Changes of com.discord v946

2019-08-22 20:54:10 +02:00 · 2019-08-22 20:54:10 +02:00 · 5ec7e99617
parent c8dad9d3cd
commit 5ec7e99617
5501 changed files with 81234 additions and 81187 deletions
--- a/com.discord/apktool.yml
+++ b/com.discord/apktool.yml
@ -1,5 +1,5 @@
 !!brut.androlib.meta.MetaInfo
-apkFileName: com.discord-945.apk
+apkFileName: com.discord-946.apk
 compressionType: false
 doNotCompress:
 - arsc
@ -308,5 +308,5 @@ usesFramework:
  tag: null
 version: 2.4.1-1b91ce-SNAPSHOT
 versionInfo:
-  versionCode: '945'
-  versionName: 9.4.5
+  versionCode: '946'
+  versionName: 9.4.6
--- 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!
 #
-#Thu Aug 22 00:01:47 UTC 2019
-version_name=9.4.5
+#Thu Aug 22 18:14:51 UTC 2019
+version_name=9.4.6
 package_name=com.discord
-build_id=b69fd8d4-be22-451a-9831-09705c601eb7
-version_code=945
+build_id=3d402c4e-8d1f-48ba-8faa-bcc5c21bba1f
+version_code=946
 app_name=com.discord
--- a/com.discord/original/AndroidManifest.xml
+++ b/com.discord/original/AndroidManifest.xml
--- a/com.discord/res/drawable-anydpi-v21/ic_clear_primary_300_24dp.xml
+++ b/com.discord/res/drawable-anydpi-v21/ic_clear_primary_300_24dp.xml
@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="24.0dip" android:width="24.0dip" android:viewportWidth="24.0" android:viewportHeight="24.0"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ffb9bbbe" android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z" />
+</vector>
--- a/com.discord/res/drawable-anydpi-v24/img_logo_discord_nitro_brand.xml
+++ b/com.discord/res/drawable-anydpi-v24/img_logo_discord_nitro_brand.xml
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="32.0dip" android:width="78.0dip" android:viewportWidth="78.0" android:viewportHeight="32.0"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ff7289da" android:pathData="M72.2706,19.372L71.3462,25.5356C71.1339,26.9925 69.4758,27.6702 67.9494,27.6702C66.5251,27.6702 65.1304,26.9925 65.3158,25.6664L66.2402,19.372C66.4526,17.9952 68.1106,17.2881 69.637,17.2881C71.1608,17.2881 72.4829,17.9952 72.2706,19.372ZM70.3626,13.0483H60.4329C60.1749,13.0483 59.9626,13.2298 59.9277,13.4779L59.444,16.7358C59.401,17.0427 59.6348,17.3121 59.9492,17.3121H61.7605C61.9432,17.3121 62.0695,17.4936 61.9942,17.6617C61.7658,18.1873 61.6046,18.7557 61.5105,19.3667L60.5861,25.661C59.9922,29.8875 63.5502,31.9927 67.4173,31.9927C71.4752,31.9927 75.4525,29.8875 76.0625,25.669L76.9869,19.3747C77.5835,15.2416 74.1491,13.1364 70.3626,13.0483ZM11.2277,21.3171L11.2787,24.3402C11.2787,24.4069 11.2357,24.4576 11.1766,24.471L10.15,20.8289C10.15,20.8209 10.15,20.8155 10.142,20.8155L6.9655,13.3525C6.8849,13.1631 6.7076,13.0457 6.5033,13.0457H2.8996C2.6497,13.0457 2.4454,13.2271 2.4078,13.4752L0.008,30.6933C-0.035,30.9921 0.1988,31.2616 0.4998,31.2616H4.0874C4.3373,31.2616 4.5496,31.0802 4.5792,30.832L5.5198,23.9907C5.5198,23.9827 5.5198,23.9774 5.5198,23.9694L5.4687,20.458L5.5708,20.4286L6.6484,24.0708C6.6484,24.0788 6.6484,24.0788 6.6565,24.0841L9.6287,30.9548C9.7093,31.1362 9.8867,31.2536 10.0829,31.2536H13.9714C14.2214,31.2536 14.4337,31.0722 14.4632,30.824L16.8711,13.6086C16.9141,13.3178 16.6803,13.0483 16.3793,13.0483H12.8132C12.5633,13.0483 12.351,13.2298 12.3214,13.4779L11.2277,21.2958C11.2277,21.3038 11.2277,21.3091 11.2277,21.3171ZM18.1341,31.2643H21.9072C22.1705,31.2643 22.3909,31.0828 22.4285,30.8347L24.9519,13.6167C24.9895,13.3178 24.7477,13.0483 24.4306,13.0483H20.6575C20.3942,13.0483 20.1738,13.2298 20.1362,13.4779L17.6128,30.696C17.5752,30.9948 17.817,31.2643 18.1341,31.2643ZM27.6446,13.4699L27.1609,16.6904C27.1179,16.9893 27.3598,17.2588 27.6661,17.2588H31.5493C31.8638,17.2588 32.1003,17.5283 32.0546,17.8271L30.2272,30.696C30.1896,30.9948 30.426,31.2643 30.7405,31.2643H34.5054C34.7634,31.2643 34.9838,31.0828 35.0106,30.8347L36.8757,17.691C36.9133,17.4429 37.1256,17.2614 37.3809,17.2614H41.557C41.815,17.2614 42.0273,17.08 42.0622,16.8399L42.546,13.6273C42.597,13.3205 42.3632,13.051 42.0461,13.051H28.1472C27.8999,13.0483 27.6796,13.2298 27.6446,13.4699ZM53.865,19.4014C53.7334,20.458 52.8895,21.5146 51.4357,21.5146H49.2562C48.9472,21.5146 48.7053,21.2451 48.751,20.9463L49.2132,17.7764C49.2428,17.5283 49.4632,17.3468 49.7185,17.3468H52.0457C53.4377,17.3468 53.9967,18.294 53.865,19.4014ZM52.5724,13.0483H45.5504C45.2924,13.0483 45.0801,13.2298 45.0452,13.4779L42.5728,30.696C42.5298,30.9948 42.7636,31.2643 43.078,31.2643H46.8215C47.0795,31.2643 47.2918,31.0828 47.3267,30.8347L48.0523,25.6904C48.0658,25.5676 48.1759,25.4716 48.3103,25.4716H48.794C48.8827,25.4716 48.9633,25.5143 49.0063,25.589L52.5805,31.0321C52.6745,31.1789 52.8385,31.2643 53.0131,31.2643H57.6354C58.0465,31.2643 58.2965,30.8134 58.0546,30.4772L54.3058,25.2528C54.2171,25.13 54.2628,24.9539 54.3998,24.8872C56.7915,23.7426 58.1863,22.5765 58.6404,19.3267C59.1699,15.0522 56.4261,13.0483 52.5724,13.0483Z" android:fillType="evenOdd" />
+    <path android:fillColor="#ff7289da" android:pathData="M9.4514,0.1146H7.3741V8.2687H9.4514V0.1146Z" />
+    <path android:fillColor="#ff7289da" android:pathData="M6.2642,5.5845V2.8416C6.2642,0.9418 4.7217,0.1146 3.077,0.1146H0V3.5406L2.0478,5.3657V2.0384H3.1415C3.8375,2.0384 4.1734,2.3719 4.1734,2.9002V5.4457C4.1734,5.9767 3.8483,6.3316 3.1415,6.3316H0V8.2661H3.0716C4.7217,8.2767 6.2642,7.4602 6.2642,5.5845Z" />
+    <path android:fillColor="#ff7289da" android:pathData="M20.3297,8.3836C21.3617,8.3836 22.6032,7.8766 23.2858,6.5532L21.4772,5.7233C21.0258,6.852 19.1688,6.5772 19.1688,5.5979V2.7856C19.1688,1.7717 20.9989,1.5396 21.5579,2.5562L23.2509,1.8784C22.5898,0.4269 21.3724,0 20.3647,0C18.7173,0 17.0915,0.9446 17.0915,2.7856V5.5953C17.0969,7.4524 18.7173,8.3836 20.3297,8.3836Z" />
+    <path android:fillColor="#ff7289da" android:pathData="M45.4994,2.8416C45.4994,0.9418 43.9569,0.1146 42.3095,0.1146H39.2379V3.5406L41.2857,5.3657V2.0384H42.3794C43.0754,2.0384 43.4113,2.3719 43.4113,2.9002V5.4457C43.4113,5.9767 43.0862,6.3316 42.3794,6.3316H39.2379V8.2661H42.3095C43.9542,8.2767 45.4994,7.4602 45.4994,5.5845V2.8416Z" />
+    <path android:fillColor="#ff7289da" android:pathData="M11.6685,5.6887L10.357,6.9107C11.1229,7.8899 12.1656,8.3836 13.1519,8.3836C14.6568,8.3836 16.331,7.5217 16.4009,5.9421C16.4949,3.9383 15.0303,3.4313 13.5711,3.1672C12.9342,3.0284 12.5015,2.799 12.48,2.4067C12.5123,1.4622 13.985,1.4275 14.8449,2.3374L16.202,1.2994C15.3555,0.2775 14.3934,0 13.3937,0C11.8888,0 10.4242,0.8405 10.4242,2.4414C10.4242,3.997 11.6282,4.8268 12.953,5.0349C13.6275,5.1283 14.38,5.3898 14.3558,5.8514C14.2994,6.7239 12.4908,6.6759 11.6685,5.6887Z" />
+    <path android:fillColor="#ff7289da" android:pathData="M27.255,8.3836C28.9615,8.3836 30.6518,7.4524 30.6518,5.5873V2.7963C30.6518,0.9312 28.9454,0 27.2416,0C25.5351,0 23.8448,0.9232 23.8448,2.7963V5.5819C23.8448,7.4524 25.5486,8.3836 27.255,8.3836ZM25.9221,2.7963C25.9221,2.196 26.5725,1.8731 27.2201,1.8731C27.8946,1.8731 28.5772,2.1586 28.5772,2.7963V5.5819C28.5772,6.1689 27.9161,6.4678 27.2524,6.4678C26.5913,6.4678 25.9194,6.1823 25.9194,5.5819V2.7963H25.9221Z" />
+    <path android:fillColor="#ff7289da" android:pathData="M33.8525,5.6753H34.2233L36.1233,8.2635H38.7112L36.4726,5.4672C37.4723,5.1577 38.085,4.3038 38.085,2.7963C38.0393,0.8858 36.7279,0.1121 35.0349,0.1121H31.7536V8.2688H33.8551V5.6753H33.8525ZM33.8525,2.0385H35.0698C36.3813,2.0385 36.3813,3.9036 35.0698,3.9036H33.8525V2.0385Z" />
+</vector>
--- a/com.discord/res/drawable-anydpi-v24/img_logo_nitro_classic_brand.xml
+++ b/com.discord/res/drawable-anydpi-v24/img_logo_nitro_classic_brand.xml
--- a/com.discord/res/drawable-anydpi-v24/img_nitro_pattern.xml
+++ b/com.discord/res/drawable-anydpi-v24/img_nitro_pattern.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector android:height="301.0dip" android:width="375.0dip" android:alpha="0.2" android:viewportWidth="375.0" android:viewportHeight="301.0"
+<vector android:height="301.0dip" android:width="375.0dip" android:alpha="0.1" android:viewportWidth="375.0" android:viewportHeight="301.0"
  xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt">
    <group>
        <clip-path android:pathData="M0,0h502v301h-502z M 0,0" />
--- a/com.discord/res/drawable-hdpi/bg_nitro_classic.png
+++ b/com.discord/res/drawable-hdpi/bg_nitro_classic.png
--- a/com.discord/res/drawable-hdpi/ic_clear_primary_300_24dp.png
+++ b/com.discord/res/drawable-hdpi/ic_clear_primary_300_24dp.png
--- a/com.discord/res/drawable-hdpi/img_logo_discord_nitro_brand.png
+++ b/com.discord/res/drawable-hdpi/img_logo_discord_nitro_brand.png
--- a/com.discord/res/drawable-hdpi/img_logo_nitro_classic_brand.png
+++ b/com.discord/res/drawable-hdpi/img_logo_nitro_classic_brand.png
--- a/com.discord/res/drawable-hdpi/img_nitro_pattern.png
+++ b/com.discord/res/drawable-hdpi/img_nitro_pattern.png
--- a/com.discord/res/drawable-ldpi/bg_nitro_classic.png
+++ b/com.discord/res/drawable-ldpi/bg_nitro_classic.png
--- a/com.discord/res/drawable-ldpi/ic_clear_primary_300_24dp.png
+++ b/com.discord/res/drawable-ldpi/ic_clear_primary_300_24dp.png
--- a/com.discord/res/drawable-ldpi/img_logo_discord_nitro_brand.png
+++ b/com.discord/res/drawable-ldpi/img_logo_discord_nitro_brand.png
--- a/com.discord/res/drawable-ldpi/img_logo_nitro_classic_brand.png
+++ b/com.discord/res/drawable-ldpi/img_logo_nitro_classic_brand.png
--- a/com.discord/res/drawable-ldpi/img_nitro_pattern.png
+++ b/com.discord/res/drawable-ldpi/img_nitro_pattern.png
--- a/com.discord/res/drawable-mdpi/ic_clear_primary_300_24dp.png
+++ b/com.discord/res/drawable-mdpi/ic_clear_primary_300_24dp.png
--- a/com.discord/res/drawable-mdpi/img_logo_discord_nitro_brand.png
+++ b/com.discord/res/drawable-mdpi/img_logo_discord_nitro_brand.png
--- a/com.discord/res/drawable-mdpi/img_logo_nitro_classic_brand.png
+++ b/com.discord/res/drawable-mdpi/img_logo_nitro_classic_brand.png
--- a/com.discord/res/drawable-mdpi/img_nitro_pattern.png
+++ b/com.discord/res/drawable-mdpi/img_nitro_pattern.png
--- a/com.discord/res/drawable-xhdpi/ic_clear_primary_300_24dp.png
+++ b/com.discord/res/drawable-xhdpi/ic_clear_primary_300_24dp.png
--- a/com.discord/res/drawable-xhdpi/img_logo_discord_nitro_brand.png
+++ b/com.discord/res/drawable-xhdpi/img_logo_discord_nitro_brand.png
--- a/com.discord/res/drawable-xhdpi/img_logo_nitro_classic_brand.png
+++ b/com.discord/res/drawable-xhdpi/img_logo_nitro_classic_brand.png
--- a/com.discord/res/drawable-xhdpi/img_nitro_pattern.png
+++ b/com.discord/res/drawable-xhdpi/img_nitro_pattern.png
--- a/com.discord/res/drawable-xxhdpi/ic_clear_primary_300_24dp.png
+++ b/com.discord/res/drawable-xxhdpi/ic_clear_primary_300_24dp.png
--- a/com.discord/res/drawable-xxhdpi/img_games_preview.png
+++ b/com.discord/res/drawable-xxhdpi/img_games_preview.png
--- a/com.discord/res/drawable-xxhdpi/img_logo_discord_nitro_brand.png
+++ b/com.discord/res/drawable-xxhdpi/img_logo_discord_nitro_brand.png
--- a/com.discord/res/drawable-xxhdpi/img_logo_nitro_classic_brand.png
+++ b/com.discord/res/drawable-xxhdpi/img_logo_nitro_classic_brand.png
--- a/com.discord/res/drawable-xxhdpi/img_nitro_pattern.png
+++ b/com.discord/res/drawable-xxhdpi/img_nitro_pattern.png
--- a/com.discord/res/drawable-xxxhdpi/ic_clear_primary_300_24dp.png
+++ b/com.discord/res/drawable-xxxhdpi/ic_clear_primary_300_24dp.png
--- a/com.discord/res/drawable-xxxhdpi/img_logo_discord_nitro_brand.png
+++ b/com.discord/res/drawable-xxxhdpi/img_logo_discord_nitro_brand.png
--- a/com.discord/res/drawable-xxxhdpi/img_logo_nitro_classic_brand.png
+++ b/com.discord/res/drawable-xxxhdpi/img_logo_nitro_classic_brand.png
--- a/com.discord/res/drawable-xxxhdpi/img_nitro_pattern.png
+++ b/com.discord/res/drawable-xxxhdpi/img_nitro_pattern.png
--- a/com.discord/res/drawable/bg_payment_method_spinner_closed_light.xml
+++ b/com.discord/res/drawable/bg_payment_method_spinner_closed_light.xml
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <corners android:radius="2.0dip" />
+            <solid android:color="@color/primary_light_100" />
+            <stroke android:width="1.0dip" android:color="@color/primary_light_200" />
+        </shape>
+    </item>
+    <item android:gravity="center|right" android:drawable="@drawable/ic_chevron_down_dark_grey_12dp" android:right="@dimen/uikit_spacing_medium" />
+</layer-list>
--- a/com.discord/res/drawable/bg_payment_method_spinner_dropdown_light.xml
+++ b/com.discord/res/drawable/bg_payment_method_spinner_dropdown_light.xml
@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/primary_light_200" />
+</shape>
--- a/com.discord/res/drawable/img_nitro_classic_pattern.png
+++ b/com.discord/res/drawable/img_nitro_classic_pattern.png
--- a/com.discord/res/layout-v17/view_active_subscription.xml
+++ b/com.discord/res/layout-v17/view_active_subscription.xml
@ -9,10 +9,10 @@
        <Button android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/primary_100" android:id="@id/active_subscription_top_button" android:background="@drawable/drawable_uikit_primary_100_button_outline" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" android:layout_marginEnd="@dimen/uikit_spacing_medium" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.Button.Compact" />
        <ProgressBar android:theme="@style/UiKit.ProgressBar.White" android:id="@id/active_subscription_progress" android:layout_width="24.0dip" android:layout_height="24.0dip" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" android:layout_marginEnd="@dimen/uikit_spacing_medium" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" />
    </androidx.constraintlayout.widget.ConstraintLayout>
-    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/primary_400" android:id="@id/active_subscription_apple_indicator" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/billing_managed_by_apple" style="@style/UiKit.TextView" />
+    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?primary_400" android:id="@id/active_subscription_apple_indicator" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/billing_managed_by_apple" style="@style/UiKit.TextView" />
    <Button android:id="@id/active_subscriptions_bottom_button" android:layout_marginLeft="12.0dip" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="12.0dip" android:layout_marginStart="12.0dip" android:layout_marginEnd="12.0dip" style="@style/UiKit.Button.Grey" />
    <TextView android:textAppearance="@style/UiKit.Settings.Item.Header" android:id="@id/active_subscription_spinner_title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/billing_pay_for_it_with" android:layout_marginStart="@dimen/uikit_spacing_large" />
-    <Spinner android:id="@id/active_subscription_spinner" android:background="@drawable/bg_payment_method_spinner_closed" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:popupBackground="@drawable/bg_payment_method_spinner_dropdown" />
+    <Spinner android:id="@id/active_subscription_spinner" android:background="?bg_payment_method_spinner_closed" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:popupBackground="?bg_payment_method_spinner_dropdown" />
    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/status_red_500" android:id="@id/active_subscription_error_text" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" style="@style/UiKit.TextView" />
-    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/primary_400" android:id="@id/active_subscription_footer_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" android:fontFamily="@font/whitney_medium" />
+    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?primary_400" android:id="@id/active_subscription_footer_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" android:fontFamily="@font/whitney_medium" />
 </LinearLayout>
--- a/com.discord/res/layout-v17/view_gift_entitlement_list_item.xml
+++ b/com.discord/res/layout-v17/view_gift_entitlement_list_item.xml
@ -5,7 +5,7 @@
    <com.discord.app.AppViewFlipper android:id="@id/gift_entitlement_flipper" android:layout_width="fill_parent" android:layout_height="wrap_content" android:measureAllChildren="false">
        <LinearLayout android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
            <RelativeLayout android:id="@id/gift_entitlement_code_container" android:background="?primary_660_bg_outline" android:paddingLeft="@dimen/uikit_spacing_medium" android:paddingStart="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup">
-                <TextView android:textColor="?white" android:ellipsize="end" android:id="@id/gift_entitlement_code" android:layout_marginRight="@dimen/uikit_spacing_medium" android:maxLines="1" android:layout_toLeftOf="@id/gift_entitlement_copy" android:layout_alignParentLeft="true" android:layout_centerVertical="true" android:layout_marginEnd="@dimen/uikit_spacing_medium" android:layout_toStartOf="@id/gift_entitlement_copy" android:layout_alignParentStart="true" style="@style/UiKit.TextView" />
+                <TextView android:textColor="?primary_000" android:ellipsize="end" android:id="@id/gift_entitlement_code" android:layout_marginRight="@dimen/uikit_spacing_medium" android:maxLines="1" android:layout_toLeftOf="@id/gift_entitlement_copy" android:layout_alignParentLeft="true" android:layout_centerVertical="true" android:layout_marginEnd="@dimen/uikit_spacing_medium" android:layout_toStartOf="@id/gift_entitlement_copy" android:layout_alignParentStart="true" style="@style/UiKit.TextView" />
                <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/white" android:id="@id/gift_entitlement_copy" android:background="@drawable/button_brand_500" android:text="@string/copy" android:layout_alignParentRight="true" android:layout_centerVertical="true" android:textAllCaps="true" android:layout_alignParentEnd="true" style="@style/UiKit.TextView" />
            </RelativeLayout>
            <com.discord.utilities.view.text.LinkifiedTextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?primary_400" android:id="@id/gift_entitlement_revoke" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="12.0dip" style="@style/UiKit.TextView" />
--- a/com.discord/res/layout-v17/view_gift_sku_list_item.xml
+++ b/com.discord/res/layout-v17/view_gift_sku_list_item.xml
@ -3,7 +3,7 @@
  xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
    <RelativeLayout android:padding="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup">
        <com.facebook.drawee.view.SimpleDraweeView android:id="@id/gift_sku_icon" android:layout_width="32.0dip" android:layout_height="32.0dip" android:layout_marginRight="@dimen/uikit_spacing_medium" android:layout_alignParentLeft="true" android:layout_centerVertical="true" android:importantForAccessibility="no" android:layout_marginEnd="@dimen/uikit_spacing_medium" android:layout_alignParentStart="true" />
-        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?white" android:id="@id/gift_sku_name" android:layout_marginLeft="48.0dip" android:layout_alignParentLeft="true" android:layout_alignParentTop="true" android:layout_marginStart="48.0dip" android:layout_alignParentStart="true" style="@style/UiKit.TextView.Semibold" />
+        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?primary_000" android:id="@id/gift_sku_name" android:layout_marginLeft="48.0dip" android:layout_alignParentLeft="true" android:layout_alignParentTop="true" android:layout_marginStart="48.0dip" android:layout_alignParentStart="true" style="@style/UiKit.TextView.Semibold" />
        <TextView android:id="@id/gift_sku_copies" android:layout_marginLeft="48.0dip" android:layout_below="@id/gift_sku_name" android:layout_alignParentLeft="true" android:layout_marginStart="48.0dip" android:layout_alignParentStart="true" style="@style/UiKit.TextView" />
        <ImageView android:id="@id/gift_sku_arrow" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="@dimen/uikit_spacing_medium" android:src="@drawable/icon_carrot" android:layout_alignParentRight="true" android:layout_centerVertical="true" android:importantForAccessibility="no" android:layout_marginEnd="@dimen/uikit_spacing_medium" android:layout_alignParentEnd="true" />
    </RelativeLayout>
--- a/com.discord/res/layout-v17/view_no_gifts_list_item.xml
+++ b/com.discord/res/layout-v17/view_no_gifts_list_item.xml
@ -3,7 +3,7 @@
  xmlns:android="http://schemas.android.com/apk/res/android">
    <ImageView android:layout_gravity="center_vertical" android:layout_width="88.0dip" android:layout_height="40.0dip" android:layout_marginRight="@dimen/uikit_spacing_medium" android:src="@drawable/img_no_gifts" android:importantForAccessibility="no" android:layout_marginEnd="@dimen/uikit_spacing_medium" />
    <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
-        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?white" android:text="@string/gift_inventory_no_gifts" style="@style/UiKit.TextView.Semibold" />
+        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?primary_000" android:text="@string/gift_inventory_no_gifts" style="@style/UiKit.TextView.Semibold" />
        <TextView android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/gift_inventory_no_gifts_subtext_mobile" style="@style/UiKit.TextView" />
    </LinearLayout>
 </LinearLayout>
