diff --git a/devices/nodes/0BUILD b/devices/nodes/0BUILD
index ab5fdb7..09a71ff 100644
--- a/devices/nodes/0BUILD
+++ b/devices/nodes/0BUILD
@@ -12,6 +12,8 @@
     aqua_n18.xml
     aqua_n19.xml
     aqua_n20.xml
+    aqua_n21.xml
+    aqua_n22.xml
   </data>
 
 </gwbuild>
diff --git a/devices/nodes/aqua_n21.xml b/devices/nodes/aqua_n21.xml
new file mode 100644
index 0000000..f3b0ad7
--- /dev/null
+++ b/devices/nodes/aqua_n21.xml
@@ -0,0 +1,14 @@
+
+<device name="aqua_n21" driver="nodes">
+  <manufacturer>AQUA</manufacturer>
+  <devicetype>N</devicetype>
+  <deviceversion>21</deviceversion>
+  
+  <values>
+    <value name="SI7021_TEMP"  id="0x01" type="sensor" dataType="rational" modality="temperature" units="C" denom="100" />
+    <value name="SI7021_HUM"   id="0x02" type="sensor" dataType="rational" modality="humidity"    units="%" denom="1" />
+    <value name="MOTION"       id="0x07" type="sensor" dataType="rational" modality="motion"                denom="1" />
+    <value name="DOOR"         id="0x08" type="sensor" dataType="rational" modality="door"                  denom="1" />
+  </values>
+
+</device>
diff --git a/devices/nodes/aqua_n22.xml b/devices/nodes/aqua_n22.xml
new file mode 100644
index 0000000..f7eba61
--- /dev/null
+++ b/devices/nodes/aqua_n22.xml
@@ -0,0 +1,19 @@
+
+<device name="aqua_n22" driver="nodes">
+  <manufacturer>AQUA</manufacturer>
+  <devicetype>N</devicetype>
+  <deviceversion>22</deviceversion>
+  
+  <values>
+    <value name="DS18B20_TEMP" id="0x06" type="sensor" dataType="rational" modality="temperature" units="C" denom="16" />
+
+    <value name="NUMLEDS"      id="0x82" type="actor"  dataType="int" />
+    <value name="RGBWVALUE"    id="0x83" type="actor"  dataType="dword" />
+
+    <value name="MALRGBWVALUE" id="0x84" type="actor"  dataType="dword" />
+    <value name="MALONTIME"    id="0x85" type="actor"  dataType="uint16" />
+    <value name="MALSOURCE1"   id="0x86" type="actor"  dataType="uint16" />
+    <value name="MALSOURCE2"   id="0x87" type="actor"  dataType="uint16" />
+  </values>
+
+</device>