From c2fdce9d58c038ba45bc15dadc80d729251864d3 Mon Sep 17 00:00:00 2001
From: Helium314 <helium314@mailbox.org>
Date: Sun, 12 Jan 2025 21:10:06 +0100
Subject: [PATCH] upgrade emojis to unicode 16.0

and set default emoji SDK level to 21, as we don't support 19 any more
---
 app/src/main/res/values/emoji-categories.xml  | 573 ++++++++++--------
 .../tools/emoji/EmojiCategoriesResource.kt    |   2 +-
 2 files changed, 325 insertions(+), 250 deletions(-)

diff --git a/app/src/main/res/values/emoji-categories.xml b/app/src/main/res/values/emoji-categories.xml
index e11d71ae..3fd482dc 100644
--- a/app/src/main/res/values/emoji-categories.xml
+++ b/app/src/main/res/values/emoji-categories.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+    SPDX-License-Identifier: GPL-3.0-only
+-->
+
 <!--
 
     !!!!! DO NOT EDIT THIS FILE !!!!!
@@ -16,8 +20,8 @@
     The updated source file will be generated to the following path (this file).
       app/src/main/res/values/emoji-categories.xml
 
-    Unicode version 15.0.
-    Platform compatibility up to API level 33.
+    Unicode version 16.0.
+    Platform compatibility up to API level 35.
 
  -->
 
@@ -77,11 +81,14 @@
         <item>1F62E,200D,1F4A8||31</item>
         <item>1F925||24</item>
         <item>1FAE8||33</item>
+        <item>1F642,200D,2194,FE0F||34</item>
+        <item>1F642,200D,2195,FE0F||34</item>
         <item>1F60C</item>
         <item>1F614</item>
         <item>1F62A</item>
         <item>1F924||24</item>
         <item>1F634</item>
+        <item>1FAE9||35</item>
         <item>1F637</item>
         <item>1F912||23</item>
         <item>1F915||23</item>
@@ -440,24 +447,42 @@
         <item>1F6B6</item>
         <item>1F6B6,200D,2642,FE0F||25</item>
         <item>1F6B6,200D,2640,FE0F||25</item>
+        <item>1F6B6,200D,27A1,FE0F||34</item>
+        <item>1F6B6,200D,2640,FE0F,200D,27A1,FE0F||34</item>
+        <item>1F6B6,200D,2642,FE0F,200D,27A1,FE0F||34</item>
         <item>1F9CD||29</item>
         <item>1F9CD,200D,2642,FE0F||29</item>
         <item>1F9CD,200D,2640,FE0F||29</item>
         <item>1F9CE||29</item>
         <item>1F9CE,200D,2642,FE0F||29</item>
         <item>1F9CE,200D,2640,FE0F||29</item>
+        <item>1F9CE,200D,27A1,FE0F||34</item>
+        <item>1F9CE,200D,2640,FE0F,200D,27A1,FE0F||34</item>
+        <item>1F9CE,200D,2642,FE0F,200D,27A1,FE0F||34</item>
         <item>1F9D1,200D,1F9AF||30</item>
+        <item>1F9D1,200D,1F9AF,200D,27A1,FE0F||34</item>
         <item>1F468,200D,1F9AF||29</item>
+        <item>1F468,200D,1F9AF,200D,27A1,FE0F||34</item>
         <item>1F469,200D,1F9AF||29</item>
+        <item>1F469,200D,1F9AF,200D,27A1,FE0F||34</item>
         <item>1F9D1,200D,1F9BC||30</item>
+        <item>1F9D1,200D,1F9BC,200D,27A1,FE0F||34</item>
         <item>1F468,200D,1F9BC||29</item>
+        <item>1F468,200D,1F9BC,200D,27A1,FE0F||34</item>
         <item>1F469,200D,1F9BC||29</item>
+        <item>1F469,200D,1F9BC,200D,27A1,FE0F||34</item>
         <item>1F9D1,200D,1F9BD||30</item>
+        <item>1F9D1,200D,1F9BD,200D,27A1,FE0F||34</item>
         <item>1F468,200D,1F9BD||29</item>
+        <item>1F468,200D,1F9BD,200D,27A1,FE0F||34</item>
         <item>1F469,200D,1F9BD||29</item>
+        <item>1F469,200D,1F9BD,200D,27A1,FE0F||34</item>
         <item>1F3C3</item>
         <item>1F3C3,200D,2642,FE0F||25</item>
         <item>1F3C3,200D,2640,FE0F||25</item>
+        <item>1F3C3,200D,27A1,FE0F||34</item>
+        <item>1F3C3,200D,2640,FE0F,200D,27A1,FE0F||34</item>
+        <item>1F3C3,200D,2642,FE0F,200D,27A1,FE0F||34</item>
         <item>1F483</item>
         <item>1F57A||24</item>
         <item>1F574,FE0F||23</item>
@@ -530,7 +555,6 @@
         <item>1F469,200D,2764,FE0F,200D,1F468||26</item>
         <item>1F468,200D,2764,FE0F,200D,1F468||23</item>
         <item>1F469,200D,2764,FE0F,200D,1F469||23</item>
-        <item>1F46A</item>
         <item>1F468,200D,1F469,200D,1F466||25</item>
         <item>1F468,200D,1F469,200D,1F467||23</item>
         <item>1F468,200D,1F469,200D,1F467,200D,1F466||23</item>
@@ -560,7 +584,13 @@
         <item>1F464</item>
         <item>1F465</item>
         <item>1FAC2||30</item>
+        <item>1F46A</item>
+        <item>1F9D1,200D,1F9D1,200D,1F9D2||34</item>
+        <item>1F9D1,200D,1F9D1,200D,1F9D2,200D,1F9D2||34</item>
+        <item>1F9D1,200D,1F9D2||34</item>
+        <item>1F9D1,200D,1F9D2,200D,1F9D2||34</item>
         <item>1F463</item>
+        <item>1FAC6||35</item>
     </array>
 
     <array
@@ -761,7 +791,7 @@
         <item>1F470,1F3FB,200D,2642,FE0F||30;1F470,1F3FC,200D,2642,FE0F||30;1F470,1F3FD,200D,2642,FE0F||30;1F470,1F3FE,200D,2642,FE0F||30;1F470,1F3FF,200D,2642,FE0F||30</item>
         <item>1F470,1F3FB,200D,2640,FE0F||30;1F470,1F3FC,200D,2640,FE0F||30;1F470,1F3FD,200D,2640,FE0F||30;1F470,1F3FE,200D,2640,FE0F||30;1F470,1F3FF,200D,2640,FE0F||30</item>
         <item>1F930,1F3FB||24;1F930,1F3FC||24;1F930,1F3FD||24;1F930,1F3FE||24;1F930,1F3FF||24</item>
