Merge pull request #321 from JaKooLit/development

Development to main

40 files changed, 497 insertions, 817 deletions

diff --git a/config/waybar/configs/[BOT] Camellia b/config/waybar/configs/[BOT] Camellia
index e135258e..91595848 100644
--- a/config/waybar/configs/[BOT] Camellia
+++ b/config/waybar/configs/[BOT] Camellia
@@ -25,91 +25,21 @@
 	"custom/separator#line",
 	"mpris",
 	"custom/swaync",
-	"tray#cam", 
+	"tray", 
 	"wlr/taskbar"],
 
-"modules-center": ["hyprland/window#cam"], 
+"modules-center": ["hyprland/window"], 
 	
 "modules-right": [
 	"custom/backlight",
 	"backlight/slider",
 	"custom/speaker",
 	"pulseaudio/slider",
-	"battery#cam",
-	"clock#cam", 
-	"network#cam"],
+	"battery",
+	"clock#3", 
+	"network"],
 
 // Additional modules //
-
-"hyprland/workspaces#cam": {
-	"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": "Uno",
-		"2": "Due",
-		"3": "Tre",
-		"4": "Quattro",
-		"5": "Cinque",
-		"6":"Sei",
-		"7":"Sette",
-		"8":"Otto",
-		"9":"Nove",
-		"10":"Dieci"
-	}	
-},
-
-"hyprland/window#cam": {
-	"format": " {title}",
-	"max-length": 50,
-	"rewrite": {
-		"(.*) — Mozilla Firefox": " $1",
-		"(.*) - zsh": "> [$1]"
-},
-		"separate-outputs": true
-},
-
-"clock#cam": {
-	"interval": 60,
-	//"format": "{:%A, %I:%M %P}",
-	"format": "{:%A, %H:%M}",
-	"max-length": 25,
-	
-},
-
-"battery#cam": {
-	"interval": 60,
-	"align": 0,
-	"rotate": 0,
-	//"bat": "BAT1",
-	//"adapter": "ACAD",
-	"full-at": 100,
-	"design-capacity": false,
-	"states": {
-	  "critical": 15
-			 },
-	"format": "{capacity}% {icon}",
-	"format-charging": " {capacity}%",
-	"format-plugged": "󱘖 {capacity}%",
-	"format-full": "{icon} Full",
-	"format-alt": "{icon} {time}",
-	"format-icons": ["", "", "", "", ""],
-	"format-time": "{H}h {M}min",
-	"tooltip": true,
-	"tooltip-format": "{timeTo} {power}w"
-},
-
 "pulseaudio/slider": {
 	"min": 0,
 	"max": 100,
@@ -135,42 +65,4 @@
 	"interval": 1,
 	"format": "{}"
 },
-
-"tray#cam": {
-	//"icon-size": 16,
-	"spacing": 10
-},
-
-"network#cam": {
-	"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": ["󰤯","󰤟","󰤢","󰤥","󰤨"]
-},
-
-"wlr/taskbar": {
-	"format": "{icon}",
-	//"icon-size": 14,
-	//"icon-theme": "Numix-Circle",
-	"tooltip-format": "{title}",
-	"on-click": "activate",
-	"on-click-middle": "close",
-	"ignore-list": [
-	    "kitty"
-		],
-		"app_ids-mapping": {
-		  "firefoxdeveloperedition": "firefox-developer-edition"
-		},
-		"rewrite": {
-			"Firefox Web Browser": "Firefox",
-			"Foot Server": "Terminal"
-		}
-}
 }
\ No newline at end of file
diff --git a/config/waybar/configs/[BOT] Chrysanthemum b/config/waybar/configs/[BOT] Chrysanthemum
index e4f1fba8..7aaad0d5 100644
--- a/config/waybar/configs/[BOT] Chrysanthemum
+++ b/config/waybar/configs/[BOT] Chrysanthemum
@@ -16,78 +16,20 @@
 "ipc": true,
 "margin-left": 5,
 "margin-right": 5,
+"margin-top": 0,
 	
-"modules-left": ["clock#gar", "mpris", "custom/swaync", "tray"],
+"modules-left": [
+	"clock#5", 
+	"mpris", 
+	"tray", 
+	"custom/swaync"
+	],
   
 "modules-center": ["hyprland/workspaces"], 
 	
-"modules-right": ["pulseaudio#gar","backlight#gar", "battery#gar"],
-
-// M O D U L E S //
-"clock#gar": {
-  //"format": "{:%A, %I:%M %P}",
-	"format": "{:%a %d | %H:%M}",
-	"format-alt": "{:%A, %d %B, %Y (%R)}"
-},
-
-"hyprland/window#gar": {
-  "format": "{}",
-  "max-length": 60
-},
-
-"tray#gar": {
-  "icon-size": 15,
-  "spacing": 10
-},
-
-"pulseaudio#gar": {
-  "format": "{icon} {volume}%",
-  "format-bluetooth": "{icon} {volume}%",
-  "format-bluetooth-muted": " {icon}",
-  "format-muted": "󰸈",
-  "format-icons": {
-    "headphone": "",
-    "hands-free": "",
-    "headset": "",
-    "phone": "",
-    "portable": "",
-    "car": "",
-    "default": ["", "", ""]
-  },
-  "on-click": "pamixer --toggle-mute",
-  "on-click-right": "pavucontrol",
-  "tooltip": false
-},
-
-"backlight#gar": {
-  //"device": "intel_backlight",
-  "format": "{icon} {percent}%",
-  "format-icons": ["", ""]
-},
-
-"battery#gar": {
-  "interval": 60,
-  "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-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",
-},    
+"modules-right": [
+	"pulseaudio#1",
+	"backlight#2", 
+	"battery"],
+   
 }
\ No newline at end of file
diff --git a/config/waybar/configs/[BOT] Gardenia b/config/waybar/configs/[BOT] Gardenia
index 5d071521..9ba6d3b5 100644
--- a/config/waybar/configs/[BOT] Gardenia
+++ b/config/waybar/configs/[BOT] Gardenia
@@ -6,7 +6,6 @@
 
 {
  
-
 "include": "~/.config/waybar/modules",
 "layer": "top",
 //"mode": "dock",
@@ -16,84 +15,23 @@
 "spacing": 5,
 "fixed-center": false,
 "ipc": true,
-//"margin-top": 5,
-"margin-bottom": 5,
-"width": 768,
+"margin-top": 5,
+//"margin-bottom": 5,
+"width": 1000,
 	
-"modules-left": ["clock#gar", "mpris", "custom/swaync", "tray"],
+"modules-left": [
+	"clock#5", 
+	"mpris", 
+	"tray", 
+	"custom/swaync"
+	],
 	  
 "modules-center": ["hyprland/workspaces#kanji"], 
 	
-"modules-right": ["pulseaudio#gar","backlight#gar", "battery#gar"],
-
-
-// M O D U L E S //
-
-"clock#gar": {
-  //"format": "{:%A, %I:%M %P}",
-	"format": "{:%a %d | %H:%M}",
-	"format-alt": "{:%A, %d %B, %Y (%R)}"
-},
-
-"hyprland/window#gar": {
-  "format": "{}",
-  "max-length": 60
-},
-
-"tray#gar": {
-  "icon-size": 15,
-  "spacing": 10
-},
-
-"pulseaudio#gar": {
-  "format": "{icon} {volume}%",
-  "format-bluetooth": "{icon} {volume}%",
-  "format-bluetooth-muted": " {icon}",
-  "format-muted": "󰸈",
-  "format-icons": {
-      "headphone": "",
-      "hands-free": "",
-      "headset": "",
-      "phone": "",
-      "portable": "",
-      "car": "",
-      "default": ["", "", ""]
-    },
-  "on-click": "pamixer --toggle-mute",
-  "on-click-right": "pavucontrol",
-  "tooltip": false
-},
-
-"backlight#gar": {
-  "device": "intel_backlight",
-  "format": "{icon} {percent}%",
-  "format-icons": ["", ""]
-},
+"modules-right": [
+	"pulseaudio#1",
+	"backlight#2", 
+	"battery"
+	],
 
-"battery#gar": {
-  "interval": 60,
-  "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-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",
-},
-   
 }
