@switchbot/homebridge-switchbot 4.3.2 → 4.3.4

package/config.schema.json

@@ -246,6 +246,12 @@
                         "Motion Sensor"
                       ]
                     },
+                    {
+                      "title": "Presence Sensor",
+                      "enum": [
+                        "Presence Sensor"
+                      ]
+                    },
                     {
                       "title": "Plug",
                       "enum": [
@@ -306,6 +312,30 @@
                         "Smart Lock Pro"
                       ]
                     },
+                    {
+                      "title": "Smart Lock Ultra",
+                      "enum": [
+                        "Smart Lock Ultra"
+                      ]
+                    },
+                    {
+                      "title": "Lock Ultra",
+                      "enum": [
+                        "Lock Ultra"
+                      ]
+                    },
+                    {
+                      "title": "Smart Lock Ultra",
+                      "enum": [
+                        "Smart Lock Ultra"
+                      ]
+                    },
+                    {
+                      "title": "Lock Ultra",
+                      "enum": [
+                        "Lock Ultra"
+                      ]
+                    },
                     {
                       "title": "Strip Light",
                       "enum": [
@@ -606,7 +636,7 @@
                   "title": "Hide Light Sensor",
                   "type": "boolean",
                   "condition": {
-                    "functionBody": "return (model.options && model.options.devices && !model.options.devices[arrayIndices].hide_device && (model.options.devices[arrayIndices].configDeviceType === 'Hub 2' || model.options.devices[arrayIndices].configDeviceType === 'Contact Sensor' || model.options.devices[arrayIndices].configDeviceType === 'Motion Sensor' || model.options.devices[arrayIndices].configDeviceType === 'Blind Tilt' || model.options.devices[arrayIndices].configDeviceType === 'Curtain' || model.options.devices[arrayIndices].configDeviceType === 'Curtain3' || model.options.devices[arrayIndices].configDeviceType === 'WoRollerShade' || model.options.devices[arrayIndices].configDeviceType === 'Roller Shade') && model.options.devices[arrayIndices].deviceId);"
+                    "functionBody": "return (model.options && model.options.devices && !model.options.devices[arrayIndices].hide_device && (model.options.devices[arrayIndices].configDeviceType === 'Hub 2' || model.options.devices[arrayIndices].configDeviceType === 'Contact Sensor' || model.options.devices[arrayIndices].configDeviceType === 'Motion Sensor'  || model.options.devices[arrayIndices].configDeviceType === 'Presence Sensor' || model.options.devices[arrayIndices].configDeviceType === 'Blind Tilt' || model.options.devices[arrayIndices].configDeviceType === 'Curtain' || model.options.devices[arrayIndices].configDeviceType === 'Curtain3' || model.options.devices[arrayIndices].configDeviceType === 'WoRollerShade' || model.options.devices[arrayIndices].configDeviceType === 'Roller Shade') && model.options.devices[arrayIndices].deviceId);"
                   }
                 },
                 "hide_motionsensor": {
@@ -620,7 +650,7 @@
                   "title": "Hide Lock's Contact Sensor",
                   "type": "boolean",
                   "condition": {
-                    "functionBody": "return (model.options && model.options.devices && !model.options.devices[arrayIndices].hide_device && (model.options.devices[arrayIndices].configDeviceType === 'Smart Lock' || model.options.devices[arrayIndices].configDeviceType === 'Smart Lock Pro') && model.options.devices[arrayIndices].deviceId);"
+                    "functionBody": "return (model.options && model.options.devices && !model.options.devices[arrayIndices].hide_device && (model.options.devices[arrayIndices].configDeviceType === 'Smart Lock' || model.options.devices[arrayIndices].configDeviceType === 'Smart Lock Pro' || model.options.devices[arrayIndices].configDeviceType === 'Smart Lock Ultra' || model.options.devices[arrayIndices].configDeviceType === 'Lock Ultra') && model.options.devices[arrayIndices].deviceId);"
                   }
                 },
                 "hide_leak": {
@@ -700,7 +730,7 @@
                   "type": "number",
                   "placeholder": "1",
                   "condition": {
-                    "functionBody": "return (model.options && model.options.devices && !model.options.devices[arrayIndices].hide_device && (model.options.devices[arrayIndices].configDeviceType === 'Hub 2' || model.options.devices[arrayIndices].configDeviceType === 'Contact Sensor' || model.options.devices[arrayIndices].configDeviceType === 'Motion Sensor' || model.options.devices[arrayIndices].configDeviceType === 'Blind Tilt' || model.options.devices[arrayIndices].configDeviceType === 'Curtain' || model.options.devices[arrayIndices].configDeviceType === 'Curtain3' || model.options.devices[arrayIndices].configDeviceType === 'WoRollerShade' || model.options.devices[arrayIndices].configDeviceType === 'Roller Shade') && model.options.devices[arrayIndices].deviceId && !model.options.devices[arrayIndices].hide_lightsensor);"
+                    "functionBody": "return (model.options && model.options.devices && !model.options.devices[arrayIndices].hide_device && (model.options.devices[arrayIndices].configDeviceType === 'Hub 2' || model.options.devices[arrayIndices].configDeviceType === 'Contact Sensor' || model.options.devices[arrayIndices].configDeviceType === 'Motion Sensor'  || model.options.devices[arrayIndices].configDeviceType === 'Presence Sensor' || model.options.devices[arrayIndices].configDeviceType === 'Blind Tilt' || model.options.devices[arrayIndices].configDeviceType === 'Curtain' || model.options.devices[arrayIndices].configDeviceType === 'Curtain3' || model.options.devices[arrayIndices].configDeviceType === 'WoRollerShade' || model.options.devices[arrayIndices].configDeviceType === 'Roller Shade') && model.options.devices[arrayIndices].deviceId && !model.options.devices[arrayIndices].hide_lightsensor);"
                   }
                 },
                 "set_maxlux": {
@@ -708,7 +738,7 @@
                   "type": "number",
                   "placeholder": "6001",
                   "condition": {
-                    "functionBody": "return (model.options && model.options.devices && !model.options.devices[arrayIndices].hide_device && (model.options.devices[arrayIndices].configDeviceType === 'Hub 2' || model.options.devices[arrayIndices].configDeviceType === 'Contact Sensor' || model.options.devices[arrayIndices].configDeviceType === 'Motion Sensor' || model.options.devices[arrayIndices].configDeviceType === 'Blind Tilt' || model.options.devices[arrayIndices].configDeviceType === 'Curtain' || model.options.devices[arrayIndices].configDeviceType === 'Curtain3' || model.options.devices[arrayIndices].configDeviceType === 'WoRollerShade' || model.options.devices[arrayIndices].configDeviceType === 'Roller Shade') && model.options.devices[arrayIndices].deviceId && !model.options.devices[arrayIndices].hide_lightsensor);"
+                    "functionBody": "return (model.options && model.options.devices && !model.options.devices[arrayIndices].hide_device && (model.options.devices[arrayIndices].configDeviceType === 'Hub 2' || model.options.devices[arrayIndices].configDeviceType === 'Contact Sensor' || model.options.devices[arrayIndices].configDeviceType === 'Motion Sensor'  || model.options.devices[arrayIndices].configDeviceType === 'Presence Sensor' || model.options.devices[arrayIndices].configDeviceType === 'Blind Tilt' || model.options.devices[arrayIndices].configDeviceType === 'Curtain' || model.options.devices[arrayIndices].configDeviceType === 'Curtain3' || model.options.devices[arrayIndices].configDeviceType === 'WoRollerShade' || model.options.devices[arrayIndices].configDeviceType === 'Roller Shade') && model.options.devices[arrayIndices].deviceId && !model.options.devices[arrayIndices].hide_lightsensor);"
                   }
                 },
                 "setOpenMode": {
@@ -3940,6 +3970,215 @@
                   }
                 }
               },
+              "Presence Sensor": {
+                "type": "object",
+                "properties": {
+                  "hide_device": {
+                    "title": "Hide All Presence Sensors",
+                    "type": "boolean",
+                    "description": "If true, device will be removed or hidden from HomeKit."
+                  },
+                  "hide_lightsensor": {
+                    "title": "Hide Light Sensor",
+                    "type": "boolean",
+                    "condition": {
+                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Motion Sensor'].hide_device);"
+                    }
+                  },
+                  "set_minlux": {
+                    "title": "Set Min Lux",
+                    "type": "number",
+                    "placeholder": "1",
+                    "condition": {
+                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Motion Sensor'].hide_device);"
+                    }
+                  },
+                  "set_maxlux": {
+                    "title": "Set Max Lux",
+                    "type": "number",
+                    "placeholder": "6001",
+                    "condition": {
+                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Motion Sensor'].hide_device);"
+                    }
+                  },
+                  "connectionType": {
+                    "title": "Connection Type",
+                    "type": "string",
+                    "description": "Bluetooth (BLE) API is only available on certain Device Types, see the Wiki for more information.",
+                    "condition": {
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Water Detector'] && !model.options.deviceConfig['Water Detector'].hide_device);"
+                    },
+                    "oneOf": [
+                      {
+                        "title": "BLE",
+                        "enum": [
+                          "BLE"
+                        ]
+                      },
+                      {
+                        "title": "BLE/OpenAPI",
+                        "enum": [
+                          "BLE/OpenAPI"
+                        ]
+                      },
+                      {
+                        "title": "Disable",
+                        "enum": [
+                          "Disabled"
+                        ]
+                      },
+                      {
+                        "title": "OpenAPI",
+                        "enum": [
+                          "OpenAPI"
+                        ]
+                      }
+                    ]
+                  },
+                  "disablePlatformBLE": {
+                    "title": "Disable Platform BLE",
+                    "type": "boolean",
+                    "condition": {
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Motion Sensor'] && !model.options.deviceConfig['Motion Sensor'].hide_device && model.options.deviceConfig['Motion Sensor'].connectionType !== 'Disabled');"
+                    }
+                  },
+                  "scanDuration": {
+                    "title": "Scan Duration (Default is 1 Second) for BLE",
+                    "type": "number",
+                    "placeholder": 1,
+                    "condition": {
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Water Detector'] && !model.options.deviceConfig['Water Detector'].hide_device && (model.options.deviceConfig['Water Detector'].connectionType === 'BLE' || model.options.deviceConfig['Water Detector'].connectionType === 'BLE/OpenAPI'));"
+                    }
+                  },
+                  "webhook": {
+                    "title": "Enable Webhook for all Presence Sensors",
+                    "type": "boolean",
+                    "condition": {
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Water Detector'] && !model.options.deviceConfig['Water Detector'].hide_device && (model.options.deviceConfig['Water Detector'].connectionType === 'OpenAPI' || model.options.deviceConfig['Water Detector'].connectionType === 'BLE/OpenAPI'));"
+                    }
+                  },
+                  "external": {
+                    "title": "External Accessory",
+                    "type": "boolean",
+                    "condition": {
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Water Detector'] && !model.options.deviceConfig['Water Detector'].hide_device);"
+                    }
+                  },
+                  "maxRetry": {
+                    "title": "Max Retries for BLE",
+                    "type": "number",
+                    "placeholder": "5",
+                    "condition": {
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Water Detector'] && !model.options.deviceConfig['Water Detector'].hide_device && (model.options.deviceConfig['Water Detector'].connectionType === 'BLE' || model.options.deviceConfig['Water Detector'].connectionType === 'BLE/OpenAPI'));"
+                    }
+                  },
+                  "maxRetries": {
+                    "title": "Device Max Retries for OpenAPI",
+                    "type": "number",
+                    "placeholder": 5,
+                    "condition": {
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Water Detector'] && !model.options.deviceConfig['Water Detector'].hide_device && (model.options.deviceConfig['Water Detector'].connectionType === 'OpenAPI' || model.options.deviceConfig['Water Detector'].connectionType === 'BLE/OpenAPI'));"
+                    }
+                  },
+                  "delayBetweenRetries": {
+                    "title": "Device Delay Between Retries for OpenAPI (In Seconds)",
+                    "type": "number",
+                    "placeholder": 3,
+                    "condition": {
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Water Detector'] && !model.options.deviceConfig['Water Detector'].hide_device && (model.options.deviceConfig['Water Detector'].connectionType === 'OpenAPI' || model.options.deviceConfig['Water Detector'].connectionType === 'BLE/OpenAPI'));"
+                    }
+                  },
+                  "disableCaching": {
+                    "title": "Disable Caching",
+                    "type": "boolean",
+                    "condition": {
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Water Detector'] && !model.options.deviceConfig['Water Detector'].hide_device);"
+                    }
+                  },
+                  "offline": {
+                    "title": "Offline as Off",
+                    "type": "boolean",
+                    "condition": {
+                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Water Detector'].hide_device);"
+                    }
+                  },
+                  "history": {
+                    "title": "EVE History",
+                    "type": "boolean",
+                    "condition": {
+                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Water Detector'].hide_device);"
+                    }
+                  },
+                  "firmware": {
+                    "title": "Firmware Override",
+                    "type": "string",
+                    "placeholder": "1.2.8",
+                    "condition": {
+                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Water Detector'].hide_device);"
+                    }
+                  },
+                  "logging": {
+                    "title": "Logging by Device Type",
+                    "type": "string",
+                    "default": "",
+                    "condition": {
+                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Water Detector'].hide_device);"
+                    },
+                    "oneOf": [
+                      {
+                        "title": "Debug Logging",
+                        "enum": [
+                          "debug"
+                        ]
+                      },
+                      {
+                        "title": "Default Logging",
+                        "enum": [
+                          ""
+                        ]
+                      },
+                      {
+                        "title": "No Logging",
+                        "enum": [
+                          "none"
+                        ]
+                      },
+                      {
+                        "title": "Standard Logging",
+                        "enum": [
+                          "standard"
+                        ]
+                      }
+                    ]
+                  },
+                  "refreshRate": {
+                    "title": "Device Refresh Rate",
+                    "type": "number",
+                    "placeholder": 5,
+                    "condition": {
+                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Water Detector'].hide_device);"
+                    }
+                  },
+                  "updateRate": {
+                    "title": "Update Rate",
+                    "type": "number",
+                    "minimum": 1,
+                    "placeholder": 5,
+                    "description": "Indicates the number of seconds before refreshing status while updating progress.",
+                    "condition": {
+                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Water Detector'].hide_device);"
+                    }
+                  },
+                  "pushRate": {
+                    "title": "Device Push Rate",
+                    "type": "number",
+                    "placeholder": 360,
+                    "condition": {
+                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Water Detector'].hide_device);"
+                    }
+                  }
+                }
+              },
               "Contact Sensor": {
                 "type": "object",
                 "properties": {
@@ -5481,15 +5720,387 @@
                     "title": "Enable Silent Mode Switches",
                     "type": "boolean",
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Blind Tilt'].hide_device);"
+                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Blind Tilt'].hide_device);"
+                    }
+                  },
+                  "connectionType": {
+                    "title": "Connection Type",
+                    "type": "string",
+                    "description": "Bluetooth (BLE) API is only available on certain Device Types, see the Wiki for more information.",
+                    "condition": {
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Blind Tilt'] && !model.options.deviceConfig['Blind Tilt'].hide_device);"
+                    },
+                    "oneOf": [
+                      {
+                        "title": "BLE",
+                        "enum": [
+                          "BLE"
+                        ]
+                      },
+                      {
+                        "title": "BLE/OpenAPI",
+                        "enum": [
+                          "BLE/OpenAPI"
+                        ]
+                      },
+                      {
+                        "title": "Disable",
+                        "enum": [
+                          "Disabled"
+                        ]
+                      },
+                      {
+                        "title": "OpenAPI",
+                        "enum": [
+                          "OpenAPI"
+                        ]
+                      }
+                    ]
+                  },
+                  "disablePlatformBLE": {
+                    "title": "Disable Platform BLE",
+                    "type": "boolean",
+                    "condition": {
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Blind Tilt'] && !model.options.deviceConfig['Blind Tilt'].hide_device && model.options.deviceConfig['Blind Tilt'].connectionType !== 'Disabled');"
+                    }
+                  },
+                  "scanDuration": {
+                    "title": "Scan Duration (Default is 1 Second) for BLE",
+                    "type": "number",
+                    "placeholder": 1,
+                    "condition": {
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Blind Tilt'] && !model.options.deviceConfig['Blind Tilt'].hide_device && (model.options.deviceConfig['Blind Tilt'].connectionType === 'BLE' || model.options.deviceConfig['Blind Tilt'].connectionType === 'BLE/OpenAPI'));"
+                    }
+                  },
+                  "webhook": {
+                    "title": "Enable Webhook for all Blind Tilts",
+                    "type": "boolean",
+                    "condition": {
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Blind Tilt'] && !model.options.deviceConfig['Blind Tilt'].hide_device && (model.options.deviceConfig['Blind Tilt'].connectionType === 'OpenAPI' || model.options.deviceConfig['Blind Tilt'].connectionType === 'BLE/OpenAPI'));"
+                    }
+                  },
+                  "external": {
+                    "title": "External Accessory",
+                    "type": "boolean",
+                    "condition": {
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Blind Tilt'] && !model.options.deviceConfig['Blind Tilt'].hide_device);"
+                    }
+                  },
+                  "maxRetry": {
+                    "title": "Max Retries for BLE",
+                    "type": "number",
+                    "placeholder": "5",
+                    "condition": {
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Blind Tilt'] && !model.options.deviceConfig['Blind Tilt'].hide_device && (model.options.deviceConfig['Blind Tilt'].connectionType === 'BLE' || model.options.deviceConfig['Blind Tilt'].connectionType === 'BLE/OpenAPI'));"
+                    }
+                  },
+                  "maxRetries": {
+                    "title": "Device Max Retries for OpenAPI",
+                    "type": "number",
+                    "placeholder": 5,
+                    "condition": {
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Blind Tilt'] && !model.options.deviceConfig['Blind Tilt'].hide_device && (model.options.deviceConfig['Blind Tilt'].connectionType === 'OpenAPI' || model.options.deviceConfig['Blind Tilt'].connectionType === 'BLE/OpenAPI'));"
+                    }
+                  },
+                  "delayBetweenRetries": {
+                    "title": "Device Delay Between Retries for OpenAPI (In Seconds)",
+                    "type": "number",
+                    "placeholder": 3,
+                    "condition": {
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Blind Tilt'] && !model.options.deviceConfig['Blind Tilt'].hide_device && (model.options.deviceConfig['Blind Tilt'].connectionType === 'OpenAPI' || model.options.deviceConfig['Blind Tilt'].connectionType === 'BLE/OpenAPI'));"
+                    }
+                  },
+                  "disableCaching": {
+                    "title": "Disable Caching",
+                    "type": "boolean",
+                    "condition": {
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Blind Tilt'] && !model.options.deviceConfig['Blind Tilt'].hide_device);"
+                    }
+                  },
+                  "offline": {
+                    "title": "Offline as Off",
+                    "type": "boolean",
+                    "condition": {
+                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Blind Tilt'].hide_device);"
+                    }
+                  },
+                  "history": {
+                    "title": "EVE History",
+                    "type": "boolean",
+                    "condition": {
+                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Blind Tilt'].hide_device);"
+                    }
+                  },
+                  "firmware": {
+                    "title": "Firmware Override",
+                    "type": "string",
+                    "placeholder": "1.2.8",
+                    "condition": {
+                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Blind Tilt'].hide_device);"
+                    }
+                  },
+                  "logging": {
+                    "title": "Logging by Device Type",
+                    "type": "string",
+                    "default": "",
+                    "condition": {
+                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Blind Tilt'].hide_device);"
+                    },
+                    "oneOf": [
+                      {
+                        "title": "Debug Logging",
+                        "enum": [
+                          "debug"
+                        ]
+                      },
+                      {
+                        "title": "Default Logging",
+                        "enum": [
+                          ""
+                        ]
+                      },
+                      {
+                        "title": "No Logging",
+                        "enum": [
+                          "none"
+                        ]
+                      },
+                      {
+                        "title": "Standard Logging",
+                        "enum": [
+                          "standard"
+                        ]
+                      }
+                    ]
+                  },
+                  "refreshRate": {
+                    "title": "Device Refresh Rate",
+                    "type": "number",
+                    "placeholder": 5,
+                    "condition": {
+                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Blind Tilt'].hide_device);"
+                    }
+                  },
+                  "updateRate": {
+                    "title": "Update Rate",
+                    "type": "number",
+                    "minimum": 1,
+                    "placeholder": 5,
+                    "description": "Indicates the number of seconds before refreshing status while updating progress.",
+                    "condition": {
+                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Blind Tilt'].hide_device);"
+                    }
+                  },
+                  "pushRate": {
+                    "title": "Device Push Rate",
+                    "type": "number",
+                    "placeholder": 360,
+                    "condition": {
+                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Blind Tilt'].hide_device);"
+                    }
+                  }
+                }
+              },
+              "Plug": {
+                "type": "object",
+                "properties": {
+                  "hide_device": {
+                    "title": "Hide All Plugs",
+                    "type": "boolean",
+                    "description": "If true, device will be removed or hidden from HomeKit."
+                  },
+                  "connectionType": {
+                    "title": "Connection Type",
+                    "type": "string",
+                    "description": "Bluetooth (BLE) API is only available on certain Device Types, see the Wiki for more information.",
+                    "condition": {
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Plug'] && !model.options.deviceConfig['Plug'].hide_device);"
+                    },
+                    "oneOf": [
+                      {
+                        "title": "BLE",
+                        "enum": [
+                          "BLE"
+                        ]
+                      },
+                      {
+                        "title": "BLE/OpenAPI",
+                        "enum": [
+                          "BLE/OpenAPI"
+                        ]
+                      },
+                      {
+                        "title": "Disable",
+                        "enum": [
+                          "Disabled"
+                        ]
+                      },
+                      {
+                        "title": "OpenAPI",
+                        "enum": [
+                          "OpenAPI"
+                        ]
+                      }
+                    ]
+                  },
+                  "disablePlatformBLE": {
+                    "title": "Disable Platform BLE",
+                    "type": "boolean",
+                    "condition": {
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Plug'] && !model.options.deviceConfig['Humidifier'].hide_device && model.options.deviceConfig['Plug'].connectionType !== 'Disabled');"
+                    }
+                  },
+                  "scanDuration": {
+                    "title": "Scan Duration (Default is 1 Second) for BLE",
+                    "type": "number",
+                    "placeholder": 1,
+                    "condition": {
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Plug'] && !model.options.deviceConfig['Plug'].hide_device && (model.options.deviceConfig['Plug'].connectionType === 'BLE' || model.options.deviceConfig['Plug'].connectionType === 'BLE/OpenAPI'));"
+                    }
+                  },
+                  "webhook": {
+                    "title": "Enable Webhook for all Plugs",
+                    "type": "boolean",
+                    "condition": {
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Plug'] && !model.options.deviceConfig['Plug'].hide_device && (model.options.deviceConfig['Plug'].connectionType === 'OpenAPI' || model.options.deviceConfig['Plug'].connectionType === 'BLE/OpenAPI'));"
+                    }
+                  },
+                  "external": {
+                    "title": "External Accessory",
+                    "type": "boolean",
+                    "condition": {
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Plug'] && !model.options.deviceConfig['Plug'].hide_device);"
+                    }
+                  },
+                  "maxRetry": {
+                    "title": "Max Retries for BLE",
+                    "type": "number",
+                    "placeholder": "5",
+                    "condition": {
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Plug'] && !model.options.deviceConfig['Plug'].hide_device && (model.options.deviceConfig['Plug'].connectionType === 'BLE' || model.options.deviceConfig['Plug'].connectionType === 'BLE/OpenAPI'));"
+                    }
+                  },
+                  "maxRetries": {
+                    "title": "Device Max Retries for OpenAPI",
+                    "type": "number",
+                    "placeholder": 5,
+                    "condition": {
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Plug'] && !model.options.deviceConfig['Plug'].hide_device && (model.options.deviceConfig['Plug'].connectionType === 'OpenAPI' || model.options.deviceConfig['Plug'].connectionType === 'BLE/OpenAPI'));"
+                    }
+                  },
+                  "delayBetweenRetries": {
+                    "title": "Device Delay Between Retries for OpenAPI (In Seconds)",
+                    "type": "number",
+                    "placeholder": 3,
+                    "condition": {
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Plug'] && !model.options.deviceConfig['Plug'].hide_device && (model.options.deviceConfig['Plug'].connectionType === 'OpenAPI' || model.options.deviceConfig['Plug'].connectionType === 'BLE/OpenAPI'));"
+                    }
+                  },
+                  "disableCaching": {
+                    "title": "Disable Caching",
+                    "type": "boolean",
+                    "condition": {
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Plug'] && !model.options.deviceConfig['Plug'].hide_device);"
+                    }
+                  },
+                  "offline": {
+                    "title": "Offline as Off",
+                    "type": "boolean",
+                    "condition": {
+                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Plug'].hide_device);"
+                    }
+                  },
+                  "history": {
+                    "title": "EVE History",
+                    "type": "boolean",
+                    "condition": {
+                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Plug'].hide_device);"
+                    }
+                  },
+                  "firmware": {
+                    "title": "Firmware Override",
+                    "type": "string",
+                    "placeholder": "1.2.8",
+                    "condition": {
+                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Plug'].hide_device);"
+                    }
+                  },
+                  "logging": {
+                    "title": "Logging by Device Type",
+                    "type": "string",
+                    "default": "",
+                    "condition": {
+                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Plug'].hide_device);"
+                    },
+                    "oneOf": [
+                      {
+                        "title": "Debug Logging",
+                        "enum": [
+                          "debug"
+                        ]
+                      },
+                      {
+                        "title": "Default Logging",
+                        "enum": [
+                          ""
+                        ]
+                      },
+                      {
+                        "title": "No Logging",
+                        "enum": [
+                          "none"
+                        ]
+                      },
+                      {
+                        "title": "Standard Logging",
+                        "enum": [
+                          "standard"
+                        ]
+                      }
+                    ]
+                  },
+                  "refreshRate": {
+                    "title": "Device Refresh Rate",
+                    "type": "number",
+                    "placeholder": 5,
+                    "condition": {
+                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Plug'].hide_device);"
+                    }
+                  },
+                  "updateRate": {
+                    "title": "Update Rate",
+                    "type": "number",
+                    "minimum": 1,
+                    "placeholder": 5,
+                    "description": "Indicates the number of seconds before refreshing status while updating progress.",
+                    "condition": {
+                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Plug'].hide_device);"
+                    }
+                  },
+                  "pushRate": {
+                    "title": "Device Push Rate",
+                    "type": "number",
+                    "placeholder": 360,
+                    "condition": {
+                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Plug'].hide_device);"
                     }
+                  }
+                }
+              },
+              "Plug Mini (US)": {
+                "type": "object",
+                "properties": {
+                  "hide_device": {
+                    "title": "Hide All Plug Mini (US)s",
+                    "type": "boolean",
+                    "description": "If true, device will be removed or hidden from HomeKit."
                   },
                   "connectionType": {
                     "title": "Connection Type",
                     "type": "string",
                     "description": "Bluetooth (BLE) API is only available on certain Device Types, see the Wiki for more information.",
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Blind Tilt'] && !model.options.deviceConfig['Blind Tilt'].hide_device);"
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Plug Mini (US)'] && !model.options.deviceConfig['Plug Mini (US)'].hide_device);"
                     },
                     "oneOf": [
                       {
@@ -5522,7 +6133,7 @@
                     "title": "Disable Platform BLE",
                     "type": "boolean",
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Blind Tilt'] && !model.options.deviceConfig['Blind Tilt'].hide_device && model.options.deviceConfig['Blind Tilt'].connectionType !== 'Disabled');"
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Plug Mini (US)'] && !model.options.deviceConfig['Plug Mini (US)'].hide_device && model.options.deviceConfig['Plug Mini (US)'].connectionType !== 'Disabled');"
                     }
                   },
                   "scanDuration": {
@@ -5530,21 +6141,21 @@
                     "type": "number",
                     "placeholder": 1,
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Blind Tilt'] && !model.options.deviceConfig['Blind Tilt'].hide_device && (model.options.deviceConfig['Blind Tilt'].connectionType === 'BLE' || model.options.deviceConfig['Blind Tilt'].connectionType === 'BLE/OpenAPI'));"
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Plug Mini (US)'] && !model.options.deviceConfig['Plug Mini (US)'].hide_device && (model.options.deviceConfig['Plug Mini (US)'].connectionType === 'BLE' || model.options.deviceConfig['Plug Mini (US)'].connectionType === 'BLE/OpenAPI'));"
                     }
                   },
                   "webhook": {
-                    "title": "Enable Webhook for all Blind Tilts",
+                    "title": "Enable Webhook for all Plug Mini (US)s",
                     "type": "boolean",
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Blind Tilt'] && !model.options.deviceConfig['Blind Tilt'].hide_device && (model.options.deviceConfig['Blind Tilt'].connectionType === 'OpenAPI' || model.options.deviceConfig['Blind Tilt'].connectionType === 'BLE/OpenAPI'));"
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Plug Mini (US)'] && !model.options.deviceConfig['Plug Mini (US)'].hide_device && (model.options.deviceConfig['Plug Mini (US)'].connectionType === 'OpenAPI' || model.options.deviceConfig['Plug Mini (US)'].connectionType === 'BLE/OpenAPI'));"
                     }
                   },
                   "external": {
                     "title": "External Accessory",
                     "type": "boolean",
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Blind Tilt'] && !model.options.deviceConfig['Blind Tilt'].hide_device);"
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Plug Mini (US)'] && !model.options.deviceConfig['Plug Mini (US)'].hide_device);"
                     }
                   },
                   "maxRetry": {
@@ -5552,7 +6163,7 @@
                     "type": "number",
                     "placeholder": "5",
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Blind Tilt'] && !model.options.deviceConfig['Blind Tilt'].hide_device && (model.options.deviceConfig['Blind Tilt'].connectionType === 'BLE' || model.options.deviceConfig['Blind Tilt'].connectionType === 'BLE/OpenAPI'));"
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Plug Mini (US)'] && !model.options.deviceConfig['Plug Mini (US)'].hide_device && (model.options.deviceConfig['Plug Mini (US)'].connectionType === 'BLE' || model.options.deviceConfig['Plug Mini (US)'].connectionType === 'BLE/OpenAPI'));"
                     }
                   },
                   "maxRetries": {
@@ -5560,7 +6171,7 @@
                     "type": "number",
                     "placeholder": 5,
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Blind Tilt'] && !model.options.deviceConfig['Blind Tilt'].hide_device && (model.options.deviceConfig['Blind Tilt'].connectionType === 'OpenAPI' || model.options.deviceConfig['Blind Tilt'].connectionType === 'BLE/OpenAPI'));"
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Plug Mini (US)'] && !model.options.deviceConfig['Plug Mini (US)'].hide_device && (model.options.deviceConfig['Plug Mini (US)'].connectionType === 'OpenAPI' || model.options.deviceConfig['Plug Mini (US)'].connectionType === 'BLE/OpenAPI'));"
                     }
                   },
                   "delayBetweenRetries": {
@@ -5568,28 +6179,28 @@
                     "type": "number",
                     "placeholder": 3,
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Blind Tilt'] && !model.options.deviceConfig['Blind Tilt'].hide_device && (model.options.deviceConfig['Blind Tilt'].connectionType === 'OpenAPI' || model.options.deviceConfig['Blind Tilt'].connectionType === 'BLE/OpenAPI'));"
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Plug Mini (US)'] && !model.options.deviceConfig['Plug Mini (US)'].hide_device && (model.options.deviceConfig['Plug Mini (US)'].connectionType === 'OpenAPI' || model.options.deviceConfig['Plug Mini (US)'].connectionType === 'BLE/OpenAPI'));"
                     }
                   },
                   "disableCaching": {
                     "title": "Disable Caching",
                     "type": "boolean",
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Blind Tilt'] && !model.options.deviceConfig['Blind Tilt'].hide_device);"
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Plug Mini (US)'] && !model.options.deviceConfig['Plug Mini (US)'].hide_device);"
                     }
                   },
                   "offline": {
                     "title": "Offline as Off",
                     "type": "boolean",
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Blind Tilt'].hide_device);"
+                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Plug Mini (US)'].hide_device);"
                     }
                   },
                   "history": {
                     "title": "EVE History",
                     "type": "boolean",
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Blind Tilt'].hide_device);"
+                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Plug Mini (US)'].hide_device);"
                     }
                   },
                   "firmware": {
@@ -5597,7 +6208,7 @@
                     "type": "string",
                     "placeholder": "1.2.8",
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Blind Tilt'].hide_device);"
+                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Plug Mini (US)'].hide_device);"
                     }
                   },
                   "logging": {
@@ -5605,7 +6216,7 @@
                     "type": "string",
                     "default": "",
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Blind Tilt'].hide_device);"
+                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Plug Mini (US)'].hide_device);"
                     },
                     "oneOf": [
                       {
@@ -5639,7 +6250,7 @@
                     "type": "number",
                     "placeholder": 5,
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Blind Tilt'].hide_device);"
+                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Plug Mini (US)'].hide_device);"
                     }
                   },
                   "updateRate": {
@@ -5649,7 +6260,7 @@
                     "placeholder": 5,
                     "description": "Indicates the number of seconds before refreshing status while updating progress.",
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Blind Tilt'].hide_device);"
+                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Plug Mini (US)'].hide_device);"
                     }
                   },
                   "pushRate": {
@@ -5657,16 +6268,16 @@
                     "type": "number",
                     "placeholder": 360,
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Blind Tilt'].hide_device);"
+                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Plug Mini (US)'].hide_device);"
                     }
                   }
                 }
               },
