diff --git a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_zz_Device.h b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_zz_Device.h
index 3a94dcebb..3653f1c56 100644
--- a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_zz_Device.h
+++ b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_zz_Device.h
@@ -3303,59 +3303,59 @@ be_local_class(Matter_Device,
         be_const_map( *     be_nested_map(60,
     ( (struct bmapnode*) &(const bmapnode[]) {
         { be_const_key_weak(gensw_btn, -1), be_const_class(be_class_Matter_Plugin_Sensor_GenericSwitch_Btn) },
-        { be_const_key_weak(pressure, -1), be_const_class(be_class_Matter_Plugin_Sensor_Pressure) },
-        { be_const_key_weak(z_light0, 40), be_const_class(be_class_Matter_Plugin_Zigbee_Light0) },
+        { be_const_key_weak(contact, -1), be_const_class(be_class_Matter_Plugin_Sensor_Contact) },
+        { be_const_key_weak(z_light0, 26), be_const_class(be_class_Matter_Plugin_Zigbee_Light0) },
         { be_const_key_weak(v_rain, -1), be_const_class(be_class_Matter_Plugin_Virt_Sensor_Rain) },
-        { be_const_key_weak(http_temperature, 13), be_const_class(be_class_Matter_Plugin_Bridge_Sensor_Temp) },
+        { be_const_key_weak(z_temp, 16), be_const_class(be_class_Matter_Plugin_Zigbee_Temperature) },
         { be_const_key_weak(http_pressure, 25), be_const_class(be_class_Matter_Plugin_Bridge_Sensor_Pressure) },
         { be_const_key_weak(v_light2, -1), be_const_class(be_class_Matter_Plugin_Virt_Light2) },
         { be_const_key_weak(v_fan, -1), be_const_class(be_class_Matter_Plugin_Virt_Fan) },
         { be_const_key_weak(v_temp, -1), be_const_class(be_class_Matter_Plugin_Virt_Sensor_Temp) },
         { be_const_key_weak(light1, -1), be_const_class(be_class_Matter_Plugin_Light1) },
-        { be_const_key_weak(v_flow, 1), be_const_class(be_class_Matter_Plugin_Virt_Sensor_Flow) },
+        { be_const_key_weak(pressure, 45), be_const_class(be_class_Matter_Plugin_Sensor_Pressure) },
         { be_const_key_weak(v_occupancy, -1), be_const_class(be_class_Matter_Plugin_Virt_Sensor_Occupancy) },
-        { be_const_key_weak(shutter_X2Btilt, -1), be_const_class(be_class_Matter_Plugin_ShutterTilt) },
-        { be_const_key_weak(z_temp, -1), be_const_class(be_class_Matter_Plugin_Zigbee_Temperature) },
+        { be_const_key_weak(v_humidity, 34), be_const_class(be_class_Matter_Plugin_Virt_Sensor_Humidity) },
+        { be_const_key_weak(waterleak, 27), be_const_class(be_class_Matter_Plugin_Sensor_Waterleak) },
         { be_const_key_weak(fan, -1), be_const_class(be_class_Matter_Plugin_Fan) },
-        { be_const_key_weak(z_humidity, 16), be_const_class(be_class_Matter_Plugin_Zigbee_Humidity) },
-        { be_const_key_weak(v_airquality, 33), be_const_class(be_class_Matter_Plugin_Virt_Sensor_Air_Quality) },
+        { be_const_key_weak(http_occupancy, 12), be_const_class(be_class_Matter_Plugin_Bridge_Sensor_Occupancy) },
+        { be_const_key_weak(http_temperature, -1), be_const_class(be_class_Matter_Plugin_Bridge_Sensor_Temp) },
         { be_const_key_weak(light0, 54), be_const_class(be_class_Matter_Plugin_Light0) },
         { be_const_key_weak(http_contact, 9), be_const_class(be_class_Matter_Plugin_Bridge_Sensor_Contact) },
-        { be_const_key_weak(http_airquality, 39), be_const_class(be_class_Matter_Plugin_Bridge_Sensor_Air_Quality) },
-        { be_const_key_weak(light3, 45), be_const_class(be_class_Matter_Plugin_Light3) },
-        { be_const_key_weak(v_waterleak, 44), be_const_class(be_class_Matter_Plugin_Virt_Sensor_Waterleak) },
+        { be_const_key_weak(http_airquality, 40), be_const_class(be_class_Matter_Plugin_Bridge_Sensor_Air_Quality) },
+        { be_const_key_weak(light3, 33), be_const_class(be_class_Matter_Plugin_Light3) },
+        { be_const_key_weak(v_waterleak, 41), be_const_class(be_class_Matter_Plugin_Virt_Sensor_Waterleak) },
         { be_const_key_weak(occupancy, -1), be_const_class(be_class_Matter_Plugin_Sensor_Occupancy) },
         { be_const_key_weak(v_light1, -1), be_const_class(be_class_Matter_Plugin_Virt_Light1) },
         { be_const_key_weak(humidity, -1), be_const_class(be_class_Matter_Plugin_Sensor_Humidity) },
         { be_const_key_weak(flow, -1), be_const_class(be_class_Matter_Plugin_Sensor_Flow) },
-        { be_const_key_weak(contact, -1), be_const_class(be_class_Matter_Plugin_Sensor_Contact) },
-        { be_const_key_weak(waterleak, 34), be_const_class(be_class_Matter_Plugin_Sensor_Waterleak) },
+        { be_const_key_weak(v_contact, -1), be_const_class(be_class_Matter_Plugin_Virt_Sensor_Contact) },
+        { be_const_key_weak(rain, -1), be_const_class(be_class_Matter_Plugin_Sensor_Rain) },
         { be_const_key_weak(aggregator, -1), be_const_class(be_class_Matter_Plugin_Aggregator) },
         { be_const_key_weak(http_light1, -1), be_const_class(be_class_Matter_Plugin_Bridge_Light1) },
         { be_const_key_weak(relay, 21), be_const_class(be_class_Matter_Plugin_OnOff) },
         { be_const_key_weak(http_light3, -1), be_const_class(be_class_Matter_Plugin_Bridge_Light3) },
         { be_const_key_weak(http_light2, 3), be_const_class(be_class_Matter_Plugin_Bridge_Light2) },
-        { be_const_key_weak(v_humidity, 36), be_const_class(be_class_Matter_Plugin_Virt_Sensor_Humidity) },
-        { be_const_key_weak(rain, -1), be_const_class(be_class_Matter_Plugin_Sensor_Rain) },
-        { be_const_key_weak(http_illuminance, 26), be_const_class(be_class_Matter_Plugin_Bridge_Sensor_Illuminance) },
-        { be_const_key_weak(http_occupancy, -1), be_const_class(be_class_Matter_Plugin_Bridge_Sensor_Occupancy) },
+        { be_const_key_weak(airquality, 36), be_const_class(be_class_Matter_Plugin_Sensor_Air_Quality) },
+        { be_const_key_weak(v_airquality, 44), be_const_class(be_class_Matter_Plugin_Virt_Sensor_Air_Quality) },
+        { be_const_key_weak(http_illuminance, 1), be_const_class(be_class_Matter_Plugin_Bridge_Sensor_Illuminance) },
+        { be_const_key_weak(shutter_X2Btilt, -1), be_const_class(be_class_Matter_Plugin_ShutterTilt) },
         { be_const_key_weak(temperature, -1), be_const_class(be_class_Matter_Plugin_Sensor_Temp) },
         { be_const_key_weak(shutter, -1), be_const_class(be_class_Matter_Plugin_Shutter) },
-        { be_const_key_weak(light2, -1), be_const_class(be_class_Matter_Plugin_Light2) },
-        { be_const_key_weak(v_contact, -1), be_const_class(be_class_Matter_Plugin_Virt_Sensor_Contact) },
         { be_const_key_weak(z_pressure, -1), be_const_class(be_class_Matter_Plugin_Zigbee_Pressure) },
+        { be_const_key_weak(light2, -1), be_const_class(be_class_Matter_Plugin_Light2) },
+        { be_const_key_weak(http_light0, -1), be_const_class(be_class_Matter_Plugin_Bridge_Light0) },
         { be_const_key_weak(http_flow, -1), be_const_class(be_class_Matter_Plugin_Bridge_Sensor_Flow) },
         { be_const_key_weak(http_relay, -1), be_const_class(be_class_Matter_Plugin_Bridge_OnOff) },
-        { be_const_key_weak(http_light0, -1), be_const_class(be_class_Matter_Plugin_Bridge_Light0) },
-        { be_const_key_weak(airquality, 12), be_const_class(be_class_Matter_Plugin_Sensor_Air_Quality) },
+        { be_const_key_weak(z_humidity, -1), be_const_class(be_class_Matter_Plugin_Zigbee_Humidity) },
+        { be_const_key_weak(v_flow, -1), be_const_class(be_class_Matter_Plugin_Virt_Sensor_Flow) },
         { be_const_key_weak(http_waterleak, -1), be_const_class(be_class_Matter_Plugin_Bridge_Sensor_Waterleak) },
-        { be_const_key_weak(v_relay, 27), be_const_class(be_class_Matter_Plugin_Virt_OnOff) },
+        { be_const_key_weak(v_relay, 13), be_const_class(be_class_Matter_Plugin_Virt_OnOff) },
         { be_const_key_weak(z_occupancy, 59), be_const_class(be_class_Matter_Plugin_Zigbee_Occupancy) },
         { be_const_key_weak(z_light1, 23), be_const_class(be_class_Matter_Plugin_Zigbee_Light1) },
         { be_const_key_weak(v_light0, 2), be_const_class(be_class_Matter_Plugin_Virt_Light0) },
         { be_const_key_weak(v_illuminance, 48), be_const_class(be_class_Matter_Plugin_Virt_Sensor_Illuminance) },
         { be_const_key_weak(z_light2, 6), be_const_class(be_class_Matter_Plugin_Zigbee_Light2) },
-        { be_const_key_weak(root, 41), be_const_class(be_class_Matter_Plugin_Root) },
+        { be_const_key_weak(root, 39), be_const_class(be_class_Matter_Plugin_Root) },
         { be_const_key_weak(onoff, -1), be_const_class(be_class_Matter_Plugin_Sensor_OnOff) },
         { be_const_key_weak(http_humidity, -1), be_const_class(be_class_Matter_Plugin_Bridge_Sensor_Humidity) },
         { be_const_key_weak(http_rain, -1), be_const_class(be_class_Matter_Plugin_Bridge_Sensor_Rain) },