diff --git a/.config/hypr/hyprlock.conf b/.config/hypr/hyprlock.conf
index 420a7e0..e8028fb 100644
--- a/.config/hypr/hyprlock.conf
+++ b/.config/hypr/hyprlock.conf
@@ -34,19 +34,90 @@ background {
 # AUTO BACKGROUND
 # AUTO BACKGROUND END
 
-# TIME
+# Time-Hour
 label {
-  text = $TIME
-  color = rgb(255, 255, 255)
-  font_size = 90
-  font_family = $font
-  position = 75, 0
-  halign = left
-  valign = top
+    monitor =
+    text = cmd[update:1000] echo "<span>$(date +"%I")</span>"
+    color = rgba(255, 255, 255, 1)
+    font_size = 125
+    font_family = StretchPro
+    position = -80, 290
+    halign = center
+    valign = center
 }
 
+# Time-Minute
+label {
+    monitor =
+    text = cmd[update:1000] echo "<span>$(date +"%M")</span>"
+    color = rgba(147, 196, 255, 1)
+    font_size = 125
+    font_family = StretchPro
+    position = 0, 170
+    halign = center
+    valign = center
+}
+
+# Day-Month-Date
+label {
+    monitor =
+    text = cmd[update:1000] echo -e "$(date +"%d %B, %a.")"
+    color = rgba(255, 255, 255, 100)
+    font_size = 22
+    font_family = Suisse Int'l Mono
+    position = 20, 92
+    halign = center
+    valign = center
+}
+
+# USER AVATAR
+image {
+  monitor = 
+  path = $HOME/.face
+  rounding = 25
+  size = 200
+  # border_color = rgb(0, 0, 0)
+  border_size = 0
+  position = 0, -100
+  halign = center
+  valign = center
+}
+
+# INPUT FIELD
+input-field {
+    monitor =
+    size = 300, 60
+    outline_thickness = 2
+    dots_size = 0.2 # Scale of input-field height, 0.2 - 0.8
+    dots_spacing = 0.2 # Scale of dots' absolute size, 0.0 - 1.0
+    dots_center = true
+    outer_color = rgba(255, 255, 255, 1)
+    inner_color = rgba(0, 0, 0, 1)
+    font_color = rgb(200, 200, 200)
+    fade_on_empty = false
+    font_family = SF Pro Display Bold
+    placeholder_text = <i><span foreground="##ffffff99">Password...</span></i>
+    hide_input = false
+    position = 0, -290
+    halign = center
+    valign = center
+}
+
+# CURRENT SONG
+# label {
+#     monitor = eDP-1
+#     text = cmd[update:1000] echo "$(~/.config/hypr/scripts/songdetail.sh)" 
+#     color = rgba(147, 196, 255, 1)
+#     font_size = 18
+#     font_family = JetBrains Mono Nerd, SF Pro Display Bold
+#     position = 0, 20
+#     halign = center
+#     valign = bottom
+# }
+
 # Battery
 label {
+  monitor = eDP-1
   text = cmd[update:1000] /home/nathan/.config/hypr/scripts/battery.sh
   color = rgb(255, 255, 255)
   font_size = 20
@@ -55,63 +126,3 @@ label {
   halign = right
   valign = bottom
 }
-
-# DATE
-# label {
-# #   monitor =
-#   text = cmd[update:43200000] date +"%A, %d %B %Y"
-#   color = rgb(255, 255, 255)
-#   font_size = 25
-#   font_family = $font
-#   position = 30, -150
-#   halign = left
-#   valign = top
-# }
-shape {
-  monitor =
-  size = 500, 100%
-  color = rgba(255, 255, 255, 0.18)
-  rounding = 25
-  # border_size = 4
-  # border_color = rgba(255, 255, 255, 1.0)
-
-  position = -25, 0
-  halign = left
-  valign = center
-}
-
-# USER AVATAR
-image {
-  #   monitor =
-  path = $HOME/.face
-  rounding = 25
-  size = 200
-  # border_color = rgb(0, 0, 0)
-  border_size = 0
-  position = 150, 100
-  halign = left
-  valign = center
-}
-  
-  # INPUT FIELD
-input-field {
-#   monitor =
-  size = 300, 60
-  position = 100, -47
-  outline_thickness = 4
-  dots_size = 0.2
-  dots_spacing = 0.2
-  dots_center = true
-  outer_color = rgb(0, 0, 0)
-  inner_color = rgb(255, 255, 255)
-  font_color = rgb(0, 0, 0)
-  fade_on_empty = false
-  placeholder_text = <span foreground="black"><i>󰌾</i> Nathan</span>
-  hide_input = false
-  check_color = rgb(212, 130, 6)
-  fail_color = rgb(255, 0, 0)
-  fail_text = <i>$FAIL <b>($ATTEMPTS)</b></i>
-  capslock_color = rgb(255, 0, 0)
-  halign = left
-  valign = center
-}
diff --git a/.config/hypr/scripts/songdetail.sh b/.config/hypr/scripts/songdetail.sh
new file mode 100755
index 0000000..51745e6
--- /dev/null
+++ b/.config/hypr/scripts/songdetail.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+song_info=$(playerctl metadata --format '{{title}}      {{artist}}')
+
+echo "$song_info"