homebridge-easy-mqtt 1.4.0-beta.2 → 1.4.0-beta.21

package/config.schema.json

@@ -21,8 +21,8 @@
           "type": {
             "type": "string",
             "title": "${config.title.type}",
-            "enum": [ "CarbonMonoxideSensor", "CarbonDioxideSensor", "ContactSensor", "HeaterCooler", "HumiditySensor", "LeakSensor", "Lightbulb", "LockMechanism", "MotionSensor", "OccupancySensor", "Outlet", "SecuritySystem", "SmokeSensor", "Switch", "TemperatureSensor", "Thermostat"],
-            "enumNames": ["${config.enumNames.carbonMonoxideSensor}", "${config.enumNames.carbonDioxideSensor}", "${config.enumNames.contactSensor}", "${config.enumNames.heaterCooler}", "${config.enumNames.humiditySensor}", "${config.enumNames.leakSensor}", "${config.enumNames.lightbulb}", "${config.enumNames.lockMechanism}", "${config.enumNames.motionSensor}", "${config.enumNames.occupancySensor}", "${config.enumNames.outlet}", "${config.enumNames.securitySystem}", "${config.enumNames.smokeSensor}", "${config.enumNames.switch}",  "${config.enumNames.temperatureSensor}", "${config.enumNames.thermostat}"],
+            "enum": [ "AirPurifier", "AirQualitySensor", "CarbonMonoxideSensor", "CarbonDioxideSensor", "ContactSensor", "Fanv2", "GarageDoorOpener", "HeaterCooler", "HumiditySensor", "LeakSensor", "Lightbulb", "LightSensor", "LockMechanism", "MotionSensor", "OccupancySensor", "Outlet", "SecuritySystem", "SmokeSensor", "Switch", "TemperatureSensor", "Thermostat", "Valve", "WindowCovering"],
+            "enumNames": ["${config.enumNames.airPurifier}", "${config.enumNames.airQualitySensor}", "${config.enumNames.carbonMonoxideSensor}", "${config.enumNames.carbonDioxideSensor}", "${config.enumNames.contactSensor}", "${config.enumNames.fanv2}", "${config.enumNames.garageDoorOpener}", "${config.enumNames.heaterCooler}", "${config.enumNames.humiditySensor}", "${config.enumNames.leakSensor}", "${config.enumNames.lightbulb}", "${config.enumNames.lightSensor}", "${config.enumNames.lockMechanism}", "${config.enumNames.motionSensor}", "${config.enumNames.occupancySensor}", "${config.enumNames.outlet}", "${config.enumNames.securitySystem}", "${config.enumNames.smokeSensor}", "${config.enumNames.switch}",  "${config.enumNames.temperatureSensor}", "${config.enumNames.thermostat}", "${config.enumNames.valve}", "${config.enumNames.windowCovering}"],
             "required": true
           },
           "group": {
@@ -53,8 +53,9 @@
           "broker": {
             "type": "string",
             "title": "${config.title.broker}",
+            "description": "${config.description.broker}",
             "placeholder": "mqtts://192.168.0.1:1883",
-            "required": true
+            "pattern": "^(https?|mqtts?|wss?|ftp):\\/\\/([\\w.-]+)(:\\d+)?(\\/.*)?$"
           },
           "username": {
             "type": "string",
@@ -68,7 +69,22 @@
             "type": "string",
             "title": "${config.title.options}",
             "description": "${config.description.options}",
-            "placeholder": "{ \"protocolVersion\": \"4\", \"clientId\": \"my-client-id\", \"rejectUnauthorized\": true }"
+            "placeholder": "{ \"protocolVersion\": \"4\", \"clientId\": \"my-client-id\", \"rejectUnauthorized\": true }",
+            "pattern": "^\\{\\s*(?:\"[^\"\\\\\\r\\n]*\"\\s*:\\s*(?:\"[^\"\\\\\\r\\n]*\"|[0-9.+-eE]+|true|false|null)\\s*,\\s*)*(?:\"[^\"\\\\\\r\\n]*\"\\s*:\\s*(?:\"[^\"\\\\\\r\\n]*\"|[0-9.+-eE]+|true|false|null)\\s*)?\\}$"
+          },
+          "onConnect": {
+            "type": "array",
+            "items": {
+              "type": "object",
+              "properties": {
+                "topic": {
+                  "type": "string"
+                },
+                "message": {
+                  "type": "string"
+                }
+              }
+            }
           }
         }
       },
@@ -108,9 +124,16 @@
             },
             "temperatureUnits": {
               "type": "string",
+              "title": "${config.title.sourceUnits}",
               "enum": ["C", "F"],
               "enumNames": ["${config.enumNames.celsius}", "${config.enumNames.fahrenheit}"]
             },
+            "valveType": {
+              "type": "string",
+              "title": "${config.title.valveType}",
+              "enum": ["GENERIC_VALVE", "IRRIGATION", "SHOWER_HEAD", "WATER_FAUCET"],
+              "enumNames": ["${config.enumNames.valveGeneric}", "${config.enumNames.valveIrrigation}", "${config.enumNames.valveShower}", "${config.enumNames.valveFaucet}"]
+            },
             "topicGetBatteryLevel": {
               "type": "string",
               "title": "${config.title.topicGetBatteryLevel}"
@@ -235,6 +258,10 @@
               "type": "string",
               "title": "${config.title.topicGetLeakDetected}"
             },
+            "topicGetCurrentAmbientLightLevel": {
+              "type": "string",
+              "title": "${config.title.topicGetCurrentAmbientLightLevel}"
+            },
             "topicGetMotionDetected": {
               "type": "string",
               "title": "${config.title.topicGetMotionDetected}"
@@ -339,6 +366,170 @@
               "type": "string",
               "title": "${config.title.topicSetTargetHeaterCoolerState}"
             },
+            "topicGetValveActive": {
+              "type": "string",
+              "title": "${config.title.topicGetValveActive}"
+            },
+            "topicSetValveActive": {
+              "type": "string",
+              "title": "${config.title.topicSetValveActive}"
+            },
+            "topicGetValveInUse": {
+              "type": "string",
+              "title": "${config.title.topicGetValveInUse}"
+            },
+            "topicGetValveIsConfigured": {
+              "type": "string",
+              "title": "${config.title.topicGetValveIsConfigured}"
+            },
+            "topicSetValveIsConfigured": {
+              "type": "string",
+              "title": "${config.title.topicSetValveIsConfigured}"
+            },
+            "topicGetValveRemainingDuration": {
+              "type": "string",
+              "title": "${config.title.topicGetValveRemainingDuration}"
+            },
+            "topicGetValveSetDuration": {
+              "type": "string",
+              "title": "${config.title.topicGetValveSetDuration}"
+            },
+            "topicSetValveSetDuration": {
+              "type": "string",
+              "title": "${config.title.topicSetValveSetDuration}"
+            },
+            "topicGetCurrentPurifierState": {
+              "type": "string",
+              "title": "${config.title.topicGetCurrentPurifierState}"
+            },
+            "topicGetTargetPurifierState": {
+              "type": "string",
+              "title": "${config.title.topicGetTargetPurifierState}"
+            },
+            "topicSetTargetPurifierState": {
+              "type": "string",
+              "title": "${config.title.topicSetTargetPurifierState}"
+            },
+            "topicGetFilterChangeIndication": {
+              "type": "string",
+              "title": "${config.title.topicGetFilterChangeIndication}"
+            },
+            "topicGetFilterLifeLevel": {
+              "type": "string",
+              "title": "${config.title.topicGetFilterLifeLevel}"
+            },
+            "topicResetFilterIndication": {
+              "type": "string",
+              "title": "${config.title.topicResetFilterIndication}"
+            },
+            "topicGetCurrentDoorState": {
+              "type": "string",
+              "title": "${config.title.topicGetCurrentDoorState}"
+            },
+            "topicGetObstructionDetected": {
+              "type": "string",
+              "title": "${config.title.topicGetObstructionDetected}"
+            },
+            "topicGetTargetDoorState": {
+              "type": "string",
+              "title": "${config.title.topicGetTargetDoorState}"
+            },
+            "topicSetTargetDoorState": {
+              "type": "string",
+              "title": "${config.title.topicSetTargetDoorState}"
+            },
+            "topicGetCurrentFanState": {
+              "type": "string",
+              "title": "${config.title.topicGetCurrentFanState}"
+            },
+            "topicGetRotationDirection": {
+              "type": "string",
+              "title": "${config.title.topicGetRotationDirection}"
+            },
+            "topicGetTargetFanState": {
+              "type": "string",
+              "title": "${config.title.topicGetTargetFanState}"
+            },
+            "topicSetRotationDirection": {
+              "type": "string",
+              "title": "${config.title.topicSetRotationDirection}"
+            },
+            "topicSetTargetFanState": {
+              "type": "string",
+              "title": "${config.title.topicSetTargetFanState}"
+            },
+            "topicGetAirQuality": {
+              "type": "string",
+              "title": "${config.title.topicGetAirQuality}"
+            },
+            "topicGetNitrogenDioxideDensity": {
+              "type": "string",
+              "title": "${config.title.topicGetNitrogenDioxideDensity}"
+            },
+            "topicGetOzoneDensity": {
+              "type": "string",
+              "title": "${config.title.topicGetOzoneDensity}"
+            },
+            "topicGetPM10Density": {
+              "type": "string",
+              "title": "${config.title.topicGetPM10Density}"
+            },
+            "topicGetPM2_5Density": {
+              "type": "string",
+              "title": "${config.title.topicGetPM2_5Density}"
+            },
+            "topicGetSulphurDioxideDensity": {
+              "type": "string",
+              "title": "${config.title.topicGetSulphurDioxideDensity}"
+            },
+            "topicGetVOCDensity": {
+              "type": "string",
+              "title": "${config.title.topicGetVOCDensity}"
+            },
+            "topicGetCurrentPosition": {
+              "type": "string",
+              "title": "${config.title.topicGetCurrentPosition}"
+            },
+            "topicSetHoldPosition": {
+              "type": "string",
+              "title": "${config.title.topicSetHoldPosition}"
+            },
+            "topicGetPositionState": {
+              "type": "string",
+              "title": "${config.title.topicGetPositionState}"
+            },
+            "topicGetTargetPosition": {
+              "type": "string",
+              "title": "${config.title.topicGetTargetPosition}"
+            },
+            "topicSetTargetPosition": {
+              "type": "string",
+              "title": "${config.title.topicSetTargetPosition}"
+            },
+            "topicGetCurrentHorizontalTiltAngle": {
+              "type": "string",
+              "title": "${config.title.topicGetCurrentHorizontalTiltAngle}"
+            },
+            "topicGetCurrentVerticalTiltAngle": {
+              "type": "string",
+              "title": "${config.title.topicGetCurrentVerticalTiltAngle}"
+            },
+            "topicGetTargetHorizontalTiltAngle": {
+              "type": "string",
+              "title": "${config.title.topicGetTargetHorizontalTiltAngle}"
+            },
+            "topicGetTargetVerticalTiltAngle": {
+              "type": "string",
+              "title": "${config.title.topicGetTargetVerticalTiltAngle}"
+            },
+            "topicSetTargetHorizontalTiltAngle": {
+              "type": "string",
+              "title": "${config.title.topicSetTargetHorizontalTiltAngle}"
+            },
+            "topicSetTargetVerticalTiltAngle": {
+              "type": "string",
+              "title": "${config.title.topicSetTargetVerticalTiltAngle}"
+            },
             "valueBatteryLow": {
               "type": "string",
               "title": "${config.title.valueBatteryLow}"
@@ -475,114 +666,1214 @@
               "type": "string",
               "title": "${config.title.valueSwingDisabled}"
             },
