diff --git a/.gitignore b/.gitignore
index daf913b..15514dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@
 # Folders
 _obj
 _test
+target
 
 # Architecture specific extensions/prefixes
 *.[568vq]
@@ -22,3 +23,4 @@ _testmain.go
 *.exe
 *.test
 *.prof
+
diff --git a/Spec0/emojimap.json b/Spec0/emojimap.json
index cf06d4c..4a0f59d 100644
--- a/Spec0/emojimap.json
+++ b/Spec0/emojimap.json
@@ -1,5 +1,5 @@
 {
-  "version": "draft+2",
+  "version": "draft+3",
   "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"],
@@ -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"],
+    [":stars:", "U+2728"],
+    [":statue_of_liberty:", "U+1F5FD"],
+    [":steam_locomotive:", "U+1F682"],
+    [":sunflower:", "U+1F33B"],
+    [":sunglasses:", "U+1F576"],
+    [":sunny:", "U+2600"],
+    [":sunrise:", "U+1F305"],
+    [":surfer:", "U+1F3C4"],
+    [":swimmer:", "U+1F3CA"],
     [":syringe:", "U+1F489"],
-    [":tada:"],
-    [":tangerine:"],
-    [":taxi:"],
-    [":tennis:"],
-    [":tent:"],
-    [":thought_balloon:"],
-    [":tm:"],
-    [":toilet:"],
-    [":tongue:"],
-    [":tophat:"],
-    [":tractor:"],
-    [":trolleybus:"],
+    [":tada:", "U+1F389"],
+    [":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:"],
-    [":umbrella:"],
-    [":unlock:"],
-    [":us:"],
-    [":v:"],
-    [":vhs:"],
-    [":violin:"],
-    [":warning:"],
-    [":watermelon:"],
-    [":wave:"],
-    [":wavy_dash:"],
-    [":wc:"],
-    [":wheelchair:"],
-    [":woman:"],
-    [":x:"],
-    [":yum:"],
-    [":zap:"],
-    [":zzz:"]
+    [":uk:", "U+1F1EC", "U+1F1E7"],
+    [":umbrella:", "U+2602"],
+    [":unlock:", "U+1F513"],
+    [":us:", "U+1F1FA", "U+1F1F8"],
+    [":v:", "U+270C"],
+    [":vhs:", "U+1F4FC"],
+    [":violin:", "U+1F3BB"],
+    [":warning:", "U+26A0"],
+    [":watermelon:", "U+1F349"],
+    [":wave:", "U+1F30A"],
+    [":wavy_dash:", "U+3030"],
+    [":wc:", "U+1F6BE"],
+    [":wheelchair:", "U+267F"],
+    [":woman:", "U+1F469"],
+    [":x:", "U+274C"],
+    [":yum:", "U+1F60B"],
+    [":zap:", "U+26A1"],
+    [":zzz:", "U+1F4A4"]
   ]
 }
diff --git a/emojisum-rs/src/spec0/emojimap.json b/emojisum-rs/src/emojimap.json
similarity index 82%
rename from emojisum-rs/src/spec0/emojimap.json
rename to emojisum-rs/src/emojimap.json
index cf06d4c..4a0f59d 100644
--- a/emojisum-rs/src/spec0/emojimap.json
+++ b/emojisum-rs/src/emojimap.json
@@ -1,5 +1,5 @@
 {
-  "version": "draft+2",
+  "version": "draft+3",
   "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"],
@@ -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"],
+    [":stars:", "U+2728"],
+    [":statue_of_liberty:", "U+1F5FD"],
+    [":steam_locomotive:", "U+1F682"],
+    [":sunflower:", "U+1F33B"],
+    [":sunglasses:", "U+1F576"],
+    [":sunny:", "U+2600"],
+    [":sunrise:", "U+1F305"],
+    [":surfer:", "U+1F3C4"],
+    [":swimmer:", "U+1F3CA"],
     [":syringe:", "U+1F489"],
-    [":tada:"],
-    [":tangerine:"],
-    [":taxi:"],
-    [":tennis:"],
-    [":tent:"],
-    [":thought_balloon:"],
-    [":tm:"],
-    [":toilet:"],
-    [":tongue:"],
-    [":tophat:"],
-    [":tractor:"],
-    [":trolleybus:"],
+    [":tada:", "U+1F389"],
+    [":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:"],
-    [":umbrella:"],
-    [":unlock:"],
-    [":us:"],
-    [":v:"],
-    [":vhs:"],
-    [":violin:"],
-    [":warning:"],
-    [":watermelon:"],
-    [":wave:"],
-    [":wavy_dash:"],
-    [":wc:"],
-    [":wheelchair:"],
-    [":woman:"],
-    [":x:"],
-    [":yum:"],
-    [":zap:"],
-    [":zzz:"]
+    [":uk:", "U+1F1EC", "U+1F1E7"],
+    [":umbrella:", "U+2602"],
+    [":unlock:", "U+1F513"],
+    [":us:", "U+1F1FA", "U+1F1F8"],
+    [":v:", "U+270C"],
+    [":vhs:", "U+1F4FC"],
+    [":violin:", "U+1F3BB"],
+    [":warning:", "U+26A0"],
+    [":watermelon:", "U+1F349"],
+    [":wave:", "U+1F30A"],
+    [":wavy_dash:", "U+3030"],
+    [":wc:", "U+1F6BE"],
+    [":wheelchair:", "U+267F"],
+    [":woman:", "U+1F469"],
+    [":x:", "U+274C"],
+    [":yum:", "U+1F60B"],
+    [":zap:", "U+26A1"],
+    [":zzz:", "U+1F4A4"]
   ]
 }