diff --git a/.scripts/change-colortheme.py b/.scripts/change-colortheme.py
index cc86a6a..cc6c8f2 100755
--- a/.scripts/change-colortheme.py
+++ b/.scripts/change-colortheme.py
@@ -1,4 +1,4 @@
-#!/bin/env python3
+#!/usr/bin/env python3
 
 '''
 - kvantum:      kvantummanager --set catppuccin-mocha-"$flavor"
diff --git a/.scripts/change-wallpaper.sh b/.scripts/change-wallpaper.sh
index 238dfda..2dbbaff 100755
--- a/.scripts/change-wallpaper.sh
+++ b/.scripts/change-wallpaper.sh
@@ -1,4 +1,4 @@
-#!/bin/env bash
+#!/usr/bin/env bash
 
 if [ -z "$1" ]; then
     image=$(zenity --file-selection --title="Open File" --file-filter="*.jpg *.jpeg *.png *.webp *.bmp *.jfif *.tiff *.avif *.heic *.heif")
diff --git a/.scripts/fetch-weather.sh b/.scripts/fetch-weather.sh
index e4823cd..96fcb05 100755
--- a/.scripts/fetch-weather.sh
+++ b/.scripts/fetch-weather.sh
@@ -1,4 +1,4 @@
-#!/bin/env bash
+#!/usr/bin/env bash
 
 ## Collect data
 cache_dir="$HOME/.cache/eww/weather"
diff --git a/.scripts/waybar-toggle.sh b/.scripts/waybar-toggle.sh
index 71b87b0..10b1710 100755
--- a/.scripts/waybar-toggle.sh
+++ b/.scripts/waybar-toggle.sh
@@ -1,4 +1,4 @@
-#!/bin/env bash
+#!/usr/bin/env bash
 
 function close() {
     killall -q waybar
diff --git a/.scripts/waydroid-reload.sh b/.scripts/waydroid-reload.sh
index cc171b5..1817ffa 100755
--- a/.scripts/waydroid-reload.sh
+++ b/.scripts/waydroid-reload.sh
@@ -1,7 +1,7 @@
-#!/bin/env bash
+#!/usr/bin/env bash
 
 function checkReturn {
-    echo "Executing: $@"
+    echo "Executing: $*"
     if ! "$@"; then
         echo "Error runnning command"
         exit 1
diff --git a/.scripts/workspace-new.sh b/.scripts/workspace-new.sh
index f4d5032..7ce005d 100755
--- a/.scripts/workspace-new.sh
+++ b/.scripts/workspace-new.sh
@@ -1,4 +1,4 @@
-#!/bin/env bash
+#!/usr/bin/env bash
 
 # get highest workspace ID
 max_id=$(hyprctl workspaces | grep '^workspace ID ' | awk '{print $3}' | sort -n | tail -1)
diff --git a/eww/Lyrics/scripts/colorize.sh b/eww/Lyrics/scripts/colorize.sh
index 09f3e14..3dceaec 100755
--- a/eww/Lyrics/scripts/colorize.sh
+++ b/eww/Lyrics/scripts/colorize.sh
@@ -1,9 +1,9 @@
-#!/bin/env bash
+#!/usr/bin/env bash
 
 HIGHLIGHT_COLOR="#cdd6f4" # text
 NORMAL_COLOR="#7f849c" # overlay1
 TARGET_LINE=1
-[ -n $1 ] && TARGET_LINE="$1"
+[ -n "$1" ] && TARGET_LINE="$1"
 
 mapfile -t lines
 
diff --git a/eww/Lyrics/scripts/lyric-offset.py b/eww/Lyrics/scripts/lyric-offset.py
index de4dad6..6704990 100755
--- a/eww/Lyrics/scripts/lyric-offset.py
+++ b/eww/Lyrics/scripts/lyric-offset.py
@@ -1,4 +1,4 @@
-#!/bin/env python3
+#!/usr/bin/env python3
 
 APP_NAME = "spotify-lyrics"
 STATE_DIR_NAME = "~/.local/state/eww/lyrics"
diff --git a/eww/Main/scripts/fortune-split b/eww/Main/scripts/fortune-split
index 9503682..c357394 100755
--- a/eww/Main/scripts/fortune-split
+++ b/eww/Main/scripts/fortune-split
@@ -1,4 +1,4 @@
-#!/bin/env python3
+#!/usr/bin/env python3
 
 import sys
 import subprocess
diff --git a/waybar/modules/publicip.sh b/waybar/modules/publicip.sh
index 7576638..1f0e9bb 100755
--- a/waybar/modules/publicip.sh
+++ b/waybar/modules/publicip.sh
@@ -1,4 +1,4 @@
-#!/bin/env bash
+#!/usr/bin/env bash
 # shellcheck disable=SC1091,SC1090
 
 # Entries in publicip.conf: