diff --git a/config/home/waybar.nix b/config/home/waybar.nix
index fc0a5a4..fac49fe 100644
--- a/config/home/waybar.nix
+++ b/config/home/waybar.nix
@@ -15,7 +15,7 @@ in with lib; {
 
       modules-center = [ "hyprland/workspaces" ] ;
       modules-left = [ "custom/startmenu" "hyprland/window" "pulseaudio" "cpu" "memory"];
-      modules-right = [ "custom/hyprbindings" "custom/exit" "idle_inhibitor" "custom/themeselector" "custom/notification" "clock"  "tray" ];
+      modules-right = [ "custom/hyprbindings" "custom/exit" "idle_inhibitor" "custom/themeselector" "custom/notification" "battery" "clock"  "tray" ];
 
       "hyprland/workspaces" = {
       	format = if bar-number == true then "{name}" else "{icon}";
@@ -196,7 +196,7 @@ in with lib; {
 	  opacity: 0.5;
 	  transition: ${betterTransition};
 	'' else if simplebar == true then ''
-	  color: #${config.colorScheme.colors.base03};
+	  color: #${palette.base03};
           background: #${palette.base00};   
 	  margin: 4px 3px;
 	  opacity: 1;
@@ -260,7 +260,7 @@ in with lib; {
 	  opacity: 0.8;
 	  transition: ${betterTransition};
 	'' else if simplebar == true then ''
-	  color: #${config.colorScheme.colors.base05};
+	  color: #${palette.base05};
 	  border: 0px;
 	  border-radius: 15px;
 	  transition: ${betterTransition};
diff --git a/config/scripts/wallsetter.nix b/config/scripts/wallsetter.nix
index 83f2872..e7bc523 100644
--- a/config/scripts/wallsetter.nix
+++ b/config/scripts/wallsetter.nix
@@ -12,15 +12,17 @@ pkgs.writeShellScriptBin "wallsetter" ''
   if [ -d ${wallpaperDir} ]; then
     num_files=$(ls -1 ${wallpaperDir} | wc -l)
 
-    if [ $num_files -eq 0 ]; then
-      notify-send "The wallpaper folder is empty. Exiting Wallsetter."
-      exit
-    elif [ $num_files -eq 1 ]; then
-      notify-send "The wallpaper folder has only one file. Exiting Wallsetter."
+    if [ $num_files -lt 1 ]; then
+      notify-send -t 9000 "The wallpaper folder is expected to have more than 1 image. Exiting Wallsetter."
       exit
     else
       cd ${wallpaperDir}
-      git pull
+      if [ -d ".git" ]; then
+        git pull
+      else
+        notify-send -t 9000 "The wallpaper directory is expected to be a Git repository. Exiting Wallsetter."
+        exit
+      fi
     fi
   else
     ${pkgs.git}/bin/git clone ${wallpaperGit} ${wallpaperDir}
diff --git a/install-zaneyos.sh b/install-zaneyos.sh
index 38e390c..59a7054 100755
--- a/install-zaneyos.sh
+++ b/install-zaneyos.sh
@@ -36,7 +36,7 @@ if [ $persistState -eq 0 ]; then
       sleep 1
     else
       echo "Creating the backups folder & moving ZaneyOS to it."
-      mkdir .config/zaneyos-backups
+      mkdir -p .config/zaneyos-backups
       mv $HOME/zaneyos .config/zaneyos-backups/$backupname
       sleep 1
     fi
@@ -61,7 +61,7 @@ cd zaneyos
 echo "-----"
 
 installusername=$(echo $USER)
-read -p "Enter Your Username [ $installusername ]: " userName
+read -p "Enter Your Username: [ $installusername ] " userName
 if [ -z "$userName" ]; then
   userName=$(echo $USER)
 else
@@ -84,7 +84,7 @@ sed -i "/^\s*username[[:space:]]*=[[:space:]]*\"/s/\"\(.*\)\"/\"$userName\"/" ./
 
 echo "-----"
 
-read -p "Enter Your New Hostname: [ hyprnix ]" hostName
+read -p "Enter Your New Hostname: [ hyprnix ] " hostName
 if [ -z "$hostName" ]; then
   hostName="hyprnix"
 fi