diff --git a/niri/config.kdl b/niri/config.kdl
index 9ceac81..f306fa3 100644
--- a/niri/config.kdl
+++ b/niri/config.kdl
@@ -1,82 +1,50 @@
-input {
-    keyboard {
-        repeat-delay 250
-        repeat-rate 60
-    }
-
-    touchpad {
-        tap
-        natural-scroll
-        dwt
-        accel-speed 0.4
-    }
-}
-
 layout {
     gaps 10
-    border-width 2
+
+    border {
+        width 2
+        active-color "#ffb86c"
+        inactive-color "#444444"
+    }
 
     focus-ring {
-        width 3
-        active-color "#89b4fa"
-        inactive-color "#444444"
+        width 4
     }
 }
 
-environment {
-    MOZ_ENABLE_WAYLAND "1"
-    QT_QPA_PLATFORM "wayland"
-    SDL_VIDEODRIVER "wayland"
-}
-
-spawn-at-startup [
-    "waybar"
-    "mako"
-    "swww-daemon"
-    "nm-applet --indicator"
-    "polkit-gnome-authentication-agent-1"
-]
+spawn-at-startup "waybar"
+spawn-at-startup "mako"
+spawn-at-startup "swww-daemon"
+spawn-at-startup "nm-applet" "--indicator"
+spawn-at-startup "polkit-gnome-authentication-agent-1"
 
 binds {
-    // apps
-    Mod+Return { spawn "alacritty" }
-    Mod+D { spawn "wofi --show drun" }
-    Mod+E { spawn "thunar" }
+    Mod+Q repeat=false { close-window; }
+    Mod+F { fullscreen-window; }
 
-    // window control
-    Mod+Q { close-window }
-    Mod+F { toggle-fullscreen }
+    Mod+Return { spawn "alacritty"; }
+    Mod+D { spawn "wofi" "--show" "drun"; }
+    Mod+E { spawn "thunar"; }
 
-    // focus
-    Mod+H { focus-left }
-    Mod+J { focus-down }
-    Mod+K { focus-up }
-    Mod+L { focus-right }
+    Mod+H { focus-column-left; }
+    Mod+L { focus-column-right; }
+    Mod+J { focus-window-down; }
+    Mod+K { focus-window-up; }
 
-    // move windows
-    Mod+Shift+H { move-left }
-    Mod+Shift+J { move-down }
-    Mod+Shift+K { move-up }
-    Mod+Shift+L { move-right }
+    Mod+Shift+H { move-column-left; }
+    Mod+Shift+L { move-column-right; }
+    Mod+Shift+J { move-window-down; }
+    Mod+Shift+K { move-window-up; }
 
-    // screenshot
-    Print { spawn "grim -g \"$(slurp)\" ~/Pictures/screenshot-$(date +%s).png" }
+    Print { spawn-sh "grim -g \"$(slurp)\" ~/Pictures/screenshot-$(date +%s).png"; }
 
-    // lock / exit
-    Mod+Shift+E { spawn "swaylock -f -c 000000" }
-    Mod+Shift+X { quit }
+    Mod+Shift+E { spawn "swaylock" "-f" "-c" "000000"; }
+    Mod+Shift+X { quit; }
 
-    // volume
-    XF86AudioRaiseVolume { spawn "pamixer -i 5" }
-    XF86AudioLowerVolume { spawn "pamixer -d 5" }
-    XF86AudioMute { spawn "pamixer -t" }
-
-    // brightness
-    XF86MonBrightnessUp { spawn "brightnessctl set +10%" }
-    XF86MonBrightnessDown { spawn "brightnessctl set 10%-" }
-
-spawn-at-startup [
-    "~/dotfiles/scripts/autostart.sh"
-]
+    XF86AudioRaiseVolume allow-when-locked=true { spawn "pamixer" "-i" "5"; }
+    XF86AudioLowerVolume allow-when-locked=true { spawn "pamixer" "-d" "5"; }
+    XF86AudioMute        allow-when-locked=true { spawn "pamixer" "-t"; }
 
+    XF86MonBrightnessUp   allow-when-locked=true { spawn "brightnessctl" "set" "+10%"; }
+    XF86MonBrightnessDown allow-when-locked=true { spawn "brightnessctl" "set" "10%-"; }
 }