diff --git a/typo3/sysext/core/Documentation/Changelog-7.rst b/typo3/sysext/core/Documentation/Changelog-7.rst
new file mode 100644
index 0000000000000000000000000000000000000000..bb5058378e8c5cac8038f78c42e187594488ce07
--- /dev/null
+++ b/typo3/sysext/core/Documentation/Changelog-7.rst
@@ -0,0 +1,21 @@
+:orphan:
+
+.. include:: Includes.txt
+
+============
+ChangeLog v7
+============
+
+Every change to the TYPO3 Core which might affect your site is documented here.
+
+.. toctree::
+   :titlesonly:
+
+   Changelog/7.6.x/Index
+   Changelog/7.6/Index
+   Changelog/7.5/Index
+   Changelog/7.4/Index
+   Changelog/7.3/Index
+   Changelog/7.2/Index
+   Changelog/7.1/Index
+   Changelog/7.0/Index
diff --git a/typo3/sysext/core/Documentation/Changelog/7.0/Breaking-42543-DefaultTypoScriptRemoved.rst b/typo3/sysext/core/Documentation/Changelog/7.0/Breaking-42543-DefaultTypoScriptRemoved.rst
index 5c2d101b2b8d3fde5b93bb131fede0c440ec34e1..8ddb34589f184f456b050473b6724a2018c64b78 100644
--- a/typo3/sysext/core/Documentation/Changelog/7.0/Breaking-42543-DefaultTypoScriptRemoved.rst
+++ b/typo3/sysext/core/Documentation/Changelog/7.0/Breaking-42543-DefaultTypoScriptRemoved.rst
@@ -1,14 +1,9 @@
 
 .. include:: ../../Includes.txt
 
-.. role::   typoscript(code)
-.. role::   ts(typoscript)
-
-   :class:  typoscript
-
-============================================================
+=============================================
 Breaking: #42543 - Default TypoScript Removed
-============================================================
+=============================================
 
 See :issue:`42543`
 
@@ -46,5 +41,3 @@ Either remove usage of :code:`styles.insertContent` or add a snippet at an early
         languageField = sys_language_uid
       }
     }
-
-..
diff --git a/typo3/sysext/core/Documentation/Changelog/7.5/Deprecation-69736-SelectOptionIconsInOptionTagsRemoved.rst b/typo3/sysext/core/Documentation/Changelog/7.5/Deprecation-69736-SelectOptionIconsInOptionTagsRemoved.rst
index 4a247d2945a08f83fe9f7b195df426ab699023ee..7f0a12a28d7505452979eac772b7e7a37445f394 100644
--- a/typo3/sysext/core/Documentation/Changelog/7.5/Deprecation-69736-SelectOptionIconsInOptionTagsRemoved.rst
+++ b/typo3/sysext/core/Documentation/Changelog/7.5/Deprecation-69736-SelectOptionIconsInOptionTagsRemoved.rst
@@ -1,9 +1,9 @@
 
 .. include:: ../../Includes.txt
 
-===========================================================
-Important: #69736 - Select option iconsInOptionTags removed
-===========================================================
+=============================================================
+Deprecation: #69736 - Select option iconsInOptionTags removed
+=============================================================
 
 See :issue:`69736`
 
diff --git a/typo3/sysext/core/Documentation/Includes.txt b/typo3/sysext/core/Documentation/Includes.txt
index 90b452184d5aa66f68653e462866fce103ba5b02..fded53037192cd6494b432d0ee4763a43b88b4ca 100644
--- a/typo3/sysext/core/Documentation/Includes.txt
+++ b/typo3/sysext/core/Documentation/Includes.txt
@@ -6,9 +6,14 @@
 .. role:: js(code)
 .. role:: php(code)
 .. role:: typoscript(code)
+.. role:: typescript(code)
+.. role:: shell(code)
+.. role:: sql(code)
 
 .. role:: ts(typoscript)
    :class: typoscript
+.. role:: javascript(js)
+   :class: js
 
 .. default-role:: code
 .. highlight:: php
diff --git a/typo3/sysext/core/Documentation/Index.rst b/typo3/sysext/core/Documentation/Index.rst
index b48efa7e90ffbc02c62a0157959b86106b609adc..7d93b5ef46828a96cf2422fb5b347fba7e02aa1d 100644
--- a/typo3/sysext/core/Documentation/Index.rst
+++ b/typo3/sysext/core/Documentation/Index.rst
@@ -10,15 +10,8 @@ TYPO3 CMS Core ChangeLog v7
 Every change to the TYPO3 Core which might affect your site is documented here.
 
 .. toctree::
-   :hidden:
+   :titlesonly:
 
    Sitemap/Index
-   Changelog/7.6.x/Index
-   Changelog/7.6/Index
-   Changelog/7.5/Index
-   Changelog/7.4/Index
-   Changelog/7.3/Index
-   Changelog/7.2/Index
-   Changelog/7.1/Index
-   Changelog/7.0/Index
+   Changelog-7
    Changelog/Howto
diff --git a/typo3/sysext/core/Documentation/Settings.cfg b/typo3/sysext/core/Documentation/Settings.cfg
index 3a5f63b716ed6b6ee611759652b1ad58cc9dde35..5db0c1d13115e294fa0b6bf9416befeb06e4cdef 100644
--- a/typo3/sysext/core/Documentation/Settings.cfg
+++ b/typo3/sysext/core/Documentation/Settings.cfg
@@ -17,7 +17,7 @@ description = This documentation contains the changelog
 ; uncomment only what you actually use, as on each build an extra
 ; inventory file is downloaded for each mapping used.
 
-t3api         = https://typo3.org/api/typo3cms/
+# t3api         = https://typo3.org/api/typo3cms/
 # t3cgl         = https://docs.typo3.org/typo3cms/CodingGuidelinesReference/
 t3coreapi     = https://docs.typo3.org/typo3cms/CoreApiReference/
 # t3editors     = https://docs.typo3.org/typo3cms/EditorsTutorial/