diff --git a/www.i2p2/pages/_menu.html b/www.i2p2/pages/_menu.html
index 046e00a2..7107a32d 100644
--- a/www.i2p2/pages/_menu.html
+++ b/www.i2p2/pages/_menu.html
@@ -28,7 +28,7 @@
 <img src="/_static/images/sqbullet.png" alt="*" />&nbsp;<a href="todo_de.html">Aufgabenliste</a><br />
 <br /><b><a href="intro_de.html">&Uuml;ber I2P</a></b><br />
 <img src="/_static/images/sqbullet.png" alt="*" />&nbsp;<a href="faq_de.html">FAQ</a><br />
-<img src="/_static/images/sqbullet.png" alt="*" />&nbsp;<a href="http://forum.i2p2.de/">Forum</a><br />
+<img src="/_static/images/sqbullet.png" alt="*" />&nbsp;<a href="http://forum.i2p/">Forum (within I2P)</a><br />
 <img src="/_static/images/sqbullet.png" alt="*" />&nbsp;<a href="bounties_de.html">Pr&auml;mien</a><br />
 <img src="/_static/images/sqbullet.png" alt="*" />&nbsp;<a href="getinvolved_de.html">Beteilige dich!</a><br />
 <img src="/_static/images/sqbullet.png" alt="*" />&nbsp;<a href="donate_de.html">Spende!</a><br />
@@ -70,7 +70,7 @@
 <img src="/_static/images/sqbullet.png" alt="*" />&nbsp;<a href="todo.html">Tareas</a><br />
 <br /><b><a href="intro_de.html">Acerca de I2P</a></b><br />
 <img src="/_static/images/sqbullet.png" alt="*" />&nbsp;<a href="faq.html">FAQ</a><br />
-<img src="/_static/images/sqbullet.png" alt="*" />&nbsp;<a href="http://forum.i2p2.de/">Foro</a><br />
+<img src="/_static/images/sqbullet.png" alt="*" />&nbsp;<a href="http://forum.i2p/">Foro (within I2P)</a><br />
 <img src="/_static/images/sqbullet.png" alt="*" />&nbsp;<a href="bounties.html">Premias</a><br />
 <img src="/_static/images/sqbullet.png" alt="*" />&nbsp;<a href="getinvolved.html">¡Participa!</a><br />
 <img src="/_static/images/sqbullet.png" alt="*" />&nbsp;<a href="donate.html">Donaciones</a><br />
@@ -112,7 +112,7 @@
 <img src="/_static/images/sqbullet.png" alt="*" />&nbsp;<a href="todo.html">Cose-da-fare</a><br />
 <br /><b><a href="intro.html">Informazioni su I2P</a></b><br />
 <img src="/_static/images/sqbullet.png" alt="*" />&nbsp;<a href="faq.html">FAQ</a><br/>
-<img src="/_static/images/sqbullet.png" alt="*" />&nbsp;<a href="http://forum.i2p2.de/">Forum</a><br />
+<img src="/_static/images/sqbullet.png" alt="*" />&nbsp;<a href="http://forum.i2p/">Forum (within I2P)</a><br />
 <img src="/_static/images/sqbullet.png" alt="*" />&nbsp;<a href="bounties_it.html">Bounties</a><br />
 <img src="/_static/images/sqbullet.png" alt="*" />&nbsp;<a href="getinvolved_html">Get Involved!</a><br />
 <img src="/_static/images/sqbullet.png" alt="*" />&nbsp;<a href="donate.html">Donazioni</a><br />
@@ -153,7 +153,7 @@
 <img src="/_static/images/sqbullet.png" alt="*" />&nbsp;<a href="todo.html">Taken lijst</a><br />
 <br /><b><a href="intro.html">Over I2P</a></b><br />
 <img src="/_static/images/sqbullet.png" alt="*" />&nbsp;<a href="faq.html">FAQ</a><br />
-<img src="/_static/images/sqbullet.png" alt="*" />&nbsp;<a href="http://forum.i2p2.de/">Forum</a><br />
+<img src="/_static/images/sqbullet.png" alt="*" />&nbsp;<a href="http://forum.i2p/">Forum (within I2P)</a><br />
 <img src="/_static/images/sqbullet.png" alt="*" />&nbsp;<a href="bounties.html">Premies</a><br />
 <img src="/_static/images/sqbullet.png" alt="*" />&nbsp;<a href="getinvolved.html">Werk mee</a><br />
 <img src="/_static/images/sqbullet.png" alt="*" />&nbsp;<a href="donate.html">Doneer!</a><br />
@@ -198,7 +198,7 @@
 <img src="/_static/images/sqbullet.png" alt="*" />&nbsp;<a href="todo.html">任务</a><br />
 <br /><b><a href="intro.html">I2P简介</a></b><br />
 <img src="/_static/images/sqbullet.png" alt="*" />&nbsp;<a href="faq_zh.html">√ 常见问题集</a><br />
-<img src="/_static/images/sqbullet.png" alt="*" />&nbsp;<a href="http://forum.i2p2.de/">i2p论坛</a><br />
+<img src="/_static/images/sqbullet.png" alt="*" />&nbsp;<a href="http://forum.i2p/">i2p论坛 (within I2P)</a><br />
 <img src="/_static/images/sqbullet.png" alt="*" />&nbsp;<a href="bounties.html">赏金项目</a><br />
 <img src="/_static/images/sqbullet.png" alt="*" />&nbsp;<a href="getinvolved.html">志愿者</a><br />
 <img src="/_static/images/sqbullet.png" alt="*" />&nbsp;<a href="donate.html">捐助!</a><br />
