diff --git a/config/advanced-lovelace.yaml b/config/advanced-lovelace.yaml
index 4383675..205ba69 100644
--- a/config/advanced-lovelace.yaml
+++ b/config/advanced-lovelace.yaml
@@ -7,6 +7,7 @@ views:
   - !include lovelace/advanced_dashboard/01_new.yaml
   - !include lovelace/advanced_dashboard/02_lights.yaml
   - !include lovelace/advanced_dashboard/03_climate.yaml
+  - !include lovelace/advanced_dashboard/04_sensors.yaml
   - !include lovelace/advanced_dashboard/07_media.yaml
   - !include lovelace/advanced_dashboard/08_automations.yaml
   - !include lovelace/advanced_dashboard/09_network.yaml
diff --git a/config/lovelace/advanced_dashboard/00_home.yaml b/config/lovelace/advanced_dashboard/00_home.yaml
index 8fb5a96..4c82b6a 100644
--- a/config/lovelace/advanced_dashboard/00_home.yaml
+++ b/config/lovelace/advanced_dashboard/00_home.yaml
@@ -62,12 +62,3 @@ cards:
                     - red: 100
                 - entity: sensor.quarantine_times_left
                   name: Times left
-            - type: "custom:travel-time-card"
-              title: Travel time
-              columns:
-                - name
-                - duration
-                - distance
-              entities:
-                - sensor.home_to_work
-                - sensor.work_to_home
diff --git a/config/lovelace/advanced_dashboard/04_sensors.yaml b/config/lovelace/advanced_dashboard/04_sensors.yaml
new file mode 100644
index 0000000..23498a4
--- /dev/null
+++ b/config/lovelace/advanced_dashboard/04_sensors.yaml
@@ -0,0 +1,77 @@
+title: Sensors
+path: sensors
+icon: mdi:motion-sensor
+panel: true
+cards:
+  - type: custom:mod-card
+    style:
+      layout-card:
+        $:
+          horizontal-layout:
+            $:
+              .: |
+                #columns {
+                  margin: 0 20px;
+                  grid-gap: 20px;
+                }
+    card:
+      type: custom:layout-card
+      layout_type: custom:horizontal-layout
+      layout:
+        max_cols: 3
+      cards:
+        - type: vertical-stack
+          title: Sensors
+          cards:
+            - type: horizontal-stack
+              cards:
+                - type: custom:button-card
+                  template: default
+                  entity: binary_sensor.multisensor_motion
+                  name: Living room
+                - type: custom:button-card
+                  template: [default, with_state_indicator]
+                  entity: binary_sensor.kitchen_motion_occupancy
+                  name: Kitchen
+                  variables:
+                    state_indicator_id: automation.lighting_kitchen_motion_on
+                - type: custom:button-card
+                  template: [default, with_state_indicator]
+                  entity: group.hallway_motion
+                  name: Hallway
+                  variables:
+                    state_indicator_id: automation.lighting_hallway_motion_on
+            - type: horizontal-stack
+              cards:
+                - type: custom:button-card
+                  template: default
+                  entity: binary_sensor.living_room_right_window
+                  name: Living room
+                - type: custom:button-card
+                  template: default
+                  entity: binary_sensor.bedroom_left_window
+                  name: Bedroom left
+                - type: custom:button-card
+                  template: default
+                  entity: binary_sensor.bedroom_right_window
+                  name: Bedroom right
+                - type: custom:button-card
+                  template: default
+                  entity: binary_sensor.kitchen_window
+                  name: Kitchen
+            - type: horizontal-stack
+              cards:
+                - type: custom:button-card
+                  template: default
+                  entity: binary_sensor.georgi_home
+                  tap_action:
+                    action: call-service
+                    service: input_boolean.toggle
+                    service_data:
+                      entity_id: input_boolean.georgi_home
+                - type: custom:button-card
+                  template: default
+                  entity: binary_sensor.front_door
+                - type: custom:button-card
+                  template: default
+                  entity: binary_sensor.bedroom_door
diff --git a/config/lovelace/decluttering_templates/cards/bedroom_climate_card.yaml b/config/lovelace/decluttering_templates/cards/bedroom_climate_card.yaml
new file mode 100644
index 0000000..1b9de16
--- /dev/null
+++ b/config/lovelace/decluttering_templates/cards/bedroom_climate_card.yaml
@@ -0,0 +1,30 @@
+bedroom_climate_card:
+  card:
+    type: vertical-stack
+    cards:
+      - type: custom:decluttering-card
+        template: climate_card
+        variables:
+          - title: "Bedroom Climate"
+          - main_entity: sensor.bedroom_weather_temperature
+          - left_entity: sensor.bedroom_weather_humidity
+          - right_entity: sensor.bedroom_weather_pressure
+
+      - type: horizontal-stack
+        cards:
+          - type: "custom:mini-graph-card"
+            name: Air Quality
+            entities:
+              - sensor.purifier_air_quality
+            font_size: 75
+            line_color: "var(--color-blue)"
+            line_width: 6
+            hours_to_show: 72
+          - type: "custom:mini-graph-card"
+            name: Allergens
+            entities:
+              - sensor.purifier_allergens
+            font_size: 75
+            line_color: "var(--color-blue)"
+            line_width: 6
+            hours_to_show: 72
diff --git a/config/lovelace/decluttering_templates/cards/bedroom_temperature_card.yaml b/config/lovelace/decluttering_templates/cards/bedroom_temperature_card.yaml
deleted file mode 100644
index d6b63e7..0000000
--- a/config/lovelace/decluttering_templates/cards/bedroom_temperature_card.yaml
+++ /dev/null
@@ -1,49 +0,0 @@
-bedroom_temperature_card:
-  card:
-    type: vertical-stack
-    cards:
-      - type: "custom:mini-graph-card"
-        entities:
-          - sensor.bedroom_weather_temperature
-        cache: false
-        group_by: hour
-        hours_to_show: 72
-        line_width: 2
-        show:
-          average: true
-          extrema: true
-          fill: true
-        color_thresholds:
-          - value: 19
-            color: "var(--color-blue)"
-          - value: 20.5
-            color: "var(--color-green)"
-          - value: 22
-            color: "var(--color-red)"
-
-      - type: horizontal-stack
-        cards:
-          - type: "custom:mini-graph-card"
-            name: Humidity
-            font_size: 75
-            icon: "mdi:water"
-            line_color: "var(--color-blue)"
-            line_width: 8
-            entities:
-              - sensor.bedroom_weather_humidity
-
-          - type: "custom:mini-graph-card"
-            entities:
-              - sensor.bedroom_weather_pressure
-            font_size: 75
-            line_color: "var(--color-blue)"
-            line_width: 8
-
-          - type: "custom:mini-graph-card"
-            name: Air Quality
-            font_size: 75
-            icon: "mdi:weather-windy"
-            line_color: "var(--color-blue)"
-            line_width: 8
-            entities:
-              - sensor.purifier_air_quality
diff --git a/config/lovelace/decluttering_templates/cards/living_room_climate_card.yaml b/config/lovelace/decluttering_templates/cards/living_room_climate_card.yaml
new file mode 100644
index 0000000..32a7f41
--- /dev/null
+++ b/config/lovelace/decluttering_templates/cards/living_room_climate_card.yaml
@@ -0,0 +1,11 @@
+living_room_climate_card:
+  card:
+    type: custom:decluttering-card
+    template: climate_card
+    variables:
+      - title: "Climate"
+      - main_entity: sensor.multisensor_6_temperature
+      - left_entity: sensor.multisensor_6_relative_humidity
+      - left_name: Humidity (6)
+      - right_entity: sensor.multisensor_6_luminance
+      - right_name: Luminance (6)
diff --git a/config/lovelace/decluttering_templates/cards/temperature_card.yaml b/config/lovelace/decluttering_templates/cards/temperature_card.yaml
new file mode 100644
index 0000000..8a77e94
--- /dev/null
+++ b/config/lovelace/decluttering_templates/cards/temperature_card.yaml
@@ -0,0 +1,18 @@
+temperature_card:
+  default:
+    - main_name: "Temperature"
+  card:
+    type: vertical-stack
+    cards:
+      - type: "custom:mini-graph-card"
+        name: "[[main_name]]"
+        entities:
+          - "[[main_entity]]"
+        cache: false
+        group_by: hour
+        hours_to_show: 72
+        line_width: 2
+        show:
+          average: true
+          extrema: true
+          fill: true
diff --git a/config/lovelace/home_dashboard/bedroom_dashboard.yaml b/config/lovelace/home_dashboard/bedroom_dashboard.yaml
index e4cf6a3..66292a9 100644
--- a/config/lovelace/home_dashboard/bedroom_dashboard.yaml
+++ b/config/lovelace/home_dashboard/bedroom_dashboard.yaml
@@ -13,7 +13,7 @@
     type: custom:layout-card
     layout_type: custom:horizontal-layout
     layout:
-      max_cols: 2
+      max_cols: 3
     cards:
       - type: vertical-stack
         title: Bedroom
@@ -84,38 +84,6 @@
                   scene_color_1: rgb(255, 92, 38)
                   scene_color_2: rgb(255, 0, 190)
 
-          - type: vertical-stack
-            title: Controls
-            cards:
-              - type: horizontal-stack
-                cards:
-                  - type: custom:button-card
-                    template: [default, with_state_indicator]
-                    entity: input_boolean.alarm_enabled
-                    state_display: >-
-                      [[[
-                        const time = states['input_datetime.alarm_time'].state;
-                        return time.split(':').slice(0, -1).join(':');
-                      ]]]
-                    show_state: true
-                    show_name: false
-                    styles:
-                      icon:
-                        - transform: translateY(-8px)  # adjusted for state indicator size
-                      state:
-                        - transform: translateY(-13px)  # adjusted for state indicator size
-                    variables:
-                      state_indicator_id: automation.alarm_set_time
-                  - type: custom:button-card
-                    template: default
-                    entity: binary_sensor.house_mode
-                    name: House
-                    tap_action:
-                      action: call-service
-                      service: input_select.select_next
-                      service_data:
-                        entity_id: input_select.house_mode
-
           - type: horizontal-stack
             title: Climate
             cards:
