diff --git a/src/assets/styles/base.css b/src/assets/styles/base.css
index 7883b81..8c1c226 100644
--- a/src/assets/styles/base.css
+++ b/src/assets/styles/base.css
@@ -4,7 +4,7 @@
 
 @layer components {
   .btn {
-    @apply inline-flex items-center justify-center rounded-md shadow-md border-gray-400 border bg-transparent font-medium text-center text-base text-gray-700 leading-snug transition py-3.5 px-6 md:px-7 ease-in duration-200 focus:ring-blue-500 focus:ring-offset-blue-200 focus:ring-2 focus:ring-offset-2 hover:bg-gray-100 hover:border-gray-600 dark:text-slate-300 dark:border-slate-500 dark:hover:bg-slate-800 dark:hover:border-slate-800;
+    @apply inline-flex items-center justify-center rounded-full shadow-md border-gray-400 border bg-transparent font-medium text-center text-base text-gray-700 leading-snug transition py-3.5 px-6 md:px-8 ease-in duration-200 focus:ring-blue-500 focus:ring-offset-blue-200 focus:ring-2 focus:ring-offset-2 hover:bg-gray-100 hover:border-gray-600 dark:text-slate-300 dark:border-slate-500 dark:hover:bg-slate-800 dark:hover:border-slate-800;
   }
 
   .btn-ghost {
@@ -12,7 +12,11 @@
   }
 
   .btn-primary {
-    @apply font-semibold bg-primary-800 text-white border-primary-800 hover:bg-primary-900 hover:border-primary-900 hover:text-white dark:text-white dark:bg-primary-700 dark:border-primary-700 dark:hover:border-primary-900 dark:hover:bg-primary-900;
+    @apply font-semibold bg-primary-800 text-white border-primary-800 hover:bg-primary-900 hover:border-primary-900 hover:text-white dark:text-white dark:bg-primary-800 dark:border-primary-800 dark:hover:border-primary-900 dark:hover:bg-primary-900;
+  }
+
+  .bg-dark {
+    @apply bg-slate-900;
   }
 }
 
diff --git a/src/components/blog/HighlightedPosts.astro b/src/components/blog/HighlightedPosts.astro
index bddb1fd..08932dc 100644
--- a/src/components/blog/HighlightedPosts.astro
+++ b/src/components/blog/HighlightedPosts.astro
@@ -23,7 +23,7 @@ const {
 const posts = await findPostsByIds(postIds);
 ---
 
-<section class="px-4 py-16 mx-auto max-w-6xl lg:py-20">
+<section class="px-4 py-16 mx-auto max-w-screen-xl lg:py-20">
   <div class="flex flex-col lg:justify-between lg:flex-row mb-8">
     <div class="md:max-w-sm">
       {
diff --git a/src/components/common/ToggleTheme.astro b/src/components/common/ToggleTheme.astro
index 3ab33d8..a49986e 100644
--- a/src/components/common/ToggleTheme.astro
+++ b/src/components/common/ToggleTheme.astro
@@ -1,6 +1,8 @@
 ---
 import { Icon } from 'astro-icon';
 
+import { SITE } from '~/config.mjs';
+
 export interface Props {
   label?: string;
   class?: string;
@@ -17,6 +19,10 @@ const {
 } = Astro.props;
 ---
 
-<button type="button" class={className} aria-label={label} data-aw-toggle-color-scheme>
-  <Icon name={iconName} class={iconClass} />
-</button>
+{
+  !(SITE?.defaultTheme && SITE.defaultTheme.endsWith(':only')) && (
+    <button type="button" class={className} aria-label={label} data-aw-toggle-color-scheme>
+      <Icon name={iconName} class={iconClass} />
+    </button>
+  )
+}
diff --git a/src/components/widgets/Content.astro b/src/components/widgets/Content.astro
index 8dc0fba..009ad68 100644
--- a/src/components/widgets/Content.astro
+++ b/src/components/widgets/Content.astro
@@ -56,7 +56,7 @@ const {
       )
     }
   </div>
-  <div class="mx-auto max-w-6xl p-4 md:px-8">
+  <div class="mx-auto max-w-screen-xl p-4 md:px-8">
     <div class={`md:flex ${isReversed ? 'md:flex-row-reverse' : ''} md:gap-16`}>
       <div class="md:basis-1/2 self-center">
         {content && <div class="mb-12 text-lg text-gray-600 dark:text-slate-400" set:html={content} />}
@@ -67,7 +67,7 @@ const {
               {items.map(({ title: title2, description, icon }) => (
                 <div class="flex">
                   <div class="flex-shrink-0">
-                    <div class="flex h-7 w-7 items-center justify-center rounded-full bg-blue-800 text-gray-50">
+                    <div class="flex h-7 w-7 items-center justify-center rounded-full bg-primary-800 text-gray-50">
                       <Icon name={icon ? icon : 'tabler:check'} class="w-5 h-5" />
                     </div>
                   </div>
diff --git a/src/components/widgets/Features2.astro b/src/components/widgets/Features2.astro
index 23505af..ec521a9 100644
--- a/src/components/widgets/Features2.astro
+++ b/src/components/widgets/Features2.astro
@@ -24,7 +24,7 @@ const {
 
 <section class="relative">
   <div class="absolute inset-0 bg-primary-50 dark:bg-slate-800 pointer-events-none mb-32" aria-hidden="true"></div>
-  <div class="relative max-w-6xl mx-auto px-4 sm:px-6 -mb-12">
+  <div class="relative max-w-screen-xl mx-auto px-4 sm:px-6 -mb-12">
     <div class="py-4 pt-8 sm:py-6 lg:py-8 lg:pt-12">
       {
         (title || subtitle || highlight) && (
diff --git a/src/components/widgets/Hero.astro b/src/components/widgets/Hero.astro
index 581adfd..0058c36 100644
--- a/src/components/widgets/Hero.astro
+++ b/src/components/widgets/Hero.astro
@@ -19,26 +19,29 @@ export interface Props {
 const {
   title = await Astro.slots.render('title'),
   subtitle = await Astro.slots.render('subtitle'),
+  content = await Astro.slots.render('content'),
   callToAction = await Astro.slots.render('callToAction'),
   callToAction2 = await Astro.slots.render('callToAction2'),
   image = await Astro.slots.render('image'),
 } = Astro.props;
 ---
 
-<section>
-  <div class="max-w-6xl mx-auto px-4 sm:px-6">
+<section class="relative md:-mt-[76px]">
+  <div class="absolute inset-0 pointer-events-none" aria-hidden="true"></div>
+  <div class="relative max-w-screen-xl mx-auto px-4 sm:px-6">
+    <div class="pt-0 md:pt-[76px]"></div>
     <div class="py-12 md:py-20">
-      <div class="text-center pb-10 md:pb-16 max-w-5xl mx-auto">
+      <div class="text-center pb-10 md:pb-16 max-w-screen-lg mx-auto">
         {
           title && (
             <h1
-              class="text-5xl md:text-[3.50rem] font-bold leading-tighter tracking-tighter mb-4 font-heading"
+              class="text-5xl md:text-6xl  font-bold leading-tighter tracking-tighter mb-4 font-heading dark:text-gray-200"
               set:html={title}
             />
           )
         }
         <div class="max-w-3xl mx-auto">
-          {subtitle && <p class="text-xl font-medium text-gray-500 mb-8 dark:text-slate-400" set:html={subtitle} />}
+          {subtitle && <p class="text-xl text-gray-600 mb-6 dark:text-slate-300" set:html={subtitle} />}
           <div class="max-w-xs sm:max-w-md m-auto flex flex-nowrap flex-col sm:flex-row sm:justify-center gap-4">
             {
               callToAction && (
@@ -78,22 +81,23 @@ const {
             }
           </div>
         </div>
+        {content && <Fragment set:html={content} />}
       </div>
       <div>
         {
           image && (
-            <div class="relative m-auto max-w-4xl">
+            <div class="relative m-auto max-w-5xl">
               {typeof image === 'string' ? (
                 <Fragment set:html={image} />
               ) : (
                 <Picture
                   class="mx-auto rounded-md w-full"
-                  widths={[400, 768, 1480]}
-                  sizes="(max-width: 767px) 400px, (max-width: 1479px) 768px, 1480px"
-                  aspectRatio={1480 / 833}
+                  widths={[400, 768, 1024, 2040]}
+                  sizes="(max-width: 767px) 400px, (max-width: 1023px) 768px, (max-width: 2039px) 1024px, 2040px"
+                  aspectRatio={1024 / 576}
                   loading="eager"
-                  width={1480}
-                  height={833}
+                  width={1024}
+                  height={576}
                   {...image}
                 />
               )}
diff --git a/src/components/widgets/Pricing.astro b/src/components/widgets/Pricing.astro
deleted file mode 100644
index 0161e91..0000000
--- a/src/components/widgets/Pricing.astro
+++ /dev/null
@@ -1,274 +0,0 @@
----
----
-
-<!-- Pricing -->
-<div class="max-w-[85rem] px-4 py-10 sm:px-6 lg:px-8 lg:py-14 mx-auto">
-  <!-- Title -->
-  <div class="max-w-2xl mx-auto text-center mb-10 lg:mb-14">
-    <h2 class="text-2xl font-bold md:text-4xl md:leading-tight dark:text-white">Pricing</h2>
-    <p class="mt-1 text-gray-600 dark:text-gray-400">
-      Whatever your status, our offers evolve according to your needs.
-    </p>
-  </div>
-  <!-- End Title -->
-
-  <!-- Grid -->
-  <div class="mt-12 grid sm:grid-cols-2 lg:grid-cols-4 gap-6 lg:items-center">
-    <!-- Card -->
-    <div class="flex flex-col border border-gray-200 text-center rounded-xl p-8 dark:border-gray-700">
-      <h4 class="font-medium text-lg text-gray-800 dark:text-gray-200">Free</h4>
-      <span class="mt-7 font-bold text-5xl text-gray-800 dark:text-gray-200">Free</span>
-      <p class="mt-2 text-sm text-gray-500">Forever free</p>
-
-      <ul class="mt-7 space-y-2.5 text-sm">
-        <li class="flex space-x-2">
-          <svg
-            class="flex-shrink-0 h-5 w-5 text-blue-600"
-            width="16"
-            height="16"
-            viewBox="0 0 16 16"
-            fill="none"
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              d="M11.5219 4.0949C11.7604 3.81436 12.181 3.78025 12.4617 4.01871C12.7422 4.25717 12.7763 4.6779 12.5378 4.95844L6.87116 11.6251C6.62896 11.91 6.1998 11.94 5.9203 11.6916L2.9203 9.02494C2.64511 8.78033 2.62032 8.35894 2.86493 8.08375C3.10955 7.80856 3.53092 7.78378 3.80611 8.02839L6.29667 10.2423L11.5219 4.0949Z"
-              fill="currentColor"></path>
-          </svg>
-          <span class="text-gray-800 dark:text-gray-400"> 1 user</span>
-        </li>
-
-        <li class="flex space-x-2">
-          <svg
-            class="flex-shrink-0 h-5 w-5 text-blue-600"
-            width="16"
-            height="16"
-            viewBox="0 0 16 16"
-            fill="none"
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              d="M11.5219 4.0949C11.7604 3.81436 12.181 3.78025 12.4617 4.01871C12.7422 4.25717 12.7763 4.6779 12.5378 4.95844L6.87116 11.6251C6.62896 11.91 6.1998 11.94 5.9203 11.6916L2.9203 9.02494C2.64511 8.78033 2.62032 8.35894 2.86493 8.08375C3.10955 7.80856 3.53092 7.78378 3.80611 8.02839L6.29667 10.2423L11.5219 4.0949Z"
-              fill="currentColor"></path>
-          </svg>
-          <span class="text-gray-800 dark:text-gray-400"> Plan features</span>
-        </li>
-
-        <li class="flex space-x-2">
-          <svg
-            class="flex-shrink-0 h-5 w-5 text-blue-600"
-            width="16"
-            height="16"
-            viewBox="0 0 16 16"
-            fill="none"
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              d="M11.5219 4.0949C11.7604 3.81436 12.181 3.78025 12.4617 4.01871C12.7422 4.25717 12.7763 4.6779 12.5378 4.95844L6.87116 11.6251C6.62896 11.91 6.1998 11.94 5.9203 11.6916L2.9203 9.02494C2.64511 8.78033 2.62032 8.35894 2.86493 8.08375C3.10955 7.80856 3.53092 7.78378 3.80611 8.02839L6.29667 10.2423L11.5219 4.0949Z"
-              fill="currentColor"></path>
-          </svg>
-          <span class="text-gray-800 dark:text-gray-400"> Product support</span>
-        </li>
-      </ul>
-
-      <button class="mt-5 btn">Sign up</button>
-    </div>
-    <!-- End Card -->
-
-    <!-- Card -->
-    <div class="flex flex-col border-2 border-blue-600 text-center shadow-xl rounded-xl p-8 dark:border-blue-500">
-      <p class="mb-3">
-        <span
-          class="inline-flex items-center gap-1.5 py-1.5 px-3 rounded-md text-xs uppercase font-semibold bg-blue-100 text-blue-800 dark:bg-blue-900 dark:text-white"
-          >Most popular</span
-        >
-      </p>
-      <h4 class="font-medium text-lg text-gray-800 dark:text-gray-200">Startup</h4>
-      <span class="mt-5 font-bold text-5xl text-gray-800 dark:text-gray-200">
-        <span class="font-bold text-2xl -mr-2">$</span>
-        39
-      </span>
-      <p class="mt-2 text-sm text-gray-500">All the basics for starting a new business</p>
-
-      <ul class="mt-7 space-y-2.5 text-sm">
-        <li class="flex space-x-2">
-          <svg
-            class="flex-shrink-0 h-5 w-5 text-blue-600"
-            width="16"
-            height="16"
-            viewBox="0 0 16 16"
-            fill="none"
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              d="M11.5219 4.0949C11.7604 3.81436 12.181 3.78025 12.4617 4.01871C12.7422 4.25717 12.7763 4.6779 12.5378 4.95844L6.87116 11.6251C6.62896 11.91 6.1998 11.94 5.9203 11.6916L2.9203 9.02494C2.64511 8.78033 2.62032 8.35894 2.86493 8.08375C3.10955 7.80856 3.53092 7.78378 3.80611 8.02839L6.29667 10.2423L11.5219 4.0949Z"
-              fill="currentColor"></path>
-          </svg>
-          <span class="text-gray-800 dark:text-gray-400"> 2 users</span>
-        </li>
-
-        <li class="flex space-x-2">
-          <svg
-            class="flex-shrink-0 h-5 w-5 text-blue-600"
-            width="16"
-            height="16"
-            viewBox="0 0 16 16"
-            fill="none"
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              d="M11.5219 4.0949C11.7604 3.81436 12.181 3.78025 12.4617 4.01871C12.7422 4.25717 12.7763 4.6779 12.5378 4.95844L6.87116 11.6251C6.62896 11.91 6.1998 11.94 5.9203 11.6916L2.9203 9.02494C2.64511 8.78033 2.62032 8.35894 2.86493 8.08375C3.10955 7.80856 3.53092 7.78378 3.80611 8.02839L6.29667 10.2423L11.5219 4.0949Z"
-              fill="currentColor"></path>
-          </svg>
-          <span class="text-gray-800 dark:text-gray-400"> Plan features</span>
-        </li>
-
-        <li class="flex space-x-2">
-          <svg
-            class="flex-shrink-0 h-5 w-5 text-blue-600"
-            width="16"
-            height="16"
-            viewBox="0 0 16 16"
-            fill="none"
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              d="M11.5219 4.0949C11.7604 3.81436 12.181 3.78025 12.4617 4.01871C12.7422 4.25717 12.7763 4.6779 12.5378 4.95844L6.87116 11.6251C6.62896 11.91 6.1998 11.94 5.9203 11.6916L2.9203 9.02494C2.64511 8.78033 2.62032 8.35894 2.86493 8.08375C3.10955 7.80856 3.53092 7.78378 3.80611 8.02839L6.29667 10.2423L11.5219 4.0949Z"
-              fill="currentColor"></path>
-          </svg>
-          <span class="text-gray-800 dark:text-gray-400"> Product support</span>
-        </li>
-      </ul>
-
-      <button class="mt-5 btn">Sign up</button>
-    </div>
-    <!-- End Card -->
-
-    <!-- Card -->
-    <div class="flex flex-col border border-gray-200 text-center rounded-xl p-8 dark:border-gray-700">
-      <h4 class="font-medium text-lg text-gray-800 dark:text-gray-200">Team</h4>
-      <span class="mt-5 font-bold text-5xl text-gray-800 dark:text-gray-200">
-        <span class="font-bold text-2xl -mr-2">$</span>
-        89
-      </span>
-      <p class="mt-2 text-sm text-gray-500">Everything you need for a growing business</p>
-
-      <ul class="mt-7 space-y-2.5 text-sm">
-        <li class="flex space-x-2">
-          <svg
-            class="flex-shrink-0 h-5 w-5 text-blue-600"
-            width="16"
-            height="16"
-            viewBox="0 0 16 16"
-            fill="none"
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              d="M11.5219 4.0949C11.7604 3.81436 12.181 3.78025 12.4617 4.01871C12.7422 4.25717 12.7763 4.6779 12.5378 4.95844L6.87116 11.6251C6.62896 11.91 6.1998 11.94 5.9203 11.6916L2.9203 9.02494C2.64511 8.78033 2.62032 8.35894 2.86493 8.08375C3.10955 7.80856 3.53092 7.78378 3.80611 8.02839L6.29667 10.2423L11.5219 4.0949Z"
-              fill="currentColor"></path>
-          </svg>
-          <span class="text-gray-800 dark:text-gray-400"> 5 users</span>
-        </li>
-
-        <li class="flex space-x-2">
-          <svg
-            class="flex-shrink-0 h-5 w-5 text-blue-600"
-            width="16"
-            height="16"
-            viewBox="0 0 16 16"
-            fill="none"
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              d="M11.5219 4.0949C11.7604 3.81436 12.181 3.78025 12.4617 4.01871C12.7422 4.25717 12.7763 4.6779 12.5378 4.95844L6.87116 11.6251C6.62896 11.91 6.1998 11.94 5.9203 11.6916L2.9203 9.02494C2.64511 8.78033 2.62032 8.35894 2.86493 8.08375C3.10955 7.80856 3.53092 7.78378 3.80611 8.02839L6.29667 10.2423L11.5219 4.0949Z"
-              fill="currentColor"></path>
-          </svg>
-          <span class="text-gray-800 dark:text-gray-400"> Plan features</span>
-        </li>
-
-        <li class="flex space-x-2">
-          <svg
-            class="flex-shrink-0 h-5 w-5 text-blue-600"
-            width="16"
-            height="16"
-            viewBox="0 0 16 16"
-            fill="none"
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              d="M11.5219 4.0949C11.7604 3.81436 12.181 3.78025 12.4617 4.01871C12.7422 4.25717 12.7763 4.6779 12.5378 4.95844L6.87116 11.6251C6.62896 11.91 6.1998 11.94 5.9203 11.6916L2.9203 9.02494C2.64511 8.78033 2.62032 8.35894 2.86493 8.08375C3.10955 7.80856 3.53092 7.78378 3.80611 8.02839L6.29667 10.2423L11.5219 4.0949Z"
-              fill="currentColor"></path>
-          </svg>
-          <span class="text-gray-800 dark:text-gray-400"> Product support</span>
-        </li>
-      </ul>
-
-      <button class="mt-5 btn">Sign up</button>
-    </div>
-    <!-- End Card -->
-
-    <!-- Card -->
-    <div class="flex flex-col border border-gray-200 text-center rounded-xl p-8 dark:border-gray-700">
-      <h4 class="font-medium text-lg text-gray-800 dark:text-gray-200">Enterprise</h4>
-      <span class="mt-5 font-bold text-5xl text-gray-800 dark:text-gray-200">
-        <span class="font-bold text-2xl -mr-2">$</span>
-        149
-      </span>
-      <p class="mt-2 text-sm text-gray-500">Advanced features for scaling your business</p>
-
-      <ul class="mt-7 space-y-2.5 text-sm">
-        <li class="flex space-x-2">
-          <svg
-            class="flex-shrink-0 h-5 w-5 text-blue-600"
-            width="16"
-            height="16"
-            viewBox="0 0 16 16"
-            fill="none"
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              d="M11.5219 4.0949C11.7604 3.81436 12.181 3.78025 12.4617 4.01871C12.7422 4.25717 12.7763 4.6779 12.5378 4.95844L6.87116 11.6251C6.62896 11.91 6.1998 11.94 5.9203 11.6916L2.9203 9.02494C2.64511 8.78033 2.62032 8.35894 2.86493 8.08375C3.10955 7.80856 3.53092 7.78378 3.80611 8.02839L6.29667 10.2423L11.5219 4.0949Z"
-              fill="currentColor"></path>
-          </svg>
-          <span class="text-gray-800 dark:text-gray-400"> 10 users</span>
-        </li>
-
-        <li class="flex space-x-2">
-          <svg
-            class="flex-shrink-0 h-5 w-5 text-blue-600"
-            width="16"
-            height="16"
-            viewBox="0 0 16 16"
-            fill="none"
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              d="M11.5219 4.0949C11.7604 3.81436 12.181 3.78025 12.4617 4.01871C12.7422 4.25717 12.7763 4.6779 12.5378 4.95844L6.87116 11.6251C6.62896 11.91 6.1998 11.94 5.9203 11.6916L2.9203 9.02494C2.64511 8.78033 2.62032 8.35894 2.86493 8.08375C3.10955 7.80856 3.53092 7.78378 3.80611 8.02839L6.29667 10.2423L11.5219 4.0949Z"
-              fill="currentColor"></path>
-          </svg>
-          <span class="text-gray-800 dark:text-gray-400"> Plan features</span>
-        </li>
-
-        <li class="flex space-x-2">
-          <svg
-            class="flex-shrink-0 h-5 w-5 text-blue-600"
-            width="16"
-            height="16"
-            viewBox="0 0 16 16"
-            fill="none"
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              d="M11.5219 4.0949C11.7604 3.81436 12.181 3.78025 12.4617 4.01871C12.7422 4.25717 12.7763 4.6779 12.5378 4.95844L6.87116 11.6251C6.62896 11.91 6.1998 11.94 5.9203 11.6916L2.9203 9.02494C2.64511 8.78033 2.62032 8.35894 2.86493 8.08375C3.10955 7.80856 3.53092 7.78378 3.80611 8.02839L6.29667 10.2423L11.5219 4.0949Z"
-              fill="currentColor"></path>
-          </svg>
-          <span class="text-gray-800 dark:text-gray-400"> Product support</span>
-        </li>
-      </ul>
-
-      <button class="mt-5 btn">Sign up</button>
-    </div>
-    <!-- End Card -->
-  </div>
-  <!-- End Grid -->
-</div>
-<!-- End Pricing -->
diff --git a/src/layouts/BaseLayout.astro b/src/layouts/BaseLayout.astro
index 80ff7a2..9edf313 100644
--- a/src/layouts/BaseLayout.astro
+++ b/src/layouts/BaseLayout.astro
@@ -21,7 +21,7 @@ const { language = 'en', textDirection = 'ltr' } = SITE;
     <MetaTags {...meta} />
   </head>
 
-  <body class="antialiased text-gray-900 dark:text-slate-300 tracking-tight bg-white dark:bg-slate-900">
+  <body class="antialiased text-gray-900 dark:text-slate-300 tracking-tight bg-white dark:bg-dark">
     <slot />
     <BasicScripts />
     <style is:global>
diff --git a/src/layouts/MarkdownLayout.astro b/src/layouts/MarkdownLayout.astro
index d339178..a1bd9d4 100644
--- a/src/layouts/MarkdownLayout.astro
+++ b/src/layouts/MarkdownLayout.astro
@@ -1,8 +1,5 @@
 ---
-import Layout from '~/layouts/BaseLayout.astro';
-import Header from '~/components/widgets/Header.astro';
-import Footer from '~/components/widgets/Footer.astro';
-import Announcement from '~/components/widgets/Announcement.astro';
+import Layout from '~/layouts/PageLayout.astro';
 
 import { MetaSEO } from '~/types';
 
@@ -16,17 +13,12 @@ const meta: MetaSEO = {
 ---
 
 <Layout {meta}>
-  <Announcement />
-  <Header />
-  <main>
-    <section class="px-4 py-16 sm:px-6 mx-auto lg:px-8 lg:py-20 max-w-4xl">
-      <h1 class="font-bold font-heading text-3xl md:text-4xl leading-tighter tracking-tighter">{frontmatter.title}</h1>
-      <div
-        class="mx-auto prose prose-lg max-w-4xl dark:prose-invert dark:prose-headings:text-slate-300 prose-md prose-headings:font-heading prose-headings:leading-tighter prose-headings:tracking-tighter prose-headings:font-bold prose-a:text-primary-600 dark:prose-a:text-primary-400 prose-img:rounded-md prose-img:shadow-lg mt-8"
-      >
-        <slot />
-      </div>
-    </section>
-  </main>
-  <Footer />
+  <section class="px-4 py-16 sm:px-6 mx-auto lg:px-8 lg:py-20 max-w-4xl">
+    <h1 class="font-bold font-heading text-3xl md:text-4xl leading-tighter tracking-tighter">{frontmatter.title}</h1>
+    <div
+      class="mx-auto prose prose-lg max-w-4xl dark:prose-invert dark:prose-headings:text-slate-300 prose-md prose-headings:font-heading prose-headings:leading-tighter prose-headings:tracking-tighter prose-headings:font-bold prose-a:text-primary-600 dark:prose-a:text-primary-400 prose-img:rounded-md prose-img:shadow-lg mt-8"
+    >
+      <slot />
+    </div>
+  </section>
 </Layout>
diff --git a/src/layouts/PageLayout.astro b/src/layouts/PageLayout.astro
index dc53937..422bbf3 100644
--- a/src/layouts/PageLayout.astro
+++ b/src/layouts/PageLayout.astro
@@ -4,6 +4,8 @@ import Header from '~/components/widgets/Header.astro';
 import Footer from '~/components/widgets/Footer.astro';
 import Announcement from '~/components/widgets/Announcement.astro';
 
+import { headerData, footerData } from '~/data';
+
 import { MetaSEO } from '~/types';
 
 export interface Props {
@@ -15,9 +17,9 @@ const { meta } = Astro.props;
 
 <Layout {meta}>
   <Announcement />
-  <Header />
+  <Header {...headerData} />
   <main>
     <slot />
   </main>
-  <Footer />
+  <Footer {...footerData} />
 </Layout>
diff --git a/src/pages/index.astro b/src/pages/index.astro
index 53e6ebf..f0cc53e 100644
--- a/src/pages/index.astro
+++ b/src/pages/index.astro
@@ -29,17 +29,16 @@ const meta = {
     image={{ src: import('~/assets/images/hero.png'), alt: 'AstroWind Hero Image' }}
   >
     <Fragment slot="title">
-      Your website with <span>Astro</span> + <span class="sm:whitespace-nowrap">Tailwind CSS</span>
+      Free template for <span class="hidden lg:inline">create your website <br />with</span>
+      <span class="text-violet-700 dark:text-white highlight"> Astro v2</span> + Tailwind CSS
     </Fragment>
 
     <Fragment slot="subtitle">
       <span class="hidden sm:inline">
-        <span class="font-semibold underline decoration-wavy decoration-1 decoration-primary-600 underline-offset-2"
-          >AstroWind</span
-        > is a free, production-ready template to start your new website using <em>Astro</em> + <em>Tailwind CSS</em
-        >.</span
+        <span class="font-semibold">AstroWind</span> is a free, customizable and production-ready template for Astro 2 +
+        Tailwind CSS.</span
       >
-      <span class="block mb-1 sm:hidden font-bold text-primary-600">AstroWind: Free template.</span> Suitable for Startups,
+      <span class="block mb-1 sm:hidden font-bold text-primary-600">AstroWind: Production-ready.</span> Suitable for Startups,
       Small Business, Sass Websites, Professional Portfolios, Marketing Websites, Landing Pages & Blogs.
     </Fragment>
   </Hero>