diff --git a/emoji/emojimap.json b/emoji/emojimap.json
index ebab52f..c9574c0 100644
--- a/emoji/emojimap.json
+++ b/emoji/emojimap.json
@@ -34,24 +34,24 @@
     [":broken_heart:", "U+1F494"],
     [":bulb:", "U+1F4A1"],
     [":bus:", "U+1F68C"],
-    [":cactus:"],
-    [":calendar:"],
-    [":camera:"],
-    [":candy:"],
-    [":cat:"],
-    [":cherries:"],
-    [":children_crossing:"],
-    [":chocolate_bar:"],
-    [":clap:"],
-    [":cloud:"],
-    [":clubs:"],
-    [":cn:"],
-    [":coffee:"],
-    [":construction:"],
-    [":cookie:"],
-    [":copyright:"],
-    [":corn:"],
-    [":cow:"],
+    [":cactus:", "U+1F335"],
+    [":calendar:", "U+1F4C5"],
+    [":camera:", "U+1F4F7"],
+    [":candy:", "U+1F36C"],
+    [":cat:", "U+1F431"],
+    [":cherries:", "U+1F352"],
+    [":children_crossing:", "U+1F6B8"],
+    [":chocolate_bar:", "U+1F36B"],
+    [":clap:", "U+1F44F"],
+    [":cloud:", "U+2601"],
+    [":clubs:", "U+2663"],
+    [":cn:", "U+1F1E8", "U+1F1F3"],
+    [":coffee:", "U+2615"],
+    [":construction:", "U+1F6A7"],
+    [":cookie:", "U+1F36A"],
+    [":copyright:", "U+00A9"],
+    [":corn:", "U+1F33D"],
+    [":cow:", "U+1F42E"],
     [":crescent_moon:"],
     [":crown:"],
     [":cry:"],
diff --git a/emoji/list.md b/emoji/list.md
index 20c3f7b..75fe52b 100644
--- a/emoji/list.md
+++ b/emoji/list.md
@@ -47,24 +47,24 @@ draft+2
   * `29` -- :broken_heart: `:broken_heart:` U+1F494
   * `30` -- :bulb: `:bulb:` U+1F4A1
   * `31` -- :bus: `:bus:` U+1F68C
-  * `32` -- :cactus: `:cactus:`
-  * `33` -- :calendar: `:calendar:`
-  * `34` -- :camera: `:camera:`
-  * `35` -- :candy: `:candy:`
-  * `36` -- :cat: `:cat:`
-  * `37` -- :cherries: `:cherries:`
-  * `38` -- :children_crossing: `:children_crossing:`
-  * `39` -- :chocolate_bar: `:chocolate_bar:`
-  * `40` -- :clap: `:clap:`
-  * `41` -- :cloud: `:cloud:`
-  * `42` -- :clubs: `:clubs:`
-  * `43` -- :cn: `:cn:`
-  * `44` -- :coffee: `:coffee:`
-  * `45` -- :construction: `:construction:`
-  * `46` -- :cookie: `:cookie:`
-  * `47` -- :copyright: `:copyright:`
-  * `48` -- :corn: `:corn:`
-  * `49` -- :cow: `:cow:`
+  * `32` -- :cactus: `:cactus:` U+1F335
+  * `33` -- :calendar: `:calendar:` U+1F4C5
+  * `34` -- :camera: `:camera:` U+1F4F7
+  * `35` -- :candy: `:candy:` U+1F36C
+  * `36` -- :cat: `:cat:` U+1F431
+  * `37` -- :cherries: `:cherries:` U+1F352
+  * `38` -- :children_crossing: `:children_crossing:` U+1F6B8
+  * `39` -- :chocolate_bar: `:chocolate_bar:` U+1F36B
+  * `40` -- :clap: `:clap:` U+1F44F
+  * `41` -- :cloud: `:cloud:` U+2601
+  * `42` -- :clubs: `:clubs:` U+2663
+  * `43` -- :cn: `:cn:` U+1F1E8 U+1F1F3
+  * `44` -- :coffee: `:coffee:` U+2615
+  * `45` -- :construction: `:construction:` U+1F6A7
+  * `46` -- :cookie: `:cookie:` U+1F36A
+  * `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:`
diff --git a/emoji/map_gen.go b/emoji/map_gen.go
index 7fd12d8..26fe2d8 100644
--- a/emoji/map_gen.go
+++ b/emoji/map_gen.go
@@ -72,41 +72,41 @@ func init() {
       },
       Words{ ":bus:","U+1F68C",
       },
-      Words{ ":cactus:",
+      Words{ ":cactus:","U+1F335",
       },
-      Words{ ":calendar:",
+      Words{ ":calendar:","U+1F4C5",
       },
-      Words{ ":camera:",
+      Words{ ":camera:","U+1F4F7",
       },
-      Words{ ":candy:",
+      Words{ ":candy:","U+1F36C",
       },
-      Words{ ":cat:",
+      Words{ ":cat:","U+1F431",
       },
-      Words{ ":cherries:",
+      Words{ ":cherries:","U+1F352",
       },
-      Words{ ":children_crossing:",
+      Words{ ":children_crossing:","U+1F6B8",
       },
-      Words{ ":chocolate_bar:",
+      Words{ ":chocolate_bar:","U+1F36B",
       },
-      Words{ ":clap:",
+      Words{ ":clap:","U+1F44F",
       },
-      Words{ ":cloud:",
+      Words{ ":cloud:","U+2601",
       },
-      Words{ ":clubs:",
+      Words{ ":clubs:","U+2663",
       },
-      Words{ ":cn:",
+      Words{ ":cn:","U+1F1E8","U+1F1F3",
       },
-      Words{ ":coffee:",
+      Words{ ":coffee:","U+2615",
       },
-      Words{ ":construction:",
+      Words{ ":construction:","U+1F6A7",
       },
-      Words{ ":cookie:",
+      Words{ ":cookie:","U+1F36A",
       },
-      Words{ ":copyright:",
+      Words{ ":copyright:","U+00A9",
       },
-      Words{ ":corn:",
+      Words{ ":corn:","U+1F33D",
       },
-      Words{ ":cow:",
+      Words{ ":cow:","U+1F42E",
       },
       Words{ ":crescent_moon:",
       },