diff --git a/CODEOWNERS b/CODEOWNERS
index 0f4227904..f640da5f8 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -6,4 +6,7 @@
 
 # The default owners are automatically added as reviewers when you open a pull request unless different owners are specified in the file.
 
-* @fmvilas @boyney123 @mcturco @magicmatatjahu @KhudaDad414 @Amzani @asyncapi-bot-eve
\ No newline at end of file
+* @fmvilas @boyney123 @mcturco @magicmatatjahu @KhudaDad414 @Amzani @asyncapi-bot-eve
+
+apps/design-system/ @fmvilas @mcturco @KhudaDad414 @Amzani @princerajpoot20
+packages/ui/ @fmvilas @mcturco @KhudaDad414 @Amzani @princerajpoot20
\ No newline at end of file
diff --git a/apps/studio/package.json b/apps/studio/package.json
index 23a675ef5..10c352fc8 100644
--- a/apps/studio/package.json
+++ b/apps/studio/package.json
@@ -76,11 +76,11 @@
   "devDependencies": {
     "@asyncapi/dotnet-nats-template": "^0.12.1",
     "@asyncapi/go-watermill-template": "^0.2.46",
-    "@asyncapi/html-template": "^1.0.0",
+    "@asyncapi/html-template": "^2.0.0",
     "@asyncapi/java-spring-cloud-stream-template": "^0.13.4",
     "@asyncapi/java-spring-template": "^1.4.0",
     "@asyncapi/java-template": "^0.2.1",
-    "@asyncapi/markdown-template": "^1.4.0",
+    "@asyncapi/markdown-template": "^1.5.0",
     "@asyncapi/nodejs-template": "^1.0.0",
     "@asyncapi/nodejs-ws-template": "^0.9.33",
     "@asyncapi/python-paho-template": "^0.2.13",
diff --git a/package-lock.json b/package-lock.json
index 2a2871541..826c750c6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -523,11 +523,11 @@
       "devDependencies": {
         "@asyncapi/dotnet-nats-template": "^0.12.1",
         "@asyncapi/go-watermill-template": "^0.2.46",
-        "@asyncapi/html-template": "^1.0.0",
+        "@asyncapi/html-template": "^2.0.0",
         "@asyncapi/java-spring-cloud-stream-template": "^0.13.4",
         "@asyncapi/java-spring-template": "^1.4.0",
         "@asyncapi/java-template": "^0.2.1",
-        "@asyncapi/markdown-template": "^1.4.0",
+        "@asyncapi/markdown-template": "^1.5.0",
         "@asyncapi/nodejs-template": "^1.0.0",
         "@asyncapi/nodejs-ws-template": "^0.9.33",
         "@asyncapi/python-paho-template": "^0.2.13",
@@ -1232,13 +1232,13 @@
       }
     },
     "node_modules/@asyncapi/html-template": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@asyncapi/html-template/-/html-template-1.0.0.tgz",
-      "integrity": "sha512-x410SsBa3SDJ48xSpfTqO3Hpc7fY5pOKixtn2HCiG1fMb2nsL6B+tYrSpBSEACoQEpFxmZbJ9+ZGNEVOCTe0iw==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@asyncapi/html-template/-/html-template-2.0.0.tgz",
+      "integrity": "sha512-q9GNBmS1WYC2kDmq9h8wGZROzeY7HVJmeVWnnnkfa1YUqGTvVXl//hqhex209zJB3SG31l4b2EiTVERbzt69Ag==",
       "dev": true,
       "dependencies": {
         "@asyncapi/generator-react-sdk": "^1.0.0",
-        "@asyncapi/parser": "^3.0.0-next-major-spec.3",
+        "@asyncapi/parser": "^3.0.0-next-major-spec.14",
         "@asyncapi/react-component": "^1.0.1",
         "highlight.js": "10.7.3",
         "puppeteer": "^14.1.0",
@@ -1302,9 +1302,9 @@
       }
     },
     "node_modules/@asyncapi/html-template/node_modules/@asyncapi/parser": {
-      "version": "3.0.0-next-major-spec.12",
-      "resolved": "https://registry.npmjs.org/@asyncapi/parser/-/parser-3.0.0-next-major-spec.12.tgz",
-      "integrity": "sha512-68b3ceprIrkAWC9FLBOQqK+H9iQnwRNj2G8/s7OyvsNVpyRpNOe4xETUm/RkfyZYTjpLC2sGqbX42SEU0PW2+g==",
+      "version": "3.0.0-next-major-spec.15",
+      "resolved": "https://registry.npmjs.org/@asyncapi/parser/-/parser-3.0.0-next-major-spec.15.tgz",
+      "integrity": "sha512-3Ngxkekzw7oh8auqGmEnz3PiSxSIkveMzdpuBIOiQ3EHVnBpG1cdhi/mMlvksqTsMQcfLGPsVVqW7Y3cW2HPDQ==",
       "dev": true,
       "dependencies": {
         "@asyncapi/specs": "^6.0.0-next-major-spec.9",
@@ -1327,9 +1327,9 @@
       }
     },
     "node_modules/@asyncapi/html-template/node_modules/@asyncapi/specs": {
-      "version": "6.0.0-next-major-spec.14",
-      "resolved": "https://registry.npmjs.org/@asyncapi/specs/-/specs-6.0.0-next-major-spec.14.tgz",
-      "integrity": "sha512-5Et5a9jJSVKdyU+ZIP7w2Bi233oZW6fX3kWO6nWlLSsmETt/OJhU359k3tuEUnm8xz3ZvtDyfNyPWbZhX0QeRw==",
+      "version": "6.0.0-next-major-spec.15",
+      "resolved": "https://registry.npmjs.org/@asyncapi/specs/-/specs-6.0.0-next-major-spec.15.tgz",
+      "integrity": "sha512-yIh32KhmZQBxvnPr3D0BcsJ6XNLaCD9JicAGktyJvRzKVA73zxB2qmCp8v4+dHM9/SlQ6HQ7wBqC3H/5eC+5uA==",
       "dev": true,
       "dependencies": {
         "@types/json-schema": "^7.0.11"
@@ -1517,23 +1517,23 @@
       }
     },
     "node_modules/@asyncapi/markdown-template": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@asyncapi/markdown-template/-/markdown-template-1.4.0.tgz",
