diff --git a/Documentation/ContentObjects/Fluidtemplate/DataProcessing.rst b/Documentation/ContentObjects/Fluidtemplate/DataProcessing.rst
index 7f31af4dd..0e6ed81f0 100644
--- a/Documentation/ContentObjects/Fluidtemplate/DataProcessing.rst
+++ b/Documentation/ContentObjects/Fluidtemplate/DataProcessing.rst
@@ -50,7 +50,7 @@ extension `examples `__.
Once the extension t3docs/examples is installed the examples are available
as content elements:
-.. figure:: /Images/ManualScreenshots/Fluidtemplate/DataProcessingExamples.png
+.. figure:: /Images/ManualScreenshots/DataProcessing/DataProcessingExamples.png
:class: with-shadow
:alt: Overview of all data processing examples
diff --git a/Documentation/ContentObjects/Fluidtemplate/DataProcessing/CommaSeparatedValueProcessor.rst b/Documentation/ContentObjects/Fluidtemplate/DataProcessing/CommaSeparatedValueProcessor.rst
index 18c3cd310..418fe462a 100644
--- a/Documentation/ContentObjects/Fluidtemplate/DataProcessing/CommaSeparatedValueProcessor.rst
+++ b/Documentation/ContentObjects/Fluidtemplate/DataProcessing/CommaSeparatedValueProcessor.rst
@@ -150,6 +150,6 @@ Output
Using :typoscript:`maximumColumns` limits the amount of columns in the multi dimensional array.
In this example, the field data of the last column will be stripped off. Therefore the output would be:
-.. figure:: /Images/ManualScreenshots/Fluidtemplate/CsvProcessor.png
+.. figure:: /Images/ManualScreenshots/FrontendOutput/DataProcessing/CsvProcessor.png
:class: with-shadow
:alt: CSV data as HTML table
diff --git a/Documentation/ContentObjects/Fluidtemplate/DataProcessing/CustomDataProcessors.rst b/Documentation/ContentObjects/Fluidtemplate/DataProcessing/CustomDataProcessors.rst
index 7f9c2fb53..4628e8f28 100644
--- a/Documentation/ContentObjects/Fluidtemplate/DataProcessing/CustomDataProcessors.rst
+++ b/Documentation/ContentObjects/Fluidtemplate/DataProcessing/CustomDataProcessors.rst
@@ -31,7 +31,7 @@ specific custom data processor, of course.
Example output
==============
-.. figure:: /Images/ManualScreenshots/Fluidtemplate/CustomDataProcessor.png
+.. figure:: /Images/ManualScreenshots/FrontendOutput/DataProcessing/CustomDataProcessor.png
:class: with-shadow
:alt: custom data processor output
diff --git a/Documentation/ContentObjects/Fluidtemplate/DataProcessing/DatabaseQueryProcessor.rst b/Documentation/ContentObjects/Fluidtemplate/DataProcessing/DatabaseQueryProcessor.rst
index 924a9405d..0418a8960 100644
--- a/Documentation/ContentObjects/Fluidtemplate/DataProcessing/DatabaseQueryProcessor.rst
+++ b/Documentation/ContentObjects/Fluidtemplate/DataProcessing/DatabaseQueryProcessor.rst
@@ -123,6 +123,6 @@ Output
The array of records each contains the data of the table in :php:`data` and
the data of the images in :php:`files`.
-.. figure:: /Images/ManualScreenshots/Fluidtemplate/DatabaseProcessor.png
+.. figure:: /Images/ManualScreenshots/FrontendOutput/DataProcessing/DatabaseProcessor.png
:class: with-shadow
:alt: haiku record data dump and output
diff --git a/Documentation/ContentObjects/Fluidtemplate/DataProcessing/FilesProcessor.rst b/Documentation/ContentObjects/Fluidtemplate/DataProcessing/FilesProcessor.rst
index 91dc01327..174d11700 100644
--- a/Documentation/ContentObjects/Fluidtemplate/DataProcessing/FilesProcessor.rst
+++ b/Documentation/ContentObjects/Fluidtemplate/DataProcessing/FilesProcessor.rst
@@ -208,7 +208,7 @@ Output
The array :php:`images` contains the data of the files now.
-.. figure:: /Images/ManualScreenshots/Fluidtemplate/FilesProcessor.png
+.. figure:: /Images/ManualScreenshots/FrontendOutput/DataProcessing/FilesProcessor.png
:class: with-shadow
:alt: files dump and output
diff --git a/Documentation/ContentObjects/Fluidtemplate/DataProcessing/GalleryProcessor.rst b/Documentation/ContentObjects/Fluidtemplate/DataProcessing/GalleryProcessor.rst
index 06fb32882..7221c176a 100644
--- a/Documentation/ContentObjects/Fluidtemplate/DataProcessing/GalleryProcessor.rst
+++ b/Documentation/ContentObjects/Fluidtemplate/DataProcessing/GalleryProcessor.rst
@@ -239,6 +239,6 @@ The array now contains the images ordered in rows and columns. For each image th
width and height supplied.
-.. figure:: /Images/ManualScreenshots/Fluidtemplate/GalleryProcessor.png
+.. figure:: /Images/ManualScreenshots/FrontendOutput/DataProcessing/GalleryProcessor.png
:class: with-shadow
:alt: Gallery dump and output
diff --git a/Documentation/ContentObjects/Fluidtemplate/DataProcessing/LanguageMenuProcessor.rst b/Documentation/ContentObjects/Fluidtemplate/DataProcessing/LanguageMenuProcessor.rst
index 5920cf6b4..a45b17594 100644
--- a/Documentation/ContentObjects/Fluidtemplate/DataProcessing/LanguageMenuProcessor.rst
+++ b/Documentation/ContentObjects/Fluidtemplate/DataProcessing/LanguageMenuProcessor.rst
@@ -119,6 +119,6 @@ German language has the :php:`item.available` set to false. It therefore
doesn't get linked in the template.
-.. figure:: /Images/ManualScreenshots/Fluidtemplate/LanguageMenuProcessor.png
+.. figure:: /Images/ManualScreenshots/FrontendOutput/DataProcessing/LanguageMenuProcessor.png
:class: with-shadow
:alt: language menu dump and output
diff --git a/Documentation/ContentObjects/Fluidtemplate/DataProcessing/MenuProcessor.rst b/Documentation/ContentObjects/Fluidtemplate/DataProcessing/MenuProcessor.rst
index 137e6def0..3ac16a041 100644
--- a/Documentation/ContentObjects/Fluidtemplate/DataProcessing/MenuProcessor.rst
+++ b/Documentation/ContentObjects/Fluidtemplate/DataProcessing/MenuProcessor.rst
@@ -157,6 +157,6 @@ Output
The array now contains the menu items on level one. Each item in return has the menu
items of level 2 in an array called :php:`children`.
-.. figure:: /Images/ManualScreenshots/Fluidtemplate/MenuProcessor.png
+.. figure:: /Images/ManualScreenshots/FrontendOutput/DataProcessing/MenuProcessor.png
:class: with-shadow
:alt: language menu dump and output
diff --git a/Documentation/ContentObjects/Fluidtemplate/DataProcessing/SiteProcessor.rst b/Documentation/ContentObjects/Fluidtemplate/DataProcessing/SiteProcessor.rst
index 34ba347a2..26528abfa 100644
--- a/Documentation/ContentObjects/Fluidtemplate/DataProcessing/SiteProcessor.rst
+++ b/Documentation/ContentObjects/Fluidtemplate/DataProcessing/SiteProcessor.rst
@@ -72,6 +72,6 @@ Output
The array now contains the information from the site configuration:
-.. figure:: /Images/ManualScreenshots/Fluidtemplate/SiteProcessor.png
+.. figure:: /Images/ManualScreenshots/FrontendOutput/DataProcessing/SiteProcessor.png
:class: with-shadow
:alt: site configuration dump and output
diff --git a/Documentation/ContentObjects/Fluidtemplate/DataProcessing/SplitProcessor.rst b/Documentation/ContentObjects/Fluidtemplate/DataProcessing/SplitProcessor.rst
index 1e69c04fa..8868b2a4a 100644
--- a/Documentation/ContentObjects/Fluidtemplate/DataProcessing/SplitProcessor.rst
+++ b/Documentation/ContentObjects/Fluidtemplate/DataProcessing/SplitProcessor.rst
@@ -130,6 +130,6 @@ Output
The array now contains the split strings:
-.. figure:: /Images/ManualScreenshots/Fluidtemplate/SplitProcessor.png
+.. figure:: /Images/ManualScreenshots/FrontendOutput/DataProcessing/SplitProcessor.png
:class: with-shadow
:alt: split dump and output
diff --git a/Documentation/ContentObjects/GeneralInformation/Index.rst b/Documentation/ContentObjects/GeneralInformation/Index.rst
index 791ae2b65..ed508d227 100644
--- a/Documentation/ContentObjects/GeneralInformation/Index.rst
+++ b/Documentation/ContentObjects/GeneralInformation/Index.rst
@@ -133,11 +133,11 @@ Example:
The result is this configuration:
-.. include:: /Images/ManualScreenshots/ContentObjectsExampleMerge1.rst.txt
+.. include:: /Images/ManualScreenshots/FrontendOutput/StdWrap/ContentObjectsExampleMerge1.rst.txt
Notice that :typoscript:`.value` was *not* cleared, because it's simply two arrays
which are joined:
-.. include:: /Images/ManualScreenshots/ContentObjectsExampleMerge2.rst.txt
+.. include:: /Images/ManualScreenshots/FrontendOutput/StdWrap/ContentObjectsExampleMerge2.rst.txt
So hence the line :typoscript:`page.20.value >` in the above example is useless.
diff --git a/Documentation/ContentObjects/Hmenu/Index.rst b/Documentation/ContentObjects/Hmenu/Index.rst
index 3efc0a62a..4934abefd 100644
--- a/Documentation/ContentObjects/Hmenu/Index.rst
+++ b/Documentation/ContentObjects/Hmenu/Index.rst
@@ -970,7 +970,7 @@ list from the property ".items".
work if the parent page of the current page is the root page of the
site.
- .. figure:: /Images/ManualScreenshots/ContentObjectsHmenuSpecialBrowse.png
+ .. figure:: /Images/ManualScreenshots/FrontendOutput/Hmenu/ContentObjectsHmenuSpecialBrowse.png
:alt: Example for the usage of the property "items".
**nextsection\_last** / **prevsection\_last:** Where
@@ -1612,7 +1612,7 @@ are graphical items:
The menu looks like this on a web page:
-.. figure:: /Images/ManualScreenshots/ContentObjectsHmenuExampleMenu.png
+.. figure:: /Images/ManualScreenshots/FrontendOutput/Hmenu/ContentObjectsHmenuExampleMenu.png
:alt: Output of the example menu.
The TypoScript code above generates this menu, but the items do not
diff --git a/Documentation/Gifbuilder/Examples.rst b/Documentation/Gifbuilder/Examples.rst
index 294e6ef1e..6b48bd48e 100644
--- a/Documentation/Gifbuilder/Examples.rst
+++ b/Documentation/Gifbuilder/Examples.rst
@@ -393,17 +393,17 @@ create much better quality images:
without the niceText property of the GIFBUILDER
:ref:`TEXT ` object enabled as a side effect).
-.. |A Background Image| image:: /Images/ManualScreenshots/GifbuilderExamples/Backimage.jpg
+.. |A Background Image| image:: /Images/ThirdParty/GifbuilderExamples/Backimage.jpg
:target: /File:Backimage.jpg
-.. |A overlay image| image:: /Images/ManualScreenshots/GifbuilderExamples/Logo.png
+.. |A overlay image| image:: /Images/ThirdParty/GifbuilderExamples/Logo.png
:target: /File:Logo.png
-.. |A normal mask| image:: /Images/ManualScreenshots/GifbuilderExamples/Mask.png
+.. |A normal mask| image:: /Images/ThirdParty/GifbuilderExamples/Mask.png
:target: /File:Mask.png
-.. |Description| image:: /Images/ManualScreenshots/GifbuilderExamples/Mask_i.png
+.. |Description| image:: /Images/ThirdParty/GifbuilderExamples/Mask_i.png
:target: /File:Mask_i.png
-.. |image1| image:: /Images/ManualScreenshots/GifbuilderExamples/Result.jpg
+.. |image1| image:: /Images/ThirdParty/GifbuilderExamples/Result.jpg
:target: /File:Result.jpg
-.. |Variant 1| image:: /Images/ManualScreenshots/GifbuilderExamples/Typo3_shadow1.png
+.. |Variant 1| image:: /Images/ThirdParty/GifbuilderExamples/Typo3_shadow1.png
:target: /File:Typo3_shadow1.png
-.. |Variant 2| image:: /Images/ManualScreenshots/GifbuilderExamples/Typo3_shadow2.png
+.. |Variant 2| image:: /Images/ThirdParty/GifbuilderExamples/Typo3_shadow2.png
:target: /File:Typo3_shadow2.png
diff --git a/Documentation/Images/ManualScreenshots/ContentObjectsExampleMerge1.rst.txt b/Documentation/Images/ManualScreenshots/ContentObjectsExampleMerge1.rst.txt
deleted file mode 100644
index a8fc48534..000000000
--- a/Documentation/Images/ManualScreenshots/ContentObjectsExampleMerge1.rst.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-.. Manual Screenshot
-
-.. figure:: /Images/ManualScreenshots/ContentObjectsExampleMerge1.png
- :class: with-shadow
diff --git a/Documentation/Images/ManualScreenshots/ContentObjectsExampleMerge2.rst.txt b/Documentation/Images/ManualScreenshots/ContentObjectsExampleMerge2.rst.txt
deleted file mode 100644
index 82a602b59..000000000
--- a/Documentation/Images/ManualScreenshots/ContentObjectsExampleMerge2.rst.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-.. Manual Screenshot
-
-.. figure:: /Images/ManualScreenshots/ContentObjectsExampleMerge2.png
- :class: with-shadow
diff --git a/Documentation/Images/ManualScreenshots/Fluidtemplate/DataProcessingExamples.png b/Documentation/Images/ManualScreenshots/DataProcessing/DataProcessingExamples.png
similarity index 100%
rename from Documentation/Images/ManualScreenshots/Fluidtemplate/DataProcessingExamples.png
rename to Documentation/Images/ManualScreenshots/DataProcessing/DataProcessingExamples.png
diff --git a/Documentation/Images/ManualScreenshots/Fluidtemplate/CsvProcessor.png b/Documentation/Images/ManualScreenshots/FrontendOutput/DataProcessing/CsvProcessor.png
similarity index 100%
rename from Documentation/Images/ManualScreenshots/Fluidtemplate/CsvProcessor.png
rename to Documentation/Images/ManualScreenshots/FrontendOutput/DataProcessing/CsvProcessor.png
diff --git a/Documentation/Images/ManualScreenshots/Fluidtemplate/CustomDataProcessor.png b/Documentation/Images/ManualScreenshots/FrontendOutput/DataProcessing/CustomDataProcessor.png
similarity index 100%
rename from Documentation/Images/ManualScreenshots/Fluidtemplate/CustomDataProcessor.png
rename to Documentation/Images/ManualScreenshots/FrontendOutput/DataProcessing/CustomDataProcessor.png
diff --git a/Documentation/Images/ManualScreenshots/Fluidtemplate/DatabaseProcessor.png b/Documentation/Images/ManualScreenshots/FrontendOutput/DataProcessing/DatabaseProcessor.png
similarity index 100%
rename from Documentation/Images/ManualScreenshots/Fluidtemplate/DatabaseProcessor.png
rename to Documentation/Images/ManualScreenshots/FrontendOutput/DataProcessing/DatabaseProcessor.png
diff --git a/Documentation/Images/ManualScreenshots/Fluidtemplate/FilesProcessor.png b/Documentation/Images/ManualScreenshots/FrontendOutput/DataProcessing/FilesProcessor.png
similarity index 100%
rename from Documentation/Images/ManualScreenshots/Fluidtemplate/FilesProcessor.png
rename to Documentation/Images/ManualScreenshots/FrontendOutput/DataProcessing/FilesProcessor.png
diff --git a/Documentation/Images/ManualScreenshots/Fluidtemplate/GalleryProcessor.png b/Documentation/Images/ManualScreenshots/FrontendOutput/DataProcessing/GalleryProcessor.png
similarity index 100%
rename from Documentation/Images/ManualScreenshots/Fluidtemplate/GalleryProcessor.png
rename to Documentation/Images/ManualScreenshots/FrontendOutput/DataProcessing/GalleryProcessor.png
diff --git a/Documentation/Images/ManualScreenshots/Fluidtemplate/LanguageMenuProcessor.png b/Documentation/Images/ManualScreenshots/FrontendOutput/DataProcessing/LanguageMenuProcessor.png
similarity index 100%
rename from Documentation/Images/ManualScreenshots/Fluidtemplate/LanguageMenuProcessor.png
rename to Documentation/Images/ManualScreenshots/FrontendOutput/DataProcessing/LanguageMenuProcessor.png
diff --git a/Documentation/Images/ManualScreenshots/Fluidtemplate/Menu-extended.png b/Documentation/Images/ManualScreenshots/FrontendOutput/DataProcessing/Menu-extended.png
similarity index 100%
rename from Documentation/Images/ManualScreenshots/Fluidtemplate/Menu-extended.png
rename to Documentation/Images/ManualScreenshots/FrontendOutput/DataProcessing/Menu-extended.png
diff --git a/Documentation/Images/ManualScreenshots/Fluidtemplate/MenuProcessor.png b/Documentation/Images/ManualScreenshots/FrontendOutput/DataProcessing/MenuProcessor.png
similarity index 100%
rename from Documentation/Images/ManualScreenshots/Fluidtemplate/MenuProcessor.png
rename to Documentation/Images/ManualScreenshots/FrontendOutput/DataProcessing/MenuProcessor.png
diff --git a/Documentation/Images/ManualScreenshots/Fluidtemplate/SiteProcessor.png b/Documentation/Images/ManualScreenshots/FrontendOutput/DataProcessing/SiteProcessor.png
similarity index 100%
rename from Documentation/Images/ManualScreenshots/Fluidtemplate/SiteProcessor.png
rename to Documentation/Images/ManualScreenshots/FrontendOutput/DataProcessing/SiteProcessor.png
diff --git a/Documentation/Images/ManualScreenshots/Fluidtemplate/SplitProcessor.png b/Documentation/Images/ManualScreenshots/FrontendOutput/DataProcessing/SplitProcessor.png
similarity index 100%
rename from Documentation/Images/ManualScreenshots/Fluidtemplate/SplitProcessor.png
rename to Documentation/Images/ManualScreenshots/FrontendOutput/DataProcessing/SplitProcessor.png
diff --git a/Documentation/Images/ManualScreenshots/ContentObjectsHmenuExampleMenu.png b/Documentation/Images/ManualScreenshots/FrontendOutput/Hmenu/ContentObjectsHmenuExampleMenu.png
similarity index 100%
rename from Documentation/Images/ManualScreenshots/ContentObjectsHmenuExampleMenu.png
rename to Documentation/Images/ManualScreenshots/FrontendOutput/Hmenu/ContentObjectsHmenuExampleMenu.png
diff --git a/Documentation/Images/ManualScreenshots/ContentObjectsHmenuSpecialBrowse.png b/Documentation/Images/ManualScreenshots/FrontendOutput/Hmenu/ContentObjectsHmenuSpecialBrowse.png
similarity index 100%
rename from Documentation/Images/ManualScreenshots/ContentObjectsHmenuSpecialBrowse.png
rename to Documentation/Images/ManualScreenshots/FrontendOutput/Hmenu/ContentObjectsHmenuSpecialBrowse.png
diff --git a/Documentation/Images/ManualScreenshots/MenuObjectsCommonPropertiesSubmenuObjSuffixes.png b/Documentation/Images/ManualScreenshots/FrontendOutput/Hmenu/MenuObjectsCommonPropertiesSubmenuObjSuffixes.png
similarity index 100%
rename from Documentation/Images/ManualScreenshots/MenuObjectsCommonPropertiesSubmenuObjSuffixes.png
rename to Documentation/Images/ManualScreenshots/FrontendOutput/Hmenu/MenuObjectsCommonPropertiesSubmenuObjSuffixes.png
diff --git a/Documentation/Images/ManualScreenshots/ContentObjectsExampleMerge1.png b/Documentation/Images/ManualScreenshots/FrontendOutput/StdWrap/ContentObjectsExampleMerge1.png
similarity index 100%
rename from Documentation/Images/ManualScreenshots/ContentObjectsExampleMerge1.png
rename to Documentation/Images/ManualScreenshots/FrontendOutput/StdWrap/ContentObjectsExampleMerge1.png
diff --git a/Documentation/Images/ManualScreenshots/FrontendOutput/StdWrap/ContentObjectsExampleMerge1.rst.txt b/Documentation/Images/ManualScreenshots/FrontendOutput/StdWrap/ContentObjectsExampleMerge1.rst.txt
new file mode 100644
index 000000000..2b094037a
--- /dev/null
+++ b/Documentation/Images/ManualScreenshots/FrontendOutput/StdWrap/ContentObjectsExampleMerge1.rst.txt
@@ -0,0 +1,4 @@
+.. Manual Screenshot
+
+.. figure:: /Images/ManualScreenshots/FrontendOutput/StdWrap/ContentObjectsExampleMerge1.png
+ :class: with-shadow
diff --git a/Documentation/Images/ManualScreenshots/ContentObjectsExampleMerge2.png b/Documentation/Images/ManualScreenshots/FrontendOutput/StdWrap/ContentObjectsExampleMerge2.png
similarity index 100%
rename from Documentation/Images/ManualScreenshots/ContentObjectsExampleMerge2.png
rename to Documentation/Images/ManualScreenshots/FrontendOutput/StdWrap/ContentObjectsExampleMerge2.png
diff --git a/Documentation/Images/ManualScreenshots/FrontendOutput/StdWrap/ContentObjectsExampleMerge2.rst.txt b/Documentation/Images/ManualScreenshots/FrontendOutput/StdWrap/ContentObjectsExampleMerge2.rst.txt
new file mode 100644
index 000000000..e20dbfe03
--- /dev/null
+++ b/Documentation/Images/ManualScreenshots/FrontendOutput/StdWrap/ContentObjectsExampleMerge2.rst.txt
@@ -0,0 +1,4 @@
+.. Manual Screenshot
+
+.. figure:: /Images/ManualScreenshots/FrontendOutput/StdWrap/ContentObjectsExampleMerge2.png
+ :class: with-shadow
diff --git a/Documentation/Images/ManualScreenshots/TemplatesCustomSubcategory.png b/Documentation/Images/ManualScreenshots/Templates/CustomSubcategory.png
similarity index 100%
rename from Documentation/Images/ManualScreenshots/TemplatesCustomSubcategory.png
rename to Documentation/Images/ManualScreenshots/Templates/CustomSubcategory.png
diff --git a/Documentation/Images/ManualScreenshots/TemplatesFullListing.png b/Documentation/Images/ManualScreenshots/Templates/FullListing.png
similarity index 100%
rename from Documentation/Images/ManualScreenshots/TemplatesFullListing.png
rename to Documentation/Images/ManualScreenshots/Templates/FullListing.png
diff --git a/Documentation/Images/ManualScreenshots/TemplatesInputNoT3Editor.png b/Documentation/Images/ManualScreenshots/Templates/InputNoT3Editor.png
similarity index 100%
rename from Documentation/Images/ManualScreenshots/TemplatesInputNoT3Editor.png
rename to Documentation/Images/ManualScreenshots/Templates/InputNoT3Editor.png
diff --git a/Documentation/Images/ManualScreenshots/TemplatesSyntaxError.png b/Documentation/Images/ManualScreenshots/Templates/SyntaxError.png
similarity index 100%
rename from Documentation/Images/ManualScreenshots/TemplatesSyntaxError.png
rename to Documentation/Images/ManualScreenshots/Templates/SyntaxError.png
diff --git a/Documentation/Images/ManualScreenshots/GifbuilderExamples/Backimage.jpg b/Documentation/Images/ThirdParty/GifbuilderExamples/Backimage.jpg
similarity index 100%
rename from Documentation/Images/ManualScreenshots/GifbuilderExamples/Backimage.jpg
rename to Documentation/Images/ThirdParty/GifbuilderExamples/Backimage.jpg
diff --git a/Documentation/Images/ManualScreenshots/GifbuilderExamples/Logo.png b/Documentation/Images/ThirdParty/GifbuilderExamples/Logo.png
similarity index 100%
rename from Documentation/Images/ManualScreenshots/GifbuilderExamples/Logo.png
rename to Documentation/Images/ThirdParty/GifbuilderExamples/Logo.png
diff --git a/Documentation/Images/ManualScreenshots/GifbuilderExamples/Mask.png b/Documentation/Images/ThirdParty/GifbuilderExamples/Mask.png
similarity index 100%
rename from Documentation/Images/ManualScreenshots/GifbuilderExamples/Mask.png
rename to Documentation/Images/ThirdParty/GifbuilderExamples/Mask.png
diff --git a/Documentation/Images/ManualScreenshots/GifbuilderExamples/Mask_i.png b/Documentation/Images/ThirdParty/GifbuilderExamples/Mask_i.png
similarity index 100%
rename from Documentation/Images/ManualScreenshots/GifbuilderExamples/Mask_i.png
rename to Documentation/Images/ThirdParty/GifbuilderExamples/Mask_i.png
diff --git a/Documentation/Images/ManualScreenshots/GifbuilderExamples/Result.jpg b/Documentation/Images/ThirdParty/GifbuilderExamples/Result.jpg
similarity index 100%
rename from Documentation/Images/ManualScreenshots/GifbuilderExamples/Result.jpg
rename to Documentation/Images/ThirdParty/GifbuilderExamples/Result.jpg
diff --git a/Documentation/Images/ManualScreenshots/GifbuilderExamples/Typo3_shadow1.png b/Documentation/Images/ThirdParty/GifbuilderExamples/Typo3_shadow1.png
similarity index 100%
rename from Documentation/Images/ManualScreenshots/GifbuilderExamples/Typo3_shadow1.png
rename to Documentation/Images/ThirdParty/GifbuilderExamples/Typo3_shadow1.png
diff --git a/Documentation/Images/ManualScreenshots/GifbuilderExamples/Typo3_shadow2.png b/Documentation/Images/ThirdParty/GifbuilderExamples/Typo3_shadow2.png
similarity index 100%
rename from Documentation/Images/ManualScreenshots/GifbuilderExamples/Typo3_shadow2.png
rename to Documentation/Images/ThirdParty/GifbuilderExamples/Typo3_shadow2.png
diff --git a/Documentation/MenuObjects/CommonProperties/Index.rst b/Documentation/MenuObjects/CommonProperties/Index.rst
index 617d735c6..d1a9c07a3 100644
--- a/Documentation/MenuObjects/CommonProperties/Index.rst
+++ b/Documentation/MenuObjects/CommonProperties/Index.rst
@@ -305,7 +305,7 @@ showAccessRestrictedPages
The result can be seen in the image below:
- .. figure:: /Images/ManualScreenshots/MenuObjectsCommonPropertiesSubmenuObjSuffixes.png
+ .. figure:: /Images/ManualScreenshots/FrontendOutput/Hmenu/MenuObjectsCommonPropertiesSubmenuObjSuffixes.png
:alt: Output of the above example.
Applies to TMENU on >= 2 :sup:`nd` level in a menu.
diff --git a/Documentation/UsingSetting/Debugging.rst b/Documentation/UsingSetting/Debugging.rst
index 50f7e61a9..87d4da6be 100644
--- a/Documentation/UsingSetting/Debugging.rst
+++ b/Documentation/UsingSetting/Debugging.rst
@@ -34,7 +34,7 @@ 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:
-.. figure:: /Images/ManualScreenshots/TemplatesSyntaxError.png
+.. figure:: /Images/ManualScreenshots/Templates/SyntaxError.png
:alt: The TypoScript Object Browser showing a syntax error
:class: with-shadow
@@ -48,7 +48,7 @@ analyzer:
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/TemplatesFullListing.png
+.. figure:: /Images/ManualScreenshots/Templates/FullListing.png
:alt: The TypoScript Object Browser showing a syntax error
:class: with-shadow
diff --git a/Documentation/UsingSetting/Entering.rst b/Documentation/UsingSetting/Entering.rst
index b145f5172..82a999cf8 100644
--- a/Documentation/UsingSetting/Entering.rst
+++ b/Documentation/UsingSetting/Entering.rst
@@ -27,7 +27,7 @@ If the "t3editor" system extension is not installed or has been
disabled via configuration options, the :guilabel:`Constants` and :guilabel:`Setup` fields
will be normal multi-line text fields.
-.. figure:: /Images/ManualScreenshots/TemplatesInputNoT3Editor.png
+.. figure:: /Images/ManualScreenshots/Templates/InputNoT3Editor.png
:alt: The Constants and Setup fields without the t3editor enabled
diff --git a/Documentation/UsingSetting/TheConstantEditor.rst b/Documentation/UsingSetting/TheConstantEditor.rst
index 173393b22..d1fc5562d 100644
--- a/Documentation/UsingSetting/TheConstantEditor.rst
+++ b/Documentation/UsingSetting/TheConstantEditor.rst
@@ -193,7 +193,7 @@ Usage example::
Will look in the Constant Editor like this:
-.. figure:: /Images/ManualScreenshots/TemplatesCustomSubcategory.png
+.. figure:: /Images/ManualScreenshots/Templates/CustomSubcategory.png
:alt: The Constant Editor showing a custom category.