diff --git a/CHANGELOG.md b/CHANGELOG.md
index 810e37d1f..1945c24eb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,8 +26,39 @@
 
 -   TypeDoc now supports objects with multiple index signatures, #2470.
 
+### Bug Fixes
+
+-   Header anchor links in rendered markdown are now more consistent with headers generated by TypeDoc, #2546.
+-   Types rendered in the `Returns` header are now properly colored, #2546.
+-   Links added with the `navigationLinks` option are now moved into the pull out navigation on mobile displays, #2548.
+-   `@license` and `@import` comments will be ignored at the top of files, #2552.
+-   Fixed issue in documentation validation where constructor signatures where improperly considered not documented, #2553.
+
+### Thanks!
+
+-   @HarelM
+
 # Unreleased
 
+## v0.25.13 (2024-04-07)
+
+### Features
+
+-   Added `gitRevision:short` placeholder option to `--sourceLinkTemplate` option, #2529.
+    Links generated by TypeDoc will now default to using the non-short git revision.
+-   Moved "Generated by TypeDoc" footer into a `<footer>` tag, added `footer.begin` and `footer.end`
+    render hooks for use by custom plugins, #2532.
+
+### Bug Fixes
+
+-   Fixed conversion of `NoInfer` missing type parameter reference, #2539.
+-   Linking to a member on a page no longer incorrectly claims that
+    "This member is normally hidden due to your filter settings" for every member.
+
+### Thanks!
+
+-   @xuhdev
+
 ## v0.25.12 (2024-03-10)
 
 ### Features
diff --git a/internal-docs/third-party-symbols.md b/internal-docs/third-party-symbols.md
index 6d394489f..bf7a1caee 100644
--- a/internal-docs/third-party-symbols.md
+++ b/internal-docs/third-party-symbols.md
@@ -154,7 +154,7 @@ and, if the link was defined by the user, the [CommentDisplayPart] which was par
 
 If `--useTsLinkResolution` is on (the default), it may also be passed a [ReflectionSymbolId] referencing the symbol that TypeScript resolves the link to.
 
-[externalSymbolLinkMappings]: https://typedoc.org/guides/options/#externalsymbollinkmappings
+[externalSymbolLinkMappings]: https://typedoc.org/options/comments/#externalsymbollinkmappings
 [CommentDisplayPart]: https://typedoc.org/api/types/CommentDisplayPart.html
 [DeclarationReference]: https://typedoc.org/api/interfaces/DeclarationReference.html
 [ReflectionSymbolId]: https://typedoc.org/api/classes/Application.html
diff --git a/package-lock.json b/package-lock.json
index 471005f8e..cc774638e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "typedoc",
-  "version": "0.25.12",
+  "version": "0.25.13",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "typedoc",
-      "version": "0.25.12",
+      "version": "0.25.13",
       "license": "Apache-2.0",
       "dependencies": {
         "lunr": "^2.3.9",
@@ -59,262 +59,6 @@
         "node": ">=12"
       }
     },
