diff --git a/composer.json b/composer.json
index a808619..2b8deef 100644
--- a/composer.json
+++ b/composer.json
@@ -9,18 +9,18 @@
     },
     "require-dev": {
         "phpunit/phpunit": "^5.0",
-        "milesj/emojibase": "3.1.0"
+        "milesj/emojibase": "4.0.0"
     },
     "repositories": [
         {
             "type": "package",
             "package": {
                 "name": "milesj/emojibase",
-                "version": "3.1.0",
+                "version": "4.0.0",
                 "source": {
                     "url": "https://github.com/milesj/emojibase",
                     "type": "git",
-                    "reference": "tags/emojibase-data@3.1.0"
+                    "reference": "tags/emojibase-data@4.0.0"
                 }
             }
         }
diff --git a/src/shortcodes-array.php b/src/shortcodes-array.php
index e642082..e71f360 100644
--- a/src/shortcodes-array.php
+++ b/src/shortcodes-array.php
@@ -13,6 +13,7 @@
   'abc' => '1F524',
   'abcd' => '1F521',
   'accept' => '1F251',
+  'adhesive_bandage' => '1FA79',
   'admission' => '1F39F',
   'admission_tickets' => '1F39F',
   'adult' => '1F9D1',
@@ -72,7 +73,9 @@
   'atm' => '1F3E7',
   'atom' => '269B',
   'atom_symbol' => '269B',
+  'auto_rickshaw' => '1F6FA',
   'avocado' => '1F951',
+  'axe' => '1FA93',
   'b' => '1F171',
   'b_blood' => '1F171',
   'baby' => '1F476',
@@ -90,15 +93,19 @@
   'bagel' => '1F96F',
   'baggage_claim' => '1F6C4',
   'baguette_bread' => '1F956',
+  'bald' => '1F9B2',
   'bald_man' => '1F468-200D-1F9B2',
   'bald_woman' => '1F469-200D-1F9B2',
+  'ballet_shoes' => '1FA70',
   'balloon' => '1F388',
   'ballot_box' => '1F5F3',
   'ballot_box_with_ballot' => '1F5F3',
   'ballot_box_with_check' => '2611',
   'bamboo' => '1F38D',
   'banana' => '1F34C',
+  'bandaid' => '1FA79',
   'bangbang' => '203C',
+  'banjo' => '1FA95',
   'bank' => '1F3E6',
   'bar_chart' => '1F4CA',
   'barber' => '1F488',
@@ -127,6 +134,7 @@
   'bellhop' => '1F6CE',
   'bellhop_bell' => '1F6CE',
   'bento' => '1F371',
+  'beverage_box' => '1F9C3',
   'bicyclist' => '1F6B4',
   'bike' => '1F6B2',
   'bikini' => '1F459',
@@ -156,6 +164,7 @@
   'blond_man' => '1F471-200D-2642-FE0F',
   'blond_person' => '1F471',
   'blond_woman' => '1F471-200D-2640-FE0F',
+  'blood_drop' => '1FA78',
   'blossom' => '1F33C',
   'blouse' => '1F45A',
   'blowfish' => '1F421',
@@ -163,6 +172,7 @@
   'blue_car' => '1F699',
   'blue_circle' => '1F535',
   'blue_heart' => '1F499',
+  'blue_square' => '1F7E6',
   'blush' => '1F60A',
   'boar' => '1F417',
   'boat' => '26F5',
@@ -190,10 +200,14 @@
   'bride_with_veil' => '1F470',
   'bridge_at_night' => '1F309',
   'briefcase' => '1F4BC',
+  'briefs' => '1FA72',
   'bright' => '1F506',
   'broccoli' => '1F966',
   'broken_heart' => '1F494',
   'broom' => '1F9F9',
+  'brown_circle' => '1F7E4',
+  'brown_heart' => '1F90E',
+  'brown_square' => '1F7EB',
   'bug' => '1F41B',
   'building_construction' => '1F3D7',
   'bulb' => '1F4A1',
@@ -208,6 +222,7 @@
   'bust_silhouette' => '1F464',
   'busts_in_silhouette' => '1F465',
   'busts_silhouette' => '1F465',
+  'butter' => '1F9C8',
   'butterfly' => '1F98B',
   'cactus' => '1F335',
   'cake' => '1F370',
@@ -244,6 +259,7 @@
   'celebrating' => '1F973',
   'censored' => '1F92C',
   'chains' => '26D3',
+  'chair' => '1FA91',
   'champagne' => '1F37E',
   'champagne_glass' => '1F942',
   'chart' => '1F4B9',
@@ -392,6 +408,7 @@
   'cupid' => '1F498',
   'curious' => '1F914',
   'curling_stone' => '1F94C',
+  'curly_hair' => '1F9B1',
   'curly_haired_man' => '1F468-200D-1F9B1',
   'curly_haired_woman' => '1F469-200D-1F9B1',
   'curly_loop' => '27B0',
@@ -431,7 +448,9 @@
   'disk' => '1F4BF',
   'distressed' => '1F62D',
   'dividers' => '1F5C2',
+  'diving_mask' => '1F93F',
   'division' => '2797',
+  'diya_lamp' => '1FA94',
   'dizzy' => '1F4AB',
   'dizzy_face' => '1F635',
   'dizzy_star' => '1F4AB',
@@ -519,6 +538,7 @@
   'facetious' => '1F61D',
   'factory' => '1F3ED',
   'fairy' => '1F9DA',
+  'falafel' => '1F9C6',
   'fallen_leaf' => '1F342',
   'family' => '1F468-200D-1F469-200D-1F466',
   'family_mb' => '1F468-200D-1F466',
@@ -862,6 +882,7 @@
   'flag_gbsct' => '1F3F4-E0067-E0062-E0073-E0063-E0074-E007F',
   'flag_gbwls' => '1F3F4-E0067-E0062-E0077-E006C-E0073-E007F',
   'flags' => '1F38F',
+  'flamingo' => '1F9A9',
   'flashlight' => '1F526',
   'flat_shoe' => '1F97F',
   'fleur_de_lis' => '269C',
@@ -907,6 +928,7 @@
   'full_moon_with_face' => '1F31D',
   'funeral_urn' => '26B1',
   'game_die' => '1F3B2',
+  'garlic' => '1F9C4',
   'gasp' => '1F92D',
   'gb' => '1F1EC-1F1E7',
   'gear' => '2699',
@@ -940,8 +962,10 @@
   'grapes' => '1F347',
   'green_apple' => '1F34F',
   'green_book' => '1F4D7',
+  'green_circle' => '1F7E2',
   'green_heart' => '1F49A',
   'green_salad' => '1F957',
+  'green_square' => '1F7E9',
   'grey_exclamation' => '2755',
   'grey_question' => '2754',
   'grimaced' => '1F62C',
@@ -951,6 +975,7 @@
   'grinning_cat' => '1F638',
   'guard' => '1F482',
   'guardsman' => '1F482',
+  'guide_dog' => '1F9AE',
   'guitar' => '1F3B8',
   'gun' => '1F52B',
   'haha' => '1F602',
@@ -968,6 +993,7 @@
   'hand_with_index_and_middle_fingers_crossed' => '1F91E',
   'handbag' => '1F45C',
   'handball' => '1F93E',
+  'handicapped' => '267F',
   'handshake' => '1F91D',
   'hankey' => '1F4A9',
   'happy' => '1F604',
@@ -977,6 +1003,7 @@
   'hatching_chick' => '1F423',
   'headphones' => '1F3A7',
   'hear_no_evil' => '1F649',
+  'hearing_aid' => '1F9BB',
   'heart' => '2764',
   'heart_decoration' => '1F49F',
   'heart_exclamation' => '2763',
@@ -1005,11 +1032,13 @@
   'high_heel' => '1F460',
   'high_voltage' => '26A1',
   'hiking_boot' => '1F97E',
+  'hindu_temple' => '1F6D5',
   'hippo' => '1F99B',
   'hocho' => '1F52A',
   'hockey' => '1F3D2',
   'holding_hands_mm' => '1F46C',
   'holding_hands_mw' => '1F46B',
+  'holding_hands_people' => '1F9D1-200D-1F91D-200D-1F9D1',
   'holding_hands_wm' => '1F46B',
   'holding_hands_ww' => '1F46D',
   'hole' => '1F573',
@@ -1037,6 +1066,7 @@
   'hugging' => '1F917',
   'hugging_face' => '1F917',
   'hushed' => '1F62F',
+  'ice' => '1F9CA',
   'ice_cream' => '1F368',
   'ice_hockey_stick_and_puck' => '1F3D2',
   'ice_skate' => '26F8',
@@ -1095,6 +1125,7 @@
   'joystick' => '1F579',
   'jp' => '1F1EF-1F1F5',
   'juggling' => '1F939',
+  'juice_box' => '1F9C3',
   'kaaba' => '1F54B',
   'kangaroo' => '1F998',
   'key' => '1F511',
@@ -1113,6 +1144,7 @@
   'kissing_closed_eyes' => '1F61A',
   'kissing_heart' => '1F618',
   'kissing_smiling_eyes' => '1F619',
+  'kite' => '1FA81',
   'kiwi' => '1F95D',
   'kiwifruit' => '1F95D',
   'knife' => '1F52A',
@@ -1282,6 +1314,7 @@
   'man_construction_worker' => '1F477-200D-2642-FE0F',
   'man_cook' => '1F468-200D-1F373',
   'man_dancing' => '1F57A',
+  'man_deaf' => '1F9CF-200D-2642-FE0F',
   'man_detective' => '1F575-FE0F-200D-2642-FE0F',
   'man_elf' => '1F9DD-200D-2642-FE0F',
   'man_factory_worker' => '1F468-200D-1F3ED',
@@ -1297,14 +1330,18 @@
   'man_in_business_suit_levitating' => '1F574',
   'man_in_tuxedo' => '1F935',
   'man_judge' => '1F468-200D-2696-FE0F',
+  'man_kneeling' => '1F9CE-200D-2642-FE0F',
   'man_lotus_position' => '1F9D8-200D-2642-FE0F',
   'man_mage' => '1F9D9-200D-2642-FE0F',
   'man_mechanic' => '1F468-200D-1F527',
+  'man_motor_wheelchair' => '1F468-200D-1F9BC',
   'man_office_worker' => '1F468-200D-1F4BC',
   'man_pilot' => '1F468-200D-2708-FE0F',
   'man_police_officer' => '1F46E-200D-2642-FE0F',
+  'man_probing_cane' => '1F468-200D-1F9AF',
   'man_scientist' => '1F468-200D-1F52C',
   'man_singer' => '1F468-200D-1F3A4',
+  'man_standing' => '1F9CD-200D-2642-FE0F',
   'man_steamy_room' => '1F9D6-200D-2642-FE0F',
   'man_student' => '1F468-200D-1F393',
   'man_teacher' => '1F468-200D-1F3EB',
@@ -1314,6 +1351,7 @@
   'man_vampire' => '1F9DB-200D-2642-FE0F',
   'man_villain' => '1F9B9-200D-2642-FE0F',
   'man_water_polo' => '1F93D-200D-2642-FE0F',
+  'man_wheelchair' => '1F468-200D-1F9BD',
   'man_with_gua_pi_mao' => '1F472',
   'man_with_turban' => '1F473',
   'man_zombie' => '1F9DF-200D-2642-FE0F',
@@ -1325,7 +1363,10 @@
   'martial_arts_uniform' => '1F94B',
   'mask' => '1F637',
   'massage' => '1F486',
+  'mate' => '1F9C9',
   'meat_on_bone' => '1F356',
+  'mech_arm' => '1F9BE',
+  'mech_leg' => '1F9BF',
   'medal' => '1F396',
   'medical' => '2695',
   'medium_black_square' => '25FC',
@@ -1380,6 +1421,7 @@
   'mother_christmas' => '1F936',
   'motor_boat' => '1F6E5',
   'motor_scooter' => '1F6F5',
+  'motor_wheelchair' => '1F9BC',
   'motorboat' => '1F6E5',
   'motorcycle' => '1F3CD',
   'motorway' => '1F6E3',
@@ -1466,19 +1508,26 @@
   'oncoming_police_car' => '1F694',
   'oncoming_taxi' => '1F696',
   'one' => '0031-20E3',
+  'one_piece_swimsuit' => '1FA71',
+  'onion' => '1F9C5',
   'open_book' => '1F4D6',
   'open_file_folder' => '1F4C2',
   'open_hands' => '1F450',
   'open_mouth' => '1F62E',
   'ophiuchus' => '26CE',
   'orange_book' => '1F4D9',
+  'orange_circle' => '1F7E0',
   'orange_heart' => '1F9E1',
+  'orange_square' => '1F7E7',
+  'orangutan' => '1F9A7',
   'orthodox_cross' => '2626',
+  'otter' => '1F9A6',
   'outbox_tray' => '1F4E4',
   'overcast' => '1F324',
   'overheating' => '1F975',
   'owl' => '1F989',
   'ox' => '1F402',
+  'oyster' => '1F9AA',
   'p' => '1F17F',
   'package' => '1F4E6',
   'page_curl' => '1F4C3',
@@ -1493,6 +1542,7 @@
   'panda_face' => '1F43C',
   'paperclip' => '1F4CE',
   'paperclips' => '1F587',
+  'parachute' => '1FA82',
   'park' => '1F3DE',
   'parking' => '1F17F',
   'parrot' => '1F99C',
@@ -1526,6 +1576,7 @@
   'person_bowing' => '1F647',
   'person_cartwheel' => '1F938',
   'person_climbing' => '1F9D7',
+  'person_deaf' => '1F9CF',
   'person_doing_cartwheel' => '1F938',
   'person_facepalming' => '1F926',
   'person_fencing' => '1F93A',
@@ -1537,6 +1588,7 @@
   'person_golfing' => '1F3CC',
   'person_handball' => '1F93E',
   'person_juggling' => '1F939',
+  'person_kneeling' => '1F9CE',
   'person_lifting_weights' => '1F3CB',
   'person_lotus_position' => '1F9D8',
   'person_mountain_biking' => '1F6B5',
@@ -1545,6 +1597,7 @@
   'person_rowing_boat' => '1F6A3',
   'person_running' => '1F3C3',
   'person_shrugging' => '1F937',
+  'person_standing' => '1F9CD',
   'person_steamy_room' => '1F9D6',
   'person_surfing' => '1F3C4',
   'person_swimming' => '1F3CA',
@@ -1564,6 +1617,7 @@
   'pig_face' => '1F437',
   'pig_nose' => '1F43D',
   'pill' => '1F48A',
+  'pinch' => '1F90F',
   'pine_decor' => '1F38D',
   'pineapple' => '1F34D',
   'ping_pong' => '1F3D3',
@@ -1608,9 +1662,12 @@
   'prince' => '1F934',
   'princess' => '1F478',
   'printer' => '1F5A8',
+  'probing_cane' => '1F9AF',
   'projector' => '1F4FD',
   'punch' => '1F44A',
+  'purple_circle' => '1F7E3',
   'purple_heart' => '1F49C',
+  'purple_square' => '1F7EA',
   'purse' => '1F45B',
   'pushpin' => '1F4CC',
   'put_litter_in_its_place' => '1F6AE',
@@ -1644,15 +1701,18 @@
   'ram' => '1F40F',
   'ramen' => '1F35C',
   'rat' => '1F400',
+  'razor' => '1FA92',
   'receipt' => '1F9FE',
   'record' => '23FA',
   'recycle' => '267B',
   'red_car' => '1F697',
   'red_circle' => '1F534',
   'red_envelope' => '1F9E7',
+  'red_hair' => '1F9B0',
   'red_haired_man' => '1F468-200D-1F9B0',
   'red_haired_woman' => '1F469-200D-1F9B0',
   'red_lantern' => '1F3EE',
+  'red_square' => '1F7E5',
   'registered' => '00AE',
   'relaxed' => '263A',
   'relieved' => '1F60C',
@@ -1677,6 +1737,7 @@
   'right_anger_speech' => '1F5EF',
   'right_bicep' => '1F4AA',
   'ring' => '1F48D',
+  'ringed_planet' => '1FA90',
   'robot' => '1F916',
   'robot_face' => '1F916',
   'rocket' => '1F680',
@@ -1701,6 +1762,7 @@
   'sa' => '1F202',
   'sad' => '2639',
   'safety_pin' => '1F9F7',
+  'safety_vest' => '1F9BA',
   'sagittarius' => '2650',
   'sailboat' => '26F5',
   'sake' => '1F376',
@@ -1709,9 +1771,11 @@
   'sandal' => '1F461',
   'sandwich' => '1F96A',
   'santa' => '1F385',
+  'sari' => '1F97B',
   'satellite' => '1F6F0',
   'satellite_antenna' => '1F4E1',
   'satisfied' => '1F606',
+  'saturn' => '1FA90',
   'sauropod' => '1F995',
   'savour' => '1F60B',
   'saxophone' => '1F3B7',
@@ -1727,6 +1791,7 @@
   'scream' => '1F631',
   'scream_cat' => '1F640',
   'scroll' => '1F4DC',
+  'scuba_mask' => '1F93F',
   'seat' => '1F4BA',
   'second_place' => '1F948',
   'second_place_medal' => '1F948',
@@ -1734,6 +1799,7 @@
   'see_no_evil' => '1F648',
   'seedling' => '1F331',
   'selfie' => '1F933',
+  'service_dog' => '1F415-200D-1F9BA',
   'seven' => '0037-20E3',
   'shallow_pan_of_food' => '1F958',
   'shamed' => '1F613',
@@ -1753,6 +1819,7 @@
   'shopping_bags' => '1F6CD',
   'shopping_cart' => '1F6D2',
   'shopping_trolley' => '1F6D2',
+  'shorts' => '1FA73',
   'shower' => '1F6BF',
   'shrimp' => '1F990',
   'shrug' => '1F937',
@@ -1774,6 +1841,7 @@
   'skin-tone-6' => '1F3FF',
   'skull' => '1F480',
   'skull_and_crossbones' => '2620',
+  'skunk' => '1F9A8',
   'sled' => '1F6F7',
   'sleeping' => '1F634',
   'sleeping_accommodation' => '1F6CC',
@@ -1782,6 +1850,7 @@
   'slightly_frowning_face' => '1F641',
   'slightly_smiling_face' => '1F642',
   'slot_machine' => '1F3B0',
+  'sloth' => '1F9A5',
   'small_airplane' => '1F6E9',
   'small_black_square' => '25AA',
   'small_blue_diamond' => '1F539',
@@ -1859,6 +1928,7 @@
   'station' => '1F689',
   'statue_of_liberty' => '1F5FD',
   'steam_locomotive' => '1F682',
+  'stethoscope' => '1FA7A',
   'stew' => '1F372',
   'stop' => '23F9',
   'stop_sign' => '1F6D1',
@@ -1944,6 +2014,16 @@
   'toilet_paper' => '1F9FB',
   'tokyo_tower' => '1F5FC',
   'tomato' => '1F345',
+  'tone1' => '1F3FB',
+  'tone2' => '1F3FC',
+  'tone3' => '1F3FD',
+  'tone4' => '1F3FE',
+  'tone5' => '1F3FF',
+  'tone_dark' => '1F3FF',
+  'tone_light' => '1F3FB',
+  'tone_medium' => '1F3FD',
+  'tone_medium_dark' => '1F3FE',
+  'tone_medium_light' => '1F3FC',
   'tongue' => '1F445',
   'tongue_out' => '1F61B',
   'toolbox' => '1F9F0',
@@ -2035,6 +2115,7 @@
   'vomiting' => '1F92E',
   'vs' => '1F19A',
   'vulcan' => '1F596',
+  'waffle' => '1F9C7',
   'wales' => '1F3F4-E0067-E0062-E0077-E006C-E0073-E007F',
   'walking' => '1F6B6',
   'waning_crescent_moon' => '1F318',
@@ -2066,8 +2147,10 @@
   'white_flag' => '1F3F3',
   'white_flower' => '1F4AE',
   'white_frowning_face' => '2639',
+  'white_hair' => '1F9B3',
   'white_haired_man' => '1F468-200D-1F9B3',
   'white_haired_woman' => '1F469-200D-1F9B3',
+  'white_heart' => '1F90D',
   'white_large_square' => '2B1C',
   'white_medium_small_square' => '25FD',
   'white_medium_square' => '25FB',
@@ -2132,6 +2215,7 @@
   'woman_construction_worker' => '1F477-200D-2640-FE0F',
   'woman_cook' => '1F469-200D-1F373',
   'woman_dancing' => '1F483',
+  'woman_deaf' => '1F9CF-200D-2640-FE0F',
   'woman_detective' => '1F575-FE0F-200D-2640-FE0F',
   'woman_elf' => '1F9DD-200D-2640-FE0F',
   'woman_factory_worker' => '1F469-200D-1F3ED',
@@ -2146,14 +2230,18 @@
   'woman_health_worker' => '1F469-200D-2695-FE0F',
   'woman_hero' => '1F9B8-200D-2640-FE0F',
   'woman_judge' => '1F469-200D-2696-FE0F',
+  'woman_kneeling' => '1F9CE-200D-2640-FE0F',
   'woman_lotus_position' => '1F9D8-200D-2640-FE0F',
   'woman_mage' => '1F9D9-200D-2640-FE0F',
   'woman_mechanic' => '1F469-200D-1F527',
+  'woman_motor_wheelchair' => '1F469-200D-1F9BC',
   'woman_office_worker' => '1F469-200D-1F4BC',
   'woman_pilot' => '1F469-200D-2708-FE0F',
   'woman_police_officer' => '1F46E-200D-2640-FE0F',
+  'woman_probing_cane' => '1F469-200D-1F9AF',
   'woman_scientist' => '1F469-200D-1F52C',
   'woman_singer' => '1F469-200D-1F3A4',
+  'woman_standing' => '1F9CD-200D-2640-FE0F',
   'woman_steamy_room' => '1F9D6-200D-2640-FE0F',
   'woman_student' => '1F469-200D-1F393',
   'woman_teacher' => '1F469-200D-1F3EB',
@@ -2162,6 +2250,7 @@
   'woman_vampire' => '1F9DB-200D-2640-FE0F',
   'woman_villain' => '1F9B9-200D-2640-FE0F',
   'woman_water_polo' => '1F93D-200D-2640-FE0F',
+  'woman_wheelchair' => '1F469-200D-1F9BD',
   'woman_zombie' => '1F9DF-200D-2640-FE0F',
   'womans_boot' => '1F462',
   'womans_clothes' => '1F45A',
@@ -2180,10 +2269,15 @@
   'x' => '274C',
   'xmas_tree' => '1F384',
   'yarn' => '1F9F6',
+  'yawn' => '1F971',
+  'yellow_circle' => '1F7E1',
   'yellow_heart' => '1F49B',
+  'yellow_square' => '1F7E8',
   'yen' => '1F4B4',
+  'yerba_mate' => '1F9C9',
   'yes' => '1F44D',
   'yin_yang' => '262F',
+  'yoyo' => '1FA80',
   'yum' => '1F60B',
   'zap' => '26A1',
   'zebra' => '1F993',