diff --git a/_includes/sections/cloud-storage.html b/_includes/sections/cloud-storage.html
index b02595b3..ab2de826 100644
--- a/_includes/sections/cloud-storage.html
+++ b/_includes/sections/cloud-storage.html
@@ -28,8 +28,9 @@
 
 </div>
 
-<h3>Related Information</h3>
+<h3>Worth Mentioning</h3>
 
 <ul>
   <li><a href="https://cryptomator.org/">Cryptomator</a> - Free client-side AES encryption for your cloud files. Open source software: No backdoors, no registration.</li>
+  <li><a href="https://cryptpad.fr">CryptPad</a> - Free and end-to-end encrypted real time collaboration sharing folders, media, and documents.</li>
 </ul>
diff --git a/_includes/sections/productivity-tools.html b/_includes/sections/productivity-tools.html
index 96c72e51..f9f4fc6b 100644
--- a/_includes/sections/productivity-tools.html
+++ b/_includes/sections/productivity-tools.html
@@ -3,6 +3,16 @@
 <div class="row mb-2">
 
   {% include card.html color="success"
+    title="CryptPad"
+    image="assets/img/provider/CryptPad.png"
+
+    description="CryptPad is a private-by-design alternative to popular office tools and cloud services. All content is end-to-end encrypted. It is free and open source, enabling anyone to verify its security by auditing the code. The development team is supported by donations and grants. No registration is required, and it can be used anonymously via Tor browser."
+
+    url="https://cryptpad.fr/"
+    footer='OS: Linux, macOS, Windows, Web.'
+  %}
+
+  {% include card.html color="primary"
   title="Etherpad"
   image="assets/img/tools/Etherpad.png"
   url="http://etherpad.org/"
@@ -10,7 +20,7 @@
   description="Etherpad is a highly customizable Open Source online editor providing collaborative editing in really real-time. Etherpad allows you to edit documents collaboratively in real-time, much like a live multi-player editor that runs in your browser. Write articles, press releases, to-do lists, etc."
   %}
 
-  {% include card.html color="primary"
+  {% include card.html color="warning"
   title="Write.as"
   image="assets/img/tools/WriteAs.png"
   url="https://write.as/"
@@ -19,14 +29,6 @@
   description="Write.as is a cross-platform, privacy-oriented blogging platform. It's anonymous by default, letting you publish without signing up. If you create an account, it doesn't require any personal information. No ads, distraction-free, and built on a sustainable business model."
   %}
 
-  {% include card.html color="warning"
-  title="ProtectedText"
-  image="assets/img/tools/ProtectedText.png"
-  url="https://www.protectedtext.com/"
-  footer="OS: All Browsers."
-  description="ProtectedText is an open source web application. It encrypts and decrypts text in the browser, and password (or its hash) is never sent to the server - so that text can't be decrypted even if requested by authorities. No cookies, no sessions, no registration, no users tracking."
-  %}
-
 </div>
 
 <h3>Worth Mentioning</h3>
diff --git a/_includes/sections/selfhosted-cloud.html b/_includes/sections/selfhosted-cloud.html
index dfbee8a6..f065b857 100644
--- a/_includes/sections/selfhosted-cloud.html
+++ b/_includes/sections/selfhosted-cloud.html
@@ -33,3 +33,9 @@
   %}
 
 </div>
+
+<h3>Worth Mentioning</h3>
+<ul>
+  <li><a href="https://github.com/xwiki-labs/cryptpad/">CryptPad</a> - End-to-end encrypted real time collaboration sharing folders, media, and documents (open-source).</li>
+</ul>
+
diff --git a/assets/img/provider/CryptPad.png b/assets/img/provider/CryptPad.png
new file mode 100644
index 00000000..ae6f34b3
Binary files /dev/null and b/assets/img/provider/CryptPad.png differ