Merge remote-tracking branch 'aosp/cldr-release-33-1' into aosp/master.

This updates AOSP to CLDR 33.1 in preparation for the ICU 62.1 upgrade.

Bug: 111246576
Change-Id: I391323aa1215dd9cc021987e9f98251da9760381

21 files changed, 1619 insertions, 695 deletions

diff --git a/tools/java/org/unicode/cldr/draft/ScriptMetadata.java b/tools/java/org/unicode/cldr/draft/ScriptMetadata.java
index 44d6ba0..6921faf 100644
--- a/tools/java/org/unicode/cldr/draft/ScriptMetadata.java
+++ b/tools/java/org/unicode/cldr/draft/ScriptMetadata.java
@@ -305,13 +305,21 @@ public class ScriptMetadata {
     }
 
     public enum Groupings {
-        EUROPEAN("150"), MIDDLE_EASTERN("145"), SOUTH_ASIAN("034"), SOUTHEAST_ASIAN("035"), EAST_ASIAN("030"), AFRICAN("002"), AMERICAN("019"),;
+        EUROPEAN("150"),
+        MIDDLE_EASTERN("145"),
+        CENTRAL_ASIAN("143"),
+        SOUTH_ASIAN("034"),
+        SOUTHEAST_ASIAN("035"),
+        EAST_ASIAN("030"),
+        AFRICAN("002"),
+        AMERICAN("019"),;
         public final Set<String> scripts;
 
         private Groupings(String... regions) {
             scripts = With
                 .in(getScripts())
-                .toUnmodifiableCollection(new ScriptMetadata.RegionFilter(regions), new TreeSet());
+                .toUnmodifiableCollection(
+                    new ScriptMetadata.RegionFilter(regions), new TreeSet<String>());
         }
     }
 
