diff --git a/IRCCloud/Classes/ColorFormatter.m b/IRCCloud/Classes/ColorFormatter.m
index 2bbcc240..1cc9971a 100644
--- a/IRCCloud/Classes/ColorFormatter.m
+++ b/IRCCloud/Classes/ColorFormatter.m
@@ -980,6 +980,7 @@ +(NSRegularExpression *)emoji {
                 @"sweat_drops":@"💦",
                 @"droplet":@"💧",
                 @"dash":@"💨",
+                @"pile_of_poo":@"💩",
                 @"hankey":@"💩",
                 @"poop":@"💩",
                 @"shit":@"💩",
@@ -1965,7 +1966,7 @@ +(NSRegularExpression *)emoji {
                 @"part_alternation_mark":@"〽️",
                 @"congratulations":@"㊗️",
                 @"secret":@"㊙️",
-                
+
                 @"like":@"👍",
                 @"thumbs_up":@"👍",
                 @"dislike":@"👎",
diff --git a/build-scripts/BUILD b/build-scripts/BUILD
index 6547e415..89a16a7d 100644
--- a/build-scripts/BUILD
+++ b/build-scripts/BUILD
@@ -1 +1 @@
-171
\ No newline at end of file
+172
\ No newline at end of file
diff --git a/build-scripts/emocode-data.js b/build-scripts/emocode-data.js
index 40ad2cfb..7a0aa392 100644
--- a/build-scripts/emocode-data.js
+++ b/build-scripts/emocode-data.js
@@ -822,7 +822,7 @@ var data = {
     "1f4a6":[["\uD83D\uDCA6"],"Smileys & Emotion",147,["sweat_drops"],28,20,"0.6","emotion"],
     "1f4a7":[["\uD83D\uDCA7"],"Travel & Places",993,["droplet"],28,21,"0.6","sky & weather"],
     "1f4a8":[["\uD83D\uDCA8"],"Smileys & Emotion",148,["dash"],28,22,"0.6","emotion"],
-    "1f4a9":[["\uD83D\uDCA9"],"Smileys & Emotion",100,["hankey","poop","shit"],28,23,"0.6","face-costume"],
+    "1f4a9":[["\uD83D\uDCA9"],"Smileys & Emotion",100,["pile_of_poo","hankey","poop","shit"],28,23,"0.6","face-costume"],
     "1f4aa":[["\uD83D\uDCAA"],"People & Body",191,["muscle"],28,24,"0.6","body-parts"],
     "1f4ab":[["\uD83D\uDCAB"],"Smileys & Emotion",146,["dizzy"],28,30,"0.6","emotion"],
     "1f4ac":[["\uD83D\uDCAC"],"Smileys & Emotion",151,["speech_balloon"],28,31,"0.6","emotion"],
@@ -1797,13 +1797,13 @@ var aliases = {
     '1f389': ['party_popper'],
     '1f631': ['shock'],
     '269b-fe0f': ['atom'],
-    '2764-fe0f': ['<3', '&lt;3'],
-    '1f494': ['</3', '&lt;&#x2f;3'],
+    '2764-fe0f': ['<3'],
+    '1f494': ['</3'],
     '1f642': ['simple_smile', ':)', ':-)', ')', '-)'],
     '1f603': ['=D'],
     '1f600': [':D', 'D'],
     '1f61e': [':(', '('],
-    '1f622': [":'(", "'(", ':&#x27;(', '&#x27;('],
+    '1f622': [":'(", "'("],
     '1f62d': [':_(', '_(','loudly_crying_face','sad_tears','bawl'],
     '1f609': [';)'],
     '1f61c': [';p'],