diff --git a/config/inovelli/nzw1201.xml b/config/inovelli/nzw1201.xml
new file mode 100644
index 00000000..aafdda45
--- /dev/null
+++ b/config/inovelli/nzw1201.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Product xmlns="http://code.google.com/p/open-zwave/">
+  <!-- Configuration Parameters -->
+  <CommandClass id="112">
+  </CommandClass>
+
+  <!-- Association Groups -->
+  <CommandClass id="133">
+    <Associations num_groups="2">
+      <Group index="1" label="Lifeline" max_associations="5" />
+	  <Group index="2" label="Basic_Set" max_associations="5" />
+    </Associations>
+  </CommandClass>
+
+</Product>
diff --git a/config/inovelli/nzw30.xml b/config/inovelli/nzw30.xml
index 3f8bdf5f..37246070 100644
--- a/config/inovelli/nzw30.xml
+++ b/config/inovelli/nzw30.xml
@@ -20,9 +20,17 @@
 
   <!-- Association Groups -->
   <CommandClass id="133">
-    <Associations num_groups="1">
+    <Associations num_groups="2">
       <Group index="1" label="Lifeline" max_associations="5" />
+	    <Group index="2" label="Basic_Set" max_associations="5" />
     </Associations>
   </CommandClass>
+<!-- Central Scene Reports -->
+  <CommandClass id="91" name="COMMAND_CLASS_CENTRAL_SCENE" version="1" request_flags="4" scenecount="0">
+    <Instance index="1" />
+      <Value type="int" genre="system" instance="1" index="0" label="Scene Count" units="" read_only="true" write_only="false" verify_changes="false" min="-2147483648" max="2147483647" value="2" />
+      <Value type="int" genre="user" instance="1" index="1" label="Top Button Scene" units="" read_only="false" write_only="false" verify_changes="false" min="-2147483648" max="2147483647" value="0" />
+      <Value type="int" genre="user" instance="1" index="2" label="Bottom Button Scene" units="" read_only="false" write_only="false" verify_changes="false" min="-2147483648" max="2147483647" value="0" />
+  </CommandClass>
 
 </Product>
diff --git a/config/inovelli/nzw31.xml b/config/inovelli/nzw31.xml
index 2f7c154b..aa0c6ef4 100644
--- a/config/inovelli/nzw31.xml
+++ b/config/inovelli/nzw31.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Inovelli Dimmer NZW31 -->
 <Product xmlns="http://code.google.com/p/open-zwave/">
   <!-- Configuration Parameters -->
   <CommandClass id="112">
-    <Value genre="config" index="1" label="Dimming/Brightening Step Level" min="1" max="99" units="%" value="1" size="1" type="byte">
-      <Help>Each step of the dimming process will increase or decrease the brightness by this percentage. Increasing this will make the transition time quicker. Range 1-99%</Help>
+    <Value genre="config" index="1" label="Dimming/Brightening Step Level" min="0" max="99" units="%" value="3" size="1" type="byte">
+      <Help>Each step of the dimming process will increase or decrease the brightness by this percentage. Increasing this will make the transition time quicker.</Help>
     </Value>
     <Value genre="config" index="2" label="Minimum Dimming Level" min="1" max="99" units="%" value="1" size="1" type="byte">
-    <Help>This is the minimum value to which the switch will dim. Useful for CFL or LED lights that otherwise won't come on or come on but flicker/buzz. Range 1-99%</Help>
+    <Help>This is the minimum value to which the switch will dim. Useful for CFL or LED lights that otherwise won't come on or come on but flicker/buzz.</Help>
     </Value>
     <Value genre="config" index="3" value="0" label="LED Indicator Control" units="" size="1" min="0" max="255" type="list">
       <Help>Choose if you want the LED indicator to turn on when switch is on or off or disable completely.</Help>
       <Item value="0" label="LED on when switch is off"/>
       <Item value="1" label="LED on when switch is on"/>
       <Item value="2" label="LED is disabled"/>
+	  <Item value="3" label="LED is always on"/>
     </Value>
     <Value genre="config" index="4" value="0" label="Orientation" units="" size="1" min="0" max="255" type="list">
       <Help>Controls the on/off orientation of the rocker switch</Help>
@@ -22,6 +22,30 @@
     </Value>
     <Value genre="config" index="5" value="0" label="Automatically turn switch off after interval" units="seconds" size="2" min="0" max="32767" type="short">
       <Help>Automatically turn the switch off after this many seconds. 0 is disabled, or up to 32767 seconds</Help>
