diff --git a/patches/branding/856.patch b/patches/branding/856.patch
index 3f3981e..5475bd8 100644
--- a/patches/branding/856.patch
+++ b/patches/branding/856.patch
@@ -1,6 +1,6 @@
-diff -crB /home/ave/workbench/ctc/com.discord-856/AndroidManifest.xml /tmp/patchport/AndroidManifest.xml
-*** /home/ave/workbench/ctc/com.discord-856/AndroidManifest.xml	2019-03-08 14:06:23.000000000 +0300
---- /tmp/patchport/AndroidManifest.xml	2019-03-08 14:56:12.742544459 +0300
+diff -crB from/AndroidManifest.xml to/AndroidManifest.xml
+*** from/AndroidManifest.xml	2019-03-08 15:11:45.688219855 +0300
+--- to/AndroidManifest.xml	2019-03-08 16:16:09.145050830 +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="856" platformBuildVersionName="8.5.6">
@@ -71,9 +71,9 @@ diff -crB /home/ave/workbench/ctc/com.discord-856/AndroidManifest.xml /tmp/patch
       </application>
   </manifest>
 \ No newline at end of file
-diff -crB /home/ave/workbench/ctc/com.discord-856/apktool.yml /tmp/patchport/apktool.yml
-*** /home/ave/workbench/ctc/com.discord-856/apktool.yml	2019-03-08 14:06:30.631378889 +0300
---- /tmp/patchport/apktool.yml	2019-03-08 14:56:12.745877813 +0300
+diff -crB from/apktool.yml to/apktool.yml
+*** from/apktool.yml	2019-03-08 15:11:35.111488600 +0300
+--- to/apktool.yml	2019-03-08 16:16:09.145050830 +0300
 ***************
 *** 469,473 ****
     tag: null
@@ -87,9 +87,9 @@ diff -crB /home/ave/workbench/ctc/com.discord-856/apktool.yml /tmp/patchport/apk
   versionInfo:
 !   versionCode: '856CTCBUILD'
 !   versionName: 8.5.6-cutthecord-CTCBUILD
-diff -crB /home/ave/workbench/ctc/com.discord-856/res/values/strings.xml /tmp/patchport/res/values/strings.xml
-*** /home/ave/workbench/ctc/com.discord-856/res/values/strings.xml	2019-03-08 14:06:26.578020941 +0300
---- /tmp/patchport/res/values/strings.xml	2019-03-08 14:56:12.745877813 +0300
+diff -crB from/res/values/strings.xml to/res/values/strings.xml
+*** from/res/values/strings.xml	2019-03-08 15:11:45.688219855 +0300
+--- to/res/values/strings.xml	2019-03-08 16:16:09.148384183 +0300
 ***************
 *** 1222,1228 ****
       <string name="disconnect_account_body">Disconnecting your account might remove you from servers you joined via this account.</string>
diff --git a/patches/experiments/856.patch b/patches/experiments/856.patch
index 23d589f..619a43d 100644
--- a/patches/experiments/856.patch
+++ b/patches/experiments/856.patch
@@ -1,6 +1,6 @@
-diff -crB /home/ave/workbench/ctc/com.discord-856/smali/com/discord/stores/StoreExperiments$ExperimentAndStaff.smali /tmp/patchport/smali/com/discord/stores/StoreExperiments$ExperimentAndStaff.smali
-*** /home/ave/workbench/ctc/com.discord-856/smali/com/discord/stores/StoreExperiments$ExperimentAndStaff.smali	2019-03-08 14:06:28.231364315 +0300
---- /tmp/patchport/smali/com/discord/stores/StoreExperiments$ExperimentAndStaff.smali	2019-03-08 14:56:18.065910145 +0300
+diff -crB from/smali/com/discord/stores/StoreExperiments$ExperimentAndStaff.smali to/smali/com/discord/stores/StoreExperiments$ExperimentAndStaff.smali
+*** from/smali/com/discord/stores/StoreExperiments$ExperimentAndStaff.smali	2019-03-08 15:11:35.454824030 +0300
+--- to/smali/com/discord/stores/StoreExperiments$ExperimentAndStaff.smali	2019-03-08 16:16:14.428416070 +0300
 ***************
 *** 212,219 ****
   .method public final isStaff()Z
@@ -19,9 +19,9 @@ diff -crB /home/ave/workbench/ctc/com.discord-856/smali/com/discord/stores/Store
   
       return v0
   .end method
-diff -crB /home/ave/workbench/ctc/com.discord-856/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali /tmp/patchport/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali
-*** /home/ave/workbench/ctc/com.discord-856/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali	2019-03-08 14:06:28.231364315 +0300
---- /tmp/patchport/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali	2019-03-08 14:56:18.065910145 +0300
+diff -crB from/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali to/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali
+*** from/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali	2019-03-08 15:11:35.454824030 +0300
+--- to/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali	2019-03-08 16:16:14.428416070 +0300
 ***************
 *** 81,108 ****
   .method public final call(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;)Z
@@ -53,9 +53,9 @@ diff -crB /home/ave/workbench/ctc/com.discord-856/smali/com/discord/stores/Store
   
       return p1
 --- 81,86 ----
-diff -crB /home/ave/workbench/ctc/com.discord-856/smali/com/discord/stores/StoreExperiments$getExperimentAndStaff$1.smali /tmp/patchport/smali/com/discord/stores/StoreExperiments$getExperimentAndStaff$1.smali
-*** /home/ave/workbench/ctc/com.discord-856/smali/com/discord/stores/StoreExperiments$getExperimentAndStaff$1.smali	2019-03-08 14:06:28.231364315 +0300
---- /tmp/patchport/smali/com/discord/stores/StoreExperiments$getExperimentAndStaff$1.smali	2019-03-08 14:56:18.065910145 +0300
+diff -crB from/smali/com/discord/stores/StoreExperiments$getExperimentAndStaff$1.smali to/smali/com/discord/stores/StoreExperiments$getExperimentAndStaff$1.smali
+*** from/smali/com/discord/stores/StoreExperiments$getExperimentAndStaff$1.smali	2019-03-08 15:11:35.454824030 +0300
+--- to/smali/com/discord/stores/StoreExperiments$getExperimentAndStaff$1.smali	2019-03-08 16:16:14.428416070 +0300
 ***************
 *** 77,90 ****
   .method public final call(Lcom/discord/models/domain/ModelUser;)Z
@@ -80,9 +80,9 @@ diff -crB /home/ave/workbench/ctc/com.discord-856/smali/com/discord/stores/Store
   
       return p1
   .end method
-diff -crB /home/ave/workbench/ctc/com.discord-856/smali/com/discord/stores/StoreExperiments.smali /tmp/patchport/smali/com/discord/stores/StoreExperiments.smali
-*** /home/ave/workbench/ctc/com.discord-856/smali/com/discord/stores/StoreExperiments.smali	2019-03-08 14:06:28.234697668 +0300
---- /tmp/patchport/smali/com/discord/stores/StoreExperiments.smali	2019-03-08 14:56:18.065910145 +0300
+diff -crB from/smali/com/discord/stores/StoreExperiments.smali to/smali/com/discord/stores/StoreExperiments.smali
+*** from/smali/com/discord/stores/StoreExperiments.smali	2019-03-08 15:11:35.454824030 +0300
+--- to/smali/com/discord/stores/StoreExperiments.smali	2019-03-08 16:16:14.428416070 +0300
 ***************
 *** 1247,1255 ****
   
@@ -102,9 +102,9 @@ diff -crB /home/ave/workbench/ctc/com.discord-856/smali/com/discord/stores/Store
   
       if-eq v0, v1, :cond_1
   
-diff -crB /home/ave/workbench/ctc/com.discord-856/smali/com/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$1.smali /tmp/patchport/smali/com/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$1.smali
-*** /home/ave/workbench/ctc/com.discord-856/smali/com/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$1.smali	2019-03-08 14:06:28.828034604 +0300
---- /tmp/patchport/smali/com/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$1.smali	2019-03-08 14:56:18.065910145 +0300
+diff -crB from/smali/com/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$1.smali to/smali/com/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$1.smali
+*** from/smali/com/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$1.smali	2019-03-08 15:11:35.521491104 +0300
+--- to/smali/com/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$1.smali	2019-03-08 16:16:14.428416070 +0300
 ***************
 *** 71,83 ****
   
