diff --git a/pyproject.toml b/pyproject.toml
index dee86a4b..41180cf2 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -2,7 +2,7 @@
 
 [tool.poetry]
     name = "royalpack"
-    version = "5.1.7"
+    version = "5.1.8"
     description = "A Royalnet command pack for the Royal Games community"
     authors = ["Stefano Pigozzi <ste.pigozzi@gmail.com>"]
     license = "AGPL-3.0+"
diff --git a/royalpack/commands/emojify.py b/royalpack/commands/emojify.py
index 8b1b66da..5aa9a2d6 100644
--- a/royalpack/commands/emojify.py
+++ b/royalpack/commands/emojify.py
@@ -9,11 +9,13 @@ class EmojifyCommand(Command):
 
     syntax = "{messaggio}"
 
+    # noinspection InvisibleCharacter
     _emojis = {
         "abcd": ["🔡", "🔠"],
         "back": ["🔙"],
         "cool": ["🆒"],
         "free": ["🆓"],
+        "1234": ["🔢"],
         "abc": ["🔤"],
         "atm": ["🏧"],
         "new": ["🆕"],
@@ -21,6 +23,8 @@ class EmojifyCommand(Command):
         "top": ["🔝"],
         "zzz": ["💤"],
         "end": ["🔚"],
+        "777": ["🎰"],
+        "100": ["💯"],
         "ab": ["🆎"],
         "cl": ["🆑"],
         "id": ["🆔"],
@@ -32,6 +36,12 @@ class EmojifyCommand(Command):
         "tm": ["™️"],
         "wc": ["🚾"],
         "up": ["🆙"],
+        "!!": ["‼️"],
+        "!?": ["⁉️"],
+        "69": ["♋️"],
+        "24": ["🏪"],
+        "18": ["🔞"],
+        "10": ["🙌", "🔟", "🤲"],
         "a": ["🅰️"],
         "b": ["🅱️"],
         "c": ["☪️", "©", "🥐"],
@@ -58,37 +68,22 @@ class EmojifyCommand(Command):
         "x": ["🙅‍♀", "🙅‍♂", "❌", "❎"],
         "y": ["💴"],
         "z": ["⚡️"],
-        
         "*": ["*️⃣"],
-        "!!": ["‼️"],
-        "!?": ["⁉️"],
         "!": ["❗️", "❕", "⚠️"],
         "?": ["❓", "❔"],
-        
-        "1234":["🔢"],
-        "777":["🎰"],
-        "100":["💯"],
-        "69":["♋️"],
-        "24":["🏪"],
-        "18":["🔞"],
-        "10":["🙌", "🔟", "🤲"],
-        "9":["9️⃣"],
-        "8":["🎱", "8️⃣"],
-        "7":["7️⃣"],
-        "6":["6️⃣"],
-        "5":["✋", "🤚","👋", "5️⃣"],
-        "4":["4️⃣"],
-        "3":["🥉", "3️⃣"],
-        "2":["✌️", "🤘", "🥈", "2️⃣"],
-        "1":["👆", "☝️", "🖕", "🥇", "1️⃣"],
-        "0":["⭕️", "🅾️", "📯", "🌝", "🌚", "🌕", "🥯", "🙆‍♀", "🙆‍♂", "0️⃣"],
-        
-        "!":["❗️", "❕", "⚠️"],
-        "?":["❓", "❔"],
-        "+":["🏥"],
-        "/":["🏒", "🧪", "🧹"],
-        "\":["🍢", "🍡", "🥄", "🌂"],
-        "*":["✳️", "✴️"],
+        "9": ["9️⃣"],
+        "8": ["🎱", "8️⃣"],
+        "7": ["7️⃣"],
+        "6": ["6️⃣"],
+        "5": ["✋", "🤚", "👋", "5️⃣"],
+        "4": ["4️⃣"],
+        "3": ["🥉", "3️⃣"],
+        "2": ["✌️", "🤘", "🥈", "2️⃣"],
+        "1": ["👆", "☝️", "🖕", "🥇", "1️⃣"],
+        "0": ["⭕️", "🅾️", "📯", "🌝", "🌚", "🌕", "🥯", "🙆‍♀", "🙆‍♂", "0️⃣"],
+        "+": ["🏥"],
+        "/": ["🏒", "🧪", "🧹"],
+        "\\": ["🍢", "🍡", "🥄", "🌂"],
     }
 
     @classmethod
diff --git a/royalpack/version.py b/royalpack/version.py
index 888cd312..db3b65c6 100644
--- a/royalpack/version.py
+++ b/royalpack/version.py
@@ -1 +1 @@
-semantic = "5.1.7"
+semantic = "5.1.8"