diff --git a/patches/customtheme/1180.patch b/patches/customtheme/1180.patch
index e69de29..8b67e43 100644
--- a/patches/customtheme/1180.patch
+++ b/patches/customtheme/1180.patch
@@ -0,0 +1,344 @@
+diff -crB from/res/drawable/drawable_bg_corners_20dp.xml to/res/drawable/drawable_bg_corners_20dp.xml
+*** from/res/drawable/drawable_bg_corners_20dp.xml	2020-06-20 04:18:48.131397789 +0100
+--- to/res/drawable/drawable_bg_corners_20dp.xml	2020-06-20 04:42:54.845439247 +0100
+***************
+*** 1,6 ****
+  <?xml version="1.0" encoding="utf-8"?>
+  <shape
+    xmlns:android="http://schemas.android.com/apk/res/android">
+!     <solid android:color="@color/white" />
+      <corners android:radius="20.0dip" />
+  </shape>
+\ No newline at end of file
+--- 1,6 ----
+  <?xml version="1.0" encoding="utf-8"?>
+  <shape
+    xmlns:android="http://schemas.android.com/apk/res/android">
+!     <solid android:color="@android:color/transparent" />
+      <corners android:radius="20.0dip" />
+  </shape>
+\ No newline at end of file
+diff -crB from/res/drawable/drawable_circle_black.xml to/res/drawable/drawable_circle_black.xml
+*** from/res/drawable/drawable_circle_black.xml	2020-06-20 04:18:48.845392566 +0100
+--- to/res/drawable/drawable_circle_black.xml	2020-06-20 04:42:54.845439247 +0100
+***************
+*** 1,5 ****
+  <?xml version="1.0" encoding="utf-8"?>
+  <shape android:shape="oval"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+!     <solid android:color="@color/black" />
+  </shape>
+\ No newline at end of file
+--- 1,5 ----
+  <?xml version="1.0" encoding="utf-8"?>
+  <shape android:shape="oval"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+!     <solid android:color="@android:color/transparent" />
+  </shape>
+\ No newline at end of file
+diff -crB from/res/drawable/drawable_overlay_channels_active_dark.xml to/res/drawable/drawable_overlay_channels_active_dark.xml
+*** from/res/drawable/drawable_overlay_channels_active_dark.xml	2020-06-20 04:18:48.243396970 +0100
+--- to/res/drawable/drawable_overlay_channels_active_dark.xml	2020-06-20 04:42:54.845439247 +0100
+***************
+*** 3,9 ****
+    xmlns:android="http://schemas.android.com/apk/res/android">
+      <item android:left="8.0dip" android:right="8.0dip">
+          <shape android:shape="rectangle">
+!             <solid android:color="#ff42464d" />
+              <corners android:radius="4.0dip" />
+          </shape>
+      </item>
+--- 3,9 ----
+    xmlns:android="http://schemas.android.com/apk/res/android">
+      <item android:left="8.0dip" android:right="8.0dip">
+          <shape android:shape="rectangle">
+!             <solid android:color="@color/primary_500" />
+              <corners android:radius="4.0dip" />
+          </shape>
+      </item>
+diff -crB from/res/values/colors.xml to/res/values/colors.xml
+*** from/res/values/colors.xml	2020-06-20 04:18:49.599387051 +0100
+--- to/res/values/colors.xml	2020-06-20 04:42:54.845439247 +0100
+***************
+*** 105,114 ****
+      <color name="common_google_signin_btn_text_light_disabled">#1f000000</color>
+      <color name="common_google_signin_btn_text_light_focused">#90000000</color>
+      <color name="common_google_signin_btn_text_light_pressed">#de000000</color>
+!     <color name="dark_grey_2">#ff36393e</color>
+!     <color name="dark_grey_2_alpha_10">#ff303337</color>
+      <color name="design_bottom_navigation_shadow_color">#14000000</color>
+!     <color name="design_dark_default_color_background">#ff121212</color>
+      <color name="design_dark_default_color_error">#ffcf6679</color>
+      <color name="design_dark_default_color_on_background">#ffffffff</color>
+      <color name="design_dark_default_color_on_error">#ff000000</color>
+--- 105,114 ----
+      <color name="common_google_signin_btn_text_light_disabled">#1f000000</color>
+      <color name="common_google_signin_btn_text_light_focused">#90000000</color>
+      <color name="common_google_signin_btn_text_light_pressed">#de000000</color>
+!     <color name="dark_grey_2">#ff000000</color>
+!     <color name="dark_grey_2_alpha_10">#ff000000</color>
+      <color name="design_bottom_navigation_shadow_color">#14000000</color>
+!     <color name="design_dark_default_color_background">#ff000000</color>
+      <color name="design_dark_default_color_error">#ffcf6679</color>
+      <color name="design_dark_default_color_on_background">#ffffffff</color>
+      <color name="design_dark_default_color_on_error">#ff000000</color>
+***************
+*** 120,126 ****
+      <color name="design_dark_default_color_primary_variant">#ff3700b3</color>
+      <color name="design_dark_default_color_secondary">#ff03dac6</color>
+      <color name="design_dark_default_color_secondary_variant">#ff03dac6</color>
+!     <color name="design_dark_default_color_surface">#ff121212</color>
+      <color name="design_default_color_background">#ffffffff</color>
+      <color name="design_default_color_error">#ffb00020</color>
+      <color name="design_default_color_on_background">#ff000000</color>
+--- 120,126 ----
+      <color name="design_dark_default_color_primary_variant">#ff3700b3</color>
+      <color name="design_dark_default_color_secondary">#ff03dac6</color>
+      <color name="design_dark_default_color_secondary_variant">#ff03dac6</color>
+!     <color name="design_dark_default_color_surface">#ff000000</color>
+      <color name="design_default_color_background">#ffffffff</color>
+      <color name="design_default_color_error">#ffb00020</color>
+      <color name="design_default_color_on_background">#ff000000</color>
+***************
+*** 165,172 ****
+      <color name="grey_3_alpha_30">#4d737f8d</color>
+      <color name="grey_4">#ff949494</color>
+      <color name="grey_6_alpha_05">#0d4f545c</color>
+!     <color name="grey_account">#ff282b30</color>
+!     <color name="grey_unread">#ff8a8e94</color>
+      <color name="highlighted_text_material_dark">#6680cbc4</color>
+      <color name="highlighted_text_material_light">#66009688</color>
+      <color name="hypesquad_house_1">#ff9c84ef</color>
+--- 165,172 ----
+      <color name="grey_3_alpha_30">#4d737f8d</color>
+      <color name="grey_4">#ff949494</color>
+      <color name="grey_6_alpha_05">#0d4f545c</color>
+!     <color name="grey_account">#ff000000</color>
+!     <color name="grey_unread">#ff000000</color>
+      <color name="highlighted_text_material_dark">#6680cbc4</color>
+      <color name="highlighted_text_material_light">#66009688</color>
+      <color name="hypesquad_house_1">#ff9c84ef</color>
+***************
+*** 176,182 ****
+      <color name="hypesquad_house_3">#ff45ddc0</color>
+      <color name="hypesquad_house_3_500">#ff45ddc0</color>
+      <color name="league_of_legends">#ff021f25</color>
+!     <color name="link">#ff00b0f4</color>
+      <color name="link_100">#fff2fbfe</color>
+      <color name="link_130">#ffe8f8fe</color>
+      <color name="link_160">#ffdaf4fd</color>
+--- 176,182 ----
+      <color name="hypesquad_house_3">#ff45ddc0</color>
+      <color name="hypesquad_house_3_500">#ff45ddc0</color>
+      <color name="league_of_legends">#ff021f25</color>
+!     <color name="link">#ff50f148</color>
+      <color name="link_100">#fff2fbfe</color>
+      <color name="link_130">#ffe8f8fe</color>
+      <color name="link_160">#ffdaf4fd</color>
+***************
+*** 264,283 ****
+      <color name="primary_400">#ff72767d</color>
+      <color name="primary_400_alpha_30">#4d72767d</color>
+      <color name="primary_400_alpha_60">#9972767d</color>
+!     <color name="primary_500">#ff4f545c</color>
+!     <color name="primary_500_alpha_20">#334f545c</color>
+!     <color name="primary_500_alpha_30">#4d4f545c</color>
+!     <color name="primary_500_alpha_32">#514f545c</color>
+!     <color name="primary_500_alpha_60">#994f545c</color>
+      <color name="primary_560">#ff40444b</color>
+!     <color name="primary_600">#ff36393f</color>
+!     <color name="primary_600_alpha_60">#9936393f</color>
+!     <color name="primary_630">#ff2f3136</color>
+!     <color name="primary_630_alpha_60">#992f3136</color>
+!     <color name="primary_630_alpha_90">#e62f3136</color>
+!     <color name="primary_660">#ff292b2f</color>
+!     <color name="primary_700">#ff202225</color>
+!     <color name="primary_700_alpha_60">#99202225</color>
+      <color name="primary_800">#ff18191c</color>
+      <color name="primary_800_alpha_50">#8018191c</color>
+      <color name="primary_800_alpha_60">#9918191c</color>
+--- 264,283 ----
+      <color name="primary_400">#ff72767d</color>
+      <color name="primary_400_alpha_30">#4d72767d</color>
+      <color name="primary_400_alpha_60">#9972767d</color>
+!     <color name="primary_500">#ff333333</color>
+!     <color name="primary_500_alpha_20">#330f0f0f</color>
+!     <color name="primary_500_alpha_30">#4d0f0f0f</color>
+!     <color name="primary_500_alpha_32">#510f0f0f</color>
+!     <color name="primary_500_alpha_60">#990f0f0f</color>
+      <color name="primary_560">#ff40444b</color>
+!     <color name="primary_600">#ff000000</color>
+!     <color name="primary_600_alpha_60">#99000000</color>
+!     <color name="primary_630">#ff000000</color>
+!     <color name="primary_630_alpha_60">#99000000</color>
+!     <color name="primary_630_alpha_90">#e6000000</color>
+!     <color name="primary_660">#ff000000</color>
+!     <color name="primary_700">#ff000000</color>
+!     <color name="primary_700_alpha_60">#990f0f0f</color>
+      <color name="primary_800">#ff18191c</color>
+      <color name="primary_800_alpha_50">#8018191c</color>
+      <color name="primary_800_alpha_60">#9918191c</color>
+***************
+*** 302,311 ****
+      <color name="primary_dark_500">#ff4f545c</color>
+      <color name="primary_dark_530">#ff484c54</color>
+      <color name="primary_dark_560">#ff40444b</color>
+!     <color name="primary_dark_600">#ff36393f</color>
+!     <color name="primary_dark_630">#ff2f3136</color>
+      <color name="primary_dark_660">#ff292b2f</color>
+!     <color name="primary_dark_700">#ff202225</color>
+      <color name="primary_dark_730">#ff1e1f22</color>
+      <color name="primary_dark_760">#ff1b1d20</color>
+      <color name="primary_dark_800">#ff18191c</color>
+--- 302,311 ----
+      <color name="primary_dark_500">#ff4f545c</color>
+      <color name="primary_dark_530">#ff484c54</color>
+      <color name="primary_dark_560">#ff40444b</color>
+!     <color name="primary_dark_600">#ff000000</color>
+!     <color name="primary_dark_630">#ff000000</color>
+      <color name="primary_dark_660">#ff292b2f</color>
+!     <color name="primary_dark_700">#ff000000</color>
+      <color name="primary_dark_730">#ff1e1f22</color>
+      <color name="primary_dark_760">#ff1b1d20</color>
+      <color name="primary_dark_800">#ff18191c</color>
+***************
+*** 351,359 ****
+      <color name="primary_text_default_material_light">#de000000</color>
+      <color name="primary_text_disabled_material_dark">#4dffffff</color>
+      <color name="primary_text_disabled_material_light">#39000000</color>
+!     <color name="purple_brand">#ff738bd7</color>
+!     <color name="purple_brand_alpha_10">#1a738bd7</color>
+!     <color name="purple_brand_dark">#ff697ec4</color>
+      <color name="purple_brand_hint">#ffc9d2f0</color>
+      <color name="purple_brand_notification">#ff5161ff</color>
+      <color name="reaction_background_me_dark">#4d5c6a9e</color>
+--- 351,359 ----
+      <color name="primary_text_default_material_light">#de000000</color>
+      <color name="primary_text_disabled_material_dark">#4dffffff</color>
+      <color name="primary_text_disabled_material_light">#39000000</color>
+!     <color name="purple_brand">#ff9c4249</color>
+!     <color name="purple_brand_alpha_10">#1a9c4249</color>
+!     <color name="purple_brand_dark">#ff000000</color>
+      <color name="purple_brand_hint">#ffc9d2f0</color>
+      <color name="purple_brand_notification">#ff5161ff</color>
+      <color name="reaction_background_me_dark">#4d5c6a9e</color>
+***************
+*** 492,498 ****
+      <color name="switch_thumb_disabled_material_light">#ffbdbdbd</color>
+      <color name="switch_thumb_normal_material_dark">#ffbdbdbd</color>
+      <color name="switch_thumb_normal_material_light">#fff1f1f1</color>
+!     <color name="tooltip_background_dark">#e6616161</color>
+      <color name="tooltip_background_light">#e6ffffff</color>
+      <color name="transparent">@android:color/transparent</color>
+      <color name="twitch">#ff593695</color>
+--- 492,498 ----
+      <color name="switch_thumb_disabled_material_light">#ffbdbdbd</color>
+      <color name="switch_thumb_normal_material_dark">#ffbdbdbd</color>
+      <color name="switch_thumb_normal_material_light">#fff1f1f1</color>
+!     <color name="tooltip_background_dark">#e6000000</color>
+      <color name="tooltip_background_light">#e6ffffff</color>
+      <color name="transparent">@android:color/transparent</color>
+      <color name="twitch">#ff593695</color>
+diff -crB from/res/values/styles.xml to/res/values/styles.xml
+*** from/res/values/styles.xml	2020-06-20 04:18:49.557387358 +0100
+--- to/res/values/styles.xml	2020-06-20 04:42:54.847439234 +0100
+***************
+*** 402,408 ****
+          <item name="tabTextColor">@color/white_alpha_40</item>
+          <item name="theme_backspace_icon">@drawable/ic_backspace_white_24dp</item>
+          <item name="theme_chat_block_quote_divider">@color/primary_500</item>
+!         <item name="theme_chat_blocked_bg">#ff34373c</item>
+          <item name="theme_chat_blocked_text">@color/grey_unread</item>
+          <item name="theme_chat_code">@color/primary_630</item>
+          <item name="theme_chat_codeblock_border">@color/grey_account</item>
+--- 402,408 ----
+          <item name="tabTextColor">@color/white_alpha_40</item>
+          <item name="theme_backspace_icon">@drawable/ic_backspace_white_24dp</item>
+          <item name="theme_chat_block_quote_divider">@color/primary_500</item>
+!         <item name="theme_chat_blocked_bg">@color/primary_500</item>
+          <item name="theme_chat_blocked_text">@color/grey_unread</item>
+          <item name="theme_chat_code">@color/primary_630</item>
+          <item name="theme_chat_codeblock_border">@color/grey_account</item>
+***************
+*** 414,426 ****
+          <item name="theme_chat_input_button_tint_colors">@color/chat_input_button_tint_colors_dark</item>
+          <item name="theme_chat_input_content_tab_bg">@drawable/drawable_rect_rounded_dark</item>
+          <item name="theme_chat_input_divider">@color/dark_grey_2_alpha_10</item>
+!         <item name="theme_chat_input_edit">#ff3e4145</item>
+          <item name="theme_chat_input_photo_selection_icon">@drawable/ic_img_selected_dark_theme</item>
+          <item name="theme_chat_loading_spinner_color">@color/white</item>
+!         <item name="theme_chat_mentioned_me">#1afaa61a</item>
+          <item name="theme_chat_reaction_background">@drawable/drawable_bg_reaction_dark</item>
+          <item name="theme_chat_reaction_text_color">@drawable/drawable_reaction_text_color_dark</item>
+!         <item name="theme_chat_spoiler_bg">@color/primary_700</item>
+          <item name="theme_chat_spoiler_bg_visible">@color/white_alpha_10</item>
+          <item name="theme_chat_spoiler_inapp_bg">@color/primary_600</item>
+          <item name="theme_emoji_icon_activity">@drawable/ic_emoji_activity_dark</item>
+--- 414,426 ----
+          <item name="theme_chat_input_button_tint_colors">@color/chat_input_button_tint_colors_dark</item>
+          <item name="theme_chat_input_content_tab_bg">@drawable/drawable_rect_rounded_dark</item>
+          <item name="theme_chat_input_divider">@color/dark_grey_2_alpha_10</item>
+!         <item name="theme_chat_input_edit">@color/primary_600</item>
+          <item name="theme_chat_input_photo_selection_icon">@drawable/ic_img_selected_dark_theme</item>
+          <item name="theme_chat_loading_spinner_color">@color/white</item>
+!         <item name="theme_chat_mentioned_me">@color/purple_brand_alpha_10</item>
+          <item name="theme_chat_reaction_background">@drawable/drawable_bg_reaction_dark</item>
+          <item name="theme_chat_reaction_text_color">@drawable/drawable_reaction_text_color_dark</item>
+!         <item name="theme_chat_spoiler_bg">@color/primary_500</item>
+          <item name="theme_chat_spoiler_bg_visible">@color/white_alpha_10</item>
+          <item name="theme_chat_spoiler_inapp_bg">@color/primary_600</item>
+          <item name="theme_emoji_icon_activity">@drawable/ic_emoji_activity_dark</item>
+***************
+*** 832,838 ****
+          <item name="colorControlActivated">@color/brand_500</item>
+          <item name="colorControlNormal">@color/primary_100</item>
+          <item name="colorPrimary">@color/primary_600</item>
+!         <item name="colorPrimaryDark">#ff2b2e31</item>
+      </style>
+      <style name="AppTheme.Dark.Evil" parent="@style/AppTheme.Dark">
+          <item name="colorAccent">@color/brand_600</item>
+--- 832,838 ----
+          <item name="colorControlActivated">@color/brand_500</item>
+          <item name="colorControlNormal">@color/primary_100</item>
+          <item name="colorPrimary">@color/primary_600</item>
+!         <item name="colorPrimaryDark">@color/primary_630</item>
+      </style>
+      <style name="AppTheme.Dark.Evil" parent="@style/AppTheme.Dark">
+          <item name="colorAccent">@color/brand_600</item>
+***************
+*** 862,868 ****
+          <item name="colorControlActivated">@color/brand_500</item>
+          <item name="colorControlNormal">@color/primary_100</item>
+          <item name="colorPrimary">@color/primary_600</item>
+!         <item name="colorPrimaryDark">#ff2b2e31</item>
+      </style>
+      <style name="AppTheme.Dark.Notice.PositiveRed" parent="@style/AppTheme.Dark.Notice">
+          <item name="buttonBarPositiveButtonStyle">@style/UiKit.Material.Button.Red.Fit</item>
+--- 862,868 ----
+          <item name="colorControlActivated">@color/brand_500</item>
+          <item name="colorControlNormal">@color/primary_100</item>
+          <item name="colorPrimary">@color/primary_600</item>
+!         <item name="colorPrimaryDark">@color/primary_630</item>
+      </style>
+      <style name="AppTheme.Dark.Notice.PositiveRed" parent="@style/AppTheme.Dark.Notice">
+          <item name="buttonBarPositiveButtonStyle">@style/UiKit.Material.Button.Red.Fit</item>
+diff -crB from/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1.smali to/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1.smali
+*** from/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1.smali	2020-06-20 04:18:53.089361533 +0100
+--- to/smali_classes2/com/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1.smali	2020-06-20 04:43:21.609259791 +0100
+***************
+*** 78,84 ****
+      .line 3
+      iget-object v0, p0, Lcom/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1;->this$0:Lcom/discord/widgets/tabs/WidgetTabsHost;
+  
+!     const v1, 0x7f060253
+  
+      invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroidx/fragment/app/Fragment;I)I
+  
+--- 78,84 ----
+      .line 3
+      iget-object v0, p0, Lcom/discord/widgets/tabs/WidgetTabsHost$configureSystemStatusBar$1;->this$0:Lcom/discord/widgets/tabs/WidgetTabsHost;
+  
+!     const v1, 0x7f060022
+  
+      invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroidx/fragment/app/Fragment;I)I
+  
diff --git a/patches/nozlib/1180.patch b/patches/nozlib/1180.patch
index e69de29..e8c7cd3 100644
--- a/patches/nozlib/1180.patch
+++ b/patches/nozlib/1180.patch
@@ -0,0 +1,34 @@
+diff -crB from/smali/com/discord/gateway/GatewaySocket.smali to/smali/com/discord/gateway/GatewaySocket.smali
+*** from/smali/com/discord/gateway/GatewaySocket.smali	2020-06-20 04:18:51.353374224 +0100
+--- to/smali/com/discord/gateway/GatewaySocket.smali	2020-06-20 04:19:18.297177665 +0100
+***************
+*** 1333,1339 ****
+  
+      invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+  
+!     const-string p1, "/?encoding=json&v=6&compress=zlib-stream"
+  
+      invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+  
+--- 1333,1339 ----
+  
+      invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+  
+!     const-string p1, "/?encoding=json&v=6"
+  
+      invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+  
+diff -crB from/smali/com/discord/gateway/io/OutgoingPayload$Identify.smali to/smali/com/discord/gateway/io/OutgoingPayload$Identify.smali
+*** from/smali/com/discord/gateway/io/OutgoingPayload$Identify.smali	2020-06-20 04:18:51.359374181 +0100
+--- to/smali/com/discord/gateway/io/OutgoingPayload$Identify.smali	2020-06-20 04:19:18.297177665 +0100
+***************
+*** 68,73 ****
+--- 68,75 ----
+  
+      iput p2, p0, Lcom/discord/gateway/io/OutgoingPayload$Identify;->large_threshold:I
+  
++     const/4 p3, 0x0
++ 
+      iput-boolean p3, p0, Lcom/discord/gateway/io/OutgoingPayload$Identify;->compress:Z
+  
+      iput-wide p4, p0, Lcom/discord/gateway/io/OutgoingPayload$Identify;->capabilities:J
diff --git a/patches/profilemention/1180.patch b/patches/profilemention/1180.patch
index e69de29..808d7b6 100644
--- a/patches/profilemention/1180.patch
+++ b/patches/profilemention/1180.patch
@@ -0,0 +1,65 @@
+diff -crB from/smali/com/discord/widgets/chat/list/WidgetChatList$1.smali to/smali/com/discord/widgets/chat/list/WidgetChatList$1.smali
+*** from/smali/com/discord/widgets/chat/list/WidgetChatList$1.smali	2020-06-20 04:18:52.071368975 +0100
+--- to/smali/com/discord/widgets/chat/list/WidgetChatList$1.smali	2020-06-20 04:55:36.860065606 +0100
+***************
+*** 268,326 ****
+          .end annotation
+      .end param
+  
+-     .line 1
+-     invoke-static {p1}, Lcom/discord/utilities/guilds/PublicGuildUtils;->isPublicGuildSystemMessage(Lcom/discord/models/domain/ModelMessage;)Z
+- 
+-     move-result v0
+- 
+-     if-nez v0, :cond_1
+- 
+-     invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessage;->getMessageReference()Lcom/discord/models/domain/ModelMessage$MessageReference;
+- 
+-     move-result-object v0
+- 
+-     if-eqz v0, :cond_0
+- 
+-     goto :goto_0
+- 
+-     .line 2
+-     :cond_0
+-     invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessage;->getAuthor()Lcom/discord/models/domain/ModelUser;
+- 
+-     move-result-object v0
+- 
+-     invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->getId()J
+- 
+-     move-result-wide v0
+- 
+-     invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessage;->getChannelId()J
+- 
+-     move-result-wide v2
+- 
+-     invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+- 
+-     move-result-object p1
+- 
+-     iget-object v2, p0, Lcom/discord/widgets/chat/list/WidgetChatList$1;->this$0:Lcom/discord/widgets/chat/list/WidgetChatList;
+- 
+-     invoke-virtual {v2}, Landroidx/fragment/app/Fragment;->getParentFragmentManager()Landroidx/fragment/app/FragmentManager;
+- 
+-     move-result-object v2
+- 
+-     invoke-static {p2, p3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+- 
+-     move-result-object p2
+- 
+-     invoke-static {v0, v1, p1, v2, p2}, Lcom/discord/widgets/user/usersheet/WidgetUserSheet;->show(JLjava/lang/Long;Landroidx/fragment/app/FragmentManager;Ljava/lang/Long;)V
+- 
+-     goto :goto_1
+- 
+-     .line 3
+-     :cond_1
+-     :goto_0
+      invoke-virtual {p0, p1, p2, p3}, Lcom/discord/widgets/chat/list/WidgetChatList$1;->onMessageAuthorNameClicked(Lcom/discord/models/domain/ModelMessage;J)V
+  
+-     :goto_1
+      return-void
+  .end method
+  
+--- 268,275 ----
diff --git a/patches/pseudonitro-viewer/1180.patch b/patches/pseudonitro-viewer/1180.patch
index e69de29..45c5bf9 100644
--- a/patches/pseudonitro-viewer/1180.patch
+++ b/patches/pseudonitro-viewer/1180.patch
@@ -0,0 +1,21 @@
+diff -crB from/smali/com/discord/utilities/textprocessing/Rules.smali to/smali/com/discord/utilities/textprocessing/Rules.smali
+*** from/smali/com/discord/utilities/textprocessing/Rules.smali	2020-06-20 04:18:51.825370773 +0100
+--- to/smali/com/discord/utilities/textprocessing/Rules.smali	2020-06-20 04:42:29.215611152 +0100
+***************
+*** 133,139 ****
+  
+      sput-object v0, Lcom/discord/utilities/textprocessing/Rules;->PATTERN_UNICODE_EMOJI$delegate:Lkotlin/Lazy;
+  
+!     const-string v0, "^<(a)?:([a-zA-Z_0-9]+):(\\d+)>"
+  
+      .line 8
+      invoke-static {v0}, Ljava/util/regex/Pattern;->compile(Ljava/lang/String;)Ljava/util/regex/Pattern;
+--- 133,140 ----
+  
+      sput-object v0, Lcom/discord/utilities/textprocessing/Rules;->PATTERN_UNICODE_EMOJI$delegate:Lkotlin/Lazy;
+  
+!     # There's a ZWSP there
+!     const-string v0, "^<&?​?(a)?:([a-zA-Z_0-9]+):(\\d+)>"
+  
+      .line 8
+      invoke-static {v0}, Ljava/util/regex/Pattern;->compile(Ljava/lang/String;)Ljava/util/regex/Pattern;
diff --git a/patches/squareavatars/1180.patch b/patches/squareavatars/1180.patch
index e69de29..a5332a5 100644
--- a/patches/squareavatars/1180.patch
+++ b/patches/squareavatars/1180.patch
@@ -0,0 +1,21 @@
+diff -crB from/res/values/styles.xml to/res/values/styles.xml
+*** from/res/values/styles.xml	2020-06-20 04:18:49.557387358 +0100
+--- to/res/values/styles.xml	2020-06-20 04:19:09.409242406 +0100
+***************
+*** 1041,1047 ****
+          <item name="actualImageScaleType">fitCenter</item>
+          <item name="placeholderImage">@drawable/asset_default_avatar_32dp</item>
+          <item name="placeholderImageScaleType">fitCenter</item>
+!         <item name="roundAsCircle">true</item>
+      </style>
+      <style name="Avatar.Chat" parent="@style/Avatar.Large">
+          <item name="android:layout_width">@dimen/avatar_size_chat</item>
+--- 1041,1048 ----
+          <item name="actualImageScaleType">fitCenter</item>
+          <item name="placeholderImage">@drawable/asset_default_avatar_32dp</item>
+          <item name="placeholderImageScaleType">fitCenter</item>
+!         <item name="roundAsCircle">false</item>
+!         <item name="roundedCornerRadius">3dp</item>
+      </style>
+      <style name="Avatar.Chat" parent="@style/Avatar.Large">
+          <item name="android:layout_width">@dimen/avatar_size_chat</item>
diff --git a/patches/supplemental/1180.patch b/patches/supplemental/1180.patch
index e69de29..7ba5b67 100644
--- a/patches/supplemental/1180.patch
+++ b/patches/supplemental/1180.patch
@@ -0,0 +1,422 @@
+diff -crB from/smali/com/discord/gateway/io/IncomingParser.smali to/smali/com/discord/gateway/io/IncomingParser.smali
+*** from/smali/com/discord/gateway/io/IncomingParser.smali	2020-06-20 17:31:26.270341616 +0100
+--- to/smali/com/discord/gateway/io/IncomingParser.smali	2020-06-20 17:31:48.507403499 +0100
+***************
+*** 754,759 ****
+--- 754,770 ----
+  
+      .line 57
+      :goto_2
++ 
++     invoke-static {}, Lcom/discord/stores/StoreStream;->getUserSettings()Lcom/discord/stores/StoreUserSettings;
++ 
++     move-result-object v0
++ 
++     invoke-virtual {v0}, Lcom/discord/stores/StoreUserSettings;->getNoDelete()Z
++ 
++     move-result v4
++ 
++     if-nez v4, :cond_b
++ 
+      new-instance v0, Lcom/discord/models/domain/ModelMessageDelete;
+  
+      invoke-direct {v0}, Lcom/discord/models/domain/ModelMessageDelete;-><init>()V
+diff -crB from/smali/com/discord/models/domain/ModelChannel.smali to/smali/com/discord/models/domain/ModelChannel.smali
+*** from/smali/com/discord/models/domain/ModelChannel.smali	2020-06-20 17:31:26.286342537 +0100
+--- to/smali/com/discord/models/domain/ModelChannel.smali	2020-06-20 17:31:48.507403499 +0100
+***************
+*** 2230,2235 ****
+--- 2230,2245 ----
+          }
+      .end annotation
+  
++     invoke-static {}, Lcom/discord/stores/StoreStream;->getUserSettings()Lcom/discord/stores/StoreUserSettings;
++ 
++     move-result-object v0
++ 
++     invoke-virtual {v0}, Lcom/discord/stores/StoreUserSettings;->getLeakChannels()Z
++ 
++     move-result v0
++ 
++     if-eqz v0, :cond_0
++ 
+      .line 1
+      iget-object v0, p0, Lcom/discord/models/domain/ModelChannel;->permissionOverwrites:Ljava/util/Map;
+  
+diff -crB from/smali/com/discord/stores/StoreUserSettings.smali to/smali/com/discord/stores/StoreUserSettings.smali
+*** from/smali/com/discord/stores/StoreUserSettings.smali	2020-06-20 17:31:26.462352671 +0100
+--- to/smali/com/discord/stores/StoreUserSettings.smali	2020-06-20 17:31:48.509403576 +0100
+***************
+*** 396,401 ****
+--- 396,649 ----
+      return-void
+  .end method
+  
++ .method public getLeakChannels()Z
++     .locals 3
++ 
++     iget-object v0, p0, Lcom/discord/stores/StoreUserSettings;->prefs:Landroid/content/SharedPreferences;
++ 
++     const-string v1, "CACHE_KEY_CTC_LEAK_CHANNELS"
++ 
++     const/4 v2, 0x1
++ 
++     invoke-interface {v0, v1, v2}, Landroid/content/SharedPreferences;->getBoolean(Ljava/lang/String;Z)Z
++ 
++     move-result v0
++ 
++     return v0
++ .end method
++ 
++ .method public setLeakChannels(Z)V
++     .locals 2
++ 
++     iget-object v0, p0, Lcom/discord/stores/StoreUserSettings;->prefs:Landroid/content/SharedPreferences;
++ 
++     invoke-interface {v0}, Landroid/content/SharedPreferences;->edit()Landroid/content/SharedPreferences$Editor;
++ 
++     move-result-object v0
++ 
++     const-string v1, "CACHE_KEY_CTC_LEAK_CHANNELS"
++ 
++     invoke-interface {v0, v1, p1}, Landroid/content/SharedPreferences$Editor;->putBoolean(Ljava/lang/String;Z)Landroid/content/SharedPreferences$Editor;
++ 
++     move-result-object p1
++ 
++     invoke-interface {p1}, Landroid/content/SharedPreferences$Editor;->apply()V
++ 
++     return-void
++ .end method
++ 
++ .method public getImageSpoiler()Z
++     .locals 3
++ 
++     iget-object v0, p0, Lcom/discord/stores/StoreUserSettings;->prefs:Landroid/content/SharedPreferences;
++ 
++     const-string v1, "CACHE_KEY_CTC_IMAGE_SPOILER"
++ 
++     const/4 v2, 0x0
++ 
++     invoke-interface {v0, v1, v2}, Landroid/content/SharedPreferences;->getBoolean(Ljava/lang/String;Z)Z
++ 
++     move-result v0
++ 
++     return v0
++ .end method
++ 
++ .method public setImageSpoiler(Z)V
++     .locals 2
++ 
++     iget-object v0, p0, Lcom/discord/stores/StoreUserSettings;->prefs:Landroid/content/SharedPreferences;
++ 
++     invoke-interface {v0}, Landroid/content/SharedPreferences;->edit()Landroid/content/SharedPreferences$Editor;
++ 
++     move-result-object v0
++ 
++     const-string v1, "CACHE_KEY_CTC_IMAGE_SPOILER"
++ 
++     invoke-interface {v0, v1, p1}, Landroid/content/SharedPreferences$Editor;->putBoolean(Ljava/lang/String;Z)Landroid/content/SharedPreferences$Editor;
++ 
++     move-result-object p1
++ 
++     invoke-interface {p1}, Landroid/content/SharedPreferences$Editor;->apply()V
++ 
++     return-void
++ .end method
++ 
++ 
++ .method public getNoDelete()Z
++     .locals 3
++ 
++     iget-object v0, p0, Lcom/discord/stores/StoreUserSettings;->prefs:Landroid/content/SharedPreferences;
++ 
++     const-string v1, "CACHE_KEY_CTC_NO_DELETE"
++ 
++     const/4 v2, 0x0
++ 
++     invoke-interface {v0, v1, v2}, Landroid/content/SharedPreferences;->getBoolean(Ljava/lang/String;Z)Z
++ 
++     move-result v0
++ 
++     return v0
++ .end method
++ 
++ .method public setNoDelete(Z)V
++     .locals 2
++ 
++     iget-object v0, p0, Lcom/discord/stores/StoreUserSettings;->prefs:Landroid/content/SharedPreferences;
++ 
++     invoke-interface {v0}, Landroid/content/SharedPreferences;->edit()Landroid/content/SharedPreferences$Editor;
++ 
++     move-result-object v0
++ 
++     const-string v1, "CACHE_KEY_CTC_NO_DELETE"
++ 
++     invoke-interface {v0, v1, p1}, Landroid/content/SharedPreferences$Editor;->putBoolean(Ljava/lang/String;Z)Landroid/content/SharedPreferences$Editor;
++ 
++     move-result-object p1
++ 
++     invoke-interface {p1}, Landroid/content/SharedPreferences$Editor;->apply()V
++ 
++     return-void
++ .end method
++ 
++ .method public getShowTyping()Z
++     .locals 3
++ 
++     iget-object v0, p0, Lcom/discord/stores/StoreUserSettings;->prefs:Landroid/content/SharedPreferences;
++ 
++     const-string v1, "CACHE_KEY_CTC_SHOW_TYPING"
++ 
++     const/4 v2, 0x1
++ 
++     invoke-interface {v0, v1, v2}, Landroid/content/SharedPreferences;->getBoolean(Ljava/lang/String;Z)Z
++ 
++     move-result v0
++ 
++     return v0
++ .end method
++ 
++ .method public setShowTyping(Z)V
++     .locals 2
++ 
++     iget-object v0, p0, Lcom/discord/stores/StoreUserSettings;->prefs:Landroid/content/SharedPreferences;
++ 
++     invoke-interface {v0}, Landroid/content/SharedPreferences;->edit()Landroid/content/SharedPreferences$Editor;
++ 
++     move-result-object v0
++ 
++     const-string v1, "CACHE_KEY_CTC_SHOW_TYPING"
++ 
++     invoke-interface {v0, v1, p1}, Landroid/content/SharedPreferences$Editor;->putBoolean(Ljava/lang/String;Z)Landroid/content/SharedPreferences$Editor;
++ 
++     move-result-object p1
++ 
++     invoke-interface {p1}, Landroid/content/SharedPreferences$Editor;->apply()V
++ 
++     return-void
++ .end method
++ 
++ 
++ .method public getStoredToken()Ljava/lang/String;
++     .locals 3
++ 
++     iget-object v0, p0, Lcom/discord/stores/StoreAuthentication;->prefs:Landroid/content/SharedPreferences;
++ 
++     const-string v1, "none"
++ 
++     const-string v2, "STORE_AUTHED_TOKEN"
++ 
++     invoke-interface {v0, v2, v1}, Landroid/content/SharedPreferences;->getString(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
++ 
++     move-result-object v0
++ 
++     return-object v0
++ .end method
++ 
++ 
++ .method public setStoredToken(Ljava/lang/String;)V
++     .locals 2
++ 
++     iget-object v0, p0, Lcom/discord/stores/StoreAuthentication;->prefs:Landroid/content/SharedPreferences;
++ 
++     invoke-interface {v0}, Landroid/content/SharedPreferences;->edit()Landroid/content/SharedPreferences$Editor;
++ 
++     move-result-object v0
++ 
++     const-string v1, "STORE_AUTHED_TOKEN"
++ 
++     invoke-interface {v0, v1, p1}, Landroid/content/SharedPreferences$Editor;->putString(Ljava/lang/String;Ljava/lang/String;)Landroid/content/SharedPreferences$Editor;
++ 
++     move-result-object p1
++ 
++     invoke-interface {p1}, Landroid/content/SharedPreferences$Editor;->apply()V
++ 
++     return-void
++ .end method
++ 
++ .method public getAccountToken(Ljava/lang/String;)Ljava/lang/String;
++     .locals 3
++ 
++     const-string v2, "STORE_AUTHED_TOKEN_CTC_USER_"
++ 
++     invoke-virtual {p1}, Ljava/lang/String;->toUpperCase()Ljava/lang/String;
++ 
++     move-result-object p1
++ 
++     new-instance v0, Ljava/lang/StringBuilder;
++ 
++     invoke-direct {v0, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
++ 
++     invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
++ 
++     invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
++ 
++     move-result-object v2
++ 
++     iget-object v0, p0, Lcom/discord/stores/StoreAuthentication;->prefs:Landroid/content/SharedPreferences;
++ 
++     const-string v1, "none"
++ 
++     invoke-interface {v0, v2, v1}, Landroid/content/SharedPreferences;->getString(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
++ 
++     move-result-object v0
++ 
++     return-object v0
++ .end method
++ 
++ 
++ .method public setAccountToken(Ljava/lang/String;Ljava/lang/String;)V
++     .locals 2
++ 
++     const-string v1, "STORE_AUTHED_TOKEN_CTC_USER_"
++ 
++     invoke-virtual {p1}, Ljava/lang/String;->toUpperCase()Ljava/lang/String;
++ 
++     move-result-object p1
++ 
++     new-instance v0, Ljava/lang/StringBuilder;
++ 
++     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
++ 
++     invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
++ 
++     invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
++ 
++     move-result-object v1
++ 
++     iget-object v0, p0, Lcom/discord/stores/StoreAuthentication;->prefs:Landroid/content/SharedPreferences;
++ 
++     invoke-interface {v0}, Landroid/content/SharedPreferences;->edit()Landroid/content/SharedPreferences$Editor;
++ 
++     move-result-object v0
++ 
++     invoke-interface {v0, v1, p2}, Landroid/content/SharedPreferences$Editor;->putString(Ljava/lang/String;Ljava/lang/String;)Landroid/content/SharedPreferences$Editor;
++ 
++     move-result-object p1
++ 
++     invoke-interface {p1}, Landroid/content/SharedPreferences$Editor;->apply()V
++ 
++     return-void
++ .end method
++ 
+  .method private getAdjustedTheme(Ljava/lang/String;)Ljava/lang/String;
+      .locals 1
+  
+diff -crB from/smali/com/discord/utilities/rest/SendUtils$getPart$1$1.smali to/smali/com/discord/utilities/rest/SendUtils$getPart$1$1.smali
+*** from/smali/com/discord/utilities/rest/SendUtils$getPart$1$1.smali	2020-06-20 17:31:26.526356357 +0100
+--- to/smali/com/discord/utilities/rest/SendUtils$getPart$1$1.smali	2020-06-20 17:37:06.226648224 +0100
+***************
+*** 46,51 ****
+--- 46,85 ----
+      return-void
+  .end method
+  
++ .method public static final interceptFilename(Ljava/lang/String;)Ljava/lang/String;
++     .locals 3
++ 
++     invoke-static {}, Lcom/discord/stores/StoreStream;->getUserSettings()Lcom/discord/stores/StoreUserSettings;
++ 
++     move-result-object v0
++ 
++     invoke-virtual {v0}, Lcom/discord/stores/StoreUserSettings;->getImageSpoiler()Z
++ 
++     move-result v1
++ 
++     if-eqz v1, :cond_1
++ 
++     new-instance v2, Ljava/lang/StringBuilder;
++ 
++     const-string v1, "SPOILER_"
++ 
++     invoke-direct {v2, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
++ 
++     invoke-virtual {v2, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
++ 
++     invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
++ 
++     move-result-object p0
++ 
++     # I commented this out and do this in StoreMessages now as this'd only work for a single image
++     # const/4 v1, 0x0
++ 
++     # invoke-virtual {v0, v1}, Lcom/discord/stores/StoreUserSettings;->setImageSpoiler(Z)V
++ 
++     :cond_1
++     return-object p0
++ .end method
++ 
+  
+  # virtual methods
+  .method public final invoke(Lokhttp3/RequestBody;Ljava/lang/String;Landroid/graphics/Bitmap$CompressFormat;)Lcom/discord/utilities/rest/SendUtils$FileUpload;
+***************
+*** 77,82 ****
+--- 111,120 ----
+  
+      move-result-object v4
+  
++     invoke-static {v4}, Lcom/discord/utilities/rest/SendUtils$getPart$1$1;->interceptFilename(Ljava/lang/String;)Ljava/lang/String;
++ 
++     move-result-object v4
++ 
+      .line 4
+      iget-object p1, p0, Lcom/discord/utilities/rest/SendUtils$getPart$1$1;->this$0:Lcom/discord/utilities/rest/SendUtils$getPart$1;
+  
+diff -crB from/smali/com/discord/widgets/chat/input/WidgetChatInputEditText$1.smali to/smali/com/discord/widgets/chat/input/WidgetChatInputEditText$1.smali
+*** from/smali/com/discord/widgets/chat/input/WidgetChatInputEditText$1.smali	2020-06-20 17:31:26.646363267 +0100
+--- to/smali/com/discord/widgets/chat/input/WidgetChatInputEditText$1.smali	2020-06-20 17:31:48.509403576 +0100
+***************
+*** 59,64 ****
+--- 59,74 ----
+  
+      invoke-virtual {v0}, Lcom/discord/widgets/chat/input/WidgetChatInputEditText;->saveText()V
+  
++     invoke-static {}, Lcom/discord/stores/StoreStream;->getUserSettings()Lcom/discord/stores/StoreUserSettings;
++ 
++     move-result-object v0
++ 
++     invoke-virtual {v0}, Lcom/discord/stores/StoreUserSettings;->getShowTyping()Z
++ 
++     move-result v0
++ 
++     if-eqz v0, :cond_1
++ 
+      .line 4
+      invoke-static {p1}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
+  
+diff -crB from/smali/com/discord/widgets/chat/input/WidgetChatInputSend.smali to/smali/com/discord/widgets/chat/input/WidgetChatInputSend.smali
+*** from/smali/com/discord/widgets/chat/input/WidgetChatInputSend.smali	2020-06-20 17:31:26.650363497 +0100
+--- to/smali/com/discord/widgets/chat/input/WidgetChatInputSend.smali	2020-06-20 17:31:48.509403576 +0100
+***************
+*** 60,65 ****
+--- 60,89 ----
+      return p0
+  .end method
+  
++ .method public static final access$SetInput(Lcom/discord/widgets/chat/input/WidgetChatInputSend;Lcom/discord/widgets/chat/input/WidgetChatInputEditText;Ljava/lang/CharSequence;)Z
++     .locals 1
++ 
++     .line 147
++     invoke-virtual {p1, p2}, Lcom/discord/widgets/chat/input/WidgetChatInputEditText;->setText(Ljava/lang/CharSequence;)V
++ 
++     .line 148
++     invoke-virtual {p1}, Lcom/discord/widgets/chat/input/WidgetChatInputEditText;->clearLastTypingEmission()V
++ 
++     .line 151
++     invoke-static {}, Lcom/discord/stores/StoreStream;->getChat()Lcom/discord/stores/StoreChat;
++ 
++     move-result-object p1
++ 
++     const/4 v0, 0x0
++ 
++     .line 152
++     invoke-virtual {p1, v0}, Lcom/discord/stores/StoreChat;->setEditingMessage(Lcom/discord/stores/StoreChat$EditingMessage;)V
++ 
++     const/4 p1, 0x1
++ 
++     return p1
++ .end method
++ 
+  .method private final clearInput(Lcom/discord/widgets/chat/input/WidgetChatInputEditText;Lcom/lytefast/flexinput/viewmodel/FlexInputViewModel;Ljava/lang/Boolean;)Z
+      .locals 1
+  
diff --git a/patches/tokenlogin/1180.patch b/patches/tokenlogin/1180.patch
index e69de29..041a366 100644
--- a/patches/tokenlogin/1180.patch
+++ b/patches/tokenlogin/1180.patch
@@ -0,0 +1,33 @@
+diff -crB from/smali/com/discord/widgets/auth/WidgetAuthLogin.smali to/smali/com/discord/widgets/auth/WidgetAuthLogin.smali
+*** from/smali/com/discord/widgets/auth/WidgetAuthLogin.smali	2020-06-20 04:18:51.913370130 +0100
+--- to/smali/com/discord/widgets/auth/WidgetAuthLogin.smali	2020-06-20 04:19:11.447227553 +0100
+***************
+*** 950,955 ****
+--- 950,976 ----
+  
+      move-result-object v3
+  
++     # tokenlogin code
++ 
++     const-string v6, "tokenlogin"
++ 
++     invoke-virtual {v2, v6}, Ljava/lang/String;->startsWith(Ljava/lang/String;)Z
++ 
++     move-result v6
++ 
++     if-eqz v6, :cond_2
++ 
++     invoke-static {}, Lcom/discord/stores/StoreStream;->getUserSettings()Lcom/discord/stores/StoreUserSettings;
++ 
++     move-result-object v6
++ 
++     invoke-virtual {v6, v3}, Lcom/discord/stores/StoreUserSettings;->setStoredToken(Ljava/lang/String;)V
++ 
++     return-void
++ 
++     # end of new code (except conf below, that's also new)
++ 
++     :cond_2
+      invoke-virtual {v0, v2, v3, p1, p2}, Lcom/discord/stores/StoreAuthentication;->login(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)Lrx/Observable;
+  
+      move-result-object p1