From 4c3ff4ad3f2b8560a1e5ba151c95fedb599a887d Mon Sep 17 00:00:00 2001
From: Ave Ozkal <ave@ave.zone>
Date: Sun, 3 Mar 2019 19:22:59 +0300
Subject: [PATCH] Update patches to v8.5.4

Fixed top bar.

Unofficial v8.5.4 changelog:
- Full implementation of news https://cdn.discordapp.com/attachments/448273769153298452/551511285582397471/Screenshot_20190303-000846.png
- Fun placeholders such as <string name="premium_subtitle_mobile">Something that would a mobile user want to care about buying Nitro chat perks with the bonus of some free pc games.</string>
---
 README.md                                 |    2 +-
 patches/branding/854.patch                |  127 +
 patches/branding/README.md                |    1 +
 patches/compact/854.patch                 |   84 +
 patches/compact/README.md                 |    1 +
 patches/customtheme/854.patch             |  253 ++
 patches/customtheme/README.md             |    3 +
 patches/customversion/854.patch           |   21 +
 patches/customversion/README.md           |    1 +
 patches/disable-mobileindicator/854.patch |   21 +
 patches/disable-mobileindicator/README.md |    1 +
 patches/experiments/854.patch             |  153 ++
 patches/experiments/README.md             |    1 +
 patches/litecord/854.patch                |  330 +++
 patches/litecord/README.md                |    1 +
 patches/mutant/854.patch                  | 1907 +++++++++++++
 patches/mutant/README.md                  |    1 +
 patches/necessary/854.patch               |   13 +
 patches/necessary/README.md               |    1 +
 patches/noblocked/854.patch               |   18 +
 patches/noblocked/README.md               |    1 +
 patches/nonearby/854.patch                |   87 +
 patches/nonearby/README.md                |    1 +
 patches/noprofilestrip/854.patch          |   54 +
 patches/noprofilestrip/README.md          |    1 +
 patches/nospoiler/854.patch               |   65 +
 patches/nospoiler/README.md               |    1 +
 patches/notrack/854.patch                 | 3042 +++++++++++++++++++++
 patches/notrack/README.md                 |    1 +
 patches/notyping/854.patch                |   19 +
 patches/notyping/README.md                |    1 +
 patches/nozlib/854.patch                  |   35 +
 patches/nozlib/README.md                  |    1 +
 patches/pureevil/854.patch                |   26 +
 patches/pureevil/README.md                |    1 +
 patches/smalltime/854.patch               |  191 ++
 patches/smalltime/README.md               |    1 +
 patches/squareavatars/854.patch           |   22 +
 patches/squareavatars/README.md           |    1 +
 39 files changed, 6490 insertions(+), 1 deletion(-)
 create mode 100644 patches/branding/854.patch
 create mode 100644 patches/compact/854.patch
 create mode 100644 patches/customtheme/854.patch
 create mode 100644 patches/customversion/854.patch
 create mode 100644 patches/disable-mobileindicator/854.patch
 create mode 100644 patches/experiments/854.patch
 create mode 100644 patches/litecord/854.patch
 create mode 100644 patches/mutant/854.patch
 create mode 100644 patches/necessary/854.patch
 create mode 100644 patches/noblocked/854.patch
 create mode 100644 patches/nonearby/854.patch
 create mode 100644 patches/noprofilestrip/854.patch
 create mode 100644 patches/nospoiler/854.patch
 create mode 100644 patches/notrack/854.patch
 create mode 100644 patches/notyping/854.patch
 create mode 100644 patches/nozlib/854.patch
 create mode 100644 patches/pureevil/854.patch
 create mode 100644 patches/smalltime/854.patch
 create mode 100644 patches/squareavatars/854.patch

diff --git a/README.md b/README.md
index 86e9ec3..9b7a73e 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 Discord Android app patches.
 
-**Latest supported Discord Android version:** 8.5.3 (853), released on 2019-03-01.
+**Latest supported Discord Android version:** 8.5.4 (854), released on 2019-03-03.
 
 New patch development will be done for the latest supported version.
 
diff --git a/patches/branding/854.patch b/patches/branding/854.patch
new file mode 100644
index 0000000..8ffa61d
--- /dev/null
+++ b/patches/branding/854.patch
@@ -0,0 +1,127 @@
+diff -crB -x dist -x build com.discord-854-base/AndroidManifest.xml com.discord-854/AndroidManifest.xml
+*** com.discord-854-base/AndroidManifest.xml	2019-03-03 19:12:50.309105353 +0300
+--- com.discord-854/AndroidManifest.xml	2019-03-03 19:15:46.386624345 +0300
+***************
+*** 1,4 ****
+! <?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:compileSdkVersion="28" android:compileSdkVersionCodename="9" android:installLocation="auto" package="com.discord" platformBuildVersionCode="854" platformBuildVersionName="8.5.4">
+      <uses-feature android:name="android.hardware.camera" android:required="false"/>
+      <uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
+      <uses-feature android:name="android.hardware.faketouch" android:required="false"/>
+--- 1,4 ----
+! <?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:compileSdkVersion="28" android:compileSdkVersionCodename="9" android:installLocation="auto" package="com.cutthecord.CTCBRANCH" platformBuildVersionCode="854CTCBUILD" platformBuildVersionName="8.5.4-cutthecord-CTCBUILD">
+      <uses-feature android:name="android.hardware.camera" android:required="false"/>
+      <uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
+      <uses-feature android:name="android.hardware.faketouch" android:required="false"/>
+***************
+*** 94,100 ****
+          </receiver>
+          <service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.CampaignTrackingService"/>
+          <service android:name="com.discord.utilities.voice.VoiceEngineForegroundService"/>
+!         <provider android:authorities="com.discord.file-provider" android:exported="false" android:grantUriPermissions="true" android:name="androidx.core.content.FileProvider">
+              <meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths"/>
+          </provider>
+          <meta-data android:name="firebase_crashlytics_collection_enabled" android:value="false"/>
+--- 94,100 ----
+          </receiver>
+          <service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.CampaignTrackingService"/>
+          <service android:name="com.discord.utilities.voice.VoiceEngineForegroundService"/>
+!         <provider android:authorities="top.distok.cutthecord.CTCBRANCH.file-provider" android:exported="false" android:grantUriPermissions="true" android:name="androidx.core.content.FileProvider">
+              <meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths"/>
+          </provider>
+          <meta-data android:name="firebase_crashlytics_collection_enabled" android:value="false"/>
+***************
+*** 139,147 ****
+              </intent-filter>
+          </service>
+          <activity android:exported="false" android:name="com.google.android.gms.common.api.GoogleApiActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
+!         <provider android:authorities="com.discord.firebaseinitprovider" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
+          <meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
+!         <provider android:authorities="com.discord.workmanager-init" android:directBootAware="false" android:exported="false" android:multiprocess="true" android:name="androidx.work.impl.WorkManagerInitializer"/>
+          <service android:directBootAware="false" android:enabled="@bool/enable_system_alarm_service_default" android:exported="false" android:name="androidx.work.impl.background.systemalarm.SystemAlarmService"/>
+          <service android:directBootAware="false" android:enabled="@bool/enable_system_job_service_default" android:exported="true" android:name="androidx.work.impl.background.systemjob.SystemJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
+          <receiver android:directBootAware="false" android:enabled="true" android:exported="false" android:name="androidx.work.impl.utils.ForceStopRunnable$BroadcastReceiver"/>
+--- 139,147 ----
+              </intent-filter>
+          </service>
+          <activity android:exported="false" android:name="com.google.android.gms.common.api.GoogleApiActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
+!         <provider android:authorities="top.distok.cutthecord.CTCBRANCH.firebaseinitprovider" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
+          <meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
+!         <provider android:authorities="top.distok.cutthecord.CTCBRANCH.workmanager-init" android:directBootAware="false" android:exported="false" android:multiprocess="true" android:name="androidx.work.impl.WorkManagerInitializer"/>
+          <service android:directBootAware="false" android:enabled="@bool/enable_system_alarm_service_default" android:exported="false" android:name="androidx.work.impl.background.systemalarm.SystemAlarmService"/>
+          <service android:directBootAware="false" android:enabled="@bool/enable_system_job_service_default" android:exported="true" android:name="androidx.work.impl.background.systemjob.SystemJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
+          <receiver android:directBootAware="false" android:enabled="true" android:exported="false" android:name="androidx.work.impl.utils.ForceStopRunnable$BroadcastReceiver"/>
+***************
+*** 180,187 ****
+                  <action android:name="androidx.work.impl.background.systemalarm.UpdateProxies"/>
+              </intent-filter>
+          </receiver>
+!         <provider android:authorities="com.discord.lifecycle-process" android:exported="false" android:multiprocess="true" android:name="androidx.lifecycle.ProcessLifecycleOwnerInitializer"/>
+!         <provider android:authorities="com.discord.crashlyticsinitprovider" android:exported="false" android:initOrder="90" android:name="com.crashlytics.android.CrashlyticsInitProvider"/>
+          <meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
+      </application>
+  </manifest>
+\ No newline at end of file
+--- 180,187 ----
+                  <action android:name="androidx.work.impl.background.systemalarm.UpdateProxies"/>
+              </intent-filter>
+          </receiver>
+!         <provider android:authorities="top.distok.cutthecord.CTCBRANCH.lifecycle-process" android:exported="false" android:multiprocess="true" android:name="androidx.lifecycle.ProcessLifecycleOwnerInitializer"/>
+!         <provider android:authorities="top.distok.cutthecord.CTCBRANCH.crashlyticsinitprovider" android:exported="false" android:initOrder="90" android:name="com.crashlytics.android.CrashlyticsInitProvider"/>
+          <meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
+      </application>
+  </manifest>
+\ No newline at end of file
+diff -crB -x dist -x build com.discord-854-base/apktool.yml com.discord-854/apktool.yml
+*** com.discord-854-base/apktool.yml	2019-03-03 19:12:50.309105353 +0300
+--- com.discord-854/apktool.yml	2019-03-03 19:15:46.389957694 +0300
+***************
+*** 469,473 ****
+    tag: null
+  version: 2.4.0-896569-SNAPSHOT
+  versionInfo:
+!   versionCode: '854'
+!   versionName: 8.5.4
+--- 469,473 ----
+    tag: null
+  version: 2.4.0-896569-SNAPSHOT
+  versionInfo:
+!   versionCode: '854CTCBUILD'
+!   versionName: 8.5.4-cutthecord-CTCBUILD
+diff -crB -x dist -x build com.discord-854-base/res/values/strings.xml com.discord-854/res/values/strings.xml
+*** com.discord-854-base/res/values/strings.xml	2019-03-03 19:12:52.362448626 +0300
+--- com.discord-854/res/values/strings.xml	2019-03-03 19:15:46.393291044 +0300
+***************
+*** 1211,1217 ****
+      <string name="disconnect_account_body">Disconnecting your account might remove you from servers you joined via this account.</string>
+      <string name="disconnect_account_title">Disconnect %1$s</string>
+      <string name="disconnect_from_voice">Disconnect from Voice</string>
+!     <string name="discord">Discord</string>
+      <string name="discord_desc_long">Free and secure chat for gamers, works on both your desktop and your phone.</string>
+      <string name="discord_desc_short">Team voice &amp; text chat</string>
+      <string name="discord_gg">discord.gg/</string>
+--- 1211,1217 ----
+      <string name="disconnect_account_body">Disconnecting your account might remove you from servers you joined via this account.</string>
+      <string name="disconnect_account_title">Disconnect %1$s</string>
+      <string name="disconnect_from_voice">Disconnect from Voice</string>
+!     <string name="discord">CTCNAME</string>
+      <string name="discord_desc_long">Free and secure chat for gamers, works on both your desktop and your phone.</string>
+      <string name="discord_desc_short">Team voice &amp; text chat</string>
+      <string name="discord_gg">discord.gg/</string>
+***************
+*** 2790,2796 ****
+      <string name="notification_reply_failed">Failed to reply to %1$s</string>
+      <string name="notification_reply_success">Replied to %1$s</string>
+      <string name="notification_settings">Notification Settings</string>
+!     <string name="notification_title_discord">Discord</string>
+      <string name="notification_title_start_game">"Somebody Playin'"</string>
+      <string name="notifications">Notifications</string>
+      <string name="nsfw_accept">Continue</string>
+--- 2790,2796 ----
+      <string name="notification_reply_failed">Failed to reply to %1$s</string>
+      <string name="notification_reply_success">Replied to %1$s</string>
+      <string name="notification_settings">Notification Settings</string>
+!     <string name="notification_title_discord">CTCNAME</string>
+      <string name="notification_title_start_game">"Somebody Playin'"</string>
+      <string name="notifications">Notifications</string>
+      <string name="nsfw_accept">Continue</string>
+
diff --git a/patches/branding/README.md b/patches/branding/README.md
index 0d5880f..3fc4024 100644
--- a/patches/branding/README.md
+++ b/patches/branding/README.md
@@ -28,4 +28,5 @@ You can use the following line to patch authorities:
 - 8.5.0
 - 8.5.1
 - 8.5.3
+- 8.5.4
 
diff --git a/patches/compact/854.patch b/patches/compact/854.patch
new file mode 100644
index 0000000..35e0366
--- /dev/null
+++ b/patches/compact/854.patch
@@ -0,0 +1,84 @@
+diff -crB -x dist -x build com.discord-850-base/res/layout/widget_chat_list_adapter_item_text.xml com.discord-850/res/layout/widget_chat_list_adapter_item_text.xml
+*** com.discord-850-base/res/layout/widget_chat_list_adapter_item_text.xml	2019-02-23 23:35:53.012664751 +0300
+--- com.discord-850/res/layout/widget_chat_list_adapter_item_text.xml	2019-02-23 23:36:09.142758236 +0300
+***************
+*** 2,12 ****
+  <androidx.constraintlayout.widget.ConstraintLayout android:background="?selectableItemBackground" android:paddingTop="10.0dip" android:paddingRight="@dimen/chat_cell_horizontal_spacing_padding" android:layout_width="fill_parent" android:layout_height="wrap_content"
+    xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
+      <androidx.constraintlayout.widget.Guideline android:id="@id/uikit_chat_guideline" style="@style/UiKit.Chat.Guideline" />
+-     <com.facebook.drawee.view.SimpleDraweeView android:id="@id/chat_list_adapter_item_text_avatar" android:layout_marginLeft="8.0dip" android:layout_marginTop="@dimen/uikit_spacing_small" android:importantForAccessibility="no" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="@id/uikit_chat_guideline" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@id/uikit_chat_guideline" app:layout_constraintStart_toStartOf="parent" style="@style/Avatar.Chat" />
+      <androidx.constraintlayout.widget.ConstraintLayout android:id="@id/chat_list_adapter_item_text_header" android:layout_width="wrap_content" android:layout_height="0.0dip" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toRightOf="@id/uikit_chat_guideline" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/uikit_chat_guideline" app:layout_constraintTop_toTopOf="@id/chat_list_adapter_item_text_avatar">
+          <TextView android:textColor="?theme_chat_name" android:id="@id/chat_list_adapter_item_text_name" android:lineSpacingMultiplier="1.0" app:layout_constrainedWidth="true" app:layout_constraintBaseline_toBaselineOf="@id/chat_list_adapter_item_text_bot" app:layout_constraintEnd_toStartOf="@id/chat_list_adapter_item_text_bot" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintStart_toStartOf="parent" style="@style/UiKit.TextView.Large.SingleLine" />
+          <TextView android:textSize="9.5sp" android:textColor="@color/white" android:id="@id/chat_list_adapter_item_text_bot" android:background="@drawable/drawable_button_purple_neutral" android:paddingLeft="3.0dip" android:paddingTop="0.5dip" android:paddingRight="3.0dip" android:paddingBottom="0.5dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="6.0dip" android:layout_marginBottom="1.0dip" android:text="BOT" android:singleLine="true" app:layout_constraintEnd_toStartOf="@id/chat_list_adapter_item_text_timestamp" app:layout_constraintStart_toEndOf="@id/chat_list_adapter_item_text_name" style="@style/UiKit.TextView" />
+          <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?theme_chat_timestamp" android:gravity="center_vertical" android:id="@id/chat_list_adapter_item_text_timestamp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="6.0dip" android:layout_marginBottom="1.0dip" android:maxWidth="150.0dip" android:singleLine="true" app:layout_constraintBaseline_toBaselineOf="@id/chat_list_adapter_item_text_name" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/chat_list_adapter_item_text_bot" style="@style/UiKit.TextView" />
+      </androidx.constraintlayout.widget.ConstraintLayout>
+-     <com.discord.utilities.view.text.LinkifiedTextView android:id="@id/chat_list_adapter_item_text" android:layout_width="0.0dip" android:layout_marginTop="@dimen/uikit_spacing_xsmall" android:layout_marginRight="@dimen/uikit_spacing_small" android:layout_marginBottom="2.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toRightOf="@id/uikit_chat_guideline" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/uikit_chat_guideline" app:layout_constraintTop_toBottomOf="@id/chat_list_adapter_item_text_header" style="@style/UiKit.Chat.Text" />
+  </androidx.constraintlayout.widget.ConstraintLayout>
+\ No newline at end of file
+--- 2,11 ----
+  <androidx.constraintlayout.widget.ConstraintLayout android:background="?selectableItemBackground" android:paddingTop="10.0dip" android:paddingRight="@dimen/chat_cell_horizontal_spacing_padding" android:layout_width="fill_parent" android:layout_height="wrap_content"
+    xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
+      <androidx.constraintlayout.widget.Guideline android:id="@id/uikit_chat_guideline" style="@style/UiKit.Chat.Guideline" />
+      <androidx.constraintlayout.widget.ConstraintLayout android:id="@id/chat_list_adapter_item_text_header" android:layout_width="wrap_content" android:layout_height="0.0dip" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toRightOf="@id/uikit_chat_guideline" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/uikit_chat_guideline" app:layout_constraintTop_toTopOf="@id/chat_list_adapter_item_text_avatar">
+          <TextView android:textColor="?theme_chat_name" android:id="@id/chat_list_adapter_item_text_name" android:lineSpacingMultiplier="1.0" app:layout_constrainedWidth="true" app:layout_constraintBaseline_toBaselineOf="@id/chat_list_adapter_item_text_bot" app:layout_constraintEnd_toStartOf="@id/chat_list_adapter_item_text_bot" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintStart_toStartOf="parent" style="@style/UiKit.TextView.Large.SingleLine" />
+          <TextView android:textSize="9.5sp" android:textColor="@color/white" android:id="@id/chat_list_adapter_item_text_bot" android:background="@drawable/drawable_button_purple_neutral" android:paddingLeft="3.0dip" android:paddingTop="0.5dip" android:paddingRight="3.0dip" android:paddingBottom="0.5dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="6.0dip" android:layout_marginBottom="1.0dip" android:text="BOT" android:singleLine="true" app:layout_constraintEnd_toStartOf="@id/chat_list_adapter_item_text_timestamp" app:layout_constraintStart_toEndOf="@id/chat_list_adapter_item_text_name" style="@style/UiKit.TextView" />
+          <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?theme_chat_timestamp" android:gravity="center_vertical" android:id="@id/chat_list_adapter_item_text_timestamp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="6.0dip" android:layout_marginBottom="1.0dip" android:maxWidth="150.0dip" android:singleLine="true" app:layout_constraintBaseline_toBaselineOf="@id/chat_list_adapter_item_text_name" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/chat_list_adapter_item_text_bot" style="@style/UiKit.TextView" />
++         <com.discord.utilities.view.text.LinkifiedTextView  android:id="@id/chat_list_adapter_item_text" app:layout_constrainedWidth="true" android:layout_marginLeft="6.0dip" android:layout_marginBottom="1.0dip" android:layout_marginStart="6.0dip" app:layout_constraintStart_toEndOf="@id/chat_list_adapter_item_text_timestamp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toRightOf="@id/chat_list_adapter_item_text_timestamp" app:layout_constraintRight_toRightOf="parent" style="@style/UiKit.Chat.Text" />
+      </androidx.constraintlayout.widget.ConstraintLayout>
+  </androidx.constraintlayout.widget.ConstraintLayout>
+\ No newline at end of file
+diff -crB -x dist -x build com.discord-850-base/res/layout-v17/widget_chat_list_adapter_item_text.xml com.discord-850/res/layout-v17/widget_chat_list_adapter_item_text.xml
+*** com.discord-850-base/res/layout-v17/widget_chat_list_adapter_item_text.xml	2019-02-23 23:35:53.099331920 +0300
+--- com.discord-850/res/layout-v17/widget_chat_list_adapter_item_text.xml	2019-02-23 23:36:09.142758236 +0300
+***************
+*** 2,12 ****
+  <androidx.constraintlayout.widget.ConstraintLayout android:background="?selectableItemBackground" android:paddingTop="10.0dip" android:paddingRight="@dimen/chat_cell_horizontal_spacing_padding" android:layout_width="fill_parent" android:layout_height="wrap_content" android:paddingEnd="@dimen/chat_cell_horizontal_spacing_padding"
+    xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
+      <androidx.constraintlayout.widget.Guideline android:id="@id/uikit_chat_guideline" style="@style/UiKit.Chat.Guideline" />
+-     <com.facebook.drawee.view.SimpleDraweeView android:id="@id/chat_list_adapter_item_text_avatar" android:layout_marginLeft="8.0dip" android:layout_marginTop="@dimen/uikit_spacing_small" android:importantForAccessibility="no" android:layout_marginStart="8.0dip" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="@id/uikit_chat_guideline" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@id/uikit_chat_guideline" app:layout_constraintStart_toStartOf="parent" style="@style/Avatar.Chat" />
+      <androidx.constraintlayout.widget.ConstraintLayout android:id="@id/chat_list_adapter_item_text_header" android:layout_width="wrap_content" android:layout_height="0.0dip" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toRightOf="@id/uikit_chat_guideline" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/uikit_chat_guideline" app:layout_constraintTop_toTopOf="@id/chat_list_adapter_item_text_avatar">
+          <TextView android:textColor="?theme_chat_name" android:id="@id/chat_list_adapter_item_text_name" android:lineSpacingMultiplier="1.0" app:layout_constrainedWidth="true" app:layout_constraintBaseline_toBaselineOf="@id/chat_list_adapter_item_text_bot" app:layout_constraintEnd_toStartOf="@id/chat_list_adapter_item_text_bot" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintStart_toStartOf="parent" style="@style/UiKit.TextView.Large.SingleLine" />
+          <TextView android:textSize="9.5sp" android:textColor="@color/white" android:id="@id/chat_list_adapter_item_text_bot" android:background="@drawable/drawable_button_purple_neutral" android:paddingLeft="3.0dip" android:paddingTop="0.5dip" android:paddingRight="3.0dip" android:paddingBottom="0.5dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="6.0dip" android:layout_marginBottom="1.0dip" android:text="BOT" android:singleLine="true" android:layout_marginStart="6.0dip" app:layout_constraintEnd_toStartOf="@id/chat_list_adapter_item_text_timestamp" app:layout_constraintStart_toEndOf="@id/chat_list_adapter_item_text_name" style="@style/UiKit.TextView" />
+          <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?theme_chat_timestamp" android:gravity="center_vertical" android:id="@id/chat_list_adapter_item_text_timestamp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="6.0dip" android:layout_marginBottom="1.0dip" android:maxWidth="150.0dip" android:singleLine="true" android:layout_marginStart="6.0dip" app:layout_constraintBaseline_toBaselineOf="@id/chat_list_adapter_item_text_name" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/chat_list_adapter_item_text_bot" style="@style/UiKit.TextView" />
+      </androidx.constraintlayout.widget.ConstraintLayout>
+-     <com.discord.utilities.view.text.LinkifiedTextView android:id="@id/chat_list_adapter_item_text" android:layout_width="0.0dip" android:layout_marginTop="@dimen/uikit_spacing_xsmall" android:layout_marginRight="@dimen/uikit_spacing_small" android:layout_marginBottom="2.0dip" android:layout_marginEnd="@dimen/uikit_spacing_small" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toRightOf="@id/uikit_chat_guideline" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/uikit_chat_guideline" app:layout_constraintTop_toBottomOf="@id/chat_list_adapter_item_text_header" style="@style/UiKit.Chat.Text" />
+  </androidx.constraintlayout.widget.ConstraintLayout>
+\ No newline at end of file
+--- 2,14 ----
+  <androidx.constraintlayout.widget.ConstraintLayout android:background="?selectableItemBackground" android:paddingTop="10.0dip" android:paddingRight="@dimen/chat_cell_horizontal_spacing_padding" android:layout_width="fill_parent" android:layout_height="wrap_content" android:paddingEnd="@dimen/chat_cell_horizontal_spacing_padding"
+    xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
+      <androidx.constraintlayout.widget.Guideline android:id="@id/uikit_chat_guideline" style="@style/UiKit.Chat.Guideline" />
+      <androidx.constraintlayout.widget.ConstraintLayout android:id="@id/chat_list_adapter_item_text_header" android:layout_width="wrap_content" android:layout_height="0.0dip" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toRightOf="@id/uikit_chat_guideline" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/uikit_chat_guideline" app:layout_constraintTop_toTopOf="@id/chat_list_adapter_item_text_avatar">
+          <TextView android:textColor="?theme_chat_name" android:id="@id/chat_list_adapter_item_text_name" android:lineSpacingMultiplier="1.0" app:layout_constrainedWidth="true" app:layout_constraintBaseline_toBaselineOf="@id/chat_list_adapter_item_text_bot" app:layout_constraintEnd_toStartOf="@id/chat_list_adapter_item_text_bot" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintStart_toStartOf="parent" style="@style/UiKit.TextView.Large.SingleLine" />
++ 
+          <TextView android:textSize="9.5sp" android:textColor="@color/white" android:id="@id/chat_list_adapter_item_text_bot" android:background="@drawable/drawable_button_purple_neutral" android:paddingLeft="3.0dip" android:paddingTop="0.5dip" android:paddingRight="3.0dip" android:paddingBottom="0.5dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="6.0dip" android:layout_marginBottom="1.0dip" android:text="BOT" android:singleLine="true" android:layout_marginStart="6.0dip" app:layout_constraintEnd_toStartOf="@id/chat_list_adapter_item_text_timestamp" app:layout_constraintStart_toEndOf="@id/chat_list_adapter_item_text_name" style="@style/UiKit.TextView" />
++ 
+          <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?theme_chat_timestamp" android:gravity="center_vertical" android:id="@id/chat_list_adapter_item_text_timestamp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="6.0dip" android:layout_marginBottom="1.0dip" android:maxWidth="150.0dip" android:singleLine="true" android:layout_marginStart="6.0dip" app:layout_constraintBaseline_toBaselineOf="@id/chat_list_adapter_item_text_name" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/chat_list_adapter_item_text_bot" style="@style/UiKit.TextView" />
++ 
++         <com.discord.utilities.view.text.LinkifiedTextView  android:id="@id/chat_list_adapter_item_text" app:layout_constrainedWidth="true" android:layout_marginLeft="6.0dip" android:layout_marginBottom="1.0dip" android:layout_marginStart="6.0dip" app:layout_constraintStart_toEndOf="@id/chat_list_adapter_item_text_timestamp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toRightOf="@id/chat_list_adapter_item_text_timestamp" app:layout_constraintRight_toRightOf="parent" style="@style/UiKit.Chat.Text" />
+      </androidx.constraintlayout.widget.ConstraintLayout>
+  </androidx.constraintlayout.widget.ConstraintLayout>
+\ No newline at end of file
+diff -crB -x dist -x build com.discord-850-base/res/values/dimens.xml com.discord-850/res/values/dimens.xml
+*** com.discord-850-base/res/values/dimens.xml	2019-02-23 23:35:53.125998741 +0300
+--- com.discord-850/res/values/dimens.xml	2019-02-23 23:36:09.146091588 +0300
+***************
+*** 335,342 ****
+      <dimen name="uikit_btn_padding_vertical">4.0dip</dimen>
+      <dimen name="uikit_btn_stroke_width">0.75dip</dimen>
+      <dimen name="uikit_btn_wrapped_min_width">96.0dip</dimen>
+!     <dimen name="uikit_guideline_chat">58.0dip</dimen>
+!     <dimen name="uikit_guideline_chat_embed">62.0dip</dimen>
+      <dimen name="uikit_guideline_item_row">48.0dip</dimen>
+      <dimen name="uikit_guideline_sheet">72.0dip</dimen>
+      <dimen name="uikit_image_border_size">3.0dip</dimen>
+--- 335,342 ----
+      <dimen name="uikit_btn_padding_vertical">4.0dip</dimen>
+      <dimen name="uikit_btn_stroke_width">0.75dip</dimen>
+      <dimen name="uikit_btn_wrapped_min_width">96.0dip</dimen>
+!     <dimen name="uikit_guideline_chat">20.0dip</dimen>
+!     <dimen name="uikit_guideline_chat_embed">24.0dip</dimen>
+      <dimen name="uikit_guideline_item_row">48.0dip</dimen>
+      <dimen name="uikit_guideline_sheet">72.0dip</dimen>
+      <dimen name="uikit_image_border_size">3.0dip</dimen>
+
diff --git a/patches/compact/README.md b/patches/compact/README.md
index 89f57b8..803b75b 100644
--- a/patches/compact/README.md
+++ b/patches/compact/README.md
@@ -17,4 +17,5 @@ This patch, when combined with `smalltime` patch, emulates the "compact"/"irc" t
 - 8.5.0
 - 8.5.1
 - 8.5.3
+- 8.5.4
 