\ No newline at end of file
diff --git a/config/waybar/configs/[BOT] Peony b/config/waybar/configs/[BOT] Peony
index dcdf4aa1..4b548b89 100644
--- a/config/waybar/configs/[BOT] Peony
+++ b/config/waybar/configs/[BOT] Peony
@@ -15,95 +15,28 @@
 "spacing": 4,
 "fixed-center": true,
 "ipc": true,
-//"margin-top": 5,
-"margin-bottom": 5,
+"margin-top": 5,
+//"margin-bottom": 5,
 "width": 1444,
 	
-"modules-left": ["hyprland/workspaces#roman", "mpris", "tray#peony"],
+"modules-left": [
+	"hyprland/workspaces#roman", 
+	"mpris", 
+	"custom/swaync", 
+	"tray"
+	],
   
-"modules-center": ["clock#peony"], 
+"modules-center": ["clock#4"], 
 	
 "modules-right": [
-	"battery#peony",
+	"battery",
 	"custom/separator#blank",
-	"backlight#peony",
+	"backlight",
 	"custom/separator#blank",
 	"pulseaudio",
 	"custom/separator#blank",
 	"temperature",
 	"custom/separator#blank",	
-	"network#peony",
-	"custom/swaync"],
+	"network"],
 
-
-//M O D U L E S //
-
-"clock#peony": {
-	"interval": 60,
-	"tooltip-format": "<big>{:%B %Y}</big>\n<tt><small>{calendar}</small></tt>",
-	//"format": "{:%B | %a %d, %Y | %I:%M %p}",
-	"format": "{:%B | %a %d, %Y | %H:%M}",
-	"format-alt": "{:%a %b %d, %G}",
-},
-
-"wireplumber#peony": {
-	"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": ["", "", "󰕾", ""], 
-},
-
-"backlight#peony": {
-	"device": "intel_backlight",
-	"format": "{percent}% {icon}",
-	"format-icons": ["󰛩", "󱩎", "󱩏", "󱩑", "󱩒", "󱩓", "󱩔", "󱩕", "󰛨"],
-},
-
-"network#peony": {
-	"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": ["󰤯","󰤟","󰤢","󰤥","󰤨"]
-},
-
-"battery#peony": {
-	"interval": 60,
-	"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-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",
-},
-
-"tray#peony": {
-	"icon-size": 17,
-	"spacing": 8,
-}
 }	
\ No newline at end of file
diff --git a/config/waybar/configs/[BOT] Simple b/config/waybar/configs/[BOT] Simple
new file mode 100644
index 00000000..f2c0b883
--- /dev/null
+++ b/config/waybar/configs/[BOT] Simple
@@ -0,0 +1,36 @@
+/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
+// ### TOP Simple ## //
+
+{
+"include": "~/.config/waybar/modules",
+"layer": "top", 
+"position": "bottom", 
+//"mode": "dock",
+"exclusive": true,
+"passthrough": false,
+"gtk-layer-shell": true,
+"margin-left": 6,
+"margin-right": 6,
+"margin-top": 2,
+
+"modules-left": [	
+	"idle_inhibitor",
+	"group/mobo_drawer",
+	"hyprland/workspaces#rw",
+	"tray",
+	"mpris", 
+	],
+    
+"modules-center": [
+	"clock#2",
+	"custom/swaync",
+	],
+    
+"modules-right": [
+	"hyprland/window",  
+	"battery",
+ 	"group/audio", 
+	"custom/power",
+	],
+}
+
diff --git a/config/waybar/configs/[BOT] Sleek b/config/waybar/configs/[BOT] Sleek
index b1cfc1ae..6bb595bc 100644
--- a/config/waybar/configs/[BOT] Sleek
+++ b/config/waybar/configs/[BOT] Sleek
@@ -37,19 +37,4 @@
 	"custom/power",					
 	],
 
-
-
-// Additional format / customize modules
-
-"custom/power": {
-	"format": " ",
-	"icon-size": 20,
-	"tooltip": false,
-},
-	
-"clock": {
-	//"format": "{:%I:%M %p - %d/%b}", //for AM/PM
-    "format": "{:%H:%M - %d/%b}", // 24H
-	"tooltip": false
-},
 }
diff --git a/config/waybar/configs/[TOP] Camellia b/config/waybar/configs/[TOP] Camellia
index 53e2fcea..ccb078fb 100644
--- a/config/waybar/configs/[TOP] Camellia
+++ b/config/waybar/configs/[TOP] Camellia
@@ -12,7 +12,7 @@
 "exclusive": true,
 "passthrough": false,
 "position": "top",
-"spacing": 3,
+"spacing": 4,
 "fixed-center": true,
 "ipc": true,
 //"margin-top": 0,
@@ -22,100 +22,28 @@
 	
 "modules-left": [
 	"hyprland/workspaces#cam",
-	"custom/separator#line", 
+	"custom/separator#line",
 	"mpris",
-	"custom/swaync", 
-	"tray#cam", 
-	"wlr/taskbar"
-	],
+	"custom/swaync",
+	"tray", 
+	"wlr/taskbar"],
 
-"modules-center": ["hyprland/window#cam"], 
+"modules-center": ["hyprland/window"], 
 	
 "modules-right": [
 	"custom/backlight",
 	"backlight/slider",
 	"custom/speaker",
 	"pulseaudio/slider",
-	"battery#cam",
-	"clock#cam", 
-	"network#cam"
-	],
+	"battery",
+	"clock#3", 
+	"network"],
 
 // Additional modules //
-
-"hyprland/workspaces#cam": {
-	"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": "Uno",
-		"2": "Due",
-		"3": "Tre",
-		"4": "Quattro",
-		"5": "Cinque",
-		"6":"Sei",
-		"7":"Sette",
-		"8":"Otto",
-		"9":"Nove",
-		"10":"Dieci"
-	}	
-},
-
-"hyprland/window#cam": {
-	"format": " {title}",
-	"max-length": 50,
-	"rewrite": {
-		"(.*) — Mozilla Firefox": " $1",
-		"(.*) - zsh": "> [$1]"
-},
-		"separate-outputs": true
-},
-
-"clock#cam": {
-	"interval": 60,
-	//"format": "{:%A, %I:%M %P}",
-	"format": "{:%A, %H:%M}",
-	"max-length": 25,
-	
-},
-
-"battery#cam": {
-	"interval": 60,
-	"align": 0,
-	"rotate": 0,
-	//"bat": "BAT1",
-	//"adapter": "ACAD",
-	"full-at": 100,
-	"design-capacity": false,
-	"states": {
-	  "critical": 15
-			 },
-	"format": "{capacity}% {icon}",
-	"format-charging": " {capacity}%",
-	"format-plugged": "󱘖 {capacity}%",
-	"format-full": "{icon} Full",
-	"format-alt": "{icon} {time}",
-	"format-icons": ["", "", "", "", ""],
-	"format-time": "{H}h {M}min",
-	"tooltip": true,
-	"tooltip-format": "{timeTo} {power}w"
-},
-
 "pulseaudio/slider": {
 	"min": 0,
 	"max": 100,
-	"orientation": "horizontal",
+	"orientation": "horizontal"
 	
 },
 
@@ -129,7 +57,7 @@
 	"min": 0,
 	"max": 100,
 	"orientation": "horizontal",
-	//"device": "intel_backlight"
+	"device": "intel_backlight"
 },
 
 "custom/backlight": {
@@ -137,42 +65,4 @@
 	"interval": 1,
 	"format": "{}"
 },
-
-"tray#cam": {
-	//"icon-size": 16,
-	"spacing": 10
-},
-
-"network#cam": {
-	"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": ["󰤯","󰤟","󰤢","󰤥","󰤨"]
-},
-
-"wlr/taskbar": {
-	"format": "{icon}",
-	//"icon-size": 14,
-	//"icon-theme": "Numix-Circle",
-	"tooltip-format": "{title}",
-	"on-click": "activate",
-	"on-click-middle": "close",
-	"ignore-list": [
-	    "kitty"
-		],
-		"app_ids-mapping": {
-		  "firefoxdeveloperedition": "firefox-developer-edition"
-		},
-		"rewrite": {
-			"Firefox Web Browser": "Firefox",
-			"Foot Server": "Terminal"
-		}
-}
 }
\ No newline at end of file
diff --git a/config/waybar/configs/[TOP] Chrysanthemum b/config/waybar/configs/[TOP] Chrysanthemum
index b2310471..9d1c1050 100644
--- a/config/waybar/configs/[TOP] Chrysanthemum
+++ b/config/waybar/configs/[TOP] Chrysanthemum
@@ -18,78 +18,18 @@
 "margin-right": 5,
 "margin-top": 0,
 	
-"modules-left": ["clock#gar", "mpris", "tray", "custom/swaync"],
+"modules-left": [
+	"clock#5", 
+	"mpris", 
+	"tray", 
+	"custom/swaync"
+	],
   
 "modules-center": ["hyprland/workspaces"], 
 	
-"modules-right": ["pulseaudio#gar","backlight#gar", "battery#gar"],
-
-// M O D U L E S //
-
-"clock#gar": {
-  //"format": "{:%A, %I:%M %P}",
-	"format": "{:%a %d | %H:%M}",
-	"format-alt": "{:%A, %d %B, %Y (%R)}"
-},
-
-"hyprland/window#gar": {
-  "format": "{}",
-  "max-length": 60
-},
-
-"tray#gar": {
-  "icon-size": 15,
-  "spacing": 10
-},
-
-"pulseaudio#gar": {
-  "format": "{icon} {volume}%",
-  "format-bluetooth": "{icon} {volume}%",
-  "format-bluetooth-muted": " {icon}",
-  "format-muted": "󰸈",
-  "format-icons": {
-    "headphone": "",
-    "hands-free": "",
-    "headset": "",
-    "phone": "",
-    "portable": "",
-    "car": "",
-    "default": ["", "", ""]
-  },
-  "on-click": "pamixer --toggle-mute",
-  "on-click-right": "pavucontrol",
-  "tooltip": false
-},
-
-"backlight#gar": {
-  //"device": "intel_backlight",
-  "format": "{icon} {percent}%",
-  "format-icons": ["", ""]
-},
-
-"battery#gar": {
-  "interval": 60,
-  "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-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",
-},    
+"modules-right": [
+	"pulseaudio#1",
+	"backlight#2", 
+	"battery"],
+   
 }
\ No newline at end of file
diff --git a/config/waybar/configs/[TOP] Gardenia b/config/waybar/configs/[TOP] Gardenia
index 44c2de42..fff39648 100644
--- a/config/waybar/configs/[TOP] Gardenia
+++ b/config/waybar/configs/[TOP] Gardenia
@@ -17,82 +17,21 @@
 "ipc": true,
 "margin-top": 5,
 //"margin-bottom": 5,
-"width": 768,
+"width": 1000,
 	
-"modules-left": ["clock#gar", "mpris", "tray", "custom/swaync"],
+"modules-left": [
+	"clock#5", 
+	"mpris", 
+	"tray", 
+	"custom/swaync"
+	],
 	  
 "modules-center": ["hyprland/workspaces#kanji"], 
 	
-"modules-right": ["pulseaudio#gar","backlight#gar", "battery#gar"],
+"modules-right": [
+	"pulseaudio#1",
+	"backlight#2", 
+	"battery"
+	],
 
-
-// M O D U L E S //
-
-"clock#gar": {
-  //"format": "{:%A, %I:%M %P}",
-	"format": "{:%a %d | %H:%M}",
-	"format-alt": "{:%A, %d %B, %Y (%R)}"
-},
-
-"hyprland/window#gar": {
-  "format": "{}",
-  "max-length": 60
-},
-
-"tray#gar": {
-  "icon-size": 15,
-  "spacing": 10
-},
-
-"pulseaudio#gar": {
-  "format": "{icon} {volume}%",
-  "format-bluetooth": "{icon} {volume}%",
-  "format-bluetooth-muted": " {icon}",
-  "format-muted": "󰸈",
-  "format-icons": {
-      "headphone": "",
-      "hands-free": "",
-      "headset": "",
-      "phone": "",
-      "portable": "",
-      "car": "",
-      "default": ["", "", ""]
-    },
-  "on-click": "pamixer --toggle-mute",
-  "on-click-right": "pavucontrol",
-  "tooltip": false
-},
-
-"backlight#gar": {
-  "device": "intel_backlight",
-  "format": "{icon} {percent}%",
-  "format-icons": ["", ""]
-},
-
-"battery#gar": {
-  "interval": 60,
-  "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-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",
-},
-   
 }
\ No newline at end of file
diff --git a/config/waybar/configs/[TOP] Peony b/config/waybar/configs/[TOP] Peony
index c01ab104..f35979d3 100644
--- a/config/waybar/configs/[TOP] Peony
+++ b/config/waybar/configs/[TOP] Peony
@@ -19,84 +19,24 @@
 //"margin-bottom": 5,
 "width": 1444,
 	
