diff --git a/.config/gtklock/EndeavourOS_Astronaut_SpaceWalk.png b/.config/gtklock/EndeavourOS_Astronaut_SpaceWalk.png
new file mode 100644
index 0000000..bea1297
Binary files /dev/null and b/.config/gtklock/EndeavourOS_Astronaut_SpaceWalk.png differ
diff --git a/.config/gtklock/config.ini b/.config/gtklock/config.ini
new file mode 100644
index 0000000..ae7694d
--- /dev/null
+++ b/.config/gtklock/config.ini
@@ -0,0 +1,19 @@
+[main]
+gtk-theme=Arc-Dark
+time-format=%l:%M %p
+start-hidden=1
+modules=userinfo-module;powerbar-module
+
+[userinfo]
+round-image=true
+horizontal-layout=false
+under-clock=true
+
+[powerbar]
+show-labels=true
+linked-buttons=true
+reboot-command=systemctl reboot
+poweroff-command=systemctl -i poweroff
+suspend-command=systemctl suspend
+userswitch-command=
+logout-command=swaymsg exit
diff --git a/.config/gtklock/style.css b/.config/gtklock/style.css
new file mode 100644
index 0000000..7711399
--- /dev/null
+++ b/.config/gtklock/style.css
@@ -0,0 +1,47 @@
+* {
+  border: none;
+  text-shadow: 1px 1px 3px rgba(0, 0, 0, 0.8)
+}
+window {
+  background-image: url("EndeavourOS_Astronaut_SpaceWalk.png");
+  background-size: cover;
+  background-repeat: no-repeat;
+  background-position: center;
+  background-color: black;
+}
+#clock-label {
+  font-family: JetBrainsMono;
+  font-size: 64.0px;
+}
+#unlock-button {
+  background: none;
+  background-color: rgba(127, 63, 191, 0.4);
+  border: 2px solid rgba(127, 63, 191, 0.5);
+  padding: 4px;
+}
+#unlock-button:hover {
+  background-color: rgba(127, 63, 191, 0.9);
+}
+#input-field {
+  border-radius: 10px;
+  background-color: rgba(127, 127, 255, 0.1);
+  border: 2px solid rgba(127, 63, 191, 0.5);
+  padding-top: 5px;
+  padding-bottom: 5px;
+}
+#powerbar-box button {
+  background: none;
+  background-color: rgba(127, 63, 191, 0.4);
+  border: 2px solid rgba(127, 63, 191, 0.5);
+  border-radius: 10px;
+  padding: 4px;
+}
+#powerbar-box button:hover {
+  background-color: rgba(127, 63, 191, 0.9);
+}
+#input-label {
+  font-size: 0px;
+}
+#window-box infobar {
+  background-color: transparent;
+}
diff --git a/.config/sway/config.d/autostart_applications b/.config/sway/config.d/autostart_applications
index 7d0d1db..aeaa80c 100644
--- a/.config/sway/config.d/autostart_applications
+++ b/.config/sway/config.d/autostart_applications
@@ -7,10 +7,14 @@ exec /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
 # Import environment variables for user systemd service manager
 exec systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK
 
-# Update dbux environments with display variables
+# Update dbus environments with display variables
 exec hash dbus-update-activation-environment 2>/dev/null && \
      dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK
 
+# Idle configuration
+exec swayidle idlehint 1
+exec_always swayidle -w before-sleep "gtklock -d"
+
 # Desktop notifications
 exec mako
 
diff --git a/.config/sway/config.d/default b/.config/sway/config.d/default
index f1c2d41..e68a28b 100644
--- a/.config/sway/config.d/default
+++ b/.config/sway/config.d/default
@@ -19,11 +19,6 @@ set $menu nwg-drawer
 # Power Menu
 set $powermenu ~/.config/sway/scripts/power_menu.sh
 
-### Idle configuration
-exec swayidle idlehint 1
-set $lock swaylock -C ~/.config/swaylock/config
-exec_always swayidle -w before-sleep "$lock"
-
 ### Key bindings
 #
 # Basics:
@@ -44,7 +39,7 @@ exec_always swayidle -w before-sleep "$lock"
     bindsym $mod+Shift+d exec $menu
 
     # Lock screen
-    bindsym $mod+f1 exec $lock
+    bindsym $mod+f1 exec gtklock
 
     # Activities
     bindsym $mod+p exec ~/.config/sway/scripts/window_switcher.sh
diff --git a/.config/swaylock/config b/.config/swaylock/config
deleted file mode 100644
index 11e7bae..0000000
--- a/.config/swaylock/config
+++ /dev/null
@@ -1,24 +0,0 @@
-# indicator
-# no-unlock-indicator
-# daemonize
-indicator-caps-lock
-# datestr=%A
-image=$HOME/.config/sway/swaylock.png
-scaling=fill
-font=UbuntuMono
-font-size=20
-
-# Ring
-indicator-radius=115
-# line-uses-ring
-line-color=#3b4252
-text-color=#d8dee9
-inside-color=#2e344098
-inside-ver-color=#5e81ac
-line-ver-color=#5e81ac
-ring-ver-color=#5e81ac98
-ring-color=#4c566a
-key-hl-color=#5e81ac
-separator-color=#4c566a
-layout-text-color=#eceff4
-line-wrong-color=#d08770
diff --git a/.config/swaylock/qt5ct/qt5ct.conf b/.config/swaylock/qt5ct/qt5ct.conf
deleted file mode 100644
index b32291b..0000000
--- a/.config/swaylock/qt5ct/qt5ct.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-[Appearance]
-color_scheme_path=/usr/share/qt5ct/colors/airy.conf
-custom_palette=false
-icon_theme=Papirus
-standard_dialogs=default
-style=kvantum-dark
-
-[Fonts]
-fixed=@Variant(\0\0\0@\0\0\0\x12\0\x43\0\x61\0n\0t\0\x61\0r\0\x65\0l\0l@$\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0\x32\x10)
-general=@Variant(\0\0\0@\0\0\0\x12\0\x43\0\x61\0n\0t\0\x61\0r\0\x65\0l\0l@$\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0\x32\x10)
-
-[Interface]
-activate_item_on_single_click=1
-buttonbox_layout=0
-cursor_flash_time=1000
-dialog_buttons_have_icons=1
-double_click_interval=400
-gui_effects=@Invalid()
-keyboard_scheme=2
-menus_have_icons=true
-show_shortcuts_in_context_menus=true
-stylesheets=@Invalid()
-toolbutton_style=4
-underline_shortcut=1
-wheel_scroll_lines=3
-
-[SettingsWindow]
-geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\a\x80\0\0\0\"\0\0\v:\0\0\x4\x1c\0\0\a\x80\0\0\0\"\0\0\xe\xff\0\0\x4\x37\0\0\0\0\x2\0\0\0\a\x80\0\0\a\x80\0\0\0\"\0\0\v:\0\0\x4\x1c)
diff --git a/home_config/.face b/home_config/.face
new file mode 100644
index 0000000..067d909
Binary files /dev/null and b/home_config/.face differ
diff --git a/packages-repository.txt b/packages-repository.txt
index 4aaa6e9..7757c06 100644
--- a/packages-repository.txt
+++ b/packages-repository.txt
@@ -14,6 +14,9 @@ greetd-regreet
 grim
 gtk-engine-murrine
 gtk-layer-shell
+gtklock
+gtklock-powerbar-module
+gtklock-userinfo-module
 gvfs
 gvfs-afc
 gvfs-gphoto2
@@ -34,7 +37,6 @@ sway
 swaybg
 sway-contrib
 swayidle
-swaylock
 sysstat
 thunar
 thunar-archive-plugin