+    </Value>
+	<Value genre="config" index="6" value="0" label="Association Group 3 Behavior" units="" size="1" min="0" max="255" type="list">
+      <Help>Change how devices respond when associated in group 3</Help>
+      <Item value="0" label="Dim up/down"/>
+      <Item value="1" label="Keep in sync"/>
+    </Value>
+	<Value genre="config" index="7" value="1" label="Association Group 3 Configuration" units="" size="1" min="0" max="255" type="list">
+      <Help>Send association group 3 commands on these types of actions</Help>
+      <Item value="0" label="none"/>
+      <Item value="1" label="local"/>
+      <Item value="2" label="3way"/>
+	  <Item value="3" label="3way &amp; local"/>
+	  <Item value="4" label="z-wave hub"/>
+      <Item value="5" label="z-wave hub &amp; local"/>
+      <Item value="6" label="z-wave hub &amp; 3-way"/>
+	  <Item value="7" label="z-wave hub &amp; local &amp; 3way"/>
+	  <Item value="8" label="timer"/>
+      <Item value="9" label="timer &amp; local"/>
+      <Item value="10" label="timer &amp; 3-way"/>
+	  <Item value="11" label="timer &amp; 3-way &amp; local"/>
+	  <Item value="12" label="timer &amp; z-wave hub"/>
+      <Item value="13" label="timer &amp; z-wave hub &amp; local"/>
+      <Item value="14" label="timer &amp; z-wave hub &amp; 3-way"/>
+	  <Item value="15" label="all"/>
     </Value>
     <Value genre="config" index="8" value="0" label="Default value when turned on at switch" min="0" max="99" size="1" type="byte">
       <Help>Default brightness when switch is turned on locally.  0 is previous. Firmware 1.02+"</Help>
@@ -33,14 +57,18 @@
 
   <!-- Association Groups -->
   <CommandClass id="133">
-    <Associations num_groups="1">
+    <Associations num_groups="3">
       <Group index="1" label="Lifeline" max_associations="5" />
+	  <Group index="2" label="Basic_Set" max_associations="5" />
+	  <Group index="3" label="Switch_Multilevel_Set" max_associations="5" />
     </Associations>
   </CommandClass>
+<!-- Central Scene Reports -->
   <CommandClass id="91" name="COMMAND_CLASS_CENTRAL_SCENE" version="1" request_flags="4" scenecount="0">
-				<Instance index="1" />
-				<Value type="int" genre="system" instance="1" index="0" label="Scene Count" units="" read_only="true" write_only="false" verify_changes="false" min="-2147483648" max="2147483647" value="2" />
-				<Value type="int" genre="user" instance="1" index="1" label="Bottom Button Scene" units="" read_only="false" write_only="false" verify_changes="false" min="-2147483648" max="2147483647" value="1" />
-				<Value type="int" genre="user" instance="1" index="2" label="Top Button Scene" units="" read_only="false" write_only="false" verify_changes="false" min="-2147483648" max="2147483647" value="1" />
+    <Instance index="1" />
+      <Value type="int" genre="system" instance="1" index="0" label="Scene Count" units="" read_only="true" write_only="false" verify_changes="false" min="-2147483648" max="2147483647" value="2" />
+      <Value type="int" genre="user" instance="1" index="1" label="Top Button Scene" units="" read_only="false" write_only="false" verify_changes="false" min="-2147483648" max="2147483647" value="0" />
+      <Value type="int" genre="user" instance="1" index="2" label="Bottom Button Scene" units="" read_only="false" write_only="false" verify_changes="false" min="-2147483648" max="2147483647" value="0" />
   </CommandClass>
+
 </Product>
