diff --git a/modules/user/hyprland.nix b/modules/user/hyprland.nix
index 9eeec61..fed2ac1 100644
--- a/modules/user/hyprland.nix
+++ b/modules/user/hyprland.nix
@@ -94,18 +94,19 @@ in {
       ];
 
       windowrule = [
-        "float, class:^(imv)$"
-        "float, class:^(feh)$"
-        "float, class:^(mpv)$"
-        "float, title:^(Список друзей)"
-        "move onscreen cursor -50% -50%, class:^(dragon-drop)$"
-        "float, title:(nmtui)"
-        "float, title:(pulsemixer)"
-        "float, title:(clipse)"
-        "size 622 652, title:(clipse)"
+        "match:class imv,           float 1"
+        "match:class feh,           float 1"
+        "match:class mpv,           float 1"
 
-        "rounding 0, focus:1"
-        "bordersize 0, floating:0, onworkspace:w[t1]"
+        "match:title Список друзей, float 1"
+        "match:title nmtui,         float 1"
+        "match:title pulsemixer,    float 1"
+
+        "match:title clipse,        float 1"
+        "match:title clipse,   size 622 652"
+
+        "match:focus 1, rounding 0"
+        "match:float 0, match:workspace w[t1], border_size 0"
       ];
 
       exec-once = lib.mkBefore [
diff --git a/modules/user/yazi.nix b/modules/user/yazi.nix
index 40325b5..7d538f4 100644
--- a/modules/user/yazi.nix
+++ b/modules/user/yazi.nix
@@ -3,6 +3,10 @@
 		( ouch.override { enableUnfree = true; } )
 	];
 
+	wayland.windowManager.hyprland.settings.windowrule = [
+		"match:class dragon-drop, move onscreen cursor -50% -50%"
+	];
+
 	programs.yazi = {
 		package = inputs.yazi.packages
 			.${pkgs.stdenv.hostPlatform.system}.default