diff --git a/config/configuration.yaml b/config/configuration.yaml
index e097671..0f6199b 100644
--- a/config/configuration.yaml
+++ b/config/configuration.yaml
@@ -52,7 +52,7 @@ lovelace:
       mode: yaml
       title: Hallway Dashboard
       icon: mdi:tablet-dashboard
-      show_in_sidebar: true
+      show_in_sidebar: false
       filename: hallway-lovelace.yaml
     lovelace-kitchen:
       mode: yaml
diff --git a/config/lovelace/decluttering_templates/cards/bedroom_air_quality_card.yaml b/config/lovelace/decluttering_templates/cards/bedroom_air_quality_card.yaml
index 1d838b1..72ae585 100644
--- a/config/lovelace/decluttering_templates/cards/bedroom_air_quality_card.yaml
+++ b/config/lovelace/decluttering_templates/cards/bedroom_air_quality_card.yaml
@@ -13,10 +13,15 @@ bedroom_air_quality_card:
           average: true
           extrema: true
           fill: true
-        color_thresholds:
-          - value: 10
-            color: "var(--color-green)"
-          - value: 20.5
-            color: "var(--color-blue)"
-          - value: 25
-            color: "var(--color-red)"
+
+      - type: "custom:mini-graph-card"
+        name: Allergens
+        entities:
+          - sensor.purifier_allergens
+        group_by: hour
+        hours_to_show: 72
+        line_width: 2
+        show:
+          average: true
+          extrema: true
+          fill: tru
diff --git a/config/lovelace/decluttering_templates/cards/bedroom_climate_card.yaml b/config/lovelace/decluttering_templates/cards/bedroom_climate_card.yaml
index 1b9de16..5f540a3 100644
--- a/config/lovelace/decluttering_templates/cards/bedroom_climate_card.yaml
+++ b/config/lovelace/decluttering_templates/cards/bedroom_climate_card.yaml
@@ -5,9 +5,10 @@ bedroom_climate_card:
       - type: custom:decluttering-card
         template: climate_card
         variables:
-          - title: "Bedroom Climate"
           - main_entity: sensor.bedroom_weather_temperature
+          - main_name: Humidity
           - left_entity: sensor.bedroom_weather_humidity
+          - left-name: Temperature
           - right_entity: sensor.bedroom_weather_pressure
 
       - type: horizontal-stack
diff --git a/config/lovelace/decluttering_templates/cards/bedroom_humidity_card.yaml b/config/lovelace/decluttering_templates/cards/bedroom_humidity_card.yaml
index 9491267..245d447 100644
--- a/config/lovelace/decluttering_templates/cards/bedroom_humidity_card.yaml
+++ b/config/lovelace/decluttering_templates/cards/bedroom_humidity_card.yaml
@@ -2,48 +2,28 @@ bedroom_humidity_card:
   card:
     type: vertical-stack
     cards:
-      - type: "custom:mini-graph-card"
-        entities:
-          - sensor.bedroom_weather_humidity
-        cache: false
-        group_by: hour
-        hours_to_show: 72
-        line_width: 2
-        show:
-          average: true
-          extrema: true
-        color_thresholds:
-          - value: 36
-            color: "var(--color-red)"
-          - value: 40
-            color: "var(--color-blue)"
-          - value: 45
-            color: "var(--color-blue)"
-          - value: 48
-            color: "var(--color-green)"
+      - type: custom:decluttering-card
+        template: climate_card
+        variables:
+          - main_entity: sensor.bedroom_weather_humidity
+          - left_entity: sensor.bedroom_weather_temperature
+          - right_entity: sensor.bedroom_weather_pressure
 
       - type: horizontal-stack
         cards:
-          - type: "custom:mini-graph-card"
-            font_size: 75
-            icon: "mdi:thermometer"
-            line_color: var(--accent-color)
-            line_width: 8
-            entities:
-              - sensor.bedroom_weather_temperature
-
-          - type: "custom:mini-graph-card"
-            entities:
-              - sensor.bedroom_weather_pressure
-            font_size: 75
-            line_color: var(--accent-color)
-            line_width: 8
-
           - type: "custom:mini-graph-card"
             name: Air Quality
-            font_size: 75
-            icon: "mdi:weather-windy"
-            line_color: var(--accent-color)
-            line_width: 8
             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/climate_card.yaml b/config/lovelace/decluttering_templates/cards/climate_card.yaml
index d7296b2..b4ce697 100644
--- a/config/lovelace/decluttering_templates/cards/climate_card.yaml
+++ b/config/lovelace/decluttering_templates/cards/climate_card.yaml
@@ -5,7 +5,6 @@ climate_card:
     - right_name: "Pressure"
   card:
     type: vertical-stack
