diff --git a/.vscodeignore b/.vscodeignore
index 0cbae97..52d5294 100644
--- a/.vscodeignore
+++ b/.vscodeignore
@@ -1,3 +1,4 @@
+emoji/**
 !images/dark/**
 !images/light/**
 !images/settings/**
@@ -6,7 +7,6 @@
 !images/cl-*.png
 images/**
 .vscode/**
-.vscode-test/**
 test/**
 src/**
 out/ui/**
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 832f9d8..71a5929 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 ## [Unreleased]
 ### Added
+- Adds emoji support, e.g. :smile: in commit messages will now be 😃 — closes [#429](https://github.com/eamodio/vscode-gitlens/issues/429)
 - Adds *Compare with Selected* and *Select for Compare* commands to file nodes in the *GitLens*, *GitLens File History*, and *GitLens Results* explorers — closes [#446](https://github.com/eamodio/vscode-gitlens/issues/446)
 - Adds `gitlens.historyExplorer.avatars` setting to specify whether to show avatar images instead of status icons in the `GitLens File History` explorer — allows for an independent value from the other explorers
 
diff --git a/emoji/emojis.json b/emoji/emojis.json
new file mode 100644
index 0000000..e771bd3
--- /dev/null
+++ b/emoji/emojis.json
@@ -0,0 +1 @@
+{"100":"💯","1234":"🔢","gleeful":"😀","blissful":"😁","grin":"😁","joyful":"😂","haha":"😂","entertained":"🤣","rofl":"🤣","glad":"😃","smile":"😃","happy":"😄","embarassed":"😅","amused":"😆","laugh":"😆","lol":"😆","coy":"😉","wink":"😉","anxious":"😊","blush":"😊","yum":"😋","savour":"😋","confident":"😎","lovestruck":"😍","flirty":"😘","love":"🥰","kiss":"😗","happy_kiss":"😙","loving_kiss":"😚","relaxed":"☺️","pleased":"🙂","hugging":"🤗","starstruck":"🤩","curious":"🤔","thinking":"🤔","contempt":"🤨","indifferent":"😐️","neutral":"😐️","apathetic":"😑","expressionless":"😑","vacant":"😶","no_mouth":"😶","disbelief":"🙄","cocky":"😏","smirk":"😏","persevered":"😣","hopeful":"😥","surprised":"😮","silenced":"🤐","zipper_mouth":"🤐","hushed":"😯","sleepy":"😪","tired":"😫","exhausted":"😴","sleeping":"😴","relieved":"😌","playful":"😛","tongue_out":"😛","mischievous":"😜","facetious":"😝","lmao":"😝","drooling":"🤤","unamused":"😒","shamed":"😓","pensive":"😔","confused":"😕","ecstatic":"🙃","upside_down":"🙃","pretentious":"🤑","money_mouth":"🤑","astonished":"😲","sad":"☹️","frowning":"☹️","cheerless":"🙁","confounded":"😖","disappointed":"😞","worried":"😟","annoyed":"😤","hrmph":"😤","upset":"😢","cry":"😢","distressed":"😭","sob":"😭","bored":"😦","anguished":"😧","wtf":"😧","fearful":"😨","weary":"😩","shocked":"🤯","exploding_head":"🤯","grimaced":"😬","frustrated":"😰","frightened":"😱","scream":"😱","overheating":"🥵","freezing":"🥶","flushed":"😳","crazy":"🤪","dizzy":"😵","enraged":"😡","pout":"😡","angry":"😠","censored":"🤬","ill":"😷","mask":"😷","sick":"🤒","injured":"🤕","nauseated":"🤢","vomiting":"🤮","sneezing":"🤧","innocent":"😇","halo":"😇","cowboy":"🤠","partying":"🥳","celebrating":"🥳","woozy":"🥴","pleading":"🥺","lying":"🤥","shushing":"🤫","gasp":"🤭","monocle":"🧐","nerd":"🤓","imp":"😈","angry_imp":"👿","clown":"🤡","ogre":"👹","goblin":"👺","skull":"💀","crossbones":"☠️","ghost":"👻","alien":"👽️","alien_monster":"👾","space_invader":"👾","robot":"🤖","poop":"💩","smiling_cat":"😺","grinning_cat":"😸","joyful_cat":"😹","lovestruck_cat":"😻","smirking_cat":"😼","kissing_cat":"😽","weary_cat":"🙀","crying_cat":"😿","pouting_cat":"😾","see_no_evil":"🙈","hear_no_evil":"🙉","speak_no_evil":"🙊","baby":"👶","child":"🧒","boy":"👦","girl":"👧","adult":"🧑","man":"👨","woman":"👩","older_adult":"🧓","older_man":"👴","older_woman":"👵","man_health_worker":"👨‍⚕️","woman_health_worker":"👩‍⚕️","man_student":"👨‍🎓","woman_student":"👩‍🎓","man_teacher":"👨‍🏫","woman_teacher":"👩‍🏫","man_judge":"👨‍⚖️","woman_judge":"👩‍⚖️","man_farmer":"👨‍🌾","woman_farmer":"👩‍🌾","man_cook":"👨‍🍳","woman_cook":"👩‍🍳","man_mechanic":"👨‍🔧","woman_mechanic":"👩‍🔧","man_factory_worker":"👨‍🏭","woman_factory_worker":"👩‍🏭","man_office_worker":"👨‍💼","woman_office_worker":"👩‍💼","man_scientist":"👨‍🔬","woman_scientist":"👩‍🔬","man_technologist":"👨‍💻","woman_technologist":"👩‍💻","man_singer":"👨‍🎤","woman_singer":"👩‍🎤","man_artist":"👨‍🎨","woman_artist":"👩‍🎨","man_pilot":"👨‍✈️","woman_pilot":"👩‍✈️","man_astronaut":"👨‍🚀","woman_astronaut":"👩‍🚀","man_firefighter":"👨‍🚒","woman_firefighter":"👩‍🚒","police_officer":"👮","man_police_officer":"👮‍♂️","woman_police_officer":"👮‍♀️","detective":"🕵️","man_detective":"🕵️‍♂️","woman_detective":"🕵️‍♀️","guard":"💂","man_guard":"💂‍♂️","woman_guard":"💂‍♀️","construction_worker":"👷","man_construction_worker":"👷‍♂️","woman_construction_worker":"👷‍♀️","prince":"🤴","princess":"👸","person_turban":"👳","man_turban":"👳‍♂️","woman_turban":"👳‍♀️","man_chinese_cap":"👲","woman_headscarf":"🧕","bearded_person":"🧔","blond_person":"👱","blond_man":"👱‍♂️","blond_woman":"👱‍♀️","red_haired_man":"👨‍🦰","red_haired_woman":"👩‍🦰","curly_haired_man":"👨‍🦱","curly_haired_woman":"👩‍🦱","bald_man":"👨‍🦲","bald_woman":"👩‍🦲","white_haired_man":"👨‍🦳","white_haired_woman":"👩‍🦳","man_tuxedo":"🤵","bride_veil":"👰","pregnant_woman":"🤰","breast_feeding":"🤱","baby_angel":"👼","santa":"🎅","mrs_claus":"🤶","hero":"🦸","superhero":"🦸","woman_hero":"🦸‍♀️","man_hero":"🦸‍♂️","villain":"🦹","supervillain":"🦹","woman_villain":"🦹‍♀️","man_villain":"🦹‍♂️","mage":"🧙","woman_mage":"🧙‍♀️","man_mage":"🧙‍♂️","fairy":"🧚","woman_fairy":"🧚‍♀️","man_fairy":"🧚‍♂️","vampire":"🧛","woman_vampire":"🧛‍♀️","man_vampire":"🧛‍♂️","merperson":"🧜","mermaid":"🧜‍♀️","merman":"🧜‍♂️","elf":"🧝","woman_elf":"🧝‍♀️","man_elf":"🧝‍♂️","genie":"🧞","woman_genie":"🧞‍♀️","man_genie":"🧞‍♂️","zombie":"🧟","woman_zombie":"🧟‍♀️","man_zombie":"🧟‍♂️","person_frowning":"🙍","man_frowning":"🙍‍♂️","woman_frowning":"🙍‍♀️","person_pouting":"🙎","man_pouting":"🙎‍♂️","woman_pouting":"🙎‍♀️","person_gesturing_no":"🙅","man_gesturing_no":"🙅‍♂️","woman_gesturing_no":"🙅‍♀️","person_gesturing_ok":"🙆","man_gesturing_ok":"🙆‍♂️","woman_gesturing_ok":"🙆‍♀️","person_tipping_hand":"💁","man_tipping_hand":"💁‍♂️","woman_tipping_hand":"💁‍♀️","person_raising_hand":"🙋","man_raising_hand":"🙋‍♂️","woman_raising_hand":"🙋‍♀️","person_bowing":"🙇","man_bowing":"🙇‍♂️","woman_bowing":"🙇‍♀️","person_facepalming":"🤦","man_facepalming":"🤦‍♂️","woman_facepalming":"🤦‍♀️","person_shrugging":"🤷","man_shrugging":"🤷‍♂️","woman_shrugging":"🤷‍♀️","person_getting_massage":"💆","man_getting_face_massage":"💆‍♂️","woman_getting_face_massage":"💆‍♀️","person_getting_haircut":"💇","man_getting_haircut":"💇‍♂️","woman_getting_haircut":"💇‍♀️","person_walking":"🚶","man_walking":"🚶‍♂️","woman_walking":"🚶‍♀️","person_running":"🏃","man_running":"🏃‍♂️","woman_running":"🏃‍♀️","dancer":"💃","woman_dancing":"💃","man_dancing":"🕺","people_bunny_ears_partying":"👯","men_bunny_ears_partying":"👯‍♂️","women_bunny_ears_partying":"👯‍♀️","person_steamy_room":"🧖","woman_steamy_room":"🧖‍♀️","man_steamy_room":"🧖‍♂️","person_climbing":"🧗","woman_climbing":"🧗‍♀️","man_climbing":"🧗‍♂️","person_lotus_position":"🧘","woman_lotus_position":"🧘‍♀️","man_lotus_position":"🧘‍♂️","bath":"🛀","in_bed":"🛌","levitate":"🕴️","speaking_head":"🗣️","bust_silhouette":"👤","busts_silhouette":"👥","person_fencing":"🤺","horse_racing":"🏇","skier":"⛷️","snowboarder":"🏂️","person_golfing":"🏌️","man_golfing":"🏌️‍♂️","woman_golfing":"🏌️‍♀️","person_surfing":"🏄️","man_surfing":"🏄‍♂️","woman_surfing":"🏄‍♀️","person_rowing_boat":"🚣","man_rowing_boat":"🚣‍♂️","woman_rowing_boat":"🚣‍♀️","person_swimming":"🏊️","man_swimming":"🏊‍♂️","woman_swimming":"🏊‍♀️","person_bouncing_ball":"⛹️","man_bouncing_ball":"⛹️‍♂️","woman_bouncing_ball":"⛹️‍♀️","person_lifting_weights":"🏋️","man_lifting_weights":"🏋️‍♂️","woman_lifting_weights":"🏋️‍♀️","person_biking":"🚴","man_biking":"🚴‍♂️","woman_biking":"🚴‍♀️","person_mountain_biking":"🚵","man_mountain_biking":"🚵‍♂️","woman_mountain_biking":"🚵‍♀️","race_car":"🏎️","motorcycle":"🏍️","person_cartwheel":"🤸","man_cartwheeling":"🤸‍♂️","woman_cartwheeling":"🤸‍♀️","people_wrestling":"🤼","men_wrestling":"🤼‍♂️","women_wrestling":"🤼‍♀️","person_water_polo":"🤽","man_water_polo":"🤽‍♂️","woman_water_polo":"🤽‍♀️","person_handball":"🤾","man_handball":"🤾‍♂️","woman_handball":"🤾‍♀️","person_juggling":"🤹","man_juggling":"🤹‍♂️","woman_juggling":"🤹‍♀️","holding_hands_mw":"👫","holding_hands_wm":"👫","holding_hands_mm":"👬","holding_hands_ww":"👭","couple":"💏","kiss_mw":"👩‍❤️‍💋‍👨","kiss_wm":"👩‍❤️‍💋‍👨","kiss_mm":"👨‍❤️‍💋‍👨","kiss_ww":"👩‍❤️‍💋‍👩","couple_heart":"💑","couple_mw":"👩‍❤️‍👨","couple_wm":"👩‍❤️‍👨","couple_mm":"👨‍❤️‍👨","couple_ww":"👩‍❤️‍👩","family":"👪️","family_mwb":"👨‍👩‍👦","family_mwg":"👨‍👩‍👧","family_mwgb":"👨‍👩‍👧‍👦","family_mwbb":"👨‍👩‍👦‍👦","family_mwgg":"👨‍👩‍👧‍👧","family_mmb":"👨‍👨‍👦","family_mmg":"👨‍👨‍👧","family_mmgb":"👨‍👨‍👧‍👦","family_mmbb":"👨‍👨‍👦‍👦","family_mmgg":"👨‍👨‍👧‍👧","family_wwb":"👩‍👩‍👦","family_wwg":"👩‍👩‍👧","family_wwgb":"👩‍👩‍👧‍👦","family_wwbb":"👩‍👩‍👦‍👦","family_wwgg":"👩‍👩‍👧‍👧","family_mb":"👨‍👦","family_mbb":"👨‍👦‍👦","family_mg":"👨‍👧","family_mgb":"👨‍👧‍👦","family_mgg":"👨‍👧‍👧","family_wb":"👩‍👦","family_wbb":"👩‍👦‍👦","family_wg":"👩‍👧","family_wgb":"👩‍👧‍👦","family_wgg":"👩‍👧‍👧","selfie":"🤳","muscle":"💪","right_bicep":"💪","leg":"🦵","foot":"🦶","point_left":"👈️","point_right":"👉️","point_up":"☝️","backhand_point_up":"👆️","middle_finger":"🖕","point_down":"👇️","victory":"✌️","fingers_crossed":"🤞","vulcan":"🖖","metal":"🤘","call_me":"🤙","splayed_hand":"🖐️","raised_hand":"✋","ok_hand":"👌","thumbsup":"👍️","+1":"👍️","yes":"👍️","thumbsdown":"👎️","-1":"👎️","no":"👎️","fist":"✊","punch":"👊","left_facing_fist":"🤛","right_facing_fist":"🤜","raised_backhand":"🤚","wave":"👋","love_you_gesture":"🤟","writing_hand":"✍️","clap":"👏","open_hands":"👐","raised_hands":"🙌","palms_up":"🤲","pray":"🙏","handshake":"🤝","nail_care":"💅","ear":"👂️","nose":"👃","footprints":"👣","eyes":"👀","eye":"👁️","eye_bubble":"👁️‍🗨️","brain":"🧠","bone":"🦴","tooth":"🦷","tongue":"👅","lips":"👄","kiss_lips":"💋","cupid":"💘","heart":"❤️","heartbeat":"💓","broken_heart":"💔","two_hearts":"💕","sparkling_heart":"💖","heartpulse":"💗","blue_heart":"💙","green_heart":"💚","yellow_heart":"💛","orange_heart":"🧡","purple_heart":"💜","black_heart":"🖤","heart_ribbon":"💝","revolving_hearts":"💞","heart_decoration":"💟","heart_exclamation":"❣️","love_letter":"💌","zzz":"💤","anger":"💢","bomb":"💣️","boom":"💥","collision":"💥","sweat_drops":"💦","dash":"💨","dizzy_star":"💫","speech":"💬","left_speech":"🗨️","right_anger_speech":"🗯️","thought":"💭","hole":"🕳️","glasses":"👓️","sunglasses":"🕶️","goggles":"🥽","lab_coat":"🥼","necktie":"👔","tie":"👔","shirt":"👕","jeans":"👖","scarf":"🧣","gloves":"🧤","coat":"🧥","socks":"🧦","dress":"👗","kimono":"👘","bikini":"👙","blouse":"👚","womans_clothes":"👚","purse":"👛","handbag":"👜","pouch":"👝","clutch_bag":"👝","shopping_bags":"🛍️","backpack":"🎒","dress_shoe":"👞","mans_shoe":"👞","sneaker":"👟","athletic_shoe":"👟","hiking_boot":"🥾","flat_shoe":"🥿","high_heel":"👠","womans_sandal":"👡","womans_boot":"👢","crown":"👑","womans_hat":"👒","top_hat":"🎩","graduation_cap":"🎓️","billed_cap":"🧢","helmet_cross":"⛑️","prayer_beads":"📿","lipstick":"💄","ring":"💍","gem":"💎","monkey_face":"🐵","monkey":"🐒","gorilla":"🦍","dog_face":"🐶","dog":"🐕️","poodle":"🐩","wolf_face":"🐺","fox_face":"🦊","raccoon":"🦝","cat_face":"🐱","cat":"🐈️","lion_face":"🦁","tiger_face":"🐯","tiger":"🐅","leopard":"🐆","horse_face":"🐴","horse":"🐎","unicorn_face":"🦄","zebra":"🦓","deer":"🦌","cow_face":"🐮","ox":"🐂","water_buffalo":"🐃","cow":"🐄","pig_face":"🐷","pig":"🐖","boar":"🐗","pig_nose":"🐽","ram":"🐏","sheep":"🐑","goat":"🐐","camel":"🐪","two_hump_camel":"🐫","llama":"🦙","giraffe":"🦒","elephant":"🐘","rhino":"🦏","hippo":"🦛","mouse_face":"🐭","mouse":"🐁","rat":"🐀","hamster_face":"🐹","rabbit_face":"🐰","rabbit":"🐇","chipmunk":"🐿️","hedgehog":"🦔","bat":"🦇","bear_face":"🐻","koala_face":"🐨","panda_face":"🐼","kangaroo":"🦘","badger":"🦡","feet":"🐾","turkey":"🦃","chicken":"🐔","rooster":"🐓","hatching_chick":"🐣","baby_chick":"🐤","hatched_chick":"🐥","bird":"🐦️","penguin":"🐧","dove":"🕊️","eagle":"🦅","duck":"🦆","swan":"🦢","owl":"🦉","peacock":"🦚","parrot":"🦜","frog_face":"🐸","crocodile":"🐊","turtle":"🐢","lizard":"🦎","snake":"🐍","dragon_face":"🐲","dragon":"🐉","sauropod":"🦕","trex":"🦖","spouting_whale":"🐳","whale":"🐋","dolphin":"🐬","fish":"🐟️","tropical_fish":"🐠","blowfish":"🐡","shark":"🦈","octopus":"🐙","shell":"🐚","crab":"🦀","lobster":"🦞","shrimp":"🦐","squid":"🦑","snail":"🐌","butterfly":"🦋","bug":"🐛","ant":"🐜","bee":"🐝","beetle":"🐞","cricket":"🦗","spider":"🕷️","spider_web":"🕸️","scorpion":"🦂","mosquito":"🦟","microbe":"🦠","germ":"🦠","bouquet":"💐","cherry_blossom":"🌸","white_flower":"💮","rosette":"🏵️","rose":"🌹","wilted_rose":"🥀","hibiscus":"🌺","sunflower":"🌻","blossom":"🌼","tulip":"🌷","seedling":"🌱","evergreen_tree":"🌲","deciduous_tree":"🌳","palm_tree":"🌴","cactus":"🌵","ear_of_rice":"🌾","herb":"🌿","shamrock":"☘️","four_leaf_clover":"🍀","maple_leaf":"🍁","fallen_leaf":"🍂","leaves":"🍃","grapes":"🍇","melon":"🍈","watermelon":"🍉","tangerine":"🍊","lemon":"🍋","banana":"🍌","pineapple":"🍍","mango":"🥭","apple":"🍎","green_apple":"🍏","pear":"🍐","peach":"🍑","cherries":"🍒","strawberry":"🍓","kiwi":"🥝","tomato":"🍅","coconut":"🥥","avocado":"🥑","eggplant":"🍆","potato":"🥔","carrot":"🥕","corn":"🌽","hot_pepper":"🌶️","cucumber":"🥒","leafy_green":"🥬","broccoli":"🥦","mushroom":"🍄","peanuts":"🥜","chestnut":"🌰","bread":"🍞","croissant":"🥐","french_bread":"🥖","pretzel":"🥨","bagel":"🥯","pancakes":"🥞","cheese":"🧀","meat_on_bone":"🍖","poultry_leg":"🍗","cut_of_meat":"🥩","bacon":"🥓","hamburger":"🍔","fries":"🍟","pizza":"🍕","hotdog":"🌭","sandwich":"🥪","taco":"🌮","burrito":"🌯","stuffed_flatbread":"🥙","egg":"🥚","cooking":"🍳","shallow_pan_of_food":"🥘","stew":"🍲","bowl_spoon":"🥣","salad":"🥗","popcorn":"🍿","salt":"🧂","canned_food":"🥫","bento":"🍱","rice_cracker":"🍘","rice_ball":"🍙","rice":"🍚","curry":"🍛","ramen":"🍜","spaghetti":"🍝","sweet_potato":"🍠","oden":"🍢","sushi":"🍣","fried_shrimp":"🍤","fish_cake":"🍥","moon_cake":"🥮","dango":"🍡","dumpling":"🥟","fortune_cookie":"🥠","takeout_box":"🥡","icecream":"🍦","shaved_ice":"🍧","ice_cream":"🍨","doughnut":"🍩","cookie":"🍪","birthday":"🎂","cake":"🍰","cupcake":"🧁","pie":"🥧","chocolate_bar":"🍫","candy":"🍬","lollipop":"🍭","custard":"🍮","honey_pot":"🍯","baby_bottle":"🍼","milk":"🥛","coffee":"☕️","tea":"🍵","sake":"🍶","champagne":"🍾","wine_glass":"🍷","cocktail":"🍸️","tropical_drink":"🍹","beer":"🍺","beers":"🍻","champagne_glass":"🥂","tumbler_glass":"🥃","cup_straw":"🥤","chopsticks":"🥢","fork_knife_plate":"🍽️","utensils":"🍴","spoon":"🥄","knife":"🔪","amphora":"🏺","earth_africa":"🌍️","earth_americas":"🌎️","earth_asia":"🌏️","globe":"🌐","map":"🗺️","japan":"🗾","compass":"🧭","snowy_mountain":"🏔️","mountain":"⛰️","volcano":"🌋","mount_fuji":"🗻","camping":"🏕️","beach":"🏖️","desert":"🏜️","island":"🏝️","park":"🏞️","stadium":"🏟️","classical_building":"🏛️","construction_site":"🏗️","brick":"🧱","homes":"🏘️","house_abandoned":"🏚️","house":"🏠️","house_garden":"🏡","office":"🏢","ja_post_office":"🏣","post_office":"🏤","hospital":"🏥","bank":"🏦","hotel":"🏨","love_hotel":"🏩","convenience_store":"🏪","school":"🏫","department_store":"🏬","factory":"🏭️","japanese_castle":"🏯","castle":"🏰","european_castle":"🏰","wedding":"💒","tokyo_tower":"🗼","statue_of_liberty":"🗽","church":"⛪️","mosque":"🕌","synagogue":"🕍","shinto_shrine":"⛩️","kaaba":"🕋","fountain":"⛲️","tent":"⛺️","foggy":"🌁","night_stars":"🌃","cityscape":"🏙️","sunrise_over_mountains":"🌄","sunrise":"🌅","dusk":"🌆","sunset":"🌇","bridge_at_night":"🌉","hotsprings":"♨️","milky_way":"🌌","carousel_horse":"🎠","ferris_wheel":"🎡","roller_coaster":"🎢","barber":"💈","circus_tent":"🎪","steam_locomotive":"🚂","railway_car":"🚃","bullettrain_side":"🚄","bullettrain":"🚅","train":"🚆","metro":"🚇️","light_rail":"🚈","station":"🚉","tram":"🚊","monorail":"🚝","mountain_railway":"🚞","tram_car":"🚋","bus":"🚌","oncoming_bus":"🚍️","trolleybus":"🚎","minibus":"🚐","ambulance":"🚑️","fire_engine":"🚒","police_car":"🚓","oncoming_police_car":"🚔️","taxi":"🚕","oncoming_taxi":"🚖","red_car":"🚗","oncoming_automobile":"🚘️","blue_car":"🚙","truck":"🚚","lorry":"🚛","tractor":"🚜","bike":"🚲️","scooter":"🛴","skateboard":"🛹","motor_scooter":"🛵","bus_stop":"🚏","motorway":"🛣️","railway_track":"🛤️","oil_drum":"🛢️","fuel_pump":"⛽️","rotating_light":"🚨","police_light":"🚨","traffic_light":"🚥","vertical_traffic_light":"🚦","stop_sign":"🛑","octagonal_sign":"🛑","construction":"🚧","anchor":"⚓️","sailboat":"⛵️","canoe":"🛶","speedboat":"🚤","cruise_ship":"🛳️","ferry":"⛴️","motorboat":"🛥️","ship":"🚢","airplane":"✈️","small_airplane":"🛩️","airplane_departure":"🛫","airplane_arriving":"🛬","seat":"💺","helicopter":"🚁","suspension_railway":"🚟","mountain_cableway":"🚠","aerial_tramway":"🚡","satellite":"🛰️","rocket":"🚀","flying_saucer":"🛸","bellhop":"🛎️","luggage":"🧳","hourglass":"⌛️","hourglass_flowing":"⏳️","watch":"⌚️","alarm_clock":"⏰","stopwatch":"⏱️","timer":"⏲️","clock":"🕰️","clock12":"🕛️","clock1230":"🕧️","clock1":"🕐️","clock130":"🕜️","clock2":"🕑️","clock230":"🕝️","clock3":"🕒️","clock330":"🕞️","clock4":"🕓️","clock430":"🕟️","clock5":"🕔️","clock530":"🕠️","clock6":"🕕️","clock630":"🕡️","clock7":"🕖️","clock730":"🕢️","clock8":"🕗️","clock830":"🕣️","clock9":"🕘️","clock930":"🕤️","clock10":"🕙️","clock1030":"🕥️","clock11":"🕚️","clock1130":"🕦️","new_moon":"🌑","waxing_crescent_moon":"🌒","first_quarter_moon":"🌓","waxing_gibbous_moon":"🌔","full_moon":"🌕️","waning_gibbous_moon":"🌖","last_quarter_moon":"🌗","waning_crescent_moon":"🌘","crescent_moon":"🌙","new_moon_face":"🌚","first_quarter_moon_face":"🌛","last_quarter_moon_face":"🌜️","thermometer":"🌡️","sun":"☀️","full_moon_face":"🌝","sun_face":"🌞","star":"⭐️","star2":"🌟","glowing_star":"🌟","star3":"🌠","shooting_star":"🌠","cloud":"☁️","partly_sunny":"⛅️","storm":"⛈️","overcast":"🌤️","cloudy":"🌥️","sunshower":"🌦️","rain":"🌧️","snow":"🌨️","lightning":"🌩️","tornado":"🌪️","fog":"🌫️","wind_face":"🌬️","cyclone":"🌀","rainbow":"🌈","closed_umbrella":"🌂","umbrella":"☂️","umbrella_rain":"☔️","beach_umbrella":"⛱️","zap":"⚡️","high_voltage":"⚡️","snowflake":"❄️","snowy_snowman":"☃️","snowman":"⛄️","comet":"☄️","fire":"🔥","droplet":"💧","ocean":"🌊","jack_o_lantern":"🎃","christmas_tree":"🎄","xmas_tree":"🎄","fireworks":"🎆","sparkler":"🎇","firecracker":"🧨","sparkles":"✨","balloon":"🎈","tada":"🎉","party":"🎉","confetti_ball":"🎊","tanabata_tree":"🎋","bamboo":"🎍","pine_decor":"🎍","dolls":"🎎","carp_streamer":"🎏","wind_chime":"🎐","moon_ceremony":"🎑","rice_scene":"🎑","red_envelope":"🧧","ribbon":"🎀","gift":"🎁","reminder_ribbon":"🎗️","tickets":"🎟️","admission":"🎟️","ticket":"🎫","military_medal":"🎖️","trophy":"🏆️","medal":"🏅","first_place":"🥇","second_place":"🥈","third_place":"🥉","soccer":"⚽️","baseball":"⚾️","softball":"🥎","basketball":"🏀","volleyball":"🏐","football":"🏈","rugby":"🏉","tennis":"🎾","flying_disc":"🥏","bowling":"🎳","cricket_game":"🏏","field_hockey":"🏑","hockey":"🏒","lacrosse":"🥍","ping_pong":"🏓","badminton":"🏸","boxing_glove":"🥊","gi":"🥋","martial_arts_uniform":"🥋","goal":"🥅","golf":"⛳️","ice_skate":"⛸️","fishing_pole":"🎣","running_shirt":"🎽","ski":"🎿","sled":"🛷","curling_stone":"🥌","dart":"🎯","8ball":"🎱","crystal_ball":"🔮","nazar_amulet":"🧿","video_game":"🎮️","joystick":"🕹️","slot_machine":"🎰","game_die":"🎲","jigsaw":"🧩","puzzle_piece":"🧩","teddy_bear":"🧸","spades":"♠️","hearts":"♥️","diamonds":"♦️","clubs":"♣️","chess_pawn":"♟️","black_joker":"🃏","mahjong":"🀄️","flower_cards":"🎴","performing_arts":"🎭️","frame_photo":"🖼️","art":"🎨","palette":"🎨","spool":"🧵","yarn":"🧶","mute":"🔇","no_sound":"🔇","speaker":"🔈️","low_sound":"🔈️","sound":"🔉","loud_sound":"🔊","loudspeaker":"📢","megaphone":"📣","postal_horn":"📯","bell":"🔔","no_bell":"🔕","musical_score":"🎼","musical_note":"🎵","musical_notes":"🎶","studio_microphone":"🎙️","level_slider":"🎚️","control_knobs":"🎛️","microphone":"🎤","headphones":"🎧️","radio":"📻️","saxophone":"🎷","guitar":"🎸","musical_keyboard":"🎹","trumpet":"🎺","violin":"🎻","drum":"🥁","mobile":"📱","iphone":"📱","android":"📱","mobile_calling":"📲","telephone":"☎️","telephone_receiver":"📞","pager":"📟️","fax":"📠","battery":"🔋","electric_plug":"🔌","laptop":"💻️","desktop":"🖥️","computer":"🖥️","printer":"🖨️","keyboard":"⌨️","computer_mouse":"🖱️","trackball":"🖲️","minidisc":"💽","floppy_disk":"💾","cd":"💿️","disk":"💿️","dvd":"📀","abacus":"🧮","movie_camera":"🎥","film_frames":"🎞️","projector":"📽️","clapper":"🎬️","tv":"📺️","camera":"📷️","camera_flash":"📸","video_camera":"📹️","vhs":"📼","mag":"🔍️","mag_right":"🔎","candle":"🕯️","bulb":"💡","light_bulb":"💡","flashlight":"🔦","red_lantern":"🏮","decorative_notebook":"📔","closed_book":"📕","book":"📖","green_book":"📗","blue_book":"📘","orange_book":"📙","books":"📚️","notebook":"📓","ledger":"📒","page_curl":"📃","scroll":"📜","page_facing_up":"📄","newspaper":"📰","rolled_newspaper":"🗞️","bookmark_tabs":"📑","bookmark":"🔖","label":"🏷️","moneybag":"💰️","yen":"💴","dollar":"💵","euro":"💶","pound":"💷","money_wings":"💸","credit_card":"💳️","receipt":"🧾","ja_chart":"💹","currency_exchange":"💱","dollar_sign":"💲","envelope":"✉️","email":"📧","incoming_envelope":"📨","envelope_arrow":"📩","outbox_tray":"📤️","inbox_tray":"📥️","package":"📦️","mailbox":"📫️","mailbox_closed":"📪️","mailbox_mail":"📬️","mailbox_no_mail":"📭️","postbox":"📮","ballot_box":"🗳️","pencil":"✏️","black_nib":"✒️","fountain_pen":"🖋️","pen":"🖊️","paintbrush":"🖌️","crayon":"🖍️","memo":"📝","briefcase":"💼","file_folder":"📁","open_file_folder":"📂","dividers":"🗂️","date":"📅","calendar":"📅","torn_calendar":"📆","notepad_spiral":"🗒️","calendar_spiral":"🗓️","card_index":"📇","chart_up":"📈","chart_down":"📉","bar_chart":"📊","clipboard":"📋️","pushpin":"📌","round_pushpin":"📍","paperclip":"📎","paperclips":"🖇️","straight_ruler":"📏","triangular_ruler":"📐","scissors":"✂️","card_box":"🗃️","file_cabinet":"🗄️","trashcan":"🗑️","wastebasket":"🗑️","lock":"🔒️","unlock":"🔓️","locked_pen":"🔏","locked_key":"🔐","key":"🔑","old_key":"🗝️","hammer":"🔨","pick":"⛏️","hammer_pick":"⚒️","tools":"🛠️","hammer_wrench":"🛠️","dagger":"🗡️","crossed_swords":"⚔️","gun":"🔫","pistol":"🔫","bow":"🏹","shield":"🛡️","wrench":"🔧","nut_and_bolt":"🔩","gear":"⚙️","clamp":"🗜️","compression":"🗜️","scales":"⚖️","link":"🔗","chains":"⛓️","toolbox":"🧰","magnet":"🧲","alembic":"⚗️","test_tube":"🧪","petri_dish":"🧫","dna":"🧬","double_helix":"🧬","microscope":"🔬","telescope":"🔭","satellite_antenna":"📡","syringe":"💉","pill":"💊","door":"🚪","bed":"🛏️","couch":"🛋️","toilet":"🚽","shower":"🚿","bathtub":"🛁","lotion":"🧴","safety_pin":"🧷","broom":"🧹","basket":"🧺","toilet_paper":"🧻","soap":"🧼","sponge":"🧽","fire_extinguisher":"🧯","shopping_cart":"🛒","cigarette":"🚬","smoking":"🚬","coffin":"⚰️","urn":"⚱️","moai":"🗿","atm":"🏧","litter_bin":"🚮","potable_water":"🚰","wheelchair":"♿️","mens":"🚹️","womens":"🚺️","restroom":"🚻","bathroom":"🚻","baby_symbol":"🚼️","wc":"🚾","passport_control":"🛂","customs":"🛃","baggage_claim":"🛄","left_luggage":"🛅","warning":"⚠️","children_crossing":"🚸","no_entry":"⛔️","no_entry_sign":"🚫","no_bicycles":"🚳","no_smoking":"🚭️","do_not_litter":"🚯","non_potable_water":"🚱","no_pedestrians":"🚷","no_mobile_phones":"📵","underage":"🔞","radioactive":"☢️","biohazard":"☣️","arrow_up":"⬆️","arrow_upper_right":"↗️","arrow_right":"➡️","arrow_lower_right":"↘️","arrow_down":"⬇️","arrow_lower_left":"↙️","arrow_left":"⬅️","arrow_upper_left":"↖️","arrow_up_down":"↕️","arrow_left_right":"↔️","arrow_left_hook":"↩️","arrow_right_hook":"↪️","arrow_heading_up":"⤴️","arrow_heading_down":"⤵️","clockwise":"🔃","counter_clockwise":"🔄","back":"🔙","end":"🔚","on":"🔛","soon":"🔜","top":"🔝","place_of_worship":"🛐","atom":"⚛️","om_symbol":"🕉️","star_of_david":"✡️","wheel_of_dharma":"☸️","yin_yang":"☯️","cross":"✝️","orthodox_cross":"☦️","star_and_crescent":"☪️","peace":"☮️","menorah":"🕎","six_pointed_star":"🔯","aries":"♈️","taurus":"♉️","gemini":"♊️","cancer":"♋️","leo":"♌️","virgo":"♍️","libra":"♎️","scorpius":"♏️","sagittarius":"♐️","capricorn":"♑️","aquarius":"♒️","pisces":"♓️","ophiuchus":"⛎","shuffle":"🔀","repeat":"🔁","repeat_single":"🔂","play":"▶️","fast_forward":"⏩️","next_track":"⏭️","play_pause":"⏯️","reverse":"◀️","rewind":"⏪️","previous_track":"⏮️","up_button":"🔼","fast_up_button":"⏫","down_button":"🔽","fast_down_button":"⏬","pause":"⏸️","stop":"⏹️","record":"⏺️","eject":"⏏️","cinema":"🎦","dim":"🔅","low_brightness":"🔅","bright":"🔆","high_brightness":"🔆","signal_strength":"📶","antenna_bars":"📶","vibration_mode":"📳","mobile_phone_off":"📴","female":"♀️","female_sign":"♀️","male":"♂️","male_sign":"♂️","medical":"⚕️","infinity":"♾️","recycle":"♻️","fleur-de-lis":"⚜️","trident":"🔱","name_badge":"📛","ja_beginner":"🔰","o":"⭕️","white_check_mark":"✅","checked_ballot":"☑️","check_mark":"✔️","multiplication":"✖️","x":"❌","cross_mark":"❌","cross_mark_button":"❎","plus":"➕","minus":"➖","division":"➗","curly_loop":"➰","double_curly_loop":"➿","part_alternation_mark":"〽️","eight_spoked_asterisk":"✳️","eight_pointed_star":"✴️","sparkle":"❇️","bangbang":"‼️","double_exclamation":"‼️","interrobang":"⁉️","exclamation_question":"⁉️","question":"❓️","white_question":"❔","white_exclamation":"❕","exclamation":"❗️","wavy_dash":"〰️","copyright":"©️","registered":"®️","tm":"™️","hash":"#️⃣","asterisk":"*️⃣","zero":"0️⃣","one":"1️⃣","two":"2️⃣","three":"3️⃣","four":"4️⃣","five":"5️⃣","six":"6️⃣","seven":"7️⃣","eight":"8️⃣","nine":"9️⃣","ten":"🔟","upper_abcd":"🔠","abcd":"🔡","symbols":"🔣","abc":"🔤","a_blood":"🅰️","ab_blood":"🆎","b_blood":"🅱️","cl":"🆑","cool":"🆒","free":"🆓","info":"ℹ️","id":"🆔","m":"Ⓜ️","new":"🆕","ng":"🆖","o_blood":"🅾️","ok":"🆗","p":"🅿️","sos":"🆘","up":"🆙","vs":"🆚","ja_here":"🈁","koko":"🈁","ja_service_charge":"🈂️","ja_monthly_amount":"🈷️","ja_not_free_of_carge":"🈶","ja_reserved":"🈯️","ja_bargain":"🉐","ja_discount":"🈹","ja_free_of_charge":"🈚️","ja_prohibited":"🈲","ja_acceptable":"🉑","ja_application":"🈸","ja_passing_grade":"🈴","ja_vacancy":"🈳","ja_congratulations":"㊗️","ja_secret":"㊙️","ja_open_for_business":"🈺","ja_no_vacancy":"🈵","small_black_square":"▪️","small_white_square":"▫️","medium_white_square":"◻️","medium_black_square":"◼️","medium_small_white_square":"◽️","medium_small_black_square":"◾️","large_black_square":"⬛️","large_white_square":"⬜️","large_orange_diamond":"🔶","large_blue_diamond":"🔷","small_orange_diamond":"🔸","small_blue_diamond":"🔹","up_red_triangle":"🔺","down_red_triangle":"🔻","diamond_dot":"💠","radio_button":"🔘","black_square_button":"🔲","white_square_button":"🔳","white_circle":"⚪️","black_circle":"⚫️","red_circle":"🔴","blue_circle":"🔵","checkered_flag":"🏁","triangle_flag":"🚩","crossed_flags":"🎌","black_flag":"🏴","white_flag":"🏳️","rainbow_flag":"🏳️‍🌈","pirate_flag":"🏴‍☠️","jolly_roger":"🏴‍☠️","flag_ac":"🇦🇨","flag_ad":"🇦🇩","flag_ae":"🇦🇪","flag_af":"🇦🇫","flag_ag":"🇦🇬","flag_ai":"🇦🇮","flag_al":"🇦🇱","flag_am":"🇦🇲","flag_ao":"🇦🇴","flag_aq":"🇦🇶","flag_ar":"🇦🇷","flag_as":"🇦🇸","flag_at":"🇦🇹","flag_au":"🇦🇺","flag_aw":"🇦🇼","flag_ax":"🇦🇽","flag_az":"🇦🇿","flag_ba":"🇧🇦","flag_bb":"🇧🇧","flag_bd":"🇧🇩","flag_be":"🇧🇪","flag_bf":"🇧🇫","flag_bg":"🇧🇬","flag_bh":"🇧🇭","flag_bi":"🇧🇮","flag_bj":"🇧🇯","flag_bl":"🇧🇱","flag_bm":"🇧🇲","flag_bn":"🇧🇳","flag_bo":"🇧🇴","flag_bq":"🇧🇶","flag_br":"🇧🇷","flag_bs":"🇧🇸","flag_bt":"🇧🇹","flag_bv":"🇧🇻","flag_bw":"🇧🇼","flag_by":"🇧🇾","flag_bz":"🇧🇿","flag_ca":"🇨🇦","flag_cc":"🇨🇨","flag_cd":"🇨🇩","flag_cf":"🇨🇫","flag_cg":"🇨🇬","flag_ch":"🇨🇭","flag_ci":"🇨🇮","flag_ck":"🇨🇰","flag_cl":"🇨🇱","flag_cm":"🇨🇲","flag_cn":"🇨🇳","flag_co":"🇨🇴","flag_cp":"🇨🇵","flag_cr":"🇨🇷","flag_cu":"🇨🇺","flag_cv":"🇨🇻","flag_cw":"🇨🇼","flag_cx":"🇨🇽","flag_cy":"🇨🇾","flag_cz":"🇨🇿","flag_de":"🇩🇪","flag_dg":"🇩🇬","flag_dj":"🇩🇯","flag_dk":"🇩🇰","flag_dm":"🇩🇲","flag_do":"🇩🇴","flag_dz":"🇩🇿","flag_ea":"🇪🇦","flag_ec":"🇪🇨","flag_ee":"🇪🇪","flag_eg":"🇪🇬","flag_eh":"🇪🇭","flag_er":"🇪🇷","flag_es":"🇪🇸","flag_et":"🇪🇹","flag_eu":"🇪🇺","flag_fi":"🇫🇮","flag_fj":"🇫🇯","flag_fk":"🇫🇰","flag_fm":"🇫🇲","flag_fo":"🇫🇴","flag_fr":"🇫🇷","flag_ga":"🇬🇦","flag_gb":"🇬🇧","flag_gd":"🇬🇩","flag_ge":"🇬🇪","flag_gf":"🇬🇫","flag_gg":"🇬🇬","flag_gh":"🇬🇭","flag_gi":"🇬🇮","flag_gl":"🇬🇱","flag_gm":"🇬🇲","flag_gn":"🇬🇳","flag_gp":"🇬🇵","flag_gq":"🇬🇶","flag_gr":"🇬🇷","flag_gs":"🇬🇸","flag_gt":"🇬🇹","flag_gu":"🇬🇺","flag_gw":"🇬🇼","flag_gy":"🇬🇾","flag_hk":"🇭🇰","flag_hm":"🇭🇲","flag_hn":"🇭🇳","flag_hr":"🇭🇷","flag_ht":"🇭🇹","flag_hu":"🇭🇺","flag_ic":"🇮🇨","flag_id":"🇮🇩","flag_ie":"🇮🇪","flag_il":"🇮🇱","flag_im":"🇮🇲","flag_in":"🇮🇳","flag_io":"🇮🇴","flag_iq":"🇮🇶","flag_ir":"🇮🇷","flag_is":"🇮🇸","flag_it":"🇮🇹","flag_je":"🇯🇪","flag_jm":"🇯🇲","flag_jo":"🇯🇴","flag_jp":"🇯🇵","flag_ke":"🇰🇪","flag_kg":"🇰🇬","flag_kh":"🇰🇭","flag_ki":"🇰🇮","flag_km":"🇰🇲","flag_kn":"🇰🇳","flag_kp":"🇰🇵","flag_kr":"🇰🇷","flag_kw":"🇰🇼","flag_ky":"🇰🇾","flag_kz":"🇰🇿","flag_la":"🇱🇦","flag_lb":"🇱🇧","flag_lc":"🇱🇨","flag_li":"🇱🇮","flag_lk":"🇱🇰","flag_lr":"🇱🇷","flag_ls":"🇱🇸","flag_lt":"🇱🇹","flag_lu":"🇱🇺","flag_lv":"🇱🇻","flag_ly":"🇱🇾","flag_ma":"🇲🇦","flag_mc":"🇲🇨","flag_md":"🇲🇩","flag_me":"🇲🇪","flag_mf":"🇲🇫","flag_mg":"🇲🇬","flag_mh":"🇲🇭","flag_mk":"🇲🇰","flag_ml":"🇲🇱","flag_mm":"🇲🇲","flag_mn":"🇲🇳","flag_mo":"🇲🇴","flag_mp":"🇲🇵","flag_mq":"🇲🇶","flag_mr":"🇲🇷","flag_ms":"🇲🇸","flag_mt":"🇲🇹","flag_mu":"🇲🇺","flag_mv":"🇲🇻","flag_mw":"🇲🇼","flag_mx":"🇲🇽","flag_my":"🇲🇾","flag_mz":"🇲🇿","flag_na":"🇳🇦","flag_nc":"🇳🇨","flag_ne":"🇳🇪","flag_nf":"🇳🇫","flag_ng":"🇳🇬","flag_ni":"🇳🇮","flag_nl":"🇳🇱","flag_no":"🇳🇴","flag_np":"🇳🇵","flag_nr":"🇳🇷","flag_nu":"🇳🇺","flag_nz":"🇳🇿","flag_om":"🇴🇲","flag_pa":"🇵🇦","flag_pe":"🇵🇪","flag_pf":"🇵🇫","flag_pg":"🇵🇬","flag_ph":"🇵🇭","flag_pk":"🇵🇰","flag_pl":"🇵🇱","flag_pm":"🇵🇲","flag_pn":"🇵🇳","flag_pr":"🇵🇷","flag_ps":"🇵🇸","flag_pt":"🇵🇹","flag_pw":"🇵🇼","flag_py":"🇵🇾","flag_qa":"🇶🇦","flag_re":"🇷🇪","flag_ro":"🇷🇴","flag_rs":"🇷🇸","flag_ru":"🇷🇺","flag_rw":"🇷🇼","flag_sa":"🇸🇦","flag_sb":"🇸🇧","flag_sc":"🇸🇨","flag_sd":"🇸🇩","flag_se":"🇸🇪","flag_sg":"🇸🇬","flag_sh":"🇸🇭","flag_si":"🇸🇮","flag_sj":"🇸🇯","flag_sk":"🇸🇰","flag_sl":"🇸🇱","flag_sm":"🇸🇲","flag_sn":"🇸🇳","flag_so":"🇸🇴","flag_sr":"🇸🇷","flag_ss":"🇸🇸","flag_st":"🇸🇹","flag_sv":"🇸🇻","flag_sx":"🇸🇽","flag_sy":"🇸🇾","flag_sz":"🇸🇿","flag_ta":"🇹🇦","flag_tc":"🇹🇨","flag_td":"🇹🇩","flag_tf":"🇹🇫","flag_tg":"🇹🇬","flag_th":"🇹🇭","flag_tj":"🇹🇯","flag_tk":"🇹🇰","flag_tl":"🇹🇱","flag_tm":"🇹🇲","flag_tn":"🇹🇳","flag_to":"🇹🇴","flag_tr":"🇹🇷","flag_tt":"🇹🇹","flag_tv":"🇹🇻","flag_tw":"🇹🇼","flag_tz":"🇹🇿","flag_ua":"🇺🇦","flag_ug":"🇺🇬","flag_um":"🇺🇲","flag_un":"🇺🇳","flag_us":"🇺🇸","usa":"🇺🇸","flag_uy":"🇺🇾","flag_uz":"🇺🇿","flag_va":"🇻🇦","flag_vc":"🇻🇨","flag_ve":"🇻🇪","flag_vg":"🇻🇬","flag_vi":"🇻🇮","flag_vn":"🇻🇳","flag_vu":"🇻🇺","flag_wf":"🇼🇫","flag_ws":"🇼🇸","flag_xk":"🇽🇰","flag_ye":"🇾🇪","flag_yt":"🇾🇹","flag_za":"🇿🇦","flag_zm":"🇿🇲","flag_zw":"🇿🇼","flag_gbeng":"🏴󠁧󠁢󠁥󠁮󠁧󠁿","england":"🏴󠁧󠁢󠁥󠁮󠁧󠁿","flag_gbsct":"🏴󠁧󠁢󠁳󠁣󠁴󠁿","scotland":"🏴󠁧󠁢󠁳󠁣󠁴󠁿","flag_gbwls":"🏴󠁧󠁢󠁷󠁬󠁳󠁿","wales":"🏴󠁧󠁢󠁷󠁬󠁳󠁿"}
\ No newline at end of file
diff --git a/emoji/shortcodeToEmoji.js b/emoji/shortcodeToEmoji.js
new file mode 100644
index 0000000..3f03fb4
--- /dev/null
+++ b/emoji/shortcodeToEmoji.js
@@ -0,0 +1,25 @@
+const fs = require('fs');
+const path = require('path');
+
+// Get emoji data from https://github.com/milesj/emojibase
+// https://github.com/milesj/emojibase/blob/master/packages/data/en/data.json
+
+function generate() {
+    const map = Object.create(null);
+
+    const emojis = require(path.join(process.cwd(), 'data.json'));
+    for (const emoji of emojis) {
+        if (emoji.shortcodes == null || emoji.shortcodes.length === 0) continue;
+
+        for (const code of emoji.shortcodes) {
+            if (map[code] !== undefined) {
+                console.warn(code);
+            }
+            map[code] = emoji.emoji;
+        }
+    }
+
+    fs.writeFileSync(path.join(process.cwd(), 'emojis.json'), JSON.stringify(map), 'utf8');
+}
+
+generate();
diff --git a/src/annotations/annotations.ts b/src/annotations/annotations.ts
index 397aae7..f28b13e 100644
--- a/src/annotations/annotations.ts
+++ b/src/annotations/annotations.ts
@@ -141,7 +141,7 @@ export class Annotations {
                 commit.sha
             )} "Show Commit Details")`;
 
-            message = commit.message;
+            message = CommitFormatter.fromTemplate('${message}', commit);
             for (const r of remotes) {
                 if (r.provider === undefined) continue;
 
diff --git a/src/git/formatters/commitFormatter.ts b/src/git/formatters/commitFormatter.ts
index 3703990..3fffd41 100644
--- a/src/git/formatters/commitFormatter.ts
+++ b/src/git/formatters/commitFormatter.ts
@@ -1,10 +1,14 @@
 'use strict';
 import { DateStyle } from '../../configuration';
+import { GlyphChars } from '../../constants';
 import { Container } from '../../container';
 import { Strings } from '../../system';
 import { GitCommit } from '../models/commit';
 import { Formatter, IFormatOptions } from './formatter';
 
+const emojiMap: { [key: string]: string } = require('../../../emoji/emojis.json');
+const emojiRegex = /:([-+_a-z0-9]+):/g;
+
 export interface ICommitFormatOptions extends IFormatOptions {
     dateStyle?: DateStyle;
     truncateMessageAtNewLine?: boolean;
@@ -67,7 +71,7 @@ export class CommitFormatter extends Formatter<GitCommit, ICommitFormatOptions>
     }
 
     get message() {
-        let message;
+        let message: string;
         if (this._item.isStagedUncommitted) {
             message = 'Staged changes';
         }
@@ -76,11 +80,17 @@ export class CommitFormatter extends Formatter<GitCommit, ICommitFormatOptions>
         }
         else {
             if (this._options.truncateMessageAtNewLine) {
-                message = this._item.getShortMessage();
+                const index = this._item.message.indexOf('\n');
+                message =
+                    index === -1
+                        ? this._item.message
+                        : `${this._item.message.substring(0, index)}${GlyphChars.Space}${GlyphChars.Ellipsis}`;
             }
             else {
                 message = this._item.message;
             }
+
+            message = message.replace(emojiRegex, (s, code) => emojiMap[code] || s);
         }
 
         return this._padOrTruncate(message, this._options.tokenOptions!.message);
diff --git a/src/git/models/commit.ts b/src/git/models/commit.ts
index eb3212f..cdba351 100644
--- a/src/git/models/commit.ts
+++ b/src/git/models/commit.ts
@@ -5,6 +5,7 @@ import { configuration, DateStyle, GravatarDefaultStyle } from '../../configurat
 import { GlyphChars } from '../../constants';
 import { Container } from '../../container';
 import { Dates, Strings } from '../../system';
+import { CommitFormatter } from '../formatters/formatters';
 import { Git } from '../git';
 import { GitUri } from '../gitUri';
 
@@ -199,11 +200,8 @@ export abstract class GitCommit {
         return gravatar;
     }
 
-    getShortMessage(truncationSuffix: string = `${GlyphChars.Space}${GlyphChars.Ellipsis}`) {
-        const index = this.message.indexOf('\n');
-        if (index === -1) return this.message;
-
-        return `${this.message.substring(0, index)}${truncationSuffix}`;
+    getShortMessage() {
+        return CommitFormatter.fromTemplate('${message}', this, { truncateMessageAtNewLine: true });
     }
 
     async resolvePreviousFileSha(): Promise<void> {