diff --git a/core/tabs/system-setup/arch/hyprland-kool.sh b/core/tabs/system-setup/arch/hyprland-kool.sh
index 44cb4ec3c..7c85f857f 100644
--- a/core/tabs/system-setup/arch/hyprland-kool.sh
+++ b/core/tabs/system-setup/arch/hyprland-kool.sh
@@ -1,15 +1,15 @@
-#!/bin/bash
+#!/bin/sh
 
 . ../../common-script.sh
 
 printf "%b\n" "${YELLOW}Starting Hyprland JaKooLit installation${RC}"
 
-if ! pacman -Q base-devel &>/dev/null; then
+if ! pacman -Q base-devel >/dev/null 2>&1; then
     printf "%b\n" "${YELLOW}Installing base-devel...${RC}"
     "$ESCALATION_TOOL" pacman -S --noconfirm base-devel
 fi
 
 git clone --depth=1 https://github.com/JaKooLit/Arch-Hyprland.git "$HOME/Arch-Hyprland" || { printf "%b\n" "${RED}Failed to clone Jakoolits Arch-Hyprland repo${RC}"; exit 1; }
-cd "$HOME/Arch-Hyprland"
+cd "$HOME/Arch-Hyprland" || { printf "%b\n" "${RED}Failed to navigate to Arch-Hyprland directory${RC}"; exit 1; }
 chmod +x install.sh
 ./install.sh
diff --git a/core/tabs/system-setup/debian/hyprland-kool-deb.sh b/core/tabs/system-setup/debian/hyprland-kool-deb.sh
index 88ef1940e..582297929 100644
--- a/core/tabs/system-setup/debian/hyprland-kool-deb.sh
+++ b/core/tabs/system-setup/debian/hyprland-kool-deb.sh
@@ -1,9 +1,9 @@
-#!/bin/bash
+#!/bin/sh
 
 . ../../common-script.sh
 
 printf "%b\n" "${YELLOW}Starting Hyprland JaKooLit installation${RC}"
 git clone --depth=1 https://github.com/JaKooLit/Debian-Hyprland.git "$HOME/Debian-Hyprland" || { printf "%b\n" "${RED}Failed to clone Jakoolits Debian-Hyprland repo${RC}"; exit 1; }
-cd "$HOME/Debian-Hyprland"
+cd "$HOME/Debian-Hyprland" || { printf "%b\n" "${RED}Failed to navigate to Debian-Hyprland directory${RC}"; exit 1; }
 chmod +x install.sh
 ./install.sh
\ No newline at end of file
diff --git a/core/tabs/system-setup/fedora/hyprland-kool-fed.sh b/core/tabs/system-setup/fedora/hyprland-kool-fed.sh
index c14d5d019..3a7ebd922 100644
--- a/core/tabs/system-setup/fedora/hyprland-kool-fed.sh
+++ b/core/tabs/system-setup/fedora/hyprland-kool-fed.sh
@@ -1,10 +1,10 @@
-#!/bin/bash
+#!/bin/sh
 
 . ../../common-script.sh
 
 printf "%b\n" "${YELLOW}Starting Hyprland JaKooLit installation${RC}"
 
 git clone --depth=1 https://github.com/JaKooLit/Fedora-Hyprland.git "$HOME/Fedora-Hyprland" || { printf "%b\n" "${RED}Failed to clone Jakoolits Fedora-Hyprland repo${RC}"; exit 1; }  
-cd "$HOME/Fedora-Hyprland"
+cd "$HOME/Fedora-Hyprland" || { printf "%b\n" "${RED}Failed to navigate to Fedora-Hyprland directory${RC}"; exit 1; }
 chmod +x install.sh
 ./install.sh
\ No newline at end of file
diff --git a/core/tabs/system-setup/ubuntu/hyprland-kool-ubuntu24.sh b/core/tabs/system-setup/ubuntu/hyprland-kool-ubuntu24.sh
index 6a6355baa..bd12ef76b 100644
--- a/core/tabs/system-setup/ubuntu/hyprland-kool-ubuntu24.sh
+++ b/core/tabs/system-setup/ubuntu/hyprland-kool-ubuntu24.sh
@@ -1,10 +1,10 @@
-#!/bin/bash
+#!/bin/sh
 
 . ../../common-script.sh
 
 printf "%b\n" "${YELLOW}Starting Hyprland JaKooLit installation${RC}"
 
-git clone -b 24.04 --depth=1  https://github.com/JaKooLit/Ubuntu-Hyprland.git "$HOME/Ubuntu-Hyprland-24.04" || { printf "%b\n" "${RED}Failed to clone Jakoolits Ubuntu-Hyprland repo${RC}"; exit 1; }
-cd "$HOME/Ubuntu-Hyprland-24.04"
+git clone -b 24.04 --depth=1 https://github.com/JaKooLit/Ubuntu-Hyprland.git "$HOME/Ubuntu-Hyprland-24.04" || { printf "%b\n" "${RED}Failed to clone Jakoolits Ubuntu-Hyprland repo${RC}"; exit 1; }
+cd "$HOME/Ubuntu-Hyprland-24.04" || { printf "%b\n" "${RED}Failed to navigate to Ubuntu-Hyprland-24.04 directory${RC}"; exit 1; }
 chmod +x install.sh
 ./install.sh
\ No newline at end of file