diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf
index f65b54e..c664b9c 100755
--- a/.config/hypr/hyprland.conf
+++ b/.config/hypr/hyprland.conf
@@ -306,35 +306,47 @@ windowrule {
     float = on
 }
 
+#region Stay focused
 windowrule {
-    name = stay-focused
+    name = stay-focused-tag-steam
     match:class = (steam)
+    tag = +stay-focused
+}
+
+windowrule {
+    name = stay-focused-tag-zoom
     match:class = ^(zoom)$
+    tag = +stay-focused
+}
+
+windowrule {
+    name = stay-focused-apply
+    match:tag = stay-focused
     stay_focused = on
 }
+#endRegion
+
+#region tiled
+windowrule {
+    name = tiled-tag-zerene
+    match:class = ^(com-zerenesystems-stacker-gui-MainFrame)$
+    match:xwayland = 1
+    tag=+tiled
+}
 
 windowrule {
-    name = tiled
-    match:class = ^(com-zerenesystems-stacker-gui-MainFrame)$
+    name = tiled-tag-renpy
     match:title = (A Ren(.)Py Game)
     match:xwayland = 1
-    float = off
+    tag = +tiled
 }
 
 windowrule {
-    name = stay-focused
-    match:class = (steam)
-    match:class = ^(zoom)$
-    stay_focused = on
-}
-
-windowrule {
-    name = tiled
-    match:class = ^(com-zerenesystems-stacker-gui-MainFrame)$
-    match:title = (A Ren(.)Py Game)
-    match:xwayland = 1
+    name = tiles-apply
+    match:tag = tiled
     float = off
 }
+#endRegion
 
 #jetbrain xwayland fixes. see https://github.com/hyprwm/Hyprland/issues/4257
 windowrule {