diff --git a/hyprland.conf b/hyprland.conf
index 0b50279..bffb3e7 100644
--- a/hyprland.conf
+++ b/hyprland.conf
@@ -6,8 +6,7 @@ $mod = SUPER
 input {
     kb_layout = us
     kb_variant = colemak_dh
-    kb_options = caps:escape
-    kb_options = grp:alt_space_toggle
+    kb_options = caps:swapescape
 
     repeat_rate = 50
     repeat_delay = 300
@@ -46,8 +45,6 @@ decoration {
         size = 3
         new_optimizations = on
     }
-    # col.shadow = 0xeeee88ff
-    # col.shadow_inactive = 0xee1a1a1a
 }
 
 dwindle {
@@ -67,10 +64,6 @@ animations {
     animation = workspaces, 1, 2, decel, slidefade 5%
 }
 
-misc {
-    # enable_anr_dialog = false
-}
-
 ecosystem:no_update_news = true
 
 exec-once = wayland-init
@@ -78,10 +71,9 @@ exec-once = wallpaper
 exec-once = eww open bar-eDP
 exec-once = [workspace keepass silent] keepassxc
 
-# windowrule=float,Rofi
-windowrule=float,title:Firefox — Sharing Indicator
-windowrule=move 1850 40,title:Firefox — Sharing Indicator
-windowrulev2=float,class:term-popup
+# windowrule=float,title:Firefox — Sharing Indicator
+# windowrule=move 1850 40,title:Firefox — Sharing Indicator
+windowrule = match:class term-popup, float true
 
 
 
@@ -139,13 +131,13 @@ bind=$mod SHIFT,x,movetoworkspacesilent,10
 bind=$mod SHIFT,c,movetoworkspacesilent,11
 
 bind=$mod SHIFT,l,togglespecialworkspace,keepass
-# windowrule {
-#     match:class = org.keepassxc.KeePassXC
-#     match:title = negative:KeePassXC -  Access Request
-#     workspace = special:keepass
-# }
-windowrulev2 = workspace special:keepass,class:(org.keepassxc.KeePassXC)
-windowrulev2 = float,title:KeePassXC -  Access Request
+windowrule {
+    name = keepass
+    match:class = org.keepassxc.KeePassXC
+    match:title = negative:KeePassXC -  Access Request
+    workspace = special:keepass
+}
+windowrule = match:title KeePassXC -  Access Request, float true
 
 bind=$mod,semicolon,fullscreen,