diff --git a/modules/cava/hm.nix b/modules/cava/hm.nix
index 1ba12135..a0b1bc21 100644
--- a/modules/cava/hm.nix
+++ b/modules/cava/hm.nix
@@ -3,9 +3,7 @@ mkTarget {
   name = "cava";
   humanName = "CAVA";
 
-  extraOptions = {
-    rainbow.enable = lib.mkEnableOption "rainbow gradient theming";
-  };
+  extraOptions.rainbow.enable = lib.mkEnableOption "rainbow gradient theming";
 
   configElements =
     { cfg, colors }:
diff --git a/modules/hyprlock/hm.nix b/modules/hyprlock/hm.nix
index bf2d8ee2..6e644633 100644
--- a/modules/hyprlock/hm.nix
+++ b/modules/hyprlock/hm.nix
@@ -8,9 +8,7 @@ mkTarget {
   name = "hyprlock";
   humanName = "Hyprlock";
 
-  extraOptions = {
-    useWallpaper = config.lib.stylix.mkEnableWallpaper "Hyprlock" true;
-  };
+  extraOptions.useWallpaper = config.lib.stylix.mkEnableWallpaper "Hyprlock" true;
 
   configElements = [
     (
diff --git a/modules/lightdm/nixos.nix b/modules/lightdm/nixos.nix
index 405cfbac..c7fa38ed 100644
--- a/modules/lightdm/nixos.nix
+++ b/modules/lightdm/nixos.nix
@@ -8,9 +8,7 @@ mkTarget {
   name = "lightdm";
   humanName = "LightDM";
 
-  extraOptions = {
-    useWallpaper = config.lib.stylix.mkEnableWallpaper "LightDM" true;
-  };
+  extraOptions.useWallpaper = config.lib.stylix.mkEnableWallpaper "LightDM" true;
 
   configElements =
     { cfg, image }:
diff --git a/modules/yazi/hm.nix b/modules/yazi/hm.nix
index bf01e02e..397f8874 100644
--- a/modules/yazi/hm.nix
+++ b/modules/yazi/hm.nix
@@ -4,12 +4,10 @@ mkTarget {
   name = "yazi";
   humanName = "Yazi";
 
-  extraOptions = {
-    boldDirectory = lib.mkOption {
-      description = "Whether to use bold font for directories.";
-      type = lib.types.bool;
-      default = true;
-    };
+  extraOptions.boldDirectory = lib.mkOption {
+    description = "Whether to use bold font for directories.";
+    type = lib.types.bool;
+    default = true;
   };
 
   configElements =