diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index 24336fc..128e009 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,2 +1,3 @@
 ---
+ko_fi: jayjojayson
 custom: ["https://www.paypal.me/quadFlyerFW"]
diff --git a/README.md b/README.md
index 22fb0cb..1ca85ac 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@
 [![Stars](https://img.shields.io/github/stars/jayjojayson/power-flux-card)](https://github.com/jayjojayson/power-flux-card/stargazers)
 
 
-# Power Flux Card
+# Power Flux Card 
 
 The ⚡ Power Flux Card is an advanced, animated energy flow card for Home Assistant. It visualizes the power distribution between Solar, Grid, Battery, and Consumers with beautiful neon effects and diffrent animations.
 
@@ -133,7 +133,7 @@ entities:
   battery_soc: sensor.battery_soc
 card_mod:
   style: |
-    power-flux-card {
+    :host {
       {% if states('sensor.solar_power') | float > 0 %}
         --icon-solar-color: #00ff88;
       {% else %}
@@ -153,7 +153,7 @@ entities:
   battery_soc: sensor.battery_soc
 card_mod:
   style: |
-    power-flux-card {
+    :host {
       {% if states('sensor.grid_power_combined') | float < 0 %}
         --text-grid-color: #ff3333;
       {% else %}
@@ -173,7 +173,7 @@ entities:
   battery_soc: sensor.battery_soc
 card_mod:
   style: |
-    power-flux-card {
+    :host {
       {% set soc = states('sensor.battery_soc') | float %}
       {% if soc > 80 %}
         --neon-green: #00ff88;
@@ -197,7 +197,7 @@ entities:
   consumer_1: sensor.wallbox_power
 card_mod:
   style: |
-    power-flux-card {
+    :host {
       {% if states('sensor.wallbox_power') | float > 500 %}
         --pipe-consumer-1-color: #a855f7;
         --icon-consumer-1-color: #a855f7;
@@ -220,7 +220,7 @@ entities:
   consumer_1: sensor.wallbox_power
 card_mod:
   style: |
-    power-flux-card {
+    :host {
       {% if states('sensor.solar_power') | float == 0 %}
         --icon-solar-color: #555555;
         --text-solar-color: #777777;
diff --git a/dist/power-flux-card.js b/dist/power-flux-card.js
index d65ef37..2400503 100644
--- a/dist/power-flux-card.js
+++ b/dist/power-flux-card.js
@@ -1820,13 +1820,7 @@ console.log(
         const val = parseFloat(state.state);
         if (isNaN(val)) return state.state + (state.attributes.unit_of_measurement ? ' ' + state.attributes.unit_of_measurement : '');
         const unit = state.attributes.unit_of_measurement || '';
-        if (unit === 'W' || unit === 'Wh') {
-          return this._formatPower(val);
-        }
-        if (unit === 'kWh' || unit === 'kW') {
-          return val.toFixed(1) + ' ' + unit;
-        }
-        return val.toFixed(1) + (unit ? ' ' + unit : '');
+        if (unit === 'W') {          return this._formatPower(val);        }        if (unit === 'Wh') {          if (Math.abs(val) >= 1000) return (val / 1000).toFixed(2) + ' kWh';          return Math.round(val) + ' Wh';        }        if (unit === 'kWh' || unit === 'kW') {          return val.toFixed(1) + ' ' + unit;        }        if (unit.includes('EUR') || unit.includes('ct') || unit.includes('€')) {          return val.toFixed(2) + ' ' + unit;        }        return val.toFixed(1) + (unit ? ' ' + unit : '');
       };
 
       // Determine existence of main entities
diff --git a/docs/README-de.md b/docs/README-de.md
index 6523845..8f75370 100644
--- a/docs/README-de.md
+++ b/docs/README-de.md
@@ -135,7 +135,7 @@ entities:
   battery_soc: sensor.battery_soc
 card_mod:
   style: |
-    power-flux-card {
+    :host {
       {% if states('sensor.solar_power') | float > 0 %}
         --icon-solar-color: #00ff88;
       {% else %}
@@ -155,7 +155,7 @@ entities:
   battery_soc: sensor.battery_soc
 card_mod:
   style: |
-    power-flux-card {
+    :host {
       {% if states('sensor.grid_power_combined') | float < 0 %}
         --text-grid-color: #ff3333;
       {% else %}
@@ -175,7 +175,7 @@ entities:
   battery_soc: sensor.battery_soc
 card_mod:
   style: |
-    power-flux-card {
+    :host {
       {% set soc = states('sensor.battery_soc') | float %}
       {% if soc > 80 %}
         --neon-green: #00ff88;
@@ -199,7 +199,7 @@ entities:
   consumer_1: sensor.wallbox_power
 card_mod:
   style: |
-    power-flux-card {
+    :host {
       {% if states('sensor.wallbox_power') | float > 500 %}
         --pipe-consumer-1-color: #a855f7;
         --icon-consumer-1-color: #a855f7;
@@ -222,7 +222,7 @@ entities:
   consumer_1: sensor.wallbox_power
 card_mod:
   style: |
-    power-flux-card {
+    :host {
       {% if states('sensor.solar_power') | float == 0 %}
         --icon-solar-color: #555555;
         --text-solar-color: #777777;
diff --git a/src/power-flux-card.js b/src/power-flux-card.js
index 4db2e67..842366d 100644
--- a/src/power-flux-card.js
+++ b/src/power-flux-card.js
@@ -820,13 +820,7 @@ console.log(
         const val = parseFloat(state.state);
         if (isNaN(val)) return state.state + (state.attributes.unit_of_measurement ? ' ' + state.attributes.unit_of_measurement : '');
         const unit = state.attributes.unit_of_measurement || '';
-        if (unit === 'W' || unit === 'Wh') {
-          return this._formatPower(val);
-        }
-        if (unit === 'kWh' || unit === 'kW') {
-          return val.toFixed(1) + ' ' + unit;
-        }
-        return val.toFixed(1) + (unit ? ' ' + unit : '');
+        if (unit === 'W') {          return this._formatPower(val);        }        if (unit === 'Wh') {          if (Math.abs(val) >= 1000) return (val / 1000).toFixed(2) + ' kWh';          return Math.round(val) + ' Wh';        }        if (unit === 'kWh' || unit === 'kW') {          return val.toFixed(1) + ' ' + unit;        }        if (unit.includes('EUR') || unit.includes('ct') || unit.includes('€')) {          return val.toFixed(2) + ' ' + unit;        }        return val.toFixed(1) + (unit ? ' ' + unit : '');
       };
 
       // Determine existence of main entities