diff --git a/modules/k9s/hm.nix b/modules/k9s/hm.nix
index d3d5a39e1..d4da69444 100644
--- a/modules/k9s/hm.nix
+++ b/modules/k9s/hm.nix
@@ -1,126 +1,135 @@
-{ pkgs, config, lib, ... }:
+{ pkgs, config, options, lib, ... }:
 
 with config.lib.stylix.colors.withHashtag;
+let
+  skin = {
+    k9s = {
+      body = {
+        fgColor = base05-hex;
+        bgColor = "default";
+        logoColor = base0C-hex;
+      };
 
-{
-  options.stylix.targets.k9s.enable =
-    config.lib.stylix.mkEnableTarget "k9s" true;
+      prompt = {
+        fgColor = base05-hex;
+        bgColor = base00-hex;
+        suggestColor = base0A-hex;
+      };
+
+      info = {
+        fgColor = base0B-hex;
+        sectionColor = base05-hex;
+      };
 
-  config = lib.mkIf config.stylix.targets.k9s.enable {
-    programs.k9s.skin = {
-      k9s = {
-        body = {
+      dialog = {
+        fgColor = base05-hex;
+        bgColor = "default";
+        buttonFgColor = base05-hex;
+        buttonBgColor = base0C-hex;
+        buttonFocusFgColor = base0E-hex;
+        buttonFocusBgColor = base0B-hex;
+        labelFgColor = base0A-hex;
+        fieldFgColor = base05-hex;
+      };
+
+      frame = {
+        border = {
+          fgColor = base02-hex;
+          focusColor = base01-hex;
+        };
+
+        menu = {
           fgColor = base05-hex;
-          bgColor = "default";
-          logoColor = base0C-hex;
+          keyColor = base0B-hex;
+          numKeyColor = base0B-hex;
         };
 
-        prompt = {
+        crumbs = {
           fgColor = base05-hex;
-          bgColor = base00-hex;
-          suggestColor = base0A-hex;
+          bgColor = base01-hex;
+          activeColor = base01-hex;
         };
 
-        info = {
-          fgColor = base0B-hex;
-          sectionColor = base05-hex;
+        status = {
+          newColor = base08-hex;
+          modifyColor = base0C-hex;
+          addColor = base09-hex;
+          errorColor = base0D-hex;
+          highlightcolor = base0A-hex;
+          killColor = base03-hex;
+          completedColor = base03-hex;
         };
 
-        dialog = {
+        title = {
           fgColor = base05-hex;
-          bgColor = "default";
-          buttonFgColor = base05-hex;
-          buttonBgColor = base0C-hex;
-          buttonFocusFgColor = base0E-hex;
-          buttonFocusBgColor = base0B-hex;
-          labelFgColor = base0A-hex;
-          fieldFgColor = base05-hex;
+          bgColor = base01-hex;
+          highlightColor = base0A-hex;
+          counterColor = base0C-hex;
+          filterColor = base0B-hex;
         };
+      };
 
-        frame = {
-          border = {
-            fgColor = base02-hex;
-            focusColor = base01-hex;
-          };
-
-          menu = {
-            fgColor = base05-hex;
-            keyColor = base0B-hex;
-            numKeyColor = base0B-hex;
-          };
-
-          crumbs = {
-            fgColor = base05-hex;
-            bgColor = base01-hex;
-            activeColor = base01-hex;
-          };
-
-          status = {
-            newColor = base08-hex;
-            modifyColor = base0C-hex;
-            addColor = base09-hex;
-            errorColor = base0D-hex;
-            highlightcolor = base0A-hex;
-            killColor = base03-hex;
-            completedColor = base03-hex;
-          };
-
-          title = {
-            fgColor = base05-hex;
-            bgColor = base01-hex;
-            highlightColor = base0A-hex;
-            counterColor = base0C-hex;
-            filterColor = base0B-hex;
-          };
+      views = {
+        charts = {
+          bgColor = "default";
+          defaultDialColors = [ base0C-hex base0D-hex ];
+          defaultChartColors = [ base0C-hex base0D-hex ];
         };
 
-        views = {
-          charts = {
-            bgColor = "default";
-            defaultDialColors = [ base0C-hex base0D-hex ];
-            defaultChartColors = [ base0C-hex base0D-hex ];
-          };
-
-          table = {
+        table = {
+          fgColor = base05-hex;
+          bgColor = "default";
+          header = {
             fgColor = base05-hex;
             bgColor = "default";
-            header = {
-              fgColor = base05-hex;
-              bgColor = "default";
-              sorterColor = base08-hex;
-            };
+            sorterColor = base08-hex;
           };
+        };
 
-          xray = {
-            fgColor = base05-hex;
-            bgColor = "default";
-            cursorColor = base01-hex;
-            graphicColor = base0C-hex;
-            showIcons = false;
-          };
+        xray = {
+          fgColor = base05-hex;
+          bgColor = "default";
+          cursorColor = base01-hex;
+          graphicColor = base0C-hex;
+          showIcons = false;
+        };
 
-          yaml = {
-            keyColor = base0B-hex;
-            colonColor = base0C-hex;
-            valueColor = base05-hex;
-          };
+        yaml = {
+          keyColor = base0B-hex;
+          colonColor = base0C-hex;
+          valueColor = base05-hex;
+        };
 
-          logs = {
+        logs = {
+          fgColor = base05-hex;
+          bgColor = "default";
+          indicator = {
             fgColor = base05-hex;
-            bgColor = "default";
-            indicator = {
-              fgColor = base05-hex;
-              bgColor = base0C-hex;
-            };
+            bgColor = base0C-hex;
           };
+        };
 
-          help = {
-            fgColor = base05-hex;
-            bgColor = base00-hex;
-            indicator.fgColor = base0D-hex;
-          };
+        help = {
+          fgColor = base05-hex;
+          bgColor = base00-hex;
+          indicator.fgColor = base0D-hex;
         };
       };
     };
   };
+
+  # Skin setting is deprecated, but we still need to support it
+  skinsNotSkin = builtins.hasAttr "skins" options.programs.k9s;
+in
+{
+  options.stylix.targets.k9s.enable =
+    config.lib.stylix.mkEnableTarget "k9s" true;
+
+  config.programs.k9s = lib.mkIf config.stylix.targets.k9s.enable
+    (if skinsNotSkin then {
+      skins.stylix = lib.mkIf skinsNotSkin skin;
+      settings.k9s.ui.skin = "stylix";
+    } else {
+      skin = skin;
+    });
 }