diff --git a/fhem/FHEM/lib/fhem_zwave_deviceconfig.xml.gz b/fhem/FHEM/lib/fhem_zwave_deviceconfig.xml.gz
index cfe81f2af..793d7a8d2 100644
Binary files a/fhem/FHEM/lib/fhem_zwave_deviceconfig.xml.gz and b/fhem/FHEM/lib/fhem_zwave_deviceconfig.xml.gz differ
diff --git a/fhem/FHEM/lib/openzwave_deviceconfig.xml.gz b/fhem/FHEM/lib/openzwave_deviceconfig.xml.gz
index e4dc6a6fe..584aa63a7 100644
Binary files a/fhem/FHEM/lib/openzwave_deviceconfig.xml.gz and b/fhem/FHEM/lib/openzwave_deviceconfig.xml.gz differ
diff --git a/fhem/FHEM/lib/openzwave_manufacturer_specific.xml b/fhem/FHEM/lib/openzwave_manufacturer_specific.xml
index 8d51f848c..ef932ef7c 100644
--- a/fhem/FHEM/lib/openzwave_manufacturer_specific.xml
+++ b/fhem/FHEM/lib/openzwave_manufacturer_specific.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ManufacturerSpecificData xmlns='http://code.google.com/p/open-zwave/'>
-  <Manufacturer id="0040" name="2B Electronics">
-  </Manufacturer>
+<ManufacturerSpecificData Revision="44" xmlns="https://github.com/OpenZWave/open-zwave">
+  <Manufacturer id="0028" name="2B Electronics"></Manufacturer>
   <Manufacturer id="0098" name="2GIG Technologies">
     <Product config="2gig/ct50e.xml" id="015e" name="CT50e Thermostat" type="3200"/>
     <Product config="2gig/ct30.xml" id="0158" name="CT30 Thermostat" type="1e10"/>
@@ -11,40 +10,54 @@
     <Product config="2gig/ct80.xml" id="0100" name="CT80 Thermostat" type="5002"/>
     <Product config="2gig/ct80.xml" id="0109" name="CT80 Thermostat" type="5003"/>
     <Product config="2gig/ct100.xml" id="0105" name="CT100 Thermostat" type="6401"/>
+    <Product config="2gig/ct100.xml" id="0106" name="CT100 Thermostat USA" type="6401"/>
     <Product config="2gig/ct100.xml" id="0107" name="CT100 Thermostat USA" type="6401"/>
+    <Product config="2gig/ct100.xml" id="01fd" name="CT100 Thermostat USA" type="6401"/>
     <Product config="2gig/ct100.xml" id="0100" name="CT100 Plus Thermostat" type="6402"/>
     <Product config="2gig/ct100.xml" id="0001" name="CT100 Plus Thermostat" type="6402"/>
+    <Product config="2gig/ct101.xml" id="000b" name="CT101 Thermostat (Iris)" type="6501"/>
     <Product config="2gig/ct101.xml" id="000c" name="CT101 Thermostat (Iris)" type="6501"/>
     <Product config="2gig/ct101.xml" id="000d" name="CT101 Thermostat" type="6501"/>
   </Manufacturer>
-  <Manufacturer id="002a" name="3e Technologies">
-  </Manufacturer>
-  <Manufacturer id="0022" name="A-1 Components">
-  </Manufacturer>
+  <Manufacturer id="002a" name="3e Technologies"></Manufacturer>
+  <Manufacturer id="0022" name="A-1 Components"></Manufacturer>
+  <Manufacturer id="0117" name="Abilia"></Manufacturer>
+  <Manufacturer id="0400" name="Abode"></Manufacturer>
+  <Manufacturer id="0409" name="ABUS August Bremicker Sohne KG"></Manufacturer>
+  <Manufacturer id="0403" name="ABUS Security-Center GmbH Co. KG"></Manufacturer>
+  <Manufacturer id="034A" name="AcroComm Corp"></Manufacturer>
   <Manufacturer id="0001" name="ACT">
     <Product id="3130" name="ZCS101 Serial Interface" type="4349"/>
     <Product config="act/zir010.xml" id="3030" name="ZIR000 PIR Motion Sensor" type="4952"/>
     <Product config="act/zir010.xml" id="3330" name="ZIR010 PIR Motion Sensor" type="4952"/>
     <Product config="act/zir010.xml" id="3130" name="ZIR010 PIR Motion Sensor" type="4952"/>
-    <Product id="3030" name="ZDP100 Plugin Lamp Module" type="4450"/>
+    <Product config="act/zdp100.xml" id="3030" name="ZDP100 Plugin Lamp Module" type="4450"/>
     <Product config="act/zdw103.xml" id="3033" name="ZDW103 Wall Dimmer Module" type="4457"/>
     <Product id="3330" name="ZDW230 Wall Dimmer Module" type="4457"/>
     <Product config="act/zdw232.xml" id="3332" name="ZDW232 Wall Dimmer Module" type="4457"/>
     <Product config="act/zdm230.xml" id="3330" name="ZDM230 Wall Dimmer Module" type="444d"/>
-    <Product id="3030" name="ZRP100 Plugin Appliance Module" type="5250"/>
+    <Product config="act/zrp100.xml" id="3030" name="ZRP100 Plugin Appliance Module" type="5250"/>
     <Product config="act/zrp110.xml" id="3130" name="ZRP110 Exterior Appliance Module" type="5250"/>
-    <Product id="3330" name="ZRW230 Wall Appliance Module" type="5257"/>
+    <Product config="act/zrw230.xml" id="3330" name="ZRW230 Wall Appliance Module" type="5257"/>
     <Product config="act/lfm20.xml" id="3133" name="LFM-20 Relay Fixture Module" type="5246"/>
     <Product config="act/zrw103.xml" id="3033" name="ZRW103 Wall Switch Module" type="5257"/>
-    <Product id="3330" name="ZRM230 Wall Appliance Module" type="524d"/>
+    <Product config="act/zrm230.xml" id="3330" name="ZRM230 Wall Appliance Module" type="524d"/>
     <Product id="3330" name="ZTW230 Wall Transmitter Module" type="5457"/>
     <Product id="3330" name="ZTM230 Wall Transmitter Module" type="544d"/>
   </Manufacturer>
-  <Manufacturer id="0086" name="Aeotec">
+  <Manufacturer id="0297" name="AdMobilize, LLC"></Manufacturer>
+  <Manufacturer id="0101" name="ADOX, Inc."></Manufacturer>
+  <Manufacturer id="025B" name="AdTrustMedia LLC"></Manufacturer>
+  <Manufacturer id="016C" name="Advanced Optronic Devices"></Manufacturer>
+  <Manufacturer id="009E" name="Adventure Interactive"></Manufacturer>
+  <Manufacturer id="035B" name="Aeinnovation"></Manufacturer>
+  <Manufacturer id="0405" name="AEM Acotel Engineering and Manufacturing Spa"></Manufacturer>
+  <Manufacturer id="0350" name="AENSys Informatics Ltd"></Manufacturer>
+  <Manufacturer id="0086" name="AEON Labs">
     <Product id="0000" name="Z-Wave Extender" type="0000"/>
     <Product id="0001" name="Z-Stick" type="0001"/>
     <Product id="0002" name="DSA02203 Z-Stick S2" type="0001"/>
-    <Product id="0001" name="DSA02203 Z-Stick S2" type="0002"/>
+    <Product config="aeotec/dsb28-zweu.xml" id="0001" name="DSA02203 Z-Stick S2" type="0002"/>
     <Product id="0007" name="DSA07203 Z-Stick Lite" type="0001"/>
     <Product config="aeotec/dsa03202.xml" id="0003" name="DSA03202 Minimote" type="0001"/>
     <Product config="aeotec/dsa22.xml" id="0016" name="DSA22 Key Fob" type="0001"/>
@@ -52,7 +65,7 @@
     <Product config="aeotec/dsb05.xml" id="0005" name="DSB05 Multisensor" type="0002"/>
     <Product config="aeotec/dsb28.xml" id="001c" name="DSB28 Home Energy Meter (2nd Edition)" type="0002"/>
     <Product config="aeotec/dsb29.xml" id="001d" name="DSB29 Door/Window Sensor (2nd Edition)" type="0002"/>
-    <Product config="aeotec/dsb45.xml" id="002d" name="DSB45 Water Sensor" type="0002" />
+    <Product config="aeotec/dsb45.xml" id="002d" name="DSB45 Water Sensor" type="0002"/>
     <Product config="aeotec/dsb54.xml" id="0036" name="DSB54 Recessed Door Sensor" type="0002"/>
     <Product config="aeotec/dsb04100.xml" id="0004" name="DSB04100 Door/Window Sensor" type="0002"/>
     <Product config="aeotec/dsb09104.xml" id="0009" name="DSB09104 Home Energy Meter" type="0002"/>
@@ -64,32 +77,32 @@
     <Product config="aeotec/dsc12104.xml" id="000c" name="DSC12104 Micro Smart Energy Switch" type="0003"/>
     <Product config="aeotec/dsc13104.xml" id="000d" name="DSC13104 Micro Smart Energy Illuminator" type="0003"/>
     <Product config="aeotec/dsc14104.xml" id="000e" name="DSC14104 Micro Motor Controller" type="0003"/>
-    <Product config="aeotec/dsc18103.xml" id="0012" name="DSC18103 Micro Smart Switch (2nd Edition)" type="0003" />
-    <Product config="aeotec/dsc19103.xml" id="0013" name="DSC19103 Micro Smart Dimmer (2nd Edition)" type="0003" />
+    <Product config="aeotec/dsc18103.xml" id="0012" name="DSC18103 Micro Smart Switch (2nd Edition)" type="0003"/>
+    <Product config="aeotec/dsc19103.xml" id="0013" name="DSC19103 Micro Smart Dimmer (2nd Edition)" type="0003"/>
     <Product config="aeotec/dsc26103.xml" id="001a" name="DSC26103 Micro Switch (2nd Edition)" type="0003"/>
     <Product config="aeotec/dsc27103.xml" id="001b" name="DSC27103 Micro Dimmer (2nd Edition)" type="0003"/>
     <Product config="aeotec/dsc35103.xml" id="0011" name="DSC35103 Micro Double Switch" type="0003"/>
-    <Product config="aeotec/dsd37.xml" id="0025" name="DSD37 Range Extender" type="0004" />
-    <Product config="aeotec/zw056.xml" id="0038" name="ZW056 Doorbell Gen5" type="0004" />
-    <Product config="aeotec/zw056.xml" id="0038" name="ZW056 Doorbell Gen5" type="0104" />
-    <Product config="aeotec/zw056.xml" id="0038" name="ZW056 Doorbell Gen5" type="0204" />
-    <Product config="aeotec/zw056.xml" id="0038" name="ZW056 Doorbell Gen5" type="0304" />
-    <Product config="aeotec/zw056.xml" id="0038" name="ZW056 Doorbell Gen5" type="0904" />
-    <Product config="aeotec/zw056.xml" id="0038" name="ZW056 Doorbell Gen5" type="1D04" />
-    <Product config="aeotec/zw056.xml" id="0038" name="ZW056 Doorbell Gen5" type="1A04" />
-    <Product config="aeotec/zw056.xml" id="0038" name="ZW056 Doorbell Gen5" type="0A04" />
-    <Product config="aeotec/zw062.xml" id="003e" name="ZW062 Garage Door Controller" type="0003" />
-    <Product config="aeotec/zw062.xml" id="003e" name="ZW062 Garage Door Controller" type="0103" />
-    <Product config="aeotec/zw062.xml" id="003e" name="ZW062 Garage Door Controller" type="0203" />
+    <Product config="aeotec/dsd37.xml" id="0025" name="DSD37 Range Extender" type="0004"/>
+    <Product config="aeotec/zw056.xml" id="0038" name="ZW056 Doorbell Gen5" type="0004"/>
+    <Product config="aeotec/zw056.xml" id="0038" name="ZW056 Doorbell Gen5" type="0104"/>
+    <Product config="aeotec/zw056.xml" id="0038" name="ZW056 Doorbell Gen5" type="0204"/>
+    <Product config="aeotec/zw056.xml" id="0038" name="ZW056 Doorbell Gen5" type="0304"/>
+    <Product config="aeotec/zw056.xml" id="0038" name="ZW056 Doorbell Gen5" type="0904"/>
+    <Product config="aeotec/zw056.xml" id="0038" name="ZW056 Doorbell Gen5" type="1D04"/>
+    <Product config="aeotec/zw056.xml" id="0038" name="ZW056 Doorbell Gen5" type="1A04"/>
+    <Product config="aeotec/zw056.xml" id="0038" name="ZW056 Doorbell Gen5" type="0A04"/>
+    <Product config="aeotec/zw062.xml" id="003e" name="ZW062 Garage Door Controller" type="0003"/>
+    <Product config="aeotec/zw062.xml" id="003e" name="ZW062 Garage Door Controller" type="0103"/>
+    <Product config="aeotec/zw062.xml" id="003e" name="ZW062 Garage Door Controller" type="0203"/>
     <Product config="aeotec/zw074.xml" id="004a" name="ZW074 MultiSensor Gen5" type="0002"/>
     <Product config="aeotec/zw074.xml" id="004a" name="ZW074 MultiSensor Gen5" type="0102"/>
     <Product config="aeotec/zw074.xml" id="004a" name="ZW074 MultiSensor Gen5" type="0202"/>
     <Product config="aeotec/zw075.xml" id="004b" name="ZW075 Smart Switch Gen5" type="0003"/>
     <Product config="aeotec/zw075.xml" id="004b" name="ZW075 Smart Switch Gen5" type="0103"/>
     <Product config="aeotec/zw075.xml" id="004b" name="ZW075 Smart Switch Gen5" type="0203"/>
-    <Product config="aeotec/zw078.xml" id="004e" name="ZW078 Heavy Duty Smart Switch Gen5" type="0003" />
-    <Product config="aeotec/zw078.xml" id="004e" name="ZW078 Heavy Duty Smart Switch Gen5" type="0103" />
-    <Product config="aeotec/zw078.xml" id="004e" name="ZW078 Heavy Duty Smart Switch Gen5" type="0203" />
+    <Product config="aeotec/zw078.xml" id="004e" name="ZW078 Heavy Duty Smart Switch Gen5" type="0003"/>
+    <Product config="aeotec/zw078.xml" id="004e" name="ZW078 Heavy Duty Smart Switch Gen5" type="0103"/>
+    <Product config="aeotec/zw078.xml" id="004e" name="ZW078 Heavy Duty Smart Switch Gen5" type="0203"/>
     <Product config="aeotec/zw080.xml" id="0050" name="ZW080 Siren Gen5" type="0004"/>
     <Product config="aeotec/zw080.xml" id="0050" name="ZW080 Siren Gen5" type="0104"/>
     <Product config="aeotec/zw080.xml" id="0050" name="ZW080 Siren Gen5" type="0204"/>
@@ -105,32 +118,33 @@
     <Product id="005c" name="ZW092 Z-Stick Lite Gen5 EU" type="0001"/>
     <Product id="005c" name="ZW092 Z-Stick Lite Gen5 US" type="0101"/>
     <Product id="005c" name="ZW092 Z-Stick Lite Gen5 AU" type="0201"/>
-    <Product config="aeotec/zw095.xml" id="005f" name="ZW095 Home Energy Meter Gen5" type="0002" />
-    <Product config="aeotec/zw095.xml" id="005f" name="ZW095 Home Energy Meter Gen5" type="0102" />
-    <Product config="aeotec/zw095.xml" id="005f" name="ZW095 Home Energy Meter Gen5" type="0202" />
-    <Product config="aeotec/zw096.xml" id="0060" name="ZW096 Smart Switch 6" type="0003" />
-    <Product config="aeotec/zw096.xml" id="0060" name="ZW096 Smart Switch 6" type="0103" />
-    <Product config="aeotec/zw096.xml" id="0060" name="ZW096 Smart Switch 6" type="0203" />
-    <Product config="aeotec/zw097.xml" id="0061" name="ZW097 Dry Contact Sensor Gen5" type="0002" />
-    <Product config="aeotec/zw097.xml" id="0061" name="ZW097 Dry Contact Sensor Gen5" type="0102" />
-    <Product config="aeotec/zw097.xml" id="0061" name="ZW097 Dry Contact Sensor Gen5" type="0202" />
-    <Product config="aeotec/zw098.xml" id="0062" name="ZW098 LED Bulb" type="0003" />
-    <Product config="aeotec/zw098.xml" id="0062" name="ZW098 LED Bulb" type="0103" />
-    <Product config="aeotec/zw098.xml" id="0062" name="ZW098 LED Bulb" type="0203" />
-    <Product config="aeotec/zw099.xml" id="0063" name="ZW099 Smart Dimmer 6" type="0003" />
-    <Product config="aeotec/zw099.xml" id="0063" name="ZW099 Smart Dimmer 6" type="0103" />
-    <Product config="aeotec/zw099.xml" id="0063" name="ZW099 Smart Dimmer 6" type="0203" />
-    <Product config="aeotec/zw099.xml" id="0063" name="ZW099 Smart Dimmer 6" type="1D03" />
-    <Product config="aeotec/zw100.xml" id="0064" name="ZW100 MultiSensor 6" type="0002" />
-    <Product config="aeotec/zw100.xml" id="0064" name="ZW100 MultiSensor 6" type="0102" />
-    <Product config="aeotec/zw100.xml" id="0064" name="ZW100 MultiSensor 6" type="0202" />
+    <Product config="aeotec/zw095.xml" id="005f" name="ZW095 Home Energy Meter Gen5" type="0002"/>
+    <Product config="aeotec/zw095.xml" id="005f" name="ZW095 Home Energy Meter Gen5" type="0102"/>
+    <Product config="aeotec/zw095.xml" id="005f" name="ZW095 Home Energy Meter Gen5" type="0202"/>
+    <Product config="aeotec/zw096.xml" id="0060" name="ZW096 Smart Switch 6" type="0003"/>
+    <Product config="aeotec/zw096.xml" id="0060" name="ZW096 Smart Switch 6" type="0103"/>
+    <Product config="aeotec/zw096.xml" id="0060" name="ZW096 Smart Switch 6" type="0203"/>
+    <Product config="aeotec/zw097.xml" id="0061" name="ZW097 Dry Contact Sensor Gen5" type="0002"/>
+    <Product config="aeotec/zw097.xml" id="0061" name="ZW097 Dry Contact Sensor Gen5" type="0102"/>
+    <Product config="aeotec/zw097.xml" id="0061" name="ZW097 Dry Contact Sensor Gen5" type="0202"/>
+    <Product config="aeotec/zw098.xml" id="0062" name="ZW098 LED Bulb" type="0003"/>
+    <Product config="aeotec/zw098.xml" id="0062" name="ZW098 LED Bulb" type="0103"/>
+    <Product config="aeotec/zw098.xml" id="0062" name="ZW098 LED Bulb" type="0203"/>
+    <Product config="aeotec/zw099.xml" id="0063" name="ZW099 Smart Dimmer 6" type="0003"/>
+    <Product config="aeotec/zw099.xml" id="0063" name="ZW099 Smart Dimmer 6" type="0103"/>
+    <Product config="aeotec/zw099.xml" id="0063" name="ZW099 Smart Dimmer 6" type="0203"/>
+    <Product config="aeotec/zw099.xml" id="0063" name="ZW099 Smart Dimmer 6" type="1D03"/>
+    <Product config="aeotec/zw100.xml" id="0064" name="ZW100 MultiSensor 6" type="0002"/>
+    <Product config="aeotec/zw100.xml" id="0064" name="ZW100 MultiSensor 6" type="0102"/>
+    <Product config="aeotec/zw100.xml" id="0064" name="ZW100 MultiSensor 6" type="0202"/>
+    <Product config="aeotec/zw100.xml" id="0064" name="ZW100 MultiSensor 6" type="1A02"/>
     <Product config="aeotec/zw111.xml" id="006f" name="ZW111 Nano Dimmer" type="0003"/>
     <Product config="aeotec/zw111.xml" id="006f" name="ZW111 Nano Dimmer" type="0103"/>
     <Product config="aeotec/zw111.xml" id="006f" name="ZW111 Nano Dimmer" type="0203"/>
     <Product config="aeotec/zw111.xml" id="006f" name="ZW111 Nano Dimmer" type="1d03"/>
-    <Product config="aeotec/zw112.xml" id="0070" name="ZW112 Door Window Sensor 6" type="0002" />
-    <Product config="aeotec/zw112.xml" id="0070" name="ZW112 Door Window Sensor 6" type="0102" />
-    <Product config="aeotec/zw112.xml" id="0070" name="ZW112 Door Window Sensor 6" type="0202" />
+    <Product config="aeotec/zw112.xml" id="0070" name="ZW112 Door Window Sensor 6" type="0002"/>
+    <Product config="aeotec/zw112.xml" id="0070" name="ZW112 Door Window Sensor 6" type="0102"/>
+    <Product config="aeotec/zw112.xml" id="0070" name="ZW112 Door Window Sensor 6" type="0202"/>
     <Product config="aeotec/zw116.xml" id="0074" name="ZW116 Nano Switch" type="0003"/>
     <Product config="aeotec/zw116.xml" id="0074" name="ZW116 Nano Switch" type="0103"/>
     <Product config="aeotec/zw116.xml" id="0074" name="ZW116 Nano Switch" type="0203"/>
@@ -139,9 +153,9 @@
     <Product config="aeotec/zw117.xml" id="0075" name="ZW117 Range Extender 6" type="0104"/>
     <Product config="aeotec/zw117.xml" id="0075" name="ZW117 Range Extender 6" type="0204"/>
     <Product config="aeotec/zw117.xml" id="0075" name="ZW117 Range Extender 6" type="1D04"/>
-    <Product config="aeotec/zw120.xml" id="0078" name="ZW120 Door Window Sensor Gen5" type="0002" />
-    <Product config="aeotec/zw120.xml" id="0078" name="ZW120 Door Window Sensor Gen5" type="0102" />
-    <Product config="aeotec/zw120.xml" id="0078" name="ZW120 Door Window Sensor Gen5" type="0202" />
+    <Product config="aeotec/zw120.xml" id="0078" name="ZW120 Door Window Sensor Gen5" type="0002"/>
+    <Product config="aeotec/zw120.xml" id="0078" name="ZW120 Door Window Sensor Gen5" type="0102"/>
+    <Product config="aeotec/zw120.xml" id="0078" name="ZW120 Door Window Sensor Gen5" type="0202"/>
     <Product config="aeotec/zw121.xml" id="0079" name="ZW121 LED Strip" type="0003"/>
     <Product config="aeotec/zw121.xml" id="0079" name="ZW121 LED Strip" type="0103"/>
     <Product config="aeotec/zw121.xml" id="0079" name="ZW121 LED Strip" type="0203"/>
@@ -174,7 +188,7 @@
     <Product config="aeotec/zw141.xml" id="008d" name="ZW141 Nano Shutter" type="0103"/>
     <Product config="aeotec/zw141.xml" id="008d" name="ZW141 Nano Shutter" type="0203"/>
   </Manufacturer>
-  <Manufacturer id="0371" name="Aeotec">
+  <Manufacturer id="0371" name="Aeotec Limited">
     <Product config="aeotec/zwa001.xml" id="0001" name="ZWA001 LED Bulb 6 Multi-White" type="0003"/>
     <Product config="aeotec/zwa001.xml" id="0001" name="ZWA001 LED Bulb 6 Multi-White" type="0103"/>
     <Product config="aeotec/zwa002.xml" id="0002" name="ZWA002 LED Bulb 6 Multi-Color" type="0003"/>
@@ -185,52 +199,87 @@
     <Product config="aeotec/zwa004.xml" id="0004" name="ZWA004 NanoMote One" type="0102"/>
     <Product config="aeotec/zwa005.xml" id="0005" name="ZWA005 TriSensor" type="0002"/>
     <Product config="aeotec/zwa005.xml" id="0005" name="ZWA005 TriSensor" type="0102"/>
+    <Product config="aeotec/zwa005.xml" id="0005" name="ZWA005 TriSensor" type="0202"/>
     <Product config="aeotec/zw162.xml" id="00a2" name="ZW162 Doorbell 6" type="0003"/>
     <Product config="aeotec/zw162.xml" id="00a2" name="ZW162 Doorbell 6" type="0103"/>
     <Product config="aeotec/zw162.xml" id="00a2" name="ZW162 Doorbell 6" type="0203"/>
     <Product config="aeotec/zw162.xml" id="00a2" name="ZW162 Doorbell 6" type="1d03"/>
+    <Product config="aeotec/zwa006.xml" id="00b4" name="ZWA006 Smart Boost Timer Switch" type="0003"/>
+    <Product config="aeotec/zwa006.xml" id="00b4" name="ZWA006 Smart Boost Timer Switch" type="0103"/>
+    <Product config="aeotec/zwa008.xml" id="0007" name="ZWA008 Door Window Sensor 7" type="0002"/>
+    <Product config="aeotec/zwa008.xml" id="0007" name="ZWA008 Door Window Sensor 7" type="0102"/>
+    <Product config="aeotec/zwa008.xml" id="0007" name="ZWA008 Door Window Sensor 7" type="0202"/>
+    <Product config="aeotec/zw164.xml" id="00a4" name="ZW164 Indoor Siren 6" type="0003"/>
+    <Product config="aeotec/zw175.xml" id="00af" name="ZW175 Smart Switch 7" type="0003"/>
   </Manufacturer>
-  <Manufacturer id="0111" name="Airline Mechanical">
-    <Product id="0200" name="ZDS-100" type="8200"/>
+  <Manufacturer id="0088" name="Airvent SAM S.p.A."></Manufacturer>
+  <Manufacturer id="0094" name="Alarm.com"></Manufacturer>
+  <Manufacturer id="0126" name="Alertme (Iris)">
+    <Product config="iris/rangeextender.xml" id="0001" name="Range Extender" type="0002"/>
   </Manufacturer>
-  <Manufacturer id="0094" name="Alarm.com">
-  </Manufacturer>
-  <Manufacturer id="0029" name="Asia Heading">
+  <Manufacturer id="0372" name="ALLEATO"></Manufacturer>
+  <Manufacturer id="028E" name="Alphanetworks"></Manufacturer>
+  <Manufacturer id="0230" name="Alphonsus Tech">
+    <Product config="idlock/idlock101.xml" id="0001" name="ID Lock 101" type="0003"/>
   </Manufacturer>
+  <Manufacturer id="029F" name="AMADAS Co. LTD "></Manufacturer>
+  <Manufacturer id="019C" name="Amdocs"></Manufacturer>
+  <Manufacturer id="005A" name="American Grid Inc."></Manufacturer>
+  <Manufacturer id="0384" name="Ameta International Co. Ltd."></Manufacturer>
+  <Manufacturer id="032B" name="Anchor Tech"></Manufacturer>
+  <Manufacturer id="0392" name="Animus Home AB"></Manufacturer>
+  <Manufacturer id="026D" name="Antik Technology Ltd."></Manufacturer>
+  <Manufacturer id="0078" name="anyCOMM Corporation"></Manufacturer>
+  <Manufacturer id="0144" name="Applied Micro Electronics AME BV"></Manufacturer>
+  <Manufacturer id="0291" name="Arkea"></Manufacturer>
+  <Manufacturer id="0029" name="Asia Heading"></Manufacturer>
+  <Manufacturer id="0231" name="ASITEQ"></Manufacturer>
+  <Manufacturer id="028A" name="Askey Computer Corp."></Manufacturer>
   <Manufacturer id="0129" name="Assa Abloy">
     <Product config="assa_abloy/TouchLever.xml" id="0000" name="Yale Touchscreen Lever (YRL220)" type="0001"/>
