diff --git a/system/default.nix b/system/default.nix
index 7196aef6..7d437c53 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -202,7 +202,7 @@
   stylix = {
     enable = true;
     image = ./wallpapers/default.png;
-    base16Scheme = lib.mkDefault "${pkgs.base16-schemes}/share/themes/catppuccin-macchiato.yaml";
+    base16Scheme = lib.mkDefault ./themes/one-dark.yaml;
     polarity = config.lib.stylix.scheme.variant;
     opacity = {
       applications = 1.0;
diff --git a/system/themes/one-dark.yaml b/system/themes/one-dark.yaml
new file mode 100644
index 00000000..a419592c
--- /dev/null
+++ b/system/themes/one-dark.yaml
@@ -0,0 +1,29 @@
+system: "base24"
+name: "One Dark"
+author: "FredHappyface (https://github.com/fredHappyface)"
+variant: "dark"
+palette:
+  base00: "#282c34"
+  base01: "#3f4451"
+  base02: "#4f5666"
+  base03: "#545862"
+  base04: "#9196a1"
+  base05: "#abb2bf"
+  base06: "#e6e6e6"
+  base07: "#ffffff"
+  base08: "#e05561"
+  base09: "#d18f52"
+  base0A: "#e6b965"
+  base0B: "#8cc265"
+  base0C: "#42b3c2"
+  base0D: "#4aa5f0"
+  base0E: "#c162de"
+  base0F: "#bf4034"
+  base10: "#21252b"
+  base11: "#181a1f"
+  base12: "#ff616e"
+  base13: "#f0a45d"
+  base14: "#a5e075"
+  base15: "#4cd1e0"
+  base16: "#4dc4ff"
+  base17: "#de73ff"
diff --git a/system/themes/one-light.yaml b/system/themes/one-light.yaml
new file mode 100644
index 00000000..25098192
--- /dev/null
+++ b/system/themes/one-light.yaml
@@ -0,0 +1,29 @@
+system: "base24"
+name: "One Light"
+author: "FredHappyface (https://github.com/fredHappyface)"
+variant: "light"
+palette:
+  base00: "#e7e7e9"
+  base01: "#dfdfe1"
+  base02: "#cacace"
+  base03: "#a0a1a7"
+  base04: "#696c77"
+  base05: "#383a42"
+  base06: "#202227"
+  base07: "#090a0b"
+  base08: "#ca1243"
+  base09: "#c18401"
+  base0A: "#febb2a"
+  base0B: "#50a14f"
+  base0C: "#0184bc"
+  base0D: "#4078f2"
+  base0E: "#a626a4"
+  base0F: "#986801"
+  base10: "#f0f0f1"
+  base11: "#fafafa"
+  base12: "#ec2258"
+  base13: "#f4a701"
+  base14: "#6db76c"
+  base15: "#01a7ef"
+  base16: "#709af5"
+  base17: "#d02fcd"
diff --git a/system/work.nix b/system/work.nix
index 25d34895..46091bce 100644
--- a/system/work.nix
+++ b/system/work.nix
@@ -5,7 +5,7 @@
   ...
 }:
 {
-  stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-latte.yaml";
+  stylix.base16Scheme = ./themes/one-light.yaml;
   services.samba.enable = true;
   environment.systemPackages = with pkgs; [ twinkle ];
   home-manager.users.${username} =