-              "Plug": {
+              "Plug Mini (JP)": {
                 "type": "object",
                 "properties": {
                   "hide_device": {
-                    "title": "Hide All Plugs",
+                    "title": "Hide All Plug Mini (JP)s",
                     "type": "boolean",
                     "description": "If true, device will be removed or hidden from HomeKit."
                   },
@@ -5675,7 +6286,7 @@
                     "type": "string",
                     "description": "Bluetooth (BLE) API is only available on certain Device Types, see the Wiki for more information.",
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Plug'] && !model.options.deviceConfig['Plug'].hide_device);"
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Plug Mini (JP)'] && !model.options.deviceConfig['Plug Mini (JP)'].hide_device);"
                     },
                     "oneOf": [
                       {
@@ -5708,7 +6319,7 @@
                     "title": "Disable Platform BLE",
                     "type": "boolean",
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Plug'] && !model.options.deviceConfig['Humidifier'].hide_device && model.options.deviceConfig['Plug'].connectionType !== 'Disabled');"
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Plug Mini (JP)'] && !model.options.deviceConfig['Plug Mini (JP)'].hide_device && model.options.deviceConfig['Plug Mini (JP)'].connectionType !== 'Disabled');"
                     }
                   },
                   "scanDuration": {
@@ -5716,21 +6327,21 @@
                     "type": "number",
                     "placeholder": 1,
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Plug'] && !model.options.deviceConfig['Plug'].hide_device && (model.options.deviceConfig['Plug'].connectionType === 'BLE' || model.options.deviceConfig['Plug'].connectionType === 'BLE/OpenAPI'));"
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Plug Mini (JP)'] && !model.options.deviceConfig['Plug Mini (JP)'].hide_device && (model.options.deviceConfig['Plug Mini (JP)'].connectionType === 'BLE' || model.options.deviceConfig['Plug Mini (JP)'].connectionType === 'BLE/OpenAPI'));"
                     }
                   },
                   "webhook": {
-                    "title": "Enable Webhook for all Plugs",
+                    "title": "Enable Webhook for all Plug Mini (JP)s",
                     "type": "boolean",
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Plug'] && !model.options.deviceConfig['Plug'].hide_device && (model.options.deviceConfig['Plug'].connectionType === 'OpenAPI' || model.options.deviceConfig['Plug'].connectionType === 'BLE/OpenAPI'));"
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Plug Mini (JP)'] && !model.options.deviceConfig['Plug Mini (JP)'].hide_device && (model.options.deviceConfig['Plug Mini (JP)'].connectionType === 'OpenAPI' || model.options.deviceConfig['Plug Mini (JP)'].connectionType === 'BLE/OpenAPI'));"
                     }
                   },
                   "external": {
                     "title": "External Accessory",
                     "type": "boolean",
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Plug'] && !model.options.deviceConfig['Plug'].hide_device);"
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Plug Mini (JP)'] && !model.options.deviceConfig['Plug Mini (JP)'].hide_device);"
                     }
                   },
                   "maxRetry": {
@@ -5738,7 +6349,7 @@
                     "type": "number",
                     "placeholder": "5",
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Plug'] && !model.options.deviceConfig['Plug'].hide_device && (model.options.deviceConfig['Plug'].connectionType === 'BLE' || model.options.deviceConfig['Plug'].connectionType === 'BLE/OpenAPI'));"
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Plug Mini (JP)'] && !model.options.deviceConfig['Plug Mini (JP)'].hide_device && (model.options.deviceConfig['Plug Mini (JP)'].connectionType === 'BLE' || model.options.deviceConfig['Plug Mini (JP)'].connectionType === 'BLE/OpenAPI'));"
                     }
                   },
                   "maxRetries": {
@@ -5746,7 +6357,7 @@
                     "type": "number",
                     "placeholder": 5,
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Plug'] && !model.options.deviceConfig['Plug'].hide_device && (model.options.deviceConfig['Plug'].connectionType === 'OpenAPI' || model.options.deviceConfig['Plug'].connectionType === 'BLE/OpenAPI'));"
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Plug Mini (JP)'] && !model.options.deviceConfig['Plug Mini (JP)'].hide_device && (model.options.deviceConfig['Plug Mini (JP)'].connectionType === 'OpenAPI' || model.options.deviceConfig['Plug Mini (JP)'].connectionType === 'BLE/OpenAPI'));"
                     }
                   },
                   "delayBetweenRetries": {
@@ -5754,28 +6365,28 @@
                     "type": "number",
                     "placeholder": 3,
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Plug'] && !model.options.deviceConfig['Plug'].hide_device && (model.options.deviceConfig['Plug'].connectionType === 'OpenAPI' || model.options.deviceConfig['Plug'].connectionType === 'BLE/OpenAPI'));"
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Plug Mini (JP)'] && !model.options.deviceConfig['Plug Mini (JP)'].hide_device && (model.options.deviceConfig['Plug Mini (JP)'].connectionType === 'OpenAPI' || model.options.deviceConfig['Plug Mini (JP)'].connectionType === 'BLE/OpenAPI'));"
                     }
                   },
                   "disableCaching": {
                     "title": "Disable Caching",
                     "type": "boolean",
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Plug'] && !model.options.deviceConfig['Plug'].hide_device);"
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Plug Mini (JP)'] && !model.options.deviceConfig['Plug Mini (JP)'].hide_device);"
                     }
                   },
                   "offline": {
                     "title": "Offline as Off",
                     "type": "boolean",
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Plug'].hide_device);"
+                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Plug Mini (JP)'].hide_device);"
                     }
                   },
                   "history": {
                     "title": "EVE History",
                     "type": "boolean",
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Plug'].hide_device);"
+                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Plug Mini (JP)'].hide_device);"
                     }
                   },
                   "firmware": {
@@ -5783,7 +6394,7 @@
                     "type": "string",
                     "placeholder": "1.2.8",
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Plug'].hide_device);"
+                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Plug Mini (JP)'].hide_device);"
                     }
                   },
                   "logging": {
@@ -5791,7 +6402,7 @@
                     "type": "string",
                     "default": "",
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Plug'].hide_device);"
+                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Plug Mini (JP)'].hide_device);"
                     },
                     "oneOf": [
                       {
@@ -5825,7 +6436,7 @@
                     "type": "number",
                     "placeholder": 5,
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Plug'].hide_device);"
+                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Plug Mini (JP)'].hide_device);"
                     }
                   },
                   "updateRate": {
@@ -5835,7 +6446,7 @@
                     "placeholder": 5,
                     "description": "Indicates the number of seconds before refreshing status while updating progress.",
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Plug'].hide_device);"
+                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Plug Mini (JP)'].hide_device);"
                     }
                   },
                   "pushRate": {
@@ -5843,25 +6454,39 @@
                     "type": "number",
                     "placeholder": 360,
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Plug'].hide_device);"
+                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Plug Mini (JP)'].hide_device);"
                     }
                   }
                 }
               },
