diff --git a/hypr/hyprlock.conf b/hypr/hyprlock.conf
index be00954..5e25155 100644
--- a/hypr/hyprlock.conf
+++ b/hypr/hyprlock.conf
@@ -1,55 +1,77 @@
 source = $HOME/.config/hypr/mocha.conf
 
-$accent = $mauve
-$accentAlpha = $mauveAlpha
+$primary = rgb(1fb854)
+$secondary = rgb(1eb88e)
+$accent = rgb(1fb8ab)
+$accentAlpha = f5e0dc
+$neutral = rgb(19362d)
+$base100 = rgb(1b1717)
+$base200 = rgb(161212)
+$base300 = rgb(110d0d)
+$basecontent = rgb(cac9c9)
+$basecontentAlpha = cac9c9
+
+$info = rgb(00b5ff)
+$success = rgb(00a96e)
+$warning = rgb(ffbe00)
+$error = rgb(ff5861)
+
+$text = $basecontent
+$textAlpha = $basecontentAlpha
 $font = JetBrainsMono Nerd Font
 
 # GENERAL
 general {
-  disable_loading_bar = true
+  disable_loading_bar = false
   hide_cursor = true
+  ignore_empty_input = true
 }
 
 # BACKGROUND
 background {
   monitor =
-  path = $HOME/.config/background
-  blur_passes = 0
-  color = $base
+  path = $HOME/.cache/hyprlock/wallpaper
+  reload_cmd = "cp $(cat $HOME/.cache/wal/wal) $HOME/.cache/hyprlock/wallpaper"
+  blur_passes = 1
+  blur_size = 3
+  # color = $base
 }
 
 # LAYOUT
 label {
   monitor =
+  shadow_passes = 1
   text = Layout: $LAYOUT
   color = $text
   font_size = 25
   font_family = $font
-  position = 30, -30
+  position = 20, 20
   halign = left
-  valign = top
+  valign = bottom
 }
 
 # TIME
 label {
   monitor =
-  text = $TIME
+  shadow_passes = 1
+  text = cmd[update:1000] date +"%T"
   color = $text
   font_size = 90
   font_family = $font
-  position = -30, 0
-  halign = right
+  position = 0, -20
+  halign = center
   valign = top
 }
 
 # DATE
 label {
   monitor =
+  shadow_passes = 1
   text = cmd[update:43200000] date +"%A, %d %B %Y"
   color = $text
   font_size = 25
   font_family = $font
-  position = -30, -150
+  position = -10, -10
   halign = right
   valign = top
 }
@@ -58,9 +80,24 @@ label {
 image {
   monitor =
   path = $HOME/.face
-  size = 100
-  border_color = $accent
-  position = 0, 75
+  shadow_passes = 1
+  size = 150
+  border_color = $base100
+  border_size = 2
+  position = 0, 60
+  halign = center
+  valign = center
+}
+
+# GREETING
+label {
+  monitor =
+  shadow_passes = 1
+  text = <span foreground="##$textAlpha">Welcome back <span foreground="##$accentAlpha">$USER</span></span>
+  color = $text
+  font_size = 30
+  font_family = $font
+  position = 0, 280
   halign = center
   valign = center
 }
@@ -69,21 +106,23 @@ image {
 input-field {
   monitor =
   size = 300, 60
-  outline_thickness = 4
+  shadow_passes = 1
+  rounding = 20
+  outline_thickness = 0
   dots_size = 0.2
   dots_spacing = 0.2
   dots_center = true
-  outer_color = $accent
-  inner_color = $surface0
+  outer_color = $base100
+  inner_color = $base100
   font_color = $text
   fade_on_empty = false
-  placeholder_text = <span foreground="##$textAlpha"><i>󰌾 Logged in as </i><span foreground="##$accentAlpha">$USER</span></span>
+  placeholder_text = <span foreground="##$textAlpha"><i>Input password...</i></span>
   hide_input = false
-  check_color = $accent
-  fail_color = $red
+  check_color = $info
+  fail_color = $error
   fail_text = <i>$FAIL <b>($ATTEMPTS)</b></i>
-  capslock_color = $yellow
-  position = 0, -47
+  capslock_color = $warning
+  position = 0, -90
   halign = center
   valign = center
 }
diff --git a/hypr/mocha.conf b/hypr/mocha.conf
deleted file mode 100644
index 8ccb56a..0000000
--- a/hypr/mocha.conf
+++ /dev/null
@@ -1,78 +0,0 @@
-
-$rosewater = rgb(f5e0dc)
-$rosewaterAlpha = f5e0dc
-
-$flamingo = rgb(f2cdcd)
-$flamingoAlpha = f2cdcd
-
-$pink = rgb(f5c2e7)
-$pinkAlpha = f5c2e7
-
-$mauve = rgb(cba6f7)
-$mauveAlpha = cba6f7
-
-$red = rgb(f38ba8)
-$redAlpha = f38ba8
-
-$maroon = rgb(eba0ac)
-$maroonAlpha = eba0ac
-
-$peach = rgb(fab387)
-$peachAlpha = fab387
-
-$yellow = rgb(f9e2af)
-$yellowAlpha = f9e2af
-
-$green = rgb(a6e3a1)
-$greenAlpha = a6e3a1
-
-$teal = rgb(94e2d5)
-$tealAlpha = 94e2d5
-
-$sky = rgb(89dceb)
-$skyAlpha = 89dceb
-
-$sapphire = rgb(74c7ec)
-$sapphireAlpha = 74c7ec
-
-$blue = rgb(89b4fa)
-$blueAlpha = 89b4fa
-
-$lavender = rgb(b4befe)
-$lavenderAlpha = b4befe
-
-$text = rgb(cdd6f4)
-$textAlpha = cdd6f4
-
-$subtext1 = rgb(bac2de)
-$subtext1Alpha = bac2de
-
-$subtext0 = rgb(a6adc8)
-$subtext0Alpha = a6adc8
-
-$overlay2 = rgb(9399b2)
-$overlay2Alpha = 9399b2
-
-$overlay1 = rgb(7f849c)
-$overlay1Alpha = 7f849c
-
-$overlay0 = rgb(6c7086)
-$overlay0Alpha = 6c7086
-
-$surface2 = rgb(585b70)
-$surface2Alpha = 585b70
-
-$surface1 = rgb(45475a)
-$surface1Alpha = 45475a
-
-$surface0 = rgb(313244)
-$surface0Alpha = 313244
-
-$base = rgb(1e1e2e)
-$baseAlpha = 1e1e2e
-
-$mantle = rgb(181825)
-$mantleAlpha = 181825
-
-$crust = rgb(11111b)
-$crustAlpha = 11111b