@@ -128,9 +128,9 @@ diff -crB /home/ave/workbench/ctc/com.discord-856/smali/com/discord/widgets/sett
   
       const/4 v1, 0x0
   
-diff -crB /home/ave/workbench/ctc/com.discord-856/smali/com/discord/widgets/settings/WidgetSettings.smali /tmp/patchport/smali/com/discord/widgets/settings/WidgetSettings.smali
-*** /home/ave/workbench/ctc/com.discord-856/smali/com/discord/widgets/settings/WidgetSettings.smali	2019-03-08 14:06:28.831367958 +0300
---- /tmp/patchport/smali/com/discord/widgets/settings/WidgetSettings.smali	2019-03-08 14:56:18.065910145 +0300
+diff -crB from/smali/com/discord/widgets/settings/WidgetSettings.smali to/smali/com/discord/widgets/settings/WidgetSettings.smali
+*** from/smali/com/discord/widgets/settings/WidgetSettings.smali	2019-03-08 15:11:35.521491104 +0300
+--- to/smali/com/discord/widgets/settings/WidgetSettings.smali	2019-03-08 16:16:14.428416070 +0300
 ***************
 *** 785,793 ****
       if-eqz p1, :cond_1
diff --git a/patches/litecord/856.patch b/patches/litecord/856.patch
index 25b9496..bb02ac6 100644
--- a/patches/litecord/856.patch
+++ b/patches/litecord/856.patch
@@ -1,6 +1,6 @@
-diff -crB /home/ave/workbench/ctc/com.discord-856/smali/com/discord/app/App.smali /tmp/patchport/smali/com/discord/app/App.smali
-*** /home/ave/workbench/ctc/com.discord-856/smali/com/discord/app/App.smali	2019-03-08 14:06:27.984696150 +0300
---- /tmp/patchport/smali/com/discord/app/App.smali	2019-03-08 14:56:15.429227454 +0300
+diff -crB from/smali/com/discord/app/App.smali to/smali/com/discord/app/App.smali
+*** from/smali/com/discord/app/App.smali	2019-03-08 15:11:35.434823908 +0300
+--- to/smali/com/discord/app/App.smali	2019-03-08 16:16:11.778400066 +0300
 ***************
 *** 212,218 ****
   
@@ -18,9 +18,9 @@ diff -crB /home/ave/workbench/ctc/com.discord-856/smali/com/discord/app/App.smal
   
       .line 71
       invoke-static {v0}, Lcom/discord/models/domain/emoji/ModelEmojiCustom;->setCdnUri(Ljava/lang/String;)V
-diff -crB /home/ave/workbench/ctc/com.discord-856/smali/com/discord/BuildConfig.smali /tmp/patchport/smali/com/discord/BuildConfig.smali
-*** /home/ave/workbench/ctc/com.discord-856/smali/com/discord/BuildConfig.smali	2019-03-08 14:06:27.981362796 +0300
---- /tmp/patchport/smali/com/discord/BuildConfig.smali	2019-03-08 14:56:15.429227454 +0300
+diff -crB from/smali/com/discord/BuildConfig.smali to/smali/com/discord/BuildConfig.smali
+*** from/smali/com/discord/BuildConfig.smali	2019-03-08 15:11:35.431490555 +0300
+--- to/smali/com/discord/BuildConfig.smali	2019-03-08 16:16:11.778400066 +0300
 ***************
 *** 16,30 ****
   
@@ -54,9 +54,9 @@ diff -crB /home/ave/workbench/ctc/com.discord-856/smali/com/discord/BuildConfig.
   
   .field public static final LOCAL_IP:Ljava/lang/String; = ""
   