-        <item>1FAC3,1F3FB||32;1FAC3,1F3FD||32;1FAC3,1F3FE||32;1FAC3,1F3FF||32</item>
+        <item>1FAC3,1F3FB||32;1FAC3,1F3FC||32;1FAC3,1F3FD||32;1FAC3,1F3FE||32;1FAC3,1F3FF||32</item>
         <item>1FAC4,1F3FB||32;1FAC4,1F3FC||32;1FAC4,1F3FD||32;1FAC4,1F3FE||32;1FAC4,1F3FF||32</item>
         <item>1F931,1F3FB||26;1F931,1F3FC||26;1F931,1F3FD||26;1F931,1F3FE||26;1F931,1F3FF||26</item>
         <item>1F469,1F3FB,200D,1F37C||30;1F469,1F3FC,200D,1F37C||30;1F469,1F3FD,200D,1F37C||30;1F469,1F3FE,200D,1F37C||30;1F469,1F3FF,200D,1F37C||30</item>
@@ -808,24 +838,42 @@
         <item>1F6B6,1F3FB||24;1F6B6,1F3FC||24;1F6B6,1F3FD||24;1F6B6,1F3FE||24;1F6B6,1F3FF||24</item>
         <item>1F6B6,1F3FB,200D,2642,FE0F||25;1F6B6,1F3FC,200D,2642,FE0F||25;1F6B6,1F3FD,200D,2642,FE0F||25;1F6B6,1F3FE,200D,2642,FE0F||25;1F6B6,1F3FF,200D,2642,FE0F||25</item>
         <item>1F6B6,1F3FB,200D,2640,FE0F||25;1F6B6,1F3FC,200D,2640,FE0F||25;1F6B6,1F3FD,200D,2640,FE0F||25;1F6B6,1F3FE,200D,2640,FE0F||25;1F6B6,1F3FF,200D,2640,FE0F||25</item>
+        <item>1F6B6,1F3FB,200D,27A1,FE0F||34;1F6B6,1F3FC,200D,27A1,FE0F||34;1F6B6,1F3FD,200D,27A1,FE0F||34;1F6B6,1F3FE,200D,27A1,FE0F||34;1F6B6,1F3FF,200D,27A1,FE0F||34</item>
+        <item>1F6B6,1F3FB,200D,2640,FE0F,200D,27A1,FE0F||34;1F6B6,1F3FC,200D,2640,FE0F,200D,27A1,FE0F||34;1F6B6,1F3FD,200D,2640,FE0F,200D,27A1,FE0F||34;1F6B6,1F3FE,200D,2640,FE0F,200D,27A1,FE0F||34;1F6B6,1F3FF,200D,2640,FE0F,200D,27A1,FE0F||34</item>
+        <item>1F6B6,1F3FB,200D,2642,FE0F,200D,27A1,FE0F||34;1F6B6,1F3FC,200D,2642,FE0F,200D,27A1,FE0F||34;1F6B6,1F3FD,200D,2642,FE0F,200D,27A1,FE0F||34;1F6B6,1F3FE,200D,2642,FE0F,200D,27A1,FE0F||34;1F6B6,1F3FF,200D,2642,FE0F,200D,27A1,FE0F||34</item>
         <item>1F9CD,1F3FB||29;1F9CD,1F3FC||29;1F9CD,1F3FD||29;1F9CD,1F3FE||29;1F9CD,1F3FF||29</item>
         <item>1F9CD,1F3FB,200D,2642,FE0F||29;1F9CD,1F3FC,200D,2642,FE0F||29;1F9CD,1F3FD,200D,2642,FE0F||29;1F9CD,1F3FE,200D,2642,FE0F||29;1F9CD,1F3FF,200D,2642,FE0F||29</item>
         <item>1F9CD,1F3FB,200D,2640,FE0F||29;1F9CD,1F3FC,200D,2640,FE0F||29;1F9CD,1F3FD,200D,2640,FE0F||29;1F9CD,1F3FE,200D,2640,FE0F||29;1F9CD,1F3FF,200D,2640,FE0F||29</item>
         <item>1F9CE,1F3FB||29;1F9CE,1F3FC||29;1F9CE,1F3FD||29;1F9CE,1F3FE||29;1F9CE,1F3FF||29</item>
         <item>1F9CE,1F3FB,200D,2642,FE0F||29;1F9CE,1F3FC,200D,2642,FE0F||29;1F9CE,1F3FD,200D,2642,FE0F||29;1F9CE,1F3FE,200D,2642,FE0F||29;1F9CE,1F3FF,200D,2642,FE0F||29</item>
         <item>1F9CE,1F3FB,200D,2640,FE0F||29;1F9CE,1F3FC,200D,2640,FE0F||29;1F9CE,1F3FD,200D,2640,FE0F||29;1F9CE,1F3FE,200D,2640,FE0F||29;1F9CE,1F3FF,200D,2640,FE0F||29</item>
+        <item>1F9CE,1F3FB,200D,27A1,FE0F||34;1F9CE,1F3FC,200D,27A1,FE0F||34;1F9CE,1F3FD,200D,27A1,FE0F||34;1F9CE,1F3FE,200D,27A1,FE0F||34;1F9CE,1F3FF,200D,27A1,FE0F||34</item>
+        <item>1F9CE,1F3FB,200D,2640,FE0F,200D,27A1,FE0F||34;1F9CE,1F3FC,200D,2640,FE0F,200D,27A1,FE0F||34;1F9CE,1F3FD,200D,2640,FE0F,200D,27A1,FE0F||34;1F9CE,1F3FE,200D,2640,FE0F,200D,27A1,FE0F||34;1F9CE,1F3FF,200D,2640,FE0F,200D,27A1,FE0F||34</item>
+        <item>1F9CE,1F3FB,200D,2642,FE0F,200D,27A1,FE0F||34;1F9CE,1F3FC,200D,2642,FE0F,200D,27A1,FE0F||34;1F9CE,1F3FD,200D,2642,FE0F,200D,27A1,FE0F||34;1F9CE,1F3FE,200D,2642,FE0F,200D,27A1,FE0F||34;1F9CE,1F3FF,200D,2642,FE0F,200D,27A1,FE0F||34</item>
         <item>1F9D1,1F3FB,200D,1F9AF||30;1F9D1,1F3FC,200D,1F9AF||30;1F9D1,1F3FD,200D,1F9AF||30;1F9D1,1F3FE,200D,1F9AF||30;1F9D1,1F3FF,200D,1F9AF||30</item>
+        <item>1F9D1,1F3FB,200D,1F9AF,200D,27A1,FE0F||34;1F9D1,1F3FC,200D,1F9AF,200D,27A1,FE0F||34;1F9D1,1F3FD,200D,1F9AF,200D,27A1,FE0F||34;1F9D1,1F3FE,200D,1F9AF,200D,27A1,FE0F||34;1F9D1,1F3FF,200D,1F9AF,200D,27A1,FE0F||34</item>
         <item>1F468,1F3FB,200D,1F9AF||29;1F468,1F3FC,200D,1F9AF||29;1F468,1F3FD,200D,1F9AF||29;1F468,1F3FE,200D,1F9AF||29;1F468,1F3FF,200D,1F9AF||29</item>
+        <item>1F468,1F3FB,200D,1F9AF,200D,27A1,FE0F||34;1F468,1F3FC,200D,1F9AF,200D,27A1,FE0F||34;1F468,1F3FD,200D,1F9AF,200D,27A1,FE0F||34;1F468,1F3FE,200D,1F9AF,200D,27A1,FE0F||34;1F468,1F3FF,200D,1F9AF,200D,27A1,FE0F||34</item>
         <item>1F469,1F3FB,200D,1F9AF||29;1F469,1F3FC,200D,1F9AF||29;1F469,1F3FD,200D,1F9AF||29;1F469,1F3FE,200D,1F9AF||29;1F469,1F3FF,200D,1F9AF||29</item>
+        <item>1F469,1F3FB,200D,1F9AF,200D,27A1,FE0F||34;1F469,1F3FC,200D,1F9AF,200D,27A1,FE0F||34;1F469,1F3FD,200D,1F9AF,200D,27A1,FE0F||34;1F469,1F3FE,200D,1F9AF,200D,27A1,FE0F||34;1F469,1F3FF,200D,1F9AF,200D,27A1,FE0F||34</item>
         <item>1F9D1,1F3FB,200D,1F9BC||30;1F9D1,1F3FC,200D,1F9BC||30;1F9D1,1F3FD,200D,1F9BC||30;1F9D1,1F3FE,200D,1F9BC||30;1F9D1,1F3FF,200D,1F9BC||30</item>
+        <item>1F9D1,1F3FB,200D,1F9BC,200D,27A1,FE0F||34;1F9D1,1F3FC,200D,1F9BC,200D,27A1,FE0F||34;1F9D1,1F3FD,200D,1F9BC,200D,27A1,FE0F||34;1F9D1,1F3FE,200D,1F9BC,200D,27A1,FE0F||34;1F9D1,1F3FF,200D,1F9BC,200D,27A1,FE0F||34</item>
         <item>1F468,1F3FB,200D,1F9BC||29;1F468,1F3FC,200D,1F9BC||29;1F468,1F3FD,200D,1F9BC||29;1F468,1F3FE,200D,1F9BC||29;1F468,1F3FF,200D,1F9BC||29</item>
+        <item>1F468,1F3FB,200D,1F9BC,200D,27A1,FE0F||34;1F468,1F3FC,200D,1F9BC,200D,27A1,FE0F||34;1F468,1F3FD,200D,1F9BC,200D,27A1,FE0F||34;1F468,1F3FE,200D,1F9BC,200D,27A1,FE0F||34;1F468,1F3FF,200D,1F9BC,200D,27A1,FE0F||34</item>
         <item>1F469,1F3FB,200D,1F9BC||29;1F469,1F3FC,200D,1F9BC||29;1F469,1F3FD,200D,1F9BC||29;1F469,1F3FE,200D,1F9BC||29;1F469,1F3FF,200D,1F9BC||29</item>
+        <item>1F469,1F3FB,200D,1F9BC,200D,27A1,FE0F||34;1F469,1F3FC,200D,1F9BC,200D,27A1,FE0F||34;1F469,1F3FD,200D,1F9BC,200D,27A1,FE0F||34;1F469,1F3FE,200D,1F9BC,200D,27A1,FE0F||34;1F469,1F3FF,200D,1F9BC,200D,27A1,FE0F||34</item>
         <item>1F9D1,1F3FB,200D,1F9BD||30;1F9D1,1F3FC,200D,1F9BD||30;1F9D1,1F3FD,200D,1F9BD||30;1F9D1,1F3FE,200D,1F9BD||30;1F9D1,1F3FF,200D,1F9BD||30</item>
+        <item>1F9D1,1F3FB,200D,1F9BD,200D,27A1,FE0F||34;1F9D1,1F3FC,200D,1F9BD,200D,27A1,FE0F||34;1F9D1,1F3FD,200D,1F9BD,200D,27A1,FE0F||34;1F9D1,1F3FE,200D,1F9BD,200D,27A1,FE0F||34;1F9D1,1F3FF,200D,1F9BD,200D,27A1,FE0F||34</item>
         <item>1F468,1F3FB,200D,1F9BD||29;1F468,1F3FC,200D,1F9BD||29;1F468,1F3FD,200D,1F9BD||29;1F468,1F3FE,200D,1F9BD||29;1F468,1F3FF,200D,1F9BD||29</item>
+        <item>1F468,1F3FB,200D,1F9BD,200D,27A1,FE0F||34;1F468,1F3FC,200D,1F9BD,200D,27A1,FE0F||34;1F468,1F3FD,200D,1F9BD,200D,27A1,FE0F||34;1F468,1F3FE,200D,1F9BD,200D,27A1,FE0F||34;1F468,1F3FF,200D,1F9BD,200D,27A1,FE0F||34</item>
         <item>1F469,1F3FB,200D,1F9BD||29;1F469,1F3FC,200D,1F9BD||29;1F469,1F3FD,200D,1F9BD||29;1F469,1F3FE,200D,1F9BD||29;1F469,1F3FF,200D,1F9BD||29</item>
+        <item>1F469,1F3FB,200D,1F9BD,200D,27A1,FE0F||34;1F469,1F3FC,200D,1F9BD,200D,27A1,FE0F||34;1F469,1F3FD,200D,1F9BD,200D,27A1,FE0F||34;1F469,1F3FE,200D,1F9BD,200D,27A1,FE0F||34;1F469,1F3FF,200D,1F9BD,200D,27A1,FE0F||34</item>
         <item>1F3C3,1F3FB||24;1F3C3,1F3FC||24;1F3C3,1F3FD||24;1F3C3,1F3FE||24;1F3C3,1F3FF||24</item>
         <item>1F3C3,1F3FB,200D,2642,FE0F||25;1F3C3,1F3FC,200D,2642,FE0F||25;1F3C3,1F3FD,200D,2642,FE0F||25;1F3C3,1F3FE,200D,2642,FE0F||25;1F3C3,1F3FF,200D,2642,FE0F||25</item>
         <item>1F3C3,1F3FB,200D,2640,FE0F||25;1F3C3,1F3FC,200D,2640,FE0F||25;1F3C3,1F3FD,200D,2640,FE0F||25;1F3C3,1F3FE,200D,2640,FE0F||25;1F3C3,1F3FF,200D,2640,FE0F||25</item>
