diff --git a/config/certification-settings.ts b/config/certification-settings.ts
index 4b8cb6d32a..50c403483c 100644
--- a/config/certification-settings.ts
+++ b/config/certification-settings.ts
@@ -19,6 +19,7 @@ export const certTypes = {
 
 export enum SuperBlocks {
   RespWebDesign = 'responsive-web-design',
+  RespWebDesign22 = 'responsive-web-design-22',
   JsAlgoDataStruct = 'javascript-algorithms-and-data-structures',
   FrontEndDevLibs = 'front-end-development-libraries',
   DataVis = 'data-visualization',
@@ -82,6 +83,7 @@ export const certSlugTypeMap = {
 
   // modern
   [SuperBlocks.RespWebDesign]: certTypes.respWebDesign,
+  [SuperBlocks.RespWebDesign22]: certTypes.respWebDesign,
   [SuperBlocks.JsAlgoDataStruct]: certTypes.jsAlgoDataStruct,
   [SuperBlocks.FrontEndDevLibs]: certTypes.frontEndDevLibs,
   [SuperBlocks.DataVis]: certTypes.dataVis2018,
@@ -104,6 +106,7 @@ export const superBlockCertTypeMap = {
 
   // modern
   [SuperBlocks.RespWebDesign]: certTypes.respWebDesign,
+  [SuperBlocks.RespWebDesign22]: certTypes.respWebDesign,
   [SuperBlocks.JsAlgoDataStruct]: certTypes.jsAlgoDataStruct,
   [SuperBlocks.FrontEndDevLibs]: certTypes.frontEndDevLibs,
   [SuperBlocks.DataVis]: certTypes.dataVis2018,
@@ -113,11 +116,7 @@ export const superBlockCertTypeMap = {
   [SuperBlocks.SciCompPy]: certTypes.sciCompPyV7,
   [SuperBlocks.DataAnalysisPy]: certTypes.dataAnalysisPyV7,
   [SuperBlocks.MachineLearningPy]: certTypes.machineLearningPyV7,
-  [SuperBlocks.RelationalDb]: certTypes.relationalDatabasesV8,
-
-  // post-modern
-  // TODO: use enum
-  'responsive-web-design-22': certTypes.respWebDesign
+  [SuperBlocks.RelationalDb]: certTypes.relationalDatabasesV8
 };
 
 export const certTypeIdMap = {
diff --git a/curriculum/challenges/_meta/learn-accessibility-by-building-a-quiz/meta.json b/curriculum/challenges/_meta/learn-accessibility-by-building-a-quiz/meta.json
index 215661fd51..d3c5f74079 100644
--- a/curriculum/challenges/_meta/learn-accessibility-by-building-a-quiz/meta.json
+++ b/curriculum/challenges/_meta/learn-accessibility-by-building-a-quiz/meta.json
@@ -8,7 +8,7 @@
   "time": "5 hours",
   "template": "",
   "required": [],
-  "superBlock": "responsive-web-design",
+  "superBlock": "responsive-web-design-22",
   "challengeOrder": [
     [
       "614ccc21ea91ef1736b9b578",
diff --git a/curriculum/challenges/_meta/learn-basic-css-by-building-a-cafe-menu/meta.json b/curriculum/challenges/_meta/learn-basic-css-by-building-a-cafe-menu/meta.json
index 508484ff52..671602f69c 100644
--- a/curriculum/challenges/_meta/learn-basic-css-by-building-a-cafe-menu/meta.json
+++ b/curriculum/challenges/_meta/learn-basic-css-by-building-a-cafe-menu/meta.json
@@ -8,7 +8,7 @@
   "time": "5 hours",
   "template": "",
   "required": [],
-  "superBlock": "responsive-web-design",
+  "superBlock": "responsive-web-design-22",
   "isBeta": true,
   "challengeOrder": [
     [
diff --git a/curriculum/challenges/_meta/learn-css-animation-by-building-a-ferris-wheel/meta.json b/curriculum/challenges/_meta/learn-css-animation-by-building-a-ferris-wheel/meta.json
index 152ffc00df..8d49349fb3 100644
--- a/curriculum/challenges/_meta/learn-css-animation-by-building-a-ferris-wheel/meta.json
+++ b/curriculum/challenges/_meta/learn-css-animation-by-building-a-ferris-wheel/meta.json
@@ -8,7 +8,7 @@
   "time": "5 hours",
   "template": "",
   "required": [],
-  "superBlock": "responsive-web-design",
+  "superBlock": "responsive-web-design-22",
   "challengeOrder": [
     [
       "6140c7e645d8e905819f1dd4",
diff --git a/curriculum/challenges/_meta/learn-css-colors-by-building-a-color-markers-set/meta.json b/curriculum/challenges/_meta/learn-css-colors-by-building-a-color-markers-set/meta.json
index 42f4bb89fe..8a1c6654ee 100644
--- a/curriculum/challenges/_meta/learn-css-colors-by-building-a-color-markers-set/meta.json
+++ b/curriculum/challenges/_meta/learn-css-colors-by-building-a-color-markers-set/meta.json
@@ -8,7 +8,7 @@
   "time": "5 hours",
   "template": "",
   "required": [],
-  "superBlock": "responsive-web-design",
+  "superBlock": "responsive-web-design-22",
   "challengeOrder": [
     [
       "61695197ac34f0407e339882",
diff --git a/curriculum/challenges/_meta/learn-css-flexbox-by-building-a-photo-gallery/meta.json b/curriculum/challenges/_meta/learn-css-flexbox-by-building-a-photo-gallery/meta.json
index f9740afcb8..467de61fff 100644
--- a/curriculum/challenges/_meta/learn-css-flexbox-by-building-a-photo-gallery/meta.json
+++ b/curriculum/challenges/_meta/learn-css-flexbox-by-building-a-photo-gallery/meta.json
@@ -8,7 +8,7 @@
   "time": "5 hours",
   "template": "",
   "required": [],
-  "superBlock": "responsive-web-design",
+  "superBlock": "responsive-web-design-22",
   "challengeOrder": [
     [
       "61537485c4f2a624f18d7794",
diff --git a/curriculum/challenges/_meta/learn-css-grid-by-building-a-magazine/meta.json b/curriculum/challenges/_meta/learn-css-grid-by-building-a-magazine/meta.json
index 4ac40e9fcd..f55147e833 100644
--- a/curriculum/challenges/_meta/learn-css-grid-by-building-a-magazine/meta.json
+++ b/curriculum/challenges/_meta/learn-css-grid-by-building-a-magazine/meta.json
@@ -8,7 +8,7 @@
   "time": "5 hours",
   "template": "",
   "required": [],
-  "superBlock": "responsive-web-design",
+  "superBlock": "responsive-web-design-22",
   "challengeOrder": [
     [
       "61437d575fb98f57fa8f7f36",
diff --git a/curriculum/challenges/_meta/learn-css-transforms-by-building-a-penguin/meta.json b/curriculum/challenges/_meta/learn-css-transforms-by-building-a-penguin/meta.json
index 0408f93721..48ec64efc5 100644
--- a/curriculum/challenges/_meta/learn-css-transforms-by-building-a-penguin/meta.json
+++ b/curriculum/challenges/_meta/learn-css-transforms-by-building-a-penguin/meta.json
@@ -8,7 +8,7 @@
   "time": "5 hours",
   "template": "",
   "required": [],
-  "superBlock": "responsive-web-design",
+  "superBlock": "responsive-web-design-22",
   "challengeOrder": [
     [
       "619665c9abd72906f3ad30f9",
diff --git a/curriculum/challenges/_meta/learn-css-variables-by-building-a-city-skyline/meta.json b/curriculum/challenges/_meta/learn-css-variables-by-building-a-city-skyline/meta.json
index 745a6b264d..f5fed1b7a2 100644
--- a/curriculum/challenges/_meta/learn-css-variables-by-building-a-city-skyline/meta.json
+++ b/curriculum/challenges/_meta/learn-css-variables-by-building-a-city-skyline/meta.json
@@ -8,7 +8,7 @@
   "time": "5 hours",
   "template": "",
   "required": [],
-  "superBlock": "responsive-web-design",
+  "superBlock": "responsive-web-design-22",
   "challengeOrder": [
     [
       "5d822fd413a79914d39e98c9",
diff --git a/curriculum/challenges/_meta/learn-html-by-building-a-cat-photo-app/meta.json b/curriculum/challenges/_meta/learn-html-by-building-a-cat-photo-app/meta.json
index 666c848edd..6c76f77209 100644
--- a/curriculum/challenges/_meta/learn-html-by-building-a-cat-photo-app/meta.json
+++ b/curriculum/challenges/_meta/learn-html-by-building-a-cat-photo-app/meta.json
@@ -8,7 +8,7 @@
   "time": "5 hours",
   "template": "",
   "required": [],
-  "superBlock": "responsive-web-design",
+  "superBlock": "responsive-web-design-22",
   "challengeOrder": [
     [
       "5dc174fcf86c76b9248c6eb2",
diff --git a/curriculum/challenges/_meta/learn-html-forms-by-building-a-registration-form/meta.json b/curriculum/challenges/_meta/learn-html-forms-by-building-a-registration-form/meta.json
index 7cee8710a1..edafb15f66 100644
--- a/curriculum/challenges/_meta/learn-html-forms-by-building-a-registration-form/meta.json
+++ b/curriculum/challenges/_meta/learn-html-forms-by-building-a-registration-form/meta.json
@@ -8,7 +8,7 @@
   "time": "5 hours",
   "template": "",
   "required": [],
-  "superBlock": "responsive-web-design",
+  "superBlock": "responsive-web-design-22",
   "challengeOrder": [
     [
       "60eebd07ea685b0e777b5583",
diff --git a/curriculum/challenges/_meta/learn-intermediate-css-by-building-a-picasso-painting/meta.json b/curriculum/challenges/_meta/learn-intermediate-css-by-building-a-picasso-painting/meta.json
index e3fd9540bf..41b506ba30 100644
--- a/curriculum/challenges/_meta/learn-intermediate-css-by-building-a-picasso-painting/meta.json
+++ b/curriculum/challenges/_meta/learn-intermediate-css-by-building-a-picasso-painting/meta.json
@@ -8,7 +8,7 @@
   "time": "5 hours",
   "template": "",
   "required": [],
-  "superBlock": "responsive-web-design",
+  "superBlock": "responsive-web-design-22",
   "challengeOrder": [
     [
       "60b69a66b6ddb80858c51578",
diff --git a/curriculum/challenges/_meta/learn-more-about-css-pseudo-selectors-by-building-a-balance-sheet/meta.json b/curriculum/challenges/_meta/learn-more-about-css-pseudo-selectors-by-building-a-balance-sheet/meta.json
index 17afe8cd25..c05cdba11a 100644
--- a/curriculum/challenges/_meta/learn-more-about-css-pseudo-selectors-by-building-a-balance-sheet/meta.json
+++ b/curriculum/challenges/_meta/learn-more-about-css-pseudo-selectors-by-building-a-balance-sheet/meta.json
@@ -8,7 +8,7 @@
   "time": "5 hours",
   "template": "",
   "required": [],
-  "superBlock": "responsive-web-design",
+  "superBlock": "responsive-web-design-22",
   "challengeOrder": [
     [
       "6193d8081ec2531581ea7b98",
diff --git a/curriculum/challenges/_meta/learn-responsive-web-design-by-building-a-piano/meta.json b/curriculum/challenges/_meta/learn-responsive-web-design-by-building-a-piano/meta.json
index 0c2bcb9f36..be8f93213c 100644
--- a/curriculum/challenges/_meta/learn-responsive-web-design-by-building-a-piano/meta.json
+++ b/curriculum/challenges/_meta/learn-responsive-web-design-by-building-a-piano/meta.json
@@ -8,7 +8,7 @@
   "time": "5 hours",
   "template": "",
   "required": [],
-  "superBlock": "responsive-web-design",
+  "superBlock": "responsive-web-design-22",
   "challengeOrder": [
     [
       "612e6afc009b450a437940a1",
diff --git a/curriculum/challenges/_meta/learn-the-css-box-model-by-building-a-rothko-painting/meta.json b/curriculum/challenges/_meta/learn-the-css-box-model-by-building-a-rothko-painting/meta.json
index 6f660b77c6..1aeddec7c8 100644
--- a/curriculum/challenges/_meta/learn-the-css-box-model-by-building-a-rothko-painting/meta.json
+++ b/curriculum/challenges/_meta/learn-the-css-box-model-by-building-a-rothko-painting/meta.json
@@ -8,7 +8,7 @@
   "time": "5 hours",
   "template": "",
   "required": [],
-  "superBlock": "responsive-web-design",
+  "superBlock": "responsive-web-design-22",
   "challengeOrder": [
     [
       "60a3e3396c7b40068ad6996a",
diff --git a/curriculum/challenges/_meta/learn-typography-by-building-a-nutrition-label/meta.json b/curriculum/challenges/_meta/learn-typography-by-building-a-nutrition-label/meta.json
index 8f6c92c520..ce22189b01 100644
--- a/curriculum/challenges/_meta/learn-typography-by-building-a-nutrition-label/meta.json
+++ b/curriculum/challenges/_meta/learn-typography-by-building-a-nutrition-label/meta.json
@@ -8,7 +8,7 @@
   "time": "5 hours",
   "template": "",
   "required": [],
-  "superBlock": "responsive-web-design",
+  "superBlock": "responsive-web-design-22",
   "challengeOrder": [
     [
       "615f2abbe7d18d49a1e0e1c8",