--- a/com.discord/res/layout-v17/view_premium_settings_tier_2.xml
+++ b/com.discord/res/layout-v17/view_premium_settings_tier_2.xml
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <LinearLayout android:gravity="center_vertical" android:layout_marginTop="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
+        <ImageView android:id="@id/premium_settings_nitro" android:layout_width="wrap_content" android:layout_height="70.0dip" android:src="?img_logo_discord_nitro" android:adjustViewBounds="true" android:contentDescription="@string/premium_tier_2" style="@style/UiKit.ImageView" />
+        <ImageView android:id="@id/premium_settings_nitro_wumpus" android:layout_width="wrap_content" android:layout_height="70.0dip" android:layout_marginLeft="@dimen/uikit_spacing_large" android:src="@drawable/img_wumpus_jetpack" android:adjustViewBounds="true" android:scaleX="-1.0" android:importantForAccessibility="no" android:layout_marginStart="@dimen/uikit_spacing_large" style="@style/UiKit.ImageView" />
+    </LinearLayout>
+    <TextView android:textSize="20.0sp" android:textColor="?primary_000" android:layout_marginTop="@dimen/uikit_spacing_large" android:text="@string/premium_tier_2_repositioned_title" style="@style/UiKit.TextView.Semibold" />
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?primary_200" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/premium_tier_2_repositioned_subtitle" style="@style/UiKit.TextView" />
+    <com.discord.views.BoxedButton android:gravity="center_horizontal" android:id="@id/premium_settings_premium_yearly" android:background="@drawable/button_status_green_500" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large" />
+    <Button android:id="@id/premium_settings_premium_monthly" style="@style/UiKit.Button.Grey" />
+    <TextView android:textColor="?primary_000" android:layout_gravity="center_horizontal" android:id="@id/premium_settings_premium_gift" android:background="?selectableItemBackground" android:paddingLeft="@dimen/uikit_spacing_medium" android:paddingTop="@dimen/uikit_spacing_small" android:paddingRight="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_small" android:focusable="true" android:clickable="true" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/premium_gift_send" android:textAllCaps="true" style="@style/UiKit.TextView.Semibold" />
+</LinearLayout>
--- a/com.discord/res/layout-v17/widget_guild_search_list_item.xml
+++ b/com.discord/res/layout-v17/widget_guild_search_list_item.xml
@ -2,5 +2,5 @@
 <LinearLayout android:background="?selectableItemBackground" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal"
  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/guild_search_item_avatar" app:fadeDuration="50" app:roundAsCircle="true" style="@style/UiKit.GuildsListIcon" />
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?white" android:layout_gravity="center_vertical" android:id="@id/guild_search_item_name" android:layout_marginLeft="@dimen/uikit_spacing_xxlarge" android:layout_marginStart="@dimen/uikit_spacing_xxlarge" style="@style/UiKit.TextView.Semibold" />
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?primary_000" android:layout_gravity="center_vertical" android:id="@id/guild_search_item_name" android:layout_marginLeft="@dimen/uikit_spacing_xxlarge" android:layout_marginStart="@dimen/uikit_spacing_xxlarge" style="@style/UiKit.TextView.Semibold" />
 </LinearLayout>
--- a/com.discord/res/layout-v17/widget_server_remove_boost_confirmation.xml
+++ b/com.discord/res/layout-v17/widget_server_remove_boost_confirmation.xml
@ -8,14 +8,14 @@
        <ScrollView android:layout_width="fill_parent" android:layout_height="fill_parent" android:fillViewport="true" android:layout_above="@id/boost_remove_confirmation_button_container">
            <LinearLayout android:gravity="center" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
                <ImageView android:src="@drawable/drawable_boost_remove" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
-                <TextView android:textColor="?white" android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:text="@string/premium_guild_unsubscribe_confirm_header" style="@style/UiKit.TextView.H1" />
+                <TextView android:textColor="?primary_000" android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:text="@string/premium_guild_unsubscribe_confirm_header" style="@style/UiKit.TextView.H1" />
                <TextView android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/premium_guild_unsubscribe_confirm_blurb" style="@style/UiKit.TextView" />
                <androidx.cardview.widget.CardView android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" app:cardBackgroundColor="?primary_800" app:cardCornerRadius="4.0dip" style="@style/UiKit.ViewGroup">
                    <androidx.constraintlayout.widget.ConstraintLayout android:padding="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup">
                        <com.facebook.drawee.view.SimpleDraweeView android:layout_gravity="center_vertical" android:id="@id/boost_remove_confirmation_avatar" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/Avatar.Large" />
-                        <TextView android:textColor="?white" android:ellipsize="end" android:id="@id/boost_remove_confirmation_guild_name" android:layout_width="0.0dip" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" android:maxLines="1" app:layout_constraintLeft_toRightOf="@id/boost_remove_confirmation_avatar" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.TextView.Semibold" />
+                        <TextView android:textColor="?primary_000" android:ellipsize="end" android:id="@id/boost_remove_confirmation_guild_name" android:layout_width="0.0dip" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" android:maxLines="1" app:layout_constraintLeft_toRightOf="@id/boost_remove_confirmation_avatar" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.TextView.Semibold" />
                        <androidx.cardview.widget.CardView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_small" app:cardBackgroundColor="?boost_confirmation_card_bg" app:cardCornerRadius="10.0sp" app:layout_constraintLeft_toLeftOf="@id/boost_remove_confirmation_guild_name" app:layout_constraintTop_toBottomOf="@id/boost_remove_confirmation_guild_name">
-                            <TextView android:textColor="?white" android:id="@id/boost_remove_confirmation_level_info" android:layout_marginLeft="@dimen/uikit_spacing_small" android:layout_marginRight="@dimen/uikit_spacing_medium" android:drawablePadding="@dimen/uikit_spacing_small" android:layout_marginStart="@dimen/uikit_spacing_small" android:layout_marginEnd="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView" />
+                            <TextView android:textColor="?primary_000" android:id="@id/boost_remove_confirmation_level_info" android:layout_marginLeft="@dimen/uikit_spacing_small" android:layout_marginRight="@dimen/uikit_spacing_medium" android:drawablePadding="@dimen/uikit_spacing_small" android:layout_marginStart="@dimen/uikit_spacing_small" android:layout_marginEnd="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView" />
                        </androidx.cardview.widget.CardView>
                    </androidx.constraintlayout.widget.ConstraintLayout>
                </androidx.cardview.widget.CardView>
@ -25,7 +25,7 @@
        <LinearLayout android:id="@id/boost_remove_confirmation_button_container" android:layout_margin="@dimen/uikit_spacing_large" android:layout_alignParentBottom="true" style="@style/UiKit.ViewGroup.LinearLayout">
            <TextView android:textColor="@color/status_red_500" android:id="@id/boost_remove_confirmation_error" android:visibility="invisible" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/premium_guild_subscription_remove_error_mobile" style="@style/UiKit.TextView" />
            <Button android:id="@id/boost_remove_confirmation_select" android:text="@string/premium_guild_unsubscribe_confirm_confirmation" style="@style/UiKit.Button" />
-            <TextView android:textColor="?white" android:gravity="center" android:id="@id/boost_remove_confirmation_cancel" android:background="?selectableItemBackground" android:padding="@dimen/uikit_spacing_medium" android:focusable="true" android:clickable="true" android:layout_width="fill_parent" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/cancel" android:textAllCaps="true" style="@style/UiKit.TextView" />
+            <TextView android:textColor="?primary_000" android:gravity="center" android:id="@id/boost_remove_confirmation_cancel" android:background="?selectableItemBackground" android:padding="@dimen/uikit_spacing_medium" android:focusable="true" android:clickable="true" android:layout_width="fill_parent" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/cancel" android:textAllCaps="true" style="@style/UiKit.TextView" />
        </LinearLayout>
    </RelativeLayout>
    <com.discord.utilities.dimmer.DimmerView style="@style/UiKit.DimmerView" />
--- a/com.discord/res/layout-v17/widget_settings_boost.xml
+++ b/com.discord/res/layout-v17/widget_settings_boost.xml
@ -13,7 +13,7 @@
        <ScrollView style="@style/UiKit.ViewGroup.ScrollView">
            <LinearLayout android:paddingLeft="@dimen/uikit_spacing_xlarge" android:paddingTop="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_xlarge" android:paddingBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
                <androidx.cardview.widget.CardView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_xxlarge" app:cardBackgroundColor="?primary_630" app:cardCornerRadius="4.0dip">
-                    <com.discord.utilities.view.text.LinkifiedTextView android:textColor="?white" android:id="@id/settings_boost_no_sub_banner" android:padding="@dimen/uikit_spacing_medium" android:layout_width="fill_parent" android:drawableLeft="@drawable/ic_boosted_badge_24dp" android:drawablePadding="@dimen/uikit_spacing_medium" android:lineSpacingMultiplier="1.0" android:drawableStart="@drawable/ic_boosted_badge_24dp" style="@style/UiKit.TextView" />
+                    <com.discord.utilities.view.text.LinkifiedTextView android:textColor="?primary_000" android:id="@id/settings_boost_no_sub_banner" android:padding="@dimen/uikit_spacing_medium" android:layout_width="fill_parent" android:drawableLeft="@drawable/ic_boosted_badge_24dp" android:drawablePadding="@dimen/uikit_spacing_medium" android:lineSpacingMultiplier="1.0" android:drawableStart="@drawable/ic_boosted_badge_24dp" style="@style/UiKit.TextView" />
                </androidx.cardview.widget.CardView>
                <FrameLayout style="@style/UiKit.ViewGroup">
                    <androidx.cardview.widget.CardView android:layout_marginTop="20.0dip" app:cardBackgroundColor="?primary_630" app:cardCornerRadius="4.0dip" style="@style/UiKit.ViewGroup">
@ -25,7 +25,7 @@
                    </androidx.cardview.widget.CardView>
                    <ImageView android:layout_gravity="end" android:layout_marginRight="@dimen/uikit_spacing_xlarge" android:src="@drawable/img_wumpus_jetpack" android:scaleX="-1.0" android:importantForAccessibility="no" android:layout_marginEnd="@dimen/uikit_spacing_xlarge" style="@style/UiKit.ImageView" />
                </FrameLayout>
-                <TextView android:textColor="?white" android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:text="@string/premium_guild_features_title" style="@style/UiKit.TextView.H1" />
+                <TextView android:textColor="?primary_000" android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:text="@string/premium_guild_features_title" style="@style/UiKit.TextView.H1" />
                <com.discord.app.AppTextView android:textSize="@dimen/uikit_textsize_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/premium_guild_features_blurb" app:tv_markdown_enabled="true" style="@style/UiKit.TextView" />
                <include layout="@layout/view_boost_user_settings_perks" />
                <TextView android:layout_marginTop="@dimen/uikit_spacing_large" android:text="@string/premium_guild_features_more" style="@style/UiKit.TextView" />
--- a/com.discord/res/layout-v21/widget_settings_boost.xml
+++ b/com.discord/res/layout-v21/widget_settings_boost.xml
@ -13,7 +13,7 @@
        <ScrollView style="@style/UiKit.ViewGroup.ScrollView">
            <LinearLayout android:paddingLeft="@dimen/uikit_spacing_xlarge" android:paddingTop="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_xlarge" android:paddingBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
                <androidx.cardview.widget.CardView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_xxlarge" app:cardBackgroundColor="?primary_630" app:cardCornerRadius="4.0dip">
-                    <com.discord.utilities.view.text.LinkifiedTextView android:textColor="?white" android:id="@id/settings_boost_no_sub_banner" android:padding="@dimen/uikit_spacing_medium" android:layout_width="fill_parent" android:drawableLeft="@drawable/ic_boosted_badge_24dp" android:drawablePadding="@dimen/uikit_spacing_medium" android:lineSpacingMultiplier="1.0" android:drawableStart="@drawable/ic_boosted_badge_24dp" style="@style/UiKit.TextView" />
+                    <com.discord.utilities.view.text.LinkifiedTextView android:textColor="?primary_000" android:id="@id/settings_boost_no_sub_banner" android:padding="@dimen/uikit_spacing_medium" android:layout_width="fill_parent" android:drawableLeft="@drawable/ic_boosted_badge_24dp" android:drawablePadding="@dimen/uikit_spacing_medium" android:lineSpacingMultiplier="1.0" android:drawableStart="@drawable/ic_boosted_badge_24dp" style="@style/UiKit.TextView" />
                </androidx.cardview.widget.CardView>
                <FrameLayout style="@style/UiKit.ViewGroup">
                    <androidx.cardview.widget.CardView android:layout_marginTop="20.0dip" app:cardBackgroundColor="?primary_630" app:cardCornerRadius="4.0dip" style="@style/UiKit.ViewGroup">
@ -25,7 +25,7 @@
                    </androidx.cardview.widget.CardView>
                    <ImageView android:layout_gravity="end" android:layout_marginRight="@dimen/uikit_spacing_xlarge" android:src="@drawable/img_wumpus_jetpack" android:scaleX="-1.0" android:importantForAccessibility="no" android:layout_marginEnd="@dimen/uikit_spacing_xlarge" android:elevation="6.0dip" android:outlineProvider="none" style="@style/UiKit.ImageView" />
                </FrameLayout>
-                <TextView android:textColor="?white" android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:text="@string/premium_guild_features_title" style="@style/UiKit.TextView.H1" />
+                <TextView android:textColor="?primary_000" android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:text="@string/premium_guild_features_title" style="@style/UiKit.TextView.H1" />
                <com.discord.app.AppTextView android:textSize="@dimen/uikit_textsize_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/premium_guild_features_blurb" app:tv_markdown_enabled="true" style="@style/UiKit.TextView" />
                <include layout="@layout/view_boost_user_settings_perks" />
                <TextView android:layout_marginTop="@dimen/uikit_spacing_large" android:text="@string/premium_guild_features_more" style="@style/UiKit.TextView" />
--- a/com.discord/res/layout-w400dp/view_premium_settings_games.xml
+++ b/com.discord/res/layout-w400dp/view_premium_settings_games.xml
@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_xxlarge" style="@style/UiKit.ViewGroup.LinearLayout"
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <ImageView android:layout_gravity="center_horizontal" android:layout_width="400.0dip" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large" android:src="@drawable/img_games_preview" android:adjustViewBounds="true" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
-    <Button android:layout_gravity="center_horizontal" android:id="@id/premium_perks_view_games" android:layout_marginTop="@dimen/uikit_spacing_large" android:text="@string/application_store_home_view_all_applications" style="@style/UiKit.Button.Grey.Fit" />
-</LinearLayout>
--- a/com.discord/res/layout-w400dp/view_premium_settings_tier_1.xml
+++ b/com.discord/res/layout-w400dp/view_premium_settings_tier_1.xml
@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:paddingLeft="@dimen/uikit_spacing_xxlarge" android:paddingTop="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_xxlarge" android:paddingBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout"
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <LinearLayout android:gravity="center_vertical" android:layout_marginTop="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
-        <ImageView android:id="@id/premium_settings_nitro_classic_wumpus" android:layout_width="wrap_content" android:layout_height="70.0dip" android:src="@drawable/img_wumpus_riding_wheel" android:adjustViewBounds="true" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
-        <ImageView android:id="@id/premium_settings_nitro_classic" android:layout_width="wrap_content" android:layout_height="70.0dip" android:layout_marginLeft="@dimen/uikit_spacing_large" android:src="@drawable/img_logo_nitro_classic" android:adjustViewBounds="true" android:contentDescription="@string/premium_tier_1" style="@style/UiKit.ImageView" />
-    </LinearLayout>
-    <TextView android:textSize="20.0sp" android:textColor="@color/primary_100" android:layout_marginTop="@dimen/uikit_spacing_large" android:text="@string/premium_title_mobile" style="@style/UiKit.TextView.Semibold" />
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="@color/primary_200" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/premium_subtitle_mobile" style="@style/UiKit.TextView" />
-    <LinearLayout android:layout_gravity="center_horizontal" android:layout_width="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large" android:maxWidth="600.0dip" android:minWidth="400.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
-        <Button android:id="@id/premium_settings_premium_classic_yearly" style="@style/UiKit.Button.Green" />
-        <Button android:id="@id/premium_settings_premium_classic_monthly" style="@style/UiKit.Button.Grey" />
-    </LinearLayout>
-</LinearLayout>
--- a/com.discord/res/layout-w400dp/view_premium_settings_tier_2.xml
+++ b/com.discord/res/layout-w400dp/view_premium_settings_tier_2.xml
@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:paddingLeft="@dimen/uikit_spacing_xxlarge" android:paddingTop="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_xxlarge" style="@style/UiKit.ViewGroup.LinearLayout"
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <TextView android:textSize="20.0sp" android:textColor="@color/primary_100" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/premium_game_perks_title_mobile" style="@style/UiKit.TextView.Semibold" />
-    <LinearLayout android:gravity="center_vertical" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
-        <ImageView android:layout_width="wrap_content" android:layout_height="60.0dip" android:src="@drawable/img_discord_nitro_logo_left" android:adjustViewBounds="true" android:contentDescription="@string/premium_tier_2" style="@style/UiKit.ImageView" />
-        <ImageView android:layout_width="wrap_content" android:layout_height="60.0dip" android:layout_marginLeft="@dimen/uikit_spacing_small" android:src="@drawable/img_wumpus_jetpack" android:adjustViewBounds="true" android:scaleX="-1.0" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
-    </LinearLayout>
-    <TextView android:textColor="@color/primary_100" android:gravity="center_vertical" android:text="@string/premium_features_chat_perks_mobile" android:drawableLeft="@drawable/ic_check_brand_24dp" android:drawablePadding="@dimen/uikit_spacing_large" style="@style/UiKit.TextView" />
-    <TextView android:textColor="@color/primary_100" android:gravity="center_vertical" android:text="@string/premium_features_boost_perks_mobile" android:drawableLeft="@drawable/ic_check_brand_24dp" android:drawablePadding="@dimen/uikit_spacing_large" style="@style/UiKit.TextView" />
-    <TextView android:textColor="@color/primary_100" android:gravity="center_vertical" android:text="@string/premium_features_game_perks_mobile" android:drawableLeft="@drawable/ic_check_brand_24dp" android:drawablePadding="@dimen/uikit_spacing_large" style="@style/UiKit.TextView" />
-    <LinearLayout android:layout_gravity="center_horizontal" android:layout_width="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large" android:maxWidth="600.0dip" android:minWidth="400.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
-        <Button android:id="@id/premium_settings_premium_yearly" style="@style/UiKit.Button.Green" />
-        <Button android:textColor="@drawable/button_text_color_primary_100" android:id="@id/premium_settings_premium_monthly" style="@style/UiKit.Button.Grey" />
-    </LinearLayout>
-</LinearLayout>
--- a/com.discord/res/layout/view_active_subscription.xml
+++ b/com.discord/res/layout/view_active_subscription.xml
@ -9,10 +9,10 @@
        <Button android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/primary_100" android:id="@id/active_subscription_top_button" android:background="@drawable/drawable_uikit_primary_100_button_outline" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.Button.Compact" />
        <ProgressBar android:theme="@style/UiKit.ProgressBar.White" android:id="@id/active_subscription_progress" android:layout_width="24.0dip" android:layout_height="24.0dip" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" />
    </androidx.constraintlayout.widget.ConstraintLayout>
-    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/primary_400" android:id="@id/active_subscription_apple_indicator" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/billing_managed_by_apple" style="@style/UiKit.TextView" />
+    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?primary_400" android:id="@id/active_subscription_apple_indicator" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/billing_managed_by_apple" style="@style/UiKit.TextView" />
    <Button android:id="@id/active_subscriptions_bottom_button" android:layout_marginLeft="12.0dip" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="12.0dip" style="@style/UiKit.Button.Grey" />
    <TextView android:textAppearance="@style/UiKit.Settings.Item.Header" android:id="@id/active_subscription_spinner_title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/billing_pay_for_it_with" />
-    <Spinner android:id="@id/active_subscription_spinner" android:background="@drawable/bg_payment_method_spinner_closed" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:popupBackground="@drawable/bg_payment_method_spinner_dropdown" />
+    <Spinner android:id="@id/active_subscription_spinner" android:background="?bg_payment_method_spinner_closed" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:popupBackground="?bg_payment_method_spinner_dropdown" />
    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/status_red_500" android:id="@id/active_subscription_error_text" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" style="@style/UiKit.TextView" />
-    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/primary_400" android:id="@id/active_subscription_footer_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" android:fontFamily="@font/whitney_medium" />
+    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?primary_400" android:id="@id/active_subscription_footer_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" android:fontFamily="@font/whitney_medium" />
 </LinearLayout>
--- a/com.discord/res/layout/view_boost_user_settings_perks.xml
+++ b/com.discord/res/layout/view_boost_user_settings_perks.xml
@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout"
  xmlns:android="http://schemas.android.com/apk/res/android">
-    <TextView android:textColor="?white" android:text="@string/premium_guild_features_customize_guild_mobile" android:drawableLeft="@drawable/ic_star_24dp" android:drawableStart="@drawable/ic_star_24dp" style="@style/UiKit.TextView.Perk" />
-    <TextView android:textColor="?white" android:text="@string/premium_guild_features_show_support_mobile" android:drawableLeft="@drawable/ic_guild_nitro_24dp" android:drawableStart="@drawable/ic_guild_nitro_24dp" style="@style/UiKit.TextView.Perk" />
-    <TextView android:textColor="?white" android:text="@string/premium_guild_features_upload_sizes_mobile" android:drawableLeft="@drawable/ic_upload_24dp" android:drawableStart="@drawable/ic_upload_24dp" style="@style/UiKit.TextView.Perk" />
-    <TextView android:textColor="?white" android:text="@string/premium_guild_features_new_role_mobile" android:drawableLeft="@drawable/ic_role_24dp" android:drawableStart="@drawable/ic_role_24dp" style="@style/UiKit.TextView.Perk" />
+    <TextView android:textColor="?primary_000" android:text="@string/premium_guild_features_customize_guild_mobile" android:drawableLeft="@drawable/ic_star_24dp" android:drawableStart="@drawable/ic_star_24dp" style="@style/UiKit.TextView.Perk" />
+    <TextView android:textColor="?primary_000" android:text="@string/premium_guild_features_show_support_mobile" android:drawableLeft="@drawable/ic_guild_nitro_24dp" android:drawableStart="@drawable/ic_guild_nitro_24dp" style="@style/UiKit.TextView.Perk" />
+    <TextView android:textColor="?primary_000" android:text="@string/premium_guild_features_upload_sizes_mobile" android:drawableLeft="@drawable/ic_upload_24dp" android:drawableStart="@drawable/ic_upload_24dp" style="@style/UiKit.TextView.Perk" />
+    <TextView android:textColor="?primary_000" android:text="@string/premium_guild_features_new_role_mobile" android:drawableLeft="@drawable/ic_role_24dp" android:drawableStart="@drawable/ic_role_24dp" style="@style/UiKit.TextView.Perk" />
 </LinearLayout>
--- a/com.discord/res/layout/view_gift_entitlement_list_item.xml
+++ b/com.discord/res/layout/view_gift_entitlement_list_item.xml
@ -5,7 +5,7 @@
    <com.discord.app.AppViewFlipper android:id="@id/gift_entitlement_flipper" android:layout_width="fill_parent" android:layout_height="wrap_content" android:measureAllChildren="false">
        <LinearLayout android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
            <RelativeLayout android:id="@id/gift_entitlement_code_container" android:background="?primary_660_bg_outline" android:paddingLeft="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup">
-                <TextView android:textColor="?white" android:ellipsize="end" android:id="@id/gift_entitlement_code" android:layout_marginRight="@dimen/uikit_spacing_medium" android:maxLines="1" android:layout_toLeftOf="@id/gift_entitlement_copy" android:layout_alignParentLeft="true" android:layout_centerVertical="true" style="@style/UiKit.TextView" />
+                <TextView android:textColor="?primary_000" android:ellipsize="end" android:id="@id/gift_entitlement_code" android:layout_marginRight="@dimen/uikit_spacing_medium" android:maxLines="1" android:layout_toLeftOf="@id/gift_entitlement_copy" android:layout_alignParentLeft="true" android:layout_centerVertical="true" style="@style/UiKit.TextView" />
                <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/white" android:id="@id/gift_entitlement_copy" android:background="@drawable/button_brand_500" android:text="@string/copy" android:layout_alignParentRight="true" android:layout_centerVertical="true" android:textAllCaps="true" style="@style/UiKit.TextView" />
            </RelativeLayout>
            <com.discord.utilities.view.text.LinkifiedTextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?primary_400" android:id="@id/gift_entitlement_revoke" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="12.0dip" style="@style/UiKit.TextView" />
--- a/com.discord/res/layout/view_gift_sku_list_item.xml
+++ b/com.discord/res/layout/view_gift_sku_list_item.xml
@ -3,7 +3,7 @@
  xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
    <RelativeLayout android:padding="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup">
        <com.facebook.drawee.view.SimpleDraweeView android:id="@id/gift_sku_icon" android:layout_width="32.0dip" android:layout_height="32.0dip" android:layout_marginRight="@dimen/uikit_spacing_medium" android:layout_alignParentLeft="true" android:layout_centerVertical="true" android:importantForAccessibility="no" />