+        <item>1F3C3,1F3FB,200D,27A1,FE0F||34;1F3C3,1F3FC,200D,27A1,FE0F||34;1F3C3,1F3FD,200D,27A1,FE0F||34;1F3C3,1F3FE,200D,27A1,FE0F||34;1F3C3,1F3FF,200D,27A1,FE0F||34</item>
+        <item>1F3C3,1F3FB,200D,2640,FE0F,200D,27A1,FE0F||34;1F3C3,1F3FC,200D,2640,FE0F,200D,27A1,FE0F||34;1F3C3,1F3FD,200D,2640,FE0F,200D,27A1,FE0F||34;1F3C3,1F3FE,200D,2640,FE0F,200D,27A1,FE0F||34;1F3C3,1F3FF,200D,2640,FE0F,200D,27A1,FE0F||34</item>
+        <item>1F3C3,1F3FB,200D,2642,FE0F,200D,27A1,FE0F||34;1F3C3,1F3FC,200D,2642,FE0F,200D,27A1,FE0F||34;1F3C3,1F3FD,200D,2642,FE0F,200D,27A1,FE0F||34;1F3C3,1F3FE,200D,2642,FE0F,200D,27A1,FE0F||34;1F3C3,1F3FF,200D,2642,FE0F,200D,27A1,FE0F||34</item>
         <item>1F483,1F3FB||24;1F483,1F3FC||24;1F483,1F3FD||24;1F483,1F3FE||24;1F483,1F3FF||24</item>
         <item>1F57A,1F3FB||24;1F57A,1F3FC||24;1F57A,1F3FD||24;1F57A,1F3FE||24;1F57A,1F3FF||24</item>
         <item>1F574,1F3FB||26;1F574,1F3FC||26;1F574,1F3FD||26;1F574,1F3FE||26;1F574,1F3FF||26</item>
@@ -929,6 +977,11 @@
         <item/>
         <item/>
         <item/>
+        <item/>
+        <item/>
+        <item/>
+        <item/>
+        <item/>
     </array>
 
     <array
@@ -1021,6 +1074,7 @@
         <item>1FABD||33</item>
         <item>1F426,200D,2B1B||33</item>
         <item>1FABF||33</item>
+        <item>1F426,200D,1F525||34</item>
         <item>1F438</item>
         <item>1F40A</item>
         <item>1F422</item>
@@ -1042,6 +1096,11 @@
         <item>1F41A</item>
         <item>1FAB8||32</item>
         <item>1FABC||33</item>
+        <item>1F980||23</item>
+        <item>1F99E||28</item>
+        <item>1F990||24</item>
+        <item>1F991||24</item>
+        <item>1F9AA||29</item>
         <item>1F40C</item>
         <item>1F98B||24</item>
         <item>1F41B</item>
@@ -1086,6 +1145,7 @@
         <item>1FAB9||32</item>
         <item>1FABA||32</item>
         <item>1F344</item>
+        <item>1FABE||35</item>
     </array>
 
     <array
@@ -1096,6 +1156,7 @@
         <item>1F349</item>
         <item>1F34A</item>
         <item>1F34B</item>
+        <item>1F34B,200D,1F7E9||34</item>
         <item>1F34C</item>
         <item>1F34D</item>
         <item>1F96D||28</item>
@@ -1127,6 +1188,8 @@
         <item>1F330</item>
         <item>1FADA||33</item>
         <item>1FADB||33</item>
+        <item>1F344,200D,1F7EB||34</item>
+        <item>1FADC||35</item>
         <item>1F35E</item>
         <item>1F950||24</item>
         <item>1F956||24</item>
@@ -1178,11 +1241,6 @@
         <item>1F95F||26</item>
         <item>1F960||26</item>
         <item>1F961||26</item>
-        <item>1F980||23</item>
-        <item>1F99E||28</item>
-        <item>1F990||24</item>
-        <item>1F991||24</item>
-        <item>1F9AA||29</item>
         <item>1F366</item>
         <item>1F367</item>
         <item>1F368</item>
@@ -1618,6 +1676,7 @@
         <item>1FA98||30</item>
         <item>1FA87||33</item>
         <item>1FA88||33</item>
+        <item>1FA89||35</item>
         <item>1F4F1</item>
         <item>1F4F2</item>
         <item>260E,FE0F</item>
@@ -1750,11 +1809,13 @@
         <item>2696,FE0F||23</item>
         <item>1F9AF||29</item>
         <item>1F517</item>
+        <item>26D3,FE0F,200D,1F4A5||34</item>
         <item>26D3,FE0F||23</item>
         <item>1FA9D||30</item>
         <item>1F9F0||28</item>
         <item>1F9F2||28</item>
         <item>1FA9C||30</item>
+        <item>1FA8F||35</item>
         <item>2697,FE0F||23</item>
         <item>1F9EA||28</item>
         <item>1F9EB||28</item>
@@ -1945,6 +2006,7 @@
         <item>A9,FE0F</item>
         <item>AE,FE0F</item>
         <item>2122,FE0F</item>
+        <item>1FADF||35</item>
         <item>1F1E6</item>
         <item>1F1E7</item>
         <item>1F1E8</item>
@@ -1971,18 +2033,18 @@
         <item>1F1FD</item>
         <item>1F1FE</item>
         <item>1F1FF</item>
-        <item>23,FE0F,20E3||21</item>
+        <item>23,FE0F,20E3</item>
         <item>2A,FE0F,20E3||23</item>
-        <item>30,FE0F,20E3||21</item>
-        <item>31,FE0F,20E3||21</item>
-        <item>32,FE0F,20E3||21</item>
-        <item>33,FE0F,20E3||21</item>
-        <item>34,FE0F,20E3||21</item>
-        <item>35,FE0F,20E3||21</item>
-        <item>36,FE0F,20E3||21</item>
-        <item>37,FE0F,20E3||21</item>
-        <item>38,FE0F,20E3||21</item>
-        <item>39,FE0F,20E3||21</item>
+        <item>30,FE0F,20E3</item>
+        <item>31,FE0F,20E3</item>
+        <item>32,FE0F,20E3</item>
+        <item>33,FE0F,20E3</item>
+        <item>34,FE0F,20E3</item>
+        <item>35,FE0F,20E3</item>
+        <item>36,FE0F,20E3</item>
+        <item>37,FE0F,20E3</item>
+        <item>38,FE0F,20E3</item>
+        <item>39,FE0F,20E3</item>
         <item>1F51F</item>
         <item>1F520</item>
         <item>1F521</item>
@@ -2071,251 +2133,264 @@
         <item>1F3F3,FE0F,200D,26A7,FE0F||30</item>
         <item>1F3F4,200D,2620,FE0F||28</item>
         <item>1F1E6,1F1E8||24</item>
