diff --git a/_includes/sections/bios.html b/_includes/sections/bios.html
new file mode 100644
index 00000000..1f273087
--- /dev/null
+++ b/_includes/sections/bios.html
@@ -0,0 +1,26 @@
+<h1 id="laptops" class="anchor"><a href="#bios"><i class="fas fa-link anchor-icon"></i></a> BIOS</h1>
+<div class="row mb-2">
+
+     {% include card.html color="success"
+    title="Libreboot"
+    image="/assets/img/tools/libreboot.png"
+    url="https://libreboot.org/"
+    description="LibreBoot is a completely Libre BIOS."
+    %}
+
+     {% include card.html color="primary"
+    title="SeaBIOS"
+    image="/assets/img/tools/seabios.png"
+    url="https://www.seabios.org/"
+    description="Open Source BIOS for x86 computers."
+    %}
+
+     {% include card.html color="warning"
+    title="Coreboot"
+    labels="warning:warning Coreboot contains non-free dependencies. It is not recommended for sensitive information."
+    image="/assets/img/tools/coreboot.png"
+    url="https://www.coreboot.org/"
+    description="Coreboot is a lightweight bios for 32 bit and 64 bit operating systems."
+    %}
+
+ </div>
diff --git a/_includes/sections/key-manager b/_includes/sections/key-manager
new file mode 100644
index 00000000..ea02dbec
--- /dev/null
+++ b/_includes/sections/key-manager
@@ -0,0 +1,12 @@
+<h1 id="laptops" class="anchor"><a href="#laptops"><i class="fas fa-link anchor-icon"></i></a> Laptops</h1>
+<div class="row mb-2">
+
+     {% include card.html color="success"
+    title="NitroKey"
+    labels="warning:warning (<a href='https://github.com/Nitrokey/nitrokey-pro-firmware/issues/48'>more info</a>)Hardware may still contain some non-free components."
+    image="/assets/img/tools/nitrokey.png"
+    url="https://tehnoetic.com/"
+    description="USB key management devices focusing on security."
+    %}
+
+ </div>
diff --git a/_includes/sections/laptops.html b/_includes/sections/laptops.html
new file mode 100644
index 00000000..76b4316e
--- /dev/null
+++ b/_includes/sections/laptops.html
@@ -0,0 +1,38 @@
+<h1 id="laptops" class="anchor"><a href="#laptops"><i class="fas fa-link anchor-icon"></i></a> Laptops</h1>
+<div class="row mb-2">
+
+     {% include card.html color="success"
+    title="Technoethical"
+    image="/assets/img/tools/technoethical.png"
+    url="https://tehnoetic.com/"
+    description="Technoethical only sells grade A, high quality devices compatbile with fully free operating systems. All of their laptops come pre-installed with a completely libre BIOS (Libreboot)."
+    %}
+
+     {% include card.html color="primary"
+    title="Minifree"
+    image="/assets/img/tools/minifree"
+    url="https://minifree.org/"
+    description="Minifree sells hardware with zero non-free drivers. All of there laptops come pre-installed with LibreBoot."
+    %}
+
+     {% include card.html color="warning"
+    title="Purism"
+    labels="warning:warning (<a href='puri.sm/learn/freedom-roadmap/'>more info</a>):Purism laptops and tablets still contain some non-free components."
+    image="/assets/img/tools/purism.png"
+    url="https://puri.sm/"
+    description="Purism sells high-end hardware with kill switches and a de-blobbed ME. Due to non-free/proprietary dependencies they are not recommended sensitive information."
+    %}
+
+ </div>
+
+ <a>
+<b>Caution:</b> These companies may sell hardware with non-free software such as firmware. We recommend looking for products with free software certifications like <a href="https://certification.oshwa.org/">OSHWA</a>, <a href="https://ryf.fsf.org/">RYF</a>, or <a href="https://opensource.org/pressreleases/certified-open-source.php">OSI Certified</a>.
+
+ </a>
+
+ <h3>Worth Mentioning</h3>
+
+
+ <ul>
+    <li><a href="https://vikings.net/">Vikings Hardware</a> - Privacy-respecting servers and workstations</li>
+</ul>
diff --git a/_includes/sections/mobile.html b/_includes/sections/mobile.html
new file mode 100644
index 00000000..b5cf4339
--- /dev/null
+++ b/_includes/sections/mobile.html
@@ -0,0 +1,22 @@
+<h1 id="laptops" class="anchor"><a href="#laptops"><i class="fas fa-link anchor-icon"></i></a> Mobile</h1>
+<div class="row mb-2">
+
+<div class="alert alert-warning" role="alert">
+  <strong>Note: The utilization of a smartphone is not recommended due to lack of proper privacy-repsecting hardware.</strong>
+</div>
+
+     {% include card.html color="success"
+    title="Technoethical"
+    image="/assets/img/tools/technoethical.png"
+    url="https://tehnoetic.com/"
+    description="Technoethical only sells grade A, high quality devices compatbile with fully free operating systems. Their smartphones do stil contain some non-free software."
+    %}
+
+ </div>
+
+ <h3>Optimistic Upcoming Projects</h3>
+
+ <ul>
+    <li><a href="https://puri.sm/products/librem-5/">Librem5</a> - Smartphone by Purism that runs a completely free'd OS (PureOS).</li>
+    <li><a href="http://rhombus-tech.net/community_ideas/hybrid_phone/">EOMA68 Hybrid Phone</a> - A potentially free'd smartphone using the RISC-V architecture.</li>
+</ul>
diff --git a/_includes/sections/servers-desktops.html b/_includes/sections/servers-desktops.html
new file mode 100644
index 00000000..bb3533b1
--- /dev/null
+++ b/_includes/sections/servers-desktops.html
@@ -0,0 +1,20 @@
+<h1 id="laptops" class="anchor"><a href="#laptops"><i class="fas fa-link anchor-icon"></i></a> Laptops</h1>
+<div class="row mb-2">
+
+     {% include card.html color="success"
+    title="Vikings"
+    labels="warning:warning Hardware may still contain some non-free components."
+    image="/assets/img/tools/vikings.png"
+    url="https://vikings.net/"
+    description="Privacy-respecting servers and workstations."
+    %}
+
+
+ </div>
+ 
+  <h3>Worth Mentioning</h3>
+
+ <ul>
+    <li><a href="https://minifree.org/">Minifree</a> - LibreBooted hardware</li>
+    <li><a href="https://tehnoetic.com/">Technoethical</a> - Hardware manufacturer focusing on free software.</li>
+</ul>