From b65f3daefaf367e1e85d102277aa46a2cf488393 Mon Sep 17 00:00:00 2001
From: Andrew Fiddian-Green <software@whitebear.ch>
Date: Mon, 14 Apr 2025 16:40:16 +0100
Subject: [PATCH 01/15] [various] Add equipment tags: A thru E

Signed-off-by: Andrew Fiddian-Green <software@whitebear.ch>
---
 .../main/resources/OH-INF/thing/bridge.xml    |  2 ++
 .../resources/OH-INF/thing/thing-types.xml    |  2 ++
 .../resources/OH-INF/thing/thing-types.xml    |  1 +
 .../resources/OH-INF/thing/thing-types.xml    |  2 ++
 .../src/main/resources/OH-INF/thing/api.xml   |  1 +
 .../main/resources/OH-INF/thing/location.xml  |  1 +
 .../resources/OH-INF/thing/thing-types.xml    |  1 +
 .../resources/OH-INF/thing/thing-types.xml    |  2 ++
 .../resources/OH-INF/thing/thing-types.xml    |  1 +
 .../resources/OH-INF/thing/thing-types.xml    |  7 +++++
 .../resources/OH-INF/thing/thing-types.xml    |  1 +
 .../resources/OH-INF/thing/thing-types.xml    |  1 +
 .../resources/OH-INF/thing/thing-types.xml    |  1 +
 .../resources/OH-INF/thing/thing-types.xml    |  3 +++
 .../resources/OH-INF/thing/thing-types.xml    |  2 ++
 .../main/resources/OH-INF/thing/client.xml    |  2 ++
 .../main/resources/OH-INF/thing/interface.xml |  2 ++
 .../resources/OH-INF/thing/thing-types.xml    |  6 +++++
 .../src/main/resources/OH-INF/thing/jandy.xml |  1 +
 .../main/resources/OH-INF/thing/pentair.xml   |  1 +
 .../resources/OH-INF/thing/thing-types.xml    |  3 +++
 .../resources/OH-INF/thing/thing-types.xml    |  9 ++++---
 .../resources/OH-INF/thing/thing-types.xml    |  1 +
 .../main/resources/OH-INF/thing/airthings.xml |  1 +
 .../src/main/resources/OH-INF/thing/am43.xml  |  1 +
 .../resources/OH-INF/thing/daikinmadoka.xml   |  1 +
 .../resources/OH-INF/thing/enoceanble.xml     |  2 ++
 .../resources/OH-INF/thing/thing-types.xml    |  2 ++
 .../main/resources/OH-INF/thing/radoneye.xml  |  1 +
 .../resources/OH-INF/thing/thing-types.xml    | 26 +++++++++++++++++++
 .../resources/OH-INF/thing/SoundTouch10.xml   |  1 +
 .../resources/OH-INF/thing/SoundTouch20.xml   |  1 +
 .../resources/OH-INF/thing/SoundTouch30.xml   |  1 +
 .../resources/OH-INF/thing/SoundTouch300.xml  |  1 +
 .../OH-INF/thing/SoundTouchSA5Amplifier.xml   |  1 +
 .../thing/SoundTouchWirelessLinkAdapter.xml   |  1 +
 .../OH-INF/thing/UnknownSoundTouch.xml        |  2 +-
 .../thing/WaveSoundTouchMusicSystemIV.xml     |  1 +
 .../resources/OH-INF/thing/bridge-types.xml   |  1 +
 .../resources/OH-INF/thing/thing-types.xml    |  1 +
 .../resources/OH-INF/thing/thing-types.xml    |  2 ++
 .../main/resources/OH-INF/thing/keypad.xml    |  1 +
 .../src/main/resources/OH-INF/thing/panel.xml |  1 +
 .../src/main/resources/OH-INF/thing/zone.xml  |  1 +
 .../resources/OH-INF/thing/thing-types.xml    |  1 +
 .../resources/OH-INF/thing/thing-types.xml    |  1 +
 .../resources/OH-INF/thing/thing-types.xml    |  3 +++
 .../resources/OH-INF/thing/thing-types.xml    |  3 +++
 .../resources/OH-INF/thing/thing-types.xml    |  2 ++
 .../resources/OH-INF/thing/thing-types.xml    |  1 +
 .../main/resources/OH-INF/thing/country.xml   |  1 +
 .../src/main/resources/OH-INF/thing/world.xml |  1 +
 .../resources/OH-INF/thing/thing-types.xml    |  2 ++
 .../resources/OH-INF/thing/thing-types.xml    |  5 ++++
 .../resources/OH-INF/thing/thing-types.xml    |  1 +
 .../resources/OH-INF/thing/thing-types.xml    |  1 +
 .../resources/OH-INF/thing/thing-types.xml    |  2 ++
 .../main/resources/OH-INF/thing/dssBridge.xml |  1 +
 .../resources/OH-INF/thing/thing-types.xml    |  1 +
 .../resources/OH-INF/thing/thing-types.xml    |  1 +
 .../resources/OH-INF/thing/thing-types.xml    |  4 +++
 .../resources/OH-INF/thing/thing-types.xml    |  7 +++++
 .../OH-INF/thing/envisalinkbridge.xml         |  1 +
 .../resources/OH-INF/thing/it100bridge.xml    |  1 +
 .../main/resources/OH-INF/thing/keypad.xml    |  1 +
 .../main/resources/OH-INF/thing/partition.xml |  1 +
 .../OH-INF/thing/tcpserverbridge.xml          |  1 +
 .../src/main/resources/OH-INF/thing/zone.xml  |  1 +
 .../main/resources/OH-INF/thing/bridge.xml    |  1 +
 .../main/resources/OH-INF/thing/region.xml    |  1 +
 .../resources/OH-INF/thing/thing-types.xml    |  2 ++
 .../main/resources/OH-INF/thing/things.xml    |  5 ++++
 .../resources/OH-INF/thing/thing-types.xml    |  3 +++
 .../resources/OH-INF/thing/thing-types.xml    |  2 ++
 .../main/resources/OH-INF/thing/bridge.xml    |  1 +
 .../resources/OH-INF/thing/thing-types.xml    |  1 +
 .../resources/OH-INF/thing/thing-types.xml    |  1 +
 .../resources/OH-INF/thing/thing-types.xml    |  5 ++--
 .../resources/OH-INF/thing/thing-types.xml    |  5 ++++
 .../resources/OH-INF/thing/thing-service.xml  |  1 +
 .../resources/OH-INF/thing/thing-types.xml    |  3 +++
 .../resources/OH-INF/thing/thing-types.xml    |  2 ++
 .../resources/OH-INF/thing/thing-types.xml    |  1 +
 .../resources/OH-INF/thing/thing-types.xml    |  1 +
 .../resources/OH-INF/thing/thing-types.xml    |  1 +
 .../main/resources/OH-INF/thing/bridge.xml    |  1 +
 .../resources/OH-INF/thing/thing-types.xml    |  2 ++
 .../resources/OH-INF/thing/thing-types.xml    |  1 +
 .../resources/OH-INF/thing/thing-types.xml    |  1 +
 .../main/resources/OH-INF/thing/gateway.xml   |  1 +
 .../main/resources/OH-INF/thing/sensor.xml    |  1 +
 .../resources/OH-INF/thing/thing-types.xml    |  2 ++
 .../OH-INF/thing/flume-cloud-connector.xml    |  1 +
 .../resources/OH-INF/thing/flume-device.xml   |  1 +
 .../resources/OH-INF/thing/thing-types.xml    |  2 ++
 .../resources/OH-INF/thing/thing-types.xml    |  2 ++
 .../resources/OH-INF/thing/bridge-type.xml    |  1 +
 .../OH-INF/thing/api-bridge-type.xml          |  1 +
 .../resources/OH-INF/thing/thing-types.xml    |  1 +
 .../resources/OH-INF/thing/thing-types.xml    |  2 ++
 .../main/resources/OH-INF/thing/bridge.xml    |  1 +
 .../resources/OH-INF/thing/thing-types.xml    |  2 ++
 .../resources/OH-INF/thing/thing-types.xml    |  1 +
 103 files changed, 200 insertions(+), 7 deletions(-)

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 0e82fe8b7dece..c002f3a0f5218 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
@@ -7,6 +7,8 @@
 	<bridge-type id="hub">
 		<label>Adorne Hub</label>
 		<description>The Adorne Hub serves as the bridge to control Adorne switches, dimmer switches and outlets.</description>
+		<semantic-equipment-tag>Dial</semantic-equipment-tag>
+
 
 		<config-description>
 			<parameter name="host" type="text">
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 02f299343d151..9054271bb1321 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 @@
 
 		<label>Adorne Switch</label>
 		<description>Controls an Adorne switch or outlet.</description>
+		<semantic-equipment-tag>PowerOutlet</semantic-equipment-tag>
 
 		<channels>
 			<channel id="power" typeId="system.power"/>
@@ -30,6 +31,7 @@
 
 		<label>Adorne Dimmer Switch</label>
 		<description>Controls an Adorne dimmer switch.</description>
+		<semantic-equipment-tag>LightSource</semantic-equipment-tag>
 
 		<channels>
 			<channel id="power" typeId="system.power"/>
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 68c07f8e35f08..b2d024943cd76 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 @@
 	<thing-type id="collectionSchedule">
 		<label>aha Waste Collection Schedule</label>
 		<description>aha Waste Collection Schedule from http://www.aha-region.de/abholtermine/abfuhrkalender</description>
+		<semantic-equipment-tag>WebService</semantic-equipment-tag>
 
 		<channels>
 			<channel id="generalWaste" typeId="collectionDateGeneralWaste"/>
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 45c554e34d759..92e641f5e8359 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 @@
 	<bridge-type id="airgradient-api">
 		<label>AirGradient API</label>
 		<description>Connection to the AirGradient Cloud API</description>
+		<semantic-equipment-tag>WeatherService</semantic-equipment-tag>
 
 		<representation-property>token</representation-property>
 		<config-description>
@@ -36,6 +37,7 @@
 	<thing-type id="airgradient-local">
 		<label>AirGradient Local Sensor</label>
 		<description>Direct network connection to a local AirGradient Sensor</description>
+		<semantic-equipment-tag>WeatherStation</semantic-equipment-tag>
 
 		<channels>
 			<channel id="pm01" typeId="pm1"/>
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 416faef5ed302..85b54d20a151c 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.
 		</description>
+		<semantic-equipment-tag>WebService</semantic-equipment-tag>
 
 		<channel-groups>
 			<channel-group id="pollens" typeId="bridge-pollens"/>
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 aab4dd83b7f98..267b05bf5bad7 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 @@
 
 		<label>Department Report</label>
 		<description>AirParif air quality report for the given location</description>
+		<semantic-equipment-tag>WebService</semantic-equipment-tag>
 
 		<channel-groups>
 			<channel-group id="pollens" typeId="dept-pollens"/>
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 6baacb283b9fa..55d24456bac8e 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 @@
 		<label>air-Q</label>
 		<description>Thing for air-Q Device</description>
 		<category>Sensor</category>
+		<semantic-equipment-tag>WeatherStation</semantic-equipment-tag>
 
 		<channels>
 			<channel id="status" typeId="status"/>
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 8d17089129d9e..341b71f345055 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 @@
 
 	<bridge-type id="api">
 		<label>Air Quality API</label>
+		<semantic-equipment-tag>WeatherService</semantic-equipment-tag>
 
 		<config-description>
 			<parameter name="apiKey" type="text" required="true">
@@ -22,6 +23,7 @@
 		</supported-bridge-type-refs>
 
 		<label>Air Quality Station</label>
+		<semantic-equipment-tag>WeatherStation</semantic-equipment-tag>
 
 		<channel-groups>
 			<channel-group id="aqi" typeId="aqi"/>
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 be8a5854079ac..aaaa4d41594ab 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 @@
 	<thing-type id="avnode">
 		<label>AirVisual Node</label>
 		<description>AirVisual Node air quality monitor</description>
+		<semantic-equipment-tag>WeatherStation</semantic-equipment-tag>
 
 		<!-- Channels -->
 
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 9cbb9aceba9b0..2845169ed2517 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 @@
 	<bridge-type id="ipbridge">
 		<label>Alarm Decoder IP Bridge</label>
 		<description>Nu Tech Alarm Decoder IP Bridge</description>
+		<semantic-equipment-tag>NetworkAppliance</semantic-equipment-tag>
 		<properties>
 			<property name="vendor">Nu Tech Software Solutions</property>
 		</properties>
@@ -49,6 +50,7 @@
 	<bridge-type id="serialbridge">
 		<label>Alarm Decoder Serial Bridge</label>
 		<description>Nu Tech Alarm Decoder Serial Bridge</description>
+		<semantic-equipment-tag>NetworkAppliance</semantic-equipment-tag>
 		<properties>
 			<property name="vendor">Nu Tech Software Solutions</property>
 		</properties>
@@ -82,6 +84,8 @@
 
 		<label>Alarm Zone</label>
 		<description>Alarm Decoder REL or EXP zone</description>
+		<semantic-equipment-tag>AlarmDevice</semantic-equipment-tag>
+
 
 		<channels>
 			<channel id="contact" typeId="contact-channel"/>
@@ -108,6 +112,7 @@
 
 		<label>Alarm RF Zone</label>
 		<description>Alarm Decoder RFX zone</description>
+		<semantic-equipment-tag>AlarmDevice</semantic-equipment-tag>
 
 		<channels>
 			<channel id="lowbat" typeId="system.low-battery">
@@ -149,6 +154,7 @@
 
 		<label>Virtual Zone</label>
 		<description>Alarm Decoder virtual zone</description>
+		<semantic-equipment-tag>AlarmDevice</semantic-equipment-tag>
 
 		<channels>
 			<channel id="command" typeId="contact-command-channel"/>
@@ -171,6 +177,7 @@
 
 		<label>Alarm Keypad</label>
 		<description>Alarm Decoder keypad thing</description>
+		<semantic-equipment-tag>Keypad</semantic-equipment-tag>
 
 		<channels>
 			<channel id="zone" typeId="number-channel">
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 84874e6ed22ee..4dbab53e0720e 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 @@
 	<!-- Thing Type -->
 	<thing-type id="speaker">
 		<label>AllPlay Speaker</label>
+		<semantic-equipment-tag>Speaker</semantic-equipment-tag>
 
 		<channels>
 			<channel id="clearzone" typeId="clearzone"/>
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 b80c5c5746508..51e76db37145a 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 @@
 	<thing-type id="dashbutton">
 		<label>@text/dashButtonLabel</label>
 		<description>@text/dashButtonDescription</description>
+		<semantic-equipment-tag>Button</semantic-equipment-tag>
 
 		<channels>
 			<channel id="press" typeId="system.rawbutton">
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 af7dea0c79e52..910349a64f737 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 @@
 	<thing-type id="service">
 		<label>Amber Electric</label>
 		<description>Amber Electric - wholesale access to power prices</description>
+		<semantic-equipment-tag>WebService</semantic-equipment-tag>
 
 		<channels>
 			<channel id="electricity-price" typeId="electricity-price"/>
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 c6fc68fd65709..f51dde601136e 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 @@
 	<bridge-type id="controller">
 		<label>AmpliPi Controller</label>
 		<description>An AmpliPi controller</description>
+		<semantic-equipment-tag>AudioVisual</semantic-equipment-tag>
 
 		<channels>
 			<channel id="preset" typeId="preset"/>
@@ -49,6 +50,7 @@
 
 		<label>AmpliPi Zone</label>
 		<description>A zone of the AmpliPi system</description>
+		<semantic-equipment-tag>AudioVisual</semantic-equipment-tag>
 
 		<channels>
 			<channel typeId="system.power" id="power"/>
@@ -82,6 +84,7 @@
 
 		<label>AmpliPi Group</label>
 		<description>A group of the AmpliPi system</description>
+		<semantic-equipment-tag>AudioVisual</semantic-equipment-tag>
 
 		<channels>
 			<channel typeId="system.power" id="power"/>
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 92eaceba175d8..bc4ca52431799 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 <b>connectionMode</b> setting for more options).
 		]]></description>
 		<category>HVAC</category>
+		<semantic-equipment-tag>AirConditioner</semantic-equipment-tag>
 
 		<channel-groups>
 			<channel-group id="ac-controls" typeId="ac-controls-group"/>
@@ -182,6 +183,7 @@
 		<br/><i>Requires Internet connectivity for <b>both</b> openHAB and the HVAC device separately.</i>
 		]]></description>
 		<category>HVAC</category>
+		<semantic-equipment-tag>AirConditioner</semantic-equipment-tag>
 		<channel-groups>
 			<channel-group id="ac-controls" typeId="ac-controls-group"/>
 			<channel-group id="modes" typeId="modes-group"/>
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 b492346aa9925..ca385f6e20b23 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 @@
 
 		<label>Asuswrt Client</label>
 		<description>Client connected to Asuswrt-Router</description>
+		<semantic-equipment-tag>NetworkAppliance</semantic-equipment-tag>
+
 		<channel-groups>
 			<channel-group id="network-info" typeId="clientNetworkGroup"></channel-group>
 			<channel-group id="traffic" typeId="traffic-group"></channel-group>
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 42b65adec2c5a..86ea29fc2168d 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 @@
 
 		<label>Router Interface</label>
 		<description>Interface of router</description>
+		<semantic-equipment-tag>Router</semantic-equipment-tag>
+
 		<channel-groups>
 			<channel-group id="network-info" typeId="if-info-group"></channel-group>
 			<channel-group id="traffic" typeId="traffic-group"></channel-group>
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 cf9f7b90fdc1b..da53f3ba5cc47 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 @@
 	<thing-type id="pro3-44m">
 		<label>Atlona PRO3 4x4 HDBaseT Matrix</label>
 		<description>Atlona PRO3 4x4 HDBaseT Matrix (Model AT-UHD-PRO3-44M)</description>
+		<semantic-equipment-tag>AudioVisual</semantic-equipment-tag>
 
 		<channel-groups>
 			<channel-group id="primary" typeId="primarygroup"/>
@@ -56,6 +57,7 @@
 	<thing-type id="pro3-66m">
 		<label>Atlona PRO3 6x6 HDBaseT Matrix</label>
 		<description>Atlona PRO3 6x6 HDBaseT Matrix (Model AT-UHD-PRO3-66M)</description>
+		<semantic-equipment-tag>AudioVisual</semantic-equipment-tag>
 
 		<channel-groups>
 			<channel-group id="primary" typeId="primarygroup"/>
@@ -124,6 +126,7 @@
 	<thing-type id="pro3-88m">
 		<label>Atlona PRO3 8x8 HDBaseT Matrix</label>
 		<description>Atlona PRO3 8x8 HDBaseT Matrix (Model AT-UHD-PRO3-66M)</description>
+		<semantic-equipment-tag>AudioVisual</semantic-equipment-tag>
 
 		<channel-groups>
 			<channel-group id="primary" typeId="primarygroup"/>
@@ -208,6 +211,7 @@
 	<thing-type id="pro3-1616m">
 		<label>Atlona PRO3 16x16 HDBaseT Matrix</label>
 		<description>Atlona PRO3 16x16 HDBaseT Matrix (Model AT-UHD-PRO3-1616M)</description>
+		<semantic-equipment-tag>AudioVisual</semantic-equipment-tag>
 
 		<channel-groups>
 			<channel-group id="primary" typeId="primarygroup"/>
@@ -364,6 +368,7 @@
 	<thing-type id="pro3-hd44m">
 		<label>Atlona PRO3 HD 4x4 HDBaseT Matrix</label>
 		<description>Atlona PRO3 HD 4x4 HDBaseT Matrix (Model AT-PRO3HD44M)</description>
+		<semantic-equipment-tag>AudioVisual</semantic-equipment-tag>
 
 		<channel-groups>
 			<channel-group id="primary" typeId="primarygroup"/>
@@ -392,6 +397,7 @@
 	<thing-type id="pro3-hd66m">
 		<label>Atlona PRO3 HD 6x6 HDBaseT Matrix</label>
 		<description>Atlona PRO3 HD 6x6 HDBaseT Matrix (Model AT-PRO3HD66M)</description>
+		<semantic-equipment-tag>AudioVisual</semantic-equipment-tag>
 
 		<channel-groups>
 			<channel-group id="primary" typeId="primarygroup"/>
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 64ef2123e2fb5..db79137b7e998 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 @@
 	<thing-type id="jandy">
 		<label>Jandy Pool Controller</label>
 		<description>A Jandy pool control thing represents an Autelis pool controller for Jandy systems</description>
+		<semantic-equipment-tag>SwimmingPool</semantic-equipment-tag>
 		<channels>
 			<channel id="system-runstate" typeId="system-runstate"/>
 			<channel id="system-model" typeId="system-model"/>
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 76720197cf67f..48489df98cb7b 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 @@
 	<thing-type id="pentair">
 		<label>Pentair Pool Controller</label>
 		<description>A Pentair pool control thing represents an Autelis pool controller for Pentair systems</description>
+		<semantic-equipment-tag>SwimmingPool</semantic-equipment-tag>
 		<channels>
 			<channel id="system-runstate" typeId="system-runstate"/>
 			<channel id="system-model" typeId="system-model"/>
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 df01015c878db..678f90ff070ee 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 @@
 	<bridge-type id="bridge">
 		<label>Automower Connect Bridge</label>
 		<description>The bridge to communicate with the Automower Connect API</description>
+		<semantic-equipment-tag>NetworkAppliance</semantic-equipment-tag>
+
 
 		<config-description>
 			<parameter name="appKey" type="text" required="true">
@@ -41,6 +43,7 @@
 
 		<label>Automower</label>
 		<description>An automatic lawn mower</description>
