Merge pull request #106 from JaKooLit/development

Development to Main for v2.2.2 Changes

47 files changed, 104 insertions, 50 deletions

diff --git a/config/waybar/configs/[BOT & Left] SouthWest b/config/waybar/configs/[BOT & Left] SouthWest
index 27bec456..14377d57 100644
--- a/config/waybar/configs/[BOT & Left] SouthWest
+++ b/config/waybar/configs/[BOT & Left] SouthWest
@@ -67,7 +67,8 @@
     ],
     
 "modules-right": [
-	"mpris",
+		"mpris",
+		"custom/swaync",
     "tray",
     "custom/light_dark",
     ],
diff --git a/config/waybar/configs/[BOT & Right] SouthEast b/config/waybar/configs/[BOT & Right] SouthEast
index 68629cbc..7d684c85 100644
--- a/config/waybar/configs/[BOT & Right] SouthEast
+++ b/config/waybar/configs/[BOT & Right] SouthEast
@@ -67,7 +67,8 @@
     ],
     
 "modules-right": [
-	"mpris",
+		"mpris",
+		"custom/swaync",
     "tray",
     "custom/light_dark",
     ],
diff --git a/config/waybar/configs/[BOT] Camellia b/config/waybar/configs/[BOT] Camellia
index 0e2305a9..e135258e 100644
--- a/config/waybar/configs/[BOT] Camellia
+++ b/config/waybar/configs/[BOT] Camellia
@@ -24,6 +24,7 @@
 	"hyprland/workspaces#cam",
 	"custom/separator#line",
 	"mpris",
+	"custom/swaync",
 	"tray#cam", 
 	"wlr/taskbar"],
 
diff --git a/config/waybar/configs/[BOT] Chrysanthemum b/config/waybar/configs/[BOT] Chrysanthemum
index 68bff674..e4f1fba8 100644
--- a/config/waybar/configs/[BOT] Chrysanthemum
+++ b/config/waybar/configs/[BOT] Chrysanthemum
@@ -17,7 +17,7 @@
 "margin-left": 5,
 "margin-right": 5,
 	
-"modules-left": ["clock#gar", "mpris", "tray"],
+"modules-left": ["clock#gar", "mpris", "custom/swaync", "tray"],
   
 "modules-center": ["hyprland/workspaces"], 
 	
diff --git a/config/waybar/configs/[BOT] Default b/config/waybar/configs/[BOT] Default
index 36798abf..eece9165 100644
--- a/config/waybar/configs/[BOT] Default
+++ b/config/waybar/configs/[BOT] Default
@@ -45,6 +45,7 @@
 "modules-right": [
 	"network#speed",
 	"custom/separator#dot-line",
+	"custom/swaync",
 	"tray",
 	"mpris", 
 	"custom/separator#dot-line",
diff --git a/config/waybar/configs/[BOT] Gardenia b/config/waybar/configs/[BOT] Gardenia
index ce460426..5d071521 100644
--- a/config/waybar/configs/[BOT] Gardenia
+++ b/config/waybar/configs/[BOT] Gardenia
@@ -20,7 +20,7 @@
 "margin-bottom": 5,
 "width": 768,
 	
-"modules-left": ["clock#gar", "mpris", "tray"],
+"modules-left": ["clock#gar", "mpris", "custom/swaync", "tray"],
 	  
 "modules-center": ["hyprland/workspaces#kanji"], 
 	
diff --git a/config/waybar/configs/[BOT] Peony b/config/waybar/configs/[BOT] Peony
index 7f049c18..dcdf4aa1 100644
--- a/config/waybar/configs/[BOT] Peony
+++ b/config/waybar/configs/[BOT] Peony
@@ -32,7 +32,8 @@
 	"custom/separator#blank",
 	"temperature",
 	"custom/separator#blank",	
-	"network#peony"],
+	"network#peony",
+	"custom/swaync"],
 
 
 //M O D U L E S //
diff --git a/config/waybar/configs/[BOT] Sleek b/config/waybar/configs/[BOT] Sleek
index 10175e8a..10b62db6 100644
--- a/config/waybar/configs/[BOT] Sleek
+++ b/config/waybar/configs/[BOT] Sleek
@@ -24,10 +24,10 @@
 		
 "modules-right": [
 	"tray",
+	"custom/swaync",
 	"pulseaudio",
 	"clock",
-	"custom/power"
-				
+	"custom/power"				
 	],
 
 