diff --git a/tools/java/org/unicode/cldr/test/CheckCLDR.java b/tools/java/org/unicode/cldr/test/CheckCLDR.java
index 831ed93..78a4c8b 100644
--- a/tools/java/org/unicode/cldr/test/CheckCLDR.java
+++ b/tools/java/org/unicode/cldr/test/CheckCLDR.java
@@ -696,7 +696,7 @@ abstract public class CheckCLDR {
 
             charactersNotInCurrencyExemplars, asciiCharactersNotInCurrencyExemplars, charactersNotInMainOrAuxiliaryExemplars, asciiCharactersNotInMainOrAuxiliaryExemplars,
 
-            narrowDateFieldTooWide, illegalCharactersInExemplars, orientationDisagreesWithExemplars, inconsistentDatePattern, inconsistentTimePattern, missingDatePattern, illegalDatePattern, missingMainExemplars, mustNotStartOrEndWithSpace, illegalCharactersInNumberPattern, numberPatternNotCanonical, currencyPatternMissingCurrencySymbol, missingMinusSign, badNumericType, percentPatternMissingPercentSymbol, illegalNumberFormat, unexpectedAttributeValue, metazoneContainsDigit, tooManyGroupingSeparators, inconsistentPluralFormat, sameAsEnglishOrCode, dateSymbolCollision, incompleteLogicalGroup, extraMetazoneString, inconsistentDraftStatus, errorOrWarningInLogicalGroup, valueTooWide, valueTooNarrow, nameContainsYear, patternCannotContainDigits, patternContainsInvalidCharacters, parenthesesNotAllowed, illegalNumberingSystem, unexpectedOrderOfEraYear, invalidPlaceHolder, asciiQuotesNotAllowed, badMinimumGroupingDigits, inconsistentPeriods, inheritanceMarkerNotAllowed, invalidDurationUnitPattern, invalidDelimiter, illegalCharactersInPattern, badParseLenient;
+            narrowDateFieldTooWide, illegalCharactersInExemplars, orientationDisagreesWithExemplars, inconsistentDatePattern, inconsistentTimePattern, missingDatePattern, illegalDatePattern, missingMainExemplars, mustNotStartOrEndWithSpace, illegalCharactersInNumberPattern, numberPatternNotCanonical, currencyPatternMissingCurrencySymbol, missingMinusSign, badNumericType, percentPatternMissingPercentSymbol, illegalNumberFormat, unexpectedAttributeValue, metazoneContainsDigit, tooManyGroupingSeparators, inconsistentPluralFormat, sameAsEnglishOrCode, dateSymbolCollision, incompleteLogicalGroup, extraMetazoneString, inconsistentDraftStatus, errorOrWarningInLogicalGroup, valueTooWide, valueTooNarrow, nameContainsYear, patternCannotContainDigits, patternContainsInvalidCharacters, parenthesesNotAllowed, illegalNumberingSystem, unexpectedOrderOfEraYear, invalidPlaceHolder, asciiQuotesNotAllowed, badMinimumGroupingDigits, inconsistentPeriods, inheritanceMarkerNotAllowed, invalidDurationUnitPattern, invalidDelimiter, illegalCharactersInPattern, badParseLenient, tooManyValues;
 
             public String toString() {
                 return TO_STRING.matcher(name()).replaceAll(" $1").toLowerCase();
diff --git a/tools/java/org/unicode/cldr/test/CheckWidths.java b/tools/java/org/unicode/cldr/test/CheckWidths.java
index fd3687c..d8366b5 100644
--- a/tools/java/org/unicode/cldr/test/CheckWidths.java
+++ b/tools/java/org/unicode/cldr/test/CheckWidths.java
@@ -19,6 +19,8 @@ public class CheckWidths extends CheckCLDR {
     private static CoverageLevel2 coverageLevel;
     private Level requiredLevel;
 
+    public static final int MAX_COMPONENTS_PER_ANNOTATION = 16;
+    
     SupplementalDataInfo supplementalData;
 
     private static final double EM = ApproximateWidth.getWidth("月");
@@ -26,7 +28,7 @@ public class CheckWidths extends CheckCLDR {
     private static final boolean DEBUG = true;
 
     private enum Measure {
-        CODE_POINTS, DISPLAY_WIDTH
+        CODE_POINTS, DISPLAY_WIDTH, SET_ELEMENTS
     }
 
     private enum LimitType {
@@ -34,7 +36,7 @@ public class CheckWidths extends CheckCLDR {
     }
 
     private enum Special {
-        NONE, QUOTES, PLACEHOLDERS, NUMBERSYMBOLS, NUMBERFORMAT
+        NONE, QUOTES, PLACEHOLDERS, NUMBERSYMBOLS, NUMBERFORMAT, BARS
     }
 
     private static final Pattern PLACEHOLDER_PATTERN = PatternCache.get("\\{\\d\\}");
@@ -58,16 +60,35 @@ public class CheckWidths extends CheckCLDR {
             this.special = special;
             switch (limit) {
             case MINIMUM:
-                this.message = measure == Measure.CODE_POINTS
-                    ? "Expected no fewer than {0} character(s), but was {1}."
-                    : "Too narrow by about {2}% (with common fonts).";
                 this.subtype = Subtype.valueTooNarrow;
+                switch (measure) {
+                case CODE_POINTS:
+                    this.message = "Expected no fewer than {0} character(s), but was {1}.";
+                    break;
+                case DISPLAY_WIDTH:
+                    this.message = "Too narrow by about {2}% (with common fonts).";
+                    break;
+                default:
+                    throw new IllegalArgumentException();
+                }
                 break;
             case MAXIMUM:
-                this.message = measure == Measure.CODE_POINTS
-                    ? "Expected no more than {0} character(s), but was {1}."
-                    : "Too wide by about {2}% (with common fonts).";
-                this.subtype = Subtype.valueTooWide;
+                switch (measure) {
+                case CODE_POINTS:
+                    this.message = "Expected no more than {0} character(s), but was {1}.";
+                    this.subtype = Subtype.valueTooWide;
+                    break;
+                case DISPLAY_WIDTH:
+                    this.message = "Too wide by about {2}% (with common fonts).";
+                    this.subtype = Subtype.valueTooWide;
+                    break;
+                case SET_ELEMENTS: 
+                    this.message = "Expected no more than {0} items(s), but was {1}.";
+                    this.subtype = Subtype.tooManyValues;
+                    break;
+                default:
+                    throw new IllegalArgumentException();
+                }
                 break;
             default:
                 throw new IllegalArgumentException();
@@ -95,9 +116,13 @@ public class CheckWidths extends CheckCLDR {
             case NUMBERSYMBOLS:
                 value = value.replaceAll("[\u200E\u200F\u061C]", ""); // don't include LRM/RLM/ALM when checking length of number symbols
                 break;
+            case BARS:
+                value = value.replaceAll("[^|]", "")+"|"; // Check the number of items by counting separators. Bit of a hack...
+                break;
             default:
             }
-            double valueMeasure = measure == Measure.CODE_POINTS ? value.codePointCount(0, value.length()) : ApproximateWidth.getWidth(value);
+            double valueMeasure = measure == Measure.DISPLAY_WIDTH ? ApproximateWidth.getWidth(value)
+                : value.codePointCount(0, value.length()) ;
             CheckStatus.Type errorType = CheckStatus.warningType;
             switch (limit) {
             case MINIMUM:
@@ -113,7 +138,13 @@ public class CheckWidths extends CheckCLDR {
                     return false;
                 }
                 if (valueMeasure > errorReference && cause.getPhase() != Phase.BUILD && !aliasedAndComprenehsive) {
-                    errorType = CheckStatus.errorType;
+                    // Workaround for ST submission phase only per TC discussion 2018-05-30
+                    // Make too many keywords be only a warning until we decide policy (JCE)
+                    if (cause.getPhase() == Phase.SUBMISSION && measure.equals(Measure.SET_ELEMENTS)) {
+                        errorType = CheckStatus.warningType;
+                    } else {
+                        errorType = CheckStatus.errorType;
+                    }
                 }
                 break;
             }
@@ -240,7 +271,7 @@ public class CheckWidths extends CheckCLDR {
         .add("//ldml/numbers/decimalFormats[@numberSystem=%A]/decimalFormatLength[@type=\"short\"]/decimalFormat[@type=%A]/pattern[@type=\"1",
             new Limit[] {
                 new Limit(4 * EM, 5 * EM, Measure.DISPLAY_WIDTH, LimitType.MAXIMUM, Special.NUMBERFORMAT)
-            })
+        })
         // Catch -future/past Narrow units  and allow much wider values
         .add("//ldml/units/unitLength[@type=\"narrow\"]/unit[@type=\"[^\"]+-(future|past)\"]/unitPattern", new Limit[] {
             new Limit(10 * EM, 15 * EM, Measure.DISPLAY_WIDTH, LimitType.MAXIMUM, Special.PLACEHOLDERS)
@@ -270,8 +301,12 @@ public class CheckWidths extends CheckCLDR {
         // "grinning cat face with smiling eyes" should be normal max ~= 160 em
         // emoji names (not keywords)
         .add("//ldml/annotations/annotation[@cp=%A][@type=%A]", new Limit[] {
-            new Limit(20 * EM, 100 * EM, Measure.DISPLAY_WIDTH, LimitType.MAXIMUM, Special.NONE)
-        });
+            new Limit(20 * EM, 100 * EM, Measure.DISPLAY_WIDTH, LimitType.MAXIMUM, Special.NONE),
+        })
+        .add("//ldml/annotations/annotation[@cp=%A]", new Limit[] {
+            new Limit(5, MAX_COMPONENTS_PER_ANNOTATION, Measure.SET_ELEMENTS, LimitType.MAXIMUM, Special.BARS) // Allow up to 5 with no warning, up to 7 with no error.
+        })
+        ;
 
     static {
         System.out.println("EMs: " + ApproximateWidth.getWidth("grinning cat face with smiling eyes"));
diff --git a/tools/java/org/unicode/cldr/test/EmojiSubdivisionNames.java b/tools/java/org/unicode/cldr/test/EmojiSubdivisionNames.java
new file mode 100644
index 0000000..b678c85
--- /dev/null
+++ b/tools/java/org/unicode/cldr/test/EmojiSubdivisionNames.java
@@ -0,0 +1,146 @@
+package org.unicode.cldr.test;
+
+import java.io.File;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeMap;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.unicode.cldr.draft.FileUtilities;
+import org.unicode.cldr.util.CLDRConfig;
+import org.unicode.cldr.util.CLDRFile;
+import org.unicode.cldr.util.CLDRPaths;
+import org.unicode.cldr.util.EmojiConstants;
+import org.unicode.cldr.util.LanguageGroup;
+import org.unicode.cldr.util.LocaleIDParser;
+import org.unicode.cldr.util.Organization;
+import org.unicode.cldr.util.StandardCodes;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.ImmutableSortedSet;
+import com.ibm.icu.util.ULocale;
+
+public class EmojiSubdivisionNames {
+    private static final String subdivisionPathPrefix = "//ldml/localeDisplayNames/subdivisions/subdivision[@type=\"";
+    private static final String subdivisionPathSuffix = "\"]";
+    private static final Map<String,Map<String,String>> localeToNameToSubdivisionId = new ConcurrentHashMap<>();
+    private static final Map<String,Map<String,String>> localeToSubdivisionIdToName = new ConcurrentHashMap<>();
+
+    private static final Pattern SUBDIVISION_PATTERN = Pattern.compile("\\s*<subdivision\\s+type=\"(gb(?:eng|sct|wls))\">([^<]+)</subdivision>");
+    private static final SortedSet<String> SUBDIVISION_FILE_NAMES = ImmutableSortedSet.copyOf(
+        new File(CLDRPaths.SUBDIVISIONS_DIRECTORY).list()
+        );
+
+    static {
+        localeToNameToSubdivisionId.put("root", Collections.emptyMap());
+    }
+
+    public static Map<String, String> getSubdivisionIdToName(String localeID) {
+        Map<String,String> result = localeToSubdivisionIdToName.get(localeID);
+        if (result == null) {
+            load(localeID);
+            result = localeToSubdivisionIdToName.get(localeID);
+            if (result == null) {
+                result = Collections.emptyMap();
+            }
+        }
+        return result;
+    }
+
+    public static Map<String, String> getNameToSubdivisionPath(String localeID) {
+        Map<String,String> result = localeToNameToSubdivisionId.get(localeID);
+        if (result == null) {
+            load(localeID);
+            result = localeToNameToSubdivisionId.get(localeID);
+            if (result == null) {
+                result = Collections.emptyMap();
+            }
+        }
+        return result;
+    }
+
+    private static void load(String localeID) {
+        try {
+            Map<String,String> _subdivisionIdToName;
+            Map<String, String> _nameToSubdivisionId;
+
+            String fileName = localeID + ".xml";
+            if (SUBDIVISION_FILE_NAMES.contains(fileName)) {
+                _nameToSubdivisionId = new TreeMap<>();
+                _subdivisionIdToName = new TreeMap<>();
+                Matcher m = SUBDIVISION_PATTERN.matcher("");
+                for (String line : FileUtilities.in(new File(CLDRPaths.SUBDIVISIONS_DIRECTORY, fileName))) {
+                    if (m.reset(line).matches()) {
+                        String xpath = subdivisionPathPrefix + EmojiConstants.toTagSeq(m.group(1)) + subdivisionPathSuffix;
+                        _nameToSubdivisionId.put(m.group(2), xpath);
+                        _subdivisionIdToName.put(m.group(1), m.group(2));
+                    }
+                }
+                _nameToSubdivisionId = _nameToSubdivisionId.isEmpty() ? Collections.emptyMap() 
+                    : ImmutableMap.copyOf(_nameToSubdivisionId);
+                _subdivisionIdToName = _subdivisionIdToName.isEmpty() ? Collections.emptyMap() 
+                    : ImmutableMap.copyOf(_subdivisionIdToName);
+            } else {
+                String parentLocaleId = LocaleIDParser.getParent(localeID);
+                _nameToSubdivisionId = getNameToSubdivisionPath(parentLocaleId);
+                _subdivisionIdToName = localeToSubdivisionIdToName.get(parentLocaleId);
+            }
+            localeToNameToSubdivisionId.put(localeID, _nameToSubdivisionId);
+            localeToSubdivisionIdToName.put(localeID, _subdivisionIdToName);
+        } catch (Exception e) {}
+    }
+
+    static Set<String> SUBDIVISIONS = ImmutableSet.of("gbeng", "gbsct", "gbwls");
+
+    public static void main(String[] args) {
+        System.out.print("Group\tOrd.\tLocale\tCode");
+        for (String sd : SUBDIVISIONS) {
+            System.out.print('\t');
+            System.out.print(sd);
+
+        }
+        System.out.println();
+        CLDRFile english = CLDRConfig.getInstance().getEnglish();
+        Set<String> locales = new HashSet<>();
+        for (String filename : SUBDIVISION_FILE_NAMES) {
+            if (filename.endsWith(".xml")) {
+                String locale = filename.substring(0, filename.length()-4);
+                Map<String, String> map = getSubdivisionIdToName(locale);
+                if (!map.isEmpty()) {
+                    locales.add(locale);
+                    ULocale ulocale = new ULocale(locale);
+                    LanguageGroup group = LanguageGroup.get(ulocale);
+                    int rank = LanguageGroup.rankInGroup(ulocale);
+                    System.out.print(group + "\t" + rank + "\t" + english.getName(locale) + "\t" + locale);
+                    for (String sd : SUBDIVISIONS) {
+                        System.out.print('\t');
+                        System.out.print(map.get(sd));
+                    }
+                    System.out.println();
+                }
+            }
+        }
+        for (String locale : StandardCodes.make().getLocaleCoverageLocales(Organization.cldr)) {
+            if (locales.contains(locale)) {
+                continue;
+            }
+            ULocale ulocale = new ULocale(locale);
+            String region = ulocale.getCountry();
+            if (!region.isEmpty() && !region.equals("PT") && !region.equals("GB")) {
+                continue;
+            }
+            LanguageGroup group = LanguageGroup.get(ulocale);
+            int rank = LanguageGroup.rankInGroup(ulocale);
+            System.out.println(group + "\t" + rank + "\t" + english.getName(locale) + "\t" + locale);
+        }
+
+//        System.out.println(getSubdivisionIdToName("fr"));
+//        System.out.println(getNameToSubdivisionPath("fr"));
+    }
+}
\ No newline at end of file
diff --git a/tools/java/org/unicode/cldr/test/ExampleGenerator.java b/tools/java/org/unicode/cldr/test/ExampleGenerator.java
index 8c07a3a..85add0a 100644
--- a/tools/java/org/unicode/cldr/test/ExampleGenerator.java
+++ b/tools/java/org/unicode/cldr/test/ExampleGenerator.java
@@ -28,6 +28,7 @@ import org.unicode.cldr.util.CLDRPaths;
 import org.unicode.cldr.util.CldrUtility;
 import org.unicode.cldr.util.DayPeriodInfo;
 import org.unicode.cldr.util.DayPeriodInfo.DayPeriod;
+import org.unicode.cldr.util.EmojiConstants;
 import org.unicode.cldr.util.Factory;
 import org.unicode.cldr.util.ICUServiceBuilder;
 import org.unicode.cldr.util.LanguageTagParser;
@@ -41,6 +42,7 @@ import org.unicode.cldr.util.SupplementalDataInfo.PluralInfo.Count;
 import org.unicode.cldr.util.SupplementalDataInfo.PluralType;
 import org.unicode.cldr.util.TimezoneFormatter;
 import org.unicode.cldr.util.TransliteratorUtilities;
+import org.unicode.cldr.util.XListFormatter.ListTypeLength;
 import org.unicode.cldr.util.XPathParts;
 
 import com.ibm.icu.impl.Row.R3;
@@ -51,6 +53,7 @@ import com.ibm.icu.text.DateFormatSymbols;
 import com.ibm.icu.text.DateTimePatternGenerator;
 import com.ibm.icu.text.DecimalFormat;
 import com.ibm.icu.text.DecimalFormatSymbols;
+import com.ibm.icu.text.ListFormatter;
 import com.ibm.icu.text.MessageFormat;
 import com.ibm.icu.text.NumberFormat;
 import com.ibm.icu.text.PluralRules;
@@ -59,7 +62,9 @@ import com.ibm.icu.text.PluralRules.FixedDecimalRange;
 import com.ibm.icu.text.PluralRules.FixedDecimalSamples;
 import com.ibm.icu.text.PluralRules.SampleType;
 import com.ibm.icu.text.SimpleDateFormat;
+import com.ibm.icu.text.SimpleFormatter;
 import com.ibm.icu.text.Transliterator;
+import com.ibm.icu.text.UTF16;
 import com.ibm.icu.util.Calendar;
 import com.ibm.icu.util.TimeZone;
 import com.ibm.icu.util.ULocale;
@@ -126,14 +131,14 @@ public class ExampleGenerator {
 
     static {
         Calendar calendar = Calendar.getInstance(ZONE_SAMPLE, ULocale.ENGLISH);
-        calendar.set(1999, 8, 14, 13, 25, 59); // 1999-08-14 13:25:59
+        calendar.set(1999, 8, 5, 13, 25, 59); // 1999-08-14 13:25:59
         DATE_SAMPLE = calendar.getTime();
         calendar.set(1999, 9, 27, 13, 25, 59); // 1999-09-27 13:25:59
         DATE_SAMPLE2 = calendar.getTime();
 
-        calendar.set(1999, 8, 14, 7, 0, 0); // 1999-08-14 07:00:00
+        calendar.set(1999, 8, 5, 7, 0, 0); // 1999-08-14 07:00:00
         DATE_SAMPLE3 = calendar.getTime();
-        calendar.set(1999, 8, 14, 23, 0, 0); // 1999-08-14 23:00:00
+        calendar.set(1999, 8, 5, 23, 0, 0); // 1999-08-14 23:00:00
         DATE_SAMPLE4 = calendar.getTime();
     }
 
@@ -161,6 +166,8 @@ public class ExampleGenerator {
 
     private PluralSamples patternExamples;
 
+    private Map<String, String> subdivisionIdToName;
+
     /**
      * For getting the end of the "background" style. Default is "</span>". It is
      * used in composing patterns, so it can show the part that corresponds to the
@@ -224,6 +231,7 @@ public class ExampleGenerator {
         if (!resolvedCldrFile.isResolved()) throw new IllegalArgumentException("CLDRFile must be resolved");
         if (!englishFile.isResolved()) throw new IllegalArgumentException("English CLDRFile must be resolved");
         cldrFile = resolvedCldrFile;
+        subdivisionIdToName = EmojiSubdivisionNames.getSubdivisionIdToName(cldrFile.getLocaleID());
         this.englishFile = englishFile;
         synchronized (ExampleGenerator.class) {
             if (supplementalDataInfo == null) {
@@ -343,6 +351,12 @@ public class ExampleGenerator {
                 result = handleMonthPatterns(parts, value);
             } else if (parts.getElement(-1).equals("appendItem")) {
                 result = handleAppendItems(parts, value);
+            } else if (parts.getElement(-1).equals("annotation")) {
+                result = handleAnnotationName(parts, value);
+            } else if (parts.getElement(-1).equals("characterLabel")) {
+                result = handleLabel(parts, value);
+            } else if (parts.getElement(-1).equals("characterLabelPattern")) {
+                result = handleLabelPattern(parts, value);
             } else {
                 // didn't detect anything, return empty-handed
                 return null;
@@ -377,6 +391,155 @@ public class ExampleGenerator {
         return result;
     }
 
+    private String handleLabelPattern(XPathParts parts2, String value) {
+        switch (parts.getAttributeValue(-1, "type")) {
+        case "category-list":
+            List<String> examples = new ArrayList<>();
+            CLDRFile cfile = getCldrFile();
+            SimpleFormatter initialPattern = SimpleFormatter.compile(setBackground(value));
+            String path = CLDRFile.getKey(CLDRFile.TERRITORY_NAME, "FR");
+            String regionName = cfile.getStringValue(path);
+            String flagName = cfile.getStringValue("//ldml/characterLabels/characterLabel[@type=\"flag\"]");
+            examples.add(invertBackground(EmojiConstants.getEmojiFromRegionCodes("FR") 
+                + " ⇒ " + initialPattern.format(flagName, regionName)));
+            return formatExampleList(examples);
+        default: return null;
+        }
+    }
+
+    private String handleLabel(XPathParts parts2, String value) {
+        // "//ldml/characterLabels/characterLabel[@type=\"" + typeAttributeValue + "\"]"
+        switch (parts.getAttributeValue(-1, "type")) {
+        case "flag": {
+            String value2 = backgroundStartSymbol + value + backgroundEndSymbol;
+            CLDRFile cfile = getCldrFile();
+            List<String> examples = new ArrayList<>();
+            SimpleFormatter initialPattern = SimpleFormatter.compile(cfile.getStringValue("//ldml/characterLabels/characterLabelPattern[@type=\"category-list\"]"));
+            addFlag(value2, "FR", cfile, initialPattern, examples);
+            addFlag(value2, "CN", cfile, initialPattern, examples);
+            addSubdivisionFlag(value2, "gbeng", cfile, initialPattern, examples);
+            addSubdivisionFlag(value2, "gbsct", cfile, initialPattern, examples);
+            addSubdivisionFlag(value2, "gbwls", cfile, initialPattern, examples);
+            return formatExampleList(examples);
+        }
+        case "keycap": { 
+            String value2 = backgroundStartSymbol + value + backgroundEndSymbol;
+            List<String> examples = new ArrayList<>();
+            CLDRFile cfile = getCldrFile();
+            SimpleFormatter initialPattern = SimpleFormatter.compile(cfile.getStringValue("//ldml/characterLabels/characterLabelPattern[@type=\"category-list\"]"));
+            examples.add(invertBackground(initialPattern.format(value2, "1")));
+            examples.add(invertBackground(initialPattern.format(value2, "10")));
+            examples.add(invertBackground(initialPattern.format(value2, "#")));
+            return formatExampleList(examples);
+        }
+        default:
+            return null;
+        }
+    }
+
+    private void addFlag(String value2, String isoRegionCode, CLDRFile cfile, SimpleFormatter initialPattern, List<String> examples) {
+        String path = CLDRFile.getKey(CLDRFile.TERRITORY_NAME, isoRegionCode);
+        String regionName = cfile.getStringValue(path);
+        examples.add(invertBackground(EmojiConstants.getEmojiFromRegionCodes(isoRegionCode) 
+            + " ⇒ " + initialPattern.format(value2, regionName)));
+    }
+
+    private void addSubdivisionFlag(String value2, String isoSubdivisionCode, CLDRFile cfile, SimpleFormatter initialPattern, List<String> examples) {
+        String subdivisionName = subdivisionIdToName.get(isoSubdivisionCode);
+        if (subdivisionName == null) {
+            subdivisionName = isoSubdivisionCode;
+        }
+        examples.add(invertBackground(EmojiConstants.getEmojiFromSubdivisionCodes(isoSubdivisionCode) 
+            + " ⇒ " + initialPattern.format(value2, subdivisionName)));
+    }
+
+    private String handleAnnotationName(XPathParts parts, String value) {
+        //ldml/annotations/annotation[@cp="🦰"][@type="tts"]
+        // skip anything but the name
+        if (!"tts".equals(parts.getAttributeValue(-1, "type"))) {
+            return null;
+        }
+        String cp = parts.getAttributeValue(-1, "cp");
+        if (cp == null || cp.isEmpty()) {
+            return null;
+        }
+        Set<String> examples = new LinkedHashSet<>();
+        int first = cp.codePointAt(0);
+        switch(first) {
+        case 0x1F46A: // 👪  U+1F46A FAMILY
+            examples.add(formatGroup(parts, value, "👨‍👩‍👧‍👦", "👨", "👩", "👧", "👦"));
+            examples.add(formatGroup(parts, value, "👩‍👩‍👦", "👩", "👩", "👦"));
+            break;
+        case 0x1F48F: // 💏  U+1F48F KISS 👩👨
+            examples.add(formatGroup(parts, value, "👩‍❤️‍💋‍👨", "👩", "👨"));
+            examples.add(formatGroup(parts, value, "👩‍❤️‍💋‍👩", "👩", "👩"));
+           break;
+        case 0x1F491: // 💑  U+1F491     COUPLE WITH HEART
+            examples.add(formatGroup(parts, value, "👩‍❤️‍👨", "👩", "👨"));
+            examples.add(formatGroup(parts, value, "👩‍❤️‍👩", "👩", "👩"));
+            break;
+        default:
+            boolean isSkin = EmojiConstants.MODIFIERS.contains(first);
+            if (isSkin || EmojiConstants.HAIR.contains(first)) {
+                String value2 = backgroundStartSymbol + value + backgroundEndSymbol;
+                CLDRFile cfile = getCldrFile();
+                String skin = "🏽";
+                String hair = "🦰";
+                String skinName = getEmojiName(cfile, skin);
+                String hairName = getEmojiName(cfile, hair);
+                if (hairName == null) {
+                    hair = "[missing]";
+                }
+                SimpleFormatter initialPattern = SimpleFormatter.compile(cfile.getStringValue("//ldml/characterLabels/characterLabelPattern[@type=\"category-list\"]"));
+                SimpleFormatter listPattern = SimpleFormatter.compile(cfile.getStringValue("//ldml/listPatterns/listPattern[@type=\"unit-short\"]/listPatternPart[@type=\"2\"]"));
+
+                hair = EmojiConstants.JOINER_STRING + hair;
+                formatPeople(cfile, first, isSkin, value2, "👩", skin, skinName, hair, hairName, initialPattern, listPattern, examples);
+                formatPeople(cfile, first, isSkin, value2, "👨", skin, skinName, hair, hairName, initialPattern, listPattern, examples);
+            }
+            break;
+        }
+        return formatExampleList(examples);
+    }
+
+    private String getEmojiName(CLDRFile cfile, String skin) {
+        return cfile.getStringValue("//ldml/annotations/annotation[@cp=\"" + skin + "\"][@type=\"tts\"]");
+    }
+
+    //ldml/listPatterns/listPattern[@type="standard-short"]/listPatternPart[@type="2"]
+    private String formatGroup(XPathParts parts, String value, String sourceEmoji, String... components) {
+        CLDRFile cfile = getCldrFile();
+        SimpleFormatter initialPattern = SimpleFormatter.compile(cfile.getStringValue("//ldml/characterLabels/characterLabelPattern[@type=\"category-list\"]"));
+        String value2 = backgroundEndSymbol + value + backgroundStartSymbol;
+        String[] names = new String[components.length];
+        int i = 0;
+        for (String component : components) {
+            names[i++] = getEmojiName(cfile, component);
+        }
+        return backgroundStartSymbol + sourceEmoji + " ⇒ " + initialPattern.format(value2, 
+            longListPatternExample(EmojiConstants.COMPOSED_NAME_LIST.getPath(), "n/a", "n/a2", names));
+    }
+
+    private void formatPeople(CLDRFile cfile, int first, boolean isSkin, String value2, String person, String skin, String skinName, 
+        String hair, String hairName, SimpleFormatter initialPattern, SimpleFormatter listPattern, Collection<String> examples) {
+        String cp;
+        String personName = getEmojiName(cfile, person);
+        StringBuilder emoji = new StringBuilder(person).appendCodePoint(first);
+        cp = UTF16.valueOf(first);
+        cp = isSkin ? cp : EmojiConstants.JOINER_STRING + cp;
+        examples.add(person + cp + " ⇒ " + invertBackground(initialPattern.format(personName,value2)));
+        emoji.setLength(0);
+        emoji.append(personName);
+        if (isSkin) {
+            skinName = value2;
+            skin = cp;
+        } else {
+            hairName = value2;
+            hair = cp;
+        }
+        examples.add(person + skin + hair + " ⇒ " + invertBackground(listPattern.format(initialPattern.format(personName, skinName), hairName)));
+    }
+
     private String handleDayPeriod(String xpath, String value, ExampleContext context, ExampleType type) {
         //ldml/dates/calendars/calendar[@type="gregorian"]/dayPeriods/dayPeriodContext[@type="format"]/dayPeriodWidth[@type="wide"]/dayPeriod[@type="morning1"]
         //ldml/dates/calendars/calendar[@type="gregorian"]/dayPeriods/dayPeriodContext[@type="stand-alone"]/dayPeriodWidth[@type="wide"]/dayPeriod[@type="morning1"]
@@ -425,7 +588,7 @@ public class ExampleGenerator {
             <compoundUnit type="per">
                 <unitPattern count="other">{0}/{1}</unitPattern>
             </compoundUnit>
-        
+
          *  <compoundUnit type="per">
                 <unitPattern count="one">{0}/{1}</unitPattern>
                 <unitPattern count="other">{0}/{1}</unitPattern>
@@ -434,7 +597,7 @@ public class ExampleGenerator {
                 <unitPattern count="one">{0} meter</unitPattern>
                 <unitPattern count="other">{0} meters</unitPattern>
             </unit>
-        
+
          */
 
         // we want to get a number that works for the count passed in.
@@ -542,16 +705,16 @@ public class ExampleGenerator {
     }
 
     private String handleListPatterns(XPathParts parts, String value) {
-        // listPatternType is either "duration" or null
+        // listPatternType is either "duration" or null/other list
         String listPatternType = parts.getAttributeValue(-2, "type");
         if (listPatternType == null || !listPatternType.contains("unit")) {
-            return handleRegularListPatterns(parts, value);
+            return handleRegularListPatterns(parts, value, ListTypeLength.from(listPatternType));
         } else {
             return handleDurationListPatterns(parts, value, UnitLength.from(listPatternType));
         }
     }
 
-    private String handleRegularListPatterns(XPathParts parts, String value) {
+    private String handleRegularListPatterns(XPathParts parts, String value, ListTypeLength listTypeLength) {
         String patternType = parts.getAttributeValue(-1, "type");
         String pathFormat = "//ldml/localeDisplayNames/territories/territory[@type=\"{0}\"]";
         String territory1 = getValueFromFormat(pathFormat, "CH");
@@ -561,9 +724,8 @@ public class ExampleGenerator {
         }
         String territory3 = getValueFromFormat(pathFormat, "EG");
         String territory4 = getValueFromFormat(pathFormat, "CA");
-        String listPathFormat = "//ldml/listPatterns/listPattern/listPatternPart[@type=\"{0}\"]";
         return longListPatternExample(
-            listPathFormat, patternType, value, territory1, territory2, territory3, territory4);
+            listTypeLength.getPath(), patternType, value, territory1, territory2, territory3, territory4);
     }
 
     private String handleDurationListPatterns(XPathParts parts, String value, UnitLength unitWidth) {
@@ -575,20 +737,8 @@ public class ExampleGenerator {
         }
         String duration3 = getFormattedUnit("duration-minute", unitWidth, 37);
         String duration4 = getFormattedUnit("duration-second", unitWidth, 23);
-        String listPathFormat = "//ldml/listPatterns/listPattern"
-            + unitWidth.listTypeLength.typeString
-            + "/listPatternPart[@type=\"{0}\"]";
         return longListPatternExample(
-            listPathFormat, patternType, value, duration1, duration2, duration3, duration4);
-    }
-
-    public enum ListTypeLength {
-        NORMAL(""), UNIT_WIDE("[@type=\"unit\"]"), UNIT_SHORT("[@type=\"unit-short\"]"), UNIT_NARROW("[@type=\"unit-narrow\"]");
-        final String typeString;
-
-        ListTypeLength(String typeString) {
-            this.typeString = typeString;
-        }
+            unitWidth.listTypeLength.getPath(), patternType, value, duration1, duration2, duration3, duration4);
     }
 
     public enum UnitLength {
@@ -630,17 +780,24 @@ public class ExampleGenerator {
         return format(getValueFromFormat(pathFormat, unitType, form), formattedUnitAmount);
     }
 
-    private String longListPatternExample(String listPathFormat, String patternType, String value, String territory1, String territory2, String territory3,
-        String territory4) {
+    //ldml/listPatterns/listPattern/listPatternPart[@type="2"] — And
+    //ldml/listPatterns/listPattern[@type="standard-short"]/listPatternPart[@type="2"] Short And
+    //ldml/listPatterns/listPattern[@type="or"]/listPatternPart[@type="2"] or list
+    //ldml/listPatterns/listPattern[@type="unit"]/listPatternPart[@type="2"]
+    //ldml/listPatterns/listPattern[@type="unit-short"]/listPatternPart[@type="2"]
+    //ldml/listPatterns/listPattern[@type="unit-narrow"]/listPatternPart[@type="2"]
+
+    private String longListPatternExample(String listPathFormat, String patternType, String value, String... items) {
+        String doublePattern = getPattern(listPathFormat, "2", patternType, value);
         String startPattern = getPattern(listPathFormat, "start", patternType, value);
         String middlePattern = getPattern(listPathFormat, "middle", patternType, value);
         String endPattern = getPattern(listPathFormat, "end", patternType, value);
-
-        String example = format(startPattern, territory1,
-            format(middlePattern, territory2, format(endPattern, territory3, territory4)));
+        ListFormatter listFormatter = new ListFormatter(doublePattern, startPattern, middlePattern, endPattern);
+        String example = listFormatter.format(items);
         return invertBackground(example);
     }
 
+
     /**
      * Helper method for handleListPatterns. Returns the pattern to be used for
      * a specified pattern type.
@@ -651,8 +808,7 @@ public class ExampleGenerator {
      * @param value
      * @return
      */
-    private String getPattern(String pathFormat, String pathPatternType,
-        String valuePatternType, String value) {
+    private String getPattern(String pathFormat, String pathPatternType, String valuePatternType, String value) {
         return valuePatternType.equals(pathPatternType) ? setBackground(value) : getValueFromFormat(pathFormat, pathPatternType);
     }
 
@@ -837,54 +993,54 @@ public class ExampleGenerator {
         Set<FixedDecimal> examplesSeen = new HashSet<FixedDecimal>();
         int maxCount = 2;
         main:
-        // If we are a currency, we will try to see if we can set the decimals to match.
-        // but if nothing works, we will just use a plain sample.
-        for (int phase = 0; phase < 2; ++phase) {
-            int check = 0;
-            for (FixedDecimal example : exampleCount) {
-                // we have to first see whether we have a currency. If so, we have to see if the count works.
-
-                if (isCurrency && phase == 0) {
-                    example = new FixedDecimal(example.getSource(), decimalCount);
-                }
-                // skip if we've done before (can happen because of the currency reset)
-                if (examplesSeen.contains(example)) {
-                    continue;
-                }
-                examplesSeen.add(example);
-                // skip if the count isn't appropriate
-                if (!pluralRules.select(example).equals(count.toString())) {
-                    continue;
-                }
+            // If we are a currency, we will try to see if we can set the decimals to match.
+            // but if nothing works, we will just use a plain sample.
+            for (int phase = 0; phase < 2; ++phase) {
+                int check = 0;
+                for (FixedDecimal example : exampleCount) {
+                    // we have to first see whether we have a currency. If so, we have to see if the count works.
+
+                    if (isCurrency && phase == 0) {
+                        example = new FixedDecimal(example.getSource(), decimalCount);
+                    }
+                    // skip if we've done before (can happen because of the currency reset)
+                    if (examplesSeen.contains(example)) {
+                        continue;
+                    }
+                    examplesSeen.add(example);
+                    // skip if the count isn't appropriate
+                    if (!pluralRules.select(example).equals(count.toString())) {
+                        continue;
+                    }
 
-                if (value == null) {
-                    String fallbackPath = cldrFile.getCountPathWithFallback(xpath, count, true);
-                    value = cldrFile.getStringValue(fallbackPath);
-                }
-                String resultItem;
-
-                resultItem = formatCurrency(value, type, unitType, isPattern, isCurrency, count, example);
-                // now add to list
-                result = addExampleResult(resultItem, result);
-                if (isPattern) {
-                    String territory = getDefaultTerritory(type);
-                    String currency = supplementalDataInfo.getDefaultCurrency(territory);
-                    if (currency.equals(unitType)) {
-                        currency = "EUR";
-                        if (currency.equals(unitType)) {
-                            currency = "JAY";
-                        }
+                    if (value == null) {
+                        String fallbackPath = cldrFile.getCountPathWithFallback(xpath, count, true);
+                        value = cldrFile.getStringValue(fallbackPath);
                     }
-                    resultItem = formatCurrency(value, type, currency, isPattern, isCurrency, count, example);
+                    String resultItem;
+
+                    resultItem = formatCurrency(value, type, unitType, isPattern, isCurrency, count, example);
                     // now add to list
                     result = addExampleResult(resultItem, result);
+                    if (isPattern) {
+                        String territory = getDefaultTerritory(type);
+                        String currency = supplementalDataInfo.getDefaultCurrency(territory);
+                        if (currency.equals(unitType)) {
+                            currency = "EUR";
+                            if (currency.equals(unitType)) {
+                                currency = "JAY";
+                            }
+                        }
+                        resultItem = formatCurrency(value, type, currency, isPattern, isCurrency, count, example);
+                        // now add to list
+                        result = addExampleResult(resultItem, result);
 
-                }
-                if (--maxCount < 1) {
-                    break main;
+                    }
+                    if (--maxCount < 1) {
+                        break main;
+                    }
                 }
             }
-        }
         return result.isEmpty() ? null : result;
     }
 
@@ -953,8 +1109,8 @@ public class ExampleGenerator {
         String unitPattern;
         String unitPatternPath = cldrFile.getCountPathWithFallback(isCurrency
             ? "//ldml/numbers/currencyFormats/unitPattern"
-            : "//ldml/units/unit[@type=\"" + unitType + "\"]/unitPattern",
-            count, true);
+                : "//ldml/units/unit[@type=\"" + unitType + "\"]/unitPattern",
+                count, true);
         unitPattern = cldrFile.getWinningValue(unitPatternPath);
         return unitPattern;
     }
@@ -962,8 +1118,8 @@ public class ExampleGenerator {
     private String getUnitName(String unitType, final boolean isCurrency, Count count) {
         String unitNamePath = cldrFile.getCountPathWithFallback(isCurrency
             ? "//ldml/numbers/currencies/currency[@type=\"" + unitType + "\"]/displayName"
-            : "//ldml/units/unit[@type=\"" + unitType + "\"]/unitPattern",
-            count, true);
+                : "//ldml/units/unit[@type=\"" + unitType + "\"]/unitPattern",
+                count, true);
         return unitNamePath == null ? unitType : cldrFile.getWinningValue(unitNamePath);
     }
 
@@ -1506,6 +1662,28 @@ public class ExampleGenerator {
         return result;
     }
 
+    /**
+     * Return examples formatted as string, with null returned for null or empty examples.
+     * @param examples
+     * @return
+     */
+    private String formatExampleList(Collection<String> examples) {
+        if (examples == null || examples.isEmpty()) {
+            return null;
+        }
+        String result = "";
+        boolean first = true;
+        for (String example : examples) {
+            if (first) {
+                result = example;
+                first = false;
+            } else {
+                result = addExampleResult(example, result);
+            }
+        }
+        return result;
+    }
+
     public String format(String format, Object... objects) {
         if (format == null) return null;
         return MessageFormat.format(format, objects);
@@ -1525,19 +1703,17 @@ public class ExampleGenerator {
 
     /**
      * Put a background on an item, skipping enclosed patterns.
-     *
      * @param sampleTerritory
      * @return
      */
     private String setBackground(String inputPattern) {
         Matcher m = PARAMETER.matcher(inputPattern);
         return backgroundStartSymbol + m.replaceAll(backgroundEndSymbol + "$1" + backgroundStartSymbol)
-            + backgroundEndSymbol;
+        + backgroundEndSymbol;
     }
 
     /**
      * Put a background on an item, skipping enclosed patterns, except for {0}
-     *
      * @param patternToEmbed
      *            TODO
      * @param sampleTerritory
@@ -1547,7 +1723,7 @@ public class ExampleGenerator {
     private String setBackgroundExceptMatch(String input, Pattern patternToEmbed) {
         Matcher m = patternToEmbed.matcher(input);
         return backgroundStartSymbol + m.replaceAll(backgroundEndSymbol + "$1" + backgroundStartSymbol)
-            + backgroundEndSymbol;
+        + backgroundEndSymbol;
     }
 
     /**
@@ -1608,19 +1784,19 @@ public class ExampleGenerator {
     private String finalizeBackground(String input) {
         return input == null
             ? input
-            : exampleStart +
+                : exampleStart +
                 TransliteratorUtilities.toHTML.transliterate(input)
-                    .replace(backgroundStartSymbol + backgroundEndSymbol, "")
-                    // remove null runs
-                    .replace(backgroundEndSymbol + backgroundStartSymbol, "")
-                    // remove null runs
-                    .replace(backgroundStartSymbol, backgroundStart)
-                    .replace(backgroundEndSymbol, backgroundEnd)
-                    .replace(exampleSeparatorSymbol, exampleEnd + exampleStart)
-                    .replace(startItalicSymbol, startItalic)
-                    .replace(endItalicSymbol, endItalic)
-                    .replace(startSupSymbol, startSup)
-                    .replace(endSupSymbol, endSup)
+                .replace(backgroundStartSymbol + backgroundEndSymbol, "")
+                // remove null runs
+                .replace(backgroundEndSymbol + backgroundStartSymbol, "")
+                // remove null runs
+                .replace(backgroundStartSymbol, backgroundStart)
+                .replace(backgroundEndSymbol, backgroundEnd)
+                .replace(exampleSeparatorSymbol, exampleEnd + exampleStart)
+                .replace(startItalicSymbol, startItalic)
+                .replace(endItalicSymbol, endItalic)
+                .replace(startSupSymbol, startSup)
+                .replace(endSupSymbol, endSup)
                 + exampleEnd;
     }
 
@@ -1738,12 +1914,12 @@ public class ExampleGenerator {
         while (URLMatcher.reset(description).find(start)) {
             final String url = URLMatcher.group();
             buffer
-                .append(TransliteratorUtilities.toHTML.transliterate(description.substring(start, URLMatcher.start())))
-                .append("<a target='CLDR-ST-DOCS' href='")
-                .append(url)
-                .append("'>")
-                .append(url)
-                .append("</a>");
+            .append(TransliteratorUtilities.toHTML.transliterate(description.substring(start, URLMatcher.start())))
+            .append("<a target='CLDR-ST-DOCS' href='")
+            .append(url)
+            .append("'>")
+            .append(url)
+            .append("</a>");
             start = URLMatcher.end();
         }
         buffer.append(TransliteratorUtilities.toHTML.transliterate(description.substring(start)));
@@ -1755,7 +1931,7 @@ public class ExampleGenerator {
             XPathParts emoji = XPathParts.getFrozenInstance(xpath);
             String cp = emoji.getAttributeValue(-1, "cp");
             String minimal = Utility.hex(cp.replace("", "")).replace(',', '_').toLowerCase(Locale.ROOT);
-            buffer.append("<br><img height='64px' width='auto' src='images/android/android_" + minimal + ".png'>");
+            buffer.append("<br><img height='64px' width='auto' src='images/emoji/emoji_" + minimal + ".png'>");
         }
 
         return buffer.toString();
@@ -1780,12 +1956,12 @@ public class ExampleGenerator {
         return exampleHtml == null ? null
             : internal ? "〖" + exampleHtml
                 .replace("", "❬")
-                .replace("", "❭") + "〗"
-                : exampleHtml
-                    .replace("<div class='cldr_example'>", "〖")
-                    .replace("</div>", "〗")
-                    .replace("<span class='cldr_substituted'>", "❬")
-                    .replace("</span>", "❭");
+            .replace("", "❭") + "〗"
+            : exampleHtml
+            .replace("<div class='cldr_example'>", "〖")
+            .replace("</div>", "〗")
+            .replace("<span class='cldr_substituted'>", "❬")
+            .replace("</span>", "❭");
     }
 
     HelpMessages helpMessages;
diff --git a/tools/java/org/unicode/cldr/tool/CLDRModify.java b/tools/java/org/unicode/cldr/tool/CLDRModify.java
index be8a943..453e6ad 100644
--- a/tools/java/org/unicode/cldr/tool/CLDRModify.java
+++ b/tools/java/org/unicode/cldr/tool/CLDRModify.java
@@ -1331,10 +1331,10 @@ public class CLDRModify {
 
         fixList.add('c', "Fix transiton from an old currency code to a new one", new CLDRFilter() {
             public void handlePath(String xpath) {
-                String oldCurrencyCode = "MRO";
-                String newCurrencyCode = "MRU";
-                int fromDate = 1973;
-                int toDate = 2017;
+                String oldCurrencyCode = "VEF";
+                String newCurrencyCode = "VES";
+                int fromDate = 2008;
+                int toDate = 2018;
                 String leadingParenString = " (";
                 String trailingParenString = ")";
                 String separator = "\u2013";
diff --git a/tools/java/org/unicode/cldr/tool/ChartAnnotations.java b/tools/java/org/unicode/cldr/tool/ChartAnnotations.java
index e47c67e..ac6cfce 100644
--- a/tools/java/org/unicode/cldr/tool/ChartAnnotations.java
+++ b/tools/java/org/unicode/cldr/tool/ChartAnnotations.java
@@ -86,7 +86,17 @@ public class ChartAnnotations extends Chart {
             "🇪🇺", "🔟", "#️⃣", "👶🏽", "👩‍❤️‍💋‍👩", "👩‍❤️‍👩", "👩‍👩‍👧", "👨🏻‍⚕️", "👮🏿‍♂️", "👮🏽‍♀️", "👩‍❤️‍💋‍👩", "👮🏽‍♀️",
             "💏", "👩‍❤️‍💋‍👩", "💑", "👩‍❤️‍👩", "👪", "👩‍👩‍👧",
             "👦🏻", "👩🏿", "👨‍⚖", "👨🏿‍⚖", "👩‍⚖", "👩🏼‍⚖", "👮", "👮‍♂️", "👮🏼‍♂️", "👮‍♀️", "👮🏿‍♀️",
-            "🚴", "🚴🏿", "🚴‍♂️", "🚴🏿‍♂️", "🚴‍♀️", "🚴🏿‍♀️"))
+            "🚴", "🚴🏿", "🚴‍♂️", "🚴🏿‍♂️", "🚴‍♀️", "🚴🏿‍♀️",
+            "🏴󠁧󠁢󠁳󠁣󠁴󠁿",
+            "#️⃣",
+            "🇦🇨",
+            "⛹️‍♀️",
+            "👨‍⚕️",
+            "🏳️‍🌈","🏴‍☠️",
+            "👨‍🦰",
+            "👨🏿‍🦰",
+            "🏿","🦰"
+            ))
         .freeze();
 
     public void writeSubcharts(Anchors anchors) throws IOException {
diff --git a/tools/java/org/unicode/cldr/tool/GenerateMaximalLocales.java b/tools/java/org/unicode/cldr/tool/GenerateMaximalLocales.java
index 139f785..9f8e106 100644
--- a/tools/java/org/unicode/cldr/tool/GenerateMaximalLocales.java
+++ b/tools/java/org/unicode/cldr/tool/GenerateMaximalLocales.java
@@ -150,6 +150,8 @@ public class GenerateMaximalLocales {
         "bsq_Bass_LR",
         "ccp_Cakm_BD",
         "blt_Tavt_VN",
+        "rhg_Arab_MM",
+        "rhg_Rohg_MM",
     };
 
     /**
@@ -264,6 +266,7 @@ public class GenerateMaximalLocales {
 //        {"bsq", "bsq_Bass_LR"},
 //        {"ccp", "ccp_Cakm_BD"},
 //        {"blt", "blt_Tavt_VN"},
+        { "mis_Medf", "mis_Medf_NG" },
     });
 
     /**
diff --git a/tools/java/org/unicode/cldr/tool/GetChanges.java b/tools/java/org/unicode/cldr/tool/GetChanges.java
index bf8f87e..cbf8717 100644
--- a/tools/java/org/unicode/cldr/tool/GetChanges.java
+++ b/tools/java/org/unicode/cldr/tool/GetChanges.java
@@ -1,7 +1,10 @@
 package org.unicode.cldr.tool;
 
+import java.util.Collections;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Objects;
+import java.util.Set;
 import java.util.TreeMap;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -11,9 +14,15 @@ import org.unicode.cldr.util.CLDRFile;
 import org.unicode.cldr.util.CLDRPaths;
 import org.unicode.cldr.util.CldrUtility;
 import org.unicode.cldr.util.Factory;
+import org.unicode.cldr.util.LanguageTagParser;
+import org.unicode.cldr.util.Level;
+import org.unicode.cldr.util.Organization;
 import org.unicode.cldr.util.PathHeader;
 import org.unicode.cldr.util.PatternCache;
 
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Multimap;
+import com.google.common.collect.TreeMultimap;
 import com.ibm.icu.util.Output;
 
 public class GetChanges {
@@ -43,9 +52,17 @@ public class GetChanges {
         CLDRConfig testInfo = ToolConfig.getToolInstance();
         CLDRFile english = testInfo.getEnglish();
 
-        Factory lastReleaseFactory = Factory.make(CLDRPaths.LAST_DIRECTORY + "common/main/", ".*");
-        Factory trunkFactory = testInfo.getCldrFactory();
-        Factory snapshotFactory = Factory.make(CLDRPaths.TMP2_DIRECTORY + "vxml/common/main/", ".*");
+        boolean onlyMissing = true;
+        String release = "33.1";
+
+        String subdir = "annotations"; // "main";
+        Factory lastReleaseFactory = Factory.make(CLDRPaths.LAST_DIRECTORY + "common/"
+            + subdir, ".*");
+        Factory trunkFactory = testInfo.getAnnotationsFactory(); // CldrFactory();
+        Factory snapshotFactory = Factory.make(CLDRPaths.AUX_DIRECTORY + "voting/"
+            + release
+            + "/vxml/common/"
+            + subdir, ".*");
         PathHeader.Factory phf = PathHeader.getFactory(english);
 
         int totalCount = 0;
@@ -54,33 +71,84 @@ public class GetChanges {
         Output<String> localeWhereFound = new Output<String>();
         Output<String> pathWhereFound = new Output<String>();
 
-        for (String locale : lastReleaseFactory.getAvailable()) {
+        CLDRFile englishCldrFile = trunkFactory.make("en", false);
+        final Set<String> paths = ImmutableSet.copyOf(englishCldrFile.iterator());
+        System.out.println("english paths: " + paths.size());
+
+        Multimap<String,PathHeader> missing = TreeMultimap.create();
+
+        Set<String> locales = testInfo.getStandardCodes().getLocaleCoverageLocales(Organization.cldr, Collections.singleton(Level.MODERN));
+        
+        LanguageTagParser ltp = new LanguageTagParser();
+        for (String locale : locales) {
+            if (!ltp.set(locale).getRegion().isEmpty() || locale.equals("sr_Latn")) {
+                continue; // skip region locales, they'll inherit
+            }
+//            if (!locale.equals("sr_Latn")) {
+//                continue;
+//            }
+            System.out.println(locale);
+
+            CLDRFile snapshot;
+            try {
+                snapshot = snapshotFactory.make(locale, false);
+            } catch (Exception e) {
+                System.out.println("Skipping " + locale + ", no data in annotations/");
+                continue;
+            }
+
+            CLDRFile lastRelease = null;
+            try {
+                lastRelease = lastReleaseFactory.make(locale, false);
+            } catch (Exception e) {
+            }
+            
+            CLDRFile trunk = null;
+            try {
+                trunk = trunkFactory.make(locale, false);
+            } catch (Exception e) {
+            }
+
             Map<PathHeader, Data> results = new TreeMap<PathHeader, Data>();
-            CLDRFile lastRelease = lastReleaseFactory.make(locale, false);
-            CLDRFile trunk = trunkFactory.make(locale, false);
-            CLDRFile snapshot = snapshotFactory.make(locale, true);
-            for (String xpath : lastRelease) {
-                if (xpath.contains("fallbackRegionFormat") || xpath.contains("exemplar")) {
+
+            for (String xpath : paths) {
+                if (xpath.contains("fallbackRegionFormat") 
+                    || xpath.contains("exemplar") 
+                    || xpath.contains("/identity")) {
                     continue;
                 }
-                String valueLastRelease = lastRelease.getStringValue(xpath);
                 String newPath = fixOldPath(xpath);
                 String valueSnapshot = snapshot.getStringValue(newPath);
-                if (valueLastRelease.equals(valueSnapshot)) {
+                PathHeader ph = null;
+
+                if (valueSnapshot == null) {
+                    ph = phf.fromPath(newPath);
+                    missing.put(locale, ph);
+                }
+                String valueLastRelease = lastRelease == null ? null : lastRelease.getStringValue(xpath);
+                if (valueSnapshot == null) {
+                    ph = phf.fromPath(newPath);
+                    missing.put(locale, ph);
+                }
+
+                if (onlyMissing) {
                     continue;
                 }
-                String valueTrunk = trunk.getStringValue(newPath);
-                if (valueSnapshot == null && valueTrunk == null) { // committee deletion
+                if (valueSnapshot != null && Objects.equals(valueLastRelease, valueSnapshot)) {
                     continue;
                 }
+                String valueTrunk = trunk == null ? null : trunk.getStringValue(newPath);
+//                if (valueSnapshot == null && valueTrunk == null) { // committee deletion
+//                    continue;
+//                }
                 // skip inherited
                 String baileyValue = snapshot.getConstructedBaileyValue(xpath, pathWhereFound, localeWhereFound);
-                if (!localeWhereFound.value.equals("root")
-                    && !localeWhereFound.value.equals("code-fallback")
+                if (!"root".equals(localeWhereFound.value)
+                    && !"code-fallback".equals(localeWhereFound.value)
                     && CldrUtility.equals(valueSnapshot, baileyValue)) {
                     continue;
                 }
-                PathHeader ph = phf.fromPath(newPath);
+                ph = ph != null ? ph : phf.fromPath(newPath);
                 results.put(ph, new Data(valueLastRelease, valueSnapshot, valueTrunk));
             }
             if (results.isEmpty()) {
@@ -89,12 +157,22 @@ public class GetChanges {
             int itemCount = 0;
             localeCount++;
             for (Entry<PathHeader, Data> entry : results.entrySet()) {
-                System.out.println(localeCount + "\t" + ++itemCount + "\t" + locale + "\t" + english.getName(locale) + "\t«" + entry.getKey() + "\t"
-                    + entry.getValue());
+                PathHeader ph = entry.getKey();
+                String englishValue = englishCldrFile.getStringValue(ph.getOriginalPath());
+                System.out.println(localeCount 
+                    + "\t" + ++itemCount 
+                    + "\t" + locale 
+                    + "\t" + english.getName(locale) 
+                    + "\t" + ph 
+                    + "\t«" + englishValue 
+                    + "»\t" + entry.getValue());
             }
             totalCount += itemCount;
         }
         System.out.println("Total:\t" + totalCount);
+        for ( Entry<String, PathHeader> entry : missing.entries()) {
+            System.out.println(entry.getKey() + "\t" + entry.getValue()); 
+        }
     }
 
     static Pattern OLD_PATH = PatternCache.get("//ldml/units/unit\\[@type=\"([^\"]*)\"]/unitPattern\\[@count=\"([^\"]*)\"](\\[@alt=\"([^\"]*)\"])?");
diff --git a/tools/java/org/unicode/cldr/tool/ToolConstants.java b/tools/java/org/unicode/cldr/tool/ToolConstants.java
index d00dd26..74c4a3e 100644
--- a/tools/java/org/unicode/cldr/tool/ToolConstants.java
+++ b/tools/java/org/unicode/cldr/tool/ToolConstants.java
@@ -63,7 +63,8 @@ public class ToolConstants {
         "29.0",
         "30.0",
         "31.0",
-        "32.0"
+        "32.0",
+        "33.0"
     // add to this once the release is final!
     );
     public static final String PREVIOUS_CHART_VERSION;
diff --git a/tools/java/org/unicode/cldr/util/Annotations.java b/tools/java/org/unicode/cldr/util/Annotations.java
index 75f3f5c..126843e 100644
--- a/tools/java/org/unicode/cldr/util/Annotations.java
+++ b/tools/java/org/unicode/cldr/util/Annotations.java
@@ -2,9 +2,11 @@ package org.unicode.cldr.util;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.LinkedHashSet;
+import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
@@ -12,6 +14,7 @@ import java.util.TreeSet;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.regex.Pattern;
 
+import org.unicode.cldr.test.EmojiSubdivisionNames;
 import org.unicode.cldr.tool.ChartAnnotations;
 import org.unicode.cldr.util.XMLFileReader.SimpleHandler;
 
@@ -27,6 +30,8 @@ import com.ibm.icu.text.SimpleFormatter;
 import com.ibm.icu.text.Transform;
 import com.ibm.icu.text.UTF16;
 import com.ibm.icu.text.UnicodeSet;
+import com.ibm.icu.text.UnicodeSet.SpanCondition;
+import com.ibm.icu.text.UnicodeSetSpanner;
 import com.ibm.icu.util.ICUUncheckedIOException;
 
 public class Annotations {
@@ -43,6 +48,7 @@ public class Annotations {
     static final Map<String, Map<String, AnnotationSet>> cache = new ConcurrentHashMap<>();
     static final Set<String> LOCALES;
     static final String DIR;
+    private static final AnnotationSet ENGLISH_DATA;
 
     private final Set<String> annotations;
     private final String tts;
@@ -71,10 +77,11 @@ public class Annotations {
                 shortName.startsWith("#") || // skip other junk files
                 shortName.startsWith(".")
 //                || shortName.contains("001") // skip world english for now
-            ) continue; // skip dot files (backups, etc)
+                ) continue; // skip dot files (backups, etc)
             temp.add(dotSplitter.split(shortName).iterator().next());
         }
         LOCALES = temp.build();
+        ENGLISH_DATA = getDataSet("en");
     }
 
     static class MyHandler extends SimpleHandler {
@@ -191,95 +198,48 @@ public class Annotations {
         return LOCALES;
     }
 
-    static class EmojiConstants {
-        public static final String EMOJI_VARIANT_STRING = "\uFE0F";
-        static final int FIRST_REGIONAL = 0x1F1E6;
-        static final int LAST_REGIONAL = 0x1F1FF;
-        public static final UnicodeSet REGIONAL_INDICATORS = new UnicodeSet(FIRST_REGIONAL, LAST_REGIONAL).freeze();
-        public static final String KEYCAP_MARK_STRING = "\u20E3";
-        public static final UnicodeSet MODIFIERS = new UnicodeSet(0x1F3FB, 0x1F3FF).freeze();
-        public static final String JOINER_STRING = "\u200D";
-        public static final String KISS = "💋";
-        public static final String HEART = "❤";
-        public static final String MALE_SIGN = "♂";
-        public static final String FEMALE_SIGN = "♀";
-        public static final String MAN = "👨";
-        public static final String WOMAN = "👩";
-        public static final String JOINER_MALE_SIGN = JOINER_STRING + MALE_SIGN;
-        public static final String JOINER_FEMALE_SIGN = JOINER_STRING + FEMALE_SIGN;
-
-        //public static final UnicodeSet MODIFIERS_GENDER_SIGNS = new UnicodeSet(0x1F3FB, 0x1F3FF).add(MALE_SIGN).add(FEMALE_SIGN).freeze();
-        public static String getFlagCode(String s) {
-            return String.valueOf((char) (s.codePointAt(0) - FIRST_REGIONAL + 'A')) + (char) (s.codePointAt(2) - FIRST_REGIONAL + 'A');
-        }
-
-        public static final UnicodeSet FAMILY_MARKERS = new UnicodeSet()
-            .add(0x1F466, 0x1F469).add(0x1F476)
-            .add(JOINER_STRING)
-            .freeze(); // boy, girl, man, woman, baby
-        public static final UnicodeSet REM_SKIP_SET = new UnicodeSet()
-            .add(JOINER_STRING)
-            .freeze();
-        public static final UnicodeSet REM_GROUP_SKIP_SET = new UnicodeSet(REM_SKIP_SET)
-            .add(EmojiConstants.HEART).add(EmojiConstants.KISS)
-            .add(MALE_SIGN).add(FEMALE_SIGN)
-            .freeze();
-        public static final String TAG_TERM = UTF16.valueOf(0xE007F);
-        public static final String BLACK_FLAG = UTF16.valueOf(0x1F3F4);
-
-        public static String getTagSpec(String code) {
-            StringBuilder b = new StringBuilder();
-            for (int codePoint : CharSequences.codePoints(code)) {
-                if (codePoint >= 0xE0020 && codePoint <= 0xE007E) {
-                    b.appendCodePoint(codePoint - 0xE0000);
-                }
-            }
-            return b.toString();
-        }
-    }
-
     public static final class AnnotationSet {
 
         private static final CLDRConfig CONFIG = CLDRConfig.getInstance();
 
         static final Factory factory = CONFIG.getCldrFactory();
         static final CLDRFile ENGLISH = CONFIG.getEnglish();
-        static final Factory SUBDIVISION_FACTORY = Factory.make(CLDRPaths.COMMON_DIRECTORY + "subdivisions/", ".*");
-        static final CLDRFile ENGLISH_SUBDIVISIONS = SUBDIVISION_FACTORY.make("en", true);
+        static final CLDRFile ENGLISH_ANNOTATIONS = null;
+        static final Map<String,String> englishSubdivisionIdToName = EmojiSubdivisionNames.getSubdivisionIdToName("en");
+        //CLDRConfig.getInstance().getAnnotationsFactory().make("en", false);
 
         private final String locale;
         private final UnicodeMap<Annotations> baseData;
         private final UnicodeMap<Annotations> unresolvedData;
         private final CLDRFile cldrFile;
-        private final CLDRFile cldrFileSubdivisions;
+        private final Map<String, String> subdivisionIdToName;
         private final SimpleFormatter initialPattern;
         private final Pattern initialRegexPattern;
-        private final SimpleFormatter listPattern;
+        private final XListFormatter listPattern;
         private final Set<String> flagLabelSet;
         private final Set<String> keycapLabelSet;
         private final String keycapLabel;
+        private final String flagLabel;
 //        private final String maleLabel;
 //        private final String femaleLabel;
         private final Map<String, Annotations> localeCache = new ConcurrentHashMap<>();
 
-        public AnnotationSet(String locale, UnicodeMap<Annotations> source, UnicodeMap<Annotations> resolvedSource) {
+        static UnicodeSetSpanner uss = new UnicodeSetSpanner(EmojiConstants.COMPONENTS); // must be sync'ed
+
+        private AnnotationSet(String locale, UnicodeMap<Annotations> source, UnicodeMap<Annotations> resolvedSource) {
             this.locale = locale;
             unresolvedData = source.freeze();
             this.baseData = resolvedSource == null ? unresolvedData : resolvedSource.freeze();
             cldrFile = factory.make(locale, true);
-            CLDRFile _cldrFileSubdivisions = null;
-            try {
-                _cldrFileSubdivisions = SUBDIVISION_FACTORY.make(locale, true);
-            } catch (Exception e) {
-            }
-            cldrFileSubdivisions = _cldrFileSubdivisions;
-            listPattern = SimpleFormatter.compile(getStringValue("//ldml/listPatterns/listPattern[@type=\"unit-short\"]/listPatternPart[@type=\"2\"]"));
+            subdivisionIdToName = EmojiSubdivisionNames.getSubdivisionIdToName(locale);
+            listPattern = new XListFormatter(cldrFile, EmojiConstants.COMPOSED_NAME_LIST);
             final String initialPatternString = getStringValue("//ldml/characterLabels/characterLabelPattern[@type=\"category-list\"]");
             initialPattern = SimpleFormatter.compile(initialPatternString);
             final String regexPattern = ("\\Q" + initialPatternString.replace("{0}", "\\E.*\\Q").replace("{1}", "\\E.*\\Q") + "\\E")
                 .replace("\\Q\\E", ""); // HACK to detect use of prefix pattern
             initialRegexPattern = Pattern.compile(regexPattern);
             flagLabelSet = getLabelSet("flag");
+            flagLabel = flagLabelSet.isEmpty() ? null : flagLabelSet.iterator().next();
             keycapLabelSet = getLabelSet("keycap");
             keycapLabel = keycapLabelSet.isEmpty() ? null : keycapLabelSet.iterator().next();
 //            maleLabel = getStringValue("//ldml/characterLabels/characterLabel[@type=\"male\"]");
@@ -309,7 +269,7 @@ public class Annotations {
             }
             String sourceLocale = cldrFile2.getSourceLocaleID(xpath, null);
             if (sourceLocale.equals(XMLSource.CODE_FALLBACK_ID) || sourceLocale.equals(XMLSource.ROOT_ID)) {
-                return BAD_MARKER + result;
+                return MISSING_MARKER + result;
             }
             return result;
         }
@@ -365,6 +325,9 @@ public class Annotations {
         }
 
         private Annotations synthesize(String code, Transform<String, String> otherSource) {
+            if (code.equals("👱🏻‍♂")) {
+                int debug = 0;
+            }
             String shortName = null;
             int len = code.codePointCount(0, code.length());
             boolean isKeycap10 = code.equals("🔟");
@@ -388,12 +351,26 @@ public class Annotations {
             } else if (EmojiConstants.REGIONAL_INDICATORS.containsAll(code)) {
                 String countryCode = EmojiConstants.getFlagCode(code);
                 String path = CLDRFile.getKey(CLDRFile.TERRITORY_NAME, countryCode);
-                return new Annotations(flagLabelSet, getStringValue(path));
+                String regionName = getStringValue(path);
+                if (regionName == null) {
+                    regionName = ENGLISH_MARKER + ENGLISH.getStringValue(path);
+                }
+                String flagName = flagLabel == null ? regionName : initialPattern.format(flagLabel, regionName);
+                return new Annotations(flagLabelSet, flagName);
             } else if (code.startsWith(EmojiConstants.BLACK_FLAG)
                 && code.endsWith(EmojiConstants.TAG_TERM)) {
                 String subdivisionCode = EmojiConstants.getTagSpec(code);
-                String path = CLDRFile.getKey(CLDRFile.SUBDIVISION_NAME, subdivisionCode);
-                return new Annotations(flagLabelSet, getStringValue(path, cldrFileSubdivisions, ENGLISH_SUBDIVISIONS));
+                String subdivisionName = subdivisionIdToName.get(subdivisionCode);
+                if (subdivisionName == null) {
+                    subdivisionName = englishSubdivisionIdToName.get(subdivisionCode);
+                    if (subdivisionName != null) {
+                        subdivisionName = ENGLISH_MARKER + subdivisionCode;
+                    } else {
+                        subdivisionName = MISSING_MARKER + subdivisionCode;
+                    }
+                }
+                String flagName = flagLabel == null ? subdivisionName : initialPattern.format(flagLabel, subdivisionName);
+                return new Annotations(flagLabelSet, flagName);
             } else if (isKeycap10 || code.contains(EmojiConstants.KEYCAP_MARK_STRING)) {
                 final String rem = code.equals("🔟") ? "10" : UTF16.valueOf(code.charAt(0));
                 shortName = initialPattern.format(keycapLabel, rem);
@@ -402,10 +379,11 @@ public class Annotations {
             UnicodeSet skipSet = EmojiConstants.REM_SKIP_SET;
             String rem = "";
             SimpleFormatter startPattern = initialPattern;
-
-            if (EmojiConstants.MODIFIERS.containsSome(code)) {
-                rem = EmojiConstants.MODIFIERS.stripFrom(code, false);
-                code = EmojiConstants.MODIFIERS.stripFrom(code, true);
+            if (EmojiConstants.COMPONENTS.containsSome(code)) {
+                synchronized (uss) {
+                    rem = uss.deleteFrom(code, SpanCondition.NOT_CONTAINED);
+                    code = uss.deleteFrom(code, SpanCondition.CONTAINED);
+                }
             }
             if (code.contains(EmojiConstants.JOINER_STRING)) {
 //                if (code.endsWith(EmojiConstants.JOINER_MALE_SIGN)){
@@ -466,6 +444,10 @@ public class Annotations {
                     return null;
                 }
             }
+
+            boolean hackBlond = EmojiConstants.HAIR_EXPLICIT.contains(base.codePointAt(0));
+            List<String> arguments = new ArrayList<>();
+            
             for (int mod : CharSequences.codePoints(rem)) {
                 if (ignore.contains(mod)) {
                     continue;
@@ -479,13 +461,40 @@ public class Annotations {
                 }
                 if (modName == null) {
                     needMarker = true;
-                    continue;
+                    if (ENGLISH_DATA != null) {
+                        Annotations engName = ENGLISH_DATA.baseData.get(mod);
+                        if (engName != null) {
+                            modName = engName.getShortName();
+                        }
+                    }
+                    if (modName == null) {
+                        modName = Utility.hex(mod); // ultimate fallback
+                    }
+                }
+                if (hackBlond && shortName != null) { 
+                    // HACK: make the blond names look like the other hair names
+                    // Split the short name into pieces, if possible, and insert the modName first
+                    String sep = initialPattern.format("", "");
+                    int splitPoint = shortName.indexOf(sep);
+                    if (splitPoint >= 0) {
+                        String modName0 = shortName.substring(splitPoint+sep.length());
+                        shortName = shortName.substring(0, splitPoint);
+                        if (modName != null) {
+                            arguments.add(modName);
+                            annotations.add(modName);
+                        }
+                        modName = modName0;
+                    }
+                    hackBlond = false;
+                }
+
+                if (modName != null) {
+                    arguments.add(modName);
+                    annotations.add(modName);
                 }
-                shortName = shortName == null ? modName : pattern.format(shortName, modName);
-                if (modName != null) annotations.add(modName);
-                pattern = listPattern;
             }
-            Annotations result = new Annotations(annotations, (needMarker ? BAD_MARKER : "") + shortName);
+            shortName = pattern.format(shortName, listPattern.format(arguments));
+            Annotations result = new Annotations(annotations, (needMarker ? ENGLISH_MARKER : "") + shortName);
             return result;
         }
 
diff --git a/tools/java/org/unicode/cldr/util/CLDRConfig.java b/tools/java/org/unicode/cldr/util/CLDRConfig.java
index 23ec5e7..8d386bf 100644
--- a/tools/java/org/unicode/cldr/util/CLDRConfig.java
+++ b/tools/java/org/unicode/cldr/util/CLDRConfig.java
@@ -62,6 +62,11 @@ public class CLDRConfig extends Properties {
      * Object to use for synchronization when interacting with Factory
      */
     private static final Object ANNOTATIONS_FACTORY_SYNC = new Object();
+    
+    /**
+     * Object to use for synchronization when interacting with Factory
+     */
+    private static final Object SUBDIVISION_FACTORY_SYNC = new Object();
 
     /**
      * Object used for synchronization when interacting with SupplementalData
@@ -74,6 +79,11 @@ public class CLDRConfig extends Properties {
     private static final Object GET_COLLATOR_SYNC = new Object();
 
     /**
+     * Object used for synchronization in getCollator()
+     */
+    private static final Object GET_COLLATOR_SYNC_ROOT = new Object();
+
+    /**
      * Object used for synchronization in getStandardCodes()
      */
     private static final Object GET_STANDARD_CODES_SYNC = new Object();
@@ -152,7 +162,9 @@ public class CLDRConfig extends Properties {
     private Factory collationFactory;
     private Factory rbnfFactory;
     private Factory annotationsFactory;
+    private Factory subdivisionFactory;
     private Factory supplementalFactory;
+    private RuleBasedCollator colRoot;
     private RuleBasedCollator col;
     private Phase phase = null; // default
 
@@ -269,6 +281,15 @@ public class CLDRConfig extends Properties {
         return annotationsFactory;
     }
 
+    public Factory getSubdivisionFactory() {
+        synchronized (SUBDIVISION_FACTORY_SYNC) {
+            if (subdivisionFactory == null) {
+                subdivisionFactory = Factory.make(CLDRPaths.SUBDIVISIONS_DIRECTORY, ".*");
+            }
+        }
+        return subdivisionFactory;
+    }
+
     public Factory getMainAndAnnotationsFactory() {
         synchronized (FULL_FACTORY_SYNC) {
             if (mainAndAnnotationsFactory == null) {
@@ -339,6 +360,25 @@ public class CLDRConfig extends Properties {
         return getCLDRFile("root", true);
     }
 
+    public Collator getCollatorRoot() {
+        synchronized (GET_COLLATOR_SYNC_ROOT) {
+            if (colRoot == null) {
+                CLDRFile root = getCollationFactory().make("root", false);
+                String rules = root.getStringValue("//ldml/collations/collation[@type=\"emoji\"][@visibility=\"external\"]/cr");
+                try {
+                    colRoot = new RuleBasedCollator(rules);
+                } catch (Exception e) {
+                    colRoot = (RuleBasedCollator) getCollator();
+                    return colRoot;
+                }
+                colRoot.setStrength(Collator.IDENTICAL);
+                colRoot.setNumericCollation(true);
+                colRoot.freeze();
+            }
+        }
+        return colRoot;
+    }
+
     public Collator getCollator() {
         synchronized (GET_COLLATOR_SYNC) {
             if (col == null) {
diff --git a/tools/java/org/unicode/cldr/util/CLDRFile.java b/tools/java/org/unicode/cldr/util/CLDRFile.java
index 58b8182..e6c9e66 100644
--- a/tools/java/org/unicode/cldr/util/CLDRFile.java
+++ b/tools/java/org/unicode/cldr/util/CLDRFile.java
@@ -116,7 +116,7 @@ public class CLDRFile implements Freezable<CLDRFile>, Iterable<String> {
     public static final String SUPPLEMENTAL_NAME = "supplementalData";
     public static final String SUPPLEMENTAL_METADATA = "supplementalMetadata";
     public static final String SUPPLEMENTAL_PREFIX = "supplemental";
-    public static final String GEN_VERSION = "33";
+    public static final String GEN_VERSION = "33.1";
     public static final List<String> SUPPLEMENTAL_NAMES = Arrays.asList("characters", "coverageLevels", "dayPeriods", "genderList", "languageInfo",
         "languageGroup", "likelySubtags", "metaZones", "numberingSystems", "ordinals", "plurals", "postalCodeData", "rgScope", "supplementalData",
         "supplementalMetadata",
diff --git a/tools/java/org/unicode/cldr/util/Emoji.java b/tools/java/org/unicode/cldr/util/Emoji.java
index 7592105..c7e4cce 100644
--- a/tools/java/org/unicode/cldr/util/Emoji.java
+++ b/tools/java/org/unicode/cldr/util/Emoji.java
@@ -23,7 +23,7 @@ public class Emoji {
     public static final UnicodeSet TAGS = new UnicodeSet(0xE0000, 0xE007F).freeze();
     public static final UnicodeSet FAMILY = new UnicodeSet("[\u200D 👦-👩 💋 ❤]").freeze();
     public static final UnicodeSet GENDER = new UnicodeSet().add(0x2640).add(0x2642).freeze();
-    public static final UnicodeSet SPECIALS = new UnicodeSet("[{🏳‍🌈}{👁‍🗨}]").freeze();
+    public static final UnicodeSet SPECIALS = new UnicodeSet("[{🏳‍🌈}{👁‍🗨}{🏴‍☠}]").freeze();
     public static final UnicodeSet MAN_WOMAN = new UnicodeSet("[👨 👩]").freeze();
     public static final UnicodeSet OBJECT = new UnicodeSet("[👩 🎓 🌾 🍳 🏫 🏭 🎨 🚒 ✈ 🚀 🎤 💻 🔬 💼 🔧 ⚖ ⚕]").freeze();
 
@@ -31,6 +31,7 @@ public class Emoji {
     static final UnicodeMap<String> emojiToMinorCategory = new UnicodeMap<>();
     static final Map<String, Integer> minorToOrder = new HashMap<>();
     static final UnicodeSet nonConstructed = new UnicodeSet();
+    static final UnicodeSet allRgi = new UnicodeSet();
 
     static {
         /*
@@ -60,11 +61,11 @@ public class Emoji {
             }
             Iterator<String> it = semi.split(line).iterator();
             String emojiHex = it.next();
-//            String type = it.next();
-//            if (!type.startsWith("fully-qualified")) {
-//                continue;
-//            }
             String original = Utility.fromHex(emojiHex, 4, " ");
+            String type = it.next();
+            if (type.startsWith("fully-qualified")) {
+                allRgi.add(original);
+            }
             emojiToMajorCategory.put(original, majorCategory);
             emojiToMinorCategory.put(original, minorCategory);
 
@@ -95,10 +96,20 @@ public class Emoji {
         emojiToMinorCategory.freeze();
         nonConstructed.add(MODIFIERS); // needed for names
         nonConstructed.freeze();
+        allRgi.freeze();
+    }
+
+    public static UnicodeSet getAllRgi() {
+        return allRgi;
     }
 
     public static String getMinorCategory(String emoji) {
-        return CldrUtility.ifNull(emojiToMinorCategory.get(emoji), "Component");
+        String minorCat = emojiToMinorCategory.get(emoji);
+        if (minorCat == null) {
+            throw new InternalCldrException("No minor category (aka subgroup) found for " + emoji 
+                + ". Update emoji-test.txt to latest, and adjust PathHeader.. functionMap.put(\"minor\", ...");
+        }
+        return minorCat;
     }
 
     public static int getMinorToOrder(String minor) {
@@ -107,7 +118,12 @@ public class Emoji {
     }
 
     public static String getMajorCategory(String emoji) {
-        return CldrUtility.ifNull(emojiToMajorCategory.get(emoji), "Component");
+        String majorCat = emojiToMajorCategory.get(emoji);
+        if (majorCat == null) {
+            throw new InternalCldrException("No minor category (aka subgroup) found for " + emoji 
+                + ". Update emoji-test.txt to latest, and adjust PathHeader.. functionMap.put(\"major\", ...");
+        }
+        return majorCat;
     }
 
     public static Set<String> getMajorCategories() {
diff --git a/tools/java/org/unicode/cldr/util/EmojiConstants.java b/tools/java/org/unicode/cldr/util/EmojiConstants.java
new file mode 100644
index 0000000..ba24679
--- /dev/null
+++ b/tools/java/org/unicode/cldr/util/EmojiConstants.java
@@ -0,0 +1,107 @@
+package org.unicode.cldr.util;
+
+import java.util.Locale;
+
+import org.unicode.cldr.util.XListFormatter.ListTypeLength;
+
+import com.ibm.icu.lang.CharSequences;
+import com.ibm.icu.text.UTF16;
+import com.ibm.icu.text.UnicodeSet;
+
+public class EmojiConstants {
+    public static final String EMOJI_VARIANT_STRING = "\uFE0F";
+    static final int FIRST_REGIONAL = 0x1F1E6;
+    static final int LAST_REGIONAL = 0x1F1FF;
+    public static final UnicodeSet REGIONAL_INDICATORS = new UnicodeSet(FIRST_REGIONAL, LAST_REGIONAL).freeze();
+    public static final String KEYCAP_MARK_STRING = "\u20E3";
+    public static final UnicodeSet MODIFIERS = new UnicodeSet(0x1F3FB, 0x1F3FF).freeze();
+    public static final UnicodeSet HAIR = new UnicodeSet(0x1F9B0, 0x1F9B3).freeze();
+    public static final char JOINER = '\u200D';
+    public static final String JOINER_STRING = String.valueOf(JOINER);
+    public static final UnicodeSet COMPONENTS = new UnicodeSet(EmojiConstants.MODIFIERS)
+        .add(EmojiConstants.fromCodePoints(JOINER,0x1F9B0))
+        .add(EmojiConstants.fromCodePoints(JOINER,0x1F9B1))
+        .add(EmojiConstants.fromCodePoints(JOINER,0x1F9B2))
+        .add(EmojiConstants.fromCodePoints(JOINER,0x1F9B3)) 
+        .freeze();
+
+    public static final String KISS = "💋";
+    public static final String HEART = "❤";
+    public static final String MALE_SIGN = "♂";
+    public static final String FEMALE_SIGN = "♀";
+    public static final String MAN = "👨";
+    public static final String WOMAN = "👩";
+    public static final String JOINER_MALE_SIGN = JOINER_STRING + MALE_SIGN;
+    public static final String JOINER_FEMALE_SIGN = JOINER_STRING + FEMALE_SIGN;
+    public static final UnicodeSet HAIR_EXPLICIT = new UnicodeSet("[🧔 👱]").freeze();
+    
+    public static final ListTypeLength COMPOSED_NAME_LIST = ListTypeLength.UNIT_SHORT;
+
+    //public static final UnicodeSet MODIFIERS_GENDER_SIGNS = new UnicodeSet(0x1F3FB, 0x1F3FF).add(MALE_SIGN).add(FEMALE_SIGN).freeze();
+    public static String getFlagCode(String s) {
+        return String.valueOf((char) (s.codePointAt(0) - FIRST_REGIONAL + 'A')) + (char) (s.codePointAt(2) - FIRST_REGIONAL + 'A');
+    }
+    
+    public static String getEmojiFromRegionCodes(String chars) {
+        return new StringBuilder()
+                .appendCodePoint(chars.codePointAt(0) + FIRST_REGIONAL - 'A')
+                .appendCodePoint(chars.codePointAt(1) + FIRST_REGIONAL - 'A')
+                .toString();
+    }
+    
+    public static final int TAG_BASE = 0xE0000;
+    public static final int TAG_TERM_CHAR = 0xE007F;
+
+    public static String getEmojiFromSubdivisionCodes(String string) {
+        string = string.toLowerCase(Locale.ROOT).replace("-","");
+        StringBuilder result = new StringBuilder().appendCodePoint(0x1F3F4);
+        for (int cp : CharSequences.codePoints(string)) {
+            result.appendCodePoint(TAG_BASE + cp);
+        }
+        return result.appendCodePoint(TAG_TERM_CHAR).toString();
+    }
+
+    public static final UnicodeSet FAMILY_MARKERS = new UnicodeSet()
+        .add(0x1F466, 0x1F469).add(0x1F476)
+        .add(JOINER_STRING)
+        .freeze(); // boy, girl, man, woman, baby
+    public static final UnicodeSet REM_SKIP_SET = new UnicodeSet()
+        .add(JOINER_STRING)
+        .freeze();
+    public static final UnicodeSet REM_GROUP_SKIP_SET = new UnicodeSet(REM_SKIP_SET)
+        .add(EmojiConstants.HEART).add(EmojiConstants.KISS)
+        .add(MALE_SIGN).add(FEMALE_SIGN)
+        .freeze();
+    public static final String TAG_TERM = UTF16.valueOf(0xE007F);
+    public static final String BLACK_FLAG = UTF16.valueOf(0x1F3F4);
+
+    public static String getTagSpec(String code) {
+        StringBuilder b = new StringBuilder();
+        for (int codePoint : CharSequences.codePoints(code)) {
+            if (codePoint >= 0xE0020 && codePoint <= 0xE007E) {
+                b.appendCodePoint(codePoint - 0xE0000);
+            }
+        }
+        return b.toString();
+    }
+
+    // U+1F3F4 U+E0067 U+E0062 U+E0065 U+E006E U+E0067 U+E007F
+    public static String toTagSeq(String subdivisionCode) {
+        StringBuilder b = new StringBuilder().appendCodePoint(0x1F3F4);
+        for (int i = 0; i < subdivisionCode.length(); ++i) {
+            b.appendCodePoint(subdivisionCode.charAt(i) + 0xE0000);
+        }
+        return b.appendCodePoint(0xE007F).toString();
+    }
+
+    public static CharSequence fromCodePoints(int... codePoints) {
+        return EmojiConstants.appendCodePoints(new StringBuilder(), codePoints).toString();
+    }
+
+    public static StringBuilder appendCodePoints(StringBuilder b, int... codePoints) {
+        for (int i = 0; i < codePoints.length; ++i) {
+            b.appendCodePoint(codePoints[i]);
+        }
+        return b;
+    }
+}
\ No newline at end of file
diff --git a/tools/java/org/unicode/cldr/util/LanguageGroup.java b/tools/java/org/unicode/cldr/util/LanguageGroup.java
index 7c4780a..aa10e8a 100644
--- a/tools/java/org/unicode/cldr/util/LanguageGroup.java
+++ b/tools/java/org/unicode/cldr/util/LanguageGroup.java
@@ -50,7 +50,7 @@ public enum LanguageGroup {
         add(temp, romance, "fr", "pt", "gl", "es", "ca", "ast", "it", "rm", "ro");
         add(temp, slavic, "pl", "cs", "sk", "sl", "hr", "bs", "mk", "sr", "bg", "ru", "be", "uk");
         add(temp, baltic, "lt", "lv");
-        add(temp, other_indo, "el", "sq", "hy", "fa", "ps", "os");
+        add(temp, other_indo, "el", "hy", "sq", "fa", "ps", "os");
         add(temp, indic, "ur", "hi", "gu", "sd", "bn", "as", "ccp", "or", "mr", "ne", "pa", "si");
         add(temp, dravidian, "ta", "te", "ml", "kn");
         add(temp, cjk, "zh", "yue", "ja", "ko");
@@ -58,7 +58,7 @@ public enum LanguageGroup {
         add(temp, uralic, "hu", "fi", "et", "se", "smn");
         add(temp, afroasiatic, "ar", "mt", "he", "om", "so", "ha", "am", "tzm", "zgh");
         add(temp, tai, "th", "lo");
-        add(temp, austronesian, "id", "ms", "fil", "haw");
+        add(temp, austronesian, "id", "ms", "jv", "fil", "haw");
         add(temp, austroasiatic, "vi", "km");
         add(temp, niger_congo, "sw", "swc", "yo", "ig", "ff", "sn", "zu");
         add(temp, other, "ka", "eu", "mn", "naq");
@@ -81,7 +81,7 @@ public enum LanguageGroup {
     }
 
     public static LanguageGroup get(ULocale locale) {
-        return CldrUtility.ifNull(LANGUAGE_GROUP.get(locale), LanguageGroup.other);
+        return CldrUtility.ifNull(LANGUAGE_GROUP.get(new ULocale(locale.getLanguage())), LanguageGroup.other);
     }
 
     public static Set<ULocale> getExplicit() {
@@ -98,6 +98,7 @@ public enum LanguageGroup {
      * @return
      */
     public static int rankInGroup(ULocale locale) {
+        locale = new ULocale(locale.getLanguage());
         LanguageGroup group = LANGUAGE_GROUP.get(locale);
         if (group == null) {
             return Integer.MAX_VALUE;
diff --git a/tools/java/org/unicode/cldr/util/PathHeader.java b/tools/java/org/unicode/cldr/util/PathHeader.java
index 9615fe2..e0e6637 100644
--- a/tools/java/org/unicode/cldr/util/PathHeader.java
+++ b/tools/java/org/unicode/cldr/util/PathHeader.java
@@ -116,8 +116,8 @@ public class PathHeader implements Comparable<PathHeader> {
             // account for digits, and "some" future proofing.
             order = ordering < 0
                 ? source.charAt(pos)
-                : 0x10000 + ordering;
-            mainOrder = source.substring(0, pos);
+                    : 0x10000 + ordering;
+                mainOrder = source.substring(0, pos);
         }
 
         @Override
@@ -296,7 +296,7 @@ public class PathHeader implements Comparable<PathHeader> {
         "\\[@alt=\"([^\"]*+)\"]")
         .matcher("");
 
-    static final Collator alphabetic = CLDRConfig.getInstance().getCollator();// (RuleBasedCollator) Collator.getInstance(ULocale.ENGLISH);
+    static final Collator alphabetic = CLDRConfig.getInstance().getCollatorRoot();
 
 //    static final RuleBasedCollator alphabetic = (RuleBasedCollator) Collator
 //            .getInstance(ULocale.ENGLISH);
@@ -436,7 +436,7 @@ public class PathHeader implements Comparable<PathHeader> {
             + "\t" + pageId
             + "\t" + header // + "\t" + headerOrder
             + "\t" + code // + "\t" + codeOrder
-        ;
+            ;
     }
 
     @Override
@@ -976,7 +976,7 @@ public class PathHeader implements Comparable<PathHeader> {
             "Apr", "May", "Jun",
             "Jul", "Aug", "Sep",
             "Oct", "Nov", "Dec",
-            "Und" };
+        "Und" };
         static List<String> days = Arrays.asList("sun", "mon",
             "tue", "wed", "thu",
             "fri", "sat");
@@ -1198,7 +1198,7 @@ public class PathHeader implements Comparable<PathHeader> {
                     for (int i = 0; i < languageRangeStartPoints.length; i++) {
                         if (firstLetter >= languageRangeStartPoints[i] && firstLetter <= languageRangeEndPoints[i]) {
                             return "Languages (" + Character.toUpperCase(languageRangeStartPoints[i]) + "-" + Character.toUpperCase(languageRangeEndPoints[i])
-                                + ")";
+                            + ")";
                         }
                     }
                     return "Languages";
@@ -1237,13 +1237,13 @@ public class PathHeader implements Comparable<PathHeader> {
             });
             functionMap.put("categoryFromTerritory",
                 catFromTerritory = new Transform<String, String>() {
-                    public String transform(String source) {
-                        String territory = getSubdivisionsTerritory(source, null);
-                        String container = Containment.getContainer(territory);
-                        order = Containment.getOrder(territory);
-                        return englishFile.getName(CLDRFile.TERRITORY_NAME, container);
-                    }
-                });
+                public String transform(String source) {
+                    String territory = getSubdivisionsTerritory(source, null);
+                    String container = Containment.getContainer(territory);
+                    order = Containment.getOrder(territory);
+                    return englishFile.getName(CLDRFile.TERRITORY_NAME, container);
+                }
+            });
             functionMap.put("territorySection", new Transform<String, String>() {
                 final Set<String> specialRegions = new HashSet<String>(Arrays.asList("EZ", "EU", "QO", "UN", "ZZ"));
 
@@ -1274,14 +1274,14 @@ public class PathHeader implements Comparable<PathHeader> {
             });
             functionMap.put("categoryFromTimezone",
                 catFromTimezone = new Transform<String, String>() {
-                    public String transform(String source0) {
-                        String territory = Containment.getRegionFromZone(source0);
-                        if (territory == null) {
-                            territory = "ZZ";
-                        }
-                        return catFromTerritory.transform(territory);
+                public String transform(String source0) {
+                    String territory = Containment.getRegionFromZone(source0);
+                    if (territory == null) {
+                        territory = "ZZ";
                     }
-                });
+                    return catFromTerritory.transform(territory);
+                }
+            });
             functionMap.put("timeZonePage", new Transform<String, String>() {
                 Set<String> singlePageTerritories = new HashSet<String>(Arrays.asList("AQ", "RU", "ZZ"));
 
@@ -1676,7 +1676,8 @@ public class PathHeader implements Comparable<PathHeader> {
                 public String transform(String source) {
                     String major = Emoji.getMajorCategory(source);
                     // check that result is reasonable by running through PageId.
-                    if (!major.equals("Smileys & People")) {
+                    switch(major) {
+                    default:
                         PageId pageId2 = PageId.forString(major);
                         if (pageId2.getSectionId() != SectionId.Characters) {
                             if (pageId2 == PageId.Symbols) {
@@ -1684,12 +1685,15 @@ public class PathHeader implements Comparable<PathHeader> {
                             }
                         }
                         return pageId2.toString();
-                    }
-                    String minorCat = Emoji.getMinorCategory(source);
-                    if (minorCat.startsWith("person")) {
-                        return PageId.People.toString();
-                    } else {
-                        return PageId.Smileys.toString();
+                    case "Smileys & People":
+                        String minorCat = Emoji.getMinorCategory(source);
+                        if (minorCat.equals("skin-tone") || minorCat.equals("hair-style")) {
+                            return PageId.Component.toString();
+                        } else if (!minorCat.contains("face")) {
+                            return PageId.People.toString();
+                        } else {
+                            return PageId.Smileys.toString();
+                        }
                     }
                 }
             });
@@ -1749,6 +1753,9 @@ public class PathHeader implements Comparable<PathHeader> {
          * @return
          */
         private static String fix(String input, int orderIn) {
+            if (input.contains("👱")) {
+                int debug = 0;
+            }
             String oldInput = input;
             input = RegexLookup.replace(input, args.value);
             order = orderIn;
diff --git a/tools/java/org/unicode/cldr/util/XListFormatter.java b/tools/java/org/unicode/cldr/util/XListFormatter.java
new file mode 100644
index 0000000..6d0b150
--- /dev/null
+++ b/tools/java/org/unicode/cldr/util/XListFormatter.java
@@ -0,0 +1,82 @@
+package org.unicode.cldr.util;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.google.common.collect.ImmutableMap;
+import com.ibm.icu.lang.CharSequences;
+import com.ibm.icu.text.ListFormatter;
+import com.ibm.icu.text.SimpleFormatter;
+import com.ibm.icu.text.UTF16;
+
+public class XListFormatter {
+    
+    public enum ListTypeLength {
+        AND_WIDE(""), 
+        AND_SHORT("[@type=\"standard-short\"]"), 
+        OR_WIDE("[@type=\"or\"]"), 
+        UNIT_WIDE("[@type=\"unit\"]"), 
+        UNIT_SHORT("[@type=\"unit-short\"]"), 
+        UNIT_NARROW("[@type=\"unit-narrow\"]")
+        ;
+
+        public static final ListTypeLength NORMAL = AND_WIDE;
+        
+        final String typeString;
+
+        static final Map<String, ListTypeLength> stringToEnum;
+        static {
+            Map<String, ListTypeLength> _stringToEnum = new LinkedHashMap<>();
+            for (ListTypeLength value : values()) {
+                if (value != NORMAL) {
+                    _stringToEnum.put(value.typeString.substring(value.typeString.indexOf('"')+1, value.typeString.lastIndexOf('"')), value);
+                }
+            }
+            stringToEnum = ImmutableMap.copyOf(_stringToEnum);
+        }
+        private ListTypeLength(String typeString) {
+            this.typeString = typeString;
+        }
+        public static ListTypeLength from(String listPatternType) {
+            if (listPatternType == null) {
+                return NORMAL;
+            }
+            return stringToEnum.get(listPatternType);
+        }
+        public String getPath() {
+            return "//ldml/listPatterns/listPattern"
+                + typeString
+                + "/listPatternPart[@type=\"{0}\"]";
+        }
+    }
+    
+    private ListFormatter listFormatter;
+    
+    public XListFormatter(CLDRFile cldrFile, ListTypeLength listTypeLength) {
+        SimpleFormatter listPathFormat = SimpleFormatter.compile(listTypeLength.getPath());
+        String doublePattern = cldrFile.getWinningValue(listPathFormat.format("2"));
+        String startPattern = cldrFile.getWinningValue(listPathFormat.format("start"));
+        String middlePattern = cldrFile.getWinningValue(listPathFormat.format("middle"));
+        String endPattern = cldrFile.getWinningValue(listPathFormat.format("end"));
+        listFormatter = new ListFormatter(doublePattern, startPattern, middlePattern, endPattern);
+    }
+    
+    public String format(Object... items) {
+        return listFormatter.format(items);
+    }
+
+    public String format(Collection<?> items) {
+        return listFormatter.format(items);
+    }
+    
+    public String formatCodePoints(String items) {
+        List<String> source = new ArrayList<>();
+        for (int sourceInt : CharSequences.codePoints(items)) { // TODO add utility in CharSequences
+           source.add(UTF16.valueOf(sourceInt));
+        }
+        return listFormatter.format(source);
+    }
+}
\ No newline at end of file
diff --git a/tools/java/org/unicode/cldr/util/XMLSource.java b/tools/java/org/unicode/cldr/util/XMLSource.java
index bb626ee..b752301 100644
--- a/tools/java/org/unicode/cldr/util/XMLSource.java
+++ b/tools/java/org/unicode/cldr/util/XMLSource.java
@@ -1233,6 +1233,7 @@ public abstract class XMLSource implements Freezable<XMLSource>, Iterable<String
             { "fullwide", "numbers" },
             { "gb2312han", "collation" },
             { "geor", "numbers" },
+            { "gong", "numbers" },
             { "gonm", "numbers" },
             { "gregorian", "calendar" },
             { "grek", "numbers" },
@@ -1296,6 +1297,7 @@ public abstract class XMLSource implements Freezable<XMLSource>, Iterable<String
             { "pinyin", "collation" },
             { "reformed", "collation" },
             { "roc", "calendar" },
+            { "rohg", "numbers" },
             { "roman", "numbers" },
             { "romanlow", "numbers" },
             { "saur", "numbers" },
diff --git a/tools/java/org/unicode/cldr/util/data/Script_Metadata.csv b/tools/java/org/unicode/cldr/util/data/Script_Metadata.csv
index fe1ee59..ffea0df 100644
--- a/tools/java/org/unicode/cldr/util/data/Script_Metadata.csv
+++ b/tools/java/org/unicode/cldr/util/data/Script_Metadata.csv
@@ -39,7 +39,7 @@ WR,Name,Script_Code,Age,Size,Sample,Sample_Code,Origin Country,~Density,Likely L
 38,Yi,Yiii,3,"1,220",ꊈ,A288,China,3,Sichuan Yi,ii,Limited_Use,no,Yes,no,Yes,no

 39,Samaritan,Samr,5.2,61,ࠀ,800,Israel,1,Samaritan Hebrew,smp,Exclusion,Yes,no,min,no,no

 40,Coptic,Copt,1.1,165,Ϣ,3E2,Egypt,1,Coptic,cop,Exclusion,no,no,min,no,Yes

-41,Mongolian,Mong,3,153,ᠦ,1826,Mongolia,1,Mongolian,mn,Limited_Use,no,no,Yes,no,no

+41,Mongolian,Mong,3,153,ᠦ,1826,Mongolia,1,Mongolian,mn,Exclusion,no,no,Yes,no,no

 42,Glagolitic,Glag,4.1,94,Ⰰ,2C00,Bulgaria,1,Church Slavic,cu,Exclusion,no,no,no,no,Yes

 43,Vai,Vaii,5.1,300,ꕉ,A549,Liberia,2,Vai,vai,Limited_Use,no,no,no,Yes,no

 44,Balinese,Bali,5,121,ᬅ,1B05,Indonesia,1,Balinese,ban,Limited_Use,no,no,Yes,no,no

@@ -138,7 +138,7 @@ WR,Name,Script_Code,Age,Size,Sample,Sample_Code,Origin Country,~Density,Likely L
 137,Osage,Osge,9,0,𐒵,104B5,USA,1,Osage,osa,Limited_Use,no,no,no,no,Yes

 138,Tangut,Tang,9,0,𘈩,18229,China,3,Tangut,txg,Exclusion,no,Yes,no,Yes,no

 139,Newa,Newa,9,0,𑐒,11412,Nepal,1,Newari,new,Limited_Use,no,no,Yes,no,no

-140,Masaram Gondi,Gonm,10,75,𑴐,11D10,India,1,Gondi,gon,Exclusion,no,no,Yes,no,no

+140,Masaram Gondi,Gonm,10,75,𑴐,11D10,India,1,Aheri Gondi,esg,Exclusion,no,no,Yes,no,no

 141,Nushu,Nshu,10,397,𛇄,1B1C4,China,2,Chinese language family,zhx,Exclusion,no,Yes,no,Yes,no

 142,Soyombo,Soyo,10,81,𑩜,11A5C,Mongolia,1,Classical Mongolian,cmg,Exclusion,no,no,Yes,no,no

 143,Zanabazar Square,Zanb,10,69,𑨋,11A0B,Mongolia,1,Classical Mongolian,cmg,Exclusion,no,no,Yes,no,no

diff --git a/tools/java/org/unicode/cldr/util/data/emoji/emoji-test.txt b/tools/java/org/unicode/cldr/util/data/emoji/emoji-test.txt
index c2d334f..bc34cc5 100644
--- a/tools/java/org/unicode/cldr/util/data/emoji/emoji-test.txt
+++ b/tools/java/org/unicode/cldr/util/data/emoji/emoji-test.txt
@@ -1,11 +1,11 @@
 # emoji-test.txt
-# Date: 2017-03-21, 12:10:30 GMT
-# © 2017 Unicode®, Inc.
+# Date: 2018-05-22, 17:07:43 GMT
+# © 2018 Unicode®, Inc.
 # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
 # For terms of use, see http://www.unicode.org/terms_of_use.html
 #
-# Emoji Keyboard/Display Test Data for UTR #51
-# Version: 5.0
+# Emoji Keyboard/Display Test Data for UTS #51
+# Version: 11.0
 #
 # For documentation and usage, see http://www.unicode.org/reports/tr51
 #
@@ -13,8 +13,8 @@
 # Format
 #   Code points; status # emoji name
 #     Status
-#       fully-qualified — see “Emoji Implementation Notes” in UTR#51
-#       non-fully-qualified — see “Emoji Implementation Notes” in UTR#51
+#       fully-qualified — see “Emoji Implementation Notes” in UTS #51
+#       non-fully-qualified — see “Emoji Implementation Notes” in UTS #51
 # Notes:
 #   • This currently omits the 12 keycap bases, the 5 modifier characters, and 26 singleton Regional Indicator characters
 #   • The file is in CLDR order, not codepoint order. This is recommended (but not required!) for keyboard palettes.
@@ -24,19 +24,20 @@
 
 # subgroup: face-positive
 1F600                                      ; fully-qualified     # 😀 grinning face
-1F601                                      ; fully-qualified     # 😁 grinning face with smiling eyes
+1F601                                      ; fully-qualified     # 😁 beaming face with smiling eyes
 1F602                                      ; fully-qualified     # 😂 face with tears of joy
 1F923                                      ; fully-qualified     # 🤣 rolling on the floor laughing
-1F603                                      ; fully-qualified     # 😃 smiling face with open mouth
-1F604                                      ; fully-qualified     # 😄 smiling face with open mouth & smiling eyes
-1F605                                      ; fully-qualified     # 😅 smiling face with open mouth & cold sweat
-1F606                                      ; fully-qualified     # 😆 smiling face with open mouth & closed eyes
+1F603                                      ; fully-qualified     # 😃 grinning face with big eyes
+1F604                                      ; fully-qualified     # 😄 grinning face with smiling eyes
+1F605                                      ; fully-qualified     # 😅 grinning face with sweat
+1F606                                      ; fully-qualified     # 😆 grinning squinting face
 1F609                                      ; fully-qualified     # 😉 winking face
 1F60A                                      ; fully-qualified     # 😊 smiling face with smiling eyes
-1F60B                                      ; fully-qualified     # 😋 face savouring delicious food
+1F60B                                      ; fully-qualified     # 😋 face savoring food
 1F60E                                      ; fully-qualified     # 😎 smiling face with sunglasses
 1F60D                                      ; fully-qualified     # 😍 smiling face with heart-eyes
 1F618                                      ; fully-qualified     # 😘 face blowing a kiss
+1F970                                      ; fully-qualified     # 🥰 smiling face with 3 hearts
 1F617                                      ; fully-qualified     # 😗 kissing face
 1F619                                      ; fully-qualified     # 😙 kissing face with smiling eyes
 1F61A                                      ; fully-qualified     # 😚 kissing face with closed eyes
@@ -55,7 +56,7 @@
 1F644                                      ; fully-qualified     # 🙄 face with rolling eyes
 1F60F                                      ; fully-qualified     # 😏 smirking face
 1F623                                      ; fully-qualified     # 😣 persevering face
-1F625                                      ; fully-qualified     # 😥 disappointed but relieved face
+1F625                                      ; fully-qualified     # 😥 sad but relieved face
 1F62E                                      ; fully-qualified     # 😮 face with open mouth
 1F910                                      ; fully-qualified     # 🤐 zipper-mouth face
 1F62F                                      ; fully-qualified     # 😯 hushed face
@@ -63,12 +64,12 @@
 1F62B                                      ; fully-qualified     # 😫 tired face
 1F634                                      ; fully-qualified     # 😴 sleeping face
 1F60C                                      ; fully-qualified     # 😌 relieved face
-1F61B                                      ; fully-qualified     # 😛 face with stuck-out tongue
-1F61C                                      ; fully-qualified     # 😜 face with stuck-out tongue & winking eye
-1F61D                                      ; fully-qualified     # 😝 face with stuck-out tongue & closed eyes
+1F61B                                      ; fully-qualified     # 😛 face with tongue
+1F61C                                      ; fully-qualified     # 😜 winking face with tongue
+1F61D                                      ; fully-qualified     # 😝 squinting face with tongue
 1F924                                      ; fully-qualified     # 🤤 drooling face
 1F612                                      ; fully-qualified     # 😒 unamused face
-1F613                                      ; fully-qualified     # 😓 face with cold sweat
+1F613                                      ; fully-qualified     # 😓 downcast face with sweat
 1F614                                      ; fully-qualified     # 😔 pensive face
 1F615                                      ; fully-qualified     # 😕 confused face
 1F643                                      ; fully-qualified     # 🙃 upside-down face
@@ -91,14 +92,16 @@
 1F629                                      ; fully-qualified     # 😩 weary face
 1F92F                                      ; fully-qualified     # 🤯 exploding head
 1F62C                                      ; fully-qualified     # 😬 grimacing face
-1F630                                      ; fully-qualified     # 😰 face with open mouth & cold sweat
+1F630                                      ; fully-qualified     # 😰 anxious face with sweat
 1F631                                      ; fully-qualified     # 😱 face screaming in fear
+1F975                                      ; fully-qualified     # 🥵 hot face
+1F976                                      ; fully-qualified     # 🥶 cold face
 1F633                                      ; fully-qualified     # 😳 flushed face
-1F92A                                      ; fully-qualified     # 🤪 crazy face
+1F92A                                      ; fully-qualified     # 🤪 zany face
 1F635                                      ; fully-qualified     # 😵 dizzy face
 1F621                                      ; fully-qualified     # 😡 pouting face
 1F620                                      ; fully-qualified     # 😠 angry face
-1F92C                                      ; fully-qualified     # 🤬 face with symbols over mouth
+1F92C                                      ; fully-qualified     # 🤬 face with symbols on mouth
 
 # subgroup: face-sick
 1F637                                      ; fully-qualified     # 😷 face with medical mask
@@ -111,7 +114,9 @@
 # subgroup: face-role
 1F607                                      ; fully-qualified     # 😇 smiling face with halo
 1F920                                      ; fully-qualified     # 🤠 cowboy hat face
-1F921                                      ; fully-qualified     # 🤡 clown face
+1F973                                      ; fully-qualified     # 🥳 partying face
+1F974                                      ; fully-qualified     # 🥴 woozy face
+1F97A                                      ; fully-qualified     # 🥺 pleading face
 1F925                                      ; fully-qualified     # 🤥 lying face
 1F92B                                      ; fully-qualified     # 🤫 shushing face
 1F92D                                      ; fully-qualified     # 🤭 face with hand over mouth
@@ -121,6 +126,7 @@
 # subgroup: face-fantasy
 1F608                                      ; fully-qualified     # 😈 smiling face with horns
 1F47F                                      ; fully-qualified     # 👿 angry face with horns
+1F921                                      ; fully-qualified     # 🤡 clown face
 1F479                                      ; fully-qualified     # 👹 ogre
 1F47A                                      ; fully-qualified     # 👺 goblin
 1F480                                      ; fully-qualified     # 💀 skull
@@ -133,12 +139,12 @@
 1F4A9                                      ; fully-qualified     # 💩 pile of poo
 
 # subgroup: cat-face
-1F63A                                      ; fully-qualified     # 😺 smiling cat face with open mouth
+1F63A                                      ; fully-qualified     # 😺 grinning cat face
 1F638                                      ; fully-qualified     # 😸 grinning cat face with smiling eyes
 1F639                                      ; fully-qualified     # 😹 cat face with tears of joy
 1F63B                                      ; fully-qualified     # 😻 smiling cat face with heart-eyes
 1F63C                                      ; fully-qualified     # 😼 cat face with wry smile
-1F63D                                      ; fully-qualified     # 😽 kissing cat face with closed eyes
+1F63D                                      ; fully-qualified     # 😽 kissing cat face
 1F640                                      ; fully-qualified     # 🙀 weary cat face
 1F63F                                      ; fully-qualified     # 😿 crying cat face
 1F63E                                      ; fully-qualified     # 😾 pouting cat face
@@ -173,30 +179,114 @@
 1F467 1F3FD                                ; fully-qualified     # 👧🏽 girl: medium skin tone
 1F467 1F3FE                                ; fully-qualified     # 👧🏾 girl: medium-dark skin tone
 1F467 1F3FF                                ; fully-qualified     # 👧🏿 girl: dark skin tone
-1F9D1                                      ; fully-qualified     # 🧑 adult
-1F9D1 1F3FB                                ; fully-qualified     # 🧑🏻 adult: light skin tone
-1F9D1 1F3FC                                ; fully-qualified     # 🧑🏼 adult: medium-light skin tone
-1F9D1 1F3FD                                ; fully-qualified     # 🧑🏽 adult: medium skin tone
-1F9D1 1F3FE                                ; fully-qualified     # 🧑🏾 adult: medium-dark skin tone
-1F9D1 1F3FF                                ; fully-qualified     # 🧑🏿 adult: dark skin tone
+1F9D1                                      ; fully-qualified     # 🧑 person
+1F9D1 1F3FB                                ; fully-qualified     # 🧑🏻 person: light skin tone
+1F9D1 1F3FC                                ; fully-qualified     # 🧑🏼 person: medium-light skin tone
+1F9D1 1F3FD                                ; fully-qualified     # 🧑🏽 person: medium skin tone
+1F9D1 1F3FE                                ; fully-qualified     # 🧑🏾 person: medium-dark skin tone
+1F9D1 1F3FF                                ; fully-qualified     # 🧑🏿 person: dark skin tone
+1F471                                      ; fully-qualified     # 👱 person: blond hair
+1F471 1F3FB                                ; fully-qualified     # 👱🏻 person: light skin tone, blond hair
+1F471 1F3FC                                ; fully-qualified     # 👱🏼 person: medium-light skin tone, blond hair
+1F471 1F3FD                                ; fully-qualified     # 👱🏽 person: medium skin tone, blond hair
+1F471 1F3FE                                ; fully-qualified     # 👱🏾 person: medium-dark skin tone, blond hair
+1F471 1F3FF                                ; fully-qualified     # 👱🏿 person: dark skin tone, blond hair
 1F468                                      ; fully-qualified     # 👨 man
 1F468 1F3FB                                ; fully-qualified     # 👨🏻 man: light skin tone
 1F468 1F3FC                                ; fully-qualified     # 👨🏼 man: medium-light skin tone
 1F468 1F3FD                                ; fully-qualified     # 👨🏽 man: medium skin tone
 1F468 1F3FE                                ; fully-qualified     # 👨🏾 man: medium-dark skin tone
 1F468 1F3FF                                ; fully-qualified     # 👨🏿 man: dark skin tone
+1F471 200D 2642 FE0F                       ; fully-qualified     # 👱‍♂️ man: blond hair
+1F471 200D 2642                            ; non-fully-qualified # 👱‍♂ man: blond hair
+1F471 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 👱🏻‍♂️ man: light skin tone, blond hair
+1F471 1F3FB 200D 2642                      ; non-fully-qualified # 👱🏻‍♂ man: light skin tone, blond hair
+1F471 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 👱🏼‍♂️ man: medium-light skin tone, blond hair
+1F471 1F3FC 200D 2642                      ; non-fully-qualified # 👱🏼‍♂ man: medium-light skin tone, blond hair
+1F471 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 👱🏽‍♂️ man: medium skin tone, blond hair
+1F471 1F3FD 200D 2642                      ; non-fully-qualified # 👱🏽‍♂ man: medium skin tone, blond hair
+1F471 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 👱🏾‍♂️ man: medium-dark skin tone, blond hair
+1F471 1F3FE 200D 2642                      ; non-fully-qualified # 👱🏾‍♂ man: medium-dark skin tone, blond hair
+1F471 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 👱🏿‍♂️ man: dark skin tone, blond hair
+1F471 1F3FF 200D 2642                      ; non-fully-qualified # 👱🏿‍♂ man: dark skin tone, blond hair
+1F468 200D 1F9B0                           ; fully-qualified     # 👨‍🦰 man: red hair
+1F468 1F3FB 200D 1F9B0                     ; fully-qualified     # 👨🏻‍🦰 man: light skin tone, red hair
+1F468 1F3FC 200D 1F9B0                     ; fully-qualified     # 👨🏼‍🦰 man: medium-light skin tone, red hair
+1F468 1F3FD 200D 1F9B0                     ; fully-qualified     # 👨🏽‍🦰 man: medium skin tone, red hair
+1F468 1F3FE 200D 1F9B0                     ; fully-qualified     # 👨🏾‍🦰 man: medium-dark skin tone, red hair
+1F468 1F3FF 200D 1F9B0                     ; fully-qualified     # 👨🏿‍🦰 man: dark skin tone, red hair
+1F468 200D 1F9B1                           ; fully-qualified     # 👨‍🦱 man: curly hair
+1F468 1F3FB 200D 1F9B1                     ; fully-qualified     # 👨🏻‍🦱 man: light skin tone, curly hair
+1F468 1F3FC 200D 1F9B1                     ; fully-qualified     # 👨🏼‍🦱 man: medium-light skin tone, curly hair
+1F468 1F3FD 200D 1F9B1                     ; fully-qualified     # 👨🏽‍🦱 man: medium skin tone, curly hair
+1F468 1F3FE 200D 1F9B1                     ; fully-qualified     # 👨🏾‍🦱 man: medium-dark skin tone, curly hair
+1F468 1F3FF 200D 1F9B1                     ; fully-qualified     # 👨🏿‍🦱 man: dark skin tone, curly hair
+1F468 200D 1F9B3                           ; fully-qualified     # 👨‍🦳 man: white hair
+1F468 1F3FB 200D 1F9B3                     ; fully-qualified     # 👨🏻‍🦳 man: light skin tone, white hair
+1F468 1F3FC 200D 1F9B3                     ; fully-qualified     # 👨🏼‍🦳 man: medium-light skin tone, white hair
+1F468 1F3FD 200D 1F9B3                     ; fully-qualified     # 👨🏽‍🦳 man: medium skin tone, white hair
+1F468 1F3FE 200D 1F9B3                     ; fully-qualified     # 👨🏾‍🦳 man: medium-dark skin tone, white hair
+1F468 1F3FF 200D 1F9B3                     ; fully-qualified     # 👨🏿‍🦳 man: dark skin tone, white hair
+1F468 200D 1F9B2                           ; fully-qualified     # 👨‍🦲 man: bald
+1F468 1F3FB 200D 1F9B2                     ; fully-qualified     # 👨🏻‍🦲 man: light skin tone, bald
+1F468 1F3FC 200D 1F9B2                     ; fully-qualified     # 👨🏼‍🦲 man: medium-light skin tone, bald
+1F468 1F3FD 200D 1F9B2                     ; fully-qualified     # 👨🏽‍🦲 man: medium skin tone, bald
+1F468 1F3FE 200D 1F9B2                     ; fully-qualified     # 👨🏾‍🦲 man: medium-dark skin tone, bald
+1F468 1F3FF 200D 1F9B2                     ; fully-qualified     # 👨🏿‍🦲 man: dark skin tone, bald
+1F9D4                                      ; fully-qualified     # 🧔 man: beard
+1F9D4 1F3FB                                ; fully-qualified     # 🧔🏻 man: light skin tone, beard
+1F9D4 1F3FC                                ; fully-qualified     # 🧔🏼 man: medium-light skin tone, beard
+1F9D4 1F3FD                                ; fully-qualified     # 🧔🏽 man: medium skin tone, beard
+1F9D4 1F3FE                                ; fully-qualified     # 🧔🏾 man: medium-dark skin tone, beard
+1F9D4 1F3FF                                ; fully-qualified     # 🧔🏿 man: dark skin tone, beard
 1F469                                      ; fully-qualified     # 👩 woman
 1F469 1F3FB                                ; fully-qualified     # 👩🏻 woman: light skin tone
 1F469 1F3FC                                ; fully-qualified     # 👩🏼 woman: medium-light skin tone
 1F469 1F3FD                                ; fully-qualified     # 👩🏽 woman: medium skin tone
 1F469 1F3FE                                ; fully-qualified     # 👩🏾 woman: medium-dark skin tone
 1F469 1F3FF                                ; fully-qualified     # 👩🏿 woman: dark skin tone
-1F9D3                                      ; fully-qualified     # 🧓 older adult
-1F9D3 1F3FB                                ; fully-qualified     # 🧓🏻 older adult: light skin tone
-1F9D3 1F3FC                                ; fully-qualified     # 🧓🏼 older adult: medium-light skin tone
-1F9D3 1F3FD                                ; fully-qualified     # 🧓🏽 older adult: medium skin tone
-1F9D3 1F3FE                                ; fully-qualified     # 🧓🏾 older adult: medium-dark skin tone
-1F9D3 1F3FF                                ; fully-qualified     # 🧓🏿 older adult: dark skin tone
+1F471 200D 2640 FE0F                       ; fully-qualified     # 👱‍♀️ woman: blond hair
+1F471 200D 2640                            ; non-fully-qualified # 👱‍♀ woman: blond hair
+1F471 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 👱🏻‍♀️ woman: light skin tone, blond hair
+1F471 1F3FB 200D 2640                      ; non-fully-qualified # 👱🏻‍♀ woman: light skin tone, blond hair
+1F471 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 👱🏼‍♀️ woman: medium-light skin tone, blond hair
+1F471 1F3FC 200D 2640                      ; non-fully-qualified # 👱🏼‍♀ woman: medium-light skin tone, blond hair
+1F471 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 👱🏽‍♀️ woman: medium skin tone, blond hair
+1F471 1F3FD 200D 2640                      ; non-fully-qualified # 👱🏽‍♀ woman: medium skin tone, blond hair
+1F471 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 👱🏾‍♀️ woman: medium-dark skin tone, blond hair
+1F471 1F3FE 200D 2640                      ; non-fully-qualified # 👱🏾‍♀ woman: medium-dark skin tone, blond hair
+1F471 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 👱🏿‍♀️ woman: dark skin tone, blond hair
+1F471 1F3FF 200D 2640                      ; non-fully-qualified # 👱🏿‍♀ woman: dark skin tone, blond hair
+1F469 200D 1F9B0                           ; fully-qualified     # 👩‍🦰 woman: red hair
+1F469 1F3FB 200D 1F9B0                     ; fully-qualified     # 👩🏻‍🦰 woman: light skin tone, red hair
+1F469 1F3FC 200D 1F9B0                     ; fully-qualified     # 👩🏼‍🦰 woman: medium-light skin tone, red hair
+1F469 1F3FD 200D 1F9B0                     ; fully-qualified     # 👩🏽‍🦰 woman: medium skin tone, red hair
+1F469 1F3FE 200D 1F9B0                     ; fully-qualified     # 👩🏾‍🦰 woman: medium-dark skin tone, red hair
+1F469 1F3FF 200D 1F9B0                     ; fully-qualified     # 👩🏿‍🦰 woman: dark skin tone, red hair
+1F469 200D 1F9B1                           ; fully-qualified     # 👩‍🦱 woman: curly hair
+1F469 1F3FB 200D 1F9B1                     ; fully-qualified     # 👩🏻‍🦱 woman: light skin tone, curly hair
+1F469 1F3FC 200D 1F9B1                     ; fully-qualified     # 👩🏼‍🦱 woman: medium-light skin tone, curly hair
+1F469 1F3FD 200D 1F9B1                     ; fully-qualified     # 👩🏽‍🦱 woman: medium skin tone, curly hair
+1F469 1F3FE 200D 1F9B1                     ; fully-qualified     # 👩🏾‍🦱 woman: medium-dark skin tone, curly hair
+1F469 1F3FF 200D 1F9B1                     ; fully-qualified     # 👩🏿‍🦱 woman: dark skin tone, curly hair
+1F469 200D 1F9B3                           ; fully-qualified     # 👩‍🦳 woman: white hair
+1F469 1F3FB 200D 1F9B3                     ; fully-qualified     # 👩🏻‍🦳 woman: light skin tone, white hair
+1F469 1F3FC 200D 1F9B3                     ; fully-qualified     # 👩🏼‍🦳 woman: medium-light skin tone, white hair
+1F469 1F3FD 200D 1F9B3                     ; fully-qualified     # 👩🏽‍🦳 woman: medium skin tone, white hair
+1F469 1F3FE 200D 1F9B3                     ; fully-qualified     # 👩🏾‍🦳 woman: medium-dark skin tone, white hair
+1F469 1F3FF 200D 1F9B3                     ; fully-qualified     # 👩🏿‍🦳 woman: dark skin tone, white hair
+1F469 200D 1F9B2                           ; fully-qualified     # 👩‍🦲 woman: bald
+1F469 1F3FB 200D 1F9B2                     ; fully-qualified     # 👩🏻‍🦲 woman: light skin tone, bald
+1F469 1F3FC 200D 1F9B2                     ; fully-qualified     # 👩🏼‍🦲 woman: medium-light skin tone, bald
+1F469 1F3FD 200D 1F9B2                     ; fully-qualified     # 👩🏽‍🦲 woman: medium skin tone, bald
+1F469 1F3FE 200D 1F9B2                     ; fully-qualified     # 👩🏾‍🦲 woman: medium-dark skin tone, bald
+1F469 1F3FF 200D 1F9B2                     ; fully-qualified     # 👩🏿‍🦲 woman: dark skin tone, bald
+1F9D3                                      ; fully-qualified     # 🧓 older person
+1F9D3 1F3FB                                ; fully-qualified     # 🧓🏻 older person: light skin tone
+1F9D3 1F3FC                                ; fully-qualified     # 🧓🏼 older person: medium-light skin tone
+1F9D3 1F3FD                                ; fully-qualified     # 🧓🏽 older person: medium skin tone
+1F9D3 1F3FE                                ; fully-qualified     # 🧓🏾 older person: medium-dark skin tone
+1F9D3 1F3FF                                ; fully-qualified     # 🧓🏿 older person: dark skin tone
 1F474                                      ; fully-qualified     # 👴 old man
 1F474 1F3FB                                ; fully-qualified     # 👴🏻 old man: light skin tone
 1F474 1F3FC                                ; fully-qualified     # 👴🏼 old man: medium-light skin tone
@@ -618,42 +708,6 @@
 1F9D5 1F3FD                                ; fully-qualified     # 🧕🏽 woman with headscarf: medium skin tone
 1F9D5 1F3FE                                ; fully-qualified     # 🧕🏾 woman with headscarf: medium-dark skin tone
 1F9D5 1F3FF                                ; fully-qualified     # 🧕🏿 woman with headscarf: dark skin tone
-1F9D4                                      ; fully-qualified     # 🧔 bearded person
-1F9D4 1F3FB                                ; fully-qualified     # 🧔🏻 bearded person: light skin tone
-1F9D4 1F3FC                                ; fully-qualified     # 🧔🏼 bearded person: medium-light skin tone
-1F9D4 1F3FD                                ; fully-qualified     # 🧔🏽 bearded person: medium skin tone
-1F9D4 1F3FE                                ; fully-qualified     # 🧔🏾 bearded person: medium-dark skin tone
-1F9D4 1F3FF                                ; fully-qualified     # 🧔🏿 bearded person: dark skin tone
-1F471                                      ; fully-qualified     # 👱 blond-haired person
-1F471 1F3FB                                ; fully-qualified     # 👱🏻 blond-haired person: light skin tone
-1F471 1F3FC                                ; fully-qualified     # 👱🏼 blond-haired person: medium-light skin tone
-1F471 1F3FD                                ; fully-qualified     # 👱🏽 blond-haired person: medium skin tone
-1F471 1F3FE                                ; fully-qualified     # 👱🏾 blond-haired person: medium-dark skin tone
-1F471 1F3FF                                ; fully-qualified     # 👱🏿 blond-haired person: dark skin tone
-1F471 200D 2642 FE0F                       ; fully-qualified     # 👱‍♂️ blond-haired man
-1F471 200D 2642                            ; non-fully-qualified # 👱‍♂ blond-haired man
-1F471 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 👱🏻‍♂️ blond-haired man: light skin tone
-1F471 1F3FB 200D 2642                      ; non-fully-qualified # 👱🏻‍♂ blond-haired man: light skin tone
-1F471 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 👱🏼‍♂️ blond-haired man: medium-light skin tone
-1F471 1F3FC 200D 2642                      ; non-fully-qualified # 👱🏼‍♂ blond-haired man: medium-light skin tone
-1F471 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 👱🏽‍♂️ blond-haired man: medium skin tone
-1F471 1F3FD 200D 2642                      ; non-fully-qualified # 👱🏽‍♂ blond-haired man: medium skin tone
-1F471 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 👱🏾‍♂️ blond-haired man: medium-dark skin tone
-1F471 1F3FE 200D 2642                      ; non-fully-qualified # 👱🏾‍♂ blond-haired man: medium-dark skin tone
-1F471 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 👱🏿‍♂️ blond-haired man: dark skin tone
-1F471 1F3FF 200D 2642                      ; non-fully-qualified # 👱🏿‍♂ blond-haired man: dark skin tone
-1F471 200D 2640 FE0F                       ; fully-qualified     # 👱‍♀️ blond-haired woman
-1F471 200D 2640                            ; non-fully-qualified # 👱‍♀ blond-haired woman
-1F471 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 👱🏻‍♀️ blond-haired woman: light skin tone
-1F471 1F3FB 200D 2640                      ; non-fully-qualified # 👱🏻‍♀ blond-haired woman: light skin tone
-1F471 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 👱🏼‍♀️ blond-haired woman: medium-light skin tone
-1F471 1F3FC 200D 2640                      ; non-fully-qualified # 👱🏼‍♀ blond-haired woman: medium-light skin tone
-1F471 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 👱🏽‍♀️ blond-haired woman: medium skin tone
-1F471 1F3FD 200D 2640                      ; non-fully-qualified # 👱🏽‍♀ blond-haired woman: medium skin tone
-1F471 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 👱🏾‍♀️ blond-haired woman: medium-dark skin tone
-1F471 1F3FE 200D 2640                      ; non-fully-qualified # 👱🏾‍♀ blond-haired woman: medium-dark skin tone
-1F471 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 👱🏿‍♀️ blond-haired woman: dark skin tone
-1F471 1F3FF 200D 2640                      ; non-fully-qualified # 👱🏿‍♀ blond-haired woman: dark skin tone
 1F935                                      ; fully-qualified     # 🤵 man in tuxedo
 1F935 1F3FB                                ; fully-qualified     # 🤵🏻 man in tuxedo: light skin tone
 1F935 1F3FC                                ; fully-qualified     # 🤵🏼 man in tuxedo: medium-light skin tone
@@ -698,6 +752,66 @@
 1F936 1F3FD                                ; fully-qualified     # 🤶🏽 Mrs. Claus: medium skin tone
 1F936 1F3FE                                ; fully-qualified     # 🤶🏾 Mrs. Claus: medium-dark skin tone
 1F936 1F3FF                                ; fully-qualified     # 🤶🏿 Mrs. Claus: dark skin tone
+1F9B8                                      ; fully-qualified     # 🦸 superhero
+1F9B8 1F3FB                                ; fully-qualified     # 🦸🏻 superhero: light skin tone
+1F9B8 1F3FC                                ; fully-qualified     # 🦸🏼 superhero: medium-light skin tone
+1F9B8 1F3FD                                ; fully-qualified     # 🦸🏽 superhero: medium skin tone
+1F9B8 1F3FE                                ; fully-qualified     # 🦸🏾 superhero: medium-dark skin tone
+1F9B8 1F3FF                                ; fully-qualified     # 🦸🏿 superhero: dark skin tone
+1F9B8 200D 2640 FE0F                       ; fully-qualified     # 🦸‍♀️ woman superhero
+1F9B8 200D 2640                            ; non-fully-qualified # 🦸‍♀ woman superhero
+1F9B8 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 🦸🏻‍♀️ woman superhero: light skin tone
+1F9B8 1F3FB 200D 2640                      ; non-fully-qualified # 🦸🏻‍♀ woman superhero: light skin tone
+1F9B8 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 🦸🏼‍♀️ woman superhero: medium-light skin tone
+1F9B8 1F3FC 200D 2640                      ; non-fully-qualified # 🦸🏼‍♀ woman superhero: medium-light skin tone
+1F9B8 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 🦸🏽‍♀️ woman superhero: medium skin tone
+1F9B8 1F3FD 200D 2640                      ; non-fully-qualified # 🦸🏽‍♀ woman superhero: medium skin tone
+1F9B8 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 🦸🏾‍♀️ woman superhero: medium-dark skin tone
+1F9B8 1F3FE 200D 2640                      ; non-fully-qualified # 🦸🏾‍♀ woman superhero: medium-dark skin tone
+1F9B8 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 🦸🏿‍♀️ woman superhero: dark skin tone
+1F9B8 1F3FF 200D 2640                      ; non-fully-qualified # 🦸🏿‍♀ woman superhero: dark skin tone
+1F9B8 200D 2642 FE0F                       ; fully-qualified     # 🦸‍♂️ man superhero
+1F9B8 200D 2642                            ; non-fully-qualified # 🦸‍♂ man superhero
+1F9B8 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 🦸🏻‍♂️ man superhero: light skin tone
+1F9B8 1F3FB 200D 2642                      ; non-fully-qualified # 🦸🏻‍♂ man superhero: light skin tone
+1F9B8 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 🦸🏼‍♂️ man superhero: medium-light skin tone
+1F9B8 1F3FC 200D 2642                      ; non-fully-qualified # 🦸🏼‍♂ man superhero: medium-light skin tone
+1F9B8 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 🦸🏽‍♂️ man superhero: medium skin tone
+1F9B8 1F3FD 200D 2642                      ; non-fully-qualified # 🦸🏽‍♂ man superhero: medium skin tone
+1F9B8 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 🦸🏾‍♂️ man superhero: medium-dark skin tone
+1F9B8 1F3FE 200D 2642                      ; non-fully-qualified # 🦸🏾‍♂ man superhero: medium-dark skin tone
+1F9B8 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 🦸🏿‍♂️ man superhero: dark skin tone
+1F9B8 1F3FF 200D 2642                      ; non-fully-qualified # 🦸🏿‍♂ man superhero: dark skin tone
+1F9B9                                      ; fully-qualified     # 🦹 supervillain
+1F9B9 1F3FB                                ; fully-qualified     # 🦹🏻 supervillain: light skin tone
+1F9B9 1F3FC                                ; fully-qualified     # 🦹🏼 supervillain: medium-light skin tone
+1F9B9 1F3FD                                ; fully-qualified     # 🦹🏽 supervillain: medium skin tone
+1F9B9 1F3FE                                ; fully-qualified     # 🦹🏾 supervillain: medium-dark skin tone
+1F9B9 1F3FF                                ; fully-qualified     # 🦹🏿 supervillain: dark skin tone
+1F9B9 200D 2640 FE0F                       ; fully-qualified     # 🦹‍♀️ woman supervillain
+1F9B9 200D 2640                            ; non-fully-qualified # 🦹‍♀ woman supervillain
+1F9B9 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 🦹🏻‍♀️ woman supervillain: light skin tone
+1F9B9 1F3FB 200D 2640                      ; non-fully-qualified # 🦹🏻‍♀ woman supervillain: light skin tone
+1F9B9 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 🦹🏼‍♀️ woman supervillain: medium-light skin tone
+1F9B9 1F3FC 200D 2640                      ; non-fully-qualified # 🦹🏼‍♀ woman supervillain: medium-light skin tone
+1F9B9 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 🦹🏽‍♀️ woman supervillain: medium skin tone
+1F9B9 1F3FD 200D 2640                      ; non-fully-qualified # 🦹🏽‍♀ woman supervillain: medium skin tone
+1F9B9 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 🦹🏾‍♀️ woman supervillain: medium-dark skin tone
+1F9B9 1F3FE 200D 2640                      ; non-fully-qualified # 🦹🏾‍♀ woman supervillain: medium-dark skin tone
+1F9B9 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 🦹🏿‍♀️ woman supervillain: dark skin tone
+1F9B9 1F3FF 200D 2640                      ; non-fully-qualified # 🦹🏿‍♀ woman supervillain: dark skin tone
+1F9B9 200D 2642 FE0F                       ; fully-qualified     # 🦹‍♂️ man supervillain
+1F9B9 200D 2642                            ; non-fully-qualified # 🦹‍♂ man supervillain
+1F9B9 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 🦹🏻‍♂️ man supervillain: light skin tone
+1F9B9 1F3FB 200D 2642                      ; non-fully-qualified # 🦹🏻‍♂ man supervillain: light skin tone
+1F9B9 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 🦹🏼‍♂️ man supervillain: medium-light skin tone
+1F9B9 1F3FC 200D 2642                      ; non-fully-qualified # 🦹🏼‍♂ man supervillain: medium-light skin tone
+1F9B9 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 🦹🏽‍♂️ man supervillain: medium skin tone
+1F9B9 1F3FD 200D 2642                      ; non-fully-qualified # 🦹🏽‍♂ man supervillain: medium skin tone
+1F9B9 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 🦹🏾‍♂️ man supervillain: medium-dark skin tone
+1F9B9 1F3FE 200D 2642                      ; non-fully-qualified # 🦹🏾‍♂ man supervillain: medium-dark skin tone
+1F9B9 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 🦹🏿‍♂️ man supervillain: dark skin tone
+1F9B9 1F3FF 200D 2642                      ; non-fully-qualified # 🦹🏿‍♂ man supervillain: dark skin tone
 1F9D9                                      ; fully-qualified     # 🧙 mage
 1F9D9 1F3FB                                ; fully-qualified     # 🧙🏻 mage: light skin tone
 1F9D9 1F3FC                                ; fully-qualified     # 🧙🏼 mage: medium-light skin tone
@@ -1264,11 +1378,11 @@
 1F57A 1F3FD                                ; fully-qualified     # 🕺🏽 man dancing: medium skin tone
 1F57A 1F3FE                                ; fully-qualified     # 🕺🏾 man dancing: medium-dark skin tone
 1F57A 1F3FF                                ; fully-qualified     # 🕺🏿 man dancing: dark skin tone
-1F46F                                      ; fully-qualified     # 👯 people with bunny ears partying
-1F46F 200D 2642 FE0F                       ; fully-qualified     # 👯‍♂️ men with bunny ears partying
-1F46F 200D 2642                            ; non-fully-qualified # 👯‍♂ men with bunny ears partying
-1F46F 200D 2640 FE0F                       ; fully-qualified     # 👯‍♀️ women with bunny ears partying
-1F46F 200D 2640                            ; non-fully-qualified # 👯‍♀ women with bunny ears partying
+1F46F                                      ; fully-qualified     # 👯 people with bunny ears
+1F46F 200D 2642 FE0F                       ; fully-qualified     # 👯‍♂️ men with bunny ears
+1F46F 200D 2642                            ; non-fully-qualified # 👯‍♂ men with bunny ears
+1F46F 200D 2640 FE0F                       ; fully-qualified     # 👯‍♀️ women with bunny ears
+1F46F 200D 2640                            ; non-fully-qualified # 👯‍♀ women with bunny ears
 1F9D6                                      ; fully-qualified     # 🧖 person in steamy room
 1F9D6 1F3FB                                ; fully-qualified     # 🧖🏻 person in steamy room: light skin tone
 1F9D6 1F3FC                                ; fully-qualified     # 🧖🏼 person in steamy room: medium-light skin tone
@@ -1371,13 +1485,13 @@
 1F6CC 1F3FD                                ; fully-qualified     # 🛌🏽 person in bed: medium skin tone
 1F6CC 1F3FE                                ; fully-qualified     # 🛌🏾 person in bed: medium-dark skin tone
 1F6CC 1F3FF                                ; fully-qualified     # 🛌🏿 person in bed: dark skin tone
-1F574 FE0F                                 ; fully-qualified     # 🕴️ man in business suit levitating
-1F574                                      ; non-fully-qualified # 🕴 man in business suit levitating
-1F574 1F3FB                                ; fully-qualified     # 🕴🏻 man in business suit levitating: light skin tone
-1F574 1F3FC                                ; fully-qualified     # 🕴🏼 man in business suit levitating: medium-light skin tone
-1F574 1F3FD                                ; fully-qualified     # 🕴🏽 man in business suit levitating: medium skin tone
-1F574 1F3FE                                ; fully-qualified     # 🕴🏾 man in business suit levitating: medium-dark skin tone
-1F574 1F3FF                                ; fully-qualified     # 🕴🏿 man in business suit levitating: dark skin tone
+1F574 FE0F                                 ; fully-qualified     # 🕴️ man in suit levitating
+1F574                                      ; non-fully-qualified # 🕴 man in suit levitating
+1F574 1F3FB                                ; fully-qualified     # 🕴🏻 man in suit levitating: light skin tone
+1F574 1F3FC                                ; fully-qualified     # 🕴🏼 man in suit levitating: medium-light skin tone
+1F574 1F3FD                                ; fully-qualified     # 🕴🏽 man in suit levitating: medium skin tone
+1F574 1F3FE                                ; fully-qualified     # 🕴🏾 man in suit levitating: medium-dark skin tone
+1F574 1F3FF                                ; fully-qualified     # 🕴🏿 man in suit levitating: dark skin tone
 1F5E3 FE0F                                 ; fully-qualified     # 🗣️ speaking head
 1F5E3                                      ; non-fully-qualified # 🗣 speaking head
 1F464                                      ; fully-qualified     # 👤 bust in silhouette
@@ -1842,6 +1956,18 @@
 1F4AA 1F3FD                                ; fully-qualified     # 💪🏽 flexed biceps: medium skin tone
 1F4AA 1F3FE                                ; fully-qualified     # 💪🏾 flexed biceps: medium-dark skin tone
 1F4AA 1F3FF                                ; fully-qualified     # 💪🏿 flexed biceps: dark skin tone
+1F9B5                                      ; fully-qualified     # 🦵 leg
+1F9B5 1F3FB                                ; fully-qualified     # 🦵🏻 leg: light skin tone
+1F9B5 1F3FC                                ; fully-qualified     # 🦵🏼 leg: medium-light skin tone
+1F9B5 1F3FD                                ; fully-qualified     # 🦵🏽 leg: medium skin tone
+1F9B5 1F3FE                                ; fully-qualified     # 🦵🏾 leg: medium-dark skin tone
+1F9B5 1F3FF                                ; fully-qualified     # 🦵🏿 leg: dark skin tone
+1F9B6                                      ; fully-qualified     # 🦶 foot
+1F9B6 1F3FB                                ; fully-qualified     # 🦶🏻 foot: light skin tone
+1F9B6 1F3FC                                ; fully-qualified     # 🦶🏼 foot: medium-light skin tone
+1F9B6 1F3FD                                ; fully-qualified     # 🦶🏽 foot: medium skin tone
+1F9B6 1F3FE                                ; fully-qualified     # 🦶🏾 foot: medium-dark skin tone
+1F9B6 1F3FF                                ; fully-qualified     # 🦶🏿 foot: dark skin tone
 1F448                                      ; fully-qualified     # 👈 backhand index pointing left
 1F448 1F3FB                                ; fully-qualified     # 👈🏻 backhand index pointing left: light skin tone
 1F448 1F3FC                                ; fully-qualified     # 👈🏼 backhand index pointing left: medium-light skin tone
@@ -1910,13 +2036,13 @@
 1F919 1F3FD                                ; fully-qualified     # 🤙🏽 call me hand: medium skin tone
 1F919 1F3FE                                ; fully-qualified     # 🤙🏾 call me hand: medium-dark skin tone
 1F919 1F3FF                                ; fully-qualified     # 🤙🏿 call me hand: dark skin tone
-1F590 FE0F                                 ; fully-qualified     # 🖐️ raised hand with fingers splayed
-1F590                                      ; non-fully-qualified # 🖐 raised hand with fingers splayed
-1F590 1F3FB                                ; fully-qualified     # 🖐🏻 raised hand with fingers splayed: light skin tone
-1F590 1F3FC                                ; fully-qualified     # 🖐🏼 raised hand with fingers splayed: medium-light skin tone
-1F590 1F3FD                                ; fully-qualified     # 🖐🏽 raised hand with fingers splayed: medium skin tone
-1F590 1F3FE                                ; fully-qualified     # 🖐🏾 raised hand with fingers splayed: medium-dark skin tone
-1F590 1F3FF                                ; fully-qualified     # 🖐🏿 raised hand with fingers splayed: dark skin tone
+1F590 FE0F                                 ; fully-qualified     # 🖐️ hand with fingers splayed
+1F590                                      ; non-fully-qualified # 🖐 hand with fingers splayed
+1F590 1F3FB                                ; fully-qualified     # 🖐🏻 hand with fingers splayed: light skin tone
+1F590 1F3FC                                ; fully-qualified     # 🖐🏼 hand with fingers splayed: medium-light skin tone
+1F590 1F3FD                                ; fully-qualified     # 🖐🏽 hand with fingers splayed: medium skin tone
+1F590 1F3FE                                ; fully-qualified     # 🖐🏾 hand with fingers splayed: medium-dark skin tone
+1F590 1F3FF                                ; fully-qualified     # 🖐🏿 hand with fingers splayed: dark skin tone
 270B                                       ; fully-qualified     # ✋ raised hand
 270B 1F3FB                                 ; fully-qualified     # ✋🏻 raised hand: light skin tone
 270B 1F3FC                                 ; fully-qualified     # ✋🏼 raised hand: medium-light skin tone
@@ -2048,31 +2174,46 @@
 1F441 FE0F 200D 1F5E8                      ; non-fully-qualified # 👁️‍🗨 eye in speech bubble
 1F441 200D 1F5E8                           ; non-fully-qualified # 👁‍🗨 eye in speech bubble
 1F9E0                                      ; fully-qualified     # 🧠 brain
+1F9B4                                      ; fully-qualified     # 🦴 bone
+1F9B7                                      ; fully-qualified     # 🦷 tooth
 1F445                                      ; fully-qualified     # 👅 tongue
 1F444                                      ; fully-qualified     # 👄 mouth
 
+# subgroup: skin-tone
+1F3FB                                      ; fully-qualified     # 🏻 light skin tone
+1F3FC                                      ; fully-qualified     # 🏼 medium-light skin tone
+1F3FD                                      ; fully-qualified     # 🏽 medium skin tone
+1F3FE                                      ; fully-qualified     # 🏾 medium-dark skin tone
+1F3FF                                      ; fully-qualified     # 🏿 dark skin tone
+
+# subgroup: hair-style
+1F9B0                                      ; fully-qualified     # 🦰 red hair
+1F9B1                                      ; fully-qualified     # 🦱 curly hair
+1F9B3                                      ; fully-qualified     # 🦳 white hair
+1F9B2                                      ; fully-qualified     # 🦲 bald
+
 # subgroup: emotion
 1F48B                                      ; fully-qualified     # 💋 kiss mark
 1F498                                      ; fully-qualified     # 💘 heart with arrow
-2764 FE0F                                  ; fully-qualified     # ❤️ red heart
-2764                                       ; non-fully-qualified # ❤ red heart
-1F493                                      ; fully-qualified     # 💓 beating heart
-1F494                                      ; fully-qualified     # 💔 broken heart
-1F495                                      ; fully-qualified     # 💕 two hearts
+1F49D                                      ; fully-qualified     # 💝 heart with ribbon
 1F496                                      ; fully-qualified     # 💖 sparkling heart
 1F497                                      ; fully-qualified     # 💗 growing heart
-1F499                                      ; fully-qualified     # 💙 blue heart
-1F49A                                      ; fully-qualified     # 💚 green heart
-1F49B                                      ; fully-qualified     # 💛 yellow heart
+1F493                                      ; fully-qualified     # 💓 beating heart
+1F49E                                      ; fully-qualified     # 💞 revolving hearts
+1F495                                      ; fully-qualified     # 💕 two hearts
+1F48C                                      ; fully-qualified     # 💌 love letter
+2763 FE0F                                  ; fully-qualified     # ❣️ heavy heart exclamation
+2763                                       ; non-fully-qualified # ❣ heavy heart exclamation
+1F494                                      ; fully-qualified     # 💔 broken heart
+2764 FE0F                                  ; fully-qualified     # ❤️ red heart
+2764                                       ; non-fully-qualified # ❤ red heart
 1F9E1                                      ; fully-qualified     # 🧡 orange heart
+1F49B                                      ; fully-qualified     # 💛 yellow heart
+1F49A                                      ; fully-qualified     # 💚 green heart
+1F499                                      ; fully-qualified     # 💙 blue heart
 1F49C                                      ; fully-qualified     # 💜 purple heart
 1F5A4                                      ; fully-qualified     # 🖤 black heart
-1F49D                                      ; fully-qualified     # 💝 heart with ribbon
-1F49E                                      ; fully-qualified     # 💞 revolving hearts
 1F49F                                      ; fully-qualified     # 💟 heart decoration
-2763 FE0F                                  ; fully-qualified     # ❣️ heavy heart exclamation
-2763                                       ; non-fully-qualified # ❣ heavy heart exclamation
-1F48C                                      ; fully-qualified     # 💌 love letter
 1F4A4                                      ; fully-qualified     # 💤 zzz
 1F4A2                                      ; fully-qualified     # 💢 anger symbol
 1F4A3                                      ; fully-qualified     # 💣 bomb
@@ -2093,6 +2234,8 @@
 1F453                                      ; fully-qualified     # 👓 glasses
 1F576 FE0F                                 ; fully-qualified     # 🕶️ sunglasses
 1F576                                      ; non-fully-qualified # 🕶 sunglasses
+1F97D                                      ; fully-qualified     # 🥽 goggles
+1F97C                                      ; fully-qualified     # 🥼 lab coat
 1F454                                      ; fully-qualified     # 👔 necktie
 1F455                                      ; fully-qualified     # 👕 t-shirt
 1F456                                      ; fully-qualified     # 👖 jeans
@@ -2109,9 +2252,11 @@
 1F45D                                      ; fully-qualified     # 👝 clutch bag
 1F6CD FE0F                                 ; fully-qualified     # 🛍️ shopping bags
 1F6CD                                      ; non-fully-qualified # 🛍 shopping bags
-1F392                                      ; fully-qualified     # 🎒 school backpack
+1F392                                      ; fully-qualified     # 🎒 backpack
 1F45E                                      ; fully-qualified     # 👞 man’s shoe
 1F45F                                      ; fully-qualified     # 👟 running shoe
+1F97E                                      ; fully-qualified     # 🥾 hiking boot
+1F97F                                      ; fully-qualified     # 🥿 flat shoe
 1F460                                      ; fully-qualified     # 👠 high-heeled shoe
 1F461                                      ; fully-qualified     # 👡 woman’s sandal
 1F462                                      ; fully-qualified     # 👢 woman’s boot
@@ -2127,8 +2272,8 @@
 1F48D                                      ; fully-qualified     # 💍 ring
 1F48E                                      ; fully-qualified     # 💎 gem stone
 
-# Smileys & People subtotal:		2069
-# Smileys & People subtotal:		589	w/o modifiers
+# Smileys & People subtotal:		2210
+# Smileys & People subtotal:		625	w/o modifiers
 
 # group: Animals & Nature
 
@@ -2141,6 +2286,7 @@
 1F429                                      ; fully-qualified     # 🐩 poodle
 1F43A                                      ; fully-qualified     # 🐺 wolf face
 1F98A                                      ; fully-qualified     # 🦊 fox face
+1F99D                                      ; fully-qualified     # 🦝 raccoon
 1F431                                      ; fully-qualified     # 🐱 cat face
 1F408                                      ; fully-qualified     # 🐈 cat
 1F981                                      ; fully-qualified     # 🦁 lion face
@@ -2165,9 +2311,11 @@
 1F410                                      ; fully-qualified     # 🐐 goat
 1F42A                                      ; fully-qualified     # 🐪 camel
 1F42B                                      ; fully-qualified     # 🐫 two-hump camel
+1F999                                      ; fully-qualified     # 🦙 llama
 1F992                                      ; fully-qualified     # 🦒 giraffe
 1F418                                      ; fully-qualified     # 🐘 elephant
 1F98F                                      ; fully-qualified     # 🦏 rhinoceros
+1F99B                                      ; fully-qualified     # 🦛 hippopotamus
 1F42D                                      ; fully-qualified     # 🐭 mouse face
 1F401                                      ; fully-qualified     # 🐁 mouse
 1F400                                      ; fully-qualified     # 🐀 rat
@@ -2181,6 +2329,8 @@
 1F43B                                      ; fully-qualified     # 🐻 bear face
 1F428                                      ; fully-qualified     # 🐨 koala
 1F43C                                      ; fully-qualified     # 🐼 panda face
+1F998                                      ; fully-qualified     # 🦘 kangaroo
+1F9A1                                      ; fully-qualified     # 🦡 badger
 1F43E                                      ; fully-qualified     # 🐾 paw prints
 
 # subgroup: animal-bird
@@ -2196,7 +2346,10 @@
 1F54A                                      ; non-fully-qualified # 🕊 dove
 1F985                                      ; fully-qualified     # 🦅 eagle
 1F986                                      ; fully-qualified     # 🦆 duck
+1F9A2                                      ; fully-qualified     # 🦢 swan
 1F989                                      ; fully-qualified     # 🦉 owl
+1F99A                                      ; fully-qualified     # 🦚 peacock
+1F99C                                      ; fully-qualified     # 🦜 parrot
 
 # subgroup: animal-amphibian
 1F438                                      ; fully-qualified     # 🐸 frog face
@@ -2222,6 +2375,7 @@
 1F419                                      ; fully-qualified     # 🐙 octopus
 1F41A                                      ; fully-qualified     # 🐚 spiral shell
 1F980                                      ; fully-qualified     # 🦀 crab
+1F99E                                      ; fully-qualified     # 🦞 lobster
 1F990                                      ; fully-qualified     # 🦐 shrimp
 1F991                                      ; fully-qualified     # 🦑 squid
 
@@ -2238,6 +2392,8 @@
 1F578 FE0F                                 ; fully-qualified     # 🕸️ spider web
 1F578                                      ; non-fully-qualified # 🕸 spider web
 1F982                                      ; fully-qualified     # 🦂 scorpion
+1F99F                                      ; fully-qualified     # 🦟 mosquito
+1F9A0                                      ; fully-qualified     # 🦠 microbe
 
 # subgroup: plant-flower
 1F490                                      ; fully-qualified     # 💐 bouquet
@@ -2267,8 +2423,8 @@
 1F342                                      ; fully-qualified     # 🍂 fallen leaf
 1F343                                      ; fully-qualified     # 🍃 leaf fluttering in wind
 
-# Animals & Nature subtotal:		119
-# Animals & Nature subtotal:		119	w/o modifiers
+# Animals & Nature subtotal:		130
+# Animals & Nature subtotal:		130	w/o modifiers
 
 # group: Food & Drink
 
@@ -2280,6 +2436,7 @@
 1F34B                                      ; fully-qualified     # 🍋 lemon
 1F34C                                      ; fully-qualified     # 🍌 banana
 1F34D                                      ; fully-qualified     # 🍍 pineapple
+1F96D                                      ; fully-qualified     # 🥭 mango
 1F34E                                      ; fully-qualified     # 🍎 red apple
 1F34F                                      ; fully-qualified     # 🍏 green apple
 1F350                                      ; fully-qualified     # 🍐 pear
@@ -2299,6 +2456,7 @@
 1F336 FE0F                                 ; fully-qualified     # 🌶️ hot pepper
 1F336                                      ; non-fully-qualified # 🌶 hot pepper
 1F952                                      ; fully-qualified     # 🥒 cucumber
+1F96C                                      ; fully-qualified     # 🥬 leafy green
 1F966                                      ; fully-qualified     # 🥦 broccoli
 1F344                                      ; fully-qualified     # 🍄 mushroom
 1F95C                                      ; fully-qualified     # 🥜 peanuts
@@ -2309,6 +2467,7 @@
 1F950                                      ; fully-qualified     # 🥐 croissant
 1F956                                      ; fully-qualified     # 🥖 baguette bread
 1F968                                      ; fully-qualified     # 🥨 pretzel
+1F96F                                      ; fully-qualified     # 🥯 bagel
 1F95E                                      ; fully-qualified     # 🥞 pancakes
 1F9C0                                      ; fully-qualified     # 🧀 cheese wedge
 1F356                                      ; fully-qualified     # 🍖 meat on bone
@@ -2330,6 +2489,7 @@
 1F963                                      ; fully-qualified     # 🥣 bowl with spoon
 1F957                                      ; fully-qualified     # 🥗 green salad
 1F37F                                      ; fully-qualified     # 🍿 popcorn
+1F9C2                                      ; fully-qualified     # 🧂 salt
 1F96B                                      ; fully-qualified     # 🥫 canned food
 
 # subgroup: food-asian
@@ -2345,6 +2505,7 @@
 1F363                                      ; fully-qualified     # 🍣 sushi
 1F364                                      ; fully-qualified     # 🍤 fried shrimp
 1F365                                      ; fully-qualified     # 🍥 fish cake with swirl
+1F96E                                      ; fully-qualified     # 🥮 moon cake
 1F361                                      ; fully-qualified     # 🍡 dango
 1F95F                                      ; fully-qualified     # 🥟 dumpling
 1F960                                      ; fully-qualified     # 🥠 fortune cookie
@@ -2358,6 +2519,7 @@
 1F36A                                      ; fully-qualified     # 🍪 cookie
 1F382                                      ; fully-qualified     # 🎂 birthday cake
 1F370                                      ; fully-qualified     # 🍰 shortcake
+1F9C1                                      ; fully-qualified     # 🧁 cupcake
 1F967                                      ; fully-qualified     # 🥧 pie
 1F36B                                      ; fully-qualified     # 🍫 chocolate bar
 1F36C                                      ; fully-qualified     # 🍬 candy
@@ -2390,8 +2552,8 @@
 1F52A                                      ; fully-qualified     # 🔪 kitchen knife
 1F3FA                                      ; fully-qualified     # 🏺 amphora
 
-# Food & Drink subtotal:		104
-# Food & Drink subtotal:		104	w/o modifiers
+# Food & Drink subtotal:		110
+# Food & Drink subtotal:		110	w/o modifiers
 
 # group: Travel & Places
 
@@ -2403,6 +2565,7 @@
 1F5FA FE0F                                 ; fully-qualified     # 🗺️ world map
 1F5FA                                      ; non-fully-qualified # 🗺 world map
 1F5FE                                      ; fully-qualified     # 🗾 map of Japan
+1F9ED                                      ; fully-qualified     # 🧭 compass
 
 # subgroup: place-geographic
 1F3D4 FE0F                                 ; fully-qualified     # 🏔️ snow-capped mountain
@@ -2429,10 +2592,9 @@
 1F3DB                                      ; non-fully-qualified # 🏛 classical building
 1F3D7 FE0F                                 ; fully-qualified     # 🏗️ building construction
 1F3D7                                      ; non-fully-qualified # 🏗 building construction
-1F3D8 FE0F                                 ; fully-qualified     # 🏘️ house
-1F3D8                                      ; non-fully-qualified # 🏘 house
-1F3D9 FE0F                                 ; fully-qualified     # 🏙️ cityscape
-1F3D9                                      ; non-fully-qualified # 🏙 cityscape
+1F9F1                                      ; fully-qualified     # 🧱 brick
+1F3D8 FE0F                                 ; fully-qualified     # 🏘️ houses
+1F3D8                                      ; non-fully-qualified # 🏘 houses
 1F3DA FE0F                                 ; fully-qualified     # 🏚️ derelict house
 1F3DA                                      ; non-fully-qualified # 🏚 derelict house
 1F3E0                                      ; fully-qualified     # 🏠 house
@@ -2467,6 +2629,8 @@
 26FA                                       ; fully-qualified     # ⛺ tent
 1F301                                      ; fully-qualified     # 🌁 foggy
 1F303                                      ; fully-qualified     # 🌃 night with stars
+1F3D9 FE0F                                 ; fully-qualified     # 🏙️ cityscape
+1F3D9                                      ; non-fully-qualified # 🏙 cityscape
 1F304                                      ; fully-qualified     # 🌄 sunrise over mountains
 1F305                                      ; fully-qualified     # 🌅 sunrise
 1F306                                      ; fully-qualified     # 🌆 cityscape at dusk
@@ -2480,17 +2644,12 @@
 1F3A2                                      ; fully-qualified     # 🎢 roller coaster
 1F488                                      ; fully-qualified     # 💈 barber pole
 1F3AA                                      ; fully-qualified     # 🎪 circus tent
-1F3AD                                      ; fully-qualified     # 🎭 performing arts
-1F5BC FE0F                                 ; fully-qualified     # 🖼️ framed picture
-1F5BC                                      ; non-fully-qualified # 🖼 framed picture
-1F3A8                                      ; fully-qualified     # 🎨 artist palette
-1F3B0                                      ; fully-qualified     # 🎰 slot machine
 
 # subgroup: transport-ground
 1F682                                      ; fully-qualified     # 🚂 locomotive
 1F683                                      ; fully-qualified     # 🚃 railway car
 1F684                                      ; fully-qualified     # 🚄 high-speed train
-1F685                                      ; fully-qualified     # 🚅 high-speed train with bullet nose
+1F685                                      ; fully-qualified     # 🚅 bullet train
 1F686                                      ; fully-qualified     # 🚆 train
 1F687                                      ; fully-qualified     # 🚇 metro
 1F688                                      ; fully-qualified     # 🚈 light rail
@@ -2517,18 +2676,21 @@
 1F69C                                      ; fully-qualified     # 🚜 tractor
 1F6B2                                      ; fully-qualified     # 🚲 bicycle
 1F6F4                                      ; fully-qualified     # 🛴 kick scooter
+1F6F9                                      ; fully-qualified     # 🛹 skateboard
 1F6F5                                      ; fully-qualified     # 🛵 motor scooter
 1F68F                                      ; fully-qualified     # 🚏 bus stop
 1F6E3 FE0F                                 ; fully-qualified     # 🛣️ motorway
 1F6E3                                      ; non-fully-qualified # 🛣 motorway
 1F6E4 FE0F                                 ; fully-qualified     # 🛤️ railway track
 1F6E4                                      ; non-fully-qualified # 🛤 railway track
+1F6E2 FE0F                                 ; fully-qualified     # 🛢️ oil drum
+1F6E2                                      ; non-fully-qualified # 🛢 oil drum
 26FD                                       ; fully-qualified     # ⛽ fuel pump
 1F6A8                                      ; fully-qualified     # 🚨 police car light
 1F6A5                                      ; fully-qualified     # 🚥 horizontal traffic light
 1F6A6                                      ; fully-qualified     # 🚦 vertical traffic light
-1F6A7                                      ; fully-qualified     # 🚧 construction
 1F6D1                                      ; fully-qualified     # 🛑 stop sign
+1F6A7                                      ; fully-qualified     # 🚧 construction
 
 # subgroup: transport-water
 2693                                       ; fully-qualified     # ⚓ anchor
@@ -2563,18 +2725,11 @@
 # subgroup: hotel
 1F6CE FE0F                                 ; fully-qualified     # 🛎️ bellhop bell
 1F6CE                                      ; non-fully-qualified # 🛎 bellhop bell
-1F6AA                                      ; fully-qualified     # 🚪 door
-1F6CF FE0F                                 ; fully-qualified     # 🛏️ bed
-1F6CF                                      ; non-fully-qualified # 🛏 bed
-1F6CB FE0F                                 ; fully-qualified     # 🛋️ couch and lamp
-1F6CB                                      ; non-fully-qualified # 🛋 couch and lamp
-1F6BD                                      ; fully-qualified     # 🚽 toilet
-1F6BF                                      ; fully-qualified     # 🚿 shower
-1F6C1                                      ; fully-qualified     # 🛁 bathtub
+1F9F3                                      ; fully-qualified     # 🧳 luggage
 
 # subgroup: time
-231B                                       ; fully-qualified     # ⌛ hourglass
-23F3                                       ; fully-qualified     # ⏳ hourglass with flowing sand
+231B                                       ; fully-qualified     # ⌛ hourglass done
+23F3                                       ; fully-qualified     # ⏳ hourglass not done
 231A                                       ; fully-qualified     # ⌚ watch
 23F0                                       ; fully-qualified     # ⏰ alarm clock
 23F1 FE0F                                  ; fully-qualified     # ⏱️ stopwatch
@@ -2619,15 +2774,15 @@
 1F318                                      ; fully-qualified     # 🌘 waning crescent moon
 1F319                                      ; fully-qualified     # 🌙 crescent moon
 1F31A                                      ; fully-qualified     # 🌚 new moon face
-1F31B                                      ; fully-qualified     # 🌛 first quarter moon with face
-1F31C                                      ; fully-qualified     # 🌜 last quarter moon with face
+1F31B                                      ; fully-qualified     # 🌛 first quarter moon face
+1F31C                                      ; fully-qualified     # 🌜 last quarter moon face
 1F321 FE0F                                 ; fully-qualified     # 🌡️ thermometer
 1F321                                      ; non-fully-qualified # 🌡 thermometer
 2600 FE0F                                  ; fully-qualified     # ☀️ sun
 2600                                       ; non-fully-qualified # ☀ sun
-1F31D                                      ; fully-qualified     # 🌝 full moon with face
+1F31D                                      ; fully-qualified     # 🌝 full moon face
 1F31E                                      ; fully-qualified     # 🌞 sun with face
-2B50                                       ; fully-qualified     # ⭐ white medium star
+2B50                                       ; fully-qualified     # ⭐ star
 1F31F                                      ; fully-qualified     # 🌟 glowing star
 1F320                                      ; fully-qualified     # 🌠 shooting star
 2601 FE0F                                  ; fully-qualified     # ☁️ cloud
@@ -2673,8 +2828,8 @@
 1F4A7                                      ; fully-qualified     # 💧 droplet
 1F30A                                      ; fully-qualified     # 🌊 water wave
 
-# Travel & Places subtotal:		256
-# Travel & Places subtotal:		256	w/o modifiers
+# Travel & Places subtotal:		249
+# Travel & Places subtotal:		249	w/o modifiers
 
 # group: Activities
 
@@ -2683,6 +2838,7 @@
 1F384                                      ; fully-qualified     # 🎄 Christmas tree
 1F386                                      ; fully-qualified     # 🎆 fireworks
 1F387                                      ; fully-qualified     # 🎇 sparkler
+1F9E8                                      ; fully-qualified     # 🧨 firecracker
 2728                                       ; fully-qualified     # ✨ sparkles
 1F388                                      ; fully-qualified     # 🎈 balloon
 1F389                                      ; fully-qualified     # 🎉 party popper
@@ -2693,6 +2849,7 @@
 1F38F                                      ; fully-qualified     # 🎏 carp streamer
 1F390                                      ; fully-qualified     # 🎐 wind chime
 1F391                                      ; fully-qualified     # 🎑 moon viewing ceremony
+1F9E7                                      ; fully-qualified     # 🧧 red envelope
 1F380                                      ; fully-qualified     # 🎀 ribbon
 1F381                                      ; fully-qualified     # 🎁 wrapped gift
 1F397 FE0F                                 ; fully-qualified     # 🎗️ reminder ribbon
@@ -2713,22 +2870,23 @@
 # subgroup: sport
 26BD                                       ; fully-qualified     # ⚽ soccer ball
 26BE                                       ; fully-qualified     # ⚾ baseball
+1F94E                                      ; fully-qualified     # 🥎 softball
 1F3C0                                      ; fully-qualified     # 🏀 basketball
 1F3D0                                      ; fully-qualified     # 🏐 volleyball
 1F3C8                                      ; fully-qualified     # 🏈 american football
 1F3C9                                      ; fully-qualified     # 🏉 rugby football
 1F3BE                                      ; fully-qualified     # 🎾 tennis
-1F3B1                                      ; fully-qualified     # 🎱 pool 8 ball
+1F94F                                      ; fully-qualified     # 🥏 flying disc
 1F3B3                                      ; fully-qualified     # 🎳 bowling
-1F3CF                                      ; fully-qualified     # 🏏 cricket
+1F3CF                                      ; fully-qualified     # 🏏 cricket game
 1F3D1                                      ; fully-qualified     # 🏑 field hockey
 1F3D2                                      ; fully-qualified     # 🏒 ice hockey
+1F94D                                      ; fully-qualified     # 🥍 lacrosse
 1F3D3                                      ; fully-qualified     # 🏓 ping pong
 1F3F8                                      ; fully-qualified     # 🏸 badminton
 1F94A                                      ; fully-qualified     # 🥊 boxing glove
 1F94B                                      ; fully-qualified     # 🥋 martial arts uniform
 1F945                                      ; fully-qualified     # 🥅 goal net
-1F3AF                                      ; fully-qualified     # 🎯 direct hit
 26F3                                       ; fully-qualified     # ⛳ flag in hole
 26F8 FE0F                                  ; fully-qualified     # ⛸️ ice skate
 26F8                                       ; non-fully-qualified # ⛸ ice skate
@@ -2739,10 +2897,17 @@
 1F94C                                      ; fully-qualified     # 🥌 curling stone
 
 # subgroup: game
+1F3AF                                      ; fully-qualified     # 🎯 direct hit
+1F3B1                                      ; fully-qualified     # 🎱 pool 8 ball
+1F52E                                      ; fully-qualified     # 🔮 crystal ball
+1F9FF                                      ; fully-qualified     # 🧿 nazar amulet
 1F3AE                                      ; fully-qualified     # 🎮 video game
 1F579 FE0F                                 ; fully-qualified     # 🕹️ joystick
 1F579                                      ; non-fully-qualified # 🕹 joystick
+1F3B0                                      ; fully-qualified     # 🎰 slot machine
 1F3B2                                      ; fully-qualified     # 🎲 game die
+1F9E9                                      ; fully-qualified     # 🧩 jigsaw
+1F9F8                                      ; fully-qualified     # 🧸 teddy bear
 2660 FE0F                                  ; fully-qualified     # ♠️ spade suit
 2660                                       ; non-fully-qualified # ♠ spade suit
 2665 FE0F                                  ; fully-qualified     # ♥️ heart suit
@@ -2751,12 +2916,22 @@
 2666                                       ; non-fully-qualified # ♦ diamond suit
 2663 FE0F                                  ; fully-qualified     # ♣️ club suit
 2663                                       ; non-fully-qualified # ♣ club suit
+265F FE0F                                  ; fully-qualified     # ♟️ chess pawn
+265F                                       ; non-fully-qualified # ♟ chess pawn
 1F0CF                                      ; fully-qualified     # 🃏 joker
 1F004                                      ; fully-qualified     # 🀄 mahjong red dragon
 1F3B4                                      ; fully-qualified     # 🎴 flower playing cards
 
-# Activities subtotal:		69
-# Activities subtotal:		69	w/o modifiers
+# subgroup: arts & crafts
+1F3AD                                      ; fully-qualified     # 🎭 performing arts
+1F5BC FE0F                                 ; fully-qualified     # 🖼️ framed picture
+1F5BC                                      ; non-fully-qualified # 🖼 framed picture
+1F3A8                                      ; fully-qualified     # 🎨 artist palette
+1F9F5                                      ; fully-qualified     # 🧵 thread
+1F9F6                                      ; fully-qualified     # 🧶 yarn
+
+# Activities subtotal:		87
+# Activities subtotal:		87	w/o modifiers
 
 # group: Objects
 
@@ -2820,6 +2995,7 @@
 1F4BE                                      ; fully-qualified     # 💾 floppy disk
 1F4BF                                      ; fully-qualified     # 💿 optical disk
 1F4C0                                      ; fully-qualified     # 📀 dvd
+1F9EE                                      ; fully-qualified     # 🧮 abacus
 
 # subgroup: light & video
 1F3A5                                      ; fully-qualified     # 🎥 movie camera
@@ -2833,11 +3009,8 @@
 1F4F8                                      ; fully-qualified     # 📸 camera with flash
 1F4F9                                      ; fully-qualified     # 📹 video camera
 1F4FC                                      ; fully-qualified     # 📼 videocassette
-1F50D                                      ; fully-qualified     # 🔍 left-pointing magnifying glass
-1F50E                                      ; fully-qualified     # 🔎 right-pointing magnifying glass
-1F52C                                      ; fully-qualified     # 🔬 microscope
-1F52D                                      ; fully-qualified     # 🔭 telescope
-1F4E1                                      ; fully-qualified     # 📡 satellite antenna
+1F50D                                      ; fully-qualified     # 🔍 magnifying glass tilted left
+1F50E                                      ; fully-qualified     # 🔎 magnifying glass tilted right
 1F56F FE0F                                 ; fully-qualified     # 🕯️ candle
 1F56F                                      ; non-fully-qualified # 🕯 candle
 1F4A1                                      ; fully-qualified     # 💡 light bulb
@@ -2873,6 +3046,7 @@
 1F4B7                                      ; fully-qualified     # 💷 pound banknote
 1F4B8                                      ; fully-qualified     # 💸 money with wings
 1F4B3                                      ; fully-qualified     # 💳 credit card
+1F9FE                                      ; fully-qualified     # 🧾 receipt
 1F4B9                                      ; fully-qualified     # 💹 chart increasing with yen
 1F4B1                                      ; fully-qualified     # 💱 currency exchange
 1F4B2                                      ; fully-qualified     # 💲 heavy dollar sign
@@ -2973,18 +3147,47 @@
 2699                                       ; non-fully-qualified # ⚙ gear
 1F5DC FE0F                                 ; fully-qualified     # 🗜️ clamp
 1F5DC                                      ; non-fully-qualified # 🗜 clamp
-2697 FE0F                                  ; fully-qualified     # ⚗️ alembic
-2697                                       ; non-fully-qualified # ⚗ alembic
 2696 FE0F                                  ; fully-qualified     # ⚖️ balance scale
 2696                                       ; non-fully-qualified # ⚖ balance scale
 1F517                                      ; fully-qualified     # 🔗 link
 26D3 FE0F                                  ; fully-qualified     # ⛓️ chains
 26D3                                       ; non-fully-qualified # ⛓ chains
+1F9F0                                      ; fully-qualified     # 🧰 toolbox
+1F9F2                                      ; fully-qualified     # 🧲 magnet
+
+# subgroup: science
+2697 FE0F                                  ; fully-qualified     # ⚗️ alembic
+2697                                       ; non-fully-qualified # ⚗ alembic
+1F9EA                                      ; fully-qualified     # 🧪 test tube
+1F9EB                                      ; fully-qualified     # 🧫 petri dish
+1F9EC                                      ; fully-qualified     # 🧬 dna
+1F52C                                      ; fully-qualified     # 🔬 microscope
+1F52D                                      ; fully-qualified     # 🔭 telescope
+1F4E1                                      ; fully-qualified     # 📡 satellite antenna
 
 # subgroup: medical
 1F489                                      ; fully-qualified     # 💉 syringe
 1F48A                                      ; fully-qualified     # 💊 pill
 
+# subgroup: household
+1F6AA                                      ; fully-qualified     # 🚪 door
+1F6CF FE0F                                 ; fully-qualified     # 🛏️ bed
+1F6CF                                      ; non-fully-qualified # 🛏 bed
+1F6CB FE0F                                 ; fully-qualified     # 🛋️ couch and lamp
+1F6CB                                      ; non-fully-qualified # 🛋 couch and lamp
+1F6BD                                      ; fully-qualified     # 🚽 toilet
+1F6BF                                      ; fully-qualified     # 🚿 shower
+1F6C1                                      ; fully-qualified     # 🛁 bathtub
+1F9F4                                      ; fully-qualified     # 🧴 lotion bottle
+1F9F7                                      ; fully-qualified     # 🧷 safety pin
+1F9F9                                      ; fully-qualified     # 🧹 broom
+1F9FA                                      ; fully-qualified     # 🧺 basket
+1F9FB                                      ; fully-qualified     # 🧻 roll of paper
+1F9FC                                      ; fully-qualified     # 🧼 soap
+1F9FD                                      ; fully-qualified     # 🧽 sponge
+1F9EF                                      ; fully-qualified     # 🧯 fire extinguisher
+1F6D2                                      ; fully-qualified     # 🛒 shopping cart
+
 # subgroup: other-object
 1F6AC                                      ; fully-qualified     # 🚬 cigarette
 26B0 FE0F                                  ; fully-qualified     # ⚰️ coffin
@@ -2992,13 +3195,9 @@
 26B1 FE0F                                  ; fully-qualified     # ⚱️ funeral urn
 26B1                                       ; non-fully-qualified # ⚱ funeral urn
 1F5FF                                      ; fully-qualified     # 🗿 moai
-1F6E2 FE0F                                 ; fully-qualified     # 🛢️ oil drum
-1F6E2                                      ; non-fully-qualified # 🛢 oil drum
-1F52E                                      ; fully-qualified     # 🔮 crystal ball
-1F6D2                                      ; fully-qualified     # 🛒 shopping cart
 
-# Objects subtotal:		207
-# Objects subtotal:		207	w/o modifiers
+# Objects subtotal:		227
+# Objects subtotal:		227	w/o modifiers
 
 # group: Symbols
 
@@ -3065,7 +3264,7 @@
 2935 FE0F                                  ; fully-qualified     # ⤵️ right arrow curving down
 2935                                       ; non-fully-qualified # ⤵ right arrow curving down
 1F503                                      ; fully-qualified     # 🔃 clockwise vertical arrows
-1F504                                      ; fully-qualified     # 🔄 anticlockwise arrows button
+1F504                                      ; fully-qualified     # 🔄 counterclockwise arrows button
 1F519                                      ; fully-qualified     # 🔙 BACK arrow
 1F51A                                      ; fully-qualified     # 🔚 END arrow
 1F51B                                      ; fully-qualified     # 🔛 ON! arrow
@@ -3103,7 +3302,7 @@
 264C                                       ; fully-qualified     # ♌ Leo
 264D                                       ; fully-qualified     # ♍ Virgo
 264E                                       ; fully-qualified     # ♎ Libra
-264F                                       ; fully-qualified     # ♏ Scorpius
+264F                                       ; fully-qualified     # ♏ Scorpio
 2650                                       ; fully-qualified     # ♐ Sagittarius
 2651                                       ; fully-qualified     # ♑ Capricorn
 2652                                       ; fully-qualified     # ♒ Aquarius
@@ -3126,9 +3325,9 @@
 23EA                                       ; fully-qualified     # ⏪ fast reverse button
 23EE FE0F                                  ; fully-qualified     # ⏮️ last track button
 23EE                                       ; non-fully-qualified # ⏮ last track button
-1F53C                                      ; fully-qualified     # 🔼 up button
+1F53C                                      ; fully-qualified     # 🔼 upwards button
 23EB                                       ; fully-qualified     # ⏫ fast up button
-1F53D                                      ; fully-qualified     # 🔽 down button
+1F53D                                      ; fully-qualified     # 🔽 downwards button
 23EC                                       ; fully-qualified     # ⏬ fast down button
 23F8 FE0F                                  ; fully-qualified     # ⏸️ pause button
 23F8                                       ; non-fully-qualified # ⏸ pause button
@@ -3152,6 +3351,8 @@
 2642                                       ; non-fully-qualified # ♂ male sign
 2695 FE0F                                  ; fully-qualified     # ⚕️ medical symbol
 2695                                       ; non-fully-qualified # ⚕ medical symbol
+267E FE0F                                  ; fully-qualified     # ♾️ infinity
+267E                                       ; non-fully-qualified # ♾ infinity
 267B FE0F                                  ; fully-qualified     # ♻️ recycling symbol
 267B                                       ; non-fully-qualified # ♻ recycling symbol
 269C FE0F                                  ; fully-qualified     # ⚜️ fleur-de-lis
@@ -3224,7 +3425,7 @@
 0038 20E3                                  ; non-fully-qualified # 8⃣ keycap: 8
 0039 FE0F 20E3                             ; fully-qualified     # 9️⃣ keycap: 9
 0039 20E3                                  ; non-fully-qualified # 9⃣ keycap: 9
-1F51F                                      ; fully-qualified     # 🔟 keycap 10
+1F51F                                      ; fully-qualified     # 🔟 keycap: 10
 
 # subgroup: alphanum
 1F4AF                                      ; fully-qualified     # 💯 hundred points
@@ -3279,18 +3480,22 @@
 1F235                                      ; fully-qualified     # 🈵 Japanese “no vacancy” button
 
 # subgroup: geometric
-25AA FE0F                                  ; fully-qualified     # ▪️ black small square
-25AA                                       ; non-fully-qualified # ▪ black small square
-25AB FE0F                                  ; fully-qualified     # ▫️ white small square
-25AB                                       ; non-fully-qualified # ▫ white small square
-25FB FE0F                                  ; fully-qualified     # ◻️ white medium square
-25FB                                       ; non-fully-qualified # ◻ white medium square
+1F534                                      ; fully-qualified     # 🔴 red circle
+1F535                                      ; fully-qualified     # 🔵 blue circle
+26AA                                       ; fully-qualified     # ⚪ white circle
+26AB                                       ; fully-qualified     # ⚫ black circle
+2B1C                                       ; fully-qualified     # ⬜ white large square
+2B1B                                       ; fully-qualified     # ⬛ black large square
 25FC FE0F                                  ; fully-qualified     # ◼️ black medium square
 25FC                                       ; non-fully-qualified # ◼ black medium square
+25FB FE0F                                  ; fully-qualified     # ◻️ white medium square
+25FB                                       ; non-fully-qualified # ◻ white medium square
 25FD                                       ; fully-qualified     # ◽ white medium-small square
 25FE                                       ; fully-qualified     # ◾ black medium-small square
-2B1B                                       ; fully-qualified     # ⬛ black large square
-2B1C                                       ; fully-qualified     # ⬜ white large square
+25AB FE0F                                  ; fully-qualified     # ▫️ white small square
+25AB                                       ; non-fully-qualified # ▫ white small square
+25AA FE0F                                  ; fully-qualified     # ▪️ black small square
+25AA                                       ; non-fully-qualified # ▪ black small square
 1F536                                      ; fully-qualified     # 🔶 large orange diamond
 1F537                                      ; fully-qualified     # 🔷 large blue diamond
 1F538                                      ; fully-qualified     # 🔸 small orange diamond
@@ -3301,13 +3506,9 @@
 1F518                                      ; fully-qualified     # 🔘 radio button
 1F532                                      ; fully-qualified     # 🔲 black square button
 1F533                                      ; fully-qualified     # 🔳 white square button
-26AA                                       ; fully-qualified     # ⚪ white circle
-26AB                                       ; fully-qualified     # ⚫ black circle
-1F534                                      ; fully-qualified     # 🔴 red circle
-1F535                                      ; fully-qualified     # 🔵 blue circle
 
-# Symbols subtotal:		284
-# Symbols subtotal:		284	w/o modifiers
+# Symbols subtotal:		286
+# Symbols subtotal:		286	w/o modifiers
 
 # group: Flags
 
@@ -3320,273 +3521,275 @@
 1F3F3                                      ; non-fully-qualified # 🏳 white flag
 1F3F3 FE0F 200D 1F308                      ; fully-qualified     # 🏳️‍🌈 rainbow flag
 1F3F3 200D 1F308                           ; non-fully-qualified # 🏳‍🌈 rainbow flag
+1F3F4 200D 2620 FE0F                       ; fully-qualified     # 🏴‍☠️ pirate flag
+1F3F4 200D 2620                            ; non-fully-qualified # 🏴‍☠ pirate flag
 
 # subgroup: country-flag
-1F1E6 1F1E8                                ; fully-qualified     # 🇦🇨 Ascension Island
-1F1E6 1F1E9                                ; fully-qualified     # 🇦🇩 Andorra
-1F1E6 1F1EA                                ; fully-qualified     # 🇦🇪 United Arab Emirates
-1F1E6 1F1EB                                ; fully-qualified     # 🇦🇫 Afghanistan
-1F1E6 1F1EC                                ; fully-qualified     # 🇦🇬 Antigua & Barbuda
-1F1E6 1F1EE                                ; fully-qualified     # 🇦🇮 Anguilla
-1F1E6 1F1F1                                ; fully-qualified     # 🇦🇱 Albania
-1F1E6 1F1F2                                ; fully-qualified     # 🇦🇲 Armenia
-1F1E6 1F1F4                                ; fully-qualified     # 🇦🇴 Angola
-1F1E6 1F1F6                                ; fully-qualified     # 🇦🇶 Antarctica
-1F1E6 1F1F7                                ; fully-qualified     # 🇦🇷 Argentina
-1F1E6 1F1F8                                ; fully-qualified     # 🇦🇸 American Samoa
-1F1E6 1F1F9                                ; fully-qualified     # 🇦🇹 Austria
-1F1E6 1F1FA                                ; fully-qualified     # 🇦🇺 Australia
-1F1E6 1F1FC                                ; fully-qualified     # 🇦🇼 Aruba
-1F1E6 1F1FD                                ; fully-qualified     # 🇦🇽 Åland Islands
-1F1E6 1F1FF                                ; fully-qualified     # 🇦🇿 Azerbaijan
-1F1E7 1F1E6                                ; fully-qualified     # 🇧🇦 Bosnia & Herzegovina
-1F1E7 1F1E7                                ; fully-qualified     # 🇧🇧 Barbados
-1F1E7 1F1E9                                ; fully-qualified     # 🇧🇩 Bangladesh
-1F1E7 1F1EA                                ; fully-qualified     # 🇧🇪 Belgium
-1F1E7 1F1EB                                ; fully-qualified     # 🇧🇫 Burkina Faso
-1F1E7 1F1EC                                ; fully-qualified     # 🇧🇬 Bulgaria
-1F1E7 1F1ED                                ; fully-qualified     # 🇧🇭 Bahrain
-1F1E7 1F1EE                                ; fully-qualified     # 🇧🇮 Burundi
-1F1E7 1F1EF                                ; fully-qualified     # 🇧🇯 Benin
-1F1E7 1F1F1                                ; fully-qualified     # 🇧🇱 St. Barthélemy
-1F1E7 1F1F2                                ; fully-qualified     # 🇧🇲 Bermuda
-1F1E7 1F1F3                                ; fully-qualified     # 🇧🇳 Brunei
-1F1E7 1F1F4                                ; fully-qualified     # 🇧🇴 Bolivia
-1F1E7 1F1F6                                ; fully-qualified     # 🇧🇶 Caribbean Netherlands
-1F1E7 1F1F7                                ; fully-qualified     # 🇧🇷 Brazil
-1F1E7 1F1F8                                ; fully-qualified     # 🇧🇸 Bahamas
-1F1E7 1F1F9                                ; fully-qualified     # 🇧🇹 Bhutan
-1F1E7 1F1FB                                ; fully-qualified     # 🇧🇻 Bouvet Island
-1F1E7 1F1FC                                ; fully-qualified     # 🇧🇼 Botswana
-1F1E7 1F1FE                                ; fully-qualified     # 🇧🇾 Belarus
-1F1E7 1F1FF                                ; fully-qualified     # 🇧🇿 Belize
-1F1E8 1F1E6                                ; fully-qualified     # 🇨🇦 Canada
-1F1E8 1F1E8                                ; fully-qualified     # 🇨🇨 Cocos (Keeling) Islands
-1F1E8 1F1E9                                ; fully-qualified     # 🇨🇩 Congo - Kinshasa
-1F1E8 1F1EB                                ; fully-qualified     # 🇨🇫 Central African Republic
-1F1E8 1F1EC                                ; fully-qualified     # 🇨🇬 Congo - Brazzaville
-1F1E8 1F1ED                                ; fully-qualified     # 🇨🇭 Switzerland
-1F1E8 1F1EE                                ; fully-qualified     # 🇨🇮 Côte d’Ivoire
-1F1E8 1F1F0                                ; fully-qualified     # 🇨🇰 Cook Islands
-1F1E8 1F1F1                                ; fully-qualified     # 🇨🇱 Chile
-1F1E8 1F1F2                                ; fully-qualified     # 🇨🇲 Cameroon
-1F1E8 1F1F3                                ; fully-qualified     # 🇨🇳 China
-1F1E8 1F1F4                                ; fully-qualified     # 🇨🇴 Colombia
-1F1E8 1F1F5                                ; fully-qualified     # 🇨🇵 Clipperton Island
-1F1E8 1F1F7                                ; fully-qualified     # 🇨🇷 Costa Rica
-1F1E8 1F1FA                                ; fully-qualified     # 🇨🇺 Cuba
-1F1E8 1F1FB                                ; fully-qualified     # 🇨🇻 Cape Verde
-1F1E8 1F1FC                                ; fully-qualified     # 🇨🇼 Curaçao
-1F1E8 1F1FD                                ; fully-qualified     # 🇨🇽 Christmas Island
-1F1E8 1F1FE                                ; fully-qualified     # 🇨🇾 Cyprus
-1F1E8 1F1FF                                ; fully-qualified     # 🇨🇿 Czechia
-1F1E9 1F1EA                                ; fully-qualified     # 🇩🇪 Germany
-1F1E9 1F1EC                                ; fully-qualified     # 🇩🇬 Diego Garcia
-1F1E9 1F1EF                                ; fully-qualified     # 🇩🇯 Djibouti
-1F1E9 1F1F0                                ; fully-qualified     # 🇩🇰 Denmark
-1F1E9 1F1F2                                ; fully-qualified     # 🇩🇲 Dominica
-1F1E9 1F1F4                                ; fully-qualified     # 🇩🇴 Dominican Republic
-1F1E9 1F1FF                                ; fully-qualified     # 🇩🇿 Algeria
-1F1EA 1F1E6                                ; fully-qualified     # 🇪🇦 Ceuta & Melilla
-1F1EA 1F1E8                                ; fully-qualified     # 🇪🇨 Ecuador
-1F1EA 1F1EA                                ; fully-qualified     # 🇪🇪 Estonia
-1F1EA 1F1EC                                ; fully-qualified     # 🇪🇬 Egypt
-1F1EA 1F1ED                                ; fully-qualified     # 🇪🇭 Western Sahara
-1F1EA 1F1F7                                ; fully-qualified     # 🇪🇷 Eritrea
-1F1EA 1F1F8                                ; fully-qualified     # 🇪🇸 Spain
-1F1EA 1F1F9                                ; fully-qualified     # 🇪🇹 Ethiopia
-1F1EA 1F1FA                                ; fully-qualified     # 🇪🇺 European Union
-1F1EB 1F1EE                                ; fully-qualified     # 🇫🇮 Finland
-1F1EB 1F1EF                                ; fully-qualified     # 🇫🇯 Fiji
-1F1EB 1F1F0                                ; fully-qualified     # 🇫🇰 Falkland Islands
-1F1EB 1F1F2                                ; fully-qualified     # 🇫🇲 Micronesia
-1F1EB 1F1F4                                ; fully-qualified     # 🇫🇴 Faroe Islands
-1F1EB 1F1F7                                ; fully-qualified     # 🇫🇷 France
-1F1EC 1F1E6                                ; fully-qualified     # 🇬🇦 Gabon
-1F1EC 1F1E7                                ; fully-qualified     # 🇬🇧 United Kingdom
-1F1EC 1F1E9                                ; fully-qualified     # 🇬🇩 Grenada
-1F1EC 1F1EA                                ; fully-qualified     # 🇬🇪 Georgia
-1F1EC 1F1EB                                ; fully-qualified     # 🇬🇫 French Guiana
-1F1EC 1F1EC                                ; fully-qualified     # 🇬🇬 Guernsey
-1F1EC 1F1ED                                ; fully-qualified     # 🇬🇭 Ghana
-1F1EC 1F1EE                                ; fully-qualified     # 🇬🇮 Gibraltar
-1F1EC 1F1F1                                ; fully-qualified     # 🇬🇱 Greenland
-1F1EC 1F1F2                                ; fully-qualified     # 🇬🇲 Gambia
-1F1EC 1F1F3                                ; fully-qualified     # 🇬🇳 Guinea
-1F1EC 1F1F5                                ; fully-qualified     # 🇬🇵 Guadeloupe
-1F1EC 1F1F6                                ; fully-qualified     # 🇬🇶 Equatorial Guinea
-1F1EC 1F1F7                                ; fully-qualified     # 🇬🇷 Greece
-1F1EC 1F1F8                                ; fully-qualified     # 🇬🇸 South Georgia & South Sandwich Islands
-1F1EC 1F1F9                                ; fully-qualified     # 🇬🇹 Guatemala
-1F1EC 1F1FA                                ; fully-qualified     # 🇬🇺 Guam
-1F1EC 1F1FC                                ; fully-qualified     # 🇬🇼 Guinea-Bissau
-1F1EC 1F1FE                                ; fully-qualified     # 🇬🇾 Guyana
-1F1ED 1F1F0                                ; fully-qualified     # 🇭🇰 Hong Kong SAR China
-1F1ED 1F1F2                                ; fully-qualified     # 🇭🇲 Heard & McDonald Islands
-1F1ED 1F1F3                                ; fully-qualified     # 🇭🇳 Honduras
-1F1ED 1F1F7                                ; fully-qualified     # 🇭🇷 Croatia
-1F1ED 1F1F9                                ; fully-qualified     # 🇭🇹 Haiti
-1F1ED 1F1FA                                ; fully-qualified     # 🇭🇺 Hungary
-1F1EE 1F1E8                                ; fully-qualified     # 🇮🇨 Canary Islands
-1F1EE 1F1E9                                ; fully-qualified     # 🇮🇩 Indonesia
-1F1EE 1F1EA                                ; fully-qualified     # 🇮🇪 Ireland
-1F1EE 1F1F1                                ; fully-qualified     # 🇮🇱 Israel
-1F1EE 1F1F2                                ; fully-qualified     # 🇮🇲 Isle of Man
-1F1EE 1F1F3                                ; fully-qualified     # 🇮🇳 India
-1F1EE 1F1F4                                ; fully-qualified     # 🇮🇴 British Indian Ocean Territory
-1F1EE 1F1F6                                ; fully-qualified     # 🇮🇶 Iraq
-1F1EE 1F1F7                                ; fully-qualified     # 🇮🇷 Iran
-1F1EE 1F1F8                                ; fully-qualified     # 🇮🇸 Iceland
-1F1EE 1F1F9                                ; fully-qualified     # 🇮🇹 Italy
-1F1EF 1F1EA                                ; fully-qualified     # 🇯🇪 Jersey
-1F1EF 1F1F2                                ; fully-qualified     # 🇯🇲 Jamaica
-1F1EF 1F1F4                                ; fully-qualified     # 🇯🇴 Jordan
-1F1EF 1F1F5                                ; fully-qualified     # 🇯🇵 Japan
-1F1F0 1F1EA                                ; fully-qualified     # 🇰🇪 Kenya
-1F1F0 1F1EC                                ; fully-qualified     # 🇰🇬 Kyrgyzstan
-1F1F0 1F1ED                                ; fully-qualified     # 🇰🇭 Cambodia
-1F1F0 1F1EE                                ; fully-qualified     # 🇰🇮 Kiribati
-1F1F0 1F1F2                                ; fully-qualified     # 🇰🇲 Comoros
-1F1F0 1F1F3                                ; fully-qualified     # 🇰🇳 St. Kitts & Nevis
-1F1F0 1F1F5                                ; fully-qualified     # 🇰🇵 North Korea
-1F1F0 1F1F7                                ; fully-qualified     # 🇰🇷 South Korea
-1F1F0 1F1FC                                ; fully-qualified     # 🇰🇼 Kuwait
-1F1F0 1F1FE                                ; fully-qualified     # 🇰🇾 Cayman Islands
-1F1F0 1F1FF                                ; fully-qualified     # 🇰🇿 Kazakhstan
-1F1F1 1F1E6                                ; fully-qualified     # 🇱🇦 Laos
-1F1F1 1F1E7                                ; fully-qualified     # 🇱🇧 Lebanon
-1F1F1 1F1E8                                ; fully-qualified     # 🇱🇨 St. Lucia
-1F1F1 1F1EE                                ; fully-qualified     # 🇱🇮 Liechtenstein
-1F1F1 1F1F0                                ; fully-qualified     # 🇱🇰 Sri Lanka
-1F1F1 1F1F7                                ; fully-qualified     # 🇱🇷 Liberia
-1F1F1 1F1F8                                ; fully-qualified     # 🇱🇸 Lesotho
-1F1F1 1F1F9                                ; fully-qualified     # 🇱🇹 Lithuania
-1F1F1 1F1FA                                ; fully-qualified     # 🇱🇺 Luxembourg
-1F1F1 1F1FB                                ; fully-qualified     # 🇱🇻 Latvia
-1F1F1 1F1FE                                ; fully-qualified     # 🇱🇾 Libya
-1F1F2 1F1E6                                ; fully-qualified     # 🇲🇦 Morocco
-1F1F2 1F1E8                                ; fully-qualified     # 🇲🇨 Monaco
-1F1F2 1F1E9                                ; fully-qualified     # 🇲🇩 Moldova
-1F1F2 1F1EA                                ; fully-qualified     # 🇲🇪 Montenegro
-1F1F2 1F1EB                                ; fully-qualified     # 🇲🇫 St. Martin
-1F1F2 1F1EC                                ; fully-qualified     # 🇲🇬 Madagascar
-1F1F2 1F1ED                                ; fully-qualified     # 🇲🇭 Marshall Islands
-1F1F2 1F1F0                                ; fully-qualified     # 🇲🇰 Macedonia
-1F1F2 1F1F1                                ; fully-qualified     # 🇲🇱 Mali
-1F1F2 1F1F2                                ; fully-qualified     # 🇲🇲 Myanmar (Burma)
-1F1F2 1F1F3                                ; fully-qualified     # 🇲🇳 Mongolia
-1F1F2 1F1F4                                ; fully-qualified     # 🇲🇴 Macau SAR China
-1F1F2 1F1F5                                ; fully-qualified     # 🇲🇵 Northern Mariana Islands
-1F1F2 1F1F6                                ; fully-qualified     # 🇲🇶 Martinique
-1F1F2 1F1F7                                ; fully-qualified     # 🇲🇷 Mauritania
-1F1F2 1F1F8                                ; fully-qualified     # 🇲🇸 Montserrat
-1F1F2 1F1F9                                ; fully-qualified     # 🇲🇹 Malta
-1F1F2 1F1FA                                ; fully-qualified     # 🇲🇺 Mauritius
-1F1F2 1F1FB                                ; fully-qualified     # 🇲🇻 Maldives
-1F1F2 1F1FC                                ; fully-qualified     # 🇲🇼 Malawi
-1F1F2 1F1FD                                ; fully-qualified     # 🇲🇽 Mexico
-1F1F2 1F1FE                                ; fully-qualified     # 🇲🇾 Malaysia
-1F1F2 1F1FF                                ; fully-qualified     # 🇲🇿 Mozambique
-1F1F3 1F1E6                                ; fully-qualified     # 🇳🇦 Namibia
-1F1F3 1F1E8                                ; fully-qualified     # 🇳🇨 New Caledonia
-1F1F3 1F1EA                                ; fully-qualified     # 🇳🇪 Niger
-1F1F3 1F1EB                                ; fully-qualified     # 🇳🇫 Norfolk Island
-1F1F3 1F1EC                                ; fully-qualified     # 🇳🇬 Nigeria
-1F1F3 1F1EE                                ; fully-qualified     # 🇳🇮 Nicaragua
-1F1F3 1F1F1                                ; fully-qualified     # 🇳🇱 Netherlands
-1F1F3 1F1F4                                ; fully-qualified     # 🇳🇴 Norway
-1F1F3 1F1F5                                ; fully-qualified     # 🇳🇵 Nepal
-1F1F3 1F1F7                                ; fully-qualified     # 🇳🇷 Nauru
-1F1F3 1F1FA                                ; fully-qualified     # 🇳🇺 Niue
-1F1F3 1F1FF                                ; fully-qualified     # 🇳🇿 New Zealand
-1F1F4 1F1F2                                ; fully-qualified     # 🇴🇲 Oman
-1F1F5 1F1E6                                ; fully-qualified     # 🇵🇦 Panama
-1F1F5 1F1EA                                ; fully-qualified     # 🇵🇪 Peru
-1F1F5 1F1EB                                ; fully-qualified     # 🇵🇫 French Polynesia
-1F1F5 1F1EC                                ; fully-qualified     # 🇵🇬 Papua New Guinea
-1F1F5 1F1ED                                ; fully-qualified     # 🇵🇭 Philippines
-1F1F5 1F1F0                                ; fully-qualified     # 🇵🇰 Pakistan
-1F1F5 1F1F1                                ; fully-qualified     # 🇵🇱 Poland
-1F1F5 1F1F2                                ; fully-qualified     # 🇵🇲 St. Pierre & Miquelon
-1F1F5 1F1F3                                ; fully-qualified     # 🇵🇳 Pitcairn Islands
-1F1F5 1F1F7                                ; fully-qualified     # 🇵🇷 Puerto Rico
-1F1F5 1F1F8                                ; fully-qualified     # 🇵🇸 Palestinian Territories
-1F1F5 1F1F9                                ; fully-qualified     # 🇵🇹 Portugal
-1F1F5 1F1FC                                ; fully-qualified     # 🇵🇼 Palau
-1F1F5 1F1FE                                ; fully-qualified     # 🇵🇾 Paraguay
-1F1F6 1F1E6                                ; fully-qualified     # 🇶🇦 Qatar
-1F1F7 1F1EA                                ; fully-qualified     # 🇷🇪 Réunion
-1F1F7 1F1F4                                ; fully-qualified     # 🇷🇴 Romania
-1F1F7 1F1F8                                ; fully-qualified     # 🇷🇸 Serbia
-1F1F7 1F1FA                                ; fully-qualified     # 🇷🇺 Russia
-1F1F7 1F1FC                                ; fully-qualified     # 🇷🇼 Rwanda
-1F1F8 1F1E6                                ; fully-qualified     # 🇸🇦 Saudi Arabia
-1F1F8 1F1E7                                ; fully-qualified     # 🇸🇧 Solomon Islands
-1F1F8 1F1E8                                ; fully-qualified     # 🇸🇨 Seychelles
-1F1F8 1F1E9                                ; fully-qualified     # 🇸🇩 Sudan
-1F1F8 1F1EA                                ; fully-qualified     # 🇸🇪 Sweden
-1F1F8 1F1EC                                ; fully-qualified     # 🇸🇬 Singapore
-1F1F8 1F1ED                                ; fully-qualified     # 🇸🇭 St. Helena
-1F1F8 1F1EE                                ; fully-qualified     # 🇸🇮 Slovenia
-1F1F8 1F1EF                                ; fully-qualified     # 🇸🇯 Svalbard & Jan Mayen
-1F1F8 1F1F0                                ; fully-qualified     # 🇸🇰 Slovakia
-1F1F8 1F1F1                                ; fully-qualified     # 🇸🇱 Sierra Leone
-1F1F8 1F1F2                                ; fully-qualified     # 🇸🇲 San Marino
-1F1F8 1F1F3                                ; fully-qualified     # 🇸🇳 Senegal
-1F1F8 1F1F4                                ; fully-qualified     # 🇸🇴 Somalia
-1F1F8 1F1F7                                ; fully-qualified     # 🇸🇷 Suriname
-1F1F8 1F1F8                                ; fully-qualified     # 🇸🇸 South Sudan
-1F1F8 1F1F9                                ; fully-qualified     # 🇸🇹 São Tomé & Príncipe
-1F1F8 1F1FB                                ; fully-qualified     # 🇸🇻 El Salvador
-1F1F8 1F1FD                                ; fully-qualified     # 🇸🇽 Sint Maarten
-1F1F8 1F1FE                                ; fully-qualified     # 🇸🇾 Syria
-1F1F8 1F1FF                                ; fully-qualified     # 🇸🇿 Swaziland
-1F1F9 1F1E6                                ; fully-qualified     # 🇹🇦 Tristan da Cunha
-1F1F9 1F1E8                                ; fully-qualified     # 🇹🇨 Turks & Caicos Islands
-1F1F9 1F1E9                                ; fully-qualified     # 🇹🇩 Chad
-1F1F9 1F1EB                                ; fully-qualified     # 🇹🇫 French Southern Territories
-1F1F9 1F1EC                                ; fully-qualified     # 🇹🇬 Togo
-1F1F9 1F1ED                                ; fully-qualified     # 🇹🇭 Thailand
-1F1F9 1F1EF                                ; fully-qualified     # 🇹🇯 Tajikistan
-1F1F9 1F1F0                                ; fully-qualified     # 🇹🇰 Tokelau
-1F1F9 1F1F1                                ; fully-qualified     # 🇹🇱 Timor-Leste
-1F1F9 1F1F2                                ; fully-qualified     # 🇹🇲 Turkmenistan
-1F1F9 1F1F3                                ; fully-qualified     # 🇹🇳 Tunisia
-1F1F9 1F1F4                                ; fully-qualified     # 🇹🇴 Tonga
-1F1F9 1F1F7                                ; fully-qualified     # 🇹🇷 Turkey
-1F1F9 1F1F9                                ; fully-qualified     # 🇹🇹 Trinidad & Tobago
-1F1F9 1F1FB                                ; fully-qualified     # 🇹🇻 Tuvalu
-1F1F9 1F1FC                                ; fully-qualified     # 🇹🇼 Taiwan
-1F1F9 1F1FF                                ; fully-qualified     # 🇹🇿 Tanzania
-1F1FA 1F1E6                                ; fully-qualified     # 🇺🇦 Ukraine
-1F1FA 1F1EC                                ; fully-qualified     # 🇺🇬 Uganda
-1F1FA 1F1F2                                ; fully-qualified     # 🇺🇲 U.S. Outlying Islands
-1F1FA 1F1F3                                ; fully-qualified     # 🇺🇳 United Nations
-1F1FA 1F1F8                                ; fully-qualified     # 🇺🇸 United States
-1F1FA 1F1FE                                ; fully-qualified     # 🇺🇾 Uruguay
-1F1FA 1F1FF                                ; fully-qualified     # 🇺🇿 Uzbekistan
-1F1FB 1F1E6                                ; fully-qualified     # 🇻🇦 Vatican City
-1F1FB 1F1E8                                ; fully-qualified     # 🇻🇨 St. Vincent & Grenadines
-1F1FB 1F1EA                                ; fully-qualified     # 🇻🇪 Venezuela
-1F1FB 1F1EC                                ; fully-qualified     # 🇻🇬 British Virgin Islands
-1F1FB 1F1EE                                ; fully-qualified     # 🇻🇮 U.S. Virgin Islands
-1F1FB 1F1F3                                ; fully-qualified     # 🇻🇳 Vietnam
-1F1FB 1F1FA                                ; fully-qualified     # 🇻🇺 Vanuatu
-1F1FC 1F1EB                                ; fully-qualified     # 🇼🇫 Wallis & Futuna
-1F1FC 1F1F8                                ; fully-qualified     # 🇼🇸 Samoa
-1F1FD 1F1F0                                ; fully-qualified     # 🇽🇰 Kosovo
-1F1FE 1F1EA                                ; fully-qualified     # 🇾🇪 Yemen
-1F1FE 1F1F9                                ; fully-qualified     # 🇾🇹 Mayotte
-1F1FF 1F1E6                                ; fully-qualified     # 🇿🇦 South Africa
-1F1FF 1F1F2                                ; fully-qualified     # 🇿🇲 Zambia
-1F1FF 1F1FC                                ; fully-qualified     # 🇿🇼 Zimbabwe
+1F1E6 1F1E8                                ; fully-qualified     # 🇦🇨 flag: Ascension Island
+1F1E6 1F1E9                                ; fully-qualified     # 🇦🇩 flag: Andorra
+1F1E6 1F1EA                                ; fully-qualified     # 🇦🇪 flag: United Arab Emirates
+1F1E6 1F1EB                                ; fully-qualified     # 🇦🇫 flag: Afghanistan
+1F1E6 1F1EC                                ; fully-qualified     # 🇦🇬 flag: Antigua & Barbuda
+1F1E6 1F1EE                                ; fully-qualified     # 🇦🇮 flag: Anguilla
+1F1E6 1F1F1                                ; fully-qualified     # 🇦🇱 flag: Albania
+1F1E6 1F1F2                                ; fully-qualified     # 🇦🇲 flag: Armenia
+1F1E6 1F1F4                                ; fully-qualified     # 🇦🇴 flag: Angola
+1F1E6 1F1F6                                ; fully-qualified     # 🇦🇶 flag: Antarctica
+1F1E6 1F1F7                                ; fully-qualified     # 🇦🇷 flag: Argentina
+1F1E6 1F1F8                                ; fully-qualified     # 🇦🇸 flag: American Samoa
+1F1E6 1F1F9                                ; fully-qualified     # 🇦🇹 flag: Austria
+1F1E6 1F1FA                                ; fully-qualified     # 🇦🇺 flag: Australia
+1F1E6 1F1FC                                ; fully-qualified     # 🇦🇼 flag: Aruba
+1F1E6 1F1FD                                ; fully-qualified     # 🇦🇽 flag: Åland Islands
+1F1E6 1F1FF                                ; fully-qualified     # 🇦🇿 flag: Azerbaijan
+1F1E7 1F1E6                                ; fully-qualified     # 🇧🇦 flag: Bosnia & Herzegovina
+1F1E7 1F1E7                                ; fully-qualified     # 🇧🇧 flag: Barbados
+1F1E7 1F1E9                                ; fully-qualified     # 🇧🇩 flag: Bangladesh
+1F1E7 1F1EA                                ; fully-qualified     # 🇧🇪 flag: Belgium
+1F1E7 1F1EB                                ; fully-qualified     # 🇧🇫 flag: Burkina Faso
+1F1E7 1F1EC                                ; fully-qualified     # 🇧🇬 flag: Bulgaria
+1F1E7 1F1ED                                ; fully-qualified     # 🇧🇭 flag: Bahrain
+1F1E7 1F1EE                                ; fully-qualified     # 🇧🇮 flag: Burundi
+1F1E7 1F1EF                                ; fully-qualified     # 🇧🇯 flag: Benin
+1F1E7 1F1F1                                ; fully-qualified     # 🇧🇱 flag: St. Barthélemy
+1F1E7 1F1F2                                ; fully-qualified     # 🇧🇲 flag: Bermuda
+1F1E7 1F1F3                                ; fully-qualified     # 🇧🇳 flag: Brunei
+1F1E7 1F1F4                                ; fully-qualified     # 🇧🇴 flag: Bolivia
+1F1E7 1F1F6                                ; fully-qualified     # 🇧🇶 flag: Caribbean Netherlands
+1F1E7 1F1F7                                ; fully-qualified     # 🇧🇷 flag: Brazil
+1F1E7 1F1F8                                ; fully-qualified     # 🇧🇸 flag: Bahamas
+1F1E7 1F1F9                                ; fully-qualified     # 🇧🇹 flag: Bhutan
+1F1E7 1F1FB                                ; fully-qualified     # 🇧🇻 flag: Bouvet Island
+1F1E7 1F1FC                                ; fully-qualified     # 🇧🇼 flag: Botswana
+1F1E7 1F1FE                                ; fully-qualified     # 🇧🇾 flag: Belarus
+1F1E7 1F1FF                                ; fully-qualified     # 🇧🇿 flag: Belize
+1F1E8 1F1E6                                ; fully-qualified     # 🇨🇦 flag: Canada
+1F1E8 1F1E8                                ; fully-qualified     # 🇨🇨 flag: Cocos (Keeling) Islands
+1F1E8 1F1E9                                ; fully-qualified     # 🇨🇩 flag: Congo - Kinshasa
+1F1E8 1F1EB                                ; fully-qualified     # 🇨🇫 flag: Central African Republic
+1F1E8 1F1EC                                ; fully-qualified     # 🇨🇬 flag: Congo - Brazzaville
+1F1E8 1F1ED                                ; fully-qualified     # 🇨🇭 flag: Switzerland
+1F1E8 1F1EE                                ; fully-qualified     # 🇨🇮 flag: Côte d’Ivoire
+1F1E8 1F1F0                                ; fully-qualified     # 🇨🇰 flag: Cook Islands
+1F1E8 1F1F1                                ; fully-qualified     # 🇨🇱 flag: Chile
+1F1E8 1F1F2                                ; fully-qualified     # 🇨🇲 flag: Cameroon
+1F1E8 1F1F3                                ; fully-qualified     # 🇨🇳 flag: China
+1F1E8 1F1F4                                ; fully-qualified     # 🇨🇴 flag: Colombia
+1F1E8 1F1F5                                ; fully-qualified     # 🇨🇵 flag: Clipperton Island
+1F1E8 1F1F7                                ; fully-qualified     # 🇨🇷 flag: Costa Rica
+1F1E8 1F1FA                                ; fully-qualified     # 🇨🇺 flag: Cuba
+1F1E8 1F1FB                                ; fully-qualified     # 🇨🇻 flag: Cape Verde
+1F1E8 1F1FC                                ; fully-qualified     # 🇨🇼 flag: Curaçao
+1F1E8 1F1FD                                ; fully-qualified     # 🇨🇽 flag: Christmas Island
+1F1E8 1F1FE                                ; fully-qualified     # 🇨🇾 flag: Cyprus
+1F1E8 1F1FF                                ; fully-qualified     # 🇨🇿 flag: Czechia
+1F1E9 1F1EA                                ; fully-qualified     # 🇩🇪 flag: Germany
+1F1E9 1F1EC                                ; fully-qualified     # 🇩🇬 flag: Diego Garcia
+1F1E9 1F1EF                                ; fully-qualified     # 🇩🇯 flag: Djibouti
+1F1E9 1F1F0                                ; fully-qualified     # 🇩🇰 flag: Denmark
+1F1E9 1F1F2                                ; fully-qualified     # 🇩🇲 flag: Dominica
+1F1E9 1F1F4                                ; fully-qualified     # 🇩🇴 flag: Dominican Republic
+1F1E9 1F1FF                                ; fully-qualified     # 🇩🇿 flag: Algeria
+1F1EA 1F1E6                                ; fully-qualified     # 🇪🇦 flag: Ceuta & Melilla
+1F1EA 1F1E8                                ; fully-qualified     # 🇪🇨 flag: Ecuador
+1F1EA 1F1EA                                ; fully-qualified     # 🇪🇪 flag: Estonia
+1F1EA 1F1EC                                ; fully-qualified     # 🇪🇬 flag: Egypt
+1F1EA 1F1ED                                ; fully-qualified     # 🇪🇭 flag: Western Sahara
+1F1EA 1F1F7                                ; fully-qualified     # 🇪🇷 flag: Eritrea
+1F1EA 1F1F8                                ; fully-qualified     # 🇪🇸 flag: Spain
+1F1EA 1F1F9                                ; fully-qualified     # 🇪🇹 flag: Ethiopia
+1F1EA 1F1FA                                ; fully-qualified     # 🇪🇺 flag: European Union
+1F1EB 1F1EE                                ; fully-qualified     # 🇫🇮 flag: Finland
+1F1EB 1F1EF                                ; fully-qualified     # 🇫🇯 flag: Fiji
+1F1EB 1F1F0                                ; fully-qualified     # 🇫🇰 flag: Falkland Islands
+1F1EB 1F1F2                                ; fully-qualified     # 🇫🇲 flag: Micronesia
+1F1EB 1F1F4                                ; fully-qualified     # 🇫🇴 flag: Faroe Islands
+1F1EB 1F1F7                                ; fully-qualified     # 🇫🇷 flag: France
+1F1EC 1F1E6                                ; fully-qualified     # 🇬🇦 flag: Gabon
+1F1EC 1F1E7                                ; fully-qualified     # 🇬🇧 flag: United Kingdom
+1F1EC 1F1E9                                ; fully-qualified     # 🇬🇩 flag: Grenada
+1F1EC 1F1EA                                ; fully-qualified     # 🇬🇪 flag: Georgia
+1F1EC 1F1EB                                ; fully-qualified     # 🇬🇫 flag: French Guiana
+1F1EC 1F1EC                                ; fully-qualified     # 🇬🇬 flag: Guernsey
+1F1EC 1F1ED                                ; fully-qualified     # 🇬🇭 flag: Ghana
+1F1EC 1F1EE                                ; fully-qualified     # 🇬🇮 flag: Gibraltar
+1F1EC 1F1F1                                ; fully-qualified     # 🇬🇱 flag: Greenland
+1F1EC 1F1F2                                ; fully-qualified     # 🇬🇲 flag: Gambia
+1F1EC 1F1F3                                ; fully-qualified     # 🇬🇳 flag: Guinea
+1F1EC 1F1F5                                ; fully-qualified     # 🇬🇵 flag: Guadeloupe
+1F1EC 1F1F6                                ; fully-qualified     # 🇬🇶 flag: Equatorial Guinea
+1F1EC 1F1F7                                ; fully-qualified     # 🇬🇷 flag: Greece
+1F1EC 1F1F8                                ; fully-qualified     # 🇬🇸 flag: South Georgia & South Sandwich Islands
+1F1EC 1F1F9                                ; fully-qualified     # 🇬🇹 flag: Guatemala
+1F1EC 1F1FA                                ; fully-qualified     # 🇬🇺 flag: Guam
+1F1EC 1F1FC                                ; fully-qualified     # 🇬🇼 flag: Guinea-Bissau
+1F1EC 1F1FE                                ; fully-qualified     # 🇬🇾 flag: Guyana
+1F1ED 1F1F0                                ; fully-qualified     # 🇭🇰 flag: Hong Kong SAR China
+1F1ED 1F1F2                                ; fully-qualified     # 🇭🇲 flag: Heard & McDonald Islands
+1F1ED 1F1F3                                ; fully-qualified     # 🇭🇳 flag: Honduras
+1F1ED 1F1F7                                ; fully-qualified     # 🇭🇷 flag: Croatia
+1F1ED 1F1F9                                ; fully-qualified     # 🇭🇹 flag: Haiti
+1F1ED 1F1FA                                ; fully-qualified     # 🇭🇺 flag: Hungary
+1F1EE 1F1E8                                ; fully-qualified     # 🇮🇨 flag: Canary Islands
+1F1EE 1F1E9                                ; fully-qualified     # 🇮🇩 flag: Indonesia
+1F1EE 1F1EA                                ; fully-qualified     # 🇮🇪 flag: Ireland
+1F1EE 1F1F1                                ; fully-qualified     # 🇮🇱 flag: Israel
+1F1EE 1F1F2                                ; fully-qualified     # 🇮🇲 flag: Isle of Man
+1F1EE 1F1F3                                ; fully-qualified     # 🇮🇳 flag: India
+1F1EE 1F1F4                                ; fully-qualified     # 🇮🇴 flag: British Indian Ocean Territory
+1F1EE 1F1F6                                ; fully-qualified     # 🇮🇶 flag: Iraq
+1F1EE 1F1F7                                ; fully-qualified     # 🇮🇷 flag: Iran
+1F1EE 1F1F8                                ; fully-qualified     # 🇮🇸 flag: Iceland
+1F1EE 1F1F9                                ; fully-qualified     # 🇮🇹 flag: Italy
+1F1EF 1F1EA                                ; fully-qualified     # 🇯🇪 flag: Jersey
+1F1EF 1F1F2                                ; fully-qualified     # 🇯🇲 flag: Jamaica
+1F1EF 1F1F4                                ; fully-qualified     # 🇯🇴 flag: Jordan
+1F1EF 1F1F5                                ; fully-qualified     # 🇯🇵 flag: Japan
+1F1F0 1F1EA                                ; fully-qualified     # 🇰🇪 flag: Kenya
+1F1F0 1F1EC                                ; fully-qualified     # 🇰🇬 flag: Kyrgyzstan
+1F1F0 1F1ED                                ; fully-qualified     # 🇰🇭 flag: Cambodia
+1F1F0 1F1EE                                ; fully-qualified     # 🇰🇮 flag: Kiribati
+1F1F0 1F1F2                                ; fully-qualified     # 🇰🇲 flag: Comoros
+1F1F0 1F1F3                                ; fully-qualified     # 🇰🇳 flag: St. Kitts & Nevis
+1F1F0 1F1F5                                ; fully-qualified     # 🇰🇵 flag: North Korea
+1F1F0 1F1F7                                ; fully-qualified     # 🇰🇷 flag: South Korea
+1F1F0 1F1FC                                ; fully-qualified     # 🇰🇼 flag: Kuwait
+1F1F0 1F1FE                                ; fully-qualified     # 🇰🇾 flag: Cayman Islands
+1F1F0 1F1FF                                ; fully-qualified     # 🇰🇿 flag: Kazakhstan
+1F1F1 1F1E6                                ; fully-qualified     # 🇱🇦 flag: Laos
+1F1F1 1F1E7                                ; fully-qualified     # 🇱🇧 flag: Lebanon
+1F1F1 1F1E8                                ; fully-qualified     # 🇱🇨 flag: St. Lucia
+1F1F1 1F1EE                                ; fully-qualified     # 🇱🇮 flag: Liechtenstein
+1F1F1 1F1F0                                ; fully-qualified     # 🇱🇰 flag: Sri Lanka
+1F1F1 1F1F7                                ; fully-qualified     # 🇱🇷 flag: Liberia
+1F1F1 1F1F8                                ; fully-qualified     # 🇱🇸 flag: Lesotho
+1F1F1 1F1F9                                ; fully-qualified     # 🇱🇹 flag: Lithuania
+1F1F1 1F1FA                                ; fully-qualified     # 🇱🇺 flag: Luxembourg
+1F1F1 1F1FB                                ; fully-qualified     # 🇱🇻 flag: Latvia
+1F1F1 1F1FE                                ; fully-qualified     # 🇱🇾 flag: Libya
+1F1F2 1F1E6                                ; fully-qualified     # 🇲🇦 flag: Morocco
+1F1F2 1F1E8                                ; fully-qualified     # 🇲🇨 flag: Monaco
+1F1F2 1F1E9                                ; fully-qualified     # 🇲🇩 flag: Moldova
+1F1F2 1F1EA                                ; fully-qualified     # 🇲🇪 flag: Montenegro
+1F1F2 1F1EB                                ; fully-qualified     # 🇲🇫 flag: St. Martin
+1F1F2 1F1EC                                ; fully-qualified     # 🇲🇬 flag: Madagascar
+1F1F2 1F1ED                                ; fully-qualified     # 🇲🇭 flag: Marshall Islands
+1F1F2 1F1F0                                ; fully-qualified     # 🇲🇰 flag: Macedonia
+1F1F2 1F1F1                                ; fully-qualified     # 🇲🇱 flag: Mali
+1F1F2 1F1F2                                ; fully-qualified     # 🇲🇲 flag: Myanmar (Burma)
+1F1F2 1F1F3                                ; fully-qualified     # 🇲🇳 flag: Mongolia
+1F1F2 1F1F4                                ; fully-qualified     # 🇲🇴 flag: Macau SAR China
+1F1F2 1F1F5                                ; fully-qualified     # 🇲🇵 flag: Northern Mariana Islands
+1F1F2 1F1F6                                ; fully-qualified     # 🇲🇶 flag: Martinique
+1F1F2 1F1F7                                ; fully-qualified     # 🇲🇷 flag: Mauritania
+1F1F2 1F1F8                                ; fully-qualified     # 🇲🇸 flag: Montserrat
+1F1F2 1F1F9                                ; fully-qualified     # 🇲🇹 flag: Malta
+1F1F2 1F1FA                                ; fully-qualified     # 🇲🇺 flag: Mauritius
+1F1F2 1F1FB                                ; fully-qualified     # 🇲🇻 flag: Maldives
+1F1F2 1F1FC                                ; fully-qualified     # 🇲🇼 flag: Malawi
+1F1F2 1F1FD                                ; fully-qualified     # 🇲🇽 flag: Mexico
+1F1F2 1F1FE                                ; fully-qualified     # 🇲🇾 flag: Malaysia
+1F1F2 1F1FF                                ; fully-qualified     # 🇲🇿 flag: Mozambique
+1F1F3 1F1E6                                ; fully-qualified     # 🇳🇦 flag: Namibia
+1F1F3 1F1E8                                ; fully-qualified     # 🇳🇨 flag: New Caledonia
+1F1F3 1F1EA                                ; fully-qualified     # 🇳🇪 flag: Niger
+1F1F3 1F1EB                                ; fully-qualified     # 🇳🇫 flag: Norfolk Island
+1F1F3 1F1EC                                ; fully-qualified     # 🇳🇬 flag: Nigeria
+1F1F3 1F1EE                                ; fully-qualified     # 🇳🇮 flag: Nicaragua
+1F1F3 1F1F1                                ; fully-qualified     # 🇳🇱 flag: Netherlands
+1F1F3 1F1F4                                ; fully-qualified     # 🇳🇴 flag: Norway
+1F1F3 1F1F5                                ; fully-qualified     # 🇳🇵 flag: Nepal
+1F1F3 1F1F7                                ; fully-qualified     # 🇳🇷 flag: Nauru
+1F1F3 1F1FA                                ; fully-qualified     # 🇳🇺 flag: Niue
+1F1F3 1F1FF                                ; fully-qualified     # 🇳🇿 flag: New Zealand
+1F1F4 1F1F2                                ; fully-qualified     # 🇴🇲 flag: Oman
+1F1F5 1F1E6                                ; fully-qualified     # 🇵🇦 flag: Panama
+1F1F5 1F1EA                                ; fully-qualified     # 🇵🇪 flag: Peru
+1F1F5 1F1EB                                ; fully-qualified     # 🇵🇫 flag: French Polynesia
+1F1F5 1F1EC                                ; fully-qualified     # 🇵🇬 flag: Papua New Guinea
+1F1F5 1F1ED                                ; fully-qualified     # 🇵🇭 flag: Philippines
+1F1F5 1F1F0                                ; fully-qualified     # 🇵🇰 flag: Pakistan
+1F1F5 1F1F1                                ; fully-qualified     # 🇵🇱 flag: Poland
+1F1F5 1F1F2                                ; fully-qualified     # 🇵🇲 flag: St. Pierre & Miquelon
+1F1F5 1F1F3                                ; fully-qualified     # 🇵🇳 flag: Pitcairn Islands
+1F1F5 1F1F7                                ; fully-qualified     # 🇵🇷 flag: Puerto Rico
+1F1F5 1F1F8                                ; fully-qualified     # 🇵🇸 flag: Palestinian Territories
+1F1F5 1F1F9                                ; fully-qualified     # 🇵🇹 flag: Portugal
+1F1F5 1F1FC                                ; fully-qualified     # 🇵🇼 flag: Palau
+1F1F5 1F1FE                                ; fully-qualified     # 🇵🇾 flag: Paraguay
+1F1F6 1F1E6                                ; fully-qualified     # 🇶🇦 flag: Qatar
+1F1F7 1F1EA                                ; fully-qualified     # 🇷🇪 flag: Réunion
+1F1F7 1F1F4                                ; fully-qualified     # 🇷🇴 flag: Romania
+1F1F7 1F1F8                                ; fully-qualified     # 🇷🇸 flag: Serbia
+1F1F7 1F1FA                                ; fully-qualified     # 🇷🇺 flag: Russia
+1F1F7 1F1FC                                ; fully-qualified     # 🇷🇼 flag: Rwanda
+1F1F8 1F1E6                                ; fully-qualified     # 🇸🇦 flag: Saudi Arabia
+1F1F8 1F1E7                                ; fully-qualified     # 🇸🇧 flag: Solomon Islands
+1F1F8 1F1E8                                ; fully-qualified     # 🇸🇨 flag: Seychelles
+1F1F8 1F1E9                                ; fully-qualified     # 🇸🇩 flag: Sudan
+1F1F8 1F1EA                                ; fully-qualified     # 🇸🇪 flag: Sweden
+1F1F8 1F1EC                                ; fully-qualified     # 🇸🇬 flag: Singapore
+1F1F8 1F1ED                                ; fully-qualified     # 🇸🇭 flag: St. Helena
+1F1F8 1F1EE                                ; fully-qualified     # 🇸🇮 flag: Slovenia
+1F1F8 1F1EF                                ; fully-qualified     # 🇸🇯 flag: Svalbard & Jan Mayen
+1F1F8 1F1F0                                ; fully-qualified     # 🇸🇰 flag: Slovakia
+1F1F8 1F1F1                                ; fully-qualified     # 🇸🇱 flag: Sierra Leone
+1F1F8 1F1F2                                ; fully-qualified     # 🇸🇲 flag: San Marino
+1F1F8 1F1F3                                ; fully-qualified     # 🇸🇳 flag: Senegal
+1F1F8 1F1F4                                ; fully-qualified     # 🇸🇴 flag: Somalia
+1F1F8 1F1F7                                ; fully-qualified     # 🇸🇷 flag: Suriname
+1F1F8 1F1F8                                ; fully-qualified     # 🇸🇸 flag: South Sudan
+1F1F8 1F1F9                                ; fully-qualified     # 🇸🇹 flag: São Tomé & Príncipe
+1F1F8 1F1FB                                ; fully-qualified     # 🇸🇻 flag: El Salvador
+1F1F8 1F1FD                                ; fully-qualified     # 🇸🇽 flag: Sint Maarten
+1F1F8 1F1FE                                ; fully-qualified     # 🇸🇾 flag: Syria
+1F1F8 1F1FF                                ; fully-qualified     # 🇸🇿 flag: Swaziland
+1F1F9 1F1E6                                ; fully-qualified     # 🇹🇦 flag: Tristan da Cunha
+1F1F9 1F1E8                                ; fully-qualified     # 🇹🇨 flag: Turks & Caicos Islands
+1F1F9 1F1E9                                ; fully-qualified     # 🇹🇩 flag: Chad
+1F1F9 1F1EB                                ; fully-qualified     # 🇹🇫 flag: French Southern Territories
+1F1F9 1F1EC                                ; fully-qualified     # 🇹🇬 flag: Togo
+1F1F9 1F1ED                                ; fully-qualified     # 🇹🇭 flag: Thailand
+1F1F9 1F1EF                                ; fully-qualified     # 🇹🇯 flag: Tajikistan
+1F1F9 1F1F0                                ; fully-qualified     # 🇹🇰 flag: Tokelau
+1F1F9 1F1F1                                ; fully-qualified     # 🇹🇱 flag: Timor-Leste
+1F1F9 1F1F2                                ; fully-qualified     # 🇹🇲 flag: Turkmenistan
+1F1F9 1F1F3                                ; fully-qualified     # 🇹🇳 flag: Tunisia
+1F1F9 1F1F4                                ; fully-qualified     # 🇹🇴 flag: Tonga
+1F1F9 1F1F7                                ; fully-qualified     # 🇹🇷 flag: Turkey
+1F1F9 1F1F9                                ; fully-qualified     # 🇹🇹 flag: Trinidad & Tobago
+1F1F9 1F1FB                                ; fully-qualified     # 🇹🇻 flag: Tuvalu
+1F1F9 1F1FC                                ; fully-qualified     # 🇹🇼 flag: Taiwan
+1F1F9 1F1FF                                ; fully-qualified     # 🇹🇿 flag: Tanzania
+1F1FA 1F1E6                                ; fully-qualified     # 🇺🇦 flag: Ukraine
+1F1FA 1F1EC                                ; fully-qualified     # 🇺🇬 flag: Uganda
+1F1FA 1F1F2                                ; fully-qualified     # 🇺🇲 flag: U.S. Outlying Islands
+1F1FA 1F1F3                                ; fully-qualified     # 🇺🇳 flag: United Nations
+1F1FA 1F1F8                                ; fully-qualified     # 🇺🇸 flag: United States
+1F1FA 1F1FE                                ; fully-qualified     # 🇺🇾 flag: Uruguay
+1F1FA 1F1FF                                ; fully-qualified     # 🇺🇿 flag: Uzbekistan
+1F1FB 1F1E6                                ; fully-qualified     # 🇻🇦 flag: Vatican City
+1F1FB 1F1E8                                ; fully-qualified     # 🇻🇨 flag: St. Vincent & Grenadines
+1F1FB 1F1EA                                ; fully-qualified     # 🇻🇪 flag: Venezuela
+1F1FB 1F1EC                                ; fully-qualified     # 🇻🇬 flag: British Virgin Islands
+1F1FB 1F1EE                                ; fully-qualified     # 🇻🇮 flag: U.S. Virgin Islands
+1F1FB 1F1F3                                ; fully-qualified     # 🇻🇳 flag: Vietnam
+1F1FB 1F1FA                                ; fully-qualified     # 🇻🇺 flag: Vanuatu
+1F1FC 1F1EB                                ; fully-qualified     # 🇼🇫 flag: Wallis & Futuna
+1F1FC 1F1F8                                ; fully-qualified     # 🇼🇸 flag: Samoa
+1F1FD 1F1F0                                ; fully-qualified     # 🇽🇰 flag: Kosovo
+1F1FE 1F1EA                                ; fully-qualified     # 🇾🇪 flag: Yemen
+1F1FE 1F1F9                                ; fully-qualified     # 🇾🇹 flag: Mayotte
+1F1FF 1F1E6                                ; fully-qualified     # 🇿🇦 flag: South Africa
+1F1FF 1F1F2                                ; fully-qualified     # 🇿🇲 flag: Zambia
+1F1FF 1F1FC                                ; fully-qualified     # 🇿🇼 flag: Zimbabwe
 
 # subgroup: subdivision-flag
-1F3F4 E0067 E0062 E0065 E006E E0067 E007F  ; fully-qualified     # 🏴󠁧󠁢󠁥󠁮󠁧󠁿 England
-1F3F4 E0067 E0062 E0073 E0063 E0074 E007F  ; fully-qualified     # 🏴󠁧󠁢󠁳󠁣󠁴󠁿 Scotland
-1F3F4 E0067 E0062 E0077 E006C E0073 E007F  ; fully-qualified     # 🏴󠁧󠁢󠁷󠁬󠁳󠁿 Wales
+1F3F4 E0067 E0062 E0065 E006E E0067 E007F  ; fully-qualified     # 🏴󠁧󠁢󠁥󠁮󠁧󠁿 flag: England
+1F3F4 E0067 E0062 E0073 E0063 E0074 E007F  ; fully-qualified     # 🏴󠁧󠁢󠁳󠁣󠁴󠁿 flag: Scotland
+1F3F4 E0067 E0062 E0077 E006C E0073 E007F  ; fully-qualified     # 🏴󠁧󠁢󠁷󠁬󠁳󠁿 flag: Wales
 
-# Flags subtotal:		269
-# Flags subtotal:		269	w/o modifiers
+# Flags subtotal:		271
+# Flags subtotal:		271	w/o modifiers
 
 #EOF