diff --git a/EMOJIS.md b/EMOJIS.md
index bf21e25a..81d3d134 100644
--- a/EMOJIS.md
+++ b/EMOJIS.md
@@ -238,7 +238,7 @@ Here is a table of the available emojis and their aliases.
 | 💨 | dash | 👂 | ear |
 | 👀 | eyes | 👃 | nose |
 | 👅 | tongue | 👄 | lips |
-| 👍 | +1, thumbsup | 👎 | -1, thumbsdown |
+| 👍 | +1, like, thumbsup | 👎 | -1, thumbsdown |
 | 👌 | ok_hand | 👊 | facepunch, punch |
 | 👋 | wave | 👐 | open_hands |
 | 👆 | point_up_2 | 👇 | point_down |
@@ -336,7 +336,7 @@ Here is a table of the available emojis and their aliases.
 | 🎒 | school_satchel | 🎓 | mortar_board |
 | 🎏 | flags | 🎆 | fireworks |
 | 🎇 | sparkler | 🎐 | wind_chime |
-| 🎑 | rice_scene | 🎃 | jack_o_lantern |
+| 🎑 | rice_scene | 🎃 | jack_o_lantern, pumpkin |
 | 👻 | ghost | 🎅 | santa |
 | 🎄 | christmas_tree | 🎁 | gift |
 | 🎋 | tanabata_tree | 🎉 | tada |
@@ -455,7 +455,7 @@ Here is a table of the available emojis and their aliases.
 | 🗽 | statue_of_liberty | 🌉 | bridge_at_night |
 | 🎠 | carousel_horse | 🎡 | ferris_wheel |
 | 🎢 | roller_coaster | 🚢 | ship |
-| 🚤 | speedboat | 🚣 | rowboat |
+| 🚤 | speedboat | 🚣 | rowboat, person_rowing_boat |
 | 🚀 | rocket | 💺 | seat |
 | 🚁 | helicopter | 🚂 | steam_locomotive |
 | 🚊 | tram | 🚉 | station |
@@ -674,136 +674,4 @@ Here is a table of the available emojis and their aliases.
 | 🧔 | beard, bearded_man, bearded_person, man_with_beard, person_with_beard | 🧓 | older_person, gender_neutral_older_person, older_adult, gender_neutral_older_adult |
 | 🧕 | person_with_headscarf, woman_with_headscarf, hijab | 🤱 | breastfeeding |
 | 🧙 | mage, gender_neutral_mage | 🧚 | fairy, gender_neutral_fairy |
