diff --git a/package.json b/package.json
index ab39267ca6..0869824cd4 100644
--- a/package.json
+++ b/package.json
@@ -48,8 +48,8 @@
     "next-query-params": "^5.0.1",
     "next-sitemap": "^4.2.3",
     "next-with-less": "^3.0.1",
-    "nextra": "^3",
-    "nextra-theme-docs": "^3",
+    "nextra": "3.3.1",
+    "nextra-theme-docs": "3.3.1",
     "numbro": "2.5.0",
     "p-limit": "^4.0.0",
     "parser-front-matter": "1.6.4",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3770393c41..fb8006eaa9 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -98,10 +98,10 @@ importers:
         specifier: ^3.0.1
         version: 3.0.1(less-loader@12.2.0(less@4.2.1))(less@4.2.1)(next@14.2.29(@babel/core@7.26.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))
       nextra:
-        specifier: ^3
+        specifier: 3.3.1
         version: 3.3.1(patch_hash=ytqsrocfyxyupt7yg3khzgrhfe)(@types/react@18.3.23)(next@14.2.29(@babel/core@7.26.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.8.3)
       nextra-theme-docs:
-        specifier: ^3
+        specifier: 3.3.1
         version: 3.3.1(next@14.2.29(@babel/core@7.26.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(nextra@3.3.1(patch_hash=ytqsrocfyxyupt7yg3khzgrhfe)(@types/react@18.3.23)(next@14.2.29(@babel/core@7.26.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.8.3))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       numbro:
         specifier: 2.5.0
diff --git a/src/components/index-page/hero.tsx b/src/components/index-page/hero.tsx
index 4d8588556a..5e5b709c7d 100644
--- a/src/components/index-page/hero.tsx
+++ b/src/components/index-page/hero.tsx
@@ -7,7 +7,7 @@ import logoBlurred from "./hero/logo-blurred.png"
 
 export function Hero() {
   return (
-    <div className="relative bg-neu-0">
+    <div className="relative bg-neu-50 dark:bg-neu-0">
       <div className="gql-conf-container flex flex-col-reverse lg:grid lg:grid-cols-2">
         <div className="flex max-w-4xl flex-col justify-center gap-4 p-4 lg:min-h-[800px] xl:gap-8 xl:py-24 xl:pl-24 xl:pr-10">
           <h1 className="typography-h1 max-w-3xl text-neu-900">
@@ -44,7 +44,7 @@ function HeroStripes() {
     <div className="pointer-events-none relative overflow-hidden max-lg:h-[210px]">
       <ImageLoaded
         image={logoBlurred}
-        className="relative h-full bg-gradient-to-b from-pri-base to-pri-lighter opacity-0 transition-opacity duration-[1.5s] [mask-position:center_12%] [mask-size:110%] data-[loaded=true]:opacity-100 dark:to-pri-base lg:[mask-position:7%_7%] lg:[mask-size:200%]"
+        className="relative h-full bg-gradient-to-b from-pri-base to-pri-lighter opacity-0 transition-opacity duration-[1.5s] [mask-position:center_12%] [mask-size:110%] data-[loaded=true]:opacity-100 dark:to-pri-base sm:[mask-size:auto_300%] lg:[mask-position:7%_7%] lg:[mask-size:200%]"
         style={{
           maskImage: `url(${logoBlurred.src})`,
           maskRepeat: "no-repeat",
diff --git a/src/components/navbar/navbar.tsx b/src/components/navbar/navbar.tsx
new file mode 100644
index 0000000000..a38106de14
--- /dev/null
+++ b/src/components/navbar/navbar.tsx
@@ -0,0 +1,277 @@
+import { MenuItem, Menu, MenuButton, MenuItems } from "@headlessui/react"
+import clsx from "clsx"
+// eslint-disable-next-line no-restricted-imports -- since we don't need newWindow prop
+import NextLink from "next/link"
+import { Button } from "nextra/components"
+import { useFSRoute } from "nextra/hooks"
+import type * as normalizePages from "nextra/normalize-pages"
+import { Fragment, useState, type ReactElement, type ReactNode } from "react"
+import { useMenu, useThemeConfig } from "nextra-theme-docs"
+import { Anchor } from "@/app/conf/_design-system/anchor"
+import { renderComponent } from "@/components/utils"
+
+import MenuIcon from "@/app/conf/_design-system/pixelarticons/menu.svg?svgr"
+import CloseIcon from "@/app/conf/_design-system/pixelarticons/close.svg?svgr"
+
+type Item = normalizePages.PageItem | normalizePages.MenuItem
+export interface NavBarProps {
+  items: Item[]
+}
+
+const classes = {
+  link: "typography-menu flex items-center text-neu-900 px-3 py-1 nextra-focus [text-box:trim-both_cap_alphabetic] leading-none hover:underline underline-offset-2",
+}
+
+function NavbarMenu({
+  menu,
+  children,
+  onSubmenuOpen,
+}: {
+  menu: normalizePages.MenuItem
+  children: ReactNode
+  onSubmenuOpen: (open: boolean) => void
+}): ReactElement {
+  const routes = Object.fromEntries(
+    (menu.children || []).map(route => [route.name, route]),
+  )
+  return (
+    <Menu>
+      <MenuButton as={Fragment}>
+        {({ focus, open }) => {
+          // I'm sorry, I know this is so cursed.
+          // I need to migrate out of HeadlessUI to something with change handlers.
+          onSubmenuOpen(open)
+
+          return (
+            <button
+              onClick={() => onSubmenuOpen(open)}
+              className={clsx(
+                classes.link,
+                "flex items-center gap-1.5 whitespace-nowrap max-md:hidden",
+                focus && "nextra-focusable",
+              )}
+            >
+              {children}
+            </button>
+          )
+        }}
+      </MenuButton>
+      <MenuItems
+        transition
+        modal={false}
+        className={({ open }) =>
+          // eslint-disable-next-line tailwindcss/no-custom-classname
+          clsx(
+            "gql-navbar-menu-items",
+            "motion-reduce:transition-none",
+            "focus-visible:outline-none",
+            open ? "opacity-100" : "opacity-0",
+            "nextra-scrollbar overflow-visible transition-opacity",
+            "z-20 rounded-md py-1 text-sm",
+            // headlessui adds max-height as style, use !important to override
+            "!max-h-[min(calc(100vh-5rem),256px)]",
+          )
+        }
+        anchor={{ to: "top start", gap: 21, padding: 16, offset: -8 }}
+      >
+        {Object.entries(menu.items || {}).map(([key, item]) => (
+          <MenuItem key={key}>
+            <Anchor
+              href={item.href || routes[key]?.route}
+              className="block py-1.5 pl-2 pr-9"
+              target={item.newWindow ? "_blank" : undefined}
+            >
+              <span className="typography-menu px-3 py-1 underline-offset-2 [[data-active]>&]:underline">
+                {item.title}
+              </span>
+            </Anchor>
+          </MenuItem>
+        ))}
+      </MenuItems>
+    </Menu>
+  )
+}
+
+export function Navbar({ items }: NavBarProps): ReactElement {
+  const themeConfig = useThemeConfig()
+
+  const activeRoute = useFSRoute()
+  const { menu, setMenu } = useMenu()
+  const [submenuOpen, setSubmenuOpen] = useState(false)
+
+  return (
+    <div
+      className={clsx(
+        "nextra-nav-container top-0 z-20 w-full bg-transparent print:hidden",
+        activeRoute === "/" ? "fixed" : "sticky",
+      )}
+    >
+      <BackdropBlur />
+      <nav className="mx-auto flex h-[var(--nextra-navbar-height)] max-w-[90rem] items-center justify-end pl-[max(env(safe-area-inset-left),1.5rem)] pr-[max(env(safe-area-inset-right),1.5rem)]">
+        {themeConfig.logoLink ? (
+          <NextLink
+            href={
+              typeof themeConfig.logoLink === "string"
+                ? themeConfig.logoLink
+                : "/"
+            }
+            className="nextra-focus flex items-center hover:opacity-75"
+          >
+            {renderComponent(themeConfig.logo)}
+          </NextLink>
+        ) : (
+          <div className="flex items-center">
+            {renderComponent(themeConfig.logo)}
+          </div>
+        )}
+        <div className="flex-1" />
+        <div className="-mx-2 flex overflow-x-auto px-2 py-1.5 lg:gap-2 xl:absolute xl:left-1/2 xl:-translate-x-1/2">
+          {items.map(pageOrMenu => {
+            if (pageOrMenu.display === "hidden") return null
+
+            if (pageOrMenu.type === "menu") {
+              const menu = pageOrMenu as normalizePages.MenuItem
+              return (
+                <NavbarMenu
+                  key={menu.title}
+                  menu={menu}
+                  onSubmenuOpen={open => {
+                    if (typeof window !== "undefined") {
+                      if (open) {
+                        document.body.style.overflow = "hidden"
+                      } else {
+                        document.body.style.overflow = "auto"
+                      }
+                    }
+                    setSubmenuOpen(open)
+                  }}
+                >
+                  {menu.title}
+                </NavbarMenu>
+              )
+            }
+            const page = pageOrMenu as normalizePages.PageItem
+            let href = page.href || page.route || "#"
+
+            // If it's a directory
+            if (page.children) {
+              href =
+                (page.withIndexPage ? page.route : page.firstChildRoute) || href
+            }
+
+            const isActive =
+              page.route === activeRoute ||
+              activeRoute.startsWith(page.route + "/")
+
+            return (
+              <Anchor
+                href={href}
+                key={href}
+                className={clsx(
+                  classes.link,
+                  "whitespace-nowrap max-md:hidden",
+                  isActive && !page.newWindow && "underline",
+                )}
+                target={page.newWindow ? "_blank" : undefined}
+                aria-current={!page.newWindow && isActive}
+              >
+                {page.title}
+              </Anchor>
+            )
+          })}
+        </div>
+
+        {process.env.NEXTRA_SEARCH &&
+          renderComponent(themeConfig.search.component, {
+            className: "max-md:_hidden",
+          })}
+
+        {themeConfig.project.link ? (
+          <Anchor href={themeConfig.project.link}>
+            {renderComponent(themeConfig.project.icon)}
+          </Anchor>
+        ) : null}
+
+        {themeConfig.chat.link ? (
+          <Anchor href={themeConfig.chat.link}>
+            {renderComponent(themeConfig.chat.icon)}
+          </Anchor>
+        ) : null}
+
+        {renderComponent(themeConfig.navbar.extraContent)}
+
+        <Button
+          aria-label="Menu"
+          className={({ active }) =>
+            clsx(
+              "nextra-hamburger p-2 text-pri-base md:hidden",
+              active && "bg-neu-400/20",
+            )
+          }
+          onClick={() => setMenu(!menu)}
+        >
+          {menu ? (
+            <CloseIcon className="size-5" />
+          ) : (
+            <MenuIcon className="size-5" />
+          )}
+        </Button>
+      </nav>
+      <SubmenuBackdrop className={submenuOpen ? "opacity-100" : "opacity-0"} />
+    </div>
+  )
+}
+
+function BackdropBlur() {
+  const mask = "linear-gradient(to bottom, #000 0% 50%, transparent 50% 100%)"
+  const thickness = "1px"
+  return (
+    <>
+      <div
+        // note: we can't use the background trick to reduce flickering, because we have many section
+        // background colors and big images, so we'd have to change the --bg var with javascript
+        className="pointer-events-none absolute inset-0 -z-10 h-[200%] backdrop-blur-[12.8px]"
+        style={{
+          maskImage: mask,
+          WebkitMaskImage: mask,
+          background:
+            "linear-gradient(to bottom,rgb(var(--nextra-bg),.97) 0%, rgb(var(--nextra-bg),.5) 50% 100%)",
+        }}
+      />
+      <div
+        className="pointer-events-none absolute inset-0 h-full translate-y-full bg-white/10"
+        style={{
+          backdropFilter: "blur(8px) brightness(120%) saturate(113%)",
+          maskImage: `linear-gradient(to bottom, black 0, black ${thickness}, transparent ${thickness})`,
+        }}
+      />
+    </>
+  )
+}
+
+export function NavbarPlaceholder({
+  className,
+  ...rest
+}: React.HTMLAttributes<HTMLDivElement>) {
+  return (
+    <div
+      // placeholder: the colors here on `before` must match the ones on Hero `before` strip
+      className={clsx(
+        "absolute h-[calc(var(--nextra-navbar-height)+1px)] w-full before:absolute before:top-0 before:h-[calc(var(--nextra-navbar-height)+1px)] before:w-full",
+        className,
+      )}
+      {...rest}
+    />
+  )
+}
+
+function SubmenuBackdrop({ className }: { className: string }) {
+  return (
+    <div
+      className={clsx(
+        "fixed inset-0 top-[calc(var(--nextra-navbar-height)+1px)] bg-[rgb(var(--nextra-bg),.4)] backdrop-blur-[6.4px] transition-opacity",
+        className,
+      )}
+    />
+  )
+}
diff --git a/src/components/utils.tsx b/src/components/utils.tsx
new file mode 100644
index 0000000000..9074a85647
--- /dev/null
+++ b/src/components/utils.tsx
@@ -0,0 +1,8 @@
+export function renderComponent<T>(
+  ComponentOrNode: React.FC<T> | React.ReactNode,
+  props?: T,
+) {
+  if (!ComponentOrNode) return null
+  if (typeof ComponentOrNode !== "function") return ComponentOrNode
+  return <ComponentOrNode {...props!} />
+}
diff --git a/src/globals.css b/src/globals.css
index 4dbefd6e5c..962c829ce7 100644
--- a/src/globals.css
+++ b/src/globals.css
@@ -3,12 +3,6 @@
 @import "tailwindcss/utilities";
 @import "tailwindcss/components";
 
-/* #region nextra tweaks (preferably removed later, replaced with components) */
-.nextra-nav-container > nav > div:nth-child(2) {
-  margin-right: auto;
-}
-/* #endregion nextra tweaks */
-
 :root {
   --foreground-rgb: 0, 0, 0;
   --background-start-rgb: 214, 219, 220;
@@ -517,10 +511,15 @@ div[id^="headlessui-menu-items"] {
   @apply px-4 py-8 lg:px-12 xl:gap-x-24 xl:px-24 3xl:px-[240px];
 }
 
+.gql-navbar-strip,
 .gql-conf-navbar-strip {
   @apply relative [contain:paint] before:sticky before:top-0 before:z-[9] before:-mt-[var(--navbar-h)] before:block before:h-[var(--navbar-h)] before:w-full before:content-[''];
 }
 
+.gql-navbar-strip {
+  --navbar-h: var(--nextra-navbar-height);
+}
+
 :root {
   --navbar-h: 70px;
 }
diff --git a/src/nextra-theme-docs.css b/src/nextra-theme-docs.css
index 3a07dfa7d2..fbe3ba187a 100644
--- a/src/nextra-theme-docs.css
+++ b/src/nextra-theme-docs.css
@@ -2087,56 +2087,6 @@ body,
     background-color: rgb(var(--nextra-bg));
   }
 }
-.nextra-nav-container-blur {
-  pointer-events: none;
-  z-index: -1;
-  --tw-shadow: 0 2px 4px #00000005, 0 1px 0 #0000000f;
-  --tw-shadow-colored:
-    0 2px 4px var(--tw-shadow-color), 0 1px 0 var(--tw-shadow-color);
-  box-shadow:
-    var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000),
-    var(--tw-shadow);
-  width: 100%;
-  height: 100%;
-  position: absolute;
-}
-.nextra-nav-container-blur:is(html[class~="dark"] *) {
-  --tw-shadow: 0 -1px 0 #ffffff1a inset;
-  --tw-shadow-colored: inset 0 -1px 0 var(--tw-shadow-color);
-  box-shadow:
-    var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000),
-    var(--tw-shadow);
-}
-@media (prefers-contrast: more) {
-  .nextra-nav-container-blur {
-    --tw-shadow: 0 0 0 1px #000;
-    --tw-shadow-colored: 0 0 0 1px var(--tw-shadow-color);
-    box-shadow:
-      var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000),
-      var(--tw-shadow);
-  }
-  .nextra-nav-container-blur:is(html[class~="dark"] *) {
-    --tw-shadow: 0 0 0 1px #fff;
-    --tw-shadow-colored: 0 0 0 1px var(--tw-shadow-color);
-    box-shadow:
-      var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000),
-      var(--tw-shadow);
-  }
-}
-.nextra-nav-container-blur {
-  background-color: rgba(var(--nextra-bg), 0.7);
-  --tw-backdrop-blur: blur(12px);
-  -webkit-backdrop-filter: var(--tw-backdrop-blur) var(--tw-backdrop-brightness)
-    var(--tw-backdrop-contrast) var(--tw-backdrop-grayscale)
-    var(--tw-backdrop-hue-rotate) var(--tw-backdrop-invert)
-    var(--tw-backdrop-opacity) var(--tw-backdrop-saturate)
-    var(--tw-backdrop-sepia);
-  backdrop-filter: var(--tw-backdrop-blur) var(--tw-backdrop-brightness)
-    var(--tw-backdrop-contrast) var(--tw-backdrop-grayscale)
-    var(--tw-backdrop-hue-rotate) var(--tw-backdrop-invert)
-    var(--tw-backdrop-opacity) var(--tw-backdrop-saturate)
-    var(--tw-backdrop-sepia);
-}
 .nextra-toc-footer,
 .nextra-sidebar-footer {
   border-top-width: 1px;
diff --git a/src/pages/_meta.tsx b/src/pages/_meta.tsx
index 104bf3ae14..fa6c9544c6 100644
--- a/src/pages/_meta.tsx
+++ b/src/pages/_meta.tsx
@@ -80,7 +80,12 @@ export default {
   },
   conf: {
     type: "page",
-    title: "GraphQLConf",
+    title: (
+      <span className="[a:has(>&)]:[a:has(>&)]:border [a:has(>&)]:border [a:has(>&)]:border-current [a:has(>&)]:text-pri-base dark:[a:has(>&)]:text-pri-light [a:hover:has(>&)]:border-transparent">
+        GraphQLConf
+        <span className="max-xl:hidden"> 2025</span>
+      </span>
+    ),
     route: "/conf/2025",
   },
   "graphql-js": {
diff --git a/theme.config.tsx b/theme.config.tsx
index 2580fae932..63fd1090aa 100644
--- a/theme.config.tsx
+++ b/theme.config.tsx
@@ -1,5 +1,9 @@
 import { DocsThemeConfig, ThemeSwitch, useConfig } from "nextra-theme-docs"
 import NextLink from "next/link"
+
+import { Navbar } from "@/components/navbar/navbar"
+import { useRouter } from "next/router"
+
 import {
   GraphQLWordmarkLogo,
   StackOverflowIcon,
@@ -7,12 +11,12 @@ import {
   DiscordIcon,
   TwitterIcon,
 } from "./src/icons"
-import { useRouter } from "next/router"
+
 // import { createElement } from "react"
 // import NextImage from "next-image-export-optimizer"
 
 const graphQLLogo = (
-  <GraphQLWordmarkLogo className="nextra-logo h-8" title="GraphQL" />
+  <GraphQLWordmarkLogo className="nextra-logo h-6" title="GraphQL" />
 )
 
 const classes = {
@@ -201,26 +205,31 @@ export default {
       </>
     )
   },
-  banner: {
-    content: (
-      <>
-        📣 GraphQLConf 2025 • Sept 08-10 • Amsterdam • Early bird tickets
-        available &amp; sponsorship opportunities open •{" "}
-        <NextLink
-          href="/conf/2025"
-          className="underline after:font-sans after:content-['_→']"
-        >
-          Learn more
-        </NextLink>
-      </>
-    ),
-    key: "graphqlconf-2024",
-  },
+  // Hidden for now, Design is discussing it.
+  // banner: {
+  //   content: (
+  //     <>
+  //       📣 GraphQLConf 2025 • Sept 08-10 • Amsterdam • Early bird tickets
+  //       available &amp; sponsorship opportunities open •{" "}
+  //       <NextLink
+  //         href="/conf/2025"
+  //         className="underline after:font-sans after:content-['_→']"
+  //       >
+  //         Learn more
+  //       </NextLink>
+  //     </>
+  //   ),
+  //   key: "graphqlconf-2024",
+  // },
   logo: graphQLLogo,
   docsRepositoryBase:
     "https://github.com/graphql/graphql.github.io/tree/source",
   color: {
     hue: 319,
+    lightness: {
+      light: 44.1,
+      dark: 90,
+    },
   },
   sidebar: {
     defaultMenuCollapseLevel: 1,
@@ -229,7 +238,10 @@ export default {
     content: Footer,
   },
   navbar: {
-    extraContent: <ThemeSwitch lite className="[&_span]:hidden" />,
+    component: Navbar,
+    extraContent: (
+      <ThemeSwitch lite className="max-lg:hidden [&_span]:hidden" />
+    ),
   },
   toc: {
     backToTop: true,