diff --git a/dashboards/views/06_varme.yaml b/dashboards/views/06_varme.yaml
index aa89a92..6fe0793 100644
--- a/dashboards/views/06_varme.yaml
+++ b/dashboards/views/06_varme.yaml
@@ -38,9 +38,10 @@ sections:
           - entity: sensor.hue_motion_sensor_2_temperature_2
             name: Hue
 
-      - type: thermostat
+      - type: tile
         entity: climate.andreas
         name: Andreas
+        features: []
 
   - type: grid
     cards:
@@ -73,9 +74,10 @@ sections:
           - entity: sensor.hue_motion_sensor_2_temperature
             name: Hue
 
-      - type: thermostat
+      - type: tile
         entity: climate.daniel
         name: Daniel
+        features: []
 
   - type: grid
     cards:
@@ -112,9 +114,10 @@ sections:
           - entity: sensor.temperature
             name: Skab Anne
 
-      - type: thermostat
+      - type: tile
         entity: climate.sovev_prelse
-        name: Sovevaerelse
+        name: Soveværelse
+        features: []
 
   - type: grid
     cards:
@@ -145,9 +148,10 @@ sections:
           - entity: sensor.kontor_motion_temperatur
             name: Hue
 
-      - type: thermostat
+      - type: tile
         entity: climate.kontor
         name: Kontor
+        features: []
 
   - type: grid
     cards:
@@ -178,9 +182,10 @@ sections:
           - entity: sensor.gang_sensor_temperature
             name: Hue
 
-      - type: thermostat
+      - type: tile
         entity: climate.fordelingsgang
         name: Gang
+        features: []
 
   - type: grid
     cards:
@@ -269,15 +274,40 @@ sections:
           - entity: sensor.forgang_sensor_temperature
             name: Hue
 
-      - type: thermostat
+      - type: tile
         entity: climate.forgang
         name: Forgang
+        features: []
 
   - type: grid
     cards:
-      - type: thermostat
+      - type: tile
         entity: climate.lille_bad
         name: Lille bad
+        features: []
+
+  # Indstillinger: Komforttemperaturer og sænkninger
+  - type: grid
+    cards:
+      - type: entities
+        title: Komforttemperaturer
+        entities:
+          - entity: input_number.varme_komfort_andreas
+          - entity: input_number.varme_komfort_daniel
+          - entity: input_number.varme_komfort_sovevaerelse
+          - entity: input_number.varme_komfort_kontor
+          - entity: input_number.varme_komfort_gang
+          - entity: input_number.varme_komfort_forgang
+          - entity: input_number.varme_komfort_lille_bad
+
+      - type: entities
+        title: Sænkninger og ferie
+        entities:
+          - entity: input_number.varme_nat_saenkning
+          - entity: input_number.varme_vaek_saenkning
+          - entity: input_number.varme_ferie_temp
+          - entity: input_datetime.vacation_end
+            name: Hjemkomst (ferie slutter)
 
   # Ventilposition
   - type: grid
diff --git a/include/automations/varme_styring.yaml b/include/automations/varme_styring.yaml
index 51662e7..b55c0ff 100644
--- a/include/automations/varme_styring.yaml
+++ b/include/automations/varme_styring.yaml
@@ -56,3 +56,28 @@
     # Vent til integrationer er loaded
     - delay: "00:01:00"
     - service: script.varme_recalculate
+
+- alias: "Varme - Ferieopvarmning: Start 2 dage før hjemkomst"
+  id: varme_ferie_forvarm
+  description: >
+    Slår vacation_mode fra 2 dage inden vacation_end så huset er
+    varmt ved hjemkomst. Kører dagligt kl. 06:00.
+  trigger:
+    - platform: time
+      at: "06:00:00"
+  condition:
+    - condition: state
+      entity_id: input_boolean.vacation_mode
+      state: "on"
+    - condition: template
+      value_template: >
+        {% set end = states('input_datetime.vacation_end') %}
+        {% if end not in ['unknown', 'unavailable', ''] %}
+          {{ 0 < (as_timestamp(end) - as_timestamp(now())) < (2 * 86400) }}
+        {% else %}
+          false
+        {% endif %}
+  action:
+    - service: input_boolean.turn_off
+      target:
+        entity_id: input_boolean.vacation_mode