@@ -148,23 +116,6 @@
               - type: custom:decluttering-card
                 template: purifier_target_humidity
 
-          - type: custom:decluttering-card
-            template: media_with_controls
-            variables:
-              - player: media_player.master_bedroom
-              - player_name: Bedroom
-
-          - type: vertical-stack
-            title: Camera
-            cards:
-              - type: picture-glance
-                camera_image: camera.bedroom_hd
-                entities:
-                  - switch.tapo_bedroom
-
-      - type: vertical-stack
-        title: Sensors
-        cards:
           - type: horizontal-stack
             cards:
               - type: custom:button-card
@@ -180,6 +131,8 @@
                 entity: binary_sensor.bedroom_right_window
                 name: Right window
 
+      - type: vertical-stack
+        cards:
           - type: custom:decluttering-card
             template: climate_card
             variables:
@@ -188,21 +141,17 @@
               - left_entity: sensor.bedroom_weather_humidity
               - right_entity: sensor.bedroom_weather_pressure
 
-          - type: horizontal-stack
+      - type: vertical-stack
+        cards:
+          - type: custom:decluttering-card
+            template: media_with_controls
+            variables:
+              - player: media_player.master_bedroom
+              - player_name: Bedroom
+          - type: vertical-stack
+            title: Camera
             cards:
-              - type: "custom:mini-graph-card"
-                name: Air Quality
+              - type: picture-glance
+                camera_image: camera.bedroom_hd
                 entities:
-                  - sensor.purifier_air_quality
-                font_size: 75
-                line_color: "var(--color-blue)"
-                line_width: 6
-                hours_to_show: 72
-              - type: "custom:mini-graph-card"
-                name: Allergens
-                entities:
-                  - sensor.purifier_allergens
-                font_size: 75
-                line_color: "var(--color-blue)"
-                line_width: 6
-                hours_to_show: 72
+                  - switch.tapo_bedroom
diff --git a/config/lovelace/home_dashboard/kitchen_dashboard.yaml b/config/lovelace/home_dashboard/kitchen_dashboard.yaml
index b052488..96541ed 100644
--- a/config/lovelace/home_dashboard/kitchen_dashboard.yaml
+++ b/config/lovelace/home_dashboard/kitchen_dashboard.yaml
@@ -49,38 +49,20 @@
           - type: horizontal-stack
             title: Devices
             cards:
+              - type: custom:button-card
+                template: brita_water
               - type: custom:button-card
                 template: radiator_button
                 entity: climate.kitchen_radiator_mode
-              - type: custom:button-card
-                template: brita_water
               - type: custom:button-card
                 template: default
                 entity: vacuum.vacuum
                 name: Vacuum
               - type: custom:button-card
                 template: default
-                entity: media_player.living_room_tv
-                name: TV
-                icon: mdi:television
-                tap_action:
-                  action: toggle
-                state:
-                  - value: 'playing'
-                    styles: &on_styles
-                      card:
-                        - background-color: var(--primary-color)
-                        - color: black
-                      icon:
-                        - color: black
-                  - value: 'standby'
-                    styles: *on_styles
-                  - value: 'on'
-                    styles: *on_styles
-                  - value: 'home'
-                    styles: *on_styles
-                  - value: 'idle'
-                    styles: *on_styles
+                entity: binary_sensor.kitchen_window
+                name: Window
+
           - type: custom:decluttering-card
             template: media_with_controls
             variables:
@@ -88,35 +70,7 @@
               - player_name: Kitchen
 
       - type: vertical-stack
-        title: Sensors
         cards:
-          - type: horizontal-stack
-            cards:
-              - type: custom:button-card
-                template: default
-                entity: binary_sensor.kitchen_window
-                name: Window
-              - type: custom:button-card
-                template: [default, with_state_indicator]
-                entity: binary_sensor.kitchen_motion_occupancy
-                name: Motion
-                variables:
-                  state_indicator_id: automation.lighting_kitchen_motion_on
-              - type: custom:button-card
-                template: [regular, progress]
-                entity: sensor.kitchen_motion_illuminance
-                name: Lux
-                variables:
-                  min_value: 0
-                  max_value: 1000
-                  normal_value: 1000
-              - type: custom:button-card
-                template: [default, with_state_indicator]
-                entity: group.hallway_motion
-                name: Hallway
-                variables:
-                  state_indicator_id: automation.lighting_hallway_motion_on
-
           - type: custom:decluttering-card
             template: climate_card
             variables:
diff --git a/config/lovelace/home_dashboard/living_room_dashboard.yaml b/config/lovelace/home_dashboard/living_room_dashboard.yaml
index facb7eb..6c3feb4 100644
--- a/config/lovelace/home_dashboard/living_room_dashboard.yaml
+++ b/config/lovelace/home_dashboard/living_room_dashboard.yaml
@@ -79,6 +79,10 @@
                 entity: climate.living_room_radiator_mode
               - type: custom:button-card
                 template: ac_button
+              - type: custom:button-card
+                template: default
+                entity: binary_sensor.living_room_right_window
+                name: Window
           - type: horizontal-stack
             cards:
               - type: custom:button-card
@@ -109,11 +113,7 @@
                 entity: switch.titanium
                 variables:
                   state_indicator_id: automation.titanium_turn_off_when_idle
-              - type: custom:button-card
-                template: default
-                entity: binary_sensor.pi_hole_enabled
-                name: Pi-Hole
-                icon: mdi:pi-hole
+
               - type: custom:button-card
                 template: [regular, progress]
                 entity: sensor.desk_outlet_power
@@ -124,41 +124,8 @@
                   normal_value: 100
                   high_value: 300
 
-          - type: vertical-stack
-            cards:
-              - type: custom:decluttering-card
-                template: media_with_controls
-                variables:
-                  - player: media_player.living_room
-                  - player_name: Living room
-          - type: vertical-stack
-            title: Camera
-            cards:
-              - type: picture-glance
-                camera_image: camera.mercury_amcrest_1
-                entities: []
-
-
       - type: vertical-stack
