diff --git a/emoji/emojimap.json b/emoji/emojimap.json
index 152ccc4..dd98e80 100644
--- a/emoji/emojimap.json
+++ b/emoji/emojimap.json
@@ -206,57 +206,57 @@
     [":snail:", "U+1F40C"],
     [":snake:", "U+1F40D"],
     [":snowflake:", "U+FE0F", "U+2744"],
-    [":soccer:"],
-    [":soon:"],
-    [":space_invader:"],
-    [":spades:"],
-    [":speak_no_evil:"],
-    [":star:"],
-    [":stars:"],
-    [":statue_of_liberty:"],
-    [":steam_locomotive:"],
-    [":sunflower:"],
-    [":sunglasses:"],
-    [":sunny:"],
-    [":sunrise:"],
-    [":surfer:"],
-    [":swimmer:"],
+    [":soccer:", "U+26BD"],
+    [":soon:", "U+1F51C"],
+    [":space_invader:", "U+1F47E"],
+    [":spades:", "U+2660"],
+    [":speak_no_evil:", "U+1F64A"],
+    [":star:", "U+2B50", "U+1F31F"],
+    [":fountain:", "U+26F2"],
+    [":statue_of_liberty:", "U+1F5FD"],
+    [":steam_locomotive:", "U+1F682"],
+    [":sunflower:", "U+1F33B"],
+    [":sunglasses:", "U+1F576"],
+    [":sunny:", "U+2600"],
+    [":sunrise:", "U+1F304", "U+1F305"],
+    [":surfer:", "U+1F3C4", "U+1F3C4U+200DU+2642U+FEOF", "U+1F3C4U+200DU+2640U+FEOF"],
+    [":swimmer:", "U+1F3CA", "U+1F3CAU+200DU+2640U+FE0F", "U+1F3CAU+200DU+2642U+FE0F"],
     [":syringe:", "U+1F489"],
-    [":tada:"],
-    [":tangerine:"],
-    [":taxi:"],
-    [":tennis:"],
-    [":tent:"],
-    [":thought_balloon:"],
-    [":tm:"],
-    [":toilet:"],
-    [":tongue:"],
-    [":tophat:"],
-    [":tractor:"],
-    [":trolleybus:"],
+    [":tada:", "U+1F389", "U+1F38A"],
+    [":tangerine:", "U+1F34A"],
+    [":taxi:", "U+1F695"],
+    [":tennis:", "U+1F3BE"],
+    [":tent:", "U+26FA"],
+    [":thought_balloon:", "U+1F4AD"],
+    [":tm:", "U+2122"],
+    [":toilet:", "U+1F6BD"],
+    [":tongue:", "U+1F445"],
+    [":tophat:", "U+1F3A9"],
+    [":tractor:", "U+1F69C"],
+    [":trolleybus:", "U+1F68E"],
     [":nauseated_face:", "U+1F922"],
-    [":trophy:"],
-    [":trumpet:"],
-    [":turtle:"],
+    [":trophy:", "U+1F3C6"],
+    [":trumpet:", "U+1F3BA"],
+    [":turtle:", "U+1F422"],
     [":carousel_horse:", "U+1F3A0"],
     [":two_women_holding_hands:", ":two_men_holding_hands:", ":couple:", "U+1F46C ", "U+1F46D", "U+1F46B"],
     [":uk:", "U+1F1ECU+1F1E7"],
-    [":umbrella:"],
-    [":unlock:"],
+    [":umbrella:", "U+2602", "U+2614"],
+    [":unlock:", "U+1F513"],
     [":us:", "U+1F1FAU+1F1F8"],
-    [":v:"],
-    [":vhs:"],
-    [":violin:"],
-    [":warning:"],
-    [":watermelon:"],
-    [":wave:"],
-    [":wavy_dash:"],
-    [":wc:"],
-    [":wheelchair:"],
-    [":woman:"],
-    [":x:"],
-    [":yum:"],
-    [":zap:"],
-    [":zzz:"]
+    [":v:", "U+270C"],
+    [":vhs:", "U+1F4FC"],
+    [":violin:", "U+1F3BB"],
+    [":warning:", "U+26A0"],
+    [":watermelon:", "U+1F349"],
+    [":wave:", "U+1F44B"],
+    [":wavy_dash:", "U+3030"],
+    [":wc:", "U+1F6BE"],
+    [":wheelchair:", "U+267F"],
+    [":woman:", "U+1F469"],
+    [":x:", "U+2716", "U+274C"],
+    [":yum:", "U+1F60B"],
+    [":zap:", "U+26A1"],
+    [":zzz:", "U+1F4A4"]
   ]
 }
