diff --git a/_addons_bindings/froniuswattpilot/readme.md b/_addons_bindings/froniuswattpilot/readme.md
index fbee41a4b..983ca1563 100644
--- a/_addons_bindings/froniuswattpilot/readme.md
+++ b/_addons_bindings/froniuswattpilot/readme.md
@@ -5,6 +5,7 @@ title: Fronius Wattpilot - Bindings
 type: binding
 description: "This binding integrates the [Fronius Wattpilot EV charging stations](https://www.fronius.com/en-gb/uk/solar-energy/installers-partners/products-solutions/residential-energy-solutions/e-mobility-and-photovoltaic-residential/wattpilot-ev-charging-solution-for-homes)"
 since: 3x
+logo: images/addons/froniuswattpilot.png
 install: auto
 ---
 
@@ -14,6 +15,8 @@ install: auto
 
 # Fronius Wattpilot Binding
 
+<AddonLogo />
+
 This binding integrates the [Fronius Wattpilot EV charging stations](https://www.fronius.com/en-gb/uk/solar-energy/installers-partners/products-solutions/residential-energy-solutions/e-mobility-and-photovoltaic-residential/wattpilot-ev-charging-solution-for-homes)
 through their unofficial WebSocket API, which is also used by the [Fronius Solar.Wattpilot app](https://www.fronius.com/en-gb/uk/solar-energy/installers-partners/products-solutions/residential-energy-solutions/e-mobility-and-photovoltaic-residential/wattpilot-ev-charging-solution-for-homes#anc_app).
 
diff --git a/_thing_types/org.openhab.binding.hue/src/main/resources/OH-INF/thing/bridge.xml b/_thing_types/org.openhab.binding.hue/src/main/resources/OH-INF/thing/bridge.xml
index f763a8d23..fae9f8ba0 100644
--- a/_thing_types/org.openhab.binding.hue/src/main/resources/OH-INF/thing/bridge.xml
+++ b/_thing_types/org.openhab.binding.hue/src/main/resources/OH-INF/thing/bridge.xml
@@ -66,6 +66,7 @@
 	<bridge-type id="bridge-api2">
 		<label>Hue API v2 Bridge</label>
 		<description>The Hue Bridge represents a Philips Hue Bridge supporting API v2.</description>
+		<semantic-equipment-tag>NetworkAppliance</semantic-equipment-tag>
 
 		<channel-groups>
 			<channel-group id="automation" typeId="automation"/>
diff --git a/_thing_types/org.openhab.binding.hue/src/main/resources/OH-INF/thing/channels.xml b/_thing_types/org.openhab.binding.hue/src/main/resources/OH-INF/thing/channels.xml
index 5193bb495..31c4e5a06 100644
--- a/_thing_types/org.openhab.binding.hue/src/main/resources/OH-INF/thing/channels.xml
+++ b/_thing_types/org.openhab.binding.hue/src/main/resources/OH-INF/thing/channels.xml
@@ -8,6 +8,10 @@
 		<label>Last Updated</label>
 		<description>The date and time when the sensor was last updated.</description>
 		<category>Time</category>
+		<tags>
+			<tag>Status</tag>
+			<tag>Timestamp</tag>
+		</tags>
 		<state readOnly="true" pattern="%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS"/>
 	</channel-type>
 
@@ -17,7 +21,7 @@
 		<description>Current illuminance.</description>
 		<tags>
 			<tag>Measurement</tag>
-			<tag>Light</tag>
+			<tag>Illuminance</tag>
 		</tags>
 		<state readOnly="true" pattern="%.1f %unit%"/>
 	</channel-type>
@@ -26,6 +30,10 @@
 		<item-type>Number</item-type>
 		<label>Light Level</label>
 		<description>Current light level.</description>
+		<tags>
+			<tag>Measurement</tag>
+			<tag>Illuminance</tag>
+		</tags>
 		<state readOnly="true" pattern="%d"/>
 	</channel-type>
 
@@ -142,7 +150,8 @@
 		<label>Alert</label>
 		<description>The alert channel allows a temporary change to the bulb’s state.</description>
 		<tags>
-			<tag>Alarm</tag>
+			<tag>Switch</tag>
+			<tag>Mode</tag>
 		</tags>
 		<state>
 			<options>
@@ -159,6 +168,10 @@
 		<label>Color Loop</label>
 		<description>The effect channel allows putting the bulb in a color looping mode.</description>
 		<category>ColorLight</category>
+		<tags>
+			<tag>Switch</tag>
+			<tag>Mode</tag>
+		</tags>
 	</channel-type>
 
 	<!-- CLIP Sensor -->
@@ -179,6 +192,10 @@
 		<item-type>String</item-type>
 		<label>Scene</label>
 		<description>The scene channel allows recalling a scene to all lights that belong to the scene.</description>
+		<tags>
+			<tag>Control</tag>
+			<tag>Mode</tag>
+		</tags>
 	</channel-type>
 
 	<!-- API v2 Channel Types -->
@@ -200,12 +217,20 @@
 		<item-type>Switch</item-type>
 		<label>Sensor Enabled</label>
 		<category>Lock</category>
+		<tags>
+			<tag>Switch</tag>
+			<tag>Mode</tag>
+		</tags>
 	</channel-type>
 
 	<channel-type id="scene-v2" advanced="true">
 		<item-type>String</item-type>
 		<label>Scene</label>
 		<category>MediaControl</category>
+		<tags>
+			<tag>Control</tag>
+			<tag>Mode</tag>
+		</tags>
 		<state pattern="%s"/>
 		<autoUpdatePolicy>veto</autoUpdatePolicy>
 	</channel-type>
@@ -215,12 +240,20 @@
 		<label>Last Updated</label>
 		<description>The date and time when the thing was last updated.</description>
 		<category>Time</category>
+		<tags>
+			<tag>Status</tag>
+			<tag>Timestamp</tag>
+		</tags>
 		<state readOnly="true" pattern="%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS"/>
 	</channel-type>
 
 	<channel-type id="alert-v2" advanced="true">
 		<item-type>String</item-type>
 		<label>Alert</label>
+		<tags>
+			<tag>Control</tag>
+			<tag>Mode</tag>
+		</tags>
 		<state pattern="%s"/>
 		<autoUpdatePolicy>veto</autoUpdatePolicy>
 	</channel-type>
@@ -228,6 +261,10 @@
 	<channel-type id="effect-v2" advanced="true">
 		<item-type>String</item-type>
 		<label>Effect</label>
+		<tags>
+			<tag>Control</tag>
+			<tag>Mode</tag>
+		</tags>
 		<state pattern="%s"/>
 		<autoUpdatePolicy>veto</autoUpdatePolicy>
 	</channel-type>
@@ -237,6 +274,10 @@
 		<label>Dynamics</label>
 		<description>The duration (ms) of dynamic transitions between light or scene states.</description>
 		<category>Time</category>
+		<tags>
+			<tag>Control</tag>
+			<tag>Duration</tag>
+		</tags>
 		<state min="0" step="100" pattern="%d ms"/>
 	</channel-type>
 
@@ -247,7 +288,7 @@
 		<category>ColorLight</category>
 		<tags>
 			<tag>Control</tag>
-			<tag>Light</tag>
+			<tag>Color</tag>
 		</tags>
 		<autoUpdatePolicy>veto</autoUpdatePolicy>
 	</channel-type>
@@ -259,7 +300,7 @@
 		<category>Light</category>
 		<tags>
 			<tag>Control</tag>
-			<tag>Light</tag>
+			<tag>Brightness</tag>
 		</tags>
 		<state min="0" max="100" pattern="%.1f %%"/>
 		<autoUpdatePolicy>veto</autoUpdatePolicy>
@@ -281,18 +322,30 @@
 		<item-type>Contact</item-type>
 		<label>Open/Closed</label>
 		<category>Lock</category>
+		<tags>
+			<tag>Alarm</tag>
+			<tag>OpenState</tag>
+		</tags>
 	</channel-type>
 
 	<channel-type id="security-tamper">
 		<item-type>Contact</item-type>
 		<label>Normal/Tamper</label>
 		<category>Siren</category>
+		<tags>
+			<tag>Alarm</tag>
+			<tag>Tampered</tag>
+		</tags>
 	</channel-type>
 
 	<channel-type id="automation-enable">
 		<item-type>Switch</item-type>
 		<label>Enable</label>
 		<category>Switch</category>
+		<tags>
+			<tag>Switch</tag>
+			<tag>Enabled</tag>
+		</tags>
 	</channel-type>
 
 	<channel-group-type id="automation">
diff --git a/_thing_types/org.openhab.binding.tado/src/main/resources/OH-INF/thing/thing-types.xml b/_thing_types/org.openhab.binding.tado/src/main/resources/OH-INF/thing/thing-types.xml
index b3a06cecf..e3367b39a 100644
--- a/_thing_types/org.openhab.binding.tado/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/_thing_types/org.openhab.binding.tado/src/main/resources/OH-INF/thing/thing-types.xml
@@ -8,6 +8,7 @@
 	<bridge-type id="home">
 		<label>Tado Home</label>
 		<description>The user's tado home</description>
+		<semantic-equipment-tag>WebService</semantic-equipment-tag>
 
 		<channels>
 			<channel typeId="homePresence" id="homePresence"/>
@@ -46,6 +47,7 @@
 
 		<label>Zone</label>
 		<description>A zone of a home</description>
+		<semantic-equipment-tag>Thermostat</semantic-equipment-tag>
 
 		<channels>
 			<channel typeId="currentTemperature" id="currentTemperature"/>
@@ -113,6 +115,7 @@
 
 		<label>Mobile Device</label>
 		<description>Mobile device of a home</description>
+		<semantic-equipment-tag>Smartphone</semantic-equipment-tag>
 
 		<channels>
 			<channel typeId="atHome" id="atHome"/>
@@ -141,12 +144,20 @@
 		<item-type>Switch</item-type>
 		<label>At Home</label>
 		<description>ON if at home, OFF if away</description>
+		<tags>
+			<tag>Switch</tag>
+			<tag>Mode</tag>
+		</tags>
 	</channel-type>
 
 	<channel-type id="geofencingEnabled">
 		<item-type>Switch</item-type>
 		<label>Geofencing Enabled</label>
 		<description>Selects if automatic geofencing is enabled or disabled</description>
+		<tags>
+			<tag>Switch</tag>
+			<tag>Mode</tag>
+		</tags>
 	</channel-type>
 
 	<channel-type id="currentTemperature">
@@ -154,6 +165,10 @@
 		<label>Temperature</label>
 		<description>Current temperature</description>
 		<category>Temperature</category>
+		<tags>
+			<tag>Measurement</tag>
+			<tag>Temperature</tag>
+		</tags>
 		<state readOnly="true" pattern="%.1f %unit%"/>
 	</channel-type>
 
@@ -169,6 +184,10 @@
 		<item-type>String</item-type>
 		<label>HVAC Mode</label>
 		<description>Mode of the device (OFF, HEAT, COOL, DRY, FAN, AUTO - if supported)</description>
+		<tags>
+			<tag>Control</tag>
+			<tag>Mode</tag>
+		</tags>
 		<state>
 			<options>
 				<option value="OFF">Off</option>
@@ -186,6 +205,10 @@
 		<label>Target Temperature</label>
 		<description>Thermostat temperature setpoint</description>
 		<category>Temperature</category>
+		<tags>
+			<tag>Setpoint</tag>
+			<tag>Temperature</tag>
+		</tags>
 		<state step="0.1" pattern="%.1f %unit%"/>
 	</channel-type>
 
@@ -194,6 +217,10 @@
 		<label>Fan Speed</label>
 		<description>AC fan speed (only if supported by AC)</description>
 		<category>Fan</category>
+		<tags>
+			<tag>Control</tag>
+			<tag>Speed</tag>
+		</tags>
 		<state>
 			<options>
 				<option value="LOW">Low</option>
@@ -209,6 +236,10 @@
 		<label>Swing</label>
 		<description>State of AC swing (only if supported by AC)</description>
 		<category>Flow</category>
+		<tags>
+			<tag>Switch</tag>
+			<tag>Airflow</tag>
+		</tags>
 	</channel-type>
 
 	<channel-type id="light">
@@ -216,6 +247,10 @@
 		<label>Light</label>
 		<description>State of control panel light (only if supported by AC)</description>
 		<category>Light</category>
+		<tags>
+			<tag>Switch</tag>
+			<tag>Light</tag>
+		</tags>
 	</channel-type>
 
 	<channel-type id="fanLevel">
@@ -223,6 +258,10 @@
 		<label>Fan Speed</label>
 		<description>AC fan level (only if supported by AC)</description>
 		<category>Fan</category>
+		<tags>
+			<tag>Control</tag>
+			<tag>Speed</tag>
+		</tags>
 		<state>
 			<options>
 				<option value="SILENT">SILENT</option>
@@ -241,6 +280,10 @@
 		<label>Horizontal Swing</label>
 		<description>State of AC horizontal swing (only if supported by AC)</description>
 		<category>Flow</category>
+		<tags>
+			<tag>Control</tag>
+			<tag>Airflow</tag>
+		</tags>
 		<state>
 			<options>
 				<option value="AUTO">AUTO</option>
@@ -260,6 +303,10 @@
 		<label>Vertical Swing</label>
 		<description>State of AC vertical swing (only if supported by AC)</description>
 		<category>Flow</category>
+		<tags>
+			<tag>Control</tag>
+			<tag>Airflow</tag>
+		</tags>
 		<state>
 			<options>
 				<option value="AUTO">AUTO</option>
@@ -278,6 +325,10 @@
 		<item-type>String</item-type>
 		<label>Zone Operation Mode</label>
 		<description>Active operation mode (schedule, manual, timer or until next change)</description>
+		<tags>
+			<tag>Control</tag>
+			<tag>Mode</tag>
+		</tags>
 		<state>
 			<options>
 				<option value="SCHEDULE">Schedule</option>
@@ -293,6 +344,10 @@
 		<label>Timer Duration</label>
 		<description>Total duration of a timer</description>
 		<category>Time</category>
+		<tags>
+			<tag>Control</tag>
+			<tag>Duration</tag>
+		</tags>
 		<state min="0" step="1" pattern="%d min"/>
 	</channel-type>
 
@@ -301,6 +356,10 @@
 		<label>Overlay End Time</label>
 		<description>Time until when the overlay is active. Null if no overlay is set or overlay type is manual.</description>
 		<category>Time</category>
+		<tags>
+			<tag>Status</tag>
+			<tag>Timestamp</tag>
+		</tags>
 		<state readOnly="true" pattern="%1$tF %1$tR"/>
 	</channel-type>
 
@@ -308,6 +367,10 @@
 		<item-type>Switch</item-type>
 		<label>At Home</label>
 		<description>ON if at home, OFF if away</description>
+		<tags>
+			<tag>Switch</tag>
+			<tag>Mode</tag>
+		</tags>
 	</channel-type>
 
 	<channel-type id="acPower">
@@ -315,6 +378,10 @@
 		<label>Air-conditioning Power</label>
 		<description>Current power state of the air-conditioning</description>
 		<category>Climate</category>
+		<tags>
+			<tag>Switch</tag>
+			<tag>Power</tag>
+		</tags>
 		<state readOnly="true"/>
 	</channel-type>
 
@@ -323,6 +390,10 @@
 		<label>Open Window Detected</label>
 		<description>Indicates if an open window has been detected</description>
 		<category>Window</category>
+		<tags>
+			<tag>Status</tag>
+			<tag>OpenState</tag>
+		</tags>
 		<state readOnly="true"/>
 	</channel-type>
 
@@ -331,6 +402,10 @@
 		<label>Override Remaining Time</label>
 		<description>The remaining Open Window heating/cooling Override time in the Zone</description>
 		<category>Window</category>
+		<tags>
+			<tag>Status</tag>
+			<tag>Duration</tag>
+		</tags>
 		<state readOnly="true" pattern="%.0f %unit%"/>
 	</channel-type>