diff --git a/mobile_dashboard.yaml b/mobile_dashboard.yaml
index d64ac5c..3bd8254 100644
--- a/mobile_dashboard.yaml
+++ b/mobile_dashboard.yaml
@@ -196,51 +196,6 @@ streamline_templates:
           show_state: false
           tap_action:
             action: toggle
-  popup_security_button:
-    defaults:
-      - name: ''
-    card:
-      type: custom:bubble-card
-      card_type: button
-      button_type: state
-      entity: '[[entity]]'
-      name: '[[name]]'
-      double_tap_action:
-        action: none
-      hold_action:
-        action: none
-      button_action:
-        double_tap_action:
-          action: none
-        hold_action:
-          action: none
-      modules:
-        - default
-        - popup_security_button
-  popup_accent_color_button:
-    defaults:
-      - name: ''
-    card:
-      type: custom:bubble-card
-      card_type: button
-      button_type: state
-      entity: '[[entity]]'
-      name: '[[name]]'
-      show_state: true
-      tap_action:
-        action: more-info
-      double_tap_action:
-        action: none
-      hold_action:
-        action: none
-      button_action:
-        double_tap_action:
-          action: none
-        hold_action:
-          action: none
-      modules:
-        - default
-        - popup_accent_color_button
   popup_temperature_button:
     defaults:
       - name: ''
@@ -313,6 +268,32 @@ streamline_templates:
         modules:
           - default
           - popup_timer_card
+  state_color_button:
+    defaults:
+      - name: ''
+    card:
+      type: custom:bubble-card
+      card_type: button
+      button_type: state
+      entity: '[[entity]]'
+      name: '[[name]]'
+      show_state: true
+      tap_action:
+        action: more-info
+      double_tap_action:
+        action: none
+      hold_action:
+        action: none
+      button_action:
+        double_tap_action:
+          action: none
+        hold_action:
+          action: none
+      modules:
+        - default
+        - state_color_button
+      state_color_button:
+        color: '[[color]]'
 views:
   - title: Home
     path: home
@@ -1398,15 +1379,17 @@ views:
               - type: horizontal-stack
                 cards:
                   - type: custom:streamline-card
-                    template: popup_accent_color_button
+                    template: state_color_button
                     variables:
-                      name: Motion
-                      entity: binary_sensor.basement_studio_motion
+                      - name: Motion
+                      - entity: binary_sensor.basement_studio_motion
+                      - color: accent-color
                   - type: custom:streamline-card
-                    template: popup_accent_color_button
+                    template: state_color_button
                     variables:
                       - name: Occupied
                       - entity: binary_sensor.basement_occupied
+                      - color: accent-color
               - type: custom:streamline-card
                 template: popup_timer_card
                 variables:
@@ -1602,20 +1585,23 @@ views:
               - type: horizontal-stack
                 cards:
                   - type: custom:streamline-card
-                    template: popup_accent_color_button
+                    template: state_color_button
                     variables:
                       - name: Front Motion
                       - entity: binary_sensor.living_room_front_motion
+                      - color: accent-color
                   - type: custom:streamline-card
-                    template: popup_accent_color_button
+                    template: state_color_button
                     variables:
                       - name: Back Motion
                       - entity: binary_sensor.living_room_back_motion
+                      - color: accent-color
                   - type: custom:streamline-card
-                    template: popup_accent_color_button
+                    template: state_color_button
                     variables:
                       - name: Occupied
                       - entity: binary_sensor.living_room_occupied
+                      - color: accent-color
               - type: custom:streamline-card
                 template: popup_timer_card
                 variables:
@@ -1628,10 +1614,11 @@ views:
               - type: horizontal-stack
                 cards:
                   - type: custom:streamline-card
-                    template: popup_security_button
+                    template: state_color_button
                     variables:
                       - name: Door
                       - entity: binary_sensor.front_door
+                      - color: error-color
                   - type: custom:bubble-card
                     card_type: empty-column
                   - type: custom:bubble-card
@@ -1639,54 +1626,63 @@ views:
               - type: horizontal-stack
                 cards:
                   - type: custom:streamline-card
-                    template: popup_security_button
+                    template: state_color_button
                     variables:
                       - name: Front 1
                       - entity: binary_sensor.front_window_1
+                      - color: error-color
                   - type: custom:streamline-card
-                    template: popup_security_button
+                    template: state_color_button
                     variables:
                       - name: Front 2
                       - entity: binary_sensor.front_window_2
+                      - color: error-color
                   - type: custom:streamline-card
-                    template: popup_security_button
+                    template: state_color_button
                     variables:
                       - name: Front 3
                       - entity: binary_sensor.front_window_3
+                      - color: error-color
               - type: horizontal-stack
                 cards:
                   - type: custom:streamline-card
-                    template: popup_security_button
+                    template: state_color_button
                     variables:
                       - name: Side 1
                       - entity: binary_sensor.side_window_1
+                      - color: error-color
                   - type: custom:streamline-card
-                    template: popup_security_button
+                    template: state_color_button
                     variables:
                       - name: Side 2
                       - entity: binary_sensor.side_window_2
+                      - color: error-color
                   - type: custom:streamline-card
-                    template: popup_security_button
+                    template: state_color_button
                     variables:
                       - name: Side 3
                       - entity: binary_sensor.side_window_3
+                      - color: error-color
               - type: horizontal-stack
                 cards:
                   - type: custom:streamline-card
-                    template: popup_security_button
+                    template: state_color_button
                     variables:
                       - name: Side 4
                       - entity: binary_sensor.side_window_4
+                      - color: error-color
                   - type: custom:streamline-card
-                    template: popup_security_button
+                    template: state_color_button
                     variables:
                       - name: Back 1
                       - entity: binary_sensor.back_window_1
+                      - color: error-color
                   - type: custom:streamline-card
-                    template: popup_security_button
+                    template: state_color_button
                     variables:
                       - name: Back 2
                       - entity: binary_sensor.back_window_2
+                      - color: error-color
           - type: vertical-stack
             cards:
               - type: custom:bubble-card
@@ -1759,15 +1755,17 @@ views:
               - type: horizontal-stack
                 cards:
                   - type: custom:streamline-card
-                    template: popup_accent_color_button
+                    template: state_color_button
                     variables:
                       - name: Motion
                       - entity: binary_sensor.downstairs_bathroom_motion
+                      - color: accent-color
                   - type: custom:streamline-card
-                    template: popup_accent_color_button
+                    template: state_color_button
                     variables:
                       - name: Occupied
                       - entity: binary_sensor.downstairs_bathroom_occupied
+                      - color: accent-color
               - type: custom:bubble-card
                 card_type: separator
                 name: Security
@@ -1775,15 +1773,17 @@ views:
               - type: horizontal-stack
                 cards:
                   - type: custom:streamline-card
-                    template: popup_security_button
+                    template: state_color_button
                     variables:
                       - name: Back
                       - entity: binary_sensor.downstairs_bathroom_window_1
+                      - color: error-color
                   - type: custom:streamline-card
-                    template: popup_security_button
+                    template: state_color_button
                     variables:
                       - name: Side
                       - entity: binary_sensor.downstairs_bathroom_window_2
+                      - color: error-color
               - type: custom:streamline-card
                 template: popup_timer_card
                 variables:
@@ -1869,15 +1869,17 @@ views:
               - type: horizontal-stack
                 cards:
                   - type: custom:streamline-card
-                    template: popup_security_button
+                    template: state_color_button
                     variables:
                       - name: Big Window
                       - entity: binary_sensor.kitchen_big_window
+                      - color: error-color
                   - type: custom:streamline-card
-                    template: popup_security_button
+                    template: state_color_button
                     variables:
                       - name: Sink Window
                       - entity: binary_sensor.kitchen_sink_window
+                      - color: error-color
           - type: vertical-stack
             cards:
               - type: custom:bubble-card
@@ -1940,15 +1942,17 @@ views:
               - type: horizontal-stack
                 cards:
                   - type: custom:streamline-card
-                    template: popup_accent_color_button
+                    template: state_color_button
                     variables:
                       - name: Motion
                       - entity: binary_sensor.mud_room_motion
+                      - color: accent-color
                   - type: custom:streamline-card
-                    template: popup_accent_color_button
+                    template: state_color_button
                     variables:
                       - name: Occupied
                       - entity: binary_sensor.mud_room_occupied
+                      - color: accent-color
               - type: custom:bubble-card
                 card_type: separator
                 name: Security
@@ -1956,15 +1960,17 @@ views:
               - type: horizontal-stack
                 cards:
                   - type: custom:streamline-card
-                    template: popup_security_button
+                    template: state_color_button
                     variables:
                       - name: Back Door
                       - entity: binary_sensor.back_door
+                      - color: error-color
                   - type: custom:streamline-card
-                    template: popup_security_button
+                    template: state_color_button
                     variables:
                       - name: Window
                       - entity: binary_sensor.mud_room_window
+                      - color: error-color
               - type: custom:streamline-card
                 template: popup_timer_card
                 variables:
@@ -2029,15 +2035,17 @@ views:
               - type: horizontal-stack
                 cards:
                   - type: custom:streamline-card
-                    template: popup_accent_color_button
+                    template: state_color_button
                     variables:
                       - name: Motion
                       - entity: binary_sensor.stairwell_bottom_motion
+                      - color: accent-color
                   - type: custom:streamline-card
-                    template: popup_accent_color_button
+                    template: state_color_button
                     variables:
                       - name: Occupied
                       - entity: binary_sensor.stairwell_occupied
+                      - color: accent-color
               - type: custom:bubble-card
                 card_type: separator
                 name: Security
@@ -2045,10 +2053,11 @@ views:
               - type: horizontal-stack
                 cards:
                   - type: custom:streamline-card
-                    template: popup_security_button
+                    template: state_color_button
                     variables:
                       - name: Window
                       - entity: binary_sensor.stairway_window_lower
+                      - color: error-color
                   - type: custom:bubble-card
                     card_type: empty-column
               - type: custom:streamline-card
@@ -2123,15 +2132,17 @@ views:
               - type: horizontal-stack
                 cards:
                   - type: custom:streamline-card
-                    template: popup_accent_color_button
+                    template: state_color_button
                     variables:
                       - name: Motion
                       - entity: binary_sensor.stairwell_top_motion
+                      - color: accent-color
                   - type: custom:streamline-card
-                    template: popup_accent_color_button
+                    template: state_color_button
                     variables:
                       - name: Occupied
                       - entity: binary_sensor.upstairs_hallway_occupied
+                      - color: accent-color
               - type: custom:streamline-card
                 template: popup_timer_card
                 variables:
@@ -2231,15 +2242,17 @@ views:
               - type: horizontal-stack
                 cards:
                   - type: custom:streamline-card
-                    template: popup_accent_color_button
+                    template: state_color_button
                     variables:
                       - name: Motion
                       - entity: binary_sensor.upstairs_bathroom_motion
+                      - color: accent-color
                   - type: custom:streamline-card
-                    template: popup_accent_color_button
+                    template: state_color_button
                     variables:
                       - name: Occupied
                       - entity: binary_sensor.upstairs_bathroom_occupied
+                      - color: accent-color
               - type: custom:streamline-card
                 template: popup_timer_card
                 variables:
@@ -2490,15 +2503,17 @@ views:
               - type: horizontal-stack
                 cards:
                   - type: custom:streamline-card
-                    template: popup_accent_color_button
+                    template: state_color_button
                     variables:
                       - name: Motion
                       - entity: binary_sensor.master_bedroom_motion
