diff --git a/.config/hypr/animations/theme.conf b/.config/hypr/animations/theme.conf
index 42e5eeb..0680895 100644
--- a/.config/hypr/animations/theme.conf
+++ b/.config/hypr/animations/theme.conf
@@ -1,23 +1,26 @@
-# This file is generated by wallbash:animations.dcol
-
-# // ▄▀█ █▄░█ █ █▀▄▀█ ▄▀█ ▀█▀ █ █▀█ █▄░█
-# // █▀█ █░▀█ █ █░▀░█ █▀█ ░█░ █ █▄█ █░▀█
-
-# See https://wiki.hyprland.org/Configuring/Animations/
-# credits: https://github.com/prasanthrangan/hyprdots
-
+# ▄▀█ █▄░█ █ █▀▄▀█ ▄▀█ ▀█▀ █ █▀█ █▄░█
+# █▀█ █░▀█ █ █░▀░█ █▀█ ░█░ █ █▄█ █░▀█
+#
+# Inspired by "fast" and "Vertical"
+# availabe in ~/.config/hypr/animations/
+# credit for fast:- https://github.com/mylinuxforwork/dotfiles
+# ----------------------------------------------------- 
 animations {
-    enabled = yes
-    bezier = wind, 0.05, 0.9, 0.1, 1.05
-    bezier = winIn, 0.1, 1.1, 0.1, 1.1
-    bezier = winOut, 0.3, -0.3, 0, 1
-    bezier = liner, 1, 1, 1, 1
-    animation = windows, 1, 6, wind, slide
-    animation = windowsIn, 1, 6, winIn, slide
-    animation = windowsOut, 1, 5, winOut, slide
-    animation = windowsMove, 1, 5, wind, slide
-    animation = border, 1, 1, liner
-    animation = borderangle, 1, 30, liner, once
-    animation = fade, 1, 10, default
-    animation = workspaces, 1, 5, wind
-}
+    enabled = true
+    bezier = linear, 0, 0, 1, 1
+    bezier = md3_standard, 0.2, 0, 0, 1
+    bezier = md3_decel, 0.05, 0.7, 0.1, 1
+    bezier = md3_accel, 0.3, 0, 0.8, 0.15
+    bezier = overshot, 0.05, 0.9, 0.1, 1.1
+    bezier = crazyshot, 0.1, 1.5, 0.76, 0.92 
+    bezier = hyprnostretch, 0.05, 0.9, 0.1, 1.0
+    bezier = fluent_decel, 0.1, 1, 0, 1
+    bezier = easeInOutCirc, 0.85, 0, 0.15, 1
+    bezier = easeOutCirc, 0, 0.55, 0.45, 1
+    bezier = easeOutExpo, 0.16, 1, 0.3, 1
+    animation = windows, 1, 3, md3_decel, popin 60%
+    animation = border, 1, 10, default
+    animation = fade, 1, 2.5, md3_decel
+    animation = workspaces, 1, 3, fluent_decel, slidefadevert 30%
+    animation = specialWorkspace, 1, 3, md3_decel, slidevert
+}
\ No newline at end of file
diff --git a/.config/hypr/hypridle.conf b/.config/hypr/hypridle.conf
index 20c67d1..53055b4 100644
--- a/.config/hypr/hypridle.conf
+++ b/.config/hypr/hypridle.conf
@@ -31,10 +31,10 @@ listener {
 }
 
 # Suspend
-listener {
-    timeout = 500
-    on-timeout = Hyde run audio_idle ; systemctl suspend
-}
+# listener {
+#     timeout = 500
+#     on-timeout = Hyde run audio_idle ; systemctl suspend
+# }
 
 # hyprlang noerror true
 # Source anything  from this path if you want to add your own listener
diff --git a/.config/hypr/hyprlock/theme.conf b/.config/hypr/hyprlock/theme.conf
index ab4a157..8953bc0 100644
--- a/.config/hypr/hyprlock/theme.conf
+++ b/.config/hypr/hyprlock/theme.conf
@@ -1 +1,157 @@
-source = ./HyDE.conf
\ No newline at end of file
+# By: Arfan on Clouds https://github.com/arfan-on-clouds/hyprclouds
+# Modified by: The HyDE Project
+
+$resolve.font=SF Pro Display|https://font.download/dl/font/sf-pro-display.zip
+$resolve.font=AlfaSlabOne|https://font.download/dl/font/alfa-slab-one.zip
+
+# BACKGROUND
+background {
+    monitor =
+    color = $wallbash_pry1_rgba
+    path = $BACKGROUND_PATH
+    blur_size = 4
+    blur_passes = 3 # 0 disables blurring
+    noise = 0.0117
+    contrast = 1.3000 # Vibrant!!!
+    brightness = 0.8000
+    vibrancy = 0.2100
+    vibrancy_darkness = 0.0
+}
+
+# INPUT FIELD
+input-field {
+    monitor =
+    size = 190, 50
+    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
+    fade_on_empty = true
+     font_family = SF Pro Display Bold
+ placeholder_text = <i><span foreground="##ffffff99"></span></i>
+    hide_input = false
+    position = 0, -170
+    halign = center
+    valign = center
+    outer_color = $wallbash_pry4_rgba
+    inner_color = $wallbash_pry2_rgba
+    font_color = $wallbash_3xa9_rgba
+    check_color = $wallbash_pry4_rgba
+
+}
+
+# Hour-Time
+label {
+    monitor =
+    text = cmd[update:1000] echo -e "$(date +"%I")"
+    color =  $wallbash_1xa8_rgba
+      shadow_passes = 3
+    shadow_size = 2
+    font_size = 100
+    font_family = AlfaSlabOne 
+    position = 0, 100
+    halign = center
+    valign = center
+}
+
+# Minute-Time
+label {
+    monitor =
+    text = cmd[update:1000] echo -e "$(date +"%M")"
+    color = $wallbash_3xa9_rgba
+    font_size = 100
+    font_family = AlfaSlabOne
+      shadow_passes = 3
+    shadow_size = 2
+    position = 0, -20
+    halign = center
+    valign = center
+}
+
+# Day-Date-Month
+label {
+    monitor =
+    text = cmd[update:1000] echo -e "$(date +"%d %b %A")"
+    color = $wallbash_3xa9_rgba
+       shadow_passes = 3
+    shadow_size = 1
+    font_size = 12
+    font_family = JetBrains Mono Nerd Font Mono ExtraBold
+    position = 1%, -1%
+    halign = left
+    valign = top
+}
+
+
+
+# CURRENT SONG
+label {
+    monitor =
+    text = cmd[update:1000] $MPRIS_TEXT # Outputs the song title when mpris is available, otherwise, it will output the splash command.
+    color = $wallbash_3xa9_rgba
+       shadow_passes = 3
+    shadow_size = 1
+    font_size = 14
+    font_family = JetBrains Mono Nerd, SF Pro Display Bold
+    position = 0, 20
+    halign = center
+    valign = bottom
+}
+image {
+    monitor =
+    path = $MPRIS_IMAGE
+    size = 80 # lesser side if not 1:1 ratio
+    rounding = -1 # negative values mean circle
+    border_size = 0
+    shadow_passes = 3
+    shadow_size = 3
+    border_color = rgb(221, 221, 221)
+    rotate = 0 # degrees, counter-clockwise
+    reload_time = 0 # seconds between reloading, 0 to reload with SIGUSR2
+    #    reload_cmd =  # command to get new path. if empty, old path will be used. don't run "follow" commands like tail -F
+    position = 0, 10%
+    halign = center
+    valign = bottom
+}
+
+
+
+# Battery Status if present
+label {
+    monitor =
+    text = cmd[update:5000] $BATTERY_ICON
+    color = $wallbash_4xa9_rgba
+    font_size = 20
+    font_family = JetBrainsMono Nerd Font
+    position = -1%, 1%
+    halign = right
+    valign = bottom
+}
+
+# Current Keyboard Layout 
+label {
+    monitor =
+    text = $LAYOUT
+    color = $wallbash_4xa9_rgba
+    font_size = 20
+    font_family = JetBrains Mono Nerd, SF Pro Display Bold
+    position = -2%, 1%
+    halign = right
+    valign = bottom
+}
+
+
+# Weather
+#! Put the weather command last to lessen the load time of other modules
+label {
+    monitor =
+    text = cmd[update:18000000] $WEATHER_CMD
+    color = $wallbash_3xa9_rgba
+    font_size = 16
+    shadow_passes = 3
+    shadow_size = 1
+    font_family = JetBrains Mono Nerd, SF Pro Display Bold
+    position = -1%, -1%
+    halign = right
+    valign = top
+}
diff --git a/.config/hypr/themes/colors.conf b/.config/hypr/themes/colors.conf
index 36dc2d2..d2cbb8d 100644
--- a/.config/hypr/themes/colors.conf
+++ b/.config/hypr/themes/colors.conf
@@ -3,109 +3,109 @@
 
 # Color group 1
 
-$wallbash_pry1 = 1C0648    # primary color 1
+$wallbash_pry1 = 131311    # primary color 1
 $wallbash_txt1 = FFFFFF    # text color 1
-$wallbash_1xa1 = 362952    # accent color 1 for primary color 1
-$wallbash_1xa2 = 4A3A6B    # accent color 2 for primary color 1
-$wallbash_1xa3 = 5C4B7D    # accent color 3 for primary color 1
-$wallbash_1xa4 = 6A578F    # accent color 4 for primary color 1
-$wallbash_1xa5 = 7A65A3    # accent color 5 for primary color 1
-$wallbash_1xa6 = 927AC2    # accent color 6 for primary color 1
-$wallbash_1xa7 = B39AE6    # accent color 7 for primary color 1
-$wallbash_1xa8 = C1AAF0    # accent color 8 for primary color 1
-$wallbash_1xa9 = DDCCFF    # accent color 9 for primary color 1
+$wallbash_1xa1 = 525229    # accent color 1 for primary color 1
+$wallbash_1xa2 = 6B6B3A    # accent color 2 for primary color 1
+$wallbash_1xa3 = 7D7D4B    # accent color 3 for primary color 1
+$wallbash_1xa4 = 8F8F57    # accent color 4 for primary color 1
+$wallbash_1xa5 = A3A365    # accent color 5 for primary color 1
+$wallbash_1xa6 = C2C27A    # accent color 6 for primary color 1
+$wallbash_1xa7 = E6E69A    # accent color 7 for primary color 1
+$wallbash_1xa8 = F0F0AA    # accent color 8 for primary color 1
+$wallbash_1xa9 = FFFFCC    # accent color 9 for primary color 1
 
 # in rgba format
-$wallbash_pry1_rgba = rgba(28,6,72,0.95)    # primary color 1
-$wallbash_txt1_rgba = rgba(255,255,255,0.95)    # text color 1
-$wallbash_1xa1_rgba = rgba(54,41,82,0.95)    # accent color 1 for primary color 1
-$wallbash_1xa2_rgba = rgba(74,58,107,0.95)    # accent color 2 for primary color 1
-$wallbash_1xa3_rgba = rgba(92,75,125,0.95)    # accent color 3 for primary color 1
-$wallbash_1xa4_rgba = rgba(106,87,143,0.95)    # accent color 4 for primary color 1
-$wallbash_1xa5_rgba = rgba(122,101,163,0.95)    # accent color 5 for primary color 1
-$wallbash_1xa6_rgba = rgba(146,122,194,0.95)    # accent color 6 for primary color 1
-$wallbash_1xa7_rgba = rgba(179,154,230,0.95)    # accent color 7 for primary color 1
-$wallbash_1xa8_rgba = rgba(193,170,240,0.95)    # accent color 8 for primary color 1
-$wallbash_1xa9_rgba = rgba(221,204,255,0.95)    # accent color 9 for primary color 1
+$wallbash_pry1_rgba = rgba(19,19,17,1)    # primary color 1
+$wallbash_txt1_rgba = rgba(255,255,255,1)    # text color 1
+$wallbash_1xa1_rgba = rgba(82,82,41,1)    # accent color 1 for primary color 1
+$wallbash_1xa2_rgba = rgba(107,107,58,1)    # accent color 2 for primary color 1
+$wallbash_1xa3_rgba = rgba(125,125,75,1)    # accent color 3 for primary color 1
+$wallbash_1xa4_rgba = rgba(143,143,87,1)    # accent color 4 for primary color 1
+$wallbash_1xa5_rgba = rgba(163,163,101,1)    # accent color 5 for primary color 1
+$wallbash_1xa6_rgba = rgba(194,194,122,1)    # accent color 6 for primary color 1
+$wallbash_1xa7_rgba = rgba(230,230,154,1)    # accent color 7 for primary color 1
+$wallbash_1xa8_rgba = rgba(240,240,170,1)    # accent color 8 for primary color 1
+$wallbash_1xa9_rgba = rgba(255,255,204,1)    # accent color 9 for primary color 1
 
 
 # Color group 2
 
-$wallbash_pry2 = 360E76    # primary color 2
+$wallbash_pry2 = 362920    # primary color 2
 $wallbash_txt2 = FFFFFF    # text color 2
-$wallbash_2xa1 = 382952    # accent color 1 for primary color 2
-$wallbash_2xa2 = 4D3A6B    # accent color 2 for primary color 2
-$wallbash_2xa3 = 5E4B7D    # accent color 3 for primary color 2
-$wallbash_2xa4 = 6D578F    # accent color 4 for primary color 2
-$wallbash_2xa5 = 7D65A3    # accent color 5 for primary color 2
-$wallbash_2xa6 = 967AC2    # accent color 6 for primary color 2
-$wallbash_2xa7 = B79AE6    # accent color 7 for primary color 2
-$wallbash_2xa8 = C5AAF0    # accent color 8 for primary color 2
-$wallbash_2xa9 = E0CCFF    # accent color 9 for primary color 2
+$wallbash_2xa1 = 523929    # accent color 1 for primary color 2
+$wallbash_2xa2 = 6B4E3A    # accent color 2 for primary color 2
+$wallbash_2xa3 = 7D5F4B    # accent color 3 for primary color 2
+$wallbash_2xa4 = 8F6E57    # accent color 4 for primary color 2
+$wallbash_2xa5 = A37F65    # accent color 5 for primary color 2
+$wallbash_2xa6 = C2977A    # accent color 6 for primary color 2
+$wallbash_2xa7 = E6B99A    # accent color 7 for primary color 2
+$wallbash_2xa8 = F0C7AA    # accent color 8 for primary color 2
+$wallbash_2xa9 = FFE1CC    # accent color 9 for primary color 2
 
 # in rgba format
-$wallbash_pry2_rgba = rgba(54,14,118,0.95)    # primary color 2
-$wallbash_txt2_rgba = rgba(255,255,255,0.95)    # text color 2
-$wallbash_2xa1_rgba = rgba(56,41,82,0.95)    # accent color 1 for primary color 2
-$wallbash_2xa2_rgba = rgba(77,58,107,0.95)    # accent color 2 for primary color 2
-$wallbash_2xa3_rgba = rgba(94,75,125,0.95)    # accent color 3 for primary color 2
-$wallbash_2xa4_rgba = rgba(109,87,143,0.95)    # accent color 4 for primary color 2
-$wallbash_2xa5_rgba = rgba(125,101,163,0.95)    # accent color 5 for primary color 2
-$wallbash_2xa6_rgba = rgba(150,122,194,0.95)    # accent color 6 for primary color 2
-$wallbash_2xa7_rgba = rgba(183,154,230,0.95)    # accent color 7 for primary color 2
-$wallbash_2xa8_rgba = rgba(197,170,240,0.95)    # accent color 8 for primary color 2
-$wallbash_2xa9_rgba = rgba(224,204,255,0.95)    # accent color 9 for primary color 2
+$wallbash_pry2_rgba = rgba(54,41,32,1)    # primary color 2
+$wallbash_txt2_rgba = rgba(255,255,255,1)    # text color 2
+$wallbash_2xa1_rgba = rgba(82,57,41,1)    # accent color 1 for primary color 2
+$wallbash_2xa2_rgba = rgba(107,78,58,1)    # accent color 2 for primary color 2
+$wallbash_2xa3_rgba = rgba(125,95,75,1)    # accent color 3 for primary color 2
+$wallbash_2xa4_rgba = rgba(143,110,87,1)    # accent color 4 for primary color 2
+$wallbash_2xa5_rgba = rgba(163,127,101,1)    # accent color 5 for primary color 2
+$wallbash_2xa6_rgba = rgba(194,151,122,1)    # accent color 6 for primary color 2
+$wallbash_2xa7_rgba = rgba(230,185,154,1)    # accent color 7 for primary color 2
+$wallbash_2xa8_rgba = rgba(240,199,170,1)    # accent color 8 for primary color 2
+$wallbash_2xa9_rgba = rgba(255,225,204,1)    # accent color 9 for primary color 2
 
 # Color group 3
 
-$wallbash_pry3 = 3C159E    # primary color 3
+$wallbash_pry3 = 5E4533    # primary color 3
 $wallbash_txt3 = FFFFFF    # text color 3
-$wallbash_3xa1 = 342952    # accent color 1 for primary color 3
-$wallbash_3xa2 = 483A6B    # accent color 2 for primary color 3
-$wallbash_3xa3 = 594B7D    # accent color 3 for primary color 3
-$wallbash_3xa4 = 67578F    # accent color 4 for primary color 3
-$wallbash_3xa5 = 7765A3    # accent color 5 for primary color 3
-$wallbash_3xa6 = 8F7AC2    # accent color 6 for primary color 3
-$wallbash_3xa7 = AF9AE6    # accent color 7 for primary color 3
-$wallbash_3xa8 = BEAAF0    # accent color 8 for primary color 3
-$wallbash_3xa9 = DBCCFF    # accent color 9 for primary color 3
+$wallbash_3xa1 = 523A29    # accent color 1 for primary color 3
+$wallbash_3xa2 = 6B4E3A    # accent color 2 for primary color 3
+$wallbash_3xa3 = 7D604B    # accent color 3 for primary color 3
+$wallbash_3xa4 = 8F6E57    # accent color 4 for primary color 3
+$wallbash_3xa5 = A37F65    # accent color 5 for primary color 3
+$wallbash_3xa6 = C2987A    # accent color 6 for primary color 3
+$wallbash_3xa7 = E6B99A    # accent color 7 for primary color 3
+$wallbash_3xa8 = F0C7AA    # accent color 8 for primary color 3
+$wallbash_3xa9 = FFE1CC    # accent color 9 for primary color 3
 
 # in rgba format
