diff --git a/com.discord/apktool.yml b/com.discord/apktool.yml
index 542f042e96..6712486d8f 100644
--- a/com.discord/apktool.yml
+++ b/com.discord/apktool.yml
@@ -1,5 +1,5 @@
 !!brut.androlib.meta.MetaInfo
-apkFileName: com.discord-1109.apk
+apkFileName: com.discord-1111.apk
 compressionType: false
 doNotCompress:
 - arsc
@@ -190,5 +190,5 @@ usesFramework:
   tag: null
 version: 2.4.1-197d46-SNAPSHOT
 versionInfo:
-  versionCode: '1109'
-  versionName: 20-alpha2
+  versionCode: '1111'
+  versionName: 20-alpha4
diff --git a/com.discord/assets/crashlytics-build.properties b/com.discord/assets/crashlytics-build.properties
index 5802351f29..bc00cb393b 100644
--- a/com.discord/assets/crashlytics-build.properties
+++ b/com.discord/assets/crashlytics-build.properties
@@ -3,9 +3,9 @@
 #
 #Do NOT modify, delete, or commit to source control!
 #
-#Tue Apr 21 21:02:00 UTC 2020
-version_name=20-alpha2
+#Wed Apr 22 16:55:04 UTC 2020
+version_name=20-alpha4
 package_name=com.discord
-build_id=4fca7056-ac9c-41d0-8d6a-b3c7102c366a
-version_code=1109
+build_id=950b5462-2abc-43bc-b5b4-240b9038d7e8
+version_code=1111
 app_name=com.discord
diff --git a/com.discord/original/AndroidManifest.xml b/com.discord/original/AndroidManifest.xml
index a249699b08..fbee55da2d 100644
Binary files a/com.discord/original/AndroidManifest.xml and b/com.discord/original/AndroidManifest.xml differ
diff --git a/com.discord/res/drawable/ic_search_16dp.xml b/com.discord/res/drawable/ic_search_16dp.xml
new file mode 100644
index 0000000000..bde17581e1
--- /dev/null
+++ b/com.discord/res/drawable/ic_search_16dp.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="16.0dip" android:width="16.0dip" android:viewportWidth="16.0" android:viewportHeight="16.0"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ffffffff" android:pathData="M14.4713,13.5287L10.876,9.9333C11.602,9.0027 12,7.866 12,6.6667C12,5.242 11.4447,3.9027 10.4373,2.896C9.4307,1.888 8.0913,1.3333 6.6667,1.3333C5.242,1.3333 3.9027,1.888 2.896,2.896C1.8887,3.9027 1.3333,5.242 1.3333,6.6667C1.3333,8.0913 1.8887,9.4307 2.896,10.4373C3.9027,11.4453 5.242,12 6.6667,12C7.866,12 9.0027,11.6027 9.9333,10.876L13.5287,14.4707L14.4713,13.5287ZM6.6667,10.6667C5.598,10.6667 4.594,10.2507 3.8387,9.4953C3.0827,8.74 2.6667,7.7353 2.6667,6.6667C2.6667,5.5987 3.0827,4.594 3.8387,3.8387C4.594,3.0827 5.598,2.6667 6.6667,2.6667C7.7353,2.6667 8.7393,3.0827 9.4947,3.8387C10.2507,4.594 10.6667,5.5987 10.6667,6.6667C10.6667,7.7353 10.2507,8.74 9.4947,9.4953C8.7393,10.2507 7.7353,10.6667 6.6667,10.6667Z" />
+</vector>
\ No newline at end of file
diff --git a/com.discord/res/drawable/rounded_rectangle_4dp_radius.xml b/com.discord/res/drawable/rounded_rectangle_4dp_radius.xml
new file mode 100644
index 0000000000..9e22052688
--- /dev/null
+++ b/com.discord/res/drawable/rounded_rectangle_4dp_radius.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape android:shape="rectangle"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/white" />
+    <corners android:topLeftRadius="4.0dip" android:topRightRadius="4.0dip" android:bottomLeftRadius="4.0dip" android:bottomRightRadius="4.0dip" />
+</shape>
\ No newline at end of file
diff --git a/com.discord/res/layout-v22/widget_channels_list.xml b/com.discord/res/layout-v22/widget_channels_list.xml
deleted file mode 100644
index 8027d3f4f5..0000000000
--- a/com.discord/res/layout-v22/widget_channels_list.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.discord.utilities.view.rounded.RoundedCoordinatorLayout android:id="@id/widget_channels_list_container" android:background="?colorBackgroundSecondary" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup"
-  xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <com.discord.views.CustomAppBarLayout android:id="@id/app_bar_layout" android:background="?colorBackgroundSecondary" style="@style/AppTheme.AppBarLayout">
-        <com.google.android.material.appbar.CollapsingToolbarLayout android:id="@id/collapsing_toolbar" android:layout_width="fill_parent" android:layout_height="fill_parent" app:contentScrim="?colorBackgroundSecondary" app:layout_scrollFlags="exitUntilCollapsed|scroll" app:scrimVisibleHeightTrigger="0.0dip">
-            <FrameLayout android:layout_width="fill_parent" android:layout_height="wrap_content">
-                <com.facebook.drawee.view.SimpleDraweeView android:id="@id/channels_list_banner" android:layout_width="fill_parent" android:layout_height="wrap_content" android:adjustViewBounds="true" android:maxHeight="150.0dip" app:actualImageScaleType="centerCrop" />
-                <FrameLayout android:id="@id/channels_list_banner_foreground" android:background="@drawable/drawable_top_down_primary_630_gradient" android:layout_width="fill_parent" android:layout_height="48.0dip" />
-            </FrameLayout>
-            <androidx.appcompat.widget.Toolbar android:id="@id/channels_toolbar" android:background="@null" style="@style/AppTheme.Toolbar">
-                <TextView android:textSize="15.0sp" android:textColor="?colorInteractiveActive" android:gravity="center_vertical" android:id="@id/channels_list_header" android:paddingRight="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:layout_height="?actionBarSize" android:singleLine="true" android:shadowColor="?colorBackgroundSecondary" android:shadowDy="4.0" android:shadowRadius="2.0" android:drawableRight="?ic_overflow" android:drawablePadding="@dimen/uikit_spacing_small" android:drawableEnd="?ic_overflow" style="@style/UiKit.TextView.Bold" />
-            </androidx.appcompat.widget.Toolbar>
-        </com.google.android.material.appbar.CollapsingToolbarLayout>
-        <androidx.appcompat.widget.Toolbar android:id="@id/channels_list_search_toolbar" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content">
-            <com.google.android.material.button.MaterialButton android:textAppearance="@style/UiKit.TextAppearance" android:textColor="?colorTextNormal" android:gravity="center_vertical" android:id="@id/channels_list_search" android:paddingLeft="@dimen/uikit_spacing_medium" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_medium" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/dm_search_placeholder" android:drawableEnd="@drawable/ic_search" android:backgroundTint="?colorBackgroundTertiary" android:drawableTint="?colorTextNormal" />
-        </androidx.appcompat.widget.Toolbar>
-    </com.discord.views.CustomAppBarLayout>
-    <com.discord.widgets.friends.EmptyFriendsStateView android:id="@id/widget_channels_list_empty_friends_state_view" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:layout_below="@id/channels_list_search" app:ef_title_text_size="@dimen/uikit_textsize_large" />
-    <androidx.recyclerview.widget.RecyclerView android:id="@id/channels_list" android:paddingBottom="@dimen/uikit_spacing_medium" android:visibility="gone" android:scrollbars="vertical" android:clipToPadding="false" android:layout_height="fill_parent" android:layout_below="@id/channels_list_search" android:overScrollMode="never" style="@style/UiKit.ViewGroup.RecyclerView.AppBarScrollingViewBehavior" />
-    <ViewStub android:id="@id/channels_list_unreads_stub" android:layout="@layout/widget_channels_list_unreads" android:layout_width="fill_parent" android:layout_height="wrap_content" app:layout_anchor="@id/channels_list" />
-    <androidx.constraintlayout.widget.ConstraintLayout android:gravity="center" android:layout_gravity="end" android:id="@id/channels_list_premium_guild_hint" android:focusable="true" android:visibility="gone" android:clickable="true" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="48.0dip" android:layout_marginRight="28.0dip" android:translationZ="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
-        <View android:id="@id/channels_list_tooltip_top_tail" android:background="@drawable/drawable_tooltip_top_tail" android:layout_width="24.0dip" android:layout_height="20.0dip" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" />
-        <View android:id="@id/channels_list_tooltip_background" android:background="@drawable/drawable_bg_tooltip" android:layout_width="fill_parent" android:layout_height="0.0dip" android:translationY="-8.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintTop_toBottomOf="@id/channels_list_tooltip_top_tail" />
-        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="@color/white" android:gravity="center" android:id="@id/channels_list_premium_guild_hint_title" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/premium_guild_subscription_header_subscribe_tooltip_header" android:lineSpacingMultiplier="1.0" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="@id/channels_list_tooltip_background" style="@style/UiKit.TextView.Semibold" />
-        <TextView android:textColor="@color/white" android:gravity="center" android:id="@id/channels_list_premium_guild_hint_subtitle" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/premium_guild_subscription_header_subscribe_tooltip_text" android:lineSpacingMultiplier="1.0" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/channels_list_premium_guild_hint_title" style="@style/UiKit.TextView" />
-        <com.google.android.material.button.MaterialButton android:theme="@style/AppTheme.Dark" android:textColor="@color/brand_500" android:id="@id/channels_list_premium_guild_hint_button" android:layout_width="0.0dip" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" android:text="@string/premium_guild_subscription_header_subscribe_tooltip_close" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/channels_list_premium_guild_hint_subtitle" style="@style/UiKit.Material.Button.White" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</com.discord.utilities.view.rounded.RoundedCoordinatorLayout>
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_channels_list.xml b/com.discord/res/layout/widget_channels_list.xml
index 8e3dfc63e0..6c2f794324 100644
--- a/com.discord/res/layout/widget_channels_list.xml
+++ b/com.discord/res/layout/widget_channels_list.xml
@@ -12,7 +12,7 @@
             </androidx.appcompat.widget.Toolbar>
         </com.google.android.material.appbar.CollapsingToolbarLayout>
         <androidx.appcompat.widget.Toolbar android:id="@id/channels_list_search_toolbar" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content">
-            <com.google.android.material.button.MaterialButton android:textAppearance="@style/UiKit.TextAppearance" android:textColor="?colorTextNormal" android:gravity="center_vertical" android:id="@id/channels_list_search" android:paddingLeft="@dimen/uikit_spacing_medium" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_medium" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/dm_search_placeholder" android:drawableEnd="@drawable/ic_search" android:backgroundTint="?colorBackgroundTertiary" />
+            <androidx.appcompat.widget.AppCompatTextView android:textAppearance="@style/UiKit.TextAppearance" android:textColor="?colorTextMuted" android:gravity="center_vertical" android:id="@id/channels_list_search" android:background="@drawable/rounded_rectangle_4dp_radius" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_medium" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:foreground="?bg_pressed_highlight" android:text="@string/dm_search_placeholder" android:drawableEnd="@drawable/ic_search_16dp" android:paddingStart="@dimen/uikit_spacing_medium" android:paddingEnd="@dimen/uikit_spacing_medium" android:layout_marginStart="@dimen/uikit_spacing_medium" android:layout_marginEnd="@dimen/uikit_spacing_large" android:backgroundTint="?colorBackgroundTertiary" app:drawableTint="?colorTextMuted" />
         </androidx.appcompat.widget.Toolbar>
     </com.discord.views.CustomAppBarLayout>
     <com.discord.widgets.friends.EmptyFriendsStateView android:id="@id/widget_channels_list_empty_friends_state_view" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:layout_below="@id/channels_list_search" app:ef_title_text_size="@dimen/uikit_textsize_large" />
diff --git a/com.discord/res/layout/widget_channels_list_item_channel_private.xml b/com.discord/res/layout/widget_channels_list_item_channel_private.xml
index 9c0c2f64a9..42cc09aee4 100644
--- a/com.discord/res/layout/widget_channels_list_item_channel_private.xml
+++ b/com.discord/res/layout/widget_channels_list_item_channel_private.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout android:layout_height="60.0dip" style="@style/UiKit.ViewGroup.RelativeLayout"
+<RelativeLayout android:padding="@dimen/uikit_spacing_medium" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.RelativeLayout"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/channels_list_item_private_avatar" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_centerVertical="true" app:placeholderImage="?colorPrimaryCircle" style="@style/Avatar.Standard" />
-    <com.discord.views.StatusView android:id="@id/channel_list_item_private_status" android:layout_width="12.0dip" android:layout_height="wrap_content" android:layout_alignRight="@id/channels_list_item_private_avatar" android:layout_alignBottom="@id/channels_list_item_private_avatar" android:translationX="2.0dip" android:translationY="2.0dip" app:sv_background_color="?colorBackgroundSecondary" app:sv_border_width="2.0dip" app:sv_corner_radius="2.0dip" />
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/channels_list_item_private_avatar" android:layout_centerVertical="true" android:layout_marginStart="@dimen/uikit_spacing_medium" android:layout_marginEnd="@dimen/uikit_spacing_large" app:placeholderImage="?colorPrimaryCircle" style="@style/Avatar.Standard" />
+    <com.discord.views.StatusView android:id="@id/channel_list_item_private_status" android:layout_width="12.0dip" android:layout_height="wrap_content" android:layout_alignBottom="@id/channels_list_item_private_avatar" android:translationX="2.0dip" android:translationY="2.0dip" android:layout_alignEnd="@id/channels_list_item_private_avatar" app:sv_background_color="?colorBackgroundSecondary" app:sv_border_width="2.0dip" app:sv_corner_radius="2.0dip" />
     <LinearLayout android:layout_centerVertical="true" android:layout_alignWithParentIfMissing="true" android:layout_marginEnd="@dimen/uikit_spacing_large" android:layout_toStartOf="@id/channels_list_item_private_mentions" android:layout_toEndOf="@id/channels_list_item_private_avatar" style="@style/UiKit.ViewGroup.LinearLayout">
         <LinearLayout android:orientation="horizontal" style="@style/UiKit.ViewGroup.LinearLayout">
             <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorChannelDefault" android:id="@id/channels_list_item_private_name" android:singleLine="true" style="@style/UiKit.TextView.Semibold" />
-            <TextView android:textSize="9.5sp" android:textColor="@color/white" android:layout_gravity="center" android:id="@id/channels_list_item_private_tag" android:background="@drawable/drawable_tag_brand" android:paddingLeft="3.0dip" android:paddingRight="3.0dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/system_dm_tag_system" android:singleLine="true" android:drawableStart="@drawable/ic_verified_10dp" android:layout_marginStart="6.0dip" style="@style/UiKit.TextView" />
+            <TextView android:textSize="9.5sp" android:textColor="@color/white" android:layout_gravity="center" android:id="@id/channels_list_item_private_tag" android:background="@drawable/drawable_tag_brand" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/system_dm_tag_system" android:singleLine="true" android:drawableStart="@drawable/ic_verified_10dp" android:paddingStart="3.0dip" android:paddingEnd="3.0dip" android:layout_marginStart="6.0dip" style="@style/UiKit.TextView" />
         </LinearLayout>
         <com.discord.utilities.view.text.SimpleDraweeSpanTextView android:id="@id/channels_list_item_private_desc" android:singleLine="true" style="@style/UiKit.TextView.Subtext" />
     </LinearLayout>
diff --git a/com.discord/res/layout/widget_status.xml b/com.discord/res/layout/widget_status.xml
index 623cada6ba..d696f2527a 100644
--- a/com.discord/res/layout/widget_status.xml
+++ b/com.discord/res/layout/widget_status.xml
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout android:id="@id/status_wrap" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.LinearLayout"
-  xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <RelativeLayout android:id="@id/status_connectivity" android:background="?theme_status_indicator_color" android:padding="@dimen/uikit_spacing_small" android:layout_width="fill_parent" android:layout_height="wrap_content">
-        <FrameLayout android:id="@id/status_connectivity_icon" android:layout_width="18.0dip" android:layout_height="18.0dip" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_centerVertical="true">
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <RelativeLayout android:id="@id/status_connectivity" android:background="?theme_status_indicator_color" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_medium" android:layout_width="fill_parent" android:layout_height="wrap_content" android:paddingStart="@dimen/uikit_spacing_large" android:paddingEnd="@dimen/uikit_spacing_large">
+        <FrameLayout android:id="@id/status_connectivity_icon" android:layout_width="18.0dip" android:layout_height="18.0dip" android:layout_centerVertical="true" android:layout_marginEnd="@dimen/uikit_spacing_large">
             <ProgressBar android:id="@id/status_connectivity_spinner" android:layout_width="fill_parent" android:layout_height="fill_parent" android:indeterminate="true" android:indeterminateTint="@color/white" android:indeterminateTintMode="src_in" style="@style/Base.Widget.AppCompat.ProgressBar" />
             <ImageView android:id="@id/status_connectivity_limited" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="fill_parent" android:src="@drawable/ic_signal_cellular_connected_no_internet_4_bar_white_18dp" android:importantForAccessibility="no" />
         </FrameLayout>
         <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/white" android:gravity="center_vertical" android:layout_gravity="center" android:id="@id/status_connectivity_text" android:layout_width="fill_parent" android:text="@string/connecting" android:lineSpacingMultiplier="1.0" android:layout_toEndOf="@id/status_connectivity_icon" style="@style/UiKit.TextView.Semibold" />
     </RelativeLayout>
-    <androidx.cardview.widget.CardView android:id="@id/status_unread_messages" android:focusable="true" android:clickable="true" android:layout_margin="@dimen/uikit_spacing_small" app:cardBackgroundColor="@color/brand_500" app:cardCornerRadius="@dimen/uikit_textsize_medium" style="@style/UiKit.ViewGroup">
-        <LinearLayout android:gravity="center_vertical" android:paddingStart="@dimen/uikit_spacing_large" android:paddingEnd="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
-            <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/white" android:gravity="center_vertical" android:id="@id/status_unread_messages_text" android:layout_width="0.0dip" android:layout_weight="1.0" android:lineSpacingMultiplier="1.0" style="@style/UiKit.TextView.Semibold" />
-            <ImageView android:gravity="center_vertical" android:id="@id/status_unread_messages_mark" android:padding="@dimen/uikit_spacing_small" android:layout_height="wrap_content" android:src="@drawable/ic_close_white_18dp" android:scaleType="center" android:contentDescription="@string/mark_as_read" android:paddingStart="@dimen/uikit_spacing_large" style="@style/UiKit.ImageView" />
-        </LinearLayout>
-    </androidx.cardview.widget.CardView>
+    <LinearLayout android:gravity="center_vertical" android:id="@id/status_unread_messages" android:background="@color/brand_500" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_medium" android:paddingStart="@dimen/uikit_spacing_large" android:paddingEnd="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
+        <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="@color/white" android:gravity="center_vertical" android:id="@id/status_unread_messages_text" android:layout_width="0.0dip" android:layout_weight="1.0" android:lineSpacingMultiplier="1.0" style="@style/UiKit.TextView.Semibold" />
+        <ImageView android:gravity="center_vertical" android:id="@id/status_unread_messages_mark" android:layout_height="wrap_content" android:src="@drawable/ic_close_white_18dp" android:scaleType="center" android:contentDescription="@string/mark_as_read" android:paddingStart="@dimen/uikit_spacing_large" style="@style/UiKit.ImageView" />
+    </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/com.discord/res/values/public.xml b/com.discord/res/values/public.xml
index 57dd647a63..16fcf5a874 100644
--- a/com.discord/res/values/public.xml
+++ b/com.discord/res/values/public.xml
@@ -3254,204 +3254,206 @@
     <public type="drawable" name="ic_role_pink_24dp" id="0x7f0803e6" />
     <public type="drawable" name="ic_roles_dark_a60_24dp" id="0x7f0803e7" />
     <public type="drawable" name="ic_roles_light_a60_24dp" id="0x7f0803e8" />
-    <public type="drawable" name="ic_search_grey_24dp" id="0x7f0803ea" />
-    <public type="drawable" name="ic_search_white_24dp" id="0x7f0803eb" />
-    <public type="drawable" name="ic_security_24dp" id="0x7f0803ec" />
-    <public type="drawable" name="ic_security_dark_a60_24dp" id="0x7f0803ed" />
-    <public type="drawable" name="ic_security_light_a60_24dp" id="0x7f0803ee" />
-    <public type="drawable" name="ic_send_24dp" id="0x7f0803ef" />
-    <public type="drawable" name="ic_send_grey_a60_24dp" id="0x7f0803f0" />
-    <public type="drawable" name="ic_send_white_a60_24dp" id="0x7f0803f2" />
-    <public type="drawable" name="ic_settings_boost_24dp" id="0x7f0803f4" />
-    <public type="drawable" name="ic_settings_grey_a60_24dp" id="0x7f0803f5" />
-    <public type="drawable" name="ic_settings_white_a60_24dp" id="0x7f0803f6" />
-    <public type="drawable" name="ic_share_grey_24dp" id="0x7f0803f7" />
-    <public type="drawable" name="ic_share_grey_a60_24dp" id="0x7f0803f8" />
-    <public type="drawable" name="ic_share_white_24dp" id="0x7f0803f9" />
-    <public type="drawable" name="ic_share_white_a60_24dp" id="0x7f0803fa" />
-    <public type="drawable" name="ic_shieldstar_24dp" id="0x7f0803fb" />
-    <public type="drawable" name="ic_sidebar_notifications_off_dark_24dp" id="0x7f0803fc" />
-    <public type="drawable" name="ic_sidebar_notifications_off_light_24dp" id="0x7f0803fd" />
-    <public type="drawable" name="ic_sidebar_pins_off_dark_24dp" id="0x7f080400" />
-    <public type="drawable" name="ic_sidebar_pins_off_light_24dp" id="0x7f080401" />
-    <public type="drawable" name="ic_sidebar_search_24dp" id="0x7f080404" />
-    <public type="drawable" name="ic_skype_white_24dp" id="0x7f080406" />
-    <public type="drawable" name="ic_small_lock_green_24dp" id="0x7f080407" />
-    <public type="drawable" name="ic_smile_24dp" id="0x7f080408" />
-    <public type="drawable" name="ic_sort_grey_24dp" id="0x7f08040a" />
-    <public type="drawable" name="ic_sort_white_24dp" id="0x7f08040b" />
-    <public type="drawable" name="ic_sound_bluetooth_24dp" id="0x7f08040d" />
-    <public type="drawable" name="ic_speaker_state_dark" id="0x7f08040e" />
-    <public type="drawable" name="ic_speaker_state_light" id="0x7f08040f" />
-    <public type="drawable" name="ic_spotify_green_24dp" id="0x7f080410" />
-    <public type="drawable" name="ic_spotify_white_24dp" id="0x7f080411" />
-    <public type="drawable" name="ic_staff_badge_blurple_24dp" id="0x7f080412" />
-    <public type="drawable" name="ic_star_24dp" id="0x7f080413" />
-    <public type="drawable" name="ic_status_invisible_16dp" id="0x7f080418" />
-    <public type="drawable" name="ic_status_online_16dp" id="0x7f080419" />
-    <public type="drawable" name="ic_steam_white_24dp" id="0x7f08041b" />
-    <public type="drawable" name="ic_stop_stream_24dp" id="0x7f08041d" />
-    <public type="drawable" name="ic_swap_vertical_circle_grey_a60_24dp" id="0x7f08041e" />
-    <public type="drawable" name="ic_swap_vertical_circle_white_a60_24dp" id="0x7f08041f" />
-    <public type="drawable" name="ic_switch_camera_grey_24dp" id="0x7f080420" />
-    <public type="drawable" name="ic_switch_camera_white_24dp" id="0x7f080421" />
-    <public type="drawable" name="ic_tab_friends" id="0x7f080422" />
-    <public type="drawable" name="ic_tab_home" id="0x7f080423" />
-    <public type="drawable" name="ic_tab_mentions" id="0x7f080424" />
-    <public type="drawable" name="ic_tab_search" id="0x7f080425" />
-    <public type="drawable" name="ic_take_photo" id="0x7f080426" />
-    <public type="drawable" name="ic_text_channel_grey_24dp" id="0x7f08042f" />
-    <public type="drawable" name="ic_text_channel_white_24dp" id="0x7f080430" />
-    <public type="drawable" name="ic_text_image_24dp" id="0x7f080431" />
-    <public type="drawable" name="ic_theme_24dp" id="0x7f080432" />
-    <public type="drawable" name="ic_timer_dark" id="0x7f080433" />
-    <public type="drawable" name="ic_timer_grey_a60_24dp" id="0x7f080434" />
-    <public type="drawable" name="ic_timer_light" id="0x7f080435" />
-    <public type="drawable" name="ic_timer_white_a60_24dp" id="0x7f080436" />
-    <public type="drawable" name="ic_transfer_red_24dp" id="0x7f080437" />
-    <public type="drawable" name="ic_trash_outline" id="0x7f080438" />
-    <public type="drawable" name="ic_unban_grey" id="0x7f08043d" />
-    <public type="drawable" name="ic_unread_white_9dp" id="0x7f08043e" />
-    <public type="drawable" name="ic_unread_white_9dp_horiz" id="0x7f08043f" />
-    <public type="drawable" name="ic_upload_image_34dp" id="0x7f080441" />
-    <public type="drawable" name="ic_upload_image_40dp" id="0x7f080442" />
-    <public type="drawable" name="ic_upload_plus_32dp" id="0x7f080443" />
-    <public type="drawable" name="ic_uploads_file_dark" id="0x7f080444" />
-    <public type="drawable" name="ic_uploads_file_light" id="0x7f080445" />
-    <public type="drawable" name="ic_uploads_generic_dark" id="0x7f080446" />
-    <public type="drawable" name="ic_uploads_generic_light" id="0x7f080447" />
-    <public type="drawable" name="ic_uploads_image_dark" id="0x7f080448" />
-    <public type="drawable" name="ic_uploads_image_light" id="0x7f080449" />
-    <public type="drawable" name="ic_uploads_video_dark" id="0x7f08044a" />
-    <public type="drawable" name="ic_uploads_video_light" id="0x7f08044b" />
-    <public type="drawable" name="ic_user_actions_block_grey_a60_24dp" id="0x7f08044c" />
-    <public type="drawable" name="ic_user_actions_block_white_a60_24dp" id="0x7f08044d" />
-    <public type="drawable" name="ic_user_premium_guild_subscription" id="0x7f080452" />
-    <public type="drawable" name="ic_user_profile_action_message_grey_a60_24dp" id="0x7f080457" />
-    <public type="drawable" name="ic_user_profile_action_message_white_24dp" id="0x7f080458" />
-    <public type="drawable" name="ic_user_profile_action_message_white_a60_24dp" id="0x7f080459" />
-    <public type="drawable" name="ic_user_profile_action_pending" id="0x7f08045a" />
-    <public type="drawable" name="ic_user_profile_action_video_grey_a60_24dp" id="0x7f08045b" />
-    <public type="drawable" name="ic_user_profile_action_video_white_a60_24dp" id="0x7f08045c" />
-    <public type="drawable" name="ic_verified_10dp" id="0x7f08045d" />
-    <public type="drawable" name="ic_verified_badge" id="0x7f08045e" />
-    <public type="drawable" name="ic_verified_badge_banner" id="0x7f08045f" />
-    <public type="drawable" name="ic_video_grid_view_grey" id="0x7f080460" />
-    <public type="drawable" name="ic_video_grid_view_white" id="0x7f080461" />
-    <public type="drawable" name="ic_videocam_24dp" id="0x7f080462" />
-    <public type="drawable" name="ic_visibility_grey_24dp" id="0x7f080463" />
-    <public type="drawable" name="ic_visibility_off_grey_a60_24dp" id="0x7f080464" />
-    <public type="drawable" name="ic_visibility_off_white_a60_24dp" id="0x7f080465" />
-    <public type="drawable" name="ic_visibility_white_24dp" id="0x7f080466" />
-    <public type="drawable" name="ic_voice_settings_24dp" id="0x7f08046c" />
-    <public type="drawable" name="ic_volume_mute_grey_a60_24dp" id="0x7f08046d" />
-    <public type="drawable" name="ic_volume_mute_white_a60_24dp" id="0x7f08046e" />
-    <public type="drawable" name="ic_volume_off_24dp" id="0x7f08046f" />
-    <public type="drawable" name="ic_volume_up_dark_grey_24dp" id="0x7f080470" />
-    <public type="drawable" name="ic_volume_up_grey_24dp" id="0x7f080471" />
-    <public type="drawable" name="ic_volume_up_grey_a60_24dp" id="0x7f080472" />
-    <public type="drawable" name="ic_volume_up_primary_dark_400_24dp" id="0x7f080473" />
-    <public type="drawable" name="ic_volume_up_primary_light_500_24dp" id="0x7f080474" />
-    <public type="drawable" name="ic_volume_up_white_24dp" id="0x7f080475" />
-    <public type="drawable" name="ic_volume_up_white_a60_24dp" id="0x7f080476" />
-    <public type="drawable" name="ic_warning_circle_24dp" id="0x7f080477" />
-    <public type="drawable" name="ic_warning_icon_24dp" id="0x7f080478" />
-    <public type="drawable" name="ic_x_red_24dp" id="0x7f080479" />
-    <public type="drawable" name="ic_xbox_white_24dp" id="0x7f08047a" />
-    <public type="drawable" name="ic_youtube_gaming_white_24dp" id="0x7f08047b" />
-    <public type="drawable" name="img_baddies_dark_theme" id="0x7f0804ae" />
-    <public type="drawable" name="img_baddies_light_theme" id="0x7f0804af" />
-    <public type="drawable" name="img_boost_cancel" id="0x7f0804b2" />
-    <public type="drawable" name="img_boost_hands" id="0x7f0804b3" />
-    <public type="drawable" name="img_channel_following_success_1_dark" id="0x7f0804b4" />
-    <public type="drawable" name="img_channel_following_success_1_light" id="0x7f0804b5" />
-    <public type="drawable" name="img_channel_following_success_2_dark" id="0x7f0804b6" />
-    <public type="drawable" name="img_channel_following_success_2_light" id="0x7f0804b7" />
-    <public type="drawable" name="img_channel_following_success_3_dark" id="0x7f0804b8" />
-    <public type="drawable" name="img_channel_following_success_3_light" id="0x7f0804b9" />
-    <public type="drawable" name="img_discord_nitro_logo_left" id="0x7f0804bc" />
-    <public type="drawable" name="img_empty_server_settings_invites_dark" id="0x7f0804c9" />
-    <public type="drawable" name="img_empty_server_settings_invites_light" id="0x7f0804ca" />
-    <public type="drawable" name="img_forced_update_dark" id="0x7f0804cb" />
-    <public type="drawable" name="img_forced_update_light" id="0x7f0804cc" />
-    <public type="drawable" name="img_gem_hands_faded_dark" id="0x7f0804ce" />
-    <public type="drawable" name="img_gem_hands_faded_light" id="0x7f0804cf" />
-    <public type="drawable" name="img_gifting_pattern_bg_dark" id="0x7f0804d0" />
-    <public type="drawable" name="img_gifting_pattern_bg_light" id="0x7f0804d1" />
-    <public type="drawable" name="img_guild_profile_placeholder_dark" id="0x7f0804d5" />
-    <public type="drawable" name="img_guild_profile_placeholder_light" id="0x7f0804d6" />
-    <public type="drawable" name="img_guild_use_cases" id="0x7f0804d7" />
-    <public type="drawable" name="img_item_shop_dark" id="0x7f0804d8" />
-    <public type="drawable" name="img_logo_discord" id="0x7f0804dc" />
-    <public type="drawable" name="img_logo_square" id="0x7f0804e4" />
-    <public type="drawable" name="img_new_tos_dark_theme" id="0x7f0804e7" />
-    <public type="drawable" name="img_new_tos_light_theme" id="0x7f0804e8" />
-    <public type="drawable" name="img_nitro_classic_pattern" id="0x7f0804eb" />
-    <public type="drawable" name="img_nitro_uncancel" id="0x7f0804ef" />
-    <public type="drawable" name="img_no_gifts" id="0x7f0804f0" />
-    <public type="drawable" name="img_no_text_channels_dark" id="0x7f0804f5" />
-    <public type="drawable" name="img_no_text_channels_light" id="0x7f0804f6" />
-    <public type="drawable" name="img_nsfw_dark_theme" id="0x7f0804f7" />
-    <public type="drawable" name="img_nsfw_light_theme" id="0x7f0804f8" />
-    <public type="drawable" name="img_poop_dark" id="0x7f0804fb" />
-    <public type="drawable" name="img_poop_light" id="0x7f0804fc" />
-    <public type="drawable" name="img_premium_guild_subscription_header" id="0x7f080501" />
-    <public type="drawable" name="img_premium_guild_subscription_header_error" id="0x7f080502" />
-    <public type="drawable" name="img_premium_guild_subscription_header_logo" id="0x7f080503" />
-    <public type="drawable" name="img_premium_guild_subscription_header_resub" id="0x7f080504" />
-    <public type="drawable" name="img_quick_switcher_empty" id="0x7f080509" />
-    <public type="drawable" name="img_remote_auth_finished" id="0x7f08050a" />
-    <public type="drawable" name="img_remote_auth_not_found" id="0x7f08050c" />
-    <public type="drawable" name="img_save_your_group" id="0x7f08050d" />
-    <public type="drawable" name="img_server_boost_long" id="0x7f08050e" />
-    <public type="drawable" name="img_verify_email_dark_theme" id="0x7f080511" />
-    <public type="drawable" name="img_verify_email_light_theme" id="0x7f080512" />
-    <public type="drawable" name="img_verify_phone_dark_theme" id="0x7f080513" />
-    <public type="drawable" name="img_verify_phone_light_theme" id="0x7f080514" />
-    <public type="drawable" name="img_wumpus_ball_dark" id="0x7f080519" />
-    <public type="drawable" name="img_wumpus_ball_light" id="0x7f08051a" />
-    <public type="drawable" name="img_wumpus_tophat_dark" id="0x7f08051e" />
-    <public type="drawable" name="img_wumpus_tophat_light" id="0x7f08051f" />
-    <public type="drawable" name="mtrl_dialog_background" id="0x7f080520" />
-    <public type="drawable" name="mtrl_dropdown_arrow" id="0x7f080521" />
-    <public type="drawable" name="mtrl_ic_arrow_drop_down" id="0x7f080522" />
-    <public type="drawable" name="mtrl_ic_arrow_drop_up" id="0x7f080523" />
-    <public type="drawable" name="mtrl_ic_cancel" id="0x7f080524" />
-    <public type="drawable" name="mtrl_ic_error" id="0x7f080525" />
-    <public type="drawable" name="mtrl_popupmenu_background" id="0x7f080526" />
-    <public type="drawable" name="mtrl_popupmenu_background_dark" id="0x7f080527" />
-    <public type="drawable" name="mtrl_tabs_default_indicator" id="0x7f080528" />
-    <public type="drawable" name="navigation_empty_icon" id="0x7f080529" />
-    <public type="drawable" name="notification_action_background" id="0x7f08052a" />
-    <public type="drawable" name="notification_bg" id="0x7f08052b" />
-    <public type="drawable" name="notification_bg_low" id="0x7f08052c" />
-    <public type="drawable" name="notification_icon_background" id="0x7f080531" />
-    <public type="drawable" name="notification_template_icon_bg" id="0x7f080532" />
-    <public type="drawable" name="notification_template_icon_low_bg" id="0x7f080533" />
-    <public type="drawable" name="notification_tile_bg" id="0x7f080534" />
-    <public type="drawable" name="preference_list_divider_material" id="0x7f080536" />
-    <public type="drawable" name="reactions_divider" id="0x7f080537" />
-    <public type="drawable" name="ripple_brighten" id="0x7f080538" />
-    <public type="drawable" name="ripple_darken" id="0x7f080539" />
-    <public type="drawable" name="selectable_feedback_happy_dark" id="0x7f08053a" />
-    <public type="drawable" name="selectable_feedback_happy_light" id="0x7f08053b" />
-    <public type="drawable" name="selectable_feedback_neutral_dark" id="0x7f08053c" />
-    <public type="drawable" name="selectable_feedback_neutral_light" id="0x7f08053d" />
-    <public type="drawable" name="selectable_feedback_sad_dark" id="0x7f08053e" />
-    <public type="drawable" name="selectable_feedback_sad_light" id="0x7f08053f" />
-    <public type="drawable" name="tab_dot_selector" id="0x7f080540" />
-    <public type="drawable" name="tab_dot_selector_wide" id="0x7f080541" />
-    <public type="drawable" name="tab_indicator_default" id="0x7f080542" />
-    <public type="drawable" name="tab_indicator_selected" id="0x7f080543" />
-    <public type="drawable" name="tab_indicator_selected_wide" id="0x7f080544" />
-    <public type="drawable" name="test_custom_background" id="0x7f080545" />
-    <public type="drawable" name="tooltip_frame_dark" id="0x7f080546" />
-    <public type="drawable" name="tooltip_frame_light" id="0x7f080547" />
-    <public type="drawable" name="trash_bg" id="0x7f080548" />
-    <public type="drawable" name="ucrop_shadow_upside" id="0x7f080551" />
-    <public type="drawable" name="ucrop_vector_ic_crop" id="0x7f080552" />
-    <public type="drawable" name="ucrop_vector_loader" id="0x7f080553" />
-    <public type="drawable" name="ucrop_vector_loader_animated" id="0x7f080554" />
+    <public type="drawable" name="ic_search_16dp" id="0x7f0803ea" />
+    <public type="drawable" name="ic_search_grey_24dp" id="0x7f0803eb" />
+    <public type="drawable" name="ic_search_white_24dp" id="0x7f0803ec" />
+    <public type="drawable" name="ic_security_24dp" id="0x7f0803ed" />
+    <public type="drawable" name="ic_security_dark_a60_24dp" id="0x7f0803ee" />
+    <public type="drawable" name="ic_security_light_a60_24dp" id="0x7f0803ef" />
+    <public type="drawable" name="ic_send_24dp" id="0x7f0803f0" />
+    <public type="drawable" name="ic_send_grey_a60_24dp" id="0x7f0803f1" />
+    <public type="drawable" name="ic_send_white_a60_24dp" id="0x7f0803f3" />
+    <public type="drawable" name="ic_settings_boost_24dp" id="0x7f0803f5" />
+    <public type="drawable" name="ic_settings_grey_a60_24dp" id="0x7f0803f6" />
+    <public type="drawable" name="ic_settings_white_a60_24dp" id="0x7f0803f7" />
+    <public type="drawable" name="ic_share_grey_24dp" id="0x7f0803f8" />
+    <public type="drawable" name="ic_share_grey_a60_24dp" id="0x7f0803f9" />
+    <public type="drawable" name="ic_share_white_24dp" id="0x7f0803fa" />
+    <public type="drawable" name="ic_share_white_a60_24dp" id="0x7f0803fb" />
+    <public type="drawable" name="ic_shieldstar_24dp" id="0x7f0803fc" />
+    <public type="drawable" name="ic_sidebar_notifications_off_dark_24dp" id="0x7f0803fd" />
+    <public type="drawable" name="ic_sidebar_notifications_off_light_24dp" id="0x7f0803fe" />
+    <public type="drawable" name="ic_sidebar_pins_off_dark_24dp" id="0x7f080401" />
+    <public type="drawable" name="ic_sidebar_pins_off_light_24dp" id="0x7f080402" />
+    <public type="drawable" name="ic_sidebar_search_24dp" id="0x7f080405" />
+    <public type="drawable" name="ic_skype_white_24dp" id="0x7f080407" />
+    <public type="drawable" name="ic_small_lock_green_24dp" id="0x7f080408" />
+    <public type="drawable" name="ic_smile_24dp" id="0x7f080409" />
+    <public type="drawable" name="ic_sort_grey_24dp" id="0x7f08040b" />
+    <public type="drawable" name="ic_sort_white_24dp" id="0x7f08040c" />
+    <public type="drawable" name="ic_sound_bluetooth_24dp" id="0x7f08040e" />
+    <public type="drawable" name="ic_speaker_state_dark" id="0x7f08040f" />
+    <public type="drawable" name="ic_speaker_state_light" id="0x7f080410" />
+    <public type="drawable" name="ic_spotify_green_24dp" id="0x7f080411" />
+    <public type="drawable" name="ic_spotify_white_24dp" id="0x7f080412" />
+    <public type="drawable" name="ic_staff_badge_blurple_24dp" id="0x7f080413" />
+    <public type="drawable" name="ic_star_24dp" id="0x7f080414" />
+    <public type="drawable" name="ic_status_invisible_16dp" id="0x7f080419" />
+    <public type="drawable" name="ic_status_online_16dp" id="0x7f08041a" />
+    <public type="drawable" name="ic_steam_white_24dp" id="0x7f08041c" />
+    <public type="drawable" name="ic_stop_stream_24dp" id="0x7f08041e" />
+    <public type="drawable" name="ic_swap_vertical_circle_grey_a60_24dp" id="0x7f08041f" />
+    <public type="drawable" name="ic_swap_vertical_circle_white_a60_24dp" id="0x7f080420" />
+    <public type="drawable" name="ic_switch_camera_grey_24dp" id="0x7f080421" />
+    <public type="drawable" name="ic_switch_camera_white_24dp" id="0x7f080422" />
+    <public type="drawable" name="ic_tab_friends" id="0x7f080423" />
+    <public type="drawable" name="ic_tab_home" id="0x7f080424" />
+    <public type="drawable" name="ic_tab_mentions" id="0x7f080425" />
+    <public type="drawable" name="ic_tab_search" id="0x7f080426" />
+    <public type="drawable" name="ic_take_photo" id="0x7f080427" />
+    <public type="drawable" name="ic_text_channel_grey_24dp" id="0x7f080430" />
+    <public type="drawable" name="ic_text_channel_white_24dp" id="0x7f080431" />
+    <public type="drawable" name="ic_text_image_24dp" id="0x7f080432" />
+    <public type="drawable" name="ic_theme_24dp" id="0x7f080433" />
+    <public type="drawable" name="ic_timer_dark" id="0x7f080434" />
+    <public type="drawable" name="ic_timer_grey_a60_24dp" id="0x7f080435" />
+    <public type="drawable" name="ic_timer_light" id="0x7f080436" />
+    <public type="drawable" name="ic_timer_white_a60_24dp" id="0x7f080437" />
+    <public type="drawable" name="ic_transfer_red_24dp" id="0x7f080438" />
+    <public type="drawable" name="ic_trash_outline" id="0x7f080439" />
+    <public type="drawable" name="ic_unban_grey" id="0x7f08043e" />
+    <public type="drawable" name="ic_unread_white_9dp" id="0x7f08043f" />
+    <public type="drawable" name="ic_unread_white_9dp_horiz" id="0x7f080440" />
+    <public type="drawable" name="ic_upload_image_34dp" id="0x7f080442" />
+    <public type="drawable" name="ic_upload_image_40dp" id="0x7f080443" />
+    <public type="drawable" name="ic_upload_plus_32dp" id="0x7f080444" />
+    <public type="drawable" name="ic_uploads_file_dark" id="0x7f080445" />
+    <public type="drawable" name="ic_uploads_file_light" id="0x7f080446" />
+    <public type="drawable" name="ic_uploads_generic_dark" id="0x7f080447" />
+    <public type="drawable" name="ic_uploads_generic_light" id="0x7f080448" />
+    <public type="drawable" name="ic_uploads_image_dark" id="0x7f080449" />
+    <public type="drawable" name="ic_uploads_image_light" id="0x7f08044a" />
+    <public type="drawable" name="ic_uploads_video_dark" id="0x7f08044b" />
+    <public type="drawable" name="ic_uploads_video_light" id="0x7f08044c" />
+    <public type="drawable" name="ic_user_actions_block_grey_a60_24dp" id="0x7f08044d" />
+    <public type="drawable" name="ic_user_actions_block_white_a60_24dp" id="0x7f08044e" />
+    <public type="drawable" name="ic_user_premium_guild_subscription" id="0x7f080453" />
+    <public type="drawable" name="ic_user_profile_action_message_grey_a60_24dp" id="0x7f080458" />
+    <public type="drawable" name="ic_user_profile_action_message_white_24dp" id="0x7f080459" />
+    <public type="drawable" name="ic_user_profile_action_message_white_a60_24dp" id="0x7f08045a" />
+    <public type="drawable" name="ic_user_profile_action_pending" id="0x7f08045b" />
+    <public type="drawable" name="ic_user_profile_action_video_grey_a60_24dp" id="0x7f08045c" />
+    <public type="drawable" name="ic_user_profile_action_video_white_a60_24dp" id="0x7f08045d" />
+    <public type="drawable" name="ic_verified_10dp" id="0x7f08045e" />
+    <public type="drawable" name="ic_verified_badge" id="0x7f08045f" />
+    <public type="drawable" name="ic_verified_badge_banner" id="0x7f080460" />
+    <public type="drawable" name="ic_video_grid_view_grey" id="0x7f080461" />
+    <public type="drawable" name="ic_video_grid_view_white" id="0x7f080462" />
+    <public type="drawable" name="ic_videocam_24dp" id="0x7f080463" />
+    <public type="drawable" name="ic_visibility_grey_24dp" id="0x7f080464" />
+    <public type="drawable" name="ic_visibility_off_grey_a60_24dp" id="0x7f080465" />
+    <public type="drawable" name="ic_visibility_off_white_a60_24dp" id="0x7f080466" />
+    <public type="drawable" name="ic_visibility_white_24dp" id="0x7f080467" />
+    <public type="drawable" name="ic_voice_settings_24dp" id="0x7f08046d" />
+    <public type="drawable" name="ic_volume_mute_grey_a60_24dp" id="0x7f08046e" />
+    <public type="drawable" name="ic_volume_mute_white_a60_24dp" id="0x7f08046f" />
+    <public type="drawable" name="ic_volume_off_24dp" id="0x7f080470" />
+    <public type="drawable" name="ic_volume_up_dark_grey_24dp" id="0x7f080471" />
+    <public type="drawable" name="ic_volume_up_grey_24dp" id="0x7f080472" />
+    <public type="drawable" name="ic_volume_up_grey_a60_24dp" id="0x7f080473" />
+    <public type="drawable" name="ic_volume_up_primary_dark_400_24dp" id="0x7f080474" />
+    <public type="drawable" name="ic_volume_up_primary_light_500_24dp" id="0x7f080475" />
+    <public type="drawable" name="ic_volume_up_white_24dp" id="0x7f080476" />
+    <public type="drawable" name="ic_volume_up_white_a60_24dp" id="0x7f080477" />
+    <public type="drawable" name="ic_warning_circle_24dp" id="0x7f080478" />
+    <public type="drawable" name="ic_warning_icon_24dp" id="0x7f080479" />
+    <public type="drawable" name="ic_x_red_24dp" id="0x7f08047a" />
+    <public type="drawable" name="ic_xbox_white_24dp" id="0x7f08047b" />
+    <public type="drawable" name="ic_youtube_gaming_white_24dp" id="0x7f08047c" />
+    <public type="drawable" name="img_baddies_dark_theme" id="0x7f0804af" />
+    <public type="drawable" name="img_baddies_light_theme" id="0x7f0804b0" />
+    <public type="drawable" name="img_boost_cancel" id="0x7f0804b3" />
+    <public type="drawable" name="img_boost_hands" id="0x7f0804b4" />
+    <public type="drawable" name="img_channel_following_success_1_dark" id="0x7f0804b5" />
+    <public type="drawable" name="img_channel_following_success_1_light" id="0x7f0804b6" />
+    <public type="drawable" name="img_channel_following_success_2_dark" id="0x7f0804b7" />
+    <public type="drawable" name="img_channel_following_success_2_light" id="0x7f0804b8" />
+    <public type="drawable" name="img_channel_following_success_3_dark" id="0x7f0804b9" />
+    <public type="drawable" name="img_channel_following_success_3_light" id="0x7f0804ba" />
+    <public type="drawable" name="img_discord_nitro_logo_left" id="0x7f0804bd" />
+    <public type="drawable" name="img_empty_server_settings_invites_dark" id="0x7f0804ca" />
+    <public type="drawable" name="img_empty_server_settings_invites_light" id="0x7f0804cb" />
+    <public type="drawable" name="img_forced_update_dark" id="0x7f0804cc" />
+    <public type="drawable" name="img_forced_update_light" id="0x7f0804cd" />
+    <public type="drawable" name="img_gem_hands_faded_dark" id="0x7f0804cf" />
+    <public type="drawable" name="img_gem_hands_faded_light" id="0x7f0804d0" />
+    <public type="drawable" name="img_gifting_pattern_bg_dark" id="0x7f0804d1" />
+    <public type="drawable" name="img_gifting_pattern_bg_light" id="0x7f0804d2" />
+    <public type="drawable" name="img_guild_profile_placeholder_dark" id="0x7f0804d6" />
+    <public type="drawable" name="img_guild_profile_placeholder_light" id="0x7f0804d7" />
+    <public type="drawable" name="img_guild_use_cases" id="0x7f0804d8" />
+    <public type="drawable" name="img_item_shop_dark" id="0x7f0804d9" />
+    <public type="drawable" name="img_logo_discord" id="0x7f0804dd" />
+    <public type="drawable" name="img_logo_square" id="0x7f0804e5" />
+    <public type="drawable" name="img_new_tos_dark_theme" id="0x7f0804e8" />
+    <public type="drawable" name="img_new_tos_light_theme" id="0x7f0804e9" />
+    <public type="drawable" name="img_nitro_classic_pattern" id="0x7f0804ec" />
+    <public type="drawable" name="img_nitro_uncancel" id="0x7f0804f0" />
+    <public type="drawable" name="img_no_gifts" id="0x7f0804f1" />
+    <public type="drawable" name="img_no_text_channels_dark" id="0x7f0804f6" />
+    <public type="drawable" name="img_no_text_channels_light" id="0x7f0804f7" />
+    <public type="drawable" name="img_nsfw_dark_theme" id="0x7f0804f8" />
+    <public type="drawable" name="img_nsfw_light_theme" id="0x7f0804f9" />
+    <public type="drawable" name="img_poop_dark" id="0x7f0804fc" />
+    <public type="drawable" name="img_poop_light" id="0x7f0804fd" />
+    <public type="drawable" name="img_premium_guild_subscription_header" id="0x7f080502" />
+    <public type="drawable" name="img_premium_guild_subscription_header_error" id="0x7f080503" />
+    <public type="drawable" name="img_premium_guild_subscription_header_logo" id="0x7f080504" />
+    <public type="drawable" name="img_premium_guild_subscription_header_resub" id="0x7f080505" />
+    <public type="drawable" name="img_quick_switcher_empty" id="0x7f08050a" />
+    <public type="drawable" name="img_remote_auth_finished" id="0x7f08050b" />
+    <public type="drawable" name="img_remote_auth_not_found" id="0x7f08050d" />
+    <public type="drawable" name="img_save_your_group" id="0x7f08050e" />
+    <public type="drawable" name="img_server_boost_long" id="0x7f08050f" />
+    <public type="drawable" name="img_verify_email_dark_theme" id="0x7f080512" />
+    <public type="drawable" name="img_verify_email_light_theme" id="0x7f080513" />
+    <public type="drawable" name="img_verify_phone_dark_theme" id="0x7f080514" />
+    <public type="drawable" name="img_verify_phone_light_theme" id="0x7f080515" />
+    <public type="drawable" name="img_wumpus_ball_dark" id="0x7f08051a" />
+    <public type="drawable" name="img_wumpus_ball_light" id="0x7f08051b" />
+    <public type="drawable" name="img_wumpus_tophat_dark" id="0x7f08051f" />
+    <public type="drawable" name="img_wumpus_tophat_light" id="0x7f080520" />
+    <public type="drawable" name="mtrl_dialog_background" id="0x7f080521" />
+    <public type="drawable" name="mtrl_dropdown_arrow" id="0x7f080522" />
+    <public type="drawable" name="mtrl_ic_arrow_drop_down" id="0x7f080523" />
+    <public type="drawable" name="mtrl_ic_arrow_drop_up" id="0x7f080524" />
+    <public type="drawable" name="mtrl_ic_cancel" id="0x7f080525" />
+    <public type="drawable" name="mtrl_ic_error" id="0x7f080526" />
+    <public type="drawable" name="mtrl_popupmenu_background" id="0x7f080527" />
+    <public type="drawable" name="mtrl_popupmenu_background_dark" id="0x7f080528" />
+    <public type="drawable" name="mtrl_tabs_default_indicator" id="0x7f080529" />
+    <public type="drawable" name="navigation_empty_icon" id="0x7f08052a" />
+    <public type="drawable" name="notification_action_background" id="0x7f08052b" />
+    <public type="drawable" name="notification_bg" id="0x7f08052c" />
+    <public type="drawable" name="notification_bg_low" id="0x7f08052d" />
+    <public type="drawable" name="notification_icon_background" id="0x7f080532" />
+    <public type="drawable" name="notification_template_icon_bg" id="0x7f080533" />
+    <public type="drawable" name="notification_template_icon_low_bg" id="0x7f080534" />
+    <public type="drawable" name="notification_tile_bg" id="0x7f080535" />
+    <public type="drawable" name="preference_list_divider_material" id="0x7f080537" />
+    <public type="drawable" name="reactions_divider" id="0x7f080538" />
+    <public type="drawable" name="ripple_brighten" id="0x7f080539" />
+    <public type="drawable" name="ripple_darken" id="0x7f08053a" />
+    <public type="drawable" name="rounded_rectangle_4dp_radius" id="0x7f08053b" />
+    <public type="drawable" name="selectable_feedback_happy_dark" id="0x7f08053c" />
+    <public type="drawable" name="selectable_feedback_happy_light" id="0x7f08053d" />
+    <public type="drawable" name="selectable_feedback_neutral_dark" id="0x7f08053e" />
+    <public type="drawable" name="selectable_feedback_neutral_light" id="0x7f08053f" />
+    <public type="drawable" name="selectable_feedback_sad_dark" id="0x7f080540" />
+    <public type="drawable" name="selectable_feedback_sad_light" id="0x7f080541" />
+    <public type="drawable" name="tab_dot_selector" id="0x7f080542" />
+    <public type="drawable" name="tab_dot_selector_wide" id="0x7f080543" />
+    <public type="drawable" name="tab_indicator_default" id="0x7f080544" />
+    <public type="drawable" name="tab_indicator_selected" id="0x7f080545" />
+    <public type="drawable" name="tab_indicator_selected_wide" id="0x7f080546" />
+    <public type="drawable" name="test_custom_background" id="0x7f080547" />
+    <public type="drawable" name="tooltip_frame_dark" id="0x7f080548" />
+    <public type="drawable" name="tooltip_frame_light" id="0x7f080549" />
+    <public type="drawable" name="trash_bg" id="0x7f08054a" />
+    <public type="drawable" name="ucrop_shadow_upside" id="0x7f080553" />
+    <public type="drawable" name="ucrop_vector_ic_crop" id="0x7f080554" />
+    <public type="drawable" name="ucrop_vector_loader" id="0x7f080555" />
+    <public type="drawable" name="ucrop_vector_loader_animated" id="0x7f080556" />
     <public type="drawable" name="abc_control_background_material" id="0x7f08002e" />
     <public type="drawable" name="asset_nux_navigation_channels" id="0x7f080088" />
     <public type="drawable" name="asset_nux_navigation_dms" id="0x7f080089" />
@@ -3594,95 +3596,95 @@
     <public type="drawable" name="ic_profile_badge_nitro_32dp" id="0x7f0803ca" />
     <public type="drawable" name="ic_profile_badge_partner_32dp" id="0x7f0803cb" />
     <public type="drawable" name="ic_reddit_white_24dp" id="0x7f0803de" />
-    <public type="drawable" name="ic_settings_24dp" id="0x7f0803f3" />
-    <public type="drawable" name="ic_sidebar_notifications_on_dark_24dp" id="0x7f0803fe" />
-    <public type="drawable" name="ic_sidebar_notifications_on_light_24dp" id="0x7f0803ff" />
-    <public type="drawable" name="ic_sidebar_pins_on_dark_24dp" id="0x7f080402" />
-    <public type="drawable" name="ic_sidebar_pins_on_light_24dp" id="0x7f080403" />
-    <public type="drawable" name="ic_sound_24dp" id="0x7f08040c" />
-    <public type="drawable" name="ic_start_stream_24dp" id="0x7f080414" />
-    <public type="drawable" name="ic_status_24dp" id="0x7f080415" />
-    <public type="drawable" name="ic_status_dnd_16dp" id="0x7f080416" />
-    <public type="drawable" name="ic_status_idle_16dp" id="0x7f080417" />
-    <public type="drawable" name="ic_status_streaming_16dp" id="0x7f08041a" />
-    <public type="drawable" name="ic_stop_stream" id="0x7f08041c" />
-    <public type="drawable" name="ic_template_32dp" id="0x7f080427" />
-    <public type="drawable" name="ic_twitch_white_24dp" id="0x7f080439" />
-    <public type="drawable" name="ic_twitter_white_18dp" id="0x7f08043a" />
-    <public type="drawable" name="ic_twitter_white_24dp" id="0x7f08043b" />
-    <public type="drawable" name="ic_upload_24dp" id="0x7f080440" />
-    <public type="drawable" name="ic_user_actions_remove_friend_grey_a60_24dp" id="0x7f08044e" />
-    <public type="drawable" name="ic_user_actions_remove_friend_white_a60_24dp" id="0x7f08044f" />
-    <public type="drawable" name="ic_user_actions_unblock_grey_a60_24dp" id="0x7f080450" />
-    <public type="drawable" name="ic_user_actions_unblock_white_a60_24dp" id="0x7f080451" />
-    <public type="drawable" name="ic_user_profile_action_add_friend" id="0x7f080453" />
-    <public type="drawable" name="ic_user_profile_action_call_grey_a60_24dp" id="0x7f080454" />
-    <public type="drawable" name="ic_user_profile_action_call_white_24dp" id="0x7f080455" />
-    <public type="drawable" name="ic_user_profile_action_call_white_a60_24dp" id="0x7f080456" />
-    <public type="drawable" name="ic_voice_channel_streaming" id="0x7f080467" />
-    <public type="drawable" name="ic_voice_quality_average" id="0x7f080468" />
-    <public type="drawable" name="ic_voice_quality_bad" id="0x7f080469" />
-    <public type="drawable" name="ic_voice_quality_fine" id="0x7f08046a" />
-    <public type="drawable" name="ic_voice_quality_unknown" id="0x7f08046b" />
-    <public type="drawable" name="img_addfriends_empty_dark" id="0x7f0804a4" />
-    <public type="drawable" name="img_addfriends_empty_light" id="0x7f0804a5" />
-    <public type="drawable" name="img_addfriends_notconnected_dark" id="0x7f0804a6" />
-    <public type="drawable" name="img_addfriends_notconnected_light" id="0x7f0804a7" />
-    <public type="drawable" name="img_animated_emoji_upsell" id="0x7f0804a8" />
-    <public type="drawable" name="img_avatar_upsell" id="0x7f0804ad" />
-    <public type="drawable" name="img_badge_upsell" id="0x7f0804b0" />
-    <public type="drawable" name="img_boost_activated" id="0x7f0804b1" />
-    <public type="drawable" name="img_empty_friends_no_suggestions_dark" id="0x7f0804bd" />
-    <public type="drawable" name="img_empty_friends_no_suggestions_light" id="0x7f0804be" />
-    <public type="drawable" name="img_empty_friends_none_blocked_dark" id="0x7f0804bf" />
-    <public type="drawable" name="img_empty_friends_none_blocked_light" id="0x7f0804c0" />
-    <public type="drawable" name="img_empty_friends_none_dark" id="0x7f0804c1" />
-    <public type="drawable" name="img_empty_friends_none_light" id="0x7f0804c2" />
-    <public type="drawable" name="img_empty_friends_none_online_dark" id="0x7f0804c3" />
-    <public type="drawable" name="img_empty_friends_none_online_light" id="0x7f0804c4" />
-    <public type="drawable" name="img_empty_friends_none_pending_dark" id="0x7f0804c5" />
-    <public type="drawable" name="img_empty_friends_none_pending_light" id="0x7f0804c6" />
-    <public type="drawable" name="img_empty_server_settings_emoji_dark" id="0x7f0804c7" />
-    <public type="drawable" name="img_empty_server_settings_emoji_light" id="0x7f0804c8" />
-    <public type="drawable" name="img_global_emoji_upsell" id="0x7f0804d4" />
-    <public type="drawable" name="img_logo_discord_nitro" id="0x7f0804dd" />
-    <public type="drawable" name="img_logo_discord_nitro_brand" id="0x7f0804de" />
-    <public type="drawable" name="img_logo_discord_nitro_classic" id="0x7f0804df" />
-    <public type="drawable" name="img_logo_nitro" id="0x7f0804e0" />
-    <public type="drawable" name="img_logo_nitro_classic" id="0x7f0804e1" />
-    <public type="drawable" name="img_logo_nitro_classic_brand" id="0x7f0804e2" />
-    <public type="drawable" name="img_logo_nitro_classic_header" id="0x7f0804e3" />
-    <public type="drawable" name="img_mfa_dark" id="0x7f0804e5" />
-    <public type="drawable" name="img_mfa_light" id="0x7f0804e6" />
-    <public type="drawable" name="img_nitro_card" id="0x7f0804e9" />
-    <public type="drawable" name="img_nitro_classic_card" id="0x7f0804ea" />
-    <public type="drawable" name="img_nitro_pattern" id="0x7f0804ec" />
-    <public type="drawable" name="img_no_mutual_friends_dark" id="0x7f0804f1" />
-    <public type="drawable" name="img_no_mutual_friends_light" id="0x7f0804f2" />
-    <public type="drawable" name="img_no_mutual_servers_dark" id="0x7f0804f3" />
-    <public type="drawable" name="img_no_mutual_servers_light" id="0x7f0804f4" />
-    <public type="drawable" name="img_premium_classic_subscription_header" id="0x7f0804fd" />
-    <public type="drawable" name="img_premium_classic_subscription_header_error" id="0x7f0804fe" />
-    <public type="drawable" name="img_premium_classic_subscription_header_logo" id="0x7f0804ff" />
-    <public type="drawable" name="img_premium_classic_subscription_header_resub" id="0x7f080500" />
-    <public type="drawable" name="img_premium_subscription_header" id="0x7f080505" />
-    <public type="drawable" name="img_premium_subscription_header_error" id="0x7f080506" />
-    <public type="drawable" name="img_premium_subscription_header_logo" id="0x7f080507" />
-    <public type="drawable" name="img_premium_subscription_header_resub" id="0x7f080508" />
-    <public type="drawable" name="img_remote_auth_loaded" id="0x7f08050b" />
-    <public type="drawable" name="img_tag_upsell" id="0x7f08050f" />
-    <public type="drawable" name="img_upload_upsell" id="0x7f080510" />
-    <public type="drawable" name="img_wumpus_jetpack" id="0x7f08051b" />
-    <public type="drawable" name="img_wumpus_playing_with_friends" id="0x7f08051c" />
-    <public type="drawable" name="img_wumpus_riding_wheel" id="0x7f08051d" />
-    <public type="drawable" name="ucrop_ic_angle" id="0x7f080549" />
-    <public type="drawable" name="ucrop_ic_crop" id="0x7f08054a" />
-    <public type="drawable" name="ucrop_ic_cross" id="0x7f08054b" />
-    <public type="drawable" name="ucrop_ic_done" id="0x7f08054c" />
-    <public type="drawable" name="ucrop_ic_next" id="0x7f08054d" />
-    <public type="drawable" name="ucrop_ic_reset" id="0x7f08054e" />
-    <public type="drawable" name="ucrop_ic_rotate" id="0x7f08054f" />
-    <public type="drawable" name="ucrop_ic_scale" id="0x7f080550" />
+    <public type="drawable" name="ic_settings_24dp" id="0x7f0803f4" />
+    <public type="drawable" name="ic_sidebar_notifications_on_dark_24dp" id="0x7f0803ff" />
+    <public type="drawable" name="ic_sidebar_notifications_on_light_24dp" id="0x7f080400" />
+    <public type="drawable" name="ic_sidebar_pins_on_dark_24dp" id="0x7f080403" />
+    <public type="drawable" name="ic_sidebar_pins_on_light_24dp" id="0x7f080404" />
+    <public type="drawable" name="ic_sound_24dp" id="0x7f08040d" />
+    <public type="drawable" name="ic_start_stream_24dp" id="0x7f080415" />
+    <public type="drawable" name="ic_status_24dp" id="0x7f080416" />
+    <public type="drawable" name="ic_status_dnd_16dp" id="0x7f080417" />
+    <public type="drawable" name="ic_status_idle_16dp" id="0x7f080418" />
+    <public type="drawable" name="ic_status_streaming_16dp" id="0x7f08041b" />
+    <public type="drawable" name="ic_stop_stream" id="0x7f08041d" />
+    <public type="drawable" name="ic_template_32dp" id="0x7f080428" />
+    <public type="drawable" name="ic_twitch_white_24dp" id="0x7f08043a" />
+    <public type="drawable" name="ic_twitter_white_18dp" id="0x7f08043b" />
+    <public type="drawable" name="ic_twitter_white_24dp" id="0x7f08043c" />
+    <public type="drawable" name="ic_upload_24dp" id="0x7f080441" />
+    <public type="drawable" name="ic_user_actions_remove_friend_grey_a60_24dp" id="0x7f08044f" />
+    <public type="drawable" name="ic_user_actions_remove_friend_white_a60_24dp" id="0x7f080450" />
+    <public type="drawable" name="ic_user_actions_unblock_grey_a60_24dp" id="0x7f080451" />
+    <public type="drawable" name="ic_user_actions_unblock_white_a60_24dp" id="0x7f080452" />
+    <public type="drawable" name="ic_user_profile_action_add_friend" id="0x7f080454" />
+    <public type="drawable" name="ic_user_profile_action_call_grey_a60_24dp" id="0x7f080455" />
+    <public type="drawable" name="ic_user_profile_action_call_white_24dp" id="0x7f080456" />
+    <public type="drawable" name="ic_user_profile_action_call_white_a60_24dp" id="0x7f080457" />
+    <public type="drawable" name="ic_voice_channel_streaming" id="0x7f080468" />
+    <public type="drawable" name="ic_voice_quality_average" id="0x7f080469" />
+    <public type="drawable" name="ic_voice_quality_bad" id="0x7f08046a" />
+    <public type="drawable" name="ic_voice_quality_fine" id="0x7f08046b" />
+    <public type="drawable" name="ic_voice_quality_unknown" id="0x7f08046c" />
+    <public type="drawable" name="img_addfriends_empty_dark" id="0x7f0804a5" />
+    <public type="drawable" name="img_addfriends_empty_light" id="0x7f0804a6" />
+    <public type="drawable" name="img_addfriends_notconnected_dark" id="0x7f0804a7" />
+    <public type="drawable" name="img_addfriends_notconnected_light" id="0x7f0804a8" />
+    <public type="drawable" name="img_animated_emoji_upsell" id="0x7f0804a9" />
+    <public type="drawable" name="img_avatar_upsell" id="0x7f0804ae" />
+    <public type="drawable" name="img_badge_upsell" id="0x7f0804b1" />
+    <public type="drawable" name="img_boost_activated" id="0x7f0804b2" />
+    <public type="drawable" name="img_empty_friends_no_suggestions_dark" id="0x7f0804be" />
+    <public type="drawable" name="img_empty_friends_no_suggestions_light" id="0x7f0804bf" />
+    <public type="drawable" name="img_empty_friends_none_blocked_dark" id="0x7f0804c0" />
+    <public type="drawable" name="img_empty_friends_none_blocked_light" id="0x7f0804c1" />
+    <public type="drawable" name="img_empty_friends_none_dark" id="0x7f0804c2" />
+    <public type="drawable" name="img_empty_friends_none_light" id="0x7f0804c3" />
+    <public type="drawable" name="img_empty_friends_none_online_dark" id="0x7f0804c4" />
+    <public type="drawable" name="img_empty_friends_none_online_light" id="0x7f0804c5" />
+    <public type="drawable" name="img_empty_friends_none_pending_dark" id="0x7f0804c6" />
+    <public type="drawable" name="img_empty_friends_none_pending_light" id="0x7f0804c7" />
+    <public type="drawable" name="img_empty_server_settings_emoji_dark" id="0x7f0804c8" />
+    <public type="drawable" name="img_empty_server_settings_emoji_light" id="0x7f0804c9" />
+    <public type="drawable" name="img_global_emoji_upsell" id="0x7f0804d5" />
+    <public type="drawable" name="img_logo_discord_nitro" id="0x7f0804de" />
+    <public type="drawable" name="img_logo_discord_nitro_brand" id="0x7f0804df" />
+    <public type="drawable" name="img_logo_discord_nitro_classic" id="0x7f0804e0" />
+    <public type="drawable" name="img_logo_nitro" id="0x7f0804e1" />
+    <public type="drawable" name="img_logo_nitro_classic" id="0x7f0804e2" />
+    <public type="drawable" name="img_logo_nitro_classic_brand" id="0x7f0804e3" />
+    <public type="drawable" name="img_logo_nitro_classic_header" id="0x7f0804e4" />
+    <public type="drawable" name="img_mfa_dark" id="0x7f0804e6" />
+    <public type="drawable" name="img_mfa_light" id="0x7f0804e7" />
+    <public type="drawable" name="img_nitro_card" id="0x7f0804ea" />
+    <public type="drawable" name="img_nitro_classic_card" id="0x7f0804eb" />
+    <public type="drawable" name="img_nitro_pattern" id="0x7f0804ed" />
+    <public type="drawable" name="img_no_mutual_friends_dark" id="0x7f0804f2" />
+    <public type="drawable" name="img_no_mutual_friends_light" id="0x7f0804f3" />
+    <public type="drawable" name="img_no_mutual_servers_dark" id="0x7f0804f4" />
+    <public type="drawable" name="img_no_mutual_servers_light" id="0x7f0804f5" />
+    <public type="drawable" name="img_premium_classic_subscription_header" id="0x7f0804fe" />
+    <public type="drawable" name="img_premium_classic_subscription_header_error" id="0x7f0804ff" />
+    <public type="drawable" name="img_premium_classic_subscription_header_logo" id="0x7f080500" />
+    <public type="drawable" name="img_premium_classic_subscription_header_resub" id="0x7f080501" />
+    <public type="drawable" name="img_premium_subscription_header" id="0x7f080506" />
+    <public type="drawable" name="img_premium_subscription_header_error" id="0x7f080507" />
+    <public type="drawable" name="img_premium_subscription_header_logo" id="0x7f080508" />
+    <public type="drawable" name="img_premium_subscription_header_resub" id="0x7f080509" />
+    <public type="drawable" name="img_remote_auth_loaded" id="0x7f08050c" />
+    <public type="drawable" name="img_tag_upsell" id="0x7f080510" />
+    <public type="drawable" name="img_upload_upsell" id="0x7f080511" />
+    <public type="drawable" name="img_wumpus_jetpack" id="0x7f08051c" />
+    <public type="drawable" name="img_wumpus_playing_with_friends" id="0x7f08051d" />
+    <public type="drawable" name="img_wumpus_riding_wheel" id="0x7f08051e" />
+    <public type="drawable" name="ucrop_ic_angle" id="0x7f08054b" />
+    <public type="drawable" name="ucrop_ic_crop" id="0x7f08054c" />
+    <public type="drawable" name="ucrop_ic_cross" id="0x7f08054d" />
+    <public type="drawable" name="ucrop_ic_done" id="0x7f08054e" />
+    <public type="drawable" name="ucrop_ic_next" id="0x7f08054f" />
+    <public type="drawable" name="ucrop_ic_reset" id="0x7f080550" />
+    <public type="drawable" name="ucrop_ic_rotate" id="0x7f080551" />
+    <public type="drawable" name="ucrop_ic_scale" id="0x7f080552" />
     <public type="drawable" name="abc_ab_share_pack_mtrl_alpha" id="0x7f08001c" />
     <public type="drawable" name="abc_btn_check_to_on_mtrl_000" id="0x7f080021" />
     <public type="drawable" name="abc_btn_check_to_on_mtrl_015" id="0x7f080022" />
@@ -3739,15 +3741,15 @@
     <public type="drawable" name="googleg_disabled_color_18" id="0x7f0801fa" />
     <public type="drawable" name="googleg_standard_color_18" id="0x7f0801fb" />
     <public type="drawable" name="ic_add_white_24dp" id="0x7f080221" />
-    <public type="drawable" name="notification_bg_low_normal" id="0x7f08052d" />
-    <public type="drawable" name="notification_bg_low_pressed" id="0x7f08052e" />
-    <public type="drawable" name="notification_bg_normal" id="0x7f08052f" />
-    <public type="drawable" name="notification_bg_normal_pressed" id="0x7f080530" />
-    <public type="drawable" name="notify_panel_notification_icon_bg" id="0x7f080535" />
+    <public type="drawable" name="notification_bg_low_normal" id="0x7f08052e" />
+    <public type="drawable" name="notification_bg_low_pressed" id="0x7f08052f" />
+    <public type="drawable" name="notification_bg_normal" id="0x7f080530" />
+    <public type="drawable" name="notification_bg_normal_pressed" id="0x7f080531" />
+    <public type="drawable" name="notify_panel_notification_icon_bg" id="0x7f080536" />
     <public type="drawable" name="asset_security" id="0x7f080090" />
     <public type="drawable" name="common_full_open_on_phone" id="0x7f0800b8" />
     <public type="drawable" name="ic_role_lock" id="0x7f0803e5" />
-    <public type="drawable" name="img_wump_trash_dark" id="0x7f080518" />
+    <public type="drawable" name="img_wump_trash_dark" id="0x7f080519" />
     <public type="drawable" name="asset_broken_results_dark" id="0x7f080075" />
     <public type="drawable" name="asset_broken_results_light" id="0x7f080076" />
     <public type="drawable" name="asset_default_avatar_80dp" id="0x7f080079" />
@@ -3808,19 +3810,19 @@
     <public type="drawable" name="ic_group_leave" id="0x7f08030e" />
     <public type="drawable" name="ic_img_selected_dark_theme" id="0x7f08033e" />
     <public type="drawable" name="ic_img_selected_light_theme" id="0x7f08033f" />
-    <public type="drawable" name="ic_smiley_desaturated" id="0x7f080409" />
-    <public type="drawable" name="ic_ternary_neutral_checked" id="0x7f080428" />
-    <public type="drawable" name="ic_ternary_neutral_unchecked" id="0x7f080429" />
-    <public type="drawable" name="ic_ternary_off_checked" id="0x7f08042a" />
-    <public type="drawable" name="ic_ternary_off_disabled" id="0x7f08042b" />
-    <public type="drawable" name="ic_ternary_off_unchecked" id="0x7f08042c" />
-    <public type="drawable" name="ic_ternary_on_checked" id="0x7f08042d" />
-    <public type="drawable" name="ic_ternary_on_unchecked" id="0x7f08042e" />
-    <public type="drawable" name="img_nitro_splash_dark" id="0x7f0804ed" />
-    <public type="drawable" name="img_nitro_splash_light" id="0x7f0804ee" />
-    <public type="drawable" name="img_permission_prime" id="0x7f0804fa" />
-    <public type="drawable" name="img_voice_no_connections_dark" id="0x7f080515" />
-    <public type="drawable" name="img_voice_no_connections_light" id="0x7f080516" />
+    <public type="drawable" name="ic_smiley_desaturated" id="0x7f08040a" />
+    <public type="drawable" name="ic_ternary_neutral_checked" id="0x7f080429" />
+    <public type="drawable" name="ic_ternary_neutral_unchecked" id="0x7f08042a" />
+    <public type="drawable" name="ic_ternary_off_checked" id="0x7f08042b" />
+    <public type="drawable" name="ic_ternary_off_disabled" id="0x7f08042c" />
+    <public type="drawable" name="ic_ternary_off_unchecked" id="0x7f08042d" />
+    <public type="drawable" name="ic_ternary_on_checked" id="0x7f08042e" />
+    <public type="drawable" name="ic_ternary_on_unchecked" id="0x7f08042f" />
+    <public type="drawable" name="img_nitro_splash_dark" id="0x7f0804ee" />
+    <public type="drawable" name="img_nitro_splash_light" id="0x7f0804ef" />
+    <public type="drawable" name="img_permission_prime" id="0x7f0804fb" />
+    <public type="drawable" name="img_voice_no_connections_dark" id="0x7f080516" />
+    <public type="drawable" name="img_voice_no_connections_light" id="0x7f080517" />
     <public type="drawable" name="asset_account_sync_twitch" id="0x7f080073" />
     <public type="drawable" name="asset_account_sync_youtube" id="0x7f080074" />
     <public type="drawable" name="asset_default_avatar_32dp" id="0x7f080077" />
@@ -3837,51 +3839,51 @@
     <public type="drawable" name="ic_notification_friends_24dp" id="0x7f08038d" />
     <public type="drawable" name="ic_notification_message_24dp" id="0x7f08038e" />
     <public type="drawable" name="ic_search" id="0x7f0803e9" />
-    <public type="drawable" name="ic_send_white_24dp" id="0x7f0803f1" />
-    <public type="drawable" name="ic_signal_cellular_connected_no_internet_4_bar_white_18dp" id="0x7f080405" />
-    <public type="drawable" name="ic_unavailable_server_46dp" id="0x7f08043c" />
-    <public type="drawable" name="icon_flag_au" id="0x7f08047e" />
-    <public type="drawable" name="icon_flag_bg" id="0x7f08047f" />
-    <public type="drawable" name="icon_flag_cs" id="0x7f080480" />
-    <public type="drawable" name="icon_flag_da" id="0x7f080481" />
-    <public type="drawable" name="icon_flag_de" id="0x7f080482" />
-    <public type="drawable" name="icon_flag_el" id="0x7f080483" />
-    <public type="drawable" name="icon_flag_en_gb" id="0x7f080484" />
-    <public type="drawable" name="icon_flag_en_us" id="0x7f080485" />
-    <public type="drawable" name="icon_flag_es_es" id="0x7f080486" />
-    <public type="drawable" name="icon_flag_eu" id="0x7f080487" />
-    <public type="drawable" name="icon_flag_fi" id="0x7f080488" />
-    <public type="drawable" name="icon_flag_fr" id="0x7f080489" />
-    <public type="drawable" name="icon_flag_gb" id="0x7f08048a" />
-    <public type="drawable" name="icon_flag_hk" id="0x7f08048b" />
-    <public type="drawable" name="icon_flag_hr" id="0x7f08048c" />
-    <public type="drawable" name="icon_flag_hu" id="0x7f08048d" />
-    <public type="drawable" name="icon_flag_it" id="0x7f08048e" />
-    <public type="drawable" name="icon_flag_ja" id="0x7f08048f" />
-    <public type="drawable" name="icon_flag_ko" id="0x7f080490" />
-    <public type="drawable" name="icon_flag_lt" id="0x7f080491" />
-    <public type="drawable" name="icon_flag_nl" id="0x7f080492" />
-    <public type="drawable" name="icon_flag_no" id="0x7f080493" />
-    <public type="drawable" name="icon_flag_pl" id="0x7f080494" />
-    <public type="drawable" name="icon_flag_pt_br" id="0x7f080495" />
-    <public type="drawable" name="icon_flag_ro" id="0x7f080496" />
-    <public type="drawable" name="icon_flag_ru" id="0x7f080497" />
-    <public type="drawable" name="icon_flag_sg" id="0x7f080498" />
-    <public type="drawable" name="icon_flag_sv_se" id="0x7f080499" />
-    <public type="drawable" name="icon_flag_th" id="0x7f08049a" />
-    <public type="drawable" name="icon_flag_tr" id="0x7f08049b" />
-    <public type="drawable" name="icon_flag_uk" id="0x7f08049c" />
-    <public type="drawable" name="icon_flag_unknown" id="0x7f08049d" />
-    <public type="drawable" name="icon_flag_vi" id="0x7f08049e" />
-    <public type="drawable" name="icon_flag_zh_cn" id="0x7f08049f" />
-    <public type="drawable" name="icon_flag_zh_tw" id="0x7f0804a0" />
-    <public type="drawable" name="img_auth_bg_dark" id="0x7f0804a9" />
-    <public type="drawable" name="img_auth_bg_light" id="0x7f0804aa" />
-    <public type="drawable" name="img_gifting_pattern_dark" id="0x7f0804d2" />
-    <public type="drawable" name="img_gifting_pattern_light" id="0x7f0804d3" />
-    <public type="drawable" name="img_landing_bg_dark" id="0x7f0804d9" />
-    <public type="drawable" name="img_landing_bg_light" id="0x7f0804da" />
-    <public type="drawable" name="img_loading_clyde" id="0x7f0804db" />
+    <public type="drawable" name="ic_send_white_24dp" id="0x7f0803f2" />
+    <public type="drawable" name="ic_signal_cellular_connected_no_internet_4_bar_white_18dp" id="0x7f080406" />
+    <public type="drawable" name="ic_unavailable_server_46dp" id="0x7f08043d" />
+    <public type="drawable" name="icon_flag_au" id="0x7f08047f" />
+    <public type="drawable" name="icon_flag_bg" id="0x7f080480" />
+    <public type="drawable" name="icon_flag_cs" id="0x7f080481" />
+    <public type="drawable" name="icon_flag_da" id="0x7f080482" />
+    <public type="drawable" name="icon_flag_de" id="0x7f080483" />
+    <public type="drawable" name="icon_flag_el" id="0x7f080484" />
+    <public type="drawable" name="icon_flag_en_gb" id="0x7f080485" />
+    <public type="drawable" name="icon_flag_en_us" id="0x7f080486" />
+    <public type="drawable" name="icon_flag_es_es" id="0x7f080487" />
+    <public type="drawable" name="icon_flag_eu" id="0x7f080488" />
+    <public type="drawable" name="icon_flag_fi" id="0x7f080489" />
+    <public type="drawable" name="icon_flag_fr" id="0x7f08048a" />
+    <public type="drawable" name="icon_flag_gb" id="0x7f08048b" />
+    <public type="drawable" name="icon_flag_hk" id="0x7f08048c" />
+    <public type="drawable" name="icon_flag_hr" id="0x7f08048d" />
+    <public type="drawable" name="icon_flag_hu" id="0x7f08048e" />
+    <public type="drawable" name="icon_flag_it" id="0x7f08048f" />
+    <public type="drawable" name="icon_flag_ja" id="0x7f080490" />
+    <public type="drawable" name="icon_flag_ko" id="0x7f080491" />
+    <public type="drawable" name="icon_flag_lt" id="0x7f080492" />
+    <public type="drawable" name="icon_flag_nl" id="0x7f080493" />
+    <public type="drawable" name="icon_flag_no" id="0x7f080494" />
+    <public type="drawable" name="icon_flag_pl" id="0x7f080495" />
+    <public type="drawable" name="icon_flag_pt_br" id="0x7f080496" />
+    <public type="drawable" name="icon_flag_ro" id="0x7f080497" />
+    <public type="drawable" name="icon_flag_ru" id="0x7f080498" />
+    <public type="drawable" name="icon_flag_sg" id="0x7f080499" />
+    <public type="drawable" name="icon_flag_sv_se" id="0x7f08049a" />
+    <public type="drawable" name="icon_flag_th" id="0x7f08049b" />
+    <public type="drawable" name="icon_flag_tr" id="0x7f08049c" />
+    <public type="drawable" name="icon_flag_uk" id="0x7f08049d" />
+    <public type="drawable" name="icon_flag_unknown" id="0x7f08049e" />
+    <public type="drawable" name="icon_flag_vi" id="0x7f08049f" />
+    <public type="drawable" name="icon_flag_zh_cn" id="0x7f0804a0" />
+    <public type="drawable" name="icon_flag_zh_tw" id="0x7f0804a1" />
+    <public type="drawable" name="img_auth_bg_dark" id="0x7f0804aa" />
+    <public type="drawable" name="img_auth_bg_light" id="0x7f0804ab" />
+    <public type="drawable" name="img_gifting_pattern_dark" id="0x7f0804d3" />
+    <public type="drawable" name="img_gifting_pattern_light" id="0x7f0804d4" />
+    <public type="drawable" name="img_landing_bg_dark" id="0x7f0804da" />
+    <public type="drawable" name="img_landing_bg_light" id="0x7f0804db" />
+    <public type="drawable" name="img_loading_clyde" id="0x7f0804dc" />
     <public type="drawable" name="asset_empty_mentions_arm_dark" id="0x7f08007a" />
     <public type="drawable" name="asset_empty_mentions_arm_light" id="0x7f08007b" />
     <public type="drawable" name="asset_empty_mentions_hand_dark" id="0x7f08007c" />
@@ -3895,18 +3897,18 @@
     <public type="drawable" name="ic_hypesquad_house1_winner_32dp" id="0x7f080337" />
     <public type="drawable" name="ic_hypesquad_house2_winner_32dp" id="0x7f080339" />
     <public type="drawable" name="ic_hypesquad_house3_winner_32dp" id="0x7f08033b" />
-    <public type="drawable" name="icon_carrot" id="0x7f08047c" />
-    <public type="drawable" name="icon_deafened_small" id="0x7f08047d" />
-    <public type="drawable" name="icon_menu_copy" id="0x7f0804a1" />
-    <public type="drawable" name="icon_muted_small" id="0x7f0804a2" />
-    <public type="drawable" name="icon_save" id="0x7f0804a3" />
-    <public type="drawable" name="img_auth_logo" id="0x7f0804ab" />
-    <public type="drawable" name="img_auth_logo_small" id="0x7f0804ac" />
-    <public type="drawable" name="img_channels_onboarding_dark" id="0x7f0804ba" />
-    <public type="drawable" name="img_channels_onboarding_light" id="0x7f0804bb" />
-    <public type="drawable" name="img_game_presence_nux" id="0x7f0804cd" />
-    <public type="drawable" name="img_overlay_nux" id="0x7f0804f9" />
-    <public type="drawable" name="img_voice_onboarding" id="0x7f080517" />
+    <public type="drawable" name="icon_carrot" id="0x7f08047d" />
+    <public type="drawable" name="icon_deafened_small" id="0x7f08047e" />
+    <public type="drawable" name="icon_menu_copy" id="0x7f0804a2" />
+    <public type="drawable" name="icon_muted_small" id="0x7f0804a3" />
+    <public type="drawable" name="icon_save" id="0x7f0804a4" />
+    <public type="drawable" name="img_auth_logo" id="0x7f0804ac" />
+    <public type="drawable" name="img_auth_logo_small" id="0x7f0804ad" />
+    <public type="drawable" name="img_channels_onboarding_dark" id="0x7f0804bb" />
+    <public type="drawable" name="img_channels_onboarding_light" id="0x7f0804bc" />
+    <public type="drawable" name="img_game_presence_nux" id="0x7f0804ce" />
+    <public type="drawable" name="img_overlay_nux" id="0x7f0804fa" />
+    <public type="drawable" name="img_voice_onboarding" id="0x7f080518" />
     <public type="drawable" name="$bg_premium_classic_subscription_header__0" id="0x7f080006" />
     <public type="drawable" name="$bg_premium_guild_subscription_header__0" id="0x7f080007" />
     <public type="drawable" name="$bg_premium_guild_subscription_header_error__0" id="0x7f080008" />
@@ -16009,248 +16011,249 @@
     <public type="string" name="user_settings_my_account" id="0x7f12156a" />
     <public type="string" name="user_settings_noise_cancellation" id="0x7f12156b" />
     <public type="string" name="user_settings_noise_cancellation_description" id="0x7f12156c" />
-    <public type="string" name="user_settings_notifications_show_badge_body" id="0x7f12156d" />
-    <public type="string" name="user_settings_notifications_show_badge_label" id="0x7f12156e" />
-    <public type="string" name="user_settings_notifications_show_flash_body" id="0x7f12156f" />
-    <public type="string" name="user_settings_notifications_show_flash_label" id="0x7f121570" />
-    <public type="string" name="user_settings_open_on_startup_body" id="0x7f121571" />
-    <public type="string" name="user_settings_open_on_startup_label" id="0x7f121572" />
-    <public type="string" name="user_settings_privacy_terms" id="0x7f121573" />
-    <public type="string" name="user_settings_restart_app_mobile" id="0x7f121574" />
-    <public type="string" name="user_settings_save" id="0x7f121575" />
-    <public type="string" name="user_settings_scan_qr_code" id="0x7f121576" />
-    <public type="string" name="user_settings_show_library" id="0x7f121577" />
-    <public type="string" name="user_settings_show_library_note" id="0x7f121578" />
-    <public type="string" name="user_settings_start_minimized_body" id="0x7f121579" />
-    <public type="string" name="user_settings_start_minimized_label" id="0x7f12157a" />
-    <public type="string" name="user_settings_startup_behavior" id="0x7f12157b" />
-    <public type="string" name="user_settings_streamer_notice_body" id="0x7f12157c" />
-    <public type="string" name="user_settings_streamer_notice_title" id="0x7f12157d" />
-    <public type="string" name="user_settings_unverified_account_body" id="0x7f12157e" />
-    <public type="string" name="user_settings_used_backup_codes" id="0x7f12157f" />
-    <public type="string" name="user_settings_voice_add_multiple" id="0x7f121580" />
-    <public type="string" name="user_settings_voice_codec_description" id="0x7f121581" />
-    <public type="string" name="user_settings_voice_codec_title" id="0x7f121582" />
-    <public type="string" name="user_settings_voice_experimental_soundshare_label" id="0x7f121583" />
-    <public type="string" name="user_settings_voice_hardware_h264" id="0x7f121584" />
-    <public type="string" name="user_settings_voice_mic_test_button_active" id="0x7f121585" />
-    <public type="string" name="user_settings_voice_mic_test_button_inactive" id="0x7f121586" />
-    <public type="string" name="user_settings_voice_mic_test_description" id="0x7f121587" />
-    <public type="string" name="user_settings_voice_mic_test_title" id="0x7f121588" />
-    <public type="string" name="user_settings_voice_mic_test_voice_caption" id="0x7f121589" />
-    <public type="string" name="user_settings_voice_mic_test_voice_no_input_notice" id="0x7f12158a" />
-    <public type="string" name="user_settings_voice_open_h264" id="0x7f12158b" />
-    <public type="string" name="user_settings_voice_video_codec_title" id="0x7f12158c" />
-    <public type="string" name="user_settings_voice_video_hook_label" id="0x7f12158d" />
-    <public type="string" name="user_settings_windows_settings" id="0x7f12158e" />
-    <public type="string" name="user_settings_with_build_override" id="0x7f12158f" />
-    <public type="string" name="user_volume" id="0x7f121590" />
-    <public type="string" name="username" id="0x7f121591" />
-    <public type="string" name="username_and_tag" id="0x7f121592" />
-    <public type="string" name="username_live" id="0x7f121593" />
-    <public type="string" name="username_required" id="0x7f121594" />
-    <public type="string" name="users" id="0x7f121595" />
-    <public type="string" name="v7_preference_off" id="0x7f121596" />
-    <public type="string" name="v7_preference_on" id="0x7f121597" />
-    <public type="string" name="vad_permission_body" id="0x7f121598" />
-    <public type="string" name="vad_permission_small" id="0x7f121599" />
-    <public type="string" name="vad_permission_title" id="0x7f12159a" />
-    <public type="string" name="vanity_url" id="0x7f12159b" />
-    <public type="string" name="vanity_url_help" id="0x7f12159c" />
-    <public type="string" name="vanity_url_help_conflict" id="0x7f12159d" />
-    <public type="string" name="vanity_url_help_extended" id="0x7f12159e" />
-    <public type="string" name="vanity_url_help_extended_link" id="0x7f12159f" />
-    <public type="string" name="vanity_url_hint_mobile" id="0x7f1215a0" />
-    <public type="string" name="vanity_url_uses" id="0x7f1215a1" />
-    <public type="string" name="verfication_expired" id="0x7f1215a2" />
-    <public type="string" name="verification_body" id="0x7f1215a3" />
-    <public type="string" name="verification_body_alt" id="0x7f1215a4" />
-    <public type="string" name="verification_email_body" id="0x7f1215a5" />
-    <public type="string" name="verification_email_error_body" id="0x7f1215a6" />
-    <public type="string" name="verification_email_error_title" id="0x7f1215a7" />
-    <public type="string" name="verification_email_title" id="0x7f1215a8" />
-    <public type="string" name="verification_footer" id="0x7f1215a9" />
-    <public type="string" name="verification_footer_logout" id="0x7f1215aa" />
-    <public type="string" name="verification_footer_support" id="0x7f1215ab" />
-    <public type="string" name="verification_level_high_criteria" id="0x7f1215ac" />
-    <public type="string" name="verification_level_low" id="0x7f1215ad" />
-    <public type="string" name="verification_level_low_criteria" id="0x7f1215ae" />
-    <public type="string" name="verification_level_medium" id="0x7f1215af" />
-    <public type="string" name="verification_level_medium_criteria" id="0x7f1215b0" />
-    <public type="string" name="verification_level_none" id="0x7f1215b1" />
-    <public type="string" name="verification_level_none_criteria" id="0x7f1215b2" />
-    <public type="string" name="verification_level_very_high_criteria" id="0x7f1215b3" />
-    <public type="string" name="verification_open_discord" id="0x7f1215b4" />
-    <public type="string" name="verification_phone_description" id="0x7f1215b5" />
-    <public type="string" name="verification_phone_title" id="0x7f1215b6" />
-    <public type="string" name="verification_title" id="0x7f1215b7" />
-    <public type="string" name="verification_verified" id="0x7f1215b8" />
-    <public type="string" name="verification_verifying" id="0x7f1215b9" />
-    <public type="string" name="verified_bot_tooltip" id="0x7f1215ba" />
-    <public type="string" name="verified_developer_badge_tooltip" id="0x7f1215bb" />
-    <public type="string" name="verify" id="0x7f1215bc" />
-    <public type="string" name="verify_account" id="0x7f1215bd" />
-    <public type="string" name="verify_by" id="0x7f1215be" />
-    <public type="string" name="verify_by_email" id="0x7f1215bf" />
-    <public type="string" name="verify_by_email_formatted" id="0x7f1215c0" />
-    <public type="string" name="verify_by_phone_formatted" id="0x7f1215c1" />
-    <public type="string" name="verify_by_recaptcha" id="0x7f1215c2" />
-    <public type="string" name="verify_by_recaptcha_description" id="0x7f1215c3" />
-    <public type="string" name="verify_email_body" id="0x7f1215c4" />
-    <public type="string" name="verify_email_body_resent" id="0x7f1215c5" />
-    <public type="string" name="verify_phone" id="0x7f1215c6" />
-    <public type="string" name="verifying" id="0x7f1215c7" />
-    <public type="string" name="very_out_of_date_description" id="0x7f1215c8" />
-    <public type="string" name="vi" id="0x7f1215c9" />
-    <public type="string" name="video" id="0x7f1215ca" />
-    <public type="string" name="video_call_auto_select" id="0x7f1215cb" />
-    <public type="string" name="video_call_hide_members" id="0x7f1215cc" />
-    <public type="string" name="video_call_return_to_grid" id="0x7f1215cd" />
-    <public type="string" name="video_call_return_to_list" id="0x7f1215ce" />
-    <public type="string" name="video_call_show_members" id="0x7f1215cf" />
-    <public type="string" name="video_capacity_modal_body" id="0x7f1215d0" />
-    <public type="string" name="video_capacity_modal_header" id="0x7f1215d1" />
-    <public type="string" name="video_playback_mute_accessibility_label" id="0x7f1215d2" />
-    <public type="string" name="video_playback_unmute_accessibility_label" id="0x7f1215d3" />
-    <public type="string" name="video_poor_connection_body" id="0x7f1215d4" />
-    <public type="string" name="video_poor_connection_title" id="0x7f1215d5" />
-    <public type="string" name="video_settings" id="0x7f1215d6" />
-    <public type="string" name="video_unavailable" id="0x7f1215d7" />
-    <public type="string" name="video_unsupported_browser_body" id="0x7f1215d8" />
-    <public type="string" name="video_unsupported_browser_title" id="0x7f1215d9" />
-    <public type="string" name="view_audit_log" id="0x7f1215da" />
-    <public type="string" name="view_audit_log_description" id="0x7f1215db" />
-    <public type="string" name="view_channel" id="0x7f1215dc" />
-    <public type="string" name="view_embed" id="0x7f1215dd" />
-    <public type="string" name="view_guild_analytics" id="0x7f1215de" />
-    <public type="string" name="view_guild_analytics_description" id="0x7f1215df" />
-    <public type="string" name="view_profile" id="0x7f1215e0" />
-    <public type="string" name="view_spectators" id="0x7f1215e1" />
-    <public type="string" name="view_surrounding_messages" id="0x7f1215e2" />
-    <public type="string" name="voice" id="0x7f1215e3" />
-    <public type="string" name="voice_and_video" id="0x7f1215e4" />
-    <public type="string" name="voice_call_member_list_title" id="0x7f1215e5" />
-    <public type="string" name="voice_channel" id="0x7f1215e6" />
-    <public type="string" name="voice_channel_deafened" id="0x7f1215e7" />
-    <public type="string" name="voice_channel_empty" id="0x7f1215e8" />
-    <public type="string" name="voice_channel_hide_names" id="0x7f1215e9" />
-    <public type="string" name="voice_channel_muted" id="0x7f1215ea" />
-    <public type="string" name="voice_channel_show_names" id="0x7f1215eb" />
-    <public type="string" name="voice_channel_subtitle" id="0x7f1215ec" />
-    <public type="string" name="voice_channel_title" id="0x7f1215ed" />
-    <public type="string" name="voice_channels" id="0x7f1215ee" />
-    <public type="string" name="voice_permissions" id="0x7f1215ef" />
-    <public type="string" name="voice_settings" id="0x7f1215f0" />
-    <public type="string" name="voice_status_connecting" id="0x7f1215f1" />
-    <public type="string" name="voice_status_not_connected" id="0x7f1215f2" />
-    <public type="string" name="voice_status_not_connected_mobile" id="0x7f1215f3" />
-    <public type="string" name="voice_status_ringing" id="0x7f1215f4" />
-    <public type="string" name="voice_unavailable" id="0x7f1215f5" />
-    <public type="string" name="watch" id="0x7f1215f6" />
-    <public type="string" name="watch_stream" id="0x7f1215f7" />
-    <public type="string" name="watch_stream_in_app" id="0x7f1215f8" />
-    <public type="string" name="watch_stream_streaming" id="0x7f1215f9" />
-    <public type="string" name="watch_stream_tip" id="0x7f1215fa" />
-    <public type="string" name="watch_stream_watching" id="0x7f1215fb" />
-    <public type="string" name="watch_user_stream" id="0x7f1215fc" />
-    <public type="string" name="watching" id="0x7f1215fd" />
-    <public type="string" name="web_browser" id="0x7f1215fe" />
-    <public type="string" name="web_browser_chrome" id="0x7f1215ff" />
-    <public type="string" name="web_browser_in_app" id="0x7f121600" />
-    <public type="string" name="web_browser_safari" id="0x7f121601" />
-    <public type="string" name="webhook_cancel" id="0x7f121602" />
-    <public type="string" name="webhook_create" id="0x7f121603" />
-    <public type="string" name="webhook_created_on" id="0x7f121604" />
-    <public type="string" name="webhook_delete" id="0x7f121605" />
-    <public type="string" name="webhook_delete_body" id="0x7f121606" />
-    <public type="string" name="webhook_delete_title" id="0x7f121607" />
-    <public type="string" name="webhook_error_creating_webhook" id="0x7f121608" />
-    <public type="string" name="webhook_error_deleting_webhook" id="0x7f121609" />
-    <public type="string" name="webhook_error_internal_server_error" id="0x7f12160a" />
-    <public type="string" name="webhook_error_max_webhooks_reached" id="0x7f12160b" />
-    <public type="string" name="webhook_form_name" id="0x7f12160c" />
-    <public type="string" name="webhook_form_url" id="0x7f12160d" />
-    <public type="string" name="webhook_form_webhook_url_help" id="0x7f12160e" />
-    <public type="string" name="webhook_modal_icon_description" id="0x7f12160f" />
-    <public type="string" name="webhook_modal_icon_title" id="0x7f121610" />
-    <public type="string" name="webhook_modal_title" id="0x7f121611" />
-    <public type="string" name="webhooks" id="0x7f121612" />
-    <public type="string" name="welcome_channel_delete_confirm_body" id="0x7f121613" />
-    <public type="string" name="welcome_channel_delete_confirm_body_generic" id="0x7f121614" />
-    <public type="string" name="welcome_channel_delete_confirm_title" id="0x7f121615" />
-    <public type="string" name="welcome_message_desktop_apps" id="0x7f121616" />
-    <public type="string" name="welcome_message_edit_channel" id="0x7f121617" />
-    <public type="string" name="welcome_message_instant_invite" id="0x7f121618" />
-    <public type="string" name="welcome_message_mobile_apps" id="0x7f121619" />
-    <public type="string" name="welcome_message_mobile_explore_server" id="0x7f12161a" />
-    <public type="string" name="welcome_message_mobile_explore_server_desc" id="0x7f12161b" />
-    <public type="string" name="welcome_message_mobile_instant_invite" id="0x7f12161c" />
-    <public type="string" name="welcome_message_mobile_instant_invite_desc" id="0x7f12161d" />
-    <public type="string" name="welcome_message_mobile_owner_subtitle" id="0x7f12161e" />
-    <public type="string" name="welcome_message_mobile_owner_title" id="0x7f12161f" />
-    <public type="string" name="welcome_message_mobile_upload_icon" id="0x7f121620" />
-    <public type="string" name="welcome_message_mobile_upload_icon_desc" id="0x7f121621" />
-    <public type="string" name="welcome_message_owner_title" id="0x7f121622" />
-    <public type="string" name="welcome_message_setup_server" id="0x7f121623" />
-    <public type="string" name="welcome_message_subtitle_channel" id="0x7f121624" />
-    <public type="string" name="welcome_message_support" id="0x7f121625" />
-    <public type="string" name="welcome_message_title" id="0x7f121626" />
-    <public type="string" name="welcome_message_title_channel" id="0x7f121627" />
-    <public type="string" name="welcome_message_tutorial" id="0x7f121628" />
-    <public type="string" name="welcome_screen_choice_header" id="0x7f121629" />
-    <public type="string" name="welcome_screen_skip" id="0x7f12162a" />
-    <public type="string" name="welcome_screen_title" id="0x7f12162b" />
-    <public type="string" name="whats_new" id="0x7f12162c" />
-    <public type="string" name="whats_new_date" id="0x7f12162d" />
-    <public type="string" name="whitelist_failed" id="0x7f12162e" />
-    <public type="string" name="whitelisted" id="0x7f12162f" />
-    <public type="string" name="whitelisting" id="0x7f121630" />
-    <public type="string" name="widget" id="0x7f121631" />
-    <public type="string" name="windows" id="0x7f121632" />
-    <public type="string" name="wumpus" id="0x7f121633" />
-    <public type="string" name="xbox_authorization_title" id="0x7f121634" />
-    <public type="string" name="xbox_game_pass_card_body_redeemed" id="0x7f121635" />
-    <public type="string" name="xbox_game_pass_card_body_unredeemed" id="0x7f121636" />
-    <public type="string" name="xbox_game_pass_modal_code_description" id="0x7f121637" />
-    <public type="string" name="xbox_game_pass_modal_code_header" id="0x7f121638" />
-    <public type="string" name="xbox_game_pass_modal_header_confirm_pc" id="0x7f121639" />
-    <public type="string" name="xbox_game_pass_modal_header_confirm_xbox" id="0x7f12163a" />
-    <public type="string" name="xbox_game_pass_modal_header_description_confirm_pc" id="0x7f12163b" />
-    <public type="string" name="xbox_game_pass_modal_header_description_confirm_xbox" id="0x7f12163c" />
-    <public type="string" name="xbox_game_pass_modal_header_description_plan_select" id="0x7f12163d" />
-    <public type="string" name="xbox_game_pass_modal_header_description_success" id="0x7f12163e" />
-    <public type="string" name="xbox_game_pass_modal_header_plan_select" id="0x7f12163f" />
-    <public type="string" name="xbox_game_pass_modal_header_success" id="0x7f121640" />
-    <public type="string" name="xbox_game_pass_modal_plan_select_header" id="0x7f121641" />
-    <public type="string" name="xbox_game_pass_modal_plan_select_pc_plan" id="0x7f121642" />
-    <public type="string" name="xbox_game_pass_modal_plan_select_plan_duration" id="0x7f121643" />
-    <public type="string" name="xbox_game_pass_modal_plan_select_xbox_plan" id="0x7f121644" />
-    <public type="string" name="xbox_game_pass_modal_redeem_button_pc" id="0x7f121645" />
-    <public type="string" name="xbox_game_pass_modal_redeem_button_xbox" id="0x7f121646" />
-    <public type="string" name="xbox_game_pass_promotion_account_credit_body" id="0x7f121647" />
-    <public type="string" name="xbox_game_pass_promotion_account_credit_button" id="0x7f121648" />
-    <public type="string" name="xbox_game_pass_promotion_account_credit_confirm_body" id="0x7f121649" />
-    <public type="string" name="xbox_game_pass_promotion_account_credit_confirm_title" id="0x7f12164a" />
-    <public type="string" name="xbox_game_pass_promotion_account_credit_title" id="0x7f12164b" />
-    <public type="string" name="xbox_game_pass_promotion_banner_description" id="0x7f12164c" />
-    <public type="string" name="xbox_game_pass_promotion_banner_header" id="0x7f12164d" />
-    <public type="string" name="xbox_game_pass_promotion_card_company_logo_label" id="0x7f12164e" />
-    <public type="string" name="xbox_game_pass_promotion_card_header" id="0x7f12164f" />
-    <public type="string" name="xbox_game_pass_promotion_existing_subscriber_body" id="0x7f121650" />
-    <public type="string" name="xbox_game_pass_promotion_existing_subscriber_title" id="0x7f121651" />
-    <public type="string" name="xbox_game_pass_promotion_redeem_body" id="0x7f121652" />
-    <public type="string" name="xbox_link" id="0x7f121653" />
-    <public type="string" name="xbox_pin_step1" id="0x7f121654" />
-    <public type="string" name="xbox_pin_step2" id="0x7f121655" />
-    <public type="string" name="xbox_pin_step3" id="0x7f121656" />
-    <public type="string" name="yearly" id="0x7f121657" />
-    <public type="string" name="yellow" id="0x7f121658" />
-    <public type="string" name="yes_text" id="0x7f121659" />
-    <public type="string" name="your_pin_expires" id="0x7f12165a" />
-    <public type="string" name="your_pin_is_expired" id="0x7f12165b" />
-    <public type="string" name="youre_viewing_older_messages" id="0x7f12165c" />
-    <public type="string" name="zh_cn" id="0x7f12165d" />
-    <public type="string" name="zh_tw" id="0x7f12165e" />
+    <public type="string" name="user_settings_noise_cancellation_model" id="0x7f12156d" />
+    <public type="string" name="user_settings_notifications_show_badge_body" id="0x7f12156e" />
+    <public type="string" name="user_settings_notifications_show_badge_label" id="0x7f12156f" />
+    <public type="string" name="user_settings_notifications_show_flash_body" id="0x7f121570" />
+    <public type="string" name="user_settings_notifications_show_flash_label" id="0x7f121571" />
+    <public type="string" name="user_settings_open_on_startup_body" id="0x7f121572" />
+    <public type="string" name="user_settings_open_on_startup_label" id="0x7f121573" />
+    <public type="string" name="user_settings_privacy_terms" id="0x7f121574" />
+    <public type="string" name="user_settings_restart_app_mobile" id="0x7f121575" />
+    <public type="string" name="user_settings_save" id="0x7f121576" />
+    <public type="string" name="user_settings_scan_qr_code" id="0x7f121577" />
+    <public type="string" name="user_settings_show_library" id="0x7f121578" />
+    <public type="string" name="user_settings_show_library_note" id="0x7f121579" />
+    <public type="string" name="user_settings_start_minimized_body" id="0x7f12157a" />
+    <public type="string" name="user_settings_start_minimized_label" id="0x7f12157b" />
+    <public type="string" name="user_settings_startup_behavior" id="0x7f12157c" />
+    <public type="string" name="user_settings_streamer_notice_body" id="0x7f12157d" />
+    <public type="string" name="user_settings_streamer_notice_title" id="0x7f12157e" />
+    <public type="string" name="user_settings_unverified_account_body" id="0x7f12157f" />
+    <public type="string" name="user_settings_used_backup_codes" id="0x7f121580" />
+    <public type="string" name="user_settings_voice_add_multiple" id="0x7f121581" />
+    <public type="string" name="user_settings_voice_codec_description" id="0x7f121582" />
+    <public type="string" name="user_settings_voice_codec_title" id="0x7f121583" />
+    <public type="string" name="user_settings_voice_experimental_soundshare_label" id="0x7f121584" />
+    <public type="string" name="user_settings_voice_hardware_h264" id="0x7f121585" />
+    <public type="string" name="user_settings_voice_mic_test_button_active" id="0x7f121586" />
+    <public type="string" name="user_settings_voice_mic_test_button_inactive" id="0x7f121587" />
+    <public type="string" name="user_settings_voice_mic_test_description" id="0x7f121588" />
+    <public type="string" name="user_settings_voice_mic_test_title" id="0x7f121589" />
+    <public type="string" name="user_settings_voice_mic_test_voice_caption" id="0x7f12158a" />
+    <public type="string" name="user_settings_voice_mic_test_voice_no_input_notice" id="0x7f12158b" />
+    <public type="string" name="user_settings_voice_open_h264" id="0x7f12158c" />
+    <public type="string" name="user_settings_voice_video_codec_title" id="0x7f12158d" />
+    <public type="string" name="user_settings_voice_video_hook_label" id="0x7f12158e" />
+    <public type="string" name="user_settings_windows_settings" id="0x7f12158f" />
+    <public type="string" name="user_settings_with_build_override" id="0x7f121590" />
+    <public type="string" name="user_volume" id="0x7f121591" />
+    <public type="string" name="username" id="0x7f121592" />
+    <public type="string" name="username_and_tag" id="0x7f121593" />
+    <public type="string" name="username_live" id="0x7f121594" />
+    <public type="string" name="username_required" id="0x7f121595" />
+    <public type="string" name="users" id="0x7f121596" />
+    <public type="string" name="v7_preference_off" id="0x7f121597" />
+    <public type="string" name="v7_preference_on" id="0x7f121598" />
+    <public type="string" name="vad_permission_body" id="0x7f121599" />
+    <public type="string" name="vad_permission_small" id="0x7f12159a" />
+    <public type="string" name="vad_permission_title" id="0x7f12159b" />
+    <public type="string" name="vanity_url" id="0x7f12159c" />
+    <public type="string" name="vanity_url_help" id="0x7f12159d" />
+    <public type="string" name="vanity_url_help_conflict" id="0x7f12159e" />
+    <public type="string" name="vanity_url_help_extended" id="0x7f12159f" />
+    <public type="string" name="vanity_url_help_extended_link" id="0x7f1215a0" />
+    <public type="string" name="vanity_url_hint_mobile" id="0x7f1215a1" />
+    <public type="string" name="vanity_url_uses" id="0x7f1215a2" />
+    <public type="string" name="verfication_expired" id="0x7f1215a3" />
+    <public type="string" name="verification_body" id="0x7f1215a4" />
+    <public type="string" name="verification_body_alt" id="0x7f1215a5" />
+    <public type="string" name="verification_email_body" id="0x7f1215a6" />
+    <public type="string" name="verification_email_error_body" id="0x7f1215a7" />
+    <public type="string" name="verification_email_error_title" id="0x7f1215a8" />
+    <public type="string" name="verification_email_title" id="0x7f1215a9" />
+    <public type="string" name="verification_footer" id="0x7f1215aa" />
+    <public type="string" name="verification_footer_logout" id="0x7f1215ab" />
+    <public type="string" name="verification_footer_support" id="0x7f1215ac" />
+    <public type="string" name="verification_level_high_criteria" id="0x7f1215ad" />
+    <public type="string" name="verification_level_low" id="0x7f1215ae" />
+    <public type="string" name="verification_level_low_criteria" id="0x7f1215af" />
+    <public type="string" name="verification_level_medium" id="0x7f1215b0" />
+    <public type="string" name="verification_level_medium_criteria" id="0x7f1215b1" />
+    <public type="string" name="verification_level_none" id="0x7f1215b2" />
+    <public type="string" name="verification_level_none_criteria" id="0x7f1215b3" />
+    <public type="string" name="verification_level_very_high_criteria" id="0x7f1215b4" />
+    <public type="string" name="verification_open_discord" id="0x7f1215b5" />
+    <public type="string" name="verification_phone_description" id="0x7f1215b6" />
+    <public type="string" name="verification_phone_title" id="0x7f1215b7" />
+    <public type="string" name="verification_title" id="0x7f1215b8" />
+    <public type="string" name="verification_verified" id="0x7f1215b9" />
+    <public type="string" name="verification_verifying" id="0x7f1215ba" />
+    <public type="string" name="verified_bot_tooltip" id="0x7f1215bb" />
+    <public type="string" name="verified_developer_badge_tooltip" id="0x7f1215bc" />
+    <public type="string" name="verify" id="0x7f1215bd" />
+    <public type="string" name="verify_account" id="0x7f1215be" />
+    <public type="string" name="verify_by" id="0x7f1215bf" />
+    <public type="string" name="verify_by_email" id="0x7f1215c0" />
+    <public type="string" name="verify_by_email_formatted" id="0x7f1215c1" />
+    <public type="string" name="verify_by_phone_formatted" id="0x7f1215c2" />
+    <public type="string" name="verify_by_recaptcha" id="0x7f1215c3" />
+    <public type="string" name="verify_by_recaptcha_description" id="0x7f1215c4" />
+    <public type="string" name="verify_email_body" id="0x7f1215c5" />
+    <public type="string" name="verify_email_body_resent" id="0x7f1215c6" />
+    <public type="string" name="verify_phone" id="0x7f1215c7" />
+    <public type="string" name="verifying" id="0x7f1215c8" />
+    <public type="string" name="very_out_of_date_description" id="0x7f1215c9" />
+    <public type="string" name="vi" id="0x7f1215ca" />
+    <public type="string" name="video" id="0x7f1215cb" />
+    <public type="string" name="video_call_auto_select" id="0x7f1215cc" />
+    <public type="string" name="video_call_hide_members" id="0x7f1215cd" />
+    <public type="string" name="video_call_return_to_grid" id="0x7f1215ce" />
+    <public type="string" name="video_call_return_to_list" id="0x7f1215cf" />
+    <public type="string" name="video_call_show_members" id="0x7f1215d0" />
+    <public type="string" name="video_capacity_modal_body" id="0x7f1215d1" />
+    <public type="string" name="video_capacity_modal_header" id="0x7f1215d2" />
+    <public type="string" name="video_playback_mute_accessibility_label" id="0x7f1215d3" />
+    <public type="string" name="video_playback_unmute_accessibility_label" id="0x7f1215d4" />
+    <public type="string" name="video_poor_connection_body" id="0x7f1215d5" />
+    <public type="string" name="video_poor_connection_title" id="0x7f1215d6" />
+    <public type="string" name="video_settings" id="0x7f1215d7" />
+    <public type="string" name="video_unavailable" id="0x7f1215d8" />
+    <public type="string" name="video_unsupported_browser_body" id="0x7f1215d9" />
+    <public type="string" name="video_unsupported_browser_title" id="0x7f1215da" />
+    <public type="string" name="view_audit_log" id="0x7f1215db" />
+    <public type="string" name="view_audit_log_description" id="0x7f1215dc" />
+    <public type="string" name="view_channel" id="0x7f1215dd" />
+    <public type="string" name="view_embed" id="0x7f1215de" />
+    <public type="string" name="view_guild_analytics" id="0x7f1215df" />
+    <public type="string" name="view_guild_analytics_description" id="0x7f1215e0" />
+    <public type="string" name="view_profile" id="0x7f1215e1" />
+    <public type="string" name="view_spectators" id="0x7f1215e2" />
+    <public type="string" name="view_surrounding_messages" id="0x7f1215e3" />
+    <public type="string" name="voice" id="0x7f1215e4" />
+    <public type="string" name="voice_and_video" id="0x7f1215e5" />
+    <public type="string" name="voice_call_member_list_title" id="0x7f1215e6" />
+    <public type="string" name="voice_channel" id="0x7f1215e7" />
+    <public type="string" name="voice_channel_deafened" id="0x7f1215e8" />
+    <public type="string" name="voice_channel_empty" id="0x7f1215e9" />
+    <public type="string" name="voice_channel_hide_names" id="0x7f1215ea" />
+    <public type="string" name="voice_channel_muted" id="0x7f1215eb" />
+    <public type="string" name="voice_channel_show_names" id="0x7f1215ec" />
+    <public type="string" name="voice_channel_subtitle" id="0x7f1215ed" />
+    <public type="string" name="voice_channel_title" id="0x7f1215ee" />
+    <public type="string" name="voice_channels" id="0x7f1215ef" />
+    <public type="string" name="voice_permissions" id="0x7f1215f0" />
+    <public type="string" name="voice_settings" id="0x7f1215f1" />
+    <public type="string" name="voice_status_connecting" id="0x7f1215f2" />
+    <public type="string" name="voice_status_not_connected" id="0x7f1215f3" />
+    <public type="string" name="voice_status_not_connected_mobile" id="0x7f1215f4" />
+    <public type="string" name="voice_status_ringing" id="0x7f1215f5" />
+    <public type="string" name="voice_unavailable" id="0x7f1215f6" />
+    <public type="string" name="watch" id="0x7f1215f7" />
+    <public type="string" name="watch_stream" id="0x7f1215f8" />
+    <public type="string" name="watch_stream_in_app" id="0x7f1215f9" />
+    <public type="string" name="watch_stream_streaming" id="0x7f1215fa" />
+    <public type="string" name="watch_stream_tip" id="0x7f1215fb" />
+    <public type="string" name="watch_stream_watching" id="0x7f1215fc" />
+    <public type="string" name="watch_user_stream" id="0x7f1215fd" />
+    <public type="string" name="watching" id="0x7f1215fe" />
+    <public type="string" name="web_browser" id="0x7f1215ff" />
+    <public type="string" name="web_browser_chrome" id="0x7f121600" />
+    <public type="string" name="web_browser_in_app" id="0x7f121601" />
+    <public type="string" name="web_browser_safari" id="0x7f121602" />
+    <public type="string" name="webhook_cancel" id="0x7f121603" />
+    <public type="string" name="webhook_create" id="0x7f121604" />
+    <public type="string" name="webhook_created_on" id="0x7f121605" />
+    <public type="string" name="webhook_delete" id="0x7f121606" />
+    <public type="string" name="webhook_delete_body" id="0x7f121607" />
+    <public type="string" name="webhook_delete_title" id="0x7f121608" />
+    <public type="string" name="webhook_error_creating_webhook" id="0x7f121609" />
+    <public type="string" name="webhook_error_deleting_webhook" id="0x7f12160a" />
+    <public type="string" name="webhook_error_internal_server_error" id="0x7f12160b" />
+    <public type="string" name="webhook_error_max_webhooks_reached" id="0x7f12160c" />
+    <public type="string" name="webhook_form_name" id="0x7f12160d" />
+    <public type="string" name="webhook_form_url" id="0x7f12160e" />
+    <public type="string" name="webhook_form_webhook_url_help" id="0x7f12160f" />
+    <public type="string" name="webhook_modal_icon_description" id="0x7f121610" />
+    <public type="string" name="webhook_modal_icon_title" id="0x7f121611" />
+    <public type="string" name="webhook_modal_title" id="0x7f121612" />
+    <public type="string" name="webhooks" id="0x7f121613" />
+    <public type="string" name="welcome_channel_delete_confirm_body" id="0x7f121614" />
+    <public type="string" name="welcome_channel_delete_confirm_body_generic" id="0x7f121615" />
+    <public type="string" name="welcome_channel_delete_confirm_title" id="0x7f121616" />
+    <public type="string" name="welcome_message_desktop_apps" id="0x7f121617" />
+    <public type="string" name="welcome_message_edit_channel" id="0x7f121618" />
+    <public type="string" name="welcome_message_instant_invite" id="0x7f121619" />
+    <public type="string" name="welcome_message_mobile_apps" id="0x7f12161a" />
+    <public type="string" name="welcome_message_mobile_explore_server" id="0x7f12161b" />
+    <public type="string" name="welcome_message_mobile_explore_server_desc" id="0x7f12161c" />
+    <public type="string" name="welcome_message_mobile_instant_invite" id="0x7f12161d" />
+    <public type="string" name="welcome_message_mobile_instant_invite_desc" id="0x7f12161e" />
+    <public type="string" name="welcome_message_mobile_owner_subtitle" id="0x7f12161f" />
+    <public type="string" name="welcome_message_mobile_owner_title" id="0x7f121620" />
+    <public type="string" name="welcome_message_mobile_upload_icon" id="0x7f121621" />
+    <public type="string" name="welcome_message_mobile_upload_icon_desc" id="0x7f121622" />
+    <public type="string" name="welcome_message_owner_title" id="0x7f121623" />
+    <public type="string" name="welcome_message_setup_server" id="0x7f121624" />
+    <public type="string" name="welcome_message_subtitle_channel" id="0x7f121625" />
+    <public type="string" name="welcome_message_support" id="0x7f121626" />
+    <public type="string" name="welcome_message_title" id="0x7f121627" />
+    <public type="string" name="welcome_message_title_channel" id="0x7f121628" />
+    <public type="string" name="welcome_message_tutorial" id="0x7f121629" />
+    <public type="string" name="welcome_screen_choice_header" id="0x7f12162a" />
+    <public type="string" name="welcome_screen_skip" id="0x7f12162b" />
+    <public type="string" name="welcome_screen_title" id="0x7f12162c" />
+    <public type="string" name="whats_new" id="0x7f12162d" />
+    <public type="string" name="whats_new_date" id="0x7f12162e" />
+    <public type="string" name="whitelist_failed" id="0x7f12162f" />
+    <public type="string" name="whitelisted" id="0x7f121630" />
+    <public type="string" name="whitelisting" id="0x7f121631" />
+    <public type="string" name="widget" id="0x7f121632" />
+    <public type="string" name="windows" id="0x7f121633" />
+    <public type="string" name="wumpus" id="0x7f121634" />
+    <public type="string" name="xbox_authorization_title" id="0x7f121635" />
+    <public type="string" name="xbox_game_pass_card_body_redeemed" id="0x7f121636" />
+    <public type="string" name="xbox_game_pass_card_body_unredeemed" id="0x7f121637" />
+    <public type="string" name="xbox_game_pass_modal_code_description" id="0x7f121638" />
+    <public type="string" name="xbox_game_pass_modal_code_header" id="0x7f121639" />
+    <public type="string" name="xbox_game_pass_modal_header_confirm_pc" id="0x7f12163a" />
+    <public type="string" name="xbox_game_pass_modal_header_confirm_xbox" id="0x7f12163b" />
+    <public type="string" name="xbox_game_pass_modal_header_description_confirm_pc" id="0x7f12163c" />
+    <public type="string" name="xbox_game_pass_modal_header_description_confirm_xbox" id="0x7f12163d" />
+    <public type="string" name="xbox_game_pass_modal_header_description_plan_select" id="0x7f12163e" />
+    <public type="string" name="xbox_game_pass_modal_header_description_success" id="0x7f12163f" />
+    <public type="string" name="xbox_game_pass_modal_header_plan_select" id="0x7f121640" />
+    <public type="string" name="xbox_game_pass_modal_header_success" id="0x7f121641" />
+    <public type="string" name="xbox_game_pass_modal_plan_select_header" id="0x7f121642" />
+    <public type="string" name="xbox_game_pass_modal_plan_select_pc_plan" id="0x7f121643" />
+    <public type="string" name="xbox_game_pass_modal_plan_select_plan_duration" id="0x7f121644" />
+    <public type="string" name="xbox_game_pass_modal_plan_select_xbox_plan" id="0x7f121645" />
+    <public type="string" name="xbox_game_pass_modal_redeem_button_pc" id="0x7f121646" />
+    <public type="string" name="xbox_game_pass_modal_redeem_button_xbox" id="0x7f121647" />
+    <public type="string" name="xbox_game_pass_promotion_account_credit_body" id="0x7f121648" />
+    <public type="string" name="xbox_game_pass_promotion_account_credit_button" id="0x7f121649" />
+    <public type="string" name="xbox_game_pass_promotion_account_credit_confirm_body" id="0x7f12164a" />
+    <public type="string" name="xbox_game_pass_promotion_account_credit_confirm_title" id="0x7f12164b" />
+    <public type="string" name="xbox_game_pass_promotion_account_credit_title" id="0x7f12164c" />
+    <public type="string" name="xbox_game_pass_promotion_banner_description" id="0x7f12164d" />
+    <public type="string" name="xbox_game_pass_promotion_banner_header" id="0x7f12164e" />
+    <public type="string" name="xbox_game_pass_promotion_card_company_logo_label" id="0x7f12164f" />
+    <public type="string" name="xbox_game_pass_promotion_card_header" id="0x7f121650" />
+    <public type="string" name="xbox_game_pass_promotion_existing_subscriber_body" id="0x7f121651" />
+    <public type="string" name="xbox_game_pass_promotion_existing_subscriber_title" id="0x7f121652" />
+    <public type="string" name="xbox_game_pass_promotion_redeem_body" id="0x7f121653" />
+    <public type="string" name="xbox_link" id="0x7f121654" />
+    <public type="string" name="xbox_pin_step1" id="0x7f121655" />
+    <public type="string" name="xbox_pin_step2" id="0x7f121656" />
+    <public type="string" name="xbox_pin_step3" id="0x7f121657" />
+    <public type="string" name="yearly" id="0x7f121658" />
+    <public type="string" name="yellow" id="0x7f121659" />
+    <public type="string" name="yes_text" id="0x7f12165a" />
+    <public type="string" name="your_pin_expires" id="0x7f12165b" />
+    <public type="string" name="your_pin_is_expired" id="0x7f12165c" />
+    <public type="string" name="youre_viewing_older_messages" id="0x7f12165d" />
+    <public type="string" name="zh_cn" id="0x7f12165e" />
+    <public type="string" name="zh_tw" id="0x7f12165f" />
     <public type="string" name="APKTOOL_DUMMY_3ad" id="0x7f1203ad" />
     <public type="style" name="AlertDialog.AppCompat" id="0x7f130000" />
     <public type="style" name="AlertDialog.AppCompat.Light" id="0x7f130001" />
diff --git a/com.discord/res/values/strings.xml b/com.discord/res/values/strings.xml
index 60f0e82ef3..b06fb3d45b 100644
--- a/com.discord/res/values/strings.xml
+++ b/com.discord/res/values/strings.xml
@@ -1055,7 +1055,7 @@ Last month, in response to COVID-19, we upped the Go Live viewer limit from 10 t
     <string name="cloud_sync_modal_or">OR</string>
     <string name="collapse">Collapse</string>
     <string name="collapse_category">Collapse Category</string>
-    <string name="com.crashlytics.android.build_id">4fca7056-ac9c-41d0-8d6a-b3c7102c366a</string>
+    <string name="com.crashlytics.android.build_id">950b5462-2abc-43bc-b5b4-240b9038d7e8</string>
     <string name="coming_soon">Coming Soon</string>
     <string name="command_giphy_description">Search Animated GIFs on the Web</string>
     <string name="command_me_description">Displays text with emphasis.</string>
@@ -5535,6 +5535,7 @@ You cannot take any moderation actions until you enable it."</string>
     <string name="user_settings_my_account">My Account</string>
     <string name="user_settings_noise_cancellation">Noise Suppression</string>
     <string name="user_settings_noise_cancellation_description">Suppress background noise from your mic.</string>
+    <string name="user_settings_noise_cancellation_model">Noise suppression model</string>
     <string name="user_settings_notifications_show_badge_body">Shows a red badge on the app icon when you have unread messages.</string>
     <string name="user_settings_notifications_show_badge_label">Enable Unread Message Badge</string>
     <string name="user_settings_notifications_show_flash_body">Flashes the app in your taskbar when you have new notifications.</string>
diff --git a/com.discord/smali/androidx/activity/R$drawable.smali b/com.discord/smali/androidx/activity/R$drawable.smali
index 9ad6e80331..8cd9998bc7 100644
--- a/com.discord/smali/androidx/activity/R$drawable.smali
+++ b/com.discord/smali/androidx/activity/R$drawable.smali
@@ -15,29 +15,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f08052a
+.field public static final notification_action_background:I = 0x7f08052b
 
-.field public static final notification_bg:I = 0x7f08052b
+.field public static final notification_bg:I = 0x7f08052c
 
-.field public static final notification_bg_low:I = 0x7f08052c
+.field public static final notification_bg_low:I = 0x7f08052d
 
-.field public static final notification_bg_low_normal:I = 0x7f08052d
+.field public static final notification_bg_low_normal:I = 0x7f08052e
 
-.field public static final notification_bg_low_pressed:I = 0x7f08052e
+.field public static final notification_bg_low_pressed:I = 0x7f08052f
 
-.field public static final notification_bg_normal:I = 0x7f08052f
+.field public static final notification_bg_normal:I = 0x7f080530
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080530
+.field public static final notification_bg_normal_pressed:I = 0x7f080531
 
-.field public static final notification_icon_background:I = 0x7f080531
+.field public static final notification_icon_background:I = 0x7f080532
 
-.field public static final notification_template_icon_bg:I = 0x7f080532
+.field public static final notification_template_icon_bg:I = 0x7f080533
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080533
+.field public static final notification_template_icon_low_bg:I = 0x7f080534
 
-.field public static final notification_tile_bg:I = 0x7f080534
+.field public static final notification_tile_bg:I = 0x7f080535
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080535
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080536
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/appcompat/R$drawable.smali b/com.discord/smali/androidx/appcompat/R$drawable.smali
index 25ce15072c..5fa6084943 100644
--- a/com.discord/smali/androidx/appcompat/R$drawable.smali
+++ b/com.discord/smali/androidx/appcompat/R$drawable.smali
@@ -203,33 +203,33 @@
 
 .field public static final btn_radio_on_to_off_mtrl_animation:I = 0x7f0800b1
 
-.field public static final notification_action_background:I = 0x7f08052a
+.field public static final notification_action_background:I = 0x7f08052b
 
-.field public static final notification_bg:I = 0x7f08052b
+.field public static final notification_bg:I = 0x7f08052c
 
-.field public static final notification_bg_low:I = 0x7f08052c
+.field public static final notification_bg_low:I = 0x7f08052d
 
-.field public static final notification_bg_low_normal:I = 0x7f08052d
+.field public static final notification_bg_low_normal:I = 0x7f08052e
 
-.field public static final notification_bg_low_pressed:I = 0x7f08052e
+.field public static final notification_bg_low_pressed:I = 0x7f08052f
 
-.field public static final notification_bg_normal:I = 0x7f08052f
+.field public static final notification_bg_normal:I = 0x7f080530
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080530
+.field public static final notification_bg_normal_pressed:I = 0x7f080531
 
-.field public static final notification_icon_background:I = 0x7f080531
+.field public static final notification_icon_background:I = 0x7f080532
 
-.field public static final notification_template_icon_bg:I = 0x7f080532
+.field public static final notification_template_icon_bg:I = 0x7f080533
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080533
+.field public static final notification_template_icon_low_bg:I = 0x7f080534
 
-.field public static final notification_tile_bg:I = 0x7f080534
+.field public static final notification_tile_bg:I = 0x7f080535
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080535
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080536
 
-.field public static final tooltip_frame_dark:I = 0x7f080546
+.field public static final tooltip_frame_dark:I = 0x7f080548
 
-.field public static final tooltip_frame_light:I = 0x7f080547
+.field public static final tooltip_frame_light:I = 0x7f080549
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/appcompat/resources/R$drawable.smali b/com.discord/smali/androidx/appcompat/resources/R$drawable.smali
index 56a66230b1..0320ed0262 100644
--- a/com.discord/smali/androidx/appcompat/resources/R$drawable.smali
+++ b/com.discord/smali/androidx/appcompat/resources/R$drawable.smali
@@ -17,29 +17,29 @@
 # static fields
 .field public static final abc_vector_test:I = 0x7f080071
 
-.field public static final notification_action_background:I = 0x7f08052a
+.field public static final notification_action_background:I = 0x7f08052b
 
-.field public static final notification_bg:I = 0x7f08052b
+.field public static final notification_bg:I = 0x7f08052c
 
-.field public static final notification_bg_low:I = 0x7f08052c
+.field public static final notification_bg_low:I = 0x7f08052d
 
-.field public static final notification_bg_low_normal:I = 0x7f08052d
+.field public static final notification_bg_low_normal:I = 0x7f08052e
 
-.field public static final notification_bg_low_pressed:I = 0x7f08052e
+.field public static final notification_bg_low_pressed:I = 0x7f08052f
 
-.field public static final notification_bg_normal:I = 0x7f08052f
+.field public static final notification_bg_normal:I = 0x7f080530
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080530
+.field public static final notification_bg_normal_pressed:I = 0x7f080531
 
-.field public static final notification_icon_background:I = 0x7f080531
+.field public static final notification_icon_background:I = 0x7f080532
 
-.field public static final notification_template_icon_bg:I = 0x7f080532
+.field public static final notification_template_icon_bg:I = 0x7f080533
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080533
+.field public static final notification_template_icon_low_bg:I = 0x7f080534
 
-.field public static final notification_tile_bg:I = 0x7f080534
+.field public static final notification_tile_bg:I = 0x7f080535
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080535
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080536
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/asynclayoutinflater/R$drawable.smali b/com.discord/smali/androidx/asynclayoutinflater/R$drawable.smali
index 026b22b1e8..6fe7746427 100644
--- a/com.discord/smali/androidx/asynclayoutinflater/R$drawable.smali
+++ b/com.discord/smali/androidx/asynclayoutinflater/R$drawable.smali
@@ -15,29 +15,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f08052a
+.field public static final notification_action_background:I = 0x7f08052b
 
-.field public static final notification_bg:I = 0x7f08052b
+.field public static final notification_bg:I = 0x7f08052c
 
-.field public static final notification_bg_low:I = 0x7f08052c
+.field public static final notification_bg_low:I = 0x7f08052d
 
-.field public static final notification_bg_low_normal:I = 0x7f08052d
+.field public static final notification_bg_low_normal:I = 0x7f08052e
 
-.field public static final notification_bg_low_pressed:I = 0x7f08052e
+.field public static final notification_bg_low_pressed:I = 0x7f08052f
 
-.field public static final notification_bg_normal:I = 0x7f08052f
+.field public static final notification_bg_normal:I = 0x7f080530
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080530
+.field public static final notification_bg_normal_pressed:I = 0x7f080531
 
-.field public static final notification_icon_background:I = 0x7f080531
+.field public static final notification_icon_background:I = 0x7f080532
 
-.field public static final notification_template_icon_bg:I = 0x7f080532
+.field public static final notification_template_icon_bg:I = 0x7f080533
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080533
+.field public static final notification_template_icon_low_bg:I = 0x7f080534
 
-.field public static final notification_tile_bg:I = 0x7f080534
+.field public static final notification_tile_bg:I = 0x7f080535
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080535
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080536
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/browser/R$drawable.smali b/com.discord/smali/androidx/browser/R$drawable.smali
index 64fd143616..1c0f9a9f08 100644
--- a/com.discord/smali/androidx/browser/R$drawable.smali
+++ b/com.discord/smali/androidx/browser/R$drawable.smali
@@ -15,29 +15,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f08052a
+.field public static final notification_action_background:I = 0x7f08052b
 
-.field public static final notification_bg:I = 0x7f08052b
+.field public static final notification_bg:I = 0x7f08052c
 
-.field public static final notification_bg_low:I = 0x7f08052c
+.field public static final notification_bg_low:I = 0x7f08052d
 
-.field public static final notification_bg_low_normal:I = 0x7f08052d
+.field public static final notification_bg_low_normal:I = 0x7f08052e
 
-.field public static final notification_bg_low_pressed:I = 0x7f08052e
+.field public static final notification_bg_low_pressed:I = 0x7f08052f
 
-.field public static final notification_bg_normal:I = 0x7f08052f
+.field public static final notification_bg_normal:I = 0x7f080530
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080530
+.field public static final notification_bg_normal_pressed:I = 0x7f080531
 
-.field public static final notification_icon_background:I = 0x7f080531
+.field public static final notification_icon_background:I = 0x7f080532
 
-.field public static final notification_template_icon_bg:I = 0x7f080532
+.field public static final notification_template_icon_bg:I = 0x7f080533
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080533
+.field public static final notification_template_icon_low_bg:I = 0x7f080534
 
-.field public static final notification_tile_bg:I = 0x7f080534
+.field public static final notification_tile_bg:I = 0x7f080535
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080535
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080536
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/coordinatorlayout/R$drawable.smali b/com.discord/smali/androidx/coordinatorlayout/R$drawable.smali
index b8eea55b29..6e85f66ac4 100644
--- a/com.discord/smali/androidx/coordinatorlayout/R$drawable.smali
+++ b/com.discord/smali/androidx/coordinatorlayout/R$drawable.smali
@@ -15,29 +15,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f08052a
+.field public static final notification_action_background:I = 0x7f08052b
 
-.field public static final notification_bg:I = 0x7f08052b
+.field public static final notification_bg:I = 0x7f08052c
 
-.field public static final notification_bg_low:I = 0x7f08052c
+.field public static final notification_bg_low:I = 0x7f08052d
 
-.field public static final notification_bg_low_normal:I = 0x7f08052d
+.field public static final notification_bg_low_normal:I = 0x7f08052e
 
-.field public static final notification_bg_low_pressed:I = 0x7f08052e
+.field public static final notification_bg_low_pressed:I = 0x7f08052f
 
-.field public static final notification_bg_normal:I = 0x7f08052f
+.field public static final notification_bg_normal:I = 0x7f080530
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080530
+.field public static final notification_bg_normal_pressed:I = 0x7f080531
 
-.field public static final notification_icon_background:I = 0x7f080531
+.field public static final notification_icon_background:I = 0x7f080532
 
-.field public static final notification_template_icon_bg:I = 0x7f080532
+.field public static final notification_template_icon_bg:I = 0x7f080533
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080533
+.field public static final notification_template_icon_low_bg:I = 0x7f080534
 
-.field public static final notification_tile_bg:I = 0x7f080534
+.field public static final notification_tile_bg:I = 0x7f080535
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080535
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080536
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/core/R$drawable.smali b/com.discord/smali/androidx/core/R$drawable.smali
index 13ef42ec31..88797750dd 100644
--- a/com.discord/smali/androidx/core/R$drawable.smali
+++ b/com.discord/smali/androidx/core/R$drawable.smali
@@ -15,29 +15,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f08052a
+.field public static final notification_action_background:I = 0x7f08052b
 
-.field public static final notification_bg:I = 0x7f08052b
+.field public static final notification_bg:I = 0x7f08052c
 
-.field public static final notification_bg_low:I = 0x7f08052c
+.field public static final notification_bg_low:I = 0x7f08052d
 
-.field public static final notification_bg_low_normal:I = 0x7f08052d
+.field public static final notification_bg_low_normal:I = 0x7f08052e
 
-.field public static final notification_bg_low_pressed:I = 0x7f08052e
+.field public static final notification_bg_low_pressed:I = 0x7f08052f
 
-.field public static final notification_bg_normal:I = 0x7f08052f
+.field public static final notification_bg_normal:I = 0x7f080530
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080530
+.field public static final notification_bg_normal_pressed:I = 0x7f080531
 
-.field public static final notification_icon_background:I = 0x7f080531
+.field public static final notification_icon_background:I = 0x7f080532
 
-.field public static final notification_template_icon_bg:I = 0x7f080532
+.field public static final notification_template_icon_bg:I = 0x7f080533
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080533
+.field public static final notification_template_icon_low_bg:I = 0x7f080534
 
-.field public static final notification_tile_bg:I = 0x7f080534
+.field public static final notification_tile_bg:I = 0x7f080535
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080535
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080536
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/core/ktx/R$drawable.smali b/com.discord/smali/androidx/core/ktx/R$drawable.smali
index 57a46c251e..f399b6018d 100644
--- a/com.discord/smali/androidx/core/ktx/R$drawable.smali
+++ b/com.discord/smali/androidx/core/ktx/R$drawable.smali
@@ -15,29 +15,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f08052a
+.field public static final notification_action_background:I = 0x7f08052b
 
-.field public static final notification_bg:I = 0x7f08052b
+.field public static final notification_bg:I = 0x7f08052c
 
-.field public static final notification_bg_low:I = 0x7f08052c
+.field public static final notification_bg_low:I = 0x7f08052d
 
-.field public static final notification_bg_low_normal:I = 0x7f08052d
+.field public static final notification_bg_low_normal:I = 0x7f08052e
 
-.field public static final notification_bg_low_pressed:I = 0x7f08052e
+.field public static final notification_bg_low_pressed:I = 0x7f08052f
 
-.field public static final notification_bg_normal:I = 0x7f08052f
+.field public static final notification_bg_normal:I = 0x7f080530
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080530
+.field public static final notification_bg_normal_pressed:I = 0x7f080531
 
-.field public static final notification_icon_background:I = 0x7f080531
+.field public static final notification_icon_background:I = 0x7f080532
 
-.field public static final notification_template_icon_bg:I = 0x7f080532
+.field public static final notification_template_icon_bg:I = 0x7f080533
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080533
+.field public static final notification_template_icon_low_bg:I = 0x7f080534
 
-.field public static final notification_tile_bg:I = 0x7f080534
+.field public static final notification_tile_bg:I = 0x7f080535
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080535
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080536
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/customview/R$drawable.smali b/com.discord/smali/androidx/customview/R$drawable.smali
index 51bd6c1680..7cd589c8ff 100644
--- a/com.discord/smali/androidx/customview/R$drawable.smali
+++ b/com.discord/smali/androidx/customview/R$drawable.smali
@@ -15,29 +15,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f08052a
+.field public static final notification_action_background:I = 0x7f08052b
 
-.field public static final notification_bg:I = 0x7f08052b
+.field public static final notification_bg:I = 0x7f08052c
 
-.field public static final notification_bg_low:I = 0x7f08052c
+.field public static final notification_bg_low:I = 0x7f08052d
 
-.field public static final notification_bg_low_normal:I = 0x7f08052d
+.field public static final notification_bg_low_normal:I = 0x7f08052e
 
-.field public static final notification_bg_low_pressed:I = 0x7f08052e
+.field public static final notification_bg_low_pressed:I = 0x7f08052f
 
-.field public static final notification_bg_normal:I = 0x7f08052f
+.field public static final notification_bg_normal:I = 0x7f080530
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080530
+.field public static final notification_bg_normal_pressed:I = 0x7f080531
 
-.field public static final notification_icon_background:I = 0x7f080531
+.field public static final notification_icon_background:I = 0x7f080532
 
-.field public static final notification_template_icon_bg:I = 0x7f080532
+.field public static final notification_template_icon_bg:I = 0x7f080533
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080533
+.field public static final notification_template_icon_low_bg:I = 0x7f080534
 
-.field public static final notification_tile_bg:I = 0x7f080534
+.field public static final notification_tile_bg:I = 0x7f080535
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080535
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080536
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/drawerlayout/R$drawable.smali b/com.discord/smali/androidx/drawerlayout/R$drawable.smali
index b1601b8be2..108d15e6c9 100644
--- a/com.discord/smali/androidx/drawerlayout/R$drawable.smali
+++ b/com.discord/smali/androidx/drawerlayout/R$drawable.smali
@@ -15,29 +15,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f08052a
+.field public static final notification_action_background:I = 0x7f08052b
 
-.field public static final notification_bg:I = 0x7f08052b
+.field public static final notification_bg:I = 0x7f08052c
 
-.field public static final notification_bg_low:I = 0x7f08052c
+.field public static final notification_bg_low:I = 0x7f08052d
 
-.field public static final notification_bg_low_normal:I = 0x7f08052d
+.field public static final notification_bg_low_normal:I = 0x7f08052e
 
-.field public static final notification_bg_low_pressed:I = 0x7f08052e
+.field public static final notification_bg_low_pressed:I = 0x7f08052f
 
-.field public static final notification_bg_normal:I = 0x7f08052f
+.field public static final notification_bg_normal:I = 0x7f080530
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080530
+.field public static final notification_bg_normal_pressed:I = 0x7f080531
 
-.field public static final notification_icon_background:I = 0x7f080531
+.field public static final notification_icon_background:I = 0x7f080532
 
-.field public static final notification_template_icon_bg:I = 0x7f080532
+.field public static final notification_template_icon_bg:I = 0x7f080533
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080533
+.field public static final notification_template_icon_low_bg:I = 0x7f080534
 
-.field public static final notification_tile_bg:I = 0x7f080534
+.field public static final notification_tile_bg:I = 0x7f080535
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080535
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080536
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/dynamicanimation/R$drawable.smali b/com.discord/smali/androidx/dynamicanimation/R$drawable.smali
index 4e1492e78f..80bc1d4cb4 100644
--- a/com.discord/smali/androidx/dynamicanimation/R$drawable.smali
+++ b/com.discord/smali/androidx/dynamicanimation/R$drawable.smali
@@ -15,29 +15,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f08052a
+.field public static final notification_action_background:I = 0x7f08052b
 
-.field public static final notification_bg:I = 0x7f08052b
+.field public static final notification_bg:I = 0x7f08052c
 
-.field public static final notification_bg_low:I = 0x7f08052c
+.field public static final notification_bg_low:I = 0x7f08052d
 
-.field public static final notification_bg_low_normal:I = 0x7f08052d
+.field public static final notification_bg_low_normal:I = 0x7f08052e
 
-.field public static final notification_bg_low_pressed:I = 0x7f08052e
+.field public static final notification_bg_low_pressed:I = 0x7f08052f
 
-.field public static final notification_bg_normal:I = 0x7f08052f
+.field public static final notification_bg_normal:I = 0x7f080530
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080530
+.field public static final notification_bg_normal_pressed:I = 0x7f080531
 
-.field public static final notification_icon_background:I = 0x7f080531
+.field public static final notification_icon_background:I = 0x7f080532
 
-.field public static final notification_template_icon_bg:I = 0x7f080532
+.field public static final notification_template_icon_bg:I = 0x7f080533
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080533
+.field public static final notification_template_icon_low_bg:I = 0x7f080534
 
-.field public static final notification_tile_bg:I = 0x7f080534
+.field public static final notification_tile_bg:I = 0x7f080535
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080535
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080536
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/fragment/R$drawable.smali b/com.discord/smali/androidx/fragment/R$drawable.smali
index 8969e402a2..4f84547856 100644
--- a/com.discord/smali/androidx/fragment/R$drawable.smali
+++ b/com.discord/smali/androidx/fragment/R$drawable.smali
@@ -15,29 +15,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f08052a
+.field public static final notification_action_background:I = 0x7f08052b
 
-.field public static final notification_bg:I = 0x7f08052b
+.field public static final notification_bg:I = 0x7f08052c
 
-.field public static final notification_bg_low:I = 0x7f08052c
+.field public static final notification_bg_low:I = 0x7f08052d
 
-.field public static final notification_bg_low_normal:I = 0x7f08052d
+.field public static final notification_bg_low_normal:I = 0x7f08052e
 
-.field public static final notification_bg_low_pressed:I = 0x7f08052e
+.field public static final notification_bg_low_pressed:I = 0x7f08052f
 
-.field public static final notification_bg_normal:I = 0x7f08052f
+.field public static final notification_bg_normal:I = 0x7f080530
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080530
+.field public static final notification_bg_normal_pressed:I = 0x7f080531
 
-.field public static final notification_icon_background:I = 0x7f080531
+.field public static final notification_icon_background:I = 0x7f080532
 
-.field public static final notification_template_icon_bg:I = 0x7f080532
+.field public static final notification_template_icon_bg:I = 0x7f080533
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080533
+.field public static final notification_template_icon_low_bg:I = 0x7f080534
 
-.field public static final notification_tile_bg:I = 0x7f080534
+.field public static final notification_tile_bg:I = 0x7f080535
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080535
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080536
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/legacy/coreui/R$drawable.smali b/com.discord/smali/androidx/legacy/coreui/R$drawable.smali
index d6ca28e6be..965b4e4b13 100644
--- a/com.discord/smali/androidx/legacy/coreui/R$drawable.smali
+++ b/com.discord/smali/androidx/legacy/coreui/R$drawable.smali
@@ -15,29 +15,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f08052a
+.field public static final notification_action_background:I = 0x7f08052b
 
-.field public static final notification_bg:I = 0x7f08052b
+.field public static final notification_bg:I = 0x7f08052c
 
-.field public static final notification_bg_low:I = 0x7f08052c
+.field public static final notification_bg_low:I = 0x7f08052d
 
-.field public static final notification_bg_low_normal:I = 0x7f08052d
+.field public static final notification_bg_low_normal:I = 0x7f08052e
 
-.field public static final notification_bg_low_pressed:I = 0x7f08052e
+.field public static final notification_bg_low_pressed:I = 0x7f08052f
 
-.field public static final notification_bg_normal:I = 0x7f08052f
+.field public static final notification_bg_normal:I = 0x7f080530
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080530
+.field public static final notification_bg_normal_pressed:I = 0x7f080531
 
-.field public static final notification_icon_background:I = 0x7f080531
+.field public static final notification_icon_background:I = 0x7f080532
 
-.field public static final notification_template_icon_bg:I = 0x7f080532
+.field public static final notification_template_icon_bg:I = 0x7f080533
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080533
+.field public static final notification_template_icon_low_bg:I = 0x7f080534
 
-.field public static final notification_tile_bg:I = 0x7f080534
+.field public static final notification_tile_bg:I = 0x7f080535
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080535
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080536
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/legacy/coreutils/R$drawable.smali b/com.discord/smali/androidx/legacy/coreutils/R$drawable.smali
index 975469a09d..f92d211712 100644
--- a/com.discord/smali/androidx/legacy/coreutils/R$drawable.smali
+++ b/com.discord/smali/androidx/legacy/coreutils/R$drawable.smali
@@ -15,29 +15,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f08052a
+.field public static final notification_action_background:I = 0x7f08052b
 
-.field public static final notification_bg:I = 0x7f08052b
+.field public static final notification_bg:I = 0x7f08052c
 
-.field public static final notification_bg_low:I = 0x7f08052c
+.field public static final notification_bg_low:I = 0x7f08052d
 
-.field public static final notification_bg_low_normal:I = 0x7f08052d
+.field public static final notification_bg_low_normal:I = 0x7f08052e
 
-.field public static final notification_bg_low_pressed:I = 0x7f08052e
+.field public static final notification_bg_low_pressed:I = 0x7f08052f
 
-.field public static final notification_bg_normal:I = 0x7f08052f
+.field public static final notification_bg_normal:I = 0x7f080530
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080530
+.field public static final notification_bg_normal_pressed:I = 0x7f080531
 
-.field public static final notification_icon_background:I = 0x7f080531
+.field public static final notification_icon_background:I = 0x7f080532
 
-.field public static final notification_template_icon_bg:I = 0x7f080532
+.field public static final notification_template_icon_bg:I = 0x7f080533
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080533
+.field public static final notification_template_icon_low_bg:I = 0x7f080534
 
-.field public static final notification_tile_bg:I = 0x7f080534
+.field public static final notification_tile_bg:I = 0x7f080535
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080535
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080536
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/legacy/v4/R$drawable.smali b/com.discord/smali/androidx/legacy/v4/R$drawable.smali
index 975c0a466b..3355df4f47 100644
--- a/com.discord/smali/androidx/legacy/v4/R$drawable.smali
+++ b/com.discord/smali/androidx/legacy/v4/R$drawable.smali
@@ -15,29 +15,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f08052a
+.field public static final notification_action_background:I = 0x7f08052b
 
-.field public static final notification_bg:I = 0x7f08052b
+.field public static final notification_bg:I = 0x7f08052c
 
-.field public static final notification_bg_low:I = 0x7f08052c
+.field public static final notification_bg_low:I = 0x7f08052d
 
-.field public static final notification_bg_low_normal:I = 0x7f08052d
+.field public static final notification_bg_low_normal:I = 0x7f08052e
 
-.field public static final notification_bg_low_pressed:I = 0x7f08052e
+.field public static final notification_bg_low_pressed:I = 0x7f08052f
 
-.field public static final notification_bg_normal:I = 0x7f08052f
+.field public static final notification_bg_normal:I = 0x7f080530
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080530
+.field public static final notification_bg_normal_pressed:I = 0x7f080531
 
-.field public static final notification_icon_background:I = 0x7f080531
+.field public static final notification_icon_background:I = 0x7f080532
 
-.field public static final notification_template_icon_bg:I = 0x7f080532
+.field public static final notification_template_icon_bg:I = 0x7f080533
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080533
+.field public static final notification_template_icon_low_bg:I = 0x7f080534
 
-.field public static final notification_tile_bg:I = 0x7f080534
+.field public static final notification_tile_bg:I = 0x7f080535
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080535
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080536
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/lifecycle/extensions/R$drawable.smali b/com.discord/smali/androidx/lifecycle/extensions/R$drawable.smali
index 0c3b29a1fe..59c8abfc78 100644
--- a/com.discord/smali/androidx/lifecycle/extensions/R$drawable.smali
+++ b/com.discord/smali/androidx/lifecycle/extensions/R$drawable.smali
@@ -15,29 +15,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f08052a
+.field public static final notification_action_background:I = 0x7f08052b
 
-.field public static final notification_bg:I = 0x7f08052b
+.field public static final notification_bg:I = 0x7f08052c
 
-.field public static final notification_bg_low:I = 0x7f08052c
+.field public static final notification_bg_low:I = 0x7f08052d
 
-.field public static final notification_bg_low_normal:I = 0x7f08052d
+.field public static final notification_bg_low_normal:I = 0x7f08052e
 
-.field public static final notification_bg_low_pressed:I = 0x7f08052e
+.field public static final notification_bg_low_pressed:I = 0x7f08052f
 
-.field public static final notification_bg_normal:I = 0x7f08052f
+.field public static final notification_bg_normal:I = 0x7f080530
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080530
+.field public static final notification_bg_normal_pressed:I = 0x7f080531
 
-.field public static final notification_icon_background:I = 0x7f080531
+.field public static final notification_icon_background:I = 0x7f080532
 
-.field public static final notification_template_icon_bg:I = 0x7f080532
+.field public static final notification_template_icon_bg:I = 0x7f080533
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080533
+.field public static final notification_template_icon_low_bg:I = 0x7f080534
 
-.field public static final notification_tile_bg:I = 0x7f080534
+.field public static final notification_tile_bg:I = 0x7f080535
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080535
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080536
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/loader/R$drawable.smali b/com.discord/smali/androidx/loader/R$drawable.smali
index f730df383b..d82453d615 100644
--- a/com.discord/smali/androidx/loader/R$drawable.smali
+++ b/com.discord/smali/androidx/loader/R$drawable.smali
@@ -15,29 +15,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f08052a
+.field public static final notification_action_background:I = 0x7f08052b
 
-.field public static final notification_bg:I = 0x7f08052b
+.field public static final notification_bg:I = 0x7f08052c
 
-.field public static final notification_bg_low:I = 0x7f08052c
+.field public static final notification_bg_low:I = 0x7f08052d
 
-.field public static final notification_bg_low_normal:I = 0x7f08052d
+.field public static final notification_bg_low_normal:I = 0x7f08052e
 
-.field public static final notification_bg_low_pressed:I = 0x7f08052e
+.field public static final notification_bg_low_pressed:I = 0x7f08052f
 
-.field public static final notification_bg_normal:I = 0x7f08052f
+.field public static final notification_bg_normal:I = 0x7f080530
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080530
+.field public static final notification_bg_normal_pressed:I = 0x7f080531
 
-.field public static final notification_icon_background:I = 0x7f080531
+.field public static final notification_icon_background:I = 0x7f080532
 
-.field public static final notification_template_icon_bg:I = 0x7f080532
+.field public static final notification_template_icon_bg:I = 0x7f080533
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080533
+.field public static final notification_template_icon_low_bg:I = 0x7f080534
 
-.field public static final notification_tile_bg:I = 0x7f080534
+.field public static final notification_tile_bg:I = 0x7f080535
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080535
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080536
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/media/R$drawable.smali b/com.discord/smali/androidx/media/R$drawable.smali
index a75bcb765d..f76cd81675 100644
--- a/com.discord/smali/androidx/media/R$drawable.smali
+++ b/com.discord/smali/androidx/media/R$drawable.smali
@@ -15,29 +15,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f08052a
+.field public static final notification_action_background:I = 0x7f08052b
 
-.field public static final notification_bg:I = 0x7f08052b
+.field public static final notification_bg:I = 0x7f08052c
 
-.field public static final notification_bg_low:I = 0x7f08052c
+.field public static final notification_bg_low:I = 0x7f08052d
 
-.field public static final notification_bg_low_normal:I = 0x7f08052d
+.field public static final notification_bg_low_normal:I = 0x7f08052e
 
-.field public static final notification_bg_low_pressed:I = 0x7f08052e
+.field public static final notification_bg_low_pressed:I = 0x7f08052f
 
-.field public static final notification_bg_normal:I = 0x7f08052f
+.field public static final notification_bg_normal:I = 0x7f080530
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080530
+.field public static final notification_bg_normal_pressed:I = 0x7f080531
 
-.field public static final notification_icon_background:I = 0x7f080531
+.field public static final notification_icon_background:I = 0x7f080532
 
-.field public static final notification_template_icon_bg:I = 0x7f080532
+.field public static final notification_template_icon_bg:I = 0x7f080533
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080533
+.field public static final notification_template_icon_low_bg:I = 0x7f080534
 
-.field public static final notification_tile_bg:I = 0x7f080534
+.field public static final notification_tile_bg:I = 0x7f080535
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080535
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080536
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/preference/R$drawable.smali b/com.discord/smali/androidx/preference/R$drawable.smali
index b74b5ab5b3..37008f117b 100644
--- a/com.discord/smali/androidx/preference/R$drawable.smali
+++ b/com.discord/smali/androidx/preference/R$drawable.smali
@@ -205,35 +205,35 @@
 
 .field public static final ic_arrow_down_24dp:I = 0x7f080227
 
-.field public static final notification_action_background:I = 0x7f08052a
+.field public static final notification_action_background:I = 0x7f08052b
 
-.field public static final notification_bg:I = 0x7f08052b
+.field public static final notification_bg:I = 0x7f08052c
 
-.field public static final notification_bg_low:I = 0x7f08052c
+.field public static final notification_bg_low:I = 0x7f08052d
 
-.field public static final notification_bg_low_normal:I = 0x7f08052d
+.field public static final notification_bg_low_normal:I = 0x7f08052e
 
-.field public static final notification_bg_low_pressed:I = 0x7f08052e
+.field public static final notification_bg_low_pressed:I = 0x7f08052f
 
-.field public static final notification_bg_normal:I = 0x7f08052f
+.field public static final notification_bg_normal:I = 0x7f080530
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080530
+.field public static final notification_bg_normal_pressed:I = 0x7f080531
 
-.field public static final notification_icon_background:I = 0x7f080531
+.field public static final notification_icon_background:I = 0x7f080532
 
-.field public static final notification_template_icon_bg:I = 0x7f080532
+.field public static final notification_template_icon_bg:I = 0x7f080533
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080533
+.field public static final notification_template_icon_low_bg:I = 0x7f080534
 
-.field public static final notification_tile_bg:I = 0x7f080534
+.field public static final notification_tile_bg:I = 0x7f080535
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080535
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080536
 
-.field public static final preference_list_divider_material:I = 0x7f080536
+.field public static final preference_list_divider_material:I = 0x7f080537
 
-.field public static final tooltip_frame_dark:I = 0x7f080546
+.field public static final tooltip_frame_dark:I = 0x7f080548
 
-.field public static final tooltip_frame_light:I = 0x7f080547
+.field public static final tooltip_frame_light:I = 0x7f080549
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/preference/R$string.smali b/com.discord/smali/androidx/preference/R$string.smali
index 5a1d30e349..4455b98aa8 100644
--- a/com.discord/smali/androidx/preference/R$string.smali
+++ b/com.discord/smali/androidx/preference/R$string.smali
@@ -83,9 +83,9 @@
 
 .field public static final summary_collapsed_preference_list:I = 0x7f121391
 
-.field public static final v7_preference_off:I = 0x7f121596
+.field public static final v7_preference_off:I = 0x7f121597
 
-.field public static final v7_preference_on:I = 0x7f121597
+.field public static final v7_preference_on:I = 0x7f121598
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/preference/ktx/R$drawable.smali b/com.discord/smali/androidx/preference/ktx/R$drawable.smali
index 8381226c87..936461745c 100644
--- a/com.discord/smali/androidx/preference/ktx/R$drawable.smali
+++ b/com.discord/smali/androidx/preference/ktx/R$drawable.smali
@@ -205,35 +205,35 @@
 
 .field public static final ic_arrow_down_24dp:I = 0x7f080227
 
-.field public static final notification_action_background:I = 0x7f08052a
+.field public static final notification_action_background:I = 0x7f08052b
 
-.field public static final notification_bg:I = 0x7f08052b
+.field public static final notification_bg:I = 0x7f08052c
 
-.field public static final notification_bg_low:I = 0x7f08052c
+.field public static final notification_bg_low:I = 0x7f08052d
 
-.field public static final notification_bg_low_normal:I = 0x7f08052d
+.field public static final notification_bg_low_normal:I = 0x7f08052e
 
-.field public static final notification_bg_low_pressed:I = 0x7f08052e
+.field public static final notification_bg_low_pressed:I = 0x7f08052f
 
-.field public static final notification_bg_normal:I = 0x7f08052f
+.field public static final notification_bg_normal:I = 0x7f080530
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080530
+.field public static final notification_bg_normal_pressed:I = 0x7f080531
 
-.field public static final notification_icon_background:I = 0x7f080531
+.field public static final notification_icon_background:I = 0x7f080532
 
-.field public static final notification_template_icon_bg:I = 0x7f080532
+.field public static final notification_template_icon_bg:I = 0x7f080533
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080533
+.field public static final notification_template_icon_low_bg:I = 0x7f080534
 
-.field public static final notification_tile_bg:I = 0x7f080534
+.field public static final notification_tile_bg:I = 0x7f080535
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080535
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080536
 
-.field public static final preference_list_divider_material:I = 0x7f080536
+.field public static final preference_list_divider_material:I = 0x7f080537
 
-.field public static final tooltip_frame_dark:I = 0x7f080546
+.field public static final tooltip_frame_dark:I = 0x7f080548
 
-.field public static final tooltip_frame_light:I = 0x7f080547
+.field public static final tooltip_frame_light:I = 0x7f080549
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/preference/ktx/R$string.smali b/com.discord/smali/androidx/preference/ktx/R$string.smali
index 47c77c576d..7d9b5cfeb2 100644
--- a/com.discord/smali/androidx/preference/ktx/R$string.smali
+++ b/com.discord/smali/androidx/preference/ktx/R$string.smali
@@ -83,9 +83,9 @@
 
 .field public static final summary_collapsed_preference_list:I = 0x7f121391
 
-.field public static final v7_preference_off:I = 0x7f121596
+.field public static final v7_preference_off:I = 0x7f121597
 
-.field public static final v7_preference_on:I = 0x7f121597
+.field public static final v7_preference_on:I = 0x7f121598
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/recyclerview/R$drawable.smali b/com.discord/smali/androidx/recyclerview/R$drawable.smali
index 9088e89dd9..3a3c167786 100644
--- a/com.discord/smali/androidx/recyclerview/R$drawable.smali
+++ b/com.discord/smali/androidx/recyclerview/R$drawable.smali
@@ -15,29 +15,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f08052a
+.field public static final notification_action_background:I = 0x7f08052b
 
-.field public static final notification_bg:I = 0x7f08052b
+.field public static final notification_bg:I = 0x7f08052c
 
-.field public static final notification_bg_low:I = 0x7f08052c
+.field public static final notification_bg_low:I = 0x7f08052d
 
-.field public static final notification_bg_low_normal:I = 0x7f08052d
+.field public static final notification_bg_low_normal:I = 0x7f08052e
 
-.field public static final notification_bg_low_pressed:I = 0x7f08052e
+.field public static final notification_bg_low_pressed:I = 0x7f08052f
 
-.field public static final notification_bg_normal:I = 0x7f08052f
+.field public static final notification_bg_normal:I = 0x7f080530
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080530
+.field public static final notification_bg_normal_pressed:I = 0x7f080531
 
-.field public static final notification_icon_background:I = 0x7f080531
+.field public static final notification_icon_background:I = 0x7f080532
 
-.field public static final notification_template_icon_bg:I = 0x7f080532
+.field public static final notification_template_icon_bg:I = 0x7f080533
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080533
+.field public static final notification_template_icon_low_bg:I = 0x7f080534
 
-.field public static final notification_tile_bg:I = 0x7f080534
+.field public static final notification_tile_bg:I = 0x7f080535
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080535
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080536
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/room/R$drawable.smali b/com.discord/smali/androidx/room/R$drawable.smali
index eacde76636..d3a7a44231 100644
--- a/com.discord/smali/androidx/room/R$drawable.smali
+++ b/com.discord/smali/androidx/room/R$drawable.smali
@@ -15,29 +15,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f08052a
+.field public static final notification_action_background:I = 0x7f08052b
 
-.field public static final notification_bg:I = 0x7f08052b
+.field public static final notification_bg:I = 0x7f08052c
 
-.field public static final notification_bg_low:I = 0x7f08052c
+.field public static final notification_bg_low:I = 0x7f08052d
 
-.field public static final notification_bg_low_normal:I = 0x7f08052d
+.field public static final notification_bg_low_normal:I = 0x7f08052e
 
-.field public static final notification_bg_low_pressed:I = 0x7f08052e
+.field public static final notification_bg_low_pressed:I = 0x7f08052f
 
-.field public static final notification_bg_normal:I = 0x7f08052f
+.field public static final notification_bg_normal:I = 0x7f080530
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080530
+.field public static final notification_bg_normal_pressed:I = 0x7f080531
 
-.field public static final notification_icon_background:I = 0x7f080531
+.field public static final notification_icon_background:I = 0x7f080532
 
-.field public static final notification_template_icon_bg:I = 0x7f080532
+.field public static final notification_template_icon_bg:I = 0x7f080533
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080533
+.field public static final notification_template_icon_low_bg:I = 0x7f080534
 
-.field public static final notification_tile_bg:I = 0x7f080534
+.field public static final notification_tile_bg:I = 0x7f080535
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080535
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080536
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/slidingpanelayout/R$drawable.smali b/com.discord/smali/androidx/slidingpanelayout/R$drawable.smali
index 3baa34ae43..2a914276b6 100644
--- a/com.discord/smali/androidx/slidingpanelayout/R$drawable.smali
+++ b/com.discord/smali/androidx/slidingpanelayout/R$drawable.smali
@@ -15,29 +15,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f08052a
+.field public static final notification_action_background:I = 0x7f08052b
 
-.field public static final notification_bg:I = 0x7f08052b
+.field public static final notification_bg:I = 0x7f08052c
 
-.field public static final notification_bg_low:I = 0x7f08052c
+.field public static final notification_bg_low:I = 0x7f08052d
 
-.field public static final notification_bg_low_normal:I = 0x7f08052d
+.field public static final notification_bg_low_normal:I = 0x7f08052e
 
-.field public static final notification_bg_low_pressed:I = 0x7f08052e
+.field public static final notification_bg_low_pressed:I = 0x7f08052f
 
-.field public static final notification_bg_normal:I = 0x7f08052f
+.field public static final notification_bg_normal:I = 0x7f080530
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080530
+.field public static final notification_bg_normal_pressed:I = 0x7f080531
 
-.field public static final notification_icon_background:I = 0x7f080531
+.field public static final notification_icon_background:I = 0x7f080532
 
-.field public static final notification_template_icon_bg:I = 0x7f080532
+.field public static final notification_template_icon_bg:I = 0x7f080533
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080533
+.field public static final notification_template_icon_low_bg:I = 0x7f080534
 
-.field public static final notification_tile_bg:I = 0x7f080534
+.field public static final notification_tile_bg:I = 0x7f080535
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080535
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080536
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/swiperefreshlayout/R$drawable.smali b/com.discord/smali/androidx/swiperefreshlayout/R$drawable.smali
index d7ab102fbc..9e291e9f63 100644
--- a/com.discord/smali/androidx/swiperefreshlayout/R$drawable.smali
+++ b/com.discord/smali/androidx/swiperefreshlayout/R$drawable.smali
@@ -15,29 +15,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f08052a
+.field public static final notification_action_background:I = 0x7f08052b
 
-.field public static final notification_bg:I = 0x7f08052b
+.field public static final notification_bg:I = 0x7f08052c
 
-.field public static final notification_bg_low:I = 0x7f08052c
+.field public static final notification_bg_low:I = 0x7f08052d
 
-.field public static final notification_bg_low_normal:I = 0x7f08052d
+.field public static final notification_bg_low_normal:I = 0x7f08052e
 
-.field public static final notification_bg_low_pressed:I = 0x7f08052e
+.field public static final notification_bg_low_pressed:I = 0x7f08052f
 
-.field public static final notification_bg_normal:I = 0x7f08052f
+.field public static final notification_bg_normal:I = 0x7f080530
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080530
+.field public static final notification_bg_normal_pressed:I = 0x7f080531
 
-.field public static final notification_icon_background:I = 0x7f080531
+.field public static final notification_icon_background:I = 0x7f080532
 
-.field public static final notification_template_icon_bg:I = 0x7f080532
+.field public static final notification_template_icon_bg:I = 0x7f080533
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080533
+.field public static final notification_template_icon_low_bg:I = 0x7f080534
 
-.field public static final notification_tile_bg:I = 0x7f080534
+.field public static final notification_tile_bg:I = 0x7f080535
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080535
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080536
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/transition/R$drawable.smali b/com.discord/smali/androidx/transition/R$drawable.smali
index 902f61cff9..7ccaad2c48 100644
--- a/com.discord/smali/androidx/transition/R$drawable.smali
+++ b/com.discord/smali/androidx/transition/R$drawable.smali
@@ -15,29 +15,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f08052a
+.field public static final notification_action_background:I = 0x7f08052b
 
-.field public static final notification_bg:I = 0x7f08052b
+.field public static final notification_bg:I = 0x7f08052c
 
-.field public static final notification_bg_low:I = 0x7f08052c
+.field public static final notification_bg_low:I = 0x7f08052d
 
-.field public static final notification_bg_low_normal:I = 0x7f08052d
+.field public static final notification_bg_low_normal:I = 0x7f08052e
 
-.field public static final notification_bg_low_pressed:I = 0x7f08052e
+.field public static final notification_bg_low_pressed:I = 0x7f08052f
 
-.field public static final notification_bg_normal:I = 0x7f08052f
+.field public static final notification_bg_normal:I = 0x7f080530
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080530
+.field public static final notification_bg_normal_pressed:I = 0x7f080531
 
-.field public static final notification_icon_background:I = 0x7f080531
+.field public static final notification_icon_background:I = 0x7f080532
 
-.field public static final notification_template_icon_bg:I = 0x7f080532
+.field public static final notification_template_icon_bg:I = 0x7f080533
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080533
+.field public static final notification_template_icon_low_bg:I = 0x7f080534
 
-.field public static final notification_tile_bg:I = 0x7f080534
+.field public static final notification_tile_bg:I = 0x7f080535
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080535
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080536
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/vectordrawable/R$drawable.smali b/com.discord/smali/androidx/vectordrawable/R$drawable.smali
index f576993f5b..e70e2a0e3a 100644
--- a/com.discord/smali/androidx/vectordrawable/R$drawable.smali
+++ b/com.discord/smali/androidx/vectordrawable/R$drawable.smali
@@ -15,29 +15,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f08052a
+.field public static final notification_action_background:I = 0x7f08052b
 
-.field public static final notification_bg:I = 0x7f08052b
+.field public static final notification_bg:I = 0x7f08052c
 
-.field public static final notification_bg_low:I = 0x7f08052c
+.field public static final notification_bg_low:I = 0x7f08052d
 
-.field public static final notification_bg_low_normal:I = 0x7f08052d
+.field public static final notification_bg_low_normal:I = 0x7f08052e
 
-.field public static final notification_bg_low_pressed:I = 0x7f08052e
+.field public static final notification_bg_low_pressed:I = 0x7f08052f
 
-.field public static final notification_bg_normal:I = 0x7f08052f
+.field public static final notification_bg_normal:I = 0x7f080530
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080530
+.field public static final notification_bg_normal_pressed:I = 0x7f080531
 
-.field public static final notification_icon_background:I = 0x7f080531
+.field public static final notification_icon_background:I = 0x7f080532
 
-.field public static final notification_template_icon_bg:I = 0x7f080532
+.field public static final notification_template_icon_bg:I = 0x7f080533
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080533
+.field public static final notification_template_icon_low_bg:I = 0x7f080534
 
-.field public static final notification_tile_bg:I = 0x7f080534
+.field public static final notification_tile_bg:I = 0x7f080535
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080535
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080536
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/vectordrawable/animated/R$drawable.smali b/com.discord/smali/androidx/vectordrawable/animated/R$drawable.smali
index 9590e210fe..d9232308b7 100644
--- a/com.discord/smali/androidx/vectordrawable/animated/R$drawable.smali
+++ b/com.discord/smali/androidx/vectordrawable/animated/R$drawable.smali
@@ -15,29 +15,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f08052a
+.field public static final notification_action_background:I = 0x7f08052b
 
-.field public static final notification_bg:I = 0x7f08052b
+.field public static final notification_bg:I = 0x7f08052c
 
-.field public static final notification_bg_low:I = 0x7f08052c
+.field public static final notification_bg_low:I = 0x7f08052d
 
-.field public static final notification_bg_low_normal:I = 0x7f08052d
+.field public static final notification_bg_low_normal:I = 0x7f08052e
 
-.field public static final notification_bg_low_pressed:I = 0x7f08052e
+.field public static final notification_bg_low_pressed:I = 0x7f08052f
 
-.field public static final notification_bg_normal:I = 0x7f08052f
+.field public static final notification_bg_normal:I = 0x7f080530
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080530
+.field public static final notification_bg_normal_pressed:I = 0x7f080531
 
-.field public static final notification_icon_background:I = 0x7f080531
+.field public static final notification_icon_background:I = 0x7f080532
 
-.field public static final notification_template_icon_bg:I = 0x7f080532
+.field public static final notification_template_icon_bg:I = 0x7f080533
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080533
+.field public static final notification_template_icon_low_bg:I = 0x7f080534
 
-.field public static final notification_tile_bg:I = 0x7f080534
+.field public static final notification_tile_bg:I = 0x7f080535
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080535
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080536
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/viewpager/R$drawable.smali b/com.discord/smali/androidx/viewpager/R$drawable.smali
index 042897a713..3d24a8fd98 100644
--- a/com.discord/smali/androidx/viewpager/R$drawable.smali
+++ b/com.discord/smali/androidx/viewpager/R$drawable.smali
@@ -15,29 +15,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f08052a
+.field public static final notification_action_background:I = 0x7f08052b
 
-.field public static final notification_bg:I = 0x7f08052b
+.field public static final notification_bg:I = 0x7f08052c
 
-.field public static final notification_bg_low:I = 0x7f08052c
+.field public static final notification_bg_low:I = 0x7f08052d
 
-.field public static final notification_bg_low_normal:I = 0x7f08052d
+.field public static final notification_bg_low_normal:I = 0x7f08052e
 
-.field public static final notification_bg_low_pressed:I = 0x7f08052e
+.field public static final notification_bg_low_pressed:I = 0x7f08052f
 
-.field public static final notification_bg_normal:I = 0x7f08052f
+.field public static final notification_bg_normal:I = 0x7f080530
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080530
+.field public static final notification_bg_normal_pressed:I = 0x7f080531
 
-.field public static final notification_icon_background:I = 0x7f080531
+.field public static final notification_icon_background:I = 0x7f080532
 
-.field public static final notification_template_icon_bg:I = 0x7f080532
+.field public static final notification_template_icon_bg:I = 0x7f080533
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080533
+.field public static final notification_template_icon_low_bg:I = 0x7f080534
 
-.field public static final notification_tile_bg:I = 0x7f080534
+.field public static final notification_tile_bg:I = 0x7f080535
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080535
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080536
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/viewpager2/R$drawable.smali b/com.discord/smali/androidx/viewpager2/R$drawable.smali
index 15adc65222..a806115c15 100644
--- a/com.discord/smali/androidx/viewpager2/R$drawable.smali
+++ b/com.discord/smali/androidx/viewpager2/R$drawable.smali
@@ -15,29 +15,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f08052a
+.field public static final notification_action_background:I = 0x7f08052b
 
-.field public static final notification_bg:I = 0x7f08052b
+.field public static final notification_bg:I = 0x7f08052c
 
-.field public static final notification_bg_low:I = 0x7f08052c
+.field public static final notification_bg_low:I = 0x7f08052d
 
-.field public static final notification_bg_low_normal:I = 0x7f08052d
+.field public static final notification_bg_low_normal:I = 0x7f08052e
 
-.field public static final notification_bg_low_pressed:I = 0x7f08052e
+.field public static final notification_bg_low_pressed:I = 0x7f08052f
 
-.field public static final notification_bg_normal:I = 0x7f08052f
+.field public static final notification_bg_normal:I = 0x7f080530
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080530
+.field public static final notification_bg_normal_pressed:I = 0x7f080531
 
-.field public static final notification_icon_background:I = 0x7f080531
+.field public static final notification_icon_background:I = 0x7f080532
 
-.field public static final notification_template_icon_bg:I = 0x7f080532
+.field public static final notification_template_icon_bg:I = 0x7f080533
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080533
+.field public static final notification_template_icon_low_bg:I = 0x7f080534
 
-.field public static final notification_tile_bg:I = 0x7f080534
+.field public static final notification_tile_bg:I = 0x7f080535
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080535
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080536
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/work/R$drawable.smali b/com.discord/smali/androidx/work/R$drawable.smali
index 32e3fa496b..2db96688de 100644
--- a/com.discord/smali/androidx/work/R$drawable.smali
+++ b/com.discord/smali/androidx/work/R$drawable.smali
@@ -15,29 +15,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f08052a
+.field public static final notification_action_background:I = 0x7f08052b
 
-.field public static final notification_bg:I = 0x7f08052b
+.field public static final notification_bg:I = 0x7f08052c
 
-.field public static final notification_bg_low:I = 0x7f08052c
+.field public static final notification_bg_low:I = 0x7f08052d
 
-.field public static final notification_bg_low_normal:I = 0x7f08052d
+.field public static final notification_bg_low_normal:I = 0x7f08052e
 
-.field public static final notification_bg_low_pressed:I = 0x7f08052e
+.field public static final notification_bg_low_pressed:I = 0x7f08052f
 
-.field public static final notification_bg_normal:I = 0x7f08052f
+.field public static final notification_bg_normal:I = 0x7f080530
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080530
+.field public static final notification_bg_normal_pressed:I = 0x7f080531
 
-.field public static final notification_icon_background:I = 0x7f080531
+.field public static final notification_icon_background:I = 0x7f080532
 
-.field public static final notification_template_icon_bg:I = 0x7f080532
+.field public static final notification_template_icon_bg:I = 0x7f080533
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080533
+.field public static final notification_template_icon_low_bg:I = 0x7f080534
 
-.field public static final notification_tile_bg:I = 0x7f080534
+.field public static final notification_tile_bg:I = 0x7f080535
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080535
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080536
 
 
 # direct methods
diff --git a/com.discord/smali/androidx/work/ktx/R$drawable.smali b/com.discord/smali/androidx/work/ktx/R$drawable.smali
index 229cb466c3..f7f6dcec57 100644
--- a/com.discord/smali/androidx/work/ktx/R$drawable.smali
+++ b/com.discord/smali/androidx/work/ktx/R$drawable.smali
@@ -15,29 +15,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f08052a
+.field public static final notification_action_background:I = 0x7f08052b
 
-.field public static final notification_bg:I = 0x7f08052b
+.field public static final notification_bg:I = 0x7f08052c
 
-.field public static final notification_bg_low:I = 0x7f08052c
+.field public static final notification_bg_low:I = 0x7f08052d
 
-.field public static final notification_bg_low_normal:I = 0x7f08052d
+.field public static final notification_bg_low_normal:I = 0x7f08052e
 
-.field public static final notification_bg_low_pressed:I = 0x7f08052e
+.field public static final notification_bg_low_pressed:I = 0x7f08052f
 
-.field public static final notification_bg_normal:I = 0x7f08052f
+.field public static final notification_bg_normal:I = 0x7f080530
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080530
+.field public static final notification_bg_normal_pressed:I = 0x7f080531
 
-.field public static final notification_icon_background:I = 0x7f080531
+.field public static final notification_icon_background:I = 0x7f080532
 
-.field public static final notification_template_icon_bg:I = 0x7f080532
+.field public static final notification_template_icon_bg:I = 0x7f080533
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080533
+.field public static final notification_template_icon_low_bg:I = 0x7f080534
 
-.field public static final notification_tile_bg:I = 0x7f080534
+.field public static final notification_tile_bg:I = 0x7f080535
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080535
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080536
 
 
 # direct methods
diff --git a/com.discord/smali/com/discord/BuildConfig.smali b/com.discord/smali/com/discord/BuildConfig.smali
index f07f12ad55..d23361d9b2 100644
--- a/com.discord/smali/com/discord/BuildConfig.smali
+++ b/com.discord/smali/com/discord/BuildConfig.smali
@@ -40,11 +40,11 @@
 
 .field public static final SAMSUNGxDISCORD_CLIENT_ID:Ljava/lang/String; = "97t47j218f"
 
-.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/1109"
+.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/1111"
 
-.field public static final VERSION_CODE:I = 0x455
+.field public static final VERSION_CODE:I = 0x457
 
-.field public static final VERSION_NAME:Ljava/lang/String; = "20-alpha2"
+.field public static final VERSION_NAME:Ljava/lang/String; = "20-alpha4"
 
 
 # direct methods
diff --git a/com.discord/smali/com/discord/app/AppActivity.smali b/com.discord/smali/com/discord/app/AppActivity.smali
index 2c5fdb7972..07f7ddcf0f 100644
--- a/com.discord/smali/com/discord/app/AppActivity.smali
+++ b/com.discord/smali/com/discord/app/AppActivity.smali
@@ -640,7 +640,7 @@
 .end method
 
 .method public final a(Landroidx/appcompat/widget/Toolbar;)V
-    .locals 2
+    .locals 4
 
     iput-object p1, p0, Lcom/discord/app/AppActivity;->l:Landroidx/appcompat/widget/Toolbar;
 
@@ -648,32 +648,61 @@
 
     move-result-object p1
 
-    if-nez p1, :cond_1
+    if-nez p1, :cond_2
 
     iget-object p1, p0, Lcom/discord/app/AppActivity;->l:Landroidx/appcompat/widget/Toolbar;
 
+    const/4 v0, 0x0
+
     if-eqz p1, :cond_0
 
-    new-instance v0, Lcom/discord/views/ToolbarTitleLayout;
+    new-instance v1, Lcom/discord/views/ToolbarTitleLayout;
 
-    invoke-direct {v0, p0}, Lcom/discord/views/ToolbarTitleLayout;-><init>(Landroid/content/Context;)V
+    invoke-direct {v1, p0}, Lcom/discord/views/ToolbarTitleLayout;-><init>(Landroid/content/Context;)V
 
-    const/4 v1, 0x0
+    new-instance v2, Landroid/view/ViewGroup$LayoutParams;
 
-    invoke-virtual {p1, v0, v1}, Landroid/view/ViewGroup;->addView(Landroid/view/View;I)V
+    const/4 v3, -0x1
+
+    invoke-direct {v2, v3, v3}, Landroid/view/ViewGroup$LayoutParams;-><init>(II)V
+
+    invoke-virtual {p1, v1, v0, v2}, Landroid/view/ViewGroup;->addView(Landroid/view/View;ILandroid/view/ViewGroup$LayoutParams;)V
 
     :cond_0
-    iget-object p1, p0, Lcom/discord/app/AppActivity;->l:Landroidx/appcompat/widget/Toolbar;
+    invoke-virtual {p0}, Lcom/discord/app/AppActivity;->g()Lcom/discord/views/ToolbarTitleLayout;
+
+    move-result-object p1
 
     if-eqz p1, :cond_1
 
+    const v1, 0x7f040408
+
+    const/4 v2, 0x2
+
+    const/4 v3, 0x0
+
+    invoke-static {p0, v1, v0, v2, v3}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/content/Context;IIILjava/lang/Object;)I
+
+    move-result v0
+
+    invoke-virtual {p0, v0}, Landroid/app/Activity;->getDrawable(I)Landroid/graphics/drawable/Drawable;
+
+    move-result-object v0
+
+    invoke-virtual {p1, v0}, Landroid/view/ViewGroup;->setBackground(Landroid/graphics/drawable/Drawable;)V
+
+    :cond_1
+    iget-object p1, p0, Lcom/discord/app/AppActivity;->l:Landroidx/appcompat/widget/Toolbar;
+
+    if-eqz p1, :cond_2
+
     new-instance v0, Lcom/discord/app/AppActivity$k;
 
     invoke-direct {v0, p0}, Lcom/discord/app/AppActivity$k;-><init>(Lcom/discord/app/AppActivity;)V
 
     invoke-virtual {p1, v0}, Landroidx/appcompat/widget/Toolbar;->setNavigationOnClickListener(Landroid/view/View$OnClickListener;)V
 
-    :cond_1
+    :cond_2
     return-void
 .end method
 
diff --git a/com.discord/smali/com/discord/gateway/R$drawable.smali b/com.discord/smali/com/discord/gateway/R$drawable.smali
index da65f374ec..c16d0bfbdf 100644
--- a/com.discord/smali/com/discord/gateway/R$drawable.smali
+++ b/com.discord/smali/com/discord/gateway/R$drawable.smali
@@ -291,57 +291,57 @@
 
 .field public static final ic_mtrl_chip_close_circle:I = 0x7f08037e
 
-.field public static final mtrl_dialog_background:I = 0x7f080520
+.field public static final mtrl_dialog_background:I = 0x7f080521
 
-.field public static final mtrl_dropdown_arrow:I = 0x7f080521
+.field public static final mtrl_dropdown_arrow:I = 0x7f080522
 
-.field public static final mtrl_ic_arrow_drop_down:I = 0x7f080522
+.field public static final mtrl_ic_arrow_drop_down:I = 0x7f080523
 
-.field public static final mtrl_ic_arrow_drop_up:I = 0x7f080523
+.field public static final mtrl_ic_arrow_drop_up:I = 0x7f080524
 
-.field public static final mtrl_ic_cancel:I = 0x7f080524
+.field public static final mtrl_ic_cancel:I = 0x7f080525
 
-.field public static final mtrl_ic_error:I = 0x7f080525
+.field public static final mtrl_ic_error:I = 0x7f080526
 
-.field public static final mtrl_popupmenu_background:I = 0x7f080526
+.field public static final mtrl_popupmenu_background:I = 0x7f080527
 
-.field public static final mtrl_popupmenu_background_dark:I = 0x7f080527
+.field public static final mtrl_popupmenu_background_dark:I = 0x7f080528
 
-.field public static final mtrl_tabs_default_indicator:I = 0x7f080528
+.field public static final mtrl_tabs_default_indicator:I = 0x7f080529
 
-.field public static final navigation_empty_icon:I = 0x7f080529
+.field public static final navigation_empty_icon:I = 0x7f08052a
 
-.field public static final notification_action_background:I = 0x7f08052a
+.field public static final notification_action_background:I = 0x7f08052b
 
-.field public static final notification_bg:I = 0x7f08052b
+.field public static final notification_bg:I = 0x7f08052c
 
-.field public static final notification_bg_low:I = 0x7f08052c
+.field public static final notification_bg_low:I = 0x7f08052d
 
-.field public static final notification_bg_low_normal:I = 0x7f08052d
+.field public static final notification_bg_low_normal:I = 0x7f08052e
 
-.field public static final notification_bg_low_pressed:I = 0x7f08052e
+.field public static final notification_bg_low_pressed:I = 0x7f08052f
 
-.field public static final notification_bg_normal:I = 0x7f08052f
+.field public static final notification_bg_normal:I = 0x7f080530
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080530
+.field public static final notification_bg_normal_pressed:I = 0x7f080531
 
-.field public static final notification_icon_background:I = 0x7f080531
+.field public static final notification_icon_background:I = 0x7f080532
 
-.field public static final notification_template_icon_bg:I = 0x7f080532
+.field public static final notification_template_icon_bg:I = 0x7f080533
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080533
+.field public static final notification_template_icon_low_bg:I = 0x7f080534
 
-.field public static final notification_tile_bg:I = 0x7f080534
+.field public static final notification_tile_bg:I = 0x7f080535
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080535
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080536
 
-.field public static final preference_list_divider_material:I = 0x7f080536
+.field public static final preference_list_divider_material:I = 0x7f080537
 
-.field public static final test_custom_background:I = 0x7f080545
+.field public static final test_custom_background:I = 0x7f080547
 
-.field public static final tooltip_frame_dark:I = 0x7f080546
+.field public static final tooltip_frame_dark:I = 0x7f080548
 
-.field public static final tooltip_frame_light:I = 0x7f080547
+.field public static final tooltip_frame_light:I = 0x7f080549
 
 
 # direct methods
diff --git a/com.discord/smali/com/discord/gateway/R$string.smali b/com.discord/smali/com/discord/gateway/R$string.smali
index 36a1143458..abb7683daa 100644
--- a/com.discord/smali/com/discord/gateway/R$string.smali
+++ b/com.discord/smali/com/discord/gateway/R$string.smali
@@ -225,9 +225,9 @@
 
 .field public static final summary_collapsed_preference_list:I = 0x7f121391
 
-.field public static final v7_preference_off:I = 0x7f121596
+.field public static final v7_preference_off:I = 0x7f121597
 
-.field public static final v7_preference_on:I = 0x7f121597
+.field public static final v7_preference_on:I = 0x7f121598
 
 
 # direct methods
diff --git a/com.discord/smali/com/discord/overlay/R$c.smali b/com.discord/smali/com/discord/overlay/R$c.smali
index d9075da1a3..851fc5c50e 100644
--- a/com.discord/smali/com/discord/overlay/R$c.smali
+++ b/com.discord/smali/com/discord/overlay/R$c.smali
@@ -207,37 +207,37 @@
 
 .field public static final ic_close_24dp:I = 0x7f080298
 
-.field public static final ic_trash_outline:I = 0x7f080438
+.field public static final ic_trash_outline:I = 0x7f080439
 
-.field public static final notification_action_background:I = 0x7f08052a
+.field public static final notification_action_background:I = 0x7f08052b
 
-.field public static final notification_bg:I = 0x7f08052b
+.field public static final notification_bg:I = 0x7f08052c
 
-.field public static final notification_bg_low:I = 0x7f08052c
+.field public static final notification_bg_low:I = 0x7f08052d
 
-.field public static final notification_bg_low_normal:I = 0x7f08052d
+.field public static final notification_bg_low_normal:I = 0x7f08052e
 
-.field public static final notification_bg_low_pressed:I = 0x7f08052e
+.field public static final notification_bg_low_pressed:I = 0x7f08052f
 
-.field public static final notification_bg_normal:I = 0x7f08052f
+.field public static final notification_bg_normal:I = 0x7f080530
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080530
+.field public static final notification_bg_normal_pressed:I = 0x7f080531
 
-.field public static final notification_icon_background:I = 0x7f080531
+.field public static final notification_icon_background:I = 0x7f080532
 
-.field public static final notification_template_icon_bg:I = 0x7f080532
+.field public static final notification_template_icon_bg:I = 0x7f080533
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080533
+.field public static final notification_template_icon_low_bg:I = 0x7f080534
 
-.field public static final notification_tile_bg:I = 0x7f080534
+.field public static final notification_tile_bg:I = 0x7f080535
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080535
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080536
 
-.field public static final tooltip_frame_dark:I = 0x7f080546
+.field public static final tooltip_frame_dark:I = 0x7f080548
 
-.field public static final tooltip_frame_light:I = 0x7f080547
+.field public static final tooltip_frame_light:I = 0x7f080549
 
-.field public static final trash_bg:I = 0x7f080548
+.field public static final trash_bg:I = 0x7f08054a
 
 
 # direct methods
diff --git a/com.discord/smali/com/discord/restapi/R$drawable.smali b/com.discord/smali/com/discord/restapi/R$drawable.smali
index b6bd0008fb..e483f160d3 100644
--- a/com.discord/smali/com/discord/restapi/R$drawable.smali
+++ b/com.discord/smali/com/discord/restapi/R$drawable.smali
@@ -291,57 +291,57 @@
 
 .field public static final ic_mtrl_chip_close_circle:I = 0x7f08037e
 
-.field public static final mtrl_dialog_background:I = 0x7f080520
+.field public static final mtrl_dialog_background:I = 0x7f080521
 
-.field public static final mtrl_dropdown_arrow:I = 0x7f080521
+.field public static final mtrl_dropdown_arrow:I = 0x7f080522
 
-.field public static final mtrl_ic_arrow_drop_down:I = 0x7f080522
+.field public static final mtrl_ic_arrow_drop_down:I = 0x7f080523
 
-.field public static final mtrl_ic_arrow_drop_up:I = 0x7f080523
+.field public static final mtrl_ic_arrow_drop_up:I = 0x7f080524
 
-.field public static final mtrl_ic_cancel:I = 0x7f080524
+.field public static final mtrl_ic_cancel:I = 0x7f080525
 
-.field public static final mtrl_ic_error:I = 0x7f080525
+.field public static final mtrl_ic_error:I = 0x7f080526
 
-.field public static final mtrl_popupmenu_background:I = 0x7f080526
+.field public static final mtrl_popupmenu_background:I = 0x7f080527
 
-.field public static final mtrl_popupmenu_background_dark:I = 0x7f080527
+.field public static final mtrl_popupmenu_background_dark:I = 0x7f080528
 
-.field public static final mtrl_tabs_default_indicator:I = 0x7f080528
+.field public static final mtrl_tabs_default_indicator:I = 0x7f080529
 
-.field public static final navigation_empty_icon:I = 0x7f080529
+.field public static final navigation_empty_icon:I = 0x7f08052a
 
-.field public static final notification_action_background:I = 0x7f08052a
+.field public static final notification_action_background:I = 0x7f08052b
 
-.field public static final notification_bg:I = 0x7f08052b
+.field public static final notification_bg:I = 0x7f08052c
 
-.field public static final notification_bg_low:I = 0x7f08052c
+.field public static final notification_bg_low:I = 0x7f08052d
 
-.field public static final notification_bg_low_normal:I = 0x7f08052d
+.field public static final notification_bg_low_normal:I = 0x7f08052e
 
-.field public static final notification_bg_low_pressed:I = 0x7f08052e
+.field public static final notification_bg_low_pressed:I = 0x7f08052f
 
-.field public static final notification_bg_normal:I = 0x7f08052f
+.field public static final notification_bg_normal:I = 0x7f080530
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080530
+.field public static final notification_bg_normal_pressed:I = 0x7f080531
 
-.field public static final notification_icon_background:I = 0x7f080531
+.field public static final notification_icon_background:I = 0x7f080532
 
-.field public static final notification_template_icon_bg:I = 0x7f080532
+.field public static final notification_template_icon_bg:I = 0x7f080533
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080533
+.field public static final notification_template_icon_low_bg:I = 0x7f080534
 
-.field public static final notification_tile_bg:I = 0x7f080534
+.field public static final notification_tile_bg:I = 0x7f080535
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080535
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080536
 
-.field public static final preference_list_divider_material:I = 0x7f080536
+.field public static final preference_list_divider_material:I = 0x7f080537
 
-.field public static final test_custom_background:I = 0x7f080545
+.field public static final test_custom_background:I = 0x7f080547
 
-.field public static final tooltip_frame_dark:I = 0x7f080546
+.field public static final tooltip_frame_dark:I = 0x7f080548
 
-.field public static final tooltip_frame_light:I = 0x7f080547
+.field public static final tooltip_frame_light:I = 0x7f080549
 
 
 # direct methods
diff --git a/com.discord/smali/com/discord/restapi/R$string.smali b/com.discord/smali/com/discord/restapi/R$string.smali
index 943853fa6f..bb6b26b2f9 100644
--- a/com.discord/smali/com/discord/restapi/R$string.smali
+++ b/com.discord/smali/com/discord/restapi/R$string.smali
@@ -223,9 +223,9 @@
 
 .field public static final summary_collapsed_preference_list:I = 0x7f121391
 
-.field public static final v7_preference_off:I = 0x7f121596
+.field public static final v7_preference_off:I = 0x7f121597
 
-.field public static final v7_preference_on:I = 0x7f121597
+.field public static final v7_preference_on:I = 0x7f121598
 
 
 # direct methods
diff --git a/com.discord/smali/com/discord/stores/StoreClientVersion.smali b/com.discord/smali/com/discord/stores/StoreClientVersion.smali
index 7b93ccc25d..831cdf89a8 100644
--- a/com.discord/smali/com/discord/stores/StoreClientVersion.smali
+++ b/com.discord/smali/com/discord/stores/StoreClientVersion.smali
@@ -28,7 +28,7 @@
 
     invoke-direct {p0}, Lcom/discord/stores/Store;-><init>()V
 
-    const/16 v0, 0x455
+    const/16 v0, 0x457
 
     iput v0, p0, Lcom/discord/stores/StoreClientVersion;->clientVersion:I
 
diff --git a/com.discord/smali/com/discord/stores/StoreMediaNotification$init$3.smali b/com.discord/smali/com/discord/stores/StoreMediaNotification$init$3.smali
index 445aeed5dc..49ff0574ea 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaNotification$init$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaNotification$init$3.smali
@@ -76,7 +76,7 @@
 
     iget-object v0, p0, Lcom/discord/stores/StoreMediaNotification$init$3;->$context:Landroid/content/Context;
 
-    const v1, 0x7f121599
+    const v1, 0x7f12159a
 
     const/4 v2, 0x0
 
diff --git a/com.discord/smali/com/discord/stores/StoreNavigation.smali b/com.discord/smali/com/discord/stores/StoreNavigation.smali
index d936ef7ffb..07fc875d20 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigation.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigation.smali
@@ -217,7 +217,7 @@
 
     const-string v1, "CONNECTION_ISSUES"
 
-    const v4, 0x7f08043c
+    const v4, 0x7f08043d
 
     const/4 v8, 0x1
 
diff --git a/com.discord/smali/com/discord/stores/StoreVoiceChannelSelected.smali b/com.discord/smali/com/discord/stores/StoreVoiceChannelSelected.smali
index 28c4fa1c2a..3d7533d53a 100644
--- a/com.discord/smali/com/discord/stores/StoreVoiceChannelSelected.smali
+++ b/com.discord/smali/com/discord/stores/StoreVoiceChannelSelected.smali
@@ -889,7 +889,7 @@
 
     const/4 v0, 0x0
 
-    if-eqz p1, :cond_6
+    if-eqz p1, :cond_8
 
     iget-object v1, p0, Lcom/discord/stores/StoreVoiceChannelSelected;->stream:Lcom/discord/stores/StoreStream;
 
@@ -949,19 +949,25 @@
 
     const/4 v2, 0x1
 
-    if-eqz v1, :cond_3
-
-    if-eqz v0, :cond_3
+    if-eqz v1, :cond_5
 
     iget-wide v3, p0, Lcom/discord/stores/StoreVoiceChannelSelected;->selectedVoiceChannelId:J
 
+    if-nez v0, :cond_3
+
+    goto :goto_1
+
+    :cond_3
     invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
     move-result-wide v5
 
     cmp-long v1, v5, v3
 
-    if-eqz v1, :cond_3
+    if-eqz v1, :cond_5
+
+    :goto_1
+    if-eqz v0, :cond_4
 
     invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
@@ -969,9 +975,14 @@
 
     invoke-direct {p0, v0, v1, v2}, Lcom/discord/stores/StoreVoiceChannelSelected;->selectVoiceChannel(JZ)Lcom/discord/stores/StoreVoiceChannelSelected$JoinVoiceChannelResult;
 
-    goto :goto_1
+    goto :goto_2
 
-    :cond_3
+    :cond_4
+    invoke-direct {p0}, Lcom/discord/stores/StoreVoiceChannelSelected;->clearInternal()V
+
+    goto :goto_2
+
+    :cond_5
     invoke-virtual {p1}, Lcom/discord/models/domain/ModelVoice$State;->getSessionId()Ljava/lang/String;
 
     move-result-object v0
@@ -984,7 +995,7 @@
 
     xor-int/2addr v0, v2
 
-    if-eqz v0, :cond_5
+    if-eqz v0, :cond_7
 
     iget-object v0, p0, Lcom/discord/stores/StoreVoiceChannelSelected;->stream:Lcom/discord/stores/StoreStream;
 
@@ -998,7 +1009,7 @@
 
     move-result-object v0
 
-    if-eqz v0, :cond_5
+    if-eqz v0, :cond_7
 
     invoke-virtual {v0}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
 
@@ -1008,26 +1019,26 @@
 
     move-result-wide v1
 
-    if-nez v0, :cond_4
+    if-nez v0, :cond_6
 
-    goto :goto_1
+    goto :goto_2
 
-    :cond_4
+    :cond_6
     invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
 
     move-result-wide v3
 
     cmp-long p1, v3, v1
 
-    if-nez p1, :cond_5
+    if-nez p1, :cond_7
 
     invoke-direct {p0}, Lcom/discord/stores/StoreVoiceChannelSelected;->clearInternal()V
 
-    :cond_5
-    :goto_1
+    :cond_7
+    :goto_2
     return-void
 
-    :cond_6
+    :cond_8
     const-string p1, "voiceState"
 
     invoke-static {p1}, Ly/u/b/j;->a(Ljava/lang/String;)V
diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali
index a08cec1983..e173c5703b 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali
@@ -181,7 +181,7 @@
 
     const-string v3, "browser_user_agent"
 
-    const-string v4, "Discord-Android/1109"
+    const-string v4, "Discord-Android/1111"
 
     invoke-direct {v2, v3, v4}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
@@ -189,7 +189,7 @@
 
     const/4 v1, 0x2
 
-    const/16 v2, 0x455
+    const/16 v2, 0x457
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -205,7 +205,7 @@
 
     const/4 v1, 0x3
 
-    const-string v2, "20-alpha2"
+    const-string v2, "20-alpha4"
 
     const-string v3, ""
 
diff --git a/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils.smali b/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils.smali
index 220d1dc29e..bc4149826f 100644
--- a/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils.smali
+++ b/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils.smali
@@ -3897,7 +3897,7 @@
     goto :goto_0
 
     :sswitch_16
-    const p1, 0x7f1215da
+    const p1, 0x7f1215db
 
     goto :goto_0
 
diff --git a/com.discord/smali/com/discord/utilities/fcm/NotificationData.smali b/com.discord/smali/com/discord/utilities/fcm/NotificationData.smali
index b7388a0eda..b24ce92563 100644
--- a/com.discord/smali/com/discord/utilities/fcm/NotificationData.smali
+++ b/com.discord/smali/com/discord/utilities/fcm/NotificationData.smali
@@ -2177,7 +2177,7 @@
 
     new-instance v1, Landroidx/core/app/NotificationCompat$Action$Builder;
 
-    const v3, 0x7f0803f1
+    const v3, 0x7f0803f2
 
     const v4, 0x7f120e73
 
diff --git a/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer.smali b/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer.smali
index db67f7086f..90ab19e786 100644
--- a/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer.smali
+++ b/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer.smali
@@ -1263,7 +1263,7 @@
 
     new-instance v2, Landroid/app/NotificationChannel;
 
-    const v4, 0x7f1215e3
+    const v4, 0x7f1215e4    # 1.9418095E38f
 
     invoke-virtual {p1, v4}, Landroid/app/Application;->getString(I)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/utilities/icon/IconUtils.smali b/com.discord/smali/com/discord/utilities/icon/IconUtils.smali
index 133e275b50..8cff2578b9 100644
--- a/com.discord/smali/com/discord/utilities/icon/IconUtils.smali
+++ b/com.discord/smali/com/discord/utilities/icon/IconUtils.smali
@@ -3213,7 +3213,7 @@
 
     if-eqz p1, :cond_1
 
-    const p1, 0x7f080482
+    const p1, 0x7f080483
 
     goto/16 :goto_3
 
@@ -3226,7 +3226,7 @@
 
     if-eqz p1, :cond_1
 
-    const p1, 0x7f08048f
+    const p1, 0x7f080490
 
     goto/16 :goto_3
 
@@ -3239,7 +3239,7 @@
 
     if-eqz p1, :cond_1
 
-    const p1, 0x7f080492
+    const p1, 0x7f080493
 
     goto/16 :goto_3
 
@@ -3274,7 +3274,7 @@
 
     if-eqz p1, :cond_1
 
-    const p1, 0x7f08048b
+    const p1, 0x7f08048c
 
     goto/16 :goto_3
 
@@ -3287,7 +3287,7 @@
 
     if-eqz p1, :cond_1
 
-    const p1, 0x7f08047e
+    const p1, 0x7f08047f
 
     goto :goto_3
 
@@ -3300,7 +3300,7 @@
 
     if-eqz p1, :cond_1
 
-    const p1, 0x7f080497
+    const p1, 0x7f080498
 
     goto :goto_3
 
@@ -3313,7 +3313,7 @@
 
     if-eqz p1, :cond_1
 
-    const p1, 0x7f08048a
+    const p1, 0x7f08048b
 
     goto :goto_3
 
@@ -3326,7 +3326,7 @@
 
     if-eqz p1, :cond_1
 
-    const p1, 0x7f080495
+    const p1, 0x7f080496
 
     goto :goto_3
 
@@ -3361,7 +3361,7 @@
 
     if-eqz p1, :cond_1
 
-    const p1, 0x7f080498
+    const p1, 0x7f080499
 
     goto :goto_3
 
@@ -3375,7 +3375,7 @@
     if-eqz p1, :cond_1
 
     :goto_0
-    const p1, 0x7f080485
+    const p1, 0x7f080486
 
     goto :goto_3
 
@@ -3389,13 +3389,13 @@
     if-eqz p1, :cond_1
 
     :goto_1
-    const p1, 0x7f080487
+    const p1, 0x7f080488
 
     goto :goto_3
 
     :cond_1
     :goto_2
-    const p1, 0x7f08049d
+    const p1, 0x7f08049e
 
     :goto_3
     return p1
diff --git a/com.discord/smali/com/discord/utilities/platform/Platform.smali b/com.discord/smali/com/discord/utilities/platform/Platform.smali
index 08b988e219..1ead96ffac 100644
--- a/com.discord/smali/com/discord/utilities/platform/Platform.smali
+++ b/com.discord/smali/com/discord/utilities/platform/Platform.smali
@@ -99,7 +99,7 @@
 
     move-result-object v6
 
-    const v1, 0x7f08047a
+    const v1, 0x7f08047b
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -437,7 +437,7 @@
 
     move-result-object v8
 
-    const v2, 0x7f080406
+    const v2, 0x7f080407
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -477,7 +477,7 @@
 
     move-result-object v8
 
-    const v2, 0x7f080411
+    const v2, 0x7f080412
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -519,7 +519,7 @@
 
     move-result-object v8
 
-    const v2, 0x7f08041b
+    const v2, 0x7f08041c
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -559,7 +559,7 @@
 
     move-result-object v8
 
-    const v2, 0x7f080439
+    const v2, 0x7f08043a
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -595,7 +595,7 @@
 
     move-result-object v8
 
-    const v2, 0x7f08043b
+    const v2, 0x7f08043c
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -663,7 +663,7 @@
 
     move-result-object v8
 
-    const v2, 0x7f08047b
+    const v2, 0x7f08047c
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
diff --git a/com.discord/smali/com/discord/utilities/presence/PresenceUtils.smali b/com.discord/smali/com/discord/utilities/presence/PresenceUtils.smali
index e25804cc67..3f770171c7 100644
--- a/com.discord/smali/com/discord/utilities/presence/PresenceUtils.smali
+++ b/com.discord/smali/com/discord/utilities/presence/PresenceUtils.smali
@@ -267,7 +267,7 @@
     goto :goto_2
 
     :cond_1
-    const v1, 0x7f1215fd
+    const v1, 0x7f1215fe
 
     new-array v3, v3, [Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider.smali b/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider.smali
index 69f4dec40a..24c7368418 100644
--- a/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider.smali
+++ b/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider.smali
@@ -159,7 +159,7 @@
 .method public getUserAgent()Ljava/lang/String;
     .locals 1
 
-    const-string v0, "Discord-Android/1109"
+    const-string v0, "Discord-Android/1111"
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/utilities/voice/DiscordOverlayService.smali b/com.discord/smali/com/discord/utilities/voice/DiscordOverlayService.smali
index 828a26109d..25cbae2c5d 100644
--- a/com.discord/smali/com/discord/utilities/voice/DiscordOverlayService.smali
+++ b/com.discord/smali/com/discord/utilities/voice/DiscordOverlayService.smali
@@ -317,7 +317,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f0803f5
+    const v2, 0x7f0803f6
 
     invoke-virtual {p1, v2, v1, v0}, Landroidx/core/app/NotificationCompat$Builder;->addAction(ILjava/lang/CharSequence;Landroid/app/PendingIntent;)Landroidx/core/app/NotificationCompat$Builder;
 
diff --git a/com.discord/smali/com/discord/utilities/voice/VoiceViewUtils.smali b/com.discord/smali/com/discord/utilities/voice/VoiceViewUtils.smali
index 948a0aa03a..b661197a49 100644
--- a/com.discord/smali/com/discord/utilities/voice/VoiceViewUtils.smali
+++ b/com.discord/smali/com/discord/utilities/voice/VoiceViewUtils.smali
@@ -459,7 +459,7 @@
     .annotation build Landroidx/annotation/DrawableRes;
     .end annotation
 
-    const v0, 0x7f08046b
+    const v0, 0x7f08046c
 
     if-nez p1, :cond_0
 
@@ -491,17 +491,17 @@
     goto :goto_0
 
     :cond_1
-    const v0, 0x7f08046a
+    const v0, 0x7f08046b
 
     goto :goto_0
 
     :cond_2
-    const v0, 0x7f080468
+    const v0, 0x7f080469
 
     goto :goto_0
 
     :cond_3
-    const v0, 0x7f080469
+    const v0, 0x7f08046a
 
     :goto_0
     return v0
diff --git a/com.discord/smali/com/discord/utils/R$c.smali b/com.discord/smali/com/discord/utils/R$c.smali
index 2fc1caaa38..b19d83c6ef 100644
--- a/com.discord/smali/com/discord/utils/R$c.smali
+++ b/com.discord/smali/com/discord/utils/R$c.smali
@@ -291,57 +291,57 @@
 
 .field public static final ic_mtrl_chip_close_circle:I = 0x7f08037e
 
-.field public static final mtrl_dialog_background:I = 0x7f080520
+.field public static final mtrl_dialog_background:I = 0x7f080521
 
-.field public static final mtrl_dropdown_arrow:I = 0x7f080521
+.field public static final mtrl_dropdown_arrow:I = 0x7f080522
 
-.field public static final mtrl_ic_arrow_drop_down:I = 0x7f080522
+.field public static final mtrl_ic_arrow_drop_down:I = 0x7f080523
 
-.field public static final mtrl_ic_arrow_drop_up:I = 0x7f080523
+.field public static final mtrl_ic_arrow_drop_up:I = 0x7f080524
 
-.field public static final mtrl_ic_cancel:I = 0x7f080524
+.field public static final mtrl_ic_cancel:I = 0x7f080525
 
-.field public static final mtrl_ic_error:I = 0x7f080525
+.field public static final mtrl_ic_error:I = 0x7f080526
 
-.field public static final mtrl_popupmenu_background:I = 0x7f080526
+.field public static final mtrl_popupmenu_background:I = 0x7f080527
 
-.field public static final mtrl_popupmenu_background_dark:I = 0x7f080527
+.field public static final mtrl_popupmenu_background_dark:I = 0x7f080528
 
-.field public static final mtrl_tabs_default_indicator:I = 0x7f080528
+.field public static final mtrl_tabs_default_indicator:I = 0x7f080529
 
-.field public static final navigation_empty_icon:I = 0x7f080529
+.field public static final navigation_empty_icon:I = 0x7f08052a
 
-.field public static final notification_action_background:I = 0x7f08052a
+.field public static final notification_action_background:I = 0x7f08052b
 
-.field public static final notification_bg:I = 0x7f08052b
+.field public static final notification_bg:I = 0x7f08052c
 
-.field public static final notification_bg_low:I = 0x7f08052c
+.field public static final notification_bg_low:I = 0x7f08052d
 
-.field public static final notification_bg_low_normal:I = 0x7f08052d
+.field public static final notification_bg_low_normal:I = 0x7f08052e
 
-.field public static final notification_bg_low_pressed:I = 0x7f08052e
+.field public static final notification_bg_low_pressed:I = 0x7f08052f
 
-.field public static final notification_bg_normal:I = 0x7f08052f
+.field public static final notification_bg_normal:I = 0x7f080530
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080530
+.field public static final notification_bg_normal_pressed:I = 0x7f080531
 
-.field public static final notification_icon_background:I = 0x7f080531
+.field public static final notification_icon_background:I = 0x7f080532
 
-.field public static final notification_template_icon_bg:I = 0x7f080532
+.field public static final notification_template_icon_bg:I = 0x7f080533
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080533
+.field public static final notification_template_icon_low_bg:I = 0x7f080534
 
-.field public static final notification_tile_bg:I = 0x7f080534
+.field public static final notification_tile_bg:I = 0x7f080535
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080535
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080536
 
-.field public static final preference_list_divider_material:I = 0x7f080536
+.field public static final preference_list_divider_material:I = 0x7f080537
 
-.field public static final test_custom_background:I = 0x7f080545
+.field public static final test_custom_background:I = 0x7f080547
 
-.field public static final tooltip_frame_dark:I = 0x7f080546
+.field public static final tooltip_frame_dark:I = 0x7f080548
 
-.field public static final tooltip_frame_light:I = 0x7f080547
+.field public static final tooltip_frame_light:I = 0x7f080549
 
 
 # direct methods
diff --git a/com.discord/smali/com/discord/views/ActiveSubscriptionView$ActiveSubscriptionType.smali b/com.discord/smali/com/discord/views/ActiveSubscriptionView$ActiveSubscriptionType.smali
index 4e5b095519..7a99cec892 100644
--- a/com.discord/smali/com/discord/views/ActiveSubscriptionView$ActiveSubscriptionType.smali
+++ b/com.discord/smali/com/discord/views/ActiveSubscriptionView$ActiveSubscriptionType.smali
@@ -62,13 +62,13 @@
 
     const/4 v3, 0x0
 
-    const v4, 0x7f0804ff
+    const v4, 0x7f080500
 
-    const v5, 0x7f0804fd
+    const v5, 0x7f0804fe
 
-    const v6, 0x7f080500
+    const v6, 0x7f080501
 
-    const v7, 0x7f0804fe
+    const v7, 0x7f0804ff
 
     const v8, 0x7f08009d
 
@@ -92,13 +92,13 @@
 
     const/4 v14, 0x1
 
-    const v15, 0x7f080507
+    const v15, 0x7f080508
 
-    const v16, 0x7f080505
+    const v16, 0x7f080506
 
-    const v17, 0x7f080508
+    const v17, 0x7f080509
 
-    const v18, 0x7f080506
+    const v18, 0x7f080507
 
     const v19, 0x7f0800a1
 
@@ -122,13 +122,13 @@
 
     const/4 v5, 0x2
 
-    const v6, 0x7f080503
+    const v6, 0x7f080504
 
-    const v7, 0x7f080501
+    const v7, 0x7f080502
 
-    const v8, 0x7f080504
+    const v8, 0x7f080505
 
-    const v9, 0x7f080502
+    const v9, 0x7f080503
 
     const v10, 0x7f08009e
 
diff --git a/com.discord/smali/com/discord/views/StatusView.smali b/com.discord/smali/com/discord/views/StatusView.smali
index abef34e8b8..cbe6f847e3 100644
--- a/com.discord/smali/com/discord/views/StatusView.smali
+++ b/com.discord/smali/com/discord/views/StatusView.smali
@@ -411,7 +411,7 @@
     :goto_0
     if-eqz v2, :cond_2
 
-    const v0, 0x7f08041a
+    const v0, 0x7f08041b
 
     goto :goto_2
 
@@ -447,22 +447,22 @@
     if-eq v0, v2, :cond_5
 
     :goto_1
-    const v0, 0x7f080418
+    const v0, 0x7f080419
 
     goto :goto_2
 
     :cond_5
-    const v0, 0x7f080416
-
-    goto :goto_2
-
-    :cond_6
     const v0, 0x7f080417
 
     goto :goto_2
 
+    :cond_6
+    const v0, 0x7f080418
+
+    goto :goto_2
+
     :cond_7
-    const v0, 0x7f080419
+    const v0, 0x7f08041a
 
     :goto_2
     invoke-virtual {p0, v0}, Landroidx/appcompat/widget/AppCompatImageView;->setImageResource(I)V
diff --git a/com.discord/smali/com/discord/views/StreamPreviewView.smali b/com.discord/smali/com/discord/views/StreamPreviewView.smali
index 8b000f8765..e644a3ec8a 100644
--- a/com.discord/smali/com/discord/views/StreamPreviewView.smali
+++ b/com.discord/smali/com/discord/views/StreamPreviewView.smali
@@ -397,7 +397,7 @@
     :goto_0
     if-eqz p3, :cond_3
 
-    const p1, 0x7f1215fb
+    const p1, 0x7f1215fc
 
     invoke-static {p0, p1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$validationManager$2.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$validationManager$2.smali
index bd7fc08d64..cc769af301 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$validationManager$2.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$validationManager$2.smali
@@ -68,7 +68,7 @@
 
     sget-object v6, Lcom/discord/utilities/view/validators/BasicTextInputValidator;->Companion:Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;
 
-    const v7, 0x7f121594
+    const v7, 0x7f121595
 
     invoke-virtual {v6, v7}, Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;->createRequiredInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator;
 
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3.smali
index b639660d13..368c4c06fc 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3.smali
@@ -20,7 +20,7 @@
     value = {
         "Ly/u/b/k;",
         "Lkotlin/jvm/functions/Function0<",
-        "Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;",
+        "Lcom/discord/widgets/channels/list/items/ChannelListItemVoiceChannel;",
         ">;"
     }
 .end annotation
@@ -29,100 +29,268 @@
 # instance fields
 .field public final synthetic $channel:Lcom/discord/models/domain/ModelChannel;
 
-.field public final synthetic $getTextLikeChannelData$1:Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$1;
+.field public final synthetic $channelId:J
 
-.field public final synthetic $muted:Z
+.field public final synthetic $channelsWithStreams$inlined:Ljava/util/Set;
+
+.field public final synthetic $collapsedCategories$inlined:Ljava/util/Set;
+
+.field public final synthetic $forceViewCategories$inlined:Ljava/util/HashSet;
+
+.field public final synthetic $guild$inlined:Lcom/discord/utilities/channel/GuildChannelsInfo;
+
+.field public final synthetic $items$inlined:Ljava/util/ArrayList;
+
+.field public final synthetic $mentionCounts$inlined:Ljava/util/Map;
 
 .field public final synthetic $permissions:Ljava/lang/Integer;
 
+.field public final synthetic $selectedChannelId$inlined:J
+
+.field public final synthetic $selectedGuildId$inlined:J
+
+.field public final synthetic $selectedVoiceChannelId$inlined:J
+
+.field public final synthetic $tryRemoveEmptyCategory$1$inlined:Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$1;
+
+.field public final synthetic $unreadChannelIds$inlined:Ljava/util/Set;
+
+.field public final synthetic $voiceStates$inlined:Ljava/util/Map;
+
 
 # direct methods
-.method public constructor <init>(Lcom/discord/models/domain/ModelChannel;Ljava/lang/Integer;Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$1;Z)V
-    .locals 0
+.method public constructor <init>(JLcom/discord/models/domain/ModelChannel;Ljava/lang/Integer;Lcom/discord/utilities/channel/GuildChannelsInfo;Ljava/util/HashSet;JLjava/util/Map;Ljava/util/Set;JLjava/util/Set;JLjava/util/Map;Ljava/util/Set;Ljava/util/ArrayList;Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$1;)V
+    .locals 3
 
-    iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3;->$channel:Lcom/discord/models/domain/ModelChannel;
+    move-object v0, p0
 
-    iput-object p2, p0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3;->$permissions:Ljava/lang/Integer;
+    move-wide v1, p1
 
-    iput-object p3, p0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3;->$getTextLikeChannelData$1:Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$1;
+    iput-wide v1, v0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3;->$channelId:J
 
-    iput-boolean p4, p0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3;->$muted:Z
+    move-object v1, p3
 
-    const/4 p1, 0x0
+    iput-object v1, v0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3;->$channel:Lcom/discord/models/domain/ModelChannel;
 
-    invoke-direct {p0, p1}, Ly/u/b/k;-><init>(I)V
+    move-object v1, p4
+
+    iput-object v1, v0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3;->$permissions:Ljava/lang/Integer;
+
+    move-object v1, p5
+
+    iput-object v1, v0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3;->$guild$inlined:Lcom/discord/utilities/channel/GuildChannelsInfo;
+
+    move-object v1, p6
+
+    iput-object v1, v0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3;->$forceViewCategories$inlined:Ljava/util/HashSet;
+
+    move-wide v1, p7
+
+    iput-wide v1, v0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3;->$selectedChannelId$inlined:J
+
+    move-object v1, p9
+
+    iput-object v1, v0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3;->$mentionCounts$inlined:Ljava/util/Map;
+
+    move-object v1, p10
+
+    iput-object v1, v0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3;->$unreadChannelIds$inlined:Ljava/util/Set;
+
+    move-wide v1, p11
+
+    iput-wide v1, v0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3;->$selectedGuildId$inlined:J
+
+    move-object/from16 v1, p13
+
+    iput-object v1, v0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3;->$collapsedCategories$inlined:Ljava/util/Set;
+
+    move-wide/from16 v1, p14
+
+    iput-wide v1, v0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3;->$selectedVoiceChannelId$inlined:J
+
+    move-object/from16 v1, p16
+
+    iput-object v1, v0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3;->$voiceStates$inlined:Ljava/util/Map;
+
+    move-object/from16 v1, p17
+
+    iput-object v1, v0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3;->$channelsWithStreams$inlined:Ljava/util/Set;
+
+    move-object/from16 v1, p18
+
+    iput-object v1, v0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3;->$items$inlined:Ljava/util/ArrayList;
+
+    move-object/from16 v1, p19
+
+    iput-object v1, v0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3;->$tryRemoveEmptyCategory$1$inlined:Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$1;
+
+    const/4 v1, 0x0
+
+    invoke-direct {p0, v1}, Ly/u/b/k;-><init>(I)V
 
     return-void
 .end method
 
 
 # virtual methods
-.method public final invoke()Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;
-    .locals 10
+.method public final invoke()Lcom/discord/widgets/channels/list/items/ChannelListItemVoiceChannel;
+    .locals 14
 
-    iget-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3;->$channel:Lcom/discord/models/domain/ModelChannel;
+    iget-wide v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3;->$channelId:J
+
+    iget-wide v2, p0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3;->$selectedVoiceChannelId$inlined:J
+
+    const/4 v4, 0x1
+
+    const/4 v5, 0x0
+
+    cmp-long v6, v0, v2
+
+    if-nez v6, :cond_0
+
+    const/4 v9, 0x1
+
+    goto :goto_0
+
+    :cond_0
+    const/4 v9, 0x0
+
+    :goto_0
+    iget-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3;->$voiceStates$inlined:Ljava/util/Map;
+
+    iget-object v1, p0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3;->$channel:Lcom/discord/models/domain/ModelChannel;
+
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelChannel;->getId()J
+
+    move-result-wide v1
+
+    invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v1
+
+    invoke-interface {v0, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v0
+
+    check-cast v0, Ljava/util/Collection;
+
+    if-eqz v0, :cond_1
+
+    invoke-interface {v0}, Ljava/util/Collection;->size()I
+
+    move-result v5
+
+    move v11, v5
+
+    goto :goto_1
+
+    :cond_1
+    const/4 v11, 0x0
+
+    :goto_1
+    const/high16 v0, 0x100000
+
+    iget-object v1, p0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3;->$guild$inlined:Lcom/discord/utilities/channel/GuildChannelsInfo;
+
+    invoke-virtual {v1}, Lcom/discord/utilities/channel/GuildChannelsInfo;->getEveryoneRole()Lcom/discord/models/domain/ModelGuildRole;
+
+    move-result-object v1
+
+    iget-object v2, p0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3;->$channel:Lcom/discord/models/domain/ModelChannel;
+
+    invoke-virtual {v2}, Lcom/discord/models/domain/ModelChannel;->getPermissionOverwrites()Ljava/util/Map;
+
+    move-result-object v2
+
+    iget-wide v5, p0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3;->$selectedGuildId$inlined:J
+
+    invoke-static {v5, v6}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+    move-result-object v3
+
+    invoke-interface {v2, v3}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+    move-result-object v2
+
+    check-cast v2, Lcom/discord/models/domain/ModelPermissionOverwrite;
+
+    invoke-static {v0, v1, v2}, Lcom/discord/utilities/permissions/PermissionUtils;->canRole(ILcom/discord/models/domain/ModelGuildRole;Lcom/discord/models/domain/ModelPermissionOverwrite;)Z
+
+    move-result v0
+
+    xor-int/lit8 v12, v0, 0x1
+
+    const/16 v0, 0x400
 
     iget-object v1, p0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3;->$permissions:Ljava/lang/Integer;
 
-    invoke-static {v0, v1}, Lcom/discord/utilities/permissions/PermissionUtils;->hasAccess(Lcom/discord/models/domain/ModelChannel;Ljava/lang/Integer;)Z
+    invoke-static {v0, v1}, Lcom/discord/utilities/permissions/PermissionUtils;->can(ILjava/lang/Integer;)Z
 
     move-result v0
 
     const/4 v1, 0x0
 
-    if-nez v0, :cond_0
+    if-nez v0, :cond_2
+
+    if-nez v9, :cond_2
 
     return-object v1
 
-    :cond_0
-    iget-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3;->$getTextLikeChannelData$1:Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$1;
+    :cond_2
+    iget-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3;->$collapsedCategories$inlined:Ljava/util/Set;
 
-    invoke-virtual {v0}, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$1;->invoke()Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$TextLikeChannelData;
+    iget-object v2, p0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3;->$channel:Lcom/discord/models/domain/ModelChannel;
 
-    move-result-object v0
+    invoke-virtual {v2}, Lcom/discord/models/domain/ModelChannel;->getParentId()J
 
-    invoke-virtual {v0}, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$TextLikeChannelData;->getHide()Z
+    move-result-wide v2
 
-    move-result v2
+    invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    if-eqz v2, :cond_1
+    move-result-object v2
+
+    invoke-interface {v0, v2}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_3
+
+    if-nez v11, :cond_3
+
+    if-nez v9, :cond_3
 
     return-object v1
 
-    :cond_1
-    new-instance v1, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;
+    :cond_3
+    new-instance v0, Lcom/discord/widgets/channels/list/items/ChannelListItemVoiceChannel;
 
-    iget-object v4, p0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3;->$channel:Lcom/discord/models/domain/ModelChannel;
+    iget-object v8, p0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3;->$channel:Lcom/discord/models/domain/ModelChannel;
 
-    invoke-virtual {v0}, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$TextLikeChannelData;->getSelected()Z
+    iget-object v10, p0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3;->$permissions:Ljava/lang/Integer;
 
-    move-result v5
+    iget-object v1, p0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3;->$channelsWithStreams$inlined:Ljava/util/Set;
 
-    invoke-virtual {v0}, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$TextLikeChannelData;->getMentionCount()I
+    iget-wide v2, p0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3;->$channelId:J
 
-    move-result v6
+    invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    invoke-virtual {v0}, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$TextLikeChannelData;->getUnread()Z
+    move-result-object v2
 
-    move-result v7
+    invoke-interface {v1, v2}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
 
-    iget-boolean v8, p0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3;->$muted:Z
+    move-result v13
 
-    invoke-virtual {v0}, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$TextLikeChannelData;->getLocked()Z
+    move-object v7, v0
 
-    move-result v9
+    invoke-direct/range {v7 .. v13}, Lcom/discord/widgets/channels/list/items/ChannelListItemVoiceChannel;-><init>(Lcom/discord/models/domain/ModelChannel;ZLjava/lang/Integer;IZZ)V
 
-    move-object v3, v1
-
-    invoke-direct/range {v3 .. v9}, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;-><init>(Lcom/discord/models/domain/ModelChannel;ZIZZZ)V
-
-    return-object v1
+    return-object v0
 .end method
 
 .method public bridge synthetic invoke()Ljava/lang/Object;
     .locals 1
 
-    invoke-virtual {p0}, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3;->invoke()Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;
+    invoke-virtual {p0}, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3;->invoke()Lcom/discord/widgets/channels/list/items/ChannelListItemVoiceChannel;
 
     move-result-object v0
 
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$4.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$4.smali
deleted file mode 100644
index ba74b86c97..0000000000
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$4.smali
+++ /dev/null
@@ -1,298 +0,0 @@
-.class public final Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$4;
-.super Ly/u/b/k;
-.source "WidgetChannelListModel.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function0;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion;->guildListBuilder(JLcom/discord/utilities/channel/GuildChannelsInfo;Ljava/util/Map;JJLjava/util/Map;Ljava/util/Map;Ljava/util/Set;Ljava/util/Set;)Ljava/util/List;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
-    value = {
-        "Ly/u/b/k;",
-        "Lkotlin/jvm/functions/Function0<",
-        "Lcom/discord/widgets/channels/list/items/ChannelListItemVoiceChannel;",
-        ">;"
-    }
-.end annotation
-
-
-# instance fields
-.field public final synthetic $channel:Lcom/discord/models/domain/ModelChannel;
-
-.field public final synthetic $channelId:J
-
-.field public final synthetic $channelsWithStreams$inlined:Ljava/util/Set;
-
-.field public final synthetic $collapsedCategories$inlined:Ljava/util/Set;
-
-.field public final synthetic $forceViewCategories$inlined:Ljava/util/HashSet;
-
-.field public final synthetic $guild$inlined:Lcom/discord/utilities/channel/GuildChannelsInfo;
-
-.field public final synthetic $items$inlined:Ljava/util/ArrayList;
-
-.field public final synthetic $mentionCounts$inlined:Ljava/util/Map;
-
-.field public final synthetic $permissions:Ljava/lang/Integer;
-
-.field public final synthetic $selectedChannelId$inlined:J
-
-.field public final synthetic $selectedGuildId$inlined:J
-
-.field public final synthetic $selectedVoiceChannelId$inlined:J
-
-.field public final synthetic $tryRemoveEmptyCategory$1$inlined:Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$1;
-
-.field public final synthetic $unreadChannelIds$inlined:Ljava/util/Set;
-
-.field public final synthetic $voiceStates$inlined:Ljava/util/Map;
-
-
-# direct methods
-.method public constructor <init>(JLcom/discord/models/domain/ModelChannel;Ljava/lang/Integer;Lcom/discord/utilities/channel/GuildChannelsInfo;Ljava/util/HashSet;JLjava/util/Map;Ljava/util/Set;JLjava/util/Set;JLjava/util/Map;Ljava/util/Set;Ljava/util/ArrayList;Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$1;)V
-    .locals 3
-
-    move-object v0, p0
-
-    move-wide v1, p1
-
-    iput-wide v1, v0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$4;->$channelId:J
-
-    move-object v1, p3
-
-    iput-object v1, v0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$4;->$channel:Lcom/discord/models/domain/ModelChannel;
-
-    move-object v1, p4
-
-    iput-object v1, v0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$4;->$permissions:Ljava/lang/Integer;
-
-    move-object v1, p5
-
-    iput-object v1, v0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$4;->$guild$inlined:Lcom/discord/utilities/channel/GuildChannelsInfo;
-
-    move-object v1, p6
-
-    iput-object v1, v0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$4;->$forceViewCategories$inlined:Ljava/util/HashSet;
-
-    move-wide v1, p7
-
-    iput-wide v1, v0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$4;->$selectedChannelId$inlined:J
-
-    move-object v1, p9
-
-    iput-object v1, v0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$4;->$mentionCounts$inlined:Ljava/util/Map;
-
-    move-object v1, p10
-
-    iput-object v1, v0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$4;->$unreadChannelIds$inlined:Ljava/util/Set;
-
-    move-wide v1, p11
-
-    iput-wide v1, v0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$4;->$selectedGuildId$inlined:J
-
-    move-object/from16 v1, p13
-
-    iput-object v1, v0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$4;->$collapsedCategories$inlined:Ljava/util/Set;
-
-    move-wide/from16 v1, p14
-
-    iput-wide v1, v0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$4;->$selectedVoiceChannelId$inlined:J
-
-    move-object/from16 v1, p16
-
-    iput-object v1, v0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$4;->$voiceStates$inlined:Ljava/util/Map;
-
-    move-object/from16 v1, p17
-
-    iput-object v1, v0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$4;->$channelsWithStreams$inlined:Ljava/util/Set;
-
-    move-object/from16 v1, p18
-
-    iput-object v1, v0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$4;->$items$inlined:Ljava/util/ArrayList;
-
-    move-object/from16 v1, p19
-
-    iput-object v1, v0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$4;->$tryRemoveEmptyCategory$1$inlined:Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$1;
-
-    const/4 v1, 0x0
-
-    invoke-direct {p0, v1}, Ly/u/b/k;-><init>(I)V
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public final invoke()Lcom/discord/widgets/channels/list/items/ChannelListItemVoiceChannel;
-    .locals 14
-
-    iget-wide v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$4;->$channelId:J
-
-    iget-wide v2, p0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$4;->$selectedVoiceChannelId$inlined:J
-
-    const/4 v4, 0x1
-
-    const/4 v5, 0x0
-
-    cmp-long v6, v0, v2
-
-    if-nez v6, :cond_0
-
-    const/4 v9, 0x1
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v9, 0x0
-
-    :goto_0
-    iget-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$4;->$voiceStates$inlined:Ljava/util/Map;
-
-    iget-object v1, p0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$4;->$channel:Lcom/discord/models/domain/ModelChannel;
-
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelChannel;->getId()J
-
-    move-result-wide v1
-
-    invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v1
-
-    invoke-interface {v0, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Ljava/util/Collection;
-
-    if-eqz v0, :cond_1
-
-    invoke-interface {v0}, Ljava/util/Collection;->size()I
-
-    move-result v5
-
-    move v11, v5
-
-    goto :goto_1
-
-    :cond_1
-    const/4 v11, 0x0
-
-    :goto_1
-    const/high16 v0, 0x100000
-
-    iget-object v1, p0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$4;->$guild$inlined:Lcom/discord/utilities/channel/GuildChannelsInfo;
-
-    invoke-virtual {v1}, Lcom/discord/utilities/channel/GuildChannelsInfo;->getEveryoneRole()Lcom/discord/models/domain/ModelGuildRole;
-
-    move-result-object v1
-
-    iget-object v2, p0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$4;->$channel:Lcom/discord/models/domain/ModelChannel;
-
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelChannel;->getPermissionOverwrites()Ljava/util/Map;
-
-    move-result-object v2
-
-    iget-wide v5, p0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$4;->$selectedGuildId$inlined:J
-
-    invoke-static {v5, v6}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v3
-
-    invoke-interface {v2, v3}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
-    move-result-object v2
-
-    check-cast v2, Lcom/discord/models/domain/ModelPermissionOverwrite;
-
-    invoke-static {v0, v1, v2}, Lcom/discord/utilities/permissions/PermissionUtils;->canRole(ILcom/discord/models/domain/ModelGuildRole;Lcom/discord/models/domain/ModelPermissionOverwrite;)Z
-
-    move-result v0
-
-    xor-int/lit8 v12, v0, 0x1
-
-    const/16 v0, 0x400
-
-    iget-object v1, p0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$4;->$permissions:Ljava/lang/Integer;
-
-    invoke-static {v0, v1}, Lcom/discord/utilities/permissions/PermissionUtils;->can(ILjava/lang/Integer;)Z
-
-    move-result v0
-
-    const/4 v1, 0x0
-
-    if-nez v0, :cond_2
-
-    if-nez v9, :cond_2
-
-    return-object v1
-
-    :cond_2
-    iget-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$4;->$collapsedCategories$inlined:Ljava/util/Set;
-
-    iget-object v2, p0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$4;->$channel:Lcom/discord/models/domain/ModelChannel;
-
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelChannel;->getParentId()J
-
-    move-result-wide v2
-
-    invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v2
-
-    invoke-interface {v0, v2}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_3
-
-    if-nez v11, :cond_3
-
-    if-nez v9, :cond_3
-
-    return-object v1
-
-    :cond_3
-    new-instance v0, Lcom/discord/widgets/channels/list/items/ChannelListItemVoiceChannel;
-
-    iget-object v8, p0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$4;->$channel:Lcom/discord/models/domain/ModelChannel;
-
-    iget-object v10, p0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$4;->$permissions:Ljava/lang/Integer;
-
-    iget-object v1, p0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$4;->$channelsWithStreams$inlined:Ljava/util/Set;
-
-    iget-wide v2, p0, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$4;->$channelId:J
-
-    invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
-    move-result-object v2
-
-    invoke-interface {v1, v2}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
-
-    move-result v13
-
-    move-object v7, v0
-
-    invoke-direct/range {v7 .. v13}, Lcom/discord/widgets/channels/list/items/ChannelListItemVoiceChannel;-><init>(Lcom/discord/models/domain/ModelChannel;ZLjava/lang/Integer;IZZ)V
-
-    return-object v0
-.end method
-
-.method public bridge synthetic invoke()Ljava/lang/Object;
-    .locals 1
-
-    invoke-virtual {p0}, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$4;->invoke()Lcom/discord/widgets/channels/list/items/ChannelListItemVoiceChannel;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion.smali
index 1da9b721b8..65ef7724f4 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion.smali
@@ -474,7 +474,7 @@
 
     move-result v0
 
-    if-eqz v0, :cond_13
+    if-eqz v0, :cond_11
 
     invoke-interface/range {v24 .. v24}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
@@ -582,7 +582,7 @@
 
     move-result v0
 
-    if-eqz v0, :cond_12
+    if-eqz v0, :cond_10
 
     invoke-interface/range {v26 .. v26}, Ljava/util/Iterator;->next()Ljava/lang/Object;
 
@@ -704,11 +704,7 @@
 
     invoke-direct {v14, v15, v4, v0, v13}, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$2;-><init>(Lcom/discord/models/domain/ModelChannel;Ljava/lang/Integer;Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$1;Z)V
 
-    new-instance v11, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3;
-
-    invoke-direct {v11, v15, v4, v0, v13}, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3;-><init>(Lcom/discord/models/domain/ModelChannel;Ljava/lang/Integer;Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$1;Z)V
-
-    new-instance v20, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$4;
+    new-instance v20, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3;
 
     move-object/from16 v0, v20
 
@@ -726,15 +722,13 @@
 
     move-object/from16 v10, p11
 
-    move-object/from16 v27, v11
-
     move-wide/from16 v11, p1
 
     move/from16 v36, v13
 
     move-object/from16 v13, p12
 
-    move-object/from16 v28, v14
+    move-object/from16 v27, v14
 
     move-wide/from16 v14, p7
 
@@ -746,95 +740,91 @@
 
     move-object/from16 v19, v35
 
-    invoke-direct/range {v0 .. v19}, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$4;-><init>(JLcom/discord/models/domain/ModelChannel;Ljava/lang/Integer;Lcom/discord/utilities/channel/GuildChannelsInfo;Ljava/util/HashSet;JLjava/util/Map;Ljava/util/Set;JLjava/util/Set;JLjava/util/Map;Ljava/util/Set;Ljava/util/ArrayList;Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$1;)V
+    invoke-direct/range {v0 .. v19}, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3;-><init>(JLcom/discord/models/domain/ModelChannel;Ljava/lang/Integer;Lcom/discord/utilities/channel/GuildChannelsInfo;Ljava/util/HashSet;JLjava/util/Map;Ljava/util/Set;JLjava/util/Set;JLjava/util/Map;Ljava/util/Set;Ljava/util/ArrayList;Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$1;)V
 
     invoke-virtual/range {v32 .. v32}, Lcom/discord/models/domain/ModelChannel;->getType()I
 
     move-result v0
 
-    if-eqz v0, :cond_10
+    if-eqz v0, :cond_a
 
     const/4 v1, 0x2
 
-    if-eq v0, v1, :cond_e
+    if-eq v0, v1, :cond_d
 
     const/4 v1, 0x4
 
-    if-eq v0, v1, :cond_c
+    if-eq v0, v1, :cond_b
 
     const/4 v1, 0x5
 
-    if-eq v0, v1, :cond_b
+    if-eq v0, v1, :cond_a
 
     move-object/from16 v1, p4
 
-    :cond_a
-    :goto_6
-    move-object/from16 v2, p9
+    move-object/from16 v4, p9
 
-    move-object/from16 v3, p12
+    move-object/from16 v2, p12
 
-    move/from16 v4, v33
+    move/from16 v3, v33
 
     goto :goto_8
 
+    :cond_a
+    move-object/from16 v1, p4
+
+    move-object/from16 v4, p9
+
+    move-object/from16 v2, p12
+
+    move/from16 v3, v33
+
+    goto :goto_7
+
     :cond_b
-    invoke-virtual/range {v27 .. v27}, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3;->invoke()Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;
-
-    move-result-object v0
-
-    move-object/from16 v1, p4
-
-    if-eqz v0, :cond_a
-
-    invoke-virtual {v1, v0}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
-    goto :goto_6
-
-    :cond_c
-    move-object/from16 v1, p4
-
     invoke-virtual/range {v35 .. v35}, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$1;->invoke()V
 
     new-instance v0, Lcom/discord/widgets/channels/list/items/ChannelListItemCategory;
 
     invoke-static/range {v30 .. v31}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 
-    move-result-object v2
+    move-result-object v1
 
-    move-object/from16 v3, p12
+    move-object/from16 v2, p12
 
-    invoke-interface {v3, v2}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
+    invoke-interface {v2, v1}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
 
-    move-result v2
+    move-result v1
 
-    move-object/from16 v5, v32
+    move-object/from16 v4, v32
 
-    move/from16 v4, v33
+    move/from16 v3, v33
 
-    move/from16 v6, v36
+    move/from16 v5, v36
 
-    invoke-direct {v0, v5, v2, v6, v4}, Lcom/discord/widgets/channels/list/items/ChannelListItemCategory;-><init>(Lcom/discord/models/domain/ModelChannel;ZZZ)V
+    invoke-direct {v0, v4, v1, v5, v3}, Lcom/discord/widgets/channels/list/items/ChannelListItemCategory;-><init>(Lcom/discord/models/domain/ModelChannel;ZZZ)V
+
+    move-object/from16 v1, p4
 
     invoke-virtual {v1, v0}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
-    :cond_d
-    move-object/from16 v2, p9
+    :cond_c
+    move-object/from16 v4, p9
 
     goto :goto_8
 
-    :cond_e
+    :cond_d
     move-object/from16 v1, p4
 
-    move-object/from16 v3, p12
+    move-object/from16 v2, p12
 
-    move/from16 v4, v33
+    move/from16 v3, v33
 
-    invoke-virtual/range {v20 .. v20}, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$4;->invoke()Lcom/discord/widgets/channels/list/items/ChannelListItemVoiceChannel;
+    invoke-virtual/range {v20 .. v20}, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3;->invoke()Lcom/discord/widgets/channels/list/items/ChannelListItemVoiceChannel;
 
     move-result-object v0
 
-    if-eqz v0, :cond_d
+    if-eqz v0, :cond_c
 
     invoke-virtual {v1, v0}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
@@ -842,50 +832,42 @@
 
     move-result-object v0
 
-    move-object/from16 v2, p9
+    move-object/from16 v4, p9
 
-    invoke-interface {v2, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+    invoke-interface {v4, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
 
     move-result-object v0
 
     check-cast v0, Ljava/util/Collection;
 
-    if-eqz v0, :cond_f
+    if-eqz v0, :cond_e
 
-    goto :goto_7
+    goto :goto_6
 
-    :cond_f
+    :cond_e
     sget-object v0, Ly/q/o;->d:Ly/q/o;
 
-    :goto_7
+    :goto_6
     invoke-virtual {v1, v0}, Ljava/util/ArrayList;->addAll(Ljava/util/Collection;)Z
 
     goto :goto_8
 
-    :cond_10
-    move-object/from16 v1, p4
-
-    move-object/from16 v2, p9
-
-    move-object/from16 v3, p12
-
-    move/from16 v4, v33
-
-    invoke-virtual/range {v28 .. v28}, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$2;->invoke()Lcom/discord/widgets/channels/list/items/ChannelListItemTextChannel;
+    :goto_7
+    invoke-virtual/range {v27 .. v27}, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$2;->invoke()Lcom/discord/widgets/channels/list/items/ChannelListItemTextChannel;
 
     move-result-object v0
 
-    if-eqz v0, :cond_11
+    if-eqz v0, :cond_f
 
     invoke-virtual {v1, v0}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
 
-    :cond_11
+    :cond_f
     :goto_8
     move-object v14, v1
 
-    move-object v15, v3
+    move-object v15, v2
 
-    move v11, v4
+    move v11, v3
 
     move-object/from16 v12, v34
 
@@ -893,12 +875,12 @@
 
     goto/16 :goto_4
 
-    :cond_12
-    move-object/from16 v2, p9
+    :cond_10
+    move-object/from16 v4, p9
 
     goto/16 :goto_2
 
-    :cond_13
+    :cond_11
     move-object/from16 v35, v13
 
     move-object v1, v14
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList.smali
index a187fee26e..699c6e5c3c 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList.smali
@@ -846,12 +846,12 @@
 
     if-eqz v3, :cond_2
 
-    const v3, 0x7f08045e
+    const v3, 0x7f08045f
 
     goto/16 :goto_0
 
     :cond_2
-    const v3, 0x7f08045f
+    const v3, 0x7f080460
 
     goto/16 :goto_0
 
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$Item$1.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$Item$1.smali
index 09d03c25ec..f99e01e4ca 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$Item$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$Item$1.smali
@@ -73,33 +73,12 @@
 
     invoke-interface {p1, p2}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
-    goto/16 :goto_0
-
-    :cond_0
-    instance-of p1, p3, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;
-
-    if-eqz p1, :cond_1
-
-    iget-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$Item$1;->$adapter:Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter;
-
-    invoke-virtual {p1}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter;->getOnSelectChannel()Lkotlin/jvm/functions/Function1;
-
-    move-result-object p1
-
-    check-cast p3, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;
-
-    invoke-virtual {p3}, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;->getChannel()Lcom/discord/models/domain/ModelChannel;
-
-    move-result-object p2
-
-    invoke-interface {p1, p2}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-
     goto :goto_0
 
-    :cond_1
+    :cond_0
     instance-of p1, p3, Lcom/discord/widgets/channels/list/items/ChannelListItemCategory;
 
-    if-eqz p1, :cond_2
+    if-eqz p1, :cond_1
 
     iget-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$Item$1;->$adapter:Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter;
 
@@ -125,10 +104,10 @@
 
     goto :goto_0
 
-    :cond_2
+    :cond_1
     instance-of p1, p3, Lcom/discord/widgets/channels/list/items/ChannelListItemPrivate;
 
-    if-eqz p1, :cond_3
+    if-eqz p1, :cond_2
 
     iget-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$Item$1;->$adapter:Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter;
 
@@ -146,10 +125,10 @@
 
     goto :goto_0
 
-    :cond_3
+    :cond_2
     instance-of p1, p3, Lcom/discord/widgets/channels/list/items/ChannelListItemFriends;
 
-    if-eqz p1, :cond_4
+    if-eqz p1, :cond_3
 
     iget-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$Item$1;->$adapter:Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter;
 
@@ -163,10 +142,10 @@
 
     goto :goto_0
 
-    :cond_4
+    :cond_3
     instance-of p1, p3, Lcom/discord/widgets/channels/list/items/ChannelListItemVoiceChannel;
 
-    if-eqz p1, :cond_5
+    if-eqz p1, :cond_4
 
     iget-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$Item$1;->$adapter:Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter;
 
@@ -184,10 +163,10 @@
 
     goto :goto_0
 
-    :cond_5
+    :cond_4
     instance-of p1, p3, Lcom/discord/widgets/channels/list/items/ChannelListItemVoiceUser;
 
-    if-eqz p1, :cond_6
+    if-eqz p1, :cond_5
 
     iget-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$Item$1;->$adapter:Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter;
 
@@ -203,7 +182,7 @@
 
     invoke-interface {p1, p2}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
-    :cond_6
+    :cond_5
     :goto_0
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$Item$2.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$Item$2.smali
index 9e6af096fe..e7dba736e4 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$Item$2.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$Item$2.smali
@@ -76,30 +76,9 @@
     goto :goto_0
 
     :cond_0
-    instance-of p1, p3, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;
-
-    if-eqz p1, :cond_1
-
-    iget-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$Item$2;->$adapter:Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter;
-
-    invoke-virtual {p1}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter;->getOnSelectChannelOptions()Lkotlin/jvm/functions/Function1;
-
-    move-result-object p1
-
-    check-cast p3, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;
-
-    invoke-virtual {p3}, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;->getChannel()Lcom/discord/models/domain/ModelChannel;
-
-    move-result-object p2
-
-    invoke-interface {p1, p2}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-
-    goto :goto_0
-
-    :cond_1
     instance-of p1, p3, Lcom/discord/widgets/channels/list/items/ChannelListItemCategory;
 
-    if-eqz p1, :cond_2
+    if-eqz p1, :cond_1
 
     iget-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$Item$2;->$adapter:Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter;
 
@@ -117,10 +96,10 @@
 
     goto :goto_0
 
-    :cond_2
+    :cond_1
     instance-of p1, p3, Lcom/discord/widgets/channels/list/items/ChannelListItemPrivate;
 
-    if-eqz p1, :cond_3
+    if-eqz p1, :cond_2
 
     iget-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$Item$2;->$adapter:Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter;
 
@@ -138,10 +117,10 @@
 
     goto :goto_0
 
-    :cond_3
+    :cond_2
     instance-of p1, p3, Lcom/discord/widgets/channels/list/items/ChannelListItemVoiceUser;
 
-    if-eqz p1, :cond_4
+    if-eqz p1, :cond_3
 
     iget-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$Item$2;->$adapter:Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter;
 
@@ -163,10 +142,10 @@
 
     goto :goto_0
 
-    :cond_4
+    :cond_3
     instance-of p1, p3, Lcom/discord/widgets/channels/list/items/ChannelListItemVoiceChannel;
 
-    if-eqz p1, :cond_5
+    if-eqz p1, :cond_4
 
     iget-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$Item$2;->$adapter:Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter;
 
@@ -182,7 +161,7 @@
 
     invoke-interface {p1, p2}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
 
-    :cond_5
+    :cond_4
     :goto_0
     return-void
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelAnnouncement.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelAnnouncement.smali
deleted file mode 100644
index 71de5be372..0000000000
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelAnnouncement.smali
+++ /dev/null
@@ -1,592 +0,0 @@
-.class public final Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelAnnouncement;
-.super Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$Item;
-.source "WidgetChannelsListAdapter.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x19
-    name = "ItemChannelAnnouncement"
-.end annotation
-
-
-# static fields
-.field public static final synthetic $$delegatedProperties:[Lkotlin/reflect/KProperty;
-
-
-# instance fields
-.field public final itemHash$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-.field public final itemMentions$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-.field public final itemName$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-.field public final itemUnread$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-
-# direct methods
-.method public static constructor <clinit>()V
-    .locals 7
-
-    const-class v0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelAnnouncement;
-
-    const/4 v1, 0x4
-
-    new-array v1, v1, [Lkotlin/reflect/KProperty;
-
-    new-instance v2, Ly/u/b/u;
-
-    invoke-static {v0}, Ly/u/b/x;->getOrCreateKotlinClass(Ljava/lang/Class;)Ly/y/b;
-
-    move-result-object v3
-
-    const-string v4, "itemHash"
-
-    const-string v5, "getItemHash()Landroid/widget/ImageView;"
-
-    invoke-direct {v2, v3, v4, v5}, Ly/u/b/u;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    sget-object v3, Ly/u/b/x;->a:Ly/u/b/y;
-
-    invoke-virtual {v3, v2}, Ly/u/b/y;->property1(Ly/u/b/t;)Ly/y/d;
-
-    const/4 v3, 0x0
-
-    aput-object v2, v1, v3
-
-    const/4 v2, 0x1
-
-    new-instance v3, Ly/u/b/u;
-
-    invoke-static {v0}, Ly/u/b/x;->getOrCreateKotlinClass(Ljava/lang/Class;)Ly/y/b;
-
-    move-result-object v4
-
-    const-string v5, "itemName"
-
-    const-string v6, "getItemName()Landroid/widget/TextView;"
-
-    invoke-direct {v3, v4, v5, v6}, Ly/u/b/u;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    sget-object v4, Ly/u/b/x;->a:Ly/u/b/y;
-
-    invoke-virtual {v4, v3}, Ly/u/b/y;->property1(Ly/u/b/t;)Ly/y/d;
-
-    aput-object v3, v1, v2
-
-    const/4 v2, 0x2
-
-    new-instance v3, Ly/u/b/u;
-
-    invoke-static {v0}, Ly/u/b/x;->getOrCreateKotlinClass(Ljava/lang/Class;)Ly/y/b;
-
-    move-result-object v4
-
-    const-string v5, "itemMentions"
-
-    const-string v6, "getItemMentions()Landroid/widget/TextView;"
-
-    invoke-direct {v3, v4, v5, v6}, Ly/u/b/u;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    sget-object v4, Ly/u/b/x;->a:Ly/u/b/y;
-
-    invoke-virtual {v4, v3}, Ly/u/b/y;->property1(Ly/u/b/t;)Ly/y/d;
-
-    aput-object v3, v1, v2
-
-    const/4 v2, 0x3
-
-    new-instance v3, Ly/u/b/u;
-
-    invoke-static {v0}, Ly/u/b/x;->getOrCreateKotlinClass(Ljava/lang/Class;)Ly/y/b;
-
-    move-result-object v0
-
-    const-string v4, "itemUnread"
-
-    const-string v5, "getItemUnread()Landroid/view/View;"
-
-    invoke-direct {v3, v0, v4, v5}, Ly/u/b/u;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
-
-    sget-object v0, Ly/u/b/x;->a:Ly/u/b/y;
-
-    invoke-virtual {v0, v3}, Ly/u/b/y;->property1(Ly/u/b/t;)Ly/y/d;
-
-    aput-object v3, v1, v2
-
-    sput-object v1, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelAnnouncement;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
-
-    return-void
-.end method
-
-.method public constructor <init>(ILcom/discord/widgets/channels/list/WidgetChannelsListAdapter;)V
-    .locals 0
-
-    if-eqz p2, :cond_0
-
-    invoke-direct {p0, p1, p2}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$Item;-><init>(ILcom/discord/widgets/channels/list/WidgetChannelsListAdapter;)V
-
-    const p1, 0x7f0a01ab
-
-    invoke-static {p0, p1}, Lf/n/a/j/a;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelAnnouncement;->itemHash$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const p1, 0x7f0a01ad
-
-    invoke-static {p0, p1}, Lf/n/a/j/a;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelAnnouncement;->itemName$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const p1, 0x7f0a01ac
-
-    invoke-static {p0, p1}, Lf/n/a/j/a;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelAnnouncement;->itemMentions$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    const p1, 0x7f0a01ae
-
-    invoke-static {p0, p1}, Lf/n/a/j/a;->a(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
-
-    move-result-object p1
-
-    iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelAnnouncement;->itemUnread$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    return-void
-
-    :cond_0
-    const-string p1, "adapter"
-
-    invoke-static {p1}, Ly/u/b/j;->a(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method private final getAnnouncementsIcon(Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;)I
-    .locals 1
-    .annotation build Landroidx/annotation/DrawableRes;
-    .end annotation
-
-    invoke-virtual {p1}, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;->getChannel()Lcom/discord/models/domain/ModelChannel;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelChannel;->isNsfw()Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    const p1, 0x7f080271
-
-    goto :goto_0
-
-    :cond_0
-    invoke-virtual {p1}, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;->isLocked()Z
-
-    move-result p1
-
-    if-eqz p1, :cond_1
-
-    const p1, 0x7f080270
-
-    goto :goto_0
-
-    :cond_1
-    const p1, 0x7f08026f
-
-    :goto_0
-    return p1
-.end method
-
-.method private final getItemHash()Landroid/widget/ImageView;
-    .locals 3
-
-    iget-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelAnnouncement;->itemHash$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    sget-object v1, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelAnnouncement;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
-
-    const/4 v2, 0x0
-
-    aget-object v1, v1, v2
-
-    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Landroid/widget/ImageView;
-
-    return-object v0
-.end method
-
-.method private final getItemMentions()Landroid/widget/TextView;
-    .locals 3
-
-    iget-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelAnnouncement;->itemMentions$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    sget-object v1, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelAnnouncement;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
-
-    const/4 v2, 0x2
-
-    aget-object v1, v1, v2
-
-    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Landroid/widget/TextView;
-
-    return-object v0
-.end method
-
-.method private final getItemName()Landroid/widget/TextView;
-    .locals 3
-
-    iget-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelAnnouncement;->itemName$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    sget-object v1, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelAnnouncement;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
-
-    const/4 v2, 0x1
-
-    aget-object v1, v1, v2
-
-    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Landroid/widget/TextView;
-
-    return-object v0
-.end method
-
-.method private final getItemUnread()Landroid/view/View;
-    .locals 3
-
-    iget-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelAnnouncement;->itemUnread$delegate:Lkotlin/properties/ReadOnlyProperty;
-
-    sget-object v1, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelAnnouncement;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
-
-    const/4 v2, 0x3
-
-    aget-object v1, v1, v2
-
-    invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
-
-    move-result-object v0
-
-    check-cast v0, Landroid/view/View;
-
-    return-object v0
-.end method
-
-.method private final getTextColor(Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;Z)I
-    .locals 2
-    .annotation build Landroidx/annotation/ColorInt;
-    .end annotation
-
-    const v0, 0x7f04010c
-
-    const-string v1, "itemView"
-
-    if-eqz p2, :cond_0
-
-    iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
-
-    invoke-static {p1, v1}, Ly/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-static {p1, v0}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/view/View;I)I
-
-    move-result p1
-
-    goto :goto_0
-
-    :cond_0
-    invoke-virtual {p1}, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;->getMuted()Z
-
-    move-result p2
-
-    if-eqz p2, :cond_1
-
-    iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
-
-    invoke-static {p1, v1}, Ly/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const p2, 0x7f04010e
-
-    invoke-static {p1, p2}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/view/View;I)I
-
-    move-result p1
-
-    goto :goto_0
-
-    :cond_1
-    invoke-virtual {p1}, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;->isUnread()Z
-
-    move-result p1
-
-    if-eqz p1, :cond_2
-
-    iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
-
-    invoke-static {p1, v1}, Ly/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-static {p1, v0}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/view/View;I)I
-
-    move-result p1
-
-    goto :goto_0
-
-    :cond_2
-    iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
-
-    invoke-static {p1, v1}, Ly/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const p2, 0x7f0400f8
-
-    invoke-static {p1, p2}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/view/View;I)I
-
-    move-result p1
-
-    :goto_0
-    return p1
-.end method
-
-
-# virtual methods
-.method public onConfigure(ILcom/discord/widgets/channels/list/items/ChannelListItem;)V
-    .locals 5
-
-    if-eqz p2, :cond_5
-
-    invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
-
-    check-cast p2, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;
-
-    iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
-
-    const-string v0, "itemView"
-
-    invoke-static {p1, v0}, Ly/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {p2}, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;->getSelected()Z
-
-    move-result v1
-
-    invoke-virtual {p2}, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;->getChannel()Lcom/discord/models/domain/ModelChannel;
-
-    move-result-object v2
-
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelChannel;->getType()I
-
-    move-result v2
-
-    invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v2
-
-    invoke-virtual {p0, p1, v1, v2}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$Item;->setBackground(Landroid/view/View;ZLjava/lang/Integer;)V
-
-    invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelAnnouncement;->getItemName()Landroid/widget/TextView;
-
-    move-result-object p1
-
-    invoke-virtual {p2}, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;->getChannel()Lcom/discord/models/domain/ModelChannel;
-
-    move-result-object v1
-
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelChannel;->getName()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {p1, v1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
-
-    invoke-virtual {p2}, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;->getSelected()Z
-
-    move-result p1
-
-    invoke-direct {p0, p2, p1}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelAnnouncement;->getTextColor(Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;Z)I
-
-    move-result p1
-
-    invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelAnnouncement;->getItemName()Landroid/widget/TextView;
-
-    move-result-object v1
-
-    invoke-virtual {v1, p1}, Landroid/widget/TextView;->setTextColor(I)V
-
-    invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelAnnouncement;->getItemHash()Landroid/widget/ImageView;
-
-    move-result-object v1
-
-    invoke-direct {p0, p2}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelAnnouncement;->getAnnouncementsIcon(Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;)I
-
-    move-result v2
-
-    invoke-virtual {v1, v2}, Landroid/widget/ImageView;->setImageResource(I)V
-
-    invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelAnnouncement;->getItemHash()Landroid/widget/ImageView;
-
-    move-result-object v1
-
-    invoke-static {p1}, Landroid/content/res/ColorStateList;->valueOf(I)Landroid/content/res/ColorStateList;
-
-    move-result-object p1
-
-    invoke-virtual {v1, p1}, Landroid/widget/ImageView;->setImageTintList(Landroid/content/res/ColorStateList;)V
-
-    invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelAnnouncement;->getItemMentions()Landroid/widget/TextView;
-
-    move-result-object p1
-
-    invoke-virtual {p2}, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;->getMentionCount()I
-
-    move-result v1
-
-    const/16 v2, 0x8
-
-    const/4 v3, 0x0
-
-    if-lez v1, :cond_0
-
-    const/4 v1, 0x0
-
-    goto :goto_0
-
-    :cond_0
-    const/16 v1, 0x8
-
-    :goto_0
-    invoke-virtual {p1, v1}, Landroid/widget/TextView;->setVisibility(I)V
-
-    invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelAnnouncement;->getItemMentions()Landroid/widget/TextView;
-
-    move-result-object p1
-
-    const/16 v1, 0x63
-
-    invoke-virtual {p2}, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;->getMentionCount()I
-
-    move-result v4
-
-    invoke-static {v1, v4}, Ljava/lang/Math;->min(II)I
-
-    move-result v1
-
-    invoke-static {v1}, Ljava/lang/String;->valueOf(I)Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {p1, v1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
-
-    invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelAnnouncement;->getItemUnread()Landroid/view/View;
-
-    move-result-object p1
-
-    invoke-virtual {p2}, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;->isUnread()Z
-
-    move-result v1
-
-    if-eqz v1, :cond_1
-
-    invoke-virtual {p2}, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;->getSelected()Z
-
-    move-result v1
-
-    if-nez v1, :cond_1
-
-    invoke-virtual {p2}, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;->getMuted()Z
-
-    move-result v1
-
-    if-nez v1, :cond_1
-
-    const/4 v1, 0x1
-
-    goto :goto_1
-
-    :cond_1
-    const/4 v1, 0x0
-
-    :goto_1
-    if-eqz v1, :cond_2
-
-    const/4 v2, 0x0
-
-    :cond_2
-    invoke-virtual {p1, v2}, Landroid/view/View;->setVisibility(I)V
-
-    invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelAnnouncement;->getItemName()Landroid/widget/TextView;
-
-    move-result-object p1
-
-    iget-object v1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
-
-    invoke-static {v1, v0}, Ly/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {v1}, Landroid/view/View;->getContext()Landroid/content/Context;
-
-    move-result-object v0
-
-    invoke-virtual {p2}, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;->isUnread()Z
-
-    move-result v1
-
-    if-nez v1, :cond_4
-
-    invoke-virtual {p2}, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;->getSelected()Z
-
-    move-result p2
-
-    if-eqz p2, :cond_3
-
-    goto :goto_2
-
-    :cond_3
-    const p2, 0x7f090002
-
-    goto :goto_3
-
-    :cond_4
-    :goto_2
-    const p2, 0x7f090003
-
-    :goto_3
-    invoke-static {v0, p2}, Landroidx/core/content/res/ResourcesCompat;->getFont(Landroid/content/Context;I)Landroid/graphics/Typeface;
-
-    move-result-object p2
-
-    invoke-virtual {p1, p2}, Landroid/widget/TextView;->setTypeface(Landroid/graphics/Typeface;)V
-
-    return-void
-
-    :cond_5
-    const-string p1, "data"
-
-    invoke-static {p1}, Ly/u/b/j;->a(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public bridge synthetic onConfigure(ILjava/lang/Object;)V
-    .locals 0
-
-    check-cast p2, Lcom/discord/widgets/channels/list/items/ChannelListItem;
-
-    invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelAnnouncement;->onConfigure(ILcom/discord/widgets/channels/list/items/ChannelListItem;)V
-
-    return-void
-.end method
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelPrivate.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelPrivate.smali
index 04ec8cd5ae..b1e2f104fc 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelPrivate.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelPrivate.smali
@@ -435,10 +435,50 @@
     return p1
 .end method
 
+.method private final getTextColor(Lcom/discord/widgets/channels/list/items/ChannelListItemPrivate;)I
+    .locals 1
+    .annotation build Landroidx/annotation/ColorInt;
+    .end annotation
+
+    invoke-virtual {p1}, Lcom/discord/widgets/channels/list/items/ChannelListItemPrivate;->getSelected()Z
+
+    move-result p1
+
+    const-string v0, "itemView"
+
+    if-eqz p1, :cond_0
+
+    iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
+
+    invoke-static {p1, v0}, Ly/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const v0, 0x7f04010c
+
+    invoke-static {p1, v0}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/view/View;I)I
+
+    move-result p1
+
+    goto :goto_0
+
+    :cond_0
+    iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
+
+    invoke-static {p1, v0}, Ly/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const v0, 0x7f0400f8
+
+    invoke-static {p1, v0}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/view/View;I)I
+
+    move-result p1
+
+    :goto_0
+    return p1
+.end method
+
 
 # virtual methods
 .method public onConfigure(ILcom/discord/widgets/channels/list/items/ChannelListItem;)V
-    .locals 19
+    .locals 20
 
     move-object/from16 v0, p0
 
@@ -468,7 +508,7 @@
 
     invoke-virtual {v1}, Lcom/discord/widgets/channels/list/items/ChannelListItemPrivate;->component5()Z
 
-    move-result v1
+    move-result v12
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelPrivate;->getItemName()Landroid/widget/TextView;
 
@@ -487,7 +527,7 @@
     goto :goto_0
 
     :cond_0
-    sget-object v12, Lcom/discord/utilities/channel/ChannelUtils;->INSTANCE:Lcom/discord/utilities/channel/ChannelUtils;
+    sget-object v13, Lcom/discord/utilities/channel/ChannelUtils;->INSTANCE:Lcom/discord/utilities/channel/ChannelUtils;
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelPrivate;->getItemName()Landroid/widget/TextView;
 
@@ -495,56 +535,66 @@
 
     invoke-virtual {v3}, Landroid/widget/TextView;->getContext()Landroid/content/Context;
 
-    move-result-object v13
+    move-result-object v14
 
     const-string v3, "itemName.context"
 
-    invoke-static {v13, v3}, Ly/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v14, v3}, Ly/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v8}, Lcom/discord/models/domain/ModelChannel;->getName()Ljava/lang/String;
 
-    move-result-object v14
+    move-result-object v15
 
     invoke-virtual {v8}, Lcom/discord/models/domain/ModelChannel;->getType()I
 
-    move-result v15
+    move-result v16
 
-    const/16 v16, 0x0
+    const/16 v17, 0x0
 
-    const/16 v17, 0x8
+    const/16 v18, 0x8
 
-    const/16 v18, 0x0
+    const/16 v19, 0x0
 
-    invoke-static/range {v12 .. v18}, Lcom/discord/utilities/channel/ChannelUtils;->getDisplayName$default(Lcom/discord/utilities/channel/ChannelUtils;Landroid/content/Context;Ljava/lang/String;IZILjava/lang/Object;)Ljava/lang/String;
+    invoke-static/range {v13 .. v19}, Lcom/discord/utilities/channel/ChannelUtils;->getDisplayName$default(Lcom/discord/utilities/channel/ChannelUtils;Landroid/content/Context;Ljava/lang/String;IZILjava/lang/Object;)Ljava/lang/String;
 
     move-result-object v3
 
     :goto_0
     invoke-virtual {v2, v3}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelPrivate;->getItemTag()Landroid/widget/TextView;
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelPrivate;->getItemName()Landroid/widget/TextView;
 
     move-result-object v2
 
+    invoke-direct {v0, v1}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelPrivate;->getTextColor(Lcom/discord/widgets/channels/list/items/ChannelListItemPrivate;)I
+
+    move-result v1
+
+    invoke-virtual {v2, v1}, Landroid/widget/TextView;->setTextColor(I)V
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelPrivate;->getItemTag()Landroid/widget/TextView;
+
+    move-result-object v1
+
     invoke-virtual {v8}, Lcom/discord/models/domain/ModelChannel;->isSystemDM()Z
 
-    move-result v3
+    move-result v2
 
-    const/16 v12, 0x8
+    const/16 v13, 0x8
 
-    const/4 v13, 0x0
+    const/4 v14, 0x0
 
-    if-eqz v3, :cond_1
+    if-eqz v2, :cond_1
 
-    const/4 v3, 0x0
+    const/4 v2, 0x0
 
     goto :goto_1
 
     :cond_1
-    const/16 v3, 0x8
+    const/16 v2, 0x8
 
     :goto_1
-    invoke-virtual {v2, v3}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {v1, v2}, Landroid/view/View;->setVisibility(I)V
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelPrivate;->getItemAvatar()Landroid/widget/ImageView;
 
@@ -564,58 +614,58 @@
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelPrivate;->getItemStatus()Lcom/discord/views/StatusView;
 
-    move-result-object v2
+    move-result-object v1
 
     invoke-virtual {v8}, Lcom/discord/models/domain/ModelChannel;->isDM()Z
 
-    move-result v3
+    move-result v2
 
-    const/4 v14, 0x1
+    const/4 v15, 0x1
 
-    if-eqz v3, :cond_2
-
-    invoke-virtual {v8}, Lcom/discord/models/domain/ModelChannel;->isSystemDM()Z
-
-    move-result v3
-
-    if-nez v3, :cond_2
-
-    const/4 v3, 0x1
-
-    goto :goto_2
-
-    :cond_2
-    const/4 v3, 0x0
-
-    :goto_2
-    if-eqz v3, :cond_3
-
-    const/4 v12, 0x0
-
-    :cond_3
-    invoke-virtual {v2, v12}, Landroid/view/View;->setVisibility(I)V
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelPrivate;->getItemStatus()Lcom/discord/views/StatusView;
-
-    move-result-object v2
-
-    invoke-virtual {v2, v9}, Lcom/discord/views/StatusView;->setPresence(Lcom/discord/models/domain/ModelPresence;)V
-
-    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelPrivate;->getItemStatus()Lcom/discord/views/StatusView;
-
-    move-result-object v2
-
-    invoke-direct {v0, v10}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelPrivate;->getPresenceBg(Z)I
-
-    move-result v3
-
-    invoke-virtual {v2, v3}, Lcom/discord/views/StatusView;->setBackgroundColor(I)V
+    if-eqz v2, :cond_2
 
     invoke-virtual {v8}, Lcom/discord/models/domain/ModelChannel;->isSystemDM()Z
 
     move-result v2
 
-    if-eqz v2, :cond_4
+    if-nez v2, :cond_2
+
+    const/4 v2, 0x1
+
+    goto :goto_2
+
+    :cond_2
+    const/4 v2, 0x0
+
+    :goto_2
+    if-eqz v2, :cond_3
+
+    const/4 v13, 0x0
+
+    :cond_3
+    invoke-virtual {v1, v13}, Landroid/view/View;->setVisibility(I)V
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelPrivate;->getItemStatus()Lcom/discord/views/StatusView;
+
+    move-result-object v1
+
+    invoke-virtual {v1, v9}, Lcom/discord/views/StatusView;->setPresence(Lcom/discord/models/domain/ModelPresence;)V
+
+    invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelPrivate;->getItemStatus()Lcom/discord/views/StatusView;
+
+    move-result-object v1
+
+    invoke-direct {v0, v10}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelPrivate;->getPresenceBg(Z)I
+
+    move-result v2
+
+    invoke-virtual {v1, v2}, Lcom/discord/views/StatusView;->setBackgroundColor(I)V
+
+    invoke-virtual {v8}, Lcom/discord/models/domain/ModelChannel;->isSystemDM()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_4
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelPrivate;->getItemDesc()Lcom/discord/utilities/view/text/SimpleDraweeSpanTextView;
 
@@ -642,9 +692,9 @@
     :cond_4
     invoke-virtual {v8}, Lcom/discord/models/domain/ModelChannel;->isMultiUserDM()Z
 
-    move-result v2
+    move-result v1
 
-    if-eqz v2, :cond_5
+    if-eqz v1, :cond_5
 
     invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelPrivate;->getItemDesc()Lcom/discord/utilities/view/text/SimpleDraweeSpanTextView;
 
@@ -683,7 +733,7 @@
 
     move-object v2, v9
 
-    move v3, v1
+    move v3, v12
 
     invoke-static/range {v2 .. v7}, Lcom/discord/utilities/presence/PresenceUtils;->setPresenceText$default(Lcom/discord/models/domain/ModelPresence;ZLcom/discord/utilities/view/text/SimpleDraweeSpanTextView;ZILjava/lang/Object;)V
 
@@ -715,10 +765,10 @@
 
     if-lez v11, :cond_7
 
-    const/4 v13, 0x1
+    const/4 v14, 0x1
 
     :cond_7
-    invoke-static {v1, v13}, Landroidx/core/view/ViewKt;->setVisible(Landroid/view/View;Z)V
+    invoke-static {v1, v14}, Landroidx/core/view/ViewKt;->setVisible(Landroid/view/View;Z)V
 
     :cond_8
     iget-object v1, v0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelText.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelText.smali
index f514119e53..d18c19fabe 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelText.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelText.smali
@@ -174,6 +174,102 @@
     throw p1
 .end method
 
+.method private final getAnnouncementsIcon(Lcom/discord/widgets/channels/list/items/ChannelListItemTextChannel;)I
+    .locals 1
+    .annotation build Landroidx/annotation/DrawableRes;
+    .end annotation
+
+    invoke-virtual {p1}, Lcom/discord/widgets/channels/list/items/ChannelListItemTextChannel;->getChannel()Lcom/discord/models/domain/ModelChannel;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelChannel;->isNsfw()Z
+
+    move-result v0
+
+    if-eqz v0, :cond_0
+
+    const p1, 0x7f080271
+
+    goto :goto_0
+
+    :cond_0
+    invoke-virtual {p1}, Lcom/discord/widgets/channels/list/items/ChannelListItemTextChannel;->isLocked()Z
+
+    move-result p1
+
+    if-eqz p1, :cond_1
+
+    const p1, 0x7f080270
+
+    goto :goto_0
+
+    :cond_1
+    const p1, 0x7f08026f
+
+    :goto_0
+    return p1
+.end method
+
+.method private final getHashColor(Lcom/discord/widgets/channels/list/items/ChannelListItemTextChannel;)I
+    .locals 2
+    .annotation build Landroidx/annotation/ColorInt;
+    .end annotation
+
+    invoke-virtual {p1}, Lcom/discord/widgets/channels/list/items/ChannelListItemTextChannel;->getMuted()Z
+
+    move-result v0
+
+    const-string v1, "itemView"
+
+    if-eqz v0, :cond_0
+
+    iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
+
+    invoke-static {p1, v1}, Ly/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const v0, 0x7f04010e
+
+    invoke-static {p1, v0}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/view/View;I)I
+
+    move-result p1
+
+    goto :goto_0
+
+    :cond_0
+    invoke-virtual {p1}, Lcom/discord/widgets/channels/list/items/ChannelListItemTextChannel;->isUnread()Z
+
+    move-result p1
+
+    if-eqz p1, :cond_1
+
+    iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
+
+    invoke-static {p1, v1}, Ly/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const v0, 0x7f04010c
+
+    invoke-static {p1, v0}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/view/View;I)I
+
+    move-result p1
+
+    goto :goto_0
+
+    :cond_1
+    iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
+
+    invoke-static {p1, v1}, Ly/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    const v0, 0x7f0400f8
+
+    invoke-static {p1, v0}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/view/View;I)I
+
+    move-result p1
+
+    :goto_0
+    return p1
+.end method
+
 .method private final getHashIcon(Lcom/discord/widgets/channels/list/items/ChannelListItemTextChannel;)I
     .locals 1
     .annotation build Landroidx/annotation/DrawableRes;
@@ -366,129 +462,165 @@
 
 # virtual methods
 .method public onConfigure(ILcom/discord/widgets/channels/list/items/ChannelListItem;)V
-    .locals 5
+    .locals 6
 
-    if-eqz p2, :cond_5
+    if-eqz p2, :cond_7
 
     invoke-super {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V
 
     check-cast p2, Lcom/discord/widgets/channels/list/items/ChannelListItemTextChannel;
 
-    iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
-
-    const-string v0, "itemView"
-
-    invoke-static {p1, v0}, Ly/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
-    invoke-virtual {p2}, Lcom/discord/widgets/channels/list/items/ChannelListItemTextChannel;->getSelected()Z
-
-    move-result v1
-
     invoke-virtual {p2}, Lcom/discord/widgets/channels/list/items/ChannelListItemTextChannel;->getChannel()Lcom/discord/models/domain/ModelChannel;
 
-    move-result-object v2
-
-    invoke-virtual {v2}, Lcom/discord/models/domain/ModelChannel;->getType()I
-
-    move-result v2
-
-    invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
-    move-result-object v2
-
-    invoke-virtual {p0, p1, v1, v2}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$Item;->setBackground(Landroid/view/View;ZLjava/lang/Integer;)V
-
-    invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelText;->getItemName()Landroid/widget/TextView;
-
     move-result-object p1
 
-    invoke-virtual {p2}, Lcom/discord/widgets/channels/list/items/ChannelListItemTextChannel;->getChannel()Lcom/discord/models/domain/ModelChannel;
-
-    move-result-object v1
-
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelChannel;->getName()Ljava/lang/String;
-
-    move-result-object v1
-
-    invoke-virtual {p1, v1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
-
-    invoke-virtual {p2}, Lcom/discord/widgets/channels/list/items/ChannelListItemTextChannel;->getSelected()Z
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getType()I
 
     move-result p1
 
-    invoke-direct {p0, p2, p1}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelText;->getTextColor(Lcom/discord/widgets/channels/list/items/ChannelListItemTextChannel;Z)I
+    const/4 v0, 0x5
 
-    move-result p1
+    const/4 v1, 0x1
 
-    invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelText;->getItemName()Landroid/widget/TextView;
+    const/4 v2, 0x0
 
-    move-result-object v1
+    if-ne p1, v0, :cond_0
 
-    invoke-virtual {v1, p1}, Landroid/widget/TextView;->setTextColor(I)V
-
-    invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelText;->getItemHash()Landroid/widget/ImageView;
-
-    move-result-object v1
-
-    invoke-direct {p0, p2}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelText;->getHashIcon(Lcom/discord/widgets/channels/list/items/ChannelListItemTextChannel;)I
-
-    move-result v2
-
-    invoke-virtual {v1, v2}, Landroid/widget/ImageView;->setImageResource(I)V
-
-    invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelText;->getItemHash()Landroid/widget/ImageView;
-
-    move-result-object v1
-
-    invoke-static {p1}, Landroid/content/res/ColorStateList;->valueOf(I)Landroid/content/res/ColorStateList;
-
-    move-result-object p1
-
-    invoke-virtual {v1, p1}, Landroid/widget/ImageView;->setImageTintList(Landroid/content/res/ColorStateList;)V
-
-    invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelText;->getItemMentions()Landroid/widget/TextView;
-
-    move-result-object p1
-
-    invoke-virtual {p2}, Lcom/discord/widgets/channels/list/items/ChannelListItemTextChannel;->getMentionCount()I
-
-    move-result v1
-
-    const/16 v2, 0x8
-
-    const/4 v3, 0x0
-
-    if-lez v1, :cond_0
-
-    const/4 v1, 0x0
+    const/4 p1, 0x1
 
     goto :goto_0
 
     :cond_0
-    const/16 v1, 0x8
+    const/4 p1, 0x0
 
     :goto_0
-    invoke-virtual {p1, v1}, Landroid/widget/TextView;->setVisibility(I)V
+    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
+
+    const-string v3, "itemView"
+
+    invoke-static {v0, v3}, Ly/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p2}, Lcom/discord/widgets/channels/list/items/ChannelListItemTextChannel;->getSelected()Z
+
+    move-result v4
+
+    invoke-virtual {p2}, Lcom/discord/widgets/channels/list/items/ChannelListItemTextChannel;->getChannel()Lcom/discord/models/domain/ModelChannel;
+
+    move-result-object v5
+
+    invoke-virtual {v5}, Lcom/discord/models/domain/ModelChannel;->getType()I
+
+    move-result v5
+
+    invoke-static {v5}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v5
+
+    invoke-virtual {p0, v0, v4, v5}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$Item;->setBackground(Landroid/view/View;ZLjava/lang/Integer;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelText;->getItemName()Landroid/widget/TextView;
+
+    move-result-object v0
+
+    invoke-virtual {p2}, Lcom/discord/widgets/channels/list/items/ChannelListItemTextChannel;->getChannel()Lcom/discord/models/domain/ModelChannel;
+
+    move-result-object v4
+
+    invoke-virtual {v4}, Lcom/discord/models/domain/ModelChannel;->getName()Ljava/lang/String;
+
+    move-result-object v4
+
+    invoke-virtual {v0, v4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelText;->getItemName()Landroid/widget/TextView;
+
+    move-result-object v0
+
+    invoke-virtual {p2}, Lcom/discord/widgets/channels/list/items/ChannelListItemTextChannel;->getSelected()Z
+
+    move-result v4
+
+    invoke-direct {p0, p2, v4}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelText;->getTextColor(Lcom/discord/widgets/channels/list/items/ChannelListItemTextChannel;Z)I
+
+    move-result v4
+
+    invoke-virtual {v0, v4}, Landroid/widget/TextView;->setTextColor(I)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelText;->getItemHash()Landroid/widget/ImageView;
+
+    move-result-object v0
+
+    if-eqz p1, :cond_1
+
+    invoke-direct {p0, p2}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelText;->getAnnouncementsIcon(Lcom/discord/widgets/channels/list/items/ChannelListItemTextChannel;)I
+
+    move-result p1
+
+    goto :goto_1
+
+    :cond_1
+    invoke-direct {p0, p2}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelText;->getHashIcon(Lcom/discord/widgets/channels/list/items/ChannelListItemTextChannel;)I
+
+    move-result p1
+
+    :goto_1
+    invoke-virtual {v0, p1}, Landroid/widget/ImageView;->setImageResource(I)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelText;->getItemHash()Landroid/widget/ImageView;
+
+    move-result-object p1
+
+    invoke-direct {p0, p2}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelText;->getHashColor(Lcom/discord/widgets/channels/list/items/ChannelListItemTextChannel;)I
+
+    move-result v0
+
+    invoke-static {v0}, Landroid/content/res/ColorStateList;->valueOf(I)Landroid/content/res/ColorStateList;
+
+    move-result-object v0
+
+    invoke-virtual {p1, v0}, Landroid/widget/ImageView;->setImageTintList(Landroid/content/res/ColorStateList;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelText;->getItemMentions()Landroid/widget/TextView;
 
     move-result-object p1
 
-    const/16 v1, 0x63
+    invoke-virtual {p2}, Lcom/discord/widgets/channels/list/items/ChannelListItemTextChannel;->getMentionCount()I
+
+    move-result v0
+
+    const/16 v4, 0x8
+
+    if-lez v0, :cond_2
+
+    const/4 v0, 0x0
+
+    goto :goto_2
+
+    :cond_2
+    const/16 v0, 0x8
+
+    :goto_2
+    invoke-virtual {p1, v0}, Landroid/widget/TextView;->setVisibility(I)V
+
+    invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelText;->getItemMentions()Landroid/widget/TextView;
+
+    move-result-object p1
+
+    const/16 v0, 0x63
 
     invoke-virtual {p2}, Lcom/discord/widgets/channels/list/items/ChannelListItemTextChannel;->getMentionCount()I
 
-    move-result v4
+    move-result v5
 
-    invoke-static {v1, v4}, Ljava/lang/Math;->min(II)I
+    invoke-static {v0, v5}, Ljava/lang/Math;->min(II)I
 
-    move-result v1
+    move-result v0
 
-    invoke-static {v1}, Ljava/lang/String;->valueOf(I)Ljava/lang/String;
+    invoke-static {v0}, Ljava/lang/String;->valueOf(I)Ljava/lang/String;
 
-    move-result-object v1
+    move-result-object v0
 
-    invoke-virtual {p1, v1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+    invoke-virtual {p1, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelText;->getItemUnread()Landroid/view/View;
 
@@ -496,46 +628,47 @@
 
     invoke-virtual {p2}, Lcom/discord/widgets/channels/list/items/ChannelListItemTextChannel;->isUnread()Z
 
-    move-result v1
+    move-result v0
 
-    if-eqz v1, :cond_1
+    if-eqz v0, :cond_3
 
     invoke-virtual {p2}, Lcom/discord/widgets/channels/list/items/ChannelListItemTextChannel;->getSelected()Z
 
-    move-result v1
+    move-result v0
 
-    if-nez v1, :cond_1
+    if-nez v0, :cond_3
 
     invoke-virtual {p2}, Lcom/discord/widgets/channels/list/items/ChannelListItemTextChannel;->getMuted()Z
 
-    move-result v1
+    move-result v0
 
-    if-nez v1, :cond_1
+    if-nez v0, :cond_3
 
-    const/4 v1, 0x1
+    goto :goto_3
 
-    goto :goto_1
-
-    :cond_1
+    :cond_3
     const/4 v1, 0x0
 
-    :goto_1
-    if-eqz v1, :cond_2
+    :goto_3
+    if-eqz v1, :cond_4
 
-    const/4 v2, 0x0
+    goto :goto_4
 
-    :cond_2
+    :cond_4
+    const/16 v2, 0x8
+
+    :goto_4
     invoke-virtual {p1, v2}, Landroid/view/View;->setVisibility(I)V
 
     invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelText;->getItemName()Landroid/widget/TextView;
 
     move-result-object p1
 
-    iget-object v1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
+    iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
 
-    invoke-static {v1, v0}, Ly/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v3}, Ly/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-virtual {v1}, Landroid/view/View;->getContext()Landroid/content/Context;
+    invoke-virtual {v0}, Landroid/view/View;->getContext()Landroid/content/Context;
 
     move-result-object v0
 
@@ -543,26 +676,26 @@
 
     move-result v1
 
-    if-nez v1, :cond_4
+    if-nez v1, :cond_6
 
     invoke-virtual {p2}, Lcom/discord/widgets/channels/list/items/ChannelListItemTextChannel;->getSelected()Z
 
     move-result p2
 
-    if-eqz p2, :cond_3
+    if-eqz p2, :cond_5
 
-    goto :goto_2
+    goto :goto_5
 
-    :cond_3
+    :cond_5
     const p2, 0x7f090002
 
-    goto :goto_3
+    goto :goto_6
 
-    :cond_4
-    :goto_2
+    :cond_6
+    :goto_5
     const p2, 0x7f090003
 
-    :goto_3
+    :goto_6
     invoke-static {v0, p2}, Landroidx/core/content/res/ResourcesCompat;->getFont(Landroid/content/Context;I)Landroid/graphics/Typeface;
 
     move-result-object p2
@@ -571,7 +704,7 @@
 
     return-void
 
-    :cond_5
+    :cond_7
     const-string p1, "data"
 
     invoke-static {p1}, Ly/u/b/j;->a(Ljava/lang/String;)V
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelVoice.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelVoice.smali
index 00c19803da..78d5ece8b0 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelVoice.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelVoice.smali
@@ -310,7 +310,7 @@
 
     if-eqz p2, :cond_0
 
-    const p2, 0x7f080467
+    const p2, 0x7f080468
 
     goto :goto_0
 
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemHeader.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemHeader.smali
index 7bce697b04..c3f2d2a374 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemHeader.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemHeader.smali
@@ -193,7 +193,7 @@
 
     if-eq p1, p2, :cond_1
 
-    const p2, 0x7f1215ee
+    const p2, 0x7f1215ef
 
     if-eq p1, p2, :cond_0
 
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter.smali
index 6e40a6ff07..17324aef7f 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter.smali
@@ -9,7 +9,6 @@
         Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$Item;,
         Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemInvite;,
         Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelText;,
-        Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelAnnouncement;,
         Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelCategory;,
         Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelPrivate;,
         Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelVoice;,
@@ -336,8 +335,6 @@
 
     if-eqz p1, :cond_0
 
-    const p1, 0x7f0d0157
-
     packed-switch p2, :pswitch_data_0
 
     :pswitch_0
@@ -354,96 +351,88 @@
 
     invoke-direct {p1, p2, p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemSpace;-><init>(ILcom/discord/widgets/channels/list/WidgetChannelsListAdapter;)V
 
-    goto :goto_1
-
-    :pswitch_2
-    new-instance p2, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelAnnouncement;
-
-    invoke-direct {p2, p1, p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelAnnouncement;-><init>(ILcom/discord/widgets/channels/list/WidgetChannelsListAdapter;)V
-
     goto :goto_0
 
-    :pswitch_3
+    :pswitch_2
     new-instance p1, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemInvite;
 
     const p2, 0x7f0d015c
 
     invoke-direct {p1, p2, p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemInvite;-><init>(ILcom/discord/widgets/channels/list/WidgetChannelsListAdapter;)V
 
-    goto :goto_1
+    goto :goto_0
 
-    :pswitch_4
+    :pswitch_3
     new-instance p1, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelCategory;
 
     const p2, 0x7f0d0156
 
     invoke-direct {p1, p2, p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelCategory;-><init>(ILcom/discord/widgets/channels/list/WidgetChannelsListAdapter;)V
 
-    goto :goto_1
+    goto :goto_0
 
-    :pswitch_5
+    :pswitch_4
     new-instance p1, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemMFA;
 
     const p2, 0x7f0d015d
 
     invoke-direct {p1, p2, p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemMFA;-><init>(ILcom/discord/widgets/channels/list/WidgetChannelsListAdapter;)V
 
-    goto :goto_1
+    goto :goto_0
 
-    :pswitch_6
+    :pswitch_5
     new-instance p1, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemHeader;
 
     const p2, 0x7f0d015b
 
     invoke-direct {p1, p2, p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemHeader;-><init>(ILcom/discord/widgets/channels/list/WidgetChannelsListAdapter;)V
 
-    goto :goto_1
+    goto :goto_0
 
-    :pswitch_7
+    :pswitch_6
     new-instance p1, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemFriends;
 
     const p2, 0x7f0d015a
 
     invoke-direct {p1, p2, p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemFriends;-><init>(ILcom/discord/widgets/channels/list/WidgetChannelsListAdapter;)V
 
-    goto :goto_1
+    goto :goto_0
 
-    :pswitch_8
+    :pswitch_7
     new-instance p1, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelPrivate;
 
     const p2, 0x7f0d0158
 
     invoke-direct {p1, p2, p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelPrivate;-><init>(ILcom/discord/widgets/channels/list/WidgetChannelsListAdapter;)V
 
-    goto :goto_1
+    goto :goto_0
 
-    :pswitch_9
+    :pswitch_8
     new-instance p1, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemVoiceUser;
 
     const p2, 0x7f0d015f
 
     invoke-direct {p1, p2, p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemVoiceUser;-><init>(ILcom/discord/widgets/channels/list/WidgetChannelsListAdapter;)V
 
-    goto :goto_1
+    goto :goto_0
 
-    :pswitch_a
+    :pswitch_9
     new-instance p1, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelVoice;
 
     const p2, 0x7f0d0159
 
     invoke-direct {p1, p2, p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelVoice;-><init>(ILcom/discord/widgets/channels/list/WidgetChannelsListAdapter;)V
 
-    goto :goto_1
+    goto :goto_0
 
-    :pswitch_b
-    new-instance p2, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelText;
+    :pswitch_a
+    new-instance p1, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelText;
 
-    invoke-direct {p2, p1, p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelText;-><init>(ILcom/discord/widgets/channels/list/WidgetChannelsListAdapter;)V
+    const p2, 0x7f0d0157
+
+    invoke-direct {p1, p2, p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelText;-><init>(ILcom/discord/widgets/channels/list/WidgetChannelsListAdapter;)V
 
     :goto_0
-    move-object p1, p2
-
-    :goto_1
     return-object p1
 
     :cond_0
@@ -455,19 +444,21 @@
 
     throw p1
 
+    nop
+
     :pswitch_data_0
     .packed-switch 0x0
-        :pswitch_b
         :pswitch_a
         :pswitch_9
         :pswitch_8
-        :pswitch_0
         :pswitch_7
+        :pswitch_0
         :pswitch_6
         :pswitch_5
         :pswitch_4
         :pswitch_3
         :pswitch_2
+        :pswitch_0
         :pswitch_1
     .end packed-switch
 .end method
diff --git a/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItem$Companion.smali b/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItem$Companion.smali
index 431b191d59..56a99d74c8 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItem$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItem$Companion.smali
@@ -23,8 +23,6 @@
 
 .field public static final TYPE_CHANNEL:I = 0x0
 
-.field public static final TYPE_CHANNEL_ANNOUNCEMENT:I = 0xa
-
 .field public static final TYPE_CHANNEL_PRIVATE:I = 0x3
 
 .field public static final TYPE_CHANNEL_VOICE:I = 0x1
diff --git a/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItem.smali b/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItem.smali
index 454c977540..c5137eb06f 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItem.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItem.smali
@@ -24,8 +24,6 @@
 
 .field public static final TYPE_CHANNEL:I = 0x0
 
-.field public static final TYPE_CHANNEL_ANNOUNCEMENT:I = 0xa
-
 .field public static final TYPE_CHANNEL_PRIVATE:I = 0x3
 
 .field public static final TYPE_CHANNEL_VOICE:I = 0x1
diff --git a/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel.smali b/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel.smali
deleted file mode 100644
index 4d34484e95..0000000000
--- a/com.discord/smali/com/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel.smali
+++ /dev/null
@@ -1,524 +0,0 @@
-.class public final Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;
-.super Ljava/lang/Object;
-.source "ChannelListItemAnnouncementChannel.kt"
-
-# interfaces
-.implements Lcom/discord/widgets/channels/list/items/ChannelListItem;
-.implements Lcom/discord/widgets/channels/list/WidgetChannelListUnreads$UnreadItem;
-
-
-# instance fields
-.field public final channel:Lcom/discord/models/domain/ModelChannel;
-
-.field public final isLocked:Z
-
-.field public final isUnread:Z
-
-.field public final mentionCount:I
-
-.field public final muted:Z
-
-.field public final selected:Z
-
-
-# direct methods
-.method public constructor <init>(Lcom/discord/models/domain/ModelChannel;ZIZZZ)V
-    .locals 0
-
-    if-eqz p1, :cond_0
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput-object p1, p0, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;->channel:Lcom/discord/models/domain/ModelChannel;
-
-    iput-boolean p2, p0, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;->selected:Z
-
-    iput p3, p0, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;->mentionCount:I
-
-    iput-boolean p4, p0, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;->isUnread:Z
-
-    iput-boolean p5, p0, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;->muted:Z
-
-    iput-boolean p6, p0, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;->isLocked:Z
-
-    return-void
-
-    :cond_0
-    const-string p1, "channel"
-
-    invoke-static {p1}, Ly/u/b/j;->a(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public static synthetic copy$default(Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;Lcom/discord/models/domain/ModelChannel;ZIZZZILjava/lang/Object;)Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;
-    .locals 4
-
-    and-int/lit8 p8, p7, 0x1
-
-    if-eqz p8, :cond_0
-
-    iget-object p1, p0, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;->channel:Lcom/discord/models/domain/ModelChannel;
-
-    :cond_0
-    and-int/lit8 p8, p7, 0x2
-
-    if-eqz p8, :cond_1
-
-    iget-boolean p2, p0, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;->selected:Z
-
-    :cond_1
-    move p8, p2
-
-    and-int/lit8 p2, p7, 0x4
-
-    if-eqz p2, :cond_2
-
-    invoke-virtual {p0}, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;->getMentionCount()I
-
-    move-result p3
-
-    :cond_2
-    move v0, p3
-
-    and-int/lit8 p2, p7, 0x8
-
-    if-eqz p2, :cond_3
-
-    invoke-virtual {p0}, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;->isUnread()Z
-
-    move-result p4
-
-    :cond_3
-    move v1, p4
-
-    and-int/lit8 p2, p7, 0x10
-
-    if-eqz p2, :cond_4
-
-    iget-boolean p5, p0, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;->muted:Z
-
-    :cond_4
-    move v2, p5
-
-    and-int/lit8 p2, p7, 0x20
-
-    if-eqz p2, :cond_5
-
-    iget-boolean p6, p0, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;->isLocked:Z
-
-    :cond_5
-    move v3, p6
-
-    move-object p2, p0
-
-    move-object p3, p1
-
-    move p4, p8
-
-    move p5, v0
-
-    move p6, v1
-
-    move p7, v2
-
-    move p8, v3
-
-    invoke-virtual/range {p2 .. p8}, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;->copy(Lcom/discord/models/domain/ModelChannel;ZIZZZ)Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;
-
-    move-result-object p0
-
-    return-object p0
-.end method
-
-
-# virtual methods
-.method public final component1()Lcom/discord/models/domain/ModelChannel;
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;->channel:Lcom/discord/models/domain/ModelChannel;
-
-    return-object v0
-.end method
-
-.method public final component2()Z
-    .locals 1
-
-    iget-boolean v0, p0, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;->selected:Z
-
-    return v0
-.end method
-
-.method public final component3()I
-    .locals 1
-
-    invoke-virtual {p0}, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;->getMentionCount()I
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public final component4()Z
-    .locals 1
-
-    invoke-virtual {p0}, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;->isUnread()Z
-
-    move-result v0
-
-    return v0
-.end method
-
-.method public final component5()Z
-    .locals 1
-
-    iget-boolean v0, p0, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;->muted:Z
-
-    return v0
-.end method
-
-.method public final component6()Z
-    .locals 1
-
-    iget-boolean v0, p0, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;->isLocked:Z
-
-    return v0
-.end method
-
-.method public final copy(Lcom/discord/models/domain/ModelChannel;ZIZZZ)Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;
-    .locals 8
-
-    if-eqz p1, :cond_0
-
-    new-instance v7, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;
-
-    move-object v0, v7
-
-    move-object v1, p1
-
-    move v2, p2
-
-    move v3, p3
-
-    move v4, p4
-
-    move v5, p5
-
-    move v6, p6
-
-    invoke-direct/range {v0 .. v6}, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;-><init>(Lcom/discord/models/domain/ModelChannel;ZIZZZ)V
-
-    return-object v7
-
-    :cond_0
-    const-string p1, "channel"
-
-    invoke-static {p1}, Ly/u/b/j;->a(Ljava/lang/String;)V
-
-    const/4 p1, 0x0
-
-    throw p1
-.end method
-
-.method public equals(Ljava/lang/Object;)Z
-    .locals 2
-
-    if-eq p0, p1, :cond_1
-
-    instance-of v0, p1, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;
-
-    if-eqz v0, :cond_0
-
-    check-cast p1, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;
-
-    iget-object v0, p0, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;->channel:Lcom/discord/models/domain/ModelChannel;
-
-    iget-object v1, p1, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;->channel:Lcom/discord/models/domain/ModelChannel;
-
-    invoke-static {v0, v1}, Ly/u/b/j;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
-    move-result v0
-
-    if-eqz v0, :cond_0
-
-    iget-boolean v0, p0, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;->selected:Z
-
-    iget-boolean v1, p1, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;->selected:Z
-
-    if-ne v0, v1, :cond_0
-
-    invoke-virtual {p0}, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;->getMentionCount()I
-
-    move-result v0
-
-    invoke-virtual {p1}, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;->getMentionCount()I
-
-    move-result v1
-
-    if-ne v0, v1, :cond_0
-
-    invoke-virtual {p0}, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;->isUnread()Z
-
-    move-result v0
-
-    invoke-virtual {p1}, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;->isUnread()Z
-
-    move-result v1
-
-    if-ne v0, v1, :cond_0
-
-    iget-boolean v0, p0, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;->muted:Z
-
-    iget-boolean v1, p1, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;->muted:Z
-
-    if-ne v0, v1, :cond_0
-
-    iget-boolean v0, p0, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;->isLocked:Z
-
-    iget-boolean p1, p1, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;->isLocked:Z
-
-    if-ne v0, p1, :cond_0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 p1, 0x0
-
-    return p1
-
-    :cond_1
-    :goto_0
-    const/4 p1, 0x1
-
-    return p1
-.end method
-
-.method public final getChannel()Lcom/discord/models/domain/ModelChannel;
-    .locals 1
-
-    iget-object v0, p0, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;->channel:Lcom/discord/models/domain/ModelChannel;
-
-    return-object v0
-.end method
-
-.method public getKey()Ljava/lang/String;
-    .locals 3
-
-    new-instance v0, Ljava/lang/StringBuilder;
-
-    invoke-direct {v0}, Ljava/lang/StringBuilder;-><init>()V
-
-    invoke-virtual {p0}, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;->getType()I
-
-    move-result v1
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    iget-object v1, p0, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;->channel:Lcom/discord/models/domain/ModelChannel;
-
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelChannel;->getId()J
-
-    move-result-wide v1
-
-    invoke-virtual {v0, v1, v2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
-
-.method public getMentionCount()I
-    .locals 1
-
-    iget v0, p0, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;->mentionCount:I
-
-    return v0
-.end method
-
-.method public final getMuted()Z
-    .locals 1
-
-    iget-boolean v0, p0, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;->muted:Z
-
-    return v0
-.end method
-
-.method public final getSelected()Z
-    .locals 1
-
-    iget-boolean v0, p0, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;->selected:Z
-
-    return v0
-.end method
-
-.method public getType()I
-    .locals 1
-
-    const/16 v0, 0xa
-
-    return v0
-.end method
-
-.method public hashCode()I
-    .locals 3
-
-    iget-object v0, p0, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;->channel:Lcom/discord/models/domain/ModelChannel;
-
-    if-eqz v0, :cond_0
-
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelChannel;->hashCode()I
-
-    move-result v0
-
-    goto :goto_0
-
-    :cond_0
-    const/4 v0, 0x0
-
-    :goto_0
-    mul-int/lit8 v0, v0, 0x1f
-
-    iget-boolean v1, p0, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;->selected:Z
-
-    const/4 v2, 0x1
-
-    if-eqz v1, :cond_1
-
-    const/4 v1, 0x1
-
-    :cond_1
-    add-int/2addr v0, v1
-
-    mul-int/lit8 v0, v0, 0x1f
-
-    invoke-virtual {p0}, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;->getMentionCount()I
-
-    move-result v1
-
-    invoke-static {v1}, Ld;->a(I)I
-
-    move-result v1
-
-    add-int/2addr v0, v1
-
-    mul-int/lit8 v0, v0, 0x1f
-
-    invoke-virtual {p0}, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;->isUnread()Z
-
-    move-result v1
-
-    if-eqz v1, :cond_2
-
-    const/4 v1, 0x1
-
-    :cond_2
-    add-int/2addr v0, v1
-
-    mul-int/lit8 v0, v0, 0x1f
-
-    iget-boolean v1, p0, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;->muted:Z
-
-    if-eqz v1, :cond_3
-
-    const/4 v1, 0x1
-
-    :cond_3
-    add-int/2addr v0, v1
-
-    mul-int/lit8 v0, v0, 0x1f
-
-    iget-boolean v1, p0, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;->isLocked:Z
-
-    if-eqz v1, :cond_4
-
-    const/4 v1, 0x1
-
-    :cond_4
-    add-int/2addr v0, v1
-
-    return v0
-.end method
-
-.method public final isLocked()Z
-    .locals 1
-
-    iget-boolean v0, p0, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;->isLocked:Z
-
-    return v0
-.end method
-
-.method public isUnread()Z
-    .locals 1
-
-    iget-boolean v0, p0, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;->isUnread:Z
-
-    return v0
-.end method
-
-.method public toString()Ljava/lang/String;
-    .locals 3
-
-    const-string v0, "ChannelListItemAnnouncementChannel(channel="
-
-    invoke-static {v0}, Lf/e/b/a/a;->a(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    move-result-object v0
-
-    iget-object v1, p0, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;->channel:Lcom/discord/models/domain/ModelChannel;
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
-    const-string v1, ", selected="
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-boolean v1, p0, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;->selected:Z
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
-
-    const-string v1, ", mentionCount="
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p0}, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;->getMentionCount()I
-
-    move-result v1
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    const-string v1, ", isUnread="
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {p0}, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;->isUnread()Z
-
-    move-result v1
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
-
-    const-string v1, ", muted="
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-boolean v1, p0, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;->muted:Z
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
-
-    const-string v1, ", isLocked="
-
-    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    iget-boolean v1, p0, Lcom/discord/widgets/channels/list/items/ChannelListItemAnnouncementChannel;->isLocked:Z
-
-    const-string v2, ")"
-
-    invoke-static {v0, v1, v2}, Lf/e/b/a/a;->a(Ljava/lang/StringBuilder;ZLjava/lang/String;)Ljava/lang/String;
-
-    move-result-object v0
-
-    return-object v0
-.end method
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember.smali
index 309e0b4f39..e4801da69e 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember.smali
@@ -277,7 +277,7 @@
 
     if-eqz v1, :cond_4
 
-    const v1, 0x7f08045d
+    const v1, 0x7f08045e
 
     goto :goto_4
 
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputModel.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputModel.smali
index 7bacf9985d..6f4da68058 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputModel.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputModel.smali
@@ -837,7 +837,7 @@
     return-object p1
 
     :cond_0
-    const v0, 0x7f1215c6
+    const v0, 0x7f1215c7
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -846,7 +846,7 @@
     return-object p1
 
     :cond_1
-    const v0, 0x7f1215bd
+    const v0, 0x7f1215be
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker.smali
index d16d53243b..ddf2e86c9f 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker.smali
@@ -458,7 +458,7 @@
 
     if-eqz p1, :cond_0
 
-    const v1, 0x7f0803eb
+    const v1, 0x7f0803ec
 
     goto :goto_0
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/InlineMediaView$updateUI$1$1.smali b/com.discord/smali/com/discord/widgets/chat/list/InlineMediaView$updateUI$1$1.smali
index 95156bfdc4..5f76764be1 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/InlineMediaView$updateUI$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/InlineMediaView$updateUI$1$1.smali
@@ -82,12 +82,12 @@
     :cond_0
     if-eqz v0, :cond_1
 
-    const p1, 0x7f080475
+    const p1, 0x7f080476
 
     goto :goto_0
 
     :cond_1
-    const p1, 0x7f08046f
+    const p1, 0x7f080470
 
     :goto_0
     iget-object v1, p0, Lcom/discord/widgets/chat/list/InlineMediaView$updateUI$1$1;->this$0:Lcom/discord/widgets/chat/list/InlineMediaView$updateUI$1;
@@ -128,12 +128,12 @@
 
     if-eqz v0, :cond_2
 
-    const p1, 0x7f1215d2
+    const p1, 0x7f1215d3
 
     goto :goto_1
 
     :cond_2
-    const p1, 0x7f1215d3
+    const p1, 0x7f1215d4
 
     :goto_1
     iget-object v0, p0, Lcom/discord/widgets/chat/list/InlineMediaView$updateUI$1$1;->this$0:Lcom/discord/widgets/chat/list/InlineMediaView$updateUI$1;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage.smali
index 25e3d0c684..d6d6f23a06 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage.smali
@@ -169,13 +169,13 @@
     goto :goto_0
 
     :cond_0
-    const p1, 0x7f080414
+    const p1, 0x7f080415
 
     goto :goto_1
 
     :cond_1
     :goto_0
-    const p1, 0x7f08041d
+    const p1, 0x7f08041e
 
     goto :goto_1
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift.smali
index e35e342c55..a1b9d83f85 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift.smali
@@ -629,7 +629,7 @@
 
     const p1, 0x7f0402a9
 
-    const v2, 0x7f0804fb
+    const v2, 0x7f0804fc
 
     invoke-static {v0, p1, v2}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes(Landroid/content/Context;II)I
 
@@ -1001,7 +1001,7 @@
 
     const v3, 0x7f040200
 
-    const v13, 0x7f0804ed
+    const v13, 0x7f0804ee
 
     invoke-static {v2, v3, v13}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes(Landroid/content/Context;II)I
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildWelcome.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildWelcome.smali
index ec1a6ec754..75c745f394 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildWelcome.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildWelcome.smali
@@ -296,7 +296,7 @@
 
     move-result-object v2
 
-    const v5, 0x7f12161f
+    const v5, 0x7f121620
 
     new-array v6, v3, [Ljava/lang/Object;
 
@@ -313,7 +313,7 @@
 
     move-result-object v2
 
-    const v5, 0x7f121626
+    const v5, 0x7f121627
 
     new-array v6, v3, [Ljava/lang/Object;
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite.smali
index 2e3ee1d6e3..95136ace11 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite.smali
@@ -841,7 +841,7 @@
 
     move-result-object v3
 
-    const v5, 0x7f080518
+    const v5, 0x7f080519
 
     invoke-virtual {v3, v5}, Lcom/facebook/drawee/view/SimpleDraweeView;->setActualImageResource(I)V
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemMessage.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemMessage.smali
index 3ea0bf08bc..31baed40eb 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemMessage.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemMessage.smali
@@ -407,7 +407,7 @@
 
     if-eqz p1, :cond_4
 
-    const p1, 0x7f08045d
+    const p1, 0x7f08045e
 
     goto :goto_4
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage.smali
index 5df94a4aeb..ce11429115 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage.smali
@@ -182,7 +182,7 @@
 
     const v1, 0x7f08030d
 
-    const v2, 0x7f080452
+    const v2, 0x7f080453
 
     packed-switch p1, :pswitch_data_0
 
@@ -190,7 +190,7 @@
     goto :goto_0
 
     :pswitch_1
-    const v0, 0x7f080479
+    const v0, 0x7f08047a
 
     goto :goto_0
 
@@ -200,7 +200,7 @@
     goto :goto_0
 
     :pswitch_3
-    const v0, 0x7f080452
+    const v0, 0x7f080453
 
     goto :goto_0
 
diff --git a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions.smali b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions.smali
index 7ee6603bf1..559a635d93 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions.smali
@@ -1759,7 +1759,7 @@
 
     invoke-static {v4, v5}, Ly/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v5, 0x7f121659
+    const v5, 0x7f12165a
 
     invoke-virtual {v0, v5}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali b/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali
index a05159f601..783ade0781 100644
--- a/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali
+++ b/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali
@@ -492,7 +492,7 @@
 
     new-array v1, v2, [Ljava/lang/Object;
 
-    const-string v3, "20-alpha2"
+    const-string v3, "20-alpha4"
 
     aput-object v3, v1, v4
 
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd.smali
index ed609f2960..bd57bb1ae8 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd.smali
@@ -239,7 +239,7 @@
 
     new-instance v4, Lcom/discord/utilities/simple_pager/SimplePager$Adapter$Item;
 
-    const v5, 0x7f121591
+    const v5, 0x7f121592
 
     invoke-virtual {p0, v5}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetInviteInfo.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetInviteInfo.smali
index db07fc476b..e645abaaf6 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetInviteInfo.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetInviteInfo.smali
@@ -947,7 +947,7 @@
 
     move-result-object v6
 
-    const v7, 0x7f08045e
+    const v7, 0x7f08045f
 
     const/4 v8, 0x0
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheet.smali b/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheet.smali
index aa1b16dc69..00afcae9ce 100644
--- a/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheet.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheet.smali
@@ -304,7 +304,7 @@
 
     aput-object p1, v1, v2
 
-    const p1, 0x7f12162b
+    const p1, 0x7f12162c
 
     invoke-virtual {p0, p1, v1}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel.smali b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel.smali
index 5e0f40c08e..0cc9a62895 100644
--- a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel.smali
@@ -309,7 +309,7 @@
 
     if-eqz v2, :cond_0
 
-    const v2, 0x7f08045e
+    const v2, 0x7f08045f
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -662,7 +662,7 @@
 
     if-eqz v2, :cond_0
 
-    const v2, 0x7f08045e
+    const v2, 0x7f08045f
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
diff --git a/com.discord/smali/com/discord/widgets/main/OverlappingPanelsLayout.smali b/com.discord/smali/com/discord/widgets/main/OverlappingPanelsLayout.smali
index 878fa666d4..1f9ef073b3 100644
--- a/com.discord/smali/com/discord/widgets/main/OverlappingPanelsLayout.smali
+++ b/com.discord/smali/com/discord/widgets/main/OverlappingPanelsLayout.smali
@@ -35,8 +35,6 @@
 
 .field public centerPanelXAnimator:Landroid/animation/ValueAnimator;
 
-.field public centerPanelXFlingAnimation:Landroidx/dynamicanimation/animation/FlingAnimation;
-
 .field public childGestureRegions:Ljava/util/List;
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -2525,7 +2523,7 @@
 
     iget-object v0, p0, Lcom/discord/widgets/main/OverlappingPanelsLayout;->centerPanel:Landroid/view/View;
 
-    if-eqz v0, :cond_5
+    if-eqz v0, :cond_4
 
     invoke-virtual {v0}, Landroid/view/View;->getX()F
 
@@ -2538,13 +2536,6 @@
     invoke-virtual {v1}, Landroid/animation/ValueAnimator;->cancel()V
 
     :cond_0
-    iget-object v1, p0, Lcom/discord/widgets/main/OverlappingPanelsLayout;->centerPanelXFlingAnimation:Landroidx/dynamicanimation/animation/FlingAnimation;
-
-    if-eqz v1, :cond_1
-
-    invoke-virtual {v1}, Landroidx/dynamicanimation/animation/DynamicAnimation;->cancel()V
-
-    :cond_1
     invoke-direct {p0, p1}, Lcom/discord/widgets/main/OverlappingPanelsLayout;->getNormalizedX(F)F
 
     move-result p1
@@ -2557,7 +2548,7 @@
 
     const/4 v3, 0x2
 
-    if-eqz p2, :cond_2
+    if-eqz p2, :cond_1
 
     new-array p2, v3, [F
 
@@ -2581,7 +2572,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/main/OverlappingPanelsLayout;->centerPanelXAnimator:Landroid/animation/ValueAnimator;
 
-    if-eqz p1, :cond_3
+    if-eqz p1, :cond_2
 
     new-instance p2, Lcom/discord/widgets/main/OverlappingPanelsLayout$updateCenterPanelXWithAnimation$2;
 
@@ -2591,7 +2582,7 @@
 
     goto :goto_0
 
-    :cond_2
+    :cond_1
     new-array p2, v3, [F
 
     aput v0, p2, v2
@@ -2614,7 +2605,7 @@
 
     iget-object p1, p0, Lcom/discord/widgets/main/OverlappingPanelsLayout;->centerPanelXAnimator:Landroid/animation/ValueAnimator;
 
-    if-eqz p1, :cond_3
+    if-eqz p1, :cond_2
 
     new-instance p2, Lcom/discord/widgets/main/OverlappingPanelsLayout$updateCenterPanelXWithAnimation$4;
 
@@ -2622,18 +2613,18 @@
 
     invoke-virtual {p1, p2}, Landroid/animation/ValueAnimator;->addUpdateListener(Landroid/animation/ValueAnimator$AnimatorUpdateListener;)V
 
-    :cond_3
+    :cond_2
     :goto_0
     iget-object p1, p0, Lcom/discord/widgets/main/OverlappingPanelsLayout;->centerPanelXAnimator:Landroid/animation/ValueAnimator;
 
-    if-eqz p1, :cond_4
+    if-eqz p1, :cond_3
 
     invoke-virtual {p1}, Landroid/animation/ValueAnimator;->start()V
 
-    :cond_4
+    :cond_3
     return-void
 
-    :cond_5
+    :cond_4
     const-string p1, "centerPanel"
 
     invoke-static {p1}, Ly/u/b/j;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
diff --git a/com.discord/smali/com/discord/widgets/media/WidgetMedia.smali b/com.discord/smali/com/discord/widgets/media/WidgetMedia.smali
index 5d56c476ba..7047ff8798 100644
--- a/com.discord/smali/com/discord/widgets/media/WidgetMedia.smali
+++ b/com.discord/smali/com/discord/widgets/media/WidgetMedia.smali
@@ -853,7 +853,7 @@
 
     invoke-static/range {v0 .. v5}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;Ljava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
 
-    const v0, 0x7f1215dd
+    const v0, 0x7f1215de
 
     invoke-virtual {v6, v0}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsModeration.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsModeration.smali
index c46fa2d5b0..62eb8a42f3 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsModeration.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsModeration.smali
@@ -565,7 +565,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f1215b0
+    const v1, 0x7f1215b1
 
     invoke-virtual {p0, v1, v0}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
@@ -587,7 +587,7 @@
 
     aput-object v1, v0, v2
 
-    const v1, 0x7f1215ac
+    const v1, 0x7f1215ad
 
     invoke-virtual {p0, v1, v0}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsVanityUrl.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsVanityUrl.smali
index ad360c5d47..5ef82b34fd 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsVanityUrl.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsVanityUrl.smali
@@ -118,7 +118,7 @@
 
     iget-object v3, p0, Lcom/discord/widgets/servers/WidgetServerSettingsVanityUrl;->currentUrl:Lcom/discord/app/AppTextView;
 
-    const v4, 0x7f12159e
+    const v4, 0x7f12159f
 
     const/4 v5, 0x1
 
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView.smali
index ee389bcf95..d54d046de7 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView.smali
@@ -586,7 +586,7 @@
 
     const v13, 0x7f1209d5
 
-    const v14, 0x7f080408
+    const v14, 0x7f080409
 
     if-eq v1, v3, :cond_15
 
@@ -667,7 +667,7 @@
 
     new-instance v5, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;
 
-    const v8, 0x7f080440
+    const v8, 0x7f080441
 
     invoke-virtual {v2, v8, v6}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$configure$1;->invoke(IZ)I
 
@@ -711,7 +711,7 @@
 
     new-instance v3, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;
 
-    const v4, 0x7f080413
+    const v4, 0x7f080414
 
     invoke-virtual {v2, v4, v6}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$configure$1;->invoke(IZ)I
 
@@ -802,7 +802,7 @@
 
     new-instance v5, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem;
 
-    const v8, 0x7f080440
+    const v8, 0x7f080441
 
     invoke-virtual {v2, v8, v6}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$configure$1;->invoke(IZ)I
 
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog.smali b/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog.smali
index 22874b27c6..2393aea880 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog.smali
@@ -753,7 +753,7 @@
 
     invoke-static/range {v0 .. v5}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;Ljava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
 
-    const p1, 0x7f12162c
+    const p1, 0x7f12162d
 
     invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
 
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali
index c4bf12c4dd..1ed0dbb534 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali
@@ -1987,7 +1987,7 @@
 
     invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    const-string v0, " - 20-alpha2 (1109)"
+    const-string v0, " - 20-alpha4 (1111)"
 
     invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguage.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguage.smali
index d2d8d894e3..ad8fa53268 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguage.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguage.smali
@@ -1072,139 +1072,139 @@
     const/4 p0, -0x1
 
     :goto_1
-    const v0, 0x7f080485
+    const v0, 0x7f080486
 
     packed-switch p0, :pswitch_data_0
 
     return v0
 
     :pswitch_0
-    const p0, 0x7f08048c
-
-    return p0
-
-    :pswitch_1
-    const p0, 0x7f08049a
-
-    return p0
-
-    :pswitch_2
-    const p0, 0x7f08049e
-
-    return p0
-
-    :pswitch_3
-    const p0, 0x7f08049f
-
-    return p0
-
-    :pswitch_4
-    const p0, 0x7f080496
-
-    return p0
-
-    :pswitch_5
     const p0, 0x7f08048d
 
     return p0
 
-    :pswitch_6
-    const p0, 0x7f080491
-
-    return p0
-
-    :pswitch_7
-    const p0, 0x7f080483
-
-    return p0
-
-    :pswitch_8
-    const p0, 0x7f080493
-
-    return p0
-
-    :pswitch_9
-    const p0, 0x7f080488
-
-    return p0
-
-    :pswitch_a
-    const p0, 0x7f080490
-
-    return p0
-
-    :pswitch_b
-    const p0, 0x7f0804a0
-
-    return p0
-
-    :pswitch_c
-    const p0, 0x7f08048f
-
-    return p0
-
-    :pswitch_d
-    const p0, 0x7f08049c
-
-    return p0
-
-    :pswitch_e
-    const p0, 0x7f080497
-
-    return p0
-
-    :pswitch_f
-    const p0, 0x7f08047f
-
-    return p0
-
-    :pswitch_10
-    const p0, 0x7f080480
-
-    return p0
-
-    :pswitch_11
+    :pswitch_1
     const p0, 0x7f08049b
 
     return p0
 
-    :pswitch_12
-    const p0, 0x7f080499
+    :pswitch_2
+    const p0, 0x7f08049f
 
     return p0
 
-    :pswitch_13
-    const p0, 0x7f080495
+    :pswitch_3
+    const p0, 0x7f0804a0
 
     return p0
 
-    :pswitch_14
-    const p0, 0x7f080494
+    :pswitch_4
+    const p0, 0x7f080497
 
     return p0
 
-    :pswitch_15
-    const p0, 0x7f080492
-
-    return p0
-
-    :pswitch_16
+    :pswitch_5
     const p0, 0x7f08048e
 
     return p0
 
-    :pswitch_17
+    :pswitch_6
+    const p0, 0x7f080492
+
+    return p0
+
+    :pswitch_7
+    const p0, 0x7f080484
+
+    return p0
+
+    :pswitch_8
+    const p0, 0x7f080494
+
+    return p0
+
+    :pswitch_9
     const p0, 0x7f080489
 
     return p0
 
+    :pswitch_a
+    const p0, 0x7f080491
+
+    return p0
+
+    :pswitch_b
+    const p0, 0x7f0804a1
+
+    return p0
+
+    :pswitch_c
+    const p0, 0x7f080490
+
+    return p0
+
+    :pswitch_d
+    const p0, 0x7f08049d
+
+    return p0
+
+    :pswitch_e
+    const p0, 0x7f080498
+
+    return p0
+
+    :pswitch_f
+    const p0, 0x7f080480
+
+    return p0
+
+    :pswitch_10
+    const p0, 0x7f080481
+
+    return p0
+
+    :pswitch_11
+    const p0, 0x7f08049c
+
+    return p0
+
+    :pswitch_12
+    const p0, 0x7f08049a
+
+    return p0
+
+    :pswitch_13
+    const p0, 0x7f080496
+
+    return p0
+
+    :pswitch_14
+    const p0, 0x7f080495
+
+    return p0
+
+    :pswitch_15
+    const p0, 0x7f080493
+
+    return p0
+
+    :pswitch_16
+    const p0, 0x7f08048f
+
+    return p0
+
+    :pswitch_17
+    const p0, 0x7f08048a
+
+    return p0
+
     :pswitch_18
-    const p0, 0x7f080486
+    const p0, 0x7f080487
 
     return p0
 
     :pswitch_19
-    const p0, 0x7f080484
+    const p0, 0x7f080485
 
     return p0
 
@@ -1212,12 +1212,12 @@
     return v0
 
     :pswitch_1b
-    const p0, 0x7f080482
+    const p0, 0x7f080483
 
     return p0
 
     :pswitch_1c
-    const p0, 0x7f080481
+    const p0, 0x7f080482
 
     return p0
 
@@ -1695,12 +1695,12 @@
     return p0
 
     :pswitch_1
-    const p0, 0x7f1215c9
+    const p0, 0x7f1215ca
 
     return p0
 
     :pswitch_2
-    const p0, 0x7f12165d
+    const p0, 0x7f12165e
 
     return p0
 
@@ -1745,7 +1745,7 @@
     return p0
 
     :pswitch_b
-    const p0, 0x7f12165e
+    const p0, 0x7f12165f
 
     return p0
 
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice.smali
index 4bee460e1b..cb5cf5f3d9 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice.smali
@@ -2079,7 +2079,7 @@
     invoke-virtual {v0, v1}, Lcom/discord/stores/StoreMediaEngine;->setOpenSLESConfig(Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;)V
 
     :cond_2
-    const v0, 0x7f121574
+    const v0, 0x7f121575
 
     const/4 v1, 0x0
 
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$getBackupCodes$1.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$getBackupCodes$1.smali
index b40f63fb29..b14ac6cd61 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$getBackupCodes$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$getBackupCodes$1.smali
@@ -230,7 +230,7 @@
 
     move-result-object v2
 
-    const v4, 0x7f12157f
+    const v4, 0x7f121580
 
     invoke-virtual {v2, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$validationManager$2.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$validationManager$2.smali
index 2668243510..1a281b1903 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$validationManager$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$validationManager$2.smali
@@ -68,7 +68,7 @@
 
     sget-object v6, Lcom/discord/utilities/view/validators/BasicTextInputValidator;->Companion:Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;
 
-    const v7, 0x7f121594
+    const v7, 0x7f121595
 
     invoke-virtual {v6, v7}, Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;->createRequiredInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator;
 
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/PremiumSwitchPlanPagerAdapter.smali b/com.discord/smali/com/discord/widgets/settings/premium/PremiumSwitchPlanPagerAdapter.smali
index 28fb0ac767..285bfa04cc 100644
--- a/com.discord/smali/com/discord/widgets/settings/premium/PremiumSwitchPlanPagerAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/PremiumSwitchPlanPagerAdapter.smali
@@ -110,7 +110,7 @@
     goto/16 :goto_1
 
     :cond_1
-    const p2, 0x7f0804e3
+    const p2, 0x7f0804e4
 
     invoke-virtual {v0, p2}, Landroid/widget/ImageView;->setImageResource(I)V
 
@@ -122,7 +122,7 @@
 
     invoke-virtual {v1, p2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    const p2, 0x7f0804ea
+    const p2, 0x7f0804eb
 
     invoke-virtual {v2, p2}, Landroid/widget/ImageView;->setImageResource(I)V
 
@@ -173,7 +173,7 @@
     goto :goto_1
 
     :cond_2
-    const p2, 0x7f0804e0
+    const p2, 0x7f0804e1
 
     invoke-virtual {v0, p2}, Landroid/widget/ImageView;->setImageResource(I)V
 
@@ -211,7 +211,7 @@
 
     invoke-virtual {v1, p2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
 
-    const p2, 0x7f0804e9
+    const p2, 0x7f0804ea
 
     invoke-virtual {v2, p2}, Landroid/widget/ImageView;->setImageResource(I)V
 
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan.smali
index dd0f95b0a0..abc468cb19 100644
--- a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan.smali
@@ -760,7 +760,7 @@
 
     move-result-object p1
 
-    const p2, 0x7f08051b
+    const p2, 0x7f08051c
 
     invoke-virtual {p1, p2}, Landroid/widget/ImageView;->setImageResource(I)V
 
@@ -779,7 +779,7 @@
 
     move-result-object p1
 
-    const p2, 0x7f08051d
+    const p2, 0x7f08051e
 
     invoke-virtual {p1, p2}, Landroid/widget/ImageView;->setImageResource(I)V
 
diff --git a/com.discord/smali/com/discord/widgets/status/WidgetStatus.smali b/com.discord/smali/com/discord/widgets/status/WidgetStatus.smali
index fc7eeb0e70..272a7a3785 100644
--- a/com.discord/smali/com/discord/widgets/status/WidgetStatus.smali
+++ b/com.discord/smali/com/discord/widgets/status/WidgetStatus.smali
@@ -139,7 +139,7 @@
 
     const-string v4, "statusUnreadMessages"
 
-    const-string v5, "getStatusUnreadMessages()Landroid/view/View;"
+    const-string v5, "getStatusUnreadMessages()Landroid/widget/LinearLayout;"
 
     invoke-direct {v2, v3, v4, v5}, Ly/u/b/u;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
 
@@ -408,7 +408,7 @@
     :goto_4
     invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/status/WidgetStatus;->getStatusUnreadMessages()Landroid/view/View;
+    invoke-direct {p0}, Lcom/discord/widgets/status/WidgetStatus;->getStatusUnreadMessages()Landroid/widget/LinearLayout;
 
     move-result-object v0
 
@@ -416,7 +416,7 @@
 
     invoke-direct {v1, p1}, Lcom/discord/widgets/status/WidgetStatus$configureUIContent$1;-><init>(Lcom/discord/widgets/status/WidgetStatus$Model;)V
 
-    invoke-virtual {v0, v1}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {v0, v1}, Landroid/widget/LinearLayout;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     invoke-virtual {p1}, Lcom/discord/widgets/status/WidgetStatus$Model;->getUnreadCount()I
 
@@ -434,11 +434,11 @@
 
     if-lez v6, :cond_5
 
-    invoke-direct {p0}, Lcom/discord/widgets/status/WidgetStatus;->getStatusUnreadMessages()Landroid/view/View;
+    invoke-direct {p0}, Lcom/discord/widgets/status/WidgetStatus;->getStatusUnreadMessages()Landroid/widget/LinearLayout;
 
     move-result-object v0
 
-    invoke-virtual {v0, v2}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {v0, v2}, Landroid/widget/LinearLayout;->setVisibility(I)V
 
     invoke-direct {p0}, Lcom/discord/widgets/status/WidgetStatus;->getStatusUnreadMessagesText()Landroid/widget/TextView;
 
@@ -465,11 +465,11 @@
     goto :goto_5
 
     :cond_5
-    invoke-direct {p0}, Lcom/discord/widgets/status/WidgetStatus;->getStatusUnreadMessages()Landroid/view/View;
+    invoke-direct {p0}, Lcom/discord/widgets/status/WidgetStatus;->getStatusUnreadMessages()Landroid/widget/LinearLayout;
 
     move-result-object v0
 
-    invoke-virtual {v0, v3}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {v0, v3}, Landroid/widget/LinearLayout;->setVisibility(I)V
 
     :goto_5
     invoke-direct {p0}, Lcom/discord/widgets/status/WidgetStatus;->getStatusUnreadMessagesMark()Landroid/view/View;
@@ -618,7 +618,7 @@
     return-object v0
 .end method
 
-.method private final getStatusUnreadMessages()Landroid/view/View;
+.method private final getStatusUnreadMessages()Landroid/widget/LinearLayout;
     .locals 3
 
     iget-object v0, p0, Lcom/discord/widgets/status/WidgetStatus;->statusUnreadMessages$delegate:Lkotlin/properties/ReadOnlyProperty;
@@ -633,7 +633,7 @@
 
     move-result-object v0
 
-    check-cast v0, Landroid/view/View;
+    check-cast v0, Landroid/widget/LinearLayout;
 
     return-object v0
 .end method
diff --git a/com.discord/smali/com/discord/widgets/tabs/WidgetTabsHost$updateViews$$inlined$apply$lambda$1.smali b/com.discord/smali/com/discord/widgets/tabs/WidgetTabsHost$updateViews$$inlined$apply$lambda$1.smali
new file mode 100644
index 0000000000..d1d5f33c02
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/tabs/WidgetTabsHost$updateViews$$inlined$apply$lambda$1.smali
@@ -0,0 +1,74 @@
+.class public final Lcom/discord/widgets/tabs/WidgetTabsHost$updateViews$$inlined$apply$lambda$1;
+.super Ljava/lang/Object;
+.source "WidgetTabsHost.kt"
+
+# interfaces
+.implements Landroid/animation/ValueAnimator$AnimatorUpdateListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/tabs/WidgetTabsHost;->updateViews(Lcom/discord/widgets/tabs/TabsHostViewModel$ViewState;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+
+# instance fields
+.field public final synthetic this$0:Lcom/discord/widgets/tabs/WidgetTabsHost;
+
+
+# direct methods
+.method public constructor <init>(Lcom/discord/widgets/tabs/WidgetTabsHost;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/tabs/WidgetTabsHost$updateViews$$inlined$apply$lambda$1;->this$0:Lcom/discord/widgets/tabs/WidgetTabsHost;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final onAnimationUpdate(Landroid/animation/ValueAnimator;)V
+    .locals 2
+
+    iget-object v0, p0, Lcom/discord/widgets/tabs/WidgetTabsHost$updateViews$$inlined$apply$lambda$1;->this$0:Lcom/discord/widgets/tabs/WidgetTabsHost;
+
+    invoke-static {v0}, Lcom/discord/widgets/tabs/WidgetTabsHost;->access$getBottomNavigationView$p(Lcom/discord/widgets/tabs/WidgetTabsHost;)Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;
+
+    move-result-object v0
+
+    const-string v1, "animator"
+
+    invoke-static {p1, v1}, Ly/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1}, Landroid/animation/ValueAnimator;->getAnimatedValue()Ljava/lang/Object;
+
+    move-result-object p1
+
+    if-eqz p1, :cond_0
+
+    check-cast p1, Ljava/lang/Float;
+
+    invoke-virtual {p1}, Ljava/lang/Float;->floatValue()F
+
+    move-result p1
+
+    invoke-virtual {v0, p1}, Landroid/widget/LinearLayout;->setTranslationY(F)V
+
+    return-void
+
+    :cond_0
+    new-instance p1, Ly/l;
+
+    const-string v0, "null cannot be cast to non-null type kotlin.Float"
+
+    invoke-direct {p1, v0}, Ly/l;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
diff --git a/com.discord/smali/com/discord/widgets/tabs/WidgetTabsHost$updateViews$$inlined$apply$lambda$2.smali b/com.discord/smali/com/discord/widgets/tabs/WidgetTabsHost$updateViews$$inlined$apply$lambda$2.smali
new file mode 100644
index 0000000000..ac1a2dc385
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/tabs/WidgetTabsHost$updateViews$$inlined$apply$lambda$2.smali
@@ -0,0 +1,74 @@
+.class public final Lcom/discord/widgets/tabs/WidgetTabsHost$updateViews$$inlined$apply$lambda$2;
+.super Ljava/lang/Object;
+.source "WidgetTabsHost.kt"
+
+# interfaces
+.implements Landroid/animation/ValueAnimator$AnimatorUpdateListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+    value = Lcom/discord/widgets/tabs/WidgetTabsHost;->updateViews(Lcom/discord/widgets/tabs/TabsHostViewModel$ViewState;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+    accessFlags = 0x19
+    name = null
+.end annotation
+
+
+# instance fields
+.field public final synthetic this$0:Lcom/discord/widgets/tabs/WidgetTabsHost;
+
+
+# direct methods
+.method public constructor <init>(Lcom/discord/widgets/tabs/WidgetTabsHost;)V
+    .locals 0
+
+    iput-object p1, p0, Lcom/discord/widgets/tabs/WidgetTabsHost$updateViews$$inlined$apply$lambda$2;->this$0:Lcom/discord/widgets/tabs/WidgetTabsHost;
+
+    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+    return-void
+.end method
+
+
+# virtual methods
+.method public final onAnimationUpdate(Landroid/animation/ValueAnimator;)V
+    .locals 2
+
+    iget-object v0, p0, Lcom/discord/widgets/tabs/WidgetTabsHost$updateViews$$inlined$apply$lambda$2;->this$0:Lcom/discord/widgets/tabs/WidgetTabsHost;
+
+    invoke-static {v0}, Lcom/discord/widgets/tabs/WidgetTabsHost;->access$getBottomNavigationView$p(Lcom/discord/widgets/tabs/WidgetTabsHost;)Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;
+
+    move-result-object v0
+
+    const-string v1, "animator"
+
+    invoke-static {p1, v1}, Ly/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-virtual {p1}, Landroid/animation/ValueAnimator;->getAnimatedValue()Ljava/lang/Object;
+
+    move-result-object p1
+
+    if-eqz p1, :cond_0
+
+    check-cast p1, Ljava/lang/Float;
+
+    invoke-virtual {p1}, Ljava/lang/Float;->floatValue()F
+
+    move-result p1
+
+    invoke-virtual {v0, p1}, Landroid/widget/LinearLayout;->setTranslationY(F)V
+
+    return-void
+
+    :cond_0
+    new-instance p1, Ly/l;
+
+    const-string v0, "null cannot be cast to non-null type kotlin.Float"
+
+    invoke-direct {p1, v0}, Ly/l;-><init>(Ljava/lang/String;)V
+
+    throw p1
+.end method
diff --git a/com.discord/smali/com/discord/widgets/tabs/WidgetTabsHost.smali b/com.discord/smali/com/discord/widgets/tabs/WidgetTabsHost.smali
index 3cd31b89be..6cfe78d7ff 100644
--- a/com.discord/smali/com/discord/widgets/tabs/WidgetTabsHost.smali
+++ b/com.discord/smali/com/discord/widgets/tabs/WidgetTabsHost.smali
@@ -22,6 +22,8 @@
 
 
 # instance fields
+.field public bottomNavAnimator:Landroid/animation/ValueAnimator;
+
 .field public final bottomNavigationView$delegate:Lkotlin/properties/ReadOnlyProperty;
 
 .field public final callIndicatorVisibilityObserver:Lcom/discord/widgets/voice/call/CallIndicatorVisibilityObserver;
@@ -341,6 +343,16 @@
     return-void
 .end method
 
+.method public static final synthetic access$getBottomNavigationView$p(Lcom/discord/widgets/tabs/WidgetTabsHost;)Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;
+    .locals 0
+
+    invoke-direct {p0}, Lcom/discord/widgets/tabs/WidgetTabsHost;->getBottomNavigationView()Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;
+
+    move-result-object p0
+
+    return-object p0
+.end method
+
 .method public static final synthetic access$getViewModel$p(Lcom/discord/widgets/tabs/WidgetTabsHost;)Lcom/discord/widgets/tabs/TabsHostViewModel;
     .locals 0
 
@@ -939,7 +951,7 @@
 
     iget-object v3, p0, Lcom/discord/widgets/tabs/WidgetTabsHost;->viewModel:Lcom/discord/widgets/tabs/TabsHostViewModel;
 
-    if-eqz v3, :cond_5
+    if-eqz v3, :cond_6
 
     invoke-direct {v2, v3}, Lcom/discord/widgets/tabs/WidgetTabsHost$updateViews$1;-><init>(Lcom/discord/widgets/tabs/TabsHostViewModel;)V
 
@@ -989,75 +1001,116 @@
 
     if-eq v11, v1, :cond_0
 
+    const/4 v1, 0x1
+
     goto :goto_0
 
     :cond_0
-    const/4 v0, 0x0
+    const/4 v1, 0x0
 
     :goto_0
     if-nez p1, :cond_1
 
-    if-eqz v0, :cond_4
+    if-eqz v1, :cond_5
 
     :cond_1
+    iget-object p1, p0, Lcom/discord/widgets/tabs/WidgetTabsHost;->bottomNavAnimator:Landroid/animation/ValueAnimator;
+
+    if-eqz p1, :cond_2
+
+    invoke-virtual {p1}, Landroid/animation/ValueAnimator;->cancel()V
+
+    :cond_2
     invoke-direct {p0}, Lcom/discord/widgets/tabs/WidgetTabsHost;->getBottomNavigationView()Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Landroid/widget/LinearLayout;->clearAnimation()V
+    invoke-virtual {p1}, Landroid/widget/LinearLayout;->getTranslationY()F
 
-    if-eqz v10, :cond_2
+    move-result p1
+
+    const/4 v1, 0x2
+
+    if-eqz v10, :cond_3
 
     invoke-direct {p0}, Lcom/discord/widgets/tabs/WidgetTabsHost;->getBottomNavigationView()Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;
 
-    move-result-object p1
+    move-result-object v3
 
-    invoke-virtual {p1, v2}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {v3, v2}, Landroid/view/View;->setVisibility(I)V
 
-    invoke-direct {p0}, Lcom/discord/widgets/tabs/WidgetTabsHost;->getBottomNavigationView()Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;
+    new-array v1, v1, [F
+
+    aput p1, v1, v2
+
+    const/4 p1, 0x0
+
+    aput p1, v1, v0
+
+    invoke-static {v1}, Landroid/animation/ValueAnimator;->ofFloat([F)Landroid/animation/ValueAnimator;
 
     move-result-object p1
 
-    invoke-virtual {p1}, Landroid/widget/LinearLayout;->animate()Landroid/view/ViewPropertyAnimator;
+    new-instance v0, Landroidx/interpolator/view/animation/FastOutSlowInInterpolator;
 
-    move-result-object p1
+    invoke-direct {v0}, Landroidx/interpolator/view/animation/FastOutSlowInInterpolator;-><init>()V
+
+    invoke-virtual {p1, v0}, Landroid/animation/ValueAnimator;->setInterpolator(Landroid/animation/TimeInterpolator;)V
 
     const-wide/16 v0, 0xfa
 
-    invoke-virtual {p1, v0, v1}, Landroid/view/ViewPropertyAnimator;->setDuration(J)Landroid/view/ViewPropertyAnimator;
+    invoke-virtual {p1, v0, v1}, Landroid/animation/ValueAnimator;->setDuration(J)Landroid/animation/ValueAnimator;
 
-    move-result-object p1
+    new-instance v0, Lcom/discord/widgets/tabs/WidgetTabsHost$updateViews$$inlined$apply$lambda$1;
 
-    const/4 v0, 0x0
+    invoke-direct {v0, p0}, Lcom/discord/widgets/tabs/WidgetTabsHost$updateViews$$inlined$apply$lambda$1;-><init>(Lcom/discord/widgets/tabs/WidgetTabsHost;)V
 
-    invoke-virtual {p1, v0}, Landroid/view/ViewPropertyAnimator;->translationY(F)Landroid/view/ViewPropertyAnimator;
+    invoke-virtual {p1, v0}, Landroid/animation/ValueAnimator;->addUpdateListener(Landroid/animation/ValueAnimator$AnimatorUpdateListener;)V
 
-    goto :goto_1
+    invoke-virtual {p1}, Landroid/animation/ValueAnimator;->start()V
 
-    :cond_2
-    if-lez v11, :cond_3
-
-    invoke-direct {p0}, Lcom/discord/widgets/tabs/WidgetTabsHost;->getBottomNavigationView()Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;
-
-    move-result-object p1
-
-    invoke-virtual {p1}, Landroid/widget/LinearLayout;->animate()Landroid/view/ViewPropertyAnimator;
-
-    move-result-object p1
-
-    const-wide/16 v0, 0xc8
-
-    invoke-virtual {p1, v0, v1}, Landroid/view/ViewPropertyAnimator;->setDuration(J)Landroid/view/ViewPropertyAnimator;
-
-    move-result-object p1
-
-    int-to-float v0, v11
-
-    invoke-virtual {p1, v0}, Landroid/view/ViewPropertyAnimator;->translationY(F)Landroid/view/ViewPropertyAnimator;
+    iput-object p1, p0, Lcom/discord/widgets/tabs/WidgetTabsHost;->bottomNavAnimator:Landroid/animation/ValueAnimator;
 
     goto :goto_1
 
     :cond_3
+    if-lez v11, :cond_4
+
+    new-array v1, v1, [F
+
+    aput p1, v1, v2
+
+    int-to-float p1, v11
+
+    aput p1, v1, v0
+
+    invoke-static {v1}, Landroid/animation/ValueAnimator;->ofFloat([F)Landroid/animation/ValueAnimator;
+
+    move-result-object p1
+
+    new-instance v0, Landroidx/interpolator/view/animation/FastOutSlowInInterpolator;
+
+    invoke-direct {v0}, Landroidx/interpolator/view/animation/FastOutSlowInInterpolator;-><init>()V
+
+    invoke-virtual {p1, v0}, Landroid/animation/ValueAnimator;->setInterpolator(Landroid/animation/TimeInterpolator;)V
+
+    const-wide/16 v0, 0xc8
+
+    invoke-virtual {p1, v0, v1}, Landroid/animation/ValueAnimator;->setDuration(J)Landroid/animation/ValueAnimator;
+
+    new-instance v0, Lcom/discord/widgets/tabs/WidgetTabsHost$updateViews$$inlined$apply$lambda$2;
+
+    invoke-direct {v0, p0}, Lcom/discord/widgets/tabs/WidgetTabsHost$updateViews$$inlined$apply$lambda$2;-><init>(Lcom/discord/widgets/tabs/WidgetTabsHost;)V
+
+    invoke-virtual {p1, v0}, Landroid/animation/ValueAnimator;->addUpdateListener(Landroid/animation/ValueAnimator$AnimatorUpdateListener;)V
+
+    invoke-virtual {p1}, Landroid/animation/ValueAnimator;->start()V
+
+    iput-object p1, p0, Lcom/discord/widgets/tabs/WidgetTabsHost;->bottomNavAnimator:Landroid/animation/ValueAnimator;
+
+    goto :goto_1
+
+    :cond_4
     invoke-direct {p0}, Lcom/discord/widgets/tabs/WidgetTabsHost;->getBottomNavigationView()Lcom/discord/widgets/tabs/TabsHostBottomNavigationView;
 
     move-result-object p1
@@ -1066,7 +1119,7 @@
 
     invoke-virtual {p1, v0}, Landroid/widget/LinearLayout;->setVisibility(I)V
 
-    :cond_4
+    :cond_5
     :goto_1
     iput v11, p0, Lcom/discord/widgets/tabs/WidgetTabsHost;->previousBottomNavHeight:I
 
@@ -1078,7 +1131,7 @@
 
     return-void
 
-    :cond_5
+    :cond_6
     const-string p1, "viewModel"
 
     invoke-static {p1}, Ly/u/b/j;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
diff --git a/com.discord/smali/f/a/a/a/a.smali b/com.discord/smali/f/a/a/a/a.smali
index 1d3a6cacd6..291808e6e8 100644
--- a/com.discord/smali/f/a/a/a/a.smali
+++ b/com.discord/smali/f/a/a/a/a.smali
@@ -228,7 +228,7 @@
 
     invoke-static {v4, v5}, Ly/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v5, 0x7f08050f
+    const v5, 0x7f080510
 
     invoke-direct {v2, v5, v3, v4}, Lf/a/a/a/a$c;-><init>(ILjava/lang/String;Ljava/lang/String;)V
 
@@ -258,7 +258,7 @@
 
     invoke-static {v5, v6}, Ly/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v6, 0x7f0804d4
+    const v6, 0x7f0804d5
 
     invoke-direct {v2, v6, v4, v5}, Lf/a/a/a/a$c;-><init>(ILjava/lang/String;Ljava/lang/String;)V
 
@@ -286,7 +286,7 @@
 
     invoke-static {v5, v6}, Ly/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v6, 0x7f0804a8
+    const v6, 0x7f0804a9
 
     invoke-direct {v2, v6, v4, v5}, Lf/a/a/a/a$c;-><init>(ILjava/lang/String;Ljava/lang/String;)V
 
@@ -334,7 +334,7 @@
 
     invoke-static {v4, v6}, Ly/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v6, 0x7f080510
+    const v6, 0x7f080511
 
     invoke-direct {v2, v6, v5, v4}, Lf/a/a/a/a$c;-><init>(ILjava/lang/String;Ljava/lang/String;)V
 
@@ -364,7 +364,7 @@
 
     invoke-static {v5, v6}, Ly/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v6, 0x7f0804ad
+    const v6, 0x7f0804ae
 
     invoke-direct {v2, v6, v4, v5}, Lf/a/a/a/a$c;-><init>(ILjava/lang/String;Ljava/lang/String;)V
 
@@ -394,7 +394,7 @@
 
     invoke-static {v5, v6}, Ly/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
-    const v6, 0x7f0804b0
+    const v6, 0x7f0804b1
 
     invoke-direct {v2, v6, v4, v5}, Lf/a/a/a/a$c;-><init>(ILjava/lang/String;Ljava/lang/String;)V
 
diff --git a/com.discord/smali/f/a/a/i.smali b/com.discord/smali/f/a/a/i.smali
index ebdd874d4c..49615b64d3 100644
--- a/com.discord/smali/f/a/a/i.smali
+++ b/com.discord/smali/f/a/a/i.smali
@@ -189,7 +189,7 @@
 
     check-cast v2, Landroid/widget/TextView;
 
-    const v3, 0x7f1215d0
+    const v3, 0x7f1215d1
 
     new-array v1, v1, [Ljava/lang/Object;
 
diff --git a/com.discord/smali/f/a/k/t.smali b/com.discord/smali/f/a/k/t.smali
index b175c466dc..0a21561444 100644
--- a/com.discord/smali/f/a/k/t.smali
+++ b/com.discord/smali/f/a/k/t.smali
@@ -53,7 +53,7 @@
     goto :goto_0
 
     :cond_0
-    const v1, 0x7f08046b
+    const v1, 0x7f08046c
 
     :goto_0
     invoke-virtual {v0, v1}, Landroid/widget/ImageView;->setImageResource(I)V
diff --git a/com.discord/smali_classes2/r$a.smali b/com.discord/smali/r$a.smali
similarity index 100%
rename from com.discord/smali_classes2/r$a.smali
rename to com.discord/smali/r$a.smali
diff --git a/com.discord/smali_classes2/r$b$a.smali b/com.discord/smali/r$b$a.smali
similarity index 100%
rename from com.discord/smali_classes2/r$b$a.smali
rename to com.discord/smali/r$b$a.smali
diff --git a/com.discord/smali_classes2/r$b.smali b/com.discord/smali/r$b.smali
similarity index 100%
rename from com.discord/smali_classes2/r$b.smali
rename to com.discord/smali/r$b.smali
diff --git a/com.discord/smali_classes2/r$c.smali b/com.discord/smali/r$c.smali
similarity index 100%
rename from com.discord/smali_classes2/r$c.smali
rename to com.discord/smali/r$c.smali
diff --git a/com.discord/smali_classes2/r$d.smali b/com.discord/smali/r$d.smali
similarity index 100%
rename from com.discord/smali_classes2/r$d.smali
rename to com.discord/smali/r$d.smali
diff --git a/com.discord/smali_classes2/r.smali b/com.discord/smali/r.smali
similarity index 100%
rename from com.discord/smali_classes2/r.smali
rename to com.discord/smali/r.smali
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/Badge$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/user/Badge$Companion.smali
index 10c9fa7f54..2cc1ce372a 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/Badge$Companion.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/Badge$Companion.smali
@@ -512,7 +512,7 @@
 
     const v10, 0x7f0803d7
 
-    const v4, 0x7f1215bb
+    const v4, 0x7f1215bc
 
     invoke-virtual {v2, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserSetCustomStatus.smali b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserSetCustomStatus.smali
index 3f6fa60e70..f36a1a0173 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserSetCustomStatus.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserSetCustomStatus.smali
@@ -747,7 +747,7 @@
 
     move-result-object v3
 
-    const v6, 0x7f080409
+    const v6, 0x7f08040a
 
     invoke-virtual {v3, v6}, Lcom/facebook/drawee/view/SimpleDraweeView;->setActualImageResource(I)V
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserStatusSheet.smali b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserStatusSheet.smali
index 605fd5745c..059bdc1f09 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserStatusSheet.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/WidgetUserStatusSheet.smali
@@ -640,7 +640,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f080419
+    const v2, 0x7f08041a
 
     const v3, 0x7f121344
 
@@ -668,7 +668,7 @@
 
     move-result-object v1
 
-    const v2, 0x7f080417
+    const v2, 0x7f080418
 
     const v3, 0x7f121340
 
@@ -688,7 +688,7 @@
 
     move-result-object p1
 
-    const p2, 0x7f080416
+    const p2, 0x7f080417
 
     const v0, 0x7f12133e
 
@@ -714,7 +714,7 @@
 
     move-result-object p1
 
-    const p2, 0x7f080418
+    const p2, 0x7f080419
 
     const v0, 0x7f121341
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/account/WidgetUserAccountVerify.smali b/com.discord/smali_classes2/com/discord/widgets/user/account/WidgetUserAccountVerify.smali
index 485357bf54..f82b59b860 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/account/WidgetUserAccountVerify.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/account/WidgetUserAccountVerify.smali
@@ -27,7 +27,7 @@
 .method private getBodyText(Landroid/content/Context;)Ljava/lang/CharSequence;
     .locals 1
 
-    const v0, 0x7f1215a3
+    const v0, 0x7f1215a4
 
     invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
 
@@ -59,7 +59,7 @@
 
     aput-object v0, v1, v2
 
-    const v0, 0x7f1215ab
+    const v0, 0x7f1215ac
 
     invoke-virtual {p0, v0, v1}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/email/WidgetUserEmailVerify.smali b/com.discord/smali_classes2/com/discord/widgets/user/email/WidgetUserEmailVerify.smali
index beecb4b48b..3953c387b4 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/email/WidgetUserEmailVerify.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/email/WidgetUserEmailVerify.smali
@@ -139,7 +139,7 @@
 
     aput-object p1, v0, v1
 
-    const p1, 0x7f1215a5
+    const p1, 0x7f1215a6
 
     invoke-virtual {p0, p1, v0}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali b/com.discord/smali_classes2/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali
index cd7ab84670..a0c60af3d8 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali
@@ -438,7 +438,7 @@
 
     if-eqz v0, :cond_3
 
-    const v2, 0x7f0803f3
+    const v2, 0x7f0803f4
 
     goto :goto_2
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearch$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearch$Companion.smali
index eb0d94f33a..94ef5ab117 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearch$Companion.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/search/WidgetGlobalSearch$Companion.smali
@@ -67,7 +67,7 @@
 
     new-array v0, v0, [Lkotlin/Pair;
 
-    const v1, 0x7f121595
+    const v1, 0x7f121596
 
     invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -109,7 +109,7 @@
 
     const/4 v1, 0x2
 
-    const v2, 0x7f1215ee
+    const v2, 0x7f1215ef
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall.smali
index b885d8efd1..e274567ec6 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetPrivateCall.smali
@@ -778,7 +778,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f1215f2
+    const v0, 0x7f1215f3
 
     invoke-virtual {p1, v0}, Landroid/widget/TextView;->setText(I)V
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming.smali
index c636cc5105..b4ce2e31c5 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming.smali
@@ -540,7 +540,7 @@
 
     if-eqz v3, :cond_5
 
-    const v3, 0x7f1215ca
+    const v3, 0x7f1215cb
 
     goto :goto_3
 
@@ -605,7 +605,7 @@
 
     if-eqz v2, :cond_8
 
-    const v2, 0x7f080462
+    const v2, 0x7f080463
 
     goto :goto_5
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/controls/FloatingVoiceControlsView$OutputSelectorState.smali b/com.discord/smali_classes2/com/discord/widgets/voice/controls/FloatingVoiceControlsView$OutputSelectorState.smali
index e044f8727e..614603fe61 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/controls/FloatingVoiceControlsView$OutputSelectorState.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/controls/FloatingVoiceControlsView$OutputSelectorState.smali
@@ -58,7 +58,7 @@
 
     const/4 v3, 0x0
 
-    const v4, 0x7f08040c
+    const v4, 0x7f08040d
 
     const/4 v5, 0x1
 
@@ -80,7 +80,7 @@
 
     const/4 v10, 0x1
 
-    const v11, 0x7f08040c
+    const v11, 0x7f08040d
 
     const/4 v12, 0x0
 
@@ -102,7 +102,7 @@
 
     const/4 v5, 0x2
 
-    const v6, 0x7f08040d
+    const v6, 0x7f08040e
 
     const/4 v7, 0x1
 
@@ -124,7 +124,7 @@
 
     const/4 v5, 0x3
 
-    const v6, 0x7f08040c
+    const v6, 0x7f08040d
 
     move-object v3, v1
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/VoiceControlsView$configureUI$3.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/VoiceControlsView$configureUI$3.smali
index 270013c356..8f77152099 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/VoiceControlsView$configureUI$3.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/VoiceControlsView$configureUI$3.smali
@@ -55,7 +55,7 @@
 
     move-result-object p1
 
-    const v0, 0x7f121599
+    const v0, 0x7f12159a
 
     const/4 v1, 0x0
 
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetSpectatorsSheet.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetSpectatorsSheet.smali
index a5275b2c7f..13eac92b1b 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetSpectatorsSheet.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/WidgetSpectatorsSheet.smali
@@ -137,7 +137,7 @@
 
     move-result-object v0
 
-    const v1, 0x7f1215fd
+    const v1, 0x7f1215fe
 
     const/4 v2, 0x1
 
diff --git a/com.discord/smali_classes2/com/google/android/exoplayer2/ui/R$b.smali b/com.discord/smali_classes2/com/google/android/exoplayer2/ui/R$b.smali
index 3b60083631..a238303231 100644
--- a/com.discord/smali_classes2/com/google/android/exoplayer2/ui/R$b.smali
+++ b/com.discord/smali_classes2/com/google/android/exoplayer2/ui/R$b.smali
@@ -93,29 +93,29 @@
 
 .field public static final exo_notification_stop:I = 0x7f0801f8
 
-.field public static final notification_action_background:I = 0x7f08052a
+.field public static final notification_action_background:I = 0x7f08052b
 
-.field public static final notification_bg:I = 0x7f08052b
+.field public static final notification_bg:I = 0x7f08052c
 
-.field public static final notification_bg_low:I = 0x7f08052c
+.field public static final notification_bg_low:I = 0x7f08052d
 
-.field public static final notification_bg_low_normal:I = 0x7f08052d
+.field public static final notification_bg_low_normal:I = 0x7f08052e
 
-.field public static final notification_bg_low_pressed:I = 0x7f08052e
+.field public static final notification_bg_low_pressed:I = 0x7f08052f
 
-.field public static final notification_bg_normal:I = 0x7f08052f
+.field public static final notification_bg_normal:I = 0x7f080530
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080530
+.field public static final notification_bg_normal_pressed:I = 0x7f080531
 
-.field public static final notification_icon_background:I = 0x7f080531
+.field public static final notification_icon_background:I = 0x7f080532
 
-.field public static final notification_template_icon_bg:I = 0x7f080532
+.field public static final notification_template_icon_bg:I = 0x7f080533
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080533
+.field public static final notification_template_icon_low_bg:I = 0x7f080534
 
-.field public static final notification_tile_bg:I = 0x7f080534
+.field public static final notification_tile_bg:I = 0x7f080535
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080535
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080536
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/google/android/material/R$drawable.smali b/com.discord/smali_classes2/com/google/android/material/R$drawable.smali
index e1039b565e..2d66efbc75 100644
--- a/com.discord/smali_classes2/com/google/android/material/R$drawable.smali
+++ b/com.discord/smali_classes2/com/google/android/material/R$drawable.smali
@@ -241,55 +241,55 @@
 
 .field public static final ic_mtrl_chip_close_circle:I = 0x7f08037e
 
-.field public static final mtrl_dialog_background:I = 0x7f080520
+.field public static final mtrl_dialog_background:I = 0x7f080521
 
-.field public static final mtrl_dropdown_arrow:I = 0x7f080521
+.field public static final mtrl_dropdown_arrow:I = 0x7f080522
 
-.field public static final mtrl_ic_arrow_drop_down:I = 0x7f080522
+.field public static final mtrl_ic_arrow_drop_down:I = 0x7f080523
 
-.field public static final mtrl_ic_arrow_drop_up:I = 0x7f080523
+.field public static final mtrl_ic_arrow_drop_up:I = 0x7f080524
 
-.field public static final mtrl_ic_cancel:I = 0x7f080524
+.field public static final mtrl_ic_cancel:I = 0x7f080525
 
-.field public static final mtrl_ic_error:I = 0x7f080525
+.field public static final mtrl_ic_error:I = 0x7f080526
 
-.field public static final mtrl_popupmenu_background:I = 0x7f080526
+.field public static final mtrl_popupmenu_background:I = 0x7f080527
 
-.field public static final mtrl_popupmenu_background_dark:I = 0x7f080527
+.field public static final mtrl_popupmenu_background_dark:I = 0x7f080528
 
-.field public static final mtrl_tabs_default_indicator:I = 0x7f080528
+.field public static final mtrl_tabs_default_indicator:I = 0x7f080529
 
-.field public static final navigation_empty_icon:I = 0x7f080529
+.field public static final navigation_empty_icon:I = 0x7f08052a
 
-.field public static final notification_action_background:I = 0x7f08052a
+.field public static final notification_action_background:I = 0x7f08052b
 
-.field public static final notification_bg:I = 0x7f08052b
+.field public static final notification_bg:I = 0x7f08052c
 
-.field public static final notification_bg_low:I = 0x7f08052c
+.field public static final notification_bg_low:I = 0x7f08052d
 
-.field public static final notification_bg_low_normal:I = 0x7f08052d
+.field public static final notification_bg_low_normal:I = 0x7f08052e
 
-.field public static final notification_bg_low_pressed:I = 0x7f08052e
+.field public static final notification_bg_low_pressed:I = 0x7f08052f
 
-.field public static final notification_bg_normal:I = 0x7f08052f
+.field public static final notification_bg_normal:I = 0x7f080530
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080530
+.field public static final notification_bg_normal_pressed:I = 0x7f080531
 
-.field public static final notification_icon_background:I = 0x7f080531
+.field public static final notification_icon_background:I = 0x7f080532
 
-.field public static final notification_template_icon_bg:I = 0x7f080532
+.field public static final notification_template_icon_bg:I = 0x7f080533
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080533
+.field public static final notification_template_icon_low_bg:I = 0x7f080534
 
-.field public static final notification_tile_bg:I = 0x7f080534
+.field public static final notification_tile_bg:I = 0x7f080535
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080535
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080536
 
-.field public static final test_custom_background:I = 0x7f080545
+.field public static final test_custom_background:I = 0x7f080547
 
-.field public static final tooltip_frame_dark:I = 0x7f080546
+.field public static final tooltip_frame_dark:I = 0x7f080548
 
-.field public static final tooltip_frame_light:I = 0x7f080547
+.field public static final tooltip_frame_light:I = 0x7f080549
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/R$d.smali b/com.discord/smali_classes2/com/lytefast/flexinput/R$d.smali
index 6dc32d1a62..a11e08af58 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/R$d.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/R$d.smali
@@ -1869,691 +1869,695 @@
 
 .field public static final ic_search:I = 0x7f0803e9
 
-.field public static final ic_search_grey_24dp:I = 0x7f0803ea
+.field public static final ic_search_16dp:I = 0x7f0803ea
 
-.field public static final ic_search_white_24dp:I = 0x7f0803eb
+.field public static final ic_search_grey_24dp:I = 0x7f0803eb
 
-.field public static final ic_security_24dp:I = 0x7f0803ec
+.field public static final ic_search_white_24dp:I = 0x7f0803ec
 
-.field public static final ic_security_dark_a60_24dp:I = 0x7f0803ed
+.field public static final ic_security_24dp:I = 0x7f0803ed
 
-.field public static final ic_security_light_a60_24dp:I = 0x7f0803ee
+.field public static final ic_security_dark_a60_24dp:I = 0x7f0803ee
 
-.field public static final ic_send_24dp:I = 0x7f0803ef
+.field public static final ic_security_light_a60_24dp:I = 0x7f0803ef
 
-.field public static final ic_send_grey_a60_24dp:I = 0x7f0803f0
+.field public static final ic_send_24dp:I = 0x7f0803f0
 
-.field public static final ic_send_white_24dp:I = 0x7f0803f1
+.field public static final ic_send_grey_a60_24dp:I = 0x7f0803f1
 
-.field public static final ic_send_white_a60_24dp:I = 0x7f0803f2
+.field public static final ic_send_white_24dp:I = 0x7f0803f2
 
-.field public static final ic_settings_24dp:I = 0x7f0803f3
+.field public static final ic_send_white_a60_24dp:I = 0x7f0803f3
 
-.field public static final ic_settings_boost_24dp:I = 0x7f0803f4
+.field public static final ic_settings_24dp:I = 0x7f0803f4
 
-.field public static final ic_settings_grey_a60_24dp:I = 0x7f0803f5
+.field public static final ic_settings_boost_24dp:I = 0x7f0803f5
 
-.field public static final ic_settings_white_a60_24dp:I = 0x7f0803f6
+.field public static final ic_settings_grey_a60_24dp:I = 0x7f0803f6
 
-.field public static final ic_share_grey_24dp:I = 0x7f0803f7
+.field public static final ic_settings_white_a60_24dp:I = 0x7f0803f7
 
-.field public static final ic_share_grey_a60_24dp:I = 0x7f0803f8
+.field public static final ic_share_grey_24dp:I = 0x7f0803f8
 
-.field public static final ic_share_white_24dp:I = 0x7f0803f9
+.field public static final ic_share_grey_a60_24dp:I = 0x7f0803f9
 
-.field public static final ic_share_white_a60_24dp:I = 0x7f0803fa
+.field public static final ic_share_white_24dp:I = 0x7f0803fa
 
-.field public static final ic_shieldstar_24dp:I = 0x7f0803fb
+.field public static final ic_share_white_a60_24dp:I = 0x7f0803fb
 
-.field public static final ic_sidebar_notifications_off_dark_24dp:I = 0x7f0803fc
+.field public static final ic_shieldstar_24dp:I = 0x7f0803fc
 
-.field public static final ic_sidebar_notifications_off_light_24dp:I = 0x7f0803fd
+.field public static final ic_sidebar_notifications_off_dark_24dp:I = 0x7f0803fd
 
-.field public static final ic_sidebar_notifications_on_dark_24dp:I = 0x7f0803fe
+.field public static final ic_sidebar_notifications_off_light_24dp:I = 0x7f0803fe
 
-.field public static final ic_sidebar_notifications_on_light_24dp:I = 0x7f0803ff
+.field public static final ic_sidebar_notifications_on_dark_24dp:I = 0x7f0803ff
 
-.field public static final ic_sidebar_pins_off_dark_24dp:I = 0x7f080400
+.field public static final ic_sidebar_notifications_on_light_24dp:I = 0x7f080400
 
-.field public static final ic_sidebar_pins_off_light_24dp:I = 0x7f080401
+.field public static final ic_sidebar_pins_off_dark_24dp:I = 0x7f080401
 
-.field public static final ic_sidebar_pins_on_dark_24dp:I = 0x7f080402
+.field public static final ic_sidebar_pins_off_light_24dp:I = 0x7f080402
 
-.field public static final ic_sidebar_pins_on_light_24dp:I = 0x7f080403
+.field public static final ic_sidebar_pins_on_dark_24dp:I = 0x7f080403
 
-.field public static final ic_sidebar_search_24dp:I = 0x7f080404
+.field public static final ic_sidebar_pins_on_light_24dp:I = 0x7f080404
 
-.field public static final ic_signal_cellular_connected_no_internet_4_bar_white_18dp:I = 0x7f080405
+.field public static final ic_sidebar_search_24dp:I = 0x7f080405
 
-.field public static final ic_skype_white_24dp:I = 0x7f080406
+.field public static final ic_signal_cellular_connected_no_internet_4_bar_white_18dp:I = 0x7f080406
 
-.field public static final ic_small_lock_green_24dp:I = 0x7f080407
+.field public static final ic_skype_white_24dp:I = 0x7f080407
 
-.field public static final ic_smile_24dp:I = 0x7f080408
+.field public static final ic_small_lock_green_24dp:I = 0x7f080408
 
-.field public static final ic_smiley_desaturated:I = 0x7f080409
+.field public static final ic_smile_24dp:I = 0x7f080409
 
-.field public static final ic_sort_grey_24dp:I = 0x7f08040a
+.field public static final ic_smiley_desaturated:I = 0x7f08040a
 
-.field public static final ic_sort_white_24dp:I = 0x7f08040b
+.field public static final ic_sort_grey_24dp:I = 0x7f08040b
 
-.field public static final ic_sound_24dp:I = 0x7f08040c
+.field public static final ic_sort_white_24dp:I = 0x7f08040c
 
-.field public static final ic_sound_bluetooth_24dp:I = 0x7f08040d
+.field public static final ic_sound_24dp:I = 0x7f08040d
 
-.field public static final ic_speaker_state_dark:I = 0x7f08040e
+.field public static final ic_sound_bluetooth_24dp:I = 0x7f08040e
 
-.field public static final ic_speaker_state_light:I = 0x7f08040f
+.field public static final ic_speaker_state_dark:I = 0x7f08040f
 
-.field public static final ic_spotify_green_24dp:I = 0x7f080410
+.field public static final ic_speaker_state_light:I = 0x7f080410
 
-.field public static final ic_spotify_white_24dp:I = 0x7f080411
+.field public static final ic_spotify_green_24dp:I = 0x7f080411
 
-.field public static final ic_staff_badge_blurple_24dp:I = 0x7f080412
+.field public static final ic_spotify_white_24dp:I = 0x7f080412
 
-.field public static final ic_star_24dp:I = 0x7f080413
+.field public static final ic_staff_badge_blurple_24dp:I = 0x7f080413
 
-.field public static final ic_start_stream_24dp:I = 0x7f080414
+.field public static final ic_star_24dp:I = 0x7f080414
 
-.field public static final ic_status_24dp:I = 0x7f080415
+.field public static final ic_start_stream_24dp:I = 0x7f080415
 
-.field public static final ic_status_dnd_16dp:I = 0x7f080416
+.field public static final ic_status_24dp:I = 0x7f080416
 
-.field public static final ic_status_idle_16dp:I = 0x7f080417
+.field public static final ic_status_dnd_16dp:I = 0x7f080417
 
-.field public static final ic_status_invisible_16dp:I = 0x7f080418
+.field public static final ic_status_idle_16dp:I = 0x7f080418
 
-.field public static final ic_status_online_16dp:I = 0x7f080419
+.field public static final ic_status_invisible_16dp:I = 0x7f080419
 
-.field public static final ic_status_streaming_16dp:I = 0x7f08041a
+.field public static final ic_status_online_16dp:I = 0x7f08041a
 
-.field public static final ic_steam_white_24dp:I = 0x7f08041b
+.field public static final ic_status_streaming_16dp:I = 0x7f08041b
 
-.field public static final ic_stop_stream:I = 0x7f08041c
+.field public static final ic_steam_white_24dp:I = 0x7f08041c
 
-.field public static final ic_stop_stream_24dp:I = 0x7f08041d
+.field public static final ic_stop_stream:I = 0x7f08041d
 
-.field public static final ic_swap_vertical_circle_grey_a60_24dp:I = 0x7f08041e
+.field public static final ic_stop_stream_24dp:I = 0x7f08041e
 
-.field public static final ic_swap_vertical_circle_white_a60_24dp:I = 0x7f08041f
+.field public static final ic_swap_vertical_circle_grey_a60_24dp:I = 0x7f08041f
 
-.field public static final ic_switch_camera_grey_24dp:I = 0x7f080420
+.field public static final ic_swap_vertical_circle_white_a60_24dp:I = 0x7f080420
 
-.field public static final ic_switch_camera_white_24dp:I = 0x7f080421
+.field public static final ic_switch_camera_grey_24dp:I = 0x7f080421
 
-.field public static final ic_take_photo:I = 0x7f080426
+.field public static final ic_switch_camera_white_24dp:I = 0x7f080422
 
-.field public static final ic_template_32dp:I = 0x7f080427
+.field public static final ic_take_photo:I = 0x7f080427
 
-.field public static final ic_ternary_neutral_checked:I = 0x7f080428
+.field public static final ic_template_32dp:I = 0x7f080428
 
-.field public static final ic_ternary_neutral_unchecked:I = 0x7f080429
+.field public static final ic_ternary_neutral_checked:I = 0x7f080429
 
-.field public static final ic_ternary_off_checked:I = 0x7f08042a
+.field public static final ic_ternary_neutral_unchecked:I = 0x7f08042a
 
-.field public static final ic_ternary_off_disabled:I = 0x7f08042b
+.field public static final ic_ternary_off_checked:I = 0x7f08042b
 
-.field public static final ic_ternary_off_unchecked:I = 0x7f08042c
+.field public static final ic_ternary_off_disabled:I = 0x7f08042c
 
-.field public static final ic_ternary_on_checked:I = 0x7f08042d
+.field public static final ic_ternary_off_unchecked:I = 0x7f08042d
 
-.field public static final ic_ternary_on_unchecked:I = 0x7f08042e
+.field public static final ic_ternary_on_checked:I = 0x7f08042e
 
-.field public static final ic_text_channel_grey_24dp:I = 0x7f08042f
+.field public static final ic_ternary_on_unchecked:I = 0x7f08042f
 
-.field public static final ic_text_channel_white_24dp:I = 0x7f080430
+.field public static final ic_text_channel_grey_24dp:I = 0x7f080430
 
-.field public static final ic_text_image_24dp:I = 0x7f080431
+.field public static final ic_text_channel_white_24dp:I = 0x7f080431
 
-.field public static final ic_theme_24dp:I = 0x7f080432
+.field public static final ic_text_image_24dp:I = 0x7f080432
 
-.field public static final ic_timer_dark:I = 0x7f080433
+.field public static final ic_theme_24dp:I = 0x7f080433
 
-.field public static final ic_timer_grey_a60_24dp:I = 0x7f080434
+.field public static final ic_timer_dark:I = 0x7f080434
 
-.field public static final ic_timer_light:I = 0x7f080435
+.field public static final ic_timer_grey_a60_24dp:I = 0x7f080435
 
-.field public static final ic_timer_white_a60_24dp:I = 0x7f080436
+.field public static final ic_timer_light:I = 0x7f080436
 
-.field public static final ic_transfer_red_24dp:I = 0x7f080437
+.field public static final ic_timer_white_a60_24dp:I = 0x7f080437
 
-.field public static final ic_twitch_white_24dp:I = 0x7f080439
+.field public static final ic_transfer_red_24dp:I = 0x7f080438
 
-.field public static final ic_twitter_white_18dp:I = 0x7f08043a
+.field public static final ic_twitch_white_24dp:I = 0x7f08043a
 
-.field public static final ic_twitter_white_24dp:I = 0x7f08043b
+.field public static final ic_twitter_white_18dp:I = 0x7f08043b
 
-.field public static final ic_unavailable_server_46dp:I = 0x7f08043c
+.field public static final ic_twitter_white_24dp:I = 0x7f08043c
 
-.field public static final ic_unban_grey:I = 0x7f08043d
+.field public static final ic_unavailable_server_46dp:I = 0x7f08043d
 
-.field public static final ic_unread_white_9dp:I = 0x7f08043e
+.field public static final ic_unban_grey:I = 0x7f08043e
 
-.field public static final ic_unread_white_9dp_horiz:I = 0x7f08043f
+.field public static final ic_unread_white_9dp:I = 0x7f08043f
 
-.field public static final ic_upload_24dp:I = 0x7f080440
+.field public static final ic_unread_white_9dp_horiz:I = 0x7f080440
 
-.field public static final ic_upload_image_34dp:I = 0x7f080441
+.field public static final ic_upload_24dp:I = 0x7f080441
 
-.field public static final ic_upload_image_40dp:I = 0x7f080442
+.field public static final ic_upload_image_34dp:I = 0x7f080442
 
-.field public static final ic_upload_plus_32dp:I = 0x7f080443
+.field public static final ic_upload_image_40dp:I = 0x7f080443
 
-.field public static final ic_uploads_file_dark:I = 0x7f080444
+.field public static final ic_upload_plus_32dp:I = 0x7f080444
 
-.field public static final ic_uploads_file_light:I = 0x7f080445
+.field public static final ic_uploads_file_dark:I = 0x7f080445
 
-.field public static final ic_uploads_generic_dark:I = 0x7f080446
+.field public static final ic_uploads_file_light:I = 0x7f080446
 
-.field public static final ic_uploads_generic_light:I = 0x7f080447
+.field public static final ic_uploads_generic_dark:I = 0x7f080447
 
-.field public static final ic_uploads_image_dark:I = 0x7f080448
+.field public static final ic_uploads_generic_light:I = 0x7f080448
 
-.field public static final ic_uploads_image_light:I = 0x7f080449
+.field public static final ic_uploads_image_dark:I = 0x7f080449
 
-.field public static final ic_uploads_video_dark:I = 0x7f08044a
+.field public static final ic_uploads_image_light:I = 0x7f08044a
 
-.field public static final ic_uploads_video_light:I = 0x7f08044b
+.field public static final ic_uploads_video_dark:I = 0x7f08044b
 
-.field public static final ic_user_actions_block_grey_a60_24dp:I = 0x7f08044c
+.field public static final ic_uploads_video_light:I = 0x7f08044c
 
-.field public static final ic_user_actions_block_white_a60_24dp:I = 0x7f08044d
+.field public static final ic_user_actions_block_grey_a60_24dp:I = 0x7f08044d
 
-.field public static final ic_user_actions_remove_friend_grey_a60_24dp:I = 0x7f08044e
+.field public static final ic_user_actions_block_white_a60_24dp:I = 0x7f08044e
 
-.field public static final ic_user_actions_remove_friend_white_a60_24dp:I = 0x7f08044f
+.field public static final ic_user_actions_remove_friend_grey_a60_24dp:I = 0x7f08044f
 
-.field public static final ic_user_actions_unblock_grey_a60_24dp:I = 0x7f080450
+.field public static final ic_user_actions_remove_friend_white_a60_24dp:I = 0x7f080450
 
-.field public static final ic_user_actions_unblock_white_a60_24dp:I = 0x7f080451
+.field public static final ic_user_actions_unblock_grey_a60_24dp:I = 0x7f080451
 
-.field public static final ic_user_premium_guild_subscription:I = 0x7f080452
+.field public static final ic_user_actions_unblock_white_a60_24dp:I = 0x7f080452
 
-.field public static final ic_user_profile_action_add_friend:I = 0x7f080453
+.field public static final ic_user_premium_guild_subscription:I = 0x7f080453
 
-.field public static final ic_user_profile_action_call_grey_a60_24dp:I = 0x7f080454
+.field public static final ic_user_profile_action_add_friend:I = 0x7f080454
 
-.field public static final ic_user_profile_action_call_white_24dp:I = 0x7f080455
+.field public static final ic_user_profile_action_call_grey_a60_24dp:I = 0x7f080455
 
-.field public static final ic_user_profile_action_call_white_a60_24dp:I = 0x7f080456
+.field public static final ic_user_profile_action_call_white_24dp:I = 0x7f080456
 
-.field public static final ic_user_profile_action_message_grey_a60_24dp:I = 0x7f080457
+.field public static final ic_user_profile_action_call_white_a60_24dp:I = 0x7f080457
 
-.field public static final ic_user_profile_action_message_white_24dp:I = 0x7f080458
+.field public static final ic_user_profile_action_message_grey_a60_24dp:I = 0x7f080458
 
-.field public static final ic_user_profile_action_message_white_a60_24dp:I = 0x7f080459
+.field public static final ic_user_profile_action_message_white_24dp:I = 0x7f080459
 
-.field public static final ic_user_profile_action_pending:I = 0x7f08045a
+.field public static final ic_user_profile_action_message_white_a60_24dp:I = 0x7f08045a
 
-.field public static final ic_user_profile_action_video_grey_a60_24dp:I = 0x7f08045b
+.field public static final ic_user_profile_action_pending:I = 0x7f08045b
 
-.field public static final ic_user_profile_action_video_white_a60_24dp:I = 0x7f08045c
+.field public static final ic_user_profile_action_video_grey_a60_24dp:I = 0x7f08045c
 
-.field public static final ic_verified_10dp:I = 0x7f08045d
+.field public static final ic_user_profile_action_video_white_a60_24dp:I = 0x7f08045d
 
-.field public static final ic_verified_badge:I = 0x7f08045e
+.field public static final ic_verified_10dp:I = 0x7f08045e
 
-.field public static final ic_verified_badge_banner:I = 0x7f08045f
+.field public static final ic_verified_badge:I = 0x7f08045f
 
-.field public static final ic_video_grid_view_grey:I = 0x7f080460
+.field public static final ic_verified_badge_banner:I = 0x7f080460
 
-.field public static final ic_video_grid_view_white:I = 0x7f080461
+.field public static final ic_video_grid_view_grey:I = 0x7f080461
 
-.field public static final ic_videocam_24dp:I = 0x7f080462
+.field public static final ic_video_grid_view_white:I = 0x7f080462
 
-.field public static final ic_visibility_grey_24dp:I = 0x7f080463
+.field public static final ic_videocam_24dp:I = 0x7f080463
 
-.field public static final ic_visibility_off_grey_a60_24dp:I = 0x7f080464
+.field public static final ic_visibility_grey_24dp:I = 0x7f080464
 
-.field public static final ic_visibility_off_white_a60_24dp:I = 0x7f080465
+.field public static final ic_visibility_off_grey_a60_24dp:I = 0x7f080465
 
-.field public static final ic_visibility_white_24dp:I = 0x7f080466
+.field public static final ic_visibility_off_white_a60_24dp:I = 0x7f080466
 
-.field public static final ic_voice_channel_streaming:I = 0x7f080467
+.field public static final ic_visibility_white_24dp:I = 0x7f080467
 
-.field public static final ic_voice_quality_average:I = 0x7f080468
+.field public static final ic_voice_channel_streaming:I = 0x7f080468
 
-.field public static final ic_voice_quality_bad:I = 0x7f080469
+.field public static final ic_voice_quality_average:I = 0x7f080469
 
-.field public static final ic_voice_quality_fine:I = 0x7f08046a
+.field public static final ic_voice_quality_bad:I = 0x7f08046a
 
-.field public static final ic_voice_quality_unknown:I = 0x7f08046b
+.field public static final ic_voice_quality_fine:I = 0x7f08046b
 
-.field public static final ic_voice_settings_24dp:I = 0x7f08046c
+.field public static final ic_voice_quality_unknown:I = 0x7f08046c
 
-.field public static final ic_volume_mute_grey_a60_24dp:I = 0x7f08046d
+.field public static final ic_voice_settings_24dp:I = 0x7f08046d
 
-.field public static final ic_volume_mute_white_a60_24dp:I = 0x7f08046e
+.field public static final ic_volume_mute_grey_a60_24dp:I = 0x7f08046e
 
-.field public static final ic_volume_off_24dp:I = 0x7f08046f
+.field public static final ic_volume_mute_white_a60_24dp:I = 0x7f08046f
 
-.field public static final ic_volume_up_dark_grey_24dp:I = 0x7f080470
+.field public static final ic_volume_off_24dp:I = 0x7f080470
 
-.field public static final ic_volume_up_grey_24dp:I = 0x7f080471
+.field public static final ic_volume_up_dark_grey_24dp:I = 0x7f080471
 
-.field public static final ic_volume_up_grey_a60_24dp:I = 0x7f080472
+.field public static final ic_volume_up_grey_24dp:I = 0x7f080472
 
-.field public static final ic_volume_up_primary_dark_400_24dp:I = 0x7f080473
+.field public static final ic_volume_up_grey_a60_24dp:I = 0x7f080473
 
-.field public static final ic_volume_up_primary_light_500_24dp:I = 0x7f080474
+.field public static final ic_volume_up_primary_dark_400_24dp:I = 0x7f080474
 
-.field public static final ic_volume_up_white_24dp:I = 0x7f080475
+.field public static final ic_volume_up_primary_light_500_24dp:I = 0x7f080475
 
-.field public static final ic_volume_up_white_a60_24dp:I = 0x7f080476
+.field public static final ic_volume_up_white_24dp:I = 0x7f080476
 
-.field public static final ic_warning_circle_24dp:I = 0x7f080477
+.field public static final ic_volume_up_white_a60_24dp:I = 0x7f080477
 
-.field public static final ic_warning_icon_24dp:I = 0x7f080478
+.field public static final ic_warning_circle_24dp:I = 0x7f080478
 
-.field public static final ic_x_red_24dp:I = 0x7f080479
+.field public static final ic_warning_icon_24dp:I = 0x7f080479
 
-.field public static final ic_xbox_white_24dp:I = 0x7f08047a
+.field public static final ic_x_red_24dp:I = 0x7f08047a
 
-.field public static final ic_youtube_gaming_white_24dp:I = 0x7f08047b
+.field public static final ic_xbox_white_24dp:I = 0x7f08047b
 
-.field public static final icon_carrot:I = 0x7f08047c
+.field public static final ic_youtube_gaming_white_24dp:I = 0x7f08047c
 
-.field public static final icon_deafened_small:I = 0x7f08047d
+.field public static final icon_carrot:I = 0x7f08047d
 
-.field public static final icon_flag_au:I = 0x7f08047e
+.field public static final icon_deafened_small:I = 0x7f08047e
 
-.field public static final icon_flag_bg:I = 0x7f08047f
+.field public static final icon_flag_au:I = 0x7f08047f
 
-.field public static final icon_flag_cs:I = 0x7f080480
+.field public static final icon_flag_bg:I = 0x7f080480
 
-.field public static final icon_flag_da:I = 0x7f080481
+.field public static final icon_flag_cs:I = 0x7f080481
 
-.field public static final icon_flag_de:I = 0x7f080482
+.field public static final icon_flag_da:I = 0x7f080482
 
-.field public static final icon_flag_el:I = 0x7f080483
+.field public static final icon_flag_de:I = 0x7f080483
 
-.field public static final icon_flag_en_gb:I = 0x7f080484
+.field public static final icon_flag_el:I = 0x7f080484
 
-.field public static final icon_flag_en_us:I = 0x7f080485
+.field public static final icon_flag_en_gb:I = 0x7f080485
 
-.field public static final icon_flag_es_es:I = 0x7f080486
+.field public static final icon_flag_en_us:I = 0x7f080486
 
-.field public static final icon_flag_eu:I = 0x7f080487
+.field public static final icon_flag_es_es:I = 0x7f080487
 
-.field public static final icon_flag_fi:I = 0x7f080488
+.field public static final icon_flag_eu:I = 0x7f080488
 
-.field public static final icon_flag_fr:I = 0x7f080489
+.field public static final icon_flag_fi:I = 0x7f080489
 
-.field public static final icon_flag_gb:I = 0x7f08048a
+.field public static final icon_flag_fr:I = 0x7f08048a
 
-.field public static final icon_flag_hk:I = 0x7f08048b
+.field public static final icon_flag_gb:I = 0x7f08048b
 
-.field public static final icon_flag_hr:I = 0x7f08048c
+.field public static final icon_flag_hk:I = 0x7f08048c
 
-.field public static final icon_flag_hu:I = 0x7f08048d
+.field public static final icon_flag_hr:I = 0x7f08048d
 
-.field public static final icon_flag_it:I = 0x7f08048e
+.field public static final icon_flag_hu:I = 0x7f08048e
 
-.field public static final icon_flag_ja:I = 0x7f08048f
+.field public static final icon_flag_it:I = 0x7f08048f
 
-.field public static final icon_flag_ko:I = 0x7f080490
+.field public static final icon_flag_ja:I = 0x7f080490
 
-.field public static final icon_flag_lt:I = 0x7f080491
+.field public static final icon_flag_ko:I = 0x7f080491
 
-.field public static final icon_flag_nl:I = 0x7f080492
+.field public static final icon_flag_lt:I = 0x7f080492
 
-.field public static final icon_flag_no:I = 0x7f080493
+.field public static final icon_flag_nl:I = 0x7f080493
 
-.field public static final icon_flag_pl:I = 0x7f080494
+.field public static final icon_flag_no:I = 0x7f080494
 
-.field public static final icon_flag_pt_br:I = 0x7f080495
+.field public static final icon_flag_pl:I = 0x7f080495
 
-.field public static final icon_flag_ro:I = 0x7f080496
+.field public static final icon_flag_pt_br:I = 0x7f080496
 
-.field public static final icon_flag_ru:I = 0x7f080497
+.field public static final icon_flag_ro:I = 0x7f080497
 
-.field public static final icon_flag_sg:I = 0x7f080498
+.field public static final icon_flag_ru:I = 0x7f080498
 
-.field public static final icon_flag_sv_se:I = 0x7f080499
+.field public static final icon_flag_sg:I = 0x7f080499
 
-.field public static final icon_flag_th:I = 0x7f08049a
+.field public static final icon_flag_sv_se:I = 0x7f08049a
 
-.field public static final icon_flag_tr:I = 0x7f08049b
+.field public static final icon_flag_th:I = 0x7f08049b
 
-.field public static final icon_flag_uk:I = 0x7f08049c
+.field public static final icon_flag_tr:I = 0x7f08049c
 
-.field public static final icon_flag_unknown:I = 0x7f08049d
+.field public static final icon_flag_uk:I = 0x7f08049d
 
-.field public static final icon_flag_vi:I = 0x7f08049e
+.field public static final icon_flag_unknown:I = 0x7f08049e
 
-.field public static final icon_flag_zh_cn:I = 0x7f08049f
+.field public static final icon_flag_vi:I = 0x7f08049f
 
-.field public static final icon_flag_zh_tw:I = 0x7f0804a0
+.field public static final icon_flag_zh_cn:I = 0x7f0804a0
 
-.field public static final icon_menu_copy:I = 0x7f0804a1
+.field public static final icon_flag_zh_tw:I = 0x7f0804a1
 
-.field public static final icon_muted_small:I = 0x7f0804a2
+.field public static final icon_menu_copy:I = 0x7f0804a2
 
-.field public static final icon_save:I = 0x7f0804a3
+.field public static final icon_muted_small:I = 0x7f0804a3
 
-.field public static final img_addfriends_empty_dark:I = 0x7f0804a4
+.field public static final icon_save:I = 0x7f0804a4
 
-.field public static final img_addfriends_empty_light:I = 0x7f0804a5
+.field public static final img_addfriends_empty_dark:I = 0x7f0804a5
 
-.field public static final img_addfriends_notconnected_dark:I = 0x7f0804a6
+.field public static final img_addfriends_empty_light:I = 0x7f0804a6
 
-.field public static final img_addfriends_notconnected_light:I = 0x7f0804a7
+.field public static final img_addfriends_notconnected_dark:I = 0x7f0804a7
 
-.field public static final img_animated_emoji_upsell:I = 0x7f0804a8
+.field public static final img_addfriends_notconnected_light:I = 0x7f0804a8
 
-.field public static final img_auth_bg_dark:I = 0x7f0804a9
+.field public static final img_animated_emoji_upsell:I = 0x7f0804a9
 
-.field public static final img_auth_bg_light:I = 0x7f0804aa
+.field public static final img_auth_bg_dark:I = 0x7f0804aa
 
-.field public static final img_auth_logo:I = 0x7f0804ab
+.field public static final img_auth_bg_light:I = 0x7f0804ab
 
-.field public static final img_auth_logo_small:I = 0x7f0804ac
+.field public static final img_auth_logo:I = 0x7f0804ac
 
-.field public static final img_avatar_upsell:I = 0x7f0804ad
+.field public static final img_auth_logo_small:I = 0x7f0804ad
 
-.field public static final img_baddies_dark_theme:I = 0x7f0804ae
+.field public static final img_avatar_upsell:I = 0x7f0804ae
 
-.field public static final img_baddies_light_theme:I = 0x7f0804af
+.field public static final img_baddies_dark_theme:I = 0x7f0804af
 
-.field public static final img_badge_upsell:I = 0x7f0804b0
+.field public static final img_baddies_light_theme:I = 0x7f0804b0
 
-.field public static final img_boost_activated:I = 0x7f0804b1
+.field public static final img_badge_upsell:I = 0x7f0804b1
 
-.field public static final img_boost_cancel:I = 0x7f0804b2
+.field public static final img_boost_activated:I = 0x7f0804b2
 
-.field public static final img_boost_hands:I = 0x7f0804b3
+.field public static final img_boost_cancel:I = 0x7f0804b3
 
-.field public static final img_channel_following_success_1_dark:I = 0x7f0804b4
+.field public static final img_boost_hands:I = 0x7f0804b4
 
-.field public static final img_channel_following_success_1_light:I = 0x7f0804b5
+.field public static final img_channel_following_success_1_dark:I = 0x7f0804b5
 
-.field public static final img_channel_following_success_2_dark:I = 0x7f0804b6
+.field public static final img_channel_following_success_1_light:I = 0x7f0804b6
 
-.field public static final img_channel_following_success_2_light:I = 0x7f0804b7
+.field public static final img_channel_following_success_2_dark:I = 0x7f0804b7
 
-.field public static final img_channel_following_success_3_dark:I = 0x7f0804b8
+.field public static final img_channel_following_success_2_light:I = 0x7f0804b8
 
-.field public static final img_channel_following_success_3_light:I = 0x7f0804b9
+.field public static final img_channel_following_success_3_dark:I = 0x7f0804b9
 
-.field public static final img_channels_onboarding_dark:I = 0x7f0804ba
+.field public static final img_channel_following_success_3_light:I = 0x7f0804ba
 
-.field public static final img_channels_onboarding_light:I = 0x7f0804bb
+.field public static final img_channels_onboarding_dark:I = 0x7f0804bb
 
-.field public static final img_discord_nitro_logo_left:I = 0x7f0804bc
+.field public static final img_channels_onboarding_light:I = 0x7f0804bc
 
-.field public static final img_empty_friends_no_suggestions_dark:I = 0x7f0804bd
+.field public static final img_discord_nitro_logo_left:I = 0x7f0804bd
 
-.field public static final img_empty_friends_no_suggestions_light:I = 0x7f0804be
+.field public static final img_empty_friends_no_suggestions_dark:I = 0x7f0804be
 
-.field public static final img_empty_friends_none_blocked_dark:I = 0x7f0804bf
+.field public static final img_empty_friends_no_suggestions_light:I = 0x7f0804bf
 
-.field public static final img_empty_friends_none_blocked_light:I = 0x7f0804c0
+.field public static final img_empty_friends_none_blocked_dark:I = 0x7f0804c0
 
-.field public static final img_empty_friends_none_dark:I = 0x7f0804c1
+.field public static final img_empty_friends_none_blocked_light:I = 0x7f0804c1
 
-.field public static final img_empty_friends_none_light:I = 0x7f0804c2
+.field public static final img_empty_friends_none_dark:I = 0x7f0804c2
 
-.field public static final img_empty_friends_none_online_dark:I = 0x7f0804c3
+.field public static final img_empty_friends_none_light:I = 0x7f0804c3
 
-.field public static final img_empty_friends_none_online_light:I = 0x7f0804c4
+.field public static final img_empty_friends_none_online_dark:I = 0x7f0804c4
 
-.field public static final img_empty_friends_none_pending_dark:I = 0x7f0804c5
+.field public static final img_empty_friends_none_online_light:I = 0x7f0804c5
 
-.field public static final img_empty_friends_none_pending_light:I = 0x7f0804c6
+.field public static final img_empty_friends_none_pending_dark:I = 0x7f0804c6
 
-.field public static final img_empty_server_settings_emoji_dark:I = 0x7f0804c7
+.field public static final img_empty_friends_none_pending_light:I = 0x7f0804c7
 
-.field public static final img_empty_server_settings_emoji_light:I = 0x7f0804c8
+.field public static final img_empty_server_settings_emoji_dark:I = 0x7f0804c8
 
-.field public static final img_empty_server_settings_invites_dark:I = 0x7f0804c9
+.field public static final img_empty_server_settings_emoji_light:I = 0x7f0804c9
 
-.field public static final img_empty_server_settings_invites_light:I = 0x7f0804ca
+.field public static final img_empty_server_settings_invites_dark:I = 0x7f0804ca
 
-.field public static final img_forced_update_dark:I = 0x7f0804cb
+.field public static final img_empty_server_settings_invites_light:I = 0x7f0804cb
 
-.field public static final img_forced_update_light:I = 0x7f0804cc
+.field public static final img_forced_update_dark:I = 0x7f0804cc
 
-.field public static final img_game_presence_nux:I = 0x7f0804cd
+.field public static final img_forced_update_light:I = 0x7f0804cd
 
-.field public static final img_gem_hands_faded_dark:I = 0x7f0804ce
+.field public static final img_game_presence_nux:I = 0x7f0804ce
 
-.field public static final img_gem_hands_faded_light:I = 0x7f0804cf
+.field public static final img_gem_hands_faded_dark:I = 0x7f0804cf
 
-.field public static final img_gifting_pattern_bg_dark:I = 0x7f0804d0
+.field public static final img_gem_hands_faded_light:I = 0x7f0804d0
 
-.field public static final img_gifting_pattern_bg_light:I = 0x7f0804d1
+.field public static final img_gifting_pattern_bg_dark:I = 0x7f0804d1
 
-.field public static final img_gifting_pattern_dark:I = 0x7f0804d2
+.field public static final img_gifting_pattern_bg_light:I = 0x7f0804d2
 
-.field public static final img_gifting_pattern_light:I = 0x7f0804d3
+.field public static final img_gifting_pattern_dark:I = 0x7f0804d3
 
-.field public static final img_global_emoji_upsell:I = 0x7f0804d4
+.field public static final img_gifting_pattern_light:I = 0x7f0804d4
 
-.field public static final img_guild_profile_placeholder_dark:I = 0x7f0804d5
+.field public static final img_global_emoji_upsell:I = 0x7f0804d5
 
-.field public static final img_guild_profile_placeholder_light:I = 0x7f0804d6
+.field public static final img_guild_profile_placeholder_dark:I = 0x7f0804d6
 
-.field public static final img_guild_use_cases:I = 0x7f0804d7
+.field public static final img_guild_profile_placeholder_light:I = 0x7f0804d7
 
-.field public static final img_item_shop_dark:I = 0x7f0804d8
+.field public static final img_guild_use_cases:I = 0x7f0804d8
 
-.field public static final img_landing_bg_dark:I = 0x7f0804d9
+.field public static final img_item_shop_dark:I = 0x7f0804d9
 
-.field public static final img_landing_bg_light:I = 0x7f0804da
+.field public static final img_landing_bg_dark:I = 0x7f0804da
 
-.field public static final img_loading_clyde:I = 0x7f0804db
+.field public static final img_landing_bg_light:I = 0x7f0804db
 
-.field public static final img_logo_discord:I = 0x7f0804dc
+.field public static final img_loading_clyde:I = 0x7f0804dc
 
-.field public static final img_logo_discord_nitro:I = 0x7f0804dd
+.field public static final img_logo_discord:I = 0x7f0804dd
 
-.field public static final img_logo_discord_nitro_brand:I = 0x7f0804de
+.field public static final img_logo_discord_nitro:I = 0x7f0804de
 
-.field public static final img_logo_discord_nitro_classic:I = 0x7f0804df
+.field public static final img_logo_discord_nitro_brand:I = 0x7f0804df
 
-.field public static final img_logo_nitro:I = 0x7f0804e0
+.field public static final img_logo_discord_nitro_classic:I = 0x7f0804e0
 
-.field public static final img_logo_nitro_classic:I = 0x7f0804e1
+.field public static final img_logo_nitro:I = 0x7f0804e1
 
-.field public static final img_logo_nitro_classic_brand:I = 0x7f0804e2
+.field public static final img_logo_nitro_classic:I = 0x7f0804e2
 
-.field public static final img_logo_nitro_classic_header:I = 0x7f0804e3
+.field public static final img_logo_nitro_classic_brand:I = 0x7f0804e3
 
-.field public static final img_logo_square:I = 0x7f0804e4
+.field public static final img_logo_nitro_classic_header:I = 0x7f0804e4
 
-.field public static final img_mfa_dark:I = 0x7f0804e5
+.field public static final img_logo_square:I = 0x7f0804e5
 
-.field public static final img_mfa_light:I = 0x7f0804e6
+.field public static final img_mfa_dark:I = 0x7f0804e6
 
-.field public static final img_new_tos_dark_theme:I = 0x7f0804e7
+.field public static final img_mfa_light:I = 0x7f0804e7
 
-.field public static final img_new_tos_light_theme:I = 0x7f0804e8
+.field public static final img_new_tos_dark_theme:I = 0x7f0804e8
 
-.field public static final img_nitro_classic_pattern:I = 0x7f0804eb
+.field public static final img_new_tos_light_theme:I = 0x7f0804e9
 
-.field public static final img_nitro_pattern:I = 0x7f0804ec
+.field public static final img_nitro_classic_pattern:I = 0x7f0804ec
 
-.field public static final img_nitro_splash_dark:I = 0x7f0804ed
+.field public static final img_nitro_pattern:I = 0x7f0804ed
 
-.field public static final img_nitro_splash_light:I = 0x7f0804ee
+.field public static final img_nitro_splash_dark:I = 0x7f0804ee
 
-.field public static final img_nitro_uncancel:I = 0x7f0804ef
+.field public static final img_nitro_splash_light:I = 0x7f0804ef
 
-.field public static final img_no_gifts:I = 0x7f0804f0
+.field public static final img_nitro_uncancel:I = 0x7f0804f0
 
-.field public static final img_no_mutual_friends_dark:I = 0x7f0804f1
+.field public static final img_no_gifts:I = 0x7f0804f1
 
-.field public static final img_no_mutual_friends_light:I = 0x7f0804f2
+.field public static final img_no_mutual_friends_dark:I = 0x7f0804f2
 
-.field public static final img_no_mutual_servers_dark:I = 0x7f0804f3
+.field public static final img_no_mutual_friends_light:I = 0x7f0804f3
 
-.field public static final img_no_mutual_servers_light:I = 0x7f0804f4
+.field public static final img_no_mutual_servers_dark:I = 0x7f0804f4
 
-.field public static final img_no_text_channels_dark:I = 0x7f0804f5
+.field public static final img_no_mutual_servers_light:I = 0x7f0804f5
 
-.field public static final img_no_text_channels_light:I = 0x7f0804f6
+.field public static final img_no_text_channels_dark:I = 0x7f0804f6
 
-.field public static final img_nsfw_dark_theme:I = 0x7f0804f7
+.field public static final img_no_text_channels_light:I = 0x7f0804f7
 
-.field public static final img_nsfw_light_theme:I = 0x7f0804f8
+.field public static final img_nsfw_dark_theme:I = 0x7f0804f8
 
-.field public static final img_overlay_nux:I = 0x7f0804f9
+.field public static final img_nsfw_light_theme:I = 0x7f0804f9
 
-.field public static final img_permission_prime:I = 0x7f0804fa
+.field public static final img_overlay_nux:I = 0x7f0804fa
 
-.field public static final img_poop_dark:I = 0x7f0804fb
+.field public static final img_permission_prime:I = 0x7f0804fb
 
-.field public static final img_poop_light:I = 0x7f0804fc
+.field public static final img_poop_dark:I = 0x7f0804fc
 
-.field public static final img_premium_classic_subscription_header:I = 0x7f0804fd
+.field public static final img_poop_light:I = 0x7f0804fd
 
-.field public static final img_premium_classic_subscription_header_error:I = 0x7f0804fe
+.field public static final img_premium_classic_subscription_header:I = 0x7f0804fe
 
-.field public static final img_premium_classic_subscription_header_logo:I = 0x7f0804ff
+.field public static final img_premium_classic_subscription_header_error:I = 0x7f0804ff
 
-.field public static final img_premium_classic_subscription_header_resub:I = 0x7f080500
+.field public static final img_premium_classic_subscription_header_logo:I = 0x7f080500
 
-.field public static final img_premium_guild_subscription_header:I = 0x7f080501
+.field public static final img_premium_classic_subscription_header_resub:I = 0x7f080501
 
-.field public static final img_premium_guild_subscription_header_error:I = 0x7f080502
+.field public static final img_premium_guild_subscription_header:I = 0x7f080502
 
-.field public static final img_premium_guild_subscription_header_logo:I = 0x7f080503
+.field public static final img_premium_guild_subscription_header_error:I = 0x7f080503
 
-.field public static final img_premium_guild_subscription_header_resub:I = 0x7f080504
+.field public static final img_premium_guild_subscription_header_logo:I = 0x7f080504
 
-.field public static final img_premium_subscription_header:I = 0x7f080505
+.field public static final img_premium_guild_subscription_header_resub:I = 0x7f080505
 
-.field public static final img_premium_subscription_header_error:I = 0x7f080506
+.field public static final img_premium_subscription_header:I = 0x7f080506
 
-.field public static final img_premium_subscription_header_logo:I = 0x7f080507
+.field public static final img_premium_subscription_header_error:I = 0x7f080507
 
-.field public static final img_premium_subscription_header_resub:I = 0x7f080508
+.field public static final img_premium_subscription_header_logo:I = 0x7f080508
 
-.field public static final img_quick_switcher_empty:I = 0x7f080509
+.field public static final img_premium_subscription_header_resub:I = 0x7f080509
 
-.field public static final img_remote_auth_finished:I = 0x7f08050a
+.field public static final img_quick_switcher_empty:I = 0x7f08050a
 
-.field public static final img_remote_auth_loaded:I = 0x7f08050b
+.field public static final img_remote_auth_finished:I = 0x7f08050b
 
-.field public static final img_remote_auth_not_found:I = 0x7f08050c
+.field public static final img_remote_auth_loaded:I = 0x7f08050c
 
-.field public static final img_save_your_group:I = 0x7f08050d
+.field public static final img_remote_auth_not_found:I = 0x7f08050d
 
-.field public static final img_server_boost_long:I = 0x7f08050e
+.field public static final img_save_your_group:I = 0x7f08050e
 
-.field public static final img_tag_upsell:I = 0x7f08050f
+.field public static final img_server_boost_long:I = 0x7f08050f
 
-.field public static final img_upload_upsell:I = 0x7f080510
+.field public static final img_tag_upsell:I = 0x7f080510
 
-.field public static final img_verify_email_dark_theme:I = 0x7f080511
+.field public static final img_upload_upsell:I = 0x7f080511
 
-.field public static final img_verify_email_light_theme:I = 0x7f080512
+.field public static final img_verify_email_dark_theme:I = 0x7f080512
 
-.field public static final img_verify_phone_dark_theme:I = 0x7f080513
+.field public static final img_verify_email_light_theme:I = 0x7f080513
 
-.field public static final img_verify_phone_light_theme:I = 0x7f080514
+.field public static final img_verify_phone_dark_theme:I = 0x7f080514
 
-.field public static final img_voice_no_connections_dark:I = 0x7f080515
+.field public static final img_verify_phone_light_theme:I = 0x7f080515
 
-.field public static final img_voice_no_connections_light:I = 0x7f080516
+.field public static final img_voice_no_connections_dark:I = 0x7f080516
 
-.field public static final img_voice_onboarding:I = 0x7f080517
+.field public static final img_voice_no_connections_light:I = 0x7f080517
 
-.field public static final img_wump_trash_dark:I = 0x7f080518
+.field public static final img_voice_onboarding:I = 0x7f080518
 
-.field public static final img_wumpus_ball_dark:I = 0x7f080519
+.field public static final img_wump_trash_dark:I = 0x7f080519
 
-.field public static final img_wumpus_ball_light:I = 0x7f08051a
+.field public static final img_wumpus_ball_dark:I = 0x7f08051a
 
-.field public static final img_wumpus_jetpack:I = 0x7f08051b
+.field public static final img_wumpus_ball_light:I = 0x7f08051b
 
-.field public static final img_wumpus_playing_with_friends:I = 0x7f08051c
+.field public static final img_wumpus_jetpack:I = 0x7f08051c
 
-.field public static final img_wumpus_riding_wheel:I = 0x7f08051d
+.field public static final img_wumpus_playing_with_friends:I = 0x7f08051d
 
-.field public static final img_wumpus_tophat_dark:I = 0x7f08051e
+.field public static final img_wumpus_riding_wheel:I = 0x7f08051e
 
-.field public static final img_wumpus_tophat_light:I = 0x7f08051f
+.field public static final img_wumpus_tophat_dark:I = 0x7f08051f
 
-.field public static final mtrl_dialog_background:I = 0x7f080520
+.field public static final img_wumpus_tophat_light:I = 0x7f080520
 
-.field public static final mtrl_dropdown_arrow:I = 0x7f080521
+.field public static final mtrl_dialog_background:I = 0x7f080521
 
-.field public static final mtrl_ic_arrow_drop_down:I = 0x7f080522
+.field public static final mtrl_dropdown_arrow:I = 0x7f080522
 
-.field public static final mtrl_ic_arrow_drop_up:I = 0x7f080523
+.field public static final mtrl_ic_arrow_drop_down:I = 0x7f080523
 
-.field public static final mtrl_ic_cancel:I = 0x7f080524
+.field public static final mtrl_ic_arrow_drop_up:I = 0x7f080524
 
-.field public static final mtrl_ic_error:I = 0x7f080525
+.field public static final mtrl_ic_cancel:I = 0x7f080525
 
-.field public static final mtrl_popupmenu_background:I = 0x7f080526
+.field public static final mtrl_ic_error:I = 0x7f080526
 
-.field public static final mtrl_popupmenu_background_dark:I = 0x7f080527
+.field public static final mtrl_popupmenu_background:I = 0x7f080527
 
-.field public static final mtrl_tabs_default_indicator:I = 0x7f080528
+.field public static final mtrl_popupmenu_background_dark:I = 0x7f080528
 
-.field public static final navigation_empty_icon:I = 0x7f080529
+.field public static final mtrl_tabs_default_indicator:I = 0x7f080529
 
-.field public static final notification_action_background:I = 0x7f08052a
+.field public static final navigation_empty_icon:I = 0x7f08052a
 
-.field public static final notification_bg:I = 0x7f08052b
+.field public static final notification_action_background:I = 0x7f08052b
 
-.field public static final notification_bg_low:I = 0x7f08052c
+.field public static final notification_bg:I = 0x7f08052c
 
-.field public static final notification_bg_low_normal:I = 0x7f08052d
+.field public static final notification_bg_low:I = 0x7f08052d
 
-.field public static final notification_bg_low_pressed:I = 0x7f08052e
+.field public static final notification_bg_low_normal:I = 0x7f08052e
 
-.field public static final notification_bg_normal:I = 0x7f08052f
+.field public static final notification_bg_low_pressed:I = 0x7f08052f
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080530
+.field public static final notification_bg_normal:I = 0x7f080530
 
-.field public static final notification_icon_background:I = 0x7f080531
+.field public static final notification_bg_normal_pressed:I = 0x7f080531
 
-.field public static final notification_template_icon_bg:I = 0x7f080532
+.field public static final notification_icon_background:I = 0x7f080532
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080533
+.field public static final notification_template_icon_bg:I = 0x7f080533
 
-.field public static final notification_tile_bg:I = 0x7f080534
+.field public static final notification_template_icon_low_bg:I = 0x7f080534
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080535
+.field public static final notification_tile_bg:I = 0x7f080535
 
-.field public static final preference_list_divider_material:I = 0x7f080536
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080536
 
-.field public static final reactions_divider:I = 0x7f080537
+.field public static final preference_list_divider_material:I = 0x7f080537
 
-.field public static final ripple_brighten:I = 0x7f080538
+.field public static final reactions_divider:I = 0x7f080538
 
-.field public static final ripple_darken:I = 0x7f080539
+.field public static final ripple_brighten:I = 0x7f080539
 
-.field public static final selectable_feedback_happy_dark:I = 0x7f08053a
+.field public static final ripple_darken:I = 0x7f08053a
 
-.field public static final selectable_feedback_happy_light:I = 0x7f08053b
+.field public static final rounded_rectangle_4dp_radius:I = 0x7f08053b
 
-.field public static final selectable_feedback_neutral_dark:I = 0x7f08053c
+.field public static final selectable_feedback_happy_dark:I = 0x7f08053c
 
-.field public static final selectable_feedback_neutral_light:I = 0x7f08053d
+.field public static final selectable_feedback_happy_light:I = 0x7f08053d
 
-.field public static final selectable_feedback_sad_dark:I = 0x7f08053e
+.field public static final selectable_feedback_neutral_dark:I = 0x7f08053e
 
-.field public static final selectable_feedback_sad_light:I = 0x7f08053f
+.field public static final selectable_feedback_neutral_light:I = 0x7f08053f
 
-.field public static final tab_dot_selector:I = 0x7f080540
+.field public static final selectable_feedback_sad_dark:I = 0x7f080540
 
-.field public static final tab_dot_selector_wide:I = 0x7f080541
+.field public static final selectable_feedback_sad_light:I = 0x7f080541
 
-.field public static final tab_indicator_default:I = 0x7f080542
+.field public static final tab_dot_selector:I = 0x7f080542
 
-.field public static final tab_indicator_selected:I = 0x7f080543
+.field public static final tab_dot_selector_wide:I = 0x7f080543
 
-.field public static final tab_indicator_selected_wide:I = 0x7f080544
+.field public static final tab_indicator_default:I = 0x7f080544
 
-.field public static final test_custom_background:I = 0x7f080545
+.field public static final tab_indicator_selected:I = 0x7f080545
 
-.field public static final tooltip_frame_dark:I = 0x7f080546
+.field public static final tab_indicator_selected_wide:I = 0x7f080546
 
-.field public static final tooltip_frame_light:I = 0x7f080547
+.field public static final test_custom_background:I = 0x7f080547
+
+.field public static final tooltip_frame_dark:I = 0x7f080548
+
+.field public static final tooltip_frame_light:I = 0x7f080549
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/R$g.smali b/com.discord/smali_classes2/com/lytefast/flexinput/R$g.smali
index 1dc549c948..b3ca752725 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/R$g.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/R$g.smali
@@ -10873,489 +10873,491 @@
 
 .field public static final user_settings_noise_cancellation_description:I = 0x7f12156c
 
-.field public static final user_settings_notifications_show_badge_body:I = 0x7f12156d
+.field public static final user_settings_noise_cancellation_model:I = 0x7f12156d
 
-.field public static final user_settings_notifications_show_badge_label:I = 0x7f12156e
+.field public static final user_settings_notifications_show_badge_body:I = 0x7f12156e
 
-.field public static final user_settings_notifications_show_flash_body:I = 0x7f12156f
+.field public static final user_settings_notifications_show_badge_label:I = 0x7f12156f
 
-.field public static final user_settings_notifications_show_flash_label:I = 0x7f121570
+.field public static final user_settings_notifications_show_flash_body:I = 0x7f121570
 
-.field public static final user_settings_open_on_startup_body:I = 0x7f121571
+.field public static final user_settings_notifications_show_flash_label:I = 0x7f121571
 
-.field public static final user_settings_open_on_startup_label:I = 0x7f121572
+.field public static final user_settings_open_on_startup_body:I = 0x7f121572
 
-.field public static final user_settings_privacy_terms:I = 0x7f121573
+.field public static final user_settings_open_on_startup_label:I = 0x7f121573
 
-.field public static final user_settings_restart_app_mobile:I = 0x7f121574
+.field public static final user_settings_privacy_terms:I = 0x7f121574
 
-.field public static final user_settings_save:I = 0x7f121575
+.field public static final user_settings_restart_app_mobile:I = 0x7f121575
 
-.field public static final user_settings_scan_qr_code:I = 0x7f121576
+.field public static final user_settings_save:I = 0x7f121576
 
-.field public static final user_settings_show_library:I = 0x7f121577
+.field public static final user_settings_scan_qr_code:I = 0x7f121577
 
-.field public static final user_settings_show_library_note:I = 0x7f121578
+.field public static final user_settings_show_library:I = 0x7f121578
 
-.field public static final user_settings_start_minimized_body:I = 0x7f121579
+.field public static final user_settings_show_library_note:I = 0x7f121579
 
-.field public static final user_settings_start_minimized_label:I = 0x7f12157a
+.field public static final user_settings_start_minimized_body:I = 0x7f12157a
 
-.field public static final user_settings_startup_behavior:I = 0x7f12157b
+.field public static final user_settings_start_minimized_label:I = 0x7f12157b
 
-.field public static final user_settings_streamer_notice_body:I = 0x7f12157c
+.field public static final user_settings_startup_behavior:I = 0x7f12157c
 
-.field public static final user_settings_streamer_notice_title:I = 0x7f12157d
+.field public static final user_settings_streamer_notice_body:I = 0x7f12157d
 
-.field public static final user_settings_unverified_account_body:I = 0x7f12157e
+.field public static final user_settings_streamer_notice_title:I = 0x7f12157e
 
-.field public static final user_settings_used_backup_codes:I = 0x7f12157f
+.field public static final user_settings_unverified_account_body:I = 0x7f12157f
 
-.field public static final user_settings_voice_add_multiple:I = 0x7f121580
+.field public static final user_settings_used_backup_codes:I = 0x7f121580
 
-.field public static final user_settings_voice_codec_description:I = 0x7f121581
+.field public static final user_settings_voice_add_multiple:I = 0x7f121581
 
-.field public static final user_settings_voice_codec_title:I = 0x7f121582
+.field public static final user_settings_voice_codec_description:I = 0x7f121582
 
-.field public static final user_settings_voice_experimental_soundshare_label:I = 0x7f121583
+.field public static final user_settings_voice_codec_title:I = 0x7f121583
 
-.field public static final user_settings_voice_hardware_h264:I = 0x7f121584
+.field public static final user_settings_voice_experimental_soundshare_label:I = 0x7f121584
 
-.field public static final user_settings_voice_mic_test_button_active:I = 0x7f121585
+.field public static final user_settings_voice_hardware_h264:I = 0x7f121585
 
-.field public static final user_settings_voice_mic_test_button_inactive:I = 0x7f121586
+.field public static final user_settings_voice_mic_test_button_active:I = 0x7f121586
 
-.field public static final user_settings_voice_mic_test_description:I = 0x7f121587
+.field public static final user_settings_voice_mic_test_button_inactive:I = 0x7f121587
 
-.field public static final user_settings_voice_mic_test_title:I = 0x7f121588
+.field public static final user_settings_voice_mic_test_description:I = 0x7f121588
 
-.field public static final user_settings_voice_mic_test_voice_caption:I = 0x7f121589
+.field public static final user_settings_voice_mic_test_title:I = 0x7f121589
 
-.field public static final user_settings_voice_mic_test_voice_no_input_notice:I = 0x7f12158a
+.field public static final user_settings_voice_mic_test_voice_caption:I = 0x7f12158a
 
-.field public static final user_settings_voice_open_h264:I = 0x7f12158b
+.field public static final user_settings_voice_mic_test_voice_no_input_notice:I = 0x7f12158b
 
-.field public static final user_settings_voice_video_codec_title:I = 0x7f12158c
+.field public static final user_settings_voice_open_h264:I = 0x7f12158c
 
-.field public static final user_settings_voice_video_hook_label:I = 0x7f12158d
+.field public static final user_settings_voice_video_codec_title:I = 0x7f12158d
 
-.field public static final user_settings_windows_settings:I = 0x7f12158e
+.field public static final user_settings_voice_video_hook_label:I = 0x7f12158e
 
-.field public static final user_settings_with_build_override:I = 0x7f12158f
+.field public static final user_settings_windows_settings:I = 0x7f12158f
 
-.field public static final user_volume:I = 0x7f121590
+.field public static final user_settings_with_build_override:I = 0x7f121590
 
-.field public static final username:I = 0x7f121591
+.field public static final user_volume:I = 0x7f121591
 
-.field public static final username_and_tag:I = 0x7f121592
+.field public static final username:I = 0x7f121592
 
-.field public static final username_live:I = 0x7f121593
+.field public static final username_and_tag:I = 0x7f121593
 
-.field public static final username_required:I = 0x7f121594
+.field public static final username_live:I = 0x7f121594
 
-.field public static final users:I = 0x7f121595
+.field public static final username_required:I = 0x7f121595
 
-.field public static final v7_preference_off:I = 0x7f121596
+.field public static final users:I = 0x7f121596
 
-.field public static final v7_preference_on:I = 0x7f121597
+.field public static final v7_preference_off:I = 0x7f121597
 
-.field public static final vad_permission_body:I = 0x7f121598
+.field public static final v7_preference_on:I = 0x7f121598
 
-.field public static final vad_permission_small:I = 0x7f121599
+.field public static final vad_permission_body:I = 0x7f121599
 
-.field public static final vad_permission_title:I = 0x7f12159a
+.field public static final vad_permission_small:I = 0x7f12159a
 
-.field public static final vanity_url:I = 0x7f12159b
+.field public static final vad_permission_title:I = 0x7f12159b
 
-.field public static final vanity_url_help:I = 0x7f12159c
+.field public static final vanity_url:I = 0x7f12159c
 
-.field public static final vanity_url_help_conflict:I = 0x7f12159d
+.field public static final vanity_url_help:I = 0x7f12159d
 
-.field public static final vanity_url_help_extended:I = 0x7f12159e
+.field public static final vanity_url_help_conflict:I = 0x7f12159e
 
-.field public static final vanity_url_help_extended_link:I = 0x7f12159f
+.field public static final vanity_url_help_extended:I = 0x7f12159f
 
-.field public static final vanity_url_hint_mobile:I = 0x7f1215a0
+.field public static final vanity_url_help_extended_link:I = 0x7f1215a0
 
-.field public static final vanity_url_uses:I = 0x7f1215a1
+.field public static final vanity_url_hint_mobile:I = 0x7f1215a1
 
-.field public static final verfication_expired:I = 0x7f1215a2
+.field public static final vanity_url_uses:I = 0x7f1215a2
 
-.field public static final verification_body:I = 0x7f1215a3
+.field public static final verfication_expired:I = 0x7f1215a3
 
-.field public static final verification_body_alt:I = 0x7f1215a4
+.field public static final verification_body:I = 0x7f1215a4
 
-.field public static final verification_email_body:I = 0x7f1215a5
+.field public static final verification_body_alt:I = 0x7f1215a5
 
-.field public static final verification_email_error_body:I = 0x7f1215a6
+.field public static final verification_email_body:I = 0x7f1215a6
 
-.field public static final verification_email_error_title:I = 0x7f1215a7
+.field public static final verification_email_error_body:I = 0x7f1215a7
 
-.field public static final verification_email_title:I = 0x7f1215a8
+.field public static final verification_email_error_title:I = 0x7f1215a8
 
-.field public static final verification_footer:I = 0x7f1215a9
+.field public static final verification_email_title:I = 0x7f1215a9
 
-.field public static final verification_footer_logout:I = 0x7f1215aa
+.field public static final verification_footer:I = 0x7f1215aa
 
-.field public static final verification_footer_support:I = 0x7f1215ab
+.field public static final verification_footer_logout:I = 0x7f1215ab
 
-.field public static final verification_level_high_criteria:I = 0x7f1215ac
+.field public static final verification_footer_support:I = 0x7f1215ac
 
-.field public static final verification_level_low:I = 0x7f1215ad
+.field public static final verification_level_high_criteria:I = 0x7f1215ad
 
-.field public static final verification_level_low_criteria:I = 0x7f1215ae
+.field public static final verification_level_low:I = 0x7f1215ae
 
-.field public static final verification_level_medium:I = 0x7f1215af
+.field public static final verification_level_low_criteria:I = 0x7f1215af
 
-.field public static final verification_level_medium_criteria:I = 0x7f1215b0
+.field public static final verification_level_medium:I = 0x7f1215b0
 
-.field public static final verification_level_none:I = 0x7f1215b1
+.field public static final verification_level_medium_criteria:I = 0x7f1215b1
 
-.field public static final verification_level_none_criteria:I = 0x7f1215b2
+.field public static final verification_level_none:I = 0x7f1215b2
 
-.field public static final verification_level_very_high_criteria:I = 0x7f1215b3
+.field public static final verification_level_none_criteria:I = 0x7f1215b3
 
-.field public static final verification_open_discord:I = 0x7f1215b4
+.field public static final verification_level_very_high_criteria:I = 0x7f1215b4
 
-.field public static final verification_phone_description:I = 0x7f1215b5
+.field public static final verification_open_discord:I = 0x7f1215b5
 
-.field public static final verification_phone_title:I = 0x7f1215b6
+.field public static final verification_phone_description:I = 0x7f1215b6
 
-.field public static final verification_title:I = 0x7f1215b7
+.field public static final verification_phone_title:I = 0x7f1215b7
 
-.field public static final verification_verified:I = 0x7f1215b8
+.field public static final verification_title:I = 0x7f1215b8
 
-.field public static final verification_verifying:I = 0x7f1215b9
+.field public static final verification_verified:I = 0x7f1215b9
 
-.field public static final verified_bot_tooltip:I = 0x7f1215ba
+.field public static final verification_verifying:I = 0x7f1215ba
 
-.field public static final verified_developer_badge_tooltip:I = 0x7f1215bb
+.field public static final verified_bot_tooltip:I = 0x7f1215bb
 
-.field public static final verify:I = 0x7f1215bc
+.field public static final verified_developer_badge_tooltip:I = 0x7f1215bc
 
-.field public static final verify_account:I = 0x7f1215bd
+.field public static final verify:I = 0x7f1215bd
 
-.field public static final verify_by:I = 0x7f1215be
+.field public static final verify_account:I = 0x7f1215be
 
-.field public static final verify_by_email:I = 0x7f1215bf
+.field public static final verify_by:I = 0x7f1215bf
 
-.field public static final verify_by_email_formatted:I = 0x7f1215c0
+.field public static final verify_by_email:I = 0x7f1215c0
 
-.field public static final verify_by_phone_formatted:I = 0x7f1215c1
+.field public static final verify_by_email_formatted:I = 0x7f1215c1
 
-.field public static final verify_by_recaptcha:I = 0x7f1215c2
+.field public static final verify_by_phone_formatted:I = 0x7f1215c2
 
-.field public static final verify_by_recaptcha_description:I = 0x7f1215c3
+.field public static final verify_by_recaptcha:I = 0x7f1215c3
 
-.field public static final verify_email_body:I = 0x7f1215c4
+.field public static final verify_by_recaptcha_description:I = 0x7f1215c4
 
-.field public static final verify_email_body_resent:I = 0x7f1215c5
+.field public static final verify_email_body:I = 0x7f1215c5
 
-.field public static final verify_phone:I = 0x7f1215c6
+.field public static final verify_email_body_resent:I = 0x7f1215c6
 
-.field public static final verifying:I = 0x7f1215c7
+.field public static final verify_phone:I = 0x7f1215c7
 
-.field public static final very_out_of_date_description:I = 0x7f1215c8
+.field public static final verifying:I = 0x7f1215c8
 
-.field public static final vi:I = 0x7f1215c9
+.field public static final very_out_of_date_description:I = 0x7f1215c9
 
-.field public static final video:I = 0x7f1215ca
+.field public static final vi:I = 0x7f1215ca
 
-.field public static final video_call_auto_select:I = 0x7f1215cb
+.field public static final video:I = 0x7f1215cb
 
-.field public static final video_call_hide_members:I = 0x7f1215cc
+.field public static final video_call_auto_select:I = 0x7f1215cc
 
-.field public static final video_call_return_to_grid:I = 0x7f1215cd
+.field public static final video_call_hide_members:I = 0x7f1215cd
 
-.field public static final video_call_return_to_list:I = 0x7f1215ce
+.field public static final video_call_return_to_grid:I = 0x7f1215ce
 
-.field public static final video_call_show_members:I = 0x7f1215cf
+.field public static final video_call_return_to_list:I = 0x7f1215cf
 
-.field public static final video_capacity_modal_body:I = 0x7f1215d0
+.field public static final video_call_show_members:I = 0x7f1215d0
 
-.field public static final video_capacity_modal_header:I = 0x7f1215d1
+.field public static final video_capacity_modal_body:I = 0x7f1215d1
 
-.field public static final video_playback_mute_accessibility_label:I = 0x7f1215d2
+.field public static final video_capacity_modal_header:I = 0x7f1215d2
 
-.field public static final video_playback_unmute_accessibility_label:I = 0x7f1215d3
+.field public static final video_playback_mute_accessibility_label:I = 0x7f1215d3
 
-.field public static final video_poor_connection_body:I = 0x7f1215d4
+.field public static final video_playback_unmute_accessibility_label:I = 0x7f1215d4
 
-.field public static final video_poor_connection_title:I = 0x7f1215d5
+.field public static final video_poor_connection_body:I = 0x7f1215d5
 
-.field public static final video_settings:I = 0x7f1215d6
+.field public static final video_poor_connection_title:I = 0x7f1215d6
 
-.field public static final video_unavailable:I = 0x7f1215d7
+.field public static final video_settings:I = 0x7f1215d7
 
-.field public static final video_unsupported_browser_body:I = 0x7f1215d8
+.field public static final video_unavailable:I = 0x7f1215d8
 
-.field public static final video_unsupported_browser_title:I = 0x7f1215d9
+.field public static final video_unsupported_browser_body:I = 0x7f1215d9
 
-.field public static final view_audit_log:I = 0x7f1215da
+.field public static final video_unsupported_browser_title:I = 0x7f1215da
 
-.field public static final view_audit_log_description:I = 0x7f1215db
+.field public static final view_audit_log:I = 0x7f1215db
 
-.field public static final view_channel:I = 0x7f1215dc
+.field public static final view_audit_log_description:I = 0x7f1215dc
 
-.field public static final view_embed:I = 0x7f1215dd
+.field public static final view_channel:I = 0x7f1215dd
 
-.field public static final view_guild_analytics:I = 0x7f1215de
+.field public static final view_embed:I = 0x7f1215de
 
-.field public static final view_guild_analytics_description:I = 0x7f1215df
+.field public static final view_guild_analytics:I = 0x7f1215df
 
-.field public static final view_profile:I = 0x7f1215e0
+.field public static final view_guild_analytics_description:I = 0x7f1215e0
 
-.field public static final view_spectators:I = 0x7f1215e1
+.field public static final view_profile:I = 0x7f1215e1
 
-.field public static final view_surrounding_messages:I = 0x7f1215e2
+.field public static final view_spectators:I = 0x7f1215e2
 
-.field public static final voice:I = 0x7f1215e3
+.field public static final view_surrounding_messages:I = 0x7f1215e3
 
-.field public static final voice_and_video:I = 0x7f1215e4
+.field public static final voice:I = 0x7f1215e4
 
-.field public static final voice_call_member_list_title:I = 0x7f1215e5
+.field public static final voice_and_video:I = 0x7f1215e5
 
-.field public static final voice_channel:I = 0x7f1215e6
+.field public static final voice_call_member_list_title:I = 0x7f1215e6
 
-.field public static final voice_channel_deafened:I = 0x7f1215e7
+.field public static final voice_channel:I = 0x7f1215e7
 
-.field public static final voice_channel_empty:I = 0x7f1215e8
+.field public static final voice_channel_deafened:I = 0x7f1215e8
 
-.field public static final voice_channel_hide_names:I = 0x7f1215e9
+.field public static final voice_channel_empty:I = 0x7f1215e9
 
-.field public static final voice_channel_muted:I = 0x7f1215ea
+.field public static final voice_channel_hide_names:I = 0x7f1215ea
 
-.field public static final voice_channel_show_names:I = 0x7f1215eb
+.field public static final voice_channel_muted:I = 0x7f1215eb
 
-.field public static final voice_channel_subtitle:I = 0x7f1215ec
+.field public static final voice_channel_show_names:I = 0x7f1215ec
 
-.field public static final voice_channel_title:I = 0x7f1215ed
+.field public static final voice_channel_subtitle:I = 0x7f1215ed
 
-.field public static final voice_channels:I = 0x7f1215ee
+.field public static final voice_channel_title:I = 0x7f1215ee
 
-.field public static final voice_permissions:I = 0x7f1215ef
+.field public static final voice_channels:I = 0x7f1215ef
 
-.field public static final voice_settings:I = 0x7f1215f0
+.field public static final voice_permissions:I = 0x7f1215f0
 
-.field public static final voice_status_connecting:I = 0x7f1215f1
+.field public static final voice_settings:I = 0x7f1215f1
 
-.field public static final voice_status_not_connected:I = 0x7f1215f2
+.field public static final voice_status_connecting:I = 0x7f1215f2
 
-.field public static final voice_status_not_connected_mobile:I = 0x7f1215f3
+.field public static final voice_status_not_connected:I = 0x7f1215f3
 
-.field public static final voice_status_ringing:I = 0x7f1215f4
+.field public static final voice_status_not_connected_mobile:I = 0x7f1215f4
 
-.field public static final voice_unavailable:I = 0x7f1215f5
+.field public static final voice_status_ringing:I = 0x7f1215f5
 
-.field public static final watch:I = 0x7f1215f6
+.field public static final voice_unavailable:I = 0x7f1215f6
 
-.field public static final watch_stream:I = 0x7f1215f7
+.field public static final watch:I = 0x7f1215f7
 
-.field public static final watch_stream_in_app:I = 0x7f1215f8
+.field public static final watch_stream:I = 0x7f1215f8
 
-.field public static final watch_stream_streaming:I = 0x7f1215f9
+.field public static final watch_stream_in_app:I = 0x7f1215f9
 
-.field public static final watch_stream_tip:I = 0x7f1215fa
+.field public static final watch_stream_streaming:I = 0x7f1215fa
 
-.field public static final watch_stream_watching:I = 0x7f1215fb
+.field public static final watch_stream_tip:I = 0x7f1215fb
 
-.field public static final watch_user_stream:I = 0x7f1215fc
+.field public static final watch_stream_watching:I = 0x7f1215fc
 
-.field public static final watching:I = 0x7f1215fd
+.field public static final watch_user_stream:I = 0x7f1215fd
 
-.field public static final web_browser:I = 0x7f1215fe
+.field public static final watching:I = 0x7f1215fe
 
-.field public static final web_browser_chrome:I = 0x7f1215ff
+.field public static final web_browser:I = 0x7f1215ff
 
-.field public static final web_browser_in_app:I = 0x7f121600
+.field public static final web_browser_chrome:I = 0x7f121600
 
-.field public static final web_browser_safari:I = 0x7f121601
+.field public static final web_browser_in_app:I = 0x7f121601
 
-.field public static final webhook_cancel:I = 0x7f121602
+.field public static final web_browser_safari:I = 0x7f121602
 
-.field public static final webhook_create:I = 0x7f121603
+.field public static final webhook_cancel:I = 0x7f121603
 
-.field public static final webhook_created_on:I = 0x7f121604
+.field public static final webhook_create:I = 0x7f121604
 
-.field public static final webhook_delete:I = 0x7f121605
+.field public static final webhook_created_on:I = 0x7f121605
 
-.field public static final webhook_delete_body:I = 0x7f121606
+.field public static final webhook_delete:I = 0x7f121606
 
-.field public static final webhook_delete_title:I = 0x7f121607
+.field public static final webhook_delete_body:I = 0x7f121607
 
-.field public static final webhook_error_creating_webhook:I = 0x7f121608
+.field public static final webhook_delete_title:I = 0x7f121608
 
-.field public static final webhook_error_deleting_webhook:I = 0x7f121609
+.field public static final webhook_error_creating_webhook:I = 0x7f121609
 
-.field public static final webhook_error_internal_server_error:I = 0x7f12160a
+.field public static final webhook_error_deleting_webhook:I = 0x7f12160a
 
-.field public static final webhook_error_max_webhooks_reached:I = 0x7f12160b
+.field public static final webhook_error_internal_server_error:I = 0x7f12160b
 
-.field public static final webhook_form_name:I = 0x7f12160c
+.field public static final webhook_error_max_webhooks_reached:I = 0x7f12160c
 
-.field public static final webhook_form_url:I = 0x7f12160d
+.field public static final webhook_form_name:I = 0x7f12160d
 
-.field public static final webhook_form_webhook_url_help:I = 0x7f12160e
+.field public static final webhook_form_url:I = 0x7f12160e
 
-.field public static final webhook_modal_icon_description:I = 0x7f12160f
+.field public static final webhook_form_webhook_url_help:I = 0x7f12160f
 
-.field public static final webhook_modal_icon_title:I = 0x7f121610
+.field public static final webhook_modal_icon_description:I = 0x7f121610
 
-.field public static final webhook_modal_title:I = 0x7f121611
+.field public static final webhook_modal_icon_title:I = 0x7f121611
 
-.field public static final webhooks:I = 0x7f121612
+.field public static final webhook_modal_title:I = 0x7f121612
 
-.field public static final welcome_channel_delete_confirm_body:I = 0x7f121613
+.field public static final webhooks:I = 0x7f121613
 
-.field public static final welcome_channel_delete_confirm_body_generic:I = 0x7f121614
+.field public static final welcome_channel_delete_confirm_body:I = 0x7f121614
 
-.field public static final welcome_channel_delete_confirm_title:I = 0x7f121615
+.field public static final welcome_channel_delete_confirm_body_generic:I = 0x7f121615
 
-.field public static final welcome_message_desktop_apps:I = 0x7f121616
+.field public static final welcome_channel_delete_confirm_title:I = 0x7f121616
 
-.field public static final welcome_message_edit_channel:I = 0x7f121617
+.field public static final welcome_message_desktop_apps:I = 0x7f121617
 
-.field public static final welcome_message_instant_invite:I = 0x7f121618
+.field public static final welcome_message_edit_channel:I = 0x7f121618
 
-.field public static final welcome_message_mobile_apps:I = 0x7f121619
+.field public static final welcome_message_instant_invite:I = 0x7f121619
 
-.field public static final welcome_message_mobile_explore_server:I = 0x7f12161a
+.field public static final welcome_message_mobile_apps:I = 0x7f12161a
 
-.field public static final welcome_message_mobile_explore_server_desc:I = 0x7f12161b
+.field public static final welcome_message_mobile_explore_server:I = 0x7f12161b
 
-.field public static final welcome_message_mobile_instant_invite:I = 0x7f12161c
+.field public static final welcome_message_mobile_explore_server_desc:I = 0x7f12161c
 
-.field public static final welcome_message_mobile_instant_invite_desc:I = 0x7f12161d
+.field public static final welcome_message_mobile_instant_invite:I = 0x7f12161d
 
-.field public static final welcome_message_mobile_owner_subtitle:I = 0x7f12161e
+.field public static final welcome_message_mobile_instant_invite_desc:I = 0x7f12161e
 
-.field public static final welcome_message_mobile_owner_title:I = 0x7f12161f
+.field public static final welcome_message_mobile_owner_subtitle:I = 0x7f12161f
 
-.field public static final welcome_message_mobile_upload_icon:I = 0x7f121620
+.field public static final welcome_message_mobile_owner_title:I = 0x7f121620
 
-.field public static final welcome_message_mobile_upload_icon_desc:I = 0x7f121621
+.field public static final welcome_message_mobile_upload_icon:I = 0x7f121621
 
-.field public static final welcome_message_owner_title:I = 0x7f121622
+.field public static final welcome_message_mobile_upload_icon_desc:I = 0x7f121622
 
-.field public static final welcome_message_setup_server:I = 0x7f121623
+.field public static final welcome_message_owner_title:I = 0x7f121623
 
-.field public static final welcome_message_subtitle_channel:I = 0x7f121624
+.field public static final welcome_message_setup_server:I = 0x7f121624
 
-.field public static final welcome_message_support:I = 0x7f121625
+.field public static final welcome_message_subtitle_channel:I = 0x7f121625
 
-.field public static final welcome_message_title:I = 0x7f121626
+.field public static final welcome_message_support:I = 0x7f121626
 
-.field public static final welcome_message_title_channel:I = 0x7f121627
+.field public static final welcome_message_title:I = 0x7f121627
 
-.field public static final welcome_message_tutorial:I = 0x7f121628
+.field public static final welcome_message_title_channel:I = 0x7f121628
 
-.field public static final welcome_screen_choice_header:I = 0x7f121629
+.field public static final welcome_message_tutorial:I = 0x7f121629
 
-.field public static final welcome_screen_skip:I = 0x7f12162a
+.field public static final welcome_screen_choice_header:I = 0x7f12162a
 
-.field public static final welcome_screen_title:I = 0x7f12162b
+.field public static final welcome_screen_skip:I = 0x7f12162b
 
-.field public static final whats_new:I = 0x7f12162c
+.field public static final welcome_screen_title:I = 0x7f12162c
 
-.field public static final whats_new_date:I = 0x7f12162d
+.field public static final whats_new:I = 0x7f12162d
 
-.field public static final whitelist_failed:I = 0x7f12162e
+.field public static final whats_new_date:I = 0x7f12162e
 
-.field public static final whitelisted:I = 0x7f12162f
+.field public static final whitelist_failed:I = 0x7f12162f
 
-.field public static final whitelisting:I = 0x7f121630
+.field public static final whitelisted:I = 0x7f121630
 
-.field public static final widget:I = 0x7f121631
+.field public static final whitelisting:I = 0x7f121631
 
-.field public static final windows:I = 0x7f121632
+.field public static final widget:I = 0x7f121632
 
-.field public static final wumpus:I = 0x7f121633
+.field public static final windows:I = 0x7f121633
 
-.field public static final xbox_authorization_title:I = 0x7f121634
+.field public static final wumpus:I = 0x7f121634
 
-.field public static final xbox_game_pass_card_body_redeemed:I = 0x7f121635
+.field public static final xbox_authorization_title:I = 0x7f121635
 
-.field public static final xbox_game_pass_card_body_unredeemed:I = 0x7f121636
+.field public static final xbox_game_pass_card_body_redeemed:I = 0x7f121636
 
-.field public static final xbox_game_pass_modal_code_description:I = 0x7f121637
+.field public static final xbox_game_pass_card_body_unredeemed:I = 0x7f121637
 
-.field public static final xbox_game_pass_modal_code_header:I = 0x7f121638
+.field public static final xbox_game_pass_modal_code_description:I = 0x7f121638
 
-.field public static final xbox_game_pass_modal_header_confirm_pc:I = 0x7f121639
+.field public static final xbox_game_pass_modal_code_header:I = 0x7f121639
 
-.field public static final xbox_game_pass_modal_header_confirm_xbox:I = 0x7f12163a
+.field public static final xbox_game_pass_modal_header_confirm_pc:I = 0x7f12163a
 
-.field public static final xbox_game_pass_modal_header_description_confirm_pc:I = 0x7f12163b
+.field public static final xbox_game_pass_modal_header_confirm_xbox:I = 0x7f12163b
 
-.field public static final xbox_game_pass_modal_header_description_confirm_xbox:I = 0x7f12163c
+.field public static final xbox_game_pass_modal_header_description_confirm_pc:I = 0x7f12163c
 
-.field public static final xbox_game_pass_modal_header_description_plan_select:I = 0x7f12163d
+.field public static final xbox_game_pass_modal_header_description_confirm_xbox:I = 0x7f12163d
 
-.field public static final xbox_game_pass_modal_header_description_success:I = 0x7f12163e
+.field public static final xbox_game_pass_modal_header_description_plan_select:I = 0x7f12163e
 
-.field public static final xbox_game_pass_modal_header_plan_select:I = 0x7f12163f
+.field public static final xbox_game_pass_modal_header_description_success:I = 0x7f12163f
 
-.field public static final xbox_game_pass_modal_header_success:I = 0x7f121640
+.field public static final xbox_game_pass_modal_header_plan_select:I = 0x7f121640
 
-.field public static final xbox_game_pass_modal_plan_select_header:I = 0x7f121641
+.field public static final xbox_game_pass_modal_header_success:I = 0x7f121641
 
-.field public static final xbox_game_pass_modal_plan_select_pc_plan:I = 0x7f121642
+.field public static final xbox_game_pass_modal_plan_select_header:I = 0x7f121642
 
-.field public static final xbox_game_pass_modal_plan_select_plan_duration:I = 0x7f121643
+.field public static final xbox_game_pass_modal_plan_select_pc_plan:I = 0x7f121643
 
-.field public static final xbox_game_pass_modal_plan_select_xbox_plan:I = 0x7f121644
+.field public static final xbox_game_pass_modal_plan_select_plan_duration:I = 0x7f121644
 
-.field public static final xbox_game_pass_modal_redeem_button_pc:I = 0x7f121645
+.field public static final xbox_game_pass_modal_plan_select_xbox_plan:I = 0x7f121645
 
-.field public static final xbox_game_pass_modal_redeem_button_xbox:I = 0x7f121646
+.field public static final xbox_game_pass_modal_redeem_button_pc:I = 0x7f121646
 
-.field public static final xbox_game_pass_promotion_account_credit_body:I = 0x7f121647
+.field public static final xbox_game_pass_modal_redeem_button_xbox:I = 0x7f121647
 
-.field public static final xbox_game_pass_promotion_account_credit_button:I = 0x7f121648
+.field public static final xbox_game_pass_promotion_account_credit_body:I = 0x7f121648
 
-.field public static final xbox_game_pass_promotion_account_credit_confirm_body:I = 0x7f121649
+.field public static final xbox_game_pass_promotion_account_credit_button:I = 0x7f121649
 
-.field public static final xbox_game_pass_promotion_account_credit_confirm_title:I = 0x7f12164a
+.field public static final xbox_game_pass_promotion_account_credit_confirm_body:I = 0x7f12164a
 
-.field public static final xbox_game_pass_promotion_account_credit_title:I = 0x7f12164b
+.field public static final xbox_game_pass_promotion_account_credit_confirm_title:I = 0x7f12164b
 
-.field public static final xbox_game_pass_promotion_banner_description:I = 0x7f12164c
+.field public static final xbox_game_pass_promotion_account_credit_title:I = 0x7f12164c
 
-.field public static final xbox_game_pass_promotion_banner_header:I = 0x7f12164d
+.field public static final xbox_game_pass_promotion_banner_description:I = 0x7f12164d
 
-.field public static final xbox_game_pass_promotion_card_company_logo_label:I = 0x7f12164e
+.field public static final xbox_game_pass_promotion_banner_header:I = 0x7f12164e
 
-.field public static final xbox_game_pass_promotion_card_header:I = 0x7f12164f
+.field public static final xbox_game_pass_promotion_card_company_logo_label:I = 0x7f12164f
 
-.field public static final xbox_game_pass_promotion_existing_subscriber_body:I = 0x7f121650
+.field public static final xbox_game_pass_promotion_card_header:I = 0x7f121650
 
-.field public static final xbox_game_pass_promotion_existing_subscriber_title:I = 0x7f121651
+.field public static final xbox_game_pass_promotion_existing_subscriber_body:I = 0x7f121651
 
-.field public static final xbox_game_pass_promotion_redeem_body:I = 0x7f121652
+.field public static final xbox_game_pass_promotion_existing_subscriber_title:I = 0x7f121652
 
-.field public static final xbox_link:I = 0x7f121653
+.field public static final xbox_game_pass_promotion_redeem_body:I = 0x7f121653
 
-.field public static final xbox_pin_step1:I = 0x7f121654
+.field public static final xbox_link:I = 0x7f121654
 
-.field public static final xbox_pin_step2:I = 0x7f121655
+.field public static final xbox_pin_step1:I = 0x7f121655
 
-.field public static final xbox_pin_step3:I = 0x7f121656
+.field public static final xbox_pin_step2:I = 0x7f121656
 
-.field public static final yearly:I = 0x7f121657
+.field public static final xbox_pin_step3:I = 0x7f121657
 
-.field public static final yellow:I = 0x7f121658
+.field public static final yearly:I = 0x7f121658
 
-.field public static final yes_text:I = 0x7f121659
+.field public static final yellow:I = 0x7f121659
 
-.field public static final your_pin_expires:I = 0x7f12165a
+.field public static final yes_text:I = 0x7f12165a
 
-.field public static final your_pin_is_expired:I = 0x7f12165b
+.field public static final your_pin_expires:I = 0x7f12165b
 
-.field public static final youre_viewing_older_messages:I = 0x7f12165c
+.field public static final your_pin_is_expired:I = 0x7f12165c
 
-.field public static final zh_cn:I = 0x7f12165d
+.field public static final youre_viewing_older_messages:I = 0x7f12165d
 
-.field public static final zh_tw:I = 0x7f12165e
+.field public static final zh_cn:I = 0x7f12165e
+
+.field public static final zh_tw:I = 0x7f12165f
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$drawable.smali b/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$drawable.smali
index b8fcfd02c8..c8a76ed060 100644
--- a/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$drawable.smali
+++ b/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$drawable.smali
@@ -183,57 +183,57 @@
 
 .field public static final abc_vector_test:I = 0x7f080071
 
-.field public static final notification_action_background:I = 0x7f08052a
+.field public static final notification_action_background:I = 0x7f08052b
 
-.field public static final notification_bg:I = 0x7f08052b
+.field public static final notification_bg:I = 0x7f08052c
 
-.field public static final notification_bg_low:I = 0x7f08052c
+.field public static final notification_bg_low:I = 0x7f08052d
 
-.field public static final notification_bg_low_normal:I = 0x7f08052d
+.field public static final notification_bg_low_normal:I = 0x7f08052e
 
-.field public static final notification_bg_low_pressed:I = 0x7f08052e
+.field public static final notification_bg_low_pressed:I = 0x7f08052f
 
-.field public static final notification_bg_normal:I = 0x7f08052f
+.field public static final notification_bg_normal:I = 0x7f080530
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080530
+.field public static final notification_bg_normal_pressed:I = 0x7f080531
 
-.field public static final notification_icon_background:I = 0x7f080531
+.field public static final notification_icon_background:I = 0x7f080532
 
-.field public static final notification_template_icon_bg:I = 0x7f080532
+.field public static final notification_template_icon_bg:I = 0x7f080533
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080533
+.field public static final notification_template_icon_low_bg:I = 0x7f080534
 
-.field public static final notification_tile_bg:I = 0x7f080534
+.field public static final notification_tile_bg:I = 0x7f080535
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080535
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080536
 
-.field public static final tooltip_frame_dark:I = 0x7f080546
+.field public static final tooltip_frame_dark:I = 0x7f080548
 
-.field public static final tooltip_frame_light:I = 0x7f080547
+.field public static final tooltip_frame_light:I = 0x7f080549
 
-.field public static final ucrop_ic_angle:I = 0x7f080549
+.field public static final ucrop_ic_angle:I = 0x7f08054b
 
-.field public static final ucrop_ic_crop:I = 0x7f08054a
+.field public static final ucrop_ic_crop:I = 0x7f08054c
 
-.field public static final ucrop_ic_cross:I = 0x7f08054b
+.field public static final ucrop_ic_cross:I = 0x7f08054d
 
-.field public static final ucrop_ic_done:I = 0x7f08054c
+.field public static final ucrop_ic_done:I = 0x7f08054e
 
-.field public static final ucrop_ic_next:I = 0x7f08054d
+.field public static final ucrop_ic_next:I = 0x7f08054f
 
-.field public static final ucrop_ic_reset:I = 0x7f08054e
+.field public static final ucrop_ic_reset:I = 0x7f080550
 
-.field public static final ucrop_ic_rotate:I = 0x7f08054f
+.field public static final ucrop_ic_rotate:I = 0x7f080551
 
-.field public static final ucrop_ic_scale:I = 0x7f080550
+.field public static final ucrop_ic_scale:I = 0x7f080552
 
-.field public static final ucrop_shadow_upside:I = 0x7f080551
+.field public static final ucrop_shadow_upside:I = 0x7f080553
 
-.field public static final ucrop_vector_ic_crop:I = 0x7f080552
+.field public static final ucrop_vector_ic_crop:I = 0x7f080554
 
-.field public static final ucrop_vector_loader:I = 0x7f080553
+.field public static final ucrop_vector_loader:I = 0x7f080555
 
-.field public static final ucrop_vector_loader_animated:I = 0x7f080554
+.field public static final ucrop_vector_loader_animated:I = 0x7f080556
 
 
 # direct methods
diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/R$c.smali b/com.discord/smali_classes2/com/yalantis/ucrop/R$c.smali
index b2eabf2b23..41654f3bd9 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/R$c.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/R$c.smali
@@ -181,57 +181,57 @@
 
 .field public static final abc_vector_test:I = 0x7f080071
 
-.field public static final notification_action_background:I = 0x7f08052a
+.field public static final notification_action_background:I = 0x7f08052b
 
-.field public static final notification_bg:I = 0x7f08052b
+.field public static final notification_bg:I = 0x7f08052c
 
-.field public static final notification_bg_low:I = 0x7f08052c
+.field public static final notification_bg_low:I = 0x7f08052d
 
-.field public static final notification_bg_low_normal:I = 0x7f08052d
+.field public static final notification_bg_low_normal:I = 0x7f08052e
 
-.field public static final notification_bg_low_pressed:I = 0x7f08052e
+.field public static final notification_bg_low_pressed:I = 0x7f08052f
 
-.field public static final notification_bg_normal:I = 0x7f08052f
+.field public static final notification_bg_normal:I = 0x7f080530
 
-.field public static final notification_bg_normal_pressed:I = 0x7f080530
+.field public static final notification_bg_normal_pressed:I = 0x7f080531
 
-.field public static final notification_icon_background:I = 0x7f080531
+.field public static final notification_icon_background:I = 0x7f080532
 
-.field public static final notification_template_icon_bg:I = 0x7f080532
+.field public static final notification_template_icon_bg:I = 0x7f080533
 
-.field public static final notification_template_icon_low_bg:I = 0x7f080533
+.field public static final notification_template_icon_low_bg:I = 0x7f080534
 
-.field public static final notification_tile_bg:I = 0x7f080534
+.field public static final notification_tile_bg:I = 0x7f080535
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080535
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080536
 
-.field public static final tooltip_frame_dark:I = 0x7f080546
+.field public static final tooltip_frame_dark:I = 0x7f080548
 
-.field public static final tooltip_frame_light:I = 0x7f080547
+.field public static final tooltip_frame_light:I = 0x7f080549
 
-.field public static final ucrop_ic_angle:I = 0x7f080549
+.field public static final ucrop_ic_angle:I = 0x7f08054b
 
-.field public static final ucrop_ic_crop:I = 0x7f08054a
+.field public static final ucrop_ic_crop:I = 0x7f08054c
 
-.field public static final ucrop_ic_cross:I = 0x7f08054b
+.field public static final ucrop_ic_cross:I = 0x7f08054d
 
-.field public static final ucrop_ic_done:I = 0x7f08054c
+.field public static final ucrop_ic_done:I = 0x7f08054e
 
-.field public static final ucrop_ic_next:I = 0x7f08054d
+.field public static final ucrop_ic_next:I = 0x7f08054f
 
-.field public static final ucrop_ic_reset:I = 0x7f08054e
+.field public static final ucrop_ic_reset:I = 0x7f080550
 
-.field public static final ucrop_ic_rotate:I = 0x7f08054f
+.field public static final ucrop_ic_rotate:I = 0x7f080551
 
-.field public static final ucrop_ic_scale:I = 0x7f080550
+.field public static final ucrop_ic_scale:I = 0x7f080552
 
-.field public static final ucrop_shadow_upside:I = 0x7f080551
+.field public static final ucrop_shadow_upside:I = 0x7f080553
 
-.field public static final ucrop_vector_ic_crop:I = 0x7f080552
+.field public static final ucrop_vector_ic_crop:I = 0x7f080554
 
-.field public static final ucrop_vector_loader:I = 0x7f080553
+.field public static final ucrop_vector_loader:I = 0x7f080555
 
-.field public static final ucrop_vector_loader_animated:I = 0x7f080554
+.field public static final ucrop_vector_loader_animated:I = 0x7f080556
 
 
 # direct methods