diff --git a/private_dot_config/waybar/config.jsonc b/private_dot_config/waybar/config.jsonc
index 1f97217..de5754e 100644
--- a/private_dot_config/waybar/config.jsonc
+++ b/private_dot_config/waybar/config.jsonc
@@ -18,15 +18,12 @@
     "modules-right": [
         "mpd",
         "idle_inhibitor",
-        "pulseaudio",
         "backlight",
-        "tray",
-        "keyboard-state",
-        "sway/language",
-        "bluetooth",
+        "group/kbd",
         "group/nw",
         "group/hw",
         "group/power",
+        "group/misc",
         "clock",
         "custom/power"
     ],
@@ -47,15 +44,6 @@
     //         "default": ""
     //     }
     // },
-    "keyboard-state": {
-        "numlock": true,
-        "capslock": true,
-        "format": "{name} {icon}",
-        "format-icons": {
-            "locked": "",
-            "unlocked": ""
-        }
-    },
     "sway/mode": {
         "format": "<span style=\"italic\">{}</span>"
     },
@@ -99,33 +87,46 @@
             "deactivated": ""
         }
     },
-    "tray": {
-        // "icon-size": 21,
-        "spacing": 10
-    },
     "backlight": {
         // "device": "acpi_video1",
         "format": "{percent}% {icon}",
         "format-icons": ["", "", "", "", "", "", "", "", ""]
     },
-    "pulseaudio": {
-        // "scroll-step": 1, // %, can be a float
-        "format": "{volume}% {icon} {format_source}",
-        "format-bluetooth": "{volume}% {icon} {format_source}",
-        "format-bluetooth-muted": "󰗿 {icon} {format_source}",
-        "format-muted": " {format_source}",
-        "format-source": "{volume}% ",
-        "format-source-muted": "",
+    "group/kbd" : {
+        "orientation": "vertical",
+        "modules": [
+            "keyboard-state",
+            "sway/languague"
+        ]
+    },
+    "keyboard-state": {
+        "numlock": true,
+        "capslock": true,
+        "format": "{name} {icon}",
         "format-icons": {
-            "headphone": "",
-            "hands-free": "",
-            "headset": "",
-            "phone": "",
-            "portable": "",
-            "car": "",
-            "default": ["", "", ""]
-        },
-        "on-click": "pavucontrol"
+            "locked": "",
+            "unlocked": ""
+        }
+    },
+    "sway/languague": {
+
+    },
+    "group/nw": {
+        "orientation": "vertical",
+        "modules": [
+            "network",
+            "bluetooth"
+        ]
+    },
+    "network": {
+        //"interface": "wlp2*", // (Optional) To force the use of this interface
+        "family": "ipv4",
+        "format-wifi": "{essid} ({signalStrength}%) ",
+        "format-ethernet": "{ipaddr}/{cidr} ",
+        "tooltip-format": "{ifname} via {gwaddr} ",
+        "format-linked": "{ifname} (No IP) ",
+        "format-disconnected": "Disconnected ⚠",
+        "format-alt": "{ifname}: {ipaddr}/{cidr}"
     },
     "bluetooth": {
         "format": "󰂯 {status}",
@@ -138,32 +139,6 @@
         "tooltip-format": "{device_alias}: {device_address},{device_address_type}"
 
     },
-    "group/nw": {
-        "orientation": "vertical",
-        "modules": [
-            "network",
-            "network#wired"
-        ]
-    },
-    "network": {
-        "interface": "wlp2*", // (Optional) To force the use of this interface
-        "family": "ipv4",
-        "format-wifi": "{essid} ({signalStrength}%) ",
-        "format-ethernet": "{ipaddr}/{cidr} ",
-        "tooltip-format": "{ifname} via {gwaddr} ",
-        "format-linked": "{ifname} (No IP) ",
-        "format-disconnected": "Disconnected ⚠",
-        "format-alt": "{ifname}: {ipaddr}/{cidr}"
-    },
-    "network#wired": {
-        "interface": "enp*", // (Optional) To force the use of this interface
-        "family": "ipv4",
-        "format-ethernet": "{ipaddr}/{cidr} ",
-        "tooltip-format": "{ifname} via {gwaddr} ",
-        "format-linked": "{ifname} (No IP) ",
-        "format-disconnected": "Disconnected ⚠",
-        "format-alt": "{ifname}: {ipaddr}/{cidr}"
-    },
     "group/hw": {
         "orientation": "vertical",
         "modules": [
@@ -174,8 +149,8 @@
         "drawer": {
             "transition-duration": 500,
             "children-class": "not-power",
-            "transition-left-to-right": true,
-        },
+            "transition-left-to-right": true
+        }
     },
     "cpu": {
         "format": "{usage}% ",
@@ -227,6 +202,36 @@
         "power-saver": ""
       }
     },
+    "group/misc": {
+        "orientation": "vertical",
+        "modules": [
+            "tray",
+            "pulseaudio"
+        ]
+    },
+    "tray": {
+        // "icon-size": 21,
+        "spacing": 10
+    },
+    "pulseaudio": {
+        // "scroll-step": 1, // %, can be a float
+        "format": "{volume}% {icon} {format_source}",
+        "format-bluetooth": "{volume}% {icon} {format_source}",
+        "format-bluetooth-muted": "󰗿 {icon} {format_source}",
+        "format-muted": " {format_source}",
+        "format-source": "{volume}% ",
+        "format-source-muted": "",
+        "format-icons": {
+            "headphone": "",
+            "hands-free": "",
+            "headset": "",
+            "phone": "",
+            "portable": "",
+            "car": "",
+            "default": ["", "", ""]
+        },
+        "on-click": "pavucontrol"
+    },
     "clock": {
         // "timezone": "America/New_York",
         "format": "{0:%H:%M}\n{0:%Y-%m-%d}",
diff --git a/private_dot_config/waybar/style.css b/private_dot_config/waybar/style.css
index 0f38ba2..0e882d4 100644
--- a/private_dot_config/waybar/style.css
+++ b/private_dot_config/waybar/style.css
@@ -126,15 +126,6 @@ label:focus {
     background-color: #000000;
 }
 
-#cpu {
-    background-color: #2ecc71;
-    color: #000000;
-}
-
-#memory {
-    background-color: #9b59b6;
-}
-
 #disk {
     background-color: #964B00;
 }
@@ -143,28 +134,6 @@ label:focus {
     background-color: #90b1b1;
 }
 
-#network {
-    background-color: #2980b9;
-}
-
-#network.wired {
-    background-color: #2980b9;
-}
-
-#network.disconnected {
-    background-color: #f53c3c;
-}
-
-#pulseaudio {
-    background-color: #f1c40f;
-    color: #000000;
-}
-
-#pulseaudio.muted {
-    background-color: #90b1b1;
-    color: #2a5c45;
-}
-
 #wireplumber {
     background-color: #fff0f5;
     color: #000000;
@@ -188,27 +157,6 @@ label:focus {
     background-color: #ffa000;
 }
 
-#temperature {
-    background-color: #f0932b;
-}
-
-#temperature.critical {
-    background-color: #eb4d4b;
-}
-
-#tray {
-    background-color: #2980b9;
-}
-
-#tray > .passive {
-    -gtk-icon-effect: dim;
-}
-
-#tray > .needs-attention {
-    -gtk-icon-effect: highlight;
-    background-color: #eb4d4b;
-}
-
 #idle_inhibitor {
     background-color: #2d3436;
 }
@@ -235,30 +183,6 @@ label:focus {
     background-color: #51a37a;
 }
 
-#language {
-    background: #00b093;
-    color: #740864;
-    /*padding: 0 5px;
-    margin: 0 5px;*/
-    min-width: 16px;
-}
-
-#keyboard-state {
-    background: #97e1ad;
-    color: #000000;
-    /*padding: 0 0px;
-    margin: 0 5px;*/
-    min-width: 16px;
-}
-
-#keyboard-state > label {
-    /*padding: 0 5px;*/
-}
-
-#keyboard-state > label.locked {
-    background: rgba(0, 0, 0, 0.2);
-}
-
 #scratchpad {
     background: rgba(0, 0, 0, 0.2);
 }
@@ -287,6 +211,56 @@ label:focus {
     background-color: #0069d4;
 }
 
+#keyboard-state {
+    background: #97e1ad;
+    color: #000000;
+    min-width: 16px;
+}
+
+#keyboard-state > label.locked {
+    background: rgba(0, 0, 0, 0.2);
+}
+#keyboard-state > label.locked.numlock {
+    border-radius: 0 20px 20px 0px;
+}
+
+#keyboard-state > label.locked.capslock {
+    border-radius: 0 20px 20px 0px;
+}
+
+#language {
+    background: #00b093;
+    color: #740864;
+    /*padding: 0 5px;
+    margin: 0 5px;*/
+    min-width: 16px;
+}
+
+#network {
+    background-color: #2980b9;
+}
+
+#network.disconnected {
+    background-color: #f53c3c;
+}
+
+#cpu {
+    background-color: #2ecc71;
+    color: #000000;
+}
+
+#memory {
+    background-color: #9b59b6;
+}
+
+#temperature {
+    background-color: #f0932b;
+}
+
+#temperature.critical {
+    background-color: #eb4d4b;
+}
+
 #battery {
 background-color: #ffffff;
 color: #000000;
@@ -334,6 +308,29 @@ background-color: #2ecc71;
 color: #000000;
 }
 
+#pulseaudio {
+    background-color: #f1c40f;
+    color: #000000;
+}
+
+#pulseaudio.muted {
+    background-color: #90b1b1;
+    color: #2a5c45;
+}
+
+#tray {
+    background-color: #2980b9;
+}
+
+#tray > .passive {
+    -gtk-icon-effect: dim;
+}
+
+#tray > .needs-attention {
+    -gtk-icon-effect: highlight;
+    background-color: #eb4d4b;
+}
+
 #clock {
     background-color: #64727D;
 }