-| 🧛 | vampire, gender_neutral_vampire | 🧜 | merperson, gender_neutral_merperson |
-| 🧝 | elf, gender_neutral_elf | 🧞 | genie, gender_neutral_genie, djinni, jinni |
-| 🧟 | zombie, gender_neutral_zombie | 🧖 | person_in_steamy_room, sauna |
-| 🧗 | person_climbing, climber, rock_climbing | 🧘 | person_in_lotus_position, yoga, meditation |
-| 🦓 | zebra_face, zebra | 🦒 | giraffe_face, giraffe |
-| 🦔 | hedgehog | 🦕 | sauropod, brontosaurus, diplodocus, dinosaur |
-| 🦖 | trex, t_rex, tyrannosaurus_rex | 🦗 | cricket |
-| 🥥 | coconut, cocoanut | 🥦 | broccoli |
-| 🥨 | pretzel | 🥩 | cut_of_meat, meat, steak |
-| 🥪 | sandwich | 🥣 | bowl_with_spoon, cereal_bowl |
-| 🥫 | canned_food, tin_can, can_of_food, tinned_food | 🥟 | dumpling, jiaozi, gyoza, pierogi, empanada, xiaolongbao |
-| 🥠 | fortune_cookie | 🥡 | takeout_box, chinese_food_box, oyster_pail |
-| 🥧 | pie | 🥤 | cup_with_straw, milkshake, smoothie, soda_pop, soft_drink, to_go_cup |
-| 🥢 | chopsticks | 🛸 | flying_saucer, ufo, unidentified_flying_object |
-| 🛷 | sled | 🥌 | curling_stone |
-| 🧣 | scarf | 🧤 | gloves |
-| 🧥 | coat | 🧦 | socks |
-| 🧢 | billed_cap, baseball_cap, billed_hat | 🥰 | smiling_face_with_hearts, in_love_face, smiling_face_with_smiling_eyes_and_three_hearts |
-| 🥵 | hot_face, overheated_face | 🥶 | cold_face, freezing_face |
-| 🥴 | woozy_face, drunk_face, face_with_uneven_eyes_and_wavy_mouth | 🥳 | partying_face, party_face, face_with_party_horn_and_party_hat |
-| 🥺 | pleading_face, face_with_pleading_eyes | 🦵 | leg |
-| 🦶 | foot | 🦷 | tooth |
-| 🦴 | bone | 🦸 | superhero |
-| 🦹 | supervillain | 🦝 | raccoon |
-| 🦙 | llama, alpaca | 🦛 | hippo, hippopotamus |
-| 🦘 | roo, kangaroo | 🦡 | badger |
-| 🦢 | swan | 🦚 | peacock |
-| 🦜 | parrot | 🦟 | mosquito |
-| 🦠 | microbe | 🥭 | mango |
-| 🥬 | leafy_green, bok_choy, chinese_cabbage, cos_lettuce, romaine_lettuce, leafy_greens | 🥯 | bagel |
-| 🧂 | salt_shaker, salt | 🥮 | moon_cake, mooncake |
-| 🦞 | lobster | 🧁 | cupcake, fairy_cake |
-| 🧭 | compass | 🧱 | brick, bricks |
-| 🛹 | skateboard | 🧳 | lugagge, suitcase |
-| 🧨 | firecracker, dynamite | 🧧 | red_envelope, red_gift_envelope, ang_pao, hongbao, lai_see, red_packet |
-| 🥎 | softball | 🥏 | flying_disc |
-| 🥍 | lacrosse, lacrosse_stick_and_ball | 🧿 | nazar_amulet, evil_eye_talisman, nazar_boncugu |
-| 🧩 | jigsaw, puzzle_piece, jigsaw_puzzle_piece | 🧸 | teddy_bear |
-| ♟️ | black_chess_pawn, chess_pawn | 🧵 | spool_of_thread, thread |
-| 🧶 | ball_of_yarn, yarn | 🥽 | goggles |
-| 🥼 | lab_coat | 🥾 | hiking_boot |
-| 🥿 | flat_shoe | 🧮 | abacus |
-| 🧾 | receipt | 🧰 | toolbox |
-| 🧲 | magnet | 🧪 | test_tube |
-| 🧫 | petri_dish | 🧬 | dna, dna_double_helix |
-| 🧴 | lotion_bottle | 🧷 | safety_pin |
-| 🧹 | broom | 🧺 | basket |
-| 🧻 | roll_of_paper, toilet_paper | 🧼 | bar_of_soap, soap |
-| 🧽 | sponge | 🧯 | fire_extinguisher |
-| ♾️ | infinity, permanent_paper_sign | ☺ | relaxed |
-| ✨ | sparkles | ✊ | fist |
-| ✌ | v | ✋ | hand, raised_hand |
-| ☝ | point_up | ❤ | heart |
-| ⭐ | star | ☀ | sunny |
-| ⛅ | partly_sunny | ☁ | cloud |
-| ⚡ | zap | ☔ | umbrella |
-| ❄ | snowflake | ⛄ | snowman |
-| ☎ | phone, telephone | ⏳ | hourglass_flowing_sand |
-| ⌛ | hourglass | ⏰ | alarm_clock |
-| ⌚ | watch | ✉ | email, envelope |
-| ✂ | scissors | ✒ | black_nib |
-| ✏ | pencil2 | ⚽ | soccer |
-| ⚾ | baseball | ⛳ | golf |
-| ☕ | coffee | ⛪ | church |
-| ⛺ | tent | ⛲ | fountain |
-| ⛵ | boat, sailboat | ⚓ | anchor |
-| ✈ | airplane | ⚠ | warning |
-| ⛽ | fuelpump | ♨ | hotsprings |
-| ⬆ | arrow_up | ⬇ | arrow_down |
-| ⬅ | arrow_left | ➡ | arrow_right |
-| ↗ | arrow_upper_right | ↖ | arrow_upper_left |
-| ↘ | arrow_lower_right | ↙ | arrow_lower_left |
-| ↔ | left_right_arrow | ↕ | arrow_up_down |
-| ◀ | arrow_backward | ▶ | arrow_forward |
-| ↩ | leftwards_arrow_with_hook | ↪ | arrow_right_hook |
-| ℹ | information_source | ⏪ | rewind |
-| ⏩ | fast_forward | ⏫ | arrow_double_up |
-| ⏬ | arrow_double_down | ⤵ | arrow_heading_down |
-| ⤴ | arrow_heading_up | ♿ | wheelchair |
-| Ⓜ | m | ㊙ | secret |
-| ㊗ | congratulations | ⛔ | no_entry |
-| ✳ | eight_spoked_asterisk | ❇ | sparkle |
-| ❎ | negative_squared_cross_mark | ✅ | white_check_mark |
-| ✴ | eight_pointed_black_star | ➿ | loop |
-| ♻ | recycle | ♈ | aries |
-| ♉ | taurus | ♊ | gemini |
-| ♋ | cancer | ♌ | leo |
-| ♍ | virgo | ♎ | libra |
-| ♏ | scorpius | ♐ | sagittarius |
-| ♑ | capricorn | ♒ | aquarius |
-| ♓ | pisces | ⛎ | ophiuchus |
-| © | copyright | ® | registered |
-| ™ | tm | ❌ | x |
-| ‼ | bangbang | ⁉ | interrobang |
-| ❗ | exclamation, heavy_exclamation_mark | ❓ | question |
-| ❕ | grey_exclamation | ❔ | grey_question |
-| ⭕ | o | ✖ | heavy_multiplication_x |
-| ➕ | heavy_plus_sign | ➖ | heavy_minus_sign |
-| ➗ | heavy_division_sign | ♠ | spades |
-| ♥ | hearts | ♣ | clubs |
-| ♦ | diamonds | ✔ | heavy_check_mark |
-| ☑ | ballot_box_with_check | ➰ | curly_loop |
-| 〰 | wavy_dash | 〽 | part_alternation_mark |
-| ◼ | black_medium_square | ◻ | white_medium_square |
-| ◾ | black_medium_small_square | ◽ | white_medium_small_square |
-| ▪ | black_small_square | ▫ | white_small_square |
-| ⚫ | black_circle | ⚪ | white_circle |
-| ⬜ | white_large_square | ⬛ | black_large_square |
-| ☹ | frowning_face | ⛑ | helmet_white_cross |
-| ✍ | writing, writing_hand | ❣ | exclamation_heart |
-| ☠ | skull_crossbones | ☘ | shamrock, st_patrick |
-| ⛰ | mountain | ⛴ | ferry |
-| ⏱ | stopwatch | ⏲ | timer_clock |
-| ⛈ | thunder_cloud_rain | ☂ | open_umbrella |
-| ⛱ | planted_umbrella, umbrella_on_ground | ☃ | snowman_with_snow, snowing_snowman |
-| ☄ | comet, light_beam, blue_beam | ⛸ | ice_skate, ice_skating |
-| ⛷ | skier | ⛹ | person_with_ball |
-| ⏭ | black_right_pointing_double_triangle_with_vertical_bar | ⏯ | black_right_pointing_triangle_with_double_vertical_bar |
-| ⏮ | black_left_pointing_double_triangle_with_vertical_bar | ⏸ | double_vertical_bar |
-| ⏹ | black_square_for_stop | ⏺ | black_circle_for_record |
-| ⌨ | keyboard | ⛏ | pick |
-| ⚒ | hammer_and_pick | ⚙ | gear |
-| ⚗ | alembic | ⚖ | scales, scales_of_justice |
-| ⛓ | chains | ⚔ | crossed_swords |
-| ⚰ | coffin, funeral, casket | ⚱ | funeral_urn |
-| ⚜ | fleur_de_lis, scouts | ⚛ | atom, atom_symbol |
-| ✡ | star_of_david | ☸ | wheel_of_dharma |
-| ☯ | yin_yang | ✝ | latin_cross, christian_cross |
-| ☦ | orthodox_cross | ⛩ | shinto_shrine, kami_no_michi |
-| ☪ | star_and_crescent, star_crescent | ☮ | peace_symbol, peace_sign |
-| ☢ | radioactive, radioactive_symbol, radioactive_sign | ☣ | biohazard, biohazard_symbol, biohazard_sign |
-| ⚕ | medical_symbol, staff_of_aesculapius |
-
+| 🧛 | vampire, gender_neut
\ No newline at end of file
diff --git a/emoji-table-generator/README.md b/emoji-table-generator/README.md
index 4eee8aec..c6792104 100644
--- a/emoji-table-generator/README.md
+++ b/emoji-table-generator/README.md
@@ -2,11 +2,11 @@
 
 This is just a "quick'n'dirty" project to generate a markdown table with all the emojis.
 
