diff --git a/docs/src/modules.md b/docs/src/modules.md
index dd1e8def..46fbf15b 100644
--- a/docs/src/modules.md
+++ b/docs/src/modules.md
@@ -87,7 +87,7 @@ taking two arguments and returning an attrset:
 }:
 {
   options.stylix.targets.«name».enable =
-    config.lib.stylix.mkEnableOverlay "«human readable name»";
+    config.lib.stylix.mkEnableTarget "«human readable name»" true;
 
   overlay =
     final: prev:
diff --git a/modules/gnome-text-editor/overlay.nix b/modules/gnome-text-editor/overlay.nix
index ec723ac5..8618114d 100644
--- a/modules/gnome-text-editor/overlay.nix
+++ b/modules/gnome-text-editor/overlay.nix
@@ -7,7 +7,7 @@ let
 in
 {
   options.stylix.targets.gnome-text-editor.enable =
-    config.lib.stylix.mkEnableOverlay "GNOME Text Editor";
+    config.lib.stylix.mkEnableTarget "GNOME Text Editor" true;
 
   overlay =
     _: prev:
diff --git a/modules/nixos-icons/overlay.nix b/modules/nixos-icons/overlay.nix
index 087641ff..a74a8079 100644
--- a/modules/nixos-icons/overlay.nix
+++ b/modules/nixos-icons/overlay.nix
@@ -6,7 +6,7 @@
 }:
 {
   options.stylix.targets.nixos-icons.enable =
-    config.lib.stylix.mkEnableOverlay "the NixOS logo";
+    config.lib.stylix.mkEnableTarget "the NixOS logo" true;
 
   overlay =
     _: super:
diff --git a/stylix/overlays.nix b/stylix/overlays.nix
index af7b8da5..c907a2b2 100644
--- a/stylix/overlays.nix
+++ b/stylix/overlays.nix
@@ -20,7 +20,9 @@ inputs:
     in
     {
       options = attrs.options or { };
-      config.nixpkgs.overlays = [ attrs.overlay ];
+      config.nixpkgs.overlays = lib.mkIf config.stylix.overlays.enable [
+        attrs.overlay
+      ];
     }
   ) (import ./autoload.nix { inherit lib inputs; } "overlay");
 }
diff --git a/stylix/target.nix b/stylix/target.nix
index fa12bb02..12b8494b 100644
--- a/stylix/target.nix
+++ b/stylix/target.nix
@@ -35,7 +35,7 @@
     let
       cfg = config.stylix;
     in
-    rec {
+    {
       mkEnableTarget =
         humanName: autoEnable:
         lib.mkEnableOption "theming for ${humanName}"
@@ -57,7 +57,5 @@
         // lib.optionalAttrs autoEnable {
           defaultText = lib.literalMD "`stylix.image != null`";
         };
-      mkEnableOverlay =
-        humanName: mkEnableTarget humanName config.stylix.overlays.enable;
     };
 }