Changed some missing badges over to the new format

_includes/sections/file-sharing.html

@@ -46,7 +46,14 @@ netbsd="https://pypi.org/project/magic-wormhole/"
 <h3>Worth Mentioning</h3>
 
 <ul>
-  <li><a href="https://framadrop.org/">FramaDrop</a> - Stores a file of any size for 24h. Data is end-to-end encrypted from your browser, powered by <a href="https://framagit.org/fiat-tux/hat-softwares/lufi">LuFi</a>. <span class="badge badge-warning" data-toggle="tooltip" title="FramaDrop logs IP addresses and fingerprints the browser for an unclear amount of time."><a href="https://framasoft.org/en/cgu/"><i class="fas fa-exclamation-triangle"></i></a></span></li>
+  <li><a href="https://framadrop.org/">FramaDrop</a> - Stores a file of any size for 24h. Data is end-to-end encrypted from your browser, powered by <a href="https://framagit.org/fiat-tux/hat-softwares/lufi">LuFi</a>.
+    {% include badge.html
+    color="warning"
+    icon="fas fa-exclamation-triangle"
+    link="https://framasoft.org/en/cgu/"
+    tooltip="FramaDrop logs IP addresses and fingerprints the browser for an unclear amount of time."
+    %}
+  </li>
   <li><a href="https://github.com/schollz/croc">croc</a> - Easily and securely send arbitrary-sized files from one computer to another. Similar to Magic Wormhole but without dependencies.</li>
   <li><a href="https://freedombox.org/">FreedomBox</a> - Designed to be your own inexpensive server at home. It runs free software and offers an increasing number of services ranging from a calendar or XMPP server, to a wiki, or VPN.</li>
 </ul>

_includes/sections/live-operating-systems.html

@@ -15,12 +15,19 @@ git="https://git-tails.immerda.ch/tails/"
 <ul>
   <li>
     <a href="https://getfedora.org/">Fedora Workstation</a>
-    <span class="badge badge-info">GNU/Linux</span>
+    {% include badge.html
+    color="info"
+    text="GNU/Linux"
+    %}
     - 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.
   </li>
+
   <li>
     <a href="https://debian.org/">Debian</a>
-    <span class="badge badge-info">GNU/Linux</span>
+    {% include badge.html
+    color="info"
+    text="GNU/Linux"
+    %}
     - Debian is a Unix-like computer operating system and a Linux distribution that is composed entirely of free and open-source software, most of which is under the GNU General Public License, and packaged by a group of individuals known as the Debian project.
   </li>
 </ul>

_includes/sections/mobile-operating-systems.html

@@ -40,7 +40,41 @@ github="https://github.com/ubports"
 <h3>Worth Mentioning</h3>
 
 <ul>
-  <li><a href="https://www.replicant.us/">Replicant</a> <span class="badge badge-info">AOSP</span> - An open-source operating system based on Android, aiming to replace all proprietary components with free software.</li>
+  <li><a href="https://www.replicant.us/">Replicant</a>
-  <li><a href="https://www.omnirom.org/">OmniROM</a> <span class="badge badge-info">AOSP</span> <span class="badge badge-warning" data-toggle="tooltip" title="This software may depend on or recommend non-free software.">contrib <i class="far fa-question-circle"></i></span> - A free-software operating system for smartphones and tablet computers, based on the Android mobile platform.</li>
+    {% include badge.html
-  <li><a href="https://microg.org/">MicroG</a> <span class="badge badge-info">Add-on Package</span> <span class="badge badge-warning" data-toggle="tooltip" title="This software may depend on or recommend non-free software.">contrib <i class="far fa-question-circle"></i></span> - A project that aims to reimplement the proprietary Google Play Services in the Android operating system with a FLOSS replacement. The microG project also maintains a fork of LineageOS with microG and F-Droid preinstalled at <a href="https://lineage.microg.org/">Lineage for microG</a>.</li>
+    color="info"
+    text="AOSP"
+    %}
+    - An open-source operating system based on Android, aiming to replace all proprietary components with free software.
+  </li>
+
+  <li>
+    <a href="https://www.omnirom.org/">OmniROM</a>
+    {% include badge.html
+    color="info"
+    text="AOSP"
+    %}
+    {% include badge.html
+    color="warning"
+    icon="far fa-question-circle"
+    text="contrib"
+    tooltip="This software may depend on or recommend non-free software."
+    %}
+    - A free-software operating system for smartphones and tablet computers, based on the Android mobile platform.
+  </li>
+
+  <li>
+    <a href="https://microg.org/">MicroG</a>
+    {% include badge.html
+    color="info"
+    text="Add-on Package"
+    %}
+    {% include badge.html
+    color="warning"
+    icon="far fa-question-circle"
+    text="contrib"
+    tooltip="This software may depend on or recommend non-free software."
+    %}
+    - A project that aims to reimplement the proprietary Google Play Services in the Android operating system with a FLOSS replacement. The microG project also maintains a fork of LineageOS with microG and F-Droid preinstalled at <a href="https://lineage.microg.org/">Lineage for microG</a>.
+  </li>
 </ul>

