diff --git a/_includes/sections/calendar-contacts-sync.html b/_includes/sections/calendar-contacts-sync.html
index 86523946..d91da841 100644
--- a/_includes/sections/calendar-contacts-sync.html
+++ b/_includes/sections/calendar-contacts-sync.html
@@ -4,34 +4,41 @@
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"
+{%
+ include cardv2.html
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."
- %}
+ 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."
+ website="https://nextcloud.com/"
+ forum="https://forum.privacytools.io/t/discussion-nextcloud-calender-contacts-sync-tools/1535"
+ github="https://github.com/nextcloud"
+ windows="https://nextcloud.com/install/"
+ linux="https://nextcloud.com/install/"
+ mac="https://nextcloud.com/install/"
+ android="https://nextcloud.com/install/"
+ ios="https://nextcloud.com/install/"
+%}
- {% include card.html color="primary"
+{%
+ include cardv2.html
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."
- %}
+ 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.'
+ website="/providers/email"
+%}
- {% include card.html color="warning"
+{%
+ include cardv2.html
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."
- %}
-
-
+ description="