-              "Plug Mini (US)": {
+              "Smart Lock": {
                 "type": "object",
                 "properties": {
                   "hide_device": {
-                    "title": "Hide All Plug Mini (US)s",
+                    "title": "Hide All Smart Locks",
                     "type": "boolean",
                     "description": "If true, device will be removed or hidden from HomeKit."
                   },
+                  "hide_contactsensor": {
+                    "title": "Hide Lock's Contact Sensor",
+                    "type": "boolean",
+                    "condition": {
+                      "functionBody": "return (model.options && model.options.devices && !model.options.deviceConfig['Smart Lock'].hide_device && (model.options.deviceConfig['Smart Lock'].configDeviceType === 'Smart Lock' || model.options.deviceConfig['Smart Lock'].configDeviceType === 'Smart Lock Pro' ) && model.options.deviceConfig['Smart Lock'].deviceId);"
+                    }
+                  },
+                  "activate_latchbutton": {
+                    "title": "Activate Latch Button",
+                    "type": "boolean",
+                    "condition": {
+                      "functionBody": "return (model.options && model.options.devices && !model.options.deviceConfig['Smart Lock'].hide_device && (model.options.deviceConfig['Smart Lock'].configDeviceType === 'Smart Lock' || model.options.deviceConfig['Smart Lock'].configDeviceType === 'Smart Lock Pro') && model.options.deviceConfig['Smart Lock'].deviceId);"
+                    }
+                  },
                   "connectionType": {
                     "title": "Connection Type",
                     "type": "string",
                     "description": "Bluetooth (BLE) API is only available on certain Device Types, see the Wiki for more information.",
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Plug Mini (US)'] && !model.options.deviceConfig['Plug Mini (US)'].hide_device);"
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Smart Lock'] && !model.options.deviceConfig['Smart Lock'].hide_device);"
                     },
                     "oneOf": [
                       {
@@ -5894,7 +6519,7 @@
                     "title": "Disable Platform BLE",
                     "type": "boolean",
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Plug Mini (US)'] && !model.options.deviceConfig['Plug Mini (US)'].hide_device && model.options.deviceConfig['Plug Mini (US)'].connectionType !== 'Disabled');"
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Smart Lock'] && !model.options.deviceConfig['Smart Lock'].hide_device && model.options.deviceConfig['Smart Lock'].connectionType !== 'Disabled');"
                     }
                   },
                   "scanDuration": {
@@ -5902,21 +6527,21 @@
                     "type": "number",
                     "placeholder": 1,
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Plug Mini (US)'] && !model.options.deviceConfig['Plug Mini (US)'].hide_device && (model.options.deviceConfig['Plug Mini (US)'].connectionType === 'BLE' || model.options.deviceConfig['Plug Mini (US)'].connectionType === 'BLE/OpenAPI'));"
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Smart Lock'] && !model.options.deviceConfig['Smart Lock'].hide_device && (model.options.deviceConfig['Smart Lock'].connectionType === 'BLE' || model.options.deviceConfig['Smart Lock'].connectionType === 'BLE/OpenAPI'));"
                     }
                   },
                   "webhook": {
-                    "title": "Enable Webhook for all Plug Mini (US)s",
+                    "title": "Enable Webhook for all Smart Locks",
                     "type": "boolean",
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Plug Mini (US)'] && !model.options.deviceConfig['Plug Mini (US)'].hide_device && (model.options.deviceConfig['Plug Mini (US)'].connectionType === 'OpenAPI' || model.options.deviceConfig['Plug Mini (US)'].connectionType === 'BLE/OpenAPI'));"
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Smart Lock'] && !model.options.deviceConfig['Smart Lock'].hide_device && (model.options.deviceConfig['Smart Lock'].connectionType === 'OpenAPI' || model.options.deviceConfig['Smart Lock'].connectionType === 'BLE/OpenAPI'));"
                     }
                   },
                   "external": {
                     "title": "External Accessory",
                     "type": "boolean",
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Plug Mini (US)'] && !model.options.deviceConfig['Plug Mini (US)'].hide_device);"
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Smart Lock'] && !model.options.deviceConfig['Smart Lock'].hide_device);"
                     }
                   },
                   "maxRetry": {
@@ -5924,7 +6549,7 @@
                     "type": "number",
                     "placeholder": "5",
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Plug Mini (US)'] && !model.options.deviceConfig['Plug Mini (US)'].hide_device && (model.options.deviceConfig['Plug Mini (US)'].connectionType === 'BLE' || model.options.deviceConfig['Plug Mini (US)'].connectionType === 'BLE/OpenAPI'));"
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Smart Lock'] && !model.options.deviceConfig['Smart Lock'].hide_device && (model.options.deviceConfig['Smart Lock'].connectionType === 'BLE' || model.options.deviceConfig['Smart Lock'].connectionType === 'BLE/OpenAPI'));"
                     }
                   },
                   "maxRetries": {
@@ -5932,7 +6557,7 @@
                     "type": "number",
                     "placeholder": 5,
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Plug Mini (US)'] && !model.options.deviceConfig['Plug Mini (US)'].hide_device && (model.options.deviceConfig['Plug Mini (US)'].connectionType === 'OpenAPI' || model.options.deviceConfig['Plug Mini (US)'].connectionType === 'BLE/OpenAPI'));"
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Smart Lock'] && !model.options.deviceConfig['Smart Lock'].hide_device && (model.options.deviceConfig['Smart Lock'].connectionType === 'OpenAPI' || model.options.deviceConfig['Smart Lock'].connectionType === 'BLE/OpenAPI'));"
                     }
                   },
                   "delayBetweenRetries": {
@@ -5940,28 +6565,28 @@
                     "type": "number",
                     "placeholder": 3,
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Plug Mini (US)'] && !model.options.deviceConfig['Plug Mini (US)'].hide_device && (model.options.deviceConfig['Plug Mini (US)'].connectionType === 'OpenAPI' || model.options.deviceConfig['Plug Mini (US)'].connectionType === 'BLE/OpenAPI'));"
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Smart Lock'] && !model.options.deviceConfig['Smart Lock'].hide_device && (model.options.deviceConfig['Smart Lock'].connectionType === 'OpenAPI' || model.options.deviceConfig['Smart Lock'].connectionType === 'BLE/OpenAPI'));"
                     }
                   },
                   "disableCaching": {
                     "title": "Disable Caching",
                     "type": "boolean",
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Plug Mini (US)'] && !model.options.deviceConfig['Plug Mini (US)'].hide_device);"
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Smart Lock'] && !model.options.deviceConfig['Smart Lock'].hide_device);"
                     }
                   },
                   "offline": {
                     "title": "Offline as Off",
                     "type": "boolean",
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Plug Mini (US)'].hide_device);"
+                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Smart Lock'].hide_device);"
                     }
                   },
                   "history": {
                     "title": "EVE History",
                     "type": "boolean",
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Plug Mini (US)'].hide_device);"
+                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Smart Lock'].hide_device);"
                     }
                   },
                   "firmware": {
@@ -5969,7 +6594,7 @@
                     "type": "string",
                     "placeholder": "1.2.8",
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Plug Mini (US)'].hide_device);"
+                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Smart Lock'].hide_device);"
                     }
                   },
                   "logging": {
@@ -5977,7 +6602,7 @@
                     "type": "string",
                     "default": "",
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Plug Mini (US)'].hide_device);"
+                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Smart Lock'].hide_device);"
                     },
                     "oneOf": [
                       {
@@ -6011,7 +6636,7 @@
                     "type": "number",
                     "placeholder": 5,
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Plug Mini (US)'].hide_device);"
+                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Smart Lock'].hide_device);"
                     }
                   },
                   "updateRate": {
@@ -6021,7 +6646,7 @@
                     "placeholder": 5,
                     "description": "Indicates the number of seconds before refreshing status while updating progress.",
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Plug Mini (US)'].hide_device);"
+                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Smart Lock'].hide_device);"
                     }
                   },
                   "pushRate": {
@@ -6029,25 +6654,39 @@
                     "type": "number",
                     "placeholder": 360,
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Plug Mini (US)'].hide_device);"
+                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Smart Lock'].hide_device);"
                     }
                   }
                 }
               },
