diff --git a/lovelace/00_home.yaml b/lovelace/00_home.yaml
index 9ca5bb9..956416d 100644
--- a/lovelace/00_home.yaml
+++ b/lovelace/00_home.yaml
@@ -8,34 +8,41 @@ cards:
     cards:
       - type: entities
         title: Lights
+        show_header_toggle: false
         entities:
           - entity: light.living_room_all_lights
           - entity: light.living_room_main_lights
           - entity: light.pc
           - entity: light.bedside_light
-        show_header_toggle: false
 
       - type: entities
         title: Devices
+        show_header_toggle: false
         entities:
           - entity: switch.camera
           - entity: media_player.living_room_tv
           - entity: media_player.nvidia_shield
           - entity: fan.philips_airpurifier
-        show_header_toggle: false
 
       - type: "custom:mini-media-player"
         artwork: cover
         entity: media_player.master_bedroom
+        speaker_group:
+          sync_volume: true
+          entities:
+            - entity_id: media_player.master_bedroom
+              name: Master Bedroom
+            - entity_id: media_player.living_room
+              name: Livingroom
+            - entity_id: media_player.kitchen
+              name: Kitchen
         hide:
-          power_state: false
+          power: true
+          icon: true
           shuffle: false
         idle_view:
           when_idle: true
           when_standby: true
-        platform: sonos
-        show_source: true
-        source: full
 
       - type: "custom:mini-media-player"
         artwork: cover
@@ -52,41 +59,41 @@ cards:
 
       - type: entities
         title: Manual Overrides
+        show_header_toggle: false
         entities:
           - entity: input_boolean.speech_notifications
           - entity: input_boolean.guest_mode
           - entity: input_boolean.domestina
           - entity: input_boolean.sleep_mode
           - entity: input_boolean.georgi_home
-        show_header_toggle: false
 
   # Column 2: Sensors
   - type: vertical-stack
     cards:
       - type: entities
         title: Sensors
+        show_header_toggle: false
         entities:
           - entity: binary_sensor.front_door_on_off_wrapper
           - entity: binary_sensor.living_room_right_window_on_off_wrapper
           - entity: binary_sensor.bedroom_right_window_on_off_wrapper
-        show_header_toggle: false
 
       - type: entities
         title: Presence
+        show_header_toggle: false
         entities:
           - entity: binary_sensor.georgi_home
           - entity: device_tracker.carbon
           - entity: device_tracker.tile_1bcb2b3021b9f96b
-        show_header_toggle: false
 
       - type: entities
         title: Misc Badges
+        show_header_toggle: false
         entities:
           - entity: sun.sun
           - entity: sensor.carbon_battery_level
           - entity: sensor.carbon_steps
           - entity: binary_sensor.updater
-        show_header_toggle: false
 
   # Column 3: Misc
   - type: vertical-stack
diff --git a/lovelace/01_living_room.yaml b/lovelace/01_living_room.yaml
index 618a29c..63aed5e 100644
--- a/lovelace/01_living_room.yaml
+++ b/lovelace/01_living_room.yaml
@@ -3,26 +3,56 @@ path: living-room
 icon: "mdi:sofa"
 badges: []
 cards:
-  - type: glance
-    title: Window
-    show_icon: true
-    show_name: false
-    show_state: true
-    entities:
-      - entity: binary_sensor.living_room_right_window_on_off_wrapper
-      - entity: sensor.living_room_right_window_power
+  - type: vertical-stack
+    cards:
+      - type: entities
+        title: Lights
+        show_header_toggle: false
+        entities:
+          - entity: light.living_room_all_lights
+          - entity: light.living_room_main_lights
+          - entity: light.living_room_1
+          - entity: light.living_room_2
+          - entity: light.living_room_3
+          - entity: light.living_room_4
+          - entity: light.pc
 
-  - type: entities
-    title: Lights
-    show_header_toggle: false
-    entities:
-      - entity: light.living_room_all_lights
-      - entity: light.living_room_main_lights
-      - entity: light.living_room_1
-      - entity: light.living_room_2
-      - entity: light.living_room_3
-      - entity: light.living_room_4
-      - entity: light.pc
+      - type: "custom:mini-media-player"
+        artwork: cover
+        entity: media_player.living_room
+        speaker_group:
+          sync_volume: true
+          entities:
+            - entity_id: media_player.master_bedroom
+              name: Master Bedroom
+            - entity_id: media_player.living_room
+              name: Livingroom
+            - entity_id: media_player.kitchen
+              name: Kitchen
+        hide:
+          power: true
+          icon: true
+          shuffle: false
+        idle_view:
+          when_idle: true
+          when_standby: true
+
+      - type: "custom:mini-media-player"
+        entity: media_player.living_room_tv
+
+      - type: "custom:mini-media-player"
+        entity: media_player.playstation_4
+
+  - type: vertical-stack
+    cards:
+      - type: glance
+        title: Window
+        show_icon: true
+        show_name: false
+        show_state: true
+        entities:
+          - entity: binary_sensor.living_room_right_window_on_off_wrapper
+          - entity: sensor.living_room_right_window_power
 
   - type: vertical-stack
     cards:
@@ -39,9 +69,3 @@ cards:
           - entity: switch.camera
           - entity: binary_sensor.amcrest_camera_online
           - entity: binary_sensor.amcrest_camera_motion_detected
-
-  - type: media-control
-    entity: media_player.living_room_tv
-
-  - type: media-control
-    entity: media_player.playstation_4
diff --git a/lovelace/02_master_bedroom.yaml b/lovelace/02_master_bedroom.yaml
index 2081225..dae78d3 100644
--- a/lovelace/02_master_bedroom.yaml
+++ b/lovelace/02_master_bedroom.yaml
@@ -10,24 +10,54 @@ cards:
         entities:
           - entity: light.bedside_light
         show_header_toggle: false
+
+      - type: "custom:mini-media-player"
+        artwork: cover
+        entity: media_player.master_bedroom
+        speaker_group:
+          sync_volume: true
+          entities:
+            - entity_id: media_player.master_bedroom
+              name: Master Bedroom
+            - entity_id: media_player.living_room
+              name: Livingroom
+            - entity_id: media_player.kitchen
+              name: Kitchen
+        hide:
+          power: true
+          icon: true
+          shuffle: false
+        idle_view:
+          when_idle: true
+          when_standby: true
+
+  - type: vertical-stack
+    cards:
+      - type: glance
+        title: Window
+        show_name: false
+        entities:
+          - entity: binary_sensor.bedroom_right_window_on_off_wrapper
+          - entity: sensor.bedroom_right_window_power
+
       - type: "custom:mini-graph-card"
         animate: true
-        entities:
-          - entity: sensor.bedroom_weather_temperature
-            index: 0
-            name: Temperature
         line_width: 3
         points_per_hour: 1
         show:
           average: true
           extrema: true
+        entities:
+          - entity: sensor.bedroom_weather_temperature
+            index: 0
+            name: Temperature
 
       - type: horizontal-stack
         cards:
           - type: "custom:mini-graph-card"
             name: Humidity
-            icon: "mdi:water"
             font_size: 75
+            icon: "mdi:water"
             line_color: green
             line_width: 8
             entities:
@@ -36,13 +66,13 @@ cards:
 
           - type: "custom:mini-graph-card"
             name: Air Quality
-            entities:
-              - entity: sensor.purifier_air_quality
-                index: 0
             font_size: 75
             icon: "mdi:weather-windy"
             line_color: "#e74c3c"
             line_width: 8
+            entities:
+              - entity: sensor.purifier_air_quality
+                index: 0
 
           - type: "custom:mini-graph-card"
             name: Pressure
@@ -53,38 +83,23 @@ cards:
             line_color: var(--accent-color)
             line_width: 8
 
-  - type: glance
-    title: Window
-    entities:
-      - entity: binary_sensor.bedroom_right_window_on_off_wrapper
-      - entity: sensor.bedroom_right_window_power
-    show_name: false
-
-  - type: entities
-    title: Purifier Sensors
-    entities:
-      - entity: fan.philips_airpurifier
-      - entity: sensor.purifier_speed
-      - entity: sensor.purifier_mode
-      - entity: sensor.purifier_brightness
-      - entity: sensor.purifier_target_humidity
-      - entity: sensor.purifier_air_quality
-      - entity: sensor.purifier_allergens
-      - entity: sensor.purifier_humidity
-      - entity: sensor.purifier_water_level
-      - entity: sensor.purifier_temperature
-      - entity: sensor.purifier_pre_filter
-      - entity: sensor.purifier_hepa_filter
-      - entity: sensor.purifier_carbon_filter
-      - entity: sensor.purifier_wick_filter
-    show_header_toggle: false
-
-  - type: "custom:mini-media-player"
-    source: full
-    artwork: cover
-    entity: media_player.master_bedroom
-    hide:
-      power_state: false
-      shuffle: false
-    platform: sonos
-    show_source: true
+  - type: vertical-stack
+    cards:
+      - type: entities
+        title: Purifier Sensors
+        show_header_toggle: false
+        entities:
+          - entity: fan.philips_airpurifier
+          - entity: sensor.purifier_speed
+          - entity: sensor.purifier_mode
+          - entity: sensor.purifier_brightness
+          - entity: sensor.purifier_target_humidity
+          - entity: sensor.purifier_air_quality
+          - entity: sensor.purifier_allergens
+          - entity: sensor.purifier_humidity
+          - entity: sensor.purifier_water_level
+          - entity: sensor.purifier_temperature
+          - entity: sensor.purifier_pre_filter
+          - entity: sensor.purifier_hepa_filter
+          - entity: sensor.purifier_carbon_filter
+          - entity: sensor.purifier_wick_filter
diff --git a/lovelace/03_kitchen.yaml b/lovelace/03_kitchen.yaml
new file mode 100644
index 0000000..b983ab7
--- /dev/null
+++ b/lovelace/03_kitchen.yaml
@@ -0,0 +1,24 @@
+title: Kitchen
+path: kitchen
+icon: "mdi:chef-hat"
+badges: []
+cards:
+  - type: "custom:mini-media-player"
+    artwork: cover
+    entity: media_player.kitchen
+    speaker_group:
+      sync_volume: true
+      entities:
+        - entity_id: media_player.master_bedroom
+          name: Master Bedroom
+        - entity_id: media_player.living_room
+          name: Livingroom
+        - entity_id: media_player.kitchen
+          name: Kitchen
+    hide:
+      power: true
+      icon: true
+      shuffle: false
+    idle_view:
+      when_idle: true
+      when_standby: true
diff --git a/lovelace/03_system.yaml b/lovelace/04_system.yaml
similarity index 100%
rename from lovelace/03_system.yaml
rename to lovelace/04_system.yaml
index cb9bae3..b5ec6ae 100644
--- a/lovelace/03_system.yaml
+++ b/lovelace/04_system.yaml
@@ -5,6 +5,7 @@ badges: []
 cards:
   - type: entities
     title: Automations
