diff --git a/content-template.html b/content-template.html
index 564ecc5b..d5406228 100644
--- a/content-template.html
+++ b/content-template.html
@@ -18,7 +18,7 @@
               <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>Available for: Windows, Mac, Linux, iOS, Android.</p>          
+              <p>Available for: XXXXXXXXXXXXXXXXXX.</p>          
             </div>
           </div>
         </div><!-- /.col-sm-4 -->  
@@ -31,7 +31,7 @@
               <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>Available for: Windows, Mac, Linux, iOS, Android.</p>          
+              <p>Available for: XXXXXXXXXXXXXXXXXX.</p>          
             </div>
           </div>
         </div><!-- /.col-sm-4 -->            
@@ -44,7 +44,7 @@
               <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>Available for: Windows, Mac, Linux, iOS, Android.</p>          
+              <p>Available for: XXXXXXXXXXXXXXXXXX.</p>          
             </div>
           </div>
         </div><!-- /.col-sm-4 -->  
@@ -56,4 +56,4 @@
 	<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>      
-</ul>
\ No newline at end of file
+</ul>
diff --git a/img/tools/Bitcoin.svg.png b/img/tools/Bitcoin.png
similarity index 100%
rename from img/tools/Bitcoin.svg.png
rename to img/tools/Bitcoin.png
diff --git a/img/tools/shadowcash-104x108.png b/img/tools/ShadowCash.png
similarity index 100%
rename from img/tools/shadowcash-104x108.png
rename to img/tools/ShadowCash.png
diff --git a/index.html b/index.html
index ec5c7ced..4dfc0132 100644
--- a/index.html
+++ b/index.html
@@ -80,7 +80,7 @@
 				<ul class="nav navbar-nav">
 
 					<!-- home icon in the navigation bar -->
-					<li><a href="/"><span class="glyphicon glyphicon-home"></span></a></li>
+					<li><a href="#"><span class="glyphicon glyphicon-home"></span></a></li>
 
 					<!-- drop down menu - Provider -->
 					<li class="dropdown">
@@ -121,7 +121,7 @@
 							<li><a href="#encrypt">File Encryption</a></li>
 							<li><a href="#sync">Secure File Sync</a></li>
 							<li><a href="password.html">Secure Password Generator</a></li>
-							<li><a href="#network">Self Contained Network</a></li>
+							<li><a href="#network">Self-contained Networks</a></li>
 							<li><a href="#cryptocurrency">Cryptocurrencies</a></li>
 							<li><a href="#mycloud">Self-Hosted Cloud Server</a></li>
 							<li><a href="#notebook">Digital Notebook</a></li>
@@ -188,7 +188,13 @@
 			
 			<span class="flag-icon flag-icon-de" style="margin-left:5px;"></span> <a href="https://privacytools.it-sec.rocks/">Deutsch</a>
 
-			<span style="margin-left:15px;">Darknet:</span> <a data-toggle="tooltip" data-placement="bottom" data-original-title="Requires specific software to access." href="http://privacytools.i2p">I2P</a> 
+			<span style="margin-left:15px;">Darknet:</span>
+			
+			<a data-toggle="tooltip" data-placement="bottom" data-original-title="Requires specific software to access: torproject.org" href="http://privacygnk5vuzea.onion/ ">Tor</a>, 
+			
+			<a data-toggle="tooltip" data-placement="bottom" data-original-title="Requires specific software to access: geti2p.net" href="http://privacytools.i2p/?i2paddresshelper=wfewiqkdt5bvowfp3igmkaksjvcvwj7bag2smqpqyu5x4hges2qa.b32.i2p">I2P</a>, 
+			
+			<a data-toggle="tooltip" data-placement="bottom" data-original-title="Requires specific software to access: zeronet.io" href="http://127.0.0.1:43110/14gSEpfWfF5Go7u5y7UidZQCnGa6eSBYZ9/">ZeroNet</a>
 		</p>	
 <!-- end language and darknet selection -->
 
@@ -1044,20 +1050,6 @@
 
 			<tbody>
 