-It is used for the table in the top level README :)
+It is used to generate the top file EMOJIS.md :)
 
 
 Run with:
 
 ```
-mvn exec:java -Dexec.mainClass="com.vdurmont.emoji.TableGenerator"
+mvn compile exec:java -Dexec.mainClass="com.vdurmont.emoji.TableGenerator" -Dexec.args=<path_to_EMOJIS.md>
 ```
\ No newline at end of file
diff --git a/emoji-table-generator/pom.xml b/emoji-table-generator/pom.xml
index 1365913e..440b7c1b 100644
--- a/emoji-table-generator/pom.xml
+++ b/emoji-table-generator/pom.xml
@@ -12,6 +12,8 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
     </properties>
 
     <dependencies>
@@ -20,5 +22,10 @@
             <artifactId>emoji-java</artifactId>
             <version>5.1.1</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <version>3.8.1</version>
+        </dependency>
     </dependencies>
 </project>
diff --git a/emoji-table-generator/src/main/java/com/vdurmont/emoji/TableGenerator.java b/emoji-table-generator/src/main/java/com/vdurmont/emoji/TableGenerator.java
index 6ee53e15..f35a5586 100644
--- a/emoji-table-generator/src/main/java/com/vdurmont/emoji/TableGenerator.java
+++ b/emoji-table-generator/src/main/java/com/vdurmont/emoji/TableGenerator.java
@@ -7,12 +7,15 @@
  * This app generate the emoji table in the README ;)
  * <p/>
  * Run with:
