diff --git a/gtk-theme.nix b/gtk-theme.nix
index 87137d7..332bdae 100644
--- a/gtk-theme.nix
+++ b/gtk-theme.nix
@@ -41,10 +41,10 @@ pkgs.stdenv.mkDerivation rec {
       FG=${palette.util.fg}
       BG=${palette.util.bg}
       HDR_BTN_BG=${palette.util.bg}
-      HDR_BTN_FG=${palette.normal.yellow}
+      HDR_BTN_FG=${palette.util.fg}
       ACCENT_BG=${palette.normal.cyan}
       ACCENT_FG=${palette.normal.yellow}
-      HDR_FG=${palette.normal.yellow}
+      HDR_FG=${palette.bright.yellow}
       HDR_BG=${palette.util.bg}
       MATERIA_SURFACE=${palette.normal.black}
       MATERIA_VIEW=${palette.util.bg}
diff --git a/system/quiver.nix b/system/quiver.nix
index 87beb83..9e22eab 100644
--- a/system/quiver.nix
+++ b/system/quiver.nix
@@ -49,6 +49,7 @@
   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 
   environment.sessionVariables = rec {
+    ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE = "'fg=5'";
     WLR_NO_HARDWARE_CURSORS = "1";
     GBM_BACKEND = "nvidia-drm";
     NVD_BACKEND = "direct";