diff --git a/common/descriptor.cpp b/common/descriptor.cpp
index afa8ee9..d6d594c 100644
--- a/common/descriptor.cpp
+++ b/common/descriptor.cpp
@@ -45,11 +45,15 @@ UString jedecIdToUString(UINT8 vendorId, UINT8 deviceId0, UINT8 deviceId1)
     UINT32 jedecId = (UINT32)deviceId1 + ((UINT32)deviceId0 << 8) + ((UINT32)vendorId << 16);
     switch (jedecId) {
     // Winbond
+    case 0xEF3010: return UString("Winbond W25X05");
+    case 0xEF3011: return UString("Winbond W25X10");
+    case 0xEF3012: return UString("Winbond W25X20");
     case 0xEF3013: return UString("Winbond W25X40");
     case 0xEF3014: return UString("Winbond W25X80");
     case 0xEF3015: return UString("Winbond W25X16");
     case 0xEF3016: return UString("Winbond W25X32");
     case 0xEF3017: return UString("Winbond W25X64");
+    case 0xEF4012: return UString("Winbond W25Q20");
     case 0xEF4013: return UString("Winbond W25Q40");
     case 0xEF4014: return UString("Winbond W25Q80");
     case 0xEF4015: return UString("Winbond W25Q16");
@@ -65,27 +69,32 @@ UString jedecIdToUString(UINT8 vendorId, UINT8 deviceId0, UINT8 deviceId1)
     case 0xEF6016: return UString("Winbond W25Q32");
     case 0xEF6017: return UString("Winbond W25Q64");
     case 0xEF6018: return UString("Winbond W25Q128");
+    case 0xEF6019: return UString("Winbond W25Q256");
+    case 0xEF7118: return UString("Winbond W25M256");
+    case 0xEF7119: return UString("Winbond W25M512");
 
     // Macronix
     case 0xC22013: return UString("Macronix MX25L40");
     case 0xC22014: return UString("Macronix MX25L80");
-    case 0xC22015: 
-    case 0xC22415:
-    case 0xC22515: return UString("Macronix MX25L16");
-    case 0xC22016:
-    case 0xC22535: return UString("Macronix MX25U16");
+    case 0xC22015: return UString("Macronix MX25L16");
+    case 0xC22016: return UString("Macronix MX25U16");
+    case 0xC22017: return UString("Macronix MX25L64");
+    case 0xC22018: return UString("Macronix MX25L128");
+    case 0xC22019: return UString("Macronix MX25L256");
     case 0xC2201A: return UString("Macronix MX66L512");
+    case 0xC22415: return UString("Macronix MX25L16");
+    case 0xC22515: return UString("Macronix MX25L16");
+    case 0xC22534: return UString("Macronix MX25U80");
+    case 0xC22535: return UString("Macronix MX25U16");
     case 0xC22536: return UString("Macronix MX25U32");
     case 0xC22537: return UString("Macronix MX25U64");
     case 0xC22538: return UString("Macronix MX25U128");
     case 0xC22539: return UString("Macronix MX25U256");
-    case 0xC25E16: return UString("Macronix MX25L32");
-    case 0xC22017: 
-    case 0xC29517:
+    case 0xC2253A: return UString("Macronix MX25U512");
     case 0xC22617: return UString("Macronix MX25L64");
-    case 0xC22018:
     case 0xC22618: return UString("Macronix MX25L128");
-    case 0xC22019: return UString("Macronix MX25L256");
+    case 0xC25E16: return UString("Macronix MX25L32");
+    case 0xC29517: return UString("Macronix MX25L64");
     
     // Micron
     case 0x202014: return UString("Micron M25P80");
@@ -129,7 +138,7 @@ UString jedecIdToUString(UINT8 vendorId, UINT8 deviceId0, UINT8 deviceId1)
     case 0x898916: return UString("Intel 25F320S33T8");
     case 0x898917: return UString("Intel 25F640S33T8");
 
-    // Atmel
+    // Atmel / Adesto
     case 0x1F3217: return UString("Atmel AT25SF641");
     case 0x1F4216: return UString("Atmel AT25SL321");
     case 0x1F4218: return UString("Atmel AT25SL128A");
@@ -140,10 +149,11 @@ UString jedecIdToUString(UINT8 vendorId, UINT8 deviceId0, UINT8 deviceId1)
     case 0x1F4600: return UString("Atmel AT26DF161");
     case 0x1F4601: return UString("Atmel AT26DF161A");
     case 0x1F4602: return UString("Atmel AT25DF161");
-    case 0x1F8600: return UString("Atmel AT25DQ161");
     case 0x1F4700: return UString("Atmel AT25DF321");
     case 0x1F4701: return UString("Atmel AT25DF321A");
     case 0x1F4800: return UString("Atmel AT25DF641");
+    case 0x1F7018: return UString("Atmel AT25QF128");
+    case 0x1F8600: return UString("Atmel AT25DQ161");
     case 0x1F8800: return UString("Atmel AT25DQ641");
 
     // Microchip
@@ -153,7 +163,7 @@ UString jedecIdToUString(UINT8 vendorId, UINT8 deviceId0, UINT8 deviceId1)
     case 0xBF258E: return UString("Microchip SST25VF080B");
     case 0xBF254B: return UString("Microchip SST25VF064C");
 
-    // EON
+    // EON / ESMT
     case 0x1C3013: return UString("EON EN25Q40");
     case 0x1C3014: return UString("EON EN25Q80");
     case 0x1C3015: return UString("EON EN25Q16");
@@ -164,6 +174,13 @@ UString jedecIdToUString(UINT8 vendorId, UINT8 deviceId0, UINT8 deviceId1)
     case 0x1C3115: return UString("EON EN25F16");
     case 0x1C3116: return UString("EON EN25F32");
     case 0x1C3117: return UString("EON EN25F64");
+    case 0x1C3811: return UString("EON EN25S10");
+    case 0x1C3812: return UString("EON EN25S20");
+    case 0x1C3813: return UString("EON EN25S40");
+    case 0x1C3814: return UString("EON EN25S80");
+    case 0x1C3815: return UString("EON EN25S16");
+    case 0x1C3816: return UString("EON EN25S32");
+    case 0x1C3817: return UString("EON EN25S64");
     case 0x1C7014: return UString("EON EN25QH80");
     case 0x1C7015: return UString("EON EN25QH16");
     case 0x1C7016: return UString("EON EN25QH32");
@@ -210,9 +227,15 @@ UString jedecIdToUString(UINT8 vendorId, UINT8 deviceId0, UINT8 deviceId1)
     case 0x9DF77E: return UString("PMC Pm25LV040");
 
     // ISSI
+    case 0x9D6014: return UString("ISSI Ix25LP080");
+    case 0x9D6015: return UString("ISSI Ix25LP016");
+    case 0x9D6016: return UString("ISSI Ix25LP032");
     case 0x9D6017: return UString("ISSI Ix25LP064");
     case 0x9D6018: return UString("ISSI Ix25LP128");
     case 0x9D6019: return UString("ISSI Ix25LP256");
+    case 0x9D7014: return UString("ISSI Ix25WP080");
+    case 0x9D7015: return UString("ISSI Ix25WP016");
+    case 0x9D7016: return UString("ISSI Ix25WP032");
     case 0x9D7017: return UString("ISSI Ix25WP064");
     case 0x9D7018: return UString("ISSI Ix25WP128");
     case 0x9D7019: return UString("ISSI Ix25WP256");