Merge pull request #551 from JaKooLit/main

main to development

17 files changed, 326 insertions, 360 deletions

diff --git a/config/hypr/scripts/KeyHints.sh b/config/hypr/scripts/KeyHints.sh
index b7ed26e2..49ee7e52 100755
--- a/config/hypr/scripts/KeyHints.sh
+++ b/config/hypr/scripts/KeyHints.sh
@@ -25,7 +25,7 @@ max_height=1000
 
 # Set percentage of screen size for dynamic adjustment
 percentage_width=90
-percentage_height=90
+percentage_height=100
 
 # Calculate dynamic width and height
 dynamic_width=$((width * percentage_width / 100))
@@ -46,16 +46,17 @@ GDK_BACKEND=$BACKEND yad --width=$dynamic_width --height=$dynamic_height \
     --column=Command: \
     --timeout-indicator=bottom \
 "ESC" "close this app" "" "=" "SUPER KEY (Windows Key)" "(SUPER KEY)" \
+" SHIFT K" "Searchable Keybinds" "(Search all Keybinds via rofi)" \
+"" "" "" \
 " enter" "Terminal" "(kitty)" \
-" SHIFT enter" "DropDown Terminal" "(kitty-pyprland)" \
-" SHIFT K" "Searchable Keybinds" "(Keybinds)" \
+" SHIFT enter" "DropDown Terminal" "(Not available in Debian and Ubuntu)" \
 " A" "Desktop Overview" "(AGS Overview)" \
 " D" "Application Launcher" "(rofi-wayland)" \
 " T" "Open File Manager" "(Thunar)" \
 " S" "Google Search using rofi" "(rofi)" \
 " Q" "close active window" "(not kill)" \
 " Shift Q " "kills an active window" "(kill)" \
-" Z" "Desktop Zoom" "(pyprland)" \
+" Z" "Desktop Zoom" "(Not available in Debian and Ubuntu)" \
 " Alt V" "Clipboard Manager" "(cliphist)" \
 " W" "Choose wallpaper" "(Wallpaper Menu)" \
 " Shift W" "Choose wallpaper effects" "(imagemagick + swww)" \
diff --git a/config/hypr/scripts/ScreenShot.sh b/config/hypr/scripts/ScreenShot.sh
index e0df2b86..852be4b0 100755
--- a/config/hypr/scripts/ScreenShot.sh
+++ b/config/hypr/scripts/ScreenShot.sh
@@ -2,21 +2,23 @@
 # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
 # Screenshots scripts
 
-iDIR="$HOME/.config/swaync/icons"
-sDIR="$HOME/.config/hypr/scripts"
-
+# variables
 time=$(date "+%d-%b_%H-%M-%S")
 dir="$(xdg-user-dir)/Pictures/Screenshots"
 file="Screenshot_${time}_${RANDOM}.png"
 
+iDIR="$HOME/.config/swaync/icons"
+iDoR="$HOME/.config/swaync/images"
+sDIR="$HOME/.config/hypr/scripts"
+
 active_window_class=$(hyprctl -j activewindow | jq -r '(.class)')
 active_window_file="Screenshot_${time}_${active_window_class}.png"
 active_window_path="${dir}/${active_window_file}"
 
 notify_cmd_base="notify-send -t 10000 -A action1=Open -A action2=Delete -h string:x-canonical-private-synchronous:shot-notify"
-#notify_swappy="notify-send -h string:x-canonical-private-synchronous:shot-notify -u low -i ${iDIR}/picture.png"
 notify_cmd_shot="${notify_cmd_base} -i ${iDIR}/picture.png "
 notify_cmd_shot_win="${notify_cmd_base} -i ${iDIR}/picture.png "
