diff --git a/configuration.nix b/configuration.nix
index f6b5495..38fdac5 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -137,8 +137,8 @@
 
   qt.enable = true;
 
-  # Enable OpenGL
   hardware = {
+    # Enable OpenGL
     graphics.enable = true;
     nvidia = {
       # Required
diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix
index 4df5d0b..38dd3b8 100644
--- a/home/hyprland/default.nix
+++ b/home/hyprland/default.nix
@@ -10,9 +10,12 @@
   ];
 
   home.file.".config/hypr/hyprland.conf".source = ./hyprland.conf;
-  programs.kitty = {
-    settings = {
-      window_padding_width = 10;
+  programs = {
+    btop.enable = true;
+    kitty = {
+      settings = {
+        window_padding_width = 10;
+      };
     };
   };
 }
diff --git a/home/hyprland/hypridle/default.nix b/home/hyprland/hypridle/default.nix
index 244404f..f7a0f1d 100644
--- a/home/hyprland/hypridle/default.nix
+++ b/home/hyprland/hypridle/default.nix
@@ -7,19 +7,19 @@
       general = {
         after_sleep_cmd = "hyprctl dispatch dpms on";
         ignore_dbus_inhibit = false;
-        lock_cmd = "hyprlock";
+        lock_cmd = "pidof hyprlock || hyprlock"; # Avoid running multiple instances of hyprlock
       };
 
       listener = [
         {
-          timeout = 900; # Seconds
+          timeout = 900; # 15 min
           on-timeout = "hyprlock";
         }
-        {
-          timeout = 1200;
-          on-timeout = "hyprctl dispatch dpms off";
-          on-resume = "hyprctl dispatch dpms on";
-        }
+        #        {
+        #          timeout = 1200;
+        #          on-timeout = "hyprctl dispatch dpms off";
+        #          on-resume = "hyprctl dispatch dpms on";
+        #        }
       ];
     };
   };
diff --git a/home/hyprland/hyprlock/default.nix b/home/hyprland/hyprlock/default.nix
index cf4cfd6..061e0aa 100644
--- a/home/hyprland/hyprlock/default.nix
+++ b/home/hyprland/hyprlock/default.nix
@@ -1,8 +1,6 @@
 { lib, ... }:
 
 {
-  home.file.".face.png".source = ./face.png;
-  # TODO style face and wallpaper
   programs.hyprlock = {
     enable = true;
     settings = {
@@ -59,16 +57,6 @@
         }
       ];
 
-      # USER AVATAR
-      image = {
-        path = "~/.face.png";
-        size = 100;
-        border_color = "$accent";
-        position = "0, 75";
-        halign = "center";
-        valign = "center";
-      };
-
       # INPUT FIELD
       input-field = {
         size = "300, 60";
@@ -86,7 +74,7 @@
         fail_color = lib.mkDefault "$red";
         fail_text = "<i>$FAIL <b>($ATTEMPTS)</b></i>";
         capslock_color = lib.mkDefault "$yellow";
-        position = "0, -47";
+        position = "0, -20%";
         halign = "center";
         valign = "center";
       };
diff --git a/home/hyprland/hyprlock/face.png b/home/hyprland/hyprlock/face.png
deleted file mode 100644
index 81edd1f..0000000
Binary files a/home/hyprland/hyprlock/face.png and /dev/null differ