-    <Product config="assa_abloy/TouchDeadbolt.xml" id="0000" name="Yale Touchscreen Deadbolt (YRD220)" type="0002" />
+    <Product config="assa_abloy/TouchDeadbolt.xml" id="0000" name="Yale Touchscreen Deadbolt (YRD220)" type="0002"/>
+    <Product config="assa_abloy/TouchDeadbolt.xml" id="aa00" name="Yale Touchscreen Deadbolt (YRD220)" type="0002"/>
     <Product config="assa_abloy/TouchDeadbolt.xml" id="0209" name="Yale Key Free Touchscreen Deadbolt (YRD240)" type="0002"/>
     <Product config="assa_abloy/TouchDeadbolt.xml" id="0600" name="Yale Key Free Touchscreen Deadbolt (YRD446)" type="8002"/>
     <Product config="assa_abloy/TouchDeadbolt.xml" id="1000" name="Yale Key Free Touchscreen Deadbolt (YRD446)" type="8002"/>
-    <Product config="assa_abloy/TouchDeadbolt.xml" id="0800" name="Yale Touchscreen Deadbolt (YRD120)" type="0002" />
+    <Product config="assa_abloy/TouchDeadbolt.xml" id="0800" name="Yale Touchscreen Deadbolt (YRD120)" type="0002"/>
     <Product config="assa_abloy/PushButtonLever.xml" id="0409" name="Yale Push Button Lever Lock (YRL210)" type="0003"/>
     <Product config="assa_abloy/PushButtonLever.xml" id="0800" name="Yale Push Button Lever Lock (YRL210)" type="0003"/>
     <Product config="assa_abloy/PushButtonDeadbolt.xml" id="0000" name="Yale Push Button Deadbolt (YRD210)" type="0004"/>
     <Product config="assa_abloy/PushButtonDeadbolt.xml" id="0209" name="Yale Push Button Deadbolt (YRD210)" type="0004"/>
-    <Product config="assa_abloy/PushButtonDeadbolt.xml" id="0600" name="Yale Push Button Deadbolt (YRD210)" type="8004"/>
+    <Product config="assa_abloy/PushButtonDeadbolt.xml" id="aa00" name="Yale Push Button Deadbolt (YRD210)" type="0004"/>
+    <Product config="assa_abloy/PushButtonDeadbolt.xml" id="0600" name="Yale Push Button Deadbolt (YRD216)" type="8004"/>
     <Product config="assa_abloy/PushButtonDeadbolt.xml" id="0800" name="Yale Push Button Deadbolt (YRD110)" type="0004"/>
     <Product config="assa_abloy/TouchDeadbolt.xml" id="0000" name="Yale Key Free Touchscreen Deadbolt (YRD240)" type="0006"/>
     <Product config="assa_abloy/KeyfreeConnected.xml" id="0000" name="Yale Keyless Connected Smart Lock (YSL)" type="0007"/>
     <Product config="assa_abloy/KeyfreeConnected.xml" id="9230" name="Yale Keyless Connected Smart Lock (YSL)" type="1bef"/>
     <Product config="assa_abloy/ConexisL1.xml" id="0002" name="Yale Conexis L1 (SD-L1000-CH)" type="6600"/>
+    <Product config="assa_abloy/KeyfreeConnected-plus.xml" id="0001" name="Keyless Connected (YD-01-CON)" type="0007"/>
     <Product config="assa_abloy/KeyfreeConnected-plus.xml" id="0001" name="Yale Keyfree Connected Smart Lock (YKFCON)" type="0006"/>
+    <Product config="assa_abloy/KeyfreeConnected-plus.xml" id="0000" name="Yale Keyfree Connected Smart Lock (YKFCON)" type="0600"/>
     <Product config="assa_abloy/nexTouch.xml" id="0b00" name="Yale nexTouch Wireless Push Button (NTB610)" type="8001"/>
     <Product config="assa_abloy/nexTouch.xml" id="0b00" name="Yale nexTouch Wireless Push Button (NTB620)" type="8003"/>
   </Manufacturer>
-  <Manufacturer id="005d" name="Aspalis">
-    <Product id="0511" name="Plugin Lamp Module" type="0202"/>
-  </Manufacturer>
-  <Manufacturer id="002b" name="Atech">
-  </Manufacturer>
+  <Manufacturer id="013B" name="AstraLink"></Manufacturer>
+  <Manufacturer id="0134" name="AT&amp;T"></Manufacturer>
+  <Manufacturer id="002b" name="Atech"></Manufacturer>
+  <Manufacturer id="0244" name="Athom BV"></Manufacturer>
+  <Manufacturer id="032A" name="AUCEAN TECHNOLOGY. INC"></Manufacturer>
   <Manufacturer id="033f" name="August">
     <Product config="august/asl-03.xml" id="0001" name="ASL-03 Smart Lock" type="0001"/>
   </Manufacturer>
-  <Manufacturer id="0018" name="Balboa Inst.">
-  </Manufacturer>
+  <Manufacturer id="025D" name="Avadesign Technology Co."></Manufacturer>
+  <Manufacturer id="0155" name="Avadesign Technology Co. Ltd"></Manufacturer>
+  <Manufacturer id="0146" name="Axesstel Inc"></Manufacturer>
+  <Manufacturer id="0018" name="Balboa Inst."></Manufacturer>
+  <Manufacturer id="0236" name="Bandi Comm Tech Inc."></Manufacturer>
+  <Manufacturer id="0204" name="Beijing Sino-American Boyi Software Development Co. Ltd"></Manufacturer>
+  <Manufacturer id="0251" name="Beijing Universal Energy Huaxia Technology Co.Ltd"></Manufacturer>
+  <Manufacturer id="0196" name="Bellatrix Systems Inc."></Manufacturer>
+  <Manufacturer id="032D" name="Benetek"></Manufacturer>
   <Manufacturer id="008a" name="BeNext">
-    <Product id="0100" name="myGate" type="0001"/>
-    <Product id="0100" name="myDisplay" type="0002"/>
+    <Product config="BeNext/mygate.xml" id="0100" name="myGate" type="0001"/>
+    <Product config="BeNext/mydisplay.xml" id="0100" name="myDisplay" type="0002"/>
     <Product config="BeNext/Molite.xml" id="0100" name="MoLiTe Sensor" type="0003"/>
     <Product config="BeNext/Molite.xml" id="0101" name="DHS-ZW-SNMT-01 Multi Sensor" type="0003"/>
     <Product config="BeNext/DoorSensor.xml" id="0100" name="Door Sensor" type="0004"/>
@@ -256,51 +305,81 @@
     <Product config="BeNext/HeatingControl.xml" id="0102" name="Heating Control" type="0021"/>
     <Product config="BeNext/P1dongle.xml" id="0100" name="P1 Dongle" type="002f"/>
   </Manufacturer>
-  <Manufacturer id="002c" name="BeSafer">
-  </Manufacturer>
-  <Manufacturer id="0023" name="Boca Devices">
-  </Manufacturer>
-  <Manufacturer id="002d" name="Broadband Energy">
+  <Manufacturer id="014B" name="BFT S.p.A."></Manufacturer>
+  <Manufacturer id="0052" name="Bit7 Inc."></Manufacturer>
+  <Manufacturer id="0311" name="Blaze Automation"></Manufacturer>
+  <Manufacturer id="0213" name="BMS Evler LTD"></Manufacturer>
+  <Manufacturer id="0023" name="Boca Devices"></Manufacturer>
+  <Manufacturer id="0169" name="Bonig und Kallenbach oHG (Popp)">
+    <Product config="popp/zweather.xml" id="0001" name="ZWeather" type="0001"/>
   </Manufacturer>
+  <Manufacturer id="015C" name="Bosch Security Systems Inc"></Manufacturer>
+  <Manufacturer id="002d" name="Broadband Energy Networks Inc."></Manufacturer>
+  <Manufacturer id="024A" name="BTSTAR(HK) TECHNOLOGY COMPANY LIMITED"></Manufacturer>
   <Manufacturer id="0145" name="Buffalo">
-    <Product id="0004" name="HW-100V15A-ZW Measure Power Monitor" type="0001"/>
-  </Manufacturer>
-  <Manufacturer id="0026" name="BuLogics">
-  </Manufacturer>
-  <Manufacturer id="002e" name="Carrier">
-  </Manufacturer>
-  <Manufacturer id="0011" name="CasaWorks">
+    <Product config="buffalo/hw-100v15a-zw.xml" id="0004" name="HW-100V15A-ZW Measure Power Monitor" type="0001"/>
   </Manufacturer>
+  <Manufacturer id="0190" name="Building 36 Technologies"></Manufacturer>
+  <Manufacturer id="0396" name="Bulcraft Control"></Manufacturer>
+  <Manufacturer id="0026" name="BuLogics"></Manufacturer>
+  <Manufacturer id="0398" name="Calix"></Manufacturer>
+  <Manufacturer id="009C" name="Cameo Communications Inc."></Manufacturer>
+  <Manufacturer id="002e" name="Carrier"></Manufacturer>
+  <Manufacturer id="000B" name="CasaWorks"></Manufacturer>
+  <Manufacturer id="0243" name="casenio AG"></Manufacturer>
+  <Manufacturer id="0404" name="CCC Air Inc."></Manufacturer>
+  <Manufacturer id="0246" name="CentraLite Systems Inc"></Manufacturer>
+  <Manufacturer id="033C" name="Centurylink"></Manufacturer>
+  <Manufacturer id="0359" name="Chamberlain Group"></Manufacturer>
+  <Manufacturer id="014E" name="Check-It Solutions Inc."></Manufacturer>
+  <Manufacturer id="038F" name="CHENGPUTECH "></Manufacturer>
+  <Manufacturer id="0320" name="China Security and Fire IOT Sensing CO. LTD"></Manufacturer>
   <Manufacturer id="0116" name="Chromagic Technologies Corporation">
     <Product config="everspring/hsp02.xml" id="0001" name="HSCP02 Motion Detector" type="0001"/>
-    <Product config="everspringct/hsm02.xml" id="0001" name="HSM02 Mini Door/Window Detector" type="0002" />
-    <Product id="0001" name="HAC01 Remote Button" type="0010"/>
-  </Manufacturer>
-  <Manufacturer id="002f" name="Color Kinetics">
+    <Product config="everspringct/hsm02.xml" id="0001" name="HSM02 Mini Door/Window Detector" type="0002"/>
+    <Product config="everspring/hac01.xml" id="0001" name="HAC01 Remote Button" type="0010"/>
   </Manufacturer>
+  <Manufacturer id="0280" name="Chuango Security Technology Corporation"></Manufacturer>
+  <Manufacturer id="0082" name="Cisco Consumer Business Group"></Manufacturer>
+  <Manufacturer id="0194" name="Clare Controls"></Manufacturer>
+  <Manufacturer id="018E" name="Climax Technology, Ltd."></Manufacturer>
+  <Manufacturer id="0200" name="Cloud Media "></Manufacturer>
+  <Manufacturer id="002f" name="Color Kinetics"></Manufacturer>
+  <Manufacturer id="0329" name="COMAP"></Manufacturer>
+  <Manufacturer id="0309" name="Comfortability"></Manufacturer>
+  <Manufacturer id="0140" name="Computime"></Manufacturer>
+  <Manufacturer id="011B" name="Connected Object"></Manufacturer>
   <Manufacturer id="0179" name="ConnectHome">
     <Product id="0001" name="CH-201 Thermostat" type="0001"/>
   </Manufacturer>
-  <Manufacturer id="0019" name="ControlThink">
-  </Manufacturer>
-  <Manufacturer id="0015" name="ConvergeX">
-  </Manufacturer>
-  <Manufacturer id="001a" name="Cooper">
+  <Manufacturer id="0285" name="CONNECTION TECHNOLOGY SYSTEMS"></Manufacturer>
+  <Manufacturer id="025D" name="Contec intelligent housing"></Manufacturer>
+  <Manufacturer id="023F" name="Control4 Corporation"></Manufacturer>
+  <Manufacturer id="0019" name="ControlThink"></Manufacturer>
+  <Manufacturer id="000F" name="ConvergeX"></Manufacturer>
+  <Manufacturer id="007D" name="CoolGuard"></Manufacturer>
+  <Manufacturer id="0079" name="Cooper Lighting"></Manufacturer>
+  <Manufacturer id="001a" name="Cooper Wiring Devices">
     <Product config="cooper/RF9542-Z.xml" id="0000" name="RF9542-Z Accessory Dimmer" type="4441"/>
-    <Product id="0002" name="RF9534DS Wall Dimmer Module" type="4449"/>
+    <Product config="cooper/rf9534.xml" id="0002" name="RF9534DS Wall Dimmer Module" type="4449"/>
     <Product config="cooper/RF9540-N.xml" id="0101" name="RF9540-N All Load Dimmer Light Switch" type="4449"/>
     <Product config="cooper/RF9505-T.xml" id="0000" name="RF9505-T Split Control Duplex Receptacle" type="5244"/>
     <Product config="cooper/RF9501.xml" id="0000" name="RF9501 Light Switch" type="534c"/>
     <Product config="cooper/RF9517.xml" id="0000" name="RF9517 Accessory Light Switch" type="5352"/>
     <Product config="cooper/RFWC5.xml" id="0000" name="RFWC5/RFWDC Scene Controller" type="574d"/>
   </Manufacturer>
-  <Manufacturer id="009d" name="Coventive">
+  <Manufacturer id="009d" name="Coventive Technologies Inc."></Manufacturer>
+  <Manufacturer id="0379" name="CPRO"></Manufacturer>
+  <Manufacturer id="0383" name="CribOS"></Manufacturer>
+  <Manufacturer id="0328" name="Cvnet"></Manufacturer>
+  <Manufacturer id="0014" name="Cyberhouse (GoControl)">
+    <Product config="gocontrol/GC-TBZ48L.xml" id="5436" name="GC-TBZ48L Battery Powered Z-Wave Plus Thermostat" type="5442"/>
   </Manufacturer>
-  <Manufacturer id="0020" name="Cyberhouse">
-  </Manufacturer>
-  <Manufacturer id="0030" name="Cytech Tech">
-    <Product id="0001" name="Comfort 9000 with UCM/Zwave" type="0001"/>
+  <Manufacturer id="0067" name="CyberTAN Technology, Inc."></Manufacturer>
+  <Manufacturer id="0030" name="Cytech Technology Pre Ltd.">
+    <Product config="comfort/ucm.xml" id="0001" name="Comfort 9000 with UCM/Zwave" type="0001"/>
   </Manufacturer>
+  <Manufacturer id="0294" name="D-3 Technology Co. Ltd"></Manufacturer>
   <Manufacturer id="0108" name="D-Link Corporation">
     <Product config="dlink/dch-z110.xml" id="000e" name="DCH-Z110 Door/Window 3 in 1 sensor" type="0002"/>
     <Product config="dlink/dch-z120.xml" id="000d" name="DCH-Z120 PIR/Motion 3 in 1 sensor" type="0002"/>
@@ -314,46 +393,44 @@
     <Product config="danfoss/z.xml" id="0004" name="Z Thermostat 014G0013" type="0005"/>
     <Product id="0001" name="RA Plus-W Radiator Thermostat" type="0064"/>
     <Product config="danfoss/z.xml" id="a010" name="Popp Radiator Thermostat" type="0115"/>
-    <Product config="danfoss/z.xml" id="a010" name="COQON DTHERMZ6" type="0248" forumNr="no-statistics"/>
+	<Product config="danfoss/z.xml" id="a010" name="COQON DTHERMZ6" type="0248" forumNr="no-statistics"/>
     <Product id="2000" name="RXZ3 RF relay Switching Unit" type="8004"/>
     <Product config="danfoss/living.xml" id="0001" name="Living Connect Radiator Thermostat" type="8005"/>
   </Manufacturer>
-  <Manufacturer id="0031" name="Destiny Networks">
-  </Manufacturer>
+  <Manufacturer id="018C" name="Dawon DNS"></Manufacturer>
+  <Manufacturer id="020A" name="Decoris Intelligent System Limited"></Manufacturer>
+  <Manufacturer id="013F" name="Defacontrols BV"></Manufacturer>
+  <Manufacturer id="032E" name="DEFARO"></Manufacturer>
+  <Manufacturer id="040D" name="Delaney Hardware"></Manufacturer>
+  <Manufacturer id="0031" name="Destiny Networks"></Manufacturer>
   <Manufacturer id="0175" name="Devolo home Control">
-    <Product config="devolo/mt2646.xml" id="0011" name="Metering Plug MT 2646" type="0001"/>
-    <Product config="devolo/mt02792.xml" id="0012" name="Home Control Smart Metering Plug MT02792" type="0001"/>
-    <Product config="devolo/mt2647.xml" id="000d" name="Motion Detector MT 2647" type="0002"/>
-    <Product config="devolo/mt02648.xml" id="000e" name="Door/Window Contact MT 02648" type="0002"/>
-    <Product config="philio/phpat02.xml" id="0020" name="Temperature and Humidity sensor MT:2755" type="0002"/>
+    <Product config="devolo/mt2646.xml" id="0011" name="Metering Plug MT02646" type="0001"/>
+    <Product config="devolo/mt02792.xml" id="0012" name="Smart Metering Plug MT02792" type="0001"/>
+    <Product config="devolo/mt02648.xml" id="000e" name="Door/Window Contact MT02648" type="0002"/>
+    <Product config="devolo/mt02755.xml" id="0020" name="Humidity Sensor MT02755" type="0002"/>
     <Product config="devolo/mt2756.xml" id="0021" name="Flood Sensor MT02756" type="0002"/>
+    <Product config="devolo/mt2647.xml" id="000d" name="Motion Sensor MT02647" type="0002"/>
     <Product config="devolo/rs014G0159.xml" id="8010" name="Thermostats RS 014G0159" type="0003"/>
-    <Product config="devolo/siren.xml" id="000a" name="Siren" type="0004"/>
+    <Product config="devolo/mt02758.xml" id="000a" name="Siren MT02758" type="0004"/>
     <Product config="devolo/connectz.xml" id="0175" name="Thermostats Danfoss Connect Z" type="0005"/>
-    <Product config="zwave.me/ZME_WALLC-S.xml" id="0101" name="Scene Switch MT 2652" type="0100" />
-    <Product config="zwave.me/ZME_KFOB-S.xml" id="0102" name="Remote MT 2653" type="0100" />
-    <Product id="04a4" name="Smoke Detector MT02651" type="2004"/>
+    <Product config="devolo/mt2652.xml" id="0101" name="Scene Switch MT2652" type="0100"/>
+    <Product config="devolo/mt2653.xml" id="0102" name="Key MT2653" type="0100"/>
+    <Product config="devolo/mt2651.xml" id="04a4" name="Smoke Detector MT2651" type="2004"/>
+    <Product config="devolo/mt2651.xml" id="2004" name="Smoke Detector MT2651" type="2004"/>
   </Manufacturer>
-  <Manufacturer id="0103" name="DiehlControls">
-    <Product id="0002" name="Dimmer Actuator" type="0002"/>
-  </Manufacturer>
-  <Manufacturer id="0050" name="Digital 5">
-  </Manufacturer>
-  <Manufacturer id="021f" name="Dome">
-    <Product config="dome/0002.xml" id="0002" name="Water Shut-Off Valve" type="0003"/>
-    <Product config="dome/0083.xml" id="0083" name="Motion Detector" type="0003"/>
-    <Product config="dome/0085.xml" id="0085" name="Leak Sensor" type="0003"/>
-    <Product config="dome/0086.xml" id="0086" name="Mouser" type="0003"/>
-    <Product config="dome/0087.xml" id="0087" name="On/Off Plug-In Switch" type="0003"/>
-    <Product config="dome/0088.xml" id="0088" name="Siren" type="0003"/>
-    <Product config="dome/0101.xml" id="0101" name="Door/Window Sensor" type="0003"/>
-    <Product config="dome/0201.xml" id="0201" name="Door/Window Sensor Pro" type="0003"/>
+  <Manufacturer id="0103" name="Diehl AKO">
+    <Product config="diehlcontrols/766366.xml" id="0002" name="Dimmer Actuator" type="0002"/>
   </Manufacturer>
+  <Manufacturer id="0032" name="Digital 5 Inc."></Manufacturer>
+  <Manufacturer id="035D" name="Digital Watchdog"></Manufacturer>
+  <Manufacturer id="0228" name="DigitalZone"></Manufacturer>
+  <Manufacturer id="0127" name="Digital Monitoring Products"></Manufacturer>
+  <Manufacturer id="0177" name="Domino sistemi d.o.o."></Manufacturer>
   <Manufacturer id="020e" name="Domitech">
     <Product config="domitech/ze27eu.xml" id="3134" name="Smart LED Retrofit Kit ZE27EU" type="4c42"/>
     <Product config="domitech/zb22uk.xml" id="3135" name="Smart LED Light Bulb ZB22UK" type="4c42"/>
   </Manufacturer>
-  <Manufacturer id="021c" name="Domux">
+  <Manufacturer id="021c" name="Domux Shenzhen iSurpass Technology Co.">
     <Product config="domux/DX1DS-Z.xml" id="0168" name="Door Sensor DX1DS-Z" type="0168"/>
     <Product config="domux/DX1MS-Z.xml" id="1000" name="Motion Sensor DX1MS-Z" type="8001"/>
     <Product config="domux/DX1SA-Z.xml" id="1000" name="Smart Smoke Sensor DX1SA-Z" type="8002"/>
@@ -364,38 +441,75 @@
     <Product config="domux/DX1HT-Z.xml" id="1000" name="Temperature Humidity Sensor DX1HT-Z" type="8007"/>
     <Product config="domux/DX2SK-Z.xml" id="1000" name="Smart Plug DX2SK-Z" type="8008"/>
   </Manufacturer>
+  <Manufacturer id="020C" name="Dongguan Zhou Da Electronics Co.,Ltd"></Manufacturer>
+  <Manufacturer id="017D" name="DRACOR Inc."></Manufacturer>
   <Manufacturer id="0184" name="Dragon Tech">
-    <Product config="dragontech/wd-100.xml" id="3034" name="In Wall Dimmer" type="4447" />
-  </Manufacturer>
-  <Manufacturer id="0012" name="E Housekeeper">
-    <Product id="0001" name="Switchkeeper Plug-in Appliance Module" type="0001"/>
+    <Product config="dragontech/wd-100.xml" id="3034" name="In Wall Dimmer" type="4447"/>
   </Manufacturer>
+  <Manufacturer id="0223" name="DTV Research Unipessoal, Lda"></Manufacturer>
+  <Manufacturer id="0272" name="Dune-HD"></Manufacturer>
+  <Manufacturer id="0334" name="Dusun Electron Ltd."></Manufacturer>
+  <Manufacturer id="031B" name="DVACO GROUP"></Manufacturer>
+  <Manufacturer id="0132" name="DynaQuip Controls"></Manufacturer>
+  <Manufacturer id="010D" name="e-Home AUTOMATION"></Manufacturer>
+  <Manufacturer id="0247" name="EASY SAVER Co. Inc"></Manufacturer>
+  <Manufacturer id="001A" name="Eaton"></Manufacturer>
+  <Manufacturer id="017C" name="EbV"></Manufacturer>
+  <Manufacturer id="016B" name="Echostar"></Manufacturer>
+  <Manufacturer id="028F" name="Eco Automation"></Manufacturer>
+  <Manufacturer id="037C" name="Eco Life Engineering Co. Ltd."></Manufacturer>
   <Manufacturer id="014a" name="Ecolink">
     <Product config="ecolink/sensor.xml" id="0001" name="Motion Sensor" type="0001"/>
     <Product config="ecolink/doorwindow.xml" id="0002" name="Door/Window Sensor" type="0001"/>
-    <Product config="ecolink/sensor.xml" id="0003" name="Tilt Sensor" type="0001"/>
+    <Product config="ecolink/tiltsensor.xml" id="0003" name="Tilt Sensor" type="0001"/>
     <Product config="ecolink/motion.xml" id="0001" name="Motion Detector" type="0004"/>
     <Product config="ecolink/doorwindow.xml" id="0002" name="Door/Window Sensor" type="0004"/>
-    <Product config="ecolink/sensor.xml" id="0003" name="Garage Door Tilt Sensor" type="0004"/>
+    <Product config="ecolink/tiltsensor.xml" id="0003" name="Tilt Sensor" type="0004"/>
     <Product config="ecolink/firefighter.xml" id="000f" name="FireFighter" type="0005"/>
   </Manufacturer>
-  <Manufacturer id="0087" name="Eka Systems">
-  </Manufacturer>
+  <Manufacturer id="0157" name="EcoNet Controls"></Manufacturer>
+  <Manufacturer id="039D" name="ECS"></Manufacturer>
+  <Manufacturer id="031F" name="Eelectron SpA"></Manufacturer>
+  <Manufacturer id="026B" name="Ei Electronics"></Manufacturer>
+  <Manufacturer id="0087" name="Eka Systems"></Manufacturer>
+  <Manufacturer id="0034" name="El-Gev Electronics LTD"></Manufacturer>
+  <Manufacturer id="0389" name="Elear Solutions Tech Pvt. Ltd."></Manufacturer>
   <Manufacturer id="0033" name="Electronic Solutions Inc">
     <Product config="electronicsolutions/dbmz.xml" id="0002" name="DBMZ Motor Control" type="5250"/>
     <Product config="electronicsolutions/dbmz.xml" id="3032" name="DBMZ Motor Control" type="5250"/>
   </Manufacturer>
-  <Manufacturer id="0034" name="El-Gev Electronics">
+  <Manufacturer id="021f" name="Elexa Consumer Products Inc. (Dome)">
+    <Product config="dome/0002.xml" id="0002" name="Water Shut-Off Valve" type="0003"/>
+    <Product config="dome/0083.xml" id="0083" name="Motion Detector" type="0003"/>
+    <Product config="dome/0085.xml" id="0085" name="Leak Sensor" type="0003"/>
+    <Product config="dome/0086.xml" id="0086" name="Mouser" type="0003"/>
+    <Product config="dome/0087.xml" id="0087" name="On/Off Plug-In Switch" type="0003"/>
+    <Product config="dome/0088.xml" id="0088" name="Siren" type="0003"/>
+    <Product config="dome/0101.xml" id="0101" name="Door/Window Sensor" type="0003"/>
+    <Product config="dome/0201.xml" id="0201" name="Door/Window Sensor Pro" type="0003"/>
   </Manufacturer>
-  <Manufacturer id="001b" name="ELK Products">
+  <Manufacturer id="001b" name="ELK Products"></Manufacturer>
+  <Manufacturer id="0393" name="Embedded Data Systems"></Manufacturer>
+  <Manufacturer id="020B" name="Embedded System Design Limited"></Manufacturer>
+  <Manufacturer id="0035" name="Embedit A/S"></Manufacturer>
+  <Manufacturer id="0284" name="Empers Tech Co., Ltd."></Manufacturer>
+  <Manufacturer id="0336" name="EMT Controls"></Manufacturer>
+  <Manufacturer id="014d" name="Enblink">
+    <Product config="enblink/ss201-us-w_1308.xml" id="0001" name="SS201-US-W Z-Wave Controller" type="0001"/>
   </Manufacturer>
-  <Manufacturer id="0035" name="Embedit A/S">
+  <Manufacturer id="0219" name="Enwox Technologies s.r.o."></Manufacturer>
+  <Manufacturer id="006F" name="Erone">
+    <Product id="0001" name="Door/Window Sensor" type="0102"/>
+    <Product id="0001" name="HM-AM001 Plugin Appliance Module" type="0104"/>
   </Manufacturer>