+		<semantic-equipment-tag>LawnMower</semantic-equipment-tag>
 
 		<channel-groups>
 			<channel-group id="status" typeId="statusType"/>
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 47fcb5a129401..59ce400ecf4e0 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 @@
 	<bridge-type id="bridge">
 		<label>aWATTar Bridge</label>
 		<description>Provides price data from the aWATTar API.</description>
+		<semantic-equipment-tag>WebService</semantic-equipment-tag>
 
 		<channels>
 			<channel id="market-net" typeId="uom-price">
@@ -41,6 +42,7 @@
 
 		<label>Hourly Price</label>
 		<description>Prices for one kilowatt-hour at the given hour in Cent</description>
+		<semantic-equipment-tag>WebService</semantic-equipment-tag>
 
 		<channel-groups>
 			<channel-group id="current" typeId="hourly-prices">
@@ -256,11 +258,10 @@
 			<bridge-type-ref id="bridge"/>
 		</supported-bridge-type-refs>
 
-		<label>
-			Best Price
-		</label>
-
+		<label>Best Price</label>
 		<description>Evaluates the lowest price period for the given settings</description>
+		<semantic-equipment-tag>WebService</semantic-equipment-tag>
+
 		<channels>
 			<channel id="active" typeId="switch-type">
 				<label>Active</label>
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 5f8a81f8c0e6f..939805c6cfebe 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 @@
 	<thing-type id="fan">
 		<label>BigAssFan</label>
 		<description>Big Ass Fan</description>
+		<semantic-equipment-tag>Fan</semantic-equipment-tag>
 
 		<channels>
 			<!-- Channels related to fan functions -->
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 f90f38b13f73e..0be1032a6944b 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 @@
 
 		<label>Airthings Wave Mini</label>
 		<description>Indoor air quality monitor</description>
+		<semantic-equipment-tag>WeatherStation</semantic-equipment-tag>
 
 		<channels>
 			<channel id="rssi" typeId="rssi"/>
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 bcd4831421d16..a34b358607649 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 @@
 		<label>AM43 Blind Drive Motor</label>
 		<description>An AM43 Blind Drive Motor</description>
 		<category>Blinds</category>
+		<semantic-equipment-tag>Blinds</semantic-equipment-tag>
 
 		<channels>
 			<channel id="rssi" typeId="rssi"/>
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 2bb375f4de447..d1a49fea9578a 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 @@
 
 		<label>Daikin BRC1H Thermostat</label>
 		<description>A Daikin Madoka BRC1H Thermostat (BLE)</description>
+		<semantic-equipment-tag>Thermostat</semantic-equipment-tag>
 
 		<channels>
 			<channel id="onOffStatus" typeId="brc1h_onOffStatus"/>
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 6f353cdb39cf6..1d518610f51d5 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 @@
 
 		<label>Enocean PTM 215B Rocker</label>
 		<description>An Enocean BLE Rocker (PTM 215B)</description>
+		<semantic-equipment-tag>WallSwitch</semantic-equipment-tag>
+
 
 		<channels>
 			<channel id="rocker1" typeId="system.rawrocker"/>
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 c6771f80cbf8c..2f8f1d38032b5 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,8 @@
 		<label>Grundfos Alpha Reader MI401</label>
 		<description>A Grundfos Alpha Reader MI401</description>
 		<category>Pump</category>
+		<semantic-equipment-tag>Pump</semantic-equipment-tag>
+
 
 		<channels>
 			<channel id="rssi" typeId="rssi"/>
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 7f0c48617ae3b..831d3e644c162 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 @@
 
 		<label>RadonEye RD200</label>
 		<description>Indoor radon monitor</description>
+		<semantic-equipment-tag>AirQualitySensor</semantic-equipment-tag>
 
 		<channels>
 			<channel id="rssi" typeId="rssi"/>
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 b6463ccf2cffa..281ceba384354 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 @@
 	<bridge-type id="shc">
 		<label>Smart Home Controller</label>
 		<description>The Bosch Smart Home Bridge representing the Bosch Smart Home Controller.</description>
+		<semantic-equipment-tag>NetworkAppliance</semantic-equipment-tag>
 
 		<channels>
 			<channel id="scenario-triggered" typeId="scenario-triggered"/>
@@ -32,6 +33,7 @@
 
 		<label>In-wall Switch</label>
 		<description>A simple light control.</description>
+		<semantic-equipment-tag>WallSwitch</semantic-equipment-tag>
 
 		<channels>
 			<channel id="power-switch" typeId="system.power"/>
@@ -50,6 +52,7 @@
 
 		<label>Compact Smart Plug</label>
 		<description>A compact smart plug with energy monitoring capabilities.</description>
+		<semantic-equipment-tag>PowerOutlet</semantic-equipment-tag>
 
 		<channels>
 			<channel id="power-switch" typeId="system.power"/>
@@ -68,6 +71,7 @@
 
 		<label>Twinguard</label>
 		<description>The Twinguard smoke detector warns you in case of fire and constantly monitors the air.</description>
+		<semantic-equipment-tag>SmokeDetector</semantic-equipment-tag>
 
 		<channels>
 			<channel id="temperature" typeId="temperature"/>
@@ -94,6 +98,7 @@
 
 		<label>Door/Window Contact</label>
 		<description>Detects open windows and doors.</description>
+		<semantic-equipment-tag>ContactSensor</semantic-equipment-tag>
 
 		<channels>
 			<channel id="contact" typeId="contact"/>
@@ -112,6 +117,7 @@
 
 		<label>Door/Window Contact II</label>
 		<description>Detects open windows and doors and features an additional button.</description>
+		<semantic-equipment-tag>ContactSensor</semantic-equipment-tag>
 
 		<channels>
 			<channel id="contact" typeId="contact"/>
@@ -132,6 +138,7 @@
 
 		<label>Door/Window Contact II Plus</label>
 		<description>Detects open windows and doors, provides a configurable button and a vibration sensor.</description>
+		<semantic-equipment-tag>ContactSensor</semantic-equipment-tag>
 
 		<channels>
 			<channel id="contact" typeId="contact"/>
@@ -156,6 +163,7 @@
 		<label>Motion Detector</label>
 		<description>Detects every movement through an intelligent combination of passive infra-red technology and an
 			additional temperature sensor.</description>
+		<semantic-equipment-tag>MotionDetector</semantic-equipment-tag>
 
 		<channels>
 			<channel id="latest-motion" typeId="latest-motion"/>
@@ -179,6 +187,8 @@
 
 		<label>Shutter Control</label>
 		<description>Control of your shutter to take any position you desire.</description>
+		<semantic-equipment-tag>Blinds</semantic-equipment-tag>
+
 
 		<channels>
 			<channel id="level" typeId="level"/>
@@ -195,6 +205,7 @@
 
 		<label>Shutter Control II</label>
 		<description>Second generation shutter control.</description>
+		<semantic-equipment-tag>Blinds</semantic-equipment-tag>
 
 		<channels>
 			<channel id="level" typeId="level"/>
@@ -215,6 +226,7 @@
 
 		<label>Light Control II</label>
 		<description>Advanced light control with two switch circuits.</description>
+		<semantic-equipment-tag>WallSwitch</semantic-equipment-tag>
 
 		<channels>
 			<channel id="signal-strength" typeId="system.signal-strength"/>
@@ -237,6 +249,7 @@
 
 		<label>Thermostat</label>
 		<description>Radiator thermostat</description>
+		<semantic-equipment-tag>Thermostat</semantic-equipment-tag>
 
 		<channels>
 			<channel id="temperature" typeId="temperature"/>
@@ -259,6 +272,7 @@
 		<label>Climate Control</label>
 		<description>This is a virtual device which is automatically created for all rooms that have
 			thermostats in it.</description>
+		<semantic-equipment-tag>Thermostat</semantic-equipment-tag>
 
 		<channels>
 			<channel id="temperature" typeId="temperature"/>
@@ -276,6 +290,7 @@
 
 		<label>Wall Thermostat</label>
 		<description>Display of the current room temperature as well as the relative humidity in the room.</description>
+		<semantic-equipment-tag>Thermostat</semantic-equipment-tag>
 
 		<channels>
 			<channel id="temperature" typeId="temperature"/>
@@ -295,6 +310,7 @@
 
 		<label>Security Camera 360</label>
 		<description>Indoor security camera with 360° view and motion detection.</description>
+		<semantic-equipment-tag>Camera</semantic-equipment-tag>
 
 		<channels>
 			<channel id="privacy-mode" typeId="privacy-mode"/>
@@ -312,6 +328,7 @@
 
 		<label>Security Camera Eyes</label>
 		<description>Outdoor security camera with motion detection and light.</description>
+		<semantic-equipment-tag>Camera</semantic-equipment-tag>
 
 		<channels>
 			<channel id="privacy-mode" typeId="privacy-mode"/>
@@ -329,6 +346,7 @@
 
 		<label>Intrusion Detection System</label>
 		<description>Allows to retrieve and control the state of the intrusion detection alarm system.</description>
+		<semantic-equipment-tag>AlarmSystem</semantic-equipment-tag>
 
 		<channels>
 			<channel id="system-availability" typeId="system-availability"/>
@@ -349,6 +367,7 @@
 
 		<label>Smart Bulb</label>
 		<description>A smart bulb connected via Zigbee.</description>
+		<semantic-equipment-tag>Lightbulb</semantic-equipment-tag>
 
 		<channels>
 			<channel id="power-switch" typeId="system.power"/>
@@ -367,6 +386,7 @@
 
 		<label>Smoke Detector</label>
 		<description>The smoke detector warns you in case of fire.</description>
+		<semantic-equipment-tag>SmokeDetector</semantic-equipment-tag>
 
 		<channels>
 			<channel id="alarm" typeId="alarm"/>
@@ -404,6 +424,7 @@
 
 		<label>Universal Switch</label>
 		<description>Universally configurable switch with two buttons.</description>
+		<semantic-equipment-tag>WallSwitch</semantic-equipment-tag>
 
 		<channels>
 			<channel id="key-code" typeId="key-code"/>
@@ -422,6 +443,7 @@
 
 		<label>Universal Switch II</label>
 		<description>Universally configurable switch with four buttons.</description>
+		<semantic-equipment-tag>WallSwitch</semantic-equipment-tag>
 
 		<channels>
 			<channel id="key-code" typeId="key-code"/>
@@ -440,6 +462,7 @@
 
 		<label>Smoke Detector II</label>
 		<description>The smoke detector warns you in case of fire.</description>
+		<semantic-equipment-tag>SmokeDetector</semantic-equipment-tag>
 
 		<channels>
 			<channel id="alarm" typeId="alarm"/>
@@ -463,6 +486,7 @@
 
 		<label>Dimmer</label>
 		<description>Smart dimmer capable of controlling any dimmable lamp.</description>
+		<semantic-equipment-tag>Dial</semantic-equipment-tag>
 
 		<channels>
 			<channel id="power-switch" typeId="system.power"/>
@@ -481,6 +505,7 @@
 
 		<label>Water Detector</label>
 		<description>Smart sensor to detect water leakage.</description>
+		<semantic-equipment-tag>LeakSensor</semantic-equipment-tag>
 
 		<channels>
 			<channel id="water-leakage" typeId="water-leakage"/>
@@ -503,6 +528,7 @@
 
 		<label>Relay</label>
 		<description>The smart switching relay is your universal all-rounder for smart switching.</description>
+		<semantic-equipment-tag>ControlDevice</semantic-equipment-tag>
 
 		<channels>
 			<channel id="signal-strength" typeId="system.signal-strength"/>
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 6bf9414780f31..44629282546db 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 @@
 	<thing-type id="10" extensible="notificationsound">
 		<label>Bose SoundTouch 10</label>
 		<description>Bose SoundTouch 10 Speaker</description>
+		<semantic-equipment-tag>Speaker</semantic-equipment-tag>
 
 		<channels>
 			<channel id="power" typeId="power"/>
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 61fd4c6c20de3..3eda6340bcc99 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 @@
 	<thing-type id="20" extensible="notificationsound">
 		<label>Bose SoundTouch 20</label>
 		<description>Bose SoundTouch 20 Speaker</description>
+		<semantic-equipment-tag>Speaker</semantic-equipment-tag>
 
 		<channels>
 			<channel id="power" typeId="power"/>
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 48f6985c5d793..2070c607b3ed3 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 @@
 	<thing-type id="30" extensible="notificationsound">
 		<label>Bose SoundTouch 30</label>
 		<description>Bose SoundTouch 30 Speaker</description>
+		<semantic-equipment-tag>Speaker</semantic-equipment-tag>
 
 		<channels>
 			<channel id="power" typeId="power"/>
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 461743833f54e..add244e25d463 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 @@
 	<thing-type id="300">
 		<label>Bose SoundTouch 300</label>
 		<description>Bose SoundTouch 300 Speaker</description>
+		<semantic-equipment-tag>Speaker</semantic-equipment-tag>
 
 		<channels>
 			<channel id="power" typeId="power"/>
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 26973335e009c..6c61f1edc256f 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 @@
 	<thing-type id="sa5Amplifier">
 		<label>Bose SoundTouch SA-5 Amplifier</label>
 		<description>A Bose SoundTouch SA-5 Amplifier</description>
+		<semantic-equipment-tag>AudioVisual</semantic-equipment-tag>
 
 		<channels>
 			<channel id="power" typeId="power"/>
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 a101b1400727d..d8d7d94f24f47 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 @@
 	<thing-type id="wirelessLinkAdapter">
 		<label>Bose SoundTouch Wireless Link Adapter</label>
 		<description>Bose SoundTouch Wireless Link Adapter</description>
+		<semantic-equipment-tag>Router</semantic-equipment-tag>
 
 		<channels>
 			<channel id="power" typeId="power"/>
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 de403aa9ab147..57aefb2c51f60 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,7 @@
 
 	<thing-type id="device">
 		<label>Bose SoundTouch Device</label>
-		<description>Aan unknown Bose SoundTouch Device</description>
+		<description>An unknown Bose SoundTouch Device</description>
 
 		<channels>
 			<channel id="power" typeId="power"/>
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 8d96187fb56d3..d1670551b1f9f 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 @@
 	<thing-type id="waveSoundTouchMusicSystemIV">
 		<label>Bose Wave SoundTouch Music System IV</label>
 		<description>A Bose Wave SoundTouch Music System IV</description>
+		<semantic-equipment-tag>AudioVisual</semantic-equipment-tag>
 
 		<channels>
 			<channel id="power" typeId="power"/>
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 f45ad8f501651..ee84e4b27540e 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 @@
 			</ul>
 			]]>
 		</description>
+		<semantic-equipment-tag>NetworkAppliance</semantic-equipment-tag>
 
 		<channel-groups>
 			<channel-group id="status" typeId="bridge-status"/>
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 3c38a4605634a..f55876ca6c97c 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 @@
 
 		<label>BTicino Smarther Chronothermostat</label>
 		<description>This thing represents a BTicino Smarther chronothermostat module.</description>
+		<semantic-equipment-tag>Thermostat</semantic-equipment-tag>
 
 		<channel-groups>
 			<channel-group id="measures" typeId="module-measures"/>
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 2b4f2b6133bc0..83b6e3242defc 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.
 		</description>
+		<semantic-equipment-tag>WeatherService</semantic-equipment-tag>
+
 
 		<channels>
 			<channel id="actual_datetime" typeId="actual_datetime"/>
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 03a19616afa3f..1b83006668041 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 @@
 
 		<label>Caddx Alarm Keypad</label>
 		<description>Represents any of the keypads of the Caddx Alarm System.</description>
+		<semantic-equipment-tag>Keypad</semantic-equipment-tag>
 
 		<channels>
 			<channel id="keypad_key_pressed" typeId="keypad_button_press">
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 7cf962634c9b7..767f8d829b946 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 @@
 
 		<label>Caddx Alarm Panel</label>
 		<description>The basic representation of the Caddx Alarm System.</description>
+		<semantic-equipment-tag>AlarmSystem</semantic-equipment-tag>
 
 		<channels>
 			<channel id="panel_firmware_version" typeId="panel_text">
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 a83f024e1b84d..2a1efcc07219c 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 @@
 
 		<label>Caddx Alarm Zone</label>
 		<description>Represents a physical device such as a door, window, or motion sensor.</description>
+		<semantic-equipment-tag>AlarmDevice</semantic-equipment-tag>
 
 		<channels>
 			<!-- Zone partitions -->
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 f2f85877ca614..98cb5ed862b03 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 @@
 	<thing-type id="winecooler-2z">
 		<label>Wine Cooler 2 Zones</label>
 		<description>Wine cooler with 2 cooling zones</description>
+		<semantic-equipment-tag>Refrigerator</semantic-equipment-tag>
 
 		<channel-groups>
 			<channel-group id="top" typeId="top-values"/>
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 5b89027c57aba..adaa0412b01f0 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 @@
 
 		<label>OpenAI Account</label>
 		<description>Account at OpenAI that is used for accessing the ChatGPT API.</description>
+		<semantic-equipment-tag>WebService</semantic-equipment-tag>
 
 		<channels>
 			<channel id="chat" typeId="chat"/>
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 5c7bbf6bf1cd0..9e2a5c03f3ec8 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 @@
 	<thing-type id="audiogroup">
 		<label>Chromecast Audio Group</label>
 		<description>A Google Chromecast Audio Group device</description>
+		<semantic-equipment-tag>MediaPlayer</semantic-equipment-tag>
 
 		<channels>
 			<channel id="control" typeId="system.media-control"/>
@@ -58,6 +59,7 @@
 	<thing-type id="audio">
 		<label>Chromecast Audio</label>
 		<description>A Google Chromecast Audio device</description>
+		<semantic-equipment-tag>MediaPlayer</semantic-equipment-tag>
 
 		<channels>
 			<channel id="control" typeId="system.media-control"/>
@@ -108,6 +110,7 @@
 	<thing-type id="chromecast">
 		<label>Chromecast</label>
 		<description>A Google Chromecast streaming device</description>
+		<semantic-equipment-tag>MediaPlayer</semantic-equipment-tag>
 
 		<channels>
 			<channel id="control" typeId="system.media-control"/>
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 ab987a0b32337..873d6cbb7c308 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
@@ -8,6 +8,7 @@
 	<bridge-type id="cm11a">
 		<label>CM11a Controller for X10 Devices</label>
 		<description>CM11 is a device that allows control of X10 devices for a computer. </description>
+		<semantic-equipment-tag>NetworkAppliance</semantic-equipment-tag>
 
 		<config-description>
 			<parameter name="serialPort" type="text" required="true">
@@ -32,6 +33,7 @@
 
 		<label>X10 Dimmer</label>
 		<description>Controls dimmable loads</description>
+		<semantic-equipment-tag>Dial</semantic-equipment-tag>
 
 		<channels>
 			<channel id="lightlevel" typeId="lightDimmer"/>
@@ -53,6 +55,7 @@
 
 		<label>X10 Switch</label>
 		<description>On/off switch</description>
+		<semantic-equipment-tag>WallSwitch</semantic-equipment-tag>
 
 		<channels>
 			<channel id="switchstatus" typeId="switchState"/>
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 725f497e45728..fd503d509db80 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 @@
 	<thing-type id="comfoair">
 		<label>Generic ComfoAir Ventilation System</label>
 		<description>Provides a generic access to a ComfoAir compatible ventilation system</description>
+		<semantic-equipment-tag>HVAC</semantic-equipment-tag>
 
 		<channel-groups>
 			<channel-group id="bindingControl" typeId="bindingControl"/>
@@ -52,6 +53,7 @@
 	<thing-type id="WHR930">
 		<label>Zehnder WHR930 Ventilation System</label>
 		<description>Provides a generic access to a Zehnder WHR930 ventilation device</description>
+		<semantic-equipment-tag>HVAC</semantic-equipment-tag>
 
 		<channel-groups>
 			<channel-group id="bindingControl" typeId="bindingControl"/>
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 fd59e90a97787..2ee654be4a44e 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 @@
 	<bridge-type id="controller">
 		<label>CoolMasterNet Controller</label>
 		<description>A CoolMasterNet Controller (connected to one or more HVAC systems)</description>
+		<semantic-equipment-tag>HVAC</semantic-equipment-tag>
 
 		<config-description>
 			<parameter name="host" type="text" required="true">
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 de88d4f09ce77..57b44eaa91616 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 @@
 
 		<label>Corona Statistics (Country)</label>
 		<description>Corona statistics for a specific country</description>
+		<semantic-equipment-tag>WebService</semantic-equipment-tag>
 
 		<channels>
 			<channel id="cases" typeId="cases"/>
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 ef8e4bbcca1a6..5dcad9a5e2ed0 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-type id="world">
 		<label>Corona Statistics (World)</label>
 		<description>Bridge for accessing data from https://corona-stats.online/ website and representing world statistics.</description>
+		<semantic-equipment-tag>NetworkAppliance</semantic-equipment-tag>
 
 		<channels>
 			<channel id="cases" typeId="cases"/>
diff --git a/bundles/org.openhab.binding.daikin/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.daikin/src/main/resources/OH-INF/thing/thing-types.xml
index f6629f627e292..f35fa18b39433 100644
--- a/bundles/org.openhab.binding.daikin/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.daikin/src/main/resources/OH-INF/thing/thing-types.xml
@@ -7,6 +7,7 @@
 	<thing-type id="ac_unit">
 		<label>Daikin AC Unit</label>
 		<description>Daikin AC Unit</description>
+		<semantic-equipment-tag>AirConditioner</semantic-equipment-tag>
 
 		<channels>
 			<channel id="power" typeId="acunit-power"/>
@@ -66,6 +67,7 @@
 	<thing-type id="airbase_ac_unit">
 		<label>Daikin Airbase AC Unit</label>
 		<description>Daikin Airbase AC Unit</description>
