diff --git a/dist/main.js b/dist/main.js
index 06cd202..8de2bd1 100644
--- a/dist/main.js
+++ b/dist/main.js
@@ -118,6 +118,11 @@ let windowContactDiningRoom2 = new MaxWindowContact_1.MaxWindowContact('Gnd', 'D
 windowContactDiningRoom2.start();
 allLabeledItems.push(windowContactDiningRoom2);
 allWindows.push(windowContactDiningRoom2);
+let thermostatDiningRoom = new MaxThermostat_1.MaxThermostat('Gnd', 'DiningRoom', 'Thermostat', 'Thermostat Esszimmer', 31, [windowContactDiningRoom1, windowContactDiningRoom2]);
+thermostatDiningRoom.start();
+thermostatDiningRoom.setPresetTemperature(21.0);
+allLabeledItems.push(thermostatDiningRoom);
+allThermostatItems.push(thermostatDiningRoom);
 // Wohnzimmer -----------------------------------------------------------------------------------------------
 // Wohnzimmer grosse Lampe       65557 24 1            65556 24 1
 let livingRoomLargeLight = new M433SwitchItem_1.M433SwitchItem('Gnd', 'LivingRoom', 'LargeLight', 'große Lampe Wohnzimmer', '65557 24 1', '65556 24 1');
@@ -147,6 +152,11 @@ let windowContactLivingRoom2 = new MaxWindowContact_1.MaxWindowContact('Gnd', 'L
 windowContactLivingRoom2.start();
 allLabeledItems.push(windowContactLivingRoom2);
 allWindows.push(windowContactLivingRoom2);
+let thermostatLivingRoom = new MaxThermostat_1.MaxThermostat('Gnd', 'LivingRoom', 'Thermostat', 'Thermostat Wohnzimmer', 30, [windowContactLivingRoom1, windowContactLivingRoom2]);
+thermostatLivingRoom.start();
+thermostatLivingRoom.setPresetTemperature(21.0);
+allLabeledItems.push(thermostatLivingRoom);
+allThermostatItems.push(thermostatLivingRoom);
 // Flur -----------------------------------------------------------------------------------------------------
 // Flur Schreibtisch             83221 24 1            83220 24 1
 let hallwayDeskLight = new M433SwitchItem_1.M433SwitchItem('Gnd', 'Hallway', 'DeskLight', 'Schreibtischlampe Flur', '83221 24 1', '83220 24 1');
@@ -167,6 +177,16 @@ let windowContactHallway = new MaxWindowContact_1.MaxWindowContact('Gnd', 'Hallw
 windowContactHallway.start();
 allLabeledItems.push(windowContactHallway);
 allWindows.push(windowContactHallway);
+let thermostatHallway1 = new MaxThermostat_1.MaxThermostat('Gnd', 'Hallway', 'Thermostat1', 'Thermostat Flur vorne', 32, []);
+thermostatHallway1.start();
+thermostatHallway1.setPresetTemperature(19.0);
+allLabeledItems.push(thermostatHallway1);
+allThermostatItems.push(thermostatHallway1);
+let thermostatHallway2 = new MaxThermostat_1.MaxThermostat('Gnd', 'Hallway', 'Thermostat2', 'Thermostat Flur hinten', 33, []);
+thermostatHallway2.start();
+thermostatHallway2.setPresetTemperature(5.0);
+allLabeledItems.push(thermostatHallway2);
+allThermostatItems.push(thermostatHallway2);
 // Küche ----------------------------------------------------------------------------------------------------
 // Küche Fensterbank             66837 24 1            66836 24 1
 let kitchenWindowLight = new M433SwitchItem_1.M433SwitchItem('Gnd', 'Kitchen', 'WindowLight', 'Fensterbanklicht Küche', '66837 24 1', '66836 24 1');
diff --git a/homekit.json b/homekit.json
index 6b3183a..418b9c8 100644
--- a/homekit.json
+++ b/homekit.json
@@ -230,6 +230,17 @@
             "onContactDetected": "CLOSED"
         }
     },
+    "Gnd_DiningRoom_Thermostat": {
+        "id": "Gnd_DiningRoom_Thermostat",
+        "name": "Thermostat Esszimmer",
+        "service": "Thermostat",
+        "topic": {
+            "setTargetTemperature": "dispatcher_ng/items/Gnd/DiningRoom/Thermostat/temperature",
+            "statusTargetTemperature": "dispatcher_ng/items/Gnd/DiningRoom/Thermostat/temperature/feedback",
+            "statusCurrentTemperature": "dispatcher_ng/items/Gnd/DiningRoom/Thermostat/temperature/feedback"
+        },
+        "payload": {}
+    },
     "Gnd_LivingRoom_LargeLight": {
         "id": "Gnd_LivingRoom_LargeLight",
         "name": "große Lampe Wohnzimmer",
@@ -320,6 +331,17 @@
             "onContactDetected": "CLOSED"
         }
     },