+    show_header_toggle: false
     entities:
       - entity: input_boolean.routine_welcome_home
       - entity: automation.presence_arrival_detection
@@ -25,10 +26,10 @@ cards:
       - entity: automation.domestina_end
       - entity: automation.camera_turn_off_on_startup
       - entity: automation.system_announce_start
-    show_header_toggle: false
 
   - type: entities
     title: Batteries
+    show_header_toggle: false
     entities:
       - entity: sensor.front_door_power
       - entity: sensor.living_room_right_window_power
@@ -36,4 +37,3 @@ cards:
       - entity: sensor.bedroom_weather_power
       - entity: sensor.cube_power
       - entity: sensor.master_bedroom_bedside_switch_power
-    show_header_toggle: false
diff --git a/lovelace/04_covid_19.yaml b/lovelace/05_covid_19.yaml
similarity index 100%
rename from lovelace/04_covid_19.yaml
rename to lovelace/05_covid_19.yaml
index 350ea41..7fb5d81 100644
--- a/lovelace/04_covid_19.yaml
+++ b/lovelace/05_covid_19.yaml
@@ -27,6 +27,13 @@ cards:
       - type: "custom:mini-graph-card"
         animate: true
         icon: mdi:emoticon-confused
+        line_width: 3
+        line_color:
+          - var(--paper-orange-400)
+          - var(--paper-green-400)
+          - var(--accent-color)
+        hours_to_show: 168
+        points_per_hour: 0.04
         entities:
           - entity: sensor.worldwide_coronavirus_deaths
             index: 0
@@ -37,13 +44,6 @@ cards:
           - entity: sensor.worldwide_coronavirus_current
             index: 2
             name: Current
-        line_width: 3
-        line_color:
-          - var(--paper-orange-400)
-          - var(--paper-green-400)
-          - var(--accent-color)
-        hours_to_show: 168
-        points_per_hour: 0.04
 
   - type: vertical-stack
     cards:
@@ -68,6 +68,13 @@ cards:
       - type: "custom:mini-graph-card"
         animate: true
         icon: mdi:emoticon-confused
+        line_width: 3
+        line_color:
+          - var(--accent-color)
+          - var(--paper-orange-400)
+          - var(--paper-green-400)
+        hours_to_show: 168
+        points_per_hour: 0.04
         entities:
           - entity: sensor.bulgaria_coronavirus_current
             index: 0
@@ -78,10 +85,3 @@ cards:
           - entity: sensor.bulgaria_coronavirus_recovered
             index: 2
             name: Recovered
-        line_width: 3
-        line_color:
-          - var(--accent-color)
-          - var(--paper-orange-400)
-          - var(--paper-green-400)
-        hours_to_show: 168
-        points_per_hour: 0.04
diff --git a/lovelace/05_test.yaml b/lovelace/06_test.yaml
similarity index 100%
rename from lovelace/05_test.yaml
rename to lovelace/06_test.yaml
diff --git a/ui-lovelace.yaml b/ui-lovelace.yaml
index 28e58d7..6120434 100644
--- a/ui-lovelace.yaml
+++ b/ui-lovelace.yaml
@@ -35,6 +35,7 @@ views:
   - !include lovelace/00_home.yaml
   - !include lovelace/01_living_room.yaml
   - !include lovelace/02_master_bedroom.yaml
-  - !include lovelace/03_system.yaml
-  - !include lovelace/04_covid_19.yaml
-  - !include lovelace/05_test.yaml
+  - !include lovelace/03_kitchen.yaml
+  - !include lovelace/04_system.yaml
+  - !include lovelace/05_covid_19.yaml
+  - !include lovelace/06_test.yaml