diff --git a/_includes/sections/calendar-contacts-sync.html b/_includes/sections/calendar-contacts-sync.html
new file mode 100644
index 00000000..9eed98c3
--- /dev/null
+++ b/_includes/sections/calendar-contacts-sync.html
@@ -0,0 +1,50 @@
+
+
+
+ If you are currently using a calendar and or contacts synchronization service like Google Sync or iCloud, you should pick an alternative here.
+
+
+
+
+ {% include card.html color="success"
+ title="Nextcloud"
+ image="assets/img/provider/Nextcloud.png"
+ url="https://nextcloud.com/"
+ footer="Client OS: Windows, macOS, Linux, BSD, Unix, iOS, Android, Fire OS. Server: Linux."
+ description="NextCloud is a suite of client-server software for creating and using file hosting services. This includes calendar sync via CalDAV and contacts sync via CardDAV. Nextcloud is free and open-source, thereby allowing anyone to install and operate it without charge on a private server."
+ %}
+
+ {% include card.html color="primary"
+ title="Email Providers"
+ image="assets/img/misc/email.png"
+ url="#email"
+ website="Email Providers section"
+ footer="OS: depends on email provider."
+ description="Many email providers also offer calendar and or contacts sync services. Refer to the
Email Providers section to choose an email provider and check if they also offer calendar and or contacts sync."
+ %}
+
+ {% include card.html color="warning"
+ title="EteSync"
+ image="assets/img/provider/etesync.png"
+ url="https://www.etesync.com/"
+ footer="Client OS: Android, Web. Server OS: Linux."
+ description="EteSync is a secure, end-to-end encrypted and journaled personal information (e.g. contacts and calendar) cloud synchronization and backup for Android and any OS that supports CalDAV/CardDAV. It costs $14 per year to use, or you can host the server yourself for free."
+ %}
+
+
+
+Worth Mentioning
+
+
+ -
+ fruux - a unified contacts/calendaring system that works across platforms and devices.
+
+
+ -
+ Flock - a discontinued calendar and contacts sync service by Open Whisper Systems. Despite being shut down the source code is still available on GitHub.
+
+
+ -
+ cloud backups - consider regularly exporting your calendar and or contacts and backing them up on a separate storage drive or uploading them to cloud storage (ideally after encrypting them).
+
+
diff --git a/index.html b/index.html
index b80d6de0..a2d90e0e 100644
--- a/index.html
+++ b/index.html
@@ -47,52 +47,7 @@ layout: default
{% include sections/password-managers.html %}
-
-
- If you are currently using a calendar and or contacts synchronization service like Google Sync or iCloud, you should pick an alternative here.
-
-
-
- {% include card.html color="success"
- title="Nextcloud"
- image="assets/img/provider/Nextcloud.png"
- url="https://nextcloud.com/"
- footer="Client OS: Windows, macOS, Linux, BSD, Unix, iOS, Android, Fire OS. Server: Linux."
- description="NextCloud is a suite of client-server software for creating and using file hosting services. This includes calendar sync via CalDAV and contacts sync via CardDAV. Nextcloud is free and open-source, thereby allowing anyone to install and operate it without charge on a private server."
- %}
-
- {% include card.html color="primary"
- title="Email Providers"
- image="assets/img/misc/email.png"
- url="#email"
- website="Email Providers section"
- footer="OS: depends on email provider."
- description="Many email providers also offer calendar and or contacts sync services. Refer to the
Email Providers section to choose an email provider and check if they also offer calendar and or contacts sync."
- %}
-
- {% include card.html color="warning"
- title="EteSync"
- image="assets/img/provider/etesync.png"
- url="https://www.etesync.com/"
- footer="Client OS: Android, Web. Server OS: Linux."
- description="EteSync is a secure, end-to-end encrypted and journaled personal information (e.g. contacts and calendar) cloud synchronization and backup for Android and any OS that supports CalDAV/CardDAV. It costs $14 per year to use, or you can host the server yourself for free."
- %}
-
-
- Worth Mentioning
-
- -
- fruux - a unified contacts/calendaring system that works across platforms and devices.
-
-
- -
- Flock - a discontinued calendar and contacts sync service by Open Whisper Systems. Despite being shut down the source code is still available on GitHub.
-
-
- -
- cloud backups - consider regularly exporting your calendar and or contacts and backing them up on a separate storage drive or uploading them to cloud storage (ideally after encrypting them).
-
-
+ {% include sections/calendar-contacts-sync.html %}
File Encryption Software