-        title: Sensors
         cards:
-          - type: horizontal-stack
-            cards:
-              - type: custom:button-card
-                template: default
-                entity: binary_sensor.living_room_right_window
-                name: Window
-              - type: custom:button-card
-                template: default
-                entity: binary_sensor.multisensor_motion
-                name: Door
-              - type: custom:button-card
-                template: [default, with_state_indicator]
-                entity: group.hallway_motion
-                name: Hallway
-                variables:
-                  state_indicator_id: automation.lighting_hallway_motion_on
-
           - type: custom:decluttering-card
             template: climate_card
             variables:
@@ -169,7 +136,17 @@
               - right_entity: sensor.multisensor_6_luminance
               - right_name: Luminance (6)
 
-          - type: custom:button-card
-            template: [regular, progress]
-            entity: sensor.living_room_radiator_temperature
-            name: Radiator temperature
+
+      - type: vertical-stack
+        cards:
+          - type: custom:decluttering-card
+            template: media_with_controls
+            variables:
+              - player: media_player.living_room
+              - player_name: Living room
+          - type: vertical-stack
+            title: Camera
+            cards:
+              - type: picture-glance
+                camera_image: camera.mercury_amcrest_1
+                entities: []
diff --git a/config/lovelace/home_dashboard/main_dashboard.yaml b/config/lovelace/home_dashboard/main_dashboard.yaml
index 524cf35..dc565fc 100644
--- a/config/lovelace/home_dashboard/main_dashboard.yaml
+++ b/config/lovelace/home_dashboard/main_dashboard.yaml
@@ -85,169 +85,126 @@
                     template: default
                     entity: light.hallway_entrance
                     name: Entrance
-
           - type: vertical-stack
-            title: Devices
+            title: Climate
             cards:
               - type: horizontal-stack
                 cards:
                   - type: custom:button-card
-                    template: [default, cover]
-                    entity: cover.living_room
-                    name: LR Cover
-                    tap_action:
-                      action: call-service
-                      service: script.toggle_living_room_cover
+                    template: [regular, progress]
+                    entity: sensor.average_temperature
+                    icon: mdi:thermometer
+                    state_display: "[[[ return Math.round(entity.state) + ' °C' ]]]"
                   - type: custom:button-card
-                    template: regular
-                    entity: media_player.living_room_tv
-                    name: TV
-                    icon: mdi:television
-                    tap_action:
-                      action: toggle
-                    state:
-                      - value: 'playing'
-                        styles: &on_styles
-                          card:
-                            - background-color: var(--primary-color)
-                            - color: black
-                          icon:
-                            - color: black
-                      - value: 'standby'
-                        styles: *on_styles
-                      - value: 'on'
-                        styles: *on_styles
-                      - value: 'home'
-                        styles: *on_styles
-                      - value: 'idle'
-                        styles: *on_styles
-
-                  - type: custom:button-card
-                    template: [default, with_state_indicator]
-                    entity: switch.titanium
+                    template: [regular, progress]
+                    entity: sensor.average_humidity
+                    icon: mdi:water-percent
+                    state_display: "[[[ return Math.round(entity.state) + ' %' ]]]"
                     variables:
