diff --git a/config/hypr/configs/Execs.conf b/config/hypr/configs/Execs.conf
index afcc5a1..03f7f43 100644
--- a/config/hypr/configs/Execs.conf
+++ b/config/hypr/configs/Execs.conf
@@ -1,6 +1,6 @@
 ## /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+#Commands & Apps to be executed at launch
 
-#Commands to be executed at launch
 $scriptsDir = $HOME/.config/hypr/scripts
 $lock = $scriptsDir/LockScreen.sh
 $SwwwRandom = $scriptsDir/WallpaperRandom.sh
@@ -9,10 +9,8 @@ $WallpaperPath = $HOME/Pictures/wallpapers
 # Initial boot script to start Pywal and Set wallpaper. This line and corresponding script can be safely deleted once logged in
 exec-once = $HOME/.config/hypr/initial-boot.sh
 
-# wallpaper stuff
+# wallpaper stuff / More wallpaper options below
 exec-once = swww query || swww init 
-exec-once = $SwwwRandom $WallpaperPath # random wallpaper switcher every 30 minutes
-#exec-once = swww query || swww init && swww img $HOME/Pictures/wallpapers/mecha-nostalgia.png  # persistent wallpaper
 
 # Startup
 exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
@@ -21,16 +19,10 @@ exec-once = systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESK
 # Polkit (Polkit Gnome / KDE)
 exec-once = $scriptsDir/Polkit.sh
 
-#gnome polkit for nixos
-#exec-once = $scriptsDir/Polkit-NixOS.sh
-
-# xdg-desktop-portal-hyprland (should be auto starting. However, you can force to start)
-#exec-once = $scriptsDir/PortalHyprland.sh
-
 # starup apps
 exec-once = waybar &
 exec-once = dunst &
-#exec-once = blueman-applet & 
+exec-once = blueman-applet & 
 exec-once = nm-applet --indicator &
 #exec-once = rog-control-center &
 
@@ -41,15 +33,24 @@ exec-once = wl-paste --type image --watch cliphist store
 # Rainbow borders
 exec-once = $scriptsDir/RainbowBorders.sh
 
-# wlsunset - for automatic gamma adjustment. Default is 1900 to 0700 (7pm to 7am). Edit Sunset.sh accordingly
-# exec-once = $scriptsDir/Sunset.sh
-
-# auto close of apps (timeout 5 secs)
-# exec-once = $scriptsDir/AppAutoClose.sh
-
 # sway-idle with lock only
 exec-once = swayidle -w timeout 900 '$lock'
 # sway-idle with lock and sleep
 #exec-once = swayidle -w timeout 900 '$lock' timeout 1200 'hyprctl dispatch dpms off' resume 'hyprctl dispatch dpms on' before-sleep '$lock'
 # sway idle without lock
 #exec-once = swayidle -w  timeout 900 'hyprctl dispatch dpms off' resume 'hyprctl dispatch dpms on'
+
+
+## Here are list of features available but disabled by default
+
+#exec-once = $SwwwRandom $WallpaperPath # random wallpaper switcher every 30 minutes
+#exec-once = swww query || swww init && swww img $HOME/Pictures/wallpapers/mecha-nostalgia.png  # persistent wallpaper
+
+#gnome polkit for nixos
+#exec-once = $scriptsDir/Polkit-NixOS.sh
+
+# xdg-desktop-portal-hyprland (should be auto starting. However, you can force to start)
+#exec-once = $scriptsDir/PortalHyprland.sh
+
+# wlsunset - for automatic gamma adjustment. Default is 1900 to 0700 (7pm to 7am). Edit Sunset.sh accordingly
+# exec-once = $scriptsDir/Sunset.sh
\ No newline at end of file
diff --git a/config/hypr/scripts/AppAutoClose.sh b/config/hypr/scripts/AppAutoClose.sh
deleted file mode 100755
index 32a6d73..0000000
--- a/config/hypr/scripts/AppAutoClose.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-# Variables: put the process names you want to auto close here. Make sure to add "" and inside the ()
-processes=("pavucontrol")
-
-# Loop through each process name
-while true; do
-    active_window=$(hyprctl activewindow | grep class | awk '{print $2}')
-
-    # Loop through each process name in the array
-    for process in "${processes[@]}"; do
-        if [ "$active_window" == "$process" ]; then
-            # If the active window matches the process, mark it as active
-            process_active=true
-        else
-            # If not, mark it as inactive and try to kill the process
-            process_active=false
-            pkill "$process"
-        fi
-    done
-
-    sleep 5
-done
diff --git a/config/kitty/kitty.conf b/config/kitty/kitty.conf
index 2ae87ee..e5bba2c 100644
--- a/config/kitty/kitty.conf
+++ b/config/kitty/kitty.conf
@@ -1,4 +1,4 @@
-include ~/.cache/wal/colors-kitty.conf
+#include ~/.cache/wal/colors-kitty.conf
 
 font_family 	Fira Code SemiBold
 font_size 		12.0
diff --git a/config/waybar/configs/SouthWest [BL] b/config/waybar/configs/[BOT & Left] SouthWest
similarity index 100%
rename from config/waybar/configs/SouthWest [BL]
rename to config/waybar/configs/[BOT & Left] SouthWest
diff --git a/config/waybar/configs/SouthEast [BR] b/config/waybar/configs/[BOT & Right] SouthEast
similarity index 100%
rename from config/waybar/configs/SouthEast [BR]
rename to config/waybar/configs/[BOT & Right] SouthEast
diff --git a/config/waybar/configs/Camellia [Bottom] b/config/waybar/configs/[BOT] Camellia
similarity index 100%
rename from config/waybar/configs/Camellia [Bottom]
rename to config/waybar/configs/[BOT] Camellia
diff --git a/config/waybar/configs/Chrysanthemum [Bottom] b/config/waybar/configs/[BOT] Chrysanthemum
similarity index 100%
rename from config/waybar/configs/Chrysanthemum [Bottom]
rename to config/waybar/configs/[BOT] Chrysanthemum
diff --git a/config/waybar/configs/Default [Bottom] b/config/waybar/configs/[BOT] Default
similarity index 100%
rename from config/waybar/configs/Default [Bottom]
rename to config/waybar/configs/[BOT] Default
diff --git a/config/waybar/configs/Default [Bottom]-Laptop b/config/waybar/configs/[BOT] Default Laptop
similarity index 100%
rename from config/waybar/configs/Default [Bottom]-Laptop
rename to config/waybar/configs/[BOT] Default Laptop
diff --git a/config/waybar/configs/Gardenia [Bottom] b/config/waybar/configs/[BOT] Gardenia
similarity index 100%
rename from config/waybar/configs/Gardenia [Bottom]
rename to config/waybar/configs/[BOT] Gardenia
diff --git a/config/waybar/configs/Peony [Bottom] b/config/waybar/configs/[BOT] Peony
similarity index 100%
rename from config/waybar/configs/Peony [Bottom]
rename to config/waybar/configs/[BOT] Peony
diff --git a/config/waybar/configs/ClassySleek [Bottom] b/config/waybar/configs/[BOT] Sleek
similarity index 97%
rename from config/waybar/configs/ClassySleek [Bottom]
rename to config/waybar/configs/[BOT] Sleek
index a7b1c15..10175e8 100644
--- a/config/waybar/configs/ClassySleek [Bottom]	
+++ b/config/waybar/configs/[BOT] Sleek	
@@ -1,6 +1,6 @@
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
 