-        <item>1F1E6,1F1E9||21</item>
-        <item>1F1E6,1F1EA||21</item>
-        <item>1F1E6,1F1EB||21</item>
-        <item>1F1E6,1F1EC||21</item>
-        <item>1F1E6,1F1EE||21</item>
-        <item>1F1E6,1F1F1||21</item>
-        <item>1F1E6,1F1F2||21</item>
-        <item>1F1E6,1F1F4||21</item>
+        <item>1F1E6,1F1E9</item>
+        <item>1F1E6,1F1EA</item>
+        <item>1F1E6,1F1EB</item>
+        <item>1F1E6,1F1EC</item>
+        <item>1F1E6,1F1EE</item>
+        <item>1F1E6,1F1F1</item>
+        <item>1F1E6,1F1F2</item>
+        <item>1F1E6,1F1F4</item>
         <item>1F1E6,1F1F6||24</item>
-        <item>1F1E6,1F1F7||21</item>
-        <item>1F1E6,1F1F8||21</item>
-        <item>1F1E6,1F1F9||21</item>
-        <item>1F1E6,1F1FA||21</item>
-        <item>1F1E6,1F1FC||21</item>
-        <item>1F1E6,1F1FD||21</item>
-        <item>1F1E6,1F1FF||21</item>
-        <item>1F1E7,1F1E6||21</item>
-        <item>1F1E7,1F1E7||21</item>
-        <item>1F1E7,1F1E9||21</item>
-        <item>1F1E7,1F1EA||21</item>
-        <item>1F1E7,1F1EB||21</item>
-        <item>1F1E7,1F1EC||21</item>
-        <item>1F1E7,1F1ED||21</item>
-        <item>1F1E7,1F1EE||21</item>
-        <item>1F1E7,1F1EF||21</item>
+        <item>1F1E6,1F1F7</item>
+        <item>1F1E6,1F1F8</item>
+        <item>1F1E6,1F1F9</item>
+        <item>1F1E6,1F1FA</item>
+        <item>1F1E6,1F1FC</item>
+        <item>1F1E6,1F1FD</item>
+        <item>1F1E6,1F1FF</item>
+        <item>1F1E7,1F1E6</item>
+        <item>1F1E7,1F1E7</item>
+        <item>1F1E7,1F1E9</item>
+        <item>1F1E7,1F1EA</item>
+        <item>1F1E7,1F1EB</item>
+        <item>1F1E7,1F1EC</item>
+        <item>1F1E7,1F1ED</item>
+        <item>1F1E7,1F1EE</item>
+        <item>1F1E7,1F1EF</item>
         <item>1F1E7,1F1F1||29</item>
-        <item>1F1E7,1F1F2||21</item>
-        <item>1F1E7,1F1F3||21</item>
-        <item>1F1E7,1F1F4||21</item>
+        <item>1F1E7,1F1F2</item>
+        <item>1F1E7,1F1F3</item>
+        <item>1F1E7,1F1F4</item>
         <item>1F1E7,1F1F6||29</item>
-        <item>1F1E7,1F1F7||21</item>
-        <item>1F1E7,1F1F8||21</item>
-        <item>1F1E7,1F1F9||21</item>
+        <item>1F1E7,1F1F7</item>
+        <item>1F1E7,1F1F8</item>
+        <item>1F1E7,1F1F9</item>
         <item>1F1E7,1F1FB||24</item>
-        <item>1F1E7,1F1FC||21</item>
-        <item>1F1E7,1F1FE||21</item>
-        <item>1F1E7,1F1FF||21</item>
-        <item>1F1E8,1F1E6||21</item>
-        <item>1F1E8,1F1E8||21</item>
-        <item>1F1E8,1F1E9||21</item>
-        <item>1F1E8,1F1EB||21</item>
-        <item>1F1E8,1F1EC||21</item>
-        <item>1F1E8,1F1ED||21</item>
-        <item>1F1E8,1F1EE||21</item>
-        <item>1F1E8,1F1F0||21</item>
-        <item>1F1E8,1F1F1||21</item>
-        <item>1F1E8,1F1F2||21</item>
-        <item>1F1E8,1F1F3||21</item>
-        <item>1F1E8,1F1F4||21</item>
+        <item>1F1E7,1F1FC</item>
+        <item>1F1E7,1F1FE</item>
+        <item>1F1E7,1F1FF</item>
+        <item>1F1E8,1F1E6</item>
+        <item>1F1E8,1F1E8</item>
+        <item>1F1E8,1F1E9</item>
+        <item>1F1E8,1F1EB</item>
+        <item>1F1E8,1F1EC</item>
+        <item>1F1E8,1F1ED</item>
+        <item>1F1E8,1F1EE</item>
+        <item>1F1E8,1F1F0</item>
+        <item>1F1E8,1F1F1</item>
+        <item>1F1E8,1F1F2</item>
+        <item>1F1E8,1F1F3</item>
+        <item>1F1E8,1F1F4</item>
         <item>1F1E8,1F1F5||24</item>