diff --git a/emoji/list.md b/emoji/list.md
index 0353f47..b0bb9cc 100644
--- a/emoji/list.md
+++ b/emoji/list.md
@@ -219,55 +219,55 @@ draft+2
   * `201` -- :snail: `:snail:` [U+1F40C](http://www.unicode.org/emoji/charts/full-emoji-list.html#1F40C)
   * `202` -- :snake: `:snake:` [U+1F40D](http://www.unicode.org/emoji/charts/full-emoji-list.html#1F40D)
   * `203` -- :snowflake: `:snowflake:` [U+FE0F](http://www.unicode.org/emoji/charts/full-emoji-list.html#FE0F) [U+2744](http://www.unicode.org/emoji/charts/full-emoji-list.html#2744)
-  * `204` -- :soccer: `:soccer:`
-  * `205` -- :soon: `:soon:`
-  * `206` -- :space_invader: `:space_invader:`
-  * `207` -- :spades: `:spades:`
-  * `208` -- :speak_no_evil: `:speak_no_evil:`
-  * `209` -- :star: `:star:`
-  * `210` -- :stars: `:stars:`
-  * `211` -- :statue_of_liberty: `:statue_of_liberty:`
-  * `212` -- :steam_locomotive: `:steam_locomotive:`
-  * `213` -- :sunflower: `:sunflower:`
-  * `214` -- :sunglasses: `:sunglasses:`
-  * `215` -- :sunny: `:sunny:`
-  * `216` -- :sunrise: `:sunrise:`
-  * `217` -- :surfer: `:surfer:`
-  * `218` -- :swimmer: `:swimmer:`
+  * `204` -- :soccer: `:soccer:` [U+26BD](http://www.unicode.org/emoji/charts/full-emoji-list.html#26BD)
+  * `205` -- :soon: `:soon:` [U+1F51C](http://www.unicode.org/emoji/charts/full-emoji-list.html#1F51C)
+  * `206` -- :space_invader: `:space_invader:` [U+1F47E](http://www.unicode.org/emoji/charts/full-emoji-list.html#1F47E)
+  * `207` -- :spades: `:spades:` [U+2660](http://www.unicode.org/emoji/charts/full-emoji-list.html#2660)
+  * `208` -- :speak_no_evil: `:speak_no_evil:` [U+1F64A](http://www.unicode.org/emoji/charts/full-emoji-list.html#1F64A)
+  * `209` -- :star: `:star:` [U+2B50](http://www.unicode.org/emoji/charts/full-emoji-list.html#2B50) [U+1F31F](http://www.unicode.org/emoji/charts/full-emoji-list.html#1F31F)
+  * `210` -- :fountain: `:fountain:` [U+26F2](http://www.unicode.org/emoji/charts/full-emoji-list.html#26F2)
+  * `211` -- :statue_of_liberty: `:statue_of_liberty:` [U+1F5FD](http://www.unicode.org/emoji/charts/full-emoji-list.html#1F5FD)
+  * `212` -- :steam_locomotive: `:steam_locomotive:` [U+1F682](http://www.unicode.org/emoji/charts/full-emoji-list.html#1F682)
+  * `213` -- :sunflower: `:sunflower:` [U+1F33B](http://www.unicode.org/emoji/charts/full-emoji-list.html#1F33B)
+  * `214` -- :sunglasses: `:sunglasses:` [U+1F576](http://www.unicode.org/emoji/charts/full-emoji-list.html#1F576)
+  * `215` -- :sunny: `:sunny:` [U+2600](http://www.unicode.org/emoji/charts/full-emoji-list.html#2600)
+  * `216` -- :sunrise: `:sunrise:` [U+1F304](http://www.unicode.org/emoji/charts/full-emoji-list.html#1F304) [U+1F305](http://www.unicode.org/emoji/charts/full-emoji-list.html#1F305)
+  * `217` -- :surfer: `:surfer:` [U+1F3C4](http://www.unicode.org/emoji/charts/full-emoji-list.html#1F3C4) [U+1F3C4U+200DU+2642U+FEOF](http://www.unicode.org/emoji/charts/full-emoji-list.html#1F3C4_200D_2642_FEOF) [U+1F3C4U+200DU+2640U+FEOF](http://www.unicode.org/emoji/charts/full-emoji-list.html#1F3C4_200D_2640_FEOF)
+  * `218` -- :swimmer: `:swimmer:` [U+1F3CA](http://www.unicode.org/emoji/charts/full-emoji-list.html#1F3CA) [U+1F3CAU+200DU+2640U+FE0F](http://www.unicode.org/emoji/charts/full-emoji-list.html#1F3CA_200D_2640_FE0F) [U+1F3CAU+200DU+2642U+FE0F](http://www.unicode.org/emoji/charts/full-emoji-list.html#1F3CA_200D_2642_FE0F)
   * `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:`
-  * `223` -- :tennis: `:tennis:`
-  * `224` -- :tent: `:tent:`
-  * `225` -- :thought_balloon: `:thought_balloon:`
-  * `226` -- :tm: `:tm:`
-  * `227` -- :toilet: `:toilet:`
-  * `228` -- :tongue: `:tongue:`
-  * `229` -- :tophat: `:tophat:`
-  * `230` -- :tractor: `:tractor:`
-  * `231` -- :trolleybus: `:trolleybus:`
+  * `220` -- :tada: `:tada:` [U+1F389](http://www.unicode.org/emoji/charts/full-emoji-list.html#1F389) [U+1F38A](http://www.unicode.org/emoji/charts/full-emoji-list.html#1F38A)
+  * `221` -- :tangerine: `:tangerine:` [U+1F34A](http://www.unicode.org/emoji/charts/full-emoji-list.html#1F34A)
+  * `222` -- :taxi: `:taxi:` [U+1F695](http://www.unicode.org/emoji/charts/full-emoji-list.html#1F695)
+  * `223` -- :tennis: `:tennis:` [U+1F3BE](http://www.unicode.org/emoji/charts/full-emoji-list.html#1F3BE)
+  * `224` -- :tent: `:tent:` [U+26FA](http://www.unicode.org/emoji/charts/full-emoji-list.html#26FA)
+  * `225` -- :thought_balloon: `:thought_balloon:` [U+1F4AD](http://www.unicode.org/emoji/charts/full-emoji-list.html#1F4AD)
+  * `226` -- :tm: `:tm:` [U+2122](http://www.unicode.org/emoji/charts/full-emoji-list.html#2122)
+  * `227` -- :toilet: `:toilet:` [U+1F6BD](http://www.unicode.org/emoji/charts/full-emoji-list.html#1F6BD)
+  * `228` -- :tongue: `:tongue:` [U+1F445](http://www.unicode.org/emoji/charts/full-emoji-list.html#1F445)
+  * `229` -- :tophat: `:tophat:` [U+1F3A9](http://www.unicode.org/emoji/charts/full-emoji-list.html#1F3A9)
+  * `230` -- :tractor: `:tractor:` [U+1F69C](http://www.unicode.org/emoji/charts/full-emoji-list.html#1F69C)
+  * `231` -- :trolleybus: `:trolleybus:` [U+1F68E](http://www.unicode.org/emoji/charts/full-emoji-list.html#1F68E)
   * `232` -- :nauseated_face: `:nauseated_face:` [U+1F922](http://www.unicode.org/emoji/charts/full-emoji-list.html#1F922)
-  * `233` -- :trophy: `:trophy:`
-  * `234` -- :trumpet: `:trumpet:`
-  * `235` -- :turtle: `:turtle:`
+  * `233` -- :trophy: `:trophy:` [U+1F3C6](http://www.unicode.org/emoji/charts/full-emoji-list.html#1F3C6)
+  * `234` -- :trumpet: `:trumpet:` [U+1F3BA](http://www.unicode.org/emoji/charts/full-emoji-list.html#1F3BA)
+  * `235` -- :turtle: `:turtle:` [U+1F422](http://www.unicode.org/emoji/charts/full-emoji-list.html#1F422)
   * `236` -- :carousel_horse: `:carousel_horse:` [U+1F3A0](http://www.unicode.org/emoji/charts/full-emoji-list.html#1F3A0)
   * `237` -- :two_women_holding_hands: `:two_women_holding_hands:`:two_men_holding_hands: `:two_men_holding_hands:`:couple: `:couple:` [U+1F46C ](http://www.unicode.org/emoji/charts/full-emoji-list.html#1F46C ) [U+1F46D](http://www.unicode.org/emoji/charts/full-emoji-list.html#1F46D) [U+1F46B](http://www.unicode.org/emoji/charts/full-emoji-list.html#1F46B)
   * `238` -- :uk: `:uk:` [U+1F1ECU+1F1E7](http://www.unicode.org/emoji/charts/full-emoji-list.html#1F1EC_1F1E7)
-  * `239` -- :umbrella: `:umbrella:`
-  * `240` -- :unlock: `:unlock:`
+  * `239` -- :umbrella: `:umbrella:` [U+2602](http://www.unicode.org/emoji/charts/full-emoji-list.html#2602) [U+2614](http://www.unicode.org/emoji/charts/full-emoji-list.html#2614)
+  * `240` -- :unlock: `:unlock:` [U+1F513](http://www.unicode.org/emoji/charts/full-emoji-list.html#1F513)
   * `241` -- :us: `:us:` [U+1F1FAU+1F1F8](http://www.unicode.org/emoji/charts/full-emoji-list.html#1F1FA_1F1F8)
-  * `242` -- :v: `:v:`
-  * `243` -- :vhs: `:vhs:`
-  * `244` -- :violin: `:violin:`
-  * `245` -- :warning: `:warning:`
-  * `246` -- :watermelon: `:watermelon:`
-  * `247` -- :wave: `:wave:`
-  * `248` -- :wavy_dash: `:wavy_dash:`
-  * `249` -- :wc: `:wc:`
-  * `250` -- :wheelchair: `:wheelchair:`
-  * `251` -- :woman: `:woman:`
-  * `252` -- :x: `:x:`
-  * `253` -- :yum: `:yum:`
-  * `254` -- :zap: `:zap:`
-  * `255` -- :zzz: `:zzz:`
+  * `242` -- :v: `:v:` [U+270C](http://www.unicode.org/emoji/charts/full-emoji-list.html#270C)
+  * `243` -- :vhs: `:vhs:` [U+1F4FC](http://www.unicode.org/emoji/charts/full-emoji-list.html#1F4FC)
+  * `244` -- :violin: `:violin:` [U+1F3BB](http://www.unicode.org/emoji/charts/full-emoji-list.html#1F3BB)
+  * `245` -- :warning: `:warning:` [U+26A0](http://www.unicode.org/emoji/charts/full-emoji-list.html#26A0)
+  * `246` -- :watermelon: `:watermelon:` [U+1F349](http://www.unicode.org/emoji/charts/full-emoji-list.html#1F349)
+  * `247` -- :wave: `:wave:` [U+1F44B](http://www.unicode.org/emoji/charts/full-emoji-list.html#1F44B)
+  * `248` -- :wavy_dash: `:wavy_dash:` [U+3030](http://www.unicode.org/emoji/charts/full-emoji-list.html#3030)
+  * `249` -- :wc: `:wc:` [U+1F6BE](http://www.unicode.org/emoji/charts/full-emoji-list.html#1F6BE)
+  * `250` -- :wheelchair: `:wheelchair:` [U+267F](http://www.unicode.org/emoji/charts/full-emoji-list.html#267F)
+  * `251` -- :woman: `:woman:` [U+1F469](http://www.unicode.org/emoji/charts/full-emoji-list.html#1F469)
+  * `252` -- :x: `:x:` [U+2716](http://www.unicode.org/emoji/charts/full-emoji-list.html#2716) [U+274C](http://www.unicode.org/emoji/charts/full-emoji-list.html#274C)
+  * `253` -- :yum: `:yum:` [U+1F60B](http://www.unicode.org/emoji/charts/full-emoji-list.html#1F60B)
+  * `254` -- :zap: `:zap:` [U+26A1](http://www.unicode.org/emoji/charts/full-emoji-list.html#26A1)
+  * `255` -- :zzz: `:zzz:` [U+1F4A4](http://www.unicode.org/emoji/charts/full-emoji-list.html#1F4A4)
diff --git a/emoji/map_gen.go b/emoji/map_gen.go
index 63efee8..9ea5b15 100644
--- a/emoji/map_gen.go
+++ b/emoji/map_gen.go
@@ -416,69 +416,69 @@ func init() {
       },
       Words{ ":snowflake:","U+FE0F","U+2744",
       },
-      Words{ ":soccer:",
+      Words{ ":soccer:","U+26BD",
       },
-      Words{ ":soon:",
+      Words{ ":soon:","U+1F51C",
       },
-      Words{ ":space_invader:",
+      Words{ ":space_invader:","U+1F47E",
       },
-      Words{ ":spades:",
+      Words{ ":spades:","U+2660",
       },
-      Words{ ":speak_no_evil:",
+      Words{ ":speak_no_evil:","U+1F64A",
       },
-      Words{ ":star:",
+      Words{ ":star:","U+2B50","U+1F31F",
       },
-      Words{ ":stars:",
+      Words{ ":fountain:","U+26F2",
       },
-      Words{ ":statue_of_liberty:",
+      Words{ ":statue_of_liberty:","U+1F5FD",
       },
-      Words{ ":steam_locomotive:",
+      Words{ ":steam_locomotive:","U+1F682",
       },
-      Words{ ":sunflower:",
+      Words{ ":sunflower:","U+1F33B",
       },
-      Words{ ":sunglasses:",
+      Words{ ":sunglasses:","U+1F576",
       },
-      Words{ ":sunny:",
+      Words{ ":sunny:","U+2600",
       },
-      Words{ ":sunrise:",
+      Words{ ":sunrise:","U+1F304","U+1F305",
       },
-      Words{ ":surfer:",
+      Words{ ":surfer:","U+1F3C4","U+1F3C4U+200DU+2642U+FEOF","U+1F3C4U+200DU+2640U+FEOF",
       },
-      Words{ ":swimmer:",
+      Words{ ":swimmer:","U+1F3CA","U+1F3CAU+200DU+2640U+FE0F","U+1F3CAU+200DU+2642U+FE0F",
       },
       Words{ ":syringe:","U+1F489",
       },
-      Words{ ":tada:",
+      Words{ ":tada:","U+1F389","U+1F38A",
       },
-      Words{ ":tangerine:",
+      Words{ ":tangerine:","U+1F34A",
       },
-      Words{ ":taxi:",
+      Words{ ":taxi:","U+1F695",
       },
-      Words{ ":tennis:",
+      Words{ ":tennis:","U+1F3BE",
       },
-      Words{ ":tent:",
+      Words{ ":tent:","U+26FA",
       },
-      Words{ ":thought_balloon:",
+      Words{ ":thought_balloon:","U+1F4AD",
       },
-      Words{ ":tm:",
+      Words{ ":tm:","U+2122",
       },
-      Words{ ":toilet:",
+      Words{ ":toilet:","U+1F6BD",
       },
-      Words{ ":tongue:",
+      Words{ ":tongue:","U+1F445",
       },
-      Words{ ":tophat:",
+      Words{ ":tophat:","U+1F3A9",
       },
-      Words{ ":tractor:",
+      Words{ ":tractor:","U+1F69C",
       },
-      Words{ ":trolleybus:",
+      Words{ ":trolleybus:","U+1F68E",
       },
       Words{ ":nauseated_face:","U+1F922",
       },
-      Words{ ":trophy:",
+      Words{ ":trophy:","U+1F3C6",
       },
-      Words{ ":trumpet:",
+      Words{ ":trumpet:","U+1F3BA",
       },
-      Words{ ":turtle:",
+      Words{ ":turtle:","U+1F422",
       },
       Words{ ":carousel_horse:","U+1F3A0",
       },
@@ -486,39 +486,39 @@ func init() {
       },
       Words{ ":uk:","U+1F1ECU+1F1E7",
       },
-      Words{ ":umbrella:",
+      Words{ ":umbrella:","U+2602","U+2614",
       },
-      Words{ ":unlock:",
+      Words{ ":unlock:","U+1F513",
       },
       Words{ ":us:","U+1F1FAU+1F1F8",
       },
-      Words{ ":v:",
+      Words{ ":v:","U+270C",
       },
-      Words{ ":vhs:",
+      Words{ ":vhs:","U+1F4FC",
       },
-      Words{ ":violin:",
+      Words{ ":violin:","U+1F3BB",
       },
-      Words{ ":warning:",
+      Words{ ":warning:","U+26A0",
       },
-      Words{ ":watermelon:",
+      Words{ ":watermelon:","U+1F349",
       },
-      Words{ ":wave:",
+      Words{ ":wave:","U+1F44B",
       },
-      Words{ ":wavy_dash:",
+      Words{ ":wavy_dash:","U+3030",
       },
-      Words{ ":wc:",
+      Words{ ":wc:","U+1F6BE",
       },
-      Words{ ":wheelchair:",
+      Words{ ":wheelchair:","U+267F",
       },
-      Words{ ":woman:",
+      Words{ ":woman:","U+1F469",
       },
-      Words{ ":x:",
+      Words{ ":x:","U+2716","U+274C",
       },
-      Words{ ":yum:",
+      Words{ ":yum:","U+1F60B",
       },
-      Words{ ":zap:",
+      Words{ ":zap:","U+26A1",
       },
-      Words{ ":zzz:",
+      Words{ ":zzz:","U+1F4A4",
       },
 	  },
   }