diff --git a/pkgs/data/themes/sddm-sugar-dark/default.nix b/pkgs/by-name/sd/sddm-sugar-dark/package.nix
similarity index 72%
rename from pkgs/data/themes/sddm-sugar-dark/default.nix
rename to pkgs/by-name/sd/sddm-sugar-dark/package.nix
index 0f10a916cf95..162f8e4ec266 100644
--- a/pkgs/data/themes/sddm-sugar-dark/default.nix
+++ b/pkgs/by-name/sd/sddm-sugar-dark/package.nix
@@ -1,28 +1,30 @@
 {
-  pkgs,
   lib,
   stdenvNoCC,
+  fetchFromGitHub,
+  formats,
+  libsForQt5,
   themeConfig ? null,
 }:
 
-stdenvNoCC.mkDerivation rec {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "sddm-sugar-dark";
   version = "1.2";
 
-  src = pkgs.fetchFromGitHub {
+  src = fetchFromGitHub {
     owner = "MarianArlt";
     repo = "sddm-sugar-dark";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-C3qB9hFUeuT5+Dos2zFj5SyQegnghpoFV9wHvE9VoD8=";
   };
 
   dontWrapQtApps = true;
 
-  buildInputs = with pkgs.libsForQt5.qt5; [ qtgraphicaleffects ];
+  buildInputs = with libsForQt5.qt5; [ qtgraphicaleffects ];
 
   installPhase =
     let
-      iniFormat = pkgs.formats.ini { };
+      iniFormat = formats.ini { };
       configFile = iniFormat.generate "" { General = themeConfig; };
 
       basePath = "$out/share/sddm/themes/sugar-dark";
@@ -37,10 +39,9 @@ stdenvNoCC.mkDerivation rec {
 
   meta = {
     description = "Dark SDDM theme from the sugar family";
-    homepage = "https://github.com/${src.owner}/${pname}";
+    homepage = "https://github.com/MarianArlt/sddm-sugar-dark";
     license = lib.licenses.gpl3;
-
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ danid3v ];
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c1999e75e8e5..1216bf80ed3b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10069,8 +10069,6 @@ with pkgs;
 
   sddm-chili-theme = libsForQt5.callPackage ../data/themes/chili-sddm { };
 
-  sddm-sugar-dark = libsForQt5.callPackage ../data/themes/sddm-sugar-dark { };
-
   sgx-sdk = callPackage ../os-specific/linux/sgx/sdk { };
 
   sgx-psw = callPackage ../os-specific/linux/sgx/psw {