diff --git a/src/components/Common/SectionNavLink.tsx b/src/components/Common/SectionNavLink.tsx
new file mode 100644
index 0000000000..90defce483
--- /dev/null
+++ b/src/components/Common/SectionNavLink.tsx
@@ -0,0 +1,30 @@
+import React from "react";
+import clsx from "clsx";
+import Link from "@docusaurus/Link";
+import { Icon } from "@site/src/components/Common/Icon";
+import type { SectionNavItem } from "@site/src/typescript/pathUtils";
+
+interface SectionNavLinkProps {
+    item: SectionNavItem;
+    isActive: boolean;
+    onClick?: () => void;
+}
+
+export function SectionNavLink({ item, isActive, onClick }: SectionNavLinkProps) {
+    return (
+        <Link
+            to={item.to}
+            onClick={onClick}
+            // Not "page": the entry points at the section landing page, which is rarely the page you are on.
+            aria-current={isActive ? "true" : undefined}
+            className={clsx(
+                "menu__link",
+                isActive && "!bg-black/5 !font-semibold hover:!bg-black/10 dark:!bg-white/5 dark:hover:!bg-white/10"
+            )}
+        >
+            <Icon icon={item.icon} size="xs" className="me-2" />
+            {item.label}
+            {item.external && <Icon icon="newtab" size="xs" className="ms-auto opacity-60" />}
+        </Link>
+    );
+}
diff --git a/src/theme/DocSidebar/Desktop/index.tsx b/src/theme/DocSidebar/Desktop/index.tsx
index 426902f0b1..f809dc5d8a 100644
--- a/src/theme/DocSidebar/Desktop/index.tsx
+++ b/src/theme/DocSidebar/Desktop/index.tsx
@@ -12,7 +12,8 @@ import SidebarVersionDropdown from "@site/src/components/SidebarVersionDropdown"
 
 import { useActiveDocContext, useLatestVersion } from "@docusaurus/plugin-content-docs/client";
 import { Icon } from "@site/src/components/Common/Icon";
