diff --git a/_includes/sections/instant-messenger.html b/_includes/sections/instant-messenger.html
new file mode 100644
index 00000000..d72827b0
--- /dev/null
+++ b/_includes/sections/instant-messenger.html
@@ -0,0 +1,60 @@
+
Encrypted Instant Messenger
+
+
+ If you are currently using an Instant Messenger like WhatsApp, Viber, LINE, Telegram or Threema, you should pick an alternative here.
+
+
+
+ {% include card.html color="success"
+ title="Mobile: Signal"
+ image="assets/img/tools/Signal.png"
+ url="https://signal.org"
+ footer="OS: Android, iOS, macOS, Windows, Linux"
+ description="Signal is a mobile app developed by Open Whisper Systems. The app provides instant messaging, as well as voice and video calling.
+ All communications are end-to-end encrypted. Signal is free and open source, enabling anyone to verify its security by auditing the code. The development team is supported by community donations and grants. There are no advertisements,
+ and it doesn't cost anything to use."
+ %}
+
+
+ {% include card.html color="primary"
+ title="Riot.im"
+ image="assets/img/tools/riot.png"
+ url="https://riot.im/"
+ footer="OS: Android, iOS, macOS, Windows, Linux, Web"
+ labels="warning:beta:The software is currently in beta and the mobile client states 'End-to-end encryption is in beta and may not be reliable. You should not yet trust it to secure data.'"
+ description='Riot.im is a decentralized free-software chatting application based on the
Matrix protocol, a recent open protocol for real-time communication offering E2E encryption. It can bridge other communications via others protocols such as IRC too.'
+ %}
+
+ {% include card.html color="warning"
+ title="Desktop: Ricochet"
+ image="assets/img/tools/Ricochet.png"
+ url="https://ricochet.im/"
+ footer="OS: Windows, macOS, Linux."
+ description='Ricochet uses the
Tor network to reach your contacts without relying on messaging servers. It creates a hidden service, which is used to rendezvous with
+ your contacts without revealing your location or IP address. Instead of a username, you get a unique address that looks like
ricochet:rs7ce36jsj24ogfw. Other Ricochet users can use this address to send a contact request - asking to be
+ added to your contacts list.'
+ %}
+
+
+
+Worth Mentioning
+
+
+ - ChatSecure - ChatSecure is a free and open source messaging app that features OTR encryption over XMPP.
+ - Cryptocat - Encrypted open source messenger. Supports file sharing and multiple devices. Available for Windows, Linux and macOS.
+ - Kontalk - A community-driven instant messaging network. Supports end-to-end encryption. Both client-to-server and server-to-server channels are fully encrypted.
+ - Conversations - An open source Jabber/XMPP client for Android 4.4+ smartphones. Supports end-to-end encryption with either OMEMO or openPGP. There is also Conversations Legacy which still supports OTR.
+ - Wire experimental (more info) - A free software End-to-End Encrypted chatting application that supports instant messaging, voice, and video calls.
+ - List of OTR Clients - Wikipedia
+
+
+
+Related Information
+
+
diff --git a/index.html b/index.html
index 0e96adee..c5b827aa 100644
--- a/index.html
+++ b/index.html
@@ -31,63 +31,7 @@ layout: default
{% include sections/search-engines.html %}
- Encrypted Instant Messenger
-
-
- If you are currently using an Instant Messenger like WhatsApp, Viber, LINE, Telegram or Threema, you should pick an alternative here.
-
-
-
- {% include card.html color="success"
- title="Mobile: Signal"
- image="assets/img/tools/Signal.png"
- url="https://signal.org"
- footer="OS: Android, iOS, macOS, Windows, Linux"
- description="Signal is a mobile app developed by Open Whisper Systems. The app provides instant messaging, as well as voice and video calling.
- All communications are end-to-end encrypted. Signal is free and open source, enabling anyone to verify its security by auditing the code. The development team is supported by community donations and grants. There are no advertisements,
- and it doesn't cost anything to use."
- %}
-
-
- {% include card.html color="primary"
- title="Riot.im"
- image="assets/img/tools/riot.png"
- url="https://riot.im/"
- footer="OS: Android, iOS, macOS, Windows, Linux, Web"
- labels="warning:beta:The software is currently in beta and the mobile client states 'End-to-end encryption is in beta and may not be reliable. You should not yet trust it to secure data.'"
- description='Riot.im is a decentralized free-software chatting application based on the
Matrix protocol, a recent open protocol for real-time communication offering E2E encryption. It can bridge other communications via others protocols such as IRC too.'
- %}
-
- {% include card.html color="warning"
- title="Desktop: Ricochet"
- image="assets/img/tools/Ricochet.png"
- url="https://ricochet.im/"
- footer="OS: Windows, macOS, Linux."
- description='Ricochet uses the
Tor network to reach your contacts without relying on messaging servers. It creates a hidden service, which is used to rendezvous with
- your contacts without revealing your location or IP address. Instead of a username, you get a unique address that looks like
ricochet:rs7ce36jsj24ogfw. Other Ricochet users can use this address to send a contact request - asking to be
- added to your contacts list.'
- %}
-
-
- Worth Mentioning
-
- - ChatSecure - ChatSecure is a free and open source messaging app that features OTR encryption over XMPP.
- - Cryptocat - Encrypted open source messenger. Supports file sharing and multiple devices. Available for Windows, Linux and macOS.
- - Kontalk - A community-driven instant messaging network. Supports end-to-end encryption. Both client-to-server and server-to-server channels are fully encrypted.
- - Conversations - An open source Jabber/XMPP client for Android 4.4+ smartphones. Supports end-to-end encryption with either OMEMO or openPGP. There is also Conversations Legacy which still supports OTR.
- - Wire experimental (more info) - A free software End-to-End Encrypted chatting application that supports instant messaging, voice, and video calls.
- - List of OTR Clients - Wikipedia
-
-
-
- Related Information
-
+ {% include sections/instant-messenger.html %}
Encrypted Video & Voice Messenger