diff --git a/bundles/org.openhab.binding.adorne/src/main/resources/OH-INF/thing/bridge.xml b/bundles/org.openhab.binding.adorne/src/main/resources/OH-INF/thing/bridge.xml
index 0e82fe8b7de..10b7adb1279 100644
--- a/bundles/org.openhab.binding.adorne/src/main/resources/OH-INF/thing/bridge.xml
+++ b/bundles/org.openhab.binding.adorne/src/main/resources/OH-INF/thing/bridge.xml
@@ -2,11 +2,12 @@
+ xsi:schemaLocation="https://openhab.org/schemas/thing-description/v1.0.0 https://openhab.org/schemas/thing-description-1.0.0.xsd">
The Adorne Hub serves as the bridge to control Adorne switches, dimmer switches and outlets.
+ NetworkAppliance
diff --git a/bundles/org.openhab.binding.adorne/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.adorne/src/main/resources/OH-INF/thing/thing-types.xml
index 02f299343d1..9054271bb13 100644
--- a/bundles/org.openhab.binding.adorne/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.adorne/src/main/resources/OH-INF/thing/thing-types.xml
@@ -11,6 +11,7 @@
Controls an Adorne switch or outlet.
+ PowerOutlet
@@ -30,6 +31,7 @@
Controls an Adorne dimmer switch.
+ LightSource
diff --git a/bundles/org.openhab.binding.ahawastecollection/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.ahawastecollection/src/main/resources/OH-INF/thing/thing-types.xml
index 68c07f8e35f..b2d024943cd 100644
--- a/bundles/org.openhab.binding.ahawastecollection/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.ahawastecollection/src/main/resources/OH-INF/thing/thing-types.xml
@@ -7,6 +7,7 @@
aha Waste Collection Schedule from http://www.aha-region.de/abholtermine/abfuhrkalender
+ WebService
diff --git a/bundles/org.openhab.binding.airgradient/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.airgradient/src/main/resources/OH-INF/thing/thing-types.xml
index 45c554e34d7..92e641f5e83 100644
--- a/bundles/org.openhab.binding.airgradient/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.airgradient/src/main/resources/OH-INF/thing/thing-types.xml
@@ -8,6 +8,7 @@
Connection to the AirGradient Cloud API
+ WeatherService
token
@@ -36,6 +37,7 @@
Direct network connection to a local AirGradient Sensor
+ WeatherStation
diff --git a/bundles/org.openhab.binding.airparif/src/main/resources/OH-INF/thing/api.xml b/bundles/org.openhab.binding.airparif/src/main/resources/OH-INF/thing/api.xml
index 416faef5ed3..85b54d20a15 100755
--- a/bundles/org.openhab.binding.airparif/src/main/resources/OH-INF/thing/api.xml
+++ b/bundles/org.openhab.binding.airparif/src/main/resources/OH-INF/thing/api.xml
@@ -10,6 +10,7 @@
Bridge to the AirParif API Portal. In order to receive the data, you must register an account on
https://www.airparif.fr/contact and receive your API token.
+ WebService
diff --git a/bundles/org.openhab.binding.airparif/src/main/resources/OH-INF/thing/location.xml b/bundles/org.openhab.binding.airparif/src/main/resources/OH-INF/thing/location.xml
index aab4dd83b7f..267b05bf5ba 100755
--- a/bundles/org.openhab.binding.airparif/src/main/resources/OH-INF/thing/location.xml
+++ b/bundles/org.openhab.binding.airparif/src/main/resources/OH-INF/thing/location.xml
@@ -11,6 +11,7 @@
AirParif air quality report for the given location
+ WebService
diff --git a/bundles/org.openhab.binding.airq/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.airq/src/main/resources/OH-INF/thing/thing-types.xml
index 6baacb283b9..55d24456bac 100644
--- a/bundles/org.openhab.binding.airq/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.airq/src/main/resources/OH-INF/thing/thing-types.xml
@@ -8,6 +8,7 @@
Thing for air-Q Device
Sensor
+ WeatherStation
diff --git a/bundles/org.openhab.binding.airquality/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.airquality/src/main/resources/OH-INF/thing/thing-types.xml
index 8d17089129d..341b71f3450 100644
--- a/bundles/org.openhab.binding.airquality/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.airquality/src/main/resources/OH-INF/thing/thing-types.xml
@@ -6,6 +6,7 @@
+ WeatherService
@@ -22,6 +23,7 @@
+ WeatherStation
diff --git a/bundles/org.openhab.binding.airvisualnode/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.airvisualnode/src/main/resources/OH-INF/thing/thing-types.xml
index be8a5854079..aaaa4d41594 100644
--- a/bundles/org.openhab.binding.airvisualnode/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.airvisualnode/src/main/resources/OH-INF/thing/thing-types.xml
@@ -7,6 +7,7 @@
AirVisual Node air quality monitor
+ WeatherStation
diff --git a/bundles/org.openhab.binding.alarmdecoder/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.alarmdecoder/src/main/resources/OH-INF/thing/thing-types.xml
index 9cbb9aceba9..2845169ed25 100644
--- a/bundles/org.openhab.binding.alarmdecoder/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.alarmdecoder/src/main/resources/OH-INF/thing/thing-types.xml
@@ -8,6 +8,7 @@
Nu Tech Alarm Decoder IP Bridge
+ NetworkAppliance
Nu Tech Software Solutions
@@ -49,6 +50,7 @@
Nu Tech Alarm Decoder Serial Bridge
+ NetworkAppliance
Nu Tech Software Solutions
@@ -82,6 +84,8 @@
Alarm Decoder REL or EXP zone
+ AlarmDevice
+
@@ -108,6 +112,7 @@
Alarm Decoder RFX zone
+ AlarmDevice
@@ -149,6 +154,7 @@
Alarm Decoder virtual zone
+ AlarmDevice
@@ -171,6 +177,7 @@
Alarm Decoder keypad thing
+ Keypad
diff --git a/bundles/org.openhab.binding.allplay/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.allplay/src/main/resources/OH-INF/thing/thing-types.xml
index 84874e6ed22..4dbab53e072 100644
--- a/bundles/org.openhab.binding.allplay/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.allplay/src/main/resources/OH-INF/thing/thing-types.xml
@@ -7,6 +7,7 @@
+ Speaker
diff --git a/bundles/org.openhab.binding.amazondashbutton/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.amazondashbutton/src/main/resources/OH-INF/thing/thing-types.xml
index b80c5c57465..51e76db3714 100644
--- a/bundles/org.openhab.binding.amazondashbutton/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.amazondashbutton/src/main/resources/OH-INF/thing/thing-types.xml
@@ -7,6 +7,7 @@
@text/dashButtonDescription
+ Button
diff --git a/bundles/org.openhab.binding.amberelectric/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.amberelectric/src/main/resources/OH-INF/thing/thing-types.xml
index af7dea0c79e..910349a64f7 100644
--- a/bundles/org.openhab.binding.amberelectric/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.amberelectric/src/main/resources/OH-INF/thing/thing-types.xml
@@ -7,6 +7,7 @@
Amber Electric - wholesale access to power prices
+ WebService
diff --git a/bundles/org.openhab.binding.ambientweather/src/main/resources/OH-INF/thing/bridge.xml b/bundles/org.openhab.binding.ambientweather/src/main/resources/OH-INF/thing/bridge.xml
index edb6c133e4e..2630c6c9747 100644
--- a/bundles/org.openhab.binding.ambientweather/src/main/resources/OH-INF/thing/bridge.xml
+++ b/bundles/org.openhab.binding.ambientweather/src/main/resources/OH-INF/thing/bridge.xml
@@ -8,6 +8,7 @@
Represents an account at Ambient Weather (ambientweather.net)
+ WebService
diff --git a/bundles/org.openhab.binding.ambientweather/src/main/resources/OH-INF/thing/ws0265.xml b/bundles/org.openhab.binding.ambientweather/src/main/resources/OH-INF/thing/ws0265.xml
index cb9a59e3026..8f2bae62421 100644
--- a/bundles/org.openhab.binding.ambientweather/src/main/resources/OH-INF/thing/ws0265.xml
+++ b/bundles/org.openhab.binding.ambientweather/src/main/resources/OH-INF/thing/ws0265.xml
@@ -12,6 +12,7 @@
Ambient Weather Station WS-0265
+ WeatherStation
diff --git a/bundles/org.openhab.binding.ambientweather/src/main/resources/OH-INF/thing/ws0900.xml b/bundles/org.openhab.binding.ambientweather/src/main/resources/OH-INF/thing/ws0900.xml
index 9d471e0f3c4..8d9967c0aaf 100644
--- a/bundles/org.openhab.binding.ambientweather/src/main/resources/OH-INF/thing/ws0900.xml
+++ b/bundles/org.openhab.binding.ambientweather/src/main/resources/OH-INF/thing/ws0900.xml
@@ -12,6 +12,7 @@
Ambient Weather Station WS-0900-IP
+ WeatherStation
diff --git a/bundles/org.openhab.binding.ambientweather/src/main/resources/OH-INF/thing/ws1400ip.xml b/bundles/org.openhab.binding.ambientweather/src/main/resources/OH-INF/thing/ws1400ip.xml
index 6dfa79d56ef..3b52941d4c0 100644
--- a/bundles/org.openhab.binding.ambientweather/src/main/resources/OH-INF/thing/ws1400ip.xml
+++ b/bundles/org.openhab.binding.ambientweather/src/main/resources/OH-INF/thing/ws1400ip.xml
@@ -12,6 +12,7 @@
Ambient Weather Station WS-1400-IP
+ WeatherStation
diff --git a/bundles/org.openhab.binding.ambientweather/src/main/resources/OH-INF/thing/ws2902a.xml b/bundles/org.openhab.binding.ambientweather/src/main/resources/OH-INF/thing/ws2902a.xml
index 29d33f92362..72d4a1eabdd 100644
--- a/bundles/org.openhab.binding.ambientweather/src/main/resources/OH-INF/thing/ws2902a.xml
+++ b/bundles/org.openhab.binding.ambientweather/src/main/resources/OH-INF/thing/ws2902a.xml
@@ -12,6 +12,7 @@
Ambient Weather Station WS-2902A
+ WeatherStation
diff --git a/bundles/org.openhab.binding.ambientweather/src/main/resources/OH-INF/thing/ws2902b.xml b/bundles/org.openhab.binding.ambientweather/src/main/resources/OH-INF/thing/ws2902b.xml
index 06b95954501..fec5deac593 100644
--- a/bundles/org.openhab.binding.ambientweather/src/main/resources/OH-INF/thing/ws2902b.xml
+++ b/bundles/org.openhab.binding.ambientweather/src/main/resources/OH-INF/thing/ws2902b.xml
@@ -12,6 +12,7 @@
Ambient Weather Station WS-2902B
+ WeatherStation
diff --git a/bundles/org.openhab.binding.ambientweather/src/main/resources/OH-INF/thing/ws8482.xml b/bundles/org.openhab.binding.ambientweather/src/main/resources/OH-INF/thing/ws8482.xml
index b27e8558ca8..0f1423131a9 100644
--- a/bundles/org.openhab.binding.ambientweather/src/main/resources/OH-INF/thing/ws8482.xml
+++ b/bundles/org.openhab.binding.ambientweather/src/main/resources/OH-INF/thing/ws8482.xml
@@ -12,6 +12,7 @@
Ambient Weather Station WS-8482
+ WeatherStation
diff --git a/bundles/org.openhab.binding.amplipi/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.amplipi/src/main/resources/OH-INF/thing/thing-types.xml
index c6fc68fd657..f51dde60113 100644
--- a/bundles/org.openhab.binding.amplipi/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.amplipi/src/main/resources/OH-INF/thing/thing-types.xml
@@ -7,6 +7,7 @@
An AmpliPi controller
+ AudioVisual
@@ -49,6 +50,7 @@
A zone of the AmpliPi system
+ AudioVisual
@@ -82,6 +84,7 @@
A group of the AmpliPi system
+ AudioVisual
diff --git a/bundles/org.openhab.binding.androidtv/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.androidtv/src/main/resources/OH-INF/thing/thing-types.xml
index 9fd3c643df1..1688b5e729e 100644
--- a/bundles/org.openhab.binding.androidtv/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.androidtv/src/main/resources/OH-INF/thing/thing-types.xml
@@ -8,7 +8,7 @@
Nvidia ShieldTV
-
+ Television
@@ -98,7 +98,7 @@
GoogleTV
-
+ Television
@@ -170,7 +170,7 @@
A Philips TV device
-
+ Television
diff --git a/bundles/org.openhab.binding.anthem/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.anthem/src/main/resources/OH-INF/thing/thing-types.xml
index 07cac9ed150..bd79a374d4a 100644
--- a/bundles/org.openhab.binding.anthem/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.anthem/src/main/resources/OH-INF/thing/thing-types.xml
@@ -7,7 +7,7 @@
Thing for Anthem AV processor
-
+ AudioVisual
diff --git a/bundles/org.openhab.binding.argoclima/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.argoclima/src/main/resources/OH-INF/thing/thing-types.xml
index 92eaceba175..bc4ca524317 100644
--- a/bundles/org.openhab.binding.argoclima/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.argoclima/src/main/resources/OH-INF/thing/thing-types.xml
@@ -11,6 +11,7 @@
Independent mode - does not require Internet connectivity (see connectionMode setting for more options).
]]>
HVAC
+ AirConditioner
@@ -182,6 +183,7 @@
Requires Internet connectivity for both openHAB and the HVAC device separately.
]]>
HVAC
+ AirConditioner
diff --git a/bundles/org.openhab.binding.asuswrt/src/main/resources/OH-INF/thing/client.xml b/bundles/org.openhab.binding.asuswrt/src/main/resources/OH-INF/thing/client.xml
index b492346aa99..ca385f6e20b 100644
--- a/bundles/org.openhab.binding.asuswrt/src/main/resources/OH-INF/thing/client.xml
+++ b/bundles/org.openhab.binding.asuswrt/src/main/resources/OH-INF/thing/client.xml
@@ -12,6 +12,8 @@
Client connected to Asuswrt-Router
+ NetworkAppliance
+
diff --git a/bundles/org.openhab.binding.asuswrt/src/main/resources/OH-INF/thing/interface.xml b/bundles/org.openhab.binding.asuswrt/src/main/resources/OH-INF/thing/interface.xml
index 42b65adec2c..86ea29fc216 100644
--- a/bundles/org.openhab.binding.asuswrt/src/main/resources/OH-INF/thing/interface.xml
+++ b/bundles/org.openhab.binding.asuswrt/src/main/resources/OH-INF/thing/interface.xml
@@ -12,6 +12,8 @@
Interface of router
+ Router
+
diff --git a/bundles/org.openhab.binding.atlona/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.atlona/src/main/resources/OH-INF/thing/thing-types.xml
index cf9f7b90fdc..da53f3ba5cc 100644
--- a/bundles/org.openhab.binding.atlona/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.atlona/src/main/resources/OH-INF/thing/thing-types.xml
@@ -8,6 +8,7 @@
Atlona PRO3 4x4 HDBaseT Matrix (Model AT-UHD-PRO3-44M)
+ AudioVisual
@@ -56,6 +57,7 @@
Atlona PRO3 6x6 HDBaseT Matrix (Model AT-UHD-PRO3-66M)
+ AudioVisual
@@ -124,6 +126,7 @@
Atlona PRO3 8x8 HDBaseT Matrix (Model AT-UHD-PRO3-66M)
+ AudioVisual
@@ -208,6 +211,7 @@
Atlona PRO3 16x16 HDBaseT Matrix (Model AT-UHD-PRO3-1616M)
+ AudioVisual
@@ -364,6 +368,7 @@
Atlona PRO3 HD 4x4 HDBaseT Matrix (Model AT-PRO3HD44M)
+ AudioVisual
@@ -392,6 +397,7 @@
Atlona PRO3 HD 6x6 HDBaseT Matrix (Model AT-PRO3HD66M)
+ AudioVisual
diff --git a/bundles/org.openhab.binding.autelis/src/main/resources/OH-INF/thing/jandy.xml b/bundles/org.openhab.binding.autelis/src/main/resources/OH-INF/thing/jandy.xml
index 64ef2123e2f..db79137b7e9 100644
--- a/bundles/org.openhab.binding.autelis/src/main/resources/OH-INF/thing/jandy.xml
+++ b/bundles/org.openhab.binding.autelis/src/main/resources/OH-INF/thing/jandy.xml
@@ -6,6 +6,7 @@
A Jandy pool control thing represents an Autelis pool controller for Jandy systems
+ SwimmingPool
diff --git a/bundles/org.openhab.binding.autelis/src/main/resources/OH-INF/thing/pentair.xml b/bundles/org.openhab.binding.autelis/src/main/resources/OH-INF/thing/pentair.xml
index 76720197cf6..48489df98cb 100644
--- a/bundles/org.openhab.binding.autelis/src/main/resources/OH-INF/thing/pentair.xml
+++ b/bundles/org.openhab.binding.autelis/src/main/resources/OH-INF/thing/pentair.xml
@@ -6,6 +6,7 @@
A Pentair pool control thing represents an Autelis pool controller for Pentair systems
+ SwimmingPool
diff --git a/bundles/org.openhab.binding.automower/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.automower/src/main/resources/OH-INF/thing/thing-types.xml
index df01015c878..8888c55fbd2 100644
--- a/bundles/org.openhab.binding.automower/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.automower/src/main/resources/OH-INF/thing/thing-types.xml
@@ -8,6 +8,8 @@
The bridge to communicate with the Automower Connect API
+ WebService
+
@@ -41,6 +43,7 @@
An automatic lawn mower
+ LawnMower
diff --git a/bundles/org.openhab.binding.avmfritz/src/main/resources/OH-INF/thing/bridge-types.xml b/bundles/org.openhab.binding.avmfritz/src/main/resources/OH-INF/thing/bridge-types.xml
index f7583a45b8e..d5586994501 100644
--- a/bundles/org.openhab.binding.avmfritz/src/main/resources/OH-INF/thing/bridge-types.xml
+++ b/bundles/org.openhab.binding.avmfritz/src/main/resources/OH-INF/thing/bridge-types.xml
@@ -8,7 +8,7 @@
A FRITZ!Box router.
-
+ Router
diff --git a/bundles/org.openhab.binding.avmfritz/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.avmfritz/src/main/resources/OH-INF/thing/thing-types.xml
index d34f540250a..3e81e2bfad5 100644
--- a/bundles/org.openhab.binding.avmfritz/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.avmfritz/src/main/resources/OH-INF/thing/thing-types.xml
@@ -12,7 +12,7 @@
FRITZ!DECT500 color light.
-
+ LightSource
@@ -36,7 +36,7 @@
FRITZ!DECT400 switch.
-
+ Button
@@ -60,7 +60,7 @@
FRITZ!DECT440 switch.
-
+ Button
@@ -91,7 +91,7 @@
Comet DECT heating thermostat.
-
+ Thermostat
@@ -127,7 +127,7 @@
FRITZ!DECT 302 heating thermostat.
-
+ Thermostat
@@ -163,7 +163,7 @@
FRITZ!DECT 301 heating thermostat.
-
+ Thermostat
@@ -199,7 +199,7 @@
FRITZ!DECT 300 heating thermostat.
-
+ Thermostat
@@ -235,7 +235,7 @@
FRITZ!DECT210 switchable outlet.
-
+ PowerOutlet
@@ -269,7 +269,7 @@
FRITZ!DECT200 switchable outlet.
-
+ PowerOutlet
@@ -304,7 +304,7 @@
FRITZ!Powerline 546E with switchable outlet.
-
+ PowerOutlet
@@ -355,7 +355,7 @@
HAN-FUN contact (e.g. SmartHome Tür-/Fensterkontakt or SmartHome Bewegungsmelder).
-
+ ContactSensor
@@ -373,7 +373,7 @@
HAN-FUN switch (e.g. SmartHome Wandtaster).
-
+ WallSwitch
@@ -395,7 +395,7 @@
HAN-FUN blinds (e.g. RolloTron DECT 1213)
-
+ Blinds
@@ -414,7 +414,7 @@
HAN-FUN color light (e.g SmartHome LED-Lampe E27 (farbig)).
-
+ LightSource
@@ -438,6 +438,7 @@
HAN-FUN dimmable light (e.g. SmartHome LED-Lampe E27 (warmweiß)).
+ LightSource
@@ -456,7 +457,7 @@
HAN-FUN switchable device (e.g. SmartHome Zwischenstecker innen / SmartHome Zwischenstecker außen)
-
+ PowerOutlet
@@ -475,7 +476,7 @@
Group for heating thermostats.
-
+ Thermostat
@@ -510,7 +511,7 @@
Group for switchable outlets and power meters.
-
+ PowerOutlet
diff --git a/bundles/org.openhab.binding.awattar/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.awattar/src/main/resources/OH-INF/thing/thing-types.xml
index 47fcb5a1294..59ce400ecf4 100644
--- a/bundles/org.openhab.binding.awattar/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.awattar/src/main/resources/OH-INF/thing/thing-types.xml
@@ -7,6 +7,7 @@
Provides price data from the aWATTar API.
+ WebService
@@ -41,6 +42,7 @@
Prices for one kilowatt-hour at the given hour in Cent
+ WebService
@@ -256,11 +258,10 @@
-
-
+
Evaluates the lowest price period for the given settings
+ WebService
+
diff --git a/bundles/org.openhab.binding.bigassfan/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.bigassfan/src/main/resources/OH-INF/thing/thing-types.xml
index 5f8a81f8c0e..939805c6cfe 100644
--- a/bundles/org.openhab.binding.bigassfan/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.bigassfan/src/main/resources/OH-INF/thing/thing-types.xml
@@ -8,6 +8,7 @@
Big Ass Fan
+ Fan
diff --git a/bundles/org.openhab.binding.bluetooth.airthings/src/main/resources/OH-INF/thing/airthings.xml b/bundles/org.openhab.binding.bluetooth.airthings/src/main/resources/OH-INF/thing/airthings.xml
index f90f38b13f7..39caab71704 100644
--- a/bundles/org.openhab.binding.bluetooth.airthings/src/main/resources/OH-INF/thing/airthings.xml
+++ b/bundles/org.openhab.binding.bluetooth.airthings/src/main/resources/OH-INF/thing/airthings.xml
@@ -13,6 +13,7 @@
Indoor air quality monitor
+ AirQualitySensor
diff --git a/bundles/org.openhab.binding.bluetooth.am43/src/main/resources/OH-INF/thing/am43.xml b/bundles/org.openhab.binding.bluetooth.am43/src/main/resources/OH-INF/thing/am43.xml
index bcd4831421d..a34b3586076 100644
--- a/bundles/org.openhab.binding.bluetooth.am43/src/main/resources/OH-INF/thing/am43.xml
+++ b/bundles/org.openhab.binding.bluetooth.am43/src/main/resources/OH-INF/thing/am43.xml
@@ -14,6 +14,7 @@
An AM43 Blind Drive Motor
Blinds
+ Blinds
diff --git a/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/resources/OH-INF/thing/daikinmadoka.xml b/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/resources/OH-INF/thing/daikinmadoka.xml
index 2bb375f4de4..d1a49fea957 100644
--- a/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/resources/OH-INF/thing/daikinmadoka.xml
+++ b/bundles/org.openhab.binding.bluetooth.daikinmadoka/src/main/resources/OH-INF/thing/daikinmadoka.xml
@@ -11,6 +11,7 @@
A Daikin Madoka BRC1H Thermostat (BLE)
+ Thermostat
diff --git a/bundles/org.openhab.binding.bluetooth.enoceanble/src/main/resources/OH-INF/thing/enoceanble.xml b/bundles/org.openhab.binding.bluetooth.enoceanble/src/main/resources/OH-INF/thing/enoceanble.xml
index 6f353cdb39c..1d518610f51 100644
--- a/bundles/org.openhab.binding.bluetooth.enoceanble/src/main/resources/OH-INF/thing/enoceanble.xml
+++ b/bundles/org.openhab.binding.bluetooth.enoceanble/src/main/resources/OH-INF/thing/enoceanble.xml
@@ -13,6 +13,8 @@
An Enocean BLE Rocker (PTM 215B)
+ WallSwitch
+
diff --git a/bundles/org.openhab.binding.bluetooth.govee/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.bluetooth.govee/src/main/resources/OH-INF/thing/thing-types.xml
index 302deaaf0e0..1f37dbc5659 100644
--- a/bundles/org.openhab.binding.bluetooth.govee/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.bluetooth.govee/src/main/resources/OH-INF/thing/thing-types.xml
@@ -14,7 +14,7 @@
Govee Thermo-Hygrometer
-
+ Sensor
@@ -66,7 +66,7 @@
Govee Thermo-Hygrometer w/ Warning Alarms
-
+ Sensor
diff --git a/bundles/org.openhab.binding.bluetooth.grundfosalpha/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.bluetooth.grundfosalpha/src/main/resources/OH-INF/thing/thing-types.xml
index c6771f80cbf..f1d178e2fb2 100644
--- a/bundles/org.openhab.binding.bluetooth.grundfosalpha/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.bluetooth.grundfosalpha/src/main/resources/OH-INF/thing/thing-types.xml
@@ -50,6 +50,7 @@
A Grundfos Alpha Reader MI401
Pump
+ Pump
@@ -83,6 +84,7 @@
A Grundfos Alpha3 circulator pump
Pump
+ Pump
diff --git a/bundles/org.openhab.binding.bluetooth.radoneye/src/main/resources/OH-INF/thing/radoneye.xml b/bundles/org.openhab.binding.bluetooth.radoneye/src/main/resources/OH-INF/thing/radoneye.xml
index 7f0c48617ae..831d3e644c1 100644
--- a/bundles/org.openhab.binding.bluetooth.radoneye/src/main/resources/OH-INF/thing/radoneye.xml
+++ b/bundles/org.openhab.binding.bluetooth.radoneye/src/main/resources/OH-INF/thing/radoneye.xml
@@ -13,6 +13,7 @@
Indoor radon monitor
+ AirQualitySensor
diff --git a/bundles/org.openhab.binding.bluetooth.ruuvitag/src/main/resources/OH-INF/thing/ruuvitag.xml b/bundles/org.openhab.binding.bluetooth.ruuvitag/src/main/resources/OH-INF/thing/ruuvitag.xml
index ed0a4c4e7f0..b39f1ddd2c6 100644
--- a/bundles/org.openhab.binding.bluetooth.ruuvitag/src/main/resources/OH-INF/thing/ruuvitag.xml
+++ b/bundles/org.openhab.binding.bluetooth.ruuvitag/src/main/resources/OH-INF/thing/ruuvitag.xml
@@ -13,7 +13,7 @@
A RuuviTag SmartBeacon
-
+ Tracker
diff --git a/bundles/org.openhab.binding.bondhome/src/main/resources/OH-INF/thing/Bridge.xml b/bundles/org.openhab.binding.bondhome/src/main/resources/OH-INF/thing/Bridge.xml
index 55f83163fc5..d81a63458c1 100644
--- a/bundles/org.openhab.binding.bondhome/src/main/resources/OH-INF/thing/Bridge.xml
+++ b/bundles/org.openhab.binding.bondhome/src/main/resources/OH-INF/thing/Bridge.xml
@@ -8,7 +8,7 @@
The RF/IR/Wifi Bridge
-
+ NetworkAppliance
serialNumber
diff --git a/bundles/org.openhab.binding.bondhome/src/main/resources/OH-INF/thing/CeilingFan.xml b/bundles/org.openhab.binding.bondhome/src/main/resources/OH-INF/thing/CeilingFan.xml
index 158168ffb6b..90a4fb0aa61 100644
--- a/bundles/org.openhab.binding.bondhome/src/main/resources/OH-INF/thing/CeilingFan.xml
+++ b/bundles/org.openhab.binding.bondhome/src/main/resources/OH-INF/thing/CeilingFan.xml
@@ -12,7 +12,7 @@
An RF or IR remote controlled ceiling fan with or without a light
-
+ CeilingFan
diff --git a/bundles/org.openhab.binding.bondhome/src/main/resources/OH-INF/thing/Fireplace.xml b/bundles/org.openhab.binding.bondhome/src/main/resources/OH-INF/thing/Fireplace.xml
index 0821a474e54..75b15850349 100644
--- a/bundles/org.openhab.binding.bondhome/src/main/resources/OH-INF/thing/Fireplace.xml
+++ b/bundles/org.openhab.binding.bondhome/src/main/resources/OH-INF/thing/Fireplace.xml
@@ -12,7 +12,7 @@
An RF or IR remote controlled fireplace with or without a fan
-
+ Furnace
diff --git a/bundles/org.openhab.binding.bondhome/src/main/resources/OH-INF/thing/Light.xml b/bundles/org.openhab.binding.bondhome/src/main/resources/OH-INF/thing/Light.xml
index aff49eec0ae..b01dc702b52 100644
--- a/bundles/org.openhab.binding.bondhome/src/main/resources/OH-INF/thing/Light.xml
+++ b/bundles/org.openhab.binding.bondhome/src/main/resources/OH-INF/thing/Light.xml
@@ -12,7 +12,7 @@
An RF or IR remote controlled light
-
+ LightSource
diff --git a/bundles/org.openhab.binding.bondhome/src/main/resources/OH-INF/thing/MotorizedShades.xml b/bundles/org.openhab.binding.bondhome/src/main/resources/OH-INF/thing/MotorizedShades.xml
index 6f3728b6c70..2541959c0d2 100644
--- a/bundles/org.openhab.binding.bondhome/src/main/resources/OH-INF/thing/MotorizedShades.xml
+++ b/bundles/org.openhab.binding.bondhome/src/main/resources/OH-INF/thing/MotorizedShades.xml
@@ -12,7 +12,7 @@
An RF or IR remote controlled motorized shade
-
+ Blinds
diff --git a/bundles/org.openhab.binding.boschindego/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.boschindego/src/main/resources/OH-INF/thing/thing-types.xml
index c5e58304735..cbf2177b89f 100644
--- a/bundles/org.openhab.binding.boschindego/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.boschindego/src/main/resources/OH-INF/thing/thing-types.xml
@@ -16,7 +16,7 @@
Indego which supports the connect feature.
-
+ LawnMower
diff --git a/bundles/org.openhab.binding.boschshc/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.boschshc/src/main/resources/OH-INF/thing/thing-types.xml
index b6463ccf2cf..446371cf0cc 100644
--- a/bundles/org.openhab.binding.boschshc/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.boschshc/src/main/resources/OH-INF/thing/thing-types.xml
@@ -8,6 +8,7 @@
The Bosch Smart Home Bridge representing the Bosch Smart Home Controller.
+ NetworkAppliance
@@ -32,6 +33,7 @@
A simple light control.
+ WallSwitch
@@ -50,6 +52,7 @@
A compact smart plug with energy monitoring capabilities.
+ PowerOutlet
@@ -68,6 +71,7 @@
The Twinguard smoke detector warns you in case of fire and constantly monitors the air.
+ Sensor
@@ -94,6 +98,7 @@
Detects open windows and doors.
+ ContactSensor
@@ -112,6 +117,7 @@
Detects open windows and doors and features an additional button.
+ ContactSensor
@@ -132,6 +138,7 @@
Detects open windows and doors, provides a configurable button and a vibration sensor.
+ Sensor
@@ -156,6 +163,7 @@
Detects every movement through an intelligent combination of passive infra-red technology and an
additional temperature sensor.
+ MotionDetector
@@ -179,6 +187,8 @@
Control of your shutter to take any position you desire.
+ Blinds
+
@@ -195,6 +205,7 @@
Second generation shutter control.
+ Blinds
@@ -215,6 +226,7 @@
Advanced light control with two switch circuits.
+ WallSwitch
@@ -237,6 +249,7 @@
Radiator thermostat
+ Thermostat
@@ -259,6 +272,7 @@
This is a virtual device which is automatically created for all rooms that have
thermostats in it.
+ Thermostat
@@ -276,6 +290,7 @@
Display of the current room temperature as well as the relative humidity in the room.
+ Thermostat
@@ -295,6 +310,7 @@
Indoor security camera with 360° view and motion detection.
+ Camera
@@ -312,6 +328,7 @@
Outdoor security camera with motion detection and light.
+ Camera
@@ -329,6 +346,7 @@
Allows to retrieve and control the state of the intrusion detection alarm system.
+ AlarmSystem
@@ -349,6 +367,7 @@
A smart bulb connected via Zigbee.
+ Lightbulb
@@ -367,6 +386,7 @@
The smoke detector warns you in case of fire.
+ SmokeDetector
@@ -404,6 +424,7 @@
Universally configurable switch with two buttons.
+ ControlDevice
@@ -422,6 +443,7 @@
Universally configurable switch with four buttons.
+ ControlDevice
@@ -440,6 +462,7 @@
The smoke detector warns you in case of fire.
+ SmokeDetector
@@ -463,6 +486,7 @@
Smart dimmer capable of controlling any dimmable lamp.
+ LightSource
@@ -481,6 +505,7 @@
Smart sensor to detect water leakage.
+ LeakSensor
@@ -503,6 +528,7 @@
The smart switching relay is your universal all-rounder for smart switching.
+ ControlDevice
diff --git a/bundles/org.openhab.binding.bosesoundtouch/src/main/resources/OH-INF/thing/SoundTouch10.xml b/bundles/org.openhab.binding.bosesoundtouch/src/main/resources/OH-INF/thing/SoundTouch10.xml
index 6bf9414780f..44629282546 100644
--- a/bundles/org.openhab.binding.bosesoundtouch/src/main/resources/OH-INF/thing/SoundTouch10.xml
+++ b/bundles/org.openhab.binding.bosesoundtouch/src/main/resources/OH-INF/thing/SoundTouch10.xml
@@ -7,6 +7,7 @@
Bose SoundTouch 10 Speaker
+ Speaker
diff --git a/bundles/org.openhab.binding.bosesoundtouch/src/main/resources/OH-INF/thing/SoundTouch20.xml b/bundles/org.openhab.binding.bosesoundtouch/src/main/resources/OH-INF/thing/SoundTouch20.xml
index 61fd4c6c20d..3eda6340bcc 100644
--- a/bundles/org.openhab.binding.bosesoundtouch/src/main/resources/OH-INF/thing/SoundTouch20.xml
+++ b/bundles/org.openhab.binding.bosesoundtouch/src/main/resources/OH-INF/thing/SoundTouch20.xml
@@ -7,6 +7,7 @@
Bose SoundTouch 20 Speaker
+ Speaker
diff --git a/bundles/org.openhab.binding.bosesoundtouch/src/main/resources/OH-INF/thing/SoundTouch30.xml b/bundles/org.openhab.binding.bosesoundtouch/src/main/resources/OH-INF/thing/SoundTouch30.xml
index 48f6985c5d7..2070c607b3e 100644
--- a/bundles/org.openhab.binding.bosesoundtouch/src/main/resources/OH-INF/thing/SoundTouch30.xml
+++ b/bundles/org.openhab.binding.bosesoundtouch/src/main/resources/OH-INF/thing/SoundTouch30.xml
@@ -7,6 +7,7 @@
Bose SoundTouch 30 Speaker
+ Speaker
diff --git a/bundles/org.openhab.binding.bosesoundtouch/src/main/resources/OH-INF/thing/SoundTouch300.xml b/bundles/org.openhab.binding.bosesoundtouch/src/main/resources/OH-INF/thing/SoundTouch300.xml
index 461743833f5..add244e25d4 100644
--- a/bundles/org.openhab.binding.bosesoundtouch/src/main/resources/OH-INF/thing/SoundTouch300.xml
+++ b/bundles/org.openhab.binding.bosesoundtouch/src/main/resources/OH-INF/thing/SoundTouch300.xml
@@ -7,6 +7,7 @@
Bose SoundTouch 300 Speaker
+ Speaker
diff --git a/bundles/org.openhab.binding.bosesoundtouch/src/main/resources/OH-INF/thing/SoundTouchSA5Amplifier.xml b/bundles/org.openhab.binding.bosesoundtouch/src/main/resources/OH-INF/thing/SoundTouchSA5Amplifier.xml
index 26973335e00..6c61f1edc25 100644
--- a/bundles/org.openhab.binding.bosesoundtouch/src/main/resources/OH-INF/thing/SoundTouchSA5Amplifier.xml
+++ b/bundles/org.openhab.binding.bosesoundtouch/src/main/resources/OH-INF/thing/SoundTouchSA5Amplifier.xml
@@ -7,6 +7,7 @@
A Bose SoundTouch SA-5 Amplifier
+ AudioVisual
diff --git a/bundles/org.openhab.binding.bosesoundtouch/src/main/resources/OH-INF/thing/SoundTouchWirelessLinkAdapter.xml b/bundles/org.openhab.binding.bosesoundtouch/src/main/resources/OH-INF/thing/SoundTouchWirelessLinkAdapter.xml
index a101b140072..dd595b73e24 100644
--- a/bundles/org.openhab.binding.bosesoundtouch/src/main/resources/OH-INF/thing/SoundTouchWirelessLinkAdapter.xml
+++ b/bundles/org.openhab.binding.bosesoundtouch/src/main/resources/OH-INF/thing/SoundTouchWirelessLinkAdapter.xml
@@ -7,6 +7,7 @@
Bose SoundTouch Wireless Link Adapter
+ AudioVisual
diff --git a/bundles/org.openhab.binding.bosesoundtouch/src/main/resources/OH-INF/thing/UnknownSoundTouch.xml b/bundles/org.openhab.binding.bosesoundtouch/src/main/resources/OH-INF/thing/UnknownSoundTouch.xml
index de403aa9ab1..ed1f2686552 100644
--- a/bundles/org.openhab.binding.bosesoundtouch/src/main/resources/OH-INF/thing/UnknownSoundTouch.xml
+++ b/bundles/org.openhab.binding.bosesoundtouch/src/main/resources/OH-INF/thing/UnknownSoundTouch.xml
@@ -6,7 +6,8 @@
- Aan unknown Bose SoundTouch Device
+ An unknown Bose SoundTouch Device
+ AudioVisual
diff --git a/bundles/org.openhab.binding.bosesoundtouch/src/main/resources/OH-INF/thing/WaveSoundTouchMusicSystemIV.xml b/bundles/org.openhab.binding.bosesoundtouch/src/main/resources/OH-INF/thing/WaveSoundTouchMusicSystemIV.xml
index 8d96187fb56..d1670551b1f 100644
--- a/bundles/org.openhab.binding.bosesoundtouch/src/main/resources/OH-INF/thing/WaveSoundTouchMusicSystemIV.xml
+++ b/bundles/org.openhab.binding.bosesoundtouch/src/main/resources/OH-INF/thing/WaveSoundTouchMusicSystemIV.xml
@@ -7,6 +7,7 @@
A Bose Wave SoundTouch Music System IV
+ AudioVisual
diff --git a/bundles/org.openhab.binding.broadlink/src/main/resources/OH-INF/thing/a-types.xml b/bundles/org.openhab.binding.broadlink/src/main/resources/OH-INF/thing/a-types.xml
index d9e1622859a..11c717c6550 100644
--- a/bundles/org.openhab.binding.broadlink/src/main/resources/OH-INF/thing/a-types.xml
+++ b/bundles/org.openhab.binding.broadlink/src/main/resources/OH-INF/thing/a-types.xml
@@ -8,6 +8,7 @@
The Broadlink A1 is a multi sensor that can can detect temperature, humidity, illumination, background
noise and air quality.
+ Sensor
diff --git a/bundles/org.openhab.binding.broadlink/src/main/resources/OH-INF/thing/mp-types.xml b/bundles/org.openhab.binding.broadlink/src/main/resources/OH-INF/thing/mp-types.xml
index 1c03f28f77c..5f60a96320b 100644
--- a/bundles/org.openhab.binding.broadlink/src/main/resources/OH-INF/thing/mp-types.xml
+++ b/bundles/org.openhab.binding.broadlink/src/main/resources/OH-INF/thing/mp-types.xml
@@ -7,6 +7,7 @@
The Broadlink MP1 Smart Home Wifi Plug Power Strip 4 Ports Individual Wireless Remote Control.
+ PowerOutlet
@@ -27,6 +28,7 @@
The Broadlink MP1 1K3S2U Smart Home Wifi Plug Power Strip 3 AC, 2 USB Individual Wireless Remote Control.
+ ControlDevice
@@ -48,6 +50,7 @@
The Broadlink MP2 is a smart socket with Wi-Fi connectivity. It does not support switching individual
ports.
+ ControlDevice
diff --git a/bundles/org.openhab.binding.broadlink/src/main/resources/OH-INF/thing/rm-types.xml b/bundles/org.openhab.binding.broadlink/src/main/resources/OH-INF/thing/rm-types.xml
index 67370d701ba..db2e34ea410 100644
--- a/bundles/org.openhab.binding.broadlink/src/main/resources/OH-INF/thing/rm-types.xml
+++ b/bundles/org.openhab.binding.broadlink/src/main/resources/OH-INF/thing/rm-types.xml
@@ -7,6 +7,7 @@
The Broadlink RM Pro is a Wi-Fi IR transmitter with a temperature sensor.
+ RemoteControl
@@ -18,6 +19,7 @@
The Broadlink RM 3/Mini is a Wi-Fi IR transmitter.
+ RemoteControl
@@ -28,6 +30,7 @@
The Broadlink RM 3/Mini is a Wi-Fi IR transmitter running v44057 firmware.
+ RemoteControl
@@ -38,6 +41,7 @@
The Broadlink RM 4 Mini is a Wi-Fi IR transmitter with temperature and humidity sensors.
+ RemoteControl
@@ -50,6 +54,7 @@
The Broadlink RM 4 Pro is a Wi-Fi IR and RF transmitter with temperature and humidity sensors.
+ RemoteControl
diff --git a/bundles/org.openhab.binding.broadlink/src/main/resources/OH-INF/thing/sp-types.xml b/bundles/org.openhab.binding.broadlink/src/main/resources/OH-INF/thing/sp-types.xml
index 36d23dbf648..a790594edd4 100644
--- a/bundles/org.openhab.binding.broadlink/src/main/resources/OH-INF/thing/sp-types.xml
+++ b/bundles/org.openhab.binding.broadlink/src/main/resources/OH-INF/thing/sp-types.xml
@@ -7,6 +7,7 @@
The Broadlink SP1 is a Wi-Fi smart socket.
+ PowerOutlet
@@ -16,6 +17,7 @@
The Broadlink SP2 is a Wi-Fi smart socket.
+ PowerOutlet
@@ -25,6 +27,7 @@
The Broadlink SP2-s is a Wi-Fi smart socket with power consumption measurement.
+ PowerOutlet
@@ -35,6 +38,7 @@
The Broadlink SP3 is a Wi-Fi smart socket with night light. The SP mini 3 omits the night light.
+ PowerOutlet
@@ -47,6 +51,7 @@
The Broadlink SP3-s is a Wi-Fi smart socket with power consumption measurement
+ PowerOutlet
diff --git a/bundles/org.openhab.binding.broadlinkthermostat/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.broadlinkthermostat/src/main/resources/OH-INF/thing/thing-types.xml
index 69ce7865125..5a473a0cbf6 100644
--- a/bundles/org.openhab.binding.broadlinkthermostat/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.broadlinkthermostat/src/main/resources/OH-INF/thing/thing-types.xml
@@ -8,7 +8,7 @@
A heating device thermostat
-
+ Thermostat
@@ -29,7 +29,7 @@
A heating device thermostat
-
+ Thermostat
@@ -50,6 +50,7 @@
A universal infrared remote
+ RemoteControl
diff --git a/bundles/org.openhab.binding.bsblan/src/main/resources/OH-INF/thing/bridge.xml b/bundles/org.openhab.binding.bsblan/src/main/resources/OH-INF/thing/bridge.xml
index 73b6aa29e60..d984e38f9ae 100644
--- a/bundles/org.openhab.binding.bsblan/src/main/resources/OH-INF/thing/bridge.xml
+++ b/bundles/org.openhab.binding.bsblan/src/main/resources/OH-INF/thing/bridge.xml
@@ -7,6 +7,7 @@
A bridge to connect a BSB-LAN device
+ NetworkAppliance
diff --git a/bundles/org.openhab.binding.bticinosmarther/src/main/resources/OH-INF/thing/bridge-types.xml b/bundles/org.openhab.binding.bticinosmarther/src/main/resources/OH-INF/thing/bridge-types.xml
index f45ad8f5016..ee84e4b2754 100644
--- a/bundles/org.openhab.binding.bticinosmarther/src/main/resources/OH-INF/thing/bridge-types.xml
+++ b/bundles/org.openhab.binding.bticinosmarther/src/main/resources/OH-INF/thing/bridge-types.xml
@@ -36,6 +36,7 @@
]]>
+ NetworkAppliance
diff --git a/bundles/org.openhab.binding.bticinosmarther/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.bticinosmarther/src/main/resources/OH-INF/thing/thing-types.xml
index 3c38a460563..f55876ca6c9 100644
--- a/bundles/org.openhab.binding.bticinosmarther/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.bticinosmarther/src/main/resources/OH-INF/thing/thing-types.xml
@@ -12,6 +12,7 @@
This thing represents a BTicino Smarther chronothermostat module.
+ Thermostat
diff --git a/bundles/org.openhab.binding.buienradar/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.buienradar/src/main/resources/OH-INF/thing/thing-types.xml
index 2b4f2b6133b..83b6e3242de 100644
--- a/bundles/org.openhab.binding.buienradar/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.buienradar/src/main/resources/OH-INF/thing/thing-types.xml
@@ -10,6 +10,8 @@
two hours, in 5 minute increments using
the buienradar.nl webservice.
+ WeatherService
+
diff --git a/bundles/org.openhab.binding.caddx/src/main/resources/OH-INF/thing/bridge.xml b/bundles/org.openhab.binding.caddx/src/main/resources/OH-INF/thing/bridge.xml
index 0d353f670c4..0228706cb0e 100644
--- a/bundles/org.openhab.binding.caddx/src/main/resources/OH-INF/thing/bridge.xml
+++ b/bundles/org.openhab.binding.caddx/src/main/resources/OH-INF/thing/bridge.xml
@@ -7,6 +7,7 @@
This bridge represents the Caddx Serial interface.
+ NetworkAppliance
diff --git a/bundles/org.openhab.binding.caddx/src/main/resources/OH-INF/thing/keypad.xml b/bundles/org.openhab.binding.caddx/src/main/resources/OH-INF/thing/keypad.xml
index 03a19616afa..1b830066680 100644
--- a/bundles/org.openhab.binding.caddx/src/main/resources/OH-INF/thing/keypad.xml
+++ b/bundles/org.openhab.binding.caddx/src/main/resources/OH-INF/thing/keypad.xml
@@ -11,6 +11,7 @@
Represents any of the keypads of the Caddx Alarm System.
+ Keypad
diff --git a/bundles/org.openhab.binding.caddx/src/main/resources/OH-INF/thing/panel.xml b/bundles/org.openhab.binding.caddx/src/main/resources/OH-INF/thing/panel.xml
index 7cf962634c9..767f8d829b9 100644
--- a/bundles/org.openhab.binding.caddx/src/main/resources/OH-INF/thing/panel.xml
+++ b/bundles/org.openhab.binding.caddx/src/main/resources/OH-INF/thing/panel.xml
@@ -11,6 +11,7 @@
The basic representation of the Caddx Alarm System.
+ AlarmSystem
diff --git a/bundles/org.openhab.binding.caddx/src/main/resources/OH-INF/thing/zone.xml b/bundles/org.openhab.binding.caddx/src/main/resources/OH-INF/thing/zone.xml
index a83f024e1b8..2a1efcc0721 100644
--- a/bundles/org.openhab.binding.caddx/src/main/resources/OH-INF/thing/zone.xml
+++ b/bundles/org.openhab.binding.caddx/src/main/resources/OH-INF/thing/zone.xml
@@ -11,6 +11,7 @@
Represents a physical device such as a door, window, or motion sensor.
+ AlarmDevice
diff --git a/bundles/org.openhab.binding.casokitchen/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.casokitchen/src/main/resources/OH-INF/thing/thing-types.xml
index f2f85877ca6..98cb5ed862b 100644
--- a/bundles/org.openhab.binding.casokitchen/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.casokitchen/src/main/resources/OH-INF/thing/thing-types.xml
@@ -7,6 +7,7 @@
Wine cooler with 2 cooling zones
+ Refrigerator
diff --git a/bundles/org.openhab.binding.chatgpt/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.chatgpt/src/main/resources/OH-INF/thing/thing-types.xml
index 5b89027c57a..adaa0412b01 100644
--- a/bundles/org.openhab.binding.chatgpt/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.chatgpt/src/main/resources/OH-INF/thing/thing-types.xml
@@ -8,6 +8,7 @@
Account at OpenAI that is used for accessing the ChatGPT API.
+ WebService
diff --git a/bundles/org.openhab.binding.chromecast/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.chromecast/src/main/resources/OH-INF/thing/thing-types.xml
index 5c7bbf6bf1c..9e2a5c03f3e 100644
--- a/bundles/org.openhab.binding.chromecast/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.chromecast/src/main/resources/OH-INF/thing/thing-types.xml
@@ -8,6 +8,7 @@
A Google Chromecast Audio Group device
+ MediaPlayer
@@ -58,6 +59,7 @@
A Google Chromecast Audio device
+ MediaPlayer
@@ -108,6 +110,7 @@
A Google Chromecast streaming device
+ MediaPlayer
diff --git a/bundles/org.openhab.binding.cm11a/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.cm11a/src/main/resources/OH-INF/thing/thing-types.xml
index ab987a0b323..2949d75d16b 100644
--- a/bundles/org.openhab.binding.cm11a/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.cm11a/src/main/resources/OH-INF/thing/thing-types.xml
@@ -1,4 +1,3 @@
-
CM11 is a device that allows control of X10 devices for a computer.
+ NetworkAppliance
@@ -32,6 +32,7 @@
Controls dimmable loads
+ LightSource
@@ -53,6 +54,7 @@
On/off switch
+ WallSwitch
diff --git a/bundles/org.openhab.binding.comfoair/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.comfoair/src/main/resources/OH-INF/thing/thing-types.xml
index 725f497e457..fd503d509db 100644
--- a/bundles/org.openhab.binding.comfoair/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.comfoair/src/main/resources/OH-INF/thing/thing-types.xml
@@ -7,6 +7,7 @@
Provides a generic access to a ComfoAir compatible ventilation system
+ HVAC
@@ -52,6 +53,7 @@
Provides a generic access to a Zehnder WHR930 ventilation device
+ HVAC
diff --git a/bundles/org.openhab.binding.coolmasternet/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.coolmasternet/src/main/resources/OH-INF/thing/thing-types.xml
index fd59e90a977..69c0ab8fc5e 100644
--- a/bundles/org.openhab.binding.coolmasternet/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.coolmasternet/src/main/resources/OH-INF/thing/thing-types.xml
@@ -7,6 +7,7 @@
A CoolMasterNet Controller (connected to one or more HVAC systems)
+ NetworkAppliance
@@ -38,7 +39,7 @@
HVAC System connected to a controller (unique UID)
-
+ HVAC
diff --git a/bundles/org.openhab.binding.coronastats/src/main/resources/OH-INF/thing/country.xml b/bundles/org.openhab.binding.coronastats/src/main/resources/OH-INF/thing/country.xml
index de88d4f09ce..57b44eaa916 100644
--- a/bundles/org.openhab.binding.coronastats/src/main/resources/OH-INF/thing/country.xml
+++ b/bundles/org.openhab.binding.coronastats/src/main/resources/OH-INF/thing/country.xml
@@ -11,6 +11,7 @@
Corona statistics for a specific country
+ WebService
diff --git a/bundles/org.openhab.binding.coronastats/src/main/resources/OH-INF/thing/world.xml b/bundles/org.openhab.binding.coronastats/src/main/resources/OH-INF/thing/world.xml
index ef8e4bbcca1..5dcad9a5e2e 100644
--- a/bundles/org.openhab.binding.coronastats/src/main/resources/OH-INF/thing/world.xml
+++ b/bundles/org.openhab.binding.coronastats/src/main/resources/OH-INF/thing/world.xml
@@ -7,6 +7,7 @@
Bridge for accessing data from https://corona-stats.online/ website and representing world statistics.
+ NetworkAppliance
diff --git a/bundles/org.openhab.binding.dali/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.dali/src/main/resources/OH-INF/thing/thing-types.xml
index 1c13dbdfc50..5a739b40dd2 100644
--- a/bundles/org.openhab.binding.dali/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.dali/src/main/resources/OH-INF/thing/thing-types.xml
@@ -18,6 +18,8 @@
Controls a single device/ballast
+ LightSource
+
@@ -38,6 +40,7 @@
Controls a group of devices/ballasts
+ LightSource
@@ -64,6 +67,7 @@
Controls three DALI devices representing R,G,B lighting channels
+ LightSource
@@ -113,6 +117,7 @@
Controls a DT8 group of devices/ballasts
+ LightSource
diff --git a/bundles/org.openhab.binding.denonmarantz/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.denonmarantz/src/main/resources/OH-INF/thing/thing-types.xml
index 726a857a54a..6dbf1e54204 100644
--- a/bundles/org.openhab.binding.denonmarantz/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.denonmarantz/src/main/resources/OH-INF/thing/thing-types.xml
@@ -8,6 +8,7 @@
Control a Denon/Marantz AVR.
+ Receiver
diff --git a/bundles/org.openhab.binding.deutschebahn/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.deutschebahn/src/main/resources/OH-INF/thing/thing-types.xml
index 8bbcce8f12c..5d6cf5d68c5 100644
--- a/bundles/org.openhab.binding.deutschebahn/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.deutschebahn/src/main/resources/OH-INF/thing/thing-types.xml
@@ -9,6 +9,7 @@
Connection to the timetable API of Deutsche Bahn. Provides timetable data that can be displayed using the
train things.
+ WebService
@@ -51,6 +52,7 @@
Displays information about a train within the given timetable at one station.
+ WebService
diff --git a/bundles/org.openhab.binding.digiplex/src/main/resources/OH-INF/thing/area.xml b/bundles/org.openhab.binding.digiplex/src/main/resources/OH-INF/thing/area.xml
index be90d00b23f..58711aa5c90 100644
--- a/bundles/org.openhab.binding.digiplex/src/main/resources/OH-INF/thing/area.xml
+++ b/bundles/org.openhab.binding.digiplex/src/main/resources/OH-INF/thing/area.xml
@@ -10,6 +10,7 @@
Area
+ AlarmZone
diff --git a/bundles/org.openhab.binding.digiplex/src/main/resources/OH-INF/thing/zone.xml b/bundles/org.openhab.binding.digiplex/src/main/resources/OH-INF/thing/zone.xml
index e104ff0116c..d63c33e1461 100644
--- a/bundles/org.openhab.binding.digiplex/src/main/resources/OH-INF/thing/zone.xml
+++ b/bundles/org.openhab.binding.digiplex/src/main/resources/OH-INF/thing/zone.xml
@@ -10,6 +10,7 @@
Zone
+ AlarmZone
diff --git a/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/thing/dssBridge.xml b/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/thing/dssBridge.xml
index bb27064dde6..6dfcb49904e 100644
--- a/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/thing/dssBridge.xml
+++ b/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/thing/dssBridge.xml
@@ -8,6 +8,7 @@
@text/dSS_desc
+ NetworkAppliance
diff --git a/bundles/org.openhab.binding.dlinksmarthome/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.dlinksmarthome/src/main/resources/OH-INF/thing/thing-types.xml
index 8cbee61c17e..1ea7dbd0896 100644
--- a/bundles/org.openhab.binding.dlinksmarthome/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.dlinksmarthome/src/main/resources/OH-INF/thing/thing-types.xml
@@ -8,6 +8,7 @@
D-Link DCH-S150 WiFi motion sensor
+ MotionDetector
diff --git a/bundles/org.openhab.binding.dmx/src/main/resources/OH-INF/thing/artnet-bridge.xml b/bundles/org.openhab.binding.dmx/src/main/resources/OH-INF/thing/artnet-bridge.xml
index fad3cc7d8f4..129f882b461 100644
--- a/bundles/org.openhab.binding.dmx/src/main/resources/OH-INF/thing/artnet-bridge.xml
+++ b/bundles/org.openhab.binding.dmx/src/main/resources/OH-INF/thing/artnet-bridge.xml
@@ -6,6 +6,7 @@
The ArtNet bridge represents a single DMX universe connected via ArtNet, only unicast
+ NetworkAppliance
diff --git a/bundles/org.openhab.binding.dmx/src/main/resources/OH-INF/thing/chaser-thing.xml b/bundles/org.openhab.binding.dmx/src/main/resources/OH-INF/thing/chaser-thing.xml
index 5313518fcf0..7d8d9239267 100644
--- a/bundles/org.openhab.binding.dmx/src/main/resources/OH-INF/thing/chaser-thing.xml
+++ b/bundles/org.openhab.binding.dmx/src/main/resources/OH-INF/thing/chaser-thing.xml
@@ -11,6 +11,7 @@
A single/multi-channel chaser
+ LightSource
diff --git a/bundles/org.openhab.binding.dmx/src/main/resources/OH-INF/thing/color-thing.xml b/bundles/org.openhab.binding.dmx/src/main/resources/OH-INF/thing/color-thing.xml
index 1bebec0c08a..cb4ad04aaae 100644
--- a/bundles/org.openhab.binding.dmx/src/main/resources/OH-INF/thing/color-thing.xml
+++ b/bundles/org.openhab.binding.dmx/src/main/resources/OH-INF/thing/color-thing.xml
@@ -11,6 +11,7 @@
A RGB capable dimmer
+ LightSource
diff --git a/bundles/org.openhab.binding.dmx/src/main/resources/OH-INF/thing/dimmer-thing.xml b/bundles/org.openhab.binding.dmx/src/main/resources/OH-INF/thing/dimmer-thing.xml
index d4c1695ba1f..89d7e136797 100644
--- a/bundles/org.openhab.binding.dmx/src/main/resources/OH-INF/thing/dimmer-thing.xml
+++ b/bundles/org.openhab.binding.dmx/src/main/resources/OH-INF/thing/dimmer-thing.xml
@@ -11,6 +11,7 @@
A single/multi-channel dimmer
+ LightSource
diff --git a/bundles/org.openhab.binding.dmx/src/main/resources/OH-INF/thing/tunablewhite-thing.xml b/bundles/org.openhab.binding.dmx/src/main/resources/OH-INF/thing/tunablewhite-thing.xml
index 2476b86aa6f..02c275daae0 100644
--- a/bundles/org.openhab.binding.dmx/src/main/resources/OH-INF/thing/tunablewhite-thing.xml
+++ b/bundles/org.openhab.binding.dmx/src/main/resources/OH-INF/thing/tunablewhite-thing.xml
@@ -11,6 +11,7 @@
A tunable white capable dimmer
+ LightSource
diff --git a/bundles/org.openhab.binding.dolbycp/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.dolbycp/src/main/resources/OH-INF/thing/thing-types.xml
index 3e00e67dbe8..8dc6ee884a6 100644
--- a/bundles/org.openhab.binding.dolbycp/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.dolbycp/src/main/resources/OH-INF/thing/thing-types.xml
@@ -7,6 +7,7 @@
Binding for Dolby Cinema Processor CP750
+ AudioVisual
diff --git a/bundles/org.openhab.binding.dominoswiss/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.dominoswiss/src/main/resources/OH-INF/thing/thing-types.xml
index 2b06be3d50a..c5c03f73ab2 100644
--- a/bundles/org.openhab.binding.dominoswiss/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.dominoswiss/src/main/resources/OH-INF/thing/thing-types.xml
@@ -6,6 +6,7 @@
This is a Dominoswiss EGate Server instance.
+ NetworkAppliance
@@ -26,6 +27,7 @@
Provides various control commands for Dominoswiss receivers
+ Blinds
diff --git a/bundles/org.openhab.binding.doorbird/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.doorbird/src/main/resources/OH-INF/thing/thing-types.xml
index b5be96be059..65b1b18e7c5 100644
--- a/bundles/org.openhab.binding.doorbird/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.doorbird/src/main/resources/OH-INF/thing/thing-types.xml
@@ -7,6 +7,8 @@
Doorbird doorbell model D101/D201/D205/D1101V
+ Doorbell
+
@@ -36,6 +38,8 @@
Doorbird doorbell model D210x
+ Doorbell
+
diff --git a/bundles/org.openhab.binding.draytonwiser/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.draytonwiser/src/main/resources/OH-INF/thing/thing-types.xml
index 2ca034e7220..0d1bde42bf4 100644
--- a/bundles/org.openhab.binding.draytonwiser/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.draytonwiser/src/main/resources/OH-INF/thing/thing-types.xml
@@ -8,6 +8,7 @@
A Drayton Wiser HeatHub acting as a bridge to Thermostats and TRVs
+ NetworkAppliance
networkAddress
@@ -42,6 +43,7 @@
The controller attached to the boiler
+ Boiler
@@ -79,6 +81,7 @@
The hot water heating system
+ WaterHeater
@@ -108,6 +111,7 @@
A Room that contains a thermostat and/or TRV
+ Thermostat
@@ -145,6 +149,7 @@
Wireless Thermostat device
+ Thermostat
@@ -182,6 +187,7 @@
Thermostatic Radiator Valve
+ RadiatorControl
@@ -219,6 +225,7 @@
Remote controlled Plug Socket
+ PowerOutlet
diff --git a/bundles/org.openhab.binding.dscalarm/src/main/resources/OH-INF/thing/envisalinkbridge.xml b/bundles/org.openhab.binding.dscalarm/src/main/resources/OH-INF/thing/envisalinkbridge.xml
index 909bef60c3a..c7b18ac37b4 100644
--- a/bundles/org.openhab.binding.dscalarm/src/main/resources/OH-INF/thing/envisalinkbridge.xml
+++ b/bundles/org.openhab.binding.dscalarm/src/main/resources/OH-INF/thing/envisalinkbridge.xml
@@ -8,6 +8,7 @@
This bridge represents the EyezOn Envlisalink 3/2D
Ethernet interface.
+ NetworkAppliance
diff --git a/bundles/org.openhab.binding.dscalarm/src/main/resources/OH-INF/thing/it100bridge.xml b/bundles/org.openhab.binding.dscalarm/src/main/resources/OH-INF/thing/it100bridge.xml
index 2d2513c1e3f..c06831ed6d6 100644
--- a/bundles/org.openhab.binding.dscalarm/src/main/resources/OH-INF/thing/it100bridge.xml
+++ b/bundles/org.openhab.binding.dscalarm/src/main/resources/OH-INF/thing/it100bridge.xml
@@ -7,6 +7,7 @@
This bridge represents the DSC IT-100 Serial interface.
+ NetworkAppliance
diff --git a/bundles/org.openhab.binding.dscalarm/src/main/resources/OH-INF/thing/keypad.xml b/bundles/org.openhab.binding.dscalarm/src/main/resources/OH-INF/thing/keypad.xml
index 2f9f4a78a90..685802bbe76 100644
--- a/bundles/org.openhab.binding.dscalarm/src/main/resources/OH-INF/thing/keypad.xml
+++ b/bundles/org.openhab.binding.dscalarm/src/main/resources/OH-INF/thing/keypad.xml
@@ -13,6 +13,7 @@
Represents the central administrative unit of the DSC Alarm System.
+ Keypad
diff --git a/bundles/org.openhab.binding.dscalarm/src/main/resources/OH-INF/thing/partition.xml b/bundles/org.openhab.binding.dscalarm/src/main/resources/OH-INF/thing/partition.xml
index 9ea265dc228..2252ccf4b16 100644
--- a/bundles/org.openhab.binding.dscalarm/src/main/resources/OH-INF/thing/partition.xml
+++ b/bundles/org.openhab.binding.dscalarm/src/main/resources/OH-INF/thing/partition.xml
@@ -13,6 +13,7 @@
Represents a controllable area within a DSC Alarm System.
+ AlarmZone