diff --git a/patches/customtheme/854.patch b/patches/customtheme/854.patch
new file mode 100644
index 0000000..f3990cf
--- /dev/null
+++ b/patches/customtheme/854.patch
@@ -0,0 +1,253 @@
+diff -crB -x dist -x build com.discord-854-base/res/values/colors.xml com.discord-854/res/values/colors.xml
+*** com.discord-854-base/res/values/colors.xml	2019-03-03 19:12:52.362448626 +0300
+--- com.discord-854/res/values/colors.xml	2019-03-03 19:19:42.674434831 +0300
+***************
+*** 61,68 ****
+      <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_default_color_primary">#ff3f51b5</color>
+      <color name="design_default_color_primary_dark">#ff303f9f</color>
+--- 61,68 ----
+      <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_default_color_primary">#ff3f51b5</color>
+      <color name="design_default_color_primary_dark">#ff303f9f</color>
+***************
+*** 98,106 ****
+      <color name="grey_6_alpha_05">#0d4f545c</color>
+      <color name="grey_6_alpha_30">#4d4f545c</color>
+      <color name="grey_6_alpha_60">#994f545c</color>
+!     <color name="grey_account">#ff282b30</color>
+!     <color name="grey_channels">#ff2e3136</color>
+!     <color name="grey_guilds">#ff1e2124</color>
+      <color name="grey_unread">#ff8a8e94</color>
+      <color name="highlighted_text_material_dark">#6680cbc4</color>
+      <color name="highlighted_text_material_light">#66009688</color>
+--- 98,106 ----
+      <color name="grey_6_alpha_05">#0d4f545c</color>
+      <color name="grey_6_alpha_30">#4d4f545c</color>
+      <color name="grey_6_alpha_60">#994f545c</color>
+!     <color name="grey_account">#ff000000</color>
+!     <color name="grey_channels">#ff000000</color>
+!     <color name="grey_guilds">#ff000000</color>
+      <color name="grey_unread">#ff8a8e94</color>
+      <color name="highlighted_text_material_dark">#6680cbc4</color>
+      <color name="highlighted_text_material_light">#66009688</color>
+***************
+*** 109,123 ****
+      <color name="hypesquad_house3">#ff45ddc0</color>
+      <color name="icon_color_light">#ff93a5af</color>
+      <color name="league_of_legends">#ff021f25</color>
+!     <color name="link_100">#fff2fbfe</color>
+!     <color name="link_200">#ffcceffd</color>
+!     <color name="link_300">#ff99dffb</color>
+!     <color name="link_400">#ff33c0f6</color>
+!     <color name="link_500">#ff00b0f4</color>
+!     <color name="link_600">#ff0078a6</color>
+!     <color name="link_700">#ff004662</color>
+!     <color name="link_800">#ff003549</color>
+!     <color name="link_900">#ff00090c</color>
+      <color name="material_blue_grey_800">#ff37474f</color>
+      <color name="material_blue_grey_900">#ff263238</color>
+      <color name="material_blue_grey_950">#ff21272b</color>
+--- 109,123 ----
+      <color name="hypesquad_house3">#ff45ddc0</color>
+      <color name="icon_color_light">#ff93a5af</color>
+      <color name="league_of_legends">#ff021f25</color>
+!     <color name="link_100">#ff8cf687</color>
+!     <color name="link_200">#ff7df577</color>
+!     <color name="link_300">#ff6ef368</color>
+!     <color name="link_400">#ff5ff258</color>
+!     <color name="link_500">#ff50f148</color>
+!     <color name="link_600">#ff41f038</color>
+!     <color name="link_700">#ff32ef28</color>
+!     <color name="link_800">#ff23ed19</color>
+!     <color name="link_900">#ff1be411</color>
+      <color name="material_blue_grey_800">#ff37474f</color>
+      <color name="material_blue_grey_900">#ff263238</color>
+      <color name="material_blue_grey_950">#ff21272b</color>
+***************
+*** 159,176 ****
+      <color name="primary_400_alpha_30">#4d7d8187</color>
+      <color name="primary_400_alpha_60">#997d8187</color>
+      <color name="primary_400_alpha_90">#e67d8187</color>
+!     <color name="primary_500">#ff4f545c</color>
+!     <color name="primary_500_alpha_30">#4d4f545c</color>
+!     <color name="primary_500_alpha_60">#994f545c</color>
+!     <color name="primary_500_alpha_90">#e64f545c</color>
+!     <color name="primary_600">#ff36393f</color>
+!     <color name="primary_600_alpha_30">#4d36393f</color>
+!     <color name="primary_600_alpha_60">#9936393f</color>
+!     <color name="primary_600_alpha_90">#e636393f</color>
+!     <color name="primary_630">#ff2f3136</color>
+!     <color name="primary_630_alpha_30">#4d2f3136</color>
+!     <color name="primary_630_alpha_60">#992f3136</color>
+!     <color name="primary_630_alpha_90">#e62f3136</color>
+      <color name="primary_660">#ff2f3136</color>
+      <color name="primary_660_alpha_30">#4d292b2f</color>
+      <color name="primary_660_alpha_60">#99292b2f</color>
+--- 159,176 ----
+      <color name="primary_400_alpha_30">#4d7d8187</color>
+      <color name="primary_400_alpha_60">#997d8187</color>
+      <color name="primary_400_alpha_90">#e67d8187</color>
+!     <color name="primary_500">#ff0f0f0f</color>
+!     <color name="primary_500_alpha_30">#4d0f0f0f</color>
+!     <color name="primary_500_alpha_60">#990f0f0f</color>
+!     <color name="primary_500_alpha_90">#e60f0f0f</color>
+!     <color name="primary_600">#ff000000</color>
+!     <color name="primary_600_alpha_30">#4d000000</color>
+!     <color name="primary_600_alpha_60">#99000000</color>
+!     <color name="primary_600_alpha_90">#e6000000</color>
+!     <color name="primary_630">#ff000000</color>
+!     <color name="primary_630_alpha_30">#4d000000</color>
+!     <color name="primary_630_alpha_60">#99000000</color>
+!     <color name="primary_630_alpha_90">#e6000000</color>
+      <color name="primary_660">#ff2f3136</color>
+      <color name="primary_660_alpha_30">#4d292b2f</color>
+      <color name="primary_660_alpha_60">#99292b2f</color>
+***************
+*** 195,202 ****
+      <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>
+--- 195,202 ----
+      <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">#ff697ec4</color>
+      <color name="purple_brand_hint">#ffc9d2f0</color>
+      <color name="purple_brand_notification">#ff5161ff</color>
+diff -crB -x dist -x build com.discord-854-base/res/values/styles.xml com.discord-854/res/values/styles.xml
+*** com.discord-854-base/res/values/styles.xml	2019-03-03 19:12:52.365781975 +0300
+--- com.discord-854/res/values/styles.xml	2019-03-03 19:19:42.677768180 +0300
+***************
+*** 116,122 ****
+          <item name="colorPrimary">@color/primary_600</item>
+          <item name="colorPrimaryBg">@drawable/drawable_uikit_primary_600_bg_dark</item>
+          <item name="colorPrimaryCircle">@drawable/drawable_uikit_primary_600_circle</item>
+!         <item name="colorPrimaryDark">#ff2b2e31</item>
+          <item name="colorPrimaryDivider">@color/primary_500_alpha_60</item>
+          <item name="colorPrimaryTabs">@color/black_alpha_05</item>
+          <item name="dialogTheme">@style/AppTheme.Dark.Notice</item>
+--- 116,122 ----
+          <item name="colorPrimary">@color/primary_600</item>
+          <item name="colorPrimaryBg">@drawable/drawable_uikit_primary_600_bg_dark</item>
+          <item name="colorPrimaryCircle">@drawable/drawable_uikit_primary_600_circle</item>
+!         <item name="colorPrimaryDark">@color/primary_630</item>
+          <item name="colorPrimaryDivider">@color/primary_500_alpha_60</item>
+          <item name="colorPrimaryTabs">@color/black_alpha_05</item>
+          <item name="dialogTheme">@style/AppTheme.Dark.Notice</item>
+***************
+*** 330,336 ****
+          <item name="tabSelectedTextColor">@color/white</item>
+          <item name="tabTextColor">@color/white_alpha_40</item>
+          <item name="theme_backspace_icon">@drawable/ic_backspace_white_24dp</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/grey_channels</item>
+          <item name="theme_chat_codeblock_border">@color/grey_account</item>
+--- 330,336 ----
+          <item name="tabSelectedTextColor">@color/white</item>
+          <item name="tabTextColor">@color/white_alpha_40</item>
+          <item name="theme_backspace_icon">@drawable/ic_backspace_white_24dp</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/grey_channels</item>
+          <item name="theme_chat_codeblock_border">@color/grey_account</item>
+***************
+*** 344,355 ****
+          <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_input_text">@color/white_alpha_70</item>
+          <item name="theme_chat_input_text_placeholder">@color/white_alpha_20</item>
+          <item name="theme_chat_loading_spinner_color">@color/white</item>
+!         <item name="theme_chat_mentioned_me">#1afaa61a</item>
+          <item name="theme_chat_name">@color/white</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>
+--- 344,355 ----
+          <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_input_text">@color/white_alpha_70</item>
+          <item name="theme_chat_input_text_placeholder">@color/white_alpha_20</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_name">@color/white</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>
+***************
+*** 415,421 ****
+          <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>
+--- 415,421 ----
+          <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>
+***************
+*** 447,453 ****
+          <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.Button.Red.Fit</item>
+--- 447,453 ----
+          <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.Button.Red.Fit</item>
+diff -crB -x dist -x build com.discord-854-base/smali/com/discord/app/AppActivity$e.smali com.discord-854/smali/com/discord/app/AppActivity$e.smali
+*** com.discord-854-base/smali/com/discord/app/AppActivity$e.smali	2019-03-03 19:12:55.662464600 +0300
+--- com.discord-854/smali/com/discord/app/AppActivity$e.smali	2019-03-03 19:22:28.541773015 +0300
+***************
+*** 123,129 ****
+  
+      check-cast v0, Landroid/app/Activity;
+  
+!     const v1, 0x7f06013a
+  
+      invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->setStatusBarColorResourceId(Landroid/app/Activity;I)V
+  
+--- 123,129 ----
+  
+      check-cast v0, Landroid/app/Activity;
+  
+!     const v1, 0x7f0600d3
+  
+      invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->setStatusBarColorResourceId(Landroid/app/Activity;I)V
+  
+
diff --git a/patches/customtheme/README.md b/patches/customtheme/README.md
index a4707b8..381a40a 100644
--- a/patches/customtheme/README.md
+++ b/patches/customtheme/README.md
@@ -4,6 +4,8 @@ This patch replaces theme with a pitch black theme, similar to [0cord](https://g
 
 Run `fixsplash.sh <full path of asset_loading.png>` to fix the splash.
 
+Self note: Top bar color is set by `setStatusBarColorResourceId`
+
 #### Bugs / Side effects
 - Not all colors are replaced (almost all are, though)
 - Muted channel names aren't visible
@@ -25,6 +27,7 @@ Run `fixsplash.sh <full path of asset_loading.png>` to fix the splash.
 - 8.5.0
 - 8.5.1
 - 8.5.3
+- 8.5.4
 
 #### Value reference
 
diff --git a/patches/customversion/854.patch b/patches/customversion/854.patch
new file mode 100644
index 0000000..af32d19
--- /dev/null
+++ b/patches/customversion/854.patch
@@ -0,0 +1,21 @@
+diff -crB -x dist -x build com.discord-854-base/smali/com/discord/widgets/settings/WidgetSettings.smali com.discord-854/smali/com/discord/widgets/settings/WidgetSettings.smali
+*** com.discord-854-base/smali/com/discord/widgets/settings/WidgetSettings.smali	2019-03-03 19:12:57.652474233 +0300
+--- com.discord-854/smali/com/discord/widgets/settings/WidgetSettings.smali	2019-03-03 19:19:13.860961991 +0300
+***************
+*** 1414,1420 ****
+  
+      invoke-virtual {v2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+  
+!     const-string v1, " - 8.5.4 (854)"
+  
+      invoke-virtual {v2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+  
+--- 1414,1420 ----
+  
+      invoke-virtual {v2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+  
+!     const-string v1, " - 8.5.4 (854), with Cutthecord patches"
+  
+      invoke-virtual {v2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+  
+
diff --git a/patches/customversion/README.md b/patches/customversion/README.md
index 174d569..9631af8 100644
--- a/patches/customversion/README.md
+++ b/patches/customversion/README.md
@@ -20,4 +20,5 @@ This patch replaces version string and adds mention of cutthecord in the user se
 - 8.5.0
 - 8.5.1
 - 8.5.3
+- 8.5.4
 
diff --git a/patches/disable-mobileindicator/854.patch b/patches/disable-mobileindicator/854.patch
new file mode 100644
index 0000000..68dd847
--- /dev/null
+++ b/patches/disable-mobileindicator/854.patch
@@ -0,0 +1,21 @@
+diff -crB -x dist -x build com.discord-848-base/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali com.discord-848/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali
+*** com.discord-848-base/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali	2019-02-17 12:23:56.197569493 +0300
+--- com.discord-848/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali	2019-02-17 12:30:27.483215799 +0300
+***************
+*** 182,188 ****
+  
+      const-string v1, "browser"
+  
+!     const-string v2, "Discord Android"
+  
+      .line 64
+      invoke-static {v1, v2}, Lkotlin/q;->m(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
+--- 182,188 ----
+  
+      const-string v1, "browser"
+  
+!     const-string v2, "Discord Client"
+  
+      .line 64
+      invoke-static {v1, v2}, Lkotlin/q;->m(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
+
diff --git a/patches/disable-mobileindicator/README.md b/patches/disable-mobileindicator/README.md
index 411c5ba..4da63ae 100644
--- a/patches/disable-mobileindicator/README.md
+++ b/patches/disable-mobileindicator/README.md
@@ -21,4 +21,5 @@ However, this causes some issues. See the `Bugs / Side effects` list below.
 - 8.5.0
 - 8.5.1
 - 8.5.3
+- 8.5.4
 
diff --git a/patches/experiments/854.patch b/patches/experiments/854.patch
new file mode 100644
index 0000000..c65983c
--- /dev/null
+++ b/patches/experiments/854.patch
@@ -0,0 +1,153 @@
+diff -crB -x dist -x build com.discord-853-base/smali/com/discord/stores/StoreExperiments$ExperimentAndStaff.smali com.discord-853/smali/com/discord/stores/StoreExperiments$ExperimentAndStaff.smali
+*** com.discord-853-base/smali/com/discord/stores/StoreExperiments$ExperimentAndStaff.smali	2019-03-01 12:49:10.936539426 +0300
+--- com.discord-853/smali/com/discord/stores/StoreExperiments$ExperimentAndStaff.smali	2019-03-01 13:02:12.076123539 +0300
+***************
+*** 212,219 ****
+  .method public final isStaff()Z
+      .locals 1
+  
+!     .line 253
+!     iget-boolean v0, p0, Lcom/discord/stores/StoreExperiments$ExperimentAndStaff;->isStaff:Z
+  
+      return v0
+  .end method
+--- 212,218 ----
+  .method public final isStaff()Z
+      .locals 1
+  
+!     const/4 v0, 0x1
+  
+      return v0
+  .end method
+diff -crB -x dist -x build com.discord-853-base/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali com.discord-853/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali
+*** com.discord-853-base/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali	2019-03-01 12:49:10.936539426 +0300
+--- com.discord-853/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali	2019-03-01 13:02:12.079456884 +0300
+***************
+*** 81,108 ****
+  .method public final call(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;)Z
+      .locals 1
+  
+-     const-string v0, "meUser"
+- 
+-     .line 93
+-     invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+- 
+-     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
+- 
+-     move-result p1
+- 
+-     if-nez p1, :cond_1
+- 
+-     if-eqz p2, :cond_0
+- 
+-     goto :goto_0
+- 
+-     :cond_0
+-     const/4 p1, 0x0
+- 
+-     return p1
+- 
+-     :cond_1
+-     :goto_0
+      const/4 p1, 0x1
+  
+      return p1
+--- 81,86 ----
+diff -crB -x dist -x build com.discord-853-base/smali/com/discord/stores/StoreExperiments$getExperimentAndStaff$1.smali com.discord-853/smali/com/discord/stores/StoreExperiments$getExperimentAndStaff$1.smali
+*** com.discord-853-base/smali/com/discord/stores/StoreExperiments$getExperimentAndStaff$1.smali	2019-03-01 12:49:10.936539426 +0300
+--- com.discord-853/smali/com/discord/stores/StoreExperiments$getExperimentAndStaff$1.smali	2019-03-01 13:02:12.079456884 +0300
+***************
+*** 77,90 ****
+  .method public final call(Lcom/discord/models/domain/ModelUser;)Z
+      .locals 1
+  
+!     const-string v0, "it"
+! 
+!     .line 78
+!     invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+! 
+!     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
+! 
+!     move-result p1
+  
+      return p1
+  .end method
+--- 77,83 ----
+  .method public final call(Lcom/discord/models/domain/ModelUser;)Z
+      .locals 1
+  
+!     const/4 p1, 0x1
+  
+      return p1
+  .end method
+diff -crB -x dist -x build com.discord-853-base/smali/com/discord/stores/StoreExperiments.smali com.discord-853/smali/com/discord/stores/StoreExperiments.smali
+*** com.discord-853-base/smali/com/discord/stores/StoreExperiments.smali	2019-03-01 12:49:10.939872772 +0300
+--- com.discord-853/smali/com/discord/stores/StoreExperiments.smali	2019-03-01 13:02:12.079456884 +0300
+***************
+*** 1247,1255 ****
+  
+      if-eqz v0, :cond_0
+  
+!     invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser$Me;->isStaff()Z
+! 
+!     move-result v0
+  
+      if-eq v0, v1, :cond_1
+  
+--- 1247,1253 ----
+  
+      if-eqz v0, :cond_0
+  
+!     const/4 v0, 0x1
+  
+      if-eq v0, v1, :cond_1
+  
+diff -crB -x dist -x build com.discord-853-base/smali/com/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$1.smali com.discord-853/smali/com/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$1.smali
+*** com.discord-853-base/smali/com/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$1.smali	2019-03-01 12:49:11.863209553 +0300
+--- com.discord-853/smali/com/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$1.smali	2019-03-01 13:02:12.079456884 +0300
+***************
+*** 71,83 ****
+  
+      check-cast v0, Landroid/view/View;
+  
+!     const-string v1, "it"
+! 
+!     invoke-static {p1, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+! 
+!     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
+! 
+!     move-result p1
+  
+      invoke-static {v0, p1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy(Landroid/view/View;Z)V
+  
+--- 71,77 ----
+  
+      check-cast v0, Landroid/view/View;
+  
+!     const/4 p1, 0x1
+  
+      invoke-static {v0, p1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy(Landroid/view/View;Z)V
+  
+diff -crB -x dist -x build com.discord-853-base/smali/com/discord/widgets/settings/WidgetSettings.smali com.discord-853/smali/com/discord/widgets/settings/WidgetSettings.smali
+*** com.discord-853-base/smali/com/discord/widgets/settings/WidgetSettings.smali	2019-03-01 12:49:11.863209553 +0300
+--- com.discord-853/smali/com/discord/widgets/settings/WidgetSettings.smali	2019-03-01 13:02:37.799552946 +0300
+***************
+*** 777,785 ****
+      if-eqz p1, :cond_1
+  
+      .line 118
+!     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
+! 
+!     move-result v2
+  
+      if-eq v2, v1, :cond_0
+  
+--- 777,783 ----
+      if-eqz p1, :cond_1
+  
+      .line 118
+!     const/4 v2, 0x1
+  
+      if-eq v2, v1, :cond_0
+  
+
diff --git a/patches/experiments/README.md b/patches/experiments/README.md
index 98462cb..1675338 100644
--- a/patches/experiments/README.md
+++ b/patches/experiments/README.md
@@ -23,4 +23,5 @@ Conflicts with pureevil as it's included here.
 - 8.5.0
 - 8.5.1
 - 8.5.3
+- 8.5.4
 
diff --git a/patches/litecord/854.patch b/patches/litecord/854.patch
new file mode 100644
index 0000000..05a1903
--- /dev/null
+++ b/patches/litecord/854.patch
@@ -0,0 +1,330 @@
+diff -crB -x dist -x build com.discord-848-base/smali/com/discord/app/App.smali com.discord-848/smali/com/discord/app/App.smali
+*** com.discord-848-base/smali/com/discord/app/App.smali	2019-02-17 12:23:56.164235697 +0300
+--- com.discord-848/smali/com/discord/app/App.smali	2019-02-17 12:33:07.967259380 +0300
+***************
+*** 212,218 ****
+  
+      invoke-virtual {v0, v1}, Lcom/discord/utilities/view/text/LinkifiedTextView$Companion;->init(Lkotlin/jvm/functions/Function2;)Lkotlin/Unit;
+  
+!     const-string v0, "https://cdn.discordapp.com"
+  
+      .line 71
+      invoke-static {v0}, Lcom/discord/models/domain/emoji/ModelEmojiCustom;->setCdnUri(Ljava/lang/String;)V
+--- 212,218 ----
+  
+      invoke-virtual {v0, v1}, Lcom/discord/utilities/view/text/LinkifiedTextView$Companion;->init(Lkotlin/jvm/functions/Function2;)Lkotlin/Unit;
+  
+!     const-string v0, "https://dev.litecord.top"
+  
+      .line 71
+      invoke-static {v0}, Lcom/discord/models/domain/emoji/ModelEmojiCustom;->setCdnUri(Ljava/lang/String;)V
+diff -crB -x dist -x build com.discord-848-base/smali/com/discord/BuildConfig.smali com.discord-848/smali/com/discord/BuildConfig.smali
+*** com.discord-848-base/smali/com/discord/BuildConfig.smali	2019-02-17 12:23:56.164235697 +0300
+--- com.discord-848/smali/com/discord/BuildConfig.smali	2019-02-17 12:33:07.967259380 +0300
+***************
+*** 16,30 ****
+  
+  .field public static final FLAVOR_internalExternal:Ljava/lang/String; = "external"
+  
+! .field public static final HOST:Ljava/lang/String; = "https://discordapp.com"
+  
+! .field public static final HOST_API:Ljava/lang/String; = "https://discordapp.com/api/"
+  
+! .field public static final HOST_CDN:Ljava/lang/String; = "https://cdn.discordapp.com"
+  
+  .field public static final HOST_GIFT:Ljava/lang/String; = "https://discord.gift"
+  
+! .field public static final HOST_INVITE:Ljava/lang/String; = "https://discord.gg"
+  
+  .field public static final LOCAL_IP:Ljava/lang/String; = ""
+  
+--- 16,30 ----
+  
+  .field public static final FLAVOR_internalExternal:Ljava/lang/String; = "external"
+  
+! .field public static final HOST:Ljava/lang/String; = "https://dev.litecord.top"
+  
+! .field public static final HOST_API:Ljava/lang/String; = "https://dev.litecord.top/api/"
+  
+! .field public static final HOST_CDN:Ljava/lang/String; = "https://dev.litecord.top"
+  
+  .field public static final HOST_GIFT:Ljava/lang/String; = "https://discord.gift"
+  
+! .field public static final HOST_INVITE:Ljava/lang/String; = "https://dev.litecord.top"
+  
+  .field public static final LOCAL_IP:Ljava/lang/String; = ""
+  
+diff -crB -x dist -x build com.discord-848-base/smali/com/discord/gateway/GatewaySocket.smali com.discord-848/smali/com/discord/gateway/GatewaySocket.smali
+*** com.discord-848-base/smali/com/discord/gateway/GatewaySocket.smali	2019-02-17 12:23:56.167569077 +0300
+--- com.discord-848/smali/com/discord/gateway/GatewaySocket.smali	2019-02-17 12:33:07.970592728 +0300
+***************
+*** 32,38 ****
+  
+  .field private static final DISCOVERING:I = 0x1
+  
+! .field private static final GATEWAY_COMPRESSION:Ljava/lang/String; = "zlib-stream"
+  
+  .field private static final GATEWAY_ENCODING:Ljava/lang/String; = "json"
+  
+--- 32,38 ----
+  
+  .field private static final DISCOVERING:I = 0x1
+  
+! .field private static final GATEWAY_COMPRESSION:Ljava/lang/String; = ""
+  
+  .field private static final GATEWAY_ENCODING:Ljava/lang/String; = "json"
+  
+***************
+*** 1019,1025 ****
+  
+      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;
+  
+--- 1019,1025 ----
+  
+      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 -x dist -x build com.discord-848-base/smali/com/discord/gateway/io/OutgoingPayload$Identify.smali com.discord-848/smali/com/discord/gateway/io/OutgoingPayload$Identify.smali
+*** com.discord-848-base/smali/com/discord/gateway/io/OutgoingPayload$Identify.smali	2019-02-17 12:23:56.167569077 +0300
+--- com.discord-848/smali/com/discord/gateway/io/OutgoingPayload$Identify.smali	2019-02-17 12:33:07.970592728 +0300
+***************
+*** 59,64 ****
+--- 59,66 ----
+  
+      const/4 v0, 0x0
+  
++     const/4 p3, 0x0
++ 
+      .line 27
+      invoke-direct {p0, v0}, Lcom/discord/gateway/io/OutgoingPayload;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+  
+diff -crB -x dist -x build com.discord-848-base/smali/com/discord/stores/StoreGatewayConnection.smali com.discord-848/smali/com/discord/stores/StoreGatewayConnection.smali
+*** com.discord-848-base/smali/com/discord/stores/StoreGatewayConnection.smali	2019-02-17 12:23:56.187569354 +0300
+--- com.discord-848/smali/com/discord/stores/StoreGatewayConnection.smali	2019-02-17 12:33:35.187387977 +0300
+***************
+*** 1290,1296 ****
+      .line 228
+      new-instance v9, Lcom/discord/gateway/rest/RestConfig;
+  
+!     const-string v2, "https://discordapp.com/api/"
+  
+      sget-object v3, Lcom/discord/utilities/rest/RestAPI$AppHeadersProvider;->INSTANCE:Lcom/discord/utilities/rest/RestAPI$AppHeadersProvider;
+  
+--- 1290,1296 ----
+      .line 228
+      new-instance v9, Lcom/discord/gateway/rest/RestConfig;
+  
+!     const-string v2, "https://dev.litecord.top/api/"
+  
+      sget-object v3, Lcom/discord/utilities/rest/RestAPI$AppHeadersProvider;->INSTANCE:Lcom/discord/utilities/rest/RestAPI$AppHeadersProvider;
+  
+diff -crB -x dist -x build com.discord-848-base/smali/com/discord/utilities/icon/IconUtils.smali com.discord-848/smali/com/discord/utilities/icon/IconUtils.smali
+*** com.discord-848-base/smali/com/discord/utilities/icon/IconUtils.smali	2019-02-17 12:23:56.200902873 +0300
+--- com.discord-848/smali/com/discord/utilities/icon/IconUtils.smali	2019-02-17 12:33:07.977259426 +0300
+***************
+*** 359,365 ****
+      goto :goto_2
+  
+      :cond_1
+!     const-string p3, "https://cdn.discordapp.com"
+  
+      .line 109
+      check-cast p3, Ljava/lang/CharSequence;
+--- 359,365 ----
+      goto :goto_2
+  
+      :cond_1
+!     const-string p3, "https://dev.litecord.top"
+  
+      .line 109
+      check-cast p3, Ljava/lang/CharSequence;
+***************
+*** 407,413 ****
+      :cond_3
+      new-instance p3, Ljava/lang/StringBuilder;
+  
+!     const-string v0, "https://cdn.discordapp.com/channel-icons/"
+  
+      invoke-direct {p3, v0}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+  
+--- 407,413 ----
+      :cond_3
+      new-instance p3, Ljava/lang/StringBuilder;
+  
+!     const-string v0, "https://dev.litecord.top/channel-icons/"
+  
+      invoke-direct {p3, v0}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+  
+***************
+*** 649,655 ****
+      goto :goto_1
+  
+      :cond_0
+!     const-string p2, "https://cdn.discordapp.com"
+  
+      .line 142
+      check-cast p2, Ljava/lang/CharSequence;
+--- 649,655 ----
+      goto :goto_1
+  
+      :cond_0
+!     const-string p2, "https://dev.litecord.top"
+  
+      .line 142
+      check-cast p2, Ljava/lang/CharSequence;
+***************
+*** 699,705 ****
+      :cond_2
+      new-instance p2, Ljava/lang/StringBuilder;
+  
+!     const-string v0, "https://cdn.discordapp.com/icons/"
+  
+      invoke-direct {p2, v0}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+  
+--- 699,705 ----
+      :cond_2
+      new-instance p2, Ljava/lang/StringBuilder;
+  
+!     const-string v0, "https://dev.litecord.top/icons/"
+  
+      invoke-direct {p2, v0}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+  
+***************
+*** 900,906 ****
+      :cond_0
+      if-eqz p1, :cond_4
+  
+!     const-string p2, "https://cdn.discordapp.com"
+  
+      .line 88
+      check-cast p2, Ljava/lang/CharSequence;
+--- 900,906 ----
+      :cond_0
+      if-eqz p1, :cond_4
+  
+!     const-string p2, "https://dev.litecord.top"
+  
+      .line 88
+      check-cast p2, Ljava/lang/CharSequence;
+***************
+*** 969,975 ****
+      :goto_1
+      new-instance p3, Ljava/lang/StringBuilder;
+  
+!     const-string v0, "https://cdn.discordapp.com/avatars/"
+  
+      invoke-direct {p3, v0}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+  
+--- 969,975 ----
+      :goto_1
+      new-instance p3, Ljava/lang/StringBuilder;
+  
+!     const-string v0, "https://dev.litecord.top/avatars/"
+  
+      invoke-direct {p3, v0}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+  
+***************
+*** 1837,1843 ****
+      .line 165
+      new-instance v0, Ljava/lang/StringBuilder;
+  
+!     const-string v1, "https://cdn.discordapp.com/app-assets/"
+  
+      invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+  
+--- 1837,1843 ----
+      .line 165
+      new-instance v0, Ljava/lang/StringBuilder;
+  
+!     const-string v1, "https://dev.litecord.top/app-assets/"
+  
+      invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+  
+diff -crB -x dist -x build com.discord-848-base/smali/com/discord/utilities/rest/RestAPI$Companion.smali com.discord-848/smali/com/discord/utilities/rest/RestAPI$Companion.smali
+*** com.discord-848-base/smali/com/discord/utilities/rest/RestAPI$Companion.smali	2019-02-17 12:23:56.204236253 +0300
+--- com.discord-848/smali/com/discord/utilities/rest/RestAPI$Companion.smali	2019-02-17 12:33:07.977259426 +0300
+***************
+*** 318,324 ****
+      .line 213
+      new-instance v0, Lcom/discord/restapi/RestAPIBuilder;
+  
+!     const-string v9, "https://discordapp.com/api/"
+  
+      check-cast v6, Lokhttp3/m;
+  
+--- 318,324 ----
+      .line 213
+      new-instance v0, Lcom/discord/restapi/RestAPIBuilder;
+  
+!     const-string v9, "https://dev.litecord.top/api/"
+  
+      check-cast v6, Lokhttp3/m;
+  
+diff -crB -x dist -x build com.discord-848-base/smali/com/discord/utilities/textprocessing/Rules$createCustomEmojiRule$1$parse$emojiNode$1.smali com.discord-848/smali/com/discord/utilities/textprocessing/Rules$createCustomEmojiRule$1$parse$emojiNode$1.smali
+*** com.discord-848-base/smali/com/discord/utilities/textprocessing/Rules$createCustomEmojiRule$1$parse$emojiNode$1.smali	2019-02-17 12:23:56.210903012 +0300
+--- com.discord-848/smali/com/discord/utilities/textprocessing/Rules$createCustomEmojiRule$1$parse$emojiNode$1.smali	2019-02-17 12:33:07.977259426 +0300
+***************
+*** 105,111 ****
+      :goto_1
+      new-instance p2, Ljava/lang/StringBuilder;
+  
+!     const-string v0, "https://cdn.discordapp.com/emojis/"
+  
+      invoke-direct {p2, v0}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+  
+--- 105,111 ----
+      :goto_1
+      new-instance p2, Ljava/lang/StringBuilder;
+  
+!     const-string v0, "https://dev.litecord.top/emojis/"
+  
+      invoke-direct {p2, v0}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+  
+diff -crB -x dist -x build com.discord-848-base/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite.smali com.discord-848/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite.smali
+*** com.discord-848-base/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite.smali	2019-02-17 12:23:56.227569910 +0300
+--- com.discord-848/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite.smali	2019-02-17 12:33:07.980592775 +0300
+***************
+*** 605,611 ****
+      .line 104
+      new-instance v1, Ljava/lang/StringBuilder;
+  
+!     const-string v6, "https://cdn.discordapp.com/app-icons/"
+  
+      invoke-direct {v1, v6}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+  
+--- 605,611 ----
+      .line 104
+      new-instance v1, Ljava/lang/StringBuilder;
+  
+!     const-string v6, "https://dev.litecord.top/app-icons/"
+  
+      invoke-direct {v1, v6}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+  
+diff -crB -x dist -x build com.discord-848-base/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift.smali com.discord-848/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift.smali
+*** com.discord-848-base/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift.smali	2019-02-17 12:23:56.227569910 +0300
+--- com.discord-848/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift.smali	2019-02-17 12:33:07.980592775 +0300
+***************
+*** 1042,1048 ****
+      :goto_3
+      sget-object v10, Lcom/discord/utilities/icon/IconUtils;->INSTANCE:Lcom/discord/utilities/icon/IconUtils;
+  
+!     const-string v11, "https://cdn.discordapp.com"
+  
+      .line 116
+      invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Resolved;->getGift()Lcom/discord/models/domain/ModelGift;
+--- 1042,1048 ----
+      :goto_3
+      sget-object v10, Lcom/discord/utilities/icon/IconUtils;->INSTANCE:Lcom/discord/utilities/icon/IconUtils;
+  
+!     const-string v11, "https://dev.litecord.top"
+  
+      .line 116
+      invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemGift$Model$Resolved;->getGift()Lcom/discord/models/domain/ModelGift;
+
diff --git a/patches/litecord/README.md b/patches/litecord/README.md
index bef9bc0..51a87f6 100644
--- a/patches/litecord/README.md
+++ b/patches/litecord/README.md
@@ -24,4 +24,5 @@ Conflicts with nozlib as it's included here.
 - 8.5.0
 - 8.5.1
 - 8.5.3
+- 8.5.4
 
diff --git a/patches/mutant/854.patch b/patches/mutant/854.patch
new file mode 100644
index 0000000..566c23b
--- /dev/null
+++ b/patches/mutant/854.patch
@@ -0,0 +1,1907 @@
+*** com.discord-832-base/assets/data/emojis.json  2019-01-19 04:41:50.983097375 +0300
+--- com.discord-832/assets/data/emojis.json 2019-01-22 23:29:58.633342294 +0300
+***************
+*** 549,554 ****
+--- 549,568 ----
+      },
+      {
+        "names": [
++         "raised_hands_paw"
++       ],
++       "surrogates": "🙌􁙐",
++       "hasDiversity": true
++     },
++     {
++       "names": [
++         "raised_hands_claw"
++       ],
++       "surrogates": "🙌􁙑",
++       "hasDiversity": true
++     },
++     {
++       "names": [
+          "clap"
+        ],
+        "surrogates": "👏",
+***************
+*** 556,561 ****
+--- 570,589 ----
+      },
+      {
+        "names": [
++         "clap_paw"
++       ],
++       "surrogates": "👏􁙐",
++       "hasDiversity": true
++     },
++     {
++       "names": [
++         "clap_claw"
++       ],
++       "surrogates": "👏􁙑",
++       "hasDiversity": true
++     },
++     {
++       "names": [
+          "wave"
+        ],
+        "surrogates": "👋",
+***************
+*** 563,568 ****
+--- 591,610 ----
+      },
+      {
+        "names": [
++         "wave_paw"
++       ],
++       "surrogates": "👋􁙐",
++       "hasDiversity": true
++     },
++     {
++       "names": [
++         "wave_claw"
++       ],
++       "surrogates": "👋􁙑",
++       "hasDiversity": true
++     },
++     {
++       "names": [
+          "thumbsup",
+          "+1",
+          "thumbup"
+***************
+*** 572,577 ****
+--- 614,637 ----
+      },
+      {
+        "names": [
++         "thumbsup_paw",
++         "+1_paw",
++         "thumbup_paw"
++       ],
++       "surrogates": "👍􁙐",
++       "hasDiversity": true
++     },
++     {
++       "names": [
++         "thumbsup_claw",
++         "+1_claw",
++         "thumbup_claw"
++       ],
++       "surrogates": "👍􁙑",
++       "hasDiversity": true
++     },
++     {
++       "names": [
+          "thumbsdown",
+          "-1",
+          "thumbdown"
+***************
+*** 581,586 ****
+--- 641,664 ----
+      },
+      {
+        "names": [
++         "thumbsdown_paw",
++         "-1_paw",
++         "thumbdown_paw"
++       ],
++       "surrogates": "👎􁙐",
++       "hasDiversity": true
++     },
++     {
++       "names": [
++         "thumbsdown_claw",
++         "-1_claw",
++         "thumbdown_claw"
++       ],
++       "surrogates": "👎􁙑",
++       "hasDiversity": true
++     },
++     {
++       "names": [
+          "punch"
+        ],
+        "surrogates": "👊",
+***************
+*** 588,593 ****
+--- 666,685 ----
+      },
+      {
+        "names": [
++         "punch_paw"
++       ],
++       "surrogates": "👊􁙐",
++       "hasDiversity": true
++     },
++     {
++       "names": [
++         "punch_claw"
++       ],
++       "surrogates": "👊􁙑",
++       "hasDiversity": true
++     },
++     {
++       "names": [
+          "fist"
+        ],
+        "surrogates": "✊",
+***************
+*** 595,600 ****
+--- 687,706 ----
+      },
+      {
+        "names": [
++         "fist_paw"
++       ],
++       "surrogates": "✊􁙐",
++       "hasDiversity": true
++     },
++     {
++       "names": [
++         "fist_claw"
++       ],
++       "surrogates": "✊􁙑",
++       "hasDiversity": true
++     },
++     {
++       "names": [
+          "v"
+        ],
+        "surrogates": "✌",
+***************
+*** 602,607 ****
+--- 708,727 ----
+      },
+      {
+        "names": [
++         "v_paw"
++       ],
++       "surrogates": "✌􁙐",
++       "hasDiversity": true
++     },
++     {
++       "names": [
++         "v_claw"
++       ],
++       "surrogates": "✌􁙑",
++       "hasDiversity": true
++     },
++     {
++       "names": [
+          "ok_hand"
+        ],
+        "surrogates": "👌",
+***************
+*** 609,614 ****
+--- 729,748 ----
+      },
+      {
+        "names": [
++         "ok_hand_paw"
++       ],
++       "surrogates": "👌􁙐",
++       "hasDiversity": true
++     },
++     {
++       "names": [
++         "ok_hand_claw"
++       ],
++       "surrogates": "👌􁙑",
++       "hasDiversity": true
++     },
++     {
++       "names": [
+          "raised_hand"
+        ],
+        "surrogates": "✋",
+***************
+*** 616,621 ****
+--- 750,769 ----
+      },
+      {
+        "names": [
++         "raised_hand_paw"
++       ],
++       "surrogates": "✋􁙐",
++       "hasDiversity": true
++     },
++     {
++       "names": [
++         "raised_hand_claw"
++       ],
++       "surrogates": "✋􁙑",
++       "hasDiversity": true
++     },
++     {
++       "names": [
+          "open_hands"
+        ],
+        "surrogates": "👐",
+***************
+*** 623,628 ****
+--- 771,790 ----
+      },
+      {
+        "names": [
++         "open_hands_paw"
++       ],
++       "surrogates": "👐􁙐",
++       "hasDiversity": true
++     },
++     {
++       "names": [
++         "open_hands_claw"
++       ],
++       "surrogates": "👐􁙑",
++       "hasDiversity": true
++     },
++     {
++       "names": [
+          "muscle"
+        ],
+        "surrogates": "💪",
+***************
+*** 630,635 ****
+--- 792,811 ----
+      },
+      {
+        "names": [
++         "muscle_paw"
++       ],
++       "surrogates": "💪􁙐",
++       "hasDiversity": true
++     },
++     {
++       "names": [
++         "muscle_claw"
++       ],
++       "surrogates": "💪􁙑",
++       "hasDiversity": true
++     },
++     {
++       "names": [
+          "pray"
+        ],
+        "surrogates": "🙏",
+***************
+*** 637,642 ****
+--- 813,832 ----
+      },
+      {
+        "names": [
++         "pray_paw"
++       ],
++       "surrogates": "🙏􁙐",
++       "hasDiversity": true
++     },
++     {
++       "names": [
++         "pray_claw"
++       ],
++       "surrogates": "🙏􁙑",
++       "hasDiversity": true
++     },
++     {
++       "names": [
+          "point_up"
+        ],
+        "surrogates": "☝",
+***************
+*** 644,649 ****
+--- 834,853 ----
+      },
+      {
+        "names": [
++         "point_up_paw"
++       ],
++       "surrogates": "☝􁙐",
++       "hasDiversity": true
++     },
++     {
++       "names": [
++         "point_up_claw"
++       ],
++       "surrogates": "☝􁙑",
++       "hasDiversity": true
++     },
++     {
++       "names": [
+          "point_up_2"
+        ],
+        "surrogates": "👆",
+***************
+*** 651,656 ****
+--- 855,874 ----
+      },
+      {
+        "names": [
++         "point_up_2_paw"
++       ],
++       "surrogates": "👆􁙐",
++       "hasDiversity": true
++     },
++     {
++       "names": [
++         "point_up_2_claw"
++       ],
++       "surrogates": "👆􁙑",
++       "hasDiversity": true
++     },
++     {
++       "names": [
+          "point_down"
+        ],
+        "surrogates": "👇",
+***************
+*** 658,663 ****
+--- 876,895 ----
+      },
+      {
+        "names": [
++         "point_down_paw"
++       ],
++       "surrogates": "👇􁙐",
++       "hasDiversity": true
++     },
++     {
++       "names": [
++         "point_down_claw"
++       ],
++       "surrogates": "👇􁙑",
++       "hasDiversity": true
++     },
++     {
++       "names": [
+          "point_left"
+        ],
+        "surrogates": "👈",
+***************
+*** 665,670 ****
+--- 897,916 ----
+      },
+      {
+        "names": [
++         "point_left_paw"
++       ],
++       "surrogates": "👈􁙐",
++       "hasDiversity": true
++     },
++     {
++       "names": [
++         "point_left_claw"
++       ],
++       "surrogates": "👈􁙑",
++       "hasDiversity": true
++     },
++     {
++       "names": [
+          "point_right"
+        ],
+        "surrogates": "👉",
+***************
+*** 672,677 ****
+--- 918,937 ----
+      },
+      {
+        "names": [
++         "point_right_paw"
++       ],
++       "surrogates": "👉􁙐",
++       "hasDiversity": true
++     },
++     {
++       "names": [
++         "point_right_claw"
++       ],
++       "surrogates": "👉􁙑",
++       "hasDiversity": true
++     },
++     {
++       "names": [
+          "middle_finger",
+          "reversed_hand_with_middle_finger_extended"
+        ],
+***************
+*** 680,685 ****
+--- 940,961 ----
+      },
+      {
+        "names": [
++         "middle_finger_paw",
++         "reversed_hand_with_middle_finger_extended_paw"
++       ],
++       "surrogates": "🖕􁙐",
++       "hasDiversity": true
++     },
++     {
++       "names": [
++         "middle_finger_claw",
++         "reversed_hand_with_middle_finger_extended_claw"
++       ],
++       "surrogates": "🖕􁙑",
++       "hasDiversity": true
++     },
++     {
++       "names": [
+          "hand_splayed",
+          "raised_hand_with_fingers_splayed"
+        ],
+***************
+*** 688,693 ****
+--- 964,977 ----
+      },
+      {
+        "names": [
++         "hand_splayed_claw",
++         "raised_hand_with_fingers_splayed_claw"
++       ],
++       "surrogates": "🖐􁙑",
++       "hasDiversity": true
++     },
++     {
++       "names": [
+          "metal",
+          "sign_of_the_horns"
+        ],
+***************
+*** 696,701 ****
+--- 980,1001 ----
+      },
+      {
+        "names": [
++         "metal_paw",
++         "sign_of_the_horns_paw"
++       ],
++       "surrogates": "🤘􁙐",
++       "hasDiversity": true
++     },
++     {
++       "names": [
++         "metal_claw",
++         "sign_of_the_horns_claw"
++       ],
++       "surrogates": "🤘􁙑",
++       "hasDiversity": true
++     },
++     {
++       "names": [
+          "vulcan",
+          "raised_hand_with_part_between_middle_and_ring_fingers"
+        ],
+***************
+*** 704,709 ****
+--- 1004,1025 ----
+      },
+      {
+        "names": [
++         "vulcan_paw",
++         "raised_hand_with_part_between_middle_and_ring_fingers_paw"
++       ],
++       "surrogates": "🖖􁙐",
++       "hasDiversity": true
++     },
++     {
++       "names": [
++         "vulcan_claw",
++         "raised_hand_with_part_between_middle_and_ring_fingers_claw"
++       ],
++       "surrogates": "🖖􁙑",
++       "hasDiversity": true
++     },
++     {
++       "names": [
+          "writing_hand"
+        ],
+        "surrogates": "✍",
+***************
+*** 711,716 ****
+--- 1027,1046 ----
+      },
+      {
+        "names": [
++         "writing_hand_paw"
++       ],
++       "surrogates": "✍􁙐",
++       "hasDiversity": true
++     },
++     {
++       "names": [
++         "writing_hand_claw"
++       ],
++       "surrogates": "✍􁙑",
++       "hasDiversity": true
++     },
++     {
++       "names": [
+          "nail_care"
+        ],
+        "surrogates": "💅",
+***************
+*** 718,723 ****
+--- 1048,1067 ----
+      },
+      {
+        "names": [
++         "nail_care_paw"
++       ],
++       "surrogates": "💅􁙐",
++       "hasDiversity": true
++     },
++     {
++       "names": [
++         "nail_care_claw"
++       ],
++       "surrogates": "💅􁙑",
++       "hasDiversity": true
++     },
++     {
++       "names": [
+          "lips"
+        ],
+        "surrogates": "👄"
+***************
+*** 1417,1422 ****
+--- 1761,1780 ----
+      },
+      {
+        "names": [
++         "selfie_paw"
++       ],
++       "surrogates": "🤳􁙐",
++       "hasDiversity": true
++     },
++     {
++       "names": [
++         "selfie_claw"
++       ],
++       "surrogates": "🤳􁙑",
++       "hasDiversity": true
++     },
++     {
++       "names": [
+          "man_dancing",
+          "male_dancer"
+        ],
+***************
+*** 1433,1438 ****
+--- 1791,1812 ----
+      },
+      {
+        "names": [
++         "call_me_paw",
++         "call_me_hand_paw"
++       ],
++       "surrogates": "🤙􁙐",
++       "hasDiversity": true
++     },
++     {
++       "names": [
++         "call_me_claw",
++         "call_me_hand_claw"
++       ],
++       "surrogates": "🤙􁙑",
++       "hasDiversity": true
++     },
++     {
++       "names": [
+          "raised_back_of_hand",
+          "back_of_hand"
+        ],
+***************
+*** 1441,1446 ****
+--- 1815,1836 ----
+      },
+      {
+        "names": [
++         "raised_back_of_hand_paw",
++         "back_of_hand_paw"
++       ],
++       "surrogates": "🤚􁙐",
++       "hasDiversity": true
++     },
++     {
++       "names": [
++         "raised_back_of_hand_claw",
++         "back_of_hand_claw"
++       ],
++       "surrogates": "🤚􁙑",
++       "hasDiversity": true
++     },
++     {
++       "names": [
+          "left_facing_fist",
+          "left_fist"
+        ],
+***************
+*** 1449,1454 ****
+--- 1839,1860 ----
+      },
+      {
+        "names": [
++         "left_facing_fist_paw",
++         "left_fist_paw"
++       ],
++       "surrogates": "🤛􁙐",
++       "hasDiversity": true
++     },
++     {
++       "names": [
++         "left_facing_fist_claw",
++         "left_fist_claw"
++       ],
++       "surrogates": "🤛􁙑",
++       "hasDiversity": true
++     },
++     {
++       "names": [
+          "right_facing_fist",
+          "right_fist"
+        ],
+***************
+*** 1457,1462 ****
+--- 1863,1884 ----
+      },
+      {
+        "names": [
++         "right_facing_fist_paw",
++         "right_fist_paw"
++       ],
++       "surrogates": "🤜􁙐",
++       "hasDiversity": true
++     },
++     {
++       "names": [
++         "right_facing_fist_claw",
++         "right_fist_claw"
++       ],
++       "surrogates": "🤜􁙑",
++       "hasDiversity": true
++     },
++     {
++       "names": [
+          "handshake",
+          "shaking_hands"
+        ],
+***************
+*** 1464,1474 ****
+--- 1886,2100 ----
+      },
+      {
+        "names": [
++         "handshake_paw",
++         "shaking_hands_paw"
++       ],
++       "surrogates": "🤝􁙐"
++     },
++     {
++       "names": [
++         "handshake_claw",
++         "shaking_hands_claw"
++       ],
++       "surrogates": "🤝􁙑"
++     },
++     {
++       "names": [
+          "fingers_crossed",
+          "hand_with_index_and_middle_finger_crossed"
+        ],
+        "surrogates": "🤞",
+        "hasDiversity": true
++     },
++     {
++       "names": [
++         "fingers_crossed_paw",
++         "hand_with_index_and_middle_finger_crossed_paw"
++       ],
++       "surrogates": "🤞􁙐",
++       "hasDiversity": true
++     },
++     {
++       "names": [
++         "fingers_crossed_claw",
++         "hand_with_index_and_middle_finger_crossed_claw"
++       ],
++       "surrogates": "🤞􁙑",
++       "hasDiversity": true
++     },
++     {
++       "names": [
++         "pilot"
++       ],
++       "surrogates": "🧑✈"
++     },
++     {
++       "names": [
++         "health_worker"
++       ],
++       "surrogates": "🧑⚕"
++     },
++     {
++       "names": [
++         "firefighter"
++       ],
++       "surrogates": "🧑🥢"
++     },
++     {
++       "names": [
++         "astronaut"
++       ],
++       "surrogates": "🧑🚀"
++     },
++     {
++       "names": [
++         "scientist"
++       ],
++       "surrogates": "🧑🔬"
++     },
++     {
++       "names": [
++         "mechanic"
++       ],
++       "surrogates": "🧑🔧"
++     },
++     {
++       "names": [
++         "technologist"
++       ],
++       "surrogates": "🧑💻"
++     },
++     {
++       "names": [
++         "chef"
++       ],
++       "surrogates": "🧑🍳"
++     },
++     {
++       "names": [
++         "monocle"
++       ],
++       "surrogates": "🧐"
++     },
++     {
++       "names": [
++         "pleading"
++       ],
++       "surrogates": "🥺"
++     },
++     {
++       "names": [
++         "cold"
++       ],
++       "surrogates": "🥶"
++     },
++     {
++       "names": [
++         "hot"
++       ],
++       "surrogates": "🥵"
++     },
++     {
++       "names": [
++         "woozy"
++       ],
++       "surrogates": "🥴"
++     },
++     {
++       "names": [
++         "party_face"
++       ],
++       "surrogates": "🥳"
++     },
++     {
++       "names": [
++         "smile_hearts"
++       ],
++       "surrogates": "🥰"
++     },
++     {
++       "names": [
++         "mind_blown"
++       ],
++       "surrogates": "🤯"
++     },
++     {
++       "names": [
++         "vomiting"
++       ],
++       "surrogates": "🤮"
++     },
++     {
++       "names": [
++         "hand_over_mouth"
++       ],
++       "surrogates": "🤭"
++     },
++     {
++       "names": [
++         "swearing"
++       ],
++       "surrogates": "🤬"
++     },
++     {
++       "names": [
++         "shush"
++       ],
++       "surrogates": "🤫"
++     },
++     {
++       "names": [
++         "crazy"
++       ],
++       "surrogates": "🤪"
++     },
++     {
++       "names": [
++         "starry_eyes"
++       ],
++       "surrogates": "🤩"
++     },
++     {
++       "names": [
++         "raised_eyebrow"
++       ],
++       "surrogates": "🤨"
++     },
++     {
++       "names": [
++         "detective"
++       ],
++       "surrogates": "🕵􁘫"
++     },
++     {
++       "names": [
++         "massage"
++       ],
++       "surrogates": "💆􁘫"
++     },
++     {
++       "names": [
++         "tipping_hand"
++       ],
++       "surrogates": "💁􁘫"
++     },
++     {
++       "names": [
++         "hot_shit"
++       ],
++       "surrogates": "􁚐"
++     },
++     {
++       "names": [
++         "headpats"
++       ],
++       "surrogates": "􁚗"
++     },
++     {
++       "names": [
++         "merperson"
++       ],
++       "surrogates": "🧜"
+      }
+    ],
+    "nature": [
+***************
+*** 2453,2458 ****
+--- 3079,3140 ----
+          "squid"
+        ],
+        "surrogates": "🦑"
++     },
++     {
++       "names": [
++         "furry_pride",
++         "rainbow_paw"
++       ],
++       "surrogates": "􁚛🌈"
++     },
++     {
++       "names": [
++         "paw"
++       ],
++       "surrogates": "􁚛"
++     },
++     {
++       "names": [
++         "awoo"
++       ],
++       "surrogates": "􁚘"
++     },
++     {
++       "names": [
++         "dont_awoo",
++         "no_awoo"
++       ],
++       "surrogates": "􁚙"
++     },
++     {
++       "names": [
++         "elf"
++       ],
++       "surrogates": "🧝"
++     },
++     {
++       "names": [
++         "raccoon"
++       ],
++       "surrogates": "🦝"
++     },
++     {
++       "names": [
++         "parrot"
++       ],
++       "surrogates": "🦜"
++     },
++     {
++       "names": [
++         "peacock"
++       ],
++       "surrogates": "🦚"
++     },
++     {
++       "names": [
++         "demon"
++       ],
++       "surrogates": "􁙦"
+      }
+    ],
+    "food": [
+***************
+*** 2980,2985 ****
+--- 3662,3673 ----
+          "pancakes"
+        ],
+        "surrogates": "🥞"
++     },
++     {
++       "names": [
++         "cannabis_leaf"
++       ],
++       "surrogates": "􁚑"
+      }
+    ],
+    "activity": [
+***************
+*** 5271,5276 ****
+--- 5959,6018 ----
+          "shopping_trolley"
+        ],
+        "surrogates": "🛒"
++     },
++     {
++       "names": [
++         "toilet_paper"
++       ],
++       "surrogates": "🧻"
++     },
++     {
++       "names": [
++         "brick"
++       ],
++       "surrogates": "🧱"
++     },
++     {
++       "names": [
++         "firecracker"
++       ],
++       "surrogates": "🧨"
++     },
++     {
++       "names": [
++         "bone"
++       ],
++       "surrogates": "🦴"
++     },
++     {
++       "names": [
++         "d20"
++       ],
++       "surrogates": "􁚖"
++     },
++     {
++       "names": [
++         "d12"
++       ],
++       "surrogates": "􁚕"
++     },
++     {
++       "names": [
++         "d10"
++       ],
++       "surrogates": "􁚔"
++     },
++     {
++       "names": [
++         "d8"
++       ],
++       "surrogates": "􁚓"
++     },
++     {
++       "names": [
++         "d4"
++       ],
++       "surrogates": "􁚒"
+      }
+    ],
+    "symbols": [
+***************
+*** 7082,7087 ****
+--- 7824,7934 ----
+          "regional_indicator_a"
+        ],
+        "surrogates": "🇦"
++     },
++     {
++       "names": [
++         "queer_100"
++       ],
++       "surrogates": "💯🌈"
++     },
++     {
++       "names": [
++         "dont_at",
++         "no_at",
++         "no_mention",
++         "dont_mention"
++       ],
++       "surrogates": "􁚚"
++     },
++     {
++       "names": [
++         "neuter_symbol"
++       ],
++       "surrogates": "⚲"
++     },
++     {
++       "names": [
++         "androgyne_symbol"
++       ],
++       "surrogates": "⚨"
++     },
++     {
++       "names": [
++         "transgender_symbol"
++       ],
++       "surrogates": "⚧"
++     },
++     {
++       "names": [
++         "male_female_symbol"
++       ],
++       "surrogates": "⚥"
++     },
++     {
++       "names": [
++         "male_and_female_symbol"
++       ],
++       "surrogates": "⚤"
++     },
++     {
++       "names": [
++         "two_male_symbols"
++       ],
++       "surrogates": "⚣"
++     },
++     {
++       "names": [
++         "two_female_symbols"
++       ],
++       "surrogates": "⚢"
++     },
++     {
++       "names": [
++         "red_heart"
++       ],
++       "surrogates": "♴"
++     },
++     {
++       "names": [
++         "male_symbol"
++       ],
++       "surrogates": "♂"
++     },
++     {
++       "names": [
++         "female_symbol"
++       ],
++       "surrogates": "♀"
++     },
++     {
++       "names": [
++         "orange_heart"
++       ],
++       "surrogates": "🧡"
++     },
++     {
++       "names": [
++         "labrys_symbol"
++       ],
++       "surrogates": "􁚅"
++     },
++     {
++       "names": [
++         "bisexual_triangles"
++       ],
++       "surrogates": "􁚄"
++     },
++     {
++       "names": [
++         "black_triangle"
++       ],
++       "surrogates": "􁚃"
++     },
++     {
++       "names": [
++         "pink_triangle"
++       ],
++       "surrogates": "􁚂"
+      }
+    ],
+    "flags": [
+***************
+*** 8633,8638 ****
+          "rainbow_flag"
+        ],
+        "surrogates": "🏳️‍🌈"
+      }
+    ]
+! }
+\ No newline at end of file
+--- 9480,9917 ----
+          "rainbow_flag"
+        ],
+        "surrogates": "🏳️‍🌈"
++     },
++     {
++       "names": [
++         "pirate_flag"
++       ],
++       "surrogates": "🏴️"
++     },
++     {
++       "names": [
++         "transgender_flag"
++       ],
++       "surrogates": "􁚁"
++     },
++     {
++       "names": [
++         "polysexual_flag"
++       ],
++       "surrogates": "􁚀"
++     },
++     {
++       "names": [
++         "polyamory_flag"
++       ],
++       "surrogates": "􁙿"
++     },
++     {
++       "names": [
++         "pansexual_flag"
++       ],
++       "surrogates": "􁙾"
++     },
++     {
++       "names": [
++         "nonbinary_flag"
++       ],
++       "surrogates": "􁙽"
++     },
++     {
++       "names": [
++         "neutrois_flag"
++       ],
++       "surrogates": "􁙼"
++     },
++     {
++       "names": [
++         "intersex_flag"
++       ],
++       "surrogates": "􁙻"
++     },
++     {
++       "names": [
++         "genderqueer_flag"
++       ],
++       "surrogates": "􁙺"
++     },
++     {
++       "names": [
++         "genderfluid_flag"
++       ],
++       "surrogates": "􁙹"
++     },
++     {
++       "names": [
++         "deminonbinary_flag"
++       ],
++       "surrogates": "􁙸"
++     },
++     {
++       "names": [
++         "demigirl_flag"
++       ],
++       "surrogates": "􁙷"
++     },
++     {
++       "names": [
++         "demiguy_flag"
++       ],
++       "surrogates": "􁙶"
++     },
++     {
++       "names": [
++         "bisexual_flag"
++       ],
++       "surrogates": "􁙵"
++     },
++     {
++       "names": [
++         "bigender_flag"
++       ],
++       "surrogates": "􁙴"
++     },
++     {
++       "names": [
++         "bear_flag"
++       ],
++       "surrogates": "􁙳"
++     },
++     {
++       "names": [
++         "asexual_flag"
++       ],
++       "surrogates": "􁙲"
++     },
++     {
++       "names": [
++         "aromantic_flag"
++       ],
++       "surrogates": "􁙱"
++     },
++     {
++       "names": [
++         "agender_flag"
++       ],
++       "surrogates": "􁙰"
++     },
++     {
++       "names": [
++         "lesbian_flag"
++       ],
++       "surrogates": "􁚆"
++     },
++     {
++       "names": [
++         "paw-modifier"
++       ],
++       "surrogates": "􁙐"
++     },
++     {
++       "names": [
++         "claw-modifier"
++       ],
++       "surrogates": "􁙑"
++     },
++     {
++       "names": [
++         "skin-tone-1"
++       ],
++       "surrogates": "🏻"
++     },
++     {
++       "names": [
++         "skin-tone-2"
++       ],
++       "surrogates": "🏼"
++     },
++     {
++       "names": [
++         "skin-tone-3"
++       ],
++       "surrogates": "🏽"
++     },
++     {
++       "names": [
++         "skin-tone-4"
++       ],
++       "surrogates": "🏾"
++     },
++     {
++       "names": [
++         "skin-tone-5"
++       ],
++       "surrogates": "🏿"
++     },
++     {
++       "names": [
++         "skin-tone-6"
++       ],
++       "surrogates": "􁘀"
++     },
++     {
++       "names": [
++         "skin-tone-7"
++       ],
++       "surrogates": "􁘁"
++     },
++     {
++       "names": [
++         "skin-tone-8"
++       ],
++       "surrogates": "􁘂"
++     },
++     {
++       "names": [
++         "skin-tone-9"
++       ],
++       "surrogates": "􁘃"
++     },
++     {
++       "names": [
++         "skin-tone-10"
++       ],
++       "surrogates": "􁘄"
++     },
++     {
++       "names": [
++         "skin-tone-11"
++       ],
++       "surrogates": "􁘅"
++     },
++     {
++       "names": [
++         "skin-tone-12"
++       ],
++       "surrogates": "􁘆"
++     },
++     {
++       "names": [
++         "skin-tone-13"
++       ],
++       "surrogates": "􁘇"
++     },
++     {
++       "names": [
++         "skin-tone-14"
++       ],
++       "surrogates": "􁘈"
++     },
++     {
++       "names": [
++         "skin-tone-15"
++       ],
++       "surrogates": "􁘉"
++     },
++     {
++       "names": [
++         "skin-tone-16"
++       ],
++       "surrogates": "􁘊"
++     },
++     {
++       "names": [
++         "skin-tone-17"
++       ],
++       "surrogates": "􁘋"
++     },
++     {
++       "names": [
++         "skin-tone-18"
++       ],
++       "surrogates": "􁘌"
++     },
++     {
++       "names": [
++         "skin-tone-19"
++       ],
++       "surrogates": "􁘍"
++     },
++     {
++       "names": [
++         "skin-tone-20"
++       ],
++       "surrogates": "􁘎"
++     },
++     {
++       "names": [
++         "skin-tone-21"
++       ],
++       "surrogates": "􁘏"
++     },
++     {
++       "names": [
++         "skin-tone-22"
++       ],
++       "surrogates": "􁘐"
++     },
++     {
++       "names": [
++         "skin-tone-23"
++       ],
++       "surrogates": "􁘑"
++     },
++     {
++       "names": [
++         "skin-tone-24"
++       ],
++       "surrogates": "􁘒"
++     },
++     {
++       "names": [
++         "skin-tone-25"
++       ],
++       "surrogates": "􁘓"
++     },
++     {
++       "names": [
++         "skin-tone-26"
++       ],
++       "surrogates": "􁘔"
++     },
++     {
++       "names": [
++         "skin-tone-27"
++       ],
++       "surrogates": "􁘕"
++     },
++     {
++       "names": [
++         "skin-tone-28"
++       ],
++       "surrogates": "􁘖"
++     },
++     {
++       "names": [
++         "skin-tone-29"
++       ],
++       "surrogates": "􁘗"
++     },
++     {
++       "names": [
++         "skin-tone-30"
++       ],
++       "surrogates": "􁘘"
++     },
++     {
++       "names": [
++         "skin-tone-31"
++       ],
++       "surrogates": "􁘙"
++     },
++     {
++       "names": [
++         "skin-tone-32"
++       ],
++       "surrogates": "􁘚"
++     },
++     {
++       "names": [
++         "skin-tone-33"
++       ],
++       "surrogates": "􁘛"
++     },
++     {
++       "names": [
++         "skin-tone-34"
++       ],
++       "surrogates": "􁘜"
++     },
++     {
++       "names": [
++         "skin-tone-35"
++       ],
++       "surrogates": "􁘝"
++     },
++     {
++       "names": [
++         "skin-tone-36"
++       ],
++       "surrogates": "􁘞"
++     },
++     {
++       "names": [
++         "skin-tone-37"
++       ],
++       "surrogates": "􁘟"
++     },
++     {
++       "names": [
++         "skin-tone-38"
++       ],
++       "surrogates": "􁘠"
++     },
++     {
++       "names": [
++         "skin-tone-39"
++       ],
++       "surrogates": "􁘡"
++     },
++     {
++       "names": [
++         "skin-tone-40"
++       ],
++       "surrogates": "􁘢"
++     },
++     {
++       "names": [
++         "skin-tone-41"
++       ],
++       "surrogates": "􁘣"
++     },
++     {
++       "names": [
++         "skin-tone-42"
++       ],
++       "surrogates": "􁘤"
++     },
++     {
++       "names": [
++         "skin-tone-43"
++       ],
++       "surrogates": "􁘥"
++     },
++     {
++       "names": [
++         "skin-tone-44"
++       ],
++       "surrogates": "􁘦"
++     },
++     {
++       "names": [
++         "skin-tone-45"
++       ],
++       "surrogates": "􁘧"
++     },
++     {
++       "names": [
++         "skin-tone-46"
++       ],
++       "surrogates": "􁘨"
++     },
++     {
++       "names": [
++         "skin-tone-47"
++       ],
++       "surrogates": "􁘩"
++     },
++     {
++       "names": [
++         "skin-tone-48"
++       ],
++       "surrogates": "􁘪"
++     },
++     {
++       "names": [
++         "skin-tone-49"
++       ],
++       "surrogates": "􁘫"
++     },
++     {
++       "names": [
++         "skin-tone-50"
++       ],
++       "surrogates": "􁘬"
+      }
+    ]
+! }
+diff -crB -x dist -x build com.discord-832-base/smali/com/discord/models/domain/emoji/ModelEmojiUnicode.smali com.discord-832/smali/com/discord/models/domain/emoji/ModelEmojiUnicode.smali
+*** com.discord-832-base/smali/com/discord/models/domain/emoji/ModelEmojiUnicode.smali  2019-01-19 04:41:50.783096394 +0300
+--- com.discord-832/smali/com/discord/models/domain/emoji/ModelEmojiUnicode.smali   2019-01-22 14:47:17.852853706 +0300
+***************
+*** 65,71 ****
+  .method static constructor <clinit>()V
+      .locals 3
+  
+!     const/4 v0, 0x5
+  
+      .line 36
+      new-array v0, v0, [Ljava/lang/String;
+--- 65,71 ----
+  .method static constructor <clinit>()V
+      .locals 3
+  
+!     const/16 v0, 0x32
+  
+      .line 36
+      new-array v0, v0, [Ljava/lang/String;
+***************
+*** 100,105 ****
+--- 100,375 ----
+  
+      aput-object v1, v0, v2
+  
++     const-string v1, "􁘀"
++ 
++     const/16 v2, 0x5
++ 
++     aput-object v1, v0, v2
++ 
++     const-string v1, "􁘁"
++ 
++     const/16 v2, 0x6
++ 
++     aput-object v1, v0, v2
++ 
++     const-string v1, "􁘂"
++ 
++     const/16 v2, 0x7
++ 
++     aput-object v1, v0, v2
++ 
++     const-string v1, "􁘃"
++ 
++     const/16 v2, 0x8
++ 
++     aput-object v1, v0, v2
++ 
++     const-string v1, "􁘄"
++ 
++     const/16 v2, 0x9
++ 
++     aput-object v1, v0, v2
++ 
++     const-string v1, "􁘅"
++ 
++     const/16 v2, 0xa
++ 
++     aput-object v1, v0, v2
++ 
++     const-string v1, "􁘆"
++ 
++     const/16 v2, 0xb
++ 
++     aput-object v1, v0, v2
++ 
++     const-string v1, "􁘇"
++ 
++     const/16 v2, 0xc
++ 
++     aput-object v1, v0, v2
++ 
++     const-string v1, "􁘈"
++ 
++     const/16 v2, 0xd
++ 
++     aput-object v1, v0, v2
++ 
++     const-string v1, "􁘉"
++ 
++     const/16 v2, 0xe
++ 
++     aput-object v1, v0, v2
++ 
++     const-string v1, "􁘊"
++ 
++     const/16 v2, 0xf
++ 
++     aput-object v1, v0, v2
++ 
++     const-string v1, "􁘋"
++ 
++     const/16 v2, 0x10
++ 
++     aput-object v1, v0, v2
++ 
++     const-string v1, "􁘌"
++ 
++     const/16 v2, 0x11
++ 
++     aput-object v1, v0, v2
++ 
++     const-string v1, "􁘍"
++ 
++     const/16 v2, 0x12
++ 
++     aput-object v1, v0, v2
++ 
++     const-string v1, "􁘎"
++ 
++     const/16 v2, 0x13
++ 
++     aput-object v1, v0, v2
++ 
++     const-string v1, "􁘏"
++ 
++     const/16 v2, 0x14
++ 
++     aput-object v1, v0, v2
++ 
++     const-string v1, "􁘐"
++ 
++     const/16 v2, 0x15
++ 
++     aput-object v1, v0, v2
++ 
++     const-string v1, "􁘑"
++ 
++     const/16 v2, 0x16
++ 
++     aput-object v1, v0, v2
++ 
++     const-string v1, "􁘒"
++ 
++     const/16 v2, 0x17
++ 
++     aput-object v1, v0, v2
++ 
++     const-string v1, "􁘓"
++ 
++     const/16 v2, 0x18
++ 
++     aput-object v1, v0, v2
++ 
++     const-string v1, "􁘔"
++ 
++     const/16 v2, 0x19
++ 
++     aput-object v1, v0, v2
++ 
++     const-string v1, "􁘕"
++ 
++     const/16 v2, 0x1a
++ 
++     aput-object v1, v0, v2
++ 
++     const-string v1, "􁘖"
++ 
++     const/16 v2, 0x1b
++ 
++     aput-object v1, v0, v2
++ 
++     const-string v1, "􁘗"
++ 
++     const/16 v2, 0x1c
++ 
++     aput-object v1, v0, v2
++ 
++     const-string v1, "􁘘"
++ 
++     const/16 v2, 0x1d
++ 
++     aput-object v1, v0, v2
++ 
++     const-string v1, "􁘙"
++ 
++     const/16 v2, 0x1e
++ 
++     aput-object v1, v0, v2
++ 
++     const-string v1, "􁘚"
++ 
++     const/16 v2, 0x1f
++ 
++     aput-object v1, v0, v2
++ 
++     const-string v1, "􁘛"
++ 
++     const/16 v2, 0x20
++ 
++     aput-object v1, v0, v2
++ 
++     const-string v1, "􁘜"
++ 
++     const/16 v2, 0x21
++ 
++     aput-object v1, v0, v2
++ 
++     const-string v1, "􁘝"
++ 
++     const/16 v2, 0x22
++ 
++     aput-object v1, v0, v2
++ 
++     const-string v1, "􁘞"
++ 
++     const/16 v2, 0x23
++ 
++     aput-object v1, v0, v2
++ 
++     const-string v1, "􁘟"
++ 
++     const/16 v2, 0x24
++ 
++     aput-object v1, v0, v2
++ 
++     const-string v1, "􁘠"
++ 
++     const/16 v2, 0x25
++ 
++     aput-object v1, v0, v2
++ 
++     const-string v1, "􁘡"
++ 
++     const/16 v2, 0x26
++ 
++     aput-object v1, v0, v2
++ 
++     const-string v1, "􁘢"
++ 
++     const/16 v2, 0x27
++ 
++     aput-object v1, v0, v2
++ 
++     const-string v1, "􁘣"
++ 
++     const/16 v2, 0x28
++ 
++     aput-object v1, v0, v2
++ 
++     const-string v1, "􁘤"
++ 
++     const/16 v2, 0x29
++ 
++     aput-object v1, v0, v2
++ 
++     const-string v1, "􁘥"
++ 
++     const/16 v2, 0x2a
++ 
++     aput-object v1, v0, v2
++ 
++     const-string v1, "􁘦"
++ 
++     const/16 v2, 0x2b
++ 
++     aput-object v1, v0, v2
++ 
++     const-string v1, "􁘧"
++ 
++     const/16 v2, 0x2c
++ 
++     aput-object v1, v0, v2
++ 
++     const-string v1, "􁘨"
++ 
++     const/16 v2, 0x2d
++ 
++     aput-object v1, v0, v2
++ 
++     const-string v1, "􁘩"
++ 
++     const/16 v2, 0x2e
++ 
++     aput-object v1, v0, v2
++ 
++     const-string v1, "􁘪"
++ 
++     const/16 v2, 0x2f
++ 
++     aput-object v1, v0, v2
++ 
++     const-string v1, "􁘫"
++ 
++     const/16 v2, 0x30
++ 
++     aput-object v1, v0, v2
++ 
++     const-string v1, "􁘬"
++ 
++     const/16 v2, 0x31
++ 
++     aput-object v1, v0, v2
++ 
+      sput-object v0, Lcom/discord/models/domain/emoji/ModelEmojiUnicode;->DIVERSITY_MODIFIERS:[Ljava/lang/String;
+  
+      .line 193
diff --git a/patches/mutant/README.md b/patches/mutant/README.md
index 09c7a13..4eddd5a 100644
--- a/patches/mutant/README.md
+++ b/patches/mutant/README.md
@@ -32,6 +32,7 @@ Various scripts are provided to help building of custom patches easier.
 - 8.5.0
 - 8.5.1
 - 8.5.3
+- 8.5.4
 
 #### Disclaimer
 
diff --git a/patches/necessary/854.patch b/patches/necessary/854.patch
new file mode 100644
index 0000000..35bc996
--- /dev/null
+++ b/patches/necessary/854.patch
@@ -0,0 +1,13 @@
+diff -crB -x dist com.discord-831/res/values/public.xml com.discord-831-patched/res/values/public.xml
+*** com.discord-831/res/values/public.xml       2019-01-18 19:05:56.057972374 +0300
+--- com.discord-831-patched/res/values/public.xml       2019-01-18 17:26:29.150818524 +0300
+***************
+*** 65,71 ****
+      <public type="animator" name="selection_grow" id="0x7f02000a" />
+      <public type="animator" name="selection_shrink" id="0x7f02000b" />
+      <public type="animator" name="design_appbar_state_list_animator" id="0x7f020000" />
+-     <public type="array" name="color_picker_palette" id="0x7f030000" />
+      <public type="attr" name="actionBarDivider" id="0x7f040000" />
+      <public type="attr" name="actionBarItemBackground" id="0x7f040001" />
+      <public type="attr" name="actionBarPopupTheme" id="0x7f040002" />
+--- 65,70 ----
diff --git a/patches/necessary/README.md b/patches/necessary/README.md
index 23abd12..e507864 100644
--- a/patches/necessary/README.md
+++ b/patches/necessary/README.md
@@ -25,6 +25,7 @@ If the version you're using is in the following list, please make sure to use th
 - 8.5.0
 - 8.5.1
 - 8.5.3
+- 8.5.4
 
 ~~wow imagine leaving a value in that breaks repacking without this patch for 17 releases in a row, good shit discord~~
 
diff --git a/patches/noblocked/854.patch b/patches/noblocked/854.patch
new file mode 100644
index 0000000..985a85f
--- /dev/null
+++ b/patches/noblocked/854.patch
@@ -0,0 +1,18 @@
+diff -crB -x dist -x build com.discord-835-base/res/layout/widget_chat_list_adapter_item_blocked.xml com.discord-835/res/layout/widget_chat_list_adapter_item_blocked.xml
+*** com.discord-835-base/res/layout/widget_chat_list_adapter_item_blocked.xml   2019-01-25 10:57:34.359248256 +0300
+--- com.discord-835/res/layout/widget_chat_list_adapter_item_blocked.xml    2019-01-27 00:08:22.929085528 +0300
+***************
+*** 1,5 ****
+  <?xml version="1.0" encoding="utf-8"?>
+! <RelativeLayout android:background="?selectableItemBackground" android:paddingLeft="@dimen/chat_cell_horizontal_spacing_padding" android:paddingTop="@dimen/chat_cell_vertical_spacing_padding" android:paddingRight="@dimen/chat_cell_horizontal_spacing_padding" android:paddingBottom="@dimen/chat_cell_vertical_spacing_padding" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/chat_cell_horizontal_spacing_margin" android:layout_marginRight="@dimen/chat_cell_horizontal_spacing_margin"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+!     <TextView android:textSize="11.0sp" android:textColor="?theme_chat_blocked_text" android:gravity="center" android:id="@id/chat_list_adapter_item_blocked" android:background="?theme_chat_blocked_bg" android:paddingTop="7.5dip" android:paddingBottom="7.5dip" android:layout_width="fill_parent" style="@style/UiKit.TextView" />
+  </RelativeLayout>
+\ No newline at end of file
+--- 1,5 ----
+  <?xml version="1.0" encoding="utf-8"?>
+! <RelativeLayout android:background="?selectableItemBackground" android:paddingLeft="0px" android:paddingTop="0px" android:paddingRight="0px" android:paddingBottom="@dimen/chat_cell_vertical_spacing_padding" android:layout_width="0px" android:layout_height="0px" android:layout_marginLeft="0px" android:layout_marginRight="@dimen/chat_cell_horizontal_spacing_margin"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+!     <TextView android:textSize="0sp" android:textColor="?theme_chat_blocked_text" android:gravity="center" android:id="@id/chat_list_adapter_item_blocked" android:background="?theme_chat_blocked_bg" android:paddingTop="0dip" android:paddingBottom="0dip" android:layout_width="fill_parent" style="@style/UiKit.TextView" />
+  </RelativeLayout>
+\ No newline at end of file
\ No newline at end of file
diff --git a/patches/noblocked/README.md b/patches/noblocked/README.md
index afa3185..e734b19 100644
--- a/patches/noblocked/README.md
+++ b/patches/noblocked/README.md
@@ -15,4 +15,5 @@ This patch completely hides the "# Blocked Message(s)" thing.
 - 8.5.0
 - 8.5.1
 - 8.5.3
+- 8.5.4
 
diff --git a/patches/nonearby/854.patch b/patches/nonearby/854.patch
new file mode 100644
index 0000000..aeb013d
--- /dev/null
+++ b/patches/nonearby/854.patch
@@ -0,0 +1,87 @@
+diff -crB -x dist -x build com.discord-833-base/smali/com/discord/widgets/friends/NearbyManager.smali com.discord-833/smali/com/discord/widgets/friends/NearbyManager.smali
+*** com.discord-833-base/smali/com/discord/widgets/friends/NearbyManager.smali	2019-01-23 11:03:47.459035497 +0300
+--- com.discord-833/smali/com/discord/widgets/friends/NearbyManager.smali	2019-01-23 11:23:00.200709501 +0300
+***************
+*** 440,512 ****
+  
+  # virtual methods
+  .method public final activateNearby()V
+!     .locals 9
+! 
+!     .line 58
+!     iget-object v0, p0, Lcom/discord/widgets/friends/NearbyManager;->messagesClient:Lcom/google/android/gms/nearby/messages/MessagesClient;
+! 
+!     if-nez v0, :cond_0
+! 
+!     return-void
+! 
+!     .line 59
+!     :cond_0
+!     iget-object v1, p0, Lcom/discord/widgets/friends/NearbyManager;->outboundMessage:Lcom/google/android/gms/nearby/messages/Message;
+! 
+!     if-nez v1, :cond_1
+! 
+!     return-void
+! 
+!     .line 60
+!     :cond_1
+!     iget-object v2, p0, Lcom/discord/widgets/friends/NearbyManager;->messagePublishOptions:Lcom/google/android/gms/nearby/messages/PublishOptions;
+! 
+!     if-nez v2, :cond_2
+! 
+!     return-void
+! 
+!     .line 61
+!     :cond_2
+!     iget-object v3, p0, Lcom/discord/widgets/friends/NearbyManager;->messageListener:Lcom/google/android/gms/nearby/messages/MessageListener;
+! 
+!     if-nez v3, :cond_3
+! 
+!     return-void
+! 
+!     .line 62
+!     :cond_3
+!     iget-object v4, p0, Lcom/discord/widgets/friends/NearbyManager;->subscribeOptions:Lcom/google/android/gms/nearby/messages/SubscribeOptions;
+! 
+!     if-nez v4, :cond_4
+! 
+!     return-void
+! 
+!     .line 64
+!     :cond_4
+!     iget-object v5, p0, Lcom/discord/widgets/friends/NearbyManager;->nearbyStateSubject:Lrx/subjects/BehaviorSubject;
+! 
+!     new-instance v6, Lcom/discord/widgets/friends/NearbyManager$NearbyState$Connected;
+! 
+!     new-instance v7, Ljava/util/HashSet;
+! 
+!     iget-object v8, p0, Lcom/discord/widgets/friends/NearbyManager;->nearbyUserIds:Ljava/util/HashSet;
+! 
+!     check-cast v8, Ljava/util/Collection;
+! 
+!     invoke-direct {v7, v8}, Ljava/util/HashSet;-><init>(Ljava/util/Collection;)V
+! 
+!     check-cast v7, Ljava/util/Set;
+! 
+!     invoke-direct {v6, v7}, Lcom/discord/widgets/friends/NearbyManager$NearbyState$Connected;-><init>(Ljava/util/Set;)V
+! 
+!     invoke-virtual {v5, v6}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
+! 
+!     .line 66
+!     invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/nearby/messages/MessagesClient;->a(Lcom/google/android/gms/nearby/messages/Message;Lcom/google/android/gms/nearby/messages/PublishOptions;)Lcom/google/android/gms/tasks/g;
+! 
+!     .line 67
+!     invoke-virtual {v0, v3, v4}, Lcom/google/android/gms/nearby/messages/MessagesClient;->a(Lcom/google/android/gms/nearby/messages/MessageListener;Lcom/google/android/gms/nearby/messages/SubscribeOptions;)Lcom/google/android/gms/tasks/g;
+! 
+      return-void
+  .end method
+  
+--- 440,446 ----
+  
+  # virtual methods
+  .method public final activateNearby()V
+!     .locals 0
+      return-void
+  .end method
+  
+
diff --git a/patches/nonearby/README.md b/patches/nonearby/README.md
index 2784780..40c6096 100644
--- a/patches/nonearby/README.md
+++ b/patches/nonearby/README.md
@@ -18,4 +18,5 @@ This patch nulls a bunch of nearby friends features for privacy.
 - 8.5.0
 - 8.5.1
 - 8.5.3
+- 8.5.4
 
diff --git a/patches/noprofilestrip/854.patch b/patches/noprofilestrip/854.patch
new file mode 100644
index 0000000..9c35d98
--- /dev/null
+++ b/patches/noprofilestrip/854.patch
@@ -0,0 +1,54 @@
+diff -crB -x dist -x build com.discord-844-base/smali/com/discord/widgets/user/WidgetUserProfileStrip.smali com.discord-844/smali/com/discord/widgets/user/WidgetUserProfileStrip.smali
+*** com.discord-844-base/smali/com/discord/widgets/user/WidgetUserProfileStrip.smali	2019-02-08 11:20:06.748207115 +0300
+--- com.discord-844/smali/com/discord/widgets/user/WidgetUserProfileStrip.smali	2019-02-08 11:42:20.176669306 +0300
+***************
+*** 428,442 ****
+  
+      move-result-object v2
+  
+!     invoke-virtual {p1}, Lcom/discord/widgets/user/WidgetUserProfileStrip$Model;->getUser()Lcom/discord/models/domain/ModelUser;
+! 
+!     move-result-object v3
+! 
+!     invoke-virtual {v3}, Lcom/discord/models/domain/ModelUser;->getUsername()Ljava/lang/String;
+! 
+!     move-result-object v3
+! 
+!     check-cast v3, Ljava/lang/CharSequence;
+  
+      invoke-virtual {v2, v3}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+  
+--- 428,434 ----
+  
+      move-result-object v2
+  
+!     const-string v3, ""
+  
+      invoke-virtual {v2, v3}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+  
+***************
+*** 445,459 ****
+  
+      move-result-object v2
+  
+!     invoke-virtual {p1}, Lcom/discord/widgets/user/WidgetUserProfileStrip$Model;->getUser()Lcom/discord/models/domain/ModelUser;
+! 
+!     move-result-object p1
+! 
+!     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getDiscriminatorWithPadding()Ljava/lang/String;
+! 
+!     move-result-object p1
+! 
+!     check-cast p1, Ljava/lang/CharSequence;
+  
+      invoke-virtual {v2, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+  
+--- 437,443 ----
+  
+      move-result-object v2
+  
+!     const-string p1, ""
+  
+      invoke-virtual {v2, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+  
+
diff --git a/patches/noprofilestrip/README.md b/patches/noprofilestrip/README.md
index 8f5153f..27225af 100644
--- a/patches/noprofilestrip/README.md
+++ b/patches/noprofilestrip/README.md
@@ -13,4 +13,5 @@ This patch removes the "profile strip" from the left side menu, helping remove P
 - 8.5.0
 - 8.5.1
 - 8.5.3
+- 8.5.4
 
diff --git a/patches/nospoiler/854.patch b/patches/nospoiler/854.patch
new file mode 100644
index 0000000..19208f0
--- /dev/null
+++ b/patches/nospoiler/854.patch
@@ -0,0 +1,65 @@
+diff -crB -x dist -x build com.discord-853-base/smali/com/discord/models/domain/ModelMessageEmbed.smali com.discord-853/smali/com/discord/models/domain/ModelMessageEmbed.smali
+*** com.discord-853-base/smali/com/discord/models/domain/ModelMessageEmbed.smali	2019-03-01 12:49:10.723205296 +0300
+--- com.discord-853/smali/com/discord/models/domain/ModelMessageEmbed.smali	2019-03-01 13:01:30.319300913 +0300
+***************
+*** 2009,2038 ****
+  .end method
+  
+  .method public isSpoilerAttachment()Z
+!     .locals 2
+! 
+!     .line 140
+!     invoke-virtual {p0}, Lcom/discord/models/domain/ModelMessageEmbed;->isAttachment()Z
+! 
+!     move-result v0
+! 
+!     if-eqz v0, :cond_0
+! 
+!     iget-object v0, p0, Lcom/discord/models/domain/ModelMessageEmbed;->title:Ljava/lang/String;
+! 
+!     const-string v1, "SPOILER_"
+! 
+!     invoke-virtual {v0, v1}, Ljava/lang/String;->startsWith(Ljava/lang/String;)Z
+! 
+!     move-result v0
+! 
+!     if-eqz v0, :cond_0
+! 
+!     const/4 v0, 0x1
+! 
+!     return v0
+! 
+!     :cond_0
+      const/4 v0, 0x0
+  
+      return v0
+--- 2009,2015 ----
+  .end method
+  
+  .method public isSpoilerAttachment()Z
+!     .locals 0
+      const/4 v0, 0x0
+  
+      return v0
+diff -crB -x dist -x build com.discord-853-base/smali/com/discord/utilities/textprocessing/node/SpoilerNode.smali com.discord-853/smali/com/discord/utilities/textprocessing/node/SpoilerNode.smali
+*** com.discord-853-base/smali/com/discord/utilities/textprocessing/node/SpoilerNode.smali	2019-03-01 12:49:11.269874004 +0300
+--- com.discord-853/smali/com/discord/utilities/textprocessing/node/SpoilerNode.smali	2019-03-01 13:01:04.339203880 +0300
+***************
+*** 211,218 ****
+  .method public final isRevealed()Z
+      .locals 1
+  
+!     .line 23
+!     iget-boolean v0, p0, Lcom/discord/utilities/textprocessing/node/SpoilerNode;->isRevealed:Z
+  
+      return v0
+  .end method
+--- 211,217 ----
+  .method public final isRevealed()Z
+      .locals 1
+  
+!     const/4 v0, 0x1
+  
+      return v0
+  .end method
+
diff --git a/patches/nospoiler/README.md b/patches/nospoiler/README.md
index fb8c21e..d82e51e 100644
--- a/patches/nospoiler/README.md
+++ b/patches/nospoiler/README.md
@@ -15,4 +15,5 @@ I personally won't be using it as I like to use them as CWs, but I do acknowledg
 - 8.5.0
 - 8.5.1
 - 8.5.3
+- 8.5.4
 
diff --git a/patches/notrack/854.patch b/patches/notrack/854.patch
new file mode 100644
index 0000000..b537533
--- /dev/null
+++ b/patches/notrack/854.patch
@@ -0,0 +1,3042 @@
+diff -crB -x dist -x build com.discord-854-base/AndroidManifest.xml com.discord-854/AndroidManifest.xml
+*** com.discord-854-base/AndroidManifest.xml	2019-03-03 19:12:50.309105353 +0300
+--- com.discord-854/AndroidManifest.xml	2019-03-03 19:18:51.850855441 +0300
+***************
+*** 98,105 ****
+              <meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths"/>
+          </provider>
+          <meta-data android:name="firebase_crashlytics_collection_enabled" android:value="false"/>
+!         <meta-data android:name="io.fabric.ApiKey" android:value="eaccfe98b3572a0a8721a8c3b10f9909018f5ec6"/>
+!         <meta-data android:name="com.google.android.nearby.messages.API_KEY" android:value="AIzaSyD-4L6bgKMixqBRtrG2UktVXK6IexXlsog"/>
+          <activity android:name="com.yalantis.ucrop.UCropActivity" android:theme="@style/Theme.AppCompat.Light.NoActionBar"/>
+          <service android:exported="true" android:name="com.google.firebase.messaging.FirebaseMessagingService">
+              <intent-filter android:priority="-500">
+--- 98,105 ----
+              <meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths"/>
+          </provider>
+          <meta-data android:name="firebase_crashlytics_collection_enabled" android:value="false"/>
+!         <meta-data android:name="io.fabric.ApiKey" android:value="blamelunapoopoopeepeepoopoopeepblameluna"/>
+!         <meta-data android:name="com.google.android.nearby.messages.API_KEY" android:value="blamelunapoopoopeepeepoopoopeeblameluna"/>
+          <activity android:name="com.yalantis.ucrop.UCropActivity" android:theme="@style/Theme.AppCompat.Light.NoActionBar"/>
+          <service android:exported="true" android:name="com.google.firebase.messaging.FirebaseMessagingService">
+              <intent-filter android:priority="-500">
+diff -crB -x dist -x build com.discord-854-base/res/values/strings.xml com.discord-854/res/values/strings.xml
+*** com.discord-854-base/res/values/strings.xml	2019-03-03 19:12:52.362448626 +0300
+--- com.discord-854/res/values/strings.xml	2019-03-03 19:18:51.857522140 +0300
+***************
+*** 944,950 ****
+      <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">1e0458ec-94b8-4842-ac25-e6e8fa207fef</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>
+--- 944,950 ----
+      <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">00000000-0000-0000-0000-000000000000</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>
+diff -crB -x dist -x build com.discord-854-base/smali/com/crashlytics/android/answers/ab.smali com.discord-854/smali/com/crashlytics/android/answers/ab.smali
+*** com.discord-854-base/smali/com/crashlytics/android/answers/ab.smali	2019-03-03 19:12:55.549130718 +0300
+--- com.discord-854/smali/com/crashlytics/android/answers/ab.smali	2019-03-03 19:18:51.857522140 +0300
+***************
+*** 38,207 ****
+  
+  # virtual methods
+  .method public final h(Ljava/util/List;)Z
+!     .locals 9
+!     .annotation system Ldalvik/annotation/Signature;
+!         value = {
+!             "(",
+!             "Ljava/util/List<",
+!             "Ljava/io/File;",
+!             ">;)Z"
+!         }
+!     .end annotation
+! 
+!     .line 34
+!     invoke-virtual {p0}, Lcom/crashlytics/android/answers/ab;->wN()Lio/fabric/sdk/android/a/e/d;
+! 
+!     move-result-object v0
+! 
+!     const-string v1, "X-CRASHLYTICS-API-CLIENT-TYPE"
+! 
+!     const-string v2, "android"
+! 
+!     .line 38
+!     invoke-virtual {v0, v1, v2}, Lio/fabric/sdk/android/a/e/d;->W(Ljava/lang/String;Ljava/lang/String;)Lio/fabric/sdk/android/a/e/d;
+! 
+!     move-result-object v0
+! 
+!     const-string v1, "X-CRASHLYTICS-API-CLIENT-VERSION"
+! 
+!     iget-object v2, p0, Lcom/crashlytics/android/answers/ab;->nC:Lio/fabric/sdk/android/i;
+! 
+!     .line 39
+!     invoke-virtual {v2}, Lio/fabric/sdk/android/i;->getVersion()Ljava/lang/String;
+! 
+!     move-result-object v2
+! 
+!     invoke-virtual {v0, v1, v2}, Lio/fabric/sdk/android/a/e/d;->W(Ljava/lang/String;Ljava/lang/String;)Lio/fabric/sdk/android/a/e/d;
+! 
+!     move-result-object v0
+! 
+!     const-string v1, "X-CRASHLYTICS-API-KEY"
+! 
+!     iget-object v2, p0, Lcom/crashlytics/android/answers/ab;->oC:Ljava/lang/String;
+! 
+!     .line 40
+!     invoke-virtual {v0, v1, v2}, Lio/fabric/sdk/android/a/e/d;->W(Ljava/lang/String;Ljava/lang/String;)Lio/fabric/sdk/android/a/e/d;
+! 
+!     move-result-object v0
+! 
+!     .line 44
+!     invoke-interface {p1}, Ljava/util/List;->iterator()Ljava/util/Iterator;
+! 
+!     move-result-object v1
+! 
+!     const/4 v2, 0x0
+! 
+!     const/4 v3, 0x0
+! 
+!     :goto_0
+!     invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
+! 
+!     move-result v4
+! 
+!     const/4 v5, 0x1
+! 
+!     if-eqz v4, :cond_0
+! 
+!     invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+! 
+!     move-result-object v4
+! 
+!     check-cast v4, Ljava/io/File;
+! 
+!     const-string v6, "session_analytics_file_"
+! 
+!     .line 45
+!     invoke-static {v3}, Ljava/lang/String;->valueOf(I)Ljava/lang/String;
+! 
+!     move-result-object v7
+! 
+!     invoke-virtual {v6, v7}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
+! 
+!     move-result-object v6
+! 
+!     invoke-virtual {v4}, Ljava/io/File;->getName()Ljava/lang/String;
+! 
+!     move-result-object v7
+! 
+!     const-string v8, "application/vnd.crashlytics.android.events"
+! 
+!     invoke-virtual {v0, v6, v7, v8, v4}, Lio/fabric/sdk/android/a/e/d;->a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/io/File;)Lio/fabric/sdk/android/a/e/d;
+! 
+!     add-int/2addr v3, v5
+! 
+!     goto :goto_0
+! 
+!     .line 49
+!     :cond_0
+!     invoke-static {}, Lio/fabric/sdk/android/c;->wA()Lio/fabric/sdk/android/l;
+! 
+!     move-result-object v1
+! 
+!     const-string v3, "Answers"
+! 
+!     new-instance v4, Ljava/lang/StringBuilder;
+! 
+!     const-string v6, "Sending "
+! 
+!     invoke-direct {v4, v6}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+! 
+!     .line 50
+!     invoke-interface {p1}, Ljava/util/List;->size()I
+! 
+!     move-result p1
+! 
+!     invoke-virtual {v4, p1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+! 
+!     const-string p1, " analytics files to "
+! 
+!     invoke-virtual {v4, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+! 
+!     .line 1100
+!     iget-object p1, p0, Lio/fabric/sdk/android/a/b/a;->url:Ljava/lang/String;
+! 
+!     .line 50
+!     invoke-virtual {v4, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+! 
+!     invoke-virtual {v4}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+! 
+!     move-result-object p1
+! 
+!     .line 49
+!     invoke-interface {v1, v3, p1}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
+! 
+!     .line 51
+!     invoke-virtual {v0}, Lio/fabric/sdk/android/a/e/d;->xA()I
+! 
+!     move-result p1
+! 
+!     .line 52
+!     invoke-static {}, Lio/fabric/sdk/android/c;->wA()Lio/fabric/sdk/android/l;
+! 
+!     move-result-object v0
+! 
+!     const-string v1, "Answers"
+! 
+!     const-string v3, "Response code for analytics file send is "
+! 
+!     invoke-static {p1}, Ljava/lang/String;->valueOf(I)Ljava/lang/String;
+! 
+!     move-result-object v4
+! 
+!     invoke-virtual {v3, v4}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
+! 
+!     move-result-object v3
+! 
+!     invoke-interface {v0, v1, v3}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
+! 
+!     .line 55
+!     invoke-static {p1}, Lio/fabric/sdk/android/a/b/u;->cH(I)I
+! 
+!     move-result p1
+! 
+!     if-nez p1, :cond_1
+! 
+!     return v5
+! 
+!     :cond_1
+!     return v2
+  .end method
+--- 38,43 ----
+  
+  # virtual methods
+  .method public final h(Ljava/util/List;)Z
+!     .locals 0
+!     return-void
+  .end method
+diff -crB -x dist -x build com.discord-854-base/smali/com/crashlytics/android/core/ah.smali com.discord-854/smali/com/crashlytics/android/core/ah.smali
+*** com.discord-854-base/smali/com/crashlytics/android/core/ah.smali	2019-03-03 19:12:55.565797465 +0300
+--- com.discord-854/smali/com/crashlytics/android/core/ah.smali	2019-03-03 19:18:51.860855489 +0300
+***************
+*** 29,485 ****
+  .end method
+  
+  .method private static a(Lio/fabric/sdk/android/a/e/d;Lcom/crashlytics/android/core/aq;)Lio/fabric/sdk/android/a/e/d;
+!     .locals 6
+! 
+!     const-string v0, "report_id"
+! 
+!     .line 62
+!     invoke-interface {p1}, Lcom/crashlytics/android/core/aq;->getIdentifier()Ljava/lang/String;
+! 
+!     move-result-object v1
+! 
+!     const/4 v2, 0x0
+! 
+!     .line 3530
+!     invoke-virtual {p0, v0, v2, v1}, Lio/fabric/sdk/android/a/e/d;->o(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lio/fabric/sdk/android/a/e/d;
+! 
+!     .line 63
+!     invoke-interface {p1}, Lcom/crashlytics/android/core/aq;->cO()[Ljava/io/File;
+! 
+!     move-result-object p1
+! 
+!     array-length v0, p1
+! 
+!     const/4 v1, 0x0
+! 
+!     :goto_0
+!     if-ge v1, v0, :cond_a
+! 
+!     aget-object v2, p1, v1
+! 
+!     .line 64
+!     invoke-virtual {v2}, Ljava/io/File;->getName()Ljava/lang/String;
+! 
+!     move-result-object v3
+! 
+!     const-string v4, "minidump"
+! 
+!     invoke-virtual {v3, v4}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+! 
+!     move-result v3
+! 
+!     if-eqz v3, :cond_0
+! 
+!     const-string v3, "minidump_file"
+! 
+!     .line 66
+!     invoke-virtual {v2}, Ljava/io/File;->getName()Ljava/lang/String;
+! 
+!     move-result-object v4
+! 
+!     const-string v5, "application/octet-stream"
+! 
+!     .line 65
+!     invoke-virtual {p0, v3, v4, v5, v2}, Lio/fabric/sdk/android/a/e/d;->a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/io/File;)Lio/fabric/sdk/android/a/e/d;
+! 
+!     goto/16 :goto_1
+! 
+!     .line 67
+!     :cond_0
+!     invoke-virtual {v2}, Ljava/io/File;->getName()Ljava/lang/String;
+! 
+!     move-result-object v3
+! 
+!     const-string v4, "metadata"
+! 
+!     invoke-virtual {v3, v4}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+! 
+!     move-result v3
+! 
+!     if-eqz v3, :cond_1
+! 
+!     const-string v3, "crash_meta_file"
+! 
+!     .line 69
+!     invoke-virtual {v2}, Ljava/io/File;->getName()Ljava/lang/String;
+! 
+!     move-result-object v4
+! 
+!     const-string v5, "application/octet-stream"
+! 
+!     .line 68
+!     invoke-virtual {p0, v3, v4, v5, v2}, Lio/fabric/sdk/android/a/e/d;->a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/io/File;)Lio/fabric/sdk/android/a/e/d;
+! 
+!     goto/16 :goto_1
+! 
+!     .line 70
+!     :cond_1
+!     invoke-virtual {v2}, Ljava/io/File;->getName()Ljava/lang/String;
+! 
+!     move-result-object v3
+! 
+!     const-string v4, "binaryImages"
+! 
+!     invoke-virtual {v3, v4}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+! 
+!     move-result v3
+! 
+!     if-eqz v3, :cond_2
+! 
+!     const-string v3, "binary_images_file"
+! 
+!     .line 72
+!     invoke-virtual {v2}, Ljava/io/File;->getName()Ljava/lang/String;
+! 
+!     move-result-object v4
+! 
+!     const-string v5, "application/octet-stream"
+! 
+!     .line 71
+!     invoke-virtual {p0, v3, v4, v5, v2}, Lio/fabric/sdk/android/a/e/d;->a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/io/File;)Lio/fabric/sdk/android/a/e/d;
+! 
+!     goto/16 :goto_1
+! 
+!     .line 73
+!     :cond_2
+!     invoke-virtual {v2}, Ljava/io/File;->getName()Ljava/lang/String;
+! 
+!     move-result-object v3
+! 
+!     const-string v4, "session"
+! 
+!     invoke-virtual {v3, v4}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+! 
+!     move-result v3
+! 
+!     if-eqz v3, :cond_3
+! 
+!     const-string v3, "session_meta_file"
+! 
+!     .line 75
+!     invoke-virtual {v2}, Ljava/io/File;->getName()Ljava/lang/String;
+! 
+!     move-result-object v4
+! 
+!     const-string v5, "application/octet-stream"
+! 
+!     .line 74
+!     invoke-virtual {p0, v3, v4, v5, v2}, Lio/fabric/sdk/android/a/e/d;->a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/io/File;)Lio/fabric/sdk/android/a/e/d;
+! 
+!     goto/16 :goto_1
+! 
+!     .line 76
+!     :cond_3
+!     invoke-virtual {v2}, Ljava/io/File;->getName()Ljava/lang/String;
+! 
+!     move-result-object v3
+! 
+!     const-string v4, "app"
+! 
+!     invoke-virtual {v3, v4}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+! 
+!     move-result v3
+! 
+!     if-eqz v3, :cond_4
+! 
+!     const-string v3, "app_meta_file"
+! 
+!     .line 78
+!     invoke-virtual {v2}, Ljava/io/File;->getName()Ljava/lang/String;
+! 
+!     move-result-object v4
+! 
+!     const-string v5, "application/octet-stream"
+! 
+!     .line 77
+!     invoke-virtual {p0, v3, v4, v5, v2}, Lio/fabric/sdk/android/a/e/d;->a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/io/File;)Lio/fabric/sdk/android/a/e/d;
+! 
+!     goto/16 :goto_1
+! 
+!     .line 79
+!     :cond_4
+!     invoke-virtual {v2}, Ljava/io/File;->getName()Ljava/lang/String;
+! 
+!     move-result-object v3
+! 
+!     const-string v4, "device"
+! 
+!     invoke-virtual {v3, v4}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+! 
+!     move-result v3
+! 
+!     if-eqz v3, :cond_5
+! 
+!     const-string v3, "device_meta_file"
+! 
+!     .line 81
+!     invoke-virtual {v2}, Ljava/io/File;->getName()Ljava/lang/String;
+! 
+!     move-result-object v4
+! 
+!     const-string v5, "application/octet-stream"
+! 
+!     .line 80
+!     invoke-virtual {p0, v3, v4, v5, v2}, Lio/fabric/sdk/android/a/e/d;->a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/io/File;)Lio/fabric/sdk/android/a/e/d;
+! 
+!     goto :goto_1
+! 
+!     .line 82
+!     :cond_5
+!     invoke-virtual {v2}, Ljava/io/File;->getName()Ljava/lang/String;
+! 
+!     move-result-object v3
+! 
+!     const-string v4, "os"
+! 
+!     invoke-virtual {v3, v4}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+! 
+!     move-result v3
+! 
+!     if-eqz v3, :cond_6
+! 
+!     const-string v3, "os_meta_file"
+! 
+!     .line 84
+!     invoke-virtual {v2}, Ljava/io/File;->getName()Ljava/lang/String;
+! 
+!     move-result-object v4
+! 
+!     const-string v5, "application/octet-stream"
+! 
+!     .line 83
+!     invoke-virtual {p0, v3, v4, v5, v2}, Lio/fabric/sdk/android/a/e/d;->a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/io/File;)Lio/fabric/sdk/android/a/e/d;
+! 
+!     goto :goto_1
+! 
+!     .line 85
+!     :cond_6
+!     invoke-virtual {v2}, Ljava/io/File;->getName()Ljava/lang/String;
+! 
+!     move-result-object v3
+! 
+!     const-string v4, "user"
+! 
+!     invoke-virtual {v3, v4}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+! 
+!     move-result v3
+! 
+!     if-eqz v3, :cond_7
+! 
+!     const-string v3, "user_meta_file"
+! 
+!     .line 87
+!     invoke-virtual {v2}, Ljava/io/File;->getName()Ljava/lang/String;
+! 
+!     move-result-object v4
+! 
+!     const-string v5, "application/octet-stream"
+! 
+!     .line 86
+!     invoke-virtual {p0, v3, v4, v5, v2}, Lio/fabric/sdk/android/a/e/d;->a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/io/File;)Lio/fabric/sdk/android/a/e/d;
+! 
+!     goto :goto_1
+! 
+!     .line 88
+!     :cond_7
+!     invoke-virtual {v2}, Ljava/io/File;->getName()Ljava/lang/String;
+! 
+!     move-result-object v3
+! 
+!     const-string v4, "logs"
+! 
+!     invoke-virtual {v3, v4}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+! 
+!     move-result v3
+! 
+!     if-eqz v3, :cond_8
+! 
+!     const-string v3, "logs_file"
+! 
+!     .line 90
+!     invoke-virtual {v2}, Ljava/io/File;->getName()Ljava/lang/String;
+! 
+!     move-result-object v4
+! 
+!     const-string v5, "application/octet-stream"
+! 
+!     .line 89
+!     invoke-virtual {p0, v3, v4, v5, v2}, Lio/fabric/sdk/android/a/e/d;->a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/io/File;)Lio/fabric/sdk/android/a/e/d;
+! 
+!     goto :goto_1
+! 
+!     .line 91
+!     :cond_8
+!     invoke-virtual {v2}, Ljava/io/File;->getName()Ljava/lang/String;
+! 
+!     move-result-object v3
+! 
+!     const-string v4, "keys"
+! 
+!     invoke-virtual {v3, v4}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+! 
+!     move-result v3
+! 
+!     if-eqz v3, :cond_9
+! 
+!     const-string v3, "keys_file"
+! 
+!     .line 93
+!     invoke-virtual {v2}, Ljava/io/File;->getName()Ljava/lang/String;
+! 
+!     move-result-object v4
+! 
+!     const-string v5, "application/octet-stream"
+! 
+!     .line 92
+!     invoke-virtual {p0, v3, v4, v5, v2}, Lio/fabric/sdk/android/a/e/d;->a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/io/File;)Lio/fabric/sdk/android/a/e/d;
+! 
+!     :cond_9
+!     :goto_1
+!     add-int/lit8 v1, v1, 0x1
+! 
+!     goto/16 :goto_0
+! 
+!     :cond_a
+!     return-object p0
+  .end method
+  
+  
+  # virtual methods
+  .method public final a(Lcom/crashlytics/android/core/u;)Z
+!     .locals 5
+! 
+!     .line 36
+!     invoke-virtual {p0}, Lcom/crashlytics/android/core/ah;->wN()Lio/fabric/sdk/android/a/e/d;
+! 
+!     move-result-object v0
+! 
+!     .line 39
+!     iget-object v1, p1, Lcom/crashlytics/android/core/u;->oC:Ljava/lang/String;
+! 
+!     const-string v2, "User-Agent"
+! 
+!     .line 3052
+!     new-instance v3, Ljava/lang/StringBuilder;
+! 
+!     const-string v4, "Crashlytics Android SDK/"
+! 
+!     invoke-direct {v3, v4}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+! 
+!     iget-object v4, p0, Lcom/crashlytics/android/core/ah;->nC:Lio/fabric/sdk/android/i;
+! 
+!     .line 3054
+!     invoke-virtual {v4}, Lio/fabric/sdk/android/i;->getVersion()Ljava/lang/String;
+! 
+!     move-result-object v4
+! 
+!     invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+! 
+!     invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+! 
+!     move-result-object v3
+! 
+!     .line 3053
+!     invoke-virtual {v0, v2, v3}, Lio/fabric/sdk/android/a/e/d;->W(Ljava/lang/String;Ljava/lang/String;)Lio/fabric/sdk/android/a/e/d;
+! 
+!     move-result-object v2
+! 
+!     const-string v3, "X-CRASHLYTICS-API-CLIENT-TYPE"
+! 
+!     const-string v4, "android"
+! 
+!     .line 3055
+!     invoke-virtual {v2, v3, v4}, Lio/fabric/sdk/android/a/e/d;->W(Ljava/lang/String;Ljava/lang/String;)Lio/fabric/sdk/android/a/e/d;
+! 
+!     move-result-object v2
+! 
+!     const-string v3, "X-CRASHLYTICS-API-CLIENT-VERSION"
+! 
+!     iget-object v4, p0, Lcom/crashlytics/android/core/ah;->nC:Lio/fabric/sdk/android/i;
+! 
+!     .line 3056
+!     invoke-virtual {v4}, Lio/fabric/sdk/android/i;->getVersion()Ljava/lang/String;
+! 
+!     move-result-object v4
+! 
+!     invoke-virtual {v2, v3, v4}, Lio/fabric/sdk/android/a/e/d;->W(Ljava/lang/String;Ljava/lang/String;)Lio/fabric/sdk/android/a/e/d;
+! 
+!     move-result-object v2
+! 
+!     const-string v3, "X-CRASHLYTICS-API-KEY"
+! 
+!     .line 3057
+!     invoke-virtual {v2, v3, v1}, Lio/fabric/sdk/android/a/e/d;->W(Ljava/lang/String;Ljava/lang/String;)Lio/fabric/sdk/android/a/e/d;
+! 
+!     .line 40
+!     iget-object p1, p1, Lcom/crashlytics/android/core/u;->qN:Lcom/crashlytics/android/core/aq;
+! 
+!     invoke-static {v0, p1}, Lcom/crashlytics/android/core/ah;->a(Lio/fabric/sdk/android/a/e/d;Lcom/crashlytics/android/core/aq;)Lio/fabric/sdk/android/a/e/d;
+! 
+!     move-result-object p1
+! 
+!     .line 42
+!     invoke-static {}, Lio/fabric/sdk/android/c;->wA()Lio/fabric/sdk/android/l;
+! 
+!     move-result-object v0
+! 
+!     const-string v1, "CrashlyticsCore"
+! 
+!     new-instance v2, Ljava/lang/StringBuilder;
+! 
+!     const-string v3, "Sending report to: "
+! 
+!     invoke-direct {v2, v3}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+! 
+!     .line 3100
+!     iget-object v3, p0, Lio/fabric/sdk/android/a/b/a;->url:Ljava/lang/String;
+! 
+!     .line 42
+!     invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+! 
+!     invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+! 
+!     move-result-object v2
+! 
+!     invoke-interface {v0, v1, v2}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
+! 
+!     .line 44
+!     invoke-virtual {p1}, Lio/fabric/sdk/android/a/e/d;->xA()I
+! 
+!     move-result p1
+! 
+!     .line 46
+!     invoke-static {}, Lio/fabric/sdk/android/c;->wA()Lio/fabric/sdk/android/l;
+! 
+!     move-result-object v0
+! 
+!     const-string v1, "CrashlyticsCore"
+! 
+!     const-string v2, "Result was: "
+! 
+!     invoke-static {p1}, Ljava/lang/String;->valueOf(I)Ljava/lang/String;
+! 
+!     move-result-object v3
+! 
+!     invoke-virtual {v2, v3}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
+! 
+!     move-result-object v2
+! 
+!     invoke-interface {v0, v1, v2}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
+! 
+!     .line 48
+!     invoke-static {p1}, Lio/fabric/sdk/android/a/b/u;->cH(I)I
+! 
+!     move-result p1
+! 
+!     if-nez p1, :cond_0
+! 
+!     const/4 p1, 0x1
+! 
+!     return p1
+! 
+!     :cond_0
+!     const/4 p1, 0x0
+! 
+!     return p1
+  .end method
+--- 29,41 ----
+  .end method
+  
+  .method private static a(Lio/fabric/sdk/android/a/e/d;Lcom/crashlytics/android/core/aq;)Lio/fabric/sdk/android/a/e/d;
+!     .locals 0
+!     return-void
+  .end method
+  
+  
+  # virtual methods
+  .method public final a(Lcom/crashlytics/android/core/u;)Z
+!     .locals 0
+!     return-void
+  .end method
+diff -crB -x dist -x build com.discord-854-base/smali/com/crashlytics/android/core/x.smali com.discord-854/smali/com/crashlytics/android/core/x.smali
+*** com.discord-854-base/smali/com/crashlytics/android/core/x.smali	2019-03-03 19:12:55.609131009 +0300
+--- com.discord-854/smali/com/crashlytics/android/core/x.smali	2019-03-03 19:18:51.860855489 +0300
+***************
+*** 31,383 ****
+  
+  # virtual methods
+  .method public final a(Lcom/crashlytics/android/core/u;)Z
+!     .locals 12
+! 
+!     .line 59
+!     invoke-virtual {p0}, Lcom/crashlytics/android/core/x;->wN()Lio/fabric/sdk/android/a/e/d;
+! 
+!     move-result-object v0
+! 
+!     const-string v1, "X-CRASHLYTICS-API-KEY"
+! 
+!     .line 3075
+!     iget-object v2, p1, Lcom/crashlytics/android/core/u;->oC:Ljava/lang/String;
+! 
+!     invoke-virtual {v0, v1, v2}, Lio/fabric/sdk/android/a/e/d;->W(Ljava/lang/String;Ljava/lang/String;)Lio/fabric/sdk/android/a/e/d;
+! 
+!     move-result-object v0
+! 
+!     const-string v1, "X-CRASHLYTICS-API-CLIENT-TYPE"
+! 
+!     const-string v2, "android"
+! 
+!     .line 3076
+!     invoke-virtual {v0, v1, v2}, Lio/fabric/sdk/android/a/e/d;->W(Ljava/lang/String;Ljava/lang/String;)Lio/fabric/sdk/android/a/e/d;
+! 
+!     move-result-object v0
+! 
+!     const-string v1, "X-CRASHLYTICS-API-CLIENT-VERSION"
+! 
+!     iget-object v2, p0, Lcom/crashlytics/android/core/x;->nC:Lio/fabric/sdk/android/i;
+! 
+!     .line 3077
+!     invoke-virtual {v2}, Lio/fabric/sdk/android/i;->getVersion()Ljava/lang/String;
+! 
+!     move-result-object v2
+! 
+!     invoke-virtual {v0, v1, v2}, Lio/fabric/sdk/android/a/e/d;->W(Ljava/lang/String;Ljava/lang/String;)Lio/fabric/sdk/android/a/e/d;
+! 
+!     move-result-object v0
+! 
+!     .line 3080
+!     iget-object v1, p1, Lcom/crashlytics/android/core/u;->qN:Lcom/crashlytics/android/core/aq;
+! 
+!     invoke-interface {v1}, Lcom/crashlytics/android/core/aq;->cP()Ljava/util/Map;
+! 
+!     move-result-object v1
+! 
+!     .line 3082
+!     invoke-interface {v1}, Ljava/util/Map;->entrySet()Ljava/util/Set;
+! 
+!     move-result-object v1
+! 
+!     invoke-interface {v1}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
+! 
+!     move-result-object v1
+! 
+!     :goto_0
+!     invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
+! 
+!     move-result v2
+! 
+!     if-eqz v2, :cond_0
+! 
+!     invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+! 
+!     move-result-object v2
+! 
+!     check-cast v2, Ljava/util/Map$Entry;
+! 
+!     .line 3868
+!     invoke-interface {v2}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object;
+! 
+!     move-result-object v3
+! 
+!     check-cast v3, Ljava/lang/String;
+! 
+!     invoke-interface {v2}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
+! 
+!     move-result-object v2
+! 
+!     check-cast v2, Ljava/lang/String;
+! 
+!     invoke-virtual {v0, v3, v2}, Lio/fabric/sdk/android/a/e/d;->W(Ljava/lang/String;Ljava/lang/String;)Lio/fabric/sdk/android/a/e/d;
+! 
+!     move-result-object v0
+! 
+!     goto :goto_0
+! 
+!     .line 61
+!     :cond_0
+!     iget-object p1, p1, Lcom/crashlytics/android/core/u;->qN:Lcom/crashlytics/android/core/aq;
+! 
+!     const-string v1, "report[identifier]"
+! 
+!     .line 4089
+!     invoke-interface {p1}, Lcom/crashlytics/android/core/aq;->getIdentifier()Ljava/lang/String;
+! 
+!     move-result-object v2
+! 
+!     const/4 v3, 0x0
+! 
+!     .line 4530
+!     invoke-virtual {v0, v1, v3, v2}, Lio/fabric/sdk/android/a/e/d;->o(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lio/fabric/sdk/android/a/e/d;
+! 
+!     .line 4091
+!     invoke-interface {p1}, Lcom/crashlytics/android/core/aq;->cO()[Ljava/io/File;
+! 
+!     move-result-object v1
+! 
+!     array-length v1, v1
+! 
+!     const/4 v2, 0x0
+! 
+!     const/4 v3, 0x1
+! 
+!     if-ne v1, v3, :cond_1
+! 
+!     .line 4092
+!     invoke-static {}, Lio/fabric/sdk/android/c;->wA()Lio/fabric/sdk/android/l;
+! 
+!     move-result-object v1
+! 
+!     const-string v4, "CrashlyticsCore"
+! 
+!     new-instance v5, Ljava/lang/StringBuilder;
+! 
+!     const-string v6, "Adding single file "
+! 
+!     invoke-direct {v5, v6}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+! 
+!     invoke-interface {p1}, Lcom/crashlytics/android/core/aq;->getFileName()Ljava/lang/String;
+! 
+!     move-result-object v6
+! 
+!     invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+! 
+!     const-string v6, " to report "
+! 
+!     invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+! 
+!     .line 4093
+!     invoke-interface {p1}, Lcom/crashlytics/android/core/aq;->getIdentifier()Ljava/lang/String;
+! 
+!     move-result-object v6
+! 
+!     invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+! 
+!     invoke-virtual {v5}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+! 
+!     move-result-object v5
+! 
+!     .line 4092
+!     invoke-interface {v1, v4, v5}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
+! 
+!     const-string v1, "report[file]"
+! 
+!     .line 4094
+!     invoke-interface {p1}, Lcom/crashlytics/android/core/aq;->getFileName()Ljava/lang/String;
+! 
+!     move-result-object v4
+! 
+!     const-string v5, "application/octet-stream"
+! 
+!     .line 4095
+!     invoke-interface {p1}, Lcom/crashlytics/android/core/aq;->cN()Ljava/io/File;
+! 
+!     move-result-object p1
+! 
+!     .line 4094
+!     invoke-virtual {v0, v1, v4, v5, p1}, Lio/fabric/sdk/android/a/e/d;->a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/io/File;)Lio/fabric/sdk/android/a/e/d;
+! 
+!     move-result-object v0
+! 
+!     goto :goto_2
+! 
+!     .line 4099
+!     :cond_1
+!     invoke-interface {p1}, Lcom/crashlytics/android/core/aq;->cO()[Ljava/io/File;
+! 
+!     move-result-object v1
+! 
+!     array-length v4, v1
+! 
+!     const/4 v5, 0x0
+! 
+!     const/4 v6, 0x0
+! 
+!     :goto_1
+!     if-ge v5, v4, :cond_2
+! 
+!     aget-object v7, v1, v5
+! 
+!     .line 4100
+!     invoke-static {}, Lio/fabric/sdk/android/c;->wA()Lio/fabric/sdk/android/l;
+! 
+!     move-result-object v8
+! 
+!     const-string v9, "CrashlyticsCore"
+! 
+!     new-instance v10, Ljava/lang/StringBuilder;
+! 
+!     const-string v11, "Adding file "
+! 
+!     invoke-direct {v10, v11}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+! 
+!     invoke-virtual {v7}, Ljava/io/File;->getName()Ljava/lang/String;
+! 
+!     move-result-object v11
+! 
+!     invoke-virtual {v10, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+! 
+!     const-string v11, " to report "
+! 
+!     invoke-virtual {v10, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+! 
+!     .line 4101
+!     invoke-interface {p1}, Lcom/crashlytics/android/core/aq;->getIdentifier()Ljava/lang/String;
+! 
+!     move-result-object v11
+! 
+!     invoke-virtual {v10, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+! 
+!     invoke-virtual {v10}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+! 
+!     move-result-object v10
+! 
+!     .line 4100
+!     invoke-interface {v8, v9, v10}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
+! 
+!     .line 4102
+!     new-instance v8, Ljava/lang/StringBuilder;
+! 
+!     const-string v9, "report[file"
+! 
+!     invoke-direct {v8, v9}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+! 
+!     invoke-virtual {v8, v6}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+! 
+!     const-string v9, "]"
+! 
+!     invoke-virtual {v8, v9}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+! 
+!     invoke-virtual {v8}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+! 
+!     move-result-object v8
+! 
+!     invoke-virtual {v7}, Ljava/io/File;->getName()Ljava/lang/String;
+! 
+!     move-result-object v9
+! 
+!     const-string v10, "application/octet-stream"
+! 
+!     invoke-virtual {v0, v8, v9, v10, v7}, Lio/fabric/sdk/android/a/e/d;->a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/io/File;)Lio/fabric/sdk/android/a/e/d;
+! 
+!     add-int/2addr v6, v3
+! 
+!     add-int/lit8 v5, v5, 0x1
+! 
+!     goto :goto_1
+! 
+!     .line 63
+!     :cond_2
+!     :goto_2
+!     invoke-static {}, Lio/fabric/sdk/android/c;->wA()Lio/fabric/sdk/android/l;
+! 
+!     move-result-object p1
+! 
+!     const-string v1, "CrashlyticsCore"
+! 
+!     new-instance v4, Ljava/lang/StringBuilder;
+! 
+!     const-string v5, "Sending report to: "
+! 
+!     invoke-direct {v4, v5}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+! 
+!     .line 5100
+!     iget-object v5, p0, Lio/fabric/sdk/android/a/b/a;->url:Ljava/lang/String;
+! 
+!     .line 63
+!     invoke-virtual {v4, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+! 
+!     invoke-virtual {v4}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+! 
+!     move-result-object v4
+! 
+!     invoke-interface {p1, v1, v4}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
+! 
+!     .line 65
+!     invoke-virtual {v0}, Lio/fabric/sdk/android/a/e/d;->xA()I
+! 
+!     move-result p1
+! 
+!     .line 67
+!     invoke-static {}, Lio/fabric/sdk/android/c;->wA()Lio/fabric/sdk/android/l;
+! 
+!     move-result-object v1
+! 
+!     const-string v4, "CrashlyticsCore"
+! 
+!     new-instance v5, Ljava/lang/StringBuilder;
+! 
+!     const-string v6, "Create report request ID: "
+! 
+!     invoke-direct {v5, v6}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+! 
+!     const-string v6, "X-REQUEST-ID"
+! 
+!     .line 68
+!     invoke-virtual {v0, v6}, Lio/fabric/sdk/android/a/e/d;->dl(Ljava/lang/String;)Ljava/lang/String;
+! 
+!     move-result-object v0
+! 
+!     invoke-virtual {v5, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+! 
+!     invoke-virtual {v5}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+! 
+!     move-result-object v0
+! 
+!     .line 67
+!     invoke-interface {v1, v4, v0}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
+! 
+!     .line 69
+!     invoke-static {}, Lio/fabric/sdk/android/c;->wA()Lio/fabric/sdk/android/l;
+! 
+!     move-result-object v0
+! 
+!     const-string v1, "CrashlyticsCore"
+! 
+!     const-string v4, "Result was: "
+! 
+!     invoke-static {p1}, Ljava/lang/String;->valueOf(I)Ljava/lang/String;
+! 
+!     move-result-object v5
+! 
+!     invoke-virtual {v4, v5}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
+! 
+!     move-result-object v4
+! 
+!     invoke-interface {v0, v1, v4}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
+! 
+!     .line 71
+!     invoke-static {p1}, Lio/fabric/sdk/android/a/b/u;->cH(I)I
+! 
+!     move-result p1
+! 
+!     if-nez p1, :cond_3
+! 
+!     return v3
+! 
+!     :cond_3
+!     return v2
+  .end method
+--- 31,36 ----
+  
+  # virtual methods
+  .method public final a(Lcom/crashlytics/android/core/u;)Z
+!     .locals 0
+!     return-void
+  .end method
+diff -crB -x dist -x build com.discord-854-base/smali/com/discord/utilities/analytics/AdjustConfig$AdjustLifecycleListener.smali com.discord-854/smali/com/discord/utilities/analytics/AdjustConfig$AdjustLifecycleListener.smali
+*** com.discord-854-base/smali/com/discord/utilities/analytics/AdjustConfig$AdjustLifecycleListener.smali	2019-03-03 19:12:56.329134494 +0300
+--- com.discord-854/smali/com/discord/utilities/analytics/AdjustConfig$AdjustLifecycleListener.smali	2019-03-03 19:18:51.864188839 +0300
+***************
+*** 42,95 ****
+  .end method
+  
+  .method public final onActivityPaused(Landroid/app/Activity;)V
+!     .locals 1
+! 
+!     .line 1050
+!     invoke-static {}, Lcom/adjust/sdk/e;->W()Lcom/adjust/sdk/k;
+! 
+!     move-result-object p1
+! 
+!     const/4 v0, 0x0
+! 
+!     .line 1396
+!     invoke-virtual {p1, v0}, Lcom/adjust/sdk/k;->e(Ljava/lang/String;)Z
+! 
+!     move-result v0
+! 
+!     if-eqz v0, :cond_0
+! 
+!     .line 1094
+!     iget-object p1, p1, Lcom/adjust/sdk/k;->dz:Lcom/adjust/sdk/v;
+! 
+!     invoke-interface {p1}, Lcom/adjust/sdk/v;->onPause()V
+! 
+!     :cond_0
+      return-void
+  .end method
+  
+  .method public final onActivityResumed(Landroid/app/Activity;)V
+!     .locals 1
+! 
+!     .line 2045
+!     invoke-static {}, Lcom/adjust/sdk/e;->W()Lcom/adjust/sdk/k;
+! 
+!     move-result-object p1
+! 
+!     const/4 v0, 0x0
+! 
+!     .line 2396
+!     invoke-virtual {p1, v0}, Lcom/adjust/sdk/k;->e(Ljava/lang/String;)Z
+! 
+!     move-result v0
+! 
+!     if-eqz v0, :cond_0
+! 
+!     .line 2083
+!     iget-object p1, p1, Lcom/adjust/sdk/k;->dz:Lcom/adjust/sdk/v;
+! 
+!     invoke-interface {p1}, Lcom/adjust/sdk/v;->onResume()V
+! 
+!     :cond_0
+      return-void
+  .end method
+  
+--- 42,53 ----
+  .end method
+  
+  .method public final onActivityPaused(Landroid/app/Activity;)V
+!     .locals 0
+      return-void
+  .end method
+  
+  .method public final onActivityResumed(Landroid/app/Activity;)V
+!     .locals 0
+      return-void
+  .end method
+  
+diff -crB -x dist -x build com.discord-854-base/smali/com/discord/utilities/analytics/AdjustConfig.smali com.discord-854/smali/com/discord/utilities/analytics/AdjustConfig.smali
+*** com.discord-854-base/smali/com/discord/utilities/analytics/AdjustConfig.smali	2019-03-03 19:12:56.332467843 +0300
+--- com.discord-854/smali/com/discord/utilities/analytics/AdjustConfig.smali	2019-03-03 19:18:51.864188839 +0300
+***************
+*** 12,18 ****
+  
+  
+  # static fields
+! .field private static final ADJUST_APP_TOKEN:Ljava/lang/String; = "d8fcx8xdmrr4"
+  
+  .field private static final ADJUST_ENVIRONMENT:Ljava/lang/String;
+  
+--- 12,18 ----
+  
+  
+  # static fields
+! .field private static final ADJUST_APP_TOKEN:Ljava/lang/String; = "aaaaaaaaaaaa"
+  
+  .field private static final ADJUST_ENVIRONMENT:Ljava/lang/String;
+  
+***************
+*** 50,168 ****
+  
+  # virtual methods
+  .method public final init(Landroid/app/Application;Z)V
+!     .locals 3
+! 
+!     const-string v0, "application"
+! 
+!     invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+! 
+!     if-eqz p2, :cond_0
+! 
+!     return-void
+! 
+!     .line 26
+!     :cond_0
+!     new-instance p2, Lcom/adjust/sdk/f;
+! 
+!     move-object v0, p1
+! 
+!     check-cast v0, Landroid/content/Context;
+! 
+!     const-string v1, "d8fcx8xdmrr4"
+! 
+!     sget-object v2, Lcom/discord/utilities/analytics/AdjustConfig;->ADJUST_ENVIRONMENT:Ljava/lang/String;
+! 
+!     invoke-direct {p2, v0, v1, v2}, Lcom/adjust/sdk/f;-><init>(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;)V
+! 
+!     .line 27
+!     sget-object v1, Lcom/discord/utilities/analytics/AdjustConfig$init$1;->INSTANCE:Lcom/discord/utilities/analytics/AdjustConfig$init$1;
+! 
+!     check-cast v1, Lcom/adjust/sdk/af;
+! 
+!     .line 1098
+!     iput-object v1, p2, Lcom/adjust/sdk/f;->db:Lcom/adjust/sdk/af;
+! 
+!     .line 2035
+!     invoke-static {}, Lcom/adjust/sdk/e;->W()Lcom/adjust/sdk/k;
+! 
+!     move-result-object v1
+! 
+!     .line 2047
+!     iget-object v2, v1, Lcom/adjust/sdk/k;->dz:Lcom/adjust/sdk/v;
+! 
+!     if-eqz v2, :cond_1
+! 
+!     .line 2048
+!     invoke-static {}, Lcom/adjust/sdk/j;->X()Lcom/adjust/sdk/x;
+! 
+!     move-result-object p2
+! 
+!     const-string v1, "Adjust already initialized"
+! 
+!     const/4 v2, 0x0
+! 
+!     new-array v2, v2, [Ljava/lang/Object;
+! 
+!     invoke-interface {p2, v1, v2}, Lcom/adjust/sdk/x;->f(Ljava/lang/String;[Ljava/lang/Object;)V
+! 
+!     goto :goto_0
+! 
+!     .line 2052
+!     :cond_1
+!     iget-object v2, v1, Lcom/adjust/sdk/k;->dl:Ljava/util/List;
+! 
+!     iput-object v2, p2, Lcom/adjust/sdk/f;->dl:Ljava/util/List;
+! 
+!     .line 2053
+!     iget-object v2, v1, Lcom/adjust/sdk/k;->pushToken:Ljava/lang/String;
+! 
+!     iput-object v2, p2, Lcom/adjust/sdk/f;->pushToken:Ljava/lang/String;
+! 
+!     .line 2054
+!     iget-object v2, v1, Lcom/adjust/sdk/k;->dn:Ljava/lang/Boolean;
+! 
+!     iput-object v2, p2, Lcom/adjust/sdk/f;->dn:Ljava/lang/Boolean;
+! 
+!     .line 2055
+!     iget-boolean v2, v1, Lcom/adjust/sdk/k;->do:Z
+! 
+!     iput-boolean v2, p2, Lcom/adjust/sdk/f;->do:Z
+! 
+!     .line 2057
+!     invoke-static {p2}, Lcom/adjust/sdk/j;->b(Lcom/adjust/sdk/f;)Lcom/adjust/sdk/v;
+! 
+!     move-result-object v2
+! 
+!     iput-object v2, v1, Lcom/adjust/sdk/k;->dz:Lcom/adjust/sdk/v;
+! 
+!     .line 2059
+!     iget-object p2, p2, Lcom/adjust/sdk/f;->context:Landroid/content/Context;
+! 
+!     .line 2472
+!     new-instance v2, Lcom/adjust/sdk/k$2;
+! 
+!     invoke-direct {v2, v1, p2}, Lcom/adjust/sdk/k$2;-><init>(Lcom/adjust/sdk/k;Landroid/content/Context;)V
+! 
+!     .line 2480
+!     invoke-static {v2}, Lcom/adjust/sdk/az;->a(Ljava/lang/Runnable;)V
+! 
+!     .line 35
+!     :goto_0
+!     sget-object p2, Lcom/discord/utilities/analytics/AdjustConfig$init$2;->INSTANCE:Lcom/discord/utilities/analytics/AdjustConfig$init$2;
+! 
+!     check-cast p2, Lcom/adjust/sdk/ah;
+! 
+!     .line 3125
+!     invoke-static {v0, p2}, Lcom/adjust/sdk/az;->a(Landroid/content/Context;Lcom/adjust/sdk/ah;)V
+! 
+!     .line 41
+!     new-instance p2, Lcom/discord/utilities/analytics/AdjustConfig$AdjustLifecycleListener;
+! 
+!     invoke-direct {p2}, Lcom/discord/utilities/analytics/AdjustConfig$AdjustLifecycleListener;-><init>()V
+! 
+!     check-cast p2, Landroid/app/Application$ActivityLifecycleCallbacks;
+! 
+!     invoke-virtual {p1, p2}, Landroid/app/Application;->registerActivityLifecycleCallbacks(Landroid/app/Application$ActivityLifecycleCallbacks;)V
+! 
+      return-void
+  .end method
+--- 50,55 ----
+  
+  # virtual methods
+  .method public final init(Landroid/app/Application;Z)V
+!     .locals 0
+      return-void
+  .end method
+diff -crB -x dist -x build com.discord-854-base/smali/com/discord/utilities/analytics/AnalyticsTracker$AdjustEventTracker.smali com.discord-854/smali/com/discord/utilities/analytics/AnalyticsTracker$AdjustEventTracker.smali
+*** com.discord-854-base/smali/com/discord/utilities/analytics/AnalyticsTracker$AdjustEventTracker.smali	2019-03-03 19:12:56.332467843 +0300
+--- com.discord-854/smali/com/discord/utilities/analytics/AnalyticsTracker$AdjustEventTracker.smali	2019-03-03 19:18:51.867522188 +0300
+***************
+*** 15,23 ****
+  
+  
+  # static fields
+! .field private static final EVENT_TOKEN_LOGIN:Ljava/lang/String; = "ctt5aq"
+  
+! .field private static final EVENT_TOKEN_REGISTER:Ljava/lang/String; = "ebn8ke"
+  
+  .field public static final INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker$AdjustEventTracker;
+  
+--- 15,23 ----
+  
+  
+  # static fields
+! .field private static final EVENT_TOKEN_LOGIN:Ljava/lang/String; = "aaaaaa"
+  
+! .field private static final EVENT_TOKEN_REGISTER:Ljava/lang/String; = "aaaaaa"
+  
+  .field public static final INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker$AdjustEventTracker;
+  
+***************
+*** 50,78 ****
+  .method public final trackLogin()V
+      .locals 2
+  
+-     .line 901
+-     new-instance v0, Lcom/adjust/sdk/g;
+- 
+-     const-string v1, "ctt5aq"
+- 
+-     invoke-direct {v0, v1}, Lcom/adjust/sdk/g;-><init>(Ljava/lang/String;)V
+- 
+-     invoke-static {v0}, Lcom/adjust/sdk/e;->a(Lcom/adjust/sdk/g;)V
+- 
+      return-void
+  .end method
+  
+  .method public final trackRegister()V
+      .locals 2
+  
+-     .line 899
+-     new-instance v0, Lcom/adjust/sdk/g;
+- 
+-     const-string v1, "ebn8ke"
+- 
+-     invoke-direct {v0, v1}, Lcom/adjust/sdk/g;-><init>(Ljava/lang/String;)V
+- 
+-     invoke-static {v0}, Lcom/adjust/sdk/e;->a(Lcom/adjust/sdk/g;)V
+- 
+      return-void
+  .end method
+--- 50,60 ----
+diff -crB -x dist -x build com.discord-854-base/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali com.discord-854/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali
+*** com.discord-854-base/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali	2019-03-03 19:12:56.332467843 +0300
+--- com.discord-854/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali	2019-03-03 19:18:51.867522188 +0300
+***************
+*** 175,181 ****
+  .method private final setBaselineProperties()V
+      .locals 4
+  
+!     const/16 v0, 0x8
+  
+      .line 63
+      new-array v0, v0, [Lkotlin/Pair;
+--- 175,181 ----
+  .method private final setBaselineProperties()V
+      .locals 4
+  
+!     const/16 v0, 0x5
+  
+      .line 63
+      new-array v0, v0, [Lkotlin/Pair;
+***************
+*** 236,272 ****
+  
+      aput-object v1, v0, v2
+  
+-     const-string v1, "device"
+- 
+-     .line 68
+-     new-instance v2, Ljava/lang/StringBuilder;
+- 
+-     invoke-direct {v2}, Ljava/lang/StringBuilder;-><init>()V
+- 
+-     sget-object v3, Landroid/os/Build;->MODEL:Ljava/lang/String;
+- 
+-     invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+- 
+-     const-string v3, ", "
+- 
+-     invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+- 
+-     sget-object v3, Landroid/os/Build;->PRODUCT:Ljava/lang/String;
+- 
+-     invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+- 
+-     invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+- 
+-     move-result-object v2
+- 
+-     invoke-static {v1, v2}, Lkotlin/q;->m(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
+- 
+-     move-result-object v1
+- 
+-     const/4 v2, 0x4
+- 
+-     aput-object v1, v0, v2
+- 
+      const-string v1, "os"
+  
+      const-string v2, "Android"
+--- 236,241 ----
+***************
+*** 276,312 ****
+  
+      move-result-object v1
+  
+!     const/4 v2, 0x5
+! 
+!     aput-object v1, v0, v2
+! 
+!     const-string v1, "os_sdk_version"
+! 
+!     .line 70
+!     sget v2, Landroid/os/Build$VERSION;->SDK_INT:I
+! 
+!     invoke-static {v2}, Ljava/lang/String;->valueOf(I)Ljava/lang/String;
+! 
+!     move-result-object v2
+! 
+!     invoke-static {v1, v2}, Lkotlin/q;->m(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
+! 
+!     move-result-object v1
+! 
+!     const/4 v2, 0x6
+! 
+!     aput-object v1, v0, v2
+! 
+!     const-string v1, "os_version"
+! 
+!     .line 71
+!     sget-object v2, Landroid/os/Build$VERSION;->RELEASE:Ljava/lang/String;
+! 
+!     invoke-static {v1, v2}, Lkotlin/q;->m(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
+! 
+!     move-result-object v1
+! 
+!     const/4 v2, 0x7
+  
+      aput-object v1, v0, v2
+  
+--- 245,251 ----
+  
+      move-result-object v1
+  
+!     const/4 v2, 0x4
+  
+      aput-object v1, v0, v2
+  
+***************
+*** 439,861 ****
+  .end method
+  
+  .method public final setAdvertiserId(Ljava/lang/String;)V
+!     .locals 1
+! 
+!     const-string v0, "advertiserId"
+! 
+!     invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+! 
+!     const-string v0, "device_advertiser_id"
+! 
+!     .line 29
+!     invoke-static {v0, p1}, Lkotlin/q;->m(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
+! 
+!     move-result-object p1
+! 
+!     invoke-static {p1}, Lkotlin/a/ab;->a(Lkotlin/Pair;)Ljava/util/Map;
+! 
+!     move-result-object p1
+! 
+!     invoke-direct {p0, p1}, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->updateSuperProperties(Ljava/util/Map;)V
+! 
+      return-void
+  .end method
+  
+  .method public final setCampaignProperties(Landroid/content/Intent;)V
+!     .locals 7
+! 
+!     const-string v0, "intent"
+! 
+!     invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+! 
+!     .line 33
+!     invoke-virtual {p1}, Landroid/content/Intent;->getExtras()Landroid/os/Bundle;
+! 
+!     move-result-object p1
+! 
+!     if-eqz p1, :cond_9
+! 
+!     const-string v0, "referrer"
+! 
+!     invoke-virtual {p1, v0}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
+! 
+!     move-result-object p1
+! 
+!     if-nez p1, :cond_0
+! 
+!     goto/16 :goto_8
+! 
+!     :cond_0
+!     const/4 v0, 0x1
+! 
+!     .line 34
+!     new-array v1, v0, [Lkotlin/Pair;
+! 
+!     const-string v2, "referrer"
+! 
+!     invoke-static {v2, p1}, Lkotlin/q;->m(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
+! 
+!     move-result-object v2
+! 
+!     const/4 v3, 0x0
+! 
+!     aput-object v2, v1, v3
+! 
+!     invoke-static {v1}, Lkotlin/a/ab;->b([Lkotlin/Pair;)Ljava/util/Map;
+! 
+!     move-result-object v1
+! 
+!     .line 36
+!     check-cast p1, Ljava/lang/CharSequence;
+! 
+!     new-array v2, v0, [Ljava/lang/String;
+! 
+!     const-string v4, "&"
+! 
+!     aput-object v4, v2, v3
+! 
+!     .line 2189
+!     invoke-static {p1, v2, v3, v3}, Lkotlin/text/l;->b(Ljava/lang/CharSequence;[Ljava/lang/String;ZI)Ljava/util/List;
+! 
+!     move-result-object p1
+! 
+!     .line 37
+!     check-cast p1, Ljava/lang/Iterable;
+! 
+!     .line 101
+!     new-instance v2, Ljava/util/ArrayList;
+! 
+!     const/16 v4, 0xa
+! 
+!     invoke-static {p1, v4}, Lkotlin/a/l;->a(Ljava/lang/Iterable;I)I
+! 
+!     move-result v4
+! 
+!     invoke-direct {v2, v4}, Ljava/util/ArrayList;-><init>(I)V
+! 
+!     check-cast v2, Ljava/util/Collection;
+! 
+!     .line 102
+!     invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+! 
+!     move-result-object p1
+! 
+!     :goto_0
+!     invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
+! 
+!     move-result v4
+! 
+!     if-eqz v4, :cond_1
+! 
+!     invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+! 
+!     move-result-object v4
+! 
+!     .line 103
+!     check-cast v4, Ljava/lang/String;
+! 
+!     .line 38
+!     check-cast v4, Ljava/lang/CharSequence;
+! 
+!     new-array v5, v0, [Ljava/lang/String;
+! 
+!     const-string v6, "="
+! 
+!     aput-object v6, v5, v3
+! 
+!     .line 3189
+!     invoke-static {v4, v5, v3, v3}, Lkotlin/text/l;->b(Ljava/lang/CharSequence;[Ljava/lang/String;ZI)Ljava/util/List;
+! 
+!     move-result-object v4
+! 
+!     .line 38
+!     invoke-interface {v2, v4}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+! 
+!     goto :goto_0
+! 
+!     .line 104
+!     :cond_1
+!     check-cast v2, Ljava/util/List;
+! 
+!     check-cast v2, Ljava/lang/Iterable;
+! 
+!     .line 105
+!     new-instance p1, Ljava/util/ArrayList;
+! 
+!     invoke-direct {p1}, Ljava/util/ArrayList;-><init>()V
+! 
+!     check-cast p1, Ljava/util/Collection;
+! 
+!     .line 106
+!     invoke-interface {v2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+! 
+!     move-result-object v2
+! 
+!     :cond_2
+!     :goto_1
+!     invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z
+! 
+!     move-result v4
+! 
+!     if-eqz v4, :cond_4
+! 
+!     invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+! 
+!     move-result-object v4
+! 
+!     move-object v5, v4
+! 
+!     check-cast v5, Ljava/util/List;
+! 
+!     .line 39
+!     invoke-interface {v5}, Ljava/util/List;->size()I
+! 
+!     move-result v5
+! 
+!     const/4 v6, 0x2
+! 
+!     if-ne v5, v6, :cond_3
+! 
+!     const/4 v5, 0x1
+! 
+!     goto :goto_2
+! 
+!     :cond_3
+!     const/4 v5, 0x0
+! 
+!     :goto_2
+!     if-eqz v5, :cond_2
+! 
+!     invoke-interface {p1, v4}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+! 
+!     goto :goto_1
+! 
+!     .line 107
+!     :cond_4
+!     check-cast p1, Ljava/util/List;
+! 
+!     check-cast p1, Ljava/lang/Iterable;
+! 
+!     .line 108
+!     new-instance v2, Ljava/util/ArrayList;
+! 
+!     invoke-direct {v2}, Ljava/util/ArrayList;-><init>()V
+! 
+!     check-cast v2, Ljava/util/Collection;
+! 
+!     .line 109
+!     invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+! 
+!     move-result-object p1
+! 
+!     :cond_5
+!     :goto_3
+!     invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
+! 
+!     move-result v4
+! 
+!     if-eqz v4, :cond_7
+! 
+!     invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+! 
+!     move-result-object v4
+! 
+!     move-object v5, v4
+! 
+!     check-cast v5, Ljava/util/List;
+! 
+!     .line 41
+!     invoke-interface {v5, v3}, Ljava/util/List;->get(I)Ljava/lang/Object;
+! 
+!     move-result-object v5
+! 
+!     check-cast v5, Ljava/lang/String;
+! 
+!     .line 42
+!     invoke-virtual {v5}, Ljava/lang/String;->hashCode()I
+! 
+!     move-result v6
+! 
+!     sparse-switch v6, :sswitch_data_0
+! 
+!     goto :goto_5
+! 
+!     :sswitch_0
+!     const-string v6, "utm_source"
+! 
+!     invoke-virtual {v5, v6}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+! 
+!     move-result v5
+! 
+!     if-eqz v5, :cond_6
+! 
+!     goto :goto_4
+! 
+!     :sswitch_1
+!     const-string v6, "location"
+! 
+!     invoke-virtual {v5, v6}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+! 
+!     move-result v5
+! 
+!     if-eqz v5, :cond_6
+! 
+!     goto :goto_4
+! 
+!     :sswitch_2
+!     const-string v6, "utm_medium"
+! 
+!     invoke-virtual {v5, v6}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+! 
+!     move-result v5
+! 
+!     if-eqz v5, :cond_6
+! 
+!     goto :goto_4
+! 
+!     :sswitch_3
+!     const-string v6, "search_engine"
+! 
+!     invoke-virtual {v5, v6}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+! 
+!     move-result v5
+! 
+!     if-eqz v5, :cond_6
+! 
+!     goto :goto_4
+! 
+!     :sswitch_4
+!     const-string v6, "mp_keyword"
+! 
+!     invoke-virtual {v5, v6}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+! 
+!     move-result v5
+! 
+!     if-eqz v5, :cond_6
+! 
+!     goto :goto_4
+! 
+!     :sswitch_5
+!     const-string v6, "utm_term"
+! 
+!     invoke-virtual {v5, v6}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+! 
+!     move-result v5
+! 
+!     if-eqz v5, :cond_6
+! 
+!     goto :goto_4
+! 
+!     :sswitch_6
+!     const-string v6, "utm_campaign"
+! 
+!     invoke-virtual {v5, v6}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+! 
+!     move-result v5
+! 
+!     if-eqz v5, :cond_6
+! 
+!     goto :goto_4
+! 
+!     :sswitch_7
+!     const-string v6, "referring_domain"
+! 
+!     invoke-virtual {v5, v6}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+! 
+!     move-result v5
+! 
+!     if-eqz v5, :cond_6
+! 
+!     goto :goto_4
+! 
+!     :sswitch_8
+!     const-string v6, "utm_content"
+! 
+!     invoke-virtual {v5, v6}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+! 
+!     move-result v5
+! 
+!     if-eqz v5, :cond_6
+! 
+!     :goto_4
+!     const/4 v5, 0x1
+! 
+!     goto :goto_6
+! 
+!     :cond_6
+!     :goto_5
+!     const/4 v5, 0x0
+! 
+!     :goto_6
+!     if-eqz v5, :cond_5
+! 
+!     .line 55
+!     invoke-interface {v2, v4}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+! 
+!     goto :goto_3
+! 
+!     .line 110
+!     :cond_7
+!     check-cast v2, Ljava/util/List;
+! 
+!     check-cast v2, Ljava/lang/Iterable;
+! 
+!     .line 111
+!     invoke-interface {v2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+! 
+!     move-result-object p1
+! 
+!     :goto_7
+!     invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
+! 
+!     move-result v2
+! 
+!     if-eqz v2, :cond_8
+! 
+!     invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+! 
+!     move-result-object v2
+! 
+!     .line 112
+!     check-cast v2, Ljava/util/List;
+! 
+!     .line 57
+!     invoke-interface {v2, v3}, Ljava/util/List;->get(I)Ljava/lang/Object;
+! 
+!     move-result-object v4
+! 
+!     check-cast v4, Ljava/lang/String;
+! 
+!     invoke-interface {v2, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
+! 
+!     move-result-object v2
+! 
+!     check-cast v2, Ljava/lang/String;
+! 
+!     invoke-interface {v1, v4, v2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+! 
+!     goto :goto_7
+! 
+!     .line 59
+!     :cond_8
+!     invoke-direct {p0, v1}, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->updateSuperProperties(Ljava/util/Map;)V
+! 
+      return-void
+- 
+-     :cond_9
+-     :goto_8
+-     return-void
+- 
+-     :sswitch_data_0
+-     .sparse-switch
+-         -0x5bc8ed18 -> :sswitch_8
+-         -0x40f32acd -> :sswitch_7
+-         -0x3db0f7f -> :sswitch_6
+-         0x31ad945d -> :sswitch_5
+-         0x3d3a7f4d -> :sswitch_4
+-         0x3f4764b9 -> :sswitch_3
+-         0x70a1a726 -> :sswitch_2
+-         0x714f9fb5 -> :sswitch_1
+-         0x7b737fcc -> :sswitch_0
+-     .end sparse-switch
+  .end method
+--- 378,388 ----
+  .end method
+  
+  .method public final setAdvertiserId(Ljava/lang/String;)V
+!     .locals 0
+      return-void
+  .end method
+  
+  .method public final setCampaignProperties(Landroid/content/Intent;)V
+!     .locals 0
+      return-void
+  .end method
+diff -crB -x dist -x build com.discord-854-base/smali/com/discord/utilities/analytics/AnalyticsUtils$Tracker.smali com.discord-854/smali/com/discord/utilities/analytics/AnalyticsUtils$Tracker.smali
+*** com.discord-854-base/smali/com/discord/utilities/analytics/AnalyticsUtils$Tracker.smali	2019-03-03 19:12:56.342467892 +0300
+--- com.discord-854/smali/com/discord/utilities/analytics/AnalyticsUtils$Tracker.smali	2019-03-03 19:18:51.870855538 +0300
+***************
+*** 70,79 ****
+  
+  .method public static final synthetic access$drainEventsQueue(Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;)V
+      .locals 0
+- 
+-     .line 49
+-     invoke-direct {p0}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->drainEventsQueue()V
+- 
+      return-void
+  .end method
+  
+--- 70,75 ----
+***************
+*** 87,184 ****
+  .end method
+  
+  .method private final declared-synchronized drainEventsQueue()V
+!     .locals 5
+! 
+!     monitor-enter p0
+! 
+!     .line 178
+!     :try_start_0
+!     invoke-direct {p0}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->getCanDrain()Z
+! 
+!     move-result v0
+!     :try_end_0
+!     .catchall {:try_start_0 .. :try_end_0} :catchall_0
+! 
+!     if-nez v0, :cond_0
+! 
+!     .line 179
+!     monitor-exit p0
+! 
+!     return-void
+! 
+!     .line 182
+!     :cond_0
+!     :try_start_1
+!     new-instance v0, Ljava/util/ArrayList;
+! 
+!     iget-object v1, p0, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->eventsQueue:Ljava/util/concurrent/ConcurrentLinkedQueue;
+! 
+!     check-cast v1, Ljava/util/Collection;
+! 
+!     invoke-direct {v0, v1}, Ljava/util/ArrayList;-><init>(Ljava/util/Collection;)V
+! 
+!     .line 184
+!     iget-object v1, p0, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->eventsQueue:Ljava/util/concurrent/ConcurrentLinkedQueue;
+! 
+!     invoke-virtual {v1}, Ljava/util/concurrent/ConcurrentLinkedQueue;->clear()V
+! 
+!     .line 186
+!     sget-object v1, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion;
+! 
+!     invoke-virtual {v1}, Lcom/discord/utilities/rest/RestAPI$Companion;->getApi()Lcom/discord/utilities/rest/RestAPI;
+! 
+!     move-result-object v1
+! 
+!     .line 188
+!     new-instance v2, Lcom/discord/restapi/RestAPIParams$Track;
+! 
+!     iget-object v3, p0, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->analyticsToken:Ljava/lang/String;
+! 
+!     move-object v4, v0
+! 
+!     check-cast v4, Ljava/util/List;
+! 
+!     invoke-direct {v2, v3, v4}, Lcom/discord/restapi/RestAPIParams$Track;-><init>(Ljava/lang/String;Ljava/util/List;)V
+! 
+!     invoke-virtual {v1, v2}, Lcom/discord/utilities/rest/RestAPI;->track(Lcom/discord/restapi/RestAPIParams$Track;)Lrx/Observable;
+! 
+!     move-result-object v1
+! 
+!     .line 189
+!     invoke-static {}, Lcom/discord/app/g;->du()Lrx/Observable$Transformer;
+! 
+!     move-result-object v2
+! 
+!     invoke-virtual {v1, v2}, Lrx/Observable;->a(Lrx/Observable$Transformer;)Lrx/Observable;
+! 
+!     move-result-object v1
+! 
+!     .line 190
+!     sget-object v2, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker$drainEventsQueue$1;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker$drainEventsQueue$1;
+! 
+!     check-cast v2, Lrx/functions/Action1;
+! 
+!     new-instance v3, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker$drainEventsQueue$2;
+! 
+!     invoke-direct {v3, p0, v0}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker$drainEventsQueue$2;-><init>(Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;Ljava/util/ArrayList;)V
+! 
+!     check-cast v3, Lrx/functions/Action1;
+! 
+!     invoke-virtual {v1, v2, v3}, Lrx/Observable;->a(Lrx/functions/Action1;Lrx/functions/Action1;)Lrx/Subscription;
+!     :try_end_1
+!     .catchall {:try_start_1 .. :try_end_1} :catchall_0
+! 
+!     .line 193
+!     monitor-exit p0
+! 
+      return-void
+- 
+-     :catchall_0
+-     move-exception v0
+- 
+-     monitor-exit p0
+- 
+-     throw v0
+  .end method
+  
+  .method private final getCanDrain()Z
+--- 83,90 ----
+  .end method
+  
+  .method private final declared-synchronized drainEventsQueue()V
+!     .locals 0
+      return-void
+  .end method
+  
+  .method private final getCanDrain()Z
+***************
+*** 407,466 ****
+  
+  .method public static synthetic setTrackingData$default(Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;Ljava/lang/String;ZILjava/lang/Object;)V
+      .locals 0
+- 
+-     and-int/lit8 p3, p3, 0x2
+- 
+-     if-eqz p3, :cond_0
+- 
+-     const/4 p2, 0x0
+- 
+-     .line 90
+-     :cond_0
+-     invoke-virtual {p0, p1, p2}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->setTrackingData(Ljava/lang/String;Z)V
+- 
+      return-void
+  .end method
+  
+  .method public static synthetic track$default(Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;Ljava/lang/String;Ljava/util/Map;ILjava/lang/Object;)V
+      .locals 0
+- 
+-     and-int/lit8 p3, p3, 0x2
+- 
+-     if-eqz p3, :cond_0
+- 
+-     .line 115
+-     invoke-static {}, Lkotlin/a/ab;->emptyMap()Ljava/util/Map;
+- 
+-     move-result-object p2
+- 
+-     :cond_0
+-     invoke-virtual {p0, p1, p2}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V
+- 
+      return-void
+  .end method
+  
+  .method public static synthetic track$default(Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;Lkotlin/Pair;Ljava/util/Map;Ljava/lang/Long;ILjava/lang/Object;)V
+      .locals 0
+- 
+-     and-int/lit8 p5, p4, 0x2
+- 
+-     if-eqz p5, :cond_0
+- 
+-     .line 106
+-     invoke-static {}, Lkotlin/a/ab;->emptyMap()Ljava/util/Map;
+- 
+-     move-result-object p2
+- 
+-     :cond_0
+-     and-int/lit8 p4, p4, 0x4
+- 
+-     if-eqz p4, :cond_1
+- 
+-     const/4 p3, 0x0
+- 
+-     :cond_1
+-     invoke-virtual {p0, p1, p2, p3}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Lkotlin/Pair;Ljava/util/Map;Ljava/lang/Long;)V
+- 
+      return-void
+  .end method
+  
+--- 313,328 ----
+***************
+*** 604,797 ****
+  
+  .method public final declared-synchronized setTrackingData(Ljava/lang/String;Z)V
+      .locals 0
+- 
+-     monitor-enter p0
+- 
+-     .line 91
+-     :try_start_0
+-     invoke-direct {p0}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->drainEventsQueue()V
+- 
+-     .line 93
+-     iput-object p1, p0, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->analyticsToken:Ljava/lang/String;
+- 
+-     .line 94
+-     iput-boolean p2, p0, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->fingerprinted:Z
+- 
+-     .line 96
+-     invoke-direct {p0}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->drainEventsQueue()V
+-     :try_end_0
+-     .catchall {:try_start_0 .. :try_end_0} :catchall_0
+- 
+-     .line 97
+-     monitor-exit p0
+- 
+      return-void
+- 
+-     :catchall_0
+-     move-exception p1
+- 
+-     monitor-exit p0
+- 
+-     throw p1
+  .end method
+  
+  .method public final track(Ljava/lang/String;Ljava/util/Map;)V
+!     .locals 2
+!     .annotation system Ldalvik/annotation/Signature;
+!         value = {
+!             "(",
+!             "Ljava/lang/String;",
+!             "Ljava/util/Map<",
+!             "Ljava/lang/String;",
+!             "+",
+!             "Ljava/lang/Object;",
+!             ">;)V"
+!         }
+!     .end annotation
+! 
+!     const-string v0, "event"
+! 
+!     invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+! 
+!     const-string v0, "properties"
+! 
+!     invoke-static {p2, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+! 
+!     .line 116
+!     iget-object v0, p0, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->eventsQueue:Ljava/util/concurrent/ConcurrentLinkedQueue;
+! 
+!     new-instance v1, Lcom/discord/restapi/RestAPIParams$Track$Event;
+! 
+!     invoke-direct {v1, p1, p2}, Lcom/discord/restapi/RestAPIParams$Track$Event;-><init>(Ljava/lang/String;Ljava/util/Map;)V
+! 
+!     invoke-virtual {v0, v1}, Ljava/util/concurrent/ConcurrentLinkedQueue;->add(Ljava/lang/Object;)Z
+! 
+!     .line 118
+!     sget-object p1, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
+! 
+!     const-wide/16 v0, 0x5dc
+! 
+!     invoke-static {v0, v1, p1}, Lrx/Observable;->g(JLjava/util/concurrent/TimeUnit;)Lrx/Observable;
+! 
+!     move-result-object p1
+! 
+!     .line 119
+!     new-instance p2, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker$track$1;
+! 
+!     invoke-direct {p2, p0}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker$track$1;-><init>(Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;)V
+! 
+!     check-cast p2, Lrx/functions/Action1;
+! 
+!     invoke-virtual {p1, p2}, Lrx/Observable;->b(Lrx/functions/Action1;)Lrx/Subscription;
+! 
+      return-void
+  .end method
+  
+  .method public final track(Lkotlin/Pair;Ljava/util/Map;Ljava/lang/Long;)V
+!     .locals 7
+!     .annotation system Ldalvik/annotation/Signature;
+!         value = {
+!             "(",
+!             "Lkotlin/Pair<",
+!             "Ljava/lang/String;",
+!             "Ljava/lang/Long;",
+!             ">;",
+!             "Ljava/util/Map<",
+!             "Ljava/lang/String;",
+!             "+",
+!             "Ljava/lang/Object;",
+!             ">;",
+!             "Ljava/lang/Long;",
+!             ")V"
+!         }
+!     .end annotation
+! 
+!     const-string v0, "throttleKey"
+! 
+!     invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+! 
+!     const-string v0, "properties"
+! 
+!     invoke-static {p2, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+! 
+!     const/4 v4, 0x0
+! 
+!     const/4 v5, 0x4
+! 
+!     const/4 v6, 0x0
+! 
+!     move-object v1, p0
+! 
+!     move-object v2, p1
+! 
+!     move-object v3, p3
+! 
+!     .line 107
+!     invoke-static/range {v1 .. v6}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->isEventThrottled$default(Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;Lkotlin/Pair;Ljava/lang/Long;ZILjava/lang/Object;)Z
+! 
+!     move-result p3
+! 
+!     if-eqz p3, :cond_0
+! 
+!     return-void
+! 
+!     .line 1000
+!     :cond_0
+!     iget-object p1, p1, Lkotlin/Pair;->first:Ljava/lang/Object;
+! 
+!     .line 111
+!     check-cast p1, Ljava/lang/String;
+! 
+!     .line 112
+!     invoke-virtual {p0, p1, p2}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V
+! 
+      return-void
+  .end method
+  
+  .method public final trackFireBase(Ljava/lang/String;Ljava/util/Map;)V
+!     .locals 1
+!     .annotation system Ldalvik/annotation/Signature;
+!         value = {
+!             "(",
+!             "Ljava/lang/String;",
+!             "Ljava/util/Map<",
+!             "Ljava/lang/String;",
+!             "+",
+!             "Ljava/lang/Object;",
+!             ">;)V"
+!         }
+!     .end annotation
+! 
+!     const-string v0, "event"
+! 
+!     invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+! 
+!     const-string v0, "properties"
+! 
+!     invoke-static {p2, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+! 
+!     .line 126
+!     new-instance v0, Landroid/os/Bundle;
+! 
+!     invoke-direct {v0}, Landroid/os/Bundle;-><init>()V
+! 
+!     invoke-direct {p0, v0, p2}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->putMap(Landroid/os/Bundle;Ljava/util/Map;)Landroid/os/Bundle;
+! 
+!     move-result-object p2
+! 
+!     .line 127
+!     sget-object v0, Lcom/discord/utilities/analytics/AnalyticsUtils;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsUtils;
+! 
+!     invoke-static {v0}, Lcom/discord/utilities/analytics/AnalyticsUtils;->access$getFireBaseInstance$p(Lcom/discord/utilities/analytics/AnalyticsUtils;)Lcom/google/firebase/analytics/FirebaseAnalytics;
+! 
+!     move-result-object v0
+! 
+!     if-eqz v0, :cond_0
+! 
+!     invoke-virtual {v0, p1, p2}, Lcom/google/firebase/analytics/FirebaseAnalytics;->b(Ljava/lang/String;Landroid/os/Bundle;)V
+! 
+!     return-void
+! 
+!     :cond_0
+      return-void
+  .end method
+--- 466,485 ----
+  
+  .method public final declared-synchronized setTrackingData(Ljava/lang/String;Z)V
+      .locals 0
+      return-void
+  .end method
+  
+  .method public final track(Ljava/lang/String;Ljava/util/Map;)V
+!     .locals 0
+      return-void
+  .end method
+  
+  .method public final track(Lkotlin/Pair;Ljava/util/Map;Ljava/lang/Long;)V
+!     .locals 0
+      return-void
+  .end method
+  
+  .method public final trackFireBase(Ljava/lang/String;Ljava/util/Map;)V
+!     .locals 0
+      return-void
+  .end method
+diff -crB -x dist -x build com.discord-854-base/smali/com/discord/utilities/integrations/SpotifyHelper$openPlayStoreForSpotify$1.smali com.discord-854/smali/com/discord/utilities/integrations/SpotifyHelper$openPlayStoreForSpotify$1.smali
+*** com.discord-854-base/smali/com/discord/utilities/integrations/SpotifyHelper$openPlayStoreForSpotify$1.smali	2019-03-03 19:12:56.422468279 +0300
+--- com.discord-854/smali/com/discord/utilities/integrations/SpotifyHelper$openPlayStoreForSpotify$1.smali	2019-03-03 19:18:51.880855586 +0300
+***************
+*** 43,49 ****
+  
+      new-instance v1, Ljava/lang/StringBuilder;
+  
+!     const-string v2, "https://app.adjust.com/ndjczk?campaign="
+  
+      invoke-direct {v1, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+  
+--- 43,49 ----
+  
+      new-instance v1, Ljava/lang/StringBuilder;
+  
+!     const-string v2, "https://play.google.com/store/apps/details?id=com.spotify.music&trash="
+  
+      invoke-direct {v1, v2}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+  
+diff -crB -x dist -x build com.discord-854-base/smali/com/discord/utilities/receiver/CampaignReceiver.smali com.discord-854/smali/com/discord/utilities/receiver/CampaignReceiver.smali
+*** com.discord-854-base/smali/com/discord/utilities/receiver/CampaignReceiver.smali	2019-03-03 19:12:56.525802113 +0300
+--- com.discord-854/smali/com/discord/utilities/receiver/CampaignReceiver.smali	2019-03-03 19:18:51.890855634 +0300
+***************
+*** 16,49 ****
+  
+  # virtual methods
+  .method public final onReceive(Landroid/content/Context;Landroid/content/Intent;)V
+!     .locals 1
+! 
+!     const-string v0, "context"
+! 
+!     invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+! 
+!     const-string v0, "intent"
+! 
+!     invoke-static {p2, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+! 
+!     .line 23
+!     new-instance v0, Lcom/adjust/sdk/l;
+! 
+!     invoke-direct {v0}, Lcom/adjust/sdk/l;-><init>()V
+! 
+!     invoke-virtual {v0, p1, p2}, Lcom/adjust/sdk/l;->onReceive(Landroid/content/Context;Landroid/content/Intent;)V
+! 
+!     .line 24
+!     new-instance v0, Lcom/google/android/gms/analytics/a;
+! 
+!     invoke-direct {v0}, Lcom/google/android/gms/analytics/a;-><init>()V
+! 
+!     invoke-virtual {v0, p1, p2}, Lcom/google/android/gms/analytics/a;->onReceive(Landroid/content/Context;Landroid/content/Intent;)V
+! 
+!     .line 26
+!     sget-object p1, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticSuperProperties;
+! 
+!     invoke-virtual {p1, p2}, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->setCampaignProperties(Landroid/content/Intent;)V
+! 
+      return-void
+  .end method
+--- 16,21 ----
+  
+  # virtual methods
+  .method public final onReceive(Landroid/content/Context;Landroid/content/Intent;)V
+!     .locals 0
+      return-void
+  .end method
+diff -crB -x dist -x build com.discord-854-base/smali_classes2/io/fabric/sdk/android/a/b/a.smali com.discord-854/smali_classes2/io/fabric/sdk/android/a/b/a.smali
+*** com.discord-854-base/smali_classes2/io/fabric/sdk/android/a/b/a.smali	2019-03-03 19:12:53.275786380 +0300
+--- com.discord-854/smali_classes2/io/fabric/sdk/android/a/b/a.smali	2019-03-03 19:18:51.900855683 +0300
+***************
+*** 174,180 ****
+  
+      const-string v0, "X-CRASHLYTICS-DEVELOPER-TOKEN"
+  
+!     const-string v1, "470fa2b4ae81cd56ecbcda9735803434cec591fa"
+  
+      .line 142
+      invoke-virtual {p1, v0, v1}, Lio/fabric/sdk/android/a/e/d;->W(Ljava/lang/String;Ljava/lang/String;)Lio/fabric/sdk/android/a/e/d;
+--- 174,180 ----
+  
+      const-string v0, "X-CRASHLYTICS-DEVELOPER-TOKEN"
+  
+!     const-string v1, "blamelunapoopoopeepeepoopoopeepblameluna"
+  
+      .line 142
+      invoke-virtual {p1, v0, v1}, Lio/fabric/sdk/android/a/e/d;->W(Ljava/lang/String;Ljava/lang/String;)Lio/fabric/sdk/android/a/e/d;
+diff -crB -x dist -x build com.discord-854-base/smali_classes2/io/fabric/sdk/android/a/g/a.smali com.discord-854/smali_classes2/io/fabric/sdk/android/a/g/a.smali
+*** com.discord-854-base/smali_classes2/io/fabric/sdk/android/a/g/a.smali	2019-03-03 19:12:53.335786671 +0300
+--- com.discord-854/smali_classes2/io/fabric/sdk/android/a/g/a.smali	2019-03-03 19:18:51.907522382 +0300
+***************
+*** 345,581 ****
+  
+  # virtual methods
+  .method public a(Lio/fabric/sdk/android/a/g/d;)Z
+!     .locals 5
+! 
+!     .line 74
+!     invoke-virtual {p0}, Lio/fabric/sdk/android/a/g/a;->wN()Lio/fabric/sdk/android/a/e/d;
+! 
+!     move-result-object v0
+! 
+!     const-string v1, "X-CRASHLYTICS-API-KEY"
+! 
+!     .line 3098
+!     iget-object v2, p1, Lio/fabric/sdk/android/a/g/d;->oC:Ljava/lang/String;
+! 
+!     invoke-virtual {v0, v1, v2}, Lio/fabric/sdk/android/a/e/d;->W(Ljava/lang/String;Ljava/lang/String;)Lio/fabric/sdk/android/a/e/d;
+! 
+!     move-result-object v0
+! 
+!     const-string v1, "X-CRASHLYTICS-API-CLIENT-TYPE"
+! 
+!     const-string v2, "android"
+! 
+!     .line 3099
+!     invoke-virtual {v0, v1, v2}, Lio/fabric/sdk/android/a/e/d;->W(Ljava/lang/String;Ljava/lang/String;)Lio/fabric/sdk/android/a/e/d;
+! 
+!     move-result-object v0
+! 
+!     const-string v1, "X-CRASHLYTICS-API-CLIENT-VERSION"
+! 
+!     iget-object v2, p0, Lio/fabric/sdk/android/a/g/a;->nC:Lio/fabric/sdk/android/i;
+! 
+!     .line 3102
+!     invoke-virtual {v2}, Lio/fabric/sdk/android/i;->getVersion()Ljava/lang/String;
+! 
+!     move-result-object v2
+! 
+!     .line 3101
+!     invoke-virtual {v0, v1, v2}, Lio/fabric/sdk/android/a/e/d;->W(Ljava/lang/String;Ljava/lang/String;)Lio/fabric/sdk/android/a/e/d;
+! 
+!     move-result-object v0
+! 
+!     .line 76
+!     invoke-direct {p0, v0, p1}, Lio/fabric/sdk/android/a/g/a;->a(Lio/fabric/sdk/android/a/e/d;Lio/fabric/sdk/android/a/g/d;)Lio/fabric/sdk/android/a/e/d;
+! 
+!     move-result-object v0
+! 
+!     .line 78
+!     invoke-static {}, Lio/fabric/sdk/android/c;->wA()Lio/fabric/sdk/android/l;
+! 
+!     move-result-object v1
+! 
+!     const-string v2, "Fabric"
+! 
+!     new-instance v3, Ljava/lang/StringBuilder;
+! 
+!     const-string v4, "Sending app info to "
+! 
+!     invoke-direct {v3, v4}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+! 
+!     .line 4100
+!     iget-object v4, p0, Lio/fabric/sdk/android/a/b/a;->url:Ljava/lang/String;
+! 
+!     .line 78
+!     invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+! 
+!     invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+! 
+!     move-result-object v3
+! 
+!     invoke-interface {v1, v2, v3}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
+! 
+!     .line 79
+!     iget-object v1, p1, Lio/fabric/sdk/android/a/g/d;->bbE:Lio/fabric/sdk/android/a/g/n;
+! 
+!     if-eqz v1, :cond_0
+! 
+!     .line 80
+!     invoke-static {}, Lio/fabric/sdk/android/c;->wA()Lio/fabric/sdk/android/l;
+! 
+!     move-result-object v1
+! 
+!     const-string v2, "Fabric"
+! 
+!     new-instance v3, Ljava/lang/StringBuilder;
+! 
+!     const-string v4, "App icon hash is "
+! 
+!     invoke-direct {v3, v4}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+! 
+!     iget-object v4, p1, Lio/fabric/sdk/android/a/g/d;->bbE:Lio/fabric/sdk/android/a/g/n;
+! 
+!     iget-object v4, v4, Lio/fabric/sdk/android/a/g/n;->Xu:Ljava/lang/String;
+! 
+!     invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+! 
+!     invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+! 
+!     move-result-object v3
+! 
+!     invoke-interface {v1, v2, v3}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
+! 
+!     .line 82
+!     invoke-static {}, Lio/fabric/sdk/android/c;->wA()Lio/fabric/sdk/android/l;
+! 
+!     move-result-object v1
+! 
+!     const-string v2, "Fabric"
+! 
+!     new-instance v3, Ljava/lang/StringBuilder;
+! 
+!     const-string v4, "App icon size is "
+! 
+!     invoke-direct {v3, v4}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+! 
+!     iget-object v4, p1, Lio/fabric/sdk/android/a/g/d;->bbE:Lio/fabric/sdk/android/a/g/n;
+! 
+!     iget v4, v4, Lio/fabric/sdk/android/a/g/n;->width:I
+! 
+!     invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+! 
+!     const-string v4, "x"
+! 
+!     invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+! 
+!     iget-object p1, p1, Lio/fabric/sdk/android/a/g/d;->bbE:Lio/fabric/sdk/android/a/g/n;
+! 
+!     iget p1, p1, Lio/fabric/sdk/android/a/g/n;->height:I
+! 
+!     invoke-virtual {v3, p1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+! 
+!     invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+! 
+!     move-result-object p1
+! 
+!     invoke-interface {v1, v2, p1}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
+! 
+!     .line 86
+!     :cond_0
+!     invoke-virtual {v0}, Lio/fabric/sdk/android/a/e/d;->xA()I
+! 
+!     move-result p1
+! 
+!     const-string v1, "POST"
+! 
+!     .line 4929
+!     invoke-virtual {v0}, Lio/fabric/sdk/android/a/e/d;->xz()Ljava/net/HttpURLConnection;
+! 
+!     move-result-object v2
+! 
+!     invoke-virtual {v2}, Ljava/net/HttpURLConnection;->getRequestMethod()Ljava/lang/String;
+! 
+!     move-result-object v2
+! 
+!     .line 87
+!     invoke-virtual {v1, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+! 
+!     move-result v1
+! 
+!     if-eqz v1, :cond_1
+! 
+!     const-string v1, "Create"
+! 
+!     goto :goto_0
+! 
+!     :cond_1
+!     const-string v1, "Update"
+! 
+!     .line 90
+!     :goto_0
+!     invoke-static {}, Lio/fabric/sdk/android/c;->wA()Lio/fabric/sdk/android/l;
+! 
+!     move-result-object v2
+! 
+!     const-string v3, "Fabric"
+! 
+!     new-instance v4, Ljava/lang/StringBuilder;
+! 
+!     invoke-direct {v4}, Ljava/lang/StringBuilder;-><init>()V
+! 
+!     invoke-virtual {v4, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+! 
+!     const-string v1, " app request ID: "
+! 
+!     invoke-virtual {v4, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+! 
+!     const-string v1, "X-REQUEST-ID"
+! 
+!     .line 91
+!     invoke-virtual {v0, v1}, Lio/fabric/sdk/android/a/e/d;->dl(Ljava/lang/String;)Ljava/lang/String;
+! 
+!     move-result-object v0
+! 
+!     invoke-virtual {v4, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+! 
+!     invoke-virtual {v4}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+! 
+!     move-result-object v0
+! 
+!     .line 90
+!     invoke-interface {v2, v3, v0}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
+! 
+!     .line 92
+!     invoke-static {}, Lio/fabric/sdk/android/c;->wA()Lio/fabric/sdk/android/l;
+! 
+!     move-result-object v0
+! 
+!     const-string v1, "Fabric"
+! 
+!     const-string v2, "Result was "
+! 
+!     invoke-static {p1}, Ljava/lang/String;->valueOf(I)Ljava/lang/String;
+! 
+!     move-result-object v3
+! 
+!     invoke-virtual {v2, v3}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
+! 
+!     move-result-object v2
+! 
+!     invoke-interface {v0, v1, v2}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
+! 
+!     .line 94
+!     invoke-static {p1}, Lio/fabric/sdk/android/a/b/u;->cH(I)I
+! 
+!     move-result p1
+! 
+!     if-nez p1, :cond_2
+! 
+!     const/4 p1, 0x1
+! 
+!     return p1
+! 
+!     :cond_2
+!     const/4 p1, 0x0
+! 
+!     return p1
+  .end method
+--- 345,350 ----
+  
+  # virtual methods
+  .method public a(Lio/fabric/sdk/android/a/g/d;)Z
+!     .locals 0
+!     return-void
+  .end method
+diff -crB -x dist -x build com.discord-854-base/smali_classes2/io/fabric/sdk/android/a/g/l.smali com.discord-854/smali_classes2/io/fabric/sdk/android/a/g/l.smali
+*** com.discord-854-base/smali_classes2/io/fabric/sdk/android/a/g/l.smali	2019-03-03 19:12:53.342453370 +0300
+--- com.discord-854/smali_classes2/io/fabric/sdk/android/a/g/l.smali	2019-03-03 19:18:51.914189081 +0300
+***************
+*** 117,520 ****
+  
+  # virtual methods
+  .method public final a(Lio/fabric/sdk/android/a/g/w;)Lorg/json/JSONObject;
+!     .locals 6
+! 
+!     const/4 v0, 0x0
+! 
+!     .line 1140
+!     :try_start_0
+!     new-instance v1, Ljava/util/HashMap;
+! 
+!     invoke-direct {v1}, Ljava/util/HashMap;-><init>()V
+! 
+!     const-string v2, "build_version"
+! 
+!     .line 1141
+!     iget-object v3, p1, Lio/fabric/sdk/android/a/g/w;->bbz:Ljava/lang/String;
+! 
+!     invoke-interface {v1, v2, v3}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+! 
+!     const-string v2, "display_version"
+! 
+!     .line 1142
+!     iget-object v3, p1, Lio/fabric/sdk/android/a/g/w;->bby:Ljava/lang/String;
+! 
+!     invoke-interface {v1, v2, v3}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+! 
+!     const-string v2, "source"
+! 
+!     .line 1143
+!     iget v3, p1, Lio/fabric/sdk/android/a/g/w;->bbB:I
+! 
+!     invoke-static {v3}, Ljava/lang/Integer;->toString(I)Ljava/lang/String;
+! 
+!     move-result-object v3
+! 
+!     invoke-interface {v1, v2, v3}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+! 
+!     .line 1145
+!     iget-object v2, p1, Lio/fabric/sdk/android/a/g/w;->bcB:Ljava/lang/String;
+! 
+!     if-eqz v2, :cond_0
+! 
+!     const-string v2, "icon_hash"
+! 
+!     .line 1146
+!     iget-object v3, p1, Lio/fabric/sdk/android/a/g/w;->bcB:Ljava/lang/String;
+! 
+!     invoke-interface {v1, v2, v3}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+! 
+!     .line 1149
+!     :cond_0
+!     iget-object v2, p1, Lio/fabric/sdk/android/a/g/w;->bcA:Ljava/lang/String;
+! 
+!     .line 1150
+!     invoke-static {v2}, Lio/fabric/sdk/android/a/b/i;->Q(Ljava/lang/String;)Z
+! 
+!     move-result v3
+! 
+!     if-nez v3, :cond_1
+! 
+!     const-string v3, "instance"
+! 
+!     .line 1151
+!     invoke-interface {v1, v3, v2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+! 
+!     .line 82
+!     :cond_1
+!     invoke-virtual {p0, v1}, Lio/fabric/sdk/android/a/g/l;->p(Ljava/util/Map;)Lio/fabric/sdk/android/a/e/d;
+! 
+!     move-result-object v2
+!     :try_end_0
+!     .catch Lio/fabric/sdk/android/a/e/d$c; {:try_start_0 .. :try_end_0} :catch_1
+!     .catchall {:try_start_0 .. :try_end_0} :catchall_0
+! 
+!     :try_start_1
+!     const-string v3, "X-CRASHLYTICS-API-KEY"
+! 
+!     .line 1160
+!     iget-object v4, p1, Lio/fabric/sdk/android/a/g/w;->oC:Ljava/lang/String;
+! 
+!     invoke-static {v2, v3, v4}, Lio/fabric/sdk/android/a/g/l;->a(Lio/fabric/sdk/android/a/e/d;Ljava/lang/String;Ljava/lang/String;)V
+! 
+!     const-string v3, "X-CRASHLYTICS-API-CLIENT-TYPE"
+! 
+!     const-string v4, "android"
+! 
+!     .line 1161
+!     invoke-static {v2, v3, v4}, Lio/fabric/sdk/android/a/g/l;->a(Lio/fabric/sdk/android/a/e/d;Ljava/lang/String;Ljava/lang/String;)V
+! 
+!     const-string v3, "X-CRASHLYTICS-API-CLIENT-VERSION"
+! 
+!     .line 1163
+!     iget-object v4, p0, Lio/fabric/sdk/android/a/g/l;->nC:Lio/fabric/sdk/android/i;
+! 
+!     invoke-virtual {v4}, Lio/fabric/sdk/android/i;->getVersion()Ljava/lang/String;
+! 
+!     move-result-object v4
+! 
+!     invoke-static {v2, v3, v4}, Lio/fabric/sdk/android/a/g/l;->a(Lio/fabric/sdk/android/a/e/d;Ljava/lang/String;Ljava/lang/String;)V
+! 
+!     const-string v3, "Accept"
+! 
+!     const-string v4, "application/json"
+! 
+!     .line 1164
+!     invoke-static {v2, v3, v4}, Lio/fabric/sdk/android/a/g/l;->a(Lio/fabric/sdk/android/a/e/d;Ljava/lang/String;Ljava/lang/String;)V
+! 
+!     const-string v3, "X-CRASHLYTICS-DEVICE-MODEL"
+! 
+!     .line 1166
+!     iget-object v4, p1, Lio/fabric/sdk/android/a/g/w;->pe:Ljava/lang/String;
+! 
+!     invoke-static {v2, v3, v4}, Lio/fabric/sdk/android/a/g/l;->a(Lio/fabric/sdk/android/a/e/d;Ljava/lang/String;Ljava/lang/String;)V
+! 
+!     const-string v3, "X-CRASHLYTICS-OS-BUILD-VERSION"
+! 
+!     .line 1167
+!     iget-object v4, p1, Lio/fabric/sdk/android/a/g/w;->bcy:Ljava/lang/String;
+! 
+!     invoke-static {v2, v3, v4}, Lio/fabric/sdk/android/a/g/l;->a(Lio/fabric/sdk/android/a/e/d;Ljava/lang/String;Ljava/lang/String;)V
+! 
+!     const-string v3, "X-CRASHLYTICS-OS-DISPLAY-VERSION"
+! 
+!     .line 1168
+!     iget-object v4, p1, Lio/fabric/sdk/android/a/g/w;->bcz:Ljava/lang/String;
+! 
+!     invoke-static {v2, v3, v4}, Lio/fabric/sdk/android/a/g/l;->a(Lio/fabric/sdk/android/a/e/d;Ljava/lang/String;Ljava/lang/String;)V
+! 
+!     const-string v3, "X-CRASHLYTICS-INSTALLATION-ID"
+! 
+!     .line 1169
+!     iget-object p1, p1, Lio/fabric/sdk/android/a/g/w;->pa:Ljava/lang/String;
+! 
+!     invoke-static {v2, v3, p1}, Lio/fabric/sdk/android/a/g/l;->a(Lio/fabric/sdk/android/a/e/d;Ljava/lang/String;Ljava/lang/String;)V
+! 
+!     .line 85
+!     invoke-static {}, Lio/fabric/sdk/android/c;->wA()Lio/fabric/sdk/android/l;
+! 
+!     move-result-object p1
+! 
+!     const-string v3, "Fabric"
+! 
+!     new-instance v4, Ljava/lang/StringBuilder;
+! 
+!     const-string v5, "Requesting settings from "
+! 
+!     invoke-direct {v4, v5}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+! 
+!     .line 2100
+!     iget-object v5, p0, Lio/fabric/sdk/android/a/b/a;->url:Ljava/lang/String;
+! 
+!     .line 85
+!     invoke-virtual {v4, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+! 
+!     invoke-virtual {v4}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+! 
+!     move-result-object v4
+! 
+!     invoke-interface {p1, v3, v4}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
+! 
+!     .line 86
+!     invoke-static {}, Lio/fabric/sdk/android/c;->wA()Lio/fabric/sdk/android/l;
+! 
+!     move-result-object p1
+! 
+!     const-string v3, "Fabric"
+! 
+!     const-string v4, "Settings query params were: "
+! 
+!     invoke-static {v1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
+! 
+!     move-result-object v1
+! 
+!     invoke-virtual {v4, v1}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
+! 
+!     move-result-object v1
+! 
+!     invoke-interface {p1, v3, v1}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
+! 
+!     .line 2104
+!     invoke-virtual {v2}, Lio/fabric/sdk/android/a/e/d;->xA()I
+! 
+!     move-result p1
+! 
+!     .line 2105
+!     invoke-static {}, Lio/fabric/sdk/android/c;->wA()Lio/fabric/sdk/android/l;
+! 
+!     move-result-object v1
+! 
+!     const-string v3, "Fabric"
+! 
+!     const-string v4, "Settings result was: "
+! 
+!     invoke-static {p1}, Ljava/lang/String;->valueOf(I)Ljava/lang/String;
+! 
+!     move-result-object v5
+! 
+!     invoke-virtual {v4, v5}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
+! 
+!     move-result-object v4
+! 
+!     invoke-interface {v1, v3, v4}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
+! 
+!     const/16 v1, 0xc8
+! 
+!     if-eq p1, v1, :cond_3
+! 
+!     const/16 v1, 0xc9
+! 
+!     if-eq p1, v1, :cond_3
+! 
+!     const/16 v1, 0xca
+! 
+!     if-eq p1, v1, :cond_3
+! 
+!     const/16 v1, 0xcb
+! 
+!     if-ne p1, v1, :cond_2
+! 
+!     goto :goto_0
+! 
+!     :cond_2
+!     const/4 p1, 0x0
+! 
+!     goto :goto_1
+! 
+!     :cond_3
+!     :goto_0
+!     const/4 p1, 0x1
+! 
+!     :goto_1
+!     if-eqz p1, :cond_4
+! 
+!     .line 2109
+!     invoke-virtual {v2}, Lio/fabric/sdk/android/a/e/d;->xB()Ljava/lang/String;
+! 
+!     move-result-object p1
+! 
+!     invoke-direct {p0, p1}, Lio/fabric/sdk/android/a/g/l;->dp(Ljava/lang/String;)Lorg/json/JSONObject;
+! 
+!     move-result-object p1
+! 
+!     move-object v0, p1
+! 
+!     goto :goto_2
+! 
+!     .line 2111
+!     :cond_4
+!     invoke-static {}, Lio/fabric/sdk/android/c;->wA()Lio/fabric/sdk/android/l;
+! 
+!     move-result-object p1
+! 
+!     const-string v1, "Fabric"
+! 
+!     new-instance v3, Ljava/lang/StringBuilder;
+! 
+!     const-string v4, "Failed to retrieve settings from "
+! 
+!     invoke-direct {v3, v4}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+! 
+!     .line 3100
+!     iget-object v4, p0, Lio/fabric/sdk/android/a/b/a;->url:Ljava/lang/String;
+! 
+!     .line 2111
+!     invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+! 
+!     invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+! 
+!     move-result-object v3
+! 
+!     invoke-interface {p1, v1, v3}, Lio/fabric/sdk/android/l;->e(Ljava/lang/String;Ljava/lang/String;)V
+!     :try_end_1
+!     .catch Lio/fabric/sdk/android/a/e/d$c; {:try_start_1 .. :try_end_1} :catch_0
+!     .catchall {:try_start_1 .. :try_end_1} :catchall_1
+! 
+!     :goto_2
+!     if-eqz v2, :cond_5
+! 
+!     .line 94
+!     invoke-static {}, Lio/fabric/sdk/android/c;->wA()Lio/fabric/sdk/android/l;
+! 
+!     move-result-object p1
+! 
+!     const-string v1, "Fabric"
+! 
+!     new-instance v3, Ljava/lang/StringBuilder;
+! 
+!     const-string v4, "Settings request ID: "
+! 
+!     invoke-direct {v3, v4}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+! 
+!     :goto_3
+!     const-string v4, "X-REQUEST-ID"
+! 
+!     .line 95
+!     invoke-virtual {v2, v4}, Lio/fabric/sdk/android/a/e/d;->dl(Ljava/lang/String;)Ljava/lang/String;
+! 
+!     move-result-object v2
+! 
+!     invoke-virtual {v3, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+! 
+!     invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+! 
+!     move-result-object v2
+! 
+!     .line 94
+!     invoke-interface {p1, v1, v2}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
+! 
+!     goto :goto_5
+! 
+!     :catch_0
+!     move-exception p1
+! 
+!     goto :goto_4
+! 
+!     :catchall_0
+!     move-exception p1
+! 
+!     move-object v2, v0
+! 
+!     goto :goto_6
+! 
+!     :catch_1
+!     move-exception p1
+! 
+!     move-object v2, v0
+! 
+!     .line 90
+!     :goto_4
+!     :try_start_2
+!     invoke-static {}, Lio/fabric/sdk/android/c;->wA()Lio/fabric/sdk/android/l;
+! 
+!     move-result-object v1
+! 
+!     const-string v3, "Fabric"
+! 
+!     const-string v4, "Settings request failed."
+! 
+!     invoke-interface {v1, v3, v4, p1}, Lio/fabric/sdk/android/l;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
+!     :try_end_2
+!     .catchall {:try_start_2 .. :try_end_2} :catchall_1
+! 
+!     if-eqz v2, :cond_5
+! 
+!     .line 94
+!     invoke-static {}, Lio/fabric/sdk/android/c;->wA()Lio/fabric/sdk/android/l;
+! 
+!     move-result-object p1
+! 
+!     const-string v1, "Fabric"
+! 
+!     new-instance v3, Ljava/lang/StringBuilder;
+! 
+!     const-string v4, "Settings request ID: "
+! 
+!     invoke-direct {v3, v4}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+! 
+!     goto :goto_3
+! 
+!     :cond_5
+!     :goto_5
+!     return-object v0
+! 
+!     :catchall_1
+!     move-exception p1
+! 
+!     :goto_6
+!     if-eqz v2, :cond_6
+! 
+!     invoke-static {}, Lio/fabric/sdk/android/c;->wA()Lio/fabric/sdk/android/l;
+! 
+!     move-result-object v0
+! 
+!     new-instance v1, Ljava/lang/StringBuilder;
+! 
+!     const-string v3, "Settings request ID: "
+! 
+!     invoke-direct {v1, v3}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+! 
+!     const-string v3, "X-REQUEST-ID"
+! 
+!     .line 95
+!     invoke-virtual {v2, v3}, Lio/fabric/sdk/android/a/e/d;->dl(Ljava/lang/String;)Ljava/lang/String;
+! 
+!     move-result-object v2
+! 
+!     invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+! 
+!     invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+! 
+!     move-result-object v1
+! 
+!     const-string v2, "Fabric"
+! 
+!     .line 94
+!     invoke-interface {v0, v2, v1}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V
+! 
+!     .line 97
+!     :cond_6
+!     throw p1
+! 
+      return-void
+  .end method
+--- 117,122 ----
+  
+  # virtual methods
+  .method public final a(Lio/fabric/sdk/android/a/g/w;)Lorg/json/JSONObject;
+!     .locals 0
+      return-void
+  .end method
+
diff --git a/patches/notrack/README.md b/patches/notrack/README.md
index 1edfaaa..5304105 100644
--- a/patches/notrack/README.md
+++ b/patches/notrack/README.md
@@ -22,4 +22,5 @@ Fuck telemetry.
 - 8.5.0
 - 8.5.1
 - 8.5.3
+- 8.5.4
 
diff --git a/patches/notyping/854.patch b/patches/notyping/854.patch
new file mode 100644
index 0000000..c663f28
--- /dev/null
+++ b/patches/notyping/854.patch
@@ -0,0 +1,19 @@
+diff -crB -x dist -x build com.discord-843-base/smali/com/discord/widgets/chat/input/WidgetChatInputEditText$1.smali com.discord-843/smali/com/discord/widgets/chat/input/WidgetChatInputEditText$1.smali
+*** com.discord-843-base/smali/com/discord/widgets/chat/input/WidgetChatInputEditText$1.smali	2019-02-06 23:27:50.203663875 +0300
+--- com.discord-843/smali/com/discord/widgets/chat/input/WidgetChatInputEditText$1.smali	2019-02-06 23:50:23.936732869 +0300
+***************
+*** 129,140 ****
+  
+      move-result-object p1
+  
+-     iget-object v0, p0, Lcom/discord/widgets/chat/input/WidgetChatInputEditText$1;->this$0:Lcom/discord/widgets/chat/input/WidgetChatInputEditText;
+- 
+-     iget-wide v0, v0, Lcom/discord/widgets/chat/input/WidgetChatInputEditText;->channelId:J
+- 
+-     invoke-virtual {p1, v0, v1}, Lcom/discord/stores/StoreUserTyping;->setUserTyping(J)V
+- 
+      :cond_1
+      return-void
+  .end method
+--- 129,134 ----
+
diff --git a/patches/notyping/README.md b/patches/notyping/README.md
index 0d6ac8d..01bf718 100644
--- a/patches/notyping/README.md
+++ b/patches/notyping/README.md
@@ -14,4 +14,5 @@ This patch disables the typing event.
 - 8.5.0
 - 8.5.1
 - 8.5.3
+- 8.5.4
 
diff --git a/patches/nozlib/854.patch b/patches/nozlib/854.patch
new file mode 100644
index 0000000..133bdf1
--- /dev/null
+++ b/patches/nozlib/854.patch
@@ -0,0 +1,35 @@
+diff -crB -x dist -x build com.discord-848-base/smali/com/discord/gateway/GatewaySocket.smali com.discord-848/smali/com/discord/gateway/GatewaySocket.smali
+*** com.discord-848-base/smali/com/discord/gateway/GatewaySocket.smali	2019-02-17 12:23:56.167569077 +0300
+--- com.discord-848/smali/com/discord/gateway/GatewaySocket.smali	2019-02-17 12:35:50.464681682 +0300
+***************
+*** 1019,1025 ****
+  
+      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;
+  
+--- 1019,1025 ----
+  
+      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 -x dist -x build com.discord-848-base/smali/com/discord/gateway/io/OutgoingPayload$Identify.smali com.discord-848/smali/com/discord/gateway/io/OutgoingPayload$Identify.smali
+*** com.discord-848-base/smali/com/discord/gateway/io/OutgoingPayload$Identify.smali	2019-02-17 12:23:56.167569077 +0300
+--- com.discord-848/smali/com/discord/gateway/io/OutgoingPayload$Identify.smali	2019-02-17 12:35:50.461348334 +0300
+***************
+*** 59,64 ****
+--- 59,66 ----
+  
+      const/4 v0, 0x0
+  
++     const/4 p3, 0x0
++ 
+      .line 27
+      invoke-direct {p0, v0}, Lcom/discord/gateway/io/OutgoingPayload;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+  
+
diff --git a/patches/nozlib/README.md b/patches/nozlib/README.md
index 2f4370e..ac3dee2 100644
--- a/patches/nozlib/README.md
+++ b/patches/nozlib/README.md
@@ -17,4 +17,5 @@ Conflicts with litecord patch.
 - 8.5.0
 - 8.5.1
 - 8.5.3
+- 8.5.4
 
diff --git a/patches/pureevil/854.patch b/patches/pureevil/854.patch
new file mode 100644
index 0000000..472149f
--- /dev/null
+++ b/patches/pureevil/854.patch
@@ -0,0 +1,26 @@
+diff -crB -x dist -x build com.discord-834-base/smali/com/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$1.smali com.discord-834/smali/com/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$1.smali
+*** com.discord-834-base/smali/com/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$1.smali  2019-01-23 23:17:43.804497453 +0300
+--- com.discord-834/smali/com/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$1.smali   2019-01-23 23:31:20.728628077 +0300
+***************
+*** 71,83 ****
+  
+      check-cast v0, Landroid/view/View;
+  
+!     const-string v1, "it"
+! 
+!     invoke-static {p1, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+! 
+!     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
+! 
+!     move-result p1
+  
+      invoke-static {v0, p1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy(Landroid/view/View;Z)V
+  
+--- 71,77 ----
+  
+      check-cast v0, Landroid/view/View;
+  
+!     const/4 p1, 0x1
+  
+      invoke-static {v0, p1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy(Landroid/view/View;Z)V
+  
diff --git a/patches/pureevil/README.md b/patches/pureevil/README.md
index 13494ee..a3ed83b 100644
--- a/patches/pureevil/README.md
+++ b/patches/pureevil/README.md
@@ -23,4 +23,5 @@ Conflicts with experiments.
 - 8.5.0
 - 8.5.1
 - 8.5.3
+- 8.5.4
 
diff --git a/patches/smalltime/854.patch b/patches/smalltime/854.patch
new file mode 100644
index 0000000..416f09c
--- /dev/null
+++ b/patches/smalltime/854.patch
@@ -0,0 +1,191 @@
+diff -crB -x dist -x build com.discord-836-testing/smali_classes2/com/miguelgaeta/simple_time/SimpleTime.smali com.discord-836/smali_classes2/com/miguelgaeta/simple_time/SimpleTime.smali
+*** com.discord-836-testing/smali_classes2/com/miguelgaeta/simple_time/SimpleTime.smali	2019-01-31 10:40:04.989283867 +0300
+--- com.discord-836/smali_classes2/com/miguelgaeta/simple_time/SimpleTime.smali	2019-01-31 10:53:44.476028781 +0300
+***************
+*** 247,419 ****
+  .end method
+  
+  .method public toReadableTimeString(Ljava/lang/Long;)Ljava/lang/String;
+!     .locals 6
+! 
+!     .line 126
+!     invoke-virtual {p0}, Lcom/miguelgaeta/simple_time/SimpleTime;->currentTimeMillis()J
+! 
+!     move-result-wide v0
+! 
+!     invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+! 
+!     move-result-object v0
+! 
+!     invoke-virtual {p0, v0}, Lcom/miguelgaeta/simple_time/SimpleTime;->toCalendar(Ljava/lang/Long;)Ljava/util/Calendar;
+! 
+!     move-result-object v0
+! 
+!     const/4 v1, 0x0
+! 
+!     const/16 v2, 0xb
+! 
+!     .line 128
+!     invoke-virtual {v0, v2, v1}, Ljava/util/Calendar;->set(II)V
+! 
+!     const/16 v2, 0xc
+! 
+!     .line 129
+!     invoke-virtual {v0, v2, v1}, Ljava/util/Calendar;->set(II)V
+! 
+!     const/16 v2, 0xd
+! 
+!     .line 130
+!     invoke-virtual {v0, v2, v1}, Ljava/util/Calendar;->set(II)V
+! 
+!     const/16 v2, 0xe
+! 
+!     .line 131
+!     invoke-virtual {v0, v2, v1}, Ljava/util/Calendar;->set(II)V
+! 
+!     .line 133
+!     iget-object v1, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->locale:Ljava/util/Locale;
+! 
+!     invoke-virtual {v1}, Ljava/util/Locale;->getLanguage()Ljava/lang/String;
+! 
+!     move-result-object v1
+! 
+!     const-string v2, "en"
+! 
+!     invoke-virtual {v1, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+! 
+!     move-result v1
+! 
+!     if-nez v1, :cond_1
+! 
+!     .line 136
+!     invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
+! 
+!     move-result-wide v1
+! 
+!     invoke-virtual {v0}, Ljava/util/Calendar;->getTimeInMillis()J
+! 
+!     move-result-wide v3
+! 
+!     cmp-long v0, v1, v3
+! 
+!     if-lez v0, :cond_0
+! 
+!     .line 137
+      iget-object v0, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterTime:Ljava/text/DateFormat;
+  
+      invoke-virtual {v0, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String;
+  
+-     move-result-object p1
+- 
+-     return-object p1
+- 
+-     .line 139
+-     :cond_0
+-     iget-object v0, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterDateTime:Ljava/text/DateFormat;
+- 
+-     invoke-virtual {v0, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String;
+- 
+-     move-result-object p1
+- 
+-     return-object p1
+- 
+-     .line 143
+-     :cond_1
+-     invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
+- 
+-     move-result-wide v1
+- 
+-     invoke-virtual {v0}, Ljava/util/Calendar;->getTimeInMillis()J
+- 
+-     move-result-wide v3
+- 
+-     cmp-long v5, v1, v3
+- 
+-     if-lez v5, :cond_2
+- 
+-     .line 144
+-     new-instance v0, Ljava/lang/StringBuilder;
+- 
+-     const-string v1, "Today at "
+- 
+-     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+- 
+-     iget-object v1, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterTime:Ljava/text/DateFormat;
+- 
+-     invoke-virtual {v1, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String;
+- 
+-     move-result-object p1
+- 
+-     invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+- 
+-     invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+- 
+-     move-result-object p1
+- 
+-     return-object p1
+- 
+-     :cond_2
+-     const/4 v1, 0x5
+- 
+-     const/4 v2, -0x1
+- 
+-     .line 147
+-     invoke-virtual {v0, v1, v2}, Ljava/util/Calendar;->add(II)V
+- 
+-     .line 149
+-     invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
+- 
+-     move-result-wide v1
+- 
+-     invoke-virtual {v0}, Ljava/util/Calendar;->getTimeInMillis()J
+- 
+-     move-result-wide v3
+- 
+-     cmp-long v0, v1, v3
+- 
+-     if-lez v0, :cond_3
+- 
+-     .line 150
+-     new-instance v0, Ljava/lang/StringBuilder;
+- 
+-     const-string v1, "Yesterday at "
+- 
+-     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+- 
+-     iget-object v1, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterTime:Ljava/text/DateFormat;
+- 
+-     invoke-virtual {v1, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String;
+- 
+-     move-result-object p1
+- 
+-     invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+- 
+-     invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+- 
+-     move-result-object p1
+- 
+-     return-object p1
+- 
+-     .line 153
+-     :cond_3
+-     iget-object v0, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterDateTime:Ljava/text/DateFormat;
+- 
+-     invoke-virtual {v0, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String;
+- 
+      move-result-object p1
+  
+      return-object p1
+--- 247,257 ----
+  .end method
+  
+  .method public toReadableTimeString(Ljava/lang/Long;)Ljava/lang/String;
+!     .locals 1
+      iget-object v0, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterTime:Ljava/text/DateFormat;
+  
+      invoke-virtual {v0, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String;
+  
+      move-result-object p1
+  
+      return-object p1
+
diff --git a/patches/smalltime/README.md b/patches/smalltime/README.md
index b358750..a1d1a97 100644
--- a/patches/smalltime/README.md
+++ b/patches/smalltime/README.md
@@ -15,4 +15,5 @@ This patch replaces the long time string with just a simple time string. This is
 - 8.5.0
 - 8.5.1
 - 8.5.3
+- 8.5.4
 
diff --git a/patches/squareavatars/854.patch b/patches/squareavatars/854.patch
new file mode 100644
index 0000000..8e06521
--- /dev/null
+++ b/patches/squareavatars/854.patch
@@ -0,0 +1,22 @@
+diff -crB -x dist -x build com.discord-854-base/res/values/styles.xml com.discord-854/res/values/styles.xml
+*** com.discord-854-base/res/values/styles.xml	2019-03-03 19:12:52.365781975 +0300
+--- com.discord-854/res/values/styles.xml	2019-03-03 19:17:33.073807444 +0300
+***************
+*** 827,833 ****
+          <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>
+--- 827,834 ----
+          <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/squareavatars/README.md b/patches/squareavatars/README.md
index c0c372e..d37b5bc 100644
--- a/patches/squareavatars/README.md
+++ b/patches/squareavatars/README.md
@@ -17,4 +17,5 @@ A very small amount of rounding is applied to make it look a little better.
 - 8.5.0
 - 8.5.1
 - 8.5.3
+- 8.5.4