diff --git a/README.md b/README.md
index 64ef31b91..5fe1da426 100644
--- a/README.md
+++ b/README.md
@@ -16,14 +16,20 @@ We use [GitHub markdown](https://guides.github.com/features/mastering-markdown/)
 
 Note that we use British English spelling and grammar conventions.
 
-## Adding pictures
+## Adding screenshots
 
-Use the `{{site.url}}` variable to call an existing image in the corresponding directory for that language. This ensures the correct URL is used:
+In order to keep the size of the respository under control when images change over time, we do not store screenshots locally. Instead we use Jekyll's `include` function to call a file containing an external URL to the image itself:
 
-`<img src="{{site.url}}/assets/img/en-screenshots/mixer-channles.png" …`
+`<img src="{% include img/en-screenshots/main-screen-default.inc %}"  …`
 
 If you want to add a new image, use .png format if possible, and if it’s not a screenshot, ask about where you should store it. Localised images must go in a directory for that language (see the example for English, above).
 
+To get the URL for the `.inc` file, open a Github issue (in any repository) and add your image to it. Github will generate a URL for it like this:
+
+`![your-image-name](https://user-images.githubusercontent.com/45617 … .png)`
+
+Put that URL (only the part within the brackets) into the `.inc` file, saving that in the appropriate directory to be used as above for `<img src=`. Note that because Github generates unique "anonymous" URLs for every image, the `include` method allows us easily to manage the same image used in multiple places if necessary. 
+
 ### Style and tone
 
 Please have a look at our [style and tone guide](https://jamulus.io/contribute/Style-and-Tone).
diff --git a/_includes/img b/_includes/img
new file mode 120000
index 000000000..eac3b3092
--- /dev/null
+++ b/_includes/img
@@ -0,0 +1 @@
+../assets/img
\ No newline at end of file
diff --git a/_translator-files/README.md b/_translator-files/README.md
index 64279903b..ec1c52984 100644
--- a/_translator-files/README.md
+++ b/_translator-files/README.md
@@ -8,7 +8,7 @@ Proceed as follows:
 - Navigate to `_translator-files/po/LANG/`. Translate the content of the .po files in your editor of choice (Poedit, OmegaT...).
 - Change the `lang: en` parameter in the files containing it at the beginning of the file to your language code (it, fr, de, etc.) and make sure the `permalink: [parameter]` (e.g. /wiki/Client-Troubleshooting) stays the same.
 - At times there are links to other docs or specific paragraphs in other parts of the website: `[translate this](don't translate this#translate-this-but-don't-use-capitals)`. Make sure the last part uses the exact same words as the relevant paragraph title.
-- Some documents contain links to screenshots. Make sure you change the language code in them to your own. You can create screenshots for your language in `/assets/img/[LANG]-screenshots` - just replace them (if they exist already in English) or create them using the English ones as a guide.
+- Some documents contain links to screenshots. Make sure you change the language code in them to your own. You can create screenshots for your language in `/assets/img/[LANG]-screenshots` - note that we do not store these image locally but instead use include files calling an external URL to them. Please see README.md on the website repository for further information. Also note that screenshots that do not need to be localised are symlinked to the English version from each `[LANG]-screenshots` directory.
 - There are documents containing portions of text that do not require translation, e.g. scripts, links, etc., and which may constitute a full segment in your editor. In these cases, please do not leave the translation field empty, but insert the source text into the translation field. In OmegaT go to Options > Editor and enable "Allow translation to be equal to source". If you have chosen "Leave the segment empty" in Options > Editor, the `Ctrl+Shift+R` shortcut will insert it. In Poedit, `Ctrl+B` will copy it over.
 - Submit a Pull Request to the `next-release` branch with the translated .po files.
 - Pull requests for translations should have a title which looks like this: `Update [lang] web translation for [release number]`
diff --git a/_translator-files/po/de/FAQ.po b/_translator-files/po/de/FAQ.po
index 2087f57fa..cef3d7669 100644
--- a/_translator-files/po/de/FAQ.po
+++ b/_translator-files/po/de/FAQ.po
@@ -164,7 +164,7 @@ msgstr ""
 
 #. type: Plain text
 #: ../wiki/en/FAQ.md:58
-msgid "<img src=\"{{site.url}}/assets/img/en-screenshots/diagram-overview.png\" loading=\"lazy\" alt=\"Diagram showing how Jamulus works\">"
+msgid "<img src=\"{% include img/en-screenshots/diagram-overview.inc %}\" loading=\"lazy\" alt=\"Diagram showing how Jamulus works\">"
 msgstr ""
 
 #. type: Plain text
diff --git a/_translator-files/po/de/Getting-Started.po b/_translator-files/po/de/Getting-Started.po
index f339a66e1..33504014d 100644
--- a/_translator-files/po/de/Getting-Started.po
+++ b/_translator-files/po/de/Getting-Started.po
@@ -125,10 +125,15 @@ msgstr "Sobald du Jamulus öffnest, siehst du folgendes Fenster:"
 
 #. type: Plain text
 #: ../wiki/en/Getting-Started.md:42
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<figure>\n"
+#| "  <img src=\"{{site.url}}/assets/img/en-screenshots/main-screen-default.png\" loading=\"lazy\" alt=\"Screenshot\" style=\"border: 5px solid grey;\">\n"
+#| "  <figcaption>The main window before you connect to a server</figcaption>\n"
+#| "</figure>\n"
 msgid ""
 "<figure>\n"
-"  <img src=\"{{site.url}}/assets/img/en-screenshots/main-screen-default.png\" loading=\"lazy\" alt=\"Screenshot\" style=\"border: 5px solid grey;\">\n"
+"  <img src=\"{% include img/en-screenshots/main-screen-default.inc %}\" loading=\"lazy\" alt=\"Screenshot\" style=\"border: 5px solid grey;\">\n"
 "  <figcaption>The main window before you connect to a server</figcaption>\n"
 "</figure>\n"
 msgstr ""
@@ -149,10 +154,15 @@ msgstr "Lasse zuerst die anderen Teilnehmer wissen, wer du bist. Klick dazu auf
 
 #. type: Plain text
 #: ../wiki/en/Getting-Started.md:52
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<figure>\n"
+#| "  <img src=\"{{site.url}}/assets/img/en-screenshots/settings-profile.png\" loading=\"lazy\" alt=\"Screenshot\" style=\"border: 5px solid grey;\">\n"
+#| "  <figcaption>Let people know who you are</figcaption>\n"
+#| "</figure>\n"
 msgid ""
 "<figure>\n"
-"  <img src=\"{{site.url}}/assets/img/en-screenshots/settings-profile.png\" loading=\"lazy\" alt=\"Screenshot\" style=\"border: 5px solid grey;\">\n"
+"  <img src=\"{% include img/en-screenshots/settings-profile.inc %}\" loading=\"lazy\" alt=\"Screenshot\" style=\"border: 5px solid grey;\">\n"
 "  <figcaption>Let people know who you are</figcaption>\n"
 "</figure>\n"
 msgstr ""
@@ -189,10 +199,15 @@ msgstr "Nun klicke auf “Verbinden” im Jamulus-Hauptfenster, um einem Server
 
 #. type: Plain text
 #: ../wiki/en/Getting-Started.md:68
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<figure>\n"
+#| "  <img src=\"{{site.url}}/assets/img/en-screenshots/connection-setup-window.png\" loading=\"lazy\" alt=\"Screenshot\" style=\"border: 5px solid grey;\">\n"
+#| "  <figcaption>Connect to a server</figcaption>\n"
+#| "</figure>\n"
 msgid ""
 "<figure>\n"
-"  <img src=\"{{site.url}}/assets/img/en-screenshots/connection-setup-window.png\" loading=\"lazy\" alt=\"Screenshot\" style=\"border: 5px solid grey;\">\n"
+"  <img src=\"{% include img/en-screenshots/connection-setup-window.inc %}\" loading=\"lazy\" alt=\"Screenshot of the connection window\" style=\"border: 5px solid grey;\">\n"
 "  <figcaption>Connect to a server</figcaption>\n"
 "</figure>\n"
 msgstr ""
@@ -223,10 +238,15 @@ msgstr "Wenn die Audioeinstellungen fertig sind, kannst du loslegen. Nachdem du
 
 #. type: Plain text
 #: ../wiki/en/Getting-Started.md:81
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<figure>\n"
+#| "  <img src=\"{{site.url}}/assets/img/en-screenshots/main-screen-medium.png\" loading=\"lazy\" alt=\"Screenshot\" style=\"border: 5px solid grey;\">\n"
+#| "  <figcaption>The main window when you are connected to a sever</figcaption>\n"
+#| "</figure>\n"
 msgid ""
 "<figure>\n"
-"  <img src=\"{{site.url}}/assets/img/en-screenshots/main-screen-medium.png\" loading=\"lazy\" alt=\"Screenshot\" style=\"border: 5px solid grey;\">\n"
+"  <img src=\"{% include img/en-screenshots/main-screen-medium.inc %}\" loading=\"lazy\" alt=\"Screenshot\" style=\"border: 5px solid grey;\">\n"
 "  <figcaption>The main window when you are connected to a sever</figcaption>\n"
 "</figure>\n"
 msgstr ""
diff --git a/_translator-files/po/de/Running-a-Server.po b/_translator-files/po/de/Running-a-Server.po
index 509b1d3b4..2f1b7e14c 100644
--- a/_translator-files/po/de/Running-a-Server.po
+++ b/_translator-files/po/de/Running-a-Server.po
@@ -188,7 +188,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "<figure>\n"
-"\t<img src=\"{{site.url}}/assets/img/en-screenshots/diagram-public-server.png\" loading=\"lazy\" alt=\"Diagram of connections between clients within a Jamulus Public Server\">\n"
+"\t<img src=\"{% include img/en-screenshots/diagram-public-server.inc %}\" loading=\"lazy\" alt=\"Diagram of connections between clients within a Jamulus Public Server\">\n"
 "<figcaption>How Public Servers work</figcaption>\n"
 "</figure>\n"
 msgstr ""
@@ -208,7 +208,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "<figure>\n"
-"\t<img src=\"{{site.url}}/assets/img/en-screenshots/diagram-private-server.png\" loading=\"lazy\" alt=\"Diagram of connections between clients within a Jamulus Private Server\">\n"
+"\t<img src=\"{% include img/en-screenshots/diagram-private-server.inc %}\" loading=\"lazy\" alt=\"Diagram of connections between clients within a Jamulus Private Server\">\n"
 "\t<figcaption>How Private Servers work</figcaption>\n"
 "</figure>\n"
 msgstr ""
@@ -328,7 +328,7 @@ msgstr ""
 msgid ""
 "There is one upstream (musician sending to the server) and one downstream (server sending back the mix to the musician)\n"
 "<figure>\n"
-"\t<img src=\"{{site.url}}/assets/img/en-screenshots/bandwidth-diagram.png\" loading=\"lazy\" alt=\"A diagram of Jamulus network bandwidths from different audio qualities ranging from low to high\">\n"
+"\t<img src=\"{% include img/en-screenshots/bandwidth-diagram.inc %}\" loading=\"lazy\" alt=\"A diagram of Jamulus network bandwidths from different audio qualities ranging from low to high\">\n"
 "<figcaption>Calculate bandwidth use </figcaption>\n"
 "</figure>\n"
 msgstr ""
@@ -368,7 +368,7 @@ msgstr ""
 
 #. type: Plain text
 #: ../wiki/en/Running-a-Server.md:152
-msgid "<figure><img src=\"{{site.url}}/assets/img/en-screenshots/server-window-setup.png\" style=\"width:80%; border:5px solid grey;\" loading=\"lazy\" alt=\"Image of the Jamulus server setup window\"></figure>"
+msgid "<figure><img src=\"{% include img/en-screenshots/server-window-setup.inc %}\" style=\"width:80%; border:5px solid grey;\" loading=\"lazy\" alt=\"Image of the Jamulus server setup window\"></figure>"
 msgstr ""
 
 #. type: Plain text
@@ -423,7 +423,7 @@ msgstr ""
 
 #. type: Plain text
 #: ../wiki/en/Running-a-Server.md:177
-msgid "<figure><img src=\"{{site.url}}/assets/img/en-screenshots/server-window-options.png\" style=\"width:80%; border:5px solid grey;\" loading=\"lazy\" alt=\"Image of Jamulus server window options\"></figure>"
+msgid "<figure><img src=\"{% include img/en-screenshots/server-window-options.inc %}\" style=\"width:80%; border:5px solid grey;\" loading=\"lazy\" alt=\"Image of Jamulus server window options\"></figure>"
 msgstr ""
 
 #. type: Plain text
diff --git a/_translator-files/po/de/Software-Manual.po b/_translator-files/po/de/Software-Manual.po
index cf6fb71a0..011cc4e76 100644
--- a/_translator-files/po/de/Software-Manual.po
+++ b/_translator-files/po/de/Software-Manual.po
@@ -86,7 +86,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "<figure>\n"
-"\t<img src=\"{{site.url}}/assets/img/en-screenshots/main-screen-medium.png\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Image of the Jamulus main window\">\n"
+"\t<img src=\"{% include img/en-screenshots/main-screen-medium.inc %}\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Image of the Jamulus main window\">\n"
 "\t<figcaption>Your local mix when connected to a Server</figcaption>\n"
 "</figure>\n"
 msgstr ""
@@ -110,7 +110,7 @@ msgstr ""
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:36
-msgid "<figure><img src=\"{{site.url}}/assets/img/en-screenshots/led-green.png\" style=\"float:left; margin-right:10px;\" loading=\"lazy\" alt=\"Image of a green LED symbol\"></figure>"
+msgid "<figure><img src=\"{% include img/en-screenshots/led-green.inc %}\" style=\"float:left; margin-right:10px;\" loading=\"lazy\" alt=\"Image of a green LED symbol\"></figure>"
 msgstr ""
 
 #. type: Plain text
@@ -121,7 +121,7 @@ msgstr ""
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:40
-msgid "<figure><img src=\"{{site.url}}/assets/img/en-screenshots/led-yellow.png\" style=\"float:left; margin-right:10px;\" loading=\"lazy\" alt=\"Image of a yellow LED symbol\"></figure>"
+msgid "<figure><img src=\"{% include img/en-screenshots/led-yellow.inc %}\" style=\"float:left; margin-right:10px;\" loading=\"lazy\" alt=\"Image of a yellow LED symbol\"></figure>"
 msgstr ""
 
 #. type: Plain text
@@ -132,7 +132,7 @@ msgstr ""
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:44
-msgid "<figure><img src=\"{{site.url}}/assets/img/en-screenshots/led-red.png\" style=\"float:left; margin-right:10px; clear: both;\" loading=\"lazy\" alt=\"Image of a green red symbol\"></figure>"
+msgid "<figure><img src=\"{% include img/en-screenshots/led-red.inc %}\" style=\"float:left; margin-right:10px; clear: both;\" loading=\"lazy\" alt=\"Image of a green red symbol\"></figure>"
 msgstr ""
 
 #. type: Plain text
@@ -219,7 +219,7 @@ msgstr ""
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:82
-msgid "<figure><img src=\"{{site.url}}/assets/img/en-screenshots/connection-setup-window.png\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Image of a server connection window\"></figure>"
+msgid "<figure><img src=\"{% include img/en-screenshots/connection-setup-window.inc %}\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Screenshot of the server connection window\"></figure>"
 msgstr ""
 
 #. type: Plain text
@@ -244,7 +244,7 @@ msgstr ""
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:94
-msgid "<figure><img src=\"{{site.url}}/assets/img/en-screenshots/mixer-channles.png\" style=\"float:left; margin-right:10px; margin-bottom:20px; border: 5px solid grey;\" loading=\"lazy\" alt=\"Image of a pair of server mixer controls\"></figure>"
+msgid "<figure><img src=\"{% include img/en-screenshots/mixer-channels.inc %}\" style=\"float:left; margin-right:10px; margin-bottom:20px; border: 5px solid grey;\" loading=\"lazy\" alt=\"Image of a pair of server mixer controls\"></figure>"
 msgstr ""
 
 #. type: Plain text
@@ -334,7 +334,7 @@ msgstr ""
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:132
-msgid "<figure><img src=\"{{site.url}}/assets/img/en-screenshots/settings-profile.png\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Image of a profile window\"></figure>"
+msgid "<figure><img src=\"{% include img/en-screenshots/settings-profile.inc %}\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Image of a profile window\"></figure>"
 msgstr ""
 
 #. type: Plain text
@@ -344,7 +344,7 @@ msgstr ""
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:136
-msgid "<figure><img src=\"{{site.url}}/assets/img/en-screenshots/profile-tooltip.png\" style=\"width:30%;\" loading=\"lazy\" alt=\"Image of a tooltip showing profile information\"></figure>"
+msgid "<figure><img src=\"{% include img/en-screenshots/profile-tooltip.inc %}\" style=\"width:30%;\" loading=\"lazy\" alt=\"Image of a tooltip showing profile information\"></figure>"
 msgstr ""
 
 #. type: Plain text
@@ -374,7 +374,7 @@ msgstr ""
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:148
-msgid "<figure><img src=\"{{site.url}}/assets/img/en-screenshots/settings-network.png\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Image of audio/network settings window\"></figure>"
+msgid "<figure><img src=\"{% include img/en-screenshots/settings-network.inc %}\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Image of audio/network settings window\"></figure>"
 msgstr ""
 
 #. type: Plain text
@@ -394,7 +394,7 @@ msgstr ""
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:157
-msgid "<figure><img src=\"{{site.url}}/assets/img/en-screenshots/channel-mapping.png\" style=\"float:left; margin-right:10px; margin-bottom:20px;\" loading=\"lazy\" alt=\"Image of Input and output channel mapping\"></figure>"
+msgid "<figure><img src=\"{% include img/en-screenshots/channel-mapping.inc %}\" style=\"float:left; margin-right:10px; margin-bottom:20px;\" loading=\"lazy\" alt=\"Image of Input and output channel mapping\"></figure>"
 msgstr ""
 
 #. type: Plain text
@@ -557,7 +557,7 @@ msgstr ""
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:234
-msgid "<figure><img src=\"{{site.url}}/assets/img/en-screenshots/settings-advanced.png\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Image of advanced settings window\"></figure>"
+msgid "<figure><img src=\"{% include img/en-screenshots/settings-advanced.inc %}\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Image of advanced settings window\"></figure>"
 msgstr ""
 
 #. type: Plain text
diff --git a/_translator-files/po/es/FAQ.po b/_translator-files/po/es/FAQ.po
index 0e9d2c070..8af4ad5fc 100644
--- a/_translator-files/po/es/FAQ.po
+++ b/_translator-files/po/es/FAQ.po
@@ -6,14 +6,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"PO-Revision-Date: 2021-12-21 10:41+0100\n"
+"PO-Revision-Date: 2022-01-03 16:12+0000\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.3\n"
+"X-Generator: Poedit 3.0\n"
 
 #. type: YAML Front Matter: lang
 #: ../wiki/en/FAQ.md:1
@@ -167,8 +167,8 @@ msgstr "¿Cómo funciona Jamulus (en general)?"
 
 #. type: Plain text
 #: ../wiki/en/FAQ.md:58
-msgid "<img src=\"{{site.url}}/assets/img/en-screenshots/diagram-overview.png\" loading=\"lazy\" alt=\"Diagram showing how Jamulus works\">"
-msgstr "<img src=\"{{site.url}}/assets/img/es-screenshots/diagram-overview.png\" loading=\"lazy\" alt=\"Diagrama mostrando cómo funciona Jamulus\">"
+msgid "<img src=\"{% include img/en-screenshots/diagram-overview.inc %}\" loading=\"lazy\" alt=\"Diagram showing how Jamulus works\">"
+msgstr "<img src=\"{% include img/es-screenshots/diagram-overview.inc %}\" loading=\"lazy\" alt=\"Diagrama mostrando cómo funciona Jamulus\">"
 
 #. type: Plain text
 #: ../wiki/en/FAQ.md:61
diff --git a/_translator-files/po/es/Getting-Started.po b/_translator-files/po/es/Getting-Started.po
index 665c9664f..dcdce674f 100644
--- a/_translator-files/po/es/Getting-Started.po
+++ b/_translator-files/po/es/Getting-Started.po
@@ -6,14 +6,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"PO-Revision-Date: 2021-12-21 10:49+0100\n"
+"PO-Revision-Date: 2022-01-03 14:54+0000\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.3\n"
+"X-Generator: Poedit 3.0\n"
 
 #. type: YAML Front Matter: lang
 #: ../wiki/en/Getting-Started.md:1
@@ -128,12 +128,12 @@ msgstr "Cuando abras Jamulus, verás una ventana con este aspecto:"
 #, no-wrap
 msgid ""
 "<figure>\n"
-"  <img src=\"{{site.url}}/assets/img/en-screenshots/main-screen-default.png\" loading=\"lazy\" alt=\"Screenshot\" style=\"border: 5px solid grey;\">\n"
+"  <img src=\"{% include img/en-screenshots/main-screen-default.inc %}\" loading=\"lazy\" alt=\"Screenshot\" style=\"border: 5px solid grey;\">\n"
 "  <figcaption>The main window before you connect to a server</figcaption>\n"
 "</figure>\n"
 msgstr ""
 "<figure>\n"
-"  <img src=\"{{site.url}}/assets/img/es-screenshots/main-screen-default.png\" loading=\"lazy\" alt=\"Screenshot\" style=\"border: 5px solid grey;\">\n"
+"  <img src=\"{% include img/es-screenshots/main-screen-default.inc %}\" loading=\"lazy\" alt=\"Screenshot\" style=\"border: 5px solid grey;\">\n"
 "  <figcaption>La ventana principal antes de conectarte a un servidor</figcaption>\n"
 "</figure>\n"
 
@@ -152,12 +152,12 @@ msgstr "Primero muestra a los demás quién eres. Haz clic en el botón de “Co
 #, no-wrap
 msgid ""
 "<figure>\n"
-"  <img src=\"{{site.url}}/assets/img/en-screenshots/settings-profile.png\" loading=\"lazy\" alt=\"Screenshot\" style=\"border: 5px solid grey;\">\n"
+"  <img src=\"{% include img/en-screenshots/settings-profile.inc %}\" loading=\"lazy\" alt=\"Screenshot\" style=\"border: 5px solid grey;\">\n"
 "  <figcaption>Let people know who you are</figcaption>\n"
 "</figure>\n"
 msgstr ""
 "<figure>\n"
-"  <img src=\"{{site.url}}/assets/img/es-screenshots/settings-profile.png\" loading=\"lazy\" alt=\"Screenshot\" style=\"border: 5px solid grey;\">\n"
+"  <img src=\"{% include img/es-screenshots/settings-profile.inc %}\" loading=\"lazy\" alt=\"Screenshot\" style=\"border: 5px solid grey;\">\n"
 "  <figcaption>Muestra quién eres</figcaption>\n"
 "</figure>\n"
 
@@ -192,12 +192,12 @@ msgstr "Ahora usa el botón de “Conectar” en la ventana principal de Jamulus
 #, no-wrap
 msgid ""
 "<figure>\n"
-"  <img src=\"{{site.url}}/assets/img/en-screenshots/connection-setup-window.png\" loading=\"lazy\" alt=\"Screenshot\" style=\"border: 5px solid grey;\">\n"
+"  <img src=\"{% include img/en-screenshots/connection-setup-window.inc %}\" loading=\"lazy\" alt=\"Screenshot of the connection window\" style=\"border: 5px solid grey;\">\n"
 "  <figcaption>Connect to a server</figcaption>\n"
 "</figure>\n"
 msgstr ""
 "<figure>\n"
-"  <img src=\"{{site.url}}/assets/img/es-screenshots/connection-setup-window.png\" loading=\"lazy\" alt=\"Screenshot\" style=\"border: 5px solid grey;\">\n"
+"  <img src=\"{% include img/es-screenshots/connection-setup-window.inc %}\" loading=\"lazy\" alt=\"Screenshot\" style=\"border: 5px solid grey;\">\n"
 "  <figcaption>Conéctate a un servidor</figcaption>\n"
 "</figure>\n"
 
@@ -226,12 +226,12 @@ msgstr "Con el sonido configurado, ya puedes empezar. Cuando te conectas a un se
 #, no-wrap
 msgid ""
 "<figure>\n"
-"  <img src=\"{{site.url}}/assets/img/en-screenshots/main-screen-medium.png\" loading=\"lazy\" alt=\"Screenshot\" style=\"border: 5px solid grey;\">\n"
+"  <img src=\"{% include img/en-screenshots/main-screen-medium.inc %}\" loading=\"lazy\" alt=\"Screenshot\" style=\"border: 5px solid grey;\">\n"
 "  <figcaption>The main window when you are connected to a sever</figcaption>\n"
 "</figure>\n"
 msgstr ""
 "<figure>\n"
-"  <img src=\"{{site.url}}/assets/img/es-screenshots/main-screen-medium.png\" loading=\"lazy\" alt=\"Screenshot\" style=\"border: 5px solid grey;\">\n"
+"  <img src=\"{% include img/es-screenshots/main-screen-medium.inc %}\" loading=\"lazy\" alt=\"Screenshot\" style=\"border: 5px solid grey;\">\n"
 "  <figcaption>La ventana principal cuando te conectas a un servidor</figcaption>\n"
 "</figure>\n"
 
diff --git a/_translator-files/po/es/Running-a-Server.po b/_translator-files/po/es/Running-a-Server.po
index 26e59dc79..8c0f6d033 100644
--- a/_translator-files/po/es/Running-a-Server.po
+++ b/_translator-files/po/es/Running-a-Server.po
@@ -6,14 +6,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"PO-Revision-Date: 2021-12-20 10:06+0100\n"
+"PO-Revision-Date: 2022-01-03 15:16+0000\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.3\n"
+"X-Generator: Poedit 3.0\n"
 
 #. type: YAML Front Matter: lang
 #: ../wiki/en/Running-a-Server.md:1
@@ -191,12 +191,12 @@ msgstr "Tu servidor aparecerá listado en el Directorio que los clientes utiliza
 #, no-wrap
 msgid ""
 "<figure>\n"
-"\t<img src=\"{{site.url}}/assets/img/en-screenshots/diagram-public-server.png\" loading=\"lazy\" alt=\"Diagram of connections between clients within a Jamulus Public Server\">\n"
+"\t<img src=\"{% include img/en-screenshots/diagram-public-server.inc %}\" loading=\"lazy\" alt=\"Diagram of connections between clients within a Jamulus Public Server\">\n"
 "<figcaption>How Public Servers work</figcaption>\n"
 "</figure>\n"
 msgstr ""
 "<figure>\n"
-"\t<img src=\"{{site.url}}/assets/img/es-screenshots/diagram-public-server.png\" loading=\"lazy\" alt=\"Diagrama de conexiones entre clientes en un Servidor Jamulus Público\">\n"
+"\t<img src=\"{% include img/es-screenshots/diagram-public-server.inc %}\" loading=\"lazy\" alt=\"Diagrama de conexiones entre clientes en un Servidor Jamulus Público\">\n"
 "<figcaption>Cómo funcionan los Servidores Públicos</figcaption>\n"
 "</figure>\n"
 
@@ -215,12 +215,12 @@ msgstr "Esto el lo predeterminado cuando se arranca un servidor por primera vez.
 #, no-wrap
 msgid ""
 "<figure>\n"
-"\t<img src=\"{{site.url}}/assets/img/en-screenshots/diagram-private-server.png\" loading=\"lazy\" alt=\"Diagram of connections between clients within a Jamulus Private Server\">\n"
+"\t<img src=\"{% include img/en-screenshots/diagram-private-server.inc %}\" loading=\"lazy\" alt=\"Diagram of connections between clients within a Jamulus Private Server\">\n"
 "\t<figcaption>How Private Servers work</figcaption>\n"
 "</figure>\n"
 msgstr ""
 "<figure>\n"
-"\t<img src=\"{{site.url}}/assets/img/es-screenshots/diagram-private-server.png\" loading=\"lazy\" alt=\"Diagrama de conexiones entre clientes en un Servidor Jamulus Privado\">\n"
+"\t<img src=\"{% include img/es-screenshots/diagram-private-server.inc %}\" loading=\"lazy\" alt=\"Diagrama de conexiones entre clientes en un Servidor Jamulus Privado\">\n"
 "\t<figcaption>Cómo funcionan los Servidores Privados</figcaption>\n"
 "</figure>\n"
 
@@ -347,13 +347,13 @@ msgstr "## Ancho de banda de red"
 msgid ""
 "There is one upstream (musician sending to the server) and one downstream (server sending back the mix to the musician)\n"
 "<figure>\n"
-"\t<img src=\"{{site.url}}/assets/img/en-screenshots/bandwidth-diagram.png\" loading=\"lazy\" alt=\"A diagram of Jamulus network bandwidths from different audio qualities ranging from low to high\">\n"
+"\t<img src=\"{% include img/en-screenshots/bandwidth-diagram.inc %}\" loading=\"lazy\" alt=\"A diagram of Jamulus network bandwidths from different audio qualities ranging from low to high\">\n"
 "<figcaption>Calculate bandwidth use </figcaption>\n"
 "</figure>\n"
 msgstr ""
 "Hay un flujo de datos de subida (músico enviando al servidor) y otro de bajada (el servidor enviando la mezcla de vuelta al músico)\n"
 "<figure>\n"
-"\t<img src=\"{{site.url}}/assets/img/es-screenshots/bandwidth-diagram.png\" loading=\"lazy\" alt=\"Un diagrama de anchos de banda en Jamulus con diferentes calidades de audio, de baja a alta\">\n"
+"\t<img src=\"{% include img/es-screenshots/bandwidth-diagram.inc %}\" loading=\"lazy\" alt=\"Un diagrama de anchos de banda en Jamulus con diferentes calidades de audio, de baja a alta\">\n"
 "<figcaption>Cálculo del ancho de banda </figcaption>\n"
 "</figure>\n"
 
@@ -392,8 +392,8 @@ msgstr "## Configuración del Servidor"
 
 #. type: Plain text
 #: ../wiki/en/Running-a-Server.md:152
-msgid "<figure><img src=\"{{site.url}}/assets/img/en-screenshots/server-window-setup.png\" style=\"width:80%; border:5px solid grey;\" loading=\"lazy\" alt=\"Image of the Jamulus server setup window\"></figure>"
-msgstr "<figure><img src=\"{{site.url}}/assets/img/es-screenshots/server-window-setup.png\" style=\"width:80%; border:5px solid grey;\" loading=\"lazy\" alt=\"Imagen de la ventana de configuración del servidor Jamulus\"></figure>"
+msgid "<figure><img src=\"{% include img/en-screenshots/server-window-setup.inc %}\" style=\"width:80%; border:5px solid grey;\" loading=\"lazy\" alt=\"Image of the Jamulus server setup window\"></figure>"
+msgstr "<figure><img src=\"{% include img/es-screenshots/server-window-setup.inc %}\" style=\"width:80%; border:5px solid grey;\" loading=\"lazy\" alt=\"Imagen de la ventana de configuración del servidor Jamulus\"></figure>"
 
 #. type: Plain text
 #: ../wiki/en/Running-a-Server.md:154
@@ -447,8 +447,8 @@ msgstr "## Opciones"
 
 #. type: Plain text
 #: ../wiki/en/Running-a-Server.md:177
-msgid "<figure><img src=\"{{site.url}}/assets/img/en-screenshots/server-window-options.png\" style=\"width:80%; border:5px solid grey;\" loading=\"lazy\" alt=\"Image of Jamulus server window options\"></figure>"
-msgstr "<figure><img src=\"{{site.url}}/assets/img/es-screenshots/server-window-options.png\" style=\"width:80%; border:5px solid grey;\" loading=\"lazy\" alt=\"Imagen de las opciones del servidor Jamulus\"></figure>"
+msgid "<figure><img src=\"{% include img/en-screenshots/server-window-options.inc %}\" style=\"width:80%; border:5px solid grey;\" loading=\"lazy\" alt=\"Image of Jamulus server window options\"></figure>"
+msgstr "<figure><img src=\"{% include img/es-screenshots/server-window-options.inc %}\" style=\"width:80%; border:5px solid grey;\" loading=\"lazy\" alt=\"Imagen de las opciones del servidor Jamulus\"></figure>"
 
 #. type: Plain text
 #: ../wiki/en/Running-a-Server.md:179
diff --git a/_translator-files/po/es/Software-Manual.po b/_translator-files/po/es/Software-Manual.po
index 3a57d404e..adce1eb67 100644
--- a/_translator-files/po/es/Software-Manual.po
+++ b/_translator-files/po/es/Software-Manual.po
@@ -6,14 +6,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"PO-Revision-Date: 2021-12-21 11:08+0100\n"
+"PO-Revision-Date: 2022-01-04 19:21+0000\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.3\n"
+"X-Generator: Poedit 3.0\n"
 
 #. type: YAML Front Matter: lang
 #: ../wiki/en/Software-Manual.md:1
@@ -89,12 +89,12 @@ msgstr "# Ventana Principal"
 #, no-wrap
 msgid ""
 "<figure>\n"
-"\t<img src=\"{{site.url}}/assets/img/en-screenshots/main-screen-medium.png\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Image of the Jamulus main window\">\n"
+"\t<img src=\"{% include img/en-screenshots/main-screen-medium.inc %}\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Image of the Jamulus main window\">\n"
 "\t<figcaption>Your local mix when connected to a Server</figcaption>\n"
 "</figure>\n"
 msgstr ""
 "<figure>\n"
-"\t<img src=\"{{site.url}}/assets/img/es-screenshots/main-screen-medium.png\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Image of the Jamulus main window\">\n"
+"\t<img src=\"{% include img/es-screenshots/main-screen-medium.inc %}\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Image of the Jamulus main window\">\n"
 "\t<figcaption>Tu mezcla local cuando te conectas a un Servidor</figcaption>\n"
 "</figure>\n"
 
@@ -117,8 +117,8 @@ msgstr "**Retardo** muestra la latencia total que se calcula con el ping actual
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:36
-msgid "<figure><img src=\"{{site.url}}/assets/img/en-screenshots/led-green.png\" style=\"float:left; margin-right:10px;\" loading=\"lazy\" alt=\"Image of a green LED symbol\"></figure>"
-msgstr "<figure><img src=\"{{site.url}}/assets/img/es-screenshots/led-green.png\" style=\"float:left; margin-right:10px;\" loading=\"lazy\" alt=\"Imagen del símbolo de un LED verde\"></figure>"
+msgid "<figure><img src=\"{% include img/en-screenshots/led-green.inc %}\" style=\"float:left; margin-right:10px;\" loading=\"lazy\" alt=\"Image of a green LED symbol\"></figure>"
+msgstr "<figure><img src=\"{% include img/es-screenshots/led-green.inc %}\" style=\"float:left; margin-right:10px;\" loading=\"lazy\" alt=\"Imagen del símbolo de un LED verde\"></figure>"
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:38
@@ -128,8 +128,8 @@ msgstr "**Verde** - El retardo es perfecto para una jam session\n"
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:40
-msgid "<figure><img src=\"{{site.url}}/assets/img/en-screenshots/led-yellow.png\" style=\"float:left; margin-right:10px;\" loading=\"lazy\" alt=\"Image of a yellow LED symbol\"></figure>"
-msgstr "<figure><img src=\"{{site.url}}/assets/img/es-screenshots/led-yellow.png\" style=\"float:left; margin-right:10px;\" loading=\"lazy\" alt=\"Imagen del símbolo de un LED amarillo\"></figure>"
+msgid "<figure><img src=\"{% include img/en-screenshots/led-yellow.inc %}\" style=\"float:left; margin-right:10px;\" loading=\"lazy\" alt=\"Image of a yellow LED symbol\"></figure>"
+msgstr "<figure><img src=\"{% include img/es-screenshots/led-yellow.inc %}\" style=\"float:left; margin-right:10px;\" loading=\"lazy\" alt=\"Imagen del símbolo de un LED amarillo\"></figure>"
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:42
@@ -139,8 +139,8 @@ msgstr "**Amarillo** - Una sesión aún es posible pero quizá sea más difícil
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:44
-msgid "<figure><img src=\"{{site.url}}/assets/img/en-screenshots/led-red.png\" style=\"float:left; margin-right:10px; clear: both;\" loading=\"lazy\" alt=\"Image of a green red symbol\"></figure>"
-msgstr "<figure><img src=\"{{site.url}}/assets/img/es-screenshots/led-red.png\" style=\"float:left; margin-right:10px; clear: both;\" loading=\"lazy\" alt=\"Imagen del símbolo de un LED rojo\"></figure>"
+msgid "<figure><img src=\"{% include img/en-screenshots/led-red.inc %}\" style=\"float:left; margin-right:10px; clear: both;\" loading=\"lazy\" alt=\"Image of a green red symbol\"></figure>"
+msgstr "<figure><img src=\"{% include img/es-screenshots/led-red.inc %}\" style=\"float:left; margin-right:10px; clear: both;\" loading=\"lazy\" alt=\"Imagen del símbolo de un LED rojo\"></figure>"
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:46
@@ -226,8 +226,8 @@ msgstr "Abre una ventana donde puedes seleccionar un servidor al que conectarte.
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:82
-msgid "<figure><img src=\"{{site.url}}/assets/img/en-screenshots/connection-setup-window.png\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Image of a server connection window\"></figure>"
-msgstr "<figure><img src=\"{{site.url}}/assets/img/es-screenshots/connection-setup-window.png\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Imagen de la ventana de conexión del servidor\"></figure>"
+msgid "<figure><img src=\"{% include img/en-screenshots/connection-setup-window.inc %}\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Screenshot of the server connection window\"></figure>"
+msgstr "<figure><img src=\"{% include img/es-screenshots/connection-setup-window.inc %}\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Imagen de la ventana de conexión del servidor\"></figure>"
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:84
@@ -251,8 +251,8 @@ msgstr "## Mezclador de audio del servidor"
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:94
-msgid "<figure><img src=\"{{site.url}}/assets/img/en-screenshots/mixer-channles.png\" style=\"float:left; margin-right:10px; margin-bottom:20px; border: 5px solid grey;\" loading=\"lazy\" alt=\"Image of a pair of server mixer controls\"></figure>"
-msgstr "<figure><img src=\"{{site.url}}/assets/img/es-screenshots/mixer-channles.png\" style=\"float:left; margin-right:10px; margin-bottom:20px; border: 5px solid grey;\" loading=\"lazy\" alt=\"Imagen de un par de controles del mezclador de audio del servidor\"></figure>"
+msgid "<figure><img src=\"{% include img/en-screenshots/mixer-channels.inc %}\" style=\"float:left; margin-right:10px; margin-bottom:20px; border: 5px solid grey;\" loading=\"lazy\" alt=\"Image of a pair of server mixer controls\"></figure>"
+msgstr "<figure><img src=\"{% include img/es-screenshots/mixer-channels.inc %}\" style=\"float:left; margin-right:10px; margin-bottom:20px; border: 5px solid grey;\" loading=\"lazy\" alt=\"Imagen de un par de controles del mezclador de audio del servidor\"></figure>"
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:97
@@ -341,8 +341,8 @@ msgstr "Desde el menú de Configuración, selecciona \"Mi Perfil...\" para estab
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:132
-msgid "<figure><img src=\"{{site.url}}/assets/img/en-screenshots/settings-profile.png\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Image of a profile window\"></figure>"
-msgstr "<figure><img src=\"{{site.url}}/assets/img/es-screenshots/settings-profile.png\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Imagen de la ventana de perfil\"></figure>"
+msgid "<figure><img src=\"{% include img/en-screenshots/settings-profile.inc %}\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Image of a profile window\"></figure>"
+msgstr "<figure><img src=\"{% include img/es-screenshots/settings-profile.inc %}\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Imagen de la ventana de perfil\"></figure>"
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:134
@@ -351,8 +351,8 @@ msgstr "Si se establece un instrumento y/o un país, los iconos de estas selecci
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:136
-msgid "<figure><img src=\"{{site.url}}/assets/img/en-screenshots/profile-tooltip.png\" style=\"width:30%;\" loading=\"lazy\" alt=\"Image of a tooltip showing profile information\"></figure>"
-msgstr "<figure><img src=\"{{site.url}}/assets/img/es-screenshots/profile-tooltip.png\" style=\"width:30%;\" loading=\"lazy\" alt=\"Imagen de un tooltip mostrando información del perfil\"></figure>"
+msgid "<figure><img src=\"{% include img/en-screenshots/profile-tooltip.inc %}\" style=\"width:30%;\" loading=\"lazy\" alt=\"Image of a tooltip showing profile information\"></figure>"
+msgstr "<figure><img src=\"{% include img/es-screenshots/profile-tooltip.inc %}\" style=\"width:30%;\" loading=\"lazy\" alt=\"Imagen de un tooltip mostrando información del perfil\"></figure>"
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:138
@@ -381,8 +381,8 @@ msgstr "## Configuración Audio/Red"
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:148
-msgid "<figure><img src=\"{{site.url}}/assets/img/en-screenshots/settings-network.png\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Image of audio/network settings window\"></figure>"
-msgstr "<figure><img src=\"{{site.url}}/assets/img/es-screenshots/settings-network.png\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Imagen de la ventana de configuración de audio/red\"></figure>"
+msgid "<figure><img src=\"{% include img/en-screenshots/settings-network.inc %}\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Image of audio/network settings window\"></figure>"
+msgstr "<figure><img src=\"{% include img/es-screenshots/settings-network.inc %}\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Imagen de la ventana de configuración de audio/red\"></figure>"
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:150
@@ -401,8 +401,8 @@ msgstr "### Mapeo canales entrada/salida"
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:157
-msgid "<figure><img src=\"{{site.url}}/assets/img/en-screenshots/channel-mapping.png\" style=\"float:left; margin-right:10px; margin-bottom:20px;\" loading=\"lazy\" alt=\"Image of Input and output channel mapping\"></figure>"
-msgstr "<figure><img src=\"{{site.url}}/assets/img/es-screenshots/channel-mapping.png\" style=\"float:left; margin-right:10px; margin-bottom:20px;\" loading=\"lazy\" alt=\"Imagen del mapeo de canales de entrada y salida\"></figure>"
+msgid "<figure><img src=\"{% include img/en-screenshots/channel-mapping.inc %}\" style=\"float:left; margin-right:10px; margin-bottom:20px;\" loading=\"lazy\" alt=\"Image of Input and output channel mapping\"></figure>"
+msgstr "<figure><img src=\"{% include img/es-screenshots/channel-mapping.inc %}\" style=\"float:left; margin-right:10px; margin-bottom:20px;\" loading=\"lazy\" alt=\"Imagen del mapeo de canales de entrada y salida\"></figure>"
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:161
@@ -564,8 +564,8 @@ msgstr "## Configuración Avanzada"
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:234
-msgid "<figure><img src=\"{{site.url}}/assets/img/en-screenshots/settings-advanced.png\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Image of advanced settings window\"></figure>"
-msgstr "<figure><img src=\"{{site.url}}/assets/img/es-screenshots/settings-advanced.png\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Imagen de la ventana de configuración avanzada\"></figure>"
+msgid "<figure><img src=\"{% include img/en-screenshots/settings-advanced.inc %}\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Image of advanced settings window\"></figure>"
+msgstr "<figure><img src=\"{% include img/es-screenshots/settings-advanced.inc %}\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Imagen de la ventana de configuración avanzada\"></figure>"
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:236
diff --git a/_translator-files/po/fr/FAQ.po b/_translator-files/po/fr/FAQ.po
index 0b2640771..d8b22a2a1 100644
--- a/_translator-files/po/fr/FAQ.po
+++ b/_translator-files/po/fr/FAQ.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"PO-Revision-Date: 2021-12-31 08:50+0100\n"
+"PO-Revision-Date: 2022-01-03 16:16+0000\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: fr_FR\n"
@@ -170,8 +170,8 @@ msgstr "### Comment fonctionne Jamulus (en général) ?"
 
 #. type: Plain text
 #: ../wiki/en/FAQ.md:58
-msgid "<img src=\"{{site.url}}/assets/img/en-screenshots/diagram-overview.png\" loading=\"lazy\" alt=\"Diagram showing how Jamulus works\">"
-msgstr "<img src=\"{{site.url}}/assets/img/fr-screenshots/diagram-overview.png\" loading=\"lazy\" alt=\"Diagramme montrant le fonctionnement de Jamulus\">"
+msgid "<img src=\"{% include img/en-screenshots/diagram-overview.inc %}\" loading=\"lazy\" alt=\"Diagram showing how Jamulus works\">"
+msgstr "<img src=\"{% include img/fr-screenshots/diagram-overview.inc %}\" loading=\"lazy\" alt=\"Diagramme montrant le fonctionnement de Jamulus\">"
 
 #. type: Plain text
 #: ../wiki/en/FAQ.md:61
diff --git a/_translator-files/po/fr/Getting-Started.po b/_translator-files/po/fr/Getting-Started.po
index 131fe222d..4f4d811cd 100644
--- a/_translator-files/po/fr/Getting-Started.po
+++ b/_translator-files/po/fr/Getting-Started.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"PO-Revision-Date: 2022-01-02 17:39+0100\n"
+"PO-Revision-Date: 2022-01-03 16:15+0000\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: fr_FR\n"
@@ -131,12 +131,12 @@ msgstr "Lorsque vous ouvrez Jamulus, vous verrez une fenêtre qui ressemble à c
 #, no-wrap
 msgid ""
 "<figure>\n"
-"  <img src=\"{{site.url}}/assets/img/en-screenshots/main-screen-default.png\" loading=\"lazy\" alt=\"Screenshot\" style=\"border: 5px solid grey;\">\n"
+"  <img src=\"{% include img/en-screenshots/main-screen-default.inc %}\" loading=\"lazy\" alt=\"Screenshot\" style=\"border: 5px solid grey;\">\n"
 "  <figcaption>The main window before you connect to a server</figcaption>\n"
 "</figure>\n"
 msgstr ""
 "<figure>\n"
-"  <img src=\"{{site.url}}/assets/img/fr-screenshots/main-screen-default.png\" loading=\"lazy\" alt=\"Screenshot\" style=\"border: 5px solid grey;\">\n"
+"  <img src=\"{% include img/fr-screenshots/main-screen-default.inc %}\" loading=\"lazy\" alt=\"Screenshot\" style=\"border: 5px solid grey;\">\n"
 "  <figcaption>La fenêtre principale avant de se connecter à un serveur</figcaption>\n"
 "</figure>\n"
 
@@ -155,12 +155,12 @@ msgstr "Tout d'abord, faites savoir aux autres qui vous êtes. Cliquez sur le bo
 #, no-wrap
 msgid ""
 "<figure>\n"
-"  <img src=\"{{site.url}}/assets/img/en-screenshots/settings-profile.png\" loading=\"lazy\" alt=\"Screenshot\" style=\"border: 5px solid grey;\">\n"
+"  <img src=\"{% include img/en-screenshots/settings-profile.inc %}\" loading=\"lazy\" alt=\"Screenshot\" style=\"border: 5px solid grey;\">\n"
 "  <figcaption>Let people know who you are</figcaption>\n"
 "</figure>\n"
 msgstr ""
 "<figure>\n"
-"  <img src=\"{{site.url}}/assets/img/fr-screenshots/settings-profile.png\" loading=\"lazy\" alt=\"Screenshot\" style=\"border: 5px solid grey;\">\n"
+"  <img src=\"{% include img/fr-screenshots/settings-profile.inc %}\" loading=\"lazy\" alt=\"Screenshot\" style=\"border: 5px solid grey;\">\n"
 "  <figcaption>Laissez les gens savoir qui vous êtes</figcaption>\n"
 "</figure>\n"
 
@@ -195,12 +195,12 @@ msgstr "Utilisez maintenant le bouton \"Connecter\" dans la fenêtre principale
 #, no-wrap
 msgid ""
 "<figure>\n"
-"  <img src=\"{{site.url}}/assets/img/en-screenshots/connection-setup-window.png\" loading=\"lazy\" alt=\"Screenshot\" style=\"border: 5px solid grey;\">\n"
+"  <img src=\"{% include img/en-screenshots/connection-setup-window.inc %}\" loading=\"lazy\" alt=\"Screenshot of the connection window\" style=\"border: 5px solid grey;\">\n"
 "  <figcaption>Connect to a server</figcaption>\n"
 "</figure>\n"
 msgstr ""
 "<figure>\n"
-"  <img src=\"{{site.url}}/assets/img/fr-screenshots/connection-setup-window.png\" loading=\"lazy\" alt=\"Screenshot\" style=\"border: 5px solid grey;\">\n"
+"  <img src=\"{% include img/fr-screenshots/connection-setup-window.inc %}\" loading=\"lazy\" alt=\"Screenshot\" style=\"border: 5px solid grey;\">\n"
 "  <figcaption>Connexion à un serveur</figcaption>\n"
 "</figure>\n"
 
@@ -229,12 +229,12 @@ msgstr "Une fois votre son configuré, vous êtes prêt à jouer. Lorsque vous v
 #, no-wrap
 msgid ""
 "<figure>\n"
-"  <img src=\"{{site.url}}/assets/img/en-screenshots/main-screen-medium.png\" loading=\"lazy\" alt=\"Screenshot\" style=\"border: 5px solid grey;\">\n"
+"  <img src=\"{% include img/en-screenshots/main-screen-medium.inc %}\" loading=\"lazy\" alt=\"Screenshot\" style=\"border: 5px solid grey;\">\n"
 "  <figcaption>The main window when you are connected to a sever</figcaption>\n"
 "</figure>\n"
 msgstr ""
 "<figure>\n"
-"  <img src=\"{{site.url}}/assets/img/fr-screenshots/main-screen-medium.png\" loading=\"lazy\" alt=\"Screenshot\" style=\"border: 5px solid grey;\">\n"
+"  <img src=\"{% include img/fr-screenshots/main-screen-medium.inc %}\" loading=\"lazy\" alt=\"Screenshot\" style=\"border: 5px solid grey;\">\n"
 "  <figcaption>La fenêtre principale lorsque vous êtes connecté à un serveur</figcaption>\n"
 "</figure>\n"
 
diff --git a/_translator-files/po/fr/Running-a-Server.po b/_translator-files/po/fr/Running-a-Server.po
index 8ccc13e19..6a330c640 100644
--- a/_translator-files/po/fr/Running-a-Server.po
+++ b/_translator-files/po/fr/Running-a-Server.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"PO-Revision-Date: 2021-12-28 21:14+0100\n"
+"PO-Revision-Date: 2022-01-03 16:20+0000\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: fr_FR\n"
@@ -194,12 +194,12 @@ msgstr "Votre serveur sera répertorié dans le serveur annuaire que les clients
 #, no-wrap
 msgid ""
 "<figure>\n"
-"\t<img src=\"{{site.url}}/assets/img/en-screenshots/diagram-public-server.png\" loading=\"lazy\" alt=\"Diagram of connections between clients within a Jamulus Public Server\">\n"
+"\t<img src=\"{% include img/en-screenshots/diagram-public-server.inc %}\" loading=\"lazy\" alt=\"Diagram of connections between clients within a Jamulus Public Server\">\n"
 "<figcaption>How Public Servers work</figcaption>\n"
 "</figure>\n"
 msgstr ""
 "<figure>\n"
-"\t<img src=\"{{site.url}}/assets/img/fr-screenshots/diagram-public-server.png\" loading=\"lazy\" alt=\"Diagramme des connexions entre clients au sein d'un serveur public Jamulus\">\n"
+"\t<img src=\"{% include img/fr-screenshots/diagram-public-server.inc %}\" loading=\"lazy\" alt=\"Diagramme des connexions entre clients au sein d'un serveur public Jamulus\">\n"
 "<figcaption>Fonctionnement des serveurs publics</figcaption>\n"
 "</figure>\n"
 
@@ -218,12 +218,12 @@ msgstr "Il s'agit de la valeur par défaut lorsque vous démarrez un serveur pou
 #, no-wrap
 msgid ""
 "<figure>\n"
-"\t<img src=\"{{site.url}}/assets/img/en-screenshots/diagram-private-server.png\" loading=\"lazy\" alt=\"Diagram of connections between clients within a Jamulus Private Server\">\n"
+"\t<img src=\"{% include img/en-screenshots/diagram-private-server.inc %}\" loading=\"lazy\" alt=\"Diagram of connections between clients within a Jamulus Private Server\">\n"
 "\t<figcaption>How Private Servers work</figcaption>\n"
 "</figure>\n"
 msgstr ""
 "<figure>\n"
-"\t<img src=\"{{site.url}}/assets/img/fr-screenshots/diagram-private-server.png\" loading=\"lazy\" alt=\"Diagramme des connexions entre clients au sein d'un serveur privé Jamulus\">\n"
+"\t<img src=\"{% include img/fr-screenshots/diagram-private-server.inc %}\" loading=\"lazy\" alt=\"Diagramme des connexions entre clients au sein d'un serveur privé Jamulus\">\n"
 "\t<figcaption>Fonctionnement des serveurs privés</figcaption>\n"
 "</figure>\n"
 
@@ -351,13 +351,13 @@ msgstr "## Largeur de bande du réseau"
 msgid ""
 "There is one upstream (musician sending to the server) and one downstream (server sending back the mix to the musician)\n"
 "<figure>\n"
-"\t<img src=\"{{site.url}}/assets/img/en-screenshots/bandwidth-diagram.png\" loading=\"lazy\" alt=\"A diagram of Jamulus network bandwidths from different audio qualities ranging from low to high\">\n"
+"\t<img src=\"{% include img/en-screenshots/bandwidth-diagram.inc %}\" loading=\"lazy\" alt=\"A diagram of Jamulus network bandwidths from different audio qualities ranging from low to high\">\n"
 "<figcaption>Calculate bandwidth use </figcaption>\n"
 "</figure>\n"
 msgstr ""
 "Il y a un amont (le musicien envoie au serveur) et un aval (le serveur renvoie le mix au musicien).\n"
 "<figure>\n"
-"\t<img src=\"{{site.url}}/assets/img/fr-screenshots/bandwidth-diagram.png\" loading=\"lazy\" alt=\"Diagramme de la largeur de bande du réseau Jamulus pour différentes qualités audio, de faible à forte.\">\n"
+"\t<img src=\"{% include img/fr-screenshots/bandwidth-diagram.inc %}\" loading=\"lazy\" alt=\"Diagramme de la largeur de bande du réseau Jamulus pour différentes qualités audio, de faible à forte.\">\n"
 "<figcaption>Calculer l'utilisation de la bande passante </figcaption>\n"
 "</figure>\n"
 
@@ -396,8 +396,8 @@ msgstr "## Configuration du serveur"
 
 #. type: Plain text
 #: ../wiki/en/Running-a-Server.md:152
-msgid "<figure><img src=\"{{site.url}}/assets/img/en-screenshots/server-window-setup.png\" style=\"width:80%; border:5px solid grey;\" loading=\"lazy\" alt=\"Image of the Jamulus server setup window\"></figure>"
-msgstr "<figure><img src=\"{{site.url}}/assets/img/fr-screenshots/server-window-setup.png\" style=\"width:80%; border:5px solid grey;\" loading=\"lazy\" alt=\"Image de la fenêtre de configuration du serveur Jamulus\"></figure>"
+msgid "<figure><img src=\"{% include img/en-screenshots/server-window-setup.inc %}\" style=\"width:80%; border:5px solid grey;\" loading=\"lazy\" alt=\"Image of the Jamulus server setup window\"></figure>"
+msgstr "<figure><img src=\"{% include img/fr-screenshots/server-window-setup.inc %}\" style=\"width:80%; border:5px solid grey;\" loading=\"lazy\" alt=\"Image de la fenêtre de configuration du serveur Jamulus\"></figure>"
 
 #. type: Plain text
 #: ../wiki/en/Running-a-Server.md:154
@@ -451,8 +451,8 @@ msgstr "## Options"
 
 #. type: Plain text
 #: ../wiki/en/Running-a-Server.md:177
-msgid "<figure><img src=\"{{site.url}}/assets/img/en-screenshots/server-window-options.png\" style=\"width:80%; border:5px solid grey;\" loading=\"lazy\" alt=\"Image of Jamulus server window options\"></figure>"
-msgstr "<figure><img src=\"{{site.url}}/assets/img/fr-screenshots/server-window-options.png\" style=\"width:80%; border:5px solid grey;\" loading=\"lazy\" alt=\"Image de la fenêtre options du serveur Jamulus\"></figure>"
+msgid "<figure><img src=\"{% include img/en-screenshots/server-window-options.inc %}\" style=\"width:80%; border:5px solid grey;\" loading=\"lazy\" alt=\"Image of Jamulus server window options\"></figure>"
+msgstr "<figure><img src=\"{% include img/fr-screenshots/server-window-options.inc %}\" style=\"width:80%; border:5px solid grey;\" loading=\"lazy\" alt=\"Image de la fenêtre options du serveur Jamulus\"></figure>"
 
 #. type: Plain text
 #: ../wiki/en/Running-a-Server.md:179
diff --git a/_translator-files/po/fr/Software-Manual.po b/_translator-files/po/fr/Software-Manual.po
index 11db093f3..3988c0d7b 100644
--- a/_translator-files/po/fr/Software-Manual.po
+++ b/_translator-files/po/fr/Software-Manual.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"PO-Revision-Date: 2022-01-02 18:09+0100\n"
+"PO-Revision-Date: 2022-01-04 19:22+0000\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: fr_FR\n"
@@ -92,12 +92,12 @@ msgstr "# Fenêtre principale"
 #, no-wrap
 msgid ""
 "<figure>\n"
-"\t<img src=\"{{site.url}}/assets/img/en-screenshots/main-screen-medium.png\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Image of the Jamulus main window\">\n"
+"\t<img src=\"{% include img/en-screenshots/main-screen-medium.inc %}\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Image of the Jamulus main window\">\n"
 "\t<figcaption>Your local mix when connected to a Server</figcaption>\n"
 "</figure>\n"
 msgstr ""
 "<figure>\n"
-"\t<img src=\"{{site.url}}/assets/img/fr-screenshots/main-screen-medium.png\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Image de la fenêtre principale de Jamulus\">\n"
+"\t<img src=\"{% include img/fr-screenshots/main-screen-medium.inc %}\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Image de la fenêtre principale de Jamulus\">\n"
 "\t<figcaption>Votre mixage local lorsqu'il est connecté à un serveur</figcaption>\n"
 "</figure>\n"
 
@@ -120,8 +120,8 @@ msgstr "Le délai global est calculé à partir du temps de ping actuel et du d
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:36
-msgid "<figure><img src=\"{{site.url}}/assets/img/en-screenshots/led-green.png\" style=\"float:left; margin-right:10px;\" loading=\"lazy\" alt=\"Image of a green LED symbol\"></figure>"
-msgstr "<figure><img src=\"{{site.url}}/assets/img/fr-screenshots/led-green.png\" style=\"float:left; margin-right:10px;\" loading=\"lazy\" alt=\"Image d'un symbole diode verte\"></figure>"
+msgid "<figure><img src=\"{% include img/en-screenshots/led-green.inc %}\" style=\"float:left; margin-right:10px;\" loading=\"lazy\" alt=\"Image of a green LED symbol\"></figure>"
+msgstr "<figure><img src=\"{% include img/fr-screenshots/led-green.inc %}\" style=\"float:left; margin-right:10px;\" loading=\"lazy\" alt=\"Image d'un symbole diode verte\"></figure>"
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:38
@@ -131,8 +131,8 @@ msgstr "**Vert** - Le délai est parfait pour une session de boeuf\n"
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:40
-msgid "<figure><img src=\"{{site.url}}/assets/img/en-screenshots/led-yellow.png\" style=\"float:left; margin-right:10px;\" loading=\"lazy\" alt=\"Image of a yellow LED symbol\"></figure>"
-msgstr "<figure><img src=\"{{site.url}}/assets/img/fr-screenshots/led-yellow.png\" style=\"float:left; margin-right:10px;\" loading=\"lazy\" alt=\"Image d'un symbole diode jaune\"></figure>"
+msgid "<figure><img src=\"{% include img/en-screenshots/led-yellow.inc %}\" style=\"float:left; margin-right:10px;\" loading=\"lazy\" alt=\"Image of a yellow LED symbol\"></figure>"
+msgstr "<figure><img src=\"{% include img/fr-screenshots/led-yellow.inc %}\" style=\"float:left; margin-right:10px;\" loading=\"lazy\" alt=\"Image d'un symbole diode jaune\"></figure>"
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:42
@@ -142,8 +142,8 @@ msgstr "**Jaune** - Une session est toujours possible mais elle peut être plus
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:44
-msgid "<figure><img src=\"{{site.url}}/assets/img/en-screenshots/led-red.png\" style=\"float:left; margin-right:10px; clear: both;\" loading=\"lazy\" alt=\"Image of a green red symbol\"></figure>"
-msgstr "<figure><img src=\"{{site.url}}/assets/img/fr-screenshots/led-red.png\" style=\"float:left; margin-right:10px; clear: both;\" loading=\"lazy\" alt=\"Image d'un symbole diode rouge\"></figure>"
+msgid "<figure><img src=\"{% include img/en-screenshots/led-red.inc %}\" style=\"float:left; margin-right:10px; clear: both;\" loading=\"lazy\" alt=\"Image of a green red symbol\"></figure>"
+msgstr "<figure><img src=\"{% include img/fr-screenshots/led-red.inc %}\" style=\"float:left; margin-right:10px; clear: both;\" loading=\"lazy\" alt=\"Image d'un symbole diode rouge\"></figure>"
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:46
@@ -229,8 +229,8 @@ msgstr "Ouvre une boîte de dialogue dans laquelle vous pouvez sélectionner un
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:82
-msgid "<figure><img src=\"{{site.url}}/assets/img/en-screenshots/connection-setup-window.png\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Image of a server connection window\"></figure>"
-msgstr "<figure><img src=\"{{site.url}}/assets/img/fr-screenshots/connection-setup-window.png\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Image d'une fenêtre de connexion au serveurs\"></figure>"
+msgid "<figure><img src=\"{% include img/en-screenshots/connection-setup-window.inc %}\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Screenshot of the server connection window\"></figure>"
+msgstr "<figure><img src=\"{% include img/fr-screenshots/connection-setup-window.inc %}\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Image d'une fenêtre de connexion au serveurs\"></figure>"
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:84
@@ -254,8 +254,8 @@ msgstr "## Mélangeur audio du serveur"
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:94
-msgid "<figure><img src=\"{{site.url}}/assets/img/en-screenshots/mixer-channles.png\" style=\"float:left; margin-right:10px; margin-bottom:20px; border: 5px solid grey;\" loading=\"lazy\" alt=\"Image of a pair of server mixer controls\"></figure>"
-msgstr "<figure><img src=\"{{site.url}}/assets/img/fr-screenshots/mixer-channles.png\" style=\"float:left; margin-right:10px; margin-bottom:20px; border: 5px solid grey;\" loading=\"lazy\" alt=\"Image d'une paire de commandes de mélangeur de serveur\"></figure>"
+msgid "<figure><img src=\"{% include img/en-screenshots/mixer-channels.inc %}\" style=\"float:left; margin-right:10px; margin-bottom:20px; border: 5px solid grey;\" loading=\"lazy\" alt=\"Image of a pair of server mixer controls\"></figure>"
+msgstr "<figure><img src=\"{% include img/fr-screenshots/mixer-channels.inc %}\" style=\"float:left; margin-right:10px; margin-bottom:20px; border: 5px solid grey;\" loading=\"lazy\" alt=\"Image d'une paire de commandes de mélangeur de serveur\"></figure>"
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:97
@@ -344,8 +344,8 @@ msgstr "Dans le menu Paramètres, sélectionnez \"Mon profil...\" pour définir
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:132
-msgid "<figure><img src=\"{{site.url}}/assets/img/en-screenshots/settings-profile.png\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Image of a profile window\"></figure>"
-msgstr "<figure><img src=\"{{site.url}}/assets/img/fr-screenshots/settings-profile.png\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Image de la fenêtre de profil\"></figure>"
+msgid "<figure><img src=\"{% include img/en-screenshots/settings-profile.inc %}\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Image of a profile window\"></figure>"
+msgstr "<figure><img src=\"{% include img/fr-screenshots/settings-profile.inc %}\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Image de la fenêtre de profil\"></figure>"
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:134
@@ -354,8 +354,8 @@ msgstr "Si un instrument et/ou un pays est défini, les icônes de ces sélectio
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:136
-msgid "<figure><img src=\"{{site.url}}/assets/img/en-screenshots/profile-tooltip.png\" style=\"width:30%;\" loading=\"lazy\" alt=\"Image of a tooltip showing profile information\"></figure>"
-msgstr "<figure><img src=\"{{site.url}}/assets/img/fr-screenshots/profile-tooltip.png\" style=\"width:30%;\" loading=\"lazy\" alt=\"Image d'une infobulle montrant les informations du profil\"></figure>"
+msgid "<figure><img src=\"{% include img/en-screenshots/profile-tooltip.inc %}\" style=\"width:30%;\" loading=\"lazy\" alt=\"Image of a tooltip showing profile information\"></figure>"
+msgstr "<figure><img src=\"{% include img/fr-screenshots/profile-tooltip.inc %}\" style=\"width:30%;\" loading=\"lazy\" alt=\"Image d'une infobulle montrant les informations du profil\"></figure>"
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:138
@@ -384,8 +384,8 @@ msgstr "## Configuration audio/réseau"
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:148
-msgid "<figure><img src=\"{{site.url}}/assets/img/en-screenshots/settings-network.png\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Image of audio/network settings window\"></figure>"
-msgstr "<figure><img src=\"{{site.url}}/assets/img/fr-screenshots/settings-network.png\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Image de la fenêtre des paramètres audio/réseau\"></figure>"
+msgid "<figure><img src=\"{% include img/en-screenshots/settings-network.inc %}\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Image of audio/network settings window\"></figure>"
+msgstr "<figure><img src=\"{% include img/fr-screenshots/settings-network.inc %}\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Image de la fenêtre des paramètres audio/réseau\"></figure>"
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:150
@@ -404,8 +404,8 @@ msgstr "### Mappage des canaux d'entrée/sortie"
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:157
-msgid "<figure><img src=\"{{site.url}}/assets/img/en-screenshots/channel-mapping.png\" style=\"float:left; margin-right:10px; margin-bottom:20px;\" loading=\"lazy\" alt=\"Image of Input and output channel mapping\"></figure>"
-msgstr "<figure><img src=\"{{site.url}}/assets/img/fr-screenshots/channel-mapping.png\" style=\"float:left; margin-right:10px; margin-bottom:20px;\" loading=\"lazy\" alt=\"Image du mappage des canaux d'entrée et de sortie\"></figure>"
+msgid "<figure><img src=\"{% include img/en-screenshots/channel-mapping.inc %}\" style=\"float:left; margin-right:10px; margin-bottom:20px;\" loading=\"lazy\" alt=\"Image of Input and output channel mapping\"></figure>"
+msgstr "<figure><img src=\"{% include img/fr-screenshots/channel-mapping.inc %}\" style=\"float:left; margin-right:10px; margin-bottom:20px;\" loading=\"lazy\" alt=\"Image du mappage des canaux d'entrée et de sortie\"></figure>"
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:161
@@ -567,8 +567,8 @@ msgstr "## Configuration avancée"
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:234
-msgid "<figure><img src=\"{{site.url}}/assets/img/en-screenshots/settings-advanced.png\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Image of advanced settings window\"></figure>"
-msgstr "<figure><img src=\"{{site.url}}/assets/img/fr-screenshots/settings-advanced.png\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Image de la fenêtre paramètres avancés\"></figure>"
+msgid "<figure><img src=\"{% include img/en-screenshots/settings-advanced.inc %}\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Image of advanced settings window\"></figure>"
+msgstr "<figure><img src=\"{% include img/fr-screenshots/settings-advanced.inc %}\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Image de la fenêtre paramètres avancés\"></figure>"
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:236
diff --git a/_translator-files/po/it/FAQ.po b/_translator-files/po/it/FAQ.po
index 3e68ff4bd..81e2d2ea9 100644
--- a/_translator-files/po/it/FAQ.po
+++ b/_translator-files/po/it/FAQ.po
@@ -165,7 +165,7 @@ msgstr ""
 
 #. type: Plain text
 #: ../wiki/en/FAQ.md:58
-msgid "<img src=\"{{site.url}}/assets/img/en-screenshots/diagram-overview.png\" loading=\"lazy\" alt=\"Diagram showing how Jamulus works\">"
+msgid "<img src=\"{% include img/en-screenshots/diagram-overview.inc %}\" loading=\"lazy\" alt=\"Diagram showing how Jamulus works\">"
 msgstr ""
 
 #. type: Plain text
diff --git a/_translator-files/po/it/Getting-Started.po b/_translator-files/po/it/Getting-Started.po
index 9eb7a246d..11bf9a203 100644
--- a/_translator-files/po/it/Getting-Started.po
+++ b/_translator-files/po/it/Getting-Started.po
@@ -123,7 +123,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "<figure>\n"
-"  <img src=\"{{site.url}}/assets/img/en-screenshots/main-screen-default.png\" loading=\"lazy\" alt=\"Screenshot\" style=\"border: 5px solid grey;\">\n"
+"  <img src=\"{% include img/en-screenshots/main-screen-default.inc %}\" loading=\"lazy\" alt=\"Screenshot\" style=\"border: 5px solid grey;\">\n"
 "  <figcaption>The main window before you connect to a server</figcaption>\n"
 "</figure>\n"
 msgstr ""
@@ -143,7 +143,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "<figure>\n"
-"  <img src=\"{{site.url}}/assets/img/en-screenshots/settings-profile.png\" loading=\"lazy\" alt=\"Screenshot\" style=\"border: 5px solid grey;\">\n"
+"  <img src=\"{% include img/en-screenshots/settings-profile.inc %}\" loading=\"lazy\" alt=\"Screenshot\" style=\"border: 5px solid grey;\">\n"
 "  <figcaption>Let people know who you are</figcaption>\n"
 "</figure>\n"
 msgstr ""
@@ -179,7 +179,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "<figure>\n"
-"  <img src=\"{{site.url}}/assets/img/en-screenshots/connection-setup-window.png\" loading=\"lazy\" alt=\"Screenshot\" style=\"border: 5px solid grey;\">\n"
+"  <img src=\"{% include img/en-screenshots/connection-setup-window.inc %}\" loading=\"lazy\" alt=\"Screenshot of the connection window\" style=\"border: 5px solid grey;\">\n"
 "  <figcaption>Connect to a server</figcaption>\n"
 "</figure>\n"
 msgstr ""
@@ -209,7 +209,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "<figure>\n"
-"  <img src=\"{{site.url}}/assets/img/en-screenshots/main-screen-medium.png\" loading=\"lazy\" alt=\"Screenshot\" style=\"border: 5px solid grey;\">\n"
+"  <img src=\"{% include img/en-screenshots/main-screen-medium.inc %}\" loading=\"lazy\" alt=\"Screenshot\" style=\"border: 5px solid grey;\">\n"
 "  <figcaption>The main window when you are connected to a sever</figcaption>\n"
 "</figure>\n"
 msgstr ""
diff --git a/_translator-files/po/it/Running-a-Server.po b/_translator-files/po/it/Running-a-Server.po
index 83f96689f..de92c02cd 100644
--- a/_translator-files/po/it/Running-a-Server.po
+++ b/_translator-files/po/it/Running-a-Server.po
@@ -189,7 +189,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "<figure>\n"
-"\t<img src=\"{{site.url}}/assets/img/en-screenshots/diagram-public-server.png\" loading=\"lazy\" alt=\"Diagram of connections between clients within a Jamulus Public Server\">\n"
+"\t<img src=\"{% include img/en-screenshots/diagram-public-server.inc %}\" loading=\"lazy\" alt=\"Diagram of connections between clients within a Jamulus Public Server\">\n"
 "<figcaption>How Public Servers work</figcaption>\n"
 "</figure>\n"
 msgstr ""
@@ -209,7 +209,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "<figure>\n"
-"\t<img src=\"{{site.url}}/assets/img/en-screenshots/diagram-private-server.png\" loading=\"lazy\" alt=\"Diagram of connections between clients within a Jamulus Private Server\">\n"
+"\t<img src=\"{% include img/en-screenshots/diagram-private-server.inc %}\" loading=\"lazy\" alt=\"Diagram of connections between clients within a Jamulus Private Server\">\n"
 "\t<figcaption>How Private Servers work</figcaption>\n"
 "</figure>\n"
 msgstr ""
@@ -329,7 +329,7 @@ msgstr ""
 msgid ""
 "There is one upstream (musician sending to the server) and one downstream (server sending back the mix to the musician)\n"
 "<figure>\n"
-"\t<img src=\"{{site.url}}/assets/img/en-screenshots/bandwidth-diagram.png\" loading=\"lazy\" alt=\"A diagram of Jamulus network bandwidths from different audio qualities ranging from low to high\">\n"
+"\t<img src=\"{% include img/en-screenshots/bandwidth-diagram.inc %}\" loading=\"lazy\" alt=\"A diagram of Jamulus network bandwidths from different audio qualities ranging from low to high\">\n"
 "<figcaption>Calculate bandwidth use </figcaption>\n"
 "</figure>\n"
 msgstr ""
@@ -369,7 +369,7 @@ msgstr ""
 
 #. type: Plain text
 #: ../wiki/en/Running-a-Server.md:152
-msgid "<figure><img src=\"{{site.url}}/assets/img/en-screenshots/server-window-setup.png\" style=\"width:80%; border:5px solid grey;\" loading=\"lazy\" alt=\"Image of the Jamulus server setup window\"></figure>"
+msgid "<figure><img src=\"{% include img/en-screenshots/server-window-setup.inc %}\" style=\"width:80%; border:5px solid grey;\" loading=\"lazy\" alt=\"Image of the Jamulus server setup window\"></figure>"
 msgstr ""
 
 #. type: Plain text
@@ -424,7 +424,7 @@ msgstr ""
 
 #. type: Plain text
 #: ../wiki/en/Running-a-Server.md:177
-msgid "<figure><img src=\"{{site.url}}/assets/img/en-screenshots/server-window-options.png\" style=\"width:80%; border:5px solid grey;\" loading=\"lazy\" alt=\"Image of Jamulus server window options\"></figure>"
+msgid "<figure><img src=\"{% include img/en-screenshots/server-window-options.inc %}\" style=\"width:80%; border:5px solid grey;\" loading=\"lazy\" alt=\"Image of Jamulus server window options\"></figure>"
 msgstr ""
 
 #. type: Plain text
diff --git a/_translator-files/po/it/Software-Manual.po b/_translator-files/po/it/Software-Manual.po
index 76d04d4ec..b8670064f 100644
--- a/_translator-files/po/it/Software-Manual.po
+++ b/_translator-files/po/it/Software-Manual.po
@@ -87,7 +87,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "<figure>\n"
-"\t<img src=\"{{site.url}}/assets/img/en-screenshots/main-screen-medium.png\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Image of the Jamulus main window\">\n"
+"\t<img src=\"{% include img/en-screenshots/main-screen-medium.inc %}\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Image of the Jamulus main window\">\n"
 "\t<figcaption>Your local mix when connected to a Server</figcaption>\n"
 "</figure>\n"
 msgstr ""
@@ -111,7 +111,7 @@ msgstr ""
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:36
-msgid "<figure><img src=\"{{site.url}}/assets/img/en-screenshots/led-green.png\" style=\"float:left; margin-right:10px;\" loading=\"lazy\" alt=\"Image of a green LED symbol\"></figure>"
+msgid "<figure><img src=\"{% include img/en-screenshots/led-green.inc %}\" style=\"float:left; margin-right:10px;\" loading=\"lazy\" alt=\"Image of a green LED symbol\"></figure>"
 msgstr ""
 
 #. type: Plain text
@@ -122,7 +122,7 @@ msgstr ""
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:40
-msgid "<figure><img src=\"{{site.url}}/assets/img/en-screenshots/led-yellow.png\" style=\"float:left; margin-right:10px;\" loading=\"lazy\" alt=\"Image of a yellow LED symbol\"></figure>"
+msgid "<figure><img src=\"{% include img/en-screenshots/led-yellow.inc %}\" style=\"float:left; margin-right:10px;\" loading=\"lazy\" alt=\"Image of a yellow LED symbol\"></figure>"
 msgstr ""
 
 #. type: Plain text
@@ -133,7 +133,7 @@ msgstr ""
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:44
-msgid "<figure><img src=\"{{site.url}}/assets/img/en-screenshots/led-red.png\" style=\"float:left; margin-right:10px; clear: both;\" loading=\"lazy\" alt=\"Image of a green red symbol\"></figure>"
+msgid "<figure><img src=\"{% include img/en-screenshots/led-red.inc %}\" style=\"float:left; margin-right:10px; clear: both;\" loading=\"lazy\" alt=\"Image of a green red symbol\"></figure>"
 msgstr ""
 
 #. type: Plain text
@@ -220,7 +220,7 @@ msgstr ""
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:82
-msgid "<figure><img src=\"{{site.url}}/assets/img/en-screenshots/connection-setup-window.png\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Image of a server connection window\"></figure>"
+msgid "<figure><img src=\"{% include img/en-screenshots/connection-setup-window.inc %}\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Screenshot of the server connection window\"></figure>"
 msgstr ""
 
 #. type: Plain text
@@ -245,7 +245,7 @@ msgstr ""
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:94
-msgid "<figure><img src=\"{{site.url}}/assets/img/en-screenshots/mixer-channles.png\" style=\"float:left; margin-right:10px; margin-bottom:20px; border: 5px solid grey;\" loading=\"lazy\" alt=\"Image of a pair of server mixer controls\"></figure>"
+msgid "<figure><img src=\"{% include img/en-screenshots/mixer-channels.inc %}\" style=\"float:left; margin-right:10px; margin-bottom:20px; border: 5px solid grey;\" loading=\"lazy\" alt=\"Image of a pair of server mixer controls\"></figure>"
 msgstr ""
 
 #. type: Plain text
@@ -335,7 +335,7 @@ msgstr ""
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:132
-msgid "<figure><img src=\"{{site.url}}/assets/img/en-screenshots/settings-profile.png\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Image of a profile window\"></figure>"
+msgid "<figure><img src=\"{% include img/en-screenshots/settings-profile.inc %}\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Image of a profile window\"></figure>"
 msgstr ""
 
 #. type: Plain text
@@ -345,7 +345,7 @@ msgstr ""
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:136
-msgid "<figure><img src=\"{{site.url}}/assets/img/en-screenshots/profile-tooltip.png\" style=\"width:30%;\" loading=\"lazy\" alt=\"Image of a tooltip showing profile information\"></figure>"
+msgid "<figure><img src=\"{% include img/en-screenshots/profile-tooltip.inc %}\" style=\"width:30%;\" loading=\"lazy\" alt=\"Image of a tooltip showing profile information\"></figure>"
 msgstr ""
 
 #. type: Plain text
@@ -375,7 +375,7 @@ msgstr ""
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:148
-msgid "<figure><img src=\"{{site.url}}/assets/img/en-screenshots/settings-network.png\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Image of audio/network settings window\"></figure>"
+msgid "<figure><img src=\"{% include img/en-screenshots/settings-network.inc %}\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Image of audio/network settings window\"></figure>"
 msgstr ""
 
 #. type: Plain text
@@ -395,7 +395,7 @@ msgstr ""
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:157
-msgid "<figure><img src=\"{{site.url}}/assets/img/en-screenshots/channel-mapping.png\" style=\"float:left; margin-right:10px; margin-bottom:20px;\" loading=\"lazy\" alt=\"Image of Input and output channel mapping\"></figure>"
+msgid "<figure><img src=\"{% include img/en-screenshots/channel-mapping.inc %}\" style=\"float:left; margin-right:10px; margin-bottom:20px;\" loading=\"lazy\" alt=\"Image of Input and output channel mapping\"></figure>"
 msgstr ""
 
 #. type: Plain text
@@ -558,7 +558,7 @@ msgstr ""
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:234
-msgid "<figure><img src=\"{{site.url}}/assets/img/en-screenshots/settings-advanced.png\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Image of advanced settings window\"></figure>"
+msgid "<figure><img src=\"{% include img/en-screenshots/settings-advanced.inc %}\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Image of advanced settings window\"></figure>"
 msgstr ""
 
 #. type: Plain text
diff --git a/_translator-files/po/nl/FAQ.po b/_translator-files/po/nl/FAQ.po
index 376c54229..d404dc103 100644
--- a/_translator-files/po/nl/FAQ.po
+++ b/_translator-files/po/nl/FAQ.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"PO-Revision-Date: 2021-12-21 07:33+0100\n"
+"PO-Revision-Date: 2022-01-03 16:23+0000\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: nl\n"
@@ -167,8 +167,8 @@ msgstr "### Hoe werkt Jamulus (in het algemeen)?"
 
 #. type: Plain text
 #: ../wiki/en/FAQ.md:58
-msgid "<img src=\"{{site.url}}/assets/img/en-screenshots/diagram-overview.png\" loading=\"lazy\" alt=\"Diagram showing how Jamulus works\">"
-msgstr "<img src=\"{{site.url}}/assets/img/nl-screenshots/diagram-overview.png\" loading=\"lazy\" alt=\"diagram dat laat zien hoe Jamulus werkt\">"
+msgid "<img src=\"{% include img/en-screenshots/diagram-overview.inc %}\" loading=\"lazy\" alt=\"Diagram showing how Jamulus works\">"
+msgstr "<img src=\"{% include img/nl-screenshots/diagram-overview.inc %}\" loading=\"lazy\" alt=\"diagram dat laat zien hoe Jamulus werkt\">"
 
 #. type: Plain text
 #: ../wiki/en/FAQ.md:61
diff --git a/_translator-files/po/nl/Getting-Started.po b/_translator-files/po/nl/Getting-Started.po
index 0113e0bc5..09e8716f5 100644
--- a/_translator-files/po/nl/Getting-Started.po
+++ b/_translator-files/po/nl/Getting-Started.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"PO-Revision-Date: 2021-12-18 10:56+0100\n"
+"PO-Revision-Date: 2022-01-03 16:25+0000\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: nl\n"
@@ -128,12 +128,12 @@ msgstr "Wanneer je Jamulus opent, zie je een venster dat er als volgt uitziet:"
 #, no-wrap
 msgid ""
 "<figure>\n"
-"  <img src=\"{{site.url}}/assets/img/en-screenshots/main-screen-default.png\" loading=\"lazy\" alt=\"Screenshot\" style=\"border: 5px solid grey;\">\n"
+"  <img src=\"{% include img/en-screenshots/main-screen-default.inc %}\" loading=\"lazy\" alt=\"Screenshot\" style=\"border: 5px solid grey;\">\n"
 "  <figcaption>The main window before you connect to a server</figcaption>\n"
 "</figure>\n"
 msgstr ""
 "<figure>\n"
-"  <img src=\"{{site.url}}/assets/img/nl-screenshots/main-screen-default.png\" loading=\"lazy\" alt=\"schermafbeelding\" style=\"border: 5px solid grey;\">\n"
+"  <img src=\"{% include img/nl-screenshots/main-screen-default.inc %}\" loading=\"lazy\" alt=\"schermafbeelding\" style=\"border: 5px solid grey;\">\n"
 "  <figcaption>Het hoofdvenster voordat je verbing maakt met een server</figcaption>\n"
 "</figure>\n"
 
@@ -152,12 +152,12 @@ msgstr "Laat anderen weten wie je bent. Klik linksonder op de knop \"Instellinge
 #, no-wrap
 msgid ""
 "<figure>\n"
-"  <img src=\"{{site.url}}/assets/img/en-screenshots/settings-profile.png\" loading=\"lazy\" alt=\"Screenshot\" style=\"border: 5px solid grey;\">\n"
+"  <img src=\"{% include img/en-screenshots/settings-profile.inc %}\" loading=\"lazy\" alt=\"Screenshot\" style=\"border: 5px solid grey;\">\n"
 "  <figcaption>Let people know who you are</figcaption>\n"
 "</figure>\n"
 msgstr ""
 "<figure>\n"
-"  <img src=\"{{site.url}}/assets/img/nl-screenshots/settings-profile.png\" loading=\"lazy\" alt=\"schermafbeelding\" style=\"border: 5px solid grey;\">\n"
+"  <img src=\"{% include img/nl-screenshots/settings-profile.inc %}\" loading=\"lazy\" alt=\"schermafbeelding\" style=\"border: 5px solid grey;\">\n"
 "  <figcaption>Laat anderen weten wie je bent</figcaption>\n"
 "</figure>\n"
 
@@ -192,12 +192,12 @@ msgstr "Gebruik nu de \"Verbinden\" knop in het hoofdvenster van Jamulus om met
 #, no-wrap
 msgid ""
 "<figure>\n"
-"  <img src=\"{{site.url}}/assets/img/en-screenshots/connection-setup-window.png\" loading=\"lazy\" alt=\"Screenshot\" style=\"border: 5px solid grey;\">\n"
+"  <img src=\"{% include img/en-screenshots/connection-setup-window.inc %}\" loading=\"lazy\" alt=\"Screenshot of the connection window\" style=\"border: 5px solid grey;\">\n"
 "  <figcaption>Connect to a server</figcaption>\n"
 "</figure>\n"
 msgstr ""
 "<figure>\n"
-"  <img src=\"{{site.url}}/assets/img/nl-screenshots/connection-setup-window.png\" loading=\"lazy\" alt=\"schermafbeeling\" style=\"border: 5px solid grey;\">\n"
+"  <img src=\"{% include img/nl-screenshots/connection-setup-window.inc %}\" loading=\"lazy\" alt=\"schermafbeeling\" style=\"border: 5px solid grey;\">\n"
 "  <figcaption>Verbinding maken met een server</figcaption>\n"
 "</figure>\n"
 
@@ -226,12 +226,12 @@ msgstr "Met je geluid helemaal ingesteld, ben je klaar om te gaan spelen. Wannee
 #, no-wrap
 msgid ""
 "<figure>\n"
-"  <img src=\"{{site.url}}/assets/img/en-screenshots/main-screen-medium.png\" loading=\"lazy\" alt=\"Screenshot\" style=\"border: 5px solid grey;\">\n"
+"  <img src=\"{% include img/en-screenshots/main-screen-medium.inc %}\" loading=\"lazy\" alt=\"Screenshot\" style=\"border: 5px solid grey;\">\n"
 "  <figcaption>The main window when you are connected to a sever</figcaption>\n"
 "</figure>\n"
 msgstr ""
 "<figure>\n"
-"  <img src=\"{{site.url}}/assets/img/nl-screenshots/main-screen-medium.png\" loading=\"lazy\" alt=\"schermafbeelding\" style=\"border: 5px solid grey;\">\n"
+"  <img src=\"{% include img/nl-screenshots/main-screen-medium.inc %}\" loading=\"lazy\" alt=\"schermafbeelding\" style=\"border: 5px solid grey;\">\n"
 "  <figcaption>Het hoofdvenster wanneer je verbonden bent met een server</figcaption>\n"
 "</figure>\n"
 
diff --git a/_translator-files/po/nl/Running-a-Server.po b/_translator-files/po/nl/Running-a-Server.po
index 1322617bb..3a57f692f 100644
--- a/_translator-files/po/nl/Running-a-Server.po
+++ b/_translator-files/po/nl/Running-a-Server.po
@@ -6,14 +6,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"PO-Revision-Date: 2021-12-20 10:01+0100\n"
+"PO-Revision-Date: 2022-01-03 16:27+0000\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.3\n"
+"X-Generator: Poedit 3.0\n"
 
 #. type: YAML Front Matter: lang
 #: ../wiki/en/Running-a-Server.md:1
@@ -191,12 +191,12 @@ msgstr "Jouw server wordt vermeld in het adresboek die standaard door clients wo
 #, no-wrap
 msgid ""
 "<figure>\n"
-"\t<img src=\"{{site.url}}/assets/img/en-screenshots/diagram-public-server.png\" loading=\"lazy\" alt=\"Diagram of connections between clients within a Jamulus Public Server\">\n"
+"\t<img src=\"{% include img/en-screenshots/diagram-public-server.inc %}\" loading=\"lazy\" alt=\"Diagram of connections between clients within a Jamulus Public Server\">\n"
 "<figcaption>How Public Servers work</figcaption>\n"
 "</figure>\n"
 msgstr ""
 "<figure>\n"
-"\t<img src=\"{{site.url}}/assets/img/nl-screenshots/diagram-public-server.png\" loading=\"lazy\" alt=\"diagram met verbingen tussen clients en een openbare Jamulus server\">\n"
+"\t<img src=\"{% include img/nl-screenshots/diagram-public-server.inc %}\" loading=\"lazy\" alt=\"diagram met verbingen tussen clients en een openbare Jamulus server\">\n"
 "<figcaption>Hoe openbare servers werken</figcaption>\n"
 "</figure>\n"
 
@@ -215,12 +215,12 @@ msgstr "Dit is de standaardinstelling wanneer je voor de eerste keer een server
 #, no-wrap
 msgid ""
 "<figure>\n"
-"\t<img src=\"{{site.url}}/assets/img/en-screenshots/diagram-private-server.png\" loading=\"lazy\" alt=\"Diagram of connections between clients within a Jamulus Private Server\">\n"
+"\t<img src=\"{% include img/en-screenshots/diagram-private-server.inc %}\" loading=\"lazy\" alt=\"Diagram of connections between clients within a Jamulus Private Server\">\n"
 "\t<figcaption>How Private Servers work</figcaption>\n"
 "</figure>\n"
 msgstr ""
 "<figure>\n"
-"\t<img src=\"{{site.url}}/assets/img/nl-screenshots/diagram-private-server.png\" loading=\"lazy\" alt=\"diagram met verbinden tussen clients en een prive Jamulus server\">\n"
+"\t<img src=\"{% include img/nl-screenshots/diagram-private-server.inc %}\" loading=\"lazy\" alt=\"diagram met verbinden tussen clients en een prive Jamulus server\">\n"
 "\t<figcaption>Hoe prive servers werken</figcaption>\n"
 "</figure>\n"
 
@@ -347,13 +347,13 @@ msgstr "## Netwerk bandbreedte"
 msgid ""
 "There is one upstream (musician sending to the server) and one downstream (server sending back the mix to the musician)\n"
 "<figure>\n"
-"\t<img src=\"{{site.url}}/assets/img/en-screenshots/bandwidth-diagram.png\" loading=\"lazy\" alt=\"A diagram of Jamulus network bandwidths from different audio qualities ranging from low to high\">\n"
+"\t<img src=\"{% include img/en-screenshots/bandwidth-diagram.inc %}\" loading=\"lazy\" alt=\"A diagram of Jamulus network bandwidths from different audio qualities ranging from low to high\">\n"
 "<figcaption>Calculate bandwidth use </figcaption>\n"
 "</figure>\n"
 msgstr ""
 "Er is een upstream (muzikant stuurt naar de server) en een downstream (server stuurt de mix terug naar de muzikant)\n"
 "<figure>\n"
-"\t<img src=\"{{site.url}}/assets/img/nl-screenshots/bandwidth-diagram.png\" loading=\"lazy\" alt=\"een diagram met de Jamulus netwerk bandbreedte voor verschillende audiokwaliteit van laag naar hoog\">\n"
+"\t<img src=\"{% include img/nl-screenshots/bandwidth-diagram.inc %}\" loading=\"lazy\" alt=\"een diagram met de Jamulus netwerk bandbreedte voor verschillende audiokwaliteit van laag naar hoog\">\n"
 "<figcaption>Bereken bandbreedte gebruik</figcaption>\n"
 "</figure>\n"
 
@@ -392,8 +392,8 @@ msgstr "## Serverconfiguratie"
 
 #. type: Plain text
 #: ../wiki/en/Running-a-Server.md:152
-msgid "<figure><img src=\"{{site.url}}/assets/img/en-screenshots/server-window-setup.png\" style=\"width:80%; border:5px solid grey;\" loading=\"lazy\" alt=\"Image of the Jamulus server setup window\"></figure>"
-msgstr "<figure><img src=\"{{site.url}}/assets/img/nl-screenshots/server-window-setup.png\" style=\"width:80%; border:5px solid grey;\" loading=\"lazy\" alt=\"afbeelding van het Jamulus server configuratie venster\"></figure>"
+msgid "<figure><img src=\"{% include img/en-screenshots/server-window-setup.inc %}\" style=\"width:80%; border:5px solid grey;\" loading=\"lazy\" alt=\"Image of the Jamulus server setup window\"></figure>"
+msgstr "<figure><img src=\"{% include img/nl-screenshots/server-window-setup.inc %}\" style=\"width:80%; border:5px solid grey;\" loading=\"lazy\" alt=\"afbeelding van het Jamulus server configuratie venster\"></figure>"
 
 #. type: Plain text
 #: ../wiki/en/Running-a-Server.md:154
@@ -447,8 +447,8 @@ msgstr "## Opties"
 
 #. type: Plain text
 #: ../wiki/en/Running-a-Server.md:177
-msgid "<figure><img src=\"{{site.url}}/assets/img/en-screenshots/server-window-options.png\" style=\"width:80%; border:5px solid grey;\" loading=\"lazy\" alt=\"Image of Jamulus server window options\"></figure>"
-msgstr "<figure><img src=\"{{site.url}}/assets/img/nl-screenshots/server-window-options.png\" style=\"width:80%; border:5px solid grey;\" loading=\"lazy\" alt=\"afbeelding van het Jamulus server opties venster\"></figure>"
+msgid "<figure><img src=\"{% include img/en-screenshots/server-window-options.inc %}\" style=\"width:80%; border:5px solid grey;\" loading=\"lazy\" alt=\"Image of Jamulus server window options\"></figure>"
+msgstr "<figure><img src=\"{% include img/nl-screenshots/server-window-options.inc %}\" style=\"width:80%; border:5px solid grey;\" loading=\"lazy\" alt=\"afbeelding van het Jamulus server opties venster\"></figure>"
 
 #. type: Plain text
 #: ../wiki/en/Running-a-Server.md:179
diff --git a/_translator-files/po/nl/Software-Manual.po b/_translator-files/po/nl/Software-Manual.po
index 7f17cbf40..d8bd8e615 100644
--- a/_translator-files/po/nl/Software-Manual.po
+++ b/_translator-files/po/nl/Software-Manual.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"PO-Revision-Date: 2021-12-21 07:46+0100\n"
+"PO-Revision-Date: 2022-01-04 19:23+0000\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: nl\n"
@@ -89,12 +89,12 @@ msgstr "# Hoofdvenster"
 #, no-wrap
 msgid ""
 "<figure>\n"
-"\t<img src=\"{{site.url}}/assets/img/en-screenshots/main-screen-medium.png\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Image of the Jamulus main window\">\n"
+"\t<img src=\"{% include img/en-screenshots/main-screen-medium.inc %}\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Image of the Jamulus main window\">\n"
 "\t<figcaption>Your local mix when connected to a Server</figcaption>\n"
 "</figure>\n"
 msgstr ""
 "<figure>\n"
-"\t<img src=\"{{site.url}}/assets/img/nl-screenshots/main-screen-medium.png\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"afbeelding van het Jamulus hoofdvenster\">\n"
+"\t<img src=\"{% include img/nl-screenshots/main-screen-medium.inc %}\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"afbeelding van het Jamulus hoofdvenster\">\n"
 "\t<figcaption>Je eigen mix wanneer je verbinding hebt met een server</figcaption>\n"
 "</figure>\n"
 
@@ -117,8 +117,8 @@ msgstr "**Vertraging** toont de totale vertraging berekend op basis van de huidi
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:36
-msgid "<figure><img src=\"{{site.url}}/assets/img/en-screenshots/led-green.png\" style=\"float:left; margin-right:10px;\" loading=\"lazy\" alt=\"Image of a green LED symbol\"></figure>"
-msgstr "<figure><img src=\"{{site.url}}/assets/img/nl-screenshots/led-green.png\" style=\"float:left; margin-right:10px;\" loading=\"lazy\" alt=\"afbeelindg van een groen LED symbool\"></figure>"
+msgid "<figure><img src=\"{% include img/en-screenshots/led-green.inc %}\" style=\"float:left; margin-right:10px;\" loading=\"lazy\" alt=\"Image of a green LED symbol\"></figure>"
+msgstr "<figure><img src=\"{% include img/nl-screenshots/led-green.inc %}\" style=\"float:left; margin-right:10px;\" loading=\"lazy\" alt=\"afbeelindg van een groen LED symbool\"></figure>"
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:38
@@ -128,8 +128,8 @@ msgstr "**Groen** - De vertraging is perfect voor een jam sessie\n"
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:40
-msgid "<figure><img src=\"{{site.url}}/assets/img/en-screenshots/led-yellow.png\" style=\"float:left; margin-right:10px;\" loading=\"lazy\" alt=\"Image of a yellow LED symbol\"></figure>"
-msgstr "<figure><img src=\"{{site.url}}/assets/img/nl-screenshots/led-yellow.png\" style=\"float:left; margin-right:10px;\" loading=\"lazy\" alt=\"afbeelding van een geel LED symbool\"></figure>"
+msgid "<figure><img src=\"{% include img/en-screenshots/led-yellow.inc %}\" style=\"float:left; margin-right:10px;\" loading=\"lazy\" alt=\"Image of a yellow LED symbol\"></figure>"
+msgstr "<figure><img src=\"{% include img/nl-screenshots/led-yellow.inc %}\" style=\"float:left; margin-right:10px;\" loading=\"lazy\" alt=\"afbeelding van een geel LED symbool\"></figure>"
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:42
@@ -139,8 +139,8 @@ msgstr "**Geel** - Een sessie is nog steeds mogelijk maar het kan moeilijker zij
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:44
-msgid "<figure><img src=\"{{site.url}}/assets/img/en-screenshots/led-red.png\" style=\"float:left; margin-right:10px; clear: both;\" loading=\"lazy\" alt=\"Image of a green red symbol\"></figure>"
-msgstr "<figure><img src=\"{{site.url}}/assets/img/nl-screenshots/led-red.png\" style=\"float:left; margin-right:10px; clear: both;\" loading=\"lazy\" alt=\"afbeelding van een rood LED symbool\"></figure>"
+msgid "<figure><img src=\"{% include img/en-screenshots/led-red.inc %}\" style=\"float:left; margin-right:10px; clear: both;\" loading=\"lazy\" alt=\"Image of a green red symbol\"></figure>"
+msgstr "<figure><img src=\"{% include img/nl-screenshots/led-red.inc %}\" style=\"float:left; margin-right:10px; clear: both;\" loading=\"lazy\" alt=\"afbeelding van een rood LED symbool\"></figure>"
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:46
@@ -226,8 +226,8 @@ msgstr "Opent een venster waarin je een server kunt selecteren om verbinding mee
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:82
-msgid "<figure><img src=\"{{site.url}}/assets/img/en-screenshots/connection-setup-window.png\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Image of a server connection window\"></figure>"
-msgstr "<figure><img src=\"{{site.url}}/assets/img/nl-screenshots/connection-setup-window.png\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"afbeelding van het server verbindingsvenster\"></figure>"
+msgid "<figure><img src=\"{% include img/en-screenshots/connection-setup-window.inc %}\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Screenshot of the server connection window\"></figure>"
+msgstr "<figure><img src=\"{% include img/nl-screenshots/connection-setup-window.inc %}\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"afbeelding van het server verbindingsvenster\"></figure>"
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:84
@@ -251,8 +251,8 @@ msgstr "## Server audio mengpaneel"
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:94
-msgid "<figure><img src=\"{{site.url}}/assets/img/en-screenshots/mixer-channles.png\" style=\"float:left; margin-right:10px; margin-bottom:20px; border: 5px solid grey;\" loading=\"lazy\" alt=\"Image of a pair of server mixer controls\"></figure>"
-msgstr "<figure><img src=\"{{site.url}}/assets/img/nl-screenshots/mixer-channles.png\" style=\"float:left; margin-right:10px; margin-bottom:20px; border: 5px solid grey;\" loading=\"lazy\" alt=\"afbeelding van een paar server mixer opties\"></figure>"
+msgid "<figure><img src=\"{% include img/en-screenshots/mixer-channels.inc %}\" style=\"float:left; margin-right:10px; margin-bottom:20px; border: 5px solid grey;\" loading=\"lazy\" alt=\"Image of a pair of server mixer controls\"></figure>"
+msgstr "<figure><img src=\"{% include img/nl-screenshots/mixer-channels.inc %}\" style=\"float:left; margin-right:10px; margin-bottom:20px; border: 5px solid grey;\" loading=\"lazy\" alt=\"afbeelding van een paar server mixer opties\"></figure>"
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:97
@@ -341,8 +341,8 @@ msgstr "In het Instellingen menu kies je \"Mijn profiel...\" om je alias/naam di
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:132
-msgid "<figure><img src=\"{{site.url}}/assets/img/en-screenshots/settings-profile.png\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Image of a profile window\"></figure>"
-msgstr "<figure><img src=\"{{site.url}}/assets/img/nl-screenshots/settings-profile.png\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"afbeelding van het profiel venster\"></figure>"
+msgid "<figure><img src=\"{% include img/en-screenshots/settings-profile.inc %}\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Image of a profile window\"></figure>"
+msgstr "<figure><img src=\"{% include img/nl-screenshots/settings-profile.inc %}\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"afbeelding van het profiel venster\"></figure>"
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:134
@@ -351,8 +351,8 @@ msgstr "Als je een instrument en/of land instelt, worden de pictogrammen voor de
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:136
-msgid "<figure><img src=\"{{site.url}}/assets/img/en-screenshots/profile-tooltip.png\" style=\"width:30%;\" loading=\"lazy\" alt=\"Image of a tooltip showing profile information\"></figure>"
-msgstr "<figure><img src=\"{{site.url}}/assets/img/nl-screenshots/profile-tooltip.png\" style=\"width:30%;\" loading=\"lazy\" alt=\"afbeelding van een tooltop waarin de profiel informatie zichtbaar is\"></figure>"
+msgid "<figure><img src=\"{% include img/en-screenshots/profile-tooltip.inc %}\" style=\"width:30%;\" loading=\"lazy\" alt=\"Image of a tooltip showing profile information\"></figure>"
+msgstr "<figure><img src=\"{% include img/nl-screenshots/profile-tooltip.inc %}\" style=\"width:30%;\" loading=\"lazy\" alt=\"afbeelding van een tooltop waarin de profiel informatie zichtbaar is\"></figure>"
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:138
@@ -381,8 +381,8 @@ msgstr "## Audio-/netwerk-instellingen"
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:148
-msgid "<figure><img src=\"{{site.url}}/assets/img/en-screenshots/settings-network.png\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Image of audio/network settings window\"></figure>"
-msgstr "<figure><img src=\"{{site.url}}/assets/img/nl-screenshots/settings-network.png\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"afbeelding van het audio-/netwerk-instellingen venster\"></figure>"
+msgid "<figure><img src=\"{% include img/en-screenshots/settings-network.inc %}\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Image of audio/network settings window\"></figure>"
+msgstr "<figure><img src=\"{% include img/nl-screenshots/settings-network.inc %}\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"afbeelding van het audio-/netwerk-instellingen venster\"></figure>"
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:150
@@ -401,8 +401,8 @@ msgstr "### In-/uitvoerkanaaltoewijzing"
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:157
-msgid "<figure><img src=\"{{site.url}}/assets/img/en-screenshots/channel-mapping.png\" style=\"float:left; margin-right:10px; margin-bottom:20px;\" loading=\"lazy\" alt=\"Image of Input and output channel mapping\"></figure>"
-msgstr "<figure><img src=\"{{site.url}}/assets/img/nl-screenshots/channel-mapping.png\" style=\"float:left; margin-right:10px; margin-bottom:20px;\" loading=\"lazy\" alt=\"afbeelding van invoer- en uitvoerkanaaltoewijzing\"></figure>"
+msgid "<figure><img src=\"{% include img/en-screenshots/channel-mapping.inc %}\" style=\"float:left; margin-right:10px; margin-bottom:20px;\" loading=\"lazy\" alt=\"Image of Input and output channel mapping\"></figure>"
+msgstr "<figure><img src=\"{% include img/nl-screenshots/channel-mapping.inc %}\" style=\"float:left; margin-right:10px; margin-bottom:20px;\" loading=\"lazy\" alt=\"afbeelding van invoer- en uitvoerkanaaltoewijzing\"></figure>"
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:161
@@ -564,8 +564,8 @@ msgstr "## Geavanceerde instellingen"
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:234
-msgid "<figure><img src=\"{{site.url}}/assets/img/en-screenshots/settings-advanced.png\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Image of advanced settings window\"></figure>"
-msgstr "<figure><img src=\"{{site.url}}/assets/img/nl-screenshots/settings-advanced.png\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"afbeelding van het geavanceeerde instellingen venster\"></figure>"
+msgid "<figure><img src=\"{% include img/en-screenshots/settings-advanced.inc %}\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Image of advanced settings window\"></figure>"
+msgstr "<figure><img src=\"{% include img/nl-screenshots/settings-advanced.inc %}\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"afbeelding van het geavanceeerde instellingen venster\"></figure>"
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:236
diff --git a/_translator-files/po/pt/FAQ.po b/_translator-files/po/pt/FAQ.po
index cb17df3c0..b44f87748 100644
--- a/_translator-files/po/pt/FAQ.po
+++ b/_translator-files/po/pt/FAQ.po
@@ -172,7 +172,7 @@ msgstr ""
 
 #. type: Plain text
 #: ../wiki/en/FAQ.md:58
-msgid "<img src=\"{{site.url}}/assets/img/en-screenshots/diagram-overview.png\" loading=\"lazy\" alt=\"Diagram showing how Jamulus works\">"
+msgid "<img src=\"{% include img/en-screenshots/diagram-overview.inc %}\" loading=\"lazy\" alt=\"Diagram showing how Jamulus works\">"
 msgstr ""
 
 #. type: Plain text
diff --git a/_translator-files/po/pt/Getting-Started.po b/_translator-files/po/pt/Getting-Started.po
index 112bf7f47..2c9393f1c 100644
--- a/_translator-files/po/pt/Getting-Started.po
+++ b/_translator-files/po/pt/Getting-Started.po
@@ -125,10 +125,15 @@ msgstr "Quando você abre o Jamulus, você vê a seguinte janela parecida com es
 
 #. type: Plain text
 #: ../wiki/en/Getting-Started.md:42
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<figure>\n"
+#| "  <img src=\"{{site.url}}/assets/img/en-screenshots/main-screen-default.png\" loading=\"lazy\" alt=\"Screenshot\" style=\"border: 5px solid grey;\">\n"
+#| "  <figcaption>The main window before you connect to a server</figcaption>\n"
+#| "</figure>\n"
 msgid ""
 "<figure>\n"
-"  <img src=\"{{site.url}}/assets/img/en-screenshots/main-screen-default.png\" loading=\"lazy\" alt=\"Screenshot\" style=\"border: 5px solid grey;\">\n"
+"  <img src=\"{% include img/en-screenshots/main-screen-default.inc %}\" loading=\"lazy\" alt=\"Screenshot\" style=\"border: 5px solid grey;\">\n"
 "  <figcaption>The main window before you connect to a server</figcaption>\n"
 "</figure>\n"
 msgstr ""
@@ -151,10 +156,15 @@ msgstr "Primeiro, deixe os outros saberem quem você é. Clique em “Ver” (ba
 
 #. type: Plain text
 #: ../wiki/en/Getting-Started.md:52
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<figure>\n"
+#| "  <img src=\"{{site.url}}/assets/img/en-screenshots/settings-profile.png\" loading=\"lazy\" alt=\"Screenshot\" style=\"border: 5px solid grey;\">\n"
+#| "  <figcaption>Let people know who you are</figcaption>\n"
+#| "</figure>\n"
 msgid ""
 "<figure>\n"
-"  <img src=\"{{site.url}}/assets/img/en-screenshots/settings-profile.png\" loading=\"lazy\" alt=\"Screenshot\" style=\"border: 5px solid grey;\">\n"
+"  <img src=\"{% include img/en-screenshots/settings-profile.inc %}\" loading=\"lazy\" alt=\"Screenshot\" style=\"border: 5px solid grey;\">\n"
 "  <figcaption>Let people know who you are</figcaption>\n"
 "</figure>\n"
 msgstr ""
@@ -191,10 +201,15 @@ msgstr "Agora use o botão “Conectar” na janela principal do Jamulus para se
 
 #. type: Plain text
 #: ../wiki/en/Getting-Started.md:68
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<figure>\n"
+#| "  <img src=\"{{site.url}}/assets/img/en-screenshots/connection-setup-window.png\" loading=\"lazy\" alt=\"Screenshot\" style=\"border: 5px solid grey;\">\n"
+#| "  <figcaption>Connect to a server</figcaption>\n"
+#| "</figure>\n"
 msgid ""
 "<figure>\n"
-"  <img src=\"{{site.url}}/assets/img/en-screenshots/connection-setup-window.png\" loading=\"lazy\" alt=\"Screenshot\" style=\"border: 5px solid grey;\">\n"
+"  <img src=\"{% include img/en-screenshots/connection-setup-window.inc %}\" loading=\"lazy\" alt=\"Screenshot of the connection window\" style=\"border: 5px solid grey;\">\n"
 "  <figcaption>Connect to a server</figcaption>\n"
 "</figure>\n"
 msgstr ""
@@ -225,10 +240,15 @@ msgstr "Com o sistema configurado, você está pronto para começar. Quando voc
 
 #. type: Plain text
 #: ../wiki/en/Getting-Started.md:81
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<figure>\n"
+#| "  <img src=\"{{site.url}}/assets/img/en-screenshots/main-screen-medium.png\" loading=\"lazy\" alt=\"Screenshot\" style=\"border: 5px solid grey;\">\n"
+#| "  <figcaption>The main window when you are connected to a sever</figcaption>\n"
+#| "</figure>\n"
 msgid ""
 "<figure>\n"
-"  <img src=\"{{site.url}}/assets/img/en-screenshots/main-screen-medium.png\" loading=\"lazy\" alt=\"Screenshot\" style=\"border: 5px solid grey;\">\n"
+"  <img src=\"{% include img/en-screenshots/main-screen-medium.inc %}\" loading=\"lazy\" alt=\"Screenshot\" style=\"border: 5px solid grey;\">\n"
 "  <figcaption>The main window when you are connected to a sever</figcaption>\n"
 "</figure>\n"
 msgstr ""
diff --git a/_translator-files/po/pt/Running-a-Server.po b/_translator-files/po/pt/Running-a-Server.po
index 102fa1c30..ee5efb875 100644
--- a/_translator-files/po/pt/Running-a-Server.po
+++ b/_translator-files/po/pt/Running-a-Server.po
@@ -196,7 +196,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "<figure>\n"
-"\t<img src=\"{{site.url}}/assets/img/en-screenshots/diagram-public-server.png\" loading=\"lazy\" alt=\"Diagram of connections between clients within a Jamulus Public Server\">\n"
+"\t<img src=\"{% include img/en-screenshots/diagram-public-server.inc %}\" loading=\"lazy\" alt=\"Diagram of connections between clients within a Jamulus Public Server\">\n"
 "<figcaption>How Public Servers work</figcaption>\n"
 "</figure>\n"
 msgstr ""
@@ -216,7 +216,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "<figure>\n"
-"\t<img src=\"{{site.url}}/assets/img/en-screenshots/diagram-private-server.png\" loading=\"lazy\" alt=\"Diagram of connections between clients within a Jamulus Private Server\">\n"
+"\t<img src=\"{% include img/en-screenshots/diagram-private-server.inc %}\" loading=\"lazy\" alt=\"Diagram of connections between clients within a Jamulus Private Server\">\n"
 "\t<figcaption>How Private Servers work</figcaption>\n"
 "</figure>\n"
 msgstr ""
@@ -336,7 +336,7 @@ msgstr ""
 msgid ""
 "There is one upstream (musician sending to the server) and one downstream (server sending back the mix to the musician)\n"
 "<figure>\n"
-"\t<img src=\"{{site.url}}/assets/img/en-screenshots/bandwidth-diagram.png\" loading=\"lazy\" alt=\"A diagram of Jamulus network bandwidths from different audio qualities ranging from low to high\">\n"
+"\t<img src=\"{% include img/en-screenshots/bandwidth-diagram.inc %}\" loading=\"lazy\" alt=\"A diagram of Jamulus network bandwidths from different audio qualities ranging from low to high\">\n"
 "<figcaption>Calculate bandwidth use </figcaption>\n"
 "</figure>\n"
 msgstr ""
@@ -376,7 +376,7 @@ msgstr ""
 
 #. type: Plain text
 #: ../wiki/en/Running-a-Server.md:152
-msgid "<figure><img src=\"{{site.url}}/assets/img/en-screenshots/server-window-setup.png\" style=\"width:80%; border:5px solid grey;\" loading=\"lazy\" alt=\"Image of the Jamulus server setup window\"></figure>"
+msgid "<figure><img src=\"{% include img/en-screenshots/server-window-setup.inc %}\" style=\"width:80%; border:5px solid grey;\" loading=\"lazy\" alt=\"Image of the Jamulus server setup window\"></figure>"
 msgstr ""
 
 #. type: Plain text
@@ -431,7 +431,7 @@ msgstr ""
 
 #. type: Plain text
 #: ../wiki/en/Running-a-Server.md:177
-msgid "<figure><img src=\"{{site.url}}/assets/img/en-screenshots/server-window-options.png\" style=\"width:80%; border:5px solid grey;\" loading=\"lazy\" alt=\"Image of Jamulus server window options\"></figure>"
+msgid "<figure><img src=\"{% include img/en-screenshots/server-window-options.inc %}\" style=\"width:80%; border:5px solid grey;\" loading=\"lazy\" alt=\"Image of Jamulus server window options\"></figure>"
 msgstr ""
 
 #. type: Plain text
diff --git a/_translator-files/po/pt/Software-Manual.po b/_translator-files/po/pt/Software-Manual.po
index 3a208ab78..bb2eb6b96 100644
--- a/_translator-files/po/pt/Software-Manual.po
+++ b/_translator-files/po/pt/Software-Manual.po
@@ -94,7 +94,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "<figure>\n"
-"\t<img src=\"{{site.url}}/assets/img/en-screenshots/main-screen-medium.png\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Image of the Jamulus main window\">\n"
+"\t<img src=\"{% include img/en-screenshots/main-screen-medium.inc %}\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Image of the Jamulus main window\">\n"
 "\t<figcaption>Your local mix when connected to a Server</figcaption>\n"
 "</figure>\n"
 msgstr ""
@@ -118,7 +118,7 @@ msgstr ""
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:36
-msgid "<figure><img src=\"{{site.url}}/assets/img/en-screenshots/led-green.png\" style=\"float:left; margin-right:10px;\" loading=\"lazy\" alt=\"Image of a green LED symbol\"></figure>"
+msgid "<figure><img src=\"{% include img/en-screenshots/led-green.inc %}\" style=\"float:left; margin-right:10px;\" loading=\"lazy\" alt=\"Image of a green LED symbol\"></figure>"
 msgstr ""
 
 #. type: Plain text
@@ -129,7 +129,7 @@ msgstr ""
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:40
-msgid "<figure><img src=\"{{site.url}}/assets/img/en-screenshots/led-yellow.png\" style=\"float:left; margin-right:10px;\" loading=\"lazy\" alt=\"Image of a yellow LED symbol\"></figure>"
+msgid "<figure><img src=\"{% include img/en-screenshots/led-yellow.inc %}\" style=\"float:left; margin-right:10px;\" loading=\"lazy\" alt=\"Image of a yellow LED symbol\"></figure>"
 msgstr ""
 
 #. type: Plain text
@@ -140,7 +140,7 @@ msgstr ""
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:44
-msgid "<figure><img src=\"{{site.url}}/assets/img/en-screenshots/led-red.png\" style=\"float:left; margin-right:10px; clear: both;\" loading=\"lazy\" alt=\"Image of a green red symbol\"></figure>"
+msgid "<figure><img src=\"{% include img/en-screenshots/led-red.inc %}\" style=\"float:left; margin-right:10px; clear: both;\" loading=\"lazy\" alt=\"Image of a green red symbol\"></figure>"
 msgstr ""
 
 #. type: Plain text
@@ -227,7 +227,7 @@ msgstr ""
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:82
-msgid "<figure><img src=\"{{site.url}}/assets/img/en-screenshots/connection-setup-window.png\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Image of a server connection window\"></figure>"
+msgid "<figure><img src=\"{% include img/en-screenshots/connection-setup-window.inc %}\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Screenshot of the server connection window\"></figure>"
 msgstr ""
 
 #. type: Plain text
@@ -252,7 +252,7 @@ msgstr ""
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:94
-msgid "<figure><img src=\"{{site.url}}/assets/img/en-screenshots/mixer-channles.png\" style=\"float:left; margin-right:10px; margin-bottom:20px; border: 5px solid grey;\" loading=\"lazy\" alt=\"Image of a pair of server mixer controls\"></figure>"
+msgid "<figure><img src=\"{% include img/en-screenshots/mixer-channels.inc %}\" style=\"float:left; margin-right:10px; margin-bottom:20px; border: 5px solid grey;\" loading=\"lazy\" alt=\"Image of a pair of server mixer controls\"></figure>"
 msgstr ""
 
 #. type: Plain text
@@ -342,7 +342,7 @@ msgstr ""
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:132
-msgid "<figure><img src=\"{{site.url}}/assets/img/en-screenshots/settings-profile.png\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Image of a profile window\"></figure>"
+msgid "<figure><img src=\"{% include img/en-screenshots/settings-profile.inc %}\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Image of a profile window\"></figure>"
 msgstr ""
 
 #. type: Plain text
@@ -352,7 +352,7 @@ msgstr ""
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:136
-msgid "<figure><img src=\"{{site.url}}/assets/img/en-screenshots/profile-tooltip.png\" style=\"width:30%;\" loading=\"lazy\" alt=\"Image of a tooltip showing profile information\"></figure>"
+msgid "<figure><img src=\"{% include img/en-screenshots/profile-tooltip.inc %}\" style=\"width:30%;\" loading=\"lazy\" alt=\"Image of a tooltip showing profile information\"></figure>"
 msgstr ""
 
 #. type: Plain text
@@ -382,7 +382,7 @@ msgstr ""
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:148
-msgid "<figure><img src=\"{{site.url}}/assets/img/en-screenshots/settings-network.png\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Image of audio/network settings window\"></figure>"
+msgid "<figure><img src=\"{% include img/en-screenshots/settings-network.inc %}\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Image of audio/network settings window\"></figure>"
 msgstr ""
 
 #. type: Plain text
@@ -402,7 +402,7 @@ msgstr ""
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:157
-msgid "<figure><img src=\"{{site.url}}/assets/img/en-screenshots/channel-mapping.png\" style=\"float:left; margin-right:10px; margin-bottom:20px;\" loading=\"lazy\" alt=\"Image of Input and output channel mapping\"></figure>"
+msgid "<figure><img src=\"{% include img/en-screenshots/channel-mapping.inc %}\" style=\"float:left; margin-right:10px; margin-bottom:20px;\" loading=\"lazy\" alt=\"Image of Input and output channel mapping\"></figure>"
 msgstr ""
 
 #. type: Plain text
@@ -565,7 +565,7 @@ msgstr ""
 
 #. type: Plain text
 #: ../wiki/en/Software-Manual.md:234
-msgid "<figure><img src=\"{{site.url}}/assets/img/en-screenshots/settings-advanced.png\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Image of advanced settings window\"></figure>"
+msgid "<figure><img src=\"{% include img/en-screenshots/settings-advanced.inc %}\" style=\"border: 5px solid grey;\" loading=\"lazy\" alt=\"Image of advanced settings window\"></figure>"
 msgstr ""
 
 #. type: Plain text
diff --git a/assets/img/de-screenshots/connection-setup-window.inc b/assets/img/de-screenshots/connection-setup-window.inc
new file mode 100644
index 000000000..a7eadf445
--- /dev/null
+++ b/assets/img/de-screenshots/connection-setup-window.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147939171-469dd605-e838-41e9-8b40-e448d1211698.png
diff --git a/assets/img/de-screenshots/connection-setup-window.png b/assets/img/de-screenshots/connection-setup-window.png
deleted file mode 100644
index 4b204b1bc..000000000
Binary files a/assets/img/de-screenshots/connection-setup-window.png and /dev/null differ
diff --git a/assets/img/de-screenshots/led-green.inc b/assets/img/de-screenshots/led-green.inc
new file mode 120000
index 000000000..5649d01c1
--- /dev/null
+++ b/assets/img/de-screenshots/led-green.inc
@@ -0,0 +1 @@
+../en-screenshots/led-green.inc
\ No newline at end of file
diff --git a/assets/img/de-screenshots/led-red.inc b/assets/img/de-screenshots/led-red.inc
new file mode 120000
index 000000000..5300e5c4b
--- /dev/null
+++ b/assets/img/de-screenshots/led-red.inc
@@ -0,0 +1 @@
+../en-screenshots/led-red.inc
\ No newline at end of file
diff --git a/assets/img/de-screenshots/led-yellow.inc b/assets/img/de-screenshots/led-yellow.inc
new file mode 120000
index 000000000..4826e9e0a
--- /dev/null
+++ b/assets/img/de-screenshots/led-yellow.inc
@@ -0,0 +1 @@
+../en-screenshots/led-yellow.inc
\ No newline at end of file
diff --git a/assets/img/de-screenshots/main-screen-default.inc b/assets/img/de-screenshots/main-screen-default.inc
new file mode 100644
index 000000000..57dfa77a4
--- /dev/null
+++ b/assets/img/de-screenshots/main-screen-default.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147939278-1793393f-219e-4493-bf31-a7c9ad55c317.png
diff --git a/assets/img/de-screenshots/main-screen-default.png b/assets/img/de-screenshots/main-screen-default.png
deleted file mode 100644
index 05e4b4747..000000000
Binary files a/assets/img/de-screenshots/main-screen-default.png and /dev/null differ
diff --git a/assets/img/de-screenshots/main-screen-medium.inc b/assets/img/de-screenshots/main-screen-medium.inc
new file mode 100644
index 000000000..0ae90d8fc
--- /dev/null
+++ b/assets/img/de-screenshots/main-screen-medium.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147939404-8b990bb8-743e-4fd4-ad62-914d795dd811.png
diff --git a/assets/img/de-screenshots/main-screen-medium.png b/assets/img/de-screenshots/main-screen-medium.png
deleted file mode 100644
index 07bda6662..000000000
Binary files a/assets/img/de-screenshots/main-screen-medium.png and /dev/null differ
diff --git a/assets/img/de-screenshots/server-active.inc b/assets/img/de-screenshots/server-active.inc
new file mode 120000
index 000000000..040c5522e
--- /dev/null
+++ b/assets/img/de-screenshots/server-active.inc
@@ -0,0 +1 @@
+../en-screenshots/server-active.inc
\ No newline at end of file
diff --git a/assets/img/de-screenshots/server-inactive.inc b/assets/img/de-screenshots/server-inactive.inc
new file mode 120000
index 000000000..a721dddfe
--- /dev/null
+++ b/assets/img/de-screenshots/server-inactive.inc
@@ -0,0 +1 @@
+../en-screenshots/server-inactive.inc
\ No newline at end of file
diff --git a/assets/img/de-screenshots/settings-profile.inc b/assets/img/de-screenshots/settings-profile.inc
new file mode 100644
index 000000000..bba5bd582
--- /dev/null
+++ b/assets/img/de-screenshots/settings-profile.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147939449-3c931ba6-8dc5-4476-a71b-6123d25d5da1.png
diff --git a/assets/img/de-screenshots/settings-profile.png b/assets/img/de-screenshots/settings-profile.png
deleted file mode 100644
index 55f3c10c9..000000000
Binary files a/assets/img/de-screenshots/settings-profile.png and /dev/null differ
diff --git a/assets/img/de-screenshots/verification-mac.inc b/assets/img/de-screenshots/verification-mac.inc
new file mode 100644
index 000000000..4b225fc19
--- /dev/null
+++ b/assets/img/de-screenshots/verification-mac.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147939529-708dc3d6-4df1-41f4-becd-4fae12416b4c.png
diff --git a/assets/img/de-screenshots/verification-mac.png b/assets/img/de-screenshots/verification-mac.png
deleted file mode 100644
index ef79b83a5..000000000
Binary files a/assets/img/de-screenshots/verification-mac.png and /dev/null differ
diff --git a/assets/img/en-screenshots/bandwidth-diagram.inc b/assets/img/en-screenshots/bandwidth-diagram.inc
new file mode 100644
index 000000000..fb41bc1dc
--- /dev/null
+++ b/assets/img/en-screenshots/bandwidth-diagram.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/139528948-4b8e72d1-38ec-4900-93dc-5166c42b6b80.png
diff --git a/assets/img/en-screenshots/bandwidth-diagram.png b/assets/img/en-screenshots/bandwidth-diagram.png
deleted file mode 100644
index 45ea7be3e..000000000
Binary files a/assets/img/en-screenshots/bandwidth-diagram.png and /dev/null differ
diff --git a/assets/img/en-screenshots/channel-mapping.inc b/assets/img/en-screenshots/channel-mapping.inc
new file mode 100644
index 000000000..e866dbc40
--- /dev/null
+++ b/assets/img/en-screenshots/channel-mapping.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147834648-689c3d9c-eda8-4b2f-b7d2-a6a28764cc24.png
diff --git a/assets/img/en-screenshots/channel-mapping.png b/assets/img/en-screenshots/channel-mapping.png
deleted file mode 100644
index ad07286bb..000000000
Binary files a/assets/img/en-screenshots/channel-mapping.png and /dev/null differ
diff --git a/assets/img/en-screenshots/connection-setup-window.inc b/assets/img/en-screenshots/connection-setup-window.inc
new file mode 100644
index 000000000..ade42499e
--- /dev/null
+++ b/assets/img/en-screenshots/connection-setup-window.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147834663-43b9d6e3-c107-4de8-abeb-6b9c1d3426f7.png
diff --git a/assets/img/en-screenshots/connection-setup-window.png b/assets/img/en-screenshots/connection-setup-window.png
deleted file mode 100644
index 5441df139..000000000
Binary files a/assets/img/en-screenshots/connection-setup-window.png and /dev/null differ
diff --git a/assets/img/en-screenshots/diagram-overview.inc b/assets/img/en-screenshots/diagram-overview.inc
new file mode 100644
index 000000000..efe74d4ba
--- /dev/null
+++ b/assets/img/en-screenshots/diagram-overview.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147834690-69dd3caf-cb94-4a5a-94c0-afaf7dda168b.png
diff --git a/assets/img/en-screenshots/diagram-overview.png b/assets/img/en-screenshots/diagram-overview.png
deleted file mode 100644
index bc7cb1f7b..000000000
Binary files a/assets/img/en-screenshots/diagram-overview.png and /dev/null differ
diff --git a/assets/img/en-screenshots/diagram-private-server.inc b/assets/img/en-screenshots/diagram-private-server.inc
new file mode 100644
index 000000000..5957b00bb
--- /dev/null
+++ b/assets/img/en-screenshots/diagram-private-server.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147834838-c0c12d93-9bee-435d-8b4e-dcb006f86d20.png
diff --git a/assets/img/en-screenshots/diagram-private-server.png b/assets/img/en-screenshots/diagram-private-server.png
deleted file mode 100644
index 374869642..000000000
Binary files a/assets/img/en-screenshots/diagram-private-server.png and /dev/null differ
diff --git a/assets/img/en-screenshots/diagram-public-server.inc b/assets/img/en-screenshots/diagram-public-server.inc
new file mode 100644
index 000000000..111d28c7f
--- /dev/null
+++ b/assets/img/en-screenshots/diagram-public-server.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147834923-803ba3f9-c3a3-4c6a-90a4-fdbe5e950244.png
diff --git a/assets/img/en-screenshots/diagram-public-server.png b/assets/img/en-screenshots/diagram-public-server.png
deleted file mode 100644
index 27d08cb4f..000000000
Binary files a/assets/img/en-screenshots/diagram-public-server.png and /dev/null differ
diff --git a/assets/img/en-screenshots/diagram-reg-server.inc b/assets/img/en-screenshots/diagram-reg-server.inc
new file mode 100644
index 000000000..111d28c7f
--- /dev/null
+++ b/assets/img/en-screenshots/diagram-reg-server.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147834923-803ba3f9-c3a3-4c6a-90a4-fdbe5e950244.png
diff --git a/assets/img/en-screenshots/diagram-unreg-server.inc b/assets/img/en-screenshots/diagram-unreg-server.inc
new file mode 100644
index 000000000..5957b00bb
--- /dev/null
+++ b/assets/img/en-screenshots/diagram-unreg-server.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147834838-c0c12d93-9bee-435d-8b4e-dcb006f86d20.png
diff --git a/assets/img/en-screenshots/led-green.inc b/assets/img/en-screenshots/led-green.inc
new file mode 100644
index 000000000..82cb4c3ab
--- /dev/null
+++ b/assets/img/en-screenshots/led-green.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147835533-29060d31-b728-4c6b-83b7-cf374324e776.png
diff --git a/assets/img/en-screenshots/led-green.png b/assets/img/en-screenshots/led-green.png
deleted file mode 100644
index a7e0c09fa..000000000
Binary files a/assets/img/en-screenshots/led-green.png and /dev/null differ
diff --git a/assets/img/en-screenshots/led-red.inc b/assets/img/en-screenshots/led-red.inc
new file mode 100644
index 000000000..11a55e8ef
--- /dev/null
+++ b/assets/img/en-screenshots/led-red.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147835547-0586976c-f6bc-43f2-a27f-256b87bd27f8.png
diff --git a/assets/img/en-screenshots/led-red.png b/assets/img/en-screenshots/led-red.png
deleted file mode 100644
index b7d895046..000000000
Binary files a/assets/img/en-screenshots/led-red.png and /dev/null differ
diff --git a/assets/img/en-screenshots/led-yellow.inc b/assets/img/en-screenshots/led-yellow.inc
new file mode 100644
index 000000000..3f10f6ce9
--- /dev/null
+++ b/assets/img/en-screenshots/led-yellow.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147835559-591734f3-c4b1-46be-9896-ac0ad9796a10.png
diff --git a/assets/img/en-screenshots/led-yellow.png b/assets/img/en-screenshots/led-yellow.png
deleted file mode 100644
index 88cf6c3b1..000000000
Binary files a/assets/img/en-screenshots/led-yellow.png and /dev/null differ
diff --git a/assets/img/en-screenshots/main-screen-default.inc b/assets/img/en-screenshots/main-screen-default.inc
new file mode 100644
index 000000000..2468d009a
--- /dev/null
+++ b/assets/img/en-screenshots/main-screen-default.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147835619-7857c013-cc03-4ccc-b902-a1de0a2663d1.png
diff --git a/assets/img/en-screenshots/main-screen-default.png b/assets/img/en-screenshots/main-screen-default.png
deleted file mode 100644
index 34095434e..000000000
Binary files a/assets/img/en-screenshots/main-screen-default.png and /dev/null differ
diff --git a/assets/img/en-screenshots/main-screen-large.png b/assets/img/en-screenshots/main-screen-large.png
deleted file mode 100644
index a3b3d6619..000000000
Binary files a/assets/img/en-screenshots/main-screen-large.png and /dev/null differ
diff --git a/assets/img/en-screenshots/main-screen-medium.inc b/assets/img/en-screenshots/main-screen-medium.inc
new file mode 100644
index 000000000..c82ea1541
--- /dev/null
+++ b/assets/img/en-screenshots/main-screen-medium.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147835728-5dfe92b3-de74-48dc-946b-7061d89f5e22.png
diff --git a/assets/img/en-screenshots/main-screen-medium.png b/assets/img/en-screenshots/main-screen-medium.png
deleted file mode 100644
index 054b38d14..000000000
Binary files a/assets/img/en-screenshots/main-screen-medium.png and /dev/null differ
diff --git a/assets/img/en-screenshots/mixer-channels.inc b/assets/img/en-screenshots/mixer-channels.inc
new file mode 100644
index 000000000..d1aa645af
--- /dev/null
+++ b/assets/img/en-screenshots/mixer-channels.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147836084-4a2f42f0-962c-486b-8d35-c20f6b70e5a9.png
diff --git a/assets/img/en-screenshots/mixer-channles.png b/assets/img/en-screenshots/mixer-channles.png
deleted file mode 100644
index d231650ff..000000000
Binary files a/assets/img/en-screenshots/mixer-channles.png and /dev/null differ
diff --git a/assets/img/en-screenshots/profile-tooltip.inc b/assets/img/en-screenshots/profile-tooltip.inc
new file mode 100644
index 000000000..425f77f3c
--- /dev/null
+++ b/assets/img/en-screenshots/profile-tooltip.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147836179-2eeb2935-2871-48aa-bf88-9b2622c7f5aa.png
diff --git a/assets/img/en-screenshots/profile-tooltip.png b/assets/img/en-screenshots/profile-tooltip.png
deleted file mode 100644
index debfe9048..000000000
Binary files a/assets/img/en-screenshots/profile-tooltip.png and /dev/null differ
diff --git a/assets/img/en-screenshots/server-active.inc b/assets/img/en-screenshots/server-active.inc
new file mode 100644
index 000000000..fd0ae7ae8
--- /dev/null
+++ b/assets/img/en-screenshots/server-active.inc
@@ -0,0 +1 @@
+https://raw.githubusercontent.com/jamulussoftware/jamulus/master/src/res/servertrayiconactive.png
diff --git a/assets/img/en-screenshots/server-inactive.inc b/assets/img/en-screenshots/server-inactive.inc
new file mode 100644
index 000000000..167f467d0
--- /dev/null
+++ b/assets/img/en-screenshots/server-inactive.inc
@@ -0,0 +1 @@
+https://raw.githubusercontent.com/jamulussoftware/jamulus/master/src/res/servertrayiconinactive.png
diff --git a/assets/img/en-screenshots/server-window-options.inc b/assets/img/en-screenshots/server-window-options.inc
new file mode 100644
index 000000000..5448f0792
--- /dev/null
+++ b/assets/img/en-screenshots/server-window-options.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147836204-f9db1f64-4f82-4bf5-af57-018111d1359d.png
diff --git a/assets/img/en-screenshots/server-window-options.png b/assets/img/en-screenshots/server-window-options.png
deleted file mode 100644
index 1b44e8bbb..000000000
Binary files a/assets/img/en-screenshots/server-window-options.png and /dev/null differ
diff --git a/assets/img/en-screenshots/server-window-setup.inc b/assets/img/en-screenshots/server-window-setup.inc
new file mode 100644
index 000000000..c792386b5
--- /dev/null
+++ b/assets/img/en-screenshots/server-window-setup.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147836247-e150ab49-7d29-49cc-a8aa-24236d0e56ab.png
diff --git a/assets/img/en-screenshots/server-window-setup.png b/assets/img/en-screenshots/server-window-setup.png
deleted file mode 100644
index 389cabf59..000000000
Binary files a/assets/img/en-screenshots/server-window-setup.png and /dev/null differ
diff --git a/assets/img/en-screenshots/settings-advanced.inc b/assets/img/en-screenshots/settings-advanced.inc
new file mode 100644
index 000000000..921e6cf7e
--- /dev/null
+++ b/assets/img/en-screenshots/settings-advanced.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147836278-22b3fc12-52f6-4690-b9fd-9288a6fbffa2.png
diff --git a/assets/img/en-screenshots/settings-advanced.png b/assets/img/en-screenshots/settings-advanced.png
deleted file mode 100644
index 6c049bffe..000000000
Binary files a/assets/img/en-screenshots/settings-advanced.png and /dev/null differ
diff --git a/assets/img/en-screenshots/settings-network.inc b/assets/img/en-screenshots/settings-network.inc
new file mode 100644
index 000000000..f0d9bf2b6
--- /dev/null
+++ b/assets/img/en-screenshots/settings-network.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147836358-62165b26-b755-4d26-bd90-448ae69ea46c.png
diff --git a/assets/img/en-screenshots/settings-network.png b/assets/img/en-screenshots/settings-network.png
deleted file mode 100644
index aaeaa17eb..000000000
Binary files a/assets/img/en-screenshots/settings-network.png and /dev/null differ
diff --git a/assets/img/en-screenshots/settings-profile.inc b/assets/img/en-screenshots/settings-profile.inc
new file mode 100644
index 000000000..e6e99159c
--- /dev/null
+++ b/assets/img/en-screenshots/settings-profile.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147836382-e978fa15-93e1-46a9-834d-5038bd614c89.png
diff --git a/assets/img/en-screenshots/settings-profile.png b/assets/img/en-screenshots/settings-profile.png
deleted file mode 100644
index c66572c5b..000000000
Binary files a/assets/img/en-screenshots/settings-profile.png and /dev/null differ
diff --git a/assets/img/es-screenshots/bandwidth-diagram.inc b/assets/img/es-screenshots/bandwidth-diagram.inc
new file mode 100644
index 000000000..4180b1621
--- /dev/null
+++ b/assets/img/es-screenshots/bandwidth-diagram.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147939848-48416875-dd04-4a05-b46e-9efec214a954.png
diff --git a/assets/img/es-screenshots/bandwidth-diagram.png b/assets/img/es-screenshots/bandwidth-diagram.png
deleted file mode 100644
index 9157ad994..000000000
Binary files a/assets/img/es-screenshots/bandwidth-diagram.png and /dev/null differ
diff --git a/assets/img/es-screenshots/channel-mapping.inc b/assets/img/es-screenshots/channel-mapping.inc
new file mode 100644
index 000000000..6c4ed7c8e
--- /dev/null
+++ b/assets/img/es-screenshots/channel-mapping.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147939935-00cb80d3-6829-4650-9ae1-bae7404ef95c.png
diff --git a/assets/img/es-screenshots/channel-mapping.png b/assets/img/es-screenshots/channel-mapping.png
deleted file mode 100644
index 7803d308f..000000000
Binary files a/assets/img/es-screenshots/channel-mapping.png and /dev/null differ
diff --git a/assets/img/es-screenshots/connection-setup-window.inc b/assets/img/es-screenshots/connection-setup-window.inc
new file mode 100644
index 000000000..b286eecd3
--- /dev/null
+++ b/assets/img/es-screenshots/connection-setup-window.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147940878-22b36fd5-3812-417f-ba2f-86df1621a157.png
diff --git a/assets/img/es-screenshots/connection-setup-window.png b/assets/img/es-screenshots/connection-setup-window.png
deleted file mode 100644
index 6d87f7c75..000000000
Binary files a/assets/img/es-screenshots/connection-setup-window.png and /dev/null differ
diff --git a/assets/img/es-screenshots/diagram-overview.inc b/assets/img/es-screenshots/diagram-overview.inc
new file mode 100644
index 000000000..6a38151da
--- /dev/null
+++ b/assets/img/es-screenshots/diagram-overview.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147940914-dd86e986-4989-466d-bc83-4bd173c786a2.png
diff --git a/assets/img/es-screenshots/diagram-overview.png b/assets/img/es-screenshots/diagram-overview.png
deleted file mode 100644
index 9ee226d3f..000000000
Binary files a/assets/img/es-screenshots/diagram-overview.png and /dev/null differ
diff --git a/assets/img/es-screenshots/diagram-private-server.inc b/assets/img/es-screenshots/diagram-private-server.inc
new file mode 100644
index 000000000..02998e9ae
--- /dev/null
+++ b/assets/img/es-screenshots/diagram-private-server.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147940953-df99e166-c752-44c4-9e66-d991e0c31f9f.png
diff --git a/assets/img/es-screenshots/diagram-private-server.png b/assets/img/es-screenshots/diagram-private-server.png
deleted file mode 100644
index bf38fb3e0..000000000
Binary files a/assets/img/es-screenshots/diagram-private-server.png and /dev/null differ
diff --git a/assets/img/es-screenshots/diagram-public-server.inc b/assets/img/es-screenshots/diagram-public-server.inc
new file mode 100644
index 000000000..794f94efc
--- /dev/null
+++ b/assets/img/es-screenshots/diagram-public-server.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147940999-f3f8253d-d11a-4d9d-8a6f-d782501e0700.png
diff --git a/assets/img/es-screenshots/diagram-public-server.png b/assets/img/es-screenshots/diagram-public-server.png
deleted file mode 100644
index 3e7d915b0..000000000
Binary files a/assets/img/es-screenshots/diagram-public-server.png and /dev/null differ
diff --git a/assets/img/es-screenshots/led-green.inc b/assets/img/es-screenshots/led-green.inc
new file mode 120000
index 000000000..5649d01c1
--- /dev/null
+++ b/assets/img/es-screenshots/led-green.inc
@@ -0,0 +1 @@
+../en-screenshots/led-green.inc
\ No newline at end of file
diff --git a/assets/img/es-screenshots/led-green.png b/assets/img/es-screenshots/led-green.png
deleted file mode 100644
index a7e0c09fa..000000000
Binary files a/assets/img/es-screenshots/led-green.png and /dev/null differ
diff --git a/assets/img/es-screenshots/led-red.inc b/assets/img/es-screenshots/led-red.inc
new file mode 120000
index 000000000..5300e5c4b
--- /dev/null
+++ b/assets/img/es-screenshots/led-red.inc
@@ -0,0 +1 @@
+../en-screenshots/led-red.inc
\ No newline at end of file
diff --git a/assets/img/es-screenshots/led-red.png b/assets/img/es-screenshots/led-red.png
deleted file mode 100644
index b7d895046..000000000
Binary files a/assets/img/es-screenshots/led-red.png and /dev/null differ
diff --git a/assets/img/es-screenshots/led-yellow.inc b/assets/img/es-screenshots/led-yellow.inc
new file mode 120000
index 000000000..4826e9e0a
--- /dev/null
+++ b/assets/img/es-screenshots/led-yellow.inc
@@ -0,0 +1 @@
+../en-screenshots/led-yellow.inc
\ No newline at end of file
diff --git a/assets/img/es-screenshots/led-yellow.png b/assets/img/es-screenshots/led-yellow.png
deleted file mode 100644
index 88cf6c3b1..000000000
Binary files a/assets/img/es-screenshots/led-yellow.png and /dev/null differ
diff --git a/assets/img/es-screenshots/linksys-port-forward.png b/assets/img/es-screenshots/linksys-port-forward.png
deleted file mode 100644
index 948543a12..000000000
Binary files a/assets/img/es-screenshots/linksys-port-forward.png and /dev/null differ
diff --git a/assets/img/es-screenshots/main-screen-default.inc b/assets/img/es-screenshots/main-screen-default.inc
new file mode 100644
index 000000000..ada496130
--- /dev/null
+++ b/assets/img/es-screenshots/main-screen-default.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147941052-d9c8867c-8c1f-4c2e-83eb-e08006cd005d.png
diff --git a/assets/img/es-screenshots/main-screen-default.png b/assets/img/es-screenshots/main-screen-default.png
deleted file mode 100644
index 0dc0a380c..000000000
Binary files a/assets/img/es-screenshots/main-screen-default.png and /dev/null differ
diff --git a/assets/img/es-screenshots/main-screen-large.png b/assets/img/es-screenshots/main-screen-large.png
deleted file mode 100644
index 36242f756..000000000
Binary files a/assets/img/es-screenshots/main-screen-large.png and /dev/null differ
diff --git a/assets/img/es-screenshots/main-screen-medium.inc b/assets/img/es-screenshots/main-screen-medium.inc
new file mode 100644
index 000000000..d84da82f0
--- /dev/null
+++ b/assets/img/es-screenshots/main-screen-medium.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147941111-ae9afd73-e054-4b88-b6ea-d92b43f11c5d.png
diff --git a/assets/img/es-screenshots/main-screen-medium.png b/assets/img/es-screenshots/main-screen-medium.png
deleted file mode 100644
index e7fd1c57e..000000000
Binary files a/assets/img/es-screenshots/main-screen-medium.png and /dev/null differ
diff --git a/assets/img/es-screenshots/mixer-channels.inc b/assets/img/es-screenshots/mixer-channels.inc
new file mode 100644
index 000000000..173ef7f50
--- /dev/null
+++ b/assets/img/es-screenshots/mixer-channels.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147941150-02e7265c-25d8-45a0-b78a-2c527f862cd4.png
diff --git a/assets/img/es-screenshots/mixer-channles.png b/assets/img/es-screenshots/mixer-channles.png
deleted file mode 100644
index 0db1f4cf4..000000000
Binary files a/assets/img/es-screenshots/mixer-channles.png and /dev/null differ
diff --git a/assets/img/es-screenshots/profile-tooltip.inc b/assets/img/es-screenshots/profile-tooltip.inc
new file mode 100644
index 000000000..aced5384a
--- /dev/null
+++ b/assets/img/es-screenshots/profile-tooltip.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147941188-ec22ac18-432a-4139-951f-b523606e77f5.png
diff --git a/assets/img/es-screenshots/profile-tooltip.png b/assets/img/es-screenshots/profile-tooltip.png
deleted file mode 100644
index 07bd0aaa5..000000000
Binary files a/assets/img/es-screenshots/profile-tooltip.png and /dev/null differ
diff --git a/assets/img/es-screenshots/server-active.inc b/assets/img/es-screenshots/server-active.inc
new file mode 120000
index 000000000..040c5522e
--- /dev/null
+++ b/assets/img/es-screenshots/server-active.inc
@@ -0,0 +1 @@
+../en-screenshots/server-active.inc
\ No newline at end of file
diff --git a/assets/img/es-screenshots/server-inactive.inc b/assets/img/es-screenshots/server-inactive.inc
new file mode 120000
index 000000000..a721dddfe
--- /dev/null
+++ b/assets/img/es-screenshots/server-inactive.inc
@@ -0,0 +1 @@
+../en-screenshots/server-inactive.inc
\ No newline at end of file
diff --git a/assets/img/es-screenshots/server-window-options.inc b/assets/img/es-screenshots/server-window-options.inc
new file mode 100644
index 000000000..2cc9494e1
--- /dev/null
+++ b/assets/img/es-screenshots/server-window-options.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147941217-66b38e21-5ed7-4fb8-82a2-648299ba8a9c.png
diff --git a/assets/img/es-screenshots/server-window-options.png b/assets/img/es-screenshots/server-window-options.png
deleted file mode 100644
index f04dce939..000000000
Binary files a/assets/img/es-screenshots/server-window-options.png and /dev/null differ
diff --git a/assets/img/es-screenshots/server-window-setup.inc b/assets/img/es-screenshots/server-window-setup.inc
new file mode 100644
index 000000000..b4625bc1e
--- /dev/null
+++ b/assets/img/es-screenshots/server-window-setup.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147941253-ec1d7935-9ff1-4467-87e8-0ca28e39df1c.png
diff --git a/assets/img/es-screenshots/server-window-setup.png b/assets/img/es-screenshots/server-window-setup.png
deleted file mode 100644
index c111d5a83..000000000
Binary files a/assets/img/es-screenshots/server-window-setup.png and /dev/null differ
diff --git a/assets/img/es-screenshots/settings-advanced.inc b/assets/img/es-screenshots/settings-advanced.inc
new file mode 100644
index 000000000..efc338191
--- /dev/null
+++ b/assets/img/es-screenshots/settings-advanced.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147941290-15d435a0-ded6-4a7f-93c1-9a8a5a890ac9.png
diff --git a/assets/img/es-screenshots/settings-advanced.png b/assets/img/es-screenshots/settings-advanced.png
deleted file mode 100644
index a11dac567..000000000
Binary files a/assets/img/es-screenshots/settings-advanced.png and /dev/null differ
diff --git a/assets/img/es-screenshots/settings-network.inc b/assets/img/es-screenshots/settings-network.inc
new file mode 100644
index 000000000..6634e5f61
--- /dev/null
+++ b/assets/img/es-screenshots/settings-network.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147941314-ba84623a-066a-4a5a-8cbb-b712dd7ed6b8.png
diff --git a/assets/img/es-screenshots/settings-network.png b/assets/img/es-screenshots/settings-network.png
deleted file mode 100644
index 36c362e8e..000000000
Binary files a/assets/img/es-screenshots/settings-network.png and /dev/null differ
diff --git a/assets/img/es-screenshots/settings-profile.inc b/assets/img/es-screenshots/settings-profile.inc
new file mode 100644
index 000000000..7b2afb808
--- /dev/null
+++ b/assets/img/es-screenshots/settings-profile.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147941335-683d05d7-7c2b-42de-adbf-5d5166b7677d.png
diff --git a/assets/img/es-screenshots/settings-profile.png b/assets/img/es-screenshots/settings-profile.png
deleted file mode 100644
index db129c70d..000000000
Binary files a/assets/img/es-screenshots/settings-profile.png and /dev/null differ
diff --git a/assets/img/es-screenshots/verification-mac.png b/assets/img/es-screenshots/verification-mac.png
deleted file mode 100644
index ed693f7ce..000000000
Binary files a/assets/img/es-screenshots/verification-mac.png and /dev/null differ
diff --git a/assets/img/fr-screenshots/bandwidth-diagram.inc b/assets/img/fr-screenshots/bandwidth-diagram.inc
new file mode 100644
index 000000000..644956518
--- /dev/null
+++ b/assets/img/fr-screenshots/bandwidth-diagram.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147942293-eb27417a-60cc-446b-b83a-a453251827b6.png
diff --git a/assets/img/fr-screenshots/bandwidth-diagram.png b/assets/img/fr-screenshots/bandwidth-diagram.png
deleted file mode 100644
index ba709f1d5..000000000
Binary files a/assets/img/fr-screenshots/bandwidth-diagram.png and /dev/null differ
diff --git a/assets/img/fr-screenshots/channel-mapping.inc b/assets/img/fr-screenshots/channel-mapping.inc
new file mode 100644
index 000000000..95c25b6b1
--- /dev/null
+++ b/assets/img/fr-screenshots/channel-mapping.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147942352-9f41f4c9-a863-4fed-8759-fdfdcce397aa.png
diff --git a/assets/img/fr-screenshots/channel-mapping.png b/assets/img/fr-screenshots/channel-mapping.png
deleted file mode 100644
index f0dfd0dcc..000000000
Binary files a/assets/img/fr-screenshots/channel-mapping.png and /dev/null differ
diff --git a/assets/img/fr-screenshots/connection-setup-window.inc b/assets/img/fr-screenshots/connection-setup-window.inc
new file mode 100644
index 000000000..52dcf9516
--- /dev/null
+++ b/assets/img/fr-screenshots/connection-setup-window.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147942402-5a9caf3a-1eee-4682-8841-5ef2b24050ad.png
diff --git a/assets/img/fr-screenshots/connection-setup-window.png b/assets/img/fr-screenshots/connection-setup-window.png
deleted file mode 100644
index 12703035a..000000000
Binary files a/assets/img/fr-screenshots/connection-setup-window.png and /dev/null differ
diff --git a/assets/img/fr-screenshots/diagram-overview.inc b/assets/img/fr-screenshots/diagram-overview.inc
new file mode 100644
index 000000000..cd20137da
--- /dev/null
+++ b/assets/img/fr-screenshots/diagram-overview.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147942431-a9bdf575-b220-4554-8b77-2c673db2ec03.png
diff --git a/assets/img/fr-screenshots/diagram-overview.png b/assets/img/fr-screenshots/diagram-overview.png
deleted file mode 100644
index 2f9a1c772..000000000
Binary files a/assets/img/fr-screenshots/diagram-overview.png and /dev/null differ
diff --git a/assets/img/fr-screenshots/diagram-private-server.inc b/assets/img/fr-screenshots/diagram-private-server.inc
new file mode 100644
index 000000000..1584ec06b
--- /dev/null
+++ b/assets/img/fr-screenshots/diagram-private-server.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147942467-a857c2f8-4420-4f2b-9446-c953cf4b8556.png
diff --git a/assets/img/fr-screenshots/diagram-private-server.png b/assets/img/fr-screenshots/diagram-private-server.png
deleted file mode 100644
index 08d01ed74..000000000
Binary files a/assets/img/fr-screenshots/diagram-private-server.png and /dev/null differ
diff --git a/assets/img/fr-screenshots/diagram-public-server.inc b/assets/img/fr-screenshots/diagram-public-server.inc
new file mode 100644
index 000000000..d5dc13c04
--- /dev/null
+++ b/assets/img/fr-screenshots/diagram-public-server.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147942507-cce381e0-feb6-4bb2-9ccb-4b6ec42ab3c5.png
diff --git a/assets/img/fr-screenshots/diagram-public-server.png b/assets/img/fr-screenshots/diagram-public-server.png
deleted file mode 100644
index 74c1abc05..000000000
Binary files a/assets/img/fr-screenshots/diagram-public-server.png and /dev/null differ
diff --git a/assets/img/fr-screenshots/led-green.inc b/assets/img/fr-screenshots/led-green.inc
new file mode 120000
index 000000000..5649d01c1
--- /dev/null
+++ b/assets/img/fr-screenshots/led-green.inc
@@ -0,0 +1 @@
+../en-screenshots/led-green.inc
\ No newline at end of file
diff --git a/assets/img/fr-screenshots/led-green.png b/assets/img/fr-screenshots/led-green.png
deleted file mode 100644
index a7e0c09fa..000000000
Binary files a/assets/img/fr-screenshots/led-green.png and /dev/null differ
diff --git a/assets/img/fr-screenshots/led-red.inc b/assets/img/fr-screenshots/led-red.inc
new file mode 120000
index 000000000..5300e5c4b
--- /dev/null
+++ b/assets/img/fr-screenshots/led-red.inc
@@ -0,0 +1 @@
+../en-screenshots/led-red.inc
\ No newline at end of file
diff --git a/assets/img/fr-screenshots/led-red.png b/assets/img/fr-screenshots/led-red.png
deleted file mode 100644
index b7d895046..000000000
Binary files a/assets/img/fr-screenshots/led-red.png and /dev/null differ
diff --git a/assets/img/fr-screenshots/led-yellow.inc b/assets/img/fr-screenshots/led-yellow.inc
new file mode 120000
index 000000000..4826e9e0a
--- /dev/null
+++ b/assets/img/fr-screenshots/led-yellow.inc
@@ -0,0 +1 @@
+../en-screenshots/led-yellow.inc
\ No newline at end of file
diff --git a/assets/img/fr-screenshots/led-yellow.png b/assets/img/fr-screenshots/led-yellow.png
deleted file mode 100644
index 88cf6c3b1..000000000
Binary files a/assets/img/fr-screenshots/led-yellow.png and /dev/null differ
diff --git a/assets/img/fr-screenshots/main-screen-default.inc b/assets/img/fr-screenshots/main-screen-default.inc
new file mode 100644
index 000000000..2eac43267
--- /dev/null
+++ b/assets/img/fr-screenshots/main-screen-default.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147942539-de62032b-4b45-46a8-a03e-2fc4cf56eb73.png
diff --git a/assets/img/fr-screenshots/main-screen-default.png b/assets/img/fr-screenshots/main-screen-default.png
deleted file mode 100644
index b721e8ff1..000000000
Binary files a/assets/img/fr-screenshots/main-screen-default.png and /dev/null differ
diff --git a/assets/img/fr-screenshots/main-screen-large.png b/assets/img/fr-screenshots/main-screen-large.png
deleted file mode 100644
index 36d26a24b..000000000
Binary files a/assets/img/fr-screenshots/main-screen-large.png and /dev/null differ
diff --git a/assets/img/fr-screenshots/main-screen-medium.inc b/assets/img/fr-screenshots/main-screen-medium.inc
new file mode 100644
index 000000000..1554c69e7
--- /dev/null
+++ b/assets/img/fr-screenshots/main-screen-medium.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147942563-9f0e3ed9-3c30-43d8-89b3-0d25594e2015.png
diff --git a/assets/img/fr-screenshots/main-screen-medium.png b/assets/img/fr-screenshots/main-screen-medium.png
deleted file mode 100644
index 6c62a411e..000000000
Binary files a/assets/img/fr-screenshots/main-screen-medium.png and /dev/null differ
diff --git a/assets/img/fr-screenshots/mixer-channels.inc b/assets/img/fr-screenshots/mixer-channels.inc
new file mode 100644
index 000000000..40e861925
--- /dev/null
+++ b/assets/img/fr-screenshots/mixer-channels.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147942601-21d32398-fbd8-48f9-a133-ef96f1d8e110.png
diff --git a/assets/img/fr-screenshots/mixer-channles.png b/assets/img/fr-screenshots/mixer-channles.png
deleted file mode 100644
index cd69d59f2..000000000
Binary files a/assets/img/fr-screenshots/mixer-channles.png and /dev/null differ
diff --git a/assets/img/fr-screenshots/profile-tooltip.inc b/assets/img/fr-screenshots/profile-tooltip.inc
new file mode 100644
index 000000000..d2753f01d
--- /dev/null
+++ b/assets/img/fr-screenshots/profile-tooltip.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147942630-44c1fe33-5ae3-4664-8168-ec7bbdf2029a.png
diff --git a/assets/img/fr-screenshots/profile-tooltip.png b/assets/img/fr-screenshots/profile-tooltip.png
deleted file mode 100644
index 502dc5a1c..000000000
Binary files a/assets/img/fr-screenshots/profile-tooltip.png and /dev/null differ
diff --git a/assets/img/fr-screenshots/server-active.inc b/assets/img/fr-screenshots/server-active.inc
new file mode 120000
index 000000000..040c5522e
--- /dev/null
+++ b/assets/img/fr-screenshots/server-active.inc
@@ -0,0 +1 @@
+../en-screenshots/server-active.inc
\ No newline at end of file
diff --git a/assets/img/fr-screenshots/server-inactive.inc b/assets/img/fr-screenshots/server-inactive.inc
new file mode 120000
index 000000000..a721dddfe
--- /dev/null
+++ b/assets/img/fr-screenshots/server-inactive.inc
@@ -0,0 +1 @@
+../en-screenshots/server-inactive.inc
\ No newline at end of file
diff --git a/assets/img/fr-screenshots/server-window-options.inc b/assets/img/fr-screenshots/server-window-options.inc
new file mode 100644
index 000000000..3b3c1a5af
--- /dev/null
+++ b/assets/img/fr-screenshots/server-window-options.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147942654-c92a755a-7386-4f59-9bf1-de70fb032188.png
diff --git a/assets/img/fr-screenshots/server-window-options.png b/assets/img/fr-screenshots/server-window-options.png
deleted file mode 100644
index 672749e9e..000000000
Binary files a/assets/img/fr-screenshots/server-window-options.png and /dev/null differ
diff --git a/assets/img/fr-screenshots/server-window-setup.inc b/assets/img/fr-screenshots/server-window-setup.inc
new file mode 100644
index 000000000..40bc7ee46
--- /dev/null
+++ b/assets/img/fr-screenshots/server-window-setup.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147942682-b7d48d11-8d31-4d49-a856-7e7ed00fd52e.png
diff --git a/assets/img/fr-screenshots/server-window-setup.png b/assets/img/fr-screenshots/server-window-setup.png
deleted file mode 100644
index a46f8178e..000000000
Binary files a/assets/img/fr-screenshots/server-window-setup.png and /dev/null differ
diff --git a/assets/img/fr-screenshots/settings-advanced.inc b/assets/img/fr-screenshots/settings-advanced.inc
new file mode 100644
index 000000000..a69b09a3f
--- /dev/null
+++ b/assets/img/fr-screenshots/settings-advanced.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147942702-3908e50b-d0b5-4774-add9-6ed9d1c301ce.png
diff --git a/assets/img/fr-screenshots/settings-advanced.png b/assets/img/fr-screenshots/settings-advanced.png
deleted file mode 100644
index a646cd7e8..000000000
Binary files a/assets/img/fr-screenshots/settings-advanced.png and /dev/null differ
diff --git a/assets/img/fr-screenshots/settings-network.inc b/assets/img/fr-screenshots/settings-network.inc
new file mode 100644
index 000000000..6c532a527
--- /dev/null
+++ b/assets/img/fr-screenshots/settings-network.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147942737-e3e56be6-c9b6-4826-8ffa-37092ffa0eab.png
diff --git a/assets/img/fr-screenshots/settings-network.png b/assets/img/fr-screenshots/settings-network.png
deleted file mode 100644
index 0d8b37376..000000000
Binary files a/assets/img/fr-screenshots/settings-network.png and /dev/null differ
diff --git a/assets/img/fr-screenshots/settings-profile.inc b/assets/img/fr-screenshots/settings-profile.inc
new file mode 100644
index 000000000..8c84d67d6
--- /dev/null
+++ b/assets/img/fr-screenshots/settings-profile.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147942769-62fd3720-65b4-4412-813b-10d3708f566a.png
diff --git a/assets/img/fr-screenshots/settings-profile.png b/assets/img/fr-screenshots/settings-profile.png
deleted file mode 100644
index 08fca7e03..000000000
Binary files a/assets/img/fr-screenshots/settings-profile.png and /dev/null differ
diff --git a/assets/img/fr-screenshots/verification-mac.png b/assets/img/fr-screenshots/verification-mac.png
deleted file mode 100644
index 182ad3193..000000000
Binary files a/assets/img/fr-screenshots/verification-mac.png and /dev/null differ
diff --git a/assets/img/nl-screenshots/bandwidth-diagram.inc b/assets/img/nl-screenshots/bandwidth-diagram.inc
new file mode 100644
index 000000000..9bafe7ef6
--- /dev/null
+++ b/assets/img/nl-screenshots/bandwidth-diagram.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147942946-6af501ca-c827-498c-8a2d-152217348356.png
diff --git a/assets/img/nl-screenshots/bandwidth-diagram.png b/assets/img/nl-screenshots/bandwidth-diagram.png
deleted file mode 100644
index 404767505..000000000
Binary files a/assets/img/nl-screenshots/bandwidth-diagram.png and /dev/null differ
diff --git a/assets/img/nl-screenshots/channel-mapping.inc b/assets/img/nl-screenshots/channel-mapping.inc
new file mode 100644
index 000000000..2082ed190
--- /dev/null
+++ b/assets/img/nl-screenshots/channel-mapping.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147942974-d501e508-cd6d-45de-9c0e-beba87b16dae.png
diff --git a/assets/img/nl-screenshots/channel-mapping.png b/assets/img/nl-screenshots/channel-mapping.png
deleted file mode 100644
index 84bb893c8..000000000
Binary files a/assets/img/nl-screenshots/channel-mapping.png and /dev/null differ
diff --git a/assets/img/nl-screenshots/connection-setup-window.inc b/assets/img/nl-screenshots/connection-setup-window.inc
new file mode 100644
index 000000000..28659dfc0
--- /dev/null
+++ b/assets/img/nl-screenshots/connection-setup-window.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147943003-9285b644-2cbc-4266-8899-6007d2f12243.png
diff --git a/assets/img/nl-screenshots/connection-setup-window.png b/assets/img/nl-screenshots/connection-setup-window.png
deleted file mode 100644
index 91f34d2bd..000000000
Binary files a/assets/img/nl-screenshots/connection-setup-window.png and /dev/null differ
diff --git a/assets/img/nl-screenshots/diagram-overview.inc b/assets/img/nl-screenshots/diagram-overview.inc
new file mode 100644
index 000000000..f92a37238
--- /dev/null
+++ b/assets/img/nl-screenshots/diagram-overview.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147943027-0c043c26-ec07-4921-bf9c-1dfea0b7fa99.png
diff --git a/assets/img/nl-screenshots/diagram-overview.png b/assets/img/nl-screenshots/diagram-overview.png
deleted file mode 100644
index 99645ec43..000000000
Binary files a/assets/img/nl-screenshots/diagram-overview.png and /dev/null differ
diff --git a/assets/img/nl-screenshots/diagram-private-server.inc b/assets/img/nl-screenshots/diagram-private-server.inc
new file mode 100644
index 000000000..df63858e1
--- /dev/null
+++ b/assets/img/nl-screenshots/diagram-private-server.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147943052-7f61fb93-448c-4767-9906-ff0b174087ab.png
diff --git a/assets/img/nl-screenshots/diagram-private-server.png b/assets/img/nl-screenshots/diagram-private-server.png
deleted file mode 100644
index bb0e31341..000000000
Binary files a/assets/img/nl-screenshots/diagram-private-server.png and /dev/null differ
diff --git a/assets/img/nl-screenshots/diagram-public-server.inc b/assets/img/nl-screenshots/diagram-public-server.inc
new file mode 100644
index 000000000..edd09a2ef
--- /dev/null
+++ b/assets/img/nl-screenshots/diagram-public-server.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147943088-b7ebc627-7de2-49e7-b55d-71350eecd190.png
diff --git a/assets/img/nl-screenshots/diagram-public-server.png b/assets/img/nl-screenshots/diagram-public-server.png
deleted file mode 100644
index 00482d2e4..000000000
Binary files a/assets/img/nl-screenshots/diagram-public-server.png and /dev/null differ
diff --git a/assets/img/nl-screenshots/led-green.inc b/assets/img/nl-screenshots/led-green.inc
new file mode 120000
index 000000000..5649d01c1
--- /dev/null
+++ b/assets/img/nl-screenshots/led-green.inc
@@ -0,0 +1 @@
+../en-screenshots/led-green.inc
\ No newline at end of file
diff --git a/assets/img/nl-screenshots/led-green.png b/assets/img/nl-screenshots/led-green.png
deleted file mode 100644
index a7e0c09fa..000000000
Binary files a/assets/img/nl-screenshots/led-green.png and /dev/null differ
diff --git a/assets/img/nl-screenshots/led-red.inc b/assets/img/nl-screenshots/led-red.inc
new file mode 120000
index 000000000..5300e5c4b
--- /dev/null
+++ b/assets/img/nl-screenshots/led-red.inc
@@ -0,0 +1 @@
+../en-screenshots/led-red.inc
\ No newline at end of file
diff --git a/assets/img/nl-screenshots/led-red.png b/assets/img/nl-screenshots/led-red.png
deleted file mode 100644
index b7d895046..000000000
Binary files a/assets/img/nl-screenshots/led-red.png and /dev/null differ
diff --git a/assets/img/nl-screenshots/led-yellow.inc b/assets/img/nl-screenshots/led-yellow.inc
new file mode 120000
index 000000000..4826e9e0a
--- /dev/null
+++ b/assets/img/nl-screenshots/led-yellow.inc
@@ -0,0 +1 @@
+../en-screenshots/led-yellow.inc
\ No newline at end of file
diff --git a/assets/img/nl-screenshots/led-yellow.png b/assets/img/nl-screenshots/led-yellow.png
deleted file mode 100644
index 88cf6c3b1..000000000
Binary files a/assets/img/nl-screenshots/led-yellow.png and /dev/null differ
diff --git a/assets/img/nl-screenshots/main-screen-default.inc b/assets/img/nl-screenshots/main-screen-default.inc
new file mode 100644
index 000000000..ca5784210
--- /dev/null
+++ b/assets/img/nl-screenshots/main-screen-default.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147943116-787f2eb8-ef20-448d-b50f-c0cb31a3eb86.png
diff --git a/assets/img/nl-screenshots/main-screen-default.png b/assets/img/nl-screenshots/main-screen-default.png
deleted file mode 100644
index 234525b02..000000000
Binary files a/assets/img/nl-screenshots/main-screen-default.png and /dev/null differ
diff --git a/assets/img/nl-screenshots/main-screen-large.png b/assets/img/nl-screenshots/main-screen-large.png
deleted file mode 100644
index a3b3d6619..000000000
Binary files a/assets/img/nl-screenshots/main-screen-large.png and /dev/null differ
diff --git a/assets/img/nl-screenshots/main-screen-medium.inc b/assets/img/nl-screenshots/main-screen-medium.inc
new file mode 100644
index 000000000..ce4723196
--- /dev/null
+++ b/assets/img/nl-screenshots/main-screen-medium.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147943145-36e84dc4-89f4-4985-b5ea-171315316bb2.png
diff --git a/assets/img/nl-screenshots/main-screen-medium.png b/assets/img/nl-screenshots/main-screen-medium.png
deleted file mode 100644
index 3001c0c0a..000000000
Binary files a/assets/img/nl-screenshots/main-screen-medium.png and /dev/null differ
diff --git a/assets/img/nl-screenshots/mixer-channels.inc b/assets/img/nl-screenshots/mixer-channels.inc
new file mode 100644
index 000000000..b8559deda
--- /dev/null
+++ b/assets/img/nl-screenshots/mixer-channels.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147943156-0ddb93b7-0122-4ffb-bd62-6c61bca34994.png
diff --git a/assets/img/nl-screenshots/mixer-channles.png b/assets/img/nl-screenshots/mixer-channles.png
deleted file mode 100644
index a11833efd..000000000
Binary files a/assets/img/nl-screenshots/mixer-channles.png and /dev/null differ
diff --git a/assets/img/nl-screenshots/profile-tooltip.inc b/assets/img/nl-screenshots/profile-tooltip.inc
new file mode 100644
index 000000000..d0fb5d3a6
--- /dev/null
+++ b/assets/img/nl-screenshots/profile-tooltip.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147943179-de14c9bd-ba29-4303-ab5c-af3985ca3a47.png
diff --git a/assets/img/nl-screenshots/profile-tooltip.png b/assets/img/nl-screenshots/profile-tooltip.png
deleted file mode 100644
index 3cc421b09..000000000
Binary files a/assets/img/nl-screenshots/profile-tooltip.png and /dev/null differ
diff --git a/assets/img/nl-screenshots/server-active.inc b/assets/img/nl-screenshots/server-active.inc
new file mode 120000
index 000000000..040c5522e
--- /dev/null
+++ b/assets/img/nl-screenshots/server-active.inc
@@ -0,0 +1 @@
+../en-screenshots/server-active.inc
\ No newline at end of file
diff --git a/assets/img/nl-screenshots/server-inactive.inc b/assets/img/nl-screenshots/server-inactive.inc
new file mode 120000
index 000000000..a721dddfe
--- /dev/null
+++ b/assets/img/nl-screenshots/server-inactive.inc
@@ -0,0 +1 @@
+../en-screenshots/server-inactive.inc
\ No newline at end of file
diff --git a/assets/img/nl-screenshots/server-window-options.inc b/assets/img/nl-screenshots/server-window-options.inc
new file mode 100644
index 000000000..6416d5f7d
--- /dev/null
+++ b/assets/img/nl-screenshots/server-window-options.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147943218-ea78be0c-fad8-471a-a53d-916a06ecdd7b.png
diff --git a/assets/img/nl-screenshots/server-window-options.png b/assets/img/nl-screenshots/server-window-options.png
deleted file mode 100644
index 8335c0581..000000000
Binary files a/assets/img/nl-screenshots/server-window-options.png and /dev/null differ
diff --git a/assets/img/nl-screenshots/server-window-setup.inc b/assets/img/nl-screenshots/server-window-setup.inc
new file mode 100644
index 000000000..736ba4ed6
--- /dev/null
+++ b/assets/img/nl-screenshots/server-window-setup.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147943251-f5a38ed4-fd6f-4a00-8a3b-48d4615992d5.png
diff --git a/assets/img/nl-screenshots/server-window-setup.png b/assets/img/nl-screenshots/server-window-setup.png
deleted file mode 100644
index 818c4fe03..000000000
Binary files a/assets/img/nl-screenshots/server-window-setup.png and /dev/null differ
diff --git a/assets/img/nl-screenshots/settings-advanced.inc b/assets/img/nl-screenshots/settings-advanced.inc
new file mode 100644
index 000000000..9bbcf1d23
--- /dev/null
+++ b/assets/img/nl-screenshots/settings-advanced.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147943278-79df57e6-dba8-48a9-b895-3015f81f6af6.png
diff --git a/assets/img/nl-screenshots/settings-advanced.png b/assets/img/nl-screenshots/settings-advanced.png
deleted file mode 100644
index 21184b867..000000000
Binary files a/assets/img/nl-screenshots/settings-advanced.png and /dev/null differ
diff --git a/assets/img/nl-screenshots/settings-network.inc b/assets/img/nl-screenshots/settings-network.inc
new file mode 100644
index 000000000..a68e34eba
--- /dev/null
+++ b/assets/img/nl-screenshots/settings-network.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147943313-c69767b6-46f0-480f-870b-b7afdce938fd.png
diff --git a/assets/img/nl-screenshots/settings-network.png b/assets/img/nl-screenshots/settings-network.png
deleted file mode 100644
index 28bb3e19d..000000000
Binary files a/assets/img/nl-screenshots/settings-network.png and /dev/null differ
diff --git a/assets/img/nl-screenshots/settings-profile.inc b/assets/img/nl-screenshots/settings-profile.inc
new file mode 100644
index 000000000..484b5439f
--- /dev/null
+++ b/assets/img/nl-screenshots/settings-profile.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147943344-7da38f72-67fb-4ce1-b599-9201789c2151.png
diff --git a/assets/img/nl-screenshots/settings-profile.png b/assets/img/nl-screenshots/settings-profile.png
deleted file mode 100644
index a5241e2df..000000000
Binary files a/assets/img/nl-screenshots/settings-profile.png and /dev/null differ
diff --git a/assets/img/pt-screenshots/bandwidth-diagram.inc b/assets/img/pt-screenshots/bandwidth-diagram.inc
new file mode 100644
index 000000000..4d6381405
--- /dev/null
+++ b/assets/img/pt-screenshots/bandwidth-diagram.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147943502-d02c1525-15c5-4cac-ac1b-e76c5fbba3ac.png
diff --git a/assets/img/pt-screenshots/bandwidth-diagram.png b/assets/img/pt-screenshots/bandwidth-diagram.png
deleted file mode 100644
index a60d64cd2..000000000
Binary files a/assets/img/pt-screenshots/bandwidth-diagram.png and /dev/null differ
diff --git a/assets/img/pt-screenshots/channel-mapping.inc b/assets/img/pt-screenshots/channel-mapping.inc
new file mode 100644
index 000000000..8e52ffa5d
--- /dev/null
+++ b/assets/img/pt-screenshots/channel-mapping.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147943528-e685288a-2e11-4221-9b7b-40709251760a.png
diff --git a/assets/img/pt-screenshots/channel-mapping.png b/assets/img/pt-screenshots/channel-mapping.png
deleted file mode 100644
index 658f510f8..000000000
Binary files a/assets/img/pt-screenshots/channel-mapping.png and /dev/null differ
diff --git a/assets/img/pt-screenshots/connection-setup-window.inc b/assets/img/pt-screenshots/connection-setup-window.inc
new file mode 100644
index 000000000..91286252f
--- /dev/null
+++ b/assets/img/pt-screenshots/connection-setup-window.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147943550-c04dfe56-b296-4d8c-a606-c83f93283bdd.png
diff --git a/assets/img/pt-screenshots/connection-setup-window.png b/assets/img/pt-screenshots/connection-setup-window.png
deleted file mode 100644
index e645c4c92..000000000
Binary files a/assets/img/pt-screenshots/connection-setup-window.png and /dev/null differ
diff --git a/assets/img/pt-screenshots/diagram-overview.inc b/assets/img/pt-screenshots/diagram-overview.inc
new file mode 100644
index 000000000..08a904904
--- /dev/null
+++ b/assets/img/pt-screenshots/diagram-overview.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147943580-4a87d8c7-1089-4a40-9e1a-b19425ed6668.png
diff --git a/assets/img/pt-screenshots/diagram-overview.png b/assets/img/pt-screenshots/diagram-overview.png
deleted file mode 100644
index 58bc500f1..000000000
Binary files a/assets/img/pt-screenshots/diagram-overview.png and /dev/null differ
diff --git a/assets/img/pt-screenshots/diagram-private-server.inc b/assets/img/pt-screenshots/diagram-private-server.inc
new file mode 100644
index 000000000..3707fd0a4
--- /dev/null
+++ b/assets/img/pt-screenshots/diagram-private-server.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147943612-194befbc-a4dc-4402-8217-44fc21f1b465.png
diff --git a/assets/img/pt-screenshots/diagram-private-server.png b/assets/img/pt-screenshots/diagram-private-server.png
deleted file mode 100644
index 0203b3394..000000000
Binary files a/assets/img/pt-screenshots/diagram-private-server.png and /dev/null differ
diff --git a/assets/img/pt-screenshots/diagram-public-server.inc b/assets/img/pt-screenshots/diagram-public-server.inc
new file mode 100644
index 000000000..614856d4c
--- /dev/null
+++ b/assets/img/pt-screenshots/diagram-public-server.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147943638-cd30520e-386f-4177-947a-76d4f2de8f5e.png
diff --git a/assets/img/pt-screenshots/diagram-public-server.png b/assets/img/pt-screenshots/diagram-public-server.png
deleted file mode 100644
index beff2bdce..000000000
Binary files a/assets/img/pt-screenshots/diagram-public-server.png and /dev/null differ
diff --git a/assets/img/pt-screenshots/led-green.inc b/assets/img/pt-screenshots/led-green.inc
new file mode 120000
index 000000000..5649d01c1
--- /dev/null
+++ b/assets/img/pt-screenshots/led-green.inc
@@ -0,0 +1 @@
+../en-screenshots/led-green.inc
\ No newline at end of file
diff --git a/assets/img/pt-screenshots/led-green.png b/assets/img/pt-screenshots/led-green.png
deleted file mode 100644
index a7e0c09fa..000000000
Binary files a/assets/img/pt-screenshots/led-green.png and /dev/null differ
diff --git a/assets/img/pt-screenshots/led-red.inc b/assets/img/pt-screenshots/led-red.inc
new file mode 120000
index 000000000..5300e5c4b
--- /dev/null
+++ b/assets/img/pt-screenshots/led-red.inc
@@ -0,0 +1 @@
+../en-screenshots/led-red.inc
\ No newline at end of file
diff --git a/assets/img/pt-screenshots/led-red.png b/assets/img/pt-screenshots/led-red.png
deleted file mode 100644
index b7d895046..000000000
Binary files a/assets/img/pt-screenshots/led-red.png and /dev/null differ
diff --git a/assets/img/pt-screenshots/led-yellow.inc b/assets/img/pt-screenshots/led-yellow.inc
new file mode 120000
index 000000000..4826e9e0a
--- /dev/null
+++ b/assets/img/pt-screenshots/led-yellow.inc
@@ -0,0 +1 @@
+../en-screenshots/led-yellow.inc
\ No newline at end of file
diff --git a/assets/img/pt-screenshots/led-yellow.png b/assets/img/pt-screenshots/led-yellow.png
deleted file mode 100644
index 88cf6c3b1..000000000
Binary files a/assets/img/pt-screenshots/led-yellow.png and /dev/null differ
diff --git a/assets/img/pt-screenshots/linksys-port-forward.png b/assets/img/pt-screenshots/linksys-port-forward.png
deleted file mode 100644
index 948543a12..000000000
Binary files a/assets/img/pt-screenshots/linksys-port-forward.png and /dev/null differ
diff --git a/assets/img/pt-screenshots/main-screen-default.inc b/assets/img/pt-screenshots/main-screen-default.inc
new file mode 100644
index 000000000..f3c73fc47
--- /dev/null
+++ b/assets/img/pt-screenshots/main-screen-default.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147943671-57c71b23-18cd-4828-baa0-84c90f675ae3.png
diff --git a/assets/img/pt-screenshots/main-screen-default.png b/assets/img/pt-screenshots/main-screen-default.png
deleted file mode 100644
index 22d3c967e..000000000
Binary files a/assets/img/pt-screenshots/main-screen-default.png and /dev/null differ
diff --git a/assets/img/pt-screenshots/main-screen-large.png b/assets/img/pt-screenshots/main-screen-large.png
deleted file mode 100644
index 4a5f5fd02..000000000
Binary files a/assets/img/pt-screenshots/main-screen-large.png and /dev/null differ
diff --git a/assets/img/pt-screenshots/main-screen-medium.inc b/assets/img/pt-screenshots/main-screen-medium.inc
new file mode 100644
index 000000000..0df6aaf76
--- /dev/null
+++ b/assets/img/pt-screenshots/main-screen-medium.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147943698-e08a9992-99c9-4749-8685-e16f5dd514bb.png
diff --git a/assets/img/pt-screenshots/main-screen-medium.png b/assets/img/pt-screenshots/main-screen-medium.png
deleted file mode 100644
index 546036795..000000000
Binary files a/assets/img/pt-screenshots/main-screen-medium.png and /dev/null differ
diff --git a/assets/img/pt-screenshots/mixer-channels.inc b/assets/img/pt-screenshots/mixer-channels.inc
new file mode 100644
index 000000000..fa86771a8
--- /dev/null
+++ b/assets/img/pt-screenshots/mixer-channels.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147943724-3c03502a-3731-42ba-9936-2b9d367bdcf5.png
diff --git a/assets/img/pt-screenshots/mixer-channles.png b/assets/img/pt-screenshots/mixer-channles.png
deleted file mode 100644
index 2e6dfd90f..000000000
Binary files a/assets/img/pt-screenshots/mixer-channles.png and /dev/null differ
diff --git a/assets/img/pt-screenshots/profile-tooltip.inc b/assets/img/pt-screenshots/profile-tooltip.inc
new file mode 100644
index 000000000..a4e5dd988
--- /dev/null
+++ b/assets/img/pt-screenshots/profile-tooltip.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147943756-960b99de-45ef-4e16-ac23-f5c976d8f216.png
diff --git a/assets/img/pt-screenshots/profile-tooltip.png b/assets/img/pt-screenshots/profile-tooltip.png
deleted file mode 100644
index cb8292c37..000000000
Binary files a/assets/img/pt-screenshots/profile-tooltip.png and /dev/null differ
diff --git a/assets/img/pt-screenshots/server-active.inc b/assets/img/pt-screenshots/server-active.inc
new file mode 120000
index 000000000..040c5522e
--- /dev/null
+++ b/assets/img/pt-screenshots/server-active.inc
@@ -0,0 +1 @@
+../en-screenshots/server-active.inc
\ No newline at end of file
diff --git a/assets/img/pt-screenshots/server-inactive.inc b/assets/img/pt-screenshots/server-inactive.inc
new file mode 120000
index 000000000..a721dddfe
--- /dev/null
+++ b/assets/img/pt-screenshots/server-inactive.inc
@@ -0,0 +1 @@
+../en-screenshots/server-inactive.inc
\ No newline at end of file
diff --git a/assets/img/pt-screenshots/server-window-options.inc b/assets/img/pt-screenshots/server-window-options.inc
new file mode 100644
index 000000000..d613c615b
--- /dev/null
+++ b/assets/img/pt-screenshots/server-window-options.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147943782-4ad94c4a-4067-4c60-b208-a0aa3992d307.png
diff --git a/assets/img/pt-screenshots/server-window-options.png b/assets/img/pt-screenshots/server-window-options.png
deleted file mode 100644
index 18dceffcd..000000000
Binary files a/assets/img/pt-screenshots/server-window-options.png and /dev/null differ
diff --git a/assets/img/pt-screenshots/server-window-setup.inc b/assets/img/pt-screenshots/server-window-setup.inc
new file mode 100644
index 000000000..68cad412f
--- /dev/null
+++ b/assets/img/pt-screenshots/server-window-setup.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147943809-eb334ba1-1706-43a2-b34d-dca8c8def2cb.png
diff --git a/assets/img/pt-screenshots/server-window-setup.png b/assets/img/pt-screenshots/server-window-setup.png
deleted file mode 100644
index 4a11ed6cb..000000000
Binary files a/assets/img/pt-screenshots/server-window-setup.png and /dev/null differ
diff --git a/assets/img/pt-screenshots/settings-advanced.inc b/assets/img/pt-screenshots/settings-advanced.inc
new file mode 100644
index 000000000..5afcb97f6
--- /dev/null
+++ b/assets/img/pt-screenshots/settings-advanced.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147943839-cbfac258-d5f0-4494-b7d2-7b423310f225.png
diff --git a/assets/img/pt-screenshots/settings-advanced.png b/assets/img/pt-screenshots/settings-advanced.png
deleted file mode 100644
index 8d748884a..000000000
Binary files a/assets/img/pt-screenshots/settings-advanced.png and /dev/null differ
diff --git a/assets/img/pt-screenshots/settings-network.inc b/assets/img/pt-screenshots/settings-network.inc
new file mode 100644
index 000000000..9ca638d10
--- /dev/null
+++ b/assets/img/pt-screenshots/settings-network.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147943865-fbac3bcc-a8e4-4e54-8518-1fe75bacb78f.png
diff --git a/assets/img/pt-screenshots/settings-network.png b/assets/img/pt-screenshots/settings-network.png
deleted file mode 100644
index 6d78bb102..000000000
Binary files a/assets/img/pt-screenshots/settings-network.png and /dev/null differ
diff --git a/assets/img/pt-screenshots/settings-profile.inc b/assets/img/pt-screenshots/settings-profile.inc
new file mode 100644
index 000000000..d92d590e3
--- /dev/null
+++ b/assets/img/pt-screenshots/settings-profile.inc
@@ -0,0 +1 @@
+https://user-images.githubusercontent.com/4561747/147943887-32c94613-d867-4e02-8dde-72f9c5aac7da.png
diff --git a/assets/img/pt-screenshots/settings-profile.png b/assets/img/pt-screenshots/settings-profile.png
deleted file mode 100644
index 2539ae2aa..000000000
Binary files a/assets/img/pt-screenshots/settings-profile.png and /dev/null differ
diff --git a/assets/img/pt-screenshots/verification-mac.png b/assets/img/pt-screenshots/verification-mac.png
deleted file mode 100644
index 573f90955..000000000
Binary files a/assets/img/pt-screenshots/verification-mac.png and /dev/null differ
diff --git a/wiki/en/Client-Troubleshooting.md b/wiki/en/Client-Troubleshooting.md
index 1142384ec..77b4dae9a 100644
--- a/wiki/en/Client-Troubleshooting.md
+++ b/wiki/en/Client-Troubleshooting.md
@@ -33,12 +33,12 @@ Your audio device may not work with the buffer size you selected. Select a bigge
 
 ### You all sound OK, but it's difficult to keep together
 
-**If at all possible, DO NOT listen to your direct signal.** Make sure you are listening as much as you can to the sound of your own instrument/voice _coming back from the server_. This signal has you and your playing partners mixed together in sync, and will be the signal that your bandmates are hearing too. So listening to that means you will be in sync with each other (assuming you all have reasonably low latency). Note that if one or more musicians are not following this rule, they will slow down as they play or sing.
+**If at all possible, DO NOT listen to your direct signal.** Make sure you are listening as much as you can to the sound of your own instrument/voice _coming back from the Server_. This signal has you and your playing partners mixed together in sync, and will be the signal that your bandmates are hearing too. So listening to that means you will be in sync with each other (assuming you all have reasonably low latency). Note that if one or more musicians are not following this rule, they will slow down as they play or sing.
 
 You can test whether you are hearing your signal correctly by doing the following:
 
-1. Run Jamulus and connect to a server with a long ping time (greater than 200ms)
-2. Clap your hands once (or play one short note on an instrument). You should hear the sound from the Jamulus server come back, but significantly delayed.
+1. Run Jamulus and connect to a Server with a long ping time (greater than 200ms)
+2. Clap your hands once (or play one short note on an instrument). You should hear the sound from the Jamulus Server come back, but significantly delayed.
 3. Click the "Mute" button under your Jamulus name/slider in the main Jamulus mixer window (**NOT** the "Mute Myself" button on the left).
 4. Clap your hands again.
 
@@ -46,7 +46,7 @@ If you hear two claps after step 2, or any claps after step 4, then you are **no
 
 Exactly how you avoid listening to your direct signal will depend on your individual setup - your sound interface, mixing desk, headphone connection point, etc. For example, some audio interfaces have "monitor" buttons (turn these off), or similar options. **If you are still having problems**, try asking on the [forum](https://github.com/jamulussoftware/jamulus/discussions). 
 
-Be aware that while listening to the server's signal will ensure you will be in sync with other musicians, you may also experience problems if your overall latency (indicated by the "Delay" light in Jamulus) is not green or at least yellow most of the time. Consult the [software manual](/wiki/Software-Manual) to understand how to adjust your setup to help with this.
+Be aware that while listening to the Server's signal will ensure you will be in sync with other musicians, you may also experience problems if your overall latency (indicated by the "Delay" light in Jamulus) is not green or at least yellow most of the time. Consult the [software manual](/wiki/Software-Manual) to understand how to adjust your setup to help with this.
 
 ### Can't work out your mic settings?
 
@@ -62,21 +62,21 @@ This can indicate something else is competing with Jamulus on your network, so m
 
 ### Getting frustrated with software channels, audio routing, sample rates and more?
 
-It's usually far easier and more reliable to have a [mixing desk](https://www.thomann.de/pics/bdb/191244/7355025_800.jpg) to connect your kit (instruments, mic, recorder etc.) and then send a simple stereo signal to your sound interface (be sure to listen to the resulting sound from the Jamulus server via your computer though!). The huge variety of possible hardware, software and instrument combinations means that setting up your sound card to work with your particular configuration can otherwise get complicated very fast.
+It's usually far easier and more reliable to have a [mixing desk](https://www.thomann.de/pics/bdb/191244/7355025_800.jpg) to connect your kit (instruments, mic, recorder etc.) and then send a simple stereo signal to your sound interface (be sure to listen to the resulting sound from the Jamulus Server via your computer though!). The huge variety of possible hardware, software and instrument combinations means that setting up your sound card to work with your particular configuration can otherwise get complicated very fast.
 
 ### Somebody joining your jam and being too loud?
 
 You can set your "New Client Level" to a low value (e.g. 10), or set the musicians you are playing with to "Solo" state (in the mixer panel on the right side). That way, either new entrants will be very quiet, or you won't hear them at all.
 
-### Can't see the server you want to join?
+### Can't see the Server you want to join?
 
-First check that you have the right genre server selected in your Connection Setup window. Sometimes network issues mean your client won't list all the available servers. If you know the name of the server you want to join, you can [look up its IP address here](https://explorer.jamulus.io/). Enter the IP address in the "Server Name/Address" field in the Connect Setup window to connect to it.
+First check that you have the right genre Server selected in your Connect window. Sometimes network issues mean your client won't list all the available Servers. If you know the name of the Server you want to join, you can [look up its IP address here](https://explorer.jamulus.io/). Enter the IP address in the "Server Name/Address" field in the Connect Setup window to connect to it.
 
-### Not seeing a list of servers at all?
+### Not seeing a list of Servers at all?
 
 In the UK (and possibly other regions/routers) the Virgin Media Cable Internet Modem setting can cause an issue. "Block Fragmented IP Packets" should not be checked. For other routers/ISP, also try turning off SPI (Stateful Packet Inspection) and if that fixes it, you can make a judgment about whether to leave that off or not.
 
-In some cases, it may be your ISP that is blocking your use of Jamulus. See the note on the [server troubleshooting page](Server-Troubleshooting#nobody-can-connect-to-my-server---but-i-can-connect-locally) about "Nobody can connect to my server"
+In some cases, it may be your ISP that is blocking your use of Jamulus. See the note on the [server troubleshooting page](Server-Troubleshooting#nobody-can-connect-to-my-server---but-i-can-connect-locally) about "Nobody can connect to my Server"
 
 ### Trouble using Garageband (or other DAW) with Jamulus?
 
diff --git a/wiki/en/Custom-Directories.md b/wiki/en/Custom-Directories.md
new file mode 100644
index 000000000..13c375c66
--- /dev/null
+++ b/wiki/en/Custom-Directories.md
@@ -0,0 +1,30 @@
+---
+layout: wiki
+title: "Custom Directories"
+lang: "en"
+permalink: "/wiki/Custom-Directories"
+---
+
+{% include breadcrumb.html root="More" branch1="Server Administration" branch1-url="Running-a-Server" %}
+
+
+# Running a Custom Directory 
+
+This is a specialised Jamulus Server configuration, as described in [Server Types](Running-a-Server#server-types). 
+
+To view Servers listed by a Custom Directory, users must enter the address of that Directory in their client's Settings > Advanced Setup > Custom Directories field. Multiple addresses can be added in this way if needed. Custom Directories will then appear in the Directory drop-down list on their Connect window. Custom Directories otherwise work for clients in the same way as Public Directories, displaying a list of Servers registered with them.
+
+To run a Server as a Directory, it should be started with the `--directoryserver` option to make itself (that is, 'localhost' or '127.0.0.1') the Directory to query for Servers.
+
+When running a Server with the GUI, select "Custom" from the Directory drop-down list, and set the Custom Directory Address field in the Options tab.  
+
+
+### Points to note about Directories
+
+- If you want to control which Servers can register with your Directory, you can enable a whitelist with the `--listfilter` command line option in the format `ip address 1[;ip address 2]`. 
+
+- When running a Directory behind a NAT firewall on a private network, use the `--serverpublicip` option to specify the public IP address of the Server(s) being listed by your Directory if those Servers are on the same LAN / with the same public IP as the Directory. This is necessary to allow clients on the public Internet to connect to them via NAT. Note that for the Servers using this option, you will still need proper port forwarding in your router/firewall.
+
+- If you are running your Server as a Directory and need to restart it for any reason (for example when rebooting the host), Servers connected to it will be disconnected until they re-register. This does not mean that clients connected to those Servers will be disconnected, but does mean that new clients will be not able to see Servers listed by your Directory until those Servers reconnect. To enable the list of registered Servers to persist between restarts, use the `--directoryfile` option to specify the location and name of a file that the Directory can read and write to.
+
+- Up to 150 Servers can then register with a Directory.
diff --git a/wiki/en/FAQ.md b/wiki/en/FAQ.md
index 4addb6ea0..052e3f5ff 100644
--- a/wiki/en/FAQ.md
+++ b/wiki/en/FAQ.md
@@ -22,15 +22,15 @@ permalink: "/wiki/FAQ"
 
 ### Is there a metronome, synchronization, or some other way of keeping in time?
 
-No. Musicians on a Jamulus server simply play in real time together as they would in person. If you want to have a time signal, then there are shared metronome solutions on the Internet you can try. But it’s probably best to just minimise latency so nobody has an overall delay more than about 30-50 ms. 
+No. Musicians on a Jamulus Server simply play in real time together as they would in person. If you want to have a time signal, then there are shared metronome solutions on the Internet you can try. But it’s probably best to just minimise latency so nobody has an overall delay more than about 30-50 ms. 
 
 Bear in mind also that all participants should follow [The Golden Rule](/wiki/Client-Troubleshooting#you-all-sound-ok-but-its-difficult-to-keep-together) which will also determine whether you can play in time properly.
 
-### How do I know if I can join a server? Are there rules?
+### How do I know if I can join a Server? Are there rules?
 
-In general, if somebody sets up a public server, they accept that anyone can play on it. Jamulus has no password protection or other authentication mechanisms. However, some servers may state their policies in the welcome message you will see in the chat window.
+In general, if somebody lists a Server on one of the Public Directories provided by Jamulus by default, they accept that anyone can play on it. Jamulus has no password protection or other authentication mechanisms built in. However, some Servers may state their policies in the welcome message you will see in the chat window.
 
-You can also set up a private server on Jamulus and give others your address to connect to that. Have a look at [this page for more information](/wiki/Running-a-Server).
+Note also that Servers do not have to be registered on a Directory in order for Jamulus clients to connect to them. Server operators can simply give out the address of their  Servers to those they want to play with, and they can then connect directly. Have a look at [this overview for more information](/wiki/Running-a-Server#server-types).
 
 ### Why shouldn’t I use wireless equipment?
 
@@ -42,22 +42,22 @@ So it makes sense to minimise any sources of delay or other problems with the si
 
 For the same reason as you need to minimise delay in your signal in order to play in time, you need to make sure you are playing to your own sound that other musicians are hearing. More information on this, and a way of testing your setup to make sure you are obeying this “Golden Rule” [can be found here](/wiki/Client-Troubleshooting#you-all-sound-ok-but-its-difficult-to-keep-together).
 
-Of course, if you are playing an acoustic instrument, or are a singer, it will be hard to exclude your “local” sound. But you should at least try to do so by for example using closed-back headphones turned up as loud as you are able to mask your own sound. This will let you concentrate on the mix coming back to you from the server.
+Of course, if you are playing an acoustic instrument, or are a singer, it will be hard to exclude your “local” sound. But you should at least try to do so by for example using closed-back headphones turned up as loud as you are able to mask your own sound. This will let you concentrate on the mix coming back to you from the Server.
 
 ### Do I need a fast Internet connection?
 
-No, especially if you don't run a server to host other musicians. Having a low ping is more important. For most people on standard broadband (e.g. 10 Mbit/s down and 1 Mbit/s up) you will have no problems. For those running servers at home, depending on how many people join, you may encounter issues if your _upstream_ bandwidth is lower than about 5 Mbit/s. 
+No, especially if you don't run a Server to host other musicians. Having a low ping is more important. For most people on standard broadband (e.g. 10 Mbit/s down and 1 Mbit/s up) you will have no problems. For those running Servers at home, depending on how many people join, you may encounter issues if your _upstream_ bandwidth is lower than about 5 Mbit/s. 
 
-### Do I need to run a server?
+### Do I need to run a Server?
 
-No. If you just intend to connect to other people’s servers, then all you need is a client. [Read this if you think you need to run your own server](/wiki/Running-a-Server).
+No. If you just intend to connect to other people’s Servers, then all you need is a client. [Read this if you think you need to run your own Server](/wiki/Running-a-Server).
 
 ### How does Jamulus work (in general)?
 
-<img src="{{site.url}}/assets/img/en-screenshots/diagram-overview.png" loading="lazy" alt="Diagram showing how Jamulus works">
+<img src="{% include img/en-screenshots/diagram-overview.inc %}" loading="lazy" alt="Diagram showing how Jamulus works">
 
 
-Jamulus works on the client-server principle. Everybody’s audio is sent to a server, mixed and processed there. Afterwards, the audio is sent back to each client. If a server is made public and registered on a public directory, its information will be broadcast to all clients.
+Jamulus works on the client-server principle. Everybody’s audio is sent to a Server, mixed and processed there. Afterwards, the audio is sent back to each client. If a Server is registered in a Jamulus Directory, the Server's information will be provided to all clients using that Directory.
 
 ### Why doesn't Jamulus provide video support?
 
@@ -66,10 +66,10 @@ Adding video support adds a lot of complexity. You can use other software like J
 
 ## Server FAQ
 
-### Why do public servers not need port forwarding?
+### Why do Registered Servers not need port forwarding?
 
-Normally, network address translation (NAT) firewalls prevent incoming requests initiated from outside the local network. Inbound traffic is only possible for packets relating to an outbound request (strictly speaking, “related” and “established” packets to an initial outbound connection). In public server mode, when your Jamulus server connects to a Directory Server it of course initiates an outbound connection. From then on, the Directory Server sends (established/related) connection “pings” (not ICMP pings) to your server at regular intervals to keep the relevant NAT port(s) open on your router/firewall.
+Normally, network address translation (NAT) firewalls prevent incoming requests initiated from outside the local network. Inbound traffic is only possible for packets relating to an outbound request (strictly speaking, “related” and “established” packets to an initial outbound connection). In Registered Server mode, when your Jamulus Server connects to a Directory it of course initiates an outbound connection. From then on, the Directory sends (established/related) connection “pings” (not ICMP pings) to your Server at regular intervals to keep the relevant NAT port(s) open on your router/firewall.
 
-However, in private mode, clients have to **initiate** connections into the server’s network. NAT firewalls prevent this, so you need to tell them to allow incoming connection requests on the Jamulus port using port forwarding.
+However, in Unregistered mode, clients have to **initiate** connections into the Server’s network. NAT firewalls prevent this, so you need to tell them to allow incoming connection requests on the Jamulus port using port forwarding.
 
 
diff --git a/wiki/en/Getting-Started.md b/wiki/en/Getting-Started.md
index a41b5ca9c..13994c3b2 100644
--- a/wiki/en/Getting-Started.md
+++ b/wiki/en/Getting-Started.md
@@ -36,8 +36,8 @@ If you use external audio hardware, plug that in before you start Jamulus. If yo
 When you open Jamulus, you will see a window which looks like this:
 
 <figure>
-  <img src="{{site.url}}/assets/img/en-screenshots/main-screen-default.png" loading="lazy" alt="Screenshot" style="border: 5px solid grey;">
-  <figcaption>The main window before you connect to a server</figcaption>
+  <img src="{% include img/en-screenshots/main-screen-default.inc %}" loading="lazy" alt="Screenshot" style="border: 5px solid grey;">
+  <figcaption>The main window before you connect to a Server</figcaption>
 </figure>
 
 
@@ -46,37 +46,37 @@ When you open Jamulus, you will see a window which looks like this:
 First, let others know who you are. Click on the “Settings” button on the bottom left and go to “My Profile…”. Now you will see this:
 
 <figure>
-  <img src="{{site.url}}/assets/img/en-screenshots/settings-profile.png" loading="lazy" alt="Screenshot" style="border: 5px solid grey;">
+  <img src="{% include img/en-screenshots/settings-profile.inc %}" loading="lazy" alt="Screenshot" style="border: 5px solid grey;">
   <figcaption>Let people know who you are</figcaption>
 </figure>
 
 
 Fill in at least “Alias/Name” and close the window.
 
-## Connecting to a server and testing your sound
+## Connecting to a Server and testing your sound
 
-Before you connect to a server, you should **not** be able to hear yourself.  Listening to your sound from Jamulus (and not from yourself) is called “The Golden Rule” and enables you to play in time with others ([see the FAQ](/wiki/FAQ#why-should-i-not-listen-to-my-own-signal)).
+Before you connect to a Server, you should **not** be able to hear yourself.  Listening to your sound from Jamulus (and not from yourself) is called “The Golden Rule” and enables you to play in time with others ([see the FAQ](/wiki/FAQ#why-should-i-not-listen-to-my-own-signal)).
 
-**Before playing with others, we recommend that you connect to an empty server to test your setup**, and make sure you are listening to the signal coming back from the server (if possible) and not yourself.
+**Before playing with others, we recommend that you connect to an empty Server to test your setup**, and make sure you are listening to the signal coming back from the Server (if possible) and not yourself.
 
-Now use the “Connect” button in the Jamulus main window to join a server. A window will now open:
+Now use the “Connect” button in the Jamulus main window to join a Server. A window will now open:
 
 <figure>
-  <img src="{{site.url}}/assets/img/en-screenshots/connection-setup-window.png" loading="lazy" alt="Screenshot" style="border: 5px solid grey;">
-  <figcaption>Connect to a server</figcaption>
+  <img src="{% include img/en-screenshots/connection-setup-window.inc %}" loading="lazy" alt="Screenshot of the connection window" style="border: 5px solid grey;">
+  <figcaption>Connect to a Server</figcaption>
 </figure>
 
-The most important thing about servers is their “ping time”. The bigger the number, the harder it will be to play in time with others. Usually, you would select a server with a ping of less than 50ms if you can.
+The most important thing about Servers is their “ping time”. The bigger the number, the harder it will be to play in time with others. Usually, you would select a Server with a ping of less than 50ms if you can.
 
-Once connected to a server, make sure you can hear yourself OK and fix any input volume or other problems. You can have a look at the [troubleshooting page](/wiki/Client-Troubleshooting) for common problems. And of course, check that you are also able to obey [The Golden Rule](/wiki/Client-Troubleshooting#you-all-sound-ok-but-its-difficult-to-keep-together).
+Once connected to a Server, make sure you can hear yourself OK and fix any input volume or other problems. You can have a look at the [troubleshooting page](/wiki/Client-Troubleshooting) for common problems. And of course, check that you are also able to obey [The Golden Rule](/wiki/Client-Troubleshooting#you-all-sound-ok-but-its-difficult-to-keep-together).
 
 ## Playing for the first time
 
-With your sound all set up, you are ready to go. When you connect to a server (you may want to select a genre from the list), the faders you see on the right are your own personal mix. Everything you change here will change what you hear, but won’t affect others. If you move a fader down, that channel will be quieter, if you move it up, the channel will be louder for you.
+With your sound all set up, you are ready to go. When you connect to a Server (you may want to select a genre from the list), the faders you see on the right are your own personal mix. Everything you change here will change what you hear, but won’t affect others. If you move a fader down, that channel will be quieter, if you move it up, the channel will be louder for you.
 
 <figure>
-  <img src="{{site.url}}/assets/img/en-screenshots/main-screen-medium.png" loading="lazy" alt="Screenshot" style="border: 5px solid grey;">
-  <figcaption>The main window when you are connected to a sever</figcaption>
+  <img src="{% include img/en-screenshots/main-screen-medium.inc %}" loading="lazy" alt="Screenshot" style="border: 5px solid grey;">
+  <figcaption>The main window when you are connected to a Server</figcaption>
 </figure>
 
 If you don’t want others to hear your audio, click on the “Mute Myself” button which will stop your audio from being sent to other people. They won’t be able to tell you have done this though. But if you see a “mute” icon above a fader, that means they can’t hear you because they've muted your channel in their mix.
@@ -87,4 +87,4 @@ More information about using Jamulus can be found in the [Software Manual](/wiki
 
 ## Troubleshooting
 
-Having audio trouble? Can't see servers, or some other issue? Have a look at the [Troubleshooting page](/wiki/Client-Troubleshooting), or feel free to ask in the [Discussions](https://github.com/jamulussoftware/jamulus/discussions).
+Having audio trouble? Can't see Servers, or some other issue? Have a look at the [Troubleshooting page](/wiki/Client-Troubleshooting), or feel free to ask in the [Discussions](https://github.com/jamulussoftware/jamulus/discussions).
diff --git a/wiki/en/Include-Backing-Up.md b/wiki/en/Include-Backing-Up.md
index 24bc09e08..5b571dc0b 100644
--- a/wiki/en/Include-Backing-Up.md
+++ b/wiki/en/Include-Backing-Up.md
@@ -1,4 +1,4 @@
-<!-- NOTE: This must apply to both client and server, and all operating systems -->
+<!-- NOTE: This must apply to both client and Server, and all operating systems -->
 
 Once installed and running, you may want to keep a copy of your settings. Having a backup is always a good idea, and settings files are not backwardly compatible between versions of Jamulus. So if you want to go back to the previous version, you will need to restore the settings you had. 
 
diff --git a/wiki/en/Include-Client-Commands.md b/wiki/en/Include-Client-Commands.md
index 71c1676dc..2d46d8bd3 100644
--- a/wiki/en/Include-Client-Commands.md
+++ b/wiki/en/Include-Client-Commands.md
@@ -1,6 +1,6 @@
 - `-M` or `--mutestream`  Starts Jamulus in muted state                                                      
 - `--mutemyown`  Mute me in my personal mix ("headless" mode only)                                                      
--  `-c` or `--connect`  Connect to given server address on startup, format `address[:port]`  
+-  `-c` or `--connect`  Connect to given Server address on startup, format `address[:port]`  
 -  `-j` or `--nojackconnect`  Disable auto JACK connections  
 -  `--ctrlmidich`  MIDI controller channel to listen on, control number offset and consecutive CC numbers (channels). Format: `channel[;f*][;p*][;s*][;m*]` See [Tips & Tricks](Tips-Tricks-More#using-ctrlmidich-for-midi-controllers) 
 - `--clientname`  Window title and JACK client name 
diff --git a/wiki/en/Include-QOS-Windows.md b/wiki/en/Include-QOS-Windows.md
index ac38f4e36..557ba3a16 100644
--- a/wiki/en/Include-QOS-Windows.md
+++ b/wiki/en/Include-QOS-Windows.md
@@ -29,5 +29,5 @@ Looking at the third panel (Actions) of the Local Group Policy Editor<br>
 &nbsp;&nbsp;&nbsp;&nbsp;UDP<br>
 &nbsp;&nbsp;&nbsp;&nbsp;Finish<br>
 
-(Notice Jamulus policy in center panel may be edited)
+(Notice that the Jamulus policy in the center panel may be edited)
 
diff --git a/wiki/en/Include-Server-Commands.md b/wiki/en/Include-Server-Commands.md
index 7367398e5..7a5af1466 100644
--- a/wiki/en/Include-Server-Commands.md
+++ b/wiki/en/Include-Server-Commands.md
@@ -1,19 +1,19 @@
-- `-d`  or `--discononquit`   Disconnect all clients on quit. Normally, when a server is stopped or restarted, any clients that have not used their "Disconnect" buttons will re-establish connection when the server comes back up again. Using this option forces clients to manually re-establish their connections to the server.  
-- `-e`  or `--directoryserver`  Register the server on a directory (e.g. to set its genre (see also `-o`)). See [server types](#server-types) for further information.
-- `--directoryfile` Enable directory to remember registered servers even if the directory is restarted. You'll need to specify a path to a writable file location in which server information is stored.
-- `-f`  or `--listfilter`     Whitelist servers registering on the server list, format `ip address 1[;ip address 2]` Directory Servers only. See [server types](#server-types)  
+- `-d`  or `--discononquit`   Disconnect all clients on quit. Normally, when a Server is stopped or restarted, any clients that have not used their "Disconnect" buttons will re-establish connection when the Server comes back up again. Using this option forces clients to manually re-establish their connections to the Server.  
+- `-e`  or `--directoryserver`  Register the Server on a Directory (e.g. to set its genre (see also `-o`)). See [Server Types](#server-types) for further information.
+- `--directoryfile` Remember registered Servers even if the Directory is restarted. Directory Servers only. See [this guide](Custom-Directories) for further information. 
+- `-f`  or `--listfilter`     Whitelist Servers registering on the Server list, format `ip address 1[;ip address 2]` Directory Servers only. 
 -  `-F`  or `--fastupdate`     Reduces latency if clients connect with "Enable Small Network Buffers" option. Requires faster CPU to avoid dropouts, and more bandwidth to enabled clients.
 -  `-l`  or `--log`            Enable logging, set path and file name                                                                    
 - `-L`  or `--licence`        Show an agreement window before users can connect
 - `-m`  or `--htmlstatus`     Enable HTML status file, set path and file name
-- `-o`  or `--serverinfo`     Location details in the format:  `[name];[city];[locale value]` (see [values](https://doc.qt.io/qt-5/qlocale.html#Country-enum)) Public servers only
+- `-o`  or `--serverinfo`     Location details in the format:  `[name];[city];[locale value]` (see [values](https://doc.qt.io/qt-5/qlocale.html#Country-enum)) Registered Servers only
 - `-P`  or `--delaypan`       Start with delay panning enabled See [notes](#delay-panning)
 - `-R`  or `--recording`      Include a writeable path where the files should be stored (in quotes if needed).  See [Options](#options).  
 - `--norecord`       Disable recording when enabled by default by `-R`                                                 
-- `-s` or `--server` Start in server mode
+- `-s` or `--server` Start in Server mode
 - `--serverbindip`  Specify the IP address to bind to              
 -  `-T` or `--multithreading`  Use multithreading to make better use of multi-core CPUs to support more clients
 -  `-u` or `--numchannels`   Maximum number of channels (clients)
 -  `-w` or `--welcomemessage`  Welcome message on connect
 -  `-z` or `--startminimized`  Start minimizied
--  `--serverpublicip`  The public IP address of the server if connecting to a Directory behind the same NAT. See [Notes on Directory Servers](Running-a-Server#points-to-note-about-directories)
+-  `--serverpublicip`  The public IP address of the Server if connecting to a Directory behind the same NAT. See [Notes on Directory Servers](Running-a-Server#points-to-note-about-directories)
diff --git a/wiki/en/Installation-for-Macintosh.md b/wiki/en/Installation-for-Macintosh.md
index 87a71caaa..fb8015b82 100644
--- a/wiki/en/Installation-for-Macintosh.md
+++ b/wiki/en/Installation-for-Macintosh.md
@@ -16,10 +16,10 @@ Upgrading? You may want to [back up your configuration](Software-Manual#backing-
 1. [Download Jamulus]({{ site.download_root_link }}{{ site.download_file_names.mac }}){: .button}\\
  **macOS Sierra (10.12) or lower:** [Download legacy version]({{ site.download_root_link }}{{ site.download_file_names.mac-legacy }})\\
  **Mirror 2:** [SourceForge](https://sourceforge.net/projects/llcon/files/latest/download)
-1. **Install Jamulus**: Open the downloaded `.dmg` file, agree to the licence, *drag and drop* each icon you see in the window (Jamulus client and server) into your *Applications folder*. After that, you can close this window.
+1. **Install Jamulus**: Open the downloaded `.dmg` file, agree to the licence, *drag and drop* each icon you see in the window (Jamulus client and Server) into your *Applications folder*. After that, you can close this window.
 1. **Run Jamulus**. Now you should be able to use Jamulus just like any other application. 
 
-_You can remove the folder in the Downloads directory containing the `.dmg` and eject the "Jamulus" drive on your desktop. They are no longer needed._
+_You can remove the folder in the Downloads Directory containing the `.dmg` and eject the "Jamulus" drive on your desktop. They are no longer needed._
 
 ***
 
diff --git a/wiki/en/Installation-for-Windows.md b/wiki/en/Installation-for-Windows.md
index 7e7737926..35e167bf7 100644
--- a/wiki/en/Installation-for-Windows.md
+++ b/wiki/en/Installation-for-Windows.md
@@ -41,7 +41,7 @@ You can try two versions of ASIO4ALL. ASIO4ALL v2.14 includes a workaround for a
 
 You may or may not need to experiment a bit depending on your sound hardware. If everything works out of the box, you don't need to do anything.
 
-**Tip:** Set up your sound card while you're [connected to a server](Getting-Started#connecting-to-a-server-and-testing-your-sound) to hear your instrument or voice and check if everything is correctly set up; but first read on.
+**Tip:** Set up your sound card while you're [connected to a Server](Getting-Started#connecting-to-a-server-and-testing-your-sound) to hear your instrument or voice and check if everything is correctly set up; but first read on.
 
 
 Before you start with Jamulus:
diff --git a/wiki/en/Privacy-Statement.md b/wiki/en/Privacy-Statement.md
index 5390b92f0..38844bdc8 100644
--- a/wiki/en/Privacy-Statement.md
+++ b/wiki/en/Privacy-Statement.md
@@ -7,32 +7,38 @@ permalink: "/wiki/Privacy-Statement"
 
 # Privacy Statement
 
+## Definition of Terms
+
+- "**Server**" The Jamulus Server software, as opposed to the host machine/OS it is running on.
+- "**Client**" The Jamulus software used to connect to a Server
+- "**Directory**" A Jamulus Server configured to supply a list of Servers to Clients
+
 ## Web site
 
-The website at jamulus.io is served using GitHub Pages. We do not collect your personal data or set tracking cookies. When you connect to the jamulus.io site, your IP is sent to GitHub Pages.
+The website at [jamulus.io](https://jamulus.io) is served using GitHub Pages. We do not collect your personal data or set tracking cookies. When you connect to the jamulus.io site, your IP is sent to [GitHub Pages](https://pages.github.com/).
 
-## Jamulus software
+## Jamulus Software
 
 ### Use of Profile Information
 
-When you connect to a public or private Jamulus server, whatever you put in My Profile (in Settings) will be shown to others on that server while you are connected to it. The server does not otherwise store or record your Profile information and the server operator has no access to it unless they are also connected as a client.
+When you connect to a Server, whatever you put in My Profile (in Settings) will be shown to others on that Server while you are connected to it. The Server does not otherwise store or record your Profile information and the Server operator has no access to it unless they are also connected as using a Client.
 
-When you connect to a public server, your profile is also available to third parties from the Directory Server to which that server is registered. This is can be for informational purposes about the status of the public Jamulus network (for example, [here](https://explorer.jamulus.io/)), but may not be limited to that. Profile information is not otherwise logged or stored by the Jamulus server you are connected to, or by the Jamulus Directory Server, but may be stored or processed by third parties.
+When you connect to a Server, your profile may also be available to third parties from the Directory to which that Server is registered. This can be for informational purposes about the status of the public Jamulus network (for example, [here](https://explorer.jamulus.io/)), but may not be limited to that. Profile information is not otherwise logged or stored by the Jamulus Server you are connected to, or by the Jamulus Directory, but may be stored or processed by third parties.
 
 ### Use of IP Addresses
 
-When you connect to a public or private server, the server operator can see your IP address while you are connected.  If the server operator has enabled logging (which is off by default) your IP address will also be logged and stored in the server's log file.
+When you connect to Server, the Server operator can see your IP address while you are connected.  If the Server operator has enabled logging (which is off by default) your IP address will also be logged and stored in the Server's log file.
 
-The IP addresses of all public servers registered with the Directory Server can also be seen by third parties for informational or other purposes (for example [here](https://explorer.jamulus.io/)). Your public IP address is otherwise not logged or stored by Jamulus, but may be stored or processed by third parties.
+The IP addresses of all Servers registered with the Directory can also be seen by third parties for informational or other purposes (for example [here](https://explorer.jamulus.io/)). Your public IP address is otherwise not logged or stored by Jamulus, but may be stored or processed by third parties.
 
 ### Audio Recordings
 
-You will see a notice if you are connected to a Jamulus server while server recording is turned on. Recordings of each player are stored by the server separately as .WAV files and only the server operator has access to them.
+You will see a notice if you are connected to a Jamulus Server when Server recording is turned on. Recordings of each player are stored by the Server separately as .WAV files and only the Server operator has access to them unless they choose to make them available to third parties.
 
 ### Text Chat
 
-When you type a message in the Chat Window, other connected players can see that, but chats are not stored by the server and neither the server operator nor any third parties have access to them.
+When you type a message in the Chat Window, other connected players can see that, but chats are not stored by the Server and neither the Server operator nor any third parties have access to them.
 
 ### Data Transmission
 
-Please note that all audio and text data is sent and received between the Jamulus server and client without encryption. 
+Please note that all audio and text data is sent and received between the Jamulus Server and Client without encryption. 
diff --git a/wiki/en/Running-a-Server.md b/wiki/en/Running-a-Server.md
index 29ecd00e0..e9238454a 100644
--- a/wiki/en/Running-a-Server.md
+++ b/wiki/en/Running-a-Server.md
@@ -19,87 +19,67 @@ permalink: "/wiki/Running-a-Server"
 
 
 
-## Do I need to run a server?
+## Do I need to run a Server?
 
-The short answer is **no**. For various reasons, you should try to use other people's servers, at least at first while getting your sound set up with the Jamulus client.
+The short answer is **no**. For various reasons, you should try to use other people's Servers, at least at first while getting your sound set up with the Jamulus client.
 
-Note that you can have a "private" session with other people on a Public Server by simply soloing each other. You will then not be able to hear anyone else if they enter your server.
+Note that you can have a "private" session with other people on a Server by simply soloing each other. You will then not be able to hear anyone else if they enter your Server (note that this does not stop them from using the chat function, or seeing your profile information).
 
-If you do decide to run a server, please read the following. Setting up a server is easy, however it is better to know the theory first:
+If you do decide to run a Server, please read the following. Setting up a Server is easy, however it is better to know the theory first:
 
 ### Speed and latency
 
-Many people attribute problems to the server that are in fact problems with the _client_. Much depends on the clients' hard/software setup, the networks that _they_ are on, and whether they are sticking to [Rule Number One](Client-Troubleshooting#you-all-sound-ok-but-its-difficult-to-keep-together).
+Many people attribute problems to the Server that are in fact problems with the _client_. Much depends on the clients' hard/software setup, the networks that _they_ are on, and whether they are sticking to [Rule Number One](Client-Troubleshooting#you-all-sound-ok-but-its-difficult-to-keep-together).
 
-**_The capability of the server itself (and the network it's on) is NOT the main determinant of the quality of a Jamulus session!_**
+**_The capability of the Server itself (and the network it's on) is NOT the main determinant of the quality of a Jamulus session!_**
 
 If you plan to be playing regularly with the same people, **you are strongly advised** to first make sure that each member of the group is set up to use Jamulus properly. Do this by finding a Public Server with a reasonable ping time for all of you (20 ms or less perhaps), all connect to that and work to fix any individual issues (verifying that they can [follow Rule Number One](Client-Troubleshooting#you-all-sound-ok-but-its-difficult-to-keep-together) in particular). Use the solo technique above to prevent being interrupted if needed.
 
-Once any issues with musicians have been solved in this way, you can then investigate hosting your own server either at home or on a cloud host such as Amazon, which may result in better latency than servers run at home. For example, [see this guide](https://www.facebook.com/notes/jamulus-worldjam/howto-idiots-guide-to-installing-or-upgrading-a-jamulus-server-on-amazon-aws-lig/818091045662521/) for using AWS Lightsail, by Jamulus user [Simon Tomlinson](https://www.facebook.com/simon.james.tomlinson?eid=ARBQoY3KcZAtS3pGdLJuqvQTeRSOo4gHdQZT7nNzOt1oPMGgZ4_3GERe-rOyH5PxsSHVYYXjWwcqd71a) (_Facebook_)
+Once any issues with musicians have been solved in this way, you can then investigate hosting your own Server either at home or on a cloud host such as Amazon, which may result in better latency than Servers run at home. For example, [see this guide](https://www.facebook.com/notes/jamulus-worldjam/howto-idiots-guide-to-installing-or-upgrading-a-jamulus-server-on-amazon-aws-lig/818091045662521/) for using AWS Lightsail, by Jamulus user [Simon Tomlinson](https://www.facebook.com/simon.james.tomlinson?eid=ARBQoY3KcZAtS3pGdLJuqvQTeRSOo4gHdQZT7nNzOt1oPMGgZ4_3GERe-rOyH5PxsSHVYYXjWwcqd71a) (_Facebook_)
 
 ### Bandwidth – do you have enough?
 
 Unless you plan on hosting more than about 5 players on a slower-speed home connection (eg 10 Mbit/s down and 1 Mbit/s up), then you are unlikely to run out of bandwidth. You can read more about network requirements at different quality settings later in this document.
 
-
 ### In general
 
 - Consider using a cloud host to get better ping times if you're having problems
 
-- Any server should have at least 1.6GHz CPU frequency and 1GB RAM
-
-- Running a server may require you to adjust any firewalls running on or outside of your machine or cloud host.
+- Any Server should have at least 1.6GHz CPU frequency and 1GB RAM
 
-- Running a Private Server at home will require you to [port forward](#running-a-private-server) on your router. When running a Public Server, port forwarding should not be necessary in most cases, but it's advisable to do so because some networks may not work properly with Jamulus in its default mode.
+- Running a Server may require you to adjust any firewalls running on or outside of your machine or cloud host.
 
-- Jamulus only has limited IPv6 support which needs to be enabled with a command line argument on the client and server. There are plans to expand IPv6 support.
+- Running an Uregistered Server at home will require you to [port forward](#running-an-unregistered-server) on your router. When running a Registered Server, port forwarding should not be necessary in most cases, but it's advisable to do so because some networks may not work properly with Jamulus in its default mode.
 
+- Jamulus only has limited IPv6 support which needs to be enabled with a command line argument on the client and Server. There are plans to expand IPv6 support.
 
 # Server Types
 
-You can run your server in one of three "modes" (either at home or on a 3rd party host):
+You can run your Server in different ways (either at home or on a 3rd party host):
 
-### 1. Public
+### 1. Registered 
 
-Use this mode when you want anyone to join your server, whoever they are.   
-
-Your server will be listed in the Directory that clients use by default. Musicians can then discover and connect to your server.
+Your Server will be listed in a Directory. By default, Jamulus has a list of Public Directories that clients can connect to. If you register with one of these, anyone can then discover and connect to your Server. 
 
 <figure>
-	<img src="{{site.url}}/assets/img/en-screenshots/diagram-public-server.png" loading="lazy" alt="Diagram of connections between clients within a Jamulus Public Server">
-<figcaption>How Public Servers work</figcaption>
+	<img src="{% include img/en-screenshots/diagram-reg-server.inc %}" loading="lazy" alt="Diagram of connections between clients within a Jamulus Registered Server">
+  <figcaption>How Registered Servers work</figcaption>
 </figure>
 
+### 2. Unregistered 
 
-
-### 2. Private
-
-This is the default when starting a server for the first time. Private Servers are not listed by Directories, so only musicians who know your server's address to will be able to connect to it. This is useful because Jamulus does not (in any server mode) let you control who can connect to a server.
-
+This is the default when starting a Server for the first time. Unregistered Servers are not listed by Directories, so only musicians who know your Server's address to will be able to connect to it. This is useful because Jamulus does not let you control who can connect to a Server.
 
 <figure>
-	<img src="{{site.url}}/assets/img/en-screenshots/diagram-private-server.png" loading="lazy" alt="Diagram of connections between clients within a Jamulus Private Server">
-	<figcaption>How Private Servers work</figcaption>
+	<img src="{% include img/en-screenshots/diagram-unreg-server.inc %}" loading="lazy" alt="Diagram of connections between clients within a Jamulus Unregistered Server">
+	<figcaption>How Unregistered Servers work</figcaption>
 </figure>
 
+### 3. Custom Directory
 
+If you want to run a number of Servers, possibly also behind a firewall or on a LAN, you may want to run your Server as a Directory. Examples include online events, music associations, sectional rehearsals or music lessons for schools.
 
-### 3. Directory
-
-For when you want to run a number of Private Servers, possibly also behind a firewall or on a LAN. Examples include online events, music associations, sectional rehearsals or music lessons for schools.
-
-To view servers listed by a custom Directory Server, musicians must enter the address in their client’s "Custom Directory Server" settings field.  They will then see a Connection Setup list which is generated by your Directory.
-
-Up to 150 servers can then register with your Directory by setting your Directory address in their `--directoryserver` option at startup.
-
-To run a server as a Directory, it should be configured with `--directoryserver localhost` (that is, making itself the Directory to query for servers).
-
-#### Points to note about Directories
-
-- If you want to control which servers can register with your Directory, you can enable a whitelist with the `--listfilter` command line option. See the section on command line options later in this document.
-
-- When running a public Directory Server behind a NAT firewall on a private network, use the `--serverpublicip` option to specify the public IP address of the server(s) being listed by your Directory. This is necessary to allow clients on the public Internet to connect to them via NAT. Note that for the servers using this option, you will still need proper port forwarding in your router/firewall.
-
+To run a Custom Directory [read this guide](Custom-Directories)
 
 # Bandwidth use
 
@@ -126,9 +106,9 @@ With the following units
 
 ## Network bandwidth
 
-There is one upstream (musician sending to the server) and one downstream (server sending back the mix to the musician)
+There is one upstream (musician sending to the Server) and one downstream (server sending back the mix to the musician)
 <figure>
-	<img src="{{site.url}}/assets/img/en-screenshots/bandwidth-diagram.png" loading="lazy" alt="A diagram of Jamulus network bandwidths from different audio qualities ranging from low to high">
+	<img src="{% include img/en-screenshots/bandwidth-diagram.inc %}" loading="lazy" alt="A diagram of Jamulus network bandwidths from different audio qualities ranging from low to high">
 <figcaption>Calculate bandwidth use </figcaption>
 </figure>
 
@@ -136,93 +116,98 @@ Note also that mean ADSL2 transfer rate is 10 Mbit/s for downstream and 1 Mbit/s
 
 
 
-# Starting a server
+# Starting a Server
 
 
 * **Windows users** - Use the "Jamulus Server" icon in the Windows Start menu.
 
 * **macOS users** - Double-click the "Jamulus Server" icon in Applications (assuming you put the files from the install there as per [these instructions](Installation-for-Macintosh)).
 
-* **Linux users** - Open a terminal window (`CTRL+ALT+t` on Ubuntu and related distros) and type `jamulus -s`. Hit return and you should see the server control window. You can stop the server by closing the server window, or by using `CTRL+C` in the terminal. _(To run a headless server [read this guide](Server-Linux))_
+* **Linux users** - Open a terminal window (`CTRL+ALT+t` on Ubuntu and related distros) and type `jamulus -s`. Hit return and you should see the Server control window. You can stop the Server by closing the Server window, or by using `CTRL+C` in the terminal. _(To run a headless Server [read this guide](Server-Linux))_
 
 
 ## Server Setup
 
-<figure><img src="{{site.url}}/assets/img/en-screenshots/server-window-setup.png" style="width:80%; border:5px solid grey;" loading="lazy" alt="Image of the Jamulus server setup window"></figure>
-
-### Make My Server Public
-
-By default, you will be running a Private Server and need to [read these instructions](#running-a-private-server) to have others connect to you in this mode.
-
-When making your server public, you should see a confirmation message saying whether your server has registered successfully. If not, and you leave your server running, it will keep trying to register until a free slot becomes available.
+<figure><img src="{% include img/en-screenshots/server-window-setup.inc %}" style="width:80%; border:5px solid grey;" loading="lazy" alt="Image of the Jamulus Server setup window"></figure>
 
+### The Directory list 
 
-### Genre
+**None**: By default, you will not be connected to a Directory and will be running in unregistered mode. [Read these instructions](#running-an-unregistered-server) to have other people connect to your Server in this mode.
 
-Because there is a limit of 150 servers per Directory, you need to select which Directory Server you want to advertise your server on. Select a genre if you intend to limit players to that style (players can then see your server in their genre list). This will make your server appear in the relevant server list for clients.
+**Genre**: To allow other people to see your Server on one of the built-in Public Directories, select your desired genre Directory. You should see a confirmation message saying whether your Server has registered successfully. If not, and you leave your Server running, it will keep trying to register until a free slot becomes available.  
 
+**Custom**: This sets your Server to be a Directory on which other Servers can be listed. Note that when setting this mode, you may want also to specify the location of Server list file (See "Options" below) unless you want to disconnect all listed Servers when restarting Jamulus.
 
 ### My Server Info
 
-Type in the name, city and country so that other users can easily identify you.
+When running as a registered Server this displays the Server's name, city and country so that other users can easily identify it in the Directory listing.
 
 ### Chat Welcome Message
 
-The text entered here appears to all users when they join the server (the chat window will open automatically for them).
+The text entered here appears to all users when they join the Server (the chat window will open automatically for them).
 
 ## Options
 
-
-<figure><img src="{{site.url}}/assets/img/en-screenshots/server-window-options.png" style="width:80%; border:5px solid grey;" loading="lazy" alt="Image of Jamulus server window options"></figure>
+<figure><img src="{% include img/en-screenshots/server-window-options.inc %}" style="width:80%; border:5px solid grey;" loading="lazy" alt="Image of Jamulus Server window options"></figure>
 
 ### Recording Directory
 
-This sets the path to where server's recording will be stored. With this path set, the "Enable Jam Recoder" function in the Server Setup tab will make recording start once the first person connects to the server, and stops when the last person leaves. Use the "New Recording" button to create a new sub-directory in which the recordings will be stored from then on. Note that Recordings are per track in [Audacity](https://www.audacityteam.org/) `.lof` format and [REAPER](https://en.wikipedia.org/wiki/REAPER) `.rpp`. Open the respective files to listen to them in those applications.
+This sets the path to where Server's recording will be stored. With this path set, the "Enable Jam Recoder" function in the Server Setup tab will make recording start once the first person connects to the Server, and stops when the last person leaves. Use the "New Recording" button to create a new sub-directory in which the recordings will be stored from then on. Note that Recordings are per track in [Audacity](https://www.audacityteam.org/) `.lof` format and [REAPER](https://en.wikipedia.org/wiki/REAPER) `.rpp`. Open the respective files to listen to them in those applications.
 
-**Note**: When your server is recording, clients will display a message that recording is on.
+**Note**: When your Server is recording, clients will display a message that recording is on.
 
-### Delay panning
+### Custom Directory Server Address
 
-This option uses small differences in sound arrival time between the two ears. It produces a stereo effect similar to natural human hearing when compared to normal "volume" panning. Note that to achieve the effect, all clients should be set to 'mono in / stereo out' (or to 'stereo', but only if transmitting a stereo signal).
+Leave this field empty unless you need to list your Server on a [Custom Directory](#3-directory)
 
-### Custom Directory Server Address
+### Server List Filename
+
+Leave this field empty unless you need to list your Server on a [Custom Directory](#3-directory)
 
-Leave this field empty unless you need to list your server on a [private Directory](#3-directory)
+### Delay panning
 
+This option uses small differences in sound arrival time between the two ears. It produces a stereo effect similar to natural human hearing when compared to normal "volume" panning. 
 
 ### Start Minimised
 
-**Windows users** - If you want the server to start automatically on system start, enable the corresponding check box.
+**Windows users** - If you want the Server to start automatically on system start, enable the corresponding check box.
+
+### Server status icon
+
+When the Server is running, the operating system will show an icon in the system tray or status area to represent whether the Server is active:  
+
+<figure><img src="{% include img/en-screenshots/server-inactive.inc %}" style="float:left; margin-right:10px;" loading="lazy" alt="Image of the Jamulus Server icon"></figure> The Server is empty
 
+<figure><img src="{% include img/en-screenshots/server-active.inc %}" style="float:left; margin-right:10px;" loading="lazy" alt="Image of the Jamulus Server icon"></figure> The Server is occupied
 
 
-# Running a Private Server
+# Running an Unregistered Server
 
-It is highly recommended to test your server in **public mode first** so as to narrow down any subsequent problems in private mode.
+It is highly recommended to test your Server on a **Public Directory** first so as to narrow down any subsequent problems in unregistered mode.
 
-### Port forwarding
+### Port forwarding 
 
-Normally, people from outside your home network cannot see things inside it. So if you want to operate a Jamulus server at home, you need to open a hole in your router to let Jamulus clients connect to it.
+If you are running a Server on your home network, people from outside will not be able to see things inside it. So if you want to operate a Jamulus Server, you need to open a hole in your router to let Jamulus clients connect to it.
 
 **The default port for the current version of Jamulus is UDP (not TCP) port 22124.**
 
 The exact setup of port forwarding differs for every router. For help see [portforward.com](https://portforward.com).
 
-Once you have your router set up, you can get your external (WAN) IP address e.g. by [using Google](https://www.google.com/search?q=what+is+my+ip). Give this address to your friends so they can connect to your server (_but see also the note on dynamic DNS below_). You yourself have to connect to your own computer instead, since your computer runs the server. Therefore **only you** need to connect to `127.0.0.1`.
+Once you have your router set up, you can get your external (WAN) IP address e.g. by [using Google](https://www.google.com/search?q=what+is+my+ip). Give this address to your friends so they can connect to your Server (_but see also the note on dynamic DNS below_). You yourself have to connect to your own computer instead, since your computer runs the Server. Therefore **only you** need to connect to `127.0.0.1`.
 
 ## Dynamic DNS and why you will probably need it
 
-Most domestic Internet connections will change their IP address after a period (hours, days or weeks). To make it easier for people to connect to you, you may therefore also want set up a dynamic DNS address. You can do this on [the machine](https://www.online-tech-tips.com/computer-tips/ddns-dynamic-dns-service/) that you are running the Jamulus server on, or preferably your router [may support it](https://www.noip.com/support/knowledgebase/how-to-configure-ddns-in-router/).
+Most domestic Internet connections will change their IP address after a period (hours, days or weeks). To make it easier for people to connect to you, you may therefore also want set up a dynamic DNS address. You can do this on [the machine](https://www.online-tech-tips.com/computer-tips/ddns-dynamic-dns-service/) that you are running the Jamulus Server on, or preferably your router [may support it](https://www.noip.com/support/knowledgebase/how-to-configure-ddns-in-router/).
 
-Note also that your home router may also change the IP address of the machine that you are running your server on. In which case you may need either to give that machine a static IP in the router's DHCP configuration, or simply port forward to all the addresses in your LAN.
+Note also that your home router may also change the IP address of the machine that you are running your Server on. In which case you may need either to give that machine a static IP in the router's DHCP configuration, or simply port forward to all the addresses in your LAN.
 
-# Running a headless Linux server
+# Running a headless Linux Server
 
-Those wishing to run a server on a Linux cloud or other third party hosting platform should [read this guide](Server-Linux).   
+Those wishing to run a Server on a Linux cloud or other third party hosting platform should [read this guide](Server-Linux).
 
-# Backing up the server
+# Backing up the Server
 
-_Note that headless servers do not use `.ini` files. All configuration is given as command line options._
+_Note that headless Servers do not use `.ini` files. All configuration is given as command line options._
 
 {% include_relative Include-Backing-Up.md %}
 
@@ -242,7 +227,7 @@ For macOS, start a Terminal window and run Jamulus with the desired options like
  /Applications/Jamulus.app/Contents/MacOS/Jamulus --serverbindip 192.168.0.100
 ```
 
-**Note**: Command line options will set the server's defaults at startup. You can override them with their corresponding GUI controls while the server is running.
+**Note**: Command line options will set the Server's defaults at startup. You can override them with their corresponding GUI controls while the Server is running.
 
 {% include_relative Include-Server-Commands.md %}
 
@@ -253,6 +238,6 @@ For macOS, start a Terminal window and run Jamulus with the desired options like
 
 # Troubleshooting
 
-Various problems can arise when setting up servers, and we generally ecourage people to use other people's (public) servers at first to isolate any issues that may in fact be due to client configuration.
+Various problems can arise when setting up Servers, and we generally ecourage people to use other people's (public) Servers at first to isolate any issues that may in fact be due to client configuration.
 
 If you are having problems, [see this guide](Server-Troubleshooting).
diff --git a/wiki/en/Server-Linux.md b/wiki/en/Server-Linux.md
index 1277287a1..5b26b5599 100644
--- a/wiki/en/Server-Linux.md
+++ b/wiki/en/Server-Linux.md
@@ -9,29 +9,29 @@ permalink: "/wiki/Server-Linux"
 
 # Running a Headless Server
 
-The following is for running Jamulus as a "pure" server on **hardware without audio** (e.g. on a 3rd party/cloud host) and assumes Ubuntu/Debian distributions using systemd. 
+The following is for running Jamulus as a "pure" Server on **hardware without audio** (e.g. on a 3rd party/cloud host) and assumes Ubuntu/Debian distributions using systemd. 
 
-If you want to run a server on a Raspberry Pi, you will need to [compile from source](https://github.com/jamulussoftware/jamulus/blob/master/COMPILING.md). See also this [guide for Raspberry Pi](/kb/2020/03/28/Server-Rpi.html) maintained by Jamulus user fredsiva. 
+If you want to run a Server on a Raspberry Pi, you will need to [compile from source](https://github.com/jamulussoftware/jamulus/blob/master/COMPILING.md). See also this [guide for Raspberry Pi](/kb/2020/03/28/Server-Rpi.html) maintained by Jamulus user fredsiva. 
 
 1. Download the [latest headless .deb file]({{ site.download_root_link }}{{ site.download_file_names.deb-headless }})
 1. Update apt to make sure you have a current list of standard packages: `sudo apt update`
 1. Install the Jamulus package: `sudo apt install ./{{ site.download_file_names.deb-headless }}`
-1. Enable the headless server process via systemd: `sudo systemctl enable jamulus-headless`
-1. Add your desired [command line options](Running-a-Server#command-line-options) to the `ExecStart` line in the systemd service file in `/lib/systemd/system/jamulus-headless.service` (By default you will be running a private server).
-1. Reload the systemd files `sudo systemctl daemon-reload` and restart the headless server: `sudo systemctl restart jamulus-headless`
+1. Enable the headless Server process via systemd: `sudo systemctl enable jamulus-headless`
+1. Add your desired [command line options](Running-a-Server#command-line-options) to the `ExecStart` line in the systemd service file in `/lib/systemd/system/jamulus-headless.service` (By default you will be running an Unregistered Server).
+1. Reload the systemd files `sudo systemctl daemon-reload` and restart the headless Server: `sudo systemctl restart jamulus-headless`
 1. Check all is well with `systemctl status jamulus-headless` (hit `q` to get back to the command prompt).
 
 You may also be interested in downloading [this set of useful tools](https://github.com/jamulussoftware/jamulus/tree/master/tools) from the Jamulus repository (clone the Git repo and also call `git submodule update --init`).
 
 ## Notes
 
-You can control Jamulus with the `systemctl` command. For example, to stop the server cleanly:
+You can control Jamulus with the `systemctl` command. For example, to stop the Server cleanly:
 
 `sudo systemctl stop jamulus-headless`
 
-### Running in public mode
+### Running in Registered mode
 
-The following minimum setup is required to [run a public server](Running-a-Server#server-types):
+The following minimum setup is required to [run a Registered Server](Running-a-Server#server-types):
 
 ~~~
 jamulus --nogui --server \
@@ -41,7 +41,7 @@ jamulus --nogui --server \
 
 **Note**: Semicolon and newline characters are not allowed in `--serverinfo`
 
-Set your Directory (genre) server using the `--directoryserver` (`-e`) option as follows:
+Replace `genreServer:port` in the example above with one of the following options:
 
 
 | Genre |   Server address           |
@@ -54,6 +54,11 @@ Set your Directory (genre) server using the `--directoryserver` (`-e`) option as
 |**Genre Classical/Folk** |`classical.jamulus.io:22524`|
 |**Genre Choral/Barbershop** |`choral.jamulus.io:22724`|
 
+
+### Running as a Directory
+
+If you wish to run a [Custom Directory](Running-a-Server#3-custom-directory) please see [this guide](Custom-Directories).
+
 ### Viewing The Logs
 
 Jamulus will log to the system log file if you left the `StandardOutput=journal` setting in the unit file. 
@@ -65,23 +70,23 @@ To view the log, use `journalctl` (to exit press Ctrl-C). For example, to read t
 
 ### Upgrading
 
-To upgrade your server to a newer version, simply download a new .deb and re-install as step 3.
+To upgrade your Server to a newer version, simply download a new .deb and re-install as step 3.
 
 ### Recording
 
-When using the recording function with the `-R` command line option, if the server receives a SIGUSR1 signal during a re
-cording, it will start a new recording in a new directory. SIGUSR2 will toggle recording enabled on/off.
+When using the recording function with the `-R` command line option, if the Server receives a SIGUSR1 signal during a re
+cording, it will start a new recording in a new Directory. SIGUSR2 will toggle recording enabled on/off.
 
 To send these signals using systemd, create the following two `.service` files in `/etc/systemd/system`, calling them something appropriate (e.g. `newRecording-Jamulus-serv
 er.service`).
 
-**Note:** You will need to save recordings to a path _outside_ of the jamulus home directory, or remove `ProtectHome=true` from your systemd unit file (be aware that doing so is however a potential security risk).
+**Note:** You will need to save recordings to a path _outside_ of the jamulus home Directory, or remove `ProtectHome=true` from your systemd unit file (be aware that doing so is however a potential security risk).
 
 For turning recording on or off (depending on the current state):
 
 ~~~
  [Unit]
- Description=Toggle recording state of Jamulus server
+ Description=Toggle recording state of Jamulus Server
  Requisite=Jamulus-Server
 
  [Service]
@@ -93,7 +98,7 @@ For starting a new recording:
 
 ~~~
  [Unit]
- Description=Start a new recording on Jamulus server
+ Description=Start a new recording on Jamulus Server
  Requisite=Jamulus-Server
 
  [Service]
@@ -101,7 +106,7 @@ For starting a new recording:
  ExecStart=/bin/systemctl kill -s SIGUSR1 Jamulus-Server
 ~~~
 
-_Note: The Jamulus service name in the `ExecStart` line needs to be the same as the `.service` file name you created when setting systemd to control your Jamulus server. So in this example it would be `Jamulus-Server.service`_
+_Note: The Jamulus service name in the `ExecStart` line needs to be the same as the `.service` file name you created when setting systemd to control your Jamulus Server. So in this example it would be `Jamulus-Server.service`_
 
 Run `sudo systemctl daemon-reload` to register them for first use.
 
@@ -111,11 +116,11 @@ Now you can run these with the `service start` command, for example:
 
 You can see the result of these commands if you run `service jamulus status`, or by viewing the logs.
 
-## Making a server status page
+## Making a Server status page
 
-With the `-m` command line argument, server statistics can be generated to be put on a web page.
+With the `-m` command line argument, Server statistics can be generated to be put on a web page.
 
-Here is an example php script using the server status file to display the current server status on a html page (assuming the following command line argument to be used: `-m /var/www/stat1.dat`):
+Here is an example php script using the Server status file to display the current Server status on a html page (assuming the following command line argument to be used: `-m /var/www/stat1.dat`):
 
 ~~~
 <?php
diff --git a/wiki/en/Server-Troubleshooting.md b/wiki/en/Server-Troubleshooting.md
index 077f03a7a..df2910541 100644
--- a/wiki/en/Server-Troubleshooting.md
+++ b/wiki/en/Server-Troubleshooting.md
@@ -19,46 +19,34 @@ permalink: "/wiki/Server-Troubleshooting"
 
 </details>
 
-## Servers - Public
+## Servers - Registered 
 
-### Why doesn't my server show up in the list? Why isn't it registering?
+### Why doesn't my Server show up in the list? Why isn't it registering?
 
-If you are registered OK (you can [see it here](https://explorer.jamulus.io/)) and you or your friends can't see your server, you may need to wait, or start your client with the `--showallservers` option and try connecting from there ([see command line options](Software-Manual#command-line-options)) on how to start your client with a config option).
+If you are registered OK (you can [see it here](https://explorer.jamulus.io/)) and you or your friends can't see your Server, you may need to wait, or start your client with the `--showallservers` option and try connecting from there ([see command line options](Software-Manual#command-line-options)) on how to start your client with a config option). In some network configurations, you may also need to [port forward](Running-a-Server#port-forwarding) your router.
 
-If you are seeing a message that says the server is full, please [see this note](Running-a-Server#3-directory) on Directory Servers.
+If you are seeing a message that says the Server is full, you will need to wait until a slot becomes free.
 
-You can verify that your server is listed in the relevant genre by [checking it here](https://explorer.jamulus.io/).
+You can verify that your Server is listed in the relevant genre by [checking it here](https://explorer.jamulus.io/).
 
-## Servers - Private
+## Servers - Unregistered 
 
-### I'm running my client on the same machine/network as my server but I can't connect to it
+### I'm running my client on the same machine/network as my Server but I can't connect to it
 
-Connect your client to `127.0.0.1` (or `localhost` if that works for you). If you're running the client on a different machine to the server but on the same network, then connect to the _local network_ address of the server. Do not connect via the server's public (WAN) address.
+Connect your client to `127.0.0.1` (or `localhost` if that works for you). If you're running the client on a different machine to the Server but on the same network, then connect to the _local network_ address of the Server. Do not connect via the Server's public (WAN) address.
 
-### What address do I give to people so that they can connect to my server?
+### What address do I give to people so that they can connect to my Server?
 
-This should be your **public** IP address (find that with [Google](https://www.google.com/search?q=whatsmyip)). Connect your **own** Jamulus client to the **local** IP address of your server (127.0.0.1 if it's on the same machine as your client). Note that your public IP address can change - see the note on "dynamic DNS" in [this guide](Running-a-Server#dynamic-dns-and-why-you-will-probably-need-it).
+This should be your **public** IP address (find that with [Google](https://www.google.com/search?q=whatsmyip)). Connect your **own** Jamulus client to the **local** IP address of your Server (127.0.0.1 if it's on the same machine as your client). Note that your public IP address can change - see the note on "dynamic DNS" in [this guide](Running-a-Server#dynamic-dns-and-why-you-will-probably-need-it).
 
 ### What port numbers can I use?
 
-You can set your server to listen on a custom port with the `--port` option. If you do this, you will need to tell people which port to connect on. They will need to append the port number to the address of your server in the format `[serverAddress]:[portNumber]`.
+You can set your Server to listen on a custom port with the `--port` option. If you do this, you will need to tell people which port to connect on. They will need to append the port number to the address of your Server in the format `[serverAddress]:[portNumber]`.
 
-### Is a private server a direct server without contact to the Jamulus Directory Server?
+### Nobody can connect to my Server - but I can connect locally
 
-Yes. Please see [Server Types](Running-a-Server#server-types)
+Some ISPs are using techniques like [Address plus Port (A+P)](https://en.wikipedia.org/wiki/Address_plus_Port) or [Carrier-grade NAT (CGN)](https://en.wikipedia.org/wiki/Carrier-grade_NAT) to conserve address space. This makes it impossible to host services like Jamulus at home (and may mean you also cannot see Server lists in your client, or you may be missing [some specific Servers](https://sourceforge.net/p/llcon/discussion/server/thread/f72b293af0/)).
 
-### Can I convert my private server to being a public one?
+To detect if CGN is the issue, go to your router's configuration screen (typically, 192.168.X.X) and look at the WAN Status page. If your listed IPv4 address does not match with the address you see [here](https://ifconfig.me), then this means CGN may be enabled. Or if you experience problems such as being unable to [connect to Servers or an empty Server list](https://sourceforge.net/p/llcon/discussion/533517/thread/b3eea395c4/) this may also be an indicator that your ISP is the problem too.
 
-Yes. Simply check the "Make my Server Public" box in the server window and fill out the details. If you register your server, do not use port forwarding as it may prevent others using your server.
-
-### **_Headless Linux_**: I have created a server but it is joining the Directory Server and I don't want it to.
-
-To enable a private server, do not use the `--directoryserver` (`-e`) option when starting your server command line.
-
-### Nobody can connect to my server - but I can connect locally
-
-Some ISPs are using techniques like [Address plus Port (A+P)](https://en.wikipedia.org/wiki/Address_plus_Port) or [Carrier-grade NAT (CGN)](https://en.wikipedia.org/wiki/Carrier-grade_NAT) to conserve address space. This makes it impossible to host services like Jamulus at home (and may mean you also cannot see server lists in your client, or you may be missing [some specific servers](https://sourceforge.net/p/llcon/discussion/server/thread/f72b293af0/)).
-
-To detect if CGN is the issue, go to your router's configuration screen (typically, 192.168.X.X) and look at the WAN Status page. If your listed IPv4 address does not match with the address you see [here](https://ifconfig.me), then this means CGN may be enabled. Or if you experience problems such as being unable to [connect to servers or an empty server list](https://sourceforge.net/p/llcon/discussion/533517/thread/b3eea395c4/) this may also be an indicator that your ISP is the problem too.
-
-To fix the issue: if you are running a public server, try [port forwarding](Running-a-Server#port-forwarding). If you are running a private server and are port forwarding already, contact your ISP support and request them to remove you from CGN and assign you a real WAN IP address because you want to host a server. If CGN is not the issue, you may need to ask your ISP to give you a WAN IP address (or fixed one to avoid using DDNS, if possible). If all else fails, consider hosting on a cloud platform (some providers do free trial periods).
+To fix the issue: if you are running a registered Server, try [port forwarding](Running-a-Server#port-forwarding). If you are running an unregistered Server and are port forwarding already, contact your ISP support and request them to remove you from CGN and assign you a real WAN IP address because you want to host a Server. If CGN is not the issue, you may need to ask your ISP to give you a WAN IP address (or fixed one to avoid using DDNS, if possible). If all else fails, consider hosting on a cloud platform (some providers do free trial periods).
diff --git a/wiki/en/Software-Manual.md b/wiki/en/Software-Manual.md
index 8a99da62a..f7cde64dc 100644
--- a/wiki/en/Software-Manual.md
+++ b/wiki/en/Software-Manual.md
@@ -7,7 +7,7 @@ permalink: "/wiki/Software-Manual"
 # Jamulus User Manual
  {:.no_toc}
 
-This manual documents the Jamulus client application for use by musicians and singers using the software to connect to a server.
+This manual documents the Jamulus client application for use by musicians and singers using the software to connect to a Server.
 
 <details markdown="1">
 
@@ -22,25 +22,25 @@ This manual documents the Jamulus client application for use by musicians and si
 
 
 <figure>
-	<img src="{{site.url}}/assets/img/en-screenshots/main-screen-medium.png" style="border: 5px solid grey;" loading="lazy" alt="Image of the Jamulus main window">
+	<img src="{% include img/en-screenshots/main-screen-medium.inc %}" style="border: 5px solid grey;" loading="lazy" alt="Image of the Jamulus main window">
 	<figcaption>Your local mix when connected to a Server</figcaption>
 </figure>
 
 ## Ping, Delay and Jitter
 
-**Ping** shows your network latency in milliseconds, the lower the better. Ping time contributes to overall delay (see below). The most probable cause of a high ping is that your distance to the server is too large.   
+**Ping** shows your network latency in milliseconds, the lower the better. Ping time contributes to overall delay (see below). The most probable cause of a high ping is that your distance to the Server is too large.   
 
 **Delay** shows overall latency calculated from the current ping time and the delay introduced by the current audio buffer settings. The LEDs show the status of this as:
 
-<figure><img src="{{site.url}}/assets/img/en-screenshots/led-green.png" style="float:left; margin-right:10px;" loading="lazy" alt="Image of a green LED symbol"></figure>
+<figure><img src="{% include img/en-screenshots/led-green.inc %}" style="float:left; margin-right:10px;" loading="lazy" alt="Image of a green LED symbol"></figure>
 
 **Green** - The delay is perfect for a jam session
 
-<figure><img src="{{site.url}}/assets/img/en-screenshots/led-yellow.png" style="float:left; margin-right:10px;" loading="lazy" alt="Image of a yellow LED symbol"></figure>
+<figure><img src="{% include img/en-screenshots/led-yellow.inc %}" style="float:left; margin-right:10px;" loading="lazy" alt="Image of a yellow LED symbol"></figure>
 
 **Yellow** - A session is still possible but it may be harder to play
 
-<figure><img src="{{site.url}}/assets/img/en-screenshots/led-red.png" style="float:left; margin-right:10px; clear: both;" loading="lazy" alt="Image of a green red symbol"></figure>
+<figure><img src="{% include img/en-screenshots/led-red.inc %}" style="float:left; margin-right:10px; clear: both;" loading="lazy" alt="Image of a green red symbol"></figure>
 
 **Red** - The delay is too large for jamming
 
@@ -49,7 +49,7 @@ This manual documents the Jamulus client application for use by musicians and si
 - The network jitter buffer is not large enough for the current network/audio interface jitter.
 - The sound card's buffer delay (buffer size) is too small (see Settings window).
 - The upload or download stream rate is too high for your internet bandwidth.
-- The CPU of the client or server is at 100%.
+- The CPU of the client or Server is at 100%.
 
 ## Input
 
@@ -58,7 +58,7 @@ Make sure not to clip the input signal to avoid distortions of your sound (the L
 
 ## Mute Myself button
 
-Cuts your audio stream to the server so that you will be able to hear yourself and see your own input levels, but other musicians will not. Be aware that other musicians will not know if you have muted yourself.
+Cuts your audio stream to the Server so that you will be able to hear yourself and see your own input levels, but other musicians will not. Be aware that other musicians will not know if you have muted yourself.
 
 ## Reverb effect
 
@@ -75,27 +75,29 @@ open automatically for all clients.
 
 ## Connect/disconnect button
 
-Opens a dialogue where you can select a server to connect to. If you are connected,
+Opens a dialogue where you can select a Server to connect to. If you are connected,
 pressing this button will end the session.
 
-<figure><img src="{{site.url}}/assets/img/en-screenshots/connection-setup-window.png" style="border: 5px solid grey;" loading="lazy" alt="Image of a server connection window"></figure>
+<figure><img src="{% include img/en-screenshots/connection-setup-window.inc %}" style="border: 5px solid grey;" loading="lazy" alt="Screenshot of the Server connection window"></figure>
 
-The Connection Setup window shows a list of available servers together with the number of occupants and the maximum number supported. Server operators register their servers on lists (mostly defined by genre, though some could be location-specific or for all genres). Use the List dropdown to select a genre, click on the server you want to join and press the Connect button to connect to it. Alternatively, double-click on the server name. Permanent servers (those that have been listed for longer than 24 hours) are shown in bold.
+The Connect window shows a list of available Servers together with the number of occupants and the maximum number supported. Server operators register their Servers on lists (mostly defined by genre, though some could be location-specific or for all genres). 
 
-You can filter the list by server name or location. To list only occupied servers, enter a "#" character.
+Use the List dropdown to select a genre, click on the Server you want to join and press the Connect button to connect to it. Alternatively, double-click on the Server name. Permanent Servers (those that have been listed for longer than 24 hours) are shown in bold.
 
-If you know the IP address or URL of a private server, you can connect to it using the Server Name/Address
-field. An optional port number can be added after the address using a colon as a separator, e.g,
-`jamulus.example.com:22124` (Note that IPv6 addresses must be entirely enclosed in square brackets). The field will also show a list of the most recently used server addresses.
+You can filter the list by Server name or location using the Filter field. To list only occupied Servers, enter a "#" character.
+
+If you know the address of a Server, you can connect to it using the Server Address field. A port number will also be needed if the Server is not running on the default port 22124 e.g,`jamulus.example.com:22124` (Note that IPv6 addresses must be entirely enclosed in square brackets, e.g. `[fe80::7285:c2ff:fe80:f4ae]:22345`).
+
+For more information about Server types, see [the Server Administration guide](Running-a-Server#server-types).
 
 ## Server audio mixer
 
-<figure><img src="{{site.url}}/assets/img/en-screenshots/mixer-channles.png" style="float:left; margin-right:10px; margin-bottom:20px; border: 5px solid grey;" loading="lazy" alt="Image of a pair of server mixer controls"></figure>
+<figure><img src="{% include img/en-screenshots/mixer-channels.inc %}" style="float:left; margin-right:10px; margin-bottom:20px; border: 5px solid grey;" loading="lazy" alt="Image of a pair of Server mixer controls"></figure>
 
-The audio mixer screen shows each user connected to the server (including yourself).
+The audio mixer screen shows each user connected to the Server (including yourself).
 The faders allow you to adjust the level of what you hear without affecting what others hear.
 
-The VU meter shows the input level at the server - that is, the sound being sent.
+The VU meter shows the input level at the Server - that is, the sound being sent.
 
 If you have set your Audio Channel to Stereo or Stereo Out in your Settings, you will also see a pan control (shift-click to reset).
 
@@ -107,9 +109,9 @@ Defines a group of audio channels. Moving the fader of one member of the group m
 
 ### Mute button
 
-Prevents users being heard in your local mix. Be aware that when you mute someone, they will see a "muted" icon above your fader to indicate that you cannot hear them. Note also that you will continue to see their VU meters moving if sound from the muted user is reaching the server. Your fader position for them is also unaffected. 
+Prevents users being heard in your local mix. Be aware that when you mute someone, they will see a "muted" icon above your fader to indicate that you cannot hear them. Note also that you will continue to see their VU meters moving if sound from the muted user is reaching the Server. Your fader position for them is also unaffected. 
 
-Note that muting your **own** channel simply means you will not hear your signal from the server (and is not advised as it can lead to you becoming out of time with other players). This is therefore not the same as using "[Mute Myself](#mute-myself-button)".
+Note that muting your **own** channel simply means you will not hear your signal from the Server (and is not advised as it can lead to you becoming out of time with other players). This is therefore not the same as using "[Mute Myself](#mute-myself-button)".
 
 ### Solo button
 
@@ -119,20 +121,20 @@ Users are listed left to right in the order that they connect. You can change th
 
 You can group users together using the "group" toggle. Moving the fader of any member of the group will move the other faders in that group by the same amount. You can isolate a channel from the group temporarily with shift-click-drag.
 
-If the server operator has enabled recording, you will see a message above the mixer showing that you are being recorded.
+If the Server operator has enabled recording, you will see a message above the mixer showing that you are being recorded.
 
 # Settings
 
 ## My Profile
 
 From the Settings menu, select "My Profile..." to set your Alias/Name
-which is displayed below your fader in the server audio mixer board.
+which is displayed below your fader in the Server audio mixer board.
 
-<figure><img src="{{site.url}}/assets/img/en-screenshots/settings-profile.png" style="border: 5px solid grey;" loading="lazy" alt="Image of a profile window"></figure>
+<figure><img src="{% include img/en-screenshots/settings-profile.inc %}" style="border: 5px solid grey;" loading="lazy" alt="Image of a profile window"></figure>
 
 If you set an instrument and/or country, icons for these selections will also be shown below your fader. The skill setting changes the background colour of the fader tag and the city entry shows up in the tool tip of the fader tag:
 
-<figure><img src="{{site.url}}/assets/img/en-screenshots/profile-tooltip.png" style="width:30%;" loading="lazy" alt="Image of a tooltip showing profile information"></figure>
+<figure><img src="{% include img/en-screenshots/profile-tooltip.inc %}" style="width:30%;" loading="lazy" alt="Image of a tooltip showing profile information"></figure>
 
 ### Skin
 
@@ -140,11 +142,11 @@ This applies a skin to the main window, some of which are designed to accommodat
 
 ### Mixer rows
 
-This sets the number of rows displayed in the server audio mixer, for use with larger ensembles.
+This sets the number of rows displayed in the Server audio mixer, for use with larger ensembles.
 
 ## Audio/Network Setup
 
-<figure><img src="{{site.url}}/assets/img/en-screenshots/settings-network.png" style="border: 5px solid grey;" loading="lazy" alt="Image of audio/network settings window"></figure>
+<figure><img src="{% include img/en-screenshots/settings-network.inc %}" style="border: 5px solid grey;" loading="lazy" alt="Image of audio/network settings window"></figure>
 
 ### Device
 
@@ -153,7 +155,7 @@ driver is not valid an error message is shown and the previous valid driver is s
 
 ### Input/output channel mapping
 
-<figure><img src="{{site.url}}/assets/img/en-screenshots/channel-mapping.png" style="float:left; margin-right:10px; margin-bottom:20px;" loading="lazy" alt="Image of Input and output channel mapping"></figure>
+<figure><img src="{% include img/en-screenshots/channel-mapping.inc %}" style="float:left; margin-right:10px; margin-bottom:20px;" loading="lazy" alt="Image of Input and output channel mapping"></figure>
 
 If the selected sound card device offers more than one input or output channel, the _Input Channel Mapping
 and Output Channel Mapping_ settings are visible. For each Jamulus input/output channel (left and right channel)
@@ -161,7 +163,7 @@ a different actual sound card channel can be selected.
 
 ### Audio channels
 
-Selects the number of audio channels to be used for communication between client and server. 
+Selects the number of audio channels to be used for communication between client and Server. 
 
 **Note**: It is preferable to run separate client instances per voice/instrument, with each client given its own ini file, rather than using this built-in mono pair to stereo mixer.
 
@@ -169,8 +171,8 @@ There are three modes available:
 
 **Mono** and **Stereo** modes use one and two audio channels respectively.
 
-**Mono-in/Stereo-out**: The audio signal sent to the server is mono but the return signal is stereo. This is useful if the sound card has the instrument on one input channel and the microphone on the other. In that case
-the two input signals can be mixed to one mono channel but the server mix is heard in stereo.
+**Mono-in/Stereo-out**: The audio signal sent to the Server is mono but the return signal is stereo. This is useful if the sound card has the instrument on one input channel and the microphone on the other. In that case
+the two input signals can be mixed to one mono channel but the Server mix is heard in stereo.
 
 Enabling stereo mode will increase your stream's data rate. Make sure your upload rate does
 not exceed the available upload speed of your internet connection.
@@ -208,14 +210,14 @@ The jitter buffer compensates for network and sound card timing jitters. The siz
 therefore influences the quality of the audio stream (how many dropouts occur) and the overall delay
 (the longer the buffer, the higher the delay).
 
-You can set the jitter buffer size manually for your local client and the remote server. For the local jitter
+You can set the jitter buffer size manually for your local client and the remote Server. For the local jitter
 buffer, dropouts in the audio stream are indicated by the light below the jitter buffer size faders.
 If the light turns to red, a buffer overrun/underrun has taken place and the audio stream is interrupted.
 
 The jitter buffer setting is therefore a trade-off between audio quality and overall delay.
 
 If the Auto setting is enabled, the jitter buffers
-of your local client and the remote server are set automatically based on measurements of the network and sound card
+of your local client and the remote Server are set automatically based on measurements of the network and sound card
 timing jitter. If the Auto check is enabled, the jitter buffer size faders are disabled (they cannot be moved with the mouse).
 
 ### Enable small network buffers
@@ -230,17 +232,17 @@ rate is not higher than your available internet upload speed (check this with a
 
 ## Advanced Setup
 
-<figure><img src="{{site.url}}/assets/img/en-screenshots/settings-advanced.png" style="border: 5px solid grey;" loading="lazy" alt="Image of advanced settings window"></figure>
+<figure><img src="{% include img/en-screenshots/settings-advanced.inc %}" style="border: 5px solid grey;" loading="lazy" alt="Image of advanced settings window"></figure>
 
-### Custom directory server address
+### Custom Directory Server address
 
-Leave this blank unless you need to enter the address of a directory server other than the default.
+Leave this blank unless you need to enter the address of a Directory Server other than the default.
 
 ### New Client Level
 
 This setting defines the fader level of a newly connected client in percent. If a new user connects
-to the current server, they will get the specified initial fader level if no other fader level from a previous connection of
-that user was already stored. You can set all users in an occupied server to this level using Edit > "Set All Faders to New Client Level".
+to the current Server, they will get the specified initial fader level if no other fader level from a previous connection of
+that user was already stored. You can set all users in an occupied Server to this level using Edit > "Set All Faders to New Client Level".
 
 ### Input Boost
 
@@ -248,7 +250,7 @@ Increases the gain from your device. Use this if your device delivers a gain tha
 
 ### Feedback Protection
 
-Attempts to detect audio feedback loops or loud noise in the first three seconds after you connected to a server. Once detected, this feature will show a message and activate the "Mute Myself" button to mute you in your own mix. 
+Attempts to detect audio feedback loops or loud noise in the first three seconds after you connected to a Server. Once detected, this feature will show a message and activate the "Mute Myself" button to mute you in your own mix. 
 
 ### Input Balance
 
diff --git a/wiki/en/Tips-Tricks-More.md b/wiki/en/Tips-Tricks-More.md
index 9fe17ed62..e7e5d209c 100644
--- a/wiki/en/Tips-Tricks-More.md
+++ b/wiki/en/Tips-Tricks-More.md
@@ -33,15 +33,15 @@ Jamulus user [Rob Durkin](https://sourceforge.net/u/bentwrench/profile/) has wri
 
 ## Remote management of recordings
 
-Jamulus user [vdellamea](https://github.com/vdellamea) has written a [web-based remote tool](https://github.com/vdellamea/jamulus-server-remote) for starting and stopping recordings on Linux servers, allowing you to then download them from your browser. See also [Jamulus Jam Exporter](https://github.com/pljones/jamulus-jamexporter) by [pljones](https://github.com/pljones), which also includes a server recording recovery script.
+Jamulus user [vdellamea](https://github.com/vdellamea) has written a [web-based remote tool](https://github.com/vdellamea/jamulus-server-remote) for starting and stopping recordings on Linux Servers, allowing you to then download them from your browser. See also [Jamulus Jam Exporter](https://github.com/pljones/jamulus-jamexporter) by [pljones](https://github.com/pljones), which also includes a Server recording recovery script.
 
 ## Sharing song/chord sheets
 
 Jamulus user [BTDT](https://sourceforge.net/u/btdt/profile/) has written a system called [305keepers](https://github.com/keepers305/Song-Sheet-Sharing-Web-Pages), a web application that allows a "Jam leader" to push song sheets (in PDF format) to "Jammers" in real time using standard web browsers.
 
-## Converting a public server to a private one on the fly
+## Converting a public Server to a private one on the fly
 
-You can run a public server long enough for your band to connect, then go private by simply unchecking the 'Make my server Public' box in the server GUI. Your band mates will still be connected to the server until they disconnect. (Thanks to [David Savinkoff](https://github.com/DavidSavinkoff) for this tip!)
+You can run a public Server long enough for your band to connect, then go private by simply unchecking the 'Make my Server Public' box in the Server GUI. Your band mates will still be connected to the Server until they disconnect. (Thanks to [David Savinkoff](https://github.com/DavidSavinkoff) for this tip!)
 
 ## Jamulus client Linux start script
 
@@ -49,7 +49,7 @@ Here's a Linux start script for Jamulus using an old Audigy4 sound card, the lar
 
 This script therefore includes the most important audio fader settings. The second part of the script deals with the JACK connections. I use Guitarix as my guitar effect processor which I plug in in the JACK audio path.
 
-Finally I start Jamulus automatically connecting to the directory server.
+Finally I start Jamulus automatically connecting to the Directory Server.
 
 Here is the script: