From cfb5e294ca819aea3e9c4ce5c07be9c77a75349f Mon Sep 17 00:00:00 2001
From: Enivex <kristoffer.varholm@gmail.com>
Date: Sat, 31 May 2025 18:54:48 -0400
Subject: [PATCH 1/6] Change some of the more incorrectly (?) named emojis

---
 src/modules/emoji.txt | 57 +++++++++++++++++++++----------------------
 1 file changed, 28 insertions(+), 29 deletions(-)

diff --git a/src/modules/emoji.txt b/src/modules/emoji.txt
index 06df4ef..de49548 100644
--- a/src/modules/emoji.txt
+++ b/src/modules/emoji.txt
@@ -3,7 +3,7 @@ abc 🔤
 abcd 🔡
 ABCD 🔠
 accordion 🪗
-aesculapius ⚕
+asclepius ⚕
 airplane ✈
   .landing 🛬
   .small 🛩
@@ -49,7 +49,7 @@ ast *
   .box ✳
 atm 🏧
 atom ⚛
-aubergine 🍆
+eggplant 🍆
 avocado 🥑
 axe 🪓
 baby 👶
@@ -72,7 +72,7 @@ banjo 🪕
 bank 🏦
 barberpole 💈
 baseball ⚾
-basecap 🧢
+cap 🧢
 basket 🧺
 basketball ⛹
   .ball 🏀
@@ -95,7 +95,7 @@ beer 🍺
   .clink 🍻
 beet 🫜
 beetle 🪲
-  .lady 🐞
+ladybug 🐞
 bell 🔔
   .ding 🛎
   .not 🔕
@@ -106,7 +106,7 @@ bike 🚲
   .not 🚳
 bikini 👙
 billiards 🎱
-bin 🗑
+wastebasket 🗑
 biohazard ☣
 bird 🐦
 bison 🦬
@@ -195,7 +195,7 @@ calendar 📅
   .spiral 🗓
   .tearoff 📆
 camel 🐫
-  .dromedar 🐪
+  .dromedary 🐪
 camera 📷
   .flash 📸
   .movie 🎥
@@ -217,10 +217,10 @@ car 🚗
 card
   .credit 💳
   .id 🪪
-cardindex 📇
+rolodex 📇
 carrot 🥕
 cart 🛒
-cassette 📼
+vhs 📼
 castle
   .eu 🏰
   .jp 🏯
@@ -284,9 +284,9 @@ city 🏙
 clamp 🗜
 clapperboard 🎬
 climbing 🧗
-clip 📎
+paperclip 📎
+  .linked 🖇
 clipboard 📋
-clips 🖇
 clock
   .one 🕐
   .one.thirty 🕜
@@ -363,7 +363,7 @@ crossmark ❌
   .box ❎
 crown 👑
 crutch 🩼
-crystal 🔮
+crystalball 🔮
 cucumber 🥒
 cup
   .straw 🥤
@@ -372,7 +372,7 @@ curling 🥌
 curry 🍛
 custard 🍮
 customs 🛃
-cutlery 🍴
+silverware 🍴
 cyclone 🌀
 dancing
   .man 🕺
@@ -392,8 +392,8 @@ diamond
   .dot 💠
 die 🎲
 dino
-  .pod 🦕
-  .rex 🦖
+  .sauropod 🦕
+  .trex 🦖
 disc
   .cd 💿
   .dvd 📀
@@ -562,8 +562,7 @@ falafel 🧆
 family 👪
 fax 📠
 feather 🪶
-feeding
-  .breast 🤱
+breastfeeding 🤱
 fencing 🤺
 ferriswheel 🎡
 filebox 🗃
@@ -633,7 +632,7 @@ fries 🍟
 frisbee 🥏
 frog
   .face 🐸
-fuelpump ⛽
+gaspump ⛽
 garlic 🧄
 gear ⚙
 gem 💎
@@ -730,7 +729,7 @@ heart ❤
   .yellow 💛
 hedgehog 🦔
 helicopter 🚁
-helix 🧬
+dna 🧬
 helmet
   .cross ⛑
   .military 🪖
@@ -940,7 +939,7 @@ mouse 🐁
 mousetrap 🪤
 mouth 👄
   .bite 🫦
-moyai 🗿
+moai 🗿
 museum 🏛
 mushroom 🍄
 musicalscore 🎼
@@ -995,7 +994,7 @@ parachute 🪂
 park 🏞
 parking 🅿
 parrot 🦜
-partalteration 〽
+partalternation 〽
 party 🎉
 peach 🍑
 peacock 🦚
@@ -1060,7 +1059,7 @@ planet 🪐
 plant 🪴
 plaster 🩹
 plate
-  .cutlery 🍽
+  .silverware 🍽
 playback
   .down ⏬
   .eject ⏏
@@ -1110,14 +1109,13 @@ rabbit 🐇
 raccoon 🦝
 radio 📻
 radioactive ☢
-railway 🛤
+railroad 🛤
 rainbow 🌈
 ram 🐏
 rat 🐀
 razor 🪒
 receipt 🧾
 recycling ♻
-reg ®
 restroom 🚻
 rhino 🦏
 ribbon 🎀
@@ -1127,7 +1125,7 @@ rice 🍚
   .ear 🌾
   .onigiri 🍙
 ring 💍
-ringbuoy 🛟
+lifebuoy 🛟
 robot 🤖
 rock 🪨
 rocket 🚀
