diff --git a/_includes/sections/file-encryption.html b/_includes/sections/file-encryption.html
index 14965e88..c0fbb4b1 100644
--- a/_includes/sections/file-encryption.html
+++ b/_includes/sections/file-encryption.html
@@ -44,5 +44,5 @@
   <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://diskcryptor.net/">DiskCryptor</a> - A full disk and partition encryption system for Windows including the ability to encrypt the partition and disk on which the OS is installed.</li>
   <li><a href="https://gitlab.com/cryptsetup/cryptsetup/">Linux Unified Key Setup (LUKS)</a> - A full disk encryption system for Linux using dm-crypt as the disk encryption backend. Included by default in Ubuntu. Available for Windows and Linux.</li>
-  <li><a href="https://hat.sh/">Hat.sh is a cross-platform, serverless JavaScript web application that provides secure file encryption using the AES-256-GCM algorithm in your browser. It can also be downloaded and run offline.</a></li>
+  <li><a href="https://hat.sh/">Hat.sh</a> - A cross-platform, serverless JavaScript web application that provides secure file encryption using the AES-256-GCM algorithm in your browser. It can also be downloaded and run offline.</a></li>
 </ul>
diff --git a/_includes/sections/operating-systems.html b/_includes/sections/operating-systems.html
index dc8952de..1f1b66fc 100644
--- a/_includes/sections/operating-systems.html
+++ b/_includes/sections/operating-systems.html
@@ -15,16 +15,6 @@ github="https://github.com/QubesOS"
 tor="http://qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/"
 %}
 
-{% include cardv2.html
-title="Fedora Workstation"
-image="/assets/img/tools/Fedora.png"
-description='Fedora is a Linux distribution developed by the Fedora Project and sponsored by Red Hat. Fedora Workstation is a secure, reliable, and user-friendly edition developed for desktops and laptops, using GNOME as the default desktop environment.'
-badges="info:GNU/Linux"
-labels="warning:contrib:This software may depend on or recommend non-free software."
-website="https://getfedora.org/"
-git="https://src.fedoraproject.org/"
-%}
-
 {% include cardv2.html
 title="Debian"
 image="/assets/img/tools/Debian.png"
@@ -35,6 +25,15 @@ git="https://salsa.debian.org/qa/debsources"
 tor="http://sejnfjrq6szgca7v.onion"
 %}
 
+{% include cardv2.html
+title="Trisquel"
+image="/assets/img/tools/Trisquel.png"
+description='Trisquel is a Linux-based operating system derived from Ubuntu. The project aims for a fully free software system without proprietary software or firmware and uses Linux-libre, a version of the Linux kernel with the non-free code (binary blobs) removed.'
+badges="info:GNU/Linux"
+website="https://trisquel.info/"
+git="https://devel.trisquel.info/groups/trisquel"
+%}
+
 <h3>Warning</h3>
 
 <ul>
@@ -47,7 +46,6 @@ tor="http://sejnfjrq6szgca7v.onion"
   <li><a href="https://www.openbsd.org/">OpenBSD</a> <span class="badge badge-info">BSD</span> - A project that produces a free, multi-platform 4.4BSD-based UNIX-like operating system. Emphasizes portability, standardization, correctness, proactive security and integrated cryptography.</li>
   <li><a href="https://www.archlinux.org/">Arch Linux</a> <span class="badge badge-info">GNU/Linux</span> - A simple, lightweight Linux distribution. It is composed predominantly of free and open-source software, and supports community involvement. <a href="https://www.parabola.nu/">Parabola</a> is a
     completely open source version of Arch Linux.</li>
-  <li><a href="https://trisquel.info/">Trisquel</a> <span class="badge badge-info">GNU/Linux</span> - Derived from Ubuntu, this project aims for a fully free software system without proprietary software or firmware and uses Linux-libre, a version of the Linux kernel with the non-free code (binary blobs) removed.</li>
   <li><a href="https://www.whonix.org/">Whonix</a> <span class="badge badge-info">GNU/Linux</span> - A Debian-based security-focused Linux distribution. It aims to provide privacy, security and anonymity on the internet. The operating system consists of two virtual machines, a "Workstation"
     and a Tor "Gateway". All communication are forced through the Tor network to accomplish this.</li>
 </ul>
diff --git a/assets/img/tools/Fedora.png b/assets/img/tools/Fedora.png
deleted file mode 100644
index 52065868..00000000
Binary files a/assets/img/tools/Fedora.png and /dev/null differ
diff --git a/assets/img/tools/Trisquel.png b/assets/img/tools/Trisquel.png
new file mode 100644
index 00000000..82db24b2
Binary files /dev/null and b/assets/img/tools/Trisquel.png differ