-"modules-left": ["hyprland/workspaces#roman", "mpris", "custom/swaync", "tray#peony"],
+"modules-left": [
+	"hyprland/workspaces#roman", 
+	"mpris", 
+	"custom/swaync", 
+	"tray"
+	],
   
-"modules-center": ["clock#peony"], 
+"modules-center": ["clock#4"], 
 	
 "modules-right": [
-	"battery#peony",
+	"battery",
 	"custom/separator#blank",
-	"backlight#peony",
+	"backlight",
 	"custom/separator#blank",
 	"pulseaudio",
 	"custom/separator#blank",
 	"temperature",
 	"custom/separator#blank",	
-	"network#peony"],
+	"network"],
 
-
-//M O D U L E S //
-
-"clock#peony": {
-	"interval": 60,
-	"tooltip-format": "<big>{:%B %Y}</big>\n<tt><small>{calendar}</small></tt>",
-	//"format": "{:%B | %a %d, %Y | %I:%M %p}",
-	"format": "{:%B | %a %d, %Y | %H:%M}",
-	"format-alt": "{:%a %b %d, %G}",
-},
-
-"wireplumber#peony": {
-	"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": ["", "", "󰕾", ""], 
-},
-		
-"network#peony": {
-	"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": ["󰤯","󰤟","󰤢","󰤥","󰤨"]
-},
-
-"battery#peony": {
-	"interval": 60,
-	"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-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",
-},
-
-"tray#peony": {
-	"icon-size": 17,
-	"spacing": 8,
-}
 }	
\ No newline at end of file
diff --git a/config/waybar/configs/[TOP] Simple b/config/waybar/configs/[TOP] Simple
index 09488c54..16b78ea3 100644
--- a/config/waybar/configs/[TOP] Simple
+++ b/config/waybar/configs/[TOP] Simple
@@ -22,7 +22,8 @@
 	],
     
 "modules-center": [
-	"clock#2"
+	"clock#2",
+	"custom/swaync",
 	],
     
 "modules-right": [
diff --git a/config/waybar/configs/[TOP] Sleek b/config/waybar/configs/[TOP] Sleek
index fda6aca2..c5d66fa8 100644
--- a/config/waybar/configs/[TOP] Sleek
+++ b/config/waybar/configs/[TOP] Sleek
@@ -22,7 +22,7 @@
 "modules-center": [
 	"idle_inhibitor",
 	"custom/separator#blank",
-	"clock",
+	"clock#3",
 	"custom/separator#blank",
 	"custom/swaync"
 ],
@@ -35,19 +35,4 @@
 	"custom/separator#blank",
 	"custom/power",					
 	],
-
-
-// Additional format / customize modules
-
-"custom/power": {
-	"format": " ",
-	"icon-size": 20,
-	"tooltip": false,
-},
-	
-"clock": {
-	//"format": "{:%I:%M %p - %d/%b}", //for AM/PM
-    "format": "{:%H:%M - %d/%b}", // 24H
-	"tooltip": false
-},
 }
diff --git a/config/waybar/modules b/config/waybar/modules
index 071efb34..2dc4163c 100644
--- a/config/waybar/modules
+++ b/config/waybar/modules
@@ -71,13 +71,15 @@
 	},
 	"format": "{icon}",
 	"format-icons": {
-		"active": " 󰮯 ",
-		"default": "󰊠",
-		"persistent": "󰊠",
+            "active": "<span font='12'>󰮯</span>",
+            "empty": "<span font='8'></span>",
+            "default": "󰊠",
 	},
 },
+// Kanji / Japanese style
 "hyprland/workspaces#kanji": {
 	"disable-scroll": true,
+	"show-special": false,
 	"all-outputs": true,
 	"format": "{icon}",
 	"persistent-workspaces": {
@@ -132,7 +134,7 @@
 	"all-outputs": true,
 	"warp-on-scroll": false,
 	"sort-by-number": true,
-	"show-special": true,
+	"show-special": false,
 	"on-click": "activate",
 	"on-scroll-up": "hyprctl dispatch workspace e+1",
 	"on-scroll-down": "hyprctl dispatch workspace e-1",
@@ -160,6 +162,35 @@
 		"class<libreoffice-startcenter>": "󰏆 "
 		}   
 },
+// for Camilla or Spanish
+"hyprland/workspaces#cam": {
+	"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": "Uno",
+		"2": "Due",
+		"3": "Tre",
+		"4": "Quattro",
+		"5": "Cinque",
+		"6":"Sei",
+		"7":"Sette",
+		"8":"Otto",
+		"9":"Nove",
+		"10":"Dieci"
+	}	
+},
 // GROUP
 "group/motherboard": {
 	"orientation": "horizontal",
@@ -241,6 +272,11 @@
 	"on-scroll-down": "~/.config/hypr/scripts/Brightness.sh --dec",
 	"smooth-scrolling-threshold": 1,
 },
+"backlight#2": {
+  "device": "intel_backlight",
+  "format": "{icon} {percent}%",
+  "format-icons": ["", ""]
+},
 "battery": {
 	//"interval": 5,
 	"align": 0,
@@ -281,8 +317,8 @@
 },
 "clock": {
 	"interval": 1,
-	//"format": " {:%I:%M %p}", // AM PM format
-	"format": " {:%H:%M:%S}",
+    //"format": " {:%I:%M %p}", // AM PM format
+    "format": " {:%H:%M:%S}", // 24H
 	"format-alt": " {:%H:%M   %Y, %d %B, %A}",
 	"tooltip-format": "<tt><small>{calendar}</small></tt>",
 	"calendar": {
@@ -307,12 +343,28 @@
 	"on-scroll-down": "shift_down"
 },
 "clock#2": {
-	// "timezone": "America/New_York",
-	//"format": " {:%I:%M %p}", // AM PM format
-	"format": "  {:%H:%M}",
+    //"format": " {:%I:%M %p}", // AM PM format
+    "format": "  {:%H:%M}", // 24H
     "format-alt": "{:%A  |  %H:%M  |  %e %B}",
     "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>"
 },
+"clock#3": {
+    //"format": "{:%I:%M %p - %d/%b}", //for AM/PM
+    "format": "{:%H:%M - %d/%b}", // 24H
+	"tooltip": false
+},
+"clock#4": {
+	"interval": 60,
+    //"format": "{:%B | %a %d, %Y | %I:%M %p}", // AM PM format
+    "format": "{:%B | %a %d, %Y | %H:%M}", // 24H
+	"format-alt": "{:%a %b %d, %G}",
+	"tooltip-format": "<big>{:%B %Y}</big>\n<tt><small>{calendar}</small></tt>",
+},
+"clock#5": {
+    //"format": "{:%A, %I:%M %P}", // AM PM format
+    "format": "{:%a %d | %H:%M}", // 24H
+	"format-alt": "{:%A, %d %B, %Y (%R)}"
+},
 "cpu": {
 	"format": "{usage}% 󰍛",
 	"interval": 1,
@@ -463,7 +515,7 @@
 	"format-icons": {
 		"headphone": "",
 		"hands-free": "",
-		"headset": "",
+		"headset": "",
 		"phone": "",
 		"portable": "",
 		"car": "",
@@ -482,6 +534,25 @@
 	"tooltip-format": "{icon} {desc} | {volume}%",
 	"smooth-scrolling-threshold": 1,
 },
+"pulseaudio#1": {
+  "format": "{icon} {volume}%",
+  "format-bluetooth": "{icon} {volume}%",
+  "format-bluetooth-muted": " {icon}",
+  "format-muted": "󰸈",
+  "format-icons": {
+      "headphone": "",
+      "hands-free": "",
+      "headset": "",
+      "phone": "",
+      "portable": "",
+      "car": "",
+      "default": ["", "", ""]
+    },
+  "on-click": "pamixer --toggle-mute",
+  "on-click-right": "pavucontrol -t 3",
+  "tooltip": true,
+  "tooltip-format": "{icon} {desc} | {volume}%",
+},
 "pulseaudio#microphone": {
 	"format": "{format_source}",
 	"format-source": " {volume}%",
@@ -525,8 +596,8 @@
 	],
 },
 "wlr/taskbar": {
-	"format": "{icon} {name} ",
-	"icon-size": 15,
+	"format": "{icon} {name}",
+	"icon-size": 16,
 	"all-outputs": false,
 	"tooltip-format": "{title}",
 	"on-click": "activate",
@@ -534,23 +605,22 @@
 	"ignore-list": [
 		"wofi",
 		"rofi",
-	]
+		"kitty"
+		],
 },
 "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,
+	"tooltip-format": "Left Click: Wallpaper Menu\nMiddle Click: Random wallpaper\nRight Click: Waybar Styles Menu",
 },
 "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,
+	"tooltip-format": "󱧣 Quick Tips",
 },
 "custom/keyboard": {
 	"exec": "cat ~/.cache/kb_layout",
@@ -559,29 +629,27 @@
 	"on-click": "~/.config/hypr/scripts/SwitchKeyboardLayout.sh",
 },
 "custom/light_dark": {
-	"format": "󰔎{}",
-	"exec": "echo ; echo 󰔎 Dark-Light switcher",
+	"format": "󰔎",
 	"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
+	"tooltip": true,
+	"tooltip-format": "Left Click: Switch Dark-Light Themes\nMiddle Click: Wallpaper Menu\nRight Click: Waybar Styles Menu",
 },
 "custom/lock": {
-	"format": "󰌾{}",
-	"exec": "echo ; echo 󰷛  screen lock",
-	"interval": 86400, // once every day
-	"tooltip": true,
+	"format": "󰌾",
 	"on-click": "~/.config/hypr/scripts/LockScreen.sh",
+	"tooltip": true,
+	"tooltip-format": "󰷛 Screen Lock",
+
 },
 "custom/menu": {
-	"format": "{}",
-	"exec": "echo ; echo 󱓟 app launcher",
-	"interval": 86400, // once every day
-	"tooltip": true,
+	"format": "",
 	"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",
+	"tooltip": true,
+	"tooltip-format": "Left Click: Rofi Menu\nMiddle Click: Wallpaper Menu\nRight Click: Waybar Layout Menu",
 },
 // This is a custom cava visualizer
 "custom/cava_mviz": {
@@ -603,14 +671,14 @@
 },
 "custom/power": {
 	"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,
+	"tooltip-format": "Left Click: Logout Menu\nRight Click: Change Blur",
 },
 "custom/swaync": {
 	"tooltip": true,
+	"tooltip-format": "Left Click: Launch Notification Center\nRight Click: Do not Disturb",
 	"format": "{icon} {}",
 	"format-icons": {
 		"notification": "<span foreground='red'><sup></sup></span>",
@@ -636,6 +704,8 @@
 	"exec-if": "[[ $(checkupdates | wc -l) ]]",
 	"interval": 15,
 	"on-click": "kitty -T update paru -Syu || yay -Syu && notify-send 'The system has been updated'",
+	"tooltip": true,
+	"tooltip-format": "Left Click: Update System\nArch Linux Only",
 },
 "custom/weather": {
 	"format": "{}",
diff --git a/config/waybar/style/[Black & White] Monochrome.css b/config/waybar/style/[Black & White] Monochrome.css
index 430289c6..44b509cd 100644
--- a/config/waybar/style/[Black & White] Monochrome.css
+++ b/config/waybar/style/[Black & White] Monochrome.css
@@ -8,7 +8,6 @@ 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 {
@@ -149,8 +148,8 @@ tooltip label{
 #custom-weather.showyIcyDay,
 #custom-weather.snowyIcyNight,
 #custom-weather.sunnyDay {
-	padding-top: 3px;
-	padding-bottom: 3px;
+	padding-top: 4px;
+	padding-bottom: 4px;
 	padding-right: 6px;
 	padding-left: 6px;
 }
diff --git a/config/waybar/style/[Catppuccin] Latte.css b/config/waybar/style/[Catppuccin] Latte.css
index c8d50dc4..a79f2739 100644
--- a/config/waybar/style/[Catppuccin] Latte.css
+++ b/config/waybar/style/[Catppuccin] Latte.css
@@ -8,7 +8,6 @@ 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;
 }
 
 @import "../waybar/style/catppuccin-themes/latte.css";
@@ -89,8 +88,8 @@ window#waybar.hidden {
 #custom-weather.showyIcyDay,
 #custom-weather.snowyIcyNight,
 #custom-weather.sunnyDay {
-	padding-top: 3px;
-	padding-bottom: 3px;
+	padding-top: 4px;
+	padding-bottom: 4px;
 	padding-right: 6px;
 	padding-left: 6px;
 }
diff --git a/config/waybar/style/[Catppuccin] Mocha.css b/config/waybar/style/[Catppuccin] Mocha.css
index c8401815..5fb08488 100644
--- a/config/waybar/style/[Catppuccin] Mocha.css
+++ b/config/waybar/style/[Catppuccin] Mocha.css
@@ -8,7 +8,6 @@ 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;
 }
 
 @import "../waybar/style/catppuccin-themes/mocha.css";
@@ -95,8 +94,8 @@ window#waybar.hidden {
 #custom-weather.showyIcyDay,
 #custom-weather.snowyIcyNight,
 #custom-weather.sunnyDay {
-	padding-top: 3px;
-	padding-bottom: 3px;
+	padding-top: 4px;
+	padding-bottom: 4px;
 	padding-right: 6px;
 	padding-left: 6px;
 }