+		<semantic-equipment-tag>AirConditioner</semantic-equipment-tag>
 
 		<channels>
 			<channel id="power" typeId="acunit-power"/>
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 1c13dbdfc50ba..5a739b40dd2ab 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 @@
 		</supported-bridge-type-refs>
 		<label>DALI Device</label>
 		<description>Controls a single device/ballast</description>
+		<semantic-equipment-tag>LightSource</semantic-equipment-tag>
+
 		<channels>
 			<channel id="dimAtFadeRate" typeId="system.brightness"/>
 			<channel id="dimImmediately" typeId="system.brightness"/>
@@ -38,6 +40,7 @@
 		</supported-bridge-type-refs>
 		<label>DALI Group</label>
 		<description>Controls a group of devices/ballasts</description>
+		<semantic-equipment-tag>LightSource</semantic-equipment-tag>
 		<channels>
 			<channel id="dimAtFadeRate" typeId="system.brightness"/>
 			<channel id="dimImmediately" typeId="system.brightness"/>
@@ -64,6 +67,7 @@
 		</supported-bridge-type-refs>
 		<label>DALI RGB Device</label>
 		<description>Controls three DALI devices representing R,G,B lighting channels</description>
+		<semantic-equipment-tag>LightSource</semantic-equipment-tag>
 		<channels>
 			<channel id="color" typeId="system.color"/>
 		</channels>
@@ -113,6 +117,7 @@
 		</supported-bridge-type-refs>
 		<label>DALI DT8 Group</label>
 		<description>Controls a DT8 group of devices/ballasts</description>
+		<semantic-equipment-tag>LightSource</semantic-equipment-tag>
 		<channels>
 			<channel id="dimAtFadeRate" typeId="system.brightness"/>
 			<channel id="dimImmediately" typeId="system.brightness"/>
diff --git a/bundles/org.openhab.binding.danfossairunit/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.danfossairunit/src/main/resources/OH-INF/thing/thing-types.xml
index e041ae84ef965..177625448fea0 100644
--- a/bundles/org.openhab.binding.danfossairunit/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.danfossairunit/src/main/resources/OH-INF/thing/thing-types.xml
@@ -8,6 +8,7 @@
 	<thing-type id="airunit">
 		<label>Danfoss Air Unit</label>
 		<description>The Danfoss Air Unit Heat Exchanger, CCM and Air Dial</description>
+		<semantic-equipment-tag>HeatRecovery</semantic-equipment-tag>
 
 		<channel-groups>
 			<channel-group id="main" typeId="main"/>
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 726a857a54aa2..6dbf1e54204a0 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 @@
 	<thing-type id="avr">
 		<label>Denon/Marantz AVR</label>
 		<description>Control a Denon/Marantz AVR.</description>
+		<semantic-equipment-tag>Receiver</semantic-equipment-tag>
 
 		<channel-groups>
 			<channel-group id="general" typeId="general"/>
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 8bbcce8f12cb0..5d6cf5d68c52e 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 @@
 		<label>Deutsche Bahn Timetable</label>
 		<description>Connection to the timetable API of Deutsche Bahn. Provides timetable data that can be displayed using the
 			train things.</description>
+		<semantic-equipment-tag>WebService</semantic-equipment-tag>
 
 		<config-description>
 			<parameter name="clientId" type="text" required="true">
@@ -51,6 +52,7 @@
 		</supported-bridge-type-refs>
 		<label>Train</label>
 		<description>Displays information about a train within the given timetable at one station.</description>
+		<semantic-equipment-tag>WebService</semantic-equipment-tag>
 		<channel-groups>
 			<channel-group typeId="tripAttributes" id="trip">
 				<label>Trip</label>
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 bb27064dde6ae..6dfcb49904e03 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 @@
 	<bridge-type id="dssBridge">
 		<label>@text/dSS_label</label>
 		<description>@text/dSS_desc</description>
+		<semantic-equipment-tag>NetworkAppliance</semantic-equipment-tag>
 		<channels>
 			<channel typeId="total_consumption_wh" id="total_consumption_wh"/>
 			<channel typeId="total_energy_wh" id="total_energy_wh"/>
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 8cbee61c17e6d..1ea7dbd0896a5 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 @@
 	<thing-type id="DCH-S150">
 		<label>Motion Sensor</label>
 		<description>D-Link DCH-S150 WiFi motion sensor</description>
+		<semantic-equipment-tag>MotionDetector</semantic-equipment-tag>
 
 		<channels>
 			<channel id="motion" typeId="system.trigger">
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 3e00e67dbe81a..8dc6ee884a6fb 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 @@
 	<thing-type id="cp750">
 		<label>CP750 Device</label>
 		<description>Binding for Dolby Cinema Processor CP750</description>
+		<semantic-equipment-tag>AudioVisual</semantic-equipment-tag>
 
 		<channels>
 			<channel id="fader" typeId="fader"/>
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 b5be96be05967..65b1b18e7c5e6 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 @@
 	<thing-type id="d101">
 		<label>Doorbird Doorbell D101/D201/D205/D1101V</label>
 		<description>Doorbird doorbell model D101/D201/D205/D1101V</description>
+		<semantic-equipment-tag>Doorbell</semantic-equipment-tag>
+
 		<channels>
 			<channel id="doorbell" typeId="system.rawbutton">
 				<label>Doorbell</label>
@@ -36,6 +38,8 @@
 	<thing-type id="d210x">
 		<label>Doorbird D210x Doorbell</label>
 		<description>Doorbird doorbell model D210x</description>
+		<semantic-equipment-tag>Doorbell</semantic-equipment-tag>
+
 		<channels>
 			<channel id="doorbell" typeId="system.rawbutton">
 				<label>Doorbell</label>
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 2ca034e72201b..0d1bde42bf4c6 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 @@
 	<bridge-type id="heathub">
 		<label>HeatHub</label>
 		<description>A Drayton Wiser HeatHub acting as a bridge to Thermostats and TRVs</description>
+		<semantic-equipment-tag>NetworkAppliance</semantic-equipment-tag>
 
 		<representation-property>networkAddress</representation-property>
 
@@ -42,6 +43,7 @@
 
 		<label>Boiler Controller</label>
 		<description>The controller attached to the boiler</description>
+		<semantic-equipment-tag>Boiler</semantic-equipment-tag>
 
 		<channels>
 			<channel id="heatingOverride" typeId="heatingOverride-channel"/>
@@ -79,6 +81,7 @@
 
 		<label>Hot Water</label>
 		<description>The hot water heating system</description>
+		<semantic-equipment-tag>WaterHeater</semantic-equipment-tag>
 
 		<channels>
 			<channel id="hotWaterOverride" typeId="hotWaterOverride-channel"/>
@@ -108,6 +111,7 @@
 
 		<label>Room</label>
 		<description>A Room that contains a thermostat and/or TRV</description>
+		<semantic-equipment-tag>Thermostat</semantic-equipment-tag>
 
 		<channels>
 			<channel id="currentTemperature" typeId="currentTemperature-channel"/>
@@ -145,6 +149,7 @@
 
 		<label>Thermostat</label>
 		<description>Wireless Thermostat device</description>
+		<semantic-equipment-tag>Thermostat</semantic-equipment-tag>
 
 		<channels>
 			<channel id="currentTemperature" typeId="currentTemperature-channel"/>
@@ -182,6 +187,7 @@
 
 		<label>iTRV</label>
 		<description>Thermostatic Radiator Valve</description>
+		<semantic-equipment-tag>RadiatorControl</semantic-equipment-tag>
 
 		<channels>
 			<channel id="currentTemperature" typeId="currentTemperature-channel"/>
@@ -219,6 +225,7 @@
 
 		<label>Smart Plug</label>
 		<description>Remote controlled Plug Socket</description>
+		<semantic-equipment-tag>PowerOutlet</semantic-equipment-tag>
 
 		<channels>
 			<channel id="plugOutputState" typeId="plugOutputState-channel"/>
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 909bef60c3aa9..c7b18ac37b4d2 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 @@
 		<label>EyezOn Envisalink</label>
 		<description>This bridge represents the EyezOn Envlisalink 3/2D
 			Ethernet interface.</description>
+		<semantic-equipment-tag>NetworkAppliance</semantic-equipment-tag>
 
 		<channels>
 			<channel id="bridge_reset" typeId="reset">
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 2d2513c1e3fcc..c06831ed6d65d 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 @@
 	<bridge-type id="it100">
 		<label>DSC IT-100</label>
 		<description>This bridge represents the DSC IT-100 Serial interface.</description>
+		<semantic-equipment-tag>NetworkAppliance</semantic-equipment-tag>
 
 		<channels>
 			<channel id="bridge_reset" typeId="reset">
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 2f9f4a78a90c5..685802bbe76d9 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 @@
 
 		<label>DSC Alarm Keypad</label>
 		<description>Represents the central administrative unit of the DSC Alarm System.</description>
+		<semantic-equipment-tag>Keypad</semantic-equipment-tag>
 
 		<channels>
 			<channel id="keypad_ready_led" typeId="led">
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 9ea265dc22881..d96cc37a29023 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 @@
 
 		<label>DSC Alarm Partition</label>
 		<description>Represents a controllable area within a DSC Alarm System.</description>
+		<semantic-equipment-tag>AlarmSystem</semantic-equipment-tag>
 
 		<channels>
 			<channel id="partition_status" typeId="message">
diff --git a/bundles/org.openhab.binding.dscalarm/src/main/resources/OH-INF/thing/tcpserverbridge.xml b/bundles/org.openhab.binding.dscalarm/src/main/resources/OH-INF/thing/tcpserverbridge.xml
index 1dd5a75876ec2..23c01a39e01fa 100644
--- a/bundles/org.openhab.binding.dscalarm/src/main/resources/OH-INF/thing/tcpserverbridge.xml
+++ b/bundles/org.openhab.binding.dscalarm/src/main/resources/OH-INF/thing/tcpserverbridge.xml
@@ -9,6 +9,7 @@
 		<description>This bridge represents a TCP Server
 			Ethernet interface.
 		</description>
+		<semantic-equipment-tag>NetworkAppliance</semantic-equipment-tag>
 
 		<channels>
 			<channel id="bridge_reset" typeId="reset">
diff --git a/bundles/org.openhab.binding.dscalarm/src/main/resources/OH-INF/thing/zone.xml b/bundles/org.openhab.binding.dscalarm/src/main/resources/OH-INF/thing/zone.xml
index 21814b2227d91..f4473cd55a18b 100644
--- a/bundles/org.openhab.binding.dscalarm/src/main/resources/OH-INF/thing/zone.xml
+++ b/bundles/org.openhab.binding.dscalarm/src/main/resources/OH-INF/thing/zone.xml
@@ -13,6 +13,7 @@
 
 		<label>DSC Alarm Zone</label>
 		<description>Represents a physical device such as a door, window, or motion sensor.</description>
+		<semantic-equipment-tag>AlarmDevice</semantic-equipment-tag>
 
 		<channels>
 			<channel id="zone_status" typeId="zone_status">
diff --git a/bundles/org.openhab.binding.dwdpollenflug/src/main/resources/OH-INF/thing/bridge.xml b/bundles/org.openhab.binding.dwdpollenflug/src/main/resources/OH-INF/thing/bridge.xml
index 21de0a4aa54dc..a6e4dfe63e9f4 100644
--- a/bundles/org.openhab.binding.dwdpollenflug/src/main/resources/OH-INF/thing/bridge.xml
+++ b/bundles/org.openhab.binding.dwdpollenflug/src/main/resources/OH-INF/thing/bridge.xml
@@ -7,6 +7,7 @@
 	<bridge-type id="bridge">
 		<label>DWD Pollen Count Index (Bridge)</label>
 		<description>Bridge for accessing pollen count index data of the DWD</description>
+		<semantic-equipment-tag>NetworkAppliance</semantic-equipment-tag>
 
 		<channel-groups>
 			<channel-group id="updates" typeId="updates"/>
diff --git a/bundles/org.openhab.binding.dwdpollenflug/src/main/resources/OH-INF/thing/region.xml b/bundles/org.openhab.binding.dwdpollenflug/src/main/resources/OH-INF/thing/region.xml
index c2a9e43e0dabc..db3f73e015eee 100644
--- a/bundles/org.openhab.binding.dwdpollenflug/src/main/resources/OH-INF/thing/region.xml
+++ b/bundles/org.openhab.binding.dwdpollenflug/src/main/resources/OH-INF/thing/region.xml
@@ -11,6 +11,7 @@
 
 		<label>DWD Pollen Count Index (Region)</label>
 		<description>Pollen count index for a region or partregion</description>
+		<semantic-equipment-tag>WebService</semantic-equipment-tag>
 
 		<channel-groups>
 			<channel-group id="alder" typeId="pollentype">
diff --git a/bundles/org.openhab.binding.dwdunwetter/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.dwdunwetter/src/main/resources/OH-INF/thing/thing-types.xml
index fc7dc3bc76a85..f129efc45e6f4 100644
--- a/bundles/org.openhab.binding.dwdunwetter/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.dwdunwetter/src/main/resources/OH-INF/thing/thing-types.xml
@@ -7,6 +7,8 @@
 	<thing-type id="dwdwarnings">
 		<label>Weather Warnings</label>
 		<description>Weather Warnings for an area.</description>
+		<semantic-equipment-tag>WeatherService</semantic-equipment-tag>
+
 		<channels>
 			<channel typeId="lastUpdated" id="lastUpdated"/>
 		</channels>
diff --git a/bundles/org.openhab.binding.easee/src/main/resources/OH-INF/thing/things.xml b/bundles/org.openhab.binding.easee/src/main/resources/OH-INF/thing/things.xml
index f5673e1dde797..aab8108d41e81 100644
--- a/bundles/org.openhab.binding.easee/src/main/resources/OH-INF/thing/things.xml
+++ b/bundles/org.openhab.binding.easee/src/main/resources/OH-INF/thing/things.xml
@@ -6,6 +6,7 @@
 	<bridge-type id="site">
 		<label>Easee Site</label>
 		<description>Cloud connection to an Easee site.</description>
+		<semantic-equipment-tag>WebService</semantic-equipment-tag>
 		<config-description-ref uri="thing-type:easee:site"/>
 	</bridge-type>
 	<thing-type id="mastercharger">
@@ -14,6 +15,8 @@
 		</supported-bridge-type-refs>
 		<label>Easee Master Charger</label>
 		<description>Cloud connected Easee Master Charger which also controls the circuit.</description>
+		<semantic-equipment-tag>EVSE</semantic-equipment-tag>
+
 		<channel-groups>
 			<channel-group typeId="charger-state" id="state"/>
 			<channel-group typeId="charger-config" id="config"/>
@@ -33,6 +36,8 @@
 		</supported-bridge-type-refs>
 		<label>Easee Charger</label>
 		<description>Cloud connected Easee Charger.</description>
+		<semantic-equipment-tag>EVSE</semantic-equipment-tag>
+
 		<channel-groups>
 			<channel-group typeId="charger-state" id="state"/>
 			<channel-group typeId="charger-config" id="config"/>
diff --git a/bundles/org.openhab.binding.ecobee/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.ecobee/src/main/resources/OH-INF/thing/thing-types.xml
index 911676c5e71af..11d4765e677e6 100644
--- a/bundles/org.openhab.binding.ecobee/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.ecobee/src/main/resources/OH-INF/thing/thing-types.xml
@@ -8,6 +8,7 @@
 	<bridge-type id="account">
 		<label>Ecobee Account</label>
 		<description>Represents an account at Ecobee</description>
+		<semantic-equipment-tag>WebService</semantic-equipment-tag>
 		<config-description-ref uri="thing-type:ecobee:account"/>
 	</bridge-type>
 
@@ -18,6 +19,8 @@
 		</supported-bridge-type-refs>
 		<label>Ecobee Thermostat</label>
 		<description>An Ecobee thermostat</description>
+		<semantic-equipment-tag>Thermostat</semantic-equipment-tag>
+
 		<channel-groups>
 			<channel-group id="info" typeId="info">
 				<label>Thermostat Info</label>
diff --git a/bundles/org.openhab.binding.ecotouch/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.ecotouch/src/main/resources/OH-INF/thing/thing-types.xml
index 375c109400ebb..cfc5282763518 100644
--- a/bundles/org.openhab.binding.ecotouch/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.ecotouch/src/main/resources/OH-INF/thing/thing-types.xml
@@ -8,6 +8,7 @@
 		<label>Waterkotte EcoTouch Geo</label>
 		<description>Waterkotte EcoTouch Geo heat pump</description>
 		<category>HVAC</category>
+		<semantic-equipment-tag>HeatPump</semantic-equipment-tag>
 
 		<channels>
 			<channel id="temperature_outside" typeId="temperature_outside"/>
@@ -155,6 +156,7 @@
 		<label>Waterkotte EcoTouch Air</label>
 		<description>Waterkotte EcoTouch Air heat pump</description>
 		<category>HVAC</category>
+		<semantic-equipment-tag>HeatPump</semantic-equipment-tag>
 
 		<channels>
 			<channel id="temperature_outside" typeId="temperature_outside"/>
diff --git a/bundles/org.openhab.binding.ecovacs/src/main/resources/OH-INF/thing/bridge.xml b/bundles/org.openhab.binding.ecovacs/src/main/resources/OH-INF/thing/bridge.xml
index 9c41dba2ea829..b982618ff4c42 100644
--- a/bundles/org.openhab.binding.ecovacs/src/main/resources/OH-INF/thing/bridge.xml
+++ b/bundles/org.openhab.binding.ecovacs/src/main/resources/OH-INF/thing/bridge.xml
@@ -8,6 +8,7 @@
 	<bridge-type id="ecovacsapi">
 		<label>Ecovacs API Account</label>
 		<description>The API account</description>
+		<semantic-equipment-tag>WebService</semantic-equipment-tag>
 
 		<config-description>
 			<parameter name="email" type="text">
diff --git a/bundles/org.openhab.binding.ecovacs/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.ecovacs/src/main/resources/OH-INF/thing/thing-types.xml
index a527130b7a945..3a93a0926f45e 100644
--- a/bundles/org.openhab.binding.ecovacs/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.ecovacs/src/main/resources/OH-INF/thing/thing-types.xml
@@ -11,6 +11,7 @@
 
 		<label>Ecovacs Vacuum Cleaner</label>
 		<description>Represents an Ecovacs vacuum cleaner</description>
+		<semantic-equipment-tag>CleaningRobot</semantic-equipment-tag>
 
 		<channel-groups>
 			<channel-group id="actions" typeId="actions"/>
diff --git a/bundles/org.openhab.binding.ecowatt/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.ecowatt/src/main/resources/OH-INF/thing/thing-types.xml
index 1dbd4ac7e614a..4106a9864d539 100644
--- a/bundles/org.openhab.binding.ecowatt/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.ecowatt/src/main/resources/OH-INF/thing/thing-types.xml
@@ -7,6 +7,7 @@
 	<thing-type id="signals">
 		<label>Electricity Forecast</label>
 		<description>The French electricity consumption forecasts</description>
+		<semantic-equipment-tag>WebService</semantic-equipment-tag>
 
 		<channels>
 			<channel id="todaySignal" typeId="signal">
diff --git a/bundles/org.openhab.binding.electroluxappliance/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.electroluxappliance/src/main/resources/OH-INF/thing/thing-types.xml
index b8219a945778c..63ca5a8d2df37 100644
--- a/bundles/org.openhab.binding.electroluxappliance/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.electroluxappliance/src/main/resources/OH-INF/thing/thing-types.xml
@@ -7,6 +7,7 @@
 	<bridge-type id="api">
 		<label>Electrolux Group API</label>
 		<description>This bridge represents the web API connector.</description>
+		<semantic-equipment-tag>WebService</semantic-equipment-tag>
 
 		<properties>
 			<property name="vendor">Electrolux</property>
@@ -36,7 +37,7 @@
 
 		<label>Air Purifier</label>
 		<description>This thing represents the Electrolux Air Purifier.</description>
-
+		<semantic-equipment-tag>AirFilter</semantic-equipment-tag>
 		<channels>
 			<channel id="temperature" typeId="temperature"/>
 			<channel id="humidity" typeId="humidity"/>
@@ -77,7 +78,7 @@
 
 		<label>Washing Machine</label>
 		<description>This thing represents the Electrolux Washing Machine.</description>
-
+		<semantic-equipment-tag>WashingMachine</semantic-equipment-tag>
 		<channels>
 			<channel id="door-state" typeId="door-state"/>
 			<channel id="door-lock" typeId="door-lock"/>
diff --git a/bundles/org.openhab.binding.energenie/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.energenie/src/main/resources/OH-INF/thing/thing-types.xml
index 75e7a05f28f21..f666f84f3c6c8 100644
--- a/bundles/org.openhab.binding.energenie/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.energenie/src/main/resources/OH-INF/thing/thing-types.xml
@@ -7,6 +7,7 @@
 	<thing-type id="pm2lan">
 		<label>EG-PM2-LAN</label>
 		<description>Energenie programmable power strip with LAN interface</description>
+		<semantic-equipment-tag>PowerOutlet</semantic-equipment-tag>
 
 		<channels>
 			<channel id="socket1" typeId="socket1"/>
@@ -22,6 +23,7 @@
 	<thing-type id="pmslan">
 		<label>EG-PMS-LAN</label>
 		<description>Energenie programmable power strip with LAN interface</description>
+		<semantic-equipment-tag>PowerOutlet</semantic-equipment-tag>
 
 		<channels>
 			<channel id="socket1" typeId="socket1"/>