-$wallbash_pry3_rgba = rgba(60,21,158,0.95)    # primary color 3
-$wallbash_txt3_rgba = rgba(255,255,255,0.95)    # text color 3
-$wallbash_3xa1_rgba = rgba(52,41,82,0.95)    # accent color 1 for primary color 3
-$wallbash_3xa2_rgba = rgba(72,58,107,0.95)    # accent color 2 for primary color 3
-$wallbash_3xa3_rgba = rgba(89,75,125,0.95)    # accent color 3 for primary color 3
-$wallbash_3xa4_rgba = rgba(103,87,143,0.95)    # accent color 4 for primary color 3
-$wallbash_3xa5_rgba = rgba(119,101,163,0.95)    # accent color 5 for primary color 3
-$wallbash_3xa6_rgba = rgba(143,122,194,0.95)    # accent color 6 for primary color 3
-$wallbash_3xa7_rgba = rgba(175,154,230,0.95)    # accent color 7 for primary color 3
-$wallbash_3xa8_rgba = rgba(190,170,240,0.95)    # accent color 8 for primary color 3
-$wallbash_3xa9_rgba = rgba(219,204,255,0.95)    # accent color 9 for primary color 3
+$wallbash_pry3_rgba = rgba(94,69,51,1)    # primary color 3
+$wallbash_txt3_rgba = rgba(255,255,255,1)    # text color 3
+$wallbash_3xa1_rgba = rgba(82,58,41,1)    # accent color 1 for primary color 3
+$wallbash_3xa2_rgba = rgba(107,78,58,1)    # accent color 2 for primary color 3
+$wallbash_3xa3_rgba = rgba(125,96,75,1)    # accent color 3 for primary color 3
+$wallbash_3xa4_rgba = rgba(143,110,87,1)    # accent color 4 for primary color 3
+$wallbash_3xa5_rgba = rgba(163,127,101,1)    # accent color 5 for primary color 3
+$wallbash_3xa6_rgba = rgba(194,152,122,1)    # accent color 6 for primary color 3
+$wallbash_3xa7_rgba = rgba(230,185,154,1)    # accent color 7 for primary color 3
+$wallbash_3xa8_rgba = rgba(240,199,170,1)    # accent color 8 for primary color 3
+$wallbash_3xa9_rgba = rgba(255,225,204,1)    # accent color 9 for primary color 3
 
 # Color group 4
 
-$wallbash_pry4 = 612089    # primary color 4
+$wallbash_pry4 = 8B6F56    # primary color 4
 $wallbash_txt4 = FFFFFF    # text color 4
-$wallbash_4xa1 = 422952    # accent color 1 for primary color 4
-$wallbash_4xa2 = 583A6B    # accent color 2 for primary color 4
-$wallbash_4xa3 = 6A4B7D    # accent color 3 for primary color 4
-$wallbash_4xa4 = 7A578F    # accent color 4 for primary color 4
-$wallbash_4xa5 = 8C65A3    # accent color 5 for primary color 4
-$wallbash_4xa6 = A67AC2    # accent color 6 for primary color 4
-$wallbash_4xa7 = C99AE6    # accent color 7 for primary color 4
-$wallbash_4xa8 = D5AAF0    # accent color 8 for primary color 4
-$wallbash_4xa9 = ECCCFF    # accent color 9 for primary color 4
+$wallbash_4xa1 = 523C29    # accent color 1 for primary color 4
+$wallbash_4xa2 = 6B513A    # accent color 2 for primary color 4
+$wallbash_4xa3 = 7D634B    # accent color 3 for primary color 4
+$wallbash_4xa4 = 8F7157    # accent color 4 for primary color 4
+$wallbash_4xa5 = A38265    # accent color 5 for primary color 4
+$wallbash_4xa6 = C29C7A    # accent color 6 for primary color 4
+$wallbash_4xa7 = E6BD9A    # accent color 7 for primary color 4
+$wallbash_4xa8 = F0CBAA    # accent color 8 for primary color 4
+$wallbash_4xa9 = FFE4CC    # accent color 9 for primary color 4
 
 # in rgba format
-$wallbash_pry4_rgba = rgba(97,32,137,0.95)    # primary color 4
-$wallbash_txt4_rgba = rgba(255,255,255,0.95)    # text color 4
-$wallbash_4xa1_rgba = rgba(66,41,82,0.95)    # accent color 1 for primary color 4
-$wallbash_4xa2_rgba = rgba(88,58,107,0.95)    # accent color 2 for primary color 4
-$wallbash_4xa3_rgba = rgba(106,75,125,0.95)    # accent color 3 for primary color 4
-$wallbash_4xa4_rgba = rgba(122,87,143,0.95)    # accent color 4 for primary color 4
-$wallbash_4xa5_rgba = rgba(140,101,163,0.95)    # accent color 5 for primary color 4
-$wallbash_4xa6_rgba = rgba(166,122,194,0.95)    # accent color 6 for primary color 4
-$wallbash_4xa7_rgba = rgba(201,154,230,0.95)    # accent color 7 for primary color 4
-$wallbash_4xa8_rgba = rgba(213,170,240,0.95)    # accent color 8 for primary color 4
-$wallbash_4xa9_rgba = rgba(236,204,255,0.95)    # accent color 9 for primary color 4
+$wallbash_pry4_rgba = rgba(139,111,86,1)    # primary color 4
+$wallbash_txt4_rgba = rgba(255,255,255,1)    # text color 4
+$wallbash_4xa1_rgba = rgba(82,60,41,1)    # accent color 1 for primary color 4
+$wallbash_4xa2_rgba = rgba(107,81,58,1)    # accent color 2 for primary color 4
+$wallbash_4xa3_rgba = rgba(125,99,75,1)    # accent color 3 for primary color 4
+$wallbash_4xa4_rgba = rgba(143,113,87,1)    # accent color 4 for primary color 4
+$wallbash_4xa5_rgba = rgba(163,130,101,1)    # accent color 5 for primary color 4
+$wallbash_4xa6_rgba = rgba(194,156,122,1)    # accent color 6 for primary color 4
+$wallbash_4xa7_rgba = rgba(230,189,154,1)    # accent color 7 for primary color 4
+$wallbash_4xa8_rgba = rgba(240,203,170,1)    # accent color 8 for primary color 4
+$wallbash_4xa9_rgba = rgba(255,228,204,1)    # accent color 9 for primary color 4
diff --git a/.config/hypr/themes/theme.conf b/.config/hypr/themes/theme.conf
index 95451ad..9894b1c 100644
--- a/.config/hypr/themes/theme.conf
+++ b/.config/hypr/themes/theme.conf
@@ -1,54 +1,64 @@
+#  // P̳r̳a̳s̳a̳n̳t̳h̳ R̳a̳n̳g̳a̳n̳
 
-$GTK_THEME=WhiteSur-Dark
-$ICON_THEME=WhiteSur
+$GTK_THEME=Grukai
+$ICON_THEME=buuf-icons-for-plasma
 $COLOR_SCHEME=prefer-dark
-$CURSOR_THEME=macOS-Black
-$CURSOR_SIZE=26                                
-$FONT=SF Pro Rounded Regular 10.5
-$CODE_THEME=MacOS Modern Dark - Xcode Modern
+$CURSOR_THEME=Simp1e
+$CURSOR_SIZE=18
+$FONT = Inter
+
+
+# Optional: The varibles above will be set automatically when the theme is loaded
+# This exec commands will soon be deprecated
 
 
 general {
-    gaps_in = 4
-    gaps_out = 10
+    gaps_in = 3
+    gaps_out = 5
     border_size = 2
-    col.active_border = rgba(0D9AC1FF) rgba(0B4C5DFF) 45deg
-    col.inactive_border = rgba(4A3B4ACC) rgba(1A2B3DCC) 45deg
+    col.active_border = rgba(B3BBA3ff) rgba(1A1A1Aff) 45deg
+    col.inactive_border = rgba(232425ff) rgba(444742ff) 45deg
     layout = dwindle
     resize_on_border = true
 }
 
 group {
-    col.border_active = rgba(0D9AC1FF) rgba(0B4C5DFF) 45deg
-    col.border_inactive = rgba(4A3B4ACC) rgba(1A2B3DCC) 45deg
-    col.border_locked_active = rgba(0D9AC1FF) rgba(0B4C5DFF) 45deg
-    col.border_locked_inactive = rgba(4A3B4ACC) rgba(1A2B3DCC) 45deg
+    col.border_active = rgba(B3BBA3ff) rgba(1A1A1Aff) 45deg
+    col.border_inactive = rgba(232425cc) rgba(444742cc) 45deg
+    col.border_locked_active = rgba(FFFFFFff) rgba(0D0D0Dff) 45deg
+    col.border_locked_inactive = rgba(FFFFFFcc) rgba(FFFFFFcc) 45deg
 }
 
 decoration {
-    rounding = 10
-    active_opacity = 0.9
-    inactive_opacity = 0.9
+    rounding = 8
+    shadow:enabled = true
+
+    active_opacity = 0.95
+    inactive_opacity = 0.8
+
+    dim_inactive = true
+    dim_strength = 0.15
 
     blur {
         enabled = yes
-        size = 4
-        passes = 4
-        noise = 0.02
+        size = 2
+        passes = 7
         new_optimizations = on
         ignore_opacity = on
         xray = false
+        brightness = 0.9
     }
 
     shadow {
-        enabled = false
-        ignore_window = true
-        offset = 0 0
-        range = 15
+        enabled = true
+        ignore_window = false
+        offset = 4 4 4 4
+        range = 9
         render_power = 1
-        color = 0x80ffffff
+        scale = 1.0
+        color = 0xaa130d06
+        color_inactive = 0x66130d06
     }
 }
 
-
-blurls = waybar
+layerrule = blur,waybar
diff --git a/.config/hypr/themes/wallbash.conf b/.config/hypr/themes/wallbash.conf
index d3af1e4..67f84d4 100644
--- a/.config/hypr/themes/wallbash.conf
+++ b/.config/hypr/themes/wallbash.conf
@@ -1,26 +1,26 @@
 # Auto-generated by HyDE // Read-only
 # // ----------------------------
-# HyDE Theme: Monterey Frost
-# Configuration File: "/home/elleoma/.config/hyde/themes/Monterey Frost/hypr.theme"
-# Wallbash Mode : auto
+# HyDE Theme: Grukai
+# Configuration File: "/home/elleoma/.config/hyde/themes/Grukai/hypr.theme"
+# Wallbash Mode : theme
 # // ----------------------------
 
-$HYDE_THEME=Monterey Frost
-$GTK_THEME=WhiteSur-Dark
+$HYDE_THEME=Grukai
+$GTK_THEME=Grukai
 $COLOR_SCHEME=prefer-dark
-$ICON_THEME=WhiteSur
+$ICON_THEME=buuf-icons-for-plasma
 
-$CURSOR_THEME=macOS-Black
+$CURSOR_THEME=Simp1e
 $CURSOR_SIZE=$CURSOR_SIZE
 
-$FONT=SF Pro Rounded Regular 10.5
+$FONT=Inter
 $FONT_SIZE=$FONT_SIZE
 $DOCUMENT_FONT=$DOCUMENT_FONT
 $DOCUMENT_FONT_SIZE=$DOCUMENT_FONT_SIZE
 $MONOSPACE_FONT=$MONOSPACE_FONT
 $MONOSPACE_FONT_SIZE=$MONOSPACE_FONT_SIZE
 
-$CODE_THEME=MacOS Modern Dark - Xcode Modern  
+$CODE_THEME=$CODE_THEME  
 $SDDM_THEME=$CODE_THEME
 
 # // ----------------------------
@@ -47,22 +47,3 @@ $SDDM_THEME=$CODE_THEME
 # exec = hyde-shell walbash code $CODE_THEME # Setting the code theme
 
 # // ----------------------------
-
-#//---Wallbash mode enabled---
-# Overriding values above
-
-$GTK_THEME = Wallbash-Gtk
-$COLOR_SCHEME = 
-
-general {
-    col.active_border = rgba($wallbash_pry4ff) rgba($wallbash_4xa1ff) 45deg
-    col.inactive_border = rgba($wallbash_pry1ff) rgba($wallbash_pry2ff) 45deg
-}
-
-group {
-    col.border_active = rgba($wallbash_pry4ff) rgba($wallbash_4xa1ff) 45deg
-    col.border_inactive = rgba($wallbash_pry1cc) rgba($wallbash_pry2cc) 45deg
-    col.border_locked_active = rgba($wallbash_txt3ff) rgba($wallbash_txt4ff) 45deg
-    col.border_locked_inactive = rgba($wallbash_txt1cc) rgba($wallbash_txt2cc) 45deg
-}
-
diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json
index f1e4383..49e32c3 100644
--- a/.config/nvim/lazy-lock.json
+++ b/.config/nvim/lazy-lock.json
@@ -1,37 +1,37 @@
 {
-  "LuaSnip": { "branch": "master", "commit": "21f74f7ba8c49f95f9d7c8293b147c2901dd2d3a" },
-  "NvChad": { "branch": "v2.5", "commit": "b5b38ebee53bcc8b71a917916ce61504ffffd509" },
+  "LuaSnip": { "branch": "master", "commit": "73813308abc2eaeff2bc0d3f2f79270c491be9d7" },
+  "NvChad": { "branch": "v2.5", "commit": "f107fabe11ac8013dc3435ecd5382bee872b1584" },
   "base46": { "branch": "v2.5", "commit": "fde7a2cd54599e148d376f82980407c2d24b0fa2" },
   "cmp-async-path": { "branch": "main", "commit": "0ed1492f59e730c366d261a5ad822fa37e44c325" },
   "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "bd5a7d6db125d4654b50eeae9f5217f24bb22fd3" },
   "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" },
   "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
-  "conform.nvim": { "branch": "master", "commit": "b4aab989db276993ea5dcb78872be494ce546521" },
+  "conform.nvim": { "branch": "master", "commit": "c64cc754ace603e185ab30113aaef174187eacf8" },
   "crates.nvim": { "branch": "main", "commit": "ac9fa498a9edb96dc3056724ff69d5f40b898453" },
   "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
