diff --git a/index.html b/index.html
index 947b5df7..66e94129 100644
--- a/index.html
+++ b/index.html
@@ -1,15 +1,22 @@
+ <!-- force browser to interpret this as an html5 page -->
 <!DOCTYPE html>
+
+<!-- set the default language as English -->
 <html lang="en">
+
 <head>
+
+<!-- tags for Search Engine Optimization --> 
 <meta charset="utf-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=1024">
-
 <meta name="keywords" content="privacy tools, surveillance, encryption, edward snowden, nsa, tor, bitcoin">
 <meta name="description" content="You are being watched. Private and state-sponsored organizations are monitoring and recording your online activities. privacytools.io provides knowledge and tools to protect your privacy against global mass surveillance.">
 
+<!-- title -->
 <title>privacy tools - encryption against global mass surveillance 🔒</title>
 
+<!-- icons -->
 <link rel="apple-touch-icon" sizes="57x57" href="https://www.privacytools.io/img/favicons/apple-touch-icon-57x57.png">
 <link rel="apple-touch-icon" sizes="60x60" href="https://www.privacytools.io/img/favicons/apple-touch-icon-60x60.png">
 <link rel="apple-touch-icon" sizes="72x72" href="https://www.privacytools.io/img/favicons/apple-touch-icon-72x72.png">
@@ -30,6 +37,7 @@
 <meta name="msapplication-config" content="https://www.privacytools.io/img/favicons/browserconfig.xml">
 <meta name="theme-color" content="#ffffff">
 
+<!-- css stylesheets -->
 <link href="css/bootstrap.min.css" rel="stylesheet">
 <link href="css/bootstrap-theme.min.css" rel="stylesheet">
 <link href="css/font-awesome.min.css" rel="stylesheet">
@@ -41,6 +49,7 @@
       <script src="js/respond.min.js"></script>
 <![endif]-->
 
+<!-- Open Graph Protocol tags for SEO -->
 <meta property="og:title" content="privacy tools - encryption against surveillance"/>
 <meta property="og:type" content="website"/>
 <meta property="og:url" content="https://www.privacytools.io/"/>
@@ -53,7 +62,7 @@
 
 <body>
 
-<!-- navigation starts here -->
+<!-- navigation starts -->
 <nav class="navbar navbar-inverse navbar-fixed-top">
 <div class="container">
 <div class="navbar-header">
@@ -69,51 +78,56 @@
 
 <ul class="nav navbar-nav">
 
+<!-- home icon in the navigation bar -->
 <li><a href="https://www.privacytools.io/"><span class="glyphicon glyphicon-home"></span></a></li>
 
+<!-- drop down menu - Provider -->
 <li class="dropdown">
 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Provider<span class="caret"></span></a>
-<ul class="dropdown-menu" role="menu">
-<li><a href="#ukusa">Avoid all US and UK based services</a></li>
-<li><a href="#vpn">Virtual Private Network (VPN)</a></li>
-<li><a href="#email">Privacy Email</a></li>
-<li><a href="#wc">Warrant Canaries</a></li>
-<li><a href="#cloud">Encrypted Cloud Storage Services</a></li>
-<li><a href="#social">Decentralized Social Networks</a></li>
-<li><a href="#dns">Domain Name System (DNS)</a></li>
-<li><a href="#search">Privacy Respecting Search Engines</a></li>
-</ul>
+	<ul class="dropdown-menu" role="menu">
+		<li><a href="#ukusa">Avoid all US and UK based services</a></li>
+		<li><a href="#vpn">Virtual Private Network (VPN)</a></li>
+		<li><a href="#email">Privacy Email</a></li>
+		<li><a href="#wc">Warrant Canaries</a></li>
+		<li><a href="#cloud">Encrypted Cloud Storage Services</a></li>
+		<li><a href="#social">Decentralized Social Networks</a></li>
+		<li><a href="#dns">Domain Name System (DNS)</a></li>
+		<li><a href="#search">Privacy Respecting Search Engines</a></li>
+	</ul>
 </li>
 
+<!-- drop down menu - Browser -->
 <li class="dropdown">
 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Browser<span class="caret"></span></a>
-<ul class="dropdown-menu" role="menu">
-<li><a href="#browser">Recommendation</a></li>
-<li><a href="#fingerprint">Fingerprint</a></li>
-<li><a href="#webrtc">WebRTC IP Leak</a></li>
-<li><a href="#addons">Firefox Privacy Addons</a></li>
-<li><a href="#about_config">Privacy Related Tweaks</a></li>
-</ul>
+	<ul class="dropdown-menu" role="menu">
+		<li><a href="#browser">Recommendation</a></li>
+		<li><a href="#fingerprint">Fingerprint</a></li>
+		<li><a href="#webrtc">WebRTC IP Leak</a></li>
+		<li><a href="#addons">Firefox Privacy Addons</a></li>
+		<li><a href="#about_config">Privacy Related Tweaks</a></li>
+	</ul>
 </li>
 
+<!-- drop down menu - Software -->
 <li class="dropdown">
 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Software<span class="caret"></span></a>
-<ul class="dropdown-menu" role="menu">
-<li><a href="#clients">Email Clients</a></li>
-<li><a href="#messaging">Email Alternatives</a></li>
-<li><a href="#im">Encrypted Instant Messenger</a></li>
-<li><a href="#voip">Encrypted Video & Voice Messenger</a></li>
-<li><a href="#pw">Password Manager</a></li>
-<li><a href="#encrypt">File Encryption</a></li>
-<li><a href="#sync">Secure File Sync</a></li>
-<li><a href="https://www.privacytools.io/password.html" target="_blank">Secure Password Generator</a></li>
-<li><a href="#network">Self Contained Network</a></li>
-<li><a href="#mycloud">Self-Hosted Cloud Server</a></li>
-<li><a href="#productivity">Productivity Tools</a></li>
-<li><a href="#win10">Don't use Windows 10</a></li>
-</ul>
+	<ul class="dropdown-menu" role="menu">
+		<li><a href="#clients">Email Clients</a></li>
+		<li><a href="#messaging">Email Alternatives</a></li>
+		<li><a href="#im">Encrypted Instant Messenger</a></li>
+		<li><a href="#voip">Encrypted Video & Voice Messenger</a></li>
+		<li><a href="#pw">Password Manager</a></li>
+		<li><a href="#encrypt">File Encryption</a></li>
+		<li><a href="#sync">Secure File Sync</a></li>
+		<li><a href="https://www.privacytools.io/password.html" target="_blank">Secure Password Generator</a></li>
+		<li><a href="#network">Self Contained Network</a></li>
+		<li><a href="#mycloud">Self-Hosted Cloud Server</a></li>
+		<li><a href="#productivity">Productivity Tools</a></li>
+		<li><a href="#win10">Don't use Windows 10</a></li>
+	</ul>
 </li>
 
+<!-- drop down menu - OS -->
 <li class="dropdown">
 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">OS<span class="caret"></span></a>
 <ul class="dropdown-menu" role="menu">
@@ -124,6 +138,7 @@
 </ul>
 </li>
 
+<!-- drop down menu - Participate -->
 <li><a href="#participate">Participate</a></li>
 <li class="dropdown">
 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Share<span class="caret"></span></a>
@@ -148,10 +163,14 @@
 
 <div class="container theme-showcase" role="main">
 <div class="jumbotron">
+
+<!-- header just below the navigation bar -->
 <h1><a href="https://www.privacytools.io/" title="privacy tools"><img src="img/layout/logo.png" class="img-responsive" alt="privacytools.io"></a></h1>
 <p>You are being watched. Private and state-sponsored organizations are monitoring and recording your online activities. privacytools.io provides knowledge and tools to protect your privacy against global mass surveillance.</p>
+<!-- end header just below the navigation bar -->
 </div>
 
+<!-- quote by Glenn Greenwald located below the header -->
 <div class="page-header">
 <h1>Privacy? I don't have anything to hide.</h1>
 </div>
@@ -164,7 +183,7 @@ Over the last 16 months, as I've debated this issue around the world, every sing
 </p>
 
 <strong>Related:</strong> <a href="https://www.reddit.com/r/privacy/comments/3hynvp/how_do_you_counter_the_i_have_nothing_to_hide/" target="_blank">How do you counter the "I have nothing to hide?" argument?</a>
-
+<!-- end quote by Glenn Greenwald located below the header -->
 
 <!--
 <div class="page-header text-center">
@@ -193,6 +212,8 @@ Over the last 16 months, as I've debated this issue around the world, every sing
 <br />
 -->
 
+<!-- Global Mass Surveillance - The Fourteen Eyes -->
+
 <a class="anchor" name="ukusa"></a>
 <div class="page-header">
 <h1><a href="#ukusa" class="titleanchor"><span class="glyphicon glyphicon-link"></span></a> Global Mass Surveillance - The Fourteen Eyes</h1>
@@ -204,19 +225,20 @@ Over the last 16 months, as I've debated this issue around the world, every sing
 
 <br>
 
+<!-- Chart of Five Eyes, Nine Eyes, and Fourteen Eyes -->
 <div class="row">
 <div class="col-sm-4">
 <div class="panel panel-danger">
 <div class="panel-heading">
 <h3 class="panel-title">Five Eyes</h3>
 </div>
-<div class="panel-body">
-1. Australia<br />
-2. Canada<br />
-3. New Zealand<br />
-4. United Kingdom<br />
-5. United States of America
-</div>
+	<div class="panel-body">
+	1. Australia<br />
+	2. Canada<br />
+	3. New Zealand<br />
+	4. United Kingdom<br />
+	5. United States of America
+	</div>
 </div>
 </div>
 <div class="col-sm-4">
@@ -224,12 +246,12 @@ Over the last 16 months, as I've debated this issue around the world, every sing
 <div class="panel-heading">
 <h3 class="panel-title">Nine Eyes</h3>
 </div>
-<div class="panel-body">
-6. Denmark<br />
-7. France<br />
-8. Netherlands<br />
-9. Norway
-</div>
+	<div class="panel-body">
+	6. Denmark<br />
+	7. France<br />
+	8. Netherlands<br />
+	9. Norway
+	</div>
 </div>
 </div>
 <div class="col-sm-4">
@@ -237,16 +259,17 @@ Over the last 16 months, as I've debated this issue around the world, every sing
 <div class="panel-heading">
 <h3 class="panel-title">Fourteen Eyes</h3>
 </div>
-<div class="panel-body">
-10. Belgium<br />
-11. Germany<br />
-12. Italy<br />
-13. Spain<br />
-14. Sweden
-</div>
+	<div class="panel-body">
+	10. Belgium<br />
+	11. Germany<br />
+	12. Italy<br />
+	13. Spain<br />
+	14. Sweden
+	</div>
 </div>
 </div>
 </div>
+<!-- end Chart of Five Eyes, Nine Eyes, and Fourteen Eyes -->
 
 <a class="anchor" name="usa"></a>
 <h3>Why is it not recommended to choose a US based service?</h3>
@@ -267,14 +290,14 @@ Over the last 16 months, as I've debated this issue around the world, every sing
 
 
 <h3>Related Information</h3>
-<ul>
-<li><a href="https://www.bestvpn.com/the-ultimate-privacy-guide/#avoidus" target="_blank">Avoid all US and UK based services</a>
-<li><a href="https://en.wikipedia.org/wiki/Surespot#History" target="_blank">Proof that warrant canaries work based on the surespot example.</a></li>
-<li><a href="http://en.wikipedia.org/wiki/UKUSA_Agreement" target="_blank">http://en.wikipedia.org/wiki/UKUSA_Agreement</a></li>
-<li><a href="http://en.wikipedia.org/wiki/Lavabit#Suspension_and_gag_order" target="_blank">http://en.wikipedia.org/wiki/Lavabit#Suspension_and_gag_order</a></li>
-<li><a href="https://en.wikipedia.org/wiki/Key_disclosure_law" target="_blank">https://en.wikipedia.org/wiki/Key_disclosure_law</a></li>
-<li><a href="http://en.wikipedia.org/wiki/Portal:Mass_surveillance" target="_blank">http://en.wikipedia.org/wiki/Portal:Mass_surveillance</a></li>
-</ul>
+	<ul>
+		<li><a href="https://www.bestvpn.com/the-ultimate-privacy-guide/#avoidus" target="_blank">Avoid all US and UK based services</a>
+		<li><a href="https://en.wikipedia.org/wiki/Surespot#History" target="_blank">Proof that warrant canaries work based on the surespot example.</a></li>
+		<li><a href="http://en.wikipedia.org/wiki/UKUSA_Agreement" target="_blank">http://en.wikipedia.org/wiki/UKUSA_Agreement</a></li>
+		<li><a href="http://en.wikipedia.org/wiki/Lavabit#Suspension_and_gag_order" target="_blank">http://en.wikipedia.org/wiki/Lavabit#Suspension_and_gag_order</a></li>
+		<li><a href="https://en.wikipedia.org/wiki/Key_disclosure_law" target="_blank">https://en.wikipedia.org/wiki/Key_disclosure_law</a></li>
+		<li><a href="http://en.wikipedia.org/wiki/Portal:Mass_surveillance" target="_blank">http://en.wikipedia.org/wiki/Portal:Mass_surveillance</a></li>
+	</ul>
 
 
 <a class="anchor" name="vpn"></a>
@@ -301,48 +324,48 @@ Over the last 16 months, as I've debated this issue around the world, every sing
 
 <table class="sortable-theme-bootstrap" data-sortable>
 <thead>
-<tr>
-<th data-sortable="true">VPN / Country</th>
-<th data-sortable="true" title="Number of Servers">Servers</th>
-<th data-sortable="true">Price</th>
-</tr>
+	<tr>
+		<th data-sortable="true">VPN / Country</th>
+		<th data-sortable="true" title="Number of Servers">Servers</th>
+		<th data-sortable="true">Price</th>
+	</tr>
 </thead>
 <tbody>
 
 <tr>
-<td data-value="AirVPN"><a href="https://airvpn.org/" target="_blank"><img src="img/provider/AirVPN.gif" width="200" height="70"><br />AirVPN.org (Italy)</a></td>
-<td>76</td>
-<td data-value="54">54 €</td>
+	<td data-value="AirVPN"><a href="https://airvpn.org/" target="_blank"><img src="img/provider/AirVPN.gif" width="200" height="70"><br />AirVPN.org (Italy)</a></td>
+	<td>76</td>
+	<td data-value="54">54 €</td>
 </tr>
 
 <tr>
-<td data-value="AzireVPN"><a href="https://www.azirevpn.com/" target="_blank"><img src="img/provider/AzireVPN.gif" width="200" height="70"><br />AzireVPN.com (Sweden)</a></td>
-<td>3</td>
-<td data-value="45">45 €</td>
+	<td data-value="AzireVPN"><a href="https://www.azirevpn.com/" target="_blank"><img src="img/provider/AzireVPN.gif" width="200" height="70"><br />AzireVPN.com (Sweden)</a></td>
+	<td>3</td>
+	<td data-value="45">45 €</td>
 </tr>
 
 <tr>
-<td data-value="blackVPN"><a href="https://www.blackvpn.com/" target="_blank"><img src="img/provider/blackVPN.gif" width="200" height="70"><br />blackVPN.com (Hong Kong)</a></td>
-<td>25</td>
-<td data-value="99">99 €</td>
+	<td data-value="blackVPN"><a href="https://www.blackvpn.com/" target="_blank"><img src="img/provider/blackVPN.gif" width="200" height="70"><br />blackVPN.com (Hong Kong)</a></td>
+	<td>25</td>
+	<td data-value="99">99 €</td>
 </tr>
 
 <tr>
-<td data-value="Cryptostorm"><a href="https://cryptostorm.is/" target="_blank"><img src="img/provider/Cryptostorm.gif" width="200" height="70"><br />Cryptostorm.is (Iceland)</a></td>
-<td>13</td>
-<td data-value="52">$ 52</td>
+	<td data-value="Cryptostorm"><a href="https://cryptostorm.is/" target="_blank"><img src="img/provider/Cryptostorm.gif" width="200" height="70"><br />Cryptostorm.is (Iceland)</a></td>
+	<td>13</td>
+	<td data-value="52">$ 52</td>
 </tr>
 
 <tr>
-<td data-value="FrootVPN"><a href="https://www.frootvpn.com/" target="_blank"><img src="img/provider/FrootVPN.gif" width="200" height="70"><br />FrootVPN.com (Sweden)</a></td>
-<td>27</td>
-<td data-value="36">$ 36</td>
+	<td data-value="FrootVPN"><a href="https://www.frootvpn.com/" target="_blank"><img src="img/provider/FrootVPN.gif" width="200" height="70"><br />FrootVPN.com (Sweden)</a></td>
+	<td>27</td>
+	<td data-value="36">$ 36</td>
 </tr>
 
 <tr>
-<td data-value="hide.me"><a href="https://hide.me/" target="_blank"><img src="img/provider/hide.me.gif" width="200" height="70"><br />hide.me (Malaysia)</a></td>
-<td>85</td>
-<td data-value="65">$ 65</td>
+	<td data-value="hide.me"><a href="https://hide.me/" target="_blank"><img src="img/provider/hide.me.gif" width="200" height="70"><br />hide.me (Malaysia)</a></td>
+	<td>85</td>
+	<td data-value="65">$ 65</td>
 </tr>
 
 </tbody>
@@ -359,48 +382,48 @@ Over the last 16 months, as I've debated this issue around the world, every sing
 
 <table class="sortable-theme-bootstrap" data-sortable>
 <thead>
-<tr>
-<th data-sortable="true">VPN / Country</th>
-<th data-sortable="true" title="Number of Servers">Servers</th>
-<th data-sortable="true">Price</th>
-</tr>
+	<tr>
+		<th data-sortable="true">VPN / Country</th>
+		<th data-sortable="true" title="Number of Servers">Servers</th>
+		<th data-sortable="true">Price</th>
+	</tr>
 </thead>
 <tbody>
 
 <tr>
-<td data-value="IVPN"><a href="https://www.ivpn.net/" target="_blank"><img src="img/provider/IVPN.gif" width="200" height="70"><br />IVPN.net (Gibraltar)</a></td>
-<td>15</td>
-<td data-value="100">$ 100</td>
+	<td data-value="IVPN"><a href="https://www.ivpn.net/" target="_blank"><img src="img/provider/IVPN.gif" width="200" height="70"><br />IVPN.net (Gibraltar)</a></td>
+	<td>15</td>
+	<td data-value="100">$ 100</td>
 </tr>
 
 <tr>
-<td data-value="Mullvad"><a href="https://mullvad.net/" target="_blank"><img src="img/provider/Mullvad.gif" width="200" height="70"><br />Mullvad.net (Sweden)</a></td>
-<td>23</td>
-<td data-value="60">60 €</td>
+	<td data-value="Mullvad"><a href="https://mullvad.net/" target="_blank"><img src="img/provider/Mullvad.gif" width="200" height="70"><br />Mullvad.net (Sweden)</a></td>
+	<td>23</td>
+	<td data-value="60">60 €</td>
 </tr>
 
 <tr>
-<td data-value="NordVPN"><a href="https://nordvpn.com/" target="_blank"><img src="img/provider/NordVPN.gif" width="200" height="70"><br />NordVPN.com (Panama)</a></td>
-<td>52</td>
-<td data-value="48">$ 48</td>
+	<td data-value="NordVPN"><a href="https://nordvpn.com/" target="_blank"><img src="img/provider/NordVPN.gif" width="200" height="70"><br />NordVPN.com (Panama)</a></td>
+	<td>52</td>
+	<td data-value="48">$ 48</td>
 </tr>
 
 <tr>
-<td data-value="Perfect Privacy"><a href="https://www.perfect-privacy.com/" target="_blank"><img src="img/provider/Perfect-Privacy.gif" width="200" height="70"><br />Perfect-Privacy.com (Panama)</a></td>
-<td>40</td>
-<td data-value="150">150 €</td>
+	<td data-value="Perfect Privacy"><a href="https://www.perfect-privacy.com/" target="_blank"><img src="img/provider/Perfect-Privacy.gif" width="200" height="70"><br />Perfect-Privacy.com (Panama)</a></td>
+	<td>40</td>
+	<td data-value="150">150 €</td>
 </tr>
 
 <tr>
-<td data-value="Privatoria"><a href="https://privatoria.net/" target="_blank"><img src="img/provider/Privatoria.gif" width="200" height="70"><br />Privatoria.net (Czech Republic)</a></td>
-<td>12</td>
-<td data-value="23">$ 22,8</td>
+	<td data-value="Privatoria"><a href="https://privatoria.net/" target="_blank"><img src="img/provider/Privatoria.gif" width="200" height="70"><br />Privatoria.net (Czech Republic)</a></td>
+	<td>12</td>
+	<td data-value="23">$ 22,8</td>
 </tr>
 
 <tr>
-<td data-value="Proxy.sh"><a href="https://proxy.sh/" target="_blank"><img src="img/provider/Proxy.sh.gif" width="200" height="70"><br />Proxy.sh (Seychelles)</a></td>
-<td>288</td>
-<td data-value="90">$ 90</td>
+	<td data-value="Proxy.sh"><a href="https://proxy.sh/" target="_blank"><img src="img/provider/Proxy.sh.gif" width="200" height="70"><br />Proxy.sh (Seychelles)</a></td>
+	<td>288</td>
+	<td data-value="90">$ 90</td>
 </tr>
 
 </tbody>
@@ -415,6 +438,7 @@ Over the last 16 months, as I've debated this issue around the world, every sing
 
 <br>
 
+<!-- yellow warning box about vpns and "no log" policies. -->
 <div class="alert alert-warning" role="alert">
 <strong>Note: Using a VPN provider will not make you anonymous. But it will give you a better privacy. A VPN is not a tool for illegal activities. Don't rely on a "no log" policy.</strong>
 </div>
@@ -424,7 +448,8 @@ Over the last 16 months, as I've debated this issue around the world, every sing
 <div class="row">
 <div class="col-md-6">
 
-<h3>Our VPN Provider Criteria</h3>
+<!-- bullet list of VPN Provider Criteria
+ --><h3>Our VPN Provider Criteria</h3>
 <ul>
 	<li>Operating outside the USA or other Five Eyes countries. <a href="https://www.bestvpn.com/the-ultimate-privacy-guide/#avoidus" target="_blank">Avoid all US and UK based services.</a></li>
 	<li>OpenVPN software support.</li>
@@ -440,6 +465,7 @@ Over the last 16 months, as I've debated this issue around the world, every sing
 
 </div>
 
+<!-- bullet list of VPN articles -->
 <div class="col-md-6"><span class="pull-right">
 <h3>Related VPN information</h3>
 <ul>
@@ -457,6 +483,7 @@ Over the last 16 months, as I've debated this issue around the world, every sing
 </div>
 </div>
 
+<!-- warrant canary -->
 <a class="anchor" name="wc"></a>
 <div class="page-header">
 <h1><a href="#wc" class="titleanchor"><span class="glyphicon glyphicon-link"></span></a> What is a warrant canary?</h1>
@@ -464,21 +491,22 @@ Over the last 16 months, as I've debated this issue around the world, every sing
 <img src="img/layout/warrant-canary.jpg" class="img-responsive pull-right" alt="Warrant Canary Example" style="margin-left:20px;">
 <p>A warrant canary is a posted document stating that an organization has not received any secret subpoenas during a specific period of time. If this document fails to be updated during the specified time then the user is to assume that the service has received such a subpoena and should stop using the service.</p>
 <h4>Warrant Canary Examples:</h4>
-<ol>
-<li><a href="https://proxy.sh/canary" target="_blank">https://proxy.sh/canary</a></li>
-<li><a href="https://www.ivpn.net/resources/canary.txt" target="_blank">https://www.ivpn.net/resources/canary.txt</a></li>
-<li><a href="https://www.vpnsecure.me/files/canary.txt" target="_blank">https://www.vpnsecure.me/files/canary.txt</a></li>
-<li><a href="https://www.bolehvpn.net/canary.html" target="_blank">https://www.bolehvpn.net/canary.html</a></li>
-<li><a href="https://lokun.is/canary.txt" target="_blank">https://lokun.is/canary.txt</a></li>
-<li><a href="https://www.ipredator.se/static/downloads/canary.txt" target="_blank">https://www.ipredator.se/static/downloads/canary.txt</a></li>
-</ol>
+	<ol>
+		<li><a href="https://proxy.sh/canary" target="_blank">https://proxy.sh/canary</a></li>
+		<li><a href="https://www.ivpn.net/resources/canary.txt" target="_blank">https://www.ivpn.net/resources/canary.txt</a></li>
+		<li><a href="https://www.vpnsecure.me/files/canary.txt" target="_blank">https://www.vpnsecure.me/files/canary.txt</a></li>
+		<li><a href="https://www.bolehvpn.net/canary.html" target="_blank">https://www.bolehvpn.net/canary.html</a></li>
+		<li><a href="https://lokun.is/canary.txt" target="_blank">https://lokun.is/canary.txt</a></li>
+		<li><a href="https://www.ipredator.se/static/downloads/canary.txt" target="_blank">https://www.ipredator.se/static/downloads/canary.txt</a></li>
+	</ol>
 <h4>Related Warrant Canary Information</h4>
-<ul>
-<li><a href="https://www.eff.org/de/deeplinks/2014/04/warrant-canary-faq" target="_blank">Warrant Canary Frequently Asked Questions</a></li>
-<li><a href="https://canarywatch.org/" target="_blank">Canarywatch.org</a> - Lists warrant canaries, tracks changes or disappearances of canaries</li>
-<li><a href="http://en.wikipedia.org/wiki/Warrant_canary#Companies_and_organizations_with_warrant_canaries" target="_blank">Companies and organizations with warrant canaries</a></li>
-</ul>
+	<ul>
+		<li><a href="https://www.eff.org/de/deeplinks/2014/04/warrant-canary-faq" target="_blank">Warrant Canary Frequently Asked Questions</a></li>
+		<li><a href="https://canarywatch.org/" target="_blank">Canarywatch.org</a> - Lists warrant canaries, tracks changes or disappearances of canaries</li>
+		<li><a href="http://en.wikipedia.org/wiki/Warrant_canary#Companies_and_organizations_with_warrant_canaries" target="_blank">Companies and organizations with warrant canaries</a></li>
+	</ul>
 
+<!-- browsers -->
 <a class="anchor" name="browser"></a>
 <div class="page-header">
 <h1><a href="#browser" class="titleanchor"><span class="glyphicon glyphicon-link"></span></a> Browser Recommendation</h1>
@@ -486,20 +514,21 @@ Over the last 16 months, as I've debated this issue around the world, every sing
 
 <div class="row">
 
+<!-- browsers - firefox -->
 <div class="col-sm-4">
 <div class="panel panel-success">
 <div class="panel-heading">
 <h3 class="panel-title">Mozilla Firefox</h3>
 </div>
 <div class="panel-body">
-<p><img src="img/tools/Firefox.png" align="right" style="margin-left:5px;"><a href="http://www.erfahrungen.com/mit/Firefox/" target="_blank">Firefox</a> is fast, reliable, open source and respects your privacy. Don't forget to adjust the settings according to our recommendations: <a href="#webrtc">WebRTC</a> and <a href="#about_config">about:config</a> and get the <a href="#addons">privacy addons</a>.</p>
-<p><a href="https://www.firefox.com/" target="_blank"><button type="button" class="btn btn-success">Download: www.firefox.com</button></a></p>
-<p>OS: Windows, Mac, Linux, Android, BSD.</p>
+	<p><img src="img/tools/Firefox.png" align="right" style="margin-left:5px;"><a href="http://www.erfahrungen.com/mit/Firefox/" target="_blank">Firefox</a> is fast, reliable, open source and respects your privacy. Don't forget to adjust the settings according to our recommendations: <a href="#webrtc">WebRTC</a> and <a href="#about_config">about:config</a> and get the <a href="#addons">privacy addons</a>.</p>
+	<p><a href="https://www.firefox.com/" target="_blank"><button type="button" class="btn btn-success">Download: www.firefox.com</button></a></p>
+	<p>OS: Windows, Mac, Linux, Android, BSD.</p>
 </div>
 </div>
 </div>
 
-<!-- IceCate removed
+<!-- IceCat removed
 <div class="col-sm-4">
 <div class="panel panel-info">
 <div class="panel-heading">
@@ -514,45 +543,59 @@ Over the last 16 months, as I've debated this issue around the world, every sing
 </div>
 -->
 
+<!-- browsers - tor browser bundle -->
 <div class="col-sm-4">
 <div class="panel panel-warning">
 <div class="panel-heading">
 <h3 class="panel-title">Tor Browser Bundle</h3>
 </div>
 <div class="panel-body">
-<p><img src="img/tools/Tor-Browser.png" align="right" style="margin-left:5px;">Tor Browser is your choice if you need an extra layer of anonymity. It's a modified version of Firefox, it comes with pre-installed privacy addons, encryption and an advanced proxy.</p>
-<p><a href="https://www.torproject.org/" target="_blank"><button type="button" class="btn btn-warning">Download: www.torproject.org</button></a></p>
-<p>OS: Windows, Mac, Linux, <a href="https://mike.tig.as/onionbrowser/" target="_blank">iOS</a>, <a href="https://www.torproject.org/docs/android.html.en" target="_blank">Android</a>, <a href="https://github.com/torbsd/openbsd-ports" target="_blank">OpenBSD.</a></p>
+	<p><img src="img/tools/Tor-Browser.png" align="right" style="margin-left:5px;">Tor Browser is your choice if you need an extra layer of anonymity. It's a modified version of Firefox, it comes with pre-installed privacy addons, encryption and an advanced proxy.</p>
+	<p><a href="https://www.torproject.org/" target="_blank"><button type="button" class="btn btn-warning">Download: www.torproject.org</button></a></p>
+	<p>OS: Windows, Mac, Linux, <a href="https://mike.tig.as/onionbrowser/" target="_blank">iOS</a>, <a href="https://www.torproject.org/docs/android.html.en" target="_blank">Android</a>, <a href="https://github.com/torbsd/openbsd-ports" target="_blank">OpenBSD.</a></p>
 </div>
 </div>
 </div>
 
 </div>
 
+<!-- browsers - worth mentioning -->
 <h3>Worth Mentioning</h3>
+
+<!-- browsers - JonDoFox -->
 <ul>
-<li><a href="https://anonymous-proxy-servers.net/en/jondofox.html" target="_blank">JonDoFox</a> - A profile for the Firefox web browser, particularly optimized for anonymous and secure web surfing.</li>
+	<li><a href="https://anonymous-proxy-servers.net/en/jondofox.html" target="_blank">JonDoFox</a> - A profile for the Firefox web browser, particularly optimized for anonymous and secure web surfing.</li>
 </ul>
 
-
+<!-- Browser Fingerprint -->
 <a class="anchor" name="fingerprint"></a>
+
+<!-- heading -->
 <div class="page-header">
-<h1><a href="#fingerprint" class="titleanchor"><span class="glyphicon glyphicon-link"></span></a> Browser Fingerprint - Is your browser configuration unique?</h1>
+	<h1><a href="#fingerprint" class="titleanchor"><span class="glyphicon glyphicon-link"></span></a> Browser Fingerprint - Is your browser configuration unique?</h1>
 </div>
+
+<!-- yellow warning message about the browser sending unique information -->
 <div class="alert alert-warning" role="alert">
 <strong>Your Browser sends information that makes you unique amongst millions of users and therefore easy to identify.</strong>
 </div>
 
+<!-- fingerprint image to the right of the paragraphs -->
 <img src="img/layout/browser-fingerprint.jpg" class="img-responsive pull-right" alt="Warrant Canary Example" style="margin-left:20px;">
 
+<!-- first paragraph -->
 <p>When you visit a web page, your browser voluntarily sends information about its configuration, such as available fonts, browser type, and add-ons. If this combination of information is unique, it may be possible to identify and track you without using cookies. EFF created a Tool called <a href="https://panopticlick.eff.org/" target="_blank">Panopticlick</a> to test your browser to see how unique it is.</p>
 
+<!-- First orange "test your browser now" button -->
 <p><a href="https://panopticlick.eff.org/" target="_blank"><button type="button" class="btn btn-warning">Test your Browser now</button></a></p>
 
+<!-- second paragraph -->
 <p>You need to find what <strong>most browsers</strong> are reporting, and then use those variables to bring your browser in the same population. This means having the same fonts, plugins, and extensions installed as the large installed base. You should have a <a href="https://addons.mozilla.org/firefox/addon/random-agent-spoofer/" target="_blank">spoofed user agent string</a> to match what the large userbase has. You need have the same settings enabled and disabled, such as DNT and WebGL. You need your browser to look as common as everyone else. Disabling JavaScript, using Linux, or even the TBB, will make your browser stick out from the masses.</p>
 
+<!-- third paragraph -->
 <p>Modern web browsers have not been architected to assure personal web privacy. Rather than worrying about being fingerprinted, it seems more practical to use <a href="#addons">free software plugins</a> like Privacy Badger, uBlock Origin and Disconnect. They not only respect your freedom, but your privacy also. You can get much further with these than trying to manipulate your browser's fingerprint.</p>
 
+<!-- related information links -->
 <h3>Related Information</h3>
 <ul>
 	<li><a href="https://panopticlick.eff.org/browser-uniqueness.pdf" target="_blank">How Unique Is Your Web Browser? Peter Eckersley, EFF.</a></li>
@@ -561,49 +604,66 @@ Over the last 16 months, as I've debated this issue around the world, every sing
 	<li><a href="https://www.browserleaks.com/" target="_blank">BrowserLeaks.com</a> - Web browser security testing tools, that tell you what exactly personal identity data may be leaked without any permissions when you surf the Internet.</li>
 </ul>
 
-
+<!-- WebRTC IP Leak Test -->
 <a class="anchor" name="webrtc"></a>
 <div class="page-header">
-<h1><a href="#webrtc" class="titleanchor"><span class="glyphicon glyphicon-link"></span></a> WebRTC IP Leak Test - Is your IP address leaking?</h1>
+	<h1><a href="#webrtc" class="titleanchor"><span class="glyphicon glyphicon-link"></span></a> WebRTC IP Leak Test - Is your IP address leaking?</h1>
 </div>
+
+<!-- red alert message about WebRTC being a new communication protocol... -->
 <div class="alert alert-danger" role="alert">
 <strong>WebRTC is a new communication protocol that relies on JavaScript that can leak your actual IP address from behind your VPN.</strong>
 </div>
+
+<!-- first sentence -->
 <p>While software like NoScript prevents this, it's probably a good idea to block this protocol directly as well, just to be safe.</p>
+
+<!-- orange "Test your Browser now" button -->
 <p><a href="webrtc.html" target="_blank"><button type="button" class="btn btn-warning">Test your Browser now</button></a></p>
+
+<!-- heading: How to disable WRTC in Firefox? -->
 <h3>How to disable WebRTC in Firefox?</h3>
+
+<!-- steps on manually disabling WRTC in Firefox -->
 <p>In short: Set "media.peerconnection.enabled" to "false" in "about:config".</p>
 <p><strong>Explained:</strong></p>
-<ol>
-<li>Enter "about:config" in the firefox address bar and press enter.</li>
-<li>Press the button "I'll be careful, I promise!"</li>
-<li>Search for "media.peerconnection.enabled"</li>
-<li>Double click the entry, the column "Value" should now be "false"</li>
-<li>Done. Do the WebRTC leak test again.</li>
-</ol>
+	<ol>
+		<li>Enter "about:config" in the firefox address bar and press enter.</li>
+		<li>Press the button "I'll be careful, I promise!"</li>
+		<li>Search for "media.peerconnection.enabled"</li>
+		<li>Double click the entry, the column "Value" should now be "false"</li>
+		<li>Done. Do the WebRTC leak test again.</li>
+	</ol>
+
 <p>If you want to make sure every single WebRTC related setting is really disabled change these settings:</p>
-<ol>
-<li>media.peerconnection.turn.disable = true</li>
-<li>media.peerconnection.use_document_iceservers = false</li>
-<li>media.peerconnection.video.enabled = false</li>
-<li>media.peerconnection.identity.timeout = 1</li>
-</ol>
+	<ol>
+		<li>media.peerconnection.turn.disable = true</li>
+		<li>media.peerconnection.use_document_iceservers = false</li>
+		<li>media.peerconnection.video.enabled = false</li>
+		<li>media.peerconnection.identity.timeout = 1</li>
+	</ol>
 <p>Now you can be 100% sure WebRTC is disabled.</p>
+
+<!-- the "Test your Browser again" button -->
 <p><a href="webrtc.html" target="_blank"><button type="button" class="btn btn-primary">Test your Browser again</button></a></p>
+
+<!-- steps to manually disable WebRTC in Chrome -->
 <h3>How to fix the WebRTC Leak in Google Chrome?</h3>
 <p>There is no known working solution, only a plugin that is easily circumvented. Please use Firefox instead. </p>
+
 <h3>What about other browsers?</h3>
-<p>
-Chrome on iOS, Internet Explorer and Safari does not implement WebRTC yet. <a href="#browser">But we recommend using Firefox on all devices.</a>
-</p>
+<p>Chrome on iOS, Internet Explorer and Safari does not implement WebRTC yet. <a href="#browser">But we recommend using Firefox on all devices.</a></p>
 
 
+<!-- Firefox add-ons -->
 <a class="anchor" name="addons"></a>
+
 <div class="page-header">
-<h1><a href="#addons" class="titleanchor"><span class="glyphicon glyphicon-link"></span></a> Excellent Firefox Privacy Addons</h1>
+	<h1><a href="#addons" class="titleanchor"><span class="glyphicon glyphicon-link"></span></a> Excellent Firefox Privacy Addons</h1>
 </div>
+
 <div class="alert alert-success" role="alert">
-<strong>Improve your privacy with these excellent Firefox addons.</strong>
+	<strong>Improve your privacy with these excellent Firefox addons.</strong>
 </div>
 
 <h3>Stop tracking with "Disconnect"</h3>
@@ -628,7 +688,6 @@ Chrome on iOS, Internet Explorer and Safari does not implement WebRTC yet. <a hr
 <a href="https://addons.mozilla.org/firefox/addon/ublock-origin/" target="_blank">https://addons.mozilla.org/firefox/addon/ublock-origin/</a>
 </p>
 
-
 <h3>Hinder Browser Fingerprinting with "Random Agent Spoofer"</h3>
 <img src="img/addons/Random-Agent-Spoofer.gif" class="img-responsive pull-left" alt="Random Agent Spoofer" style="margin-right:30px;">
 <p>A privacy enhancing firefox addon which aims to hinder browser fingerprinting. It does this by changing the browser/device profile on a timer. Source code: <a href="https://github.com/dillbyrne/random-agent-spoofer" target="_blank">GitHub.</a>
@@ -672,6 +731,7 @@ Chrome on iOS, Internet Explorer and Safari does not implement WebRTC yet. <a hr
 <br />
 <a href="https://addons.mozilla.org/firefox/addon/umatrix/" target="_blank">https://addons.mozilla.org/firefox/addon/umatrix/</a>
 </p>
+
 <h3>Be in total control with "NoScript Security Suite"</h3>
 <img src="img/addons/NoScript.gif" class="img-responsive pull-left" alt="NoScript" style="margin-right:30px;">
 <p>
@@ -679,6 +739,7 @@ Highly customizable plugin to selectively allow Javascript, Java, and Flash to r
 <br />
 <a href="https://addons.mozilla.org/firefox/addon/noscript/" target="_blank">https://addons.mozilla.org/firefox/addon/noscript/</a>
 </p>
+
 <h3>Content control with "Policeman"</h3>
 <img src="img/addons/Policeman.gif" class="img-responsive pull-left" alt="Policeman" style="margin-right:30px;">
 <p>This addon has purpose similar to RequestPolicy and NoScript. It's different from the former in that it supports rules based on content type. For example, you can allow images and styles, but not scripts and frames for some sites. It can also be set up to act as a blacklist.
@@ -686,24 +747,25 @@ Highly customizable plugin to selectively allow Javascript, Java, and Flash to r
 <a href="https://addons.mozilla.org/firefox/addon/policeman/" target="_blank">https://addons.mozilla.org/firefox/addon/policeman/</a>
 </p>
 
-
+<!-- about:config tweaks for Firefox -->
 <a class="anchor" name="about_config"></a>
+
 <div class="page-header">
 <h1><a href="#about_config" class="titleanchor"><span class="glyphicon glyphicon-link"></span></a> Firefox: Privacy Related "about:config" Tweaks</h1>
 </div>
-<div class="alert alert-success" role="alert">
-This is a collection of privacy related <strong>about:config</strong> tweaks. We'll show you how to enhance the privacy of your Firefox browser.
-</div>
 
-<p></p><h3>Preparation:</h3><p></p>
+<div class="alert alert-success" role="alert">This is a collection of privacy related <strong>about:config</strong> tweaks. We'll show you how to enhance the privacy of your Firefox browser.</div>
 
-<ol>
-<li>Enter "about:config" in the firefox address bar and press enter.</li>
-<li>Press the button "I'll be careful, I promise!"</li>
-<li>Follow the instructions below...</li>
-</ol>
+<!-- preparation list -->
+<h3>Preparation:</h3>
+	<ol>
+		<li>Enter "about:config" in the firefox address bar and press enter.</li>
+		<li>Press the button "I'll be careful, I promise!"</li>
+		<li>Follow the instructions below...</li>
+	</ol>
 
-<p></p><h3>Getting started:</h3><p></p>
+<!-- Getting started list -->
+<h3>Getting started:</h3>
 
 <ol>
 <li>privacy.trackingprotection.enabled = true</li>
@@ -723,19 +785,19 @@ This is a collection of privacy related <strong>about:config</strong> tweaks. We
 
 <li>network.cookie.cookieBehavior = 1</li>
 <ul>
-<li>Disable cookies</li>
-<li>0 = accept all cookies by default</li>
-<li>1 = only accept from the originating site (block third party cookies)</li>
-<li>2 = block all cookies by default</li>
+	<li>Disable cookies</li>
+	<li>0 = accept all cookies by default</li>
+	<li>1 = only accept from the originating site (block third party cookies)</li>
+	<li>2 = block all cookies by default</li>
 </ul>
 
 <li>network.cookie.lifetimePolicy = 2</li>
 <ul>
-<li>cookies are deleted at the end of the session</li>
-<li>0 = Accept cookies normally</li>
-<li>1 = Prompt for each cookie</li>
-<li>2 = Accept for current session only</li>
-<li>3 = Accept for N days</li>
+	<li>cookies are deleted at the end of the session</li>
+	<li>0 = Accept cookies normally</li>
+	<li>1 = Prompt for each cookie</li>
+	<li>2 = Accept for current session only</li>
+	<li>3 = Accept for N days</li>
 </ul>
 
 <li>browser.cache.offline.enable = false</li>
@@ -754,6 +816,7 @@ This is a collection of privacy related <strong>about:config</strong> tweaks. We
 <ul><li>Even with Firefox set to not remember history, your closed tabs are stored temporarily at Menu -> History -> Recently Closed Tabs.</li></ul>
 </ol>
 
+<!-- related information -->
 <h3>Related Information</h3>
 <ul>
 	<li><a href="https://ffprofile.com/" target="_blank">ffprofile.com</a> -  Helps you to create a Firefox profile with the defaults you like.</li>	
@@ -766,6 +829,7 @@ This is a collection of privacy related <strong>about:config</strong> tweaks. We
 <div class="page-header">
 <h1><a href="#email" class="titleanchor"><span class="glyphicon glyphicon-link"></span></a> Privacy-Conscious Email Providers - No Affiliates</h1>
 </div>
+
 <div class="alert alert-success" role="alert">
 <strong>All providers listed here are operating outside the US and support <a data-toggle="tooltip" data-placement="bottom" data-original-title="When sending or receiving emails, if both the sending and receiving servers support TLS encryption, the email is sent between servers using an encrypted connection.">SMTP TLS.</a> The table is sortable. Never trust any company with your privacy, always encrypt.</strong>
 </div>
@@ -773,52 +837,52 @@ This is a collection of privacy related <strong>about:config</strong> tweaks. We
 <br>
 
 <table class="sortable-theme-bootstrap" data-sortable>
-<thead>
-<tr>
-<th data-sortable="true">Email Service</th>
-<th data-sortable="true">Since</th>
-<th data-sortable="true">Server</th>
-<th data-sortable="true">Storage</th>
-<th data-sortable="true">Price / Year</th>
-<th data-sortable="true">Bitcoin</th>
-<th data-sortable="true">Encryption</th>
-<th data-sortable="true">Own Domain</th>
-</tr>
-</thead>
+	<thead>
+		<tr>
+			<th data-sortable="true">Email Service</th>
+			<th data-sortable="true">Since</th>
+			<th data-sortable="true">Server</th>
+			<th data-sortable="true">Storage</th>
+			<th data-sortable="true">Price / Year</th>
+			<th data-sortable="true">Bitcoin</th>
+			<th data-sortable="true">Encryption</th>
+			<th data-sortable="true">Own Domain</th>
+		</tr>
+	</thead>
 
 <tbody>
 
 <tr>
-<td data-value="GhostMail"><a href="https://www.ghostmail.com/" target="_blank"><img src="img/provider/GhostMail.gif" width="200" height="70"><br />GhostMail.com</a></td>
-<td data-value="2015">2015</td>
-<td>Sweden</td>
-<td data-value="1000">1 GB</td>
-<td data-value="0"><span class="label label-warning">Free</span></td>
-<td><span class="label label-success">Accepted</span></td>
-<td><span class="label label-success">Built-in</span></td>
-<td><span class="label label-primary">No</span></td>
+	<td data-value="GhostMail"><a href="https://www.ghostmail.com/" target="_blank"><img src="img/provider/GhostMail.gif" width="200" height="70"><br />GhostMail.com</a></td>
+	<td data-value="2015">2015</td>
+	<td>Sweden</td>
+	<td data-value="1000">1 GB</td>
+	<td data-value="0"><span class="label label-warning">Free</span></td>
+	<td><span class="label label-success">Accepted</span></td>
+	<td><span class="label label-success">Built-in</span></td>
+	<td><span class="label label-primary">No</span></td>
 </tr>
 
 <tr>
-<td data-value="OpenMailBox"><a href="https://www.openmailbox.org/" target="_blank"><img src="img/provider/OpenMailBox.gif" width="200" height="70"><br />OpenMailBox.org</a></td>
-<td data-value="2013">2013</td>
-<td>France</td>
-<td data-value="1000">1 GB</td>
-<td data-value="0"><span class="label label-warning">Free</span></td>
-<td><span class="label label-success">Accepted</span></td>
-<td><span class="label label-success">Built-in</span></td>
-<td><span class="label label-primary">No</span></td>
+	<td data-value="OpenMailBox"><a href="https://www.openmailbox.org/" target="_blank"><img src="img/provider/OpenMailBox.gif" width="200" height="70"><br />OpenMailBox.org</a></td>
+	<td data-value="2013">2013</td>
+	<td>France</td>
+	<td data-value="1000">1 GB</td>
+	<td data-value="0"><span class="label label-warning">Free</span></td>
+	<td><span class="label label-success">Accepted</span></td>
+	<td><span class="label label-success">Built-in</span></td>
+	<td><span class="label label-primary">No</span></td>
 </tr>
 
 <tr>
-<td data-value="ProtonMail"><a href="https://www.protonmail.ch/" target="_blank"><img src="img/provider/ProtonMail.ch.gif" width="200" height="70"><br />ProtonMail.ch</a></td>
-<td data-value="2013">2013</td>
-<td>Switzerland</td>
-<td data-value="500">500 MB</td>
-<td data-value="0"><span class="label label-warning">Free</span></td>
-<td><span class="label label-success">Accepted</span></td>
-<td><span class="label label-success">Built-in</span></td>
-<td><span class="label label-success">Yes</span></td>
+	<td data-value="ProtonMail"><a href="https://www.protonmail.ch/" target="_blank"><img src="img/provider/ProtonMail.ch.gif" width="200" height="70"><br />ProtonMail.ch</a></td>
+	<td data-value="2013">2013</td>
+	<td>Switzerland</td>
+	<td data-value="500">500 MB</td>
+	<td data-value="0"><span class="label label-warning">Free</span></td>
+	<td><span class="label label-success">Accepted</span></td>
+	<td><span class="label label-success">Built-in</span></td>
+	<td><span class="label label-success">Yes</span></td>
 </tr>
 
 <!-- removed ruggedinbox: ssl certificate expired
@@ -835,104 +899,104 @@ This is a collection of privacy related <strong>about:config</strong> tweaks. We
 -->
 
 <tr>
-<td data-value="Tutanota"><a href="https://www.tutanota.com/" target="_blank"><img src="img/provider/Tutanota.gif" width="200" height="70"><br />Tutanota.com</a></td>
-<td data-value="2011">2011</td>
-<td>Germany</td>
-<td data-value="1000">1 GB</td>
-<td data-value="0"><span class="label label-warning">Free</span></td>
-<td><span class="label label-primary">No</span></td>
-<td><span class="label label-success">Built-in</span></td>
-<td><span class="label label-success">Yes</span></td>
+	<td data-value="Tutanota"><a href="https://www.tutanota.com/" target="_blank"><img src="img/provider/Tutanota.gif" width="200" height="70"><br />Tutanota.com</a></td>
+	<td data-value="2011">2011</td>
+	<td>Germany</td>
+	<td data-value="1000">1 GB</td>
+	<td data-value="0"><span class="label label-warning">Free</span></td>
+	<td><span class="label label-primary">No</span></td>
+	<td><span class="label label-success">Built-in</span></td>
+	<td><span class="label label-success">Yes</span></td>
 </tr>
 
 <tr>
 <tr>
-<td data-value="mailbox.org"><a href="https://www.mailbox.org/" target="_blank"><img src="img/provider/mailbox.org.gif" width="200" height="70"><br />mailbox.org</a></td>
-<td data-value="2014">2014</td>
-<td>Germany</td>
-<td data-value="2000">2 GB</td>
-<td>12 €</td>
-<td><span class="label label-success">Accepted</span></td>
-<td><span class="label label-success">Built-in</span></td>
-<td><span class="label label-success">Yes</span></td>
+	<td data-value="mailbox.org"><a href="https://www.mailbox.org/" target="_blank"><img src="img/provider/mailbox.org.gif" width="200" height="70"><br />mailbox.org</a></td>
+	<td data-value="2014">2014</td>
+	<td>Germany</td>
+	<td data-value="2000">2 GB</td>
+	<td>12 €</td>
+	<td><span class="label label-success">Accepted</span></td>
+	<td><span class="label label-success">Built-in</span></td>
+	<td><span class="label label-success">Yes</span></td>
 </tr>
 
 <tr>
 <tr>
-<td data-value="Posteo"><a href="https://www.posteo.de/" target="_blank"><img src="img/provider/Posteo.gif" width="200" height="70"><br />Posteo.de</a></td>
-<td data-value="2009">2009</td>
-<td>Germany</td>
-<td data-value="2000">2 GB</td>
-<td>12 €</td>
-<td><span class="label label-primary">No</span></td>
-<td><span class="label label-success">Built-in</span></td>
-<td><span class="label label-primary">No</span></td>
+	<td data-value="Posteo"><a href="https://www.posteo.de/" target="_blank"><img src="img/provider/Posteo.gif" width="200" height="70"><br />Posteo.de</a></td>
+	<td data-value="2009">2009</td>
+	<td>Germany</td>
+	<td data-value="2000">2 GB</td>
+	<td>12 €</td>
+	<td><span class="label label-primary">No</span></td>
+	<td><span class="label label-success">Built-in</span></td>
+	<td><span class="label label-primary">No</span></td>
 </tr>
 
 <tr>
-<td data-value="Runbox"><a href="https://runbox.com/" target="_blank"><img src="img/provider/runbox.gif" width="200" height="70"><br />Runbox.com</a></td>
-<td data-value="1999">1999</td>
-<td>Norway</td>
-<td data-value="1000">1 GB</td>
-<td>$ 19.95</td>
-<td><span class="label label-primary">No</span></td>
-<td><span class="label label-primary">No</span></td>
-<td><span class="label label-success">Yes</span></td>
+	<td data-value="Runbox"><a href="https://runbox.com/" target="_blank"><img src="img/provider/runbox.gif" width="200" height="70"><br />Runbox.com</a></td>
+	<td data-value="1999">1999</td>
+	<td>Norway</td>
+	<td data-value="1000">1 GB</td>
+	<td>$ 19.95</td>
+	<td><span class="label label-primary">No</span></td>
+	<td><span class="label label-primary">No</span></td>
+	<td><span class="label label-success">Yes</span></td>
 </tr>
 
 <tr>
-<td data-value="Neomailbox"><a href="https://www.neomailbox.com/" target="_blank"><img src="img/provider/Neomailbox.gif" width="200" height="70"><br />Neomailbox.com</a></td>
-<td data-value="2003">2003</td>
-<td>Switzerland</td>
-<td data-value="1000">1 GB</td>
-<td>$ 49.95</td>
-<td><span class="label label-success">Accepted</span></td>
-<td><span class="label label-success">Built-in</span></td>
-<td><span class="label label-success">Yes</span></td>
+	<td data-value="Neomailbox"><a href="https://www.neomailbox.com/" target="_blank"><img src="img/provider/Neomailbox.gif" width="200" height="70"><br />Neomailbox.com</a></td>
+	<td data-value="2003">2003</td>
+	<td>Switzerland</td>
+	<td data-value="1000">1 GB</td>
+	<td>$ 49.95</td>
+	<td><span class="label label-success">Accepted</span></td>
+	<td><span class="label label-success">Built-in</span></td>
+	<td><span class="label label-success">Yes</span></td>
 </tr>
 
 <tr>
