diff --git a/README.md b/README.md
index c2a61dd..f9087ec 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
Modular Client Mod for Discord's Android app.
-**Latest supported Discord Android version:** 18.0-alpha12 (1104), released on 2020-04-19.
+**Latest supported Discord Android version:** 18.0-alpha9 (1100), released on 2020-04-17.
New patch development will be done for the latest supported version.
diff --git a/patches/branding/1103.patch b/patches/branding/1103.patch
deleted file mode 100644
index 242694b..0000000
--- a/patches/branding/1103.patch
+++ /dev/null
@@ -1,248 +0,0 @@
-diff -crB from/AndroidManifest.xml to/AndroidManifest.xml
-*** from/AndroidManifest.xml 2020-04-08 17:16:56.203784103 +0100
---- to/AndroidManifest.xml 2020-04-08 17:22:13.427918160 +0100
-***************
-*** 1,4 ****
-!
-
-
-
---- 1,4 ----
-!
-
-
-
-***************
-*** 20,31 ****
-
-
-
-!
-
-
-
-
-!
-
-
-
---- 20,31 ----
-
-
-
-!
-
-
-
-
-!
-
-
-
-***************
-*** 114,120 ****
-
-
-
-!
-
-
-
---- 114,120 ----
-
-
-
-!
-
-
-
-***************
-*** 144,150 ****
-
-
-
-!
-
-
-
---- 144,150 ----
-
-
-
-!
-
-
-
-***************
-*** 161,167 ****
-
-
-
-!
-
-
-
---- 161,167 ----
-
-
-
-!
-
-
-
-***************
-*** 176,182 ****
-
-
-
-!
-
-
-
---- 176,182 ----
-
-
-
-!
-
-
-
-***************
-*** 186,192 ****
-
-
-
-!
-
-
-
---- 186,192 ----
-
-
-
-!
-
-
-
-***************
-*** 226,239 ****
-
-
-
-!
-
-
-
-
-
-!
-!
-
-
-!
-\ No newline at end of file
---- 226,239 ----
-
-
-
-!
-
-
-
-
-
-!
-!
-
-
-!
-diff -crB from/apktool.yml to/apktool.yml
-*** from/apktool.yml 2020-04-08 17:16:37.551874293 +0100
---- to/apktool.yml 2020-04-08 17:23:18.647208860 +0100
-***************
-*** 190,194 ****
- tag: null
- version: 2.4.2-f3136b-SNAPSHOT
- versionInfo:
-! versionCode: '1103'
-! versionName: 18.0-alpha11
---- 190,194 ----
- tag: null
- version: 2.4.2-f3136b-SNAPSHOT
- versionInfo:
-! versionCode: '1103CTCBUILD'
-! versionName: '18.0-alpha11-cutthecord-CTCBUILD'
-diff -crB from/res/values/strings.xml to/res/values/strings.xml
-*** from/res/values/strings.xml 2020-04-08 17:16:32.625898090 +0100
---- to/res/values/strings.xml 2020-04-08 17:22:13.429918137 +0100
-***************
-*** 1381,1387 ****
- Disconnecting your account might remove you from servers you joined via this account.
- Disconnect %1$s
- Disconnect from Voice
-! Discord
- Discord is an all-in-one communication app for your friends, communities, and gaming.
- Team voice & text chat
- discord.gg/
---- 1381,1387 ----
- Disconnecting your account might remove you from servers you joined via this account.
- Disconnect %1$s
- Disconnect from Voice
-! CTCNAME
- Discord is an all-in-one communication app for your friends, communities, and gaming.
- Team voice & text chat
- discord.gg/
-***************
-*** 3716,3722 ****
- Failed to reply to %1$s
- Replied to %1$s
- Notification Settings
-! Discord
- "Somebody Playin'"
- Notifications
- Setup notifications to know when your friends send a message.
---- 3716,3722 ----
- Failed to reply to %1$s
- Replied to %1$s
- Notification Settings
-! CTCNAME
- "Somebody Playin'"
- Notifications
- Setup notifications to know when your friends send a message.
-***************
-*** 5015,5021 ****
- Subscriptions
- Suggestions
- %1$s, %2$s
-! Support
- Remove all embeds
- This will remove all embeds on this message for everyone.
- Remove All Embeds
---- 5015,5021 ----
- Subscriptions
- Suggestions
- %1$s, %2$s
-! CutTheCord Repo
- Remove all embeds
- This will remove all embeds on this message for everyone.
- Remove All Embeds
-diff -crB from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali
-*** from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-04-08 17:16:34.755887801 +0100
---- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-04-08 17:22:13.429918137 +0100
-***************
-*** 76,82 ****
- .line 3
- new-instance v0, Landroid/content/Intent;
-
-! const-string v1, "https://discordapp.com/app"
-
- .line 4
- invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
---- 76,82 ----
- .line 3
- new-instance v0, Landroid/content/Intent;
-
-! const-string v1, "https://gitdab.com/distok/cutthecord/issues/22#issuecomment-82"
-
- .line 4
- invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
diff --git a/patches/branding/1104.patch b/patches/branding/1104.patch
deleted file mode 100644
index 93c2750..0000000
--- a/patches/branding/1104.patch
+++ /dev/null
@@ -1,248 +0,0 @@
-diff -crB from/AndroidManifest.xml to/AndroidManifest.xml
-*** from/AndroidManifest.xml 2020-04-08 17:16:56.203784103 +0100
---- to/AndroidManifest.xml 2020-04-08 17:22:13.427918160 +0100
-***************
-*** 1,4 ****
-!
-
-
-
---- 1,4 ----
-!
-
-
-
-***************
-*** 20,31 ****
-
-
-
-!
-
-
-
-
-!
-
-
-
---- 20,31 ----
-
-
-
-!
-
-
-
-
-!
-
-
-
-***************
-*** 114,120 ****
-
-
-
-!
-
-
-
---- 114,120 ----
-
-
-
-!
-
-
-
-***************
-*** 144,150 ****
-
-
-
-!
-
-
-
---- 144,150 ----
-
-
-
-!
-
-
-
-***************
-*** 161,167 ****
-
-
-
-!
-
-
-
---- 161,167 ----
-
-
-
-!
-
-
-
-***************
-*** 176,182 ****
-
-
-
-!
-
-
-
---- 176,182 ----
-
-
-
-!
-
-
-
-***************
-*** 186,192 ****
-
-
-
-!
-
-
-
---- 186,192 ----
-
-
-
-!
-
-
-
-***************
-*** 226,239 ****
-
-
-
-!
-
-
-
-
-
-!
-!
-
-
-!
-\ No newline at end of file
---- 226,239 ----
-
-
-
-!
-
-
-
-
-
-!
-!
-
-
-!
-diff -crB from/apktool.yml to/apktool.yml
-*** from/apktool.yml 2020-04-08 17:16:37.551874293 +0100
---- to/apktool.yml 2020-04-08 17:23:18.647208860 +0100
-***************
-*** 190,194 ****
- tag: null
- version: 2.4.2-f3136b-SNAPSHOT
- versionInfo:
-! versionCode: '1104'
-! versionName: 18.0-alpha12
---- 190,194 ----
- tag: null
- version: 2.4.2-f3136b-SNAPSHOT
- versionInfo:
-! versionCode: '1104CTCBUILD'
-! versionName: '18.0-alpha12-cutthecord-CTCBUILD'
-diff -crB from/res/values/strings.xml to/res/values/strings.xml
-*** from/res/values/strings.xml 2020-04-08 17:16:32.625898090 +0100
---- to/res/values/strings.xml 2020-04-08 17:22:13.429918137 +0100
-***************
-*** 1381,1387 ****
- Disconnecting your account might remove you from servers you joined via this account.
- Disconnect %1$s
- Disconnect from Voice
-! Discord
- Discord is an all-in-one communication app for your friends, communities, and gaming.
- Team voice & text chat
- discord.gg/
---- 1381,1387 ----
- Disconnecting your account might remove you from servers you joined via this account.
- Disconnect %1$s
- Disconnect from Voice
-! CTCNAME
- Discord is an all-in-one communication app for your friends, communities, and gaming.
- Team voice & text chat
- discord.gg/
-***************
-*** 3716,3722 ****
- Failed to reply to %1$s
- Replied to %1$s
- Notification Settings
-! Discord
- "Somebody Playin'"
- Notifications
- Setup notifications to know when your friends send a message.
---- 3716,3722 ----
- Failed to reply to %1$s
- Replied to %1$s
- Notification Settings
-! CTCNAME
- "Somebody Playin'"
- Notifications
- Setup notifications to know when your friends send a message.
-***************
-*** 5015,5021 ****
- Subscriptions
- Suggestions
- %1$s, %2$s
-! Support
- Remove all embeds
- This will remove all embeds on this message for everyone.
- Remove All Embeds
---- 5015,5021 ----
- Subscriptions
- Suggestions
- %1$s, %2$s
-! CutTheCord Repo
- Remove all embeds
- This will remove all embeds on this message for everyone.
- Remove All Embeds
-diff -crB from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali
-*** from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-04-08 17:16:34.755887801 +0100
---- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-04-08 17:22:13.429918137 +0100
-***************
-*** 76,82 ****
- .line 3
- new-instance v0, Landroid/content/Intent;
-
-! const-string v1, "https://discordapp.com/app"
-
- .line 4
- invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
---- 76,82 ----
- .line 3
- new-instance v0, Landroid/content/Intent;
-
-! const-string v1, "https://gitdab.com/distok/cutthecord/issues/22#issuecomment-82"
-
- .line 4
- invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
diff --git a/patches/branding/README.md b/patches/branding/README.md
index e1bb964..cd3518d 100644
--- a/patches/branding/README.md
+++ b/patches/branding/README.md
@@ -115,31 +115,21 @@ You can use the following line to patch authorities:
- 16
- 17.0
- 18.0-alpha1
-- 18.0-alpha9
-- 18.0-alpha11
-- 18.0-alpha12-alpha1
+- 18.0-alpha9-alpha1
+- 16
+- 17.0
+- 18.0-alpha1
+- 18.0-alpha9-alpha4
+- 16
+- 17.0
+- 18.0-alpha1
+- 18.0-alpha9-alpha6
+- 16
+- 17.0
+- 18.0-alpha1
+- 18.0-alpha9-alpha7
- 16
- 17.0
- 18.0-alpha1
- 18.0-alpha9
-- 18.0-alpha11
-- 18.0-alpha12-alpha4
-- 16
-- 17.0
-- 18.0-alpha1
-- 18.0-alpha9
-- 18.0-alpha11
-- 18.0-alpha12-alpha6
-- 16
-- 17.0
-- 18.0-alpha1
-- 18.0-alpha9
-- 18.0-alpha11
-- 18.0-alpha12-alpha7
-- 16
-- 17.0
-- 18.0-alpha1
-- 18.0-alpha9
-- 18.0-alpha11
-- 18.0-alpha12
diff --git a/patches/customtheme/1103.patch b/patches/customtheme/1103.patch
deleted file mode 100644
index 7398f65..0000000
--- a/patches/customtheme/1103.patch
+++ /dev/null
@@ -1,306 +0,0 @@
-diff -crB from/res/drawable/drawable_overlay_channels_active_dark.xml to/res/drawable/drawable_overlay_channels_active_dark.xml
-*** from/res/drawable/drawable_overlay_channels_active_dark.xml 2020-04-17 13:03:24.199048742 +0100
---- to/res/drawable/drawable_overlay_channels_active_dark.xml 2020-04-17 13:04:19.996521837 +0100
-***************
-*** 3,9 ****
- xmlns:android="http://schemas.android.com/apk/res/android">
- -
-
-!
-
-
-
---- 3,9 ----
- xmlns:android="http://schemas.android.com/apk/res/android">
- -
-
-!
-
-
-
-diff -crB from/res/values/colors.xml to/res/values/colors.xml
-*** from/res/values/colors.xml 2020-04-17 13:03:25.057040519 +0100
---- to/res/values/colors.xml 2020-04-17 13:04:19.998521818 +0100
-***************
-*** 103,112 ****
- #1f000000
- #90000000
- #de000000
-! #ff36393e
-! #ff303337
- #14000000
-! #ff121212
- #ffcf6679
- #ffffffff
- #ff000000
---- 103,112 ----
- #1f000000
- #90000000
- #de000000
-! #ff000000
-! #ff000000
- #14000000
-! #ff000000
- #ffcf6679
- #ffffffff
- #ff000000
-***************
-*** 118,124 ****
- #ff3700b3
- #ff03dac6
- #ff03dac6
-! #ff121212
- #ffffffff
- #ffb00020
- #ff000000
---- 118,124 ----
- #ff3700b3
- #ff03dac6
- #ff03dac6
-! #ff000000
- #ffffffff
- #ffb00020
- #ff000000
-***************
-*** 163,170 ****
- #4d737f8d
- #ff949494
- #0d4f545c
-! #ff282b30
-! #ff8a8e94
- #6680cbc4
- #66009688
- #ff9c84ef
---- 163,170 ----
- #4d737f8d
- #ff949494
- #0d4f545c
-! #ff000000
-! #ff000000
- #6680cbc4
- #66009688
- #ff9c84ef
-***************
-*** 174,180 ****
- #ff45ddc0
- #ff45ddc0
- #ff021f25
-! #ff00b0f4
- #fff2fbfe
- #ffe8f8fe
- #ffdaf4fd
---- 174,180 ----
- #ff45ddc0
- #ff45ddc0
- #ff021f25
-! #ff50f148
- #fff2fbfe
- #ffe8f8fe
- #ffdaf4fd
-***************
-*** 262,281 ****
- #ff72767d
- #4d72767d
- #9972767d
-! #ff4f545c
-! #334f545c
-! #4d4f545c
-! #514f545c
-! #994f545c
- #ff40444b
-! #ff36393f
-! #9936393f
-! #ff2f3136
-! #992f3136
-! #e62f3136
-! #ff292b2f
-! #ff202225
-! #99202225
- #ff18191c
- #9918191c
- #e618191c
---- 262,281 ----
- #ff72767d
- #4d72767d
- #9972767d
-! #ff333333
-! #330f0f0f
-! #4d0f0f0f
-! #510f0f0f
-! #990f0f0f
- #ff40444b
-! #ff000000
-! #99000000
-! #ff000000
-! #99000000
-! #e6000000
-! #ff000000
-! #ff000000
-! #990f0f0f
- #ff18191c
- #9918191c
- #e618191c
-***************
-*** 298,307 ****
- #ff4f545c
- #ff484c54
- #ff40444b
-! #ff36393f
-! #ff2f3136
- #ff292b2f
-! #ff202225
- #ff1e1f22
- #ff1b1d20
- #ff18191c
---- 298,307 ----
- #ff4f545c
- #ff484c54
- #ff40444b
-! #ff000000
-! #ff000000
- #ff292b2f
-! #ff000000
- #ff1e1f22
- #ff1b1d20
- #ff18191c
-***************
-*** 346,354 ****
- #de000000
- #4dffffff
- #39000000
-! #ff738bd7
-! #1a738bd7
-! #ff697ec4
- #ffc9d2f0
- #ff5161ff
- #4d5c6a9e
---- 346,354 ----
- #de000000
- #4dffffff
- #39000000
-! #ff9c4249
-! #1a9c4249
-! #ff000000
- #ffc9d2f0
- #ff5161ff
- #4d5c6a9e
-***************
-*** 487,493 ****
- #ffbdbdbd
- #ffbdbdbd
- #fff1f1f1
-! #e6616161
- #e6ffffff
- @android:color/transparent
- #ff593695
---- 487,493 ----
- #ffbdbdbd
- #ffbdbdbd
- #fff1f1f1
-! #e6000000
- #e6ffffff
- @android:color/transparent
- #ff593695
-diff -crB from/res/values/styles.xml to/res/values/styles.xml
-*** from/res/values/styles.xml 2020-04-17 13:03:25.037040710 +0100
---- to/res/values/styles.xml 2020-04-17 13:04:19.998521818 +0100
-***************
-*** 387,393 ****
- - @color/white_alpha_40
- - @drawable/ic_backspace_white_24dp
- - @color/primary_500
-! - #ff34373c
- - @color/grey_unread
- - @color/primary_630
- - @color/grey_account
---- 387,393 ----
- - @color/white_alpha_40
- - @drawable/ic_backspace_white_24dp
- - @color/primary_500
-! - @color/primary_500
- - @color/grey_unread
- - @color/primary_630
- - @color/grey_account
-***************
-*** 399,411 ****
- - @color/chat_input_button_tint_colors_dark
- - @drawable/drawable_rect_rounded_dark
- - @color/dark_grey_2_alpha_10
-! - #ff3e4145
- - @drawable/ic_img_selected_dark_theme
- - @color/white
-! - #1afaa61a
- - @drawable/drawable_bg_reaction_dark
- - @drawable/drawable_reaction_text_color_dark
-! - @color/primary_700
- - @color/white_alpha_10
- - @color/primary_600
- - @drawable/ic_emoji_activity_dark
---- 399,411 ----
- - @color/chat_input_button_tint_colors_dark
- - @drawable/drawable_rect_rounded_dark
- - @color/dark_grey_2_alpha_10
-! - @color/primary_600
- - @drawable/ic_img_selected_dark_theme
- - @color/white
-! - @color/purple_brand_alpha_10
- - @drawable/drawable_bg_reaction_dark
- - @drawable/drawable_reaction_text_color_dark
-! - @color/primary_500
- - @color/white_alpha_10
- - @color/primary_600
- - @drawable/ic_emoji_activity_dark
-***************
-*** 819,825 ****
- - @color/brand_500
- - @color/primary_100
- - @color/primary_600
-! - #ff2b2e31
-
-
-
-
-
-
-
-
-
-
-
-
-