diff --git a/home/environments/hyprland/waybar.nix b/home/environments/hyprland/waybar.nix
index ad57d8eb..499628c4 100644
--- a/home/environments/hyprland/waybar.nix
+++ b/home/environments/hyprland/waybar.nix
@@ -80,7 +80,7 @@ window#waybar.empty #window {
   margin: 0px;
 }
 
-#mode, #clock, #battery, #idle_inhibitor, #tray, #wireplumber, #bluetooth, #mpris {
+#mode, #clock, #battery, #idle_inhibitor, #tray, #wireplumber, #bluetooth, #backlight, #mpris {
     padding: 0 5px;
     margin: 0 5px;
 }
@@ -110,8 +110,6 @@ window#waybar.empty #window {
 }
 
 #battery {
-    background-color: #ffffff;
-    color: black;
 }
 
 #battery.charging {
@@ -157,21 +155,48 @@ window#waybar.empty #window {
         "wireplumber"
         "idle_inhibitor"
         "power-profiles-daemon"
+        "backlight"
         "battery"
         "tray"
       ];
 
+      idle_inhibitor = {
+        format = "idin {icon}";
+        format-icons = {
+          activated = "active";
+          deactivated = "inactive";
+        };
+      };
+
       bluetooth = {
         on-click = "blueman-manager";
-        format = " {status}";
-        format-connected-battery = " {device_alias} {device_battery_percentage}%";
-        format-connected = " {num_connections} connected";
+        format = "bt {status}";
+        format-connected-battery = "bt {device_alias} {device_battery_percentage}%";
+        format-connected = "bt {num_connections} connected";
         tooltip-format = "{controller_alias}\t{controller_address}\n\n{num_connections} connected";
         tooltip-format-connected = "{controller_alias}\t{controller_address}\n\n{num_connections} connected\n\n{device_enumerate}";
         tooltip-format-enumerate-connected = "{device_alias}\t{device_address}";
         tooltip-format-enumerate-connected-battery = "{device_alias}\t{device_address}\t{device_battery_percentage}%";
       };
 
+      wireplumber = {
+        format = "vol {volume}%";
+        max-volume = 150;
+      };
+      backlight = {
+        format = "bl {percent}%";
+      };
+      battery = {
+        format = "bat {capacity}%";
+        format-tooltip = "{power}W, {timeTo}, {health}%";
+        interval = 60;
+
+        states = {
+          warning = 30;
+          critical = 15;
+        };
+      };
+
       tray = {
         spacing = 4;
       };
diff --git a/systems/daiyousei.nix b/systems/daiyousei.nix
index b2a8774a..8763fa53 100644
--- a/systems/daiyousei.nix
+++ b/systems/daiyousei.nix
@@ -16,7 +16,7 @@ _: let
       ])
       ++ (with tree.nixos.servers; [
         weechat
-        matrix
+        #matrix
         postgres
         web
       ]);
diff --git a/systems/koishi.nix b/systems/koishi.nix
index a774ba61..f3ac9c07 100644
--- a/systems/koishi.nix
+++ b/systems/koishi.nix
@@ -51,9 +51,11 @@ _: let
       swapDevices = [
         {device = "/dev/disk/by-uuid/7486e618-214b-47ff-87a7-0d53099a05b4";}
       ];
-      home-manager.users.kat.wayland.windowManager.hyprland.settings.monitor = [
-        "eDP-1, preferred, 0x0, 1"
-      ];
+      home-manager.users.kat = {
+        wayland.windowManager.hyprland.settings.monitor = [
+          "eDP-1, preferred, 0x0, 1"
+        ];
+      };
       boot = {
         initrd.luks.devices."cryptmapper".device = "/dev/disk/by-uuid/16296ac6-b8b2-4c4e-94f6-c06ea84d6fbb";
         loader.grub.useOSProber = true;