diff --git a/system/Vanguard.nix b/system/Vanguard.nix
index 503aedff..5aed9302 100644
--- a/system/Vanguard.nix
+++ b/system/Vanguard.nix
@@ -90,10 +90,9 @@
           "desc:${secondary},1920x1080@144,0x140,1.0,vrr,2"
         ];
         workspace = [
-          "2, monitor:desc:${primary}"
-          "3, monitor:desc:${secondary}"
-          "5, monitor:desc:${primary}"
-          "7, monitor:desc:${primary}"
+          "2, monitor:desc:${secondary}"
+          "4, monitor:desc:${primary}"
+          "6, monitor:desc:${primary}"
         ];
       };
   };
diff --git a/system/desktop.nix b/system/desktop.nix
index 22574f6b..5fb060c0 100644
--- a/system/desktop.nix
+++ b/system/desktop.nix
@@ -41,10 +41,7 @@
       zotero
       evince
       libreoffice
-      webcord
       signal-desktop
-      whatsapp-for-linux
-      teams-for-linux
       nomachine-client
     ];
   };
@@ -224,43 +221,9 @@
               figure.autolayout: True
               savefig.dpi: 300
             '';
-          # WhatsApp config
-          "whatsapp-for-linux/settings.conf" =
-            let
-              inherit (config.lib.stylix.scheme) 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 {
-              awayOnSystemIdle = true;
-              closeAppOnCross = false;
-              followSystemTheme = true;
-              notificationMethod = "electron";
-              optInTeamsV2 = true;
-              spellCheckerLanguages = [ "en_GB" ];
-            };
-          };
           # 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 350ccefd..5029837d 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, (Nxplayer.bin)" # Remote Desktop
-        "workspace 6, (PrusaSlicer)" # 3D Printing
-        "workspace 7, (gamescope|steam|steam_app|lutris|org.prismlauncher.PrismLauncher)" # Gaming
+        "workspace 3, (org.musicbrainz.Picard|libreoffice|soffice|Zotero)(.*)" # Files
+        "workspace 4, (Nxplayer.bin)" # Remote Desktop
+        "workspace 5, (PrusaSlicer)" # 3D Printing
+        "workspace 6, (gamescope|steam|steam_app|lutris|org.prismlauncher.PrismLauncher)" # Gaming
 
         # PrismLauncher / Minecraft
         "float, org.prismlauncher.PrismLauncher"
@@ -301,8 +300,6 @@
         "float, title:Open,class:(libreoffice|soffice)(.*)"
 
         # Steam
-        "workspace 3, title:Friends List,class:steam"
-        "workspace 7 silent, title:(notification)(.*),class:steam"
         "float, title:Steam Settings,class:steam"
         "size 800 600, title:Steam Settings,class:steam"
         "center, title:Steam Settings,class:steam"
diff --git a/system/home/scripts/shell/clean-config.sh b/system/home/scripts/shell/clean-config.sh
index 9a383ec8..de1456ff 100644
--- a/system/home/scripts/shell/clean-config.sh
+++ b/system/home/scripts/shell/clean-config.sh
@@ -1,2 +1,2 @@
 shopt -s extglob
-rm -rf ~/.config/!(dconf|protonmail|Signal|whatsapp-for-linux)
+rm -rf ~/.config/!(dconf|protonmail|Signal)
diff --git a/system/home/waybar.nix b/system/home/waybar.nix
index fb74bb7e..3b431675 100644
--- a/system/home/waybar.nix
+++ b/system/home/waybar.nix
@@ -42,11 +42,10 @@
         format-icons = {
           "1" = "󰆍";
           "2" = "󰖟";
-          "3" = "󰭹";
-          "4" = "󱧶";
-          "5" = "󰢹";
-          "6" = "󰐫";
-          "7" = "󰊴";
+          "3" = "󱧶";
+          "4" = "󰢹";
+          "5" = "󰐫";
+          "6" = "󰊴";
           default = "󰀻";
         };
         all-outputs = false;
@@ -57,7 +56,6 @@
           "4" = [ ];
           "5" = [ ];
           "6" = [ ];
-          "7" = [ ];
         };
       };
       mpris = {