+            "valueActive": {
+              "type": "string",
+              "title": "${config.title.valueActive}"
+            },
+            "valueConfigured": {
+              "type": "string",
+              "title": "${config.title.valueConfigured}"
+            },
+            "valueNotConfigured": {
+              "type": "string",
+              "title": "${config.title.valueNotConfigured}"
+            },
+            "valueInUse": {
+              "type": "string",
+              "title": "${config.title.valueInUse}"
+            },
+            "valueInactive": {
+              "type": "string",
+              "title": "${config.title.valueInactive}"
+            },
+            "valueModeManual": {
+              "type": "string",
+              "title": "${config.title.valueModeManual}"
+            },
+            "valueModePurifying": {
+              "type": "string",
+              "title": "${config.title.valueModePurifying}"
+            },
+            "valueFilterChange": {
+              "type": "string",
+              "title": "${config.title.valueFilterChange}"
+            },
+            "valueFilterReset": {
+              "type": "string",
+              "title": "${config.title.valueFilterReset}"
+            },
+            "valueDoorObstructed": {
+              "type": "string",
+              "title": "${config.title.valueDoorObstructed}"
+            },
+            "valueDoorStateClosed": {
+              "type": "string",
+              "title": "${config.title.valueDoorStateClosed}"
+            },
+            "valueDoorStateClosing": {
+              "type": "string",
+              "title": "${config.title.valueDoorStateClosing}"
+            },
+            "valueDoorStateOpen": {
+              "type": "string",
+              "title": "${config.title.valueDoorStateOpen}"
+            },
+            "valueDoorStateOpening": {
+              "type": "string",
+              "title": "${config.title.valueDoorStateOpening}"
+            },
+            "valueDoorStateStopped": {
+              "type": "string",
+              "title": "${config.title.valueDoorStateStopped}"
+            },
+            "valueDirectionClockwise": {
+              "type": "string",
+              "title": "${config.title.valueDirectionClockwise}"
+            },
+            "valueDirectionCounterClockwise": {
+              "type": "string",
+              "title": "${config.title.valueDirectionCounterClockwise}"
+            },
+            "valueModeBlowing": {
+              "type": "string",
+              "title": "${config.title.valueModeBlowing}"
+            },
+            "valueAQExcellent": {
+              "type": "string",
+              "title": "${config.title.valueAQExcellent}"
+            },
+            "valueAQFair": {
+              "type": "string",
+              "title": "${config.title.valueAQFair}"
+            },
+            "valueAQGood": {
+              "type": "string",
+              "title": "${config.title.valueAQGood}"
+            },
+            "valueAQInferior": {
+              "type": "string",
+              "title": "${config.title.valueAQInferior}"
+            },
+            "valueAQPoor": {
+              "type": "string",
+              "title": "${config.title.valueAQPoor}"
+            },
+            "valueAQUnknown": {
+              "type": "string",
+              "title": "${config.title.valueAQUnknown}"
+            },
+            "valuePositionHold": {
+              "type": "string",
+              "title": "${config.title.valuePositionHold}"
+            },
+            "valuePositionDecreasing": {
+              "type": "string",
+              "title": "${config.title.valuePositionDecreasing}"
+            },
+            "valuePositionIncreasing": {
+              "type": "string",
+              "title": "${config.title.valuePositionIncreasing}"
+            },
+            "valuePositionObstructed": {
+              "type": "string",
+              "title": "${config.title.valuePositionObstructed}"
+            },
+            "valuePositionResume": {
+              "type": "string",
+              "title": "${config.title.valuePositionResume}"
+            },
+            "valuePositionStopped": {
+              "type": "string",
+              "title": "${config.title.valuePositionStopped}"
+            },
+            "resetOnRestart": {
+              "type": "boolean",
+              "title": "${config.title.resetOnRestart}"
+            },
             "disableLogging": {
               "type": "boolean",
               "title": "${config.title.disableLogging}"
             }