+notify_cmd_NOT="notify-send -u low -i ${iDoR}/ja.png "
 
 # notify and view screenshot
 notify_view() {
@@ -33,7 +35,7 @@ notify_view() {
 					;;
 			esac
         else
-            ${notify_cmd_shot} " Screenshot of:" " ${active_window_class} NOT Saved."
+            ${notify_cmd_NOT} " Screenshot of:" " ${active_window_class} NOT Saved."
             "${sDIR}/Sounds.sh" --error
         fi
 
@@ -63,14 +65,12 @@ notify_view() {
 					;;
 			esac
         else
-            ${notify_cmd_shot} " Screenshot" " NOT Saved"
+            ${notify_cmd_NOT} " Screenshot" " NOT Saved"
             "${sDIR}/Sounds.sh" --error
         fi
     fi
 }
 
-
-
 # countdown
 countdown() {
 	for sec in $(seq $1 -1 1); do
diff --git a/config/waybar/configs/[BOT] Default b/config/waybar/configs/[BOT] Default
index fc87a9e4..39490f85 100644
--- a/config/waybar/configs/[BOT] Default
+++ b/config/waybar/configs/[BOT] Default
@@ -1,71 +1,56 @@
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
 
-// ### DEFAULT Bottom ### //
+// ### DEFAULT - Bottom ### //
 {
-"include": [
-  "$HOME/.config/waybar/Modules",
-  "$HOME/.config/waybar/ModulesWorkspaces",
-  "$HOME/.config/waybar/ModulesCustom",
-  "$HOME/.config/waybar/ModulesGroups",
-  ],
-"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",
-	"custom/separator#blank_3",
-	"custom/cava_mviz",
-	],
-
-"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/hint",	
-	], 
-
-"modules-right": [
-	"network#speed",
-	"custom/separator#dot-line",
-	"custom/swaync",
-	"tray",
-	"mpris", 
-	"custom/separator#dot-line",
-	"bluetooth",
-	"custom/separator#dot-line", 
-	"pulseaudio",
-	"custom/separator#dot-line",
-	"pulseaudio#microphone",
-	"custom/separator#dot-line",
-	"keyboard-state",
-	"custom/separator#dot-line",
-	"custom/keyboard",
-	"custom/separator#dot-line",
-	"custom/power",
-	],
-}
+	"include": [
+	  "$HOME/.config/waybar/Modules",
+	  "$HOME/.config/waybar/ModulesWorkspaces",
+	  "$HOME/.config/waybar/ModulesCustom",
+	  "$HOME/.config/waybar/ModulesGroups",
+	  ],
+	"layer": "top",
+	//"mode": "dock",
+	"exclusive": true,
+	"passthrough": false,
+	"position": "bottom",
+	"spacing": 3,
+	"fixed-center": true,
+	"ipc": true,
+	"margin-top": 3,
+	"margin-left": 8,
+	"margin-right": 8,
+	
+	"modules-left": [
+		"custom/separator#blank",
+		"custom/cava_mviz",
+		"custom/separator#blank",
+		"custom/playerctl",
+		"custom/separator#blank_2",
+		"hyprland/window",
+		],
+	
+	"modules-center": [
+		"group/app_drawer",
+		"custom/separator#blank",
+		"custom/swaync",
+		"custom/separator#dot-line",
+		"hyprland/workspaces#rw",
+		"clock",
+		"custom/separator#dot-line",
+		"custom/weather",
+		"custom/separator#dot-line",
+		"idle_inhibitor",	
+		"custom/hint",	
+		],
+	
+	"modules-right": [
+		"tray",
+		"network#speed",
+		"custom/separator#dot-line",
+		"group/mobo_drawer",
+		"custom/separator#line",  
+		"group/audio",
+		"custom/separator#dot-line", 
+		"group/status",
+		],
+	}
\ No newline at end of file
diff --git a/config/waybar/configs/[BOT] Default Laptop b/config/waybar/configs/[BOT] Default Laptop
index 067dfbc4..ea95e6c6 100644
--- a/config/waybar/configs/[BOT] Default Laptop
+++ b/config/waybar/configs/[BOT] Default Laptop
@@ -1,74 +1,58 @@
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
 
