diff --git a/docs/components/AppFooter.vue b/docs/components/AppFooter.vue
index 7e19a8bf5..18b94cfd8 100644
--- a/docs/components/AppFooter.vue
+++ b/docs/components/AppFooter.vue
@@ -26,19 +26,7 @@
             aria-label="NuxtJS"
             href="https://nuxtjs.org"
             target="_blank"
-            class="
-              text-sm
-              flex
-              items-center
-              font-medium
-              p-1
-              text-gray-500
-              transition-colors
-              duration-200
-              dark:text-gray-500
-              hover:text-gray-700
-              dark:hover:text-gray-400
-            "
+            class="text-sm flex items-center font-medium p-1 d-icon"
           >
             <IconNuxt class="w-5 h-5" />
           </a>
@@ -47,19 +35,7 @@
             aria-label="Vue Telescope"
             href="https://vuetelescope.com"
             target="_blank"
-            class="
-              text-sm
-              flex
-              items-center
-              font-medium
-              p-1
-              text-gray-500
-              transition-colors
-              duration-200
-              dark:text-gray-500
-              hover:text-gray-700
-              dark:hover:text-gray-400
-            "
+            class="text-sm flex items-center font-medium p-1 d-icon"
           >
             <IconVueTelescope class="w-5 h-5" />
           </a>
diff --git a/docs/content/index.md b/docs/content/index.md
index cfcd95b09..046ac4ffe 100644
--- a/docs/content/index.md
+++ b/docs/content/index.md
@@ -4,6 +4,7 @@ description: >-
   Write pages in markdown, use Vue components, add style with Windi CSS and
   enjoy the power of Nuxt with a blazing fast developer experience.
 template: page
+layout.fluid: true
 navigation: false
 layout.asideClass: 'block lg:hidden'
 layout.aside: true
diff --git a/src/defaultTheme/components/organisms/PageContent.vue b/src/defaultTheme/components/organisms/PageContent.vue
index 62baa0f49..1cdfde2e9 100644
--- a/src/defaultTheme/components/organisms/PageContent.vue
+++ b/src/defaultTheme/components/organisms/PageContent.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <slot name="mobile-toc" />
-    <div class="px-4 sm:px-6 mt-4">
+    <div class="px-4 sm:px-6 mt-4 xl:mt-0">
       <DocusContent :document="page" class="docus-content" />
     </div>
   </div>
diff --git a/src/defaultTheme/components/organisms/app/AppPage.vue b/src/defaultTheme/components/organisms/app/AppPage.vue
index 10c894768..cfdb68564 100644
--- a/src/defaultTheme/components/organisms/app/AppPage.vue
+++ b/src/defaultTheme/components/organisms/app/AppPage.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="flex flex-col w-full pt-0 xl:flex-row xl:pt-10">
-    <article class="flex-auto order-last min-w-0 mt-4 xl:order-first xl:mt-0">
+    <article class="flex-auto order-last min-w-0 mt-0 xl:order-first xl:mt-0">
       <slot />
       <div v-if="$scopedSlots['prev-next']" class="px-4 sm:px-6">
         <hr class="mt-10 mb-8 border-t d-border" />
diff --git a/src/defaultTheme/settings.ts b/src/defaultTheme/settings.ts
index 39de4e229..f38d9a2a5 100644
--- a/src/defaultTheme/settings.ts
+++ b/src/defaultTheme/settings.ts
@@ -82,7 +82,7 @@ const defaultThemeSettings = {
     'd-blur-header': 'blur-12',
     'd-bg-header': 'bg-white bg-opacity-80 dark:bg-gray-900 dark:bg-opacity-80',
     'd-border': 'light:border-gray-200 light:border-opacity-50 dark:border-gray-800',
-    'd-border-hover': 'border-primary-200 dark:border-secondary-dark',
+    'd-border-hover': 'border-primary-200 dark:border-gray-700',
     'd-border-header': 'border-b border-gray-200 dark:border-gray-800 border-opacity-50',
     'd-header': 'sticky w-full top-0 z-50 d-bg-header d-border-header d-blur-header h-header',
     // Heading