diff --git a/main_dashboard.yaml b/main_dashboard.yaml
index c141d5d..c2ab585 100644
--- a/main_dashboard.yaml
+++ b/main_dashboard.yaml
@@ -772,26 +772,6 @@ views:
                           'on': hue:lightstrip
                           'off': hue:lightstrip-off
                           unavailable: mdi:map-marker-question
-                  - type: custom:paper-buttons-row
-                    buttons:
-                      - entity: light.christmas_tree
-                        name: Tree
-                        layout: icon|name_state
-                        state:
-                          case: first
-                        state_icons:
-                          'on': mdi:pine-tree-variant
-                          'off': mdi:pine-tree-variant-outline
-                          unavailable: mdi:map-marker-question
-                      - entity: light.christmas_lights_front_window
-                        name: Window
-                        layout: icon|name_state
-                        state:
-                          case: first
-                        state_icons:
-                          'on': mdi:string-lights
-                          'off': mdi:string-lights-off
-                          unavailable: mdi:map-marker-question
               - type: entities
                 entities:
                   - entity: input_select.living_room_scenes
@@ -809,6 +789,32 @@ views:
                     name: FW1
                   - entity: binary_sensor.front_window_2
                     name: FW2
+                  - entity: binary_sensor.front_window_3
+                    name: FW3
+              - type: glance
+                show_name: true
+                show_icon: true
+                show_state: true
+                state_color: true
+                entities:
+                  - entity: binary_sensor.side_window_1
+                    name: SW1
+                  - entity: binary_sensor.side_window_2
+                    name: SW2
+                  - entity: binary_sensor.side_window_3
+                    name: SW3
+                  - entity: binary_sensor.side_window_4
+                    name: SW4
+              - type: glance
+                show_name: true
+                show_icon: true
+                show_state: true
+                state_color: true
+                entities:
+                  - entity: binary_sensor.back_window_1
+                    name: BW1
+                  - entity: binary_sensor.back_window_2
+                    name: BW2
               - type: glance
                 show_name: true
                 show_icon: true
@@ -1225,6 +1231,16 @@ views:
               - type: entities
                 entities:
                   - entity: input_select.downstairs_bathroom_scenes
+              - type: glance
+                show_name: true
+                show_icon: true
+                show_state: true
+                state_color: true
+                entities:
+                  - entity: binary_sensor.downstairs_bathroom_window_1
+                    name: Back
+                  - entity: binary_sensor.downstairs_bathroom_window_2
+                    name: Side
               - type: glance
                 show_name: true
                 show_icon: true
@@ -1390,6 +1406,9 @@ views:
                 state_color: true
                 entities:
                   - entity: binary_sensor.kitchen_big_window
+                    name: Main
+                  - entity: binary_sensor.kitchen_sink_window
+                    name: Sink
       - type: grid
         cards:
           - type: custom:stack-in-card
@@ -1616,7 +1635,7 @@ views:
                 state_color: true
                 entities:
                   - entity: binary_sensor.stairway_window_lower
-                    name: SW1
+                    name: Stairwell Bottom
               - type: glance
                 show_name: true
                 show_icon: true
@@ -1741,7 +1760,7 @@ views:
                 state_color: true
                 entities:
                   - entity: binary_sensor.stairway_window_upper
-                    name: SW2
+                    name: Stairwell Top
               - type: glance
                 show_name: true
                 show_icon: true
diff --git a/mobile_dashboard.yaml b/mobile_dashboard.yaml
index 716a0f0..4b43a47 100644
--- a/mobile_dashboard.yaml
+++ b/mobile_dashboard.yaml
@@ -2404,6 +2404,20 @@ views:
                       - name: Occupied
                       - entity: binary_sensor.upstairs_hallway_occupied
                       - color: accent-color
+              - type: custom:bubble-card
+                card_type: separator
+                name: Security
+                icon: mdi:security
+              - type: horizontal-stack
+                cards:
+                  - type: custom:streamline-card
+                    template: contact_sensor_button
+                    variables:
+                      name: Window
+                      entity: binary_sensor.stairway_window_upper
+                      color: error-color
+                  - type: custom:bubble-card
+                    card_type: empty-column
               - type: custom:streamline-card
                 template: popup_timer_card
                 variables:
@@ -2514,6 +2528,20 @@ views:
                       - name: Occupied
                       - entity: binary_sensor.upstairs_bathroom_occupied
                       - color: accent-color
+              - type: custom:bubble-card
+                card_type: separator
+                name: Security
+                icon: mdi:security
+              - type: horizontal-stack
+                cards:
+                  - type: custom:streamline-card
+                    template: contact_sensor_button
+                    variables:
+                      name: Window
+                      entity: binary_sensor.upstairs_bathroom_window
+                      color: error-color
+                  - type: custom:bubble-card
+                    card_type: empty-column
               - type: custom:streamline-card
                 template: popup_timer_card
                 variables: