diff --git a/src/main/java/com/oasisfeng/nevo/decorators/wechat/EmojiMap.java b/src/main/java/com/oasisfeng/nevo/decorators/wechat/EmojiMap.java
index 4120c85..f646862 100644
--- a/src/main/java/com/oasisfeng/nevo/decorators/wechat/EmojiMap.java
+++ b/src/main/java/com/oasisfeng/nevo/decorators/wechat/EmojiMap.java
@@ -16,34 +16,39 @@ class EmojiMap {
 	static final String[][] MAP = new String[][] {
 			{ "OK",			"OK",			"👌" },
 			{ "耶",			"Yeah!",		"✌" },
-			{ "嘘",			"Silent",		"🤫" },
-			{ "晕",			"Dizzy",		"😲" },
+			{ "嘘",			"Shhh"	,		"🤫" },
+			{ "晕",			"Dizzy",		"😵" },
 			{ "衰",			"BadLuck",		"😳" },
-			{ "色",			"Drool",		"😍" },
-			{ "囧",			"Tension",		"☺" },
+			{ null,			"Toasted",		"😳" }, // same as above in newer versions
+			{ "色",			"Drool",		"🤤" },
+			{ "囧",			"Tension",		"😳" },
+			{ null,			"Blush",		"😳" }, // same as above in newer versions
 			{ "鸡",			"Chick",		"🐥" },
 			{ "强",			"Thumbs Up",	"👍" },
+			{ null,			"ThumbsUp",		"👍" }, // same as above in newer versions
 			{ "弱",			"Weak",			"👎" },
+			{ null,			"ThumbsDown",	"👎" }, // same as above in newer versions
 			{ "睡",			"Sleep",		"😴" },
 			{ "吐",			"Puke",			"🤢" },
 			{ "困",			"Drowsy",		"😪" },
 			{ "發",			"Rich",			"🀅" },
-			{ "微笑",		"Smile",		"😃" },
+			{ "微笑",		"Smile",		"🙂" },
 			{ "撇嘴",		"Grimace",		"😖" },
 			{ "发呆",		"Scowl",		"😳" },
 			{ "得意",		"CoolGuy",		"😎" },
 			{ "流泪",		"Sob",			"😭" },
 			{ "害羞",		"Shy",			"☺" },
 			{ "闭嘴",		"Shutup",		"🤐" },
-			{ "大哭",		"Cry",			"😣" },
+			{ null,			"Silent",		"🤐" }, // same as above in newer versions
+			{ "大哭",		"Cry",			"😢" },
 			{ "尴尬",		"Awkward",		"😰" },
 			{ "发怒",		"Angry",		"😡" },
 			{ "调皮",		"Tongue",		"😜" },
 			{ "呲牙",		"Grin",			"😁" },
-			{ "惊讶",		"Surprise",		"😱" },
+			{ "惊讶",		"Surprise",		"😲" },
 			{ "难过",		"Frown",		"🙁" },
 			{ "抓狂",		"Scream",		"😫" },
-			{ "偷笑",		"Chuckle",		"😅" },
+			{ "偷笑",		"Chuckle",		"🤭" },
 			{ "愉快",		"Joyful",		"☺" },
 			{ "白眼",		"Slight",		"🙄" },
 			{ "傲慢",		"Smug",			"😕" },
@@ -52,8 +57,9 @@ class EmojiMap {
 			{ "憨笑",		"Laugh",		"😄" },
 			{ "悠闲",		"Loafer",		"😌" },
 			{ "奋斗",		"Strive",		"💪" },
-			{ "咒骂",		"Scold",		"😤" },
-			{ "疑问",		"Doubt",		"❓" },
+			{ "咒骂",		"Scold",		"🤬" },
+			{ "疑问",		"Doubt",		"🤨" },
+			{ null,			"Shocked",		"🤨" }, // same as above for newer versions
 			{ "骷髅",		"Skull",		"💀" },
 			{ "敲打",		"Hammer",		"👊" },
 			{ "捂脸",		"Facepalm",		"🤦" },
@@ -62,12 +68,16 @@ class EmojiMap {
 			{ "红包",		"Packet",		SDK_INT > O_MR1 ? "🧧"/* Emoji 11+ */: "💰" },
 			{ "小狗",		"Pup",			"🐶" },
 			{ "再见",		"Bye",			"🙋" },
-			{ "擦汗",		"Relief",		"😥" },
+			{ null,			"Wave",			"🙋" }, // same as above
+			{ "擦汗",		"Relief",		"😶" },
+			{ null,			"Speechless",	"😶" }, // same as above in newer versions
 			{ "鼓掌",		"Clap",			"👏" },
 			{ "坏笑",		"Trick",		"👻" },
-			{ "哈欠",		"Yawn",			"😪" },
+			{ "哈欠",		"Yawn",			"🥱" },
 			{ "鄙视",		"Lookdown",		"😒" },
-			{ "委屈",		"Wronged",		"😣" },
+			{ null,			"Pooh-pooh",	"😒" }, // same as above for newer wechat
+			{ "委屈",		"Wronged",		"😞" },
+			{ null,			"Shrunken",		"😞" },
 			{ "阴险",		"Sly",			"😈" },
 			{ "亲亲",		"Kiss",			"😘" },
 			{ "菜刀",		"Cleaver",		"🔪" },
@@ -77,7 +87,8 @@ class EmojiMap {
 			{ "猪头",		"Pig",			"🐷" },
 			{ "玫瑰",		"Rose",			"🌹" },
 			{ "凋谢",		"Wilt",			"🥀" },
-			{ "嘴唇",		"Lip",			"💋" },
+			{ "嘴唇",		"Lip",			"👄" },
+			{ null,			"Lips",			"👄" }, // same as above for newer wechat
 			{ "爱心",		"Heart",		"❤" },
 			{ "心碎",		"BrokenHeart",	"💔" },
 			{ "蛋糕",		"Cake",			"🎂" },
@@ -88,22 +99,55 @@ class EmojiMap {
 			{ "拥抱",		"Hug",			"🤗" },
 			{ "握手",		"Shake",		"🤝" },
 			{ "胜利",		"Victory",		"✌" },
+			{ null,			"Peace",		"✌" }, // same as above in newer versions
 			{ "抱拳",		"Salute",		"🙏" },
+			{ null,			"Fight",		"🙏" }, // same as above
 			{ "拳头",		"Fist",			"✊" },
 //			{ "跳跳",		"Waddle",		"" },
-//			{ "发抖",		"Tremble",		"" },
+			{ "发抖",		"Tremble",		"🥶" },
 			{ "怄火",		"Aaagh!",		"😡" },
 //			{ "转圈",		"Twirl",		"" },
 			{ "蜡烛",		"Candle",		"🕯️" },
 //			{ "勾引",		"Beckon",		""},
 //			{ "嘿哈",		"Hey",			"" },
-//			{ "机智",		"Smart",		"" },
+			{ "机智",		"Smart",		"👉" },
 //			{ "抠鼻",		"DigNose",		"" },
-//			{ "可怜",		"Whimper",		"" },
-			{ "快哭了",		"Puling",		"😔" },
-//			{ "左哼哼",		"Bah！L",		"" },
-//			{ "右哼哼",		"Bah！R",		"" },
-			{ "破涕为笑",	"Lol",			"😂" },
+//			{ null,			"NosePick",		"" }, // same as above for newer wechat
+			{ "可怜",		"Whimper",		"🥺" },
+			{ "快哭了",		"Puling",		"😢" },
+			{ null,			"TearingUp",	"😢" }, // same as above for newer wechat
+			{ "左哼哼",		"Bah！L",		"😗" },
+			{ "右哼哼",		"Bah！R",		"😗" },
+			{ "破涕为笑",		"Lol",			"😂" },
+			{ "悠闲",		"Commando", 	"🪖" },
+			{ "笑脸",		"Happy", 		"😄" },
+			{ "生病",		"Sick", 		"😷" },
+			{ "脸红",		"Flushed", 		"😳" },
+			{ "恐惧",		"Terror", 		"😱" },
+			{ "失望",		"LetDown",	 	"😔" },
+			{ "无语",		"Duh", 			"😒" },
+			{ "吃瓜",		"Onlooker", 	"🍉" },
+			{ "加油",		"GoForIt", 		"✊" },
+			{ "加油加油",		"KeepFighting", "😷" },
+			{ "汗",			"Sweats", 		"😑" },
+			{ "天啊",		"OMG", 			"🤯" },
+//			{ null,			"Emm", 			"" },
+			{ "社会社会",		"Respect", 		"👏" },
+			{ "旺柴",		"Doge", 		"🐶" },
+			{ "好的",		"NoProb", 		"👌" },
+			{ "打脸",		"MyBad", 		"👊" },
+			{ "哇",			"Wow", 			"🤩" },
+			{ "翻白眼",		"Boring", 		"🙄" },
+			{ "666",		"Awesome", 		"😝" },
+//			{ "让我看看",		"LetMeSee", 	"" },
+			{ "叹气",		"Sigh", 		"😌" }, // will have its own in next standard => 😮‍💨
+			{ "苦涩",		"Hurt", 		"😥" },
+			{ "裂开",		"Broken", 		"💔" },
+			{ "合十",		"Worship",		"🙏" },
+			{ "福",			"Blessing",		"🌠" }, //wishing star is often used as a "blessing" or "wish"
+			{ "烟花",		"Fireworks",	"🎆" },
+			{ "爆竹",		"Firecracker",	"🧨" },
+		
 
 			// From WeChat for iOS
 			{ "强壮",		null,			"💪"},
@@ -121,7 +165,7 @@ class EmojiMap {
 			{ "爱情",		"InLove",		"💕" },
 			{ "飞吻",		"Blowkiss",		"😘" },
 			{ "闪电",		"Lightning",	"⚡" },
-			{ "刀",			null,			"🔪" },		// Dup of "Cleaver"
+			{ "刀",			"Dagger",		"🗡️" },		// Dup of "Cleaver"
 			{ "足球",		"Soccer",		"⚽" },
 			{ "棒球",		"Baseball",		"⚾" },
 			{ "橄榄球",		"Football",		"🏈" },
@@ -131,7 +175,23 @@ class EmojiMap {
 			{ "宝石",		"Gem",			"💎" },
 			{ "茶",			"Tea",			"🍵" },
 			{ "药丸",		"Pill",			"💊" },
-			{ "庆祝",		"Party",		"🎆" },
+			{ "庆祝",		"Party",		"🎉" },
 			{ "火箭",		"Rocket ship",	"🚀" },
+			{ "饥饿",		"Hungry", 		"😋" },
+			{ "酷",			"Ruthless", 	"😈" },
+			{ "吓",			"Uh Oh", 		"😠" },
+			{ null,			"Wrath", 		"😠" }, // Dup of above
+			{ "奋斗",		"Determined", 	"😣" },
+			{ "疯了",		"Tormented", 	"😤" },
+			{ "糗大了",		"Shame", 		"😳" },
+			{ "磕头",		"Kotow",		"🙇" },
+			{ "回头",		"Lookback",		"🤚" },
+//			{ "跳绳",		"Jump",			"" },
+			{ "投降",		"Surrender",	"🏳️" },
+			{ "激动",		"Hooray",		"🙌" },
+//			{ "乱舞",		"HeyHey",		"" },
+			{ "献吻",		"Smooch",		"😘" },
+//			{ "左太极",		"Tai Ji L",		"" },
+//			{ "右太极",		"Tai Ji R",		"" },
 	};
 }