-        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?white" android:id="@id/gift_sku_name" android:layout_marginLeft="48.0dip" android:layout_alignParentLeft="true" android:layout_alignParentTop="true" style="@style/UiKit.TextView.Semibold" />
+        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?primary_000" android:id="@id/gift_sku_name" android:layout_marginLeft="48.0dip" android:layout_alignParentLeft="true" android:layout_alignParentTop="true" style="@style/UiKit.TextView.Semibold" />
        <TextView android:id="@id/gift_sku_copies" android:layout_marginLeft="48.0dip" android:layout_below="@id/gift_sku_name" android:layout_alignParentLeft="true" style="@style/UiKit.TextView" />
        <ImageView android:id="@id/gift_sku_arrow" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="@dimen/uikit_spacing_medium" android:src="@drawable/icon_carrot" android:layout_alignParentRight="true" android:layout_centerVertical="true" android:importantForAccessibility="no" />
    </RelativeLayout>
--- a/com.discord/res/layout/view_no_gifts_list_item.xml
+++ b/com.discord/res/layout/view_no_gifts_list_item.xml
@ -3,7 +3,7 @@
  xmlns:android="http://schemas.android.com/apk/res/android">
    <ImageView android:layout_gravity="center_vertical" android:layout_width="88.0dip" android:layout_height="40.0dip" android:layout_marginRight="@dimen/uikit_spacing_medium" android:src="@drawable/img_no_gifts" android:importantForAccessibility="no" />
    <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
-        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?white" android:text="@string/gift_inventory_no_gifts" style="@style/UiKit.TextView.Semibold" />
+        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?primary_000" android:text="@string/gift_inventory_no_gifts" style="@style/UiKit.TextView.Semibold" />
        <TextView android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/gift_inventory_no_gifts_subtext_mobile" style="@style/UiKit.TextView" />
    </LinearLayout>
 </LinearLayout>
--- a/com.discord/res/layout/view_premium_settings_games.xml
+++ b/com.discord/res/layout/view_premium_settings_games.xml
@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_xxlarge" style="@style/UiKit.ViewGroup.LinearLayout"
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <ImageView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large" android:src="@drawable/img_games_preview" android:adjustViewBounds="true" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
-    <Button android:layout_gravity="center_horizontal" android:id="@id/premium_perks_view_games" android:layout_marginTop="@dimen/uikit_spacing_large" android:text="@string/application_store_home_view_all_applications" style="@style/UiKit.Button.Grey.Fit" />
-</LinearLayout>
--- a/com.discord/res/layout/view_premium_settings_perks.xml
+++ b/com.discord/res/layout/view_premium_settings_perks.xml
@ -1,19 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:layout_marginLeft="@dimen/uikit_spacing_xxlarge" android:layout_marginRight="@dimen/uikit_spacing_xxlarge" android:layout_marginBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout"
+<LinearLayout android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout"
  xmlns:android="http://schemas.android.com/apk/res/android">
-    <TextView android:textSize="20.0sp" android:textColor="@color/primary_100" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_medium" android:text="@string/premium_included" style="@style/UiKit.TextView.Semibold" />
+    <TextView android:textSize="20.0sp" android:textColor="?primary_000" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_medium" android:text="@string/premium_included" style="@style/UiKit.TextView.Semibold" />
    <TextView android:text="@string/premium_chat_perks_discriminator_mobile" android:drawableLeft="@drawable/ic_nitro_tag_24dp" android:drawableStart="@drawable/ic_nitro_tag_24dp" style="@style/UiKit.TextView.Perk" />
-    <View android:background="@color/primary_700" style="@style/UiKit.Divider" />
    <TextView android:text="@string/premium_chat_perks_animated_avatar_and_emoji_mobile" android:drawableLeft="@drawable/ic_nitro_gifs_24dp" android:drawableStart="@drawable/ic_nitro_gifs_24dp" style="@style/UiKit.TextView.Perk" />
-    <View android:background="@color/primary_700" style="@style/UiKit.Divider" />
    <TextView android:text="@string/premium_chat_perks_streaming_mobile" android:drawableLeft="@drawable/ic_nitro_perk_stream_24dp" android:drawableStart="@drawable/ic_nitro_perk_stream_24dp" style="@style/UiKit.TextView.Perk" />
-    <View android:background="@color/primary_700" style="@style/UiKit.Divider" />
    <TextView android:text="@string/premium_chat_perks_screenshare_mobile" android:drawableLeft="@drawable/ic_nitro_highquality_24dp" android:drawableStart="@drawable/ic_nitro_highquality_24dp" style="@style/UiKit.TextView.Perk" />
-    <View android:background="@color/primary_700" style="@style/UiKit.Divider" />
    <TextView android:text="@string/premium_chat_perks_custom_emoji_mobile" android:drawableLeft="@drawable/ic_nitro_globalemojis_24dp" android:drawableStart="@drawable/ic_nitro_globalemojis_24dp" style="@style/UiKit.TextView.Perk" />
-    <View android:background="@color/primary_700" style="@style/UiKit.Divider" />
    <TextView android:id="@id/premium_perks_upload_text" android:text="@string/premium_chat_perks_upload_mobile" android:drawableLeft="@drawable/ic_upload_24dp" android:drawableStart="@drawable/ic_upload_24dp" style="@style/UiKit.TextView.Perk" />
-    <View android:background="@color/primary_700" style="@style/UiKit.Divider" />
    <TextView android:text="@string/premium_chat_perks_rep_mobile" android:drawableLeft="@drawable/ic_nitro_rep_24dp" android:drawableStart="@drawable/ic_nitro_rep_24dp" style="@style/UiKit.TextView.Perk" />
-    <View android:background="@color/primary_700" style="@style/UiKit.Divider" />
+    <TextView android:text="@string/premium_chat_perks_premium_guild_subscription" android:drawableLeft="@drawable/ic_boosted_badge_24dp" android:drawableStart="@drawable/ic_boosted_badge_24dp" style="@style/UiKit.TextView.Perk" />
 </LinearLayout>
--- a/com.discord/res/layout/view_premium_settings_tier_1.xml
+++ b/com.discord/res/layout/view_premium_settings_tier_1.xml
@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:paddingLeft="@dimen/uikit_spacing_xxlarge" android:paddingTop="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_xxlarge" android:paddingBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout"
+<LinearLayout android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout"
  xmlns:android="http://schemas.android.com/apk/res/android">
+    <TextView android:textSize="20.0sp" android:textColor="?primary_000" android:layout_marginTop="@dimen/uikit_spacing_large" android:text="@string/premium_chat_perks_simple_title_mobile" style="@style/UiKit.TextView.Semibold" />
    <LinearLayout android:gravity="center_vertical" android:layout_marginTop="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
        <ImageView android:id="@id/premium_settings_nitro_classic_wumpus" android:layout_width="wrap_content" android:layout_height="70.0dip" android:src="@drawable/img_wumpus_riding_wheel" android:adjustViewBounds="true" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
-        <ImageView android:id="@id/premium_settings_nitro_classic" android:layout_width="wrap_content" android:layout_height="70.0dip" android:layout_marginLeft="@dimen/uikit_spacing_large" android:src="@drawable/img_logo_nitro_classic" android:adjustViewBounds="true" android:contentDescription="@string/premium_tier_1" style="@style/UiKit.ImageView" />
-    </LinearLayout>
-    <TextView android:textSize="20.0sp" android:textColor="@color/primary_100" android:layout_marginTop="@dimen/uikit_spacing_large" android:text="@string/premium_title_mobile" style="@style/UiKit.TextView.Semibold" />
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="@color/primary_200" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/premium_subtitle_mobile" style="@style/UiKit.TextView" />
-    <LinearLayout android:layout_marginTop="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
-        <Button android:id="@id/premium_settings_premium_classic_yearly" style="@style/UiKit.Button.Green" />
-        <Button android:id="@id/premium_settings_premium_classic_monthly" style="@style/UiKit.Button.Grey" />
+        <ImageView android:id="@id/premium_settings_nitro_classic" android:layout_width="wrap_content" android:layout_height="70.0dip" android:layout_marginLeft="@dimen/uikit_spacing_large" android:src="?img_logo_discord_nitro_classic" android:adjustViewBounds="true" android:contentDescription="@string/premium_tier_1" style="@style/UiKit.ImageView" />
    </LinearLayout>
+    <TextView android:textColor="?primary_000" android:layout_marginTop="@dimen/uikit_spacing_large" android:text="@string/premium_features_enhanced_chat_perks" android:drawableLeft="@drawable/ic_check_brand_24dp" android:drawablePadding="@dimen/uikit_spacing_large" android:drawableStart="@drawable/ic_check_brand_24dp" style="@style/UiKit.TextView" />
+    <TextView android:textColor="?primary_000" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/premium_features_premium_guild_subscriptions" android:drawableLeft="@drawable/ic_clear_primary_300_24dp" android:drawablePadding="@dimen/uikit_spacing_large" android:drawableStart="@drawable/ic_clear_primary_300_24dp" style="@style/UiKit.TextView" />
+    <com.discord.views.BoxedButton android:gravity="center_horizontal" android:id="@id/premium_settings_premium_classic_yearly" android:background="@drawable/button_status_green_500" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large" />
+    <Button android:id="@id/premium_settings_premium_classic_monthly" style="@style/UiKit.Button.Grey" />
+    <TextView android:textColor="?primary_000" android:layout_gravity="center_horizontal" android:id="@id/premium_settings_premium_classic_gift" android:background="?selectableItemBackground" android:paddingLeft="@dimen/uikit_spacing_medium" android:paddingTop="@dimen/uikit_spacing_small" android:paddingRight="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_small" android:focusable="true" android:clickable="true" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/premium_gift_send" android:textAllCaps="true" style="@style/UiKit.TextView.Semibold" />
 </LinearLayout>
--- a/com.discord/res/layout/view_premium_settings_tier_2.xml
+++ b/com.discord/res/layout/view_premium_settings_tier_2.xml
@ -1,16 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:paddingLeft="@dimen/uikit_spacing_xxlarge" android:paddingTop="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_xxlarge" style="@style/UiKit.ViewGroup.LinearLayout"
+<LinearLayout android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout"
  xmlns:android="http://schemas.android.com/apk/res/android">
-    <TextView android:textSize="20.0sp" android:textColor="@color/primary_100" android:text="@string/premium_game_perks_title_mobile" style="@style/UiKit.TextView.Semibold" />
-    <LinearLayout android:gravity="center_vertical" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
-        <ImageView android:layout_width="wrap_content" android:layout_height="60.0dip" android:src="@drawable/img_discord_nitro_logo_left" android:adjustViewBounds="true" android:contentDescription="@string/premium_tier_2" style="@style/UiKit.ImageView" />
-        <ImageView android:layout_width="wrap_content" android:layout_height="60.0dip" android:layout_marginLeft="@dimen/uikit_spacing_small" android:src="@drawable/img_wumpus_jetpack" android:adjustViewBounds="true" android:scaleX="-1.0" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
-    </LinearLayout>
-    <TextView android:textColor="@color/primary_100" android:gravity="center_vertical" android:text="@string/premium_features_chat_perks_mobile" android:drawableLeft="@drawable/ic_check_brand_24dp" android:drawablePadding="@dimen/uikit_spacing_large" style="@style/UiKit.TextView" />
-    <TextView android:textColor="@color/primary_100" android:gravity="center_vertical" android:text="@string/premium_features_boost_perks_mobile" android:drawableLeft="@drawable/ic_check_brand_24dp" android:drawablePadding="@dimen/uikit_spacing_large" style="@style/UiKit.TextView" />
-    <TextView android:textColor="@color/primary_100" android:gravity="center_vertical" android:text="@string/premium_features_game_perks_mobile" android:drawableLeft="@drawable/ic_check_brand_24dp" android:drawablePadding="@dimen/uikit_spacing_large" style="@style/UiKit.TextView" />
-    <LinearLayout android:layout_marginTop="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
-        <Button android:id="@id/premium_settings_premium_yearly" android:maxWidth="200.0dip" style="@style/UiKit.Button.Green" />
-        <Button android:textColor="@drawable/button_text_color_primary_100" android:id="@id/premium_settings_premium_monthly" android:maxWidth="200.0dip" style="@style/UiKit.Button.Grey" />
+    <LinearLayout android:gravity="center_vertical" android:layout_marginTop="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
+        <ImageView android:id="@id/premium_settings_nitro" android:layout_width="wrap_content" android:layout_height="70.0dip" android:src="?img_logo_discord_nitro" android:adjustViewBounds="true" android:contentDescription="@string/premium_tier_2" style="@style/UiKit.ImageView" />
+        <ImageView android:id="@id/premium_settings_nitro_wumpus" android:layout_width="wrap_content" android:layout_height="70.0dip" android:layout_marginLeft="@dimen/uikit_spacing_large" android:src="@drawable/img_wumpus_jetpack" android:adjustViewBounds="true" android:scaleX="-1.0" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
    </LinearLayout>
+    <TextView android:textSize="20.0sp" android:textColor="?primary_000" android:layout_marginTop="@dimen/uikit_spacing_large" android:text="@string/premium_tier_2_repositioned_title" style="@style/UiKit.TextView.Semibold" />
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?primary_200" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/premium_tier_2_repositioned_subtitle" style="@style/UiKit.TextView" />
+    <com.discord.views.BoxedButton android:gravity="center_horizontal" android:id="@id/premium_settings_premium_yearly" android:background="@drawable/button_status_green_500" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large" />
+    <Button android:id="@id/premium_settings_premium_monthly" style="@style/UiKit.Button.Grey" />
+    <TextView android:textColor="?primary_000" android:layout_gravity="center_horizontal" android:id="@id/premium_settings_premium_gift" android:background="?selectableItemBackground" android:paddingLeft="@dimen/uikit_spacing_medium" android:paddingTop="@dimen/uikit_spacing_small" android:paddingRight="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_small" android:focusable="true" android:clickable="true" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/premium_gift_send" android:textAllCaps="true" style="@style/UiKit.TextView.Semibold" />
 </LinearLayout>
--- a/com.discord/res/layout/view_settings_boost_info_listitem.xml
+++ b/com.discord/res/layout/view_settings_boost_info_listitem.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout android:id="@id/boost_info_container" android:background="?primary_700" style="@style/UiKit.ViewGroup"
  xmlns:android="http://schemas.android.com/apk/res/android">
-    <TextView android:textColor="?white" android:id="@id/boost_info_text" 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_medium" style="@style/UiKit.TextView" />
+    <TextView android:textColor="?primary_000" android:id="@id/boost_info_text" 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_medium" style="@style/UiKit.TextView" />
 </FrameLayout>
--- a/com.discord/res/layout/view_settings_boosted_guild_listitem.xml
+++ b/com.discord/res/layout/view_settings_boosted_guild_listitem.xml
@ -6,16 +6,16 @@
        <View android:id="@id/boosted_guild_gradient" android:background="@color/primary_700" android:layout_width="fill_parent" android:layout_height="0.0dip" android:alpha="0.65" app:layout_constraintBottom_toBottomOf="@id/boosted_guild_banner" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="@id/boosted_guild_banner" />
        <LinearLayout android:gravity="center" android:background="?primary_800_circle" android:layout_width="80.0dip" android:layout_height="80.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.ViewGroup.LinearLayout">
            <ImageView android:id="@id/boosted_guild_gem_icon" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
-            <TextView android:textColor="?white" android:id="@id/boosted_guild_level_text" android:textAllCaps="true" style="@style/UiKit.TextView.Bold" />
+            <TextView android:textColor="?primary_000" android:id="@id/boosted_guild_level_text" android:textAllCaps="true" style="@style/UiKit.TextView.Bold" />
        </LinearLayout>
        <ProgressBar android:id="@id/boosted_guild_progress" android:layout_width="92.0dip" android:layout_height="92.0dip" android:progressDrawable="@drawable/drawable_boost_progress_ring" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" style="?android:progressBarStyleHorizontal" />
    </androidx.constraintlayout.widget.ConstraintLayout>
    <LinearLayout android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
        <com.facebook.drawee.view.SimpleDraweeView android:layout_gravity="center_vertical" android:id="@id/boosted_guild_icon" android:layout_marginRight="@dimen/uikit_spacing_medium" style="@style/UiKit.GuildsListIcon" />
        <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
-            <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?white" android:ellipsize="end" android:id="@id/boosted_guild_name" android:maxLines="1" style="@style/UiKit.TextView.Semibold" />
+            <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?primary_000" android:ellipsize="end" android:id="@id/boosted_guild_name" android:maxLines="1" style="@style/UiKit.TextView.Semibold" />
            <androidx.cardview.widget.CardView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_small" app:cardBackgroundColor="?primary_700" app:cardCornerRadius="14.0sp">
-                <TextView android:textColor="?white" android:id="@id/boosted_guild_time" android:paddingTop="@dimen/uikit_spacing_small" android:paddingBottom="@dimen/uikit_spacing_small" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" android:drawableLeft="@drawable/ic_boosted_badge_12dp" android:drawablePadding="@dimen/uikit_spacing_small" style="@style/UiKit.TextView" />
+                <TextView android:textColor="?primary_000" android:id="@id/boosted_guild_time" android:paddingTop="@dimen/uikit_spacing_small" android:paddingBottom="@dimen/uikit_spacing_small" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" android:drawableLeft="@drawable/ic_boosted_badge_12dp" android:drawablePadding="@dimen/uikit_spacing_small" style="@style/UiKit.TextView" />
            </androidx.cardview.widget.CardView>
        </LinearLayout>
    </LinearLayout>
--- a/com.discord/res/layout/widget_guild_search_list_item.xml
+++ b/com.discord/res/layout/widget_guild_search_list_item.xml
@ -2,5 +2,5 @@
 <LinearLayout android:background="?selectableItemBackground" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal"
  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/guild_search_item_avatar" app:fadeDuration="50" app:roundAsCircle="true" style="@style/UiKit.GuildsListIcon" />
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?white" android:layout_gravity="center_vertical" android:id="@id/guild_search_item_name" android:layout_marginLeft="@dimen/uikit_spacing_xxlarge" style="@style/UiKit.TextView.Semibold" />
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?primary_000" android:layout_gravity="center_vertical" android:id="@id/guild_search_item_name" android:layout_marginLeft="@dimen/uikit_spacing_xxlarge" style="@style/UiKit.TextView.Semibold" />
 </LinearLayout>
--- a/com.discord/res/layout/widget_server_boost_confirmation.xml
+++ b/com.discord/res/layout/widget_server_boost_confirmation.xml
@ -14,9 +14,9 @@
                    <androidx.cardview.widget.CardView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" app:cardBackgroundColor="?primary_800" app:cardCornerRadius="4.0dip">
                        <androidx.constraintlayout.widget.ConstraintLayout android:padding="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:layout_height="wrap_content">
                            <com.facebook.drawee.view.SimpleDraweeView android:layout_gravity="center_vertical" android:id="@id/boost_confirmation_avatar" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/Avatar.Large" />
-                            <TextView android:textColor="?white" android:ellipsize="end" android:id="@id/boost_confirmation_guild_name" android:layout_width="0.0dip" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" android:maxLines="1" app:layout_constraintLeft_toRightOf="@id/boost_confirmation_avatar" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.TextView.Semibold" />
+                            <TextView android:textColor="?primary_000" android:ellipsize="end" android:id="@id/boost_confirmation_guild_name" android:layout_width="0.0dip" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" android:maxLines="1" app:layout_constraintLeft_toRightOf="@id/boost_confirmation_avatar" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.TextView.Semibold" />
                            <androidx.cardview.widget.CardView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_small" app:cardBackgroundColor="?boost_confirmation_card_bg" app:cardCornerRadius="10.0sp" app:layout_constraintLeft_toLeftOf="@id/boost_confirmation_guild_name" app:layout_constraintTop_toBottomOf="@id/boost_confirmation_guild_name">
-                                <TextView android:textColor="?white" android:id="@id/boost_confirmation_level_info" android:layout_marginLeft="@dimen/uikit_spacing_small" android:layout_marginRight="@dimen/uikit_spacing_medium" android:drawablePadding="@dimen/uikit_spacing_small" style="@style/UiKit.TextView" />
+                                <TextView android:textColor="?primary_000" android:id="@id/boost_confirmation_level_info" android:layout_marginLeft="@dimen/uikit_spacing_small" android:layout_marginRight="@dimen/uikit_spacing_medium" android:drawablePadding="@dimen/uikit_spacing_small" style="@style/UiKit.TextView" />
                            </androidx.cardview.widget.CardView>
                        </androidx.constraintlayout.widget.ConstraintLayout>
                    </androidx.cardview.widget.CardView>
@ -26,13 +26,13 @@
            <LinearLayout android:id="@id/boost_confirmation_button_container" android:layout_margin="@dimen/uikit_spacing_large" android:layout_alignParentBottom="true" style="@style/UiKit.ViewGroup.LinearLayout">
                <TextView android:textColor="@color/status_red_500" android:id="@id/boost_confirmation_error" android:visibility="invisible" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/premium_guild_subscription_error_mobile" style="@style/UiKit.TextView" />
                <Button android:id="@id/boost_confirmation_select" android:text="@string/premium_guild_subscribe_confirm_confirmation" style="@style/UiKit.Button" />
-                <TextView android:textColor="?white" android:gravity="center" android:id="@id/boost_confirmation_cancel" android:background="?selectableItemBackground" android:padding="@dimen/uikit_spacing_medium" android:focusable="true" android:clickable="true" android:layout_width="fill_parent" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/cancel" android:textAllCaps="true" style="@style/UiKit.TextView" />
+                <TextView android:textColor="?primary_000" android:gravity="center" android:id="@id/boost_confirmation_cancel" android:background="?selectableItemBackground" android:padding="@dimen/uikit_spacing_medium" android:focusable="true" android:clickable="true" android:layout_width="fill_parent" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/cancel" android:textAllCaps="true" style="@style/UiKit.TextView" />
            </LinearLayout>
        </RelativeLayout>
        <RelativeLayout android:layout_width="fill_parent" android:layout_height="fill_parent">
            <LinearLayout android:gravity="center" android:layout_height="fill_parent" android:layout_above="@id/boost_confirmation_close" android:layout_centerInParent="true" style="@style/UiKit.ViewGroup.LinearLayout">
                <com.airbnb.lottie.LottieAnimationView android:layout_gravity="center_horizontal" android:id="@id/boost_confirmation_lottie" android:layout_width="300.0dip" android:layout_height="200.0dip" app:lottie_fileName="?anim_boost_confirmation" style="@style/UiKit.LottieAnimationView" />
-                <TextView android:textSize="20.0sp" android:textColor="?white" android:layout_gravity="center_horizontal" android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:text="@string/premium_guild_subscribe_success_thanks" style="@style/UiKit.TextView" />
+                <TextView android:textSize="20.0sp" android:textColor="?primary_000" android:layout_gravity="center_horizontal" android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:text="@string/premium_guild_subscribe_success_thanks" style="@style/UiKit.TextView" />
            </LinearLayout>
            <Button android:id="@id/boost_confirmation_close" android:layout_margin="@dimen/uikit_spacing_large" android:text="@string/close" android:layout_alignParentBottom="true" style="@style/UiKit.Button.Grey" />
        </RelativeLayout>
--- a/com.discord/res/layout/widget_server_remove_boost_confirmation.xml
+++ b/com.discord/res/layout/widget_server_remove_boost_confirmation.xml
@ -8,14 +8,14 @@
        <ScrollView android:layout_width="fill_parent" android:layout_height="fill_parent" android:fillViewport="true" android:layout_above="@id/boost_remove_confirmation_button_container">
            <LinearLayout android:gravity="center" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
                <ImageView android:src="@drawable/drawable_boost_remove" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
-                <TextView android:textColor="?white" android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:text="@string/premium_guild_unsubscribe_confirm_header" style="@style/UiKit.TextView.H1" />
+                <TextView android:textColor="?primary_000" android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:text="@string/premium_guild_unsubscribe_confirm_header" style="@style/UiKit.TextView.H1" />
                <TextView android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/premium_guild_unsubscribe_confirm_blurb" style="@style/UiKit.TextView" />
                <androidx.cardview.widget.CardView android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" app:cardBackgroundColor="?primary_800" app:cardCornerRadius="4.0dip" style="@style/UiKit.ViewGroup">
                    <androidx.constraintlayout.widget.ConstraintLayout android:padding="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup">
                        <com.facebook.drawee.view.SimpleDraweeView android:layout_gravity="center_vertical" android:id="@id/boost_remove_confirmation_avatar" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/Avatar.Large" />
