diff --git a/package-lock.json b/package-lock.json
index ff9a88f..bad56fe 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@onwidget/astrowind",
-  "version": "0.0.6",
+  "version": "0.0.8",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@onwidget/astrowind",
-      "version": "0.0.6",
+      "version": "0.0.8",
       "devDependencies": {
         "@astrojs/image": "^0.3.3",
         "@astrojs/sitemap": "^1.0.0",
diff --git a/package.json b/package.json
index b19ea58..a267aa0 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@onwidget/astrowind",
   "description": "A template to make your website using Astro + Tailwind CSS.",
-  "version": "0.0.6",
+  "version": "0.0.8",
   "private": true,
   "scripts": {
     "dev": "astro dev",
diff --git a/src/components/astro/features/BasicFeatures.astro b/src/components/astro/features/BasicFeatures.astro
index a411e76..c34fce2 100644
--- a/src/components/astro/features/BasicFeatures.astro
+++ b/src/components/astro/features/BasicFeatures.astro
@@ -7,12 +7,12 @@
   <div class="relative max-w-6xl mx-auto px-4 sm:px-6">
     <div class="py-4 pt-8 sm:py-6 lg:py-8 lg:pt-12">
       <div class="mb-8 text-center">
-        <p class="text-base text-blue-600 font-semibold tracking-wide uppercase">
+        <p class="text-base text-blue-600 dark:text-blue-200 font-semibold tracking-wide uppercase">
           Features
         </p>
         <h2 class="text-4xl md:text-5xl font-bold leading-tighter tracking-tighter mb-4">
           Most used Sections
-        </h2><p class="max-w-3xl mx-auto text-center text-xl text-gray-600 dark:text-slate-400">Duis aute irure dolor in reprehenderit in voluptate velit esse cillum
+        </h2><p class="max-w-3xl mx-auto text-center text-xl text-gray-600 dark:text-slate-300">Duis aute irure dolor in reprehenderit in voluptate velit esse cillum
           dolore eu fugiat nulla pariatur excepteur sint occaecat cupidatat.</p>
       </div>
       <div class="grid gap-6 md:grid-cols-2 lg:grid-cols-3 items-start my-12 dark:text-white">
diff --git a/src/components/astro/footers/BasicFooter.astro b/src/components/astro/footers/BasicFooter.astro
index c86523d..99be1b3 100644
--- a/src/components/astro/footers/BasicFooter.astro
+++ b/src/components/astro/footers/BasicFooter.astro
@@ -9,86 +9,86 @@
       <div class="sm:col-span-12 lg:col-span-3">
         <div class="mb-2"><a class="inline-block font-bold" aria-label="Tailwind Astro" href="/">AstroWind</a></div>
         <div class="text-sm text-gray-600">
-          <a class="text-gray-600 hover:text-gray-700 hover:underline transition duration-150 ease-in-out"
+          <a class="text-gray-600 hover:text-gray-700 dark:text-gray-400 hover:underline transition duration-150 ease-in-out"
             href="/">Terms</a> ·
-          <a class="text-gray-600 hover:text-gray-700 hover:underline transition duration-150 ease-in-out"
+          <a class="text-gray-600 hover:text-gray-700 dark:text-gray-400 hover:underline transition duration-150 ease-in-out"
             href="/">Privacy Policy</a>
         </div>
       </div>
       <div class="sm:col-span-6 md:col-span-3 lg:col-span-2">
-        <div class="text-gray-800 dark:text-gray-500 font-medium mb-2">Products</div>
+        <div class="text-gray-800 dark:text-gray-300 font-medium mb-2">Products</div>
         <ul class="text-sm">
           <li class="mb-2">
-            <a class="text-gray-600 hover:text-gray-700 transition duration-150 ease-in-out" href="/">Web
+            <a class="text-gray-600 hover:text-gray-700 dark:text-gray-400 transition duration-150 ease-in-out" href="/">Web
               Studio</a>
           </li>
           <li class="mb-2">
-            <a class="text-gray-600 hover:text-gray-700 transition duration-150 ease-in-out" href="/">DynamicBox
+            <a class="text-gray-600 hover:text-gray-700 dark:text-gray-400 transition duration-150 ease-in-out" href="/">DynamicBox
               Flex</a>
           </li>
           <li class="mb-2">
-            <a class="text-gray-600 hover:text-gray-700 transition duration-150 ease-in-out" href="/">Programming
+            <a class="text-gray-600 hover:text-gray-700 dark:text-gray-400 transition duration-150 ease-in-out" href="/">Programming
               Forms</a>
           </li>
           <li class="mb-2">
-            <a class="text-gray-600 hover:text-gray-700 transition duration-150 ease-in-out" href="/">Integrations</a>
+            <a class="text-gray-600 hover:text-gray-700 dark:text-gray-400 transition duration-150 ease-in-out" href="/">Integrations</a>
           </li>
           <li class="mb-2">
-            <a class="text-gray-600 hover:text-gray-700 transition duration-150 ease-in-out" href="/">Command-line</a>
+            <a class="text-gray-600 hover:text-gray-700 dark:text-gray-400 transition duration-150 ease-in-out" href="/">Command-line</a>
           </li>
         </ul>
       </div>
       <div class="sm:col-span-6 md:col-span-3 lg:col-span-2">
-        <div class="text-gray-800 dark:text-gray-500 font-medium mb-2">Resources</div>
+        <div class="text-gray-800 dark:text-gray-300 font-medium mb-2">Resources</div>
         <ul class="text-sm">
           <li class="mb-2">
-            <a class="text-gray-600 hover:text-gray-700 transition duration-150 ease-in-out" href="/">Documentation</a>
+            <a class="text-gray-600 hover:text-gray-700 dark:text-gray-400 transition duration-150 ease-in-out" href="/">Documentation</a>
           </li>
           <li class="mb-2">
-            <a class="text-gray-600 hover:text-gray-700 transition duration-150 ease-in-out" href="/">Tutorials &amp;
+            <a class="text-gray-600 hover:text-gray-700 dark:text-gray-400 transition duration-150 ease-in-out" href="/">Tutorials &amp;
               Guides</a>
           </li>
           <li class="mb-2">
-            <a class="text-gray-600 hover:text-gray-700 transition duration-150 ease-in-out" href="/">Blog</a>
+            <a class="text-gray-600 hover:text-gray-700 dark:text-gray-400 transition duration-150 ease-in-out" href="/">Blog</a>
           </li>
           <li class="mb-2">
-            <a class="text-gray-600 hover:text-gray-700 transition duration-150 ease-in-out" href="/">Support Center</a>
+            <a class="text-gray-600 hover:text-gray-700 dark:text-gray-400 transition duration-150 ease-in-out" href="/">Support Center</a>
           </li>
           <li class="mb-2">
-            <a class="text-gray-600 hover:text-gray-700 transition duration-150 ease-in-out" href="/">Partners</a>
+            <a class="text-gray-600 hover:text-gray-700 dark:text-gray-400 transition duration-150 ease-in-out" href="/">Partners</a>
           </li>
         </ul>
       </div>
       <div class="sm:col-span-6 md:col-span-3 lg:col-span-2">
-        <div class="text-gray-800 dark:text-gray-500 font-medium mb-2">Company</div>
+        <div class="text-gray-800 dark:text-gray-300 font-medium mb-2">Company</div>
         <ul class="text-sm">
           <li class="mb-2">
-            <a class="text-gray-600 hover:text-gray-700 transition duration-150 ease-in-out" href="/">Home</a>
+            <a class="text-gray-600 hover:text-gray-700 dark:text-gray-400 transition duration-150 ease-in-out" href="/">Home</a>
           </li>
           <li class="mb-2">
-            <a class="text-gray-600 hover:text-gray-700 transition duration-150 ease-in-out" href="/">About us</a>
+            <a class="text-gray-600 hover:text-gray-700 dark:text-gray-400 transition duration-150 ease-in-out" href="/">About us</a>
           </li>
           <li class="mb-2">
-            <a class="text-gray-600 hover:text-gray-700 transition duration-150 ease-in-out" href="/">Company values</a>
+            <a class="text-gray-600 hover:text-gray-700 dark:text-gray-400 transition duration-150 ease-in-out" href="/">Company values</a>
           </li>
           <li class="mb-2">
-            <a class="text-gray-600 hover:text-gray-700 transition duration-150 ease-in-out" href="/">Pricing</a>
+            <a class="text-gray-600 hover:text-gray-700 dark:text-gray-400 transition duration-150 ease-in-out" href="/">Pricing</a>
           </li>
           <li class="mb-2">
-            <a class="text-gray-600 hover:text-gray-700 transition duration-150 ease-in-out" href="/">Privacy Policy</a>
+            <a class="text-gray-600 hover:text-gray-700 dark:text-gray-400 transition duration-150 ease-in-out" href="/">Privacy Policy</a>
           </li>
         </ul>
       </div>
       <div class="sm:col-span-6 md:col-span-3 lg:col-span-3">
-        <div class="text-gray-800 dark:text-gray-500 font-medium mb-2">Subscribe</div>
-        <p class="text-sm text-gray-600 mb-4">Get the latest news and articles to your inbox every month.</p>
+        <div class="text-gray-800 dark:text-gray-300 font-medium mb-2">Subscribe</div>
+        <p class="text-sm text-gray-600 dark:text-gray-400 mb-4">Get the latest news and articles to your inbox every month.</p>
         <form>
           <div class="flex flex-wrap mb-4">
             <div class="w-full">
               <label class="block text-sm sr-only" for="newsletter">Email</label>
               <div class="relative flex items-center max-w-xs">
                 <input id="newsletter" type="email"
-                  class="form-input w-full text-gray-800 px-3 py-2 pr-12 text-sm border rounded-sm dark:bg-slate-900 dark:border-slate-600"
+                  class="form-input w-full text-gray-800 px-3 py-2 pr-12 text-sm border rounded-sm dark:bg-slate-900 dark:border-slate-600 dark:text-gray-400"
                   placeholder="Your email">
                 <button type="submit" class="absolute inset-0 left-auto" aria-label="Subscribe">
                   <span class="absolute inset-0 right-auto w-px -ml-px my-2 bg-gray-300 dark:bg-slate-600"
@@ -105,20 +105,20 @@
     <div class="md:flex md:items-center md:justify-between py-4 md:py-8">
       <ul class="flex mb-4 md:order-1 md:ml-4 md:mb-0">
         <li>
-          <a class="flex justify-center items-center text-gray-600 hover:text-gray-700 bg-white hover:bg-white-100 rounded-full shadow transition duration-150 ease-in-out dark:bg-gray-800 dark:text-gray-400 p-1.5"
+          <a class="flex justify-center items-center text-gray-600 hover:text-gray-700 dark:text-gray-400 bg-white hover:bg-white-100 rounded-full shadow transition duration-150 ease-in-out dark:bg-gray-800 dark:text-gray-400 p-1.5"
             aria-label="Twitter" href="/">
             <IconTwitter />
 
           </a>
         </li>
         <li class="ml-4">
-          <a class="flex justify-center items-center text-gray-600 hover:text-gray-700 bg-white hover:bg-white-100 rounded-full shadow transition duration-150 ease-in-out dark:bg-gray-800 dark:text-gray-400 p-1.5"
+          <a class="flex justify-center items-center text-gray-600 hover:text-gray-700 dark:text-gray-400 bg-white hover:bg-white-100 rounded-full shadow transition duration-150 ease-in-out dark:bg-gray-800 dark:text-gray-400 p-1.5"
             aria-label="Instagram" href="/">
             <IconInstagram />
           </a>
         </li>
         <li class="ml-4">
-          <a class="flex justify-center items-center text-gray-600 hover:text-gray-700 bg-white hover:bg-white-100 rounded-full shadow transition duration-150 ease-in-out dark:bg-gray-800 dark:text-gray-400 p-1.5"
+          <a class="flex justify-center items-center text-gray-600 hover:text-gray-700 dark:text-gray-400 bg-white hover:bg-white-100 rounded-full shadow transition duration-150 ease-in-out dark:bg-gray-800 dark:text-gray-400 p-1.5"
             aria-label="Facebook" href="/">
             <IconFacebook />
           </a>
@@ -126,7 +126,7 @@
 
       </ul>
       <div class="text-sm text-gray-700 mr-4 dark:text-slate-400">
-        Made by <a class="text-blue-600 hover:underline" href="https://onwidget.com/">onWidget</a>. All rights reserved.
+        Made by <a class="text-blue-600 hover:underline dark:text-gray-200" href="https://onwidget.com/">onWidget</a>. All rights reserved.
       </div>
     </div>
   </div>
diff --git a/src/components/astro/headers/BasicHeader.astro b/src/components/astro/headers/BasicHeader.astro
index 25acc3f..3a3a74e 100644
--- a/src/components/astro/headers/BasicHeader.astro
+++ b/src/components/astro/headers/BasicHeader.astro
@@ -1,6 +1,6 @@
 ---
-  import { IconSun, IconGithub, IconMenu } from "~/components/astro/icons";
-  const { } = Astro.props;
+import { IconSun, IconGithub, IconMenu } from "~/components/astro/icons";
+const { } = Astro.props;
 ---
 
 <header
@@ -15,15 +15,12 @@
       <div class="flex items-center lg:hidden">
         <button type="button"
           class="text-gray-500 dark:text-gray-400 hover:bg-gray-100 dark:hover:bg-gray-700 focus:outline-none focus:ring-4 focus:ring-gray-200 dark:focus:ring-gray-700 rounded-lg text-sm p-2.5 inline-flex items-center"
-          aria-label="Toggle between Dark and Light mode"
-          onclick="window.toggleDarkMode()">
+          aria-label="Toggle between Dark and Light mode" onclick="window.toggleDarkMode()">
           <IconSun />
         </button>
         <button
           class="ml-1 text-gray-500 dark:text-gray-400 hover:bg-gray-100 dark:hover:bg-gray-800 focus:outline-none focus:ring-4 focus:ring-gray-200 dark:focus:ring-gray-700 rounded-lg text-sm p-2.5 inline-flex items-center"
-          aria-label="Toggle Menu"
-          onclick="toggleMenu()">
-
+          aria-label="Toggle Menu" onclick="toggleMenu()">
           <IconMenu />
         </button>
       </div>