diff --git a/config/lovelace/advanced_dashboard/09_network.yaml b/config/lovelace/advanced_dashboard/09_network.yaml
index 3fd95c5..9e657a2 100644
--- a/config/lovelace/advanced_dashboard/09_network.yaml
+++ b/config/lovelace/advanced_dashboard/09_network.yaml
@@ -29,9 +29,9 @@ cards:
                 - icon: mdi:desktop-tower
 
             - type: custom:decluttering-card
-              template: platinum_card
+              template: mercury_card
               variables:
-                - title: Platinum
+                - title: Mercury
                 - icon: mdi:nas
 
         - type: vertical-stack
diff --git a/config/lovelace/decluttering_templates/cards/cadmium_card.yaml b/config/lovelace/decluttering_templates/cards/cadmium_card.yaml
index fae4187..829438f 100644
--- a/config/lovelace/decluttering_templates/cards/cadmium_card.yaml
+++ b/config/lovelace/decluttering_templates/cards/cadmium_card.yaml
@@ -1,112 +1,119 @@
 cadmium_card:
-  default:
+  v3_xs_button:
     - title:
     - icon:
   card:
-    type: vertical-stack
-    cards:
-      - type: entities
-        title: "[[title]]"
-        icon: "[[icon]]"
-        entities:
-          - switch.cadmium
-      - type: vertical-stack
+    type: entities
+    style: |
+      #states > div:last-child {
+        margin: 0 -16px -16px -16px;
+      }
+    title: "[[title]]"
+    icon: "[[icon]]"
+    entities:
+      - type: custom:hui-vertical-stack-card
         cards:
-          - type: entities
-            style:
-              "#states div": |
-                mini-graph-card {
-                  margin: 0 -15px -15px
-                }
-
-            entities:
-              - sensor.cadmium_uptime
-              - sensor.cadmium_idle_time
-              - type: custom:fold-entity-row
-                head:
-                  type: custom:decluttering-card
-                  template: percentage_card
-                  variables:
-                    - name: Memory
-                    - entity: sensor.cadmium_memory_used_percent
-                    - icon: mdi:memory
-                    - orange: 70
-                    - red: 85
-                entities:
-                  - entity: sensor.cadmium_memory_used
-                    name: Memory used
-                  - entity: sensor.cadmium_memory_available
-                    name: Memory available
-                  - entity: sensor.cadmium_memory_total
-                    name: Memory total
-
-              - type: custom:fold-entity-row
-                head:
-                  type: custom:decluttering-card
-                  template: percentage_card
-                  variables:
-                    - name: "C: Drive"
-                    - entity: sensor.cadmium_c_usage
-                    - icon: mdi:harddisk
-                    - orange: 70
-                    - red: 85
-                entities:
-                  - entity: sensor.cadmium_c_used_space
-                    name: "C: Drive used"
-                  - entity: sensor.cadmium_c_free_space
-                    name: "C: Drive available"
-                  - entity: sensor.cadmium_c_total_space
-                    name: "C: Drive total"
-              - type: custom:mini-graph-card
-                align_state: left
-                entities:
-                  - color: var(--accent-color)
-                    entity: sensor.cadmium_cpu_usage
-                  - color: green
-                    entity: sensor.cadmium_memory_used_percent
-                points_per_hour: 1
-                line_width: 3
-                hour24: true
-                hours_to_show: 24
-                group_by: hour
-                show:
-                  fill: fade
-                  icon: true
-                  name: true
-                  state: true
-                  name_adaptive_color: false
-                  labels: hover
-                  legend: false
-                tap_action:
-                  action: none
-
           - type: horizontal-stack
             cards:
               - type: custom:button-card
-                template: default
+                template: v3_xs_button
+                entity: switch.cadmium
+                name: Power
+              - type: custom:button-card
+                template: v3_xs_button
                 entity: script.cadmium_lock
                 name: Lock
                 icon: mdi:lock
                 tap_action:
                   action: toggle
               - type: custom:button-card
-                template: default
+                template: v3_xs_button
                 entity: script.cadmium_displays_on
-                name: Displays on
+                name: Displ. on
                 icon: mdi:monitor-dashboard
                 tap_action:
                   action: toggle
               - type: custom:button-card
-                template: default
+                template: v3_xs_button
                 entity: script.cadmium_displays_off
-                name: Displays off
+                name: Displ. off
                 icon: mdi:monitor-off
                 tap_action:
                   action: toggle
               - type: custom:button-card
-                template: default
+                template: v3_xs_button
                 entity: script.cadmium_refresh
                 name: Refresh
                 icon: mdi:refresh
                 tap_action:
                   action: toggle