-                        <TextView android:textColor="?white" android:ellipsize="end" android:id="@id/boost_remove_confirmation_guild_name" android:layout_width="0.0dip" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" android:maxLines="1" app:layout_constraintLeft_toRightOf="@id/boost_remove_confirmation_avatar" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.TextView.Semibold" />
+                        <TextView android:textColor="?primary_000" android:ellipsize="end" android:id="@id/boost_remove_confirmation_guild_name" android:layout_width="0.0dip" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" android:maxLines="1" app:layout_constraintLeft_toRightOf="@id/boost_remove_confirmation_avatar" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.TextView.Semibold" />
                        <androidx.cardview.widget.CardView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_small" app:cardBackgroundColor="?boost_confirmation_card_bg" app:cardCornerRadius="10.0sp" app:layout_constraintLeft_toLeftOf="@id/boost_remove_confirmation_guild_name" app:layout_constraintTop_toBottomOf="@id/boost_remove_confirmation_guild_name">
-                            <TextView android:textColor="?white" android:id="@id/boost_remove_confirmation_level_info" android:layout_marginLeft="@dimen/uikit_spacing_small" android:layout_marginRight="@dimen/uikit_spacing_medium" android:drawablePadding="@dimen/uikit_spacing_small" style="@style/UiKit.TextView" />
+                            <TextView android:textColor="?primary_000" android:id="@id/boost_remove_confirmation_level_info" android:layout_marginLeft="@dimen/uikit_spacing_small" android:layout_marginRight="@dimen/uikit_spacing_medium" android:drawablePadding="@dimen/uikit_spacing_small" style="@style/UiKit.TextView" />
                        </androidx.cardview.widget.CardView>
                    </androidx.constraintlayout.widget.ConstraintLayout>
                </androidx.cardview.widget.CardView>
@ -25,7 +25,7 @@
        <LinearLayout android:id="@id/boost_remove_confirmation_button_container" android:layout_margin="@dimen/uikit_spacing_large" android:layout_alignParentBottom="true" style="@style/UiKit.ViewGroup.LinearLayout">
            <TextView android:textColor="@color/status_red_500" android:id="@id/boost_remove_confirmation_error" android:visibility="invisible" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/premium_guild_subscription_remove_error_mobile" style="@style/UiKit.TextView" />
            <Button android:id="@id/boost_remove_confirmation_select" android:text="@string/premium_guild_unsubscribe_confirm_confirmation" style="@style/UiKit.Button" />
-            <TextView android:textColor="?white" android:gravity="center" android:id="@id/boost_remove_confirmation_cancel" android:background="?selectableItemBackground" android:padding="@dimen/uikit_spacing_medium" android:focusable="true" android:clickable="true" android:layout_width="fill_parent" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/cancel" android:textAllCaps="true" style="@style/UiKit.TextView" />
+            <TextView android:textColor="?primary_000" android:gravity="center" android:id="@id/boost_remove_confirmation_cancel" android:background="?selectableItemBackground" android:padding="@dimen/uikit_spacing_medium" android:focusable="true" android:clickable="true" android:layout_width="fill_parent" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/cancel" android:textAllCaps="true" style="@style/UiKit.TextView" />
        </LinearLayout>
    </RelativeLayout>
    <com.discord.utilities.dimmer.DimmerView style="@style/UiKit.DimmerView" />
--- a/com.discord/res/layout/widget_server_settings_members.xml
+++ b/com.discord/res/layout/widget_server_settings_members.xml
@ -6,7 +6,7 @@
        <LinearLayout android:gravity="center_vertical" android:id="@id/server_settings_members_header_container" android:background="@drawable/drawable_uikit_primary_100_bg_dark" android:padding="@dimen/uikit_spacing_medium" android:layout_marginLeft="10.0dip" android:layout_marginRight="10.0dip" android:layout_marginBottom="10.0dip" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
            <EditText android:textColor="@color/primary_500" android:id="@id/server_settings_members_name_search" android:padding="0.0dip" android:layout_width="0.0dip" android:hint="@string/members_search_placeholder" android:singleLine="true" android:maxLength="20" android:drawableLeft="@drawable/ic_search" android:drawablePadding="@dimen/uikit_spacing_medium" android:layout_weight="5.0" android:inputType="textNoSuggestions" android:imeOptions="actionDone" android:drawableStart="@drawable/ic_search" style="@style/UiKit.EditText.Themed" />
            <View style="@style/UiKit.Divider.Vertical" />
-            <Spinner android:theme="@style/AppTheme.Light.Legacy" android:gravity="center" android:id="@id/server_settings_members_roles_spinner" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_weight="3.0" />
+            <Spinner android:theme="@style/AppTheme.Light" android:gravity="center" android:id="@id/server_settings_members_roles_spinner" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_weight="3.0" />
        </LinearLayout>
    </com.google.android.material.appbar.AppBarLayout>
    <com.discord.app.AppViewFlipper android:id="@id/server_settings_members_view_flipper" android:inAnimation="@android:anim/fade_in" android:outAnimation="@android:anim/fade_out" style="@style/UiKit.ViewGroup.RelativeLayout.AppBarScrollingViewBehavior">
--- a/com.discord/res/layout/widget_settings.xml
+++ b/com.discord/res/layout/widget_settings.xml
@ -20,7 +20,7 @@
                <TextView android:text="@string/premium_settings" style="@style/UiKit.Settings.Item.Header" />
                <TextView android:textColor="@color/brand_500" android:id="@id/settings_nitro" android:drawableLeft="@drawable/ic_nitro_rep" android:drawableStart="@drawable/ic_nitro_rep" style="@style/UiKit.Settings.Item.Icon" />
                <TextView android:id="@id/settings_nitro_boosting" android:text="@string/premium_guild_subscription_title" android:drawableLeft="?ic_settings_boost_a60" android:drawableStart="?ic_settings_boost_a60" style="@style/UiKit.Settings.Item.Icon" />
-                <TextView android:id="@id/settings_nitro_gifting" android:visibility="gone" android:text="@string/premium_gifting_title" android:drawableLeft="?ic_settings_gifting_a60" android:drawableStart="?ic_settings_gifting_a60" style="@style/UiKit.Settings.Item.Icon" />
+                <TextView android:id="@id/settings_nitro_gifting" android:text="@string/premium_gifting_title" android:drawableLeft="?ic_settings_gifting_a60" android:drawableStart="?ic_settings_gifting_a60" style="@style/UiKit.Settings.Item.Icon" />
            </LinearLayout>
            <View style="@style/UiKit.Settings.Divider" />
            <TextView android:text="@string/app_settings" style="@style/UiKit.Settings.Item.Header" />
--- a/com.discord/res/layout/widget_settings_boost.xml
+++ b/com.discord/res/layout/widget_settings_boost.xml
@ -13,7 +13,7 @@
        <ScrollView style="@style/UiKit.ViewGroup.ScrollView">
            <LinearLayout android:paddingLeft="@dimen/uikit_spacing_xlarge" android:paddingTop="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_xlarge" android:paddingBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
                <androidx.cardview.widget.CardView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_xxlarge" app:cardBackgroundColor="?primary_630" app:cardCornerRadius="4.0dip">
-                    <com.discord.utilities.view.text.LinkifiedTextView android:textColor="?white" android:id="@id/settings_boost_no_sub_banner" android:padding="@dimen/uikit_spacing_medium" android:layout_width="fill_parent" android:drawableLeft="@drawable/ic_boosted_badge_24dp" android:drawablePadding="@dimen/uikit_spacing_medium" android:lineSpacingMultiplier="1.0" android:drawableStart="@drawable/ic_boosted_badge_24dp" style="@style/UiKit.TextView" />
+                    <com.discord.utilities.view.text.LinkifiedTextView android:textColor="?primary_000" android:id="@id/settings_boost_no_sub_banner" android:padding="@dimen/uikit_spacing_medium" android:layout_width="fill_parent" android:drawableLeft="@drawable/ic_boosted_badge_24dp" android:drawablePadding="@dimen/uikit_spacing_medium" android:lineSpacingMultiplier="1.0" android:drawableStart="@drawable/ic_boosted_badge_24dp" style="@style/UiKit.TextView" />
                </androidx.cardview.widget.CardView>
                <FrameLayout style="@style/UiKit.ViewGroup">
                    <androidx.cardview.widget.CardView android:layout_marginTop="20.0dip" app:cardBackgroundColor="?primary_630" app:cardCornerRadius="4.0dip" style="@style/UiKit.ViewGroup">
@ -25,7 +25,7 @@
                    </androidx.cardview.widget.CardView>
                    <ImageView android:layout_gravity="end" android:layout_marginRight="@dimen/uikit_spacing_xlarge" android:src="@drawable/img_wumpus_jetpack" android:scaleX="-1.0" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
                </FrameLayout>
-                <TextView android:textColor="?white" android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:text="@string/premium_guild_features_title" style="@style/UiKit.TextView.H1" />
+                <TextView android:textColor="?primary_000" android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:text="@string/premium_guild_features_title" style="@style/UiKit.TextView.H1" />
                <com.discord.app.AppTextView android:textSize="@dimen/uikit_textsize_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/premium_guild_features_blurb" app:tv_markdown_enabled="true" style="@style/UiKit.TextView" />
                <include layout="@layout/view_boost_user_settings_perks" />
                <TextView android:layout_marginTop="@dimen/uikit_spacing_large" android:text="@string/premium_guild_features_more" style="@style/UiKit.TextView" />
--- a/com.discord/res/layout/widget_settings_premium.xml
+++ b/com.discord/res/layout/widget_settings_premium.xml
@ -8,14 +8,14 @@
        <ScrollView android:id="@id/premium_settings_scrollview" style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
            <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="fill_parent" android:layout_height="wrap_content">
                <ImageView android:layout_gravity="top" android:background="@drawable/img_nitro_pattern" android:layout_width="fill_parent" android:layout_height="270.0sp" android:importantForAccessibility="no" app:layout_constraintTop_toTopOf="parent" />
+                <ImageView android:layout_gravity="top" android:background="@drawable/img_nitro_classic_pattern" android:layout_width="fill_parent" android:layout_height="270.0sp" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="parent" />
                <LinearLayout android:layout_width="0.0dip" android:layout_marginTop="@dimen/uikit_spacing_xlarge" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintWidth_max="500.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
-                    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/primary_100" android:id="@id/premium_settings_grandfathered" android:background="@drawable/bg_nitro_grandfathered" android:padding="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_xlarge" android:layout_marginRight="@dimen/uikit_spacing_xlarge" android:layout_marginBottom="@dimen/uikit_spacing_large" android:drawableLeft="@drawable/ic_nitro_badge_white" android:drawablePadding="@dimen/uikit_spacing_medium" android:drawableStart="@drawable/ic_nitro_badge_white" style="@style/UiKit.TextView" />
-                    <com.discord.views.ActiveSubscriptionView android:id="@id/premium_settings_active_subscription" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_xlarge" android:layout_marginRight="@dimen/uikit_spacing_xlarge" app:cardBackgroundColor="@color/primary_630" />
-                    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/primary_400" android:id="@id/premium_settings_legalese" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_xlarge" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_xlarge" style="@style/UiKit.TextView" />
-                    <include android:id="@id/premium_settings_tier_1_container" layout="@layout/view_premium_settings_tier_1" />
-                    <include layout="@layout/view_premium_settings_perks" />
+                    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/white" android:id="@id/premium_settings_grandfathered" android:background="@drawable/bg_nitro_grandfathered" android:padding="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" android:drawableLeft="@drawable/ic_nitro_badge_white" android:drawablePadding="@dimen/uikit_spacing_medium" android:drawableStart="@drawable/ic_nitro_badge_white" style="@style/UiKit.TextView" />
+                    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/primary_400" android:id="@id/premium_settings_legalese" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" style="@style/UiKit.TextView" />
+                    <com.discord.views.ActiveSubscriptionView android:id="@id/premium_settings_active_subscription" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" app:cardBackgroundColor="?primary_630" />
                    <include android:id="@id/premium_settings_tier_2_container" layout="@layout/view_premium_settings_tier_2" />
-                    <include layout="@layout/view_premium_settings_games" />
+                    <include layout="@layout/view_premium_settings_perks" />
+                    <include android:id="@id/premium_settings_tier_1_container" layout="@layout/view_premium_settings_tier_1" />
                </LinearLayout>
            </androidx.constraintlayout.widget.ConstraintLayout>
        </ScrollView>
--- a/com.discord/res/values-ja/strings.xml
+++ b/com.discord/res/values-ja/strings.xml
@ -59,8 +59,8 @@
    <string name="activity_invite_private">"ログイン状態を隠している、またはプレイ状態を非表示にしているため、招待を送信できません。設定の
 変更を希望しない場合は、代わりに招待してもらうことも可能です。"</string>
    <string name="activity_panel_go_live_hotspot_dismiss_button">分かった！</string>
-    <string name="activity_panel_go_live_hotspot_header">ゲームのライブ配信で直接フレンドにゲームプレイを配信する！</string>
-    <string name="activity_panel_go_live_tooltip">ゲームのライブ配信</string>
+    <string name="activity_panel_go_live_hotspot_header">Go Liveで直接フレンドにゲームプレイを配信する！</string>
+    <string name="activity_panel_go_live_tooltip">Go Live</string>
    <string name="activity_panel_go_live_tooltip_no_permission_in_guild">このサーバーには配信するボイスチャンネルがありません。</string>
    <string name="activity_panel_go_live_tooltip_no_permission_in_voice">このボイスチャンネルでは配信できません。</string>
    <string name="activity_panel_go_live_tooltip_not_in_guild">配信するサーバーに移動。</string>
@ -1449,7 +1449,7 @@
    <string name="go_live_listen">聞いて！</string>
    <string name="go_live_look">見て！</string>
    <string name="go_live_modal_application_form_title">現在配信中</string>
-    <string name="go_live_modal_cta">ゲームのライブ配信</string>
+    <string name="go_live_modal_cta">Go Live</string>
    <string name="go_live_modal_current_channel_form_title">配信チャンネル</string>
    <string name="go_live_modal_description">配信を開始します。フレンドに視聴してもらいましょう！</string>
    <string name="go_live_modal_overflow_four_or_more_users">%1$sと%2$sと、その他%3$s人</string>
@ -1457,7 +1457,7 @@
    <string name="go_live_modal_overflow_two_users">%1$sと%2$s</string>
    <string name="go_live_modal_select_channel_form_title">ボイスチャンネルを選択</string>
    <string name="go_live_modal_select_channel_placeholder">ボイスチャンネルを検索</string>
-    <string name="go_live_modal_title">ゲームのライブ配信</string>
+    <string name="go_live_modal_title">Go Live</string>
    <string name="grant_temporary_membership">一時的なメンバーとして招待</string>
    <string name="group">グループ</string>
    <string name="group_dm_add_friends">DMにフレンドを追加</string>
@ -2079,7 +2079,7 @@ Discordについて詳しい情報が必要ですか？"</string>
    <string name="link_your_xbox_account_2">Discordは、無料、安全な、デスクトップとモバイルで動作する、ゲーマー向けの音声、テキスト、ビデオチャットアプリです。</string>
    <string name="listening_to">**%1$s**を再生中</string>
    <string name="live">ライブ</string>
-    <string name="live_beta_description">配信にようこそ！ゲームのライブ配信はまだベータ版ですので、不備がありましたら申し訳ございません。</string>
+    <string name="live_beta_description">配信にようこそ！Go Liveはまだベータ版ですので、不備がありましたら申し訳ございません。</string>
    <string name="live_on_twitch">Twitchで配信中</string>
    <string name="live_viewers">視聴者%1$s %2$s</string>
    <string name="load_image_error">"画像の読み込みに失敗しました。
@ -2457,7 +2457,7 @@ Discordについて詳しい情報が必要ですか？"</string>
    <string name="overlay_mobile_toggle_label">モバイルボイスオーバーレイを有効にする</string>
    <string name="overlay_mobile_unauthed">この特典を有効にするには、Discordアプリにログインしてください。</string>
    <string name="overlay_news_go_live_body">%1$sを%2$sでフレンドに配信しますか？</string>
-    <string name="overlay_news_go_live_cta">ゲームのライブ配信</string>
+    <string name="overlay_news_go_live_cta">Go Live</string>
    <string name="overlay_news_text_pinning_body">ゲームにテキストチャットをピン留めできるようになりました！</string>
    <string name="overlay_news_text_pinning_tip">コツ：$[pinIcon](pinHook)を押してチャットをピン留めします</string>
    <string name="overlay_news_text_pinning_title">Discordオーバーレイが更新されました</string>
@ -3130,7 +3130,7 @@ Discordについて詳しい情報が必要ですか？"</string>
    <string name="stop_watching">視聴を中止</string>
    <string name="store_payment_legalese_monthly">こんにちは！%1$sを購入することで、当方の[ストアご利用規約](%2$s)に合意することになります。%1$sは定期サブスクリプションです。つまり、今日こちらよりご請求し、お客さまがサブスクリプションを取り消すまで毎月ご請求するということです。ユーザー設定画面で、いつでもキャンセルすることができます。</string>
    <string name="store_payment_legalese_yearly">こんにちは！%1$sを購入することで、当方の[ストアご利用規約](%2$s)に合意することになります。%1$sは定期サブスクリプションです。つまり、今日こちらよりご請求し、お客さまがサブスクリプションを取り消すまで毎年ご請求するということです。ユーザー設定画面で、いつでもキャンセルすることができます。</string>
-    <string name="stream">ゲームのライブ配信</string>
+    <string name="stream">Go Live</string>
    <string name="stream_bad_spectator">現在、視聴中の配信は動画あるいは音声の品質を落としています。ネットワークの状態が原因かもしれません。</string>
    <string name="stream_bad_streamer">現在、映像あるいは音声の品質を落として配信しています。ネットワークの状態によるものかもしれません。</string>
    <string name="stream_capture_paused">配信ポーズ中</string>
--- a/com.discord/res/values-ko/strings.xml
+++ b/com.discord/res/values-ko/strings.xml
@ -97,7 +97,7 @@
 싫으시다면 다른 사람의 초대를 받아야 해요."</string>
    <string name="activity_panel_go_live_hotspot_dismiss_button">알겠어요!</string>
    <string name="activity_panel_go_live_hotspot_header">친구들에게 게임 플레이를 직접 방송해 보세요!</string>
-    <string name="activity_panel_go_live_tooltip">방송 시작하기</string>
+    <string name="activity_panel_go_live_tooltip">Go Live</string>
    <string name="activity_panel_go_live_tooltip_no_permission_in_guild">이 서버에는 방송할 음성 채널이 없어요.</string>
    <string name="activity_panel_go_live_tooltip_no_permission_in_voice">이 음성 채널로 방송할 수 없어요.</string>
    <string name="activity_panel_go_live_tooltip_not_in_guild">방송을 시작할 서버로 이동해 보세요.</string>
@ -1565,7 +1565,7 @@ Discord가 [마이크를 사용할 수 있도록 허용](onEnableClick)해 주
    <string name="go_live_listen">들어보세요!</string>
    <string name="go_live_look">보세요!</string>
    <string name="go_live_modal_application_form_title">방송할 게임</string>
-    <string name="go_live_modal_cta">방송 시작하기</string>
+    <string name="go_live_modal_cta">Go Live</string>
    <string name="go_live_modal_current_channel_form_title">방송할 채널</string>
    <string name="go_live_modal_description">방송이 시작되었어요. 친구들에게 알리세요!</string>
    <string name="go_live_modal_overflow_four_or_more_users">%1$s, %2$s, 그 외 %3$s명</string>
@ -1573,7 +1573,7 @@ Discord가 [마이크를 사용할 수 있도록 허용](onEnableClick)해 주
    <string name="go_live_modal_overflow_two_users">%1$s, %2$s</string>
    <string name="go_live_modal_select_channel_form_title">음성 채널 선택</string>
    <string name="go_live_modal_select_channel_placeholder">음성 채널 찾기</string>
-    <string name="go_live_modal_title">방송 시작하기</string>
+    <string name="go_live_modal_title">Go Live</string>
    <string name="grant_temporary_membership">임시 멤버 자격 부여</string>
    <string name="group">그룹</string>
    <string name="group_dm_add_friends">개인 메시지에 친구 추가하기</string>
@ -2225,7 +2225,7 @@ Discord에 대해 더 알고 싶으신가요?"</string>
    <string name="link_your_xbox_account_2">Discord는 무료에, 안전하고, PC는 물론 모바일에서도 이용 가능한 음성, 텍스트, 영상 채팅 앱이에요.</string>
    <string name="listening_to">**%1$s** 듣는 중</string>
    <string name="live">라이브</string>
-    <string name="live_beta_description">방송에 잘 왔어요! 방송 시작하기는 베타 상태이므로 일시적 오류가 있어도 양해해 주세요</string>
+    <string name="live_beta_description">방송에 잘 왔어요! Go Live는 베타 상태이므로 일시적 오류가 있어도 양해해 주세요</string>
    <string name="live_on_twitch">Twitch에서 방송 중</string>
    <string name="load_image_error">"이미지를 불러오지 못했어요.
 다시 시도해 주세요."</string>
@ -2618,7 +2618,7 @@ Discord에 대해 더 알고 싶으신가요?"</string>
    <string name="overlay_mobile_toggle_label">모바일 음성 오버레이 활성화하기</string>
    <string name="overlay_mobile_unauthed">이 기능을 활성화하려면 Discord 앱에 로그인하세요.</string>
    <string name="overlay_news_go_live_body">%1$s을(를) %2$s 서버의 친구들에게 방송하시겠어요?</string>
-    <string name="overlay_news_go_live_cta">방송 시작하기</string>
+    <string name="overlay_news_go_live_cta">Go Live</string>
    <string name="overlay_news_text_pinning_body">이제 게임에 텍스트 채팅을 고정할 수 있어요!</string>
    <string name="overlay_news_text_pinning_tip">팁: $[pinIcon](pinHook)을 누르면 채팅을 고정할 수 있어요.</string>
    <string name="overlay_news_text_pinning_title">Discord 오버레이 업그레이드 완료</string>
@ -3359,7 +3359,7 @@ PC 앱을 받아주세요. [다운로드](onDownloadClick)"</string>
    <string name="store_channel">스토어 채널</string>
    <string name="store_payment_legalese_monthly">반가워요! %1$s 구독을 구매하시면 [이용 약관](%2$s)에 동의하는 것으로 간주해요. %1$s 구독은 반복 구독 상품이에요. 즉, 오늘 구독료를 청구하고 한 달 뒤에 사용자가 구독을 취소하지 않았다면 다시 구독료를 청구하는 방식이에요. 구독은 사용자 설정 화면에서 언제든지 취소할 수 있어요.</string>
    <string name="store_payment_legalese_yearly">반가워요! %1$s 구독을 구매하시면 [이용 약관](%2$s)에 동의하는 것으로 간주해요. %1$s 구독은 반복 구독 상품이에요. 즉, 오늘 구독료를 청구하고 1년 뒤에 사용자가 구독을 취소하지 않았다면 다시 구독료를 청구하는 방식이에요. 구독은 사용자 설정 화면에서 언제든지 취소할 수 있어요.</string>
-    <string name="stream">방송 시작하기</string>
+    <string name="stream">Go Live</string>
    <string name="stream_bad_spectator">시청 중인 방송의 영상 또는 오디오 품질이 낮아요. 네트워크 상태 문제일 수 있어요.</string>
    <string name="stream_bad_streamer">방송 중인 영상 또는 오디오 품질이 낮아요. 네트워크 상태 문제일 수 있어요.</string>
    <string name="stream_capture_paused">방송 일시 정지됨</string>
--- a/com.discord/res/values-v21/styles.xml
+++ b/com.discord/res/values-v21/styles.xml
@ -62,7 +62,6 @@
        <item name="status_white_outline">@drawable/drawable_uikit_primary_100_button_outline</item>
        <item name="ternaryCheckboxDisabledColor">@color/primary_630_alpha_60</item>
        <item name="theme_name">dark</item>
-        <item name="white">@color/white</item>
    </style>
    <style name="AppTheme.Dialog.Popup" parent="@style/Theme.AppCompat.Dialog">
        <item name="android:windowBackground">@drawable/drawable_bg_dialog_popup</item>
--- a/com.discord/res/values-v23/styles.xml
+++ b/com.discord/res/values-v23/styles.xml
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="AppTheme.Light.Legacy" parent="@style/AppTheme.Light.Base">
+    <style name="AppTheme.Light" parent="@style/AppTheme.Light.Base">
        <item name="android:windowLightStatusBar">true</item>
        <item name="actionMenuTextColor">@color/primary_500</item>
        <item name="boost_confirmation_card_bg">@color/white</item>
@ -17,37 +17,41 @@
        <item name="dialogTheme">@style/AppTheme.Light.Notice</item>
        <item name="notice_popup_bg">@color/primary_100</item>
        <item name="notice_theme_positive_red">@style/AppTheme.Light.Notice.PositiveRed</item>
-        <item name="primary_000">@color/black</item>
+        <item name="primary_000">@color/primary_light_800</item>
        <item name="primary_100">@color/primary_500</item>
        <item name="primary_100_alpha_30">@color/primary_500_alpha_30</item>
        <item name="primary_100_alpha_60">@color/primary_500_alpha_60</item>
        <item name="primary_100_bg">@drawable/drawable_uikit_primary_600_bg_dark</item>
-        <item name="primary_200">@color/primary_800</item>
+        <item name="primary_200">@color/primary_light_700</item>
        <item name="primary_200_bg">@drawable/drawable_uikit_primary_800_bg_dark</item>
-        <item name="primary_300">@color/primary_400</item>
+        <item name="primary_300">@color/primary_light_600</item>
        <item name="primary_300_alpha_30">@color/primary_400_alpha_30</item>
        <item name="primary_300_bg">@drawable/drawable_uikit_primary_400_bg_dark</item>
-        <item name="primary_400">@color/primary_300</item>
+        <item name="primary_400">@color/primary_light_400</item>
        <item name="primary_400_alpha_30">@color/primary_300_alpha_30</item>
        <item name="primary_400_bg">@drawable/drawable_uikit_primary_300_bg_dark</item>
-        <item name="primary_500">@color/primary_500</item>
+        <item name="primary_500">@color/primary_light_500</item>
        <item name="primary_500_alpha_60">@color/primary_500_alpha_60</item>
        <item name="primary_500_bg">@drawable/drawable_uikit_primary_500_bg_dark</item>
        <item name="primary_500_button_outline">@drawable/drawable_uikit_primary_500_button_outline</item>
        <item name="primary_500_circle">@drawable/drawable_uikit_primary_500_circle</item>
-        <item name="primary_600">@color/primary_400</item>
+        <item name="primary_560">@color/primary_light_230</item>
+        <item name="primary_600">@color/white</item>
        <item name="primary_600_bg">@drawable/drawable_uikit_primary_400_bg_dark</item>
-        <item name="primary_630">@color/primary_100</item>
+        <item name="primary_630">@color/primary_light_100</item>
        <item name="primary_630_bg">@drawable/drawable_uikit_primary_100_bg_dark</item>
        <item name="primary_630_bg_bottom_corners">@drawable/drawable_uikit_primary_light_100_bg_bottom_corners</item>
        <item name="primary_630_circle">@drawable/drawable_uikit_primary_100_circle</item>
-        <item name="primary_660">#ffebedef</item>
+        <item name="primary_660">@color/primary_light_160</item>
        <item name="primary_660_bg_outline">@drawable/drawable_uikit_primary_light_100_bg_outline</item>
-        <item name="primary_700">@color/primary_300</item>
+        <item name="primary_700">@color/primary_light_200</item>
        <item name="primary_700_alpha_60">@color/primary_300_alpha_60</item>
        <item name="primary_700_bg">@drawable/drawable_uikit_primary_300_bg_dark</item>
+        <item name="primary_700_circle">@drawable/drawable_uikit_primary_light_200_circle</item>
+        <item name="primary_700_top_corners">@drawable/drawable_bg_primary_light_200_top_corners</item>
        <item name="primary_800">@color/primary_200</item>
        <item name="primary_800_bg">@drawable/drawable_uikit_primary_200_bg_dark</item>
+        <item name="primary_800_circle">@drawable/drawable_uikit_primary_light_100_circle</item>
        <item name="primary_900">@color/primary_100</item>
        <item name="primary_900_bg">@drawable/drawable_uikit_primary_100_bg_dark</item>
        <item name="status_white_outline">@drawable/drawable_uikit_status_primary_300_button_outline</item>
--- a/com.discord/res/values/attrs.xml
+++ b/com.discord/res/values/attrs.xml
@ -148,6 +148,8 @@
    <attr name="bg_cloud_pattern" format="reference" />
    <attr name="bg_gem_boost" format="reference" />
    <attr name="bg_mentions" format="reference" />
+    <attr name="bg_payment_method_spinner_closed" format="reference" />
+    <attr name="bg_payment_method_spinner_dropdown" format="reference" />
    <attr name="boost_confirmation_card_bg" format="reference|color" />
    <attr name="boosted_guild_tier_0" format="reference" />
    <attr name="borderWidth" format="dimension" />
@ -641,6 +643,8 @@
    <attr name="img_empty_server_invites" format="reference" />
    <attr name="img_forced_update" format="reference" />
    <attr name="img_gifting_pattern_bg" format="reference" />
+    <attr name="img_logo_discord_nitro" format="reference" />
+    <attr name="img_logo_discord_nitro_classic" format="reference" />
    <attr name="img_mfa" format="reference" />
    <attr name="img_new_tos" format="reference" />
    <attr name="img_no_mutual_friends" format="reference" />
@ -1401,7 +1405,6 @@
    <attr name="viewInflaterClass" format="string" />
    <attr name="voiceIcon" format="reference" />
    <attr name="vuv_avatar_size" format="reference|dimension" />
-    <attr name="white" format="reference|color" />
    <attr name="windowActionBar" format="boolean" />
    <attr name="windowActionBarOverlay" format="boolean" />
    <attr name="windowActionModeOverlay" format="boolean" />
--- a/com.discord/res/values/ids.xml
+++ b/com.discord/res/values/ids.xml
@ -1214,14 +1214,17 @@
    <item type="id" name="popup_subtitle" />
    <item type="id" name="popup_title" />
    <item type="id" name="premium_perks_upload_text" />
-    <item type="id" name="premium_perks_view_games" />
    <item type="id" name="premium_settings_active_subscription" />
    <item type="id" name="premium_settings_grandfathered" />
    <item type="id" name="premium_settings_legalese" />
+    <item type="id" name="premium_settings_nitro" />
    <item type="id" name="premium_settings_nitro_classic" />
    <item type="id" name="premium_settings_nitro_classic_wumpus" />
+    <item type="id" name="premium_settings_nitro_wumpus" />
+    <item type="id" name="premium_settings_premium_classic_gift" />
    <item type="id" name="premium_settings_premium_classic_monthly" />
    <item type="id" name="premium_settings_premium_classic_yearly" />
+    <item type="id" name="premium_settings_premium_gift" />
    <item type="id" name="premium_settings_premium_monthly" />
    <item type="id" name="premium_settings_premium_yearly" />
    <item type="id" name="premium_settings_retry" />
--- a/com.discord/res/values/public.xml
+++ b/com.discord/res/values/public.xml
--- a/com.discord/res/values/strings.xml
+++ b/com.discord/res/values/strings.xml
@ -996,7 +996,7 @@ Icon"</string>
    <string name="cloud_sync_modal_error_header">Unable to sync cloud saves</string>
    <string name="cloud_sync_modal_or">OR</string>
    <string name="collapse_category">Collapse Category</string>
-    <string name="com.crashlytics.android.build_id">b69fd8d4-be22-451a-9831-09705c601eb7</string>
+    <string name="com.crashlytics.android.build_id">3d402c4e-8d1f-48ba-8faa-bcc5c21bba1f</string>
    <string name="coming_soon">Coming Soon</string>
    <string name="coming_soon_notifications">Granular notification control only works on desktop apps at the moment. For now use the iOS notification settings.</string>
    <string name="coming_soon_title">COMING SOON!</string>
@ -3447,8 +3447,8 @@ Want to know more about Discord?"</string>
    <string name="premium_chat_perks_rep_mobile">Exclusive Nitro badge on your profile</string>
    <string name="premium_chat_perks_screenshare_mobile">Screen share on PC in 720p 60fps or 1080p 30fps</string>
    <string name="premium_chat_perks_simple_title">Want to keep it simple? Support Discord and get sweet chat perks:</string>
-    <string name="premium_chat_perks_simple_title_ios">Just want super powered chat perks? Get Nitro Classic</string>
-    <string name="premium_chat_perks_streaming_mobile">Better Go Live streams: Stream at source with Nitro or up to a crisp 1080 60fps with Nitro Classic</string>
+    <string name="premium_chat_perks_simple_title_mobile">Just want super powered chat perks? Get Nitro Classic</string>
+    <string name="premium_chat_perks_streaming_mobile">Better Go Live streams: Stream at source with Nitro or up to a crisp 1080p 60fps with Nitro Classic</string>
    <string name="premium_chat_perks_title_animated_avatar_and_emoji">Animated Fun</string>
    <string name="premium_chat_perks_title_badge">Rep Your Support</string>
    <string name="premium_chat_perks_title_custom_emoji">Global Custom Emojis</string>
@ -3481,6 +3481,7 @@ To keep your sub, go to Settings and update your payment."</string>
    <string name="premium_features_boost_perks_mobile">Support your favorite server with Server Boosting</string>
    <string name="premium_features_chat_perks">Chat Perks</string>
    <string name="premium_features_chat_perks_mobile">All the sweet chat perks above</string>
+    <string name="premium_features_enhanced_chat_perks">Enhanced Chat Perks</string>
    <string name="premium_features_game_perks_mobile">PLUS $1000 worth of PC games and perks</string>
    <string name="premium_features_premium_applications">Free Games</string>
    <string name="premium_features_premium_applications_mobile">Free Games and game perks.</string>
@ -3488,6 +3489,7 @@ To keep your sub, go to Settings and update your payment."</string>
    <string name="premium_game_perks_title_mobile">Want more? Get Nitro with PC games.</string>
    <string name="premium_gift_button_label">Send a gift</string>
    <string name="premium_gift_button_tooltip">Upgrade your friends! Gift them Nitro games and chat perks.</string>
+    <string name="premium_gift_send">or send a gift!</string>
    <string name="premium_gift_share_link_ios">Share</string>
    <string name="premium_gifting_title">Nitro Gifting</string>
    <string name="premium_gifting_title_mobile">Select a Nitro Gift</string>
--- a/com.discord/res/values/styles.xml
+++ b/com.discord/res/values/styles.xml
@ -160,7 +160,6 @@
        <item name="status_white_outline">@drawable/drawable_uikit_primary_100_button_outline</item>
        <item name="ternaryCheckboxDisabledColor">@color/primary_630_alpha_60</item>
        <item name="theme_name">dark</item>
-        <item name="white">@color/white</item>
    </style>
    <style name="AppTheme.Dark.Base" parent="@style/AppTheme.NoActionBar">
        <item name="anim_boost_confirmation">animations/anim_nitro_boost_confirmation_dark.json</item>
@ -182,6 +181,8 @@
        <item name="bg_cloud_pattern">@drawable/bg_cloud_pattern_dark</item>
        <item name="bg_gem_boost">@drawable/drawable_gem_boost_background_dark</item>
        <item name="bg_mentions">@drawable/drawable_overlay_mentions_primary_600</item>
+        <item name="bg_payment_method_spinner_closed">@drawable/bg_payment_method_spinner_closed</item>
+        <item name="bg_payment_method_spinner_dropdown">@drawable/bg_payment_method_spinner_dropdown</item>
        <item name="boosted_guild_tier_0">@drawable/drawable_boosted_guild_tier_0_dark</item>
        <item name="card_bg">@drawable/drawable_bg_card_grey</item>
        <item name="chat_embed_bg">@drawable/drawable_chat_embed_dark_background</item>
@ -304,6 +305,8 @@
        <item name="img_empty_server_invites">@drawable/img_empty_server_settings_invites_dark</item>
        <item name="img_forced_update">@drawable/img_forced_update_dark</item>
        <item name="img_gifting_pattern_bg">@drawable/img_gifting_pattern_bg_dark</item>
+        <item name="img_logo_discord_nitro">@drawable/img_logo_discord_nitro</item>
+        <item name="img_logo_discord_nitro_classic">@drawable/img_logo_nitro_classic</item>
        <item name="img_mfa">@drawable/img_mfa_dark</item>
        <item name="img_new_tos">@drawable/img_new_tos_dark_theme</item>
        <item name="img_no_mutual_friends">@drawable/img_no_mutual_friends_dark</item>
@ -459,20 +462,62 @@
        <item name="android:windowSoftInputMode">stateUnchanged</item>
        <item name="android:windowCloseOnTouchOutside">false</item>
    </style>
-    <style name="AppTheme.Light" parent="@style/AppTheme.Light.Legacy">
+    <style name="AppTheme.Light" parent="@style/AppTheme.Light.Base">
+        <item name="actionMenuTextColor">@color/primary_500</item>
+        <item name="boost_confirmation_card_bg">@color/white</item>
+        <item name="bottomSheetDialogTheme">@style/AppTheme.Light.BottomSheet</item>
+        <item name="colorAccent">@color/brand_500</item>
+        <item name="colorButtonNormal">@color/brand_500</item>
+        <item name="colorControlActivated">@color/brand_500</item>
+        <item name="colorPrimary">@color/white</item>
+        <item name="colorPrimaryBg">@drawable/drawable_uikit_primary_white_bg</item>
+        <item name="colorPrimaryCircle">@drawable/drawable_uikit_white_circle</item>
+        <item name="colorPrimaryDark">#ffe5e5e5</item>
+        <item name="colorPrimaryDivider">@color/primary_200_alpha_60</item>
+        <item name="colorPrimaryTabs">@color/primary_200_alpha_30</item>
+        <item name="dialogTheme">@style/AppTheme.Light.Notice</item>
+        <item name="notice_popup_bg">@color/primary_100</item>
+        <item name="notice_theme_positive_red">@style/AppTheme.Light.Notice.PositiveRed</item>
+        <item name="primary_000">@color/primary_light_800</item>
+        <item name="primary_100">@color/primary_500</item>
+        <item name="primary_100_alpha_30">@color/primary_500_alpha_30</item>
+        <item name="primary_100_alpha_60">@color/primary_500_alpha_60</item>
+        <item name="primary_100_bg">@drawable/drawable_uikit_primary_600_bg_dark</item>
        <item name="primary_200">@color/primary_light_700</item>
+        <item name="primary_200_bg">@drawable/drawable_uikit_primary_800_bg_dark</item>
        <item name="primary_300">@color/primary_light_600</item>
+        <item name="primary_300_alpha_30">@color/primary_400_alpha_30</item>
+        <item name="primary_300_bg">@drawable/drawable_uikit_primary_400_bg_dark</item>
        <item name="primary_400">@color/primary_light_400</item>
+        <item name="primary_400_alpha_30">@color/primary_300_alpha_30</item>
+        <item name="primary_400_bg">@drawable/drawable_uikit_primary_300_bg_dark</item>
        <item name="primary_500">@color/primary_light_500</item>
+        <item name="primary_500_alpha_60">@color/primary_500_alpha_60</item>
+        <item name="primary_500_bg">@drawable/drawable_uikit_primary_500_bg_dark</item>
+        <item name="primary_500_button_outline">@drawable/drawable_uikit_primary_500_button_outline</item>
+        <item name="primary_500_circle">@drawable/drawable_uikit_primary_500_circle</item>
        <item name="primary_560">@color/primary_light_230</item>
        <item name="primary_600">@color/white</item>
+        <item name="primary_600_bg">@drawable/drawable_uikit_primary_400_bg_dark</item>
        <item name="primary_630">@color/primary_light_100</item>
+        <item name="primary_630_bg">@drawable/drawable_uikit_primary_100_bg_dark</item>
+        <item name="primary_630_bg_bottom_corners">@drawable/drawable_uikit_primary_light_100_bg_bottom_corners</item>
+        <item name="primary_630_circle">@drawable/drawable_uikit_primary_100_circle</item>
        <item name="primary_660">@color/primary_light_160</item>
+        <item name="primary_660_bg_outline">@drawable/drawable_uikit_primary_light_100_bg_outline</item>
        <item name="primary_700">@color/primary_light_200</item>
+        <item name="primary_700_alpha_60">@color/primary_300_alpha_60</item>
+        <item name="primary_700_bg">@drawable/drawable_uikit_primary_300_bg_dark</item>
        <item name="primary_700_circle">@drawable/drawable_uikit_primary_light_200_circle</item>
        <item name="primary_700_top_corners">@drawable/drawable_bg_primary_light_200_top_corners</item>
+        <item name="primary_800">@color/primary_200</item>
+        <item name="primary_800_bg">@drawable/drawable_uikit_primary_200_bg_dark</item>
        <item name="primary_800_circle">@drawable/drawable_uikit_primary_light_100_circle</item>
-        <item name="white">@color/primary_light_800</item>
+        <item name="primary_900">@color/primary_100</item>
+        <item name="primary_900_bg">@drawable/drawable_uikit_primary_100_bg_dark</item>
+        <item name="status_white_outline">@drawable/drawable_uikit_status_primary_300_button_outline</item>
+        <item name="ternaryCheckboxDisabledColor">@color/primary_100_alpha_60</item>
+        <item name="theme_name">light</item>
    </style>
    <style name="AppTheme.Light.Base" parent="@style/AppTheme.NoActionBar">
        <item name="anim_boost_confirmation">animations/anim_nitro_boost_confirmation_light.json</item>
@ -494,6 +539,8 @@
        <item name="bg_cloud_pattern">@drawable/bg_cloud_pattern_light</item>
        <item name="bg_gem_boost">@drawable/drawable_gem_boost_background_light</item>
        <item name="bg_mentions">@drawable/drawable_overlay_mentions_primary_100</item>
+        <item name="bg_payment_method_spinner_closed">@drawable/bg_payment_method_spinner_closed_light</item>
+        <item name="bg_payment_method_spinner_dropdown">@drawable/bg_payment_method_spinner_dropdown_light</item>
        <item name="boosted_guild_tier_0">@drawable/drawable_boosted_guild_tier_0_light</item>
        <item name="card_bg">@drawable/drawable_bg_card_white</item>
        <item name="chat_embed_bg">@drawable/drawable_chat_embed_light_background</item>
@ -616,6 +663,8 @@
        <item name="img_empty_server_invites">@drawable/img_empty_server_settings_invites_light</item>
        <item name="img_forced_update">@drawable/img_forced_update_light</item>
        <item name="img_gifting_pattern_bg">@drawable/img_gifting_pattern_bg_light</item>
+        <item name="img_logo_discord_nitro">@drawable/img_logo_discord_nitro_brand</item>
+        <item name="img_logo_discord_nitro_classic">@drawable/img_logo_nitro_classic_brand</item>
        <item name="img_mfa">@drawable/img_mfa_light</item>
        <item name="img_new_tos">@drawable/img_new_tos_light_theme</item>
        <item name="img_no_mutual_friends">@drawable/img_no_mutual_friends_light</item>
@ -728,59 +777,6 @@
        <item name="colorPrimary">@color/white</item>
        <item name="colorPrimaryDark">#ffe5e5e5</item>
    </style>
-    <style name="AppTheme.Light.Legacy" parent="@style/AppTheme.Light.Base">
-        <item name="actionMenuTextColor">@color/primary_500</item>
-        <item name="boost_confirmation_card_bg">@color/white</item>
-        <item name="bottomSheetDialogTheme">@style/AppTheme.Light.BottomSheet</item>
-        <item name="colorAccent">@color/brand_500</item>
-        <item name="colorButtonNormal">@color/brand_500</item>
-        <item name="colorControlActivated">@color/brand_500</item>
-        <item name="colorPrimary">@color/white</item>
-        <item name="colorPrimaryBg">@drawable/drawable_uikit_primary_white_bg</item>
-        <item name="colorPrimaryCircle">@drawable/drawable_uikit_white_circle</item>
-        <item name="colorPrimaryDark">#ffe5e5e5</item>
-        <item name="colorPrimaryDivider">@color/primary_200_alpha_60</item>
-        <item name="colorPrimaryTabs">@color/primary_200_alpha_30</item>
-        <item name="dialogTheme">@style/AppTheme.Light.Notice</item>
-        <item name="notice_popup_bg">@color/primary_100</item>
-        <item name="notice_theme_positive_red">@style/AppTheme.Light.Notice.PositiveRed</item>
-        <item name="primary_000">@color/black</item>
-        <item name="primary_100">@color/primary_500</item>
-        <item name="primary_100_alpha_30">@color/primary_500_alpha_30</item>
-        <item name="primary_100_alpha_60">@color/primary_500_alpha_60</item>
-        <item name="primary_100_bg">@drawable/drawable_uikit_primary_600_bg_dark</item>
-        <item name="primary_200">@color/primary_800</item>
-        <item name="primary_200_bg">@drawable/drawable_uikit_primary_800_bg_dark</item>
-        <item name="primary_300">@color/primary_400</item>
-        <item name="primary_300_alpha_30">@color/primary_400_alpha_30</item>
-        <item name="primary_300_bg">@drawable/drawable_uikit_primary_400_bg_dark</item>
-        <item name="primary_400">@color/primary_300</item>
-        <item name="primary_400_alpha_30">@color/primary_300_alpha_30</item>
-        <item name="primary_400_bg">@drawable/drawable_uikit_primary_300_bg_dark</item>
-        <item name="primary_500">@color/primary_500</item>
-        <item name="primary_500_alpha_60">@color/primary_500_alpha_60</item>
-        <item name="primary_500_bg">@drawable/drawable_uikit_primary_500_bg_dark</item>
-        <item name="primary_500_button_outline">@drawable/drawable_uikit_primary_500_button_outline</item>
-        <item name="primary_500_circle">@drawable/drawable_uikit_primary_500_circle</item>
-        <item name="primary_600">@color/primary_400</item>
-        <item name="primary_600_bg">@drawable/drawable_uikit_primary_400_bg_dark</item>
-        <item name="primary_630">@color/primary_100</item>
-        <item name="primary_630_bg">@drawable/drawable_uikit_primary_100_bg_dark</item>
-        <item name="primary_630_bg_bottom_corners">@drawable/drawable_uikit_primary_light_100_bg_bottom_corners</item>
-        <item name="primary_630_circle">@drawable/drawable_uikit_primary_100_circle</item>
-        <item name="primary_660">#ffebedef</item>
-        <item name="primary_660_bg_outline">@drawable/drawable_uikit_primary_light_100_bg_outline</item>
-        <item name="primary_700">@color/primary_300</item>
-        <item name="primary_700_alpha_60">@color/primary_300_alpha_60</item>
-        <item name="primary_700_bg">@drawable/drawable_uikit_primary_300_bg_dark</item>
-        <item name="primary_800">@color/primary_200</item>
-        <item name="primary_800_bg">@drawable/drawable_uikit_primary_200_bg_dark</item>
-        <item name="primary_900">@color/primary_100</item>
-        <item name="primary_900_bg">@drawable/drawable_uikit_primary_100_bg_dark</item>
-        <item name="status_white_outline">@drawable/drawable_uikit_status_primary_300_button_outline</item>
-        <item name="ternaryCheckboxDisabledColor">@color/primary_100_alpha_60</item>
-        <item name="theme_name">light</item>
-    </style>
    <style name="AppTheme.Light.Notice" parent="@style/Theme.AppCompat.Light.Dialog">
        <item name="buttonBarNegativeButtonStyle">@style/UiKit.Button.Transparent.Fit</item>
        <item name="buttonBarPositiveButtonStyle">@style/UiKit.Button.Fit</item>
--- a/com.discord/smali/androidx/appcompat/R$attr.smali
+++ b/com.discord/smali/androidx/appcompat/R$attr.smali
@ -125,439 +125,439 @@

 .field public static final barLength:I = 0x7f040052

-.field public static final borderlessButtonStyle:I = 0x7f040063
+.field public static final borderlessButtonStyle:I = 0x7f040065

-.field public static final buttonBarButtonStyle:I = 0x7f040072
+.field public static final buttonBarButtonStyle:I = 0x7f040074

-.field public static final buttonBarNegativeButtonStyle:I = 0x7f040073
+.field public static final buttonBarNegativeButtonStyle:I = 0x7f040075

-.field public static final buttonBarNeutralButtonStyle:I = 0x7f040074
+.field public static final buttonBarNeutralButtonStyle:I = 0x7f040076

-.field public static final buttonBarPositiveButtonStyle:I = 0x7f040075
+.field public static final buttonBarPositiveButtonStyle:I = 0x7f040077

-.field public static final buttonBarStyle:I = 0x7f040076
+.field public static final buttonBarStyle:I = 0x7f040078

-.field public static final buttonGravity:I = 0x7f040077
+.field public static final buttonGravity:I = 0x7f040079

-.field public static final buttonIconDimen:I = 0x7f040078
+.field public static final buttonIconDimen:I = 0x7f04007a

-.field public static final buttonPanelSideLayout:I = 0x7f040079
+.field public static final buttonPanelSideLayout:I = 0x7f04007b

-.field public static final buttonStyle:I = 0x7f04007b
+.field public static final buttonStyle:I = 0x7f04007d

-.field public static final buttonStyleSmall:I = 0x7f04007c
+.field public static final buttonStyleSmall:I = 0x7f04007e

-.field public static final buttonTint:I = 0x7f04007d
+.field public static final buttonTint:I = 0x7f04007f

-.field public static final buttonTintMode:I = 0x7f04007e
+.field public static final buttonTintMode:I = 0x7f040080

-.field public static final checkboxStyle:I = 0x7f04008a
+.field public static final checkboxStyle:I = 0x7f04008c

-.field public static final checkedTextViewStyle:I = 0x7f04008f
+.field public static final checkedTextViewStyle:I = 0x7f040091

