diff --git a/wiki/bind.md b/wiki/bind.md
index 154d03d..968ddc6 100644
--- a/wiki/bind.md
+++ b/wiki/bind.md
@@ -8,7 +8,12 @@ interacting with the [DNS](./dns.md).
 The software can be setup via docker with the
 [ventz image](./docker-images/ventz_-_bind.md).
 
-## Configure Local DNS server with forwarding
+## Usage
+
+The following sections describe various use cases for Bind and how to set up
+specific domains.
+
+### Configure Local DNS server with forwarding
 
 After setting up the server.
 Look into the file `/etc/bind/named.conf.options`.
@@ -45,7 +50,7 @@ options {
 };
 ```
 
-## Configure 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/linux/dislocker.md b/wiki/linux/dislocker.md
index ffa647a..fa9395f 100644
--- a/wiki/linux/dislocker.md
+++ b/wiki/linux/dislocker.md
@@ -8,7 +8,7 @@ Bitlocker-ed volumes under Linux systems.
 On most of the Linux distributions Dislocker is bundled with the `dislocker`
 package.
 
-## Mounting Bitlocker-ed volume
+## Usage
 
 For the mounting to work two directories are required.
 One to mount the `dislocker-file` (`/mnt/bitlocker`) and one to mount the
diff --git a/wiki/linux/easyeffects.md b/wiki/linux/easyeffects.md
index 3e5ba83..32b025c 100644
--- a/wiki/linux/easyeffects.md
+++ b/wiki/linux/easyeffects.md
@@ -6,7 +6,7 @@ streams.
 Easyeffects uses [Pipewire](./pipewire.md) as
 [sound server](/wiki/linux/audio.md#sound-server).
 
-## Installation
+## Setup
 
 Easyeffects can be installed in most distributions by installing the
 `easyeffects` plugin.
@@ -17,7 +17,7 @@ An installation via [Flatpak](./flatpak.md) is also possible.
 Easyeffects can apply `Effects` to input and output sound.
 
 ### Noise cancellation
-
+Setup
 Noise cancellation can be achieved by installing
 Easyeffects.
 Make sure to check the box `Process all Inputs` and `Process all Outputs` to
diff --git a/wiki/linux/fdupes.md b/wiki/linux/fdupes.md
index e67c0ae..275e1c2 100644
--- a/wiki/linux/fdupes.md
+++ b/wiki/linux/fdupes.md
@@ -4,7 +4,7 @@
 for identifying and deleting duplicate files residing within one or more
 specified directories.
 
-## Installation
+## Setup
 
 The fdupes program can be installed by going to the
 [github page of it](https://github.com/adrianlopezroche/fdupes/releases).
diff --git a/wiki/linux/ffmpeg.md b/wiki/linux/ffmpeg.md
index 1962203..bf6d436 100644
--- a/wiki/linux/ffmpeg.md
+++ b/wiki/linux/ffmpeg.md
@@ -3,7 +3,9 @@
 [ffmpeg](https://www.ffmpeg.org) is a free and open-source suite consisting of
 many audio and video tools and libraries.
 
-## Convert from format to another
+## Usage
+
+### Convert from format to another
 
 The following line is an example for a conversion of a video and audio capable
 format - in this case `.webm` - to an audio format - in this case `.flac`:
diff --git a/wiki/linux/flac_(package).md b/wiki/linux/flac_(package).md
index 3c6a6e1..cd99e54 100644
--- a/wiki/linux/flac_(package).md
+++ b/wiki/linux/flac_(package).md
@@ -8,7 +8,9 @@ On most distributions it is bundled together with the command line tagging
 software `metaflac` and other auxiliary tools in the `flac` package.
 Another possible tagging software is [MusicBrainz Picard](../picard.md)
 
-## Splitting Flac file according to cue file
+## Usage
+
+### Splitting Flac file according to cue file
 
 An easy way to split flac files according to a [cue file](../cue_sheet.md) is
 using `cuebreakpoints` and `shnsplit`.
diff --git a/wiki/linux/flatpak.md b/wiki/linux/flatpak.md
index e196d68..db421dd 100644
--- a/wiki/linux/flatpak.md
+++ b/wiki/linux/flatpak.md
@@ -16,14 +16,16 @@ For browsing and installing Flatpak packages via a graphic user interface the
 software management suite called Discover can be used.
 It requires the Flatpak backend.
 
-## Installing software
+## Usage
+
+### Installing software
 
 When software installation is done with Flatpak it is recommended to pass the
 `--user` so the software is not installed system-wide but for the user only.
 In practice it looks like the following:
 `flatpak install --user <package to install>`.
 
-## Running software
+### Running software
 
 Software installed via Flatpak can be run by typing the full package path into
 the command line, for example `com.makemkv.MakeMKV`.
diff --git a/wiki/linux/hwclock.md b/wiki/linux/hwclock.md
index 8cdfde2..2959fac 100644
--- a/wiki/linux/hwclock.md
+++ b/wiki/linux/hwclock.md
@@ -2,7 +2,9 @@
 
 `hwclock` is a program to set and display the hardware clock.
 
-## Display time and date
+## Usage
+
+### Display time and date
 
 To display the hardware clock run the following command:
 
@@ -10,7 +12,7 @@ To display the hardware clock run the following command:
 hwclock
 ```
 
-## Sync the hardware clock to the system time
+### Sync the hardware clock to the system time
 
 To sync the hardware clock run the following command:
 
diff --git a/wiki/linux/intel.md b/wiki/linux/intel.md
new file mode 100644
index 0000000..6718ced
--- /dev/null
+++ b/wiki/linux/intel.md
@@ -0,0 +1,31 @@
+# Intel
+
+[Intel](https://www.intel.de/content/www/de/de/homepage.html) is a vendor and
+manufacturer of semiconductor chips.
+They provide motherboard chips, network interface controllers, flash memory,
+[graphics chips](#intel-graphics) and more.
+
+## Intel Graphics
+
+Intel graphics is the name for various intel made integrated graphics
+processors.
+
+### Usage
+
+#### Screen Tearing
+
+Linux systems that use intel graphics can sometimes have problems with screen
+tearing.
+To get this working you need to change the `/etc/X11/xorg.conf.d/20-intel.conf`
+as explained on
+[maketecheasier](https://www.maketecheasier.com/get-rid-screen-tearing-linux)
+to:
+
+```txt
+Section "Device"
+    Identifier "Intel Graphics"
+    Driver "intel"
+    Option "TearFree" "true"
+EndSection
+```
+
diff --git a/wiki/linux/ip.md b/wiki/linux/ip.md
index 331175c..2e5e81e 100644
--- a/wiki/linux/ip.md
+++ b/wiki/linux/ip.md
@@ -4,7 +4,9 @@
 interfaces, routing and tunnels.
 It is a replacement for the program `ifconfig`.
 
-## List all network interfaces
+## Usage
+
+### List all network interfaces
 
 You can list network interfaces by running:
 
@@ -12,7 +14,7 @@ You can list network interfaces by running:
 ip link list
 ```
 
-## Enable/disable a network interface
+### Enable/disable a network interface
 
 Assuming the interface is named `wlan0` run the following:
 
diff --git a/wiki/linux/khal.md b/wiki/linux/khal.md
index e3fb7c0..0c16bdb 100644
--- a/wiki/linux/khal.md
+++ b/wiki/linux/khal.md
@@ -1,13 +1,12 @@
 # Khal
 
-`khal` is a calendar you can use in your terminal.
+[Khal](https://github.com/pimutils/khal) is a calendar you can use in your terminal.
 You can sync it with [vdirsyncer](vdirsyncer.md)
 
 ## Setup
 
-### Arch-Linux
-
-- `pacman -S khal` - Install needed packages
+On most linux distributions Khal can be installed with the `khal` package.
+Alternatively it can be installed via [Github](https://github.com/pimutils/khal).
 
 ### Configuration
 
diff --git a/wiki/linux/khard.md b/wiki/linux/khard.md
index 9d6d2c1..b4d3c7b 100644
--- a/wiki/linux/khard.md
+++ b/wiki/linux/khard.md
@@ -1,13 +1,12 @@
 # Khard
 
-`khard` is a adressbook that runs in your terminal.
+[Khard](https://github.com/lucc/khard) is a adressbook that runs in your terminal.
 You can sync it with [vdirsyncer](vdirsyncer.md).
 
 ## Setup
 
-### Arch Linux
-
-- `pacman -S khard` - Install needed programs
+On most linux distributions Khal can be installed with the `khard` package.
+Alternatively it can be installed via [Github](https://github.com/lucc/khard).
 
 ### Configuration
 
diff --git a/wiki/linux/lvm.md b/wiki/linux/lvm.md
index baf7c48..fbe3f7d 100644
--- a/wiki/linux/lvm.md
+++ b/wiki/linux/lvm.md
@@ -2,7 +2,9 @@
 
 `lvm` is a utility to create logical volumes.
 
-## Create VG for proxmox
+## Usage
+
+### Create VG for proxmox
 
 We will use `/dev/sdb` as our drive.
 Setup the disk for the physical volume with `sgdisk -N 1 /dev/sdb`.
@@ -13,7 +15,7 @@ This can be solved by removing the old partition table with `wipefs -a /dev/sdb`
 And finally create the volume group `vgcreate vmdata /dev/sdb`.
 Then follow the guide in proxmox on how to connect a `vg` to proxmox.
 
-## Add Drive to existing volume group
+### Add Drive to existing volume group
 
 First format the disk so that it has one partition (we will assume its called
 `/dev/sdc1`).
@@ -24,7 +26,7 @@ pvcreate /dev/sdc1
 vgextend <name of your volume group> /dev/sdc1
 ```
 
-## Resize a physical volume
+### Resize a physical volume
 
 To increase the size of a physical volume you have to have free free space
 in the partition containing the physical volume.
@@ -36,7 +38,7 @@ encrypted with LUKS a guide is available in
 To resize the physical volume to the size of the containing volume run:
 `pvresize /dev/mapper/<name of physical volume>`
 
-## Increase size of a logical volume
+### Increase size of a logical volume
 
 To increase the size of the logical volume you have to have free space in the
 according volume group. You can check that by running: `vgdisplay`.
diff --git a/wiki/linux/mdadm.md b/wiki/linux/mdadm.md
index 4c12599..5e8a917 100644
--- a/wiki/linux/mdadm.md
+++ b/wiki/linux/mdadm.md
@@ -2,7 +2,9 @@
 
 `mdadm` is a utility to create and manage raid devices.
 
-## Get information about a raid
+## Usage
+
+### Get information about a raid
 
 To get an info for a running raid (assuming it is `/dev/md0`) run
 `mdadm -D /dev/md0`.
@@ -15,11 +17,11 @@ be a whole drive and the mdadm drive is called `/dev/md0`.
 
 `mdadm --add /dev/md0 /dev/sdd1`
 
-## Raid 1
+### Raid 1
 
 Raid 1 creates a mirror with even amount of drives.
 
-### Create raid 1 device
+#### Create raid 1 device
 
 You can create a Raid 1 device with
 `mdadm --create --verbose /dev/md0 --level=1 --raid-devices=2 /dev/sda /dev/sdb`
@@ -27,7 +29,7 @@ where `sda` and `sdb` are the disks you want to include in your raid.
 You can increase the number of raid devices, but they have to be at least 2.
 If it is an uneven amount of disks in the raid, a disk will act as a spare disk.
 
-### Convert raid 1 to raid 5
+#### Convert raid 1 to raid 5
 
 Assuming the raid device is called `/dev/md0`.
 All other drives are part of the `md0` raid device.
diff --git a/wiki/linux/mime.md b/wiki/linux/mime.md
index 71062b9..b707f67 100644
--- a/wiki/linux/mime.md
+++ b/wiki/linux/mime.md
@@ -3,7 +3,9 @@
 A MIME type (short for Multipurpose Internet Mail Extensions) is a identifier
 for file formats and contents on the internet.
 
-## Setting applications for MIME types
+## Usage
+
+### Setting applications for MIME types
 
 In `~/.config/mimeapps.list` a list of applications to run specific MIME
 types can be found.
@@ -44,7 +46,7 @@ Exec=/usr/bin/sxiv -a %f
 Atleast `Type`, `Name` and `Exec` have to be specified for a minimal
 application file.
 
-## Getting MIME type of a file
+### Getting MIME type of a file
 
 The MIME type of a file can be returned by running
 `xdg-mime query filetype <file>` or `file -b --mime-type image.png`.
diff --git a/wiki/linux/netplan.md b/wiki/linux/netplan.md
index e8ce6a4..404c48d 100644
--- a/wiki/linux/netplan.md
+++ b/wiki/linux/netplan.md
@@ -3,7 +3,9 @@
 [Netplan](https://netplan.io) is a utility for configuring the networking of a
 linux system via YAML files.
 
-## Add more IP addresses to a system
+## Usage
+
+### Add more IP addresses to a system
 
 In the file `/etc/netplan/50-cloud-init.yaml` create an `addresses:` section
 for a device (for example an ethernet device) and list the IP addresses you
diff --git a/wiki/linux/nvidia.md b/wiki/linux/nvidia.md
index dca2dcb..770c5ca 100644
--- a/wiki/linux/nvidia.md
+++ b/wiki/linux/nvidia.md
@@ -4,8 +4,6 @@ NVidia is a vendor for graphics cards.
 
 ## Setup NVidia GPU
 
-### Arch Linux
-
 For NVidia GPUs to work install the `nvidia` and the `nvidia-utils` package.
 If you want to easily configure the monitors as described in a later section of
 this file you can also install `nvidia-settings`.
@@ -13,7 +11,13 @@ this file you can also install `nvidia-settings`.
 There is no initial setup in for of a `xorg.conf` in `/etc/X11` needed
 (except for a multiple GPU/APU setup).
 
-## Change monitor configuration
+### Basic Configuration
+
+A basic configuration can be achieved by running `nvidia-xconfig`.
+
+## Usage
+
+### Change monitor configuration
 
 After running `sudo nvidia-setting` can drag and drop the monitors to your
 liking.
@@ -21,7 +25,7 @@ After that you have to save the configuration to the
 [X window manager](./x_window_system.md) configuration file
 `/etc/X11/xorg.conf`.
 
-## Avoid screen tearing
+### Avoid screen tearing
 
 To avoid screen tearing open up `nvidia-settings` and under
 `X Server Display Configuration` select your display.
diff --git a/wiki/linux/openssl.md b/wiki/linux/openssl.md
index 4cf3971..f463537 100644
--- a/wiki/linux/openssl.md
+++ b/wiki/linux/openssl.md
@@ -3,7 +3,9 @@
 [OpenSSL](https://www.openssl.org) is a software library for secure
 communication over computer networks.
 
-## Creating a key pair
+## Usage
+
+### Creating a key pair
 
 As described by [dreikanter](https://gist.github.com/dreikanter/c7e85598664901afae03fedff308736b)
 you can create and save a pretty secure private key to `private.key` with
@@ -11,7 +13,7 @@ you can create and save a pretty secure private key to `private.key` with
 After that run `openssl rsa -in private.key -pubout -out public.key` to save the
 according public key to `public.key`.
 
-## Encrypting and decrypting files
+### Encrypting and decrypting files
 
 [Dreikanter](https://gist.github.com/dreikanter/c7e85598664901afae03fedff308736b)
 describes to encrypt larger files with symmetric encryption and encrypt the key
diff --git a/wiki/linux/pipewire.md b/wiki/linux/pipewire.md
index 241ccfc..e2c7dfb 100644
--- a/wiki/linux/pipewire.md
+++ b/wiki/linux/pipewire.md
@@ -3,7 +3,7 @@
 [Pipewire](https://pipewire.org) is a graph based
 [sound server](/wiki/linux/audio.md#sound-server).
 
-## Installation
+## Setup
 
 For clients that use the [PulseAudio](/wiki/linux/pulseaudio.md) API
 `pipewire-pulse` (on Arch-based distros or according
@@ -13,7 +13,7 @@ Additionally `pipewire-alsa` and `pipewire-jack` for JACK and Alsa clients are
 available.
 Make sure to restart to be sure everything is running correctly.
 
-## Sound processing
+## Usage
 
 For simple sound processing in the form of volume adjustment as well as setting
 the default input and output devices `pavucontrol` can be used as a simple
diff --git a/wiki/linux/proxmox.md b/wiki/linux/proxmox.md
index 4be429d..bf762d0 100644
--- a/wiki/linux/proxmox.md
+++ b/wiki/linux/proxmox.md
@@ -78,7 +78,7 @@ To increase it navigate to the webinterface and click on Datacenter and Storage
 select the storage you want to save your backup to and change `Max Backups` to
 your liking.
 
-## Bugfixing
+## Troubleshooting
 
 ### No internet after mainboard swap
 
diff --git a/wiki/linux/pulseaudio.md b/wiki/linux/pulseaudio.md
index a9a5ca2..2447a50 100644
--- a/wiki/linux/pulseaudio.md
+++ b/wiki/linux/pulseaudio.md
@@ -4,7 +4,9 @@
 [sound server](/wiki/linux/audio.md#sound-server) distributed by the
 [freedesktop.org](https://www.freedesktop.org/wiki/Software/PulseAudio) project.
 
-## Sound Processing
+## Usage
+
+### Mixing
 
 For simple sound processing in the form of volume adjustment as well as setting
 the default input and output devices `pavucontrol` can be used as a simple
diff --git a/wiki/linux/sc-im.md b/wiki/linux/sc-im.md
index b253c14..fc0b54d 100644
--- a/wiki/linux/sc-im.md
+++ b/wiki/linux/sc-im.md
@@ -1,13 +1,14 @@
 # SC-IM
 
-`sc-im` is a program to view and edit tables especially in csv-format.
+[sc-im](https://github.com/andmarti1424/sc-im) is a program to view and edit tables especially in csv-format.
 
 ## Setup
 
+
 ### Arch-Linux
 
-- `yay -S sc-im` - Install sc-im
-- `sc-im <insert-filename>.csv` - Edit files
+Sc-im can be installed via [github](https://github.com/andmarti1424/sc-im).
+Some distributions also feature the `sc-im` package.
 
 ## Usage
 
@@ -18,7 +19,7 @@ You can delete (multiple (for example `3`) rows `dr`/`d3r`, yank rows `yr`/`y3r`
 You can delete (multiple (for example `3`) columns `dc`/`d3c`, yank rows `yc`/`y3c`.
 You can insert new rows `ir`/`i3r` or columns `ic`/`i3c`.
 
-### Special numbers
+### Calculations and Functions
 
 There are some functions you can use when in numbers mode.
 
diff --git a/wiki/linux/shells.md b/wiki/linux/shell.md
similarity index 60%
rename from wiki/linux/shells.md
rename to wiki/linux/shell.md
index 4199566..42b37ff 100644
--- a/wiki/linux/shells.md
+++ b/wiki/linux/shell.md
@@ -1,13 +1,15 @@
-# Shells
+# Shell
 
-## Change /bin/sh
+A shell is a command-line interpreter that provides a command-line interface to
+interact with the many unix-like system.
 
-### Arch-Linux
+## Change /bin/sh
 
-The Shell in Arch-Linux is made up by a POSIX compliant mode of bash.
+The Shell in some distributions is made up by a POSIX compliant mode of bash.
 Problem with that is the speed.
 A shell like dash would be much faster.
-This is a guide on how to persistently change the symlink /bin/sh from bash to dash.
+This is a guide on how to persistently change the symlink /bin/sh from bash to
+dash.
 
 - `yay -S dash` - Install dash
 - `sudo ln -sfT /bin/dash /bin/sh` - link /bin/sh to dash
diff --git a/wiki/linux/ssh.md b/wiki/linux/ssh.md
index 83affb0..24513a4 100644
--- a/wiki/linux/ssh.md
+++ b/wiki/linux/ssh.md
@@ -3,17 +3,19 @@
 SSH is a network protocoll to securely connect to a computer.
 In this article it is assumed that `openssh` is used.
 
-## Generate new keys
+## Usage
+
+### Generate new keys
 
 To generate new ssh keys simply run `ssh-keygen -t ed25519` or
 `ssh-keygen -t rsa -b 4096`.
 
-## Enable root login via SSH
+### Enable root login via SSH
 
 Edit the `/etc/ssh/sshd_config` and change the line containing `PermitRootLogin`
 to `PermitRootLogin yes`.
 
-## Add login via SSH public key
+### Add login via SSH public key
 
 To enable easy login without password you can add the contents of the file
 `~/.ssh/id_rsa.pub` from your local machine to the file `~/.ssh/authorized_keys`
@@ -24,7 +26,7 @@ You can use the modified command below for ease of use:
 cat ~/.ssh/id_rsa.pub | ssh username@server 'cat >> ~/.ssh/authorized_keys'
 ```
 
-## Mount directory with sshfs
+### Mount directory with sshfs
 
 To mount a directory (in this case called `directory`) from a remote server
 (in this case called `server` also can be substituted by something like
diff --git a/wiki/linux/suckless.md b/wiki/linux/suckless.md
index a7c496c..d7ba76c 100644
--- a/wiki/linux/suckless.md
+++ b/wiki/linux/suckless.md
@@ -3,7 +3,15 @@
 Suckless is a community that is best known for minimalist free software.
 Notable works include `dwm` and `dmenu`.
 
-## Workflow for installation
+## Programs
+
+- dmenu is a menu with prgram launcher functionality
+- dwm is a window manager
+- ii is an IRC client
+- slock is a screen locker
+- st is a terminal
+
+## Setup
 
 Programs written by the suckless community are minimal by default.
 `.diff` files are available to patch functionality.
@@ -32,15 +40,10 @@ new `feature`
   - Get the `config.def.h` of `master` into `config` with
   `git checkout master config.def.h`
 
-## Programs
 
-- dmenu is a menu with prgram launcher functionality
-- dwm is a window manager
-- ii is an IRC client
-- slock is a screen locker
-- st is a terminal
+## Troubleshooting
 
-## suckless program crashes or struggles with colored emojis
+### suckless program crashes or struggles with colored emojis
 
 Suckless programs  especially `st` and `dmenu` can not display colored
 emojis.
diff --git a/wiki/linux/systemd.md b/wiki/linux/systemd.md
index 10eebca..99d97ac 100644
--- a/wiki/linux/systemd.md
+++ b/wiki/linux/systemd.md
@@ -3,7 +3,9 @@
 SystemD is an [init system](./init.md) for Linux systems.
 It is used for service configuration and startup.
 
-## Run command on boot
+## Usage
+
+### Run Command on Boot
 
 To run a command (in this case `/bin/bash /root/run.sh`) create the following
 file at `/etc/systemd/system/` with a name ending on `.service`.
diff --git a/wiki/linux/todoman.md b/wiki/linux/todoman.md
index 015d41b..6619907 100644
--- a/wiki/linux/todoman.md
+++ b/wiki/linux/todoman.md
@@ -1,13 +1,13 @@
 # Todoman
 
-`todoman` is a todolist you can use in your terminal.
+[todoman](https://github.com/pimutils/todoman) is a todolist you can use in your terminal.
 You can sync it using [vdirsyncer](vdirsyncer.md)
 
 ## Setup
 
-### Arch-Linux
-
-- `pacman -S todoman` - Install needed packages
+Todoman can be installed via the
+[github page](https://github.com/pimutils/todoman).
+Some distributions also feature the `todoman` package.
 
 ### Configuration
 
diff --git a/wiki/linux/ufw.md b/wiki/linux/ufw.md
index 17e0f7d..5f19bac 100644
--- a/wiki/linux/ufw.md
+++ b/wiki/linux/ufw.md
@@ -3,7 +3,9 @@
 [UFW (Uncomplicated Firewall)](https://code.launchpad.net/ufw) is a program to
 manage a netfilter firewall.
 
-## Block specific IPs
+## Usage
+
+### Block specific IPs
 
 To block the whole traffic from a specific IP to your computer run:
 `ufw deny from <ip> to any`
@@ -12,7 +14,7 @@ was blocked.
 If you don't care if the target knows you can also run:
 `sudo ufw reject from <ip> to any`
 
-## List all rules
+### List all rules
 
 To show all rules you can run:
 `ufw status`
@@ -20,7 +22,7 @@ or:
 `ufw status numbered`
 if you want to have a list of all rules with according numbers.
 
-## Remove rules
+### Remove rules
 
 Locate the rule you want to remove by showing all rules (numbered).
 Then run:
diff --git a/wiki/linux/vdirsyncer.md b/wiki/linux/vdirsyncer.md
index 94a03ec..410ff35 100644
--- a/wiki/linux/vdirsyncer.md
+++ b/wiki/linux/vdirsyncer.md
@@ -1,13 +1,13 @@
 # Vdirsyncer
 
-`vdirsyncer` can sync calendars and contacts using the caldav and carddav
-protocol.
+[Vdirsyncer](https://github.com/pimutils/vdirsyncer) can sync calendars and
+contacts using the caldav and carddav protocol.
 
 ## Setup
 
-### Arch-Linux
-
-- `pacman -S vdirsyncer` - Install needed packages
+Vdirsyncer can be installed via the
+[github page](https://github.com/pimutils/vdirsyncer).
+Some distributions also feature the `vdirsyncer` package.
 
 ### Configuration
 
diff --git a/wiki/linux/vifm.md b/wiki/linux/vifm.md
index 2a61ff5..27d51c0 100644
--- a/wiki/linux/vifm.md
+++ b/wiki/linux/vifm.md
@@ -2,7 +2,15 @@
 
 [ViFM](https://vifm.info) is a file manager focussed on vim like usage.
 
-## Image Previews with Ueberzug
+## Setup
+
+ViFM can be installed via the
+[github page](https://github.com/vifm/vifm).
+Some distributions also feature the `vifm` package.
+
+### Configuration
+
+#### Image Previews with Ueberzug
 
 This section is based on a
 [video by Distrotube](https://www.youtube.com/watch?v=qgxsduCO1pE).
diff --git a/wiki/linux/wine.md b/wiki/linux/wine.md
index a55da0f..a1b0610 100644
--- a/wiki/linux/wine.md
+++ b/wiki/linux/wine.md
@@ -1,23 +1,22 @@
 # Wine
 
-Wine is a compatibility layer to run windows programs on linux machines.
+[Wine](https://www.winehq.org/) is a compatibility layer to run windows
+programs on linux machines.
 
 ## Setup
 
-- Enable multilib support in pacman
-  - `vim /etc/pacman.conf` - Uncomment the following lines
+Wine can be installed on most distributions by acquiring the `wine` package.
+The `winetricks` package also is recommended.
+Alternatively it can be downloaded from
+[the official website](https://www.winehq.org/).
 
-    ```txt
-    [multilib]
-    Include = /etc/pacman.d/mirrorlist
-    ```
+## Usage
 
-- `pacman -S wine winetricks` - Install wine and configuration helper
-
-## Configuration
+### Run a windows program
 
 - Set the global variable `WINEPREFIX` to your liking, standard is `$HOME/.wine`
-- `winetricks` - run the installation of basic windows dependencies to the wine directory
+- `winetricks` - run the installation of basic windows dependencies to the wine
+  directory
 - Move the program you want to run to `$WINEPREFIX/drive_c/`
 - `winetricks sandbox` - (Optional) if you don't want wine to set up directories
 or files into your home directory
diff --git a/wiki/linux/wpa_supplicant.md b/wiki/linux/wpa_supplicant.md
index 1497a0d..b37d0c7 100644
--- a/wiki/linux/wpa_supplicant.md
+++ b/wiki/linux/wpa_supplicant.md
@@ -4,7 +4,9 @@
 It is especially interesting due to its WPA2 and WPA3 capabilities in contrast
 to other networking software.
 
-## Connect to a WPA2 secured WLAN
+## Usage
+
+### Connect to a WPA2 secured WLAN
 
 This part assumes that your network interface is called `wlan0`
 (change it accordingly).
diff --git a/wiki/linux/x_window_system.md b/wiki/linux/x_window_system.md
index 656e781..7cacb59 100644
--- a/wiki/linux/x_window_system.md
+++ b/wiki/linux/x_window_system.md
@@ -20,9 +20,10 @@ Properties and options of a peripheral device can then be shown by running
 `xinput list-props <id>` where `<id>` is the identifier of the
 device.
 
-
 ### Keyboard
 
+This section describes the handling of keyboards by X.
+
 #### Change Keyboardlayout
 
 To temporarily change the layout of the keyboard just run
@@ -31,24 +32,12 @@ For a permanent change run `localectl set-x11-keymap <your preferred layout>`.
 
 ### Display
 
-#### Screen Tearing
-
-Linux systems that use intel graphics can sometimes have problems with screen
-tearing.
-To get this working you need to change the `/etc/X11/xorg.conf.d/20-intel.conf`
-as explained on
-[maketecheasier](https://www.maketecheasier.com/get-rid-screen-tearing-linux)
-to:
-
-```txt
-Section "Device"
-    Identifier "Intel Graphics"
-    Driver "intel"
-    Option "TearFree" "true"
-EndSection
-```
+This section describes the handling of displays by X.
+Additionally to the guides in this section that are independent of the used
+graphics unit special configuration for [Nvidia](/wiki/linux/nvidia.md)
+and [Intel](./intel.md) can be found in their respective entries in this wiki.
 
-#### Disable Screen Blanking
+#### Screen Blanking
 
 To save power the screen is set to turn black after a given amount of time.
 This can be disabled temporarily by running `xset s off` or permanently by
@@ -62,9 +51,14 @@ EndSection
 
 ### Mouse
 
-#### Enable/Disable the Usage of the Middle Mouse Button
+This section describes the handling of mouse by X.
+
+#### Emulation of the Middle Mouse Button
 
-The middle mouse button can be activated or deactivated.
+If middle mouse button emulation is enabled the system will emulate a middle
+mouse button click when clicking both left and right mouse button
+simultaneously.
+The middle mouse button emulation can be activated or deactivated.
 First the current options have to be confirmed as explained in
 [the peripheral section](#peripheral-devices).
 Important is the property named `libinput Middle Emulation Enabled`.