diff --git a/mobile_dashboard.yaml b/mobile_dashboard.yaml
index f40b1bb..b4f9079 100644
--- a/mobile_dashboard.yaml
+++ b/mobile_dashboard.yaml
@@ -1259,7 +1259,7 @@ views:
                     styles: |-
                       .bubble-button-background {
                         opacity: 1 !important;
-                        background-color: ${state === 'on' ? 'var(--accent-color)' : 'var(--background-color-2)'} !important;
+                        background-color: ${state === 'on' ? 'var(--bubble-accent-color)' : 'var(--background-color-2)'} !important;
                       }
                     modules:
                       - default
@@ -1294,7 +1294,7 @@ views:
                     styles: |-
                       .bubble-button-background {
                         opacity: 1 !important;
-                        background-color: ${state === 'on' ? 'var(--accent-color)' : 'var(--background-color-2)'} !important;
+                        background-color: ${state === 'on' ? 'var(--bubble-accent-color)' : 'var(--background-color-2)'} !important;
                       }
                     modules:
                       - default
@@ -1644,13 +1644,13 @@ views:
                     variables:
                       - name: Motion
                       - entity: binary_sensor.basement_studio_motion
-                      - color: accent-color
+                      - color: bubble-accent-color
                   - type: custom:streamline-card
                     template: state_color_button
                     variables:
                       - name: Occupied
                       - entity: binary_sensor.basement_occupied
-                      - color: accent-color
+                      - color: bubble-accent-color
               - type: custom:streamline-card
                 template: popup_timer_card
                 variables:
@@ -1850,19 +1850,19 @@ views:
                     variables:
                       name: Front Motion
                       entity: binary_sensor.living_room_front_motion
-                      color: accent-color
+                      color: bubble-accent-color
                   - type: custom:streamline-card
                     template: state_color_button
                     variables:
                       name: Back Motion
                       entity: binary_sensor.living_room_back_motion
-                      color: accent-color
+                      color: bubble-accent-color
                   - type: custom:streamline-card
                     template: state_color_button
                     variables:
                       name: Occupied
                       entity: binary_sensor.living_room_occupied
-                      color: accent-color
+                      color: bubble-accent-color
               - type: custom:streamline-card
                 template: popup_timer_card
                 variables:
@@ -2020,13 +2020,13 @@ views:
                     variables:
                       - name: Motion
                       - entity: binary_sensor.downstairs_bathroom_motion
-                      - color: accent-color
+                      - color: bubble-accent-color
                   - type: custom:streamline-card
                     template: state_color_button
                     variables:
                       - name: Occupied
                       - entity: binary_sensor.downstairs_bathroom_occupied
-                      - color: accent-color
+                      - color: bubble-accent-color
               - type: custom:bubble-card
                 card_type: separator
                 name: Security
@@ -2207,13 +2207,13 @@ views:
                     variables:
                       - name: Motion
                       - entity: binary_sensor.mud_room_motion
-                      - color: accent-color
+                      - color: bubble-accent-color
                   - type: custom:streamline-card
                     template: state_color_button
                     variables:
                       - name: Occupied
                       - entity: binary_sensor.mud_room_occupied
-                      - color: accent-color
+                      - color: bubble-accent-color
               - type: custom:bubble-card
                 card_type: separator
                 name: Security
@@ -2300,13 +2300,13 @@ views:
                     variables:
                       - name: Motion
                       - entity: binary_sensor.stairwell_bottom_motion
-                      - color: accent-color
+                      - color: bubble-accent-color
                   - type: custom:streamline-card
                     template: state_color_button
                     variables:
                       - name: Occupied
                       - entity: binary_sensor.stairwell_occupied
-                      - color: accent-color
+                      - color: bubble-accent-color
               - type: custom:bubble-card
                 card_type: separator
                 name: Security
@@ -2397,13 +2397,13 @@ views:
                     variables:
                       - name: Motion
                       - entity: binary_sensor.stairwell_top_motion
-                      - color: accent-color
+                      - color: bubble-accent-color
                   - type: custom:streamline-card
                     template: state_color_button
                     variables:
                       - name: Occupied
                       - entity: binary_sensor.upstairs_hallway_occupied
-                      - color: accent-color
+                      - color: bubble-accent-color
               - type: custom:bubble-card
                 card_type: separator
                 name: Security
@@ -2521,13 +2521,13 @@ views:
                     variables:
                       - name: Motion
                       - entity: binary_sensor.upstairs_bathroom_motion
-                      - color: accent-color
+                      - color: bubble-accent-color
                   - type: custom:streamline-card
                     template: state_color_button
                     variables:
                       - name: Occupied
                       - entity: binary_sensor.upstairs_bathroom_occupied
-                      - color: accent-color
+                      - color: bubble-accent-color
               - type: custom:bubble-card
                 card_type: separator
                 name: Security
@@ -2713,7 +2713,7 @@ views:
                           styles: |-
                             .bubble-button-background {
                               opacity: 1 !important;
-                              background-color: ${state === 'on' ? 'var(--accent-color)' : 'var(--background-color-2)'} !important;
+                              background-color: ${state === 'on' ? 'var(--bubble-accent-color)' : 'var(--background-color-2)'} !important;
                             }
                         - type: custom:bubble-card
                           card_type: button
@@ -2801,13 +2801,13 @@ views:
                     variables:
                       - name: Motion
                       - entity: binary_sensor.master_bedroom_motion
-                      - color: accent-color
+                      - color: bubble-accent-color
                   - type: custom:streamline-card
                     template: state_color_button
                     variables:
                       - name: Occupied
                       - entity: binary_sensor.master_bedroom_occupied
-                      - color: accent-color
+                      - color: bubble-accent-color
               - type: custom:bubble-card
                 card_type: separator
                 name: Security
@@ -3009,13 +3009,13 @@ views:
                     variables:
                       - name: Motion
                       - entity: binary_sensor.kallen_bedroom_motion
-                      - color: accent-color
+                      - color: bubble-accent-color
                   - type: custom:streamline-card
                     template: state_color_button
                     variables:
                       - name: Occupied
                       - entity: binary_sensor.kallen_bedroom_occupied
-                      - color: accent-color
+                      - color: bubble-accent-color
               - type: custom:bubble-card
                 card_type: separator
                 name: Security
@@ -3184,7 +3184,7 @@ views:
                           styles: |-
                             .bubble-button-background {
                               opacity: 1 !important;
-                              background-color: ${state === 'on' ? 'var(--accent-color)' : 'var(--background-color-2)'} !important;
+                              background-color: ${state === 'on' ? 'var(--bubble-accent-color)' : 'var(--background-color-2)'} !important;
                             }
                         - type: custom:bubble-card
                           card_type: button
@@ -3301,13 +3301,13 @@ views:
                     variables:
                       - name: Motion
                       - entity: binary_sensor.emma_bedroom_motion
-                      - color: accent-color
+                      - color: bubble-accent-color
                   - type: custom:streamline-card
                     template: state_color_button
                     variables:
                       - name: Occupied
                       - entity: binary_sensor.emma_bedroom_occupied
-                      - color: accent-color
+                      - color: bubble-accent-color
               - type: custom:bubble-card
                 card_type: separator
                 name: Security
@@ -7417,7 +7417,7 @@ views:
               - default
               - state_color_button
             state_color_button:
-              color: accent-color
+              color: bubble-accent-color
           - type: custom:bubble-card
             card_type: button
             button_type: state