-				<tr>
-					<td data-value="OpenMailBox">
-						<a href="https://www.openmailbox.org/"><img src="img/provider/OpenMailBox.gif" width="200" height="70">
-							<br />OpenMailBox.org</a>
-					</td>
-					<td data-value="2013">2013</td>
-					<td><span class="flag-icon flag-icon-fr"></span> France</td>
-					<td data-value="1000">1 GB</td>
-					<td data-value="0"><span class="label label-warning">Free</span></td>
-					<td data-value="1"><span class="label label-success">Accepted</span></td>
-					<td data-value="1"><span class="label label-success">Built-in</span></td>
-					<td data-value="0"><span class="label label-primary">No</span></td>
-				</tr>
-
 				<tr>
 					<td data-value="ProtonMail">
 						<a href="https://www.protonmail.ch/"><img src="img/provider/ProtonMail.ch.gif" width="200" height="70">
@@ -2164,26 +2156,26 @@
           					<h3 class="panel-title">Bitcoin</h3>
 			  		</div>
 					<div class="panel-body">
-						<p><img src="img/tools/Bitcoin.svg.png" alt="Bitcoin" align="right" style="margin-left:5px;">Bitcoin is a pseudonymous cryptocurrency that allows anyone to transact online without registering or giving away any personal information.</p>
+						<p><img src="img/tools/Bitcoin.png" alt="Bitcoin" align="right" style="margin-left:5px;">Bitcoin is a pseudonymous cryptocurrency that allows anyone to transact online without registering or giving away any personal information.</p>
 						<p>
 							<a href="https://bitcoin.org/">
 								<button type="button" class="btn btn-success">Website: bitcoin.org</button>
 							</a>
 						</p>
-						<p>OS: Cross-platform.</p>
+						<p>OS: Windows, Mac, Linux, BSD, Android, iOS.</p>
 					</div>
 				</div>
 			</div>
 			<div class="col-sm-4">
 				<div class="panel panel-info">
 					<div class="panel-heading">
-						<h3 class="panel-title">ZCash</h3>
+						<h3 class="panel-title">Zcash</h3>
 					</div>
 					<div class="panel-body">
-						<p><img src="img/tools/zcash.png" alt="ZCash" align="right" style="margin-left:5px;">Zcash offers total payment confidentiality, while still maintaining a decentralized network using a public blockchain. Unlike Bitcoin, Zcash transactions automatically hide the sender, recipient, and value of all transactions on the blockchain.</p>
+						<p><img src="img/tools/zcash.png" alt="Zcash" align="right" style="margin-left:5px;">Zcash offers total payment confidentiality, while still maintaining a decentralized network using a public blockchain. Unlike Bitcoin, Zcash transactions automatically hide the sender, recipient, and value of all transactions on the blockchain.</p>
 						<p>
 							<a href="https://www.z.cash/">
-								<button type="button" class="btn btn-warning">Website: z.cash</button>
+								<button type="button" class="btn btn-info">Website: z.cash</button>
 							</a>
 						</p>
 						<p>OS: Linux.</p>
@@ -2196,10 +2188,10 @@
 						<h3 class="panel-title">ShadowCash</h3>
 					</div>
 					<div class="panel-body">
-						<p><img src="img/tools/shadowcash-104x108.png" alt="ShadowCash" align="right" style="margin-left:5px;">ShadowCash is an anonymous cryptocurrency built on Bitcoin's codebase featuring additional cryptographic techniques allowing untraceable and unlinkable transactions meaning malicious attackers are unable to identify sender or receiver. Also includes decentralized encrypted messaging similar to BitMessage.</p>
+						<p><img src="img/tools/ShadowCash.png" alt="ShadowCash" align="right" style="margin-left:5px;">ShadowCash is an anonymous cryptocurrency built on Bitcoin's codebase featuring additional cryptographic techniques allowing untraceable and unlinkable transactions meaning malicious attackers are unable to identify sender or receiver. Also includes decentralized encrypted messaging similar to BitMessage.</p>
 						<p>
 							<a href="https://shadowproject.io/">
-								<button type="button" class="btn btn-info">Website: shadowproject.io</button>
+								<button type="button" class="btn btn-warning">Website: shadowproject.io</button>
 							</a>
 						</p>
 						<p>OS: Windows, Mac, Linux.</p>