+                      - color: accent-color
                   - type: custom:streamline-card
-                    template: popup_accent_color_button
+                    template: state_color_button
                     variables:
                       - name: Occupied
                       - entity: binary_sensor.master_bedroom_occupied
+                      - color: accent-color
               - type: custom:streamline-card
                 template: popup_timer_card
                 variables:
@@ -2673,15 +2688,17 @@ views:
               - type: horizontal-stack
                 cards:
                   - type: custom:streamline-card
-                    template: popup_accent_color_button
+                    template: state_color_button
                     variables:
                       - name: Motion
                       - entity: binary_sensor.kallen_bedroom_motion
+                      - color: accent-color
                   - type: custom:streamline-card
-                    template: popup_accent_color_button
+                    template: state_color_button
                     variables:
                       - name: Occupied
                       - entity: binary_sensor.kallen_bedroom_occupied
+                      - color: accent-color
               - type: custom:streamline-card
                 template: popup_timer_card
                 variables:
@@ -2907,15 +2924,17 @@ views:
               - type: horizontal-stack
                 cards:
                   - type: custom:streamline-card
-                    template: popup_accent_color_button
+                    template: state_color_button
                     variables:
                       - name: Motion
                       - entity: binary_sensor.emma_bedroom_motion
+                      - color: accent-color
                   - type: custom:streamline-card
-                    template: popup_accent_color_button
+                    template: state_color_button
                     variables:
                       - name: Occupied
                       - entity: binary_sensor.emma_bedroom_occupied
+                      - color: accent-color
               - type: custom:streamline-card
                 template: popup_timer_card
                 variables:
@@ -2961,15 +2980,17 @@ views:
               - type: horizontal-stack
                 cards:
                   - type: custom:streamline-card
-                    template: popup_security_button
+                    template: state_color_button
                     variables:
                       - name: Front
                       - entity: binary_sensor.front_door
+                      - color: error-color
                   - type: custom:streamline-card
-                    template: popup_security_button
+                    template: state_color_button
                     variables:
                       - name: Back
                       - entity: binary_sensor.back_door
+                      - color: error-color
               - type: custom:bubble-card
                 card_type: separator
                 name: Living Room
@@ -2977,54 +2998,63 @@ views:
               - type: horizontal-stack
                 cards:
                   - type: custom:streamline-card
-                    template: popup_security_button
+                    template: state_color_button
                     variables:
                       - name: Front 1
                       - entity: binary_sensor.front_window_1
+                      - color: error-color
                   - type: custom:streamline-card
-                    template: popup_security_button
+                    template: state_color_button
                     variables:
                       - name: Front 2
                       - entity: binary_sensor.front_window_2
+                      - color: error-color
                   - type: custom:streamline-card
-                    template: popup_security_button
+                    template: state_color_button
                     variables:
                       - name: Front 3
                       - entity: binary_sensor.front_window_3
+                      - color: error-color
               - type: horizontal-stack
                 cards:
                   - type: custom:streamline-card
-                    template: popup_security_button
+                    template: state_color_button
                     variables:
                       - name: Side 1
                       - entity: binary_sensor.side_window_1
+                      - color: error-color
                   - type: custom:streamline-card
-                    template: popup_security_button
+                    template: state_color_button
                     variables:
                       - name: Side 2
                       - entity: binary_sensor.side_window_2
+                      - color: error-color
                   - type: custom:streamline-card
-                    template: popup_security_button
+                    template: state_color_button
                     variables:
                       - name: Side 3
                       - entity: binary_sensor.side_window_3
+                      - color: error-color
               - type: horizontal-stack
                 cards:
                   - type: custom:streamline-card
-                    template: popup_security_button
+                    template: state_color_button
                     variables:
                       - name: Side 4
                       - entity: binary_sensor.side_window_4
+                      - color: error-color
                   - type: custom:streamline-card