-                      state_indicator_id: automation.titanium_turn_off_when_idle
-
-                  - type: custom:button-card
-                    template: default
-                    entity: binary_sensor.pi_hole_enabled
-                    name: Pi-Hole
-                    icon: mdi:pi-hole
-
-              - type: horizontal-stack
-                cards:
-                  - type: custom:button-card
-                    template: ac_button
-                  - type: custom:button-card
-                    template: radiator_button
-                    entity: climate.living_room_radiator_mode
-                    name: "Living room"
-                  - type: custom:button-card
-                    template: radiator_button
-                    entity: climate.bedroom_radiator_mode
-                    name: "Bedroom"
-                  - type: custom:button-card
-                    template: radiator_button
-                    entity: climate.kitchen_radiator_mode
-                    name: "Kitchen"
-              - type: horizontal-stack
-                cards:
-                  - type: custom:button-card
-                    template: default
-                    entity: camera.mercury_amcrest_1
-                    name: Living Room
-                  - type: custom:button-card
-                    template: default
-                    entity: switch.tapo_bedroom
-                    name: Bedroom
-                  - type: custom:button-card
-                    template: [default, with_state_indicator]
-                    entity: fan.philips_airpurifier
-                    variables:
-                      state_indicator_id: binary_sensor.purifier_filter_needs_change
-                      state_indicator_size: 5px
-                      state_indicator_off_size: 0px
-                      state_indicator_on_color: var(--color-red)
-                      state_on_indicator_on_color: var(--color-red)
-                  - type: custom:button-card
-                    template: default
-                    entity: vacuum.vacuum
-                    name: Vacuum
-                  - type: custom:button-card
-                    template: brita_water
+                      min_value: 25
+                      max_value: 90
+                      normal_value: 40
+                      high_value: 65
+                      low_color: "var(--color-red)"
 
       # Column 2
       - type: vertical-stack
         cards:
-          - type: horizontal-stack
-            title: Manual controls
-            cards:
-              - type: custom:button-card
-                template: [small, with_state_indicator, with_state_background]
-                entity: input_boolean.alarm_enabled
-                state_display: >-
-                  [[[
-                    const time = states['input_datetime.alarm_time'].state;
-                    return time.split(':').slice(0, -1).join(':');
-                  ]]]
-                show_state: true
-                show_name: false
-                styles:
-                  icon:
-                    - transform: translateY(0)  # adjusted for state indicator size
-                  state:
-                    - transform: translateY(-4px)  # adjusted for state indicator size
-                variables:
-                  state_indicator_id: automation.alarm_set_time
-              - type: custom:button-card
-                template: [small, with_state_background]
-                entity: input_boolean.speech_notifications
-                name: Speech
-              - type: custom:button-card
-                template: [small, with_state_background]
-                entity: binary_sensor.house_mode
-                name: House
-                tap_action:
-                  action: call-service
-                  service: input_select.select_next
-                  service_data:
-                    entity_id: input_select.house_mode
-              - type: custom:button-card
-                template: [small, with_state_background]
-                name: Guests
-                entity: input_boolean.guest_mode
-              - type: custom:button-card
-                template: [small, with_state_background]
-                entity: input_boolean.simulation_mode
-                name: Simulation
-              - type: custom:button-card
-                template: [small, with_state_background]
-                entity: switch.mercury_home_mode
-                name: Mercury
-
           - type: vertical-stack
             cards:
               - type: vertical-stack
-                title: Sensors
+                title: Devices
                 cards:
                   - type: horizontal-stack
                     cards:
+                      - type: custom:button-card
+                        template: [default, cover]
+                        entity: cover.living_room
+                        name: LR Cover
+                        tap_action:
+                          action: call-service
+                          service: script.toggle_living_room_cover
+                      - type: custom:button-card
+                        template: regular
+                        entity: media_player.living_room_tv
+                        name: TV
+                        icon: mdi:television
+                        tap_action:
+                          action: toggle
+                        state:
+                          - value: 'playing'
+                            styles: &on_styles
+                              card:
+                                - background-color: var(--primary-color)
+                                - color: black
+                              icon:
+                                - color: black
+                          - value: 'standby'
+                            styles: *on_styles
+                          - value: 'on'
+                            styles: *on_styles
+                          - value: 'home'
+                            styles: *on_styles
+                          - value: 'idle'
+                            styles: *on_styles
+
+                      - type: custom:button-card
+                        template: [default, with_state_indicator]
+                        entity: switch.titanium
+                        variables:
+                          state_indicator_id: automation.titanium_turn_off_when_idle
+
                       - type: custom:button-card
                         template: default
