diff --git a/modules/hyprland/home.nix b/modules/hyprland/home.nix
index 374a14c..c326e42 100644
--- a/modules/hyprland/home.nix
+++ b/modules/hyprland/home.nix
@@ -42,12 +42,15 @@ in
         inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
     };
     programs = {
+      hyprlock = {
+        enable = true;
+      };
       wlogout = {
         enable = true;
         layout = [
           {
             "label" = "lock";
-            "action" = "loginctl lock-session";
+            "action" = "hyprlock";
             "text" = "Lock";
             "keybind" = "l";
           }
diff --git a/modules/hyprland/settings.nix b/modules/hyprland/settings.nix
index ea89aca..f788ae7 100644
--- a/modules/hyprland/settings.nix
+++ b/modules/hyprland/settings.nix
@@ -1,4 +1,12 @@
-{ inputs, pkgs, ... }:
+{
+  inputs,
+  pkgs,
+  config,
+  ...
+}:
+let
+  base16 = config.modules.base16;
+in
 {
   home.packages = [
     pkgs.hyprcursor
@@ -23,7 +31,8 @@
       gaps_in = 1;
       gaps_out = 1;
       border_size = 1;
-      # col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg
+      "col.active_border" =
+        "rgb(${toString base16.rgb."06".r},${toString base16.rgb."06".g},${toString base16.rgb."06".b})";
       # col.inactive_border = rgba(595959aa)
       resize_on_border = false;
       allow_tearing = true;