+    "Gnd_LivingRoom_Thermostat": {
+        "id": "Gnd_LivingRoom_Thermostat",
+        "name": "Thermostat Wohnzimmer",
+        "service": "Thermostat",
+        "topic": {
+            "setTargetTemperature": "dispatcher_ng/items/Gnd/LivingRoom/Thermostat/temperature",
+            "statusTargetTemperature": "dispatcher_ng/items/Gnd/LivingRoom/Thermostat/temperature/feedback",
+            "statusCurrentTemperature": "dispatcher_ng/items/Gnd/LivingRoom/Thermostat/temperature/feedback"
+        },
+        "payload": {}
+    },
     "Gnd_Hallway_DeskLight": {
         "id": "Gnd_Hallway_DeskLight",
         "name": "Schreibtischlampe Flur",
@@ -382,6 +404,28 @@
             "onContactDetected": "CLOSED"
         }
     },
+    "Gnd_Hallway_Thermostat1": {
+        "id": "Gnd_Hallway_Thermostat1",
+        "name": "Thermostat Flur vorne",
+        "service": "Thermostat",
+        "topic": {
+            "setTargetTemperature": "dispatcher_ng/items/Gnd/Hallway/Thermostat1/temperature",
+            "statusTargetTemperature": "dispatcher_ng/items/Gnd/Hallway/Thermostat1/temperature/feedback",
+            "statusCurrentTemperature": "dispatcher_ng/items/Gnd/Hallway/Thermostat1/temperature/feedback"
+        },
+        "payload": {}
+    },
+    "Gnd_Hallway_Thermostat2": {
+        "id": "Gnd_Hallway_Thermostat2",
+        "name": "Thermostat Flur hinten",
+        "service": "Thermostat",
+        "topic": {
+            "setTargetTemperature": "dispatcher_ng/items/Gnd/Hallway/Thermostat2/temperature",
+            "statusTargetTemperature": "dispatcher_ng/items/Gnd/Hallway/Thermostat2/temperature/feedback",
+            "statusCurrentTemperature": "dispatcher_ng/items/Gnd/Hallway/Thermostat2/temperature/feedback"
+        },
+        "payload": {}
+    },
     "Gnd_Kitchen_WindowLight": {
         "id": "Gnd_Kitchen_WindowLight",
         "name": "Fensterbanklicht Küche",
diff --git a/openhab.items b/openhab.items
index ce8f579..fa48b9c 100644
--- a/openhab.items
+++ b/openhab.items
@@ -14,16 +14,24 @@ Switch Gnd_DiningRoom_ShelfLight "Regallicht Esszimmer"{mqtt=">[localbroker:disp
 
 Contact Gnd_DiningRoom_WindowContact1 "Fenster Esszimmer Straße links" {mqtt="<[localbroker:dispatcher_ng/items/Gnd/DiningRoom/WindowContact1/state/feedback:state:default]"}
 Contact Gnd_DiningRoom_WindowContact2 "Fenster Esszimmer Straße rechts" {mqtt="<[localbroker:dispatcher_ng/items/Gnd/DiningRoom/WindowContact2/state/feedback:state:default]"}
+Number Gnd_DiningRoom_Thermostat "Thermostat Esszimmer [%.1f °C]" {mqtt=">[localbroker:dispatcher_ng/items/Gnd/DiningRoom/Thermostat/temperature:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/DiningRoom/Thermostat/temperature/feedback:state:default]"}
+Number Preset_Gnd_DiningRoom_Thermostat "Preset_Thermostat Esszimmer [%.1f °C]" {mqtt=">[localbroker:dispatcher_ng/items/Gnd/DiningRoom/Thermostat/presetTemperature:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/DiningRoom/Thermostat/presetTemperature/feedback:state:default]"}
 Switch Gnd_LivingRoom_LargeLight "große Lampe Wohnzimmer"{mqtt=">[localbroker:dispatcher_ng/items/Gnd/LivingRoom/LargeLight/state:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/LivingRoom/LargeLight/state/feedback:state:default]"}
 Switch Gnd_LivingRoom_SmallLight "kleine Lampe Wohnzimmer"{mqtt=">[localbroker:dispatcher_ng/items/Gnd/LivingRoom/SmallLight/state:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/LivingRoom/SmallLight/state/feedback:state:default]"}
 Switch Gnd_LivingRoom_Stars "Sterne Wohnzimmer"{mqtt=">[localbroker:dispatcher_ng/items/Gnd/LivingRoom/Stars/state:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/LivingRoom/Stars/state/feedback:state:default]"}
 Switch Gnd_LivingRoom_StandLight "Stehlampe Wohnzimmer"{mqtt=">[localbroker:dispatcher_ng/items/Gnd/LivingRoom/StandLight/state:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/LivingRoom/StandLight/state/feedback:state:default]"}
 Contact Gnd_LivingRoom_WindowContact1 "Fenster Wohnzimmer Garten rechts" {mqtt="<[localbroker:dispatcher_ng/items/Gnd/LivingRoom/WindowContact1/state/feedback:state:default]"}
 Contact Gnd_LivingRoom_WindowContact2 "Fenster Wohnzimmer Garten links" {mqtt="<[localbroker:dispatcher_ng/items/Gnd/LivingRoom/WindowContact2/state/feedback:state:default]"}
+Number Gnd_LivingRoom_Thermostat "Thermostat Wohnzimmer [%.1f °C]" {mqtt=">[localbroker:dispatcher_ng/items/Gnd/LivingRoom/Thermostat/temperature:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/LivingRoom/Thermostat/temperature/feedback:state:default]"}
+Number Preset_Gnd_LivingRoom_Thermostat "Preset_Thermostat Wohnzimmer [%.1f °C]" {mqtt=">[localbroker:dispatcher_ng/items/Gnd/LivingRoom/Thermostat/presetTemperature:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/LivingRoom/Thermostat/presetTemperature/feedback:state:default]"}
 Switch Gnd_Hallway_DeskLight "Schreibtischlampe Flur"{mqtt=">[localbroker:dispatcher_ng/items/Gnd/Hallway/DeskLight/state:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/Hallway/DeskLight/state/feedback:state:default]"}
 Switch Gnd_Hallway_StandLight "Stehlampe Flur"{mqtt=">[localbroker:dispatcher_ng/items/Gnd/Hallway/StandLight/state:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/Hallway/StandLight/state/feedback:state:default]"}
 Switch Gnd_Hallway_WardrobeLight "Schranklicht Flur"{mqtt=">[localbroker:dispatcher_ng/items/Gnd/Hallway/WardrobeLight/state:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/Hallway/WardrobeLight/state/feedback:state:default]"}
 Contact Gnd_Hallway_WindowContact "Fenster Flur" {mqtt="<[localbroker:dispatcher_ng/items/Gnd/Hallway/WindowContact/state/feedback:state:default]"}
+Number Gnd_Hallway_Thermostat1 "Thermostat Flur vorne [%.1f °C]" {mqtt=">[localbroker:dispatcher_ng/items/Gnd/Hallway/Thermostat1/temperature:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/Hallway/Thermostat1/temperature/feedback:state:default]"}
+Number Preset_Gnd_Hallway_Thermostat1 "Preset_Thermostat Flur vorne [%.1f °C]" {mqtt=">[localbroker:dispatcher_ng/items/Gnd/Hallway/Thermostat1/presetTemperature:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/Hallway/Thermostat1/presetTemperature/feedback:state:default]"}
+Number Gnd_Hallway_Thermostat2 "Thermostat Flur hinten [%.1f °C]" {mqtt=">[localbroker:dispatcher_ng/items/Gnd/Hallway/Thermostat2/temperature:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/Hallway/Thermostat2/temperature/feedback:state:default]"}
+Number Preset_Gnd_Hallway_Thermostat2 "Preset_Thermostat Flur hinten [%.1f °C]" {mqtt=">[localbroker:dispatcher_ng/items/Gnd/Hallway/Thermostat2/presetTemperature:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/Hallway/Thermostat2/presetTemperature/feedback:state:default]"}
 Switch Gnd_Kitchen_WindowLight "Fensterbanklicht Küche"{mqtt=">[localbroker:dispatcher_ng/items/Gnd/Kitchen/WindowLight/state:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/Kitchen/WindowLight/state/feedback:state:default]"}
 Switch Gnd_Kitchen_CeilingLight "Deckenlampe Küche"{mqtt=">[localbroker:dispatcher_ng/items/Gnd/Kitchen/CeilingLight/state:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/Kitchen/CeilingLight/state/feedback:state:default]"}
 Switch 1st_BedRoom_WolfgangsSide "Wolfgangs Seite Schlafzimmer"{mqtt=">[localbroker:dispatcher_ng/items/1st/BedRoom/WolfgangsSide/state:command:*:default],<[localbroker:dispatcher_ng/items/1st/BedRoom/WolfgangsSide/state/feedback:state:default]"}
diff --git a/src/main.ts b/src/main.ts
index 275c4a8..9485b99 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -146,6 +146,11 @@ windowContactDiningRoom2.start()
 allLabeledItems.push(windowContactDiningRoom2)
 allWindows.push(windowContactDiningRoom2)
 
+let thermostatDiningRoom = new MaxThermostat('Gnd', 'DiningRoom', 'Thermostat', 'Thermostat Esszimmer', 31, [windowContactDiningRoom1, windowContactDiningRoom2])
+thermostatDiningRoom.start()
+thermostatDiningRoom.setPresetTemperature(21.0)
+allLabeledItems.push(thermostatDiningRoom)
+allThermostatItems.push(thermostatDiningRoom)
 
 // Wohnzimmer -----------------------------------------------------------------------------------------------
 // Wohnzimmer grosse Lampe       65557 24 1            65556 24 1
@@ -181,6 +186,12 @@ windowContactLivingRoom2.start()
 allLabeledItems.push(windowContactLivingRoom2)
 allWindows.push(windowContactLivingRoom2)
 
+let thermostatLivingRoom = new MaxThermostat('Gnd', 'LivingRoom', 'Thermostat', 'Thermostat Wohnzimmer', 30, [windowContactLivingRoom1, windowContactLivingRoom2])
+thermostatLivingRoom.start()
+thermostatLivingRoom.setPresetTemperature(21.0)
+allLabeledItems.push(thermostatLivingRoom)
+allThermostatItems.push(thermostatLivingRoom)
+
 // Flur -----------------------------------------------------------------------------------------------------
 // Flur Schreibtisch             83221 24 1            83220 24 1
 let hallwayDeskLight = new M433SwitchItem('Gnd', 'Hallway', 'DeskLight', 'Schreibtischlampe Flur', '83221 24 1', '83220 24 1')
@@ -205,6 +216,17 @@ windowContactHallway.start()
 allLabeledItems.push(windowContactHallway)
 allWindows.push(windowContactHallway)
 
+let thermostatHallway1 = new MaxThermostat('Gnd', 'Hallway', 'Thermostat1', 'Thermostat Flur vorne', 32, [])
+thermostatHallway1.start()
+thermostatHallway1.setPresetTemperature(19.0)
+allLabeledItems.push(thermostatHallway1)
+allThermostatItems.push(thermostatHallway1)
+
+let thermostatHallway2 = new MaxThermostat('Gnd', 'Hallway', 'Thermostat2', 'Thermostat Flur hinten', 33, [])
+thermostatHallway2.start()
+thermostatHallway2.setPresetTemperature(5.0)
+allLabeledItems.push(thermostatHallway2)
+allThermostatItems.push(thermostatHallway2)
 
 // Küche ----------------------------------------------------------------------------------------------------
 // Küche Fensterbank             66837 24 1            66836 24 1