diff --git a/apps/global/heating.yaml b/apps/global/heating.yaml
index 6ac84d5..fcc67a8 100644
--- a/apps/global/heating.yaml
+++ b/apps/global/heating.yaml
@@ -17,7 +17,7 @@ heating_sensors:
             value: 18
           default:
             conditions: True
-            value: 27
+            value: input_number.heatpump_temperature
 
 smart_heating_templates_library:
   module: templatelibrary
@@ -27,7 +27,7 @@ smart_heating_templates_library:
   templates_library:
     clim_conditions:
       local_expressions:
-        temp_threshold: "sleeping_in_the_room ? 0 : 1"
+        temp_threshold: "sleeping_in_the_room ? 0 : (ext_temperature >= 35 ? 0.5 : 1)"
       trigger_conditions:
         - "not binary_sensor.heatpump_winter_mode and (ext_temperature >= room_temperature or ext_temperature >= target_temperature or cant_open_window) and room_temperature >= (quick_resume ? target_temperature : (target_temperature + temp_threshold))"
         - not binary_sensor.heatpump_winter_mode and self and (ext_temperature >= target_temperature or cant_open_window)
@@ -35,7 +35,7 @@ smart_heating_templates_library:
         - binary_sensor.heatpump_winter_mode and self and room_temperature < target_temperature
       blocking_conditions:
         - binary_sensor.is_everybody_sleeping and not sleeping_in_the_room and not stay_on_while_sleeping
-        - not room_occupancy
+        - not room_occupancy and not (sleeping_in_the_room or (occupied_tonight and binary_sensor.day_interval_night))
         - not binary_sensor.someone_home
         - window_open
 
@@ -55,15 +55,16 @@ desk_heatpump:
     cant_open_window: binary_sensor.is_desk_sleeping
     sleeping_in_the_room: binary_sensor.is_desk_sleeping
     quick_resume: binary_sensor.desk_heatpump_quick_resume
+    occupied_tonight: input_boolean.desk_occupied_tonight
     stay_on_while_sleeping: false
 
   virtual_sensors:
     sensors:
       value_selector.desk_heatpump_fan_mode:
-        auto: binary_sensor.heatpump_winter_mode
+        auto: binary_sensor.heatpump_winter_mode or room_temperature > target_temperature + 1
         quiet: True
 
-  target_temperature: sensor.target_temperature_heatpump + 0.5
+  target_temperature: sensor.target_temperature_heatpump
   hvac_mode: "binary_sensor.heatpump_winter_mode ? 'heat' : 'cool'"
   fan_mode: sensor.desk_heatpump_fan_mode
 
@@ -101,15 +102,16 @@ bedroom_heatpump:
     cant_open_window: binary_sensor.is_bedroom_sleeping
     sleeping_in_the_room: binary_sensor.is_bedroom_sleeping
     quick_resume: binary_sensor.bedroom_heatpump_quick_resume
-    stay_on_while_sleeping: true
+    occupied_tonight: input_boolean.bedroom_occupied_tonight
+    stay_on_while_sleeping: false
 
   virtual_sensors:
     sensors:
       value_selector.bedroom_heatpump_fan_mode:
-        auto: binary_sensor.heatpump_winter_mode
+        auto: binary_sensor.heatpump_winter_mode or room_temperature > target_temperature + 1
         quiet: True
 
-  target_temperature: sensor.target_temperature_heatpump + 0.5
+  target_temperature: sensor.target_temperature_heatpump # + 0.5
   hvac_mode: "binary_sensor.heatpump_winter_mode ? 'heat' : 'cool'"
   fan_mode: sensor.bedroom_heatpump_fan_mode
 
@@ -138,6 +140,9 @@ living_room_heatpump:
     sensors:
       binary_sensor.living_room_any_window_open: binary_sensor.living_room_french_door or binary_sensor.living_room_window
       binary_sensor.living_room_cant_open_window: binary_sensor.is_living_room_sleeping or binary_sensor.projector_on
+      value_selector.living_room_heatpump_fan_mode:
+        auto: binary_sensor.heatpump_winter_mode or room_temperature > target_temperature + 1
+        quiet: True
 
   constants:
     window_open: binary_sensor.living_room_any_window_open
@@ -148,10 +153,12 @@ living_room_heatpump:
     cant_open_window: binary_sensor.living_room_cant_open_window
     sleeping_in_the_room: binary_sensor.is_living_room_sleeping
     quick_resume: binary_sensor.living_room_heatpump_quick_resume
+    occupied_tonight: input_boolean.living_room_occupied_tonight
     stay_on_while_sleeping: false
 
   target_temperature: sensor.target_temperature_heatpump + 0.5
   hvac_mode: "binary_sensor.heatpump_winter_mode ? 'heat' : 'cool'"
+  fan_mode: sensor.living_room_heatpump_fan_mode
 
   smart_conditions:
     callback_delay: 10 # on the morning it can happen that we ask to start and stop the heat pump immediately afterwards which in result in the heat pump ignoring the second command