diff --git a/_addons_automation/jsscripting/readme.md b/_addons_automation/jsscripting/readme.md
index fbf35e173..1b6502787 100644
--- a/_addons_automation/jsscripting/readme.md
+++ b/_addons_automation/jsscripting/readme.md
@@ -298,8 +298,8 @@ Use the `SCRIPT` transformation with JavaScript Scripting by:
    })(input);
    ```
 
-2. Using `SCRIPT(graaljs:<scriptname>.script):%s` as the transformation profile, e.g. on an Item.
-3. Passing parameters is also possible by using a URL like syntax: `SCRIPT(graaljs:<scriptname>.script?arg=value):%s`.
+2. Using `SCRIPT(js:<scriptname>.script):%s` as the transformation profile, e.g. on an Item.
+3. Passing parameters is also possible by using a URL like syntax: `SCRIPT(js:<scriptname>.script?arg=value):%s`.
    Parameters are injected into the script and can be referenced like variables.
 
 ## Standard Library
diff --git a/_addons_bindings/avmfritz/readme.md b/_addons_bindings/avmfritz/readme.md
index 04711402a..3c1bfe040 100644
--- a/_addons_bindings/avmfritz/readme.md
+++ b/_addons_bindings/avmfritz/readme.md
@@ -156,7 +156,7 @@ If correct credentials are set in the bridge configuration, connected AHA device
 - `port` (optional, 1 to 65535), no default (derived from protocol: 80 or 443)
 - `password` (optional for call monitoring, but mandatory for AHA features), no default (depends on FRITZ!Box security configuration)
 - `user` (optional), no default (depends on FRITZ!Box security configuration)
-- `pollingInterval` (optional, 5 to 60), default 15 (in seconds)
+- `pollingInterval` (optional, 1 to 60), default 15 (in seconds)
 - `asyncTimeout` (optional, 1000 to 60000), default 10000 (in milliseconds)
 - `syncTimeout` (optional, 500 to 15000), default 2000 (in milliseconds)
 
@@ -167,7 +167,7 @@ If correct credentials are set in the bridge configuration, connected AHA device
 - `protocol` (optional, "http" or "https"), default "http"
 - `port` (optional, 1 to 65535), no default (derived from protocol: 80 or 443)
 - `password` (optional), no default (depends on FRITZ!Powerline security configuration)
-- `pollingInterval` (optional, 5 to 60), default 15 (in seconds)
+- `pollingInterval` (optional, 1 to 60), default 15 (in seconds)
 - `asyncTimeout` (optional, 1000 to 60000), default 10000 (in milliseconds)
 - `syncTimeout` (optional, 500 to 15000), default 2000 (in milliseconds)
 
diff --git a/_thing_types/org.openhab.binding.avmfritz/src/main/resources/OH-INF/thing/bridge-types.xml b/_thing_types/org.openhab.binding.avmfritz/src/main/resources/OH-INF/thing/bridge-types.xml
index a3aa44053..c019b633e 100644
--- a/_thing_types/org.openhab.binding.avmfritz/src/main/resources/OH-INF/thing/bridge-types.xml
+++ b/_thing_types/org.openhab.binding.avmfritz/src/main/resources/OH-INF/thing/bridge-types.xml
@@ -31,11 +31,21 @@
 			<channel id="locked" typeId="locked"/>
 			<channel id="device_locked" typeId="device_locked"/>
 			<channel id="apply_template" typeId="apply_template"/>
-			<channel id="energy" typeId="energy"/>
-			<channel id="power" typeId="power"/>
+			<channel id="energy" typeId="system.electrical-energy">
+				<label>Energy Consumption</label>
+				<description>Accumulated energy consumption.</description>
+			</channel>
+			<channel id="power" typeId="system.electric-power">
+				<label>Power</label>
+				<description>Current power consumption.</description>
+			</channel>
 			<channel id="outlet" typeId="outlet"/>
 		</channels>
 
+		<properties>
+			<property name="thingTypeVersion">1</property>
+		</properties>
+
 		<representation-property>ipAddress</representation-property>
 
 		<config-description-ref uri="bridge-type:avmfritz:fritzpowerline"/>
diff --git a/_thing_types/org.openhab.binding.avmfritz/src/main/resources/OH-INF/thing/channel-types.xml b/_thing_types/org.openhab.binding.avmfritz/src/main/resources/OH-INF/thing/channel-types.xml
index 69543c6c8..d16c8e528 100644
--- a/_thing_types/org.openhab.binding.avmfritz/src/main/resources/OH-INF/thing/channel-types.xml
+++ b/_thing_types/org.openhab.binding.avmfritz/src/main/resources/OH-INF/thing/channel-types.xml
@@ -11,18 +11,21 @@
 		<description>Details about incoming call.</description>
 		<state pattern="%1$s to %2$s" readOnly="true"/>
 	</channel-type>
+
 	<channel-type id="outgoing_call">
 		<item-type>Call</item-type>
 		<label>Outgoing Call</label>
 		<description>Details about outgoing call.</description>
 		<state pattern="%1$s to %2$s" readOnly="true"/>
 	</channel-type>
+
 	<channel-type id="active_call">
 		<item-type>Call</item-type>
 		<label>Active Call</label>
 		<description>Details about active call.</description>
 		<state pattern="%1$s" readOnly="true"/>
 	</channel-type>
+
 	<channel-type id="call_state">
 		<item-type>String</item-type>
 		<label>Call State</label>
@@ -36,6 +39,7 @@
 			</options>
 		</state>
 	</channel-type>
+
 	<channel-type id="apply_template" advanced="true">
 		<item-type>String</item-type>
 		<label>Apply Template</label>
@@ -48,6 +52,7 @@
 		<item-type>String</item-type>
 		<label>Mode</label>
 		<description>States the mode of the device (MANUAL/AUTOMATIC/VACATION).</description>
+		<category>Heating</category>
 		<state pattern="%s" readOnly="true">
 			<options>
 				<option value="MANUAL">Manual</option>
@@ -107,6 +112,10 @@
 		<label>Current Temperature</label>
 		<description>Current measured temperature.</description>
 		<category>Temperature</category>
+		<tags>
+			<tag>Measurement</tag>
+			<tag>Temperature</tag>
+		</tags>
 		<state pattern="%.1f %unit%" readOnly="true"/>
 
 		<config-description-ref uri="channel-type:avmfritz:temperature"/>
@@ -117,46 +126,22 @@
 		<label>Current Humidity</label>
 		<description>Current measured humidity.</description>
 		<category>Humidity</category>
+		<tags>
+			<tag>Measurement</tag>
+			<tag>Humidity</tag>
+		</tags>
 		<state pattern="%.0f %unit%" readOnly="true"/>
 	</channel-type>
 
-	<channel-type id="energy">
-		<item-type>Number:Energy</item-type>
-		<label>Energy Consumption</label>
-		<description>Accumulated energy consumption.</description>
-		<category>Energy</category>
-		<state pattern="%.3f kWh" readOnly="true"/>
-	</channel-type>
-
-	<channel-type id="power">
-		<item-type>Number:Power</item-type>
-		<label>Power</label>
-		<description>Current power consumption.</description>
-		<category>Energy</category>
-		<state pattern="%.2f %unit%" readOnly="true"/>
-	</channel-type>
-
-	<channel-type id="voltage">
-		<item-type>Number:ElectricPotential</item-type>
-		<label>Voltage</label>
-		<description>Current voltage.</description>
-		<category>Energy</category>
-		<state pattern="%.1f %unit%" readOnly="true"/>
-	</channel-type>
-
 	<channel-type id="outlet">
 		<item-type>Switch</item-type>
 		<label>Outlet</label>
 		<description>Switched outlet (ON/OFF).</description>
 		<category>PowerOutlet</category>
-	</channel-type>
-
-	<channel-type id="actual_temp" advanced="true">
-		<item-type>Number:Temperature</item-type>
-		<label>Current Temperature</label>
-		<description>Current measured temperature.</description>
-		<category>Temperature</category>
-		<state pattern="%.1f %unit%" readOnly="true"/>
+		<tags>
+			<tag>Switch</tag>
+			<tag>Power</tag>
+		</tags>
 	</channel-type>
 
 	<channel-type id="set_temp">
@@ -164,6 +149,10 @@
 		<label>Setpoint Temperature</label>
 		<description>Thermostat Setpoint temperature.</description>
 		<category>Heating</category>
+		<tags>
+			<tag>Setpoint</tag>
+			<tag>Temperature</tag>
+		</tags>
 		<state pattern="%.1f %unit%"/>
 	</channel-type>
 
diff --git a/_thing_types/org.openhab.binding.avmfritz/src/main/resources/OH-INF/thing/thing-types.xml b/_thing_types/org.openhab.binding.avmfritz/src/main/resources/OH-INF/thing/thing-types.xml
index 00c37e435..26d8691be 100644
--- a/_thing_types/org.openhab.binding.avmfritz/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/_thing_types/org.openhab.binding.avmfritz/src/main/resources/OH-INF/thing/thing-types.xml
@@ -91,7 +91,10 @@
 			<channel id="locked" typeId="locked"/>
 			<channel id="device_locked" typeId="device_locked"/>
 			<channel id="temperature" typeId="temperature"/>
-			<channel id="actual_temp" typeId="actual_temp"/>
+			<channel id="actual_temp" typeId="system.indoor-temperature">
+				<label>Current Temperature</label>
+				<description>Current measured temperature.</description>
+			</channel>
 			<channel id="set_temp" typeId="set_temp"/>
 			<channel id="eco_temp" typeId="eco_temp"/>
 			<channel id="comfort_temp" typeId="comfort_temp"/>
@@ -101,6 +104,10 @@
 			<channel id="battery_low" typeId="system.low-battery"/>
 		</channels>
 
+		<properties>
+			<property name="thingTypeVersion">1</property>
+		</properties>
+
 		<representation-property>ain</representation-property>
 
 		<config-description-ref uri="thing-type:avmfritz:fritzdevice"/>
@@ -120,7 +127,10 @@
 			<channel id="locked" typeId="locked"/>
 			<channel id="device_locked" typeId="device_locked"/>
 			<channel id="temperature" typeId="temperature"/>
-			<channel id="actual_temp" typeId="actual_temp"/>
+			<channel id="actual_temp" typeId="system.indoor-temperature">
+				<label>Current Temperature</label>
+				<description>Current measured temperature.</description>
+			</channel>
 			<channel id="set_temp" typeId="set_temp"/>
 			<channel id="eco_temp" typeId="eco_temp"/>
 			<channel id="comfort_temp" typeId="comfort_temp"/>
@@ -130,6 +140,10 @@
 			<channel id="battery_low" typeId="system.low-battery"/>
 		</channels>
 
+		<properties>
+			<property name="thingTypeVersion">1</property>
+		</properties>
+
 		<representation-property>ain</representation-property>
 
 		<config-description-ref uri="thing-type:avmfritz:fritzdevice"/>
@@ -149,7 +163,10 @@
 			<channel id="locked" typeId="locked"/>
 			<channel id="device_locked" typeId="device_locked"/>
 			<channel id="temperature" typeId="temperature"/>
-			<channel id="actual_temp" typeId="actual_temp"/>
+			<channel id="actual_temp" typeId="system.indoor-temperature">
+				<label>Current Temperature</label>
+				<description>Current measured temperature.</description>
+			</channel>
 			<channel id="set_temp" typeId="set_temp"/>
 			<channel id="eco_temp" typeId="eco_temp"/>
 			<channel id="comfort_temp" typeId="comfort_temp"/>
@@ -159,6 +176,10 @@
 			<channel id="battery_low" typeId="system.low-battery"/>
 		</channels>
 
+		<properties>
+			<property name="thingTypeVersion">1</property>
+		</properties>
+
 		<representation-property>ain</representation-property>
 
 		<config-description-ref uri="thing-type:avmfritz:fritzdevice"/>
@@ -178,7 +199,10 @@
 			<channel id="locked" typeId="locked"/>
 			<channel id="device_locked" typeId="device_locked"/>
 			<channel id="temperature" typeId="temperature"/>
-			<channel id="actual_temp" typeId="actual_temp"/>
+			<channel id="actual_temp" typeId="system.indoor-temperature">
+				<label>Current Temperature</label>
+				<description>Current measured temperature.</description>
+			</channel>
 			<channel id="set_temp" typeId="set_temp"/>
 			<channel id="eco_temp" typeId="eco_temp"/>
 			<channel id="comfort_temp" typeId="comfort_temp"/>
@@ -188,6 +212,10 @@
 			<channel id="battery_low" typeId="system.low-battery"/>
 		</channels>
 
+		<properties>
+			<property name="thingTypeVersion">1</property>
+		</properties>
+
 		<representation-property>ain</representation-property>
 
 		<config-description-ref uri="thing-type:avmfritz:fritzdevice"/>
@@ -207,11 +235,21 @@
 			<channel id="locked" typeId="locked"/>
 			<channel id="device_locked" typeId="device_locked"/>
 			<channel id="temperature" typeId="temperature"/>
-			<channel id="energy" typeId="energy"/>
-			<channel id="power" typeId="power"/>
+			<channel id="energy" typeId="system.electrical-energy">
+				<label>Energy Consumption</label>
+				<description>Accumulated energy consumption.</description>
+			</channel>
+			<channel id="power" typeId="system.electric-power">
+				<label>Power</label>
+				<description>Current power consumption.</description>
+			</channel>
 			<channel id="outlet" typeId="outlet"/>
 		</channels>
 
+		<properties>
+			<property name="thingTypeVersion">1</property>
+		</properties>
+
 		<representation-property>ain</representation-property>
 
 		<config-description-ref uri="thing-type:avmfritz:fritzdevice"/>
@@ -231,11 +269,21 @@
 			<channel id="locked" typeId="locked"/>
 			<channel id="device_locked" typeId="device_locked"/>
 			<channel id="temperature" typeId="temperature"/>
-			<channel id="energy" typeId="energy"/>
-			<channel id="power" typeId="power"/>
+			<channel id="energy" typeId="system.electrical-energy">
+				<label>Energy Consumption</label>
+				<description>Accumulated energy consumption.</description>
+			</channel>
+			<channel id="power" typeId="system.electric-power">
+				<label>Power</label>
+				<description>Current power consumption.</description>
+			</channel>
 			<channel id="outlet" typeId="outlet"/>
 		</channels>
 
+		<properties>
+			<property name="thingTypeVersion">1</property>
+		</properties>
+
 		<representation-property>ain</representation-property>
 
 		<config-description-ref uri="thing-type:avmfritz:fritzdevice"/>
@@ -255,11 +303,21 @@
 			<channel id="mode" typeId="mode"/>
 			<channel id="locked" typeId="locked"/>
 			<channel id="device_locked" typeId="device_locked"/>
-			<channel id="energy" typeId="energy"/>
-			<channel id="power" typeId="power"/>
+			<channel id="energy" typeId="system.electrical-energy">
+				<label>Energy Consumption</label>
+				<description>Accumulated energy consumption.</description>
+			</channel>
+			<channel id="power" typeId="system.electric-power">
+				<label>Power</label>
+				<description>Current power consumption.</description>
+			</channel>
 			<channel id="outlet" typeId="outlet"/>
 		</channels>
 
+		<properties>
+			<property name="thingTypeVersion">1</property>
+		</properties>
+
 		<representation-property>ain</representation-property>
 
 		<config-description-ref uri="thing-type:avmfritz:fritzdevice"/>
@@ -410,7 +468,10 @@
 			<channel id="mode" typeId="mode"/>
 			<channel id="locked" typeId="locked"/>
 			<channel id="device_locked" typeId="device_locked"/>
-			<channel id="actual_temp" typeId="actual_temp"/>
+			<channel id="actual_temp" typeId="system.indoor-temperature">
+				<label>Current Temperature</label>
+				<description>Current measured temperature.</description>
+			</channel>
 			<channel id="set_temp" typeId="set_temp"/>
 			<channel id="eco_temp" typeId="eco_temp"/>
 			<channel id="comfort_temp" typeId="comfort_temp"/>
@@ -420,6 +481,10 @@
 			<channel id="battery_low" typeId="system.low-battery"/>
 		</channels>
 
+		<properties>
+			<property name="thingTypeVersion">1</property>
+		</properties>
+
 		<representation-property>ain</representation-property>
 
 		<config-description-ref uri="thing-type:avmfritz:fritzgroup"/>
@@ -438,11 +503,21 @@
 			<channel id="mode" typeId="mode"/>
 			<channel id="locked" typeId="locked"/>
 			<channel id="device_locked" typeId="device_locked"/>
-			<channel id="energy" typeId="energy"/>
-			<channel id="power" typeId="power"/>
+			<channel id="energy" typeId="system.electrical-energy">
+				<label>Energy Consumption</label>
+				<description>Accumulated energy consumption.</description>
+			</channel>
+			<channel id="power" typeId="system.electric-power">
+				<label>Power</label>
+				<description>Current power consumption.</description>
+			</channel>
 			<channel id="outlet" typeId="outlet"/>
 		</channels>
 
+		<properties>
+			<property name="thingTypeVersion">1</property>
+		</properties>
+
 		<representation-property>ain</representation-property>
 
 		<config-description-ref uri="thing-type:avmfritz:fritzgroup"/>