diff --git a/system/Vanguard.nix b/system/Vanguard.nix
index 630dab5a..8decf744 100644
--- a/system/Vanguard.nix
+++ b/system/Vanguard.nix
@@ -91,8 +91,8 @@
           "desc:${secondary},1920x1080@144,0x140,1.0,vrr,2"
         ];
         workspace = [
-          "3, monitor:desc:${secondary}"
-          "7, monitor:desc:${primary}"
+          "2, monitor:desc:${secondary}"
+          "6, monitor:desc:${primary}"
         ];
       };
   };
diff --git a/system/desktop.nix b/system/desktop.nix
index c30a055f..edf8f48c 100644
--- a/system/desktop.nix
+++ b/system/desktop.nix
@@ -42,9 +42,7 @@
       zotero
       evince
       libreoffice
-      webcord
       signal-desktop
-      whatsapp-for-linux
       teams-for-linux
       nomachine-client
     ];
@@ -222,27 +220,6 @@
               figure.autolayout: True
               savefig.dpi: 300
             '';
-          # WhatsApp config
-          "whatsapp-for-linux/settings.conf" =
-            let
-              inherit (config.lib.stylix.colors) variant;
-            in
-            {
-              force = true;
-              text = ''
-                [web]
-                allow-permissions=true
-                hw-accel=2
-
-                [general]
-                notification-sounds=true
-                close-to-tray=true
-                start-in-tray=true
-
-                [appearance]
-                prefer-dark-theme=${if variant == "dark" then "true" else "false"}
-              '';
-            };
           "teams-for-linux/config.json" = {
             force = true;
             text = builtins.toJSON {
@@ -257,8 +234,6 @@
           # Autostart some programs
           "autostart/signal-desktop.desktop".source =
             "${pkgs.signal-desktop}/share/applications/signal-desktop.desktop";
-          "autostart/com.github.eneshecan.WhatsAppForLinux.desktop".source =
-            "${pkgs.whatsapp-for-linux}/share/applications/com.github.eneshecan.WhatsAppForLinux.desktop";
         };
       };
     };
diff --git a/system/home/hyprland.nix b/system/home/hyprland.nix
index 0b26b9ee..a30fd32d 100644
--- a/system/home/hyprland.nix
+++ b/system/home/hyprland.nix
@@ -260,11 +260,10 @@
 
         # Workspace rules
         "workspace 2, (firefox)" # Browser
-        "workspace 3, (WebCord|signal|whatsapp-for-linux|teams-for-linux|twinkle)" # Messaging
-        "workspace 4, (org.musicbrainz.Picard|libreoffice|soffice|Zotero)(.*)" # Files
-        "workspace 5, (com.obsproject.Studio|Nxplayer.bin)" # Remote
-        "workspace 6, (org.freecad.FreeCAD|PrusaSlicer)" # 3D Printing
-        "workspace 7, (steam|steam_app|gamescope|lutris|org.prismlauncher.PrismLauncher|org.libretro.RetroArch)" # Gaming
+        "workspace 3, (org.musicbrainz.Picard|libreoffice|soffice|Zotero)(.*)" # Files
+        "workspace 4, (com.obsproject.Studio|Nxplayer.bin)" # Remote
+        "workspace 5, (org.freecad.FreeCAD|PrusaSlicer)" # 3D Printing
+        "workspace 6, (steam|steam_app|gamescope|lutris|org.prismlauncher.PrismLauncher|org.libretro.RetroArch)" # Gaming
 
         # PrismLauncher / Minecraft
         "float, org.prismlauncher.PrismLauncher"
diff --git a/system/home/waybar.nix b/system/home/waybar.nix
index 6261d15b..06ade74c 100644
--- a/system/home/waybar.nix
+++ b/system/home/waybar.nix
@@ -42,12 +42,17 @@
         format-icons = {
           "1" = "󰆍";
           "2" = "󰖟";
-          "3" = "󰭹";
-          "4" = "󱧶";
-          "5" = "󰢹";
-          "6" = "󰐫";
-          "7" = "󰊴";
-          default = "󰀻";
+          "3" = "󱧶";
+          "4" = "󰢹";
+          "5" = "󰐫";
+          "6" = "󰊴";
+          "7" = "󰫃";
+          "8" = "󰫄";
+          "9" = "󰫅";
+          "10" = "󰫆";
+          "11" = "󰫇";
+          "12" = "󰫈";
+          default = "󰋙";
         };
         all-outputs = false;
         persistent-workspaces = {
@@ -57,7 +62,6 @@
           "4" = [ ];
           "5" = [ ];
           "6" = [ ];
-          "7" = [ ];
         };
       };
       mpris = {