diff --git a/lovelace/overview/energy.yaml b/lovelace/overview/energy.yaml
index aab7b70..a889bdd 100755
--- a/lovelace/overview/energy.yaml
+++ b/lovelace/overview/energy.yaml
@@ -39,13 +39,13 @@
       template: card_generic
       entity: sensor.kai_monitor_power
       variables:
-        ulm_card_generic_name: Current
+        ulm_card_generic_name: Monitor
         ulm_card_generic_icon: "mdi:home-lightning-bolt"
     - type: 'custom:button-card'
       template: card_generic
       entity: switch.kai_monitor
       variables:
-        ulm_card_generic_name: Current
+        ulm_card_generic_name: Monitor
         ulm_card_generic_icon: "mdi:home-lightning-bolt"
 - type: "horizontal-stack"
   cards:
@@ -53,7 +53,13 @@
       template: card_generic
       entity: sensor.kai_wifi_power
       variables:
-        ulm_card_generic_name: Current
+        ulm_card_generic_name: WiFi
+        ulm_card_generic_icon: "mdi:home-lightning-bolt"
+    - type: 'custom:button-card'
+      template: card_generic
+      entity: switch.kai_wifi_power
+      variables:
+        ulm_card_generic_name: WiFi
         ulm_card_generic_icon: "mdi:home-lightning-bolt"
 - type: "horizontal-stack"
   cards:
@@ -61,5 +67,11 @@
       template: card_generic
       entity: sensor.kai_anlage_power
       variables:
-        ulm_card_generic_name: Current
+        ulm_card_generic_name: Denon
+        ulm_card_generic_icon: "mdi:home-lightning-bolt"
+    - type: 'custom:button-card'
+      template: card_generic
+      entity: switch.kai_anlage_power
+      variables:
+        ulm_card_generic_name: Denon
         ulm_card_generic_icon: "mdi:home-lightning-bolt"
\ No newline at end of file