@@ -37,6 +39,7 @@
 	<thing-type id="pms2lan">
 		<label>EG-PMS2-LAN</label>
 		<description>Energenie programmable power strip with LAN interface</description>
+		<semantic-equipment-tag>PowerOutlet</semantic-equipment-tag>
 
 		<channels>
 			<channel id="socket1" typeId="socket1"/>
@@ -52,6 +55,7 @@
 	<thing-type id="pmswlan">
 		<label>EG-PMS-WLAN</label>
 		<description>Energenie programmable power strip with WLAN interface</description>
+		<semantic-equipment-tag>PowerOutlet</semantic-equipment-tag>
 
 		<channels>
 			<channel id="socket1" typeId="socket1"/>
@@ -67,6 +71,7 @@
 	<thing-type id="pwmlan">
 		<label>EGM-PWM-LAN</label>
 		<description>Energenie energy meter with LAN interface</description>
+		<semantic-equipment-tag>PowerOutlet</semantic-equipment-tag>
 
 		<channels>
 			<channel id="voltage" typeId="voltage"/>
diff --git a/bundles/org.openhab.binding.energidataservice/src/main/resources/OH-INF/thing/thing-service.xml b/bundles/org.openhab.binding.energidataservice/src/main/resources/OH-INF/thing/thing-service.xml
index fd893596bfd87..989f4f4a0c1d8 100644
--- a/bundles/org.openhab.binding.energidataservice/src/main/resources/OH-INF/thing/thing-service.xml
+++ b/bundles/org.openhab.binding.energidataservice/src/main/resources/OH-INF/thing/thing-service.xml
@@ -8,6 +8,7 @@
 
 		<label>Energi Data Service</label>
 		<description>This Thing represents the Energi Data Service API.</description>
+		<semantic-equipment-tag>WebService</semantic-equipment-tag>
 
 		<channel-groups>
 			<channel-group id="electricity" typeId="electricity"/>
diff --git a/bundles/org.openhab.binding.enphase/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.enphase/src/main/resources/OH-INF/thing/thing-types.xml
index bc8f6e2c49293..4155a656a671e 100644
--- a/bundles/org.openhab.binding.enphase/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.enphase/src/main/resources/OH-INF/thing/thing-types.xml
@@ -8,6 +8,7 @@
 	<bridge-type id="envoy">
 		<label>Envoy</label>
 		<description>Envoy gateway</description>
+		<semantic-equipment-tag>NetworkAppliance</semantic-equipment-tag>
 
 		<channel-groups>
 			<channel-group id="production" typeId="envoy-production">
@@ -77,6 +78,7 @@
 
 		<label>Inverter</label>
 		<description>Inverter</description>
+		<semantic-equipment-tag>Inverter</semantic-equipment-tag>
 
 		<channels>
 			<channel id="lastReportWatts" typeId="last-report-watts"/>
@@ -110,6 +112,7 @@
 
 		<label>Relay Controller</label>
 		<description>Network system relay controller</description>
+		<semantic-equipment-tag>PowerSupply</semantic-equipment-tag>
 
 		<channels>
 			<channel id="relay" typeId="relay"/>
diff --git a/bundles/org.openhab.binding.entsoe/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.entsoe/src/main/resources/OH-INF/thing/thing-types.xml
index 6845becf62c4d..24b55fd2c9c65 100644
--- a/bundles/org.openhab.binding.entsoe/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.entsoe/src/main/resources/OH-INF/thing/thing-types.xml
@@ -10,6 +10,8 @@
 		<description>Hourly spot prices of the electricity market from European Network of Transmission System Operators
 			(ENTSO-E)</description>
 		<category>WebService</category>
+		<semantic-equipment-tag>WebService</semantic-equipment-tag>
+
 		<channels>
 			<channel id="spot-price" typeId="spot-price"/>
 			<channel id="prices-received" typeId="trigger-prices-received"/>
diff --git a/bundles/org.openhab.binding.enturno/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.enturno/src/main/resources/OH-INF/thing/thing-types.xml
index 16f551c0104d7..efd877444c26d 100644
--- a/bundles/org.openhab.binding.enturno/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.enturno/src/main/resources/OH-INF/thing/thing-types.xml
@@ -9,6 +9,7 @@
 		<label>Entur Timetable</label>
 		<description>Provides real-time (estimated) departure timetable for chosen public transport line and stop in Norway.
 			Data provided by Entur.no API.</description>
+		<semantic-equipment-tag>WebService</semantic-equipment-tag>
 
 		<channel-groups>
 			<channel-group id="stopPlace" typeId="stopPlace"/>
diff --git a/bundles/org.openhab.binding.etherrain/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.etherrain/src/main/resources/OH-INF/thing/thing-types.xml
index 084edb1acf622..79d4cdb80abc0 100644
--- a/bundles/org.openhab.binding.etherrain/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.etherrain/src/main/resources/OH-INF/thing/thing-types.xml
@@ -7,6 +7,7 @@
 	<thing-type id="etherrain">
 		<label>EtherRain</label>
 		<description>This is a stand alone EtherRain device that allows sprinkler control</description>
+		<semantic-equipment-tag>Irrigation</semantic-equipment-tag>
 
 		<channels>
 			<channel id="commandstatus" typeId="commandstatus"/>
diff --git a/bundles/org.openhab.binding.evcc/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.evcc/src/main/resources/OH-INF/thing/thing-types.xml
index 3b88b6fc28207..9fd23564e1641 100644
--- a/bundles/org.openhab.binding.evcc/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.evcc/src/main/resources/OH-INF/thing/thing-types.xml
@@ -8,6 +8,7 @@
 
 		<label>evcc installation</label>
 		<description>A running evcc installation</description>
+		<semantic-equipment-tag>EVSE</semantic-equipment-tag>
 
 		<channel-groups>
 			<channel-group id="general" typeId="general"/>
diff --git a/bundles/org.openhab.binding.evohome/src/main/resources/OH-INF/thing/bridge.xml b/bundles/org.openhab.binding.evohome/src/main/resources/OH-INF/thing/bridge.xml
index fe0e59ed535f6..e7b32cb69f09b 100644
--- a/bundles/org.openhab.binding.evohome/src/main/resources/OH-INF/thing/bridge.xml
+++ b/bundles/org.openhab.binding.evohome/src/main/resources/OH-INF/thing/bridge.xml
@@ -8,6 +8,7 @@
 		<label>evohome Account</label>
 		<description>The evohome account is used to connect to your Total Connect Comfort (TCC) using your TCC username and
 			password.</description>
+		<semantic-equipment-tag>WebService</semantic-equipment-tag>
 		<config-description>
 			<parameter-group name="auth">
 				<label>Authentication</label>
diff --git a/bundles/org.openhab.binding.evohome/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.evohome/src/main/resources/OH-INF/thing/thing-types.xml
index 57eb85be349f9..9a01780e978b9 100644
--- a/bundles/org.openhab.binding.evohome/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.evohome/src/main/resources/OH-INF/thing/thing-types.xml
@@ -9,6 +9,7 @@
 		</supported-bridge-type-refs>
 		<label>evohome Display</label>
 		<description>This represents the evohome control display.</description>
+		<semantic-equipment-tag>Screen</semantic-equipment-tag>
 		<channels>
 			<channel id="SystemMode" typeId="systemMode"/>
 		</channels>
@@ -29,6 +30,7 @@
 		</supported-bridge-type-refs>
 		<label>evohome Heating Zone</label>
 		<description>This represents the evohome Heating Zone.</description>
+		<semantic-equipment-tag>Thermostat</semantic-equipment-tag>
 		<channels>
 			<channel id="Temperature" typeId="temperature"/>
 			<channel id="SetPointStatus" typeId="setpointstatus"/>
diff --git a/bundles/org.openhab.binding.feican/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.feican/src/main/resources/OH-INF/thing/thing-types.xml
index 3203300435982..26b1df2997f12 100644
--- a/bundles/org.openhab.binding.feican/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.feican/src/main/resources/OH-INF/thing/thing-types.xml
@@ -7,6 +7,7 @@
 	<thing-type id="bulb">
 		<label>Wifi RGBW Bulb</label>
 		<description>A dimmable light with changeable colors.</description>
+		<semantic-equipment-tag>LightSource</semantic-equipment-tag>
 
 		<channels>
 			<channel id="color" typeId="color"/>
diff --git a/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/thing/thing-types.xml
index 1ae8c93676abe..cead2afeba50c 100644
--- a/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/thing/thing-types.xml
@@ -10,6 +10,7 @@
 		<label>FENECON Home</label>
 		<description>Thing for FENECON Home Device</description>
 		<category>Solarplant</category>
+		<semantic-equipment-tag>Inverter</semantic-equipment-tag>
 
 		<channels>
 			<channel id="state" typeId="state"/>
diff --git a/bundles/org.openhab.binding.fineoffsetweatherstation/src/main/resources/OH-INF/thing/gateway.xml b/bundles/org.openhab.binding.fineoffsetweatherstation/src/main/resources/OH-INF/thing/gateway.xml
index 8de145105bfed..f7f2e5b3a093f 100644
--- a/bundles/org.openhab.binding.fineoffsetweatherstation/src/main/resources/OH-INF/thing/gateway.xml
+++ b/bundles/org.openhab.binding.fineoffsetweatherstation/src/main/resources/OH-INF/thing/gateway.xml
@@ -8,6 +8,7 @@
 		<label>Gateway Device</label>
 		<description>A WiFi connected gateway device (WN1900, GW1000, GW1100, WH2680, WH2650) to bridge Sensors</description>
 		<category>NetworkAppliance</category>
+		<semantic-equipment-tag>NetworkAppliance</semantic-equipment-tag>
 		<representation-property>macAddress</representation-property>
 		<config-description-ref uri="thing-type:fineoffsetweatherstation:gateway"/>
 	</bridge-type>
diff --git a/bundles/org.openhab.binding.fineoffsetweatherstation/src/main/resources/OH-INF/thing/sensor.xml b/bundles/org.openhab.binding.fineoffsetweatherstation/src/main/resources/OH-INF/thing/sensor.xml
index 7581fc571d0c9..288e33fb267ee 100644
--- a/bundles/org.openhab.binding.fineoffsetweatherstation/src/main/resources/OH-INF/thing/sensor.xml
+++ b/bundles/org.openhab.binding.fineoffsetweatherstation/src/main/resources/OH-INF/thing/sensor.xml
@@ -24,6 +24,7 @@
 		<label>Sensor Device</label>
 		<description>A Sensor connected to the gateway (WN1900, GW1000, GW1100, WH2680, WH2650)</description>
 		<category>Sensor</category>
+		<semantic-equipment-tag>Sensor</semantic-equipment-tag>
 
 		<channels>
 			<channel id="signal" typeId="system.signal-strength"/>
diff --git a/bundles/org.openhab.binding.flicbutton/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.flicbutton/src/main/resources/OH-INF/thing/thing-types.xml
index e5c79c2ce9008..e9b6a1343a384 100644
--- a/bundles/org.openhab.binding.flicbutton/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.flicbutton/src/main/resources/OH-INF/thing/thing-types.xml
@@ -7,6 +7,7 @@
 	<bridge-type id="flicd-bridge">
 		<label>FlicButton Bridge</label>
 		<description>This bridge represents a running instance of the fliclib-linux-hci server (flicd).</description>
+		<semantic-equipment-tag>NetworkAppliance</semantic-equipment-tag>
 
 		<config-description>
 			<parameter name="hostname" type="text" required="false">
@@ -29,6 +30,7 @@
 		</supported-bridge-type-refs>
 		<label>Flic Button</label>
 		<description>The thing(-type) representing a Flic Button</description>
+		<semantic-equipment-tag>Button</semantic-equipment-tag>
 		<channels>
 			<channel id="rawbutton" typeId="system.rawbutton"/>
 			<channel id="button" typeId="system.button"/>
diff --git a/bundles/org.openhab.binding.flume/src/main/resources/OH-INF/thing/flume-cloud-connector.xml b/bundles/org.openhab.binding.flume/src/main/resources/OH-INF/thing/flume-cloud-connector.xml
index 3ca7044df73e3..f96e592e4e861 100644
--- a/bundles/org.openhab.binding.flume/src/main/resources/OH-INF/thing/flume-cloud-connector.xml
+++ b/bundles/org.openhab.binding.flume/src/main/resources/OH-INF/thing/flume-cloud-connector.xml
@@ -7,6 +7,7 @@
 	<bridge-type id="cloud">
 		<label>Flume Cloud Connector</label>
 		<description>Flume cloud connector.</description>
+		<semantic-equipment-tag>WebService</semantic-equipment-tag>
 
 		<config-description>
 			<parameter name="username" type="text">
diff --git a/bundles/org.openhab.binding.flume/src/main/resources/OH-INF/thing/flume-device.xml b/bundles/org.openhab.binding.flume/src/main/resources/OH-INF/thing/flume-device.xml
index 4f6f913239536..93fbecef1cd8f 100644
--- a/bundles/org.openhab.binding.flume/src/main/resources/OH-INF/thing/flume-device.xml
+++ b/bundles/org.openhab.binding.flume/src/main/resources/OH-INF/thing/flume-device.xml
@@ -11,6 +11,7 @@
 
 		<label>Flume Meter Device</label>
 		<description>Flume water meter device.</description>
+		<semantic-equipment-tag>WaterMeter</semantic-equipment-tag>
 
 		<channels>
 			<channel id="instant-usage" typeId="instant-usage"/>
diff --git a/bundles/org.openhab.binding.fmiweather/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.fmiweather/src/main/resources/OH-INF/thing/thing-types.xml
index 468afc12d545e..59fdca72f9ecd 100644
--- a/bundles/org.openhab.binding.fmiweather/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.fmiweather/src/main/resources/OH-INF/thing/thing-types.xml
@@ -8,6 +8,7 @@
 	<thing-type id="observation">
 		<label>FMI Current Weather (Observation)</label>
 		<description>Finnish Meteorological Institute (FMI) weather observation</description>
+		<semantic-equipment-tag>WeatherService</semantic-equipment-tag>
 
 		<channel-groups>
 			<channel-group id="current" typeId="current-group"/>
@@ -26,6 +27,7 @@
 	<thing-type id="forecast">
 		<label>FMI Weather Forecast</label>
 		<description>Finnish Meteorological Institute (FMI) weather forecast</description>
+		<semantic-equipment-tag>WeatherService</semantic-equipment-tag>
 
 		<channel-groups>
 			<channel-group id="forecast" typeId="group-forecast">
diff --git a/bundles/org.openhab.binding.foobot/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.foobot/src/main/resources/OH-INF/thing/thing-types.xml
index c5883ad90dc80..901b8b647a0ad 100644
--- a/bundles/org.openhab.binding.foobot/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.foobot/src/main/resources/OH-INF/thing/thing-types.xml
@@ -8,6 +8,7 @@
 	<bridge-type id="account">
 		<label>Foobot Account</label>
 		<description>Your Foobot account.</description>
+		<semantic-equipment-tag>WebService</semantic-equipment-tag>
 
 		<channels>
 			<channel id="apiKeyLimitRemaining" typeId="api-key-limit-remaining"/>
@@ -41,6 +42,7 @@
 
 		<label>Foobot</label>
 		<description>A Foobot device.</description>
+		<semantic-equipment-tag>WeatherStation</semantic-equipment-tag>
 
 		<channels>
 			<channel id="time" typeId="time"/>
diff --git a/bundles/org.openhab.binding.freeathome/src/main/resources/OH-INF/thing/bridge-type.xml b/bundles/org.openhab.binding.freeathome/src/main/resources/OH-INF/thing/bridge-type.xml
index 243f4fdabb96d..9c05898742450 100644
--- a/bundles/org.openhab.binding.freeathome/src/main/resources/OH-INF/thing/bridge-type.xml
+++ b/bundles/org.openhab.binding.freeathome/src/main/resources/OH-INF/thing/bridge-type.xml
@@ -7,6 +7,7 @@
 	<bridge-type id="gateway">
 		<label>free@home Gateway</label>
 		<description>This gateway represents the free@home Gateway</description>
+		<semantic-equipment-tag>NetworkAppliance</semantic-equipment-tag>
 
 		<config-description>
 			<parameter-group name="identification">
diff --git a/bundles/org.openhab.binding.freeboxos/src/main/resources/OH-INF/thing/api-bridge-type.xml b/bundles/org.openhab.binding.freeboxos/src/main/resources/OH-INF/thing/api-bridge-type.xml
index cf0f95dc69cc1..85763f888c4d5 100644
--- a/bundles/org.openhab.binding.freeboxos/src/main/resources/OH-INF/thing/api-bridge-type.xml
+++ b/bundles/org.openhab.binding.freeboxos/src/main/resources/OH-INF/thing/api-bridge-type.xml
@@ -7,6 +7,7 @@
 	<bridge-type id="api">
 		<label>Freebox OS Api</label>
 		<description>Bridge between hosts and the API rest service</description>
+		<semantic-equipment-tag>NetworkAppliance</semantic-equipment-tag>
 
 		<representation-property>apiDomain</representation-property>
 
diff --git a/bundles/org.openhab.binding.freecurrency/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.freecurrency/src/main/resources/OH-INF/thing/thing-types.xml
index 03e3cbbe0953d..e9dd998281a74 100644
--- a/bundles/org.openhab.binding.freecurrency/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.freecurrency/src/main/resources/OH-INF/thing/thing-types.xml
@@ -7,6 +7,7 @@
 	<thing-type id="info" extensible="exchange-rate">
 		<label>Currency Information</label>
 		<description>Provide exchanges rates between currencies and service status information.</description>
+		<semantic-equipment-tag>WebService</semantic-equipment-tag>
 
 		<channels>
 			<channel id="lastUpdate" typeId="last-update"/>
diff --git a/bundles/org.openhab.binding.frenchgovtenergydata/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.frenchgovtenergydata/src/main/resources/OH-INF/thing/thing-types.xml
index 479b16f23ff5c..0d8dbb6a73d92 100644
--- a/bundles/org.openhab.binding.frenchgovtenergydata/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.frenchgovtenergydata/src/main/resources/OH-INF/thing/thing-types.xml
@@ -7,6 +7,7 @@
 	<thing-type id="base">
 		<label>Base Tariff</label>
 		<description>Default Tariff Subscription</description>
+		<semantic-equipment-tag>WebService</semantic-equipment-tag>
 
 		<channels>
 			<channel id="tariff-start" typeId="timestamp"/>
@@ -40,6 +41,7 @@
 	<thing-type id="hphc">
 		<label>HP-HC Tariff</label>
 		<description>High / Low usage Tariff Subscription</description>
+		<semantic-equipment-tag>WebService</semantic-equipment-tag>
 
 		<channels>
 			<channel id="tariff-start" typeId="timestamp"/>
diff --git a/bundles/org.openhab.binding.fronius/src/main/resources/OH-INF/thing/bridge.xml b/bundles/org.openhab.binding.fronius/src/main/resources/OH-INF/thing/bridge.xml
index 143dd95d4ba39..4cefaafcc5f13 100644
--- a/bundles/org.openhab.binding.fronius/src/main/resources/OH-INF/thing/bridge.xml
+++ b/bundles/org.openhab.binding.fronius/src/main/resources/OH-INF/thing/bridge.xml
@@ -7,6 +7,7 @@
 	<bridge-type id="bridge">
 		<label>Fronius Bridge</label>
 		<description>A bridge to connect Fronius devices</description>
+		<semantic-equipment-tag>NetworkAppliance</semantic-equipment-tag>
 		<config-description>
 			<parameter name="hostname" type="text" required="true">
 				<context>network-address</context>
diff --git a/bundles/org.openhab.binding.fronius/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.fronius/src/main/resources/OH-INF/thing/thing-types.xml
index bae2bc1343309..ae1b89af192fb 100644
--- a/bundles/org.openhab.binding.fronius/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.fronius/src/main/resources/OH-INF/thing/thing-types.xml
@@ -11,6 +11,7 @@
 		</supported-bridge-type-refs>
 		<label>Fronius Symo Inverter</label>
 		<description>Fronius Symo power inverter</description>
+		<semantic-equipment-tag>Inverter</semantic-equipment-tag>
 
 		<channels>
 			<channel id="inverterdatachannelpac" typeId="pac"/>
@@ -63,6 +64,7 @@
 		</supported-bridge-type-refs>
 		<label>Fronius Smart Meter</label>
 		<description>Fronius Smart Meter</description>
+		<semantic-equipment-tag>ElectricMeter</semantic-equipment-tag>
 
 		<channels>
 			<channel id="enable" typeId="meter_enable"/>
diff --git a/bundles/org.openhab.binding.fsinternetradio/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.fsinternetradio/src/main/resources/OH-INF/thing/thing-types.xml
index 248851517ac6b..0396fdfce0bfd 100644
--- a/bundles/org.openhab.binding.fsinternetradio/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.fsinternetradio/src/main/resources/OH-INF/thing/thing-types.xml
@@ -7,6 +7,7 @@
 	<thing-type id="radio">
 		<label>Internet Radio</label>
 		<description>An internet radio device based on the Frontier Silicon chipset.</description>
+		<semantic-equipment-tag>MediaPlayer</semantic-equipment-tag>
 
 		<channels>
 			<channel id="power" typeId="power"/>

From fa46d35eec44ab60864701e5eee0865649893ae2 Mon Sep 17 00:00:00 2001
From: Andrew Fiddian-Green <software@whitebear.ch>
Date: Mon, 14 Apr 2025 16:41:10 +0100
Subject: [PATCH 02/15] Missing

