diff --git a/users/simon/modules/zsh/default.nix b/users/simon/modules/zsh/default.nix
index 29fff36..87bddfe 100644
--- a/users/simon/modules/zsh/default.nix
+++ b/users/simon/modules/zsh/default.nix
@@ -1,5 +1,7 @@
 { lib, nixosConfig, pkgs, ... }:
 let
+  solarized = (import ../common.nix).colorschemes.solarized;
+
   dircolors-solarized = pkgs.fetchFromGitHub {
     owner = "seebi";
     repo = "dircolors-solarized";
@@ -26,9 +28,24 @@ in
       defaultCommand = "fd --color always";
       defaultOptions = [
         "--ansi"
-        "--color=bg+:#073642,bg:#002b36,spinner:#2aa198,hl:#268bd2"
-        "--color=fg:#839496,header:#268bd2,info:#b58900,pointer:#2aa198"
-        "--color=marker:#2aa198,fg+:#eee8d5,prompt:#b58900,hl+:#268bd2"
+        "--color=${lib.concatStringsSep
+          ","
+          (lib.mapAttrsToList
+            (n: v: "${n}:${v}")
+            (with solarized; {
+              "bg" = base03;
+              "bg+" = base02;
+              "fg" = base0;
+              "fg+" = base2;
+              "header" = blue;
+              "hl" = blue;
+              "hl+" = blue;
+              "info" = yellow;
+              "marker" = cyan;
+              "pointer" = cyan;
+              "prompt" = yellow;
+              "spinner" = cyan;
+            }))}"
       ];
       fileWidgetCommand = "fd --color always --type f";
       fileWidgetOptions = [ "--preview 'head -n 100 {}'" ];