diff --git a/hyprlock/hyprlock.conf b/hyprlock/hyprlock.conf
index ad39d33..555926f 100644
--- a/hyprlock/hyprlock.conf
+++ b/hyprlock/hyprlock.conf
@@ -1,79 +1,93 @@
-source = $HOME/.config/hypr/mocha.conf
 
-$accent = $mauve
-$accentAlpha = $mauveAlpha
-$font = JetBrainsMono Nerd Font
+# Colors
+$text = rgb(ffffff)
+$accent = rgb(e6c272)
+$clockAccent = rgba(249, 226, 175, .7)
+$background = rgb(312d23)
+$backgroundAlt = rgb(50462f)
+
+# Fonts
+$font = Cantarell Regular
+$clockFont = Cantarell Black
 
-# GENERAL
 general {
-    disable_loading_bar = true
-    hide_cursor = true
+    disable_loading_bar = true 
+    hide_cursor = false
 }
 
-# BACKGROUND
 background {
     monitor =
-    path = ~/.config/background
-    blur_passes = 0
-    color = $base
+    path = ~/wallpapers/nijika-ijichi-btr.jpg
+    blur_passes = 2
+    # color = $COLOR / rgb(COLOR)
 }
 
-# TIME
+# Time
 label {
     monitor =
-    text = cmd[update:30000] echo "$(date +"%R")"
-    color = $text
-    font_size = 90
-    font_family = $font
-    position = -30, 0
-    halign = right
+    text = cmd[update:30000] echo -e "$(date +"%R")" # 24-hour style
+    # text = cmd[update:30000] echo -e "$(date +"%r")"
+    color = $clockAccent
+    font_size = 120
+    font_family = $clockFont
+    position = 0, -60
+    halign = center
     valign = top
 }
 
-# DATE 
+# Date
 label {
     monitor = 
-    text = cmd[update:43200000] echo "$(date +"%A, %d %B %Y")"
+    text = cmd[update:43200000] echo -e "$(date +"%A, %d %B %Y")"
     color = $text
-    font_size = 25
+    font_size = 20
     font_family = $font
-    position = -30, -150
-    halign = right
+    position = 0, -250
+    halign = center
     valign = top
 }
 
-# USER AVATAR
+# Logged user
+label {
+    monitor = 
+    font_size = 6
+    font_family = Noto Sans Mono
+    text = Currently logged in as $USER
+    halign = center
+    valign = bottom
+    position = 0, 5
+}
 
+# Avatar
 image {
     monitor = 
     path = ~/.face
-    size = 100
+    size = 70
     border_color = $accent
-
-    position = 0, 75
+    position = 0, 100
     halign = center
-    valign = center
+    valign = bottom
 }
 
-# INPUT FIELD
+# Input (password)
 input-field {
     monitor =
-    size = 300, 60
-    outline_thickness = 4
-    dots_size = 0.2
-    dots_spacing = 0.2
+    size = 180, 35
+    outline_thickness = 1 
+    dots_size = .15
+    dots_spacing = .6
     dots_center = true
-    outer_color = $accent
-    inner_color = $surface0
+    outer_color = $backgroundAlt
+    inner_color = $background
     font_color = $text
     fade_on_empty = false
-    placeholder_text = <span foreground="##cad3f5"><i>󰌾 Logged in as </i><span foreground="##b7bdf8">$USER</span></span>
+    placeholder_text = 
     hide_input = false
     check_color = $accent
-    fail_color = $red
+    fail_color = $accent
     fail_text = <i>$FAIL <b>($ATTEMPTS)</b></i>
-    capslock_color = $yellow
-    position = 0, -35
+    capslock_color = $accent
+    position = 0, 40
     halign = center
-    valign = center
+    valign = bottom
 }