diff --git a/Droidnix/assets/hyprland/conf/hypr/hyprland.conf b/Droidnix/assets/hyprland/conf/hypr/hyprland.conf
index 811ed3d35..f430b139b 100644
--- a/Droidnix/assets/hyprland/conf/hypr/hyprland.conf
+++ b/Droidnix/assets/hyprland/conf/hypr/hyprland.conf
@@ -1,4 +1,3 @@
-source = ./variables.conf
 source = ./theming.conf
 source = ./animations.conf
 source = ./bindings.conf
diff --git a/Droidnix/assets/hyprland/conf/hypr/theming.conf b/Droidnix/assets/hyprland/conf/hypr/theming.conf
index d66793bbf..330a72bf1 100644
--- a/Droidnix/assets/hyprland/conf/hypr/theming.conf
+++ b/Droidnix/assets/hyprland/conf/hypr/theming.conf
@@ -1,25 +1,23 @@
-# Hyprland Catppuccin Mocha Theme
-# Solid colors only, compatible with current Hyprland
+# Hyprland Catppuccin Mocha Theme (solid colors)
 
 # Colors
-$base = #1e1e2e
-$mantle = #181825
-$surface0 = #313244
-$surface1 = #45475a
-$surface2 = #585b70
-$text = #cdd6f4
-$rosewater = #f5e0dc
-$lavender = #b4befe
-$red = #f38ba8
-$peach = #fab387
-$yellow = #f9e2af
-$green = #a6e3a1
-$teal = #94e2d5
-$blue = #89b4fa
-$mauve = #cba6f7
-$flamingo = #f2cdcd
-$inactive = #595959aa
-#$activeborder = #1ae6ccee
+$base       = #1e1e2e
+$mantle     = #181825
+$surface0   = #313244
+$surface1   = #45475a
+$surface2   = #585b70
+$text       = #cdd6f4
+$rosewater  = #f5e0dc
+$lavender   = #b4befe
+$red        = #f38ba8
+$peach      = #fab387
+$yellow     = #f9e2af
+$green      = #a6e3a1
+$teal       = #94e2d5
+$blue       = #89b4fa
+$mauve      = #cba6f7
+$flamingo   = #f2cdcd
+$inactive   = #595959aa
 
 # General theming
 general {
@@ -30,13 +28,19 @@ general {
     resize_on_border = true
     extend_border_grab_area = 20
 
-    # Solid color borders only
-    col.active_border = $green
+    # Solid-color borders
+    col.active_border   = $green
     col.inactive_border = $inactive
 }
 
 # Window decorations
 decoration {
     rounding = 8
-    # Drop shadows are not supported in native Hyprland
+    # Drop shadows not supported in Hyprland natively
 }
+
+# Input fields, Hyprbar, Hyprlock, Hypridle are optional
+input_field {}
+hyprbar {}
+hyprlock {}
+hypridle {}
diff --git a/Droidnix/assets/hyprland/conf/hypr/variables.conf b/Droidnix/assets/hyprland/conf/hypr/variables.conf
deleted file mode 100644
index d6e340d0c..000000000
--- a/Droidnix/assets/hyprland/conf/hypr/variables.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# Colors (Hyprland "col" values commonly use rgba(aarrggbb)-style hex)
-# See Hyprland variable / type docs for color formats & bools. :contentReference[oaicite:2]{index=2}
-$base          = rgba(1e1e2eff)
-$inactive      = rgba(595959aa)
-$blue          = rgba(33ccffee)
-$green         = rgba(00ff99ee)
diff --git a/Droidnix/assets/system/theming/stylix/catppuccin-mocha.yaml b/Droidnix/assets/system/theming/stylix/catppuccin-mocha.yaml
index 998e7c0b0..4d3b504c9 100644
--- a/Droidnix/assets/system/theming/stylix/catppuccin-mocha.yaml
+++ b/Droidnix/assets/system/theming/stylix/catppuccin-mocha.yaml
@@ -1,7 +1,7 @@
 system: "base16"
-name: "Catppuccin Mocha"
-author: "https://github.com/catppuccin/catppuccin"
+name: "Catppuccin Mocha Solid"
 variant: "dark"
+author: "https://github.com/catppuccin/catppuccin"
 palette:
   base00: "#1e1e2e" # base
   base01: "#181825" # mantle
@@ -19,3 +19,9 @@ palette:
   base0D: "#89b4fa" # blue
   base0E: "#cba6f7" # mauve
   base0F: "#f2cdcd" # flamingo
+
+# Force solid colors only
+targets:
+  hyprland:
+    enable: true
+    solidOnly: true