diff --git a/config/packages/gate.yaml b/config/packages/gate.yaml
index eb81777..ed30e6e 100644
--- a/config/packages/gate.yaml
+++ b/config/packages/gate.yaml
@@ -62,10 +62,10 @@ automation:
         attribute: dir_of_travel
         state: towards
       - condition: state
-        entity_id: sensor.bos_iphone_activity
+        entity_id: sensor.bos_iphone_hass_activity
         state: Automotive
       - condition: state
-        entity_id: sensor.bos_iphone_activity
+        entity_id: sensor.bos_iphone_hass_activity
         attribute: Confidence
         state: High
     action:
diff --git a/config/packages/offices.yaml b/config/packages/offices.yaml
index 2faf30d..2fc81e2 100644
--- a/config/packages/offices.yaml
+++ b/config/packages/offices.yaml
@@ -28,7 +28,30 @@ automation:
           area_id: bo_s_office
       - service: switch.turn_on
         target:
-          area_id: bo_s_office
+          entity_id: switch.bo_s_office_plug
+
+  - id: 2804db52f34458004191f589ed3453dd6f9e1f45
+    alias: Warm up Bo's office heater
+    trigger:
+      - platform: template
+        value_template: |
+          {{ is_state('binary_sensor.bo_s_office_door_contact', 'off')
+               and (is_state('binary_sensor.bo_s_office_motion', 'on')
+                    or is_state('binary_sensor.bo_s_office_is_occupied', 'on'))
+               and states('sensor.ble_temperature_bos_office_a4c1380f0b98') | float < 19 }}
+        variables:
+          service: switch.turn_on
+      - platform: template
+        value_template: |
+          {{ is_state('binary_sensor.bo_s_office_door_contact', 'on')
+               or (is_state('binary_sensor.bo_s_office_motion', 'off') and is_state('binary_sensor.bo_s_office_is_occupied', 'off'))
+               or states('sensor.ble_temperature_bos_office_a4c1380f0b98') | float > 20 }}
+        variables:
+          service: switch.turn_off
+    action:
+      - service: "{{ service }}"
+        target:
+          entity_id: switch.bos_office_heater
 
   - id: 8a32a559bfcf43ddfd6ec03a8071eecfbf8161bb
     alias: Turn off Bo's office if no motion for a while
diff --git a/lovelace/lovelace.yaml b/lovelace/lovelace.yaml
index 147ca50..d04601d 100644
--- a/lovelace/lovelace.yaml
+++ b/lovelace/lovelace.yaml
@@ -782,3 +782,23 @@ config:
     path: doors
     theme: Backend-selected
     title: Doors
+  - badges: []
+    cards:
+    - entities:
+      - sensor.ble_temperature_shower_a4c13865903a
+      - sensor.ble_temperature_bathroom_a4c138f6b8cb
+      - sensor.bathroom_sensor_temperature
+      - sensor.ble_humidity_shower_a4c13865903a
+      - sensor.ble_humidity_bathroom_a4c138f6b8cb
+      type: entities
+    - entities:
+      - sensor.ble_temperature_shower_a4c13865903a
+      - sensor.ble_temperature_bathroom_a4c138f6b8cb
+      - sensor.bathroom_sensor_temperature
+      - sensor.ble_humidity_shower_a4c13865903a
+      - sensor.ble_humidity_bathroom_a4c138f6b8cb
+      type: history-graph
+    icon: mdi:shower
+    path: bathroom
+    theme: Backend-selected
+    title: Bathroom