- * mvn exec:java -Dexec.mainClass="com.vdurmont.emoji.TableGenerator"
+ * mvn compile exec:java -Dexec.mainClass="com.vdurmont.emoji.TableGenerator" -Dexec.args=<path_to_EMOJIS.md>
  */
 public class TableGenerator {
   public static void main(String[] args) throws IOException {
     StringBuilder sb = new StringBuilder();
 
+    sb.append("## Available Emojis\n\n");
+    sb.append("Here is a table of the available emojis and their aliases.\n\n");
+
     // Table header
     sb.append("| Emoji | Aliases | Emoji | Aliases |\n");
     sb.append("| :---: | ------- | :---: | ------- |\n");
diff --git a/pom.xml b/pom.xml
index ee1ae63f..41023b39 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,6 +35,8 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
     </properties>
 
     <dependencies>
diff --git a/src/main/resources/emojis.json b/src/main/resources/emojis.json
index b0614812..2acb791a 100644
--- a/src/main/resources/emojis.json
+++ b/src/main/resources/emojis.json
@@ -9105,7 +9105,8 @@
     "description": "rowboat",
     "supports_fitzpatrick": true,
     "aliases": [
-      "rowboat"
+      "rowboat",
+      "person_rowing_boat"
     ],
     "tags": []
   },
@@ -15965,6 +15966,24 @@
     ],
     "tags": []
   },
+  {
+    "emojiChar": "🪜",
+    "emoji": "\uD83E\uDE9C",
+    "description": "ladder",
+    "aliases": [
+      "ladder"
+    ],
+    "tags": []
+  },
+  {
+    "emojiChar": "🪶",
+    "emoji": "\uD83E\uDEB6",
+    "description": "feather",
+    "aliases": [
+      "feather"
+    ],
+    "tags": []
+  },
   {
     "emojiChar": "🛸",
     "emoji": "\uD83D\uDEF8",