diff --git a/index.html b/index.html
index d294052..3f22faf 100644
--- a/index.html
+++ b/index.html
@@ -96,7 +96,7 @@
         </ul>
 	<b>Notes</b>
 	<ul>
-		<li><a href="https://git.lsd.cat/g/pax-pwn" target="_blank"">PAX POS Prolin OS RCE</a> - CVE-2020-28044, CVE-2020-28045, CVE-2020-28046</li>
+		<li><a href="https://git.lsd.cat/g/pax-pwn" target="_blank">PAX POS Prolin OS RCE</a> - CVE-2020-28044, CVE-2020-28045, CVE-2020-28046</li>
 		<li><a href="https://git.lsd.cat/g/websphere-portal-pt" target="_blank">WebSphere Portal Security Intro</a></li>
 		<li><a href="https://git.lsd.cat/g/nokia-keygen" target="_blank">Nokia/ALU CPE Keygen</a> - CVE-2020-12694</li>
 		<li><a href="https://git.lsd.cat/g/openwrt-cpe46b" target="_blank">Porting OpenWrt</a></li>
@@ -109,9 +109,6 @@
 	</ul>
         <b>Stuff</b>
         <ul>
-	    <li><a href="https://lsd.cat/keygen/" target="_blank">Wind WPA Keygen</a> - default WPA generator for wifi networks ALHN-XXXX</li>
-            <li><a href="/torrents/" target="_blank">Torrents archive</a> - archives containing crawled torrents in Q1 2017</li>
-            <li><a href="/torsearch/" target="_blank">Torsearch</a> - full text search on the torrents archives</li>
             <li><a href="/anime/" target="_blank">VVVVID Catalog</a> - direct catalog of vvvvid.it</li>
             <li><a href="https://t.me/certalertbot" target="_blank">Certalert Bot</a> - Telegram bot that notify when a certificate with a certain pattern is logged in CT</li>
         </ul>
@@ -128,16 +125,9 @@
 	    <li>pengy.lsd.cat - <a href="https://metrics.torproject.org/rs.html#details/08394C4873C8A71BE9F53593F9B4AD694BFCDB90" target="_blank"><small>08394C4873C8A71BE9F53593F9B4AD694BFCDB90</small></a></li>
             <li>pinga.lsd.cat - <a href="https://metrics.torproject.org/rs.html#details/C00F992C589549F4BEA95116D97B804422F427F9" target="_blank"><small>C00F992C589549F4BEA95116D97B804422F427F9</small></a></li>
 	</ul>
-	<!--
-	<b>Site Proxies</b>
-	<ul>
-	    <li>Sci-Hub - <a href="https://scihub.proxy.lsd.cat" target="_blank">https://scihub.proxy.lsd.cat</a></li>
-	    <li>LibGen - <a href="https://libgen.proxy.lsd.cat" target="_blank">https://libgen.proxy.lsd.cat</a></li>
-	</ul>
-	-->
         </div>
         <hr>
-	<div>Served from Roost, Bissen, Luxembourg - <u>chaberton.lsd.cat</u></div>
+	<div>Served from %%location%% - <u>%%host%%</u></div>
 	<div><a href="http://l4frkgv5uxwrcjv2nmuegnnf33nz4dicvlnukdkouxsehzkv7xpfysqd.onion"><small><i>http://l4frkgv5uxwrcjv2nmuegnnf33nz4dicvlnukdkouxsehzkv7xpfysqd.onion</i></small></a></div>
     </div>
 </div>