-// ### DEFAULT Bottom - Laptop### //
+// ### DEFAULT Laptop  - Bottom ### //
 {
-"include": [
-  "$HOME/.config/waybar/Modules",
-  "$HOME/.config/waybar/ModulesWorkspaces",
-  "$HOME/.config/waybar/ModulesCustom",
-  "$HOME/.config/waybar/ModulesGroups",
-  ],
-"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",
-	"custom/separator#blank_3",
-	"custom/cava_mviz",
-	],
-
-"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": [
-	"network#speed",
-	"custom/separator#dot-line",
-	"tray",
-	"mpris", 
-	"custom/separator#dot-line",
-	"bluetooth",
-	"custom/separator#dot-line", 
-	"battery",
-	"custom/separator#dot-line", 
-	"backlight",
-	"custom/separator#dot-line",
-	"pulseaudio",
-	"custom/separator#dot-line",
-	"pulseaudio#microphone",
-	"custom/separator#dot-line",
-	"keyboard-state",
-	"custom/separator#dot-line",
-	"custom/keyboard",
-	"custom/separator#dot-line",
-	"custom/power",
-	],
-}
+	"include": [
+	  "$HOME/.config/waybar/Modules",
+	  "$HOME/.config/waybar/ModulesWorkspaces",
+	  "$HOME/.config/waybar/ModulesCustom",
+	  "$HOME/.config/waybar/ModulesGroups",
+	  ],
+	"layer": "top",
+	//"mode": "dock",
+	"exclusive": true,
+	"passthrough": false,
+	"position": "bottom",
+	"spacing": 3,
+	"fixed-center": true,
+	"ipc": true,
+	"margin-top": 3,
+	"margin-left": 8,
+	"margin-right": 8,
+	
+	"modules-left": [
+		"custom/separator#blank",
+		"custom/cava_mviz",
+		"custom/separator#blank",
+		"custom/playerctl",
+		"custom/separator#blank_2",
+		"hyprland/window",
+		],
+	
+	"modules-center": [
+		"group/app_drawer",
+		"custom/separator#blank",
+		"custom/swaync",
+		"custom/separator#dot-line",
+		"hyprland/workspaces#rw",
+		"clock",
+		"custom/separator#dot-line",
+		"custom/weather",
+		"custom/separator#dot-line",
+		"idle_inhibitor",	
+		"custom/hint",	
+		],
+	
+	"modules-right": [
+		"tray",
+		"network#speed",
+		"custom/separator#dot-line",
+		"group/laptop",
+		"custom/separator#dot-line",
+		"group/mobo_drawer",
+		"custom/separator#line",  
+		"group/audio",
+		"custom/separator#dot-line", 
+		"group/status",
+		],
+	}
\ No newline at end of file
diff --git a/config/waybar/configs/[TOP] Default b/config/waybar/configs/[TOP] Default
index 3a95929b..9d7c68a8 100644
--- a/config/waybar/configs/[TOP] Default
+++ b/config/waybar/configs/[TOP] Default
@@ -21,51 +21,36 @@
 "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",
-	"custom/separator#blank_3",
+	"custom/separator#blank",
 	"custom/cava_mviz",
+	"custom/separator#blank",
+	"custom/playerctl",
+	"custom/separator#blank_2",
+	"hyprland/window",
 	],
 
 "modules-center": [
-	"custom/menu",
-	"custom/separator#dot-line",
-	"idle_inhibitor", 
+	"group/app_drawer",
+	"custom/separator#blank",
+	"custom/swaync",
 	"custom/separator#dot-line",
+	"hyprland/workspaces#rw",
 	"clock",
 	"custom/separator#dot-line",
-	"custom/light_dark",
-	"custom/separator#dot-line",	
-	"custom/lock",
-	//],
+	"custom/weather",
 	"custom/separator#dot-line",
+	"idle_inhibitor",	
 	"custom/hint",	
-	], 
+	],
 
 "modules-right": [
-	"network#speed",
-	"custom/separator#dot-line",
-	"custom/swaync",
 	"tray",
-	"mpris", 
+	"network#speed",
 	"custom/separator#dot-line",
-	"bluetooth",
+	"group/mobo_drawer",
+	"custom/separator#line",  
+	"group/audio",
 	"custom/separator#dot-line", 
-	"pulseaudio",
-	"custom/separator#dot-line",
-	"pulseaudio#microphone",
-	"custom/separator#dot-line",
-	"keyboard-state",
-	"custom/separator#dot-line",
-	"custom/keyboard",
-	"custom/separator#dot-line",
-	"custom/power",
+	"group/status",
 	],
 }