diff --git a/config/waybar/configs/[Left] WestWing b/config/waybar/configs/[Left] WestWing
index 1458b43c..a3381e8c 100644
--- a/config/waybar/configs/[Left] WestWing
+++ b/config/waybar/configs/[Left] WestWing
@@ -27,7 +27,7 @@
 "modules-right": [
 	"mpris",
 	"tray",
-	//"network",
+	"custom/swaync",
 	"backlight#vertical",
 	"pulseaudio#microphone_vertical",
 	"pulseaudio#vertical",
diff --git a/config/waybar/configs/[Right] EastWing b/config/waybar/configs/[Right] EastWing
index 4fc258cf..5ce7be2e 100644
--- a/config/waybar/configs/[Right] EastWing
+++ b/config/waybar/configs/[Right] EastWing
@@ -27,7 +27,7 @@
 "modules-right": [
 	"mpris",
 	"tray",
-	//"network",
+	"custom/swaync",
 	"backlight#vertical",
 	"pulseaudio#microphone_vertical",
 	"pulseaudio#vertical",
diff --git a/config/waybar/configs/[TOP & BOT] SummitSplit b/config/waybar/configs/[TOP & BOT] SummitSplit
index 9564fe68..62cb449d 100644
--- a/config/waybar/configs/[TOP & BOT] SummitSplit
+++ b/config/waybar/configs/[TOP & BOT] SummitSplit
@@ -68,6 +68,7 @@
 "modules-right": [
 	"hyprland/window",
 	"tray",
+	"custom/swaync",
 	"mpris",
 	"keyboard-state",
 	"pulseaudio",
diff --git a/config/waybar/configs/[TOP & Left] NorthWest b/config/waybar/configs/[TOP & Left] NorthWest
index 6fc84642..81f23066 100644
--- a/config/waybar/configs/[TOP & Left] NorthWest
+++ b/config/waybar/configs/[TOP & Left] NorthWest
@@ -18,25 +18,25 @@
 "margin-right": 8,
     
 "modules-left": [
-    "custom/menu",
+	"custom/menu",
 	"custom/separator#blank_2",
 	"group/motherboard",
     ],
     
 "modules-center": [
-    //"hyprland/window",
-    "hyprland/workspaces#pacman",
+  	//"hyprland/window",
+ 	"hyprland/workspaces#pacman",
 	],
     
 "modules-right": [
-    "network",
-    "bluetooth",
+  	"network",
+  	"bluetooth",
 	"custom/weather",
 	"custom/separator#blank_2",
 	"group/audio",
 	"custom/separator#blank_2",
-    "keyboard-state",
-    "custom/power",
+  	"keyboard-state",
+  	"custom/power",
     ],
 },
 
@@ -64,6 +64,7 @@
     
 "modules-right": [
 	"mpris",
+	"custom/swaync",
     "tray",
     "custom/light_dark",
     ],
diff --git a/config/waybar/configs/[TOP & Right] NorthEast b/config/waybar/configs/[TOP & Right] NorthEast
index 84ab71ef..21bcb2c8 100644
--- a/config/waybar/configs/[TOP & Right] NorthEast
+++ b/config/waybar/configs/[TOP & Right] NorthEast
@@ -65,6 +65,7 @@
     
 "modules-right": [
 	"mpris",
+	"custom/swaync",
     "tray",
     "custom/light_dark",
     ],
diff --git a/config/waybar/configs/[TOP] Camellia b/config/waybar/configs/[TOP] Camellia
index beeb80bd..53e2fcea 100644
--- a/config/waybar/configs/[TOP] Camellia
+++ b/config/waybar/configs/[TOP] Camellia
@@ -23,7 +23,8 @@
 "modules-left": [
 	"hyprland/workspaces#cam",
 	"custom/separator#line", 
-	"mpris", 
+	"mpris",
+	"custom/swaync", 
 	"tray#cam", 
 	"wlr/taskbar"
 	],
diff --git a/config/waybar/configs/[TOP] Chrysanthemum b/config/waybar/configs/[TOP] Chrysanthemum
index b8691847..b2310471 100644
--- a/config/waybar/configs/[TOP] Chrysanthemum
+++ b/config/waybar/configs/[TOP] Chrysanthemum
@@ -18,7 +18,7 @@
 "margin-right": 5,
 "margin-top": 0,
 	
-"modules-left": ["clock#gar", "mpris", "tray"],
+"modules-left": ["clock#gar", "mpris", "tray", "custom/swaync"],
   
 "modules-center": ["hyprland/workspaces"], 
 	
diff --git a/config/waybar/configs/[TOP] Default b/config/waybar/configs/[TOP] Default
index a75f7524..b40bc576 100644
--- a/config/waybar/configs/[TOP] Default
+++ b/config/waybar/configs/[TOP] Default
@@ -45,6 +45,7 @@
 "modules-right": [
 	"network#speed",
 	"custom/separator#dot-line",
+	"custom/swaync",
 	"tray",
 	"mpris", 
 	"custom/separator#dot-line",
diff --git a/config/waybar/configs/[TOP] Default Laptop b/config/waybar/configs/[TOP] Default Laptop
index 24f27552..89f6bbbd 100644
--- a/config/waybar/configs/[TOP] Default Laptop
+++ b/config/waybar/configs/[TOP] Default Laptop
@@ -45,6 +45,7 @@
 "modules-right": [
 	"network#speed",
 	"custom/separator#dot-line",
+	"custom/swaync",
 	"tray",
 	"mpris", 
 	"custom/separator#dot-line",
diff --git a/config/waybar/configs/[TOP] Gardenia b/config/waybar/configs/[TOP] Gardenia
index 293c9852..44c2de42 100644
--- a/config/waybar/configs/[TOP] Gardenia
+++ b/config/waybar/configs/[TOP] Gardenia
@@ -19,7 +19,7 @@
 //"margin-bottom": 5,
 "width": 768,
 	
-"modules-left": ["clock#gar", "mpris", "tray"],
+"modules-left": ["clock#gar", "mpris", "tray", "custom/swaync"],
 	  
 "modules-center": ["hyprland/workspaces#kanji"], 
 	
diff --git a/config/waybar/configs/[TOP] Minimal - Long b/config/waybar/configs/[TOP] Minimal - Long
index 8bc41eae..52e16fd0 100644
--- a/config/waybar/configs/[TOP] Minimal - Long
+++ b/config/waybar/configs/[TOP] Minimal - Long
@@ -22,6 +22,7 @@
 	"hyprland/workspaces#pacman",
 	"custom/separator#blank_2",
 	"mpris",
+	"custom/swaync",
 	"tray",
 	],
 "modules-center": [
diff --git a/config/waybar/configs/[TOP] Minimal - Short b/config/waybar/configs/[TOP] Minimal - Short
index 2282d93c..99616d84 100644
--- a/config/waybar/configs/[TOP] Minimal - Short
+++ b/config/waybar/configs/[TOP] Minimal - Short
@@ -21,6 +21,7 @@
 "modules-right": [
 	"custom/menu", 
 	"tray",
+	"custom/swaync",
 	"mpris", 
 	"network", 
 	"bluetooth", 
diff --git a/config/waybar/configs/[TOP] Peony b/config/waybar/configs/[TOP] Peony
index 83ec43f5..c01ab104 100644
--- a/config/waybar/configs/[TOP] Peony
+++ b/config/waybar/configs/[TOP] Peony
@@ -19,7 +19,7 @@
 //"margin-bottom": 5,
 "width": 1444,
 	
-"modules-left": ["hyprland/workspaces#roman", "mpris", "tray#peony"],
+"modules-left": ["hyprland/workspaces#roman", "mpris", "custom/swaync", "tray#peony"],
   
 "modules-center": ["clock#peony"], 
 	
diff --git a/config/waybar/configs/[TOP] Sleek b/config/waybar/configs/[TOP] Sleek
index 5f3b39c3..dbd8a7e0 100644
--- a/config/waybar/configs/[TOP] Sleek
+++ b/config/waybar/configs/[TOP] Sleek
@@ -13,7 +13,8 @@
 "modules-left": [
 	"custom/menu",
 	"custom/separator#blank_2",
-	"mpris", 
+	"clock",
+	"custom/separator#blank_2",
 	"hyprland/window"
 ],
 
@@ -22,11 +23,15 @@
 ],
 		
 "modules-right": [
+	"custom/swaync",
+	"custom/separator#blank",
 	"tray",
+	"custom/separator#blank",
+	"mpris",
+	"custom/separator#blank", 
 	"pulseaudio",
-	"clock",
-	"custom/power"
-				
+	"custom/separator#blank",
+	"custom/power",					
 	],
 
 
diff --git a/config/waybar/modules b/config/waybar/modules
index a462e75d..2841dc36 100644
--- a/config/waybar/modules
+++ b/config/waybar/modules
@@ -526,7 +526,7 @@
     "exec": "echo ; echo 󱓟 app launcher",
     "interval" : 86400, // once every day
     "tooltip": true,
-    "on-click": "pkill rofi || rofi -show drun -modi run,drun,filebrowser",
+    "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",
 },
@@ -544,6 +544,27 @@
     "on-scroll-down": "~/.config/hypr/scripts/Volume.sh --dec",
     "smooth-scrolling-threshold": 1,
 },
+
+"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,
+},
       
 "custom/power": {
     "format": "⏻ ",
@@ -569,8 +590,8 @@
     "format-alt-click": "click",
     "interval": 3600,
     "return-type": "json",
-    "exec": "~/.config/hypr/scripts/Weather.sh",
-    //"exec": "~/.config/hypr/scripts/Weather.py",
+    "exec": "~/.config/hypr/UserScripts/Weather.sh",
+    //"exec": "~/.config/hypr/UserScripts/Weather.py",
     "exec-if": "ping wttr.in -c1",
     "tooltip" : true,
 },
@@ -715,7 +736,6 @@
     "tooltip": true,
 },
   
