diff --git a/java/res/drawable-hdpi/ic_emoji_activity_activated_holo_dark.png b/java/res/drawable-hdpi/ic_emoji_activity_activated_holo_dark.png
deleted file mode 100644
index 8e93610..0000000
--- a/java/res/drawable-hdpi/ic_emoji_activity_activated_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-hdpi/ic_emoji_activity_activated_lxx_dark.png b/java/res/drawable-hdpi/ic_emoji_activity_activated_lxx_dark.png
deleted file mode 100644
index 063bb03..0000000
--- a/java/res/drawable-hdpi/ic_emoji_activity_activated_lxx_dark.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-hdpi/ic_emoji_activity_activated_lxx_light.png b/java/res/drawable-hdpi/ic_emoji_activity_activated_lxx_light.png
deleted file mode 100644
index 39238db..0000000
--- a/java/res/drawable-hdpi/ic_emoji_activity_activated_lxx_light.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-hdpi/ic_emoji_activity_normal_holo_dark.png b/java/res/drawable-hdpi/ic_emoji_activity_normal_holo_dark.png
deleted file mode 100644
index afa1926..0000000
--- a/java/res/drawable-hdpi/ic_emoji_activity_normal_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-hdpi/ic_emoji_activity_normal_lxx_dark.png b/java/res/drawable-hdpi/ic_emoji_activity_normal_lxx_dark.png
deleted file mode 100644
index 8966c3a..0000000
--- a/java/res/drawable-hdpi/ic_emoji_activity_normal_lxx_dark.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-hdpi/ic_emoji_activity_normal_lxx_light.png b/java/res/drawable-hdpi/ic_emoji_activity_normal_lxx_light.png
deleted file mode 100644
index 0dfd303..0000000
--- a/java/res/drawable-hdpi/ic_emoji_activity_normal_lxx_light.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-hdpi/ic_emoji_flag_activated_holo_dark.png b/java/res/drawable-hdpi/ic_emoji_flag_activated_holo_dark.png
deleted file mode 100644
index d5d57f1..0000000
--- a/java/res/drawable-hdpi/ic_emoji_flag_activated_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-hdpi/ic_emoji_flag_activated_lxx_dark.png b/java/res/drawable-hdpi/ic_emoji_flag_activated_lxx_dark.png
deleted file mode 100644
index 07d1448..0000000
--- a/java/res/drawable-hdpi/ic_emoji_flag_activated_lxx_dark.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-hdpi/ic_emoji_flag_activated_lxx_light.png b/java/res/drawable-hdpi/ic_emoji_flag_activated_lxx_light.png
deleted file mode 100644
index 0e83104..0000000
--- a/java/res/drawable-hdpi/ic_emoji_flag_activated_lxx_light.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-hdpi/ic_emoji_flag_normal_holo_dark.png b/java/res/drawable-hdpi/ic_emoji_flag_normal_holo_dark.png
deleted file mode 100644
index e0644a3..0000000
--- a/java/res/drawable-hdpi/ic_emoji_flag_normal_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-hdpi/ic_emoji_flag_normal_lxx_dark.png b/java/res/drawable-hdpi/ic_emoji_flag_normal_lxx_dark.png
deleted file mode 100644
index d7448f7..0000000
--- a/java/res/drawable-hdpi/ic_emoji_flag_normal_lxx_dark.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-hdpi/ic_emoji_flag_normal_lxx_light.png b/java/res/drawable-hdpi/ic_emoji_flag_normal_lxx_light.png
deleted file mode 100644
index d96b8b0..0000000
--- a/java/res/drawable-hdpi/ic_emoji_flag_normal_lxx_light.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-hdpi/ic_emoji_food_activated_holo_dark.png b/java/res/drawable-hdpi/ic_emoji_food_activated_holo_dark.png
deleted file mode 100644
index 6214bce..0000000
--- a/java/res/drawable-hdpi/ic_emoji_food_activated_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-hdpi/ic_emoji_food_activated_lxx_dark.png b/java/res/drawable-hdpi/ic_emoji_food_activated_lxx_dark.png
deleted file mode 100644
index f50fd5d..0000000
--- a/java/res/drawable-hdpi/ic_emoji_food_activated_lxx_dark.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-hdpi/ic_emoji_food_activated_lxx_light.png b/java/res/drawable-hdpi/ic_emoji_food_activated_lxx_light.png
deleted file mode 100644
index 2e194a6..0000000
--- a/java/res/drawable-hdpi/ic_emoji_food_activated_lxx_light.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-hdpi/ic_emoji_food_normal_holo_dark.png b/java/res/drawable-hdpi/ic_emoji_food_normal_holo_dark.png
deleted file mode 100644
index 0353b08..0000000
--- a/java/res/drawable-hdpi/ic_emoji_food_normal_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-hdpi/ic_emoji_food_normal_lxx_dark.png b/java/res/drawable-hdpi/ic_emoji_food_normal_lxx_dark.png
deleted file mode 100644
index 125c27f..0000000
--- a/java/res/drawable-hdpi/ic_emoji_food_normal_lxx_dark.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-hdpi/ic_emoji_food_normal_lxx_light.png b/java/res/drawable-hdpi/ic_emoji_food_normal_lxx_light.png
deleted file mode 100644
index 1fafd15..0000000
--- a/java/res/drawable-hdpi/ic_emoji_food_normal_lxx_light.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-mdpi/ic_emoji_activity_activated_holo_dark.png b/java/res/drawable-mdpi/ic_emoji_activity_activated_holo_dark.png
deleted file mode 100644
index 91bee63..0000000
--- a/java/res/drawable-mdpi/ic_emoji_activity_activated_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-mdpi/ic_emoji_activity_activated_lxx_dark.png b/java/res/drawable-mdpi/ic_emoji_activity_activated_lxx_dark.png
deleted file mode 100644
index 6ac51ba..0000000
--- a/java/res/drawable-mdpi/ic_emoji_activity_activated_lxx_dark.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-mdpi/ic_emoji_activity_activated_lxx_light.png b/java/res/drawable-mdpi/ic_emoji_activity_activated_lxx_light.png
deleted file mode 100644
index c2350ee..0000000
--- a/java/res/drawable-mdpi/ic_emoji_activity_activated_lxx_light.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-mdpi/ic_emoji_activity_normal_holo_dark.png b/java/res/drawable-mdpi/ic_emoji_activity_normal_holo_dark.png
deleted file mode 100644
index 636486e..0000000
--- a/java/res/drawable-mdpi/ic_emoji_activity_normal_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-mdpi/ic_emoji_activity_normal_lxx_dark.png b/java/res/drawable-mdpi/ic_emoji_activity_normal_lxx_dark.png
deleted file mode 100644
index ba767a6..0000000
--- a/java/res/drawable-mdpi/ic_emoji_activity_normal_lxx_dark.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-mdpi/ic_emoji_activity_normal_lxx_light.png b/java/res/drawable-mdpi/ic_emoji_activity_normal_lxx_light.png
deleted file mode 100644
index c448afb..0000000
--- a/java/res/drawable-mdpi/ic_emoji_activity_normal_lxx_light.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-mdpi/ic_emoji_flag_activated_holo_dark.png b/java/res/drawable-mdpi/ic_emoji_flag_activated_holo_dark.png
deleted file mode 100644
index 3375310..0000000
--- a/java/res/drawable-mdpi/ic_emoji_flag_activated_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-mdpi/ic_emoji_flag_activated_lxx_dark.png b/java/res/drawable-mdpi/ic_emoji_flag_activated_lxx_dark.png
deleted file mode 100644
index aa63582..0000000
--- a/java/res/drawable-mdpi/ic_emoji_flag_activated_lxx_dark.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-mdpi/ic_emoji_flag_activated_lxx_light.png b/java/res/drawable-mdpi/ic_emoji_flag_activated_lxx_light.png
deleted file mode 100644
index 39913d9..0000000
--- a/java/res/drawable-mdpi/ic_emoji_flag_activated_lxx_light.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-mdpi/ic_emoji_flag_normal_holo_dark.png b/java/res/drawable-mdpi/ic_emoji_flag_normal_holo_dark.png
deleted file mode 100644
index 2615aab..0000000
--- a/java/res/drawable-mdpi/ic_emoji_flag_normal_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-mdpi/ic_emoji_flag_normal_lxx_dark.png b/java/res/drawable-mdpi/ic_emoji_flag_normal_lxx_dark.png
deleted file mode 100644
index 66c5b04..0000000
--- a/java/res/drawable-mdpi/ic_emoji_flag_normal_lxx_dark.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-mdpi/ic_emoji_flag_normal_lxx_light.png b/java/res/drawable-mdpi/ic_emoji_flag_normal_lxx_light.png
deleted file mode 100644
index b965a1b..0000000
--- a/java/res/drawable-mdpi/ic_emoji_flag_normal_lxx_light.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-mdpi/ic_emoji_food_activated_holo_dark.png b/java/res/drawable-mdpi/ic_emoji_food_activated_holo_dark.png
deleted file mode 100644
index 0212294..0000000
--- a/java/res/drawable-mdpi/ic_emoji_food_activated_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-mdpi/ic_emoji_food_activated_lxx_dark.png b/java/res/drawable-mdpi/ic_emoji_food_activated_lxx_dark.png
deleted file mode 100644
index d51cf47..0000000
--- a/java/res/drawable-mdpi/ic_emoji_food_activated_lxx_dark.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-mdpi/ic_emoji_food_activated_lxx_light.png b/java/res/drawable-mdpi/ic_emoji_food_activated_lxx_light.png
deleted file mode 100644
index cbd80d2..0000000
--- a/java/res/drawable-mdpi/ic_emoji_food_activated_lxx_light.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-mdpi/ic_emoji_food_normal_holo_dark.png b/java/res/drawable-mdpi/ic_emoji_food_normal_holo_dark.png
deleted file mode 100644
index 8acdf4d..0000000
--- a/java/res/drawable-mdpi/ic_emoji_food_normal_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-mdpi/ic_emoji_food_normal_lxx_dark.png b/java/res/drawable-mdpi/ic_emoji_food_normal_lxx_dark.png
deleted file mode 100644
index 666e278..0000000
--- a/java/res/drawable-mdpi/ic_emoji_food_normal_lxx_dark.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-mdpi/ic_emoji_food_normal_lxx_light.png b/java/res/drawable-mdpi/ic_emoji_food_normal_lxx_light.png
deleted file mode 100644
index e29dd61..0000000
--- a/java/res/drawable-mdpi/ic_emoji_food_normal_lxx_light.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-xhdpi/ic_emoji_activity_activated_holo_dark.png b/java/res/drawable-xhdpi/ic_emoji_activity_activated_holo_dark.png
deleted file mode 100644
index 846046d..0000000
--- a/java/res/drawable-xhdpi/ic_emoji_activity_activated_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-xhdpi/ic_emoji_activity_activated_lxx_dark.png b/java/res/drawable-xhdpi/ic_emoji_activity_activated_lxx_dark.png
deleted file mode 100644
index 3e1ee4d..0000000
--- a/java/res/drawable-xhdpi/ic_emoji_activity_activated_lxx_dark.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-xhdpi/ic_emoji_activity_activated_lxx_light.png b/java/res/drawable-xhdpi/ic_emoji_activity_activated_lxx_light.png
deleted file mode 100644
index 4ee704e..0000000
--- a/java/res/drawable-xhdpi/ic_emoji_activity_activated_lxx_light.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-xhdpi/ic_emoji_activity_normal_holo_dark.png b/java/res/drawable-xhdpi/ic_emoji_activity_normal_holo_dark.png
deleted file mode 100644
index 8d23db0..0000000
--- a/java/res/drawable-xhdpi/ic_emoji_activity_normal_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-xhdpi/ic_emoji_activity_normal_lxx_dark.png b/java/res/drawable-xhdpi/ic_emoji_activity_normal_lxx_dark.png
deleted file mode 100644
index 8ad9cda..0000000
--- a/java/res/drawable-xhdpi/ic_emoji_activity_normal_lxx_dark.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-xhdpi/ic_emoji_activity_normal_lxx_light.png b/java/res/drawable-xhdpi/ic_emoji_activity_normal_lxx_light.png
deleted file mode 100644
index 49e0feb..0000000
--- a/java/res/drawable-xhdpi/ic_emoji_activity_normal_lxx_light.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-xhdpi/ic_emoji_flag_activated_holo_dark.png b/java/res/drawable-xhdpi/ic_emoji_flag_activated_holo_dark.png
deleted file mode 100644
index d79f7ad..0000000
--- a/java/res/drawable-xhdpi/ic_emoji_flag_activated_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-xhdpi/ic_emoji_flag_activated_lxx_dark.png b/java/res/drawable-xhdpi/ic_emoji_flag_activated_lxx_dark.png
deleted file mode 100644
index 735efcc..0000000
--- a/java/res/drawable-xhdpi/ic_emoji_flag_activated_lxx_dark.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-xhdpi/ic_emoji_flag_activated_lxx_light.png b/java/res/drawable-xhdpi/ic_emoji_flag_activated_lxx_light.png
deleted file mode 100644
index 78e877d..0000000
--- a/java/res/drawable-xhdpi/ic_emoji_flag_activated_lxx_light.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-xhdpi/ic_emoji_flag_normal_holo_dark.png b/java/res/drawable-xhdpi/ic_emoji_flag_normal_holo_dark.png
deleted file mode 100644
index 938cafa..0000000
--- a/java/res/drawable-xhdpi/ic_emoji_flag_normal_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-xhdpi/ic_emoji_flag_normal_lxx_dark.png b/java/res/drawable-xhdpi/ic_emoji_flag_normal_lxx_dark.png
deleted file mode 100644
index 662dbdc..0000000
--- a/java/res/drawable-xhdpi/ic_emoji_flag_normal_lxx_dark.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-xhdpi/ic_emoji_flag_normal_lxx_light.png b/java/res/drawable-xhdpi/ic_emoji_flag_normal_lxx_light.png
deleted file mode 100644
index 6ff93ba..0000000
--- a/java/res/drawable-xhdpi/ic_emoji_flag_normal_lxx_light.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-xhdpi/ic_emoji_food_activated_holo_dark.png b/java/res/drawable-xhdpi/ic_emoji_food_activated_holo_dark.png
deleted file mode 100644
index 4977bfb..0000000
--- a/java/res/drawable-xhdpi/ic_emoji_food_activated_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-xhdpi/ic_emoji_food_activated_lxx_dark.png b/java/res/drawable-xhdpi/ic_emoji_food_activated_lxx_dark.png
deleted file mode 100644
index f902e43..0000000
--- a/java/res/drawable-xhdpi/ic_emoji_food_activated_lxx_dark.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-xhdpi/ic_emoji_food_activated_lxx_light.png b/java/res/drawable-xhdpi/ic_emoji_food_activated_lxx_light.png
deleted file mode 100644
index 23f3d96..0000000
--- a/java/res/drawable-xhdpi/ic_emoji_food_activated_lxx_light.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-xhdpi/ic_emoji_food_normal_holo_dark.png b/java/res/drawable-xhdpi/ic_emoji_food_normal_holo_dark.png
deleted file mode 100644
index 2c849f8..0000000
--- a/java/res/drawable-xhdpi/ic_emoji_food_normal_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-xhdpi/ic_emoji_food_normal_lxx_dark.png b/java/res/drawable-xhdpi/ic_emoji_food_normal_lxx_dark.png
deleted file mode 100644
index ed671e1..0000000
--- a/java/res/drawable-xhdpi/ic_emoji_food_normal_lxx_dark.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-xhdpi/ic_emoji_food_normal_lxx_light.png b/java/res/drawable-xhdpi/ic_emoji_food_normal_lxx_light.png
deleted file mode 100644
index e7ac068..0000000
--- a/java/res/drawable-xhdpi/ic_emoji_food_normal_lxx_light.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-xxhdpi/ic_emoji_activity_activated_holo_dark.png b/java/res/drawable-xxhdpi/ic_emoji_activity_activated_holo_dark.png
deleted file mode 100644
index 8215230..0000000
--- a/java/res/drawable-xxhdpi/ic_emoji_activity_activated_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-xxhdpi/ic_emoji_activity_activated_lxx_dark.png b/java/res/drawable-xxhdpi/ic_emoji_activity_activated_lxx_dark.png
deleted file mode 100644
index 986899b..0000000
--- a/java/res/drawable-xxhdpi/ic_emoji_activity_activated_lxx_dark.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-xxhdpi/ic_emoji_activity_activated_lxx_light.png b/java/res/drawable-xxhdpi/ic_emoji_activity_activated_lxx_light.png
deleted file mode 100644
index c36822d..0000000
--- a/java/res/drawable-xxhdpi/ic_emoji_activity_activated_lxx_light.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-xxhdpi/ic_emoji_activity_normal_holo_dark.png b/java/res/drawable-xxhdpi/ic_emoji_activity_normal_holo_dark.png
deleted file mode 100644
index 0b5ec7e..0000000
--- a/java/res/drawable-xxhdpi/ic_emoji_activity_normal_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-xxhdpi/ic_emoji_activity_normal_lxx_dark.png b/java/res/drawable-xxhdpi/ic_emoji_activity_normal_lxx_dark.png
deleted file mode 100644
index 63c9b50..0000000
--- a/java/res/drawable-xxhdpi/ic_emoji_activity_normal_lxx_dark.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-xxhdpi/ic_emoji_activity_normal_lxx_light.png b/java/res/drawable-xxhdpi/ic_emoji_activity_normal_lxx_light.png
deleted file mode 100644
index 7350c1c..0000000
--- a/java/res/drawable-xxhdpi/ic_emoji_activity_normal_lxx_light.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-xxhdpi/ic_emoji_flag_activated_holo_dark.png b/java/res/drawable-xxhdpi/ic_emoji_flag_activated_holo_dark.png
deleted file mode 100644
index 28a94c3..0000000
--- a/java/res/drawable-xxhdpi/ic_emoji_flag_activated_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-xxhdpi/ic_emoji_flag_activated_lxx_dark.png b/java/res/drawable-xxhdpi/ic_emoji_flag_activated_lxx_dark.png
deleted file mode 100644
index 2a08a15..0000000
--- a/java/res/drawable-xxhdpi/ic_emoji_flag_activated_lxx_dark.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-xxhdpi/ic_emoji_flag_activated_lxx_light.png b/java/res/drawable-xxhdpi/ic_emoji_flag_activated_lxx_light.png
deleted file mode 100644
index f4dd175..0000000
--- a/java/res/drawable-xxhdpi/ic_emoji_flag_activated_lxx_light.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-xxhdpi/ic_emoji_flag_normal_holo_dark.png b/java/res/drawable-xxhdpi/ic_emoji_flag_normal_holo_dark.png
deleted file mode 100644
index bf2bdc1..0000000
--- a/java/res/drawable-xxhdpi/ic_emoji_flag_normal_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-xxhdpi/ic_emoji_flag_normal_lxx_dark.png b/java/res/drawable-xxhdpi/ic_emoji_flag_normal_lxx_dark.png
deleted file mode 100644
index ac95fd7..0000000
--- a/java/res/drawable-xxhdpi/ic_emoji_flag_normal_lxx_dark.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-xxhdpi/ic_emoji_flag_normal_lxx_light.png b/java/res/drawable-xxhdpi/ic_emoji_flag_normal_lxx_light.png
deleted file mode 100644
index 11e101f..0000000
--- a/java/res/drawable-xxhdpi/ic_emoji_flag_normal_lxx_light.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-xxhdpi/ic_emoji_food_activated_holo_dark.png b/java/res/drawable-xxhdpi/ic_emoji_food_activated_holo_dark.png
deleted file mode 100644
index 24f0d0f..0000000
--- a/java/res/drawable-xxhdpi/ic_emoji_food_activated_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-xxhdpi/ic_emoji_food_activated_lxx_dark.png b/java/res/drawable-xxhdpi/ic_emoji_food_activated_lxx_dark.png
deleted file mode 100644
index a4274bd..0000000
--- a/java/res/drawable-xxhdpi/ic_emoji_food_activated_lxx_dark.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-xxhdpi/ic_emoji_food_activated_lxx_light.png b/java/res/drawable-xxhdpi/ic_emoji_food_activated_lxx_light.png
deleted file mode 100644
index 3c56146..0000000
--- a/java/res/drawable-xxhdpi/ic_emoji_food_activated_lxx_light.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-xxhdpi/ic_emoji_food_normal_holo_dark.png b/java/res/drawable-xxhdpi/ic_emoji_food_normal_holo_dark.png
deleted file mode 100644
index 64065d4..0000000
--- a/java/res/drawable-xxhdpi/ic_emoji_food_normal_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-xxhdpi/ic_emoji_food_normal_lxx_dark.png b/java/res/drawable-xxhdpi/ic_emoji_food_normal_lxx_dark.png
deleted file mode 100644
index f82647c..0000000
--- a/java/res/drawable-xxhdpi/ic_emoji_food_normal_lxx_dark.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-xxhdpi/ic_emoji_food_normal_lxx_light.png b/java/res/drawable-xxhdpi/ic_emoji_food_normal_lxx_light.png
deleted file mode 100644
index 4f1ac1b..0000000
--- a/java/res/drawable-xxhdpi/ic_emoji_food_normal_lxx_light.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-xxxhdpi/ic_emoji_activity_activated_lxx_dark.png b/java/res/drawable-xxxhdpi/ic_emoji_activity_activated_lxx_dark.png
deleted file mode 100644
index 93eb4e3..0000000
--- a/java/res/drawable-xxxhdpi/ic_emoji_activity_activated_lxx_dark.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-xxxhdpi/ic_emoji_activity_activated_lxx_light.png b/java/res/drawable-xxxhdpi/ic_emoji_activity_activated_lxx_light.png
deleted file mode 100644
index 6594fa0..0000000
--- a/java/res/drawable-xxxhdpi/ic_emoji_activity_activated_lxx_light.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-xxxhdpi/ic_emoji_activity_normal_lxx_dark.png b/java/res/drawable-xxxhdpi/ic_emoji_activity_normal_lxx_dark.png
deleted file mode 100644
index c41bc87..0000000
--- a/java/res/drawable-xxxhdpi/ic_emoji_activity_normal_lxx_dark.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-xxxhdpi/ic_emoji_activity_normal_lxx_light.png b/java/res/drawable-xxxhdpi/ic_emoji_activity_normal_lxx_light.png
deleted file mode 100644
index 0b9ef24..0000000
--- a/java/res/drawable-xxxhdpi/ic_emoji_activity_normal_lxx_light.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-xxxhdpi/ic_emoji_flag_activated_lxx_dark.png b/java/res/drawable-xxxhdpi/ic_emoji_flag_activated_lxx_dark.png
deleted file mode 100644
index 0d7545d..0000000
--- a/java/res/drawable-xxxhdpi/ic_emoji_flag_activated_lxx_dark.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-xxxhdpi/ic_emoji_flag_activated_lxx_light.png b/java/res/drawable-xxxhdpi/ic_emoji_flag_activated_lxx_light.png
deleted file mode 100644
index 5fd9088..0000000
--- a/java/res/drawable-xxxhdpi/ic_emoji_flag_activated_lxx_light.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-xxxhdpi/ic_emoji_flag_normal_lxx_dark.png b/java/res/drawable-xxxhdpi/ic_emoji_flag_normal_lxx_dark.png
deleted file mode 100644
index c205e29..0000000
--- a/java/res/drawable-xxxhdpi/ic_emoji_flag_normal_lxx_dark.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-xxxhdpi/ic_emoji_flag_normal_lxx_light.png b/java/res/drawable-xxxhdpi/ic_emoji_flag_normal_lxx_light.png
deleted file mode 100644
index e596f8e..0000000
--- a/java/res/drawable-xxxhdpi/ic_emoji_flag_normal_lxx_light.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-xxxhdpi/ic_emoji_food_activated_lxx_dark.png b/java/res/drawable-xxxhdpi/ic_emoji_food_activated_lxx_dark.png
deleted file mode 100644
index 0e16e03..0000000
--- a/java/res/drawable-xxxhdpi/ic_emoji_food_activated_lxx_dark.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-xxxhdpi/ic_emoji_food_activated_lxx_light.png b/java/res/drawable-xxxhdpi/ic_emoji_food_activated_lxx_light.png
deleted file mode 100644
index 74632fb..0000000
--- a/java/res/drawable-xxxhdpi/ic_emoji_food_activated_lxx_light.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-xxxhdpi/ic_emoji_food_normal_lxx_dark.png b/java/res/drawable-xxxhdpi/ic_emoji_food_normal_lxx_dark.png
deleted file mode 100644
index cc27079..0000000
--- a/java/res/drawable-xxxhdpi/ic_emoji_food_normal_lxx_dark.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-xxxhdpi/ic_emoji_food_normal_lxx_light.png b/java/res/drawable-xxxhdpi/ic_emoji_food_normal_lxx_light.png
deleted file mode 100644
index 9254780..0000000
--- a/java/res/drawable-xxxhdpi/ic_emoji_food_normal_lxx_light.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable/ic_emoji_activity_holo_dark.xml b/java/res/drawable/ic_emoji_activity_holo_dark.xml
deleted file mode 100644
index 8eeb640..0000000
--- a/java/res/drawable/ic_emoji_activity_holo_dark.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2015, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:state_focused="true"
-        android:drawable="@drawable/ic_emoji_activity_activated_holo_dark" />
-    <item
-        android:state_pressed="true"
-        android:drawable="@drawable/ic_emoji_activity_activated_holo_dark" />
-    <item
-        android:state_selected="true"
-        android:drawable="@drawable/ic_emoji_activity_activated_holo_dark" />
-    <item
-        android:drawable="@drawable/ic_emoji_activity_normal_holo_dark" />
-</selector>
diff --git a/java/res/drawable/ic_emoji_activity_lxx_dark.xml b/java/res/drawable/ic_emoji_activity_lxx_dark.xml
deleted file mode 100644
index b916d4f..0000000
--- a/java/res/drawable/ic_emoji_activity_lxx_dark.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2015, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:state_focused="true"
-        android:drawable="@drawable/ic_emoji_activity_activated_lxx_dark" />
-    <item
-        android:state_pressed="true"
-        android:drawable="@drawable/ic_emoji_activity_activated_lxx_dark" />
-    <item
-        android:state_selected="true"
-        android:drawable="@drawable/ic_emoji_activity_activated_lxx_dark" />
-    <item
-        android:drawable="@drawable/ic_emoji_activity_normal_lxx_dark" />
-</selector>
diff --git a/java/res/drawable/ic_emoji_activity_lxx_light.xml b/java/res/drawable/ic_emoji_activity_lxx_light.xml
deleted file mode 100644
index 801f895..0000000
--- a/java/res/drawable/ic_emoji_activity_lxx_light.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2015, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:state_focused="true"
-        android:drawable="@drawable/ic_emoji_activity_activated_lxx_light" />
-    <item
-        android:state_pressed="true"
-        android:drawable="@drawable/ic_emoji_activity_activated_lxx_light" />
-    <item
-        android:state_selected="true"
-        android:drawable="@drawable/ic_emoji_activity_activated_lxx_light" />
-    <item
-        android:drawable="@drawable/ic_emoji_activity_normal_lxx_light" />
-</selector>
diff --git a/java/res/drawable/ic_emoji_flag_holo_dark.xml b/java/res/drawable/ic_emoji_flag_holo_dark.xml
deleted file mode 100644
index c9857fe..0000000
--- a/java/res/drawable/ic_emoji_flag_holo_dark.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2015, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:state_focused="true"
-        android:drawable="@drawable/ic_emoji_flag_activated_holo_dark" />
-    <item
-        android:state_pressed="true"
-        android:drawable="@drawable/ic_emoji_flag_activated_holo_dark" />
-    <item
-        android:state_selected="true"
-        android:drawable="@drawable/ic_emoji_flag_activated_holo_dark" />
-    <item
-        android:drawable="@drawable/ic_emoji_flag_normal_holo_dark" />
-</selector>
diff --git a/java/res/drawable/ic_emoji_flag_lxx_dark.xml b/java/res/drawable/ic_emoji_flag_lxx_dark.xml
deleted file mode 100644
index 8bd0fd7..0000000
--- a/java/res/drawable/ic_emoji_flag_lxx_dark.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2015, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:state_focused="true"
-        android:drawable="@drawable/ic_emoji_flag_activated_lxx_dark" />
-    <item
-        android:state_pressed="true"
-        android:drawable="@drawable/ic_emoji_flag_activated_lxx_dark" />
-    <item
-        android:state_selected="true"
-        android:drawable="@drawable/ic_emoji_flag_activated_lxx_dark" />
-    <item
-        android:drawable="@drawable/ic_emoji_flag_normal_lxx_dark" />
-</selector>
diff --git a/java/res/drawable/ic_emoji_flag_lxx_light.xml b/java/res/drawable/ic_emoji_flag_lxx_light.xml
deleted file mode 100644
index 3632cfe..0000000
--- a/java/res/drawable/ic_emoji_flag_lxx_light.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2015, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:state_focused="true"
-        android:drawable="@drawable/ic_emoji_flag_activated_lxx_light" />
-    <item
-        android:state_pressed="true"
-        android:drawable="@drawable/ic_emoji_flag_activated_lxx_light" />
-    <item
-        android:state_selected="true"
-        android:drawable="@drawable/ic_emoji_flag_activated_lxx_light" />
-    <item
-        android:drawable="@drawable/ic_emoji_flag_normal_lxx_light" />
-</selector>
diff --git a/java/res/drawable/ic_emoji_food_holo_dark.xml b/java/res/drawable/ic_emoji_food_holo_dark.xml
deleted file mode 100644
index 2c6c0f2..0000000
--- a/java/res/drawable/ic_emoji_food_holo_dark.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2015, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:state_focused="true"
-        android:drawable="@drawable/ic_emoji_food_activated_holo_dark" />
-    <item
-        android:state_pressed="true"
-        android:drawable="@drawable/ic_emoji_food_activated_holo_dark" />
-    <item
-        android:state_selected="true"
-        android:drawable="@drawable/ic_emoji_food_activated_holo_dark" />
-    <item
-        android:drawable="@drawable/ic_emoji_food_normal_holo_dark" />
-</selector>
diff --git a/java/res/drawable/ic_emoji_food_lxx_dark.xml b/java/res/drawable/ic_emoji_food_lxx_dark.xml
deleted file mode 100644
index 19d7d57..0000000
--- a/java/res/drawable/ic_emoji_food_lxx_dark.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2015, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:state_focused="true"
-        android:drawable="@drawable/ic_emoji_food_activated_lxx_dark" />
-    <item
-        android:state_pressed="true"
-        android:drawable="@drawable/ic_emoji_food_activated_lxx_dark" />
-    <item
-        android:state_selected="true"
-        android:drawable="@drawable/ic_emoji_food_activated_lxx_dark" />
-    <item
-        android:drawable="@drawable/ic_emoji_food_normal_lxx_dark" />
-</selector>
diff --git a/java/res/drawable/ic_emoji_food_lxx_light.xml b/java/res/drawable/ic_emoji_food_lxx_light.xml
deleted file mode 100644
index 9da2c48..0000000
--- a/java/res/drawable/ic_emoji_food_lxx_light.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2015, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:state_focused="true"
-        android:drawable="@drawable/ic_emoji_food_activated_lxx_light" />
-    <item
-        android:state_pressed="true"
-        android:drawable="@drawable/ic_emoji_food_activated_lxx_light" />
-    <item
-        android:state_selected="true"
-        android:drawable="@drawable/ic_emoji_food_activated_lxx_light" />
-    <item
-        android:drawable="@drawable/ic_emoji_food_normal_lxx_light" />
-</selector>
diff --git a/java/res/values-v19/emoji-categories.xml b/java/res/values-v19/emoji-categories.xml
index d9b1738..51aad6e 100644
--- a/java/res/values-v19/emoji-categories.xml
+++ b/java/res/values-v19/emoji-categories.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The Android Open Source Project
+<!-- Copyright (C) 2013 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -887,240 +887,6 @@
         <item>fe4ee|1f1f0,1f1f7|99</item> <!-- TODO: fix support min sdk version (99) -->
     </array>
     <array
-        name="emoji_flags"
-        format="string"
-    >
-        <item>1f1e6,1f1e9</item>
-        <item>1f1e6,1f1ea</item>
-        <item>1f1e6,1f1eb</item>
-        <item>1f1e6,1f1ec</item>
-        <item>1f1e6,1f1ee</item>
-        <item>1f1e6,1f1f1</item>
-        <item>1f1e6,1f1f2</item>
-        <item>1f1e6,1f1f4</item>
-        <item>1f1e6,1f1f7</item>
-        <item>1f1e6,1f1f8</item>
-        <item>1f1e6,1f1f9</item>
-        <item>1f1e6,1f1fa</item>
-        <item>1f1e6,1f1fc</item>
-        <item>1f1e6,1f1fd</item>
-        <item>1f1e6,1f1ff</item>
-        <item>1f1e7,1f1e6</item>
-        <item>1f1e7,1f1e7</item>
-        <item>1f1e7,1f1e9</item>
-        <item>1f1e7,1f1ea</item>
-        <item>1f1e7,1f1eb</item>
-        <item>1f1e7,1f1ec</item>
-        <item>1f1e7,1f1ed</item>
-        <item>1f1e7,1f1ee</item>
-        <item>1f1e7,1f1ef</item>
-        <item>1f1e7,1f1f2</item>
-        <item>1f1e7,1f1f3</item>
-        <item>1f1e7,1f1f4</item>
-        <item>1f1e7,1f1f7</item>
-        <item>1f1e7,1f1f8</item>
-        <item>1f1e7,1f1f9</item>
-        <item>1f1e7,1f1fc</item>
-        <item>1f1e7,1f1fe</item>
-        <item>1f1e7,1f1ff</item>
-        <item>1f1e8,1f1e6</item>
-        <item>1f1e8,1f1e8</item>
-        <item>1f1e8,1f1e9</item>
-        <item>1f1e8,1f1eb</item>
-        <item>1f1e8,1f1ec</item>
-        <item>1f1e8,1f1ed</item>
-        <item>1f1e8,1f1ee</item>
-        <item>1f1e8,1f1f0</item>
-        <item>1f1e8,1f1f1</item>
-        <item>1f1e8,1f1f2</item>
-        <item>1f1e8,1f1f3</item>
-        <item>1f1e8,1f1f4</item>
-        <item>1f1e8,1f1f7</item>
-        <item>1f1e8,1f1fa</item>
-        <item>1f1e8,1f1fb</item>
-        <item>1f1e8,1f1fc</item>
-        <item>1f1e8,1f1fd</item>
-        <item>1f1e8,1f1fe</item>
-        <item>1f1e8,1f1ff</item>
-        <item>1f1e9,1f1ea</item>
-        <item>1f1e9,1f1ef</item>
-        <item>1f1e9,1f1f0</item>
-        <item>1f1e9,1f1f2</item>
-        <item>1f1e9,1f1f4</item>
-        <item>1f1e9,1f1ff</item>
-        <item>1f1ea,1f1e8</item>
-        <item>1f1ea,1f1ea</item>
-        <item>1f1ea,1f1ec</item>
-        <item>1f1ea,1f1f7</item>
-        <item>1f1ea,1f1f8</item>
-        <item>1f1ea,1f1f9</item>
-        <item>1f1ea,1f1fa</item>
-        <item>1f1eb,1f1ee</item>
-        <item>1f1eb,1f1ef</item>
-        <item>1f1eb,1f1f2</item>
-        <item>1f1eb,1f1f4</item>
-        <item>1f1eb,1f1f7</item>
-        <item>1f1ec,1f1e6</item>
-        <item>1f1ec,1f1e7</item>
-        <item>1f1ec,1f1e9</item>
-        <item>1f1ec,1f1ea</item>
-        <item>1f1ec,1f1ec</item>
-        <item>1f1ec,1f1ed</item>
-        <item>1f1ec,1f1ee</item>
-        <item>1f1ec,1f1f1</item>
-        <item>1f1ec,1f1f2</item>
-        <item>1f1ec,1f1f3</item>
-        <item>1f1ec,1f1f6</item>
-        <item>1f1ec,1f1f7</item>
-        <item>1f1ec,1f1f9</item>
-        <item>1f1ec,1f1fa</item>
-        <item>1f1ec,1f1fc</item>
-        <item>1f1ec,1f1fe</item>
-        <item>1f1ed,1f1f0</item>
-        <item>1f1ed,1f1f3</item>
-        <item>1f1ed,1f1f7</item>
-        <item>1f1ed,1f1f9</item>
-        <item>1f1ed,1f1fa</item>
-        <item>1f1ee,1f1e9</item>
-        <item>1f1ee,1f1ea</item>
-        <item>1f1ee,1f1f1</item>
-        <item>1f1ee,1f1f2</item>
-        <item>1f1ee,1f1f3</item>
-        <item>1f1ee,1f1f4</item>
-        <item>1f1ee,1f1f6</item>
-        <item>1f1ee,1f1f7</item>
-        <item>1f1ee,1f1f8</item>
-        <item>1f1ee,1f1f9</item>
-        <item>1f1ef,1f1ea</item>
-        <item>1f1ef,1f1f2</item>
-        <item>1f1ef,1f1f4</item>
-        <item>1f1ef,1f1f5</item>
-        <item>1f1f0,1f1ea</item>
-        <item>1f1f0,1f1ec</item>
-        <item>1f1f0,1f1ed</item>
-        <item>1f1f0,1f1ee</item>
-        <item>1f1f0,1f1f2</item>
-        <item>1f1f0,1f1f3</item>
-        <item>1f1f0,1f1f5</item>
-        <item>1f1f0,1f1f7</item>
-        <item>1f1f0,1f1fc</item>
-        <item>1f1f0,1f1fe</item>
-        <item>1f1f0,1f1ff</item>
-        <item>1f1f1,1f1e6</item>
-        <item>1f1f1,1f1e7</item>
-        <item>1f1f1,1f1e8</item>
-        <item>1f1f1,1f1ee</item>
-        <item>1f1f1,1f1f0</item>
-        <item>1f1f1,1f1f7</item>
-        <item>1f1f1,1f1f8</item>
-        <item>1f1f1,1f1f9</item>
-        <item>1f1f1,1f1fa</item>
-        <item>1f1f1,1f1fb</item>
-        <item>1f1f1,1f1fe</item>
-        <item>1f1f2,1f1e6</item>
-        <item>1f1f2,1f1e8</item>
-        <item>1f1f2,1f1e9</item>
-        <item>1f1f2,1f1ea</item>
-        <item>1f1f2,1f1ec</item>
-        <item>1f1f2,1f1ed</item>
-        <item>1f1f2,1f1f0</item>
-        <item>1f1f2,1f1f1</item>
-        <item>1f1f2,1f1f2</item>
-        <item>1f1f2,1f1f3</item>
-        <item>1f1f2,1f1f4</item>
-        <item>1f1f2,1f1f5</item>
-        <item>1f1f2,1f1f7</item>
-        <item>1f1f2,1f1f8</item>
-        <item>1f1f2,1f1f9</item>
-        <item>1f1f2,1f1fa</item>
-        <item>1f1f2,1f1fb</item>
-        <item>1f1f2,1f1fc</item>
-        <item>1f1f2,1f1fd</item>
-        <item>1f1f2,1f1fe</item>
-        <item>1f1f2,1f1ff</item>
-        <item>1f1f3,1f1e6</item>
-        <item>1f1f3,1f1ea</item>
-        <item>1f1f3,1f1eb</item>
-        <item>1f1f3,1f1ec</item>
-        <item>1f1f3,1f1ee</item>
-        <item>1f1f3,1f1f1</item>
-        <item>1f1f3,1f1f4</item>
-        <item>1f1f3,1f1f5</item>
-        <item>1f1f3,1f1f7</item>
-        <item>1f1f3,1f1fa</item>
-        <item>1f1f3,1f1ff</item>
-        <item>1f1f4,1f1f2</item>
-        <item>1f1f5,1f1e6</item>
-        <item>1f1f5,1f1ea</item>
-        <item>1f1f5,1f1eb</item>
-        <item>1f1f5,1f1ec</item>
-        <item>1f1f5,1f1ed</item>
-        <item>1f1f5,1f1f0</item>
-        <item>1f1f5,1f1f1</item>
-        <item>1f1f5,1f1f3</item>
-        <item>1f1f5,1f1f7</item>
-        <item>1f1f5,1f1f8</item>
-        <item>1f1f5,1f1f9</item>
-        <item>1f1f5,1f1fc</item>
-        <item>1f1f5,1f1fe</item>
-        <item>1f1f6,1f1e6</item>
-        <item>1f1f7,1f1f4</item>
-        <item>1f1f7,1f1f8</item>
-        <item>1f1f7,1f1fa</item>
-        <item>1f1f7,1f1fc</item>
-        <item>1f1f8,1f1e6</item>
-        <item>1f1f8,1f1e7</item>
-        <item>1f1f8,1f1e8</item>
-        <item>1f1f8,1f1e9</item>
-        <item>1f1f8,1f1ea</item>
-        <item>1f1f8,1f1ec</item>
-        <item>1f1f8,1f1ee</item>
-        <item>1f1f8,1f1f0</item>
-        <item>1f1f8,1f1f1</item>
-        <item>1f1f8,1f1f2</item>
-        <item>1f1f8,1f1f3</item>
-        <item>1f1f8,1f1f4</item>
-        <item>1f1f8,1f1f7</item>
-        <item>1f1f8,1f1f8</item>
-        <item>1f1f8,1f1f9</item>
-        <item>1f1f8,1f1fb</item>
-        <item>1f1f8,1f1fd</item>
-        <item>1f1f8,1f1fe</item>
-        <item>1f1f8,1f1ff</item>
-        <item>1f1f9,1f1e8</item>
-        <item>1f1f9,1f1e9</item>
-        <item>1f1f9,1f1ec</item>
-        <item>1f1f9,1f1ed</item>
-        <item>1f1f9,1f1ef</item>
-        <item>1f1f9,1f1f0</item>
-        <item>1f1f9,1f1f1</item>
-        <item>1f1f9,1f1f2</item>
-        <item>1f1f9,1f1f3</item>
-        <item>1f1f9,1f1f4</item>
-        <item>1f1f9,1f1f7</item>
-        <item>1f1f9,1f1f9</item>
-        <item>1f1f9,1f1fb</item>
-        <item>1f1f9,1f1fc</item>
-        <item>1f1f9,1f1ff</item>
-        <item>1f1fa,1f1e6</item>
-        <item>1f1fa,1f1ec</item>
-        <item>1f1fa,1f1f8</item>
-        <item>1f1fa,1f1fe</item>
-        <item>1f1fa,1f1ff</item>
-        <item>1f1fb,1f1e6</item>
-        <item>1f1fb,1f1e8</item>
-        <item>1f1fb,1f1ea</item>
-        <item>1f1fb,1f1ec</item>
-        <item>1f1fb,1f1ee</item>
-        <item>1f1fb,1f1f3</item>
-        <item>1f1fb,1f1fa</item>
-        <item>1f1fc,1f1f8</item>
-        <item>1f1fe,1f1ea</item>
-        <item>1f1ff,1f1e6</item>
-        <item>1f1ff,1f1f2</item>
-        <item>1f1ff,1f1fc</item>
-    </array>
-    <array
         name="emoji_emoticons"
         format="string"
     >
@@ -1140,1576 +906,4 @@
         <item>O:-)</item>
         <item>:-[</item>
     </array>
-    <array
-        name="emoji_eight_symbols"
-        format="string"
-    >
-        <item>1f3c1</item>
-        <item>1f3f3</item>
-        <item>1f3f4</item>
-        <item>1f6a9</item>
-        <item>1f3e7</item>
-        <item>1f6ae</item>
-        <item>1f6b0</item>
-        <item>267f</item>
-        <item>1f6b9</item>
-        <item>1f6ba</item>
-        <item>1f6bb</item>
-        <item>1f6bc</item>
-        <item>1f6be</item>
-        <item>1f6c2</item>
-        <item>1f6c3</item>
-        <item>1f6c4</item>
-        <item>1f6c5</item>
-        <item>26a0</item>
-        <item>1f6b8</item>
-        <item>26d4</item>
-        <item>1f6ab</item>
-        <item>1f6b3</item>
-        <item>1f6ad</item>
-        <item>1f6af</item>
-        <item>1f6b1</item>
-        <item>1f6b7</item>
-        <item>2622</item>
-        <item>2623</item>
-        <item>2b06</item>
-        <item>2197</item>
-        <item>27a1</item>
-        <item>2198</item>
-        <item>2b07</item>
-        <item>2199</item>
-        <item>2b05</item>
-        <item>2196</item>
-        <item>2195</item>
-        <item>2194</item>
-        <item>21a9</item>
-        <item>21aa</item>
-        <item>2934</item>
-        <item>2935</item>
-        <item>1f503</item>
-        <item>1f504</item>
-        <item>1f519</item>
-        <item>1f51a</item>
-        <item>1f51b</item>
-        <item>1f51c</item>
-        <item>1f51d</item>
-        <item>1f6d0</item>
-        <item>269b</item>
-        <!-- Removed for lack of color glyph support.  <item>1f549</item>  -->
-        <!-- Removed for lack of color glyph support.  <item>2721</item>  -->
-        <!-- Removed for lack of color glyph support.  <item>2638</item>  -->
-        <!-- Removed for lack of color glyph support.  <item>262f</item>  -->
-        <!-- Removed for lack of color glyph support.  <item>271d</item>  -->
-        <!-- Removed for lack of color glyph support.  <item>2626</item>  -->
-        <!-- Removed for lack of color glyph support.  <item>262a</item>  -->
-        <!-- Removed for lack of color glyph support.  <item>262e</item>  -->
-        <!-- Removed for lack of color glyph support.  <item>1f54e</item>  -->
-        <item>1f52f</item>
-        <item>267b</item>
-        <item>1f4db</item>
-        <!-- Removed for lack of color glyph support.  <item>269c</item>  -->
-        <item>1f530</item>
-        <item>1f531</item>
-        <item>2b55</item>
-        <item>2705</item>
-        <item>2611</item>
-        <item>2714</item>
-        <item>2716</item>
-        <item>274c</item>
-        <item>274e</item>
-        <item>2795</item>
-        <item>2796</item>
-        <item>2797</item>
-        <item>27b0</item>
-        <item>27bf</item>
-        <item>303d</item>
-        <item>2733</item>
-        <item>2734</item>
-        <item>2747</item>
-        <item>1f4b1</item>
-        <item>1f4b2</item>
-        <item>203c</item>
-        <item>2049</item>
-        <item>2753</item>
-        <item>2754</item>
-        <item>2755</item>
-        <item>2757</item>
-        <item>3030</item>
-        <item>a9</item>
-        <item>ae</item>
-        <item>2122</item>
-        <item>2648</item>
-        <item>2649</item>
-        <item>264a</item>
-        <item>264b</item>
-        <item>264c</item>
-        <item>264d</item>
-        <item>264e</item>
-        <item>264f</item>
-        <item>2650</item>
-        <item>2651</item>
-        <item>2652</item>
-        <item>2653</item>
-        <item>26ce</item>
-        <item>1f500</item>
-        <item>1f501</item>
-        <item>1f502</item>
-        <item>25b6</item>
-        <item>23e9</item>
-        <item>23ed</item>
-        <item>23ef</item>
-        <item>25c0</item>
-        <item>23ea</item>
-        <item>23ee</item>
-        <item>1f53c</item>
-        <item>23eb</item>
-        <item>1f53d</item>
-        <item>23ec</item>
-        <item>23f8</item>
-        <item>23f9</item>
-        <item>23fa</item>
-        <item>23cf</item>
-        <item>1f3a6</item>
-        <item>1f505</item>
-        <item>1f506</item>
-        <item>1f4f6</item>
-        <item>1f4f5</item>
-        <item>1f4f3</item>
-        <item>1f4f4</item>
-        <item>23,20e3</item>
-        <item>2a,20e3</item>
-        <item>30,20e3</item>
-        <item>31,20e3</item>
-        <item>32,20e3</item>
-        <item>33,20e3</item>
-        <item>34,20e3</item>
-        <item>35,20e3</item>
-        <item>36,20e3</item>
-        <item>37,20e3</item>
-        <item>38,20e3</item>
-        <item>39,20e3</item>
-        <item>1f51f</item>
-        <item>1f4af</item>
-        <item>1f51e</item>
-        <item>1f520</item>
-        <item>1f521</item>
-        <item>1f522</item>
-        <item>1f523</item>
-        <item>1f524</item>
-        <item>1f170</item>
-        <item>1f18e</item>
-        <item>1f171</item>
-        <item>1f191</item>
-        <item>1f192</item>
-        <item>1f193</item>
-        <item>2139</item>
-        <item>1f194</item>
-        <item>24c2</item>
-        <item>1f195</item>
-        <item>1f196</item>
-        <item>1f17e</item>
-        <item>1f197</item>
-        <item>1f17f</item>
-        <item>1f198</item>
-        <item>1f199</item>
-        <item>1f19a</item>
-        <item>1f201</item>
-        <item>1f202</item>
-        <item>1f237</item>
-        <item>1f236</item>
-        <item>1f22f</item>
-        <item>1f250</item>
-        <item>1f239</item>
-        <item>1f21a</item>
-        <item>1f232</item>
-        <item>1f251</item>
-        <item>1f238</item>
-        <item>1f234</item>
-        <item>1f233</item>
-        <item>3297</item>
-        <item>3299</item>
-        <item>1f23a</item>
-        <item>1f235</item>
-        <item>25aa</item>
-        <item>25ab</item>
-        <item>25fb</item>
-        <item>25fc</item>
-        <item>25fd</item>
-        <item>25fe</item>
-        <item>2b1b</item>
-        <item>2b1c</item>
-        <item>1f536</item>
-        <item>1f537</item>
-        <item>1f538</item>
-        <item>1f539</item>
-        <item>1f53a</item>
-        <item>1f53b</item>
-        <item>1f4a0</item>
-        <item>1f518</item>
-        <item>1f532</item>
-        <item>1f533</item>
-        <item>26aa</item>
-        <item>26ab</item>
-        <item>1f534</item>
-        <item>1f535</item>
-    </array>
-    <array
-        name="emoji_eight_animals_nature"
-        format="string"
-    >
-        <item>1f435</item>
-        <item>1f412</item>
-        <item>1f436</item>
-        <item>1f415</item>
-        <item>1f429</item>
-        <item>1f43a</item>
-        <item>1f431</item>
-        <item>1f408</item>
-        <item>1f981</item>
-        <item>1f42f</item>
-        <item>1f405</item>
-        <item>1f406</item>
-        <item>1f434</item>
-        <item>1f40e</item>
-        <item>1f984</item>
-        <item>1f42e</item>
-        <item>1f402</item>
-        <item>1f403</item>
-        <item>1f404</item>
-        <item>1f437</item>
-        <item>1f416</item>
-        <item>1f417</item>
-        <item>1f43d</item>
-        <item>1f40f</item>
-        <item>1f411</item>
-        <item>1f410</item>
-        <item>1f42a</item>
-        <item>1f42b</item>
-        <item>1f418</item>
-        <item>1f42d</item>
-        <item>1f401</item>
-        <item>1f400</item>
-        <item>1f439</item>
-        <item>1f430</item>
-        <item>1f407</item>
-        <item>1f43f</item>
-        <item>1f43b</item>
-        <item>1f428</item>
-        <item>1f43c</item>
-        <item>1f43e</item>
-        <item>1f983</item>
-        <item>1f414</item>
-        <item>1f413</item>
-        <item>1f423</item>
-        <item>1f424</item>
-        <item>1f425</item>
-        <item>1f426</item>
-        <item>1f427</item>
-        <item>1f54a</item>
-        <item>1f438</item>
-        <item>1f40a</item>
-        <item>1f422</item>
-        <item>1f40d</item>
-        <item>1f432</item>
-        <item>1f409</item>
-        <item>1f433</item>
-        <item>1f40b</item>
-        <item>1f42c</item>
-        <item>1f41f</item>
-        <item>1f420</item>
-        <item>1f421</item>
-        <item>1f419</item>
-        <item>1f41a</item>
-        <item>1f980</item>
-        <item>1f40c</item>
-        <item>1f41b</item>
-        <item>1f41c</item>
-        <item>1f41d</item>
-        <item>1f41e</item>
-        <item>1f577</item>
-        <item>1f578</item>
-        <item>1f982</item>
-        <item>1f490</item>
-        <item>1f338</item>
-        <item>1f4ae</item>
-        <item>1f3f5</item>
-        <item>1f339</item>
-        <item>1f33a</item>
-        <item>1f33b</item>
-        <item>1f33c</item>
-        <item>1f337</item>
-        <!-- Removed for lack of color glyph support.  <item>2618</item>  -->
-        <item>1f331</item>
-        <item>1f332</item>
-        <item>1f333</item>
-        <item>1f334</item>
-        <item>1f335</item>
-        <item>1f33e</item>
-        <item>1f33f</item>
-        <item>1f340</item>
-        <item>1f341</item>
-        <item>1f342</item>
-        <item>1f343</item>
-    </array>
-    <array
-        name="emoji_eight_smiley_people"
-        format="string"
-    >
-        <item>1f600</item>
-        <item>1f601</item>
-        <item>1f602</item>
-        <item>1f603</item>
-        <item>1f604</item>
-        <item>1f605</item>
-        <item>1f606</item>
-        <item>1f609</item>
-        <item>1f60a</item>
-        <item>1f60b</item>
-        <item>1f60e</item>
-        <item>1f60d</item>
-        <item>1f618</item>
-        <item>1f617</item>
-        <item>1f619</item>
-        <item>1f61a</item>
-        <item>263a</item>
-        <item>1f642</item>
-        <item>1f917</item>
-        <item>1f607</item>
-        <item>1f914</item>
-        <item>1f610</item>
-        <item>1f611</item>
-        <item>1f636</item>
-        <item>1f644</item>
-        <item>1f60f</item>
-        <item>1f623</item>
-        <item>1f625</item>
-        <item>1f62e</item>
-        <item>1f910</item>
-        <item>1f62f</item>
-        <item>1f62a</item>
-        <item>1f62b</item>
-        <item>1f634</item>
-        <item>1f60c</item>
-        <item>1f913</item>
-        <item>1f61b</item>
-        <item>1f61c</item>
-        <item>1f61d</item>
-        <!-- Removed for lack of color glyph support.  <item>2639</item>  -->
-        <item>1f641</item>
-        <item>1f612</item>
-        <item>1f613</item>
-        <item>1f614</item>
-        <item>1f615</item>
-        <item>1f616</item>
-        <item>1f643</item>
-        <item>1f637</item>
-        <item>1f912</item>
-        <item>1f915</item>
-        <item>1f911</item>
-        <item>1f632</item>
-        <item>1f61e</item>
-        <item>1f61f</item>
-        <item>1f624</item>
-        <item>1f622</item>
-        <item>1f62d</item>
-        <item>1f626</item>
-        <item>1f627</item>
-        <item>1f628</item>
-        <item>1f629</item>
-        <item>1f62c</item>
-        <item>1f630</item>
-        <item>1f631</item>
-        <item>1f633</item>
-        <item>1f635</item>
-        <item>1f621</item>
-        <item>1f620</item>
-        <item>1f608</item>
-        <item>1f47f</item>
-        <item>1f479</item>
-        <item>1f47a</item>
-        <item>1f480</item>
-        <!-- Removed for lack of color glyph support.  <item>2620</item>  -->
-        <item>1f47b</item>
-        <item>1f47d</item>
-        <item>1f47e</item>
-        <item>1f916</item>
-        <item>1f4a9</item>
-        <item>1f63a</item>
-        <item>1f638</item>
-        <item>1f639</item>
-        <item>1f63b</item>
-        <item>1f63c</item>
-        <item>1f63d</item>
-        <item>1f640</item>
-        <item>1f63f</item>
-        <item>1f63e</item>
-        <item>1f648</item>
-        <item>1f649</item>
-        <item>1f64a</item>
-        <item>1f466</item>
-        <item>1f467</item>
-        <item>1f468</item>
-        <item>1f469</item>
-        <item>1f474</item>
-        <item>1f475</item>
-        <item>1f476</item>
-        <item>1f471</item>
-        <item>1f46e</item>
-        <item>1f472</item>
-        <item>1f473</item>
-        <item>1f477</item>
-        <!-- Removed for lack of color glyph support.  <item>26d1</item>  -->
-        <item>1f478</item>
-        <item>1f482</item>
-        <item>1f575</item>
-        <item>1f385</item>
-        <item>1f47c</item>
-        <item>1f46f</item>
-        <item>1f486</item>
-        <item>1f487</item>
-        <item>1f470</item>
-        <item>1f64d</item>
-        <item>1f64e</item>
-        <item>1f645</item>
-        <item>1f646</item>
-        <item>1f481</item>
-        <item>1f64b</item>
-        <item>1f647</item>
-        <item>1f64c</item>
-        <item>1f64f</item>
-        <item>1f5e3</item>
-        <item>1f464</item>
-        <item>1f465</item>
-        <item>1f6b6</item>
-        <item>1f3c3</item>
-        <item>1f483</item>
-        <item>1f574</item>
-        <item>1f46b</item>
-        <item>1f46c</item>
-        <item>1f46d</item>
-        <item>1f48f</item>
-        <item>1f468,200d,2764,fe0f,200d,1f48b,200d,1f468</item>
-        <item>1f469,200d,2764,fe0f,200d,1f48b,200d,1f469</item>
-        <item>1f491</item>
-        <item>1f468,200d,2764,fe0f,200d,1f468</item>
-        <item>1f469,200d,2764,fe0f,200d,1f469</item>
-        <item>1f46a</item>
-        <item>1f468,200d,1f468,200d,1f466</item>
-        <item>1f468,200d,1f468,200d,1f466,200d,1f466</item>
-        <item>1f468,200d,1f468,200d,1f467</item>
-        <item>1f468,200d,1f468,200d,1f467,200d,1f466</item>
-        <item>1f468,200d,1f468,200d,1f467,200d,1f467</item>
-        <item>1f468,200d,1f469,200d,1f466</item>
-        <item>1f468,200d,1f469,200d,1f466,200d,1f466</item>
-        <item>1f468,200d,1f469,200d,1f467</item>
-        <item>1f468,200d,1f469,200d,1f467,200d,1f466</item>
-        <item>1f468,200d,1f469,200d,1f467,200d,1f467</item>
-        <item>1f469,200d,1f469,200d,1f466</item>
-        <item>1f469,200d,1f469,200d,1f466,200d,1f466</item>
-        <item>1f469,200d,1f469,200d,1f467</item>
-        <item>1f469,200d,1f469,200d,1f467,200d,1f466</item>
-        <item>1f469,200d,1f469,200d,1f467,200d,1f467</item>
-        <!-- Removed for lack of color glyph support.  <item>1f3fb</item>  -->
-        <!-- Removed for lack of color glyph support.  <item>1f3fc</item>  -->
-        <!-- Removed for lack of color glyph support.  <item>1f3fd</item>  -->
-        <!-- Removed for lack of color glyph support.  <item>1f3fe</item>  -->
-        <!-- Removed for lack of color glyph support.  <item>1f3ff</item>  -->
-        <item>1f4aa</item>
-        <item>1f448</item>
-        <item>1f449</item>
-        <item>261d</item>
-        <item>1f446</item>
-        <item>1f595</item>
-        <item>1f447</item>
-        <item>270c</item>
-        <item>1f596</item>
-        <item>1f918</item>
-        <item>1f590</item>
-        <item>270a</item>
-        <item>270b</item>
-        <item>1f44a</item>
-        <item>1f44c</item>
-        <item>1f44d</item>
-        <item>1f44e</item>
-        <item>1f44b</item>
-        <item>1f44f</item>
-        <item>1f450</item>
-        <!-- Removed for lack of color glyph support.  <item>270d</item>  -->
-        <item>1f485</item>
-        <item>1f442</item>
-        <item>1f443</item>
-        <item>1f463</item>
-        <item>1f440</item>
-        <item>1f441</item>
-        <item>1f445</item>
-        <item>1f444</item>
-        <item>1f48b</item>
-        <item>1f498</item>
-        <item>2764</item>
-        <item>1f493</item>
-        <item>1f494</item>
-        <item>1f495</item>
-        <item>1f496</item>
-        <item>1f497</item>
-        <item>1f499</item>
-        <item>1f49a</item>
-        <item>1f49b</item>
-        <item>1f49c</item>
-        <item>1f49d</item>
-        <item>1f49e</item>
-        <item>1f49f</item>
-        <!-- Removed for lack of color glyph support.  <item>2763</item>  -->
-        <item>1f48c</item>
-        <item>1f4a4</item>
-        <item>1f4a2</item>
-        <item>1f4a3</item>
-        <item>1f4a5</item>
-        <item>1f4a6</item>
-        <item>1f4a8</item>
-        <item>1f4ab</item>
-        <item>1f4ac</item>
-        <item>1f5e8</item>
-        <item>1f5ef</item>
-        <item>1f4ad</item>
-        <item>1f441,200d,1f5e8</item>
-        <item>1f573</item>
-        <item>1f453</item>
-        <item>1f576</item>
-        <item>1f454</item>
-        <item>1f455</item>
-        <item>1f456</item>
-        <item>1f457</item>
-        <item>1f458</item>
-        <item>1f459</item>
-        <item>1f45a</item>
-        <item>1f45b</item>
-        <item>1f45c</item>
-        <item>1f45d</item>
-        <item>1f6cd</item>
-        <item>1f392</item>
-        <item>1f45e</item>
-        <item>1f45f</item>
-        <item>1f460</item>
-        <item>1f461</item>
-        <item>1f462</item>
-        <item>1f451</item>
-        <item>1f452</item>
-        <item>1f3a9</item>
-        <item>1f393</item>
-        <item>1f4ff</item>
-        <item>1f484</item>
-        <item>1f48d</item>
-        <item>1f48e</item>
-    </array>
-    <array
-        name="emoji_eight_smiley_people_boring"
-        format="string"
-    >
-        <item>1f600</item>
-        <item>1f601</item>
-        <item>1f602</item>
-        <item>1f603</item>
-        <item>1f604</item>
-        <item>1f605</item>
-        <item>1f606</item>
-        <item>1f609</item>
-        <item>1f60a</item>
-        <item>1f60b</item>
-        <item>1f60e</item>
-        <item>1f60d</item>
-        <item>1f618</item>
-        <item>1f617</item>
-        <item>1f619</item>
-        <item>1f61a</item>
-        <item>263a</item>
-        <item>1f642</item>
-        <item>1f917</item>
-        <item>1f607</item>
-        <item>1f914</item>
-        <item>1f610</item>
-        <item>1f611</item>
-        <item>1f636</item>
-        <item>1f644</item>
-        <item>1f60f</item>
-        <item>1f623</item>
-        <item>1f625</item>
-        <item>1f62e</item>
-        <item>1f910</item>
-        <item>1f62f</item>
-        <item>1f62a</item>
-        <item>1f62b</item>
-        <item>1f634</item>
-        <item>1f60c</item>
-        <item>1f913</item>
-        <item>1f61b</item>
-        <item>1f61c</item>
-        <item>1f61d</item>
-        <!-- Removed for lack of color glyph support.  <item>2639</item>  -->
-        <item>1f641</item>
-        <item>1f612</item>
-        <item>1f613</item>
-        <item>1f614</item>
-        <item>1f615</item>
-        <item>1f616</item>
-        <item>1f643</item>
-        <item>1f637</item>
-        <item>1f912</item>
-        <item>1f915</item>
-        <item>1f911</item>
-        <item>1f632</item>
-        <item>1f61e</item>
-        <item>1f61f</item>
-        <item>1f624</item>
-        <item>1f622</item>
-        <item>1f62d</item>
-        <item>1f626</item>
-        <item>1f627</item>
-        <item>1f628</item>
-        <item>1f629</item>
-        <item>1f62c</item>
-        <item>1f630</item>
-        <item>1f631</item>
-        <item>1f633</item>
-        <item>1f635</item>
-        <item>1f621</item>
-        <item>1f620</item>
-        <item>1f608</item>
-        <item>1f47f</item>
-        <item>1f479</item>
-        <item>1f47a</item>
-        <item>1f480</item>
-        <!-- Removed for lack of color glyph support.  <item>2620</item>  -->
-        <item>1f47b</item>
-        <item>1f47d</item>
-        <item>1f47e</item>
-        <item>1f916</item>
-        <item>1f4a9</item>
-        <item>1f63a</item>
-        <item>1f638</item>
-        <item>1f639</item>
-        <item>1f63b</item>
-        <item>1f63c</item>
-        <item>1f63d</item>
-        <item>1f640</item>
-        <item>1f63f</item>
-        <item>1f63e</item>
-        <item>1f648</item>
-        <item>1f649</item>
-        <item>1f64a</item>
-        <item>1f466</item>
-        <item>1f467</item>
-        <item>1f468</item>
-        <item>1f469</item>
-        <item>1f474</item>
-        <item>1f475</item>
-        <item>1f476</item>
-        <item>1f471</item>
-        <item>1f46e</item>
-        <item>1f472</item>
-        <item>1f473</item>
-        <item>1f477</item>
-        <!-- Removed for lack of color glyph support.  <item>26d1</item>  -->
-        <item>1f478</item>
-        <item>1f482</item>
-        <item>1f575</item>
-        <item>1f385</item>
-        <item>1f47c</item>
-        <item>1f46f</item>
-        <item>1f486</item>
-        <item>1f487</item>
-        <item>1f470</item>
-        <item>1f64d</item>
-        <item>1f64e</item>
-        <item>1f645</item>
-        <item>1f646</item>
-        <item>1f481</item>
-        <item>1f64b</item>
-        <item>1f647</item>
-        <item>1f64c</item>
-        <item>1f64f</item>
-        <item>1f5e3</item>
-        <item>1f464</item>
-        <item>1f465</item>
-        <item>1f6b6</item>
-        <item>1f3c3</item>
-        <item>1f483</item>
-        <item>1f574</item>
-        <item>1f46b</item>
-        <item>1f46c</item>
-        <item>1f46d</item>
-        <item>1f48f</item>
-        <item>1f491</item>
-        <item>1f46a</item>
-        <!-- Removed for lack of color glyph support.  <item>1f3fb</item>  -->
-        <!-- Removed for lack of color glyph support.  <item>1f3fc</item>  -->
-        <!-- Removed for lack of color glyph support.  <item>1f3fd</item>  -->
-        <!-- Removed for lack of color glyph support.  <item>1f3fe</item>  -->
-        <!-- Removed for lack of color glyph support.  <item>1f3ff</item>  -->
-        <item>1f4aa</item>
-        <item>1f448</item>
-        <item>1f449</item>
-        <item>261d</item>
-        <item>1f446</item>
-        <item>1f595</item>
-        <item>1f447</item>
-        <item>270c</item>
-        <item>1f596</item>
-        <item>1f918</item>
-        <item>1f590</item>
-        <item>270a</item>
-        <item>270b</item>
-        <item>1f44a</item>
-        <item>1f44c</item>
-        <item>1f44d</item>
-        <item>1f44e</item>
-        <item>1f44b</item>
-        <item>1f44f</item>
-        <item>1f450</item>
-        <!-- Removed for lack of color glyph support.  <item>270d</item>  -->
-        <item>1f485</item>
-        <item>1f442</item>
-        <item>1f443</item>
-        <item>1f463</item>
-        <item>1f440</item>
-        <item>1f441</item>
-        <item>1f445</item>
-        <item>1f444</item>
-        <item>1f48b</item>
-        <item>1f498</item>
-        <item>2764</item>
-        <item>1f493</item>
-        <item>1f494</item>
-        <item>1f495</item>
-        <item>1f496</item>
-        <item>1f497</item>
-        <item>1f499</item>
-        <item>1f49a</item>
-        <item>1f49b</item>
-        <item>1f49c</item>
-        <item>1f49d</item>
-        <item>1f49e</item>
-        <item>1f49f</item>
-        <!-- Removed for lack of color glyph support.  <item>2763</item>  -->
-        <item>1f48c</item>
-        <item>1f4a4</item>
-        <item>1f4a2</item>
-        <item>1f4a3</item>
-        <item>1f4a5</item>
-        <item>1f4a6</item>
-        <item>1f4a8</item>
-        <item>1f4ab</item>
-        <item>1f4ac</item>
-        <item>1f5e8</item>
-        <item>1f5ef</item>
-        <item>1f4ad</item>
-        <item>1f573</item>
-        <item>1f453</item>
-        <item>1f576</item>
-        <item>1f454</item>
-        <item>1f455</item>
-        <item>1f456</item>
-        <item>1f457</item>
-        <item>1f458</item>
-        <item>1f459</item>
-        <item>1f45a</item>
-        <item>1f45b</item>
-        <item>1f45c</item>
-        <item>1f45d</item>
-        <item>1f6cd</item>
-        <item>1f392</item>
-        <item>1f45e</item>
-        <item>1f45f</item>
-        <item>1f460</item>
-        <item>1f461</item>
-        <item>1f462</item>
-        <item>1f451</item>
-        <item>1f452</item>
-        <item>1f3a9</item>
-        <item>1f393</item>
-        <item>1f4ff</item>
-        <item>1f484</item>
-        <item>1f48d</item>
-        <item>1f48e</item>
-    </array>
-    <array
-        name="emoji_eight_food_drink"
-        format="string"
-    >
-        <item>1f347</item>
-        <item>1f348</item>
-        <item>1f349</item>
-        <item>1f34a</item>
-        <item>1f34b</item>
-        <item>1f34c</item>
-        <item>1f34d</item>
-        <item>1f34e</item>
-        <item>1f34f</item>
-        <item>1f350</item>
-        <item>1f351</item>
-        <item>1f352</item>
-        <item>1f353</item>
-        <item>1f345</item>
-        <item>1f346</item>
-        <item>1f33d</item>
-        <item>1f336</item>
-        <item>1f344</item>
-        <item>1f330</item>
-        <item>1f35e</item>
-        <item>1f9c0</item>
-        <item>1f356</item>
-        <item>1f357</item>
-        <item>1f354</item>
-        <item>1f35f</item>
-        <item>1f355</item>
-        <item>1f32d</item>
-        <item>1f32e</item>
-        <item>1f32f</item>
-        <item>1f37f</item>
-        <item>1f372</item>
-        <item>1f371</item>
-        <item>1f358</item>
-        <item>1f359</item>
-        <item>1f35a</item>
-        <item>1f35b</item>
-        <item>1f35c</item>
-        <item>1f35d</item>
-        <item>1f360</item>
-        <item>1f362</item>
-        <item>1f363</item>
-        <item>1f364</item>
-        <item>1f365</item>
-        <item>1f361</item>
-        <item>1f366</item>
-        <item>1f367</item>
-        <item>1f368</item>
-        <item>1f369</item>
-        <item>1f36a</item>
-        <item>1f382</item>
-        <item>1f370</item>
-        <item>1f36b</item>
-        <item>1f36c</item>
-        <item>1f36d</item>
-        <item>1f36e</item>
-        <item>1f36f</item>
-        <item>1f37c</item>
-        <item>2615</item>
-        <item>1f375</item>
-        <item>1f376</item>
-        <item>1f37e</item>
-        <item>1f377</item>
-        <item>1f378</item>
-        <item>1f379</item>
-        <item>1f37a</item>
-        <item>1f37b</item>
-        <item>1f37d</item>
-        <item>1f374</item>
-        <item>1f373</item>
-        <item>1f3fa</item>
-    </array>
-    <array
-        name="emoji_eight_objects"
-        format="string"
-    >
-        <item>1f507</item>
-        <item>1f508</item>
-        <item>1f509</item>
-        <item>1f50a</item>
-        <item>1f4e2</item>
-        <item>1f4e3</item>
-        <item>1f4ef</item>
-        <item>1f514</item>
-        <item>1f515</item>
-        <item>1f3bc</item>
-        <item>1f3b5</item>
-        <item>1f3b6</item>
-        <item>1f399</item>
-        <item>1f39a</item>
-        <item>1f39b</item>
-        <item>1f3a4</item>
-        <item>1f3a7</item>
-        <item>1f3b7</item>
-        <item>1f3b8</item>
-        <item>1f3b9</item>
-        <item>1f3ba</item>
-        <item>1f3bb</item>
-        <item>1f4fb</item>
-        <item>1f4f1</item>
-        <item>1f4f2</item>
-        <item>260e</item>
-        <item>1f4de</item>
-        <item>1f4df</item>
-        <item>1f4e0</item>
-        <item>1f50b</item>
-        <item>1f50c</item>
-        <item>1f4bb</item>
-        <item>1f5a5</item>
-        <item>1f5a8</item>
-        <item>2328</item>
-        <item>1f5b1</item>
-        <item>1f5b2</item>
-        <item>1f4bd</item>
-        <item>1f4be</item>
-        <item>1f4bf</item>
-        <item>1f4c0</item>
-        <item>1f3a5</item>
-        <item>1f3ac</item>
-        <item>1f4fd</item>
-        <item>1f4fa</item>
-        <item>1f4f7</item>
-        <item>1f4f8</item>
-        <item>1f4f9</item>
-        <item>1f4fc</item>
-        <item>1f50d</item>
-        <item>1f50e</item>
-        <item>1f52c</item>
-        <item>1f52d</item>
-        <item>1f4e1</item>
-        <item>1f56f</item>
-        <item>1f4a1</item>
-        <item>1f526</item>
-        <item>1f3ee</item>
-        <item>1f4d4</item>
-        <item>1f4d5</item>
-        <item>1f4d6</item>
-        <item>1f4d7</item>
-        <item>1f4d8</item>
-        <item>1f4d9</item>
-        <item>1f4da</item>
-        <item>1f4d3</item>
-        <item>1f4d2</item>
-        <item>1f4c3</item>
-        <item>1f4dc</item>
-        <item>1f4c4</item>
-        <item>1f4f0</item>
-        <item>1f5de</item>
-        <item>1f4d1</item>
-        <item>1f516</item>
-        <item>1f4b0</item>
-        <item>1f4b4</item>
-        <item>1f4b5</item>
-        <item>1f4b6</item>
-        <item>1f4b7</item>
-        <item>1f4b8</item>
-        <item>1f4b3</item>
-        <item>1f4b9</item>
-        <item>2709</item>
-        <item>1f4e7</item>
-        <item>1f4e8</item>
-        <item>1f4e9</item>
-        <item>1f4e4</item>
-        <item>1f4e5</item>
-        <item>1f4e6</item>
-        <item>1f4eb</item>
-        <item>1f4ea</item>
-        <item>1f4ec</item>
-        <item>1f4ed</item>
-        <item>1f4ee</item>
-        <item>1f5f3</item>
-        <item>270f</item>
-        <item>2712</item>
-        <item>1f58b</item>
-        <item>1f58a</item>
-        <item>1f58c</item>
-        <item>1f58d</item>
-        <item>1f4dd</item>
-        <item>1f4bc</item>
-        <item>1f4c1</item>
-        <item>1f4c2</item>
-        <item>1f5c2</item>
-        <item>1f4c5</item>
-        <item>1f4c6</item>
-        <item>1f5d2</item>
-        <item>1f5d3</item>
-        <item>1f4c7</item>
-        <item>1f4c8</item>
-        <item>1f4c9</item>
-        <item>1f4ca</item>
-        <item>1f4cb</item>
-        <item>1f4cc</item>
-        <item>1f4cd</item>
-        <item>1f4ce</item>
-        <item>1f587</item>
-        <item>1f4cf</item>
-        <item>1f4d0</item>
-        <item>2702</item>
-        <item>1f5c3</item>
-        <item>1f5c4</item>
-        <item>1f5d1</item>
-        <item>1f512</item>
-        <item>1f513</item>
-        <item>1f50f</item>
-        <item>1f510</item>
-        <item>1f511</item>
-        <item>1f5dd</item>
-        <item>1f528</item>
-        <!-- Removed for lack of color glyph support.  <item>26cf</item>  -->
-        <!-- Removed for lack of color glyph support.  <item>2692</item>  -->
-        <item>1f6e0</item>
-        <item>1f527</item>
-        <item>1f529</item>
-        <!-- Removed for lack of color glyph support.  <item>2699</item>  -->
-        <item>1f5dc</item>
-        <!-- Removed for lack of color glyph support.  <item>2697</item>  -->
-        <!-- Removed for lack of color glyph support.  <item>2696</item>  -->
-        <item>1f517</item>
-        <!-- Removed for lack of color glyph support.  <item>26d3</item>  -->
-        <item>1f489</item>
-        <item>1f48a</item>
-        <item>1f5e1</item>
-        <item>1f52a</item>
-        <!-- Removed for lack of color glyph support.  <item>2694</item>  -->
-        <item>1f52b</item>
-        <item>1f6e1</item>
-        <item>1f3f9</item>
-        <item>1f6ac</item>
-        <!-- Removed for lack of color glyph support.  <item>26b0</item>  -->
-        <!-- Removed for lack of color glyph support.  <item>26b1</item>  -->
-        <item>1f5ff</item>
-        <item>1f6e2</item>
-        <item>1f52e</item>
-    </array>
-    <array
-        name="emoji_eight_activity"
-        format="string"
-    >
-        <item>1f383</item>
-        <item>1f384</item>
-        <item>1f386</item>
-        <item>1f387</item>
-        <item>2728</item>
-        <item>1f388</item>
-        <item>1f389</item>
-        <item>1f38a</item>
-        <item>1f38b</item>
-        <item>1f38c</item>
-        <item>1f38d</item>
-        <item>1f38e</item>
-        <item>1f38f</item>
-        <item>1f390</item>
-        <item>1f391</item>
-        <item>1f380</item>
-        <item>1f381</item>
-        <item>1f396</item>
-        <item>1f397</item>
-        <item>1f39e</item>
-        <item>1f39f</item>
-        <item>1f3ab</item>
-        <item>1f3f7</item>
-        <item>26bd</item>
-        <item>26be</item>
-        <item>1f3c0</item>
-        <item>1f3c8</item>
-        <item>1f3c9</item>
-        <item>1f3be</item>
-        <item>1f3b1</item>
-        <item>1f3b3</item>
-        <item>26f3</item>
-        <item>1f3cc</item>
-        <!-- Removed for lack of color glyph support.  <item>26f8</item>  -->
-        <item>1f3a3</item>
-        <item>1f3bd</item>
-        <item>1f3bf</item>
-        <!-- Removed for lack of color glyph support.  <item>26f7</item>  -->
-        <item>1f3c2</item>
-        <item>1f3c4</item>
-        <item>1f3c7</item>
-        <item>1f3ca</item>
-        <!-- Removed for lack of color glyph support.  <item>26f9</item>  -->
-        <item>1f3cb</item>
-        <item>1f6b4</item>
-        <item>1f6b5</item>
-        <item>1f3ce</item>
-        <item>1f3cd</item>
-        <item>1f3c5</item>
-        <item>1f3c6</item>
-        <item>1f3cf</item>
-        <item>1f3d0</item>
-        <item>1f3d1</item>
-        <item>1f3d2</item>
-        <item>1f3d3</item>
-        <item>1f3f8</item>
-        <item>1f3af</item>
-        <item>1f3ae</item>
-        <item>1f579</item>
-        <item>1f3b2</item>
-        <item>2660</item>
-        <item>2665</item>
-        <item>2666</item>
-        <item>2663</item>
-        <item>1f0cf</item>
-        <item>1f004</item>
-        <item>1f3b4</item>
-    </array>
-    <array
-        name="emoji_eight_travel_places"
-        format="string"
-    >
-        <item>1f30d</item>
-        <item>1f30e</item>
-        <item>1f30f</item>
-        <item>1f310</item>
-        <item>1f5fa</item>
-        <item>1f3d4</item>
-        <!-- Removed for lack of color glyph support.  <item>26f0</item>  -->
-        <item>1f30b</item>
-        <item>1f5fb</item>
-        <item>1f3d5</item>
-        <item>1f3d6</item>
-        <item>1f3dc</item>
-        <item>1f3dd</item>
-        <item>1f3de</item>
-        <item>1f3df</item>
-        <item>1f3db</item>
-        <item>1f3d7</item>
-        <item>1f3d8</item>
-        <item>1f3d9</item>
-        <item>1f3da</item>
-        <item>1f3e0</item>
-        <item>1f3e1</item>
-        <item>26ea</item>
-        <item>1f54b</item>
-        <item>1f54c</item>
-        <item>1f54d</item>
-        <!-- Removed for lack of color glyph support.  <item>26e9</item>  -->
-        <item>1f3e2</item>
-        <item>1f3e3</item>
-        <item>1f3e4</item>
-        <item>1f3e5</item>
-        <item>1f3e6</item>
-        <item>1f3e8</item>
-        <item>1f3e9</item>
-        <item>1f3ea</item>
-        <item>1f3eb</item>
-        <item>1f3ec</item>
-        <item>1f3ed</item>
-        <item>1f3ef</item>
-        <item>1f3f0</item>
-        <item>1f492</item>
-        <item>1f5fc</item>
-        <item>1f5fd</item>
-        <item>1f5fe</item>
-        <item>26f2</item>
-        <item>26fa</item>
-        <item>1f301</item>
-        <item>1f303</item>
-        <item>1f304</item>
-        <item>1f305</item>
-        <item>1f306</item>
-        <item>1f307</item>
-        <item>1f309</item>
-        <item>2668</item>
-        <item>1f30c</item>
-        <item>1f3a0</item>
-        <item>1f3a1</item>
-        <item>1f3a2</item>
-        <item>1f488</item>
-        <item>1f3aa</item>
-        <item>1f3ad</item>
-        <item>1f5bc</item>
-        <item>1f3a8</item>
-        <item>1f3b0</item>
-        <item>1f682</item>
-        <item>1f683</item>
-        <item>1f684</item>
-        <item>1f685</item>
-        <item>1f686</item>
-        <item>1f687</item>
-        <item>1f688</item>
-        <item>1f689</item>
-        <item>1f68a</item>
-        <item>1f69d</item>
-        <item>1f69e</item>
-        <item>1f68b</item>
-        <item>1f68c</item>
-        <item>1f68d</item>
-        <item>1f68e</item>
-        <item>1f68f</item>
-        <item>1f690</item>
-        <item>1f691</item>
-        <item>1f692</item>
-        <item>1f693</item>
-        <item>1f694</item>
-        <item>1f695</item>
-        <item>1f696</item>
-        <item>1f697</item>
-        <item>1f698</item>
-        <item>1f699</item>
-        <item>1f69a</item>
-        <item>1f69b</item>
-        <item>1f69c</item>
-        <item>1f6b2</item>
-        <item>26fd</item>
-        <item>1f6e3</item>
-        <item>1f6e4</item>
-        <item>1f6a8</item>
-        <item>1f6a5</item>
-        <item>1f6a6</item>
-        <item>1f6a7</item>
-        <item>2693</item>
-        <item>26f5</item>
-        <item>1f6a3</item>
-        <item>1f6a4</item>
-        <item>1f6f3</item>
-        <!-- Removed for lack of color glyph support.  <item>26f4</item>  -->
-        <item>1f6e5</item>
-        <item>1f6a2</item>
-        <item>2708</item>
-        <item>1f6e9</item>
-        <item>1f6eb</item>
-        <item>1f6ec</item>
-        <item>1f4ba</item>
-        <item>1f681</item>
-        <item>1f69f</item>
-        <item>1f6a0</item>
-        <item>1f6a1</item>
-        <item>1f680</item>
-        <item>1f6f0</item>
-        <item>1f6ce</item>
-        <item>1f6aa</item>
-        <item>1f6cc</item>
-        <item>1f6cf</item>
-        <item>1f6cb</item>
-        <item>1f6bd</item>
-        <item>1f6bf</item>
-        <item>1f6c0</item>
-        <item>1f6c1</item>
-        <item>231b</item>
-        <item>23f3</item>
-        <item>231a</item>
-        <item>23f0</item>
-        <!-- Removed for lack of color glyph support.  <item>23f1</item>  -->
-        <!-- Removed for lack of color glyph support.  <item>23f2</item>  -->
-        <item>1f570</item>
-        <item>1f55b</item>
-        <item>1f567</item>
-        <item>1f550</item>
-        <item>1f55c</item>
-        <item>1f551</item>
-        <item>1f55d</item>
-        <item>1f552</item>
-        <item>1f55e</item>
-        <item>1f553</item>
-        <item>1f55f</item>
-        <item>1f554</item>
-        <item>1f560</item>
-        <item>1f555</item>
-        <item>1f561</item>
-        <item>1f556</item>
-        <item>1f562</item>
-        <item>1f557</item>
-        <item>1f563</item>
-        <item>1f558</item>
-        <item>1f564</item>
-        <item>1f559</item>
-        <item>1f565</item>
-        <item>1f55a</item>
-        <item>1f566</item>
-        <item>1f311</item>
-        <item>1f312</item>
-        <item>1f313</item>
-        <item>1f314</item>
-        <item>1f315</item>
-        <item>1f316</item>
-        <item>1f317</item>
-        <item>1f318</item>
-        <item>1f319</item>
-        <item>1f31a</item>
-        <item>1f31b</item>
-        <item>1f31c</item>
-        <item>1f321</item>
-        <item>2600</item>
-        <item>1f31d</item>
-        <item>1f31e</item>
-        <item>2b50</item>
-        <item>1f31f</item>
-        <item>1f320</item>
-        <item>2601</item>
-        <item>26c5</item>
-        <!-- Removed for lack of color glyph support.  <item>26c8</item>  -->
-        <item>1f324</item>
-        <item>1f325</item>
-        <item>1f326</item>
-        <item>1f327</item>
-        <item>1f328</item>
-        <item>1f329</item>
-        <item>1f32a</item>
-        <item>1f32b</item>
-        <item>1f32c</item>
-        <item>1f300</item>
-        <item>1f308</item>
-        <item>1f302</item>
-        <!-- Removed for lack of color glyph support.  <item>2602</item>  -->
-        <item>2614</item>
-        <!-- Removed for lack of color glyph support.  <item>26f1</item>  -->
-        <item>26a1</item>
-        <item>2744</item>
-        <!-- Removed for lack of color glyph support.  <item>2603</item>  -->
-        <item>26c4</item>
-        <!-- Removed for lack of color glyph support.  <item>2604</item>  -->
-        <item>1f525</item>
-        <item>1f4a7</item>
-        <item>1f30a</item>
-    </array>
-    <array
-        name="emoji_eight_flags"
-        format="string"
-    >
-        <item>1f1e6,1f1e8</item>
-        <item>1f1e6,1f1e9</item>
-        <item>1f1e6,1f1ea</item>
-        <item>1f1e6,1f1eb</item>
-        <item>1f1e6,1f1ec</item>
-        <item>1f1e6,1f1ee</item>
-        <item>1f1e6,1f1f1</item>
-        <item>1f1e6,1f1f2</item>
-        <item>1f1e6,1f1f4</item>
-        <item>1f1e6,1f1f6</item>
-        <item>1f1e6,1f1f7</item>
-        <item>1f1e6,1f1f8</item>
-        <item>1f1e6,1f1f9</item>
-        <item>1f1e6,1f1fa</item>
-        <item>1f1e6,1f1fc</item>
-        <item>1f1e6,1f1fd</item>
-        <item>1f1e6,1f1ff</item>
-        <item>1f1e7,1f1e6</item>
-        <item>1f1e7,1f1e7</item>
-        <item>1f1e7,1f1e9</item>
-        <item>1f1e7,1f1ea</item>
-        <item>1f1e7,1f1eb</item>
-        <item>1f1e7,1f1ec</item>
-        <item>1f1e7,1f1ed</item>
-        <item>1f1e7,1f1ee</item>
-        <item>1f1e7,1f1ef</item>
-        <item>1f1e7,1f1f1</item>
-        <item>1f1e7,1f1f2</item>
-        <item>1f1e7,1f1f3</item>
-        <item>1f1e7,1f1f4</item>
-        <item>1f1e7,1f1f6</item>
-        <item>1f1e7,1f1f7</item>
-        <item>1f1e7,1f1f8</item>
-        <item>1f1e7,1f1f9</item>
-        <item>1f1e7,1f1fb</item>
-        <item>1f1e7,1f1fc</item>
-        <item>1f1e7,1f1fe</item>
-        <item>1f1e7,1f1ff</item>
-        <item>1f1e8,1f1e6</item>
-        <item>1f1e8,1f1e8</item>
-        <item>1f1e8,1f1e9</item>
-        <item>1f1e8,1f1eb</item>
-        <item>1f1e8,1f1ec</item>
-        <item>1f1e8,1f1ed</item>
-        <item>1f1e8,1f1ee</item>
-        <item>1f1e8,1f1f0</item>
-        <item>1f1e8,1f1f1</item>
-        <item>1f1e8,1f1f2</item>
-        <item>1f1e8,1f1f3</item>
-        <item>1f1e8,1f1f4</item>
-        <item>1f1e8,1f1f5</item>
-        <item>1f1e8,1f1f7</item>
-        <item>1f1e8,1f1fa</item>
-        <item>1f1e8,1f1fb</item>
-        <item>1f1e8,1f1fc</item>
-        <item>1f1e8,1f1fd</item>
-        <item>1f1e8,1f1fe</item>
-        <item>1f1e8,1f1ff</item>
-        <item>1f1e9,1f1ea</item>
-        <item>1f1e9,1f1ec</item>
-        <item>1f1e9,1f1ef</item>
-        <item>1f1e9,1f1f0</item>
-        <item>1f1e9,1f1f2</item>
-        <item>1f1e9,1f1f4</item>
-        <item>1f1e9,1f1ff</item>
-        <item>1f1ea,1f1e6</item>
-        <item>1f1ea,1f1e8</item>
-        <item>1f1ea,1f1ea</item>
-        <item>1f1ea,1f1ec</item>
-        <item>1f1ea,1f1ed</item>
-        <item>1f1ea,1f1f7</item>
-        <item>1f1ea,1f1f8</item>
-        <item>1f1ea,1f1f9</item>
-        <item>1f1ea,1f1fa</item>
-        <item>1f1eb,1f1ee</item>
-        <item>1f1eb,1f1ef</item>
-        <item>1f1eb,1f1f0</item>
-        <item>1f1eb,1f1f2</item>
-        <item>1f1eb,1f1f4</item>
-        <item>1f1eb,1f1f7</item>
-        <item>1f1ec,1f1e6</item>
-        <item>1f1ec,1f1e7</item>
-        <item>1f1ec,1f1e9</item>
-        <item>1f1ec,1f1ea</item>
-        <item>1f1ec,1f1eb</item>
-        <item>1f1ec,1f1ec</item>
-        <item>1f1ec,1f1ed</item>
-        <item>1f1ec,1f1ee</item>
-        <item>1f1ec,1f1f1</item>
-        <item>1f1ec,1f1f2</item>
-        <item>1f1ec,1f1f3</item>
-        <item>1f1ec,1f1f5</item>
-        <item>1f1ec,1f1f6</item>
-        <item>1f1ec,1f1f7</item>
-        <item>1f1ec,1f1f8</item>
-        <item>1f1ec,1f1f9</item>
-        <item>1f1ec,1f1fa</item>
-        <item>1f1ec,1f1fc</item>
-        <item>1f1ec,1f1fe</item>
-        <item>1f1ed,1f1f0</item>
-        <item>1f1ed,1f1f2</item>
-        <item>1f1ed,1f1f3</item>
-        <item>1f1ed,1f1f7</item>
-        <item>1f1ed,1f1f9</item>
-        <item>1f1ed,1f1fa</item>
-        <item>1f1ee,1f1e8</item>
-        <item>1f1ee,1f1e9</item>
-        <item>1f1ee,1f1ea</item>
-        <item>1f1ee,1f1f1</item>
-        <item>1f1ee,1f1f2</item>
-        <item>1f1ee,1f1f3</item>
-        <item>1f1ee,1f1f4</item>
-        <item>1f1ee,1f1f6</item>
-        <item>1f1ee,1f1f7</item>
-        <item>1f1ee,1f1f8</item>
-        <item>1f1ee,1f1f9</item>
-        <item>1f1ef,1f1ea</item>
-        <item>1f1ef,1f1f2</item>
-        <item>1f1ef,1f1f4</item>
-        <item>1f1ef,1f1f5</item>
-        <item>1f1f0,1f1ea</item>
-        <item>1f1f0,1f1ec</item>
-        <item>1f1f0,1f1ed</item>
-        <item>1f1f0,1f1ee</item>
-        <item>1f1f0,1f1f2</item>
-        <item>1f1f0,1f1f3</item>
-        <item>1f1f0,1f1f5</item>
-        <item>1f1f0,1f1f7</item>
-        <item>1f1f0,1f1fc</item>
-        <item>1f1f0,1f1fe</item>
-        <item>1f1f0,1f1ff</item>
-        <item>1f1f1,1f1e6</item>
-        <item>1f1f1,1f1e7</item>
-        <item>1f1f1,1f1e8</item>
-        <item>1f1f1,1f1ee</item>
-        <item>1f1f1,1f1f0</item>
-        <item>1f1f1,1f1f7</item>
-        <item>1f1f1,1f1f8</item>
-        <item>1f1f1,1f1f9</item>
-        <item>1f1f1,1f1fa</item>
-        <item>1f1f1,1f1fb</item>
-        <item>1f1f1,1f1fe</item>
-        <item>1f1f2,1f1e6</item>
-        <item>1f1f2,1f1e8</item>
-        <item>1f1f2,1f1e9</item>
-        <item>1f1f2,1f1ea</item>
-        <item>1f1f2,1f1eb</item>
-        <item>1f1f2,1f1ec</item>
-        <item>1f1f2,1f1ed</item>
-        <item>1f1f2,1f1f0</item>
-        <item>1f1f2,1f1f1</item>
-        <item>1f1f2,1f1f2</item>
-        <item>1f1f2,1f1f3</item>
-        <item>1f1f2,1f1f4</item>
-        <item>1f1f2,1f1f5</item>
-        <item>1f1f2,1f1f6</item>
-        <item>1f1f2,1f1f7</item>
-        <item>1f1f2,1f1f8</item>
-        <item>1f1f2,1f1f9</item>
-        <item>1f1f2,1f1fa</item>
-        <item>1f1f2,1f1fb</item>
-        <item>1f1f2,1f1fc</item>
-        <item>1f1f2,1f1fd</item>
-        <item>1f1f2,1f1fe</item>
-        <item>1f1f2,1f1ff</item>
-        <item>1f1f3,1f1e6</item>
-        <item>1f1f3,1f1e8</item>
-        <item>1f1f3,1f1ea</item>
-        <item>1f1f3,1f1eb</item>
-        <item>1f1f3,1f1ec</item>
-        <item>1f1f3,1f1ee</item>
-        <item>1f1f3,1f1f1</item>
-        <item>1f1f3,1f1f4</item>
-        <item>1f1f3,1f1f5</item>
-        <item>1f1f3,1f1f7</item>
-        <item>1f1f3,1f1fa</item>
-        <item>1f1f3,1f1ff</item>
-        <item>1f1f4,1f1f2</item>
-        <item>1f1f5,1f1e6</item>
-        <item>1f1f5,1f1ea</item>
-        <item>1f1f5,1f1eb</item>
-        <item>1f1f5,1f1ec</item>
-        <item>1f1f5,1f1ed</item>
-        <item>1f1f5,1f1f0</item>
-        <item>1f1f5,1f1f1</item>
-        <item>1f1f5,1f1f2</item>
-        <item>1f1f5,1f1f3</item>
-        <item>1f1f5,1f1f7</item>
-        <item>1f1f5,1f1f8</item>
-        <item>1f1f5,1f1f9</item>
-        <item>1f1f5,1f1fc</item>
-        <item>1f1f5,1f1fe</item>
-        <item>1f1f6,1f1e6</item>
-        <item>1f1f7,1f1ea</item>
-        <item>1f1f7,1f1f4</item>
-        <item>1f1f7,1f1f8</item>
-        <item>1f1f7,1f1fa</item>
-        <item>1f1f7,1f1fc</item>
-        <item>1f1f8,1f1e6</item>
-        <item>1f1f8,1f1e7</item>
-        <item>1f1f8,1f1e8</item>
-        <item>1f1f8,1f1e9</item>
-        <item>1f1f8,1f1ea</item>
-        <item>1f1f8,1f1ec</item>
-        <item>1f1f8,1f1ed</item>
-        <item>1f1f8,1f1ee</item>
-        <item>1f1f8,1f1ef</item>
-        <item>1f1f8,1f1f0</item>
-        <item>1f1f8,1f1f1</item>
-        <item>1f1f8,1f1f2</item>
-        <item>1f1f8,1f1f3</item>
-        <item>1f1f8,1f1f4</item>
-        <item>1f1f8,1f1f7</item>
-        <item>1f1f8,1f1f8</item>
-        <item>1f1f8,1f1f9</item>
-        <item>1f1f8,1f1fb</item>
-        <item>1f1f8,1f1fd</item>
-        <item>1f1f8,1f1fe</item>
-        <item>1f1f8,1f1ff</item>
-        <item>1f1f9,1f1e6</item>
-        <item>1f1f9,1f1e8</item>
-        <item>1f1f9,1f1e9</item>
-        <item>1f1f9,1f1eb</item>
-        <item>1f1f9,1f1ec</item>
-        <item>1f1f9,1f1ed</item>
-        <item>1f1f9,1f1ef</item>
-        <item>1f1f9,1f1f0</item>
-        <item>1f1f9,1f1f1</item>
-        <item>1f1f9,1f1f2</item>
-        <item>1f1f9,1f1f3</item>
-        <item>1f1f9,1f1f4</item>
-        <item>1f1f9,1f1f7</item>
-        <item>1f1f9,1f1f9</item>
-        <item>1f1f9,1f1fb</item>
-        <item>1f1f9,1f1fc</item>
-        <item>1f1f9,1f1ff</item>
-        <item>1f1fa,1f1e6</item>
-        <item>1f1fa,1f1ec</item>
-        <item>1f1fa,1f1f2</item>
-        <item>1f1fa,1f1f8</item>
-        <item>1f1fa,1f1fe</item>
-        <item>1f1fa,1f1ff</item>
-        <item>1f1fb,1f1e6</item>
-        <item>1f1fb,1f1e8</item>
-        <item>1f1fb,1f1ea</item>
-        <item>1f1fb,1f1ec</item>
-        <item>1f1fb,1f1ee</item>
-        <item>1f1fb,1f1f3</item>
-        <item>1f1fb,1f1fa</item>
-        <item>1f1fc,1f1eb</item>
-        <item>1f1fc,1f1f8</item>
-        <item>1f1fd,1f1f0</item>
-        <item>1f1fe,1f1ea</item>
-        <item>1f1fe,1f1f9</item>
-        <item>1f1ff,1f1e6</item>
-        <item>1f1ff,1f1f2</item>
-        <item>1f1ff,1f1fc</item>
-    </array>
 </resources>
diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml
index 8ff5a87..d9e42f1 100644
--- a/java/res/values/attrs.xml
+++ b/java/res/values/attrs.xml
@@ -2,7 +2,7 @@
 <!--
 /*
 **
-** Copyright 2015, The Android Open Source Project
+** Copyright 2010, The Android Open Source Project
 **
 ** Licensed under the Apache License, Version 2.0 (the "License");
 ** you may not use this file except in compliance with the License.
@@ -199,16 +199,6 @@
         <attr name="iconEmojiCategory4Tab" format="reference" />
         <attr name="iconEmojiCategory5Tab" format="reference" />
         <attr name="iconEmojiCategory6Tab" format="reference" />
-        <attr name="iconEmojiCategory7Tab" format="reference" />
-        <attr name="iconEmojiCategory8Tab" format="reference" />
-        <attr name="iconEmojiCategory9Tab" format="reference" />
-        <attr name="iconEmojiCategory10Tab" format="reference" />
-        <attr name="iconEmojiCategory11Tab" format="reference" />
-        <attr name="iconEmojiCategory12Tab" format="reference" />
-        <attr name="iconEmojiCategory13Tab" format="reference" />
-        <attr name="iconEmojiCategory14Tab" format="reference" />
-        <attr name="iconEmojiCategory15Tab" format="reference" />
-        <attr name="iconEmojiCategory16Tab" format="reference" />
     </declare-styleable>
 
     <declare-styleable name="SuggestionStripView">
@@ -464,16 +454,6 @@
             <enum name="emojiCategory4" value="14" />
             <enum name="emojiCategory5" value="15" />
             <enum name="emojiCategory6" value="16" />
-            <enum name="emojiCategory7" value="17" />
-            <enum name="emojiCategory8" value="18" />
-            <enum name="emojiCategory9" value="19" />
-            <enum name="emojiCategory10" value="20" />
-            <enum name="emojiCategory11" value="21" />
-            <enum name="emojiCategory12" value="22" />
-            <enum name="emojiCategory13" value="23" />
-            <enum name="emojiCategory14" value="24" />
-            <enum name="emojiCategory15" value="25" />
-            <enum name="emojiCategory16" value="26" />
         </attr>
         <!-- This should be aligned with Keyboard.themeId and
              {@link com.android.inputmethod.keyboard.KeyboardTheme#THEME_ID_ICS} etc. -->
@@ -549,16 +529,6 @@
             <enum name="emojiCategory4" value="14" />
             <enum name="emojiCategory5" value="15" />
             <enum name="emojiCategory6" value="16" />
-            <enum name="emojiCategory7" value="17" />
-            <enum name="emojiCategory8" value="18" />
-            <enum name="emojiCategory9" value="19" />
-            <enum name="emojiCategory10" value="20" />
-            <enum name="emojiCategory11" value="21" />
-            <enum name="emojiCategory12" value="22" />
-            <enum name="emojiCategory13" value="23" />
-            <enum name="emojiCategory14" value="24" />
-            <enum name="emojiCategory15" value="25" />
-            <enum name="emojiCategory16" value="26" />
         </attr>
         <attr name="elementKeyboard" format="reference"/>
         <!-- Enable proximity characters correction. Disabled by default. -->
diff --git a/java/res/values/strings-talkback-descriptions.xml b/java/res/values/strings-talkback-descriptions.xml
index 307cd47..9644271 100644
--- a/java/res/values/strings-talkback-descriptions.xml
+++ b/java/res/values/strings-talkback-descriptions.xml
@@ -2,7 +2,7 @@
 <!--
 /*
 **
-** Copyright 2015, The Android Open Source Project
+** Copyright 2014, The Android Open Source Project
 **
 ** Licensed under the Apache License, Version 2.0 (the "License");
 ** you may not use this file except in compliance with the License.
@@ -127,18 +127,6 @@
     <string name="spoken_descrption_emoji_category_places">Places</string>
     <!-- Description of the emoji category icon of Symbols. -->
     <string name="spoken_descrption_emoji_category_symbols">Symbols</string>
-    <!-- Description of the emoji category icon of Flags. -->
-    <string name="spoken_descrption_emoji_category_flags">Flags</string>
-    <!-- Description of the emoji category icon of Smiley & People. -->
-    <string name="spoken_descrption_emoji_category_eight_smiley_people">Smiley &amp; People</string>
-    <!-- Description of the emoji category icon of Animals & Nature. -->
-    <string name="spoken_descrption_emoji_category_eight_animals_nature">Animals &amp; Nature</string>
-    <!-- Description of the emoji category icon of Food & Drink. -->
-    <string name="spoken_descrption_emoji_category_eight_food_drink">Food &amp; Drink</string>
-    <!-- Description of the emoji category icon of Travel & Places. -->
-    <string name="spoken_descrption_emoji_category_eight_travel_places">Travel &amp; Places</string>
-    <!-- Description of the emoji category icon of Activity. -->
-    <string name="spoken_descrption_emoji_category_eight_activity">Activity</string>
     <!-- Description of the emoji category icon of Emoticons. -->
     <string name="spoken_descrption_emoji_category_emoticons">Emoticons</string>
 
diff --git a/java/res/values/themes-ics.xml b/java/res/values/themes-ics.xml
index 1a15b0e..26ebd2f 100644
--- a/java/res/values/themes-ics.xml
+++ b/java/res/values/themes-ics.xml
@@ -93,16 +93,6 @@
         <item name="iconEmojiCategory4Tab">@drawable/ic_emoji_places_holo_dark</item>
         <item name="iconEmojiCategory5Tab">@drawable/ic_emoji_symbols_holo_dark</item>
         <item name="iconEmojiCategory6Tab">@drawable/ic_emoji_emoticons_holo_dark</item>
-        <item name="iconEmojiCategory7Tab">@drawable/ic_emoji_flag_holo_dark</item>
-        <item name="iconEmojiCategory8Tab">@drawable/ic_emoji_people_holo_dark</item>
-        <item name="iconEmojiCategory9Tab">@drawable/ic_emoji_nature_holo_dark</item>
-        <item name="iconEmojiCategory10Tab">@drawable/ic_emoji_food_holo_dark</item>
-        <item name="iconEmojiCategory11Tab">@drawable/ic_emoji_places_holo_dark</item>
-        <item name="iconEmojiCategory12Tab">@drawable/ic_emoji_activity_holo_dark</item>
-        <item name="iconEmojiCategory13Tab">@drawable/ic_emoji_objects_holo_dark</item>
-        <item name="iconEmojiCategory14Tab">@drawable/ic_emoji_symbols_holo_dark</item>
-        <item name="iconEmojiCategory15Tab">@drawable/ic_emoji_flag_holo_dark</item>
-        <item name="iconEmojiCategory16Tab">@drawable/ic_emoji_people_holo_dark</item>
     </style>
     <style
         name="MoreKeysKeyboard.ICS"
diff --git a/java/res/values/themes-klp.xml b/java/res/values/themes-klp.xml
index 32884db..c8e11a9 100644
--- a/java/res/values/themes-klp.xml
+++ b/java/res/values/themes-klp.xml
@@ -2,7 +2,7 @@
 <!--
 /*
 **
-** Copyright 2015, The Android Open Source Project
+** Copyright 2013, The Android Open Source Project
 **
 ** Licensed under the Apache License, Version 2.0 (the "License");
 ** you may not use this file except in compliance with the License.
@@ -93,16 +93,6 @@
         <item name="iconEmojiCategory4Tab">@drawable/ic_emoji_places_holo_dark</item>
         <item name="iconEmojiCategory5Tab">@drawable/ic_emoji_symbols_holo_dark</item>
         <item name="iconEmojiCategory6Tab">@drawable/ic_emoji_emoticons_holo_dark</item>
-        <item name="iconEmojiCategory7Tab">@drawable/ic_emoji_flag_holo_dark</item>
-        <item name="iconEmojiCategory8Tab">@drawable/ic_emoji_people_holo_dark</item>
-        <item name="iconEmojiCategory9Tab">@drawable/ic_emoji_nature_holo_dark</item>
-        <item name="iconEmojiCategory10Tab">@drawable/ic_emoji_food_holo_dark</item>
-        <item name="iconEmojiCategory11Tab">@drawable/ic_emoji_places_holo_dark</item>
-        <item name="iconEmojiCategory12Tab">@drawable/ic_emoji_activity_holo_dark</item>
-        <item name="iconEmojiCategory13Tab">@drawable/ic_emoji_objects_holo_dark</item>
-        <item name="iconEmojiCategory14Tab">@drawable/ic_emoji_symbols_holo_dark</item>
-        <item name="iconEmojiCategory15Tab">@drawable/ic_emoji_flag_holo_dark</item>
-        <item name="iconEmojiCategory16Tab">@drawable/ic_emoji_people_holo_dark</item>
     </style>
     <style
         name="MoreKeysKeyboard.KLP"
diff --git a/java/res/values/themes-lxx-dark.xml b/java/res/values/themes-lxx-dark.xml
index cae1f72..0535064 100644
--- a/java/res/values/themes-lxx-dark.xml
+++ b/java/res/values/themes-lxx-dark.xml
@@ -2,7 +2,7 @@
 <!--
 /*
 **
-** Copyright 2015, The Android Open Source Project
+** Copyright 2014, The Android Open Source Project
 **
 ** Licensed under the Apache License, Version 2.0 (the "License");
 ** you may not use this file except in compliance with the License.
@@ -91,16 +91,6 @@
         <item name="iconEmojiCategory4Tab">@drawable/ic_emoji_places_lxx_dark</item>
         <item name="iconEmojiCategory5Tab">@drawable/ic_emoji_symbols_lxx_dark</item>
         <item name="iconEmojiCategory6Tab">@drawable/ic_emoji_emoticons_lxx_dark</item>
-        <item name="iconEmojiCategory7Tab">@drawable/ic_emoji_flag_lxx_dark</item>
-        <item name="iconEmojiCategory8Tab">@drawable/ic_emoji_people_lxx_dark</item>
-        <item name="iconEmojiCategory9Tab">@drawable/ic_emoji_nature_lxx_dark</item>
-        <item name="iconEmojiCategory10Tab">@drawable/ic_emoji_food_lxx_dark</item>
-        <item name="iconEmojiCategory11Tab">@drawable/ic_emoji_places_lxx_dark</item>
-        <item name="iconEmojiCategory12Tab">@drawable/ic_emoji_activity_lxx_dark</item>
-        <item name="iconEmojiCategory13Tab">@drawable/ic_emoji_objects_lxx_dark</item>
-        <item name="iconEmojiCategory14Tab">@drawable/ic_emoji_symbols_lxx_dark</item>
-        <item name="iconEmojiCategory15Tab">@drawable/ic_emoji_flag_lxx_dark</item>
-        <item name="iconEmojiCategory16Tab">@drawable/ic_emoji_people_lxx_dark</item>
     </style>
     <style
         name="MoreKeysKeyboard.LXX_Dark"
diff --git a/java/res/values/themes-lxx-light.xml b/java/res/values/themes-lxx-light.xml
index eecd191..80e88b8 100644
--- a/java/res/values/themes-lxx-light.xml
+++ b/java/res/values/themes-lxx-light.xml
@@ -2,7 +2,7 @@
 <!--
 /*
 **
-** Copyright 2015, The Android Open Source Project
+** Copyright 2014, The Android Open Source Project
 **
 ** Licensed under the Apache License, Version 2.0 (the "License");
 ** you may not use this file except in compliance with the License.
@@ -91,16 +91,6 @@
         <item name="iconEmojiCategory4Tab">@drawable/ic_emoji_places_lxx_light</item>
         <item name="iconEmojiCategory5Tab">@drawable/ic_emoji_symbols_lxx_light</item>
         <item name="iconEmojiCategory6Tab">@drawable/ic_emoji_emoticons_lxx_light</item>
-        <item name="iconEmojiCategory7Tab">@drawable/ic_emoji_flag_lxx_light</item>
-        <item name="iconEmojiCategory8Tab">@drawable/ic_emoji_people_lxx_light</item>
-        <item name="iconEmojiCategory9Tab">@drawable/ic_emoji_nature_lxx_light</item>
-        <item name="iconEmojiCategory10Tab">@drawable/ic_emoji_food_lxx_light</item>
-        <item name="iconEmojiCategory11Tab">@drawable/ic_emoji_places_lxx_light</item>
-        <item name="iconEmojiCategory12Tab">@drawable/ic_emoji_activity_lxx_light</item>
-        <item name="iconEmojiCategory13Tab">@drawable/ic_emoji_objects_lxx_light</item>
-        <item name="iconEmojiCategory14Tab">@drawable/ic_emoji_symbols_lxx_light</item>
-        <item name="iconEmojiCategory15Tab">@drawable/ic_emoji_flag_lxx_light</item>
-        <item name="iconEmojiCategory16Tab">@drawable/ic_emoji_people_lxx_light</item>
     </style>
     <style
         name="MoreKeysKeyboard.LXX_Light"
diff --git a/java/res/xml/kbd_emoji_category10.xml b/java/res/xml/kbd_emoji_category10.xml
deleted file mode 100644
index 44c2def..0000000
--- a/java/res/xml/kbd_emoji_category10.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2015, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
-    latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
-    latin:keyLetterSize="90%p"
-    latin:rowHeight="@fraction/config_emoji_keyboard_row_height"
->
-    <GridRows
-        latin:codesArray="@array/emoji_eight_food_drink"
-        latin:keyLabelFlags="fontNormal"
-        latin:backgroundType="empty" />
-</Keyboard>
diff --git a/java/res/xml/kbd_emoji_category11.xml b/java/res/xml/kbd_emoji_category11.xml
deleted file mode 100644
index bf014b3..0000000
--- a/java/res/xml/kbd_emoji_category11.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2015, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
-    latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
-    latin:keyLetterSize="90%p"
-    latin:rowHeight="@fraction/config_emoji_keyboard_row_height"
->
-    <GridRows
-        latin:codesArray="@array/emoji_eight_travel_places"
-        latin:keyLabelFlags="fontNormal"
-        latin:backgroundType="empty" />
-</Keyboard>
diff --git a/java/res/xml/kbd_emoji_category12.xml b/java/res/xml/kbd_emoji_category12.xml
deleted file mode 100644
index dc6592a..0000000
--- a/java/res/xml/kbd_emoji_category12.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2015, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
-    latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
-    latin:keyLetterSize="90%p"
-    latin:rowHeight="@fraction/config_emoji_keyboard_row_height"
->
-    <GridRows
-        latin:codesArray="@array/emoji_eight_activity"
-        latin:keyLabelFlags="fontNormal"
-        latin:backgroundType="empty" />
-</Keyboard>
diff --git a/java/res/xml/kbd_emoji_category13.xml b/java/res/xml/kbd_emoji_category13.xml
deleted file mode 100644
index 9c1ec8b..0000000
--- a/java/res/xml/kbd_emoji_category13.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2015, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
-    latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
-    latin:keyLetterSize="90%p"
-    latin:rowHeight="@fraction/config_emoji_keyboard_row_height"
->
-    <GridRows
-        latin:codesArray="@array/emoji_eight_objects"
-        latin:keyLabelFlags="fontNormal"
-        latin:backgroundType="empty" />
-</Keyboard>
diff --git a/java/res/xml/kbd_emoji_category14.xml b/java/res/xml/kbd_emoji_category14.xml
deleted file mode 100644
index 6838a8b..0000000
--- a/java/res/xml/kbd_emoji_category14.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2015, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
-    latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
-    latin:keyLetterSize="90%p"
-    latin:rowHeight="@fraction/config_emoji_keyboard_row_height"
->
-    <GridRows
-        latin:codesArray="@array/emoji_eight_symbols"
-        latin:keyLabelFlags="fontNormal"
-        latin:backgroundType="empty" />
-</Keyboard>
diff --git a/java/res/xml/kbd_emoji_category15.xml b/java/res/xml/kbd_emoji_category15.xml
deleted file mode 100644
index a41a586..0000000
--- a/java/res/xml/kbd_emoji_category15.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2015, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
-    latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
-    latin:keyLetterSize="90%p"
-    latin:rowHeight="@fraction/config_emoji_keyboard_row_height"
->
-    <GridRows
-        latin:codesArray="@array/emoji_eight_flags"
-        latin:keyLabelFlags="fontNormal"
-        latin:backgroundType="empty" />
-</Keyboard>
diff --git a/java/res/xml/kbd_emoji_category16.xml b/java/res/xml/kbd_emoji_category16.xml
deleted file mode 100644
index 1a0a742..0000000
--- a/java/res/xml/kbd_emoji_category16.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2015, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
-    latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
-    latin:keyLetterSize="90%p"
-    latin:rowHeight="@fraction/config_emoji_keyboard_row_height"
->
-    <GridRows
-        latin:codesArray="@array/emoji_eight_smiley_people_boring"
-        latin:keyLabelFlags="fontNormal"
-        latin:backgroundType="empty" />
-</Keyboard>
diff --git a/java/res/xml/kbd_emoji_category7.xml b/java/res/xml/kbd_emoji_category7.xml
deleted file mode 100644
index 022ff92..0000000
--- a/java/res/xml/kbd_emoji_category7.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2015, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
-    latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
-    latin:keyLetterSize="90%p"
-    latin:rowHeight="@fraction/config_emoji_keyboard_row_height"
->
-    <GridRows
-        latin:codesArray="@array/emoji_flags"
-        latin:keyLabelFlags="fontNormal"
-        latin:backgroundType="empty" />
-</Keyboard>
diff --git a/java/res/xml/kbd_emoji_category8.xml b/java/res/xml/kbd_emoji_category8.xml
deleted file mode 100644
index eee645b..0000000
--- a/java/res/xml/kbd_emoji_category8.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2015, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
-    latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
-    latin:keyLetterSize="90%p"
-    latin:rowHeight="@fraction/config_emoji_keyboard_row_height"
->
-    <GridRows
-        latin:codesArray="@array/emoji_eight_smiley_people"
-        latin:keyLabelFlags="fontNormal"
-        latin:backgroundType="empty" />
-</Keyboard>
diff --git a/java/res/xml/kbd_emoji_category9.xml b/java/res/xml/kbd_emoji_category9.xml
deleted file mode 100644
index c3b9922..0000000
--- a/java/res/xml/kbd_emoji_category9.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2015, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
-    latin:keyWidth="@fraction/config_emoji_keyboard_key_width"
-    latin:keyLetterSize="90%p"
-    latin:rowHeight="@fraction/config_emoji_keyboard_row_height"
->
-    <GridRows
-        latin:codesArray="@array/emoji_eight_animals_nature"
-        latin:keyLabelFlags="fontNormal"
-        latin:backgroundType="empty" />
-</Keyboard>
diff --git a/java/res/xml/keyboard_layout_set_emoji.xml b/java/res/xml/keyboard_layout_set_emoji.xml
index 120b92b..98e6b6b 100644
--- a/java/res/xml/keyboard_layout_set_emoji.xml
+++ b/java/res/xml/keyboard_layout_set_emoji.xml
@@ -2,7 +2,7 @@
 <!--
 /*
 **
-** Copyright 2015, The Android Open Source Project
+** Copyright 2013, The Android Open Source Project
 **
 ** Licensed under the Apache License, Version 2.0 (the "License");
 ** you may not use this file except in compliance with the License.
@@ -41,34 +41,4 @@
     <Element
         latin:elementName="emojiCategory6"
         latin:elementKeyboard="@xml/kbd_emoji_category6" />
-    <Element
-        latin:elementName="emojiCategory7"
-        latin:elementKeyboard="@xml/kbd_emoji_category7" />
-    <Element
-        latin:elementName="emojiCategory8"
-        latin:elementKeyboard="@xml/kbd_emoji_category8" />
-    <Element
-        latin:elementName="emojiCategory9"
-        latin:elementKeyboard="@xml/kbd_emoji_category9" />
-    <Element
-        latin:elementName="emojiCategory10"
-        latin:elementKeyboard="@xml/kbd_emoji_category10" />
-    <Element
-        latin:elementName="emojiCategory11"
-        latin:elementKeyboard="@xml/kbd_emoji_category11" />
-    <Element
-        latin:elementName="emojiCategory12"
-        latin:elementKeyboard="@xml/kbd_emoji_category12" />
-    <Element
-        latin:elementName="emojiCategory13"
-        latin:elementKeyboard="@xml/kbd_emoji_category13" />
-    <Element
-        latin:elementName="emojiCategory14"
-        latin:elementKeyboard="@xml/kbd_emoji_category14" />
-    <Element
-        latin:elementName="emojiCategory15"
-        latin:elementKeyboard="@xml/kbd_emoji_category15" />
-    <Element
-        latin:elementName="emojiCategory16"
-        latin:elementKeyboard="@xml/kbd_emoji_category16" />
 </KeyboardLayoutSet>
diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardId.java b/java/src/com/android/inputmethod/keyboard/KeyboardId.java
index 7352f91..a1f7bf0 100644
--- a/java/src/com/android/inputmethod/keyboard/KeyboardId.java
+++ b/java/src/com/android/inputmethod/keyboard/KeyboardId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2010 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -60,16 +60,6 @@
     public static final int ELEMENT_EMOJI_CATEGORY4 = 14;
     public static final int ELEMENT_EMOJI_CATEGORY5 = 15;
     public static final int ELEMENT_EMOJI_CATEGORY6 = 16;
-    public static final int ELEMENT_EMOJI_CATEGORY7 = 17;
-    public static final int ELEMENT_EMOJI_CATEGORY8 = 18;
-    public static final int ELEMENT_EMOJI_CATEGORY9 = 19;
-    public static final int ELEMENT_EMOJI_CATEGORY10 = 20;
-    public static final int ELEMENT_EMOJI_CATEGORY11 = 21;
-    public static final int ELEMENT_EMOJI_CATEGORY12 = 22;
-    public static final int ELEMENT_EMOJI_CATEGORY13 = 23;
-    public static final int ELEMENT_EMOJI_CATEGORY14 = 24;
-    public static final int ELEMENT_EMOJI_CATEGORY15 = 25;
-    public static final int ELEMENT_EMOJI_CATEGORY16 = 26;
 
     public final RichInputMethodSubtype mSubtype;
     public final int mWidth;
@@ -235,16 +225,6 @@
         case ELEMENT_EMOJI_CATEGORY4: return "emojiCategory4";
         case ELEMENT_EMOJI_CATEGORY5: return "emojiCategory5";
         case ELEMENT_EMOJI_CATEGORY6: return "emojiCategory6";
-        case ELEMENT_EMOJI_CATEGORY7: return "emojiCategory7";
-        case ELEMENT_EMOJI_CATEGORY8: return "emojiCategory8";
-        case ELEMENT_EMOJI_CATEGORY9: return "emojiCategory9";
-        case ELEMENT_EMOJI_CATEGORY10: return "emojiCategory10";
-        case ELEMENT_EMOJI_CATEGORY11: return "emojiCategory11";
-        case ELEMENT_EMOJI_CATEGORY12: return "emojiCategory12";
-        case ELEMENT_EMOJI_CATEGORY13: return "emojiCategory13";
-        case ELEMENT_EMOJI_CATEGORY14: return "emojiCategory14";
-        case ELEMENT_EMOJI_CATEGORY15: return "emojiCategory15";
-        case ELEMENT_EMOJI_CATEGORY16: return "emojiCategory16";
         default: return null;
         }
     }
diff --git a/java/src/com/android/inputmethod/keyboard/emoji/EmojiCategory.java b/java/src/com/android/inputmethod/keyboard/emoji/EmojiCategory.java
index 1f4fbe5..f2f52f8 100644
--- a/java/src/com/android/inputmethod/keyboard/emoji/EmojiCategory.java
+++ b/java/src/com/android/inputmethod/keyboard/emoji/EmojiCategory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2014 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@
 import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.content.res.TypedArray;
-import android.graphics.Paint;
 import android.graphics.Rect;
 import android.os.Build;
 import android.util.Log;
@@ -51,16 +50,6 @@
     private static final int ID_PLACES = 4;
     private static final int ID_SYMBOLS = 5;
     private static final int ID_EMOTICONS = 6;
-    private static final int ID_FLAGS = 7;
-    private static final int ID_EIGHT_SMILEY_PEOPLE = 8;
-    private static final int ID_EIGHT_ANIMALS_NATURE = 9;
-    private static final int ID_EIGHT_FOOD_DRINK = 10;
-    private static final int ID_EIGHT_TRAVEL_PLACES = 11;
-    private static final int ID_EIGHT_ACTIVITY = 12;
-    private static final int ID_EIGHT_OBJECTS = 13;
-    private static final int ID_EIGHT_SYMBOLS = 14;
-    private static final int ID_EIGHT_FLAGS = 15;
-    private static final int ID_EIGHT_SMILEY_PEOPLE_BORING = 16;
 
     public final class CategoryProperties {
         public final int mCategoryId;
@@ -78,17 +67,7 @@
             "nature",
             "places",
             "symbols",
-            "emoticons",
-            "flags",
-            "smiley & people",
-            "animals & nature",
-            "food & drink",
-            "travel & places",
-            "activity",
-            "objects2",
-            "symbols2",
-            "flags2",
-            "smiley & people2" };
+            "emoticons" };
 
     private static final int[] sCategoryTabIconAttr = {
             R.styleable.EmojiPalettesView_iconEmojiRecentsTab,
@@ -97,17 +76,7 @@
             R.styleable.EmojiPalettesView_iconEmojiCategory3Tab,
             R.styleable.EmojiPalettesView_iconEmojiCategory4Tab,
             R.styleable.EmojiPalettesView_iconEmojiCategory5Tab,
-            R.styleable.EmojiPalettesView_iconEmojiCategory6Tab,
-            R.styleable.EmojiPalettesView_iconEmojiCategory7Tab,
-            R.styleable.EmojiPalettesView_iconEmojiCategory8Tab,
-            R.styleable.EmojiPalettesView_iconEmojiCategory9Tab,
-            R.styleable.EmojiPalettesView_iconEmojiCategory10Tab,
-            R.styleable.EmojiPalettesView_iconEmojiCategory11Tab,
-            R.styleable.EmojiPalettesView_iconEmojiCategory12Tab,
-            R.styleable.EmojiPalettesView_iconEmojiCategory13Tab,
-            R.styleable.EmojiPalettesView_iconEmojiCategory14Tab,
-            R.styleable.EmojiPalettesView_iconEmojiCategory15Tab,
-            R.styleable.EmojiPalettesView_iconEmojiCategory16Tab };
+            R.styleable.EmojiPalettesView_iconEmojiCategory6Tab };
 
     private static final int[] sAccessibilityDescriptionResourceIdsForCategories = {
             R.string.spoken_descrption_emoji_category_recents,
@@ -116,17 +85,7 @@
             R.string.spoken_descrption_emoji_category_nature,
             R.string.spoken_descrption_emoji_category_places,
             R.string.spoken_descrption_emoji_category_symbols,
-            R.string.spoken_descrption_emoji_category_emoticons,
-            R.string.spoken_descrption_emoji_category_flags,
-            R.string.spoken_descrption_emoji_category_eight_smiley_people,
-            R.string.spoken_descrption_emoji_category_eight_animals_nature,
-            R.string.spoken_descrption_emoji_category_eight_food_drink,
-            R.string.spoken_descrption_emoji_category_eight_travel_places,
-            R.string.spoken_descrption_emoji_category_eight_activity,
-            R.string.spoken_descrption_emoji_category_objects,
-            R.string.spoken_descrption_emoji_category_symbols,
-            R.string.spoken_descrption_emoji_category_flags,
-            R.string.spoken_descrption_emoji_category_eight_smiley_people };
+            R.string.spoken_descrption_emoji_category_emoticons };
 
     private static final int[] sCategoryElementId = {
             KeyboardId.ELEMENT_EMOJI_RECENTS,
@@ -135,17 +94,7 @@
             KeyboardId.ELEMENT_EMOJI_CATEGORY3,
             KeyboardId.ELEMENT_EMOJI_CATEGORY4,
             KeyboardId.ELEMENT_EMOJI_CATEGORY5,
-            KeyboardId.ELEMENT_EMOJI_CATEGORY6,
-            KeyboardId.ELEMENT_EMOJI_CATEGORY7,
-            KeyboardId.ELEMENT_EMOJI_CATEGORY8,
-            KeyboardId.ELEMENT_EMOJI_CATEGORY9,
-            KeyboardId.ELEMENT_EMOJI_CATEGORY10,
-            KeyboardId.ELEMENT_EMOJI_CATEGORY11,
-            KeyboardId.ELEMENT_EMOJI_CATEGORY12,
-            KeyboardId.ELEMENT_EMOJI_CATEGORY13,
-            KeyboardId.ELEMENT_EMOJI_CATEGORY14,
-            KeyboardId.ELEMENT_EMOJI_CATEGORY15,
-            KeyboardId.ELEMENT_EMOJI_CATEGORY16 };
+            KeyboardId.ELEMENT_EMOJI_CATEGORY6 };
 
     private final SharedPreferences mPrefs;
     private final Resources mRes;
@@ -175,37 +124,17 @@
         int defaultCategoryId = EmojiCategory.ID_SYMBOLS;
         addShownCategoryId(EmojiCategory.ID_RECENTS);
         if (BuildCompatUtils.EFFECTIVE_SDK_INT >= Build.VERSION_CODES.KITKAT) {
-            if (canShowUnicodeEightEmoji()) {
-                if (Build.VERSION.SDK_INT > Build.VERSION_CODES.M) {
-                    defaultCategoryId = EmojiCategory.ID_EIGHT_SMILEY_PEOPLE;
-                    addShownCategoryId(EmojiCategory.ID_EIGHT_SMILEY_PEOPLE);
-                } else {
-                    defaultCategoryId = EmojiCategory.ID_EIGHT_SMILEY_PEOPLE_BORING;
-                    addShownCategoryId(EmojiCategory.ID_EIGHT_SMILEY_PEOPLE_BORING);
-                }
-                addShownCategoryId(EmojiCategory.ID_EIGHT_ANIMALS_NATURE);
-                addShownCategoryId(EmojiCategory.ID_EIGHT_FOOD_DRINK);
-                addShownCategoryId(EmojiCategory.ID_EIGHT_TRAVEL_PLACES);
-                addShownCategoryId(EmojiCategory.ID_EIGHT_ACTIVITY);
-                addShownCategoryId(EmojiCategory.ID_EIGHT_OBJECTS);
-                addShownCategoryId(EmojiCategory.ID_EIGHT_SYMBOLS);
-                addShownCategoryId(EmojiCategory.ID_FLAGS); // Exclude combinations without glyphs.
-            } else {
-                defaultCategoryId = EmojiCategory.ID_PEOPLE;
-                addShownCategoryId(EmojiCategory.ID_PEOPLE);
-                addShownCategoryId(EmojiCategory.ID_OBJECTS);
-                addShownCategoryId(EmojiCategory.ID_NATURE);
-                addShownCategoryId(EmojiCategory.ID_PLACES);
-                addShownCategoryId(EmojiCategory.ID_SYMBOLS);
-                if (canShowFlagEmoji()) {
-                    addShownCategoryId(EmojiCategory.ID_FLAGS);
-                }
-            }
+            defaultCategoryId = EmojiCategory.ID_PEOPLE;
+            addShownCategoryId(EmojiCategory.ID_PEOPLE);
+            addShownCategoryId(EmojiCategory.ID_OBJECTS);
+            addShownCategoryId(EmojiCategory.ID_NATURE);
+            addShownCategoryId(EmojiCategory.ID_PLACES);
         }
+        addShownCategoryId(EmojiCategory.ID_SYMBOLS);
         addShownCategoryId(EmojiCategory.ID_EMOTICONS);
 
         DynamicGridKeyboard recentsKbd =
-                getKeyboard(EmojiCategory.ID_RECENTS, 0 /* categoryPageId */);
+                getKeyboard(EmojiCategory.ID_RECENTS, 0 /* cagetoryPageId */);
         recentsKbd.loadRecentKeys(mCategoryKeyboardMap.values());
 
         mCurrentCategoryId = Settings.readLastShownEmojiCategoryId(mPrefs, defaultCategoryId);
@@ -218,7 +147,7 @@
 
     private void addShownCategoryId(final int categoryId) {
         // Load a keyboard of categoryId
-        getKeyboard(categoryId, 0 /* categoryPageId */);
+        getKeyboard(categoryId, 0 /* cagetoryPageId */);
         final CategoryProperties properties =
                 new CategoryProperties(categoryId, getCategoryPageCount(categoryId));
         mShownCategories.add(properties);
@@ -353,16 +282,16 @@
 
     public DynamicGridKeyboard getKeyboard(final int categoryId, final int id) {
         synchronized (mCategoryKeyboardMap) {
-            final Long categoryKeyboardMapKey = getCategoryKeyboardMapKey(categoryId, id);
-            if (mCategoryKeyboardMap.containsKey(categoryKeyboardMapKey)) {
-                return mCategoryKeyboardMap.get(categoryKeyboardMapKey);
+            final Long categotyKeyboardMapKey = getCategoryKeyboardMapKey(categoryId, id);
+            if (mCategoryKeyboardMap.containsKey(categotyKeyboardMapKey)) {
+                return mCategoryKeyboardMap.get(categotyKeyboardMapKey);
             }
 
             if (categoryId == EmojiCategory.ID_RECENTS) {
                 final DynamicGridKeyboard kbd = new DynamicGridKeyboard(mPrefs,
                         mLayoutSet.getKeyboard(KeyboardId.ELEMENT_EMOJI_RECENTS),
                         mMaxPageKeyCount, categoryId);
-                mCategoryKeyboardMap.put(categoryKeyboardMapKey, kbd);
+                mCategoryKeyboardMap.put(categotyKeyboardMapKey, kbd);
                 return kbd;
             }
 
@@ -382,7 +311,7 @@
                 mCategoryKeyboardMap.put(
                         getCategoryKeyboardMapKey(categoryId, pageId), tempKeyboard);
             }
-            return mCategoryKeyboardMap.get(categoryKeyboardMapKey);
+            return mCategoryKeyboardMap.get(categotyKeyboardMapKey);
         }
     }
 
@@ -426,34 +355,4 @@
         }
         return retval;
     }