diff --git a/config/inovelli/nzw36.xml b/config/inovelli/nzw36.xml
new file mode 100644
index 00000000..775acdcb
--- /dev/null
+++ b/config/inovelli/nzw36.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Product xmlns="http://code.google.com/p/open-zwave/">
+  <!-- Configuration Parameters -->
+  <CommandClass id="112">
+    <Value genre="config" index="1" value="0" label="LED Indicator Control" units="" size="1" min="0" max="255" type="list">
+      <Help>Choose if you want the LED indicator to turn on when switch is on or off or disable completely.</Help>
+      <Item value="0" label="LED on when switch is off"/>
+      <Item value="1" label="LED on when switch is on"/>
+      <Item value="2" label="LED is disabled"/>
+    </Value>
+    <Value genre="config" index="2" value="0" label="Automatically turn switch off after interval" units="seconds" size="2" min="0" max="32767" type="short">
+      <Help>Automatically turn the switch off after this many seconds. 0 is disabled</Help>
+    </Value>
+  </CommandClass>
+
+  <!-- Association Groups -->
+  <CommandClass id="133">
+    <Associations num_groups="1">
+      <Group index="1" label="Lifeline" max_associations="5" />
+    </Associations>
+  </CommandClass>
+
+</Product>
diff --git a/config/inovelli/nzw37.xml b/config/inovelli/nzw37.xml
new file mode 100644
index 00000000..ca917491
--- /dev/null
+++ b/config/inovelli/nzw37.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Product xmlns="http://code.google.com/p/open-zwave/">
+  <!-- Configuration Parameters -->
+  <CommandClass id="112">
+    <Value genre="config" index="1" value="0" label="LED Indicator Control" units="" size="1" min="0" max="255" type="list">
+      <Help>Choose if you want the LED indicator to turn on when switch is on or off or disable completely.</Help>
+      <Item value="0" label="LED on when switch is off"/>
+      <Item value="1" label="LED on when switch is on"/>
+      <Item value="2" label="LED is disabled"/>
+    </Value>
+    <Value genre="config" index="2" value="0" label="Automatically turn channel 1 off after interval" units="seconds" size="2" min="0" max="32767" type="short">
+      <Help>Automatically turn channel 1 off after this many seconds. 0 is disabled</Help>
+    </Value>
+    <Value genre="config" index="3" value="0" label="Automatically turn channel 2 off after interval" units="seconds" size="2" min="0" max="32767" type="short">
+      <Help>Automatically turn channel 2 off after this many seconds. 0 is disabled</Help>
+    </Value>
+  </CommandClass>
+
+  <!-- Association Groups -->
+  <CommandClass id="133">
+    <Associations num_groups="1">
+      <Group index="1" label="Lifeline" max_associations="5" />
+    </Associations>
+  </CommandClass>
+
+</Product>
diff --git a/config/inovelli/nzw39.xml b/config/inovelli/nzw39.xml
new file mode 100644
index 00000000..775acdcb
--- /dev/null
+++ b/config/inovelli/nzw39.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Product xmlns="http://code.google.com/p/open-zwave/">
+  <!-- Configuration Parameters -->
+  <CommandClass id="112">
+    <Value genre="config" index="1" value="0" label="LED Indicator Control" units="" size="1" min="0" max="255" type="list">
+      <Help>Choose if you want the LED indicator to turn on when switch is on or off or disable completely.</Help>
+      <Item value="0" label="LED on when switch is off"/>
+      <Item value="1" label="LED on when switch is on"/>
+      <Item value="2" label="LED is disabled"/>
+    </Value>
+    <Value genre="config" index="2" value="0" label="Automatically turn switch off after interval" units="seconds" size="2" min="0" max="32767" type="short">
+      <Help>Automatically turn the switch off after this many seconds. 0 is disabled</Help>
+    </Value>
+  </CommandClass>
+
+  <!-- Association Groups -->
+  <CommandClass id="133">
+    <Associations num_groups="1">
+      <Group index="1" label="Lifeline" max_associations="5" />
+    </Associations>
+  </CommandClass>
+
+</Product>
diff --git a/config/inovelli/nzw96.xml b/config/inovelli/nzw96.xml
new file mode 100644
index 00000000..cf05016d
--- /dev/null
+++ b/config/inovelli/nzw96.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Product xmlns="http://code.google.com/p/open-zwave/">
+  <!-- Configuration Parameters -->
+  <CommandClass id="112">
+    <Value genre="config" index="1" value="0" label="LED Indicator Control" units="" size="1" min="0" max="255" type="list">
+      <Help>Choose if you want the LED indicator to turn on when switch is on or off or disable completely.</Help>
+      <Item value="0" label="LED on when switch is off"/>
+      <Item value="1" label="LED on when switch is on"/>
+      <Item value="2" label="LED is disabled"/>
+    </Value>
+    <Value genre="config" index="2" value="0" label="Automatically turn switch off after interval" units="seconds" size="2" min="0" max="32767" type="short">
+      <Help>Automatically turn the switch off after this many seconds. 0 is disabled</Help>
+    </Value>
+  </CommandClass>
+
+  <!-- Association Groups -->
+  <CommandClass id="133">
+    <Associations num_groups="2">
+      <Group index="1" label="Lifeline" max_associations="5" />
+      <Group index="2" label="Basic_Set" max_associations="5" />
+    </Associations>
+  </CommandClass>
+
+</Product>
diff --git a/config/inovelli/nzw97.xml b/config/inovelli/nzw97.xml
index 95192758..44221841 100644
--- a/config/inovelli/nzw97.xml
+++ b/config/inovelli/nzw97.xml
@@ -2,18 +2,25 @@
 <Product xmlns="http://code.google.com/p/open-zwave/">
   <!-- Configuration Parameters -->
   <CommandClass id="112">
-    <Value genre="config" index="3" value="0" label="LED Indicator Control" units="" size="1" min="0" max="255" type="list">
+    <Value genre="config" index="1" value="0" label="LED Indicator Control" units="" size="1" min="0" max="255" type="list">
       <Help>Choose if you want the LED indicator to turn on when switch is on or off or disable completely.</Help>
       <Item value="0" label="LED on when switch is off"/>
       <Item value="1" label="LED on when switch is on"/>
       <Item value="2" label="LED is disabled"/>
     </Value>