-    title: "[[title]]"
     cards:
       - type: "custom:mini-graph-card"
         name: "[[main_name]]"
diff --git a/config/lovelace/decluttering_templates/cards/living_room_climate_card.yaml b/config/lovelace/decluttering_templates/cards/living_room_climate_card.yaml
index 32a7f41..e61aa72 100644
--- a/config/lovelace/decluttering_templates/cards/living_room_climate_card.yaml
+++ b/config/lovelace/decluttering_templates/cards/living_room_climate_card.yaml
@@ -3,7 +3,6 @@ living_room_climate_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)
diff --git a/config/lovelace/home_dashboard/kitchen_dashboard_card.yaml b/config/lovelace/home_dashboard/kitchen_dashboard_card.yaml
index f8af2f3..deffbd1 100644
--- a/config/lovelace/home_dashboard/kitchen_dashboard_card.yaml
+++ b/config/lovelace/home_dashboard/kitchen_dashboard_card.yaml
@@ -53,7 +53,9 @@ cards:
       - type: horizontal-stack
         cards:
           - type: custom:button-card
-            template: v3_button_brita_water
+            template: v3_button
+            entity: media_player.kitchen
+            name: Sonos
           - type: custom:button-card
             template: v3_button_radiator
             entity: climate.kitchen_radiator_mode
@@ -65,6 +67,4 @@ cards:
       - type: horizontal-stack
         cards:
           - type: custom:button-card
-            template: v3_button
-            entity: media_player.kitchen
-            name: Sonos
+            template: v3_button_brita_water
diff --git a/config/lovelace/popup_cards.yaml b/config/lovelace/popup_cards.yaml
index a8af9e4..8e432d9 100644
--- a/config/lovelace/popup_cards.yaml
+++ b/config/lovelace/popup_cards.yaml
@@ -1,15 +1,5 @@
 binary_sensor.house_mode:
   title: House mode
-  style: &popup_style |
-    ha-dialog {
-      --mdc-dialog-min-width: 400px !important;
-      --mdc-dialog-max-width: 500px !important;
-    }
-
-    .content {
-      width: auto !important;
-    }
-
   card:
     type: entities
     entities:
@@ -17,12 +7,6 @@ binary_sensor.house_mode:
 
 binary_sensor.kitchen_motion_occupancy:
   title: Kitchen motion
-  style: &broad_popup_style
-    "--ha-card-border-radius": 0 0 0.8em 0.8em
-    border-radius: 0.8em
-    opacity: 0.95
-    margin-bottom: 200px
-    width: 40%
   card:
     type: vertical-stack
     cards:
@@ -44,7 +28,6 @@ binary_sensor.kitchen_motion_occupancy:
 
 binary_sensor.hallway_motion_occupancy:
   title: Hallway motion
-  style: *broad_popup_style
   card:
     type: vertical-stack
     cards:
@@ -67,23 +50,10 @@ binary_sensor.hallway_motion_occupancy:
 
 sensor.synology_type_volume_1:
   title: Platinum
-  style: *popup_style
   card:
     type: custom:decluttering-card
     template: platinum_card
 
-binary_sensor.camera_state:
-  title: Security camera
-  style: *popup_style
-  card:
-    type: vertical-stack
-    cards:
-      - type: picture-entity
-        aspect_ratio: 50%
-        entity: camera.mercury_amcrest_1
-        show_name: true
-        show_state: true
-
 media_player.living_room:
   title: Living room Sonos
   card:
@@ -126,7 +96,6 @@ media_player.master_bedroom:
 
 media_player.nvidia_shield: &nvidia_shield
   title: TV
-  style: *popup_style
   card:
     type: vertical-stack
     cards:
@@ -227,7 +196,6 @@ sensor.active_motion_sensors:
             variables:
               background_color: rgba(60, 60, 60, 1)
 
-
 sensor.open_door_count:
   title: Open doors
   card:
@@ -293,71 +261,128 @@ sensor.open_window_count:
               background_color: rgba(60, 60, 60, 1)
 
 sensor.bedroom_weather_temperature:
-  title: Bedroom climate
-  style: *broad_popup_style
+  title: Bedroom Climate
   card:
     type: custom:decluttering-card
     template: bedroom_climate_card
 
 sensor.multisensor_6_temperature:
-  title: Living room climate
-  style: *broad_popup_style
+  title: Living Room Climate
   card:
     type: custom:decluttering-card
     template: living_room_climate_card
 
 sensor.bedroom_weather_humidity:
-  title: Bedroom humidity
-  style: *broad_popup_style
+  title: Bedroom Humidity
   card:
     type: custom:decluttering-card
     template: bedroom_humidity_card
 
+sensor.kitchen_weather_temperature:
+  title: Kitchen Temperature
+  card:
+    type: custom:decluttering-card
+    template: climate_card
+    variables:
+      - main_entity: sensor.kitchen_weather_temperature
+      - left_entity: sensor.kitchen_weather_humidity
+      - right_entity: sensor.kitchen_weather_pressure
+
+sensor.kitchen_weather_humidity:
+  title: Kitchen Humidity
+  card:
+    type: custom:decluttering-card
+    template: climate_card
+    variables:
+      - main_entity: sensor.kitchen_weather_humidity
+      - main_name: Humidity
+      - left_entity: sensor.kitchen_weather_temperature
+      - left_name: Temperature
+      - right_entity: sensor.kitchen_weather_pressure
+
+sensor.bathroom_weather_temperature:
+  title: Bathroom Temperature
+  card:
+    type: custom:decluttering-card
+    template: climate_card
+    variables:
+      - main_entity: sensor.bathroom_weather_temperature
+      - left_entity: sensor.bathroom_weather_humidity
+      - right_entity: sensor.bathroom_weather_pressure
+
+sensor.bathroom_weather_humidity:
+  title: Bathroom Humidity
+  card:
+    type: custom:decluttering-card
+    template: climate_card
+    variables:
+      - main_entity: sensor.bathroom_weather_humidity
+      - main_name: Humidity
+      - left_entity: sensor.bathroom_weather_temperature
+      - left_name: Temperature
+      - right_entity: sensor.bathroom_weather_pressure
+
+
+sensor.hallway_weather_temperature:
+  title: Hallway Temperature
+  card:
+    type: custom:decluttering-card
+    template: climate_card
+    variables:
+      - main_entity: sensor.hallway_weather_temperature
+      - left_entity: sensor.hallway_weather_humidity
+      - right_entity: sensor.hallway_weather_pressure
+
+sensor.hallway_weather_humidity:
+  title: Hallway Humidity
+  card:
+    type: custom:decluttering-card
+    template: climate_card
+    variables:
+      - main_entity: sensor.hallway_weather_humidity
+      - main_name: Humidity
+      - left_entity: sensor.hallway_weather_temperature
+      - left_name: Temperature
+      - right_entity: sensor.hallway_weather_pressure
+
 sensor.purifier_air_quality:
   title: Bedroom air quality
-  style: *broad_popup_style
   card:
     type: custom:decluttering-card
     template: bedroom_air_quality_card
 
 sensor.purifier_allergens:
   title: Bedroom allergen index
-  style: *broad_popup_style
   card:
     type: custom:decluttering-card
     template: bedroom_allergen_index_card
 
 fan.philips_airpurifier:
   title: Air purifier
-  style: *popup_style
   card:
     type: custom:decluttering-card
     template: philips_airpurifier_card
 
 switch.titanium:
   title: Titanium
-  style: *popup_style
   card:
     type: custom:decluttering-card
     template: titanium_card
 
 sensor.fast_com_download:
   title: Network Speed
-  style: *broad_popup_style
   card:
     type: custom:decluttering-card
     template: network_card
 
 binary_sensor.pi_hole_enabled:
   title: Pi-Hole
-  style: *broad_popup_style
   card:
     type: custom:decluttering-card
     template: pi_hole_card
 
 input_boolean.alarm_enabled:
   title: Alarm
-  style: *popup_style
   card:
     type: vertical-stack
     cards:
@@ -377,14 +402,12 @@ input_boolean.alarm_enabled:
 
 script.brita_pour_water:
   title: Brita
-  style: *popup_style
   card:
     type: custom:decluttering-card
     template: brita_card
 
 sensor.desk_outlet_power:
   title: Desk power
-  style: *popup_style
   card:
     type: entities
     entities:
@@ -409,7 +432,6 @@ sensor.desk_outlet_power:
 
 sensor.average_temperature:
   title: Temperatures
-  style: *popup_style
   card:
     type: vertical-stack
     cards:
@@ -469,7 +491,6 @@ sensor.average_temperature:
 
 sensor.average_humidity:
   title: Humidities
-  style: *popup_style
   card:
     type: vertical-stack
     cards:
@@ -556,7 +577,6 @@ sensor.average_humidity:
 
 vacuum.vacuum:
   title: Vacuum
-  style: *broad_popup_style
   card:
     type: custom:layout-card
     layout_type: custom:horizontal-layout