diff --git a/modules/bspwm/hm.nix b/modules/bspwm/hm.nix
index 2df8691a..fb51e970 100644
--- a/modules/bspwm/hm.nix
+++ b/modules/bspwm/hm.nix
@@ -1,15 +1,16 @@
-{ config, lib, ... }:
-{
-  options.stylix.targets.bspwm.enable =
-    config.lib.stylix.mkEnableTarget "bspwm" true;
+{ mkTarget, ... }:
+mkTarget {
+  name = "bspwm";
+  humanName = "bspwm";
 
-  config = lib.mkIf (config.stylix.enable && config.stylix.targets.bspwm.enable) {
-    xsession.windowManager.bspwm.settings =
-      with config.lib.stylix.colors.withHashtag; {
+  configElements =
+    { colors }:
+    {
+      xsession.windowManager.bspwm.settings = with colors.withHashtag; {
         normal_border_color = base03;
         active_border_color = base0C;
         focused_border_color = base0D;
         presel_feedback_color = base00;
       };
-  };
+    };
 }