@@ -1146,8 +1144,8 @@ sandwich 🥪
 santa
   .man 🎅
   .woman 🤶
-satdish 📡
 satellite 🛰
+  .dish 📡
 saw 🪚
 saxophone 🎷
 scales ⚖
@@ -1184,7 +1182,7 @@ shoe 👞
   .ski 🎿
   .sneaker 👟
   .tall 👢
-  .thong 🩴
+  .flipflop 🩴
 shopping 🛍
 shorts 🩳
 shoshinsha 🔰
@@ -1317,7 +1315,8 @@ ticket
   .travel 🎫
 tiger 🐅
   .face 🐯
-tm ™
+trademark ™
+  .registered ®
 toilet 🚽
 toiletpaper 🧻
 tomato 🍅
@@ -1350,8 +1349,9 @@ train 🚆
 transgender ⚧
 tray
   .inbox 📥
-  .mail 📨
   .outbox 📤
+envelope ✉️
+  .incoming 📨
 tree
   .deciduous 🌳
   .evergreen 🌲
@@ -1382,7 +1382,6 @@ umbrella
   .rain ☔
   .sun ⛱
 unicorn 🦄
-unknown 🦳
 up 🆙
 urn ⚱
 vampire 🧛

From 33c576972490a60dac232147d9d6aa567741d5c9 Mon Sep 17 00:00:00 2001
From: Enivex <kristoffer.varholm@gmail.com>
Date: Sun, 1 Jun 2025 13:06:58 -0400
Subject: [PATCH 2/6] Change camel.dromedary to dromedary

Co-authored-by: Malo <57839069+MDLC01@users.noreply.github.com>
---
 src/modules/emoji.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/emoji.txt b/src/modules/emoji.txt
index de49548..b255e95 100644
--- a/src/modules/emoji.txt
+++ b/src/modules/emoji.txt
@@ -195,7 +195,7 @@ calendar 📅
   .spiral 🗓
   .tearoff 📆
 camel 🐫
-  .dromedary 🐪
+dromedary 🐪
 camera 📷
   .flash 📸
   .movie 🎥

From 11fd93851bb423303ad3fdb7e639e6826a8b5625 Mon Sep 17 00:00:00 2001
From: Enivex <kristoffer.varholm@gmail.com>
Date: Sun, 1 Jun 2025 13:07:26 -0400
Subject: [PATCH 3/6] Make sauropod and trex standalone

Co-authored-by: Malo <57839069+MDLC01@users.noreply.github.com>
---
 src/modules/emoji.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/modules/emoji.txt b/src/modules/emoji.txt
index b255e95..e130644 100644
--- a/src/modules/emoji.txt
+++ b/src/modules/emoji.txt
@@ -392,8 +392,8 @@ diamond
   .dot 💠
 die 🎲
 dino
-  .sauropod 🦕
-  .trex 🦖
+sauropod 🦕
+trex 🦖
 disc
   .cd 💿
   .dvd 📀

From 38f2860b7e9cc6c44d01ca358e5efd1d1c71ad05 Mon Sep 17 00:00:00 2001
From: Enivex <kristoffer.varholm@gmail.com>
Date: Sun, 1 Jun 2025 13:14:42 -0400
Subject: [PATCH 4/6] Rename plate.silverware to just plate

Co-authored-by: Malo <57839069+MDLC01@users.noreply.github.com>
---
 src/modules/emoji.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/emoji.txt b/src/modules/emoji.txt
index e130644..a15de81 100644
--- a/src/modules/emoji.txt
+++ b/src/modules/emoji.txt
@@ -1059,7 +1059,7 @@ planet 🪐
 plant 🪴
 plaster 🩹
 plate
-  .silverware 🍽
+plate 🍽
 playback
   .down ⏬
   .eject ⏏

From 23fc1f776294acf4743eb96c4888a212e43bd43d Mon Sep 17 00:00:00 2001
From: Enivex <kristoffer.varholm@gmail.com>
Date: Sun, 1 Jun 2025 13:19:11 -0400
Subject: [PATCH 5/6] Remove duplicate lines caused by commits from github

---
 src/modules/emoji.txt | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/modules/emoji.txt b/src/modules/emoji.txt
index a15de81..e85a01c 100644
--- a/src/modules/emoji.txt
+++ b/src/modules/emoji.txt
@@ -391,7 +391,6 @@ diamond
   .orange.small 🔸
   .dot 💠
 die 🎲
-dino
 sauropod 🦕
 trex 🦖
 disc
@@ -1058,7 +1057,6 @@ placard 🪧
 planet 🪐
 plant 🪴
 plaster 🩹
-plate
 plate 🍽
 playback
   .down ⏬

From 540f71fe0544d7335bf81f38d10ae4f0da60bc5b Mon Sep 17 00:00:00 2001
From: Enivex <kristoffer.varholm@gmail.com>
Date: Sun, 1 Jun 2025 13:20:13 -0400
Subject: [PATCH 6/6] Rename satellite.dish to antenna

---
 src/modules/emoji.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/emoji.txt b/src/modules/emoji.txt
index e85a01c..fc11815 100644
--- a/src/modules/emoji.txt
+++ b/src/modules/emoji.txt
@@ -1143,7 +1143,7 @@ santa
   .man 🎅
   .woman 🤶
 satellite 🛰
-  .dish 📡
+antenna 📡
 saw 🪚
 saxophone 🎷
 scales ⚖