diff --git a/patches/disable-mobileindicator/1208.patch b/patches/disable-mobileindicator/1208.patch
index b251b0f..5eee56a 100644
--- a/patches/disable-mobileindicator/1208.patch
+++ b/patches/disable-mobileindicator/1208.patch
@@ -1,96 +1,20 @@
-Only in com.discord: build
-Only in com.discord: dist
-diff --color -crB com.discord-base/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali
-*** com.discord-base/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali	2020-07-29 21:27:28.163447492 +0300
---- com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali	2020-07-29 23:32:55.123412443 +0300
+diff -crB from/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali to/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali
+*** from/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali	2020-06-20 04:18:51.683371812 +0100
+--- to/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali	2020-06-20 04:19:01.317301433 +0100
 ***************
-*** 317,387 ****
-  .end method
+*** 176,182 ****
   
-  .method private final setSuperProperties(Ljava/util/Map;)V
-!     .locals 3
-!     .annotation system Ldalvik/annotation/Signature;
-!         value = {
-!             "(",
-!             "Ljava/util/Map<",
-!             "Ljava/lang/String;",
-!             "+",
-!             "Ljava/lang/Object;",
-!             ">;)V"
-!         }
-!     .end annotation
-! 
-!     sget-object v0, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->superProperties$delegate:Lkotlin/properties/ReadWriteProperty;
-! 
-!     sget-object v1, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
-! 
-!     const/4 v2, 0x0
-! 
-!     aget-object v1, v1, v2
-! 
-!     invoke-interface {v0, p0, v1, p1}, Lkotlin/properties/ReadWriteProperty;->setValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;Ljava/lang/Object;)V
+      const-string v2, "browser"
   
-      return-void
-  .end method
+!     const-string v3, "Discord Android"
   
-  .method private final declared-synchronized updateSuperProperties(Ljava/util/Map;)V
-!     .locals 1
-!     .annotation system Ldalvik/annotation/Signature;
-!         value = {
-!             "(",
-!             "Ljava/util/Map<",
-!             "Ljava/lang/String;",
-!             "+",
-!             "Ljava/lang/Object;",
-!             ">;)V"
-!         }
-!     .end annotation
-! 
-!     monitor-enter p0
-! 
-!     .line 1
-!     :try_start_0
-!     invoke-virtual {p0}, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->getSuperProperties()Ljava/util/Map;
-! 
-!     move-result-object v0
-! 
-!     invoke-static {v0, p1}, Lf/n/a/k/a;->plus(Ljava/util/Map;Ljava/util/Map;)Ljava/util/Map;
-! 
-!     move-result-object p1
-! 
-!     invoke-direct {p0, p1}, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->setSuperProperties(Ljava/util/Map;)V
-!     :try_end_0
-!     .catchall {:try_start_0 .. :try_end_0} :catchall_0
-! 
-!     .line 2
-!     monitor-exit p0
+      invoke-direct {v1, v2, v3}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
   
-      return-void
-- 
--     :catchall_0
--     move-exception p1
-- 
--     monitor-exit p0
-- 
--     throw p1
-  .end method
+--- 176,182 ----
   
+      const-string v2, "browser"
   
---- 317,331 ----
-  .end method
+!     const-string v3, "Discord Client"
   
-  .method private final setSuperProperties(Ljava/util/Map;)V
-!     .locals 0
+      invoke-direct {v1, v2, v3}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
   
-      return-void
-  .end method
-  
-  .method private final declared-synchronized updateSuperProperties(Ljava/util/Map;)V
-!     .locals 0
-  
-      return-void
-  .end method
-  
-  
-Only in com.discord/smali/com/discord/utilities/analytics: AnalyticSuperProperties.smali.orig
-
diff --git a/patches/disable-mobileindicator/README.md b/patches/disable-mobileindicator/README.md
index 60dfd3a..9da79b1 100644
--- a/patches/disable-mobileindicator/README.md
+++ b/patches/disable-mobileindicator/README.md
@@ -1,11 +1,12 @@
 ## DisTok CutTheCord: Disable Mobile Indicator Patch
 
-Between 8.3.0 and 33.1: This patch replaces the browser name from "Discord Android" to "Discord Client", disabling the Mobile Indicator which is a privacy violation without an explicit opt-out option.
+This patch replaces the browser name from "Discord Android" to "Discord Client", disabling the Mobile Indicator which is a privacy violation without an explicit opt-out option.
 
-33.1+: This disables SuperProperties, which causes mobile indicator to be not displayed.
+However, this causes some issues. See the `Bugs / Side effects` list below.
 
 #### Bugs / Side effects
-- CRITICAL (8.3.0-33.1): Push notifications are broken
+- CRITICAL: Push notifications are broken
+- NOTE: This is really obvious on discord's end, and may be bannable.
 
 #### Available and tested on:
 - 8.3.0
diff --git a/patches/nocamerabutton/1208.patch b/patches/nocamerabutton/1208.patch
index 385d293..0421878 100644
--- a/patches/nocamerabutton/1208.patch
+++ b/patches/nocamerabutton/1208.patch
@@ -1,25 +1,6 @@
-Only in com.discord: build
-Only in com.discord: dist
-diff --color -crB com.discord-base/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment.smali com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment.smali
-*** com.discord-base/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment.smali	2020-07-29 21:27:30.480127538 +0300
---- com.discord/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment.smali	2020-07-29 23:19:53.075584660 +0300
-***************
-*** 362,368 ****
-  
-      if-nez v5, :cond_4
-  
-!     const/4 v10, 0x0
-  
-      goto :goto_1
-  
---- 362,368 ----
-  
-      if-nez v5, :cond_4
-  
-!     const/16 v10, 0x8
-  
-      goto :goto_1
-  
+diff -crB from/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment.smali to/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment.smali
+*** from/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment.smali	2020-07-18 13:36:47.690000000 +0300
+--- to/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment.smali	2020-07-18 13:38:12.390000000 +0300
 ***************
 *** 379,385 ****
   
@@ -37,21 +18,3 @@ diff --color -crB com.discord-base/smali_classes2/com/lytefast/flexinput/fragmen
   
       goto :goto_2
   
-***************
-*** 401,407 ****
-      goto :goto_3
-  
-      :cond_6
-!     const/16 v5, 0x8
-  
-      :goto_3
-      invoke-virtual {v6, v5}, Landroid/view/View;->setVisibility(I)V
---- 401,407 ----
-      goto :goto_3
-  
-      :cond_6
-!     const/16 v5, 0x0
-  
-      :goto_3
-      invoke-virtual {v6, v5}, Landroid/view/View;->setVisibility(I)V
-