diff --git a/config/waybar/configs/Simple-L [TOP] b/config/waybar/configs/Simple-L [TOP]
index d94ecda..b22d0a7 100644
--- a/config/waybar/configs/Simple-L [TOP]	
+++ b/config/waybar/configs/Simple-L [TOP]	
@@ -9,7 +9,7 @@
 "exclusive": true,
 "passthrough": false,
 "position": "top",
-"spacing": 3,
+"spacing": 6,
 "fixed-center": true,
 "ipc": true,
 "margin-top": 6,
@@ -17,21 +17,23 @@
 "margin-right": 8,
 
 "modules-left": [
-	"custom/menu", 
+	"custom/menu",
+	"custom/separator#blank_2", 
 	"hyprland/workspaces",
+	"custom/separator#blank_2",
+	"tray",
 	],
 "modules-center": [
 	"clock",
-	"custom/light_dark",
 	],
 "modules-right": [
-	"backlight",
-	"keyboard-state", 
-	"pulseaudio", 
-	"bluetooth", 
-	"network", 
-	"battery",
+	"temperature",
+	"custom/separator#blank_2",
+	"group/laptop",
+	"custom/separator#blank_2",
+	"group/audio",
+	"custom/separator#blank_2",
+	"custom/power",
 	],
 
-
 }
\ No newline at end of file
diff --git a/config/waybar/modules b/config/waybar/modules
index 94d9b1d..ae9b3c5 100644
--- a/config/waybar/modules
+++ b/config/waybar/modules
@@ -98,6 +98,35 @@
     "default": "",
 	},
 },
+
+// GROUP
+
+"group/motherboard": {
+	"orientation": "horizontal",
+	"modules": [
+		"cpu",
+		"memory",
+		"temperature",
+		"disk",
+		]	
+},
+
+"group/laptop": {
+	"orientation": "horizontal",
+	"modules": [
+		"backlight",
+		"battery",
+		]	
+},
+
+"group/audio": {
+	"orientation": "horizontal",
+	"modules": [
+		"pulseaudio",
+		"pulseaudio#microphone",
+		]	
+},
+
 "backlight": {
   "interval": 2,
   "align": 0,
@@ -342,7 +371,7 @@
 },
     
 "tray": {
-  //"icon-size": 17,
+  "icon-size": 17,
   "spacing": 8,
 },
     
@@ -468,6 +497,18 @@
   "tooltip": false
 },
 
+"custom/separator#blank": {
+  "format": "",
+  "interval": "once",
+  "tooltip": false
+},
+
+"custom/separator#blank_2": {
+  "format": "  ",
+  "interval": "once",
+  "tooltip": false
+},
+
 // Modules below are for vertical layout
 
 "backlight#vertical": {
@@ -572,5 +613,7 @@
   "on-click": "~/.config/hypr/scripts/Wlogout.sh",
   "on-click-right": "~/.config/hypr/scripts/ChangeBlur.sh",
 },
+
+
 }