+  <Manufacturer id="0160" name="Essence Security"></Manufacturer>
+  <Manufacturer id="029B" name="ESSENTIAL TECHNOLOGIES INC."></Manufacturer>
   <Manufacturer id="0148" name="EUROtronic">
     <Product config="eurotronic/eur_stellaz.xml" id="0001" name="EUR_STELLAZ Wall Radiator Thermostat Valve Control" type="0001"/>
     <Product config="eurotronic/eur_cometz.xml" id="0001" name="EUR_COMETZ Wall Radiator Thermostat Valve Control" type="0002"/>
-    <Product config="eurotronic/eur_spirit.xml" id="0001" name="EUR_SPIRIT Wall Radiator Thermostat Valve Control" type="0003" forumNr="77598"/>
-    <Product config="eurotronic/eur_spirit.xml" id="0003" name="EUR_SPIRIT Wall Radiator Thermostat Valve Control" type="0003" forumNr="77598"/>
+    <Product config="eurotronic/eur_spiritz.xml" id="0001" name="EUR_SPIRITZ Wall Radiator Thermostat" type="0003"/>
+    <Product config="eurotronic/eur_spiritz.xml" id="0002" name="EUR_SPIRITZ Wall Radiator Thermostat" type="0003"/>
+    <Product config="eurotronic/eur_spiritz.xml" id="0003" name="EUR_SPIRITZ Wall Radiator Thermostat" type="0003"/>
   </Manufacturer>
   <Manufacturer id="0128" name="Eneco">
     <Product id="0000" name="ED2.0 Meter Adapter" type="0000"/>
@@ -407,6 +521,7 @@
     <Product config="enerwave/zw15s.xml" id="0102" name="ZW15S 15A On/Off Switch" type="0101"/>
     <Product config="enerwave/zw20r.xml" id="0603" name="ZW20R 20A TR Duplex Receptacle" type="0101"/>
     <Product config="enerwave/zwnrsm1plus.xml" id="0605" name="ZWN-RSM1 PLUS—Smart Single Relay Switch Module" type="0111"/>
+    <!--<Product type="0111" id="0605" name="ZWN-RSM2-PLUS Smart Single Relay Switch Module" config="enerwave/zwnrsm2plus.xml"/>-->
     <Product config="enerwave/zw20rm.xml" id="0101" name="ZW20RM 20A TR Smart Meter Duplex Receptacle" type="0111"/>
     <Product config="enerwave/zw500d.xml" id="0201" name="ZW500D 500W In-Wall Preset Dimmer Switch" type="0102"/>
     <Product config="enerwave/zw15rmplus.xml" id="0105" name="ZW15RM Plus 15A TR Smart Meter Duplex Receptacle" type="0111"/>
@@ -414,13 +529,15 @@
   <Manufacturer id="0060" name="Everspring">
     <Product config="everspring/hsp02.xml" id="0001" name="HSP02 Motion Detector" type="0001"/>
     <Product config="everspring/sp814.xml" id="0002" name="SP814 Motion Detector" type="0001"/>
+    <Product config="everspring/sp815.xml" id="0004" name="SP815 Pet Immune Pir Motion Detector" type="0001"/>
     <Product config="everspring/sp816.xml" id="0005" name="SP816 Outdoor Motion Detector" type="0001"/>
     <Product config="everspring/sm103.xml" id="0001" name="SM103 Door/Window Sensor" type="0002"/>
-    <Product id="0001" name="AD142 Plug-in Dimmer Module" type="0003"/>
+    <Product config="everspring/lptdm1u.xml" id="0001" name="AD142 Plug-in Dimmer Module" type="0003"/>
     <Product config="everspring/ad147.xml" id="0003" name="AD147 Plug-in Dimmer Module" type="0003"/>
     <Product config="everspring/ad146.xml" id="0002" name="AD146 In wall Dimmer Module" type="0003"/>
     <Product config="everspring/an145.xml" id="0001" name="AN145 Lamp Screw In Module" type="0004"/>
     <Product config="everspring/an158.xml" id="0002" name="AN158 Plug-in Meter Appliance Module" type="0004"/>
+    <Product config="everspring/an163.xml" id="0005" name="AN163 Plug-in On/Off with meter function" type="0004"/>
     <Product config="everspring/an181.xml" id="0006" name="AN181 Miniplug On/Off with meter function" type="0004"/>
     <Product config="everspring/an180.xml" id="0007" name="AN180 Plug-in ON/OFF Module" type="0004"/>
     <Product config="everspring/an179.xml" id="0008" name="AN179 In wall ON/OFF Module" type="0004"/>
@@ -431,62 +548,67 @@
     <Product config="everspring/se812.xml" id="0001" name="SE812 Siren" type="000c"/>
     <Product config="everspring/sf812.xml" id="0001" name="SF812 Smoke Alarm" type="000d"/>
     <Product config="everspring/hac01.xml" id="0001" name="HAC01 In-wall Remote Module" type="0010"/>
-    <Product id="0001" name="HAN01 In-wall Switch Module" type="0011"/>
-    <Product id="0002" name="HAN02 In-wall Switch Module" type="0011"/>
+    <Product config="everspring/han01.xml" id="0001" name="HAN01 In-wall Switch Module" type="0011"/>
+    <Product config="everspring/han02-1.xml" id="0002" name="HAN02 In-wall Switch Module" type="0011"/>
     <Product config="everspring/sp103.xml" id="0001" name="SP103 PIR Motion Sensor" type="0101"/>
     <Product config="everspring/an145.xml" id="0001" name="AN145 Lamp Screw In Module" type="0104"/>
     <Product config="everspring/sm103.xml" id="0001" name="SM103 Door/Window Sensor" type="0202"/>
   </Manufacturer>
-  <Manufacturer id="014d" name="Enblink">
-    <Product id="0001" name="SS201-US-W Z-Wave Controller" type="0001"/>
-  </Manufacturer>
   <Manufacturer id="0113" name="Evolve Guest Controls">
     <Product config="evolve/lrm-as.xml" id="3034" name="LRM-AS Wall Dimmer 500W" type="4457"/>
-    <Product id="3133" name="LFM-20 Fixture Module" type="5246"/>
+    <Product config="evolve/lfm-20.xml" id="3133" name="LFM-20 Fixture Module" type="5246"/>
     <Product config="evolve/lsm-15.xml" id="3533" name="LSM-15 Wall Switch" type="5257"/>
-    <Product config="evolve/ltm-5.xml" id="3033" name="LTM-5 Wall Switch Transmitter" type="5457" />
-  </Manufacturer>
-  <Manufacturer id="0036" name="Exceptional Innv">
-  </Manufacturer>
-  <Manufacturer id="0004" name="Exhausto">
-  </Manufacturer>
-  <Manufacturer id="009f" name="Exigent">
+    <Product config="evolve/ltm-5.xml" id="3033" name="LTM-5 Wall Switch Transmitter" type="5457"/>
   </Manufacturer>
+  <Manufacturer id="036F" name="Evolvere SpA"></Manufacturer>
+  <Manufacturer id="0036" name="Exceptional Innovations"></Manufacturer>
+  <Manufacturer id="0004" name="Exhausto"></Manufacturer>
+  <Manufacturer id="009f" name="Exigent"></Manufacturer>
+  <Manufacturer id="0233" name="eZEX Corporation"></Manufacturer>
   <Manufacturer id="0085" name="Fakro">
     <Product config="fakro/zwp10.xml" id="0001" name="ZWP10 Remote Controller" type="0001"/>
-    <Product id="0002" name="ARZ Roof Window Roller Shutter" type="0002" />
-    <Product config="fakro/zws230.xml" id="0005" name="ZWS230 Chain actuator 230VAC" type="0002" />
-    <Product config="fakro/zws12.xml" id="0001" name="ZWS12 Chain actuator 12VDC" type="0003" />
-    <Product config="fakro/zws230.xml" id="0002" name="ZWS230 Chain actuator 230VAC" type="0003" />
+    <Product config="fakro/arz.xml" id="0002" name="ARZ Roof Window Roller Shutter" type="0002"/>
+    <Product config="fakro/zws230.xml" id="0005" name="ZWS230 Chain actuator 230VAC" type="0002"/>
+    <Product config="fakro/zws12.xml" id="0001" name="ZWS12 Chain actuator 12VDC" type="0003"/>
+    <Product config="fakro/zws230.xml" id="0002" name="ZWS230 Chain actuator 230VAC" type="0003"/>
     <Product config="fakro/zwrs.xml" id="0001" name="ZWRS Roller Shutter FLiRS module" type="0016"/>
   </Manufacturer>
+  <Manufacturer id="016a" name="Oomi">
+    <Product config="oomi/ft100.xml" id="0064" name="FT100 MultiSensor 6" type="0002"/>
+    <Product config="oomi/ft100.xml" id="0064" name="FT100 MultiSensor 6" type="0102"/>
+    <Product config="oomi/ft100.xml" id="0064" name="FT100 MultiSensor 6" type="0202"/>
+    <Product config="oomi/ft100.xml" id="0064" name="FT100 MultiSensor 6" type="1D02"/>
+    <Product config="oomi/ft111.xml" id="006F" name="FT111 In Wall Dimmer" type="0103"/>
+    <Product config="oomi/ft111.xml" id="006F" name="FT111 In Wall Dimmer" type="0203"/>
+    <Product config="oomi/ft111.xml" id="006F" name="FT111 In Wall Dimmer" type="1D03"/>
+  </Manufacturer>
   <Manufacturer id="010f" name="FIBARO System">
     <Product id="1000" name="HC2" type="0001" forumNr="no-statistics" />
-    <Product config="fibaro/fgbs001.xml" id="0101" name="FGBS001 Universal Binary Sensor" type="0501" />
-    <Product config="fibaro/fgbs001.xml" id="0102" name="FGBS001 Universal Binary Sensor" type="0501" />
-    <Product config="fibaro/fgbs001.xml" id="0109" name="FGBS001 Universal Binary Sensor" type="0501" />
-    <Product config="fibaro/fgbs001.xml" id="1002" name="FGBS001 Universal Binary Sensor" type="0501" />
-    <Product config="fibaro/fgbs001.xml" id="3002" name="FGBS001 Universal Binary Sensor" type="0501" />
-    <Product config="fibaro/fgbs001.xml" id="4002" name="FGBS001 Universal Binary Sensor" type="0501" />
-    <Product config="fibaro/fgbs222.xml" id="1000" name="FGBS222 Smart Implant" type="0502" />
-    <Product config="fibaro/fgd211.xml" id="0104" name="FGD211 Universal Dimmer 500W" type="0100" />
-    <Product config="fibaro/fgd211.xml" id="0106" name="FGD211 Universal Dimmer 500W" type="0100" />
-    <Product config="fibaro/fgd211.xml" id="0107" name="FGD211 Universal Dimmer 500W" type="0100" />
-    <Product config="fibaro/fgd211.xml" id="0109" name="FGD211 Universal Dimmer 500W" type="0100" />
-    <Product config="fibaro/fgd211.xml" id="100a" name="FGD211 Universal Dimmer 500W" type="0100" />
-    <Product config="fibaro/fgd211.xml" id="300a" name="FGD211 Universal Dimmer 500W" type="0100" />
-    <Product config="fibaro/fgd212.xml" id="1000" name="FGD212 Dimmer 2" type="0102" />
+    <Product config="fibaro/fgbs001.xml" id="0101" name="FGBS001 Universal Binary Sensor" type="0501"/>
+    <Product config="fibaro/fgbs001.xml" id="0102" name="FGBS001 Universal Binary Sensor" type="0501"/>
+    <Product config="fibaro/fgbs001.xml" id="0109" name="FGBS001 Universal Binary Sensor" type="0501"/>
+    <Product config="fibaro/fgbs001.xml" id="1002" name="FGBS001 Universal Binary Sensor" type="0501"/>
+    <Product config="fibaro/fgbs001.xml" id="3002" name="FGBS001 Universal Binary Sensor" type="0501"/>
+    <Product config="fibaro/fgbs001.xml" id="4002" name="FGBS001 Universal Binary Sensor" type="0501"/>
+    <Product config="fibaro/fgbs222.xml" id="1000" name="FGBS222 Smart Implant" type="0502"/>
+    <Product config="fibaro/fgd211.xml" id="0104" name="FGD211 Universal Dimmer 500W" type="0100"/>
+    <Product config="fibaro/fgd211.xml" id="0106" name="FGD211 Universal Dimmer 500W" type="0100"/>
+    <Product config="fibaro/fgd211.xml" id="0107" name="FGD211 Universal Dimmer 500W" type="0100"/>
+    <Product config="fibaro/fgd211.xml" id="0109" name="FGD211 Universal Dimmer 500W" type="0100"/>
+    <Product config="fibaro/fgd211.xml" id="100a" name="FGD211 Universal Dimmer 500W" type="0100"/>
+    <Product config="fibaro/fgd211.xml" id="300a" name="FGD211 Universal Dimmer 500W" type="0100"/>
+    <Product config="fibaro/fgd212.xml" id="1000" name="FGD212 Dimmer 2" type="0102"/>
     <Product config="fibaro/fgd212.xml" id="2000" name="FGD212 Dimmer 2" type="0102"/>
-    <Product config="fibaro/fgd212.xml" id="3000" name="FGD212 Dimmer 2" type="0102" />
-    <Product config="fibaro/fgd212.xml" id="4000" name="FGD212 Dimmer 2" type="0102" />
-    <Product config="fibaro/fgk001.xml" id="1000" name="FGK101 Door Opening Sensor" type="0700" />
-    <Product config="fibaro/fgk001.xml" id="2000" name="FGK10x Door Opening Sensor" type="0700" />
-    <Product config="fibaro/fgk001.xml" id="3000" name="FGK101 Door Opening Sensor" type="0700" />
-    <Product config="fibaro/fgk001.xml" id="4000" name="FGK101 Door Opening Sensor" type="0700" />
-    <Product config="fibaro/fgk10x.xml" id="1001" name="FGK10x Door Opening Sensor" type="0701" />
-    <Product config="fibaro/fgk10x.xml" id="2001" name="FGK10x Door Opening Sensor" type="0701" />
-    <Product config="fibaro/fgk10x.xml" id="3001" name="FGK10x Door Opening Sensor" type="0701" />
-    <Product config="fibaro/fgdw2.xml" id="1000" name="FGDW002 Door Opening Sensor 2" type="0702" />
+    <Product config="fibaro/fgd212.xml" id="3000" name="FGD212 Dimmer 2" type="0102"/>
+    <Product config="fibaro/fgd212.xml" id="4000" name="FGD212 Dimmer 2" type="0102"/>
+    <Product config="fibaro/fgk001.xml" id="1000" name="FGK101 Door Opening Sensor" type="0700"/>
+    <Product config="fibaro/fgk001.xml" id="2000" name="FGK10x Door Opening Sensor" type="0700"/>
+    <Product config="fibaro/fgk001.xml" id="3000" name="FGK101 Door Opening Sensor" type="0700"/>
+    <Product config="fibaro/fgk001.xml" id="4000" name="FGK101 Door Opening Sensor" type="0700"/>
+    <Product config="fibaro/fgk10x.xml" id="1001" name="FGK10x Door Opening Sensor" type="0701"/>
+    <Product config="fibaro/fgk10x.xml" id="2001" name="FGK10x Door Opening Sensor" type="0701"/>
+    <Product config="fibaro/fgk10x.xml" id="3001" name="FGK10x Door Opening Sensor" type="0701"/>
+    <Product config="fibaro/fgdw2.xml" id="1000" name="FGDW002 Door Opening Sensor 2" type="0702"/>
     <Product config="fibaro/fgr221.xml" id="0104" name="FGR221 Roller Shutter Controller" type="0300"/>
     <Product config="fibaro/fgr221.xml" id="100a" name="FGR221 Roller Shutter Controller" type="0300"/>
     <Product config="fibaro/fgr221.xml" id="0106" name="FGR221 Roller Shutter Controller" type="0300"/>
@@ -494,85 +616,102 @@
     <Product config="fibaro/fgr221.xml" id="0109" name="FGR221 Roller Shutter Controller" type="0300"/>
     <Product config="fibaro/fgrm222.xml" id="1001" name="FGRM222 Roller Shutter Controller 2" type="0301"/>
     <Product config="fibaro/fgrm222.xml" id="1000" name="FGRM222 Roller Shutter Controller 2" type="0302"/>
-    <Product config="fibaro/fgs211.xml" id="0104" name="FGS211 Switch 3kW" type="0400" />
-    <Product config="fibaro/fgs211.xml" id="0105" name="FGS211 Switch 3kW" type="0400" />
-    <Product config="fibaro/fgs211.xml" id="0106" name="FGS211 Switch 3kW" type="0400" />
-    <Product config="fibaro/fgs211.xml" id="0107" name="FGS211 Switch 3kW" type="0400" />
-    <Product config="fibaro/fgs211.xml" id="0108" name="FGS211 Switch 3kW" type="0400" />
-    <Product config="fibaro/fgs211.xml" id="0109" name="FGS211 Switch 3kW" type="0400" />
-    <Product config="fibaro/fgs211.xml" id="100a" name="FGS211 Switch 3kW" type="0400" />
-    <Product config="fibaro/fgs211.xml" id="400a" name="FGS211 Switch 3kW" type="0400" />
-    <Product config="fibaro/fgs212.xml" id="1002" name="FGS212 Switch 3kW" type="0402" />
-    <Product config="fibaro/fgs212.xml" id="3002" name="FGS212 Switch 3kW" type="0402" />
+    <Product config="fibaro/fgrm222.xml" id="4000" name="FGRM222 Roller Shutter Controller 2" type="0302"/>
+    <Product config="fibaro/fgr223.xml" id="1000" name="FGRM223 Roller Shutter Controller 3" type="0303"/>
+    <Product config="fibaro/fgs211.xml" id="0104" name="FGS211 Switch 3kW" type="0400"/>
+    <Product config="fibaro/fgs211.xml" id="0105" name="FGS211 Switch 3kW" type="0400"/>
+    <Product config="fibaro/fgs211.xml" id="0106" name="FGS211 Switch 3kW" type="0400"/>
+    <Product config="fibaro/fgs211.xml" id="0107" name="FGS211 Switch 3kW" type="0400"/>
+    <Product config="fibaro/fgs211.xml" id="0108" name="FGS211 Switch 3kW" type="0400"/>
+    <Product config="fibaro/fgs211.xml" id="0109" name="FGS211 Switch 3kW" type="0400"/>
+    <Product config="fibaro/fgs211.xml" id="100a" name="FGS211 Switch 3kW" type="0400"/>
+    <Product config="fibaro/fgs211.xml" id="400a" name="FGS211 Switch 3kW" type="0400"/>
+    <Product config="fibaro/fgs212.xml" id="1002" name="FGS212 Switch 3kW" type="0402"/>
+    <Product config="fibaro/fgs212.xml" id="3002" name="FGS212 Switch 3kW" type="0402"/>
+    <Product config="fibaro/fgs212.xml" id="4002" name="FGS212 Switch 3kW" type="0402"/>
     <Product config="fibaro/fgs213.xml" id="1000" name="FGS213 Switch" type="0403"/>
     <Product config="fibaro/fgs213.xml" id="2000" name="FGS213 Switch" type="0403"/>
     <Product config="fibaro/fgs213.xml" id="4000" name="FGS213 Switch" type="0403"/>
-    <Product config="fibaro/fgs221.xml" id="0104" name="FGS221 Double Relay Switch 2x1.5kW" type="0200" />
-    <Product config="fibaro/fgs221.xml" id="0105" name="FGS221 Double Relay Switch 2x1.5kW" type="0200" />
-    <Product config="fibaro/fgs221.xml" id="0106" name="FGS221 Double Relay Switch 2x1.5kW" type="0200" />
-    <Product config="fibaro/fgs221.xml" id="0107" name="FGS221 Double Relay Switch 2x1.5kW" type="0200" />
-    <Product config="fibaro/fgs221.xml" id="0109" name="FGS221 Double Relay Switch 2x1.5kW" type="0200" />
+    <Product config="fibaro/fgs221.xml" id="0104" name="FGS221 Double Relay Switch 2x1.5kW" type="0200"/>
+    <Product config="fibaro/fgs221.xml" id="0105" name="FGS221 Double Relay Switch 2x1.5kW" type="0200"/>
+    <Product config="fibaro/fgs221.xml" id="0106" name="FGS221 Double Relay Switch 2x1.5kW" type="0200"/>
+    <Product config="fibaro/fgs221.xml" id="0107" name="FGS221 Double Relay Switch 2x1.5kW" type="0200"/>
+    <Product config="fibaro/fgs221.xml" id="0109" name="FGS221 Double Relay Switch 2x1.5kW" type="0200"/>
     <Product config="fibaro/fgs221v102.xml" id="100a" name="FGS221 Double Relay Switch 2x1.5kW" type="0200" forumNr="35416" />
-    <Product config="fibaro/fgs221.xml" id="300a" name="FGS221 Double Relay Switch 2x1.5kW" type="0200" />
-    <Product config="fibaro/fgs221.xml" id="400a" name="FGS221 Double Relay Switch 2x1.5kW" type="0200" />
-    <Product config="fibaro/fgs222.xml" id="1002" name="FGS222 Double Relay Switch 2x1.5kW" type="0202" />
-    <Product config="fibaro/fgs222.xml" id="3002" name="FGS222 Double Relay Switch 2x1.5kW" type="0202" />
+    <Product config="fibaro/fgs221.xml" id="300a" name="FGS221 Double Relay Switch 2x1.5kW" type="0200"/>
+    <Product config="fibaro/fgs221.xml" id="400a" name="FGS221 Double Relay Switch 2x1.5kW" type="0200"/>
+    <Product config="fibaro/fgs222.xml" id="1002" name="FGS222 Double Relay Switch 2x1.5kW" type="0202"/>
+    <Product config="fibaro/fgs222.xml" id="3002" name="FGS222 Double Relay Switch 2x1.5kW" type="0202"/>
     <Product config="fibaro/fgs223.xml" id="1000" name="FGS223 Double Relay" type="0203"/>
     <Product config="fibaro/fgs223.xml" id="2000" name="FGS223 Double Relay" type="0203"/>
     <Product config="fibaro/fgs223.xml" id="3000" name="FGS223 Double Relay" type="0203"/>
+    <Product config="fibaro/fgs223.xml" id="4000" name="FGS223 Double Relay" type="0203"/>
     <Product config="fibaro/fgr223.xml" id="1000" name="FGR223 Roller Shutter Controller 3" type="0303"/>
-    <Product config="fibaro/fgwpe.xml" id="1000" name="FGWPE/F Wall Plug" type="0600" />
+    <Product config="fibaro/fgwpe.xml" id="1000" name="FGWPE/F Wall Plug" type="0600"/>
     <Product config="fibaro/fgwpe.xml" id="1000" name="FGWPE/F Wall Plug" type="0200"/>
-    <Product config="fibaro/fgwpfzw5.xml" id="1001" name="FGWPE/F Wall Plug Gen5" type="0602" />
-    <Product config="fibaro/fgwpfzw5.xml" id="1003" name="FGWPE/F Wall Plug Gen5" type="0602" />
-    <Product config="fibaro/fgms.xml" id="1001" name="FGMS001 Motion Sensor" type="0800" />
-    <Product config="fibaro/fgms.xml" id="2001" name="FGMS001 Motion Sensor" type="0800" />
-    <Product config="fibaro/fgms.xml" id="3001" name="FGMS001 Motion Sensor" type="0800" />
-    <Product config="fibaro/fgms.xml" id="4001" name="FGMS001 Motion Sensor" type="0800" />
+    <Product config="fibaro/fgwpfzw5.xml" id="1001" name="FGWPE/F Wall Plug Gen5" type="0602"/>
+    <Product config="fibaro/fgwpfzw5.xml" id="1003" name="FGWPE/F Wall Plug Gen5" type="0602"/>
+    <Product config="fibaro/fgms.xml" id="1001" name="FGMS001 Motion Sensor" type="0800"/>
+    <Product config="fibaro/fgms.xml" id="2001" name="FGMS001 Motion Sensor" type="0800"/>
+    <Product config="fibaro/fgms.xml" id="3001" name="FGMS001 Motion Sensor" type="0800"/>
+    <Product config="fibaro/fgms.xml" id="4001" name="FGMS001 Motion Sensor" type="0800"/>
     <Product config="fibaro/fgmszw5.xml" id="1001" name="FGMS001-ZW5 Motion Sensor" type="0801"/>
     <Product config="fibaro/fgmszw5.xml" id="1002" name="FGMS001-ZW5 Motion Sensor" type="0801"/>
     <Product config="fibaro/fgmszw5.xml" id="2001" name="FGMS001-ZW5 Motion Sensor" type="0801"/>
+    <Product config="fibaro/fgmszw5.xml" id="2002" name="FGMS001-ZW5 Motion Sensor" type="0801"/>
     <Product config="fibaro/fgmszw5.xml" id="3001" name="FGMS001-ZW5 Motion Sensor" type="0801"/>
-    <Product config="fibaro/fgfs101.xml" id="3001" name="FGFS101 Flood Sensor" type="0b00" />
-    <Product config="fibaro/fgfs101.xml" id="4001" name="FGFS101 Flood Sensor" type="0b00" />
-    <Product config="fibaro/fgfs101.xml" id="1001" name="FGFS101 Flood Sensor" type="0b00" />
-    <Product config="fibaro/fgfs101.xml" id="2001" name="FGFS101 Flood Sensor" type="0b00" />
-    <Product config="fibaro/fgfs101.xml" id="9e00" name="FGFS101 Flood Sensor" type="0b00" />
-    <Product config="fibaro/fgfs101zw5.xml" id="1002" name="FGFS101 Zwave+ Flood Sensor" type="0b01" />
-    <Product config="fibaro/fgfs101zw5.xml" id="1003" name="FGFS101 Zwave+ Flood Sensor" type="0b01" />
-    <Product config="fibaro/fgfs101zw5.xml" id="2002" name="FGFS101 Zwave+ Flood Sensor" type="0b01" />
-    <Product config="fibaro/fgrgbwm441.xml" id="1000" name="FGRGBWM441 RGBW Controller" type="0900" />
+    <Product config="fibaro/fgfs101.xml" id="3001" name="FGFS101 Flood Sensor" type="0b00"/>
+    <Product config="fibaro/fgfs101.xml" id="4001" name="FGFS101 Flood Sensor" type="0b00"/>
+    <Product config="fibaro/fgfs101.xml" id="1001" name="FGFS101 Flood Sensor" type="0b00"/>
+    <Product config="fibaro/fgfs101.xml" id="2001" name="FGFS101 Flood Sensor" type="0b00"/>
+    <Product config="fibaro/fgfs101.xml" id="9e00" name="FGFS101 Flood Sensor" type="0b00"/>
+    <Product config="fibaro/fgfs101zw5.xml" id="1002" name="FGFS101 Zwave+ Flood Sensor" type="0b01"/>
+    <Product config="fibaro/fgfs101zw5.xml" id="1003" name="FGFS101 Zwave+ Flood Sensor" type="0b01"/>
+    <Product config="fibaro/fgfs101zw5.xml" id="2002" name="FGFS101 Zwave+ Flood Sensor" type="0b01"/>
+    <Product config="fibaro/fgrgbwm441.xml" id="1000" name="FGRGBWM441 RGBW Controller" type="0900"/>
     <Product config="fibaro/fgrgbwm441.xml" id="2000" name="FGRGBWM441 RGBW Controller" type="0900"/>
