diff --git a/default.nix b/default.nix
index d577044c..65cf4936 100644
--- a/default.nix
+++ b/default.nix
@@ -1,7 +1,7 @@
 rec {
   sources = import ./nix/sources.nix;
   pkgs = import ./pkgs { inherit sources; };
-  witch = import ./lib/witch.nix { lib = pkgs.lib; };
+  witch = import ./lib/witch.nix { inherit pkgs; lib = pkgs.lib; };
   profiles = witch.modList {
     modulesDir = ./profiles;
     defaultFile = "nixos.nix";
diff --git a/lib/style.nix b/lib/style.nix
index 7f5d627f..0903d358 100644
--- a/lib/style.nix
+++ b/lib/style.nix
@@ -1,61 +1,11 @@
+{ pkgs }:
+
 rec {
-  base16 = {
-    color0 = "#292a44";
-    color1 = "#a0a0c5";
-    color2 = "#6dfedf";
-    color3 = "#ae81ff";
-    color4 = "#2de0a7";
-    color5 = "#7aa5ff";
-    color6 = "#8eaee0";
-    color7 = "#f1eff8";
-
-    color8 = "#666699";
-    color9 = "#a0a0c5";
-    color10 = "#6dfedf";
-    color11 = "#ae81ff";
-    color12 = "#2de0a7";
-    color13 = "#7aa5ff";
-    color14 = "#8eaee0";
-    color15 = "#53495d";
-
-    color16 = "#efe4a1";
-    color17 = "#ff79c6";
-    color18 = "#663399";
-    color19 = "#383a62";
-    color20 = "#a0a0c5";
-    color21 = "#ccccff";
-
-    ## Nord
-
-    # color0 = "#2e3440";
-    # color1 = "#bf616a";
-    # color2 = "#a3be8c";
-    # color3 = "#ebcb8b";
-    # color4 = "#81a1c1";
-    # color5 = "#b48ead";
-    # color6 = "#88c0d0";
-    # color7 = "#e5e9f0";
-
-    # color8 = "#4c566a";
-    # color9 = "#d08770";
-    # color10 = "#3b4252";
-    # color11 = "#434c5e";
-    # color12 = "#d8dee9";
-    # color13 = "#eceff4";
-    # color14 = "#5e81ac";
-    # color15 = "#8fbcbb";
-
-    # color16 = "#fd971f";
-    # color17 = "#cc6633";
-    # color18 = "#383830";
-    # color19 = "#49483e";
-    # color20 = "#a59f85";
-    # color21 = "#f5f4f1";
-  };
+  base16 = mapAttrs (_: toString) pkgs.base16.shell.shell256;
 
   font = {
-    name = "Hack Nerd Font";
-    size = "9";
-    size_css = "12px";
+    name = "FantasqueSansMono Nerd Font";
+    size = "10";
+    size_css = "14px";
   };
 }
diff --git a/lib/witch.nix b/lib/witch.nix
index 2b53e228..431825c8 100644
--- a/lib/witch.nix
+++ b/lib/witch.nix
@@ -1,7 +1,7 @@
-{ lib }:
+{ pkgs, lib }:
 
 {
-  style = import ./style.nix;
+  style = import ./style.nix { inherit pkgs; };
   colorhelpers = import ./colorhelpers.nix { inherit lib; };
   modList = import ./modules.nix;
 }
diff --git a/profiles/kat/home/default.nix b/profiles/kat/home/default.nix
index b5c3e879..a84bef22 100644
--- a/profiles/kat/home/default.nix
+++ b/profiles/kat/home/default.nix
@@ -8,7 +8,7 @@
     ./kitty.nix
     ./tmux.nix
     ./secrets.nix
-    #./base16.nix
+    ./base16.nix
     ./xdg.nix
     ./ssh.nix
     ./packages.nix
diff --git a/profiles/kat/home/vim/vimrc.nix b/profiles/kat/home/vim/vimrc.nix
index 7bf4e951..6ce15b3f 100644
--- a/profiles/kat/home/vim/vimrc.nix
+++ b/profiles/kat/home/vim/vimrc.nix
@@ -6,8 +6,7 @@
 
   " colors
   let base16colorspace=256
-  "colorscheme base16-rebecca
-  colorscheme default
+  colorscheme base16-default-dark
 
   " tabline
   let g:airline#extensions#tabline#enabled = 1