-
-    private static boolean canShowFlagEmoji() {
-        Paint paint = new Paint();
-        String switzerland = "\uD83C\uDDE8\uD83C\uDDED"; //  U+1F1E8 U+1F1ED Flag for Switzerland
-        try {
-            return paint.hasGlyph(switzerland);
-        } catch (NoSuchMethodError e) {
-            // Compare display width of single-codepoint emoji to width of flag emoji to determine
-            // whether flag is rendered as single glyph or two adjacent regional indicator symbols.
-            float flagWidth = paint.measureText(switzerland);
-            float standardWidth = paint.measureText("\uD83D\uDC27"); //  U+1F427 Penguin
-            return flagWidth < standardWidth * 1.25;
-            // This assumes that a valid glyph for the flag emoji must be less than 1.25 times
-            // the width of the penguin.
-        }
-    }
-
-    private static boolean canShowUnicodeEightEmoji() {
-        Paint paint = new Paint();
-        String cheese = "\uD83E\uDDC0"; //  U+1F9C0 Cheese wedge
-        try {
-            return paint.hasGlyph(cheese);
-        } catch (NoSuchMethodError e) {
-            float cheeseWidth = paint.measureText(cheese);
-            float tofuWidth = paint.measureText("\uFFFE");
-            return cheeseWidth > tofuWidth;
-            // This assumes that a valid glyph for the cheese wedge must be greater than the width
-            // of the noncharacter.
-        }
-    }
 }