diff --git a/bundles/org.openhab.binding.stiebelheatpump/src/main/resources/ESH-INF/thing/channel-types.xml b/bundles/org.openhab.binding.stiebelheatpump/src/main/resources/ESH-INF/thing/channel-types.xml
index 4f2ca6f291f7e..5b56b79fbc766 100644
--- a/bundles/org.openhab.binding.stiebelheatpump/src/main/resources/ESH-INF/thing/channel-types.xml
+++ b/bundles/org.openhab.binding.stiebelheatpump/src/main/resources/ESH-INF/thing/channel-types.xml
@@ -43,6 +43,11 @@
+
+ Number
+
+
+
Number:Temperature
@@ -406,8 +411,8 @@
-
-
+
+
diff --git a/bundles/org.openhab.binding.stiebelheatpump/src/main/resources/ESH-INF/thing/channelgroup-types.xml b/bundles/org.openhab.binding.stiebelheatpump/src/main/resources/ESH-INF/thing/channelgroup-types.xml
index 6ba1b862173a6..ac97296b57b0f 100644
--- a/bundles/org.openhab.binding.stiebelheatpump/src/main/resources/ESH-INF/thing/channelgroup-types.xml
+++ b/bundles/org.openhab.binding.stiebelheatpump/src/main/resources/ESH-INF/thing/channelgroup-types.xml
@@ -31,40 +31,40 @@
Measurements of the heat pump.
-
-
+
+
Collector temperature
-
+
Outside temperature
-
+
Flow temperature
-
+
Return temperature
-
+
Hot gas temperature
-
+
Cylinder temperature
-
+
Flow temperature HC2
-
+
Inside temperature
-
+
Evaporator temperature
@@ -84,7 +84,7 @@
Exhaust fan speed
-
+
Filtered outside temperature
@@ -150,14 +150,26 @@
Operation counter heating mode
-
+
+
+ Operation counter heating booster mode
+
+
Operation counter DHW mode
+
+
+ Operation counter DHW booster mode
+
Operation counter cooling mode
+
+
+ Compressor starts
+
@@ -185,8 +197,8 @@
P05 Domestic hot water set back mode setting
-
- P06 Domestic hot water set back mode setting
+
+ P06 Domestic hot water standby mode setting
diff --git a/bundles/org.openhab.binding.stiebelheatpump/src/main/resources/HeatpumpConfig/LWZ_THZ303_2_06.xml b/bundles/org.openhab.binding.stiebelheatpump/src/main/resources/HeatpumpConfig/LWZ_THZ303_2_06.xml
index 79eea7020c87e..db1d0e62bc677 100644
--- a/bundles/org.openhab.binding.stiebelheatpump/src/main/resources/HeatpumpConfig/LWZ_THZ303_2_06.xml
+++ b/bundles/org.openhab.binding.stiebelheatpump/src/main/resources/HeatpumpConfig/LWZ_THZ303_2_06.xml
@@ -18,24 +18,23 @@
bitPosition="0" min="1" max="12" step="1.0">
-
-
-
-
-
-
-
-
-
-
@@ -45,7 +44,7 @@
bitPosition="0" min="0" max="0" step="0.0">
-
@@ -76,7 +75,7 @@
bitPosition="0" min="0" max="0" step="0.0">
-
diff --git a/bundles/org.openhab.binding.stiebelheatpump/src/main/resources/HeatpumpConfig/LWZ_THZ303_2_36.xml b/bundles/org.openhab.binding.stiebelheatpump/src/main/resources/HeatpumpConfig/LWZ_THZ303_2_36.xml
index d3fcb7e5bcc56..d70deba9e84a4 100644
--- a/bundles/org.openhab.binding.stiebelheatpump/src/main/resources/HeatpumpConfig/LWZ_THZ303_2_36.xml
+++ b/bundles/org.openhab.binding.stiebelheatpump/src/main/resources/HeatpumpConfig/LWZ_THZ303_2_36.xml
@@ -16,23 +16,23 @@
bitPosition="0" min="1" max="12" step="1.0">
-
-
-
-
-
-
-
-
-
@@ -42,7 +42,7 @@
bitPosition="0" min="0" max="0" step="0.0">
-
@@ -72,7 +72,7 @@
bitPosition="0" min="0" max="0" step="0.0">
-
diff --git a/bundles/org.openhab.binding.stiebelheatpump/src/main/resources/HeatpumpConfig/LWZ_THZ303_4_19.xml b/bundles/org.openhab.binding.stiebelheatpump/src/main/resources/HeatpumpConfig/LWZ_THZ303_4_19.xml
index d3fcb7e5bcc56..d70deba9e84a4 100644
--- a/bundles/org.openhab.binding.stiebelheatpump/src/main/resources/HeatpumpConfig/LWZ_THZ303_4_19.xml
+++ b/bundles/org.openhab.binding.stiebelheatpump/src/main/resources/HeatpumpConfig/LWZ_THZ303_4_19.xml
@@ -16,23 +16,23 @@
bitPosition="0" min="1" max="12" step="1.0">
-
-
-
-
-
-
-
-
-
@@ -42,7 +42,7 @@
bitPosition="0" min="0" max="0" step="0.0">
-
@@ -72,7 +72,7 @@
bitPosition="0" min="0" max="0" step="0.0">
-
diff --git a/bundles/org.openhab.binding.stiebelheatpump/src/main/resources/HeatpumpConfig/LWZ_THZ303_5_09.xml b/bundles/org.openhab.binding.stiebelheatpump/src/main/resources/HeatpumpConfig/LWZ_THZ303_5_09.xml
index b062b3df6e364..d393819becb72 100644
--- a/bundles/org.openhab.binding.stiebelheatpump/src/main/resources/HeatpumpConfig/LWZ_THZ303_5_09.xml
+++ b/bundles/org.openhab.binding.stiebelheatpump/src/main/resources/HeatpumpConfig/LWZ_THZ303_5_09.xml
@@ -16,23 +16,23 @@
bitPosition="0" min="1" max="12" step="1.0">
-
-
-
-
-
-
-
-
-
@@ -42,7 +42,7 @@
bitPosition="0" min="0" max="0" step="0.0">
-
@@ -72,7 +72,7 @@
bitPosition="0" min="0" max="0" step="0.0">
-
diff --git a/bundles/org.openhab.binding.stiebelheatpump/src/main/resources/HeatpumpConfig/LWZ_THZ303_5_39.xml b/bundles/org.openhab.binding.stiebelheatpump/src/main/resources/HeatpumpConfig/LWZ_THZ303_5_39.xml
index b062b3df6e364..d393819becb72 100644
--- a/bundles/org.openhab.binding.stiebelheatpump/src/main/resources/HeatpumpConfig/LWZ_THZ303_5_39.xml
+++ b/bundles/org.openhab.binding.stiebelheatpump/src/main/resources/HeatpumpConfig/LWZ_THZ303_5_39.xml
@@ -16,23 +16,23 @@
bitPosition="0" min="1" max="12" step="1.0">
-
-
-
-
-
-
-
-
-
@@ -42,7 +42,7 @@
bitPosition="0" min="0" max="0" step="0.0">
-
@@ -72,7 +72,7 @@
bitPosition="0" min="0" max="0" step="0.0">
-
diff --git a/bundles/org.openhab.binding.stiebelheatpump/src/main/resources/HeatpumpConfig/LWZ_THZ303_7_39.xml b/bundles/org.openhab.binding.stiebelheatpump/src/main/resources/HeatpumpConfig/LWZ_THZ303_7_39.xml
index b062b3df6e364..d393819becb72 100644
--- a/bundles/org.openhab.binding.stiebelheatpump/src/main/resources/HeatpumpConfig/LWZ_THZ303_7_39.xml
+++ b/bundles/org.openhab.binding.stiebelheatpump/src/main/resources/HeatpumpConfig/LWZ_THZ303_7_39.xml
@@ -16,23 +16,23 @@
bitPosition="0" min="1" max="12" step="1.0">
-
-
-
-
-
-
-
-
-
@@ -42,7 +42,7 @@
bitPosition="0" min="0" max="0" step="0.0">
-
@@ -72,7 +72,7 @@
bitPosition="0" min="0" max="0" step="0.0">
-
diff --git a/bundles/org.openhab.binding.stiebelheatpump/src/main/resources/HeatpumpConfig/LWZ_THZ504_7_59.xml b/bundles/org.openhab.binding.stiebelheatpump/src/main/resources/HeatpumpConfig/LWZ_THZ504_7_59.xml
index b062b3df6e364..e0c836993b6c1 100644
--- a/bundles/org.openhab.binding.stiebelheatpump/src/main/resources/HeatpumpConfig/LWZ_THZ504_7_59.xml
+++ b/bundles/org.openhab.binding.stiebelheatpump/src/main/resources/HeatpumpConfig/LWZ_THZ504_7_59.xml
@@ -16,23 +16,23 @@
bitPosition="0" min="1" max="12" step="1.0">
-
-
-
-
-
-
-
-
-
@@ -42,7 +42,7 @@
bitPosition="0" min="0" max="0" step="0.0">
-
@@ -68,14 +68,16 @@
bitPosition="7" min="0" max="1" step="0.0">
-
-
-
+
+
-
-
-
-
-
-
-
-
-
@@ -42,7 +42,7 @@
bitPosition="0" min="0" max="0" step="0.0">
-
@@ -72,7 +72,7 @@
bitPosition="0" min="0" max="0" step="0.0">
-