diff --git a/apps/showcase/assets/data/news.json b/apps/showcase/assets/data/news.json
index 9f57044dd..0894a0a91 100644
--- a/apps/showcase/assets/data/news.json
+++ b/apps/showcase/assets/data/news.json
@@ -1,7 +1,7 @@
 {
-    "id": 73,
-    "content": "Remastered Diamond Template is out now! 🎉",
+    "id": 74,
+    "content": "Introducing the Genesis Template! 🎉",
     "linkText": "View Demo",
-    "linkHref": "https://diamond.primevue.org",
+    "linkHref": "https://genesis.primevue.org",
     "target": "_blank"
 }
diff --git a/apps/showcase/components/template/TemplateHero.vue b/apps/showcase/components/template/TemplateHero.vue
index 4e6374044..241e5366b 100644
--- a/apps/showcase/components/template/TemplateHero.vue
+++ b/apps/showcase/components/template/TemplateHero.vue
@@ -30,7 +30,7 @@
                         <i class="pi pi-github" />
                         <span class="hover:underline">{{ templateHeroData.free ? 'Open Issues' : 'Community' }}</span>
                     </a>
-                    <a class="flex items-center gap-2 text-primary-contrast lg:text-base text-sm" :href="templateHeroData.docHref" target="_blank">
+                    <a v-if="templateHeroData.docHref" class="flex items-center gap-2 text-primary-contrast lg:text-base text-sm" :href="templateHeroData.docHref" target="_blank">
                         <i class="pi pi-book" />
                         <span class="hover:underline">Documentation</span>
                     </a>
diff --git a/apps/showcase/components/template/TemplateLicense.vue b/apps/showcase/components/template/TemplateLicense.vue
index ea5805f6c..f488d38fc 100644
--- a/apps/showcase/components/template/TemplateLicense.vue
+++ b/apps/showcase/components/template/TemplateLicense.vue
@@ -21,7 +21,7 @@
                 </template>
             </div>
             <p class="text-muted-color text-center mt-6 mb-0">{{ license.description }}</p>
-            <p class="text-muted-color text-center mt-6 mb-0">
+            <p v-if="license.documentLink" class="text-muted-color text-center mt-6 mb-0">
                 Visit the
                 <a :href="license.documentLink" target="_blank" class="text-primary cursor-pointer transition-all hover:underline"> official documentation </a> for more information.
             </p>
diff --git a/apps/showcase/doc/setup/GuidesDoc.vue b/apps/showcase/doc/setup/GuidesDoc.vue
index 6a00118d7..4b24b167b 100644
--- a/apps/showcase/doc/setup/GuidesDoc.vue
+++ b/apps/showcase/doc/setup/GuidesDoc.vue
@@ -1,7 +1,7 @@
 <template>
     <DocSectionText v-bind="$attrs"></DocSectionText>
     <div class="grid grid-cols-12 gap-4">
-        <div class="col-span-12 sm:col-span-3">
+        <div class="col-span-12 sm:col-span-6 md:col-span-3">
             <div class="card">
                 <NuxtLink to="/vite">
                     <span class="images">
@@ -57,7 +57,7 @@
                 </NuxtLink>
             </div>
         </div>
-        <div class="col-span-12 sm:col-span-3">
+        <div class="col-span-12 sm:col-span-6 md:col-span-3">
             <div class="card">
                 <NuxtLink to="/nuxt">
                     <span class="images">
@@ -81,7 +81,7 @@
                 </NuxtLink>
             </div>
         </div>
-        <div class="col-span-12 sm:col-span-3">
+        <div class="col-span-12 sm:col-span-6 md:col-span-3">
             <div class="card flex-1">
                 <NuxtLink to="/cdn">
                     <span class="images">
@@ -111,7 +111,7 @@
                 </NuxtLink>
             </div>
         </div>
-        <div class="col-span-12 sm:col-span-3">
+        <div class="col-span-12 sm:col-span-6 md:col-span-3">
             <div class="card flex-1">
                 <NuxtLink to="/laravel">
                     <span class="images">
diff --git a/apps/showcase/pages/templates/genesis/index.vue b/apps/showcase/pages/templates/genesis/index.vue
index ca85b1326..298f68975 100644
--- a/apps/showcase/pages/templates/genesis/index.vue
+++ b/apps/showcase/pages/templates/genesis/index.vue
@@ -25,15 +25,14 @@ export default {
                         props: {
                             templateHeroData: {
                                 logo: markRaw(GenesisLogo),
-                                pattern: 'https://primefaces.org/cdn/primereact/images/templates/genesis/hero-pattern.png',
-                                dashboard1: 'https://primefaces.org/cdn/primereact/images/templates/genesis/dashboard-2.png',
-                                dashboard2: 'https://primefaces.org/cdn/primereact/images/templates/genesis/dashboard-1.png',
-                                description: 'Genesis is a modern admin template for developers and IT professionals. It comes with a huge collection of reusable UI components and dozens of built-in layouts for various purposes.',
-                                liveHref: 'https://www.primefaces.org/genesis-react/',
-                                docHref: 'https://genesis.primereact.org/documentation',
+                                pattern: 'https://primefaces.org/cdn/primevue/images/templates/genesis/hero-pattern.png',
+                                dashboard1: 'https://primefaces.org/cdn/primevue/images/templates/genesis/dashboard-2.png',
+                                dashboard2: 'https://primefaces.org/cdn/primevue/images/templates/genesis/dashboard-1.png',
+                                description: 'Genesis, crafted by Prime, is the ultimate multi-purpose website template built with Vue and Nuxt. It offers unmatched versatility and performance with a suite of example pages to elevate your projects.',
+                                liveHref: 'https://genesis.primevue.org',
                                 pattern: {
                                     className: 'select-none absolute z-[6] w-[58rem] md:w-[50rem] h-auto top-12 md:top-32 -left-24 md:-left-12 opacity-75',
-                                    src: 'https://primefaces.org/cdn/primereact/images/templates/genesis/hero-pattern.png'
+                                    src: 'https://primefaces.org/cdn/primevue/images/templates/genesis/hero-pattern.png'
                                 },
                                 isMultipurpose: true
                             }
@@ -43,7 +42,6 @@ export default {
                         name: markRaw(TemplateLicense),
                         props: {
                             license: {
-                                documentLink: 'https://genesis.primereact.org/documentation',
                                 description: 'The download package is a Nuxt-based project containing all application source codes deployed at the live demo. The project code is written in JavaScript.',
                                 showDiscount: false,
                                 licenseDetails: [
@@ -72,25 +70,25 @@ export default {
                                     id: 1,
                                     title: 'Various Landing Pages',
                                     description: 'Choose from 9 templates for industries like SaaS, Travel, and Real Estate, each tailored to specific business needs.',
-                                    src: 'https://primefaces.org/cdn/primereact/images/templates/genesis/animation-landing-pages.png'
+                                    src: 'https://primefaces.org/cdn/primevue/images/templates/genesis/animation-landing-pages.png'
                                 },
                                 {
                                     id: 2,
                                     title: 'Secondary Pages',
                                     description: 'Includes essential pages like About, Pricing, Blog, and Contact for a complete user experience.',
-                                    src: 'https://primefaces.org/cdn/primereact/images/templates/genesis/animation-second-pages.png'
+                                    src: 'https://primefaces.org/cdn/primevue/images/templates/genesis/animation-second-pages.png'
                                 },
                                 {
                                     id: 3,
                                     title: 'Dark & Light Modes',
                                     description: 'Easily switch between Light and Dark modes to match your aesthetic preferences.',
-                                    src: 'https://primefaces.org/cdn/primereact/images/templates/genesis/animation-dark-light-modes.png'
+                                    src: 'https://primefaces.org/cdn/primevue/images/templates/genesis/animation-dark-light-modes.png'
                                 },
                                 {
                                     id: 4,
                                     title: 'Themes',
                                     description: 'Customize with 16 color themes to align with your brand effortlessly.',
-                                    src: 'https://primefaces.org/cdn/primereact/images/templates/genesis/animation-menu-themes.png'
+                                    src: 'https://primefaces.org/cdn/primevue/images/templates/genesis/animation-menu-themes.png'
                                 }
                             ]
                         }
@@ -111,17 +109,17 @@ export default {
                                 {
                                     title: 'Modern and Sleek Design',
                                     description: 'Enjoy a contemporary design that looks great on all devices.',
-                                    src: 'https://primefaces.org/cdn/primereact/images/templates/genesis/horizontal-features-img-1.png'
+                                    src: 'https://primefaces.org/cdn/primevue/images/templates/genesis/horizontal-features-img-1.png'
                                 },
                                 {
                                     title: 'SEO & Performance',
                                     description: 'Optimized for fast loading and high search engine rankings.',
-                                    src: 'https://primefaces.org/cdn/primereact/images/templates/genesis/horizontal-features-img-2.png'
+                                    src: 'https://primefaces.org/cdn/primevue/images/templates/genesis/horizontal-features-img-2.png'
                                 },
                                 {
                                     title: 'Animation / Effects',
                                     description: 'Enhance engagement with captivating animations and effects.',
-                                    src: 'https://primefaces.org/cdn/primereact/images/templates/genesis/horizontal-features-img-3.png'
+                                    src: 'https://primefaces.org/cdn/primevue/images/templates/genesis/horizontal-features-img-3.png'
                                 }
                             ],
                             displayType: 'horizontal'
@@ -136,25 +134,25 @@ export default {
                                     id: 1,
                                     title: 'Tailwind',
                                     description: 'Built with TailwindCSS, offering flexibility and efficiency for responsive design. Enjoy the power of Tailwind, a favorite among developers.',
-                                    src: 'https://primefaces.org/cdn/primereact/images/templates/genesis/animation-tailwind.png'
+                                    src: 'https://primefaces.org/cdn/primevue/images/templates/genesis/animation-tailwind.png'
                                 },
                                 {
                                     id: 2,
                                     title: 'PrimeBlocks',
                                     slotType: 'description2',
-                                    src: 'https://primefaces.org/cdn/primereact/images/templates/apollo/features-animation-blocks.png'
+                                    src: 'https://primefaces.org/cdn/primevue/images/templates/apollo/features-animation-blocks.png'
                                 },
                                 {
                                     id: 3,
                                     title: 'PrimeIcons',
                                     description: 'Genesis ships with PrimeIcons, PrimeTek’s modern icon library including a wide range of icons for your applications.',
-                                    src: 'https://primefaces.org/cdn/primereact/images/templates/apollo/features-animation-icons.png'
+                                    src: 'https://primefaces.org/cdn/primevue/images/templates/apollo/features-animation-icons.png'
                                 },
                                 {
                                     id: 4,
                                     title: 'Figma File',
                                     slotType: 'description4',
-                                    src: 'https://primefaces.org/cdn/primereact/images/templates/genesis/animation-figma.png'
+                                    src: 'https://primefaces.org/cdn/primevue/images/templates/genesis/animation-figma.png'
                                 }
                             ]
                         },
@@ -175,30 +173,30 @@ export default {
                                 {
                                     title: 'Fully Responsive',
                                     description: 'Genesis is crafted to provide optimal viewing and interaction experience for a wide range of devices.',
-                                    src: 'https://primefaces.org/cdn/primereact/images/templates/genesis/fully-responsive.png'
+                                    src: 'https://primefaces.org/cdn/primevue/images/templates/genesis/fully-responsive.png'
                                 },
                                 {
                                     title: 'Cross Browser Compatible',
                                     description: 'First class support for Firefox, Safari, Chrome and Edge.',
-                                    src: 'https://primefaces.org/cdn/primereact/images/templates/apollo/apollo-features2-compatible.png',
-                                    darkSrc: 'https://primefaces.org/cdn/primereact/images/templates/apollo/apollo-features2-compatible-dark.png'
+                                    src: 'https://primefaces.org/cdn/primevue/images/templates/apollo/apollo-features2-compatible.png',
+                                    darkSrc: 'https://primefaces.org/cdn/primevue/images/templates/apollo/apollo-features2-compatible-dark.png'
                                 },
                                 {
                                     title: 'Support',
                                     description:
                                         'PrimeTek offers assistance with account management and licensing issues, with the expectation that users have the necessary technical knowledge to use our products, as we do not offer technical support or consulting. Users can seek assistance in our community via our public Discord and Forum.',
-                                    src: 'https://primefaces.org/cdn/primereact/images/templates/apollo/apollo-features2-lifetime.png'
+                                    src: 'https://primefaces.org/cdn/primevue/images/templates/apollo/apollo-features2-lifetime.png'
                                 },
                                 {
                                     title: 'Customizable Design',
                                     description: 'Fully customizable with a mixture of Sass and CSS variables.',
-                                    src: 'https://primefaces.org/cdn/primereact/images/templates/apollo/apollo-features2-customizable.png',
-                                    darkSrc: 'https://primefaces.org/cdn/primereact/images/templates/apollo/apollo-features2-customizable-dark.png'
+                                    src: 'https://primefaces.org/cdn/primevue/images/templates/apollo/apollo-features2-customizable.png',
+                                    darkSrc: 'https://primefaces.org/cdn/primevue/images/templates/apollo/apollo-features2-customizable-dark.png'
                                 },
                                 {
                                     title: 'Mobile Experience',
                                     description: 'Touch optimized enhanced mobile experience with responsive design.',
-                                    src: 'https://primefaces.org/cdn/primereact/images/templates/genesis/mobile-experience.png'
+                                    src: 'https://primefaces.org/cdn/primevue/images/templates/genesis/mobile-experience.png'
                                 }
                             ],
                             displayType: 'vertical'