diff --git a/config/waybar/style/[Colored] Chroma Glow.css b/config/waybar/style/[Colored] Chroma Glow.css
index f8649a8f..35ee0629 100644
--- a/config/waybar/style/[Colored] Chroma Glow.css
+++ b/config/waybar/style/[Colored] Chroma Glow.css
@@ -8,7 +8,6 @@ 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 {
@@ -137,8 +136,8 @@ tooltip label{
 #custom-weather.showyIcyDay,
 #custom-weather.snowyIcyNight,
 #custom-weather.sunnyDay {
-	padding-top: 3px;
-	padding-bottom: 3px;
+	padding-top: 4px;
+	padding-bottom: 4px;
 	padding-right: 6px;
 	padding-left: 6px;
 }
diff --git a/config/waybar/style/[Colored] Translucent.css b/config/waybar/style/[Colored] Translucent.css
index c8ca561f..edddce42 100644
--- a/config/waybar/style/[Colored] Translucent.css
+++ b/config/waybar/style/[Colored] Translucent.css
@@ -22,7 +22,6 @@ 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 {
@@ -147,8 +146,8 @@ tooltip {
 #custom-weather.showyIcyDay,
 #custom-weather.snowyIcyNight,
 #custom-weather.sunnyDay {
-	padding-top: 3px;
-	padding-bottom: 3px;
+	padding-top: 4px;
+	padding-bottom: 4px;
 	padding-right: 6px;
 	padding-left: 6px;
 }
diff --git a/config/waybar/style/[Colorful] Aurora Blossom.css b/config/waybar/style/[Colorful] Aurora Blossom.css
index 6b0b65c4..b7fd25d4 100644
--- a/config/waybar/style/[Colorful] Aurora Blossom.css
+++ b/config/waybar/style/[Colorful] Aurora Blossom.css
@@ -7,7 +7,6 @@ font-weight: bold;
 /* 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 {
@@ -139,10 +138,10 @@ tooltip label{
 #custom-weather.showyIcyDay,
 #custom-weather.snowyIcyNight,
 #custom-weather.sunnyDay {
-	padding-top: 2px;
-	padding-bottom: 2px;
-	padding-right: 5px;
-	padding-left: 5px;
+	padding-top: 4px;
+	padding-bottom: 4px;
+	padding-right: 6px;
+	padding-left: 6px;
 }
 #custom-power {
 	padding: 1px 3px;
diff --git a/config/waybar/style/[Colorful] Aurora.css b/config/waybar/style/[Colorful] Aurora.css
index 8fe0e3f1..4a05258b 100644
--- a/config/waybar/style/[Colorful] Aurora.css
+++ b/config/waybar/style/[Colorful] Aurora.css
@@ -7,7 +7,6 @@ font-weight: bold;
 /* 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 {
@@ -134,8 +133,8 @@ tooltip label{
 	border: 1px;
 	border-style: solid;
 	border-radius: 4px;
-	padding-top: 2px;
-	padding-bottom: 2px;
+	padding-top: 4px;
+	padding-bottom: 4px;
 	padding-right: 6px;
 	padding-left: 6px;
 }
diff --git a/config/waybar/style/[Colorful] Rainbow Spectrum.css b/config/waybar/style/[Colorful] Rainbow Spectrum.css
index e862d490..550d2866 100644
--- a/config/waybar/style/[Colorful] Rainbow Spectrum.css
+++ b/config/waybar/style/[Colorful] Rainbow Spectrum.css
@@ -8,7 +8,6 @@ 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 {
@@ -96,10 +95,10 @@ tooltip label{
 	border-radius: 16px;
   	color: #3A3B3C;
   	border: 1px solid #b4befe;
-	padding-top: 3px;
-	padding-bottom: 3px;
-    padding-left: 6px;
-    padding-right: 6px;
+	padding-top: 4px;
+	padding-bottom: 4px;
+	padding-right: 6px;
+	padding-left: 6px;
 }
 
 #backlight {
diff --git a/config/waybar/style/[Dark] Golden Noir.css b/config/waybar/style/[Dark] Golden Noir.css
index c80c9486..a0e0acea 100644
--- a/config/waybar/style/[Dark] Golden Noir.css
+++ b/config/waybar/style/[Dark] Golden Noir.css
@@ -12,7 +12,6 @@
     /* 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 {
@@ -165,8 +164,8 @@ tooltip {
 #custom-weather.snowyIcyNight,
 #custom-weather.sunnyDay {
     color: #e5d9f5;
-	padding-top: 3px;
-	padding-bottom: 3px;
+	padding-top: 5px;
+	padding-bottom: 5px;
 	padding-right: 6px;
 	padding-left: 6px;
 }
diff --git a/config/waybar/style/[Dark] Latte-Wallust combined.css b/config/waybar/style/[Dark] Latte-Wallust combined.css
index aa85b75d..79041091 100644
--- a/config/waybar/style/[Dark] Latte-Wallust combined.css
+++ b/config/waybar/style/[Dark] Latte-Wallust combined.css
@@ -27,7 +27,6 @@
     /* 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 {
@@ -82,7 +81,7 @@ tooltip {
     /*border-right: 2px solid #ffd700;*/
     /*border:@teal-trans;*/
 	padding-top: 2px;
-	padding-bottom: 4px;
+	padding-bottom: 0px;
 	padding-right: 4px;
 	padding-left: 4px;
 }
@@ -92,7 +91,7 @@ tooltip {
     border-radius:15px;
     border-bottom: 2px solid @border-color;
 	padding-top: 2px;
-	padding-bottom: 4px;
+	padding-bottom: 0px;
 	padding-right: 4px;
 	padding-left: 4px;
 }
@@ -196,10 +195,8 @@ tooltip {
 #custom-weather.snowyIcyNight,
 #custom-weather.sunnyDay {
     color: #e5d9f5;
-	padding-top: 1px;
-	padding-bottom: 1px;
 	padding-right: 6px;
-	padding-left: 6px;
+	padding-left: 6px;;
 }
 
 #temperature.critical {
diff --git a/config/waybar/style/[Dark] Purpl.css b/config/waybar/style/[Dark] Purpl.css
index 976cd86f..3dbd99da 100644
--- a/config/waybar/style/[Dark] Purpl.css
+++ b/config/waybar/style/[Dark] Purpl.css
@@ -11,7 +11,6 @@
 	/* 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 {
@@ -162,8 +161,8 @@ tooltip {
 #custom-weather.snowyIcyNight,
 #custom-weather.sunnyDay {
 	color: whitesmoke;
-	padding-top: 1px;
-	padding-bottom: 1px;
+	padding-top: 4px;
+	padding-bottom: 4px;
 	padding-right: 6px;
 	padding-left: 6px;
 
diff --git a/config/waybar/style/[Dark] Wallust Obsidian Edge.css b/config/waybar/style/[Dark] Wallust Obsidian Edge.css
index 39b84cca..d841e3c4 100644
--- a/config/waybar/style/[Dark] Wallust Obsidian Edge.css
+++ b/config/waybar/style/[Dark] Wallust Obsidian Edge.css
@@ -10,7 +10,6 @@ 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 {
@@ -159,8 +158,8 @@ tooltip label {
 #custom-weather.sunnyDay {
     color: @foreground;
     border-radius: 8px;
-	padding-top: 3px;
-	padding-bottom: 3px;
+	padding-top: 5px;
+	padding-bottom: 5px;
 	padding-right: 6px;
 	padding-left: 6px;
 }
diff --git a/config/waybar/style/[Extra] Crimson.css b/config/waybar/style/[Extra] Crimson.css
index 79fc2fbe..63992515 100644
--- a/config/waybar/style/[Extra] Crimson.css
+++ b/config/waybar/style/[Extra] Crimson.css
@@ -151,8 +151,8 @@ tooltip {
 #custom-weather.snowyIcyNight,
 #custom-weather.sunnyDay {
 	color: wheat;
-	padding-top: 4px;
-	padding-bottom: 4px;
+	padding-top: 5px;
+	padding-bottom: 5px;
 	padding-right: 6px;
 	padding-left: 6px;
 }
diff --git a/config/waybar/style/[Extra] Mauve.css b/config/waybar/style/[Extra] Mauve.css
index af90af8e..cfdec9a1 100644
--- a/config/waybar/style/[Extra] Mauve.css
+++ b/config/waybar/style/[Extra] Mauve.css
@@ -11,7 +11,6 @@
 	/* 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: 2px;
 }
 
 window#waybar {
@@ -173,8 +172,8 @@ tooltip {
 #custom-weather.snowyIcyNight,
 #custom-weather.sunnyDay {
 	color: whitesmoke;
-	padding-top: 1px;
-	padding-bottom: 1px;
+	padding-top: 4px;
+	padding-bottom: 4px;
 	padding-right: 6px;
 	padding-left: 6px;
 
diff --git a/config/waybar/style/[Extra] Rose Pine.css b/config/waybar/style/[Extra] Rose Pine.css
index 9954cf4a..40536ff9 100644
--- a/config/waybar/style/[Extra] Rose Pine.css
+++ b/config/waybar/style/[Extra] Rose Pine.css
@@ -148,8 +148,8 @@ tooltip {
 	border-color: #2B5D34;
 	border-style: solid;
 	border-radius: 10px;
-	padding-top: 3px;
-	padding-bottom: 3px;
+	padding-top: 4px;
+	padding-bottom: 4px;
 	padding-right: 6px;
 	padding-left: 6px;
 }
diff --git a/config/waybar/style/[Light] Monochrome Contrast.css b/config/waybar/style/[Light] Monochrome Contrast.css
index 18eefd93..b188f99a 100644
--- a/config/waybar/style/[Light] Monochrome Contrast.css
+++ b/config/waybar/style/[Light] Monochrome Contrast.css
@@ -8,7 +8,6 @@ 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 {
@@ -150,8 +149,8 @@ tooltip label{
 #custom-weather.showyIcyDay,
 #custom-weather.snowyIcyNight,
 #custom-weather.sunnyDay {
-	padding-top: 3px;
-	padding-bottom: 3px;
+	padding-top: 4px;
+	padding-bottom: 4px;
 	padding-right: 6px;
 	padding-left: 6px;
 }
diff --git a/config/waybar/style/[Light] Obsidian Glow.css b/config/waybar/style/[Light] Obsidian Glow.css
index d41742c5..5b6fe9ba 100644
--- a/config/waybar/style/[Light] Obsidian Glow.css
+++ b/config/waybar/style/[Light] Obsidian Glow.css
@@ -8,7 +8,6 @@ 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 {
@@ -128,8 +127,8 @@ tooltip label {
 #custom-weather.sunnyDay {
 	color: #000000;
 	border-radius: 8px;
-	padding-top: 3px;
-	padding-bottom: 3px;
+	padding-top: 4px;
+	padding-bottom: 4px;
 	padding-right: 6px;
 	padding-left: 6px;
 }
diff --git a/config/waybar/style/[Transparent] Crystal Clear.css b/config/waybar/style/[Transparent] Crystal Clear.css
index 84788e7a..fb2710ae 100644
--- a/config/waybar/style/[Transparent] Crystal Clear.css
+++ b/config/waybar/style/[Transparent] Crystal Clear.css
@@ -11,7 +11,6 @@
 	/* 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 {
@@ -128,8 +127,8 @@ window#waybar.empty #window {
 #custom-weather.showyIcyDay,
 #custom-weather.snowyIcyNight,
 #custom-weather.sunnyDay {
-	padding-top: 3px;
-	padding-bottom: 3px;
+	padding-top: 4px;
+	padding-bottom: 4px;
 	padding-right: 6px;
 	padding-left: 6px;
 }
diff --git a/config/waybar/style/[Wallust Bordered] Chroma Fusion Edge.css b/config/waybar/style/[Wallust Bordered] Chroma Fusion Edge.css
index ec3ecbf7..233763c6 100644
--- a/config/waybar/style/[Wallust Bordered] Chroma Fusion Edge.css
+++ b/config/waybar/style/[Wallust Bordered] Chroma Fusion Edge.css
@@ -27,7 +27,6 @@
 	/* 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"';
-
 }
 
 window#waybar {
diff --git a/config/waybar/style/[Wallust Bordered] Chroma Simple.css b/config/waybar/style/[Wallust Bordered] Chroma Simple.css
index 8fcf4514..ce5f3fc3 100644
--- a/config/waybar/style/[Wallust Bordered] Chroma Simple.css
+++ b/config/waybar/style/[Wallust Bordered] Chroma Simple.css
@@ -1,5 +1,5 @@
 /* ----------- 💫 https://github.com/JaKooLit 💫 -------- */
-/* Wallust Bordered*/
+/* Wallust Bordered - Chroma Simple */
 
 @import '../../.config/waybar/wallust/colors-waybar.css';
 
diff --git a/config/waybar/style/[Wallust Transparent] Crystal Clear.css b/config/waybar/style/[Wallust Transparent] Crystal Clear.css
index 8b9ded8d..b8739911 100644
--- a/config/waybar/style/[Wallust Transparent] Crystal Clear.css
+++ b/config/waybar/style/[Wallust Transparent] Crystal Clear.css
@@ -1,6 +1,6 @@
 /* ----------- 💫 https://github.com/JaKooLit 💫 -------- */
 /* ..........................................*/
-/* ....Wallust - Clear Background........ */
+/* ....Wallust Transparent - Crystal Clear........ */
 /* ......................................... */
 /* --- 👍 original designed by https://github.com/Krautt  👍 --- */
 
@@ -19,7 +19,6 @@
 	/* 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 {
@@ -137,8 +136,8 @@ window#waybar.empty #window {
 #custom-weather.showyIcyDay,
 #custom-weather.snowyIcyNight,
 #custom-weather.sunnyDay {
-	padding-top: 3px;
-	padding-bottom: 3px;
+	padding-top: 4px;
+	padding-bottom: 4px;
 	padding-right: 6px;
 	padding-left: 6px;
 }
diff --git a/config/waybar/style/[Wallust] Box type.css b/config/waybar/style/[Wallust] Box type.css
new file mode 100644
index 00000000..a5338e84
--- /dev/null
+++ b/config/waybar/style/[Wallust] Box type.css
@@ -0,0 +1,209 @@
+/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
+/* Wallust - Box type */
+
+@import '../../.config/waybar/wallust/colors-waybar.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"';
+}
+
+
+window#waybar {
+	background: transparent;
+}
+
+window#waybar.hidden {
+	opacity: 0.2;
+}
+
+
+window#waybar.empty #window {  
+ background:none;  
+ border-bottom-width: 5px;
+ border-bottom-color: transparent;
+ border-bottom-style: solid;
+}
+
+#window {
+	padding-left: 10px;
+	padding-right: 10px;
+	border-radius: 10px;
+	transition: none;
+    color: transparent;
+	background: transparent;
+}
+
+#taskbar button,
+#workspaces button {
+    color: @foreground;
+    box-shadow: none;
+	text-shadow: none;
+    padding: 0px;
+    border-radius: 9px;
+    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);
+}
+
+#taskbar button.active,
+#workspaces button.active {
+    color: @color12;
+    background-color: @foreground;
+    padding-left: 4px;
+    padding-right: 8px;
+    animation: gradient_f 20s ease-in infinite;
+    transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
+}
+
+#taskbar button.focused,
+#workspaces button.focused {
+    color: @color4;
+}
+
+#workspaces button.urgent {
+    color: #11111b;
+    border-radius: 10px;
+}
+
+#taskbar button:hover,
+#workspaces button:hover {
+    color: @color4;
+    padding-left: 2px;
+    padding-right: 8px;
+    animation: gradient_f 20s ease-in infinite;
+    transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
+}
+
+#backlight,
+#backlight-slider,
+#battery,
+#bluetooth,
+#clock,
+#cpu,
+#disk,
+#idle_inhibitor,
+#keyboard-state,
+#memory,
+#mode,
+#network,
+#power-profiles-daemon,
+#pulseaudio,
+#pulseaudio-slider,	
+#taskbar,
+#temperature,
+#tray,
+#window,
+#wireplumber,
+#workspaces,
+#custom-backlight,
+#custom-cycle_wall,
+#custom-hint,
+#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{
+	padding-top: 4px;
+	padding-bottom: 4px;
+	padding-left: 8px;
+	padding-right: 10px;
+	border-radius: 10px;
+	transition: none;
+	color: @foreground;
+	background: @color0;
+    border-bottom-width: 5px;
+    border-bottom-color: @color12;
+    border-bottom-style: solid;
+}
+
+#custom-power {
+	padding-right: 2px;
+}
+
+#network {
+	padding-right: 12px;
+}
+
+#mpris {
+	padding-right: 8px;
+	padding-left: 8px;
+}
+#battery.critical:not(.charging) {
+    background-color: #ffffff;
+    color: #000000;
+    animation-name: blink;
+    animation-duration: 0.5s;
+    animation-timing-function: linear;
+    animation-iteration-count: infinite;
+    animation-direction: alternate;
+    border-bottom-width: 5px;
+    border-bottom-color: @color12;
+    border-bottom-style: solid;
+}
+
+@keyframes blink {
+    to {
+        background-color: #ffffff;
+        color: #000000;
+    }
+}
+
+#pulseaudio-slider slider {
+	min-width: 0px;
+	min-height: 0px;
+	opacity: 10;
+	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: @color12;
+}
+
+#backlight-slider trough {
+	min-width: 80px;
+	min-height: 10px;
+	border-radius: 5px;
+}
+
+#backlight-slider highlight {
+	min-width: 10px;
+	border-radius: 5px;
+}
\ No newline at end of file
diff --git a/config/waybar/style/[Wallust] Chroma Edge.css b/config/waybar/style/[Wallust] Chroma Edge.css
index f24db6fd..28be5dee 100644
--- a/config/waybar/style/[Wallust] Chroma Edge.css
+++ b/config/waybar/style/[Wallust] Chroma Edge.css
@@ -10,7 +10,6 @@ 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 {
@@ -135,7 +134,10 @@ tooltip label{
 	border-radius: 12px;
 	background-color: rgba(50, 50, 50, 0.1);
 	border: 1px solid @color12;
-	padding: 5px;
+	padding-top: 4px;
+	padding-bottom: 4px;
+	padding-right: 6px;
+	padding-left: 6px;
 }
 
 #workspaces {
diff --git a/config/waybar/style/[Wallust] Chroma Fusion.css b/config/waybar/style/[Wallust] Chroma Fusion.css
index 519dd5c6..368c99e3 100644
--- a/config/waybar/style/[Wallust] Chroma Fusion.css
+++ b/config/waybar/style/[Wallust] Chroma Fusion.css
@@ -1,5 +1,5 @@
 /* ----------- 💫 https://github.com/JaKooLit 💫 -------- */
-/* ....Chroma Fusion Edge .... */
+/* ....Chroma Fusion .... */
 /* Wallust - Catpuccin */
 
 @define-color white      	#F2F2F2;
@@ -27,7 +27,6 @@
 	/* 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"';
-
 }
 
 window#waybar {
@@ -100,9 +99,12 @@ tooltip {
 #custom-weather.sunnyDay {
 	background-color: @background-module;
     border-radius: 25px;
-    padding: 0px 10px 0px 10px;
     margin: 5px 5px 5px 5px;
     opacity:0.8;
+   	padding-top: 4px;
+	padding-bottom: 4px;
+	padding-right: 6px;
+	padding-left: 6px;
 }
 #backlight {
 	padding: 0px 2px 0px 6px;
diff --git a/config/waybar/style/[Wallust] Chroma Tally.css b/config/waybar/style/[Wallust] Chroma Tally.css
index 98c13984..4b7ad61e 100644
--- a/config/waybar/style/[Wallust] Chroma Tally.css
+++ b/config/waybar/style/[Wallust] Chroma Tally.css
@@ -10,7 +10,6 @@ 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 {
@@ -112,8 +111,8 @@ tooltip {
 #custom-weather.showyIcyDay,
 #custom-weather.snowyIcyNight,
 #custom-weather.sunnyDay {
-	padding-top: 3px;
-	padding-bottom: 3px;
+	padding-top: 5px;
+	padding-bottom: 5px;
 	padding-right: 6px;
 	padding-left: 6px;
 }
diff --git a/config/waybar/style/[Wallust] Colored.css b/config/waybar/style/[Wallust] Colored.css
index 5b78d073..8d73d52e 100644
--- a/config/waybar/style/[Wallust] Colored.css
+++ b/config/waybar/style/[Wallust] Colored.css
@@ -10,7 +10,6 @@
      /* set font-size to 100% if font scaling is set to 1.00 using nwg-look */
     font-size: 96%;
     font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"';
-    padding: 1px;
 }
 
 window#waybar {
@@ -159,8 +158,8 @@ tooltip {
 #custom-weather.snowyIcyNight,
 #custom-weather.sunnyDay {
 	color: @foreground;
-	padding-top: 1px;
-	padding-bottom: 1px;
+	padding-top: 4px;
+	padding-bottom: 4px;
 	padding-right: 6px;
 	padding-left: 6px;
 }
diff --git a/config/waybar/style/[Wallust] Simple.css b/config/waybar/style/[Wallust] Simple.css
index b69f686a..e2a27636 100644
--- a/config/waybar/style/[Wallust] Simple.css
+++ b/config/waybar/style/[Wallust] Simple.css
@@ -8,8 +8,6 @@ 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-top: 1px;
-padding-bottom: 1px;
 }
 
 @import '../../.config/waybar/wallust/colors-waybar.css';
@@ -147,10 +145,10 @@ tooltip {
 #custom-weather.snowyIcyNight,
 #custom-weather.sunnyDay {
 	color: @color12;
-	padding-top: 3px;
-	padding-bottom: 3px;
+	padding-top: 4px;
+	padding-bottom: 4px;
 	padding-right: 6px;
-	padding-left: 6px;
+	padding-left: 6px;;
 }
 
 #mode {