diff --git a/configuration.nix b/configuration.nix
index 76aff7a..02994d5 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -656,7 +656,7 @@ valign = bottom
 				margin-bottom = 0;
 				modules-left = ["pulseaudio"];
 				modules-center = ["clock"];
-				modules-right = [];
+				modules-right = ["cpu" "memory"];
 
 				"clock" = {
 					format = "{:%d/%m/%Y   %I:%M:%S}  ";
@@ -804,9 +804,10 @@ valign = bottom
                       #memory {
 			color: #${BG};
 			background: #${ORANGE};
-			border-radius: ${CORNER_RADIUS}px;
-			margin: 5px;
-			padding: 2px 10px;
+			border-radius: 0px 0px ${CORNER_RADIUS}px ${CORNER_RADIUS}px;
+			margin: 0px;
+			padding: 0px 10px;
+			border: 2px solid #${FG};
                       }
 
                       #clock {
@@ -820,10 +821,11 @@ valign = bottom
 
                       #cpu {
 			color: #${BG};
-			background: #${BLUE};
-			border-radius: ${CORNER_RADIUS}px;
-			margin: 5px;
-			padding: 2px 10px;
+			background: #${GREEN};
+			border-radius: 0px 0px ${CORNER_RADIUS}px ${CORNER_RADIUS}px;
+			margin: 0px;
+			padding: 0px 10px;
+			border: 2px solid #${FG};
                       }
 
                       #network {
diff --git a/nixos-switch.log b/nixos-switch.log
index 82d57a4..301c735 100644
--- a/nixos-switch.log
+++ b/nixos-switch.log
@@ -1,49 +1,28 @@
 building Nix...
 building the system configuration...
 trace: warning: The option `services.xserver.displayManager.defaultSession' defined in `/etc/nixos/configuration.nix' has been renamed to `services.displayManager.defaultSession'.