-        <item>1F1E8,1F1F7||21</item>
-        <item>1F1E8,1F1FA||21</item>
-        <item>1F1E8,1F1FB||21</item>
-        <item>1F1E8,1F1FC||21</item>
-        <item>1F1E8,1F1FD||21</item>
-        <item>1F1E8,1F1FE||21</item>
-        <item>1F1E8,1F1FF||21</item>
-        <item>1F1E9,1F1EA||21</item>
-        <item>1F1E9,1F1EF||21</item>
-        <item>1F1E9,1F1F0||21</item>
-        <item>1F1E9,1F1F2||21</item>
-        <item>1F1E9,1F1F4||21</item>
-        <item>1F1E9,1F1FF||21</item>
-        <item>1F1EA,1F1E8||21</item>
-        <item>1F1EA,1F1EA||21</item>
-        <item>1F1EA,1F1EC||21</item>
-        <item>1F1EA,1F1F7||21</item>
-        <item>1F1EA,1F1F8||21</item>
-        <item>1F1EA,1F1F9||21</item>
-        <item>1F1EA,1F1FA||21</item>
-        <item>1F1EB,1F1EE||21</item>
-        <item>1F1EB,1F1EF||21</item>
-        <item>1F1EB,1F1F2||21</item>
-        <item>1F1EB,1F1F4||21</item>
-        <item>1F1EB,1F1F7||21</item>
-        <item>1F1EC,1F1E6||21</item>
-        <item>1F1EC,1F1E7||21</item>
-        <item>1F1EC,1F1E9||21</item>
-        <item>1F1EC,1F1EA||21</item>
-        <item>1F1EC,1F1EC||21</item>
-        <item>1F1EC,1F1ED||21</item>
-        <item>1F1EC,1F1EE||21</item>
-        <item>1F1EC,1F1F1||21</item>
-        <item>1F1EC,1F1F2||21</item>
-        <item>1F1EC,1F1F3||21</item>
-        <item>1F1EC,1F1F6||21</item>
-        <item>1F1EC,1F1F7||21</item>
-        <item>1F1EC,1F1F9||21</item>
-        <item>1F1EC,1F1FA||21</item>
-        <item>1F1EC,1F1FC||21</item>
-        <item>1F1EC,1F1FE||21</item>
-        <item>1F1ED,1F1F0||21</item>
+        <item>1F1E8,1F1F6||35</item>
+        <item>1F1E8,1F1F7</item>
+        <item>1F1E8,1F1FA</item>
+        <item>1F1E8,1F1FB</item>
+        <item>1F1E8,1F1FC</item>
+        <item>1F1E8,1F1FD</item>
+        <item>1F1E8,1F1FE</item>
+        <item>1F1E8,1F1FF</item>
+        <item>1F1E9,1F1EA</item>
+        <item>1F1E9,1F1EC||30</item>
+        <item>1F1E9,1F1EF</item>
+        <item>1F1E9,1F1F0</item>
+        <item>1F1E9,1F1F2</item>
+        <item>1F1E9,1F1F4</item>
+        <item>1F1E9,1F1FF</item>
+        <item>1F1EA,1F1E6||30</item>
+        <item>1F1EA,1F1E8</item>
+        <item>1F1EA,1F1EA</item>
+        <item>1F1EA,1F1EC</item>
+        <item>1F1EA,1F1ED||30</item>
+        <item>1F1EA,1F1F7</item>
+        <item>1F1EA,1F1F8</item>
+        <item>1F1EA,1F1F9</item>
+        <item>1F1EA,1F1FA</item>
+        <item>1F1EB,1F1EE</item>
+        <item>1F1EB,1F1EF</item>
+        <item>1F1EB,1F1F0||30</item>
+        <item>1F1EB,1F1F2</item>
+        <item>1F1EB,1F1F4</item>
+        <item>1F1EB,1F1F7</item>
+        <item>1F1EC,1F1E6</item>
+        <item>1F1EC,1F1E7</item>
+        <item>1F1EC,1F1E9</item>
+        <item>1F1EC,1F1EA</item>
+        <item>1F1EC,1F1EB||30</item>
+        <item>1F1EC,1F1EC</item>
+        <item>1F1EC,1F1ED</item>
+        <item>1F1EC,1F1EE</item>
+        <item>1F1EC,1F1F1</item>
+        <item>1F1EC,1F1F2</item>
+        <item>1F1EC,1F1F3</item>
+        <item>1F1EC,1F1F5||30</item>
+        <item>1F1EC,1F1F6</item>
+        <item>1F1EC,1F1F7</item>
+        <item>1F1EC,1F1F8||30</item>
+        <item>1F1EC,1F1F9</item>
+        <item>1F1EC,1F1FA</item>
+        <item>1F1EC,1F1FC</item>
+        <item>1F1EC,1F1FE</item>
+        <item>1F1ED,1F1F0</item>
         <item>1F1ED,1F1F2||24</item>
-        <item>1F1ED,1F1F3||21</item>
-        <item>1F1ED,1F1F7||21</item>
-        <item>1F1ED,1F1F9||21</item>
-        <item>1F1ED,1F1FA||21</item>
+        <item>1F1ED,1F1F3</item>
+        <item>1F1ED,1F1F7</item>
+        <item>1F1ED,1F1F9</item>
+        <item>1F1ED,1F1FA</item>
         <item>1F1EE,1F1E8||24</item>
-        <item>1F1EE,1F1E9||21</item>
-        <item>1F1EE,1F1EA||21</item>
-        <item>1F1EE,1F1F1||21</item>
-        <item>1F1EE,1F1F2||21</item>
-        <item>1F1EE,1F1F3||21</item>
-        <item>1F1EE,1F1F4||21</item>
-        <item>1F1EE,1F1F6||21</item>
-        <item>1F1EE,1F1F7||21</item>
-        <item>1F1EE,1F1F8||21</item>
-        <item>1F1EE,1F1F9||21</item>
-        <item>1F1EF,1F1EA||21</item>
-        <item>1F1EF,1F1F2||21</item>
-        <item>1F1EF,1F1F4||21</item>
-        <item>1F1EF,1F1F5||21</item>
-        <item>1F1F0,1F1EA||21</item>
-        <item>1F1F0,1F1EC||21</item>
-        <item>1F1F0,1F1ED||21</item>
-        <item>1F1F0,1F1EE||21</item>
-        <item>1F1F0,1F1F2||21</item>
-        <item>1F1F0,1F1F3||21</item>
-        <item>1F1F0,1F1F5||21</item>
-        <item>1F1F0,1F1F7||21</item>
-        <item>1F1F0,1F1FC||21</item>
-        <item>1F1F0,1F1FE||21</item>
-        <item>1F1F0,1F1FF||21</item>
-        <item>1F1F1,1F1E6||21</item>
-        <item>1F1F1,1F1E7||21</item>
-        <item>1F1F1,1F1E8||21</item>
-        <item>1F1F1,1F1EE||21</item>
-        <item>1F1F1,1F1F0||21</item>
-        <item>1F1F1,1F1F7||21</item>
-        <item>1F1F1,1F1F8||21</item>
-        <item>1F1F1,1F1F9||21</item>
-        <item>1F1F1,1F1FA||21</item>
-        <item>1F1F1,1F1FB||21</item>
-        <item>1F1F1,1F1FE||21</item>
-        <item>1F1F2,1F1E6||21</item>
-        <item>1F1F2,1F1E8||21</item>
-        <item>1F1F2,1F1E9||21</item>
-        <item>1F1F2,1F1EA||21</item>
-        <item>1F1F2,1F1EC||21</item>
-        <item>1F1F2,1F1ED||21</item>
-        <item>1F1F2,1F1F0||21</item>
-        <item>1F1F2,1F1F1||21</item>
-        <item>1F1F2,1F1F2||21</item>
-        <item>1F1F2,1F1F3||21</item>
-        <item>1F1F2,1F1F4||21</item>
-        <item>1F1F2,1F1F5||21</item>
+        <item>1F1EE,1F1E9</item>
+        <item>1F1EE,1F1EA</item>
+        <item>1F1EE,1F1F1</item>
+        <item>1F1EE,1F1F2</item>
+        <item>1F1EE,1F1F3</item>
+        <item>1F1EE,1F1F4</item>
+        <item>1F1EE,1F1F6</item>
+        <item>1F1EE,1F1F7</item>
+        <item>1F1EE,1F1F8</item>
+        <item>1F1EE,1F1F9</item>
+        <item>1F1EF,1F1EA</item>
+        <item>1F1EF,1F1F2</item>
+        <item>1F1EF,1F1F4</item>
+        <item>1F1EF,1F1F5</item>
+        <item>1F1F0,1F1EA</item>
+        <item>1F1F0,1F1EC</item>
+        <item>1F1F0,1F1ED</item>
+        <item>1F1F0,1F1EE</item>
+        <item>1F1F0,1F1F2</item>
+        <item>1F1F0,1F1F3</item>
+        <item>1F1F0,1F1F5</item>
+        <item>1F1F0,1F1F7</item>
+        <item>1F1F0,1F1FC</item>
+        <item>1F1F0,1F1FE</item>
+        <item>1F1F0,1F1FF</item>
+        <item>1F1F1,1F1E6</item>
+        <item>1F1F1,1F1E7</item>
+        <item>1F1F1,1F1E8</item>
+        <item>1F1F1,1F1EE</item>
+        <item>1F1F1,1F1F0</item>
+        <item>1F1F1,1F1F7</item>
+        <item>1F1F1,1F1F8</item>
+        <item>1F1F1,1F1F9</item>
+        <item>1F1F1,1F1FA</item>
+        <item>1F1F1,1F1FB</item>
+        <item>1F1F1,1F1FE</item>
+        <item>1F1F2,1F1E6</item>
+        <item>1F1F2,1F1E8</item>
+        <item>1F1F2,1F1E9</item>
+        <item>1F1F2,1F1EA</item>
+        <item>1F1F2,1F1EB||30</item>
+        <item>1F1F2,1F1EC</item>
+        <item>1F1F2,1F1ED</item>
+        <item>1F1F2,1F1F0</item>
+        <item>1F1F2,1F1F1</item>
+        <item>1F1F2,1F1F2</item>
+        <item>1F1F2,1F1F3</item>
+        <item>1F1F2,1F1F4</item>
+        <item>1F1F2,1F1F5</item>
         <item>1F1F2,1F1F6||29</item>
