diff --git a/config/lovelace/decluttering_templates/cards/bedroom_air_quality_card.yaml b/config/lovelace/decluttering_templates/cards/bedroom_air_quality_card.yaml
new file mode 100644
index 0000000..1d838b1
--- /dev/null
+++ b/config/lovelace/decluttering_templates/cards/bedroom_air_quality_card.yaml
@@ -0,0 +1,22 @@
+bedroom_air_quality_card:
+  card:
+    type: vertical-stack
+    cards:
+      - type: "custom:mini-graph-card"
+        entities:
+          - sensor.purifier_air_quality
+        cache: false
+        group_by: hour
+        hours_to_show: 72
+        line_width: 2
+        show:
+          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)"
diff --git a/config/lovelace/decluttering_templates/cards/bedroom_allergen_index_card.yaml b/config/lovelace/decluttering_templates/cards/bedroom_allergen_index_card.yaml
new file mode 100644
index 0000000..8b550a1
--- /dev/null
+++ b/config/lovelace/decluttering_templates/cards/bedroom_allergen_index_card.yaml
@@ -0,0 +1,22 @@
+bedroom_allergen_index_card:
+  card:
+    type: vertical-stack
+    cards:
+      - type: "custom:mini-graph-card"
+        entities:
+          - sensor.purifier_allergens
+        cache: false
+        group_by: hour
+        hours_to_show: 72
+        line_width: 2
+        show:
+          average: true
+          extrema: true
+          fill: true
+        color_thresholds:
+          - value: 2
+            color: "var(--color-green)"
+          - value: 4
+            color: "var(--color-blue)"
+          - value: 5
+            color: "var(--color-red)"
diff --git a/config/lovelace/decluttering_templates/cards/bedroom_humidity_card.yaml b/config/lovelace/decluttering_templates/cards/bedroom_humidity_card.yaml
index ae280c6..9491267 100644
--- a/config/lovelace/decluttering_templates/cards/bedroom_humidity_card.yaml
+++ b/config/lovelace/decluttering_templates/cards/bedroom_humidity_card.yaml
@@ -3,21 +3,31 @@ bedroom_humidity_card:
     type: vertical-stack
     cards:
       - type: "custom:mini-graph-card"
-        animate: true
-        line_width: 3
-        points_per_hour: 1
+        entities:
+          - sensor.bedroom_weather_humidity
+        cache: false
+        group_by: hour
+        hours_to_show: 72
+        line_width: 2
         show:
           average: true
           extrema: true
-        entities:
-          - sensor.bedroom_weather_humidity
+        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: horizontal-stack
         cards:
           - type: "custom:mini-graph-card"
             font_size: 75
             icon: "mdi:thermometer"
-            line_color: green
+            line_color: var(--accent-color)
             line_width: 8
             entities:
               - sensor.bedroom_weather_temperature
@@ -33,7 +43,7 @@ bedroom_humidity_card:
             name: Air Quality
             font_size: 75
             icon: "mdi:weather-windy"
-            line_color: "#e74c3c"
+            line_color: var(--accent-color)
             line_width: 8
             entities:
               - sensor.purifier_air_quality
diff --git a/config/lovelace/decluttering_templates/cards/bedroom_temperature_card.yaml b/config/lovelace/decluttering_templates/cards/bedroom_temperature_card.yaml
index 3633a36..d6b63e7 100644
--- a/config/lovelace/decluttering_templates/cards/bedroom_temperature_card.yaml
+++ b/config/lovelace/decluttering_templates/cards/bedroom_temperature_card.yaml
@@ -3,14 +3,23 @@ bedroom_temperature_card:
     type: vertical-stack
     cards:
       - type: "custom:mini-graph-card"
-        animate: true
-        line_width: 3
-        points_per_hour: 1
+        entities:
+          - sensor.bedroom_weather_temperature
+        cache: false
+        group_by: hour
+        hours_to_show: 72
+        line_width: 2
         show:
           average: true
           extrema: true
-        entities:
-          - sensor.bedroom_weather_temperature
+          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:
@@ -18,7 +27,7 @@ bedroom_temperature_card:
             name: Humidity
             font_size: 75
             icon: "mdi:water"
-            line_color: green
+            line_color: "var(--color-blue)"
             line_width: 8
             entities:
               - sensor.bedroom_weather_humidity
@@ -27,14 +36,14 @@ bedroom_temperature_card:
             entities:
               - sensor.bedroom_weather_pressure
             font_size: 75
-            line_color: var(--accent-color)
+            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: "#e74c3c"
+            line_color: "var(--color-blue)"
             line_width: 8
             entities:
               - sensor.purifier_air_quality
diff --git a/config/lovelace/decluttering_templates/cards/titanium_card.yaml b/config/lovelace/decluttering_templates/cards/titanium_card.yaml
index c242b82..6f68ecd 100644
--- a/config/lovelace/decluttering_templates/cards/titanium_card.yaml
+++ b/config/lovelace/decluttering_templates/cards/titanium_card.yaml
@@ -66,11 +66,11 @@ titanium_card:
                     entity: sensor.titanium_cpu_usage
                   - color: green
                     entity: sensor.titanium_memory_used_percent
-                group: false
                 points_per_hour: 1
                 line_width: 3
                 hour24: true
                 hours_to_show: 24
+                group_by: hour
                 show:
                   fill: fade
                   icon: true
diff --git a/config/lovelace/home_dashboard/master_bedroom_dashboard.yaml b/config/lovelace/home_dashboard/master_bedroom_dashboard.yaml
index 67481a4..d07bf54 100644
--- a/config/lovelace/home_dashboard/master_bedroom_dashboard.yaml
+++ b/config/lovelace/home_dashboard/master_bedroom_dashboard.yaml
@@ -132,9 +132,9 @@
                 entity: sensor.purifier_air_quality
                 variables:
                   min_value: 1
-                  max_value: 90
-                  normal_value: 10
-                  high_value: 30
+                  max_value: 30
+                  normal_value: 1
+                  high_value: 20
               - type: custom:button-card
                 template:
                   - small
@@ -142,9 +142,9 @@
                 entity: sensor.purifier_allergens
                 variables:
                   min_value: 1
-                  max_value: 90
-                  normal_value: 10
-                  high_value: 30
+                  max_value: 30
+                  normal_value: 1
+                  high_value: 10
 
           - type: horizontal-stack
             cards:
diff --git a/config/lovelace/popup_cards.yaml b/config/lovelace/popup_cards.yaml
index a1e286c..b9e0c3e 100644
--- a/config/lovelace/popup_cards.yaml
+++ b/config/lovelace/popup_cards.yaml
@@ -202,19 +202,33 @@ light.living_room_main_lights:
           name: Toggle
 
 sensor.bedroom_weather_temperature:
-  title: Bedroom climate
+  title: Bedroom temperature
   style: *broad_popup_style
   card:
     type: custom:decluttering-card
     template: bedroom_temperature_card
 
 sensor.bedroom_weather_humidity:
-  title: Bedroom climate
+  title: Bedroom humidity
   style: *broad_popup_style
   card:
     type: custom:decluttering-card
     template: bedroom_humidity_card
 
+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