diff --git a/content-template.html b/content-template.html
index d5406228..43d884d7 100644
--- a/content-template.html
+++ b/content-template.html
@@ -17,7 +17,7 @@
             <div class="panel-body">
               <p><img src="img/tools/XXXXXXXXXXXXXXXXXX" alt="XXXXXXXXXXXXXXXXXX" align="right" style="margin-left:5px;">XXXXXXXXXXXXXXXXXX</p>
               
-              <p><a href="XXXXXXXXXXXXXXXXXX" target="_blank"><button type="button" class="btn btn-success">Website: XXXXXXXXXXXXXXXXXX</button></a></p>
+              <p><a href="XXXXXXXXXXXXXXXXXX"><button type="button" class="btn btn-success">Website: XXXXXXXXXXXXXXXXXX</button></a></p>
               <p>Available for: XXXXXXXXXXXXXXXXXX.</p>          
             </div>
           </div>
@@ -30,7 +30,7 @@
             <div class="panel-body">
               <p><img src="img/tools/XXXXXXXXXXXXXXXXXX" alt="XXXXXXXXXXXXXXXXXX" align="right" style="margin-left:5px;">XXXXXXXXXXXXXXXXXX</p>
               
-              <p><a href="XXXXXXXXXXXXXXXXXX" target="_blank"><button type="button" class="btn btn-info">Website: XXXXXXXXXXXXXXXXXX</button></a></p>
+              <p><a href="XXXXXXXXXXXXXXXXXX"><button type="button" class="btn btn-info">Website: XXXXXXXXXXXXXXXXXX</button></a></p>
               <p>Available for: XXXXXXXXXXXXXXXXXX.</p>          
             </div>
           </div>
@@ -43,7 +43,7 @@
             <div class="panel-body">
               <p><img src="img/tools/XXXXXXXXXXXXXXXXXX" alt="XXXXXXXXXXXXXXXXXX" align="right" style="margin-left:5px;">XXXXXXXXXXXXXXXXXX</p>
               
-              <p><a href="XXXXXXXXXXXXXXXXXX" target="_blank"><button type="button" class="btn btn-warning">Website: XXXXXXXXXXXXXXXXXX</button></a></p>
+              <p><a href="XXXXXXXXXXXXXXXXXX"><button type="button" class="btn btn-warning">Website: XXXXXXXXXXXXXXXXXX</button></a></p>
               <p>Available for: XXXXXXXXXXXXXXXXXX.</p>          
             </div>
           </div>
@@ -53,7 +53,7 @@
 
 <h3>Worth Mentioning</h3>
 <ul>
-	<li><a href="XXXXXXXXXXXXXXXXXX" target="_blank">XXXXXXXXXXXXXXXXXX</a> - XXXXXXXXXXXXXXXXXX.</li>      
-	<li><a href="XXXXXXXXXXXXXXXXXX" target="_blank">XXXXXXXXXXXXXXXXXX</a> - XXXXXXXXXXXXXXXXXX.</li>  
-	<li><a href="XXXXXXXXXXXXXXXXXX" target="_blank">XXXXXXXXXXXXXXXXXX</a> - XXXXXXXXXXXXXXXXXX.</li>      
+	<li><a href="XXXXXXXXXXXXXXXXXX">XXXXXXXXXXXXXXXXXX</a> - XXXXXXXXXXXXXXXXXX.</li>      
+	<li><a href="XXXXXXXXXXXXXXXXXX">XXXXXXXXXXXXXXXXXX</a> - XXXXXXXXXXXXXXXXXX.</li>  
+	<li><a href="XXXXXXXXXXXXXXXXXX">XXXXXXXXXXXXXXXXXX</a> - XXXXXXXXXXXXXXXXXX.</li>      
 </ul>
diff --git a/index.html b/index.html
index 7418b8c5..637dcad1 100644
--- a/index.html
+++ b/index.html
@@ -2406,7 +2406,7 @@
             <div class="panel-body">
               <p><img src="img/tools/Ghostbin.png" alt="Ghostbin" align="right" style="margin-left:5px;">Ghostbin supports encryption, expiration, sessions, grant users to edit your notes and pastes up to one megabyte. You can also create your own account to keep track of your pastes.</p>
               
-              <p><a href="https://ghostbin.com/" target="_blank"><button type="button" class="btn btn-success">Website: ghostbin.com</button></a></p>          
+              <p><a href="https://ghostbin.com/"><button type="button" class="btn btn-success">Website: ghostbin.com</button></a></p>          
             </div>
           </div>
         </div><!-- /.col-sm-4 -->  
@@ -2418,7 +2418,7 @@
             <div class="panel-body">
               <p><img src="img/tools/PrivateBin.png" alt="PrivateBin" align="right" style="margin-left:5px;">PrivateBin is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted in the browser using 256bit AES.</p>
               
-              <p><a href="https://privatebin.info/" target="_blank"><button type="button" class="btn btn-info">Website: privatebin.info</button></a></p>         
+              <p><a href="https://privatebin.info/"><button type="button" class="btn btn-info">Website: privatebin.info</button></a></p>         
             </div>
           </div>
         </div><!-- /.col-sm-4 -->            
@@ -2430,7 +2430,7 @@
             <div class="panel-body">
               <p><img src="img/tools/0bin.png" alt="0bin" align="right" style="margin-left:5px;">0bin is a client side encrypted pastebin that can run without a database. 0bin allows anybody to host a pastebin while welcoming any type of content to be pasted in it.</p>
               
-              <p><a href="https://0bin.net/" target="_blank"><button type="button" class="btn btn-warning">Website: 0bin.net</button></a></p>          
+              <p><a href="https://0bin.net/"><button type="button" class="btn btn-warning">Website: 0bin.net</button></a></p>          
             </div>
           </div>
         </div><!-- /.col-sm-4 -->  
@@ -2438,7 +2438,7 @@
 
   <h3>Worth Mentioning</h3>
   <ul>
-	  <li><a href="https://hastebin.com/" target="_blank">hastebin.com</a> - Haste is an open-source pastebin software written in node.js, which is easily installable in any network.</li>          
+	  <li><a href="https://hastebin.com/">hastebin.com</a> - Haste is an open-source pastebin software written in node.js, which is easily installable in any network.</li>          
   </ul>
 
 
@@ -2782,7 +2782,7 @@
             </div>
             <div class="panel-body">
               <p><img src="img/tools/Purism.png" alt="Purism" align="right" style="margin-left:5px;">High-quality privacy, security, and freedom focused computers and software. A convenient hardware and software product.</p>
-              <p><a href="https://puri.sm/" target="_blank"><button type="button" class="btn btn-success">Website: puri.sm</button></a></p>         
+              <p><a href="https://puri.sm/"><button type="button" class="btn btn-success">Website: puri.sm</button></a></p>         
             </div>
           </div>
         </div><!-- /.col-sm-4 -->  
@@ -2793,7 +2793,7 @@
             </div>
             <div class="panel-body">
               <p><img src="img/tools/ORWL.png" alt="ORWL" align="right" style="margin-left:5px;">The only open source consumer device using secure NFC protection and requiring two factors of authentication, a key and password.</p>
-              <p><a href="https://orwl.org/" target="_blank"><button type="button" class="btn btn-info">Website: orwl.org</button></a></p>
+              <p><a href="https://orwl.org/"><button type="button" class="btn btn-info">Website: orwl.org</button></a></p>
             </div>
           </div>
         </div><!-- /.col-sm-4 -->            
@@ -2804,7 +2804,7 @@
             </div>
             <div class="panel-body">
               <p><img src="img/tools/USB-armory.png" alt="USB armory" align="right" style="margin-left:5px;">An open source USB stick computer for security applications. Usage ideas: OpenSSH client, VPN tunneling, Tor bridge, electronic wallet.</p>
-              <p><a href="https://inversepath.com/usbarmory.html" target="_blank"><button type="button" class="btn btn-warning">Website: inversepath.com</button></a></p>        
+              <p><a href="https://inversepath.com/usbarmory.html"><button type="button" class="btn btn-warning">Website: inversepath.com</button></a></p>        
             </div>
           </div>
         </div><!-- /.col-sm-4 -->  
@@ -2813,8 +2813,14 @@
 
 <h3>Worth Mentioning</h3>
 <ul>
-	<li><a href="https://www.fsf.org/resources/hw" target="_blank">Free Software Foundation</a> - Hardware Devices that Support GNU/Linux.</li>
-	<li><a href="https://h-node.org/" target="_blank">h-node.org</a> - Collection about hardware that works with a fully free operating system.</li>
+	<li>Modified ThinkPads with Libreboot and Trisquel: <a href="https://shop.libiquity.com/product/taurinus-x200">Libiquity.com</a> (US), <a href="https://tehnoetic.com/tet-x200">Technoethical</a> (Romania) and <a href="https://store.vikings.net/libre-friendly-hardware/x200-ryf-certfied">Vikings.net</a> (Germany)</li>
+	<li><a href="https://minifree.org/">Ministry of Freedom</a> - Minifree provides secure, privacy-respecting computers with 100% free (as in freedom) software, including the Libreboot BIOS replacement and GNU+Linux operating system, certified by FSF under their Respects Your Freedom certification program. Shipping worldwide.
+</ul>
+
+<h3>Related Information</h3>
+<ul>
+	<li><a href="https://www.fsf.org/resources/hw">Free Software Foundation</a> - Hardware Devices that Support GNU/Linux.</li>
+	<li><a href="https://h-node.org/">h-node.org</a> - Collection about hardware that works with a fully free operating system.</li>
 </ul>