diff --git a/.phrozn/entries/blog/18-08-2012/documentation-updates.twig b/.phrozn/entries/blog/18-08-2012/documentation-updates.twig
index 9c01e72..df83842 100644
--- a/.phrozn/entries/blog/18-08-2012/documentation-updates.twig
+++ b/.phrozn/entries/blog/18-08-2012/documentation-updates.twig
@@ -23,7 +23,7 @@ layout: page.twig
 </div>
 <div class="well" id="disqus_thread"></div>
 <script type="text/javascript">
-  var disqus_identifier = '/blog/18-07-2012/documentation-updates';
+  var disqus_identifier = '/blog/18-08-2012/documentation-updates';
   (function() {
       var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
       dsq.src = 'http://' + disqus_shortname + '.disqus.com/embed.js';
diff --git a/.phrozn/entries/blog/25-08-2012/essential-framework-components.twig b/.phrozn/entries/blog/25-08-2012/essential-framework-components.twig
index eee86ba..08367da 100644
--- a/.phrozn/entries/blog/25-08-2012/essential-framework-components.twig
+++ b/.phrozn/entries/blog/25-08-2012/essential-framework-components.twig
@@ -26,7 +26,7 @@ layout: page.twig
 </div>
 <div class="well" id="disqus_thread"></div>
 <script type="text/javascript">
-  var disqus_identifier = '/blog/18-07-2012/essential-framework-components';
+  var disqus_identifier = '/blog/25-08-2012/essential-framework-components';
   (function() {
       var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
       dsq.src = 'http://' + disqus_shortname + '.disqus.com/embed.js';
diff --git a/.phrozn/entries/docs/current/bootstrap.twig b/.phrozn/entries/docs/current/bootstrap.twig
index be1748c..2b96772 100644
--- a/.phrozn/entries/docs/current/bootstrap.twig
+++ b/.phrozn/entries/docs/current/bootstrap.twig
@@ -56,7 +56,7 @@ layout: docs/current.twig
     }
   </pre>
   <p>
-    Here Proem sets up a <a href="/docs/current/signal-component.html">Signal Manager</a> and a <a href="/docs/services-component.html">Service Manager</a>.
+    Here Proem sets up a <a href="/docs/current/signal-component.html">Signal Manager</a> and a <a href="/docs/current/services-component.html">Service Manager</a>.
     (Asset is an alias of <a href="https://github.com/proem/proem/blob/develop/lib/Proem/Service/Asset/Standard.php">\Proem\Service\Asset\Standard</a>).
     These two objects form the heart of an application built on top of Proem and are passed around the entire bootstrap process and into userland <em>(your application)</em>.
   </p>
diff --git a/.phrozn/entries/docs/current/index.twig b/.phrozn/entries/docs/current/index.twig
index eba0d5a..bf15645 100644
--- a/.phrozn/entries/docs/current/index.twig
+++ b/.phrozn/entries/docs/current/index.twig
@@ -62,7 +62,7 @@ layout: docs/current.twig
     The <em>Userland</em> section covers how you can write code to extend and build upon the Proem framework.
   </p>
   <p>
-    If you are then still looking for more detail we also have available the <a href="http://prdoc/api/namespaces/Proem.html">API Documentation</a>. This documentation documents every class and method
+    If you are then still looking for more detail we also have available the <a href="/api/namespaces/Proem.html">API Documentation</a>. This documentation documents every class and method
     within Proem and is automatically generated from comments within the actual code itself.
   </p>
   <p>
diff --git a/.phrozn/entries/docs/current/modules.twig b/.phrozn/entries/docs/current/modules.twig
index 838a617..dabeddf 100644
--- a/.phrozn/entries/docs/current/modules.twig
+++ b/.phrozn/entries/docs/current/modules.twig
@@ -111,7 +111,7 @@ layout: docs/current.twig
     All that is left now is to load our <em>Module</em>. Edit the <em>htdocs/index.php</em> file so that it looks lie the following:
   </p>
   <pre class="prettyprint">
-    require_once '/Users/thorpe/www/lib/proem/framework/lib/Proem/Autoloader.php';
+    require_once '../lib/Proem/Autoloader.php';
 
     (new Proem\Autoloader())
         ->attachNamespace('Module', '../lib')
diff --git a/.phrozn/entries/docs/current/plugins.twig b/.phrozn/entries/docs/current/plugins.twig
index 5a863dc..8879fdd 100644
--- a/.phrozn/entries/docs/current/plugins.twig
+++ b/.phrozn/entries/docs/current/plugins.twig
@@ -52,7 +52,7 @@ layout: docs/current.twig
     Next, we need to load our <em>Plugin</em>. Simple, open our <em>htdocs/index.php</em> file and edit it to look like:
   </p>
   <pre class="prettyprint">
-    require_once '/Users/thorpe/www/lib/proem/framework/lib/Proem/Autoloader.php';
+    require_once '../lib/Proem/Autoloader.php';
 
     (new Proem\Autoloader())
         ->attachNamespace('Module', '../lib')
@@ -77,7 +77,7 @@ layout: docs/current.twig
   </p>
   <p>
     In fact, under the hood, a <em>Module</em> and a <em>Plugin</em> are currently exactly the same. This will likely change somewhat in future versions, but for now, it's more a simple naming convention.
-    <em>Modules</em> are designed to manipulate <a href="http://prdoc/docs/current/route-component.html">Routes</a> and house <a href="/docs/current/controllers.html">Controllers</a> while <em>Plugins</em>
+    <em>Modules</em> are designed to manipulate <a href="/docs/current/route-component.html">Routes</a> and house <a href="/docs/current/controllers.html">Controllers</a> while <em>Plugins</em>
     are designed to inject third party code.
   </p>
   <p>
diff --git a/.phrozn/entries/docs/current/route-component.twig b/.phrozn/entries/docs/current/route-component.twig
index 37558d6..785ef7a 100644
--- a/.phrozn/entries/docs/current/route-component.twig
+++ b/.phrozn/entries/docs/current/route-component.twig
@@ -153,7 +153,7 @@ layout: docs/current.twig
   <p>
     The above examples demonstrate how to configure simple rules, but web applications these days are complex beasts with multiple
     url's all pointing to multiple resources. How do we handle all this in a simple uniformed manner? Easy, this is where the
-    <a href="(https://github.com/proem/proem/blob/develop/lib/Proem/Routing/Router.php">Router</a> comes into play. The <em>Router</em>
+    <a href="https://github.com/proem/proem/blob/develop/lib/Proem/Routing/Router.php">Router</a> comes into play. The <em>Router</em>
     is basically responsible for storing a series of <em>Routes</em> and managing the execution of there <em>process()</em> method's against the supplied url.
   </p>
   <p>
diff --git a/.phrozn/entries/docs/dev/bootstrap.twig b/.phrozn/entries/docs/dev/bootstrap.twig
index 0d3bc77..f131675 100644
--- a/.phrozn/entries/docs/dev/bootstrap.twig
+++ b/.phrozn/entries/docs/dev/bootstrap.twig
@@ -56,7 +56,7 @@ layout: docs/dev.twig
     }
   </pre>
   <p>
-    Here Proem sets up a <a href="/docs/dev/signal-component.html">Signal Manager</a> and a <a href="/docs/services-component.html">Service Manager</a>.
+    Here Proem sets up a <a href="/docs/dev/signal-component.html">Signal Manager</a> and a <a href="/docs/dev/services-component.html">Service Manager</a>.
     (Asset is an alias of <a href="https://github.com/proem/proem/blob/develop/lib/Proem/Service/Asset/Standard.php">\Proem\Service\Asset\Standard</a>).
     These two objects form the heart of an application built on top of Proem and are passed around the entire bootstrap process and into userland <em>(your application)</em>.
   </p>
diff --git a/.phrozn/entries/docs/dev/index.twig b/.phrozn/entries/docs/dev/index.twig
index 7b0736f..0fd8fc0 100644
--- a/.phrozn/entries/docs/dev/index.twig
+++ b/.phrozn/entries/docs/dev/index.twig
@@ -59,7 +59,7 @@ layout: docs/dev.twig
     The <em>Userland</em> section covers how you can write code to extend and build upon the Proem framework.
   </p>
   <p>
-    If you are then still looking for more detail we also have available the <a href="http://prdoc/api/namespaces/Proem.html">API Documentation</a>. This documentation documents every class and method
+    If you are then still looking for more detail we also have available the <a href="/api/namespaces/Proem.html">API Documentation</a>. This documentation documents every class and method
     within Proem and is automatically generated from comments within the actual code itself.
   </p>
   <p>
diff --git a/.phrozn/entries/docs/dev/modules.twig b/.phrozn/entries/docs/dev/modules.twig
index 0bb2cf0..84e7946 100644
--- a/.phrozn/entries/docs/dev/modules.twig
+++ b/.phrozn/entries/docs/dev/modules.twig
@@ -111,7 +111,7 @@ layout: docs/dev.twig
     All that is left now is to load our <em>Module</em>. Edit the <em>htdocs/index.php</em> file so that it looks lie the following:
   </p>
   <pre class="prettyprint">
-    require_once '/Users/thorpe/www/lib/proem/framework/lib/Proem/Autoloader.php';
+    require_once '../lib/Proem/Autoloader.php';
 
     (new Proem\Autoloader())
         ->attachNamespace('Module', '../lib')
diff --git a/.phrozn/entries/docs/dev/plugins.twig b/.phrozn/entries/docs/dev/plugins.twig
index 1e2ccc0..866da78 100644
--- a/.phrozn/entries/docs/dev/plugins.twig
+++ b/.phrozn/entries/docs/dev/plugins.twig
@@ -52,7 +52,7 @@ layout: docs/dev.twig
     Next, we need to load our <em>Plugin</em>. Simple, open our <em>htdocs/index.php</em> file and edit it to look like:
   </p>
   <pre class="prettyprint">
-    require_once '/Users/thorpe/www/lib/proem/framework/lib/Proem/Autoloader.php';
+    require_once '../lib/Proem/Autoloader.php';
 
     (new Proem\Autoloader())
         ->attachNamespace('Module', '../lib')
@@ -77,7 +77,7 @@ layout: docs/dev.twig
   </p>
   <p>
     In fact, under the hood, a <em>Module</em> and a <em>Plugin</em> are currently exactly the same. This will likely change somewhat in future versions, but for now, it's more a simple naming convention.
-    <em>Modules</em> are designed to manipulate <a href="http://prdoc/docs/dev/route-component.html">Routes</a> and house <a href="/docs/dev/controllers.html">Controllers</a> while <em>Plugins</em>
+    <em>Modules</em> are designed to manipulate <a href="/docs/dev/route-component.html">Routes</a> and house <a href="/docs/dev/controllers.html">Controllers</a> while <em>Plugins</em>
     are designed to inject third party code.
   </p>
   <p>
diff --git a/.phrozn/entries/docs/dev/route-component.twig b/.phrozn/entries/docs/dev/route-component.twig
index 800ce67..96babcb 100644
--- a/.phrozn/entries/docs/dev/route-component.twig
+++ b/.phrozn/entries/docs/dev/route-component.twig
@@ -153,7 +153,7 @@ layout: docs/dev.twig
   <p>
     The above examples demonstrate how to configure simple rules, but web applications these days are complex beasts with multiple
     url's all pointing to multiple resources. How do we handle all this in a simple uniformed manner? Easy, this is where the
-    <a href="(https://github.com/proem/proem/blob/develop/lib/Proem/Routing/Router.php">Router</a> comes into play. The <em>Router</em>
+    <a href="https://github.com/proem/proem/blob/develop/lib/Proem/Routing/Router.php">Router</a> comes into play. The <em>Router</em>
     is basically responsible for storing a series of <em>Routes</em> and managing the execution of there <em>process()</em> method's against the supplied url.
   </p>
   <p>
diff --git a/.phrozn/layouts/index.twig b/.phrozn/layouts/index.twig
index 0122928..5199b4f 100644
--- a/.phrozn/layouts/index.twig
+++ b/.phrozn/layouts/index.twig
@@ -24,7 +24,7 @@
           </div>
           <div class="span4">
             <div class="well">
-              <h3><a href="/docs/services-component.html">Dependency Injection</a></h3>
+              <h3><a href="/docs/current/services-component.html">Dependency Injection</a></h3>
               <p>
                 A simple dependency injection implementation allows easy decoupling and configuration of individual components via DI containers (services) and assets.
               </p>
@@ -32,7 +32,7 @@
           </div>
           <div class="span4">
             <div class="well">
-              <h3><a href="/docs/signal-component.html">Event Driven</a></h3>
+              <h3><a href="/docs/current/signal-component.html">Event Driven</a></h3>
               <p>
                 The entire bootstrap process is event driven in Proem. This allows you to register a listener for events and easily inject your own code into the process.
               </p>