diff --git a/.config/hypr/hyprlock.conf b/.config/hypr/hyprlock.conf
index 71ad2ff4..ca74f370 100644
--- a/.config/hypr/hyprlock.conf
+++ b/.config/hypr/hyprlock.conf
@@ -9,7 +9,7 @@ general {
 background {
     monitor =
     path = $HOME/.config/hypr/theme/walls/flowers.png
-    color = rgb($lavenderAlpha)
+    color = $lavender
 
     blur_size = 4
     blur_passes = 3
@@ -29,10 +29,10 @@ input-field {
     dots_size = 0.2
     dots_spacing = 0.64
     dots_center = true
-    inner_color = rgb($surface0Alpha)
-    font_color = rgb($subtext0Alpha)
-    check_color = rgb($textYellow)
-    fail_color = rgb($textRed)
+    inner_color = $surface0
+    font_color = $subtext0
+    check_color = $yellow
+    fail_color = $red
     fail_text = <i>$FAIL <b>($ATTEMPTS)</b></i>
     fail_transition = 300
     fade_on_empty = true
@@ -48,7 +48,7 @@ label {
     monitor = DP-1
     shadow_passes = 1
     text = cmd[update:1000] echo "<b><big> $(date +"%H:%M:%S") </big></b>"
-    color = rgb($textAlpha)
+    color = $text
     font_size = 64
     font_family = $font
     position = 0, -90
@@ -61,7 +61,7 @@ label {
     monitor = DP-1
     text = Hey $USER!
     shadow_passes = 1
-    color = rgb($subtext0Alpha)
+    color = $subtext0
     font_size = 20
     font_family = $font
     position = 0, -102
diff --git a/.config/hypr/plugins/hyprbars.conf b/.config/hypr/plugins/hyprbars.conf
index 0fdf37ca..5dbaccb5 100644
--- a/.config/hypr/plugins/hyprbars.conf
+++ b/.config/hypr/plugins/hyprbars.conf
@@ -4,7 +4,7 @@ source = ../theme/colors.conf
 plugin {
     hyprbars {
         bar_height = 20
-        bar_color = rgb($mantleAlpha)
+        bar_color = $mantle
         bar_text_font = "JetBrainsMono Nerd Font"
         bar_part_of_window = true
         bar_precedence_over_border = false
diff --git a/.config/hypr/plugins/hyprexpo.conf b/.config/hypr/plugins/hyprexpo.conf
index 8e0b4879..c17276ee 100644
--- a/.config/hypr/plugins/hyprexpo.conf
+++ b/.config/hypr/plugins/hyprexpo.conf
@@ -5,7 +5,7 @@ plugin {
     hyprexpo {
         columns = 3
         gap_size = 6
-        bg_col = rgb($surface0Alpha)
+        bg_col = $surface0
         workspace_method = first r~1
 
         enable_gesture = true
diff --git a/.config/hypr/plugins/hyprspace.conf b/.config/hypr/plugins/hyprspace.conf
index 8cfeabf5..c99af30f 100644
--- a/.config/hypr/plugins/hyprspace.conf
+++ b/.config/hypr/plugins/hyprspace.conf
@@ -4,10 +4,10 @@ source = ../theme/colors.conf
 plugin {
     overview {
         # Colors
-        panelColor = rgb($surface0Alpha)
-        panelBorderColor = rgb($surface0Alpha)
-        workspaceActiveBorder = rgb($lavenderAlpha)
-        workspaceInactiveBorder = rgb($surface1Alpha)
+        panelColor = $surface0
+        panelBorderColor = $surface0
+        workspaceActiveBorder = $lavender
+        workspaceInactiveBorder = $surface1
         dragAlpha = 1
 
         # Layout
diff --git a/.config/hypr/plugins/hyprtrails.conf b/.config/hypr/plugins/hyprtrails.conf
index 066daf84..8715a2d2 100644
--- a/.config/hypr/plugins/hyprtrails.conf
+++ b/.config/hypr/plugins/hyprtrails.conf
@@ -3,6 +3,6 @@ source = ../theme/colors.conf
 # Conf
 plugin {
     hyprtrails {
-        color = rgb($lavenderAlpha)
+        color = $lavender
     }
 }
diff --git a/.config/hypr/theme/colors.conf b/.config/hypr/theme/colors.conf
index 0a90d224..a179511d 100644
--- a/.config/hypr/theme/colors.conf
+++ b/.config/hypr/theme/colors.conf
@@ -1,61 +1,77 @@
+$rosewater = rgb(f4dbd6)
 $rosewaterAlpha = f4dbd6
-$flamingoAlpha  = f0c6c6
-$pinkAlpha      = f5bde6
-$mauveAlpha     = c6a0f6
-$redAlpha       = ed8796
-$maroonAlpha    = ee99a0
-$peachAlpha     = f5a97f
-$yellowAlpha    = eed49f
-$greenAlpha     = a6da95
-$tealAlpha      = 8bd5ca
-$skyAlpha       = 91d7e3
-$sapphireAlpha  = 7dc4e4
-$blueAlpha      = 8aadf4
-$lavenderAlpha  = b7bdf8
 
-$textAlpha      = cad3f5
-$subtext1Alpha  = b8c0e0
-$subtext0Alpha  = a5adcb
+$flamingo = rgb(f0c6c6)
+$flamingoAlpha = f0c6c6
 
-$overlay2Alpha  = 939ab7
-$overlay1Alpha  = 8087a2
-$overlay0Alpha  = 6e738d
+$pink = rgb(f5bde6)
+$pinkAlpha = f5bde6
 
-$surface2Alpha  = 5b6078
-$surface1Alpha  = 494d64
-$surface0Alpha  = 363a4f
+$mauve = rgb(c6a0f6)
+$mauveAlpha = c6a0f6
 
-$baseAlpha      = 24273a
-$mantleAlpha    = 1e2030
-$crustAlpha     = 181926
+$red = rgb(ed8796)
+$redAlpha = ed8796
 
-$rosewater = 0xfff4dbd6
-$flamingo  = 0xfff0c6c6
-$pink      = 0xfff5bde6
-$mauve     = 0xffc6a0f6
-$red       = 0xffed8796
-$maroon    = 0xffee99a0
-$peach     = 0xfff5a97f
-$yellow    = 0xffeed49f
-$green     = 0xffa6da95
-$teal      = 0xff8bd5ca
-$sky       = 0xff91d7e3
-$sapphire  = 0xff7dc4e4
-$blue      = 0xff8aadf4
-$lavender  = 0xffb7bdf8
+$maroon = rgb(ee99a0)
+$maroonAlpha = ee99a0
 
-$text      = 0xffcad3f5
-$subtext1  = 0xffb8c0e0
-$subtext0  = 0xffa5adcb
+$peach = rgb(f5a97f)
+$peachAlpha = f5a97f
 
-$overlay2  = 0xff939ab7
-$overlay1  = 0xff8087a2
-$overlay0  = 0xff6e738d
+$yellow = rgb(eed49f)
+$yellowAlpha = eed49f
 
-$surface2  = 0xff5b6078
-$surface1  = 0xff494d64
-$surface0  = 0xff363a4f
+$green = rgb(a6da95)
+$greenAlpha = a6da95
 
-$base      = 0xff24273a
-$mantle    = 0xff1e2030
-$crust     = 0xff181926
+$teal = rgb(8bd5ca)
+$tealAlpha = 8bd5ca
+
+$sky = rgb(91d7e3)
+$skyAlpha = 91d7e3
+
+$sapphire = rgb(7dc4e4)
+$sapphireAlpha = 7dc4e4
+
+$blue = rgb(8aadf4)
+$blueAlpha = 8aadf4
+
+$lavender = rgb(b7bdf8)
+$lavenderAlpha = b7bdf8
+
+$text = rgb(cad3f5)
+$textAlpha = cad3f5
+
+$subtext1 = rgb(b8c0e0)
+$subtext1Alpha = b8c0e0
+
+$subtext0 = rgb(a5adcb)
+$subtext0Alpha = a5adcb
+
+$overlay2 = rgb(939ab7)
+$overlay2Alpha = 939ab7
+
+$overlay1 = rgb(8087a2)
+$overlay1Alpha = 8087a2
+
+$overlay0 = rgb(6e738d)
+$overlay0Alpha = 6e738d
+
+$surface2 = rgb(5b6078)
+$surface2Alpha = 5b6078
+
+$surface1 = rgb(494d64)
+$surface1Alpha = 494d64
+
+$surface0 = rgb(363a4f)
+$surface0Alpha = 363a4f
+
+$base = rgb(24273a)
+$baseAlpha = 24273a
+
+$mantle = rgb(1e2030)
+$mantleAlpha = 1e2030
+
+$crust = rgb(181926)
+$crustAlpha = 181926
diff --git a/.config/hypr/theme/decoration.conf b/.config/hypr/theme/decoration.conf
index 6c427542..3c07ba73 100644
--- a/.config/hypr/theme/decoration.conf
+++ b/.config/hypr/theme/decoration.conf
@@ -30,7 +30,7 @@ decoration {
     dim_strength = 0.05
 
     drop_shadow = yes
-    shadow_range = 40
+    shadow_range = 30
     shadow_scale = 2
     shadow_render_power = 5
     col.shadow = $crust
@@ -46,6 +46,6 @@ group {
       col.inactive = rgba($subtext1Alpha99)
       font_family = JetBrainsMono Nerd Font
       font_size = 10
-      text_color = rgb($baseAlpha)
+      text_color = $base
     }
 }