+    <Value genre="config" index="2" value="0" label="Automatically turn channel 1 off after interval" units="seconds" size="2" min="0" max="32767" type="short">
+      <Help>Automatically turn channel 1 off after this many seconds. 0 is disabled</Help>
+    </Value>
+    <Value genre="config" index="3" value="0" label="Automatically turn channel 2 off after interval" units="seconds" size="2" min="0" max="32767" type="short">
+      <Help>Automatically turn channel 2 off after this many seconds. 0 is disabled</Help>
+    </Value>
   </CommandClass>
 
   <!-- Association Groups -->
   <CommandClass id="133">
-    <Associations num_groups="1">
+    <Associations num_groups="2">
       <Group index="1" label="Lifeline" max_associations="5" />
+      <Group index="2" label="Basic_Set" max_associations="5" />
     </Associations>
   </CommandClass>
 
diff --git a/config/manufacturer_specific.xml b/config/manufacturer_specific.xml
index 155f3a33..88c9aee8 100644
--- a/config/manufacturer_specific.xml
+++ b/config/manufacturer_specific.xml
@@ -738,15 +738,20 @@
 		<Product type="0001" id="0001" name="RAone SmartDimmer Wall Dimmer Module"/>
 	</Manufacturer>
 	<Manufacturer id="0312" name="Inovelli">
-		<Product type="1e00" id="1e00" name="NZW30S On/Off Switch(scene)" config="inovelli/nzw30.xml"/>
-		<Product type="1e01" id="1e01" name="NZW30 On/Off Switch" config="inovelli/nzw30.xml"/>
-		<Product type="1e02" id="1e02" name="NZW30T On/Off Toggle(scene)" config="inovelli/nzw30.xml"/>
-		<Product type="1f00" id="1f00" name="NZW31S Dimmer(scene)" config="inovelli/nzw31.xml"/>
-		<Product type="1f01" id="1f01" name="NZW31 Dimmer" config="inovelli/nzw31.xml"/>
-		<Product type="1f02" id="1f02" name="NZW31T Dimmer(scene)" config="inovelli/nzw31.xml"/>
-		<Product type="b211" id="241c" name="NZW36 Smart Plug-In Module (1 Channel)" config="inovelli/simple_module.xml"/>
-		<Product type="b221" id="251c" name="NZW37 Smart Plug-In Module (2 Channel)" config="inovelli/simple_module.xml"/>
-		<Product type="b212" id="271c" name="NZW39 Smart Plug (Dimmer)" config="inovelli/simple_module.xml"/>
+		<Product type="1e01" id="1e01" name="NZW30 Smart Switch" config="inovelli/nzw30.xml"/>
+		<Product type="1e00" id="1e00" name="NZW30 Smart Switch (w/Scene)" config="inovelli/nzw30.xml"/>
+		<Product type="1e02" id="1e02" name="NZW30 Smart Toggle Switch (w/Scene)" config="inovelli/nzw30.xml"/>
+		<Product type="1f01" id="1f01" name="NZW31 Smart Dimmer" config="inovelli/nzw31.xml"/>
+		<Product type="1f00" id="1f00" name="NZW31 Smart Dimmer (w/Scene)" config="inovelli/nzw31.xml"/>
+		<Product type="1f02" id="1f02" name="NZW31 Smart Toggle Dimmer (w/Scene)" config="inovelli/nzw31.xml"/>
+		<Product type="b211" id="241c" name="NZW36 1-Channel Smart Plug-In Module" config="inovelli/simple_module.xml"/>
+		<Product type="2400" id="2400" name="NZW36 1-Channel Smart Plug (w/Scene)" config="inovelli/nzw36.xml"/>
+		<Product type="b221" id="251c" name="NZW37 2-Channel Smart Plug" config="inovelli/simple_module.xml"/>
+		<Product type="2500" id="2500" name="NZW37 2-Channel Smart Plug (w/Scene)" config="inovelli/nzw37.xml"/>
+		<Product type="b212" id="271c" name="NZW39 Smart Plug Dimmer" config="inovelli/simple_module.xml"/>
+		<Product type="2700" id="2700" name="NZW39 Smart Plug Dimmer (w/Scene)" config="inovelli/nzw39.xml"/>
+		<Product type="6000" id="6000" name="NZW96 1-Channel Outdoor Smart Plug" config="inovelli/nzw96.xml"/>
+		<Product type="6100" id="6100" name="NZW97 2-Channel Outdoor Smart Plug" config="inovelli/nzw97.xml"/>
 	</Manufacturer>
 	<Manufacturer id="0006" name="Intel">
 	</Manufacturer>