-.field public static final closeIcon:I = 0x7f0400a3
+.field public static final closeIcon:I = 0x7f0400a5

-.field public static final closeItemLayout:I = 0x7f0400aa
+.field public static final closeItemLayout:I = 0x7f0400ac

-.field public static final collapseContentDescription:I = 0x7f0400ab
+.field public static final collapseContentDescription:I = 0x7f0400ad

-.field public static final collapseIcon:I = 0x7f0400ac
+.field public static final collapseIcon:I = 0x7f0400ae

-.field public static final color:I = 0x7f0400af
+.field public static final color:I = 0x7f0400b1

-.field public static final colorAccent:I = 0x7f0400b0
+.field public static final colorAccent:I = 0x7f0400b2

-.field public static final colorBackgroundFloating:I = 0x7f0400b1
+.field public static final colorBackgroundFloating:I = 0x7f0400b3

-.field public static final colorButtonNormal:I = 0x7f0400b2
+.field public static final colorButtonNormal:I = 0x7f0400b4

-.field public static final colorControlActivated:I = 0x7f0400b3
+.field public static final colorControlActivated:I = 0x7f0400b5

-.field public static final colorControlHighlight:I = 0x7f0400b4
+.field public static final colorControlHighlight:I = 0x7f0400b6

-.field public static final colorControlNormal:I = 0x7f0400b5
+.field public static final colorControlNormal:I = 0x7f0400b7

-.field public static final colorError:I = 0x7f0400b6
+.field public static final colorError:I = 0x7f0400b8

-.field public static final colorPrimary:I = 0x7f0400b7
+.field public static final colorPrimary:I = 0x7f0400b9

-.field public static final colorPrimaryDark:I = 0x7f0400ba
+.field public static final colorPrimaryDark:I = 0x7f0400bc

-.field public static final colorSwitchThumbNormal:I = 0x7f0400bf
+.field public static final colorSwitchThumbNormal:I = 0x7f0400c1

-.field public static final commitIcon:I = 0x7f0400c0
+.field public static final commitIcon:I = 0x7f0400c2

-.field public static final contentDescription:I = 0x7f0400c5
+.field public static final contentDescription:I = 0x7f0400c7

-.field public static final contentInsetEnd:I = 0x7f0400c6
+.field public static final contentInsetEnd:I = 0x7f0400c8

-.field public static final contentInsetEndWithActions:I = 0x7f0400c7
+.field public static final contentInsetEndWithActions:I = 0x7f0400c9

-.field public static final contentInsetLeft:I = 0x7f0400c8
+.field public static final contentInsetLeft:I = 0x7f0400ca

-.field public static final contentInsetRight:I = 0x7f0400c9
+.field public static final contentInsetRight:I = 0x7f0400cb

-.field public static final contentInsetStart:I = 0x7f0400ca
+.field public static final contentInsetStart:I = 0x7f0400cc

-.field public static final contentInsetStartWithNavigation:I = 0x7f0400cb
+.field public static final contentInsetStartWithNavigation:I = 0x7f0400cd

-.field public static final controlBackground:I = 0x7f0400d2
+.field public static final controlBackground:I = 0x7f0400d4

-.field public static final coordinatorLayoutStyle:I = 0x7f0400d3
+.field public static final coordinatorLayoutStyle:I = 0x7f0400d5

-.field public static final customNavigationLayout:I = 0x7f0400e7
+.field public static final customNavigationLayout:I = 0x7f0400e9

-.field public static final defaultQueryHint:I = 0x7f0400fd
+.field public static final defaultQueryHint:I = 0x7f0400ff

-.field public static final dialogCornerRadius:I = 0x7f0400fe
+.field public static final dialogCornerRadius:I = 0x7f040100

-.field public static final dialogPreferredPadding:I = 0x7f0400ff
+.field public static final dialogPreferredPadding:I = 0x7f040101

-.field public static final dialogTheme:I = 0x7f040100
+.field public static final dialogTheme:I = 0x7f040102

-.field public static final displayOptions:I = 0x7f040101
+.field public static final displayOptions:I = 0x7f040103

-.field public static final divider:I = 0x7f040102
+.field public static final divider:I = 0x7f040104

-.field public static final dividerHorizontal:I = 0x7f040106
+.field public static final dividerHorizontal:I = 0x7f040108

-.field public static final dividerPadding:I = 0x7f040107
+.field public static final dividerPadding:I = 0x7f040109

-.field public static final dividerVertical:I = 0x7f040108
+.field public static final dividerVertical:I = 0x7f04010a

-.field public static final drawableSize:I = 0x7f040109
+.field public static final drawableSize:I = 0x7f04010b

-.field public static final drawerArrowStyle:I = 0x7f04010a
+.field public static final drawerArrowStyle:I = 0x7f04010c

-.field public static final dropDownListViewStyle:I = 0x7f04010b
+.field public static final dropDownListViewStyle:I = 0x7f04010d

-.field public static final dropdownListPreferredItemHeight:I = 0x7f04010c
+.field public static final dropdownListPreferredItemHeight:I = 0x7f04010e

-.field public static final editTextBackground:I = 0x7f04010d
+.field public static final editTextBackground:I = 0x7f04010f

-.field public static final editTextColor:I = 0x7f04010e
+.field public static final editTextColor:I = 0x7f040110

-.field public static final editTextStyle:I = 0x7f04010f
+.field public static final editTextStyle:I = 0x7f040111

-.field public static final elevation:I = 0x7f040110
+.field public static final elevation:I = 0x7f040112

-.field public static final expandActivityOverflowButtonDrawable:I = 0x7f040116
+.field public static final expandActivityOverflowButtonDrawable:I = 0x7f040118

-.field public static final firstBaselineToTopHeight:I = 0x7f04012f
+.field public static final firstBaselineToTopHeight:I = 0x7f040131

-.field public static final font:I = 0x7f04013c
+.field public static final font:I = 0x7f04013e

-.field public static final fontFamily:I = 0x7f04013d
+.field public static final fontFamily:I = 0x7f04013f

-.field public static final fontProviderAuthority:I = 0x7f04013e
+.field public static final fontProviderAuthority:I = 0x7f040140

-.field public static final fontProviderCerts:I = 0x7f04013f
+.field public static final fontProviderCerts:I = 0x7f040141

-.field public static final fontProviderFetchStrategy:I = 0x7f040140
+.field public static final fontProviderFetchStrategy:I = 0x7f040142

-.field public static final fontProviderFetchTimeout:I = 0x7f040141
+.field public static final fontProviderFetchTimeout:I = 0x7f040143

-.field public static final fontProviderPackage:I = 0x7f040142
+.field public static final fontProviderPackage:I = 0x7f040144

-.field public static final fontProviderQuery:I = 0x7f040143
+.field public static final fontProviderQuery:I = 0x7f040145

-.field public static final fontStyle:I = 0x7f040144
+.field public static final fontStyle:I = 0x7f040146

-.field public static final fontVariationSettings:I = 0x7f040145
+.field public static final fontVariationSettings:I = 0x7f040147

-.field public static final fontWeight:I = 0x7f040146
+.field public static final fontWeight:I = 0x7f040148

-.field public static final gapBetweenBars:I = 0x7f040148
+.field public static final gapBetweenBars:I = 0x7f04014a

-.field public static final goIcon:I = 0x7f04014d
+.field public static final goIcon:I = 0x7f04014f

-.field public static final height:I = 0x7f040154
+.field public static final height:I = 0x7f040156

-.field public static final hideOnContentScroll:I = 0x7f040159
+.field public static final hideOnContentScroll:I = 0x7f04015b

-.field public static final homeAsUpIndicator:I = 0x7f040160
+.field public static final homeAsUpIndicator:I = 0x7f040162

-.field public static final homeLayout:I = 0x7f040161
+.field public static final homeLayout:I = 0x7f040163

-.field public static final icon:I = 0x7f0401c2
+.field public static final icon:I = 0x7f0401c4

-.field public static final iconTint:I = 0x7f0401c8
+.field public static final iconTint:I = 0x7f0401ca

-.field public static final iconTintMode:I = 0x7f0401c9
+.field public static final iconTintMode:I = 0x7f0401cb

-.field public static final iconifiedByDefault:I = 0x7f0401ca
+.field public static final iconifiedByDefault:I = 0x7f0401cc

-.field public static final imageButtonStyle:I = 0x7f0401cd
+.field public static final imageButtonStyle:I = 0x7f0401cf

-.field public static final indeterminateProgressStyle:I = 0x7f0401e3
+.field public static final indeterminateProgressStyle:I = 0x7f0401e7

-.field public static final initialActivityCount:I = 0x7f0401e4
+.field public static final initialActivityCount:I = 0x7f0401e8

-.field public static final isLightTheme:I = 0x7f0401e6
+.field public static final isLightTheme:I = 0x7f0401ea

-.field public static final itemPadding:I = 0x7f0401ed
+.field public static final itemPadding:I = 0x7f0401f1

-.field public static final keylines:I = 0x7f0401f4
+.field public static final keylines:I = 0x7f0401f8

-.field public static final lastBaselineToBottomHeight:I = 0x7f0401f6
+.field public static final lastBaselineToBottomHeight:I = 0x7f0401fa

-.field public static final layout:I = 0x7f0401f7
+.field public static final layout:I = 0x7f0401fb

-.field public static final layout_anchor:I = 0x7f0401fa
+.field public static final layout_anchor:I = 0x7f0401fe

-.field public static final layout_anchorGravity:I = 0x7f0401fb
+.field public static final layout_anchorGravity:I = 0x7f0401ff

-.field public static final layout_behavior:I = 0x7f0401fc
+.field public static final layout_behavior:I = 0x7f040200

-.field public static final layout_dodgeInsetEdges:I = 0x7f040228
+.field public static final layout_dodgeInsetEdges:I = 0x7f04022c

-.field public static final layout_insetEdge:I = 0x7f040234
+.field public static final layout_insetEdge:I = 0x7f040238

-.field public static final layout_keyline:I = 0x7f040235
+.field public static final layout_keyline:I = 0x7f040239

-.field public static final lineHeight:I = 0x7f040243
+.field public static final lineHeight:I = 0x7f040247

-.field public static final listChoiceBackgroundIndicator:I = 0x7f040245
+.field public static final listChoiceBackgroundIndicator:I = 0x7f040249

-.field public static final listDividerAlertDialog:I = 0x7f040246
+.field public static final listDividerAlertDialog:I = 0x7f04024a

-.field public static final listItemLayout:I = 0x7f040247
+.field public static final listItemLayout:I = 0x7f04024b

-.field public static final listLayout:I = 0x7f040248
+.field public static final listLayout:I = 0x7f04024c

-.field public static final listMenuViewStyle:I = 0x7f040249
+.field public static final listMenuViewStyle:I = 0x7f04024d

-.field public static final listPopupWindowStyle:I = 0x7f04024a
+.field public static final listPopupWindowStyle:I = 0x7f04024e

-.field public static final listPreferredItemHeight:I = 0x7f04024b
+.field public static final listPreferredItemHeight:I = 0x7f04024f

-.field public static final listPreferredItemHeightLarge:I = 0x7f04024c
+.field public static final listPreferredItemHeightLarge:I = 0x7f040250

-.field public static final listPreferredItemHeightSmall:I = 0x7f04024d
+.field public static final listPreferredItemHeightSmall:I = 0x7f040251

-.field public static final listPreferredItemPaddingLeft:I = 0x7f04024e
+.field public static final listPreferredItemPaddingLeft:I = 0x7f040252

-.field public static final listPreferredItemPaddingRight:I = 0x7f04024f
+.field public static final listPreferredItemPaddingRight:I = 0x7f040253

-.field public static final logo:I = 0x7f040250
+.field public static final logo:I = 0x7f040254

-.field public static final logoDescription:I = 0x7f040251
+.field public static final logoDescription:I = 0x7f040255

-.field public static final maxButtonHeight:I = 0x7f040264
+.field public static final maxButtonHeight:I = 0x7f040268

-.field public static final measureWithLargestChild:I = 0x7f040267
+.field public static final measureWithLargestChild:I = 0x7f04026b

-.field public static final multiChoiceItemLayout:I = 0x7f040269
+.field public static final multiChoiceItemLayout:I = 0x7f04026d

-.field public static final navigationContentDescription:I = 0x7f04026a
+.field public static final navigationContentDescription:I = 0x7f04026e

-.field public static final navigationIcon:I = 0x7f04026b
+.field public static final navigationIcon:I = 0x7f04026f

-.field public static final navigationMode:I = 0x7f04026c
+.field public static final navigationMode:I = 0x7f040270

-.field public static final numericModifiers:I = 0x7f040270
+.field public static final numericModifiers:I = 0x7f040274

-.field public static final overlapAnchor:I = 0x7f040271
+.field public static final overlapAnchor:I = 0x7f040275

-.field public static final paddingBottomNoButtons:I = 0x7f040275
+.field public static final paddingBottomNoButtons:I = 0x7f040279

-.field public static final paddingEnd:I = 0x7f040276
+.field public static final paddingEnd:I = 0x7f04027a

-.field public static final paddingStart:I = 0x7f040277
+.field public static final paddingStart:I = 0x7f04027b

-.field public static final paddingTopNoTitle:I = 0x7f040278
+.field public static final paddingTopNoTitle:I = 0x7f04027c

-.field public static final panelBackground:I = 0x7f040279
+.field public static final panelBackground:I = 0x7f04027d

-.field public static final panelMenuListTheme:I = 0x7f04027a
+.field public static final panelMenuListTheme:I = 0x7f04027e

-.field public static final panelMenuListWidth:I = 0x7f04027b
+.field public static final panelMenuListWidth:I = 0x7f04027f

-.field public static final popupMenuStyle:I = 0x7f040283
+.field public static final popupMenuStyle:I = 0x7f040287

-.field public static final popupTheme:I = 0x7f040284
+.field public static final popupTheme:I = 0x7f040288

-.field public static final popupWindowStyle:I = 0x7f040285
+.field public static final popupWindowStyle:I = 0x7f040289

-.field public static final preserveIconSpacing:I = 0x7f040286
+.field public static final preserveIconSpacing:I = 0x7f04028a

-.field public static final progressBarPadding:I = 0x7f0402b2
+.field public static final progressBarPadding:I = 0x7f0402b6

-.field public static final progressBarStyle:I = 0x7f0402b3
+.field public static final progressBarStyle:I = 0x7f0402b7

-.field public static final queryBackground:I = 0x7f0402b6
+.field public static final queryBackground:I = 0x7f0402ba

-.field public static final queryHint:I = 0x7f0402b7
+.field public static final queryHint:I = 0x7f0402bb

-.field public static final radioButtonStyle:I = 0x7f0402b8
+.field public static final radioButtonStyle:I = 0x7f0402bc

-.field public static final ratingBarStyle:I = 0x7f0402bb
+.field public static final ratingBarStyle:I = 0x7f0402bf

-.field public static final ratingBarStyleIndicator:I = 0x7f0402bc
+.field public static final ratingBarStyleIndicator:I = 0x7f0402c0

-.field public static final ratingBarStyleSmall:I = 0x7f0402bd
+.field public static final ratingBarStyleSmall:I = 0x7f0402c1

-.field public static final searchHintIcon:I = 0x7f0402e2
+.field public static final searchHintIcon:I = 0x7f0402e6

-.field public static final searchIcon:I = 0x7f0402e3
+.field public static final searchIcon:I = 0x7f0402e7

-.field public static final searchViewStyle:I = 0x7f0402e4
+.field public static final searchViewStyle:I = 0x7f0402e8

-.field public static final seekBarStyle:I = 0x7f0402e6
+.field public static final seekBarStyle:I = 0x7f0402ea

-.field public static final selectableItemBackground:I = 0x7f0402e7
+.field public static final selectableItemBackground:I = 0x7f0402eb

-.field public static final selectableItemBackgroundBorderless:I = 0x7f0402e8
+.field public static final selectableItemBackgroundBorderless:I = 0x7f0402ec

-.field public static final showAsAction:I = 0x7f0402ea
+.field public static final showAsAction:I = 0x7f0402ee

-.field public static final showDividers:I = 0x7f0402ee
+.field public static final showDividers:I = 0x7f0402f2

-.field public static final showText:I = 0x7f0402f0
+.field public static final showText:I = 0x7f0402f4

-.field public static final showTitle:I = 0x7f0402f1
+.field public static final showTitle:I = 0x7f0402f5

-.field public static final singleChoiceItemLayout:I = 0x7f0402f2
+.field public static final singleChoiceItemLayout:I = 0x7f0402f6

-.field public static final spinBars:I = 0x7f0402f8
+.field public static final spinBars:I = 0x7f0402fc

-.field public static final spinnerDropDownItemStyle:I = 0x7f0402f9
+.field public static final spinnerDropDownItemStyle:I = 0x7f0402fd

-.field public static final spinnerStyle:I = 0x7f0402fa
+.field public static final spinnerStyle:I = 0x7f0402fe

-.field public static final splitTrack:I = 0x7f0402fb
+.field public static final splitTrack:I = 0x7f0402ff

-.field public static final srcCompat:I = 0x7f0402fc
+.field public static final srcCompat:I = 0x7f040300

-.field public static final state_above_anchor:I = 0x7f0402fe
+.field public static final state_above_anchor:I = 0x7f040302

-.field public static final statusBarBackground:I = 0x7f040303
+.field public static final statusBarBackground:I = 0x7f040307

-.field public static final subMenuArrow:I = 0x7f04030a
+.field public static final subMenuArrow:I = 0x7f04030e

-.field public static final submitBackground:I = 0x7f04030b
+.field public static final submitBackground:I = 0x7f04030f

-.field public static final subtitle:I = 0x7f04030c
+.field public static final subtitle:I = 0x7f040310

-.field public static final subtitleTextAppearance:I = 0x7f04030d
+.field public static final subtitleTextAppearance:I = 0x7f040311

-.field public static final subtitleTextColor:I = 0x7f04030e
+.field public static final subtitleTextColor:I = 0x7f040312

-.field public static final subtitleTextStyle:I = 0x7f04030f
+.field public static final subtitleTextStyle:I = 0x7f040313

-.field public static final suggestionRowLayout:I = 0x7f040310
+.field public static final suggestionRowLayout:I = 0x7f040314

-.field public static final switchMinWidth:I = 0x7f040311
+.field public static final switchMinWidth:I = 0x7f040315

-.field public static final switchPadding:I = 0x7f040312
+.field public static final switchPadding:I = 0x7f040316

-.field public static final switchStyle:I = 0x7f040313
+.field public static final switchStyle:I = 0x7f040317

-.field public static final switchTextAppearance:I = 0x7f040314
+.field public static final switchTextAppearance:I = 0x7f040318

-.field public static final textAllCaps:I = 0x7f040332
+.field public static final textAllCaps:I = 0x7f040336

-.field public static final textAppearanceLargePopupMenu:I = 0x7f04033d
+.field public static final textAppearanceLargePopupMenu:I = 0x7f040341

-.field public static final textAppearanceListItem:I = 0x7f04033e
+.field public static final textAppearanceListItem:I = 0x7f040342

-.field public static final textAppearanceListItemSecondary:I = 0x7f04033f
+.field public static final textAppearanceListItemSecondary:I = 0x7f040343

-.field public static final textAppearanceListItemSmall:I = 0x7f040340
+.field public static final textAppearanceListItemSmall:I = 0x7f040344

-.field public static final textAppearancePopupMenuHeader:I = 0x7f040342
+.field public static final textAppearancePopupMenuHeader:I = 0x7f040346

-.field public static final textAppearanceSearchResultSubtitle:I = 0x7f040343
+.field public static final textAppearanceSearchResultSubtitle:I = 0x7f040347

-.field public static final textAppearanceSearchResultTitle:I = 0x7f040344
+.field public static final textAppearanceSearchResultTitle:I = 0x7f040348

-.field public static final textAppearanceSmallPopupMenu:I = 0x7f040345
+.field public static final textAppearanceSmallPopupMenu:I = 0x7f040349

-.field public static final textColorAlertDialogListItem:I = 0x7f040348
+.field public static final textColorAlertDialogListItem:I = 0x7f04034c

-.field public static final textColorSearchUrl:I = 0x7f040349
+.field public static final textColorSearchUrl:I = 0x7f04034d

-.field public static final theme:I = 0x7f04034e
+.field public static final theme:I = 0x7f040352

-.field public static final thickness:I = 0x7f04039f
+.field public static final thickness:I = 0x7f0403a3

-.field public static final thumbTextPadding:I = 0x7f0403a0
+.field public static final thumbTextPadding:I = 0x7f0403a4

-.field public static final thumbTint:I = 0x7f0403a1
+.field public static final thumbTint:I = 0x7f0403a5

-.field public static final thumbTintMode:I = 0x7f0403a2
+.field public static final thumbTintMode:I = 0x7f0403a6

-.field public static final tickMark:I = 0x7f0403a3
+.field public static final tickMark:I = 0x7f0403a7

-.field public static final tickMarkTint:I = 0x7f0403a4
+.field public static final tickMarkTint:I = 0x7f0403a8

-.field public static final tickMarkTintMode:I = 0x7f0403a5
+.field public static final tickMarkTintMode:I = 0x7f0403a9

-.field public static final tint:I = 0x7f0403a6
+.field public static final tint:I = 0x7f0403aa

-.field public static final tintMode:I = 0x7f0403a7
+.field public static final tintMode:I = 0x7f0403ab

-.field public static final title:I = 0x7f0403a8
+.field public static final title:I = 0x7f0403ac

-.field public static final titleMargin:I = 0x7f0403aa
+.field public static final titleMargin:I = 0x7f0403ae

-.field public static final titleMarginBottom:I = 0x7f0403ab
+.field public static final titleMarginBottom:I = 0x7f0403af

-.field public static final titleMarginEnd:I = 0x7f0403ac
+.field public static final titleMarginEnd:I = 0x7f0403b0

-.field public static final titleMarginStart:I = 0x7f0403ad
+.field public static final titleMarginStart:I = 0x7f0403b1

-.field public static final titleMarginTop:I = 0x7f0403ae
+.field public static final titleMarginTop:I = 0x7f0403b2

-.field public static final titleMargins:I = 0x7f0403af
+.field public static final titleMargins:I = 0x7f0403b3

-.field public static final titleTextAppearance:I = 0x7f0403b0
+.field public static final titleTextAppearance:I = 0x7f0403b4

-.field public static final titleTextColor:I = 0x7f0403b1
+.field public static final titleTextColor:I = 0x7f0403b5

-.field public static final titleTextStyle:I = 0x7f0403b2
+.field public static final titleTextStyle:I = 0x7f0403b6

-.field public static final toolbarNavigationButtonStyle:I = 0x7f0403b4
+.field public static final toolbarNavigationButtonStyle:I = 0x7f0403b8

-.field public static final toolbarStyle:I = 0x7f0403b5
+.field public static final toolbarStyle:I = 0x7f0403b9

-.field public static final tooltipForegroundColor:I = 0x7f0403b6
+.field public static final tooltipForegroundColor:I = 0x7f0403ba

-.field public static final tooltipFrameBackground:I = 0x7f0403b7
+.field public static final tooltipFrameBackground:I = 0x7f0403bb

-.field public static final tooltipText:I = 0x7f0403b8
+.field public static final tooltipText:I = 0x7f0403bc

-.field public static final track:I = 0x7f0403b9
+.field public static final track:I = 0x7f0403bd

-.field public static final trackTint:I = 0x7f0403ba
+.field public static final trackTint:I = 0x7f0403be

-.field public static final trackTintMode:I = 0x7f0403bb
+.field public static final trackTintMode:I = 0x7f0403bf

-.field public static final ttcIndex:I = 0x7f0403bc
+.field public static final ttcIndex:I = 0x7f0403c0

-.field public static final viewInflaterClass:I = 0x7f0403d5
+.field public static final viewInflaterClass:I = 0x7f0403d9

-.field public static final voiceIcon:I = 0x7f0403d6
+.field public static final voiceIcon:I = 0x7f0403da

-.field public static final windowActionBar:I = 0x7f0403d9
+.field public static final windowActionBar:I = 0x7f0403dc

-.field public static final windowActionBarOverlay:I = 0x7f0403da
+.field public static final windowActionBarOverlay:I = 0x7f0403dd

-.field public static final windowActionModeOverlay:I = 0x7f0403db
+.field public static final windowActionModeOverlay:I = 0x7f0403de

-.field public static final windowFixedHeightMajor:I = 0x7f0403dc
+.field public static final windowFixedHeightMajor:I = 0x7f0403df

-.field public static final windowFixedHeightMinor:I = 0x7f0403dd
+.field public static final windowFixedHeightMinor:I = 0x7f0403e0

-.field public static final windowFixedWidthMajor:I = 0x7f0403de
+.field public static final windowFixedWidthMajor:I = 0x7f0403e1