-    <Product config="fibaro/fgrgbwm441.xml" id="4000" name="FGRGBWM441 RGBW Controller" type="0900" />
-    <Product config="fibaro/fgss101.xml" id="1000" name="FGSS101 Smoke Sensor" type="0c00" />
-    <Product config="fibaro/fgsd002.xml" id="1002" name="FGSD002 Smoke Sensor" type="0c02" />
-    <Product config="fibaro/fgsd002.xml" id="1003" name="FGSD002 Smoke Sensor" type="0c02" />
-    <Product config="fibaro/fggc001.xml" id="1000" name="FGGC001 Swipe" type="0d01" />
+    <Product config="fibaro/fgrgbwm441.xml" id="3000" name="FGRGBWM441 RGBW Controller" type="0900"/>
+    <Product config="fibaro/fgrgbwm441.xml" id="4000" name="FGRGBWM441 RGBW Controller" type="0900"/>
+    <Product config="fibaro/fgss101.xml" id="1000" name="FGSS101 Smoke Sensor" type="0c00"/>
+    <Product config="fibaro/fgsd002.xml" id="1002" name="FGSD002 Smoke Sensor" type="0c02"/>
+    <Product config="fibaro/fgsd002.xml" id="1003" name="FGSD002 Smoke Sensor" type="0c02"/>
+    <Product config="fibaro/fggc001.xml" id="1000" name="FGGC001 Swipe" type="0d01"/>
     <Product config="fibaro/fggc001.xml" id="2000" name="FGGC001 Swipe" type="0d01"/>
-    <Product config="fibaro/fgpb101.xml" id="1000" name="FGPB101 Button" type="0f01" />
-    <Product config="fibaro/fgpb101.xml" id="2000" name="FGPB101 Button" type="0f01" />
-    <Product config="fibaro/fgkf601.xml" id="1000" name="FGKF601 Keyfob" type="1001" />
-    <Product config="fibaro/fgkf601.xml" id="2000" name="FGKF601 Keyfob" type="1001" />
-    <Product config="fibaro/fgcd001.xml" id="1000" name="FGSD001 CO Sensor" type="1201" />
+    <Product config="fibaro/fgpb101.xml" id="1000" name="FGPB101 Button" type="0f01"/>
+    <Product config="fibaro/fgpb101.xml" id="2000" name="FGPB101 Button" type="0f01"/>
+    <Product config="fibaro/fgpb101.xml" id="3000" name="FGPB101 Button" type="0f01"/>
+    <Product config="fibaro/fgkf601.xml" id="1000" name="FGKF601 Keyfob" type="1001"/>
+    <Product config="fibaro/fgkf601.xml" id="2000" name="FGKF601 Keyfob" type="1001"/>
+    <Product config="fibaro/fgcd001.xml" id="1000" name="FGSD001 CO Sensor" type="1201"/>
+    <Product config="fibaro/fgcd001.xml" id="1001" name="FGSD001 CO Sensor" type="1201"/>
     <Product config="fibaro/fgt001.xml" id="1000" name="FGT001 Heat Controller" type="1301"/>
+    <Product config="fibaro/fgwpg111.xml" id="2000" name="FGWPG111 US Wall Plug" type="1701"/>
+    <Product config="fibaro/fgwpg111.xml" id="1000" name="FGWPG111 UK Wall Plug" type="1801"/>
+    <Product config="fibaro/fgwds221.xml" id="1000" name="FGWDS221 Walli Double Switch" type="1B01"/>
+    <Product config="fibaro/fgwd111.xml" id="1000" name="FGWD111 Walli Dimmer" type="1C01"/>
     <Product config="fibaro/fgwr111.xml" id="1000" name="FGWR111 Walli Roller Shutter" type="1d01"/>
   </Manufacturer>
-  <Manufacturer id="0138" name="First Alert">
+  <Manufacturer id="0295" name="fifthplay nv"></Manufacturer>
+  <Manufacturer id="0138" name="First Alert (BRK Brands Inc)">
     <Product config="firstalert/zcombo.xml" id="0002" name="ZCombo Smoke and Carbon Monoxide Detector" type="0001"/>
   </Manufacturer>
-  <Manufacturer id="0037" name="Foard Sys">
+  <Manufacturer id="002c" name="Flex Automation"></Manufacturer>
+  <Manufacturer id="004F" name="Flex Automation"></Manufacturer>
+  <Manufacturer id="018D" name="Flextronics"></Manufacturer>
+  <Manufacturer id="0024" name="Flue Sentinel"></Manufacturer>
+  <Manufacturer id="0037" name="Foard Systems"></Manufacturer>
+  <Manufacturer id="018F" name="Focal Point Limited"></Manufacturer>
+  <Manufacturer id="0137" name="FollowGood Technology Company">
+    <Product config="followgood/swz-1002.xml" id="0002" name="SWZ-1002 Binary Power Switch" type="3001"/>
   </Manufacturer>
-  <Manufacturer id="0137" name="Followgood">
-    <Product id="0002" name="SWZ-1002 Binary Power Switch" type="3001"/>
-  </Manufacturer>
-  <Manufacturer id="0207" name="Forest Group Nederland B.V.">
+  <Manufacturer id="0207" name="Forest Group Nederland B.V">
     <Product config="forest/fs2z5232000002.xml" id="0100" name="Shuttle L Z-Wave" type="0027"/>
   </Manufacturer>
   <Manufacturer id="0084" name="FortrezZ">
-    <Product id="0210" name="WWA-01AA - Wireless Water and Freeze Alarm" type="0013" />
+    <Product config="fortrezz/wwa-01aa.xml" id="0210" name="WWA-01AA - Wireless Water and Freeze Alarm" type="0013"/>
     <Product config="fortrezz/wwa02.xml" id="010a" name="WWA-02 Water and Temperature Alarm" type="0021"/>
     <Product config="fortrezz/wwa02.xml" id="0109" name="WWA-02 Water and Temperature Alarm" type="0023"/>
-    <Product id="0216" name="WWA-01AA Wireless Water and Freeze Alarm" type="0053" />
+    <Product id="0216" name="WWA-01AA Wireless Water and Freeze Alarm" type="0053"/>
     <Product config="fortrezz/wv01.xml" id="020c" name="WV-01 Automated Water Shut-Off Valve" type="0213"/>
     <Product config="fortrezz/wv01.xml" id="0300" name="WV-01 Automated Water Shut-Off Valve" type="0241"/>
     <Product config="fortrezz/wv01.xml" id="0216" name="WV-01 Automated Water Shut-Off Valve" type="0243"/>
@@ -589,24 +728,17 @@
     <Product config="fortrezz/mimo2plus.xml" id="0204" name="MIMO2+" type="0463"/>
     <Product config="fortrezz/mimo2plus.xml" id="0208" name="MIMO2+" type="0463"/>
     <Product config="fortrezz/fmi.xml" id="0110" name="FMI Flow Meter" type="0473"/>
-    <Product id="0111" name="GDC1 Siren/Strobe Light Alarm" type="0513"/>
+    <Product config="fortrezz/gdc1_fortrezz_1501.xml" id="0111" name="GDC1 Siren/Strobe Light Alarm" type="0513"/>
   </Manufacturer>
+  <Manufacturer id="011D" name="Foxconn"></Manufacturer>
+  <Manufacturer id="039C" name="Foxconn Industrial Internet"></Manufacturer>
   <Manufacturer id="0110" name="Frostdale">
-    <Product id="0001" name="Nanogrid: FDN2nxx light switch - where n is 1, 2, 3 or 4 buttons" type="2411"/>
+    <Product config="frostdale/fdn2311.xml" id="0001" name="Nanogrid: FDN2nxx light switch - where n is 1, 2, 3 or 4 buttons" type="2411"/>
     <Product config="frostdale/fdn2nxx.xml" id="0031" name="Nanogrid: FDN2nxx light switch - where n is 1, 2, 3 or 4 buttons" type="7333"/>
   </Manufacturer>
-  <Manufacturer id="0152" name="G.R.">
-    <Product id="0002" name="GR-201N In-Wall Switch" type="0003"/>
-    <Product config="gr/gr105n.xml" id="0512" name="GR105n Auto Valve" type="0003"/>
-    <Product config="gr/gr105.xml" id="0511" name="GR105 Auto Valve" type="0202"/>
-    <Product id="0000" name="Topvico Water Leckage Sensor" type="0500" forumNr="74705"/>
-    <Product id="0001" name="GR-309N Door/Window detector" type="0500"/>
-  </Manufacturer>
-  <Manufacturer id="0020" name="General Electric">
-    <Product id="1390" name="Wireless Lighting Control" type="8007"/>
-    <Product id="1391" name="45601 Advanced Remote" type="8007"/>
-  </Manufacturer>
-  <Manufacturer id="0063" name="GE">
+  <Manufacturer id="0305" name="Future Home AS"></Manufacturer>
+  <Manufacturer id="033E" name="GE"></Manufacturer>
+  <Manufacturer id="0063" name="GE (Jasco Products)">
     <Product config="ge/dimmer_module.xml" id="3030" name="45602 Lamp Dimmer Module" type="4450"/>
     <Product config="ge/dimmer.xml" id="3230" name="45606 2-Way Dimmer Switch" type="4457"/>
     <Product config="ge/12724-dimmer.xml" id="3031" name="12724 3-Way Dimmer Switch" type="4944"/>
@@ -615,59 +747,84 @@
     <Product config="ge/12724-dimmer.xml" id="3131" name="14287 Fan Control Switch" type="4944"/>
     <Product config="ge/14288-outlet.xml" id="3134" name="14288 In-Wall Tamper Resistant Smart Outlet" type="4952"/>
     <Product config="ge/14294-dimmer.xml" id="3038" name="14294 In-Wall Smart Dimmer" type="4944"/>
+    <Product config="ge/14294-dimmer.xml" id="3039" name="14299 In-Wall 1000W Smart Dimmer" type="4944"/>
     <Product config="ge/14295-dimmer-toggle.xml" id="3130" name="14295 In-Wall Smart Toggle Dimmer" type="4944"/>
     <Product config="ge/26931-motion-switch.xml" id="3032" name="26931 Smart Motion Switch" type="494d"/>
     <Product config="ge/26933-motion-dimmer.xml" id="3034" name="26933 Smart Motion Dimmer" type="494d"/>
     <Product config="ge/14291-switch.xml" id="3036" name="14291 In-Wall Smart Switch" type="4952"/>
     <Product config="ge/14292-toggle-switch.xml" id="3037" name="14292 In-Wall Smart Toggle Switch" type="4952"/>
     <Product config="ge/14292-toggle-switch.xml" id="3038" name="14293 In-Wall Smart Toggle Switch" type="4952"/>
-    <Product id="3030" name="45603 Plugin Appliance Module" type="5250"/>
+    <Product config="ge/45604.xml" id="3030" name="45603 Plugin Appliance Module" type="5250"/>
     <Product id="3130" name="45604 Outdoor Module" type="5250"/>
     <Product id="3031" name="12720 Outdoor Smart Switch" type="4f50"/>
+    <Product config="ge/14284.xml" id="3032" name="14284 Outdoor Smart Switch" type="4f50"/>
     <Product config="ge/receptacle.xml" id="3530" name="45605 Duplex Receptacle" type="5252"/>
+    <Product config="ge/28167-plugin-dimmer.xml" id="3038" name="28167/ZW3104 Plug-In Smart Dimmer (Single Plug)" type="5044"/>
     <Product config="ge/receptacle.xml" id="3133" name="14288 Duplex Receptacle" type="4952"/>
     <Product config="ge/relay.xml" id="3533" name="45609 On/Off Relay Switch" type="5257"/>
     <Product config="ge/dimmer.xml" id="3033" name="45613 3-Way Dimmer Switch" type="4457"/>
     <Product config="ge/receptacle.xml" id="3031" name="12721 Lighting Control Duplex Receptacle" type="4952"/>
     <Product config="ge/relay.xml" id="3032" name="12722 On/Off Relay Switch" type="4952"/>
-    <Product id="3033" name="12727 In-Wall Smart Switch (Toggle)" type="4952"/>
+    <Product config="ge/12727.xml" id="3033" name="12727 In-Wall Smart Switch (Toggle)" type="4952"/>
     <Product config="ge/hinge-pin.xml" id="3032" name="32563 Hinge Pin Smart Door Sensor" type="4953"/>
+    <Product config="ge/dimmer_module.xml" id="3031" name="12718 Plug-In Two-Outlet Smart Dimmer" type="5044"/>
     <Product config="ge/12719-plugin-switch.xml" id="3031" name="12719 Plug-in Smart Switch" type="5052"/>
     <Product config="ge/14282-plugin-switch.xml" id="3033" name="14282 Plug-In Two-Outlet Smart Switch" type="5052"/>
+    <Product config="ge/28169-plugin-switch.xml" id="3038" name="28169 Plug-In One-Outlet Smart Switch" type="5052"/>
     <Product config="ge/zw4001-switch.xml" id="3533" name="ZW4001 In-Wall Decora Style On/Off Relay Switch" type="6363"/>
     <Product config="ge/ze26i.xml" id="3031" name="ZW7101 Smart LED Light Bulb ZE26I" type="4c42"/>
     <Product config="ge/zw6302.xml" id="3133" name="ZW6302 Portable Smart Motion Sensor" type="4953"/>
     <Product config="ge/zw6302.xml" id="3134" name="ZW6302 Portable Smart Motion Sensor" type="4953"/>
   </Manufacturer>
-  <Manufacturer id="0014" name="GoControl">
-    <Product config="gocontrol/GC-TBZ48L.xml" id="5436" name="GC-TBZ48L Battery Powered Z-Wave Plus Thermostat" type="5442" />
+  <Manufacturer id="0408" name="Gerber Technology"></Manufacturer>
+  <Manufacturer id="025A" name="GES"></Manufacturer>
+  <Manufacturer id="022B" name="GKB Security Corporation"></Manufacturer>
+  <Manufacturer id="018A" name="Globalchina-Tech"></Manufacturer>
+  <Manufacturer id="0076" name="Goggin Research"></Manufacturer>
+  <Manufacturer id="0068" name="Good Way Technology Co. Ltd"></Manufacturer>
+  <Manufacturer id="0152" name="G.R.">
+    <Product config="gr/gr105.xml" id="0511" name="GR105 Auto Valve" type="0202"/>
+    <Product config="gr/gr105n.xml" id="0512" name="GR105n Auto Valve" type="0003"/>
+	<Product id="0000" name="Topvico Water Leckage Sensor" type="0500" forumNr="74705"/>
+    <Product config="gr/grb3.xml" id="0005" name="GRB3 Multichannel Switch" type="0500"/>
+    <Product config="gr/gr-302n.xml" id="0003" name="ZSE02 Motion Sensor" type="0500"/>
   </Manufacturer>
-  <Manufacturer id="026e" name="Graber">
-    <Product config="graber/brz1.xml" id="5a31" name="BRZ1 Remote Control" type="4252"/>
-    <Product id="5a31" name="RSZ1 Roller Shade" type="5253"/>
-    <Product config="graber/vcz1.xml" id="5a31" name="VCZ1 Virtual Cord Remote Control" type="5643"/>
-    <Product id="5a31" name="CSZ1 Cellular Shade" type="4353"/>
-  </Manufacturer>
-  <Manufacturer id="0099" name="GreenWave">
-    <Product id="0002" name="One Gateway" type="0001"/>
+  <Manufacturer id="0099" name="GreenWave Reality Inc">
+    <Product config="greenwave/gs1110-1-gr-1.xml" id="0002" name="One Gateway" type="0001"/>
     <Product config="greenwave/powernode1.xml" id="0002" name="PowerNode 1 port" type="0002"/>
     <Product config="greenwave/powernode6.xml" id="0004" name="PowerNode 6 port" type="0003"/>
   </Manufacturer>
-  <Manufacturer id="0208" name="Hank">
+  <Manufacturer id="0401" name="Grenton Sp. z o.o."></Manufacturer>
+  <Manufacturer id="018B" name="Grib"></Manufacturer>
+  <Manufacturer id="0391" name="GUANGDONG PHNIX ECO-ENERGY SOLUTION LTD"></Manufacturer>
+  <Manufacturer id="016D" name="Guangzhou Ruixiang M&amp;E Co. Ltd"></Manufacturer>
+  <Manufacturer id="0158" name="GuangZhou Zeewave Information Technology Co. Ltd"></Manufacturer>
+  <Manufacturer id="0395" name="Guangzhou_SIMT Limited"></Manufacturer>
+  <Manufacturer id="037B" name="Guardtec Inc"></Manufacturer>
+  <Manufacturer id="0287" name="HAB Home Intelligence LLC"></Manufacturer>
+  <Manufacturer id="030D" name="Hampoo"></Manufacturer>
+  <Manufacturer id="040A" name="Hangzhou Hikvision Digital Technology Co. Ltd"></Manufacturer>
+  <Manufacturer id="0387" name="HangZhou iMagic Technology Co. Ltd"></Manufacturer>
+  <Manufacturer id="0208" name="HANK Electronics Ltd">
     <Product config="hank/hkzw-so01-smartplug.xml" id="0005" name="HKZW-SO01 Smart Plug" type="0101"/>
     <Product config="hank/hkzw-so05-smartplug.xml" id="000a" name="HKZW-SO05 Smart Plug" type="0100"/>
     <Product config="hank/hkzw-ms01.xml" id="0006" name="HKZW-MS01 Multisensor" type="0200"/>
-    <Product config="hank/hkzw-ms02.xml" id="0012" name="HKZW-MS02 Motion Sensor" type="0200"/>
+    <Product config="hank/hkzw-ms02-200.xml" id="0012" name="HKZW-MS02 Motion Sensor" type="0200"/>
     <Product config="hank/hkzw-dws01.xml" id="0008" name="HKZW-DWS01 Door/Window Sensor" type="0200"/>
     <Product config="hank/hkzw-dws01.xml" id="0008" name="HKZW-DWS01 Door/Window Sensor" type="0201"/>
     <Product config="hank/scenecontroller1.xml" id="0009" name="HKZW-SCN01 Scene Controller" type="0200"/>
     <Product config="hank/scenecontroller4.xml" id="000b" name="HKZW-SCN04 Scene Controller" type="0200"/>
+    <Product config="hank/scenecontroller4.xml" id="000b" name="HKZW-SCN04 Scene Controller" type="0201"/>
     <Product config="hank/hkzw-rgb01.xml" id="0004" name="HKZW-RGB01 RGB bulb" type="0100"/>
     <Product config="hank/hkzw-rgb01.xml" id="0004" name="HKZW-RGB01 RGB bulb" type="0101"/>
     <Product config="hank/hkzw-so03.xml" id="000a" name="HKZW-SO03 Smart Plug" type="0101"/>
     <Product config="hank/hkzw-fld01.xml" id="000f" name="HKZW-FLD01 Flood Sensor" type="0200"/>
   </Manufacturer>
-  <Manufacturer id="0260" name="Heiman">
+  <Manufacturer id="024C" name="Hankook Gas Kiki CO.LTD"></Manufacturer>
+  <Manufacturer id="025C" name="Hauppauge"></Manufacturer>
+  <Manufacturer id="0073" name="Hawking Technologies Inc"></Manufacturer>
+  <Manufacturer id="040C" name="HEIGHTS TELECOM T LTD"></Manufacturer>
+  <Manufacturer id="0260" name="Heiman Technology Co. Ltd">
     <Product config="heiman/HS1DS-Z.xml" id="0168" name="Door Sensor HS1DS-Z" type="0168"/>
     <Product config="heiman/HS1MS-Z.xml" id="1000" name="Motion Sensor HS1MS-Z" type="8001"/>
     <Product config="heiman/HS1SA-Z.xml" id="1000" name="Smart Smoke Sensor HS1SA-Z" type="8002"/>
@@ -678,42 +835,58 @@
     <Product config="heiman/HS1HT-Z.xml" id="1000" name="Temperature Humidity Sensor HS1HT-Z" type="8007"/>
     <Product config="heiman/HS2SK-Z.xml" id="1000" name="Smart Plug HS2SK-Z" type="8008"/>
   </Manufacturer>
-  <Manufacturer id="0017" name="HiTech Automation">
+  <Manufacturer id="0344" name="HELTUN">
+    <Product config="heltun/he-zw-therm-fl2.xml" id="0001" name="HE-ZW-THERM-FL2 Heating Thermostat" type="0003"/>
+    <Product config="heltun/he-zw-sw-5a-1.xml" id="0003" name="HE-ZW-SW-5A-1 Touch Panel Switch" type="0003"/>
+    <Product config="heltun/he-zw-therm-fc1.xml" id="0002" name="HE-ZW-THERM-FC1 Fan Coil Thermostat" type="0003"/>
   </Manufacturer>
-  <Manufacturer id="005b" name="HAI">
-  </Manufacturer>
-  <Manufacturer id="009a" name="Home Auto. Euro">
-  </Manufacturer>
-  <Manufacturer id="0038" name="Home Director">
-  </Manufacturer>
-  <Manufacturer id="006f" name="Home Manageables">
-    <Product id="0001" name="Door/Window Sensor" type="0102"/>
-    <Product id="0001" name="HM-AM001 Plugin Appliance Module" type="0104"/>
-  </Manufacturer>
-  <Manufacturer id="0080" name="Homepro">
-  </Manufacturer>
-  <Manufacturer id="001e" name="Homeseer">
+  <Manufacturer id="020F" name="Herald Datanetics Limited"></Manufacturer>
+  <Manufacturer id="0017" name="HiTech Automation"></Manufacturer>
+  <Manufacturer id="024C" name="Hankook Gas Kiki CO.LTD"></Manufacturer>
+  <Manufacturer id="025C" name="Hauppauge"></Manufacturer>
+  <Manufacturer id="0073" name="Hawking Technologies Inc"></Manufacturer>
+  <Manufacturer id="040C" name="HEIGHTS TELECOM T LTD"></Manufacturer>
+  <Manufacturer id="0344" name="HELTUN"></Manufacturer>
+  <Manufacturer id="020F" name="Herald Datanetics Limited"></Manufacturer>
+  <Manufacturer id="0017" name="HiTech Automation"></Manufacturer>
+  <Manufacturer id="0181" name="Holion Electronic Engineering Co. Ltd"></Manufacturer>
+  <Manufacturer id="013E" name="Holtec Electronics BV"></Manufacturer>
+  <Manufacturer id="000D" name="Home Automated Living"></Manufacturer>
+  <Manufacturer id="009a" name="Home Automation Europe"></Manufacturer>
+  <Manufacturer id="005b" name="Home Automation Inc."></Manufacturer>
+  <Manufacturer id="0293" name="Home controls"></Manufacturer>
+  <Manufacturer id="0038" name="Home Director"></Manufacturer>
+  <Manufacturer id="0070" name="Homemanageables Inc"></Manufacturer>
+  <Manufacturer id="0050" name="Homepro"></Manufacturer>
+  <Manufacturer id="0162" name="HomeScenario"></Manufacturer>
+  <Manufacturer id="001e" name="Homeseer (Express Controls)">
     <Product config="homeseer/ztroller.xml" id="0002" name="ZTroller" type="0001"/>
     <Product config="homeseer/hsm100.xml" id="0001" name="HSM100 Wireless Multi-Sensor" type="0002"/>
     <Product config="homeseer/ezmotionplus.xml" id="0002" name="EZMotion+ 3-in-1 Sensor" type="0002"/>
     <Product config="homeseer/hsm200.xml" id="0001" name="HSM200 Wireless Multi-Sensor" type="0004"/>
   </Manufacturer>
-  <Manufacturer id="000c" name="HomeSeer">
+  <Manufacturer id="000c" name="HomeSeer Technologies">
     <Product config="homeseer/hs-ws100plus.xml" id="3033" name="HS-WS100+ Wall Switch" type="4447"/>
     <Product config="homeseer/hs-wd100plus.xml" id="3034" name="HS-WD100+ Wall Dimmer" type="4447"/>
     <Product config="homeseer/hs-ws200plus.xml" id="3035" name="HS-WS200+ Wall Switch" type="4447"/>
     <Product config="homeseer/hs-wd200plus.xml" id="3036" name="HS-WD200+ Wall Dimmer" type="4447"/>
-    <Product config="homeseer/hs-ms100plus.xml" id="0009" name="HS-MS100+ Motion Sensor" type="0201"/>
-    <Product config="homeseer/hs-ls100plus.xml" id="000a" name="HS-LS100+ Leak Sensor" type="0201"/>
-    <Product config="homeseer/hs-wd200plus.xml" id="3036" name="HS-WD200+ Wall Dimmer" type="4447"/>
-  </Manufacturer>
-  <Manufacturer id="0030" name="HomeSeer Tech">
+    <Product type="201" id="8" name="HS-DS100+ Door/Window Sensor" config="homeseer/hs-ds100plus.xml"/>
+    <Product config="homeseer/hs-ms100plus.xml" id="9" name="HS-MS100+ Motion Sensor" type="201"/>
+    <Product config="homeseer/hs-ls100plus.xml" id="a" name="HS-LS100+ Leak Sensor" type="201"/>
+    <Product config="homeseer/hs-fls100plus.xml" id="000b" name="HS-FLS100+ Floodlight Sensor" type="0201"/>
+    <Product config="homeseer/hs-fc200plus.xml" id="0001" name="HS-FC200+ Z-Wave Plus Fan Controller" type="0203"/>
   </Manufacturer>
+  <Manufacturer id="0275" name="Honest Technology"></Manufacturer>
+  <Manufacturer id="023D" name="Honest Technology Co. Ltd"></Manufacturer>
   <Manufacturer id="0039" name="Honeywell">
     <Product config="honeywell/th8320zw1000.xml" id="0001" name="TH8320ZW1000 Touchscreen Thermostat" type="0011"/>
+    <Product config="honeywell/th6320zw2003.xml" id="0008" name="TH6320ZW2003 T6 Pro Series Thermostat" type="0011"/>
     <Product config="honeywell/lynx-touch-l5100.xml" id="0003" name="Lynx Touch L5100 / L7000" type="0001"/>
+    <Product config="honeywell/39351-ZW3005.xml" id="3038" name="39351 / ZW3005 In-Wall Smart Dimmer" type="4944"/>
   </Manufacturer>
-  <Manufacturer id="0059" name="Horstmann">
+  <Manufacturer id="0313" name="Hoppe"></Manufacturer>
+  <Manufacturer id="0377" name="HORNBACH Baumarkt AG"></Manufacturer>
+  <Manufacturer id="0059" name="Horstmann (Secure Meters)">
     <Product id="0001" name="ASR-RF Thermostat Receiver" type="0001"/>
     <Product id="0002" name="AS2-RF Thermostat Transmitter" type="0001"/>
     <Product config="horstmann/hrt4zw.xml" id="0003" name="HRT4-ZW Thermostat Transmitter" type="0001"/>
@@ -721,27 +894,43 @@
     <Product config="horstmann/srt321.xml" id="0005" name="SRT-321 Thermostat-HVAC" type="0001"/>
     <Product config="horstmann/asrzw.xml" id="0001" name="ASR-ZW Thermostat Receiver" type="0003"/>
     <Product config="horstmann/ssr302.xml" id="0002" name="SSR 302 2-zone Thermostat Receiver" type="0003"/>
+    <Product config="horstmann/ssr303.xml" id="0005" name="SSR 303 Thermostat Receiver" type="0003"/>
     <Product config="horstmann/scsc17.xml" id="0001" name="SCSC17 Thermostat" type="0004"/>
-    <Product id="0001" name="SES 301 Temperature Sensor" type="000d"/>
+    <Product config="horstmann/ses301.xml" id="0001" name="SES 301 Temperature Sensor" type="000d"/>
     <Product config="horstmann/ses302.xml" id="0002" name="SES 302 Temperature Sensor" type="000d"/>
     <Product config="horstmann/ses303.xml" id="0003" name="SES 303 Temperature and Humidity Sensor" type="000d"/>
     <Product id="0001" name="SWM01 Water Meter Sensor" type="000f"/>
     <Product config="horstmann/sir321.xml" id="0001" name="SIR321 RF Countdown Timer" type="0010"/>
     <Product config="horstmann/sir321.xml" id="0002" name="SIR321 RF Countdown Timer with temperature" type="0010"/>
   </Manufacturer>
