diff --git a/docusaurus.config.js b/docusaurus.config.js
index b8b8689176..c04391c660 100755
--- a/docusaurus.config.js
+++ b/docusaurus.config.js
@@ -43,6 +43,7 @@ export default {
         },
         {
           to: 'docs/getting-started',
+          activeBasePath: 'docs',
           label: 'Docs',
           position: 'right',
         },
@@ -75,19 +76,21 @@ export default {
               label: 'Troubleshooting',
               to: 'docs/troubleshooting',
             },
+            {
+              label: 'Contributing',
+              to: 'docs/contributing',
+            },
           ],
           position: 'right',
         },
         {
           href: 'https://x.com/reactnavigation',
-          position: 'right',
           className: 'navbar-social-link navbar-social-link-x',
           'aria-label': 'X',
           position: 'right',
         },
         {
-          href: 'https://github.com/react-navigation',
-          position: 'right',
+          href: 'https://github.com/react-navigation/react-navigation',
           className: 'navbar-social-link navbar-social-link-github',
           'aria-label': 'GitHub',
           position: 'right',
@@ -95,80 +98,7 @@ export default {
       ],
     },
     footer: {
-      links: [
-        {
-          title: 'Docs',
-          items: [
-            {
-              label: 'Getting Started',
-              to: 'docs/getting-started',
-            },
-            {
-              label: 'Building your own Navigator',
-              to: 'docs/custom-navigators',
-            },
-            {
-              label: 'Contributing',
-              to: 'docs/contributing',
-            },
-          ],
-        },
-        {
-          title: 'Support',
-          items: [
-            {
-              label: 'Chat in our Discord channel',
-              href: 'https://discord.gg/reactiflux',
-            },
-            {
-              label: 'Get help on Stack Overflow',
-              href: 'https://stackoverflow.com/questions/tagged/react-navigation',
-            },
-            {
-              label: 'Request a feature on Canny',
-              href: 'https://react-navigation.canny.io/feature-requests',
-            },
-            {
-              label: 'Report a bug on GitHub',
-              href: 'https://github.com/react-navigation/react-navigation/issues/new/choose',
-            },
-          ],
-        },
-        {
-          title: 'Social',
-          items: [
-            {
-              label: 'Blog',
-              to: 'blog',
-            },
-            {
-              label: 'GitHub',
-              href: 'https://github.com/react-navigation/react-navigation',
-            },
-            {
-              label: 'Twitter',
-              href: 'https://twitter.com/reactnavigation',
-            },
-          ],
-        },
-        {
-          title: 'Built with',
-          items: [
-            {
-              label: 'Docusaurus',
-              to: 'https://docusaurus.io/',
-            },
-            {
-              label: 'GitHub Pages',
-              href: 'https://pages.github.com/',
-            },
-            {
-              label: 'Netlify',
-              href: 'https://www.netlify.com/',
-            },
-          ],
-        },
-      ],
+      copyright: `Copyright © ${new Date().getFullYear()} React Navigation. Built with <a href="https://docusaurus.io/">Docusaurus</a>, <a href="https://pages.github.com/">GitHub Pages</a>, and <a href="https://www.netlify.com/">Netlify</a>.`,
     },
   },
   plugins: [
diff --git a/src/css/custom.css b/src/css/custom.css
index c6982fbcec..fb2c75cff1 100755
--- a/src/css/custom.css
+++ b/src/css/custom.css
@@ -66,7 +66,7 @@
   );
 
   --ifm-hero-background-color: var(--ifm-color-primary);
-  --ifm-footer-background-color: #f7f7ff;
+  --ifm-footer-background-color: var(--ifm-background-surface-color);
   --ifm-home-color-text: #414360;
   --ifm-home-color-background: #f7f7ff;
   --ifm-home-color-background-secondary: #d5d6f5;
@@ -79,6 +79,8 @@
   --ifm-menu-color-background-active: rgba(107, 82, 174, 0.1);
   --docusaurus-highlighted-code-line-bg: rgba(107, 82, 174, 0.1);
 
+  --ifm-footer-padding-horizontal: var(--ifm-spacing-horizontal);
+  --ifm-footer-padding-vertical: var(--ifm-spacing-vertical);
   --ifm-tabs-padding-vertical: 0.5rem;
   --ifm-alert-border-left-width: 0;
 }