diff --git a/fluxo/config.toml b/fluxo/config.toml
index 77b985d..db8bb2c 100644
--- a/fluxo/config.toml
+++ b/fluxo/config.toml
@@ -39,16 +39,16 @@ format = "{mount} {used:^3.0}/{total:^3.0}G"
 format = "{percentage:>3}%  {icon}"
 
 [audio]
-format_sink_unmuted = " {icon} {name} {volume:>3}%"
-format_sink_muted = " {icon} {name}"
-format_source_unmuted = "{icon} {name} {volume:>3}%"
-format_source_muted = "{icon} {name}"
+format_sink_unmuted = "{name} {volume:>3}% <span size='large'> {icon}</span>"
+format_sink_muted = "{name} <span size='large'> {icon}</span>"
+format_source_unmuted = "{name} {volume:>3}% <span size='large'> {icon}</span>"
+format_source_muted = "{name} <span size='large'> {icon}</span>"
 
 [bt]
-format_plugin = "󰂰 {alias} [{left}|{right}] {anc}"
-format_connected = "󰂰 {alias}"
-format_disconnected = "󰂯 Disconnected"
-format_disabled = "󰂲 Off"
+format_plugin = "{alias} [{left}|{right}] {anc} <span size='large'> 󰂰</span>"
+format_connected = "{alias} <span size='large'> 󰂰</span>"
+format_disconnected = "Disconnected <span size='large'> 󰂯</span>"
+format_disabled = "<span size='large'>󰂲</span>"
 
 [game]
 format_active = "<span size='large'>󰊖</span>"
@@ -81,5 +81,5 @@ format = " {icon} {percentage}"
 
 [dnd]
 enabled = true
-format_dnd = "󰂛"
-format_normal = "󰂚"
+format_dnd = "<span size='large'>󰂛</span>"
+format_normal = "<span size='large'>󰂚</span>"
diff --git a/hypr/hyprlock.conf b/hypr/hyprlock.conf
index c2e66f8..2310247 100644
--- a/hypr/hyprlock.conf
+++ b/hypr/hyprlock.conf
@@ -1,5 +1,7 @@
 # For more information visit https://wiki.hyprland.org/Hypr-Ecosystem/hyprlock/
 
+source = ~/.config/hypr/catppuccin-hyprland/themes/mocha.conf
+
 $scrPath      = ~/.config/hypr/hyprlock/
 $imgPath      = ~/.config/hypr/hyprlock/assets/
 
@@ -28,19 +30,19 @@ $font-display = PP Neue Machina Ultra-Bold
 $font-symbol  = JetBrainsMono Nerd Font Mono
 # Input Var
 $weight       = 2
-$inner-color  = rgba(0, 0, 0, 0.5)
-$border-color = rgba(255, 255, 255, 0.15)
+$inner-color  = rgba($baseAlpha80)
+$border-color = rgba($mauveAlpha80)
 
 # Colors
-$clock-color  = rgba(255, 255, 255, 1)
-$fg0          = rgba(255, 255, 255, 1)
-$fg1          = rgba(0, 0, 0, 1)
-$shape-col0   = rgba(255, 255, 255, 1)
-$shape-col1   = rgba(0, 0, 0, 0.25)
-$shape-col2   = rgba(255, 255, 255, 0.25)
+$clock-color  = $text
+$fg0          = $text
+$fg1          = $base
+$shape-col0   = $mauve
+$shape-col1   = rgba($surface0Alpha80)
+$shape-col2   = rgba($surface1Alpha80)
 $shadow-pass  = 2
 $shadow-size  = 3
-$shadow-color = rgb(0,0,0)
+$shadow-color = $crust
 $shadow-boost = 1.2
 $text-shadow-pass   = 1
 $text-shadow-boost  = 0.5
@@ -83,6 +85,7 @@ image {
 
     rounding            = $rounding # negative values mean circle
     border_size         = 4
+    border_color        = $mauve
     rotate              = 0 # degrees, counter-clockwise
     
     position            = 20, -20
@@ -142,8 +145,12 @@ input-field {
     fade_on_empty       = false
     
     font_family         = $font-text
-    placeholder_text    = <span>󰢏 $USER</span>
+    placeholder_text    = <span foreground="##$textAlpha">󰢏 $USER</span>
     hide_input          = false
+    check_color         = $mauve
+    fail_color          = $red
+    fail_text           = <i>$FAIL <b>($ATTEMPTS)</b></i>
+    capslock_color      = $yellow
     
     position            = 0, -240
     halign              = center
@@ -497,7 +504,7 @@ label {
     monitor     =
     text        = cmd[update:1000] echo "$($scrPath/playerctl.sh --source-symbol)"
 
-    color               = rgba(255, 255, 255, 0.6)
+    color               = rgba($subtext0Alpha99)
     font_size           = 16
     font_family         = $font-symbol
 
@@ -512,7 +519,7 @@ label {
     monitor     =
     text        = cmd[update:1000] echo "$($scrPath/playerctl.sh --source)"
 
-    color               = rgba(255, 255, 255, 0.6)
+    color               = rgba($subtext0Alpha99)
     font_size           = 10
     font_family         = $font-text
 
diff --git a/hypr/hyprpaper.conf b/hypr/hyprpaper.conf
index 6992ed7..44fa5fe 100644
--- a/hypr/hyprpaper.conf
+++ b/hypr/hyprpaper.conf
@@ -1,6 +1,6 @@
 wallpaper {
 	monitor =
-	path = ~/Pictures/rem/rem-oled.png
+	path = ~/Pictures/reze/reze.png
 	fit_mode = cover
 }
 
diff --git a/hypr/lid_state.conf b/hypr/lid_state.conf
index 8b13789..e8e4907 100644
--- a/hypr/lid_state.conf
+++ b/hypr/lid_state.conf
@@ -1 +1 @@
-
+monitor=eDP-1, disable
diff --git a/waybar/config.jsonc b/waybar/config.jsonc
index 3f98a33..d3f1765 100644
--- a/waybar/config.jsonc
+++ b/waybar/config.jsonc
@@ -44,6 +44,14 @@
             "icon-size": 18,
             "spacing": 10
         },
+        "custom/dnd": {
+            "format": "{}",
+            "return-type": "json",
+            "exec": "fluxo-rs dnd",
+            "on-click": "dunstctl set-paused toggle",
+            "signal": 13,
+            "interval": 5
+        },
         "group/spaces": {
             "orientation": "horizontal",
             "modules": [
@@ -54,8 +62,8 @@
         "group/powertray": {
             "orientation": "horizontal",
             "modules": [
-                "tray",
                 "custom/dnd",
+                "tray",
                 "custom/gamemode",
                 "custom/power_status"
             ]
@@ -191,14 +199,6 @@
             "signal": 9,
             "tooltip": true
         },
-        "custom/dnd": {
-            "format": "{}",
-            "return-type": "json",
-            "exec": "fluxo-rs dnd",
-            "on-click": "fluxo-rs dnd toggle",
-            "signal": 13,
-            "interval": 5
-        },
         "custom/backlight": {
             "format": "{}",
             "return-type": "json",