diff --git a/config/hypr/initial-boot.sh b/config/hypr/initial-boot.sh
old mode 100644
new mode 100755
index d5ce323..ba07fed
--- a/config/hypr/initial-boot.sh
+++ b/config/hypr/initial-boot.sh
@@ -1,27 +1,28 @@
 #!/bin/bash
 
-# THIS SCRIPT CAN BE DELETED ONCE BOOTED!!
-
 # A bash script designed to ran it only once dotfiles installed
+
+# THIS SCRIPT CAN BE DELETED ONCE SUCCESSFULLY BOOTED!! And also, edit ~/.config/hypr/configs/Execs.conf
+# not necessary to do since this script is only designed to ran only once as long as the marker exist
+
+# Set swww options
+wallpaper=$HOME/Pictures/wallpapers/mecha-nostalgia.png
+
+swww="swww img"
+effect="--transition-bezier .43,1.19,1,.4 --transition-fps 60 --transition-type grow --transition-pos 0.925,0.977 --transition-duration 2"
+
 # Check if a marker file exists.
 if [ ! -f ~/.config/hypr/.initial_startup_done ]; then
 
-	# Check if the ~/.cache/wal directory exists
-	if [ ! -d ~/.cache/wal ]; then
-    	printf " Initializing pywal........\n\n"
-    	# Check if the ~/Pictures/wallpapers directory exists
-    	if [ -d ~/Pictures/wallpapers ]; then
-        	# Run wal with random wallpapers from ~/Pictures/wallpapers
-        	wal -i ~/Pictures/wallpapers/mecha-nostalgia.png 
-        	echo "Pywal initialized"
-		fi
-	fi
+	# Initialize pywal
+	printf " Initializing pywal........\n\n"
+    wal -i $wallpaper 
 
 	#initial symlink for Pywal Dark and Light for Rofi Themes
 	ln -sf "$HOME/.cache/wal/colors-rofi-dark.rasi" "$HOME/.config/rofi/pywal-color/pywal-theme.rasi"
 	
 	# Initial scripts to load inorder to have a proper wallpaper waybar and pywal themes
-	exec $HOME/.config/hypr/scripts/Wallpaper.sh &
+	swww query || swww init && $swww $wallpaper $effect
 	
     # Create a marker file to indicate that the script has been executed.
     touch ~/.config/hypr/.initial_startup_done
diff --git a/config/hypr/v2.1.16 b/config/hypr/v2.1.17
similarity index 100%
rename from config/hypr/v2.1.16
rename to config/hypr/v2.1.17
diff --git a/config/waybar/configs/Def[Bottom]-Laptop b/config/waybar/configs/Def[Bottom]-Laptop
new file mode 100644
index 0000000..8bf8ecd
--- /dev/null
+++ b/config/waybar/configs/Def[Bottom]-Laptop
@@ -0,0 +1,66 @@
+/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
+
+// ### DEFAULT ### //
+{
+"include": "~/.config/waybar/modules",
+"layer": "top",
+//"mode": "dock",
+"exclusive": true,
+"passthrough": false,
+"position": "bottom",
+"spacing": 3,
+"fixed-center": true,
+"ipc": true,
+//"margin-top": 6,
+"margin-left": 8,
+"margin-right": 8,
+
+"modules-left": [
+	"hyprland/workspaces#pacman",
+	"custom/separator#dot-line",
+	"cpu",
+	"custom/separator#dot-line", 
+	"temperature",
+	"custom/separator#dot-line", 
+	"memory",
+	"custom/separator#dot-line",
+	"custom/weather",
+	],
+
+"modules-center": [
+	"custom/menu",
+	"custom/separator#dot-line",
+	"idle_inhibitor", 
+	"custom/separator#dot-line",
+	"clock",
+	"custom/separator#dot-line",
+	"custom/light_dark",
+	"custom/separator#dot-line",	
+	"custom/lock",
+	//],
+	"custom/separator#dot-line",
+	"custom/keybinds",	
+	], 
+
+"modules-right": [
+	//"hyprland/window", 
+	"tray",
+	"custom/separator#dot-line",
+	"bluetooth",
+	"custom/separator#dot-line",
+	"network#speed",
+	"custom/separator#dot-line", 
+	"battery",
+	"custom/separator#dot-line", 
+	"backlight",
+	"custom/separator#dot-line",
+	"pulseaudio",
+	"custom/separator#dot-line",
+	//"wireplumber", 
+	"pulseaudio#microphone",
+	"custom/separator#dot-line",
+	"keyboard-state",
+	"custom/separator#dot-line",
+	"custom/power",
+	],
+}
diff --git a/config/waybar/configs/Def[TOP]-Laptop b/config/waybar/configs/Def[TOP]-Laptop
new file mode 100644
index 0000000..eabaf37
--- /dev/null
+++ b/config/waybar/configs/Def[TOP]-Laptop
@@ -0,0 +1,66 @@
+/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
+
+// ### DEFAULT ### //
+{
+"include": "~/.config/waybar/modules",
+"layer": "top",
+//"mode": "dock",
+"exclusive": true,
+"passthrough": false,
+"position": "top",
+"spacing": 3,
+"fixed-center": true,
+"ipc": true,
+"margin-top": 3,
+"margin-left": 8,
+"margin-right": 8,
+
+"modules-left": [
+	"hyprland/workspaces#pacman",
+	"custom/separator#dot-line",
+	"cpu",
+	"custom/separator#dot-line", 
+	"temperature",
+	"custom/separator#dot-line", 
+	"memory",
+	"custom/separator#dot-line",
+	"custom/weather",
+	],
+
+"modules-center": [
+	"custom/menu",
+	"custom/separator#dot-line",
+	"idle_inhibitor", 
+	"custom/separator#dot-line",
+	"clock",
+	"custom/separator#dot-line",
+	"custom/light_dark",
+	"custom/separator#dot-line",	
+	"custom/lock",
+	//],
+	"custom/separator#dot-line",
+	"custom/keybinds",	
+	], 
+
+"modules-right": [
+	//"hyprland/window", 
+	"tray",
+	"custom/separator#dot-line",
+	"bluetooth",
+	"custom/separator#dot-line",
+	"network#speed",
+	"custom/separator#dot-line", 
+	"battery",
+	"custom/separator#dot-line", 
+	"backlight",
+	"custom/separator#dot-line",
+	"pulseaudio",
+	"custom/separator#dot-line",
+	//"wireplumber", 
+	"pulseaudio#microphone",
+	"custom/separator#dot-line",
+	"keyboard-state",
+	"custom/separator#dot-line",
+	"custom/power",
+	],
+}
\ No newline at end of file
diff --git a/config/waybar/configs/Default [Bottom] b/config/waybar/configs/Default [Bottom]
index 8bf8ecd..6c37a22 100644
--- a/config/waybar/configs/Default [Bottom]	
+++ b/config/waybar/configs/Default [Bottom]	
@@ -50,13 +50,8 @@
 	"custom/separator#dot-line",
 	"network#speed",
 	"custom/separator#dot-line", 
