diff --git a/asciidoc/pmg-docbook.conf b/asciidoc/pmg-docbook.conf
index 044ea84..8c557b6 100644
--- a/asciidoc/pmg-docbook.conf
+++ b/asciidoc/pmg-docbook.conf
@@ -275,7 +275,7 @@ endif::deprecated-quotes[]
 <formalpara{id? id="{id}"}{role? role="{role}"}{reftext? xreflabel="{reftext}"}><title>{title}</title><para>
 {thumbnail#}<mediaobject>
 {thumbnail#}  <imageobject>
-{thumbnail#}  <imagedata fileref="images/screenshot/{thumbnail}"{width? contentwidth="{width}"}{height? contentdepth="{height}"}{scale? scale="{scale}"}{scaledwidth? width="{scaledwidth}" scalefit="1"}{align? align="{align}"}/>
+{thumbnail#}  <imagedata fileref="images/{thumbnail}"{width? contentwidth="{width}"}{height? contentdepth="{height}"}{scale? scale="{scale}"}{scaledwidth? width="{scaledwidth}" scalefit="1"}{align? align="{align}"}/>
 {thumbnail#}  </imageobject>
 {thumbnail#}  <textobject><phrase>{alt={thumbnail}}</phrase></textobject>
 {thumbnail#}</mediaobject>
diff --git a/asciidoc/pmg-html.conf b/asciidoc/pmg-html.conf
index a83a8a6..9f694fd 100644
--- a/asciidoc/pmg-html.conf
+++ b/asciidoc/pmg-html.conf
@@ -302,8 +302,8 @@ endif::deprecated-quotes[]
 # Paragraph substitution.
 [paragraph]
 <div class="paragraph{role? {role}}{unbreakable-option? unbreakable}"{id? id="{id}"}>
-{thumbnail#}<a class="image" href="images/screenshot/{thumbnail}">
-{thumbnail#}<img src="images/screenshot/{thumbnail}" alt="{alt={thumbnail}}"
+{thumbnail#}<a class="image" href="images/{thumbnail}">
+{thumbnail#}<img src="images/{thumbnail}" alt="{alt={thumbnail}}"
 {thumbnail#}{width#}width="{width}"
 {thumbnail#}{big#}{width%}width="800"
 {thumbnail#}{big%}{width%}width="250"
diff --git a/pmg-administration.adoc b/pmg-administration.adoc
index 3f7ebaf..8f632dc 100644
--- a/pmg-administration.adoc
+++ b/pmg-administration.adoc
@@ -13,7 +13,7 @@ Server Administration
 Status
 ~~~~~~
 
-[thumbnail="pmg-gui-server-status.png", big=1]
+[thumbnail="screenshot/pmg-gui-server-status.png", big=1]
 
 This page shows statistics about server CPU, memory, disk and network
 usage. You can select the displayed time span from the upper right.
@@ -26,7 +26,7 @@ button. It is also possible to trigger a server 'Restart' or
 Services
 ~~~~~~~~
 
-[thumbnail="pmg-gui-service-status.png", big=1]
+[thumbnail="screenshot/pmg-gui-service-status.png", big=1]
 
 This panel lists all the major services used for mail processing and
 cluster synchronization. If necessary, you can start, stop or restart
@@ -46,7 +46,7 @@ systemctl status postfix
 Updates
 ~~~~~~~
 
-[thumbnail="pmg-gui-updates.png", big=1]
+[thumbnail="screenshot/pmg-gui-updates.png", big=1]
 
 We release software updates on a regular basis, and it is recommended
 to always run the latest available version. This page shows the
@@ -60,7 +60,7 @@ details about the available package repositories.
 Syslog and Tasks
 ~~~~~~~~~~~~~~~~
 
-[thumbnail="pmg-gui-syslog.png", big=1]
+[thumbnail="screenshot/pmg-gui-syslog.png", big=1]
 
 The Syslog page gives you a quick real-time log view. You can use the
 xref:pmg_tracking_center[Tracking Center] to search the logs.
@@ -77,7 +77,7 @@ Quarantine
 Spam
 ~~~~
 
-[thumbnail="pmg-gui-spam-quarantine.png", big=1]
+[thumbnail="screenshot/pmg-gui-spam-quarantine.png", big=1]
 
 This panel lets you inspect the mail quarantine. Emails can be safely
 previewed and if desired, delivered to the original user.
@@ -126,7 +126,7 @@ users can manage this themselves.
 Tracking Center
 ---------------
 
-[thumbnail="pmg-gui-tracking-center.png", big=1]
+[thumbnail="screenshot/pmg-gui-tracking-center.png", big=1]
 
 Email processing is a complex task and involves several service
 daemons. Each daemon logs information to the syslog service. The
@@ -191,7 +191,7 @@ combines the results from the first and second phase.
 Postfix Queue Administration
 ----------------------------
 
-[thumbnail="pmg-gui-queue-admin-summary.png", big=1]
+[thumbnail="screenshot/pmg-gui-queue-admin-summary.png", big=1]
 
 Mail-queues are one of the central concepts of the SMTP protocol. Once a
 mail server accepts a mail for further processing it saves it to a queue.
@@ -228,7 +228,7 @@ one of the servers for which you relay emails sends spam itself.
 
 Deferred Mail
 ~~~~~~~~~~~~~
-[thumbnail="pmg-gui-queue-admin-deferred.png"]
+[thumbnail="screenshot/pmg-gui-queue-admin-deferred.png"]
 
 In the 'Deferred Mail' tab, you can examine each deferred email
 separately. In addition to providing contact information about the
diff --git a/pmg-installation.adoc b/pmg-installation.adoc
index cc3d7a2..65c106f 100644
--- a/pmg-installation.adoc
+++ b/pmg-installation.adoc
@@ -48,7 +48,7 @@ TIP: Make sure that booting from the installation medium (for example, USB) is
 enabled in your server's firmware settings. Secure boot needs to be disabled
 when booting an installer prior to {pmg} version 8.1.
 
-[thumbnail="../installer/pmg-grub-menu.png"]
+[thumbnail="installer/pmg-grub-menu.png"]
 
 After choosing the correct entry (for example, Boot from USB) the {pmg} menu
 will be displayed, and one of the following options can be selected:
@@ -74,7 +74,7 @@ kernel to use the (first) serial port of the machine for in- and output. This
 can be used if the machine is completely headless and only has a serial console
 available.
 
-[thumbnail="../installer/pmg-tui-installer.png"]
+[thumbnail="installer/pmg-tui-installer.png"]
 
 Both modes use the same code base for the actual installation process to
 benefit from more than a decade of bug fixes and ensure feature parity.
@@ -116,7 +116,7 @@ run this option.
 
 You normally select *Install {pmg} (Graphical)* to start the installation.
 
-[thumbnail="../installer/pmg-select-target-disk.png"]
+[thumbnail="installer/pmg-select-target-disk.png"]
 
 The first step is to read our EULA (End User License Agreement). Following
 this, you can select the target hard disk(s) for the installation.
@@ -138,7 +138,7 @@ lets you choose the ZFS RAID level and select which disks will be used.
 WARNING: ZFS on top of any hardware RAID is not supported and can result in data
 loss.
 
-[thumbnail="../installer/pmg-select-location.png", float="left"]
+[thumbnail="installer/pmg-select-location.png", float="left"]
 
 The next page asks for basic configuration options like your
 location, timezone, and keyboard layout. The location is used to
@@ -147,7 +147,7 @@ The installer is usually able to auto-detect these settings, so you only need to
 change them in rare situations when auto-detection fails, or when you want to
 use a keyboard layout not commonly used in your country.
 
-[thumbnail="../installer/pmg-set-password.png"]
+[thumbnail="installer/pmg-set-password.png"]
 
 You then need to specify an email address and the superuser (root)
 password. The password must have at least 5 characters, but we highly
@@ -171,13 +171,13 @@ example:
 
 All those notification mails will be sent to the specified email address.
 
-[thumbnail="../installer/pmg-setup-network.png"]
+[thumbnail="installer/pmg-setup-network.png"]
 
 The next step is the network configuration. Please note that you can use either
 IPv4 or IPv6 here, but not both. If you want to configure a dual stack node,
 you can easily do that after the installation.
 
-[thumbnail="../installer/pmg-installation.png", float="left"]
+[thumbnail="installer/pmg-installation.png", float="left"]
 
 When you press `Next`, you will see an overview of your entered configuration.
 Please re-check every setting, you can still use the `Previous` button to go
@@ -186,7 +186,7 @@ back and edit any settings.
 After clicking `Install`, the installer will begin to format and copy packages
 to the target disk(s).
 
-[thumbnail="../installer/pmg-summary.png"]
+[thumbnail="installer/pmg-summary.png"]
 
 Copying the packages usually takes several minutes. When this is
 finished, you can reboot the server.
@@ -198,7 +198,7 @@ is still not working, look at the xref:getting_help[how to get help chapter].
 
 Further configuration is done via the {pmg} web interface:
 
-[thumbnail="pmg-gui-login-window.png"]
+[thumbnail="screenshot/pmg-gui-login-window.png"]
 
 . Point your browser to the IP address given during the installation
 (https://youripaddress:8006).
@@ -366,7 +366,7 @@ files placed in `/etc/apt/sources.list.d/`.
 Repository Management
 ^^^^^^^^^^^^^^^^^^^^^
 
-[thumbnail="pmg-gui-admin-repositories.png"]
+[thumbnail="screenshot/pmg-gui-admin-repositories.png"]
 
 Since {pmg} 7.0 you can check the repository state in the web interface. The
 'Dashboard' shows a high level status overview, while the separate 'Repository'
diff --git a/pmg-intro.adoc b/pmg-intro.adoc
index 5b8d1be..28d3f8d 100644
--- a/pmg-intro.adoc
+++ b/pmg-intro.adoc
@@ -175,7 +175,7 @@ Web-based Management Interface
 management interface allows you to set up and maintain even a complex mail
 system with ease.
 
-[thumbnail="pmg-gui-dashboard.png"]
+[thumbnail="screenshot/pmg-gui-dashboard.png"]
 
 There is no need to install a separate management tool. Any modern internet
 browser is sufficient.
diff --git a/pmg-mail-filter.adoc b/pmg-mail-filter.adoc
index 264959c..235f156 100644
--- a/pmg-mail-filter.adoc
+++ b/pmg-mail-filter.adoc
@@ -6,7 +6,7 @@ Rule-Based Mail Filter
 easy but powerful way to define filter rules by user, domain, time
 frame, content type, and resulting action.
 
-[thumbnail="pmg-gui-mail-filter-rules.png", big=1]
+[thumbnail="screenshot/pmg-gui-mail-filter-rules.png", big=1]
 
 Every rule has 5 categories ('FROM', 'TO', 'WHEN', 'WHAT', and
 'ACTION'), and each category may contain several objects to match
@@ -118,7 +118,7 @@ selection in the web ui:
 'Action' - objects
 ------------------
 
-[thumbnail="pmg-gui-mail-filter-actions.png", big=1]
+[thumbnail="screenshot/pmg-gui-mail-filter-actions.png", big=1]
 
 Please note that some actions stop further rule processing. We call
 such actions 'final'.
@@ -235,7 +235,7 @@ existence of the separator can be configured with the `position` and
 'Who' objects
 -------------
 
-[thumbnail="pmg-gui-mail-filter-who-objects.png", big=1]
+[thumbnail="screenshot/pmg-gui-mail-filter-who-objects.png", big=1]
 
 These types of objects can be used for the 'TO' and/or 'FROM' category,
 and match the sender or recipient of the email. A single object can
@@ -270,7 +270,7 @@ or allow specific senders.
 'What' objects
 --------------
 
-[thumbnail="pmg-gui-mail-filter-what-objects.png", big=1]
+[thumbnail="screenshot/pmg-gui-mail-filter-what-objects.png", big=1]
 
 'What' objects are used to classify the mail's content. A single
 object can combine multiple items, and the following item types are
@@ -312,7 +312,7 @@ This also matches the filenames for all regular (non-archived) attachments.
 'When' objects
 --------------
 
-[thumbnail="pmg-gui-mail-filter-when-objects.png", big=1]
+[thumbnail="screenshot/pmg-gui-mail-filter-when-objects.png", big=1]
 
 'When' objects are used to activate rules at specific times of the
 day. You can compose them from one or more time frame items.
diff --git a/pmg-ssl-certificate.adoc b/pmg-ssl-certificate.adoc
index 9ec7099..00042aa 100644
--- a/pmg-ssl-certificate.adoc
+++ b/pmg-ssl-certificate.adoc
@@ -41,7 +41,7 @@ Upload Custom Certificate
 If you already have a certificate which you want to use for a {pmg} host, you
 can simply upload that certificate over the web interface.
 
-[thumbnail="pmg-gui-certs-upload-custom.png"]
+[thumbnail="screenshot/pmg-gui-certs-upload-custom.png"]
 
 Note that any certificate key files must not be password protected.
 
@@ -65,7 +65,7 @@ supporting all the DNS API endpoints https://acme.sh[acme.sh] does.
 ACME Account
 ^^^^^^^^^^^^
 
-[thumbnail="pmg-gui-acme-create-account.png"]
+[thumbnail="screenshot/pmg-gui-acme-create-account.png"]
 
 You need to register an ACME account per cluster, with the endpoint you want to
 use. The email address used for that account will serve as the contact point for
@@ -97,7 +97,7 @@ technical limitations or if the address of a record is not reachable from the
 public internet. The `dns-01` challenge can be used in such cases. This
 challenge is fulfilled by creating a certain DNS record in the domain's zone.
 
-[thumbnail="pmg-gui-acme-create-challenge-plugin.png"]
+[thumbnail="screenshot/pmg-gui-acme-create-challenge-plugin.png"]
 
 {pmg} supports both of those challenge types out of the box, you can configure
 plugins either over the web interface under `Certificates -> ACME Challenges`,
@@ -112,7 +112,7 @@ Domains
 You can add new or manage existing domain entries under `Certificates`, or
 using the `pmgconfig` command.
 
-[thumbnail="pmg-gui-acme-add-domain.png"]
+[thumbnail="screenshot/pmg-gui-acme-add-domain.png"]
 
 After configuring the desired domain(s) for a node and ensuring that the
 desired ACME account is selected, you can order your new certificate over the
@@ -160,7 +160,7 @@ refer to its documentation for details on configuration of specific APIs.
 The easiest way to configure a new plugin with the DNS API is using the web
 interface (`Certificates -> ACME Accounts/Challenges`).
 
-[thumbnail="pmg-gui-acme-create-challenge-plugin.png"]
+[thumbnail="screenshot/pmg-gui-acme-create-challenge-plugin.png"]
 
 Here you can add a new challenge plugin by selecting your API provider and
 entering the credential data to access your account over their API.
diff --git a/pmg-statistic.adoc b/pmg-statistic.adoc
index c8e00d3..e4c2c3a 100644
--- a/pmg-statistic.adoc
+++ b/pmg-statistic.adoc
@@ -10,7 +10,7 @@ The statistics are displayed for a selected period, which by default is the
 current day. This period can be changed to any other day, a whole month or even
 a whole year.
 
-[thumbnail="pmg-gui-statistics-general.png", big=1]
+[thumbnail="screenshot/pmg-gui-statistics-general.png", big=1]
 
 On the main statistics page there are three graphs with additional data:
 
@@ -50,7 +50,7 @@ including their percentage of the total outgoing mail volume:
 Spam Scores
 -----------
 
-[thumbnail="pmg-gui-statistics-spam-scores.png", big=1]
+[thumbnail="screenshot/pmg-gui-statistics-spam-scores.png", big=1]
 
 The `Spam Scores` panel shows the distribution of the different spam scores for
 the selected time period. Note that you can also select a whole month or even a
@@ -60,7 +60,7 @@ whole year as period to display.
 Virus Charts
 ------------
 
-[thumbnail="pmg-gui-statistics-virus-charts.png"]
+[thumbnail="screenshot/pmg-gui-statistics-virus-charts.png"]
 
 The `Virus Charts` panel gives you an overview of how many virus files were
 tried to be transmitted through your mail infrastructure, but got caught early
@@ -76,7 +76,7 @@ See xref:pmgconfig_clamav[Virus Detector Configuration] for details about how
 Hourly Distribution
 -------------------
 
-[thumbnail="pmg-gui-statistics-hourly-distribution.png", big=1]
+[thumbnail="screenshot/pmg-gui-statistics-hourly-distribution.png", big=1]
 
 The `Hourly Distribution` shows the amount of incoming and outgoing mail per
 hour for the selected time period. For periods spanning a whole month or a
@@ -86,7 +86,7 @@ whole year the arithmetic average of mail volume in an hour will be shown.
 Postscreen
 ----------
 
-[thumbnail="pmg-gui-statistics-postscreen.png"]
+[thumbnail="screenshot/pmg-gui-statistics-postscreen.png"]
 
 Contains a chart with the RBL (Real-time Blackhole Lists) and `pregreet`
 rejects for the selected time frame.
@@ -107,7 +107,7 @@ https://www.postfix.org/POSTSCREEN_README.html[postscreen readme].
 Domain
 ------
 
-[thumbnail="pmg-gui-statistics-domain.png"]
+[thumbnail="screenshot/pmg-gui-statistics-domain.png"]
 
 The `Domain` view is split into two tabs, one for incoming and one for outgoing
 mails.
@@ -125,7 +125,7 @@ with stats for:
 Sender
 ------
 
-[thumbnail="pmg-gui-statistics-sender.png", big=1]
+[thumbnail="screenshot/pmg-gui-statistics-sender.png", big=1]
 
 The `Sender` panel contains a list of e-mail addresses that sent mail out in
 the selected time frame, with a total count, how many viruses were detected and
@@ -138,7 +138,7 @@ recipients, complete with size, date and time.
 Receiver
 --------
 
-[thumbnail="pmg-gui-statistics-receiver.png"]
+[thumbnail="screenshot/pmg-gui-statistics-receiver.png"]
 
 Similar to the `Sender` panel, this contains a list of e-mail addresses that
 received e-mails from outside, with a total, spam and virus count, as well
@@ -155,7 +155,7 @@ sent mail during the selected time period or up to 90 days before.
 Contact
 -------
 
-[thumbnail="pmg-gui-statistics-contact.png"]
+[thumbnail="screenshot/pmg-gui-statistics-contact.png"]
 
 This contains the list of external recipients that received mail from this
 {pmg}, coming in on the internal port, with total count, virus count and size.
diff --git a/pmgbackup.adoc b/pmgbackup.adoc
index 2eb9fb7..c273574 100644
--- a/pmgbackup.adoc
+++ b/pmgbackup.adoc
@@ -25,7 +25,7 @@ Backup and Restore
 endif::manvolnum[]
 
 ifndef::manvolnum[]
-[thumbnail="pmg-gui-backup.png", big=1]
+[thumbnail="screenshot/pmg-gui-backup.png", big=1]
 endif::manvolnum[]
 
 {pmg} includes the ability to back up and restore the
@@ -112,7 +112,7 @@ Remotes
 ~~~~~~~
 
 ifndef::manvolnum[]
-[thumbnail="pmg-gui-pbs-remote.png"]
+[thumbnail="screenshot/pmg-gui-pbs-remote.png"]
 endif::manvolnum[]
 
 
@@ -170,7 +170,7 @@ Backup Jobs
 ~~~~~~~~~~~
 
 ifndef::manvolnum[]
-[thumbnail="pmg-gui-pbs-backup.png", big=1]
+[thumbnail="screenshot/pmg-gui-pbs-backup.png", big=1]
 endif::manvolnum[]
 
 With a configured remote, you can create backups using the GUI or the
diff --git a/pmgcm.adoc b/pmgcm.adoc
index d3cce0d..5110a92 100644
--- a/pmgcm.adoc
+++ b/pmgcm.adoc
@@ -207,7 +207,7 @@ be changed later.
 Creating a Cluster
 ~~~~~~~~~~~~~~~~~~
 
-[thumbnail="pmg-gui-cluster-panel.png", big=1]
+[thumbnail="screenshot/pmg-gui-cluster-panel.png", big=1]
 
 You can create a cluster from any existing {pmg} host. All data is
 preserved.
@@ -242,7 +242,7 @@ pmg5(1)              192.168.2.127   master A       1 day 21:18   0.30    80%
 Adding Cluster Nodes
 ~~~~~~~~~~~~~~~~~~~~
 
-[thumbnail="pmg-gui-cluster-join.png", big=1]
+[thumbnail="screenshot/pmg-gui-cluster-join.png", big=1]
 
 When you add a new node to a cluster (using `join`), all data on that node is
 destroyed. The whole database is initialized with the cluster data from
diff --git a/pmgconfig.adoc b/pmgconfig.adoc
index 34210ac..38c7a3a 100644
--- a/pmgconfig.adoc
+++ b/pmgconfig.adoc
@@ -240,7 +240,7 @@ Network and Time
 ~~~~~~~~~~~~~~~~
 
 ifndef::manvolnum[]
-[thumbnail="pmg-gui-network-config.png", big=1]
+[thumbnail="screenshot/pmg-gui-network-config.png", big=1]
 endif::manvolnum[]
 
 As network and time are configured in the installer, these generally do not
@@ -279,7 +279,7 @@ Options
 ~~~~~~~
 
 ifndef::manvolnum[]
-[thumbnail="pmg-gui-system-options.png", big=1]
+[thumbnail="screenshot/pmg-gui-system-options.png", big=1]
 endif::manvolnum[]
 
 
@@ -299,7 +299,7 @@ Relaying
 ~~~~~~~~
 
 ifndef::manvolnum[]
-[thumbnail="pmg-gui-mailproxy-relaying.png", big=1]
+[thumbnail="screenshot/pmg-gui-mailproxy-relaying.png", big=1]
 endif::manvolnum[]
 
 These settings are saved to the 'mail' subsection in `/etc/pmg/pmg.conf`. Some of these correspond
@@ -315,7 +315,7 @@ Relay Domains
 ~~~~~~~~~~~~~
 
 ifndef::manvolnum[]
-[thumbnail="pmg-gui-mailproxy-relaydomains.png", big=1]
+[thumbnail="screenshot/pmg-gui-mailproxy-relaydomains.png", big=1]
 endif::manvolnum[]
 
 A list of relayed mail domains, that is, what destination domains this
@@ -328,7 +328,7 @@ Ports
 ~~~~~
 
 ifndef::manvolnum[]
-[thumbnail="pmg-gui-mailproxy-ports.png", big=1]
+[thumbnail="screenshot/pmg-gui-mailproxy-ports.png", big=1]
 endif::manvolnum[]
 
 These settings are saved to the 'mail' subsection in `/etc/pmg/pmg.conf`. Many of these correspond
@@ -345,7 +345,7 @@ Options
 ~~~~~~~
 
 ifndef::manvolnum[]
-[thumbnail="pmg-gui-mailproxy-options.png", big=1]
+[thumbnail="screenshot/pmg-gui-mailproxy-options.png", big=1]
 endif::manvolnum[]
 
 These settings are saved to the 'mail' subsection in `/etc/pmg/pmg.conf`,
@@ -454,7 +454,7 @@ Transports
 ~~~~~~~~~~
 
 ifndef::manvolnum[]
-[thumbnail="pmg-gui-mailproxy-transports.png", big=1]
+[thumbnail="screenshot/pmg-gui-mailproxy-transports.png", big=1]
 endif::manvolnum[]
 
 You can use {pmg} to send emails to different internal email servers. For
@@ -472,7 +472,7 @@ Networks
 ~~~~~~~~
 
 ifndef::manvolnum[]
-[thumbnail="pmg-gui-mailproxy-networks.png", big=1]
+[thumbnail="screenshot/pmg-gui-mailproxy-networks.png", big=1]
 endif::manvolnum[]
 
 You can add additional internal (trusted) IP networks or hosts.  All hosts in
@@ -487,7 +487,7 @@ TLS
 ~~~
 
 ifndef::manvolnum[]
-[thumbnail="pmg-gui-mailproxy-tls.png", big=1]
+[thumbnail="screenshot/pmg-gui-mailproxy-tls.png", big=1]
 endif::manvolnum[]
 
 Transport Layer Security (TLS) provides certificate-based authentication and
@@ -535,7 +535,7 @@ DKIM Signing
 ~~~~~~~~~~~~
 
 ifndef::manvolnum[]
-[thumbnail="pmg-gui-mailproxy-dkim.png", big=1]
+[thumbnail="screenshot/pmg-gui-mailproxy-dkim.png", big=1]
 endif::manvolnum[]
 
 DomainKeys Identified Mail (DKIM) Signatures (see {dkim_rfc}) is a method to
@@ -596,7 +596,7 @@ Whitelist
 ~~~~~~~~~
 
 ifndef::manvolnum[]
-[thumbnail="pmg-gui-mailproxy-whitelist.png", big=1]
+[thumbnail="screenshot/pmg-gui-mailproxy-whitelist.png", big=1]
 endif::manvolnum[]
 
 All SMTP checks are disabled for those entries (e.g. Greylisting,
@@ -619,7 +619,7 @@ Options
 ~~~~~~~
 
 ifndef::manvolnum[]
-[thumbnail="pmg-gui-spam-options.png", big=1]
+[thumbnail="screenshot/pmg-gui-spam-options.png", big=1]
 endif::manvolnum[]
 
 {pmg} uses a wide variety of local and network tests to identify spam
@@ -639,7 +639,7 @@ Quarantine
 ~~~~~~~~~~
 
 ifndef::manvolnum[]
-[thumbnail="pmg-gui-spamquar-options.png", big=1]
+[thumbnail="screenshot/pmg-gui-spamquar-options.png", big=1]
 endif::manvolnum[]
 
 {pmg} analyses all incoming email messages and decides for each
@@ -661,7 +661,7 @@ Customization of Rulescores
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 ifndef::manvolnum[]
-[thumbnail="pmg-gui-spam-custom-scores.png", big=1]
+[thumbnail="screenshot/pmg-gui-spam-custom-scores.png", big=1]
 endif::manvolnum[]
 
 While the default scoring of {spamassassin}'s ruleset provides very good
@@ -699,7 +699,7 @@ Options
 ~~~~~~~
 
 ifndef::manvolnum[]
-[thumbnail="pmg-gui-virus-options.png", big=1]
+[thumbnail="screenshot/pmg-gui-virus-options.png", big=1]
 endif::manvolnum[]
 
 All mails are automatically passed to the included virus detector
@@ -712,7 +712,7 @@ using the following configuration keys:
 include::pmg.clamav-conf-opts.adoc[]
 
 ifndef::manvolnum[]
-[thumbnail="pmg-gui-clamav-database.png", big=1]
+[thumbnail="screenshot/pmg-gui-clamav-database.png", big=1]
 endif::manvolnum[]
 
 Please note that the virus signature database is automatically
@@ -725,7 +725,7 @@ Quarantine
 ~~~~~~~~~~
 
 ifndef::manvolnum[]
-[thumbnail="pmg-gui-virusquar-options.png", big=1]
+[thumbnail="screenshot/pmg-gui-virusquar-options.png", big=1]
 endif::manvolnum[]
 
 Identified virus mails are automatically moved to the virus
@@ -876,7 +876,7 @@ User management in {pmg} consists of three types of users/accounts:
 Local Users
 ~~~~~~~~~~~
 
-[thumbnail="pmg-gui-local-user-config.png", big=1]
+[thumbnail="screenshot/pmg-gui-local-user-config.png", big=1]
 
 Local users can manage and audit {pmg}. They can login on the management web
 interface.
@@ -918,7 +918,7 @@ For details on the fields, see xref:pmg_user_configuration_file[user.conf]
 LDAP/Active Directory
 ~~~~~~~~~~~~~~~~~~~~~
 
-[thumbnail="pmg-gui-ldap-user-config.png", big=1]
+[thumbnail="screenshot/pmg-gui-ldap-user-config.png", big=1]
 
 With {pmg}, users can use LDAP and Active directory as authentication methods to
 access their individual xref:pmgadministration_spam_quarantine[Spam Quarantine].
@@ -974,7 +974,7 @@ interface. Following this, you can create rules targeting LDAP users and groups.
 Fetchmail
 ~~~~~~~~~
 
-[thumbnail="pmg-gui-fetchmail-config.png", big=1]
+[thumbnail="screenshot/pmg-gui-fetchmail-config.png", big=1]
 
 Fetchmail is a utility for polling and forwarding emails. You can define
 email accounts, which will then be fetched and forwarded to the email
diff --git a/system-booting.adoc b/system-booting.adoc
index bdbac1f..af5b767 100644
--- a/system-booting.adoc
+++ b/system-booting.adoc
@@ -178,7 +178,7 @@ Partitions (ESPs) after a manual kernel addition or removal from above.
 Determine which Bootloader is Used
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-[thumbnail="boot-grub.png", float="left"]
+[thumbnail="screenshot/boot-grub.png", float="left"]
 
 The simplest and most reliable way to determine which bootloader is used, is to
 watch the boot process of the {pmg} node.
@@ -186,7 +186,7 @@ watch the boot process of the {pmg} node.
 You will either see the blue box of GRUB or the simple black on white
 `systemd-boot`.
 
-[thumbnail="boot-systemdboot.png"]
+[thumbnail="screenshot/boot-systemdboot.png"]
 
 Determining the bootloader from a running system might not be 100% accurate. The
 safest way is to run the following command: