diff --git a/modules/programs/hyprland/_config.nix b/modules/programs/hyprland/_config.nix
index c8b5aab..281505d 100644
--- a/modules/programs/hyprland/_config.nix
+++ b/modules/programs/hyprland/_config.nix
@@ -110,28 +110,23 @@ in
       workspace_swipe = on
   }
 
-  # Example per-device config
-  # See https://wiki.hyprland.org/Configuring/Keywords/#executing for more
-  device:epic mouse V1 {
-      sensitivity = -0.5
-  }
-
-  # Example windowrule v2
-  # windowrulev2 = float,class:^(kitty)$,title:^(kitty)$
   # See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
-
   # Firefox Sharing Indicator
-  ${mkRules ["float" "move 49% 40" "noborder" "nofullscreenrequest"] ["title:^(.*Sharing Indicator)$"]}
+  ${mkRules ["float" "move 49% 40" "noborder" "nofullscreenrequest"] ["title:^(.*Sharing Indicator.*)$"]}
 
   # Emacs
-  windowrulev2 = opaque, class:^emacs$
+  windowrulev2 = opaque, class:^(emacs)$
 
   # Fullscreen Applications
   ${mkRules ["opaque" "noblur" "noborder" "noshadow" "forceinput"] ["fullscreen:1"]}
 
-  ${mkRules ["opaque" "noblur" "noshadow"] ["class:^jetbrains-pycharm$"]}
+  ${mkRules ["tile" "opaque"] ["class:^(neovide)$"]}
 
-  ${mkRules ["tile" "opaque"] ["class:^neovide$"]}
+  # fix xwayland apps
+  windowrulev2 = rounding 0, xwayland:1, floating:1
+  windowrulev2 = center, class:^(.*jetbrains.*)$, title:^(Confirm Exit|Open Project|win424|win201|splash)$
+  windowrulev2 = size 640 400, class:^(.*jetbrains.*)$, title:^(splash)$
+  ${mkRules ["opaque" "noshadow" "noblur" "noanim" "move cursor 5 5"] ["class:^(.*jetbrains-.*)$"]}
 
   # See https://wiki.hyprland.org/Configuring/Keywords/ for more
   $mainMod = SUPER
@@ -141,9 +136,9 @@ in
 
   # Window binds
   bind = $mainMod       , F      , togglefloating ,
-  bind = $mainMod       , P      , pseudo         , 
+  bind = $mainMod       , P      , pseudo         ,
   bind = $mainMod       , Q      , killactive     ,
-  bind = $mainMod       , T      , togglesplit    , 
+  bind = $mainMod       , T      , togglesplit    ,
   bind = $mainMod SHIFT , F      , fullscreen     ,
 
   # Program binds