-        <item>1F1F2,1F1F7||21</item>
-        <item>1F1F2,1F1F8||21</item>
-        <item>1F1F2,1F1F9||21</item>
-        <item>1F1F2,1F1FA||21</item>
-        <item>1F1F2,1F1FB||21</item>
-        <item>1F1F2,1F1FC||21</item>
-        <item>1F1F2,1F1FD||21</item>
-        <item>1F1F2,1F1FE||21</item>
-        <item>1F1F2,1F1FF||21</item>
-        <item>1F1F3,1F1E6||21</item>
-        <item>1F1F3,1F1EA||21</item>
-        <item>1F1F3,1F1EB||21</item>
-        <item>1F1F3,1F1EC||21</item>
-        <item>1F1F3,1F1EE||21</item>
-        <item>1F1F3,1F1F1||21</item>
-        <item>1F1F3,1F1F4||21</item>
-        <item>1F1F3,1F1F5||21</item>
-        <item>1F1F3,1F1F7||21</item>
-        <item>1F1F3,1F1FA||21</item>
-        <item>1F1F3,1F1FF||21</item>
-        <item>1F1F4,1F1F2||21</item>
-        <item>1F1F5,1F1E6||21</item>
-        <item>1F1F5,1F1EA||21</item>
-        <item>1F1F5,1F1EB||21</item>
-        <item>1F1F5,1F1EC||21</item>
-        <item>1F1F5,1F1ED||21</item>
-        <item>1F1F5,1F1F0||21</item>
-        <item>1F1F5,1F1F1||21</item>
-        <item>1F1F5,1F1F3||21</item>
-        <item>1F1F5,1F1F7||21</item>
-        <item>1F1F5,1F1F8||21</item>
-        <item>1F1F5,1F1F9||21</item>
-        <item>1F1F5,1F1FC||21</item>
-        <item>1F1F5,1F1FE||21</item>
-        <item>1F1F6,1F1E6||21</item>
+        <item>1F1F2,1F1F7</item>
+        <item>1F1F2,1F1F8</item>
+        <item>1F1F2,1F1F9</item>
+        <item>1F1F2,1F1FA</item>
+        <item>1F1F2,1F1FB</item>
+        <item>1F1F2,1F1FC</item>
+        <item>1F1F2,1F1FD</item>
+        <item>1F1F2,1F1FE</item>
+        <item>1F1F2,1F1FF</item>
+        <item>1F1F3,1F1E6</item>
+        <item>1F1F3,1F1E8||30</item>
+        <item>1F1F3,1F1EA</item>
+        <item>1F1F3,1F1EB</item>
+        <item>1F1F3,1F1EC</item>
+        <item>1F1F3,1F1EE</item>
+        <item>1F1F3,1F1F1</item>
+        <item>1F1F3,1F1F4</item>
+        <item>1F1F3,1F1F5</item>
+        <item>1F1F3,1F1F7</item>
+        <item>1F1F3,1F1FA</item>
+        <item>1F1F3,1F1FF</item>
+        <item>1F1F4,1F1F2</item>
+        <item>1F1F5,1F1E6</item>
+        <item>1F1F5,1F1EA</item>
+        <item>1F1F5,1F1EB</item>
+        <item>1F1F5,1F1EC</item>
+        <item>1F1F5,1F1ED</item>
+        <item>1F1F5,1F1F0</item>
+        <item>1F1F5,1F1F1</item>
+        <item>1F1F5,1F1F2||30</item>
+        <item>1F1F5,1F1F3</item>
+        <item>1F1F5,1F1F7</item>
+        <item>1F1F5,1F1F8</item>
+        <item>1F1F5,1F1F9</item>
+        <item>1F1F5,1F1FC</item>
+        <item>1F1F5,1F1FE</item>
+        <item>1F1F6,1F1E6</item>
         <item>1F1F7,1F1EA||29</item>
-        <item>1F1F7,1F1F4||21</item>
-        <item>1F1F7,1F1F8||21</item>
-        <item>1F1F7,1F1FA||21</item>
-        <item>1F1F7,1F1FC||21</item>
-        <item>1F1F8,1F1E6||21</item>
-        <item>1F1F8,1F1E7||21</item>
-        <item>1F1F8,1F1E8||21</item>
-        <item>1F1F8,1F1E9||21</item>
-        <item>1F1F8,1F1EA||21</item>
-        <item>1F1F8,1F1EC||21</item>
+        <item>1F1F7,1F1F4</item>
+        <item>1F1F7,1F1F8</item>
+        <item>1F1F7,1F1FA</item>
+        <item>1F1F7,1F1FC</item>
+        <item>1F1F8,1F1E6</item>
+        <item>1F1F8,1F1E7</item>
+        <item>1F1F8,1F1E8</item>
+        <item>1F1F8,1F1E9</item>
+        <item>1F1F8,1F1EA</item>
+        <item>1F1F8,1F1EC</item>
         <item>1F1F8,1F1ED||24</item>