+
+          - type: vertical-stack
+            cards:
+              - type: entities
+                style:
+                  "#states div": |
+                    mini-graph-card {
+                      margin: 0 -15px -15px
+                    }
+
+                entities:
+                  - sensor.cadmium_uptime
+                  - sensor.cadmium_idle_time
+                  - type: custom:fold-entity-row
+                    head:
+                      type: custom:decluttering-card
+                      template: percentage_card
+                      variables:
+                        - name: Memory
+                        - entity: sensor.cadmium_memory_used_percent
+                        - icon: mdi:memory
+                        - orange: 70
+                        - red: 85
+                    entities:
+                      - entity: sensor.cadmium_memory_used
+                        name: Memory used
+                      - entity: sensor.cadmium_memory_available
+                        name: Memory available
+                      - entity: sensor.cadmium_memory_total
+                        name: Memory total
+
+                  - type: custom:fold-entity-row
+                    head:
+                      type: custom:decluttering-card
+                      template: percentage_card
+                      variables:
+                        - name: "C: Drive"
+                        - entity: sensor.cadmium_c_usage
+                        - icon: mdi:harddisk
+                        - orange: 70
+                        - red: 85
+                    entities:
+                      - entity: sensor.cadmium_c_used_space
+                        name: "C: Drive used"
+                      - entity: sensor.cadmium_c_free_space
+                        name: "C: Drive available"
+                      - entity: sensor.cadmium_c_total_space
+                        name: "C: Drive total"
+                  - type: custom:mini-graph-card
+                    align_state: left
+                    entities:
+                      - color: var(--accent-color)
+                        entity: sensor.cadmium_cpu_usage
+                      - color: green
+                        entity: sensor.cadmium_memory_used_percent
+                    points_per_hour: 1
+                    line_width: 3
+                    hour24: true
+                    hours_to_show: 24
+                    group_by: hour
+                    show:
+                      fill: fade
+                      icon: true
+                      name: true
+                      state: true
+                      name_adaptive_color: false
+                      labels: hover
+                      legend: false
+                    tap_action:
+                      action: none
diff --git a/config/lovelace/decluttering_templates/cards/platinum_card.yaml b/config/lovelace/decluttering_templates/cards/mercury_card.yaml
similarity index 54%
rename from config/lovelace/decluttering_templates/cards/platinum_card.yaml
rename to config/lovelace/decluttering_templates/cards/mercury_card.yaml
index 09704e8..8287e5e 100644
--- a/config/lovelace/decluttering_templates/cards/platinum_card.yaml
+++ b/config/lovelace/decluttering_templates/cards/mercury_card.yaml
@@ -1,7 +1,6 @@
-platinum_card:
+mercury_card:
   default:
     - title:
-    - icon:
   card:
     type: entities
     style: |
@@ -11,34 +10,45 @@ platinum_card:
     title: "[[title]]"
     icon: "[[icon]]"
     entities:
-      - type: custom:template-entity-row
-        name: Open admin UI
-        icon: mdi:firefox
-        tap_action:
-          action: url
-          url_path: http://platinum.lan:5000
+      - type: custom:hui-horizontal-stack-card
+        cards:
+          - type: custom:button-card
+            template: v3_xs_button
+            entity: switch.cadmium
+            icon: mdi:firefox
+            name: "Open UI"
+            tap_action:
+              action: url
+              url_path: https://home.gar.dev
+          - type: custom:button-card
+            template: v3_xs_button
+            entity: update.mercury_dsm_update
+            name: Update?
+          - type: custom:button-card
+            template: v3_xs_button
+            entity: button.mercury_reboot
+            name: Reboot
+          - type: custom:button-card
+            template: v3_xs_button
+            entity: button.mercury_shutdown
+            name: Shutdown
+
       - type: custom:fold-entity-row
         head:
           type: custom:decluttering-card
           template: percentage_card
           variables:
             - name: CPU
-            - entity: sensor.synology_cpu_load_total
+            - entity: sensor.mercury_cpu_utilization_total
             - icon: mdi:chip
             - orange: 40
             - red: 60
         entities:
-          - entity: sensor.synology_cpu_load_system
-            name: CPU load (System)
-          - entity: sensor.synology_cpu_load_user
+          - entity: sensor.mercury_cpu_utilization_user
             name: CPU load (User)
-          - entity: sensor.synology_cpu_load_other
-            name: CPU load (Other)
-          - entity: sensor.synology_cpu_load_1_min
-            name: CPU load (1 min)
-          - entity: sensor.synology_cpu_load_5_min
+          - entity: sensor.mercury_cpu_load_average_5_min
             name: CPU load (5 min)
-          - entity: sensor.synology_cpu_load_15_min
+          - entity: sensor.mercury_cpu_load_average_15_min
             name: CPU load (15 min)
 
       - type: custom:fold-entity-row
@@ -47,22 +57,18 @@ platinum_card:
           template: percentage_card
           variables:
             - name: Memory
-            - entity: sensor.synology_memory_usage_real
+            - entity: sensor.mercury_memory_usage_real
             - icon: mdi:memory
             - orange: 70
             - red: 85
         entities:
-          - entity: sensor.synology_memory_cached
-            name: Memory cached
-          - entity: sensor.synology_memory_size
-            name: Memory size
-          - entity: sensor.synology_memory_available_real
+          - entity: sensor.mercury_memory_available_real
             name: Memory available (Real)
-          - entity: sensor.synology_memory_total_real
+          - entity: sensor.mercury_memory_total_real
             name: Memory total (Real)
-          - entity: sensor.synology_memory_available_swap
+          - entity: sensor.mercury_memory_available_swap
             name: Memory available (Swap)
-          - entity: sensor.synology_memory_total_swap
+          - entity: sensor.mercury_memory_total_swap
             name: Memory total (Swap)
 
       - type: custom:fold-entity-row
@@ -71,90 +77,80 @@ platinum_card:
           template: percentage_card
           variables:
             - name: Volume 1
-            - entity: sensor.synology_volume_used_volume_1
+            - entity: sensor.mercury_volume_1_volume_used
             - icon: mdi:harddisk
             - orange: 85
             - red: 90
         entities:
-          - entity: sensor.synology_average_disk_temp_volume_1
+          - entity: sensor.mercury_volume_1_status
+            name: Status
+          - entity: sensor.mercury_volume_1_average_disk_temp
             name: Average temperature
-          - entity: sensor.synology_maximum_disk_temp_volume_1
-            name: Maximum temperature
-          - entity: sensor.synology_used_space_volume_1
+          - entity: sensor.mercury_volume_1_used_space
             name: Used space
-          - entity: sensor.synology_total_size_volume_1
-            name: Total size
 
       - type: custom:fold-entity-row
         head:
-          type: custom:decluttering-card
-          template: percentage_card
-          variables:
-            - name: Volume 2
-            - entity: sensor.synology_volume_used_volume_2
-            - icon: mdi:harddisk
-            - orange: 85
-            - red: 90
+          entity: sensor.mercury_drive_1_status
+          name: Drive 1
         entities:
-          - entity: sensor.synology_average_disk_temp_volume_2
-            name: Average temperature
-          - entity: sensor.synology_maximum_disk_temp_volume_2
-            name: Maximum temperature
-          - entity: sensor.synology_used_space_volume_2
-            name: Used space
-          - entity: sensor.synology_total_size_volume_2
-            name: Total size
+          - entity: sensor.mercury_drive_1_temperature
+            name: Temperature
+          - entity: binary_sensor.mercury_drive_1_below_min_remaining_life
+            name: Below minimum remaining life
+          - entity: binary_sensor.mercury_drive_1_exceeded_max_bad_sectors
+            name: Exceeded max bad sectors
+      - type: custom:fold-entity-row
+        head:
+          entity: sensor.mercury_drive_2_status
+          name: Drive 2
+        entities:
+          - entity: sensor.mercury_drive_2_temperature
+            name: Temperature
+          - entity: binary_sensor.mercury_drive_2_below_min_remaining_life
+            name: Below minimum remaining life
+          - entity: binary_sensor.mercury_drive_2_exceeded_max_bad_sectors
+            name: Exceeded max bad sectors
+      - type: custom:fold-entity-row
+        head:
+          entity: sensor.mercury_drive_3_status
+          name: Drive 3
+        entities:
+          - entity: sensor.mercury_drive_3_temperature
+            name: Temperature
+          - entity: binary_sensor.mercury_drive_3_below_min_remaining_life
+            name: Below minimum remaining life
+          - entity: binary_sensor.mercury_drive_3_exceeded_max_bad_sectors
+            name: Exceeded max bad sectors
+      - type: custom:fold-entity-row
+        head:
+          entity: sensor.mercury_drive_4_status
+          name: Drive 4
+        entities:
+          - entity: sensor.mercury_drive_4_temperature
+            name: Temperature
+          - entity: binary_sensor.mercury_drive_4_below_min_remaining_life
+            name: Below minimum remaining life
+          - entity: binary_sensor.mercury_drive_4_exceeded_max_bad_sectors
+            name: Exceeded max bad sectors
 
       - type: custom:fold-entity-row
         head:
-          entity: sensor.synology_status_sda
-          name: /sda
+          entity: sensor.mercury_cache_device_1_status
+          name: Cache
         entities:
-          - entity: sensor.synology_temperature_sda
+          - entity: sensor.mercury_cache_device_1_temperature
             name: Temperature
-          - entity: sensor.synology_below_min_remaining_life_sda
+          - entity: binary_sensor.mercury_cache_device_1_below_min_remaining_life
             name: Below minimum remaining life
-          - entity: sensor.synology_exceeded_max_bad_sectors_sda
-            name: Exceeded max bad sectors
-      - type: custom:fold-entity-row
-        head:
-          entity: sensor.synology_status_sdb
-          name: /sdb
-        entities:
-          - entity: sensor.synology_temperature_sdb
-            name: Temperature
-          - entity: sensor.synology_below_min_remaining_life_sdb
-            name: Below minimum remaining life
-          - entity: sensor.synology_exceeded_max_bad_sectors_sdb
-            name: Exceeded max bad sectors
-      - type: custom:fold-entity-row
-        head:
-          entity: sensor.synology_status_sdc
-          name: /sdc
-        entities:
-          - entity: sensor.synology_temperature_sdc
-            name: Temperature
-          - entity: sensor.synology_below_min_remaining_life_sdc
-            name: Below minimum remaining life
-          - entity: sensor.synology_exceeded_max_bad_sectors_sdc
-            name: Exceeded max bad sectors
-      - type: custom:fold-entity-row
-        head:
-          entity: sensor.synology_status_sdd
-          name: /sdd
-        entities:
-          - entity: sensor.synology_temperature_sdd
-            name: Temperature
-          - entity: sensor.synology_below_min_remaining_life_sdd
-            name: Below minimum remaining life
-          - entity: sensor.synology_exceeded_max_bad_sectors_sdd
+          - entity: binary_sensor.mercury_cache_device_1_exceeded_max_bad_sectors
             name: Exceeded max bad sectors
 
       - type: custom:hui-horizontal-stack-card
         cards:
           - type: entities
             entities:
-              - entity: sensor.synology_network_down
+              - entity: sensor.mercury_download_throughput
                 name: Down
                 style: |
                   :host {
@@ -183,7 +179,7 @@ platinum_card:
                         }
           - type: entities
             entities:
-              - entity: sensor.synology_network_up
+              - entity: sensor.mercury_upload_throughput
                 name: Up
                 style: |
                   :host {
@@ -195,9 +191,9 @@ platinum_card:
         align_state: left
         entities:
           - color: var(--accent-color)
-            entity: sensor.synology_network_up
+            entity: sensor.mercury_upload_throughput
           - color: green
-            entity: sensor.synology_network_down
+            entity: sensor.mercury_download_throughput
         group: false
         points_per_hour: 1
         line_width: 3
diff --git a/config/lovelace/home_dashboard/guest_bedroom_dashboard.yaml b/config/lovelace/home_dashboard/guest_bedroom_dashboard.yaml
index 86337ec..62b8fa2 100644
--- a/config/lovelace/home_dashboard/guest_bedroom_dashboard.yaml
+++ b/config/lovelace/home_dashboard/guest_bedroom_dashboard.yaml
@@ -61,3 +61,16 @@
                   service: input_select.select_next
                   service_data:
                     entity_id: input_select.guest_bedroom_mode
+
+          - type: custom:decluttering-card
+            template: v3_section_title
+            variables:
+              - title: Devices
+
+          - type: horizontal-stack
+            cards:
+              - type: custom:button-card
+                template: v3_button
+                entity: sensor.mercury_temperature
+                name: Mercury
+                icon: mdi:nas
diff --git a/config/lovelace/popup_cards.yaml b/config/lovelace/popup_cards.yaml
index 2a0856b..7787d0c 100644
--- a/config/lovelace/popup_cards.yaml
+++ b/config/lovelace/popup_cards.yaml
@@ -49,11 +49,12 @@ group.hallway_motion:
         entities:
           - entity: sensor.hallway_motion_illuminance
 
-sensor.synology_type_volume_1:
-  title: Platinum
+sensor.mercury_temperature:
+  title: Mercury
   card:
     type: custom:decluttering-card
-    template: platinum_card
+    template: mercury_card
+
 
 media_player.living_room:
   title: Living room Sonos
@@ -423,6 +424,8 @@ switch.cadmium:
   card:
     type: custom:decluttering-card
     template: cadmium_card
+    variables:
+      - title: ''
 
 sensor.fast_com_download:
   title: Network Speed