diff --git a/avr/devices/n14/aqua_n14.xml b/avr/devices/n14/aqua_n14.xml
index 89eb432..9f85f3c 100644
--- a/avr/devices/n14/aqua_n14.xml
+++ b/avr/devices/n14/aqua_n14.xml
@@ -7,10 +7,10 @@
   <values>
     <value name="DS18B20_TEMP" id="0x06" type="sensor" dataType="rational" modality="temperature" units="C" denom="16" />
 
-    <value name="RGBWSTATE"    id="0x81" type="actor"  dataType="uint16" />
+    <value name="RGBWSTATE"    id="0x81" type="actor"  dataType="uint16"   modality="onOff"/>
     <value name="NUMLEDS"      id="0x82" type="actor"  dataType="int" />
-    <value name="RGBWVALUE"    id="0x83" type="actor"  dataType="dword" />
-    <value name="RGBWMODE"     id="0x8b" type="actor"  dataType="int"      modality="onOff" />
+    <value name="RGBWVALUE"    id="0x83" type="actor"  dataType="dword"    modality="rgbw"/>
+    <value name="RGBWMODE"     id="0x8b" type="actor"  dataType="int"      modality="onOffAuto" />
 
     <value name="MALONTIME"    id="0x85" type="actor"  dataType="uint16" />
     <value name="MALSOURCE1"   id="0x86" type="actor"  dataType="uint16" />
diff --git a/avr/devices/n25/aqua_n25.xml b/avr/devices/n25/aqua_n25.xml
index 09fbae2..db5053b 100644
--- a/avr/devices/n25/aqua_n25.xml
+++ b/avr/devices/n25/aqua_n25.xml
@@ -7,10 +7,10 @@
   <values>
     <value name="DS18B20_TEMP" id="0x06" type="sensor" dataType="rational" modality="temperature" units="C" denom="16" />
 
-    <value name="RGBWSTATE"    id="0x81" type="actor"  dataType="uint16" />
+    <value name="RGBWSTATE"    id="0x81" type="actor"  dataType="uint16"   modality="onOff" />
     <value name="NUMLEDS"      id="0x82" type="actor"  dataType="int" />
-    <value name="RGBWVALUE"    id="0x83" type="actor"  dataType="dword" />
-    <value name="RGBWMODE"     id="0x8b" type="actor"  dataType="int"      modality="onOff" />
+    <value name="RGBWVALUE"    id="0x83" type="actor"  dataType="dword"    modality="rgbw"/>
+    <value name="RGBWMODE"     id="0x8b" type="actor"  dataType="int"      modality="onOffAuto" />
 
     <value name="MALONTIME"    id="0x85" type="actor"  dataType="uint16" />
     <value name="MALSOURCE1"   id="0x86" type="actor"  dataType="uint16" />