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 @@
   <strong>If you are currently using a calendar and or contacts synchronization service like Google Sync or iCloud, you should pick an alternative here.</strong>
 </div>
 
-<div class="row mb-2">
-
-  {% 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="<strong>Nextcloud</strong> 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 <a href=\"../email\">Email Providers section</a> 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 <a href="/providers/email">Email Providers section</a> 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."
-  %}
-
-</div>
+  description="<strong>EteSync</strong> 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."
+  website="https://www.etesync.com/"
+  forum="https://forum.privacytools.io/t/discussion-etesync-calender-contacts-sync-tools/1536"
+  github="https://github.com/etesync"
+  web="https://www.etesync.com/"
+  linux="https://www.etesync.com/"
+  android="https://www.etesync.com/"
+%}
 
 <h3>Worth Mentioning</h3>
 
@@ -41,6 +48,6 @@
   </li>
 
   <li>
-    <a href="../cloud">cloud backups</a> - 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 <a href="../encryption-tools/#encrypt">encrypting</a> them).
+    <a href="../cloud">cloud backups</a> - 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 <a href="../encryption-tools/">encrypting</a> them).
   </li>
 </ul>
diff --git a/source_code.md b/source_code.md
index 04f7efb6..6a6c7182 100644
--- a/source_code.md
+++ b/source_code.md
@@ -201,15 +201,14 @@ Worth Mentioning
 - Password Safe: https://sourceforge.net/projects/passwordsafe/files/
 
 ## Calendar and Contacts Sync
-  Nextcloud: https://github.com/nextcloud
 
-  EteSync: https://github.com/etesync
+Nextcloud: https://github.com/nextcloud
 
-   Worth Mentioning:
-.
-    fruux: https://fruux.com/opensource/
-.
-    Flock: https://github.com/signalapp/Flock
+EteSync: https://github.com/etesync
+
+Worth Mentioning:
+
+- fruux: https://fruux.com/opensource/
 
 ## File Encryption Software