-diff -crB /home/ave/workbench/ctc/com.discord-856/smali/com/discord/gateway/GatewaySocket.smali /tmp/patchport/smali/com/discord/gateway/GatewaySocket.smali
-*** /home/ave/workbench/ctc/com.discord-856/smali/com/discord/gateway/GatewaySocket.smali	2019-03-08 14:06:28.034696454 +0300
---- /tmp/patchport/smali/com/discord/gateway/GatewaySocket.smali	2019-03-08 14:56:15.429227454 +0300
+diff -crB from/smali/com/discord/gateway/GatewaySocket.smali to/smali/com/discord/gateway/GatewaySocket.smali
+*** from/smali/com/discord/gateway/GatewaySocket.smali	2019-03-08 15:11:35.438157262 +0300
+--- to/smali/com/discord/gateway/GatewaySocket.smali	2019-03-08 16:16:11.778400066 +0300
 ***************
 *** 42,48 ****
       .end annotation
@@ -91,9 +91,9 @@ diff -crB /home/ave/workbench/ctc/com.discord-856/smali/com/discord/gateway/Gate
   
       invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
   
-diff -crB /home/ave/workbench/ctc/com.discord-856/smali/com/discord/gateway/io/OutgoingPayload$Identify.smali /tmp/patchport/smali/com/discord/gateway/io/OutgoingPayload$Identify.smali
-*** /home/ave/workbench/ctc/com.discord-856/smali/com/discord/gateway/io/OutgoingPayload$Identify.smali	2019-03-08 14:06:28.028029746 +0300
---- /tmp/patchport/smali/com/discord/gateway/io/OutgoingPayload$Identify.smali	2019-03-08 14:56:15.429227454 +0300
+diff -crB from/smali/com/discord/gateway/io/OutgoingPayload$Identify.smali to/smali/com/discord/gateway/io/OutgoingPayload$Identify.smali
+*** from/smali/com/discord/gateway/io/OutgoingPayload$Identify.smali	2019-03-08 15:11:35.438157262 +0300
+--- to/smali/com/discord/gateway/io/OutgoingPayload$Identify.smali	2019-03-08 16:16:11.778400066 +0300
 ***************
 *** 59,64 ****
 --- 59,66 ----
@@ -105,9 +105,9 @@ diff -crB /home/ave/workbench/ctc/com.discord-856/smali/com/discord/gateway/io/O
       .line 27
       invoke-direct {p0, v0}, Lcom/discord/gateway/io/OutgoingPayload;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
   
-diff -crB /home/ave/workbench/ctc/com.discord-856/smali/com/discord/stores/StoreGatewayConnection.smali /tmp/patchport/smali/com/discord/stores/StoreGatewayConnection.smali
-*** /home/ave/workbench/ctc/com.discord-856/smali/com/discord/stores/StoreGatewayConnection.smali	2019-03-08 14:06:28.241364375 +0300
---- /tmp/patchport/smali/com/discord/stores/StoreGatewayConnection.smali	2019-03-08 14:56:15.429227454 +0300
+diff -crB from/smali/com/discord/stores/StoreGatewayConnection.smali to/smali/com/discord/stores/StoreGatewayConnection.smali
+*** from/smali/com/discord/stores/StoreGatewayConnection.smali	2019-03-08 15:11:35.458157384 +0300
+--- to/smali/com/discord/stores/StoreGatewayConnection.smali	2019-03-08 16:16:11.778400066 +0300
 ***************
 *** 1338,1344 ****
       .line 232
@@ -125,9 +125,9 @@ diff -crB /home/ave/workbench/ctc/com.discord-856/smali/com/discord/stores/Store
   
       sget-object v3, Lcom/discord/utilities/rest/RestAPI$AppHeadersProvider;->INSTANCE:Lcom/discord/utilities/rest/RestAPI$AppHeadersProvider;
   
-diff -crB /home/ave/workbench/ctc/com.discord-856/smali/com/discord/utilities/icon/IconUtils.smali /tmp/patchport/smali/com/discord/utilities/icon/IconUtils.smali
-*** /home/ave/workbench/ctc/com.discord-856/smali/com/discord/utilities/icon/IconUtils.smali	2019-03-08 14:06:28.374698518 +0300
---- /tmp/patchport/smali/com/discord/utilities/icon/IconUtils.smali	2019-03-08 14:56:15.429227454 +0300
+diff -crB from/smali/com/discord/utilities/icon/IconUtils.smali to/smali/com/discord/utilities/icon/IconUtils.smali
+*** from/smali/com/discord/utilities/icon/IconUtils.smali	2019-03-08 15:11:35.471490799 +0300
+--- to/smali/com/discord/utilities/icon/IconUtils.smali	2019-03-08 16:16:11.778400066 +0300
 ***************
 *** 359,365 ****
       goto :goto_2
