diff --git a/modules/home/wayland/apps/eww/bar/modules/sys.yuck b/modules/home/wayland/apps/eww/bar/modules/sys.yuck
index 2f55dcc..aae60a4 100644
--- a/modules/home/wayland/apps/eww/bar/modules/sys.yuck
+++ b/modules/home/wayland/apps/eww/bar/modules/sys.yuck
@@ -36,7 +36,7 @@
           :visible {battery.visible}
           :style "color: ${battery.color};"
           :thickness 6
-          :tooltip "${battery.status}"
+          :tooltip "${battery.status} @ ${battery.wattage}"
           (label :class "icon-text" :text "B"))
       )
     )
diff --git a/modules/home/wayland/apps/eww/bar/scripts/net/net b/modules/home/wayland/apps/eww/bar/scripts/net/net
index 7efbfb1..35ee48e 100755
--- a/modules/home/wayland/apps/eww/bar/scripts/net/net
+++ b/modules/home/wayland/apps/eww/bar/scripts/net/net
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env zsh
 
 function get_time_ms {
   date -u +%s%3N
diff --git a/modules/home/wayland/apps/eww/bar/scripts/sys/battery b/modules/home/wayland/apps/eww/bar/scripts/sys/battery
index 070cbc6..5964975 100755
--- a/modules/home/wayland/apps/eww/bar/scripts/sys/battery
+++ b/modules/home/wayland/apps/eww/bar/scripts/sys/battery
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env zsh
 
 icons=("󰂎" "󰁺" "󰁻" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹")
 num_icons=$(awk -v n="${#icons[@]}" 'BEGIN{print 100 / n}')
@@ -11,7 +11,7 @@ geticon() {
 
 status() {
   if [ "$STATE" = "Charging" ]; then
-    echo -n "charging"
+    echo -n "Charging"
 
     if [ "$RATE" -gt 0 ]; then
       echo ", $(gettime) left"
@@ -21,7 +21,7 @@ status() {
   elif [ "$STATE" = "Discharging" ]; then
     echo "$(gettime)h left"
   else
-    echo "fully charged"
+    echo "Fully Charged"
   fi
 }
 
@@ -39,9 +39,9 @@ gettime() {
 
   if [ "$RATE" -gt 0 ]; then
     if [ "$STATE" = "Discharging" ]; then
-      EX=$(($NOW / $RATE))
+      EX=$(( ($NOW*1.0) / $RATE))
     else
-      EX=$(( ($FULL - $NOW) / $RATE))
+      EX=$(( (($FULL - $NOW)*1.0) / $RATE))
     fi
     date -u -d@"$(awk -v ex="$EX" 'BEGIN{print ex * 3600}')" +%H:%M
   fi
diff --git a/modules/home/wayland/apps/eww/bar/scripts/sys/cpu b/modules/home/wayland/apps/eww/bar/scripts/sys/cpu
index f1f641a..8441a36 100755
--- a/modules/home/wayland/apps/eww/bar/scripts/sys/cpu
+++ b/modules/home/wayland/apps/eww/bar/scripts/sys/cpu
@@ -1 +1 @@
-#!/usr/bin/env bash
+#!/usr/bin/env zsh
diff --git a/modules/home/wayland/apps/eww/bar/scripts/sys/gpu b/modules/home/wayland/apps/eww/bar/scripts/sys/gpu
index 427a240..44ff401 100755
--- a/modules/home/wayland/apps/eww/bar/scripts/sys/gpu
+++ b/modules/home/wayland/apps/eww/bar/scripts/sys/gpu
@@ -1,3 +1,3 @@
-#!/usr/bin/env bash
+#!/usr/bin/env zsh
 
 amdgpu_top -J -s 5000 | sed 's/ //g' 
\ No newline at end of file
diff --git a/modules/home/wayland/apps/eww/bar/scripts/sys/memory b/modules/home/wayland/apps/eww/bar/scripts/sys/memory
index 99daad4..08de4d5 100755
--- a/modules/home/wayland/apps/eww/bar/scripts/sys/memory
+++ b/modules/home/wayland/apps/eww/bar/scripts/sys/memory
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env zsh
 
 total="$(free --si | rg Mem | awk '{print $2}')"