diff --git a/.openpublishing.redirection.core.json b/.openpublishing.redirection.core.json
index 225cad1072d97..285c5abb30a31 100644
--- a/.openpublishing.redirection.core.json
+++ b/.openpublishing.redirection.core.json
@@ -1707,6 +1707,10 @@
       "source_path_from_root": "/docs/core/tools/csproj.md",
       "redirect_url": "/dotnet/core/project-sdk/msbuild-props"
     },
+    {
+      "source_path_from_root": "/docs/core/tools/custom-templates.md",
+      "redirect_url": "/dotnet/core/tools/templates"
+    },
     {
       "source_path_from_root": "/docs/core/tools/dotnet-add-package.md",
       "redirect_url": "/dotnet/core/tools/dotnet-package-add"
diff --git a/docs/core/tools/custom-templates.md b/docs/core/tools/custom-templates.md
deleted file mode 100644
index 8d9b73a116d18..0000000000000
--- a/docs/core/tools/custom-templates.md
+++ /dev/null
@@ -1,325 +0,0 @@
----
-title: Custom templates for dotnet new
-description: Learn about custom templates for any type of .NET project or files.
-author: adegeo
-ms.date: 05/20/2020
----
-
-# Custom templates for dotnet new
-
-The [.NET SDK](https://dotnet.microsoft.com/download) comes with many templates already installed and ready for you to use. The [`dotnet new` command](dotnet-new.md) isn't only the way to use a template, but also how to install and uninstall templates. You can create your own custom templates for any type of project, such as an app, service, tool, or class library. You can even create a template that outputs one or more independent files, such as a configuration file.
-
-You can install custom templates from a NuGet package on any NuGet feed, by referencing a NuGet *.nupkg* file directly, or by specifying a file system directory that contains the template. The template engine offers features that allow you to replace values, include and exclude files, and execute custom processing operations when your template is used.
-
-The template engine is open source, and the online code repository is at [dotnet/templating](https://github.com/dotnet/templating/) on GitHub. More templates, including templates from third parties, can be found using [`dotnet new search`](dotnet-new-search.md). For more information about creating and using custom templates, see [How to create your own templates for dotnet new](https://devblogs.microsoft.com/dotnet/how-to-create-your-own-templates-for-dotnet-new/) and the [dotnet/templating GitHub repo Wiki](https://github.com/dotnet/templating/wiki).
-
-> [!NOTE]
-> Template examples are available at the [dotnet/templating](https://aka.ms/template-samples) GitHub repository.
-
-To follow a walkthrough and create a template, see the [Create a custom template for dotnet new](../tutorials/cli-templates-create-item-template.md) tutorial.
-
-## .NET default templates
-
-When you install the [.NET SDK](https://dotnet.microsoft.com/download), you receive over a dozen built-in templates for creating projects and files, including console apps, class libraries, unit test projects, ASP.NET Core apps (including [Angular](https://angular.io/) and [React](https://reactjs.org/) projects), and configuration files. To list the built-in templates, run the `dotnet new list` command:
-
-```dotnetcli
-dotnet new list
-```
-
-## Configuration
-
-A template is composed of the following parts:
-
-- Source files and folders.
-- A configuration file (*template.json*).
-
-### Source files and folders
-
-The source files and folders include whatever files and folders you want the template engine to use when the `dotnet new <TEMPLATE>` command is run. The template engine is designed to use *runnable projects* as source code to produce projects. This has several benefits:
-
-- The template engine doesn't require you to inject special tokens into your project's source code.
-- The code files aren't special files or modified in any way to work with the template engine. So, the tools you normally use when working with projects also work with template content.
-- You build, run, and debug your template projects just like you do for any of your other projects.
-- You can quickly create a template from an existing project just by adding a *./.template.config/template.json* configuration file to the project.
-
-Files and folders stored in the template aren't limited to formal .NET project types. Source files and folders may consist of any content that you wish to create when the template is used, even if the template engine produces just one file as its output.
-
-Files generated by the template can be modified based on logic and settings you've provided in the *template.json* configuration file. The user can override these settings by passing options to the `dotnet new <TEMPLATE>` command. A common example of custom logic is providing a name for a class or variable in the code file that's deployed by a template.
-
-### template.json
-
-The *template.json* file is placed in a *.template.config* folder in the root directory of the template. The file provides configuration information to the template engine. The minimum configuration requires the members shown in the following table, which is sufficient to create a functional template.
-
-| Member            | Type          | Description |
-| ----------------- | ------------- | ----------- |
-| `$schema`         | URI           | The JSON schema for the *template.json* file. Editors that support JSON schemas enable JSON-editing features when the schema is specified. For example, [Visual Studio Code](https://code.visualstudio.com/) requires this member to enable IntelliSense. Use a value of `https://json.schemastore.org/template`. |
-| `author`          | string        | The author of the template. |
-| `classifications` | array(string) | Zero or more characteristics of the template that a user might use to find the template when searching for it. The classifications also appear in the *Tags* column when it appears in a list of templates produced by using the `dotnet new list` command. |
-| `identity`        | string        | A unique name for this template. |
-| `name`            | string        | The name for the template that users should see. |
-| `shortName`       | string        | A default shorthand name for selecting the template that applies to environments where the template name is specified by the user, not selected via a GUI. For example, the short name is useful when using templates from a command prompt with CLI commands. |
-| `sourceName`       | string        | The name in the source tree to replace with the name the user specifies. The template engine will look for any occurrence of the `sourceName` mentioned in the config file and replace it in file names and file contents. The value to be replaced with can be given using the `-n` or `--name` options while running a template. If no name is specified, the current directory is used.|
-| `preferNameDirectory`       | Boolean        | Indicates whether to create a directory for the template if name is specified but an output directory isn't set (instead of creating the content directly in the current directory). The default value is false.|
-
-The full schema for the *template.json* file is found at the [JSON Schema Store](https://www.schemastore.org). For more information about the *template.json* file, see the [dotnet templating wiki](https://github.com/dotnet/templating/wiki). For deeper examples and information on how to make your templates visible in Visual Studio, check out the [resources that Sayed Hashimi has created](https://github.com/sayedihashimi/template-sample).
-
-#### Example
-
-For example, here's a template folder that contains two content files: *console.cs* and *readme.txt*. There's also the required folder named *.template.config* that contains the *template.json* file.
-
-```text
-└───mytemplate
-    │   console.cs
-    │   readme.txt
-    │
-    └───.template.config
-            template.json
-```
-
-The *template.json* file looks like the following:
-
-```json
-{
-  "$schema": "https://json.schemastore.org/template",
-  "author": "Travis Chau",
-  "classifications": [ "Common", "Console" ],
-  "identity": "AdatumCorporation.ConsoleTemplate.CSharp",
-  "name": "Adatum Corporation Console Application",
-  "shortName": "adatumconsole"
-}
-```
-
-The *mytemplate* folder is an installable template package. Once the package is installed, the `shortName` can be used with the `dotnet new` command. For example, `dotnet new adatumconsole` would output the `console.cs` and `readme.txt` files to the current folder.
-
-## Template localization
-
-The .NET templates are localizable. If a template is localized for the language matching the current locale, its elements appear in the same language as the CLI. Localization is optional when creating new templates.
-
-The localizable elements on a template are:
-
-- Name
-- Author
-- Description
-- Symbols
-  - Description
-  - Display Name
-  - Descriptions and Display name of choices for choice parameters
-- Post actions
-  - Description
-  - Manual instructions
-
-Localization files have a JSON format, and just one file per culture should exist. The naming convention is: `templatestrings.<lang code>.json`, where `lang code` corresponds to one of the [CultureInfo](/dotnet/api/system.globalization.cultureinfo.name) options. All localization files should be inside the `.template-config\localize` folder.
-
-The localization JSON consists of key value pairs:
-
-- The key is the reference to an element of `template.json` to be localized. If the element is a child, use the full path with a `/` delimiter.
-- The value is the localization string of the element given by the key.
-
-For more information about localizing templates, see the [dotnet templating wiki's localization page](https://aka.ms/templating-localization).
-
-### Example
-
-For example, here's *template.json* file with some localizable fields:
-
-```JSON
-{
-  "$schema": "https://json.schemastore.org/template",
-  "author": "Microsoft",
-  "classifications": "Config",
-  "name": "EditorConfig file",
-  "description": "Creates an .editorconfig file for configuring code style preferences.",
-  "symbols": {
-    "Empty": {
-      "type": "parameter",
-      "datatype": "bool",
-      "defaultValue": "false",
-      "displayName": "Empty",
-      "description": "Creates empty .editorconfig instead of the defaults for .NET."
-    }
-  }
-}
-```
-
-And some fields are to be localized to Brazilian Portuguese. The filename will be `templatestrings.pt-BR.json` to match the culture, and it would look like:
-
-```JSON
-{
-  "author": "Microsoft",
-  "name": "Arquivo EditorConfig",
-  "description": "Cria um arquivo .editorconfig para configurar as preferências de estilo de código.",
-  "symbols/Empty/displayName": "Vazio",
-  "symbols/Empty/description": "Cria .editorconfig vazio em vez dos padrões para .NET."
-}
-```
-
-## Pack a template into a NuGet package (nupkg file)
-
-A custom template is packed with the [dotnet pack](dotnet-pack.md) command and a *.csproj* file. Alternatively, [NuGet](/nuget/tools/nuget-exe-cli-reference) can be used with the [nuget pack](/nuget/tools/cli-ref-pack) command along with a *.nuspec* file. However, NuGet requires the .NET Framework on Windows and [Mono](https://www.mono-project.com/) on Linux and macOS.
-
-The *.csproj* file is slightly different from a traditional code-project *.csproj* file. Note the following settings:
-
-01. The `<PackageType>` setting is added and set to `Template`.
-01. The `<PackageVersion>` setting is added and set to a valid [NuGet version number](/nuget/reference/package-versioning).
-01. The `<PackageId>` setting is added and set to a unique identifier. This identifier is used to uninstall the template pack and is used by NuGet feeds to register your template pack.
-01. Generic metadata settings should be set: `<Title>`, `<Authors>`, `<Description>`, and `<PackageTags>`.
-01. The `<TargetFramework>` setting must be set, even though the binary produced by the template process isn't used. In the example below it's set to `netstandard2.0`.
-
-A template package, in the form of a *.nupkg* NuGet package, requires that all templates be stored in the *content* folder within the package. There are a few more settings to add to a *.csproj* file to ensure that the generated *.nupkg* can be installed as a template pack:
-
-01. The `<IncludeContentInPack>` setting is set to `true` to include any file the project sets as **content** in the NuGet package.
-01. The `<IncludeBuildOutput>` setting is set to `false` to exclude all binaries generated by the compiler from the NuGet package.
-01. The `<ContentTargetFolders>` setting is set to `content`. This makes sure that the files set as **content** are stored in the *content* folder in the NuGet package. This folder in the NuGet package is parsed by the dotnet template system.
-
-An easy way to exclude all code files from being compiled by your template project is by using the `<Compile Remove="**\*" />` item in your project file, inside an `<ItemGroup>` element.
-
-An easy way to structure your template pack is to put all templates in individual folders, and then each template folder inside of a *templates* folder that is located in the same directory as your *.csproj* file. This way, you can use a single project item to include all files and folders in the *templates* as **content**. Inside of an `<ItemGroup>` element, create a `<Content Include="templates\**\*" Exclude="templates\**\bin\**;templates\**\obj\**" />` item.
-
-Here's an example *.csproj* file that follows all of these guidelines. It packs the *templates* child folder to the *content* package folder and excludes any code file from being compiled.
-
-```xml
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <PackageType>Template</PackageType>
-    <PackageVersion>1.0</PackageVersion>
-    <PackageId>AdatumCorporation.Utility.Templates</PackageId>
-    <Title>AdatumCorporation Templates</Title>
-    <Authors>Me</Authors>
-    <Description>Templates to use when creating an application for Adatum Corporation.</Description>
-    <PackageTags>dotnet-new;templates;contoso</PackageTags>
-    <TargetFramework>netstandard2.0</TargetFramework>
-
-    <IncludeContentInPack>true</IncludeContentInPack>
-    <IncludeBuildOutput>false</IncludeBuildOutput>
-    <ContentTargetFolders>content</ContentTargetFolders>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Content Include="templates\**\*" Exclude="templates\**\bin\**;templates\**\obj\**" />
-    <Compile Remove="**\*" />
-  </ItemGroup>
-
-</Project>
-```
-
-The following example demonstrates the file and folder structure of using a *.csproj* to create a template package. The *MyDotnetTemplates.csproj* file and *templates* folder are both located at the root of a directory named *project_folder*. The *templates* folder contains two templates, *mytemplate1* and *mytemplate2*. Each template has content files and a *.template.config* folder with a *template.json* config file.
-
-```text
-project_folder
-│   MyDotnetTemplates.csproj
-│
-└───templates
-    ├───mytemplate1
-    │   │   console.cs
-    │   │   readme.txt
-    │   │
-    │   └───.template.config
-    │           template.json
-    │
-    └───mytemplate2
-        │   otherfile.cs
-        │
-        └───.template.config
-                template.json
-```
-
-> [!NOTE]
-> To ensure that the template package appears in `dotnet new search` result, set [the NuGet package type](/nuget/create-packages/set-package-type) to `Template`.
-
-## Install a template package
-
-Use the [dotnet new install](dotnet-new-install.md) command to install a template package.
-
-> [!WARNING]
-> Templates can run MSBuild code and other arbitrary code when triggered. Don't install or run untrusted .NET templates.
-
-### To install a template package from a NuGet package stored at nuget.org
-
-Use the NuGet package identifier to install a template package.
-
-```dotnetcli
-dotnet new install <NUGET_PACKAGE_ID>
-```
-
-### To install a template package from a custom NuGet source
-
-Provide a custom NuGet source (for example, `https://api.my-custom-nuget.com/v3/index.json`).
-
-```dotnetcli
-dotnet new install <NUGET_PACKAGE_ID> --nuget-source <SOURCE>
-```
-
-### To install a template package from a local nupkg file
-
-Provide the path to a *.nupkg* NuGet package file.
-
-```dotnetcli
-dotnet new install <PATH_TO_NUPKG_FILE>
-```
-
-### To install a template package from a file system directory
-
-Templates can be installed from a template folder, such as the *mytemplate1* folder from the previous example. Specify the folder path of the *.template.config* folder. The path to the template directory doesn't need to be absolute.
-
-```dotnetcli
-dotnet new install <FILE_SYSTEM_DIRECTORY>
-```
-
-## Get a list of installed template packages
-
-The uninstall command, without any other parameters, lists all installed template packages and included templates.
-
-```dotnetcli
-dotnet new uninstall
-```
-
-That command returns something similar to the following output:
-
-```console
-Currently installed items:
-   Microsoft.Azure.WebJobs.ProjectTemplates
-      Version: 4.0.1942
-      Details:
-         Author: Microsoft
-         NuGetSource: https://api.nuget.org/v3/index.json
-      Templates:
-         Azure Functions (func) C#
-         Azure Functions (func) F#
-      Uninstall Command:
-         dotnet new uninstall Microsoft.Azure.WebJobs.ProjectTemplates
-...
-```
-
-The first level of items after `Currently installed items:` are the identifiers used in uninstalling a template package. And in the previous example, `Microsoft.Azure.WebJobs.ProjectTemplates` is listed. If the template package was installed by using a file system path, this identifier is the folder path of the *.template.config* folder. Only the template packages installed via `dotnet new install` are shown in the list. The template packages that are built into the .NET SDK aren't shown.
-
-## Uninstall a template package
-
-Use the [dotnet new uninstall](dotnet-new-uninstall.md) command to uninstall a template package.
-
-If the package was installed by either a NuGet feed or by a *.nupkg* file directly, provide the identifier.
-
-```dotnetcli
-dotnet new uninstall <NUGET_PACKAGE_ID>
-```
-
-If the package was installed by specifying a path to the *.template.config* folder, use that path to uninstall the package. You can see the absolute path of the template package in the output provided by the `dotnet new uninstall` command. For more information, see the [Get a list of installed templates](#get-a-list-of-installed-template-packages) section.
-
-```dotnetcli
-dotnet new uninstall <FILE_SYSTEM_DIRECTORY>
-```
-
-## Create a project using a custom template
-
-After a template is installed, use the template by executing the `dotnet new <TEMPLATE>` command as you would with any other preinstalled template. You can also specify [options](dotnet-new.md#options) to the `dotnet new` command, including template-specific options you configured in the template settings. Supply the template's short name directly to the command:
-
-```dotnetcli
-dotnet new <TEMPLATE>
-```
-
-## See also
-
-- [Create a custom template for dotnet new (tutorial)](../tutorials/cli-templates-create-item-template.md)
-- [dotnet/templating GitHub repo Wiki](https://github.com/dotnet/templating/wiki)
-- [Template samples](https://aka.ms/template-samples)
-- [How to create your own templates for dotnet new](https://devblogs.microsoft.com/dotnet/how-to-create-your-own-templates-for-dotnet-new/)
-- [*template.json* schema at the JSON Schema Store](https://www.schemastore.org)
diff --git a/docs/core/tools/dotnet-new-details.md b/docs/core/tools/dotnet-new-details.md
index 864e32cdbdfd9..eb7085abc752a 100644
--- a/docs/core/tools/dotnet-new-details.md
+++ b/docs/core/tools/dotnet-new-details.md
@@ -64,4 +64,4 @@ If the package is installed locally or is found on the official NuGet website, i
 - [dotnet new uninstall command](dotnet-new-uninstall.md)
 - [dotnet new list command](dotnet-new-list.md)
 - [dotnet new search command](dotnet-new-search.md)
-- [Custom templates for dotnet new](custom-templates.md)
+- [.NET templates overview](templates.md)
diff --git a/docs/core/tools/dotnet-new-install.md b/docs/core/tools/dotnet-new-install.md
index 7a54ef7af0f88..a36f5b051f20c 100644
--- a/docs/core/tools/dotnet-new-install.md
+++ b/docs/core/tools/dotnet-new-install.md
@@ -100,4 +100,4 @@ Starting with .NET SDK 6.0.100, installed template packages are available in lat
 
 - [`dotnet new` command](dotnet-new.md)
 - [`dotnet new search` command](dotnet-new-search.md)
-- [Custom templates for `dotnet new`](custom-templates.md)
+- [.NET templates overview](templates.md)
diff --git a/docs/core/tools/dotnet-new-list.md b/docs/core/tools/dotnet-new-list.md
index 37fd65754dabb..a7624e03d25a8 100644
--- a/docs/core/tools/dotnet-new-list.md
+++ b/docs/core/tools/dotnet-new-list.md
@@ -148,4 +148,4 @@ Starting with .NET SDK 7.0.100, the `list` command might not show all the templa
 
 - [dotnet new command](dotnet-new.md)
 - [dotnet new search command](dotnet-new-search.md)
-- [Custom templates for dotnet new](custom-templates.md)
+- [.NET templates overview](templates.md)
diff --git a/docs/core/tools/dotnet-new-sdk-templates.md b/docs/core/tools/dotnet-new-sdk-templates.md
index e37c378efe192..c1c4eb340a5f5 100644
--- a/docs/core/tools/dotnet-new-sdk-templates.md
+++ b/docs/core/tools/dotnet-new-sdk-templates.md
@@ -1006,6 +1006,6 @@ The following table shows templates that have been discontinued and no longer co
 
 - [dotnet new command](dotnet-new.md)
 - [dotnet new list command](dotnet-new-list.md)
-- [Custom templates for dotnet new](custom-templates.md)
+- [.NET templates overview](templates.md)
 - [Create a custom template for dotnet new](../tutorials/cli-templates-create-item-template.md)
 - [Implicit using directives](../project-sdk/overview.md#implicit-using-directives)
diff --git a/docs/core/tools/dotnet-new-search.md b/docs/core/tools/dotnet-new-search.md
index e274fa888ee2f..9819cd2a18e69 100644
--- a/docs/core/tools/dotnet-new-search.md
+++ b/docs/core/tools/dotnet-new-search.md
@@ -130,4 +130,4 @@ The `dotnet new search` command searches for templates supported by `dotnet new`
 
 - [dotnet new command](dotnet-new.md)
 - [dotnet new list command](dotnet-new-list.md)
-- [Custom templates for dotnet new](custom-templates.md)
+- [.NET templates overview](templates.md)
diff --git a/docs/core/tools/dotnet-new-uninstall.md b/docs/core/tools/dotnet-new-uninstall.md
index d998fad003eb8..a0ea4c2d024c2 100644
--- a/docs/core/tools/dotnet-new-uninstall.md
+++ b/docs/core/tools/dotnet-new-uninstall.md
@@ -74,4 +74,4 @@ The `dotnet new uninstall` command uninstalls a template package at the `PATH` o
 - [dotnet new command](dotnet-new.md)
 - [dotnet new list command](dotnet-new-list.md)
 - [dotnet new search command](dotnet-new-search.md)
-- [Custom templates for dotnet new](custom-templates.md)
+- [.NET templates overview](templates.md)
diff --git a/docs/core/tools/dotnet-new-update.md b/docs/core/tools/dotnet-new-update.md
index e2ddfe9c31cfd..7ae71354b6195 100644
--- a/docs/core/tools/dotnet-new-update.md
+++ b/docs/core/tools/dotnet-new-update.md
@@ -85,4 +85,4 @@ The `dotnet new update` command with `--check-only` option checks for available
 - [dotnet new command](dotnet-new.md)
 - [dotnet new search command](dotnet-new-search.md)
 - [dotnet new install command](dotnet-new-install.md)
-- [Custom templates for dotnet new](custom-templates.md)
+- [.NET templates overview](templates.md)
diff --git a/docs/core/tools/dotnet-new.md b/docs/core/tools/dotnet-new.md
index 8110995d6feda..cb16d73818b5b 100644
--- a/docs/core/tools/dotnet-new.md
+++ b/docs/core/tools/dotnet-new.md
@@ -160,5 +160,5 @@ Each template may have additional options defined. For more information, see [.N
 - [dotnet new search command](dotnet-new-search.md)
 - [dotnet new install command](dotnet-new-install.md)
 - [.NET default templates for dotnet new](dotnet-new-sdk-templates.md)
-- [Custom templates for dotnet new](custom-templates.md)
+- [.NET templates overview](templates.md)
 - [Create a custom template for dotnet new](../tutorials/cli-templates-create-item-template.md)
diff --git a/docs/core/tools/templates.md b/docs/core/tools/templates.md
new file mode 100644
index 0000000000000..de3881d70da85
--- /dev/null
+++ b/docs/core/tools/templates.md
@@ -0,0 +1,293 @@
+---
+title: .NET templates overview
+description: Learn how .NET templates work, how they're structured, and what you can do with them using the dotnet new command and Visual Studio.
+author: adegeo
+ms.author: adegeo
+ms.topic: overview
+ms.date: 07/29/2026
+ai-usage: ai-assisted
+
+#customer intent: As a .NET developer, I want to understand how .NET templates work so that I can use, create, and distribute templates for projects and files.
+
+---
+
+# What are .NET templates?
+
+A .NET template is a blueprint that generates projects, files, or other resources from a predefined structure. When you run `dotnet new console`, the .NET template engine reads the console project template and produces a working project in your current directory. Visual Studio's **Create a new project** dialog also uses the .NET template engine for .NET project templates, so templates you create for the CLI work in Visual Studio too.
+
+The .NET SDK ships with built-in templates for common starting points like console apps, class libraries, and ASP.NET projects. To see every template currently installed, run `dotnet new list`. Beyond the built-in templates, you can install community templates from NuGet or build your own.
+
+This article focuses on how templates are structured. It also provides an overview of how to install and distribute templates. For step-by-step instructions to create and package templates, see the [Related content](#related-content) section.
+
+## Template types
+
+The .NET template engine supports three types of templates: item templates, project templates, and solution templates.
+
+- **Item templates** generate one or more files, such as a code file, configuration file, or other resource, without generating an entire project around them. For example, an item template might produce a class file that adds a set of extension methods, or a JSON configuration file that follows a standard layout your team uses. To learn how to build an item template, see [Tutorial: Create an item template](../tutorials/cli-templates-create-item-template.md).
+
+- **Project templates** generate a complete project structure. When you run `dotnet new console`, for example, the console project template produces a `.csproj` file, a `Program.cs` file, and any other files that make up the project. Use a project template when you want to give users a full project starting point rather than individual files. To learn how to build a project template, see [Tutorial: Create a project template](../tutorials/cli-templates-create-project-template.md).
+
+- **Solution templates** generate a solution with one or more projects. For example, a solution template can create an API project paired with a test project in a single step.
+
+When you create your own template, you declare its type using the `tags.type` field in the `template.json` configuration file. The valid values are `"project"`, `"item"`, and `"solution"`. These values let users filter results when they search for templates with `dotnet new search` or `dotnet new list`.
+
+> [!TIP]
+> Project and solution templates appear in the Visual Studio **Create a new project** dialog, but item templates don't appear in the **Add** > **New Item** dialog. You can use item templates from the `dotnet new` CLI.
+
+## Template structure
+
+A template is a folder on disk that contains two things: the template source files and a special `.template.config` subfolder. When you run `dotnet new <shortName>`, the template engine copies the source files to the output location and applies any configuration that's defined for the template.
+
+```text
+mytemplate/
+├── console.cs
+├── readme.txt
+└── .template.config/
+    ├── template.json
+    └── icon.png
+```
+
+The source files can be any type of file. The template engine doesn't require you to inject special tokens or markers into the source code. It uses the files as-is, which means you can build, run, and debug a template's source project exactly like a normal .NET project. To turn an existing project into a template, add a `.template.config/template.json` file to the project root.
+
+You can optionally inject substitution tokens tied to template parameters (symbols) directly into template source files and file names. If the tokens aren't valid source code, you can't build, run, or debug the source project before you deploy it as a template. The tokens don't affect projects that users create from the deployed template because the template engine replaces them during project creation.
+
+The only required file inside `.template.config` is `template.json`. That file tells the template engine everything it needs: the template's name, short name, author, classifications, and any parameters users can pass when they create from the template. You can also place an `icon.png` file in the `.template.config` folder. The terminal doesn't display icons, but Visual Studio shows the icon next to the template in the **Create a new project** dialog. A 128×128 PNG works well.
+
+### The template.json file
+
+The `template.json` file is the only required piece of configuration in a template. It lives inside the `.template.config` folder and tells the template engine how to present and process your template. The following table describes common required and optional fields:
+
+| Field                 | Type          | Required | Description |
+|-----------------------|---------------|----------|-------------|
+| `$schema`             | URI           | No       | The JSON schema for `template.json`. Set to `https://json.schemastore.org/template` to enable IntelliSense in editors like Visual Studio Code. |
+| `author`              | string        | No       | The author of the template. |
+| `classifications`     | array(string) | No       | Tags users can use to find the template with `dotnet new search` or `dotnet new list`. These values appear in the **Tags** column of the template list. |
+| `description`         | string        | No       | A description of what the template creates. |
+| `identity`            | string        | Yes      | A unique identifier for the template. |
+| `name`                | string        | Yes      | The display name of the template shown to users. |
+| `shortName`           | string        | Yes      | The short name users pass to `dotnet new` to create from the template, such as `console` or `classlib`. |
+| `sourceName`          | string        | No       | A string in your source files and file names that the template engine replaces with the name the user provides via `-n` or `--name`. If the user doesn't provide a name, the engine uses the current directory name. |
+| `preferNameDirectory` | boolean       | No       | When `true` and the user provides a name but no output directory, the template engine creates a new directory with that name instead of writing files into the current directory. The default is `false`. |
+| `tags`                | object        | No       | Metadata that identifies properties such as the template language and type. Use `tags.language` for the language and `tags.type` for `project`, `item`, or `solution`. |
+
+Two fields deserve extra attention. The `sourceName` field is how templates handle naming: set it to a string that appears in your file names and source code (such as `MyTemplate`), and the template engine replaces every occurrence with whatever name the user passes when creating the template. The `classifications` field controls discoverability; choose tags that accurately describe your template's purpose so users can find it when searching.
+
+Here's a minimal `template.json` for a console template:
+
+```json
+{
+  "$schema": "https://json.schemastore.org/template",
+  "author": "Your Name",
+  "classifications": [ "Common", "Console" ],
+  "description": "Creates a console application.",
+  "identity": "MyCompany.ConsoleTemplate.CSharp",
+  "name": "My Console App",
+  "shortName": "myconsole",
+  "sourceName": "MyConsoleApp",
+  "tags": {
+    "language": "C#",
+    "type": "project"
+  }
+}
+```
+
+The full schema is available at [JSON Schema Store](https://www.schemastore.org/template.json). For advanced configuration options such as conditional file inclusion, post-creation actions, and multi-project templates, see the [dotnet/templating GitHub wiki](https://github.com/dotnet/templating/wiki).
+
+### Template parameters (symbols)
+
+The `symbols` section in `template.json` defines the parameters users can pass when creating from your template. Each symbol becomes a CLI option on `dotnet new <shortName>`, so a symbol named `ClassName` becomes `--ClassName` (or `-C` if you define a short name).
+
+Each symbol entry supports the following common settings:
+
+| Setting | Description |
+|---|---|
+| `type` | Must be `"parameter"` for user-facing parameters. |
+| `description` | Shown in the template help output when users run `dotnet new <shortName> -?`. |
+| `datatype` | The expected data type, such as `"text"`, `"bool"`, or `"choice"`. |
+| `replaces` | A string in your source file contents that the template engine replaces with the parameter value. |
+| `fileRename` | A string in your source file names that the template engine replaces with the parameter value. |
+| `defaultValue` | The value used when the user doesn't supply the parameter. |
+
+The `replaces` and `fileRename` settings are how symbols drive substitution. When a user provides a value, the template engine replaces every occurrence of the `replaces` string inside file contents and every occurrence of the `fileRename` string in file names. If the user doesn't provide a value, the `defaultValue` is used instead.
+
+For example, the following symbol lets users set the class name when they create from the template. The file is renamed and the class inside it is updated to match:
+
+```json
+"symbols": {
+  "ClassName": {
+    "type": "parameter",
+    "description": "The name of the code file and class.",
+    "datatype": "text",
+    "replaces": "StringExtensions",
+    "fileRename": "StringExtensions",
+    "defaultValue": "StringExtensions"
+  }
+}
+```
+
+With this symbol defined, a user can run `dotnet new <shortName> --ClassName MyHelpers` to produce a file named `MyHelpers.cs` containing a class named `MyHelpers`. Without the flag, the file and class keep the default name `StringExtensions`.
+
+To see all available parameters for any installed template, pass `-?` to the template's short name:
+
+```dotnetcli
+dotnet new <shortName> -?
+```
+
+## Template packages
+
+A template package is a NuGet (`.nupkg`) file that bundles one or more templates together. When you install a template package, the .NET template engine registers every template inside it at once. Packages are the standard way to distribute templates. You can publish a single package to NuGet.org or a private NuGet feed, or share a local `.nupkg` file. Users install the whole collection with one command.
+
+To build a template package, use a C# project file (`.csproj`) configured to act as a **packaging project** rather than a compilation project. The key settings that make this work are:
+
+| Setting                | Value      | Purpose                                                      |
+|------------------------|------------|--------------------------------------------------------------|
+| `PackageType`          | `Template` | Marks the package as a template package so it appears in `dotnet new search` results. |
+| `IncludeContentInPack` | `true`     | Includes content files in the NuGet package.                 |
+| `IncludeBuildOutput`   | `false`    | Prevents compiled binaries from being added to the package.  |
+| `ContentTargetFolders` | `content`  | Places your template folders inside the `content` folder of the NuGet package, which is where the template engine expects to find them. |
+
+The `templatepack` project template provides the easiest way to create a packaging project:
+
+1. Install the [Microsoft.TemplateEngine.Authoring.Templates](https://www.nuget.org/packages/Microsoft.TemplateEngine.Authoring.Templates) NuGet package:
+
+   ```dotnetcli
+   dotnet new install Microsoft.TemplateEngine.Authoring.Templates
+   ```
+
+1. Create the packaging project:
+
+   ```dotnetcli
+   dotnet new templatepack -n <PackageName>
+   ```
+
+The generated project includes the correct `.csproj` settings, a `content` folder for your templates, and MSBuild tasks for template validation and optional localization.
+
+For a full walkthrough of creating, packing, and publishing a template package, see [Tutorial: Create a template package](../tutorials/cli-templates-create-template-package.md).
+
+## Install and uninstall templates
+
+To install a template, use the `dotnet new install` command with a source argument. The source can be any of the following:
+
+- A NuGet package ID, which installs the latest stable version from the NuGet sources configured for the current directory:
+
+  ```dotnetcli
+  dotnet new install AdatumCorporation.ConsoleTemplate.CSharp
+  ```
+
+- A NuGet package ID with a custom feed URL. The `--nuget-source` option uses the specified feed, in addition to the configured NuGet sources, for this installation command only:
+
+  ```dotnetcli
+  dotnet new install AdatumCorporation.ConsoleTemplate.CSharp --nuget-source https://mynugetfeed.example.com/v3/index.json
+  ```
+
+- A path to a local `.nupkg` file:
+
+  ```dotnetcli
+  dotnet new install ./AdatumCorporation.ConsoleTemplate.CSharp.1.0.0.nupkg
+  ```
+
+- A path to a directory that contains the template (the folder with `.template.config` inside):
+
+  ```dotnetcli
+  dotnet new install ./mytemplate/
+  ```
+
+  Installing from a directory is especially useful during template development because it lets you test your template without packing it first.
+
+> [!WARNING]
+> Templates can run MSBuild tasks and arbitrary code during project creation. Only install templates from sources you trust.
+
+To see all installed template packages and the exact command to uninstall each one, run `dotnet new uninstall` with no arguments:
+
+```dotnetcli
+dotnet new uninstall
+```
+
+To uninstall a specific template package, pass its identifier. For a package installed from a NuGet source or a local `.nupkg` file, use the NuGet package ID. For a template installed from a directory, use the directory path.
+
+Use the package ID to uninstall a NuGet package:
+
+```dotnetcli
+dotnet new uninstall AdatumCorporation.ConsoleTemplate.CSharp
+```
+
+Use the directory path to uninstall a template installed from a directory:
+
+```dotnetcli
+dotnet new uninstall ./mytemplate/
+```
+
+The built-in SDK templates don't appear in the uninstall list and can't be removed with `dotnet new uninstall`.
+
+## Template localization
+
+The .NET template engine supports optional localization of template metadata. When you provide localization files, hosts such as `dotnet new` and the Visual Studio **New Project** dialog display the template's name, description, and symbol information in the user's language instead of the original authored language.
+
+The following template fields support localization:
+
+- `name`
+- `author`
+- `description`
+- Symbol `description` and `displayName`
+- Description and display name for each choice in a choice parameter
+- Post action `description` and `manualInstructions`
+
+To add localization, create a `localize` subfolder inside `.template.config` and add one JSON file per language. Name each file `templatestrings.<lang-code>.json`, where `<lang-code>` matches a valid <xref:System.Globalization.CultureInfo> name, such as `pt-BR`, `zh-Hans`, or `de`. Each file contains key-value pairs where the key is a path to the element in `template.json`, using `/` as a delimiter for nested fields.
+
+For example, given a `template.json` with the following content:
+
+```json
+{
+  "$schema": "https://json.schemastore.org/template",
+  "author": "Microsoft",
+  "classifications": [ "Config" ],
+  "name": "EditorConfig file",
+  "description": "Creates an .editorconfig file for configuring code style preferences.",
+  "symbols": {
+    "Empty": {
+      "type": "parameter",
+      "datatype": "bool",
+      "defaultValue": "false",
+      "displayName": "Empty",
+      "description": "Creates empty .editorconfig instead of the defaults for .NET."
+    }
+  }
+}
+```
+
+A Brazilian Portuguese localization file named `templatestrings.pt-BR.json` would look like this:
+
+```json
+{
+  "author": "Microsoft",
+  "name": "Arquivo EditorConfig",
+  "description": "Cria um arquivo .editorconfig para configurar as preferências de estilo de código.",
+  "symbols/Empty/displayName": "Vazio",
+  "symbols/Empty/description": "Cria .editorconfig vazio em vez dos padrões para .NET."
+}
+```
+
+The template engine parses these files when it loads template information, and it returns localized values automatically based on the current UI culture—no extra steps are required from the user.
+
+Localization is optional. If you don't include localization files, the template works normally and always displays the values from `template.json`. For more information, see the [dotnet/templating wiki localization page](https://github.com/dotnet/templating/wiki/Localization).
+
+## Visual Studio integration
+
+Visual Studio's **Create a new project** dialog uses the .NET template engine for .NET project templates. Templates you create for `dotnet new` work in Visual Studio too, without any extra configuration. When you install a template package with `dotnet new install`, Visual Studio automatically detects and surfaces those templates in the dialog.
+
+**Project and solution templates** appear in the **Create a new project** dialog alongside the built-in SDK templates. Other users can find your template by name, language, or the tags from the `classifications` field in `template.json`. Accurate classifications help your template surface in the right filter categories, so choose them carefully. To give your template a polished appearance in the dialog, add an `icon.png` to the `.template.config` folder — Visual Studio displays it next to your template's name.
+
+**Item templates** don't currently appear in the **Add** > **New Item** dialog. Users can still use item templates with the `dotnet new` command in the terminal.
+
+To make your template discoverable to Visual Studio users who haven't installed it yet, publish your template package to nuget.org. The **Create a new project** dialog includes an **Install more templates from the online search** option that searches nuget.org for template packages. When a user installs your package through that option, Visual Studio uses the same install mechanism as `dotnet new install`.
+
+For deeper guidance on Visual Studio-specific integration—such as controlling template sort order and configuring additional IDE-specific options—see [Sayed Hashimi's template-sample repository](https://github.com/sayedihashimi/template-sample).
+
+## Related content
+
+- [Tutorial: Create an item template](../tutorials/cli-templates-create-item-template.md)
+- [Tutorial: Create a project template](../tutorials/cli-templates-create-project-template.md)
+- [Tutorial: Create a template package](../tutorials/cli-templates-create-template-package.md)
+- [dotnet new command](dotnet-new.md)
+- [dotnet/templating GitHub repo wiki](https://github.com/dotnet/templating/wiki)
+- [Template samples](https://github.com/dotnet/templating/tree/main/dotnet-template-samples)
diff --git a/docs/core/tutorials/cli-templates-create-template-package.md b/docs/core/tutorials/cli-templates-create-template-package.md
index 9337a17559539..ee810b3343ce3 100644
--- a/docs/core/tutorials/cli-templates-create-template-package.md
+++ b/docs/core/tutorials/cli-templates-create-template-package.md
@@ -107,7 +107,7 @@ In the second group, the `<TargetFramework>` setting ensures that MSBuild runs p
 `<ItemGroup>` contains two items. First, the `<Content>` item includes everything in the _templates_ folder as content. It's also set to exclude any _bin_ folder or _obj_ folder to prevent any compiled code (if you tested and compiled your templates) from being included. Second, the `<Compile>` item excludes all code files from compiling no matter where they're located. This setting prevents the project that's used to create the template package from trying to compile the code in the _templates_ folder hierarchy.
 
 > [!TIP]
-> For more information about NuGet metadata settings, see [Pack a template into a NuGet package (nupkg file)](../tools/custom-templates.md#pack-a-template-into-a-nuget-package-nupkg-file).
+> For more information about NuGet metadata settings, see [Template packages](../tools/templates.md#template-packages).
 
 The created project file includes [template authoring MSBuild tasks](https://aka.ms/templating-authoring-tools) and localization settings.
 
@@ -209,7 +209,7 @@ Congratulations! You've installed and uninstalled a template package.
 
 ## Next steps
 
-To learn more about templates, most of which you've already learned, see the [Custom templates for dotnet new](../tools/custom-templates.md) article.
+To learn more about templates, see [.NET templates overview](../tools/templates.md).
 
 * [Template Authoring Tools](https://aka.ms/templating-authoring-tools)
 * [dotnet/templating GitHub repo Wiki](https://github.com/dotnet/templating/wiki)
diff --git a/docs/navigate/tools-diagnostics/toc.yml b/docs/navigate/tools-diagnostics/toc.yml
index 2d2ab180dd219..a1c360bd0a8c9 100644
--- a/docs/navigate/tools-diagnostics/toc.yml
+++ b/docs/navigate/tools-diagnostics/toc.yml
@@ -150,8 +150,8 @@ items:
                 href: ../../core/tools/dotnet-new-update.md
               - name: .NET default templates
                 href: ../../core/tools/dotnet-new-sdk-templates.md
-              - name: Custom templates
-                href: ../../core/tools/custom-templates.md
+              - name: .NET templates overview
+                href: ../../core/tools/templates.md
           - name: dotnet nuget
             items:
               - name: dotnet nuget delete