diff --git a/client/js/libs/simplemap.json b/client/js/libs/simplemap.json
index 2f3f0567..13152309 100644
--- a/client/js/libs/simplemap.json
+++ b/client/js/libs/simplemap.json
@@ -1,91 +1,171 @@
 {
   "100": "💯",
   "1234": "🔢",
+  "interrobang": "⁉",
+  "tm": "™",
+  "information_source": "ℹ",
+  "left_right_arrow": "↔",
+  "arrow_up_down": "↕",
+  "arrow_upper_left": "↖",
+  "arrow_upper_right": "↗",
+  "arrow_lower_right": "↘",
+  "arrow_lower_left": "↙",
+  "keyboard": "⌨",
+  "sunny": "☀",
+  "cloud": "☁",
+  "umbrella2": "☂",
+  "snowman2": "☃",
+  "comet": "☄",
+  "ballot_box_with_check": "☑",
+  "umbrella": "☔",
+  "coffee": "☕",
+  "shamrock": "☘",
+  "skull_crossbones": "☠",
+  "radioactive": "☢",
+  "biohazard": "☣",
+  "orthodox_cross": "☦",
+  "wheel_of_dharma": "☸",
+  "frowning2": "☹",
+  "white_frowning_face": "☹",
+  "female_sign": "♀",
+  "male_sign": "♂",
+  "aries": "♈",
+  "taurus": "♉",
+  "sagittarius": "♐",
+  "capricorn": "♑",
+  "aquarius": "♒",
+  "pisces": "♓",
+  "spades": "♠",
+  "clubs": "♣",
+  "hearts": "♥",
+  "diamonds": "♦",
+  "hotsprings": "♨",
+  "hammer_pick": "⚒",
+  "anchor": "⚓",
+  "crossed_swords": "⚔",
+  "medical_symbol": "⚕",
+  "scales": "⚖",
+  "alembic": "⚗",
+  "gear": "⚙",
+  "scissors": "✂",
+  "white_check_mark": "✅",
+  "airplane": "✈",
+  "envelope": "✉",
+  "black_nib": "✒",
+  "heavy_check_mark": "✔",
+  "heavy_multiplication_x": "✖",
+  "star_of_david": "✡",
+  "sparkles": "✨",
+  "eight_spoked_asterisk": "✳",
+  "eight_pointed_black_star": "✴",
+  "snowflake": "❄",
+  "sparkle": "❇",
+  "question": "❓",
+  "grey_question": "❔",
+  "grey_exclamation": "❕",
+  "exclamation": "❗",
+  "heart_exclamation": "❣",
+  "heart": "❤",
+  "heavy_plus_sign": "➕",
+  "heavy_minus_sign": "➖",
+  "heavy_division_sign": "➗",
+  "arrow_heading_up": "⤴",
+  "arrow_heading_down": "⤵",
+  "wavy_dash": "〰",
+  "congratulations": "㊗",
+  "secret": "㊙",
   "grinning": "😀",
-  "grimacing": "😬",
-  "grin": "😁",
-  "joy": "😂",
-  "rofl": "🤣",
   "smiley": "😃",
   "smile": "😄",
-  "sweat_smile": "😅",
+  "grin": "😁",
   "laughing": "😆",
-  "innocent": "😇",
-  "wink": "😉",
+  "satisfied": "😆",
+  "sweat_smile": "😅",
+  "joy": "😂",
+  "rofl": "🤣",
+  "relaxed": "☺",
   "blush": "😊",
-  "slightly_smiling_face": "🙂",
-  "upside_down_face": "🙃",
-  "relaxed": "☺️",
-  "yum": "😋",
+  "innocent": "😇",
+  "slight_smile": "🙂",
+  "upside_down": "🙃",
+  "wink": "😉",
   "relieved": "😌",
   "heart_eyes": "😍",
   "kissing_heart": "😘",
   "kissing": "😗",
   "kissing_smiling_eyes": "😙",
   "kissing_closed_eyes": "😚",
+  "yum": "😋",
   "stuck_out_tongue_winking_eye": "😜",
   "stuck_out_tongue_closed_eyes": "😝",
   "stuck_out_tongue": "😛",
-  "money_mouth_face": "🤑",
-  "nerd_face": "🤓",
+  "money_mouth": "🤑",
+  "hugging": "🤗",
+  "nerd": "🤓",
   "sunglasses": "😎",
-  "clown_face": "🤡",
-  "cowboy_hat_face": "🤠",
-  "hugs": "🤗",
+  "clown": "🤡",
+  "cowboy": "🤠",
   "smirk": "😏",
-  "no_mouth": "😶",
-  "neutral_face": "😐",
-  "expressionless": "😑",
   "unamused": "😒",
-  "roll_eyes": "🙄",
-  "thinking": "🤔",
-  "lying_face": "🤥",
-  "flushed": "😳",
   "disappointed": "😞",
-  "worried": "😟",
-  "angry": "😠",
-  "rage": "😡",
   "pensive": "😔",
+  "worried": "😟",
   "confused": "😕",
-  "slightly_frowning_face": "🙁",
-  "frowning_face": "☹",
+  "slight_frown": "🙁",
   "persevere": "😣",
   "confounded": "😖",
   "tired_face": "😫",
   "weary": "😩",
   "triumph": "😤",
-  "open_mouth": "😮",
-  "scream": "😱",
-  "fearful": "😨",
-  "cold_sweat": "😰",
+  "angry": "😠",
+  "rage": "😡",
+  "no_mouth": "😶",
+  "neutral_face": "😐",
+  "expressionless": "😑",
   "hushed": "😯",
   "frowning": "😦",
   "anguished": "😧",
+  "open_mouth": "😮",
+  "astonished": "😲",
+  "dizzy_face": "😵",
+  "flushed": "😳",
+  "scream": "😱",
+  "fearful": "😨",
+  "cold_sweat": "😰",
   "cry": "😢",
   "disappointed_relieved": "😥",
   "drooling_face": "🤤",
-  "sleepy": "😪",
-  "sweat": "😓",
   "sob": "😭",
-  "dizzy_face": "😵",
-  "astonished": "😲",
-  "zipper_mouth_face": "🤐",
+  "sweat": "😓",
+  "sleepy": "😪",
+  "sleeping": "😴",
+  "rolling_eyes": "🙄",
+  "thinking": "🤔",
+  "lying_face": "🤥",
+  "liar": "🤥",
+  "grimacing": "😬",
+  "zipper_mouth": "🤐",
   "nauseated_face": "🤢",
+  "sick": "🤢",
   "sneezing_face": "🤧",
   "mask": "😷",
+  "thermometer_face": "🤒",
   "face_with_thermometer": "🤒",
-  "face_with_head_bandage": "🤕",
-  "sleeping": "😴",
-  "zzz": "💤",
-  "poop": "💩",
+  "head_bandage": "🤕",
   "smiling_imp": "😈",
   "imp": "👿",
   "japanese_ogre": "👹",
   "japanese_goblin": "👺",
-  "skull": "💀",
+  "poop": "💩",
+  "shit": "💩",
+  "hankey": "💩",
   "ghost": "👻",
+  "skull": "💀",
+  "skeleton": "💀",
   "alien": "👽",
+  "space_invader": "👾",
   "robot": "🤖",
+  "jack_o_lantern": "🎃",
   "smiley_cat": "😺",
   "smile_cat": "😸",
   "joy_cat": "😹",
@@ -95,180 +175,224 @@
   "scream_cat": "🙀",
   "crying_cat_face": "😿",
   "pouting_cat": "😾",
+  "open_hands": "👐",
   "raised_hands": "🙌",
   "clap": "👏",
-  "wave": "👋",
-  "call_me_hand": "🤙",
-  "+1": "👍",
-  "-1": "👎",
-  "facepunch": "👊",
-  "fist": "✊",
-  "fist_left": "🤛",
-  "fist_right": "🤜",
-  "v": "✌",
-  "ok_hand": "👌",
-  "raised_hand": "✋",
-  "raised_back_of_hand": "🤚",
-  "open_hands": "👐",
-  "muscle": "💪",
   "pray": "🙏",
   "handshake": "🤝",
-  "point_up": "☝",
-  "point_up_2": "👆",
-  "point_down": "👇",
+  "shaking_hands": "🤝",
+  "thumbsup": "👍",
+  "+1": "👍",
+  "thumbsdown": "👎",
+  "-1": "👎",
+  "punch": "👊",
+  "fist": "✊",
+  "left_facing_fist": "🤛",
+  "right_facing_fist": "🤜",
+  "fingers_crossed": "🤞",
+  "hand_with_index_and_middle_finger_crossed": "🤞",
+  "v": "✌",
+  "metal": "🤘",
+  "sign_of_the_horns": "🤘",
+  "ok_hand": "👌",
   "point_left": "👈",
   "point_right": "👉",
-  "fu": "🖕",
-  "raised_hand_with_fingers_splayed": "🖐",
-  "metal": "🤘",
-  "crossed_fingers": "🤞",
-  "vulcan_salute": "🖖",
+  "point_up_2": "👆",
+  "point_down": "👇",
+  "point_up": "☝",
+  "raised_hand": "✋",
+  "raised_back_of_hand": "🤚",
+  "hand_splayed": "🖐",
+  "vulcan": "🖖",
+  "raised_hand_with_part_between_middle_and_ring_fingers": "🖖",
+  "wave": "👋",
+  "call_me": "🤙",
+  "muscle": "💪",
+  "middle_finger": "🖕",
   "writing_hand": "✍",
   "selfie": "🤳",
   "nail_care": "💅",
+  "ring": "💍",
+  "lipstick": "💄",
+  "kiss": "💋",
   "lips": "👄",
   "tongue": "👅",
   "ear": "👂",
   "nose": "👃",
+  "footprints": "👣",
   "eye": "👁",
   "eyes": "👀",
+  "speaking_head": "🗣",
   "bust_in_silhouette": "👤",
   "busts_in_silhouette": "👥",
-  "speaking_head": "🗣",
   "baby": "👶",
   "boy": "👦",
   "girl": "👧",
   "man": "👨",
   "woman": "👩",
-  "blonde_woman": "👱‍♀️",
-  "blonde_man": "👱",
+  "blond_haired_woman": "👱♀",
+  "blond_haired_person": "👱",
+  "person_with_blond_hair": "👱",
+  "blond_haired_man": "👱♂",
   "older_man": "👴",
   "older_woman": "👵",
+  "grandma": "👵",
+  "man_with_chinese_cap": "👲",
   "man_with_gua_pi_mao": "👲",
-  "woman_with_turban": "👳‍♀️",
+  "woman_wearing_turban": "👳♀",
+  "person_wearing_turban": "👳",
   "man_with_turban": "👳",
-  "policewoman": "👮‍♀️",
-  "policeman": "👮",
-  "construction_worker_woman": "👷‍♀️",
-  "construction_worker_man": "👷",
-  "guardswoman": "💂‍♀️",
-  "guardsman": "💂",
-  "female_detective": "🕵️‍♀️",
-  "male_detective": "🕵",
-  "woman_health_worker": "👩‍⚕️",
-  "man_health_worker": "👨‍⚕️",
-  "woman_farmer": "👩‍🌾",
-  "man_farmer": "👨‍🌾",
-  "woman_cook": "👩‍🍳",
-  "man_cook": "👨‍🍳",
-  "woman_student": "👩‍🎓",
-  "man_student": "👨‍🎓",
-  "woman_singer": "👩‍🎤",
-  "man_singer": "👨‍🎤",
-  "woman_teacher": "👩‍🏫",
-  "man_teacher": "👨‍🏫",
-  "woman_factory_worker": "👩‍🏭",
-  "man_factory_worker": "👨‍🏭",
-  "woman_technologist": "👩‍💻",
-  "man_technologist": "👨‍💻",
-  "woman_office_worker": "👩‍💼",
-  "man_office_worker": "👨‍💼",
-  "woman_mechanic": "👩‍🔧",
-  "man_mechanic": "👨‍🔧",
-  "woman_scientist": "👩‍🔬",
-  "man_scientist": "👨‍🔬",
-  "woman_artist": "👩‍🎨",
-  "man_artist": "👨‍🎨",
-  "woman_firefighter": "👩‍🚒",
-  "man_firefighter": "👨‍🚒",
-  "woman_pilot": "👩‍✈️",
-  "man_pilot": "👨‍✈️",
-  "woman_astronaut": "👩‍🚀",
-  "man_astronaut": "👨‍🚀",
-  "woman_judge": "👩‍⚖️",
-  "man_judge": "👨‍⚖️",
+  "man_wearing_turban": "👳♂",
+  "woman_police_officer": "👮♀",
+  "police_officer": "👮",
+  "cop": "👮",
+  "man_police_officer": "👮♂",
+  "woman_construction_worker": "👷♀",
+  "construction_worker": "👷",
+  "man_construction_worker": "👷♂",
+  "woman_guard": "💂♀",
+  "guard": "💂",
+  "man_guard": "💂♂",
+  "woman_detective": "🕵♀",
+  "detective": "🕵",
+  "spy": "🕵",
+  "sleuth_or_spy": "🕵",
+  "man_detective": "🕵♂",
+  "woman_health_worker": "👩⚕",
+  "man_health_worker": "👨⚕",
+  "woman_farmer": "👩🌾",
+  "man_farmer": "👨🌾",
+  "woman_cook": "👩🍳",
+  "man_cook": "👨🍳",
+  "woman_student": "👩🎓",
+  "man_student": "👨🎓",
+  "woman_singer": "👩🎤",
+  "man_singer": "👨🎤",
+  "woman_teacher": "👩🏫",
+  "man_teacher": "👨🏫",
+  "woman_factory_worker": "👩🏭",
+  "man_factory_worker": "👨🏭",
+  "woman_technologist": "👩💻",
+  "man_technologist": "👨💻",
+  "woman_office_worker": "👩💼",
+  "man_office_worker": "👨💼",
+  "woman_mechanic": "👩🔧",
+  "man_mechanic": "👨🔧",
+  "woman_scientist": "👩🔬",
+  "man_scientist": "👨🔬",
+  "woman_artist": "👩🎨",
+  "man_artist": "👨🎨",
+  "woman_firefighter": "👩🚒",
+  "man_firefighter": "👨🚒",
+  "woman_pilot": "👩✈",
+  "man_pilot": "👨✈",
+  "woman_astronaut": "👩🚀",
+  "man_astronaut": "👨🚀",
+  "woman_judge": "👩⚖",
+  "man_judge": "👨⚖",
   "mrs_claus": "🤶",
+  "mother_christmas": "🤶",
   "santa": "🎅",
-  "angel": "👼",
-  "pregnant_woman": "🤰",
   "princess": "👸",
   "prince": "🤴",
   "bride_with_veil": "👰",
   "man_in_tuxedo": "🤵",
-  "running_woman": "🏃‍♀️",
-  "running_man": "🏃",
-  "walking_woman": "🚶‍♀️",
-  "walking_man": "🚶",
+  "angel": "👼",
+  "pregnant_woman": "🤰",
+  "expecting_woman": "🤰",
+  "woman_bowing": "🙇♀",
+  "person_bowing": "🙇",
+  "man_bowing": "🙇♂",
+  "person_tipping_hand": "💁",
+  "information_desk_person": "💁",
+  "man_tipping_hand": "💁♂",
+  "woman_tipping_hand": "💁♀",
+  "person_gesturing_no": "🙅",
+  "no_good": "🙅",
+  "man_gesturing_no": "🙅♂",
+  "woman_gesturing_no": "🙅♀",
+  "person_gesturing_ok": "🙆",
+  "ok_woman": "🙆",
+  "man_gesturing_ok": "🙆♂",
+  "woman_gesturing_ok": "🙆♀",
+  "person_raising_hand": "🙋",
+  "man_raising_hand": "🙋♂",
+  "woman_raising_hand": "🙋♀",
+  "woman_facepalming": "🤦♀",
+  "man_facepalming": "🤦♂",
+  "person_facepalming": "🤦",
+  "face_palm": "🤦",
+  "woman_shrugging": "🤷♀",
+  "man_shrugging": "🤷♂",
+  "person_shrugging": "🤷",
+  "person_pouting": "🙎",
+  "man_pouting": "🙎♂",
+  "woman_pouting": "🙎♀",
+  "person_frowning": "🙍",
+  "man_frowning": "🙍♂",
+  "woman_frowning": "🙍♀",
+  "person_getting_haircut": "💇",
+  "man_getting_haircut": "💇♂",
+  "woman_getting_haircut": "💇♀",
+  "person_getting_massage": "💆",
+  "man_getting_face_massage": "💆♂",
+  "woman_getting_face_massage": "💆♀",
+  "levitate": "🕴",
   "dancer": "💃",
   "man_dancing": "🕺",
-  "dancing_women": "👯",
-  "dancing_men": "👯‍♂️",
+  "male_dancer": "🕺",
+  "people_with_bunny_ears_partying": "👯",
+  "dancers": "👯",
+  "men_with_bunny_ears_partying": "👯♂",
+  "women_with_bunny_ears_partying": "👯♀",
+  "woman_walking": "🚶♀",
+  "person_walking": "🚶",
+  "man_walking": "🚶♂",
+  "woman_running": "🏃♀",
+  "person_running": "🏃",
+  "runner": "🏃",
+  "man_running": "🏃♂",
   "couple": "👫",
-  "two_men_holding_hands": "👬",
   "two_women_holding_hands": "👭",
-  "bowing_woman": "🙇‍♀️",
-  "bowing_man": "🙇",
-  "man_facepalming": "🤦",
-  "woman_facepalming": "🤦‍♀️",
-  "woman_shrugging": "🤷",
-  "man_shrugging": "🤷‍♂️",
-  "tipping_hand_woman": "💁",
-  "tipping_hand_man": "💁‍♂️",
-  "no_good_woman": "🙅",
-  "no_good_man": "🙅‍♂️",
-  "ok_woman": "🙆",
-  "ok_man": "🙆‍♂️",
-  "raising_hand_woman": "🙋",
-  "raising_hand_man": "🙋‍♂️",
-  "pouting_woman": "🙎",
-  "pouting_man": "🙎‍♂️",
-  "frowning_woman": "🙍",
-  "frowning_man": "🙍‍♂️",
-  "haircut_woman": "💇",
-  "haircut_man": "💇‍♂️",
-  "massage_woman": "💆",
-  "massage_man": "💆‍♂️",
-  "couple_with_heart_woman_man": "💑",
-  "couple_with_heart_woman_woman": "👩‍❤️‍👩",
-  "couple_with_heart_man_man": "👨‍❤️‍👨",
-  "couplekiss_man_woman": "💏",
-  "couplekiss_woman_woman": "👩‍❤️‍💋‍👩",
-  "couplekiss_man_man": "👨‍❤️‍💋‍👨",
-  "family_man_woman_boy": "👪",
-  "family_man_woman_girl": "👨‍👩‍👧",
-  "family_man_woman_girl_boy": "👨‍👩‍👧‍👦",
-  "family_man_woman_boy_boy": "👨‍👩‍👦‍👦",
-  "family_man_woman_girl_girl": "👨‍👩‍👧‍👧",
-  "family_woman_woman_boy": "👩‍👩‍👦",
-  "family_woman_woman_girl": "👩‍👩‍👧",
-  "family_woman_woman_girl_boy": "👩‍👩‍👧‍👦",
-  "family_woman_woman_boy_boy": "👩‍👩‍👦‍👦",
-  "family_woman_woman_girl_girl": "👩‍👩‍👧‍👧",
-  "family_man_man_boy": "👨‍👨‍👦",
-  "family_man_man_girl": "👨‍👨‍👧",
-  "family_man_man_girl_boy": "👨‍👨‍👧‍👦",
-  "family_man_man_boy_boy": "👨‍👨‍👦‍👦",
-  "family_man_man_girl_girl": "👨‍👨‍👧‍👧",
-  "family_woman_boy": "👩‍👦",
-  "family_woman_girl": "👩‍👧",
-  "family_woman_girl_boy": "👩‍👧‍👦",
-  "family_woman_boy_boy": "👩‍👦‍👦",
-  "family_woman_girl_girl": "👩‍👧‍👧",
-  "family_man_boy": "👨‍👦",
-  "family_man_girl": "👨‍👧",
-  "family_man_girl_boy": "👨‍👧‍👦",
-  "family_man_boy_boy": "👨‍👦‍👦",
-  "family_man_girl_girl": "👨‍👧‍👧",
+  "two_men_holding_hands": "👬",
+  "couple_with_heart": "💑",
+  "couple_ww": "👩❤👩",
+  "couple_mm": "👨❤👨",
+  "couplekiss": "💏",
+  "kiss_ww": "👩❤💋👩",
+  "kiss_mm": "👨❤💋👨",
+  "family": "👪",
+  "family_mwg": "👨👩👧",
+  "family_mwgb": "👨👩👧👦",
+  "family_mwbb": "👨👩👦👦",
+  "family_mwgg": "👨👩👧👧",
+  "family_wwb": "👩👩👦",
+  "family_wwg": "👩👩👧",
+  "family_wwgb": "👩👩👧👦",
+  "family_wwbb": "👩👩👦👦",
+  "family_wwgg": "👩👩👧👧",
+  "family_mmb": "👨👨👦",
+  "family_mmg": "👨👨👧",
+  "family_mmgb": "👨👨👧👦",
+  "family_mmbb": "👨👨👦👦",
+  "family_mmgg": "👨👨👧👧",
+  "family_woman_boy": "👩👦",
+  "family_woman_girl": "👩👧",
+  "family_woman_girl_boy": "👩👧👦",
+  "family_woman_boy_boy": "👩👦👦",
+  "family_woman_girl_girl": "👩👧👧",
+  "family_man_boy": "👨👦",
+  "family_man_girl": "👨👧",
+  "family_man_girl_boy": "👨👧👦",
+  "family_man_boy_boy": "👨👦👦",
+  "family_man_girl_girl": "👨👧👧",
   "womans_clothes": "👚",
-  "tshirt": "👕",
+  "shirt": "👕",
   "jeans": "👖",
   "necktie": "👔",
   "dress": "👗",
   "bikini": "👙",
   "kimono": "👘",
-  "lipstick": "💄",
-  "kiss": "💋",
-  "footprints": "👣",
   "high_heel": "👠",
   "sandal": "👡",
   "boot": "👢",
@@ -276,9 +400,9 @@
   "athletic_shoe": "👟",
   "womans_hat": "👒",
   "tophat": "🎩",
-  "rescue_worker_helmet": "⛑",
   "mortar_board": "🎓",
   "crown": "👑",
+  "helmet_with_cross": "⛑",
   "school_satchel": "🎒",
   "pouch": "👝",
   "purse": "👛",
@@ -286,28 +410,23 @@
   "briefcase": "💼",
   "eyeglasses": "👓",
   "dark_sunglasses": "🕶",
-  "ring": "💍",
   "closed_umbrella": "🌂",
   "dog": "🐶",
   "cat": "🐱",
   "mouse": "🐭",
   "hamster": "🐹",
   "rabbit": "🐰",
-  "fox_face": "🦊",
+  "fox": "🦊",
   "bear": "🐻",
   "panda_face": "🐼",
   "koala": "🐨",
   "tiger": "🐯",
-  "lion": "🦁",
+  "lion_face": "🦁",
   "cow": "🐮",
   "pig": "🐷",
   "pig_nose": "🐽",
   "frog": "🐸",
-  "squid": "🦑",
-  "octopus": "🐙",
-  "shrimp": "🦐",
   "monkey_face": "🐵",
-  "gorilla": "🦍",
   "see_no_evil": "🙈",
   "hear_no_evil": "🙉",
   "speak_no_evil": "🙊",
@@ -326,18 +445,23 @@
   "boar": "🐗",
   "horse": "🐴",
   "unicorn": "🦄",
-  "honeybee": "🐝",
+  "bee": "🐝",
   "bug": "🐛",
   "butterfly": "🦋",
   "snail": "🐌",
+  "shell": "🐚",
   "beetle": "🐞",
   "ant": "🐜",
   "spider": "🕷",
-  "scorpion": "🦂",
-  "crab": "🦀",
+  "spider_web": "🕸",
+  "turtle": "🐢",
   "snake": "🐍",
   "lizard": "🦎",
-  "turtle": "🐢",
+  "scorpion": "🦂",
+  "crab": "🦀",
+  "squid": "🦑",
+  "octopus": "🐙",
+  "shrimp": "🦐",
   "tropical_fish": "🐠",
   "fish": "🐟",
   "blowfish": "🐡",
@@ -355,22 +479,24 @@
   "dromedary_camel": "🐪",
   "camel": "🐫",
   "elephant": "🐘",
-  "rhinoceros": "🦏",
+  "rhino": "🦏",
+  "gorilla": "🦍",
+  "racehorse": "🐎",
+  "pig2": "🐖",
   "goat": "🐐",
   "ram": "🐏",
   "sheep": "🐑",
-  "racehorse": "🐎",
-  "pig2": "🐖",
-  "rat": "🐀",
-  "mouse2": "🐁",
-  "rooster": "🐓",
-  "turkey": "🦃",
-  "dove": "🕊",
   "dog2": "🐕",
   "poodle": "🐩",
   "cat2": "🐈",
+  "rooster": "🐓",
+  "turkey": "🦃",
+  "dove": "🕊",
   "rabbit2": "🐇",
+  "mouse2": "🐁",
+  "rat": "🐀",
   "chipmunk": "🐿",
+  "feet": "🐾",
   "paw_prints": "🐾",
   "dragon": "🐉",
   "dragon_face": "🐲",
@@ -381,27 +507,23 @@
   "palm_tree": "🌴",
   "seedling": "🌱",
   "herb": "🌿",
-  "shamrock": "☘",
   "four_leaf_clover": "🍀",
   "bamboo": "🎍",
   "tanabata_tree": "🎋",
   "leaves": "🍃",
   "fallen_leaf": "🍂",
   "maple_leaf": "🍁",
+  "mushroom": "🍄",
   "ear_of_rice": "🌾",
-  "hibiscus": "🌺",
-  "sunflower": "🌻",
-  "rose": "🌹",
-  "wilted_flower": "🥀",
+  "bouquet": "💐",
   "tulip": "🌷",
+  "rose": "🌹",
+  "wilted_rose": "🥀",
+  "wilted_flower": "🥀",
+  "sunflower": "🌻",
   "blossom": "🌼",
   "cherry_blossom": "🌸",
-  "bouquet": "💐",
-  "mushroom": "🍄",
-  "chestnut": "🌰",
-  "jack_o_lantern": "🎃",
-  "shell": "🐚",
-  "spider_web": "🕸",
+  "hibiscus": "🌺",
   "earth_americas": "🌎",
   "earth_africa": "🌍",
   "earth_asia": "🌏",
@@ -415,40 +537,41 @@
   "waxing_gibbous_moon": "🌔",
   "new_moon_with_face": "🌚",
   "full_moon_with_face": "🌝",
+  "sun_with_face": "🌞",
   "first_quarter_moon_with_face": "🌛",
   "last_quarter_moon_with_face": "🌜",
-  "sun_with_face": "🌞",
   "crescent_moon": "🌙",
+  "dizzy": "💫",
   "star": "⭐",
   "star2": "🌟",
-  "dizzy": "💫",
-  "sparkles": "✨",
-  "comet": "☄",
-  "sunny": "☀️",
-  "sun_behind_small_cloud": "🌤",
-  "partly_sunny": "⛅",
-  "sun_behind_large_cloud": "🌥",
-  "sun_behind_rain_cloud": "🌦",
-  "cloud": "☁️",
-  "cloud_with_rain": "🌧",
-  "cloud_with_lightning_and_rain": "⛈",
-  "cloud_with_lightning": "🌩",
   "zap": "⚡",
   "fire": "🔥",
+  "flame": "🔥",
   "boom": "💥",
-  "snowflake": "❄️",
-  "cloud_with_snow": "🌨",
+  "white_sun_small_cloud": "🌤",
+  "partly_sunny": "⛅",
+  "white_sun_cloud": "🌥",
+  "white_sun_rain_cloud": "🌦",
+  "white_sun_behind_cloud_with_rain": "🌦",
+  "rainbow": "🌈",
+  "cloud_rain": "🌧",
+  "thunder_cloud_rain": "⛈",
+  "cloud_lightning": "🌩",
+  "cloud_snow": "🌨",
   "snowman": "⛄",
-  "snowman_with_snow": "☃",
-  "wind_face": "🌬",
+  "wind_blowing_face": "🌬",
   "dash": "💨",
-  "tornado": "🌪",
+  "cloud_tornado": "🌪",
   "fog": "🌫",
-  "open_umbrella": "☂",
-  "umbrella": "☔",
+  "ocean": "🌊",
   "droplet": "💧",
   "sweat_drops": "💦",
-  "ocean": "🌊",
+  "giraffe": "🦒",
+  "zebra": "🦓",
+  "hedgehog": "🦔",
+  "sauropod": "🦕",
+  "t_rex": "🦖",
+  "cricket": "🦗",
   "green_apple": "🍏",
   "apple": "🍎",
   "pear": "🍐",
@@ -462,39 +585,44 @@
   "cherries": "🍒",
   "peach": "🍑",
   "pineapple": "🍍",
-  "kiwi_fruit": "🥝",
+  "kiwi": "🥝",
   "avocado": "🥑",
   "tomato": "🍅",
   "eggplant": "🍆",
   "cucumber": "🥒",
   "carrot": "🥕",
+  "corn": "🌽",
   "hot_pepper": "🌶",
   "potato": "🥔",
-  "corn": "🌽",
   "sweet_potato": "🍠",
+  "chestnut": "🌰",
   "peanuts": "🥜",
+  "shelled_peanut": "🥜",
   "honey_pot": "🍯",
   "croissant": "🥐",
   "bread": "🍞",
+  "french_bread": "🥖",
   "baguette_bread": "🥖",
   "cheese": "🧀",
   "egg": "🥚",
+  "cooking": "🍳",
   "bacon": "🥓",
   "pancakes": "🥞",
+  "fried_shrimp": "🍤",
   "poultry_leg": "🍗",
   "meat_on_bone": "🍖",
-  "fried_shrimp": "🍤",
-  "fried_egg": "🍳",
+  "pizza": "🍕",
+  "hotdog": "🌭",
   "hamburger": "🍔",
   "fries": "🍟",
   "stuffed_flatbread": "🥙",
-  "hotdog": "🌭",
-  "pizza": "🍕",
-  "spaghetti": "🍝",
+  "stuffed_pita": "🥙",
   "taco": "🌮",
   "burrito": "🌯",
-  "green_salad": "🥗",
+  "salad": "🥗",
   "shallow_pan_of_food": "🥘",
+  "paella": "🥘",
+  "spaghetti": "🍝",
   "ramen": "🍜",
   "stew": "🍲",
   "fish_cake": "🍥",
@@ -512,28 +640,45 @@
   "cake": "🍰",
   "birthday": "🎂",
   "custard": "🍮",
-  "candy": "🍬",
+  "pudding": "🍮",
+  "flan": "🍮",
   "lollipop": "🍭",
+  "candy": "🍬",
   "chocolate_bar": "🍫",
   "popcorn": "🍿",
   "doughnut": "🍩",
   "cookie": "🍪",
-  "milk_glass": "🥛",
+  "milk": "🥛",
+  "baby_bottle": "🍼",
+  "tea": "🍵",
+  "sake": "🍶",
   "beer": "🍺",
   "beers": "🍻",
-  "clinking_glasses": "🥂",
+  "champagne_glass": "🥂",
+  "clinking_glass": "🥂",
   "wine_glass": "🍷",
   "tumbler_glass": "🥃",
+  "whisky": "🥃",
   "cocktail": "🍸",
   "tropical_drink": "🍹",
   "champagne": "🍾",
-  "sake": "🍶",
-  "tea": "🍵",
-  "coffee": "☕",
-  "baby_bottle": "🍼",
+  "bottle_with_popping_cork": "🍾",
   "spoon": "🥄",
   "fork_and_knife": "🍴",
-  "plate_with_cutlery": "🍽",
+  "fork_knife_plate": "🍽",
+  "dumpling": "🥟",
+  "fortune_cookie": "🥠",
+  "takeout_box": "🥡",
+  "chopsticks": "🥢",
+  "bowl_with_spoon": "🥣",
+  "cup_with_straw": "🥤",
+  "coconut": "🥥",
+  "broccoli": "🥦",
+  "pie": "🥧",
+  "pretzel": "🥨",
+  "cut_of_meat": "🥩",
+  "sandwich": "🥪",
+  "canned_food": "🥫",
   "soccer": "⚽",
   "basketball": "🏀",
   "football": "🏈",
@@ -542,65 +687,93 @@
   "volleyball": "🏐",
   "rugby_football": "🏉",
   "8ball": "🎱",
-  "golf": "⛳",
-  "golfing_woman": "🏌️‍♀️",
-  "golfing_man": "🏌",
   "ping_pong": "🏓",
+  "table_tennis": "🏓",
   "badminton": "🏸",
-  "goal_net": "🥅",
-  "ice_hockey": "🏒",
+  "goal": "🥅",
+  "hockey": "🏒",
   "field_hockey": "🏑",
-  "cricket": "🏏",
-  "ski": "🎿",
-  "skier": "⛷",
-  "snowboarder": "🏂",
-  "person_fencing": "🤺",
-  "women_wrestling": "🤼‍♀️",
-  "men_wrestling": "🤼‍♂️",
-  "woman_cartwheeling": "🤸‍♀️",
-  "man_cartwheeling": "🤸‍♂️",
-  "woman_playing_handball": "🤾‍♀️",
-  "man_playing_handball": "🤾‍♂️",
-  "ice_skate": "⛸",
+  "cricket_game": "🏏",
+  "cricket_bat_ball": "🏏",
+  "golf": "⛳",
   "bow_and_arrow": "🏹",
+  "archery": "🏹",
   "fishing_pole_and_fish": "🎣",
   "boxing_glove": "🥊",
   "martial_arts_uniform": "🥋",
-  "rowing_woman": "🚣‍♀️",
-  "rowing_man": "🚣",
-  "swimming_woman": "🏊‍♀️",
-  "swimming_man": "🏊",
-  "woman_playing_water_polo": "🤽‍♀️",
-  "man_playing_water_polo": "🤽‍♂️",
-  "surfing_woman": "🏄‍♀️",
-  "surfing_man": "🏄",
-  "bath": "🛀",
-  "basketball_woman": "⛹️‍♀️",
-  "basketball_man": "⛹",
-  "weight_lifting_woman": "🏋️‍♀️",
-  "weight_lifting_man": "🏋",
-  "biking_woman": "🚴‍♀️",
-  "biking_man": "🚴",
-  "mountain_biking_woman": "🚵‍♀️",
-  "mountain_biking_man": "🚵",
+  "karate_uniform": "🥋",
+  "ice_skate": "⛸",
+  "ski": "🎿",
+  "skier": "⛷",
+  "snowboarder": "🏂",
+  "woman_lifting_weights": "🏋♀",
+  "person_lifting_weights": "🏋",
+  "lifter": "🏋",
+  "weight_lifter": "🏋",
+  "man_lifting_weights": "🏋♂",
+  "person_fencing": "🤺",
+  "fencer": "🤺",
+  "women_wrestling": "🤼♀",
+  "men_wrestling": "🤼♂",
+  "people_wrestling": "🤼",
+  "wrestlers": "🤼",
+  "woman_cartwheeling": "🤸♀",
+  "man_cartwheeling": "🤸♂",
+  "person_doing_cartwheel": "🤸",
+  "woman_bouncing_ball": "⛹♀",
+  "person_bouncing_ball": "⛹",
+  "basketball_player": "⛹",
+  "person_with_ball": "⛹",
+  "man_bouncing_ball": "⛹♂",
+  "woman_playing_handball": "🤾♀",
+  "man_playing_handball": "🤾♂",
+  "person_playing_handball": "🤾",
+  "woman_golfing": "🏌♀",
+  "person_golfing": "🏌",
+  "golfer": "🏌",
+  "man_golfing": "🏌♂",
+  "woman_surfing": "🏄♀",
+  "person_surfing": "🏄",
+  "surfer": "🏄",
+  "man_surfing": "🏄♂",
+  "woman_swimming": "🏊♀",
+  "person_swimming": "🏊",
+  "swimmer": "🏊",
+  "man_swimming": "🏊♂",
+  "woman_playing_water_polo": "🤽♀",
+  "man_playing_water_polo": "🤽♂",
+  "person_playing_water_polo": "🤽",
+  "woman_rowing_boat": "🚣♀",
+  "person_rowing_boat": "🚣",
+  "man_rowing_boat": "🚣♂",
   "horse_racing": "🏇",
-  "business_suit_levitating": "🕴",
-  "trophy": "🏆",
+  "woman_biking": "🚴♀",
+  "person_biking": "🚴",
+  "bicyclist": "🚴",
+  "man_biking": "🚴♂",
+  "woman_mountain_biking": "🚵♀",
+  "person_mountain_biking": "🚵",
+  "mountain_bicyclist": "🚵",
+  "man_mountain_biking": "🚵♂",
   "running_shirt_with_sash": "🎽",
-  "medal_sports": "🏅",
-  "medal_military": "🎖",
-  "1st_place_medal": "🥇",
-  "2nd_place_medal": "🥈",
-  "3rd_place_medal": "🥉",
-  "reminder_ribbon": "🎗",
+  "medal": "🏅",
+  "military_medal": "🎖",
+  "first_place": "🥇",
+  "second_place": "🥈",
+  "third_place": "🥉",
+  "trophy": "🏆",
   "rosette": "🏵",
+  "reminder_ribbon": "🎗",
   "ticket": "🎫",
   "tickets": "🎟",
+  "circus_tent": "🎪",
+  "woman_juggling": "🤹♀",
+  "man_juggling": "🤹♂",
+  "person_juggling": "🤹",
+  "juggler": "🤹",
   "performing_arts": "🎭",
   "art": "🎨",
-  "circus_tent": "🎪",
-  "woman_juggling": "🤹‍♀️",
-  "man_juggling": "🤹‍♂️",
+  "clapper": "🎬",
   "microphone": "🎤",
   "headphones": "🎧",
   "musical_score": "🎼",
@@ -610,18 +783,28 @@
   "trumpet": "🎺",
   "guitar": "🎸",
   "violin": "🎻",
-  "clapper": "🎬",
-  "video_game": "🎮",
-  "space_invader": "👾",
-  "dart": "🎯",
   "game_die": "🎲",
-  "slot_machine": "🎰",
+  "dart": "🎯",
   "bowling": "🎳",
+  "video_game": "🎮",
+  "slot_machine": "🎰",
+  "sled": "🛷",
+  "breast_feeding": "🤱",
+  "person_in_steamy_room": "🧖",
+  "person_climbing": "🧗",
+  "person_in_lotus_position": "🧘",
+  "woman_in_steamy_room": "🧖♀",
+  "man_in_steamy_room": "🧖♂",
+  "woman_climbing": "🧗♀",
+  "man_climbing": "🧗♂",
+  "woman_in_lotus_position": "🧘♀",
+  "man_in_lotus_position": "🧘♂",
   "red_car": "🚗",
   "taxi": "🚕",
   "blue_car": "🚙",
   "bus": "🚌",
   "trolleybus": "🚎",
+  "race_car": "🏎",
   "racing_car": "🏎",
   "police_car": "🚓",
   "ambulance": "🚑",
@@ -630,10 +813,11 @@
   "truck": "🚚",
   "articulated_lorry": "🚛",
   "tractor": "🚜",
-  "kick_scooter": "🛴",
-  "motorcycle": "🏍",
+  "scooter": "🛴",
   "bike": "🚲",
   "motor_scooter": "🛵",
+  "motorbike": "🛵",
+  "motorcycle": "🏍",
   "rotating_light": "🚨",
   "oncoming_police_car": "🚔",
   "oncoming_bus": "🚍",
@@ -644,80 +828,73 @@
   "suspension_railway": "🚟",
   "railway_car": "🚃",
   "train": "🚋",
+  "mountain_railway": "🚞",
   "monorail": "🚝",
   "bullettrain_side": "🚄",
   "bullettrain_front": "🚅",
   "light_rail": "🚈",
-  "mountain_railway": "🚞",
   "steam_locomotive": "🚂",
   "train2": "🚆",
   "metro": "🚇",
   "tram": "🚊",
   "station": "🚉",
   "helicopter": "🚁",
+  "airplane_small": "🛩",
   "small_airplane": "🛩",
-  "airplane": "✈️",
-  "flight_departure": "🛫",
-  "flight_arrival": "🛬",
-  "sailboat": "⛵",
-  "motor_boat": "🛥",
-  "speedboat": "🚤",
-  "ferry": "⛴",
-  "passenger_ship": "🛳",
+  "airplane_departure": "🛫",
+  "airplane_arriving": "🛬",
   "rocket": "🚀",
-  "artificial_satellite": "🛰",
+  "satellite_orbital": "🛰",
   "seat": "💺",
   "canoe": "🛶",
-  "anchor": "⚓",
+  "kayak": "🛶",
+  "sailboat": "⛵",
+  "motorboat": "🛥",
+  "speedboat": "🚤",
+  "cruise_ship": "🛳",
+  "passenger_ship": "🛳",
+  "ferry": "⛴",
+  "ship": "🚢",
   "construction": "🚧",
   "fuelpump": "⛽",
   "busstop": "🚏",
   "vertical_traffic_light": "🚦",
   "traffic_light": "🚥",
-  "checkered_flag": "🏁",
-  "ship": "🚢",
-  "ferris_wheel": "🎡",
-  "roller_coaster": "🎢",
-  "carousel_horse": "🎠",
-  "building_construction": "🏗",
-  "foggy": "🌁",
-  "tokyo_tower": "🗼",
-  "factory": "🏭",
+  "map": "🗺",
+  "moyai": "🗿",
+  "statue_of_liberty": "🗽",
   "fountain": "⛲",
-  "rice_scene": "🎑",
-  "mountain": "⛰",
-  "mountain_snow": "🏔",
-  "mount_fuji": "🗻",
-  "volcano": "🌋",
-  "japan": "🗾",
-  "camping": "🏕",
-  "tent": "⛺",
-  "national_park": "🏞",
-  "motorway": "🛣",
-  "railway_track": "🛤",
-  "sunrise": "🌅",
-  "sunrise_over_mountains": "🌄",
-  "desert": "🏜",
-  "beach_umbrella": "🏖",
-  "desert_island": "🏝",
-  "city_sunrise": "🌇",
-  "city_sunset": "🌆",
-  "cityscape": "🏙",
-  "night_with_stars": "🌃",
-  "bridge_at_night": "🌉",
-  "milky_way": "🌌",
-  "stars": "🌠",
-  "sparkler": "🎇",
-  "fireworks": "🎆",
-  "rainbow": "🌈",
-  "houses": "🏘",
+  "tokyo_tower": "🗼",
   "european_castle": "🏰",
   "japanese_castle": "🏯",
   "stadium": "🏟",
-  "statue_of_liberty": "🗽",
+  "ferris_wheel": "🎡",
+  "roller_coaster": "🎢",
+  "carousel_horse": "🎠",
+  "beach_umbrella": "⛱",
+  "umbrella_on_ground": "⛱",
+  "beach": "🏖",
+  "island": "🏝",
+  "mountain": "⛰",
+  "mountain_snow": "🏔",
+  "snow_capped_mountain": "🏔",
+  "mount_fuji": "🗻",
+  "volcano": "🌋",
+  "desert": "🏜",
+  "camping": "🏕",
+  "tent": "⛺",
+  "railway_track": "🛤",
+  "railroad_track": "🛤",
+  "motorway": "🛣",
+  "construction_site": "🏗",
+  "building_construction": "🏗",
+  "factory": "🏭",
   "house": "🏠",
   "house_with_garden": "🏡",
-  "derelict_house": "🏚",
+  "homes": "🏘",
+  "house_buildings": "🏘",
+  "house_abandoned": "🏚",
+  "derelict_house_building": "🏚",
   "office": "🏢",
   "department_store": "🏬",
   "post_office": "🏣",
@@ -735,43 +912,61 @@
   "synagogue": "🕍",
   "kaaba": "🕋",
   "shinto_shrine": "⛩",
+  "japan": "🗾",
+  "rice_scene": "🎑",
+  "park": "🏞",
+  "sunrise": "🌅",
+  "sunrise_over_mountains": "🌄",
+  "stars": "🌠",
+  "sparkler": "🎇",
+  "fireworks": "🎆",
+  "city_sunset": "🌇",
+  "city_sunrise": "🌇",
+  "city_dusk": "🌆",
+  "cityscape": "🏙",
+  "night_with_stars": "🌃",
+  "milky_way": "🌌",
+  "bridge_at_night": "🌉",
+  "foggy": "🌁",
+  "flying_saucer": "🛸",
   "watch": "⌚",
   "iphone": "📱",
   "calling": "📲",
   "computer": "💻",
-  "keyboard": "⌨",
-  "desktop_computer": "🖥",
+  "desktop": "🖥",
   "printer": "🖨",
-  "computer_mouse": "🖱",
+  "mouse_three_button": "🖱",
+  "three_button_mouse": "🖱",
   "trackball": "🖲",
   "joystick": "🕹",
-  "clamp": "🗜",
+  "compression": "🗜",
   "minidisc": "💽",
   "floppy_disk": "💾",
   "cd": "💿",
   "dvd": "📀",
   "vhs": "📼",
   "camera": "📷",
-  "camera_flash": "📸",
+  "camera_with_flash": "📸",
   "video_camera": "📹",
   "movie_camera": "🎥",
-  "film_projector": "📽",
-  "film_strip": "🎞",
+  "projector": "📽",
+  "film_frames": "🎞",
   "telephone_receiver": "📞",
-  "phone": "☎️",
+  "telephone": "☎",
   "pager": "📟",
   "fax": "📠",
   "tv": "📺",
   "radio": "📻",
+  "microphone2": "🎙",
   "studio_microphone": "🎙",
   "level_slider": "🎚",
   "control_knobs": "🎛",
   "stopwatch": "⏱",
-  "timer_clock": "⏲",
+  "timer": "⏲",
   "alarm_clock": "⏰",
-  "mantelpiece_clock": "🕰",
-  "hourglass_flowing_sand": "⏳",
+  "clock": "🕰",
   "hourglass": "⌛",
+  "hourglass_flowing_sand": "⏳",
   "satellite": "📡",
   "battery": "🔋",
   "electric_plug": "🔌",
@@ -779,7 +974,7 @@
   "flashlight": "🔦",
   "candle": "🕯",
   "wastebasket": "🗑",
-  "oil_drum": "🛢",
+  "oil": "🛢",
   "money_with_wings": "💸",
   "dollar": "💵",
   "yen": "💴",
@@ -788,141 +983,135 @@
   "moneybag": "💰",
   "credit_card": "💳",
   "gem": "💎",
-  "balance_scale": "⚖",
   "wrench": "🔧",
   "hammer": "🔨",
-  "hammer_and_pick": "⚒",
+  "tools": "🛠",
   "hammer_and_wrench": "🛠",
   "pick": "⛏",
   "nut_and_bolt": "🔩",
-  "gear": "⚙",
   "chains": "⛓",
   "gun": "🔫",
   "bomb": "💣",
-  "hocho": "🔪",
+  "knife": "🔪",
   "dagger": "🗡",
-  "crossed_swords": "⚔",
   "shield": "🛡",
   "smoking": "🚬",
-  "skull_and_crossbones": "☠",
   "coffin": "⚰",
-  "funeral_urn": "⚱",
+  "urn": "⚱",
   "amphora": "🏺",
   "crystal_ball": "🔮",
   "prayer_beads": "📿",
   "barber": "💈",
-  "alembic": "⚗",
   "telescope": "🔭",
   "microscope": "🔬",
   "hole": "🕳",
   "pill": "💊",
   "syringe": "💉",
   "thermometer": "🌡",
-  "label": "🏷",
-  "bookmark": "🔖",
   "toilet": "🚽",
+  "potable_water": "🚰",
   "shower": "🚿",
   "bathtub": "🛁",
+  "bath": "🛀",
+  "bellhop": "🛎",
   "key": "🔑",
+  "key2": "🗝",
   "old_key": "🗝",
-  "couch_and_lamp": "🛋",
-  "sleeping_bed": "🛌",
-  "bed": "🛏",
   "door": "🚪",
-  "bellhop_bell": "🛎",
-  "framed_picture": "🖼",
-  "world_map": "🗺",
-  "parasol_on_ground": "⛱",
-  "moyai": "🗿",
-  "shopping": "🛍",
+  "couch": "🛋",
+  "bed": "🛏",
+  "sleeping_accommodation": "🛌",
+  "frame_photo": "🖼",
+  "frame_with_picture": "🖼",
+  "shopping_bags": "🛍",
   "shopping_cart": "🛒",
+  "shopping_trolley": "🛒",
+  "gift": "🎁",
   "balloon": "🎈",
   "flags": "🎏",
   "ribbon": "🎀",
-  "gift": "🎁",
   "confetti_ball": "🎊",
   "tada": "🎉",
   "dolls": "🎎",
-  "wind_chime": "🎐",
-  "crossed_flags": "🎌",
   "izakaya_lantern": "🏮",
-  "email": "✉️",
+  "wind_chime": "🎐",
   "envelope_with_arrow": "📩",
   "incoming_envelope": "📨",
-  "e-mail": "📧",
+  "email": "📧",
   "love_letter": "💌",
-  "postbox": "📮",
+  "inbox_tray": "📥",
+  "outbox_tray": "📤",
+  "package": "📦",
+  "label": "🏷",
   "mailbox_closed": "📪",
   "mailbox": "📫",
   "mailbox_with_mail": "📬",
   "mailbox_with_no_mail": "📭",
-  "package": "📦",
+  "postbox": "📮",
   "postal_horn": "📯",
-  "inbox_tray": "📥",
-  "outbox_tray": "📤",
   "scroll": "📜",
   "page_with_curl": "📃",
+  "page_facing_up": "📄",
   "bookmark_tabs": "📑",
   "bar_chart": "📊",
   "chart_with_upwards_trend": "📈",
   "chart_with_downwards_trend": "📉",
-  "page_facing_up": "📄",
-  "date": "📅",
+  "notepad_spiral": "🗒",
+  "spiral_note_pad": "🗒",
+  "calendar_spiral": "🗓",
+  "spiral_calendar_pad": "🗓",
   "calendar": "📆",
-  "spiral_calendar": "🗓",
+  "date": "📅",
   "card_index": "📇",
-  "card_file_box": "🗃",
+  "card_box": "🗃",
   "ballot_box": "🗳",
   "file_cabinet": "🗄",
   "clipboard": "📋",
-  "spiral_notepad": "🗒",
   "file_folder": "📁",
   "open_file_folder": "📂",
-  "card_index_dividers": "🗂",
-  "newspaper_roll": "🗞",
+  "dividers": "🗂",
+  "newspaper2": "🗞",
+  "rolled_up_newspaper": "🗞",
   "newspaper": "📰",
   "notebook": "📓",
+  "notebook_with_decorative_cover": "📔",
+  "ledger": "📒",
   "closed_book": "📕",
   "green_book": "📗",
   "blue_book": "📘",
   "orange_book": "📙",
-  "notebook_with_decorative_cover": "📔",
-  "ledger": "📒",
   "books": "📚",
-  "open_book": "📖",
+  "book": "📖",
+  "bookmark": "🔖",
   "link": "🔗",
   "paperclip": "📎",
   "paperclips": "🖇",
-  "scissors": "✂️",
   "triangular_ruler": "📐",
   "straight_ruler": "📏",
   "pushpin": "📌",
   "round_pushpin": "📍",
-  "triangular_flag_on_post": "🚩",
-  "white_flag": "🏳",
-  "black_flag": "🏴",
-  "rainbow_flag": "🏳️‍🌈",
+  "pen_ballpoint": "🖊",
+  "lower_left_ballpoint_pen": "🖊",
+  "pen_fountain": "🖋",
+  "lower_left_fountain_pen": "🖋",
+  "paintbrush": "🖌",
+  "crayon": "🖍",
+  "pencil": "📝",
+  "memo": "📝",
+  "pencil2": "✏",
+  "mag": "🔍",
+  "mag_right": "🔎",
+  "lock_with_ink_pen": "🔏",
   "closed_lock_with_key": "🔐",
   "lock": "🔒",
   "unlock": "🔓",
-  "lock_with_ink_pen": "🔏",
-  "pen": "🖊",
-  "fountain_pen": "🖋",
-  "black_nib": "✒️",
-  "memo": "📝",
-  "pencil2": "✏️",
-  "crayon": "🖍",
-  "paintbrush": "🖌",
-  "mag": "🔍",
-  "mag_right": "🔎",
-  "heart": "❤️",
+  "orange_heart": "🧡",
   "yellow_heart": "💛",
   "green_heart": "💚",
   "blue_heart": "💙",
   "purple_heart": "💜",
   "black_heart": "🖤",
   "broken_heart": "💔",
-  "heavy_heart_exclamation": "❣",
   "two_hearts": "💕",
   "revolving_hearts": "💞",
   "heartbeat": "💓",
@@ -931,110 +1120,88 @@
   "cupid": "💘",
   "gift_heart": "💝",
   "heart_decoration": "💟",
-  "peace_symbol": "☮",
-  "latin_cross": "✝",
+  "peace": "☮",
+  "cross": "✝",
   "star_and_crescent": "☪",
-  "om": "🕉",
-  "wheel_of_dharma": "☸",
-  "star_of_david": "✡",
+  "om_symbol": "🕉",
   "six_pointed_star": "🔯",
   "menorah": "🕎",
   "yin_yang": "☯",
-  "orthodox_cross": "☦",
   "place_of_worship": "🛐",
+  "worship_symbol": "🛐",
   "ophiuchus": "⛎",
-  "aries": "♈",
-  "taurus": "♉",
   "gemini": "♊",
   "cancer": "♋",
   "leo": "♌",
   "virgo": "♍",
   "libra": "♎",
   "scorpius": "♏",
-  "sagittarius": "♐",
-  "capricorn": "♑",
-  "aquarius": "♒",
-  "pisces": "♓",
   "id": "🆔",
-  "atom_symbol": "⚛",
-  "u7a7a": "🈳",
-  "u5272": "🈹",
-  "radioactive": "☢",
-  "biohazard": "☣",
+  "atom": "⚛",
+  "accept": "🉑",
   "mobile_phone_off": "📴",
   "vibration_mode": "📳",
   "u6709": "🈶",
   "u7121": "🈚",
   "u7533": "🈸",
   "u55b6": "🈺",
-  "u6708": "🈷️",
-  "eight_pointed_black_star": "✴️",
+  "u6708": "🈷",
   "vs": "🆚",
-  "accept": "🉑",
   "white_flower": "💮",
   "ideograph_advantage": "🉐",
-  "secret": "㊙️",
-  "congratulations": "㊗️",
   "u5408": "🈴",
   "u6e80": "🈵",
+  "u5272": "🈹",
   "u7981": "🈲",
-  "a": "🅰️",
-  "b": "🅱️",
+  "a": "🅰",
+  "b": "🅱",
   "ab": "🆎",
   "cl": "🆑",
-  "o2": "🅾️",
+  "o2": "🅾",
   "sos": "🆘",
+  "x": "❌",
+  "o": "⭕",
+  "octagonal_sign": "🛑",
+  "stop_sign": "🛑",
   "no_entry": "⛔",
   "name_badge": "📛",
   "no_entry_sign": "🚫",
-  "x": "❌",
-  "o": "⭕",
-  "stop_sign": "🛑",
   "anger": "💢",
-  "hotsprings": "♨️",
   "no_pedestrians": "🚷",
   "do_not_litter": "🚯",
   "no_bicycles": "🚳",
-  "non-potable_water": "🚱",
+  "non_potable_water": "🚱",
   "underage": "🔞",
   "no_mobile_phones": "📵",
-  "exclamation": "❗",
-  "grey_exclamation": "❕",
-  "question": "❓",
-  "grey_question": "❔",
-  "bangbang": "‼️",
-  "interrobang": "⁉️",
+  "no_smoking": "🚭",
+  "bangbang": "‼",
   "low_brightness": "🔅",
   "high_brightness": "🔆",
-  "trident": "🔱",
-  "fleur_de_lis": "⚜",
-  "part_alternation_mark": "〽️",
-  "warning": "⚠️",
+  "part_alternation_mark": "〽",
+  "warning": "⚠",
   "children_crossing": "🚸",
+  "trident": "🔱",
+  "fleur_de-lis": "⚜",
   "beginner": "🔰",
-  "recycle": "♻️",
+  "recycle": "♻",
   "u6307": "🈯",
   "chart": "💹",
-  "sparkle": "❇️",
-  "eight_spoked_asterisk": "✳️",
   "negative_squared_cross_mark": "❎",
-  "white_check_mark": "✅",
-  "diamond_shape_with_a_dot_inside": "💠",
-  "cyclone": "🌀",
-  "loop": "➿",
   "globe_with_meridians": "🌐",
-  "m": "Ⓜ️",
+  "diamond_shape_with_a_dot_inside": "💠",
+  "m": "Ⓜ",
+  "cyclone": "🌀",
+  "zzz": "💤",
   "atm": "🏧",
-  "sa": "🈂️",
+  "wc": "🚾",
+  "wheelchair": "♿",
+  "parking": "🅿",
+  "u7a7a": "🈳",
+  "sa": "🈂",
   "passport_control": "🛂",
   "customs": "🛃",
   "baggage_claim": "🛄",
   "left_luggage": "🛅",
-  "wheelchair": "♿",
-  "no_smoking": "🚭",
-  "wc": "🚾",
-  "parking": "🅿️",
-  "potable_water": "🚰",
   "mens": "🚹",
   "womens": "🚺",
   "baby_symbol": "🚼",
@@ -1043,123 +1210,110 @@
   "cinema": "🎦",
   "signal_strength": "📶",
   "koko": "🈁",
+  "symbols": "🔣",
+  "abc": "🔤",
+  "abcd": "🔡",
+  "capital_abcd": "🔠",
   "ng": "🆖",
   "ok": "🆗",
   "up": "🆙",
   "cool": "🆒",
   "new": "🆕",
   "free": "🆓",
-  "zero": "0️⃣",
-  "one": "1️⃣",
-  "two": "2️⃣",
-  "three": "3️⃣",
-  "four": "4️⃣",
-  "five": "5️⃣",
-  "six": "6️⃣",
-  "seven": "7️⃣",
-  "eight": "8️⃣",
-  "nine": "9️⃣",
+  "zero": "0⃣",
+  "one": "1⃣",
+  "two": "2⃣",
+  "three": "3⃣",
+  "four": "4⃣",
+  "five": "5⃣",
+  "six": "6⃣",
+  "seven": "7⃣",
+  "eight": "8⃣",
+  "nine": "9⃣",
   "keycap_ten": "🔟",
+  "hash": "#⃣",
   "asterisk": "*⃣",
-  "arrow_forward": "▶️",
+  "arrow_forward": "▶",
   "pause_button": "⏸",
-  "next_track_button": "⏭",
+  "double_vertical_bar": "⏸",
+  "play_pause": "⏯",
   "stop_button": "⏹",
   "record_button": "⏺",
-  "play_or_pause_button": "⏯",
-  "previous_track_button": "⏮",
+  "eject": "⏏",
+  "track_next": "⏭",
+  "next_track": "⏭",
+  "track_previous": "⏮",
+  "previous_track": "⏮",
   "fast_forward": "⏩",
   "rewind": "⏪",
+  "arrow_double_up": "⏫",
+  "arrow_double_down": "⏬",
+  "arrow_backward": "◀",
+  "arrow_up_small": "🔼",
+  "arrow_down_small": "🔽",
+  "arrow_right": "➡",
+  "arrow_left": "⬅",
+  "arrow_up": "⬆",
+  "arrow_down": "⬇",
+  "arrow_right_hook": "↪",
+  "leftwards_arrow_with_hook": "↩",
   "twisted_rightwards_arrows": "🔀",
   "repeat": "🔁",
   "repeat_one": "🔂",
-  "arrow_backward": "◀️",
-  "arrow_up_small": "🔼",
-  "arrow_down_small": "🔽",
-  "arrow_double_up": "⏫",
-  "arrow_double_down": "⏬",
-  "arrow_right": "➡️",
-  "arrow_left": "⬅️",
-  "arrow_up": "⬆️",
-  "arrow_down": "⬇️",
-  "arrow_upper_right": "↗️",
-  "arrow_lower_right": "↘️",
-  "arrow_lower_left": "↙️",
-  "arrow_upper_left": "↖️",
-  "arrow_up_down": "↕️",
-  "left_right_arrow": "↔️",
   "arrows_counterclockwise": "🔄",
-  "arrow_right_hook": "↪️",
-  "leftwards_arrow_with_hook": "↩️",
-  "arrow_heading_up": "⤴️",
-  "arrow_heading_down": "⤵️",
-  "hash": "#️⃣",
-  "information_source": "ℹ️",
-  "abc": "🔤",
-  "abcd": "🔡",
-  "capital_abcd": "🔠",
-  "symbols": "🔣",
+  "arrows_clockwise": "🔃",
   "musical_note": "🎵",
   "notes": "🎶",
-  "wavy_dash": "〰️",
-  "curly_loop": "➰",
-  "heavy_check_mark": "✔️",
-  "arrows_clockwise": "🔃",
-  "heavy_plus_sign": "➕",
-  "heavy_minus_sign": "➖",
-  "heavy_division_sign": "➗",
-  "heavy_multiplication_x": "✖️",
   "heavy_dollar_sign": "💲",
   "currency_exchange": "💱",
-  "copyright": "©️",
-  "registered": "®️",
-  "tm": "™️",
+  "copyright": "©",
+  "registered": "®",
+  "curly_loop": "➰",
+  "loop": "➿",
   "end": "🔚",
   "back": "🔙",
   "on": "🔛",
   "top": "🔝",
   "soon": "🔜",
-  "ballot_box_with_check": "☑️",
   "radio_button": "🔘",
   "white_circle": "⚪",
   "black_circle": "⚫",
   "red_circle": "🔴",
-  "large_blue_circle": "🔵",
+  "blue_circle": "🔵",
+  "small_red_triangle": "🔺",
+  "small_red_triangle_down": "🔻",
   "small_orange_diamond": "🔸",
   "small_blue_diamond": "🔹",
   "large_orange_diamond": "🔶",
   "large_blue_diamond": "🔷",
-  "small_red_triangle": "🔺",
-  "black_small_square": "▪️",
-  "white_small_square": "▫️",
-  "black_large_square": "⬛",
-  "white_large_square": "⬜",
-  "small_red_triangle_down": "🔻",
-  "black_medium_square": "◼️",
-  "white_medium_square": "◻️",
+  "white_square_button": "🔳",
+  "black_square_button": "🔲",
+  "black_small_square": "▪",
+  "white_small_square": "▫",
   "black_medium_small_square": "◾",
   "white_medium_small_square": "◽",
-  "black_square_button": "🔲",
-  "white_square_button": "🔳",
+  "black_medium_square": "◼",
+  "white_medium_square": "◻",
+  "black_large_square": "⬛",
+  "white_large_square": "⬜",
   "speaker": "🔈",
+  "mute": "🔇",
   "sound": "🔉",
   "loud_sound": "🔊",
-  "mute": "🔇",
-  "mega": "📣",
-  "loudspeaker": "📢",
   "bell": "🔔",
   "no_bell": "🔕",
-  "black_joker": "🃏",
-  "mahjong": "🀄",
-  "spades": "♠️",
-  "clubs": "♣️",
-  "hearts": "♥️",
-  "diamonds": "♦️",
-  "flower_playing_cards": "🎴",
-  "thought_balloon": "💭",
-  "right_anger_bubble": "🗯",
-  "speech_balloon": "💬",
+  "mega": "📣",
+  "loudspeaker": "📢",
+  "speech_left": "🗨",
   "left_speech_bubble": "🗨",
+  "eye_in_speech_bubble": "👁🗨",
+  "speech_balloon": "💬",
+  "thought_balloon": "💭",
+  "anger_right": "🗯",
+  "right_anger_bubble": "🗯",
+  "black_joker": "🃏",
+  "flower_playing_cards": "🎴",
+  "mahjong": "🀄",
   "clock1": "🕐",
   "clock2": "🕑",
   "clock3": "🕒",
@@ -1184,251 +1338,366 @@
   "clock1030": "🕥",
   "clock1130": "🕦",
   "clock1230": "🕧",
-  "afghanistan": "🇦🇫",
-  "aland_islands": "🇦🇽",
-  "albania": "🇦🇱",
-  "algeria": "🇩🇿",
-  "american_samoa": "🇦🇸",
-  "andorra": "🇦🇩",
-  "angola": "🇦🇴",
-  "anguilla": "🇦🇮",
-  "antarctica": "🇦🇶",
-  "antigua_barbuda": "🇦🇬",
-  "argentina": "🇦🇷",
-  "armenia": "🇦🇲",
-  "aruba": "🇦🇼",
-  "australia": "🇦🇺",
-  "austria": "🇦🇹",
-  "azerbaijan": "🇦🇿",
-  "bahamas": "🇧🇸",
-  "bahrain": "🇧🇭",
-  "bangladesh": "🇧🇩",
-  "barbados": "🇧🇧",
-  "belarus": "🇧🇾",
-  "belgium": "🇧🇪",
-  "belize": "🇧🇿",
-  "benin": "🇧🇯",
-  "bermuda": "🇧🇲",
-  "bhutan": "🇧🇹",
-  "bolivia": "🇧🇴",
-  "caribbean_netherlands": "🇧🇶",
-  "bosnia_herzegovina": "🇧🇦",
-  "botswana": "🇧🇼",
-  "brazil": "🇧🇷",
-  "british_indian_ocean_territory": "🇮🇴",
-  "british_virgin_islands": "🇻🇬",
-  "brunei": "🇧🇳",
-  "bulgaria": "🇧🇬",
-  "burkina_faso": "🇧🇫",
-  "burundi": "🇧🇮",
-  "cape_verde": "🇨🇻",
-  "cambodia": "🇰🇭",
-  "cameroon": "🇨🇲",
-  "canada": "🇨🇦",
-  "canary_islands": "🇮🇨",
-  "cayman_islands": "🇰🇾",
-  "central_african_republic": "🇨🇫",
-  "chad": "🇹🇩",
+  "flag_white": "🏳",
+  "waving_white_flag": "🏳",
+  "flag_black": "🏴",
+  "waving_black_flag": "🏴",
+  "checkered_flag": "🏁",
+  "triangular_flag_on_post": "🚩",
+  "rainbow_flag": "🏳🌈",
+  "gay_pride_flag": "🏳🌈",
+  "flag_af": "🇦🇫",
+  "flag_ax": "🇦🇽",
+  "flag_al": "🇦🇱",
+  "flag_dz": "🇩🇿",
+  "flag_as": "🇦🇸",
+  "flag_ad": "🇦🇩",
+  "flag_ao": "🇦🇴",
+  "flag_ai": "🇦🇮",
+  "flag_aq": "🇦🇶",
+  "flag_ag": "🇦🇬",
+  "flag_ar": "🇦🇷",
+  "flag_am": "🇦🇲",
+  "flag_aw": "🇦🇼",
+  "flag_au": "🇦🇺",
+  "flag_at": "🇦🇹",
+  "flag_az": "🇦🇿",
+  "flag_bs": "🇧🇸",
+  "flag_bh": "🇧🇭",
+  "flag_bd": "🇧🇩",
+  "flag_bb": "🇧🇧",
+  "flag_by": "🇧🇾",
+  "flag_be": "🇧🇪",
+  "flag_bz": "🇧🇿",
+  "flag_bj": "🇧🇯",
+  "flag_bm": "🇧🇲",
+  "flag_bt": "🇧🇹",
+  "flag_bo": "🇧🇴",
+  "flag_ba": "🇧🇦",
+  "flag_bw": "🇧🇼",
+  "flag_br": "🇧🇷",
+  "flag_io": "🇮🇴",
+  "flag_vg": "🇻🇬",
+  "flag_bn": "🇧🇳",
+  "flag_bg": "🇧🇬",
+  "flag_bf": "🇧🇫",
+  "flag_bi": "🇧🇮",
+  "flag_kh": "🇰🇭",
+  "flag_cm": "🇨🇲",
+  "flag_ca": "🇨🇦",
+  "flag_ic": "🇮🇨",
+  "flag_cv": "🇨🇻",
+  "flag_bq": "🇧🇶",
+  "flag_ky": "🇰🇾",
+  "flag_cf": "🇨🇫",
+  "flag_td": "🇹🇩",
+  "flag_cl": "🇨🇱",
   "chile": "🇨🇱",
-  "cn": "🇨🇳",
-  "christmas_island": "🇨🇽",
-  "cocos_islands": "🇨🇨",
-  "colombia": "🇨🇴",
-  "comoros": "🇰🇲",
-  "congo_brazzaville": "🇨🇬",
-  "congo_kinshasa": "🇨🇩",
-  "cook_islands": "🇨🇰",
-  "costa_rica": "🇨🇷",
-  "croatia": "🇭🇷",
-  "cuba": "🇨🇺",
-  "curacao": "🇨🇼",
-  "cyprus": "🇨🇾",
-  "czech_republic": "🇨🇿",
-  "denmark": "🇩🇰",
-  "djibouti": "🇩🇯",
-  "dominica": "🇩🇲",
-  "dominican_republic": "🇩🇴",
-  "ecuador": "🇪🇨",
-  "egypt": "🇪🇬",
-  "el_salvador": "🇸🇻",
-  "equatorial_guinea": "🇬🇶",
-  "eritrea": "🇪🇷",
-  "estonia": "🇪🇪",
-  "ethiopia": "🇪🇹",
-  "eu": "🇪🇺",
-  "falkland_islands": "🇫🇰",
-  "faroe_islands": "🇫🇴",
-  "fiji": "🇫🇯",
-  "finland": "🇫🇮",
-  "fr": "🇫🇷",
-  "french_guiana": "🇬🇫",
-  "french_polynesia": "🇵🇫",
-  "french_southern_territories": "🇹🇫",
-  "gabon": "🇬🇦",
-  "gambia": "🇬🇲",
-  "georgia": "🇬🇪",
-  "de": "🇩🇪",
-  "ghana": "🇬🇭",
-  "gibraltar": "🇬🇮",
-  "greece": "🇬🇷",
-  "greenland": "🇬🇱",
-  "grenada": "🇬🇩",
-  "guadeloupe": "🇬🇵",
-  "guam": "🇬🇺",
-  "guatemala": "🇬🇹",
-  "guernsey": "🇬🇬",
-  "guinea": "🇬🇳",
-  "guinea_bissau": "🇬🇼",
-  "guyana": "🇬🇾",
-  "haiti": "🇭🇹",
-  "honduras": "🇭🇳",
-  "hong_kong": "🇭🇰",
-  "hungary": "🇭🇺",
-  "iceland": "🇮🇸",
-  "india": "🇮🇳",
+  "flag_cn": "🇨🇳",
+  "flag_cx": "🇨🇽",
+  "flag_cc": "🇨🇨",
+  "flag_co": "🇨🇴",
+  "flag_km": "🇰🇲",
+  "flag_cg": "🇨🇬",
+  "flag_cd": "🇨🇩",
+  "congo": "🇨🇩",
+  "flag_ck": "🇨🇰",
+  "flag_cr": "🇨🇷",
+  "flag_ci": "🇨🇮",
+  "flag_hr": "🇭🇷",
+  "flag_cu": "🇨🇺",
+  "flag_cw": "🇨🇼",
+  "flag_cy": "🇨🇾",
+  "flag_cz": "🇨🇿",
+  "flag_dk": "🇩🇰",
+  "flag_dj": "🇩🇯",
+  "flag_dm": "🇩🇲",
+  "flag_do": "🇩🇴",
+  "flag_ec": "🇪🇨",
+  "flag_eg": "🇪🇬",
+  "flag_sv": "🇸🇻",
+  "flag_gq": "🇬🇶",
+  "flag_er": "🇪🇷",
+  "flag_ee": "🇪🇪",
+  "flag_et": "🇪🇹",
+  "flag_eu": "🇪🇺",
+  "flag_fk": "🇫🇰",
+  "flag_fo": "🇫🇴",
+  "flag_fj": "🇫🇯",
+  "flag_fi": "🇫🇮",
+  "flag_fr": "🇫🇷",
+  "flag_gf": "🇬🇫",
+  "flag_pf": "🇵🇫",
+  "flag_tf": "🇹🇫",
+  "flag_ga": "🇬🇦",
+  "flag_gm": "🇬🇲",
+  "flag_ge": "🇬🇪",
+  "flag_de": "🇩🇪",
+  "flag_gh": "🇬🇭",
+  "flag_gi": "🇬🇮",
+  "flag_gr": "🇬🇷",
+  "flag_gl": "🇬🇱",
+  "flag_gd": "🇬🇩",
+  "flag_gp": "🇬🇵",
+  "flag_gu": "🇬🇺",
+  "flag_gt": "🇬🇹",
+  "flag_gg": "🇬🇬",
+  "flag_gn": "🇬🇳",
+  "flag_gw": "🇬🇼",
+  "flag_gy": "🇬🇾",
+  "flag_ht": "🇭🇹",
+  "flag_hn": "🇭🇳",
+  "flag_hk": "🇭🇰",
+  "flag_hu": "🇭🇺",
+  "flag_is": "🇮🇸",
+  "flag_in": "🇮🇳",
+  "flag_id": "🇮🇩",
   "indonesia": "🇮🇩",
-  "iran": "🇮🇷",
-  "iraq": "🇮🇶",
-  "ireland": "🇮🇪",
-  "isle_of_man": "🇮🇲",
-  "israel": "🇮🇱",
-  "it": "🇮🇹",
-  "cote_divoire": "🇨🇮",
-  "jamaica": "🇯🇲",
-  "jp": "🇯🇵",
-  "jersey": "🇯🇪",
-  "jordan": "🇯🇴",
-  "kazakhstan": "🇰🇿",
-  "kenya": "🇰🇪",
-  "kiribati": "🇰🇮",
-  "kosovo": "🇽🇰",
-  "kuwait": "🇰🇼",
-  "kyrgyzstan": "🇰🇬",
-  "laos": "🇱🇦",
-  "latvia": "🇱🇻",
-  "lebanon": "🇱🇧",
-  "lesotho": "🇱🇸",
-  "liberia": "🇱🇷",
-  "libya": "🇱🇾",
-  "liechtenstein": "🇱🇮",
-  "lithuania": "🇱🇹",
-  "luxembourg": "🇱🇺",
-  "macau": "🇲🇴",
-  "macedonia": "🇲🇰",
-  "madagascar": "🇲🇬",
-  "malawi": "🇲🇼",
-  "malaysia": "🇲🇾",
-  "maldives": "🇲🇻",
-  "mali": "🇲🇱",
-  "malta": "🇲🇹",
-  "marshall_islands": "🇲🇭",
-  "martinique": "🇲🇶",
-  "mauritania": "🇲🇷",
-  "mauritius": "🇲🇺",
-  "mayotte": "🇾🇹",
-  "mexico": "🇲🇽",
-  "micronesia": "🇫🇲",
-  "moldova": "🇲🇩",
-  "monaco": "🇲🇨",
-  "mongolia": "🇲🇳",
-  "montenegro": "🇲🇪",
-  "montserrat": "🇲🇸",
-  "morocco": "🇲🇦",
-  "mozambique": "🇲🇿",
-  "myanmar": "🇲🇲",
-  "namibia": "🇳🇦",
-  "nauru": "🇳🇷",
-  "nepal": "🇳🇵",
-  "netherlands": "🇳🇱",
-  "new_caledonia": "🇳🇨",
-  "new_zealand": "🇳🇿",
-  "nicaragua": "🇳🇮",
-  "niger": "🇳🇪",
+  "flag_ir": "🇮🇷",
+  "flag_iq": "🇮🇶",
+  "flag_ie": "🇮🇪",
+  "flag_im": "🇮🇲",
+  "flag_il": "🇮🇱",
+  "flag_it": "🇮🇹",
+  "flag_jm": "🇯🇲",
+  "flag_jp": "🇯🇵",
+  "crossed_flags": "🎌",
+  "flag_je": "🇯🇪",
+  "flag_jo": "🇯🇴",
+  "flag_kz": "🇰🇿",
+  "flag_ke": "🇰🇪",
+  "flag_ki": "🇰🇮",
+  "flag_xk": "🇽🇰",
+  "flag_kw": "🇰🇼",
+  "flag_kg": "🇰🇬",
+  "flag_la": "🇱🇦",
+  "flag_lv": "🇱🇻",
+  "flag_lb": "🇱🇧",
+  "flag_ls": "🇱🇸",
+  "flag_lr": "🇱🇷",
+  "flag_ly": "🇱🇾",
+  "flag_li": "🇱🇮",
+  "flag_lt": "🇱🇹",
+  "flag_lu": "🇱🇺",
+  "flag_mo": "🇲🇴",
+  "flag_mk": "🇲🇰",
+  "flag_mg": "🇲🇬",
+  "flag_mw": "🇲🇼",
+  "flag_my": "🇲🇾",
+  "flag_mv": "🇲🇻",
+  "flag_ml": "🇲🇱",
+  "flag_mt": "🇲🇹",
+  "flag_mh": "🇲🇭",
+  "flag_mq": "🇲🇶",
+  "flag_mr": "🇲🇷",
+  "flag_mu": "🇲🇺",
+  "flag_yt": "🇾🇹",
+  "flag_mx": "🇲🇽",
+  "flag_fm": "🇫🇲",
+  "flag_md": "🇲🇩",
+  "flag_mc": "🇲🇨",
+  "flag_mn": "🇲🇳",
+  "flag_me": "🇲🇪",
+  "flag_ms": "🇲🇸",
+  "flag_ma": "🇲🇦",
+  "flag_mz": "🇲🇿",
+  "flag_mm": "🇲🇲",
+  "flag_na": "🇳🇦",
+  "flag_nr": "🇳🇷",
+  "flag_np": "🇳🇵",
+  "flag_nl": "🇳🇱",
+  "flag_nc": "🇳🇨",
+  "flag_nz": "🇳🇿",
+  "flag_ni": "🇳🇮",
+  "flag_ne": "🇳🇪",
+  "flag_ng": "🇳🇬",
   "nigeria": "🇳🇬",
-  "niue": "🇳🇺",
-  "norfolk_island": "🇳🇫",
-  "northern_mariana_islands": "🇲🇵",
-  "north_korea": "🇰🇵",
-  "norway": "🇳🇴",
-  "oman": "🇴🇲",
-  "pakistan": "🇵🇰",
-  "palau": "🇵🇼",
-  "palestinian_territories": "🇵🇸",
-  "panama": "🇵🇦",
-  "papua_new_guinea": "🇵🇬",
-  "paraguay": "🇵🇾",
-  "peru": "🇵🇪",
-  "philippines": "🇵🇭",
-  "pitcairn_islands": "🇵🇳",
-  "poland": "🇵🇱",
-  "portugal": "🇵🇹",
-  "puerto_rico": "🇵🇷",
-  "qatar": "🇶🇦",
-  "reunion": "🇷🇪",
-  "romania": "🇷🇴",
-  "ru": "🇷🇺",
-  "rwanda": "🇷🇼",
-  "st_barthelemy": "🇧🇱",
-  "st_helena": "🇸🇭",
-  "st_kitts_nevis": "🇰🇳",
-  "st_lucia": "🇱🇨",
-  "st_pierre_miquelon": "🇵🇲",
-  "st_vincent_grenadines": "🇻🇨",
-  "samoa": "🇼🇸",
-  "san_marino": "🇸🇲",
-  "sao_tome_principe": "🇸🇹",
-  "saudi_arabia": "🇸🇦",
-  "senegal": "🇸🇳",
-  "serbia": "🇷🇸",
-  "seychelles": "🇸🇨",
-  "sierra_leone": "🇸🇱",
-  "singapore": "🇸🇬",
-  "sint_maarten": "🇸🇽",
-  "slovakia": "🇸🇰",
-  "slovenia": "🇸🇮",
-  "solomon_islands": "🇸🇧",
-  "somalia": "🇸🇴",
-  "south_africa": "🇿🇦",
-  "south_georgia_south_sandwich_islands": "🇬🇸",
-  "kr": "🇰🇷",
-  "south_sudan": "🇸🇸",
-  "es": "🇪🇸",
-  "sri_lanka": "🇱🇰",
-  "sudan": "🇸🇩",
-  "suriname": "🇸🇷",
-  "swaziland": "🇸🇿",
-  "sweden": "🇸🇪",
-  "switzerland": "🇨🇭",
-  "syria": "🇸🇾",
-  "taiwan": "🇹🇼",
-  "tajikistan": "🇹🇯",
-  "tanzania": "🇹🇿",
-  "thailand": "🇹🇭",
-  "timor_leste": "🇹🇱",
-  "togo": "🇹🇬",
-  "tokelau": "🇹🇰",
-  "tonga": "🇹🇴",
-  "trinidad_tobago": "🇹🇹",
-  "tunisia": "🇹🇳",
-  "tr": "🇹🇷",
+  "flag_nu": "🇳🇺",
+  "flag_nf": "🇳🇫",
+  "flag_kp": "🇰🇵",
+  "flag_mp": "🇲🇵",
+  "flag_no": "🇳🇴",
+  "flag_om": "🇴🇲",
+  "flag_pk": "🇵🇰",
+  "flag_pw": "🇵🇼",
+  "flag_ps": "🇵🇸",
+  "flag_pa": "🇵🇦",
+  "flag_pg": "🇵🇬",
+  "flag_py": "🇵🇾",
+  "flag_pe": "🇵🇪",
+  "flag_ph": "🇵🇭",
+  "flag_pn": "🇵🇳",
+  "flag_pl": "🇵🇱",
+  "flag_pt": "🇵🇹",
+  "flag_pr": "🇵🇷",
+  "flag_qa": "🇶🇦",
+  "flag_re": "🇷🇪",
+  "flag_ro": "🇷🇴",
+  "flag_ru": "🇷🇺",
+  "flag_rw": "🇷🇼",
+  "flag_ws": "🇼🇸",
+  "flag_sm": "🇸🇲",
+  "flag_st": "🇸🇹",
+  "flag_sa": "🇸🇦",
+  "saudiarabia": "🇸🇦",
+  "saudi": "🇸🇦",
+  "flag_sn": "🇸🇳",
+  "flag_rs": "🇷🇸",
+  "flag_sc": "🇸🇨",
+  "flag_sl": "🇸🇱",
+  "flag_sg": "🇸🇬",
+  "flag_sx": "🇸🇽",
+  "flag_sk": "🇸🇰",
+  "flag_si": "🇸🇮",
+  "flag_gs": "🇬🇸",
+  "flag_sb": "🇸🇧",
+  "flag_so": "🇸🇴",
+  "flag_za": "🇿🇦",
+  "flag_kr": "🇰🇷",
+  "flag_ss": "🇸🇸",
+  "flag_es": "🇪🇸",
+  "flag_lk": "🇱🇰",
+  "flag_bl": "🇧🇱",
+  "flag_sh": "🇸🇭",
+  "flag_kn": "🇰🇳",
+  "flag_lc": "🇱🇨",
+  "flag_pm": "🇵🇲",
+  "flag_vc": "🇻🇨",
+  "flag_sd": "🇸🇩",
+  "flag_sr": "🇸🇷",
+  "flag_sz": "🇸🇿",
+  "flag_se": "🇸🇪",
+  "flag_ch": "🇨🇭",
+  "flag_sy": "🇸🇾",
+  "flag_tw": "🇹🇼",
+  "flag_tj": "🇹🇯",
+  "flag_tz": "🇹🇿",
+  "flag_th": "🇹🇭",
+  "flag_tl": "🇹🇱",
+  "flag_tg": "🇹🇬",
+  "flag_tk": "🇹🇰",
+  "flag_to": "🇹🇴",
+  "flag_tt": "🇹🇹",
+  "flag_tn": "🇹🇳",
+  "flag_tr": "🇹🇷",
+  "flag_tm": "🇹🇲",
   "turkmenistan": "🇹🇲",
-  "turks_caicos_islands": "🇹🇨",
+  "flag_tc": "🇹🇨",
+  "flag_tv": "🇹🇻",
   "tuvalu": "🇹🇻",
-  "uganda": "🇺🇬",
-  "ukraine": "🇺🇦",
-  "united_arab_emirates": "🇦🇪",
-  "uk": "🇬🇧",
-  "us": "🇺🇸",
-  "us_virgin_islands": "🇻🇮",
-  "uruguay": "🇺🇾",
-  "uzbekistan": "🇺🇿",
-  "vanuatu": "🇻🇺",
-  "vatican_city": "🇻🇦",
-  "venezuela": "🇻🇪",
-  "vietnam": "🇻🇳",
-  "wallis_futuna": "🇼🇫",
-  "western_sahara": "🇪🇭",
-  "yemen": "🇾🇪",
-  "zambia": "🇿🇲",
-  "zimbabwe": "🇿🇼"
-}
\ No newline at end of file
+  "flag_vi": "🇻🇮",
+  "flag_ug": "🇺🇬",
+  "flag_ua": "🇺🇦",
+  "flag_ae": "🇦🇪",
+  "flag_gb": "🇬🇧",
+  "flag_us": "🇺🇸",
+  "flag_uy": "🇺🇾",
+  "flag_uz": "🇺🇿",
+  "flag_vu": "🇻🇺",
+  "flag_va": "🇻🇦",
+  "flag_ve": "🇻🇪",
+  "flag_vn": "🇻🇳",
+  "flag_wf": "🇼🇫",
+  "flag_eh": "🇪🇭",
+  "flag_ye": "🇾🇪",
+  "flag_zm": "🇿🇲",
+  "flag_zw": "🇿🇼",
+  "flag_ac": "🇦🇨",
+  "flag_ta": "🇹🇦",
+  "flag_bv": "🇧🇻",
+  "flag_hm": "🇭🇲",
+  "flag_sj": "🇸🇯",
+  "flag_um": "🇺🇲",
+  "flag_ea": "🇪🇦",
+  "flag_cp": "🇨🇵",
+  "flag_dg": "🇩🇬",
+  "flag_mf": "🇲🇫",
+  "united_nations": "🇺🇳",
+  "england": "🏴󠁧󠁢󠁥󠁮󠁧󠁿",
+  "scotland": "🏴󠁧󠁢󠁳󠁣󠁴󠁿",
+  "wales": "🏴󠁧󠁢󠁷󠁬󠁳󠁿",
+  "asterisk_symbol": "*",
+  "regional_indicator_z": "🇿",
+  "regional_indicator_y": "🇾",
+  "regional_indicator_x": "🇽",
+  "pound_symbol": "#",
+  "regional_indicator_w": "🇼",
+  "regional_indicator_v": "🇻",
+  "regional_indicator_u": "🇺",
+  "regional_indicator_t": "🇹",
+  "regional_indicator_s": "🇸",
+  "regional_indicator_r": "🇷",
+  "regional_indicator_q": "🇶",
+  "regional_indicator_p": "🇵",
+  "regional_indicator_o": "🇴",
+  "regional_indicator_n": "🇳",
+  "regional_indicator_m": "🇲",
+  "regional_indicator_l": "🇱",
+  "regional_indicator_k": "🇰",
+  "regional_indicator_j": "🇯",
+  "regional_indicator_i": "🇮",
+  "regional_indicator_h": "🇭",
+  "regional_indicator_g": "🇬",
+  "regional_indicator_f": "🇫",
+  "regional_indicator_e": "🇪",
+  "regional_indicator_d": "🇩",
+  "regional_indicator_c": "🇨",
+  "regional_indicator_b": "🇧",
+  "regional_indicator_a": "🇦",
+  "digit_nine": "9",
+  "digit_eight": "8",
+  "digit_seven": "7",
+  "digit_six": "6",
+  "digit_five": "5",
+  "digit_four": "4",
+  "digit_three": "3",
+  "digit_two": "2",
+  "digit_one": "1",
+  "digit_zero": "0",
+  "family_man_woman_boy": "👨👩👦",
+  "couple_with_heart_woman_man": "👩❤👨",
+  "kiss_woman_man": "👩❤💋👨",
+  "face_with_raised_eyebrow": "🤨",
+  "star_struck": "🤩",
+  "crazy_face": "🤪",
+  "shushing_face": "🤫",
+  "face_with_symbols_over_mouth": "🤬",
+  "face_with_hand_over_mouth": "🤭",
+  "face_vomiting": "🤮",
+  "exploding_head": "🤯",
+  "face_with_monocle": "🧐",
+  "adult": "🧑",
+  "child": "🧒",
+  "older_adult": "🧓",
+  "bearded_person": "🧔",
+  "woman_with_headscarf": "🧕",
+  "brain": "🧠",
+  "billed_cap": "🧢",
+  "mage": "🧙",
+  "fairy": "🧚",
+  "vampire": "🧛",
+  "merperson": "🧜",
+  "elf": "🧝",
+  "genie": "🧞",
+  "zombie": "🧟",
+  "scarf": "🧣",
+  "gloves": "🧤",
+  "coat": "🧥",
+  "socks": "🧦",
+  "love_you_gesture": "🤟",
+  "palms_up_together": "🤲",
+  "woman_mage": "🧙♀",
+  "man_mage": "🧙♂",
+  "woman_fairy": "🧚♀",
+  "man_fairy": "🧚♂",
+  "woman_vampire": "🧛♀",
+  "man_vampire": "🧛♂",
+  "mermaid": "🧜♀",
+  "merman": "🧜♂",
+  "woman_elf": "🧝♀",
+  "man_elf": "🧝♂",
+  "woman_genie": "🧞♀",
+  "man_genie": "🧞♂",
+  "woman_zombie": "🧟♀",
+  "man_zombie": "🧟♂"
+}
diff --git a/scripts/generate-emoji.js b/scripts/generate-emoji.js
new file mode 100644
index 00000000..de02eed1
--- /dev/null
+++ b/scripts/generate-emoji.js
@@ -0,0 +1,70 @@
+"use strict";
+
+const request = require("request");
+const path = require("path");
+const fs = require("fs");
+const fuzzy = require("fuzzy");
+
+request.get({
+	url: "https://raw.githubusercontent.com/emojione/emojione/master/emoji_strategy.json",
+	json: true,
+}, (error, response, emojiStrategy) => {
+	const emojiMap = {};
+
+	for (const key in emojiStrategy) {
+		if (emojiStrategy.hasOwnProperty(key)) {
+			const shortname = prepareShortName(emojiStrategy[key].shortname);
+
+			// Skip tones, at least for now
+			if (shortname.indexOf("tone") > -1) {
+				continue;
+			}
+
+			const unicode = stringToUnicode(key);
+
+			emojiMap[shortname] = unicode;
+
+			for (let alternative of emojiStrategy[key].shortname_alternates) {
+				alternative = prepareShortName(alternative);
+
+				if (fuzzy.test(shortname, alternative) || fuzzy.test(alternative, shortname)) {
+					continue;
+				}
+
+				emojiMap[alternative] = unicode;
+			}
+		}
+	}
+
+	const output = JSON.stringify(emojiMap, null, 2) + "\n";
+
+	fs.writeFileSync(path.resolve(path.join(
+		__dirname,
+		"..",
+		"client",
+		"js",
+		"libs",
+		"simplemap.json"
+	)), output);
+});
+
+function stringToUnicode(key) {
+	return key
+		.split("-")
+		.map((c) => String.fromCodePoint(`0x${c}`))
+		.join("");
+}
+
+function prepareShortName(shortname) {
+	if (shortname === ":-1:") {
+		// We replace dashes, but should keep :-1: working
+		return "-1";
+	} else if (shortname === ":e-mail:") {
+		// :email: exists as an alternative, should figure out how to use it instead
+		return "email";
+	}
+
+	return shortname
+		.slice(1, -1)
+		.replace("-", "_");
+}