-  <Manufacturer id="0121" name="IBR-ZW">
-    <Product id="0001" name="I-Bridge Z-Wave Controller" type="0001"/>
-  </Manufacturer>
-  <Manufacturer id="0011" name="iCOM Tech">
-  </Manufacturer>
-  <Manufacturer id="0230" name="ID Lock">
-    <Product config="idlock/idlock101.xml" id="0001" name="ID Lock 101" type="0003"/>
+  <Manufacturer id="0298" name="Horus Smart Control"></Manufacturer>
+  <Manufacturer id="0221" name="HOSEOTELNET"></Manufacturer>
+  <Manufacturer id="0180" name="Huapin Information Technology Co.Ltd"></Manufacturer>
+  <Manufacturer id="025F" name="Huawei Device Co. Ltd"></Manufacturer>
+  <Manufacturer id="024B" name="Huawei Technologies Co. Ltd"></Manufacturer>
+  <Manufacturer id="007C" name="Hunter Douglas"></Manufacturer>
+  <Manufacturer id="0374" name="Hyundai Telecom"></Manufacturer>
+  <Manufacturer id="038A" name="iamsmart"></Manufacturer>
+  <Manufacturer id="0218" name="iAutomade Pte Ltd"></Manufacturer>
+  <Manufacturer id="0011" name="iCOM Technology b.v."></Manufacturer>
+  <Manufacturer id="0106" name="Icontrol Networks"></Manufacturer>
+  <Manufacturer id="0373" name="ID Lock AS">
+    <Product config="idlock/idlock150.xml" id="0001" name="150" type="0003"/>
   </Manufacturer>
+  <Manufacturer id="019E" name="iEXERGY GmbH"></Manufacturer>
+  <Manufacturer id="031C" name="Ilevia srl"></Manufacturer>
+  <Manufacturer id="0056" name="Impact Technologies and Products"></Manufacturer>
+  <Manufacturer id="0061" name="Impact Technologies BV"></Manufacturer>
+  <Manufacturer id="0385" name="Inergy Systems LLC"></Manufacturer>
+  <Manufacturer id="012B" name="Infusion Development"></Manufacturer>
+  <Manufacturer id="006C" name="Ingersoll Rand (Schlage)"></Manufacturer>
   <Manufacturer id="011f" name="Ingersoll Rand">
     <Product config="ingersoll/dwzwave1.xml" id="0002" name="DWZWAVE1" type="0001"/>
   </Manufacturer>
-  <Manufacturer id="003a" name="Inlon Srl">
-  </Manufacturer>
+  <Manufacturer id="0256" name="Inkel Corp"></Manufacturer>
+  <Manufacturer id="003a" name="Inlon Srl"></Manufacturer>
+  <Manufacturer id="0141" name="Innoband Technologies Inc"></Manufacturer>
+  <Manufacturer id="0382" name="INNOPIA Technologies Inc"></Manufacturer>
   <Manufacturer id="0077" name="Innovus">
     <Product id="0001" name="SmoothRemote Controller" type="0002"/>
     <Product id="0002" name="RAone SmartPower Wall Appliance Module" type="0001"/>
@@ -763,10 +952,11 @@
     <Product config="inovelli/nzw96.xml" id="6000" name="NZW96 1-Channel Outdoor Smart Plug" type="6000"/>
     <Product config="inovelli/nzw97.xml" id="6100" name="NZW97 2-Channel Outdoor Smart Plug" type="6100"/>
   </Manufacturer>
-  <Manufacturer id="0006" name="Intel">
-  </Manufacturer>
-  <Manufacturer id="001c" name="IntelliCon">
-  </Manufacturer>
+  <Manufacturer id="031E" name="Inovelli"></Manufacturer>
+  <Manufacturer id="0100" name="Insignia"></Manufacturer>
+  <Manufacturer id="0006" name="Intel"></Manufacturer>
+  <Manufacturer id="001c" name="IntelliCon"></Manufacturer>
+  <Manufacturer id="0072" name="Interactive Electronics Systems"></Manufacturer>
   <Manufacturer id="0005" name="Intermatic">
     <Product id="0003" name="HA-02 Appliance Module" type="0002"/>
     <Product id="0003" name="HA-03WD Lamp Module" type="0003"/>
@@ -779,35 +969,52 @@
     <Product config="intermatic/ca8900.xml" id="8900" name="CA8900 Digital Thermostat" type="4341"/>
     <Product id="9000" name="CA9000 PIR Occupancy Sensor" type="4341"/>
   </Manufacturer>
-  <Manufacturer id="0013" name="Internet Dom">
-  </Manufacturer>
-  <Manufacturer id="0126" name="Iris">
-    <Product config="iris/rangeextender.xml" id="0001" name="Range Extender" type="0002"/>
-  </Manufacturer>
-  <Manufacturer id="0123" name="Iwatsu Electric Co">
+  <Manufacturer id="0338" name="International Integrated Systems Inc"></Manufacturer>
+  <Manufacturer id="0013" name="Internet Dom"></Manufacturer>
+  <Manufacturer id="0288" name="INTERSOFT"></Manufacturer>
+  <Manufacturer id="039E" name="Invalance"></Manufacturer>
+  <Manufacturer id="0278" name="Inventec"></Manufacturer>
+  <Manufacturer id="0368" name="IOOOTA"></Manufacturer>
+  <Manufacturer id="005F" name="IQ-Group"></Manufacturer>
+  <Manufacturer id="0212" name="iRevo"></Manufacturer>
+  <Manufacturer id="0253" name="iungo.nl B.V."></Manufacturer>
+  <Manufacturer id="0123" name="IWATSU">
     <Product id="0000" name="TM-H2VHD081 HA Dongle" type="0000"/>
-    <Product id="0102" name="NE-4CT-2P Electric Power Measuring Equipment" type="0102"/>
-    <Product id="0103" name="NE-4CT Electric Power Measuring Equipment" type="0103"/>
+    <Product config="iwatsu/ne-4ct-2p.xml" id="0102" name="NE-4CT-2P Electric Power Measuring Equipment" type="0102"/>
+    <Product config="iwatsu/ne-4ct.xml" id="0103" name="NE-4CT Electric Power Measuring Equipment" type="0103"/>
   </Manufacturer>
-  <Manufacturer id="0214" name="Kaipule">
+  <Manufacturer id="015A" name="Jin Tao Bao"></Manufacturer>
+  <Manufacturer id="039F" name="JLabs Corporation"></Manufacturer>
+  <Manufacturer id="0164" name="JSW Pacific Corporation"></Manufacturer>
+  <Manufacturer id="0214" name="Kaipule Technology Co. Ltd">
     <Product config="kaipule/im20.xml" id="0001" name="IM20 Door/Window Sensor" type="0002"/>
     <Product config="kaipule/ix32.xml" id="0002" name="PIR Celling Sensor" type="0003"/>
   </Manufacturer>
-  <Manufacturer id="0091" name="Kamstrup">
-  </Manufacturer>
-  <Manufacturer id="0090" name="Kwikset">
+  <Manufacturer id="0091" name="Kamstrup A/S"></Manufacturer>
+  <Manufacturer id="006A" name="Kellendonk Elektronik"></Manufacturer>
+  <Manufacturer id="0114" name="Kichler"></Manufacturer>
+  <Manufacturer id="035F" name="KIWILAB"></Manufacturer>
+  <Manufacturer id="0139" name="KlickH Pvt Ltd"></Manufacturer>
+  <Manufacturer id="0261" name="KOOL KONCEPTS"></Manufacturer>
+  <Manufacturer id="0174" name="Kopera Development Inc"></Manufacturer>
+  <Manufacturer id="023A" name="KUMHO ELECTRIC INC"></Manufacturer>
+  <Manufacturer id="0090" name="Kwikset (Spectrum Brands)">
     <Product config="kwikset/smartcode.xml" id="0001" name="Touchpad Electronic Deadbolt" type="0001"/>
+    <Product config="kwikset/smartcode.xml" id="0642" name="SmartCode 916" type="0003"/>
+    <Product config="kwikset/smartcode.xml" id="0440" name="SmartCode 914" type="0003"/>
+    <Product config="kwikset/smartcode.xml" id="0440" name="SmartCode 10" type="0006"/>
   </Manufacturer>
-  <Manufacturer id="0051" name="Lagotek Corp">
-  </Manufacturer>
+  <Manufacturer id="0051" name="Lagotek Corp"></Manufacturer>
+  <Manufacturer id="0173" name="Leak Intelligence LLC"></Manufacturer>
+  <Manufacturer id="0300" name="LEEDARSON LIGHTING CO. LTD"></Manufacturer>
+  <Manufacturer id="0187" name="LEVION Technologies GmbH"></Manufacturer>
   <Manufacturer id="001d" name="Leviton">
     <Product id="0206" name="RZP15-1LW Binary Scene Switch" type="0101"/>
-    <Product id="0206" name="RZP03-1LW Binary Scene Switch" type="0201"/>
+    <Product config="leviton/vrcs2.xml" id="0206" name="RZP03-1LW Binary Scene Switch" type="0201"/>
     <Product id="030b" name="VRP03-1LW Lamp Module" type="0202"/>
     <Product id="0206" name="RZS15-1LX Binary Scene Switch" type="0301"/>
     <Product id="0209" name="VRS15-1LZ Binary Scene Switch" type="0301"/>
-    <Product id="0209" name="VRS15-1LZ Switch" type="0301"/>
-    <Product id="0334" name="VRS15-1LZ Switch" type="0301"/>
+    <Product config="leviton/vrs15.xml" id="0334" name="VRS15-1LZ Switch" type="0301"/>
     <Product config="leviton/rzi10.xml" id="0206" name="RZI10-1LX Multilevel Scene Switch" type="0401"/>
     <Product config="leviton/vri06.xml" id="0209" name="VRI06-1LX Multilevel Scene Switch" type="0401"/>
     <Product config="leviton/vri10.xml" id="0206" name="VRI10-1LX Multilevel Scene Switch" type="0501"/>
@@ -815,14 +1022,14 @@
     <Product config="leviton/vri10.xml" id="0209" name="VRMX1-1LZ Multilevel Scene Switch" type="0602"/>
     <Product config="leviton/vri10.xml" id="0334" name="VRMX1-1LZ Multilevel Scene Switch" type="0602"/>
     <Product id="0215" name="VRC51-1LX One Scene Controller" type="0901"/>
-    <Product id="0261" name="VRCZ4-M0Z 4-Button Zone Controller" type="0702"/>
+    <Product config="leviton/vrcz4.xml" id="0261" name="VRCZ4-M0Z 4-Button Zone Controller" type="0702"/>
     <Product id="030b" name="VRC0P-1LW Plug-in Serial Interface Module" type="0b02"/>
     <Product config="leviton/vrcpg.xml" id="0206" name="VRCPG-SG RF Handheld Remote Controller" type="0c01"/>
-    <Product config="leviton/vrf01.xml" id="0209" name="VRF01-1LZ Quiet Fan Speed Control" type="1001"/>
+    <Product config="leviton/vre06.xml" id="0334" name="VRE06-1LZ Multilevel Scene Switch" type="0e01"/>
+    <Product config="leviton/vrf01.xml" id="0209" name="VRF01-1LZ Scene Capable Quiet Fan Speed Control" type="1001"/>
     <Product config="leviton/vrf01.xml" id="0334" name="VRF01-1LZ Quiet Fan Speed Control" type="1001"/>
-    <Product config="leviton/vrf01.xml" id="0209" name="VRF01-1LZ Multilevel Scene Switch - 1.5A Fan" type="1001"/>
     <Product id="0243" name="VRCS2-MRZ 2-Button Scene Controller with Switches" type="1102"/>
-    <Product id="0243" name="VRCZ4-MRZ 4-Button Zone Controller with Switch" type="1202"/>
+    <Product config="leviton/vrcz4.xml" id="0243" name="VRCZ4-MRZ 4-Button Zone Controller with Switch" type="1202"/>
     <Product id="0334" name="DZPD3-1LW Plug-In Dimming Lamp Module" type="1902"/>
     <Product id="0334" name="DZPA1-1LW Plug-In Appliance Module" type="1a02"/>
     <Product id="0334" name="DZMX1-1LZ Dimmer" type="1b03"/>
@@ -832,9 +1039,16 @@
     <Product config="leviton/dz6hd.xml" id="0001" name="DZ1KD-1BZ Decora 1000W Smart Dimmer" type="3301"/>
     <Product config="leviton/dz15s.xml" id="0001" name="DZ15S-1BZ Decora Smart Switch" type="3401"/>
     <Product config="leviton/dzpd3.xml" id="0001" name="DZPD3-2BW Decora 300W Plug-In Smart Dimmer" type="3501"/>
-    <Product config="leviton/dz15s.xml" id="0001" name="DZPA1-2BW Plug-In Outlet" type="3601"/>
+    <Product config="leviton/dz15s.xml" id="0001" name="Leviton DZPA1 Plug-In Outlet" type="3601"/>
   </Manufacturer>
-  <Manufacturer id="014f" name="Linear">
+  <Manufacturer id="0015" name="Lexel"></Manufacturer>
+  <Manufacturer id="015B" name="LG Electronics"></Manufacturer>
+  <Manufacturer id="0362" name="LiaoningYouwang Lighting and Electronic Technology Pty Ltd"></Manufacturer>
+  <Manufacturer id="0224" name="LifeShield LLC"></Manufacturer>
+  <Manufacturer id="003C" name="Lifestyle Networks"></Manufacturer>
+  <Manufacturer id="0210" name="Light Engine Limited"></Manufacturer>
+  <Manufacturer id="0342" name="LIMEI"></Manufacturer>
+  <Manufacturer id="014f" name="Linear (Nortek Security Control LLC)">
     <Product config="linear/WADWAZ-1.xml" id="0102" name="WADWAZ-1 Door/Window Sensor" type="2001"/>
     <Product config="linear/WAPIRZ-1.xml" id="0203" name="WAPIRZ-1 Motion Sensor" type="2002"/>
     <Product config="linear/WA105DBZ-1.xml" id="0903" name="WA105DBZ-1 Main Operated Siren" type="2009"/>
@@ -842,8 +1056,8 @@
     <Product config="linear/WD500Z-1.xml" id="3034" name="WD500Z-1 Wall Dimmer Switch" type="4457"/>
     <Product id="3331" name="WD1000Z-1 Wall Dimmer Switch" type="4457"/>
     <Product id="3030" name="GD00Z-4 Garage Door Opener Remote Controller" type="4744"/>
-    <Product id="3530" name="GD00Z-4 Garage Door Opener Remote Controller" type="4744"/>
-    <Product id="3531" name="GD00Z-7 Garage Door Opener Remote Controller" type="4744"/>
+    <Product config="linear/ngd00z.xml" id="3530" name="GD00Z-4 Garage Door Opener Remote Controller" type="4744"/>
+    <Product config="linear/gd00z-7.xml" id="3531" name="GD00Z-7 Garage Door Opener Remote Controller" type="4744"/>
     <Product config="linear/LB60Z-1.xml" id="3038" name="LB60Z-1 Dimmable LED Light Bulb" type="4754"/>
     <Product id="3133" name="FS20Z Isolated Contact Fixture Module" type="5246"/>
     <Product id="3030" name="PS15Z-2 Plug-in Appliance Module" type="5250"/>
@@ -851,11 +1065,15 @@
     <Product config="linear/WS15Z-1.xml" id="3533" name="WS15Z-1 Wall Switch" type="5257"/>
     <Product config="linear/WA00Z-1.xml" id="3132" name="WA00Z-1 Scene Switch" type="5343"/>
     <Product config="linear/WT00Z-1.xml" id="3033" name="WT00Z-1 3-Way Wall Accessory Switch" type="5457"/>
-    <Product config="linear/GC-TBZ48.xml" id="5431" name="GC-TBZ48 Battery Powered Z-Wave Thermostat" type="5442" />
-    <Product config="linear/GC-TBZ48.xml" id="5436" name="GC-TBZ48 Battery Powered Z-Wave Thermostat" type="5442" />
-    <Product config="linear/GC-TBZ48.xml" id="5437" name="GC-TBZ48 Battery Powered Z-Wave Thermostat" type="5442" />
-    <Product config="linear/WD500Z5-1.xml" id="3530" name="WD500Z5-1 Wall Mounted Dimmer" type="5744" />
+    <Product config="linear/GC-TBZ48.xml" id="5431" name="GC-TBZ48 Battery Powered Z-Wave Thermostat" type="5442"/>
+    <Product config="linear/GC-TBZ48.xml" id="5436" name="GC-TBZ48 Battery Powered Z-Wave Thermostat" type="5442"/>
+    <Product config="linear/GC-TBZ48.xml" id="5437" name="GC-TBZ48 Battery Powered Z-Wave Thermostat" type="5442"/>
+    <Product config="linear/WD500Z5-1.xml" id="3530" name="WD500Z5-1 Wall Mounted Dimmer" type="5744"/>
   </Manufacturer>
+  <Manufacturer id="035C" name="LINK ELECTRONICS Co. Ltd"></Manufacturer>
+  <Manufacturer id="0316" name="Lite Automation"></Manufacturer>
+  <Manufacturer id="017A" name="Liveguard Ltd"></Manufacturer>
+  <Manufacturer id="013A" name="Living Style Enterprises Ltd"></Manufacturer>
   <Manufacturer id="015e" name="Locstar">
     <Product id="0001" name="LS-8015-ZW Single Latch Door Lock" type="8015"/>
   </Manufacturer>
@@ -863,24 +1081,30 @@
     <Product config="logicsoft/ZHC5010.xml" id="010a" name="ZHC5010 Wall switch" type="0003"/>
     <Product config="logicsoft/ZHC5002.xml" id="010c" name="ZHC5002 Z-Scene Controller" type="0003"/>
   </Manufacturer>
-  <Manufacturer id="007f" name="Logitech">
-  </Manufacturer>
-  <Manufacturer id="0025" name="Loudwater Tech">
-  </Manufacturer>
+  <Manufacturer id="007f" name="Logitech"></Manufacturer>
+  <Manufacturer id="0025" name="Loudwater Tech"></Manufacturer>
+  <Manufacturer id="038C" name="Lowes"></Manufacturer>
   <Manufacturer id="0071" name="LS Control">
     <Product id="035D" name="ES 861 Temperature Sensor" type="0002"/>
   </Manufacturer>
-  <Manufacturer id="003d" name="Marmitek BV">
-  </Manufacturer>
-  <Manufacturer id="003e" name="Martec Access">
-  </Manufacturer>
-  <Manufacturer id="008f" name="MB Design">
-  </Manufacturer>
-  <Manufacturer id="015f" name="Mcohome">
+  <Manufacturer id="036D" name="Luffanet Co. Lte"></Manufacturer>
+  <Manufacturer id="025E" name="LUXEASY technology company LTD"></Manufacturer>
+  <Manufacturer id="0062" name="LVI Produkter AB"></Manufacturer>
+  <Manufacturer id="0192" name="m2m Solution"></Manufacturer>
+  <Manufacturer id="0195" name="M2M Solution"></Manufacturer>
+  <Manufacturer id="006E" name="Manodo / KTC"></Manufacturer>
+  <Manufacturer id="003d" name="Marmitek BV"></Manufacturer>
+  <Manufacturer id="003e" name="Martec Access"></Manufacturer>
+  <Manufacturer id="0092" name="Martin Renz GmbH"></Manufacturer>
+  <Manufacturer id="008f" name="MB Turn Key Design"></Manufacturer>
+  <Manufacturer id="015f" name="McoHome Technology Co Ltd">
     <Product id="0001" name="Mini Energy Dimmer" type="0001"/>
     <Product id="0001" name="Mini Energy Switch" type="0002"/>
-    <Product id="5102" name="MH7 Water/Electrical Heating Thermostat" type="0702" forumNr="no-statistics"/>
+	<Product id="5102" name="MH7 Water/Electrical Heating Thermostat" type="0702" forumNr="no-statistics"/>
     <Product config="mcohome/mhp210.xml" id="1302" name="MH-P210 Mini Energy Dimmer" type="210a"/>
+    <Product config="mcohome/mhp220.xml" id="1352" name="MH-P220 Micro Dimmer" type="220a"/>
+    <Product config="mcohome/mhp220.xml" id="5101" name="MH-P220 Micro Dimmer" type="220a"/>
+    <Product config="mcohome/mhp220.xml" id="5102" name="MH-P220 Micro Dimmer" type="220a"/>
     <Product config="mcohome/mhs311.xml" id="0201" name="MH-S311 One-load" type="3102"/>
     <Product config="mcohome/mhs312.xml" id="0202" name="MH-S312 Two-load" type="3102"/>
     <Product config="mcohome/mhs314.xml" id="0204" name="MH-S314 Four-load" type="3102"/>
@@ -893,98 +1117,107 @@
     <Product config="mcohome/mh8fceu.xml" id="3102" name="MH8-FC-EU Thermostat" type="0801"/>
     <Product config="mcohome/mh8fceu.xml" id="3102" name="MH8-FC4-EU Thermostat" type="0802"/>
     <Product config="mcohome/mh9co2.xml" id="0201" name="MH9-CO2-WD CO2 Monitor" type="0905"/>
+    <Product config="mcohome/mh9co2.xml" id="3102" name="MH9-CO2-WD CO2 Monitor" type="0901"/>
     <Product config="mcohome/a8-9.xml" id="1352" name="A8-9 Multi-sensor" type="a800"/>
-    <Product config="mcohome/mhs513.xml" id="0103" name="Touch Panel Switch MH-S513" type="5102"/>
     <Product config="mcohome/mh7h.xml" id="5102" name="MH7H Water/Electrical Heating Thermostat" type="0701"/>
     <Product config="mcohome/mh7h.xml" id="5102" name="MH7H Water/Electrical Heating Thermostat" type="0702"/>
     <Product config="mcohome/mh7h.xml" id="5102" name="MH7H Water/Electrical Heating Thermostat" type="0712"/>
     <Product config="mcohome/mh7h.xml" id="5102" name="MH7H Water/Electrical Heating Thermostat" type="0732"/>
+    <Product config="mcohome/mhs513.xml" id="0103" name="Touch Panel Switch MH-S513" type="5102"/>
+    <Product config="mcohome/mhp511.xml" id="1453" name="Dimmer Touch Panel Switch MH-P511" type="511a"/>
   </Manufacturer>
+  <Manufacturer id="0222" name="MCT CO. LTD"></Manufacturer>
+  <Manufacturer id="0027" name="Meedio LLC"></Manufacturer>
+  <Manufacturer id="0107" name="MegaChips"></Manufacturer>
+  <Manufacturer id="022D" name="Mercury Corporation"></Manufacturer>
   <Manufacturer id="007a" name="Merten">
     <Product id="0001" name="Plug-in Appliance Module" type="8001"/>
     <Product id="0001" name="Plug-in Dimmer Module" type="8002"/>
     <Product config="merten/507801.xml" id="0001" name="Plug-in Roller Shutter Module" type="8003"/>
-    <Product id="0001" name="Wall Dimmer Module" type="4003"/>
-    <Product id="0002" name="Dimmer Wall Insert" type="4003"/>
-    <Product id="0001" name="Wall Appliance Module" type="4002"/>
+    <Product config="merten/5046xx.xml" id="0001" name="Wall Dimmer Module" type="4003"/>
+    <Product config="merten/5044xx.xml" id="0001" name="Wall Appliance Module" type="4002"/>
     <Product config="merten/50x5xx.xml" id="0001" name="Wall Roller Shutter Module" type="4004"/>
-    <Product id="0001" name="Merten Radio Argus 220 Connect Movement Detector" type="4005" forumNr="no-statistics"/>
+	<Product id="0001" name="Merten Radio Argus 220 Connect Movement Detector" type="4005" forumNr="no-statistics"/>
     <Product id="8001" name="Receiver Flush-Mounted 1-Gang Switch" type="8001"/>
-    <Product id="8002" name="Switch Wall Insert 1 Gang" type="8001"/>
-    <Product id="0004" name="Transmitter Flush-Mounted 4-Gang Switch" type="0003"/>
+    <Product config="merten/506004.xml" id="0004" name="Transmitter Flush-Mounted 4-Gang Switch" type="0003"/>
     <Product id="0002" name="Transmitter 1-Gang Switch" type="0001"/>
     <Product id="0004" name="Transmitter 2-Gang Switch" type="0001"/>
-    <Product id="0001" name="Transmitter Move" type="0002"/>
+    <Product config="merten/508244.xml" id="0001" name="Transmitter Move" type="0002"/>
   </Manufacturer>
-  <Manufacturer id="008c" name="MIOS">
-    <Product id="0001" name="Vera Lite" type="0001"/>
-  </Manufacturer>
-  <Manufacturer id="0122" name="Miyakawa Electric Works">
-    <Product id="0001" name="ME-D101 Electric Power Measuring Instrument" type="0001"/>
+  <Manufacturer id="0238" name="Milanity Inc"></Manufacturer>
+  <Manufacturer id="0112" name="MITSUMI"></Manufacturer>
+  <Manufacturer id="019D" name="MOBILUS MOTOR z o.o."></Manufacturer>
+  <Manufacturer id="0232" name="MODACOM CO. LTD"></Manufacturer>
+  <Manufacturer id="008D" name="Modstrom"></Manufacturer>
+  <Manufacturer id="000E" name="Mohito Networks"></Manufacturer>
+  <Manufacturer id="0202" name="Monoprice"></Manufacturer>
+  <Manufacturer id="007E" name="Monster Cable"></Manufacturer>
+  <Manufacturer id="0125" name="Motion Control Systems"></Manufacturer>
+  <Manufacturer id="003F" name="Motorola"></Manufacturer>
+  <Manufacturer id="0122" name="MSK Miyakawa Seisakusho">
+    <Product config="miyakawaelectric/me-d101.xml" id="0001" name="ME-D101 Electric Power Measuring Instrument" type="0001"/>
     <Product id="0000" name="ZW-GW Smart Bridge" type="8000"/>
   </Manufacturer>
-  <Manufacturer id="007e" name="Monster Cable">
-  </Manufacturer>
-  <Manufacturer id="003f" name="Motorola">
-  </Manufacturer>
-  <Manufacturer id="0083" name="MTC Maintronic">
-  </Manufacturer>
-  <Manufacturer id="0258" name="Neo CoolCam">
-    <Product config="shenzen_neo/nas-ds01z.xml" id="0082" name="Door/Window Detector" type="0003"/>
-    <Product config="shenzen_neo/nas-ds01z.xml" id="1082" name="Door/Window Detector" type="0003"/>
-    <Product config="shenzen_neo/nas-wr01z.xml" id="0087" name="Power plug 12A" type="0003"/>
-    <Product config="shenzen_neo/nas-wr01z.xml" id="1087" name="Power plug 12A" type="0003"/>
-    <Product config="shenzen_neo/nas-pd01z.xml" id="0083" name="Battery Powered PIR Sensor" type="0003"/>
-    <Product config="shenzen_neo/nas-pd01z.xml" id="1083" name="Battery Powered PIR Sensor" type="0003"/>
-    <Product config="shenzen_neo/nas-pd02z.xml" id="108d" name="Battery Powered PIR Sensor" type="0003" forumNr="91363"/>
-    <Product config="shenzen_neo/nas-ws02z.xml" id="0085" name="Water Leakage Detector" type="0003"/>
-    <Product config="shenzen_neo/nas-ws02z.xml" id="1085" name="Water Leakage Detector" type="0003"/>
-    <Product config="shenzen_neo/nas-ws02z.xml" id="6085" name="Water Leakage Detector" type="0003"/>
-    <Product config="shenzen_neo/nas-ab01z.xml" id="0088" name="Siren Alarm" type="0003"/>
-    <Product config="shenzen_neo/nas-ab01z.xml" id="1088" name="Siren Alarm" type="0003"/>
-    <Product config="shenzen_neo/nas-rc01z.xml" id="008a" name="SOS/Remote Control" type="0003"/>
-    <Product config="shenzen_neo/nas-rc01z.xml" id="108a" name="SOS/Remote Control" type="0003"/>
-    <Product config="shenzen_neo/ls02ch.xml" id="008b" name="Wall Switch (2 channels)" type="0003"/>
-    <Product config="shenzen_neo/ls02ch.xml" id="108b" name="Wall Switch (2 channels)" type="0003"/>
-    <Product config="shenzen_neo/ls01ch.xml" id="008c" name="Wall Switch (1 channel)" type="0003"/>
-    <Product config="shenzen_neo/ls01ch.xml" id="108c" name="Wall Switch (1 channel)" type="0003"/>
-    <Product config="shenzen_neo/nas-wr01z.xml" id="1027" name="Power plug 12A" type="0200" forumNr="96406"/>
+  <Manufacturer id="0083" name="MTC Maintronic"></Manufacturer>
+  <Manufacturer id="0143" name="myStrom"></Manufacturer>
+  <Manufacturer id="016E" name="Nanjing Easthouse Electrical Co"></Manufacturer>
+  <Manufacturer id="0121" name="Napco Security Technologies, Inc.">
+    <Product id="0001" name="I-Bridge Z-Wave Controller" type="0001"/>
   </Manufacturer>
