diff --git a/i2p2www/pages/site/about/papers.html b/i2p2www/pages/site/about/papers.html
index a4881172..9a0fe279 100644
--- a/i2p2www/pages/site/about/papers.html
+++ b/i2p2www/pages/site/about/papers.html
@@ -15,11 +15,11 @@ Newest links are at the bottom of each section.
 <ul>
 
 <li>
-<a href="/_static/pdf/i2p_philosophy.pdf">Invisible Internet Project (I2P) Project Overview</a>, jrandom, August 28, 2003.
+<a href="{{ url_for('static', filename='pdf/i2p_philosophy.pdf') }}">Invisible Internet Project (I2P) Project Overview</a>, jrandom, August 28, 2003.
 </li>
 
 <li>
-<a href="/_static/pdf/I2P-PET-CON-2009.1.pdf">Peer Profiling and Selection in the I2P Anonymous Network</a> -
+<a href="{{ url_for('static', filename='pdf/I2P-PET-CON-2009.1.pdf') }}">Peer Profiling and Selection in the I2P Anonymous Network</a> -
 zzz and Lars Schimmer,
 presented at
 <a href="http://www.pet-con.org/index.php/PET_Convention_2009.1">PET-CON 2009.1</a>,
diff --git a/i2p2www/pages/site/about/team.html b/i2p2www/pages/site/about/team.html
index 5bd06e7d..db394d57 100644
--- a/i2p2www/pages/site/about/team.html
+++ b/i2p2www/pages/site/about/team.html
@@ -26,7 +26,7 @@ network.
 	<td valign="top"><i>press contact, manages public relations and affairs</i></td>
 </tr>
 <tr>
-    <td valign="top"><b><a href="http://forum.i2p/">Forum</a> admin</b></td>
+    <td valign="top"><b><a href="http://{{ i2pconv('forum.i2p') }}/">Forum</a> admin</b></td>
 	<td valign="top">cervantes</td>
 	<td valign="top"><i>manage the public user forum</i></td>
 </tr>
@@ -81,12 +81,12 @@ network.
 	<td valign="top"><i>manage the public project website content design</i></td>
 </tr>
 <tr>
-	<td valign="top"><b><a href="http://www.i2p2.i2p/">Webserver</a> admin</b></td>
+	<td valign="top"><b><a href="http://{{ i2pconv('www.i2p2.i2p') }}/">Webserver</a> admin</b></td>
 	<td valign="top">welterde</td>
 	<td valign="top"><i>manage the public project webservers</i></td>
 </tr>
 <tr>
-	<td valign="top"><b><a href="http://www.i2p2.i2p/">Website</a> admin</b></td>
+	<td valign="top"><b><a href="http://{{ i2pconv('www.i2p2.i2p') }}/">Website</a> admin</b></td>
 	<td valign="top" style="color:blue">[vacant]</td>
 	<td valign="top"><i>manage the public project website content</i></td>
 </tr>
@@ -108,47 +108,47 @@ network.
 	<td valign="top"><i>lead dev for the SDK and router</i></td>
 </tr>
 <tr>
-        <td valign="top"><b><a href="http://hq.postman.i2p/">I2P mail</a> lead</b></td>
+        <td valign="top"><b><a href="http://{{ i2pconv('hq.postman.i2p') }}/">I2P mail</a> lead</b></td>
 	<td valign="top">postman</td>
 	<td valign="top"><i>organize and develop the i2p mail system</i></td>
 </tr>
 <tr>
-        <td valign="top"><b><a href="http://i2host.i2p/">I2Host</a> lead</b></td>
+        <td valign="top"><b><a href="http://{{ i2pconv('i2host.i2p') }}/">I2Host</a> lead</b></td>
 	<td valign="top">sponge</td>
 	<td valign="top"><i>I2Host addressbook application</i></td>
 </tr>
 <tr>
-        <td valign="top"><b><a href="http://bob.i2p/">BOB</a> lead</b></td>
+        <td valign="top"><b><a href="http://{{ i2pconv('bob.i2p') }}/">BOB</a> lead</b></td>
 	<td valign="top">sponge</td>
 	<td valign="top"><i>Basic Open Bridge</i></td>
 </tr>
 <tr>
-        <td valign="top"><b><a href="http://i2pbote.i2p/">I2P-Bote</a> lead</b></td>
+        <td valign="top"><b><a href="http://{{ i2pconv('i2pbote.i2p') }}/">I2P-Bote</a> lead</b></td>
 	<td valign="top">HungryHobo</td>
 	<td valign="top"><i>I2PBote plugin</i></td>
 </tr>
 <tr>
-        <td valign="top"><b><a href="http://bob.i2p/">Robert</a> lead</b></td>
+        <td valign="top"><b><a href="http://{{ i2pconv('bob.i2p') }}/">Robert</a> lead</b></td>
 	<td valign="top">sponge</td>
 	<td valign="top"><i>Robert BitTorrent client</i></td>
 </tr>
 <tr>
-        <td valign="top"><b><a href="http://forum.i2p2.de/viewforum?f=25">I2Phex</a> lead</b></td>
+        <td valign="top"><b><a href="http://{{ i2pconv('forum.i2p') }}/viewforum?f=25">I2Phex</a> lead</b></td>
 	<td valign="top" style="color:blue">[vacant]</td>
 	<td valign="top"><i>I2Phex Gnutella client</i></td>
 </tr>
 <tr>
-        <td valign="top"><b><a href="http://forum.i2p2.de/viewforum?f=21">I2PSnark</a> lead</b></td>
+        <td valign="top"><b><a href="http://{{ i2pconv('forum.i2p') }}/viewforum?f=21">I2PSnark</a> lead</b></td>
 	<td valign="top">zzz</td>
 	<td valign="top"><i>Maintains the integrated Bittorrent client</i></td>
 </tr>
 <tr>
-        <td valign="top"><b><a href="http://forum.i2p2.de/viewforum?f=30">iMule</a> lead</b></td>
+        <td valign="top"><b><a href="http://{{ i2pconv('forum.i2p') }}/viewforum?f=30">iMule</a> lead</b></td>
 	<td valign="top" style="color:blue">[vacant]</td>
 	<td valign="top"><i>eMule client over I2P</i></td>
 </tr>
 <tr>
-        <td valign="top"><b><a href="http://forum.i2p2.de/viewforum?f=29">Syndie</a> lead</b></td>
+        <td valign="top"><b><a href="http://{{ i2pconv('forum.i2p') }}/viewforum?f=29">Syndie</a> lead</b></td>
 	<td valign="top" style="color:blue">[vacant]</td>
         <td valign="top"><i>Syndie development</i></td>
 </tr>