diff --git a/bundles/org.openhab.binding.openthermgateway/src/main/resources/OH-INF/thing/boiler.xml b/bundles/org.openhab.binding.openthermgateway/src/main/resources/OH-INF/thing/boiler.xml
index 26471ea4074..5433a9abc8b 100644
--- a/bundles/org.openhab.binding.openthermgateway/src/main/resources/OH-INF/thing/boiler.xml
+++ b/bundles/org.openhab.binding.openthermgateway/src/main/resources/OH-INF/thing/boiler.xml
@@ -9,6 +9,7 @@
Boiler and thermostat
+ Boiler
diff --git a/bundles/org.openhab.binding.openthermgateway/src/main/resources/OH-INF/thing/channels.xml b/bundles/org.openhab.binding.openthermgateway/src/main/resources/OH-INF/thing/channels.xml
index 41e02ad1ece..9a9abc9001b 100644
--- a/bundles/org.openhab.binding.openthermgateway/src/main/resources/OH-INF/thing/channels.xml
+++ b/bundles/org.openhab.binding.openthermgateway/src/main/resources/OH-INF/thing/channels.xml
@@ -10,6 +10,9 @@
Number:Dimensionless
Transparent slave parameter or Fault history buffer value
+
+ Status
+
@@ -19,6 +22,9 @@
String
Channel to send commands to the OpenTherm Gateway device
+
+ Control
+
@@ -29,6 +35,10 @@
Current sensed room temperature
Temperature
+
+ Measurement
+ Temperature
+
@@ -37,6 +47,10 @@
Current room temperature setpoint
Temperature
+
+ Setpoint
+ Temperature
+
@@ -45,6 +59,10 @@
Temporary override room temperature setpoint
Temperature
+
+ Setpoint
+ Temperature
+
@@ -53,6 +71,10 @@
Constant override room temperature setpoint
Temperature
+
+ Setpoint
+ Temperature
+
@@ -61,6 +83,10 @@
Central heating water setpoint set at boiler
Temperature
+
+ Setpoint
+ Temperature
+
@@ -69,6 +95,10 @@
Central heating water setpoint requested by Thermostat
Temperature
+
+ Setpoint
+ Temperature
+
@@ -77,6 +107,10 @@
Central heating water setpoint configured on OTGW
Temperature
+
+ Setpoint
+ Temperature
+
@@ -85,6 +119,10 @@
Central heating 2 water setpoint set at boiler
Temperature
+
+ Setpoint
+ Temperature
+
@@ -93,6 +131,10 @@
Central heating 2 water setpoint requested by Thermostat
Temperature
+
+ Setpoint
+ Temperature
+
@@ -101,6 +143,10 @@
Central heating 2 water setpoint configured on OTGW
Temperature
+
+ Setpoint
+ Temperature
+
@@ -109,6 +155,10 @@
Domestic hot water temperature
Temperature
+
+ Measurement
+ Temperature
+
@@ -117,6 +167,10 @@
Domestic hot water temperature setpoint
Temperature
+
+ Setpoint
+ Temperature
+
@@ -125,6 +179,10 @@
Domestic hot water temperature setpoint override
Temperature
+
+ Setpoint
+ Temperature
+
@@ -133,6 +191,10 @@
Boiler water temperature
Temperature
+
+ Measurement
+ Temperature
+
@@ -141,6 +203,10 @@
Return water temperature
Temperature
+
+ Measurement
+ Temperature
+
@@ -149,13 +215,21 @@
Outside temperature
Temperature
-
+
+ Measurement
+ Temperature
+
+
Number:Dimensionless
Central heating water pressure
+
+ Measurement
+ Pressure
+
@@ -163,6 +237,10 @@
Switch
Central heating enabled set at boiler
+
+ Status
+ Enabled
+
@@ -170,6 +248,10 @@
Switch
Central heating enabled requested by thermostat
+
+ Status
+ Enabled
+
@@ -177,6 +259,10 @@
Switch
Central heating enabled overridden at OTGW
+
+ Status
+ Enabled
+
@@ -184,6 +270,10 @@
Switch
Central heating 2 enabled set at boiler
+
+ Status
+ Enabled
+
@@ -191,6 +281,10 @@
Switch
Central heating 2 enabled requested by thermostat
+
+ Status
+ Enabled
+
@@ -198,6 +292,10 @@
Switch
Central heating 2 enabled overridden at OTGW
+
+ Status
+ Enabled
+
@@ -205,6 +303,10 @@
Switch
Central heating active
+
+ Status
+ Power
+
@@ -212,6 +314,10 @@
Switch
Domestic hot water enabled
+
+ Status
+ Enabled
+
@@ -219,6 +325,10 @@
Switch
Domestic hot water active
+
+ Status
+ Power
+
@@ -226,6 +336,10 @@
Switch
Burner active
+
+ Status
+ Power
+
@@ -233,6 +347,10 @@
Number:Dimensionless
Relative modulation level
+
+ Measurement
+ Power
+
@@ -240,6 +358,10 @@
Number:Dimensionless
Maximum relative modulation level
+
+ Status
+ Power
+
@@ -247,6 +369,9 @@
Switch
Fault indication
+
+ Alarm
+
@@ -254,6 +379,9 @@
Switch
Service required
+
+ Alarm
+
@@ -261,6 +389,9 @@
Switch
Lockout-reset enabled
+
+ Alarm
+
@@ -268,6 +399,10 @@
Switch
Low water pressure fault
+
+ Alarm
+ Pressure
+
@@ -275,6 +410,10 @@
Switch
Gas or flame fault
+
+ Alarm
+ Gas
+
@@ -282,6 +421,10 @@
Switch
Air pressure fault
+
+ Alarm
+ Pressure
+
@@ -289,6 +432,10 @@
Switch
Water over-temperature fault
+
+ Alarm
+ Temperature
+
@@ -296,6 +443,9 @@
Number:Dimensionless
OEM fault code
+
+ Alarm
+
@@ -303,6 +453,9 @@
Switch
Diagnostics indication
+
+ Status
+
@@ -310,6 +463,9 @@
Number:Dimensionless
Unsuccessful burner starts
+
+ Status
+
@@ -317,6 +473,9 @@
Number:Dimensionless
Burner starts
+
+ Status
+
@@ -324,6 +483,9 @@
Number:Dimensionless
Central heating pump starts
+
+ Status
+
@@ -331,6 +493,9 @@
Number:Dimensionless
Domestic hot water pump/valve starts
+
+ Status
+
@@ -338,6 +503,9 @@
Number:Dimensionless
Domestic hot water burner starts
+
+ Status
+
@@ -345,6 +513,10 @@
Number:Time
Burner hours
+
+ Status
+ Duration
+
@@ -352,6 +524,10 @@
Number:Time
Central heating pump hours
+
+ Status
+ Duration
+
@@ -359,6 +535,10 @@
Number:Time
Domestic hot water pump/valve hours
+
+ Status
+ Duration
+
@@ -366,6 +546,10 @@
Number:Time
Domestic hot water burner hours
+
+ Status
+ Duration
+
@@ -373,6 +557,9 @@
Number:Dimensionless
Number of transparant slave parameter entries
+
+ Status
+
@@ -380,6 +567,9 @@
Number:Dimensionless
Transparent slave parameter entry
+
+ Status
+
@@ -387,6 +577,9 @@
Number:Dimensionless
Number of fault history buffer entries
+
+ Status
+
@@ -394,6 +587,9 @@
Number:Dimensionless
Fault history buffer entry
+
+ Status
+
@@ -403,6 +599,10 @@
Switch
Ventilation enabled
+
+ Status
+ Enabled
+
@@ -410,6 +610,10 @@
Number:Dimensionless
Bypass position
+
+ Status
+ OpenState
+
@@ -422,6 +626,10 @@
Number:Dimensionless
Bypass mode
+
+ Status
+ Mode
+
@@ -434,6 +642,10 @@
Switch
Free ventilation mode
+
+ Status
+ Mode
+
@@ -441,6 +653,9 @@
Switch
Fault indication
+
+ Alarm
+
@@ -448,6 +663,10 @@
Switch
Ventilation mode
+
+ Status
+ Mode
+
@@ -455,6 +674,10 @@
Switch
Bypass status
+
+ Status
+ Power
+
@@ -462,6 +685,10 @@
Number:Dimensionless
Bypass automatic status
+
+ Status
+ Mode
+
@@ -474,6 +701,10 @@
Switch
Free ventilation status
+
+ Status
+ Power
+
@@ -481,6 +712,9 @@
Switch
Diagnostic indication
+
+ Status
+
@@ -488,6 +722,10 @@
Number:Dimensionless
Control setpoint
+
+ Setpoint
+ Ventilation
+
@@ -495,6 +733,9 @@
Switch
Service request
+
+ Alarm
+
@@ -502,6 +743,9 @@
Switch
Exhaust fan fault
+
+ Alarm
+
@@ -509,6 +753,9 @@
Switch
Inlet fan fault
+
+ Alarm
+
@@ -516,6 +763,10 @@
Switch
Frost protection
+
+ Alarm
+ Temperature
+
@@ -523,6 +774,9 @@
Number:Dimensionless
Fault code
+
+ Alarm
+
@@ -530,6 +784,9 @@
Number:Dimensionless
Diagnostic code
+
+ Status
+
@@ -537,6 +794,9 @@
Number:Dimensionless
System type
+
+ Status
+
@@ -549,6 +809,10 @@
Switch
Bypass
+
+ Status
+ Power
+
@@ -556,6 +820,9 @@
Number:Dimensionless
Speed control
+
+ Status
+
@@ -568,6 +835,9 @@
Number:Dimensionless
Member ID
+
+ Status
+
@@ -575,6 +845,9 @@
Number:Dimensionless
OpenTherm version
+
+ Status
+
@@ -582,6 +855,9 @@
Number:Dimensionless
Version type
+
+ Status
+
@@ -589,6 +865,10 @@
Number:Dimensionless
Relative ventilation position
+
+ Measurement
+ Position
+
@@ -596,6 +876,10 @@
Number:Dimensionless
Relative humidity exhaust air
+
+ Measurement
+ Humidity
+
@@ -603,6 +887,10 @@
Number:Dimensionless
CO2 level exhaust air
+
+ Measurement
+ CO2
+
@@ -610,6 +898,10 @@
Number:Temperature
Supply inlet temperature
+
+ Measurement
+ Temperature
+
@@ -617,6 +909,10 @@
Number:Temperature
Supply outlet temperature
+
+ Measurement
+ Temperature
+
@@ -624,6 +920,10 @@
Number:Temperature
Exhaust inlet temperature
+
+ Measurement
+ Temperature
+
@@ -631,6 +931,10 @@
Number:Temperature
Exhaust outlet temperature
+
+ Measurement
+ Temperature
+
@@ -638,6 +942,10 @@
Number:Dimensionless
Actual exhaust fan speed
+
+ Measurement
+ Speed
+
@@ -645,6 +953,10 @@
Number:Dimensionless
Actual inlet fan speed
+
+ Measurement
+ Speed
+
@@ -652,6 +964,10 @@
Switch
Nominal ventilation value transfer enabled
+
+ Status
+ Enabled
+
@@ -659,6 +975,9 @@
Number:Dimensionless
Nominal ventilation value
+
+ Status
+
@@ -671,6 +990,10 @@
Number:Dimensionless
Nominal ventilation value
+
+ Measurement
+ Ventilation
+
@@ -678,6 +1001,10 @@
Switch
Filter Check enabled
+
+ Status
+ Enabled
+
@@ -685,6 +1012,9 @@
Number:Dimensionless
Number of transparent slave parameter entries
+
+ Status
+
@@ -692,6 +1022,9 @@
Number:Dimensionless
Transparent slave parameter entry
+
+ Status
+
@@ -699,6 +1032,9 @@
Number:Dimensionless
Number of fault history buffer entries
+
+ Status
+
@@ -706,6 +1042,9 @@
Number:Dimensionless
Fault history buffer entry
+
+ Status
+
@@ -713,6 +1052,10 @@
Number:Dimensionless
Ventilation setpoint override
+
+ Setpoint
+ Speed
+
diff --git a/bundles/org.openhab.binding.openthermgateway/src/main/resources/OH-INF/thing/openthermgateway.xml b/bundles/org.openhab.binding.openthermgateway/src/main/resources/OH-INF/thing/openthermgateway.xml
index 4f4337164f9..7d5018fefa6 100644
--- a/bundles/org.openhab.binding.openthermgateway/src/main/resources/OH-INF/thing/openthermgateway.xml
+++ b/bundles/org.openhab.binding.openthermgateway/src/main/resources/OH-INF/thing/openthermgateway.xml
@@ -6,6 +6,7 @@
OpenTherm Gateway
+ NetworkAppliance
diff --git a/bundles/org.openhab.binding.openthermgateway/src/main/resources/OH-INF/thing/ventilationheatrecovery.xml b/bundles/org.openhab.binding.openthermgateway/src/main/resources/OH-INF/thing/ventilationheatrecovery.xml
index 84ed5814c2f..95d20ebcf65 100644
--- a/bundles/org.openhab.binding.openthermgateway/src/main/resources/OH-INF/thing/ventilationheatrecovery.xml
+++ b/bundles/org.openhab.binding.openthermgateway/src/main/resources/OH-INF/thing/ventilationheatrecovery.xml
@@ -9,6 +9,7 @@
Ventilation or Heat Recovery unit
+ HVAC