diff --git a/pkgs/data/themes/andromeda-gtk-theme/default.nix b/pkgs/by-name/an/andromeda-gtk-theme/package.nix
similarity index 93%
rename from pkgs/data/themes/andromeda-gtk-theme/default.nix
rename to pkgs/by-name/an/andromeda-gtk-theme/package.nix
index da49e70adeba..281c0eee0b57 100644
--- a/pkgs/data/themes/andromeda-gtk-theme/default.nix
+++ b/pkgs/by-name/an/andromeda-gtk-theme/package.nix
@@ -56,12 +56,12 @@ stdenvNoCC.mkDerivation {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Elegant dark theme for gnome, mate, budgie, cinnamon, xfce";
     homepage = "https://github.com/EliverLara/Andromeda-gtk";
-    license = licenses.gpl3Only;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl3Only;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [
       jakedevs
       romildo
     ];
diff --git a/pkgs/data/icons/beauty-line-icon-theme/default.nix b/pkgs/by-name/be/beauty-line-icon-theme/package.nix
similarity index 74%
rename from pkgs/data/icons/beauty-line-icon-theme/default.nix
rename to pkgs/by-name/be/beauty-line-icon-theme/package.nix
index af4c09e9adff..c92199cd7dc0 100644
--- a/pkgs/data/icons/beauty-line-icon-theme/default.nix
+++ b/pkgs/by-name/be/beauty-line-icon-theme/package.nix
@@ -2,16 +2,16 @@
   lib,
   stdenvNoCC,
   fetchFromGitLab,
-  breeze-icons,
   gtk3,
   gnome-icon-theme,
   hicolor-icon-theme,
   mint-x-icons,
   pantheon,
   jdupes,
+  libsForQt5,
 }:
 
-stdenvNoCC.mkDerivation rec {
+stdenvNoCC.mkDerivation {
   pname = "BeautyLine";
   version = "2.4";
 
@@ -29,7 +29,7 @@ stdenvNoCC.mkDerivation rec {
 
   # ubuntu-mono is also required but missing in ubuntu-themes (please add it if it is packaged at some point)
   propagatedBuildInputs = [
-    breeze-icons
+    libsForQt5.breeze-icons
     gnome-icon-theme
     hicolor-icon-theme
     mint-x-icons
@@ -44,20 +44,20 @@ stdenvNoCC.mkDerivation rec {
   installPhase = ''
     runHook preInstall
 
-    mkdir -p $out/share/icons/${pname}
-    cp -r * $out/share/icons/${pname}/
-    gtk-update-icon-cache $out/share/icons/${pname}
+    mkdir -p $out/share/icons/BeautyLine
+    cp -r * $out/share/icons/BeautyLine/
+    gtk-update-icon-cache $out/share/icons/BeautyLine
 
     jdupes --link-soft --recurse $out/share
 
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "BeautyLine icon theme";
     homepage = "https://www.gnome-look.org/p/1425426/";
-    platforms = platforms.linux;
-    license = [ licenses.publicDomain ];
-    maintainers = with maintainers; [ lwb-2021 ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.publicDomain;
+    maintainers = with lib.maintainers; [ lwb-2021 ];
   };
 }
diff --git a/pkgs/data/icons/bibata-cursors/0001-fix-broken-symlinks.patch b/pkgs/by-name/bi/bibata-cursors-translucent/0001-fix-broken-symlinks.patch
similarity index 100%
rename from pkgs/data/icons/bibata-cursors/0001-fix-broken-symlinks.patch
rename to pkgs/by-name/bi/bibata-cursors-translucent/0001-fix-broken-symlinks.patch
diff --git a/pkgs/data/icons/bibata-cursors/translucent.nix b/pkgs/by-name/bi/bibata-cursors-translucent/package.nix
similarity index 100%
rename from pkgs/data/icons/bibata-cursors/translucent.nix
rename to pkgs/by-name/bi/bibata-cursors-translucent/package.nix
diff --git a/pkgs/data/themes/elegant-sddm/default.nix b/pkgs/by-name/el/elegant-sddm/package.nix
similarity index 84%
rename from pkgs/data/themes/elegant-sddm/default.nix
rename to pkgs/by-name/el/elegant-sddm/package.nix
index 56545c77c843..dc5ac6d4638e 100644
--- a/pkgs/data/themes/elegant-sddm/default.nix
+++ b/pkgs/by-name/el/elegant-sddm/package.nix
@@ -3,7 +3,7 @@
   formats,
   stdenvNoCC,
   fetchFromGitHub,
-  qtgraphicaleffects,
+  libsForQt5,
   /*
     An example of how you can override the background with a NixOS wallpaper
     *
@@ -33,11 +33,10 @@ stdenvNoCC.mkDerivation {
     hash = "sha256-yn0fTYsdZZSOcaYlPCn8BUIWeFIKcTI1oioTWqjYunQ=";
   };
 
-  propagatedBuildInputs = [
-    qtgraphicaleffects
-  ];
-
   dontWrapQtApps = true;
+  propagatedBuildInputs = [
+    libsForQt5.qtgraphicaleffects
+  ];
 
   installPhase = ''
     runHook preInstall
@@ -55,13 +54,13 @@ stdenvNoCC.mkDerivation {
   postFixup = ''
     mkdir -p $out/nix-support
 
-    echo ${qtgraphicaleffects} >> $out/nix-support/propagated-user-env-packages
+    echo ${libsForQt5.qtgraphicaleffects} >> $out/nix-support/propagated-user-env-packages
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Sleek and stylish SDDM theme crafted in QML";
     homepage = "https://github.com/surajmandalcell/Elegant-sddm";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ GaetanLepage ];
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
   };
 }
diff --git a/pkgs/data/icons/flat-remix-icon-theme/default.nix b/pkgs/by-name/fl/flat-remix-icon-theme/package.nix
similarity index 77%
rename from pkgs/data/icons/flat-remix-icon-theme/default.nix
rename to pkgs/by-name/fl/flat-remix-icon-theme/package.nix
index ad9d166a5a6b..18f55e5cbda9 100644
--- a/pkgs/data/icons/flat-remix-icon-theme/default.nix
+++ b/pkgs/by-name/fl/flat-remix-icon-theme/package.nix
@@ -3,21 +3,21 @@
   stdenvNoCC,
   fetchFromGitHub,
   gtk3,
-  breeze-icons,
   pantheon,
   gnome-icon-theme,
   hicolor-icon-theme,
+  libsForQt5,
 }:
 
-stdenvNoCC.mkDerivation rec {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "flat-remix-icon-theme";
   version = "20240201";
 
   src = fetchFromGitHub {
     owner = "daniruiz";
     repo = "flat-remix";
-    rev = version;
-    sha256 = "sha256-3TkBRgoT2AW0Sb0CrXdxh53/jYARAMFC/TIj/r/zruo=";
+    tag = finalAttrs.version;
+    hash = "sha256-3TkBRgoT2AW0Sb0CrXdxh53/jYARAMFC/TIj/r/zruo=";
   };
 
   nativeBuildInputs = [
@@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation rec {
   ];
 
   propagatedBuildInputs = [
-    breeze-icons
+    libsForQt5.breeze-icons
     pantheon.elementary-icon-theme
     gnome-icon-theme
     hicolor-icon-theme
@@ -45,12 +45,12 @@ stdenvNoCC.mkDerivation rec {
     recordPropagatedDependencies
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Flat remix is a pretty simple icon theme inspired on material design";
     homepage = "https://drasite.com/flat-remix";
-    license = with licenses; [ gpl3Only ];
+    license = with lib.licenses; [ gpl3Only ];
     # breeze-icons and pantheon.elementary-icon-theme dependencies are restricted to linux
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
     maintainers = [ ];
   };
-}
+})
diff --git a/pkgs/data/icons/gruvbox-dark-icons-gtk/default.nix b/pkgs/by-name/gr/gruvbox-dark-icons-gtk/package.nix
similarity index 75%
rename from pkgs/data/icons/gruvbox-dark-icons-gtk/default.nix
rename to pkgs/by-name/gr/gruvbox-dark-icons-gtk/package.nix
index f0cd2ed87c5f..1095643dbd14 100644
--- a/pkgs/data/icons/gruvbox-dark-icons-gtk/default.nix
+++ b/pkgs/by-name/gr/gruvbox-dark-icons-gtk/package.nix
@@ -3,26 +3,26 @@
   stdenvNoCC,
   fetchFromGitHub,
   gtk3,
-  breeze-icons,
   gnome-icon-theme,
   hicolor-icon-theme,
+  libsForQt5,
 }:
 
-stdenvNoCC.mkDerivation rec {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "gruvbox-dark-icons-gtk";
   version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "jmattheis";
     repo = "gruvbox-dark-icons-gtk";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     sha256 = "1fks2rrrb62ybzn8gqan5swcgksrb579vk37bx4xpwkc552dz2z2";
   };
 
   nativeBuildInputs = [ gtk3 ];
 
   propagatedBuildInputs = [
-    breeze-icons
+    libsForQt5.breeze-icons
     gnome-icon-theme
     hicolor-icon-theme
   ];
@@ -36,11 +36,11 @@ stdenvNoCC.mkDerivation rec {
 
   dontDropIconThemeCache = true;
 
-  meta = with lib; {
+  meta = {
     description = "Gruvbox icons for GTK based desktop environments";
     homepage = "https://github.com/jmattheis/gruvbox-dark-gtk";
-    license = licenses.gpl3Only;
-    platforms = platforms.unix;
-    maintainers = [ maintainers.nomisiv ];
+    license = lib.licenses.gpl3Only;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ nomisiv ];
   };
-}
+})
diff --git a/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix b/pkgs/by-name/kd/kde-rounded-corners/package.nix
similarity index 85%
rename from pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix
rename to pkgs/by-name/kd/kde-rounded-corners/package.nix
index f90fa9a68697..51849df7a489 100644
--- a/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix
+++ b/pkgs/by-name/kd/kde-rounded-corners/package.nix
@@ -3,11 +3,7 @@
   fetchFromGitHub,
   fetchpatch2,
   cmake,
-  extra-cmake-modules,
-  wrapQtAppsHook,
-  qtbase,
-  kwin,
-  kcmutils,
+  kdePackages,
   libepoxy,
   libxcb,
   lib,
@@ -33,15 +29,15 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     cmake
-    extra-cmake-modules
-    wrapQtAppsHook
+    kdePackages.extra-cmake-modules
+    kdePackages.wrapQtAppsHook
   ];
   buildInputs = [
-    kcmutils
-    kwin
+    kdePackages.kcmutils
+    kdePackages.kwin
     libepoxy
     libxcb
-    qtbase
+    kdePackages.qtbase
   ];
 
   meta = with lib; {
diff --git a/pkgs/data/icons/la-capitaine-icon-theme/default.nix b/pkgs/by-name/la/la-capitaine-icon-theme/package.nix
similarity index 56%
rename from pkgs/data/icons/la-capitaine-icon-theme/default.nix
rename to pkgs/by-name/la/la-capitaine-icon-theme/package.nix
index bf0df6858f0c..e3dd010f7098 100644
--- a/pkgs/data/icons/la-capitaine-icon-theme/default.nix
+++ b/pkgs/by-name/la/la-capitaine-icon-theme/package.nix
@@ -2,26 +2,26 @@
   lib,
   stdenvNoCC,
   fetchFromGitHub,
-  breeze-icons,
-  elementary-icon-theme,
   gnome-icon-theme,
   hicolor-icon-theme,
+  pantheon,
+  libsForQt5,
 }:
 
-stdenvNoCC.mkDerivation rec {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "la-capitaine-icon-theme";
   version = "0.6.2";
 
   src = fetchFromGitHub {
     owner = "keeferrourke";
     repo = "la-capitaine-icon-theme";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-+n+GN5sCcWTyAigtgyudliOTulP7ECoOCYdm01trokU=";
   };
 
   propagatedBuildInputs = [
-    breeze-icons
-    elementary-icon-theme
+    libsForQt5.breeze-icons
+    pantheon.elementary-icon-theme
     gnome-icon-theme
     hicolor-icon-theme
   ];
@@ -37,21 +37,21 @@ stdenvNoCC.mkDerivation rec {
 
   installPhase = ''
     runHook preInstall
-    mkdir -p $out/share/icons/$pname
-    cp -a * $out/share/icons/$pname
-    rm $out/share/icons/$pname/{configure,COPYING,LICENSE,*.md}
-    cp "$out/share/icons/$pname/places/scalable/"distributor-logo-{archlinux,debian,kubuntu}.svg "$out/share/icons/$pname/apps/scalable/"
+    mkdir -p $out/share/icons/la-capitaine-icon-theme
+    cp -a * $out/share/icons/la-capitaine-icon-theme
+    rm $out/share/icons/la-capitaine-icon-theme/{configure,COPYING,LICENSE,*.md}
+    cp "$out/share/icons/la-capitaine-icon-theme/places/scalable/"distributor-logo-{archlinux,debian,kubuntu}.svg "$out/share/icons/la-capitaine-icon-theme/apps/scalable/"
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Icon theme inspired by macOS and Google's Material Design";
     homepage = "https://github.com/keeferrourke/la-capitaine-icon-theme";
-    license = with licenses; [
+    license = with lib.licenses; [
       gpl3Plus
       mit
     ];
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ romildo ];
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ romildo ];
   };
-}
+})
diff --git a/pkgs/data/icons/maia-icon-theme/default.nix b/pkgs/by-name/ma/maia-icon-theme/package.nix
similarity index 88%
rename from pkgs/data/icons/maia-icon-theme/default.nix
rename to pkgs/by-name/ma/maia-icon-theme/package.nix
index 2d087781d1ba..818a8cf9f167 100644
--- a/pkgs/data/icons/maia-icon-theme/default.nix
+++ b/pkgs/by-name/ma/maia-icon-theme/package.nix
@@ -5,9 +5,8 @@
   cmake,
   extra-cmake-modules,
   gtk3,
-  plasma-framework,
-  kwindowsystem,
   hicolor-icon-theme,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation {
@@ -27,8 +26,8 @@ stdenv.mkDerivation {
     cmake
     extra-cmake-modules
     gtk3
-    plasma-framework
-    kwindowsystem
+    libsForQt5.plasma-framework
+    libsForQt5.kwindowsystem
   ];
 
   propagatedBuildInputs = [
@@ -52,10 +51,10 @@ stdenv.mkDerivation {
     done
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Icons based on Breeze and Super Flat Remix";
     homepage = "https://gitlab.manjaro.org/artwork/themes/maia";
-    license = licenses.lgpl3;
-    platforms = platforms.all;
+    license = lib.licenses.lgpl3;
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/data/icons/numix-icon-theme/default.nix b/pkgs/by-name/nu/numix-icon-theme/package.nix
similarity index 74%
rename from pkgs/data/icons/numix-icon-theme/default.nix
rename to pkgs/by-name/nu/numix-icon-theme/package.nix
index 907e51a6e5cf..8438f544d88d 100644
--- a/pkgs/data/icons/numix-icon-theme/default.nix
+++ b/pkgs/by-name/nu/numix-icon-theme/package.nix
@@ -4,21 +4,21 @@
   fetchFromGitHub,
   gtk3,
   adwaita-icon-theme,
-  breeze-icons,
   gnome-icon-theme,
   hicolor-icon-theme,
   gitUpdater,
+  libsForQt5,
 }:
 
-stdenvNoCC.mkDerivation rec {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "numix-icon-theme";
   version = "25.10.26";
 
   src = fetchFromGitHub {
     owner = "numixproject";
     repo = "numix-icon-theme";
-    rev = version;
-    sha256 = "sha256-YKR4dncq2uuX8CMJj/Zr/0pdl7gLC8VZGvb/HI1+Uwc=";
+    tag = finalAttrs.version;
+    hash = "sha256-YKR4dncq2uuX8CMJj/Zr/0pdl7gLC8VZGvb/HI1+Uwc=";
   };
 
   nativeBuildInputs = [
@@ -27,7 +27,7 @@ stdenvNoCC.mkDerivation rec {
 
   propagatedBuildInputs = [
     adwaita-icon-theme
-    breeze-icons
+    libsForQt5.breeze-icons
     gnome-icon-theme
     hicolor-icon-theme
   ];
@@ -51,12 +51,12 @@ stdenvNoCC.mkDerivation rec {
 
   passthru.updateScript = gitUpdater { };
 
-  meta = with lib; {
+  meta = {
     description = "Numix icon theme";
     homepage = "https://numixproject.github.io";
-    license = licenses.gpl3Only;
+    license = lib.licenses.gpl3Only;
     # darwin cannot deal with file names differing only in case
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ romildo ];
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ romildo ];
   };
-}
+})
diff --git a/pkgs/data/icons/papirus-maia-icon-theme/default.nix b/pkgs/by-name/pa/papirus-maia-icon-theme/package.nix
similarity index 96%
rename from pkgs/data/icons/papirus-maia-icon-theme/default.nix
rename to pkgs/by-name/pa/papirus-maia-icon-theme/package.nix
index 3d68f98572f5..09d47a182a21 100644
--- a/pkgs/data/icons/papirus-maia-icon-theme/default.nix
+++ b/pkgs/by-name/pa/papirus-maia-icon-theme/package.nix
@@ -4,10 +4,10 @@
   fetchFromGitHub,
   cmake,
   gtk3,
-  breeze-icons,
   gnome-icon-theme,
   papirus-icon-theme,
   hicolor-icon-theme,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation {
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
   ];
 
   propagatedBuildInputs = [
-    breeze-icons
+    libsForQt5.breeze-icons
     gnome-icon-theme
     papirus-icon-theme
     hicolor-icon-theme
diff --git a/pkgs/data/themes/qogir-kde/default.nix b/pkgs/by-name/qo/qogir-kde/package.nix
similarity index 100%
rename from pkgs/data/themes/qogir-kde/default.nix
rename to pkgs/by-name/qo/qogir-kde/package.nix
diff --git a/pkgs/data/themes/sddm-astronaut/default.nix b/pkgs/by-name/sd/sddm-astronaut/package.nix
similarity index 90%
rename from pkgs/data/themes/sddm-astronaut/default.nix
rename to pkgs/by-name/sd/sddm-astronaut/package.nix
index 21bf75833449..330c0ca4f122 100644
--- a/pkgs/data/themes/sddm-astronaut/default.nix
+++ b/pkgs/by-name/sd/sddm-astronaut/package.nix
@@ -1,7 +1,9 @@
 {
-  pkgs,
   lib,
   stdenvNoCC,
+  fetchFromGitHub,
+  kdePackages,
+  formats,
   themeConfig ? null,
   embeddedTheme ? "astronaut",
 }:
@@ -9,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
   pname = "sddm-astronaut";
   version = "1.0-unstable-2025-01-05";
 
-  src = pkgs.fetchFromGitHub {
+  src = fetchFromGitHub {
     owner = "Keyitdev";
     repo = "sddm-astronaut-theme";
     rev = "11c0bf6147bbea466ce2e2b0559e9a9abdbcc7c3";
@@ -18,7 +20,7 @@ stdenvNoCC.mkDerivation rec {
 
   dontWrapQtApps = true;
 
-  propagatedBuildInputs = with pkgs.kdePackages; [
+  propagatedBuildInputs = with kdePackages; [
     qtsvg
     qtmultimedia
     qtvirtualkeyboard
@@ -26,7 +28,7 @@ stdenvNoCC.mkDerivation rec {
 
   installPhase =
     let
-      iniFormat = pkgs.formats.ini { };
+      iniFormat = formats.ini { };
       configFile = iniFormat.generate "" { General = themeConfig; };
 
       basePath = "$out/share/sddm/themes/sddm-astronaut-theme";
diff --git a/pkgs/data/themes/chili-sddm/default.nix b/pkgs/by-name/sd/sddm-chili-theme/package.nix
similarity index 92%
rename from pkgs/data/themes/chili-sddm/default.nix
rename to pkgs/by-name/sd/sddm-chili-theme/package.nix
index cb6939b3d3e4..a08e87b6982e 100644
--- a/pkgs/data/themes/chili-sddm/default.nix
+++ b/pkgs/by-name/sd/sddm-chili-theme/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  qtgraphicaleffects,
+  libsForQt5,
   themeConfig ? { },
 }:
 let
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
   };
 
   propagatedBuildInputs = [
-    qtgraphicaleffects
+    libsForQt5.qtgraphicaleffects
   ];
 
   dontWrapQtApps = true;
@@ -46,7 +46,7 @@ stdenv.mkDerivation {
   postFixup = ''
     mkdir -p $out/nix-support
 
-    echo ${qtgraphicaleffects} >> $out/nix-support/propagated-user-env-packages
+    echo ${libsForQt5.qtgraphicaleffects} >> $out/nix-support/propagated-user-env-packages
   '';
   meta = with lib; {
     license = licenses.gpl3;
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/data/icons/tango-icon-theme/default.nix b/pkgs/by-name/ta/tango-icon-theme/package.nix
similarity index 76%
rename from pkgs/data/icons/tango-icon-theme/default.nix
rename to pkgs/by-name/ta/tango-icon-theme/package.nix
index 5d9a4883b7ba..5e41a3f2b697 100644
--- a/pkgs/data/icons/tango-icon-theme/default.nix
+++ b/pkgs/by-name/ta/tango-icon-theme/package.nix
@@ -7,17 +7,17 @@
   iconnamingutils,
   imagemagick,
   librsvg,
-  gtk, # any version
+  gtk3, # any version
   gnome-icon-theme,
   hicolor-icon-theme,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "tango-icon-theme";
   version = "0.8.90";
 
   src = fetchurl {
-    url = "http://tango.freedesktop.org/releases/tango-icon-theme-${version}.tar.gz";
+    url = "http://tango.freedesktop.org/releases/tango-icon-theme-${finalAttrs.version}.tar.gz";
     sha256 = "13n8cpml71w6zfm2jz5fa7r1z18qlzk4gv07r6n1in2p5l1xi63f";
   };
 
@@ -26,6 +26,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     pkg-config
     intltool
+    gtk3
   ];
   buildInputs = [
     iconnamingutils
@@ -42,12 +43,14 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--enable-png-creation" ];
 
-  postInstall = '''${gtk.out}/bin/gtk-update-icon-cache' "$out/share/icons/Tango" '';
+  postInstall = ''
+    gtk-update-icon-cache $out/share/icons/Tango
+  '';
 
-  meta = with lib; {
+  meta = {
     description = "Basic set of icons";
     homepage = "https://tango.freedesktop.org/Tango_Icon_Library";
-    platforms = platforms.linux;
-    license = licenses.publicDomain;
+    platforms = lib.platforms.linux;
+    license = lib.licenses.publicDomain;
   };
-}
+})
diff --git a/pkgs/data/icons/tango-icon-theme/rsvg-convert.patch b/pkgs/by-name/ta/tango-icon-theme/rsvg-convert.patch
similarity index 100%
rename from pkgs/data/icons/tango-icon-theme/rsvg-convert.patch
rename to pkgs/by-name/ta/tango-icon-theme/rsvg-convert.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 59b64434c5cf..b6b7e589cf8f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1707,10 +1707,6 @@ with pkgs;
 
   bat-extras = recurseIntoAttrs (lib.makeScope newScope (import ../tools/misc/bat-extras));
 
-  beauty-line-icon-theme = callPackage ../data/icons/beauty-line-icon-theme {
-    inherit (plasma5Packages) breeze-icons;
-  };
-
   beautysh = with python3.pkgs; toPythonApplication beautysh;
 
   inherit (callPackages ../misc/logging/beats/7.x.nix { })
@@ -9817,8 +9813,6 @@ with pkgs;
 
   libuuid = if stdenv.hostPlatform.isLinux then util-linuxMinimal else null;
 
-  elegant-sddm = libsForQt5.callPackage ../data/themes/elegant-sddm { };
-
   error-inject = recurseIntoAttrs (callPackages ../os-specific/linux/error-inject { });
 
   ffado = callPackage ../os-specific/linux/ffado { };
@@ -10069,12 +10063,6 @@ with pkgs;
 
   rfkill_udev = callPackage ../os-specific/linux/rfkill/udev.nix { };
 
-  sddm-astronaut = qt6Packages.callPackage ../data/themes/sddm-astronaut { };
-
-  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 {
@@ -10294,10 +10282,6 @@ with pkgs;
 
   androguard = with python3.pkgs; toPythonApplication androguard;
 
-  andromeda-gtk-theme = libsForQt5.callPackage ../data/themes/andromeda-gtk-theme { };
-
-  bibata-cursors-translucent = callPackage ../data/icons/bibata-cursors/translucent.nix { };
-
   dejavu_fonts = lowPrio (callPackage ../data/fonts/dejavu-fonts { });
 
   # solve collision for nix-env before https://github.com/NixOS/nix/pull/815
@@ -10333,9 +10317,6 @@ with pkgs;
 
   moeli = eduli;
 
-  flat-remix-icon-theme = callPackage ../data/icons/flat-remix-icon-theme {
-    inherit (plasma5Packages) breeze-icons;
-  };
   font-awesome_4 = (callPackage ../data/fonts/font-awesome { }).v4;
   font-awesome_5 = (callPackage ../data/fonts/font-awesome { }).v5;
   font-awesome_6 = (callPackage ../data/fonts/font-awesome { }).v6;
@@ -10369,10 +10350,6 @@ with pkgs;
     gruppled-white-lite-cursors
     ;
 
-  gruvbox-dark-icons-gtk = callPackage ../data/icons/gruvbox-dark-icons-gtk {
-    inherit (plasma5Packages) breeze-icons;
-  };
-
   iosevka-comfy = recurseIntoAttrs (callPackages ../data/fonts/iosevka/comfy.nix { });
 
   /**
@@ -10382,15 +10359,6 @@ with pkgs;
   */
   inherit (callPackage ../data/json-schema/default.nix { }) jsonSchemaCatalogs;
 
-  kde-rounded-corners =
-    kdePackages.callPackage ../data/themes/kwin-decorations/kde-rounded-corners
-      { };
-
-  la-capitaine-icon-theme = callPackage ../data/icons/la-capitaine-icon-theme {
-    inherit (plasma5Packages) breeze-icons;
-    inherit (pantheon) elementary-icon-theme;
-  };
-
   inherit (callPackages ../data/fonts/liberation-fonts { })
     liberation_ttf_v1
     liberation_ttf_v2
@@ -10407,8 +10375,6 @@ with pkgs;
   # lohit-fonts.kashmiri lohit-fonts.konkani lohit-fonts.maithili lohit-fonts.sindhi
   lohit-fonts = recurseIntoAttrs (callPackages ../data/fonts/lohit-fonts { });
 
-  maia-icon-theme = libsForQt5.callPackage ../data/icons/maia-icon-theme { };
-
   marwaita-icons = callPackage ../by-name/ma/marwaita-icons/package.nix {
     inherit (kdePackages) breeze-icons;
   };
@@ -10444,24 +10410,14 @@ with pkgs;
     stdenv = gccStdenv;
   };
 
-  numix-icon-theme = callPackage ../data/icons/numix-icon-theme {
-    inherit (plasma5Packages) breeze-icons;
-  };
-
   openmoji-color = callPackage ../data/fonts/openmoji { fontFormats = [ "glyf_colr_0" ]; };
 
   openmoji-black = callPackage ../data/fonts/openmoji { fontFormats = [ "glyf" ]; };
 
-  papirus-maia-icon-theme = callPackage ../data/icons/papirus-maia-icon-theme {
-    inherit (plasma5Packages) breeze-icons;
-  };
-
   papis = with python3Packages; toPythonApplication papis;
 
   polychromatic = qt6Packages.callPackage ../applications/misc/polychromatic { };
 
-  qogir-kde = libsForQt5.callPackage ../data/themes/qogir-kde { };
-
   ricochet-refresh = callPackage ../by-name/ri/ricochet-refresh/package.nix {
     protobuf = protobuf_21; # https://github.com/blueprint-freespeech/ricochet-refresh/issues/178
   };
@@ -10502,10 +10458,6 @@ with pkgs;
   source-han-serif-vf-otf = sourceHanPackages.serif-vf-otf;
   source-han-serif-vf-ttf = sourceHanPackages.serif-vf-ttf;
 
-  tango-icon-theme = callPackage ../data/icons/tango-icon-theme {
-    gtk = res.gtk2;
-  };
-
   themes = name: callPackage (../data/misc/themes + ("/" + name + ".nix")) { };
 
   tex-gyre = recurseIntoAttrs (callPackages ../data/fonts/tex-gyre { });