diff --git a/com.discord/apktool.yml b/com.discord/apktool.yml
index 4b44d1bc52..bc5330b60d 100644
--- a/com.discord/apktool.yml
+++ b/com.discord/apktool.yml
@@ -1,5 +1,5 @@
!!brut.androlib.meta.MetaInfo
-apkFileName: com.discord-1198.apk
+apkFileName: com.discord-1199.apk
compressionType: false
doNotCompress:
- resources.arsc
@@ -3224,5 +3224,5 @@ usesFramework:
tag: null
version: 2.4.2-83a459-SNAPSHOT
versionInfo:
- versionCode: '1198'
- versionName: 32-alpha1
+ versionCode: '1199'
+ versionName: '31.1'
diff --git a/com.discord/lib/arm64-v8a/libapng-drawable.so b/com.discord/lib/arm64-v8a/libapng-drawable.so
index 98396ae1e7..8892feb3a2 100644
Binary files a/com.discord/lib/arm64-v8a/libapng-drawable.so and b/com.discord/lib/arm64-v8a/libapng-drawable.so differ
diff --git a/com.discord/lib/arm64-v8a/libcamerakit-core.so b/com.discord/lib/arm64-v8a/libcamerakit-core.so
index 761c8078c4..5ae880a1ee 100644
Binary files a/com.discord/lib/arm64-v8a/libcamerakit-core.so and b/com.discord/lib/arm64-v8a/libcamerakit-core.so differ
diff --git a/com.discord/lib/arm64-v8a/libcamerakit.so b/com.discord/lib/arm64-v8a/libcamerakit.so
index 328511044a..aeee71daf5 100644
Binary files a/com.discord/lib/arm64-v8a/libcamerakit.so and b/com.discord/lib/arm64-v8a/libcamerakit.so differ
diff --git a/com.discord/lib/arm64-v8a/libcrashlytics.so b/com.discord/lib/arm64-v8a/libcrashlytics.so
index c548d250e1..5e3b2d8318 100644
Binary files a/com.discord/lib/arm64-v8a/libcrashlytics.so and b/com.discord/lib/arm64-v8a/libcrashlytics.so differ
diff --git a/com.discord/lib/arm64-v8a/libdiscord.so b/com.discord/lib/arm64-v8a/libdiscord.so
index aba58dd734..111c94a72b 100644
Binary files a/com.discord/lib/arm64-v8a/libdiscord.so and b/com.discord/lib/arm64-v8a/libdiscord.so differ
diff --git a/com.discord/lib/arm64-v8a/libdsti.so b/com.discord/lib/arm64-v8a/libdsti.so
index 688918d068..4aa2bf1021 100644
Binary files a/com.discord/lib/arm64-v8a/libdsti.so and b/com.discord/lib/arm64-v8a/libdsti.so differ
diff --git a/com.discord/lib/arm64-v8a/libgifimage.so b/com.discord/lib/arm64-v8a/libgifimage.so
index 723839b14b..f0c4d805e9 100644
Binary files a/com.discord/lib/arm64-v8a/libgifimage.so and b/com.discord/lib/arm64-v8a/libgifimage.so differ
diff --git a/com.discord/lib/arm64-v8a/libimagepipeline.so b/com.discord/lib/arm64-v8a/libimagepipeline.so
index b17f43acf4..d4e9749902 100644
Binary files a/com.discord/lib/arm64-v8a/libimagepipeline.so and b/com.discord/lib/arm64-v8a/libimagepipeline.so differ
diff --git a/com.discord/lib/arm64-v8a/libjpegkit.so b/com.discord/lib/arm64-v8a/libjpegkit.so
index 3fb001d1c6..c60ce0224a 100644
Binary files a/com.discord/lib/arm64-v8a/libjpegkit.so and b/com.discord/lib/arm64-v8a/libjpegkit.so differ
diff --git a/com.discord/lib/arm64-v8a/libkrisp_wrapper.so b/com.discord/lib/arm64-v8a/libkrisp_wrapper.so
index b3d8944f57..13b9944272 100644
Binary files a/com.discord/lib/arm64-v8a/libkrisp_wrapper.so and b/com.discord/lib/arm64-v8a/libkrisp_wrapper.so differ
diff --git a/com.discord/lib/arm64-v8a/libnative-filters.so b/com.discord/lib/arm64-v8a/libnative-filters.so
index 3515677853..1a08886e17 100644
Binary files a/com.discord/lib/arm64-v8a/libnative-filters.so and b/com.discord/lib/arm64-v8a/libnative-filters.so differ
diff --git a/com.discord/lib/arm64-v8a/libnative-imagetranscoder.so b/com.discord/lib/arm64-v8a/libnative-imagetranscoder.so
index 1e9b019b23..5591268202 100644
Binary files a/com.discord/lib/arm64-v8a/libnative-imagetranscoder.so and b/com.discord/lib/arm64-v8a/libnative-imagetranscoder.so differ
diff --git a/com.discord/lib/arm64-v8a/libstatic-webp.so b/com.discord/lib/arm64-v8a/libstatic-webp.so
index 95d53cce04..62a0b7c57f 100644
Binary files a/com.discord/lib/arm64-v8a/libstatic-webp.so and b/com.discord/lib/arm64-v8a/libstatic-webp.so differ
diff --git a/com.discord/lib/armeabi-v7a/libapng-drawable.so b/com.discord/lib/armeabi-v7a/libapng-drawable.so
index 0fb80581b8..f054f4f7ae 100644
Binary files a/com.discord/lib/armeabi-v7a/libapng-drawable.so and b/com.discord/lib/armeabi-v7a/libapng-drawable.so differ
diff --git a/com.discord/lib/armeabi-v7a/libcamerakit-core.so b/com.discord/lib/armeabi-v7a/libcamerakit-core.so
index 29945b4338..9c04c47512 100644
Binary files a/com.discord/lib/armeabi-v7a/libcamerakit-core.so and b/com.discord/lib/armeabi-v7a/libcamerakit-core.so differ
diff --git a/com.discord/lib/armeabi-v7a/libcamerakit.so b/com.discord/lib/armeabi-v7a/libcamerakit.so
index 6aaa0beb23..08f3d27aa9 100644
Binary files a/com.discord/lib/armeabi-v7a/libcamerakit.so and b/com.discord/lib/armeabi-v7a/libcamerakit.so differ
diff --git a/com.discord/lib/armeabi-v7a/libcrashlytics.so b/com.discord/lib/armeabi-v7a/libcrashlytics.so
index 212bf6f775..74cc296b5d 100644
Binary files a/com.discord/lib/armeabi-v7a/libcrashlytics.so and b/com.discord/lib/armeabi-v7a/libcrashlytics.so differ
diff --git a/com.discord/lib/armeabi-v7a/libdiscord.so b/com.discord/lib/armeabi-v7a/libdiscord.so
index 13abbaa46a..cf67436fd4 100644
Binary files a/com.discord/lib/armeabi-v7a/libdiscord.so and b/com.discord/lib/armeabi-v7a/libdiscord.so differ
diff --git a/com.discord/lib/armeabi-v7a/libdsti.so b/com.discord/lib/armeabi-v7a/libdsti.so
index 81c4897a99..25a79301bc 100644
Binary files a/com.discord/lib/armeabi-v7a/libdsti.so and b/com.discord/lib/armeabi-v7a/libdsti.so differ
diff --git a/com.discord/lib/armeabi-v7a/libgifimage.so b/com.discord/lib/armeabi-v7a/libgifimage.so
index 0c1492f2fb..c88fb200bd 100644
Binary files a/com.discord/lib/armeabi-v7a/libgifimage.so and b/com.discord/lib/armeabi-v7a/libgifimage.so differ
diff --git a/com.discord/lib/armeabi-v7a/libimagepipeline.so b/com.discord/lib/armeabi-v7a/libimagepipeline.so
index bd0f99cae5..92ffb10e45 100644
Binary files a/com.discord/lib/armeabi-v7a/libimagepipeline.so and b/com.discord/lib/armeabi-v7a/libimagepipeline.so differ
diff --git a/com.discord/lib/armeabi-v7a/libjpegkit.so b/com.discord/lib/armeabi-v7a/libjpegkit.so
index 99b0b3b7a9..0209e6a65b 100644
Binary files a/com.discord/lib/armeabi-v7a/libjpegkit.so and b/com.discord/lib/armeabi-v7a/libjpegkit.so differ
diff --git a/com.discord/lib/armeabi-v7a/libkrisp_wrapper.so b/com.discord/lib/armeabi-v7a/libkrisp_wrapper.so
index d6fac4ee83..a861f7beb3 100644
Binary files a/com.discord/lib/armeabi-v7a/libkrisp_wrapper.so and b/com.discord/lib/armeabi-v7a/libkrisp_wrapper.so differ
diff --git a/com.discord/lib/armeabi-v7a/libnative-filters.so b/com.discord/lib/armeabi-v7a/libnative-filters.so
index cf3af6af61..92df8793e5 100644
Binary files a/com.discord/lib/armeabi-v7a/libnative-filters.so and b/com.discord/lib/armeabi-v7a/libnative-filters.so differ
diff --git a/com.discord/lib/armeabi-v7a/libnative-imagetranscoder.so b/com.discord/lib/armeabi-v7a/libnative-imagetranscoder.so
index 1a5a582257..d7b1a349d4 100644
Binary files a/com.discord/lib/armeabi-v7a/libnative-imagetranscoder.so and b/com.discord/lib/armeabi-v7a/libnative-imagetranscoder.so differ
diff --git a/com.discord/lib/armeabi-v7a/libstatic-webp.so b/com.discord/lib/armeabi-v7a/libstatic-webp.so
index 920aadb059..9b97fcad2f 100644
Binary files a/com.discord/lib/armeabi-v7a/libstatic-webp.so and b/com.discord/lib/armeabi-v7a/libstatic-webp.so differ
diff --git a/com.discord/lib/x86/libapng-drawable.so b/com.discord/lib/x86/libapng-drawable.so
index 88fc19d3bc..f4bae23c0b 100644
Binary files a/com.discord/lib/x86/libapng-drawable.so and b/com.discord/lib/x86/libapng-drawable.so differ
diff --git a/com.discord/lib/x86/libcamerakit-core.so b/com.discord/lib/x86/libcamerakit-core.so
index 33da361eb4..c24bda24d6 100644
Binary files a/com.discord/lib/x86/libcamerakit-core.so and b/com.discord/lib/x86/libcamerakit-core.so differ
diff --git a/com.discord/lib/x86/libcamerakit.so b/com.discord/lib/x86/libcamerakit.so
index edafc25b7c..3d6d5be11b 100644
Binary files a/com.discord/lib/x86/libcamerakit.so and b/com.discord/lib/x86/libcamerakit.so differ
diff --git a/com.discord/lib/x86/libcrashlytics.so b/com.discord/lib/x86/libcrashlytics.so
index b705af3bf6..a0fe9a8057 100644
Binary files a/com.discord/lib/x86/libcrashlytics.so and b/com.discord/lib/x86/libcrashlytics.so differ
diff --git a/com.discord/lib/x86/libdiscord.so b/com.discord/lib/x86/libdiscord.so
index f0fcd7ebbd..98d5b5a87f 100644
Binary files a/com.discord/lib/x86/libdiscord.so and b/com.discord/lib/x86/libdiscord.so differ
diff --git a/com.discord/lib/x86/libdsti.so b/com.discord/lib/x86/libdsti.so
index 78574a5ffb..a132dbd339 100644
Binary files a/com.discord/lib/x86/libdsti.so and b/com.discord/lib/x86/libdsti.so differ
diff --git a/com.discord/lib/x86/libgifimage.so b/com.discord/lib/x86/libgifimage.so
index 7cd7670a8b..813977f198 100644
Binary files a/com.discord/lib/x86/libgifimage.so and b/com.discord/lib/x86/libgifimage.so differ
diff --git a/com.discord/lib/x86/libimagepipeline.so b/com.discord/lib/x86/libimagepipeline.so
index e3ea382644..5b452f11d4 100644
Binary files a/com.discord/lib/x86/libimagepipeline.so and b/com.discord/lib/x86/libimagepipeline.so differ
diff --git a/com.discord/lib/x86/libjpegkit.so b/com.discord/lib/x86/libjpegkit.so
index b15a09795f..f93283f18d 100644
Binary files a/com.discord/lib/x86/libjpegkit.so and b/com.discord/lib/x86/libjpegkit.so differ
diff --git a/com.discord/lib/x86/libkrisp_wrapper.so b/com.discord/lib/x86/libkrisp_wrapper.so
index 144d8a6e50..56233cb40d 100644
Binary files a/com.discord/lib/x86/libkrisp_wrapper.so and b/com.discord/lib/x86/libkrisp_wrapper.so differ
diff --git a/com.discord/lib/x86/libnative-filters.so b/com.discord/lib/x86/libnative-filters.so
index bb6b32dc58..c0862d1bee 100644
Binary files a/com.discord/lib/x86/libnative-filters.so and b/com.discord/lib/x86/libnative-filters.so differ
diff --git a/com.discord/lib/x86/libnative-imagetranscoder.so b/com.discord/lib/x86/libnative-imagetranscoder.so
index 9548368868..df45b1db25 100644
Binary files a/com.discord/lib/x86/libnative-imagetranscoder.so and b/com.discord/lib/x86/libnative-imagetranscoder.so differ
diff --git a/com.discord/lib/x86/libstatic-webp.so b/com.discord/lib/x86/libstatic-webp.so
index 16227df791..ab88bb8594 100644
Binary files a/com.discord/lib/x86/libstatic-webp.so and b/com.discord/lib/x86/libstatic-webp.so differ
diff --git a/com.discord/lib/x86_64/libapng-drawable.so b/com.discord/lib/x86_64/libapng-drawable.so
index 8e71e26577..a90d0b6777 100644
Binary files a/com.discord/lib/x86_64/libapng-drawable.so and b/com.discord/lib/x86_64/libapng-drawable.so differ
diff --git a/com.discord/lib/x86_64/libcamerakit-core.so b/com.discord/lib/x86_64/libcamerakit-core.so
index 4eff6d81c8..86da00b58e 100644
Binary files a/com.discord/lib/x86_64/libcamerakit-core.so and b/com.discord/lib/x86_64/libcamerakit-core.so differ
diff --git a/com.discord/lib/x86_64/libcamerakit.so b/com.discord/lib/x86_64/libcamerakit.so
index a8e6552184..de823c7e5a 100644
Binary files a/com.discord/lib/x86_64/libcamerakit.so and b/com.discord/lib/x86_64/libcamerakit.so differ
diff --git a/com.discord/lib/x86_64/libcrashlytics.so b/com.discord/lib/x86_64/libcrashlytics.so
index cafbb75321..bfda14d6e3 100644
Binary files a/com.discord/lib/x86_64/libcrashlytics.so and b/com.discord/lib/x86_64/libcrashlytics.so differ
diff --git a/com.discord/lib/x86_64/libdiscord.so b/com.discord/lib/x86_64/libdiscord.so
index 1012d30460..f943a7fd02 100644
Binary files a/com.discord/lib/x86_64/libdiscord.so and b/com.discord/lib/x86_64/libdiscord.so differ
diff --git a/com.discord/lib/x86_64/libdsti.so b/com.discord/lib/x86_64/libdsti.so
index 3173017e36..0fd01175b1 100644
Binary files a/com.discord/lib/x86_64/libdsti.so and b/com.discord/lib/x86_64/libdsti.so differ
diff --git a/com.discord/lib/x86_64/libgifimage.so b/com.discord/lib/x86_64/libgifimage.so
index da7c61148f..b70ef7ab38 100644
Binary files a/com.discord/lib/x86_64/libgifimage.so and b/com.discord/lib/x86_64/libgifimage.so differ
diff --git a/com.discord/lib/x86_64/libimagepipeline.so b/com.discord/lib/x86_64/libimagepipeline.so
index d57aa7b0d0..eab5a6b53d 100644
Binary files a/com.discord/lib/x86_64/libimagepipeline.so and b/com.discord/lib/x86_64/libimagepipeline.so differ
diff --git a/com.discord/lib/x86_64/libjpegkit.so b/com.discord/lib/x86_64/libjpegkit.so
index fec8f1ddc1..445f6329f4 100644
Binary files a/com.discord/lib/x86_64/libjpegkit.so and b/com.discord/lib/x86_64/libjpegkit.so differ
diff --git a/com.discord/lib/x86_64/libkrisp_wrapper.so b/com.discord/lib/x86_64/libkrisp_wrapper.so
index 7d724cda82..b3c5c44507 100644
Binary files a/com.discord/lib/x86_64/libkrisp_wrapper.so and b/com.discord/lib/x86_64/libkrisp_wrapper.so differ
diff --git a/com.discord/lib/x86_64/libnative-filters.so b/com.discord/lib/x86_64/libnative-filters.so
index 8e50401a0a..35d563f1ba 100644
Binary files a/com.discord/lib/x86_64/libnative-filters.so and b/com.discord/lib/x86_64/libnative-filters.so differ
diff --git a/com.discord/lib/x86_64/libnative-imagetranscoder.so b/com.discord/lib/x86_64/libnative-imagetranscoder.so
index 162ff1bdf2..f2a9414b3e 100644
Binary files a/com.discord/lib/x86_64/libnative-imagetranscoder.so and b/com.discord/lib/x86_64/libnative-imagetranscoder.so differ
diff --git a/com.discord/lib/x86_64/libstatic-webp.so b/com.discord/lib/x86_64/libstatic-webp.so
index 9d73d5f42c..77db4048b4 100644
Binary files a/com.discord/lib/x86_64/libstatic-webp.so and b/com.discord/lib/x86_64/libstatic-webp.so differ
diff --git a/com.discord/original/AndroidManifest.xml b/com.discord/original/AndroidManifest.xml
index 9e5fabae29..dbe70e7f67 100644
Binary files a/com.discord/original/AndroidManifest.xml and b/com.discord/original/AndroidManifest.xml differ
diff --git a/com.discord/res/drawable-xhdpi/emoji_activity_color.png b/com.discord/res/drawable-xhdpi/emoji_activity_color.png
new file mode 100644
index 0000000000..096fc27fb7
Binary files /dev/null and b/com.discord/res/drawable-xhdpi/emoji_activity_color.png differ
diff --git a/com.discord/res/drawable-xhdpi/emoji_activity_dark.png b/com.discord/res/drawable-xhdpi/emoji_activity_dark.png
new file mode 100644
index 0000000000..f1a957b742
Binary files /dev/null and b/com.discord/res/drawable-xhdpi/emoji_activity_dark.png differ
diff --git a/com.discord/res/drawable-xhdpi/emoji_activity_light.png b/com.discord/res/drawable-xhdpi/emoji_activity_light.png
new file mode 100644
index 0000000000..7715938f6d
Binary files /dev/null and b/com.discord/res/drawable-xhdpi/emoji_activity_light.png differ
diff --git a/com.discord/res/drawable-xhdpi/emoji_custom_color.png b/com.discord/res/drawable-xhdpi/emoji_custom_color.png
new file mode 100644
index 0000000000..34e7333ef5
Binary files /dev/null and b/com.discord/res/drawable-xhdpi/emoji_custom_color.png differ
diff --git a/com.discord/res/drawable-xhdpi/emoji_custom_dark.png b/com.discord/res/drawable-xhdpi/emoji_custom_dark.png
new file mode 100644
index 0000000000..44b8f0f358
Binary files /dev/null and b/com.discord/res/drawable-xhdpi/emoji_custom_dark.png differ
diff --git a/com.discord/res/drawable-xhdpi/emoji_custom_light.png b/com.discord/res/drawable-xhdpi/emoji_custom_light.png
new file mode 100644
index 0000000000..a1fd5a140f
Binary files /dev/null and b/com.discord/res/drawable-xhdpi/emoji_custom_light.png differ
diff --git a/com.discord/res/drawable-xhdpi/emoji_flags_color.png b/com.discord/res/drawable-xhdpi/emoji_flags_color.png
new file mode 100644
index 0000000000..31a9adb5c8
Binary files /dev/null and b/com.discord/res/drawable-xhdpi/emoji_flags_color.png differ
diff --git a/com.discord/res/drawable-xhdpi/emoji_flags_dark.png b/com.discord/res/drawable-xhdpi/emoji_flags_dark.png
new file mode 100644
index 0000000000..15e60f766d
Binary files /dev/null and b/com.discord/res/drawable-xhdpi/emoji_flags_dark.png differ
diff --git a/com.discord/res/drawable-xhdpi/emoji_flags_light.png b/com.discord/res/drawable-xhdpi/emoji_flags_light.png
new file mode 100644
index 0000000000..24e865fc62
Binary files /dev/null and b/com.discord/res/drawable-xhdpi/emoji_flags_light.png differ
diff --git a/com.discord/res/drawable-xhdpi/emoji_food_color.png b/com.discord/res/drawable-xhdpi/emoji_food_color.png
new file mode 100644
index 0000000000..23cd2c231e
Binary files /dev/null and b/com.discord/res/drawable-xhdpi/emoji_food_color.png differ
diff --git a/com.discord/res/drawable-xhdpi/emoji_food_dark.png b/com.discord/res/drawable-xhdpi/emoji_food_dark.png
new file mode 100644
index 0000000000..866e17f216
Binary files /dev/null and b/com.discord/res/drawable-xhdpi/emoji_food_dark.png differ
diff --git a/com.discord/res/drawable-xhdpi/emoji_food_light.png b/com.discord/res/drawable-xhdpi/emoji_food_light.png
new file mode 100644
index 0000000000..0f462d88ab
Binary files /dev/null and b/com.discord/res/drawable-xhdpi/emoji_food_light.png differ
diff --git a/com.discord/res/drawable-xhdpi/emoji_nature_color.png b/com.discord/res/drawable-xhdpi/emoji_nature_color.png
new file mode 100644
index 0000000000..dba53de52c
Binary files /dev/null and b/com.discord/res/drawable-xhdpi/emoji_nature_color.png differ
diff --git a/com.discord/res/drawable-xhdpi/emoji_nature_dark.png b/com.discord/res/drawable-xhdpi/emoji_nature_dark.png
new file mode 100644
index 0000000000..c19a273757
Binary files /dev/null and b/com.discord/res/drawable-xhdpi/emoji_nature_dark.png differ
diff --git a/com.discord/res/drawable-xhdpi/emoji_nature_light.png b/com.discord/res/drawable-xhdpi/emoji_nature_light.png
new file mode 100644
index 0000000000..28431a9015
Binary files /dev/null and b/com.discord/res/drawable-xhdpi/emoji_nature_light.png differ
diff --git a/com.discord/res/drawable-xhdpi/emoji_object_color.png b/com.discord/res/drawable-xhdpi/emoji_object_color.png
new file mode 100644
index 0000000000..e18a969b69
Binary files /dev/null and b/com.discord/res/drawable-xhdpi/emoji_object_color.png differ
diff --git a/com.discord/res/drawable-xhdpi/emoji_object_dark.png b/com.discord/res/drawable-xhdpi/emoji_object_dark.png
new file mode 100644
index 0000000000..5c081dbec1
Binary files /dev/null and b/com.discord/res/drawable-xhdpi/emoji_object_dark.png differ
diff --git a/com.discord/res/drawable-xhdpi/emoji_object_light.png b/com.discord/res/drawable-xhdpi/emoji_object_light.png
new file mode 100644
index 0000000000..2e607bad96
Binary files /dev/null and b/com.discord/res/drawable-xhdpi/emoji_object_light.png differ
diff --git a/com.discord/res/drawable-xhdpi/emoji_people_color.png b/com.discord/res/drawable-xhdpi/emoji_people_color.png
new file mode 100644
index 0000000000..b00942d283
Binary files /dev/null and b/com.discord/res/drawable-xhdpi/emoji_people_color.png differ
diff --git a/com.discord/res/drawable-xhdpi/emoji_people_dark.png b/com.discord/res/drawable-xhdpi/emoji_people_dark.png
new file mode 100644
index 0000000000..deef6ad536
Binary files /dev/null and b/com.discord/res/drawable-xhdpi/emoji_people_dark.png differ
diff --git a/com.discord/res/drawable-xhdpi/emoji_people_light.png b/com.discord/res/drawable-xhdpi/emoji_people_light.png
new file mode 100644
index 0000000000..d06249c7c6
Binary files /dev/null and b/com.discord/res/drawable-xhdpi/emoji_people_light.png differ
diff --git a/com.discord/res/drawable-xhdpi/emoji_recent_color.png b/com.discord/res/drawable-xhdpi/emoji_recent_color.png
new file mode 100644
index 0000000000..3ebb61c532
Binary files /dev/null and b/com.discord/res/drawable-xhdpi/emoji_recent_color.png differ
diff --git a/com.discord/res/drawable-xhdpi/emoji_recent_dark.png b/com.discord/res/drawable-xhdpi/emoji_recent_dark.png
new file mode 100644
index 0000000000..90165a0b17
Binary files /dev/null and b/com.discord/res/drawable-xhdpi/emoji_recent_dark.png differ
diff --git a/com.discord/res/drawable-xhdpi/emoji_recent_light.png b/com.discord/res/drawable-xhdpi/emoji_recent_light.png
new file mode 100644
index 0000000000..3a9fdd7e05
Binary files /dev/null and b/com.discord/res/drawable-xhdpi/emoji_recent_light.png differ
diff --git a/com.discord/res/drawable-xhdpi/emoji_symbol_color.png b/com.discord/res/drawable-xhdpi/emoji_symbol_color.png
new file mode 100644
index 0000000000..b72a493342
Binary files /dev/null and b/com.discord/res/drawable-xhdpi/emoji_symbol_color.png differ
diff --git a/com.discord/res/drawable-xhdpi/emoji_symbol_dark.png b/com.discord/res/drawable-xhdpi/emoji_symbol_dark.png
new file mode 100644
index 0000000000..dbd157edb7
Binary files /dev/null and b/com.discord/res/drawable-xhdpi/emoji_symbol_dark.png differ
diff --git a/com.discord/res/drawable-xhdpi/emoji_symbol_light.png b/com.discord/res/drawable-xhdpi/emoji_symbol_light.png
new file mode 100644
index 0000000000..074930a8d6
Binary files /dev/null and b/com.discord/res/drawable-xhdpi/emoji_symbol_light.png differ
diff --git a/com.discord/res/drawable-xhdpi/emoji_travel_color.png b/com.discord/res/drawable-xhdpi/emoji_travel_color.png
new file mode 100644
index 0000000000..87e4ffb06b
Binary files /dev/null and b/com.discord/res/drawable-xhdpi/emoji_travel_color.png differ
diff --git a/com.discord/res/drawable-xhdpi/emoji_travel_dark.png b/com.discord/res/drawable-xhdpi/emoji_travel_dark.png
new file mode 100644
index 0000000000..15ad731f4b
Binary files /dev/null and b/com.discord/res/drawable-xhdpi/emoji_travel_dark.png differ
diff --git a/com.discord/res/drawable-xhdpi/emoji_travel_light.png b/com.discord/res/drawable-xhdpi/emoji_travel_light.png
new file mode 100644
index 0000000000..3a895a60ec
Binary files /dev/null and b/com.discord/res/drawable-xhdpi/emoji_travel_light.png differ
diff --git a/com.discord/res/drawable-xxhdpi/emoji_activity_color.png b/com.discord/res/drawable-xxhdpi/emoji_activity_color.png
new file mode 100644
index 0000000000..a519f9f18f
Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/emoji_activity_color.png differ
diff --git a/com.discord/res/drawable-xxhdpi/emoji_activity_dark.png b/com.discord/res/drawable-xxhdpi/emoji_activity_dark.png
new file mode 100644
index 0000000000..fad297822a
Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/emoji_activity_dark.png differ
diff --git a/com.discord/res/drawable-xxhdpi/emoji_activity_light.png b/com.discord/res/drawable-xxhdpi/emoji_activity_light.png
new file mode 100644
index 0000000000..d80b47575b
Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/emoji_activity_light.png differ
diff --git a/com.discord/res/drawable-xxhdpi/emoji_custom_color.png b/com.discord/res/drawable-xxhdpi/emoji_custom_color.png
new file mode 100644
index 0000000000..80807dc2e3
Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/emoji_custom_color.png differ
diff --git a/com.discord/res/drawable-xxhdpi/emoji_custom_dark.png b/com.discord/res/drawable-xxhdpi/emoji_custom_dark.png
new file mode 100644
index 0000000000..470f3a5187
Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/emoji_custom_dark.png differ
diff --git a/com.discord/res/drawable-xxhdpi/emoji_custom_light.png b/com.discord/res/drawable-xxhdpi/emoji_custom_light.png
new file mode 100644
index 0000000000..2f4a77e2ef
Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/emoji_custom_light.png differ
diff --git a/com.discord/res/drawable-xxhdpi/emoji_flags_color.png b/com.discord/res/drawable-xxhdpi/emoji_flags_color.png
new file mode 100644
index 0000000000..994c8c1012
Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/emoji_flags_color.png differ
diff --git a/com.discord/res/drawable-xxhdpi/emoji_flags_dark.png b/com.discord/res/drawable-xxhdpi/emoji_flags_dark.png
new file mode 100644
index 0000000000..33de28ad48
Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/emoji_flags_dark.png differ
diff --git a/com.discord/res/drawable-xxhdpi/emoji_flags_light.png b/com.discord/res/drawable-xxhdpi/emoji_flags_light.png
new file mode 100644
index 0000000000..7152bae0df
Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/emoji_flags_light.png differ
diff --git a/com.discord/res/drawable-xxhdpi/emoji_food_color.png b/com.discord/res/drawable-xxhdpi/emoji_food_color.png
new file mode 100644
index 0000000000..6ab97554c6
Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/emoji_food_color.png differ
diff --git a/com.discord/res/drawable-xxhdpi/emoji_food_dark.png b/com.discord/res/drawable-xxhdpi/emoji_food_dark.png
new file mode 100644
index 0000000000..8025c52e46
Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/emoji_food_dark.png differ
diff --git a/com.discord/res/drawable-xxhdpi/emoji_food_light.png b/com.discord/res/drawable-xxhdpi/emoji_food_light.png
new file mode 100644
index 0000000000..d3e3729170
Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/emoji_food_light.png differ
diff --git a/com.discord/res/drawable-xxhdpi/emoji_nature_color.png b/com.discord/res/drawable-xxhdpi/emoji_nature_color.png
new file mode 100644
index 0000000000..d797a41e49
Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/emoji_nature_color.png differ
diff --git a/com.discord/res/drawable-xxhdpi/emoji_nature_dark.png b/com.discord/res/drawable-xxhdpi/emoji_nature_dark.png
new file mode 100644
index 0000000000..48c5d111e9
Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/emoji_nature_dark.png differ
diff --git a/com.discord/res/drawable-xxhdpi/emoji_nature_light.png b/com.discord/res/drawable-xxhdpi/emoji_nature_light.png
new file mode 100644
index 0000000000..cc54cf52f0
Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/emoji_nature_light.png differ
diff --git a/com.discord/res/drawable-xxhdpi/emoji_object_color.png b/com.discord/res/drawable-xxhdpi/emoji_object_color.png
new file mode 100644
index 0000000000..00f23babbd
Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/emoji_object_color.png differ
diff --git a/com.discord/res/drawable-xxhdpi/emoji_object_dark.png b/com.discord/res/drawable-xxhdpi/emoji_object_dark.png
new file mode 100644
index 0000000000..c2acfc5774
Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/emoji_object_dark.png differ
diff --git a/com.discord/res/drawable-xxhdpi/emoji_object_light.png b/com.discord/res/drawable-xxhdpi/emoji_object_light.png
new file mode 100644
index 0000000000..53684a2a5a
Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/emoji_object_light.png differ
diff --git a/com.discord/res/drawable-xxhdpi/emoji_people_color.png b/com.discord/res/drawable-xxhdpi/emoji_people_color.png
new file mode 100644
index 0000000000..5e4de3cc81
Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/emoji_people_color.png differ
diff --git a/com.discord/res/drawable-xxhdpi/emoji_people_dark.png b/com.discord/res/drawable-xxhdpi/emoji_people_dark.png
new file mode 100644
index 0000000000..1d0af643ff
Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/emoji_people_dark.png differ
diff --git a/com.discord/res/drawable-xxhdpi/emoji_people_light.png b/com.discord/res/drawable-xxhdpi/emoji_people_light.png
new file mode 100644
index 0000000000..17bc75863d
Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/emoji_people_light.png differ
diff --git a/com.discord/res/drawable-xxhdpi/emoji_recent_color.png b/com.discord/res/drawable-xxhdpi/emoji_recent_color.png
new file mode 100644
index 0000000000..336ffaf004
Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/emoji_recent_color.png differ
diff --git a/com.discord/res/drawable-xxhdpi/emoji_recent_dark.png b/com.discord/res/drawable-xxhdpi/emoji_recent_dark.png
new file mode 100644
index 0000000000..6806f2df25
Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/emoji_recent_dark.png differ
diff --git a/com.discord/res/drawable-xxhdpi/emoji_recent_light.png b/com.discord/res/drawable-xxhdpi/emoji_recent_light.png
new file mode 100644
index 0000000000..51f0d7f4a1
Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/emoji_recent_light.png differ
diff --git a/com.discord/res/drawable-xxhdpi/emoji_symbol_color.png b/com.discord/res/drawable-xxhdpi/emoji_symbol_color.png
new file mode 100644
index 0000000000..82154ec445
Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/emoji_symbol_color.png differ
diff --git a/com.discord/res/drawable-xxhdpi/emoji_symbol_dark.png b/com.discord/res/drawable-xxhdpi/emoji_symbol_dark.png
new file mode 100644
index 0000000000..b4b95c6ddf
Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/emoji_symbol_dark.png differ
diff --git a/com.discord/res/drawable-xxhdpi/emoji_symbol_light.png b/com.discord/res/drawable-xxhdpi/emoji_symbol_light.png
new file mode 100644
index 0000000000..26a7742640
Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/emoji_symbol_light.png differ
diff --git a/com.discord/res/drawable-xxhdpi/emoji_travel_color.png b/com.discord/res/drawable-xxhdpi/emoji_travel_color.png
new file mode 100644
index 0000000000..3c9522039b
Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/emoji_travel_color.png differ
diff --git a/com.discord/res/drawable-xxhdpi/emoji_travel_dark.png b/com.discord/res/drawable-xxhdpi/emoji_travel_dark.png
new file mode 100644
index 0000000000..1c84bf7cfe
Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/emoji_travel_dark.png differ
diff --git a/com.discord/res/drawable-xxhdpi/emoji_travel_light.png b/com.discord/res/drawable-xxhdpi/emoji_travel_light.png
new file mode 100644
index 0000000000..4350c7df4e
Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/emoji_travel_light.png differ
diff --git a/com.discord/res/drawable-xxhdpi/empty_pins_dark.png b/com.discord/res/drawable-xxhdpi/empty_pins_dark.png
new file mode 100644
index 0000000000..9ec0245035
Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/empty_pins_dark.png differ
diff --git a/com.discord/res/drawable-xxhdpi/empty_pins_light.png b/com.discord/res/drawable-xxhdpi/empty_pins_light.png
new file mode 100644
index 0000000000..2fd41913a8
Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/empty_pins_light.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/emoji_activity_color.png b/com.discord/res/drawable-xxxhdpi/emoji_activity_color.png
new file mode 100644
index 0000000000..459a369180
Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/emoji_activity_color.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/emoji_activity_dark.png b/com.discord/res/drawable-xxxhdpi/emoji_activity_dark.png
new file mode 100644
index 0000000000..a6c7071fd7
Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/emoji_activity_dark.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/emoji_activity_light.png b/com.discord/res/drawable-xxxhdpi/emoji_activity_light.png
new file mode 100644
index 0000000000..53c3e9a97b
Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/emoji_activity_light.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/emoji_custom_color.png b/com.discord/res/drawable-xxxhdpi/emoji_custom_color.png
new file mode 100644
index 0000000000..6ece1aa344
Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/emoji_custom_color.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/emoji_custom_dark.png b/com.discord/res/drawable-xxxhdpi/emoji_custom_dark.png
new file mode 100644
index 0000000000..d25c0b6546
Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/emoji_custom_dark.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/emoji_custom_light.png b/com.discord/res/drawable-xxxhdpi/emoji_custom_light.png
new file mode 100644
index 0000000000..29e91213bc
Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/emoji_custom_light.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/emoji_flags_color.png b/com.discord/res/drawable-xxxhdpi/emoji_flags_color.png
new file mode 100644
index 0000000000..c89e1bfe26
Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/emoji_flags_color.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/emoji_flags_dark.png b/com.discord/res/drawable-xxxhdpi/emoji_flags_dark.png
new file mode 100644
index 0000000000..b2d367f74b
Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/emoji_flags_dark.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/emoji_flags_light.png b/com.discord/res/drawable-xxxhdpi/emoji_flags_light.png
new file mode 100644
index 0000000000..f0b0b0fc30
Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/emoji_flags_light.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/emoji_food_color.png b/com.discord/res/drawable-xxxhdpi/emoji_food_color.png
new file mode 100644
index 0000000000..82c9790e69
Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/emoji_food_color.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/emoji_food_dark.png b/com.discord/res/drawable-xxxhdpi/emoji_food_dark.png
new file mode 100644
index 0000000000..2e667547c7
Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/emoji_food_dark.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/emoji_food_light.png b/com.discord/res/drawable-xxxhdpi/emoji_food_light.png
new file mode 100644
index 0000000000..4fbbc65ddd
Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/emoji_food_light.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/emoji_nature_color.png b/com.discord/res/drawable-xxxhdpi/emoji_nature_color.png
new file mode 100644
index 0000000000..885b124511
Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/emoji_nature_color.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/emoji_nature_dark.png b/com.discord/res/drawable-xxxhdpi/emoji_nature_dark.png
new file mode 100644
index 0000000000..68625ad514
Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/emoji_nature_dark.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/emoji_nature_light.png b/com.discord/res/drawable-xxxhdpi/emoji_nature_light.png
new file mode 100644
index 0000000000..28f3d0357a
Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/emoji_nature_light.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/emoji_object_color.png b/com.discord/res/drawable-xxxhdpi/emoji_object_color.png
new file mode 100644
index 0000000000..c32fde482f
Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/emoji_object_color.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/emoji_object_dark.png b/com.discord/res/drawable-xxxhdpi/emoji_object_dark.png
new file mode 100644
index 0000000000..90e2181d91
Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/emoji_object_dark.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/emoji_object_light.png b/com.discord/res/drawable-xxxhdpi/emoji_object_light.png
new file mode 100644
index 0000000000..8dd7a100e0
Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/emoji_object_light.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/emoji_people_color.png b/com.discord/res/drawable-xxxhdpi/emoji_people_color.png
new file mode 100644
index 0000000000..2ac3772da3
Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/emoji_people_color.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/emoji_people_dark.png b/com.discord/res/drawable-xxxhdpi/emoji_people_dark.png
new file mode 100644
index 0000000000..2e3e907a94
Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/emoji_people_dark.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/emoji_people_light.png b/com.discord/res/drawable-xxxhdpi/emoji_people_light.png
new file mode 100644
index 0000000000..31841dd409
Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/emoji_people_light.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/emoji_recent_color.png b/com.discord/res/drawable-xxxhdpi/emoji_recent_color.png
new file mode 100644
index 0000000000..97d86919b1
Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/emoji_recent_color.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/emoji_recent_dark.png b/com.discord/res/drawable-xxxhdpi/emoji_recent_dark.png
new file mode 100644
index 0000000000..2838b9fb0b
Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/emoji_recent_dark.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/emoji_recent_light.png b/com.discord/res/drawable-xxxhdpi/emoji_recent_light.png
new file mode 100644
index 0000000000..ccc62d37f0
Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/emoji_recent_light.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/emoji_symbol_color.png b/com.discord/res/drawable-xxxhdpi/emoji_symbol_color.png
new file mode 100644
index 0000000000..6451f33d01
Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/emoji_symbol_color.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/emoji_symbol_dark.png b/com.discord/res/drawable-xxxhdpi/emoji_symbol_dark.png
new file mode 100644
index 0000000000..1f5cdc2207
Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/emoji_symbol_dark.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/emoji_symbol_light.png b/com.discord/res/drawable-xxxhdpi/emoji_symbol_light.png
new file mode 100644
index 0000000000..8f5f122155
Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/emoji_symbol_light.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/emoji_travel_color.png b/com.discord/res/drawable-xxxhdpi/emoji_travel_color.png
new file mode 100644
index 0000000000..29ebe76dcd
Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/emoji_travel_color.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/emoji_travel_dark.png b/com.discord/res/drawable-xxxhdpi/emoji_travel_dark.png
new file mode 100644
index 0000000000..e49d934ea4
Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/emoji_travel_dark.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/emoji_travel_light.png b/com.discord/res/drawable-xxxhdpi/emoji_travel_light.png
new file mode 100644
index 0000000000..8b34fc9092
Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/emoji_travel_light.png differ
diff --git a/com.discord/res/drawable/ic_emoji_activity_dark.xml b/com.discord/res/drawable/ic_emoji_activity_dark.xml
new file mode 100644
index 0000000000..91f7caab5f
--- /dev/null
+++ b/com.discord/res/drawable/ic_emoji_activity_dark.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_emoji_activity_light.xml b/com.discord/res/drawable/ic_emoji_activity_light.xml
new file mode 100644
index 0000000000..da50329b71
--- /dev/null
+++ b/com.discord/res/drawable/ic_emoji_activity_light.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_emoji_custom_dark.xml b/com.discord/res/drawable/ic_emoji_custom_dark.xml
new file mode 100644
index 0000000000..22cb2f9a10
--- /dev/null
+++ b/com.discord/res/drawable/ic_emoji_custom_dark.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_emoji_custom_light.xml b/com.discord/res/drawable/ic_emoji_custom_light.xml
new file mode 100644
index 0000000000..c99f90daa1
--- /dev/null
+++ b/com.discord/res/drawable/ic_emoji_custom_light.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_emoji_flags_dark.xml b/com.discord/res/drawable/ic_emoji_flags_dark.xml
new file mode 100644
index 0000000000..6a0ad339df
--- /dev/null
+++ b/com.discord/res/drawable/ic_emoji_flags_dark.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_emoji_flags_light.xml b/com.discord/res/drawable/ic_emoji_flags_light.xml
new file mode 100644
index 0000000000..5667ea59c9
--- /dev/null
+++ b/com.discord/res/drawable/ic_emoji_flags_light.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_emoji_food_dark.xml b/com.discord/res/drawable/ic_emoji_food_dark.xml
new file mode 100644
index 0000000000..1d6d0c0f21
--- /dev/null
+++ b/com.discord/res/drawable/ic_emoji_food_dark.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_emoji_food_light.xml b/com.discord/res/drawable/ic_emoji_food_light.xml
new file mode 100644
index 0000000000..92f7d0b643
--- /dev/null
+++ b/com.discord/res/drawable/ic_emoji_food_light.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_emoji_nature_dark.xml b/com.discord/res/drawable/ic_emoji_nature_dark.xml
new file mode 100644
index 0000000000..178b5f19a0
--- /dev/null
+++ b/com.discord/res/drawable/ic_emoji_nature_dark.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_emoji_nature_light.xml b/com.discord/res/drawable/ic_emoji_nature_light.xml
new file mode 100644
index 0000000000..da42b6f124
--- /dev/null
+++ b/com.discord/res/drawable/ic_emoji_nature_light.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_emoji_objects_dark.xml b/com.discord/res/drawable/ic_emoji_objects_dark.xml
new file mode 100644
index 0000000000..d6692fe3db
--- /dev/null
+++ b/com.discord/res/drawable/ic_emoji_objects_dark.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_emoji_objects_light.xml b/com.discord/res/drawable/ic_emoji_objects_light.xml
new file mode 100644
index 0000000000..bc5143e9ac
--- /dev/null
+++ b/com.discord/res/drawable/ic_emoji_objects_light.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_emoji_people_dark.xml b/com.discord/res/drawable/ic_emoji_people_dark.xml
new file mode 100644
index 0000000000..95cc0daa19
--- /dev/null
+++ b/com.discord/res/drawable/ic_emoji_people_dark.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_emoji_people_light.xml b/com.discord/res/drawable/ic_emoji_people_light.xml
new file mode 100644
index 0000000000..3fde54272a
--- /dev/null
+++ b/com.discord/res/drawable/ic_emoji_people_light.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_emoji_recent_dark.xml b/com.discord/res/drawable/ic_emoji_recent_dark.xml
new file mode 100644
index 0000000000..567e77e125
--- /dev/null
+++ b/com.discord/res/drawable/ic_emoji_recent_dark.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_emoji_recent_light.xml b/com.discord/res/drawable/ic_emoji_recent_light.xml
new file mode 100644
index 0000000000..81219d6123
--- /dev/null
+++ b/com.discord/res/drawable/ic_emoji_recent_light.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_expression_search_empty_dark.xml b/com.discord/res/drawable/ic_emoji_search_empty_dark.xml
similarity index 100%
rename from com.discord/res/drawable/ic_expression_search_empty_dark.xml
rename to com.discord/res/drawable/ic_emoji_search_empty_dark.xml
diff --git a/com.discord/res/drawable/ic_expression_search_empty_light.xml b/com.discord/res/drawable/ic_emoji_search_empty_light.xml
similarity index 100%
rename from com.discord/res/drawable/ic_expression_search_empty_light.xml
rename to com.discord/res/drawable/ic_emoji_search_empty_light.xml
diff --git a/com.discord/res/drawable/ic_emoji_symbols_dark.xml b/com.discord/res/drawable/ic_emoji_symbols_dark.xml
new file mode 100644
index 0000000000..461a5a9456
--- /dev/null
+++ b/com.discord/res/drawable/ic_emoji_symbols_dark.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_emoji_symbols_light.xml b/com.discord/res/drawable/ic_emoji_symbols_light.xml
new file mode 100644
index 0000000000..d81584db08
--- /dev/null
+++ b/com.discord/res/drawable/ic_emoji_symbols_light.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_emoji_travel_dark.xml b/com.discord/res/drawable/ic_emoji_travel_dark.xml
new file mode 100644
index 0000000000..b9ec427f21
--- /dev/null
+++ b/com.discord/res/drawable/ic_emoji_travel_dark.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_emoji_travel_light.xml b/com.discord/res/drawable/ic_emoji_travel_light.xml
new file mode 100644
index 0000000000..cf39f1096f
--- /dev/null
+++ b/com.discord/res/drawable/ic_emoji_travel_light.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout-v22/emoji_picker_header_item.xml b/com.discord/res/layout-v22/emoji_picker_header_item_v2.xml
similarity index 100%
rename from com.discord/res/layout-v22/emoji_picker_header_item.xml
rename to com.discord/res/layout-v22/emoji_picker_header_item_v2.xml
diff --git a/com.discord/res/layout-v22/widget_emoji_picker.xml b/com.discord/res/layout-v22/widget_emoji_picker_v2.xml
similarity index 97%
rename from com.discord/res/layout-v22/widget_emoji_picker.xml
rename to com.discord/res/layout-v22/widget_emoji_picker_v2.xml
index ee09594001..572b56cf21 100644
--- a/com.discord/res/layout-v22/widget_emoji_picker.xml
+++ b/com.discord/res/layout-v22/widget_emoji_picker_v2.xml
@@ -18,7 +18,7 @@
-
-
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/emoji_category_item_guild.xml b/com.discord/res/layout/emoji_category_item_guild.xml
index df056ae37e..68589a28ba 100644
--- a/com.discord/res/layout/emoji_category_item_guild.xml
+++ b/com.discord/res/layout/emoji_category_item_guild.xml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/com.discord/res/layout/emoji_picker_emoji_item.xml b/com.discord/res/layout/emoji_picker_emoji_item.xml
index df3d8ee461..9a5852881a 100644
--- a/com.discord/res/layout/emoji_picker_emoji_item.xml
+++ b/com.discord/res/layout/emoji_picker_emoji_item.xml
@@ -1,3 +1,3 @@
-
\ No newline at end of file
diff --git a/com.discord/res/layout/emoji_picker_emoji_item_v2.xml b/com.discord/res/layout/emoji_picker_emoji_item_v2.xml
new file mode 100644
index 0000000000..6983985fd9
--- /dev/null
+++ b/com.discord/res/layout/emoji_picker_emoji_item_v2.xml
@@ -0,0 +1,3 @@
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/emoji_picker_header_item.xml b/com.discord/res/layout/emoji_picker_header_item.xml
index f672d5f978..44c5b90a40 100644
--- a/com.discord/res/layout/emoji_picker_header_item.xml
+++ b/com.discord/res/layout/emoji_picker_header_item.xml
@@ -1,3 +1,3 @@
-
\ No newline at end of file
diff --git a/com.discord/res/layout/emoji_picker_header_item_v2.xml b/com.discord/res/layout/emoji_picker_header_item_v2.xml
new file mode 100644
index 0000000000..f672d5f978
--- /dev/null
+++ b/com.discord/res/layout/emoji_picker_header_item_v2.xml
@@ -0,0 +1,3 @@
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_chat_input_emoji_picker.xml b/com.discord/res/layout/widget_chat_input_emoji_picker.xml
new file mode 100644
index 0000000000..5c37fdc371
--- /dev/null
+++ b/com.discord/res/layout/widget_chat_input_emoji_picker.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_chat_list_adapter_item_embed.xml b/com.discord/res/layout/widget_chat_list_adapter_item_embed.xml
index 8ca6b7c72d..5e7474e7af 100644
--- a/com.discord/res/layout/widget_chat_list_adapter_item_embed.xml
+++ b/com.discord/res/layout/widget_chat_list_adapter_item_embed.xml
@@ -1,5 +1,5 @@
-
diff --git a/com.discord/res/layout/widget_emoji_picker.xml b/com.discord/res/layout/widget_emoji_picker_v2.xml
similarity index 97%
rename from com.discord/res/layout/widget_emoji_picker.xml
rename to com.discord/res/layout/widget_emoji_picker_v2.xml
index ad2b369365..bba5b39012 100644
--- a/com.discord/res/layout/widget_emoji_picker.xml
+++ b/com.discord/res/layout/widget_emoji_picker_v2.xml
@@ -18,7 +18,7 @@
-
-
+
+
\ No newline at end of file
diff --git a/com.discord/res/values/attrs.xml b/com.discord/res/values/attrs.xml
index 5206bc912e..dca95cb354 100644
--- a/com.discord/res/values/attrs.xml
+++ b/com.discord/res/values/attrs.xml
@@ -1772,6 +1772,16 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/com.discord/res/values/dimens.xml b/com.discord/res/values/dimens.xml
index 4416bd2d54..1ae009921e 100644
--- a/com.discord/res/values/dimens.xml
+++ b/com.discord/res/values/dimens.xml
@@ -108,10 +108,10 @@
8.0dip
12.0dip
5.0dip
- 0.25dip
600.0dip
128.0dip
- 44.0dip
+ 48.0dip
+ 44.0dip
136.0dip
24.0dip
4.0dip
diff --git a/com.discord/res/values/ids.xml b/com.discord/res/values/ids.xml
index 0ebf86428e..d20d6ecdbb 100644
--- a/com.discord/res/values/ids.xml
+++ b/com.discord/res/values/ids.xml
@@ -527,7 +527,6 @@
-
@@ -742,6 +741,8 @@
+
+
diff --git a/com.discord/res/values/plurals.xml b/com.discord/res/values/plurals.xml
index 78132c986d..5d5b5f4376 100644
--- a/com.discord/res/values/plurals.xml
+++ b/com.discord/res/values/plurals.xml
@@ -575,8 +575,8 @@
- %s Server Boost
- - %s mentions
- - %s mention
+ - %s unread mentions
+ - %s unread mention
- %s users
@@ -618,9 +618,9 @@
- **1** person used this template
- - %s mentions,
+ - , %s unread mentions
- - %s mention,
+ - , %s unread mention
- %s days
diff --git a/com.discord/res/values/public.xml b/com.discord/res/values/public.xml
index 91f6f5ac39..f805b68cb1 100644
--- a/com.discord/res/values/public.xml
+++ b/com.discord/res/values/public.xml
@@ -1364,148 +1364,158 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2299,10 +2309,10 @@
-
-
-
-
+
+
+
+
@@ -3017,576 +3027,596 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -3609,228 +3639,228 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -3882,13 +3912,13 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -3902,42 +3932,72 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -3945,58 +4005,58 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -4006,19 +4066,19 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -4622,2104 +4682,2105 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -6837,594 +6898,597 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -17109,830 +17173,831 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
diff --git a/com.discord/res/values/strings.xml b/com.discord/res/values/strings.xml
index c5e4fd11fc..d2328896eb 100644
--- a/com.discord/res/values/strings.xml
+++ b/com.discord/res/values/strings.xml
@@ -1133,7 +1133,7 @@ We’re here to make a good impression."
Presets
Select a color
Transparency
- b413eb1188f64ab2b80b1dabe3a478d4
+ 947f03a953f84e3599b81598885346b1
Coming Soon
Search Animated GIFs on the Web
Displays text with emphasis.
@@ -2879,8 +2879,8 @@ Servers that have set up a Welcome Screen see improvements in more people sticki
Enable Server Widget
%1$s (server)
%1$s (%2$s store %3$s announcement %4$s other %5$s})
- , %1$s, %2$s (%3$s store %4$s announcement %5$s other %6$s})
- unread, %1$s (%2$s store %3$s announcement %4$s other %5$s})
+ %1$s (%2$s store %3$s announcement %4$s other %5$s}), %6$s
+ %1$s (%2$s store %3$s announcement %4$s other %5$s}), has unread messages
%1$s (voice channel)
%1$s (voice channel), %2$s of %3$s users
%1$s (voice channel), %2$s
@@ -3995,7 +3995,7 @@ Want to know more about Discord?"
Oh no, an error has occurred. Code %1$s
Discord has to install some stuff before we can launch your game. Installing (%1$s of %2$s).
Discord has to install some stuff before we can launch your game. Installing %1$s (%2$s of %3$s).
- Get custom features and tools that can help you run your community.
+ Get tailored features and tools that can help grow your community!
Well, it looks like the **%1$s %2$s** microphone hardware mute switch is on.
We suggest adding a phone to your 2 factor authentication settings as a backup.
Add Phone
diff --git a/com.discord/res/values/styles.xml b/com.discord/res/values/styles.xml
index 8b3061a3d7..8c812093bf 100644
--- a/com.discord/res/values/styles.xml
+++ b/com.discord/res/values/styles.xml
@@ -419,9 +419,19 @@
- @color/primary_700
- @color/white_alpha_10
- @color/primary_600
+ - @drawable/ic_emoji_activity_dark
+ - @drawable/ic_emoji_custom_dark
+ - @drawable/ic_emoji_flags_dark
+ - @drawable/ic_emoji_food_dark
+ - @drawable/ic_emoji_nature_dark
+ - @drawable/ic_emoji_objects_dark
+ - @drawable/ic_emoji_people_dark
+ - @drawable/ic_emoji_recent_dark
+ - @drawable/ic_emoji_symbols_dark
+ - @drawable/ic_emoji_travel_dark
- @drawable/ic_emoji_placeholder_primary_500
- @drawable/img_empty_server_settings_emoji_dark
- - @drawable/ic_expression_search_empty_dark
+ - @drawable/ic_emoji_search_empty_dark
- @drawable/ic_header_members_add_white_24dp
- #ff303337
- @drawable/ic_group_add_white_24dp
@@ -687,9 +697,19 @@
- @color/primary_300
- @color/black_alpha_10
- @color/primary_300
+ - @drawable/ic_emoji_activity_light
+ - @drawable/ic_emoji_custom_light
+ - @drawable/ic_emoji_flags_light
+ - @drawable/ic_emoji_food_light
+ - @drawable/ic_emoji_nature_light
+ - @drawable/ic_emoji_objects_light
+ - @drawable/ic_emoji_people_light
+ - @drawable/ic_emoji_recent_light
+ - @drawable/ic_emoji_symbols_light
+ - @drawable/ic_emoji_travel_light
- @drawable/ic_emoji_placeholder_primary_100
- @drawable/img_empty_server_settings_emoji_light
- - @drawable/ic_expression_search_empty_light
+ - @drawable/ic_emoji_search_empty_light
- @drawable/ic_header_members_add_grey_24dp
- @color/white_6
- @drawable/ic_group_add_grey_24dp
@@ -2622,6 +2642,14 @@
- fill_parent
+