diff --git a/waybar/style.css b/waybar/style.css
index 3461a8f..70b64f8 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -62,12 +62,10 @@ button:hover {
 #battery,
 #cpu,
 #memory,
-#disk,
 #temperature,
 #backlight,
 #network,
 #pulseaudio,
-#wireplumber,
 #tray,
 #power-profiles-daemon,
 #mpd {
@@ -77,17 +75,26 @@ button:hover {
     border: 2px solid #81a1c1;
 }
 
+#clock:hover,
+#battery:hover,
+#power-profiles-daemon:hover,
+#network:hover,
+#pulseaudio:hover,
+#mpd:hover {
+    border: 2px solid #eceff4;
+}
+
 #window {
     margin: 0 4px;
 }
 
 /* If workspaces is the leftmost module, omit left margin */
-.modules-left > widget:first-child > #workspaces {
+.modules-left > widget:first-child > #tags {
     margin-left: 0;
 }
 
 /* If workspaces is the rightmost module, omit right margin */
-.modules-right > widget:last-child > #workspaces {
+.modules-right > widget:last-child > #tags {
     margin-right: 0;
 }