+  <Manufacturer id="038D" name="nCube"></Manufacturer>
+  <Manufacturer id="036B" name="NEC Platforms Ltd"></Manufacturer>
+  <Manufacturer id="0241" name="NEEO AG"></Manufacturer>
+  <Manufacturer id="006D" name="Nefit"></Manufacturer>
+  <Manufacturer id="0351" name="NEOCONTROL US LLC"></Manufacturer>
+  <Manufacturer id="0189" name="Ness Corporation Pty Ltd"></Manufacturer>
+  <Manufacturer id="0133" name="Netgear"></Manufacturer>
+  <Manufacturer id="0248" name="neusta next GmbH Co. KG"></Manufacturer>
+  <Manufacturer id="0203" name="Newland Communication Science Technology Co. Ltd"></Manufacturer>
+  <Manufacturer id="0268" name="Nexa Trading AB"></Manufacturer>
   <Manufacturer id="0178" name="Nexia">
+    <!-- full name in Z-wave database: Ingersoll Rand - Nexia Home Intelligence -->
     <Product config="nexia/db100z.xml" id="3130" name="DB100Z Doorbell Sensor" type="4442"/>
   </Manufacturer>
-  <Manufacturer id="0165" name="NodOn">
+  <Manufacturer id="0075" name="NextEnergy"></Manufacturer>
+  <Manufacturer id="0361" name="NHN Entertainment"></Manufacturer>
+  <Manufacturer id="0185" name="Ningbo Sentek Electronics Co Ltd"></Manufacturer>
+  <Manufacturer id="0165" name="NodOn (ID-RF)">
     <Product config="nodon/asp3100SmartPlug.xml" id="0001" name="ASP-3-1-00 Smart Plug" type="0001"/>
     <Product config="nodon/msp31xxMicroSmartPlug.xml" id="0003" name="MSP-3-1-XX Micro Smart Plug" type="0001"/>
     <Product config="nodon/crc3100OctanRemote.xml" id="0001" name="CRC-3-1-00 Octan Remote" type="0002"/>
     <Product config="nodon/crc360xSofremote.xml" id="0002" name="CRC-3-6-0x Soft Remote" type="0002"/>
     <Product config="nodon/cws3101wallswitch.xml" id="0003" name="CWS-3-1-01 Wall Switch" type="0002"/>
   </Manufacturer>
+  <Manufacturer id="0252" name="North China University of Technology"></Manufacturer>
   <Manufacturer id="0096" name="NorthQ">
     <Product config="northq/nq92021.xml" id="0001" name="NQ-92021 Power Reader" type="0001"/>
-    <Product config="northq/nq9021.xml" id="0002" name="NQ-9021 Power Reader" type="0001" />
-    <Product config="northq/nq9121.xml" id="0001" name="NQ-9121 Gas Meter" type="0010" />
+    <Product config="northq/nq9021.xml" id="0002" name="NQ-9021 Power Reader" type="0001"/>
+    <Product config="northq/nq9121.xml" id="0001" name="NQ-9121 Gas Meter" type="0010"/>
   </Manufacturer>
-  <Manufacturer id="0040" name="Novar EDS">
+  <Manufacturer id="0040" name="Novar Electrical Devices and Systems"></Manufacturer>
+  <Manufacturer id="020D" name="Novateqni HK Ltd"></Manufacturer>
+  <Manufacturer id="0296" name="OBLO LIVING LLC "></Manufacturer>
+  <Manufacturer id="0119" name="Omnima Limited"></Manufacturer>
+  <Manufacturer id="014C" name="OnSite Pro"></Manufacturer>
+  <Manufacturer id="0041" name="OpenPeak Inc"></Manufacturer>
+  <Manufacturer id="027D" name="Oregon Automation"></Manufacturer>
+  <Manufacturer id="0104" name="Panasonic Electric Works Co. Ltd"></Manufacturer>
+  <Manufacturer id="031A" name="Panasonic ES Shin Dong-A Co Ltd"></Manufacturer>
+  <Manufacturer id="028D" name="Panodic Electric (Shenzhen) Limited"></Manufacturer>
+  <Manufacturer id="0257" name="PARATECH"></Manufacturer>
+  <Manufacturer id="0172" name="PassivSystems Limited"></Manufacturer>
+  <Manufacturer id="0322" name="Paxton Access Ltd"></Manufacturer>
+  <Manufacturer id="0281" name="PC Partner"></Manufacturer>
+  <Manufacturer id="013D" name="Pella"></Manufacturer>
+  <Manufacturer id="0245" name="permundo GmbH">
+    <Product config="permundo/psc132zw.xml" id="0002" name="PSC132ZW Smart Mini Plug" type="0003"/>
+    <Product config="permundo/psc234zw.xml" id="0001" name="PSC234ZW Smart Plug" type="0003"/>
   </Manufacturer>
-  <Manufacturer id="016a" name="Oomi">
-    <Product config="oomi/ft100.xml" id="0064" name="FT100-C MultiSensor 6" type="0002" forumNr="95312"/>
-    <Product config="oomi/ft100.xml" id="0064" name="FT100 MultiSensor 6" type="0102" />
-    <Product config="oomi/ft100.xml" id="0064" name="FT100 MultiSensor 6" type="0202" />
-    <Product config="oomi/ft100.xml" id="0064" name="FT100 MultiSensor 6" type="1D02" />
-    <Product config="oomi/ft111.xml" id="006F" name="FT111 In Wall Dimmer" type="0103" />
-    <Product config="oomi/ft111.xml" id="006F" name="FT111 In Wall Dimmer" type="0203" />
-    <Product config="oomi/ft111.xml" id="006F" name="FT111 In Wall Dimmer" type="1D03" />
-  </Manufacturer>
-  <Manufacturer id="0041" name="OpenPeak Inc.">
-  </Manufacturer>
-  <Manufacturer id="0245" name="Permundo">
-    <Product id="0002" name="PSC132ZW Smart Mini Plug" type="0003"/>
-    <Product id="0001" name="PSC234ZW Smart Plug" type="0003"/>
-  </Manufacturer>
-  <Manufacturer id="013c" name="Philio Technology Corporation">
-    <Product id="0001" name="PAN11-4 Smart Energy Plug In Switch" type="0001"/>
+  <Manufacturer id="0366" name="PHILIA TECHNOLOGY Co. Ltd"></Manufacturer>
+  <Manufacturer id="013c" name="Philio Technology Corp">
+    <Product config="philio/pan11-1.xml" id="0001" name="PAN11-4 Smart Energy Plug In Switch" type="0001"/>
     <Product config="philio/pan04.xml" id="0003" name="PAN04-1 Double Relay Switch 2x1.5kW with Power Measurement" type="0001"/>
+    <Product config="philio/pan05.xml" id="0010" name="PAN05-1 In Wall Single relay (1 way) Switch" type="0001"/>
     <Product config="philio/pan06.xml" id="0004" name="PAN06-1 In Wall Dual Relay (1 Way) Switch Module" type="0001"/>
     <Product config="philio/pan07.xml" id="0005" name="PAN07-1 TWO SPDT Switch module with meter" type="0001"/>
     <Product config="philio/pan08.xml" id="0006" name="PAN08-1 In Wall Roller Shutter Controller" type="0001"/>
@@ -995,33 +1228,36 @@
     <Product config="philio/pan08.xml" id="0015" name="PAN08-1 In Wall Roller Shutter Controller" type="0001"/>
     <Product config="philio/pan16.xml" id="0029" name="PAN16 Smart energy plug in switch" type="0001"/>
     <Product config="philio/psm02.xml" id="0002" name="PSM02-1 Slim Multi-Sensor" type="0002"/>
+    <Product config="philio/psp05.xml" id="0050" name="PSP05 PIR/Motion" type="0002"/>
     <Product config="philio/pst02.xml" id="000c" name="PST02-A 4 in 1 Multi-Sensor" type="0002"/>
     <Product config="philio/pst02-b.xml" id="000d" name="PST02-B PIR/Motion 3 in 1 Sensor" type="0002"/>
     <Product config="philio/pst02-1c.xml" id="000e" name="PST02-C Door/Window 3 in 1 sensor" type="0002"/>
     <Product config="philio/phpsg01.xml" id="001e" name="PH-PSG01 Smoke Sensor" type="0002"/>
     <Product config="philio/phpat02.xml" id="001f" name="PH-PAT02.eu Flood Multisensor 3in1" type="0002"/>
     <Product config="philio/phpat02.xml" id="0020" name="PH-PAT02-B.eu Multisensor 2in1" type="0002"/>
-    <Product config="philio/psp05.xml" id="0050" name="PSP05 PIR/Motion" type="0002"/>
     <Product config="philio/pse02.xml" id="000a" name="PH-PSE02.eu Zipato Indoor Siren" type="0004"/>
+    <Product config="philio/pad02.xml" id="0031" name="PH-PAD02.eu Smart Dimmer Socket E27" type="0005"/>
     <Product config="philio/phpab01.xml" id="001a" name="PH-PAB01.eu Micromodule Energy Meter" type="0006"/>
+    <Product config="philio/psr03-1b.xml" id="001d" name="PSR03-1B.EU Keyfob 5 Remote" type="0008"/>
     <Product config="philio/psr04.xml" id="0022" name="PSR04 Smart Color Button" type="0009"/>
-    <Product config="philio/pan16.xml" id="0029" name="PAN16 Smart energy plug in switch" type="0001"/>
   </Manufacturer>
-  <Manufacturer id="010e" name="Polycontrol">
+  <Manufacturer id="0277" name="Pixela Corporation "></Manufacturer>
+  <Manufacturer id="010e" name="Poly-control">
     <Product config="polycontrol/keypad.xml" id="0001" name="Danalock Keypad" type="0002"/>
     <Product config="polycontrol/doorlock.xml" id="0002" name="Danalock Circle/Square" type="0003"/>
     <Product config="polycontrol/polylock.xml" id="0001" name="Polylock" type="0001"/>
     <Product config="polycontrol/doorlock.xml" id="0002" name="Danalock V2 BTZE" type="0008"/>
     <Product config="polycontrol/doorlockv3.xml" id="0001" name="Danalock V3 BTZE" type="0009"/>
   </Manufacturer>
-  <Manufacturer id="0154" name="Popp">
+  <Manufacturer id="0154" name="Popp &amp; Co">
     <Product config="popp/123658.xml" id="0001" name="123658 Plug-in Switch plus Power Meter" type="0001"/>
     <Product config="popp/009105.xml" id="0001" name="009105 Wall Plug Switch Schuko (IP44)" type="0003"/>
     <Product config="popp/700397.xml" id="000a" name="700397 Wall Plug Switch Outdoor Schuko (IP44)" type="0003"/>
     <Product config="popp/solar-siren.xml" id="0002" name="Solar Powered Outdoor Siren" type="0004"/>
     <Product config="popp/004407.xml" id="0003" name="004407 CO Detector" type="0004"/>
-    <Product config="popp/700982.xml" id="0007" name="POPP Door / Window Sensor" type="0004" />
-    <Product config="popp/009402.xml" id="0004" name="009402 10-Year Smoke Detector" type="0004" />
+    <Product config="popp/700982.xml" id="0007" name="POPP Door / Window Sensor" type="0004" forumNr="unknown"/>
+    <Product config="popp/009402.xml" id="0004" name="009402 10-Year Smoke Detector" type="0004"/>
+    <Product config="popp/009501.xml" id="0003" name="009501 Flow Stop" type="0005"/>
     <Product config="popp/700168.xml" id="0011" name="Popp Z-Rain Rain Sensor" type="0004"/>
     <Product config="popp/012501.xml" id="0001" name="012501 Strike Lock Control" type="0005"/>
     <Product config="popp/700045.xml" id="0002" name="700045 Universal Keypad" type="0005"/>
@@ -1029,43 +1265,49 @@
     <Product config="zwave.me/ZME_KFOB-S.xml" id="0103" name="Popp KFOB-C Remote Control" type="0100"/>
     <Product config="popp/smoke-detector.xml" id="0201" name="Smoke Detector and Siren" type="0100"/>
     <Product config="popp/zweather.xml" id="0400" name="ZWeather" type="0100"/>
-    <Product config="popp/123601.xml" id="0001" name="123601 Plug-in Switch" type="1100" />
-    <Product config="popp/123580.xml" id="0002" name="123580 Plug-in Dimmer" type="1100" />
+    <Product config="popp/123601.xml" id="0001" name="123601 Plug-in Switch" type="1100"/>
+    <Product config="popp/123580.xml" id="0002" name="123580 Plug-in Dimmer" type="1100"/>
   </Manufacturer>
-  <Manufacturer id="0169" name="Popp">
-    <Product config="popp/zweather.xml" id="0001" name="ZWeather" type="0001" />
-  </Manufacturer>
-  <Manufacturer id="0064" name="Popp / Duwi">
-    <Product id="0000" name="ZW EDAN 300 Flush Mounted Dimmer" type="0001" />
-    <Product config="popp/smoke-detector.xml" id="0201" name="Smoke Detector and Siren" type="0100" />
+  <Manufacturer id="0064" name="Popp / Duwi (Reitz-Group.de)">
+    <Product config="duwi/zw-edan-300.xml" id="0000" name="ZW EDAN 300 Flush Mounted Dimmer" type="0001"/>
     <Product id="0002" name="Flush Mounted Switch" type="1000"/>
-    <Product id="0000" name="Plugin Dimmer" type="1001" />
-    <Product config="popp/ZME_05433.xml" id="0009" name="Wall Dimmer Set for Busch-Jaeger DURO 2000" type="1000"/>
-    <Product config="duwi/ZWES1000.xml" id="0000" name="ZW ES 1000 Flush Mounted Switch" type="2001" />
-    <Product id="0000" name="ZW ZS 3500 Plugin Switch" type="3001" />
-    <Product id="0000" name="ZW ZSA 3500 Plugin Switch" type="3002" />
-    <Product config="duwi/ZWESJ300.xml" id="0000" name="ZW ESJ Blind Control" type="4001" />
+    <Product config="duwi/zw-zdan-300.xml" id="0000" name="Plugin Dimmer" type="1001"/>
+    <Product config="duwi/05458.xml" id="0009" name="Wall Dimmer Set for Busch-Jaeger DURO 2000" type="1000"/>
+    <Product config="duwi/ZWES1000.xml" id="0000" name="ZW ES 1000 Flush Mounted Switch" type="2001"/>
+    <Product id="0000" name="ZW ZS 3500 Plugin Switch" type="3001"/>
+    <Product id="0000" name="ZW ZSA 3500 Plugin Switch" type="3002"/>
+    <Product config="duwi/ZWESJ300.xml" id="0000" name="ZW ESJ Blind Control" type="4001"/>
     <Product config="duwi/zwfb.xml" id="0000" name="ZW FB Wireless remote control 10-channel" type="5001"/>
-    <Product id="0000" name="Wireless Flush Mounted Switch" type="5002" />
-    <Product id="0000" name="Static Controller" type="5003" />
+    <Product config="duwi/zwws.xml" id="0000" name="Wireless Flush Mounted Switch" type="5002"/>
+    <Product id="0000" name="Static Controller" type="5003"/>
   </Manufacturer>
-  <Manufacturer id="0016" name="PowerLynx">
+  <Manufacturer id="0170" name="Powerhouse Dynamics"></Manufacturer>
+  <Manufacturer id="0074" name="PowerLinx"></Manufacturer>
+  <Manufacturer id="0016" name="PowerLynx"></Manufacturer>
+  <Manufacturer id="0042" name="Pragmatic Cons"></Manufacturer>
+  <Manufacturer id="0341" name="Prodea"></Manufacturer>
+  <Manufacturer id="0128" name="Prodrive Technologies">
+    <Product id="0000" name="ED2.0 Meter Adapter" type="0000"/>
+    <Product id="0000" name="ED2.0 Display" type="0128"/>
   </Manufacturer>
-  <Manufacturer id="0042" name="Pragmatic Cons">
-  </Manufacturer>
-  <Manufacturer id="0163" name="Queenlock">
-    <Product id="0301" name="ZW-702 Door Lock" type="3001"/>
+  <Manufacturer id="0161" name="Promixis LLC"></Manufacturer>
+  <Manufacturer id="005d" name="Pulse Technologies (Aspalis)">
+    <Product id="0511" name="Plugin Lamp Module" type="0202"/>
   </Manufacturer>
+  <Manufacturer id="0376" name="Pytronic AB"></Manufacturer>
   <Manufacturer id="0095" name="Qees">
     <Product config="qees/reto-dimmer-plus.xml" id="0001" name="RETO Dimmer Plus 2013" type="3101"/>
-    <Product config="qees/reto-plugin-switch.xml" id="0001" name="RETO Plug-in Switch Plus" type="3103" />
+    <Product config="qees/reto-plugin-switch.xml" id="0001" name="RETO Plug-in Switch Plus" type="3103"/>
   </Manufacturer>
-  <Manufacturer id="0159" name="Qubino">
+  <Manufacturer id="0355" name="Qingdao hongyu cles air conditioning co.ltd"></Manufacturer>
+  <Manufacturer id="012A" name="Qolsys"></Manufacturer>
+  <Manufacturer id="0159" name="Qubino (Goap)">
     <Product config="qubino/ZMNHDA2.xml" id="0001" name="ZMNHDA2 Flush Dimmer" type="0001"/>
     <Product config="qubino/ZMNHDDx.xml" id="0051" name="ZMNHDD1 Flush Dimmer" type="0001"/>
     <Product config="qubino/ZMNHSDx.xml" id="0052" name="ZMNHSDx Din Dimmer" type="0001"/>
     <Product config="qubino/ZMNHVDx.xml" id="0053" name="ZMNHVDx Flush Dimmer 0-10V" type="0001"/>
     <Product config="qubino/ZMNHWD1.xml" id="0054" name="ZMNHWD1 Flush RGBW Dimmer" type="0001"/>
+    <Product config="qubino/ZMNHHDx.xml" id="0055" name="ZMNHHDx Mini Dimmer" type="0001"/>
     <Product config="qubino/ZMNHBA2.xml" id="0001" name="ZMNHBA2 Flush 2 Relays" type="0002"/>
     <Product config="qubino/ZMNHBDx.xml" id="0051" name="ZMNHBDx Flush 2 Relays" type="0002"/>
     <Product config="qubino/ZMNHAA2.xml" id="0002" name="ZMNHAA2 Flush 1 Relay" type="0002"/>
@@ -1079,23 +1321,42 @@
     <Product config="qubino/ZMNHJD1.xml" id="0051" name="ZMNHJD1 Flush Dimmer Pilot Wire" type="0004"/>
     <Product config="qubino/ZMNHUD1.xml" id="0052" name="ZMNHUD1 DIN Pilot Wire" type="0004"/>
     <Product config="qubino/ZMNHIA2.xml" id="0001" name="ZMNHIA2 Flush on/off thermostat" type="0005"/>
-    <Product config="qubino/ZMNHIDxS1.xml" id="0051" name="ZMNHIDx Flush on/off thermostat (H1S1P1)" type="0005"/>
+    <!--<Product type="0005" id="0051" name="ZMNHIDx Flush on/off thermostat (H1S1P1)" config="qubino/ZMNHIDxS1.xml"/>-->
+    <Product config="qubino/ZMNHIDxS2.xml" id="0051" name="ZMNHIDx Flush on/off thermostat (H1S2P1)" type="0005"/>
     <Product config="qubino/ZMNHKDx.xml" id="0052" name="ZMNHKDx Flush Heat and Cool thermostat" type="0005"/>
     <Product config="qubino/ZMNHLDx.xml" id="0053" name="ZMNHLDx Flush PWM thermostat" type="0005"/>
     <Product config="qubino/ZMNHLAx.xml" id="0003" name="ZMNHLA2 Flush PWM thermostat" type="0005"/>
-    <Product config="qubino/ZMNHTDx.xml" id="0052" name="ZMNHTDx Smart meter" type="0007"/>
+    <!--<Product type="0007" id="0052" name="ZMNHTDx Smart meter S1 S2 S3" config="qubino/ZMNHTDxS3.xml"/>-->
+    <Product config="qubino/ZMNHTDx.xml" id="0052" name="ZMNHTDx Smart meter S4 S5 S6" type="0007"/>
     <Product config="qubino/ZMNHZDx.xml" id="0053" name="ZMNHZDx Weather Station" type="0007"/>
     <Product config="qubino/ZMNHXDx.xml" id="0054" name="ZMNHXDx 3-phase Smart Meter" type="0007"/>
+    <Product config="qubino/ZMNKIDx.xml" id="0054" name="ZMNKIDx OnOff Thermostat 2" type="0005"/>
   </Manufacturer>
   <Manufacturer id="0130" name="Quby">
-    <Product id="0001" name="Energy Management System" type="0001"/>
+    <Product config="quby/qb2.xml" id="0001" name="Energy Management System" type="0001"/>
   </Manufacturer>
-  <Manufacturer id="0100" name="Reitz-Group.de">
+  <Manufacturer id="0163" name="Queenlock">
+    <Product config="prowell/zw-702.xml" id="0301" name="ZW-702 Door Lock" type="3001"/>
   </Manufacturer>
+  <Manufacturer id="0142" name="Rademacher Gerate-Elektronik GmbH"></Manufacturer>
+  <Manufacturer id="0098" name="Radio Thermostat Company of America"></Manufacturer>
+  <Manufacturer id="0314" name="Raonix Co. Ltd"></Manufacturer>
+  <Manufacturer id="008E" name="Raritan"></Manufacturer>
+  <Manufacturer id="040F" name="RATOC Systems Inc"></Manufacturer>
+  <Manufacturer id="0370" name="Raylios"></Manufacturer>
+  <Manufacturer id="021E" name="Red Bee Co. Ltd"></Manufacturer>
+  <Manufacturer id="022C" name="Remote Solution"></Manufacturer>
+  <Manufacturer id="0255" name="Remote Technologies Incorporated"></Manufacturer>
   <Manufacturer id="5254" name="Remotec">
     <Product config="remotec/zurc.xml" id="531f" name="Z-URC" type="0000"/>
-    <Product id="8380" name="ZRC-100" type="0001"/>
-    <Product id="8371" name="ZXT-310EU" type="0101"/>
+    <Product config="remotec/zrc-100eu.xml" id="8380" name="ZRC-100" type="0001"/>
+    <Product config="remotec/zxt-310.xml" id="8371" name="ZXT-310US" type="0100"/>
+    <Product config="remotec/zxt-310.xml" id="8371" name="ZXT-310EU" type="0101"/>
+    <Product config="remotec/zxt-310.xml" id="8371" name="ZXT-310AU" type="0102"/>
+    <Product config="remotec/zxt-310.xml" id="8371" name="ZXT-310IN" type="0103"/>
+    <Product config="remotec/zxt-310.xml" id="8371" name="ZXT-310RU" type="0106"/>
+    <Product config="remotec/zxt-310.xml" id="8371" name="ZXT-310IL" type="0107"/>
+    <Product config="remotec/zxt-310.xml" id="8371" name="ZXT-310BR" type="0108"/>
     <Product config="remotec/zxt-120.xml" id="8377" name="ZXT-120US" type="0100"/>
     <Product config="remotec/zxt-120.xml" id="8377" name="ZXT-120EU" type="0101"/>
     <Product config="remotec/zxt-120.xml" id="8377" name="ZXT-120AU" type="0102"/>
@@ -1103,134 +1364,303 @@
     <Product config="remotec/zxt-120.xml" id="8377" name="ZXT-120RU" type="0106"/>
     <Product config="remotec/zxt-120.xml" id="8377" name="ZXT-120IL" type="0107"/>
     <Product config="remotec/zxt-120.xml" id="8377" name="ZXT-120BR" type="0108"/>
+    <Product config="remotec/zxt-600.xml" id="8490" name="ZXT-600US AC MASTER" type="0100"/>
+    <Product config="remotec/zxt-600.xml" id="8490" name="ZXT-600EU AC MASTER" type="0101"/>
+    <Product config="remotec/zxt-600.xml" id="8490" name="ZXT-600AU AC MASTER" type="0102"/>
+    <Product config="remotec/zxt-600.xml" id="8490" name="ZXT-600IN AC MASTER" type="0103"/>
     <Product config="remotec/zrc-90.xml" id="8510" name="ZRC-90" type="0001"/>
     <Product config="remotec/zrc-90.xml" id="8510" name="ZRC-90" type="0002"/>
-    <Product id="8120" name="ZFM-X10EU Dual Mode Insert Module " type="8201"/>
-    <Product config="remotec/zfm-80.xml" id="0002" name="ZFM-80" type="8000" />
-    <Product config="remotec/zts-110.xml" id="8031" name="ZTS-110" type="0200" />
-    <Product config="remotec/zts-110.xml" id="8031" name="ZTS-110" type="0202" />
-    <Product config="remotec/zts-500.xml" id="8170" name="ZTS-500US" type="0200" />
+    <Product config="remotec/bw8120eu.xml" id="8120" name="ZFM-X10EU Dual Mode Insert Module " type="8201"/>
+    <Product config="remotec/zfm-80.xml" id="0002" name="ZFM-80" type="8000"/>
+    <Product config="remotec/zts-110.xml" id="8031" name="ZTS-110" type="0200"/>
+    <Product config="remotec/zts-110.xml" id="8031" name="ZTS-110" type="0202"/>
+    <Product config="remotec/zts-500.xml" id="8170" name="ZTS-500US" type="0200"/>
   </Manufacturer>