-              "Plug Mini (JP)": {
+              "Smart Lock Pro": {
                 "type": "object",
                 "properties": {
                   "hide_device": {
-                    "title": "Hide All Plug Mini (JP)s",
+                    "title": "Hide All Smart Lock Pros",
                     "type": "boolean",
                     "description": "If true, device will be removed or hidden from HomeKit."
                   },
+                  "hide_contactsensor": {
+                    "title": "Hide Lock's Contact Sensor",
+                    "type": "boolean",
+                    "condition": {
+                      "functionBody": "return (model.options && model.options.devices && !model.options.deviceConfig['Smart Lock Pro'].hide_device && (model.options.deviceConfig['Smart Lock Pro'].configDeviceType === 'Smart Lock' || model.options.deviceConfig['Smart Lock Pro'].configDeviceType === 'Smart Lock Pro') && model.options.deviceConfig['Smart Lock Pro'].deviceId);"
+                    }
+                  },
+                  "activate_latchbutton": {
+                    "title": "Activate Latch Button",
+                    "type": "boolean",
+                    "condition": {
+                      "functionBody": "return (model.options && model.options.devices && !model.options.deviceConfig['Smart Lock Pro'].hide_device && (model.options.deviceConfig['Smart Lock Pro'].configDeviceType === 'Smart Lock' || model.options.deviceConfig['Smart Lock Pro'].configDeviceType === 'Smart Lock Pro') && model.options.deviceConfig['Smart Lock Pro'].deviceId);"
+                    }
+                  },
                   "connectionType": {
                     "title": "Connection Type",
                     "type": "string",
                     "description": "Bluetooth (BLE) API is only available on certain Device Types, see the Wiki for more information.",
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Plug Mini (JP)'] && !model.options.deviceConfig['Plug Mini (JP)'].hide_device);"
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Smart Lock Pro'] && !model.options.deviceConfig['Smart Lock Pro'].hide_device);"
                     },
                     "oneOf": [
                       {
@@ -6080,7 +6719,7 @@
                     "title": "Disable Platform BLE",
                     "type": "boolean",
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Plug Mini (JP)'] && !model.options.deviceConfig['Plug Mini (JP)'].hide_device && model.options.deviceConfig['Plug Mini (JP)'].connectionType !== 'Disabled');"
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Smart Lock Pro'] && !model.options.deviceConfig['Smart Lock Pro'].hide_device && model.options.deviceConfig['Smart Lock Pro'].connectionType !== 'Disabled');"
                     }
                   },
                   "scanDuration": {
@@ -6088,21 +6727,21 @@
                     "type": "number",
                     "placeholder": 1,
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Plug Mini (JP)'] && !model.options.deviceConfig['Plug Mini (JP)'].hide_device && (model.options.deviceConfig['Plug Mini (JP)'].connectionType === 'BLE' || model.options.deviceConfig['Plug Mini (JP)'].connectionType === 'BLE/OpenAPI'));"
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Smart Lock Pro'] && !model.options.deviceConfig['Smart Lock Pro'].hide_device && (model.options.deviceConfig['Smart Lock Pro'].connectionType === 'BLE' || model.options.deviceConfig['Smart Lock Pro'].connectionType === 'BLE/OpenAPI'));"
                     }
                   },
                   "webhook": {
-                    "title": "Enable Webhook for all Plug Mini (JP)s",
+                    "title": "Enable Webhook for all Smart Lock Pros",
                     "type": "boolean",
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Plug Mini (JP)'] && !model.options.deviceConfig['Plug Mini (JP)'].hide_device && (model.options.deviceConfig['Plug Mini (JP)'].connectionType === 'OpenAPI' || model.options.deviceConfig['Plug Mini (JP)'].connectionType === 'BLE/OpenAPI'));"
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Smart Lock Pro'] && !model.options.deviceConfig['Smart Lock Pro'].hide_device && (model.options.deviceConfig['Smart Lock Pro'].connectionType === 'OpenAPI' || model.options.deviceConfig['Smart Lock Pro'].connectionType === 'BLE/OpenAPI'));"
                     }
                   },
                   "external": {
                     "title": "External Accessory",
                     "type": "boolean",
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Plug Mini (JP)'] && !model.options.deviceConfig['Plug Mini (JP)'].hide_device);"
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Smart Lock Pro'] && !model.options.deviceConfig['Smart Lock Pro'].hide_device);"
                     }
                   },
                   "maxRetry": {
@@ -6110,7 +6749,7 @@
                     "type": "number",
                     "placeholder": "5",
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Plug Mini (JP)'] && !model.options.deviceConfig['Plug Mini (JP)'].hide_device && (model.options.deviceConfig['Plug Mini (JP)'].connectionType === 'BLE' || model.options.deviceConfig['Plug Mini (JP)'].connectionType === 'BLE/OpenAPI'));"
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Smart Lock Pro'] && !model.options.deviceConfig['Smart Lock Pro'].hide_device && (model.options.deviceConfig['Smart Lock Pro'].connectionType === 'BLE' || model.options.deviceConfig['Smart Lock Pro'].connectionType === 'BLE/OpenAPI'));"
                     }
                   },
                   "maxRetries": {
@@ -6118,7 +6757,7 @@
                     "type": "number",
                     "placeholder": 5,
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Plug Mini (JP)'] && !model.options.deviceConfig['Plug Mini (JP)'].hide_device && (model.options.deviceConfig['Plug Mini (JP)'].connectionType === 'OpenAPI' || model.options.deviceConfig['Plug Mini (JP)'].connectionType === 'BLE/OpenAPI'));"
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Smart Lock Pro'] && !model.options.deviceConfig['Smart Lock Pro'].hide_device && (model.options.deviceConfig['Smart Lock Pro'].connectionType === 'OpenAPI' || model.options.deviceConfig['Smart Lock Pro'].connectionType === 'BLE/OpenAPI'));"
                     }
                   },
                   "delayBetweenRetries": {
@@ -6126,28 +6765,28 @@
                     "type": "number",
                     "placeholder": 3,
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Plug Mini (JP)'] && !model.options.deviceConfig['Plug Mini (JP)'].hide_device && (model.options.deviceConfig['Plug Mini (JP)'].connectionType === 'OpenAPI' || model.options.deviceConfig['Plug Mini (JP)'].connectionType === 'BLE/OpenAPI'));"
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Smart Lock Pro'] && !model.options.deviceConfig['Smart Lock Pro'].hide_device && (model.options.deviceConfig['Smart Lock Pro'].connectionType === 'OpenAPI' || model.options.deviceConfig['Smart Lock Pro'].connectionType === 'BLE/OpenAPI'));"
                     }
                   },
                   "disableCaching": {
                     "title": "Disable Caching",
                     "type": "boolean",
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Plug Mini (JP)'] && !model.options.deviceConfig['Plug Mini (JP)'].hide_device);"
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Smart Lock Pro'] && !model.options.deviceConfig['Smart Lock Pro'].hide_device);"
                     }
                   },
                   "offline": {
                     "title": "Offline as Off",
                     "type": "boolean",
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Plug Mini (JP)'].hide_device);"
+                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Smart Lock Pro'].hide_device);"
                     }
                   },
                   "history": {
                     "title": "EVE History",
                     "type": "boolean",
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Plug Mini (JP)'].hide_device);"
+                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Smart Lock Pro'].hide_device);"
                     }
                   },
                   "firmware": {
@@ -6155,7 +6794,7 @@
                     "type": "string",
                     "placeholder": "1.2.8",
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Plug Mini (JP)'].hide_device);"
+                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Smart Lock Pro'].hide_device);"
                     }
                   },
                   "logging": {
@@ -6163,7 +6802,7 @@
                     "type": "string",
                     "default": "",
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Plug Mini (JP)'].hide_device);"
+                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Smart Lock Pro'].hide_device);"
                     },
                     "oneOf": [
                       {
@@ -6197,7 +6836,7 @@
                     "type": "number",
                     "placeholder": 5,
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Plug Mini (JP)'].hide_device);"
+                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Smart Lock Pro'].hide_device);"
                     }
                   },
                   "updateRate": {
@@ -6207,7 +6846,7 @@
                     "placeholder": 5,
                     "description": "Indicates the number of seconds before refreshing status while updating progress.",
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Plug Mini (JP)'].hide_device);"
+                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Smart Lock Pro'].hide_device);"
                     }
                   },
                   "pushRate": {
@@ -6215,16 +6854,16 @@
                     "type": "number",
                     "placeholder": 360,
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Plug Mini (JP)'].hide_device);"
+                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Smart Lock Pro'].hide_device);"
                     }
                   }
                 }
               },
-              "Smart Lock": {
+              "Smart Lock Ultra": {
                 "type": "object",
                 "properties": {
                   "hide_device": {
-                    "title": "Hide All Smart Locks",
+                    "title": "Hide All Smart Lock Ultras",
                     "type": "boolean",
                     "description": "If true, device will be removed or hidden from HomeKit."
                   },
@@ -6232,14 +6871,14 @@
                     "title": "Hide Lock's Contact Sensor",
                     "type": "boolean",
                     "condition": {
-                      "functionBody": "return (model.options && model.options.devices && !model.options.deviceConfig['Smart Lock'].hide_device && (model.options.deviceConfig['Smart Lock'].configDeviceType === 'Smart Lock' || model.options.deviceConfig['Smart Lock'].configDeviceType === 'Smart Lock Pro') && model.options.deviceConfig['Smart Lock'].deviceId);"
+                      "functionBody": "return (model.options && model.options.devices && !model.options.deviceConfig['Smart Lock Ultra'].hide_device && (model.options.deviceConfig['Smart Lock Ultra'].configDeviceType === 'Smart Lock' || model.options.deviceConfig['Smart Lock Ultra'].configDeviceType === 'Smart Lock Pro' || model.options.deviceConfig['Smart Lock Ultra'].configDeviceType === 'Smart Lock Ultra' || model.options.deviceConfig['Smart Lock Ultra'].configDeviceType === 'Lock Ultra') && model.options.deviceConfig['Smart Lock Ultra'].deviceId);"
                     }
                   },
                   "activate_latchbutton": {
                     "title": "Activate Latch Button",
                     "type": "boolean",
                     "condition": {
-                      "functionBody": "return (model.options && model.options.devices && !model.options.deviceConfig['Smart Lock'].hide_device && (model.options.deviceConfig['Smart Lock'].configDeviceType === 'Smart Lock' || model.options.deviceConfig['Smart Lock'].configDeviceType === 'Smart Lock Pro') && model.options.deviceConfig['Smart Lock'].deviceId);"
+                      "functionBody": "return (model.options && model.options.devices && !model.options.deviceConfig['Smart Lock Ultra'].hide_device && (model.options.deviceConfig['Smart Lock Ultra'].configDeviceType === 'Smart Lock' || model.options.deviceConfig['Smart Lock Ultra'].configDeviceType === 'Smart Lock Pro' || model.options.deviceConfig['Smart Lock Ultra'].configDeviceType === 'Smart Lock Ultra' || model.options.deviceConfig['Smart Lock Ultra'].configDeviceType === 'Lock Ultra') && model.options.deviceConfig['Smart Lock Ultra'].deviceId);"
                     }
                   },
                   "connectionType": {
@@ -6247,7 +6886,7 @@
                     "type": "string",
                     "description": "Bluetooth (BLE) API is only available on certain Device Types, see the Wiki for more information.",
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Smart Lock'] && !model.options.deviceConfig['Smart Lock'].hide_device);"
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Smart Lock Ultra'] && !model.options.deviceConfig['Smart Lock Ultra'].hide_device);"
                     },
                     "oneOf": [
                       {
@@ -6263,7 +6902,7 @@
                         ]
                       },
                       {
-                        "title": "Disable",
+                        "title": "Disabled",
                         "enum": [
                           "Disabled"
                         ]
@@ -6280,7 +6919,7 @@
                     "title": "Disable Platform BLE",
                     "type": "boolean",
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Smart Lock'] && !model.options.deviceConfig['Smart Lock'].hide_device && model.options.deviceConfig['Smart Lock'].connectionType !== 'Disabled');"
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Smart Lock Ultra'] && !model.options.deviceConfig['Smart Lock Ultra'].hide_device && model.options.deviceConfig['Smart Lock Ultra'].connectionType !== 'Disabled');"
                     }
                   },
                   "scanDuration": {
@@ -6288,21 +6927,21 @@
                     "type": "number",
                     "placeholder": 1,
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Smart Lock'] && !model.options.deviceConfig['Smart Lock'].hide_device && (model.options.deviceConfig['Smart Lock'].connectionType === 'BLE' || model.options.deviceConfig['Smart Lock'].connectionType === 'BLE/OpenAPI'));"
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Smart Lock Ultra'] && !model.options.deviceConfig['Smart Lock Ultra'].hide_device && (model.options.deviceConfig['Smart Lock Ultra'].connectionType === 'BLE' || model.options.deviceConfig['Smart Lock Ultra'].connectionType === 'BLE/OpenAPI'));"
                     }
                   },
                   "webhook": {
-                    "title": "Enable Webhook for all Smart Locks",
+                    "title": "Enable Webhook for all Smart Lock Ultras",
                     "type": "boolean",
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Smart Lock'] && !model.options.deviceConfig['Smart Lock'].hide_device && (model.options.deviceConfig['Smart Lock'].connectionType === 'OpenAPI' || model.options.deviceConfig['Smart Lock'].connectionType === 'BLE/OpenAPI'));"
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Smart Lock Ultra'] && !model.options.deviceConfig['Smart Lock Ultra'].hide_device && (model.options.deviceConfig['Smart Lock Ultra'].connectionType === 'OpenAPI' || model.options.deviceConfig['Smart Lock Ultra'].connectionType === 'BLE/OpenAPI'));"
                     }
                   },
                   "external": {
                     "title": "External Accessory",
                     "type": "boolean",
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Smart Lock'] && !model.options.deviceConfig['Smart Lock'].hide_device);"
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Smart Lock Ultra'] && !model.options.deviceConfig['Smart Lock Ultra'].hide_device);"
                     }
                   },
                   "maxRetry": {
@@ -6310,7 +6949,7 @@
                     "type": "number",
                     "placeholder": "5",
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Smart Lock'] && !model.options.deviceConfig['Smart Lock'].hide_device && (model.options.deviceConfig['Smart Lock'].connectionType === 'BLE' || model.options.deviceConfig['Smart Lock'].connectionType === 'BLE/OpenAPI'));"
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Smart Lock Ultra'] && !model.options.deviceConfig['Smart Lock Ultra'].hide_device && (model.options.deviceConfig['Smart Lock Ultra'].connectionType === 'BLE' || model.options.deviceConfig['Smart Lock Ultra'].connectionType === 'BLE/OpenAPI'));"
                     }
                   },
                   "maxRetries": {
@@ -6318,7 +6957,7 @@
                     "type": "number",
                     "placeholder": 5,
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Smart Lock'] && !model.options.deviceConfig['Smart Lock'].hide_device && (model.options.deviceConfig['Smart Lock'].connectionType === 'OpenAPI' || model.options.deviceConfig['Smart Lock'].connectionType === 'BLE/OpenAPI'));"
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Smart Lock Ultra'] && !model.options.deviceConfig['Smart Lock Ultra'].hide_device && (model.options.deviceConfig['Smart Lock Ultra'].connectionType === 'OpenAPI' || model.options.deviceConfig['Smart Lock Ultra'].connectionType === 'BLE/OpenAPI'));"
                     }
                   },
                   "delayBetweenRetries": {
@@ -6326,28 +6965,28 @@
                     "type": "number",
                     "placeholder": 3,
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Smart Lock'] && !model.options.deviceConfig['Smart Lock'].hide_device && (model.options.deviceConfig['Smart Lock'].connectionType === 'OpenAPI' || model.options.deviceConfig['Smart Lock'].connectionType === 'BLE/OpenAPI'));"
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Smart Lock Ultra'] && !model.options.deviceConfig['Smart Lock Ultra'].hide_device && (model.options.deviceConfig['Smart Lock Ultra'].connectionType === 'OpenAPI' || model.options.deviceConfig['Smart Lock Ultra'].connectionType === 'BLE/OpenAPI'));"
                     }
                   },
                   "disableCaching": {
                     "title": "Disable Caching",
                     "type": "boolean",
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Smart Lock'] && !model.options.deviceConfig['Smart Lock'].hide_device);"
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Smart Lock Ultra'] && !model.options.deviceConfig['Smart Lock Ultra'].hide_device);"
                     }
                   },
                   "offline": {
                     "title": "Offline as Off",
                     "type": "boolean",
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Smart Lock'].hide_device);"
+                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Smart Lock Ultra'].hide_device);"
                     }
                   },
                   "history": {
                     "title": "EVE History",
                     "type": "boolean",
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Smart Lock'].hide_device);"
+                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Smart Lock Ultra'].hide_device);"
                     }
                   },
                   "firmware": {
@@ -6355,7 +6994,7 @@
                     "type": "string",
                     "placeholder": "1.2.8",
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Smart Lock'].hide_device);"
+                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Smart Lock Ultra'].hide_device);"
                     }
                   },
                   "logging": {
@@ -6363,7 +7002,7 @@
                     "type": "string",
                     "default": "",
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Smart Lock'].hide_device);"
+                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Smart Lock Ultra'].hide_device);"
                     },
                     "oneOf": [
                       {
@@ -6397,7 +7036,7 @@
                     "type": "number",
                     "placeholder": 5,
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Smart Lock'].hide_device);"
+                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Smart Lock Ultra'].hide_device);"
                     }
                   },
                   "updateRate": {
@@ -6407,7 +7046,7 @@
                     "placeholder": 5,
                     "description": "Indicates the number of seconds before refreshing status while updating progress.",
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Smart Lock'].hide_device);"
+                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Smart Lock Ultra'].hide_device);"
                     }
                   },
                   "pushRate": {
@@ -6415,16 +7054,16 @@
                     "type": "number",
                     "placeholder": 360,
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Smart Lock'].hide_device);"
+                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Smart Lock Ultra'].hide_device);"
                     }
                   }
                 }
               },
