diff --git a/wiki/airsonic-advanced.md b/wiki/airsonic-advanced.md
index 55af884..cac60cd 100644
--- a/wiki/airsonic-advanced.md
+++ b/wiki/airsonic-advanced.md
@@ -6,12 +6,12 @@ a free and open-source personal media streamer mainly used for
 It is a more modern implementation of [Airsonic](./airsonic.md) which in turn
 is a fork of [Subsonic](./subsonic.md).
 
-## Server
+## Setup
 
-A server can be setup via docker with the
+The software can be setup via docker with the
 [linuxserver image](./docker-images/linuxserver_-_airsonic-advanced.md).
 
-### Setup
+### Initial configuration
 
 The administration username after installation is `admin`.
 The password is `admin` too.
@@ -32,7 +32,13 @@ Select `Add credentials` and select `encrypted-AES-GCM` as encoder.
 Type in the Airsonic password and confirm it and create the new credential.
 Log in with the clients now works correctly.
 
-### Scrobbling with Last.fm
+### Clients
+
+It is possible to use many different clients because the server is compatible
+with all the Subsonic clients.
+These can be found in the [Subsonic entry](./subsonic.md#clients).
+
+## Scrobbling with Last.fm
 
 To set up the scrobbling of music with Last.fm check
 `Register what I'm playing at Last.fm` in the personal tab of the settings.
@@ -41,9 +47,3 @@ tab.
 Select `Add credentials`, set the App to Last.fm and put in the Last.fm
 password.
 After the creation of credentials in this way the music will be scrobbled.
-
-## Clients
-
-It is possible to use many different clients because the server is compatible
-with all the Subsonic clients.
-These can be found in the [Subsonic entry](./subsonic.md#clients).
diff --git a/wiki/airsonic.md b/wiki/airsonic.md
index c9e1c8b..b7c0c7b 100644
--- a/wiki/airsonic.md
+++ b/wiki/airsonic.md
@@ -7,12 +7,12 @@ Airsonic is not maintained anymore and therefore deprecated.
 A more modern implementation of it is
 [Airsonic-Advanced](./airsonic-advanced.md).
 
-## Server
+## Set up
 
-A server can be setup via docker with the
+The software can be setup via docker with the
 [linuxserver image](./docker-images/linuxserver_-_airsonic.md).
 
-## Clients
+### Clients
 
 It is possible to use many different clients because the server is compatible
 with all the Subsonic clients.
diff --git a/wiki/bibliogram.md b/wiki/bibliogram.md
index 8a9db18..e4d5106 100644
--- a/wiki/bibliogram.md
+++ b/wiki/bibliogram.md
@@ -6,9 +6,10 @@ Please note that Bibliogram is now officially discontinued according to
 [the developer](https://cadence.moe/blog/2022-09-01-discontinuing-bibliogram)
 as it is not possible anymore to show user pages but only single posts.
 
-## Server
+## Setup
 
-A server can be setup via docker with the [cloudrac3r image](./docker-images/cloudrac3r_-_bibliogram.md).
+The software can be setup via docker with the
+[cloudrac3r image](./docker-images/cloudrac3r_-_bibliogram.md).
 
 ## Automatic redirect from Instagram
 
diff --git a/wiki/bind.md b/wiki/bind.md
index 1e93545..f314f76 100644
--- a/wiki/bind.md
+++ b/wiki/bind.md
@@ -3,12 +3,12 @@
 [Bind](https://www.isc.org/bind/) is an open-source software suite for
 interacting with the [DNS](./dns.md).
 
-## Server
+## Setup
 
-A server can be setup via docker with the
+The software can be setup via docker with the
 [ventz image](./docker-images/ventz_-_bind.md).
 
-## Setup a local DNS server with forwarding
+## Configure Local DNS server with forwarding
 
 After setting up the server.
 Look into the file `/etc/bind/named.conf.options`.
@@ -45,7 +45,7 @@ options {
 };
 ```
 
-## Creating local domains
+## Configure local domains
 
 This section explains how to add local domains for local systems.
 It is explicitly compatible with the
diff --git a/wiki/cups.md b/wiki/cups.md
index f4374e8..081125b 100644
--- a/wiki/cups.md
+++ b/wiki/cups.md
@@ -1,15 +1,23 @@
-# Cups
+# CUPS
 
-## Server
+[CUPS](https://www.cups.org/) is a open source printing software developed for
+unix and unix-like systems.
 
-A server can be setup via docker with the [linuxserver image](./docker-images/linuxserver_-_airsonic.md).
+## Setup
 
-## Client
+The software can be setup via docker with the
+[linuxserver image](./docker-images/linuxserver_-_airsonic.md).
+Additionally to this a client is needed on the system that need access to the
+server software.
+
+### Client
+
+To use CUPS an additional client software is needed.
 
 For Linux computers follow these instructions:
 
-- Install the cups-client package (in Arch Linux it is included in `cups`)
+- Install the CUPS-client package (in Arch Linux it is included in `cups`)
 - Edit `/etc/cups/client.conf` and insert `ServerName <ip to print-server>:631`
-- Restart the cups service: `systemctl restart cups`
+- Restart the CUPS service: `systemctl restart cups`
 - Test connectivity: `lpstat -r`
 - Check the detected printers with: `lpstat -v`
diff --git a/wiki/file-synchronization.md b/wiki/file-synchronization.md
index 535b554..9b93c9c 100644
--- a/wiki/file-synchronization.md
+++ b/wiki/file-synchronization.md
@@ -22,5 +22,5 @@ this is probably a more
 safe way to "host" files.
 There is no single server as point of attack with all your data.
 
-- Syncthing is a free and open-source peer-to-peer file
+- [Syncthing](./syncthing.md) is a free and open-source peer-to-peer file
   synchronization tool that can be dockerized.
diff --git a/wiki/flac_(codec).md b/wiki/flac_(codec).md
index 5229bdf..5da5369 100644
--- a/wiki/flac_(codec).md
+++ b/wiki/flac_(codec).md
@@ -2,7 +2,7 @@
 
 This article describes the `flac` codec.
 For the linux `flac` package see the
-[flac package entry](./linux/flac_(package).md)
+[flac package entry](./linux/flac_(package).md.
 
 `flac` - short for Free Lossless Audio Codec - is a [audio](./audio.md) codec
 without compression losses.
diff --git a/wiki/git.md b/wiki/git.md
index 0924c6e..f6aea64 100644
--- a/wiki/git.md
+++ b/wiki/git.md
@@ -9,10 +9,10 @@ The Client is pretty simple to understand.
 With only a handfull of commands you should be able to get your versioning going.
 For servers with web interfaces there are different cli tools to control it
 without using a browser.
+For most linux distributions it is packaged with the `git` package
 
-- Arch based systems: `pacman -S git`
-
-There is also an interactive [fixup guide by Seth Robertson](https://sethrobertson.github.io/GitFixUm/fixup.html).
+There is also an interactive
+[fixup guide by Seth Robertson](https://sethrobertson.github.io/GitFixUm/fixup.html).
 
 ## Server with web interface
 
diff --git a/wiki/gitea.md b/wiki/gitea.md
index 68c32e1..04c1e66 100644
--- a/wiki/gitea.md
+++ b/wiki/gitea.md
@@ -3,11 +3,14 @@
 Gitea is a selfhostable git server with a web interface.
 It is similar to Github but opensource.
 
-## Server
+## Setup
 
-A server can be setup via docker with the [gitea image](./docker-images/gitea_-_gitea.md).
+The software can be setup via docker with the
+[gitea image](./docker-images/gitea_-_gitea.md).
+Additionally to this a client is needed on the system that need access to the
+server software.
 
-## Client
+### Client
 
 If you want to use all features in addition to the basic client described in
 [git.md](git.md) but don't want to use the web-interface all the time you can get
diff --git a/wiki/golinks.md b/wiki/golinks.md
index b728e90..8308df3 100644
--- a/wiki/golinks.md
+++ b/wiki/golinks.md
@@ -3,15 +3,14 @@
 [Golinks](https://github.com/prologic/golinks) is a web app that can create and
 use bookmarks and run different searches by prefixes.
 
-## Server
+## Setup
 
-A server can be setup via docker with the [prologic image](./docker-images/prologic_-_golinks.md).
+The software can be setup via docker with the
+[prologic image](./docker-images/prologic_-_golinks.md).
 
-## Client
-
-### Firefox
+### Client: Firefox
 
 Add Golinks as a new search engine for firefox and set it as main search for the
-address bar as described in [the Firefox article](./firefox.md).
+address bar as described in [the Firefox article](./firefox.md#add-a-new-search-engine).
 Follow the add-on part of the guide and put searx with
 `<url to golinks instance>/?q=%s` as search string.
diff --git a/wiki/invidious.md b/wiki/invidious.md
index cdfe3a7..2485c5f 100644
--- a/wiki/invidious.md
+++ b/wiki/invidious.md
@@ -4,9 +4,10 @@
 YouTube.
 It includes locally stored subscription management.
 
-## Server
+## Setup
 
-A server can be setup via docker with the [iv-org image](./docker-images/iv-org_-_invidious.md).
+The software can be setup via docker with the
+[iv-org image](./docker-images/iv-org_-_invidious.md).
 
 ## Automatic redirect from YouTube
 
diff --git a/wiki/jellyfin.md b/wiki/jellyfin.md
index 45b2a03..93489f3 100644
--- a/wiki/jellyfin.md
+++ b/wiki/jellyfin.md
@@ -3,9 +3,9 @@
 [Jellyfin](https://jellyfin.ord) is a suite for multimedia streaming.
 It includes a web-interface and is mainly used for [video data](./video.md).
 
-## Server
+## Setup
 
-A server can be setup via docker with the
+The software can be setup via docker with the
 [linuxserver image](./docker-images/linuxserver_-_jellyfin.md).
 
 ## Add IP-TV
diff --git a/wiki/libreddit.md b/wiki/libreddit.md
index f61a87e..0450a36 100644
--- a/wiki/libreddit.md
+++ b/wiki/libreddit.md
@@ -3,9 +3,10 @@
 [LibReddit](https://github.com/spikecodes/libreddit) is an alternative frontend for
 Reddit.
 
-## Server
+## Setup
 
-A server can be setup via docker with the [spikecodes image](./docker-images/spikecodes_-_libreddit.md).
+The software can be setup via docker with the
+[spikecodes image](./docker-images/spikecodes_-_libreddit.md).
 
 ## Automatic redirect from Reddit
 
diff --git a/wiki/linkding.md b/wiki/linkding.md
index d671995..3d18ea8 100644
--- a/wiki/linkding.md
+++ b/wiki/linkding.md
@@ -3,10 +3,10 @@
 [Linkding](https://github.com/sissbruecker/linkding) is a self-hostable
 bookmarking and archiving service.
 
-## Server
+## The software
 
-A server can be setup via docker with the
-[image by sissbrueckner](./docker-images/sissbrueckner_-_linkding.md)
+The software can be setup via docker with the
+[image by sissbrueckner](./docker-images/sissbrueckner_-_linkding.md).
 
 ## Firefox add-on
 
diff --git a/wiki/mail.md b/wiki/mail.md
index 4490a8e..e1de2af 100644
--- a/wiki/mail.md
+++ b/wiki/mail.md
@@ -6,7 +6,8 @@ Nevertheless there are some really nice pieces of software to check out.
 
 ## Server
 
-If you want to host your own mail-server there are solutions with and without interfaces.
+If you want to host your own mail-server there are solutions with and without
+interfaces.
 
 - [Dovecot](./docker-images/tvial_-_docker-mailserver.md) is a simple dockerized
   mail server that has no interface.
diff --git a/wiki/matrix.md b/wiki/matrix.md
index 0d201c4..386d6d8 100644
--- a/wiki/matrix.md
+++ b/wiki/matrix.md
@@ -3,9 +3,9 @@
 [Matrix](https://matrix.org/) is an open network for secure, decentralized
 communication.
 
-## Docker setup
+## Setup
 
-The matrix server can be a complex setup of servers and services.
+The matrix server is a complex setup of servers and services.
 Please note that this configuration is a composition of docker images.
 Therefore a shared `docker-compose.yml` file is used.
 This setup guide follows a modified version of the
@@ -195,12 +195,6 @@ You should see a green sign that indicates success.
 If one of these does not work (but synapse works) your nginx configuration is
 not correctly set up.
 
-## Additional Features
-
-Your done with the most basic setup for your Matrix Homeserver to work properly
-with federation.
-All following sections will add features to it.
-
 ### Element web client
 
 The docker-image used for the web client can be found in the
diff --git a/wiki/nextcloud.md b/wiki/nextcloud.md
index a4adb91..85f3784 100644
--- a/wiki/nextcloud.md
+++ b/wiki/nextcloud.md
@@ -2,9 +2,10 @@
 
 NextCloud is a free and open source client-server cloud-service.
 
-## Server
+## Setup
 
-A server can be setup via docker with the [nextcloud image](./docker-images/nextcloud.md).
+The software can be setup via docker with the
+[nextcloud image](./docker-images/nextcloud.md).
 
 When using NextCloud with a specific nginx configuration you have to append
 `'overwriteprotocol' => 'https',` to your `config/config.html`.
diff --git a/wiki/nginx.md b/wiki/nginx.md
index f2309d8..81b77a1 100644
--- a/wiki/nginx.md
+++ b/wiki/nginx.md
@@ -3,9 +3,9 @@
 [nginx](https://www.nginx.com/) is a web server that can be used as
 [reverse proxy](./reverse-proxy.md).
 
-## Server
+## Setup
 
-A server can be setup via docker with a terminal user interface program for
+The software can be setup via docker with a terminal user interface program for
 nginx and certbot, which is called nginx-certbot-docker-tui or short ncdt.
 
 Alternatively the standalone [nginx image](./docker-images/nginx.md) can be
diff --git a/wiki/nitter.md b/wiki/nitter.md
index 839c6fa..1cef059 100644
--- a/wiki/nitter.md
+++ b/wiki/nitter.md
@@ -3,9 +3,10 @@
 [Nitter](https://github.com/zedeus/nitter) is an alternative frontend for
 Twitter.
 
-## Server
+## Setup
 
-A server can be setup via docker with the [zedeus image](./docker-images/zedeus_-_nitter.md).
+The software can be setup via docker with the
+[zedeus image](./docker-images/zedeus_-_nitter.md).
 
 ## Automatic redirect from Twitter
 
diff --git a/wiki/owncloud.md b/wiki/owncloud.md
index 7e0567f..8839676 100644
--- a/wiki/owncloud.md
+++ b/wiki/owncloud.md
@@ -2,9 +2,10 @@
 
 ownCloud is a free client-server cloud-service.
 
-## Server
+## Setup
 
-A server can be setup via docker with the [owncloud image](./docker-images/owncloud.md).
+The software can be setup via docker with the
+[owncloud image](./docker-images/owncloud.md).
 
 ## Error handling
 
diff --git a/wiki/peertube.md b/wiki/peertube.md
index 0bfb521..d75bf9a 100644
--- a/wiki/peertube.md
+++ b/wiki/peertube.md
@@ -3,7 +3,7 @@
 [PeerTube](https://joinpeertube.org/) is a free and decentralized video
 platform using WebTorrent.
 
-## Server
+## Setup
 
-A server can be setup via docker with the
+The software can be setup via docker with the
 [chocobozzz image](./docker-images/chocobozzz_-_peertube.md).
diff --git a/wiki/portainer.md b/wiki/portainer.md
index 18d1f4c..fd5a03d 100644
--- a/wiki/portainer.md
+++ b/wiki/portainer.md
@@ -1,9 +1,14 @@
 # Portainer
 
-## Server
+[Portainer](https://www.portainer.io/) is a Kubernetes management platform that
+also works with [Docker](./docker.md).
 
-A server can be setup via docker with the [portainer image](./docker-images/portainer_-_portainer.md).
+## Setup
 
-## Agent
+The software can be setup via Docker with the
+[portainer image](./docker-images/portainer_-_portainer.md).
 
-An agent can be setup via docker with the [portainer image](./docker-images/portainer_-_agent.md).
+## Configure an agent
+
+An agent is a cluster of Docker API proxies
+An agent can be setup via Docker with the [portainer image](./docker-images/portainer_-_agent.md).
diff --git a/wiki/searx.md b/wiki/searx.md
index cf51f3c..db30484 100644
--- a/wiki/searx.md
+++ b/wiki/searx.md
@@ -2,9 +2,10 @@
 
 [Searx](https://searx.me) is a free metasearch engine.
 
-## Server
+## Setup
 
-A server can be setup via docker with the [searx image](./docker-images/searx_-_searx.md).
+The software can be setup via Docker with the
+[searx image](./docker-images/searx_-_searx.md).
 
 ## Adding to Firefox
 
diff --git a/wiki/syncthing.md b/wiki/syncthing.md
new file mode 100644
index 0000000..11bbceb
--- /dev/null
+++ b/wiki/syncthing.md
@@ -0,0 +1,10 @@
+# Syncthing
+
+[Syncthing](https://syncthing.net/) is a continuous file synchronization
+program.
+The Software synchronizes files between multiple devices directly.
+
+## Setup
+
+The software can be setup via Docker with the
+[linuxserver image](./docker-images/linuxserver_-_syncthing.md).
diff --git a/wiki/synctube.md b/wiki/synctube.md
index 1b6b94c..3c4f980 100644
--- a/wiki/synctube.md
+++ b/wiki/synctube.md
@@ -3,6 +3,7 @@
 [SyncTube](https://github.com/RblSb/SyncTube) is open source software to view
 videos in sync with other people.
 
-## Server
+## Setup
 
-A server can be setup via docker with the [rblsb image](./docker-images/rblsb_-_synctube.md).
+The software can be setup via Docker with the
+[rblsb image](./docker-images/rblsb_-_synctube.md).
diff --git a/wiki/teamspeak3.md b/wiki/teamspeak3.md
index f8dfd0c..6fc1e77 100644
--- a/wiki/teamspeak3.md
+++ b/wiki/teamspeak3.md
@@ -2,16 +2,15 @@
 
 [Teamspeak3](https://www.teamspeak.com) is a voice-over-IP service.
 
-## Server
+## Setup
 
-A server can be setup via docker with the [teamspeak image](./docker-images/teamspeak.md).
+The software can be setup via Docker with the
+[teamspeak image](./docker-images/teamspeak.md).
 
-## DNS
+## Link Teamspeak3 to a subdomain
 
-### Link Teamspeak3 to a subdomain
-
-To link Teamspeak3 to one of your subdomains you need to add a [DNS](./dns.md)
-SRV-record:
+To link Teamspeak3 to one of your subdomains you need to add a
+[DNS SRV-record](./dns.md#srv-record):
 
 ```txt
 type: SRV
diff --git a/wiki/traefik.md b/wiki/traefik.md
index 9d9c398..3b4dc40 100644
--- a/wiki/traefik.md
+++ b/wiki/traefik.md
@@ -3,7 +3,7 @@
 [Traefik](https://github.com/traefik/traefik) is a http reverse proxy with
 a special integration of infrastructure components (e.g. [Docker](./docker.md)).
 
-## Server
+## Setup
 
-A server can be setup via docker with the
+The software can be setup via docker with the
 [traefik image](./docker-images/traefik.md).
diff --git a/wiki/wallabag.md b/wiki/wallabag.md
index ef2ef9c..aa16be5 100644
--- a/wiki/wallabag.md
+++ b/wiki/wallabag.md
@@ -2,9 +2,10 @@
 
 [Wallabag](https://github.com/wallabag/wallabag) is a read-it-later app.
 
-## Server
+## Setup
 
-A server can be setup via docker with the [wallabag image](./docker-images/wallabag_-_wallabag.md).
+The software can be setup via Docker with the
+[wallabag image](./docker-images/wallabag_-_wallabag.md).
 
 ## Add-ons for quick access
 
diff --git a/wiki/whoogle.md b/wiki/whoogle.md
index 284464c..4903ed9 100644
--- a/wiki/whoogle.md
+++ b/wiki/whoogle.md
@@ -3,9 +3,9 @@
 [Whoogle](https://github.com/benbusby/whoogle-search) is a self-hostable
 metasearch engine.
 
-## Server
+## Setup
 
-A server can be setup via docker with the
+The software can be setup via docker with the
 [image by benbusby](./docker-images/benbusby_-_whoogle-search.md)
 
 ## Adding to Firefox