diff --git a/home/file/waybar/config/default.nix b/home/file/waybar/config/default.nix
index 3c73d018..81348013 100644
--- a/home/file/waybar/config/default.nix
+++ b/home/file/waybar/config/default.nix
@@ -92,8 +92,10 @@ in {
 		"group/batteryinfo" = {
 			orientation = "horizontal";
 			modules = [
+				"custom/tagbat1"
 				"battery"
 				"custom/powerlimit"
+				"custom/tagbat2"
 			];
 		};
 		pulseaudio = {
@@ -125,14 +127,21 @@ in {
 				"paused" = "";
 			};
 		};
-		cpu = {
-			format          = "{usage}% ({load})";
+		"cpu#usage" = {
+			format          = "{usage}%";
 			interval        = refreshInterval;
 			on-click        = "foot -e bash -c btop";
 			on-click-right  = "powersave toggle";
 			states.critical = 100;
 			tooltip         = false;
 		};
+		"cpu#load" = {
+			format          = "({load})";
+			interval        = refreshInterval;
+			on-click        = "foot -e bash -c btop";
+			on-click-right  = "powersave toggle";
+			tooltip         = false;
+		};
 		memory = {
 			format          = "{percentage}%";
 			interval        = refreshInterval;
@@ -160,12 +169,13 @@ in {
 		"group/hardware" = {
 			orientation = "horizontal";
 			modules = [
-				"custom/tag1"
-				"cpu"
+				"custom/taghw1"
+				"cpu#usage"
+				"cpu#load"
 				"temperature"
 				"memory"
 				"custom/powersave"
-				"custom/tag2"
+				"custom/taghw2"
 			];
 		};
 		"custom/display" = {
@@ -176,10 +186,16 @@ in {
 			return-type     = "json";
 			signal          = 4;
 		};
-		"custom/tag1" = {
+		"custom/taghw1" = {
 			exec = "echo ​";
 		};
-		"custom/tag2" = {
+		"custom/taghw2" = {
+			exec = "echo ​";
+		};
+		"custom/tagbat1" = {
+			exec = "echo ​";
+		};
+		"custom/tagbat2" = {
 			exec = "echo ​";
 		};
 	};
diff --git a/home/file/waybar/style/Plugin.nix b/home/file/waybar/style/Plugin.nix
index af7fab21..1f061922 100644
--- a/home/file/waybar/style/Plugin.nix
+++ b/home/file/waybar/style/Plugin.nix
@@ -10,13 +10,13 @@ in {
 	# instead of the whole group.
 	text = ''
 		/* See the ISSUE above. */
-		#custom-tag1,
-		#battery {
+		#custom-taghw1,
+		#custom-tagbat1 {
 			padding-left: ${paddingH};
 		}
 
-		#custom-tag2,
-		#custom-powerlimit {
+		#custom-taghw2,
+		#custom-tagbat2 {
 			padding-right: ${paddingH};
 		}
 
@@ -32,6 +32,7 @@ in {
 		}
 
 		/* Padding for combined widgets. */
+		#cpu.load,
 		#custom-powerlimit,
 		#custom-powersave,
 		#memory,
@@ -55,7 +56,7 @@ in {
 
 		/* Critical state. */
 		#battery,
-		#cpu,
+		#cpu.usage,
 		#custom-display,
 		#memory,
 		#pulseaudio,
@@ -66,7 +67,7 @@ in {
 		}
 
 		#battery.critical,
-		#cpu.critical,
+		#cpu.usage.critical,
 		#custom-display.modified,
 		#memory.critical,
 		#pulseaudio.muted,
diff --git a/host/x86_64-linux/work/default.nix b/host/x86_64-linux/work/default.nix
index 7a43b0d4..5615c11c 100644
--- a/host/x86_64-linux/work/default.nix
+++ b/host/x86_64-linux/work/default.nix
@@ -11,7 +11,7 @@
 
 	module = {
 		builder.client.enable      = true;
-		display.primary            = "DSI-1";
+		display.primary            = "eDP-1";
 		package.extra              = true;
 		powerlimit.thinkpad.enable = true;
 		print.enable               = true;