Merge branch 'development' into main

13 files changed, 1026 insertions, 613 deletions

diff --git a/config/waybar/config b/config/waybar/config
index 48604a06..079ec33f 100644..120000
--- a/config/waybar/config
+++ b/config/waybar/config
@@ -1 +1 @@
-for symlink
\ No newline at end of file
+/home/ja/.config/waybar/configs/[TOP] Default Laptop_v2
\ No newline at end of file
diff --git a/config/waybar/modules b/config/waybar/modules
index a2357e20..9956e30e 100644
--- a/config/waybar/modules
+++ b/config/waybar/modules
@@ -1,730 +1,756 @@
 //* ---- 💫 https://github.com/JaKooLit 💫 ---- *//
+/* Waybar Modules */
 
 {
 // HYPRLAND WORKSPACES. CHOOSE as desired and place on waybar configs
 // CIRCLES Style
 "hyprland/workspaces": {
 	"active-only": false,
-    "all-outputs": true, 
-    "format": "{icon}",
-    "show-special": false,
-    "on-click": "activate",
-    "on-scroll-up": "hyprctl dispatch workspace e+1",
-    "on-scroll-down": "hyprctl dispatch workspace e-1",
-    "persistent-workspaces": {
-      "1": [],
-      "2": [],
-      "3": [],
-      "4": [],
-      "5": [],
-    },
-    "format-icons": {
-      "active": "",
-      "default": "",
-	},  
+	"all-outputs": true,
+	"format": "{icon}",
+	"show-special": false,
+	"on-click": "activate",
+	"on-scroll-up": "hyprctl dispatch workspace e+1",
+	"on-scroll-down": "hyprctl dispatch workspace e-1",
+	"persistent-workspaces": {
+		"1": [],
+		"2": [],
+		"3": [],
+		"4": [],
+		"5": [],
+	},
+	"format-icons": {
+		"active": "",
+		"default": "",
+	},
 },
-
 // ROMAN Numerals style
 "hyprland/workspaces#roman": {
-    "active-only":false,
-    "all-outputs": true,
-    "format": "{icon}",
-    "show-special": false,
-    "on-click": "activate",
-    "on-scroll-up": "hyprctl dispatch workspace e+1",
-    "on-scroll-down": "hyprctl dispatch workspace e-1",
-    "persistent-workspaces":{
-        "1": [],
-        "2": [],
-        "3": [],
-        "4": [],
-        "5": [],
-    },
-    "format-icons": {
-      "1": "I",
-      "2": "II",
-      "3": "III",
-      "4": "IV",
-      "5": "V",
-      "6": "VI",
-      "7": "VII",
-      "8": "VIII",
-      "9": "IX",
-      "10": "X",
-      
-    },
+	"active-only": false,
+	"all-outputs": true,
+	"format": "{icon}",
+	"show-special": false,
+	"on-click": "activate",
+	"on-scroll-up": "hyprctl dispatch workspace e+1",
+	"on-scroll-down": "hyprctl dispatch workspace e-1",
+	"persistent-workspaces": {
+		"1": [],
+		"2": [],
+		"3": [],
+		"4": [],
+		"5": [],
+	},
+	"format-icons": {
+		"1": "I",
+		"2": "II",
+		"3": "III",
+		"4": "IV",
+		"5": "V",
+		"6": "VI",
+		"7": "VII",
+		"8": "VIII",
+		"9": "IX",
+		"10": "X",
+	},
 },
-
 // PACMAN Style
-  "hyprland/workspaces#pacman": {
-    "active-only":false,
-    "all-outputs": true,
-    "format": "{icon}",
-    "on-click": "activate",
-    "on-scroll-up": "hyprctl dispatch workspace e+1",
-    "on-scroll-down": "hyprctl dispatch workspace e-1",
-    "show-special": false,
-    "persistent-workspaces":{
-        "1": [],
-        "2": [],
-        "3": [],
-        "4": [],
-        "5": [],
-    },
-    "format": "{icon}",
-    "format-icons": {
-      "active": " 󰮯 ",
-      "default": "󰊠",
-      "persistent":"󰊠",
-    },
+"hyprland/workspaces#pacman": {
+	"active-only": false,
+	"all-outputs": true,
+	"format": "{icon}",
+	"on-click": "activate",
+	"on-scroll-up": "hyprctl dispatch workspace e+1",
+	"on-scroll-down": "hyprctl dispatch workspace e-1",
+	"show-special": false,
+	"persistent-workspaces": {
+		"1": [],
+		"2": [],
+		"3": [],
+		"4": [],
+		"5": [],
+	},
+	"format": "{icon}",
+	"format-icons": {
+		"active": " 󰮯 ",
+		"default": "󰊠",
+		"persistent": "󰊠",
+	},
 },
-  
 "hyprland/workspaces#kanji": {
-    "disable-scroll": true,
-    "all-outputs": true,
-    "format": "{icon}",
-    "persistent-workspaces": {
-      "1": [],
-      "2": [],
-      "3": [],
-      "4": [],
-      "5": [],
-      },
-    "format-icons": {
-      "1": "一",
-      "2": "二",
-      "3": "三",
-      "4": "四",
-      "5": "五",
-      "6": "六",
-      "7": "七",
-      "8": "八",
-      "9": "九",
-      "10": "十",
-    }
+	"disable-scroll": true,
+	"all-outputs": true,
+	"format": "{icon}",
+	"persistent-workspaces": {
+		"1": [],
+		"2": [],
+		"3": [],
+		"4": [],
+		"5": [],
+	},
+	"format-icons": {
+		"1": "一",
+		"2": "二",
+		"3": "三",
+		"4": "四",
+		"5": "五",
+		"6": "六",
+		"7": "七",
+		"8": "八",
+		"9": "九",
+		"10": "十",
+	}
 },
-  
 //  NUMBERS and ICONS style
 "hyprland/workspaces#4": {
-    "format": "{name}",
-    "format": " {name} {icon} ",
-    //"format": " {icon} ",
-    "show-special": false,
-    "on-click": "activate",
-    "on-scroll-up": "hyprctl dispatch workspace e+1",
-    "on-scroll-down": "hyprctl dispatch workspace e-1",
-    "all-outputs": true,
-    "sort-by-number": true,
-    "format-icons": {
-      "1": " ",
-      "2": " ",
-      "3": " ",
-      "4": " ",
-      "5": " ",
-      "6": " ",
-      "7": "",
-      "8": " ",
-      "9": "",
-      "10": "10",
-      "focused": "",
-      "default": "",
-    },
+	"format": "{name}",
+	"format": " {name} {icon} ",
+	//"format": " {icon} ",
+	"show-special": false,
+	"on-click": "activate",
+	"on-scroll-up": "hyprctl dispatch workspace e+1",
+	"on-scroll-down": "hyprctl dispatch workspace e-1",
+	"all-outputs": true,
+	"sort-by-number": true,
+	"format-icons": {
+		"1": " ",
+		"2": " ",
+		"3": " ",
+		"4": " ",
+		"5": " ",
+		"6": " ",
+		"7": "",
+		"8": " ",
+		"9": "",
+		"10": "10",
+		"focused": "",
+		"default": "",
+	},
 },
- 
 // GROUP
-  
 "group/motherboard": {
-    "orientation": "horizontal",
-    "modules": [
-      "cpu",
-      "memory",
-      "temperature",
-      "disk",
-      ]	
+	"orientation": "horizontal",
+	"modules": [
+		"cpu",
+		"memory",
+		"temperature",
+		"disk",
+	]
 },
-  
 "group/laptop": {
-    "orientation": "horizontal",
-    "modules": [
-      "backlight",
-      "battery",
-      ]	
+	"orientation": "horizontal",
+	"modules": [
+		"backlight",
+		"battery",
+	]
 },
-  
 "group/audio": {
-    "orientation": "horizontal",
-    "modules": [
-      "pulseaudio",
-      "pulseaudio#microphone",
-      ]	
+	"orientation": "horizontal",
+	"modules": [
+		"pulseaudio",
+		"pulseaudio#microphone",
+	]
 },
- 
 "backlight": {
-    "interval": 2,
-    "align": 0,
-    "rotate": 0,
-    //"format": "{icon} {percent}%",
-    "format-icons": [" ", " ", " ", "󰃝 ", "󰃞 ", "󰃟 ", "󰃠 "],
-    "format": "{icon}",
-    //"format-icons": ["","","","","","","","","","","","","","",""],
-    "tooltip-format": "backlight {percent}%",
-    "icon-size": 10,
-    "on-click": "",
-    "on-click-middle": "",
-    "on-click-right": "",
-    "on-update": "",
-    "on-scroll-up": "~/.config/hypr/scripts/Brightness.sh --inc",
-    "on-scroll-down": "~/.config/hypr/scripts/Brightness.sh --dec",
-    "smooth-scrolling-threshold": 1,
+	"interval": 2,
+	"align": 0,
+	"rotate": 0,
+	//"format": "{icon} {percent}%",
+	"format-icons": [
+		" ",
+		" ",
+		" ",
+		"󰃝 ",
+		"󰃞 ",
+		"󰃟 ",
+		"󰃠 "
+	],
+	"format": "{icon}",
+	//"format-icons": ["","","","","","","","","","","","","","",""],
+	"tooltip-format": "backlight {percent}%",
+	"icon-size": 10,
+	"on-click": "",
+	"on-click-middle": "",
+	"on-click-right": "",
+	"on-update": "",
+	"on-scroll-up": "~/.config/hypr/scripts/Brightness.sh --inc",
+	"on-scroll-down": "~/.config/hypr/scripts/Brightness.sh --dec",
+	"smooth-scrolling-threshold": 1,
 },
-      
 "battery": {
-    //"interval": 5,
-    "align": 0,
-    "rotate": 0,
-    //"bat": "BAT1",
-    //"adapter": "ACAD",
-    "full-at": 100,
-    "design-capacity": false,
-    "states": {
-      "good": 95,
-      "warning": 30,
-      "critical": 15
-             },
-    "format": "{icon} {capacity}%",
-    "format-charging": " {capacity}%",
-    "format-plugged": "󱘖 {capacity}%",
+	//"interval": 5,
+	"align": 0,
+	"rotate": 0,
+	//"bat": "BAT1",
+	//"adapter": "ACAD",
+	"full-at": 100,
+	"design-capacity": false,
+	"states": {
+		"good": 95,
+		"warning": 30,
+		"critical": 15
+	},
+	"format": "{icon} {capacity}%",
+	"format-charging": " {capacity}%",
+	"format-plugged": "󱘖 {capacity}%",
 	"format-alt-click": "click",
-    "format-full": "{icon} Full",
-    "format-alt": "{icon} {time}",
-    "format-icons": ["󰂎", "󰁺", "󰁻", "󰁼", "󰁽", "󰁾", "󰁿", "󰂀", "󰂁", "󰂂", "󰁹"],
-    "format-time": "{H}h {M}min",
-    "tooltip": true,
-    "tooltip-format": "{timeTo} {power}w",
-    "on-click-middle": "~/.config/hypr/scripts/ChangeBlur.sh",
-    "on-click-right": "~/.config/hypr/scripts/Wlogout.sh",
+	"format-full": "{icon} Full",
+	"format-alt": "{icon} {time}",
+	"format-icons": [
+		"󰂎",
+		"󰁺",
+		"󰁻",
+		"󰁼",
+		"󰁽",
+		"󰁾",
+		"󰁿",
+		"󰂀",
+		"󰂁",
+		"󰂂",
+		"󰁹"
+	],
+	"format-time": "{H}h {M}min",
+	"tooltip": true,
+	"tooltip-format": "{timeTo} {power}w",
+	"on-click-middle": "~/.config/hypr/scripts/ChangeBlur.sh",
+	"on-click-right": "~/.config/hypr/scripts/Wlogout.sh",
 },
-      
 "bluetooth": {
-    "format": "",
-    "format-disabled": "󰂳",
-    "format-connected": "󰂱 {num_connections}",
-    "tooltip-format": " {device_alias}",
-    "tooltip-format-connected": "{device_enumerate}",
-    "tooltip-format-enumerate-connected": " {device_alias} 󰂄{device_battery_percentage}%",
-    "tooltip": true,
-    "on-click": "blueman-manager",
+	"format": "",
+	"format-disabled": "󰂳",
+	"format-connected": "󰂱 {num_connections}",
+	"tooltip-format": " {device_alias}",
+	"tooltip-format-connected": "{device_enumerate}",
+	"tooltip-format-enumerate-connected": " {device_alias} 󰂄{device_battery_percentage}%",
+	"tooltip": true,
+	"on-click": "blueman-manager",
 },
-     
 "clock": {
-    "interval": 1,
-    //"format": " {:%I:%M %p}", // AM PM format
-    "format": " {:%H:%M:%S}",
-    "format-alt": " {:%H:%M   %Y, %d %B, %A}",
-    "tooltip-format": "<tt><small>{calendar}</small></tt>",
-    "calendar": {
-      "mode"          : "year",
-      "mode-mon-col"  : 3,
-      "weeks-pos"     : "right",
-      "on-scroll"     : 1,
-      "format": {
-      "months":     "<span color='#ffead3'><b>{}</b></span>",
-      "days":       "<span color='#ecc6d9'><b>{}</b></span>",
-      "weeks":      "<span color='#99ffdd'><b>W{}</b></span>",
-      "weekdays":   "<span color='#ffcc66'><b>{}</b></span>",
-      "today":      "<span color='#ff6699'><b><u>{}</u></b></span>"
-                }
-                }
-    },              
-    "actions":  {
-      "on-click-right": "mode",
-      "on-click-forward": "tz_up",
-      "on-click-backward": "tz_down",
-      "on-scroll-up": "shift_up",
-      "on-scroll-down": "shift_down"
+	"interval": 1,
+	//"format": " {:%I:%M %p}", // AM PM format
+	"format": " {:%H:%M:%S}",
+	"format-alt": " {:%H:%M   %Y, %d %B, %A}",
+	"tooltip-format": "<tt><small>{calendar}</small></tt>",
+	"calendar": {
+		"mode": "year",
+		"mode-mon-col": 3,
+		"weeks-pos": "right",
+		"on-scroll": 1,
+		"format": {
+			"months": "<span color='#ffead3'><b>{}</b></span>",
+			"days": "<span color='#ecc6d9'><b>{}</b></span>",
+			"weeks": "<span color='#99ffdd'><b>W{}</b></span>",
+			"weekdays": "<span color='#ffcc66'><b>{}</b></span>",
+			"today": "<span color='#ff6699'><b><u>{}</u></b></span>"
+		}
+	}
+},
+"actions": {
+	"on-click-right": "mode",
+	"on-click-forward": "tz_up",
+	"on-click-backward": "tz_down",
+	"on-scroll-up": "shift_up",
+	"on-scroll-down": "shift_down"
 },
-   
 "cpu": {
-    "format": "{usage}% 󰍛",  
-    "interval": 1,
-    "format-alt-click": "click",
-    "format-alt": "{icon0}{icon1}{icon2}{icon3} {usage:>2}% 󰍛",
-    "format-icons": ["▁", "▂", "▃", "▄", "▅", "▆", "▇", "█"],
-    "on-click-right": "gnome-system-monitor",
+	"format": "{usage}% 󰍛",
+	"interval": 1,
+	"format-alt-click": "click",
+	"format-alt": "{icon0}{icon1}{icon2}{icon3} {usage:>2}% 󰍛",
+	"format-icons": [
+		"▁",
+		"▂",
+		"▃",
+		"▄",
+		"▅",
+		"▆",
+		"▇",
+		"█"
+	],
+	"on-click-right": "gnome-system-monitor",
 },
-    
 "disk": {
-    "interval": 30,
-    //"format": "󰋊",
-    "path": "/",
-    //"format-alt-click": "click",
-    "format": "{percentage_used}% 󰋊",
-    //"tooltip": true,
-    "tooltip-format": "{used} used out of {total} on {path} ({percentage_used}%)",
+	"interval": 30,
+	//"format": "󰋊",
+	"path": "/",
+	//"format-alt-click": "click",
+	"format": "{percentage_used}% 󰋊",
+	//"tooltip": true,
+	"tooltip-format": "{used} used out of {total} on {path} ({percentage_used}%)",
 },
-    
 "hyprland/language": {
-    "format": "Lang: {}",
-    "format-en": "US",
-    "format-tr": "Korea",
-    "keyboard-name": "at-translated-set-2-keyboard",
-    "on-click": "hyprctl switchxkblayout $SET_KB next"
+	"format": "Lang: {}",
+	"format-en": "US",
+	"format-tr": "Korea",
+	"keyboard-name": "at-translated-set-2-keyboard",
+	"on-click": "hyprctl switchxkblayout $SET_KB next"
 },
-    
 "hyprland/submap": {
-    "format": "<span style=\"italic\">  {}</span>", // Icon: expand-arrows-alt
-    "tooltip": false,
+	"format": "<span style=\"italic\">  {}</span>", // Icon: expand-arrows-alt
+	"tooltip": false,
 },
-    
 "hyprland/window": {
-    "format": "{}",
-    "max-length": 40,
-    "separate-outputs": true,
-    "offscreen-css" : true,
-    "offscreen-css-text": "(inactive)",
-     "rewrite": {
-          "(.*) — Mozilla Firefox": " $1",
-          "(.*) - fish": "> [$1]",
-      "(.*) - zsh": "> [$1]",
-      "(.*) - kitty": "> [$1]",
-    },
+	"format": "{}",
+	"max-length": 40,
+	"separate-outputs": true,
+	"offscreen-css": true,
+	"offscreen-css-text": "(inactive)",
+	"rewrite": {
+		"(.*) — Mozilla Firefox": " $1",
+		"(.*) - fish": "> [$1]",
+		"(.*) - zsh": "> [$1]",
+		"(.*) - $term": "> [$1]",
+	},
 },
-  
 "idle_inhibitor": {
-    "format": "{icon}",
-    "format-icons": {
-      "activated": " ",
-      "deactivated": " ",
-                    }
+	"format": "{icon}",
+	"format-icons": {
+		"activated": " ",
+		"deactivated": " ",
+	}
 },
-    
 "keyboard-state": {
-    //"numlock": true,
-    "capslock": true,
-    "format": {
-      "numlock": "N {icon}",
-    "capslock":"󰪛 {icon}",
-        }, 
-    "format-icons": {
-      "locked": "",
-      "unlocked": ""
-              },
+	//"numlock": true,
+	"capslock": true,
+	"format": {
+		"numlock": "N {icon}",
+		"capslock": "󰪛 {icon}",
+	},
+	"format-icons": {
+		"locked": "",
+		"unlocked": ""
+	},
 },
-    
 "memory": {
-    "interval": 10,
-    "format": "{used:0.1f}G 󰾆",
-    "format-alt": "{percentage}% 󰾆",
-    "format-alt-click": "click",
-    "tooltip": true,
-    "tooltip-format": "{used:0.1f}GB/{total:0.1f}G",
-    "on-click-right": "kitty --title btop sh -c 'btop'"
+	"interval": 10,
+	"format": "{used:0.1f}G 󰾆",
+	"format-alt": "{percentage}% 󰾆",
+	"format-alt-click": "click",
+	"tooltip": true,
+	"tooltip-format": "{used:0.1f}GB/{total:0.1f}G",
+	"on-click-right": "kitty --title btop sh -c 'btop'"
 },
-
 "mpris": {
-    "interval": 10,
+	"interval": 10,
 	"format": "{player_icon} ",
 	"format-paused": "{status_icon} <i>{dynamic}</i>",
 	"on-click-middle": "playerctl play-pause",
-    "on-click": "playerctl previous",
-    "on-click-right": "playerctl next",
-    "scroll-step": 5.0,
-    "on-scroll-up": "~/.config/hypr/scripts/Volume.sh --inc",
-    "on-scroll-down": "~/.config/hypr/scripts/Volume.sh --dec",
-    "smooth-scrolling-threshold": 1,
+	"on-click": "playerctl previous",
+	"on-click-right": "playerctl next",
+	"scroll-step": 5.0,
+	"on-scroll-up": "~/.config/hypr/scripts/Volume.sh --inc",
+	"on-scroll-down": "~/.config/hypr/scripts/Volume.sh --dec",
+	"smooth-scrolling-threshold": 1,
 	"player-icons": {
-        "chromium": "",
+		"chromium": "",
 		"default": "",
-        "firefox": "",
-        "kdeconnect": "",
-        "mopidy": "",
+		"firefox": "",
+		"kdeconnect": "",
+		"mopidy": "",
 		"mpv": "󰐹",
-        "spotify": "",
+		"spotify": "",
 		"vlc": "󰕼",
 	},
 	"status-icons": {
 		"paused": "󰐎",
-        "playing": "",
-        "stopped": "",
+		"playing": "",
+		"stopped": "",
 	},
 	// "ignored-players": ["firefox"]
 	"max-length": 30,
 },
-      
 "network": {
-    "format": "{ifname}",
-    "format-wifi": "{icon}",
-    "format-ethernet": "󰌘",
-    "format-disconnected": "󰌙", 
-    "tooltip-format": "{ipaddr}  {bandwidthUpBytes}  {bandwidthDownBytes}",
-    "format-linked": "󰈁 {ifname} (No IP)",
-    "tooltip-format-wifi": "{essid} {icon} {signalStrength}%",
-    "tooltip-format-ethernet": "{ifname} 󰌘",
-    "tooltip-format-disconnected": "󰌙 Disconnected",
-    "max-length": 50,
-    "format-icons": ["󰤯","󰤟","󰤢","󰤥","󰤨"]
+	"format": "{ifname}",
+	"format-wifi": "{icon}",
+	"format-ethernet": "󰌘",
+	"format-disconnected": "󰌙",
+	"tooltip-format": "{ipaddr}  {bandwidthUpBytes}  {bandwidthDownBytes}",
+	"format-linked": "󰈁 {ifname} (No IP)",
+	"tooltip-format-wifi": "{essid} {icon} {signalStrength}%",
+	"tooltip-format-ethernet": "{ifname} 󰌘",
+	"tooltip-format-disconnected": "󰌙 Disconnected",
+	"max-length": 50,
+	"format-icons": [
+		"󰤯",
+		"󰤟",
+		"󰤢",
+		"󰤥",
+		"󰤨"
+	]
 },
-  
 "network#speed": {
-    "interval": 1,
-    "format": "{ifname}",
-    "format-wifi": "{icon}  {bandwidthUpBytes}  {bandwidthDownBytes}",
-    "format-ethernet": "󰌘   {bandwidthUpBytes}  {bandwidthDownBytes}",
-    "format-disconnected": "󰌙", 
-    "tooltip-format": "{ipaddr}",
-    "format-linked": "󰈁 {ifname} (No IP)",
-    "tooltip-format-wifi": "{essid} {icon} {signalStrength}%",
-    "tooltip-format-ethernet": "{ifname} 󰌘",
-    "tooltip-format-disconnected": "󰌙 Disconnected",
-    "max-length": 50,
-    "format-icons": ["󰤯","󰤟","󰤢","󰤥","󰤨"]
+	"interval": 1,
+	"format": "{ifname}",
+	"format-wifi": "{icon}  {bandwidthUpBytes}  {bandwidthDownBytes}",
+	"format-ethernet": "󰌘   {bandwidthUpBytes}  {bandwidthDownBytes}",
+	"format-disconnected": "󰌙",
+	"tooltip-format": "{ipaddr}",
+	"format-linked": "󰈁 {ifname} (No IP)",
+	"tooltip-format-wifi": "{essid} {icon} {signalStrength}%",
+	"tooltip-format-ethernet": "{ifname} 󰌘",
+	"tooltip-format-disconnected": "󰌙 Disconnected",
+	"max-length": 50,
+	"format-icons": [
+		"󰤯",
+		"󰤟",
+		"󰤢",
+		"󰤥",
+		"󰤨"
+	]
 },
-      
 "pulseaudio": {
-    "format": "{icon} {volume}%",
-    "format-bluetooth": "{icon} 󰂰 {volume}%",
-    "format-muted": "󰖁",
-    "format-icons": {
-        "headphone": "",
-        "hands-free": "",
-        "headset": "",
-        "phone": "",
-        "portable": "",
-        "car": "",
-    "default": ["", "", "󰕾", ""], 
-    "ignored-sinks": ["Easy Effects Sink"],
-    },
-    "scroll-step": 5.0,
-    "on-click": "~/.config/hypr/scripts/Volume.sh --toggle",
-    "on-click-right": "pavucontrol -t 3",
-    "on-scroll-up": "~/.config/hypr/scripts/Volume.sh --inc",
-    "on-scroll-down": "~/.config/hypr/scripts/Volume.sh --dec",
+	"format": "{icon} {volume}%",
+	"format-bluetooth": "{icon} 󰂰 {volume}%",
+	"format-muted": "󰖁",
+	"format-icons": {
+		"headphone": "",
+		"hands-free": "",
+		"headset": "",
+		"phone": "",
+		"portable": "",
+		"car": "",
+		"default": [
+			"",
+			"",
+			"󰕾",
+			""
+		],
+		"ignored-sinks": [
+			"Easy Effects Sink"
+		],
+	},
+	"scroll-step": 5.0,
+	"on-click": "~/.config/hypr/scripts/Volume.sh --toggle",
+	"on-click-right": "pavucontrol -t 3",
+	"on-scroll-up": "~/.config/hypr/scripts/Volume.sh --inc",
+	"on-scroll-down": "~/.config/hypr/scripts/Volume.sh --dec",
 	"tooltip-format": "{icon} {desc} | {volume}%",
-    "smooth-scrolling-threshold": 1,
+	"smooth-scrolling-threshold": 1,
 },
-      
 "pulseaudio#microphone": {
-    "format": "{format_source}",
-    "format-source": " {volume}%",
-    "format-source-muted": "",
-    "on-click": "~/.config/hypr/scripts/Volume.sh --toggle-mic",
-    "on-click-right": "pavucontrol -t 4",
-    "on-scroll-up": "~/.config/hypr/scripts/Volume.sh --mic-inc",
-    "on-scroll-down": "~/.config/hypr/scripts/Volume.sh --mic-dec",
+	"format": "{format_source}",
+	"format-source": " {volume}%",
+	"format-source-muted": "",
+	"on-click": "~/.config/hypr/scripts/Volume.sh --toggle-mic",
+	"on-click-right": "pavucontrol -t 4",
+	"on-scroll-up": "~/.config/hypr/scripts/Volume.sh --mic-inc",
+	"on-scroll-down": "~/.config/hypr/scripts/Volume.sh --mic-dec",
 	"tooltip-format": "{source_desc} | {source_volume}%",
-    "scroll-step": 5,
+	"scroll-step": 5,
 },
-    
 "temperature": {
-    "interval": 10,
-    "tooltip": true,
-    "hwmon-path": ["/sys/class/hwmon/hwmon1/temp1_input", "/sys/class/thermal/thermal_zone0/temp"],
-    //"thermal-zone": 0,
-    "critical-threshold": 82,
-    "format-critical": "{temperatureC}°C {icon}",
-    "format": "{temperatureC}°C {icon}",
-    "format-icons": ["󰈸"],
-    "on-click-right": "kitty --title nvtop sh -c 'nvtop'"
+	"interval": 10,
+	"tooltip": true,
+	"hwmon-path": [
+		"/sys/class/hwmon/hwmon6/temp1_input",
+		"/sys/class/thermal/thermal_zone0/temp"
+	],
+	//"thermal-zone": 0,
+	"critical-threshold": 82,
+	"format-critical": "{temperatureC}°C {icon}",
+	"format": "{temperatureC}°C {icon}",
+	"format-icons": [
+		"󰈸"
+	],
+	"on-click-right": "kitty --title nvtop sh -c 'nvtop'"
 },
-      
 "tray": {
-    "icon-size": 15,
-    "spacing": 8,
+	"icon-size": 15,
+	"spacing": 8,
 },
-      
 "wireplumber": {
-    "format": "{icon} {volume} %",
-    "format-muted": " Mute",
-    "on-click": "~/.config/hypr/scripts/Volume.sh --toggle",
-    "on-click-right": "pavucontrol -t 3",
-    "on-scroll-up": "~/.config/hypr/scripts/Volume.sh --inc",
-    "on-scroll-down": "~/.config/hypr/scripts/Volume.sh --dec",
-    "format-icons": ["", "", "󰕾", ""], 
+	"format": "{icon} {volume} %",
+	"format-muted": " Mute",
+	"on-click": "~/.config/hypr/scripts/Volume.sh --toggle",
+	"on-click-right": "pavucontrol -t 3",
+	"on-scroll-up": "~/.config/hypr/scripts/Volume.sh --inc",
+	"on-scroll-down": "~/.config/hypr/scripts/Volume.sh --dec",
+	"format-icons": [
+		"",
+		"",
+		"󰕾",
+		""
+	],
 },
-      
 "wlr/taskbar": {
-    "format": "{icon} {name} ",
-    "icon-size": 15,
-    "all-outputs": false,
-    "tooltip-format": "{title}",
-    "on-click": "activate",
-    "on-click-middle": "close",
-    "ignore-list": [
-          "wofi",
-          "rofi",  
-                   ]
+	"format": "{icon} {name} ",
+	"icon-size": 15,
+	"all-outputs": false,
+	"tooltip-format": "{title}",
+	"on-click": "activate",
+	"on-click-middle": "close",
+	"ignore-list": [
+		"wofi",
+		"rofi",
+	]
 },
-      
-"custom/cycle_wall":{
-    "format":" ",
-    "exec": "echo ; echo 󰸉 wallpaper select",
-    "on-click": "~/.config/hypr/scripts/WallpaperSelect.sh",
-    "on-click-right": "~/.config/hypr/scripts/Wallpaper.sh",
-    "on-click-middle": "~/.config/hypr/scripts/WaybarStyles.sh",
-    "interval" : 86400, // once every day
-    "tooltip": true,
+"custom/cycle_wall": {
+	"format": " ",
+	"exec": "echo ; echo 󰸉 wallpaper select",
+	"on-click": "~/.config/hypr/UserScripts/WallpaperSelect.sh",
+	"on-click-right": "~/.config/hypr/UserScripts/WallpaperRandom.sh",
+	"on-click-middle": "~/.config/hypr/scripts/WaybarStyles.sh",
+	"interval": 86400, // once every day
+	"tooltip": true,
 },
-      
 "custom/hint": {
-    "format":"󰺁 HINT!",
-    "exec": "echo ; echo  Key Hints SUPER H",
-    "on-click": "~/.config/hypr/scripts/KeyHints.sh",
-    "interval" : 86400, // once every day
-    "tooltip": true,
+	"format": "󰺁 HINT!",
+	"exec": "echo ; echo  Key Hints SUPER H",
+	"on-click": "~/.config/hypr/scripts/KeyHints.sh",
+	"interval": 86400, // once every day
+	"tooltip": true,
 },
-
 "custom/keyboard": {
-    "exec": "cat ~/.cache/kb_layout",
-    "interval": 1,
-    "format": " {}",
-    "on-click": "~/.config/hypr/scripts/SwitchKeyboardLayout.sh",
-    },
-    
+	"exec": "cat ~/.cache/kb_layout",
+	"interval": 1,
+	"format": " {}",
+	"on-click": "~/.config/hypr/scripts/SwitchKeyboardLayout.sh",
+},
 "custom/light_dark": {
-    "format": "{}",
-    "exec": "echo ; echo 󰔎 Dark-Light switcher",
-    "on-click": "~/.config/hypr/scripts/DarkLight.sh",
-    "on-click-right": "~/.config/hypr/scripts/WaybarStyles.sh",
-    "on-click-middle": "~/.config/hypr/scripts/Wallpaper.sh",
-    "interval" : 86400, // once every day
-    "tooltip": true
+	"format": "{}",
+	"exec": "echo ; echo 󰔎 Dark-Light switcher",
+	"on-click": "~/.config/hypr/scripts/DarkLight.sh",
+	"on-click-right": "~/.config/hypr/scripts/WaybarStyles.sh",
+	"on-click-middle": "~/.config/hypr/UserScripts/WallpaperSelect.sh",
+	"interval": 86400, // once every day
+	"tooltip": true
 },
-      
 "custom/lock": {
-    "format": "󰌾{}",
-    "exec": "echo ; echo 󰷛  screen lock",
-    "interval" : 86400, // once every day
-    "tooltip": true,
-    "on-click": "~/.config/hypr/scripts/LockScreen.sh",
+	"format": "󰌾{}",
+	"exec": "echo ; echo 󰷛  screen lock",
+	"interval": 86400, // once every day
+	"tooltip": true,
+	"on-click": "~/.config/hypr/scripts/LockScreen.sh",
 },
-    
 "custom/menu": {
-    "format": "{}",
-    "exec": "echo ; echo 󱓟 app launcher",
-    "interval" : 86400, // once every day
-    "tooltip": true,
-    "on-click": "pkill rofi || rofi -show drun -modi run,drun,filebrowser,window",
-    "on-click-middle": "~/.config/hypr/scripts/WallpaperSelect.sh",
-    "on-click-right": "~/.config/hypr/scripts/WaybarLayout.sh",
+	"format": "{}",
+	"exec": "echo ; echo 󱓟 app launcher",
+	"interval": 86400, // once every day
+	"tooltip": true,
+	"on-click": "pkill rofi || rofi -show drun -modi run,drun,filebrowser,window",
+	"on-click-middle": "~/.config/hypr/UserScripts/WallpaperSelect.sh",
+	"on-click-right": "~/.config/hypr/scripts/WaybarLayout.sh",
 },
-
 // This is a custom cava visualizer
 "custom/cava_mviz": {
-    "exec": "~/.config/hypr/scripts/WaybarCava.sh",
-    "format": "{}"
+	"exec": "~/.config/hypr/scripts/WaybarCava.sh",
+	"format": "{}"
 },
-  
 "custom/playerctl": {
-    "format": "<span>{}</span>",
-    "return-type": "json",
-    "max-length": 35,
-    "exec": "playerctl -a metadata --format '{\"text\": \"{{artist}} ~ {{markup_escape(title)}}\", \"tooltip\": \"{{playerName}} : {{markup_escape(title)}}\", \"alt\": \"{{status}}\", \"class\": \"{{status}}\"}' -F",
-    "on-click-middle": "playerctl play-pause",
-    "on-click": "playerctl previous",
-    "on-click-right": "playerctl next",
-    "scroll-step": 5.0,
-    "on-scroll-up": "~/.config/hypr/scripts/Volume.sh --inc",
-    "on-scroll-down": "~/.config/hypr/scripts/Volume.sh --dec",
-    "smooth-scrolling-threshold": 1,
+	"format": "<span>{}</span>",
+	"return-type": "json",
+	"max-length": 35,
+	"exec": "playerctl -a metadata --format '{\"text\": \"{{artist}} ~ {{markup_escape(title)}}\", \"tooltip\": \"{{playerName}} : {{markup_escape(title)}}\", \"alt\": \"{{status}}\", \"class\": \"{{status}}\"}' -F",
+	"on-click-middle": "playerctl play-pause",
+	"on-click": "playerctl previous",
+	"on-click-right": "playerctl next",
+	"scroll-step": 5.0,
+	"on-scroll-up": "~/.config/hypr/scripts/Volume.sh --inc",
+	"on-scroll-down": "~/.config/hypr/scripts/Volume.sh --dec",
+	"smooth-scrolling-threshold": 1,
 },
-
 "custom/power": {
-    "format": "⏻ ",
-    "exec": "echo ; echo 󰟡 power // blur",
+	"format": "⏻ ",
+	"exec": "echo ; echo 󰟡 power // blur",
 	"on-click": "~/.config/hypr/scripts/Wlogout.sh",
-    "on-click-right": "~/.config/hypr/scripts/ChangeBlur.sh",
-    "interval" : 86400, // once every day
-    "tooltip": true,
+	"on-click-right": "~/.config/hypr/scripts/ChangeBlur.sh",
+	"interval": 86400, // once every day
+	"tooltip": true,
 },
-
 "custom/swaync": {
-    "tooltip":true,     
-    "format": "{icon} {}",
-    "format-icons": {
-      "notification": "<span foreground='red'><sup></sup></span>",
-      "none": "",
-      "dnd-notification": "<span foreground='red'><sup></sup></span>",
-      "dnd-none": "",
-      "inhibited-notification": "<span foreground='red'><sup></sup></span>",
-      "inhibited-none": "",
-      "dnd-inhibited-notification": "<span foreground='red'><sup></sup></span>",
-      "dnd-inhibited-none": ""
-    },
-    "return-type": "json",
-    "exec-if": "which swaync-client",
-    "exec": "swaync-client -swb",
-    "on-click": "sleep 0.1 && swaync-client -t -sw",
-    "on-click-right": "swaync-client -d -sw",
-    "escape": true,
+	"tooltip": true,
+	"format": "{icon} {}",
+	"format-icons": {
+		"notification": "<span foreground='red'><sup></sup></span>",
+		"none": "",
+		"dnd-notification": "<span foreground='red'><sup></sup></span>",
+		"dnd-none": "",
+		"inhibited-notification": "<span foreground='red'><sup></sup></span>",
+		"inhibited-none": "",
+		"dnd-inhibited-notification": "<span foreground='red'><sup></sup></span>",
+		"dnd-inhibited-none": ""
+	},
+	"return-type": "json",
+	"exec-if": "which swaync-client",
+	"exec": "swaync-client -swb",
+	"on-click": "sleep 0.1 && swaync-client -t -sw",
+	"on-click-right": "swaync-client -d -sw",
+	"escape": true,
 },
-    
-// NOTE:! This is only for Arch and Arch Based Distros  
-"custom/updater":{
-    "format": " {}",
-    "exec": "checkupdates | wc -l",
-    "exec-if": "[[ $(checkupdates | wc -l) ]]",
-    "interval": 15,
-    "on-click": "kitty -T update paru -Syu || yay -Syu && notify-send 'The system has been updated'",
+// NOTE:! This is only for Arch and Arch Based Distros  depend: pacman-contrib
+"custom/updater": {
+	"format": " {}",
+	"exec": "checkupdates | wc -l",
+	"exec-if": "[[ $(checkupdates | wc -l) ]]",
+	"interval": 15,
+	"on-click": "kitty -T update paru -Syu || yay -Syu && notify-send 'The system has been updated'",
 },
-    
 "custom/weather": {
-    "format": "{}",
-    "format-alt": "{alt}: {}",
-    "format-alt-click": "click",
-    "interval": 3600,
-    "return-type": "json",
-    "exec": "~/.config/hypr/UserScripts/Weather.sh",
-    //"exec": "~/.config/hypr/UserScripts/Weather.py",
-    "exec-if": "ping wttr.in -c1",
-    "tooltip" : true,
+	"format": "{}",
+	"format-alt": "{alt}: {}",
+	"format-alt-click": "click",
+	"interval": 3600,
+	"return-type": "json",
+	"exec": "~/.config/hypr/UserScripts/Weather.sh",
+	//"exec": "~/.config/hypr/UserScripts/Weather.py",
+	"exec-if": "ping wttr.in -c1",
+	"tooltip": true,
 },
-  
-  
 // Separators
 "custom/separator#dot": {
-    "format": "",
-    "interval": "once",
-    "tooltip": false
+	"format": "",
+	"interval": "once",
+	"tooltip": false
 },
-  
 "custom/separator#dot-line": {
-    "format": "",
-    "interval": "once",
-    "tooltip": false
+	"format": "",
+	"interval": "once",
+	"tooltip": false
 },
-  
 "custom/separator#line": {
-    "format": "|",
-    "interval": "once",
-    "tooltip": false
+	"format": "|",
+	"interval": "once",
+	"tooltip": false
 },
-  
 "custom/separator#blank": {
-    "format": "",
-    "interval": "once",
-    "tooltip": false
+	"format": "",
+	"interval": "once",
+	"tooltip": false
 },
-  
 "custom/separator#blank_2": {
 	"format": "  ",
-    "interval": "once",
-    "tooltip": false
+	"interval": "once",
+	"tooltip": false
 },
-
 "custom/separator#blank_3": {
 	"format": "   ",
-    "interval": "once",
-    "tooltip": false
+	"interval": "once",
+	"tooltip": false
 },
-  
 // Modules below are for vertical layout
-  
 "backlight#vertical": {
 	"interval": 2,
-    "align": 0.35,
-    "rotate": 1,
-    "format": "{icon}",
-    //"format-icons": ["󰃞", "󰃟", "󰃠"],
-	"format-icons": ["","","","","","","","","","","","","","",""],
-    "on-click": "",
-    "on-click-middle": "",
-    "on-click-right": "",
-    "on-update": "",
-    "on-scroll-up": "~/.config/hypr/scripts/Brightness.sh --inc",
-    "on-scroll-down": "~/.config/hypr/scripts/Brightness.sh --dec",
-    "smooth-scrolling-threshold": 1,
+	"align": 0.35,
+	"rotate": 1,
+	"format": "{icon}",
+	//"format-icons": ["󰃞", "󰃟", "󰃠"],
+	"format-icons": [
+		"",
+		"",
+		"",
+		"",
+		"",
+		"",
+		"",
+		"",
+		"",
+		"",
+		"",
+		"",
+		"",
+		"",
+		""
+	],
+	"on-click": "",
+	"on-click-middle": "",
+	"on-click-right": "",
+	"on-update": "",
+	"on-scroll-up": "~/.config/hypr/scripts/Brightness.sh --inc",
+	"on-scroll-down": "~/.config/hypr/scripts/Brightness.sh --dec",
+	"smooth-scrolling-threshold": 1,
 	"tooltip-format": "{percent}%",
 },
-  
 "clock#vertical": {
 	"format": "\n{:%H\n%M\n%S\n\n \n%d\n%m\n%y}",
 	"interval": 1,
-     //"format": "\n{:%I\n%M\n%p\n\n \n%d\n%m\n%y}",
-     "tooltip": true,
-     "tooltip-format": "{calendar}",
-     "calendar": {
-       "mode": "year",
-       "mode-mon-col": 3,
-       "format": {
-       "today": "<span color='#0dbc79'>{}</span>",
-       }
-     }
+	//"format": "\n{:%I\n%M\n%p\n\n \n%d\n%m\n%y}",
+	"tooltip": true,
+	"tooltip-format": "{calendar}",
+	"calendar": {
+		"mode": "year",
+		"mode-mon-col": 3,
+		"format": {
+			"today": "<span color='#0dbc79'>{}</span>",
+		}
+	}
 },
-
 "cpu#vertical": {
-    "format": "󰍛\n{usage}%",  
-    "interval": 1,
-    "on-click-right": "gnome-system-monitor",
+	"format": "󰍛\n{usage}%",
+	"interval": 1,
+	"on-click-right": "gnome-system-monitor",
 },
-  
 "memory#vertical": {
-    "interval": 10,
-    "format": "󰾆\n{percentage}%",
-    "format-alt": "󰾆\n{used:0.1f}G",
-    "format-alt-click": "click",
-    "tooltip": true,
-    "tooltip-format": "{used:0.1f}GB/{total:0.1f}G",
-    "on-click-right": "kitty --title btop sh -c 'btop'",
+	"interval": 10,
+	"format": "󰾆\n{percentage}%",
+	"format-alt": "󰾆\n{used:0.1f}G",
+	"format-alt-click": "click",
+	"tooltip": true,
+	"tooltip-format": "{used:0.1f}GB/{total:0.1f}G",
+	"on-click-right": "kitty --title btop sh -c 'btop'",
 },
-  
 "pulseaudio#vertical": {
-    "format": "{icon}",
-    "format-bluetooth": "󰂰",
-    "format-muted": "󰖁",
-    "format-icons": {
-        "headphone": "",
-        "hands-free": "",
-        "headset": "",
-        "phone": "",
-        "portable": "",
-        "car": "",
-    "default": ["", "", "󰕾", ""],
-	"tooltip-format": "{icon} {desc} | {volume}%", 
-    "ignored-sinks": ["Easy Effects Sink"],
+	"format": "{icon}",
+	"format-bluetooth": "󰂰",
+	"format-muted": "󰖁",
+	"format-icons": {
+		"headphone": "",
+		"hands-free": "",
+		"headset": "",
+		"phone": "",
+		"portable": "",
+		"car": "",
+		"default": [
+			"",
+			"",
+			"󰕾",
+			""
+		],
+		"tooltip-format": "{icon} {desc} | {volume}%",
+		"ignored-sinks": [
+			"Easy Effects Sink"
+		],
 	},
-    "scroll-step": 5.0,
-    "on-click": "~/.config/hypr/scripts/Volume.sh --toggle",
-    "on-click-right": "pavucontrol -t 3",
-    "on-scroll-up": "~/.config/hypr/scripts/Volume.sh --inc",
-    "on-scroll-down": "~/.config/hypr/scripts/Volume.sh --dec",
+	"scroll-step": 5.0,
+	"on-click": "~/.config/hypr/scripts/Volume.sh --toggle",
+	"on-click-right": "pavucontrol -t 3",
+	"on-scroll-up": "~/.config/hypr/scripts/Volume.sh --inc",
+	"on-scroll-down": "~/.config/hypr/scripts/Volume.sh --dec",
 	"tooltip-format": "{icon} {desc} | {volume}%",
-    "smooth-scrolling-threshold": 1,
+	"smooth-scrolling-threshold": 1,
 },
-  
 "pulseaudio#microphone_vertical": {
-    "format": "{format_source}",
-    "format-source": "󰍬",
-    "format-source-muted": "󰍭",
-    "on-click-right": "pavucontrol",
-    "on-click": "~/.config/hypr/scripts/Volume.sh --toggle-mic",
-    "on-scroll-up": "~/.config/hypr/scripts/Volume.sh --mic-inc",
-    "on-scroll-down": "~/.config/hypr/scripts/Volume.sh --mic-dec",
-    "max-volume": 100,
-    "tooltip": true,
+	"format": "{format_source}",
+	"format-source": "󰍬",
+	"format-source-muted": "󰍭",
+	"on-click-right": "pavucontrol",
+	"on-click": "~/.config/hypr/scripts/Volume.sh --toggle-mic",
+	"on-scroll-up": "~/.config/hypr/scripts/Volume.sh --mic-inc",
+	"on-scroll-down": "~/.config/hypr/scripts/Volume.sh --mic-dec",
+	"max-volume": 100,
+	"tooltip": true,
 	"tooltip-format": "{source_desc} | {source_volume}%",
 },
-  
 "temperature#vertical": {
-    "interval": 10,
-    "tooltip": true,
-    "hwmon-path": ["/sys/class/hwmon/hwmon1/temp1_input", "/sys/class/thermal/thermal_zone0/temp"],
-    //"thermal-zone": 0,
-    "critical-threshold": 80,
-    "format-critical": "{icon}\n{temperatureC}°C",
-    "format": " {icon}",
-    "format-icons": ["󰈸"],
-    "on-click-right": "kitty --title nvtop sh -c 'nvtop'"
+	"interval": 10,
+	"tooltip": true,
+	"hwmon-path": [
+		"/sys/class/hwmon/hwmon6/temp1_input",
+		"/sys/class/thermal/thermal_zone0/temp"
+	],
+	//"thermal-zone": 0,
+	"critical-threshold": 80,
+	"format-critical": "{icon}\n{temperatureC}°C",
+	"format": " {icon}",
+	"format-icons": [
+		"󰈸"
+	],
+	"on-click-right": "kitty --title nvtop sh -c 'nvtop'"
 },
-  
 "custom/power_vertical": {
-    "format": "⏻",
-    "exec": "echo ; echo 󰟡 power // blur",
+	"format": "⏻",
+	"exec": "echo ; echo 󰟡 power // blur",
 	"on-click": "~/.config/hypr/scripts/Wlogout.sh",
-    "on-click-right": "~/.config/hypr/scripts/ChangeBlur.sh",
-    "interval" : 86400, // once every day
-    "tooltip": true,
+	"on-click-right": "~/.config/hypr/scripts/ChangeBlur.sh",
+	"interval": 86400, // once every day
+	"tooltip": true,
 },
-  
-}
-  
-  
+}
\ No newline at end of file
diff --git a/config/waybar/style.css b/config/waybar/style.css
index 48604a06..ab62339b 100644..120000
--- a/config/waybar/style.css
+++ b/config/waybar/style.css
@@ -1 +1 @@
-for symlink
\ No newline at end of file
+/home/ja/.config/waybar/style/[Wallust] Chroma Tally.css
\ No newline at end of file
diff --git a/config/waybar/style/[Dark] Latte-Wallust combined.css b/config/waybar/style/[Dark] Latte-Wallust combined.css
new file mode 100644
index 00000000..f56f1a17
--- /dev/null
+++ b/config/waybar/style/[Dark] Latte-Wallust combined.css
@@ -0,0 +1,367 @@
+/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
+/* Catppuccin Latte - Wallust */
+/* Original Design by DC user mannatsingh */
+
+@define-color white      	#F2F2F2;
+@define-color black      	#000000;
+@define-color text       	#FFFFFF;
+@define-color lightgray  	#686868;
+@define-color darkgray   	#353535;
+
+@define-color transparent	rgba(1, 1, 1, 0.5);
+@define-color teal-trans	rgba(1, 117, 84, 0.5);
+@define-color cyan			rgba(53, 140, 169, 1);
+
+@define-color background-module     @transparent;
+@define-color border-color          @color9;
+@define-color button-color          @color11;
+@define-color button-hover          @color12;
+
+@import '../../.config/waybar/wallust/colors-waybar.css';
+@import "../waybar/style/catppuccin-themes/latte.css";
+
+* {
+    font-family: "JetBrainsMono Nerd Font";
+    font-weight: bold;
+	min-height: 0;  
+    /* set font-size to 100% if font scaling is set to 1.00 using nwg-look */
+    font-size: 97%;
+    font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"';
+    padding: 1px;
+}
+
+window#waybar {
+    background: transparent;
+    border-radius: 0px;
+    color: #cba6f7;
+}
+
+window#waybar.hidden {
+    opacity: 0;
+}
+
+window#waybar.empty {
+    /*background-color: #040406;*/
+    background-color: transparent;
+}
+
+window#waybar.empty #window {
+    padding: 0px;
+    border: 0px;
+    /*  background-color: rgba(66,66,66,0.5); */
+    /* transparent */
+    background-color: transparent;
+}
+
+
+tooltip {
+    background: #1e1e2e;
+    border-radius: 5px;
+    border-width: 1px;
+    border-style: solid;
+    border-color: @border-color;
+    color: #ffffff;
+}
+
+/*-----module groups----*/
+.modules-right {
+    background-color: @background-module;
+    border-bottom:2px solid @border-color;
+    border-radius:15px;
+	padding-top: 2px;
+	padding-bottom: 0px;
+	padding-right: 4px;
+	padding-left: 4px;
+
+}
+
+.modules-center {
+    background-color: @background-module;
+    border-radius:15px;
+    border-bottom:2px solid @border-color;
+    /*border-right: 2px solid #ffd700;*/
+    /*border:@teal-trans;*/
+	padding-top: 2px;
+	padding-bottom: 4px;
+	padding-right: 4px;
+	padding-left: 4px;
+}
+
+.modules-left {
+    background-color: @background-module;
+    border-radius:15px;
+    border-bottom: 2px solid @border-color;
+	padding-top: 2px;
+	padding-bottom: 4px;
+	padding-right: 4px;
+	padding-left: 4px;
+}
+
+#workspaces {
+    padding: 0px 1px;
+    border-radius: 15px;
+    border:2px solid @border-color;
+    font-weight: bold;
+    font-style: normal;
+    opacity:0.8;
+    color:#FFFFFF;
+}   
+#workspaces button {
+    color: #6E6A86;
+    box-shadow: none;
+	text-shadow: none;
+    border-radius: 30px;
+    padding-left: 4px;
+    padding-right: 4px;
+    animation: gradient_f 20s ease-in infinite;
+    transition: all 0.5s cubic-bezier(.55,-0.68,.48,1.682);
+}
+
+#workspaces button.active {
+    color: #ffd700;
+    border-radius: 50%;
+    background-color: black;
+    border-radius: 15px 15px 15px 15px;
+    padding-left: 8px;
+    padding-right: 8px;
+    animation: gradient_f 20s ease-in infinite;
+    transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
+}
+
+#workspaces button.focused {
+    color: #d8dee9;
+}
+
+#workspaces button.urgent {
+    color: #11111b;
+    border-radius: 10px;
+}
+
+#workspaces button:hover {
+    color: #ffd700;
+    border-radius: 10px;
+ 	padding-left: 2px;
+    padding-right: 2px;
+    animation: gradient_f 20s ease-in infinite;
+    transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
+}
+
+#clock#2 {
+    color: #efe8f7;
+}
+
+#backlight,
+#backlight-slider,
+#battery,
+#bluetooth,
+#clock,
+#cpu,
+#disk,
+#idle_inhibitor,
+#keyboard-state,
+#memory,
+#mode,
+#mpris,
+#network,
+#pulseaudio,
+#pulseaudio-slider,
+#taskbar,
+#temperature,
+#tray,
+#window,
+#wireplumber,
+#workspaces,
+#custom-backlight,
+#custom-cava_mviz,
+#custom-cycle_wall,
+#custom-keybinds,
+#custom-keyboard,
+#custom-light_dark,
+#custom-lock,
+#custom-menu,
+#custom-power_vertical,
+#custom-power,
+#custom-swaync,
+#custom-updater,
+#custom-weather,
+#custom-weather.clearNight,
+#custom-weather.cloudyFoggyDay,
+#custom-weather.cloudyFoggyNight,
+#custom-weather.default, 
+#custom-weather.rainyDay,
+#custom-weather.rainyNight,
+#custom-weather.severe,
+#custom-weather.showyIcyDay,
+#custom-weather.snowyIcyNight,
+#custom-weather.sunnyDay {
+    color: #e5d9f5;
+	padding-top: 1px;
+	padding-bottom: 1px;
+	padding-right: 6px;
+	padding-left: 6px;
+}
+
+#temperature.critical {
+    background-color: #ff0000;
+}
+
+@keyframes blink {
+    to {
+        color: #000000;
+    }
+}
+
+#taskbar button.active {
+    background-color: rgb(47, 46, 46);
+    padding-left: 12px;
+    padding-right: 12px;
+    animation: gradient_f 20s ease-in infinite;
+    transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
+}
+
+#taskbar button:hover {
+    padding-left: 3px;
+    padding-right: 3px;
+    animation: gradient_f 20s ease-in infinite;
+    transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
+}
+
+#battery.critical:not(.charging) {
+    color: #f53c3c;
+    animation-name: blink;
+    animation-duration: 0.5s;
+    animation-timing-function: linear;
+    animation-iteration-count: infinite;
+    animation-direction: alternate;
+}
+
+#pulseaudio-slider slider {
+    min-width: 0px;
+    min-height: 0px;
+    opacity: 0;
+    background-image: none;
+    border: none;
+    box-shadow: none;
+}
+
+#pulseaudio-slider trough {
+    min-width: 80px;
+    min-height: 5px;
+    border-radius: 5px;
+    background-color: #22252a;
+}
+
+#pulseaudio-slider highlight {
+    min-height: 10px;
+    border-radius: 5px;
+    background-color: #ba5663;
+}
+
+#backlight-slider slider {
+    min-width: 0px;
+    min-height: 0px;
+    opacity: 0;
+    background-image: none;
+    border: none;
+    box-shadow: none;
+}
+
+#backlight-slider trough {
+    min-width: 80px;
+    min-height: 10px;
+    border-radius: 5px;
+    background-color: #22252a;
+}
+
+#backlight-slider highlight {
+    min-width: 10px;
+    border-radius: 5px;
+    background-color: #ba5663;
+}
+#pulseaudio-slider,
+#pulseaudio {
+	color: @color13;
+}
+
+#pulseaudio.muted {
+    color: red;
+}
+
+#memory {
+	color: @sapphire;
+}
+
+#cpu {
+	color: @mauve;
+}
+
+#battery {
+	color: @rosewater;
+}
+
+#disk {
+	color: @sky;
+}
+
+#temperature.critical {
+    background-color: @red;
+}
+#battery.critical:not(.charging) {
+    color: #f53c3c;
+    animation-name: blink;
+    animation-duration: 0.5s;
+    animation-timing-function: linear;
+    animation-iteration-count: infinite;
+    animation-direction: alternate;
+}#pulseaudio-slider slider {
+	min-width: 0px;
+	min-height: 0px;
+	opacity: 0;
+	background-image: none;
+	border: none;
+	box-shadow: none;
+}
+
+#pulseaudio-slider trough {
+	min-width: 80px;
+	min-height: 5px;
+	border-radius: 5px;
+}
+
+#pulseaudio-slider highlight {
+	min-height: 10px;
+	border-radius: 5px;
+}
+#backlight-slider slider {
+	min-width: 0px;
+	min-height: 0px;
+	opacity: 0;
+	background-image: none;
+	border: none;
+	box-shadow: none;
+}
+
+#backlight-slider trough {
+	min-width: 80px;
+	min-height: 10px;
+	border-radius: 5px;
+}
+
+#backlight-slider highlight {
+	min-width: 10px;
+	border-radius: 5px;
+}
+#custom-lock,
+#idle_inhibitor {
+    color: @teal;
+}
+#clock {
+	color: @sapphire;
+    border-radius: 15px;
+    border:2px solid @border-color;
+}
+#custom-updates {
+    color: @yellow;
+}
+#swaync{
+    color: #ffd700;}
diff --git a/config/waybar/style/[Dark] Obsidian Edge.css b/config/waybar/style/[Dark] Wallust Obsidian Edge.css
index a64649f2..526547f7 100644
--- a/config/waybar/style/[Dark] Obsidian Edge.css
+++ b/config/waybar/style/[Dark] Wallust Obsidian Edge.css
@@ -1,7 +1,7 @@
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
 /* Dark - Obsidian Edge */
 
-@import '../../.cache/wal/colors-waybar.css';
+@import '../../.config/waybar/wallust/colors-waybar.css';
 
 * {
 font-family: "JetBrainsMono Nerd Font";
diff --git a/config/waybar/style/[Pywal Bordered] Chroma Fusion Edge.css b/config/waybar/style/[Wallust Bordered] Chroma Fusion Edge.css
index 89977952..b9831707 100644
--- a/config/waybar/style/[Pywal Bordered] Chroma Fusion Edge.css
+++ b/config/waybar/style/[Wallust Bordered] Chroma Fusion Edge.css
@@ -1,6 +1,6 @@
 /* ----------- 💫 https://github.com/JaKooLit 💫 -------- */
 /* ....Chroma Fusion Edge .... */
-/* Pywal & Catppuccin - Bordered */
+/* Wallust & Catppuccin - Bordered */
 
 @define-color white      	#F2F2F2;
 @define-color black      	#000000;
@@ -13,11 +13,11 @@
 @define-color cyan			rgba(53, 140, 169, 1);
 
 @define-color background-module     @transparent;
-@define-color border-color          @color2;
+@define-color border-color          @color9;
 @define-color button-color          @color11;
 @define-color button-hover          @color12;
 
-@import '../../.cache/wal/colors-waybar.css';
+@import '../../.config/waybar/wallust/colors-waybar.css';
 @import "../waybar/style/catppuccin-themes/latte.css";
 
 * {
diff --git a/config/waybar/style/[Pywal Transparent] Crystal Clear.css b/config/waybar/style/[Wallust Transparent] Crystal Clear.css
index 9d6502f6..189be61f 100644
--- a/config/waybar/style/[Pywal Transparent] Crystal Clear.css
+++ b/config/waybar/style/[Wallust Transparent] Crystal Clear.css
@@ -1,15 +1,15 @@
 /* ----------- 💫 https://github.com/JaKooLit 💫 -------- */
 /* ..........................................*/
-/* .......Pywal - Transparent............... */
+/* ....Wallust - Clear Background........ */
 /* ......................................... */
-/* --- 👍 designed by https://github.com/Krautt  👍 --- */
+/* --- 👍 original designed by https://github.com/Krautt  👍 --- */
 
-@import '../../.cache/wal/colors-waybar.css';
+@import '../../.config/waybar/wallust/colors-waybar.css';
 
 @define-color critical #ff0000; /* critical color */
 @define-color warning #f3f809;  /* warning color */
-@define-color text @color2;  /* text color */
-@define-color text-alt @color7;  /* text alternative color */
+@define-color text @color12;  /* text color */
+@define-color text-alt @color9;  /* text alternative color */
 @define-color bg @color7;  /* background color */
 
 *{
diff --git a/config/waybar/style/[Pywal] Chroma Edge.css b/config/waybar/style/[Wallust] Chroma Edge.css
index 600b72d0..9ee29a21 100644
--- a/config/waybar/style/[Pywal] Chroma Edge.css
+++ b/config/waybar/style/[Wallust] Chroma Edge.css
@@ -1,7 +1,7 @@
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
-/* Pywal Chroma Edge */
+/* Wallust Chroma Edge */
 
-@import '../../.cache/wal/colors-waybar.css';
+@import '../../.config/waybar/wallust/colors-waybar.css';
 
 * {
 font-family: "JetBrainsMono Nerd Font";
@@ -43,7 +43,7 @@ tooltip {
 	border-radius: 12px;
 	border-width: 2px;
 	border-style: solid;
-	border-color: @color2;
+	border-color: @color12;
 }
 
 tooltip label{
@@ -133,7 +133,7 @@ tooltip label{
 	/* color: #bf616a; */
 	border-radius: 12px;
 	background-color: rgba(50, 50, 50, 0.1);
-	border: 1px solid @color2;
+	border: 1px solid @color12;
 	padding: 5px;
 }
 
diff --git a/config/waybar/style/[Pywal] Chroma Fusion.css b/config/waybar/style/[Wallust] Chroma Fusion.css
index 00e50ef6..e8a04270 100644
--- a/config/waybar/style/[Pywal] Chroma Fusion.css
+++ b/config/waybar/style/[Wallust] Chroma Fusion.css
@@ -1,6 +1,6 @@
 /* ----------- 💫 https://github.com/JaKooLit 💫 -------- */
 /* ....Chroma Fusion Edge .... */
-/* Pywal -Catpuccin */
+/* Wallust - Catpuccin */
 
 @define-color white      	#F2F2F2;
 @define-color black      	#000000;
@@ -13,11 +13,11 @@
 @define-color cyan			rgba(53, 140, 169, 1);
 
 @define-color background-module     @transparent;
-@define-color border-color          @color2;
+@define-color border-color          @color12;
 @define-color button-color          @color11;
 @define-color button-hover          @color12;
 
-@import '../../.cache/wal/colors-waybar.css';
+@import '../../.config/waybar/wallust/colors-waybar.css';
 @import "../waybar/style/catppuccin-themes/latte.css";
 
 * {
diff --git a/config/waybar/style/[Pywal] Chroma Tally.css b/config/waybar/style/[Wallust] Chroma Tally.css
index fe3bc0f1..24f08dfd 100644
--- a/config/waybar/style/[Pywal] Chroma Tally.css
+++ b/config/waybar/style/[Wallust] Chroma Tally.css
@@ -1,7 +1,7 @@
 /* ---- 💫 https://github.com/JaKooLit 💫 ---- */
-/* Pywal - Chroma Tally */
+/* Wallust - Chroma Tally */
 
-@import '../../.cache/wal/colors-waybar.css';
+@import '../../.config/waybar/wallust/colors-waybar.css';
 
 * {
 font-family: "JetBrainsMono Nerd Font";
@@ -18,7 +18,7 @@ window#waybar {
     border-radius: 12px;
 	border-bottom: 2px;
     border-style: solid;
-	border-color: @color2; 
+	border-color: @color12; 
 }
 
 #workspaces {
diff --git a/config/waybar/style/[Pywal] Colored.css b/config/waybar/style/[Wallust] Colored.css
index f52211bf..251f10ba 100644
--- a/config/waybar/style/[Pywal] Colored.css
+++ b/config/waybar/style/[Wallust] Colored.css
@@ -1,7 +1,7 @@
 /* ----------- 💫 https://github.com/JaKooLit 💫 -------- */
-/* pywal Colored*/
+/* Wallust Colored*/
 
-@import '../../.cache/wal/colors-waybar.css';
+@import '../../.config/waybar/wallust/colors-waybar.css';
 
 * {
     font-family: "JetBrainsMono Nerd Font";
@@ -37,7 +37,7 @@ tooltip {
     border-radius: 10px;
     border-width: 1px;
     border-style: solid;
-    border-color: @color2;
+    border-color: @color15;
 }
 
 /*-----module groups----*/
@@ -85,7 +85,7 @@ tooltip {
 
 #workspaces button.active {
     color: @background;
-    background-color: @color2;
+    background-color: @color7;
     padding-left: 8px;
     padding-right: 8px;
     animation: gradient_f 20s ease-in infinite;
diff --git a/config/waybar/style/[Pywal] Simple.css b/config/waybar/style/[Wallust] Simple.css
index 835d2cac..77d39c60 100644
--- a/config/waybar/style/[Pywal] Simple.css
+++ b/config/waybar/style/[Wallust] Simple.css
@@ -1,5 +1,5 @@
 /* ----------- 💫 https://github.com/JaKooLit 💫 -------- */
-/* pywal - Simple */
+/* Wallust - Simple */
 
 *{
 font-family: "JetBrainsMono Nerd Font";
@@ -12,7 +12,7 @@ padding-top: 1px;
 padding-bottom: 1px;
 }
 
-@import '../../.cache/wal/colors-waybar.css';
+@import '../../.config/waybar/wallust/colors-waybar.css';
 
 window#waybar {
 	background: transparent;
@@ -23,7 +23,7 @@ window#waybar {
 }
 
 tooltip {
-	color: @color2;
+	color: @color15;
 	background: @color0;
 	opacity: 0.8;
 	border-radius: 10px;
@@ -145,7 +145,7 @@ tooltip {
 #custom-weather.showyIcyDay,
 #custom-weather.snowyIcyNight,
 #custom-weather.sunnyDay {
-	color: @color2;
+	color: @color12;
 	padding-top: 3px;
 	padding-bottom: 3px;
 	padding-right: 6px;
diff --git a/config/waybar/wallust/colors-waybar.css b/config/waybar/wallust/colors-waybar.css
new file mode 100644
index 00000000..60cca045
--- /dev/null
+++ b/config/waybar/wallust/colors-waybar.css
@@ -0,0 +1,20 @@
+@define-color foreground #E2FECE;
+@define-color background rgba(1,1,2,0.25);
+@define-color cursor #E2FECE;
+
+@define-color color0 #010102;
+@define-color color1 #595213;
+@define-color color2 #9E2517;
+@define-color color3 #0E714C;
+@define-color color4 #08AC75;
+@define-color color5 #08BCB1;
+@define-color color6 #81BC57;
+@define-color color7 #CDF5B1;
+@define-color color8 #8FAB7C;
+@define-color color9 #776D19;
+@define-color color10 #D3311F;
+@define-color color11 #129766;
+@define-color color12 #0AE59C;
+@define-color color13 #0AFAEC;
+@define-color color14 #ACFB74;
+@define-color color15 #CDF5B1;