-  <Manufacturer id="0010" name="RCS">
-    <Product config="rcs/therm0009.xml" id="0002" name="TZ43 Thermostat" type="0001" />
-    <Product config="rcs/therm0005.xml" id="0005" name="TZ43-IHD SMUD Thermostat" type="0001" />
-    <Product config="rcs/therm0007.xml" id="0007" name="TZ45-IHD SMUD Thermostat" type="0001" />
-    <Product config="rcs/therm0009.xml" id="0009" name="TZ45 Thermostat" type="0001" />
-    <Product id="000a" name="TZ4Z-IHD RCS Thermostat" type="0001" />
-    <Product config="rcs/em52-zw.xml" id="3532" name="EM52-ZW Z-Wave Home Energy Meter" type="454d" />
-    <Product config="rcs/pm12-zw.xml" id="3132" name="PM12-ZW Z-Wave Power Monitoring Module" type="504d" />
+  <Manufacturer id="039B" name="Reply S.p.A."></Manufacturer>
+  <Manufacturer id="0010" name="Residential Control Systems">
+    <Product config="rcs/therm0009.xml" id="0002" name="TZ43 Thermostat" type="0001"/>
+    <Product config="rcs/therm0005.xml" id="0005" name="TZ43-IHD SMUD Thermostat" type="0001"/>
+    <Product config="rcs/therm0007.xml" id="0007" name="TZ45-IHD SMUD Thermostat" type="0001"/>
+    <Product config="rcs/therm0009.xml" id="0009" name="TZ45 Thermostat" type="0001"/>
+    <Product id="000a" name="TZ4Z-IHD RCS Thermostat" type="0001"/>
+    <Product config="rcs/em52-zw.xml" id="3532" name="EM52-ZW Z-Wave Home Energy Meter" type="454d"/>
+    <Product config="rcs/pm12-zw.xml" id="3132" name="PM12-ZW Z-Wave Power Monitoring Module" type="504d"/>
   </Manufacturer>
-  <Manufacturer id="0065" name="RS Scene">
+  <Manufacturer id="0216" name="RET Nanjing Intelligence System"></Manufacturer>
+  <Manufacturer id="0153" name="Revolv"></Manufacturer>
+  <Manufacturer id="035E" name="RISCO Group"></Manufacturer>
+  <Manufacturer id="023B" name="ROC-Connect"></Manufacturer>
+  <Manufacturer id="0197" name="RPE Ajax LLC"></Manufacturer>
+  <Manufacturer id="0065" name="RS Scene Automation"></Manufacturer>
+  <Manufacturer id="029D" name="Rubetek"></Manufacturer>
+  <Manufacturer id="0290" name="S1"></Manufacturer>
+  <Manufacturer id="023C" name="SafeTech Products"></Manufacturer>
+  <Manufacturer id="0201" name="Samsung Electronics"></Manufacturer>
+  <Manufacturer id="022E" name="Samsung SDS"></Manufacturer>
+  <Manufacturer id="0093" name="San Shih Electrical Enterprise"></Manufacturer>
+  <Manufacturer id="0150" name="Samsung SmartThings">
+    <Product config="smartthings/sth-eth200.xml" id="0006" name="SmartThings Hub v2" type="0002"/>
+    <Product config="smartthings/pgc401m.xml" id="0191" name="SmartThings Hub v1" type="0001"/>
   </Manufacturer>
-  <Manufacturer id="003b" name="Schlage">
-    <Product id="504c" name="FE599GR Wireless Door Lock" type="634b"/>
+  <Manufacturer id="012C" name="SANAV"></Manufacturer>
+  <Manufacturer id="0307" name="SATCO Products"></Manufacturer>
+  <Manufacturer id="0318" name="SBCK Corp"></Manufacturer>
+  <Manufacturer id="003b" name="Schlage (Allegion)">
+    <Product config="schlage/fe599.xml" id="504c" name="FE599GR Wireless Door Lock" type="634b"/>
     <Product config="schlage/BE469.xml" id="5044" name="BE469 Touchscreen Deadbolt" type="6341"/>
     <Product config="schlage/BE468.xml" id="5044" name="BE468 Touchscreen Deadbolt" type="6349"/>
+    <Product config="schlage/BE469ZP.xml" id="0469" name="BE469ZP Connect Smart Deadbolt" type="0001"/>
+    <Product config="schlage/BE468ZP.xml" id="0468" name="BE468ZP Connect Smart Deadbolt" type="0001"/>
   </Manufacturer>
   <Manufacturer id="0097" name="Schlage Link">
-    <Product config="schlagelink/itemp.xml" id="4501" name="iTemp Dual Sensor" type="1182" />
-    <Product config="schlagelink/itemp.xml" id="4501" name="iTemp Dual Sensor" type="1188" />
-    <Product config="schlagelink/minikeypad.xml" id="4501" name="Mini Keypad RFID" type="6131" />
-    <Product config="schlagelink/minikeypad.xml" id="4101" name="Mini Keypad RFID" type="6131" />
-    <Product id="5501" name="LE120 Appliance Module" type="6941"/>
-    <Product id="4503" name="iPlugDim" type="6942" forumNr="no-statistics"/>
+    <Product config="schlagelink/itemp.xml" id="4501" name="iTemp Dual Sensor" type="1182"/>
+    <Product config="schlagelink/itemp.xml" id="4501" name="iTemp Dual Sensor" type="1188"/>
+    <Product config="schlagelink/minikeypad.xml" id="4501" name="Mini Keypad RFID" type="6131"/>
+    <Product config="schlagelink/minikeypad.xml" id="4101" name="Mini Keypad RFID" type="6131"/>
+    <Product config="schlagelink/41.xml" id="5501" name="LE120 Appliance Module" type="6941"/>
+	<Product id="4503" name="iPlugDim" type="6942" forumNr="no-statistics"/>
     <Product id="4501" name="On-Wall Power Socket" type="6943"/>
   </Manufacturer>
-  <Manufacturer id="001f" name="Scientia Tech">
-  </Manufacturer>
-  <Manufacturer id="0069" name="Seluxit">
-  </Manufacturer>
-  <Manufacturer id="0043" name="Senmatic A/S">
-  </Manufacturer>
+  <Manufacturer id="001F" name="Scientia Technologies"></Manufacturer>
+  <Manufacturer id="029A" name="Scout Alarm"></Manufacturer>
+  <Manufacturer id="011E" name="Secure Wireless"></Manufacturer>
+  <Manufacturer id="0167" name="SecureNet Technologies"></Manufacturer>
+  <Manufacturer id="0182" name="Securifi"></Manufacturer>
+  <Manufacturer id="0069" name="Seluxit"></Manufacturer>
+  <Manufacturer id="0043" name="Senmatic A/S"></Manufacturer>
   <Manufacturer id="019a" name="Sensative">
-    <Product config="sensative/strips.xml" id="0003" name="Strips" type="0003" />
-    <Product config="sensative/stripscomfort.xml" id="000a" name="Strips Comfort" type="0003" />
-  </Manufacturer>
-  <Manufacturer id="0044" name="Sequoia Tech">
+    <Product config="sensative/strips.xml" id="0003" name="Strips" type="0003"/>
+    <Product config="sensative/stripscomfort.xml" id="000a" name="Strips Comfort" type="0003"/>
   </Manufacturer>
+  <Manufacturer id="0044" name="Sequoia Tech"></Manufacturer>
   <Manufacturer id="0151" name="Sercomm">
-    <Product id="0001" name="SW-CLP01-EU Clamp Power Meter" type="0002"/>
+    <Product config="sercomm/sw-clp01-eu.xml" id="0001" name="SW-CLP01-EU Clamp Power Meter" type="0002"/>
   </Manufacturer>
-  <Manufacturer id="0000" name="Sigma Designs">
-    <Product id="0001" name="UZB Z-Wave USB Adapter" type="0001"/>
+  <Manufacturer id="0378" name="Shandong Bittel Intelligent Technology"></Manufacturer>
+  <Manufacturer id="030B" name="Shandong Smart Life Data System"></Manufacturer>
+  <Manufacturer id="0215" name="Shangdong Smart Life Data System"></Manufacturer>
+  <Manufacturer id="023E" name="Shanghai Dorlink Intelligent Technologies"></Manufacturer>
+  <Manufacturer id="0205" name="Shanghai Longchuang Eco-energy Systems"></Manufacturer>
+  <Manufacturer id="010B" name="Sharp"></Manufacturer>
+  <Manufacturer id="0357" name="Shenzhen 3nod Acousticlink"></Manufacturer>
+  <Manufacturer id="021A" name="SHENZHEN AOYA INDUSTRY"></Manufacturer>
+  <Manufacturer id="0286" name="Shenzhen Easyhome Technology"></Manufacturer>
+  <Manufacturer id="021C" name="Shenzhen iSurpass Technology"></Manufacturer>
+  <Manufacturer id="037A" name="Shenzhen JBT Smart Lighting"></Manufacturer>
+  <Manufacturer id="021D" name="Shenzhen Kaadas Intelligent Technology"></Manufacturer>
+  <Manufacturer id="0211" name="Shenzhen Liao Wang Tong Da Technology"></Manufacturer>
+  <Manufacturer id="0406" name="Shenzhen Meian Technology"></Manufacturer>
+  <Manufacturer id="0258" name="Neo CoolCam">
+    <Product config="shenzen_neo/nas-ds01z.xml" id="0082" name="Door/Window Detector" type="0003"/>
+    <Product config="shenzen_neo/nas-ds01z.xml" id="1082" name="Door/Window Detector" type="0003"/>
+    <Product config="shenzen_neo/nas-ds01z.xml" id="2082" name="Door/Window Detector" type="0003"/>
+    <Product config="shenzen_neo/nas-wr01z.xml" id="0087" name="Power plug 12A" type="0003"/>
+    <Product config="shenzen_neo/nas-wr01z.xml" id="1087" name="Power plug 12A" type="0003"/>
+    <Product config="shenzen_neo/nas-wr01ze.xml" id="1027" name="Power plug 12A" type="0200"/>
+    <Product config="shenzen_neo/nas-wr01z.xml" id="2087" name="Power plug 12A" type="0003"/>
+    <Product config="shenzen_neo/nas-pd01z.xml" id="0083" name="Battery Powered PIR Sensor" type="0003"/>
+    <Product config="shenzen_neo/nas-pd01z.xml" id="1083" name="Battery Powered PIR Sensor" type="0003"/>
+    <Product config="shenzen_neo/nas-pd02z.xml" id="108d" name="Battery Powered PIR Sensor V2" type="0003"/>
+    <Product config="shenzen_neo/nas-ws02z.xml" id="0085" name="Water Leakage Detector" type="0003"/>
+    <Product config="shenzen_neo/nas-ws02z.xml" id="1085" name="Water Leakage Detector" type="0003"/>
+    <Product config="shenzen_neo/nas-ws02z.xml" id="6085" name="Water Leakage Detector" type="0003"/>
+    <Product config="shenzen_neo/nas-ws02z.xml" id="2085" name="Water Leakage Detector" type="0003"/>
+    <Product config="shenzen_neo/nas-ab01z.xml" id="0088" name="Siren Alarm" type="0003"/>
+    <Product config="shenzen_neo/nas-ab01z.xml" id="1088" name="Siren Alarm" type="0003"/>
+    <Product config="shenzen_neo/nas-rc01z.xml" id="008a" name="SOS/Remote Control" type="0003"/>
+    <Product config="shenzen_neo/nas-rc01z.xml" id="108a" name="SOS/Remote Control" type="0003"/>
+    <Product config="shenzen_neo/ls02ch.xml" id="008b" name="Wall Switch (2 channels)" type="0003"/>
+    <Product config="shenzen_neo/ls02ch.xml" id="108b" name="Wall Switch (2 channels)" type="0003"/>
+    <Product config="shenzen_neo/ls01ch.xml" id="008c" name="Wall Switch (1 channel)" type="0003"/>
+    <Product config="shenzen_neo/ls01ch.xml" id="108c" name="Wall Switch (1 channel)" type="0003"/>
   </Manufacturer>
-  <Manufacturer id="0045" name="Sine Wireless">
+  <Manufacturer id="032C" name="Shenzhen Saykey Technology"></Manufacturer>
+  <Manufacturer id="036C" name="Shenzhen Sen5 Technology"></Manufacturer>
+  <Manufacturer id="0381" name="Shenzhen Thingsview Tech"></Manufacturer>
+  <Manufacturer id="0250" name="Shenzhen Tripath Digital Audio Equipment"></Manufacturer>
+  <Manufacturer id="0356" name="Shenzhen ZHIQU Technology Limited"></Manufacturer>
+  <Manufacturer id="0081" name="SIEGENIA-AUBI KG"></Manufacturer>
+  <Manufacturer id="0267" name="Simon">
+    <Product config="simon/10002034-13X.xml" id="0000" name="S100 Socket iO" type="0001"/>
+    <Product config="simon/10002034-13X.xml" id="00da" name="S100 Socket iO" type="0001"/>
+    <Product config="simon/10002041-13X.xml" id="0022" name="S100 Socket iO" type="0009"/>
   </Manufacturer>
-  <Manufacturer id="0070" name="Smart Products">
+  <Manufacturer id="0045" name="Sine Wireless"></Manufacturer>
+  <Manufacturer id="0266" name="Siterwell Technology HK"></Manufacturer>
+  <Manufacturer id="0282" name="Smart Electronic Industrial"></Manufacturer>
+  <Manufacturer id="0046" name="Smart Products"></Manufacturer>
+  <Manufacturer id="026A" name="SmartAll"></Manufacturer>
+  <Manufacturer id="0323" name="SmartHome Partner GmbH"></Manufacturer>
+  <Manufacturer id="024F" name="Smartly AS"></Manufacturer>
+  <Manufacturer id="0150" name="SmartThings"></Manufacturer>
+  <Manufacturer id="0102" name="SMK Manufacturing"></Manufacturer>
+  <Manufacturer id="029C" name="SoftAtHome"></Manufacturer>
+  <Manufacturer id="0047" name="Somfy"></Manufacturer>
+  <Manufacturer id="0394" name="SONG JIANG YUN-AN TECHNOLOGY"></Manufacturer>
+  <Manufacturer id="0402" name="Sony Mobile Communications"></Manufacturer>
+  <Manufacturer id="0274" name="Soosan Hometech"></Manufacturer>
+  <Manufacturer id="035A" name="SOREL GmbH"></Manufacturer>
+  <Manufacturer id="026e" name="Springs Window Fashions (Graber)">
+    <Product config="graber/brz1.xml" id="5a31" name="BRZ1 Remote Control" type="4252"/>
+    <Product config="graber/rsz1.xml" id="5a31" name="RSZ1 Roller Shade" type="5253"/>
+    <Product config="graber/vcz1.xml" id="5a31" name="VCZ1 Virtual Cord Remote Control" type="5643"/>
+    <Product config="graber/csz1.xml" id="5a31" name="CSZ1 Cellular Shade" type="4353"/>
   </Manufacturer>
-  <Manufacturer id="0047" name="Somfy">
+  <Manufacturer id="026F" name="Sprue Safety Products"></Manufacturer>
+  <Manufacturer id="0124" name="Square Connect"></Manufacturer>
+  <Manufacturer id="021B" name="ST&amp;T Electric Corporation"></Manufacturer>
+  <Manufacturer id="0358" name="Star Automation"></Manufacturer>
+  <Manufacturer id="0259" name="Starkoff"></Manufacturer>
+  <Manufacturer id="0265" name="StarVedia"></Manufacturer>
+  <Manufacturer id="0271" name="Steinel">
+    <Product config="steinel/is140-2.xml" id="1a72" name="IS140-2" type="0002"/>
+    <Product config="steinel/rs-led-d2.xml" id="1a74" name="RS LED D2" type="0001"/>
+    <Product config="steinel/xled-home-2.xml" id="1a73" name="XLED HOME 2" type="0001"/>
+    <Product config="steinel/l810-led-ihf.xml" id="1a75" name="L810 LED iHF" type="0001"/>
   </Manufacturer>
   <Manufacturer id="0239" name="Stelpro">
     <Product config="stelpro/stzw402.xml" id="0001" name="STZW402+ Electronic Thermostat" type="0001"/>
   </Manufacturer>
-  <Manufacturer id="0271" name="Steinel">
-    <Product config="steinel/is140-2.xml" id="1a72" name="IS 140-2" type="0002"/>
-    <Product config="steinel/is140-2.xml" id="1a73" name="XLED Home 2" type="0001"/>
-    <Product config="steinel/rs-led-d2.xml" id="1a74" name="RS LED D2" type="0001"/>
-    <Product config="steinel/l810-led-ihf.xml" id="1a75" name="L 810 LED iHF" type="0001"/>
-  </Manufacturer>
-  <Manufacturer id="0166" name="Swiid">
+  <Manufacturer id="0217" name="Strattec Advanced Logic"></Manufacturer>
+  <Manufacturer id="0168" name="STRATTEC Security"></Manufacturer>
+  <Manufacturer id="0105" name="Sumitomo"></Manufacturer>
+  <Manufacturer id="028B" name="Sunjet Components"></Manufacturer>
+  <Manufacturer id="0054" name="Superna"></Manufacturer>
+  <Manufacturer id="0191" name="Swann Communications"></Manufacturer>
+  <Manufacturer id="0339" name="SWYCS"></Manufacturer>
+  <Manufacturer id="0166" name="Swiid (CBCC Domotique SAS)">
     <Product config="swiid/swiidinter.xml" id="0100" name="SwiidInter" type="0100"/>
     <Product config="swiid/swiidplug.xml" id="0706" name="SwiidPlug" type="2007"/>
   </Manufacturer>
-  <Manufacturer id="0009" name="Sylvania">
-  </Manufacturer>
+  <Manufacturer id="0009" name="Sylvania"></Manufacturer>
+  <Manufacturer id="0136" name="Systech Corporation"></Manufacturer>
+  <Manufacturer id="0276" name="Systemair Sverige AB"></Manufacturer>
+  <Manufacturer id="0375" name="T&amp;W"></Manufacturer>
+  <Manufacturer id="0235" name="TAEWON Lighting"></Manufacturer>
+  <Manufacturer id="0262" name="Taiwan Fu Hsing Industrial"></Manufacturer>
+  <Manufacturer id="0264" name="Taiwan iCATCH"></Manufacturer>
+  <Manufacturer id="0186" name="Team Digital Limited"></Manufacturer>
+  <Manufacturer id="0089" name="Team Precision PCL"></Manufacturer>
+  <Manufacturer id="0240" name="Technicolor"></Manufacturer>
+  <Manufacturer id="000A" name="Techniku"></Manufacturer>
+  <Manufacturer id="012F" name="Tecom"></Manufacturer>
   <Manufacturer id="0012" name="Tell It Online">
+    <Product config="icare/zw-66.xml" id="0001" name="Switchkeeper Plug-in Appliance Module" type="0001"/>
   </Manufacturer>
   <Manufacturer id="0176" name="Telldus">
     <Product config="telldus/tzwp100.xml" id="0001" name="TZWP-100 Plug-in Switch" type="0003"/>
     <Product config="telldus/tzwp102.xml" id="0003" name="TZWP-102 Plug-in Switch" type="0003"/>
     <Product config="telldus/tzdw100.xml" id="0001" name="TZDW-100 Magnet Switch" type="0005"/>
   </Manufacturer>
-  <Manufacturer id="0048" name="Telsey">
-  </Manufacturer>
-  <Manufacturer id="010c" name="There">
-    <Product id="0001" name="ThereGate" type="0001"/>
+  <Manufacturer id="0048" name="Telsey"></Manufacturer>
+  <Manufacturer id="017E" name="Telular"></Manufacturer>
+  <Manufacturer id="0397" name="Teptron AB"></Manufacturer>
+  <Manufacturer id="005C" name="Terra Optima B.V."></Manufacturer>
+  <Manufacturer id="010c" name="There Corporation">
+    <Product config="there/800z.xml" id="0001" name="ThereGate" type="0001"/>
   </Manufacturer>
   <Manufacturer id="019b" name="ThermoFloor AS">
     <Product config="thermofloor/heatit021.xml" id="0001" name="Heatit Thermostat TF 021" type="0001"/>
     <Product config="thermofloor/heatit056.xml" id="0202" name="Heatit Thermostat TF 056" type="0003"/>
   </Manufacturer>
-  <Manufacturer id="008b" name="Trane">
+  <Manufacturer id="0317" name="Think Simple srl"></Manufacturer>
+  <Manufacturer id="022A" name="TIMEVALVE"></Manufacturer>
+  <Manufacturer id="033B" name="Tingcore AB"></Manufacturer>
+  <Manufacturer id="0118" name="Wenzhou TKB Control System">
+    <Product config="wenzhou/tz88.xml" id="0001" name="TZ88 Smart Energy Plug-in Switch" type="0001"/>
+    <Product config="wenzhou/tz88.xml" id="0011" name="TZ88 Smart Energy Plug-in Switch" type="0001"/>
+    <Product config="wenzhou/sm103.xml" id="0001" name="SM103 Door/Window Sensor" type="0002"/>
+    <Product config="wenzhou/tsp01.xml" id="0002" name="TSP01 3 in 1 PIR Motion Sensor" type="0002"/>
+    <Product config="wenzhou/tz68.xml" id="0002" name="TZ68 On/Off Switch Socket" type="0003"/>
+    <Product config="wenzhou/tz56.xml" id="0003" name="TZ56 Wall Switch On/Off" type="0003"/>
+    <Product config="wenzhou/tz55.xml" id="0004" name="TZ55 Wall Switch Dimmer" type="0003"/>
+	<Product id="0008" name="TZ67G Wall Plug Dimmer" type="0003" forumNr="no-statistics"/>
+    <Product config="wenzhou/tz69.xml" id="0002" name="TZ69 Smart energy plug in switch" type="0004"/>
+    <Product config="wenzhou/tz69.xml" id="3119" name="TZ69F Smart energy plug in switch" type="0116"/>
+    <Product config="everspring/st812.xml" id="0001" name="ST812 Flood Detector" type="000b"/>
+    <Product config="wenzhou/tz65d.xml" id="0808" name="TZ65 Dual Wall Dimmer" type="0808"/>
+    <Product config="wenzhou/tz68.xml" id="0103" name="TZ68 On/Off Switch Socket" type="0101"/>
+    <Product config="wenzhou/tz66d.xml" id="1020" name="TZ66D Dual Wall Switch" type="0102"/>
+    <Product config="wenzhou/tz67.xml" id="0611" name="TZ67 Wall Plug Dimmer" type="0202"/>
+    <Product config="wenzhou/tz69.xml" id="0103" name="TZ69E Smart energy plug in switch" type="0311"/>
+    <Product config="wenzhou/tz56s.xml" id="0202" name="TZ56S On/Off wall switch" type="0311"/>
+    <Product config="wenzhou/tz36d.xml" id="0203" name="TZ37 Wall Switch On/Off" type="0311" forumNr="unknown"/>
+    <Product config="wenzhou/tz79.xml" id="0305" name="TZ79 Power meter Relay Switch" type="0311"/>
+    <Product config="wenzhou/tz74.xml" id="0304" name="TZ74 Dual Switch" type="0311"/>
+  </Manufacturer>
+  <Manufacturer id="011C" name="TKH Group / Eminent"></Manufacturer>
+  <Manufacturer id="0327" name="TMC Technology"></Manufacturer>
+  <Manufacturer id="0326" name="TODKI"></Manufacturer>
+  <Manufacturer id="0319" name="Toledo"></Manufacturer>
+  <Manufacturer id="034F" name="TONG LUNG METAL INDUSTRY"></Manufacturer>
+  <Manufacturer id="0333" name="Toshiba Visual Solution"></Manufacturer>
+  <Manufacturer id="0283" name="TP-Link Technologies"></Manufacturer>
+  <Manufacturer id="008b" name="Trane Corporation">
     <Product config="trane/TZEMT400AB32MAA.xml" id="5431" name="Model TZEMT400AB32MAA" type="5452"/>
     <Product config="trane/TZEMT400BB32MAA.xml" id="5433" name="Model TZEMT400BB32MAA" type="5452"/>
     <Product config="trane/TZEMT400BB32MAA.xml" id="5436" name="Model TZEMT400BB32MAA" type="5452"/>
     <Product config="trane/TZEMT524AA21MA.xml" id="5442" name="Model TZEMT524AA21MA" type="5452"/>
     <Product config="trane/TZEMT524AA21MA.xml" id="5439" name="Model TCONT624AS42DAA" type="5452"/>
   </Manufacturer>
-  <Manufacturer id="006b" name="Tricklestar">
+  <Manufacturer id="0066" name="TrickleStar"></Manufacturer>
+  <Manufacturer id="006b" name="Tricklestar"></Manufacturer>
+  <Manufacturer id="0055" name="Tridium"></Manufacturer>
+  <Manufacturer id="0111" name="Tronico Technology Co. Ltd.">
+    <Product config="airlinemechanical/zds-ud10.xml" id="0200" name="ZDS-100" type="8200"/>
   </Manufacturer>
-  <Manufacturer id="0330" name="Tronika">
+  <Manufacturer id="0330" name="Sunricher">
+    <Product config="sunricher/srzv9001t4dimeu.xml" id="a10d" name="Touch Panel Wall Controller - ZSC-01D" type="0003"/>
+    <Product config="sunricher/srzv9001k8.xml" id="a305" name="Wall Controller - SR-ZV9001" type="0300"/>
     <Product config="sunricher/zv9101.xml" id="d005" name="Dimmer ZV-9101" type="0200"/>
+    <Product config="sunricher/srzv9101sachpeu.xml" id="d00c" name="Dimmer ZV9040" type="0200"/>
+    <Product config="sunricher/srzv9003t4rgbweu.xml" id="a107" name="Z-Wave Wall Controller - SR-ZV9003T4-RGBW-EU" type="0300"/>
   </Manufacturer>
-  <Manufacturer id="0049" name="Twisthink">
+  <Manufacturer id="0049" name="Twisthink"></Manufacturer>
+  <Manufacturer id="0270" name="Ubitech"></Manufacturer>
+  <Manufacturer id="0152" name="UFairy G.R. Tech">
+    <Product config="gr/gr105.xml" id="0511" name="GR105 Auto Valve" type="0202"/>
+    <Product config="gr/gr105n.xml" id="0512" name="GR105n Auto Valve" type="0003"/>
+    <Product id="0003" name="ZSE02 Motion Sensor" type="0500"/>
   </Manufacturer>
-  <Manufacturer id="0080" name="Vero Duco">
+  <Manufacturer id="0193" name="Universal Devices"></Manufacturer>
+  <Manufacturer id="0020" name="Universal Electronics Inc.">
+    <Product id="1390" name="Wireless Lighting Control" type="8007"/>
+    <Product config="jasco/45601.xml" id="1391" name="45601 Advanced Remote" type="8007"/>
   </Manufacturer>
-  <Manufacturer id="005e" name="ViewSonic">
+  <Manufacturer id="0183" name="Universe Future"></Manufacturer>
+  <Manufacturer id="0209" name="UTC Fire and Security Americas Corp"></Manufacturer>
+  <Manufacturer id="0388" name="Vates"></Manufacturer>
+  <Manufacturer id="030F" name="Vemmio"></Manufacturer>
+  <Manufacturer id="0198" name="Venstar"></Manufacturer>
+  <Manufacturer id="008c" name="Vera Control">
+    <Product config="vera/vera2.xml" id="0001" name="Vera Lite" type="0001"/>
   </Manufacturer>