-                    template: popup_security_button
+                    template: state_color_button
                     variables:
                       - name: Back 1
                       - entity: binary_sensor.back_window_1
+                      - color: error-color
                   - type: custom:streamline-card
-                    template: popup_security_button
+                    template: state_color_button
                     variables:
                       - name: Back 2
                       - entity: binary_sensor.back_window_2
+                      - color: error-color
               - type: custom:bubble-card
                 card_type: separator
                 name: Stairwell
@@ -3032,10 +3062,11 @@ views:
               - type: horizontal-stack
                 cards:
                   - type: custom:streamline-card
-                    template: popup_security_button
+                    template: state_color_button
                     variables:
                       - name: Window
                       - entity: binary_sensor.stairway_window_lower
+                      - color: error-color
                   - type: custom:bubble-card
                     card_type: empty-column
               - type: custom:bubble-card
@@ -3045,15 +3076,17 @@ views:
               - type: horizontal-stack
                 cards:
                   - type: custom:streamline-card
-                    template: popup_security_button
+                    template: state_color_button
                     variables:
                       - name: Big
                       - entity: binary_sensor.kitchen_big_window
+                      - color: error-color
                   - type: custom:streamline-card
-                    template: popup_security_button
+                    template: state_color_button
                     variables:
                       - name: Sink
                       - entity: binary_sensor.kitchen_sink_window
+                      - color: error-color
               - type: custom:bubble-card
                 card_type: separator
                 name: Mud Room
@@ -3061,10 +3094,11 @@ views:
               - type: horizontal-stack
                 cards:
                   - type: custom:streamline-card
-                    template: popup_security_button
+                    template: state_color_button
                     variables:
                       - name: Window
                       - entity: binary_sensor.mud_room_window
+                      - color: error-color
                   - type: custom:bubble-card
                     card_type: empty-column
               - type: custom:bubble-card
@@ -3074,15 +3108,17 @@ views:
               - type: horizontal-stack
                 cards:
                   - type: custom:streamline-card
-                    template: popup_security_button
+                    template: state_color_button
                     variables:
                       - name: Back
                       - entity: binary_sensor.downstairs_bathroom_window_1
+                      - color: error-color
                   - type: custom:streamline-card
-                    template: popup_security_button
+                    template: state_color_button
                     variables:
                       - name: Side
                       - entity: binary_sensor.downstairs_bathroom_window_2
+                      - color: error-color
               - type: custom:bubble-card
                 card_type: separator
                 name: Upstairs Hallway
@@ -3090,10 +3126,11 @@ views:
               - type: horizontal-stack
                 cards:
                   - type: custom:streamline-card
-                    template: popup_security_button
+                    template: state_color_button
                     variables:
                       - name: Window
                       - entity: binary_sensor.stairway_window_upper
+                      - color: error-color
                   - type: custom:bubble-card
                     card_type: empty_column
               - type: custom:bubble-card
@@ -3103,10 +3140,11 @@ views:
               - type: horizontal-stack
                 cards:
                   - type: custom:streamline-card
-                    template: popup_security_button
+                    template: state_color_button
                     variables:
                       - name: Window
                       - entity: binary_sensor.upstairs_bathroom_window
+                      - color: error-color
                   - type: custom:bubble-card
                     card_type: empty_column
           - type: vertical-stack
@@ -5856,4 +5894,26 @@ views:
         cards:
           - type: heading
             heading: New section
+          - type: custom:bubble-card
+            card_type: button
+            button_type: state
+            entity: input_boolean.gaming_mode
+            name: Gaming Mode
+            tap_action:
+              action: none
+            double_tap_action:
+              action: none
+            hold_action:
+              action: none
+            button_action:
+              tap_action:
+                action: none
+              double_tap_action:
+                action: none
+              hold_action:
+                action: none
+            show_state: false
+            columns: 2
+            modules:
+              - state_color_button
 title: ''