diff --git a/app/mapping.js b/app/mapping.js
index 9b19ae9..fc40620 100644
--- a/app/mapping.js
+++ b/app/mapping.js
@@ -180,6 +180,11 @@ module.exports = {
       12013: 'Moria',
       12014: 'Shren',
       12015: 'Jumaline',
+      12031: 'Ellena',
+      12032: 'Kahli',
+      12033: 'Moria',
+      12034: 'Shren',
+      12035: 'Jumaline',
 
       121: 'Harpu',
       12111: 'Sisroo',
@@ -405,6 +410,11 @@ module.exports = {
       15213: 'Roid',
       15214: 'Darion',
       15215: 'Jubelle',
+      15231: 'Allen',
+      15232: "Kai'en",
+      15233: 'Roid',
+      15234: 'Darion',
+      15235: 'Jubelle',
 
       153: 'Epikion Priest',
       15311: 'Rina',
@@ -415,7 +425,7 @@ module.exports = {
 
       154: 'Magical Archer',
       15411: 'Sharron',
-      15412: 'Cassandra',
+      15412: 'Amanda',
       15413: 'Ardella',
       15414: 'Chris',
       15415: 'Bethony',
@@ -454,6 +464,11 @@ module.exports = {
       15913: 'Silia',
       15914: 'Linda',
       15915: 'Gina',
+      15931: 'Megan',
+      15932: 'Rebecca',
+      15933: 'Silia',
+      15934: 'Linda',
+      15935: 'Gina',
 
       160: 'Grim Reaper',
       16011: 'Hemos',
@@ -501,6 +516,11 @@ module.exports = {
       16513: 'Copper',
       16514: 'Silver',
       16515: 'Zinc',
+      16531: 'Nickel',
+      16532: 'Iron',
+      16533: 'Copper',
+      16534: 'Silver',
+      16535: 'Zinc',
 
       166: 'Dragon Knight',
       16611: 'Chow',
@@ -509,7 +529,7 @@ module.exports = {
       16614: 'Jager',
       16615: 'Ragdoll',
 
-      167: 'Magical Archer Promo',
+      167: 'Elite Magical Archer',
       16711: '',
       16712: '',
       16713: '',
@@ -744,7 +764,7 @@ module.exports = {
       20111: 'Emma',
       20112: 'Lisa',
       20113: 'Olivia',
-      20114: 'Illiana',
+      20114: 'Illianna',
       20115: 'Sylvia',
 
       202: 'Martial Artist',
@@ -795,6 +815,11 @@ module.exports = {
       20813: 'Crane',
       20814: 'Driller',
       20815: 'Crawler',
+      20831: 'Tractor',
+      20832: 'Bulldozer',
+      20833: 'Crane',
+      20834: 'Driller',
+      20835: 'Crawler',
 
       209: 'Elven Ranger',
       20911: 'Eluin',
@@ -941,13 +966,13 @@ module.exports = {
       23311: 'Tanzaite',
       23312: 'Kunite',
       23313: 'Malite',
-      23314: 'Pheneka',
+      23314: 'Phenaka',
       23315: 'Onyx',
       234: 'Gargoyle',
       23411: 'Tanzaite',
       23412: 'Kunite',
       23413: 'Malite',
-      23414: 'Pheneka',
+      23414: 'Phenaka',
       23415: 'Onyx',
 
       235: 'Beast Rider',
@@ -1074,7 +1099,7 @@ module.exports = {
       25415: 'ROBO-F29',
 
       256: 'Totemist',
-      25611: 'Aaaliyah',
+      25611: 'Aaliyah',
       25612: 'Nora',
       25613: 'Riley',
       25614: 'Ella',
@@ -1087,7 +1112,7 @@ module.exports = {
       25714: 'Benedict',
       25715: 'Maximilian',
 
-      258: 'Rune Hammer Blacksmith',
+      258: 'Rune Blacksmith',
       25811: 'Susan',
       25812: 'Miriam',
       25813: 'Celine',
@@ -1298,6 +1323,100 @@ module.exports = {
       29214: 'Geralt',
       29215: 'Geralt',
 
+      293: 'Ciri',
+      29311: 'Ciri',
+      29312: 'Ciri',
+      29313: 'Ciri',
+      29314: 'Ciri',
+      29315: 'Ciri',
+
+      294: 'Yennefer',
+      29411: 'Yennefer',
+      29412: 'Yennefer',
+      29413: 'Yennefer',
+      29414: 'Yennefer',
+      29415: 'Yennefer',
+
+      295: 'Triss',
+      29511: 'Triss',
+      29512: 'Triss',
+      29513: 'Triss',
+      29514: 'Triss',
+      29515: 'Triss',
+
+      296: 'Magic Order Guardian',
+      29601: 'Anders',
+      29602: 'Magnus',
+      29603: 'Henrik',
+      29604: 'Lars',
+      29605: 'Valdemar',
+
+      297: 'Magic Order Swordsinger',
+      29701: 'Rigna',
+      29702: 'Reyka',
+      29703: 'Tirsa',
+      29704: 'Birgitta',
+      29705: 'Fiona',
+
+      298: 'Magic Order Enchantress',
+      29801: 'Johanna',
+      29802: 'Tarnisha',
+      29803: 'Hexarina',
+      29804: 'Arcana',
+      29805: 'Hilda',
+
+      299: 'Magic Order Elementalist',
+      29901: 'Lumina',
+      29902: 'Enshia',
+      29903: 'Nobella',
+      29904: 'Groa',
+      29905: 'Celestara',
+
+      300: 'Hacker',
+      30001: 'K1D',
+      30002: '7R1X',
+      30003: '570RM',
+      30004: '51LV3R',
+      30005: 'N1X',
+
+      301: 'Cyborg',
+      30101: 'Lorenza',
+      30102: 'Carmella',
+      30103: 'Eliza',
+      30104: 'Alesia',
+      30105: 'Roberta',
+
+      302: 'Ryomen Sukuna',
+      30215: 'Ryomen Sukuna',
+
+      303: 'Satoru Gojo',
+      30311: 'Satoru Gojo',
+      30312: 'Satoru Gojo',
+      30313: 'Satoru Gojo',
+      30314: 'Satoru Gojo',
+      30315: 'Satoru Gojo',
+
+      304: 'Yuji Itadori',
+      30411: 'Yuji Itadori',
+      30412: 'Yuji Itadori',
+      30413: 'Yuji Itadori',
+      30414: 'Yuji Itadori',
+      30415: 'Yuji Itadori',
+
+      305: 'Megumi Fushiguro',
+      30511: 'Megumi Fushiguro',
+      30512: 'Megumi Fushiguro',
+      30513: 'Megumi Fushiguro',
+      30514: 'Megumi Fushiguro',
+      30515: 'Megumi Fushiguro',
+
+      306: 'Nobara Kugisaki',
+      30611: 'Nobara Kugisaki',
+      30612: 'Nobara Kugisaki',
+      30613: 'Nobara Kugisaki',
+      30614: 'Nobara Kugisaki',
+      30615: 'Nobara Kugisaki',
+
       15105: 'Devilmon',
       14314: 'Rainbowmon',