diff --git a/home/waybar/default.nix b/home/waybar/default.nix
index 06caf9e8..4943dcd7 100644
--- a/home/waybar/default.nix
+++ b/home/waybar/default.nix
@@ -40,16 +40,18 @@
         # TODO workspace rewrites
         "rewrite" = {
           "(.*) - GNU Emacs at (.*)" = "  $1 [$2]";
-          "Alacritty" = " ";
+          "(Alacritty.*)" = "  $1";
           "(.*) - mpv" = "󰦟  $1";
-          "btm" = "  Resource Usage [btm]";
-          "cava" = "󰝚  Music Visualiser [cava]";
+          "(btm)" = "  Resource Usage [$1]";
+          "(cava)" = "󰝚  Music Visualiser [$1]";
           "(.*) - Thunar" = "󰝰  $1";
           "Nyxt - (.*)" = "󰀹  $1";
           "(.*) — Mozilla Firefox" = "󰈹  $1";
-          ".*WebCord (.*)" = "󰙯  $1";
-          "[Ss]team" = "󰓓 ";
-          "Prism Launcher (.*)" = "󰍳  Minecraft (Prism Launcher $1)";
+          "((?:.*)WebCord.*)" = "󰙯  $1";
+          "(Signal.*)" = "󰭹  $1";
+          "(WhatsApp for Linux.*)" = "󰖣  $1";
+          "([Ss]team)" = "󰓓  $1";
+          "(Prism Launcher.*)" = "󰍳  Minecraft ($1)";
           "Microsoft Teams(?: classic)?(?: - )?(.*)(?: \| Microsoft Teams)?" = "󰊻  $1";
         };
         "separate-outputs" = true;
diff --git a/system/desktop.nix b/system/desktop.nix
index a25c14e7..fb15d0ce 100644
--- a/system/desktop.nix
+++ b/system/desktop.nix
@@ -14,6 +14,7 @@
     libreoffice-fresh
     inkscape
     webcord
+    signal-desktop
     whatsapp-for-linux
     teams-for-linux
     nomachine-client