diff --git a/config/lovelace/button_card_templates/v3/primitives/v3_badge.yaml b/config/lovelace/button_card_templates/v3/primitives/v3_badge.yaml
index 0e4b502..79dddad 100644
--- a/config/lovelace/button_card_templates/v3/primitives/v3_badge.yaml
+++ b/config/lovelace/button_card_templates/v3/primitives/v3_badge.yaml
@@ -1,6 +1,6 @@
 v3_badge:
   variables:
-    state_size: 15px
+    state_size: 14px
   show_name: false
   show_icon: false
   show_state: true
diff --git a/config/lovelace/button_card_templates/v3/primitives/v3_button.yaml b/config/lovelace/button_card_templates/v3/primitives/v3_button.yaml
index 60e1651..917b9c0 100644
--- a/config/lovelace/button_card_templates/v3/primitives/v3_button.yaml
+++ b/config/lovelace/button_card_templates/v3/primitives/v3_button.yaml
@@ -29,7 +29,7 @@ v3_button:
       - bottom: 10px
       - left: 16px
       - font-weight: bold
-      - font-size: 13px
+      - font-size: 14px
       - color: "[[[ return variables.value_has_error ? 'red' : 'white' ]]]"
     name:
       - position: absolute
@@ -51,7 +51,7 @@ v3_button:
         icon:
           - color: var(--primary-color)
         state:
-          - color: "[[[ return variables.value_has_error ? 'red' : 'black' ]]]"
+          - color: "[[[ return variables.value_has_error ? 'red' : 'var(--v3-btn-state-color)' ]]]"
     - value: 'home'
       styles: *on_styles
     - value: 'recording'
diff --git a/config/lovelace/button_card_templates/v3/v3_button_brita_water.yaml b/config/lovelace/button_card_templates/v3/v3_button_brita_water.yaml
index d863ab8..b7e060a 100644
--- a/config/lovelace/button_card_templates/v3/v3_button_brita_water.yaml
+++ b/config/lovelace/button_card_templates/v3/v3_button_brita_water.yaml
@@ -47,7 +47,7 @@ v3_button_brita_water:
           [[[
             const remaining = states['input_number.brita_remaining_liters'].state;
             const percent = remaining / 150 * 100;
-            return percent > 65 ? 'black' : 'white';
+            return percent > 65 ? 'var(--primary-color)' : 'white';
           ]]]
       - background-color: |
           [[[
@@ -69,7 +69,7 @@ v3_button_brita_water:
 
             const remaining = states['input_number.brita_remaining_liters'].state;
             const percent = remaining / 150 * 100;
-            return percent > 10 ? 'black' : 'white';
+            return percent > 10 ? 'var(--v3-btn-state-color)' : 'white';
           ]]]
       - background-color: |
           [[[
diff --git a/config/lovelace/home_dashboard/living_room_dashboard.yaml b/config/lovelace/home_dashboard/living_room_dashboard.yaml
index d32ebd3..802aff0 100644
--- a/config/lovelace/home_dashboard/living_room_dashboard.yaml
+++ b/config/lovelace/home_dashboard/living_room_dashboard.yaml
@@ -49,15 +49,15 @@
                 entity: scene.living_room_ambient_neon
                 name: Neon
                 variables:
-                  scene_color_1: rgba(255, 0, 190, 0.7)
-                  scene_color_2: rgba(0, 255, 190, 0.7)
+                  scene_color_1: rgba(255, 0, 190, 1)
+                  scene_color_2: rgba(0, 255, 190, 1)
               - type: custom:button-card
                 template: v3_scene
                 entity: scene.living_room_ambient_default
                 name: Warm
                 variables:
-                  scene_color_1: rgba(240, 240, 190, 0.7)
-                  scene_color_2: rgba(255, 210, 170, 0.7)
+                  scene_color_1: rgba(240, 240, 190, 1)
+                  scene_color_2: rgba(255, 210, 170, 1)
           - type: custom:decluttering-card
             template: v3_section_title
             variables: