diff --git a/README.md b/README.md
index 2d8d4fb..e1e1209 100644
--- a/README.md
+++ b/README.md
@@ -19,9 +19,9 @@ _This is the WP Emerge Theme project - for the WP Emerge framework please check
 
 ## Documentation
 
-https://docs.theme.wpemerge.com/
+[https://docs.wpemerge.com/#/starter-theme/overview](https://docs.wpemerge.com/#/starter-theme/overview)
 
-https://docs.theme.wpemerge.com/quickstart.html
+[https://docs.wpemerge.com/#/starter-theme/quickstart](https://docs.wpemerge.com/#/starter-theme/quickstart)
 
 ## Development Team
 
@@ -43,7 +43,7 @@ Brought to you by [Atanas Angelov](https://github.com/atanas-angelov-dev) and th
 | Automatic Sprite Generation    | ✔                | ✖              | N/A³     |
 | Cache Breaker                  | ✔                | ✖              | ✖        |
 | WPCS Linting                   | ✔                | ✖              | ✖        |
-| [Advanced Error Reporting](https://docs.wpemerge.com/routing/exceptions.html) | ✔ | ✖ | ✖ |
+| [Advanced Error Reporting](https://docs.wpemerge.com/#/framework/routing/error-handling) | ✔ | ✖ | ✖ |
 | WP Unit Tests for your classes | ✔                | ✖              | ✖        |
 
 _¹ Sage's Controller is more of a View Composer than a Controller._
@@ -55,7 +55,7 @@ _³ Timber does not provide a front-end build process so you can implement whate
 _Email any factual inaccuracies to [atanas.angelov.dev@gmail.com](mailto:atanas.angelov.dev@gmail.com) so they can be corrected._ 
 
 ## Features
-- All features from [WP Emerge](https://docs.wpemerge.com/):
+- All features from [WP Emerge](https://docs.wpemerge.com/#/framework/overview):
   - Routes with optional rewrite rule integration
   - Controllers
   - Middleware
@@ -178,7 +178,7 @@ These directories are for the admin, editor and login bundles, respectively. The
 
 #### `theme/`
 
-Add views in this, the `theme/partials/` or the `theme/templates/` directories accordingly. Avoid adding any PHP logic here, unless it pertains to layouting (PHP logic should go into helper files or [WP Emerge controllers](https://docs.wpemerge.com/controllers/overview.html))
+Add views in this, the `theme/partials/` or the `theme/templates/` directories accordingly. Avoid adding any PHP logic here, unless it pertains to layouting (PHP logic should go into helper files or [WP Emerge controllers](https://docs.wpemerge.com/#/framework/routing/controllers))
 
 ## Contributing
 
diff --git a/app/config.php b/app/config.php
index cc3a5be..a9874b3 100644
--- a/app/config.php
+++ b/app/config.php
@@ -2,7 +2,7 @@
 /**
  * WP Emerge configuration.
  *
- * @link https://docs.wpemerge.com/configuration.html
+ * @link https://docs.wpemerge.com/#/framework/configuration
  *
  * @package WPEmergeTheme
  */
diff --git a/app/framework.php b/app/framework.php
index 857e7c1..2555022 100644
--- a/app/framework.php
+++ b/app/framework.php
@@ -15,7 +15,7 @@
  * ------------------------------------------------------------------------
  * Routes
  *
- * @link https://docs.wpemerge.com/routing/methods.html
+ * @link https://docs.wpemerge.com/#/framework/routing/methods
  * ------------------------------------------------------------------------
  */
 
@@ -31,7 +31,7 @@
  * Pass all front-end requests through WPEmerge.
  * WARNING: Do not add routes after this - they will be ignored.
  *
- * @link https://docs.wpemerge.com/routing/methods.html#handling-all-requests
+ * @link https://docs.wpemerge.com/#/framework/routing/methods?id=handling-all-requests
  */
 Router::handleAll();
 
@@ -39,7 +39,7 @@
  * ------------------------------------------------------------------------
  * Globals
  *
- * @link https://docs.wpemerge.com/view/global-context.html
+ * @link https://docs.wpemerge.com/#/framework/views/global-context
  * ------------------------------------------------------------------------
  */
 
@@ -50,7 +50,7 @@
  * ------------------------------------------------------------------------
  * View composers
  *
- * @link https://docs.wpemerge.com/view/view-composers.html
+ * @link https://docs.wpemerge.com/#/framework/views/view-composers
  * ------------------------------------------------------------------------
  */
 
diff --git a/theme/layouts/app.php b/theme/layouts/app.php
index c96cd81..72cf296 100644
--- a/theme/layouts/app.php
+++ b/theme/layouts/app.php
@@ -2,7 +2,7 @@
 /**
  * Base app layout.
  *
- * @link https://docs.wpemerge.com/view/layouts.html
+ * @link https://docs.wpemerge.com/#/framework/views/layouts
  *
  * @package WPEmergeTheme
  */