diff --git a/src/commands/common-script.sh b/src/commands/common-script.sh
index 30353cc0..a97a284f 100644
--- a/src/commands/common-script.sh
+++ b/src/commands/common-script.sh
@@ -8,23 +8,26 @@ YELLOW='\033[33m'
 GREEN='\033[32m'
 
 command_exists() {
-    which $1 >/dev/null 2>&1
+    which "$1" >/dev/null 2>&1
 }
 
-checkEnv() {
+
+checkCommandRequirements() {
     ## Check for requirements.
-    REQUIREMENTS='curl groups sudo'
+    REQUIREMENTS=$1
     for req in ${REQUIREMENTS}; do
-        if ! command_exists ${req}; then
-            echo -e "${RED}To run me, you need: ${REQUIREMENTS}${RC}"
+        if ! command_exists "${req}"; then
+            echo "${RED}To run me, you need: ${REQUIREMENTS}${RC}"
             exit 1
         fi
     done
+}
 
-    ## Check Package Handler
-    PACKAGEMANAGER='apt-get dnf pacman zypper'
+checkPackageManager() {
+    ## Check Package Manager
+    PACKAGEMANAGER=$1
     for pgm in ${PACKAGEMANAGER}; do
-        if command_exists ${pgm}; then
+        if command_exists "${pgm}"; then
             PACKAGER=${pgm}
             echo "Using ${pgm}"
             break
@@ -35,11 +38,13 @@ checkEnv() {
         echo -e "${RED}Can't find a supported package manager${RC}"
         exit 1
     fi
+}
 
+checkSuperUser() {
     ## Check SuperUser Group
     SUPERUSERGROUP='wheel sudo root'
     for sug in ${SUPERUSERGROUP}; do
-        if groups | grep -q ${sug}; then
+        if groups | grep -q "${sug}"; then
             SUGROUP=${sug}
             echo "Super user group ${SUGROUP}"
             break
@@ -47,15 +52,33 @@ checkEnv() {
     done
 
     ## Check if member of the sudo group.
-    if ! groups | grep -q ${SUGROUP}; then
-        echo -e "${RED}You need to be a member of the sudo group to run me!${RC}"
+    if ! groups | grep -q "${SUGROUP}"; then
+        echo "${RED}You need to be a member of the sudo group to run me!${RC}"
         exit 1
     fi
+}
 
+checkCurrentDirectoryWritable() {
+    ## Check if the current directory is writable.
+    GITPATH="$(dirname "$(realpath "$0")")"
+    if [ ! -w "$GITPATH" ]; then
+        echo "${RED}Can't write to $GITPATH${RC}"
+        exit 1
+    fi
+}
+
+checkDistro() {
     DTYPE="unknown"  # Default to unknown
     # Use /etc/os-release for modern distro identification
     if [ -f /etc/os-release ]; then
         . /etc/os-release
         DTYPE=$ID
     fi
-}
\ No newline at end of file
+}
+
+checkEnv() {
+    checkCommandRequirements 'curl groups sudo'
+    checkPackageHandler 'apt-get dnf pacman zypper'
+    checkSuperUser
+    checkDistro
+}
diff --git a/src/commands/dotfiles/alacritty-setup.sh b/src/commands/dotfiles/alacritty-setup.sh
index 4ef110f6..2e2156d4 100755
--- a/src/commands/dotfiles/alacritty-setup.sh
+++ b/src/commands/dotfiles/alacritty-setup.sh
@@ -1,5 +1,12 @@
 #!/bin/sh -e
 
+checkEnv() {
+    checkCommandRequirements 'curl groups sudo'
+    checkPackageManager 'apt-get dnf pacman zypper'
+    checkSuperUser
+    checkDistro
+}
+
 setupAlacritty() {
     echo "Install Alacritty if not already installed..."
     if ! command_exists alacritty; then
@@ -24,4 +31,4 @@ setupAlacritty() {
 }
 
 checkEnv
-setupAlacritty
\ No newline at end of file
+setupAlacritty
diff --git a/src/commands/dotfiles/kitty-setup.sh b/src/commands/dotfiles/kitty-setup.sh
index 60c9efb9..131d1f9a 100755
--- a/src/commands/dotfiles/kitty-setup.sh
+++ b/src/commands/dotfiles/kitty-setup.sh
@@ -1,14 +1,21 @@
 #!/bin/sh -e
 
+checkEnv() {
+    checkCommandRequirements 'curl groups sudo'
+    checkPackageManager 'apt-get dnf pacman zypper'
+    checkSuperUser
+    checkDistro
+}
+
 setupKitty() {
     echo "Install Kitty if not already installed..."
     if ! command_exists kitty; then
         case ${PACKAGER} in
             pacman)
-                sudo ${PACKAGER} -S --noconfirm kitty
+                sudo "${PACKAGER}" -S --noconfirm kitty
                 ;;
             *)
-                sudo ${PACKAGER} install -y kitty
+                sudo "${PACKAGER}" install -y kitty
                 ;;
         esac
     else
@@ -16,12 +23,12 @@ setupKitty() {
     fi
     echo "Copy Kitty config files"
     if [ -d "${HOME}/.config/kitty" ]; then
-        cp -r ${HOME}/.config/kitty ${HOME}/.config/kitty-bak
+        cp -r "${HOME}"/.config/kitty "${HOME}"/.config/kitty-bak
     fi
-    mkdir -p ${HOME}/.config/kitty/
-    wget -O ${HOME}/.config/kitty/kitty.conf https://github.com/ChrisTitusTech/dwm-titus/raw/main/config/kitty/kitty.conf
-    wget -O ${HOME}/.config/kitty/nord.conf https://github.com/ChrisTitusTech/dwm-titus/raw/main/config/kitty/nord.conf
+    mkdir -p "${HOME}"/.config/kitty/
+    wget -O "${HOME}"/.config/kitty/kitty.conf https://github.com/ChrisTitusTech/dwm-titus/raw/main/config/kitty/kitty.conf
+    wget -O "${HOME}"/.config/kitty/nord.conf https://github.com/ChrisTitusTech/dwm-titus/raw/main/config/kitty/nord.conf
 }
 
 checkEnv
-setupKitty
\ No newline at end of file
+setupKitty
diff --git a/src/commands/dotfiles/rofi-setup.sh b/src/commands/dotfiles/rofi-setup.sh
index d3c6b728..aab942ed 100755
--- a/src/commands/dotfiles/rofi-setup.sh
+++ b/src/commands/dotfiles/rofi-setup.sh
@@ -1,5 +1,12 @@
 #!/bin/sh -e
 
+checkEnv() {
+    checkCommandRequirements 'curl groups sudo'
+    checkPackageManager 'apt-get dnf pacman zypper'
+    checkSuperUser
+    checkDistro
+}
+
 setupRofi() {
     echo "Install Rofi if not already installed..."
     if ! command_exists rofi; then
@@ -29,4 +36,4 @@ setupRofi() {
 }
 
 checkEnv
-setupRofi
\ No newline at end of file
+setupRofi
diff --git a/src/commands/system-setup/1-compile-setup.sh b/src/commands/system-setup/1-compile-setup.sh
index 98b69b44..e34e68a0 100755
--- a/src/commands/system-setup/1-compile-setup.sh
+++ b/src/commands/system-setup/1-compile-setup.sh
@@ -22,6 +22,13 @@ fi
 
 cd "$LINUXTOOLBOXDIR/linux-setup" || exit
 
+checkEnv() {
+    checkCommandRequirements 'curl groups sudo'
+    checkPackageHandler 'apt yum dnf pacman zypper'
+    checkCurrentDirectoryWritable
+    checkSuperUser
+}
+
 installDepend() {
     ## Check for dependencies.
     DEPENDENCIES='tar tree multitail tldr trash-cli unzip cmake make jq'
@@ -51,30 +58,30 @@ installDepend() {
                 echo "No AUR helper found. Please install yay or paru."
                 exit 1
             fi
-            "$AUR_HELPER" --noconfirm -S $DEPENDENCIES
+            "$AUR_HELPER" --noconfirm -S "$DEPENDENCIES"
             ;;
         apt)
             COMPILEDEPS='build-essential'
             sudo "$PACKAGER" update
             sudo dpkg --add-architecture i386
             sudo "$PACKAGER" update
-            sudo "$PACKAGER" install -y $DEPENDENCIES $COMPILEDEPS 
+            sudo "$PACKAGER" install -y "$DEPENDENCIES" $COMPILEDEPS 
             ;;
         dnf)
             COMPILEDEPS='@development-tools'
             sudo "$PACKAGER" update
             sudo "$PACKAGER" config-manager --set-enabled powertools
-            sudo "$PACKAGER" install -y $DEPENDENCIES $COMPILEDEPS
+            sudo "$PACKAGER" install -y "$DEPENDENCIES" $COMPILEDEPS
             sudo "$PACKAGER" install -y glibc-devel.i686 libgcc.i686
             ;;
         zypper)
             COMPILEDEPS='patterns-devel-base-devel_basis'
             sudo "$PACKAGER" refresh 
-            sudo "$PACKAGER" --non-interactive install $DEPENDENCIES $COMPILEDEPS
+            sudo "$PACKAGER" --non-interactive install "$DEPENDENCIES" $COMPILEDEPS
             sudo "$PACKAGER" --non-interactive install libgcc_s1-gcc7-32bit glibc-devel-32bit
             ;;
         *)
-            sudo "$PACKAGER" install -y $DEPENDENCIES
+            sudo "$PACKAGER" install -y "$DEPENDENCIES"
             ;;
     esac
 }
@@ -101,4 +108,4 @@ install_additional_dependencies() {
 
 checkEnv
 installDepend
-install_additional_dependencies
\ No newline at end of file
+install_additional_dependencies
diff --git a/src/commands/system-setup/2-gaming-setup.sh b/src/commands/system-setup/2-gaming-setup.sh
index d61e5ecb..f044162c 100755
--- a/src/commands/system-setup/2-gaming-setup.sh
+++ b/src/commands/system-setup/2-gaming-setup.sh
@@ -1,5 +1,12 @@
 #!/bin/sh -e
 
+checkEnv() {
+    checkCommandRequirements 'curl groups sudo'
+    checkPackageManager 'apt-get yum dnf pacman zypper'
+    checkCurrentDirectoryWritable
+    checkSuperUser
+}
+
 installDepend() {
     ## Check for dependencies.
     echo -e "${YELLOW}Installing dependencies...${RC}"
@@ -83,4 +90,4 @@ install_additional_dependencies() {
 
 checkEnv
 installDepend
-install_additional_dependencies
\ No newline at end of file
+install_additional_dependencies
diff --git a/src/commands/system-update.sh b/src/commands/system-update.sh
index 577e5d0f..132e617d 100755
--- a/src/commands/system-update.sh
+++ b/src/commands/system-update.sh
@@ -1,5 +1,12 @@
 #!/bin/sh -e
 
+checkEnv() {
+    checkCommandRequirements 'curl groups sudo'
+    checkPackageManager 'apt-get nala dnf pacman zypper yum xbps-install'
+    checkSuperUser
+    checkDistro
+}
+
 fastUpdate() {
     case ${PACKAGER} in
         pacman)
@@ -68,15 +75,15 @@ updateSystem() {
     echo -e "${GREEN}Updating system${RC}"
     case ${PACKAGER} in
         nala|apt-get)
-            sudo ${PACKAGER} update -y
-            sudo ${PACKAGER} upgrade -y
+            sudo "${PACKAGER}" update -y
+            sudo "${PACKAGER}" upgrade -y
             ;;
         yum|dnf)
-            sudo ${PACKAGER} update -y
-            sudo ${PACKAGER} upgrade -y
+            sudo "${PACKAGER}" update -y
+            sudo "${PACKAGER}" upgrade -y
             ;;
         pacman)
-            sudo ${PACKAGER} -Syu --noconfirm
+            sudo "${PACKAGER}" -Syu --noconfirm
             ;;
         zypper)
             sudo ${PACKAGER} ref