diff --git a/emoji/emojimap.json b/emoji/emojimap.json
index 929ee81..23340bb 100644
--- a/emoji/emojimap.json
+++ b/emoji/emojimap.json
@@ -158,45 +158,45 @@
     [":paperclip:", "U+1F4CE", "U+1F587"],
     [":partly_sunny:", "U+26C5", "U+1F324", "U+1F325"],
     [":passport_control:", "U+1F6C2", "U+1F6C3"],
-    [":paw_prints:"],
-    [":peach:"],
-    [":penguin:"],
-    [":phone:"],
-    [":pig:"],
-    [":pill:"],
-    [":pineapple:"],
-    [":pizza:"],
-    [":point_left:"],
-    [":point_right:"],
-    [":poop:"],
-    [":poultry_leg:"],
-    [":pray:"],
-    [":princess:"],
-    [":purse:"],
-    [":pushpin:"],
-    [":rabbit:"],
-    [":rainbow:"],
-    [":raised_hand:"],
-    [":recycle:"],
-    [":red_car:"],
-    [":registered:"],
-    [":ribbon:"],
-    [":rice:"],
-    [":rocket:"],
-    [":roller_coaster:"],
-    [":rooster:"],
-    [":ru:"],
-    [":sailboat:"],
-    [":santa:"],
-    [":satellite:"],
-    [":satisfied:"],
-    [":saxophone:"],
-    [":scissors:"],
-    [":see_no_evil:"],
-    [":sheep:"],
-    [":shell:"],
-    [":shoe:"],
-    [":ski:"],
+    [":paw_prints:", "U+1F43E"],
+    [":peach:", "U+1F351"],
+    [":penguin:", "U+1F427"],
+    [":phone:", "U+260E"],
+    [":pig:", "U+1F437"],
+    [":pill:", "U+1F48A"],
+    [":pineapple:", "U+1F34D"],
+    [":pizza:", "U+1F355"],
+    [":point_left:", "U+1F448"],
+    [":point_right:", "U+1F449"],
+    [":poop:", "U+1F4A9"],
+    [":poultry_leg:", "U+1F357"],
+    [":pray:", "U+1F64F"],
+    [":princess:", "U+1F478"],
+    [":purse:", "U+1F45B"],
+    [":pushpin:", "U+1F4CC", "U+1F4CD"],
+    [":rabbit:", "U+1F430"],
+    [":rainbow:", "U+1F308"],
+    [":raised_hand:", "U+270B"],
+    [":recycle:", "U+267B"],
+    [":red_car:", "U+1F697"],
+    [":registered:", "U+00AE"],
+    [":ribbon:", "U+1F380"],
+    [":rice:", "U+1F35A"],
+    [":rocket:", "U+1F680"],
+    [":roller_coaster:", "U+1F3A2"],
+    [":rooster:", "U+1F413"],
+    [":ru:", "U+1F1F7", "U+1F1FA"],
+    [":sailboat:", "U+26F5"],
+    [":santa:", "U+1F385"],
+    [":satellite:", "U+1F6F0"],
+    [":satisfied:", "U+1F606"],
+    [":saxophone:", "U+1F3B7"],
+    [":scissors:", "U+2702"],
+    [":see_no_evil:", "U+1F648"],
+    [":sheep:", "U+1F411", "U+1F40F"],
+    [":shell:", "U+1F41A"],
+    [":shoe:", "U+1F45E", "U+1F45F"],
+    [":ski:", "U+1F3BF"],
     [":skull:"],
     [":sleepy:"],
     [":smile:"],
@@ -221,7 +221,7 @@
     [":sunrise:"],
     [":surfer:"],
     [":swimmer:"],
-    [":syringe:"],
+    [":syringe:", "U+1F489"],
     [":tada:"],
     [":tangerine:"],
     [":taxi:"],
diff --git a/emoji/list.md b/emoji/list.md
index 5cb8db0..2f42650 100644
--- a/emoji/list.md
+++ b/emoji/list.md
@@ -171,45 +171,45 @@ draft+2
   * `153` -- :paperclip: `:paperclip:` [U+1F4CE](http://www.unicode.org/emoji/charts/full-emoji-list.html#1f4ce) [U+1F587](http://www.unicode.org/emoji/charts/full-emoji-list.html#1f587)
   * `154` -- :partly_sunny: `:partly_sunny:` [U+26C5](http://www.unicode.org/emoji/charts/full-emoji-list.html#26c5) [U+1F324](http://www.unicode.org/emoji/charts/full-emoji-list.html#1f324) [U+1F325](http://www.unicode.org/emoji/charts/full-emoji-list.html#1f325)
   * `155` -- :passport_control: `:passport_control:` [U+1F6C2](http://www.unicode.org/emoji/charts/full-emoji-list.html#1f6c2) [U+1F6C3](http://www.unicode.org/emoji/charts/full-emoji-list.html#1f6c3)
-  * `156` -- :paw_prints: `:paw_prints:`
-  * `157` -- :peach: `:peach:`
-  * `158` -- :penguin: `:penguin:`
-  * `159` -- :phone: `:phone:`
-  * `160` -- :pig: `:pig:`
-  * `161` -- :pill: `:pill:`
-  * `162` -- :pineapple: `:pineapple:`
-  * `163` -- :pizza: `:pizza:`
-  * `164` -- :point_left: `:point_left:`
-  * `165` -- :point_right: `:point_right:`
-  * `166` -- :poop: `:poop:`
-  * `167` -- :poultry_leg: `:poultry_leg:`
-  * `168` -- :pray: `:pray:`
-  * `169` -- :princess: `:princess:`
-  * `170` -- :purse: `:purse:`
-  * `171` -- :pushpin: `:pushpin:`
-  * `172` -- :rabbit: `:rabbit:`
-  * `173` -- :rainbow: `:rainbow:`
-  * `174` -- :raised_hand: `:raised_hand:`
-  * `175` -- :recycle: `:recycle:`
-  * `176` -- :red_car: `:red_car:`
-  * `177` -- :registered: `:registered:`
-  * `178` -- :ribbon: `:ribbon:`
-  * `179` -- :rice: `:rice:`
-  * `180` -- :rocket: `:rocket:`
-  * `181` -- :roller_coaster: `:roller_coaster:`
-  * `182` -- :rooster: `:rooster:`
-  * `183` -- :ru: `:ru:`
-  * `184` -- :sailboat: `:sailboat:`
-  * `185` -- :santa: `:santa:`
-  * `186` -- :satellite: `:satellite:`
-  * `187` -- :satisfied: `:satisfied:`
-  * `188` -- :saxophone: `:saxophone:`
-  * `189` -- :scissors: `:scissors:`
-  * `190` -- :see_no_evil: `:see_no_evil:`
-  * `191` -- :sheep: `:sheep:`
-  * `192` -- :shell: `:shell:`
-  * `193` -- :shoe: `:shoe:`
-  * `194` -- :ski: `:ski:`
+  * `156` -- :paw_prints: `:paw_prints:` [U+1F43E](http://www.unicode.org/emoji/charts/full-emoji-list.html#1f43e)
+  * `157` -- :peach: `:peach:` [U+1F351](http://www.unicode.org/emoji/charts/full-emoji-list.html#1f351)
+  * `158` -- :penguin: `:penguin:` [U+1F427](http://www.unicode.org/emoji/charts/full-emoji-list.html#1f427)
+  * `159` -- :phone: `:phone:` [U+260E](http://www.unicode.org/emoji/charts/full-emoji-list.html#260e)
+  * `160` -- :pig: `:pig:` [U+1F437](http://www.unicode.org/emoji/charts/full-emoji-list.html#1f437)
+  * `161` -- :pill: `:pill:` [U+1F48A](http://www.unicode.org/emoji/charts/full-emoji-list.html#1f48a)
+  * `162` -- :pineapple: `:pineapple:` [U+1F34D](http://www.unicode.org/emoji/charts/full-emoji-list.html#1f34d)
+  * `163` -- :pizza: `:pizza:` [U+1F355](http://www.unicode.org/emoji/charts/full-emoji-list.html#1f355)
+  * `164` -- :point_left: `:point_left:` [U+1F448](http://www.unicode.org/emoji/charts/full-emoji-list.html#1f448)
+  * `165` -- :point_right: `:point_right:` [U+1F449](http://www.unicode.org/emoji/charts/full-emoji-list.html#1f449)
+  * `166` -- :poop: `:poop:` [U+1F4A9](http://www.unicode.org/emoji/charts/full-emoji-list.html#1f4a9)
+  * `167` -- :poultry_leg: `:poultry_leg:` [U+1F357](http://www.unicode.org/emoji/charts/full-emoji-list.html#1f357)
+  * `168` -- :pray: `:pray:` [U+1F64F](http://www.unicode.org/emoji/charts/full-emoji-list.html#1f64f)
+  * `169` -- :princess: `:princess:` [U+1F478](http://www.unicode.org/emoji/charts/full-emoji-list.html#1f478)
+  * `170` -- :purse: `:purse:` [U+1F45B](http://www.unicode.org/emoji/charts/full-emoji-list.html#1f45b)
+  * `171` -- :pushpin: `:pushpin:` [U+1F4CC](http://www.unicode.org/emoji/charts/full-emoji-list.html#1f4cc) [U+1F4CD](http://www.unicode.org/emoji/charts/full-emoji-list.html#1f4cd)
+  * `172` -- :rabbit: `:rabbit:` [U+1F430](http://www.unicode.org/emoji/charts/full-emoji-list.html#1f430)
+  * `173` -- :rainbow: `:rainbow:` [U+1F308](http://www.unicode.org/emoji/charts/full-emoji-list.html#1f308)
+  * `174` -- :raised_hand: `:raised_hand:` [U+270B](http://www.unicode.org/emoji/charts/full-emoji-list.html#270b)
+  * `175` -- :recycle: `:recycle:` [U+267B](http://www.unicode.org/emoji/charts/full-emoji-list.html#267b)
+  * `176` -- :red_car: `:red_car:` [U+1F697](http://www.unicode.org/emoji/charts/full-emoji-list.html#1f697)
+  * `177` -- :registered: `:registered:` [U+00AE](http://www.unicode.org/emoji/charts/full-emoji-list.html#00ae)
+  * `178` -- :ribbon: `:ribbon:` [U+1F380](http://www.unicode.org/emoji/charts/full-emoji-list.html#1f380)
+  * `179` -- :rice: `:rice:` [U+1F35A](http://www.unicode.org/emoji/charts/full-emoji-list.html#1f35a)
+  * `180` -- :rocket: `:rocket:` [U+1F680](http://www.unicode.org/emoji/charts/full-emoji-list.html#1f680)
+  * `181` -- :roller_coaster: `:roller_coaster:` [U+1F3A2](http://www.unicode.org/emoji/charts/full-emoji-list.html#1f3a2)
+  * `182` -- :rooster: `:rooster:` [U+1F413](http://www.unicode.org/emoji/charts/full-emoji-list.html#1f413)
+  * `183` -- :ru: `:ru:` [U+1F1F7](http://www.unicode.org/emoji/charts/full-emoji-list.html#1f1f7) [U+1F1FA](http://www.unicode.org/emoji/charts/full-emoji-list.html#1f1fa)
+  * `184` -- :sailboat: `:sailboat:` [U+26F5](http://www.unicode.org/emoji/charts/full-emoji-list.html#26f5)
+  * `185` -- :santa: `:santa:` [U+1F385](http://www.unicode.org/emoji/charts/full-emoji-list.html#1f385)
+  * `186` -- :satellite: `:satellite:` [U+1F6F0](http://www.unicode.org/emoji/charts/full-emoji-list.html#1f6f0)
+  * `187` -- :satisfied: `:satisfied:` [U+1F606](http://www.unicode.org/emoji/charts/full-emoji-list.html#1f606)
+  * `188` -- :saxophone: `:saxophone:` [U+1F3B7](http://www.unicode.org/emoji/charts/full-emoji-list.html#1f3b7)
+  * `189` -- :scissors: `:scissors:` [U+2702](http://www.unicode.org/emoji/charts/full-emoji-list.html#2702)
+  * `190` -- :see_no_evil: `:see_no_evil:` [U+1F648](http://www.unicode.org/emoji/charts/full-emoji-list.html#1f648)
+  * `191` -- :sheep: `:sheep:` [U+1F411](http://www.unicode.org/emoji/charts/full-emoji-list.html#1f411) [U+1F40F](http://www.unicode.org/emoji/charts/full-emoji-list.html#1f40f)
+  * `192` -- :shell: `:shell:` [U+1F41A](http://www.unicode.org/emoji/charts/full-emoji-list.html#1f41a)
+  * `193` -- :shoe: `:shoe:` [U+1F45E](http://www.unicode.org/emoji/charts/full-emoji-list.html#1f45e) [U+1F45F](http://www.unicode.org/emoji/charts/full-emoji-list.html#1f45f)
+  * `194` -- :ski: `:ski:` [U+1F3BF](http://www.unicode.org/emoji/charts/full-emoji-list.html#1f3bf)
   * `195` -- :skull: `:skull:`
   * `196` -- :sleepy: `:sleepy:`
   * `197` -- :smile: `:smile:`
@@ -234,7 +234,7 @@ draft+2
   * `216` -- :sunrise: `:sunrise:`
   * `217` -- :surfer: `:surfer:`
   * `218` -- :swimmer: `:swimmer:`
-  * `219` -- :syringe: `:syringe:`
+  * `219` -- :syringe: `:syringe:` [U+1F489](http://www.unicode.org/emoji/charts/full-emoji-list.html#1f489)
   * `220` -- :tada: `:tada:`
   * `221` -- :tangerine: `:tangerine:`
   * `222` -- :taxi: `:taxi:`
diff --git a/emoji/map_gen.go b/emoji/map_gen.go
index 9fa2f88..0927762 100644
--- a/emoji/map_gen.go
+++ b/emoji/map_gen.go
@@ -320,83 +320,83 @@ func init() {
       },
       Words{ ":passport_control:","U+1F6C2","U+1F6C3",
       },
-      Words{ ":paw_prints:",
+      Words{ ":paw_prints:","U+1F43E",
       },
-      Words{ ":peach:",
+      Words{ ":peach:","U+1F351",
       },
-      Words{ ":penguin:",
+      Words{ ":penguin:","U+1F427",
       },
-      Words{ ":phone:",
+      Words{ ":phone:","U+260E",
       },
-      Words{ ":pig:",
+      Words{ ":pig:","U+1F437",
       },
-      Words{ ":pill:",
+      Words{ ":pill:","U+1F48A",
       },
-      Words{ ":pineapple:",
+      Words{ ":pineapple:","U+1F34D",
       },
-      Words{ ":pizza:",
+      Words{ ":pizza:","U+1F355",
       },
-      Words{ ":point_left:",
+      Words{ ":point_left:","U+1F448",
       },
-      Words{ ":point_right:",
+      Words{ ":point_right:","U+1F449",
       },
-      Words{ ":poop:",
+      Words{ ":poop:","U+1F4A9",
       },
-      Words{ ":poultry_leg:",
+      Words{ ":poultry_leg:","U+1F357",
       },
-      Words{ ":pray:",
+      Words{ ":pray:","U+1F64F",
       },
-      Words{ ":princess:",
+      Words{ ":princess:","U+1F478",
       },
-      Words{ ":purse:",
+      Words{ ":purse:","U+1F45B",
       },
-      Words{ ":pushpin:",
+      Words{ ":pushpin:","U+1F4CC","U+1F4CD",
       },
-      Words{ ":rabbit:",
+      Words{ ":rabbit:","U+1F430",
       },
-      Words{ ":rainbow:",
+      Words{ ":rainbow:","U+1F308",
       },
-      Words{ ":raised_hand:",
+      Words{ ":raised_hand:","U+270B",
       },
-      Words{ ":recycle:",
+      Words{ ":recycle:","U+267B",
       },
-      Words{ ":red_car:",
+      Words{ ":red_car:","U+1F697",
       },
-      Words{ ":registered:",
+      Words{ ":registered:","U+00AE",
       },
-      Words{ ":ribbon:",
+      Words{ ":ribbon:","U+1F380",
       },
-      Words{ ":rice:",
+      Words{ ":rice:","U+1F35A",
       },
-      Words{ ":rocket:",
+      Words{ ":rocket:","U+1F680",
       },
-      Words{ ":roller_coaster:",
+      Words{ ":roller_coaster:","U+1F3A2",
       },
-      Words{ ":rooster:",
+      Words{ ":rooster:","U+1F413",
       },
-      Words{ ":ru:",
+      Words{ ":ru:","U+1F1F7","U+1F1FA",
       },
-      Words{ ":sailboat:",
+      Words{ ":sailboat:","U+26F5",
       },
-      Words{ ":santa:",
+      Words{ ":santa:","U+1F385",
       },
-      Words{ ":satellite:",
+      Words{ ":satellite:","U+1F6F0",
       },
-      Words{ ":satisfied:",
+      Words{ ":satisfied:","U+1F606",
       },
-      Words{ ":saxophone:",
+      Words{ ":saxophone:","U+1F3B7",
       },
-      Words{ ":scissors:",
+      Words{ ":scissors:","U+2702",
       },
-      Words{ ":see_no_evil:",
+      Words{ ":see_no_evil:","U+1F648",
       },
-      Words{ ":sheep:",
+      Words{ ":sheep:","U+1F411","U+1F40F",
       },
-      Words{ ":shell:",
+      Words{ ":shell:","U+1F41A",
       },
-      Words{ ":shoe:",
+      Words{ ":shoe:","U+1F45E","U+1F45F",
       },
-      Words{ ":ski:",
+      Words{ ":ski:","U+1F3BF",
       },
       Words{ ":skull:",
       },
@@ -446,7 +446,7 @@ func init() {
       },
       Words{ ":swimmer:",
       },
-      Words{ ":syringe:",
+      Words{ ":syringe:","U+1F489",
       },
       Words{ ":tada:",
       },