-        <item>1F1F8,1F1EE||21</item>
+        <item>1F1F8,1F1EE</item>
         <item>1F1F8,1F1EF||24</item>
-        <item>1F1F8,1F1F0||21</item>
-        <item>1F1F8,1F1F1||21</item>
-        <item>1F1F8,1F1F2||21</item>
-        <item>1F1F8,1F1F3||21</item>
-        <item>1F1F8,1F1F4||21</item>
-        <item>1F1F8,1F1F7||21</item>
-        <item>1F1F8,1F1F8||21</item>
-        <item>1F1F8,1F1F9||21</item>
-        <item>1F1F8,1F1FB||21</item>
-        <item>1F1F8,1F1FD||21</item>
-        <item>1F1F8,1F1FE||21</item>
-        <item>1F1F8,1F1FF||21</item>
+        <item>1F1F8,1F1F0</item>
+        <item>1F1F8,1F1F1</item>
+        <item>1F1F8,1F1F2</item>
+        <item>1F1F8,1F1F3</item>
+        <item>1F1F8,1F1F4</item>
+        <item>1F1F8,1F1F7</item>
+        <item>1F1F8,1F1F8</item>
+        <item>1F1F8,1F1F9</item>
+        <item>1F1F8,1F1FB</item>
+        <item>1F1F8,1F1FD</item>
+        <item>1F1F8,1F1FE</item>
+        <item>1F1F8,1F1FF</item>
         <item>1F1F9,1F1E6||24</item>
-        <item>1F1F9,1F1E8||21</item>
-        <item>1F1F9,1F1E9||21</item>
+        <item>1F1F9,1F1E8</item>
+        <item>1F1F9,1F1E9</item>
         <item>1F1F9,1F1EB||29</item>
-        <item>1F1F9,1F1EC||21</item>
-        <item>1F1F9,1F1ED||21</item>
-        <item>1F1F9,1F1EF||21</item>
-        <item>1F1F9,1F1F0||21</item>
-        <item>1F1F9,1F1F1||21</item>
-        <item>1F1F9,1F1F2||21</item>
-        <item>1F1F9,1F1F3||21</item>
-        <item>1F1F9,1F1F4||21</item>
-        <item>1F1F9,1F1F7||21</item>
-        <item>1F1F9,1F1F9||21</item>
-        <item>1F1F9,1F1FB||21</item>
-        <item>1F1F9,1F1FC||21</item>
-        <item>1F1F9,1F1FF||21</item>
-        <item>1F1FA,1F1E6||21</item>
-        <item>1F1FA,1F1EC||21</item>
+        <item>1F1F9,1F1EC</item>
+        <item>1F1F9,1F1ED</item>
+        <item>1F1F9,1F1EF</item>
+        <item>1F1F9,1F1F0</item>
+        <item>1F1F9,1F1F1</item>
+        <item>1F1F9,1F1F2</item>
+        <item>1F1F9,1F1F3</item>
+        <item>1F1F9,1F1F4</item>
+        <item>1F1F9,1F1F7</item>
+        <item>1F1F9,1F1F9</item>
+        <item>1F1F9,1F1FB</item>
+        <item>1F1F9,1F1FC</item>
+        <item>1F1F9,1F1FF</item>
+        <item>1F1FA,1F1E6</item>
+        <item>1F1FA,1F1EC</item>
         <item>1F1FA,1F1F2||24</item>
         <item>1F1FA,1F1F3||26</item>
-        <item>1F1FA,1F1F8||21</item>
-        <item>1F1FA,1F1FE||21</item>
-        <item>1F1FA,1F1FF||21</item>
-        <item>1F1FB,1F1E6||21</item>
-        <item>1F1FB,1F1E8||21</item>
-        <item>1F1FB,1F1EA||21</item>
-        <item>1F1FB,1F1EC||21</item>
-        <item>1F1FB,1F1EE||21</item>
-        <item>1F1FB,1F1F3||21</item>
-        <item>1F1FB,1F1FA||21</item>
-        <item>1F1FC,1F1F8||21</item>
+        <item>1F1FA,1F1F8</item>
+        <item>1F1FA,1F1FE</item>
+        <item>1F1FA,1F1FF</item>
+        <item>1F1FB,1F1E6</item>
+        <item>1F1FB,1F1E8</item>
+        <item>1F1FB,1F1EA</item>
+        <item>1F1FB,1F1EC</item>
+        <item>1F1FB,1F1EE</item>
+        <item>1F1FB,1F1F3</item>
+        <item>1F1FB,1F1FA</item>
+        <item>1F1FC,1F1EB||30</item>
+        <item>1F1FC,1F1F8</item>
         <item>1F1FD,1F1F0||29</item>
-        <item>1F1FE,1F1EA||21</item>
-        <item>1F1FF,1F1E6||21</item>
-        <item>1F1FF,1F1F2||21</item>
-        <item>1F1FF,1F1FC||21</item>
+        <item>1F1FE,1F1EA</item>
+        <item>1F1FE,1F1F9||30</item>
+        <item>1F1FF,1F1E6</item>
+        <item>1F1FF,1F1F2</item>
+        <item>1F1FF,1F1FC</item>
         <item>1F3F4,E0067,E0062,E0065,E006E,E0067,E007F||26</item>
         <item>1F3F4,E0067,E0062,E0073,E0063,E0074,E007F||26</item>
         <item>1F3F4,E0067,E0062,E0077,E006C,E0073,E007F||26</item>
diff --git a/tools/make-emoji-keys/src/main/kotlin/com/majeur/inputmethod/tools/emoji/EmojiCategoriesResource.kt b/tools/make-emoji-keys/src/main/kotlin/com/majeur/inputmethod/tools/emoji/EmojiCategoriesResource.kt
index c9b4df3e..223a93a9 100644
--- a/tools/make-emoji-keys/src/main/kotlin/com/majeur/inputmethod/tools/emoji/EmojiCategoriesResource.kt
+++ b/tools/make-emoji-keys/src/main/kotlin/com/majeur/inputmethod/tools/emoji/EmojiCategoriesResource.kt
@@ -121,7 +121,7 @@ class EmojiCategoriesResource(private val jarFile: JarFile) {
                     it.toString(radix = 16)
                             .uppercase()
                 }
-        return if (minApi > 19) "$cps||$minApi" else cps
+        return if (minApi > 21) "$cps||$minApi" else cps
     }
 
     private fun getMinApi(codes: IntArray, supportData: Map<Int, Int>): Int {