diff --git a/_data/nav/2_providers.yml b/_data/nav/2_providers.yml
index 03086114..b52f7df7 100644
--- a/_data/nav/2_providers.yml
+++ b/_data/nav/2_providers.yml
@@ -3,8 +3,8 @@ title: Providers
 items:
   - type: link
     title: Cloud Storage
-    icon: fad fa-laptop-house
-    file: legacy_pages/providers/cloud.html
+    icon: fad fa-cloud
+    file: _evergreen/cloud.html
   - type: link
     title: DNS Servers
     icon: fad fa-map-signs
diff --git a/_data/providers/cloud/1_nextcloud.yml b/_data/providers/cloud/1_nextcloud.yml
new file mode 100644
index 00000000..3f7d4c51
--- /dev/null
+++ b/_data/providers/cloud/1_nextcloud.yml
@@ -0,0 +1,33 @@
+title: Nextcloud
+type: Recommendation
+logo: /assets/img/cloud/nextcloud.svg
+description: |
+  <strong>Nextcloud</strong> is a suite of free and open-source client-server software for creating your own file hosting services on a private server you control. It also comes with experimental end-to-end encryption (E2EE).
+
+  We recommend checking if your Nextcloud provider supports E2EE, otherwise you have to trust the provider to not look at your files.
+
+  When self hosting Nextcloud, you should also remember to enable E2EE to protect against your hosting provider from snooping on your data.
+
+website: 'https://nextcloud.com/'
+privacy_policy: 'https://nextcloud.com/privacy/'
+downloads:
+  - icon: fab fa-windows
+    url: 'https://nextcloud.com/install/#install-clients'
+  - icon: fab fa-apple
+    url: 'https://nextcloud.com/install/#install-clients'
+  - icon: fab fa-linux
+    url: 'https://nextcloud.com/install/#install-clients'
+  - icon: fab fa-freebsd
+    url: 'https://www.freshports.org/www/nextcloud/'
+  - icon: ptio-openbsd
+    url: 'http://openports.se/www/nextcloud'
+  - icon: ptio-netbsd
+    url: 'http://pkgsrc.se/www/php-nextcloud'
+  - icon: fab fa-android
+    url: 'https://f-droid.org/packages/com.nextcloud.client/'
+  - icon: fab fa-google-play
+    url: 'https://play.google.com/store/apps/details?id=com.nextcloud.client'
+  - icon: fab fa-app-store-ios
+    url: 'https://itunes.apple.com/us/app/nextcloud/id1125420102'
+  - icon: fab fa-github
+    url: 'https://github.com/nextcloud'
diff --git a/_data/providers/cloud/2_proton-drive.yml b/_data/providers/cloud/2_proton-drive.yml
new file mode 100644
index 00000000..a52a83a0
--- /dev/null
+++ b/_data/providers/cloud/2_proton-drive.yml
@@ -0,0 +1,17 @@
+title: Proton Drive
+type: Recommendation
+logo: /assets/img/cloud/protondrive.svg
+description: |
+  <strong>Proton Drive</strong> is an end-to-end encrypted (E2EE) general file storage service by the popular encrypted email provider <a href="https://protonmail.com">ProtonMail</a>.
+
+  Proton Drive is currently in beta and only is only available through a web client.
+
+  When using a web client, you are placing trust in the server sending you the JavaScript code that encrypts your files.
+
+website: 'https://protonmail.com'
+privacy_policy: 'https://protonmail.com/privacy-policy'
+downloads:
+  - icon: fas fa-globe-americas
+    url: 'https://protonmail.com'
+  - icon: fab fa-github
+    url: 'https://github.com/ProtonMail/proton-drive'
diff --git a/_data/providers/cloud/3_tahoe-lafs.yml b/_data/providers/cloud/3_tahoe-lafs.yml
new file mode 100644
index 00000000..5bd8ae02
--- /dev/null
+++ b/_data/providers/cloud/3_tahoe-lafs.yml
@@ -0,0 +1,20 @@
+title: Tahoe-LAFS (Advanced)
+type: Recommendation
+logo: /assets/img/cloud/tahoe-lafs.svg
+description: |
+  <strong>Tahoe-LAFS</strong> is a free and open decentralized cloud storage system. It distributes your data across multiple servers. Even if some of the servers fail or are taken over by an attacker, the entire file store continues to function correctly, preserving your privacy and security. The servers used as storage pools do not have access to your data.
+
+  Due to the complexity of the system and the amount of nodes needed to set it up, Tahoe-LAFS is only recommended for seasoned system administrators.
+website: 'https://www.tahoe-lafs.org/'
+privacy_policy: 'https://protonmail.com/privacy-policy'
+downloads:
+  - icon: fab fa-windows
+    url: 'https://github.com/tahoe-lafs/tahoe-lafs#via-pip'
+  - icon: fab fa-apple
+    url: 'https://github.com/tahoe-lafs/tahoe-lafs#via-pip'
+  - icon: fab fa-linux
+    url: 'https://github.com/tahoe-lafs/tahoe-lafs#using-os-packages'
+  - icon: ptio-netbsd
+    url: 'http://pkgsrc.se/filesystems/tahoe-lafs'
+  - icon: fab fa-github
+    url: 'https://www.tahoe-lafs.org/trac/tahoe-lafs/browser'
diff --git a/_includes/legacy/sections/calendar-contacts-sync.html b/_includes/legacy/sections/calendar-contacts-sync.html
index 1c777e45..61163f71 100644
--- a/_includes/legacy/sections/calendar-contacts-sync.html
+++ b/_includes/legacy/sections/calendar-contacts-sync.html
@@ -53,10 +53,6 @@
 <h3>Worth Mentioning</h3>
 
 <ul>
