diff --git a/pkgs/data/icons/gruppled-lite-cursors/default.nix b/pkgs/by-name/gr/gruppled-black-lite-cursors/package.nix
similarity index 58%
rename from pkgs/data/icons/gruppled-lite-cursors/default.nix
rename to pkgs/by-name/gr/gruppled-black-lite-cursors/package.nix
index 9b1b6b073302..bbac2df3d287 100644
--- a/pkgs/data/icons/gruppled-lite-cursors/default.nix
+++ b/pkgs/by-name/gr/gruppled-black-lite-cursors/package.nix
@@ -1,12 +1,17 @@
 {
+  lib,
   stdenvNoCC,
   fetchFromGitHub,
-  theme,
-  lib,
+  theme ? "black",
 }:
 
+assert lib.asserts.assertOneOf "theme" theme [
+  "black"
+  "white"
+];
+
 stdenvNoCC.mkDerivation (finalAttrs: {
-  pname = "gruppled-lite-cursors";
+  pname = "gruppled-${theme}-lite-cursors";
   version = "1.0.0";
 
   src = fetchFromGitHub {
@@ -17,12 +22,12 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   };
 
   installPhase = ''
-    mkdir -p $out/share/icons/${theme}
-    cp -r ${theme}/{cursors,index.theme} $out/share/icons/${theme}
+    mkdir -p $out/share/icons/gruppled_${theme}_lite
+    cp -r gruppled_${theme}_lite/{cursors,index.theme} $out/share/icons/gruppled_${theme}_lite
   '';
 
   meta = {
-    description = "Gruppled Lite Cursors theme";
+    description = "Gruppled ${lib.toSentenceCase theme} Lite Cursors theme";
     homepage = "https://github.com/nim65s/gruppled-lite-cursors";
     license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [ nim65s ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 15e732a048f1..b22dbbe0c395 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9656,20 +9656,8 @@ with pkgs;
 
   spacx-gtk-theme = callPackage ../data/themes/gtk-theme-framework { theme = "spacx"; };
 
-  inherit
-    ({
-      gruppled-black-lite-cursors = callPackage ../data/icons/gruppled-lite-cursors {
-        theme = "gruppled_black_lite";
-      };
-      gruppled-white-lite-cursors = callPackage ../data/icons/gruppled-lite-cursors {
-        theme = "gruppled_white_lite";
-      };
-    })
-    gruppled-black-lite-cursors
-    gruppled-white-lite-cursors
-    ;
-
   gruppled-white-cursors = gruppled-black-cursors.override { theme = "white"; };
+  gruppled-white-lite-cursors = gruppled-black-lite-cursors.override { theme = "white"; };
 
   iosevka-comfy = recurseIntoAttrs (callPackages ../data/fonts/iosevka/comfy.nix { });