diff --git a/pkgs/data/themes/ant-theme/ant-bloody.nix b/pkgs/by-name/an/ant-bloody-theme/package.nix
similarity index 69%
rename from pkgs/data/themes/ant-theme/ant-bloody.nix
rename to pkgs/by-name/an/ant-bloody-theme/package.nix
index b00455b79a67..66380c9536a8 100644
--- a/pkgs/data/themes/ant-theme/ant-bloody.nix
+++ b/pkgs/by-name/an/ant-bloody-theme/package.nix
@@ -8,13 +8,13 @@
 let
   themeName = "Ant-Bloody";
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "ant-bloody-theme";
   version = "1.3.0";
 
   src = fetchurl {
-    url = "https://github.com/EliverLara/${themeName}/releases/download/v${version}/${themeName}.tar";
-    sha256 = "0rrz50kmzjmqj17hvrw67pbaclwxv85i5m08s7842iky6dnn5z8s";
+    url = "https://github.com/EliverLara/${themeName}/releases/download/v${finalAttrs.version}/${themeName}.tar";
+    hash = "sha256-Gv1ibTN+RkHQ0QjUEgvanVOm1j2G5w1PkLjKXycoP2c=";
   };
 
   propagatedUserEnvPkgs = [
@@ -29,11 +29,11 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Bloody variant of the Ant theme";
     homepage = "https://github.com/EliverLara/${themeName}";
-    license = licenses.gpl3;
-    platforms = platforms.all;
-    maintainers = with maintainers; [ alexarice ];
+    license = lib.licenses.gpl3Only;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ alexarice ];
   };
-}
+})
diff --git a/pkgs/data/themes/ant-theme/ant-nebula.nix b/pkgs/by-name/an/ant-nebula-theme/package.nix
similarity index 69%
rename from pkgs/data/themes/ant-theme/ant-nebula.nix
rename to pkgs/by-name/an/ant-nebula-theme/package.nix
index 3e7a31902cc2..8e3f0be4b441 100644
--- a/pkgs/data/themes/ant-theme/ant-nebula.nix
+++ b/pkgs/by-name/an/ant-nebula-theme/package.nix
@@ -8,13 +8,13 @@
 let
   themeName = "Ant-Nebula";
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "ant-nebula-theme";
   version = "1.3.0";
 
   src = fetchurl {
-    url = "https://github.com/EliverLara/${themeName}/releases/download/v${version}/${themeName}.tar";
-    sha256 = "1xpgw577nmgjk547mg2vvv0gdai60srgncykm5pb1w8dnlk69jbz";
+    url = "https://github.com/EliverLara/${themeName}/releases/download/v${finalAttrs.version}/${themeName}.tar";
+    hash = "sha256-f8lkJrUN8bBuqdMz+7IGJqr2wN5bvHpImfJVe07h7/Y=";
   };
 
   propagatedUserEnvPkgs = [
@@ -29,11 +29,11 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Nebula variant of the Ant theme";
     homepage = "https://github.com/EliverLara/${themeName}";
-    license = licenses.gpl3;
-    platforms = platforms.all;
-    maintainers = with maintainers; [ alexarice ];
+    license = lib.licenses.gpl3Only;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ alexarice ];
   };
-}
+})
diff --git a/pkgs/data/themes/ant-theme/ant.nix b/pkgs/by-name/an/ant-theme/package.nix
similarity index 69%
rename from pkgs/data/themes/ant-theme/ant.nix
rename to pkgs/by-name/an/ant-theme/package.nix
index e6bc0f848681..37f41f15c3b8 100644
--- a/pkgs/data/themes/ant-theme/ant.nix
+++ b/pkgs/by-name/an/ant-theme/package.nix
@@ -8,13 +8,13 @@
 let
   themeName = "Ant";
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "ant-theme";
   version = "1.3.0";
 
   src = fetchurl {
-    url = "https://github.com/EliverLara/${themeName}/releases/download/v${version}/${themeName}.tar";
-    sha256 = "1r795v96ywzcb4dq08q2fdbmfia32g36cc512mhy41s8fb1a47dz";
+    url = "https://github.com/EliverLara/${themeName}/releases/download/v${finalAttrs.version}/${themeName}.tar";
+    hash = "sha256-vx2iwnJIB+JhFaEwZsYTQ0VXV3MCI4AbWexzb9Iu6eQ=";
   };
 
   propagatedUserEnvPkgs = [
@@ -29,11 +29,11 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Flat and light theme with a modern look";
     homepage = "https://github.com/EliverLara/${themeName}";
-    license = licenses.gpl3;
-    platforms = platforms.all;
-    maintainers = with maintainers; [ alexarice ];
+    license = lib.licenses.gpl3Only;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ alexarice ];
   };
-}
+})
diff --git a/pkgs/data/themes/plata/default.nix b/pkgs/by-name/pl/plata-theme/package.nix
similarity index 89%
rename from pkgs/data/themes/plata/default.nix
rename to pkgs/by-name/pl/plata-theme/package.nix
index 405c818d7ff9..23a82e148f61 100644
--- a/pkgs/data/themes/plata/default.nix
+++ b/pkgs/by-name/pl/plata-theme/package.nix
@@ -18,7 +18,7 @@
   xfceSupport ? true,
   mateSupport ? true,
   gtk3,
-  marco,
+  mate,
   gtkNextSupport ? false,
   plankSupport ? false,
   steamSupport ? false,
@@ -31,15 +31,15 @@
   destructionColor ? null, # Tertiary color for 'destructive' buttons (Default: #F44336 = Red500)
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "plata-theme";
   version = "0.9.9";
 
   src = fetchFromGitLab {
     owner = "tista500";
     repo = "plata-theme";
-    rev = version;
-    sha256 = "1iwvlv9qcrjyfbzab00vjqafmp3vdybz1hi02r6lwbgvwyfyrifk";
+    rev = finalAttrs.version;
+    hash = "sha256-08Xsnef7LU5NFiDC8Jdve9zqFJYbgKX+cl5mhtOmm8c=";
   };
 
   nativeBuildInputs = [
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
   ]
   ++ lib.optionals mateSupport [
     gtk3
-    marco
+    mate.marco
   ]
   ++ lib.optional telegramSupport zip;
 
@@ -96,14 +96,14 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  meta = with lib; {
+  meta = {
     description = "GTK theme based on Material Design Refresh";
     homepage = "https://gitlab.com/tista500/plata-theme";
-    license = with licenses; [
-      gpl2
+    license = with lib.licenses; [
+      gpl2Plus
       cc-by-sa-40
     ];
-    platforms = platforms.linux;
-    maintainers = [ maintainers.tadfisher ];
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ tadfisher ];
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c24d32a85114..9ece6c7499be 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10299,12 +10299,6 @@ with pkgs;
 
   andromeda-gtk-theme = libsForQt5.callPackage ../data/themes/andromeda-gtk-theme { };
 
-  ant-theme = callPackage ../data/themes/ant-theme/ant.nix { };
-
-  ant-bloody-theme = callPackage ../data/themes/ant-theme/ant-bloody.nix { };
-
-  ant-nebula-theme = callPackage ../data/themes/ant-theme/ant-nebula.nix { };
-
   bibata-cursors-translucent = callPackage ../data/icons/bibata-cursors/translucent.nix { };
 
   dejavu_fonts = lowPrio (callPackage ../data/fonts/dejavu-fonts { });
@@ -10467,10 +10461,6 @@ with pkgs;
 
   papis = with python3Packages; toPythonApplication papis;
 
-  plata-theme = callPackage ../data/themes/plata {
-    inherit (mate) marco;
-  };
-
   polychromatic = qt6Packages.callPackage ../applications/misc/polychromatic { };
 
   qogir-kde = libsForQt5.callPackage ../data/themes/qogir-kde { };