-// ClassySleek
+// Sleek 
 
 {
 "include": "~/.config/waybar/modules",
diff --git a/config/waybar/configs/WestWing [Left] b/config/waybar/configs/[Left] WestWing
similarity index 100%
rename from config/waybar/configs/WestWing [Left]
rename to config/waybar/configs/[Left] WestWing
diff --git a/config/waybar/configs/EastWing [Right] b/config/waybar/configs/[Right] EastWing
similarity index 100%
rename from config/waybar/configs/EastWing [Right]
rename to config/waybar/configs/[Right] EastWing
diff --git a/config/waybar/configs/SummitSplit [Top & Bot] b/config/waybar/configs/[TOP & BOT] SummitSplit
similarity index 100%
rename from config/waybar/configs/SummitSplit [Top & Bot]
rename to config/waybar/configs/[TOP & BOT] SummitSplit
diff --git a/config/waybar/configs/NorthWest [TL] b/config/waybar/configs/[TOP & Left] NorthWest
similarity index 100%
rename from config/waybar/configs/NorthWest [TL]
rename to config/waybar/configs/[TOP & Left] NorthWest
diff --git a/config/waybar/configs/NorthEast [TR] b/config/waybar/configs/[TOP & Right] NorthEast
similarity index 97%
rename from config/waybar/configs/NorthEast [TR]
rename to config/waybar/configs/[TOP & Right] NorthEast
index f2e1fe5..84ab71e 100644
--- a/config/waybar/configs/NorthEast [TR]	
+++ b/config/waybar/configs/[TOP & Right] NorthEast	
@@ -1,6 +1,6 @@
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
 
-// ### TOP and LEFT PANEL ## //
+// ### TOP and Right PANEL ## //
 
 [{
 "include": "~/.config/waybar/modules",
diff --git a/config/waybar/configs/Camellia [TOP] b/config/waybar/configs/[TOP] Camellia
similarity index 100%
rename from config/waybar/configs/Camellia [TOP]
rename to config/waybar/configs/[TOP] Camellia
diff --git a/config/waybar/configs/Chrysanthemum [TOP] b/config/waybar/configs/[TOP] Chrysanthemum
similarity index 100%
rename from config/waybar/configs/Chrysanthemum [TOP]
rename to config/waybar/configs/[TOP] Chrysanthemum
diff --git a/config/waybar/configs/Default [TOP] b/config/waybar/configs/[TOP] Default
similarity index 100%
rename from config/waybar/configs/Default [TOP]
rename to config/waybar/configs/[TOP] Default
diff --git a/config/waybar/configs/Default [TOP]-Laptop b/config/waybar/configs/[TOP] Default Laptop
similarity index 100%
rename from config/waybar/configs/Default [TOP]-Laptop
rename to config/waybar/configs/[TOP] Default Laptop
diff --git a/config/waybar/configs/Gardenia [TOP] b/config/waybar/configs/[TOP] Gardenia
similarity index 100%
rename from config/waybar/configs/Gardenia [TOP]
rename to config/waybar/configs/[TOP] Gardenia
diff --git a/config/waybar/configs/Minimalist Stretch [TOP] b/config/waybar/configs/[TOP] Minimal - Long
similarity index 95%
rename from config/waybar/configs/Minimalist Stretch [TOP]
rename to config/waybar/configs/[TOP] Minimal - Long
index dc519ad..8bc41ea 100644
--- a/config/waybar/configs/Minimalist Stretch [TOP]	
+++ b/config/waybar/configs/[TOP] Minimal - Long	
@@ -1,6 +1,6 @@
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
 
-// ### SIMPLE - Long ### //
+// ### Minimal - Long ### //
 
 {
 "include": "~/.config/waybar/modules",
diff --git a/config/waybar/configs/Minimalist [TOP] b/config/waybar/configs/[TOP] Minimal - Short
similarity index 93%
rename from config/waybar/configs/Minimalist [TOP]
rename to config/waybar/configs/[TOP] Minimal - Short
index 1368667..2282d93 100644
--- a/config/waybar/configs/Minimalist [TOP]	
+++ b/config/waybar/configs/[TOP] Minimal - Short	
@@ -1,6 +1,6 @@
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
 
-// ### SIMPLE -SHORT ### //
+// ### Minimal -SHORT ### //
 
 {
 "include": "~/.config/waybar/modules",
diff --git a/config/waybar/configs/Peony [TOP] b/config/waybar/configs/[TOP] Peony
similarity index 100%
rename from config/waybar/configs/Peony [TOP]
rename to config/waybar/configs/[TOP] Peony
diff --git a/config/waybar/configs/ClassySleek [TOP] b/config/waybar/configs/[TOP] Sleek
similarity index 97%
rename from config/waybar/configs/ClassySleek [TOP]
rename to config/waybar/configs/[TOP] Sleek
index 311a094..5f3b39c 100644
--- a/config/waybar/configs/ClassySleek [TOP]	
+++ b/config/waybar/configs/[TOP] Sleek	
@@ -1,6 +1,5 @@
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
-
-// ClassySleek
+// Sleek
 
 {
 "include": "~/.config/waybar/modules",
diff --git a/config/waybar/style/Monochrome Manifest.css b/config/waybar/style/[Black & White] Monochrome.css
similarity index 99%
rename from config/waybar/style/Monochrome Manifest.css
rename to config/waybar/style/[Black & White] Monochrome.css
index fd92aef..a9eeaa5 100644
--- a/config/waybar/style/Monochrome Manifest.css	
+++ b/config/waybar/style/[Black & White] Monochrome.css	
@@ -1,5 +1,5 @@
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
-/* MonoChrome Manifest */
+/*  Black & White MonoChrome */
 
 * {
 font-family: "JetBrainsMono Nerd Font";
diff --git a/config/waybar/style/Chroma Fusion Edge.css b/config/waybar/style/[Bordered Pywal] Chroma Fusion Edge.css
similarity index 99%
rename from config/waybar/style/Chroma Fusion Edge.css
rename to config/waybar/style/[Bordered Pywal] Chroma Fusion Edge.css
index 0ae1be5..d26c6a2 100644
--- a/config/waybar/style/Chroma Fusion Edge.css	
+++ b/config/waybar/style/[Bordered Pywal] Chroma Fusion Edge.css	
@@ -1,5 +1,6 @@
 /* ----------- 💫 https://github.com/JaKooLit 💫 -------- */
 /* ....Chroma Fusion Edge .... */
+/* Pywal & Catppuccin - Bordered */
 
 @define-color white      	#F2F2F2;
 @define-color black      	#000000;
diff --git a/config/waybar/style/Chroma Glow.css b/config/waybar/style/[Colored] Chroma Glow.css
similarity index 100%
rename from config/waybar/style/Chroma Glow.css
rename to config/waybar/style/[Colored] Chroma Glow.css
diff --git a/config/waybar/style/Translucent Chromatic.css b/config/waybar/style/[Colored] Translucent.css
similarity index 99%
rename from config/waybar/style/Translucent Chromatic.css
rename to config/waybar/style/[Colored] Translucent.css
index 6d02815..9a096c3 100644
--- a/config/waybar/style/Translucent Chromatic.css	
+++ b/config/waybar/style/[Colored] Translucent.css	
@@ -13,7 +13,7 @@
 @define-color accent6 #0db9d7;
 
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
-/* Translucent Chromatic */
+/* Translucent */
 
 * {
 font-family: "JetBrainsMono Nerd Font";
diff --git a/config/waybar/style/Aurora Blossom.css b/config/waybar/style/[Colorful] Aurora Blossom.css
similarity index 100%
rename from config/waybar/style/Aurora Blossom.css
rename to config/waybar/style/[Colorful] Aurora Blossom.css
diff --git a/config/waybar/style/Aurora.css b/config/waybar/style/[Colorful] Aurora.css
similarity index 99%
rename from config/waybar/style/Aurora.css
rename to config/waybar/style/[Colorful] Aurora.css
index f09b611..b151b9c 100644
--- a/config/waybar/style/Aurora.css
+++ b/config/waybar/style/[Colorful] Aurora.css	
@@ -1,5 +1,5 @@
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
-/* Aurora Blossom */
+/* Aurora */
 
 * {
 font-family: "JetBrainsMono Nerd Font";
diff --git a/config/waybar/style/Rainbow Spectrum.css b/config/waybar/style/[Colorful] Rainbow Spectrum.css
similarity index 100%
rename from config/waybar/style/Rainbow Spectrum.css
rename to config/waybar/style/[Colorful] Rainbow Spectrum.css
diff --git a/config/waybar/style/Obsidian Edge.css b/config/waybar/style/[Dark] Obsidian Edge.css
similarity index 99%
rename from config/waybar/style/Obsidian Edge.css
rename to config/waybar/style/[Dark] Obsidian Edge.css
index e1d6340..587c3f0 100644
--- a/config/waybar/style/Obsidian Edge.css	
+++ b/config/waybar/style/[Dark] Obsidian Edge.css	
@@ -1,5 +1,5 @@
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
-/* Obsidian Edge */
+/* Dark - Obsidian Edge */
 
 @import '../../.cache/wal/colors-waybar.css';
 
diff --git a/config/waybar/style/Monochrome Contrast.css b/config/waybar/style/[Light] Monochrome Contrast.css
similarity index 99%
rename from config/waybar/style/Monochrome Contrast.css
rename to config/waybar/style/[Light] Monochrome Contrast.css
index b363008..d70ce5e 100644
--- a/config/waybar/style/Monochrome Contrast.css	
+++ b/config/waybar/style/[Light] Monochrome Contrast.css	
@@ -1,5 +1,5 @@
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
-/* MonoChrome Contrast */
+/* Light - MonoChrome Contrast */
 
 * {
 font-family: "JetBrainsMono Nerd Font";
diff --git a/config/waybar/style/Obsidian Glow.css b/config/waybar/style/[Light] Obsidian Glow.css
similarity index 99%
rename from config/waybar/style/Obsidian Glow.css
rename to config/waybar/style/[Light] Obsidian Glow.css
index 2ffc148..9b4b07a 100644
--- a/config/waybar/style/Obsidian Glow.css	
+++ b/config/waybar/style/[Light] Obsidian Glow.css	
@@ -1,5 +1,5 @@
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
-/* Obsidian Glow */
+/* Light - Obsidian Glow */
 
 * {
 font-family: "JetBrainsMono Nerd Font";
diff --git a/config/waybar/style/Chroma Edge.css b/config/waybar/style/[Pywal] Chroma Edge.css
similarity index 99%
rename from config/waybar/style/Chroma Edge.css
rename to config/waybar/style/[Pywal] Chroma Edge.css
index e876240..acdfce2 100644
--- a/config/waybar/style/Chroma Edge.css	
+++ b/config/waybar/style/[Pywal] Chroma Edge.css	
@@ -1,5 +1,5 @@
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
-/* Chroma Edge */
+/* Pywal Chroma Edge */
 
 @import '../../.cache/wal/colors-waybar.css';
 
diff --git a/config/waybar/style/Chroma Fusion.css b/config/waybar/style/[Pywal] Chroma Fusion.css
similarity index 99%
rename from config/waybar/style/Chroma Fusion.css
rename to config/waybar/style/[Pywal] Chroma Fusion.css
index 4551251..3a2ddda 100644
--- a/config/waybar/style/Chroma Fusion.css	
+++ b/config/waybar/style/[Pywal] Chroma Fusion.css	
@@ -1,5 +1,6 @@
 /* ----------- 💫 https://github.com/JaKooLit 💫 -------- */
 /* ....Chroma Fusion Edge .... */
+/* Pywal -Catpuccin */
 
 @define-color white      	#F2F2F2;
 @define-color black      	#000000;
diff --git a/config/waybar/style/Chroma Tally.css b/config/waybar/style/[Pywal] Chroma Tally.css
similarity index 99%
rename from config/waybar/style/Chroma Tally.css
rename to config/waybar/style/[Pywal] Chroma Tally.css
index 7009c5d..5ea40d8 100644
--- a/config/waybar/style/Chroma Tally.css	
+++ b/config/waybar/style/[Pywal] Chroma Tally.css	
@@ -1,5 +1,5 @@
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
-/* Chroma Tally */
+/* Pywal - Chroma Tally */
 
 @import '../../.cache/wal/colors-waybar.css';
 
diff --git a/config/waybar/style/Pywallete Chroma.css b/config/waybar/style/[Pywal] Colored.css
similarity index 99%
rename from config/waybar/style/Pywallete Chroma.css
rename to config/waybar/style/[Pywal] Colored.css
index 57ef72f..b1e2b00 100644
--- a/config/waybar/style/Pywallete Chroma.css	
+++ b/config/waybar/style/[Pywal] Colored.css	
@@ -1,5 +1,5 @@
 /* ----------- 💫 https://github.com/JaKooLit 💫 -------- */
-/* pywallete Chroma*/
+/* pywal Colored*/
 
 @import '../../.cache/wal/colors-waybar.css';
 
diff --git a/config/waybar/style/Pywallete.css b/config/waybar/style/[Pywal] Simple.css
similarity index 99%
rename from config/waybar/style/Pywallete.css
rename to config/waybar/style/[Pywal] Simple.css
index fe08c19..9d8c1c8 100644
--- a/config/waybar/style/Pywallete.css
+++ b/config/waybar/style/[Pywal] Simple.css	
@@ -1,5 +1,5 @@
 /* ----------- 💫 https://github.com/JaKooLit 💫 -------- */
-/* pywallete */
+/* pywal - Simple */
 
 *{
 font-family: "JetBrainsMono Nerd Font";
diff --git a/config/waybar/style/Simple Style.css b/config/waybar/style/[Retro] Simple Style.css
similarity index 100%
rename from config/waybar/style/Simple Style.css
rename to config/waybar/style/[Retro] Simple Style.css
diff --git a/config/waybar/style/Crystal Clear.css b/config/waybar/style/[Transparent] Crystal Clear.css
similarity index 100%
rename from config/waybar/style/Crystal Clear.css
rename to config/waybar/style/[Transparent] Crystal Clear.css
diff --git a/copy.sh b/copy.sh
index b561d1d..5db1ea5 100755
--- a/copy.sh
+++ b/copy.sh
@@ -214,17 +214,17 @@ printf "\n%.0s" {1..3}
 # 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/Default [TOP]-Laptop" "$HOME/.config/waybar/configs/Default [Bottom]-Laptop" 2>&1 | tee -a "$LOG"
+    ln -sf "$HOME/.config/waybar/configs/[TOP] Default" "$HOME/.config/waybar/config" 2>&1 | tee -a "$LOG"
+    rm -r "$HOME/.config/waybar/configs/[TOP] Default Laptop" "$HOME/.config/waybar/configs/[BOT] Default Laptop" 2>&1 | tee -a "$LOG"
 else
     # Configurations for a laptop or any system other than desktop
-    ln -sf "$HOME/.config/waybar/configs/Default [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"
+    ln -sf "$HOME/.config/waybar/configs/[TOP] Default Laptop" "$HOME/.config/waybar/config" 2>&1 | tee -a "$LOG"
+    rm -r "$HOME/.config/waybar/configs/[TOP] Default" "$HOME/.config/waybar/configs/[BOT] Default" 2>&1 | tee -a "$LOG"
 fi
 
 
 # symlinks for waybar style
-ln -sf "$HOME/.config/waybar/style/Golden Noir.css" "$HOME/.config/waybar/style.css" && \
+ln -sf "$HOME/.config/waybar/style/[Pywal] Chroma Fusion.css" "$HOME/.config/waybar/style.css" && \
 
 # initialize pywal to avoid config error on hyprland
 wal -i ~/Pictures/wallpapers/anime-girl-abyss.png 2>&1 | tee -a "$LOG"