diff --git a/emoji/emojimap.json b/emoji/emojimap.json
index 6652f52..ebab52f 100644
--- a/emoji/emojimap.json
+++ b/emoji/emojimap.json
@@ -1,5 +1,5 @@
 {
-  "version": "draft+1",
+  "version": "draft+2",
   "description": "This ordered list of emojiwords is the conventional order for the practice of conveying checksums with emoji. Each position provides the alternative for resolving the desired emoji.",
   "emojiwords": [
     [":+1:", "U+1F44D"],
@@ -75,7 +75,7 @@
     [":facepunch:"],
     [":family:"],
     [":ferris_wheel:"],
-    [":finnadie:"],
+    [":cold_sweat:", "U+1F630"],
     [":fire:"],
     [":fireworks:"],
     [":floppy_disk:"],
@@ -114,7 +114,7 @@
     [":horse_racing:"],
     [":hourglass:"],
     [":house:"],
-    [":hurtrealbad:"],
+    [":female_detective:", "U+1F575", "U+1FE0F", "U+200D", "U+2640"],
     [":icecream:"],
     [":imp:"],
     [":it:"],
@@ -234,7 +234,7 @@
     [":tophat:"],
     [":tractor:"],
     [":trolleybus:"],
-    [":trollface:"],
+    [":nauseated_face:", "U+1F922"],
     [":trophy:"],
     [":trumpet:"],
     [":turtle:"],
diff --git a/emoji/list.md b/emoji/list.md
index 3426c24..20c3f7b 100644
--- a/emoji/list.md
+++ b/emoji/list.md
@@ -12,41 +12,41 @@ This ordered list of emojiwords is the conventional order for the practice of co
 
 ### Version
 
-draft+1
+draft+2
 
 ### List
-  * `0` -- :+1: `:+1:`
-  * `1` -- :8ball: `:8ball:`
-  * `2` -- :airplane: `:airplane:`
-  * `3` -- :alien: `:alien:`
-  * `4` -- :anchor: `:anchor:`
-  * `5` -- :angel: `:angel:`
-  * `6` -- :angry: `:angry:`
-  * `7` -- :ant: `:ant:`
-  * `8` -- :apple: `:apple:`
-  * `9` -- :art: `:art:`
-  * `10` -- :baby: `:baby:`
-  * `11` -- :baby_bottle: `:baby_bottle:`
-  * `12` -- :back: `:back:`
-  * `13` -- :bamboo: `:bamboo:`
-  * `14` -- :banana: `:banana:`
-  * `15` -- :barber: `:barber:`
-  * `16` -- :bathtub: `:bathtub:`
-  * `17` -- :beer: `:beer:`
-  * `18` -- :bell: `:bell:`
-  * `19` -- :bicyclist: `:bicyclist:`
-  * `20` -- :bird: `:bird:`
-  * `21` -- :birthday: `:birthday:`
-  * `22` -- :blossom: `:blossom:`
-  * `23` -- :blue_car: `:blue_car:`
-  * `24` -- :boar: `:boar:`
-  * `25` -- :bomb: `:bomb:`
-  * `26` -- :boom: `:boom:`
-  * `27` -- :bow: `:bow:`
-  * `28` -- :boy: `:boy:`
-  * `29` -- :broken_heart: `:broken_heart:`
-  * `30` -- :bulb: `:bulb:`
-  * `31` -- :bus: `:bus:`
+  * `0` -- :+1: `:+1:` U+1F44D
+  * `1` -- :8ball: `:8ball:` U+1F3B1
+  * `2` -- :airplane: `:airplane:` U+2708
+  * `3` -- :alien: `:alien:` U+1F47D
+  * `4` -- :anchor: `:anchor:` U+2693
+  * `5` -- :angel: `:angel:` U+1F607
+  * `6` -- :angry: `:angry:` U+1F621
+  * `7` -- :ant: `:ant:` U+1F41C
+  * `8` -- :apple: `:apple:` U+1F34E
+  * `9` -- :art: `:art:` U+1F3A8
+  * `10` -- :baby: `:baby:` U+1F476
+  * `11` -- :baby_bottle: `:baby_bottle:` U+1F37C
+  * `12` -- :back: `:back:` U+1F519
+  * `13` -- :bamboo: `:bamboo:` U+1F38D
+  * `14` -- :banana: `:banana:` U+1F34C
+  * `15` -- :barber: `:barber:` U+1F488
+  * `16` -- :bathtub: `:bathtub:` U+1F6C1
+  * `17` -- :beer: `:beer:` U+1F37A
+  * `18` -- :bell: `:bell:` U+1F514
+  * `19` -- :bicyclist: `:bicyclist:` U+1F6B4
+  * `20` -- :bird: `:bird:` U+1F426
+  * `21` -- :birthday: `:birthday:` U+1F382
+  * `22` -- :blossom: `:blossom:` U+1F33C
+  * `23` -- :blue_car: `:blue_car:` U+1F693
+  * `24` -- :boar: `:boar:` U+1F417
+  * `25` -- :bomb: `:bomb:` U+1F4A3
+  * `26` -- :boom: `:boom:` U+1F4A5
+  * `27` -- :bow: `:bow:` U+1F3F9
+  * `28` -- :boy: `:boy:` U+1F466
+  * `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:`
@@ -88,7 +88,7 @@ draft+1
   * `70` -- :facepunch: `:facepunch:`
   * `71` -- :family: `:family:`
   * `72` -- :ferris_wheel: `:ferris_wheel:`
-  * `73` -- :finnadie: `:finnadie:`
+  * `73` -- :cold_sweat: `:cold_sweat:` U+1F630
   * `74` -- :fire: `:fire:`
   * `75` -- :fireworks: `:fireworks:`
   * `76` -- :floppy_disk: `:floppy_disk:`
@@ -127,7 +127,7 @@ draft+1
   * `109` -- :horse_racing: `:horse_racing:`
   * `110` -- :hourglass: `:hourglass:`
   * `111` -- :house: `:house:`
-  * `112` -- :hurtrealbad: `:hurtrealbad:`
+  * `112` -- :female_detective: `:female_detective:` U+1F575 U+1FE0F U+200D U+2640
   * `113` -- :icecream: `:icecream:`
   * `114` -- :imp: `:imp:`
   * `115` -- :it: `:it:`
@@ -247,7 +247,7 @@ draft+1
   * `229` -- :tophat: `:tophat:`
   * `230` -- :tractor: `:tractor:`
   * `231` -- :trolleybus: `:trolleybus:`
-  * `232` -- :trollface: `:trollface:`
+  * `232` -- :nauseated_face: `:nauseated_face:` U+1F922
   * `233` -- :trophy: `:trophy:`
   * `234` -- :trumpet: `:trumpet:`
   * `235` -- :turtle: `:turtle:`
diff --git a/emoji/map_gen.go b/emoji/map_gen.go
index 5064e04..7fd12d8 100644
--- a/emoji/map_gen.go
+++ b/emoji/map_gen.go
@@ -6,71 +6,71 @@ package emoji
 func init() {
   mapGen = VersionedMap{
 	  Description: "This ordered list of emojiwords is the conventional order for the practice of conveying checksums with emoji. Each position provides the alternative for resolving the desired emoji.",
-	  Version: "draft+1",
+	  Version: "draft+2",
 	  EmojiWords: []Words{
-      Words{ ":+1:",
+      Words{ ":+1:","U+1F44D",
       },
-      Words{ ":8ball:",
+      Words{ ":8ball:","U+1F3B1",
       },
-      Words{ ":airplane:",
+      Words{ ":airplane:","U+2708",
       },
-      Words{ ":alien:",
+      Words{ ":alien:","U+1F47D",
       },
-      Words{ ":anchor:",
+      Words{ ":anchor:","U+2693",
       },
-      Words{ ":angel:",
+      Words{ ":angel:","U+1F607",
       },
-      Words{ ":angry:",
+      Words{ ":angry:","U+1F621",
       },
-      Words{ ":ant:",
+      Words{ ":ant:","U+1F41C",
       },
-      Words{ ":apple:",
+      Words{ ":apple:","U+1F34E",
       },
-      Words{ ":art:",
+      Words{ ":art:","U+1F3A8",
       },
-      Words{ ":baby:",
+      Words{ ":baby:","U+1F476",
       },
-      Words{ ":baby_bottle:",
+      Words{ ":baby_bottle:","U+1F37C",
       },
-      Words{ ":back:",
+      Words{ ":back:","U+1F519",
       },
-      Words{ ":bamboo:",
+      Words{ ":bamboo:","U+1F38D",
       },
-      Words{ ":banana:",
+      Words{ ":banana:","U+1F34C",
       },
-      Words{ ":barber:",
+      Words{ ":barber:","U+1F488",
       },
-      Words{ ":bathtub:",
+      Words{ ":bathtub:","U+1F6C1",
       },
-      Words{ ":beer:",
+      Words{ ":beer:","U+1F37A",
       },
-      Words{ ":bell:",
+      Words{ ":bell:","U+1F514",
       },
-      Words{ ":bicyclist:",
+      Words{ ":bicyclist:","U+1F6B4",
       },
-      Words{ ":bird:",
+      Words{ ":bird:","U+1F426",
       },
-      Words{ ":birthday:",
+      Words{ ":birthday:","U+1F382",
       },
-      Words{ ":blossom:",
+      Words{ ":blossom:","U+1F33C",
       },
-      Words{ ":blue_car:",
+      Words{ ":blue_car:","U+1F693",
       },
-      Words{ ":boar:",
+      Words{ ":boar:","U+1F417",
       },
-      Words{ ":bomb:",
+      Words{ ":bomb:","U+1F4A3",
       },
-      Words{ ":boom:",
+      Words{ ":boom:","U+1F4A5",
       },
-      Words{ ":bow:",
+      Words{ ":bow:","U+1F3F9",
       },
-      Words{ ":boy:",
+      Words{ ":boy:","U+1F466",
       },
-      Words{ ":broken_heart:",
+      Words{ ":broken_heart:","U+1F494",
       },
-      Words{ ":bulb:",
+      Words{ ":bulb:","U+1F4A1",
       },
-      Words{ ":bus:",
+      Words{ ":bus:","U+1F68C",
       },
       Words{ ":cactus:",
       },
@@ -154,7 +154,7 @@ func init() {
       },
       Words{ ":ferris_wheel:",
       },
-      Words{ ":finnadie:",
+      Words{ ":cold_sweat:","U+1F630",
       },
       Words{ ":fire:",
       },
@@ -232,7 +232,7 @@ func init() {
       },
       Words{ ":house:",
       },
-      Words{ ":hurtrealbad:",
+      Words{ ":female_detective:","U+1F575","U+1FE0F","U+200D","U+2640",
       },
       Words{ ":icecream:",
       },
@@ -472,7 +472,7 @@ func init() {
       },
       Words{ ":trolleybus:",
       },
-      Words{ ":trollface:",
+      Words{ ":nauseated_face:","U+1F922",
       },
       Words{ ":trophy:",
       },