-    "node_modules/@esbuild/aix-ppc64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.20.2.tgz",
-      "integrity": "sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "aix"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/android-arm": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.20.2.tgz",
-      "integrity": "sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/android-arm64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.20.2.tgz",
-      "integrity": "sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/android-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.20.2.tgz",
-      "integrity": "sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.20.2.tgz",
-      "integrity": "sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/darwin-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.20.2.tgz",
-      "integrity": "sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.2.tgz",
-      "integrity": "sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.20.2.tgz",
-      "integrity": "sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-arm": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.20.2.tgz",
-      "integrity": "sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-arm64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.20.2.tgz",
-      "integrity": "sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-ia32": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.20.2.tgz",
-      "integrity": "sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-loong64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.20.2.tgz",
-      "integrity": "sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==",
-      "cpu": [
-        "loong64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.20.2.tgz",
-      "integrity": "sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==",
-      "cpu": [
-        "mips64el"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.20.2.tgz",
-      "integrity": "sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.20.2.tgz",
-      "integrity": "sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==",
-      "cpu": [
-        "riscv64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-s390x": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.20.2.tgz",
-      "integrity": "sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==",
-      "cpu": [
-        "s390x"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
     "node_modules/@esbuild/linux-x64": {
       "version": "0.20.2",
       "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.2.tgz",
@@ -331,102 +75,6 @@
         "node": ">=12"
       }
     },
-    "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.20.2.tgz",
-      "integrity": "sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "netbsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.20.2.tgz",
-      "integrity": "sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "openbsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/sunos-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.20.2.tgz",
-      "integrity": "sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "sunos"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/win32-arm64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.20.2.tgz",
-      "integrity": "sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/win32-ia32": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.20.2.tgz",
-      "integrity": "sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/win32-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.20.2.tgz",
-      "integrity": "sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
     "node_modules/@eslint-community/eslint-utils": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
@@ -1880,20 +1528,6 @@
       "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
       "dev": true
     },
-    "node_modules/fsevents": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
-      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-      "dev": true,
-      "hasInstallScript": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
-    },
     "node_modules/get-caller-file": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
diff --git a/package.json b/package.json
index 624db7bfd..5e67749d6 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "typedoc",
   "description": "Create api documentation for TypeScript projects.",
-  "version": "0.25.12",
+  "version": "0.25.13",
   "homepage": "https://typedoc.org",
   "exports": {
     ".": "./dist/index.js",
diff --git a/scripts/testcase.js b/scripts/testcase.js
index b531d9529..8b53bda68 100644
--- a/scripts/testcase.js
+++ b/scripts/testcase.js
@@ -37,8 +37,8 @@ function guessExtension(code) {
 }
 
 async function main() {
-    if (process.argv.length !== 3) {
-        console.log("Usage: node scripts/testcase.js <issue number>");
+    if (process.argv.length !== 3 && process.argv.length !== 4) {
+        console.log("Usage: node scripts/testcase.js <issue number> [lang]");
         process.exit(1);
     }
 
@@ -62,7 +62,8 @@ async function main() {
         return;
     }
 
-    const file = `src/test/converter2/issues/gh${issue}${guessExtension(code)}`;
+    const ext = process.argv[3] ? `.${process.argv[3]}` : guessExtension(code);
+    const file = `src/test/converter2/issues/gh${issue}${ext}`;
     await writeFile(file, code.text);
     await exec(`code ${file} src/test/issues.c2.test.ts`);
 }
diff --git a/src/lib/converter/comments/discovery.ts b/src/lib/converter/comments/discovery.ts
index 1b638b670..e37a9b605 100644
--- a/src/lib/converter/comments/discovery.ts
+++ b/src/lib/converter/comments/discovery.ts
@@ -110,7 +110,7 @@ export interface DiscoveredComment {
     jsDoc: ts.JSDoc | undefined;
 }
 
-export function discoverFileComment(
+export function discoverFileComments(
     node: ts.SourceFile,
     commentStyle: CommentStyle,
 ) {
@@ -120,17 +120,17 @@ export function discoverFileComment(
         ts.getLeadingCommentRanges(text, node.pos),
     );
 
-    const selectedDocComment = comments.find((ranges) =>
+    const selectedDocComments = comments.filter((ranges) =>
         permittedRange(text, ranges, commentStyle),
     );
 
-    if (selectedDocComment) {
+    return selectedDocComments.map((ranges) => {
         return {
             file: node,
-            ranges: selectedDocComment,
-            jsDoc: findJsDocForComment(node, selectedDocComment),
+            ranges,
+            jsDoc: findJsDocForComment(node, ranges),
         };
-    }
+    });
 }
 
 export function discoverNodeComment(
diff --git a/src/lib/converter/comments/index.ts b/src/lib/converter/comments/index.ts
index 53f552186..59595953f 100644
--- a/src/lib/converter/comments/index.ts
+++ b/src/lib/converter/comments/index.ts
@@ -9,7 +9,7 @@ import { lexBlockComment } from "./blockLexer";
 import {
     type DiscoveredComment,
     discoverComment,
-    discoverFileComment,
+    discoverFileComments,
     discoverNodeComment,
     discoverSignatureComment,
 } from "./discovery";
@@ -143,8 +143,12 @@ export function getComment(
         );
     }
 
+    const sf = declarations.find(ts.isSourceFile);
+    if (sf) {
+        return getFileComment(sf, config, logger, commentStyle, checker);
+    }
+
     const isModule = declarations.some((decl) => {
-        if (ts.isSourceFile(decl)) return true;
         if (ts.isModuleDeclaration(decl) && ts.isStringLiteral(decl.name)) {
             return true;
         }
@@ -196,13 +200,26 @@ export function getFileComment(
     commentStyle: CommentStyle,
     checker: ts.TypeChecker | undefined,
 ): Comment | undefined {
-    return getCommentImpl(
-        discoverFileComment(file, commentStyle),
-        config,
-        logger,
-        /* moduleComment */ true,
-        checker,
-    );
+    for (const commentSource of discoverFileComments(file, commentStyle)) {
+        const comment = getCommentWithCache(
+            commentSource,
+            config,
+            logger,
+            checker,
+        );
+
+        if (comment?.getTag("@license") || comment?.getTag("@import")) {
+            continue;
+        }
+
+        if (
+            comment?.getTag("@module") ||
+            comment?.hasModifier("@packageDocumentation")
+        ) {
+            return comment;
+        }
+        return;
+    }
 }
 
 function getConstructorParamPropertyComment(
diff --git a/src/lib/converter/types.ts b/src/lib/converter/types.ts
index e136bd343..1360c137e 100644
--- a/src/lib/converter/types.ts
+++ b/src/lib/converter/types.ts
@@ -698,7 +698,7 @@ const queryConverter: TypeConverter<ts.TypeQueryNode> = {
 
 const referenceConverter: TypeConverter<
     ts.TypeReferenceNode,
-    ts.TypeReference | ts.StringMappingType
+    ts.TypeReference | ts.StringMappingType | ts.SubstitutionType
 > = {
     kind: [ts.SyntaxKind.TypeReference],
     convert(context, node) {
@@ -748,7 +748,12 @@ const referenceConverter: TypeConverter<
             context.resolveAliasedSymbol(symbol),
             context,
         );
-        if (type.flags & ts.TypeFlags.StringMapping) {
+        if (type.flags & ts.TypeFlags.Substitution) {
+            // NoInfer<T>
+            ref.typeArguments = [
+                convertType(context, (type as ts.SubstitutionType).baseType),
+            ];
+        } else if (type.flags & ts.TypeFlags.StringMapping) {
             ref.typeArguments = [
                 convertType(context, (type as ts.StringMappingType).type),
             ];
diff --git a/src/lib/converter/utils/repository.ts b/src/lib/converter/utils/repository.ts
index 408268821..eefd289ac 100644
--- a/src/lib/converter/utils/repository.ts
+++ b/src/lib/converter/utils/repository.ts
@@ -32,12 +32,13 @@ export class AssumedRepository implements Repository {
     getURL(fileName: string, line: number): string | undefined {
         const replacements = {
             gitRevision: this.gitRevision,
+            "gitRevision:short": this.gitRevision.substring(0, 8),
             path: fileName.substring(this.path.length + 1),
             line,
         };
 
         return this.sourceLinkTemplate.replace(
-            /\{(gitRevision|path|line)\}/g,
+            /\{(gitRevision|gitRevision:short|path|line)\}/g,
             (_, key) => replacements[key as never],
         );
     }
@@ -93,12 +94,13 @@ export class GitRepository implements Repository {
 
         const replacements = {
             gitRevision: this.gitRevision,
+            "gitRevision:short": this.gitRevision.substring(0, 8),
             path: fileName.substring(this.path.length + 1),
             line,
         };
 
         return this.urlTemplate.replace(
-            /\{(gitRevision|path|line)\}/g,
+            /\{(gitRevision|gitRevision:short|path|line)\}/g,
             (_, key) => replacements[key as never],
         );
     }
@@ -122,13 +124,7 @@ export class GitRepository implements Repository {
         const topLevel = git("-C", path, "rev-parse", "--show-toplevel");
         if (topLevel.status !== 0) return;
 
-        gitRevision ||= git(
-            "-C",
-            path,
-            "rev-parse",
-            "--short",
-            "HEAD",
-        ).stdout.trim();
+        gitRevision ||= git("-C", path, "rev-parse", "HEAD").stdout.trim();
         if (!gitRevision) return; // Will only happen in a repo with no commits.
 
         let urlTemplate: string | undefined;
diff --git a/src/lib/output/renderer.ts b/src/lib/output/renderer.ts
index 215401cb2..0a09e2e2a 100644
--- a/src/lib/output/renderer.ts
+++ b/src/lib/output/renderer.ts
@@ -81,6 +81,16 @@ export interface RendererHooks {
      * Applied immediately after calling `context.pageSidebar`.
      */
     "pageSidebar.end": [DefaultThemeRenderContext];
+
+    /**
+     * Applied immediately before the "Generated by TypeDoc" link in the footer.
+     */
+    "footer.begin": [DefaultThemeRenderContext];
+
+    /**
+     * Applied immediately after the "Generated by TypeDoc" link in the footer.
+     */
+    "footer.end": [DefaultThemeRenderContext];
 }
 
 /**
diff --git a/src/lib/output/themes/MarkedPlugin.tsx b/src/lib/output/themes/MarkedPlugin.tsx
index d15c00c79..d5dcdee34 100644
--- a/src/lib/output/themes/MarkedPlugin.tsx
+++ b/src/lib/output/themes/MarkedPlugin.tsx
@@ -4,12 +4,14 @@ import markdown from "markdown-it";
 
 import { Component, ContextAwareRendererComponent } from "../components";
 import { type RendererEvent, MarkdownEvent, type PageEvent } from "../events";
-import { Option, readFile, copySync, isFile, type Logger } from "../../utils";
+import { Option, readFile, copySync, isFile, type Logger, renderElement } from "../../utils";
 import { highlight, isSupportedLanguage } from "../../utils/highlighter";
 import type { BundledTheme } from "shiki" with { "resolution-mode": "import" };
 import { escapeHtml, getTextContent } from "../../utils/html";
 import type { DefaultTheme } from "..";
 import { Slugger } from "./default/DefaultTheme";
+import { anchorIcon } from "./default/partials/anchor-icon";
+import type { DefaultThemeRenderContext } from "..";
 
 let defaultSlugger: Slugger | undefined;
 function getDefaultSlugger(logger: Logger) {
@@ -40,6 +42,13 @@ export class MarkedPlugin extends ContextAwareRendererComponent {
 
     private parser?: MarkdownIt;
 
+    /**
+     * This needing to be here really feels hacky... probably some nicer way to do this.
+     * Revisit when adding support for arbitrary pages.
+     */
+    private renderContext: DefaultThemeRenderContext = null!;
+    private lastHeaderSlug = "";
+
     /**
      * The path referenced files are located in.
      */
@@ -97,7 +106,9 @@ export class MarkedPlugin extends ContextAwareRendererComponent {
      * @param text  The markdown string that should be parsed.
      * @returns The resulting html string.
      */
-    public parseMarkdown(text: string, page: PageEvent<any>) {
+    public parseMarkdown(text: string, page: PageEvent<any>, context: DefaultThemeRenderContext) {
+        this.renderContext = context;
+
         if (this.includes) {
             text = text.replace(this.includePattern, (_match, path) => {
                 path = Path.join(this.includes!, path.trim());
@@ -129,6 +140,7 @@ export class MarkedPlugin extends ContextAwareRendererComponent {
         const event = new MarkdownEvent(MarkdownEvent.PARSE, page, text, text);
 
         this.owner.trigger(event);
+        this.renderContext = null!;
         return event.parsedText;
     }
 
@@ -201,6 +213,8 @@ export class MarkedPlugin extends ContextAwareRendererComponent {
             const level = token.markup.length;
 
             const slug = this.getSlugger().slug(content);
+            this.lastHeaderSlug = slug;
+
             // Prefix the slug with an extra `md:` to prevent conflicts with TypeDoc's anchors.
             this.page!.pageHeadings.push({
                 link: `#md:${slug}`,
@@ -208,10 +222,10 @@ export class MarkedPlugin extends ContextAwareRendererComponent {
                 level,
             });
 
-            return `<a id="md:${slug}" class="tsd-anchor"></a><${token.tag}><a href="#md:${slug}">`;
+            return `<a id="md:${slug}" class="tsd-anchor"></a><${token.tag}>`;
         };
         this.parser.renderer.rules["heading_close"] = (tokens, idx) => {
-            return `</a></${tokens[idx].tag}>`;
+            return `${renderElement(anchorIcon(this.renderContext, `md:${this.lastHeaderSlug}`))}</${tokens[idx].tag}>`;
         };
 
         // Rewrite anchor links inline in a readme file to links targeting the `md:` prefixed anchors
diff --git a/src/lib/output/themes/default/DefaultThemeRenderContext.ts b/src/lib/output/themes/default/DefaultThemeRenderContext.ts
index 578568bb4..da12a998a 100644
--- a/src/lib/output/themes/default/DefaultThemeRenderContext.ts
+++ b/src/lib/output/themes/default/DefaultThemeRenderContext.ts
@@ -23,7 +23,7 @@ import {
 import { footer } from "./partials/footer";
 import { header } from "./partials/header";
 import { hierarchy } from "./partials/hierarchy";
-import { buildRefIcons, icons } from "./partials/icon";
+import { buildRefIcons, type icons } from "./partials/icon";
 import { member } from "./partials/member";
 import { memberDeclaration } from "./partials/member.declaration";
 import { memberGetterSetter } from "./partials/member.getterSetter";
@@ -70,8 +70,7 @@ export class DefaultThemeRenderContext {
         this.options = options;
         this.internationalization = theme.application.internationalization;
         this.i18n = this.internationalization.proxy;
-
-        this._refIcons = buildRefIcons(icons, this);
+        this._refIcons = buildRefIcons(theme.icons, this);
     }
 
     /**
@@ -107,9 +106,12 @@ export class DefaultThemeRenderContext {
             return this.theme.markedPlugin.parseMarkdown(
                 Comment.displayPartsToMarkdown(md, this.urlTo, false), // GERRIT come back here
                 this.page,
+                this,
             );
         }
-        return md ? this.theme.markedPlugin.parseMarkdown(md, this.page) : "";
+        return md
+            ? this.theme.markedPlugin.parseMarkdown(md, this.page, this)
+            : "";
     };
 
     getNavigation = () => this.theme.getNavigation(this.page.project);
diff --git a/src/lib/output/themes/default/assets/typedoc/Application.ts b/src/lib/output/themes/default/assets/typedoc/Application.ts
index 4d1e4a1d8..0406e1d27 100644
--- a/src/lib/output/themes/default/assets/typedoc/Application.ts
+++ b/src/lib/output/themes/default/assets/typedoc/Application.ts
@@ -42,8 +42,9 @@ export class Application {
         // We're on a *really* slow network connection and the inline JS
         // has already made the page display.
         if (!document.body.style.display) {
-            this.scrollToHash();
+            this.ensureFocusedElementVisible();
             this.updateIndexVisibility();
+            this.scrollToHash();
         }
     }
 
@@ -67,15 +68,18 @@ export class Application {
 
     public showPage() {
         if (!document.body.style.display) return;
+        console.log("Show page");
         document.body.style.removeProperty("display");
-        this.scrollToHash();
+        this.ensureFocusedElementVisible();
         this.updateIndexVisibility();
+        this.scrollToHash();
     }
 
     public scrollToHash() {
         // Because we hid the entire page until the navigation loaded or we hit a timeout,
         // we have to manually resolve the url hash here.
         if (location.hash) {
+            console.log("Scorlling");
             const reflAnchor = document.getElementById(
                 location.hash.substring(1),
             );
diff --git a/src/lib/output/themes/default/partials/footer.tsx b/src/lib/output/themes/default/partials/footer.tsx
index 0be9a80c7..07dcee7f0 100644
--- a/src/lib/output/themes/default/partials/footer.tsx
+++ b/src/lib/output/themes/default/partials/footer.tsx
@@ -11,12 +11,12 @@ export function footer(context: DefaultThemeRenderContext) {
     const index = message.indexOf("TypeDoc");
     let display: JSX.Element;
     if (index == -1) {
-        display = <p>{message}</p>;
+        display = <p class="tsd-generator">{message}</p>;
     } else {
         const pre = message.substring(0, index);
         const post = message.substring(index + "TypeDoc".length);
         display = (
-            <p>
+            <p class="tsd-generator">
                 {pre}
                 <a href="https://typedoc.org/" target="_blank">
                     TypeDoc
@@ -26,5 +26,11 @@ export function footer(context: DefaultThemeRenderContext) {
         );
     }
 
-    return <div class="tsd-generator">{display}</div>;
+    return (
+        <footer>
+            {context.hook("footer.begin")}
+            {hideGenerator || display}
+            {context.hook("footer.end")}
+        </footer>
+    );
 }
diff --git a/src/lib/output/themes/default/partials/hierarchy.tsx b/src/lib/output/themes/default/partials/hierarchy.tsx
index 6c01ffe95..5d13d14fa 100644
--- a/src/lib/output/themes/default/partials/hierarchy.tsx
+++ b/src/lib/output/themes/default/partials/hierarchy.tsx
@@ -22,7 +22,7 @@ export function hierarchy(context: DefaultThemeRenderContext, props: Declaration
         <>
             {" "}
             (
-            <a class="link" href={context.relativeURL("hierarchy.html") + "#" + context.page.model.getFullName()}>
+            <a href={context.relativeURL("hierarchy.html") + "#" + context.page.model.getFullName()}>
                 {context.i18n.theme_hierarchy_view_full()}
             </a>
             )
diff --git a/src/lib/output/themes/default/partials/navigation.tsx b/src/lib/output/themes/default/partials/navigation.tsx
index b806a2246..38c8c2f55 100644
--- a/src/lib/output/themes/default/partials/navigation.tsx
+++ b/src/lib/output/themes/default/partials/navigation.tsx
@@ -27,12 +27,19 @@ function buildFilterItem(context: DefaultThemeRenderContext, name: string, displ
 
 export function sidebarLinks(context: DefaultThemeRenderContext) {
     const links = Object.entries(context.options.getValue("sidebarLinks"));
-    if (!links.length) return null;
+    const navLinks = Object.entries(context.options.getValue("navigationLinks"));
+
+    if (!links.length && !navLinks.length) return null;
     return (
         <nav id="tsd-sidebar-links" class="tsd-navigation">
             {links.map(([label, url]) => (
                 <a href={url}>{label}</a>
             ))}
+            {navLinks.map(([label, url]) => (
+                <a href={url} class="tsd-nav-link">
+                    {label}
+                </a>
+            ))}
         </nav>
     );
 }
diff --git a/src/lib/utils/options/tsdoc-defaults.ts b/src/lib/utils/options/tsdoc-defaults.ts
index 9ae30e874..c09ba21cf 100644
--- a/src/lib/utils/options/tsdoc-defaults.ts
+++ b/src/lib/utils/options/tsdoc-defaults.ts
@@ -28,6 +28,8 @@ export const blockTags = [
     "@prop",
     "@property",
     "@satisfies",
+    "@license",
+    "@import",
 ] as const;
 
 export const tsdocInlineTags = ["@link", "@inheritDoc", "@label"] as const;
diff --git a/src/lib/validation/documentation.ts b/src/lib/validation/documentation.ts
index f0e375c8c..dcf3bdb8e 100644
--- a/src/lib/validation/documentation.ts
+++ b/src/lib/validation/documentation.ts
@@ -71,6 +71,15 @@ export function validateDocumentation(
             continue;
         }
 
+        // Call signatures are considered documented if they are directly within a documented type alias.
+        if (
+            ref.kindOf(ReflectionKind.ConstructorSignature) &&
+            ref.parent?.parent?.kindOf(ReflectionKind.TypeAlias)
+        ) {
+            toProcess.push(ref.parent.parent);
+            continue;
+        }
+
         if (ref instanceof DeclarationReflection) {
             const signatures =
                 ref.type instanceof ReflectionType
diff --git a/src/test/Repository.test.ts b/src/test/Repository.test.ts
index c68821fd0..e62d95383 100644
--- a/src/test/Repository.test.ts
+++ b/src/test/Repository.test.ts
@@ -1,5 +1,13 @@
-import { guessSourceUrlTemplate } from "../lib/converter/utils/repository";
-import { strictEqual as equal } from "assert";
+import {
+    GitRepository,
+    guessSourceUrlTemplate,
+} from "../lib/converter/utils/repository";
+import { strictEqual as equal, ok } from "assert";
+import { tempdirProject } from "@typestrong/fs-fixture-builder";
+import { spawnSync } from "child_process";
+import { TestLogger } from "./TestLogger";
+import { join } from "path";
+import { normalizePath } from "../lib/utils/paths";
 
 describe("Repository", function () {
     describe("guessSourceUrlTemplate helper", () => {
@@ -99,4 +107,56 @@ describe("Repository", function () {
             equal(guessSourceUrlTemplate(mockRemotes), undefined);
         });
     });
+
+    describe("getURL", () => {
+        const project = tempdirProject();
+        function git(...args: string[]) {
+            const env = {
+                GIT_AUTHOR_NAME: "test",
+                GIT_AUTHOR_EMAIL: "test@example.com",
+                GIT_AUTHOR_DATE: "2024-03-31T22:04:50.119Z",
+                GIT_COMMITTER_NAME: "test",
+                GIT_COMMITTER_EMAIL: "test@example.com",
+                GIT_COMMITTER_DATE: "2024-03-31T22:04:50.119Z",
+            };
+            return spawnSync("git", ["-C", project.cwd, ...args], {
+                encoding: "utf-8",
+                windowsHide: true,
+                env,
+            });
+        }
+
+        afterEach(() => {
+            project.rm();
+        });
+
+        it("Handles replacements", function () {
+            project.addFile("test.js", "console.log('hi!')");
+            project.write();
+
+            git("init", "-b", "test");
+            git("add", ".");
+            git("commit", "-m", "Test commit");
+            git(
+                "remote",
+                "add",
+                "origin",
+                "git@github.com:TypeStrong/typedoc.git",
+            );
+
+            const repo = GitRepository.tryCreateRepository(
+                project.cwd,
+                "{gitRevision}/{gitRevision:short}/{path}/{line}",
+                "", // revision, empty to get from repo
+                "origin", // remote
+                new TestLogger(),
+            );
+
+            ok(repo);
+            equal(
+                repo.getURL(normalizePath(join(project.cwd, "test.js")), 1),
+                "b53cc55bcdd9bc5920787a1d4a4a15fa24123b04/b53cc55b/test.js/1",
+            );
+        });
+    });
 });
diff --git a/src/test/behavior.c2.test.ts b/src/test/behavior.c2.test.ts
index bfb222011..8471ae621 100644
--- a/src/test/behavior.c2.test.ts
+++ b/src/test/behavior.c2.test.ts
@@ -1192,7 +1192,7 @@ describe("Behavior Tests", () => {
         const sig = querySig(project, "createStreetLight");
         equal(sig.parameters?.length, 2);
         equal(sig.parameters[0].type?.toString(), "C[]");
-        equal(sig.parameters[1].type?.toString(), "NoInfer");
+        equal(sig.parameters[1].type?.toString(), "NoInfer<C>");
     });
 
     it("Handles inferred predicate functions from TS 5.5", () => {
diff --git a/src/test/converter2/issues/gh2552.js b/src/test/converter2/issues/gh2552.js
new file mode 100644
index 000000000..18af18ab5
--- /dev/null
+++ b/src/test/converter2/issues/gh2552.js
@@ -0,0 +1,16 @@
+/**
+ * Summary
+ * @license MIT
+ *
+ * Full permission notice.
+ */
+
+// TS 5.5 @import comments
+/** @import * as ts from "typescript" */
+
+/**
+ * This is an awesome module.
+ * @module good-module
+ */
+
+export function goodFunction() {}
diff --git a/src/test/converter2/issues/gh2553.ts b/src/test/converter2/issues/gh2553.ts
new file mode 100644
index 000000000..892454b11
--- /dev/null
+++ b/src/test/converter2/issues/gh2553.ts
@@ -0,0 +1,16 @@
+/**
+ * Constructor.
+ *
+ * @param args - Constructor arguments.
+ * @returns New instance.
+ */
+export type Constructor = new (...args: any[]) => object;
+
+/**
+ * Typed constructor.
+ *
+ * @typeParam T - Class type.
+ * @param args - Constructor arguments.
+ * @returns New instance.
+ */
+export type TypedConstructor<T> = new (...args: any[]) => T;
diff --git a/src/test/issues.c2.test.ts b/src/test/issues.c2.test.ts
index 6f11f5163..61355d5c6 100644
--- a/src/test/issues.c2.test.ts
+++ b/src/test/issues.c2.test.ts
@@ -1463,4 +1463,18 @@ describe("Issue Tests", () => {
         equal(cb2.type?.type, "reflection");
         equal(cb2.type.declaration.signatures![0].comment, undefined);
     });
+
+    it("Ignores @license and @import comments at the top of the file, #2552", () => {
+        const project = convert();
+        equal(
+            Comment.combineDisplayParts(project.comment?.summary),
+            "This is an awesome module.",
+        );
+    });
+
+    it("Does not warn about documented constructor signature type aliases, #2553", () => {
+        const project = convert();
+        app.validate(project);
+        logger.expectNoOtherMessages();
+    });
 });
diff --git a/static/style.css b/static/style.css
index 072daed85..da5e73a66 100644
--- a/static/style.css
+++ b/static/style.css
@@ -266,16 +266,6 @@ h6 {
     line-height: 1.2;
 }
 
-h1 > a:not(.link),
-h2 > a:not(.link),
-h3 > a:not(.link),
-h4 > a:not(.link),
-h5 > a:not(.link),
-h6 > a:not(.link) {
-    text-decoration: none;
-    color: var(--color-text);
-}
-
 h1 {
     font-size: 1.875rem;
     margin: 0.67rem 0;
@@ -327,17 +317,14 @@ dd {
 }
 
 /* Footer */
-.tsd-generator {
+footer {
     border-top: 1px solid var(--color-accent);
     padding-top: 1rem;
     padding-bottom: 1rem;
     max-height: 3.5rem;
 }
-
-.tsd-generator > p {
-    margin-top: 0;
-    margin-bottom: 0;
-    padding: 0 1rem;
+.tsd-generator {
+    margin: 0 1em;
 }
 
 .container-main {
@@ -424,6 +411,9 @@ a.external[target="_blank"] {
     background-repeat: no-repeat;
     padding-right: 13px;
 }
+a.tsd-anchor-link {
+    color: var(--color-text);
+}
 
 code,
 pre {
@@ -772,6 +762,9 @@ input[type="checkbox"]:checked ~ svg .tsd-checkbox-checkmark {
     padding: 0;
     max-width: 100%;
 }
+.tsd-navigation .tsd-nav-link {
+    display: none;
+}
 .tsd-nested-navigation {
     margin-left: 3rem;
 }
@@ -1350,6 +1343,12 @@ img {
     .has-menu .tsd-navigation {
         max-height: 100%;
     }
+    #tsd-toolbar-links {
+        display: none;
+    }
+    .tsd-navigation .tsd-nav-link {
+        display: flex;
+    }
 }
 
 /* one sidebar */
diff --git a/tsdoc.json b/tsdoc.json
index 5e5590ec3..977281fbe 100644
--- a/tsdoc.json
+++ b/tsdoc.json
@@ -1,5 +1,6 @@
 {
     "$schema": "https://developer.microsoft.com/json-schemas/tsdoc/v0/tsdoc.schema.json",
+    // If updating this, also update tsdoc-defaults.ts
     "noStandardTags": false,
     "tagDefinitions": [
         {
@@ -93,6 +94,14 @@
             "tagName": "@satisfies",
             "syntaxKind": "block"
         },
+        {
+            "tagName": "@license",
+            "syntaxKind": "block"
+        },
+        {
+            "tagName": "@import",
+            "syntaxKind": "block"
+        },
         {
             "tagName": "@overload",
             "syntaxKind": "modifier"