diff --git a/gtk-theme.nix b/gtk-theme.nix
index 71801f0..87137d7 100644
--- a/gtk-theme.nix
+++ b/gtk-theme.nix
@@ -36,29 +36,29 @@ pkgs.stdenv.mkDerivation rec {
     sed -e 's/handle-horz-.*//' -e 's/handle-vert-.*//' -i ./src/gtk-2.0/assets.txt
 
     cat > /build/gtk-colors << EOF
-      BTN_BG=${palette.bright.black}
-      BTN_FG=${palette.normal.blue}
+      BTN_BG=${palette.util.bg}
+      BTN_FG=${palette.bright.yellow}
       FG=${palette.util.fg}
       BG=${palette.util.bg}
-      HDR_BTN_BG=${palette.bright.black}
-      HDR_BTN_FG=${palette.normal.blue}
-      ACCENT_BG=${palette.bright.black}
+      HDR_BTN_BG=${palette.util.bg}
+      HDR_BTN_FG=${palette.normal.yellow}
+      ACCENT_BG=${palette.normal.cyan}
       ACCENT_FG=${palette.normal.yellow}
-      HDR_FG=${palette.util.fg}
+      HDR_FG=${palette.normal.yellow}
       HDR_BG=${palette.util.bg}
       MATERIA_SURFACE=${palette.normal.black}
       MATERIA_VIEW=${palette.util.bg}
       MENU_BG=${palette.util.bg}
       MENU_FG=${palette.util.fg}
-      SEL_BG=${palette.normal.black}
-      SEL_FG=${palette.normal.yellow}
+      SEL_BG=${palette.normal.yellow}
+      SEL_FG=${palette.normal.cyan}
       TXT_BG=${palette.util.bg}
       TXT_FG=${palette.util.fg}
       WM_BORDER_FOCUS=${palette.normal.yellow}
       WM_BORDER_UNFOCUS=${palette.normal.black}
       UNITY_DEFAULT_LAUNCHER_STYLE=False
       NAME="nix-rice"
-      MATERIA_STYLE_COMPACT=True
+      MATERIA_STYLE_COMPACT=False
     EOF
 
     echo "Changing colours:"
diff --git a/home/dots/hyprland/hyprland.conf b/home/dots/hyprland/hyprland.conf
index 0e9684a..7f65895 100644
--- a/home/dots/hyprland/hyprland.conf
+++ b/home/dots/hyprland/hyprland.conf
@@ -1,5 +1,5 @@
 exec-once = eww open bar
-exec-once = swayidle -w timeout 300 'waylock -init-color 0x#BORDER -input-color 0x#ACTIVEBORDER'
+exec-once = swayidle -w timeout 300 'gtklock' timeout 900 'systemctl suspend'
 exec-once = ckb-next -c -b
 exec-once = swaybg -i #BGIMAGE -m fill
 exec-once = xrdb -l ~/.Xresources
diff --git a/home/dots/wlogout/layout b/home/dots/wlogout/layout
index de02de1..8eeacd4 100644
--- a/home/dots/wlogout/layout
+++ b/home/dots/wlogout/layout
@@ -1,7 +1,7 @@
 [
   {
   "label" : "lock",
-  "action" : "waylock",
+  "action" : "gtklock",
   "text" : "Lock",
   "keybind" : "l"
   },
@@ -13,7 +13,7 @@
   },
   {
     "label" : "suspend",
-    "action" : "systemctl suspend",
+    "action" : "gtklock & systemctl suspend",
     "text" : "Suspend",
     "keybind" : "s"
   },
diff --git a/home/home.nix b/home/home.nix
index 529790e..e2255cf 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -44,7 +44,7 @@ in {
     xorg.xrdb
     swayidle
     swaynotificationcenter
-    waylock
+    gtklock
     playerctl
 
     xplr
@@ -268,7 +268,7 @@ in {
         util.bg
         normal.white
         normal.black
-        normal.red
+        normal.magenta
       ]
       (builtins.readFile dots/wlogout/style.css));
   };
diff --git a/system/configuration.nix b/system/configuration.nix
index 4d30f54..69eb9ea 100644
--- a/system/configuration.nix
+++ b/system/configuration.nix
@@ -196,7 +196,7 @@
     };
   };
 
-  security.pam.services.waylock = {
+  security.pam.services.gtklock = {
     text = ''
       auth include login
     '';