diff --git a/wiki/linux/arch-linux/arch-linux.md b/wiki/linux/arch-linux/arch-linux.md
index e62d9ef..58e454b 100644
--- a/wiki/linux/arch-linux/arch-linux.md
+++ b/wiki/linux/arch-linux/arch-linux.md
@@ -3,10 +3,17 @@
 [Arch Linux](https://archlinux.org/) is a rolling-release, general-purpose
 [Linux](/wiki/linux/linux.md)
 distribution.
-Arch Linux uses the [pacman](./package_manager.md) package manager.
+
+## Package Manager and AUR
+
+Arch Linux uses the
+[pacman](/wiki/linux/package_manager.md#arch-linux-pacman-and-yay) package
+manager.
+An additional repository for user made software exists.
+It is called Arch User Repository (AUR).
 The Arch User Repositories (AUR) features community-made packages that can be
 installed with different
-[package manager that inlcude access to the AUR](/wiki/linux/arch-linux/package_manager.md).
+[package manager for that purpose](/wiki/linux/package_manager.md#arch-linux-pacman-and-yay).
 
 ## Installation
 
@@ -25,12 +32,17 @@ The iso can be written on an USB-stick using the command
 `dd bs=4M if=<path to ISO> of=/dev/sdx conv=fsync oflag=direct status=progress`.
 `<path to ISO>` points the command to the location of the ISO file
 
-## Recommended Practices
+## Usage
+
+The following section describes various ways to use and improve the usage of
+the Arch Linux operating system.
+
+### Recommended Practices
 
 The following articles describe steps to undertake to harden the system security
 or setups and installation that are recommended for Arch Linux.
 
-## Enable Microcode Updates
+#### Enable Microcode Updates
 
 The microcode of Intel and AMD CPUs can be automatically updated by installing
 the `amd-ucode` or `intel-ucode` package depending on your CPU.
diff --git a/wiki/linux/arch-linux/package_manager.md b/wiki/linux/package_manager.md
similarity index 64%
rename from wiki/linux/arch-linux/package_manager.md
rename to wiki/linux/package_manager.md
index 826d9b4..a6cc16b 100644
--- a/wiki/linux/arch-linux/package_manager.md
+++ b/wiki/linux/package_manager.md
@@ -1,15 +1,26 @@
-# Pacman and Yay
+# Package Managers
 
 Package managers are important programs to get software onto your system.
-In Arch Linux there are 2 main package managers.
-One is `pacman`, the default package manager.
-But there are also a bunch other managers for the Arch User Repositories (AUR).
 
-In this article `yay` is used as the go to AUR manager.
-`yay` is also a wrapper for `pacman` so you can just use `yay` instead of pacman
-to install programs.
+## Arch Linux: Pacman and Yay
 
-## Update Mirrorlist
+In [Arch Linux](/wiki/linux/arch-linux/arch-linux.md) there are 2 main types of
+package managers.
+The first is pacman, the default package manager.
+
+For the second type there are many different managers to chose from.
+Those managers are handling for the Arch User Repositories (AUR).
+In this article yay is used as the go to AUR manager.
+yay is also a wrapper for pacman so yay can be used instead of pacman to
+install and update both AUR and main repository programs.
+It features the same syntax.
+
+### Bugfixes
+
+The following section describes problems that can arise when using pacman or
+yay.
+
+#### Update Mirrorlist
 
 After a while not updating the system it is possible for the mirrorlist to be
 outdated.
@@ -19,9 +30,7 @@ This can be fixed by updating it with the following command:
 curl -o /etc/pacman.d/mirrorlist https://archlinux.org/mirrorlist/all/
 ```
 
-## Bugfixes
-
-### Error while importing keys
+#### Error while importing keys
 
 Both `yay` and `pacman` use gpg keys to confirm the package manager gets the
 right package.
@@ -29,7 +38,7 @@ It is possible that it runs into errors when importing new keys.
 If this happens you should try to restart your gpg key server with
 `gpgconf --kill all`.
 
-### Unknown public key
+#### Unknown public key
 
 If the error `ERROR: One or more PGP signatures could not be verified!`, you
 have to manually receive the key and trust it.
@@ -44,7 +53,7 @@ Where <KEYID> is the placeholder of the identification string of the key.
 It usually gets gets printed in the line above the error looking like
 `FAILED (unknown public key <KEYID>)`.
 
-### Error while updating `is marginal trust`
+#### Error while updating `is marginal trust`
 
 Both `yay` and `pacman` use gpg keys to confirm the package manager gets the
 right package.
diff --git a/wiki/linux/vifm.md b/wiki/linux/vifm.md
index 27d51c0..90ae62f 100644
--- a/wiki/linux/vifm.md
+++ b/wiki/linux/vifm.md
@@ -14,8 +14,14 @@ Some distributions also feature the `vifm` package.
 
 This section is based on a
 [video by Distrotube](https://www.youtube.com/watch?v=qgxsduCO1pE).
-First you need to install [Ueberzug](https://github.com/seebye/ueberzug)
-on your system.
+First you need to install Überzug on your system.
+Überzug was provided by [seebye](https://github.com/seebye/ueberzug) but this
+project is now unmaintained.
+An alternative to using this project is
+[Überzug++](https://github.com/jstkdng/ueberzugpp) that can be used as a drop-in
+alternative.
+It can be installed by the
+[Arch User Repository package `ueberzugpp`](/wiki/linux/package_manager.md#arch-linux-pacman-and-yay).
 After that you need to add 2 files to your path:
 
 - vifmimg