diff --git a/.config/hypr/config/appearance.conf b/.config/hypr/config/appearance.conf
index c1f5237..43a0f6f 100644
--- a/.config/hypr/config/appearance.conf
+++ b/.config/hypr/config/appearance.conf
@@ -51,16 +51,30 @@ decoration {
 
 }
 
+# TODO: replace layerrules
+
 # Apply blur to waybar
-layerrule = blur,waybar
+# layerrule {
+#     name = waybar
+#     blur = on
+# }
 
 # Apply blur to swaync
-layerrule = blur, swaync-control-center
-layerrule = blur, swaync-notification-window
-layerrule = ignorezero, swaync-control-center
-layerrule = ignorezero, swaync-notification-window
-layerrule = ignorealpha 0.5, swaync-control-center
-layerrule = ignorealpha 0.5, swaync-notification-window
+
+## New
+layerrule {
+    name = swaync-control-center,swaync-notification-window
+    blur = on
+    ignore_alpha = 0.5
+}
+
+## Old
+# layerrule = blur, swaync-control-center
+# layerrule = blur, swaync-notification-window
+# layerrule = ignorezero, swaync-control-center
+# layerrule = ignorezero, swaync-notification-window
+# layerrule = ignorealpha 0.5, swaync-control-center
+# layerrule = ignorealpha 0.5, swaync-notification-window
 
 
 # https://wiki.hyprland.org/Configuring/Variables/#animations
@@ -141,45 +155,82 @@ misc {
 # See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
 # See https://wiki.hyprland.org/Configuring/Workspace-Rules/ for workspace rules
 
-# Example windowrule v1
-# windowrule = float, ^(kitty)$
-
-# Example windowrule v2
-# windowrulev2 = float,class:^(kitty)$,title:^(kitty)$
-
 # Ignore maximize requests from apps. You'll probably like this.
-windowrule = suppressevent maximize, class:.*
+windowrule {
+    name = suppress-maximize-events
+    suppress_event = maximize
+    match:class = .*
+}
 
 # Fix some dragging issues with XWayland
-windowrule = nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0
+windowrule {
+    name = fix-xwayland-drags
+    match:class = ^$
+    match:title = ^$
+    match:xwayland = true
+    match:float = true
+    match:fullscreen = false
+    match:pin = false
+
+    no_focus = true
+}
 
 # Albert
-windowrule=noborder,class:^(albert)$
-windowrule=noblur,class:^(albert)$
-windowrule=noshadow,class:^(albert)$
-windowrule=float,class:^(albert)$
-windowrule=stayfocused,class:^(albert)$
-windowrule=nodim,class:^(albert)$
+windowrule {
+  name = albert
+  border_size = 0
+  no_blur = on
+  no_shadow = on
+  float = on
+  stay_focused = on
+  no_dim = on
+  match:class = ^(albert)$
+}
 
 # Prism Launcher
-windowrule=pseudo, class:(org.prismlauncher.PrismLauncher) 
-windowrule=size 65% 70%, class:(org.prismlauncher.PrismLauncher), title:^(Prism Launcher .*)$
+windowrule {
+  name = prismlauncher-all
+  pseudo = on
+  match:class = (org.prismlauncher.PrismLauncher)
+}
+windowrule {
+  name = prismlauncher-main
+  size = (monitor_w*0.65) (monitor_h*0.7)
+  match:class = (org.prismlauncher.PrismLauncher)
+  match:title = ^(Prism Launcher .*)$
+}
 
 # Nautilus
-windowrule=pseudo, class:(org.gnome.Nautilus)
-windowrule=size 65% 70%, class:(org.gnome.Nautilus) # initialTitle:^(Loading…)$
-
-# Kitty
-#windowrule=pseudo, class:(kitty)
-#windowrule=size 80% 80%, class:(kitty)
+windowrule {
+  name = nautilus-all
+  pseudo = on
+  match:class = (org.gnome.Nautilus)
+}
+windowrule {
+  name = nautilus-main
+  size = (monitor_w*0.65) (monitor_h*0.7)
+  match:class = (org.gnome.Nautilus) # initialTitle:^(Loading…)$
+}
 
 # Vivado
 ## Loading screen
-windowrule=float, class:(ui-PlanAhead)
-windowrule=size 397 295, class:(ui-PlanAhead) title:^(win0)$
-windowrule=center, class:(ui-PlanAhead)
+windowrule {
+  name = vivado-loading-screen
+  float = on
+  center = on
+  match:class = (ui-PlanAhead)
+}
+windowrule {
+  name = vivado-loading-screen-2
+  size = 397 295
+  match:class = (ui-PlanAhead) title:^(win0)$
+}
 ## Main window
-windowrule=tile, class:(Vivado)
+windowrule {
+  name = vivado-main
+  tile = on
+  match:class = (Vivado)
+}
 
 
 # TODO Automatically fullscreen single apps
diff --git a/.config/hypr/config/environment.conf b/.config/hypr/config/environment.conf
index 4a2e550..2bfce6a 100644
--- a/.config/hypr/config/environment.conf
+++ b/.config/hypr/config/environment.conf
@@ -26,6 +26,9 @@ exec-once = ~/.config/hypr/scripts/autostart.sh
 exec-once = wl-paste --type text --watch cliphist store # Stores only text data
 exec-once = wl-paste --type image --watch cliphist store # Stores only image data
 
+# SSH Agent
+exec-once = ssh-agent
+
 
 #############################
 ### ENVIRONMENT VARIABLES ###
diff --git a/.config/hypr/config/fast-mod.conf b/.config/hypr/config/fast-mod.conf
deleted file mode 100644
index f43807d..0000000
--- a/.config/hypr/config/fast-mod.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# Mod file to disable desktop animations
-
-animations {
-    enabled = false
-
-}
diff --git a/.config/hypr/config/input.conf b/.config/hypr/config/input.conf
index ca3b6c4..c7a285f 100644
--- a/.config/hypr/config/input.conf
+++ b/.config/hypr/config/input.conf
@@ -45,6 +45,7 @@ bind = $mainMod, L, exec, hyprlock  # Lockscreen
 bind = $mainMod, B, exec, ~/.config/hypr/scripts/toggle-waybar.sh  # Toggle sidebar
 bind = $mainMod SHIFT, R, exec, ~/.config/hypr/scripts/reload.sh  # Reload desktop
 bind = $mainMod, F11, exec, ~/.config/hypr/scripts/gamemode.sh  # Gamemode
+bind = $mainMod, F10, exec, ~/.config/hypr/scripts/sharp_mode.sh # Sharp mode
 bind = $mainMod SHIFT, M, exit,  # Exit desktop session
 
 # Shortcuts
diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf
index 072991c..9edd80c 100644
--- a/.config/hypr/hyprland.conf
+++ b/.config/hypr/hyprland.conf
@@ -12,4 +12,3 @@ source = ~/.config/hypr/config/input.conf
 source = ~/.config/hypr/config/kb_layouts/us.conf
 source = ~/.config/hypr/config/appearance.conf
 source = ~/.config/hypr/config/plugins.conf
-#source = ~/.config/hypr/config/fast-mod.conf
diff --git a/.config/hypr/hyprpaper.conf b/.config/hypr/hyprpaper.conf
index 246b059..4fe72b9 100644
--- a/.config/hypr/hyprpaper.conf
+++ b/.config/hypr/hyprpaper.conf
@@ -1,2 +1,6 @@
-preload = ~/.config/hypr/images/wallpaper.jpg
-wallpaper = , ~/.config/hypr/images/wallpaper.jpg
+wallpaper {
+	monitor =
+	path = ~/.config/hypr/images/wallpaper.png
+}
+
+splash = false
diff --git a/.config/hypr/images/wallpaper.jpg b/.config/hypr/images/wallpaper.jpg
deleted file mode 100644
index 4167f89..0000000
Binary files a/.config/hypr/images/wallpaper.jpg and /dev/null differ
diff --git a/.config/hypr/images/wallpaper.png b/.config/hypr/images/wallpaper.png
new file mode 100644
index 0000000..4761c54
Binary files /dev/null and b/.config/hypr/images/wallpaper.png differ
diff --git a/.config/hypr/scripts/sharp_mode.sh b/.config/hypr/scripts/sharp_mode.sh
new file mode 100755
index 0000000..e6d14c9
--- /dev/null
+++ b/.config/hypr/scripts/sharp_mode.sh
@@ -0,0 +1,21 @@
+#!/usr/bin/env sh
+
+# Disables animations accros the desktop (as well as some other tweaks)
+# Similar to game mode but with the goal to enhance productivity
+# From Hyprland documentation - https://wiki.hyprland.org/0.41.2/Configuring/Uncommon-tips--tricks/#toggle-animationsbluretc-hotkey
+
+HYPRGAMEMODE=$(hyprctl getoption animations:enabled | awk 'NR==1{print $2}')
+if [ "$HYPRGAMEMODE" = 1 ] ; then
+    hyprctl --batch "\
+        keyword animations:enabled 0;\
+        keyword general:gaps_in 0;\
+        keyword general:gaps_out 0;\
+        keyword general:border_size 1;\
+        keyword decoration:rounding 0"
+    hyprctl notify 1 2000 0 "Enabled Sharp mode"
+    exit
+fi 
+
+hyprctl reload
+# ~/.config/hypr/scripts/restore-waybar.sh
+hyprctl notify 1 2000 0 "Disabled Sharp mode"