@@ -247,9 +247,9 @@ diff -crB /home/ave/workbench/ctc/com.discord-856/smali/com/discord/utilities/ic
   
       invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
   
-diff -crB /home/ave/workbench/ctc/com.discord-856/smali/com/discord/utilities/rest/RestAPI$Companion.smali /tmp/patchport/smali/com/discord/utilities/rest/RestAPI$Companion.smali
-*** /home/ave/workbench/ctc/com.discord-856/smali/com/discord/utilities/rest/RestAPI$Companion.smali	2019-03-08 14:06:28.411365407 +0300
---- /tmp/patchport/smali/com/discord/utilities/rest/RestAPI$Companion.smali	2019-03-08 14:56:15.432560807 +0300
+diff -crB from/smali/com/discord/utilities/rest/RestAPI$Companion.smali to/smali/com/discord/utilities/rest/RestAPI$Companion.smali
+*** from/smali/com/discord/utilities/rest/RestAPI$Companion.smali	2019-03-08 15:11:35.474824152 +0300
+--- to/smali/com/discord/utilities/rest/RestAPI$Companion.smali	2019-03-08 16:16:11.778400066 +0300
 ***************
 *** 318,324 ****
       .line 213
@@ -267,9 +267,9 @@ diff -crB /home/ave/workbench/ctc/com.discord-856/smali/com/discord/utilities/re
   
       check-cast v6, Lokhttp3/m;
   
-diff -crB /home/ave/workbench/ctc/com.discord-856/smali/com/discord/utilities/textprocessing/Rules$createCustomEmojiRule$1$parse$emojiNode$1.smali /tmp/patchport/smali/com/discord/utilities/textprocessing/Rules$createCustomEmojiRule$1$parse$emojiNode$1.smali
-*** /home/ave/workbench/ctc/com.discord-856/smali/com/discord/utilities/textprocessing/Rules$createCustomEmojiRule$1$parse$emojiNode$1.smali	2019-03-08 14:06:28.441365589 +0300
---- /tmp/patchport/smali/com/discord/utilities/textprocessing/Rules$createCustomEmojiRule$1$parse$emojiNode$1.smali	2019-03-08 14:56:15.432560807 +0300
+diff -crB from/smali/com/discord/utilities/textprocessing/Rules$createCustomEmojiRule$1$parse$emojiNode$1.smali to/smali/com/discord/utilities/textprocessing/Rules$createCustomEmojiRule$1$parse$emojiNode$1.smali
+*** from/smali/com/discord/utilities/textprocessing/Rules$createCustomEmojiRule$1$parse$emojiNode$1.smali	2019-03-08 15:11:35.478157506 +0300
+--- to/smali/com/discord/utilities/textprocessing/Rules$createCustomEmojiRule$1$parse$emojiNode$1.smali	2019-03-08 16:16:11.778400066 +0300
 ***************
 *** 105,111 ****
       :goto_1
@@ -287,9 +287,9 @@ diff -crB /home/ave/workbench/ctc/com.discord-856/smali/com/discord/utilities/te
   
       invoke-direct {p2, v0}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
   
-diff -crB /home/ave/workbench/ctc/com.discord-856/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite.smali /tmp/patchport/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite.smali
-*** /home/ave/workbench/ctc/com.discord-856/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite.smali	2019-03-08 14:06:28.608033268 +0300
---- /tmp/patchport/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite.smali	2019-03-08 14:56:15.432560807 +0300
+diff -crB from/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite.smali to/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite.smali
+*** from/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite.smali	2019-03-08 15:11:35.494824274 +0300
+--- to/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite.smali	2019-03-08 16:16:11.778400066 +0300
 ***************
 *** 610,616 ****
       .line 104
@@ -307,9 +307,9 @@ diff -crB /home/ave/workbench/ctc/com.discord-856/smali/com/discord/widgets/chat
   
       invoke-direct {v1, v6}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
   
