diff --git a/packages/iotlink_tony_desktop.yaml b/packages/iotlink_tony_desktop.yaml
index 539ce38..495eb00 100644
--- a/packages/iotlink_tony_desktop.yaml
+++ b/packages/iotlink_tony_desktop.yaml
@@ -1,169 +1,154 @@
-sensor:
+mqtt:
+  sensor:
+    - name: "Tony Desktop - GPU Temperature"
+      state_topic: "iotlink/workgroup/tony-asus/monitor/stats/gpu_nvidia/temperatures/gpu_core"
+      unit_of_measurement: 'C'
+      icon: mdi:thermometer
+      value_template: "{{ value }}"
+      availability_topic: "iotlink/workgroup/tony-asus/lwt"
+      payload_available: "ON"
+      payload_not_available: "OFF"
+      qos: 1
 
-  - platform: mqtt
-    name: "Tony Desktop - GPU Temperature"
-    state_topic: "iotlink/workgroup/tony-asus/monitor/stats/gpu_nvidia/temperatures/gpu_core"
-    unit_of_measurement: 'C'
-    icon: mdi:thermometer
-    value_template: "{{ value }}"
-    availability_topic: "iotlink/workgroup/tony-asus/lwt"
-    payload_available: "ON"
-    payload_not_available: "OFF"
-    qos: 1
+    - name: "Tony Desktop - CPU Temperature"
+      state_topic: "iotlink/workgroup/tony-asus/monitor/stats/cpu/temperatures/core_(tctl/tdie)"
+      unit_of_measurement: 'C'
+      icon: mdi:thermometer
+      value_template: "{{ value }}"
+      availability_topic: "iotlink/workgroup/tony-asus/lwt"
+      payload_available: "ON"
+      payload_not_available: "OFF"
+      qos: 1
 
-  - platform: mqtt
-    name: "Tony Desktop - CPU Temperature"
-    state_topic: "iotlink/workgroup/tony-asus/monitor/stats/cpu/temperatures/core_(tctl/tdie)"
-    unit_of_measurement: 'C'
-    icon: mdi:thermometer
-    value_template: "{{ value }}"
-    availability_topic: "iotlink/workgroup/tony-asus/lwt"
-    payload_available: "ON"
-    payload_not_available: "OFF"
-    qos: 1
+    - name: "Tony Desktop - Memory Usage"
+      state_topic: "iotlink/workgroup/tony-asus/monitor/stats/memory/load/memory"
+      unit_of_measurement: '%'
+      icon: mdi:memory
+      value_template: "{{ value }}"
+      availability_topic: "iotlink/workgroup/tony-asus/lwt"
+      payload_available: "ON"
+      payload_not_available: "OFF"
+      qos: 1
 
-  - platform: mqtt
-    name: "Tony Desktop - Memory Usage"
-    state_topic: "iotlink/workgroup/tony-asus/monitor/stats/memory/load/memory"
-    unit_of_measurement: '%'
-    icon: mdi:memory
-    value_template: "{{ value }}"
-    availability_topic: "iotlink/workgroup/tony-asus/lwt"
-    payload_available: "ON"
-    payload_not_available: "OFF"
-    qos: 1
+    - name: "Tony Desktop - Virtual Memory Usage"
+      state_topic: "iotlink/workgroup/tony-asus/monitor/stats/memory/load/virtual_memory"
+      unit_of_measurement: '%'
+      icon: mdi:memory
+      value_template: "{{ value }}"
+      availability_topic: "iotlink/workgroup/tony-asus/lwt"
+      payload_available: "ON"
+      payload_not_available: "OFF"
+      qos: 1
 
-  - platform: mqtt
-    name: "Tony Desktop - Virtual Memory Usage"
-    state_topic: "iotlink/workgroup/tony-asus/monitor/stats/memory/load/virtual_memory"
-    unit_of_measurement: '%'
-    icon: mdi:memory
-    value_template: "{{ value }}"
-    availability_topic: "iotlink/workgroup/tony-asus/lwt"
-    payload_available: "ON"
-    payload_not_available: "OFF"
-    qos: 1
+    - name: "Tony Desktop - GPU Core Load"
+      state_topic: "iotlink/workgroup/tony-asus/monitor/stats/gpu_nvidia/load/gpu_core"
+      unit_of_measurement: '%'
+      icon: mdi:speedometer
+      value_template: "{{ value }}"
+      availability_topic: "iotlink/workgroup/tony-asus/lwt"
+      payload_available: "ON"
+      payload_not_available: "OFF"
+      qos: 1
 
