diff --git a/blocks.def/battery_button.sh b/blocks.def/battery_button.sh
index 52efd33..b6b51ad 100755
--- a/blocks.def/battery_button.sh
+++ b/blocks.def/battery_button.sh
@@ -8,31 +8,31 @@ read -r charge_now </sys/class/power_supply/BAT0/charge_now
 
 if [ "$ac" = 1 ] ; then
     read -r charge_full </sys/class/power_supply/BAT0/charge_full
-    val=$(( charge_full-charge_now ))
+    val="$(( charge_full-charge_now ))"
 else
-    val=$charge_now
+    val="$charge_now"
 fi
 
-hr=$(( val / rate ))
-mn=$(( (val * 60) / rate - hr * 60 ))
+hr="$(( val / rate ))"
+mn="$(( (val * 60) / rate - hr * 60 ))"
 
-case $hr in
+case "$hr" in
     0)
-        case $mn in
+        case "$mn" in
             0) notify-send "Battery fully charged" ;;
             1) notify-send "1 minute remaining" ;;
             *) notify-send "$mn minutes remaining" ;;
         esac
         ;;
     1)
-        case $mn in
+        case "$mn" in
             0) notify-send "1 hour remaining" ;;
             1) notify-send "1 hour, 1 minute remaining" ;;
             *) notify-send "1 hour, $mn minutes remaining" ;;
         esac
         ;;
     *)
-        case $mn in
+        case "$mn" in
             0) notify-send "$hr hours remaining" ;;
             1) notify-send "$hr hours, 1 minute remaining" ;;
             *) notify-send "$hr hours, $mn minutes remaining" ;;
diff --git a/blocks.def/cpu_temp.sh b/blocks.def/cpu_temp.sh
index e660639..8159ea1 100755
--- a/blocks.def/cpu_temp.sh
+++ b/blocks.def/cpu_temp.sh
@@ -6,7 +6,7 @@ ICONc="
" # icon for critical temperatures
 crit=70 # critical temperature
 
 read -r temp </sys/class/thermal/thermal_zone0/temp
-temp=${temp%???}
+temp="${temp%???}"
 
 if [ "$temp" -lt "$crit" ] ; then
     printf "$ICONn%s°C" "$temp"
diff --git a/blocks.def/cpu_temp_button.sh b/blocks.def/cpu_temp_button.sh
index 9da4b85..d10b196 100755
--- a/blocks.def/cpu_temp_button.sh
+++ b/blocks.def/cpu_temp_button.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-case $1 in
+case "$1" in
     1) exec "$TERMINAL" -e "htop -s PERCENT_CPU" ;;
     2) exec "$TERMINAL" -e "htop" ;;
     3) exec "$TERMINAL" -e "htop -s PERCENT_MEM" ;;
diff --git a/blocks.def/volume.pipewire.sh b/blocks.def/volume.pipewire.sh
index 445d514..b4e6c8f 100755
--- a/blocks.def/volume.pipewire.sh
+++ b/blocks.def/volume.pipewire.sh
@@ -3,7 +3,7 @@
 # This script parses the output of `pactl list sinks' to find volume and mute
 # status of the default audio sink and whether headphones are plugged in or not
 # Also see ../daemons/pulse_daemon.sh
-sink=$(pactl info | awk '$1 == "Default" && $2 == "Sink:" {print $3}')
+sink="$(pactl info | awk '$1 == "Default" && $2 == "Sink:" {print $3}')"
 [ -n "$sink" ] || exit
 pactl list sinks | awk -v sink="$sink" '
     BEGIN {
diff --git a/blocks.def/volume_button.sh b/blocks.def/volume_button.sh
index f72c885..b0f58d4 100755
--- a/blocks.def/volume_button.sh
+++ b/blocks.def/volume_button.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-case $1 in
+case "$1" in
     1) pactl set-sink-mute @DEFAULT_SINK@ toggle ;;
     3) pactl set-sink-volume @DEFAULT_SINK@ 50% ;;
 esac
diff --git a/daemons/pulse_daemon.sh b/daemons/pulse_daemon.sh
index e732220..222099b 100755
--- a/daemons/pulse_daemon.sh
+++ b/daemons/pulse_daemon.sh
@@ -3,7 +3,7 @@
 # It signals volume block to update on audio related events
 pactl subscribe |
     while IFS='' read -r output ; do
-        case $output in
+        case "$output" in
             *" sink "*) sigdwmblocks 1 ;;
         esac
     done