diff --git a/flake.nix b/flake.nix
index 72e0c52..ff83a34 100644
--- a/flake.nix
+++ b/flake.nix
@@ -36,7 +36,7 @@
       ...
     }@inputs:
     {
-      formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixfmt-rfc-style;
+      formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixfmt;
       nixosConfigurations = {
         eliasLaptop = nixpkgs.lib.nixosSystem {
           system = "x86_64-linux";
diff --git a/home/programs/eww/src/power.yuck b/home/programs/eww/src/power.yuck
index ba7dc95..e016f4a 100644
--- a/home/programs/eww/src/power.yuck
+++ b/home/programs/eww/src/power.yuck
@@ -2,28 +2,28 @@
   (box
     :class "powermenu"
     (button
-      :onclick "close eww power; systemctl poweroff"
+      :onclick "eww close power; systemctl poweroff"
       :class "powermenu-button"
       (label
         :text "⏻ "))
     (label
       :text " ")
     (button
-      :onclick "close eww power; /home/elias/.config/helperscripts/lock.sh"
+      :onclick "eww close power; /home/elias/.config/helperscripts/lock.sh"
       :class "powermenu-button"
       (label
         :text ""))
     (label
       :text " ")
     (button
-      :onclick "close eww power; systemctl reboot"
+      :onclick "eww close power; systemctl reboot"
       :class "powermenu-button"
       (label
         :text ""))
     (label
       :text "")
     (button
-      :onclick "close eww power; /home/elias/.config/helperscripts/logout.sh"
+      :onclick "eww close power; /home/elias/.config/helperscripts/logout.sh"
       :class "powermenu-button"
       (label
         :text ""))))
diff --git a/home/programs/hyprlock.nix b/home/programs/hyprlock.nix
index 8a52a93..0805c79 100644
--- a/home/programs/hyprlock.nix
+++ b/home/programs/hyprlock.nix
@@ -5,29 +5,47 @@
     enable = true;
     settings = {
       general = {
-        disable_loading_bar = true;
-        grace = 300;
+        # disable_loading_bar = true;
+        # grace = 300;
         hide_cursor = true;
-        no_fade_in = false;
+        ignore_empty_input = true;
+        # no_fade_in = false;
       };
-      background = [{
-        path = "screenshot";
-        blur_passes = 3;
-        blur_size = 8;
-      }];
-      input-field = [{
-        size = "200, 50";
-        position = "0, -80";
-        monitor = "";
-        dots_center = true;
-        fade_on_empty = false;
-        font_color = "rgb(202, 211, 245)";
-        inner_color = "rgb(91, 96, 120)";
-        outer_color = "rgb(24, 25, 38)";
-        outline_thickness = 5;
-        placeholder_text = ''<span foreground="##cad3f5">Password...</span>'';
-        shadow_passes = 2;
-      }];
+
+      animations = {
+        enabled = true;
+        fade_in = {
+          duration = 300;
+          bezier = "easeOutQuint";
+        };
+        fade_out = {
+          duration = 300;
+          bezier = "easeOutQuint";
+        };
+      };
+
+      background = [
+        {
+          path = "screenshot";
+          blur_passes = 2;
+          blur_size = 3;
+        }
+      ];
+      input-field = [
+        {
+          size = "200, 50";
+          position = "0, -80";
+          monitor = "";
+          dots_center = true;
+          fade_on_empty = false;
+          font_color = "rgb(202, 211, 245)";
+          inner_color = "rgb(91, 96, 120)";
+          outer_color = "rgb(24, 25, 38)";
+          outline_thickness = 3;
+          placeholder_text = ''<span foreground="##cad3f5">Password...</span>'';
+          shadow_passes = 2;
+        }
+      ];
     };
   };
 }
diff --git a/home/programs/nixvim/plugins/conform.nix b/home/programs/nixvim/plugins/conform.nix
index c71798d..8abe1a7 100644
--- a/home/programs/nixvim/plugins/conform.nix
+++ b/home/programs/nixvim/plugins/conform.nix
@@ -12,7 +12,7 @@
     beamMinimal28Packages.elixir
     clang-tools
     prettierd
-    nixfmt-rfc-style
+    nixfmt
     tex-fmt
     hclfmt
     topiary # TODO: Install https://github.com/blindFS/topiary-nushell somehow, e.g. clone languages.ncl to ~/.config/topiary/languages.ncl & nu.scm to ~/.config/topiary/topiary-queries/queries/nu.scm
@@ -130,4 +130,3 @@
     };
   };
 }
-
diff --git a/home/programs/river/src/lock.sh b/home/programs/river/src/lock.sh
index 73568da..aadf6ad 100755
--- a/home/programs/river/src/lock.sh
+++ b/home/programs/river/src/lock.sh
@@ -1 +1 @@
-betterlockscreen --lock blur
+hyprlock