-              "Smart Lock Pro": {
+              "Lock Ultra": {
                 "type": "object",
                 "properties": {
                   "hide_device": {
-                    "title": "Hide All Smart Lock Pros",
+                    "title": "Hide All Lock Ultras",
                     "type": "boolean",
                     "description": "If true, device will be removed or hidden from HomeKit."
                   },
@@ -6432,14 +7071,14 @@
                     "title": "Hide Lock's Contact Sensor",
                     "type": "boolean",
                     "condition": {
-                      "functionBody": "return (model.options && model.options.devices && !model.options.deviceConfig['Smart Lock Pro'].hide_device && (model.options.deviceConfig['Smart Lock Pro'].configDeviceType === 'Smart Lock' || model.options.deviceConfig['Smart Lock Pro'].configDeviceType === 'Smart Lock Pro') && model.options.deviceConfig['Smart Lock Pro'].deviceId);"
+                      "functionBody": "return (model.options && model.options.devices && !model.options.deviceConfig['Lock Ultra'].hide_device && (model.options.deviceConfig['Lock Ultra'].configDeviceType === 'Smart Lock' || model.options.deviceConfig['Lock Ultra'].configDeviceType === 'Smart Lock Pro' || model.options.deviceConfig['Lock Ultra'].configDeviceType === 'Smart Lock Ultra' || model.options.deviceConfig['Lock Ultra'].configDeviceType === 'Lock Ultra') && model.options.deviceConfig['Lock Ultra'].deviceId);"
                     }
                   },
                   "activate_latchbutton": {
                     "title": "Activate Latch Button",
                     "type": "boolean",
                     "condition": {
-                      "functionBody": "return (model.options && model.options.devices && !model.options.deviceConfig['Smart Lock Pro'].hide_device && (model.options.deviceConfig['Smart Lock Pro'].configDeviceType === 'Smart Lock' || model.options.deviceConfig['Smart Lock Pro'].configDeviceType === 'Smart Lock Pro') && model.options.deviceConfig['Smart Lock Pro'].deviceId);"
+                      "functionBody": "return (model.options && model.options.devices && !model.options.deviceConfig['Lock Ultra'].hide_device && (model.options.deviceConfig['Lock Ultra'].configDeviceType === 'Smart Lock' || model.options.deviceConfig['Lock Ultra'].configDeviceType === 'Smart Lock Pro' || model.options.deviceConfig['Lock Ultra'].configDeviceType === 'Smart Lock Ultra' || model.options.deviceConfig['Lock Ultra'].configDeviceType === 'Lock Ultra') && model.options.deviceConfig['Lock Ultra'].deviceId);"
                     }
                   },
                   "connectionType": {
@@ -6447,7 +7086,7 @@
                     "type": "string",
                     "description": "Bluetooth (BLE) API is only available on certain Device Types, see the Wiki for more information.",
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Smart Lock Pro'] && !model.options.deviceConfig['Smart Lock Pro'].hide_device);"
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Lock Ultra'] && !model.options.deviceConfig['Lock Ultra'].hide_device);"
                     },
                     "oneOf": [
                       {
@@ -6463,7 +7102,7 @@
                         ]
                       },
                       {
-                        "title": "Disable",
+                        "title": "Disabled",
                         "enum": [
                           "Disabled"
                         ]
@@ -6480,7 +7119,7 @@
                     "title": "Disable Platform BLE",
                     "type": "boolean",
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Smart Lock Pro'] && !model.options.deviceConfig['Smart Lock Pro'].hide_device && model.options.deviceConfig['Smart Lock Pro'].connectionType !== 'Disabled');"
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Lock Ultra'] && !model.options.deviceConfig['Lock Ultra'].hide_device && model.options.deviceConfig['Lock Ultra'].connectionType !== 'Disabled');"
                     }
                   },
                   "scanDuration": {
@@ -6488,21 +7127,21 @@
                     "type": "number",
                     "placeholder": 1,
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Smart Lock Pro'] && !model.options.deviceConfig['Smart Lock Pro'].hide_device && (model.options.deviceConfig['Smart Lock Pro'].connectionType === 'BLE' || model.options.deviceConfig['Smart Lock Pro'].connectionType === 'BLE/OpenAPI'));"
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Lock Ultra'] && !model.options.deviceConfig['Lock Ultra'].hide_device && (model.options.deviceConfig['Lock Ultra'].connectionType === 'BLE' || model.options.deviceConfig['Lock Ultra'].connectionType === 'BLE/OpenAPI'));"
                     }
                   },
                   "webhook": {
-                    "title": "Enable Webhook for all Smart Lock Pros",
+                    "title": "Enable Webhook for all Lock Ultras",
                     "type": "boolean",
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Smart Lock Pro'] && !model.options.deviceConfig['Smart Lock Pro'].hide_device && (model.options.deviceConfig['Smart Lock Pro'].connectionType === 'OpenAPI' || model.options.deviceConfig['Smart Lock Pro'].connectionType === 'BLE/OpenAPI'));"
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Lock Ultra'] && !model.options.deviceConfig['Lock Ultra'].hide_device && (model.options.deviceConfig['Lock Ultra'].connectionType === 'OpenAPI' || model.options.deviceConfig['Lock Ultra'].connectionType === 'BLE/OpenAPI'));"
                     }
                   },
                   "external": {
                     "title": "External Accessory",
                     "type": "boolean",
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Smart Lock Pro'] && !model.options.deviceConfig['Smart Lock Pro'].hide_device);"
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Lock Ultra'] && !model.options.deviceConfig['Lock Ultra'].hide_device);"
                     }
                   },
                   "maxRetry": {
@@ -6510,7 +7149,7 @@
                     "type": "number",
                     "placeholder": "5",
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Smart Lock Pro'] && !model.options.deviceConfig['Smart Lock Pro'].hide_device && (model.options.deviceConfig['Smart Lock Pro'].connectionType === 'BLE' || model.options.deviceConfig['Smart Lock Pro'].connectionType === 'BLE/OpenAPI'));"
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Lock Ultra'] && !model.options.deviceConfig['Lock Ultra'].hide_device && (model.options.deviceConfig['Lock Ultra'].connectionType === 'BLE' || model.options.deviceConfig['Lock Ultra'].connectionType === 'BLE/OpenAPI'));"
                     }
                   },
                   "maxRetries": {
@@ -6518,7 +7157,7 @@
                     "type": "number",
                     "placeholder": 5,
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Smart Lock Pro'] && !model.options.deviceConfig['Smart Lock Pro'].hide_device && (model.options.deviceConfig['Smart Lock Pro'].connectionType === 'OpenAPI' || model.options.deviceConfig['Smart Lock Pro'].connectionType === 'BLE/OpenAPI'));"
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Lock Ultra'] && !model.options.deviceConfig['Lock Ultra'].hide_device && (model.options.deviceConfig['Lock Ultra'].connectionType === 'OpenAPI' || model.options.deviceConfig['Lock Ultra'].connectionType === 'BLE/OpenAPI'));"
                     }
                   },
                   "delayBetweenRetries": {
@@ -6526,28 +7165,28 @@
                     "type": "number",
                     "placeholder": 3,
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Smart Lock Pro'] && !model.options.deviceConfig['Smart Lock Pro'].hide_device && (model.options.deviceConfig['Smart Lock Pro'].connectionType === 'OpenAPI' || model.options.deviceConfig['Smart Lock Pro'].connectionType === 'BLE/OpenAPI'));"
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Lock Ultra'] && !model.options.deviceConfig['Lock Ultra'].hide_device && (model.options.deviceConfig['Lock Ultra'].connectionType === 'OpenAPI' || model.options.deviceConfig['Lock Ultra'].connectionType === 'BLE/OpenAPI'));"
                     }
                   },
                   "disableCaching": {
                     "title": "Disable Caching",
                     "type": "boolean",
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Smart Lock Pro'] && !model.options.deviceConfig['Smart Lock Pro'].hide_device);"
+                      "functionBody": "return (model.options && model.options.deviceConfig && model.options.deviceConfig['Lock Ultra'] && !model.options.deviceConfig['Lock Ultra'].hide_device);"
                     }
                   },
                   "offline": {
                     "title": "Offline as Off",
                     "type": "boolean",
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Smart Lock Pro'].hide_device);"
+                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Lock Ultra'].hide_device);"
                     }
                   },
                   "history": {
                     "title": "EVE History",
                     "type": "boolean",
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Smart Lock Pro'].hide_device);"
+                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Lock Ultra'].hide_device);"
                     }
                   },
                   "firmware": {
@@ -6555,7 +7194,7 @@
                     "type": "string",
                     "placeholder": "1.2.8",
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Smart Lock Pro'].hide_device);"
+                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Lock Ultra'].hide_device);"
                     }
                   },
                   "logging": {
@@ -6563,7 +7202,7 @@
                     "type": "string",
                     "default": "",
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Smart Lock Pro'].hide_device);"
+                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Lock Ultra'].hide_device);"
                     },
                     "oneOf": [
                       {
@@ -6597,7 +7236,7 @@
                     "type": "number",
                     "placeholder": 5,
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Smart Lock Pro'].hide_device);"
+                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Lock Ultra'].hide_device);"
                     }
                   },
                   "updateRate": {
@@ -6607,7 +7246,7 @@
                     "placeholder": 5,
                     "description": "Indicates the number of seconds before refreshing status while updating progress.",
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Smart Lock Pro'].hide_device);"
+                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Lock Ultra'].hide_device);"
                     }
                   },
                   "pushRate": {
@@ -6615,7 +7254,7 @@
                     "type": "number",
                     "placeholder": 360,
                     "condition": {
-                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Smart Lock Pro'].hide_device);"
+                      "functionBody": "return (model.options && model.options.deviceConfig && !model.options.deviceConfig['Lock Ultra'].hide_device);"
                     }
                   }
                 }
