diff --git a/pkgs/data/themes/marwaita-ubuntu/default.nix b/pkgs/by-name/ma/marwaita-orange/package.nix
similarity index 82%
rename from pkgs/data/themes/marwaita-ubuntu/default.nix
rename to pkgs/by-name/ma/marwaita-orange/package.nix
index 4190b1c0c3d2..bcf0baf2c9ae 100644
--- a/pkgs/data/themes/marwaita-ubuntu/default.nix
+++ b/pkgs/by-name/ma/marwaita-orange/package.nix
@@ -9,14 +9,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  pname = "marwaita-ubuntu";
-  version = "17.0";
+  pname = "marwaita-orange";
+  version = "20.3";
 
   src = fetchFromGitHub {
     owner = "darkomarko42";
     repo = pname;
-    rev = "481aae16034e0321bcabd14270639b8bd8b9aa73";
-    hash = "sha256-Ze2nR+77qe0TfwcvXP9eheB7mXSSVdejk11GS0fx7LY=";
+    rev = version;
+    hash = "sha256-RT7+LmauSAavl4ZA9vuKNrh/x8cGUb9V4RecxI/fN+E=";
   };
 
   buildInputs = [
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 5871a61f155e..d9835efb4e08 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -865,6 +865,7 @@ mapAliases ({
   markmind = throw "markmind has been removed from nixpkgs, because it depended on an old version of electron"; # Added 2023-09-12
   marwaita-manjaro = lib.warn "marwaita-manjaro has been renamed to marwaita-darkcyan" marwaita-darkcyan; # Added 2024-07-01
   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
   matrique = spectral; # Added 2020-01-27
   matrixcli = throw "'matrixcli' has been removed due to being unmaintained and broken functionality. Recommend 'matrix-commander' as an alternative"; # Added 2024-03-09
   matrix-recorder = throw "matrix-recorder has been removed due to being unmaintained"; # Added 2023-05-21
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b84f1c7669cf..f7694ae74dc2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -28552,8 +28552,6 @@ with pkgs;
 
   marwaita-pop_os = callPackage ../data/themes/marwaita-pop_os { };
 
-  marwaita-ubuntu = callPackage ../data/themes/marwaita-ubuntu { };
-
   matcha-gtk-theme = callPackage ../data/themes/matcha { };
 
   materia-theme = callPackage ../data/themes/materia-theme { };