-  - platform: mqtt
-    name: "Tony Desktop - GPU Core Load"
-    state_topic: "iotlink/workgroup/tony-asus/monitor/stats/gpu_nvidia/load/gpu_core"
-    unit_of_measurement: '%'
-    icon: mdi:speedometer
-    value_template: "{{ value }}"
-    availability_topic: "iotlink/workgroup/tony-asus/lwt"
-    payload_available: "ON"
-    payload_not_available: "OFF"
-    qos: 1
+    - name: "Tony Desktop - GPU VRAM Usage"
+      state_topic: "iotlink/workgroup/tony-asus/monitor/stats/gpu_nvidia/load/gpu_memory"
+      unit_of_measurement: '%'
+      icon: mdi:memory
+      value_template: "{{ value }}"
+      availability_topic: "iotlink/workgroup/tony-asus/lwt"
+      payload_available: "ON"
+      payload_not_available: "OFF"
+      qos: 1
 
-  - platform: mqtt
-    name: "Tony Desktop - GPU VRAM Usage"
-    state_topic: "iotlink/workgroup/tony-asus/monitor/stats/gpu_nvidia/load/gpu_memory"
-    unit_of_measurement: '%'
-    icon: mdi:memory
-    value_template: "{{ value }}"
-    availability_topic: "iotlink/workgroup/tony-asus/lwt"
-    payload_available: "ON"
-    payload_not_available: "OFF"
-    qos: 1
+    - name: "Tony Desktop - GPU Video Engine Load"
+      state_topic: "iotlink/workgroup/tony-asus/monitor/stats/gpu_nvidia/load/gpu_video_engine"
+      unit_of_measurement: '%'
+      icon: mdi:speedometer
+      value_template: "{{ value }}"
+      availability_topic: "iotlink/workgroup/tony-asus/lwt"
+      payload_available: "ON"
+      payload_not_available: "OFF"
+      qos: 1
 
-  - platform: mqtt
-    name: "Tony Desktop - GPU Video Engine Load"
-    state_topic: "iotlink/workgroup/tony-asus/monitor/stats/gpu_nvidia/load/gpu_video_engine"
-    unit_of_measurement: '%'
-    icon: mdi:speedometer
-    value_template: "{{ value }}"
-    availability_topic: "iotlink/workgroup/tony-asus/lwt"
-    payload_available: "ON"
-    payload_not_available: "OFF"
-    qos: 1
+    - name: "Tony Desktop - GPU Memory Controller Load"
+      state_topic: "iotlink/workgroup/tony-asus/monitor/stats/gpu_nvidia/load/gpu_memory_controller"
+      unit_of_measurement: '%'
+      icon: mdi:speedometer
+      value_template: "{{ value }}"
+      availability_topic: "iotlink/workgroup/tony-asus/lwt"
+      payload_available: "ON"
+      payload_not_available: "OFF"
+      qos: 1
 
-  - platform: mqtt
-    name: "Tony Desktop - GPU Memory Controller Load"
-    state_topic: "iotlink/workgroup/tony-asus/monitor/stats/gpu_nvidia/load/gpu_memory_controller"
-    unit_of_measurement: '%'
-    icon: mdi:speedometer
-    value_template: "{{ value }}"
-    availability_topic: "iotlink/workgroup/tony-asus/lwt"
-    payload_available: "ON"
-    payload_not_available: "OFF"
-    qos: 1
+    - name: "Tony Desktop - GPU Memory Total"
+      state_topic: "iotlink/workgroup/tony-asus/monitor/stats/gpu_nvidia/data/gpu_memory_total"
+      unit_of_measurement: 'MB'
+      icon: mdi:memory
+      value_template: "{{ value }}"
+      availability_topic: "iotlink/workgroup/tony-asus/lwt"
+      payload_available: "ON"
+      payload_not_available: "OFF"
+      qos: 1
 
-  - platform: mqtt
-    name: "Tony Desktop - GPU Memory Total"
-    state_topic: "iotlink/workgroup/tony-asus/monitor/stats/gpu_nvidia/data/gpu_memory_total"
-    unit_of_measurement: 'MB'
-    icon: mdi:memory
-    value_template: "{{ value }}"
-    availability_topic: "iotlink/workgroup/tony-asus/lwt"
-    payload_available: "ON"
-    payload_not_available: "OFF"
-    qos: 1
+    - name: "Tony Desktop - GPU Memory Free"
+      state_topic: "iotlink/workgroup/tony-asus/monitor/stats/gpu_nvidia/data/gpu_memory_free"
+      unit_of_measurement: 'MB'
+      icon: mdi:memory
+      value_template: "{{ value }}"
+      availability_topic: "iotlink/workgroup/tony-asus/lwt"
+      payload_available: "ON"
+      payload_not_available: "OFF"
+      qos: 1
 
