diff --git a/.cache/Inovelli.json b/.cache/Inovelli.json
index 39ed96d..22d48a4 100644
--- a/.cache/Inovelli.json
+++ b/.cache/Inovelli.json
@@ -1 +1 @@
-{"VZM31-SN":[{"version":"00000011","channel":"beta","firmware":"https://files.inovelli.com/firmware/VZM31-SN/Beta/1.11/VZM31-SN_1.11.ota","manufacturer_id":4655,"image_type":257},{"version":"16842764","channel":"beta","firmware":"https://files.inovelli.com/firmware/VZM31-SN/Beta/1.12/VZM31-SN_1.12.ota","manufacturer_id":4655,"image_type":257},{"version":"16843021","channel":"beta","firmware":"https://files.inovelli.com/firmware/VZM31-SN/Beta/1.13/VZM31-SN_1.13.ota","manufacturer_id":4655,"image_type":257},{"version":"16908805","channel":"beta","firmware":"https://files.inovelli.com/firmware/VZM31-SN/Beta/2.05/VZM31-SN_2.05.ota","manufacturer_id":4655,"image_type":257},{"version":"16908806","channel":"beta","firmware":"https://files.inovelli.com/firmware/VZM31-SN/Beta/2.06/VZM31-SN_2.06.ota","manufacturer_id":4655,"image_type":257},{"version":"16908807","channel":"beta","firmware":"https://files.inovelli.com/firmware/VZM31-SN/Beta/2.07/VZM31-SN_2.07.ota","manufacturer_id":4655,"image_type":257},{"version":"16908808","channel":"beta","firmware":"https://files.inovelli.com/firmware/VZM31-SN/Beta/2.08/VZM31-SN_2.08.ota","manufacturer_id":4655,"image_type":257},{"version":"16908815","channel":"beta","firmware":"https://github.com/InovelliUSA/Firmware/raw/main/Blue-Series/Zigbee/VZM31-SN-2-1-Switch/Production/2.15/VZM31-SN_2.15-Production.ota","manufacturer_id":4655,"image_type":257},{"version":"16908818","channel":"beta","firmware":"https://github.com/InovelliUSA/Firmware/raw/3a73f98512f6e6f44fd5c89b7ee3402be5bbc4d1/Blue-Series/Zigbee/VZM31-SN-2-1-Switch/Beta/2.18/VZM31-SN_2.18-Beta.ota","manufacturer_id":4655,"image_type":257}],"VZM35-SN":[{"version":"33685506","channel":"beta","firmware":"https://files.inovelli.com/firmware/VZM35-SN/Beta/0.02/VZM35-SN_0.02.ota","manufacturer_id":4655,"image_type":513},{"version":"33685760","channel":"beta","firmware":"https://files.inovelli.com/firmware/VZM35-SN/1.00/VZM35-SN_1.00.ota","manufacturer_id":4655,"image_type":513},{"version":"33685762","channel":"beta","firmware":"https://files.inovelli.com/firmware/VZM35-SN/1.02/VZM35-SN_1.02.ota","manufacturer_id":4655,"image_type":513},{"version":"33685764","channel":"beta","firmware":"https://files.inovelli.com/firmware/VZM35-SN/1.04/VZM35-SN_1.04.ota","manufacturer_id":4655,"image_type":513},{"version":"33685765","channel":"beta","firmware":"https://files.inovelli.com/firmware/VZM35-SN/Beta/1.05/VZM35-SN_1.05.ota","manufacturer_id":4655,"image_type":513},{"version":"33685767","channel":"beta","firmware":"https://files.inovelli.com/firmware/VZM35-SN/Beta/1.07/VZM35-SN_1.07.ota","manufacturer_id":4655,"image_type":513},{"version":"33685768","channel":"beta","firmware":"https://files.inovelli.com/firmware/VZM35-SN/Beta/1.08/VZM35-SN_1.08.ota","manufacturer_id":4655,"image_type":513}],"VZM35-SN-MG24":[{"version":"33685506","channel":"beta","firmware":"https://inov.li/IRbxhx1646F/VZM35-SN_0.02.ota","manufacturer_id":4655,"image_type":513}],"":[{"version":"33685767","channel":"beta","firmware":"https://inov.li/IRbxhx1646F/VZM35-SN_1.07.ota","manufacturer_id":4655,"image_type":513}],"VZM36":[{"version":"67174402","channel":"beta","firmware":"https://inov.li/IRbxhx1646F/VZM36_0.02.ota","manufacturer_id":4655,"image_type":1025},{"version":"67174403","channel":"beta","firmware":"https://inov.li/IRbxhx1646F/VZM36_0.03.ota","manufacturer_id":4655,"image_type":1025},{"version":"67174404","channel":"beta","firmware":"https://inov.li/IRbxhx1646F/VZM36_0.04.ota","manufacturer_id":4655,"image_type":1025},{"version":"67174657","channel":"beta","firmware":"https://github.com/InovelliUSA/Firmware/raw/6608d75c73b5200b20ed197653c9ad3af1f5c1e7/Blue-Series/Zigbee/VZM36-Fan-Plus-Light/Beta/1.01/VZM36_1.01-Beta.ota","manufacturer_id":4655,"image_type":1025}],"DZM32-SN":[{"version":"50397203","channel":"beta","firmware":"https://files.inovelli.com/firmware/DZM32-SN/Beta/1.13/DZM32-SN_1.13.ota","manufacturer_id":4655,"image_type":4660}],"VZM30-SN":[{"version":"17825794","channel":"beta","firmware":"https://files.inovelli.com/firmware/VZM30-SN/Beta/0.02/VZM30-SN_0.02.ota","manufacturer_id":4655,"image_type":272},{"version":"17825795","channel":"beta","firmware":"https://files.inovelli.com/firmware/VZM30-SN/Beta/0.03/VZM30-SN_0.03.ota","manufacturer_id":4655,"image_type":272},{"version":"17825796","channel":"beta","firmware":"https://files.inovelli.com/firmware/VZM30-SN/Beta/0.04/VZM30-SN_0.04.ota","manufacturer_id":4655,"image_type":272},{"version":"17825797","channel":"beta","firmware":"https://files.inovelli.com/firmware/VZM30-SN/Beta/0.05/VZM30-SN_0.05.ota","manufacturer_id":4655,"image_type":272},{"version":"17826048","channel":"beta","firmware":"https://files.inovelli.com/firmware/VZM30-SN/Production/1.00/VZM30-SN_1.00.ota","manufacturer_id":4655,"image_type":272},{"version":"17826049","channel":"production","firmware":"https://files.inovelli.com/firmware/VZM30-SN/Production/1.01/VZM30-SN_1.01.ota","manufacturer_id":4655,"image_type":272},{"version":"17826050","channel":"beta","firmware":"https://files.inovelli.com/firmware/VZM30-SN/Beta/1.02/VZM30-SN_1.02.ota","manufacturer_id":4655,"image_type":272},{"version":"17826051","channel":"beta","firmware":"https://files.inovelli.com/firmware/VZM30-SN/Production/1.03/VZM30-SN_1.03.ota","manufacturer_id":4655,"image_type":272}],"VZM32-SN":[{"version":"16973826","channel":"beta","firmware":"https://files.inovelli.com/firmware/VZM32-SN/Beta/0.02/VZM32-SN_0.02.ota","manufacturer_id":4655,"image_type":259},{"version":"16973827","channel":"beta","firmware":"https://files.inovelli.com/firmware/VZM32-SN/Beta/0.03/VZM32-SN_0.03.ota","manufacturer_id":4655,"image_type":259},{"version":"16973828","channel":"beta","firmware":"https://files.inovelli.com/firmware/VZM32-SN/Beta/0.04/VZM32-SN_0.04.ota","manufacturer_id":4655,"image_type":259},{"version":"16973830","channel":"beta","firmware":"https://files.inovelli.com/firmware/VZM32-SN/Beta/0.06/VZM32-SN_0.06.ota","manufacturer_id":4655,"image_type":259},{"version":"16973831","channel":"beta","firmware":"https://files.inovelli.com/firmware/VZM32-SN/Beta/0.07/VZM32-SN_0.07.ota","manufacturer_id":4655,"image_type":259},{"version":"16973832","channel":"beta","firmware":"https://files.inovelli.com/firmware/VZM32-SN/Beta/0.08/VZM32-SN_0.08.ota","manufacturer_id":4655,"image_type":259},{"version":"16973833","channel":"beta","firmware":"https://files.inovelli.com/firmware/VZM32-SN/Beta/0.09/VZM32-SN_0.09.ota","manufacturer_id":4655,"image_type":259},{"version":"16973834","channel":"beta","firmware":"https://files.inovelli.com/firmware/VZM32-SN/Beta/0.10/VZM32-SN_0.10.ota","manufacturer_id":4655,"image_type":259}],"VZM32-SN-mmwave":[{"version":"100863491","channel":"beta","firmware":"https://inov.li/IRbxhx1646F/mmwave_module_fw_V3_14_3.ota","manufacturer_id":4655,"image_type":260}]}
\ No newline at end of file
+{"VZM31-SN":[{"version":"00000011","channel":"beta","firmware":"https://files.inovelli.com/firmware/VZM31-SN/Beta/1.11/VZM31-SN_1.11.ota","manufacturer_id":4655,"image_type":257},{"version":"16842764","channel":"beta","firmware":"https://files.inovelli.com/firmware/VZM31-SN/Beta/1.12/VZM31-SN_1.12.ota","manufacturer_id":4655,"image_type":257},{"version":"16843021","channel":"beta","firmware":"https://files.inovelli.com/firmware/VZM31-SN/Beta/1.13/VZM31-SN_1.13.ota","manufacturer_id":4655,"image_type":257},{"version":"16908805","channel":"beta","firmware":"https://files.inovelli.com/firmware/VZM31-SN/Beta/2.05/VZM31-SN_2.05.ota","manufacturer_id":4655,"image_type":257},{"version":"16908806","channel":"beta","firmware":"https://files.inovelli.com/firmware/VZM31-SN/Beta/2.06/VZM31-SN_2.06.ota","manufacturer_id":4655,"image_type":257},{"version":"16908807","channel":"beta","firmware":"https://files.inovelli.com/firmware/VZM31-SN/Beta/2.07/VZM31-SN_2.07.ota","manufacturer_id":4655,"image_type":257},{"version":"16908808","channel":"beta","firmware":"https://files.inovelli.com/firmware/VZM31-SN/Beta/2.08/VZM31-SN_2.08.ota","manufacturer_id":4655,"image_type":257},{"version":"16908815","channel":"beta","firmware":"https://github.com/InovelliUSA/Firmware/raw/main/Blue-Series/Zigbee/VZM31-SN-2-1-Switch/Production/2.15/VZM31-SN_2.15-Production.ota","manufacturer_id":4655,"image_type":257},{"version":"16908818","channel":"beta","firmware":"https://github.com/InovelliUSA/Firmware/raw/3a73f98512f6e6f44fd5c89b7ee3402be5bbc4d1/Blue-Series/Zigbee/VZM31-SN-2-1-Switch/Beta/2.18/VZM31-SN_2.18-Beta.ota","manufacturer_id":4655,"image_type":257},{"version":"16909060","channel":"beta","firmware":"https://files.inovelli.com/firmware/VZM31-SN/Production/3.04/VZM31-SN_3.04.ota","manufacturer_id":4655,"image_type":257}],"VZM35-SN":[{"version":"33685506","channel":"beta","firmware":"https://files.inovelli.com/firmware/VZM35-SN/Beta/0.02/VZM35-SN_0.02.ota","manufacturer_id":4655,"image_type":513},{"version":"33685760","channel":"beta","firmware":"https://files.inovelli.com/firmware/VZM35-SN/1.00/VZM35-SN_1.00.ota","manufacturer_id":4655,"image_type":513},{"version":"33685762","channel":"beta","firmware":"https://files.inovelli.com/firmware/VZM35-SN/1.02/VZM35-SN_1.02.ota","manufacturer_id":4655,"image_type":513},{"version":"33685764","channel":"beta","firmware":"https://files.inovelli.com/firmware/VZM35-SN/1.04/VZM35-SN_1.04.ota","manufacturer_id":4655,"image_type":513},{"version":"33685765","channel":"beta","firmware":"https://files.inovelli.com/firmware/VZM35-SN/Beta/1.05/VZM35-SN_1.05.ota","manufacturer_id":4655,"image_type":513},{"version":"33685767","channel":"beta","firmware":"https://files.inovelli.com/firmware/VZM35-SN/Beta/1.07/VZM35-SN_1.07.ota","manufacturer_id":4655,"image_type":513},{"version":"33685768","channel":"beta","firmware":"https://files.inovelli.com/firmware/VZM35-SN/Beta/1.08/VZM35-SN_1.08.ota","manufacturer_id":4655,"image_type":513}],"VZM35-SN-MG24":[{"version":"33685506","channel":"beta","firmware":"https://inov.li/IRbxhx1646F/VZM35-SN_0.02.ota","manufacturer_id":4655,"image_type":513}],"":[{"version":"33685767","channel":"beta","firmware":"https://inov.li/IRbxhx1646F/VZM35-SN_1.07.ota","manufacturer_id":4655,"image_type":513}],"VZM36":[{"version":"67174402","channel":"beta","firmware":"https://inov.li/IRbxhx1646F/VZM36_0.02.ota","manufacturer_id":4655,"image_type":1025},{"version":"67174403","channel":"beta","firmware":"https://inov.li/IRbxhx1646F/VZM36_0.03.ota","manufacturer_id":4655,"image_type":1025},{"version":"67174404","channel":"beta","firmware":"https://inov.li/IRbxhx1646F/VZM36_0.04.ota","manufacturer_id":4655,"image_type":1025},{"version":"67174657","channel":"beta","firmware":"https://github.com/InovelliUSA/Firmware/raw/6608d75c73b5200b20ed197653c9ad3af1f5c1e7/Blue-Series/Zigbee/VZM36-Fan-Plus-Light/Beta/1.01/VZM36_1.01-Beta.ota","manufacturer_id":4655,"image_type":1025}],"DZM32-SN":[{"version":"50397203","channel":"beta","firmware":"https://files.inovelli.com/firmware/DZM32-SN/Beta/1.13/DZM32-SN_1.13.ota","manufacturer_id":4655,"image_type":4660}],"VZM30-SN":[{"version":"17825794","channel":"beta","firmware":"https://files.inovelli.com/firmware/VZM30-SN/Beta/0.02/VZM30-SN_0.02.ota","manufacturer_id":4655,"image_type":272},{"version":"17825795","channel":"beta","firmware":"https://files.inovelli.com/firmware/VZM30-SN/Beta/0.03/VZM30-SN_0.03.ota","manufacturer_id":4655,"image_type":272},{"version":"17825796","channel":"beta","firmware":"https://files.inovelli.com/firmware/VZM30-SN/Beta/0.04/VZM30-SN_0.04.ota","manufacturer_id":4655,"image_type":272},{"version":"17825797","channel":"beta","firmware":"https://files.inovelli.com/firmware/VZM30-SN/Beta/0.05/VZM30-SN_0.05.ota","manufacturer_id":4655,"image_type":272},{"version":"17826048","channel":"beta","firmware":"https://files.inovelli.com/firmware/VZM30-SN/Production/1.00/VZM30-SN_1.00.ota","manufacturer_id":4655,"image_type":272},{"version":"17826049","channel":"production","firmware":"https://files.inovelli.com/firmware/VZM30-SN/Production/1.01/VZM30-SN_1.01.ota","manufacturer_id":4655,"image_type":272},{"version":"17826050","channel":"beta","firmware":"https://files.inovelli.com/firmware/VZM30-SN/Beta/1.02/VZM30-SN_1.02.ota","manufacturer_id":4655,"image_type":272},{"version":"17826051","channel":"beta","firmware":"https://files.inovelli.com/firmware/VZM30-SN/Production/1.03/VZM30-SN_1.03.ota","manufacturer_id":4655,"image_type":272}],"VZM32-SN":[{"version":"16973826","channel":"beta","firmware":"https://files.inovelli.com/firmware/VZM32-SN/Beta/0.02/VZM32-SN_0.02.ota","manufacturer_id":4655,"image_type":259},{"version":"16973827","channel":"beta","firmware":"https://files.inovelli.com/firmware/VZM32-SN/Beta/0.03/VZM32-SN_0.03.ota","manufacturer_id":4655,"image_type":259},{"version":"16973828","channel":"beta","firmware":"https://files.inovelli.com/firmware/VZM32-SN/Beta/0.04/VZM32-SN_0.04.ota","manufacturer_id":4655,"image_type":259},{"version":"16973830","channel":"beta","firmware":"https://files.inovelli.com/firmware/VZM32-SN/Beta/0.06/VZM32-SN_0.06.ota","manufacturer_id":4655,"image_type":259},{"version":"16973831","channel":"beta","firmware":"https://files.inovelli.com/firmware/VZM32-SN/Beta/0.07/VZM32-SN_0.07.ota","manufacturer_id":4655,"image_type":259},{"version":"16973832","channel":"beta","firmware":"https://files.inovelli.com/firmware/VZM32-SN/Beta/0.08/VZM32-SN_0.08.ota","manufacturer_id":4655,"image_type":259},{"version":"16973833","channel":"beta","firmware":"https://files.inovelli.com/firmware/VZM32-SN/Beta/0.09/VZM32-SN_0.09.ota","manufacturer_id":4655,"image_type":259},{"version":"16973834","channel":"beta","firmware":"https://files.inovelli.com/firmware/VZM32-SN/Beta/0.10/VZM32-SN_0.10.ota","manufacturer_id":4655,"image_type":259}],"VZM32-SN-mmwave":[{"version":"100863491","channel":"beta","firmware":"https://inov.li/IRbxhx1646F/mmwave_module_fw_V3_14_3.ota","manufacturer_id":4655,"image_type":260}]}
\ No newline at end of file
diff --git a/images/Inovelli/VZM31-SN_3.04.ota b/images/Inovelli/VZM31-SN_3.04.ota
new file mode 100644
index 0000000..4804f29
Binary files /dev/null and b/images/Inovelli/VZM31-SN_3.04.ota differ
diff --git a/images1/Inovelli/VZM31-SN_2.15-Production.ota b/images1/Inovelli/VZM31-SN_2.15-Production.ota
deleted file mode 100644
index a01c72c..0000000
Binary files a/images1/Inovelli/VZM31-SN_2.15-Production.ota and /dev/null differ
diff --git a/images/Inovelli/VZM31-SN_2.18-Production.ota b/images1/Inovelli/VZM31-SN_2.18-Production.ota
similarity index 100%
rename from images/Inovelli/VZM31-SN_2.18-Production.ota
rename to images1/Inovelli/VZM31-SN_2.18-Production.ota
diff --git a/index.json b/index.json
index 5f4cdc3..a2a9a85 100644
--- a/index.json
+++ b/index.json
@@ -1270,16 +1270,6 @@
     "otaHeaderString": "EFR32MG21_Z3",
     "originalUrl": "https://files.inovelli.com/firmware/DZM32-SN/Beta/1.13/DZM32-SN_1.13.ota"
   },
