diff --git a/flake.lock b/flake.lock
index dc5723a..be012b3 100644
--- a/flake.lock
+++ b/flake.lock
@@ -19,11 +19,11 @@
     "base16-kermit": {
       "flake": false,
       "locked": {
-        "lastModified": 1672591646,
-        "narHash": "sha256-Mx/aNz5cFnqD1/hirf2y9xbn6Q1W1IKQea8FLKLjJdg=",
+        "lastModified": 1728176159,
+        "narHash": "sha256-+jxOfQql/Q4TtXzYk5+iQYA8TX2G4Wsa7iTbd1hinX8=",
         "owner": "orhun",
         "repo": "base16-kermit",
-        "rev": "5de65e04fdc5d02d66c9c5c249cb0507a5b331e0",
+        "rev": "661d9df5aa2c76c88f9d6214927c9448860cda8d",
         "type": "github"
       },
       "original": {
@@ -35,11 +35,11 @@
     "base16-kitty": {
       "flake": false,
       "locked": {
-        "lastModified": 1665001328,
-        "narHash": "sha256-aRaizTYPpuWEcvoYE9U+YRX+Wsc8+iG0guQJbvxEdJY=",
+        "lastModified": 1721117198,
+        "narHash": "sha256-+vEXvEsar7w7wPVRmKx+rJKUTD5DBgLR7jfl0k7VhnE=",
         "owner": "kdrag0n",
         "repo": "base16-kitty",
-        "rev": "06bb401fa9a0ffb84365905ffbb959ae5bf40805",
+        "rev": "0898f2677f3a583cc6a89bde29b2b05ac2041e0b",
         "type": "github"
       },
       "original": {
@@ -51,11 +51,11 @@
     "base16-rofi": {
       "flake": false,
       "locked": {
-        "lastModified": 1668291378,
-        "narHash": "sha256-RZpjCQ8KGO3cv9A/lNNoTE+WJ9sNk5sz0zJq02zzxA8=",
+        "lastModified": 1725756568,
+        "narHash": "sha256-TvydMwm3iwrtn136e3w7cTsopcAfG5BhBcn+jzfeBXw=",
         "owner": "tinted-theming",
         "repo": "base16-rofi",
-        "rev": "3f64a9f8d8cb7db796557b516682b255172c4ab4",
+        "rev": "3a1ddc189c6cfd966c49b2c2d04cbaca7bb72a99",
         "type": "github"
       },
       "original": {
@@ -83,11 +83,11 @@
     "base16-vscode": {
       "flake": false,
       "locked": {
-        "lastModified": 1679600489,
-        "narHash": "sha256-UcoI5OGT2M6fPjyRHQWQ/M13ngFzv/kyAw87uKCUZO0=",
+        "lastModified": 1727574560,
+        "narHash": "sha256-fDWr+lXmYmf/GP8qwvZ9cmUxVVTUQqxh1QKvwn3Gkpg=",
         "owner": "golf1052",
         "repo": "base16-vscode",
-        "rev": "87d39d31399346cafe9bffcfc0d01e990baf3ea6",
+        "rev": "a9f381af1e93feb38361707437aa4e05e3a793bc",
         "type": "github"
       },
       "original": {
@@ -99,11 +99,11 @@
     "bemoji": {
       "flake": false,
       "locked": {
-        "lastModified": 1701165211,
-        "narHash": "sha256-2IWtA2LL/PmQ19vxZasS05MEkUeH6Q8B2cUqjTncqQE=",
+        "lastModified": 1713343160,
+        "narHash": "sha256-q34sNdgoNrd8qzMK9zST0lZ9J1ZLR0NZv3K2OgPfiLE=",
         "owner": "marty-oehme",
         "repo": "bemoji",
-        "rev": "b97c09828dd6294bb357ab401da4708d255bc016",
+        "rev": "cc9f809446f75a67e2128749537c51dd9558eec8",
         "type": "github"
       },
       "original": {
@@ -131,11 +131,11 @@
     "firenvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1692332191,
-        "narHash": "sha256-h7G0/4uwn4+8zYbx5qcz4RY3Z3Ly8v81dhuFg7Sj3CI=",
+        "lastModified": 1727248536,
+        "narHash": "sha256-2l2lFqHMwwKWnRreTGaM5B1ih/iSfi5zsQq7am93hYU=",
         "owner": "glacambre",
         "repo": "firenvim",
-        "rev": "138424db463e6c0e862a05166a4ccc781cd7c19d",
+        "rev": "64f9389b88c8b0c7667d45c171a5f25c42d852fb",
         "type": "github"
       },
       "original": {
@@ -149,11 +149,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1701680307,
-        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
+        "lastModified": 1726560853,
+        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
+        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
         "type": "github"
       },
       "original": {
@@ -169,11 +169,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1701676655,
-        "narHash": "sha256-wP8i7hO2aLNJhYoTK3kqoymaCLgt4QcwWcO8d/A1CjQ=",
+        "lastModified": 1730016908,
+        "narHash": "sha256-bFCxJco7d8IgmjfNExNz9knP8wvwbXU4s/d53KOK6U0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "948703f3e71f1332a0cb535ebaf5cb14946e3724",
+        "rev": "e83414058edd339148dc142a8437edb9450574c8",
         "type": "github"
       },
       "original": {
@@ -184,11 +184,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1701436327,
-        "narHash": "sha256-tRHbnoNI8SIM5O5xuxOmtSLnswEByzmnQcGGyNRjxsE=",
+        "lastModified": 1729880355,
+        "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "91050ea1e57e50388fa87a3302ba12d188ef723a",
+        "rev": "18536bf04cd71abd345f9579158841376fdd0c5a",
         "type": "github"
       },
       "original": {
@@ -224,11 +224,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1700267030,
-        "narHash": "sha256-1ke+7xrkCVOI13RJ1w6EjCGcJywkN3bbTKbLWAt4jaE=",
+        "lastModified": 1729710171,
+        "narHash": "sha256-2sVt2hbL+G0FzEESm/EZBewPOmNtZ6MTnYhsvHJW6Rs=",
         "owner": "pjones",
         "repo": "plasma-manager",
-        "rev": "019a8fd22a26c8d59f63aa9cc8a9c1729d6ffbda",
+        "rev": "247a8e677b51f053ca89dcf67059e24f85e47391",
         "type": "github"
       },
       "original": {
@@ -255,17 +255,17 @@
         "plasma-manager": "plasma-manager",
         "rycee": "rycee",
         "schemer2": "schemer2",
-        "spicetify-nix": "spicetify-nix"
+        "tinted-foot": "tinted-foot"
       }
     },
     "rycee": {
       "flake": false,
       "locked": {
-        "lastModified": 1701677369,
-        "narHash": "sha256-w3dShcMSeRuQGk17V7mKxeX7qi75lIlhX2bd8400f3M=",
+        "lastModified": 1730088193,
+        "narHash": "sha256-bal4Z9FuMyOeDf9QKjq0BY/ftxas95yksZZjqz3erZo=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "92a8f13ee0cfb433e37d3258092a67df33d879df",
+        "rev": "2e14b0705c0c510258864a9832832b89ca6628e9",
         "type": "gitlab"
       },
       "original": {
@@ -290,29 +290,6 @@
         "type": "github"
       }
     },
-    "spicetify-nix": {
-      "inputs": {
-        "flake-utils": [
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1699986787,
-        "narHash": "sha256-eYlLWibKtHN/uWJQLzOMRXpoTbO6VcFTfVY4dpgdJcQ=",
-        "owner": "the-argus",
-        "repo": "spicetify-nix",
-        "rev": "3c702af1f717b7876fac08809201b1368d0d956c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "the-argus",
-        "repo": "spicetify-nix",
-        "type": "github"
-      }
-    },
     "systems": {
       "locked": {
         "lastModified": 1681028828,
@@ -327,6 +304,22 @@
         "repo": "default",
         "type": "github"
       }
+    },
+    "tinted-foot": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1727574105,
+        "narHash": "sha256-ByMVgH0rZ1by2YIVJ47gE8/ZHWcG8yqsErQ4tKLbm7Q=",
+        "owner": "tinted-theming",
+        "repo": "tinted-foot",
+        "rev": "e558fe47e187093313f19fa6a9eea61940ffbd6b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tinted-theming",
+        "repo": "tinted-foot",
+        "type": "github"
+      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index 4d2b77b..62d407d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -22,12 +22,12 @@
       url = "github:orhun/base16-kermit";
       flake = false;
     };
-    base16-foot = {
-      url = "github:tinted-theming/base16-foot";
+    tinted-foot = {
+      url = "github:tinted-theming/tinted-foot";
       flake = false;
     };
-    base16-vscode = {
-      url = "github:golf1052/base16-vscode";
+    tinted-vscode = {
+      url = "github:tinted-theming/tinted-vscode";
       flake = false;
     };
     base16-vim = {
diff --git a/home-manager/modules/colors.nix b/home-manager/modules/colors.nix
index 04c2854..7cf9ba3 100644
--- a/home-manager/modules/colors.nix
+++ b/home-manager/modules/colors.nix
@@ -321,7 +321,7 @@ in {
         programs.kermit.extraConfig = builtins.readFile (genTheme inputs.base16-kermit);
 
         # Foot
-        programs.foot.settings.main.include = "${genTheme inputs.base16-foot}";
+        programs.foot.settings.main.include = toString (mustache scheme "${inputs.tinted-foot}/templates/base16.mustache");
 
         # neovim
         xdg.configFile."nvim/colors/base16.vim".source = "${genTheme inputs.base16-vim}";
@@ -367,7 +367,7 @@ in {
           [
             (
               mkIf config.programs.vscode.enable {
-                ".vscode-oss/extensions/base16-1.0.0/themes/nix-colors.json".source = genTheme inputs.base16-vscode;
+                ".vscode-oss/extensions/base16-1.0.0/themes/nix-colors.json".source = mustache scheme "${inputs.tinted-vscode}/templates/base16.mustache";
                 ".vscode-oss/extensions/base16-1.0.0/package.json".text = builtins.toJSON {
                   name = "nix colors";
                   displayName = "Automatic Nix-generated base16 colors";