-<td data-value="CounterMail"><a href="https://www.countermail.com/" target="_blank"><img src="img/provider/CounterMail.gif" width="200" height="70"><br />CounterMail.com</a></td>
-<td data-value="2010">2010</td>
-<td>Sweden</td>
-<td data-value="500">500 MB</td>
-<td>$ 59</td>
-<td><span class="label label-success">Accepted</span></td>
-<td><span class="label label-success">Built-in</span></td>
-<td><span class="label label-success">Yes</span></td>
+	<td data-value="CounterMail"><a href="https://www.countermail.com/" target="_blank"><img src="img/provider/CounterMail.gif" width="200" height="70"><br />CounterMail.com</a></td>
+	<td data-value="2010">2010</td>
+	<td>Sweden</td>
+	<td data-value="500">500 MB</td>
+	<td>$ 59</td>
+	<td><span class="label label-success">Accepted</span></td>
+	<td><span class="label label-success">Built-in</span></td>
+	<td><span class="label label-success">Yes</span></td>
 </tr>
 
 <tr>
-<td data-value="StartMail"><a href="https://www.startmail.com/" target="_blank"><img src="img/provider/StartMail.gif" width="200" height="70"><br />StartMail.com</a></td>
-<td data-value="2014">2014</td>
-<td>Netherlands</td>
-<td data-value="10000">10 GB</td>
-<td>$ 59.95</td>
-<td><span class="label label-primary">No</span></td>
-<td><span class="label label-success">Built-in</span></td>
-<td><span class="label label-primary">No</span></td>
+	<td data-value="StartMail"><a href="https://www.startmail.com/" target="_blank"><img src="img/provider/StartMail.gif" width="200" height="70"><br />StartMail.com</a></td>
+	<td data-value="2014">2014</td>
+	<td>Netherlands</td>
+	<td data-value="10000">10 GB</td>
+	<td>$ 59.95</td>
+	<td><span class="label label-primary">No</span></td>
+	<td><span class="label label-success">Built-in</span></td>
+	<td><span class="label label-primary">No</span></td>
 </tr>
 
 <tr>
-<td data-value="Kolab Now"><a href="https://www.kolabnow.com/" target="_blank"><img src="img/provider/Kolab-Now.gif" width="200" height="70"><br />KolabNow.com</a></td>
-<td data-value="2010">2010</td>
-<td>Switzerland</td>
-<td data-value="2048">2 GB</td>
-<td>$ 60</td>
-<td><span class="label label-success">Accepted</span></td>
-<td><span class="label label-primary">No</span></td>
-<td><span class="label label-success">Yes</span></td>
+	<td data-value="Kolab Now"><a href="https://www.kolabnow.com/" target="_blank"><img src="img/provider/Kolab-Now.gif" width="200" height="70"><br />KolabNow.com</a></td>
+	<td data-value="2010">2010</td>
+	<td>Switzerland</td>
+	<td data-value="2048">2 GB</td>
+	<td>$ 60</td>
+	<td><span class="label label-success">Accepted</span></td>
+	<td><span class="label label-primary">No</span></td>
+	<td><span class="label label-success">Yes</span></td>
 </tr>
 
 <tr>
-<td data-value="CryptoHeaven"><a href="http://www.cryptoheaven.com/" target="_blank"><img src="img/provider/CryptoHeaven.gif" width="200" height="70"><br />CryptoHeaven.com</a></td>
-<td data-value="2001">2001</td>
-<td>Canada</td>
-<td data-value="200">200 MB</td>
-<td>$ 66</td>
-<td><span class="label label-primary">No</span></td>
-<td><span class="label label-success">Built-in</span></td>
-<td><span class="label label-success">Yes</span></td>
+	<td data-value="CryptoHeaven"><a href="http://www.cryptoheaven.com/" target="_blank"><img src="img/provider/CryptoHeaven.gif" width="200" height="70"><br />CryptoHeaven.com</a></td>
+	<td data-value="2001">2001</td>
+	<td>Canada</td>
+	<td data-value="200">200 MB</td>
+	<td>$ 66</td>
+	<td><span class="label label-primary">No</span></td>
+	<td><span class="label label-success">Built-in</span></td>
+	<td><span class="label label-success">Yes</span></td>
 </tr>
 
 </tbody>
@@ -948,25 +1012,23 @@ This is a collection of privacy related <strong>about:config</strong> tweaks. We
 
 <h3>Become Your Own Email Provider with Mail-in-a-Box</h3>
 <a href="https://mailinabox.email/" target="_blank"><img src="img/provider/Mail-in-a-Box.gif" class="img-responsive pull-left" alt="Mail-in-a-Box" style="margin-right:10px;"></a>
-<p>
-Take it a step further and get control of your email with this easy-to-deploy mail server in a box. Mail-in-a-Box lets you become your own mail service provider in a few easy steps. It’s sort of like making your own gmail, but one you control from top to bottom. Technically, Mail-in-a-Box turns a fresh cloud computer into a working mail server. But you don’t need to be a technology expert to set it up. <strong>More: <a href="https://mailinabox.email/" target="_blank">https://mailinabox.email/</a></strong>
-</p>
+<p>Take it a step further and get control of your email with this easy-to-deploy mail server in a box. Mail-in-a-Box lets you become your own mail service provider in a few easy steps. It’s sort of like making your own gmail, but one you control from top to bottom. Technically, Mail-in-a-Box turns a fresh cloud computer into a working mail server. But you don’t need to be a technology expert to set it up. <strong>More: <a href="https://mailinabox.email/" target="_blank">https://mailinabox.email/</a></strong></p>
 
 <h3>Privacy Email Tools</h3>
 <ul>
-<li><a href="http://www.gpg4usb.org/" target="_blank">gpg4usb</a> - A very easy to use and small portable editor to encrypt and decrypt any text-message or -file. For Windows and Linux.</li>
-<li><a href="https://www.mailvelope.com/" target="_blank">Mailvelope</a> - A browser extension that enables the exchange of encrypted emails following the OpenPGP encryption standard.</li>
-<li><a href="https://www.enigmail.net/" target="_blank">Enigmail</a> - A security extension to Thunderbird and Seamonkey. It enables you to write and receive email messages signed and/or encrypted with the OpenPGP standard.</li>
-<li><a href="https://addons.mozilla.org/thunderbird/addon/torbirdy/" target="_blank">TorBirdy</a> - This extension configures Thunderbird to make connections over the Tor anonymity network.</li>
-<li><a href="https://emailprivacytester.com/" target="_blank">Email Privacy Tester</a> - This tool will send an Email to your address and perform privacy related tests.</li>
+	<li><a href="http://www.gpg4usb.org/" target="_blank">gpg4usb</a> - A very easy to use and small portable editor to encrypt and decrypt any text-message or -file. For Windows and Linux.</li>
+	<li><a href="https://www.mailvelope.com/" target="_blank">Mailvelope</a> - A browser extension that enables the exchange of encrypted emails following the OpenPGP encryption standard.</li>
+	<li><a href="https://www.enigmail.net/" target="_blank">Enigmail</a> - A security extension to Thunderbird and Seamonkey. It enables you to write and receive email messages signed and/or encrypted with the OpenPGP standard.</li>
+	<li><a href="https://addons.mozilla.org/thunderbird/addon/torbirdy/" target="_blank">TorBirdy</a> - This extension configures Thunderbird to make connections over the Tor anonymity network.</li>
+	<li><a href="https://emailprivacytester.com/" target="_blank">Email Privacy Tester</a> - This tool will send an Email to your address and perform privacy related tests.</li>
 </ul>
 
 <h3>Related Information</h3>
 <ul>
-<li><a href="http://www.wired.com/2011/10/ecpa-turns-twenty-five/" target="_blank">Aging ‘Privacy’ Law Leaves Cloud E-Mail Open to Cops</a> - Data stored in the cloud for longer than 6 months is considered abandoned and may be accessed by intelligence agencies without a warrant. Learning: Use an external email client like Thunderbird or Enigmail, download your emails and store them locally. Never leave them on the server.</li>
-<li><a href="https://www.openmailbox.org/forum/viewtopic.php?id=390" target="_blank">OpenMailBox keeps one year logs of meta-data</a> - Forum discussion, reply of the server admin.</li>
-<li><a href="https://www.eff.org/deeplinks/2012/04/may-firstriseup-server-seizure-fbi-overreaches-yet-again" target="_blank">With May First/Riseup Server Seizure, FBI Overreaches Yet Again</a></li>
-<li><a href="http://www.autistici.org/ai/crackdown/" target="_blank">Autistici/Inventati server compromised</a> -  The cryptographic services offered by the Autistici/Inventati server have been compromised on 15th June 2004. It was discovered on 21st June 2005. One year later. During an enquiry on a single mailbox, the Postal Police may have tapped for a whole year every user's private communication going through the server autistici.org/inventati.org.</li>
+	<li><a href="http://www.wired.com/2011/10/ecpa-turns-twenty-five/" target="_blank">Aging ‘Privacy’ Law Leaves Cloud E-Mail Open to Cops</a> - Data stored in the cloud for longer than 6 months is considered abandoned and may be accessed by intelligence agencies without a warrant. Learning: Use an external email client like Thunderbird or Enigmail, download your emails and store them locally. Never leave them on the server.</li>
+	<li><a href="https://www.openmailbox.org/forum/viewtopic.php?id=390" target="_blank">OpenMailBox keeps one year logs of meta-data</a> - Forum discussion, reply of the server admin.</li>
+	<li><a href="https://www.eff.org/deeplinks/2012/04/may-firstriseup-server-seizure-fbi-overreaches-yet-again" target="_blank">With May First/Riseup Server Seizure, FBI Overreaches Yet Again</a></li>
+	<li><a href="http://www.autistici.org/ai/crackdown/" target="_blank">Autistici/Inventati server compromised</a> -  The cryptographic services offered by the Autistici/Inventati server have been compromised on 15th June 2004. It was discovered on 21st June 2005. One year later. During an enquiry on a single mailbox, the Postal Police may have tapped for a whole year every user's private communication going through the server autistici.org/inventati.org.</li>
 </ul>
 
 <a class="anchor" name="clients"></a>
@@ -1021,9 +1083,9 @@ Take it a step further and get control of your email with this easy-to-deploy ma
 
 <h3>Worth Mentioning</h3>
 <ul>