-these 17 derivations will be built:
-  /nix/store/jfxhcgd80arqb5vlsra731j5431c1vmz-system-path.drv
-  /nix/store/8crrcpfk3vr0k02qih6km773pzd5l39p-dbus-1.drv
-  /nix/store/8n7zw4kwc19x30njz2xyv0hg1bsriwi3-unit-accounts-daemon.service.drv
-  /nix/store/nv6jpyw489y1y6xkg1xj763qqccs58s9-X-Restart-Triggers-dbus.drv
-  /nix/store/ifjdqxphqdlbqzk36bvhd5cz7qxg1l9b-unit-dbus.service.drv
-  /nix/store/g6kgl8lqqljw9kvq20ahd74rwpxccpbb-hm_hyprhyprland.conf.drv
-  /nix/store/gdwfx50dzwlid56rx0m8wvjym4ya751r-home-manager-files.drv
-  /nix/store/nhqxmfm3hv6hi4790gyy9bqjcn677i32-activation-script.drv
-  /nix/store/j7jm2aidgawav8vwpr8782n8m72l0g9i-home-manager-generation.drv
-  /nix/store/jiznf41xaxf3ida89p0grv8v59mcsxzv-unit-home-manager-deadvey.service.drv
-  /nix/store/cnap1abm5mvggnvnsqa27q63fdv5pa6d-X-Restart-Triggers-polkit.drv
-  /nix/store/v4mv6afvazrkk2p9ryjm8k36qcr9n2s3-unit-polkit.service.drv
-  /nix/store/9crqqbr2yhaqsdxzizm6yabm8zcg9zb1-system-units.drv
-  /nix/store/a2b5582g9p43kwzyrx2k1lpq5j88w4p9-unit-dbus.service.drv
-  /nix/store/bazz60kivs7p4ff824rkm19bx9r01za0-user-units.drv
-  /nix/store/wzzificsj17vicvmk94mkn7hha271bnz-etc.drv
-  /nix/store/73xrxsarifbziygafjzzz0cmhr95x2cp-nixos-system-nixos-24.05.3642.883180e6550c.drv
-building '/nix/store/jfxhcgd80arqb5vlsra731j5431c1vmz-system-path.drv'...
-building '/nix/store/g6kgl8lqqljw9kvq20ahd74rwpxccpbb-hm_hyprhyprland.conf.drv'...
-building '/nix/store/nhqxmfm3hv6hi4790gyy9bqjcn677i32-activation-script.drv'...
-building '/nix/store/gdwfx50dzwlid56rx0m8wvjym4ya751r-home-manager-files.drv'...
-created 10132 symlinks in user environment
-building '/nix/store/j7jm2aidgawav8vwpr8782n8m72l0g9i-home-manager-generation.drv'...
-building '/nix/store/jiznf41xaxf3ida89p0grv8v59mcsxzv-unit-home-manager-deadvey.service.drv'...
-gtk-update-icon-cache: Cache file created successfully.
-building '/nix/store/cnap1abm5mvggnvnsqa27q63fdv5pa6d-X-Restart-Triggers-polkit.drv'...
-building '/nix/store/8crrcpfk3vr0k02qih6km773pzd5l39p-dbus-1.drv'...
-building '/nix/store/8n7zw4kwc19x30njz2xyv0hg1bsriwi3-unit-accounts-daemon.service.drv'...
-building '/nix/store/nv6jpyw489y1y6xkg1xj763qqccs58s9-X-Restart-Triggers-dbus.drv'...
-building '/nix/store/v4mv6afvazrkk2p9ryjm8k36qcr9n2s3-unit-polkit.service.drv'...
-building '/nix/store/a2b5582g9p43kwzyrx2k1lpq5j88w4p9-unit-dbus.service.drv'...
-building '/nix/store/ifjdqxphqdlbqzk36bvhd5cz7qxg1l9b-unit-dbus.service.drv'...
-building '/nix/store/bazz60kivs7p4ff824rkm19bx9r01za0-user-units.drv'...
-building '/nix/store/9crqqbr2yhaqsdxzizm6yabm8zcg9zb1-system-units.drv'...
-building '/nix/store/wzzificsj17vicvmk94mkn7hha271bnz-etc.drv'...
-building '/nix/store/73xrxsarifbziygafjzzz0cmhr95x2cp-nixos-system-nixos-24.05.3642.883180e6550c.drv'...
-stopping the following units: accounts-daemon.service
+these 9 derivations will be built:
+  /nix/store/580h1iyx0c3s06f9616mk1c7ha6cxxn0-waybar-config.json.drv
+  /nix/store/i29ka5cqc9f175sg5y4b0b2rrjvcqjqm-waybar-style.css.drv
+  /nix/store/ajd3mpj78z5pv868cbhh7s7sy6rhg129-home-manager-files.drv
+  /nix/store/blvq4k7y9nqzi2v5jn2gmanzh32x2hgx-activation-script.drv
+  /nix/store/ni5dg897qxph63n92wb4bjmbgcwf7r1n-home-manager-generation.drv
+  /nix/store/dl4yx9mg172z0wc18a4dbv3xdi2kzrcc-unit-home-manager-deadvey.service.drv
+  /nix/store/ampsbsjrix04q8k8ig7m4c9hmaw99p8n-system-units.drv
+  /nix/store/q9gddiycsv9xcnykcz9kaik2cgpnm2as-etc.drv
+  /nix/store/y9zz955b18bf5gn595vxhxpnkrm7bb1n-nixos-system-nixos-24.05.3642.883180e6550c.drv
+building '/nix/store/i29ka5cqc9f175sg5y4b0b2rrjvcqjqm-waybar-style.css.drv'...
+building '/nix/store/580h1iyx0c3s06f9616mk1c7ha6cxxn0-waybar-config.json.drv'...
+building '/nix/store/blvq4k7y9nqzi2v5jn2gmanzh32x2hgx-activation-script.drv'...
+building '/nix/store/ajd3mpj78z5pv868cbhh7s7sy6rhg129-home-manager-files.drv'...
+building '/nix/store/ni5dg897qxph63n92wb4bjmbgcwf7r1n-home-manager-generation.drv'...
+building '/nix/store/dl4yx9mg172z0wc18a4dbv3xdi2kzrcc-unit-home-manager-deadvey.service.drv'...
+building '/nix/store/ampsbsjrix04q8k8ig7m4c9hmaw99p8n-system-units.drv'...
+building '/nix/store/q9gddiycsv9xcnykcz9kaik2cgpnm2as-etc.drv'...
+building '/nix/store/y9zz955b18bf5gn595vxhxpnkrm7bb1n-nixos-system-nixos-24.05.3642.883180e6550c.drv'...
 activating the configuration...
 setting up /etc...
 reloading user units for lightdm...
 reloading user units for deadvey...
 restarting sysinit-reactivation.target
-reloading the following units: dbus.service
-restarting the following units: home-manager-deadvey.service, polkit.service
-starting the following units: accounts-daemon.service
+restarting the following units: home-manager-deadvey.service