-  {
-    "fileName": "VZM31-SN_2.18-Production.ota",
-    "fileVersion": 16908818,
-    "fileSize": 310258,
-    "url": "https://raw.githubusercontent.com/Koenkk/zigbee-OTA/master/images/Inovelli/VZM31-SN_2.18-Production.ota",
-    "imageType": 257,
-    "manufacturerCode": 4655,
-    "sha512": "6d480a5d621a16bb3a57fcc1af09071fc528dab2a8f3e479620c3bd75ddfa9e8f624c32b1dc35d5c1bc8db0f67a70ee150ce3a516a2026f717076dcbeba23df7",
-    "otaHeaderString": "EBL VM_SWITCH"
-  },
   {
     "fileName": "VZM36_1.01-Beta.ota",
     "fileVersion": 67174657,
@@ -9404,5 +9394,16 @@
     "manufacturerCode": 5127,
     "sha512": "f071aa4bfd06f015819f67472d967380dfb2111b4b02d6f1d0344afbe90a37cdeaac8c761f8fed6d25377dacd89407fbddd983442505d6b51a850b837448c02b",
     "otaHeaderString": "temp_humi_sensor"
+  },
+  {
+    "fileName": "VZM31-SN_3.04.ota",
+    "fileVersion": 16909060,
+    "fileSize": 319866,
+    "originalUrl": "https://files.inovelli.com/firmware/VZM31-SN/Production/3.04/VZM31-SN_3.04.ota",
+    "url": "https://raw.githubusercontent.com/Koenkk/zigbee-OTA/master/images/Inovelli/VZM31-SN_3.04.ota",
+    "imageType": 257,
+    "manufacturerCode": 4655,
+    "sha512": "95aac7aacb41c9437c9b372bade31c7a1201180c21083cd0ef588ecb9be9208d4d97593528f6ebbe1039d850ee6702eb3f1835488363b30b1a694ac19bf92ae2",
+    "otaHeaderString": "EBL VM_SWITCH"
   }
 ]
\ No newline at end of file
diff --git a/index1.json b/index1.json
index c611cb5..a3765a7 100644
--- a/index1.json
+++ b/index1.json
@@ -69,17 +69,6 @@
     "originalUrl": "https://fw.ota.homesmart.ikea.com/files/zingo-lds-stoftmoln_release_prod_v65542_3388635f-aa73-40e0-8edb-50cd242b72f1.ota",
     "releaseNotes": "https://ww8.ikea.com/ikeahomesmart/releasenotes/releasenotes.html"
   },
-  {
-    "fileName": "VZM31-SN_2.15-Production.ota",
-    "fileVersion": 16908815,
-    "fileSize": 306782,
-    "url": "https://raw.githubusercontent.com/Koenkk/zigbee-OTA/master/images1/Inovelli/VZM31-SN_2.15-Production.ota",
-    "imageType": 257,
-    "manufacturerCode": 4655,
-    "sha512": "0c0973c9ad5f627b9cd1cfea8c6d4b0e57958378b4ca21b97d9552fa0183eecbb3c3971cf4f965e39c8b974aa3e91653c9ef7a55abe4ae478a67dccc6417b26a",
-    "otaHeaderString": "EBL VM_SWITCH",
-    "originalUrl": "https://github.com/InovelliUSA/Firmware/raw/main/Blue-Series/Zigbee/VZM31-SN-2-1-Switch/Production/2.15/VZM31-SN_2.15-Production.ota"
-  },
   {
     "fileName": "VZM36_0.04.ota",
     "fileVersion": 67174404,
@@ -3144,5 +3133,15 @@
     "manufacturerCode": 5127,
     "sha512": "2804f83240a6c78b6eb7a9864eacf3901c2ba9be1dc1a919ee5cf23d150891717a2bec772243593c4bf2ba61e973dbcd17f757104e0ad24802afa049da07c47f",
     "otaHeaderString": "temp_humi_sensor"
+  },
+  {
+    "fileName": "VZM31-SN_2.18-Production.ota",
+    "fileVersion": 16908818,
+    "fileSize": 310258,
+    "url": "https://raw.githubusercontent.com/Koenkk/zigbee-OTA/master/images1/Inovelli/VZM31-SN_2.18-Production.ota",
+    "imageType": 257,
+    "manufacturerCode": 4655,
+    "sha512": "6d480a5d621a16bb3a57fcc1af09071fc528dab2a8f3e479620c3bd75ddfa9e8f624c32b1dc35d5c1bc8db0f67a70ee150ce3a516a2026f717076dcbeba23df7",
+    "otaHeaderString": "EBL VM_SWITCH"
   }
 ]
\ No newline at end of file