@@ -243,7 +243,7 @@
 <img src="/_static/images/sqbullet.png" alt="*" />&nbsp;<a href="todo_fr.html">Les choses à faire</a><br />
 <br /><b><a href="intro_fr.html">&Agrave; propos d'i2p</a></b><br />
 <img src="/_static/images/sqbullet.png" alt="*" />&nbsp;<a href="faq_fr.html">Foire aux questions</a><br />
-<img src="/_static/images/sqbullet.png" alt="*" />&nbsp;<a href="http://forum.i2p2.de/">I2P forums</a><br />
+<img src="/_static/images/sqbullet.png" alt="*" />&nbsp;<a href="http://forum.i2p/">I2P forums (within I2P)</a><br />
 <img src="/_static/images/sqbullet.png" alt="*" />&nbsp;<a href="bounties.html">Primes</a><br />
 <img src="/_static/images/sqbullet.png" alt="*" />&nbsp;<a href="getinvolved_fr.html">Impliquez-vous!</a><br />
 <img src="/_static/images/sqbullet.png" alt="*" />&nbsp;<a href="donate_fr.html">Faire un don</a><br />
@@ -287,7 +287,7 @@
 
 <br /><b><a href="intro_ru.html">О проекте I2P</a></b><br />
 <img src="/_static/images/sqbullet.png" alt="*" />&nbsp;<a href="faq.html">FAQ</a><br />
-<img src="/_static/images/sqbullet.png" alt="*" />&nbsp;<a href="http://forum.i2p2.de/">Форумы</a><br />
+<img src="/_static/images/sqbullet.png" alt="*" />&nbsp;<a href="http://forum.i2p/">Форумы (within I2P)</a><br />
 <img src="/_static/images/sqbullet.png" alt="*" />&nbsp;<a href="bounties_ru.html">Премии за проекты</a><br />
 <img src="/_static/images/sqbullet.png" alt="*" />&nbsp;<a href="getinvolved_ru.html">Как стать участником</a><br />
 <img src="/_static/images/sqbullet.png" alt="*" />&nbsp;<a href="donate_ru.html">Donate!</a><br />
@@ -334,7 +334,7 @@
 
 <br /><b><a href="intro.html">Co je I2P</a></b><br />
 <img src="/_static/images/sqbullet.png" alt="*" />&nbsp;<a href="faq.html">FAQ</a><br />
-<img src="/_static/images/sqbullet.png" alt="*" />&nbsp;<a href="http://forum.i2p2.de/">Diskuzní fóra</a><br />
+<img src="/_static/images/sqbullet.png" alt="*" />&nbsp;<a href="http://forum.i2p/">Diskuzní fóra (within I2P)</a><br />
 <img src="/_static/images/sqbullet.png" alt="*" />&nbsp;<a href="bounties.html">Projektové odměny</a><br />
 <img src="/_static/images/sqbullet.png" alt="*" />&nbsp;<a href="getinvolved.html">Zapojte se</a><br />
 <img src="/_static/images/sqbullet.png" alt="*" />&nbsp;<a href="donate.html">Dotace!</a><br />
@@ -380,7 +380,7 @@
 <img src="/_static/images/sqbullet.png" alt="*" />&nbsp;<a href="todo.html">قائمة المهام</a><br />
 <br /><b><a href="intro_ar.html"> I2P حول </a></b><br />
 <img src="/_static/images/sqbullet.png" alt="*" />&nbsp;<a href="faq_ar.html">أسئلة متكررة</a><br />
-<img src="/_static/images/sqbullet.png" alt="*" />&nbsp;<a href="http://forum.i2p2.de/">المنتديات</a><br />
+<img src="/_static/images/sqbullet.png" alt="*" />&nbsp;<a href="http://forum.i2p/">المنتديات (within I2P)</a><br />
 <img src="/_static/images/sqbullet.png" alt="*" />&nbsp;<a href="bounties_ar.html">العطاءات</a><br />
 <img src="/_static/images/sqbullet.png" alt="*" />&nbsp;<a href="getinvolved_ar.html">شاركنا</a><br />
 <img src="/_static/images/sqbullet.png" alt="*" />&nbsp;<a href="donate_ar.html">! تبرع</a><br />
@@ -423,7 +423,7 @@
 <img src="/_static/images/sqbullet.png" alt="*" />&nbsp;<a href="todo.html">Task list</a><br />
 <br /><b><a href="intro.html">About I2P</a></b><br />
 <img src="/_static/images/sqbullet.png" alt="*" />&nbsp;<a href="faq.html">FAQ</a><br />
-<img src="/_static/images/sqbullet.png" alt="*" />&nbsp;<a href="http://forum.i2p2.de/">Forums</a><br />
+<img src="/_static/images/sqbullet.png" alt="*" />&nbsp;<a href="http://forum.i2p/">Forums (within I2P)</a><br />
 <img src="/_static/images/sqbullet.png" alt="*" />&nbsp;<a href="bounties.html">Bounties</a><br />
 <img src="/_static/images/sqbullet.png" alt="*" />&nbsp;<a href="getinvolved.html">Get involved</a><br />
 <img src="/_static/images/sqbullet.png" alt="*" />&nbsp;<a href="donate.html">Donate!</a><br />