diff --git a/hyprland.conf b/hyprland.conf
index 6c21e0d..936464c 100644
--- a/hyprland.conf
+++ b/hyprland.conf
@@ -153,7 +153,7 @@ animations {
 # windowrule = rounding 0, floating:0, onworkspace:f[1]
 
 # Borders only on alacritty
-windowrule = noborder, class:negative:Alacritty
+windowrule = border_size 0, match:class negative:Alacritty
 
 # See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more
 dwindle {
@@ -327,18 +327,18 @@ bindl = , XF86AudioPrev, exec, playerctl previous
 # windowrule = float,class:^(kitty)$,title:^(kitty)$
 
 # Ignore maximize requests from apps. You'll probably like this.
-windowrule = suppressevent maximize, class:.*
+# windowrule = suppressevent maximize, match:class .*
 
 # Fix some dragging issues with XWayland
-windowrule = nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0
+# windowrule = no_focus on,match:class ^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0
 
 # Nvidia config
 env = LIBVA_DRIVER_NAME,nvidia
 env = __GLX_VENDOR_LIBRARY_NAME,nvidia
 
 # Flameshot
-windowrule = pin, class:flameshot,title:flameshot-pin
-windowrule = float, class:flameshot,title:flameshot-pin
-windowrule = noborder, class:flameshot,title:flameshot-pin
-windowrule = noblur, class:flameshot,title:flameshot-pin
-windowrule = noshadow, class:flameshot,title:flameshot-pin
+# windowrule = pin, class:flameshot,title:flameshot-pin
+# windowrule = float, class:flameshot,title:flameshot-pin
+# windowrule = noborder, class:flameshot,title:flameshot-pin
+# windowrule = noblur, class:flameshot,title:flameshot-pin
+# windowrule = noshadow, class:flameshot,title:flameshot-pin
diff --git a/hyprpaper.conf b/hyprpaper.conf
index 22a23b0..4d35877 100644
--- a/hyprpaper.conf
+++ b/hyprpaper.conf
@@ -1,2 +1,5 @@
-preload = /home/thomas/.config/awesome/Wallpapers/cobra-kai-1.png
-wallpaper = , /home/thomas/.config/awesome/Wallpapers/cobra-kai-1.png
+wallpaper {
+    monitor =
+    path = /home/thomas/.config/awesome/Wallpapers/cobra-kai-1.png
+    fit_mode = cover
+}
diff --git a/hyprscript b/hyprscript
index 17a1a44..5c9ed19 100755
--- a/hyprscript
+++ b/hyprscript
@@ -138,12 +138,12 @@ class Workspace:
         """
         new_id = (self.id - 1) // 10 * 10 + n
 
+        subprocess.run(['hyprctl', 'dispatch', 'movetoworkspace' if move else 'workspace', str(new_id)])
+
         current = monitor.special_workspace
         if current is not None:
             subprocess.run(['hyprctl', 'dispatch', 'togglespecialworkspace', current.special_name()])
 
-        subprocess.run(['hyprctl', 'dispatch', 'movetoworkspace' if move else 'workspace', str(new_id)])
-
     def previous(self, monitor: Monitor, move: bool = False):
         """
         Goes to the previous workspace on the same monitor, or the last if we're on the first.
@@ -157,12 +157,12 @@ class Workspace:
         if new_id % 10 == 0:
             new_id += 10
 
+        subprocess.run(['hyprctl', 'dispatch', 'movetoworkspace' if move else 'workspace', str(new_id)])
+
         current = monitor.special_workspace
         if current is not None:
             subprocess.run(['hyprctl', 'dispatch', 'togglespecialworkspace', current.special_name()])
 
-        subprocess.run(['hyprctl', 'dispatch', 'movetoworkspace' if move else 'workspace', str(new_id)])
-
     def next(self, monitor: Monitor, move: bool = False):
         """
         Goes to the next workspace on the same monitor, or the first if we're on the last.
@@ -176,12 +176,12 @@ class Workspace:
         if new_id % 10 == 1:
             new_id -= 10
 
+        subprocess.run(['hyprctl', 'dispatch', 'movetoworkspace' if move else 'workspace', str(new_id)])
+
         current = monitor.special_workspace
         if current is not None:
             subprocess.run(['hyprctl', 'dispatch', 'togglespecialworkspace', current.special_name()])
 
-        subprocess.run(['hyprctl', 'dispatch', 'movetoworkspace' if move else 'workspace', str(new_id)])
-
 
 def to_bar(x):
     return bars[round((len(bars) - 1) * x / 100)]