-      "integrity": "sha512-mvghEtlCi/2DxSnBRMn5nRD+lD2P/HOfodnLMPav1SM0th9eiwizovTQzfuUByjFxVRj9x54ywXObm/fzo3oBQ==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@asyncapi/markdown-template/-/markdown-template-1.5.0.tgz",
+      "integrity": "sha512-86ExMTh4PtnMCOJO1uomMViipNgWUKT+OTfiUZbvJ1WFUm8Mka1g+eva9L0OoEnS/NAFeariQF4g4/l+/6SS0w==",
       "dev": true,
       "dependencies": {
-        "@asyncapi/generator-react-sdk": "^1.0.0",
+        "@asyncapi/generator-react-sdk": "^1.0.2",
         "openapi-sampler": "^1.3.0",
         "yaml": "^1.10.2"
       }
     },
     "node_modules/@asyncapi/markdown-template/node_modules/@asyncapi/generator-react-sdk": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@asyncapi/generator-react-sdk/-/generator-react-sdk-1.0.0.tgz",
-      "integrity": "sha512-QK88mxnxk1ptgXJ4Os2GoS+G/lR8n4zAdtKRvDyPRZzoUZG9/ACtlGhJam3+8DB6H5vZ6zb5Ak56Y6OTDRTX5w==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@asyncapi/generator-react-sdk/-/generator-react-sdk-1.0.2.tgz",
+      "integrity": "sha512-7RLR+ZznajT4nW8X94ygdd8q+YOVW4S1Rbw4j00jJmjRCZPia6+0uJLAu1JD/FDcCs3RgpWrwQsIO59FnPEwuw==",
       "dev": true,
       "dependencies": {
-        "@asyncapi/parser": "^2.1.0-next-major-spec.9",
+        "@asyncapi/parser": "^2.1.2",
         "@babel/core": "7.12.9",
         "@babel/preset-env": "^7.12.7",
         "@babel/preset-react": "^7.12.7",
@@ -34894,13 +34894,13 @@
       }
     },
     "@asyncapi/html-template": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@asyncapi/html-template/-/html-template-1.0.0.tgz",