-          }
-        },
-        "default": []
-      },
-      "verbose": {
-        "type": "boolean",
-        "default": false
-      }
-    }
-  },
-  "layout": [
-    {
-      "type": "array",
-      "key": "accessories",
-      "notitle": true,
-      "items": [
-        {
-          "type": "fieldset",
-          "expandable": true,
-          "title": "${config.title.accessory}",
-          "items": [
+          },
+          "allOf": [
             {
-              "type": "div",
-              "displayFlex": true,
-              "flex-direction": "row",
-              "items": [
-                {
-                  "key": "accessories[].info.name",
-                  "flex": "0 0 33%"
-                },
-                {
-                  "key": "accessories[].info.type",
-                  "flex": "0 0 33%"
-                },
-                {
-                  "key": "accessories[].info.group",
-                  "flex": "0 0 33%"
+              "if": {
+                "properties": {
+                  "info": {
+                    "properties": {
+                      "type" : {
+                        "enum": ["Lightbulb", "Outlet", "Switch"]
+                      }
+                    }
+                  }
                 }
-              ]
+              },
+              "then": {
+                "required": ["topicGetOn", "topicSetOn", "valueOn", "valueOff"]
+              }
             },
-            "accessories[].mqtt.broker",
             {
-              "type": "div",
-              "displayFlex": true,
-              "flex-direction": "row",
-              "items": [
-                {
-                  "key": "accessories[].mqtt.username",
-                  "flex": "0 0 50%"
-                },
-                {
-                  "key": "accessories[].mqtt.password",
-                  "flex": "0 0 50%"
+               "if": {
+                "properties": {
+                  "info": {
+                    "properties": {
+                      "type" : {
+                        "enum": ["WindowCovering"]
+                      }
+                    }
+                  }
                 }
-              ]
+              },
+              "then": {
+                "required": ["topicGetCurrentPosition", "topicGetTargetPosition", "topicSetTargetPosition", "topicGetPositionState"],
+                "anyOf": [
+                  { "required": ["valuePositionDecreasing"] },
+                  { "required": ["valuePositionIncreasing"] },
+                  { "required": ["valuePositionStopped"] }
+                ]
+              }
             },
-            "accessories[].mqtt.options",
-            "accessories[].disableLogging",
             {
-              "type": "fieldset",
-              "title": "${config.title.topics}",
-              "description": "${config.description.topics}",
-              "condition": {
-                "functionBody": "return model.accessories?.[arguments[1]]?.info?.type !== undefined;"
+              "if": {
+                "properties": {
+                  "info": {
+                    "properties": {
+                      "type" : {
+                        "const": "AirQualitySensor"
+                      }
+                    }
+                  }
+                }
               },
-              "items": [
-                {
-                  "type": "fieldset",
-                  "notitle": true,
-                  "condition": {
-                    "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'LockMechanism';"
-                  },
-                  "items": [
-                    {
-                      "type": "div",
-                      "displayFlex": true,
-                      "flex-direction": "row",
-                      "items": [
-                        {
-                          "key": "accessories[].topicGetCurrentLockState",
-                          "flex": "0 0 50%"
-                        }
-                      ]
-                    },
-                    {
-                      "type": "div",
-                      "displayFlex": true,
-                      "flex-direction": "row",
-                      "items": [
-                        {
-                          "key": "accessories[].topicGetTargetLockState",
-                          "flex": "0 0 50%"
-                        },
-                        {
-                          "key": "accessories[].topicSetTargetLockState",
-                          "flex": "0 0 50%"
-                        }
-                      ]
+              "then": {
+                "required": ["topicGetAirQuality"],
+                "anyOf": [
+                  { "required": ["valueAQExcellent"] },
+                  { "required": ["valueAQFair"] },
+                  { "required": ["valueAQGood"] },
+                  { "required": ["valueAQInferior"] },
+                  { "required": ["valueAQPoor"] }
+                ]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "info": {
+                    "properties": {
+                      "type" : {
+                        "const": "CarbonDioxideSensor"
+                      }
                     }
-                  ]
-                },
-                {
-                  "type": "fieldset",
-                  "notitle": true,
+                  }
+                }
+              },
+              "then": {
+                "required": ["topicGetCarbonDioxideDetected", "valueCarbonDioxideDetected"]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "info": {
+                    "properties": {
+                      "type" : {
+                        "const": "CarbonMonoxideSensor"
+                      }
+                    }
+                  }
+                }
+              },
+              "then": {
+                "required": ["topicGetCarbonMonoxideDetected", "valueCarbonMonoxideDetected"]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "info": {
+                    "properties": {
+                      "type" : {
+                        "const": "ContactSensor"
+                      }
+                    }
+                  }
+                }
+              },
+              "then": {
+                "required": ["topicGetContactSensorState", "valueContactDetected"]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "info": {
+                    "properties": {
+                      "type" : {
+                        "const": "HumiditySensor"
+                      }
+                    }
+                  }
+                }
+              },
+              "then": {
+                "required": ["topicGetCurrentRelativeHumidity"]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "info": {
+                    "properties": {
+                      "type" : {
+                        "const": "LeakSensor"
+                      }
+                    }
+                  }
+                }
+              },
+              "then": {
+                "required": ["topicGetLeakDetected", "valueLeakDetected"]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "info": {
+                    "properties": {
+                      "type" : {
+                        "const": "LightSensor"
+                      }
+                    }
+                  }
+                }
+              },
+              "then": {
+                "required": ["topicGetCurrentAmbientLightLevel"]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "info": {
+                    "properties": {
+                      "type" : {
+                        "const": "MotionSensor"
+                      }
+                    }
+                  }
+                }
+              },
+              "then": {
+                "required": ["topicGetMotionDetected", "valueMotionDetected"]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "info": {
+                    "properties": {
+                      "type" : {
+                        "const": "OccupancySensor"
+                      }
+                    }
+                  }
+                }
+              },
+              "then": {
+                "required": ["topicGetOccupancyDetected", "valueOccupancyDetected"]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "info": {
+                    "properties": {
+                      "type" : {
+                        "const": "SmokeSensor"
+                      }
+                    }
+                  }
+                }
+              },
+              "then": {
+                "required": ["topicGetSmokeDetected", "valueSmokeDetected"]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "info": {
+                    "properties": {
+                      "type" : {
+                        "const": "TemperatureSensor"
+                      }
+                    }
+                  }
+                }
+              },
+              "then": {
+                "required": ["topicGetCurrentTemperature"]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "info": {
+                    "properties": {
+                      "type" : {
+                        "const": "AirPurifier"
+                      }
+                    }
+                  }
+                }
+              },
+              "then": {
+                "required": ["topicGetActive", "topicSetActive", "topicGetCurrentPurifierState", "topicGetTargetPurifierState", "topicSetTargetPurifierState", "valueStateActive", "valueStateInactive"],
+                "anyOf": [
+                  { "required": ["valueModeIdle"] },
+                  { "required": ["valueModeInactive"] },
+                  { "required": ["valueModePurifying"] }
+                ]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "info": {
+                    "properties": {
+                      "type" : {
+                        "const": "AirPurifier"
+                      }
+                    }
+                  }
+                }
+              },
+              "then": {
+                "anyOf": [
+                  { "required": ["valueModeAuto"] },
+                  { "required": ["valueModeManual"] }
+                ]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "info": {
+                    "properties": {
+                      "type" : {
+                        "const": "Fanv2"
+                      }
+                    }
+                  }
+                }
+              },
+              "then": {
+                "required": ["topicGetActive", "topicSetActive", "valueStateActive", "valueStateInactive"]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "info": {
+                    "properties": {
+                      "type" : {
+                        "const": "HeaterCooler"
+                      }
+                    }
+                  }
+                }
+              },
+              "then": {
+                "required": ["topicGetActive", "topicSetActive", "topicGetCurrentHeaterCoolerState", "topicGetCurrentTemperature", "topicGetTargetHeaterCoolerState", "topicSetTargetHeaterCoolerState", "valueStateActive", "valueStateInactive"],
+                "anyOf": [
+                  { "required": ["valueModeCool"] },
+                  { "required": ["valueModeHeat"] },
+                  { "required": ["valueModeIdle"] },
+                  { "required": ["valueModeInactive"] }
+                ]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "info": {
+                    "properties": {
+                      "type" : {
+                        "const": "HeaterCooler"
+                      }
+                    }
+                  }
+                }
+              },
+              "then": {
+                "anyOf": [
+                  { "required": ["valueModeAuto"] },
+                  { "required": ["valueModeHeat"] },
+                  { "required": ["valueModeCool"] }
+                ]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "info": {
+                    "properties": {
+                      "type" : {
+                        "const": "Thermostat"
+                      }
+                    }
+                  }
+                }
+              },
+              "then": {
+                "required": ["topicGetCurrentHeatingCoolingState", "topicGetTargetHeatingCoolingState", "topicSetTargetHeatingCoolingState", "topicGetCurrentTemperature", "topicGetTargetTemperature", "topicSetTargetTemperature"],
+                "anyOf": [
+                  { "required": ["valueModeCool"] },
+                  { "required": ["valueModeHeat"] },
+                  { "required": ["valueModeOff"] }
+                ]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "info": {
+                    "properties": {
+                      "type" : {
+                        "const": "GarageDoorOpener"
+                      }
+                    }
+                  }
+                }
+              },
+              "then": {
+                "required": ["topicGetCurrentDoorState", "topicGetTargetDoorState", "topicSetTargetDoorState", "topicGetObstructionDetected", "valueDoorObstructed"],
+                "anyOf": [
+                  { "required": ["valueDoorStateOpen"] },
+                  { "required": ["valueDoorStateClosed"] }
+                ]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "info": {
+                    "properties": {
+                      "type" : {
+                        "const": "LockMechanism"
+                      }
+                    }
+                  }
+                }
+              },
+              "then": {
+                "required": ["topicGetCurrentLockState", "topicGetTargetLockState", "topicSetTargetLockState", "valueLockStateSecured", "valueLockStateUnsecured"]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "info": {
+                    "properties": {
+                      "type" : {
+                        "const": "SecuritySystem"
+                      }
+                    }
+                  }
+                }
+              },
+              "then": {
+                "required": ["topicGetCurrentSecurityState", "topicGetTargetSecurityState", "topicSetTargetSecurityState"],
+                "anyOf": [
+                  { "required": ["valueArmStay"] },
+                  { "required": ["valueArmAway"] },
+                  { "required": ["valueArmNight"] },
+                  { "required": ["valueDisarm"] }
+                ]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "info": {
+                    "properties": {
+                      "type" : {
+                        "const": "Valve"
+                      }
+                    }
+                  }
+                }
+              },
+              "then": {
+                "required": ["topicGetValveActive", "topicGetValveInUse", "topicSetValveActive", "valueActive", "valueInactive", "valueInUse"]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "topicGetLockPhysicalControls": {
+                    "minLength": 1
+                  }
+                },
+                "required": ["topicGetLockPhysicalControls"]
+              },
+              "then": {
+                "required": ["valueControlLock"]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "topicSetLockPhysicalControls": {
+                    "minLength": 1
+                  }
+                },
+                "required": ["topicSetLockPhysicalControls"]
+              },
+              "then": {
+                "required": ["valueControlLock", "valueControlUnlock"]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "topicGetSwingMode": {
+                    "minLength": 1
+                  }
+                },
+                "required": ["topicGetSwingMode"]
+              },
+              "then": {
+                "required": ["valueSwingEnabled"]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "topicSetSwingMode": {
+                    "minLength": 1
+                  }
+                },
+                "required": ["topicSetSwingMode"]
+              },
+              "then": {
+                "required": ["valueSwingEnabled", "valueSwingDisabled"]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "topicGetBatteryLow": {
+                    "minLength": 1
+                  }
+                },
+                "required": ["topicGetBatteryLow"]
+              },
+              "then": {
+                "required": ["valueBatteryLow"]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "topicGetStatusActive": {
+                    "minLength": 1
+                  }
+                },
+                "required": ["topicGetStatusActive"]
+              },
+              "then": {
+                "required": ["valueStatusActive"]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "topicGetStatusFault": {
+                    "minLength": 1
+                  }
+                },
+                "required": ["topicGetStatusFault"]
+              },
+              "then": {
+                "required": ["valueFault"]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "topicGetStatusTampered": {
+                    "minLength": 1
+                  }
+                },
+                "required": ["topicGetStatusTampered"]
+              },
+              "then": {
+                "required": ["valueTampered"]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "topicGetOutletInUse": {
+                    "minLength": 1
+                  }
+                },
+                "required": ["topicGetOutletInUse"]
+              },
+              "then": {
+                "required": ["valueOutletInUse"]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "topicGetValveIsConfigured": {
+                    "minLength": 1
+                  }
+                },
+                "required": ["topicGetValveIsConfigured"]
+              },
+              "then": {
+                "required": ["valueConfigured"]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "topicSetValveIsConfigured": {
+                    "minLength": 1
+                  }
+                },
+                "required": ["topicSetValveIsConfigured"]
+              },
+              "then": {
+                "required": ["valueConfigured", "valueNotConfigured"]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "topicGetFilterChangeIndication": {
+                    "minLength": 1
+                  }
+                },
+                "required": ["topicGetFilterChangeIndication"]
+              },
+              "then": {
+                "required": ["valueFilterChange"]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "topicGetFilterLifeLevel": {
+                    "minLength": 1
+                  }
+                },
+                "required": ["topicGetFilterLifeLevel"]
+              },
+              "then": {
+                "required": ["topicGetFilterChangeIndication"]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "topicResetFilterIndication": {
+                    "minLength": 1
+                  }
+                },
+                "required": ["topicResetFilterIndication"]
+              },
+              "then": {
+                "required": ["topicGetFilterChangeIndication", "valueFilterReset"]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "topicGetCurrentLockState": {
+                    "minLength": 1
+                  }
+                },
+                "required": ["topicGetCurrentLockState"]
+              },
+              "then": {
+                "required": ["valueLockStateSecured", "valueLockStateUnsecured"]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "topicGetTargetLockState": {
+                    "minLength": 1
+                  }
+                },
+                "required": ["topicGetTargetLockState"]
+              },
+              "then": {
+                "required": ["topicGetCurrentLockState", "topicSetTargetLockState"]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "topicSetTargetLockState": {
+                    "minLength": 1
+                  }
+                },
+                "required": ["topicSetTargetLockState"]
+              },
+              "then": {
+                "required": ["topicGetTargetLockState"]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "topicGetCurrentFanState": {
+                    "minLength": 1
+                  }
+                },
+                "required": ["topicGetCurrentFanState"]
+              },
+              "then": {
+                "anyOf": [
+                  { "required": ["valueModeInactive"] },
+                  { "required": ["valueModeIdle"] },
+                  { "required": ["valueModeBlowing"] }
+                ]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "topicGetTargetFanState": {
+                    "minLength": 1
+                  }
+                },
+                "required": ["topicGetTargetFanState"]
+              },
+              "then": {
+                "required": ["topicSetTargetFanState"],
+                "anyOf": [
+                  { "required": ["valueModeAuto"] },
+                  { "required": ["valueModeManual"] }
+                ]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "topicSetTargetFanState": {
+                    "minLength": 1
+                  }
+                },
+                "required": ["topicSetTargetFanState"]
+              },
+              "then": {
+                "required": ["topicGetTargetFanState"]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "topicGetRotationDirection": {
+                    "minLength": 1
+                  }
+                },
+                "required": ["topicGetRotationDirection"]
+              },
+              "then": {
+                "required": ["topicSetRotationDirection", "valueDirectionClockwise", "valueDirectionCounterClockwise"]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "topicSetRotationDirection": {
+                    "minLength": 1
+                  }
+                },
+                "required": ["topicSetRotationDirection"]
+              },
+              "then": {
+                "required": ["topicGetRotationDirection"]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "topicSetHoldPosition": {
+                    "minLength": 1
+                  }
+                },
+                "required": ["topicSetHoldPosition"]
+              },
+              "then": {
+                "required": ["valuePositionHold", "valuePositionResume"]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "topicGetObstructionDetected": {
+                    "minLength": 1
+                  }
+                },
+                "required": ["topicGetObstructionDetected"]
+              },
+              "then": {
+                "required": ["valuePositionObstructed"]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "topicGetCurrentHorizontalTiltAngle": {
+                    "minLength": 1
+                  }
+                },
+                "required": ["topicGetCurrentHorizontalTiltAngle"]
+              },
+              "then": {
+                "required": ["topicGetTargetHorizontalTiltAngle", "topicSetTargetHorizontalTiltAngle"]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "topicSetTargetHorizontalTiltAngle": {
+                    "minLength": 1
+                  }
+                },
+                "required": ["topicSetTargetHorizontalTiltAngle"]
+              },
+              "then": {
+                "required": ["topicGetTargetHorizontalTiltAngle"]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "topicGetTargetVerticalTiltAngle": {
+                    "minLength": 1
+                  }
+                },
+                "required": ["topicGetTargetVerticalTiltAngle"]
+              },
+              "then": {
+                "required": ["topicGetCurrentVerticalTiltAngle", "topicSetTargetVerticalTiltAngle"]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "topicSetTargetVerticalTiltAngle": {
+                    "minLength": 1
+                  }
+                },
+                "required": ["topicSetTargetVerticalTiltAngle"]
+              },
+              "then": {
+                "required": ["topicGetCurrentVerticalTiltAngle"]
+              }
+            }
+          ]
+        },
+        "default": []
+      },
+      "verbose": {
+        "type": "boolean",
+        "default": false
+      }
+    }
+  },
+  "layout": [
+    {
+      "type": "array",
+      "key": "accessories",
+      "notitle": true,
+      "items": [
+        {
+          "type": "fieldset",
+          "expandable": true,
+          "title": "${config.title.accessory}",
+          "items": [
+            {
+              "type": "div",
+              "displayFlex": true,
+              "flex-direction": "row",
+              "items": [
+                {
+                  "key": "accessories[].info.name",
+                  "flex": "0 0 33%"
+                },
+                {
+                  "key": "accessories[].info.type",
+                  "flex": "0 0 33%"
+                },
+                {
+                  "key": "accessories[].info.group",
+                  "flex": "0 0 33%"
+                }
+              ]
+            },
+            {
+              "type": "fieldset",
+              "notitle": true,
+              "condition": {
+                "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'Valve';"
+              },
+              "items": [
+                {
+                  "type": "div",
+                  "displayFlex": true,
+                  "flex-direction": "row",
+                  "items": [
+                    {
+                      "key": "accessories[].valveType",
+                      "flex": "0 0 33%"
+                    }
+                  ]
+                }
+              ]
+            },
+            "accessories[].mqtt.broker",
+            {
+              "type": "div",
+              "displayFlex": true,
+              "flex-direction": "row",
+              "items": [
+                {
+                  "key": "accessories[].mqtt.username",
+                  "flex": "0 0 50%"
+                },
+                {
+                  "key": "accessories[].mqtt.password",
+                  "flex": "0 0 50%"
+                }
+              ]
+            },
+            "accessories[].mqtt.options",
+            {
+              "type": "div",
+              "displayFlex": true,
+              "flex-direction": "row",
+              "items": [
+                {
+                  "key": "accessories[].resetOnRestart",
+                  "flex": "0 0 25%"
+                },
+                {
+                  "key": "accessories[].disableLogging",
+                  "flex": "0 0 25%"
+                }
+              ]
+            },
+            {
+              "type": "fieldset",
+              "title": "${config.title.topics}",
+              "description": "${config.description.topics}",
+              "condition": {
+                "functionBody": "return model.accessories?.[arguments[1]]?.info?.type !== undefined;"
+              },
+              "items": [
+                {
+                  "type": "fieldset",
+                  "notitle": true,
+                  "condition": {
+                    "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'GarageDoorOpener';"
+                  },
+                  "items": [
+                    {
+                      "type": "div",
+                      "displayFlex": true,
+                      "flex-direction": "row",
+                      "items": [
+                        {
+                          "key": "accessories[].topicGetCurrentDoorState",
+                          "flex": "0 0 50%"
+                        },
+                        {
+                          "key": "accessories[].topicGetObstructionDetected",
+                          "flex": "0 0 50%"
+                        }
+                      ]
+                    },
+                    {
+                      "type": "div",
+                      "displayFlex": true,
+                      "flex-direction": "row",
+                      "items": [
+                        {
+                          "key": "accessories[].topicGetTargetDoorState",
+                          "flex": "0 0 50%"
+                        },
+                        {
+                          "key": "accessories[].topicSetTargetDoorState",
+                          "flex": "0 0 50%"
+                        }
+                      ]
+                    },
+                    {
+                      "type": "div",
+                      "displayFlex": true,
+                      "flex-direction": "row",
+                      "items": [
+                        {
+                          "key": "accessories[].topicGetCurrentLockState",
+                          "title": "${config.title.topicGetCurrentLockStateOptional}",
+                          "flex": "0 0 50%"
+                        }
+                      ]
+                    },
+                    {
+                      "type": "div",
+                      "displayFlex": true,
+                      "flex-direction": "row",
+                      "items": [
+                        {
+                          "key": "accessories[].topicGetTargetLockState",
+                          "title": "${config.title.topicGetTargetLockStateOptional}",
+                          "flex": "0 0 50%"
+                        },
+                        {
+                          "key": "accessories[].topicSetTargetLockState",
+                          "title": "${config.title.topicSetTargetLockStateOptional}",
+                          "flex": "0 0 50%"
+                        }
+                      ]
+                    }
+                  ]
+                },
+                {
+                  "type": "fieldset",
+                  "notitle": true,
+                  "condition": {
+                    "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'LockMechanism';"
+                  },
+                  "items": [
+                    {
+                      "type": "div",
+                      "displayFlex": true,
+                      "flex-direction": "row",
+                      "items": [
+                        {
+                          "key": "accessories[].topicGetCurrentLockState",
+                          "flex": "0 0 50%"
+                        }
+                      ]
+                    },
+                    {
+                      "type": "div",
+                      "displayFlex": true,
+                      "flex-direction": "row",
+                      "items": [
+                        {
+                          "key": "accessories[].topicGetTargetLockState",
+                          "flex": "0 0 50%"
+                        },
+                        {
+                          "key": "accessories[].topicSetTargetLockState",
+                          "flex": "0 0 50%"
+                        }
+                      ]
+                    }
+                  ]
+                },
+                {
+                  "type": "fieldset",
+                  "notitle": true,
+                  "condition": {
+                    "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'Valve';"
+                  },
+                  "items": [
+                    {
+                      "type": "div",
+                      "displayFlex": true,
+                      "flex-direction": "row",
+                      "items": [
+                        {
+                          "key": "accessories[].topicGetValveActive",
+                          "flex": "0 0 50%"
+                        },
+                        {
+                          "key": "accessories[].topicSetValveActive",
+                          "flex": "0 0 50%"
+                        }
+                      ]
+                    },
+                    {
+                      "type": "div",
+                      "displayFlex": true,
+                      "flex-direction": "row",
+                      "items": [
+                        {
+                          "key": "accessories[].topicGetValveInUse",
+                          "flex": "0 0 50%"
+                        }
+                      ]
+                    },
+                    {
+                      "type": "div",
+                      "displayFlex": true,
+                      "flex-direction": "row",
+                      "items": [
+                        {
+                          "key": "accessories[].topicGetValveIsConfigured",
+                          "flex": "0 0 50%"
+                        },
+                        {
+                          "key": "accessories[].topicSetValveIsConfigured",
+                          "flex": "0 0 50%"
+                        }
+                      ]
+                    },
+                    {
+                      "type": "div",
+                      "displayFlex": true,
+                      "flex-direction": "row",
+                      "items": [
+                        {
+                          "key": "accessories[].topicGetValveSetDuration",
+                          "flex": "0 0 50%"
+                        },
+                        {
+                          "key": "accessories[].topicSetValveSetDuration",
+                          "flex": "0 0 50%"
+                        }
+                      ]
+                    },
+                    {
+                      "type": "div",
+                      "displayFlex": true,
+                      "flex-direction": "row",
+                      "items": [
+                        {
+                          "key": "accessories[].topicGetValveRemainingDuration",
+                          "flex": "0 0 50%"
+                        }
+                      ]
+                    },
+                    {
+                      "type": "div",
+                      "displayFlex": true,
+                      "flex-direction": "row",
+                      "items": [
+                        {
+                          "key": "accessories[].topicGetStatusFault",
+                          "flex": "0 0 50%"
+                        }
+                      ]
+                    }
+                  ]
+                },
+                {
+                  "type": "fieldset",
+                  "notitle": true,
                   "condition": {
                     "functionBody": "return ['Lightbulb', 'Outlet', 'Switch'].includes(model.accessories?.[arguments[1]]?.info?.type);"
                   },
@@ -593,11 +1884,359 @@
                       "flex-direction": "row",
                       "items": [
                         {
-                          "key": "accessories[].topicGetOn",
+                          "key": "accessories[].topicGetOn",
+                          "flex": "0 0 50%"
+                        },
+                        {
+                          "key": "accessories[].topicSetOn",
+                          "flex": "0 0 50%"
+                        }
+                      ]
+                    }
+                  ]
+                },
+                {
+                  "type": "fieldset",
+                  "notitle": true,
+                  "condition": {
+                    "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'Lightbulb';"
+                  },
+                  "items": [
+                    {
+                      "type": "div",
+                      "displayFlex": true,
+                      "flex-direction": "row",
+                      "items": [
+                        {
+                          "key": "accessories[].topicGetBrightness",
+                          "flex": "0 0 50%"
+                        },
+                        {
+                          "key": "accessories[].topicSetBrightness",
+                          "flex": "0 0 50%"
+                        }
+                      ]
+                    },
+                    {
+                      "type": "div",
+                      "displayFlex": true,
+                      "flex-direction": "row",
+                      "items": [
+                        {
+                          "key": "accessories[].topicGetHue",
+                          "flex": "0 0 50%"
+                        },
+                        {
+                          "key": "accessories[].topicSetHue",
+                          "flex": "0 0 50%"
+                        }
+                      ]
+                    },
+                    {
+                      "type": "div",
+                      "displayFlex": true,
+                      "flex-direction": "row",
+                      "items": [
+                        {
+                          "key": "accessories[].topicGetColorTemperature",
+                          "flex": "0 0 50%"
+                        },
+                        {
+                          "key": "accessories[].topicSetColorTemperature",
+                          "flex": "0 0 50%"
+                        }
+                      ]
+                    },
+                    {
+                      "type": "div",
+                      "displayFlex": true,
+                      "flex-direction": "row",
+                      "items": [
+                        {
+                          "key": "accessories[].topicGetSaturation",
+                          "flex": "0 0 50%"
+                        },
+                        {
+                          "key": "accessories[].topicSetSaturation",
+                          "flex": "0 0 50%"
+                        }
+                      ]
+                    }
+                  ]
+                },
+                {
+                  "type": "fieldset",
+                  "notitle": true,
+                  "condition": {
+                    "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'Outlet';"
+                  },
+                  "items": [
+                    {
+                      "type": "div",
+                      "displayFlex": true,
+                      "flex-direction": "row",
+                      "items": [
+                        {
+                          "key": "accessories[].topicGetOutletInUse",
+                          "flex": "0 0 50%"
+                        }
+                      ]
+                    }
+                  ]
+                },
+                {
+                  "type": "fieldset",
+                  "notitle": true,
+                  "condition": {
+                    "functionBody": "return ['WindowCovering'].includes(model.accessories?.[arguments[1]]?.info?.type);"
+                  },
+                  "items": [
+                    {
+                      "type": "fieldset",
+                      "notitle": true,
+                      "items": [
+                        {
+                          "type": "div",
+                          "displayFlex": true,
+                          "flex-direction": "row",
+                          "items": [
+                            {
+                              "key": "accessories[].topicGetCurrentPosition",
+                              "flex": "0 0 50%"
+                            },
+                            {
+                              "key": "accessories[].topicGetPositionState",
+                              "flex": "0 0 50%"
+                            }
+                          ]
+                        },
+                        {
+                          "type": "div",
+                          "displayFlex": true,
+                          "flex-direction": "row",
+                          "items": [
+                            {
+                              "key": "accessories[].topicGetTargetPosition",
+                              "flex": "0 0 50%"
+                            },
+                            {
+                              "key": "accessories[].topicSetTargetPosition",
+                              "flex": "0 0 50%"
+                            }
+                          ]
+                        }
+                      ]
+                    }
+                  ]
+                },
+                {
+                  "type": "fieldset",
+                  "notitle": true,
+                  "condition": {
+                    "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'WindowCovering';"
+                  },
+                  "items": [
+                    {
+                      "type": "fieldset",
+                      "notitle": true,
+                      "items": [
+                        {
+                          "type": "div",
+                          "displayFlex": true,
+                          "flex-direction": "row",
+                          "items": [
+                            {
+                              "key": "accessories[].topicGetCurrentHorizontalTiltAngle",
+                              "flex": "0 0 50%"
+                            }
+                          ]
+                        },
+                        {
+                          "type": "div",
+                          "displayFlex": true,
+                          "flex-direction": "row",
+                          "items": [
+                            {
+                              "key": "accessories[].topicGetTargetHorizontalTiltAngle",
+                              "flex": "0 0 50%"
+                            },
+                            {
+                              "key": "accessories[].topicSetTargetHorizontalTiltAngle",
+                              "flex": "0 0 50%"
+                            }
+                          ]
+                        },
+                        {
+                          "type": "div",
+                          "displayFlex": true,
+                          "flex-direction": "row",
+                          "items": [
+                            {
+                              "type": "div",
+                              "displayFlex": true,
+                              "flex-direction": "row",
+                              "items": [
+                                {
+                                  "key": "accessories[].topicGetCurrentVerticalTiltAngle",
+                                  "flex": "0 0 50%"
+                                }
+                              ]
+                            }
+                          ]
+                        },
+                        {
+                          "type": "div",
+                          "displayFlex": true,
+                          "flex-direction": "row",
+                          "items": [
+                            {
+                              "key": "accessories[].topicGetTargetVerticalTiltAngle",
+                              "flex": "0 0 50%"
+                            },
+                            {
+                              "key": "accessories[].topicSetTargetVerticalTiltAngle",
+                              "flex": "0 0 50%"
+                            }
+                          ]
+                        }
+                      ]
+                    }
+                  ]
+                },
+                {
+                  "type": "fieldset",
+                  "notitle": true,
+                  "condition": {
+                    "functionBody": "return ['WindowCovering'].includes(model.accessories?.[arguments[1]]?.info?.type);"
+                  },
+                  "items": [
+                    {
+                      "type": "div",
+                      "displayFlex": true,
+                      "flex-direction": "row",
+                      "items": [
+                        {
+                          "key": "accessories[].topicSetHoldPosition",
+                          "flex": "0 0 50%"
+                        },
+                        {
+                          "key": "accessories[].topicGetObstructionDetected",
+                          "title": "${config.title.topicGetObstructionDetectedOptional}",
+                          "flex": "0 0 50%"
+                        }
+                      ]
+                    }
+                  ]
+                },
+                {
+                  "type": "fieldset",
+                  "notitle": true,
+                  "condition": {
+                    "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'SecuritySystem';"
+                  },
+                  "items": [
+                    {
+                      "type": "div",
+                      "displayFlex": true,
+                      "flex-direction": "row",
+                      "items": [
+                        {
+                          "key": "accessories[].topicGetCurrentSecurityState",
+                          "flex": "0 0 50%"
+                        }
+                      ]
+                    },
+                    {
+                      "type": "div",
+                      "displayFlex": true,
+                      "flex-direction": "row",
+                      "items": [
+                        {
+                          "key": "accessories[].topicGetTargetSecurityState",
+                          "flex": "0 0 50%"
+                        },
+                        {
+                          "key": "accessories[].topicSetTargetSecurityState",
+                          "flex": "0 0 50%"
+                        }
+                      ]
+                    },
+                    {
+                      "type": "div",
+                      "displayFlex": true,
+                      "flex-direction": "row",
+                      "items": [
+                        {
+                          "key": "accessories[].topicGetStatusTampered",
+                          "flex": "0 0 50%"
+                        },
+                        {
+                          "key": "accessories[].topicGetStatusFault",
+                          "flex": "0 0 50%"
+                        }
+                      ]
+                    }
+                  ]
+                },
+                {
+                  "type": "fieldset",
+                  "notitle": true,
+                  "condition": {
+                    "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'AirQualitySensor';"
+                  },
+                  "items": [
+                    {
+                      "type": "div",
+                      "displayFlex": true,
+                      "flex-direction": "row",
+                      "items": [
+                        {
+                          "key": "accessories[].topicGetAirQuality",
+                          "flex": "0 0 50%"
+                        }
+                      ]
+                    },
+                    {
+                      "type": "div",
+                      "displayFlex": true,
+                      "flex-direction": "row",
+                      "items": [
+                        {
+                          "key": "accessories[].topicGetNitrogenDioxideDensity",
+                          "flex": "0 0 50%"
+                        },
+                        {
+                          "key": "accessories[].topicGetOzoneDensity",
+                          "flex": "0 0 50%"
+                        }
+                      ]
+                    },
+                    {
+                      "type": "div",
+                      "displayFlex": true,
+                      "flex-direction": "row",
+                      "items": [
+                        {
+                          "key": "accessories[].topicGetPM2_5Density",
                           "flex": "0 0 50%"
                         },
                         {
-                          "key": "accessories[].topicSetOn",
+                          "key": "accessories[].topicGetPM10Density",
+                          "flex": "0 0 50%"
+                        }
+                      ]
+                    },
+                    {
+                      "type": "div",
+                      "displayFlex": true,
+                      "flex-direction": "row",
+                      "items": [
+                        {
+                          "key": "accessories[].topicGetSulphurDioxideDensity",
+                          "flex": "0 0 50%"
+                        },
+                        {
+                          "key": "accessories[].topicGetVOCDensity",
                           "flex": "0 0 50%"
                         }
                       ]
@@ -608,7 +2247,7 @@
                   "type": "fieldset",
                   "notitle": true,
                   "condition": {
-                    "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'Lightbulb';"
+                    "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'CarbonDioxideSensor';"
                   },
                   "items": [
                     {
@@ -617,11 +2256,7 @@
                       "flex-direction": "row",
                       "items": [
                         {
-                          "key": "accessories[].topicGetBrightness",
-                          "flex": "0 0 50%"
-                        },
-                        {
-                          "key": "accessories[].topicSetBrightness",
+                          "key": "accessories[].topicGetCarbonDioxideDetected",
                           "flex": "0 0 50%"
                         }
                       ]
@@ -632,26 +2267,31 @@
                       "flex-direction": "row",
                       "items": [
                         {
-                          "key": "accessories[].topicGetHue",
+                          "key": "accessories[].topicGetCarbonDioxideLevel",
                           "flex": "0 0 50%"
                         },
                         {
-                          "key": "accessories[].topicSetHue",
+                          "key": "accessories[].topicGetCarbonDioxidePeakLevel",
                           "flex": "0 0 50%"
                         }
                       ]
-                    },
+                    }
+                  ]
+                },
+                {
+                  "type": "fieldset",
+                  "notitle": true,
+                  "condition": {
+                    "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'CarbonMonoxideSensor';"
+                  },
+                  "items": [
                     {
                       "type": "div",
                       "displayFlex": true,
                       "flex-direction": "row",
                       "items": [
                         {
-                          "key": "accessories[].topicGetColorTemperature",
-                          "flex": "0 0 50%"
-                        },
-                        {
-                          "key": "accessories[].topicSetColorTemperature",
+                          "key": "accessories[].topicGetCarbonMonoxideDetected",
                           "flex": "0 0 50%"
                         }
                       ]
@@ -662,22 +2302,36 @@
                       "flex-direction": "row",
                       "items": [
                         {
-                          "key": "accessories[].topicGetSaturation",
+                          "key": "accessories[].topicGetCarbonMonoxideLevel",
                           "flex": "0 0 50%"
                         },
                         {
-                          "key": "accessories[].topicSetSaturation",
+                          "key": "accessories[].topicGetCarbonMonoxidePeakLevel",
                           "flex": "0 0 50%"
                         }
                       ]
                     }
                   ]
                 },
+                {
+                  "type": "div",
+                  "displayFlex": true,
+                  "flex-direction": "row",
+                  "condition": {
+                    "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'ContactSensor';"
+                  },
+                  "items": [
+                    {
+                      "key": "accessories[].topicGetContactSensorState",
+                      "flex": "0 0 50%"
+                    }
+                  ]
+                },
                 {
                   "type": "fieldset",
                   "notitle": true,
                   "condition": {
-                    "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'Outlet';"
+                    "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'AirPurifier';"
                   },
                   "items": [
                     {
@@ -686,7 +2340,22 @@
                       "flex-direction": "row",
                       "items": [
                         {
-                          "key": "accessories[].topicGetOutletInUse",
+                          "key": "accessories[].topicGetCurrentPurifierState",
+                          "flex": "0 0 50%"
+                        }
+                      ]
+                    },
+                    {
+                      "type": "div",
+                      "displayFlex": true,
+                      "flex-direction": "row",
+                      "items": [
+                        {
+                          "key": "accessories[].topicGetTargetPurifierState",
+                          "flex": "0 0 50%"
+                        },
+                        {
+                          "key": "accessories[].topicSetTargetPurifierState",
                           "flex": "0 0 50%"
                         }
                       ]
@@ -697,7 +2366,7 @@
                   "type": "fieldset",
                   "notitle": true,
                   "condition": {
-                    "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'SecuritySystem';"
+                    "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'HeaterCooler';"
                   },
                   "items": [
                     {
@@ -706,7 +2375,22 @@
                       "flex-direction": "row",
                       "items": [
                         {
-                          "key": "accessories[].topicGetCurrentSecurityState",
+                          "key": "accessories[].topicGetCurrentTemperature",
+                          "flex": "0 0 50%"
+                        },
+                        {
+                          "key": "accessories[].temperatureUnits",
+                          "flex": "0 0 25%"
+                        }
+                      ]
+                    },
+                    {
+                      "type": "div",
+                      "displayFlex": true,
+                      "flex-direction": "row",
+                      "items": [
+                        {
+                          "key": "accessories[].topicGetCurrentHeaterCoolerState",
                           "flex": "0 0 50%"
                         }
                       ]
@@ -717,26 +2401,35 @@
                       "flex-direction": "row",
                       "items": [
                         {
-                          "key": "accessories[].topicGetTargetSecurityState",
+                          "key": "accessories[].topicGetTargetHeaterCoolerState",
                           "flex": "0 0 50%"
                         },
                         {
-                          "key": "accessories[].topicSetTargetSecurityState",
+                          "key": "accessories[].topicSetTargetHeaterCoolerState",
                           "flex": "0 0 50%"
                         }
                       ]
-                    },
+                    }
+                  ]
+                },
+                {
+                  "type": "fieldset",
+                  "notitle": true,
+                  "condition": {
+                    "functionBody": "return ['AirPurifier', 'Fanv2', 'HeaterCooler'].includes(model.accessories?.[arguments[1]]?.info?.type);"
+                  },
+                  "items": [
                     {
                       "type": "div",
                       "displayFlex": true,
                       "flex-direction": "row",
                       "items": [
                         {
-                          "key": "accessories[].topicGetStatusTampered",
+                          "key": "accessories[].topicGetActive",
                           "flex": "0 0 50%"
                         },
                         {
-                          "key": "accessories[].topicGetStatusFault",
+                          "key": "accessories[].topicSetActive",
                           "flex": "0 0 50%"
                         }
                       ]
@@ -747,7 +2440,7 @@
                   "type": "fieldset",
                   "notitle": true,
                   "condition": {
-                    "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'CarbonDioxideSensor';"
+                    "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'Fanv2';"
                   },
                   "items": [
                     {
@@ -756,7 +2449,7 @@
                       "flex-direction": "row",
                       "items": [
                         {
-                          "key": "accessories[].topicGetCarbonDioxideDetected",
+                          "key": "accessories[].topicGetCurrentFanState",
                           "flex": "0 0 50%"
                         }
                       ]
@@ -767,11 +2460,26 @@
                       "flex-direction": "row",
                       "items": [
                         {
-                          "key": "accessories[].topicGetCarbonDioxideLevel",
+                          "key": "accessories[].topicGetTargetFanState",
                           "flex": "0 0 50%"
                         },
                         {
-                          "key": "accessories[].topicGetCarbonDioxidePeakLevel",
+                          "key": "accessories[].topicSetTargetFanState",
+                          "flex": "0 0 50%"
+                        }
+                      ]
+                    },
+                    {
+                      "type": "div",
+                      "displayFlex": true,
+                      "flex-direction": "row",
+                      "items": [
+                        {
+                          "key": "accessories[].topicGetRotationDirection",
+                          "flex": "0 0 50%"
+                        },
+                        {
+                          "key": "accessories[].topicSetRotationDirection",
                           "flex": "0 0 50%"
                         }
                       ]
@@ -782,7 +2490,7 @@
                   "type": "fieldset",
                   "notitle": true,
                   "condition": {
-                    "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'CarbonMonoxideSensor';"
+                    "functionBody": "return ['AirPurifier', 'Fanv2', 'HeaterCooler'].includes(model.accessories?.[arguments[1]]?.info?.type);"
                   },
                   "items": [
                     {
@@ -791,7 +2499,11 @@
                       "flex-direction": "row",
                       "items": [
                         {
-                          "key": "accessories[].topicGetCarbonMonoxideDetected",
+                          "key": "accessories[].topicGetLockPhysicalControls",
+                          "flex": "0 0 50%"
+                        },
+                        {
+                          "key": "accessories[].topicSetLockPhysicalControls",
                           "flex": "0 0 50%"
                         }
                       ]
@@ -802,11 +2514,26 @@
                       "flex-direction": "row",
                       "items": [
                         {
-                          "key": "accessories[].topicGetCarbonMonoxideLevel",
+                          "key": "accessories[].topicGetRotationSpeed",
                           "flex": "0 0 50%"
                         },
                         {
-                          "key": "accessories[].topicGetCarbonMonoxidePeakLevel",
+                          "key": "accessories[].topicSetRotationSpeed",
+                          "flex": "0 0 50%"
+                        }
+                      ]
+                    },
+                    {
+                      "type": "div",
+                      "displayFlex": true,
+                      "flex-direction": "row",
+                      "items": [
+                        {
+                          "key": "accessories[].topicGetSwingMode",
+                          "flex": "0 0 50%"
+                        },
+                        {
+                          "key": "accessories[].topicSetSwingMode",
                           "flex": "0 0 50%"
                         }
                       ]
@@ -818,12 +2545,100 @@
                   "displayFlex": true,
                   "flex-direction": "row",
                   "condition": {
-                    "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'ContactSensor';"
+                    "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'HumiditySensor';"
+                  },
+                  "items": [
+                    {
+                      "key": "accessories[].topicGetCurrentRelativeHumidity",
+                      "flex": "0 0 50%"
+                    }
+                  ]
+                },
+                {
+                  "type": "div",
+                  "displayFlex": true,
+                  "flex-direction": "row",
+                  "condition": {
+                    "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'LeakSensor';"
+                  },
+                  "items": [
+                    {
+                      "key": "accessories[].topicGetLeakDetected",
+                      "flex": "0 0 50%"
+                    }
+                  ]
+                },
+                {
+                  "type": "div",
+                  "displayFlex": true,
+                  "flex-direction": "row",
+                  "condition": {
+                    "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'LightSensor';"
+                  },
+                  "items": [
+                    {
+                      "key": "accessories[].topicGetCurrentAmbientLightLevel",
+                      "flex": "0 0 50%"
+                    }
+                  ]
+                },
+                {
+                  "type": "div",
+                  "displayFlex": true,
+                  "flex-direction": "row",
+                  "condition": {
+                    "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'MotionSensor';"
+                  },
+                  "items": [
+                    {
+                      "key": "accessories[].topicGetMotionDetected",
+                      "flex": "0 0 50%"
+                    }
+                  ]
+                },
+                {
+                  "type": "div",
+                  "displayFlex": true,
+                  "flex-direction": "row",
+                  "condition": {
+                    "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'OccupancySensor';"
+                  },
+                  "items": [
+                    {
+                      "key": "accessories[].topicGetOccupancyDetected",
+                      "flex": "0 0 50%"
+                    }
+                  ]
+                },
+                {
+                  "type": "div",
+                  "displayFlex": true,
+                  "flex-direction": "row",
+                  "condition": {
+                    "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'SmokeSensor';"
+                  },
+                  "items": [
+                    {
+                      "key": "accessories[].topicGetSmokeDetected",
+                      "flex": "0 0 50%"
+                    }
+                  ]
+                },
+                {
+                  "type": "div",
+                  "displayFlex": true,
+                  "flex-direction": "row",
+                  "condition": {
+                    "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'TemperatureSensor';"
                   },
                   "items": [
                     {
-                      "key": "accessories[].topicGetContactSensorState",
-                      "flex": "0 0 50%"
+                      "key": "accessories[].topicGetCurrentTemperature",
+                      "flex": "0 0 67%"
+                    },
+                    {
+                      "key": "accessories[].temperatureUnits",
+                      "flex": "0 0 33%"
                     }
                   ]
                 },
@@ -831,7 +2646,7 @@
                   "type": "fieldset",
                   "notitle": true,
                   "condition": {
-                    "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'HeaterCooler';"
+                    "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'Thermostat';"
                   },
                   "items": [
                     {
@@ -840,13 +2655,8 @@
                       "flex-direction": "row",
                       "items": [
                         {
-                          "key": "accessories[].topicGetCurrentTemperature",
+                          "key": "accessories[].topicGetCurrentHeatingCoolingState",
                           "flex": "0 0 50%"
-                        },
-                        {
-                          "key": "accessories[].temperatureUnits",
-                          "title": "${config.title.sourceUnits}",
-                          "flex": "0 0 25%"
                         }
                       ]
                     },
@@ -856,11 +2666,11 @@
                       "flex-direction": "row",
                       "items": [
                         {
-                          "key": "accessories[].topicGetActive",
+                          "key": "accessories[].topicGetTargetHeatingCoolingState",
                           "flex": "0 0 50%"
                         },
                         {
-                          "key": "accessories[].topicSetActive",
+                          "key": "accessories[].topicSetTargetHeatingCoolingState",
                           "flex": "0 0 50%"
                         }
                       ]
@@ -871,8 +2681,12 @@
                       "flex-direction": "row",
                       "items": [
                         {
-                          "key": "accessories[].topicGetCurrentHeaterCoolerState",
+                          "key": "accessories[].topicGetCurrentTemperature",
                           "flex": "0 0 50%"
+                        },
+                        {
+                          "key": "accessories[].temperatureUnits",
+                          "flex": "0 0 25%"
                         }
                       ]
                     },
@@ -882,11 +2696,11 @@
                       "flex-direction": "row",
                       "items": [
                         {
-                          "key": "accessories[].topicGetTargetHeaterCoolerState",
+                          "key": "accessories[].topicGetTargetTemperature",
                           "flex": "0 0 50%"
                         },
                         {
-                          "key": "accessories[].topicSetTargetHeaterCoolerState",
+                          "key": "accessories[].topicSetTargetTemperature",
                           "flex": "0 0 50%"
                         }
                       ]
@@ -897,11 +2711,8 @@
                       "flex-direction": "row",
                       "items": [
                         {
-                          "key": "accessories[].topicGetCoolingThresholdTemperature",
-                          "flex": "0 0 50%"
-                        },
-                        {
-                          "key": "accessories[].topicSetCoolingThresholdTemperature",
+                          "key": "accessories[].topicGetCurrentRelativeHumidity",
+                          "title": "${config.title.topicGetCurrentRelativeHumidityOptional}",
                           "flex": "0 0 50%"
                         }
                       ]
@@ -912,26 +2723,35 @@
                       "flex-direction": "row",
                       "items": [
                         {
-                          "key": "accessories[].topicGetHeatingThresholdTemperature",
+                          "key": "accessories[].topicGetTargetRelativeHumidity",
                           "flex": "0 0 50%"
                         },
                         {
-                          "key": "accessories[].topicSetHeatingThresholdTemperature",
+                          "key": "accessories[].topicSetTargetRelativeHumidity",
                           "flex": "0 0 50%"
                         }
                       ]
-                    },
+                    }
+                  ]
+                },
+                {
+                  "type": "fieldset",
+                  "notitle": true,
+                  "condition": {
+                    "functionBody": "return ['HeaterCooler', 'Thermostat'].includes(model.accessories?.[arguments[1]]?.info?.type);"
+                  },
+                  "items": [
                     {
                       "type": "div",
                       "displayFlex": true,
                       "flex-direction": "row",
                       "items": [
                         {
-                          "key": "accessories[].topicGetLockPhysicalControls",
+                          "key": "accessories[].topicGetCoolingThresholdTemperature",
                           "flex": "0 0 50%"
                         },
                         {
-                          "key": "accessories[].topicSetLockPhysicalControls",
+                          "key": "accessories[].topicSetCoolingThresholdTemperature",
                           "flex": "0 0 50%"
                         }
                       ]
@@ -942,26 +2762,46 @@
                       "flex-direction": "row",
                       "items": [
                         {
-                          "key": "accessories[].topicGetRotationSpeed",
+                          "key": "accessories[].topicGetHeatingThresholdTemperature",
                           "flex": "0 0 50%"
                         },
                         {
-                          "key": "accessories[].topicSetRotationSpeed",
+                          "key": "accessories[].topicSetHeatingThresholdTemperature",
                           "flex": "0 0 50%"
                         }
                       ]
-                    },
+                    }
+                  ]
+                },
+                {
+                  "type": "fieldset",
+                  "notitle": true,
+                  "condition": {
+                    "functionBody": "return ['AirPurifier', 'HeaterCooler'].includes(model.accessories?.[arguments[1]]?.info?.type);"
+                  },
+                  "items": [
                     {
                       "type": "div",
                       "displayFlex": true,
                       "flex-direction": "row",
                       "items": [
                         {
-                          "key": "accessories[].topicGetSwingMode",
+                          "key": "accessories[].topicGetFilterChangeIndication",
                           "flex": "0 0 50%"
                         },
                         {
-                          "key": "accessories[].topicSetSwingMode",
+                          "key": "accessories[].topicGetFilterLifeLevel",
+                          "flex": "0 0 50%"
+                        }
+                      ]
+                    },
+                    {
+                      "type": "div",
+                      "displayFlex": true,
+                      "flex-direction": "row",
+                      "items": [
+                        {
+                          "key": "accessories[].topicResetFilterIndication",
                           "flex": "0 0 50%"
                         }
                       ]
@@ -973,25 +2813,15 @@
                   "displayFlex": true,
                   "flex-direction": "row",
                   "condition": {
-                    "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'HumiditySensor';"
+                    "functionBody": "const type = model.accessories?.[arguments[1]]?.info?.type; return type !== undefined && type.endsWith('Sensor');"
                   },
                   "items": [
                     {
-                      "key": "accessories[].topicGetCurrentRelativeHumidity",
+                      "key": "accessories[].topicGetStatusFault",
                       "flex": "0 0 50%"
-                    }
-                  ]
-                },
-                {
-                  "type": "div",
-                  "displayFlex": true,
-                  "flex-direction": "row",
-                  "condition": {
-                    "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'LeakSensor';"
-                  },
-                  "items": [
+                    },
                     {
-                      "key": "accessories[].topicGetLeakDetected",
+                      "key": "accessories[].topicGetStatusTampered",
                       "flex": "0 0 50%"
                     }
                   ]
@@ -1000,12 +2830,13 @@
                   "type": "div",
                   "displayFlex": true,
                   "flex-direction": "row",
-                  "condition": {
-                    "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'MotionSensor';"
-                  },
                   "items": [
                     {
-                      "key": "accessories[].topicGetMotionDetected",
+                      "key": "accessories[].topicGetBatteryLevel",
+                      "flex": "0 0 50%"
+                    },
+                    {
+                      "key": "accessories[].topicGetBatteryLow",
                       "flex": "0 0 50%"
                     }
                   ]
@@ -1014,46 +2845,95 @@
                   "type": "div",
                   "displayFlex": true,
                   "flex-direction": "row",
-                  "condition": {
-                    "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'OccupancySensor';"
-                  },
                   "items": [
                     {
-                      "key": "accessories[].topicGetOccupancyDetected",
+                      "key": "accessories[].topicGetStatusActive",
                       "flex": "0 0 50%"
                     }
                   ]
-                },
+                }
+              ]
+            },
+            {
+              "type": "fieldset",
+              "title": "${config.title.values}",
+              "description": "${config.description.values}",
+              "condition": {
+                "functionBody": "return model.accessories?.[arguments[1]]?.info?.type !== undefined;"
+              },
+              "items": [
                 {
-                  "type": "div",
-                  "displayFlex": true,
-                  "flex-direction": "row",
+                  "type": "fieldset",
+                  "notitle": true,
                   "condition": {
-                    "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'SmokeSensor';"
+                    "functionBody": "return ['AirPurifier', 'Fanv2', 'HeaterCooler'].includes(model.accessories?.[arguments[1]]?.info?.type);"
                   },
                   "items": [
                     {
-                      "key": "accessories[].topicGetSmokeDetected",
-                      "flex": "0 0 50%"
+                      "type": "div",
+                      "displayFlex": true,
+                      "flex-direction": "row",
+                      "items": [
+                        {
+                          "key": "accessories[].valueStateActive",
+                          "flex": "0 0 20%"
+                        },
+                        {
+                          "key": "accessories[].valueStateInactive",
+                          "flex": "0 0 20%"
+                        }
+                      ]
                     }
                   ]
                 },
                 {
-                  "type": "div",
-                  "displayFlex": true,
-                  "flex-direction": "row",
+                  "type": "fieldset",
+                  "notitle": true,
                   "condition": {
-                    "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'TemperatureSensor';"
+                    "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'Fanv2';"
                   },
                   "items": [
                     {
-                      "key": "accessories[].topicGetCurrentTemperature",
-                      "flex": "0 0 67%"
+                      "type": "div",
+                      "displayFlex": true,
+                      "flex-direction": "row",
+                      "items": [
+                        {
+                          "key": "accessories[].valueModeAuto",
+                          "flex": "0 0 20%"
+                        },
+                        {
+                          "key": "accessories[].valueModeManual",
+                          "flex": "0 0 20%"
+                        },
+                        {
+                          "key": "accessories[].valueModeBlowing",
+                          "flex": "0 0 20%"
+                        },
+                        {
+                          "key": "accessories[].valueModeIdle",
+                          "flex": "0 0 20%"
+                        },
+                        {
+                          "key": "accessories[].valueModeInactive",
+                          "flex": "0 0 20%"
+                        }
+                      ]
                     },
                     {
-                      "key": "accessories[].temperatureUnits",
-                      "title": "${config.title.sourceUnits}",
-                      "flex": "0 0 33%"
+                      "type": "div",
+                      "displayFlex": true,
+                      "flex-direction": "row",
+                      "items": [
+                        {
+                          "key": "accessories[].valueDirectionClockwise",
+                          "flex": "0 0 20%"
+                        },
+                        {
+                          "key": "accessories[].valueDirectionCounterClockwise",
+                          "flex": "0 0 20%"
+                        }
+                      ]
                     }
                   ]
                 },
@@ -1061,7 +2941,7 @@
                   "type": "fieldset",
                   "notitle": true,
                   "condition": {
-                    "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'Thermostat';"
+                    "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'AirPurifier';"
                   },
                   "items": [
                     {
@@ -1070,81 +2950,148 @@
                       "flex-direction": "row",
                       "items": [
                         {
-                          "key": "accessories[].topicGetCurrentHeatingCoolingState",
-                          "flex": "0 0 50%"
+                          "key": "accessories[].valueModeAuto",
+                          "flex": "0 0 20%"
+                        },
+                        {
+                          "key": "accessories[].valueModeManual",
+                          "flex": "0 0 20%"
+                        },
+                        {
+                          "key": "accessories[].valueModePurifying",
+                          "flex": "0 0 20%"
+                        },
+                        {
+                          "key": "accessories[].valueModeIdle",
+                          "flex": "0 0 20%"
+                        },
+                        {
+                          "key": "accessories[].valueModeInactive",
+                          "flex": "0 0 20%"
                         }
                       ]
-                    },
+                    }
+                  ]
+                },
+                {
+                  "type": "fieldset",
+                  "notitle": true,
+                  "condition": {
+                    "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'HeaterCooler';"
+                  },
+                  "items": [
                     {
                       "type": "div",
                       "displayFlex": true,
                       "flex-direction": "row",
                       "items": [
                         {
-                          "key": "accessories[].topicGetTargetHeatingCoolingState",
-                          "flex": "0 0 50%"
+                          "key": "accessories[].valueModeAuto",
+                          "flex": "0 0 20%"
                         },
                         {
-                          "key": "accessories[].topicSetTargetHeatingCoolingState",
-                          "flex": "0 0 50%"
+                          "key": "accessories[].valueModeCool",
+                          "flex": "0 0 20%"
+                        },
+                        {
+                          "key": "accessories[].valueModeHeat",
+                          "flex": "0 0 20%"
+                        },
+                        {
+                          "key": "accessories[].valueModeIdle",
+                          "flex": "0 0 20%"
+                        },
+                        {
+                          "key": "accessories[].valueModeInactive",
+                          "flex": "0 0 20%"
                         }
                       ]
-                    },
+                    }
+                  ]
+                },
+                {
+                  "type": "fieldset",
+                  "notitle": true,
+                  "condition": {
+                    "functionBody": "return ['AirPurifier', 'Fanv2', 'HeaterCooler'].includes(model.accessories?.[arguments[1]]?.info?.type);"
+                  },
+                  "items": [
                     {
                       "type": "div",
                       "displayFlex": true,
                       "flex-direction": "row",
                       "items": [
                         {
-                          "key": "accessories[].topicGetCurrentTemperature",
-                          "flex": "0 0 50%"
+                          "key": "accessories[].valueControlLock",
+                          "flex": "0 0 20%"
+                        },
+                        {
+                          "key": "accessories[].valueControlUnlock",
+                          "flex": "0 0 20%"
+                        },
+                        {
+                          "key": "accessories[].valueSwingEnabled",
+                          "flex": "0 0 20%"
                         },
                         {
-                          "key": "accessories[].temperatureUnits",
-                          "title": "${config.title.sourceUnits}",
-                          "flex": "0 0 25%"
+                          "key": "accessories[].valueSwingDisabled",
+                          "flex": "0 0 20%"
                         }
                       ]
-                    },
+                    }
+                  ]
+                },
+                {
+                  "type": "fieldset",
+                  "notitle": true,
+                  "condition": {
+                    "functionBody": "return ['AirPurifier', 'HeaterCooler'].includes(model.accessories?.[arguments[1]]?.info?.type);"
+                  },
+                  "items": [
                     {
                       "type": "div",
                       "displayFlex": true,
                       "flex-direction": "row",
                       "items": [
                         {
-                          "key": "accessories[].topicGetTargetTemperature",
-                          "flex": "0 0 50%"
+                          "key": "accessories[].valueFilterChange",
+                          "flex": "0 0 20%"
                         },
                         {
-                          "key": "accessories[].topicSetTargetTemperature",
-                          "flex": "0 0 50%"
+                          "key": "accessories[].valueFilterReset",
+                          "flex": "0 0 20%"
                         }
                       ]
-                    },
+                    }
+                  ]
+                },
+                {
+                  "type": "fieldset",
+                  "notitle": true,
+                  "condition": {
+                    "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'GarageDoorOpener';"
+                  },
+                  "items": [
                     {
                       "type": "div",
                       "displayFlex": true,
                       "flex-direction": "row",
                       "items": [
                         {
-                          "key": "accessories[].topicGetCurrentRelativeHumidity",
-                          "title": "${config.title.topicGetCurrentRelativeHumidityOptional}",
-                          "flex": "0 0 50%"
-                        }
-                      ]
-                    },
-                    {
-                      "type": "div",
-                      "displayFlex": true,
-                      "flex-direction": "row",
-                      "items": [
+                          "key": "accessories[].valueDoorStateOpen",
+                          "flex": "0 0 25%"
+                        },
                         {
-                          "key": "accessories[].topicGetTargetRelativeHumidity",
-                          "flex": "0 0 50%"
+                          "key": "accessories[].valueDoorStateClosed",
+                          "flex": "0 0 25%"
                         },
                         {
-                          "key": "accessories[].topicSetTargetRelativeHumidity",
-                          "flex": "0 0 50%"
+                          "key": "accessories[].valueDoorStateOpening",
+                          "flex": "0 0 25%"
+                        },
+                        {
+                          "key": "accessories[].valueDoorStateClosing",
+                          "flex": "0 0 25%"
                         }
                       ]
                     },
@@ -1154,12 +3101,12 @@
                       "flex-direction": "row",
                       "items": [
                         {
-                          "key": "accessories[].topicGetCoolingThresholdTemperature",
-                          "flex": "0 0 50%"
+                          "key": "accessories[].valueDoorStateStopped",
+                          "flex": "0 0 25%"
                         },
                         {
-                          "key": "accessories[].topicSetCoolingThresholdTemperature",
-                          "flex": "0 0 50%"
+                          "key": "accessories[].valueDoorObstructed",
+                          "flex": "0 0 25%"
                         }
                       ]
                     },
@@ -1169,12 +3116,18 @@
                       "flex-direction": "row",
                       "items": [
                         {
-                          "key": "accessories[].topicGetHeatingThresholdTemperature",
-                          "flex": "0 0 50%"
+                          "key": "accessories[].valueLockStateSecured",
+                          "title": "${config.title.valueLockStateSecuredOptional}",
+                          "flex": "0 0 25%"
                         },
                         {
-                          "key": "accessories[].topicSetHeatingThresholdTemperature",
-                          "flex": "0 0 50%"
+                          "key": "accessories[].valueLockStateUnsecured",
+                          "title": "${config.title.valueLockStateUnsecuredOptional}",
+                          "flex": "0 0 25%"
+                        },
+                        {
+                          "key": "accessories[].valueLockStateJammed",
+                          "flex": "0 0 25%"
                         }
                       ]
                     }
@@ -1185,59 +3138,28 @@
                   "displayFlex": true,
                   "flex-direction": "row",
                   "condition": {
-                    "functionBody": "const type = model.accessories?.[arguments[1]]?.info?.type; return type !== undefined && type.endsWith('Sensor');"
+                    "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'LockMechanism';"
                   },
                   "items": [
                     {
-                      "key": "accessories[].topicGetStatusFault",
-                      "flex": "0 0 50%"
+                      "key": "accessories[].valueLockStateSecured",
+                      "flex": "0 0 25%"
                     },
                     {
-                      "key": "accessories[].topicGetStatusTampered",
-                      "flex": "0 0 50%"
-                    }
-                  ]
-                },
-                {
-                  "type": "div",
-                  "displayFlex": true,
-                  "flex-direction": "row",
-                  "items": [
-                    {
-                      "key": "accessories[].topicGetBatteryLevel",
-                      "flex": "0 0 50%"
+                      "key": "accessories[].valueLockStateUnsecured",
+                      "flex": "0 0 25%"
                     },
                     {
-                      "key": "accessories[].topicGetBatteryLow",
-                      "flex": "0 0 50%"
+                      "key": "accessories[].valueLockStateJammed",
+                      "flex": "0 0 25%"
                     }
                   ]
                 },
                 {
-                  "type": "div",
-                  "displayFlex": true,
-                  "flex-direction": "row",
-                  "items": [
-                    {
-                      "key": "accessories[].topicGetStatusActive",
-                      "flex": "0 0 50%"
-                    }
-                  ]
-                }
-              ]
-            },
-            {
-              "type": "fieldset",
-              "title": "${config.title.values}",
-              "condition": {
-                "functionBody": "return model.accessories?.[arguments[1]]?.info?.type !== undefined;"
-              },
-              "items": [
-                  {
                   "type": "fieldset",
                   "notitle": true,
                   "condition": {
-                    "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'HeaterCooler';"
+                    "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'Valve';"
                   },
                   "items": [
                     {
@@ -1246,39 +3168,16 @@
                       "flex-direction": "row",
                       "items": [
                         {
-                          "key": "accessories[].valueStateActive",
-                          "flex": "0 0 20%"
-                        },
-                        {
-                          "key": "accessories[].valueStateInactive",
-                          "flex": "0 0 20%"
-                        }
-                      ]
-                    },
-                    {
-                      "type": "div",
-                      "displayFlex": true,
-                      "flex-direction": "row",
-                      "items": [
-                        {
-                          "key": "accessories[].valueModeAuto",
-                          "flex": "0 0 20%"
-                        },
-                        {
-                          "key": "accessories[].valueModeCool",
-                          "flex": "0 0 20%"
-                        },
-                        {
-                          "key": "accessories[].valueModeHeat",
-                          "flex": "0 0 20%"
+                          "key": "accessories[].valueActive",
+                          "flex": "0 0 25%"
                         },
                         {
-                          "key": "accessories[].valueModeIdle",
-                          "flex": "0 0 20%"
+                          "key": "accessories[].valueInactive",
+                          "flex": "0 0 25%"
                         },
                         {
-                          "key": "accessories[].valueModeInactive",
-                          "flex": "0 0 20%"
+                          "key": "accessories[].valueInUse",
+                          "flex": "0 0 25%"
                         }
                       ]
                     },
@@ -1288,20 +3187,16 @@
                       "flex-direction": "row",
                       "items": [
                         {
-                          "key": "accessories[].valueControlLock",
-                          "flex": "0 0 20%"
-                        },
-                        {
-                          "key": "accessories[].valueControlUnlock",
-                          "flex": "0 0 20%"
+                          "key": "accessories[].valueConfigured",
+                          "flex": "0 0 25%"
                         },
                         {
-                          "key": "accessories[].valueSwingEnabled",
-                          "flex": "0 0 20%"
+                          "key": "accessories[].valueNotConfigured",
+                          "flex": "0 0 25%"
                         },
                         {
-                          "key": "accessories[].valueSwingDisabled",
-                          "flex": "0 0 20%"
+                          "key": "accessories[].valueFault",
+                          "flex": "0 0 25%"
                         }
                       ]
                     }
@@ -1312,19 +3207,15 @@
                   "displayFlex": true,
                   "flex-direction": "row",
                   "condition": {
-                    "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'LockMechanism';"
+                    "functionBody": "return ['Lightbulb', 'Outlet', 'Switch'].includes(model.accessories?.[arguments[1]]?.info?.type);"
                   },
                   "items": [
                     {
-                      "key": "accessories[].valueLockStateSecured",
-                      "flex": "0 0 25%"
-                    },
-                    {
-                      "key": "accessories[].valueLockStateUnsecured",
+                      "key": "accessories[].valueOn",
                       "flex": "0 0 25%"
                     },
                     {
-                      "key": "accessories[].valueLockStateJammed",
+                      "key": "accessories[].valueOff",
                       "flex": "0 0 25%"
                     }
                   ]
@@ -1334,30 +3225,59 @@
                   "displayFlex": true,
                   "flex-direction": "row",
                   "condition": {
-                    "functionBody": "return ['Lightbulb', 'Outlet', 'Switch'].includes(model.accessories?.[arguments[1]]?.info?.type);"
+                    "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'Outlet';"
                   },
                   "items": [
                     {
-                      "key": "accessories[].valueOn",
-                      "flex": "0 0 25%"
-                    },
-                    {
-                      "key": "accessories[].valueOff",
+                      "key": "accessories[].valueOutletInUse",
                       "flex": "0 0 25%"
                     }
                   ]
                 },
                 {
-                  "type": "div",
-                  "displayFlex": true,
-                  "flex-direction": "row",
+                  "type": "fieldset",
+                  "notitle": true,
                   "condition": {
-                    "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'Outlet';"
+                    "functionBody": "return ['WindowCovering'].includes(model.accessories?.[arguments[1]]?.info?.type);"
                   },
                   "items": [
                     {
-                      "key": "accessories[].valueOutletInUse",
-                      "flex": "0 0 25%"
+                      "type": "div",
+                      "displayFlex": true,
+                      "flex-direction": "row",
+                      "items": [
+                        {
+                          "key": "accessories[].valuePositionDecreasing",
+                          "flex": "0 0 25%"
+                        },
+                        {
+                          "key": "accessories[].valuePositionIncreasing",
+                          "flex": "0 0 25%"
+                        },
+                        {
+                          "key": "accessories[].valuePositionStopped",
+                          "flex": "0 0 25%"
+                        }
+                      ]
+                    },
+                    {
+                      "type": "div",
+                      "displayFlex": true,
+                      "flex-direction": "row",
+                      "items": [
+                        {
+                          "key": "accessories[].valuePositionHold",
+                          "flex": "0 0 25%"
+                        },
+                        {
+                          "key": "accessories[].valuePositionResume",
+                          "flex": "0 0 25%"
+                        },
+                        {
+                          "key": "accessories[].valuePositionObstructed",
+                          "flex": "0 0 25%"
+                        }
+                      ]
                     }
                   ]
                 },
@@ -1438,6 +3358,53 @@
                     }
                   ]
                 },
+                {
+                  "type": "fieldset",
+                  "notitle": true,
+                  "condition": {
+                    "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'AirQualitySensor';"
+                  },
+                  "items": [
+                    {
+                      "type": "div",
+                      "displayFlex": true,
+                      "flex-direction": "row",
+                      "items": [
+                        {
+                          "key": "accessories[].valueAQExcellent",
+                          "flex": "0 0 25%"
+                        },
+                        {
+                          "key": "accessories[].valueAQGood",
+                          "flex": "0 0 25%"
+                        },
+                        {
+                          "key": "accessories[].valueAQFair",
+                          "flex": "0 0 25%"
+                        }
+                      ]
+                    },
+                    {
+                      "type": "div",
+                      "displayFlex": true,
+                      "flex-direction": "row",
+                      "items": [
+                        {
+                          "key": "accessories[].valueAQInferior",
+                          "flex": "0 0 25%"
+                        },
+                        {
+                          "key": "accessories[].valueAQPoor",
+                          "flex": "0 0 25%"
+                        },
+                        {
+                          "key": "accessories[].valueAQUnknown",
+                          "flex": "0 0 25%"
+                        }
+                      ]
+                    }
+                  ]
+                },
                 {
                   "type": "div",
                   "displayFlex": true,