diff --git a/machines/enka/hyprland/default.nix b/machines/enka/hyprland/default.nix
index 8481477..22c6edc 100644
--- a/machines/enka/hyprland/default.nix
+++ b/machines/enka/hyprland/default.nix
@@ -25,7 +25,7 @@
       exec-once = wl-paste --type text  --watch cliphist store
       exec-once = wl-paste --type image --watch cliphist store
 
-      exec = pkill --signal SIGUSR2 waybar
+      exec = pkill waybar; waybar
     ''
     +
     ''
diff --git a/machines/enka/waybar/default.nix b/machines/enka/waybar/default.nix
index 0c1ee30..68a57c0 100644
--- a/machines/enka/waybar/default.nix
+++ b/machines/enka/waybar/default.nix
@@ -2,8 +2,6 @@
 
 homeConfiguration "nixos" {
   programs.waybar = with upkgs.theme.withHashtag; enabled {
-    systemd = enabled {};
-
     settings = [{
       layer  = "top";
       height = 2 * corner-radius;
@@ -138,23 +136,23 @@ homeConfiguration "nixos" {
         color: ${base05};
       }
 
-      #workspaces button:nth-child(1) {
+      #workspaces button:nth-child(1) button.has-window {
         color: ${base08};
       }
 
-      #workspaces button:nth-child(2) {
+      #workspaces button:nth-child(2) button.has-window {
         color: ${base09};
       }
 
-      #workspaces button:nth-child(3) {
+      #workspaces button:nth-child(3) button.has-window {
         color: ${base0A};
       }
 
-      #workspaces button:nth-child(4) {
+      #workspaces button:nth-child(4) button.has-window {
         color: ${base0B};
       }
 
-      #workspaces button:nth-child(5) {
+      #workspaces button:nth-child(5) button.has-window {
         color: ${base0C};
       }