diff --git a/_includes/nav.html b/_includes/nav.html
index 138e7e8b..9a09bed1 100644
--- a/_includes/nav.html
+++ b/_includes/nav.html
@@ -68,6 +68,11 @@
             <a class="dropdown-item" href="/operating-systems/#firmware"><i class="fas fa-signal fa-fw"></i> Router Firmware</a>
           </div>
         </li>
+        
+        <li class="nav-item">
+          <a class="nav-link" href="/hardware/">Hardware</a>
+        </li>
+        
         <li class="nav-item">
           <a class="nav-link" href="/index.html#participate">Participate</a>
         </li>
diff --git a/_includes/sections/bios.html b/_includes/sections/bios.html
new file mode 100644
index 00000000..caeba817
--- /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/diy-hardware.html b/_includes/sections/diy-hardware.html
new file mode 100644
index 00000000..720a1666
--- /dev/null
+++ b/_includes/sections/diy-hardware.html
@@ -0,0 +1,34 @@
+<h1 id="clients" class="anchor"><a href="#diy"><i class="fas fa-link anchor-icon"></i></a> DIY Hardware</h1>
+
+{% include cardv2.html
+title="ZeroCat"
+image="/assets/img/tools/zerocat.png"
+description="ZeroCat is a DIY hardware manufacuter with a focus on free software. Warning: Not all of their hardware is yet compleely free'd."
+website="http://zerocat.org/"
+forum=""
+github=""
+windows=""
+mac=""
+linux=""
+bsd=""
+%}
+
+{% include cardv2.html
+title="ThinkPenguin.com"
+image="/assets/img/tools/thinkpenguin.png"
+description="ThinkPenguin.com sells hardware with zero non-free drivers."
+website="https://www.thinkpenguin.com/"
+forum=""
+git=""
+windows=""
+mac=""
+linux=""
+bsd=""
+%}
+
+
+ <h3>Worth Mentioning</h3>
+
+ <ul>
+    <li><a href="https://shop.phreedom2600.net">Phreedom2600</a> - Open Hardware DIY Tools</li>
+</ul>
diff --git a/_includes/sections/hardware-learn-more.html b/_includes/sections/hardware-learn-more.html
new file mode 100644
index 00000000..acff20c8
--- /dev/null
+++ b/_includes/sections/hardware-learn-more.html
@@ -0,0 +1,9 @@
+<h1 id="resources" class="anchor"><a href="#Hardware-resources"><i class="fas fa-link anchor-icon"></i></a> More Hardware Resources</h1>
+
+<h3>Related</h3>
+
+<ul>
+  <li><a href="https://www.wikipedia.org/wiki/Mycroft_(software)"><strong>Mycroft</strong></a> - A potentially free software voice assistant.</li>
+</ul>
+
+<p>Note: Just being free software does not make software secure!</p>
diff --git a/_includes/sections/key-manager.html b/_includes/sections/key-manager.html
new file mode 100644
index 00000000..584fed8e
--- /dev/null
+++ b/_includes/sections/key-manager.html
@@ -0,0 +1,12 @@
+<h1 id="key-manager" class="anchor"><a href="#key-manager"><i class="fas fa-link anchor-icon"></i></a> Key Managers</h1>
+<div class="row mb-2">
+
+     {% include card.html color="success"
+    title="NitroKey"
+    labels="warning:warning (<a href='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://www.nitrokey.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..41f87e74
--- /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.png"
+    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..145442e2
--- /dev/null
+++ b/_includes/sections/mobile.html
@@ -0,0 +1,22 @@
+<h1 id="mobile" class="anchor"><a href="#mobile"><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/routers.html b/_includes/sections/routers.html
new file mode 100644
index 00000000..1a488ee3
--- /dev/null
+++ b/_includes/sections/routers.html
@@ -0,0 +1,19 @@
+<h1 id="routers" class="anchor"><a href="#routers"><i class="fas fa-link anchor-icon"></i></a> Routers</h1>
+<div class="row mb-2">
+
+     {% include card.html color="success"
+    title="Minifree"
+    image="/assets/img/tools/minifree.png"
+    url="https://minifree.org/"
+    description="Minifree sells hardware with zero non-free drivers. All of there routets come pre-installed with LibreCMC."
+    %}
+
+     {% include card.html color="primary"
+    title="ThinkPenguin.com"
+    labels="warning:warning:ThinkPenguin.com may sell hardware with non-free software such as firmware. We recommend finding products with free software certifications."
+    image="/assets/img/tools/thinkpenguin.png"
+    url="https://www.thinkpenguin.com/"
+    description="ThinkPenguin.com sells hardware with zero non-free drivers."
+    %}
+
+</div>
diff --git a/_includes/sections/servers-desktops.html b/_includes/sections/servers-desktops.html
new file mode 100644
index 00000000..e1986d64
--- /dev/null
+++ b/_includes/sections/servers-desktops.html
@@ -0,0 +1,21 @@
+<h1 id="servers" class="anchor"><a href="#servers"><i class="fas fa-link anchor-icon"></i></a> Servers and Desktops</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>
+    <li><a href="https://raptorcs.com/TALOSII/">Talos</a> - Hardware manufacturer with a Libre BIOS.</li>
+</ul>
diff --git a/assets/img/tools/coreboot.png b/assets/img/tools/coreboot.png
new file mode 100644
index 00000000..d134d52d
Binary files /dev/null and b/assets/img/tools/coreboot.png differ
diff --git a/assets/img/tools/libreboot.png b/assets/img/tools/libreboot.png
new file mode 100644
index 00000000..1de93c24
Binary files /dev/null and b/assets/img/tools/libreboot.png differ
diff --git a/assets/img/tools/minifree.png b/assets/img/tools/minifree.png
new file mode 100644
index 00000000..c4a2a80c
Binary files /dev/null and b/assets/img/tools/minifree.png differ
diff --git a/assets/img/tools/nitrokey.png b/assets/img/tools/nitrokey.png
new file mode 100644
index 00000000..6b62ed24
Binary files /dev/null and b/assets/img/tools/nitrokey.png differ
diff --git a/assets/img/tools/purism.png b/assets/img/tools/purism.png
new file mode 100644
index 00000000..48667c4e
Binary files /dev/null and b/assets/img/tools/purism.png differ
diff --git a/assets/img/tools/technoethical.png b/assets/img/tools/technoethical.png
new file mode 100644
index 00000000..c9fb085e
Binary files /dev/null and b/assets/img/tools/technoethical.png differ
diff --git a/assets/img/tools/thinkpenguin.png b/assets/img/tools/thinkpenguin.png
new file mode 100644
index 00000000..fbd9e892
Binary files /dev/null and b/assets/img/tools/thinkpenguin.png differ
diff --git a/assets/img/tools/vikings.png b/assets/img/tools/vikings.png
new file mode 100644
index 00000000..6e9bc23d
Binary files /dev/null and b/assets/img/tools/vikings.png differ
diff --git a/assets/img/tools/zerocat.png b/assets/img/tools/zerocat.png
new file mode 100644
index 00000000..28820904
Binary files /dev/null and b/assets/img/tools/zerocat.png differ
diff --git a/pages/hardware.html b/pages/hardware.html
new file mode 100644
index 00000000..ab08c201
--- /dev/null
+++ b/pages/hardware.html
@@ -0,0 +1,26 @@
+---
+layout: page
+permalink: /hardware/
+title: "Hardware"
+description: "Privacy isn't all about the software you use. Discover hardware dedicated to protecting your data and security."
+---
+
+<div class="alert alert-warning" role="alert">
+  <strong>Note: 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>.</strong>
+</div>
+
+{% include sections/laptops.html %}
+
+{% include sections/servers-desktops.html %}
+
+{% include sections/mobile.html %}
+
+{% include sections/key-manager.html %}
+
+{% include sections/routers.html %}
+
+{% include sections/bios.html %}
+
+{% include sections/diy-hardware.html %}
+
+{% include sections/hardware-learn-more.html %}
diff --git a/pages/old.html b/pages/old.html
index eed694b7..d29cfc3d 100644
--- a/pages/old.html
+++ b/pages/old.html
@@ -29,6 +29,20 @@ permalink: /classic/
 
 {% include sections/browser-tweaks.html %}
 
+{% include sections/laptops.html %}
+
+{% include sections/servers-desktops.html %}
+
+{% include sections/mobile.html %}
+
+{% include sections/key-manager.html %}
+
+{% include sections/routers.html %}
+
+{% include sections/bios.html %}
+
+{% include sections/diy-hardware.html %}
+
 {% include sections/email-providers.html %}
 
 {% include sections/email-clients.html %}