-  - platform: mqtt
-    name: "Tony Desktop - GPU Memory Free"
-    state_topic: "iotlink/workgroup/tony-asus/monitor/stats/gpu_nvidia/data/gpu_memory_free"
-    unit_of_measurement: 'MB'
-    icon: mdi:memory
-    value_template: "{{ value }}"
-    availability_topic: "iotlink/workgroup/tony-asus/lwt"
-    payload_available: "ON"
-    payload_not_available: "OFF"
-    qos: 1
+    - name: "Tony Desktop - GPU Memory Used"
+      state_topic: "iotlink/workgroup/tony-asus/monitor/stats/gpu_nvidia/data/gpu_memory_used"
+      unit_of_measurement: 'MB'
+      icon: mdi:memory
+      value_template: "{{ value }}"
+      availability_topic: "iotlink/workgroup/tony-asus/lwt"
+      payload_available: "ON"
+      payload_not_available: "OFF"
+      qos: 1
 
-  - platform: mqtt
-    name: "Tony Desktop - GPU Memory Used"
-    state_topic: "iotlink/workgroup/tony-asus/monitor/stats/gpu_nvidia/data/gpu_memory_used"
-    unit_of_measurement: 'MB'
-    icon: mdi:memory
-    value_template: "{{ value }}"
-    availability_topic: "iotlink/workgroup/tony-asus/lwt"
-    payload_available: "ON"
-    payload_not_available: "OFF"
-    qos: 1
+    - name: "Tony Desktop - Memory Used (GB)"
+      state_topic: "iotlink/workgroup/tony-asus/monitor/stats/memory/data/memory_used"
+      unit_of_measurement: 'GB'
+      icon: mdi:memory
+      value_template: "{{ value }}"
+      availability_topic: "iotlink/workgroup/tony-asus/lwt"
+      payload_available: "ON"
+      payload_not_available: "OFF"
+      qos: 1
 
-  - platform: mqtt
-    name: "Tony Desktop - Memory Used (GB)"
-    state_topic: "iotlink/workgroup/tony-asus/monitor/stats/memory/data/memory_used"
-    unit_of_measurement: 'GB'
-    icon: mdi:memory
-    value_template: "{{ value }}"
-    availability_topic: "iotlink/workgroup/tony-asus/lwt"
-    payload_available: "ON"
-    payload_not_available: "OFF"
-    qos: 1
+    - name: "Tony Desktop - Memory Available (GB)"
+      state_topic: "iotlink/workgroup/tony-asus/monitor/stats/memory/data/memory_available"
+      unit_of_measurement: 'GB'
+      icon: mdi:memory
+      value_template: "{{ value }}"
+      availability_topic: "iotlink/workgroup/tony-asus/lwt"
+      payload_available: "ON"
+      payload_not_available: "OFF"
+      qos: 1
 
-  - platform: mqtt
-    name: "Tony Desktop - Memory Available (GB)"
-    state_topic: "iotlink/workgroup/tony-asus/monitor/stats/memory/data/memory_available"
-    unit_of_measurement: 'GB'
-    icon: mdi:memory
-    value_template: "{{ value }}"
-    availability_topic: "iotlink/workgroup/tony-asus/lwt"
-    payload_available: "ON"
-    payload_not_available: "OFF"
-    qos: 1
+    - name: "Tony Desktop - Virtual Memory Used (GB)"
+      state_topic: "iotlink/workgroup/tony-asus/monitor/stats/memory/data/virtual_memory_used"
+      unit_of_measurement: 'GB'
+      icon: mdi:memory
+      value_template: "{{ value }}"
+      availability_topic: "iotlink/workgroup/tony-asus/lwt"
+      payload_available: "ON"
+      payload_not_available: "OFF"
+      qos: 1
 
-  - platform: mqtt
-    name: "Tony Desktop - Virtual Memory Used (GB)"
-    state_topic: "iotlink/workgroup/tony-asus/monitor/stats/memory/data/virtual_memory_used"
-    unit_of_measurement: 'GB'
-    icon: mdi:memory
-    value_template: "{{ value }}"
-    availability_topic: "iotlink/workgroup/tony-asus/lwt"
-    payload_available: "ON"
-    payload_not_available: "OFF"
-    qos: 1
-
-  - platform: mqtt
-    name: "Tony Desktop - Virtual Memory Available (GB)"
-    state_topic: "iotlink/workgroup/tony-asus/monitor/stats/memory/data/virtual_memory_available"
-    unit_of_measurement: 'GB'
-    icon: mdi:memory
-    value_template: "{{ value }}"
-    availability_topic: "iotlink/workgroup/tony-asus/lwt"
-    payload_available: "ON"
-    payload_not_available: "OFF"
-    qos: 1
+    - name: "Tony Desktop - Virtual Memory Available (GB)"
+      state_topic: "iotlink/workgroup/tony-asus/monitor/stats/memory/data/virtual_memory_available"
+      unit_of_measurement: 'GB'
+      icon: mdi:memory
+      value_template: "{{ value }}"
+      availability_topic: "iotlink/workgroup/tony-asus/lwt"
+      payload_available: "ON"
+      payload_not_available: "OFF"
+      qos: 1
 
 script:
   tony_desktop_wake: