diff --git a/Documentation/Images/AutomaticScreenshots/TemplatesModul/TemplatesConstants.png b/Documentation/Images/AutomaticScreenshots/TemplatesModul/TemplatesConstants.png
deleted file mode 100644
index 31525184c..000000000
Binary files a/Documentation/Images/AutomaticScreenshots/TemplatesModul/TemplatesConstants.png and /dev/null differ
diff --git a/Documentation/Images/AutomaticScreenshots/TemplatesModul/TemplatesConstants.rst.txt b/Documentation/Images/AutomaticScreenshots/TemplatesModul/TemplatesConstants.rst.txt
deleted file mode 100644
index f0c291f64..000000000
--- a/Documentation/Images/AutomaticScreenshots/TemplatesModul/TemplatesConstants.rst.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-.. Automatic screenshot: Remove this line if you want to manually change this file
-
-.. figure:: /Images/AutomaticScreenshots/TemplatesModul/TemplatesConstants.png
-   :alt: Overview of the defined constants
-   :class: with-shadow
-
-   Overview of the defined constants
\ No newline at end of file
diff --git a/Documentation/Images/ManualScreenshots/Templates/SyntaxError.png b/Documentation/Images/ManualScreenshots/Templates/SyntaxError.png
deleted file mode 100644
index 9db630037..000000000
Binary files a/Documentation/Images/ManualScreenshots/Templates/SyntaxError.png and /dev/null differ
diff --git a/Documentation/Images/ManualScreenshots/TypoScriptModule/ConstantsDisplayActiveTypoScript.png b/Documentation/Images/ManualScreenshots/TypoScriptModule/ConstantsDisplayActiveTypoScript.png
new file mode 100644
index 000000000..aff90785e
Binary files /dev/null and b/Documentation/Images/ManualScreenshots/TypoScriptModule/ConstantsDisplayActiveTypoScript.png differ
diff --git a/Documentation/Images/ManualScreenshots/TypoScriptModule/IncludedTypoScriptWarnings.png b/Documentation/Images/ManualScreenshots/TypoScriptModule/IncludedTypoScriptWarnings.png
new file mode 100644
index 000000000..ae8a13e2b
Binary files /dev/null and b/Documentation/Images/ManualScreenshots/TypoScriptModule/IncludedTypoScriptWarnings.png differ
diff --git a/Documentation/UsingSetting/Debugging.rst b/Documentation/UsingSetting/Debugging.rst
index 43402861f..df1a829f2 100644
--- a/Documentation/UsingSetting/Debugging.rst
+++ b/Documentation/UsingSetting/Debugging.rst
@@ -14,14 +14,26 @@ to find errors within TypoScript.
 ..  index::
     TypoScript; Constants debugging
     Constants; debugging
+..  _typoscript-debugging-constants:
 
 Analyzing defined constants
 ===========================
 
-The *TypoScript Object Browser* provides an tree view to all defined constants
-on the currently active page.
+..  versionchanged:: 12.0
+    The TypoScript management tools are now found in backend module
+    :guilabel:`Site Management > TypoScript`. It was formerly found in
+    "Page > Template".
 
-..  include:: /Images/AutomaticScreenshots/TemplatesModul/TemplatesConstants.rst.txt
+    The submodule :guilabel:`Active TypoScript` was renamed from
+    "TypoScript Object Browser".
+
+The backend submodule :guilabel:`Site Management > TypoScript > Active TypoScript`
+provides a tree view to all defined TypoScript Constants on the currently active page.
+
+..  figure:: /Images/ManualScreenshots/TypoScriptModule/ConstantsDisplayActiveTypoScript.png
+    :alt: A Screenshot showing the "Constants" section of the "Active TypoScript" submodule.
+
+    Analyzing defined TypoScript Constants in the :guilabel:`Active TypoScript` submodule.
 
 ..  index:: TypoScript; Syntax errors
 ..  _typoscript-syntax-finding-errors:
@@ -29,31 +41,27 @@ on the currently active page.
 Finding errors
 ==============
 
-There are no tools that will tell whether the given TypoScript code is 100%
-correct. The :guilabel:`TypoScript object browser` will warn about syntax errors though:
+..  versionchanged:: 12.0
+    The TypoScript management tools are now found in backend module
+    :guilabel:`Site Management > TypoScript`. It was formerly found in
+    "Page > Template".
 
-..  figure:: /Images/ManualScreenshots/Templates/SyntaxError.png
-    :alt: The TypoScript Object Browser showing a syntax error
-    :class: with-shadow
+    The submodule :guilabel:`Active TypoScript` was renamed from
+    "TypoScript Object Browser". It does not display syntax warnings anymore,
+    those are displayed in the submodule :guilabel:`Included TypoScript` only.
 
-Errors will also appear in the :guilabel:`template analyzer`, when viewing the content of a
-given template. It is also possible to see the full TypoScript code by clicking
-on the :guilabel:`View the complete TS listing` button at the bottom of the template
-analyzer:
+    The submodule :guilabel:`Included TypoScript` was renamed from
+    "TypoScript Analyzer".
 
-..  include:: /Images/AutomaticScreenshots/TemplatesModul/TemplatesViewFullListingButton.rst.txt
-
-The result is a long listing with all compiled line numbers, which makes it
-possible to find the error reported by the :guilabel:`TypoScript object browser`.
-
-..  figure:: /Images/ManualScreenshots/Templates/FullListing.png
-    :alt: The TypoScript Object Browser showing a syntax error
-    :class: with-shadow
+There are no tools that will tell whether the given TypoScript code is 100%
+correct. The :guilabel:`Included TypoScript` will warn about syntax errors though:
 
-In the frontend, the :guilabel:`admin panel` is another possibility to debug TypoScript; use
-its section called :guilabel:`TypoScript`. It shows selected rendered (configuration)
-values, SQL queries, error messages and more.
+..  figure:: /Images/ManualScreenshots/TypoScriptModule/IncludedTypoScriptWarnings.png
+    :alt: The submodule 'Included TypoScript' showing a syntax warning
 
+In the frontend, the :composer:`typo3/cms-adminpanel` is another possibility
+to debug TypoScript: use its section called :guilabel:`TypoScript`. It shows
+selected rendered (configuration) values, SQL queries, error messages and more.
 
 ..  index::
     TypoScript; Debugging stdWrap