diff --git a/topics/tutorials/custom_language_support/annotator.md b/topics/tutorials/custom_language_support/annotator.md
index 63b49345a..4b8650960 100644
--- a/topics/tutorials/custom_language_support/annotator.md
+++ b/topics/tutorials/custom_language_support/annotator.md
@@ -2,13 +2,17 @@
+
+
+**Reference**: [](syntax_highlighting_and_error_highlighting.md#annotator)
+
+
+
An `Annotator` helps highlight and annotate any code based on specific rules.
This section adds annotation functionality to support the Simple Language in the context of Java code.
-**Reference**: [Annotator](syntax_highlighting_and_error_highlighting.md#annotator)
-
## Required Project Configuration Changes
Classes defined in this step of the tutorial depend on `com.intellij.psi.PsiLiteralExpression` (the PSI representation for String literals in Java code) at runtime.
diff --git a/topics/tutorials/custom_language_support/code_style_settings.md b/topics/tutorials/custom_language_support/code_style_settings.md
index 8e37cfde6..ab4166d16 100644
--- a/topics/tutorials/custom_language_support/code_style_settings.md
+++ b/topics/tutorials/custom_language_support/code_style_settings.md
@@ -2,14 +2,18 @@
+
+
+**Reference**: [](code_formatting.md#code-style-settings)
+
+
+
Code style settings enable defining formatting options.
A code style settings provider creates an instance of the settings and also creates an options page in settings/preferences.
This example creates a settings/preferences page that uses the default language code style settings, customized by a language code style settings provider.
-**Reference**: [Code Style Settings](code_formatting.md#code-style-settings)
-
## Define Code Style Settings
Define a code style settings for Simple Language by subclassing [`CustomCodeStyleSettings`](%gh-ic%/platform/code-style-api/src/com/intellij/psi/codeStyle/CustomCodeStyleSettings.java).
diff --git a/topics/tutorials/custom_language_support/completion_contributor.md b/topics/tutorials/custom_language_support/completion_contributor.md
index a82235258..a593580e1 100644
--- a/topics/tutorials/custom_language_support/completion_contributor.md
+++ b/topics/tutorials/custom_language_support/completion_contributor.md
@@ -2,12 +2,16 @@
+
+
+**Reference**: [](code_completion.md)
+
+
+
Custom languages provide code completion using one of two approaches: Contributor and Reference-based (see [](reference_contributor.md)) completion.
-**Reference**: [](code_completion.md)
-
## Define a Completion Contributor
For this tutorial, the `simple_language_plugin` provides custom completion for values in Simple Language property files.
diff --git a/topics/tutorials/custom_language_support/documentation_provider.md b/topics/tutorials/custom_language_support/documentation_provider.md
index 690484fdc..b07ffbf8e 100644
--- a/topics/tutorials/custom_language_support/documentation_provider.md
+++ b/topics/tutorials/custom_language_support/documentation_provider.md
@@ -2,6 +2,12 @@
+
+
+**Reference**: [](documentation.md)
+
+
+
A [`DocumentationProvider`](%gh-ic%/platform/analysis-api/src/com/intellij/lang/documentation/DocumentationProvider.java)
@@ -9,8 +15,6 @@ helps users by showing documentation for symbols like method calls inside the ed
For the custom language tutorial, we're implementing a version of this extension point (EP) for the Simple Language that shows the key/value,
the file where it is defined, and any related documentation comment.
-**Reference:** [](documentation.md)
-
## Implement DocumentationProvider and Register the EP
In the first step, we create an empty class that extends
diff --git a/topics/tutorials/custom_language_support/find_usages_provider.md b/topics/tutorials/custom_language_support/find_usages_provider.md
index 188b5bf72..2acc3f22a 100644
--- a/topics/tutorials/custom_language_support/find_usages_provider.md
+++ b/topics/tutorials/custom_language_support/find_usages_provider.md
@@ -2,13 +2,17 @@
+
+
+**Reference**: [](find_usages.md)
+
+
+
A `FindUsagesProvider` uses a word scanner to build an index of words in every file.
A scanner breaks the text into words and defines the context for each word.
-**Reference**: [](find_usages.md)
-
## Define a Find Usages Provider
The `SimpleFindUsagesProvider` implements [`FindUsagesProvider`](%gh-ic%/platform/indexing-api/src/com/intellij/lang/findUsages/FindUsagesProvider.java).
diff --git a/topics/tutorials/custom_language_support/formatter.md b/topics/tutorials/custom_language_support/formatter.md
index c383691e7..85241583a 100644
--- a/topics/tutorials/custom_language_support/formatter.md
+++ b/topics/tutorials/custom_language_support/formatter.md
@@ -2,14 +2,18 @@
+
+
+**Reference**: [](code_formatting.md)
+
+
+
The IntelliJ Platform includes a powerful framework for implementing formatting for custom languages.
A formatter enables reformatting code automatically based on code style settings.
The formatter controls spaces, indents, wrap, and alignment.
-**Reference**: [](code_formatting.md)
-
## Define a Block
The formatting model represents the formatting structure of a file as a tree of [`Block`](%gh-ic%/platform/code-style-api/src/com/intellij/formatting/Block.java) objects, with associated indent, wrap, alignment and spacing settings.
diff --git a/topics/tutorials/custom_language_support/go_to_symbol_contributor.md b/topics/tutorials/custom_language_support/go_to_symbol_contributor.md
index 5b18d493b..cb9a2b86c 100644
--- a/topics/tutorials/custom_language_support/go_to_symbol_contributor.md
+++ b/topics/tutorials/custom_language_support/go_to_symbol_contributor.md
@@ -2,12 +2,15 @@
+
+
+**Reference**: [](go_to_class_and_go_to_symbol.md)
+
+
A _Go to Symbol Contributor_ helps the user to navigate to any PSI element by its name.
-**Reference**: [](go_to_class_and_go_to_symbol.md)
-
## Define a Helper Method for Generated PSI Elements
To specify how a PSI element looks like in the Navigate | Symbol popup window, Structure tool window, or other components, it should implement `getPresentation()`.
diff --git a/topics/tutorials/custom_language_support/grammar_and_parser.md b/topics/tutorials/custom_language_support/grammar_and_parser.md
index 075dc9094..6a33af02b 100644
--- a/topics/tutorials/custom_language_support/grammar_and_parser.md
+++ b/topics/tutorials/custom_language_support/grammar_and_parser.md
@@ -2,15 +2,17 @@
+
+
+**Reference**: [](implementing_lexer.md), [](implementing_parser_and_psi.md)
+
+
+
In order for the IntelliJ Platform to parse a Simple Language file, tokens and elements must be defined based on [`IElementType`](%gh-ic%/platform/core-api/src/com/intellij/psi/tree/IElementType.java).
The Simple Language grammar must also be defined to generate a parser.
-**Reference**:
-- [](implementing_lexer.md)
-- [](implementing_parser_and_psi.md)
-
## Define a Token Type
Create `SimpleTokenType` in the `org.intellij.sdk.language.psi` package (see the `simple_language_plugin` code sample) by subclassing `IElementType`.
diff --git a/topics/tutorials/custom_language_support/language_and_filetype.md b/topics/tutorials/custom_language_support/language_and_filetype.md
index f3f6ea2b5..f42764c9c 100644
--- a/topics/tutorials/custom_language_support/language_and_filetype.md
+++ b/topics/tutorials/custom_language_support/language_and_filetype.md
@@ -2,6 +2,12 @@
+
+
+**Reference**: [](registering_file_type.md)
+
+
+