-  "gitsigns.nvim": { "branch": "main", "commit": "f780609807eca1f783a36a8a31c30a48fbe150c5" },
+  "gitsigns.nvim": { "branch": "main", "commit": "ea7c05f70214aed320ad6afa0718a9c15cf8cb12" },
   "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
   "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
-  "mason.nvim": { "branch": "main", "commit": "7dc4facca9702f95353d5a1f87daf23d78e31c2a" },
+  "mason.nvim": { "branch": "main", "commit": "b3689a41dd77e5294498dba9757fb22cc80cbebd" },
   "menu": { "branch": "main", "commit": "7a0a4a2896b715c066cfbe320bdc048091874cc6" },
   "minty": { "branch": "main", "commit": "aafc9e8e0afe6bf57580858a2849578d8d8db9e0" },
   "nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" },
   "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" },
-  "nvim-dap": { "branch": "master", "commit": "7523676a4be17644587aa47e4d42f6f7646d4727" },
+  "nvim-dap": { "branch": "master", "commit": "7367cec8e8f7a0b1e4566af9a7ef5959d11206a7" },
   "nvim-dap-ui": { "branch": "master", "commit": "cf91d5e2d07c72903d052f5207511bf7ecdb7122" },
-  "nvim-lspconfig": { "branch": "master", "commit": "d89f4891f0720cd2598e4bdd60010d8784b2ac8a" },
+  "nvim-lspconfig": { "branch": "master", "commit": "a844e89ea0e0e4b207ec550c3b51fb6e471881a4" },
   "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
-  "nvim-tree.lua": { "branch": "master", "commit": "e179ad2f83b5955ab0af653069a493a1828c2697" },
+  "nvim-tree.lua": { "branch": "master", "commit": "87d096a39cb2d5d43e6771563575ff042a79f48b" },
   "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
-  "nvim-web-devicons": { "branch": "master", "commit": "6e51ca170563330e063720449c21f43e27ca0bc1" },
+  "nvim-web-devicons": { "branch": "master", "commit": "b8221e42cf7287c4dcde81f232f58d7b947c210d" },
   "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
   "riscv-asm-vim": { "branch": "master", "commit": "af37cced21452c6edbe1f42811103be34ee19de2" },
   "rust.vim": { "branch": "master", "commit": "889b9a7515db477f4cb6808bef1769e53493c578" },
   "rustaceanvim": { "branch": "master", "commit": "12504405821c05874d2d1f6b5ec919f9808e2c99" },
   "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" },
-  "ui": { "branch": "v3.0", "commit": "4852e04faefbba3a18cb197b76ac00f4bc2e615f" },
+  "ui": { "branch": "v3.0", "commit": "03b9718140375e7f3f5e4f3e04bc2b6c907440ec" },
   "vim-wakatime": { "branch": "master", "commit": "d7973b157a632d1edeff01818f18d67e584eeaff" },
   "volt": { "branch": "main", "commit": "620de1321f275ec9d80028c68d1b88b409c0c8b1" },
-  "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }
+  "which-key.nvim": { "branch": "main", "commit": "904308e6885bbb7b60714c80ab3daf0c071c1492" }
 }
diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
index f2cb899..914e0a6 100644
--- a/.config/zsh/.zshrc
+++ b/.config/zsh/.zshrc
@@ -14,7 +14,7 @@ alias c='clear'                                                        # clear t
 alias l='eza -lh --icons=auto'                                         # long list
 alias ls='eza -1 --icons=auto'                                         # short list
 alias ll='eza -lha --icons=auto --sort=name --group-directories-first' # long list all
-alias ld='eza -lhD --icons=auto'                                       # long list dirs
+# alias ld='eza -lhD --icons=auto'                                       # long list dirs
 alias lt='eza --icons=auto --tree'                                     # list folder as tree
 alias un='paru -Rns'                                             # uninstall package
 alias up='paru -Syu'                                             # update system/package/aur
diff --git a/.config/zsh/conf.d/hyde/terminal.zsh b/.config/zsh/conf.d/hyde/terminal.zsh
index b8f34ab..355349f 100644
--- a/.config/zsh/conf.d/hyde/terminal.zsh
+++ b/.config/zsh/conf.d/hyde/terminal.zsh
@@ -29,9 +29,9 @@ function _dedup_zsh_plugins {
     unset -f _dedup_zsh_plugins
     # Oh-my-zsh installation path
     zsh_paths=(
-        "$HOME/.oh-my-zsh"
-        "/usr/local/share/oh-my-zsh"
         "/usr/share/oh-my-zsh"
+        "/usr/local/share/oh-my-zsh"
+        "$HOME/.oh-my-zsh"
     )
     for zsh_path in "${zsh_paths[@]}"; do [[ -d $zsh_path ]] && export ZSH=$zsh_path && break; done
     # Load Plugins