-	"battery",
-	"custom/separator#dot-line", 
-	"backlight",
-	"custom/separator#dot-line",
 	"pulseaudio",
 	"custom/separator#dot-line",
-	//"wireplumber", 
 	"pulseaudio#microphone",
 	"custom/separator#dot-line",
 	"keyboard-state",
diff --git a/config/waybar/configs/Default [TOP] b/config/waybar/configs/Default [TOP]
index eabaf37..edc1409 100644
--- a/config/waybar/configs/Default [TOP]	
+++ b/config/waybar/configs/Default [TOP]	
@@ -50,13 +50,8 @@
 	"custom/separator#dot-line",
 	"network#speed",
 	"custom/separator#dot-line", 
-	"battery",
-	"custom/separator#dot-line", 
-	"backlight",
-	"custom/separator#dot-line",
 	"pulseaudio",
 	"custom/separator#dot-line",
-	//"wireplumber", 
 	"pulseaudio#microphone",
 	"custom/separator#dot-line",
 	"keyboard-state",
diff --git a/copy.sh b/copy.sh
index 2efc116..7f29b34 100755
--- a/copy.sh
+++ b/copy.sh
@@ -173,10 +173,7 @@ cp -r config/* ~/.config/ && { echo "${OK}Copy completed!"; } || { echo "${ERROR
 mkdir -p ~/Pictures/wallpapers
 cp -r wallpapers ~/Pictures/ && { echo "${OK}Copy completed!"; } || { echo "${ERROR} Failed to copy wallpapers."; exit 1; } 2>&1 | tee -a "$LOG"
 
-# Initial Symlinks to avoid errors
-# symlinks for waybar
-ln -sf "$HOME/.config/waybar/configs/Default [TOP]" "$HOME/.config/waybar/config" && \
-ln -sf "$HOME/.config/waybar/style/Golden Noir.css" "$HOME/.config/waybar/style.css" && \
+
 
   
 # Set some files as executable
@@ -206,6 +203,23 @@ if [[ $WALL =~ ^[Yy]$ ]]; then
   fi
 fi
 
+# Initial Symlinks to avoid errors
+
+# Detect machine type and set Waybar configurations accordingly, logging the output
+if hostnamectl | grep -q 'Chassis: desktop'; then
+    # Configurations for a desktop
+    ln -sf "$HOME/.config/waybar/configs/Default [TOP]" "$HOME/.config/waybar/config" 2>&1 | tee -a "$LOG"
+    rm -r "$HOME/.config/waybar/configs/Def[TOP]-Laptop" "$HOME/.config/waybar/configs/Def[Bottom]-Laptop" 2>&1 | tee -a "$LOG"
+else
+    # Configurations for a laptop or any system other than desktop
+    ln -sf "$HOME/.config/waybar/configs/Def[TOP]-Laptop" "$HOME/.config/waybar/config" 2>&1 | tee -a "$LOG"
+    rm -r "$HOME/.config/waybar/configs/Default [TOP]" "$HOME/.config/waybar/configs/Default [Bottom]" 2>&1 | tee -a "$LOG"
+fi
+
+
+# symlinks for waybar style
+ln -sf "$HOME/.config/waybar/style/Golden Noir.css" "$HOME/.config/waybar/style.css" && \
+
 # initialize pywal to avoid config error on hyprland
 wal -i ~/Pictures/wallpapers/mecha-nostalgia.png 2>&1 | tee -a "$LOG"