diff --git a/home.nix b/home.nix
index 011fd1d..527142c 100644
--- a/home.nix
+++ b/home.nix
@@ -115,6 +115,7 @@
 		ncurses
 		rustup
 		wayvnc
+		power-profiles-daemon
 	];
 	programs.wofi = {
 		enable = true;
diff --git a/includes/waybar.nix b/includes/waybar.nix
index c0926aa..c4d39e0 100644
--- a/includes/waybar.nix
+++ b/includes/waybar.nix
@@ -19,32 +19,179 @@
 					"memory"
 					"temperature"
 					"backlight"
-					"keyboard-state"
+					# "keyboard-state"
 					"battery"
 					"tray"
 					"clock"
 					"custom/power"
 				];
-
 				"hyprland/workspaces" = {
 					format = "{name}";
 				};
 				"hyprland/window" = {
 					max-length = 50;
 				};
-				clock = {
-					format = "{:%Y-%m-%d %H:%M}";
-					tooltip = false;
+				"keyboard-state"= {
+					"numlock"= true;
+					"capslock"= true;
+					"format"= "{name} {icon}";
+					"format-icons"= {
+						"locked"= "";
+						"unlocked"= "";
+					};
 				};
-				cpu = { format = "{usage}%"; };
-				memory = { format = "{}%"; };
-				network = {
-					format-wifi = "{essid} ({signalStrength}%)";
-					format-ethernet = "{ifname}: {ipaddr}/{cidr}";
+				"sway/mode"= {
+					"format"= "<span style=\"italic\">{}</span>";
 				};
-				battery = {
-					format = "{capacity}%";
-					format-charging = "⚡ {capacity}%";
+				"sway/scratchpad"= {
+					"format"= "{icon} {count}";
+					"show-empty"= false;
+					"format-icons"= ["" ""];
+					"tooltip"= true;
+					"tooltip-format"= "{app}: {title}";
+				};
+				"mpd"= {
+					"format"= "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) ⸨{songPosition}|{queueLength}⸩% ";
+					"format-disconnected"= "Disconnected ";
+					"format-stopped"= "{consumeIcon}{randomIcon}{repeatIcon}{singleIcon}Stopped ";
+					"unknown-tag"= "N/A";
+					"interval"= 5;
+					"consume-icons"= {
+						"on"= " ";
+					};
+					"random-icons"= {
+						"off"= "<span color=\"#f53c3c\"></span> ";
+						"on"= " ";
+					};
+					"repeat-icons"= {
+						"on"= " ";
+					};
+					"single-icons"= {
+						"on"= "1 ";
+					};
+					"state-icons"= {
+						"paused"= "";
+						"playing"= "";
+					};
+					"tooltip-format"= "MPD (connected)";
+					"tooltip-format-disconnected"= "MPD (disconnected)";
+					"on-click"= "pwvucontrol";
+				};
+				"idle_inhibitor"= {
+					"format"= "{icon}";
+					"format-icons"= {
+						"activated"= "";
+						"deactivated"= "";
+					};
+				};
+				"tray"= {
+					"icon-size"= 21;
+					"spacing"= 10;
+				};
+				"clock"= {
+					"timezone"= "America/New_York";
+					"tooltip-format"= "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>";
+					"format-alt"= "{:%Y-%m-%d}";
+				};
+				"cpu"= {
+					"format"= "{usage}% ";
+					"tooltip"= false;
+				};
+				"memory"= {
+					"format"= "{}% ";
+				};
+				"temperature"= {
+					"thermal-zone"= 2;
+					"hwmon-path"= "/sys/class/hwmon/hwmon2/temp1_input";
+					"critical-threshold"= 80;
+					"format-critical"= "{temperatureC}°C {icon}";
+					"format"= "{temperatureC}°C {icon}";
+					"format-icons"= ["" "" ""];
+				};
+				"backlight"= {
+					"device"= "acpi_video1";
+					"format"= "{percent}% {icon}";
+					"format-icons"= ["" "" "" "" "" "" "" "" ""];
+				};
+				"battery"= {
+					"states"= {
+						"good"= 95;
+						"warning"= 20;
+						"critical"= 15;
+					};
+					"format"= "{capacity}% 󰂌 ";
+					"format-full"= "{capacity}% {icon} ";
+					"format-charging"= "{capacity}% {icon} ";
+					"format-plugged"= "{capacity}%  ";
+					"format-alt"= "{time} {icon} ";
+					"format-good"= "";
+					"format-icons"= ["" "" "" "" ""];
+				};
+				"battery#bat2"= {
+					"bat"= "BAT2";
+				};
+				"power-profiles-daemon"= {
+					"format"= "{icon}";
+					"tooltip-format"= "Power profile: {profile}\nDriver: {driver}";
+					"tooltip"= true;
+					"format-icons"= {
+						"default"= "";
+						"performance"= "";
+						"balanced"= "";
+						"power-saver"= "";
+					};
+				};
+				"network"= {
+					"interface"= "wlp2*";
+					"format-wifi"= "{essid} ({signalStrength}%) ";
+					"format-ethernet"= "{ipaddr}/{cidr} 󰛳";
+					"tooltip-format"= "{ifname} via {gwaddr} 󱦂";
+					"format-linked"= "{ifname} (No IP) ";
+					"format-disconnected"= "Disconnected ";
+					"format-alt"= "{ifname}: {ipaddr}/{cidr}";
+				};
+				"pulseaudio"= {
+					"scroll-step"= 1;
+					"format"= "{volume}% {icon} {format_source}";
+					"format-bluetooth"= "{volume}% {icon} {format_source}";
+					"format-bluetooth-muted"= " {icon} {format_source}";
+					"format-muted"= " {format_source}";
+					"format-source"= "{volume}% ";
+					"format-source-muted"= "";
+					"format-icons"= {
+						"headphone"= "";
+						"hands-free"= "󱡏";
+						"headset"= "󰋎";
+						"phone"= "";
+						"portable"= "";
+						"car"= "";
+						"default"= ["" "" ""];
+					};
+					"on-click"= "pwvucontrol";
+				};
+				"custom/media"= {
+					"format"= "{icon} {text}";
+					"return-type"= "json";
+					"max-length"= 40;
+					"format-icons"= {
+						"spotify"= "";
+						"default"= "";
+					};
+					"escape"= true;
+					"exec"= "$HOME/.config/waybar/mediaplayer.py 2> /dev/null";
+				};
+				"custom/power"= {
+					"format" = "⏻ ";
+					"tooltip"= false;
+					"menu"= "on-click";
+					"menu-file"= "$HOME/.config/waybar/power_menu.xml";
+					"menu-actions"= {
+						"shutdown"= "shutdown";
+						"reboot"= "reboot";
+						"suspend"= "systemctl suspend";
+						"hibernate"= "systemctl hibernate";
+						"lock"= "loginctl lock-session";
+					};
 				};
 			};
 		};
@@ -52,7 +199,7 @@
 			* {
 				/* `otf-font-awesome` is required to be installed for icons */
 color: #565f89;
-			 font-family: 'Font Awesome 6 Free Solid', Roboto, Helvetica, Arial, sans-serif;
+			 font-family: FontAwesome, Roboto, Helvetica, Arial, sans-serif;
 			 font-size: 15px;
 			 border-radius: 10px;
 margin: 0px 5px 0px 5px;