diff --git a/dist/sunsynk-power-flow-card.js b/dist/sunsynk-power-flow-card.js
index 5005e87b..46f4f6d9 100644
--- a/dist/sunsynk-power-flow-card.js
+++ b/dist/sunsynk-power-flow-card.js
@@ -468,46 +468,46 @@ class SunsynkPowerFlowCard extends LitElement {
       return html`
         <div class="container card">
           <svg viewBox="-0.5 ${config.show_solar === 'no' ? 145.33 : -0.5} 483 ${config.show_solar === 'no' ? 270.67 : 406}" height="${config.show_solar === 'no' ? '246px' : '396px'}" width="100%"  xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1">
-            <text id="daily_bat_charge_value" x="77.2" y="344.675" class="${config.show_daily === 'no' ? 'st11' : 'st10 st2 left-align'}" >${stateObj1.state ? stateObj1.state : '0'} kWh</text>
-            <text id="daily_bat_charge" x="77.2" y="357.236" class="${config.show_daily === 'no' ? 'st11' : 'st3 st2 left-align'}" >DAILY CHARGE</text>
-            <text id="duration" x="318.45" y="377.533" class="${config.battery_energy === 'hidden' ? 'st11' : 'st2 st4 left-align'}" >${duration}</text>
-            <text id="duration_text" x="318.45" y="393.77" class="${config.battery_energy === 'hidden' ? 'st11' : 'st2 st3 left-align'}" >BATTERY RUNTIME</text>
-            <text id="daily_bat_discharge_value" x="77.2" y="380.156" class="${config.show_daily === 'no' ? 'st11' : 'st10 st2 left-align'}" >${stateObj.state ? stateObj.state : '0'} kWh</text>
-            <text id="daily_bat_charge" x="77.2" y="393.77" class="${config.show_daily === 'no' ? 'st11' : 'st3 st2 left-align'}" >DAILY DISCHARGE</text>
-            <text id="daily_load_value" x="400.475" y="267.92" class="${config.show_daily === 'no' ? 'st11' : 'st10 st6 left-align'}" >${stateObj2.state ? stateObj2.state : '0'} kWh</text>
-            <text id="daily_load" x="400.475" y="282.13" class="${config.show_daily === 'no' ? 'st11' : 'st3 st6 left-align'}" >DAILY LOAD</text>
-            <text id="daily_grid_value" x="14.475" y="267.92" class="${config.show_daily === 'no' ? 'st11' : 'st10 st7 left-align'}" >${stateObj3.state ? stateObj3.state : '0'} kWh</text>
-            <text id="daily_grid" x="14.475" y="282.13" class="${config.show_daily === 'no' ? 'st11' : 'st3 st7 left-align'}" >DAILY GRID</text>
-            <text id="daily_solar_value" x="226.775" y="16.23" class="${config.show_daily === 'no' || config.show_solar === 'no' ? 'st11' : 'st10 st1 left-align'}" >${stateObj4.state ? stateObj4.state : '0'} kWh</text>
-            <text id="daily_solar" x="226.775" y="30.44" class="${config.show_daily === 'no' || config.show_solar === 'no' ? 'st11' : 'st3 st1 left-align'}" >DAILY SOLAR</text>
-            <text id="inverter_grid_voltage_154" x="270.2" y="168.28" class="st3 st9 left-align" >${stateObj5.state ? stateObj5.state : '0'} V</text>
-            <text id="inverter_load_freq_192" x="270.2" y="180.447" class="st3 st9 left-align">${stateObj6.state ? stateObj6.state : '0'} Hz</text>
-            <text id="inverter_out_164" x="270.2" y="192.612" class="st3 st9 left-align">${stateObj7.state ? stateObj7.state : '0'} A</text>
-            <text id="pv2_power_187" x="289.5" y="71.04" class="${config.show_solar === 'no' ? 'st12' : 'st1 st4 st8'}">${stateObj8.state ? stateObj8.state : '0'} W</text>
-            <text id="pv1_power_186" x="188.175" y="71.04" class="${config.show_solar === 'no' ? 'st12' : 'st1 st4 st8'}">${stateObj9.state ? stateObj9.state : '0'} W</text>
-            <text id="pvtotal_power" x="238.83" y="133.96" class="${config.show_solar === 'no' ? 'st12' : 'st1 st4 st8'}">${totalsolar ? totalsolar : '0'} W</text>
-            <text x="173.7" y="93.368" class="${config.show_solar === 'no' ? 'st12' : 'st1 st3 st8'}">PV1</text>
-            <text x="272.61" y="93.368" class="${config.show_solar === 'no' ? 'st12' : 'st1 st3 st8'}">PV2</text>
-            <text id="battery_voltage_183" x="193" y="345.05" class="st2 st4 st8">${stateObj11.state ? stateObj11.state : '0'} V</text>
-            <text id="battery_soc_184" x="193" y="365.35" class="st2 st4 st8">${stateObj12.state ? stateObj12.state : '0'} %</text>
-            <text id="battery_out_190" x="193" y="385.65" class="st2 st4 st8">${stateObj13.state < '0' ? stateObj13.state *-1 : stateObj13.state} W</text>
-            <text id="ess_power" x="340.16" y="219.21" class="st4 st6 st8">${stateObj14.state ? stateObj14.state : '0'} W</text>
-            <text id="grid_external_power_172" x="135.1" y="219.21" class="st4 st7 st8">${stateObj15.state ? stateObj15.state : '0'} W</text>
-            <text id="pv1_v" x="120.62" y="64.95" class="${config.show_solar === 'no' ? 'st12' : 'st3 st1 left-align'}" >${stateObj16.state ? stateObj16.state : '0'} V</text>
-            <text id="pv1_i" x="120.62" y="77.13" class="${config.show_solar === 'no' ? 'st12' : 'st3 st1 left-align'}" >${stateObj17.state ? stateObj17.state : '0'} A</text>
-            <text id="pv2_v" x="332.028" y="64.95" class="${config.show_solar === 'no' ? 'st12' : 'st3 st1 left-align'}" >${stateObj18.state ? stateObj18.state : '0'} V</text>
-            <text id="pv2_i" x="332.028" y="77.13" class="${config.show_solar === 'no' ? 'st12' : 'st3 st1 left-align'}" >${stateObj19.state ? stateObj19.state : '0'} A</text>
-            <text id="timer_text_off" x="287.08" y="254.73" class="${stateObj26.state == 'off' && config.entities.use_timer_248 !== 'no' ? 'st3 st9 left-align' : 'st12'}">Timer off</text>
-            <text id="timer_text_on" x="287.08" y="254.73" class="${stateObj26.state == 'on' && config.entities.use_timer_248 !== 'no' ? 'st3 st9 left-align' : 'st12'}">Timer on</text>
-            <text id="priority_text_batt"x="287.08" y="273" class="${stateObj25.state === 'off' && config.entities.priority_load_243 !== 'no' ? 'st3 st9 left-align' : 'st12'}">Priority Batt</text>
-            <text id="priority_text_load"x="287.08" y="273" class="${stateObj25.state === 'on' && config.entities.priority_load_243 !== 'no' ? 'st3 st9 left-align' : 'st12'}">Priority Load</text>
+            <text id="daily_bat_charge_value" x="77.2" y="344.6" class="${config.show_daily === 'no' ? 'st11' : 'st10 st2 left-align'}" >${stateObj1.state ? stateObj1.state : '0'} kWh</text>
+            <text id="daily_bat_charge" x="77.2" y="357.2" class="${config.show_daily === 'no' ? 'st11' : 'st3 st2 left-align'}" >DAILY CHARGE</text>
+            <text id="duration" x="318.4" y="377.5" class="${config.battery_energy === 'hidden' ? 'st11' : 'st2 st4 left-align'}" >${duration}</text>
+            <text id="duration_text" x="318.4" y="393.7" class="${config.battery_energy === 'hidden' ? 'st11' : 'st2 st3 left-align'}" >BATTERY RUNTIME</text>
+            <text id="daily_bat_discharge_value" x="77.2" y="380.1" class="${config.show_daily === 'no' ? 'st11' : 'st10 st2 left-align'}" >${stateObj.state ? stateObj.state : '0'} kWh</text>
+            <text id="daily_bat_charge" x="77.2" y="393.7" class="${config.show_daily === 'no' ? 'st11' : 'st3 st2 left-align'}" >DAILY DISCHARGE</text>
+            <text id="daily_load_value" x="400.4" y="267.9" class="${config.show_daily === 'no' ? 'st11' : 'st10 st6 left-align'}" >${stateObj2.state ? stateObj2.state : '0'} kWh</text>
+            <text id="daily_load" x="400.4" y="282.1" class="${config.show_daily === 'no' ? 'st11' : 'st3 st6 left-align'}" >DAILY LOAD</text>
+            <text id="daily_grid_value" x="14.4" y="267.9" class="${config.show_daily === 'no' ? 'st11' : 'st10 st7 left-align'}" >${stateObj3.state ? stateObj3.state : '0'} kWh</text>
+            <text id="daily_grid" x="14.4" y="282.1" class="${config.show_daily === 'no' ? 'st11' : 'st3 st7 left-align'}" >DAILY GRID</text>
+            <text id="daily_solar_value" x="226.7" y="16.2" class="${config.show_daily === 'no' || config.show_solar === 'no' ? 'st11' : 'st10 st1 left-align'}" >${stateObj4.state ? stateObj4.state : '0'} kWh</text>
+            <text id="daily_solar" x="226.7" y="30.4" class="${config.show_daily === 'no' || config.show_solar === 'no' ? 'st11' : 'st3 st1 left-align'}" >DAILY SOLAR</text>
+            <text id="inverter_grid_voltage_154" x="270.2" y="168.2" class="st3 st9 left-align" >${stateObj5.state ? stateObj5.state : '0'} V</text>
+            <text id="inverter_load_freq_192" x="270.2" y="180.4" class="st3 st9 left-align">${stateObj6.state ? stateObj6.state : '0'} Hz</text>
+            <text id="inverter_out_164" x="270.2" y="192.6" class="st3 st9 left-align">${stateObj7.state ? stateObj7.state : '0'} A</text>
+            <text id="pv2_power_187" x="289.5" y="71" class="${config.show_solar === 'no' ? 'st12' : 'st1 st4 st8'}">${stateObj8.state ? stateObj8.state : '0'} W</text>
+            <text id="pv1_power_186" x="188.1" y="71" class="${config.show_solar === 'no' ? 'st12' : 'st1 st4 st8'}">${stateObj9.state ? stateObj9.state : '0'} W</text>
+            <text id="pvtotal_power" x="238.8" y="133.9" class="${config.show_solar === 'no' ? 'st12' : 'st1 st4 st8'}">${totalsolar ? totalsolar : '0'} W</text>
+            <text x="173.7" y="93.3" class="${config.show_solar === 'no' ? 'st12' : 'st1 st3 st8'}">PV1</text>
+            <text x="272.6" y="93.3" class="${config.show_solar === 'no' ? 'st12' : 'st1 st3 st8'}">PV2</text>
+            <text id="battery_voltage_183" x="193" y="345" class="st2 st4 st8">${stateObj11.state ? stateObj11.state : '0'} V</text>
+            <text id="battery_soc_184" x="193" y="365.3" class="st2 st4 st8">${stateObj12.state ? stateObj12.state : '0'} %</text>
+            <text id="battery_out_190" x="193" y="385.6" class="st2 st4 st8">${stateObj13.state < '0' ? stateObj13.state *-1 : stateObj13.state} W</text>
+            <text id="ess_power" x="340.1" y="219.2" class="st4 st6 st8">${stateObj14.state ? stateObj14.state : '0'} W</text>
+            <text id="grid_external_power_172" x="135.1" y="219.2" class="st4 st7 st8">${stateObj15.state ? stateObj15.state : '0'} W</text>
+            <text id="pv1_v" x="120.6" y="64.9" class="${config.show_solar === 'no' ? 'st12' : 'st3 st1 left-align'}" >${stateObj16.state ? stateObj16.state : '0'} V</text>
+            <text id="pv1_i" x="120.6" y="77.1" class="${config.show_solar === 'no' ? 'st12' : 'st3 st1 left-align'}" >${stateObj17.state ? stateObj17.state : '0'} A</text>
+            <text id="pv2_v" x="332" y="64.9" class="${config.show_solar === 'no' ? 'st12' : 'st3 st1 left-align'}" >${stateObj18.state ? stateObj18.state : '0'} V</text>
+            <text id="pv2_i" x="332" y="77.1" class="${config.show_solar === 'no' ? 'st12' : 'st3 st1 left-align'}" >${stateObj19.state ? stateObj19.state : '0'} A</text>
+            <text id="timer_text_off" x="287" y="254.7" class="${stateObj26.state == 'off' && config.entities.use_timer_248 !== 'no' ? 'st3 st9 left-align' : 'st12'}">Timer off</text>
+            <text id="timer_text_on" x="287" y="254.7" class="${stateObj26.state == 'on' && config.entities.use_timer_248 !== 'no' ? 'st3 st9 left-align' : 'st12'}">Timer on</text>
+            <text id="priority_text_batt"x="287" y="273" class="${stateObj25.state === 'off' && config.entities.priority_load_243 !== 'no' ? 'st3 st9 left-align' : 'st12'}">Priority Batt</text>
+            <text id="priority_text_load"x="287" y="273" class="${stateObj25.state === 'on' && config.entities.priority_load_243 !== 'no' ? 'st3 st9 left-align' : 'st12'}">Priority Load</text>
             
-            <circle id="standby" cx="217.125" cy="267.92" r="3.5" fill="${stateObj21.state === '0' || stateObj21.state === 'standby' ? 'blue' : 'transparent'}"/>
-            <circle id="selftest" cx="217.125" cy="267.92" r="3.5" fill="${stateObj21.state === '1' || stateObj21.state === 'selftest' ? 'yellow' : 'transparent'}"/>
-            <circle id="normal" cx="217.125" cy="267.92" r="3.5" fill="${stateObj21.state === '2' || stateObj21.state === 'normal' ? 'green' : 'transparent'}"/>
-            <circle id="alarm" cx="217.125" cy="267.92" r="3.5" fill="${stateObj21.state === '3' || stateObj21.state === 'alarm' ? 'orange' : 'transparent'}"/>
-            <circle id="fault" cx="217.125" cy="267.92" r="3.5" fill="${stateObj21.state === '4' || stateObj21.state === 'fault' ? 'red' : 'transparent'}"/>
-            <circle id="grid" cx="31.362" cy="251.689" r="3.5" fill="${stateObj20.state === 'off' ? 'red' : 'transparent'}"/>
+            <circle id="standby" cx="217.1" cy="267.9" r="3.5" fill="${stateObj21.state === '0' || stateObj21.state === 'standby' ? 'blue' : 'transparent'}"/>
+            <circle id="selftest" cx="217.1" cy="267.9" r="3.5" fill="${stateObj21.state === '1' || stateObj21.state === 'selftest' ? 'yellow' : 'transparent'}"/>
+            <circle id="normal" cx="217.1" cy="267.9" r="3.5" fill="${stateObj21.state === '2' || stateObj21.state === 'normal' ? 'green' : 'transparent'}"/>
+            <circle id="alarm" cx="217.1" cy="267.9" r="3.5" fill="${stateObj21.state === '3' || stateObj21.state === 'alarm' ? 'orange' : 'transparent'}"/>
+            <circle id="fault" cx="217.1" cy="267.9" r="3.5" fill="${stateObj21.state === '4' || stateObj21.state === 'fault' ? 'red' : 'transparent'}"/>
+            <circle id="grid" cx="31.3" cy="251.6" r="3.5" fill="${stateObj20.state === 'off' ? 'red' : 'transparent'}"/>
             
             <path id="pv1-line" d="M 189 84.5 L 189 122.03 Q 189 132.03 197 132.03 L 205 132.03" class="${config.show_solar === 'no' ? 'st12' : ''}" fill="none" stroke="#ff9933" stroke-width="1" stroke-miterlimit="10"  pointer-events="stroke"/>
             <circle id="pv1-dot" cx="0" cy="0" r="3" class="${config.show_solar === 'no' ? 'st12' : ''}" fill="${stateObj9.state === '0' ? 'transparent' : '#ff9933'}">
@@ -581,10 +581,10 @@ class SunsynkPowerFlowCard extends LitElement {
             <rect x="154" y="54.5" width="70" height="30" rx="4.5" ry="4.5" fill="none" stroke="#ff9933" pointer-events="all" class="${config.show_solar === 'no' ? 'st12' : ''}"/>
             <rect x="254" y="54.5" width="70" height="30" rx="4.5" ry="4.5" fill="none" stroke="#ff9933" pointer-events="all" class="${config.show_solar === 'no' ? 'st12' : ''}"/>
 
-            <svg xmlns="http://www.w3.org/2000/svg" id="timer" x="267.787" y="243.3" width="18" height="18" viewBox="0 0 24 24"><path class="${stateObj26.state == 'on' && config.entities.use_timer_248 !== 'no' ? 'st9' : 'st12'}" d="M15 1H9v2h6V1zm-4 13h2V8h-2v6zm8.03-6.61l1.42-1.42c-.43-.51-.9-.99-1.41-1.41l-1.42 1.42A8.962 8.962 0 0 0 12 4c-4.97 0-9 4.03-9 9s4.02 9 9 9a8.994 8.994 0 0 0 7.03-14.61zM12 20c-3.87 0-7-3.13-7-7s3.13-7 7-7s7 3.13 7 7s-3.13 7-7 7z"/></svg>
-            <svg xmlns="http://www.w3.org/2000/svg" id="timer_off" x="267.787" y="243.3" width="18" height="18" viewBox="0 0 24 24"><path class="${stateObj26.state == 'off' && config.entities.use_timer_248 !== 'no' ? 'st9' : 'st12'}" d="m19.95 17.15l-1.5-1.5q.275-.675.413-1.337T19 13q0-2.9-2.05-4.95T12 6q-.6 0-1.275.125t-1.4.4l-1.5-1.5q.95-.5 2.012-.763T12 4q1.5 0 2.938.5t2.712 1.45l1.4-1.4l1.4 1.4l-1.4 1.4q.95 1.275 1.45 2.713T21 13q0 1.05-.263 2.087t-.787 2.063ZM13 10.2V8h-2v.2l2 2Zm6.8 12.4l-2.4-2.4q-1.2.875-2.588 1.338T12 22q-1.85 0-3.488-.713T5.65 19.35q-1.225-1.225-1.938-2.863T3 13q0-1.5.463-2.888T4.8 7.6L1.4 4.2l1.4-1.4l18.4 18.4l-1.4 1.4ZM12 20q1.05 0 2.05-.325t1.875-.925L6.2 9.025q-.6.875-.9 1.875T5 13q0 2.9 2.05 4.95T12 20ZM9 3V1h6v2H9Zm2.075 10.875Zm2.825-2.8Z"/></svg>
-            <svg xmlns="http://www.w3.org/2000/svg" id="pbat" x="267.787" y="262.561" width="18" height="18" viewBox="0 0 24 24"><path class="${stateObj25.state === 'off' && config.entities.priority_load_243 !== 'no' ? 'st9' : 'st12'}" d="M15.95 21.175L13.1 18.35l1.425-1.4l1.425 1.4l3.525-3.525l1.425 1.4l-4.95 4.95ZM8 22q-.425 0-.713-.288T7 21V5q0-.425.288-.713T8 4h2V2h4v2h2q.425 0 .713.288T17 5v7q-.525 0-1.025.088T15 12.35V6H9v14h2.35q.2.575.488 1.075t.687.925H8Zm1-2h2.35H11h.35H9Z"/></svg>
-            <svg xmlns="http://www.w3.org/2000/svg" id="pload" x="267.787" y="262.561" width="18" height="18" viewBox="0 0 24 24"><path class="${stateObj25.state === 'on' && config.entities.priority_load_243 !== 'no' ? 'st9' : 'st12'}" d="m15 13l-4 4v-3H2v-2h9V9l4 4M5 20v-4h2v2h10v-7.81l-5-4.5L7.21 10H4.22L12 3l10 9h-3v8H5Z"/></svg>
+            <svg xmlns="http://www.w3.org/2000/svg" id="timer" x="267.7" y="243.3" width="18" height="18" viewBox="0 0 24 24"><path class="${stateObj26.state == 'on' && config.entities.use_timer_248 !== 'no' ? 'st9' : 'st12'}" d="M15 1H9v2h6V1zm-4 13h2V8h-2v6zm8.03-6.61l1.42-1.42c-.43-.51-.9-.99-1.41-1.41l-1.42 1.42A8.962 8.962 0 0 0 12 4c-4.97 0-9 4.03-9 9s4.02 9 9 9a8.994 8.994 0 0 0 7.03-14.61zM12 20c-3.87 0-7-3.13-7-7s3.13-7 7-7s7 3.13 7 7s-3.13 7-7 7z"/></svg>
+            <svg xmlns="http://www.w3.org/2000/svg" id="timer_off" x="267.7" y="243.3" width="18" height="18" viewBox="0 0 24 24"><path class="${stateObj26.state == 'off' && config.entities.use_timer_248 !== 'no' ? 'st9' : 'st12'}" d="m19.95 17.15l-1.5-1.5q.275-.675.413-1.337T19 13q0-2.9-2.05-4.95T12 6q-.6 0-1.275.125t-1.4.4l-1.5-1.5q.95-.5 2.012-.763T12 4q1.5 0 2.938.5t2.712 1.45l1.4-1.4l1.4 1.4l-1.4 1.4q.95 1.275 1.45 2.713T21 13q0 1.05-.263 2.087t-.787 2.063ZM13 10.2V8h-2v.2l2 2Zm6.8 12.4l-2.4-2.4q-1.2.875-2.588 1.338T12 22q-1.85 0-3.488-.713T5.65 19.35q-1.225-1.225-1.938-2.863T3 13q0-1.5.463-2.888T4.8 7.6L1.4 4.2l1.4-1.4l18.4 18.4l-1.4 1.4ZM12 20q1.05 0 2.05-.325t1.875-.925L6.2 9.025q-.6.875-.9 1.875T5 13q0 2.9 2.05 4.95T12 20ZM9 3V1h6v2H9Zm2.075 10.875Zm2.825-2.8Z"/></svg>
+            <svg xmlns="http://www.w3.org/2000/svg" id="pbat" x="267.7" y="262.5" width="18" height="18" viewBox="0 0 24 24"><path class="${stateObj25.state === 'off' && config.entities.priority_load_243 !== 'no' ? 'st9' : 'st12'}" d="M15.95 21.175L13.1 18.35l1.425-1.4l1.425 1.4l3.525-3.525l1.425 1.4l-4.95 4.95ZM8 22q-.425 0-.713-.288T7 21V5q0-.425.288-.713T8 4h2V2h4v2h2q.425 0 .713.288T17 5v7q-.525 0-1.025.088T15 12.35V6H9v14h2.35q.2.575.488 1.075t.687.925H8Zm1-2h2.35H11h.35H9Z"/></svg>
+            <svg xmlns="http://www.w3.org/2000/svg" id="pload" x="267.7" y="262.5" width="18" height="18" viewBox="0 0 24 24"><path class="${stateObj25.state === 'on' && config.entities.priority_load_243 !== 'no' ? 'st9' : 'st12'}" d="m15 13l-4 4v-3H2v-2h9V9l4 4M5 20v-4h2v2h10v-7.81l-5-4.5L7.21 10H4.22L12 3l10 9h-3v8H5Z"/></svg>
 
           </svg>
         </div>