diff --git a/hyprland/colours.conf b/hyprland/colours.conf
index 5d06674..bd5ed96 100644
--- a/hyprland/colours.conf
+++ b/hyprland/colours.conf
@@ -7,4 +7,10 @@ general {
     col.inactive_border = rgba($subtext194)
 }
 
-windowrulev2 = bordercolor rgb($accent) rgba($accent94), pinned:1
+decoration {
+    shadow {
+        color = rgba($overlay2d4)
+    }
+}
+
+windowrulev2 = bordercolor rgb($primary) rgba($primary94), pinned:1
diff --git a/hyprland/decoration.conf b/hyprland/decoration.conf
index 851ec5a..f6bffed 100644
--- a/hyprland/decoration.conf
+++ b/hyprland/decoration.conf
@@ -16,7 +16,6 @@ decoration {
         enabled = true
         range = 5
         render_power = 3
-        color = rgba(000000a4)
     }
 
     # Dim
diff --git a/scheme/default.conf b/scheme/default.conf
index 2326bd2..5d3f7ae 100644
--- a/scheme/default.conf
+++ b/scheme/default.conf
@@ -26,4 +26,6 @@ $mantle = 21242b
 $crust = 1e2126
 $success = 98c379
 $error = be5046
-$accent = d19a66
+$primary = d19a66
+$secondary = 61afef
+$tertiary = 98c379
diff --git a/scripts/templates/hyprlock-base.conf b/scripts/templates/hyprlock-base.conf
index 1a210d7..add30f3 100644
--- a/scripts/templates/hyprlock-base.conf
+++ b/scripts/templates/hyprlock-base.conf
@@ -1,6 +1,5 @@
 source = ~/.config/hypr/scheme/current.conf
 
-$secondary_text = rgb($overlay2)
 $font_family = JetBrainsMonoNF
 $scripts = ~/.config/hypr/scripts
 $media_cmd = caelestia shell media
@@ -38,7 +37,7 @@ input-field {
     check_color = rgb($sky)
     fail_color = rgb($error)
     fade_on_empty = false
-    placeholder_text = <i>󰌾 Logged in as </i><span foreground="##$accent">$USER</span>
+    placeholder_text = <i>󰌾 Logged in as </i><span foreground="##$primary">$USER</span>
     fail_text = <i>$FAIL ($ATTEMPTS)</i>
     swap_font_color = true
 
@@ -50,7 +49,7 @@ input-field {
 label {  # Clock
     monitor =
     text = $TIME
-    color = rgb($accent)
+    color = rgb($primary)
     font_size = 200
     font_family = $font_family ExtraBold
 
@@ -62,7 +61,7 @@ label {  # Clock
 label {  # Date
     monitor =
     text = cmd[update:5000] date +'%B %d %Y'
-    color = $secondary_text
+    color = rgb($secondary)
     font_size = 40
     font_family = $font_family Bold
 
@@ -74,7 +73,7 @@ label {  # Date
 label {  # Day
     monitor =
     text = cmd[update:5000] date +'%A'
-    color = $secondary_text
+    color = rgb($secondary)
     font_size = 40
     font_family = $font_family Bold
 
@@ -86,7 +85,7 @@ label {  # Day
 label {  # Uptime
     monitor =
     text = cmd[update:60000] uptime -p
-    color = rgb($accent)
+    color = rgb($primary)
     font_size = 20
     font_family = $font_family Bold
 
@@ -98,7 +97,7 @@ label {  # Uptime
 label {  # Battery
     monitor =
     text = cmd[update:5000] $scripts/battery.fish
-    color = rgb($accent)
+    color = rgb($primary)
     font_size = 20
     font_family = $font_family Bold
 
@@ -110,7 +109,7 @@ label {  # Battery
 label {  # Weather if no battery
     monitor =
     text = cmd[update:90000] $scripts/battery.fish > /dev/null || $scripts/weather.fish
-    color = rgb($accent)
+    color = rgb($primary)
     font_size = 20
     font_family = $font_family Bold