diff --git a/runtime-packer/machinetag.json b/runtime-packer/machinetag.json
index 8df5dd2..87175d1 100644
--- a/runtime-packer/machinetag.json
+++ b/runtime-packer/machinetag.json
@@ -16,7 +16,7 @@
       "expanded": "Executable Linkable Format (ELF)"
     },
     {
-      "value": "mach-o",
+      "value": "macho",
       "expanded": "Mach-object (Mach-O)"
     },
     {
@@ -26,7 +26,82 @@
   ],
   "values": [
     {
-      "predicate": "portable-executable",
+      "predicate": "dex",
+      "entry": [
+        {
+          "value": "apk-protect",
+          "expanded": "APK Protect"
+        },
+        {
+          "value": "dexguard",
+          "expanded": "DexGuard"
+        },
+        {
+          "value": "dexprotector",
+          "expanded": "DexProtector"
+        }
+      ]
+    },
+    {
+      "predicate": "elf",
+      "entry": [
+        {
+          "value": "bzexe",
+          "expanded": "BzExe"
+        },
+        {
+          "value": "ezuri",
+          "expanded": "Ezuri"
+        },
+        {
+          "value": "gzexe",
+          "expanded": "GzExe"
+        },
+        {
+          "value": "midgetpack",
+          "expanded": "MidgetPack"
+        },
+        {
+          "value": "pakkero",
+          "expanded": "Pakkero"
+        },
+        {
+          "value": "papaw",
+          "expanded": "Papaw"
+        },
+        {
+          "value": "shiva",
+          "expanded": "Shiva"
+        },
+        {
+          "value": "upx",
+          "expanded": "UPX"
+        }
+      ]
+    },
+    {
+      "predicate": "macho",
+      "entry": [
+        {
+          "value": "eleckey",
+          "expanded": "ElecKey"
+        },
+        {
+          "value": "muncho",
+          "expanded": "Muncho"
+        },
+        {
+          "value": "mpress",
+          "expanded": "MPRESS"
+        },
+        {
+          "value": "upx",
+          "expanded": "UPX"
+        }
+      ]
+    },
+    {
+      "predicate": "pe",
       "entry": [
         {
           "value": ".netshrink",
@@ -44,10 +119,6 @@
           "value": "apack",
           "expanded": "aPack"
         },
-        {
-          "value": "apk-protect",
-          "expanded": "APK Protect"
-        },
         {
           "value": "armadillo",
           "expanded": "Armadillo"
@@ -64,6 +135,10 @@
           "value": "autoit",
           "expanded": "AutoIT"
         },
+        {
+          "value": "axprotector",
+          "expanded": "AxProtector"
+        },
         {
           "value": "bero",
           "expanded": "BeRo EXE Packer"
@@ -81,17 +156,21 @@
           "expanded": "Code Virtualizer"
         },
         {
-          "value": "dexguard",
-          "expanded": "DexGuard"
-        },
-        {
-          "value": "dexprotector",
-          "expanded": "DexProtector"
+          "value": "confuserex",
+          "expanded": "ConfuserEx"
         },
         {
           "value": "dotbundle",
           "expanded": "dotBundle"
         },
+        {
+          "value": "dragon-armor",
+          "expanded": "Dragon Armor"
+        },
+        {
+          "value": "eleckey",
+          "expanded": "ElecKey"
+        },
         {
           "value": "enigma-protector",
           "expanded": "Enigma Protector"
@@ -120,10 +199,6 @@
           "value": "fsg",
           "expanded": "FSG"
         },
-        {
-          "value": "gzexe",
-          "expanded": "GzExe"
-        },
         {
           "value": "hxor-packer",
           "expanded": "hXOR Packer"
@@ -144,10 +219,6 @@
           "value": "mew",
           "expanded": "MEW"
         },
-        {
-          "value": "midgetpack",
-          "expanded": "MidgetPack"
-        },
         {
           "value": "molebox",
           "expanded": "MoleBox"
@@ -160,10 +231,6 @@
           "value": "mpress",
           "expanded": "MPRESS"
         },
-        {
-          "value": "muncho",
-          "expanded": "Muncho"
-        },
         {
           "value": "neolite",
           "expanded": "Neolite"
@@ -184,10 +251,6 @@
           "value": "packman",
           "expanded": "Packman"
         },
-        {
-          "value": "pakkero",
-          "expanded": "Pakkero"
-        },
         {
           "value": "pecompact",
           "expanded": "PECompact"
@@ -213,12 +276,12 @@
           "expanded": "PEtite"
         },
         {
-          "value": "rlpack-basic",
-          "expanded": "RLPack Basic"
+          "value": "procrypt",
+          "expanded": "ProCrypt"
         },
         {
-          "value": "shiva",
-          "expanded": "Shiva"
+          "value": "rlpack-basic",
+          "expanded": "RLPack Basic"
         },
         {
           "value": "smart-packer-pro",