diff --git a/lovelace/krauss-home.yaml b/lovelace/krauss-home.yaml
index 9ce752f..a00e3d1 100644
--- a/lovelace/krauss-home.yaml
+++ b/lovelace/krauss-home.yaml
@@ -9,17 +9,23 @@ views:
     icon: mdi:home
     title: Overview
     cards:
-      # Early Morning Scenes (conditional; Midnight - 8AM)
-      - type: vertical-stack
+      # Early Morning Scenes (conditional)
+      - type: conditional
         title: Morning Scenes
+        conditions:
+          - entity: binary_sensor.before_dawn
+            state: "on"
         cards:
           - type: entities
             entities:
               - scene.dining_room_dim
 
-      # Evening Scenes (conditional; 4 - 7PM)
-      - type: vertical-stack
+      # Evening Scenes (conditional)
+      - type: conditional
         title: Evening Scenes
+        conditions:
+          - entity: binary_sensor.evening
+            state: "on"
         cards:
           - type: entities
             entities:
@@ -27,9 +33,12 @@ views:
               - scene.pergola_low
               - scene.pergola_full
 
-      # Nighttime Scenes (conditional; 7PM - Midnight)
-      - type: vertical-stack
+      # Nighttime Scenes (conditional)
+      - type: conditional
         title: Night Scenes
+        conditions:
+          - entity: binary_sensor.night
+            state: "on"
         cards:
           - type: entities
             entities:
@@ -37,3 +46,4 @@ views:
               - scene.home_theater_off
               - scene.pergola_off
 
+      #