diff --git a/apps/website/src/download-helper.ts b/apps/website/src/download-helper.ts
index 92cdec7b1..2b4af9ef6 100644
--- a/apps/website/src/download-helper.ts
+++ b/apps/website/src/download-helper.ts
@@ -127,7 +127,7 @@ export function getDownloadMatrix(t: TFunction<"translation", undefined>): Downl
             docker: {
                 title: t("download_helper_server_docker.title"),
                 description: t("download_helper_server_docker.description"),
-                helpUrl: "https://docs.triliumnotes.org/User%20Guide/User%20Guide/Installation%20%26%20Setup/Server%20Installation/1.%20Installing%20the%20server/Using%20Docker.html",
+                helpUrl: "https://docs.triliumnotes.org/user-guide/setup/server/installation/docker",
                 quickStartCode: "docker pull triliumnext/trilium\ndocker run -p 8080:8080 -d -v ./data:/home/node/trilium-data triliumnext/trilium",
                 downloads: {
                     dockerhub: {
@@ -143,7 +143,7 @@ export function getDownloadMatrix(t: TFunction<"translation", undefined>): Downl
             linux: {
                 title: t("download_helper_server_linux.title"),
                 description: t("download_helper_server_linux.description"),
-                helpUrl: "https://docs.triliumnotes.org/User%20Guide/User%20Guide/Installation%20%26%20Setup/Server%20Installation/1.%20Installing%20the%20server/Packaged%20version%20for%20Linux.html",
+                helpUrl: "https://docs.triliumnotes.org/user-guide/setup/server/installation/packaged-server",
                 downloads: {
                     tarX64: {
                         recommended: true,
@@ -157,7 +157,7 @@ export function getDownloadMatrix(t: TFunction<"translation", undefined>): Downl
                     },
                     nixos: {
                         name: t("download_helper_server_linux.download_nixos"),
-                        url: "https://docs.triliumnotes.org/User%20Guide/User%20Guide/Installation%20&%20Setup/Server%20Installation/1.%20Installing%20the%20server/On%20NixOS"
+                        url: "https://docs.triliumnotes.org/user-guide/setup/server/installation/nixos"
                     }
                 }
             },
diff --git a/apps/website/src/pages/Home/index.tsx b/apps/website/src/pages/Home/index.tsx
index b26d43621..fab19eebc 100644
--- a/apps/website/src/pages/Home/index.tsx
+++ b/apps/website/src/pages/Home/index.tsx
@@ -102,9 +102,9 @@ function OrganizationBenefitsSection() {
         <>
             <Section className="benefits" title={t("organization_benefits.title")}>
                 <div className="benefits-container grid-3-cols">
-                    <Card iconSvg={noteStructureIcon} title={t("organization_benefits.note_structure_title")} moreInfoUrl="https://docs.triliumnotes.org/User%20Guide/User%20Guide/Basic%20Concepts%20and%20Features/Notes/index.html">{t("organization_benefits.note_structure_description")}</Card>
-                    <Card iconSvg={attributesIcon} title={t("organization_benefits.attributes_title")} moreInfoUrl="https://docs.triliumnotes.org/User Guide/User Guide/Advanced Usage/Attributes/index.html">{t("organization_benefits.attributes_description")}</Card>
-                    <Card iconSvg={hoistingIcon} title={t("organization_benefits.hoisting_title")} moreInfoUrl="https://docs.triliumnotes.org/User%20Guide/User%20Guide/Basic%20Concepts%20and%20Features/Navigation/Note%20Hoisting.html">{t("organization_benefits.hoisting_description")}</Card>
+                    <Card iconSvg={noteStructureIcon} title={t("organization_benefits.note_structure_title")} moreInfoUrl="https://docs.triliumnotes.org/user-guide/concepts/notes">{t("organization_benefits.note_structure_description")}</Card>
+                    <Card iconSvg={attributesIcon} title={t("organization_benefits.attributes_title")} moreInfoUrl="https://docs.triliumnotes.org/user-guide/advanced-usage/attributes">{t("organization_benefits.attributes_description")}</Card>
+                    <Card iconSvg={hoistingIcon} title={t("organization_benefits.hoisting_title")} moreInfoUrl="https://docs.triliumnotes.org/user-guide/concepts/navigation/note-hoisting">{t("organization_benefits.hoisting_description")}</Card>
                 </div>
             </Section>
         </>
@@ -117,12 +117,12 @@ function ProductivityBenefitsSection() {
         <>
             <Section className="benefits accented" title={t("productivity_benefits.title")}>
                 <div className="benefits-container grid-3-cols">
-                    <Card iconSvg={revisionsIcon} title={t("productivity_benefits.revisions_title")} moreInfoUrl="https://docs.triliumnotes.org/User%20Guide/User%20Guide/Basic%20Concepts%20and%20Features/Notes/Note%20Revisions.html">{t("productivity_benefits.revisions_content")}</Card>
-                    <Card iconSvg={syncIcon} title={t("productivity_benefits.sync_title")} moreInfoUrl="https://docs.triliumnotes.org/User%20Guide/User%20Guide/Installation%20%26%20Setup/Synchronization.html">{t("productivity_benefits.sync_content")}</Card>
-                    <Card iconSvg={protectedNotesIcon} title={t("productivity_benefits.protected_notes_title")} moreInfoUrl="https://docs.triliumnotes.org/User%20Guide/User%20Guide/Basic%20Concepts%20and%20Features/Notes/Protected%20Notes.html">{t("productivity_benefits.protected_notes_content")}</Card>
-                    <Card iconSvg={jumpToIcon} title={t("productivity_benefits.jump_to_title")} moreInfoUrl="https://docs.triliumnotes.org/User%20Guide/User%20Guide/Basic%20Concepts%20and%20Features/Navigation/Jump%20to.html">{t("productivity_benefits.jump_to_content")}</Card>
-                    <Card iconSvg={searchIcon} title={t("productivity_benefits.search_title")} moreInfoUrl="https://docs.triliumnotes.org/User%20Guide/User%20Guide/Basic%20Concepts%20and%20Features/Navigation/Search.html">{t("productivity_benefits.search_content")}</Card>
-                    <Card iconSvg={webClipperIcon} title={t("productivity_benefits.web_clipper_title")} moreInfoUrl="https://docs.triliumnotes.org/User%20Guide/User%20Guide/Installation%20%26%20Setup/Web%20Clipper.html">{t("productivity_benefits.web_clipper_content")}</Card>
+                    <Card iconSvg={revisionsIcon} title={t("productivity_benefits.revisions_title")} moreInfoUrl="https://docs.triliumnotes.org/user-guide/concepts/notes/note-revisions">{t("productivity_benefits.revisions_content")}</Card>
+                    <Card iconSvg={syncIcon} title={t("productivity_benefits.sync_title")} moreInfoUrl="https://docs.triliumnotes.org/user-guide/setup/synchronization">{t("productivity_benefits.sync_content")}</Card>
+                    <Card iconSvg={protectedNotesIcon} title={t("productivity_benefits.protected_notes_title")} moreInfoUrl="https://docs.triliumnotes.org/user-guide/concepts/notes/protected-notes">{t("productivity_benefits.protected_notes_content")}</Card>
+                    <Card iconSvg={jumpToIcon} title={t("productivity_benefits.jump_to_title")} moreInfoUrl="https://docs.triliumnotes.org/user-guide/concepts/navigation/jump-to">{t("productivity_benefits.jump_to_content")}</Card>
+                    <Card iconSvg={searchIcon} title={t("productivity_benefits.search_title")} moreInfoUrl="https://docs.triliumnotes.org/user-guide/concepts/navigation/search">{t("productivity_benefits.search_content")}</Card>
+                    <Card iconSvg={webClipperIcon} title={t("productivity_benefits.web_clipper_title")} moreInfoUrl="docs.triliumnotes.org/user-guide/setup/web-clipper">{t("productivity_benefits.web_clipper_content")}</Card>
                 </div>
             </Section>
         </>
@@ -138,42 +138,42 @@ function NoteTypesSection() {
                     title: t("note_types.text_title"),
                     imageUrl: "/type_text.webp",
                     iconSvg: textNoteIcon,
-                    moreInfo: "https://docs.triliumnotes.org/User%20Guide/User%20Guide/Note%20Types/Text/index.html",
+                    moreInfo: "https://docs.triliumnotes.org/user-guide/note-types/text",
                     description: t("note_types.text_description")
                 },
                 {
                     title: t("note_types.code_title"),
                     imageUrl: "/type_code.webp",
                     iconSvg: codeIcon,
-                    moreInfo: "https://docs.triliumnotes.org/User%20Guide/User%20Guide/Note%20Types/Code.html",
+                    moreInfo: "https://docs.triliumnotes.org/user-guide/note-types/code",
                     description: t("note_types.code_description")
                 },
                 {
                     title: t("note_types.file_title"),
                     imageUrl: "/type_file.webp",
                     iconSvg: fileIcon,
-                    moreInfo: "https://docs.triliumnotes.org/User%20Guide/User%20Guide/Note%20Types/File.html",
+                    moreInfo: "https://docs.triliumnotes.org/user-guide/note-types/file",
                     description: t("note_types.file_description")
                 },
                 {
                     title: t("note_types.canvas_title"),
                     imageUrl: "/type_canvas.webp",
                     iconSvg: canvasIcon,
-                    moreInfo: "https://docs.triliumnotes.org/User%20Guide/User%20Guide/Note%20Types/Canvas.html",
+                    moreInfo: "https://docs.triliumnotes.org/user-guide/note-types/canvas",
                     description: t("note_types.canvas_description")
                 },
                 {
                     title: t("note_types.mermaid_title"),
                     imageUrl: "/type_mermaid.webp",
                     iconSvg: mermaidIcon,
-                    moreInfo: "https://docs.triliumnotes.org/User%20Guide/User%20Guide/Note%20Types/Mermaid%20Diagrams/index.html",
+                    moreInfo: "https://docs.triliumnotes.org/user-guide/note-types/mermaid-diagrams",
                     description: t("note_types.mermaid_description")
                 },
                 {
                     title: t("note_types.mindmap_title"),
                     imageUrl: "/type_mindmap.webp",
                     iconSvg: mindmapIcon,
-                    moreInfo: "https://docs.triliumnotes.org/User%20Guide/User%20Guide/Note%20Types/Mind%20Map.html",
+                    moreInfo: "https://docs.triliumnotes.org/user-guide/note-types/mindmap",
                     description: t("note_types.mindmap_description")
                 }
             ]} />
@@ -181,11 +181,11 @@ function NoteTypesSection() {
                 <Trans
                     i18nKey="note_types.others_list"
                     components={[
-                        <Link href="https://docs.triliumnotes.org/User%20Guide/User%20Guide/Note%20Types/Note%20Map.html" openExternally />,
-                        <Link href="https://docs.triliumnotes.org/User%20Guide/User%20Guide/Note%20Types/Relation%20Map.html" openExternally />,
-                        <Link href="https://docs.triliumnotes.org/User%20Guide/User%20Guide/Note%20Types/Saved%20Search.html" openExternally />,
-                        <Link href="https://docs.triliumnotes.org/User%20Guide/User%20Guide/Note%20Types/Render%20Note.html" openExternally />,
-                        <Link href="https://docs.triliumnotes.org/User%20Guide/User%20Guide/Note%20Types/Web%20View.html" openExternally />
+                        <Link href="https://docs.triliumnotes.org/user-guide/note-types/note-map" openExternally />,
+                        <Link href="https://docs.triliumnotes.org/user-guide/note-types/relation-map" openExternally />,
+                        <Link href="https://docs.triliumnotes.org/user-guide/note-types/saved-search" openExternally />,
+                        <Link href="https://docs.triliumnotes.org/user-guide/note-types/render-note" openExternally />,
+                        <Link href="https://docs.triliumnotes.org/user-guide/note-types/webview" openExternally />
                     ]}
                 />
             </p>
@@ -199,10 +199,10 @@ function ExtensibilityBenefitsSection() {
         <>
             <Section className="benefits accented" title={t("extensibility_benefits.title")}>
                 <div className="benefits-container grid-4-cols">
-                    <Card iconSvg={importExportIcon} title={t("extensibility_benefits.import_export_title")} moreInfoUrl="https://docs.triliumnotes.org/User%20Guide/User%20Guide/Basic%20Concepts%20and%20Features/Import%20%26%20Export/Markdown/index.html">{t("extensibility_benefits.import_export_description")}</Card>
-                    <Card iconSvg={shareIcon} title={t("extensibility_benefits.share_title")} moreInfoUrl="https://docs.triliumnotes.org/User%20Guide/User%20Guide/Advanced%20Usage/Sharing/Serving%20directly%20the%20content%20o.html">{t("extensibility_benefits.share_description")}</Card>
-                    <Card iconSvg={codeIcon} title={t("extensibility_benefits.scripting_title")} moreInfoUrl="https://docs.triliumnotes.org/User%20Guide/User%20Guide/Scripting/Custom%20Widgets/index.html">{t("extensibility_benefits.scripting_description")}</Card>
-                    <Card iconSvg={restApiIcon} title={t("extensibility_benefits.api_title")} moreInfoUrl="https://docs.triliumnotes.org/User%20Guide/User%20Guide/Advanced%20Usage/ETAPI%20%28REST%20API%29/index.html">{t("extensibility_benefits.api_description")}</Card>
+                    <Card iconSvg={importExportIcon} title={t("extensibility_benefits.import_export_title")} moreInfoUrl="https://docs.triliumnotes.org/user-guide/concepts/import-export">{t("extensibility_benefits.import_export_description")}</Card>
+                    <Card iconSvg={shareIcon} title={t("extensibility_benefits.share_title")} moreInfoUrl="https://docs.triliumnotes.org/user-guide/advanced-usage/sharing">{t("extensibility_benefits.share_description")}</Card>
+                    <Card iconSvg={codeIcon} title={t("extensibility_benefits.scripting_title")} moreInfoUrl="https://docs.triliumnotes.org/user-guide/scripts">{t("extensibility_benefits.scripting_description")}</Card>
+                    <Card iconSvg={restApiIcon} title={t("extensibility_benefits.api_title")} moreInfoUrl="https://docs.triliumnotes.org/user-guide/advanced-usage/etapi">{t("extensibility_benefits.api_description")}</Card>
                 </div>
             </Section>
         </>
@@ -218,35 +218,35 @@ function CollectionsSection() {
                     title: t("collections.calendar_title"),
                     imageUrl: "/collection_calendar.webp",
                     iconSvg: calendarIcon,
-                    moreInfo: "https://docs.triliumnotes.org/User%20Guide/User%20Guide/Note%20Types/Collections/Calendar%20View.html",
+                    moreInfo: "https://docs.triliumnotes.org/user-guide/collections/calendar",
                     description: t("collections.calendar_description")
                 },
                 {
                     title: t("collections.table_title"),
                     iconSvg: tableIcon,
                     imageUrl: "/collection_table.webp",
-                    moreInfo: "https://docs.triliumnotes.org/User%20Guide/User%20Guide/Note%20Types/Collections/Table%20View.html",
+                    moreInfo: "https://docs.triliumnotes.org/user-guide/collections/table",
                     description: t("collections.table_description")
                 },
                 {
                     title: t("collections.board_title"),
                     iconSvg: boardIcon,
                     imageUrl: "/collection_board.webp",
-                    moreInfo: "https://docs.triliumnotes.org/User%20Guide/User%20Guide/Note%20Types/Collections/Board%20View.html",
+                    moreInfo: "https://docs.triliumnotes.org/user-guide/collections/kanban-board",
                     description: t("collections.board_description")
                 },
                 {
                     title: t("collections.geomap_title"),
                     iconSvg: geomapIcon,
                     imageUrl: "/collection_geomap.webp",
-                    moreInfo: "https://docs.triliumnotes.org/User%20Guide/User%20Guide/Note%20Types/Collections/Geo%20Map%20View.html",
+                    moreInfo: "https://docs.triliumnotes.org/user-guide/collections/geomap",
                     description: t("collections.geomap_description")
                 },
                 {
                     title: t("collections.presentation_title"),
                     iconSvg: presentationIcon,
                     imageUrl: "/collection_presentation.webp",
-                    moreInfo: "https://docs.triliumnotes.org/User%20Guide/User%20Guide/Note%20Types/Collections/Presentation%20View.html",
+                    moreInfo: "https://docs.triliumnotes.org/user-guide/collections/presentation",
                     description: t("collections.presentation_description")
                 }
             ]} />