diff --git a/Droidnix/README.org b/Droidnix/README.org
index 7d2f3d5cf..90614a34e 100644
--- a/Droidnix/README.org
+++ b/Droidnix/README.org
@@ -1116,11 +1116,11 @@ You'll notice the color values in multiple places outside this as well.
 I use the [[https://catppuccin.com/][Catppuccin]] almost everywhere. The nix module integrates almost automatically everywhere (except gtk).
 You'll notice the color values in multiple places outside this as well.
 #+BEGIN_SRC nix :tangle generated/system/core/theme.nix :noweb tangle :mkdirp yes :eval never-html
-{ pkgs, ... }:
+{ pkgs,flakeRoot ... }:
 
 {
   stylix.enable = true;
-  stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml";
+  stylix.base24Scheme = "${flakeRoot}/assets/system/theming/stylix/catppuccin-mocha.yaml";
 }
 #+END_SRC
 
diff --git a/Droidnix/assets/system/theming/stylix/catppuccin-mocha.yaml b/Droidnix/assets/system/theming/stylix/catppuccin-mocha.yaml
new file mode 100644
index 000000000..ecbf2e33d
--- /dev/null
+++ b/Droidnix/assets/system/theming/stylix/catppuccin-mocha.yaml
@@ -0,0 +1,29 @@
+system: "base24"
+name: "Catppuccin Mocha"
+author: "https://github.com/catppuccin/catppuccin"
+variant: "dark"
+palette:
+  base00: "#1e1e2e" # base
+  base01: "#181825" # mantle
+  base02: "#313244" # surface0
+  base03: "#45475a" # surface1
+  base04: "#585b70" # surface2
+  base05: "#cdd6f4" # text
+  base06: "#f5e0dc" # rosewater
+  base07: "#b4befe" # lavender
+  base08: "#f38ba8" # red
+  base09: "#fab387" # peach
+  base0A: "#f9e2af" # yellow
+  base0B: "#a6e3a1" # green
+  base0C: "#94e2d5" # teal
+  base0D: "#89b4fa" # blue
+  base0E: "#cba6f7" # mauve
+  base0F: "#f2cdcd" # flamingo
+  base10: "#181825" # mantle - darker background
+  base11: "#11111b" # crust - darkest background
+  base12: "#eba0ac" # maroon - bright red
+  base13: "#f5e0dc" # rosewater - bright yellow
+  base14: "#a6e3a1" # green - bright green
+  base15: "#89dceb" # sky - bright cyan
+  base16: "#74c7ec" # sapphire - bright blue
+  base17: "#f5c2e7" # pink - bright purple
diff --git a/Droidnix/generated/system/core/theme.nix b/Droidnix/generated/system/core/theme.nix
index 7f4766078..8f0871df8 100644
--- a/Droidnix/generated/system/core/theme.nix
+++ b/Droidnix/generated/system/core/theme.nix
@@ -1,6 +1,6 @@
-{ pkgs, ... }:
+{ pkgs,flakeRoot ... }:
 
 {
   stylix.enable = true;
-  stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml";
+  stylix.base24Scheme = "${flakeRoot}/assets/system/theming/stylix/catppuccin-mocha.yaml";
 }