-.field public static final windowFixedWidthMinor:I = 0x7f0403df
+.field public static final windowFixedWidthMinor:I = 0x7f0403e2

-.field public static final windowMinWidthMajor:I = 0x7f0403e0
+.field public static final windowMinWidthMajor:I = 0x7f0403e3

-.field public static final windowMinWidthMinor:I = 0x7f0403e1
+.field public static final windowMinWidthMinor:I = 0x7f0403e4

-.field public static final windowNoTitle:I = 0x7f0403e2
+.field public static final windowNoTitle:I = 0x7f0403e5


 # direct methods
--- a/com.discord/smali/androidx/appcompat/R$drawable.smali
+++ b/com.discord/smali/androidx/appcompat/R$drawable.smali
@ -183,33 +183,33 @@

 .field public static final abc_vector_test:I = 0x7f080069

-.field public static final notification_action_background:I = 0x7f08042c
+.field public static final notification_action_background:I = 0x7f080431

-.field public static final notification_bg:I = 0x7f08042d
+.field public static final notification_bg:I = 0x7f080432

-.field public static final notification_bg_low:I = 0x7f08042e
+.field public static final notification_bg_low:I = 0x7f080433

-.field public static final notification_bg_low_normal:I = 0x7f08042f
+.field public static final notification_bg_low_normal:I = 0x7f080434

-.field public static final notification_bg_low_pressed:I = 0x7f080430
+.field public static final notification_bg_low_pressed:I = 0x7f080435

-.field public static final notification_bg_normal:I = 0x7f080431
+.field public static final notification_bg_normal:I = 0x7f080436

-.field public static final notification_bg_normal_pressed:I = 0x7f080432
+.field public static final notification_bg_normal_pressed:I = 0x7f080437

-.field public static final notification_icon_background:I = 0x7f080433
+.field public static final notification_icon_background:I = 0x7f080438

-.field public static final notification_template_icon_bg:I = 0x7f080434
+.field public static final notification_template_icon_bg:I = 0x7f080439

-.field public static final notification_template_icon_low_bg:I = 0x7f080435
+.field public static final notification_template_icon_low_bg:I = 0x7f08043a

-.field public static final notification_tile_bg:I = 0x7f080436
+.field public static final notification_tile_bg:I = 0x7f08043b

-.field public static final notify_panel_notification_icon_bg:I = 0x7f080437
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08043c

-.field public static final tooltip_frame_dark:I = 0x7f08043c
+.field public static final tooltip_frame_dark:I = 0x7f080441

-.field public static final tooltip_frame_light:I = 0x7f08043d
+.field public static final tooltip_frame_light:I = 0x7f080442


 # direct methods
--- a/com.discord/smali/androidx/appcompat/R$id.smali
+++ b/com.discord/smali/androidx/appcompat/R$id.smali
@ -131,99 +131,99 @@

 .field public static final parentPanel:I = 0x7f0a04c9

-.field public static final progress_circular:I = 0x7f0a0546
+.field public static final progress_circular:I = 0x7f0a0549

-.field public static final progress_horizontal:I = 0x7f0a0548
+.field public static final progress_horizontal:I = 0x7f0a054b

-.field public static final radio:I = 0x7f0a0553
+.field public static final radio:I = 0x7f0a0556

-.field public static final right:I = 0x7f0a056d
+.field public static final right:I = 0x7f0a0570

-.field public static final right_icon:I = 0x7f0a056e
+.field public static final right_icon:I = 0x7f0a0571

-.field public static final right_side:I = 0x7f0a056f
+.field public static final right_side:I = 0x7f0a0572

-.field public static final screen:I = 0x7f0a059d
+.field public static final screen:I = 0x7f0a05a0

-.field public static final scrollIndicatorDown:I = 0x7f0a059f
+.field public static final scrollIndicatorDown:I = 0x7f0a05a2

-.field public static final scrollIndicatorUp:I = 0x7f0a05a0
+.field public static final scrollIndicatorUp:I = 0x7f0a05a3

-.field public static final scrollView:I = 0x7f0a05a1
+.field public static final scrollView:I = 0x7f0a05a4

-.field public static final search_badge:I = 0x7f0a05a5
+.field public static final search_badge:I = 0x7f0a05a8

-.field public static final search_bar:I = 0x7f0a05a6
+.field public static final search_bar:I = 0x7f0a05a9

-.field public static final search_button:I = 0x7f0a05a7
+.field public static final search_button:I = 0x7f0a05aa

-.field public static final search_close_btn:I = 0x7f0a05a9
+.field public static final search_close_btn:I = 0x7f0a05ac

-.field public static final search_edit_frame:I = 0x7f0a05aa
+.field public static final search_edit_frame:I = 0x7f0a05ad

-.field public static final search_go_btn:I = 0x7f0a05ad
+.field public static final search_go_btn:I = 0x7f0a05b0

-.field public static final search_mag_icon:I = 0x7f0a05af
+.field public static final search_mag_icon:I = 0x7f0a05b2

-.field public static final search_plate:I = 0x7f0a05b0
+.field public static final search_plate:I = 0x7f0a05b3

-.field public static final search_src_text:I = 0x7f0a05b3
+.field public static final search_src_text:I = 0x7f0a05b6

-.field public static final search_voice_btn:I = 0x7f0a05bf
+.field public static final search_voice_btn:I = 0x7f0a05c2

-.field public static final select_dialog_listview:I = 0x7f0a05c0
+.field public static final select_dialog_listview:I = 0x7f0a05c3

-.field public static final shortcut:I = 0x7f0a06fa
+.field public static final shortcut:I = 0x7f0a06fd

-.field public static final spacer:I = 0x7f0a0706
+.field public static final spacer:I = 0x7f0a0709

-.field public static final split_action_bar:I = 0x7f0a0707
+.field public static final split_action_bar:I = 0x7f0a070a

-.field public static final src_atop:I = 0x7f0a070a
+.field public static final src_atop:I = 0x7f0a070d

-.field public static final src_in:I = 0x7f0a070b
+.field public static final src_in:I = 0x7f0a070e

-.field public static final src_over:I = 0x7f0a070c
+.field public static final src_over:I = 0x7f0a070f

-.field public static final start:I = 0x7f0a070f
+.field public static final start:I = 0x7f0a0712

-.field public static final submenuarrow:I = 0x7f0a0727
+.field public static final submenuarrow:I = 0x7f0a072a

-.field public static final submit_area:I = 0x7f0a0728
+.field public static final submit_area:I = 0x7f0a072b

-.field public static final tabMode:I = 0x7f0a0734
+.field public static final tabMode:I = 0x7f0a0737

-.field public static final tag_transition_group:I = 0x7f0a073a
+.field public static final tag_transition_group:I = 0x7f0a073d

-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a073b
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a073e

-.field public static final tag_unhandled_key_listeners:I = 0x7f0a073c
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a073f

-.field public static final text:I = 0x7f0a0742
+.field public static final text:I = 0x7f0a0745

-.field public static final text2:I = 0x7f0a0743
+.field public static final text2:I = 0x7f0a0746

-.field public static final textSpacerNoButtons:I = 0x7f0a0744
+.field public static final textSpacerNoButtons:I = 0x7f0a0747

-.field public static final textSpacerNoTitle:I = 0x7f0a0745
+.field public static final textSpacerNoTitle:I = 0x7f0a0748

-.field public static final time:I = 0x7f0a0751
+.field public static final time:I = 0x7f0a0754

-.field public static final title:I = 0x7f0a0752
+.field public static final title:I = 0x7f0a0755

-.field public static final titleDividerNoCustom:I = 0x7f0a0753
+.field public static final titleDividerNoCustom:I = 0x7f0a0756

-.field public static final title_template:I = 0x7f0a0754
+.field public static final title_template:I = 0x7f0a0757

-.field public static final top:I = 0x7f0a0759
+.field public static final top:I = 0x7f0a075c

-.field public static final topPanel:I = 0x7f0a075a
+.field public static final topPanel:I = 0x7f0a075d

-.field public static final uniform:I = 0x7f0a076d
+.field public static final uniform:I = 0x7f0a0770

-.field public static final up:I = 0x7f0a0770
+.field public static final up:I = 0x7f0a0773

-.field public static final wrap_content:I = 0x7f0a0830
+.field public static final wrap_content:I = 0x7f0a0833


 # direct methods
--- a/com.discord/smali/androidx/appcompat/R$string.smali
+++ b/com.discord/smali/androidx/appcompat/R$string.smali
@ -93,9 +93,9 @@

 .field public static final abc_toolbar_collapse_description:I = 0x7f12002a

-.field public static final search_menu_title:I = 0x7f120f88
+.field public static final search_menu_title:I = 0x7f120f8a

-.field public static final status_bar_notification_info_overflow:I = 0x7f12104e
+.field public static final status_bar_notification_info_overflow:I = 0x7f121050


 # direct methods