-  <Manufacturer id="0007" name="Vimar CRS">
+  <Manufacturer id="0080" name="Vero Duco"></Manufacturer>
+  <Manufacturer id="0237" name="Vestel Elektronik Ticaret ve Sanayi"></Manufacturer>
+  <Manufacturer id="0053" name="Viewsonic"></Manufacturer>
+  <Manufacturer id="005e" name="ViewSonic Corporation"></Manufacturer>
+  <Manufacturer id="0007" name="Vimar CRS"></Manufacturer>
+  <Manufacturer id="0188" name="Vipa-Star"></Manufacturer>
+  <Manufacturer id="010a" name="Vitrum (VDA)">
+    <Product config="vitrum/vitrumI-Dimmer.xml" id="4900" name="Vitrum I EU Wireless Dimmer" type="1100"/>
+    <Product config="vitrum/vitrumII-Dimmer.xml" id="4a00" name="Vitrum II EU Wireless Dimmer" type="1100"/>
+    <Product config="vitrum/vitrumIII-Dimmer.xml" id="4b00" name="Vitrum III EU Wireless Dimmer" type="1100"/>
+    <Product config="vitrum/vitrumI-Switch.xml" id="5100" name="Vitrum I EU Wireless On-off" type="1200"/>
+    <Product config="vitrum/vitrumII-Switch.xml" id="5200" name="Vitrum II EU Wireless On-off" type="1200"/>
+    <Product config="vitrum/vitrumIII-Switch.xml" id="5300" name="Vitrum III EU Wireless On-off" type="1200"/>
+    <Product config="vitrum/vitrumIV-Switch.xml" id="5400" name="Vitrum IV EU Wireless On-off" type="1200"/>
+    <Product config="vitrum/vitrumII-RollerBlind.xml" id="5A00" name="Vitrum II EU Roller Blind Control" type="1300"/>
+    <Product config="vitrum/vitrumII-Dimmer.xml" id="8a00" name="Vitrum II BS Wireless Dimmer" type="2100"/>
+    <Product config="vitrum/vitrumI-Dimmer.xml" id="9100" name="Vitrum I BS Wireless On-off" type="2200"/>
+    <Product config="vitrum/vitrumII-Switch.xml" id="9200" name="Vitrum II BS Wireless On-off" type="2200"/>
+    <Product config="vitrum/vitrumIV-Switch.xml" id="9400" name="Vitrum IV BS Wireless On-off" type="2200"/>
+    <Product config="vitrum/vitrumIV-Switch.xml" id="6400" name="Vitrum IV EU Wireless On-off" type="4400"/>
+    <Product config="vitrum/vitrumIV-Switch.xml" id="6400" name="Vitrum IV EU Wireless On-off" type="3400"/>
+    <Product config="vitrum/vitrumVI-Switch.xml" id="6600" name="Vitrum VI EU Wireless On-off" type="1400"/>
+    <Product config="vitrum/vitrumI-Switch.xml" id="6100" name="Vitrum I EU Wireless On-off" type="1400"/>
   </Manufacturer>
-  <Manufacturer id="010a" name="Vitrum">
-    <Product config="vitrum/vitrumBS.xml" id="4900" name="Vitrum I EU Wireless Dimmer" type="1100"/>
-    <Product config="vitrum/vitrumBS.xml" id="4a00" name="Vitrum II EU Wireless Dimmer" type="1100"/>
-    <Product config="vitrum/vitrumBS.xml" id="4b00" name="Vitrum III EU Wireless Dimmer" type="1100"/>
-    <Product config="vitrum/vitrumBS.xml" id="5100" name="Vitrum I EU Wireless On-off" type="1200"/>
-    <Product config="vitrum/vitrumBS.xml" id="5200" name="Vitrum II EU Wireless On-off" type="1200"/>
-    <Product config="vitrum/vitrumBS.xml" id="5300" name="Vitrum III EU Wireless On-off" type="1200"/>
-    <Product config="vitrum/vitrumBS.xml" id="5400" name="Vitrum IV EU Wireless On-off" type="1200"/>
-    <Product config="vitrum/vitrumBS.xml" id="5A00" name="Vitrum II EU Roller Blind Control" type="1300"/>
-    <Product config="vitrum/vitrumBS.xml" id="8a00" name="Vitrum II BS Wireless Dimmer" type="2100"/>
-    <Product config="vitrum/vitrumBS.xml" id="9100" name="Vitrum I BS Wireless On-off" type="2200"/>
-    <Product config="vitrum/vitrumBS.xml" id="9200" name="Vitrum II BS Wireless On-off" type="2200"/>
-    <Product config="vitrum/vitrumBS.xml" id="9400" name="Vitrum IV BS Wireless On-off" type="2200"/>
-    <Product config="vitrum/vitrumBS.xml" id="6400" name="Vitrum IV EU Wireless On-off" type="4400"/>
-    <Product config="vitrum/vitrumBS.xml" id="6400" name="Vitrum IV EU Wireless On-off" type="3400"/>
-    <Product config="vitrum/vitrumBS.xml" id="6600" name="Vitrum VI EU Wireless On-off" type="1400"/>
-    <Product config="vitrum/vitrumBS.xml" id="6100" name="Vitrum I EU Wireless On-off" type="1400"/>
-  </Manufacturer>
-  <Manufacturer id="0109" name="Vision">
-    <Product id="0101" name="ZU1401 Z-Wave USB Stick" type="1001"/>
+  <Manufacturer id="0109" name="Vision Security">
+    <Product config="vision/zu1401jp.xml" id="0101" name="ZU1401 Z-Wave USB Stick" type="1001"/>
     <Product id="0104" name="ZU1401 Z-Wave USB Stick" type="1001"/>
     <Product id="0105" name="ZU1401 Z-Wave USB Stick" type="1001"/>
     <Product config="vision/zd2102.xml" id="0101" name="ZD2102 US Door/Window Sensor" type="2001"/>
@@ -1247,24 +1677,24 @@
     <Product config="vision/zs5101eu.xml" id="0302" name="ZS5101 Shock and Vibration Sensor" type="2003"/>
     <Product config="vision/zs5101eu.xml" id="0306" name="ZS5101 Shock and Vibration Sensor" type="2003"/>
     <Product config="vision/zs5101eu.xml" id="0307" name="ZS5101 Shock and Vibration Sensor" type="2003"/>
-    <Product id="0403" name="ZS6101 Smoke Detector" type="2004"/>
+    <Product config="vision/zs610eu.xml" id="0403" name="ZS6101 Smoke Detector" type="2004"/>
     <Product config="vision/zm1601eu.xml" id="0503" name="ZM1601 Battery Operated Siren" type="2005"/>
     <Product config="vision/zm1601eu.xml" id="0505" name="ZM1601 Battery Operated Siren" type="2005"/>
     <Product config="vision/zm1601eu5.xml" id="0508" name="ZM1601EU-5 Battery Operated Siren" type="2005"/>
     <Product id="0610" name="ZM1701 Electronic Deadbolt Door Lock without Handle" type="2006"/>
-    <Product id="0620" name="ZM1702 Electronic Deadbolt Door Lock with Handle" type="2006"/>
+    <Product config="vision/1701.xml" id="0620" name="ZM1702 Electronic Deadbolt Door Lock with Handle" type="2006"/>
     <Product id="0621" name="ZM1701 Electronic Deadbolt Door Lock without Handle" type="2006"/>
-    <Product id="0703" name="Plug-in Switch" type="2007"/>
-    <Product id="0803" name="ZL7101 Plug-in Dimmer Module" type="2008"/>
+    <Product config="vision/zl7201us.xml" id="0703" name="Plug-in Switch" type="2007"/>
+    <Product config="vision/zl7101us.xml" id="0803" name="ZL7101 Plug-in Dimmer Module" type="2008"/>
     <Product config="vision/zm1602eu.xml" id="0903" name="ZM1602 Main Operated Siren" type="2009"/>
     <Product config="vision/zm1602eu5.xml" id="0908" name="ZM1602+ DC/AC Power Siren" type="2009"/>
     <Product config="vision/zg8101.xml" id="0a02" name="ZG8101 Garage Door Detector" type="200a"/>
     <Product config="vision/zl7431.xml" id="0c02" name="ZL7431 In-Wall Switch Single Relay" type="200c"/>
     <Product id="0f02" name="ZS6301 CO Detector" type="200f"/>
     <Product id="0f03" name="ZS6301 CO Detector" type="200f"/>
-    <Product id="1203" name="ZR1202 Repeater" type="2012"/>
-    <Product id="1401" name="ZL7101 Plug-in Dimmer Module" type="2014"/>
-    <Product id="1717" name="ZL7432 In-Wall Switch, Dual Relay" type="2017"/>
+    <Product config="vision/zr1202us.xml" id="1203" name="ZR1202 Repeater" type="2012"/>
+    <Product config="vision/brg1-433.xml" id="1401" name="ZL7101 Plug-in Dimmer Module" type="2014"/>
+    <Product config="vision/zl7432us.xml" id="1717" name="ZL7432 In-Wall Switch, Dual Relay" type="2017"/>
     <Product config="vision/zl7261.xml" id="1aa4" name="ZL7261 Plug-in Power Monitor" type="201a"/>
     <Product config="vision/zf5201.xml" id="1c01" name="ZF5201 Flood sensor" type="201c"/>
     <Product config="vision/zd2201.xml" id="1f10" name="ZD2201 Multisensor 4in1" type="201f"/>
@@ -1273,60 +1703,66 @@
     <Product config="vision/zd2105us5.xml" id="2201" name="ZD2105US-5 Recessed Door/Window Sensor" type="2022"/>
     <Product id="0104" name="ZM1602 Main Operated Siren" type="3001"/>
   </Manufacturer>
-  <Manufacturer id="004a" name="Visualize">
-  </Manufacturer>
-  <Manufacturer id="004b" name="Watt Stopper">
-  </Manufacturer>
+  <Manufacturer id="004a" name="Visualize"></Manufacturer>
+  <Manufacturer id="0058" name="Vitelec"></Manufacturer>
+  <Manufacturer id="0263" name="Viva Labs AS"></Manufacturer>
+  <Manufacturer id="0156" name="Vivint"></Manufacturer>
+  <Manufacturer id="017B" name="Vs-Safety AS"></Manufacturer>
+  <Manufacturer id="004b" name="Watt Stopper"></Manufacturer>
   <Manufacturer id="0008" name="Wayne Dalton">
     <Product config="waynedalton/WDTC-20.xml" id="0020" name="WDTC-20 Thermostat" type="0007"/>
   </Manufacturer>
+  <Manufacturer id="019F" name="Webee Life"></Manufacturer>
   <Manufacturer id="0171" name="WeBeHome AB">
     <Product id="0001" name="WBH HG-900 Home Gateway" type="0001"/>
   </Manufacturer>
-  <Manufacturer id="0118" name="Wenzhou TKB Control System">
-    <Product config="wenzhou/tz88.xml" id="0001" name="TZ88 Smart Energy Plug-in Switch" type="0001"/>
-    <Product config="wenzhou/tz88.xml" id="0011" name="TZ88 Smart Energy Plug-in Switch" type="0001"/>
-    <Product config="wenzhou/sm103.xml" id="0001" name="SM103 Door/Window Sensor" type="0002"/>
-    <Product config="wenzhou/tsp01.xml" id="0002" name="TSP01 3 in 1 PIR Motion Sensor" type="0002" />
-    <Product config="wenzhou/tz68.xml" id="0002" name="TZ68 On/Off Switch Socket" type="0003"/>
-    <Product config="wenzhou/tz56.xml" id="0003" name="TZ56 Wall Switch On/Off" type="0003"/>
-    <Product config="wenzhou/tz55.xml" id="0004" name="TZ55 Wall Switch Dimmer" type="0003"/>
-    <Product id="0008" name="TZ67G Wall Plug Dimmer" type="0003" forumNr="no-statistics"/>
-    <Product config="wenzhou/tz69.xml" id="0002" name="TZ69 Smart energy plug in switch" type="0004"/>
-    <Product config="wenzhou/tz69.xml" id="0103" name="TZ69E Smart energy plug in switch" type="0311"/>
-    <Product config="wenzhou/tz69.xml" id="3119" name="TZ69F Smart energy plug in switch" type="0116"/>
-    <Product config="everspring/st812.xml" id="0001" name="ST812 Flood Detector" type="000b"/>
-    <Product config="wenzhou/tz65d.xml" id="0808" name="TZ65 Dual Wall Dimmer" type="0808"/>
-    <Product config="wenzhou/tz68.xml" id="0103" name="TZ68 On/Off Switch Socket" type="0101"/>
-    <Product config="wenzhou/tz66d.xml" id="1020" name="TZ66D Dual Wall Switch" type="0102"/>
-    <Product config="wenzhou/tz67.xml" id="0611" name="TZ67 Wall Plug Dimmer" type="0202"/>
-    <Product config="wenzhou/tz36d.xml" id="0203" name="TZ37 Wall Switch On/Off" type="0311"/>
-    <Product config="wenzhou/tz74.xml" id="0304" name="TZ74 Dual Switch" type="0311"/>
-    <Product config="wenzhou/tz79.xml" id="0305" name="TZ79 Power meter Relay Switch" type="0311"/>
+  <Manufacturer id="011a" name="Wenzhou MTLC Electric Appliances (Enerwave)">
+    <Product config="enerwave/zwn-bpc.xml" id="0901" name="ZWN-BPC Ceiling Mounted PIR Motion Sensor" type="0601"/>
+    <Product config="enerwave/zwn-sc7.xml" id="0b03" name="ZWN-SC7 7-Button Scene Controller" type="0801"/>
+    <Product config="enerwave/zw15s.xml" id="0102" name="ZW15S 15A On/Off Switch" type="0101"/>
+    <Product config="enerwave/zw20r.xml" id="0603" name="ZW20R 20A TR Duplex Receptacle" type="0101"/>
+    <Product config="enerwave/zwnrsm1plus.xml" id="0605" name="ZWN-RSM1 PLUS-Smart Single Relay Switch Module" type="0111"/>
+    <!--<Product type="0111" id="0605" name="ZWN-RSM2-PLUS Smart Single Relay Switch Module" config="enerwave/zwnrsm2plus.xml"/>-->
+    <Product config="enerwave/zw20rm.xml" id="0101" name="ZW20RM 20A TR Smart Meter Duplex Receptacle" type="0111"/>
+    <Product config="enerwave/zw500d.xml" id="0201" name="ZW500D 500W In-Wall Preset Dimmer Switch" type="0102"/>
+    <Product config="enerwave/zw15rmplus.xml" id="0105" name="ZW15RM Plus 15A TR Smart Meter Duplex Receptacle" type="0111"/>
   </Manufacturer>
+  <Manufacturer id="026C" name="Westcontrol AS"></Manufacturer>
+  <Manufacturer id="0057" name="Whirlpool"></Manufacturer>
+  <Manufacturer id="027B" name="White Rabbit"></Manufacturer>
   <Manufacturer id="0149" name="wiDom">
     <Product config="widom/UBS104.xml" id="0104" name="UBS104 Universal Relay Switch" type="0012"/>
     <Product config="widom/UME304C_S.xml" id="0304" name="UME304 Energy Driven Switch" type="1214"/>
     <Product config="widom/WDS.xml" id="0504" name="WDS Universal Double Switch" type="1214"/>
   </Manufacturer>
-  <Manufacturer id="004c" name="Woodward Labs">
-  </Manufacturer>
-  <Manufacturer id="0003" name="Wrap">
-  </Manufacturer>
-  <Manufacturer id="004d" name="Xanboo">
+  <Manufacturer id="012D" name="Wilshine Holding"></Manufacturer>
+  <Manufacturer id="017F" name="Wink"></Manufacturer>
+  <Manufacturer id="004c" name="Woodward Labs"></Manufacturer>
+  <Manufacturer id="0242" name="Winytechnology"></Manufacturer>
+  <Manufacturer id="0199" name="Wireless Maingate AB"></Manufacturer>
+  <Manufacturer id="0269" name="WOOREE Lighting"></Manufacturer>
+  <Manufacturer id="0003" name="Wrap"></Manufacturer>
+  <Manufacturer id="022F" name="WRT Intelligent Technology"></Manufacturer>
+  <Manufacturer id="012E" name="Wuhan NWD Technology"></Manufacturer>
+  <Manufacturer id="004d" name="Xanboo"></Manufacturer>
+  <Manufacturer id="037D" name="Xiamen AcTEC Electronics"></Manufacturer>
+  <Manufacturer id="0000" name="Z-Wave (Sigma Designs)">
+    <Product id="0001" name="UZB Z-Wave USB Adapter" type="0001"/>
   </Manufacturer>
+  <Manufacturer id="031D" name="Z-Wave Alliance"></Manufacturer>
+  <Manufacturer id="004F" name="Z-Wave Technologia"></Manufacturer>
   <Manufacturer id="0115" name="Z-Wave.Me">
-    <Product id="0001" name="Z-Wave USB Stick" type="0001"/>
+    <Product config="zwave.me/zme_raz5.xml" id="0001" name="Z-Wave USB Stick" type="0001"/>
     <Product config="zwave.me/kfob.xml" id="0069" name="Key Fob" type="0001"/>
     <Product id="0003" name="Z-Wave USB Stick" type="0002"/>
     <Product id="0001" name="Floor Thermostat" type="0024"/>
     <Product config="zwave.me/kfob.xml" id="0001" name="ZME_KFOB 4 Button Key Fob" type="0100"/>
     <Product config="zwave.me/ZME_WCD2.xml" id="0004" name="ZME_WCD2 Double Paddle Wall Controller" type="0100"/>
-    <Product config="zwave.me/ZME_WALLC-S.xml" id="0101" name="ZME_WALLC-S Secure Wall Controller" type="0100" />
-    <Product config="zwave.me/ZME_KFOB-S.xml" id="0102" name="ZME_KFOB-S 4 Button Key Fob" type="0100" />
-    <Product config="zwave.me/popp_kfob-c.xml" id="0103" name="Popp KFOB-C Remote Control" type="0100" />
+    <Product config="zwave.me/ZME_WALLC-S.xml" id="0101" name="ZME_WALLC-S Secure Wall Controller" type="0100"/>
+    <Product config="zwave.me/ZME_KFOB-S.xml" id="0102" name="ZME_KFOB-S 4 Button Key Fob" type="0100"/>
+    <Product config="zwave.me/popp_kfob-c.xml" id="0103" name="Popp KFOB-C Remote Control" type="0100"/>
     <Product id="0200" name="Smoke Detector" type="0100"/>
-    <Product id="0201" name="Smoke Detector" type="0100"/>
+    <Product config="zwave.me/004001.xml" id="0201" name="Smoke Detector" type="0100"/>
     <Product config="zwave.me/zweather.xml" id="0400" name="Z-Weather Wind and Weather Sensor" type="0100"/>
     <Product config="zwave.me/ZUno.xml" id="0001" name="Z-Uno" type="0110"/>
     <Product config="zwave.me/iTemp.xml" id="0001" name="iTemp Temperature Sensor" type="0200"/>
@@ -1336,7 +1772,7 @@
     <Product id="0001" name="ZME_UZB1 USB Stick" type="0400"/>
     <Product config="zwave.me/ZME_05431.xml" id="0001" name="ZME_054313Z Flush-Mountable Switch" type="1000"/>
     <Product config="zwave.me/ZME_06433.xml" id="0002" name="ZME_06433/05433 Wall Flush-Mountable Dimmer" type="1000"/>
-    <Product config="zwave.me/ZME_06436.xml" id="0003" name="ZME_06436 Motor Control" type="1000" />
+    <Product config="zwave.me/ZME_06436.xml" id="0003" name="ZME_06436 Motor Control" type="1000"/>
     <Product config="zwave.me/ZME_064435.xml" id="0004" name="ZME_064435 Wall Controller" type="1000"/>
     <Product config="zwave.me/ZME_05461.xml" id="0100" name="ZME_05461 Dual Load Wall Switch" type="1000"/>
     <Product config="zwave.me/ZME_064381.xml" id="0200" name="ZME_064281 Wall Plug switch Schuko (IP44) Gen 5" type="1000"/>
@@ -1348,19 +1784,22 @@
     <Product id="0001" name="RaZberry Controller ZWave+" type="0400"/>
     <Product id="0002" name="RaZberry Controller 2016 ZWave+" type="0400"/>
   </Manufacturer>
-  <Manufacturer id="004f" name="Z-Wave Technologia">
-  </Manufacturer>
-  <Manufacturer id="004e" name="Zdata">
-  </Manufacturer>
+  <Manufacturer id="024D" name="Z-works"></Manufacturer>
+  <Manufacturer id="024E" name="zConnect"></Manufacturer>
+  <Manufacturer id="004e" name="Zdata"></Manufacturer>
+  <Manufacturer id="016F" name="Zhejiang Jiuxing Electric"></Manufacturer>
+  <Manufacturer id="040E" name="ZHONGSHAN YunJia INTELLIGENT TECHNOLOGY"></Manufacturer>
+  <Manufacturer id="036E" name="Zinno"></Manufacturer>
   <Manufacturer id="0131" name="Zipato">
-    <Product config="zipato/pan04.xml" id="0012" name="Micro Module Switch Double PAN04" type="0001" />
-    <Product config="zipato/RGBBulb.xml" id="0002" name="RGBW LED Bulb" type="0002" />
+    <Product config="zipato/pan04.xml" id="0012" name="Micro Module Switch Double PAN04" type="0001"/>
+    <Product config="zipato/RGBBulb.xml" id="0002" name="RGBW LED Bulb" type="0002"/>
     <Product config="zipato/RGBBulb2.xml" id="0003" name="Bulb 2" type="0002"/>
     <Product config="philio/pst02.xml" id="000c" name="PST02-A 4 in 1 Multi-Sensor" type="0002"/>
     <Product config="philio/pse02.xml" id="000a" name="Indoor Siren" type="0004"/>
+    <Product config="philio/pad02.xml" id="0031" name="PH-PAD02.eu Smart Dimmer Socket E27" type="0005"/>
     <Product config="philio/phpab01.xml" id="001a" name="PH-PAB01.eu Micromodule Energy Meter" type="0006"/>
-    <Product config="zipato/MiniKeypad.xml" id="4501" name="Zipato Mini Keypad" type="6131" />
-    <Product config="zipato/vszd2102.xml" id="0106" name="VS-ZD2102 Door/Window Sensor" type="2001" />
+    <Product config="zipato/MiniKeypad.xml" id="4501" name="Zipato Mini Keypad" type="6131"/>
+    <Product config="zipato/vszd2102.xml" id="0106" name="VS-ZD2102 Door/Window Sensor" type="2001"/>
     <Product config="zipato/zp3102.xml" id="0205" name="ZP3102-EU Multisensor Duo" type="2002"/>
     <Product config="vision/zd2301.xml" id="1f20" name="ZD2301 Multisensor 4in1" type="201f"/>
     <Product config="heiman/HS1SA-Z.xml" id="1000" name="Smart Smoke Sensor HS1SA-Z" type="8002"/>
@@ -1368,32 +1807,41 @@
     <Product config="heiman/HS1WL-Z.xml" id="1000" name="Water Leakage Sensor HS1WL-Z" type="8004"/>
     <Product config="heiman/HS1CA-Z.xml" id="1000" name="CO Sensor HS1CA-Z" type="8005"/>
   </Manufacturer>
+  <Manufacturer id="0120" name="Zonoff"></Manufacturer>
   <Manufacturer id="027a" name="Zooz">
-    <Product config="zooz/zse08.xml" id="0082" name="ZSE08 Contact Sensor" type="0003" />
-    <Product config="zooz/zse09.xml" id="0083" name="ZSE09 Mini Sensor" type="0003" />
+    <Product config="zooz/zse08.xml" id="0082" name="ZSE08 Contact Sensor" type="0003"/>
+    <Product config="zooz/zse09.xml" id="0083" name="ZSE09 Mini Sensor" type="0003"/>
     <Product config="zooz/zen22v2.xml" id="1f1c" name="ZEN22 Dimmer V2" type="b112"/>
-    <Product config="zooz/zse30.xml" id="0085" name="ZSE30 Water Sensor" type="0003" />
-    <Product config="zooz/zen07.xml" id="0087" name="ZEN07 Mini Plug" type="0003" />
-    <Product config="zooz/zse40.xml" id="2101" name="ZSE40 4-in-1 sensor" type="2021" />
-    <Product config="zooz/zse33.xml" id="0088" name="ZSE33 Smart Chime" type="0003" />
+    <Product config="zooz/zse30.xml" id="0085" name="ZSE30 Water Sensor" type="0003"/>
+    <Product config="zooz/zen07.xml" id="0087" name="ZEN07 Mini Plug" type="0003"/>
+    <Product config="zooz/zse40.xml" id="2101" name="ZSE40 4-in-1 sensor" type="2021"/>
+    <Product config="zooz/zse33.xml" id="0088" name="ZSE33 Smart Chime" type="0003"/>
     <Product config="zooz/zen06.xml" id="000a" name="ZEN06" type="0101"/>
-    <Product config="zooz/zen23.xml" id="251c" name="ZEN23 Toggle Switch V2" type="b111" />
-    <Product config="zooz/zen15.xml" id="000D" name="ZEN15 Power Switch" type="0101" />
+    <Product config="zooz/zen23.xml" id="251c" name="ZEN23 Toggle Switch V2" type="b111"/>
+    <Product config="zooz/zen15.xml" id="000D" name="ZEN15 Power Switch" type="0101"/>
+    <Product config="zooz/zse18.xml" id="0012" name="ZSE18 Motion Sensor" type="0301"/>
+    <Product id="0002" name="ZST10 S2 Z-Wave Plus USB Stick" type="0401"/>
+    <Product config="zooz/zen26.xml" id="a001" name="ZEN26 S2 On Off Wall Switch" type="a000"/>
+    <Product config="zooz/zen27.xml" id="a002" name="ZEN27 S2 Dimmer Wall Switch" type="a000"/>
+    <Product config="zooz/zen21.xml" id="1e1c" name="ZEN21 Switch V2.0" type="b111"/>
+    <Product config="zooz/zse19.xml" id="0003" name="ZSE19 S2 Multisiren" type="000c"/>
+    <Product config="zooz/zen20v2.xml" id="a004" name="ZEN20 V2.0 Power Strip" type="a000"/>
+    <Product config="zooz/zse29.xml" id="0005" name="ZSE29 Outdoor Motion Sensor" type="0001"/>
+    <Product config="zooz/zen25.xml" id="a003" name="ZEN25 S2 Double Plug with USB Port" type="a000"/>
   </Manufacturer>
-  <Manufacturer id="015d" name="Zooz">
-    <Product config="zooz/zen20.xml" id="f51c" name="ZEN20 Power Strip" type="0651" />
+  <Manufacturer id="015d" name="Zooz (Willis Electric)">
+    <Product config="zooz/zen20.xml" id="f51c" name="ZEN20 Power Strip" type="0651"/>
     <Product config="zooz/zen21.xml" id="231c" name="ZEN21 Switch" type="0111"/>
     <Product config="zooz/zen22.xml" id="241c" name="ZEN22 Dimmer" type="0112"/>
-    <Product config="zooz/zen23.xml" id="1e1c" name="ZEN23 Toggle Switch" type="1111" />
-    <Product config="zooz/zen24.xml" id="1f1c" name="ZEN24 Dimmer Switch" type="0111" />
+    <Product config="zooz/zen23.xml" id="1e1c" name="ZEN23 Toggle Switch" type="1111"/>
+    <Product config="zooz/zen24.xml" id="1f1c" name="ZEN24 Dimmer Switch" type="0111"/>
     <Product config="inovelli/nzw97.xml" id="6100" name="NZW97 Inovelli Dual Outdoor Z-Wave Plug" type="6100"/>
+    <Product config="zooz/zen21.xml" id="1e1c" name="ZEN21 Switch V2.0" type="b111"/>
   </Manufacturer>
-  <Manufacturer id="0315" name="Z Wave Products Inc.">
+  <Manufacturer id="0315" name="zwaveproducts.com">
+    <Product type="4447" id="3031" name="PA-100" config="zwp/PA-100.xml"/>
     <Product config="zwp/WD-100.xml" id="3034" name="WD-100" type="4447"/>
   </Manufacturer>
-  <Manufacturer id="0021" name="Zykronix">
-  </Manufacturer>
-  <Manufacturer id="0131" name="ZyXEL">
-    <Product config="everspring/sp103.xml" id="0001" name="SP103 PIR Motion Sensor" type="0101"/>
-  </Manufacturer>
+  <Manufacturer id="0021" name="Zykronix"></Manufacturer>
+  <Manufacturer id="0135" name="ZyXEL"></Manufacturer>
 </ManufacturerSpecificData>