diff --git a/alacritty/.config/alacritty/alacritty.toml b/alacritty/.config/alacritty/alacritty.toml
index 65f52ad..c5eecad 100644
--- a/alacritty/.config/alacritty/alacritty.toml
+++ b/alacritty/.config/alacritty/alacritty.toml
@@ -183,3 +183,8 @@ x = 9
 y = 6
 
 [terminal]
+
+[[keyboard.bindings]]
+key = "Return"
+mods = "Shift"
+chars = "\u001B\r"
diff --git a/hypr/.config/hypr/hyprland.conf b/hypr/.config/hypr/hyprland.conf
index d45c2d5..cb5c979 100644
--- a/hypr/.config/hypr/hyprland.conf
+++ b/hypr/.config/hypr/hyprland.conf
@@ -337,7 +337,7 @@ bind = $mainMod, t, settiled, # dwindle
 bind = $mainMod, p, pin, # dwindle
 bind = $mainMod, m, fullscreen,  1 # monocole layout
 bind = $mainMod, f, fullscreen,  0 # real fullscreen
-bind = $mainMod, SPACE, togglesplit, # dwindle
+bind = $mainMod, SPACE, layoutmsg, togglesplit # dwindle
 
 # Move focus with mainMod + arrow keys
 bind = $mainMod, H, movefocus, l
@@ -494,29 +494,34 @@ binde = $mainMod ALT, down, exec, hyprctl dispatch resizeactive 0 $(~/bin/mouse_
 # windowrulev2 = float,class:^(kitty)$,title:^(kitty)$
 
 # Ignore maximize requests from apps. You'll probably like this.
-windowrulev2 = suppressevent maximize, class:.*
+windowrule = suppress_event maximize, match:class .*
 
 # Fix some dragging issues with XWayland
-windowrulev2 = nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0
+windowrule = no_focus on, match:class ^$, match:title ^$, match:xwayland 1, match:float 1, match:fullscreen 0, match:pin 0
 
-# Fix ueberzugpp
-windowrulev2 = noanim, class:^(ueberzugpp_.*)
+# Fix ueberzugpp https://github.com/jstkdng/ueberzugpp/issues/276#issuecomment-3745524231
+windowrule {
+  name = ueberzugpp
+  match:class = ^(ueberzugpp.*)$
+  float = true
+  no_anim = true
+  border_size = 0
+  no_focus = true
+  no_follow_mouse = true
+  no_blur = true
+}
 #windowrulev2 = float, class:^(ueberzugpp_.*)
+#
+windowrule = float on, match:title ^(Save screenshot)
 
 # Fix Matlab
-windowrulev2 = nofocus, class: ^(MATLAB [\w\d]* - academic use)$, title: ^(Command HistoryWindow)$
-windowrulev2 = noborder, class: ^(MATLAB [\w\d]* - academic use)$, title: ^(Command HistoryWindow)$
-windowrulev2 = opacity 1.0 override, class: ^(MATLAB [\w\d]* - academic use)$, title: ^(Command HistoryWindow)$
+windowrule = no_focus on, border_size 0, opacity 1.0 override, match:class ^(MATLAB [\w\d]* - academic use)$, match:title ^(Command HistoryWindow)$
 
-windowrulev2 = nofocus, class: ^(MATLAB [\w\d]* - academic use)$, title: ^(TabCompletionPopup)$
-windowrulev2 = noborder, class: ^(MATLAB [\w\d]* - academic use)$, title: ^(TabCompletionPopup)$
-windowrulev2 = opacity 1.0 override, class: ^(MATLAB [\w\d]* - academic use)$, title: ^(TabCompletionPopup)$
+windowrule = no_focus on, border_size 0, opacity 1.0 override, match:class ^(MATLAB [\w\d]* - academic use)$, match:title ^(TabCompletionPopup)$
 
-windowrulev2 = nofocus, class: ^(MATLAB [\w\d]* - academic use)$, title: ^(FunctionHints)$
-windowrulev2 = noborder, class: ^(MATLAB [\w\d]* - academic use)$, title: ^(FunctionHints)$
-windowrulev2 = opacity 1.0 override, class: ^(MATLAB [\w\d]* - academic use)$, title: ^(FunctionHints)$
+windowrule = no_focus on, border_size 0, opacity 1.0 override, match:class ^(MATLAB [\w\d]* - academic use)$, match:title ^(FunctionHints)$
 
-windowrulev2 = nofocus, class: ^(MATLAB [\w\d]* - academic use)$, title: ^(DefaultOverlayManager\.JWindow)$
+windowrule = no_focus on, match:class ^(MATLAB [\w\d]* - academic use)$, match:title ^(DefaultOverlayManager\.JWindow)$
 
 # SMART GAPS ()
 #workspace = w[tv1], gapsout:0, gapsin:0
@@ -527,8 +532,8 @@ windowrulev2 = nofocus, class: ^(MATLAB [\w\d]* - academic use)$, title: ^(Defau
 #windowrulev2 = rounding 0, floating:0, onworkspace:f[1]
 
 # Prayer times
-windowrulev2 = float,class:(yad)
-windowrulev2 = move cursor -50% 25,title:(Prayers)
+windowrule = match:class (yad), float on
+windowrule = match:title (Prayers), move (cursor_x) (50)
 
 # opacity
 # windowrule = opacity 0.95 override,class:^(firefox)$
@@ -545,9 +550,8 @@ windowrulev2 = move cursor -50% 25,title:(Prayers)
 #windowrulev2 = monitor 1, class:^(flameshot)$
 
 # SATTY (for screenshots)
-windowrulev2 = noanim, class:^(flameshot)$
-windowrulev2 = fullscreen, class:^(com.gabm.satty)$, title:^(satty)$
-windowrulev2 = float, class:^(com.gabm.satty)$, title:^(satty)$
+windowrule = no_anim on, match:class ^(flameshot)$
+windowrule = fullscreen on, float on, match:class ^(com.gabm.satty)$, match:title ^(satty)$
 
 # bind workspaces
 #workspace = [1-5], monitor: $mainMonitor
diff --git a/hypr/.config/hypr/hyprpaper.conf b/hypr/.config/hypr/hyprpaper.conf
index fecd263..f2b7ee0 100644
--- a/hypr/.config/hypr/hyprpaper.conf
+++ b/hypr/.config/hypr/hyprpaper.conf
@@ -1,3 +1,10 @@
-preload = ~/Pictures/wallhaven-yxdvjx.png
-wallpaper = DVI-D-1, ~/Pictures/wallhaven-yxdvjx.png
-wallpaper = , ~/Pictures/wallhaven-yxdvjx.png
+wallpaper {
+    monitor = DP-3
+    path = ~/Pictures/wallhaven-yxdvjx.png
+    fit_mode = cover
+}
+wallpaper {
+    monitor =
+    path =  ~/Pictures/wallhaven-yxdvjx.png
+    fit_mode = cover
+}
diff --git a/hypr/.config/swayidle/config b/hypr/.config/swayidle/config
index d66c5b0..bb64b5c 100644
--- a/hypr/.config/swayidle/config
+++ b/hypr/.config/swayidle/config
@@ -1,4 +1,4 @@
 timeout 250 'notify-send --app-name=screenlockwarning "Screen will lock in 30 seconds"'
 timeout 300 'hyprlock >> ~/hyprlock_logfile.txt'
-timeout 600 'hyprctl dispatch dpms off' resume 'hyprctl dispatch dpms on'
+# timeout 600 'hyprctl dispatch dpms off' resume 'hyprctl dispatch dpms on'
 before-sleep 'hyprlock'