diff --git a/modules/waybar/clock.nix b/modules/waybar/clock.nix
index 51a3ea7..157c320 100644
--- a/modules/waybar/clock.nix
+++ b/modules/waybar/clock.nix
@@ -8,7 +8,7 @@ in
     enable = lib.mkEnableOption "enable ${name} waybar module";
   };
   config = lib.mkIf config.modules.waybar.${name}.enable {
-    programs.waybar.settings.mainbar.${name} = {
+    programs.waybar.settings.mainBar.${name} = {
       tooltip-format = "<big>{:%Y %B}</big>\n\n{calendar}";
       interval = 1;
       format = "{:%H:%M:%S}";
diff --git a/modules/waybar/cpu.nix b/modules/waybar/cpu.nix
index f0e53b2..cf20ba2 100644
--- a/modules/waybar/cpu.nix
+++ b/modules/waybar/cpu.nix
@@ -8,7 +8,7 @@ in
     enable = lib.mkEnableOption "enable ${name} waybar module";
   };
   config = lib.mkIf config.modules.waybar.${name}.enable {
-    programs.waybar.settings.mainbar."${name}" = {
+    programs.waybar.settings.mainBar."${name}" = {
       format = "cpu: {usage}%";
       tooltip = false;
     };
diff --git a/modules/waybar/memory.nix b/modules/waybar/memory.nix
index 134431c..e5171bc 100644
--- a/modules/waybar/memory.nix
+++ b/modules/waybar/memory.nix
@@ -8,7 +8,7 @@ in
     enable = lib.mkEnableOption "enable ${name} waybar module";
   };
   config = lib.mkIf config.modules.waybar.${name}.enable {
-    programs.waybar.settings.mainbar."${name}" = {
+    programs.waybar.settings.mainBar."${name}" = {
       format = "mem: {}%";
       tooltip = false;
     };
diff --git a/modules/waybar/network.nix b/modules/waybar/network.nix
index 8fd8fa2..1c10421 100644
--- a/modules/waybar/network.nix
+++ b/modules/waybar/network.nix
@@ -8,7 +8,7 @@ in
     enable = lib.mkEnableOption "enable ${name} waybar module";
   };
   config = lib.mkIf config.modules.waybar.${name}.enable {
-    programs.waybar.settings.mainbar."${name}" = {
+    programs.waybar.settings.mainBar."${name}" = {
       format-wifi = "{essid} ({signalStrength}%) 󰖩";
       format-ethernet = "{ipaddr}/{cidr} 󰛳";
       tooltip-format = "{ifname} via {gwaddr} 󰛳";
diff --git a/modules/waybar/power.nix b/modules/waybar/power.nix
index d6c40e9..3b3e2c1 100644
--- a/modules/waybar/power.nix
+++ b/modules/waybar/power.nix
@@ -12,7 +12,7 @@ in
   ];
   config = lib.mkIf config.modules.waybar.${name}.enable {
     modules.wofi.enable = true;
-    programs.waybar.settings.mainbar."${name}" = {
+    programs.waybar.settings.mainBar."${name}" = {
       format = "";
       on-click = "wofi-power";
       # on-click-right = "swaylock"; # TODO: change to whatever lock screen i want
diff --git a/modules/waybar/temperature.nix b/modules/waybar/temperature.nix
index 3d10984..0534414 100644
--- a/modules/waybar/temperature.nix
+++ b/modules/waybar/temperature.nix
@@ -8,7 +8,7 @@ in
     enable = lib.mkEnableOption "enable ${name} waybar module";
   };
   config = lib.mkIf config.modules.waybar.${name}.enable {
-    programs.waybar.settings.mainbar."${name}" = {
+    programs.waybar.settings.mainBar."${name}" = {
       thermal-zone = 2;
       hwmon-path = "/sys/class/hwmon/hwmon3/temp1_input";
       critical-threshold = 80;
diff --git a/modules/waybar/tray.nix b/modules/waybar/tray.nix
index 279265a..f87c976 100644
--- a/modules/waybar/tray.nix
+++ b/modules/waybar/tray.nix
@@ -8,7 +8,7 @@ in
     enable = lib.mkEnableOption "enable ${name} waybar module";
   };
   config = lib.mkIf config.modules.waybar.${name}.enable {
-    programs.waybar.settings.mainbar."${name}" = {
+    programs.waybar.settings.mainBar."${name}" = {
       spacing = 10;
     };
   };
diff --git a/modules/waybar/vpn.nix b/modules/waybar/vpn.nix
index da226b3..3991fd3 100644
--- a/modules/waybar/vpn.nix
+++ b/modules/waybar/vpn.nix
@@ -8,7 +8,7 @@ in
     enable = lib.mkEnableOption "enable ${name} waybar module";
   };
   config = lib.mkIf config.modules.waybar.${name}.enable {
-    programs.waybar.settings.mainbar."${name}" = {
+    programs.waybar.settings.mainBar."${name}" = {
       format = "VPN";
       exec = "echo '{\"class\": \"connected\"}'";
       exec-if = "test -d /proc/sys/net/ipv4/conf/tun0";
diff --git a/modules/waybar/window.nix b/modules/waybar/window.nix
index b2739bb..86c3e49 100644
--- a/modules/waybar/window.nix
+++ b/modules/waybar/window.nix
@@ -8,7 +8,7 @@ in
     enable = lib.mkEnableOption "enable ${name} waybar module";
   };
   config = lib.mkIf config.modules.waybar.${name}.enable {
-    programs.waybar.settings.mainbar."${name}" = {
+    programs.waybar.settings.mainBar."${name}" = {
       max-length = 36;
     };
   };
diff --git a/modules/waybar/wireplumber.nix b/modules/waybar/wireplumber.nix
index bdf5f19..4c6e1bc 100644
--- a/modules/waybar/wireplumber.nix
+++ b/modules/waybar/wireplumber.nix
@@ -8,7 +8,7 @@ in
     enable = lib.mkEnableOption "enable ${name} waybar module";
   };
   config = lib.mkIf config.modules.waybar.${name}.enable {
-    programs.waybar.settings.mainbar."${name}" = {
+    programs.waybar.settings.mainBar."${name}" = {
       format = "{volume}% {icon}";
       format-muted = "";
       on-click = "helvum";
diff --git a/modules/waybar/workspaces.nix b/modules/waybar/workspaces.nix
index 50051ce..8901bcc 100644
--- a/modules/waybar/workspaces.nix
+++ b/modules/waybar/workspaces.nix
@@ -8,7 +8,7 @@ in
     enable = lib.mkEnableOption "enable ${name} waybar module";
   };
   config = lib.mkIf config.modules.waybar.${name}.enable {
-    programs.waybar.settings.mainbar."${name}" = {
+    programs.waybar.settings.mainBar."${name}" = {
       format = "{name}";
       on-click = "activate";
       sort-by = "id";