diff --git a/i2p2www/pages/site/docs/index.html b/i2p2www/pages/site/docs/index.html
index 4452a004..27d8f248 100644
--- a/i2p2www/pages/site/docs/index.html
+++ b/i2p2www/pages/site/docs/index.html
@@ -36,8 +36,8 @@ If you find any inaccuracies in the documents linked below, please
 <li><a href="plugins.html">Plugins Overview</a></li>
 <li><a href="plugin_spec.html">Plugin Specification</a></li>
 <li><a href="updates.html">Router software updates</a></li>
-<li><a href="bittorrent.html">Bittorrent over I2P</a></li>
-<li><a href="i2pcontrol.html">I2PControl Plugin API</a></li>
+<li><a href="{{ site_url('docs/applications/bittorrent') }}">Bittorrent over I2P</a></li>
+<li><a href="{{ site_url('docs/api/i2pcontrol') }}">I2PControl Plugin API</a></li>
 <li><a href="blockfile.html">hostsdb.blockfile Format</a></li>
 <li><a href="configuration.html">Configuration File Format</a></li>
 </ul>
@@ -45,11 +45,11 @@ If you find any inaccuracies in the documents linked below, please
 <h3>Application Layer API and Protocols</h3>
 High-level, easy-to-use APIs for applications written in any language to send and receive data.
 <ul><li>
-<a href="applications.html">Application Development Overview and Guide</a>
+<a href="{{ site_url('develop/applications') }}">Application Development Overview and Guide</a>
 </li><li>
-<a href="i2ptunnel.html">I2PTunnel</a>
+<a href="{{ site_url('docs/api/i2ptunnel') }}">I2PTunnel</a>
 </li><li>
-<a href="socks.html">SOCKS Proxy</a>
+<a href="{{ site_url('docs/api/socks') }}">SOCKS Proxy</a>
 </li><li>
 HTTP Proxy
 </li><li>
@@ -75,7 +75,7 @@ HTTP Bidir Proxy
 <h3>End-to-End Transport API and Protocols</h3>
 The end-to-end protocols used by clients for reliable and unreliable communication.
 <ul><li>
-<a href="streaming.html">Streaming Library</a>
+<a href="{{ site_url('docs/api/streaming') }}">Streaming Library</a>
 </li><li>
 <a href="http://docs.i2p-projekt.de/javadoc/net/i2p/client/streaming/package-summary.html">Streaming Javadoc</a>
 </li><li>
@@ -179,13 +179,13 @@ Time synchronization and NTP
 
 <h3>Developer's Guides and Resources</h3>
 <ul><li>
-<a href="newdevelopers.html">New Developer's Guide</a>
+<a href="{{ site_url('volunteer/guides/newdevelopers') }}">New Developer's Guide</a>
 </li><li>
-<a href="newtranslators.html">New Translator's Guide</a>
+<a href="{{ site_url('volunteer/guides/newtranslators') }}">New Translator's Guide</a>
 </li><li>
 <a href="monotone.html">Monotone Guide</a>
 </li><li>
-<a href="dev-guidelines.html">Developer Guidelines</a>
+<a href="{{ site_url('volunteer/guides/devguidelines') }}">Developer Guidelines</a>
 </li><li>
 <a href="http://docs.i2p-projekt.de/javadoc/">Javadocs</a> (standard internet)
 Note: always verify that javadocs are current by checking the release number.
@@ -221,9 +221,9 @@ Note: always verify that javadocs are current by checking the release number.
 </li><li>
 <a href="http://trac.i2p2.de/09roadmap">0.9 roadmap wiki</a> (not current)
 </li><li>
-<a href="roadmap.html">Old roadmap</a> (not current)
+<a href="{{ site_url('volunteer/roadmap') }}">Old roadmap</a> (not current)
 </li><li>
-<a href="todo.html">To Do List</a> (not current)
+<a href="{{ site_url('volunteer/guides/todo') }}">To Do List</a> (not current)
 </li></ul>