diff --git a/system/desktop.nix b/system/desktop.nix
index 4201f11b..6f4cd9ed 100644
--- a/system/desktop.nix
+++ b/system/desktop.nix
@@ -42,6 +42,7 @@
       libreoffice
       webcord
       signal-desktop
+      whatsapp-for-linux
       nomachine-client
     ];
   };
@@ -220,9 +221,32 @@
               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"}
+              '';
+            };
           # 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 ff4f4bcb..5f501269 100644
--- a/system/home/hyprland.nix
+++ b/system/home/hyprland.nix
@@ -261,11 +261,11 @@
 
         # Workspace rules
         "workspace 2, (firefox)" # Browser
-        "workspace 3, (signal|WebCord|teams-for-linux|twinkle)" # Messaging
-        "workspace 4, (Zotero|libreoffice|soffice|org.musicbrainz.Picard)(.*)" # Files
+        "workspace 3, (WebCord|signal|whatsapp-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, (steam_app|gamescope|steam|lutris|org.prismlauncher.PrismLauncher)" # Gaming
+        "workspace 7, (gamescope|steam|steam_app|lutris|org.prismlauncher.PrismLauncher)" # Gaming
 
         # PrismLauncher / Minecraft
         "float, org.prismlauncher.PrismLauncher"