-  
 }
   
   
diff --git a/config/waybar/style/Catppuccin-Latte.css b/config/waybar/style/Catppuccin-Latte.css
index eff29a7c..18b16633 100644
--- a/config/waybar/style/Catppuccin-Latte.css
+++ b/config/waybar/style/Catppuccin-Latte.css
@@ -75,6 +75,7 @@ window#waybar.hidden {
 #custom-lock,
 #custom-menu,
 #custom-power,
+#custom-speaker,
 #custom-power_vertical,
 #custom-updater,
 #custom-weather,
@@ -123,6 +124,10 @@ window#waybar.hidden {
   box-shadow: inset 0 -3px transparent;
 }
 
+#bluetooth {
+	color: @blue;
+}
+
 #clock {
   color: @yellow;
 }
diff --git a/config/waybar/style/Catppuccin-Mocha.css b/config/waybar/style/Catppuccin-Mocha.css
index 63075eff..061106c5 100644
--- a/config/waybar/style/Catppuccin-Mocha.css
+++ b/config/waybar/style/Catppuccin-Mocha.css
@@ -82,7 +82,7 @@ window#waybar.hidden {
 #custom-menu,
 #custom-power_vertical,
 #custom-power,
-#custom-speaker,
+#custom-swaync,
 #custom-updater,
 #custom-weather,
 #custom-weather.clearNight,