-      "integrity": "sha512-x410SsBa3SDJ48xSpfTqO3Hpc7fY5pOKixtn2HCiG1fMb2nsL6B+tYrSpBSEACoQEpFxmZbJ9+ZGNEVOCTe0iw==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@asyncapi/html-template/-/html-template-2.0.0.tgz",
+      "integrity": "sha512-q9GNBmS1WYC2kDmq9h8wGZROzeY7HVJmeVWnnnkfa1YUqGTvVXl//hqhex209zJB3SG31l4b2EiTVERbzt69Ag==",
       "dev": true,
       "requires": {
         "@asyncapi/generator-react-sdk": "^1.0.0",
-        "@asyncapi/parser": "^3.0.0-next-major-spec.3",
+        "@asyncapi/parser": "^3.0.0-next-major-spec.14",
         "@asyncapi/react-component": "^1.0.1",
         "highlight.js": "10.7.3",
         "puppeteer": "^14.1.0",
@@ -34966,9 +34966,9 @@
           }
         },
         "@asyncapi/parser": {
-          "version": "3.0.0-next-major-spec.12",
-          "resolved": "https://registry.npmjs.org/@asyncapi/parser/-/parser-3.0.0-next-major-spec.12.tgz",
-          "integrity": "sha512-68b3ceprIrkAWC9FLBOQqK+H9iQnwRNj2G8/s7OyvsNVpyRpNOe4xETUm/RkfyZYTjpLC2sGqbX42SEU0PW2+g==",
+          "version": "3.0.0-next-major-spec.15",
+          "resolved": "https://registry.npmjs.org/@asyncapi/parser/-/parser-3.0.0-next-major-spec.15.tgz",
+          "integrity": "sha512-3Ngxkekzw7oh8auqGmEnz3PiSxSIkveMzdpuBIOiQ3EHVnBpG1cdhi/mMlvksqTsMQcfLGPsVVqW7Y3cW2HPDQ==",
           "dev": true,
           "requires": {
             "@asyncapi/specs": "^6.0.0-next-major-spec.9",
@@ -34991,9 +34991,9 @@
           }
         },
         "@asyncapi/specs": {
-          "version": "6.0.0-next-major-spec.14",
-          "resolved": "https://registry.npmjs.org/@asyncapi/specs/-/specs-6.0.0-next-major-spec.14.tgz",
-          "integrity": "sha512-5Et5a9jJSVKdyU+ZIP7w2Bi233oZW6fX3kWO6nWlLSsmETt/OJhU359k3tuEUnm8xz3ZvtDyfNyPWbZhX0QeRw==",
+          "version": "6.0.0-next-major-spec.15",
+          "resolved": "https://registry.npmjs.org/@asyncapi/specs/-/specs-6.0.0-next-major-spec.15.tgz",
+          "integrity": "sha512-yIh32KhmZQBxvnPr3D0BcsJ6XNLaCD9JicAGktyJvRzKVA73zxB2qmCp8v4+dHM9/SlQ6HQ7wBqC3H/5eC+5uA==",
           "dev": true,
           "requires": {
             "@types/json-schema": "^7.0.11"
@@ -35140,23 +35140,23 @@
       }
     },
     "@asyncapi/markdown-template": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@asyncapi/markdown-template/-/markdown-template-1.4.0.tgz",
-      "integrity": "sha512-mvghEtlCi/2DxSnBRMn5nRD+lD2P/HOfodnLMPav1SM0th9eiwizovTQzfuUByjFxVRj9x54ywXObm/fzo3oBQ==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@asyncapi/markdown-template/-/markdown-template-1.5.0.tgz",
+      "integrity": "sha512-86ExMTh4PtnMCOJO1uomMViipNgWUKT+OTfiUZbvJ1WFUm8Mka1g+eva9L0OoEnS/NAFeariQF4g4/l+/6SS0w==",
       "dev": true,
       "requires": {
-        "@asyncapi/generator-react-sdk": "^1.0.0",
+        "@asyncapi/generator-react-sdk": "^1.0.2",
         "openapi-sampler": "^1.3.0",
         "yaml": "^1.10.2"
       },
       "dependencies": {
         "@asyncapi/generator-react-sdk": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/@asyncapi/generator-react-sdk/-/generator-react-sdk-1.0.0.tgz",
-          "integrity": "sha512-QK88mxnxk1ptgXJ4Os2GoS+G/lR8n4zAdtKRvDyPRZzoUZG9/ACtlGhJam3+8DB6H5vZ6zb5Ak56Y6OTDRTX5w==",
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/@asyncapi/generator-react-sdk/-/generator-react-sdk-1.0.2.tgz",
+          "integrity": "sha512-7RLR+ZznajT4nW8X94ygdd8q+YOVW4S1Rbw4j00jJmjRCZPia6+0uJLAu1JD/FDcCs3RgpWrwQsIO59FnPEwuw==",
           "dev": true,
           "requires": {
-            "@asyncapi/parser": "^2.1.0-next-major-spec.9",
+            "@asyncapi/parser": "^2.1.2",
             "@babel/core": "7.12.9",
             "@babel/preset-env": "^7.12.7",
             "@babel/preset-react": "^7.12.7",
@@ -35494,11 +35494,11 @@
         "@asyncapi/converter": "^1.4.2",
         "@asyncapi/dotnet-nats-template": "^0.12.1",
         "@asyncapi/go-watermill-template": "^0.2.46",
-        "@asyncapi/html-template": "^1.0.0",
+        "@asyncapi/html-template": "^2.0.0",
         "@asyncapi/java-spring-cloud-stream-template": "^0.13.4",
         "@asyncapi/java-spring-template": "^1.4.0",
         "@asyncapi/java-template": "^0.2.1",
-        "@asyncapi/markdown-template": "^1.4.0",
+        "@asyncapi/markdown-template": "^1.5.0",
         "@asyncapi/nodejs-template": "^1.0.0",
         "@asyncapi/nodejs-ws-template": "^0.9.33",
         "@asyncapi/openapi-schema-parser": "^3.0.4",