diff --git a/include/automations/vinduer.yaml b/include/automations/vinduer.yaml
index b14c945..b300249 100644
--- a/include/automations/vinduer.yaml
+++ b/include/automations/vinduer.yaml
@@ -2,14 +2,14 @@
 # Vindue-automationer (Aqara vinduesensorer)
 ##################################################
 
-### Varme: Sluk varme når vindue åbnes, tænd igen når det lukkes
-### Rum-mapping: andreas, daniel, sovevaerelse, lille_bad
+### Varme: Genberegn ved vindue-ændring (åbner og lukker)
+### Script slukker klimaenhed hvis vindue er åbent, tænder igen ved lukning
 
-  - alias: "Varme - sluk ved åbent vindue"
-    id: varme_sluk_ved_aabent_vindue
-    description: "Slukker varme i rummet når vinduet åbnes og genstarter når det lukkes"
-    mode: parallel
-    max: 4
+  - alias: "Varme - vindue åbner eller lukker"
+    id: varme_vindue_trigger
+    description: "Kalder varme_recalculate når et vindue eller terrassedøren skifter tilstand"
+    mode: queued
+    max: 3
     trigger:
       - platform: state
         entity_id:
@@ -17,25 +17,9 @@
           - binary_sensor.daniel_vindue
           - binary_sensor.sovevaerelse_vindue
           - binary_sensor.lille_bad_vindue
-        to: "on"
+          - binary_sensor.badevaerelse_vindue
+          - binary_sensor.terrassedor
     action:
-      - variables:
-          room_map:
-            binary_sensor.andreas_vindue: climate.andreas
-            binary_sensor.daniel_vindue: climate.daniel
-            binary_sensor.sovevaerelse_vindue: climate.sovev_prelse
-            binary_sensor.lille_bad_vindue: climate.lille_bad
-          climate_entity: "{{ room_map[trigger.entity_id] }}"
-          window_entity: "{{ trigger.entity_id }}"
-      - service: climate.set_hvac_mode
-        target:
-          entity_id: "{{ climate_entity }}"
-        data:
-          hvac_mode: "off"
-      - wait_template: "{{ is_state(window_entity, 'off') }}"
-        timeout: "04:00:00"
-        continue_on_timeout: true
-      # Genberegn korrekt temperatur (nat/væk/komfort) efter vindue lukkes
       - service: script.varme_recalculate
 
 ### Notifikation: Vindue åbner og ingen er hjemme
diff --git a/include/scripts/varme_styring.yaml b/include/scripts/varme_styring.yaml
index 06e334a..07626f0 100644
--- a/include/scripts/varme_styring.yaml
+++ b/include/scripts/varme_styring.yaml
@@ -59,6 +59,12 @@ varme_recalculate:
               {% elif not home %} {{ [k - vaek_sænk, 15] | max }}
               {% else %} {{ k }}
               {% endif %}
+      else:
+        - service: climate.set_hvac_mode
+          target:
+            entity_id: climate.andreas
+          data:
+            hvac_mode: "off"
 
     # ---- Daniel (vindue: binary_sensor.daniel_vindue) ----
     - if:
@@ -76,6 +82,12 @@ varme_recalculate:
               {% elif not home %} {{ [k - vaek_sænk, 15] | max }}
               {% else %} {{ k }}
               {% endif %}
+      else:
+        - service: climate.set_hvac_mode
+          target:
+            entity_id: climate.daniel
+          data:
+            hvac_mode: "off"
 
     # ---- Soveværelse (vindue: binary_sensor.sovevaerelse_vindue) ----
     - if:
@@ -93,6 +105,12 @@ varme_recalculate:
               {% elif not home %} {{ [k - vaek_sænk, 15] | max }}
               {% else %} {{ k }}
               {% endif %}
+      else:
+        - service: climate.set_hvac_mode
+          target:
+            entity_id: climate.sovev_prelse
+          data:
+            hvac_mode: "off"
 
     # ---- Kontor (ingen vinduesensor) ----
     - service: climate.set_temperature
@@ -149,6 +167,12 @@ varme_recalculate:
               {% elif not home %} {{ [k - vaek_sænk, 15] | max }}
               {% else %} {{ k }}
               {% endif %}
+      else:
+        - service: climate.set_hvac_mode
+          target:
+            entity_id: climate.lille_bad
+          data:
+            hvac_mode: "off"
 
     # ---- Badeværelse – Danfoss Ally (vindue: binary_sensor.badevaerelse_vindue) ----
     - if:
@@ -167,6 +191,12 @@ varme_recalculate:
               {% elif not home %} {{ [k - vaek_sænk, 15] | max }}
               {% else %} {{ k }}
               {% endif %}
+      else:
+        - service: climate.set_hvac_mode
+          target:
+            entity_id: climate.badevarelse
+          data:
+            hvac_mode: "off"
 
     # ---- Stue – Danfoss Ally (vindue: binary_sensor.terrassedor) ----
     - if:
@@ -185,3 +215,9 @@ varme_recalculate:
               {% elif not home %} {{ [k - vaek_sænk, 15] | max }}
               {% else %} {{ k }}
               {% endif %}
+      else:
+        - service: climate.set_hvac_mode
+          target:
+            entity_id: climate.stue
+          data:
+            hvac_mode: "off"