@@ -105,6 +105,7 @@ window#waybar.hidden {
   color: @blue;
 }
 
+#bluetooth,
 #backlight {
   color: @blue;
 }
diff --git a/config/waybar/style/Crimson.css b/config/waybar/style/Crimson.css
index acf8048d..fcac5dc1 100644
--- a/config/waybar/style/Crimson.css
+++ b/config/waybar/style/Crimson.css
@@ -137,7 +137,7 @@ tooltip {
 #custom-menu,
 #custom-power_vertical,
 #custom-power,
-#custom-speaker,
+#custom-swaync,
 #custom-updater,
 #custom-weather,
 #custom-weather.clearNight,
diff --git a/config/waybar/style/[Dark] Purpl.css b/config/waybar/style/Purpl.css
index e3a35731..0f97470f 100644
--- a/config/waybar/style/[Dark] Purpl.css
+++ b/config/waybar/style/Purpl.css
@@ -147,7 +147,7 @@ tooltip {
 #custom-menu,
 #custom-power_vertical,
 #custom-power,
-#custom-speaker,
+#custom-swaync,
 #custom-updater,
 #custom-weather,
 #custom-weather.clearNight,
diff --git a/config/waybar/style/Rose Pine.css b/config/waybar/style/Rose Pine.css
index f4ba4303..4a15422b 100644
--- a/config/waybar/style/Rose Pine.css
+++ b/config/waybar/style/Rose Pine.css
@@ -126,8 +126,9 @@ tooltip {
 #custom-menu,
 #custom-power_vertical,
 #custom-power,
-#custom-speaker,
+#custom-swaync,
 #custom-updater,
+#custom-swaync,
 #custom-weather,
 #custom-weather.clearNight,
 #custom-weather.cloudyFoggyDay,
diff --git a/config/waybar/style/Simple Pink.css b/config/waybar/style/Simple Pink.css
index f449e7ad..d306dd84 100644
--- a/config/waybar/style/Simple Pink.css
+++ b/config/waybar/style/Simple Pink.css
@@ -152,7 +152,7 @@ tooltip {
 #custom-menu,
 #custom-power_vertical,
 #custom-power,
-#custom-speaker,
+#custom-swaync,
 #custom-updater,
 #custom-weather,
 #custom-weather.clearNight,
diff --git a/config/waybar/style/[Black & White] Monochrome.css b/config/waybar/style/[Black & White] Monochrome.css
index 6574848f..143e887b 100644
--- a/config/waybar/style/[Black & White] Monochrome.css
+++ b/config/waybar/style/[Black & White] Monochrome.css
@@ -136,7 +136,7 @@ tooltip label{
 #custom-menu,
 #custom-power_vertical,
 #custom-power,
-#custom-speaker,
+#custom-swaync,
 #custom-updater,
 #custom-weather,
 #custom-weather.clearNight,
diff --git a/config/waybar/style/[Bordered Pywal] Chroma Fusion Edge.css b/config/waybar/style/[Bordered Pywal] Chroma Fusion Edge.css
index ad1981ec..1a29c409 100644
--- a/config/waybar/style/[Bordered Pywal] Chroma Fusion Edge.css
+++ b/config/waybar/style/[Bordered Pywal] Chroma Fusion Edge.css
@@ -76,6 +76,7 @@ window#waybar.empty #window {
 #custom-menu,
 #custom-power_vertical,
 #custom-power,
+#custom-swaync,
 #custom-updater,
 #custom-weather,
 #custom-weather.clearNight,
@@ -125,6 +126,7 @@ window#waybar.empty #window {
     color: @rosewater;
 }
 
+#custom-swaync,
 #custom-keybinds,
 #tray {
 	color: aliceblue;
diff --git a/config/waybar/style/[Colored] Chroma Glow.css b/config/waybar/style/[Colored] Chroma Glow.css
index e28973a3..f324bf3a 100644
--- a/config/waybar/style/[Colored] Chroma Glow.css
+++ b/config/waybar/style/[Colored] Chroma Glow.css
@@ -124,7 +124,7 @@ tooltip label{
 #custom-menu,
 #custom-power_vertical,
 #custom-power,
-#custom-speaker,
+#custom-swaync,
 #custom-updater,
 #custom-weather,
 #custom-weather.clearNight,
@@ -223,6 +223,7 @@ label:focus {
     color: #df3320;
 }
 
+#custom-swaync,
 #custom-keybinds {
 	color: #1e66f5;	
 }
diff --git a/config/waybar/style/[Colored] Translucent.css b/config/waybar/style/[Colored] Translucent.css
index 9a096c35..0e3cbaf5 100644
--- a/config/waybar/style/[Colored] Translucent.css
+++ b/config/waybar/style/[Colored] Translucent.css
@@ -138,7 +138,7 @@ tooltip label{
 #custom-menu,
 #custom-power_vertical,
 #custom-power,
-#custom-speaker,
+#custom-swaync,
 #custom-updater,
 #custom-weather,
 #custom-weather.clearNight,
diff --git a/config/waybar/style/[Colorful] Aurora Blossom.css b/config/waybar/style/[Colorful] Aurora Blossom.css
index 369300a7..8a0f8522 100644
--- a/config/waybar/style/[Colorful] Aurora Blossom.css
+++ b/config/waybar/style/[Colorful] Aurora Blossom.css
@@ -125,7 +125,7 @@ tooltip label{
 #custom-menu,
 #custom-power_vertical,
 #custom-power,
-#custom-speaker,
+#custom-swaync,
 #custom-updater,
 #custom-weather,
 #custom-weather.clearNight,
diff --git a/config/waybar/style/[Colorful] Aurora.css b/config/waybar/style/[Colorful] Aurora.css
index 297be9d0..a5e57cbd 100644
--- a/config/waybar/style/[Colorful] Aurora.css
+++ b/config/waybar/style/[Colorful] Aurora.css
@@ -115,7 +115,7 @@ tooltip label{
 #custom-menu,
 #custom-power,
 #custom-power_vertical,
-#custom-speaker,
+#custom-swaync,
 #custom-updater,
 #custom-weather,
 #custom-weather.clearNight,
diff --git a/config/waybar/style/[Colorful] Rainbow Spectrum.css b/config/waybar/style/[Colorful] Rainbow Spectrum.css
index 6515e149..333f798a 100644
--- a/config/waybar/style/[Colorful] Rainbow Spectrum.css
+++ b/config/waybar/style/[Colorful] Rainbow Spectrum.css
@@ -80,7 +80,7 @@ tooltip label{
 #custom-menu,
 #custom-power_vertical,
 #custom-power,
-#custom-speaker,
+#custom-swaync,
 #custom-updater,
 #custom-weather,
 #custom-weather.clearNight,
@@ -239,6 +239,7 @@ tooltip label{
 	background-color: #94e2d5;
 }
 
+#custom-swaync,
 #custom-weather {
 	background-color: #cba6f7;
 }
diff --git a/config/waybar/style/[Dark] Golden Noir.css b/config/waybar/style/[Dark] Golden Noir.css
index 25be8e80..667b06e7 100644
--- a/config/waybar/style/[Dark] Golden Noir.css
+++ b/config/waybar/style/[Dark] Golden Noir.css
@@ -150,7 +150,7 @@ tooltip {
 #custom-menu,
 #custom-power_vertical,
 #custom-power,
-#custom-speaker,
+#custom-swaync,
 #custom-updater,
 #custom-weather,
 #custom-weather.clearNight,
diff --git a/config/waybar/style/[Dark] Obsidian Edge.css b/config/waybar/style/[Dark] Obsidian Edge.css
index 587c3f0d..8d21d72d 100644
--- a/config/waybar/style/[Dark] Obsidian Edge.css
+++ b/config/waybar/style/[Dark] Obsidian Edge.css
@@ -143,7 +143,7 @@ tooltip label {
 #custom-menu,
 #custom-power_vertical,
 #custom-power,
-#custom-speaker,
+#custom-swaync,
 #custom-updater,
 #custom-weather,
 #custom-weather.clearNight,
diff --git a/config/waybar/style/[Light] Monochrome Contrast.css b/config/waybar/style/[Light] Monochrome Contrast.css
index d70ce5eb..34b579f9 100644
--- a/config/waybar/style/[Light] Monochrome Contrast.css
+++ b/config/waybar/style/[Light] Monochrome Contrast.css
@@ -137,7 +137,7 @@ tooltip label{
 #custom-menu,
 #custom-power_vertical,
 #custom-power,
-#custom-speaker,
+#custom-swaync,
 #custom-updater,
 #custom-weather,
 #custom-weather.clearNight,
diff --git a/config/waybar/style/[Light] Obsidian Glow.css b/config/waybar/style/[Light] Obsidian Glow.css
index 9b4b07a8..cd939b5d 100644
--- a/config/waybar/style/[Light] Obsidian Glow.css
+++ b/config/waybar/style/[Light] Obsidian Glow.css
@@ -112,7 +112,7 @@ tooltip label {
 #custom-menu,
 #custom-power_vertical,
 #custom-power,
-#custom-speaker,
+#custom-swaync,
 #custom-updater,
 #custom-weather,
 #custom-weather.clearNight,
diff --git a/config/waybar/style/[Pywal] Chroma Edge.css b/config/waybar/style/[Pywal] Chroma Edge.css
index 0bc333a7..282057c8 100644
--- a/config/waybar/style/[Pywal] Chroma Edge.css
+++ b/config/waybar/style/[Pywal] Chroma Edge.css
@@ -117,7 +117,7 @@ tooltip label{
 #custom-menu,
 #custom-power_vertical,
 #custom-power,
-#custom-speaker,
+#custom-swaync,
 #custom-updater,
 #custom-weather,
 #custom-weather.clearNight,
@@ -207,7 +207,8 @@ tooltip label{
 	color: #d6e7e5;
 }
 
-#custom-weather.default {
+#custom-swaync,
+#custom-weather {
 	color: #ebecf0;
 }
 
diff --git a/config/waybar/style/[Pywal] Chroma Fusion.css b/config/waybar/style/[Pywal] Chroma Fusion.css
index 05d881f9..3f15037f 100644
--- a/config/waybar/style/[Pywal] Chroma Fusion.css
+++ b/config/waybar/style/[Pywal] Chroma Fusion.css
@@ -76,6 +76,7 @@ window#waybar.empty #window {
 #custom-menu,
 #custom-power_vertical,
 #custom-power,
+#custom-swaync,
 #custom-updater,
 #custom-weather,
 #custom-weather.clearNight,
@@ -109,6 +110,7 @@ window#waybar.empty #window {
     opacity:1.0;
 }
 
+#custom-swaync,
 #custom-weather,
 #custom-updater {
     color: @yellow;
diff --git a/config/waybar/style/[Pywal] Chroma Tally.css b/config/waybar/style/[Pywal] Chroma Tally.css
index 5ea40d86..c3a38fb6 100644
--- a/config/waybar/style/[Pywal] Chroma Tally.css
+++ b/config/waybar/style/[Pywal] Chroma Tally.css
@@ -82,7 +82,7 @@ window#waybar {
 #custom-menu,
 #custom-power_vertical,
 #custom-power,
-#custom-speaker,
+#custom-swaync,
 #custom-updater,
 #custom-weather,
 #custom-weather.clearNight,
@@ -189,6 +189,7 @@ window#waybar {
 #tray {
 }
 
+#custom-swaync,
 #custom-menu {
 	color: yellow;
 }
diff --git a/config/waybar/style/[Pywal] Colored.css b/config/waybar/style/[Pywal] Colored.css
index b1e2b007..afb01280 100644
--- a/config/waybar/style/[Pywal] Colored.css
+++ b/config/waybar/style/[Pywal] Colored.css
@@ -144,7 +144,7 @@ tooltip {
 #custom-menu,
 #custom-power_vertical,
 #custom-power,
-#custom-speaker,
+#custom-swaync,
 #custom-updater,
 #custom-weather,
 #custom-weather.clearNight,
diff --git a/config/waybar/style/[Pywal] Simple.css b/config/waybar/style/[Pywal] Simple.css
index 9d8c1c8c..6acef45e 100644
--- a/config/waybar/style/[Pywal] Simple.css
+++ b/config/waybar/style/[Pywal] Simple.css
@@ -132,7 +132,7 @@ tooltip {
 #custom-menu,
 #custom-power_vertical,
 #custom-power,
-#custom-speaker,
+#custom-swaync,
 #custom-updater,
 #custom-weather,
 #custom-weather.clearNight,
diff --git a/config/waybar/style/[Retro] Simple Style.css b/config/waybar/style/[Retro] Simple Style.css
index da5c5a22..aaf14d62 100644
--- a/config/waybar/style/[Retro] Simple Style.css
+++ b/config/waybar/style/[Retro] Simple Style.css
@@ -75,7 +75,7 @@ window#waybar {
 #custom-menu,
 #custom-power_vertical,
 #custom-power,
-#custom-speaker,
+#custom-swaync,
 #custom-updater,
 #custom-weather,
 #custom-weather.clearNight,
@@ -89,7 +89,7 @@ window#waybar {
 #custom-weather.snowyIcyNight,
 #custom-weather.sunnyDay {
   color: @foreground;
-  padding: 5px 8px 5px 8px;
+  padding: 3px 6px 3px 6px;
 }
 
 #battery.warning,
diff --git a/config/waybar/style/[Transparent] Crystal Clear.css b/config/waybar/style/[Transparent] Crystal Clear.css
index 27cd99a4..3f64235d 100644
--- a/config/waybar/style/[Transparent] Crystal Clear.css
+++ b/config/waybar/style/[Transparent] Crystal Clear.css
@@ -122,6 +122,7 @@ tooltip {
 #custom-menu,
 #custom-power_vertical,
 #custom-power,
+#custom-swaync,
 #custom-spotify,
 #custom-updater,
 #custom-weather,