@@ -13566,6 +14205,34 @@
             "options.deviceConfig['Motion Sensor'].pushRate"
           ]
         },
+        {
+          "type": "fieldset",
+          "title": "Presence Sensor Settings",
+          "expandable": true,
+          "expanded": false,
+          "items": [
+            "options.deviceConfig['Presence Sensor'].hide_device",
+            "options.deviceConfig['Presence Sensor'].hide_lightsensor",
+            "options.deviceConfig['Presence Sensor'].set_minlux",
+            "options.deviceConfig['Presence Sensor'].set_maxlux",
+            "options.deviceConfig['Presence Sensor'].connectionType",
+            "options.deviceConfig['Presence Sensor'].disablePlatformBLE",
+            "options.deviceConfig['Presence Sensor'].scanDuration",
+            "options.deviceConfig['Presence Sensor'].webhook",
+            "options.deviceConfig['Presence Sensor'].external",
+            "options.deviceConfig['Presence Sensor'].maxRetry",
+            "options.deviceConfig['Presence Sensor'].maxRetries",
+            "options.deviceConfig['Presence Sensor'].delayBetweenRetries",
+            "options.deviceConfig['Presence Sensor'].disableCaching",
+            "options.deviceConfig['Presence Sensor'].offline",
+            "options.deviceConfig['Presence Sensor'].history",
+            "options.deviceConfig['Presence Sensor'].firmware",
+            "options.deviceConfig['Presence Sensor'].logging",
+            "options.deviceConfig['Presence Sensor'].refreshRate",
+            "options.deviceConfig['Presence Sensor'].updateRate",
+            "options.deviceConfig['Presence Sensor'].pushRate"
+          ]
+        },
         {
           "type": "fieldset",
           "title": "Contact Sensor Settings",
@@ -13900,6 +14567,60 @@
             "options.deviceConfig['Smart Lock Pro'].pushRate"
           ]
         },
+        {
+          "type": "fieldset",
+          "title": "Smart Lock Ultra Settings",
+          "expandable": true,
+          "expanded": false,
+          "items": [
+            "options.deviceConfig['Smart Lock Ultra'].hide_device",
+            "options.deviceConfig['Smart Lock Ultra'].hide_contactsensor",
+            "options.deviceConfig['Smart Lock Ultra'].activate_latchbutton",
+            "options.deviceConfig['Smart Lock Ultra'].connectionType",
+            "options.deviceConfig['Smart Lock Ultra'].disablePlatformBLE",
+            "options.deviceConfig['Smart Lock Ultra'].scanDuration",
+            "options.deviceConfig['Smart Lock Ultra'].webhook",
+            "options.deviceConfig['Smart Lock Ultra'].external",
+            "options.deviceConfig['Smart Lock Ultra'].maxRetry",
+            "options.deviceConfig['Smart Lock Ultra'].maxRetries",
+            "options.deviceConfig['Smart Lock Ultra'].delayBetweenRetries",
+            "options.deviceConfig['Smart Lock Ultra'].disableCaching",
+            "options.deviceConfig['Smart Lock Ultra'].offline",
+            "options.deviceConfig['Smart Lock Ultra'].history",
+            "options.deviceConfig['Smart Lock Ultra'].firmware",
+            "options.deviceConfig['Smart Lock Ultra'].logging",
+            "options.deviceConfig['Smart Lock Ultra'].refreshRate",
+            "options.deviceConfig['Smart Lock Ultra'].updateRate",
+            "options.deviceConfig['Smart Lock Ultra'].pushRate"
+          ]
+        },
+        {
+          "type": "fieldset",
+          "title": "Lock Ultra Settings",
+          "expandable": true,
+          "expanded": false,
+          "items": [
+            "options.deviceConfig['Lock Ultra'].hide_device",
+            "options.deviceConfig['Lock Ultra'].hide_contactsensor",
+            "options.deviceConfig['Lock Ultra'].activate_latchbutton",
+            "options.deviceConfig['Lock Ultra'].connectionType",
+            "options.deviceConfig['Lock Ultra'].disablePlatformBLE",
+            "options.deviceConfig['Lock Ultra'].scanDuration",
+            "options.deviceConfig['Lock Ultra'].webhook",
+            "options.deviceConfig['Lock Ultra'].external",
+            "options.deviceConfig['Lock Ultra'].maxRetry",
+            "options.deviceConfig['Lock Ultra'].maxRetries",
+            "options.deviceConfig['Lock Ultra'].delayBetweenRetries",
+            "options.deviceConfig['Lock Ultra'].disableCaching",
+            "options.deviceConfig['Lock Ultra'].offline",
+            "options.deviceConfig['Lock Ultra'].history",
+            "options.deviceConfig['Lock Ultra'].firmware",
+            "options.deviceConfig['Lock Ultra'].logging",
+            "options.deviceConfig['Lock Ultra'].refreshRate",
+            "options.deviceConfig['Lock Ultra'].updateRate",
+            "options.deviceConfig['Lock Ultra'].pushRate"
+          ]
+        },
         {
           "type": "fieldset",
           "title": "Color Bulb Settings",