diff --git a/home/hyprland/waybar/default.nix b/home/hyprland/waybar/default.nix
index 5b3cfea9..e66170d4 100644
--- a/home/hyprland/waybar/default.nix
+++ b/home/hyprland/waybar/default.nix
@@ -15,14 +15,8 @@
       layer = "top";
       position = "top";
       # Layout
-      "modules-left" = [
-        "hyprland/workspaces"
-        "custom/separator"
-        "hyprland/window"
-        "custom/separator"
-        "mpris"
-      ];
-      "modules-center" = [ ];
+      "modules-left" = [ "hyprland/workspaces" ];
+      "modules-center" = [ "mpris" ];
       "modules-right" = [
         "battery"
         "pulseaudio"
@@ -55,34 +49,19 @@
           default = "󰋙";
           special = "󰁡";
         };
+        persistent-workspaces = {
+          "emacs" = [ ];
+          "web" = [ ];
+          "files" = [ ];
+          "steam" = [ ];
+          "apps" = [ ];
+          "btm" = [ ];
+          "term" = [ ];
+          "remote" = [ ];
+        };
         show-special = true;
         sort-by = "id";
       };
-      "hyprland/window" = {
-        rewrite = {
-          "Alacritty" = "󰆍";
-          "(.*) - GNU Emacs(.*)" = " $1";
-          "Nyxt - (.*)" = "󰀹 $1";
-          "(.*) — Mozilla Firefox" = "󰈹 $1";
-          "(.*) - Chromium" = " $1";
-          "(.*) - Thunar" = "󰝰 $1";
-          "(.*) - LibreOffice Writer" = "󰈙 $1";
-          "(.*) - LibreOffice Calc" = "󰡱 $1";
-          "(.*) - LibreOffice Impress" = "󰐨 $1";
-          "(.*) - LibreOffice Base" = "󰆼 $1";
-          "(.*) - LibreOffice Draw" = "󰽉 $1";
-          "(.*) - LibreOffice Math" = "󰪚 $1";
-          "NoMachine - (.*)" = "󰢹 $1";
-          "Microsoft Teams - (.*)" = "󰊻 $1";
-          "Microsoft Teams classic" = "󰊻";
-          "Microsoft 365 - (.*)" = "󰏆 $1";
-          "Signal" = "󰒢";
-          "whatsapp-for-linux" = "󰖣";
-          "(.*)WebCord - (.*)" = "$1󰙯 $2";
-          "seahorse" = "󰌾 Passwords and Keys";
-        };
-        separate-outputs = true;
-      };
       mpris = {
         "format" = "{player_icon} <b>{title}</b>";
         "tooltip-format" = "{player_icon} ({player}) {dynamic}";