diff --git a/config/waybar/configs/Simple-L [TOP] b/config/waybar/configs/Simple-L [TOP]
index b22d0a7..4baf027 100644
--- a/config/waybar/configs/Simple-L [TOP]	
+++ b/config/waybar/configs/Simple-L [TOP]	
@@ -27,7 +27,7 @@
 	"clock",
 	],
 "modules-right": [
-	"temperature",
+	"group/motherboard",
 	"custom/separator#blank_2",
 	"group/laptop",
 	"custom/separator#blank_2",
diff --git a/config/waybar/configs/Top & Left b/config/waybar/configs/Top & Left
index 97e356f..7c0532f 100644
--- a/config/waybar/configs/Top & Left	
+++ b/config/waybar/configs/Top & Left	
@@ -19,10 +19,8 @@
     
 "modules-left": [
     "custom/menu",
-    "cpu",
-    "temperature", 
-    "memory",
-    "disk",
+	"custom/separator#blank_2",
+	"group/motherboard",
     ],
     
 "modules-center": [
@@ -31,14 +29,12 @@
 	],
     
 "modules-right": [
-    //"network",
-    //"bluetooth",
+    "network",
+    "bluetooth",
 	"custom/weather",
-    "battery", 
-    "backlight",
-    "pulseaudio",
-    //"wireplumber", 
-    "pulseaudio#microphone",
+	"custom/separator#blank_2",
+	"group/audio",
+	"custom/separator#blank_2",
     "keyboard-state",
     "custom/power",
     ],
diff --git a/config/waybar/configs/Top & Right b/config/waybar/configs/Top & Right
index 1be4897..065a995 100644
--- a/config/waybar/configs/Top & Right	
+++ b/config/waybar/configs/Top & Right	
@@ -19,10 +19,8 @@
     
 "modules-left": [
     "custom/menu",
-    "cpu",
-    "temperature", 
-    "memory",
-    "disk",
+	"custom/separator#blank_2",
+	"group/motherboard",
     ],
     
 "modules-center": [
@@ -31,14 +29,12 @@
 	],
     
 "modules-right": [
-    //"network",
-    //"bluetooth",
+    "network",
+    "bluetooth",
 	"custom/weather",
-    "battery", 
-    "backlight",
-    "pulseaudio",
-    //"wireplumber", 
-    "pulseaudio#microphone",
+	"custom/separator#blank_2",
+	"group/audio",
+	"custom/separator#blank_2",
     "keyboard-state",
     "custom/power",
     ],
diff --git a/config/waybar/modules b/config/waybar/modules
index ae9b3c5..4c58e3c 100644
--- a/config/waybar/modules
+++ b/config/waybar/modules
@@ -512,22 +512,19 @@
 // Modules below are for vertical layout
 
 "backlight#vertical": {
-  "interval": 2,
-  "align": 0,
-  "rotate": 0,
-  "format": "{icon}",
-  "format-icons": ["󰛩", "󱩎", "󱩏", "󱩑", "󱩒", "󱩓", "󱩔", "󱩕", "󰛨"],
-  "tooltip-format": "{percent}%",
-  "icon-size": 10,
-  "on-update": "",
-  "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}",
+    "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": {
diff --git a/config/waybar/style/Pywal.css b/config/waybar/style/Pywal.css
index 5980492..7a50f8a 100644
--- a/config/waybar/style/Pywal.css
+++ b/config/waybar/style/Pywal.css
@@ -77,12 +77,16 @@ tooltip {
     padding: 2px;
     color: @foreground;
     margin-right: 5px;
+    animation: gradient_f 20s ease-in infinite;
+    transition: all 0.5s cubic-bezier(.55,-0.68,.48,1.682);
 }
 
 #workspaces button.active {
     color: @foreground;
     border-radius: 40%;
     background-color: @color0;
+    animation: gradient_f 20s ease-in infinite;
+    transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
 }
 
 #workspaces button.focused {
@@ -97,6 +101,8 @@ tooltip {
 #workspaces button:hover {
     color: @color4;
     border-radius: 15px;
+    animation: gradient_f 20s ease-in infinite;
+    transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
 }
 
 #clock#2 {
diff --git a/config/waybar/style/Rose-Pine.css b/config/waybar/style/Rose-Pine.css
index 4e971a3..7d9f79c 100644
--- a/config/waybar/style/Rose-Pine.css
+++ b/config/waybar/style/Rose-Pine.css
@@ -27,7 +27,7 @@ window#waybar {
 tooltip {
     background: @main-bg;
     color: @main-fg;
-    border-radius: 7px;
+    border-radius: 8px;
     border-width: 0px;
 }
 
@@ -145,7 +145,6 @@ tooltip {
     color: @main-fg;
     background: @main-bg;
     opacity: 1;
-    margin: 4px 0px 4px 0px;
 	padding-top: 2px;
 	padding-bottom: 2px;
     padding-left: 6px;
diff --git a/config/waybar/style/Simple Pink.css b/config/waybar/style/Simple Pink.css
index 75e45b9..d2a85d7 100644
--- a/config/waybar/style/Simple Pink.css	
+++ b/config/waybar/style/Simple Pink.css	
@@ -145,6 +145,7 @@ tooltip {
 #custom-weather.sunnyDay {
 	color: whitesmoke;
 	padding: 0px 10px;
+	margin: 3px;
 
 }