diff --git a/templates/pupil.jade b/templates/pupil.jade
index 6007f7da..1a9fc553 100644
--- a/templates/pupil.jade
+++ b/templates/pupil.jade
@@ -176,7 +176,7 @@ block main
               h4 We believe in open source. All Pupil code is released with open source licenses.
               h4 A lot of work went into making the software modular and accessible. The majority of the codebase is written in Python.
               h4 We have developed a plugin structure that enables you to extend Pupil Capture and Pupil Player to suit your needs. 
-              h4 Check out the pupil repository on #[a(href="https://github.com/pupil-labs/pupil/" rel="noopener" title="Pupil repository on github") Github]. Read developer documentation on the #[a(href="https://github.com/pupil-labs/pupil/wiki" rel="noopener" title="Pupil Wiki") wiki].
+              h4 Check out the pupil repository on #[a(href="https://github.com/pupil-labs/pupil/" rel="noopener" title="Pupil repository on github") Github]. Read developer documentation on #[a(href="http://docs.pupil-labs.com/" rel="noopener" title="Pupil Docs") docs.pupil-labs.com].
           div.Grid-cell
             div.Feature
               figure.Feature-figure
@@ -214,10 +214,10 @@ block main
           div.Grid-cell
             div.Feature
               h1 Modular & Hackable
-              h4 If we don't have the configuration you need, customize it yourself. Our camera mount geometry and electrical interface is #[a(href="https://github.com/pupil-labs/pupil/wiki/Pupil%20Hardware%20Development" rel="noopener" title="Pupil Wiki - Hardware Development") open]. 
+              h4 If we don't have the configuration you need, customize it yourself. Our camera mount geometry and electrical interface is #[a(href="http://docs.pupil-labs.com/#pupil-hardware-development" rel="noopener" title="Pupil Docs - Hardware Development") open]. 
               h4 We also like to work with users to create custom solutions. #[a(href="mailto:sales@pupil-labs.com" rel="noopener" title="Get in touch") Get in touch!]
               h4 If you're excited about SMD soldering and hacking: you can make your own Pupil DIY. 
-              h4 #[a(href="https://www.shapeways.com/product/LQJJK2CHQ/pupil-mobile-eye-tracking-headset" rel="noopener" title="Pupil DIY frame on Shapeways") Buy the frame], #[a(href="https://docs.google.com/spreadsheets/d/1NRv2WixyXNINiq1WQQVs5upn20jakKyEl1R8NObrTgU/pub?single=true&gid=0&output=html" rel="noopener" title="Source parts") source parts], and #[a(href="https://github.com/pupil-labs/pupil/wiki/DIY-Kit-Guide" rel="noopener" title="Pupil DIY guide") follow assembly instructions] to build your own Pupil DIY headset.
+              h4 #[a(href="https://www.shapeways.com/product/LQJJK2CHQ/pupil-mobile-eye-tracking-headset" rel="noopener" title="Pupil DIY frame on Shapeways") Buy the frame], #[a(href="https://docs.google.com/spreadsheets/d/1NRv2WixyXNINiq1WQQVs5upn20jakKyEl1R8NObrTgU/pub?single=true&gid=0&output=html" rel="noopener" title="Source parts") source parts], and #[a(href="http://docs.pupil-labs.com/#diy" rel="noopener" title="Pupil Docs - DIY") follow assembly instructions] to build your own Pupil DIY headset.
 
 
     //- Commercial Use & Dedicated Support
diff --git a/templates/vr-ar.jade b/templates/vr-ar.jade
index 84c3aeb1..5675134c 100644
--- a/templates/vr-ar.jade
+++ b/templates/vr-ar.jade
@@ -182,7 +182,7 @@ block main
                       td 
                     tr
                       td.Table--column SDK
-                      td #[a(href="https://github.com/pupil-labs/pupil/wiki/Pupil-Interprocess-and-Network-Communication" title="Pupil Interprocess and Network Communication" rel="noopener") Through network message based API]
+                      td #[a(href="http://docs.pupil-labs.com/#interprocess-and-network-communication" title="Pupil Docs - Interprocess and Network Communication" rel="noopener") Through network message based API]
                     tr
                       td.Table--column Plugin for Game Engines
                       td #[a(href="https://github.com/pupil-labs/hmd-eyes" title="HMD Eyes" rel="noopener") Reference plugin] implementation for Unity3D