-diff -crB /home/ave/workbench/ctc/com.discord-856/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift.smali /tmp/patchport/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift.smali
-*** /home/ave/workbench/ctc/com.discord-856/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift.smali	2019-03-08 14:06:28.614699975 +0300
---- /tmp/patchport/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift.smali	2019-03-08 14:56:15.432560807 +0300
+diff -crB from/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift.smali to/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift.smali
+*** from/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift.smali	2019-03-08 15:11:35.498157628 +0300
+--- to/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift.smali	2019-03-08 16:16:11.778400066 +0300
 ***************
 *** 1042,1048 ****
       :goto_3
diff --git a/patches/nozlib/856.patch b/patches/nozlib/856.patch
index 32b89cf..339f16b 100644
--- a/patches/nozlib/856.patch
+++ b/patches/nozlib/856.patch
@@ -1,6 +1,6 @@
-diff -crB /home/ave/workbench/ctc/com.discord-856/smali/com/discord/gateway/GatewaySocket.smali /tmp/patchport/smali/com/discord/gateway/GatewaySocket.smali
-*** /home/ave/workbench/ctc/com.discord-856/smali/com/discord/gateway/GatewaySocket.smali	2019-03-08 14:06:28.034696454 +0300
---- /tmp/patchport/smali/com/discord/gateway/GatewaySocket.smali	2019-03-08 14:56:10.139195303 +0300
+diff -crB from/smali/com/discord/gateway/GatewaySocket.smali to/smali/com/discord/gateway/GatewaySocket.smali
+*** from/smali/com/discord/gateway/GatewaySocket.smali	2019-03-08 15:11:35.438157262 +0300
+--- to/smali/com/discord/gateway/GatewaySocket.smali	2019-03-08 16:16:06.511701594 +0300
 ***************
 *** 1050,1056 ****
   
@@ -18,9 +18,9 @@ diff -crB /home/ave/workbench/ctc/com.discord-856/smali/com/discord/gateway/Gate
   
       invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
   
-diff -crB /home/ave/workbench/ctc/com.discord-856/smali/com/discord/gateway/io/OutgoingPayload$Identify.smali /tmp/patchport/smali/com/discord/gateway/io/OutgoingPayload$Identify.smali
-*** /home/ave/workbench/ctc/com.discord-856/smali/com/discord/gateway/io/OutgoingPayload$Identify.smali	2019-03-08 14:06:28.028029746 +0300
---- /tmp/patchport/smali/com/discord/gateway/io/OutgoingPayload$Identify.smali	2019-03-08 14:56:10.139195303 +0300
+diff -crB from/smali/com/discord/gateway/io/OutgoingPayload$Identify.smali to/smali/com/discord/gateway/io/OutgoingPayload$Identify.smali
+*** from/smali/com/discord/gateway/io/OutgoingPayload$Identify.smali	2019-03-08 15:11:35.438157262 +0300
+--- to/smali/com/discord/gateway/io/OutgoingPayload$Identify.smali	2019-03-08 16:16:06.511701594 +0300
 ***************
 *** 59,64 ****
 --- 59,66 ----
diff --git a/patchport.py b/patchport.py
index 35ea998..f0dd558 100644
--- a/patchport.py
+++ b/patchport.py
@@ -40,12 +40,13 @@ def fix_offset(patch_contents):
     shutil.copytree(apk_folder, tmp_folder)
     subprocess.run("patch -p1 --no-backup-if-mismatch --force",
                    shell=True, input=patch_contents, text=True,
-                   cwd=tmp_folder)
+                   cwd=tmp_folder, capture_output=True)
     out = subprocess.run(f"diff -crB {apk_folder} {tmp_folder}",
                          shell=True, input=patch_contents, text=True,
                          cwd=tmp_folder, capture_output=True)
     shutil.rmtree(tmp_folder, ignore_errors=True)
-    return out.stdout
+    patch_out = out.stdout.replace(apk_folder, "from").replace(tmp_folder, "to")
+    return patch_out
 
 
 re_versioncode = re.compile(r'platformBuildVersionCode="([0-9]+)"')