diff --git a/emoji/emojimap.json b/emoji/emojimap.json
index c9574c0..d76ad3b 100644
--- a/emoji/emojimap.json
+++ b/emoji/emojimap.json
@@ -52,52 +52,52 @@
     [":copyright:", "U+00A9"],
     [":corn:", "U+1F33D"],
     [":cow:", "U+1F42E"],
-    [":crescent_moon:"],
-    [":crown:"],
-    [":cry:"],
-    [":crystal_ball:"],
-    [":curly_loop:"],
-    [":dancers:"],
-    [":dash:"],
-    [":de:"],
-    [":diamonds:"],
-    [":dog:"],
-    [":doughnut:"],
-    [":dragon:"],
-    [":dvd:"],
-    [":ear:"],
-    [":eggplant:"],
-    [":elephant:"],
-    [":end:"],
-    [":envelope:"],
-    [":es:"],
-    [":eyes:"],
-    [":facepunch:"],
-    [":family:"],
-    [":ferris_wheel:"],
+    [":crescent_moon:", "U+1F319"],
+    [":crown:", "U+1F451"],
+    [":cry:", "U+1F622"],
+    [":crystal_ball:", "U+1F52E"],
+    [":curly_loop:", "U+27B0"],
+    [":dancers:", "U+1F46F"],
+    [":dash:", "U+1F4A8"],
+    [":de:", "U+1F1E9", "U+1F1EA"],
+    [":diamonds:", "U+2666"],
+    [":dog:", "U+1F436"],
+    [":doughnut:", "U+1F369"],
+    [":dragon:", "U+1F409"],
+    [":dvd:", "U+1F4C0"],
+    [":ear:", "U+1F442"],
+    [":eggplant:", "U+1F346"],
+    [":elephant:", "U+1F418"],
+    [":end:", "U+1F51A"],
+    [":envelope:", "U+2709"],
+    [":es:", "U+1F1EA", "U+1F1F8"],
+    [":eyes:", "U+1F440"],
+    [":facepunch:", "U+1F44A"],
+    [":family:", "U+1F46A"],
+    [":ferris_wheel:", "U+1F3A1"],
     [":cold_sweat:", "U+1F630"],
-    [":fire:"],
-    [":fireworks:"],
-    [":floppy_disk:"],
-    [":football:"],
-    [":fork_and_knife:"],
-    [":four_leaf_clover:"],
-    [":fr:"],
-    [":fries:"],
+    [":fire:", "U+1F525"],
+    [":fireworks:", "U+1F386"],
+    [":floppy_disk:", "U+1F4BE"],
+    [":football:", "U+1F3C8"],
+    [":fork_and_knife:", "U+1F374"],
+    [":four_leaf_clover:", "U+1F340"],
+    [":fr:", "U+1F1EB", "U+1F1F7"],
+    [":fries:", "U+1F35F"],
     [":frog:"],
-    [":fu:"],
-    [":full_moon:"],
-    [":game_die:"],
-    [":eu:"],
-    [":gem:"],
-    [":girl:"],
-    [":goat:"],
-    [":grimacing:"],
-    [":grin:"],
-    [":guardsman:"],
-    [":guitar:"],
-    [":gun:"],
-    [":hamburger:"],
+    [":fu:", "U+1F595"],
+    [":full_moon:", "U+1F315"],
+    [":game_die:", "U+1F3B2"],
+    [":eu:", "U+1F1EA", "U+1F1FA"],
+    [":gem:", "U+1F48E"],
+    [":girl:", "U+1F467"],
+    [":goat:", "U+1F410"],
+    [":grimacing:", "U+1F62C"],
+    [":grin:", "U+1F600"],
+    [":guardsman:", "U+1F482"],
+    [":guitar:", "U+1F3B8"],
+    [":gun:", "U+1F52B"],
+    [":hamburger:", "U+1F354"],
     [":hammer:"],
     [":hamster:"],
     [":hear_no_evil:"],
diff --git a/emoji/list.md b/emoji/list.md
index 75fe52b..9cb9056 100644
--- a/emoji/list.md
+++ b/emoji/list.md
@@ -65,52 +65,52 @@ draft+2
   * `47` -- :copyright: `:copyright:` U+00A9
   * `48` -- :corn: `:corn:` U+1F33D
   * `49` -- :cow: `:cow:` U+1F42E
-  * `50` -- :crescent_moon: `:crescent_moon:`
-  * `51` -- :crown: `:crown:`
-  * `52` -- :cry: `:cry:`
-  * `53` -- :crystal_ball: `:crystal_ball:`
-  * `54` -- :curly_loop: `:curly_loop:`
-  * `55` -- :dancers: `:dancers:`
-  * `56` -- :dash: `:dash:`
-  * `57` -- :de: `:de:`
-  * `58` -- :diamonds: `:diamonds:`
-  * `59` -- :dog: `:dog:`
-  * `60` -- :doughnut: `:doughnut:`
-  * `61` -- :dragon: `:dragon:`
-  * `62` -- :dvd: `:dvd:`
-  * `63` -- :ear: `:ear:`
-  * `64` -- :eggplant: `:eggplant:`
-  * `65` -- :elephant: `:elephant:`
-  * `66` -- :end: `:end:`
-  * `67` -- :envelope: `:envelope:`
-  * `68` -- :es: `:es:`
-  * `69` -- :eyes: `:eyes:`
-  * `70` -- :facepunch: `:facepunch:`
-  * `71` -- :family: `:family:`
-  * `72` -- :ferris_wheel: `:ferris_wheel:`
+  * `50` -- :crescent_moon: `:crescent_moon:` U+1F319
+  * `51` -- :crown: `:crown:` U+1F451
+  * `52` -- :cry: `:cry:` U+1F622
+  * `53` -- :crystal_ball: `:crystal_ball:` U+1F52E
+  * `54` -- :curly_loop: `:curly_loop:` U+27B0
+  * `55` -- :dancers: `:dancers:` U+1F46F
+  * `56` -- :dash: `:dash:` U+1F4A8
+  * `57` -- :de: `:de:` U+1F1E9 U+1F1EA
+  * `58` -- :diamonds: `:diamonds:` U+2666
+  * `59` -- :dog: `:dog:` U+1F436
+  * `60` -- :doughnut: `:doughnut:` U+1F369
+  * `61` -- :dragon: `:dragon:` U+1F409
+  * `62` -- :dvd: `:dvd:` U+1F4C0
+  * `63` -- :ear: `:ear:` U+1F442
+  * `64` -- :eggplant: `:eggplant:` U+1F346
+  * `65` -- :elephant: `:elephant:` U+1F418
+  * `66` -- :end: `:end:` U+1F51A
+  * `67` -- :envelope: `:envelope:` U+2709
+  * `68` -- :es: `:es:` U+1F1EA U+1F1F8
+  * `69` -- :eyes: `:eyes:` U+1F440
+  * `70` -- :facepunch: `:facepunch:` U+1F44A
+  * `71` -- :family: `:family:` U+1F46A
+  * `72` -- :ferris_wheel: `:ferris_wheel:` U+1F3A1
   * `73` -- :cold_sweat: `:cold_sweat:` U+1F630
-  * `74` -- :fire: `:fire:`
-  * `75` -- :fireworks: `:fireworks:`
-  * `76` -- :floppy_disk: `:floppy_disk:`
-  * `77` -- :football: `:football:`
-  * `78` -- :fork_and_knife: `:fork_and_knife:`
-  * `79` -- :four_leaf_clover: `:four_leaf_clover:`
-  * `80` -- :fr: `:fr:`
-  * `81` -- :fries: `:fries:`
+  * `74` -- :fire: `:fire:` U+1F525
+  * `75` -- :fireworks: `:fireworks:` U+1F386
+  * `76` -- :floppy_disk: `:floppy_disk:` U+1F4BE
+  * `77` -- :football: `:football:` U+1F3C8
+  * `78` -- :fork_and_knife: `:fork_and_knife:` U+1F374
+  * `79` -- :four_leaf_clover: `:four_leaf_clover:` U+1F340
+  * `80` -- :fr: `:fr:` U+1F1EB U+1F1F7
+  * `81` -- :fries: `:fries:` U+1F35F
   * `82` -- :frog: `:frog:`
-  * `83` -- :fu: `:fu:`
-  * `84` -- :full_moon: `:full_moon:`
-  * `85` -- :game_die: `:game_die:`
-  * `86` -- :eu: `:eu:`
-  * `87` -- :gem: `:gem:`
-  * `88` -- :girl: `:girl:`
-  * `89` -- :goat: `:goat:`
-  * `90` -- :grimacing: `:grimacing:`
-  * `91` -- :grin: `:grin:`
-  * `92` -- :guardsman: `:guardsman:`
-  * `93` -- :guitar: `:guitar:`
-  * `94` -- :gun: `:gun:`
-  * `95` -- :hamburger: `:hamburger:`
+  * `83` -- :fu: `:fu:` U+1F595
+  * `84` -- :full_moon: `:full_moon:` U+1F315
+  * `85` -- :game_die: `:game_die:` U+1F3B2
+  * `86` -- :eu: `:eu:` U+1F1EA U+1F1FA
+  * `87` -- :gem: `:gem:` U+1F48E
+  * `88` -- :girl: `:girl:` U+1F467
+  * `89` -- :goat: `:goat:` U+1F410
+  * `90` -- :grimacing: `:grimacing:` U+1F62C
+  * `91` -- :grin: `:grin:` U+1F600
+  * `92` -- :guardsman: `:guardsman:` U+1F482
+  * `93` -- :guitar: `:guitar:` U+1F3B8
+  * `94` -- :gun: `:gun:` U+1F52B
+  * `95` -- :hamburger: `:hamburger:` U+1F354
   * `96` -- :hammer: `:hammer:`
   * `97` -- :hamster: `:hamster:`
   * `98` -- :hear_no_evil: `:hear_no_evil:`
diff --git a/emoji/map_gen.go b/emoji/map_gen.go
index 26fe2d8..1b2c48a 100644
--- a/emoji/map_gen.go
+++ b/emoji/map_gen.go
@@ -108,97 +108,97 @@ func init() {
       },
       Words{ ":cow:","U+1F42E",
       },
-      Words{ ":crescent_moon:",
+      Words{ ":crescent_moon:","U+1F319",
       },
-      Words{ ":crown:",
+      Words{ ":crown:","U+1F451",
       },
-      Words{ ":cry:",
+      Words{ ":cry:","U+1F622",
       },
-      Words{ ":crystal_ball:",
+      Words{ ":crystal_ball:","U+1F52E",
       },
-      Words{ ":curly_loop:",
+      Words{ ":curly_loop:","U+27B0",
       },
-      Words{ ":dancers:",
+      Words{ ":dancers:","U+1F46F",
       },
-      Words{ ":dash:",
+      Words{ ":dash:","U+1F4A8",
       },
-      Words{ ":de:",
+      Words{ ":de:","U+1F1E9","U+1F1EA",
       },
-      Words{ ":diamonds:",
+      Words{ ":diamonds:","U+2666",
       },
-      Words{ ":dog:",
+      Words{ ":dog:","U+1F436",
       },
-      Words{ ":doughnut:",
+      Words{ ":doughnut:","U+1F369",
       },
-      Words{ ":dragon:",
+      Words{ ":dragon:","U+1F409",
       },
-      Words{ ":dvd:",
+      Words{ ":dvd:","U+1F4C0",
       },
-      Words{ ":ear:",
+      Words{ ":ear:","U+1F442",
       },
-      Words{ ":eggplant:",
+      Words{ ":eggplant:","U+1F346",
       },
-      Words{ ":elephant:",
+      Words{ ":elephant:","U+1F418",
       },
-      Words{ ":end:",
+      Words{ ":end:","U+1F51A",
       },
-      Words{ ":envelope:",
+      Words{ ":envelope:","U+2709",
       },
-      Words{ ":es:",
+      Words{ ":es:","U+1F1EA","U+1F1F8",
       },
-      Words{ ":eyes:",
+      Words{ ":eyes:","U+1F440",
       },
-      Words{ ":facepunch:",
+      Words{ ":facepunch:","U+1F44A",
       },
-      Words{ ":family:",
+      Words{ ":family:","U+1F46A",
       },
-      Words{ ":ferris_wheel:",
+      Words{ ":ferris_wheel:","U+1F3A1",
       },
       Words{ ":cold_sweat:","U+1F630",
       },
-      Words{ ":fire:",
+      Words{ ":fire:","U+1F525",
       },
-      Words{ ":fireworks:",
+      Words{ ":fireworks:","U+1F386",
       },
-      Words{ ":floppy_disk:",
+      Words{ ":floppy_disk:","U+1F4BE",
       },
-      Words{ ":football:",
+      Words{ ":football:","U+1F3C8",
       },
-      Words{ ":fork_and_knife:",
+      Words{ ":fork_and_knife:","U+1F374",
       },
-      Words{ ":four_leaf_clover:",
+      Words{ ":four_leaf_clover:","U+1F340",
       },
-      Words{ ":fr:",
+      Words{ ":fr:","U+1F1EB","U+1F1F7",
       },
-      Words{ ":fries:",
+      Words{ ":fries:","U+1F35F",
       },
       Words{ ":frog:",
       },
-      Words{ ":fu:",
+      Words{ ":fu:","U+1F595",
       },
-      Words{ ":full_moon:",
+      Words{ ":full_moon:","U+1F315",
       },
-      Words{ ":game_die:",
+      Words{ ":game_die:","U+1F3B2",
       },
-      Words{ ":eu:",
+      Words{ ":eu:","U+1F1EA","U+1F1FA",
       },
-      Words{ ":gem:",
+      Words{ ":gem:","U+1F48E",
       },
-      Words{ ":girl:",
+      Words{ ":girl:","U+1F467",
       },
-      Words{ ":goat:",
+      Words{ ":goat:","U+1F410",
       },
-      Words{ ":grimacing:",
+      Words{ ":grimacing:","U+1F62C",
       },
-      Words{ ":grin:",
+      Words{ ":grin:","U+1F600",
       },
-      Words{ ":guardsman:",
+      Words{ ":guardsman:","U+1F482",
       },
-      Words{ ":guitar:",
+      Words{ ":guitar:","U+1F3B8",
       },
-      Words{ ":gun:",
+      Words{ ":gun:","U+1F52B",
       },
-      Words{ ":hamburger:",
+      Words{ ":hamburger:","U+1F354",
       },
       Words{ ":hammer:",
       },