diff --git a/config/profiles/base/base16.nix b/config/profiles/base/base16.nix
index 07ec4e4a..e23efe22 100644
--- a/config/profiles/base/base16.nix
+++ b/config/profiles/base/base16.nix
@@ -4,7 +4,7 @@
   base16 = {
     console = {
       enable = true;
-      scheme = config.home-manager.users.kat.alias.default;
+      scheme = config.home-manager.users.kat.base16.alias.default;
     };
   };
 }
diff --git a/config/users/kat/base/base16.nix b/config/users/kat/base/base16.nix
index 861db8e6..6efeb3cf 100644
--- a/config/users/kat/base/base16.nix
+++ b/config/users/kat/base/base16.nix
@@ -8,5 +8,7 @@
     alias.dark = "atelier.atelier-cave";
   };
 
-  kw.hexColours = lib.mapAttrs' (k: v: lib.nameValuePair k "#${v.hex.rgb}") config.lib.arc.base16.schemeForAlias.default;
+
+  kw.hexColors = lib.mapAttrs' (k: v: lib.nameValuePair k "#${v.hex.rgb}")
+  (lib.filterAttrs (n: _: lib.hasInfix "base" n) config.lib.arc.base16.schemeForAlias.default);
 }
diff --git a/config/users/kat/gui/foot.nix b/config/users/kat/gui/foot.nix
index 09212af1..01fb7051 100644
--- a/config/users/kat/gui/foot.nix
+++ b/config/users/kat/gui/foot.nix
@@ -2,12 +2,7 @@
 
 with lib;
 
-let
-  witch.style.base16 = lib.mapAttrs' (k: v: lib.nameValuePair k "#${v.hex.rgb}")
-  config.lib.arc.base16.schemeForAlias.default;
-  colors.ansi = builtins.concatStringsSep ", " (map (c: ''"#${c.hex.rgb}"'') (sublist 0 8 config.lib.arc.base16.schemeForAlias.default.shell.colours));
-  colors.brights = builtins.concatStringsSep ", " (map (c: ''"#${c.hex.rgb}"'') (sublist 8 8 config.lib.arc.base16.schemeForAlias.default.shell.colours));
-in {
+{
   programs.foot = {
     enable = true;
     settings = {
diff --git a/config/users/kat/sway/mako.nix b/config/users/kat/sway/mako.nix
index 6ab09451..38038051 100644
--- a/config/users/kat/sway/mako.nix
+++ b/config/users/kat/sway/mako.nix
@@ -1,8 +1,7 @@
 { config, pkgs, lib, witch, ... }:
 
 let
-  base16 = lib.mapAttrs' (k: v: lib.nameValuePair k "#${v.hex.rgb}")
-    config.lib.arc.base16.schemeForAlias.default;
+  base16 = config.kw.hexColors;
 in
 {
   systemd.user.services = {
diff --git a/config/users/kat/sway/waybar.nix b/config/users/kat/sway/waybar.nix
index ad19ba22..df29f88e 100644
--- a/config/users/kat/sway/waybar.nix
+++ b/config/users/kat/sway/waybar.nix
@@ -1,8 +1,7 @@
 { config, lib, pkgs, ... }:
 
 let
-  base16 = lib.mapAttrs' (k: v: lib.nameValuePair k "#${v.hex.rgb}")
-  config.lib.arc.base16.schemeForAlias.default;
+  base16 = config.kw.hexColors;
 in
   {
     programs.waybar = {