diff --git a/index.html b/index.html
index 2a50bc1e..4399fc4e 100644
--- a/index.html
+++ b/index.html
@@ -99,7 +99,6 @@
 <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="#win10">Don't use Windows 10</a></li>
 <li><a href="#clients">Email Clients</a></li>
 <li><a href="#messaging">Email Alternatives</a></li>
 <li><a href="#im">Instant Messenger</a></li>
@@ -111,6 +110,7 @@
 <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>
 
@@ -193,88 +193,6 @@ Over the last 16 months, as I've debated this issue around the world, every sing
 <br />
 -->
 
-<a class="anchor" name="win10"></a>
-<div class="page-header">
-<h1><a href="#win10" class="titleanchor"><span class="glyphicon glyphicon-link"></span></a> Don't use Windows 10 - It's a privacy nightmare</h1>
-</div>
-
-<div class="alert alert-warning" role="alert">
-<strong>Microsoft introduced a lot of new features in Windows 10 such as Cortana. However, most of them are violating your privacy.</strong>
-</div>
-
-<img src="img/layout/Windows-10-Privacy.jpg" class="img-responsive pull-right" alt="Windows 10 Privacy" style="margin-left:10px;">
-
-<ol>
-	<strong><li>Data syncing is by default enabled.</li></strong>
-	<ul><li>Browsing history and open websites.</li></ul>
-	<ul><li>Apps settings.</li></ul>
-	<ul><li>WiFi hotspot names and passwords.</li></ul>
-	
-	<strong><li>Your device is by default tagged with a unique advertising ID.</li></strong>
-	<ul><li>Used to serve you with personalized advertisements by third-party advertisers and ad networks.</li></ul>
-	
-	<strong><li>Cortana can collect any of your data.</li></strong>
-	<ul><li>Your keystrokes, searches and mic input.</li></ul>
-	<ul><li>Calendar data.</li></ul>
-	<ul><li>Music you listen to.</li></ul>
-	<ul><li>Credit Card information.</li></ul>
-	<ul><li>Purchases.</li></ul>
-	
-	<strong><li>Microsoft can collect any personal data.</li></strong>
-	<ul><li>Your identity.</li></ul>
-	<ul><li>Passwords.</li></ul>
-	<ul><li>Demographics.</li></ul>
-	<ul><li>Interests and habits.</li></ul>
-	<ul><li>Usage data.</li></ul>
-	<ul><li>Contacts and relationships.</li></ul>
-	<ul><li>Location data.</li></ul>
-	<ul><li>Content like emails, instant messages, caller list, audio and video recordings.</li></ul>
-	
-	<strong><li>Your data can be shared.</li></strong>
-	<ul><li>When downloading Windows 10, you are authorizing Microsoft to share any of above mentioned data with any third-party, with or without your consent.</li></ul>	
-</ol>
-
-<p>Source: <a href="http://propakistani.pk/2015/07/30/windows-10-can-be-your-worst-privacy-nightmare/" target="_blank">propakistani.pk</a>	
-
-<br>
-
-<p><a href="https://github.com/10se1ucgo/DisableWinTracking/releases" target="_blank"><button type="button" class="btn btn-warning">Download: Win10 Tracking Disable Tool</button></a></p>
-
-This open source tool uses some known methods that attempt to disable major tracking features in Windows 10.
-
-<br>
-
-
-
-<div class="container">
-<div class="row">
-<div class="col-md-6">
-
-<h3>More bad news</h3>
-<ul>
-	<li><a href="http://arstechnica.com/information-technology/2015/08/even-when-told-not-to-windows-10-just-cant-stop-talking-to-microsoft/" target="_blank">Even when told not to, Windows 10 just can’t stop talking to Microsoft. It's no wonder that privacy activists are up in arms.</a> - Ars Technica.</li>
-	<li><a href="http://arstechnica.com/information-technology/2015/08/windows-10-privacy-paranoia-leads-to-ban-from-private-piracy-torrent-trackers/" target="_blank">Windows 10 privacy paranoia leads to ban from private pirate torrent trackers. Pirates are concerned that Win10 will send the contents of your hard disk to Microsoft.</a> - Ars Technica.</li>
-	<li><a href="http://lifehacker.com/what-windows-10s-privacy-nightmare-settings-actually-1722267229" target="_blank">What Windows 10's "Privacy Nightmare" Settings Actually Do.</a> - Lifehacker.</li>
-	<li><a href="https://www.techdirt.com/articles/20150820/06171332012/windows-10-reserves-right-to-block-pirated-games-unauthorized-hardware.shtml" target="_blank">Windows 10 Reserves The Right To Block Pirated Games And 'Unauthorized' Hardware.</a> - Techdirt.</li>
-	
-</ul>
-
-</div>
-
-<div class="col-md-6"><span class="pull-right">
-<h3>Some good news</h3>
-<ul>
-	<li><a href="https://fix10.isleaked.com/" target="_blank">Fix Windows 10 privacy.</a> - fix10.isleaked.com</li>
-	<li><a href="http://arstechnica.com/information-technology/2015/08/windows-10-doesnt-offer-much-privacy-by-default-heres-how-to-fix-it/" target="_blank">Windows 10 doesn’t offer much privacy by default: Here’s how to fix it. </a> - Ars Technica.</li>
-	<li><a href="https://www.reddit.com/r/Windows10/comments/3f38ed/guide_how_to_disable_data_logging_in_w10" target="_blank">Guide: How to disable data logging in W10.</a></li>
-
-</ul>
-</span></div>
-</div>
-</div>
-
-
-
 <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>
@@ -1997,6 +1915,95 @@ diaspora* is based on three key philosophies: Decentralization, freedom and priv
 <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>
+
+
+<a class="anchor" name="win10"></a>
+<div class="page-header">
+<h1><a href="#win10" class="titleanchor"><span class="glyphicon glyphicon-link"></span></a> Don't use Windows 10 - It's a privacy nightmare</h1>
+</div>
+
+<div class="alert alert-warning" role="alert">
+<strong>Microsoft introduced a lot of new features in Windows 10 such as Cortana. However, most of them are violating your privacy.</strong>
+</div>
+
+<img src="img/layout/Windows-10-Privacy.jpg" class="img-responsive pull-right" alt="Windows 10 Privacy" style="margin-left:10px;">
+
+<ol>
+	<strong><li>Data syncing is by default enabled.</li></strong>
+	<ul><li>Browsing history and open websites.</li></ul>
+	<ul><li>Apps settings.</li></ul>
+	<ul><li>WiFi hotspot names and passwords.</li></ul>
+	
+	<strong><li>Your device is by default tagged with a unique advertising ID.</li></strong>
+	<ul><li>Used to serve you with personalized advertisements by third-party advertisers and ad networks.</li></ul>
+	
+	<strong><li>Cortana can collect any of your data.</li></strong>
+	<ul><li>Your keystrokes, searches and mic input.</li></ul>
+	<ul><li>Calendar data.</li></ul>
+	<ul><li>Music you listen to.</li></ul>
+	<ul><li>Credit Card information.</li></ul>
+	<ul><li>Purchases.</li></ul>
+	
+	<strong><li>Microsoft can collect any personal data.</li></strong>
+	<ul><li>Your identity.</li></ul>
+	<ul><li>Passwords.</li></ul>
+	<ul><li>Demographics.</li></ul>
+	<ul><li>Interests and habits.</li></ul>
+	<ul><li>Usage data.</li></ul>
+	<ul><li>Contacts and relationships.</li></ul>
+	<ul><li>Location data.</li></ul>
+	<ul><li>Content like emails, instant messages, caller list, audio and video recordings.</li></ul>
+	
+	<strong><li>Your data can be shared.</li></strong>
+	<ul><li>When downloading Windows 10, you are authorizing Microsoft to share any of above mentioned data with any third-party, with or without your consent.</li></ul>	
+</ol>
+
+<p>Source: <a href="http://propakistani.pk/2015/07/30/windows-10-can-be-your-worst-privacy-nightmare/" target="_blank">propakistani.pk</a>	
+
+<br>
+
+<p><a href="http://www.winprivacy.de/english-home/" target="_blank"><button type="button" class="btn btn-warning">Download: W10Privacy</button></a></p>
+
+This tool uses some known methods that attempt to disable major tracking features in Windows 10.
+
+<br>
+
+
+
+<div class="container">
+<div class="row">
+<div class="col-md-6">
+
+<h3>Some good news</h3>
+<ul>
+	<li><a href="https://github.com/Nummer/Destroy-Windows-10-Spying/releases" target="_blank">Destroy Win10 Spying</a> - Open source tool. <a href="http://dws.wzor.net/" target="_blank">Official Website.</a></li>
+	<li><a href="http://www.ghacks.net/2015/08/14/comparison-of-windows-10-privacy-tools/" target="_blank">Comparison of Windows 10 Privacy tools</a> - ghacks.net</li>
+	<li><a href="https://fix10.isleaked.com/" target="_blank">Fix Windows 10 privacy.</a> - fix10.isleaked.com</li>
+	<li><a href="http://arstechnica.com/information-technology/2015/08/windows-10-doesnt-offer-much-privacy-by-default-heres-how-to-fix-it/" target="_blank">Windows 10 doesn’t offer much privacy by default: Here’s how to fix it. </a> - Ars Technica.</li>
+	<li><a href="https://www.reddit.com/r/Windows10/comments/3f38ed/guide_how_to_disable_data_logging_in_w10" target="_blank">Guide: How to disable data logging in W10.</a></li>
+
+</ul>
+
+
+
+</div>
+
+<div class="col-md-6"><span class="pull-right">
+<h3>More bad news</h3>
+
+<ul>
+	<li><a href="http://arstechnica.com/information-technology/2015/08/even-when-told-not-to-windows-10-just-cant-stop-talking-to-microsoft/" target="_blank">Even when told not to, Windows 10 just can’t stop talking to Microsoft. It's no wonder that privacy activists are up in arms.</a> - Ars Technica.</li>
+	<li><a href="http://arstechnica.com/information-technology/2015/08/windows-10-privacy-paranoia-leads-to-ban-from-private-piracy-torrent-trackers/" target="_blank">Windows 10 privacy paranoia leads to ban from private pirate torrent trackers. Pirates are concerned that Win10 will send the contents of your hard disk to Microsoft.</a> - Ars Technica.</li>
+	<li><a href="http://lifehacker.com/what-windows-10s-privacy-nightmare-settings-actually-1722267229" target="_blank">What Windows 10's "Privacy Nightmare" Settings Actually Do.</a> - Lifehacker.</li>
+	<li><a href="https://www.techdirt.com/articles/20150820/06171332012/windows-10-reserves-right-to-block-pirated-games-unauthorized-hardware.shtml" target="_blank">Windows 10 Reserves The Right To Block Pirated Games And 'Unauthorized' Hardware.</a> - Techdirt.</li>
+	
+</ul>
+</span></div>
+</div>
+</div>
+
+
+
 <a class="anchor" name="quotes"></a>
 <div class="page-header">
 <h1><a href="#quotes" class="titleanchor"><span class="glyphicon glyphicon-link"></span></a> Quotes</h1>