-  <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="../productivity/#encrypt">encrypting</a> them).
-  </li>
-
   <li>
     <a href="https://github.com/39aldo39/DecSync">DecSync</a> - DecSync can be used to synchronize RSS, contacts, and calendars without a server by using file synchronization software such as <a href="https://syncthing.net/">Syncthing</a>.
   </li>
diff --git a/_includes/legacy/sections/cloud.html b/_includes/legacy/sections/cloud.html
deleted file mode 100644
index c5feee59..00000000
--- a/_includes/legacy/sections/cloud.html
+++ /dev/null
@@ -1,40 +0,0 @@
-{% include legacy/cardv2.html
-  title="Nextcloud"
-  image="/assets/img/legacy_svg/3rd-party/nextcloud.svg"
-  description="<strong>Nextcloud</strong> is a suite of free and open-source client-server software for creating your own file hosting services on a private server you control. It also comes with experimental <strong>zero trust</strong> end-to-end encryption. The only limits on storage and bandwidth are the limits on the server provider you choose."
-  website="https://nextcloud.com/"
-  privacy-policy="https://nextcloud.com/privacy/"
-  windows="https://nextcloud.com/install/#install-clients"
-  mac="https://nextcloud.com/install/#install-clients"
-  linux="https://nextcloud.com/install/#install-clients"
-  freebsd="https://www.freshports.org/www/nextcloud/"
-  openbsd="http://openports.se/www/nextcloud"
-  netbsd="http://pkgsrc.se/www/php-nextcloud"
-  fdroid="https://f-droid.org/packages/com.nextcloud.client/"
-  googleplay="https://play.google.com/store/apps/details?id=com.nextcloud.client"
-  ios="https://itunes.apple.com/us/app/nextcloud/id1125420102"
-  github="https://github.com/nextcloud"
-%}
-
-{% include legacy/cardv2.html
-  title="Tahoe-LAFS"
-  image="/assets/img/legacy_svg/3rd-party/tahoe-lafs.svg"
-  image-dark="/assets/img/legacy_svg/3rd-party/tahoe-lafs-dark.svg"
-  website="https://www.tahoe-lafs.org/"
-  description="<strong>Tahoe-LAFS</strong> is a free and open decentralized cloud storage system. It distributes your data across multiple servers. Even if some of the servers fail or are taken over by an attacker, the entire file store continues to function correctly, preserving your privacy and security. The servers used as storage pools do not have access to your data."
-  windows="https://github.com/tahoe-lafs/tahoe-lafs#via-pip"
-  mac="https://github.com/tahoe-lafs/tahoe-lafs#via-pip"
-  linux="https://github.com/tahoe-lafs/tahoe-lafs#using-os-packages"
-  netbsd="http://pkgsrc.se/filesystems/tahoe-lafs"
-  git="https://www.tahoe-lafs.org/trac/tahoe-lafs/browser"
-%}
-
-{% include legacy/cardv2.html
-  title="Proton Drive"
-  image="/assets/img/legacy_svg/3rd-party/protondrive.svg"
-  description="<strong>Proton Drive</strong> is an end-to-end encrypted general file storage service by ProtonMail. It is currently in beta and only is only available through a web client. As such, it is reliant on JavaScript to handle encryption, and you must trust ProtonMail to not inject any malicious JavaScript to get your private key. Consider using a different service if this does not fit your threat model."
-  website="https://protonmail.com/blog/proton-drive-early-access/"
-  privacy-policy="https://protonmail.com/privacy-policy"
-  github="https://github.com/ProtonMail/proton-drive"
-  web="https://protonmail.com/"
-%}
diff --git a/assets/img/cloud/nextcloud.svg b/assets/img/cloud/nextcloud.svg
new file mode 100644
index 00000000..823cb960
--- /dev/null
+++ b/assets/img/cloud/nextcloud.svg
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="128" height="128" version="1.1" viewBox="0 0 33.867 33.867" xmlns="http://www.w3.org/2000/svg"><path id="XMLID_107_" d="m16.959 5.8379c-3.5104 0-6.4858 2.3798-7.408 5.6042-0.80146-1.7103-2.5382-2.9085-4.5387-2.9085-2.7511 0-5.0126 2.2615-5.0126 5.0126 0 2.7511 2.2615 5.0137 5.0126 5.0137 2.0005 0 3.7373-1.1989 4.5387-2.9095 0.92217 3.2246 3.8975 5.6053 7.408 5.6053 3.4845 0 6.4447-2.3447 7.3904-5.533 0.81627 1.6717 2.5316 2.8372 4.5036 2.8372 2.7511 0 5.0137-2.2625 5.0137-5.0137 0-2.7511-2.2625-5.0126-5.0137-5.0126-1.9721 0-3.6874 1.1647-4.5036 2.8362-0.94575-3.188-3.9059-5.532-7.3904-5.532zm0 2.9425c2.65 0 4.7669 2.1159 4.7669 4.7659 0 2.65-2.1169 4.7669-4.7669 4.7669-2.65 0-4.7659-2.1169-4.7659-4.7669 0-2.65 2.1159-4.7659 4.7659-4.7659zm-11.947 2.6958c1.161 0 2.0711 0.90908 2.0711 2.0701 0 1.161-0.91012 2.0711-2.0711 2.0711-1.161 0-2.0701-0.91012-2.0701-2.0711 0-1.161 0.90909-2.0701 2.0701-2.0701zm23.841 0c1.161 0 2.0711 0.90908 2.0711 2.0701 0 1.161-0.91012 2.0711-2.0711 2.0711-1.161 0-2.0701-0.91012-2.0701-2.0711 0-1.161 0.90909-2.0701 2.0701-2.0701z" color="#000000" color-rendering="auto" fill="#0082c9" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-transform:none;white-space:normal"/><g transform="matrix(.13987 0 0 .13987 3.3867 17.958)" fill="#0082c9"><path id="XMLID_121_" d="m37.67 48.9c5.9 0 9.2 4.2 9.2 10.5 0 0.6-0.5 1.1-1.1 1.1h-15.9c0.1 5.6 4 8.8 8.5 8.8 2.8 0 4.8-1.2 5.8-2 0.6-0.4 1.1-0.3 1.4 0.3l0.3 0.5c0.3 0.5 0.2 1-0.3 1.4-1.2 0.9-3.8 2.4-7.3 2.4-6.5 0-11.5-4.7-11.5-11.5 0.1-7.2 4.9-11.5 10.9-11.5zm6.1 9.4c-0.2-4.6-3-6.9-6.2-6.9-3.7 0-6.9 2.4-7.6 6.9z"/><path id="XMLID_119_" d="m76.9 52.1v-7.7c0-0.7 0.4-1.1 1.1-1.1h0.8c0.7 0 1 0.4 1 1.1v5.2h4.5c0.7 0 1.1 0.4 1.1 1.1v0.3c0 0.7-0.4 1-1.1 1h-4.5v11c0 5.1 3.1 5.7 4.8 5.8 0.9 0.1 1.2 0.3 1.2 1.1v0.6c0 0.7-0.3 1-1.2 1-4.8 0-7.7-2.9-7.7-8.1z"/><path id="XMLID_117_" d="m99.8 48.9c3.8 0 6.2 1.6 7.3 2.5 0.5 0.4 0.6 0.9 0.1 1.5l-0.3 0.5c-0.4 0.6-0.9 0.6-1.5 0.2-1-0.7-2.9-2-5.5-2-4.8 0-8.6 3.6-8.6 8.9 0 5.2 3.8 8.8 8.6 8.8 3.1 0 5.2-1.4 6.2-2.3 0.6-0.4 1-0.3 1.4 0.3l0.3 0.4c0.3 0.6 0.2 1-0.3 1.5-1.1 0.9-3.8 2.8-7.8 2.8-6.5 0-11.5-4.7-11.5-11.5 0.1-6.8 5.1-11.6 11.6-11.6z"/><path id="XMLID_115_" d="m113.1 41.8c0-0.7-0.4-1.1 0.3-1.1h0.8c0.7 0 1.8 0.4 1.8 1.1v23.9c0 2.8 1.3 3.1 2.3 3.2 0.5 0 0.9 0.3 0.9 1v0.7c0 0.7-0.3 1.1-1.1 1.1-1.8 0-5-0.6-5-5.4z"/><path id="XMLID_112_" d="m133.6 48.9c6.4 0 11.6 4.9 11.6 11.4 0 6.6-5.2 11.6-11.6 11.6s-11.6-5-11.6-11.6c0-6.5 5.2-11.4 11.6-11.4zm0 20.4c4.7 0 8.5-3.8 8.5-9 0-5-3.8-8.7-8.5-8.7s-8.6 3.8-8.6 8.7c0.1 5.1 3.9 9 8.6 9z"/><path id="XMLID_109_" d="m183.5 48.9c5.3 0 7.2 4.4 7.2 4.4h0.1s-0.1-0.7-0.1-1.7v-9.9c0-0.7-0.3-1.1 0.4-1.1h0.8c0.7 0 1.8 0.4 1.8 1.1v28.5c0 0.7-0.3 1.1-1 1.1h-0.7c-0.7 0-1.1-0.3-1.1-1v-1.7c0-0.8 0.2-1.4 0.2-1.4h-0.1s-1.9 4.6-7.6 4.6c-5.9 0-9.6-4.7-9.6-11.5-0.2-6.8 3.9-11.4 9.7-11.4zm0.1 20.4c3.7 0 7.1-2.6 7.1-8.9 0-4.5-2.3-8.8-7-8.8-3.9 0-7.1 3.2-7.1 8.8 0.1 5.4 2.9 8.9 7 8.9z"/><path id="XMLID_103_" d="m1 71.4h0.8c0.7 0 1.1-0.4 1.1-1.1v-21.472c0-3.4 3.7-5.8277 7.9-5.8277s7.9 2.4277 7.9 5.8277v21.472c0 0.7 0.4 1.1 1.1 1.1h0.8c0.7 0 1-0.4 1-1.1v-21.6c0-5.7-5.7-8.5-10.9-8.5-5 0-10.7 2.8-10.7 8.5v21.6c0 0.7 0.3 1.1 1 1.1z"/><path id="XMLID_102_" d="m167.9 49.4h-0.8c-0.7 0-1.1 0.4-1.1 1.1v12.1c0 3.4-2.2 6.5-6.5 6.5-4.2 0-6.5-3.1-6.5-6.5v-12.1c0-0.7-0.4-1.1-1.1-1.1h-0.8c-0.7 0-1 0.4-1 1.1v12.9c0 5.7 4.2 8.5 9.4 8.5s9.4-2.8 9.4-8.5v-12.9c0.1-0.7-0.3-1.1-1-1.1z"/><path d="m68.908 49.236c-0.24494 0.0391-0.4801 0.20259-0.70508 0.4707l-4.0469 4.8242-3.0293 3.6094-4.5859-5.4668-2.4883-2.9668c-0.22498-0.26812-0.47975-0.41472-0.74414-0.4375-0.26439-0.02278-0.53852 0.07775-0.80664 0.30273l-0.61328 0.51367c-0.53623 0.44995-0.50854 0.94814-0.05859 1.4844l4.0488 4.8242 3.3574 4-4.916 5.8574c-0.0037 0.0044-0.0061 0.0093-0.0098 0.01367l-2.4805 2.9551c-0.44995 0.53623-0.39953 1.1008 0.13672 1.5508l0.61328 0.51172c0.53623 0.44995 1.0227 0.33701 1.4727-0.19922l4.0469-4.8242 3.0293-3.6094 4.5859 5.4668c3e-3 0.0036 0.0067 0.0062 0.0098 0.0098l2.4805 2.957c0.44995 0.53623 1.0126 0.58474 1.5488 0.13476l0.61328-0.51367c0.53623-0.44995 0.50854-0.94814 0.05859-1.4844l-4.0488-4.8242-3.3574-4 4.916-5.8574c0.0037-0.0044 0.0061-0.0093 0.0098-0.01367l2.4805-2.9551c0.44995-0.53623 0.39953-1.1008-0.13672-1.5508l-0.61328-0.51367c-0.26812-0.22498-0.52264-0.30864-0.76758-0.26953z"/></g></svg>
diff --git a/assets/img/legacy_svg/3rd-party/protondrive.svg b/assets/img/cloud/protondrive.svg
similarity index 100%
rename from assets/img/legacy_svg/3rd-party/protondrive.svg
rename to assets/img/cloud/protondrive.svg
diff --git a/assets/img/legacy_svg/3rd-party/tahoe-lafs-dark.svg b/assets/img/cloud/tahoe-lafs-dark.svg
similarity index 100%
rename from assets/img/legacy_svg/3rd-party/tahoe-lafs-dark.svg
rename to assets/img/cloud/tahoe-lafs-dark.svg
diff --git a/assets/img/legacy_svg/3rd-party/tahoe-lafs.svg b/assets/img/cloud/tahoe-lafs.svg
similarity index 100%
rename from assets/img/legacy_svg/3rd-party/tahoe-lafs.svg
rename to assets/img/cloud/tahoe-lafs.svg
diff --git a/collections/_evergreen/cloud.html b/collections/_evergreen/cloud.html
new file mode 100644
index 00000000..4cc77a6a
--- /dev/null
+++ b/collections/_evergreen/cloud.html
@@ -0,0 +1,16 @@
+---
+layout: evergreen
+title: Cloud Storage
+description: "If you are currently using a Cloud Storage Service like Dropbox, Google Drive, Microsoft OneDrive or Apple iCloud, you are putting complete trust in your service provider to not look at your files.
+
+Consider reducing the need to trust your provider, by using an alternative below that supports <a href='https://wikipedia.org/wiki/End-to-end_encryption'>end-to-end-encryption (E2EE)</a>."
+---
+
+{% for item_hash in site.data.providers.cloud %}
+{% assign item = item_hash[1] %}
+
+{% if item.type == "Recommendation" %}
+{% include recommendation-card.html %}
+{% endif %}
+
+{% endfor %}
diff --git a/legacy_pages/providers/cloud.html b/legacy_pages/providers/cloud.html
deleted file mode 100644
index 8114589f..00000000
--- a/legacy_pages/providers/cloud.html
+++ /dev/null
@@ -1,8 +0,0 @@
----
-layout: page
-permalink: /software/cloud/
-title: "Cloud Storage"
-description: "If you are currently using a Cloud Storage Services like Dropbox, Google Drive, Microsoft OneDrive or Apple iCloud, you are putting complete trust in your service provider to not look at your files. Consider using an alternative below to remove the need for that trust."
----
-
-{% include legacy/sections/cloud.html %}