diff --git a/home/wayland/river/waybar/default.nix b/home/wayland/river/waybar/default.nix
index 013a415..03762ad 100644
--- a/home/wayland/river/waybar/default.nix
+++ b/home/wayland/river/waybar/default.nix
@@ -22,6 +22,7 @@ in {
       };
       "river/tags" = {
         num-tags = 5;
+        tag-labels = ["" "" "" "" ""];
       };
       "river/window" = {
         format = "{}";
@@ -30,27 +31,24 @@ in {
         interval = 10;
         format = "{}%";
         max-length = 10;
+        tooltip = false;
       };
       "memory" = {
         interval = 10;
         format = "{}%";
         max-length = 10;
+        tooltip = false;
       };
       "battery" = {
-        format = "{capacity}% {icon}";
-        format-icons = [
-          ""
-          ""
-          ""
-          ""
-          ""
-        ];
+        format = "{capacity}%";
         interval = 60;
+        tooltip = false;
       };
       "clock" = {
         interval = 60;
         format = "{:%H:%M}";
         max-length = 25;
+        tooltip = false;
       };
       "tray" = {
         icon-size = 21;
diff --git a/home/wayland/river/waybar/style.scss b/home/wayland/river/waybar/style.scss
index bc530ab..f8fdaf4 100644
--- a/home/wayland/river/waybar/style.scss
+++ b/home/wayland/river/waybar/style.scss
@@ -36,7 +36,7 @@ $crust:       #11111b;
 * {
   all: unset;
   font-family: JetBrainsMono Nerd Font;
-  font-size: 10px;
+  font-size: 13px;
   color: $text;
 }
 
@@ -47,17 +47,16 @@ window#waybar {
 #tags {
   button {
     padding: 0.5rem;
-    focused {
-      color: $overlay2;
-    }
-    urgent {
-      color: $red;
-    }
   }
-}
-
-#window {
-  
+  button.focused {
+    border-radius: 3px;
+    border: 1px solid;
+    border-color: $red;
+  }
+  button.urgent {
+    border-radius: 3px;
+    background-color: $red;
+  }
 }
 
 #cpu,