-import { getPathType, getLandingPagePath, PathType } from "../../../typescript/pathUtils";
+import { SectionNavLink } from "@site/src/components/Common/SectionNavLink";
+import { getPathType, getSectionNavItems, PathType } from "../../../typescript/pathUtils";
 
 function DocSidebarDesktop({ path, sidebar, onCollapse, isHidden }: Props) {
     const {
@@ -28,7 +29,7 @@ function DocSidebarDesktop({ path, sidebar, onCollapse, isHidden }: Props) {
     const versionLabel = activeVersion?.label ?? latestVersion.label;
 
     const pathType = getPathType(path);
-    const landingPagePath = getLandingPagePath(pathType, versionLabel);
+    const sectionNavItems = getSectionNavItems(pathType, versionLabel);
 
     const shouldDisplayContent = pathType !== PathType.Guides && pathType !== PathType.Samples;
 
@@ -41,66 +42,16 @@ function DocSidebarDesktop({ path, sidebar, onCollapse, isHidden }: Props) {
             )}
         >
             {hideOnScroll && <Logo tabIndex={-1} className={styles.sidebarLogo} />}
-            <div className="menu thin-scrollbar menu_Y1UP shrink-0 !grow-0">
-                <div className="menu__list-item-collapsible">
-                    <Link to={landingPagePath} className="menu__link">
-                        <Icon icon="home" size="xs" className="me-2" /> Start
-                    </Link>
-                </div>
-                {pathType !== PathType.Guides && (
-                    <Link to="/guides" className="menu__link group">
-                        <Icon icon="guides" size="xs" className="me-2" /> Guides
-                        <small className="flex items-center ms-auto gap-1 text-[0.675rem] opacity-0 group-hover:opacity-100 !transition-all">
-                            Switch <Icon icon="arrow-thin-right" size="xs" />
-                        </small>
-                    </Link>
-                )}
-                {pathType !== PathType.Samples && (
-                    <Link to="/samples" className="menu__link group">
-                        <Icon icon="create-sample-data" size="xs" className="me-2" /> Samples
-                        <small className="flex items-center ms-auto gap-1 text-[0.675rem] opacity-0 group-hover:opacity-100 !transition-all">
-                            Switch <Icon icon="arrow-thin-right" size="xs" />
-                        </small>
-                    </Link>
-                )}
-                {pathType !== PathType.Documentation && (
-                    <Link to={`/${versionLabel}`} className="menu__link group">
-                        <Icon icon="database" size="xs" className="me-2" /> RavenDB Docs
-                        <small className="flex items-center ms-auto gap-1 text-[0.675rem] opacity-0 group-hover:opacity-100 !transition-all">
-                            Switch <Icon icon="arrow-thin-right" size="xs" />
-                        </small>
-                    </Link>
-                )}
-                {pathType !== PathType.Cloud && (
-                    <Link to="/cloud" className="menu__link group">
-                        <Icon icon="cloud" size="xs" className="me-2" /> RavenDB Cloud Docs
-                        <small className="flex items-center ms-auto gap-1 text-[0.675rem] opacity-0 group-hover:opacity-100 !transition-all">
-                            Switch <Icon icon="arrow-thin-right" size="xs" />
-                        </small>
-                    </Link>
-                )}
-                {pathType !== PathType.Quill && (
-                    <Link to="/quill" className="menu__link group">
-                        <Icon icon="quill" size="xs" className="me-2" /> Quill Docs
-                        <small className="flex items-center ms-auto gap-1 text-[0.675rem] opacity-0 group-hover:opacity-100 !transition-all">
-                            Switch <Icon icon="arrow-thin-right" size="xs" />
-                        </small>
-                    </Link>
-                )}
-                <Link to="https://ravendb.net/community" className="menu__link group">
-                    <Icon icon="community" size="xs" className="me-2" /> Community
-                    <Icon
-                        icon="newtab"
-                        size="xs"
-                        className="ms-auto opacity-0 group-hover:opacity-100 !transition-all"
-                    />
-                </Link>
+            <nav aria-label="Documentation sections" className="menu thin-scrollbar menu_Y1UP shrink-0 !grow-0">
+                {sectionNavItems.map((item) => (
+                    <SectionNavLink key={item.label} item={item} isActive={item.pathType === pathType} />
+                ))}
                 {pathType === PathType.Documentation && (
                     <Link to={`/${versionLabel}/whats-new`} className="menu__link">
                         <Icon icon="star-filled" size="xs" className="me-2" /> What's new
                     </Link>
                 )}
-            </div>
+            </nav>
             {shouldDisplayContent && <hr className="!my-0 !mx-3 !bg-black/10 dark:!bg-white/10" />}
             {pathType === PathType.Documentation && <SidebarVersionDropdown />}
             {shouldDisplayContent && <Content path={path} sidebar={sidebar} />}
diff --git a/src/theme/DocSidebar/Mobile/index.tsx b/src/theme/DocSidebar/Mobile/index.tsx
index 960568b237..853075e5fa 100644
--- a/src/theme/DocSidebar/Mobile/index.tsx
+++ b/src/theme/DocSidebar/Mobile/index.tsx
@@ -7,9 +7,10 @@ import type { Props } from "@theme/DocSidebar/Mobile";
 import Link from "@docusaurus/Link";
 import { useActiveDocContext, useLatestVersion } from "@docusaurus/plugin-content-docs/client";
 import { Icon } from "@site/src/components/Common/Icon";
+import { SectionNavLink } from "@site/src/components/Common/SectionNavLink";
 import type { Props as DocSidebarProps } from "@theme/DocSidebar";
 import SidebarVersionDropdown from "@site/src/components/SidebarVersionDropdown";
-import { getPathType, getLandingPagePath, PathType } from "../../../typescript/pathUtils";
+import { getPathType, getSectionNavItems, PathType } from "../../../typescript/pathUtils";
 
 function DocSidebarMobileSecondaryMenu({ sidebar, path }: DocSidebarProps) {
     const mobileSidebar = useNavbarMobileSidebar();
@@ -20,63 +21,21 @@ function DocSidebarMobileSecondaryMenu({ sidebar, path }: DocSidebarProps) {
     const versionLabel = activeVersion?.label ?? latestVersion.label;
 
     const pathType = getPathType(path);
-    const landingPagePath = getLandingPagePath(pathType, versionLabel);
+    const sectionNavItems = getSectionNavItems(pathType, versionLabel);
 
     const shouldDisplayContent = pathType !== PathType.Guides && pathType !== PathType.Samples;
 
     return (
         <ul className={clsx(ThemeClassNames.docs.docSidebarMenu, "menu__list")}>
-            <li className="menu__list-item">
-                <div className="menu__list-item-collapsible">
-                    <Link to={landingPagePath} className="menu__link" onClick={() => mobileSidebar.toggle()}>
-                        <Icon icon="home" size="xs" className="me-2" /> Start
-                    </Link>
-                </div>
-            </li>
-            {pathType !== PathType.Guides && (
-                <Link to="/guides" className="menu__link group">
-                    <Icon icon="guides" size="xs" className="me-2" /> Guides
-                    <small className="flex items-center ms-auto gap-1 text-[0.675rem]">
-                        Switch <Icon icon="arrow-thin-right" size="xs" />
-                    </small>
-                </Link>
-            )}
-            {pathType !== PathType.Documentation && (
-                <Link to={`/${versionLabel}`} className="menu__link group">
-                    <Icon icon="database" size="xs" className="me-2" /> RavenDB Docs
-                    <small className="flex items-center ms-auto gap-1 text-[0.675rem]">
-                        Switch <Icon icon="arrow-thin-right" size="xs" />
-                    </small>
-                </Link>
-            )}
-            {pathType !== PathType.Samples && (
-                <Link to="/samples" className="menu__link group">
-                    <Icon icon="create-sample-data" size="xs" className="me-2" /> Samples
-                    <small className="flex items-center ms-auto gap-1 text-[0.675rem]">
-                        Switch <Icon icon="arrow-thin-right" size="xs" />
-                    </small>
-                </Link>
-            )}
-            {pathType !== PathType.Cloud && (
-                <Link to="/cloud" className="menu__link group">
-                    <Icon icon="cloud" size="xs" className="me-2" /> RavenDB Cloud Docs
-                    <small className="flex items-center ms-auto gap-1 text-[0.675rem]">
-                        Switch <Icon icon="arrow-thin-right" size="xs" />
-                    </small>
-                </Link>
-            )}
-            {pathType !== PathType.Quill && (
-                <Link to="/quill" className="menu__link group">
-                    <Icon icon="sparkles" size="xs" className="me-2" /> Quill Docs
-                    <small className="flex items-center ms-auto gap-1 text-[0.675rem]">
-                        Switch <Icon icon="arrow-thin-right" size="xs" />
-                    </small>
-                </Link>
-            )}
-            <Link to="https://ravendb.net/community" className="menu__link group">
-                <Icon icon="community" size="xs" className="me-2" /> Community
-                <Icon icon="newtab" size="xs" className="ms-auto" />
-            </Link>
+            {sectionNavItems.map((item) => (
+                <li key={item.label} className="menu__list-item">
+                    <SectionNavLink
+                        item={item}
+                        isActive={item.pathType === pathType}
+                        onClick={() => mobileSidebar.toggle()}
+                    />
+                </li>
+            ))}
             {pathType === PathType.Documentation && (
                 <li className="menu__list-item">
                     <Link
diff --git a/src/typescript/pathUtils.ts b/src/typescript/pathUtils.ts
index 4e8d014511..c25d0b9e16 100644
--- a/src/typescript/pathUtils.ts
+++ b/src/typescript/pathUtils.ts
@@ -1,3 +1,5 @@
+import { IconName } from "./iconName";
+
 export const PathType = {
     Cloud: "CLOUD",
     Quill: "QUILL",
@@ -28,3 +30,44 @@ export function getLandingPagePath(pathType: PathTypeValue, versionLabel: string
     const section = SECTIONS.find((candidate) => candidate.type === pathType);
     return section ? `/${section.segment}` : `/${versionLabel}`;
 }
+
+export interface SectionNavItem {
+    label: string;
+    icon: IconName;
+    to: string;
+    pathType: PathTypeValue | null;
+    // Shown only while you are already inside it, for areas that are not public destinations.
+    currentOnly?: boolean;
+    external?: boolean;
+}
+
+const NAV_SECTIONS: readonly { type: PathTypeValue; label: string; icon: IconName; currentOnly?: boolean }[] = [
+    { type: PathType.Documentation, label: "RavenDB Docs", icon: "database" },
+    { type: PathType.Cloud, label: "RavenDB Cloud Docs", icon: "cloud" },
+    { type: PathType.Quill, label: "Quill Docs", icon: "quill" },
+    { type: PathType.Guides, label: "Guides", icon: "guides" },
+    { type: PathType.Samples, label: "Samples", icon: "create-sample-data" },
+    { type: PathType.Templates, label: "Templates", icon: "documentation-guide", currentOnly: true },
+];
+
+export function getSectionNavItems(pathType: PathTypeValue, versionLabel: string): SectionNavItem[] {
+    const sections = NAV_SECTIONS.filter((section) => !section.currentOnly || section.type === pathType).map(
+        (section) => ({
+            label: section.label,
+            icon: section.icon,
+            to: getLandingPagePath(section.type, versionLabel),
+            pathType: section.type,
+        })
+    );
+
+    return [
+        ...sections,
+        {
+            label: "Community",
+            icon: "community",
+            to: "https://ravendb.net/community",
+            pathType: null,
+            external: true,
+        },
+    ];
+}