diff --git a/content/docs/libraries.md b/content/docs/libraries.md
index 9a6f2c60125077aafbf0254e3a6c89f071ca564e..0718a346c9b14d441d4949a9f41d900457fc735d 100644
--- a/content/docs/libraries.md
+++ b/content/docs/libraries.md
@@ -12,6 +12,9 @@ menu:
 - [liboqs](https://github.com/open-quantum-safe/liboqs):
 An open source C library for quantum-safe cryptographic algorithms.
 
+- [PQClean](https://github.com/PQClean/PQClean):
+Portable C implementations of post-quantum cryptography.
+
 - [NaCL (Salt)](https://nacl.cr.yp.to/):
 Software library for network communication, encryption, decryption, signatures, etc.
 
diff --git a/content/docs/migration/protocols/_index.md b/content/docs/migration/protocols/_index.md
index b7f80695a201f2a1db39bd19a47a42ce62a771a0..044316cf6cbe9ee64be2b23839fe01a6437c6e62 100644
--- a/content/docs/migration/protocols/_index.md
+++ b/content/docs/migration/protocols/_index.md
@@ -9,18 +9,41 @@ layout: no_index
 - [TLS/SSL]({{< ref "/tls" >}} "TLS/SSL")
 - [SSH]({{< ref "/ssh" >}} "SSH")
 - [IPsec/IKE]({{< ref "/ike" >}} "IPsec/IKE")
+- [MACsec]({{< ref "/macsec" >}} "MACsec")
 - [DTLS]({{< ref "/dtls" >}} "DTLS")
 
 ##### Authentication & Signing
 - [CMS]({{< ref "/cms" >}} "CMS")
 - [S/MIME]({{< ref "/smime" >}} "S/MIME")
-- [X.509]({{< ref "/certs" >}} "X.509")
+- [PGP/GPG]({{< ref "/pgp" >}} "PGP/GPG")
+- [OPC UA]({{< ref "/opcua" >}} "OPC UA")
+- OAuth
 
-##### Certificate Authority
+##### Certification
 - [DNSSEC]({{< ref "/dnssec" >}} "DNSSEC")
+- [X.509]({{< ref "/certs" >}} "X.509")
 
 ##### Wireless
+- [WPA/EAP]({{< ref "/wlan" >}} "WPA/EAP")
+- UMTTS/LTE/5G
+- Bluetooth/IR/ZigBee
+- WSN
 
-##### Others
+##### End-to-End
 - [VPN]({{< ref "/vpn" >}} "VPN")
-- [Others]({{< ref "/others" >}} "Others")
+- [WireGuard]({{< ref "/wireguard" >}} "WireGuard")
+- SFTP
+- Telnet
+
+##### Others
+- [DLT]({{< ref "/dlt" >}} "DLT")
+- [PKINIT]({{< ref "/pkinit" >}} "PKINIT")
+- SRTP/ZRTP
+- QUIC
+- PPP CHAP/PAP
+- PCT
+- SET
+- GRE
+- S-RPC
+- FinTS/HBCI
+- PKCS
diff --git a/content/docs/migration/protocols/all/dlt.md b/content/docs/migration/protocols/all/dlt.md
new file mode 100644
index 0000000000000000000000000000000000000000..c9115d40909d1aa25ff4d91f052879033684c3a4
--- /dev/null
+++ b/content/docs/migration/protocols/all/dlt.md
@@ -0,0 +1,7 @@
+---
+title: "DLT"
+date: 2021-05-05T22:41:49+02:00
+draft: false
+type: docs
+weight: 14
+---
diff --git a/content/docs/migration/protocols/all/macsec.md b/content/docs/migration/protocols/all/macsec.md
new file mode 100644
index 0000000000000000000000000000000000000000..dc76bbc447749d27b30227209ff070b1d5773f43
--- /dev/null
+++ b/content/docs/migration/protocols/all/macsec.md
@@ -0,0 +1,8 @@
+---
+title: "MACsec"
+date: 2021-05-05T22:41:49+02:00
+draft: false
+type: docs
+weight: 10
+---
+- [Post-quantum MACsec in Ethernet Networks ](https://journals.riverpublishers.com/index.php/JCSANDM/article/view/5973) Authenticated post-quantum key establishment protocol which is suitable for long-term secure MACsec. Hybrid mode, ephemeral key exchange, and an end-to-end encryption [[ChSe21]](../../../../refs#chse21).
diff --git a/content/docs/migration/protocols/all/opcua.md b/content/docs/migration/protocols/all/opcua.md
new file mode 100644
index 0000000000000000000000000000000000000000..e494105520f5519d7122ed609b1e654c52bfe42a
--- /dev/null
+++ b/content/docs/migration/protocols/all/opcua.md
@@ -0,0 +1,7 @@
+---
+title: "OPC UA"
+date: 2021-05-05T22:41:49+02:00
+draft: false
+type: docs
+weight: 14
+---
diff --git a/content/docs/migration/protocols/all/others.md b/content/docs/migration/protocols/all/others.md
deleted file mode 100644
index 1a2445d5b6c3872ab0f4b89a18ff790f66e31c77..0000000000000000000000000000000000000000
--- a/content/docs/migration/protocols/all/others.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-title: "Others"
-date: 2021-05-05T22:41:49+02:00
-draft: false
-type: docs
-weight: 10
----
-- Key Establishment:
-  - [Post-quantum MACsec in Ethernet Networks ](https://journals.riverpublishers.com/index.php/JCSANDM/article/view/5973) Authenticated post-quantum key establishment protocol which is suitable for long-term secure MACsec. Hybrid mode, ephemeral key exchange, and an end-to-end encryption [[ChSe21]](../../../../refs#chse21).
diff --git a/content/docs/migration/protocols/all/pgp.md b/content/docs/migration/protocols/all/pgp.md
new file mode 100644
index 0000000000000000000000000000000000000000..03f7b01fbaba205395ea9fb522c627e725c38c1d
--- /dev/null
+++ b/content/docs/migration/protocols/all/pgp.md
@@ -0,0 +1,7 @@
+---
+title: "PGP/GPG"
+date: 2021-05-05T22:41:49+02:00
+draft: false
+type: docs
+weight: 11
+---
diff --git a/content/docs/migration/protocols/all/pkinit.md b/content/docs/migration/protocols/all/pkinit.md
new file mode 100644
index 0000000000000000000000000000000000000000..5d246e615a2c0b97eade526c8e49a8429d25eac9
--- /dev/null
+++ b/content/docs/migration/protocols/all/pkinit.md
@@ -0,0 +1,7 @@
+---
+title: "PKINIT"
+date: 2021-05-05T22:41:49+02:00
+draft: false
+type: docs
+weight: 13
+---
diff --git a/content/docs/migration/protocols/all/wireguard.md b/content/docs/migration/protocols/all/wireguard.md
new file mode 100644
index 0000000000000000000000000000000000000000..ef562a4e827083957461731629825d6a67c146f1
--- /dev/null
+++ b/content/docs/migration/protocols/all/wireguard.md
@@ -0,0 +1,7 @@
+---
+title: "WireGuard"
+date: 2021-05-05T22:41:49+02:00
+draft: false
+type: docs
+weight: 12
+---
diff --git a/content/docs/migration/protocols/all/wlan.md b/content/docs/migration/protocols/all/wlan.md
new file mode 100644
index 0000000000000000000000000000000000000000..36414987082cb49610145d40541ac52cadf942a7
--- /dev/null
+++ b/content/docs/migration/protocols/all/wlan.md
@@ -0,0 +1,7 @@
+---
+title: "WPA/EAP"
+date: 2021-05-05T22:41:49+02:00
+draft: false
+type: docs
+weight: 9
+---