Signed-off-by: Andrew Fiddian-Green <software@whitebear.ch>
---
 .../src/main/resources/OH-INF/thing/bridge.xml                   | 1 +
 .../src/main/resources/OH-INF/thing/bridge.xml                   | 1 +
 2 files changed, 2 insertions(+)

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 73b6aa29e6014..dd33553ce0809 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 @@
 	<bridge-type id="bridge">
 		<label>BSB-LAN Bridge</label>
 		<description>A bridge to connect a BSB-LAN device</description>
+                <semantic-equipment-tag>NetworkAppliance</semantic-equipment-tag>
 
 		<config-description>
 			<parameter-group name="network">
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 0d353f670c4d4..316cd52d8bab0 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 @@
 	<bridge-type id="bridge">
 		<label>Caddx</label>
 		<description>This bridge represents the Caddx Serial interface.</description>
+                <semantic-equipment-tag>NetworkAppliance</semantic-equipment-tag>
 
 		<channels>
 			<channel id="send_command" typeId="command">

From 7b8c0a829644e15f5c41dd836d7cf83869e4c316 Mon Sep 17 00:00:00 2001
From: Andrew Fiddian-Green <software@whitebear.ch>
Date: Mon, 14 Apr 2025 19:11:35 +0100
Subject: [PATCH 03/15] change Screen to Display

Signed-off-by: Andrew Fiddian-Green <software@whitebear.ch>
---
 .../src/main/resources/OH-INF/thing/thing-types.xml             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/org.openhab.binding.evohome/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.evohome/src/main/resources/OH-INF/thing/thing-types.xml
index 9a01780e978b9..85cb5d9902bd5 100644
--- a/bundles/org.openhab.binding.evohome/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.evohome/src/main/resources/OH-INF/thing/thing-types.xml
@@ -9,7 +9,7 @@
 		</supported-bridge-type-refs>
 		<label>evohome Display</label>
 		<description>This represents the evohome control display.</description>
-		<semantic-equipment-tag>Screen</semantic-equipment-tag>
+		<semantic-equipment-tag>Display</semantic-equipment-tag>
 		<channels>
 			<channel id="SystemMode" typeId="systemMode"/>
 		</channels>

From 3913f79e0d4370134574ffc0eb77fcd29e9ebf11 Mon Sep 17 00:00:00 2001
From: Andrew Fiddian-Green <software@whitebear.ch>
Date: Mon, 14 Apr 2025 19:17:17 +0100
Subject: [PATCH 04/15] spotless; grundfos stuff

Signed-off-by: Andrew Fiddian-Green <software@whitebear.ch>
---
 .../src/main/resources/OH-INF/thing/thing-types.xml             | 2 +-
 .../src/main/resources/OH-INF/thing/bridge.xml                  | 2 +-
 .../src/main/resources/OH-INF/thing/bridge.xml                  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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 2f8f1d38032b5..f1d178e2fb281 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
@@ -52,7 +52,6 @@
 		<category>Pump</category>
 		<semantic-equipment-tag>Pump</semantic-equipment-tag>
 
-
 		<channels>
 			<channel id="rssi" typeId="rssi"/>
 			<channel id="flow-rate" typeId="grundfos-flow"/>
@@ -85,6 +84,7 @@
 		<label>Grundfos Alpha3</label>
 		<description>A Grundfos Alpha3 circulator pump</description>
 		<category>Pump</category>
+		<semantic-equipment-tag>Pump</semantic-equipment-tag>
 
 		<channels>
 			<channel id="rssi" typeId="rssi"/>
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 dd33553ce0809..d984e38f9ae20 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,7 +7,7 @@
 	<bridge-type id="bridge">
 		<label>BSB-LAN Bridge</label>
 		<description>A bridge to connect a BSB-LAN device</description>
-                <semantic-equipment-tag>NetworkAppliance</semantic-equipment-tag>
+		<semantic-equipment-tag>NetworkAppliance</semantic-equipment-tag>
 
 		<config-description>
 			<parameter-group name="network">
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 316cd52d8bab0..0228706cb0ee2 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,7 +7,7 @@
 	<bridge-type id="bridge">
 		<label>Caddx</label>
 		<description>This bridge represents the Caddx Serial interface.</description>
-                <semantic-equipment-tag>NetworkAppliance</semantic-equipment-tag>
+		<semantic-equipment-tag>NetworkAppliance</semantic-equipment-tag>
 
 		<channels>
 			<channel id="send_command" typeId="command">

From 03a759736904f46a1bcd2302d9e42ad33669545b Mon Sep 17 00:00:00 2001
From: Andrew Fiddian-Green <software@whitebear.ch>
Date: Mon, 14 Apr 2025 21:40:33 +0100
Subject: [PATCH 05/15] change WallSwitch to ControlDevice

Signed-off-by: Andrew Fiddian-Green <software@whitebear.ch>
---
 .../src/main/resources/OH-INF/thing/thing-types.xml           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 281ceba384354..0a726ca526d06 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
@@ -424,7 +424,7 @@
 
 		<label>Universal Switch</label>
 		<description>Universally configurable switch with two buttons.</description>
-		<semantic-equipment-tag>WallSwitch</semantic-equipment-tag>
+		<semantic-equipment-tag>ControlDevice</semantic-equipment-tag>
 
 		<channels>
 			<channel id="key-code" typeId="key-code"/>
@@ -443,7 +443,7 @@
 
 		<label>Universal Switch II</label>
 		<description>Universally configurable switch with four buttons.</description>
-		<semantic-equipment-tag>WallSwitch</semantic-equipment-tag>
+		<semantic-equipment-tag>ControlDevice</semantic-equipment-tag>
 
 		<channels>
 			<channel id="key-code" typeId="key-code"/>

From 058be17809e581b830cd03eb727d0e8c33638ab5 Mon Sep 17 00:00:00 2001
From: Andrew Fiddian-Green <software@whitebear.ch>
Date: Mon, 14 Apr 2025 22:01:03 +0100
Subject: [PATCH 06/15] adorne fixes

Signed-off-by: Andrew Fiddian-Green <software@whitebear.ch>
---
 .../src/main/resources/OH-INF/thing/bridge.xml               | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

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 c002f3a0f5218..10b7adb1279fe 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,13 +2,12 @@
 <thing:thing-descriptions bindingId="adorne"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:thing="https://openhab.org/schemas/thing-description/v1.0.0"
-	xsi:schemaLocation="http://openhab.org/schemas/thing-description/v1.0.0 http://openhab.org/schemas/thing-description-1.0.0.xsd">
+	xsi:schemaLocation="https://openhab.org/schemas/thing-description/v1.0.0 https://openhab.org/schemas/thing-description-1.0.0.xsd">
 
 	<bridge-type id="hub">
 		<label>Adorne Hub</label>
 		<description>The Adorne Hub serves as the bridge to control Adorne switches, dimmer switches and outlets.</description>
-		<semantic-equipment-tag>Dial</semantic-equipment-tag>
-
+		<semantic-equipment-tag>NetworkAppliance</semantic-equipment-tag>
 
 		<config-description>
 			<parameter name="host" type="text">

From 26d9ec81c32aa013aa91c8e1491179668a2dde6b Mon Sep 17 00:00:00 2001
From: Andrew Fiddian-Green <software@whitebear.ch>
Date: Tue, 15 Apr 2025 11:46:41 +0100
Subject: [PATCH 07/15] fix bose

Signed-off-by: Andrew Fiddian-Green <software@whitebear.ch>
---
 .../resources/OH-INF/thing/SoundTouchWirelessLinkAdapter.xml    | 2 +-
 .../src/main/resources/OH-INF/thing/UnknownSoundTouch.xml       | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

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 d8d7d94f24f47..dd595b73e2441 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,7 +7,7 @@
 	<thing-type id="wirelessLinkAdapter">
 		<label>Bose SoundTouch Wireless Link Adapter</label>
 		<description>Bose SoundTouch Wireless Link Adapter</description>
-		<semantic-equipment-tag>Router</semantic-equipment-tag>
+		<semantic-equipment-tag>AudioVisual</semantic-equipment-tag>
 
 		<channels>
 			<channel id="power" typeId="power"/>
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 57aefb2c51f60..ed1f268655248 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
@@ -7,6 +7,7 @@
 	<thing-type id="device">
 		<label>Bose SoundTouch Device</label>
 		<description>An unknown Bose SoundTouch Device</description>
+		<semantic-equipment-tag>AudioVisual</semantic-equipment-tag>
 
 		<channels>
 			<channel id="power" typeId="power"/>

From 08259ae64ffb169c771b2e8556e00a3755c22013 Mon Sep 17 00:00:00 2001
From: Andrew Fiddian-Green <software@whitebear.ch>
Date: Tue, 15 Apr 2025 14:05:54 +0100
Subject: [PATCH 08/15] fenecon

Signed-off-by: Andrew Fiddian-Green <software@whitebear.ch>
---
 .../src/main/resources/OH-INF/thing/thing-types.xml             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/thing/thing-types.xml
index cead2afeba50c..1523e48d2ba2a 100644
--- a/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.fenecon/src/main/resources/OH-INF/thing/thing-types.xml
@@ -10,7 +10,7 @@
 		<label>FENECON Home</label>
 		<description>Thing for FENECON Home Device</description>
 		<category>Solarplant</category>
-		<semantic-equipment-tag>Inverter</semantic-equipment-tag>
+		<semantic-equipment-tag>PowerSupply</semantic-equipment-tag>
 
 		<channels>
 			<channel id="state" typeId="state"/>

From 1f50f6e484abdbafb89b86994dfb5ecc520e2354 Mon Sep 17 00:00:00 2001
From: Andrew Fiddian-Green <software@whitebear.ch>
Date: Tue, 15 Apr 2025 14:17:38 +0100
Subject: [PATCH 09/15] boschshc (subject to agreement)

Signed-off-by: Andrew Fiddian-Green <software@whitebear.ch>
---
 .../src/main/resources/OH-INF/thing/thing-types.xml       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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 0a726ca526d06..b7e1feaea7be3 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
@@ -71,7 +71,7 @@
 
 		<label>Twinguard</label>
 		<description>The Twinguard smoke detector warns you in case of fire and constantly monitors the air.</description>
-		<semantic-equipment-tag>SmokeDetector</semantic-equipment-tag>
+		<semantic-equipment-tag>Sensor</semantic-equipment-tag>
 
 		<channels>
 			<channel id="temperature" typeId="temperature"/>
@@ -117,7 +117,7 @@
 
 		<label>Door/Window Contact II</label>
 		<description>Detects open windows and doors and features an additional button.</description>
-		<semantic-equipment-tag>ContactSensor</semantic-equipment-tag>
+		<semantic-equipment-tag>Sensor</semantic-equipment-tag>
 
 		<channels>
 			<channel id="contact" typeId="contact"/>
@@ -138,7 +138,7 @@
 
 		<label>Door/Window Contact II Plus</label>
 		<description>Detects open windows and doors, provides a configurable button and a vibration sensor.</description>
-		<semantic-equipment-tag>ContactSensor</semantic-equipment-tag>
+		<semantic-equipment-tag>Sensor</semantic-equipment-tag>
 
 		<channels>
 			<channel id="contact" typeId="contact"/>
@@ -290,7 +290,7 @@
 
 		<label>Wall Thermostat</label>
 		<description>Display of the current room temperature as well as the relative humidity in the room.</description>
-		<semantic-equipment-tag>Thermostat</semantic-equipment-tag>
+		<semantic-equipment-tag>Display</semantic-equipment-tag>
 
 		<channels>
 			<channel id="temperature" typeId="temperature"/>

From 2e4db49c909beb8df3a77eb8cdb9adf70f7f0d1d Mon Sep 17 00:00:00 2001
From: Andrew Fiddian-Green <software@whitebear.ch>
Date: Wed, 16 Apr 2025 17:30:59 +0100
Subject: [PATCH 10/15] revert boschshc

Signed-off-by: Andrew Fiddian-Green <software@whitebear.ch>
---
 .../src/main/resources/OH-INF/thing/thing-types.xml           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 b7e1feaea7be3..75ae3ce0d256b 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
@@ -117,7 +117,7 @@
 
 		<label>Door/Window Contact II</label>
 		<description>Detects open windows and doors and features an additional button.</description>
-		<semantic-equipment-tag>Sensor</semantic-equipment-tag>
+		<semantic-equipment-tag>ContactSensor</semantic-equipment-tag>
 
 		<channels>
 			<channel id="contact" typeId="contact"/>
@@ -290,7 +290,7 @@
 
 		<label>Wall Thermostat</label>
 		<description>Display of the current room temperature as well as the relative humidity in the room.</description>
-		<semantic-equipment-tag>Display</semantic-equipment-tag>
+		<semantic-equipment-tag>Thermostat</semantic-equipment-tag>
 
 		<channels>
 			<channel id="temperature" typeId="temperature"/>

From 0257a21013cc51fbc13c97965841edb301d926d2 Mon Sep 17 00:00:00 2001
From: Andrew Fiddian-Green <software@whitebear.ch>
Date: Fri, 18 Apr 2025 14:35:09 +0100
Subject: [PATCH 11/15] Add missing addons

Signed-off-by: Andrew Fiddian-Green <software@whitebear.ch>
---
 .../main/resources/OH-INF/thing/bridge.xml    |  1 +
 .../main/resources/OH-INF/thing/ws0265.xml    |  1 +
 .../main/resources/OH-INF/thing/ws0900.xml    |  1 +
 .../main/resources/OH-INF/thing/ws1400ip.xml  |  1 +
 .../main/resources/OH-INF/thing/ws2902a.xml   |  1 +
 .../main/resources/OH-INF/thing/ws2902b.xml   |  1 +
 .../main/resources/OH-INF/thing/ws8482.xml    |  1 +
 .../resources/OH-INF/thing/thing-types.xml    |  6 ++--
 .../resources/OH-INF/thing/thing-types.xml    |  2 +-
 .../resources/OH-INF/thing/bridge-types.xml   |  2 +-
 .../resources/OH-INF/thing/thing-types.xml    | 36 +++++++++----------
 .../resources/OH-INF/thing/thing-types.xml    |  4 +--
 .../main/resources/OH-INF/thing/ruuvitag.xml  |  2 +-
 .../main/resources/OH-INF/thing/Bridge.xml    |  2 +-
 .../resources/OH-INF/thing/CeilingFan.xml     |  2 +-
 .../main/resources/OH-INF/thing/Fireplace.xml |  2 +-
 .../src/main/resources/OH-INF/thing/Light.xml |  2 +-
 .../OH-INF/thing/MotorizedShades.xml          |  2 +-
 .../resources/OH-INF/thing/thing-types.xml    |  2 +-
 .../main/resources/OH-INF/thing/a-types.xml   |  1 +
 .../main/resources/OH-INF/thing/mp-types.xml  |  3 ++
 .../main/resources/OH-INF/thing/rm-types.xml  |  5 +++
 .../main/resources/OH-INF/thing/sp-types.xml  |  5 +++
 .../resources/OH-INF/thing/thing-types.xml    |  5 +--
 .../src/main/resources/OH-INF/thing/area.xml  |  1 +
 .../src/main/resources/OH-INF/thing/zone.xml  |  1 +
 .../resources/OH-INF/thing/artnet-bridge.xml  |  1 +
 .../resources/OH-INF/thing/chaser-thing.xml   |  1 +
 .../resources/OH-INF/thing/color-thing.xml    |  1 +
 .../resources/OH-INF/thing/dimmer-thing.xml   |  1 +
 .../OH-INF/thing/tunablewhite-thing.xml       |  1 +
 .../resources/OH-INF/thing/thing-types.xml    |  2 ++
 .../thing/meter_electricity_ace4000.xml       |  2 +-
 .../thing/meter_electricity_dsmr_v2_1.xml     |  2 +-
 .../thing/meter_electricity_dsmr_v2_2.xml     |  2 +-
 .../thing/meter_electricity_dsmr_v3.xml       |  2 +-
 .../thing/meter_electricity_dsmr_v4.xml       |  2 +-
 .../thing/meter_electricity_dsmr_v4_0_4.xml   |  2 +-
 .../thing/meter_electricity_dsmr_v4_2.xml     |  2 +-
 .../thing/meter_electricity_dsmr_v5.xml       |  2 +-
 .../thing/meter_electricity_emucs_v1_0.xml    |  2 +-
 .../meter_electricity_slave1_ace4000.xml      |  2 +-
 .../meter_electricity_slave2_ace4000.xml      |  2 +-
 .../thing/meter_electricity_slave_v4.xml      |  2 +-
 .../thing/meter_electricity_slave_v5.xml      |  2 +-
 .../thing/meter_electricity_smarty_v1.xml     |  2 +-
 .../meter_electricity_smarty_v1_austria.xml   |  2 +-
 .../OH-INF/thing/meter_gas_ace4000.xml        |  2 +-
 .../resources/OH-INF/thing/meter_gas_v2_1.xml |  2 +-
 .../resources/OH-INF/thing/meter_gas_v2_2.xml |  2 +-
 .../resources/OH-INF/thing/meter_gas_v3_0.xml |  2 +-
 .../thing/meter_gasmeter_emucs_v1_0.xml       |  2 +-
 .../OH-INF/thing/meter_water_ace4000.xml      |  2 +-
 .../OH-INF/thing/meter_water_v2_2.xml         |  2 +-
 .../OH-INF/thing/meter_water_v3_0.xml         |  2 +-
 .../resources/OH-INF/thing/smarty_device.xml  |  2 +-
 .../resources/OH-INF/thing/thing-types.xml    |  8 +++++
 .../resources/OH-INF/thing/thing-types.xml    |  2 +-
 .../resources/OH-INF/thing/thing-types.xml    |  1 +
 .../main/resources/OH-INF/thing/Contact.xml   |  2 +-
 .../OH-INF/thing/EnvironmentalSensor.xml      |  2 +-
 .../main/resources/OH-INF/thing/GasSensor.xml |  2 +-
 .../OH-INF/thing/HeatRecoveryVentilation.xml  |  2 +-
 .../resources/OH-INF/thing/LightSensor.xml    |  2 +-
 .../thing/LightTemperatureOccupancySensor.xml |  2 +-
 .../OH-INF/thing/MeasurementSwitch.xml        |  2 +-
 .../OH-INF/thing/MechanicalHandle.xml         |  2 +-
 .../thing/MultiFunctionSmokeDetector.xml      |  2 +-
 .../OH-INF/thing/OccupancySensor.xml          |  2 +-
 .../resources/OH-INF/thing/PushButton.xml     |  2 +-
 .../resources/OH-INF/thing/RockerSwitch.xml   |  2 +-
 .../resources/OH-INF/thing/Rollershutter.xml  |  2 +-
 .../OH-INF/thing/RoomOperatingPanel.xml       |  2 +-
 .../thing/TemperatureHumiditySensor.xml       |  2 +-
 .../OH-INF/thing/TemperatureSensor.xml        |  2 +-
 .../resources/OH-INF/thing/Thermostat.xml     |  2 +-
 .../OH-INF/thing/WindowSashHandleSensor.xml   |  2 +-
 77 files changed, 117 insertions(+), 77 deletions(-)

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 edb6c133e4e06..2630c6c9747f3 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 @@
 	<bridge-type id="bridge">
 		<label>Ambient Weather Account</label>
 		<description>Represents an account at Ambient Weather (ambientweather.net)</description>
+		<semantic-equipment-tag>WebService</semantic-equipment-tag>
 		<config-description-ref uri="thing-type:ambientweather:bridge"/>
 	</bridge-type>
 </thing:thing-descriptions>
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 cb9a59e3026a6..8f2bae62421ef 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 @@
 
 		<label>WS-0265</label>
 		<description>Ambient Weather Station WS-0265</description>
+		<semantic-equipment-tag>WeatherStation</semantic-equipment-tag>
 		<channel-groups>
 			<channel-group id="station" typeId="station">
 				<label>Weather Station</label>
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 9d471e0f3c4be..8d9967c0aafb7 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 @@
 
 		<label>WS-0900-IP</label>
 		<description>Ambient Weather Station WS-0900-IP</description>
+		<semantic-equipment-tag>WeatherStation</semantic-equipment-tag>
 		<channel-groups>
 			<channel-group id="station" typeId="station">
 				<label>Weather Station</label>
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 6dfa79d56ef32..3b52941d4c053 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 @@
 
 		<label>WS-1400-IP</label>
 		<description>Ambient Weather Station WS-1400-IP</description>
+		<semantic-equipment-tag>WeatherStation</semantic-equipment-tag>
 		<channel-groups>
 			<channel-group id="station" typeId="station">
 				<label>Weather Station</label>
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 29d33f92362af..72d4a1eabdd45 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 @@
 
 		<label>WS-2902A</label>
 		<description>Ambient Weather Station WS-2902A</description>
+		<semantic-equipment-tag>WeatherStation</semantic-equipment-tag>
 		<channel-groups>
 			<channel-group id="station" typeId="station">
 				<label>Weather Station</label>
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 06b95954501f7..fec5deac5934a 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 @@
 
 		<label>WS-2902B</label>
 		<description>Ambient Weather Station WS-2902B</description>
+		<semantic-equipment-tag>WeatherStation</semantic-equipment-tag>
 		<channel-groups>
 			<channel-group id="station" typeId="station">
 				<label>Weather Station</label>
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 b27e8558ca8c3..0f1423131a9a3 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 @@
 
 		<label>WS-8482</label>
 		<description>Ambient Weather Station WS-8482</description>
+		<semantic-equipment-tag>WeatherStation</semantic-equipment-tag>
 		<channel-groups>
 			<channel-group id="station" typeId="station">
 				<label>Weather Station</label>
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 9fd3c643df189..1688b5e729e7c 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 @@
 
 		<label>ShieldTV</label>
 		<description>Nvidia ShieldTV</description>
-
+		<semantic-equipment-tag>Television</semantic-equipment-tag>
 		<channels>
 			<channel id="debug" typeId="debug"/>
 			<channel id="keypress" typeId="keypress"/>
@@ -98,7 +98,7 @@
 
 		<label>GoogleTV</label>
 		<description>GoogleTV</description>
-
+		<semantic-equipment-tag>Television</semantic-equipment-tag>
 		<channels>
 			<channel id="debug" typeId="debug"/>
 			<channel id="keypress" typeId="keypress"/>
@@ -170,7 +170,7 @@
 	<thing-type id="philipstv">
 		<label>Philips TV</label>
 		<description>A Philips TV device</description>
-
+		<semantic-equipment-tag>Television</semantic-equipment-tag>
 		<channels>
 			<channel id="debug" typeId="debug"/>
 			<channel id="keypress" typeId="keypress"/>
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 07cac9ed1504a..bd79a374d4aa9 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-type id="anthem">
 		<label>Anthem</label>
 		<description>Thing for Anthem AV processor</description>
-
+		<semantic-equipment-tag>AudioVisual</semantic-equipment-tag>
 		<channel-groups>
 			<channel-group id="general" typeId="general"/>
 			<channel-group id="1" typeId="zone">
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 f7583a45b8e40..d558699450138 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 @@
 	<bridge-type id="fritzbox">
 		<label>FRITZ!Box</label>
 		<description>A FRITZ!Box router.</description>
-
+		<semantic-equipment-tag>Router</semantic-equipment-tag>
 		<channels>
 			<channel id="incoming_call" typeId="incoming_call"/>
 			<channel id="outgoing_call" typeId="outgoing_call"/>
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 d34f540250a56..d561cbd0fa663 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 @@
 
 		<label>FRITZ!DECT 500</label>
 		<description>FRITZ!DECT500 color light.</description>
-
+		<semantic-equipment-tag>LightSource</semantic-equipment-tag>
 		<channels>
 			<channel id="color" typeId="system.color"/>
 			<channel id="color_temperature" typeId="system.color-temperature"/>
@@ -36,7 +36,7 @@
 
 		<label>FRITZ!DECT 400</label>
 		<description>FRITZ!DECT400 switch.</description>
-
+		<semantic-equipment-tag>Button</semantic-equipment-tag>
 		<channels>
 			<channel id="press" typeId="system.button">
 				<label>Button Press</label>
@@ -60,7 +60,7 @@
 
 		<label>FRITZ!DECT 440</label>
 		<description>FRITZ!DECT440 switch.</description>
-
+		<semantic-equipment-tag>Button</semantic-equipment-tag>
 		<channel-groups>
 			<channel-group id="top-left" typeId="button">
 				<label>Top Left Button</label>
@@ -91,7 +91,7 @@
 
 		<label>Comet DECT</label>
 		<description>Comet DECT heating thermostat.</description>
-
+		<semantic-equipment-tag>Thermostat</semantic-equipment-tag>
 		<channels>
 			<channel id="mode" typeId="mode"/>
 			<channel id="locked" typeId="locked"/>
@@ -127,7 +127,7 @@
 
 		<label>FRITZ!DECT 302</label>
 		<description>FRITZ!DECT 302 heating thermostat.</description>
-
+		<semantic-equipment-tag>Thermostat</semantic-equipment-tag>
 		<channels>
 			<channel id="mode" typeId="mode"/>
 			<channel id="locked" typeId="locked"/>
@@ -163,7 +163,7 @@
 
 		<label>FRITZ!DECT 301</label>
 		<description>FRITZ!DECT 301 heating thermostat.</description>
-
+		<semantic-equipment-tag>Thermostat</semantic-equipment-tag>
 		<channels>
 			<channel id="mode" typeId="mode"/>
 			<channel id="locked" typeId="locked"/>
@@ -199,7 +199,7 @@
 
 		<label>FRITZ!DECT 300</label>
 		<description>FRITZ!DECT 300 heating thermostat.</description>
-
+		<semantic-equipment-tag>Thermostat</semantic-equipment-tag>
 		<channels>
 			<channel id="mode" typeId="mode"/>
 			<channel id="locked" typeId="locked"/>
@@ -235,7 +235,7 @@
 
 		<label>FRITZ!DECT 210</label>
 		<description>FRITZ!DECT210 switchable outlet.</description>
-
+		<semantic-equipment-tag>PowerOutlet</semantic-equipment-tag>
 		<channels>
 			<channel id="mode" typeId="mode"/>
 			<channel id="locked" typeId="locked"/>
@@ -269,7 +269,7 @@
 
 		<label>FRITZ!DECT 200</label>
 		<description>FRITZ!DECT200 switchable outlet.</description>
-
+		<semantic-equipment-tag>PowerOutlet</semantic-equipment-tag>
 		<channels>
 			<channel id="mode" typeId="mode"/>
 			<channel id="locked" typeId="locked"/>
@@ -304,7 +304,7 @@
 		<label>FRITZ!Powerline 546E</label>
 		<description>FRITZ!Powerline 546E with switchable outlet.
 		</description>
-
+		<semantic-equipment-tag>PowerOutlet</semantic-equipment-tag>
 		<channels>
 			<channel id="mode" typeId="mode"/>
 			<channel id="locked" typeId="locked"/>
@@ -355,7 +355,7 @@
 
 		<label>HAN-FUN Contact</label>
 		<description>HAN-FUN contact (e.g. SmartHome Tür-/Fensterkontakt or SmartHome Bewegungsmelder).</description>
-
+		<semantic-equipment-tag>ContactSensor</semantic-equipment-tag>
 		<channels>
 			<channel typeId="contact_state" id="contact_state"/>
 		</channels>
@@ -373,7 +373,7 @@
 
 		<label>HAN-FUN Switch</label>
 		<description>HAN-FUN switch (e.g. SmartHome Wandtaster).</description>
-
+		<semantic-equipment-tag>WallSwitch</semantic-equipment-tag>
 		<channels>
 			<channel id="press" typeId="system.rawbutton">
 				<label>Button Press</label>
@@ -395,7 +395,7 @@
 
 		<label>HAN-FUN Blinds</label>
 		<description>HAN-FUN blinds (e.g. RolloTron DECT 1213)</description>
-
+		<semantic-equipment-tag>Blinds</semantic-equipment-tag>
 		<channels>
 			<channel id="rollershutter" typeId="rollershutter"/>
 			<channel id="obstruction_alarm" typeId="obstruction_alarm"/>
@@ -414,7 +414,7 @@
 
 		<label>HAN-FUN Color Light</label>
 		<description>HAN-FUN color light (e.g SmartHome LED-Lampe E27 (farbig)).</description>
-
+		<semantic-equipment-tag>LightSource</semantic-equipment-tag>
 		<channels>
 			<channel id="color" typeId="system.color"/>
 			<channel id="color_temperature" typeId="system.color-temperature"/>
@@ -435,7 +435,7 @@
 		<supported-bridge-type-refs>
 			<bridge-type-ref id="fritzbox"/>
 		</supported-bridge-type-refs>
-
+		<semantic-equipment-tag>LightSource</semantic-equipment-tag>
 		<label>HAN-FUN Dimmable Light</label>
 		<description>HAN-FUN dimmable light (e.g. SmartHome LED-Lampe E27 (warmweiß)).</description>
 
@@ -456,7 +456,7 @@
 
 		<label>HAN-FUN On / Off Device</label>
 		<description>HAN-FUN switchable device (e.g. SmartHome Zwischenstecker innen / SmartHome Zwischenstecker außen)</description>
-
+		<semantic-equipment-tag>PowerOutlet</semantic-equipment-tag>
 		<channels>
 			<channel id="on_off" typeId="system.power"/>
 		</channels>
@@ -475,7 +475,7 @@
 
 		<label>Heating Group</label>
 		<description>Group for heating thermostats.</description>
-
+		<semantic-equipment-tag>Thermostat</semantic-equipment-tag>
 		<channels>
 			<channel id="mode" typeId="mode"/>
 			<channel id="locked" typeId="locked"/>
@@ -510,7 +510,7 @@
 
 		<label>Switch Group</label>
 		<description>Group for switchable outlets and power meters.</description>
-
+		<semantic-equipment-tag>PowerOutlet</semantic-equipment-tag>
 		<channels>
 			<channel id="mode" typeId="mode"/>
 			<channel id="locked" typeId="locked"/>
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 302deaaf0e0cc..1f37dbc5659f3 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 @@
 
 		<label>Govee Hygrometer</label>
 		<description>Govee Thermo-Hygrometer</description>
-
+		<semantic-equipment-tag>Sensor</semantic-equipment-tag>
 		<channels>
 			<channel id="rssi" typeId="rssi"/>
 			<channel id="battery" typeId="system.battery-level"/>
@@ -66,7 +66,7 @@
 
 		<label>Govee Monitoring Hygrometer</label>
 		<description>Govee Thermo-Hygrometer w/ Warning Alarms</description>
-
+		<semantic-equipment-tag>Sensor</semantic-equipment-tag>
 		<channels>
 			<channel id="rssi" typeId="rssi"/>
 			<channel id="battery" typeId="system.battery-level"/>
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 ed0a4c4e7f0e3..b39f1ddd2c6ca 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 @@
 
 		<label>RuuviTag SmartBeacon</label>
 		<description>A RuuviTag SmartBeacon</description>
-
+		<semantic-equipment-tag>Tracker</semantic-equipment-tag>
 		<channels>
 			<channel id="rssi" typeId="rssi"/>
 			<channel id="accelerationx" typeId="ruuvitag_accelerationx"/>
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 55f83163fc5c6..d81a63458c134 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 @@
 	<bridge-type id="bondBridge">
 		<label>Bond Home Bridge</label>
 		<description>The RF/IR/Wifi Bridge</description>
-
+		<semantic-equipment-tag>NetworkAppliance</semantic-equipment-tag>
 		<representation-property>serialNumber</representation-property>
 		<config-description-ref uri="thing-type:bondhome:bondbridge"/>
 
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 158168ffb6bc6..90a4fb0aa613d 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 @@
 
 		<label>Bond Home Ceiling Fan</label>
 		<description>An RF or IR remote controlled ceiling fan with or without a light</description>
-
+		<semantic-equipment-tag>CeilingFan</semantic-equipment-tag>
 		<channel-groups>
 			<channel-group id="common" typeId="commonChannelGroup"/>
 			<channel-group id="fan" typeId="ceilingFanChannelGroup"/>
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 0821a474e5411..75b15850349eb 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 @@
 
 		<label>Bond Home Fireplace</label>
 		<description>An RF or IR remote controlled fireplace with or without a fan</description>
-
+		<semantic-equipment-tag>Furnace</semantic-equipment-tag>
 		<channel-groups>
 			<channel-group id="common" typeId="commonChannelGroup"/>
 			<channel-group id="fireplace" typeId="fireplaceChannelGroup"/>
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 aff49eec0ae69..b01dc702b5294 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 @@
 
 		<label>Bond Home Light</label>
 		<description>An RF or IR remote controlled light</description>
-
+		<semantic-equipment-tag>LightSource</semantic-equipment-tag>
 		<channel-groups>
 			<channel-group id="light" typeId="lightChannelGroup"/>
 		</channel-groups>
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 6f3728b6c708a..2541959c0d259 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 @@
 
 		<label>Bond Home Motorized Shades</label>
 		<description>An RF or IR remote controlled motorized shade</description>
-
+		<semantic-equipment-tag>Blinds</semantic-equipment-tag>
 		<channel-groups>
 			<channel-group id="common" typeId="commonChannelGroup"/>
 			<channel-group id="shade" typeId="shadeChannelGroup"/>
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 c5e58304735d2..cbf2177b89f26 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 @@
 
 		<label>Bosch Indego</label>
 		<description>Indego which supports the connect feature.</description>
-
+		<semantic-equipment-tag>LawnMower</semantic-equipment-tag>
 		<channels>
 			<channel id="state" typeId="state"/>
 			<channel id="textualstate" typeId="textualstate"/>
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 d9e1622859ac2..11c717c65500b 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 @@
 		<label>Broadlink A1</label>
 		<description>The Broadlink A1 is a multi sensor that can can detect temperature, humidity, illumination, background
 			noise and air quality.</description>
+		<semantic-equipment-tag>Sensor</semantic-equipment-tag>
 		<channels>
 			<channel id="temperature" typeId="system.indoor-temperature"/>
 			<channel id="humidity" typeId="system.atmospheric-humidity"/>
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 1c03f28f77c46..8534d7fbb937a 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 @@
 	<thing-type id="mp1">
 		<label>Broadlink MP1</label>
 		<description>The Broadlink MP1 Smart Home Wifi Plug Power Strip 4 Ports Individual Wireless Remote Control.</description>
+		<semantic-equipment-tag>PowerOutlet</semantic-equipment-tag>
 		<channels>
 			<channel id="power-on-s1" typeId="system.power">
 				<label>Socket 1 Power</label>
@@ -27,6 +28,7 @@
 	<thing-type id="mp1-1k3s2u">
 		<label>Broadlink MP1 1K3S2U</label>
 		<description>The Broadlink MP1 1K3S2U Smart Home Wifi Plug Power Strip 3 AC, 2 USB Individual Wireless Remote Control.</description>
+		<semantic-equipment-tag>Sensor</semantic-equipment-tag>
 		<channels>
 			<channel id="power-on-s1" typeId="system.power">
 				<label>Socket 1 Power</label>
@@ -48,6 +50,7 @@
 		<label>Broadlink MP2</label>
 		<description>The Broadlink MP2 is a smart socket with Wi-Fi connectivity. It does not support switching individual
 			ports.</description>
+		<semantic-equipment-tag>Sensor</semantic-equipment-tag>
 		<channels>
 			<channel id="power-on" typeId="system.power"/>
 			<channel id="power-consumption" typeId="system.electric-energy"/>
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 67370d701ba46..db2e34ea41040 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 @@
 	<thing-type id="rm-pro">
 		<label>Broadlink RM Pro</label>
 		<description>The Broadlink RM Pro is a Wi-Fi IR transmitter with a temperature sensor.</description>
+		<semantic-equipment-tag>RemoteControl</semantic-equipment-tag>
 		<channels>
 			<channel id="command" typeId="command"/>
 			<channel id="learning-control" typeId="learning-control"/>
@@ -18,6 +19,7 @@
 	<thing-type id="rm3">
 		<label>Broadlink RM3</label>
 		<description>The Broadlink RM 3/Mini is a Wi-Fi IR transmitter.</description>
+		<semantic-equipment-tag>RemoteControl</semantic-equipment-tag>
 		<channels>
 			<channel id="command" typeId="command"/>
 			<channel id="learning-control" typeId="learning-control"/>
@@ -28,6 +30,7 @@
 	<thing-type id="rm3-q">
 		<label>Broadlink RM3 v44057</label>
 		<description>The Broadlink RM 3/Mini is a Wi-Fi IR transmitter running v44057 firmware.</description>
+		<semantic-equipment-tag>RemoteControl</semantic-equipment-tag>
 		<channels>
 			<channel id="command" typeId="command"/>
 			<channel id="learning-control" typeId="learning-control"/>
@@ -38,6 +41,7 @@
 	<thing-type id="rm4-mini">
 		<label>Broadlink RM4 Mini</label>
 		<description>The Broadlink RM 4 Mini is a Wi-Fi IR transmitter with temperature and humidity sensors.</description>
+		<semantic-equipment-tag>RemoteControl</semantic-equipment-tag>
 		<channels>
 			<channel id="command" typeId="command"/>
 			<channel id="learning-control" typeId="learning-control"/>
@@ -50,6 +54,7 @@
 	<thing-type id="rm4-pro">
 		<label>Broadlink RM4 Pro</label>
 		<description>The Broadlink RM 4 Pro is a Wi-Fi IR and RF transmitter with temperature and humidity sensors.</description>
+		<semantic-equipment-tag>RemoteControl</semantic-equipment-tag>
 		<channels>
 			<channel id="command" typeId="command"/>
 			<channel id="learning-control" typeId="learning-control"/>
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 36d23dbf648e9..a790594edd41c 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 @@
 	<thing-type id="sp1">
 		<label>Broadlink SP1</label>
 		<description>The Broadlink SP1 is a Wi-Fi smart socket.</description>
+		<semantic-equipment-tag>PowerOutlet</semantic-equipment-tag>
 		<channels>
 			<channel id="power-on" typeId="system.power"/>
 		</channels>
@@ -16,6 +17,7 @@
 	<thing-type id="sp2">
 		<label>Broadlink SP2</label>
 		<description>The Broadlink SP2 is a Wi-Fi smart socket.</description>
+		<semantic-equipment-tag>PowerOutlet</semantic-equipment-tag>
 		<channels>
 			<channel id="power-on" typeId="system.power"/>
 		</channels>
@@ -25,6 +27,7 @@
 	<thing-type id="sp2-s">
 		<label>Broadlink SP2-s</label>
 		<description>The Broadlink SP2-s is a Wi-Fi smart socket with power consumption measurement.</description>
+		<semantic-equipment-tag>PowerOutlet</semantic-equipment-tag>
 		<channels>
 			<channel id="power-on" typeId="system.power"/>
 			<channel id="power-consumption" typeId="system.electric-energy"/>
@@ -35,6 +38,7 @@
 	<thing-type id="sp3">
 		<label>Broadlink SP3</label>
 		<description>The Broadlink SP3 is a Wi-Fi smart socket with night light. The SP mini 3 omits the night light.</description>
+		<semantic-equipment-tag>PowerOutlet</semantic-equipment-tag>
 		<channels>
 			<channel id="power-on" typeId="system.power"/>
 			<channel id="night-light" typeId="night-light">
@@ -47,6 +51,7 @@
 	<thing-type id="sp3-s">
 		<label>Broadlink SP3-s</label>
 		<description>The Broadlink SP3-s is a Wi-Fi smart socket with power consumption measurement</description>
+		<semantic-equipment-tag>PowerOutlet</semantic-equipment-tag>
 		<channels>
 			<channel id="power-on" typeId="system.power"/>
 			<channel id="power-consumption" typeId="system.electric-energy"/>
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 69ce786512548..5a473a0cbf61a 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 @@
 	<thing-type id="floureonthermostat">
 		<label>Floureon Thermostat</label>
 		<description>A heating device thermostat</description>
-
+		<semantic-equipment-tag>Thermostat</semantic-equipment-tag>
 		<channels>
 			<channel id="power" typeId="power"/>
 			<channel id="mode" typeId="mode"/>
@@ -29,7 +29,7 @@
 	<thing-type id="hysenthermostat">
 		<label>Hysen Thermostat</label>
 		<description>A heating device thermostat</description>
-
+		<semantic-equipment-tag>Thermostat</semantic-equipment-tag>
 		<channels>
 			<channel id="power" typeId="power"/>
 			<channel id="mode" typeId="mode"/>
@@ -50,6 +50,7 @@
 	<thing-type id="rmuniversaldevice">
 		<label>Rm Universal Device</label>
 		<description>A universal infrared remote</description>
+		<semantic-equipment-tag>RemoteControl</semantic-equipment-tag>
 		<channels>
 			<channel id="learningmode" typeId="learningmode"/>
 			<channel id="savelearned" typeId="savelearned"/>
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 be90d00b23ffc..55151b3b2673a 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 @@
 		</supported-bridge-type-refs>
 		<label>Area</label>
 		<description>Area</description>
+		<semantic-equipment-tag>AlarmSystem</semantic-equipment-tag>
 		<channels>
 			<channel typeId="area_status" id="status"/>
 			<channel typeId="area_armed" id="armed"/>
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 e104ff0116cf2..0bd436a8ed3d8 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 @@
 		</supported-bridge-type-refs>
 		<label>Zone</label>
 		<description>Zone</description>
+		<semantic-equipment-tag>AlarmSystem</semantic-equipment-tag>
 		<channels>
 			<channel typeId="status" id="status"/>
 			<channel typeId="extended_status" id="extended_status"/>
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 fad3cc7d8f419..129f882b461ff 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 @@
 	<bridge-type id="artnet-bridge">
 		<label>ArtNet Bridge</label>
 		<description>The ArtNet bridge represents a single DMX universe connected via ArtNet, only unicast</description>
+		<semantic-equipment-tag>NetworkAppliance</semantic-equipment-tag>
 		<channels>
 			<channel id="mute" typeId="mute"/>
 		</channels>
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 5313518fcf0ec..7d8d92392670c 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 @@
 		</supported-bridge-type-refs>
 		<label>DMX Chaser</label>
 		<description>A single/multi-channel chaser</description>
+		<semantic-equipment-tag>LightSource</semantic-equipment-tag>
 		<channels>
 			<channel id="switch" typeId="switch"/>
 			<channel id="control" typeId="control"/>
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 1bebec0c08ad5..cb4ad04aaae5a 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 @@
 		</supported-bridge-type-refs>
 		<label>DMX Color (RGB) Dimmer</label>
 		<description>A RGB capable dimmer</description>
+		<semantic-equipment-tag>LightSource</semantic-equipment-tag>
 		<channels>
 			<channel id="brightness_r" typeId="brightness"/>
 			<channel id="brightness_g" typeId="brightness"/>
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 d4c1695ba1fbd..89d7e13679722 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 @@
 		</supported-bridge-type-refs>
 		<label>DMX Dimmer</label>
 		<description>A single/multi-channel dimmer</description>
+		<semantic-equipment-tag>LightSource</semantic-equipment-tag>
 		<channels>
 			<channel id="brightness" typeId="brightness"/>
 			<channel id="switch" typeId="switch"/>
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 2476b86aa6fc3..02c275daae058 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 @@
 		</supported-bridge-type-refs>
 		<label>DMX Tunable White Dimmer</label>
 		<description>A tunable white capable dimmer</description>
+		<semantic-equipment-tag>LightSource</semantic-equipment-tag>
 		<channels>
 			<channel id="brightness" typeId="brightness"/>
 			<channel id="brightness_cw" typeId="brightness"/>
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 2b06be3d50ad2..c5c03f73ab2ab 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 @@
 	<bridge-type id="egate">
 		<label>Dominoswiss EGate Server</label>
 		<description>This is a Dominoswiss EGate Server instance.</description>
+		<semantic-equipment-tag>NetworkAppliance</semantic-equipment-tag>
 		<config-description>
 			<parameter name="ipAddress" type="text" required="true">
 				<label>IP or Host Name</label>
@@ -26,6 +27,7 @@
 		</supported-bridge-type-refs>
 		<label>Blind</label>
 		<description>Provides various control commands for Dominoswiss receivers</description>
+		<semantic-equipment-tag>Blinds</semantic-equipment-tag>
 		<channels>
 			<channel id="pulseUp" typeId="pulseUp"/>
 			<channel id="pulseDown" typeId="pulseDown"/>
diff --git a/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_electricity_ace4000.xml b/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_electricity_ace4000.xml
index dfac6e95a46c6..dea4df7b68e43 100644
--- a/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_electricity_ace4000.xml
+++ b/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_electricity_ace4000.xml
@@ -11,7 +11,7 @@
 
 		<label>Electricity Meter (ACE4000)</label>
 		<description>This is an electricity meter that complies to the ACE4000 GTMM Mk3 specification.</description>
-
+		<semantic-equipment-tag>ElectricMeter</semantic-equipment-tag>
 		<channels>
 			<channel id="emeter_equipment_identifier" typeId="equipmentIdType"/>
 			<channel id="emeter_delivery_tariff0" typeId="deliveryTariff0Type"/>
diff --git a/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_electricity_dsmr_v2_1.xml b/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_electricity_dsmr_v2_1.xml
index 9eaec9dbe4404..d7a66df79a930 100644
--- a/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_electricity_dsmr_v2_1.xml
+++ b/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_electricity_dsmr_v2_1.xml
@@ -11,7 +11,7 @@
 
 		<label>Electricity Meter (DSMR V2.1)</label>
 		<description>This is an electricity meter that complies to the DSMR V2.1 specification.</description>
-
+		<semantic-equipment-tag>ElectricMeter</semantic-equipment-tag>
 		<channels>
 			<channel id="emeter_equipment_identifier_v2_x" typeId="equipmentIdType"/>
 			<channel id="emeter_delivery_tariff1" typeId="deliveryTariff1Type"/>
diff --git a/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_electricity_dsmr_v2_2.xml b/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_electricity_dsmr_v2_2.xml
index 39685dafac5ff..114293effd6f2 100644
--- a/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_electricity_dsmr_v2_2.xml
+++ b/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_electricity_dsmr_v2_2.xml
@@ -11,7 +11,7 @@
 
 		<label>Electricity Meter (DSMR V2.2)</label>
 		<description>This is an electricity meter that complies to the DSMR V2.2 specification.</description>
-
+		<semantic-equipment-tag>ElectricMeter</semantic-equipment-tag>
 		<channels>
 			<channel id="emeter_equipment_identifier_v2_x" typeId="equipmentIdType"/>
 			<channel id="emeter_delivery_tariff1" typeId="deliveryTariff1Type"/>
diff --git a/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_electricity_dsmr_v3.xml b/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_electricity_dsmr_v3.xml
index 9a41be73449d3..1d64bf901fa82 100644
--- a/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_electricity_dsmr_v3.xml
+++ b/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_electricity_dsmr_v3.xml
@@ -11,7 +11,7 @@
 
 		<label>Electricity Meter (DSMR V3)</label>
 		<description>This is an electricity meter that complies to the DSMR V3 specification.</description>
-
+		<semantic-equipment-tag>ElectricMeter</semantic-equipment-tag>
 		<channels>
 			<channel id="emeter_equipment_identifier" typeId="equipmentIdType"/>
 			<channel id="emeter_delivery_tariff1" typeId="deliveryTariff1Type"/>
diff --git a/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_electricity_dsmr_v4.xml b/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_electricity_dsmr_v4.xml
index 59dcd198be45c..a9e76f5f4fb09 100644
--- a/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_electricity_dsmr_v4.xml
+++ b/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_electricity_dsmr_v4.xml
@@ -11,7 +11,7 @@
 
 		<label>Electricity Meter (DSMR V4.0)</label>
 		<description>This is an electricity meter that complies to the DSMR V4.0 specification.</description>
-
+		<semantic-equipment-tag>ElectricMeter</semantic-equipment-tag>
 		<channels>
 			<channel id="emeter_equipment_identifier" typeId="equipmentIdType"/>
 			<channel id="emeter_delivery_tariff1" typeId="deliveryTariff1Type"/>
diff --git a/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_electricity_dsmr_v4_0_4.xml b/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_electricity_dsmr_v4_0_4.xml
index ef2867869a3ba..f269601c53ff4 100644
--- a/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_electricity_dsmr_v4_0_4.xml
+++ b/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_electricity_dsmr_v4_0_4.xml
@@ -11,7 +11,7 @@
 
 		<label>Electricity Meter (DSMR V4.0.4)</label>
 		<description>This is an electricity meter that complies to the DSMR V4.0.4 specification.</description>
-
+		<semantic-equipment-tag>ElectricMeter</semantic-equipment-tag>
 		<channels>
 			<channel id="emeter_equipment_identifier" typeId="equipmentIdType"/>
 			<channel id="emeter_delivery_tariff1" typeId="deliveryTariff1Type"/>
diff --git a/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_electricity_dsmr_v4_2.xml b/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_electricity_dsmr_v4_2.xml
index 0307c7603c5e9..8412c334d0280 100644
--- a/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_electricity_dsmr_v4_2.xml
+++ b/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_electricity_dsmr_v4_2.xml
@@ -11,7 +11,7 @@
 
 		<label>Electricity Meter (DSMR V4.2)</label>
 		<description>This is an electricity meter that complies to the DSMR V4.2 specification.</description>
-
+		<semantic-equipment-tag>ElectricMeter</semantic-equipment-tag>
 		<channels>
 			<channel id="emeter_equipment_identifier" typeId="equipmentIdType"/>
 			<channel id="emeter_delivery_tariff1" typeId="deliveryTariff1Type"/>
diff --git a/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_electricity_dsmr_v5.xml b/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_electricity_dsmr_v5.xml
index 03f286215cf4d..d8dc8e866f478 100644
--- a/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_electricity_dsmr_v5.xml
+++ b/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_electricity_dsmr_v5.xml
@@ -11,7 +11,7 @@
 
 		<label>Electricity Meter (DSMR V5.0)</label>
 		<description>This is an electricity meter that complies to the DSMR V5.0 specification.</description>
-
+		<semantic-equipment-tag>ElectricMeter</semantic-equipment-tag>
 		<channels>
 			<channel id="emeter_equipment_identifier" typeId="equipmentIdType"/>
 			<channel id="emeter_delivery_tariff1" typeId="deliveryTariff1Type"/>
diff --git a/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_electricity_emucs_v1_0.xml b/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_electricity_emucs_v1_0.xml
index 045fc7227fedf..d5fe7a90f26c5 100644
--- a/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_electricity_emucs_v1_0.xml
+++ b/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_electricity_emucs_v1_0.xml
@@ -11,7 +11,7 @@
 
 		<label>Electricity Meter (e-MUCS V1.0)</label>
 		<description>This is an electricity meter that complies to the e-MUCS V1.0 specification.</description>
-
+		<semantic-equipment-tag>ElectricMeter</semantic-equipment-tag>
 		<channels>
 			<channel id="emeter_equipment_identifier" typeId="equipmentIdType"/>
 			<channel id="emeter_delivery_tariff1" typeId="deliveryTariff1BelgiumType"/>
diff --git a/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_electricity_slave1_ace4000.xml b/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_electricity_slave1_ace4000.xml
index d16d564697cc9..b79344b25c52d 100644
--- a/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_electricity_slave1_ace4000.xml
+++ b/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_electricity_slave1_ace4000.xml
@@ -11,7 +11,7 @@
 
 		<label>Slave Electricity Meter 1 (ACE4000)</label>
 		<description>This is the first slave electricity meter that complies to the ACE4000 GTMM Mk3 specification.</description>
-
+		<semantic-equipment-tag>ElectricMeter</semantic-equipment-tag>
 		<channels>
 			<channel id="emeter_delivery_tariff0" typeId="deliveryTariff0Type"/>
 			<channel id="emeter_delivery_tariff1" typeId="deliveryTariff1Type"/>
diff --git a/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_electricity_slave2_ace4000.xml b/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_electricity_slave2_ace4000.xml
index 340b9802a16bb..535bfb781deab 100644
--- a/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_electricity_slave2_ace4000.xml
+++ b/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_electricity_slave2_ace4000.xml
@@ -11,7 +11,7 @@
 
 		<label>Slave Electricity Meter 2 (ACE4000)</label>
 		<description>This is the second slave electricity meter that complies to the ACE4000 GTMM Mk3 specification.</description>
-
+		<semantic-equipment-tag>ElectricMeter</semantic-equipment-tag>
 		<channels>
 			<channel id="emeter_delivery_tariff0" typeId="deliveryTariff0Type"/>
 			<channel id="emeter_delivery_tariff1" typeId="deliveryTariff1Type"/>
diff --git a/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_electricity_slave_v4.xml b/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_electricity_slave_v4.xml
index 4b7bf463eb53f..3a8622ab2d095 100644
--- a/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_electricity_slave_v4.xml
+++ b/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_electricity_slave_v4.xml
@@ -11,7 +11,7 @@
 
 		<label>Slave Electricity Meter (DSMR V4.x)</label>
 		<description>This is the slave electricity meter that complies to the DSMR 4.x specification.</description>
-
+		<semantic-equipment-tag>ElectricMeter</semantic-equipment-tag>
 		<channels>
 			<channel id="meter_device_type" typeId="deviceType"/>
 			<channel id="meter_equipment_identifier" typeId="equipmentIdType"/>
diff --git a/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_electricity_slave_v5.xml b/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_electricity_slave_v5.xml
index 913ef482cd422..2a03b36c7ec61 100644
--- a/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_electricity_slave_v5.xml
+++ b/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_electricity_slave_v5.xml
@@ -11,7 +11,7 @@
 
 		<label>Slave Electricity Meter (DSMR V5.x)</label>
 		<description>This is the slave electricity meter that complies to the DSMR 5.x specification.</description>
-
+		<semantic-equipment-tag>ElectricMeter</semantic-equipment-tag>
 		<channels>
 			<channel id="meter_device_type" typeId="deviceType"/>
 			<channel id="meter_equipment_identifier" typeId="equipmentIdType"/>
diff --git a/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_electricity_smarty_v1.xml b/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_electricity_smarty_v1.xml
index 4acf3e97cdf38..25b5f03e57ff6 100644
--- a/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_electricity_smarty_v1.xml
+++ b/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_electricity_smarty_v1.xml
@@ -11,7 +11,7 @@
 
 		<label>Electricity Meter (Smarty V1.0)</label>
 		<description>This is an electricity meter that complies to the Luxembourg's Smarty V1.0 specification.</description>
-
+		<semantic-equipment-tag>ElectricMeter</semantic-equipment-tag>
 		<channels>
 			<channel id="emeter_equipment_identifier_v2_x" typeId="equipmentIdType"/>
 			<channel id="emeter_delivery_tariff0" typeId="totalImportedEnergyRegisterPType"/>
diff --git a/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_electricity_smarty_v1_austria.xml b/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_electricity_smarty_v1_austria.xml
index daed1a2d19947..042029f210995 100644
--- a/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_electricity_smarty_v1_austria.xml
+++ b/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_electricity_smarty_v1_austria.xml
@@ -11,7 +11,7 @@
 
 		<label>Electricity Meter Austria</label>
 		<description>This is an electricity meter that complies to the Austria's Smarty V1.0 specification.</description>
-
+		<semantic-equipment-tag>ElectricMeter</semantic-equipment-tag>
 		<channels>
 			<channel id="p1_timestamp" typeId="p1TimestampType"/>
 			<channel id="p1_version_output" typeId="p1VersionType"/>
diff --git a/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_gas_ace4000.xml b/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_gas_ace4000.xml
index 5ffcf1f1646a9..e9629e13e790d 100644
--- a/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_gas_ace4000.xml
+++ b/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_gas_ace4000.xml
@@ -11,7 +11,7 @@
 
 		<label>Gas Meter (ACE4000)</label>
 		<description>This is a gas meter that complies to the ACE4000 GTMM Mk3 specification.</description>
-
+		<semantic-equipment-tag>GasMeter</semantic-equipment-tag>
 		<channels>
 			<channel id="meter_equipment_identifier" typeId="equipmentIdType"/>
 			<channel id="gmeter_24h_delivery_v2" typeId="gasDelivery24HType"/>
diff --git a/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_gas_v2_1.xml b/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_gas_v2_1.xml
index c5e37f8193b18..49578656749a3 100644
--- a/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_gas_v2_1.xml
+++ b/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_gas_v2_1.xml
@@ -11,7 +11,7 @@
 
 		<label>Gas Meter (DSMR V2.1)</label>
 		<description>This is a gas meter that complies to the DSMR V2.1 specification.</description>
-
+		<semantic-equipment-tag>GasMeter</semantic-equipment-tag>
 		<channels>
 			<channel id="gmeter_equipment_identifier_v2" typeId="equipmentIdType"/>
 			<channel id="gmeter_24h_delivery_v2" typeId="gasDelivery24HType"/>
diff --git a/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_gas_v2_2.xml b/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_gas_v2_2.xml
index baa231632f0da..f85984025aaef 100644
--- a/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_gas_v2_2.xml
+++ b/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_gas_v2_2.xml
@@ -11,7 +11,7 @@
 
 		<label>Gas Meter (DSMR V2.2)</label>
 		<description>This is a gas meter that complies to the DSMR V2.2 specification.</description>
-
+		<semantic-equipment-tag>GasMeter</semantic-equipment-tag>
 		<channels>
 			<channel id="gmeter_equipment_identifier_v2" typeId="equipmentIdType"/>
 			<channel id="gmeter_24h_delivery_v2" typeId="gasDelivery24HType"/>
diff --git a/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_gas_v3_0.xml b/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_gas_v3_0.xml
index b87ede5dad312..3954735c4683e 100644
--- a/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_gas_v3_0.xml
+++ b/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_gas_v3_0.xml
@@ -11,7 +11,7 @@
 
 		<label>Gas Meter (DSMR V3.0)</label>
 		<description>This is a gas meter that complies to the DSMR V3.0 specification.</description>
-
+		<semantic-equipment-tag>GasMeter</semantic-equipment-tag>
 		<channels>
 			<channel id="meter_device_type" typeId="deviceType"/>
 			<channel id="meter_equipment_identifier" typeId="equipmentIdType"/>
diff --git a/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_gasmeter_emucs_v1_0.xml b/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_gasmeter_emucs_v1_0.xml
index 5305125ca072e..eb892ccc9853b 100644
--- a/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_gasmeter_emucs_v1_0.xml
+++ b/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_gasmeter_emucs_v1_0.xml
@@ -11,7 +11,7 @@
 
 		<label>Gas Meter (e-MUCS V1.0)</label>
 		<description>This is a gas meter that complies to the e-MUCS V1.0 specification.</description>
-
+		<semantic-equipment-tag>GasMeter</semantic-equipment-tag>
 		<channels>
 			<channel id="meter_device_type" typeId="deviceType"/>
 			<channel id="meter_equipment_identifier" typeId="equipmentIdType"/>
diff --git a/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_water_ace4000.xml b/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_water_ace4000.xml
index 342226f74e82f..e13c6ad928d2e 100644
--- a/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_water_ace4000.xml
+++ b/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_water_ace4000.xml
@@ -11,7 +11,7 @@
 
 		<label>Water Meter (ACE4000)</label>
 		<description>This is a water meter that complies to the ACE4000 GTMM Mk3 specification.</description>
-
+		<semantic-equipment-tag>WaterMeter</semantic-equipment-tag>
 		<channels>
 			<channel id="meter_equipment_identifier" typeId="equipmentIdType"/>
 			<channel id="wmeter_value_v2" typeId="waterValueType"/>
diff --git a/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_water_v2_2.xml b/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_water_v2_2.xml
index f64acbfc24bfd..4e7634a1225b2 100644
--- a/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_water_v2_2.xml
+++ b/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_water_v2_2.xml
@@ -11,7 +11,7 @@
 
 		<label>Water Meter (DSMR V2.2)</label>
 		<description>This is a water meter that complies to the DSMR V2.2 specification.</description>
-
+		<semantic-equipment-tag>WaterMeter</semantic-equipment-tag>
 		<channels>
 			<channel id="wmeter_equipment_identifier_v2_2" typeId="equipmentIdType"/>
 			<channel id="wmeter_value_v2" typeId="waterValueType"/>
diff --git a/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_water_v3_0.xml b/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_water_v3_0.xml
index 769ddb050fc9d..a60b40912483d 100644
--- a/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_water_v3_0.xml
+++ b/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/meter_water_v3_0.xml
@@ -11,7 +11,7 @@
 
 		<label>Water Meter (DSMR V3.0)</label>
 		<description>This is a water meter that complies to the DSMR V3.0 specification.</description>
-
+		<semantic-equipment-tag>WaterMeter</semantic-equipment-tag>
 		<channels>
 			<channel id="meter_device_type" typeId="deviceType"/>
 			<channel id="meter_equipment_identifier" typeId="equipmentIdType"/>
diff --git a/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/smarty_device.xml b/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/smarty_device.xml
index ff4f2d5d70ffa..1c17135398bd4 100644
--- a/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/smarty_device.xml
+++ b/bundles/org.openhab.binding.dsmr/src/main/resources/OH-INF/thing/smarty_device.xml
@@ -7,7 +7,7 @@
 	<bridge-type id="smartyBridge">
 		<label>Smarty Meter</label>
 		<description>The Luxembourgian Smart Meter 'Smarty'</description>
-
+		<semantic-equipment-tag>ElectricMeter</semantic-equipment-tag>
 		<config-description-ref uri="thing-type:dsmr:smartybridgesettings"/>
 	</bridge-type>
 
diff --git a/bundles/org.openhab.binding.elroconnects/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.elroconnects/src/main/resources/OH-INF/thing/thing-types.xml
index 59bea29f387d0..b6d58eb1b06a3 100644
--- a/bundles/org.openhab.binding.elroconnects/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.elroconnects/src/main/resources/OH-INF/thing/thing-types.xml
@@ -71,6 +71,7 @@
 		<label>Smoke Alarm</label>
 		<description>ELRO Connects smoke alarm</description>
 		<category>SmokeDetector</category>
+		<semantic-equipment-tag>SmokeDetector</semantic-equipment-tag>
 		<channels>
 			<channel id="smokeAlarm" typeId="smokealarm"/>
 			<channel id="muteAlarm" typeId="mutealarm"/>
@@ -93,6 +94,7 @@
 		</supported-bridge-type-refs>
 		<label>CO Alarm</label>
 		<description>ELRO Connects CO alarm</description>
+		<semantic-equipment-tag>COSensor</semantic-equipment-tag>
 		<channels>
 			<channel id="coAlarm" typeId="coalarm"/>
 			<channel id="muteAlarm" typeId="mutealarm"/>
@@ -115,6 +117,7 @@
 		</supported-bridge-type-refs>
 		<label>Heat Alarm</label>
 		<description>ELRO Connects heat alarm</description>
+		<semantic-equipment-tag>HeatDetector</semantic-equipment-tag>
 		<channels>
 			<channel id="heatAlarm" typeId="heatalarm"/>
 			<channel id="muteAlarm" typeId="mutealarm"/>
@@ -137,6 +140,7 @@
 		</supported-bridge-type-refs>
 		<label>Water Alarm</label>
 		<description>ELRO Connects water alarm</description>
+		<semantic-equipment-tag>LeakSensor</semantic-equipment-tag>
 		<channels>
 			<channel id="waterAlarm" typeId="wateralarm"/>
 			<channel id="muteAlarm" typeId="mutealarm"/>
@@ -160,6 +164,7 @@
 		<label>Door/Window Sensor</label>
 		<description>ELRO Connects door/window contact sensor</description>
 		<category>Door</category>
+		<semantic-equipment-tag>ContactSensor</semantic-equipment-tag>
 		<channels>
 			<channel id="entryAlarm" typeId="entryalarm"/>
 			<channel id="entry" typeId="entry"/>
@@ -182,6 +187,7 @@
 		<label>Motion Sensor</label>
 		<description>ELRO Connects motion sensor</description>
 		<category>MotionDetector</category>
+		<semantic-equipment-tag>MotionDetector</semantic-equipment-tag>
 		<channels>
 			<channel id="motionAlarm" typeId="motionalarm"/>
 			<channel id="motion" typeId="system.motion"/>
@@ -204,6 +210,7 @@
 		<label>Temperature Sensor</label>
 		<description>ELRO Connects temperature sensor</description>
 		<category>Sensor</category>
+		<semantic-equipment-tag>TemperatureSensor</semantic-equipment-tag>
 		<channels>
 			<channel id="temperature" typeId="temperature"/>
 			<channel id="humidity" typeId="system.atmospheric-humidity"/>
@@ -226,6 +233,7 @@
 		<label>Power Socket</label>
 		<description>ELRO Connects power socket</description>
 		<category>PowerOutlet</category>
+		<semantic-equipment-tag>PowerOutlet</semantic-equipment-tag>
 		<channels>
 			<channel id="signal" typeId="system.signal-strength"/>
 			<channel id="powerState" typeId="system.power"/>
diff --git a/bundles/org.openhab.binding.emotiva/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.emotiva/src/main/resources/OH-INF/thing/thing-types.xml
index 83101e3f77e33..91b38d0f69135 100644
--- a/bundles/org.openhab.binding.emotiva/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.emotiva/src/main/resources/OH-INF/thing/thing-types.xml
@@ -7,7 +7,7 @@
 	<thing-type id="processor">
 		<label>Emotiva Processor</label>
 		<description>Emotiva Processor Thing for Emotiva Binding</description>
-
+		<semantic-equipment-tag>AudioVisual</semantic-equipment-tag>
 		<channel-groups>
 			<channel-group id="general" typeId="general"/>
 			<channel-group id="main-zone" typeId="zone">
diff --git a/bundles/org.openhab.binding.enigma2/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.enigma2/src/main/resources/OH-INF/thing/thing-types.xml
index 13623591534de..65432ff2e54f3 100644
--- a/bundles/org.openhab.binding.enigma2/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.enigma2/src/main/resources/OH-INF/thing/thing-types.xml
@@ -6,6 +6,7 @@
 	<thing-type id="device">
 		<label>Enigma2</label>
 		<description>The Thing represents an Enigma2 device</description>
+		<semantic-equipment-tag>AudioVisual</semantic-equipment-tag>
 		<channels>
 			<channel id="power" typeId="powerType"/>
 			<channel id="mute" typeId="muteType"/>
diff --git a/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/Contact.xml b/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/Contact.xml
index 648cb2c6b6253..71747a1578fd0 100644
--- a/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/Contact.xml
+++ b/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/Contact.xml
@@ -11,7 +11,7 @@
 
 		<label>Single Input Contact</label>
 		<description>Single input contact sensor (EEP: D5-00)</description>
-
+		<semantic-equipment-tag>ContactSensor</semantic-equipment-tag>
 		<config-description>
 			<parameter name="enoceanId" type="text" required="true">
 				<label>EnOceanId</label>
diff --git a/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/EnvironmentalSensor.xml b/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/EnvironmentalSensor.xml
index 0962fb9f6128d..2a0f65e93dc79 100644
--- a/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/EnvironmentalSensor.xml
+++ b/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/EnvironmentalSensor.xml
@@ -11,7 +11,7 @@
 
 		<label>Environmental Sensor</label>
 		<description>Sensor for different environmental sensors like a weather station (EEP: A5-13)</description>
-
+		<semantic-equipment-tag>WeatherStation</semantic-equipment-tag>
 		<config-description>
 			<parameter name="enoceanId" type="text" required="true">
 				<label>EnOceanId</label>
diff --git a/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/GasSensor.xml b/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/GasSensor.xml
index 09d90c428c18d..346e7081d1e8c 100644
--- a/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/GasSensor.xml
+++ b/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/GasSensor.xml
@@ -11,7 +11,7 @@
 
 		<label>Gas Sensor</label>
 		<description>Sensor which sends gas measurement data (EEP: A5-09)</description>
-
+		<semantic-equipment-tag>AirQualitySensor</semantic-equipment-tag>
 		<config-description>
 			<parameter name="enoceanId" type="text" required="true">
 				<label>EnOceanId</label>
diff --git a/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/HeatRecoveryVentilation.xml b/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/HeatRecoveryVentilation.xml
index 46d461cf8e5fb..c2e31e938337a 100644
--- a/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/HeatRecoveryVentilation.xml
+++ b/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/HeatRecoveryVentilation.xml
@@ -11,7 +11,7 @@
 
 		<label>Heat Recovery Ventilation</label>
 		<description>Sensor and actuator to control heat recovery ventilation units (EEP: D2-50)</description>
-
+		<semantic-equipment-tag>HeatRecovery</semantic-equipment-tag>
 		<config-description>
 			<parameter name="enoceanId" type="text" required="true">
 				<label>EnOceanId</label>
diff --git a/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/LightSensor.xml b/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/LightSensor.xml
index 00d978f5ed546..2287ba1415266 100644
--- a/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/LightSensor.xml
+++ b/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/LightSensor.xml
@@ -11,7 +11,7 @@
 
 		<label>Light Sensor</label>
 		<description>Sensor which sends light data (EEP: A5-06)</description>
-
+		<semantic-equipment-tag>IlluminanceSensor</semantic-equipment-tag>
 		<config-description>
 			<parameter name="enoceanId" type="text" required="true">
 				<label>EnOceanId</label>
diff --git a/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/LightTemperatureOccupancySensor.xml b/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/LightTemperatureOccupancySensor.xml
index c1c36d1c6daec..ec4ff31d5725c 100644
--- a/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/LightTemperatureOccupancySensor.xml
+++ b/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/LightTemperatureOccupancySensor.xml
@@ -11,7 +11,7 @@
 
 		<label>Light/Temperature/Occupancy Sensor</label>
 		<description>Sensor which sends light, temperature and occupancy data (EEP: A5-08)</description>
-
+		<semantic-equipment-tag>Sensor</semantic-equipment-tag>
 		<config-description>
 			<parameter name="enoceanId" type="text" required="true">
 				<label>EnOceanId</label>
diff --git a/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/MeasurementSwitch.xml b/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/MeasurementSwitch.xml
index 2e0657004640d..77f069efccdaa 100644
--- a/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/MeasurementSwitch.xml
+++ b/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/MeasurementSwitch.xml
@@ -11,7 +11,7 @@
 
 		<label>Energy Measurement Switch</label>
 		<description>Electronic switches and dimmers with energy measurement and local control (EEP: D2-01)</description>
-
+		<semantic-equipment-tag>ControlDevice</semantic-equipment-tag>
 		<config-description>
 			<parameter name="enoceanId" type="text" required="true">
 				<label>EnOceanId</label>
diff --git a/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/MechanicalHandle.xml b/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/MechanicalHandle.xml
index 488fe1c5eef3d..a0f87b2d11ad1 100644
--- a/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/MechanicalHandle.xml
+++ b/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/MechanicalHandle.xml
@@ -12,7 +12,7 @@
 
 		<label>Mechanical Handle</label>
 		<description>Mechanical handle sensor for window/door handles</description>
-
+		<semantic-equipment-tag>Lock</semantic-equipment-tag>
 		<config-description>
 			<parameter name="enoceanId" type="text" required="true">
 				<label>EnOceanId</label>
diff --git a/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/MultiFunctionSmokeDetector.xml b/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/MultiFunctionSmokeDetector.xml
index e292562a738ac..f1fa1a1b1049a 100644
--- a/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/MultiFunctionSmokeDetector.xml
+++ b/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/MultiFunctionSmokeDetector.xml
@@ -11,7 +11,7 @@
 
 		<label>Multi Function Smoke Detector</label>
 		<description>Multi Function Sensor like a Smoke Detector (EEP: F6-05, D2-14)</description>
-
+		<semantic-equipment-tag>Sensor</semantic-equipment-tag>
 		<config-description>
 			<parameter name="enoceanId" type="text" required="true">
 				<label>EnOceanId</label>
diff --git a/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/OccupancySensor.xml b/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/OccupancySensor.xml
index 7f770684e64c2..fa094aef6fa0d 100644
--- a/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/OccupancySensor.xml
+++ b/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/OccupancySensor.xml
@@ -11,7 +11,7 @@
 
 		<label>Occupancy Sensor</label>
 		<description>Sensor which sends light, supply voltage and occupancy data (EEP: A5-07)</description>
-
+		<semantic-equipment-tag>OccupancySensor</semantic-equipment-tag>
 		<config-description>
 			<parameter name="enoceanId" type="text" required="true">
 				<label>EnOceanId</label>
diff --git a/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/PushButton.xml b/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/PushButton.xml
index 635d291363312..42cc66ecd813b 100644
--- a/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/PushButton.xml
+++ b/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/PushButton.xml
@@ -12,7 +12,7 @@
 
 		<label>Simple Push Button</label>
 		<description>Represents a physical Push Button (EEP: F6-01, D2-03)</description>
-
+		<semantic-equipment-tag>Button</semantic-equipment-tag>
 		<config-description>
 			<parameter name="enoceanId" type="text" required="true">
 				<label>EnOceanId</label>
diff --git a/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/RockerSwitch.xml b/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/RockerSwitch.xml
index c17b070eb5909..66b8c9c1c75e4 100644
--- a/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/RockerSwitch.xml
+++ b/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/RockerSwitch.xml
@@ -12,7 +12,7 @@
 
 		<label>Rocker Switch</label>
 		<description>Represents a physical Rocker Switch (EEP: F6-02)</description>
-
+		<semantic-equipment-tag>ControlDevice</semantic-equipment-tag>
 		<channels>
 			<channel typeId="system.rawrocker" id="rockerswitchA">
 				<label>Rocker Switch - Channel A</label>
diff --git a/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/Rollershutter.xml b/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/Rollershutter.xml
index 19d1061d01794..aa98a4da43dfd 100644
--- a/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/Rollershutter.xml
+++ b/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/Rollershutter.xml
@@ -11,7 +11,7 @@
 
 		<label>Rollershutter Actuator</label>
 		<description>Rollershutter like Eltako FSB14/61/71, FJ62 or NodOn SIN-2-RS-01 (EEP: A5-37, D2-05)</description>
-
+		<semantic-equipment-tag>Blinds</semantic-equipment-tag>
 		<config-description>
 			<parameter name="enoceanId" type="text" required="true">
 				<label>EnOceanId</label>
diff --git a/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/RoomOperatingPanel.xml b/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/RoomOperatingPanel.xml
index c8a177104763d..8779bf6e3d41f 100644
--- a/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/RoomOperatingPanel.xml
+++ b/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/RoomOperatingPanel.xml
@@ -11,7 +11,7 @@
 
 		<label>Room Operating Panel</label>
 		<description>Room operating panel with different kinds of sensors (EEP: A5-10)</description>
-
+		<semantic-equipment-tag>ControlDevice</semantic-equipment-tag>
 		<config-description>
 			<parameter name="enoceanId" type="text" required="true">
 				<label>EnOceanId</label>
diff --git a/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/TemperatureHumiditySensor.xml b/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/TemperatureHumiditySensor.xml
index fd7282fa92009..14db3898ddcbd 100644
--- a/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/TemperatureHumiditySensor.xml
+++ b/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/TemperatureHumiditySensor.xml
@@ -11,7 +11,7 @@
 
 		<label>Temperature/Humidity Sensor</label>
 		<description>Sensor which sends temperature and humidity data (EEP: A5-04)</description>
-
+		<semantic-equipment-tag>Sensor</semantic-equipment-tag>
 		<config-description>
 			<parameter name="enoceanId" type="text" required="true">
 				<label>EnOceanId</label>
diff --git a/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/TemperatureSensor.xml b/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/TemperatureSensor.xml
index 9f28e772caa04..c4778dac458f1 100644
--- a/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/TemperatureSensor.xml
+++ b/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/TemperatureSensor.xml
@@ -11,7 +11,7 @@
 
 		<label>Temperature Sensor</label>
 		<description>Sensor which send temperature data (EEP: A5-02)</description>
-
+		<semantic-equipment-tag>TemperatureSensor</semantic-equipment-tag>
 		<config-description>
 			<parameter name="enoceanId" type="text" required="true">
 				<label>EnOceanId</label>
diff --git a/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/Thermostat.xml b/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/Thermostat.xml
index 750bbb27d650c..e5bd2c40f6ad7 100644
--- a/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/Thermostat.xml
+++ b/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/Thermostat.xml
@@ -11,7 +11,7 @@
 
 		<label>Thermostat</label>
 		<description>Sensor and actuator to control radiator thermostats</description>
-
+		<semantic-equipment-tag>Thermostat</semantic-equipment-tag>
 		<config-description>
 			<parameter name="enoceanId" type="text" required="true">
 				<label>EnOceanId</label>
diff --git a/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/WindowSashHandleSensor.xml b/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/WindowSashHandleSensor.xml
index e57bf0fdae1a4..bc71bdbf6504c 100644
--- a/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/WindowSashHandleSensor.xml
+++ b/bundles/org.openhab.binding.enocean/src/main/resources/OH-INF/thing/WindowSashHandleSensor.xml
@@ -12,7 +12,7 @@
 
 		<label>Sash Handle Sensor</label>
 		<description>Combined sensor for window/door sash state and handle state</description>
-
+		<semantic-equipment-tag>Lock</semantic-equipment-tag>
 		<config-description>
 			<parameter name="enoceanId" type="text" required="true">
 				<label>EnOceanId</label>

From d48e360716e7dd8b28479d118450e1779c2cfb4d Mon Sep 17 00:00:00 2001
From: Andrew Fiddian-Green <software@whitebear.ch>
Date: Fri, 18 Apr 2025 22:59:11 +0100
Subject: [PATCH 12/15] fix avmfritz

Signed-off-by: Andrew Fiddian-Green <software@whitebear.ch>
---
 .../src/main/resources/OH-INF/thing/thing-types.xml            | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 d561cbd0fa663..3e81e2bfad556 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
@@ -435,9 +435,10 @@
 		<supported-bridge-type-refs>
 			<bridge-type-ref id="fritzbox"/>
 		</supported-bridge-type-refs>
-		<semantic-equipment-tag>LightSource</semantic-equipment-tag>
+
 		<label>HAN-FUN Dimmable Light</label>
 		<description>HAN-FUN dimmable light (e.g. SmartHome LED-Lampe E27 (warmweiß)).</description>
+		<semantic-equipment-tag>LightSource</semantic-equipment-tag>
 
 		<channels>
 			<channel id="brightness" typeId="system.brightness"/>

From e97b146bdd6eb046e69af016dd8cb6bfd5f94947 Mon Sep 17 00:00:00 2001
From: Andrew Fiddian-Green <software@whitebear.ch>
Date: Tue, 22 Apr 2025 16:49:32 +0100
Subject: [PATCH 13/15] adopt reviewer suggestions

Signed-off-by: Andrew Fiddian-Green <software@whitebear.ch>
---
 .../src/main/resources/OH-INF/thing/thing-types.xml           | 2 +-
 .../src/main/resources/OH-INF/thing/airthings.xml             | 2 +-
 .../src/main/resources/OH-INF/thing/mp-types.xml              | 4 ++--
 .../src/main/resources/OH-INF/thing/thing-types.xml           | 3 +--
 .../src/main/resources/OH-INF/thing/thing-types.xml           | 4 ++--
 5 files changed, 7 insertions(+), 8 deletions(-)

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 678f90ff070ee..8888c55fbd272 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,7 +8,7 @@
 	<bridge-type id="bridge">
 		<label>Automower Connect Bridge</label>
 		<description>The bridge to communicate with the Automower Connect API</description>
-		<semantic-equipment-tag>NetworkAppliance</semantic-equipment-tag>
+		<semantic-equipment-tag>WebService</semantic-equipment-tag>
 
 
 		<config-description>
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 0be1032a6944b..39caab71704c8 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,7 +13,7 @@
 
 		<label>Airthings Wave Mini</label>
 		<description>Indoor air quality monitor</description>
-		<semantic-equipment-tag>WeatherStation</semantic-equipment-tag>
+		<semantic-equipment-tag>AirQualitySensor</semantic-equipment-tag>
 
 		<channels>
 			<channel id="rssi" typeId="rssi"/>
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 8534d7fbb937a..5f60a96320b36 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
@@ -28,7 +28,7 @@
 	<thing-type id="mp1-1k3s2u">
 		<label>Broadlink MP1 1K3S2U</label>
 		<description>The Broadlink MP1 1K3S2U Smart Home Wifi Plug Power Strip 3 AC, 2 USB Individual Wireless Remote Control.</description>
-		<semantic-equipment-tag>Sensor</semantic-equipment-tag>
+		<semantic-equipment-tag>ControlDevice</semantic-equipment-tag>
 		<channels>
 			<channel id="power-on-s1" typeId="system.power">
 				<label>Socket 1 Power</label>
@@ -50,7 +50,7 @@
 		<label>Broadlink MP2</label>
 		<description>The Broadlink MP2 is a smart socket with Wi-Fi connectivity. It does not support switching individual
 			ports.</description>
-		<semantic-equipment-tag>Sensor</semantic-equipment-tag>
+		<semantic-equipment-tag>ControlDevice</semantic-equipment-tag>
 		<channels>
 			<channel id="power-on" typeId="system.power"/>
 			<channel id="power-consumption" typeId="system.electric-energy"/>
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 873d6cbb7c308..2949d75d16b49 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 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <thing:thing-descriptions bindingId="cm11a"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:thing="https://openhab.org/schemas/thing-description/v1.0.0"
@@ -33,7 +32,7 @@
 
 		<label>X10 Dimmer</label>
 		<description>Controls dimmable loads</description>
-		<semantic-equipment-tag>Dial</semantic-equipment-tag>
+		<semantic-equipment-tag>LightSource</semantic-equipment-tag>
 
 		<channels>
 			<channel id="lightlevel" typeId="lightDimmer"/>
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 2ee654be4a44e..69c0ab8fc5ed9 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,7 +7,7 @@
 	<bridge-type id="controller">
 		<label>CoolMasterNet Controller</label>
 		<description>A CoolMasterNet Controller (connected to one or more HVAC systems)</description>
-		<semantic-equipment-tag>HVAC</semantic-equipment-tag>
+		<semantic-equipment-tag>NetworkAppliance</semantic-equipment-tag>
 
 		<config-description>
 			<parameter name="host" type="text" required="true">
@@ -39,7 +39,7 @@
 
 		<label>HVAC System</label>
 		<description>HVAC System connected to a controller (unique UID)</description>
-
+		<semantic-equipment-tag>HVAC</semantic-equipment-tag>
 		<channels>
 			<channel id="on" typeId="power"/>
 			<channel id="mode" typeId="hvac_mode"/>

From 1e870733d7e4694f06790cd3ddd2b9f382e01f67 Mon Sep 17 00:00:00 2001
From: Andrew Fiddian-Green <software@whitebear.ch>
Date: Tue, 22 Apr 2025 17:06:22 +0100
Subject: [PATCH 14/15] adopt reviewer suggestion

Signed-off-by: Andrew Fiddian-Green <software@whitebear.ch>
---
 .../src/main/resources/OH-INF/thing/thing-types.xml             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 75ae3ce0d256b..446371cf0ccb7 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
@@ -486,7 +486,7 @@
 
 		<label>Dimmer</label>
 		<description>Smart dimmer capable of controlling any dimmable lamp.</description>
-		<semantic-equipment-tag>Dial</semantic-equipment-tag>
+		<semantic-equipment-tag>LightSource</semantic-equipment-tag>
 
 		<channels>
 			<channel id="power-switch" typeId="system.power"/>

From ae7cb46e9d8047a5657274d6b94b78af5d7c0c80 Mon Sep 17 00:00:00 2001
From: Andrew Fiddian-Green <software@whitebear.ch>
Date: Tue, 22 Apr 2025 17:43:04 +0100
Subject: [PATCH 15/15] Added alarmzone

Signed-off-by: Andrew Fiddian-Green <software@whitebear.ch>
---
 .../src/main/resources/OH-INF/thing/area.xml                    | 2 +-
 .../src/main/resources/OH-INF/thing/zone.xml                    | 2 +-
 .../src/main/resources/OH-INF/thing/partition.xml               | 2 +-
 .../src/main/resources/OH-INF/thing/zone.xml                    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

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 55151b3b2673a..58711aa5c903a 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,7 +10,7 @@
 		</supported-bridge-type-refs>
 		<label>Area</label>
 		<description>Area</description>
-		<semantic-equipment-tag>AlarmSystem</semantic-equipment-tag>
+		<semantic-equipment-tag>AlarmZone</semantic-equipment-tag>
 		<channels>
 			<channel typeId="area_status" id="status"/>
 			<channel typeId="area_armed" id="armed"/>
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 0bd436a8ed3d8..d63c33e146135 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,7 +10,7 @@
 		</supported-bridge-type-refs>
 		<label>Zone</label>
 		<description>Zone</description>
-		<semantic-equipment-tag>AlarmSystem</semantic-equipment-tag>
+		<semantic-equipment-tag>AlarmZone</semantic-equipment-tag>
 		<channels>
 			<channel typeId="status" id="status"/>
 			<channel typeId="extended_status" id="extended_status"/>
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 d96cc37a29023..2252ccf4b1642 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,7 +13,7 @@
 
 		<label>DSC Alarm Partition</label>
 		<description>Represents a controllable area within a DSC Alarm System.</description>
-		<semantic-equipment-tag>AlarmSystem</semantic-equipment-tag>
+		<semantic-equipment-tag>AlarmZone</semantic-equipment-tag>
 
 		<channels>
 			<channel id="partition_status" typeId="message">
diff --git a/bundles/org.openhab.binding.dscalarm/src/main/resources/OH-INF/thing/zone.xml b/bundles/org.openhab.binding.dscalarm/src/main/resources/OH-INF/thing/zone.xml
index f4473cd55a18b..5136280135780 100644
--- a/bundles/org.openhab.binding.dscalarm/src/main/resources/OH-INF/thing/zone.xml
+++ b/bundles/org.openhab.binding.dscalarm/src/main/resources/OH-INF/thing/zone.xml
@@ -13,7 +13,7 @@
 
 		<label>DSC Alarm Zone</label>
 		<description>Represents a physical device such as a door, window, or motion sensor.</description>
-		<semantic-equipment-tag>AlarmDevice</semantic-equipment-tag>
+		<semantic-equipment-tag>AlarmZone</semantic-equipment-tag>
 
 		<channels>
 			<channel id="zone_status" typeId="zone_status">