\ No newline at end of file
diff --git a/config/waybar/configs/[TOP] Default (old v1) b/config/waybar/configs/[TOP] Default (old v1)
new file mode 100644
index 00000000..96396a88
--- /dev/null
+++ b/config/waybar/configs/[TOP] Default (old v1)
@@ -0,0 +1,71 @@
+/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
+
+// ### DEFAULT - Top (old v1) ### //
+{
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  "$HOME/.config/waybar/ModulesCustom",
+  "$HOME/.config/waybar/ModulesGroups",
+  ],
+"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",
+	"custom/separator#blank_3",
+	"custom/cava_mviz",
+	],
+
+"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/hint",	
+	], 
+
+"modules-right": [
+	"network#speed",
+	"custom/separator#dot-line",
+	"custom/swaync",
+	"tray",
+	"mpris", 
+	"custom/separator#dot-line",
+	"bluetooth",
+	"custom/separator#dot-line", 
+	"pulseaudio",
+	"custom/separator#dot-line",
+	"pulseaudio#microphone",
+	"custom/separator#dot-line",
+	"keyboard-state",
+	"custom/separator#dot-line",
+	"custom/keyboard",
+	"custom/separator#dot-line",
+	"custom/power",
+	],
+}
\ No newline at end of file
diff --git a/config/waybar/configs/[TOP] Default_v2 b/config/waybar/configs/[TOP] Default (old v2)
index c4e4f59c..4b5e8941 100644
--- a/config/waybar/configs/[TOP] Default_v2
+++ b/config/waybar/configs/[TOP] Default (old v2)
@@ -1,6 +1,6 @@
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
 
