Bug 1771961 - Align preexisting colorways with new directory structure r=kpatenio

Differential Revision: https://phabricator.services.mozilla.com/D147784

browser/components/newtab/aboutwelcome/content/aboutwelcome.css

@@ -395,37 +395,37 @@ body[lwt-newtab-brighttext] {
   background-image: url("chrome://browser/skin/upgradeDialog/default.png");
 }
 .onboardingContainer .colorway-variations.abstract .variations-disc, .onboardingContainer .colorway-variations[next=abstract]::after {
-  background-image: url("resource://builtin-themes/monochromatic/abstract/balanced/icon.svg");
+  background-image: url("resource://builtin-themes/monochromatic/2021abstract/balanced/icon.svg");
 }
 .onboardingContainer .colorway-variations.abstract::before {
   background-image: url("chrome://browser/skin/upgradeDialog/abstract.png");
 }
 .onboardingContainer .colorway-variations.cheers .variations-disc, .onboardingContainer .colorway-variations[next=cheers]::after {
-  background-image: url("resource://builtin-themes/monochromatic/cheers/balanced/icon.svg");
+  background-image: url("resource://builtin-themes/monochromatic/2021cheers/balanced/icon.svg");
 }
 .onboardingContainer .colorway-variations.cheers::before {
   background-image: url("chrome://browser/skin/upgradeDialog/cheers.png");
 }
 .onboardingContainer .colorway-variations.elemental .variations-disc, .onboardingContainer .colorway-variations[next=elemental]::after {
-  background-image: url("resource://builtin-themes/monochromatic/elemental/balanced/icon.svg");
+  background-image: url("resource://builtin-themes/monochromatic/2021elemental/balanced/icon.svg");
 }
 .onboardingContainer .colorway-variations.elemental::before {
   background-image: url("chrome://browser/skin/upgradeDialog/elemental.png");
 }
 .onboardingContainer .colorway-variations.foto .variations-disc, .onboardingContainer .colorway-variations[next=foto]::after {
-  background-image: url("resource://builtin-themes/monochromatic/foto/balanced/icon.svg");
+  background-image: url("resource://builtin-themes/monochromatic/2021foto/balanced/icon.svg");
 }
 .onboardingContainer .colorway-variations.foto::before {
   background-image: url("chrome://browser/skin/upgradeDialog/foto.png");
 }
 .onboardingContainer .colorway-variations.graffiti .variations-disc, .onboardingContainer .colorway-variations[next=graffiti]::after {
-  background-image: url("resource://builtin-themes/monochromatic/graffiti/balanced/icon.svg");
+  background-image: url("resource://builtin-themes/monochromatic/2021graffiti/balanced/icon.svg");
 }
 .onboardingContainer .colorway-variations.graffiti::before {
   background-image: url("chrome://browser/skin/upgradeDialog/graffiti.png");
 }
 .onboardingContainer .colorway-variations.lush .variations-disc, .onboardingContainer .colorway-variations[next=lush]::after {
-  background-image: url("resource://builtin-themes/monochromatic/lush/balanced/icon.svg");
+  background-image: url("resource://builtin-themes/monochromatic/2021lush/balanced/icon.svg");
 }
 .onboardingContainer .colorway-variations.lush::before {
   background-image: url("chrome://browser/skin/upgradeDialog/lush.png");
@@ -564,22 +564,22 @@ body[lwt-newtab-brighttext] {
   background-image: url("resource://default-theme/icon.svg");
 }
 .onboardingContainer .tiles-theme-section .theme .icon.abstract {
-  background-image: url("resource://builtin-themes/monochromatic/abstract/balanced/icon.svg");
+  background-image: url("resource://builtin-themes/monochromatic/2021abstract/balanced/icon.svg");
 }
 .onboardingContainer .tiles-theme-section .theme .icon.cheers {
-  background-image: url("resource://builtin-themes/monochromatic/cheers/balanced/icon.svg");
+  background-image: url("resource://builtin-themes/monochromatic/2021cheers/balanced/icon.svg");
 }
 .onboardingContainer .tiles-theme-section .theme .icon.elemental {
-  background-image: url("resource://builtin-themes/monochromatic/elemental/balanced/icon.svg");
+  background-image: url("resource://builtin-themes/monochromatic/2021elemental/balanced/icon.svg");
 }
 .onboardingContainer .tiles-theme-section .theme .icon.foto {
-  background-image: url("resource://builtin-themes/monochromatic/foto/balanced/icon.svg");
+  background-image: url("resource://builtin-themes/monochromatic/2021foto/balanced/icon.svg");
 }
 .onboardingContainer .tiles-theme-section .theme .icon.graffiti {
-  background-image: url("resource://builtin-themes/monochromatic/graffiti/balanced/icon.svg");
+  background-image: url("resource://builtin-themes/monochromatic/2021graffiti/balanced/icon.svg");
 }
 .onboardingContainer .tiles-theme-section .theme .icon.lush {
-  background-image: url("resource://builtin-themes/monochromatic/lush/balanced/icon.svg");
+  background-image: url("resource://builtin-themes/monochromatic/2021lush/balanced/icon.svg");
 }
 .onboardingContainer .tiles-theme-section .theme .text {
   display: flex;

browser/components/newtab/content-src/aboutwelcome/aboutwelcome.scss

@@ -455,7 +455,7 @@ body {
 
     &.abstract .variations-disc,
     &[next='abstract']::after {
-      background-image: url('resource://builtin-themes/monochromatic/abstract/balanced/icon.svg');
+      background-image: url('resource://builtin-themes/monochromatic/2021abstract/balanced/icon.svg');
     }
 
     &.abstract::before {
@@ -464,7 +464,7 @@ body {
 
     &.cheers .variations-disc,
     &[next='cheers']::after {
-      background-image: url('resource://builtin-themes/monochromatic/cheers/balanced/icon.svg');
+      background-image: url('resource://builtin-themes/monochromatic/2021cheers/balanced/icon.svg');
     }
 
     &.cheers::before {
@@ -473,7 +473,7 @@ body {
 
     &.elemental .variations-disc,
     &[next='elemental']::after {
-      background-image: url('resource://builtin-themes/monochromatic/elemental/balanced/icon.svg');
+      background-image: url('resource://builtin-themes/monochromatic/2021elemental/balanced/icon.svg');
     }
 
     &.elemental::before {
@@ -482,7 +482,7 @@ body {
 
     &.foto .variations-disc,
     &[next='foto']::after {
-      background-image: url('resource://builtin-themes/monochromatic/foto/balanced/icon.svg');
+      background-image: url('resource://builtin-themes/monochromatic/2021foto/balanced/icon.svg');
     }
 
     &.foto::before {
@@ -491,7 +491,7 @@ body {
 
     &.graffiti .variations-disc,
     &[next='graffiti']::after {
-      background-image: url('resource://builtin-themes/monochromatic/graffiti/balanced/icon.svg');
+      background-image: url('resource://builtin-themes/monochromatic/2021graffiti/balanced/icon.svg');
     }
 
     &.graffiti::before {
@@ -500,7 +500,7 @@ body {
 
     &.lush .variations-disc,
     &[next='lush']::after {
-      background-image: url('resource://builtin-themes/monochromatic/lush/balanced/icon.svg');
+      background-image: url('resource://builtin-themes/monochromatic/2021lush/balanced/icon.svg');
     }
 
     &.lush::before {
@@ -672,27 +672,27 @@ body {
         }
 
         &.abstract {
-          background-image: url('resource://builtin-themes/monochromatic/abstract/balanced/icon.svg');
+          background-image: url('resource://builtin-themes/monochromatic/2021abstract/balanced/icon.svg');
         }
 
         &.cheers {
-          background-image: url('resource://builtin-themes/monochromatic/cheers/balanced/icon.svg');
+          background-image: url('resource://builtin-themes/monochromatic/2021cheers/balanced/icon.svg');
         }
 
         &.elemental {
-          background-image: url('resource://builtin-themes/monochromatic/elemental/balanced/icon.svg');
+          background-image: url('resource://builtin-themes/monochromatic/2021elemental/balanced/icon.svg');
         }
 
         &.foto {
-          background-image: url('resource://builtin-themes/monochromatic/foto/balanced/icon.svg');
+          background-image: url('resource://builtin-themes/monochromatic/2021foto/balanced/icon.svg');
         }
 
         &.graffiti {
-          background-image: url('resource://builtin-themes/monochromatic/graffiti/balanced/icon.svg');
+          background-image: url('resource://builtin-themes/monochromatic/2021graffiti/balanced/icon.svg');
         }
 
         &.lush {
-          background-image: url('resource://builtin-themes/monochromatic/lush/balanced/icon.svg');
+          background-image: url('resource://builtin-themes/monochromatic/2021lush/balanced/icon.svg');
         }
       }
 

browser/themes/BuiltInThemeConfig.jsm

@@ -100,7 +100,7 @@ const BuiltInThemeConfig = new Map([
     "lush-soft-colorway@mozilla.org",
     {
       version: "1.0",
-      path: "resource://builtin-themes/monochromatic/lush/soft/",
+      path: "resource://builtin-themes/monochromatic/2021lush/soft/",
       collection: "life-in-color",
     },
   ],
@@ -108,7 +108,7 @@ const BuiltInThemeConfig = new Map([
     "lush-balanced-colorway@mozilla.org",
     {
       version: "1.0",
-      path: "resource://builtin-themes/monochromatic/lush/balanced/",
+      path: "resource://builtin-themes/monochromatic/2021lush/balanced/",
       collection: "life-in-color",
     },
   ],
@@ -116,7 +116,7 @@ const BuiltInThemeConfig = new Map([
     "lush-bold-colorway@mozilla.org",
     {
       version: "1.0",
-      path: "resource://builtin-themes/monochromatic/lush/bold/",
+      path: "resource://builtin-themes/monochromatic/2021lush/bold/",
       collection: "life-in-color",
     },
   ],
@@ -124,7 +124,7 @@ const BuiltInThemeConfig = new Map([
     "abstract-soft-colorway@mozilla.org",
     {
       version: "1.0",
-      path: "resource://builtin-themes/monochromatic/abstract/soft/",
+      path: "resource://builtin-themes/monochromatic/2021abstract/soft/",
       collection: "life-in-color",
     },
   ],
@@ -132,7 +132,7 @@ const BuiltInThemeConfig = new Map([
     "abstract-balanced-colorway@mozilla.org",
     {
       version: "1.0",
-      path: "resource://builtin-themes/monochromatic/abstract/balanced/",
+      path: "resource://builtin-themes/monochromatic/2021abstract/balanced/",
       collection: "life-in-color",
     },
   ],
@@ -140,7 +140,7 @@ const BuiltInThemeConfig = new Map([
     "abstract-bold-colorway@mozilla.org",
     {
       version: "1.0",
-      path: "resource://builtin-themes/monochromatic/abstract/bold/",
+      path: "resource://builtin-themes/monochromatic/2021abstract/bold/",
       collection: "life-in-color",
     },
   ],
@@ -148,7 +148,7 @@ const BuiltInThemeConfig = new Map([
     "elemental-soft-colorway@mozilla.org",
     {
       version: "1.0",
-      path: "resource://builtin-themes/monochromatic/elemental/soft/",
+      path: "resource://builtin-themes/monochromatic/2021elemental/soft/",
       collection: "life-in-color",
     },
   ],
@@ -156,7 +156,7 @@ const BuiltInThemeConfig = new Map([
     "elemental-balanced-colorway@mozilla.org",
     {
       version: "1.0",
-      path: "resource://builtin-themes/monochromatic/elemental/balanced/",
+      path: "resource://builtin-themes/monochromatic/2021elemental/balanced/",
       collection: "life-in-color",
     },
   ],
@@ -164,7 +164,7 @@ const BuiltInThemeConfig = new Map([
     "elemental-bold-colorway@mozilla.org",
     {
       version: "1.0",
-      path: "resource://builtin-themes/monochromatic/elemental/bold/",
+      path: "resource://builtin-themes/monochromatic/2021elemental/bold/",
       collection: "life-in-color",
     },
   ],
@@ -172,7 +172,7 @@ const BuiltInThemeConfig = new Map([
     "cheers-soft-colorway@mozilla.org",
     {
       version: "1.0",
-      path: "resource://builtin-themes/monochromatic/cheers/soft/",
+      path: "resource://builtin-themes/monochromatic/2021cheers/soft/",
       collection: "life-in-color",
     },
   ],
@@ -180,7 +180,7 @@ const BuiltInThemeConfig = new Map([
     "cheers-balanced-colorway@mozilla.org",
     {
       version: "1.0",
-      path: "resource://builtin-themes/monochromatic/cheers/balanced/",
+      path: "resource://builtin-themes/monochromatic/2021cheers/balanced/",
       collection: "life-in-color",
     },
   ],
@@ -188,7 +188,7 @@ const BuiltInThemeConfig = new Map([
     "cheers-bold-colorway@mozilla.org",
     {
       version: "1.0",
-      path: "resource://builtin-themes/monochromatic/cheers/bold/",
+      path: "resource://builtin-themes/monochromatic/2021cheers/bold/",
       collection: "life-in-color",
     },
   ],
@@ -196,7 +196,7 @@ const BuiltInThemeConfig = new Map([
     "graffiti-soft-colorway@mozilla.org",
     {
       version: "1.0",
-      path: "resource://builtin-themes/monochromatic/graffiti/soft/",
+      path: "resource://builtin-themes/monochromatic/2021graffiti/soft/",
       collection: "life-in-color",
     },
   ],
@@ -204,7 +204,7 @@ const BuiltInThemeConfig = new Map([
     "graffiti-balanced-colorway@mozilla.org",
     {
       version: "1.0",
-      path: "resource://builtin-themes/monochromatic/graffiti/balanced/",
+      path: "resource://builtin-themes/monochromatic/2021graffiti/balanced/",
       collection: "life-in-color",
     },
   ],
@@ -212,7 +212,7 @@ const BuiltInThemeConfig = new Map([
     "graffiti-bold-colorway@mozilla.org",
     {
       version: "1.0",
-      path: "resource://builtin-themes/monochromatic/graffiti/bold/",
+      path: "resource://builtin-themes/monochromatic/2021graffiti/bold/",
       collection: "life-in-color",
     },
   ],
@@ -220,7 +220,7 @@ const BuiltInThemeConfig = new Map([
     "foto-soft-colorway@mozilla.org",
     {
       version: "1.0",
-      path: "resource://builtin-themes/monochromatic/foto/soft/",
+      path: "resource://builtin-themes/monochromatic/2021foto/soft/",
       collection: "life-in-color",
     },
   ],
@@ -228,7 +228,7 @@ const BuiltInThemeConfig = new Map([
     "foto-balanced-colorway@mozilla.org",
     {
       version: "1.0",
-      path: "resource://builtin-themes/monochromatic/foto/balanced/",
+      path: "resource://builtin-themes/monochromatic/2021foto/balanced/",
       collection: "life-in-color",
     },
   ],
@@ -236,7 +236,7 @@ const BuiltInThemeConfig = new Map([
     "foto-bold-colorway@mozilla.org",
     {
       version: "1.0",
-      path: "resource://builtin-themes/monochromatic/foto/bold/",
+      path: "resource://builtin-themes/monochromatic/2021foto/bold/",
       collection: "life-in-color",
     },
   ],

browser/themes/addons/jar.mn

@@ -16,54 +16,54 @@ browser.jar:
   content/builtin-themes/light                     (light/*.css)
   content/builtin-themes/light/manifest.json       (light/manifest.json)
 
-  content/builtin-themes/monochromatic/lush/soft                          (monochromatic/lush/soft/*.svg)
-  content/builtin-themes/monochromatic/lush/soft/manifest.json            (monochromatic/lush/soft/manifest.json)
-  content/builtin-themes/monochromatic/lush/balanced                      (monochromatic/lush/balanced/*.svg)
-  content/builtin-themes/monochromatic/lush/balanced/manifest.json        (monochromatic/lush/balanced/manifest.json)
-  content/builtin-themes/monochromatic/lush/bold                          (monochromatic/lush/bold/*.svg)
-  content/builtin-themes/monochromatic/lush/bold/manifest.json            (monochromatic/lush/bold/manifest.json)
-  content/builtin-themes/monochromatic/abstract/soft                      (monochromatic/abstract/soft/*.svg)
-  content/builtin-themes/monochromatic/abstract/soft/manifest.json        (monochromatic/abstract/soft/manifest.json)
-  content/builtin-themes/monochromatic/abstract/balanced                  (monochromatic/abstract/balanced/*.svg)
-  content/builtin-themes/monochromatic/abstract/balanced/manifest.json    (monochromatic/abstract/balanced/manifest.json)
-  content/builtin-themes/monochromatic/abstract/bold                      (monochromatic/abstract/bold/*.svg)
-  content/builtin-themes/monochromatic/abstract/bold/manifest.json        (monochromatic/abstract/bold/manifest.json)
-  content/builtin-themes/monochromatic/elemental/soft                     (monochromatic/elemental/soft/*.svg)
-  content/builtin-themes/monochromatic/elemental/soft/manifest.json       (monochromatic/elemental/soft/manifest.json)
-  content/builtin-themes/monochromatic/elemental/balanced                 (monochromatic/elemental/balanced/*.svg)
-  content/builtin-themes/monochromatic/elemental/balanced/manifest.json   (monochromatic/elemental/balanced/manifest.json)
-  content/builtin-themes/monochromatic/elemental/bold                     (monochromatic/elemental/bold/*.svg)
-  content/builtin-themes/monochromatic/elemental/bold/manifest.json       (monochromatic/elemental/bold/manifest.json)
-  content/builtin-themes/monochromatic/cheers/soft                        (monochromatic/cheers/soft/*.svg)
-  content/builtin-themes/monochromatic/cheers/soft/manifest.json          (monochromatic/cheers/soft/manifest.json)
-  content/builtin-themes/monochromatic/cheers/balanced                    (monochromatic/cheers/balanced/*.svg)
-  content/builtin-themes/monochromatic/cheers/balanced/manifest.json      (monochromatic/cheers/balanced/manifest.json)
-  content/builtin-themes/monochromatic/cheers/bold                        (monochromatic/cheers/bold/*.svg)
-  content/builtin-themes/monochromatic/cheers/bold/manifest.json          (monochromatic/cheers/bold/manifest.json)
-  content/builtin-themes/monochromatic/graffiti/soft                      (monochromatic/graffiti/soft/*.svg)
-  content/builtin-themes/monochromatic/graffiti/soft/manifest.json        (monochromatic/graffiti/soft/manifest.json)
-  content/builtin-themes/monochromatic/graffiti/balanced                  (monochromatic/graffiti/balanced/*.svg)
-  content/builtin-themes/monochromatic/graffiti/balanced/manifest.json    (monochromatic/graffiti/balanced/manifest.json)
-  content/builtin-themes/monochromatic/graffiti/bold                      (monochromatic/graffiti/bold/*.svg)
-  content/builtin-themes/monochromatic/graffiti/bold/manifest.json        (monochromatic/graffiti/bold/manifest.json)
-  content/builtin-themes/monochromatic/foto/soft                          (monochromatic/foto/soft/*.svg)
-  content/builtin-themes/monochromatic/foto/soft/manifest.json            (monochromatic/foto/soft/manifest.json)
-  content/builtin-themes/monochromatic/foto/balanced                      (monochromatic/foto/balanced/*.svg)
-  content/builtin-themes/monochromatic/foto/balanced/manifest.json        (monochromatic/foto/balanced/manifest.json)
-  content/builtin-themes/monochromatic/foto/bold                          (monochromatic/foto/bold/*.svg)
-  content/builtin-themes/monochromatic/foto/bold/manifest.json            (monochromatic/foto/bold/manifest.json)
-  content/builtin-themes/monochromatic/2022blue                   (monochromatic/2022blue/*.svg)
-  content/builtin-themes/monochromatic/2022blue/manifest.json     (monochromatic/2022blue/manifest.json)
-  content/builtin-themes/monochromatic/2022green                  (monochromatic/2022green/*.svg)
-  content/builtin-themes/monochromatic/2022green/manifest.json    (monochromatic/2022green/manifest.json)
-  content/builtin-themes/monochromatic/2022orange                 (monochromatic/2022orange/*.svg)
-  content/builtin-themes/monochromatic/2022orange/manifest.json   (monochromatic/2022orange/manifest.json)
-  content/builtin-themes/monochromatic/2022purple                 (monochromatic/2022purple/*.svg)
-  content/builtin-themes/monochromatic/2022purple/manifest.json   (monochromatic/2022purple/manifest.json)
-  content/builtin-themes/monochromatic/2022red                    (monochromatic/2022red/*.svg)
-  content/builtin-themes/monochromatic/2022red/manifest.json      (monochromatic/2022red/manifest.json)
-  content/builtin-themes/monochromatic/2022yellow                 (monochromatic/2022yellow/*.svg)
-  content/builtin-themes/monochromatic/2022yellow/manifest.json   (monochromatic/2022yellow/manifest.json)
+  content/builtin-themes/monochromatic/2021lush/soft                          (monochromatic/2021-life-in-color/lush/soft/*.svg)
+  content/builtin-themes/monochromatic/2021lush/soft/manifest.json            (monochromatic/2021-life-in-color/lush/soft/manifest.json)
+  content/builtin-themes/monochromatic/2021lush/balanced                      (monochromatic/2021-life-in-color/lush/balanced/*.svg)
+  content/builtin-themes/monochromatic/2021lush/balanced/manifest.json        (monochromatic/2021-life-in-color/lush/balanced/manifest.json)
+  content/builtin-themes/monochromatic/2021lush/bold                          (monochromatic/2021-life-in-color/lush/bold/*.svg)
+  content/builtin-themes/monochromatic/2021lush/bold/manifest.json            (monochromatic/2021-life-in-color/lush/bold/manifest.json)
+  content/builtin-themes/monochromatic/2021abstract/soft                      (monochromatic/2021-life-in-color/abstract/soft/*.svg)
+  content/builtin-themes/monochromatic/2021abstract/soft/manifest.json        (monochromatic/2021-life-in-color/abstract/soft/manifest.json)
+  content/builtin-themes/monochromatic/2021abstract/balanced                  (monochromatic/2021-life-in-color/abstract/balanced/*.svg)
+  content/builtin-themes/monochromatic/2021abstract/balanced/manifest.json    (monochromatic/2021-life-in-color/abstract/balanced/manifest.json)
+  content/builtin-themes/monochromatic/2021abstract/bold                      (monochromatic/2021-life-in-color/abstract/bold/*.svg)
+  content/builtin-themes/monochromatic/2021abstract/bold/manifest.json        (monochromatic/2021-life-in-color/abstract/bold/manifest.json)
+  content/builtin-themes/monochromatic/2021elemental/soft                     (monochromatic/2021-life-in-color/elemental/soft/*.svg)
+  content/builtin-themes/monochromatic/2021elemental/soft/manifest.json       (monochromatic/2021-life-in-color/elemental/soft/manifest.json)
+  content/builtin-themes/monochromatic/2021elemental/balanced                 (monochromatic/2021-life-in-color/elemental/balanced/*.svg)
+  content/builtin-themes/monochromatic/2021elemental/balanced/manifest.json   (monochromatic/2021-life-in-color/elemental/balanced/manifest.json)
+  content/builtin-themes/monochromatic/2021elemental/bold                     (monochromatic/2021-life-in-color/elemental/bold/*.svg)
+  content/builtin-themes/monochromatic/2021elemental/bold/manifest.json       (monochromatic/2021-life-in-color/elemental/bold/manifest.json)
+  content/builtin-themes/monochromatic/2021cheers/soft                        (monochromatic/2021-life-in-color/cheers/soft/*.svg)
+  content/builtin-themes/monochromatic/2021cheers/soft/manifest.json          (monochromatic/2021-life-in-color/cheers/soft/manifest.json)
+  content/builtin-themes/monochromatic/2021cheers/balanced                    (monochromatic/2021-life-in-color/cheers/balanced/*.svg)
+  content/builtin-themes/monochromatic/2021cheers/balanced/manifest.json      (monochromatic/2021-life-in-color/cheers/balanced/manifest.json)
+  content/builtin-themes/monochromatic/2021cheers/bold                        (monochromatic/2021-life-in-color/cheers/bold/*.svg)
+  content/builtin-themes/monochromatic/2021cheers/bold/manifest.json          (monochromatic/2021-life-in-color/cheers/bold/manifest.json)
+  content/builtin-themes/monochromatic/2021graffiti/soft                      (monochromatic/2021-life-in-color/graffiti/soft/*.svg)
+  content/builtin-themes/monochromatic/2021graffiti/soft/manifest.json        (monochromatic/2021-life-in-color/graffiti/soft/manifest.json)
+  content/builtin-themes/monochromatic/2021graffiti/balanced                  (monochromatic/2021-life-in-color/graffiti/balanced/*.svg)
+  content/builtin-themes/monochromatic/2021graffiti/balanced/manifest.json    (monochromatic/2021-life-in-color/graffiti/balanced/manifest.json)
+  content/builtin-themes/monochromatic/2021graffiti/bold                      (monochromatic/2021-life-in-color/graffiti/bold/*.svg)
+  content/builtin-themes/monochromatic/2021graffiti/bold/manifest.json        (monochromatic/2021-life-in-color/graffiti/bold/manifest.json)
+  content/builtin-themes/monochromatic/2021foto/soft                          (monochromatic/2021-life-in-color/foto/soft/*.svg)
+  content/builtin-themes/monochromatic/2021foto/soft/manifest.json            (monochromatic/2021-life-in-color/foto/soft/manifest.json)
+  content/builtin-themes/monochromatic/2021foto/balanced                      (monochromatic/2021-life-in-color/foto/balanced/*.svg)
+  content/builtin-themes/monochromatic/2021foto/balanced/manifest.json        (monochromatic/2021-life-in-color/foto/balanced/manifest.json)
+  content/builtin-themes/monochromatic/2021foto/bold                          (monochromatic/2021-life-in-color/foto/bold/*.svg)
+  content/builtin-themes/monochromatic/2021foto/bold/manifest.json            (monochromatic/2021-life-in-color/foto/bold/manifest.json)
+  content/builtin-themes/monochromatic/2022blue                   (monochromatic/2022-true-colors/blue/*.svg)
+  content/builtin-themes/monochromatic/2022blue/manifest.json     (monochromatic/2022-true-colors/blue/manifest.json)
+  content/builtin-themes/monochromatic/2022green                  (monochromatic/2022-true-colors/green/*.svg)
+  content/builtin-themes/monochromatic/2022green/manifest.json    (monochromatic/2022-true-colors/green/manifest.json)
+  content/builtin-themes/monochromatic/2022orange                 (monochromatic/2022-true-colors/orange/*.svg)
+  content/builtin-themes/monochromatic/2022orange/manifest.json   (monochromatic/2022-true-colors/orange/manifest.json)
+  content/builtin-themes/monochromatic/2022purple                 (monochromatic/2022-true-colors/purple/*.svg)
+  content/builtin-themes/monochromatic/2022purple/manifest.json   (monochromatic/2022-true-colors/purple/manifest.json)
+  content/builtin-themes/monochromatic/2022red                    (monochromatic/2022-true-colors/red/*.svg)
+  content/builtin-themes/monochromatic/2022red/manifest.json      (monochromatic/2022-true-colors/red/manifest.json)
+  content/builtin-themes/monochromatic/2022yellow                 (monochromatic/2022-true-colors/yellow/*.svg)
+  content/builtin-themes/monochromatic/2022yellow/manifest.json   (monochromatic/2022-true-colors/yellow/manifest.json)
   content/builtin-themes/monochromatic/2022playmaker/soft                         (monochromatic/2022-independent-voices/playmaker/soft/*.svg)
   content/builtin-themes/monochromatic/2022playmaker/soft/manifest.json           (monochromatic/2022-independent-voices/playmaker/soft/manifest.json)
   content/builtin-themes/monochromatic/2022playmaker/balanced                     (monochromatic/2022-independent-voices/playmaker/balanced/*.svg)

browser/themes/test/browser/browser_expireThemes.js

@@ -30,7 +30,7 @@ add_task(async function retainExpiredActiveTheme() {
       kLushSoftID,
       {
         version: "1.0",
-        path: "resource://builtin-themes/monochromatic/lush/soft/",
+        path: "resource://builtin-themes/monochromatic/2021lush/soft/",
         expiry: tomorrow,
       },
     ],
@@ -38,7 +38,7 @@ add_task(async function retainExpiredActiveTheme() {
       kLushBoldID,
       {
         version: "1.0",
-        path: "resource://builtin-themes/monochromatic/lush/bold/",
+        path: "resource://builtin-themes/monochromatic/2021lush/bold/",
         expiry: tomorrow,
       },
     ],