diff --git a/app/projects/router.tsx b/app/projects/router.tsx
index 5de2d054..9561f86d 100644
--- a/app/projects/router.tsx
+++ b/app/projects/router.tsx
@@ -1,6 +1,75 @@
+import { Link } from '@remix-run/react'
+import reactLogo from '~/images/react-logo.svg'
+import { FaDiscord, FaGithub } from 'react-icons/fa/index'
+import { useDocsConfig } from '~/utils/config'
+import type { ConfigSchema, MenuItem } from '~/utils/config'
+
 export const repo = 'tanstack/router'
 
-export const v1branch = 'main'
+export const latestBranch = 'main'
+export const latestVersion = 'v1'
+export const availableVersions = ['v1']
 
 export const gradientText =
   'inline-block text-transparent bg-clip-text bg-gradient-to-r from-lime-500 to-emerald-500'
+
+const frameworks = {
+  react: { label: 'React', logo: reactLogo, value: 'react' },
+} as const
+
+export type Framework = keyof typeof frameworks
+
+export const createLogo = (version?: string) => (
+  <>
+    <Link to="/" className="font-light">
+      TanStack
+    </Link>
+    <Link to=".." className={`font-bold`}>
+      <span className={`${gradientText}`}>Router</span>
+      <span className="text-sm align-super">
+        {version === 'latest' ? latestVersion : version}
+      </span>
+    </Link>
+  </>
+)
+
+export const localMenu: MenuItem = {
+  label: 'Menu',
+  children: [
+    {
+      label: 'Home',
+      to: '..',
+    },
+    {
+      label: (
+        <div className="flex items-center gap-2">
+          GitHub <FaGithub className="text-lg opacity-20" />
+        </div>
+      ),
+      to: 'https://github.com/tanstack/router',
+    },
+    {
+      label: (
+        <div className="flex items-center gap-2">
+          Discord <FaDiscord className="text-lg opacity-20" />
+        </div>
+      ),
+      to: 'https://tlinz.com/discord',
+    },
+  ],
+}
+
+export function getBranch(argVersion?: string) {
+  const version = argVersion || latestVersion
+
+  return ['latest', latestVersion].includes(version) ? latestBranch : version
+}
+
+export const useRouterDocsConfig = (config: ConfigSchema) => {
+  return useDocsConfig({
+    config,
+    frameworks,
+    localMenu,
+    availableVersions,
+  })
+}
diff --git a/app/routes/router.$.tsx b/app/routes/router.$.tsx
index 5ca9fab7..10c22c08 100644
--- a/app/routes/router.$.tsx
+++ b/app/routes/router.$.tsx
@@ -4,7 +4,7 @@ import { redirect } from '@remix-run/node'
 export const loader: LoaderFunction = (context) => {
   handleRedirects(context)
 
-  return redirect('/router/v1')
+  return redirect('/router/latest')
 }
 
 function handleRedirects(context: Parameters<LoaderFunction>[0]) {
@@ -27,8 +27,7 @@ function handleRedirects(context: Parameters<LoaderFunction>[0]) {
   reactLocationv2List.forEach((item) => {
     if (url.pathname.startsWith(`/router/react-location/${item.from}`)) {
       throw redirect(
-        `/router/v1/${item.to}?from=reactLocationV2&original=https://react-location-v2.tanstack.com/${item.from}`,
-        301
+        `/router/v1/${item.to}?from=reactLocationV2&original=https://react-location-v2.tanstack.com/${item.from}`
       )
     }
   })
diff --git a/app/routes/router.v1._index.tsx b/app/routes/router.$version._index.tsx
similarity index 97%
rename from app/routes/router.v1._index.tsx
rename to app/routes/router.$version._index.tsx
index e6a24e15..cb2eb146 100644
--- a/app/routes/router.v1._index.tsx
+++ b/app/routes/router.$version._index.tsx
@@ -7,18 +7,19 @@ import {
   FaGithub,
   FaTshirt,
 } from 'react-icons/fa'
-import { Link, useLoaderData } from '@remix-run/react'
+import { Link, useLoaderData, useParams } from '@remix-run/react'
 import { json } from '@remix-run/node'
 import { TbHeartHandshake, TbZoomQuestion } from 'react-icons/tb'
 import { VscPreview } from 'react-icons/vsc'
 import { RiLightbulbFlashLine } from 'react-icons/ri'
-import { gradientText, v1branch } from '~/projects/router'
+import { gradientText, getBranch } from '~/projects/router'
 import { Carbon } from '~/components/Carbon'
 import { Footer } from '~/components/Footer'
 import SponsorPack from '~/components/SponsorPack'
 import { Logo } from '~/components/Logo'
 import { getSponsorsForSponsorPack } from '~/server/sponsors'
 import type { LoaderFunction } from '@remix-run/node'
+import type { Framework } from '~/projects/router'
 
 const menu = [
   {
@@ -81,10 +82,9 @@ export const loader: LoaderFunction = async () => {
 
 export default function TanStackRouterRoute() {
   const { sponsors } = useLoaderData<typeof loader>()
-  const [framework] = React.useState<
-    'react' | 'preact' | 'svelte' | 'vue' | 'solid'
-  >('react')
-
+  const { version } = useParams()
+  const branch = getBranch(version)
+  const [framework] = React.useState<Framework>('react')
   const [isDark, setIsDark] = React.useState(true)
 
   React.useEffect(() => {
@@ -338,7 +338,7 @@ export default function TanStackRouterRoute() {
         <div className="bg-white dark:bg-black">
           <iframe
             key={framework}
-            src={`https://stackblitz.com/github/tanstack/router/tree/${v1branch}/examples/${framework}/kitchen-sink-file-based?file=src%2Fmain.tsx&embed=1&theme=${
+            src={`https://stackblitz.com/github/tanstack/router/tree/${branch}/examples/${framework}/kitchen-sink-file-based?file=src%2Fmain.tsx&embed=1&theme=${
               isDark ? 'dark' : 'light'
             }`}
             title="tannerlinsley/router: kitchen-sink"
diff --git a/app/routes/router.$version.docs.$.tsx b/app/routes/router.$version.docs.$.tsx
new file mode 100644
index 00000000..db7c4255
--- /dev/null
+++ b/app/routes/router.$version.docs.$.tsx
@@ -0,0 +1,44 @@
+import { useLoaderData, useParams } from '@remix-run/react'
+import type { LoaderFunctionArgs, MetaFunction } from '@remix-run/node'
+import { repo, getBranch } from '~/projects/router'
+import { DefaultErrorBoundary } from '~/components/DefaultErrorBoundary'
+import { seo } from '~/utils/seo'
+import { Doc } from '~/components/Doc'
+import { loadDocs } from '~/utils/docs'
+
+export const loader = async (context: LoaderFunctionArgs) => {
+  const { '*': docsPath, version } = context.params
+  const { url } = context.request
+
+  return loadDocs({
+    repo,
+    branch: getBranch(version),
+    docPath: `docs/${docsPath}`,
+    currentPath: url,
+    redirectPath: url.replace(/\/docs.*/, '/docs/react/overview'),
+  })
+}
+
+export const meta: MetaFunction<typeof loader> = ({ data }) => {
+  return seo({
+    title: `${data?.title ?? 'Docs'} | TanStack Router Docs`,
+    description: data?.description,
+  })
+}
+
+export const ErrorBoundary = DefaultErrorBoundary
+
+export default function RouteReactTableDocs() {
+  const { title, content, filePath } = useLoaderData<typeof loader>()
+  const { version } = useParams()
+  const branch = getBranch(version)
+  return (
+    <Doc
+      title={title}
+      content={content}
+      repo={repo}
+      branch={branch}
+      filePath={filePath}
+    />
+  )
+}
diff --git a/app/routes/router.v1.docs.examples._index.tsx b/app/routes/router.$version.docs._index.tsx
similarity index 70%
rename from app/routes/router.v1.docs.examples._index.tsx
rename to app/routes/router.$version.docs._index.tsx
index 7ad9846d..9c552fb6 100644
--- a/app/routes/router.v1.docs.examples._index.tsx
+++ b/app/routes/router.$version.docs._index.tsx
@@ -1,8 +1,8 @@
-import { redirect } from '@remix-run/node'
 import type { LoaderFunction } from '@remix-run/node'
+import { redirect } from '@remix-run/node'
 
 export const loader: LoaderFunction = (context) => {
   throw redirect(
-    context.request.url.replace(/\/examples.*/, '/examples/react/basic')
+    context.request.url.replace(/\/docs.*/, '/docs/react/overview')
   )
 }
diff --git a/app/routes/router.$version.docs.framework.$framework.$.tsx b/app/routes/router.$version.docs.framework.$framework.$.tsx
new file mode 100644
index 00000000..e38e5df6
--- /dev/null
+++ b/app/routes/router.$version.docs.framework.$framework.$.tsx
@@ -0,0 +1,45 @@
+import type { LoaderFunctionArgs, MetaFunction } from '@remix-run/node'
+import { repo, getBranch } from '~/projects/router'
+import { DefaultErrorBoundary } from '~/components/DefaultErrorBoundary'
+import { seo } from '~/utils/seo'
+import { useLoaderData, useParams } from '@remix-run/react'
+import { Doc } from '~/components/Doc'
+import { loadDocs } from '~/utils/docs'
+
+export const loader = async (context: LoaderFunctionArgs) => {
+  const { '*': docsPath, framework, version } = context.params
+  const { url } = context.request
+
+  return loadDocs({
+    repo,
+    branch: getBranch(version),
+    docPath: `docs/framework/${framework}/${docsPath}`,
+    currentPath: url,
+    redirectPath: url.replace(/\/docs.*/, '/docs/react/overview'),
+  })
+}
+
+export const meta: MetaFunction<typeof loader> = ({ data }) => {
+  return seo({
+    title: `${data?.title} | TanStack Router Docs`,
+    description: data?.description,
+  })
+}
+
+export const ErrorBoundary = DefaultErrorBoundary
+
+export default function RouteDocs() {
+  const { title, content, filePath } = useLoaderData<typeof loader>()
+  const { version } = useParams()
+  const branch = getBranch(version)
+
+  return (
+    <Doc
+      title={title}
+      content={content}
+      repo={repo}
+      branch={branch}
+      filePath={filePath}
+    />
+  )
+}
diff --git a/app/routes/router.$version.docs.framework.$framework._index.tsx b/app/routes/router.$version.docs.framework.$framework._index.tsx
new file mode 100644
index 00000000..deee4434
--- /dev/null
+++ b/app/routes/router.$version.docs.framework.$framework._index.tsx
@@ -0,0 +1,8 @@
+import { redirect } from '@remix-run/node'
+import type { LoaderFunctionArgs } from '@remix-run/node'
+
+export const loader = async (context: LoaderFunctionArgs) => {
+  throw redirect(
+    context.request.url.replace(/\/docs.*/, '/docs/react/overview')
+  )
+}
diff --git a/app/routes/router.v1.docs.examples.$.tsx b/app/routes/router.$version.docs.framework.$framework.examples.$.tsx
similarity index 76%
rename from app/routes/router.v1.docs.examples.$.tsx
rename to app/routes/router.$version.docs.framework.$framework.examples.$.tsx
index 3c63432e..2a3451c3 100644
--- a/app/routes/router.v1.docs.examples.$.tsx
+++ b/app/routes/router.$version.docs.framework.$framework.examples.$.tsx
@@ -1,36 +1,36 @@
 import * as React from 'react'
 import type { LoaderFunctionArgs, MetaFunction } from '@remix-run/node'
 import { json } from '@remix-run/node'
-import { useLoaderData } from '@remix-run/react'
+import { useLoaderData, useParams } from '@remix-run/react'
 import { DocTitle } from '~/components/DocTitle'
-import { repo, v1branch } from '~/projects/router'
+import { repo, getBranch } from '~/projects/router'
 import { seo } from '~/utils/seo'
 import { capitalize, slugToTitle } from '~/utils/utils'
 import { FaExternalLinkAlt } from 'react-icons/fa'
 
 export const loader = async (context: LoaderFunctionArgs) => {
-  const { '*': examplePath } = context.params
-  const [kind, _name] = (examplePath ?? '').split('/')
-  const [name, search] = _name.split('?')
+  const { framework, '*': name } = context.params
 
-  return json({ kind, name, search: search ?? '' })
+  return json({ framework, name })
 }
 
 export const meta: MetaFunction<typeof loader> = ({ data }) => {
   return seo({
-    title: `${capitalize(data.kind)} Router ${slugToTitle(
+    title: `${capitalize(data.framework)} Router ${slugToTitle(
       data.name
     )} Example | TanStack Router Docs`,
     description: `An example showing how to implement ${slugToTitle(
       data.name
-    )} in ${capitalize(data.kind)} Router`,
+    )} in ${capitalize(data.framework)} Router`,
   })
 }
 
 export default function RouteReactTableDocs() {
-  const { kind, name, search } = useLoaderData<typeof loader>()
+  const { framework, name } = useLoaderData<typeof loader>()
+  const { version } = useParams()
+  const branch = getBranch(version)
 
-  const examplePath = [kind, name].join('/')
+  const examplePath = [framework, name].join('/')
 
   const [isDark, setIsDark] = React.useState(true)
 
@@ -38,11 +38,11 @@ export default function RouteReactTableDocs() {
     setIsDark(window.matchMedia?.(`(prefers-color-scheme: dark)`).matches)
   }, [])
 
-  const githubUrl = `https://github.com/${repo}/tree/${v1branch}/examples/${examplePath}`
-  const stackBlitzUrl = `https://stackblitz.com/github/${repo}/tree/${v1branch}/examples/${examplePath}?${search}embed=1&theme=${
+  const githubUrl = `https://github.com/${repo}/tree/${branch}/examples/${examplePath}`
+  const stackBlitzUrl = `https://stackblitz.com/github/${repo}/tree/${branch}/examples/${examplePath}?embed=1&theme=${
     isDark ? 'dark' : 'light'
   }`
-  const codesandboxUrl = `https://codesandbox.io/s/github/${repo}/tree/${v1branch}/examples/${examplePath}?${search}embed=1&theme=${
+  const codesandboxUrl = `https://codesandbox.io/s/github/${repo}/tree/${branch}/examples/${examplePath}?embed=1&theme=${
     isDark ? 'dark' : 'light'
   }`
 
@@ -51,7 +51,7 @@ export default function RouteReactTableDocs() {
       <div className="p-4 lg:p-6">
         <DocTitle>
           <span>
-            {capitalize(kind)} Example: {slugToTitle(name)}
+            {capitalize(framework)} Example: {slugToTitle(name)}
           </span>
           <div className="flex items-center gap-4 flex-wrap font-normal text-xs">
             <a
diff --git a/app/routes/router.v1.docs._index.tsx b/app/routes/router.$version.docs.framework.$framework.examples._index.tsx
similarity index 65%
rename from app/routes/router.v1.docs._index.tsx
rename to app/routes/router.$version.docs.framework.$framework.examples._index.tsx
index d49d255c..e99fb415 100644
--- a/app/routes/router.v1.docs._index.tsx
+++ b/app/routes/router.$version.docs.framework.$framework.examples._index.tsx
@@ -1,6 +1,6 @@
-import type { LoaderFunction } from '@remix-run/node'
 import { redirect } from '@remix-run/node'
+import type { LoaderFunction } from '@remix-run/node'
 
 export const loader: LoaderFunction = (context) => {
-  throw redirect(context.request.url.replace(/\/docs.*/, '/docs/overview'))
+  throw redirect(context.request.url.replace(/\/examples.*/, '/examples/basic'))
 }
diff --git a/app/routes/router.$version.docs.tsx b/app/routes/router.$version.docs.tsx
new file mode 100644
index 00000000..a33947b7
--- /dev/null
+++ b/app/routes/router.$version.docs.tsx
@@ -0,0 +1,49 @@
+import { Outlet, json, useLoaderData } from '@remix-run/react'
+import type { LoaderFunctionArgs, MetaFunction } from '@remix-run/node'
+import {
+  repo,
+  getBranch,
+  useRouterDocsConfig,
+  createLogo,
+} from '~/projects/router'
+import { seo } from '~/utils/seo'
+import { DocsLayout } from '~/components/DocsLayout'
+import { getTanstackDocsConfig } from '~/utils/config'
+
+export const loader = async (context: LoaderFunctionArgs) => {
+  const { version } = context.params
+  const branch = getBranch(version)
+  const tanstackDocsConfig = await getTanstackDocsConfig(repo, branch)
+
+  return json({
+    tanstackDocsConfig,
+    version,
+  })
+}
+
+export const meta: MetaFunction = () => {
+  return seo({
+    title: 'TanStack Router Docs | React Router',
+    description: 'Modern and scalable routing for React applications',
+  })
+}
+
+export default function DocsRoute() {
+  const { tanstackDocsConfig, version } = useLoaderData<typeof loader>()
+  let config = useRouterDocsConfig(tanstackDocsConfig)
+
+  return (
+    <DocsLayout
+      v2={true}
+      logo={createLogo(version)}
+      colorFrom={'from-lime-500'}
+      colorTo={'to-emerald-500'}
+      textColor={'text-emerald-500'}
+      config={config}
+      framework={config.frameworkConfig}
+      version={config.versionConfig}
+    >
+      <Outlet />
+    </DocsLayout>
+  )
+}
diff --git a/app/routes/router.v1.tsx b/app/routes/router.$version.tsx
similarity index 90%
rename from app/routes/router.v1.tsx
rename to app/routes/router.$version.tsx
index 0e58730c..71adef64 100644
--- a/app/routes/router.v1.tsx
+++ b/app/routes/router.$version.tsx
@@ -1,5 +1,6 @@
 import { Link, Outlet, useLocation, useSearchParams } from '@remix-run/react'
 import { DefaultErrorBoundary } from '~/components/DefaultErrorBoundary'
+import { useClientOnlyRender } from '~/utils/useClientOnlyRender'
 
 export const ErrorBoundary = DefaultErrorBoundary
 
@@ -10,6 +11,10 @@ export default function RouteReactRouter() {
   const show = params.get('from') === 'reactLocationV2'
   const original = params.get('original')
 
+  if (!useClientOnlyRender()) {
+    return null
+  }
+
   return (
     <>
       {show ? (
diff --git a/app/routes/router.tsx b/app/routes/router.tsx
index 5789b0aa..8300c8a0 100644
--- a/app/routes/router.tsx
+++ b/app/routes/router.tsx
@@ -15,8 +15,11 @@ export const meta: MetaFunction = () => {
 }
 
 export const loader = async (context: LoaderFunctionArgs) => {
-  if (!context.request.url.includes('/router/v')) {
-    return redirect(`${new URL(context.request.url).origin}/router/v1`)
+  if (
+    !context.request.url.includes('/router/v') &&
+    !context.request.url.includes('/router/latest')
+  ) {
+    return redirect(`${new URL(context.request.url).origin}/router/latest`)
   }
 
   return new Response('OK')
diff --git a/app/routes/router.v1.docs.$.tsx b/app/routes/router.v1.docs.$.tsx
deleted file mode 100644
index 8c1dca5f..00000000
--- a/app/routes/router.v1.docs.$.tsx
+++ /dev/null
@@ -1,67 +0,0 @@
-import { useLoaderData } from '@remix-run/react'
-import type { LoaderFunctionArgs, MetaFunction } from '@remix-run/node'
-import { json } from '@remix-run/node'
-import { extractFrontMatter, fetchRepoFile } from '~/utils/documents.server'
-import { repo, v1branch } from '~/projects/router'
-import { DefaultErrorBoundary } from '~/components/DefaultErrorBoundary'
-import { seo } from '~/utils/seo'
-import removeMarkdown from 'remove-markdown'
-import { Doc } from '~/components/Doc'
-
-export const loader = async (context: LoaderFunctionArgs) => {
-  const { '*': docsPath } = context.params
-
-  if (!docsPath) {
-    throw new Error('Invalid docs path')
-  }
-
-  const filePath = `docs/${docsPath}.md`
-
-  const file = await fetchRepoFile('tanstack/router', v1branch, filePath)
-
-  if (!file) {
-    throw new Response('Not Found', {
-      status: 404,
-    })
-  }
-
-  const frontMatter = extractFrontMatter(file)
-  const description = removeMarkdown(frontMatter.excerpt ?? '')
-
-  return json(
-    {
-      title: frontMatter.data.title,
-      description,
-      filePath,
-      content: frontMatter.content,
-    },
-    {
-      headers: {
-        'Cache-Control': 's-maxage=1, stale-while-revalidate=300',
-      },
-    }
-  )
-}
-
-export const meta: MetaFunction<typeof loader> = ({ data }) => {
-  return seo({
-    title: `${data?.title ?? 'Docs'} | TanStack Router Docs`,
-    description: data?.description,
-  })
-}
-
-export const ErrorBoundary = DefaultErrorBoundary
-
-export default function RouteReactTableDocs() {
-  const { title, content, filePath } = useLoaderData<typeof loader>()
-
-  return (
-    <Doc
-      title={title}
-      content={content}
-      repo={repo}
-      branch={v1branch}
-      filePath={filePath}
-    />
-  )
-}
diff --git a/app/routes/router.v1.docs.tsx b/app/routes/router.v1.docs.tsx
deleted file mode 100644
index 171eed03..00000000
--- a/app/routes/router.v1.docs.tsx
+++ /dev/null
@@ -1,78 +0,0 @@
-import { FaDiscord, FaGithub } from 'react-icons/fa'
-import { Link, json, useLoaderData } from '@remix-run/react'
-import type { LoaderFunction, MetaFunction } from '@remix-run/node'
-import { gradientText, repo, v1branch } from '~/projects/router'
-import { seo } from '~/utils/seo'
-import { DocsLayout } from '~/components/DocsLayout'
-import { getTanstackDocsConfig } from '~/utils/config'
-
-export const loader: LoaderFunction = async () => {
-  const tanstackDocsConfig = await getTanstackDocsConfig(repo, v1branch)
-
-  return json({
-    tanstackDocsConfig,
-  })
-}
-
-const logo = (
-  <>
-    <Link to="/" className="font-light">
-      TanStack
-    </Link>
-    <Link to=".." className={`font-bold`}>
-      <span className={`${gradientText}`}>Router</span>
-    </Link>
-  </>
-)
-
-const localMenu = {
-  label: 'Menu',
-  children: [
-    {
-      label: 'Home',
-      to: '..',
-    },
-    {
-      label: (
-        <div className="flex items-center gap-2">
-          GitHub <FaGithub className="text-lg opacity-20" />
-        </div>
-      ),
-      to: 'https://github.com/tanstack/router',
-    },
-    {
-      label: (
-        <div className="flex items-center gap-2">
-          Discord <FaDiscord className="text-lg opacity-20" />
-        </div>
-      ),
-      to: 'https://tlinz.com/discord',
-    },
-  ],
-}
-
-export const meta: MetaFunction = () => {
-  return seo({
-    title: 'TanStack Router Docs | React Router',
-    description: 'Modern and scalable routing for React applications',
-  })
-}
-
-export default function DocsRoute() {
-  const { tanstackDocsConfig } = useLoaderData<typeof loader>()
-
-  const config = {
-    ...tanstackDocsConfig,
-    menu: [localMenu, ...tanstackDocsConfig.menu],
-  }
-
-  return (
-    <DocsLayout
-      logo={logo}
-      colorFrom={'from-lime-500'}
-      colorTo={'to-emerald-500'}
-      textColor={'text-emerald-500'}
-      config={config}
-    />
-  )
-}