-// ### DEFAULT v2 - Top ### //
+// ### DEFAULT - Top (old v2) ### //
 {
 "include": [
   "$HOME/.config/waybar/Modules",
diff --git a/config/waybar/configs/[TOP] Default_v3 b/config/waybar/configs/[TOP] Default (old v3)
index 826b7724..70da4482 100644
--- a/config/waybar/configs/[TOP] Default_v3
+++ b/config/waybar/configs/[TOP] Default (old v3)
@@ -1,6 +1,6 @@
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
 
-// ### DEFAULT v3  - Top ### //
+// ### DEFAULT - Top (old v3) ### //
 {
 "include": [
   "$HOME/.config/waybar/Modules",
diff --git a/config/waybar/configs/[TOP] Default_v4 b/config/waybar/configs/[TOP] Default (old v4)
index 678c2085..0b6010aa 100644
--- a/config/waybar/configs/[TOP] Default_v4
+++ b/config/waybar/configs/[TOP] Default (old v4)
@@ -1,6 +1,6 @@
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
 
-// ### DEFAULT v4  - Top ### //
+// ### DEFAULT  - Top (old v4) ### //
 {
 "include": [
   "$HOME/.config/waybar/Modules",
diff --git a/config/waybar/configs/[TOP] Default Laptop b/config/waybar/configs/[TOP] Default Laptop
index 47f13956..7fe3f413 100644
--- a/config/waybar/configs/[TOP] Default Laptop
+++ b/config/waybar/configs/[TOP] Default Laptop
@@ -1,6 +1,6 @@
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
 
-// ### DEFAULT Top -Laptop ### //
+// ### DEFAULT Laptop  - Top ### //
 {
 "include": [
   "$HOME/.config/waybar/Modules",
@@ -21,55 +21,38 @@
 "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",
-	"custom/separator#blank_3",
+	"custom/separator#blank",
 	"custom/cava_mviz",
+	"custom/separator#blank",
+	"custom/playerctl",
+	"custom/separator#blank_2",
+	"hyprland/window",
 	],
 
 "modules-center": [
-	"custom/menu",
-	"custom/separator#dot-line",
-	"idle_inhibitor", 
+	"group/app_drawer",
+	"custom/separator#blank",
+	"custom/swaync",
 	"custom/separator#dot-line",
+	"hyprland/workspaces#rw",
 	"clock",
 	"custom/separator#dot-line",
-	"custom/light_dark",
-	"custom/separator#dot-line",	
-	"custom/lock",
-	//],
+	"custom/weather",
 	"custom/separator#dot-line",
+	"idle_inhibitor",	
 	"custom/hint",	
-	], 
+	],
 
 "modules-right": [
+	"tray",
 	"network#speed",
 	"custom/separator#dot-line",
-	"custom/swaync",
-	"tray",
-	"mpris", 
+	"group/laptop",
 	"custom/separator#dot-line",
-	"bluetooth",
+	"group/mobo_drawer",
+	"custom/separator#line",  
+	"group/audio",
 	"custom/separator#dot-line", 
-	"battery",
-	"custom/separator#dot-line", 
-	"backlight",
-	"custom/separator#dot-line",
-	"pulseaudio",
-	"custom/separator#dot-line",
-	"pulseaudio#microphone",
-	"custom/separator#dot-line",
-	"keyboard-state",
-	"custom/separator#dot-line",
-	"custom/keyboard",
-	"custom/separator#dot-line",
-	"custom/power",
+	"group/status",
 	],
 }
\ No newline at end of file
diff --git a/config/waybar/configs/[TOP] Default Laptop (old v1) b/config/waybar/configs/[TOP] Default Laptop (old v1)
new file mode 100644
index 00000000..91139573
--- /dev/null
+++ b/config/waybar/configs/[TOP] Default Laptop (old v1)
@@ -0,0 +1,75 @@
+/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
+
+// ### DEFAULT Top -Laptop (old v1) ### //
+{
+"include": [
+  "$HOME/.config/waybar/Modules",
+  "$HOME/.config/waybar/ModulesWorkspaces",
+  "$HOME/.config/waybar/ModulesCustom",
+  "$HOME/.config/waybar/ModulesGroups",
+  ],
+"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",
+	"custom/separator#blank_3",
+	"custom/cava_mviz",
+	],
+
+"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/hint",	
+	], 
+
+"modules-right": [
+	"network#speed",
+	"custom/separator#dot-line",
+	"custom/swaync",
+	"tray",
+	"mpris", 
+	"custom/separator#dot-line",
+	"bluetooth",
+	"custom/separator#dot-line", 
+	"battery",
+	"custom/separator#dot-line", 
+	"backlight",
+	"custom/separator#dot-line",
+	"pulseaudio",
+	"custom/separator#dot-line",
+	"pulseaudio#microphone",
+	"custom/separator#dot-line",
+	"keyboard-state",
+	"custom/separator#dot-line",
+	"custom/keyboard",
+	"custom/separator#dot-line",
+	"custom/power",
+	],
+}
\ No newline at end of file
diff --git a/config/waybar/configs/[TOP] Default Laptop_v2 b/config/waybar/configs/[TOP] Default Laptop (old v2)
index adc49a4d..c7056247 100644
--- a/config/waybar/configs/[TOP] Default Laptop_v2
+++ b/config/waybar/configs/[TOP] Default Laptop (old v2)
@@ -1,6 +1,6 @@
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
 
-// ### DEFAULT v2 (Laptop)  - Top ### //
+// ### DEFAULT (Laptop)  - Top (old v2) ### //
 {
 "include": [
   "$HOME/.config/waybar/Modules",
diff --git a/config/waybar/configs/[TOP] Default Laptop_v3 b/config/waybar/configs/[TOP] Default Laptop (old v3)
index 04f037fa..541b9493 100644
--- a/config/waybar/configs/[TOP] Default Laptop_v3
+++ b/config/waybar/configs/[TOP] Default Laptop (old v3)
@@ -1,6 +1,6 @@
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
 
-// ### DEFAULT v2 (Laptop)  - Top ### //
+// ### DEFAULT (Laptop)  - Top (old v3) ### //
 {
 "include": [
   "$HOME/.config/waybar/Modules",
diff --git a/config/waybar/configs/[TOP] Default Laptop_v4 b/config/waybar/configs/[TOP] Default Laptop (old v4)
index 86e5a5fe..be97970c 100644
--- a/config/waybar/configs/[TOP] Default Laptop_v4
+++ b/config/waybar/configs/[TOP] Default Laptop (old v4)
@@ -1,6 +1,6 @@
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
 
-// ### DEFAULT v4 (Laptop)  - Top ### //
+// ### DEFAULT (Laptop)  - Top (old v4) ### //
 {
 "include": [
   "$HOME/.config/waybar/Modules",
diff --git a/config/waybar/configs/[TOP] Default Laptop_v5 b/config/waybar/configs/[TOP] Default Laptop_v5
deleted file mode 100644
index 2ef7b933..00000000
--- a/config/waybar/configs/[TOP] Default Laptop_v5
+++ /dev/null
@@ -1,58 +0,0 @@
-/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
-
-// ### DEFAULT v5 (Laptop)  - Top ### //
-{
-"include": [
-  "$HOME/.config/waybar/Modules",
-  "$HOME/.config/waybar/ModulesWorkspaces",
-  "$HOME/.config/waybar/ModulesCustom",
-  "$HOME/.config/waybar/ModulesGroups",
-  ],
-"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": [
-	"custom/separator#blank",
-	"custom/cava_mviz",
-	"custom/separator#blank",
-	"custom/playerctl",
-	"custom/separator#blank_2",
-	"hyprland/window",
-	],
-
-"modules-center": [
-	"group/app_drawer",
-	"custom/separator#blank",
-	"custom/swaync",
-	"custom/separator#dot-line",
-	"hyprland/workspaces#rw",
-	"clock",
-	"custom/separator#dot-line",
-	"custom/weather",
-	"custom/separator#dot-line",
-	"idle_inhibitor",	
-	"custom/hint",	
-	],
-
-"modules-right": [
-	"tray",
-	"network#speed",
-	"custom/separator#dot-line",
-	"group/laptop",
-	"custom/separator#dot-line",
-	"group/mobo_drawer",
-	"custom/separator#line",  
-	"group/audio",
-	"custom/separator#dot-line", 
-	"group/status",
-	],
-}
\ No newline at end of file
diff --git a/config/waybar/configs/[TOP] Default_v5 b/config/waybar/configs/[TOP] Default_v5
deleted file mode 100644
index a8a9601a..00000000
--- a/config/waybar/configs/[TOP] Default_v5
+++ /dev/null
@@ -1,56 +0,0 @@
-/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
-
-// ### DEFAULT v5 - Top ### //
-{
-"include": [
-  "$HOME/.config/waybar/Modules",
-  "$HOME/.config/waybar/ModulesWorkspaces",
-  "$HOME/.config/waybar/ModulesCustom",
-  "$HOME/.config/waybar/ModulesGroups",
-  ],
-"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": [
-	"custom/separator#blank",
-	"custom/cava_mviz",
-	"custom/separator#blank",
-	"custom/playerctl",
-	"custom/separator#blank_2",
-	"hyprland/window",
-	],
-
-"modules-center": [
-	"group/app_drawer",
-	"custom/separator#blank",
-	"custom/swaync",
-	"custom/separator#dot-line",
-	"hyprland/workspaces#rw",
-	"clock",
-	"custom/separator#dot-line",
-	"custom/weather",
-	"custom/separator#dot-line",
-	"idle_inhibitor",	
-	"custom/hint",	
-	],
-
-"modules-right": [
-	"tray",
-	"network#speed",
-	"custom/separator#dot-line",
-	"group/mobo_drawer",
-	"custom/separator#line",  
-	"group/audio",
-	"custom/separator#dot-line", 
-	"group/status",
-	],
-}
\ No newline at end of file
diff --git a/copy.sh b/copy.sh
index ffbb3267..ba642acb 100755
--- a/copy.sh
+++ b/copy.sh
@@ -4,8 +4,8 @@
 clear
 wallpaper=$HOME/.config/hypr/wallpaper_effects/.wallpaper_current
 waybar_style="$HOME/.config/waybar/style/[Extra] Modern-Combined - Transparent.css"
-waybar_config="$HOME/.config/waybar/configs/[TOP] Default_v5"
-waybar_config_laptop="$HOME/.config/waybar/configs/[TOP] Default Laptop_v5" 
+waybar_config="$HOME/.config/waybar/configs/[TOP] Default"
+waybar_config_laptop="$HOME/.config/waybar/configs/[TOP] Default Laptop" 
 
 # Set some colors for output messages
 OK="$(tput setaf 2)[OK]$(tput sgr0)"
@@ -649,29 +649,25 @@ chmod +x ~/.config/hypr/UserScripts/* 2>&1 | tee -a "$LOG"
 # Set executable for initial-boot.sh
 chmod +x ~/.config/hypr/initial-boot.sh 2>&1 | tee -a "$LOG"
 
-# Detect machine type and set waybar configurations accordingly
+# Waybar config to symlink & retain based on machine type
 if hostnamectl | grep -q 'Chassis: desktop'; then
-    # Configurations for a desktop
-    ln -sf "$waybar_config" "$HOME/.config/waybar/config" 2>&1 | tee -a "$LOG"
-    # Remove waybar configs for laptop
-    rm -rf "$HOME/.config/waybar/configs/[TOP] Default Laptop" \
-           "$HOME/.config/waybar/configs/[BOT] Default Laptop" \
-           "$HOME/.config/waybar/configs/[TOP] Default Laptop_v2" \
-           "$HOME/.config/waybar/configs/[TOP] Default Laptop_v3" \
-           "$HOME/.config/waybar/configs/[TOP] Default Laptop_v4" \
-           "$HOME/.config/waybar/configs/[TOP] Default Laptop_v5" 2>&1 | tee -a "$LOG" || true
+    config_file="$waybar_config"
+    config_remove=" Laptop"
 else
-    # Configurations for a laptop or any system other than desktop
-    ln -sf "$waybar_config_laptop" "$HOME/.config/waybar/config" 2>&1 | tee -a "$LOG"
-    # Remove waybar configs for desktop
-    rm -rf "$HOME/.config/waybar/configs/[TOP] Default" \
-           "$HOME/.config/waybar/configs/[BOT] Default" \
-           "$HOME/.config/waybar/configs/[TOP] Default_v2" \
-           "$HOME/.config/waybar/configs/[TOP] Default_v3" \
-           "$HOME/.config/waybar/configs/[TOP] Default_v4" \
-           "$HOME/.config/waybar/configs/[TOP] Default_v5" 2>&1 | tee -a "$LOG" || true
+    config_file="$waybar_config_laptop"
+    config_remove=""
 fi
 
+ln -sf "$config_file" "$HOME/.config/waybar/config" 2>&1 | tee -a "$LOG" || true
+
+# Remove inappropriate waybar configs
+rm -rf "$HOME/.config/waybar/configs/[TOP] Default$config_remove" \
+       "$HOME/.config/waybar/configs/[BOT] Default$config_remove" \
+       "$HOME/.config/waybar/configs/[TOP] Default$config_remove (old v1)" \
+       "$HOME/.config/waybar/configs/[TOP] Default$config_remove (old v2)" \
+       "$HOME/.config/waybar/configs/[TOP] Default$config_remove (old v3)" \
+       "$HOME/.config/waybar/configs/[TOP] Default$config_remove (old v4)" 2>&1 | tee -a "$LOG" || true
+
 printf "\n%.0s" {1..2}
 
 # for SDDM (sequoia_2)