diff --git a/home/dot_config/ml4w-custom-dotfiles/dot_config/hypr/conf/custom.d/windows.conf b/home/dot_config/ml4w-custom-dotfiles/dot_config/hypr/conf/custom.d/windows.conf
index d92700d31e8392adcee6ac7587a074192f109472..ce3affe0fc69d093294f0614d8e66cdce1372a43 100644
--- a/home/dot_config/ml4w-custom-dotfiles/dot_config/hypr/conf/custom.d/windows.conf
+++ b/home/dot_config/ml4w-custom-dotfiles/dot_config/hypr/conf/custom.d/windows.conf
@@ -13,4 +13,12 @@ general {
 # https://wiki.hyprland.org/Configuring/Window-Rules/
 
 # Map apps to workspaces
-windowrule = workspace 4, class:(firefox|chromium)
+workspace = 2, monitor:id:1
+windowrule = workspace 2, class:^thunderbird$
+
+workspace = 4, monitor:id:1
+windowrule = workspace 4, class:^(firefox|chromium)$
+
+# Test
+# Doesn't seem to work ?
+workspace = 5, monitor:eDP-1