diff --git a/modules/niri/fuzzel.conf.nix b/modules/niri/fuzzel.conf.nix
index fe43e4c..56ae3de 100644
--- a/modules/niri/fuzzel.conf.nix
+++ b/modules/niri/fuzzel.conf.nix
@@ -1,11 +1,24 @@
-{ lib, config, ... }: {
-  colors = with lib; with strings; {
-    background = concatStrings [ config.theme.base "ee" ];
-    text = concatStrings [ config.theme.text "ff" ];
-    match = concatStrings [ config.theme.gold "ff" ];
-    selection = concatStrings [ config.theme.highlight-med "ee" ];
-    selection-text = concatStrings [ config.theme.text "ff" ];
-    selection-match = concatStrings [ config.theme.gold "ff" ];
-    border = concatStrings [ config.theme.overlay "ff" ];
+{ lib, config, ... }: let
+  inherit (lib.strings) concatStrings;
+  inherit (config) theme;
+in {
+  main = {
+    font = "FiraCodeNerdFont:size=18";
+    prompt = "";
+    icons-enabled = false;
+    terminal = "alacritty -e";
+    list-executables-in-path = true;
+  };
+  colors = {
+    background = concatStrings [ theme.base "ee" ];
+    text = concatStrings [ theme.text "ff" ];
+    match = concatStrings [ theme.gold "ff" ];
+    selection = concatStrings [ theme.highlight-med "ee" ];
+    selection-text = concatStrings [ theme.text "ff" ];
+    selection-match = concatStrings [ theme.gold "ff" ];
   }; 
+  border = {
+    width = 0;
+    radius = 8;
+  };
 }
diff --git a/modules/niri/niri.conf.nix b/modules/niri/niri.conf.nix
index 96a2221..be0542f 100644
--- a/modules/niri/niri.conf.nix
+++ b/modules/niri/niri.conf.nix
@@ -81,14 +81,14 @@ in {
     { command = ["waybar"]; }
     { command = ["brightnessctl" "s" "50%"]; }
     { command = ["swaybg" "-i" "${./wallpaper.png}"]; }
-    { command = ["swayidle" "-w" "before-sleep" "swaylock"]; }
+    { command = ["swayidle" "-w" "before-sleep" "swaylock" ]; }
   ];
 
   binds = {
     # Shortcuts
     "Mod+Z".action.spawn = "alacritty";
     "Mod+B".action.spawn = "firefox";
-    "Mod+Semicolon".action.spawn = ["fuzzel" "-I" "-T" "alacritty" "-p" ""];
+    "Mod+Space".action.spawn = "fuzzel";
 
     "XF86AudioRaiseVolume".action.spawn = ["wpctl" "set-volume" "-l" "1" "@DEFAULT_AUDIO_SINK@" "5%+"];
     "XF86AudioLowerVolume".action.spawn = ["wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "5%-"];
diff --git a/modules/niri/swaylock.conf.nix b/modules/niri/swaylock.conf.nix
index a6e1392..14cad6a 100644
--- a/modules/niri/swaylock.conf.nix
+++ b/modules/niri/swaylock.conf.nix
@@ -2,6 +2,7 @@
   inherit (lib.strings) concatStrings;
   inherit (config) theme;
 in {
+  daemonize = true;
   ignore-empty-password = true;
   submit-on-touch = true;