-<li><a href="https://github.com/k9mail/k-9/releases" target="_blank">K-9 Mail</a> - An independent mail application for Android. It supports both POP3 and IMAP mailboxes, but only supports push mail for IMAP.</li>
-<li><a href="https://www.gnupg.org/" target="_blank">GNU Privacy Guard</a> - Email Encryption. GnuPG is a GPL Licensed alternative to the PGP suite of cryptographic software. Use <a href="https://gpgtools.org/" target="_blank">GPGTools for Mac OS X.</a></li>
-<li><a href="https://www.mailpile.is/" target="_blank">Mailpile (Beta)</a> - A modern, fast web-mail client with user-friendly encryption and privacy features.</li>
+	<li><a href="https://github.com/k9mail/k-9/releases" target="_blank">K-9 Mail</a> - An independent mail application for Android. It supports both POP3 and IMAP mailboxes, but only supports push mail for IMAP.</li>
+	<li><a href="https://www.gnupg.org/" target="_blank">GNU Privacy Guard</a> - Email Encryption. GnuPG is a GPL Licensed alternative to the PGP suite of cryptographic software. Use <a href="https://gpgtools.org/" target="_blank">GPGTools for Mac OS X.</a></li>
+	<li><a href="https://www.mailpile.is/" target="_blank">Mailpile (Beta)</a> - A modern, fast web-mail client with user-friendly encryption and privacy features.</li>
 </ul>
 
 <a class="anchor" name="messaging"></a>
@@ -1043,6 +1105,7 @@ Take it a step further and get control of your email with this easy-to-deploy ma
 </div>
 </div>
 </div>
+
 <div class="col-sm-4">
 <div class="panel panel-info">
 <div class="panel-heading">
@@ -1057,6 +1120,7 @@ Take it a step further and get control of your email with this easy-to-deploy ma
 </div>
 </div>
 </div>
+
 <div class="col-sm-4">
 <div class="panel panel-warning">
 <div class="panel-heading">
@@ -1133,9 +1197,17 @@ Take it a step further and get control of your email with this easy-to-deploy ma
 
 <h3>Worth Mentioning</h3>
 <ul>
-	<li><a href="https://metager.de/en/" target="_blank">MetaGer</a> - A metasearch engine, which is based in Germany. It focuses on protecting the user's privacy. Supported by 24 own crawlers of small scale web search engines.</li>      
-	<li><a href="https://ixquick.com/" target="_blank">ixquick.com</a> - Returns the top ten results from multiple search engines. It uses a "Star System" to rank its results by awarding one star for every result that has been returned from a search engine. Based in the USA and the Netherlands.</li>
-	<li><a href="https://addons.mozilla.org/firefox/addon/google-search-link-fix/" target="_blank">Google search link fix</a> - Firefox extension that prevents Google, Yahoo and Yandex search pages from modifying search result links when you click them. This is useful when copying links but it also helps privacy by preventing the search engines from recording your clicks. (<a href="https://github.com/palant/searchlinkfix" target="_blank">Open Source</a>)</li>         
+	<li>
+		<a href="https://metager.de/en/" target="_blank">MetaGer</a> - A metasearch engine, which is based in Germany. It focuses on protecting the user's privacy. Supported by 24 own crawlers of small scale web search engines.
+	</li>
+
+	<li>
+		<a href="https://ixquick.com/" target="_blank">ixquick.com</a> - Returns the top ten results from multiple search engines. It uses a "Star System" to rank its results by awarding one star for every result that has been returned from a search engine. Based in the USA and the Netherlands.
+	</li>
+
+	<li>
+		<a href="https://addons.mozilla.org/firefox/addon/google-search-link-fix/" target="_blank">Google search link fix</a> - Firefox extension that prevents Google, Yahoo and Yandex search pages from modifying search result links when you click them. This is useful when copying links but it also helps privacy by preventing the search engines from recording your clicks. (<a href="https://github.com/palant/searchlinkfix" target="_blank">Open Source</a>)
+	</li>
 </ul>
 
 
@@ -1143,6 +1215,7 @@ Take it a step further and get control of your email with this easy-to-deploy ma
 <div class="page-header">
 <h1><a href="#im" class="titleanchor"><span class="glyphicon glyphicon-link"></span></a> Encrypted Instant Messenger</h1>
 </div>
+
 <div class="alert alert-warning" role="alert">
 <strong>If you are currently using an Instant Messenger like WhatsApp, Viber, LINE or Threema you should pick an alternative here.</strong>
 </div>
@@ -1189,6 +1262,7 @@ Take it a step further and get control of your email with this easy-to-deploy ma
 </div>
 </div>
 </div>
+
 </div>
 <h3>Worth Mentioning</h3>
 <ul>
@@ -1218,6 +1292,7 @@ Take it a step further and get control of your email with this easy-to-deploy ma
 <div class="panel-heading">
 <h3 class="panel-title">Signal for Mobile</h3>
 </div>
+
 <div class="panel-body">
 <p><img src="img/tools/Open-Whisper-Systems.png" alt="Open Whisper Systems" align="right" style="margin-left:5px;">Signal is a mobile app developed by <a href="https://whispersystems.org/" target="_blank">Open Whisper Systems</a>. The app provides end-to-end encryption for your calls. Signal is free and open source, enabling anyone to verify its security by auditing the code.</p>
 <p>
@@ -1228,6 +1303,7 @@ Take it a step further and get control of your email with this easy-to-deploy ma
 </div>
 </div>
 </div>
+
 <div class="col-sm-4">
 <div class="panel panel-info">
 <div class="panel-heading">
@@ -1257,8 +1333,8 @@ Take it a step further and get control of your email with this easy-to-deploy ma
 
 <h3>Worth Mentioning</h3>
 <ul>
-<li><a href="https://tox.chat/" target="_blank">Tox</a> - A free and open-source, peer-to-peer, encrypted instant messaging and video calling software.</li>
-<li><a href="http://www.ring.cx/" target="_blank">Ring (formerly SFLphone)</a> - Gives you a full control over your communications and an unmatched level of privacy.</li>
+	<li><a href="https://tox.chat/" target="_blank">Tox</a> - A free and open-source, peer-to-peer, encrypted instant messaging and video calling software.</li>
+	<li><a href="http://www.ring.cx/" target="_blank">Ring (formerly SFLphone)</a> - Gives you a full control over your communications and an unmatched level of privacy.</li>
 </ul>
 
 <a class="anchor" name="cloud"></a>
@@ -1317,8 +1393,8 @@ Take it a step further and get control of your email with this easy-to-deploy ma
 
 <h3>Related Information</h3>
 <ul>
-<li><a href="https://cryptomator.org/" target="_blank">Cryptomator</a> - Free client-side AES encryption for your cloud files. Open source software: No backdoors, no registration. Beta software.</li>
-<li><a href="https://www.reddit.com/r/privacytoolsIO/comments/31v6ma/should_spideroak_be_avoided/" target="_blank">reddit.com</a> - Should SpiderOak be avoided? Read the discussion in our subreddit.</li>
+	<li><a href="https://cryptomator.org/" target="_blank">Cryptomator</a> - Free client-side AES encryption for your cloud files. Open source software: No backdoors, no registration. Beta software.</li>
+	<li><a href="https://www.reddit.com/r/privacytoolsIO/comments/31v6ma/should_spideroak_be_avoided/" target="_blank">reddit.com</a> - Should SpiderOak be avoided? Read the discussion in our subreddit.</li>
 </ul>
 
 <a class="anchor" name="mycloud"></a>
@@ -1368,7 +1444,9 @@ Take it a step further and get control of your email with this easy-to-deploy ma
 </div>
 <h3>Worth Mentioning</h3>
 <ul>
-<li><a href="https://owncloud.org/" target="_blank">ownCloud</a> - Free and open-source, allows anyone to install and operate it for free on a private server, with no limits on storage space or the number of connected clients.</li>
+	<li>
+	<a href="https://owncloud.org/" target="_blank">ownCloud</a> - Free and open-source, allows anyone to install and operate it for free on a private server, with no limits on storage space or the number of connected clients.
+	</li>
 </ul>
 <a class="anchor" name="sync"></a>
 <div class="page-header">
@@ -1413,9 +1491,11 @@ Take it a step further and get control of your email with this easy-to-deploy ma
 </div>
 </div>
 <h3>Worth Mentioning</h3>
-<ul>
-<li><a href="https://git-annex.branchable.com/" target="_blank">git-annex</a> - Allows managing files with git, without checking the file contents into git. While that may seem paradoxical, it is useful when dealing with files larger than git can currently easily handle, whether due to limitations in memory, time, or disk space..</li>
-</ul>
+	<ul>
+		<li>
+		<a href="https://git-annex.branchable.com/" target="_blank">git-annex</a> - Allows managing files with git, without checking the file contents into git. While that may seem paradoxical, it is useful when dealing with files larger than git can currently easily handle, whether due to limitations in memory, time, or disk space..
+		</li>
+	</ul>
 <a class="anchor" name="pw"></a>
 <div class="page-header">
 <h1><a href="#pw" class="titleanchor"><span class="glyphicon glyphicon-link"></span></a> Password Manager Software</h1>
@@ -1473,16 +1553,24 @@ Take it a step further and get control of your email with this easy-to-deploy ma
 </div>
 
 <h3>Worth Mentioning</h3>
-<ul>
-<li><a href="https://www.privacytools.io/password.html	" target="_blank">Secure Password Generator</a> - generates a unique set of custom, high quality, cryptographic-strength password strings which are safe for you to use.</li>
-<li><a href="http://www.supergenpass.com/" target="_blank">SuperGenPass</a> - A master password and the domain name of the Web site you are visiting is used as the “seed” for a one-way hash algorithm (base-64 MD5). The output of this algorithm is your generated password. You remember one password (your “master password”), and SGP uses it to generate unique, complex passwords for the Web sites you visit. Your generated passwords are never stored or transmitted, so you can use SGP on as many computers as you like without having to “sync” anything.</li>
-<li><a href="http://pwsafe.org/" target="_blank">Password Safe</a> - Whether the answer is one or hundreds, Password Safe allows you to safely and easily create a secured and encrypted user name/password list. With Password Safe all you have to do is create and remember a single "Master Password" of your choice in order to unlock and access your entire user name/password list.</li>
-</ul>
+	<ul>
+		<li>
+		<a href="https://www.privacytools.io/password.html	" target="_blank">Secure Password Generator</a> - generates a unique set of custom, high quality, cryptographic-strength password strings which are safe for you to use.
+		</li>
+
+		<li>
+		<a href="http://www.supergenpass.com/" target="_blank">SuperGenPass</a> - A master password and the domain name of the Web site you are visiting is used as the “seed” for a one-way hash algorithm (base-64 MD5). The output of this algorithm is your generated password. You remember one password (your “master password”), and SGP uses it to generate unique, complex passwords for the Web sites you visit. Your generated passwords are never stored or transmitted, so you can use SGP on as many computers as you like without having to “sync” anything.
+		</li>
+
+		<li>
+		<a href="http://pwsafe.org/" target="_blank">Password Safe</a> - Whether the answer is one or hundreds, Password Safe allows you to safely and easily create a secured and encrypted user name/password list. With Password Safe all you have to do is create and remember a single "Master Password" of your choice in order to unlock and access your entire user name/password list.
+		</li>
+	</ul>
 
 <h3>Related Information</h3>
-<ul>
-<li><a href="https://www.youtube.com/watch?v=yzGzB-yYKcc" target="_blank">Edward Snowden on Passwords - YouTube</a></li>
-</ul>
+	<ul>
+		<li><a href="https://www.youtube.com/watch?v=yzGzB-yYKcc" target="_blank">Edward Snowden on Passwords - YouTube</a></li>
+	</ul>
 <a class="anchor" name="encrypt"></a>
 <div class="page-header">
 <h1><a href="#encrypt" class="titleanchor"><span class="glyphicon glyphicon-link"></span></a> File Encryption Software</h1>
@@ -1533,12 +1621,12 @@ Take it a step further and get control of your email with this easy-to-deploy ma
 </div>
 
 <h3>Worth Mentioning</h3>
-<ul>
-<li><a href="https://cryptomator.org/" target="_blank">Cryptomator</a> - Free client-side AES encryption for your cloud files. Open source software: No backdoors, no registration. Beta software.</li>
-<li><a href="https://minilock.io/" target="_blank">miniLock</a> - Browser plugin for Google Chrome / Chromium to encrypt files using a secret passphrase. Easy to use. From the developer of Cryptocat.</li>
-<li><a href="https://www.aescrypt.com/" target="_blank">AES Crypt</a> - Using a powerful 256-bit encryption algorithm, AES Crypt can safely secure your most sensitive files. For Windows, Mac, Linux and Android.</li>
-<li><a href="https://diskcryptor.net/" target="_blank">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>
-</ul>
+	<ul>
+		<li><a href="https://cryptomator.org/" target="_blank">Cryptomator</a> - Free client-side AES encryption for your cloud files. Open source software: No backdoors, no registration. Beta software.</li>
+		<li><a href="https://minilock.io/" target="_blank">miniLock</a> - Browser plugin for Google Chrome / Chromium to encrypt files using a secret passphrase. Easy to use. From the developer of Cryptocat.</li>
+		<li><a href="https://www.aescrypt.com/" target="_blank">AES Crypt</a> - Using a powerful 256-bit encryption algorithm, AES Crypt can safely secure your most sensitive files. For Windows, Mac, Linux and Android.</li>
+		<li><a href="https://diskcryptor.net/" target="_blank">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>
+	</ul>
 
 <a class="anchor" name="network"></a>
 <div class="page-header">
@@ -1589,10 +1677,10 @@ Take it a step further and get control of your email with this easy-to-deploy ma
 </div>
 </div>
 <h3>Worth Mentioning</h3>
-<ul>
-<li><a href="https://www.torproject.org/" target="_blank">Tor Project</a> - Provides anonymity to websites and other servers. Servers configured to receive connections only through Tor are called hidden services.</li>
-<li><a href="http://retroshare.sourceforge.net/" target="_blank">RetroShare</a> - Open Source cross-platform, Friend-2-Friend and secure decentralised communication platform.</li>
-</ul>
+	<ul>
+		<li><a href="https://www.torproject.org/" target="_blank">Tor Project</a> - Provides anonymity to websites and other servers. Servers configured to receive connections only through Tor are called hidden services.</li>
+		<li><a href="http://retroshare.sourceforge.net/" target="_blank">RetroShare</a> - Open Source cross-platform, Friend-2-Friend and secure decentralised communication platform.</li>
+	</ul>
 <a class="anchor" name="social"></a>
 <div class="page-header">
 <h1><a href="#social" class="titleanchor"><span class="glyphicon glyphicon-link"></span></a> Decentralized Social Networks</h1>
@@ -1639,15 +1727,15 @@ diaspora* is based on three key philosophies: Decentralization, freedom and priv
 </div>
 
 <h3>Worth Mentioning</h3>
-<ul>
-<li><a href="http://libertreeproject.org/" target="_blank">Libertree</a> - A free, libre, open-source software which is intended to provide a way for people to create their own social network. Currently in an invitational alpha phase.</li>
-</ul>
+	<ul>
+		<li><a href="http://libertreeproject.org/" target="_blank">Libertree</a> - A free, libre, open-source software which is intended to provide a way for people to create their own social network. Currently in an invitational alpha phase.</li>
+	</ul>
 
 <h3>Related Information</h3>
-<ul>
-<li><a href="https://www.facebook.com/help/delete_account" target="_blank">Delete your Facebook account</a> - Direct link to delete your Facebook account without being able to reactivate it again.</li>
-<li><a href="http://deletefacebook.com/" target="_blank">How To Permanently Delete A Facebook Account</a> - This guide will take you through a smooth and successful Facebook account deletion.</li>
-</ul>
+	<ul>
+		<li><a href="https://www.facebook.com/help/delete_account" target="_blank">Delete your Facebook account</a> - Direct link to delete your Facebook account without being able to reactivate it again.</li>
+		<li><a href="http://deletefacebook.com/" target="_blank">How To Permanently Delete A Facebook Account</a> - This guide will take you through a smooth and successful Facebook account deletion.</li>
+	</ul>
 
 
 <a class="anchor" name="dns"></a>
@@ -1794,16 +1882,16 @@ diaspora* is based on three key philosophies: Decentralization, freedom and priv
 </div>
 
 <h3>Warning</h3>
-<ul>
-<li><a href="#win10">Don't use Windows 10 - It's a privacy nightmare</a></li>
-</ul>
+	<ul>
+		<li><a href="#win10">Don't use Windows 10 - It's a privacy nightmare</a></li>
+	</ul>
 
 <h3>Worth Mentioning</h3>
-<ul>
-<li><a href="http://www.openbsd.org/" target="_blank">OpenBSD</a> - 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/" target="_blank">Arch Linux</a> - 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/" target="_blank">Parabola</a> is a completely open source version of Arch Linux.</li>
-<li><a href="https://www.whonix.org/" target="_blank">Whonix</a> - A Debian GNU/Linux 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>
+	<ul>
+		<li><a href="http://www.openbsd.org/" target="_blank">OpenBSD</a> - 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/" target="_blank">Arch Linux</a> - 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/" target="_blank">Parabola</a> is a completely open source version of Arch Linux.</li>
+		<li><a href="https://www.whonix.org/" target="_blank">Whonix</a> - A Debian GNU/Linux 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>
 
 <a class="anchor" name="live_os"></a>
 <div class="page-header">
@@ -1847,10 +1935,10 @@ diaspora* is based on three key philosophies: Decentralization, freedom and priv
 </div>
 </div>
 <h3>Worth Mentioning</h3>
-<ul>
-<li><a href="https://anonymous-proxy-servers.net/en/jondo-live-cd.html" target="_blank">JonDo Live-CD</a> - A secure, pre-configured environment for anonymous surfing and more. It is based on Debian GNU/Linux. The live system contains proxy clients for JonDonym, Tor Onion Router and Mixmaster remailer. JonDoFox is a pre-configured browser for anonymous web surfing and TorBrowser is installed too..</li>
-<li><a href="http://distro.ibiblio.org/tinycorelinux/" target="_blank">Tiny Core Linux</a> - A minimal Linux operating system focusing on providing a base system using BusyBox and FLTK. The distribution is notable for its size (15 MB) and minimalism, with additional functionality provided by extensions.</li>
-</ul>
+	<ul>
+		<li><a href="https://anonymous-proxy-servers.net/en/jondo-live-cd.html" target="_blank">JonDo Live-CD</a> - A secure, pre-configured environment for anonymous surfing and more. It is based on Debian GNU/Linux. The live system contains proxy clients for JonDonym, Tor Onion Router and Mixmaster remailer. JonDoFox is a pre-configured browser for anonymous web surfing and TorBrowser is installed too..</li>
+		<li><a href="http://distro.ibiblio.org/tinycorelinux/" target="_blank">Tiny Core Linux</a> - A minimal Linux operating system focusing on providing a base system using BusyBox and FLTK. The distribution is notable for its size (15 MB) and minimalism, with additional functionality provided by extensions.</li>
+	</ul>
 <a class="anchor" name="mobile_os"></a>
 <div class="page-header">
 <h1><a href="#mobile_os" class="titleanchor"><span class="glyphicon glyphicon-link"></span></a> Mobile Operating Systems</h1>
@@ -1935,8 +2023,8 @@ diaspora* is based on three key philosophies: Decentralization, freedom and priv
 </div>
 <h3>Worth Mentioning</h3>
 <ul>
-<li><a href="http://www.openbsd.org/" target="_blank">OpenBSD</a> - 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="http://www.dd-wrt.com/" target="_blank">DD-WRT</a> - A is Linux-based firmware for wireless routers and wireless access points. It is compatible with several models of routers and access points.</li>
+	<li><a href="http://www.openbsd.org/" target="_blank">OpenBSD</a> - 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="http://www.dd-wrt.com/" target="_blank">DD-WRT</a> - A is Linux-based firmware for wireless routers and wireless access points. It is compatible with several models of routers and access points.</li>
 </ul>
 
 
@@ -2137,12 +2225,8 @@ It's important for a website like privacytools.io to be up-to-date. Keep an eye
 
 <h3>Here is what you can do:</h3>
 <p>Make suggestions on reddit: <a href="https://www.reddit.com/r/privacytoolsIO/" target="_blank">https://www.reddit.com/r/privacytoolsIO/</a></p>
-
 <p>Follow on Twitter: <a href="https://twitter.com/privacytoolsIO" target="_blank">https://twitter.com/privacytoolsIO</a></p>
-
 <p>View and edit our website source code on GitHub: <a href="https://github.com/privacytoolsIO/privacytools.io" target="_blank">https://github.com/privacytoolsIO/privacytools.io</a></p>
-
-
 <p>Thank you for participating. This projects needs you.</p>
 
 
@@ -2164,7 +2248,7 @@ It's important for a website like privacytools.io to be up-to-date. Keep an eye
 <p><em>privacytools.io is a socially motivated website that provides information for protecting your data security and privacy. never trust any company with your privacy, always encrypt.</em></p>
 </div>
 
-<!-- Start Piwik -->
+<!-- Start Piwik: This is an open-source analytics platform -->
 <script type="text/javascript">
   var _paq = _paq || [];
   _paq.push(['trackPageView']);
@@ -2180,6 +2264,7 @@ It's important for a website like privacytools.io to be up-to-date. Keep an eye
 <noscript><p><img src="//www.privacytools.io/stats/piwik.php?idsite=1" style="border:0;" alt="" /></p></noscript>
 <!-- End Piwik Code -->
 
+<!-- add jQuery, Bootstrap, Sortable, and tooltip libraries  -->
 <script src="js/jquery-1.11.2.min.js"></script>
 <script src="js/bootstrap.min.js"></script>
 <script src="js/sortable.min.js"></script>