-                        entity: binary_sensor.multisensor_motion
-                        name: Living room
+                        entity: binary_sensor.pi_hole_enabled
+                        name: Pi-Hole
+                        icon: mdi:pi-hole
+
+                  - type: horizontal-stack
+                    cards:
+                      - type: custom:button-card
+                        template: ac_button
+                      - type: custom:button-card
+                        template: radiator_button
+                        entity: climate.living_room_radiator_mode
+                        name: "Living room"
+                      - type: custom:button-card
+                        template: radiator_button
+                        entity: climate.bedroom_radiator_mode
+                        name: "Bedroom"
+                      - type: custom:button-card
+                        template: radiator_button
+                        entity: climate.kitchen_radiator_mode
+                        name: "Kitchen"
+                  - type: horizontal-stack
+                    cards:
+                      - type: custom:button-card
+                        template: default
+                        entity: camera.mercury_amcrest_1
+                        name: Living Room
+                      - type: custom:button-card
+                        template: default
+                        entity: switch.tapo_bedroom
+                        name: Bedroom
                       - type: custom:button-card
                         template: [default, with_state_indicator]
-                        entity: binary_sensor.kitchen_motion_occupancy
-                        name: Kitchen
+                        entity: fan.philips_airpurifier
                         variables:
-                          state_indicator_id: automation.lighting_kitchen_motion_on
+                          state_indicator_id: binary_sensor.purifier_filter_needs_change
+                          state_indicator_size: 5px
+                          state_indicator_off_size: 0px
+                          state_indicator_on_color: var(--color-red)
+                          state_on_indicator_on_color: var(--color-red)
                       - type: custom:button-card
-                        template: [default, with_state_indicator]
-                        entity: group.hallway_motion
-                        name: Hallway
-                        variables:
-                          state_indicator_id: automation.lighting_hallway_motion_on
+                        template: default
+                        entity: vacuum.vacuum
+                        name: Vacuum
+                      - type: custom:button-card
+                        template: brita_water
+
+              - type: vertical-stack
+                title: Sensors
+                cards:
                   - type: horizontal-stack
                     cards:
                       - type: custom:button-card
@@ -282,27 +239,7 @@
                       - type: custom:button-card
                         template: default
                         entity: binary_sensor.bedroom_door
-          - type: vertical-stack
-            title: Climate
-            cards:
-              - type: horizontal-stack
-                cards:
-                  - type: custom:button-card
-                    template: [regular, progress]
-                    entity: sensor.average_temperature
-                    icon: mdi:thermometer
-                    state_display: "[[[ return Math.round(entity.state) + ' °C' ]]]"
-                  - type: custom:button-card
-                    template: [regular, progress]
-                    entity: sensor.average_humidity
-                    icon: mdi:water-percent
-                    state_display: "[[[ return Math.round(entity.state) + ' %' ]]]"
-                    variables:
-                      min_value: 25
-                      max_value: 90
-                      normal_value: 40
-                      high_value: 65
-                      low_color: "var(--color-red)"
+
 
       # Column 3
       - type: vertical-stack
diff --git a/config/lovelace/home_dashboard/preferences_dashboard.yaml b/config/lovelace/home_dashboard/preferences_dashboard.yaml
new file mode 100644
index 0000000..85c72f6
--- /dev/null
+++ b/config/lovelace/home_dashboard/preferences_dashboard.yaml
@@ -0,0 +1,87 @@
+- type: custom:mod-card
+  style:
+    layout-card:
+      $:
+        horizontal-layout:
+          $:
+            .: |
+              #columns {
+                margin: 0 20px;
+                grid-gap: 20px;
+              }
+  card:
+    type: custom:layout-card
+    layout_type: custom:horizontal-layout
+    layout:
+      max_cols: 2
+    cards:
+      - type: vertical-stack
+        title: Temperature
+        cards:
+          - type: entities
+            show_header_toggle: false
+            entities:
+              - input_boolean.heating_enabled
+              - input_number.radiators_temperature
+              - script.turn_on_all_radiators
+              - type: divider
+              - input_boolean.ac_heating
+              - input_number.toshiba_heat_temp
+              - input_number.toshiba_cool_temp
+              - input_number.toshiba_trigger_temp
+
+      - type: vertical-stack
+        title: Controls
+        cards:
+          - type: horizontal-stack
+            cards:
+              - type: custom:button-card
+                template: [default, with_state_indicator, with_state_background]
+                entity: input_boolean.alarm_enabled
+                state_display: >-
+                  [[[
+                    const time = states['input_datetime.alarm_time'].state;
+                    return time.split(':').slice(0, -1).join(':');
+                  ]]]
+                show_state: true
+                show_name: false
+                styles:
+                  icon:
+                    - transform: translateY(0)  # adjusted for state indicator size
+                  state:
+                    - transform: translateY(-8px)  # adjusted for state indicator size
+                variables:
+                  state_indicator_id: automation.alarm_set_time
+              - type: custom:button-card
+                template: default
+                entity: input_boolean.speech_notifications
+                name: Speech
+              - type: custom:button-card
+                template: default
+                entity: binary_sensor.house_mode
+                name: House
+                tap_action:
+                  action: call-service
+                  service: input_select.select_next
+                  service_data:
+                    entity_id: input_select.house_mode
+              - type: custom:button-card
+                template: default
+                name: Guests
+                entity: input_boolean.guest_mode
+
+          - type: horizontal-stack
+            cards:
+              - type: custom:button-card
+                template: default
+                entity: input_boolean.simulation_mode
+                name: Simulation
+              - type: custom:button-card
+                template: default
+                entity: switch.mercury_home_mode
+                name: Mercury
+              - type: custom:button-card
+                template: default
+                entity: binary_sensor.pi_hole_enabled
+                name: Pi-Hole
+                icon: mdi:pi-hole
diff --git a/config/lovelace/popup_cards.yaml b/config/lovelace/popup_cards.yaml
index e639586..c06fbf5 100644
--- a/config/lovelace/popup_cards.yaml
+++ b/config/lovelace/popup_cards.yaml
@@ -191,11 +191,18 @@ light.living_room_main:
           name: Toggle
 
 sensor.bedroom_weather_temperature:
-  title: Bedroom temperature
+  title: Bedroom climate
   style: *broad_popup_style
   card:
     type: custom:decluttering-card
-    template: bedroom_temperature_card
+    template: bedroom_climate_card
+
+sensor.multisensor_6_temperature:
+  title: Living room climate
+  style: *broad_popup_style
+  card:
+    type: custom:decluttering-card
+    template: living_room_climate_card
 
 sensor.bedroom_weather_humidity:
   title: Bedroom humidity
diff --git a/config/packages/devices/living_room/toshiba_ac.yaml b/config/packages/devices/living_room/toshiba_ac.yaml
index bd13e19..82821f7 100644
--- a/config/packages/devices/living_room/toshiba_ac.yaml
+++ b/config/packages/devices/living_room/toshiba_ac.yaml
@@ -47,7 +47,7 @@ input_number:
     step: 1
     icon: mdi:air-conditioner
   toshiba_trigger_temp:
-    name: AC trigger temp
+    name: AC cooling trigger temp
     unit_of_measurement: "ºC"
     min: 18
     max: 25
diff --git a/config/packages/sensors/travel_time.yaml b/config/packages/sensors/travel_time.yaml
deleted file mode 100644
index 13ce46c..0000000
--- a/config/packages/sensors/travel_time.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-sensor:
-  - platform: waze_travel_time
-    name: Home to work
-    origin: zone.home
-    destination: zone.work
-    region: "EU"
-
-  - platform: waze_travel_time
-    name: Work to home
-    origin: zone.work
-    destination: zone.home
-    region: "EU"
diff --git a/config/ui-lovelace.yaml b/config/ui-lovelace.yaml
index 4f2939a..6c181ee 100644
--- a/config/ui-lovelace.yaml
+++ b/config/ui-lovelace.yaml
@@ -34,6 +34,11 @@ views:
     icon: "mdi:door-closed"
     panel: true
     cards: !include lovelace/home_dashboard/hallway_dashboard.yaml
+  - title: Preferences
+    path: preferences
+    icon: "mdi:cogs"
+    panel: true
+    cards: !include lovelace/home_dashboard/preferences_dashboard.yaml
   - title: Cameras
     path: cameras
     icon: "mdi:webcam"