--- a/com.discord/smali/androidx/appcompat/R$style.smali
+++ b/com.discord/smali/androidx/appcompat/R$style.smali
--- a/com.discord/smali/androidx/appcompat/R$styleable.smali
+++ b/com.discord/smali/androidx/appcompat/R$styleable.smali
@ -1166,7 +1166,7 @@

    new-array v5, v1, [I

-    const v6, 0x7f0402fe
+    const v6, 0x7f040302

    aput v6, v5, v3

@ -1255,60 +1255,60 @@
        0x7f04004c
        0x7f04004e
        0x7f04004f
-        0x7f0400c6
-        0x7f0400c7
        0x7f0400c8
        0x7f0400c9
        0x7f0400ca
        0x7f0400cb
-        0x7f0400e7
-        0x7f040101
-        0x7f040102
-        0x7f040110
-        0x7f040154
-        0x7f040159
-        0x7f040160
-        0x7f040161
-        0x7f0401c2
-        0x7f0401e3
-        0x7f0401ed
-        0x7f040250
-        0x7f04026c
-        0x7f040284
-        0x7f0402b2
-        0x7f0402b3
-        0x7f04030c
-        0x7f04030f
-        0x7f0403a8
-        0x7f0403b2
+        0x7f0400cc
+        0x7f0400cd
+        0x7f0400e9
+        0x7f040103
+        0x7f040104
+        0x7f040112
+        0x7f040156
+        0x7f04015b
+        0x7f040162
+        0x7f040163
+        0x7f0401c4
+        0x7f0401e7
+        0x7f0401f1
+        0x7f040254
+        0x7f040270
+        0x7f040288
+        0x7f0402b6
+        0x7f0402b7
+        0x7f040310
+        0x7f040313
+        0x7f0403ac
+        0x7f0403b6
    .end array-data

    :array_1
    .array-data 4
        0x7f04004c
        0x7f04004e
-        0x7f0400aa
-        0x7f040154
-        0x7f04030f
-        0x7f0403b2
+        0x7f0400ac
+        0x7f040156
+        0x7f040313
+        0x7f0403b6
    .end array-data

    :array_2
    .array-data 4
-        0x7f040116
-        0x7f0401e4
+        0x7f040118
+        0x7f0401e8
    .end array-data

    :array_3
    .array-data 4
        0x10100f2
-        0x7f040078
-        0x7f040079
-        0x7f040247
-        0x7f040248
-        0x7f040269
-        0x7f0402f1
-        0x7f0402f2
+        0x7f04007a
+        0x7f04007b
+        0x7f04024b
+        0x7f04024c
+        0x7f04026d
+        0x7f0402f5
+        0x7f0402f6
    .end array-data

    :array_4
@ -1338,17 +1338,17 @@
    :array_7
    .array-data 4
        0x1010119
-        0x7f0402fc
-        0x7f0403a6
-        0x7f0403a7
+        0x7f040300
+        0x7f0403aa
+        0x7f0403ab
    .end array-data

    :array_8
    .array-data 4
        0x1010142
-        0x7f0403a3
-        0x7f0403a4
-        0x7f0403a5
+        0x7f0403a7
+        0x7f0403a8
+        0x7f0403a9
    .end array-data

    :array_9
@ -1370,11 +1370,11 @@
        0x7f040048
        0x7f040049
        0x7f04004a
-        0x7f04012f
-        0x7f04013d
-        0x7f0401f6
-        0x7f040243
-        0x7f040332
+        0x7f040131
+        0x7f04013f
+        0x7f0401fa
+        0x7f040247
+        0x7f040336
    .end array-data

    :array_b
@ -1417,82 +1417,79 @@
        0x7f04002b
        0x7f04002c
        0x7f040044
-        0x7f040063
-        0x7f040072
-        0x7f040073
+        0x7f040065
        0x7f040074
        0x7f040075
        0x7f040076
-        0x7f04007b
-        0x7f04007c
-        0x7f04008a
-        0x7f04008f
-        0x7f0400b0
-        0x7f0400b1
+        0x7f040077
+        0x7f040078
+        0x7f04007d
+        0x7f04007e
+        0x7f04008c
+        0x7f040091
        0x7f0400b2
        0x7f0400b3
        0x7f0400b4
        0x7f0400b5
        0x7f0400b6
        0x7f0400b7
-        0x7f0400ba
-        0x7f0400bf
-        0x7f0400d2
-        0x7f0400fe
-        0x7f0400ff
+        0x7f0400b8
+        0x7f0400b9
+        0x7f0400bc
+        0x7f0400c1
+        0x7f0400d4
        0x7f040100
-        0x7f040106
+        0x7f040101
+        0x7f040102
        0x7f040108
-        0x7f04010b
-        0x7f04010c
+        0x7f04010a
        0x7f04010d
        0x7f04010e
        0x7f04010f
-        0x7f040160
-        0x7f0401cd
-        0x7f040245
-        0x7f040246
+        0x7f040110
+        0x7f040111
+        0x7f040162
+        0x7f0401cf
        0x7f040249
        0x7f04024a
-        0x7f04024b
-        0x7f04024c
        0x7f04024d
        0x7f04024e
        0x7f04024f
-        0x7f040279
-        0x7f04027a
-        0x7f04027b
-        0x7f040283
-        0x7f040285
-        0x7f0402b8
-        0x7f0402bb
+        0x7f040250
+        0x7f040251
+        0x7f040252
+        0x7f040253
+        0x7f04027d
+        0x7f04027e
+        0x7f04027f
+        0x7f040287
+        0x7f040289
        0x7f0402bc
-        0x7f0402bd
-        0x7f0402e4
-        0x7f0402e6
-        0x7f0402e7
+        0x7f0402bf
+        0x7f0402c0
+        0x7f0402c1
        0x7f0402e8
-        0x7f0402f9
-        0x7f0402fa
-        0x7f040313
-        0x7f04033d
-        0x7f04033e
-        0x7f04033f
-        0x7f040340
+        0x7f0402ea
+        0x7f0402eb
+        0x7f0402ec
+        0x7f0402fd
+        0x7f0402fe
+        0x7f040317
+        0x7f040341
        0x7f040342
        0x7f040343
        0x7f040344
-        0x7f040345
+        0x7f040346
+        0x7f040347
        0x7f040348
        0x7f040349
-        0x7f0403b4
-        0x7f0403b5
-        0x7f0403b6
-        0x7f0403b7
-        0x7f0403d5
+        0x7f04034c
+        0x7f04034d
+        0x7f0403b8
+        0x7f0403b9
+        0x7f0403ba
+        0x7f0403bb
        0x7f0403d9
-        0x7f0403da
-        0x7f0403db
        0x7f0403dc
        0x7f0403dd
        0x7f0403de
@ -1500,6 +1497,9 @@
        0x7f0403e0
        0x7f0403e1
        0x7f0403e2
+        0x7f0403e3
+        0x7f0403e4
+        0x7f0403e5
    .end array-data

    :array_c
@ -1512,25 +1512,25 @@
    :array_d
    .array-data 4
        0x1010107
-        0x7f04007d
-        0x7f04007e
+        0x7f04007f
+        0x7f040080
    .end array-data

    :array_e
    .array-data 4
-        0x7f0401f4
-        0x7f040303
+        0x7f0401f8
+        0x7f040307
    .end array-data

    :array_f
    .array-data 4
        0x10100b3
-        0x7f0401fa
-        0x7f0401fb
-        0x7f0401fc
-        0x7f040228
-        0x7f040234
-        0x7f040235
+        0x7f0401fe
+        0x7f0401ff
+        0x7f040200
+        0x7f04022c
+        0x7f040238
+        0x7f040239
    .end array-data

    :array_10
@ -1538,21 +1538,21 @@
        0x7f04003b
        0x7f04003c
        0x7f040052
-        0x7f0400af
-        0x7f040109
-        0x7f040148
-        0x7f0402f8
-        0x7f04039f
+        0x7f0400b1
+        0x7f04010b
+        0x7f04014a
+        0x7f0402fc
+        0x7f0403a3
    .end array-data

    :array_11
    .array-data 4
-        0x7f04013e
-        0x7f04013f
        0x7f040140
        0x7f040141
        0x7f040142
        0x7f040143
+        0x7f040144
+        0x7f040145
    .end array-data

    :array_12
@ -1562,11 +1562,11 @@
        0x101053f
        0x101056f
        0x1010570
-        0x7f04013c
-        0x7f040144
-        0x7f040145
+        0x7f04013e
        0x7f040146
-        0x7f0403bc
+        0x7f040147
+        0x7f040148
+        0x7f0403c0
    .end array-data

    :array_13
@ -1598,10 +1598,10 @@
        0x1010126
        0x1010127
        0x1010128
-        0x7f040102
-        0x7f040107
-        0x7f040267
-        0x7f0402ee
+        0x7f040104
+        0x7f040109
+        0x7f04026b
+        0x7f0402f2
    .end array-data

    :array_16
@ -1647,12 +1647,12 @@
        0x7f04001f
        0x7f040020
        0x7f040031
-        0x7f0400c5
-        0x7f0401c8
-        0x7f0401c9
-        0x7f040270
-        0x7f0402ea
-        0x7f0403b8
+        0x7f0400c7
+        0x7f0401ca
+        0x7f0401cb
+        0x7f040274
+        0x7f0402ee
+        0x7f0403bc
    .end array-data

    :array_1a
@ -1664,21 +1664,21 @@
        0x101012f
        0x1010130
        0x1010131
-        0x7f040286
-        0x7f04030a
+        0x7f04028a
+        0x7f04030e
    .end array-data

    :array_1b
    .array-data 4
        0x1010176
        0x10102c9
-        0x7f040271
+        0x7f040275
    .end array-data

    :array_1c
    .array-data 4
-        0x7f040275
-        0x7f040278
+        0x7f040279
+        0x7f04027c
    .end array-data

    :array_1d
@ -1687,19 +1687,19 @@
        0x101011f
        0x1010220
        0x1010264
-        0x7f0400a3
-        0x7f0400c0
-        0x7f0400fd
-        0x7f04014d
-        0x7f0401ca
-        0x7f0401f7
-        0x7f0402b6
-        0x7f0402b7
-        0x7f0402e2
-        0x7f0402e3
-        0x7f04030b
-        0x7f040310
-        0x7f0403d6
+        0x7f0400a5
+        0x7f0400c2
+        0x7f0400ff
+        0x7f04014f
+        0x7f0401cc
+        0x7f0401fb
+        0x7f0402ba
+        0x7f0402bb
+        0x7f0402e6
+        0x7f0402e7
+        0x7f04030f
+        0x7f040314
+        0x7f0403da
    .end array-data

    :array_1e
@ -1708,7 +1708,7 @@
        0x1010176
        0x101017b
        0x1010262
-        0x7f040284
+        0x7f040288
    .end array-data

    :array_1f
@ -1726,17 +1726,17 @@
        0x1010124
        0x1010125
        0x1010142
-        0x7f0402f0
-        0x7f0402fb
-        0x7f040311
-        0x7f040312
-        0x7f040314
-        0x7f0403a0
-        0x7f0403a1
-        0x7f0403a2
-        0x7f0403b9
-        0x7f0403ba
-        0x7f0403bb
+        0x7f0402f4
+        0x7f0402ff
+        0x7f040315
+        0x7f040316
+        0x7f040318
+        0x7f0403a4
+        0x7f0403a5
+        0x7f0403a6
+        0x7f0403bd
+        0x7f0403be
+        0x7f0403bf
    .end array-data

    :array_21
@ -1752,50 +1752,50 @@
        0x1010163
        0x1010164
        0x10103ac
-        0x7f04013d
-        0x7f040332
+        0x7f04013f
+        0x7f040336
    .end array-data

    :array_22
    .array-data 4
        0x10100af
        0x1010140
-        0x7f040077
-        0x7f0400ab
-        0x7f0400ac
-        0x7f0400c6
-        0x7f0400c7
+        0x7f040079
+        0x7f0400ad
+        0x7f0400ae
        0x7f0400c8
        0x7f0400c9
        0x7f0400ca
        0x7f0400cb
-        0x7f040250
-        0x7f040251
-        0x7f040264
-        0x7f04026a
-        0x7f04026b
-        0x7f040284
-        0x7f04030c
-        0x7f04030d
-        0x7f04030e
-        0x7f0403a8
-        0x7f0403aa
-        0x7f0403ab
+        0x7f0400cc
+        0x7f0400cd
+        0x7f040254
+        0x7f040255
+        0x7f040268
+        0x7f04026e
+        0x7f04026f
+        0x7f040288
+        0x7f040310
+        0x7f040311
+        0x7f040312
        0x7f0403ac
-        0x7f0403ad
        0x7f0403ae
        0x7f0403af
        0x7f0403b0
        0x7f0403b1
+        0x7f0403b2
+        0x7f0403b3
+        0x7f0403b4
+        0x7f0403b5
    .end array-data

    :array_23
    .array-data 4
        0x1010000
        0x10100da
-        0x7f040276
-        0x7f040277
-        0x7f04034e
+        0x7f04027a
+        0x7f04027b
+        0x7f040352
    .end array-data

    :array_24
--- a/com.discord/smali/androidx/asynclayoutinflater/R$attr.smali
+++ b/com.discord/smali/androidx/asynclayoutinflater/R$attr.smali
@ -17,27 +17,27 @@
 # static fields
 .field public static final alpha:I = 0x7f040030

-.field public static final font:I = 0x7f04013c
+.field public static final font:I = 0x7f04013e

-.field public static final fontProviderAuthority:I = 0x7f04013e
+.field public static final fontProviderAuthority:I = 0x7f040140

-.field public static final fontProviderCerts:I = 0x7f04013f
+.field public static final fontProviderCerts:I = 0x7f040141

-.field public static final fontProviderFetchStrategy:I = 0x7f040140
+.field public static final fontProviderFetchStrategy:I = 0x7f040142

-.field public static final fontProviderFetchTimeout:I = 0x7f040141
+.field public static final fontProviderFetchTimeout:I = 0x7f040143

-.field public static final fontProviderPackage:I = 0x7f040142
+.field public static final fontProviderPackage:I = 0x7f040144

-.field public static final fontProviderQuery:I = 0x7f040143
+.field public static final fontProviderQuery:I = 0x7f040145

-.field public static final fontStyle:I = 0x7f040144
+.field public static final fontStyle:I = 0x7f040146

-.field public static final fontVariationSettings:I = 0x7f040145
+.field public static final fontVariationSettings:I = 0x7f040147

-.field public static final fontWeight:I = 0x7f040146
+.field public static final fontWeight:I = 0x7f040148

-.field public static final ttcIndex:I = 0x7f0403bc
+.field public static final ttcIndex:I = 0x7f0403c0


 # direct methods
--- 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 = 0x7f08042c
+.field public static final notification_action_background:I = 0x7f080431

-.field public static final notification_bg:I = 0x7f08042d
+.field public static final notification_bg:I = 0x7f080432

-.field public static final notification_bg_low:I = 0x7f08042e
+.field public static final notification_bg_low:I = 0x7f080433

-.field public static final notification_bg_low_normal:I = 0x7f08042f
+.field public static final notification_bg_low_normal:I = 0x7f080434

-.field public static final notification_bg_low_pressed:I = 0x7f080430
+.field public static final notification_bg_low_pressed:I = 0x7f080435

-.field public static final notification_bg_normal:I = 0x7f080431
+.field public static final notification_bg_normal:I = 0x7f080436

-.field public static final notification_bg_normal_pressed:I = 0x7f080432
+.field public static final notification_bg_normal_pressed:I = 0x7f080437

-.field public static final notification_icon_background:I = 0x7f080433
+.field public static final notification_icon_background:I = 0x7f080438

-.field public static final notification_template_icon_bg:I = 0x7f080434
+.field public static final notification_template_icon_bg:I = 0x7f080439

-.field public static final notification_template_icon_low_bg:I = 0x7f080435
+.field public static final notification_template_icon_low_bg:I = 0x7f08043a

-.field public static final notification_tile_bg:I = 0x7f080436
+.field public static final notification_tile_bg:I = 0x7f08043b

-.field public static final notify_panel_notification_icon_bg:I = 0x7f080437
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08043c


 # direct methods
--- a/com.discord/smali/androidx/asynclayoutinflater/R$id.smali
+++ b/com.discord/smali/androidx/asynclayoutinflater/R$id.smali
@ -53,23 +53,23 @@

 .field public static final notification_main_column_container:I = 0x7f0a049c

-.field public static final right_icon:I = 0x7f0a056e
+.field public static final right_icon:I = 0x7f0a0571

-.field public static final right_side:I = 0x7f0a056f
+.field public static final right_side:I = 0x7f0a0572

-.field public static final tag_transition_group:I = 0x7f0a073a
+.field public static final tag_transition_group:I = 0x7f0a073d

-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a073b
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a073e

-.field public static final tag_unhandled_key_listeners:I = 0x7f0a073c
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a073f

-.field public static final text:I = 0x7f0a0742
+.field public static final text:I = 0x7f0a0745

-.field public static final text2:I = 0x7f0a0743
+.field public static final text2:I = 0x7f0a0746

-.field public static final time:I = 0x7f0a0751
+.field public static final time:I = 0x7f0a0754

-.field public static final title:I = 0x7f0a0752
+.field public static final title:I = 0x7f0a0755


 # direct methods
--- a/com.discord/smali/androidx/asynclayoutinflater/R$string.smali
+++ b/com.discord/smali/androidx/asynclayoutinflater/R$string.smali
@ -15,7 +15,7 @@


 # static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f12104e
+.field public static final status_bar_notification_info_overflow:I = 0x7f121050


 # direct methods
--- a/com.discord/smali/androidx/asynclayoutinflater/R$style.smali
+++ b/com.discord/smali/androidx/asynclayoutinflater/R$style.smali
@ -15,19 +15,19 @@


 # static fields
-.field public static final TextAppearance_Compat_Notification:I = 0x7f130182
+.field public static final TextAppearance_Compat_Notification:I = 0x7f130181

-.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f130183
+.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f130182

-.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f130185
+.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f130184

-.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f130188
+.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f130187

-.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13018a
+.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f130189

-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1302f5
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1302f4

-.field public static final Widget_Compat_NotificationActionText:I = 0x7f1302f6
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f1302f5


 # direct methods
--- a/com.discord/smali/androidx/asynclayoutinflater/R$styleable.smali
+++ b/com.discord/smali/androidx/asynclayoutinflater/R$styleable.smali
@ -149,12 +149,12 @@

    :array_1
    .array-data 4
-        0x7f04013e
-        0x7f04013f
        0x7f040140
        0x7f040141
        0x7f040142
        0x7f040143
+        0x7f040144
+        0x7f040145
    .end array-data

    :array_2
@ -164,11 +164,11 @@
        0x101053f
        0x101056f
        0x1010570
-        0x7f04013c
-        0x7f040144
-        0x7f040145
+        0x7f04013e
        0x7f040146
-        0x7f0403bc
+        0x7f040147
+        0x7f040148
+        0x7f0403c0
    .end array-data

    :array_3
--- a/com.discord/smali/androidx/browser/R$attr.smali
+++ b/com.discord/smali/androidx/browser/R$attr.smali
@ -17,45 +17,45 @@
 # static fields
 .field public static final alpha:I = 0x7f040030

-.field public static final coordinatorLayoutStyle:I = 0x7f0400d3
+.field public static final coordinatorLayoutStyle:I = 0x7f0400d5

-.field public static final font:I = 0x7f04013c
+.field public static final font:I = 0x7f04013e

-.field public static final fontProviderAuthority:I = 0x7f04013e
+.field public static final fontProviderAuthority:I = 0x7f040140

-.field public static final fontProviderCerts:I = 0x7f04013f
+.field public static final fontProviderCerts:I = 0x7f040141

-.field public static final fontProviderFetchStrategy:I = 0x7f040140
+.field public static final fontProviderFetchStrategy:I = 0x7f040142

-.field public static final fontProviderFetchTimeout:I = 0x7f040141
+.field public static final fontProviderFetchTimeout:I = 0x7f040143

-.field public static final fontProviderPackage:I = 0x7f040142
+.field public static final fontProviderPackage:I = 0x7f040144

-.field public static final fontProviderQuery:I = 0x7f040143
+.field public static final fontProviderQuery:I = 0x7f040145

-.field public static final fontStyle:I = 0x7f040144
+.field public static final fontStyle:I = 0x7f040146

-.field public static final fontVariationSettings:I = 0x7f040145
+.field public static final fontVariationSettings:I = 0x7f040147

-.field public static final fontWeight:I = 0x7f040146
+.field public static final fontWeight:I = 0x7f040148

-.field public static final keylines:I = 0x7f0401f4
+.field public static final keylines:I = 0x7f0401f8

-.field public static final layout_anchor:I = 0x7f0401fa
+.field public static final layout_anchor:I = 0x7f0401fe

-.field public static final layout_anchorGravity:I = 0x7f0401fb
+.field public static final layout_anchorGravity:I = 0x7f0401ff

-.field public static final layout_behavior:I = 0x7f0401fc
+.field public static final layout_behavior:I = 0x7f040200

-.field public static final layout_dodgeInsetEdges:I = 0x7f040228
+.field public static final layout_dodgeInsetEdges:I = 0x7f04022c

-.field public static final layout_insetEdge:I = 0x7f040234
+.field public static final layout_insetEdge:I = 0x7f040238

-.field public static final layout_keyline:I = 0x7f040235
+.field public static final layout_keyline:I = 0x7f040239

-.field public static final statusBarBackground:I = 0x7f040303
+.field public static final statusBarBackground:I = 0x7f040307

-.field public static final ttcIndex:I = 0x7f0403bc
+.field public static final ttcIndex:I = 0x7f0403c0


 # direct methods
--- 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 = 0x7f08042c
+.field public static final notification_action_background:I = 0x7f080431

-.field public static final notification_bg:I = 0x7f08042d
+.field public static final notification_bg:I = 0x7f080432

-.field public static final notification_bg_low:I = 0x7f08042e
+.field public static final notification_bg_low:I = 0x7f080433

-.field public static final notification_bg_low_normal:I = 0x7f08042f
+.field public static final notification_bg_low_normal:I = 0x7f080434

-.field public static final notification_bg_low_pressed:I = 0x7f080430
+.field public static final notification_bg_low_pressed:I = 0x7f080435

-.field public static final notification_bg_normal:I = 0x7f080431
+.field public static final notification_bg_normal:I = 0x7f080436

-.field public static final notification_bg_normal_pressed:I = 0x7f080432
+.field public static final notification_bg_normal_pressed:I = 0x7f080437

-.field public static final notification_icon_background:I = 0x7f080433
+.field public static final notification_icon_background:I = 0x7f080438

-.field public static final notification_template_icon_bg:I = 0x7f080434
+.field public static final notification_template_icon_bg:I = 0x7f080439

-.field public static final notification_template_icon_low_bg:I = 0x7f080435
+.field public static final notification_template_icon_low_bg:I = 0x7f08043a

-.field public static final notification_tile_bg:I = 0x7f080436
+.field public static final notification_tile_bg:I = 0x7f08043b

-.field public static final notify_panel_notification_icon_bg:I = 0x7f080437
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08043c


 # direct methods
--- a/com.discord/smali/androidx/browser/R$id.smali
+++ b/com.discord/smali/androidx/browser/R$id.smali
@ -71,29 +71,29 @@

 .field public static final notification_main_column_container:I = 0x7f0a049c

-.field public static final right:I = 0x7f0a056d
+.field public static final right:I = 0x7f0a0570

-.field public static final right_icon:I = 0x7f0a056e
+.field public static final right_icon:I = 0x7f0a0571

-.field public static final right_side:I = 0x7f0a056f
+.field public static final right_side:I = 0x7f0a0572

-.field public static final start:I = 0x7f0a070f
+.field public static final start:I = 0x7f0a0712

-.field public static final tag_transition_group:I = 0x7f0a073a
+.field public static final tag_transition_group:I = 0x7f0a073d

-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a073b
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a073e

-.field public static final tag_unhandled_key_listeners:I = 0x7f0a073c
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a073f

-.field public static final text:I = 0x7f0a0742
+.field public static final text:I = 0x7f0a0745

-.field public static final text2:I = 0x7f0a0743
+.field public static final text2:I = 0x7f0a0746

-.field public static final time:I = 0x7f0a0751
+.field public static final time:I = 0x7f0a0754

-.field public static final title:I = 0x7f0a0752
+.field public static final title:I = 0x7f0a0755

-.field public static final top:I = 0x7f0a0759
+.field public static final top:I = 0x7f0a075c


 # direct methods
--- a/com.discord/smali/androidx/browser/R$string.smali
+++ b/com.discord/smali/androidx/browser/R$string.smali
@ -15,7 +15,7 @@


 # static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f12104e
+.field public static final status_bar_notification_info_overflow:I = 0x7f121050


 # direct methods
--- a/com.discord/smali/androidx/browser/R$style.smali
+++ b/com.discord/smali/androidx/browser/R$style.smali
@ -15,21 +15,21 @@


 # static fields
-.field public static final TextAppearance_Compat_Notification:I = 0x7f130182
+.field public static final TextAppearance_Compat_Notification:I = 0x7f130181

-.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f130183
+.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f130182

-.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f130185
+.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f130184

-.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f130188
+.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f130187

-.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f13018a
+.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f130189

-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1302f5
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f1302f4

-.field public static final Widget_Compat_NotificationActionText:I = 0x7f1302f6
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f1302f5

-.field public static final Widget_Support_CoordinatorLayout:I = 0x7f130325
+.field public static final Widget_Support_CoordinatorLayout:I = 0x7f130324


 # direct methods
--- a/com.discord/smali/androidx/browser/R$styleable.smali
+++ b/com.discord/smali/androidx/browser/R$styleable.smali
@ -183,29 +183,29 @@

    :array_1
    .array-data 4
-        0x7f0401f4
-        0x7f040303
+        0x7f0401f8
+        0x7f040307
    .end array-data

    :array_2
    .array-data 4
        0x10100b3
-        0x7f0401fa
-        0x7f0401fb
-        0x7f0401fc
-        0x7f040228
-        0x7f040234
-        0x7f040235
+        0x7f0401fe
+        0x7f0401ff
+        0x7f040200
+        0x7f04022c
+        0x7f040238
+        0x7f040239
    .end array-data

    :array_3
    .array-data 4
-        0x7f04013e
-        0x7f04013f
        0x7f040140
        0x7f040141
        0x7f040142
        0x7f040143
+        0x7f040144
+        0x7f040145
    .end array-data

    :array_4
@ -215,11 +215,11 @@
        0x101053f
        0x101056f
        0x1010570
-        0x7f04013c
-        0x7f040144
-        0x7f040145
+        0x7f04013e
        0x7f040146
-        0x7f0403bc
+        0x7f040147
+        0x7f040148
+        0x7f0403c0
    .end array-data

    :array_5
--- a/com.discord/smali/androidx/cardview/R$attr.smali
+++ b/com.discord/smali/androidx/cardview/R$attr.smali
@ -15,29 +15,29 @@


 # static fields
-.field public static final cardBackgroundColor:I = 0x7f04007f
+.field public static final cardBackgroundColor:I = 0x7f040081

-.field public static final cardCornerRadius:I = 0x7f040080
+.field public static final cardCornerRadius:I = 0x7f040082

-.field public static final cardElevation:I = 0x7f040081
+.field public static final cardElevation:I = 0x7f040083

-.field public static final cardMaxElevation:I = 0x7f040082
+.field public static final cardMaxElevation:I = 0x7f040084

-.field public static final cardPreventCornerOverlap:I = 0x7f040083
+.field public static final cardPreventCornerOverlap:I = 0x7f040085

-.field public static final cardUseCompatPadding:I = 0x7f040084
+.field public static final cardUseCompatPadding:I = 0x7f040086

-.field public static final cardViewStyle:I = 0x7f040085
+.field public static final cardViewStyle:I = 0x7f040087

-.field public static final contentPadding:I = 0x7f0400cc
+.field public static final contentPadding:I = 0x7f0400ce

-.field public static final contentPaddingBottom:I = 0x7f0400cd
+.field public static final contentPaddingBottom:I = 0x7f0400cf

-.field public static final contentPaddingLeft:I = 0x7f0400ce
+.field public static final contentPaddingLeft:I = 0x7f0400d0

-.field public static final contentPaddingRight:I = 0x7f0400cf
+.field public static final contentPaddingRight:I = 0x7f0400d1

-.field public static final contentPaddingTop:I = 0x7f0400d0
+.field public static final contentPaddingTop:I = 0x7f0400d2


 # direct methods
--- a/com.discord/smali/androidx/cardview/R$style.smali
+++ b/com.discord/smali/androidx/cardview/R$style.smali
@ -15,13 +15,13 @@


 # static fields
-.field public static final Base_CardView:I = 0x7f13003c
+.field public static final Base_CardView:I = 0x7f13003b

-.field public static final CardView:I = 0x7f1300f3
+.field public static final CardView:I = 0x7f1300f2

-.field public static final CardView_Dark:I = 0x7f1300f4
+.field public static final CardView_Dark:I = 0x7f1300f3

-.field public static final CardView_Light:I = 0x7f1300f5
+.field public static final CardView_Light:I = 0x7f1300f4


 # direct methods
--- a/com.discord/smali/androidx/cardview/R$styleable.smali
+++ b/com.discord/smali/androidx/cardview/R$styleable.smali
@ -62,17 +62,17 @@
    .array-data 4
        0x101013f
        0x1010140
-        0x7f04007f
-        0x7f040080
        0x7f040081
        0x7f040082
        0x7f040083
        0x7f040084
-        0x7f0400cc
-        0x7f0400cd
+        0x7f040085
+        0x7f040086
        0x7f0400ce
        0x7f0400cf
        0x7f0400d0
+        0x7f0400d1
+        0x7f0400d2
    .end array-data
 .end method

--- a/com.discord/smali/androidx/constraintlayout/widget/R$attr.smali
+++ b/com.discord/smali/androidx/constraintlayout/widget/R$attr.smali
@ -19,115 +19,115 @@

 .field public static final barrierDirection:I = 0x7f040054

-.field public static final chainUseRtl:I = 0x7f040087
+.field public static final chainUseRtl:I = 0x7f040089

-.field public static final constraintSet:I = 0x7f0400c1
+.field public static final constraintSet:I = 0x7f0400c3

-.field public static final constraint_referenced_ids:I = 0x7f0400c2
+.field public static final constraint_referenced_ids:I = 0x7f0400c4

-.field public static final content:I = 0x7f0400c4
+.field public static final content:I = 0x7f0400c6

-.field public static final emptyVisibility:I = 0x7f040111
+.field public static final emptyVisibility:I = 0x7f040113

-.field public static final layout_constrainedHeight:I = 0x7f0401ff
+.field public static final layout_constrainedHeight:I = 0x7f040203

-.field public static final layout_constrainedWidth:I = 0x7f040200
+.field public static final layout_constrainedWidth:I = 0x7f040204

-.field public static final layout_constraintBaseline_creator:I = 0x7f040201
+.field public static final layout_constraintBaseline_creator:I = 0x7f040205

-.field public static final layout_constraintBaseline_toBaselineOf:I = 0x7f040202
+.field public static final layout_constraintBaseline_toBaselineOf:I = 0x7f040206

-.field public static final layout_constraintBottom_creator:I = 0x7f040203
+.field public static final layout_constraintBottom_creator:I = 0x7f040207

-.field public static final layout_constraintBottom_toBottomOf:I = 0x7f040204
+.field public static final layout_constraintBottom_toBottomOf:I = 0x7f040208

-.field public static final layout_constraintBottom_toTopOf:I = 0x7f040205
+.field public static final layout_constraintBottom_toTopOf:I = 0x7f040209

-.field public static final layout_constraintCircle:I = 0x7f040206
+.field public static final layout_constraintCircle:I = 0x7f04020a

-.field public static final layout_constraintCircleAngle:I = 0x7f040207
+.field public static final layout_constraintCircleAngle:I = 0x7f04020b

-.field public static final layout_constraintCircleRadius:I = 0x7f040208
+.field public static final layout_constraintCircleRadius:I = 0x7f04020c

-.field public static final layout_constraintDimensionRatio:I = 0x7f040209
+.field public static final layout_constraintDimensionRatio:I = 0x7f04020d

-.field public static final layout_constraintEnd_toEndOf:I = 0x7f04020a
+.field public static final layout_constraintEnd_toEndOf:I = 0x7f04020e

-.field public static final layout_constraintEnd_toStartOf:I = 0x7f04020b
+.field public static final layout_constraintEnd_toStartOf:I = 0x7f04020f

-.field public static final layout_constraintGuide_begin:I = 0x7f04020c
+.field public static final layout_constraintGuide_begin:I = 0x7f040210

-.field public static final layout_constraintGuide_end:I = 0x7f04020d
+.field public static final layout_constraintGuide_end:I = 0x7f040211

-.field public static final layout_constraintGuide_percent:I = 0x7f04020e
+.field public static final layout_constraintGuide_percent:I = 0x7f040212

-.field public static final layout_constraintHeight_default:I = 0x7f04020f
+.field public static final layout_constraintHeight_default:I = 0x7f040213

-.field public static final layout_constraintHeight_max:I = 0x7f040210
+.field public static final layout_constraintHeight_max:I = 0x7f040214

-.field public static final layout_constraintHeight_min:I = 0x7f040211
+.field public static final layout_constraintHeight_min:I = 0x7f040215

-.field public static final layout_constraintHeight_percent:I = 0x7f040212
+.field public static final layout_constraintHeight_percent:I = 0x7f040216

-.field public static final layout_constraintHorizontal_bias:I = 0x7f040213
+.field public static final layout_constraintHorizontal_bias:I = 0x7f040217

-.field public static final layout_constraintHorizontal_chainStyle:I = 0x7f040214
+.field public static final layout_constraintHorizontal_chainStyle:I = 0x7f040218

-.field public static final layout_constraintHorizontal_weight:I = 0x7f040215
+.field public static final layout_constraintHorizontal_weight:I = 0x7f040219

-.field public static final layout_constraintLeft_creator:I = 0x7f040216
+.field public static final layout_constraintLeft_creator:I = 0x7f04021a

-.field public static final layout_constraintLeft_toLeftOf:I = 0x7f040217
+.field public static final layout_constraintLeft_toLeftOf:I = 0x7f04021b

-.field public static final layout_constraintLeft_toRightOf:I = 0x7f040218
+.field public static final layout_constraintLeft_toRightOf:I = 0x7f04021c

-.field public static final layout_constraintRight_creator:I = 0x7f040219
+.field public static final layout_constraintRight_creator:I = 0x7f04021d

-.field public static final layout_constraintRight_toLeftOf:I = 0x7f04021a
+.field public static final layout_constraintRight_toLeftOf:I = 0x7f04021e

-.field public static final layout_constraintRight_toRightOf:I = 0x7f04021b
+.field public static final layout_constraintRight_toRightOf:I = 0x7f04021f

-.field public static final layout_constraintStart_toEndOf:I = 0x7f04021c
+.field public static final layout_constraintStart_toEndOf:I = 0x7f040220

-.field public static final layout_constraintStart_toStartOf:I = 0x7f04021d
+.field public static final layout_constraintStart_toStartOf:I = 0x7f040221

-.field public static final layout_constraintTop_creator:I = 0x7f04021e
+.field public static final layout_constraintTop_creator:I = 0x7f040222

-.field public static final layout_constraintTop_toBottomOf:I = 0x7f04021f
+.field public static final layout_constraintTop_toBottomOf:I = 0x7f040223

-.field public static final layout_constraintTop_toTopOf:I = 0x7f040220
+.field public static final layout_constraintTop_toTopOf:I = 0x7f040224

-.field public static final layout_constraintVertical_bias:I = 0x7f040221
+.field public static final layout_constraintVertical_bias:I = 0x7f040225

-.field public static final layout_constraintVertical_chainStyle:I = 0x7f040222
+.field public static final layout_constraintVertical_chainStyle:I = 0x7f040226

-.field public static final layout_constraintVertical_weight:I = 0x7f040223
+.field public static final layout_constraintVertical_weight:I = 0x7f040227

-.field public static final layout_constraintWidth_default:I = 0x7f040224
+.field public static final layout_constraintWidth_default:I = 0x7f040228

-.field public static final layout_constraintWidth_max:I = 0x7f040225
+.field public static final layout_constraintWidth_max:I = 0x7f040229

-.field public static final layout_constraintWidth_min:I = 0x7f040226
+.field public static final layout_constraintWidth_min:I = 0x7f04022a

-.field public static final layout_constraintWidth_percent:I = 0x7f040227
+.field public static final layout_constraintWidth_percent:I = 0x7f04022b

-.field public static final layout_editor_absoluteX:I = 0x7f040229
+.field public static final layout_editor_absoluteX:I = 0x7f04022d

-.field public static final layout_editor_absoluteY:I = 0x7f04022a
+.field public static final layout_editor_absoluteY:I = 0x7f04022e

-.field public static final layout_goneMarginBottom:I = 0x7f04022e
+.field public static final layout_goneMarginBottom:I = 0x7f040232

-.field public static final layout_goneMarginEnd:I = 0x7f04022f
+.field public static final layout_goneMarginEnd:I = 0x7f040233

-.field public static final layout_goneMarginLeft:I = 0x7f040230
+.field public static final layout_goneMarginLeft:I = 0x7f040234

-.field public static final layout_goneMarginRight:I = 0x7f040231
+.field public static final layout_goneMarginRight:I = 0x7f040235

-.field public static final layout_goneMarginStart:I = 0x7f040232
+.field public static final layout_goneMarginStart:I = 0x7f040236

-.field public static final layout_goneMarginTop:I = 0x7f040233
+.field public static final layout_goneMarginTop:I = 0x7f040237

-.field public static final layout_optimizationLevel:I = 0x7f04023a
+.field public static final layout_optimizationLevel:I = 0x7f04023e


 # direct methods
--- a/com.discord/smali/androidx/constraintlayout/widget/R$id.smali
+++ b/com.discord/smali/androidx/constraintlayout/widget/R$id.smali
@ -31,17 +31,17 @@

 .field public static final percent:I = 0x7f0a04fb

-.field public static final right:I = 0x7f0a056d
+.field public static final right:I = 0x7f0a0570

-.field public static final spread:I = 0x7f0a0708
+.field public static final spread:I = 0x7f0a070b

-.field public static final spread_inside:I = 0x7f0a0709
+.field public static final spread_inside:I = 0x7f0a070c

-.field public static final start:I = 0x7f0a070f
+.field public static final start:I = 0x7f0a0712

-.field public static final top:I = 0x7f0a0759
+.field public static final top:I = 0x7f0a075c

-.field public static final wrap:I = 0x7f0a082f
+.field public static final wrap:I = 0x7f0a0832


 # direct methods
--- a/com.discord/smali/androidx/constraintlayout/widget/R$styleable.smali
+++ b/com.discord/smali/androidx/constraintlayout/widget/R$styleable.smali
@ -361,13 +361,9 @@
        0x1010140
        0x7f040053
        0x7f040054
-        0x7f040087
-        0x7f0400c1
-        0x7f0400c2
-        0x7f0401ff
-        0x7f040200
-        0x7f040201
-        0x7f040202
+        0x7f040089
+        0x7f0400c3
+        0x7f0400c4
        0x7f040203
        0x7f040204
        0x7f040205
@ -405,21 +401,25 @@
        0x7f040225
        0x7f040226
        0x7f040227
+        0x7f040228
        0x7f040229
        0x7f04022a
+        0x7f04022b
+        0x7f04022d
        0x7f04022e
-        0x7f04022f
-        0x7f040230
-        0x7f040231
        0x7f040232
        0x7f040233
-        0x7f04023a
+        0x7f040234
+        0x7f040235
+        0x7f040236
+        0x7f040237
+        0x7f04023e
    .end array-data

    :array_1
    .array-data 4
-        0x7f0400c4
-        0x7f040111
+        0x7f0400c6
+        0x7f040113
    .end array-data

    :array_2
@ -453,12 +453,8 @@
        0x1010440
        0x7f040053
        0x7f040054
-        0x7f040087
-        0x7f0400c2
-        0x7f0401ff
-        0x7f040200
-        0x7f040201
-        0x7f040202
+        0x7f040089
+        0x7f0400c4
        0x7f040203
        0x7f040204
        0x7f040205
@ -496,14 +492,18 @@
        0x7f040225
        0x7f040226
        0x7f040227
+        0x7f040228
        0x7f040229
        0x7f04022a
+        0x7f04022b
+        0x7f04022d
        0x7f04022e
-        0x7f04022f
-        0x7f040230
-        0x7f040231
        0x7f040232
        0x7f040233
+        0x7f040234
+        0x7f040235
+        0x7f040236
+        0x7f040237
    .end array-data
 .end method

--- a/Show More
+++ b/Show More