diff --git a/pkgs/data/themes/marwaita-pop_os/default.nix b/pkgs/by-name/ma/marwaita-yellow/package.nix
similarity index 80%
rename from pkgs/data/themes/marwaita-pop_os/default.nix
rename to pkgs/by-name/ma/marwaita-yellow/package.nix
index 33e75cdd08c2..15c51e354eb5 100644
--- a/pkgs/data/themes/marwaita-pop_os/default.nix
+++ b/pkgs/by-name/ma/marwaita-yellow/package.nix
@@ -9,14 +9,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  pname = "marwaita-pop_os";
-  version = "17.0";
+  pname = "marwaita-yellow";
+  version = "20.3.1";
 
   src = fetchFromGitHub {
     owner = "darkomarko42";
-    repo = pname;
-    rev = "1f3561f1231d0e9e931f93c5d59df19ed2205ce0";
-    hash = "sha256-WbCIMEWF5853TQyhq8aRoWzpsmjObm9hEc4I0pxDNOM=";
+    repo = "marwaita-yellow";
+    rev = version;
+    hash = "sha256-ClM2lvFFLNz+pF/pY7j/V5L24egB3oxpkH8cpZMSu5g=";
   };
 
   buildInputs = [
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index cbb6cec74710..394335eaee14 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -738,6 +738,7 @@ mapAliases {
   marwaita-manjaro = lib.warn "marwaita-manjaro has been renamed to marwaita-teal" marwaita-teal; # Added 2024-07-08
   marwaita-peppermint = lib.warn "marwaita-peppermint has been renamed to marwaita-red" marwaita-red; # Added 2024-07-01
   marwaita-ubuntu = lib.warn "marwaita-ubuntu has been renamed to marwaita-orange" marwaita-orange; # Added 2024-07-08
+  marwaita-pop_os = lib.warn "marwaita-pop_os has been renamed to marwaita-yellow" marwaita-yellow; # Added 2024-10-29
   masari = throw "masari has been removed as it was abandoned upstream"; # Added 2024-07-11
   mathematica9 = throw "mathematica9 has been removed as it was obsolete, broken, and depended on OpenCV 2"; # Added 2024-08-20
   mathematica10 = throw "mathematica10 has been removed as it was obsolete, broken, and depended on OpenCV 2"; # Added 2024-08-20
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6f06f7eb702f..610ab06de46d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -27203,8 +27203,6 @@ with pkgs;
     inherit (kdePackages) breeze-icons;
   };
 
-  marwaita-pop_os = callPackage ../data/themes/marwaita-pop_os { };
-
   matcha-gtk-theme = callPackage ../data/themes/matcha { };
 
   materia-theme = callPackage ../data/themes/materia-theme { };