_includes/sections/operating-systems.html

@@ -41,10 +41,46 @@ gitlab="https://salsa.debian.org/qa/debsources"
 <h3>Worth Mentioning</h3>
 
 <ul>
-  <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.openbsd.org/">OpenBSD</a>
-  <li><a href="https://www.archlinux.org/">Arch Linux</a> <span class="badge badge-info">GNU/Linux</span> <span class="badge badge-warning" data-toggle="tooltip" title="This software may depend on or recommend non-free software.">contrib <i class="far fa-question-circle"></i></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
+    {% include badge.html
-    completely open source version of Arch Linux.</li>
+    color="info"
-  <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>
+    text="BSD"
-  <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>
+    - 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>
+    {% include badge.html
+    color="info"
+    text="GNU/Linux"
+    %}
+    {% include badge.html
+    color="warning"
+    icon="far fa-question-circle"
+    text="contrib"
+    tooltip="This software may depend on or recommend non-free software."
+    %}
+    - 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>
+    {% include badge.html
+    color="info"
+    text="GNU/Linux"
+    %}
+    - 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>
+    {% include badge.html
+    color="info"
+    text="GNU/Linux"
+    %}
+    - 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>

_includes/sections/router-firmware.html

@@ -36,6 +36,27 @@ git="https://gogs.librecmc.org/libreCMC/libreCMC"
 <h3>Worth Mentioning</h3>
 
 <ul>
-  <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>
-  <li><a href="https://dd-wrt.com/">DD-WRT</a> <span class="badge badge-info">Linux</span> <span class="badge badge-warning" data-toggle="tooltip" title="This software may depend on or recommend non-free software.">contrib <i class="far fa-question-circle"></i></span> - A Linux-based open-source firmware compatible with several models of routers and access points.</li>
+    <a href="https://www.openbsd.org/">OpenBSD</a>
+    {% include badge.html
+    color="info"
+    text="BSD"
+    %}
+    - 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://dd-wrt.com/">DD-WRT</a>
+    {% include badge.html
+    color="info"
+    text="GNU/Linux"
+    %}
+    {% include badge.html
+    color="warning"
+    icon="far fa-question-circle"
+    text="contrib"
+    tooltip="This software may depend on or recommend non-free software."
+    %}
+    - A Linux-based open-source firmware compatible with several models of routers and access points.
+  </li>
 </ul>

_includes/sections/voice-video-messenger.html

@@ -39,17 +39,24 @@ ios="https://apps.apple.com/us/app/mumble/id443472808?ls=1"
 <ul>
   <li>
     <a href="https://jitsi.org/jitsi-meet/">Jitsi Meet</a> - Jitsi Meet is a free and open-source multiplatform voice (VoIP), video conferencing, and instant messaging application.
-    <span class="badge badge-warning"
+
-      data-toggle="tooltip"
+    {% include badge.html
-      title="Our Firefox tweaks recommend disabling WebRTC as it can be used to leak your IP address even behind a VPN, which is why Tor Browser disables it.">Requires WebRTC
+    color="warning"
-    </span>
+    icon="fas fa-exclamation-triangle"
-    <span class="badge badge-warning">
+    text="Requires WebRTC"
-      <a href="https://jitsi.org/security">Multiparty meetings are not E2EE</a>
+    tooltip="Our Firefox tweaks recommend disabling WebRTC as it can be used to leak your IP address even behind a VPN, which is why Tor Browser disables it."
-    </span>
+    %}
+
+    {% include badge.html
+    color="warning"
+    icon="fas fa-exclamation-triangle"
+    link="https://jitsi.org/security"
+    text="Multiparty meetings are not E2EE"
+    %}
+
     See also <a href="https://github.com/jitsi/jitsi-meet/wiki/Jitsi-Meet-Instances">list of public Jitsi Meet instances</a>.
   </li>
 </ul>
-
 <h3>Related Information</h3>
 
 <ul>