diff --git a/avizo.ini b/avizo.ini
index 12a344c..ad9d1ac 100644
--- a/avizo.ini
+++ b/avizo.ini
@@ -1,6 +1,6 @@
 [default]
 # The color of the notification background in format: rgba([0, 255], [0, 255], [0, 255], [0, 1]).
-background = rgba(48, 52, 70, 0.95)
+background = rgba(48, 52, 70, 0.8)
 
 # Sets the color of the notification border in format rgba([0, 255], [0, 255], [0, 255], [0, 1]).
 border-color = rgba(166, 209, 137, 1.0)
@@ -10,4 +10,4 @@ bar-fg-color = rgba(166, 200, 190, 1.0)
 
 # The color of the unfilled bar blocks in format rgba([0, 255], [0, 255], [0, 255], [0, 1]).
 # Defaults to 'background' with 2/3 brightness.
-bar-bg-color = rgba(129, 200, 190, 1.0)
+bar-bg-color = rgba(198, 208, 245, 0.8)
diff --git a/configuration.nix b/configuration.nix
index c458a26..630642d 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -2,7 +2,7 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
-{ pkgs, ... }: {
+{ pkgs, hyprland, ... }: {
   imports = [
     <home-manager/nixos>
     ./hardware-configuration.nix
@@ -16,7 +16,9 @@
   ];
 
   nix.settings = {
-    substituters = [ "https://hyprland.cachix.org" ];
+    substituters = [
+      "https://hyprland.cachix.org"
+    ];
     trusted-public-keys = [ "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" ];
 
   };
diff --git a/flake.nix b/flake.nix
index 39c95df..3dbd1b8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -7,7 +7,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };
-  outputs = { self, nixpkgs, hyprland, home-manager }: {
+  outputs = { self, nixpkgs, hyprland, home-manager }@inputs: {
     nixosConfigurations.bat = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       modules = [
@@ -15,11 +15,11 @@
         hyprland.nixosModules.default
         { programs.hyprland.enable = true; }
       ];
+      specialArgs = inputs;
     };
     homeConfigurations."zoe@bat" = home-manager.lib.homeManagerConfiguration {
       pkgs = nixpkgs.legacyPackages.x86_64-linux;
-
-      modules = [];
+      modules = [ ];
     };
   };
 }
diff --git a/services.nix b/services.nix
index 6e872bd..bf184b1 100644
--- a/services.nix
+++ b/services.nix
@@ -2,6 +2,7 @@
 {
   services = {
     syncthing.enable = true;
+    upower.enable = true;
     mullvad-vpn.enable = true;
     udisks2.enable = true;
     gnome.sushi.enable = true;
diff --git a/user.nix b/user.nix
index a734312..bf98f0c 100644
--- a/user.nix
+++ b/user.nix
@@ -1,4 +1,4 @@
-{ pkgs, users, config, ... }:
+{ pkgs, users, config, inputs, ... }:
 let
   unstable = import
     (builtins.fetchTarball https://github.com/nixos/nixpkgs/tarball/master)
@@ -57,7 +57,6 @@ in
       wl-clipboard
       wofi
       wofi-emoji
-      unstable.waybar
       avizo
       wdisplays
       
@@ -89,6 +88,7 @@ in
 
       # terminal
       kitty
+      dt-shell-color-scripts
 
       # window manager
       rofimoji
diff --git a/waybar/settings.nix b/waybar/settings.nix
index a07fd0e..d0e7983 100644
--- a/waybar/settings.nix
+++ b/waybar/settings.nix
@@ -1,20 +1,16 @@
-{ config, pkgs, ... }:
-let
-  unstable = import (builtins.fetchTarball https://github.com/nixos/nixpkgs/tarball/master)
-  { config = config.nixpkgs.config; };
-in
+{ config, pkgs, hyprland, ... }:
 {
   home-manager.users.zoe.programs.waybar = {
     enable = true;
-    package = unstable.waybar;
+    package = hyprland.packages.${pkgs.system}.waybar-hyprland;
     settings = {
       mainBar = {
         layer = "top";
         position = "top";
         height = 30;
         modules-left = [ "wlr/workspaces" "wlr/taskbar" "hyprland/submap" ];
-        modules-center = [ "clock" ];
-        modules-right = [ "battery" "clock" ];
+        modules-center = [ "mpris" ];
+        modules-right = [ "network" "upower" "clock" "tray" ];
         
         "wlr/taskbar" = {
           "format" = "{icon}";
@@ -27,14 +23,57 @@ in
         };
         
         "clock" = {
-          "format" = "{:%H:%M} ";
+          "format" = "{:%H:%M}";
         };
         
-        "battery" = {
-          "format" = "{capacity}{icon}";
-          "format-icons" = "['', '', '', '', '']";
+        "network" = {
+          format = "{essid}{signalStrength}";
+          format-disconnected = "NO NETWORK";
+          tooltip = "false";
+        };
+        
+        "upower" = {
+          "hide-if-empty" = "true";
+        };
+
+        "mpris" = {
+          "format" = "{status_icon} {artist} - {title}";
+          "status-icons" = {
+            "paused" = "paused!";
+            "playing" = "jamming!";
+          };
         };
       };
     };
+    style = ''
+    * {
+      font-family: "CaskaydiaCove Nerd Font";
+      font-size: 14px;
+      background: none;
+      color: #${config.color.foreground};
+      min-height: 24px;
+      padding: 0px 4px;
+      margin: 0;
+    }
+
+    window#waybar,
+    tooltip {
+      border-bottom: 2px solid #${config.color.green};
+      background: alpha(#${config.color.background}, 0.9);
+    }
+
+    #workspaces button:hover {
+      box-shadow: inherit;
+      text-shadow: inherit;
+    }
+    
+    #workspaces button.active label{
+      color: #${config.color.green};
+    }
+    
+    #submap {
+      color: #${config.color.red};
+    }
+    '';
   };
 }