diff --git a/config/lovelace/button_card_templates/small_button.yaml b/config/lovelace/button_card_templates/small_button.yaml
index 3bdf36c..cd06b26 100644
--- a/config/lovelace/button_card_templates/small_button.yaml
+++ b/config/lovelace/button_card_templates/small_button.yaml
@@ -14,7 +14,7 @@ small:
     - value: 'on'
       styles:
         card:
-          - background-color: var(--accent-color)
+          - background-color: var(--primary-color)
           - color: black
         icon:
             - color: black
diff --git a/config/lovelace/decluttering_templates/covid_19.yaml b/config/lovelace/decluttering_templates/covid_19.yaml
index 3068e0e..b1b5f72 100644
--- a/config/lovelace/decluttering_templates/covid_19.yaml
+++ b/config/lovelace/decluttering_templates/covid_19.yaml
@@ -29,7 +29,7 @@ covid_19:
             points_per_hour: 0.04
             font_size: 75
             icon: "mdi:emoticon-sad-outline"
-            line_color: var(--accent-color)
+            line_color: var(--color-blue)
             line_width: 8
             show:
               state: false
@@ -43,7 +43,7 @@ covid_19:
             points_per_hour: 0.04
             font_size: 75
             icon: "mdi:emoticon-cry-outline"
-            line_color: "#e74c3c"
+            line_color: var(--color-red)
             line_width: 8
             show:
               state: false
@@ -57,7 +57,7 @@ covid_19:
             points_per_hour: 0.04
             font_size: 75
             icon: "mdi:emoticon-cool-outline"
-            line_color: var(--paper-green-400)
+            line_color: var(--color-green)
             line_width: 8
             show:
               state: false
diff --git a/config/lovelace/home_dashboard/00_home.yaml b/config/lovelace/home_dashboard/00_home.yaml
index 1935d05..c44bbc5 100644
--- a/config/lovelace/home_dashboard/00_home.yaml
+++ b/config/lovelace/home_dashboard/00_home.yaml
@@ -9,10 +9,10 @@ cards:
         $:
           .: |
             #columns {
-              margin: 0 10px;
+              padding: 0 10px;
             }
             #columns .column {
-              margin: 20px 10px;
+              padding: 20px 10px;
             }
     card:
       type: custom:layout-card
@@ -81,7 +81,6 @@ cards:
                   entities:
                     - binary_sensor.sonos_recoverable
 
-        - break
         # Column 2: Sensors
         - type: vertical-stack
           cards:
@@ -122,7 +121,7 @@ cards:
               entities:
                 - sensor.home_to_work
                 - sensor.work_to_home
-        - break
+
         # Column 3: Misc
         - type: vertical-stack
           title: Alarm
diff --git a/config/lovelace/home_dashboard/01_living_room.yaml b/config/lovelace/home_dashboard/01_living_room.yaml
index 3971765..9d3643d 100644
--- a/config/lovelace/home_dashboard/01_living_room.yaml
+++ b/config/lovelace/home_dashboard/01_living_room.yaml
@@ -9,10 +9,10 @@ cards:
         $:
           .: |
             #columns {
-              margin: 0 10px;
+              padding: 0 10px;
             }
             #columns .column {
-              margin: 20px 10px;
+              padding: 20px 10px;
             }
     card:
       type: custom:layout-card
diff --git a/config/lovelace/home_dashboard/02_master_bedroom.yaml b/config/lovelace/home_dashboard/02_master_bedroom.yaml
index 0fb245a..761859f 100644
--- a/config/lovelace/home_dashboard/02_master_bedroom.yaml
+++ b/config/lovelace/home_dashboard/02_master_bedroom.yaml
@@ -9,10 +9,10 @@ cards:
         $:
           .: |
             #columns {
-              margin: 0 10px;
+              padding: 0 10px;
             }
             #columns .column {
-              margin: 20px 10px;
+              padding: 20px 10px;
             }
     card:
       type: custom:layout-card
@@ -90,6 +90,7 @@ cards:
             - type: "custom:mini-graph-card"
               animate: true
               line_width: 3
+              line_color: var(--color-blue)
               points_per_hour: 1
               show:
                 average: true
@@ -104,7 +105,7 @@ cards:
                   name: Humidity
                   font_size: 75
                   icon: "mdi:water"
-                  line_color: green
+                  line_color: var(--color-blue)
                   line_width: 8
                   entities:
                     - sensor.bedroom_weather_humidity
@@ -114,14 +115,14 @@ cards:
                   entities:
                     - sensor.bedroom_weather_pressure
                   font_size: 75
-                  line_color: var(--accent-color)
+                  line_color: var(--color-red)
                   line_width: 8
 
                 - type: "custom:mini-graph-card"
                   name: Air Quality
                   font_size: 75
                   icon: "mdi:weather-windy"
-                  line_color: "#e74c3c"
+                  line_color: var(--color-green)
                   line_width: 8
                   entities:
                     - sensor.purifier_air_quality
diff --git a/config/lovelace/home_dashboard/03_kitchen.yaml b/config/lovelace/home_dashboard/03_kitchen.yaml
index 79f0b0c..47b8bc3 100644
--- a/config/lovelace/home_dashboard/03_kitchen.yaml
+++ b/config/lovelace/home_dashboard/03_kitchen.yaml
@@ -10,10 +10,10 @@ cards:
         $:
           .: |
             #columns {
-              margin: 0 10px;
+              padding: 0 10px;
             }
             #columns .column {
-              margin: 20px 10px;
+              padding: 20px 10px;
             }
     card:
       type: custom:layout-card
diff --git a/config/lovelace/home_dashboard/04_bathroom.yaml b/config/lovelace/home_dashboard/04_bathroom.yaml
index 1621da1..1766412 100644
--- a/config/lovelace/home_dashboard/04_bathroom.yaml
+++ b/config/lovelace/home_dashboard/04_bathroom.yaml
@@ -1,7 +1,6 @@
 title: Bathroom
 path: bathroom
 icon: "mdi:shower-head"
-badges: []
 cards:
   - type: custom:decluttering-card
     template: sonos_media_player
diff --git a/config/lovelace/home_dashboard/05_hallway.yaml b/config/lovelace/home_dashboard/05_hallway.yaml
index b1504df..618bd17 100644
--- a/config/lovelace/home_dashboard/05_hallway.yaml
+++ b/config/lovelace/home_dashboard/05_hallway.yaml
@@ -9,10 +9,10 @@ cards:
         $:
           .: |
             #columns {
-              margin: 0 10px;
+              padding: 0 10px;
             }
             #columns .column {
-              margin: 20px 10px;
+              padding: 20px 10px;
             }
     card:
       type: custom:layout-card
diff --git a/config/lovelace/home_dashboard/06_lights.yaml b/config/lovelace/home_dashboard/06_lights.yaml
index 299c0b5..dbae3af 100644
--- a/config/lovelace/home_dashboard/06_lights.yaml
+++ b/config/lovelace/home_dashboard/06_lights.yaml
@@ -9,10 +9,10 @@ cards:
         $:
           .: |
             #columns {
-              margin: 0 10px;
+              padding: 0 10px;
             }
             #columns .column {
-              margin: 20px 10px;
+              padding: 20px 10px;
             }
     card:
       type: custom:layout-card
diff --git a/config/lovelace/home_dashboard/07_media.yaml b/config/lovelace/home_dashboard/07_media.yaml
index 14aed09..2b0f6af 100644
--- a/config/lovelace/home_dashboard/07_media.yaml
+++ b/config/lovelace/home_dashboard/07_media.yaml
@@ -2,7 +2,6 @@ title: Media
 path: media
 panel: true
 icon: mdi:youtube
-badges: []
 cards:
   - type: custom:layout-card
     layout: horizontal
diff --git a/config/lovelace/home_dashboard/08_network.yaml b/config/lovelace/home_dashboard/08_network.yaml
index 332c48c..aad6d11 100644
--- a/config/lovelace/home_dashboard/08_network.yaml
+++ b/config/lovelace/home_dashboard/08_network.yaml
@@ -9,10 +9,10 @@ cards:
         $:
           .: |
             #columns {
-              margin: 0 10px;
+              padding: 0 10px;
             }
             #columns .column {
-              margin: 20px 10px;
+              padding: 20px 10px;
             }
     card:
       type: custom:layout-card
diff --git a/config/lovelace/home_dashboard/09_system.yaml b/config/lovelace/home_dashboard/09_system.yaml
index 603cb0d..89b40a4 100644
--- a/config/lovelace/home_dashboard/09_system.yaml
+++ b/config/lovelace/home_dashboard/09_system.yaml
@@ -9,10 +9,10 @@ cards:
         $:
           .: |
             #columns {
-              margin: 0 10px;
+              padding: 0 10px;
             }
             #columns .column {
-              margin: 20px 10px;
+              padding: 20px 10px;
             }
     card:
       type: custom:layout-card
diff --git a/config/lovelace/home_dashboard/10_covid_19.yaml b/config/lovelace/home_dashboard/10_covid_19.yaml
index 0cdf995..89b0e52 100644
--- a/config/lovelace/home_dashboard/10_covid_19.yaml
+++ b/config/lovelace/home_dashboard/10_covid_19.yaml
@@ -9,10 +9,10 @@ cards:
         $:
           .: |
             #columns {
-              margin: 0 10px;
+              padding: 0 10px;
             }
             #columns .column {
-              margin: 20px 10px;
+              padding: 20px 10px;
             }
     card:
       type: custom:layout-card
diff --git a/config/lovelace/home_dashboard/11_test.yaml b/config/lovelace/home_dashboard/11_test.yaml
index 57bc34f..097f2ca 100644
--- a/config/lovelace/home_dashboard/11_test.yaml
+++ b/config/lovelace/home_dashboard/11_test.yaml
@@ -1,6 +1,5 @@
 title: test
 path: test
-badges: []
 cards:
   - type: custom:button-card
     name: Reload themes