diff --git a/defaults/xdg/waybar/config b/defaults/xdg/waybar/config
index 952ad75..763cdff 100644
--- a/defaults/xdg/waybar/config
+++ b/defaults/xdg/waybar/config
@@ -17,16 +17,16 @@
     "modules-right": [
         "tray",
         "mpris",
-        "custom/cpugov",
         "bluetooth",
         "group/sound",
         "backlight",
-        "group/battery",
+        "group/bat",
         "group/indicators"
     ],
     "group/indicators": {
         "orientation": "inherit",
         "modules": [
+            "custom/cpugov",
             "gamemode",
             //"custom/updates",
             "idle_inhibitor",
@@ -58,7 +58,7 @@
             "transition-left-to-right": true
         }
     },
-    "group/battery": {
+    "group/bat": {
         "orientation": "inherit",
         "modules": [
             "battery",
diff --git a/defaults/xdg/waybar/style.css b/defaults/xdg/waybar/style.css
index 3794e52..952f221 100644
--- a/defaults/xdg/waybar/style.css
+++ b/defaults/xdg/waybar/style.css
@@ -12,7 +12,7 @@ window#waybar {
     background: alpha(@theme_selected_fg_color, 0.2);
 }
 
-/* --- Main groups --- */
+/* --- Module areas --- */
 
 .modules-left {
     margin: 0;
@@ -32,18 +32,17 @@ window#waybar {
     border-radius: 0;
 }
 
-/* --- Default module box (top-level modules and groups) --- */
+/* --- Module boxes --- */
 
-.modules-left > widget > *,
-.modules-center > widget > *,
-.modules-right > widget > * {
+.modules-left>widget>*,
+.modules-center>widget>*,
+.modules-right>widget>* {
     padding: 0px 10px;
     border-radius: 4px;
     margin: 8px 2px;
     background-color: alpha(@theme_selected_bg_color, 0.05);
 }
 
-/* Exceptions: no box styling */
 #workspaces,
 #taskbar,
 #window {
@@ -53,8 +52,9 @@ window#waybar {
     background-color: transparent;
 }
 
-/* Group children: compact inside group box */
-widget widget > * {
+/* --- Group children --- */
+
+widget widget>* {
     padding: 0 6px;
     margin: 0;
     background-color: transparent;
@@ -110,12 +110,30 @@ widget widget > * {
     background-color: alpha(@theme_selected_bg_color, 0.5);
 }
 
-/* --- Misc --- */
+#pulseaudio.muted {
+    color: #cc3436;
+}
 
-#mpris {
-    border-radius: 0;
-    margin: 8px 10px 8px 0px;
-    padding: 0 10px;
+/* --- Battery --- */
+
+#battery {
+    padding: 0;
+}
+
+#battery.charging {
+    color: #2dcc36;
+}
+
+#battery.warning:not(.charging) {
+    color: #e6e600;
+}
+
+#battery.critical:not(.charging) {
+    color: #cc3436;
+}
+
+#custom-batsaver {
+    font-size: 10px;
 }
 
 /* --- Workspaces --- */
@@ -147,32 +165,6 @@ widget widget > * {
     text-shadow: inherit;
 }
 
-/* --- Indicators --- */
-
-#pulseaudio.muted {
-    color: #cc3436;
-}
-
-#battery.charging {
-    color: #2dcc36;
-}
-
-#battery.warning:not(.charging) {
-    color: #e6e600;
-}
-
-#battery.critical:not(.charging) {
-    color: #cc3436;
-}
-
-#temperature.critical {
-    color: #cc3436;
-}
-
-#idle_inhibitor.activated {
-    color: alpha(@theme_selected_bg_color, 0.9);
-}
-
 /* --- Taskbar --- */
 
 #taskbar {
@@ -203,6 +195,22 @@ widget widget > * {
     opacity: 1;
 }
 
+/* --- Misc --- */
+
+#mpris {
+    border-radius: 0;
+    margin: 8px 10px 8px 0px;
+    padding: 0 10px;
+}
+
+#temperature.critical {
+    color: #cc3436;
+}
+
+#idle_inhibitor.activated {
+    color: alpha(@theme_selected_bg_color, 0.9);
+}
+
 menu {
     border-radius: 4px;
 }