diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index e1e05f8..278096d 100755
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -13,10 +13,15 @@ on:
     - cron: '0 0 1,15 * *'
 
 jobs:
-  general_module_workflow:
+  general_module_workflow_php:
     uses: Karaka-Management/Karaka/.github/workflows/php_template.yml@develop
     secrets:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       GH_PAT: ${{ secrets.GH_PAT }}
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-
+  general_module_workflow_js:
+    uses: Karaka-Management/Karaka/.github/workflows/js_template.yml@develop
+    secrets:
+      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      GH_PAT: ${{ secrets.GH_PAT }}
+      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
\ No newline at end of file
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index f0dd0ef..d31133a 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -72,6 +72,14 @@ final class BackendController extends Controller
         $head->addAsset(AssetType::JSLATE, 'Modules/Help/Controller/Controller.js?v=' . self::VERSION, ['nonce' => $nonce, 'type' => 'module']);
     }
 
+    private function loadMermaid(ResponseAbstract $response) : void
+    {
+        $head  = $response->data['Content']->head;
+        $nonce = $this->app->appSettings->getOption('script-nonce');
+
+        $head->addAsset(AssetType::JSLATE, 'Resources/mermaid/mermaid.min.js?v=' . $this->app->version, ['nonce' => $nonce]);
+    }
+
     /**
      * Routing end-point for application behavior.
      *
@@ -274,10 +282,16 @@ final class BackendController extends Controller
         $toParse = \file_get_contents($path);
         $summary = \file_get_contents(__DIR__ . '/../../../Developer-Guide/SUMMARY.md');
 
-        $content    = Markdown::parse($toParse === false ? '' : $toParse);
+        if (\stripos($toParse, '```mermaid') !== false) {
+            $this->loadMermaid($response);
+        }
+
+        $markdown = new Markdown();
+
+        $content    = $markdown->parse($toParse === false ? '' : $toParse);
         $navigation = Markdown::parse($summary === false ? '' : $summary);
 
-        $view->setTemplate('/Modules/Help/Theme/Backend/help-developer');
+        $view->setTemplate('/Modules/Help/Theme/Backend/help-general');
         $view->data['content']    = $content;
         $view->data['navigation'] = $navigation;
 
diff --git a/Controller/Controller.js b/Controller/Controller.js
index d9842ef..e8efe29 100644
--- a/Controller/Controller.js
+++ b/Controller/Controller.js
@@ -2,6 +2,7 @@ import { Autoloader } from '../../../jsOMS/Autoloader.js';
 
 Autoloader.defineNamespace('omsApp.Modules');
 
+/* global omsApp */
 omsApp.Modules.Help = class {
     /**
      * @constructor
@@ -13,17 +14,11 @@ omsApp.Modules.Help = class {
         this.app = app;
     };
 
-    bind (id)
+    bind ()
     {
-        const e    = typeof id === 'undefined' ? document.getElementsByTagName('code') : [document.getElementById(id)],
-            length = e.length;
-
+        /* global hljs */
         hljs.highlightAll();
     };
-
-    bindElement (code)
-    {
-    };
 };
 
-window.omsApp.moduleManager.get('Help').bind();
\ No newline at end of file
+window.omsApp.moduleManager.get('Help').bind();
diff --git a/Theme/Backend/help-developer.tpl.php b/Theme/Backend/help-developer.tpl.php
deleted file mode 100755
index 6fd5e28..0000000
--- a/Theme/Backend/help-developer.tpl.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<div class="row">
-    <div class="col-xs-12 col-md-8 col-lg-9">
-        <section class="portlet">
-            <article>
-                <?= $this->data['content']; ?>
-            </article>
-        </section>
-    </div>
-
-    <div class="col-xs-12 col-md-4 col-lg-3 pH">
-        <section class="portlet">
-            <article>
-                <?= $this->data['navigation']; ?>
-            </article>
-        </section>
-    </div>
-</div>
\ No newline at end of file
diff --git a/Theme/Backend/help-general.tpl.php b/Theme/Backend/help-general.tpl.php
index 6fd5e28..e55cb5f 100755
--- a/Theme/Backend/help-general.tpl.php
+++ b/Theme/Backend/help-general.tpl.php
@@ -9,9 +9,9 @@
 
     <div class="col-xs-12 col-md-4 col-lg-3 pH">
         <section class="portlet">
-            <article>
+            <nav class="content-side-nav">
                 <?= $this->data['navigation']; ?>
-            </article>
+            </nav>
         </section>
     </div>
 </div>
\ No newline at end of file
diff --git a/Theme/Backend/help-module.tpl.php b/Theme/Backend/help-module.tpl.php
index a0b0f91..83bd84c 100755
--- a/Theme/Backend/help-module.tpl.php
+++ b/Theme/Backend/help-module.tpl.php
@@ -18,17 +18,13 @@
 
         <?php if (!empty($this->data['navigation'] ?? '')) : ?>
         <section class="portlet">
-            <div class="portlet-body">
-                <article><?= $this->data['navigation']; ?></article>
-            </div>
+            <nav class="content-side-nav"><?= $this->data['navigation']; ?></nav>
         </section>
         <?php endif; ?>
 
         <?php if (!empty($this->data['devNavigation'] ?? '')) : ?>
         <section class="portlet">
-            <div class="portlet-body">
-                <article><?= $this->data['devNavigation']; ?></article>
-            </div>
+            <nav class="content-side-nav"><?= $this->data['devNavigation']; ?></nav>
         </section>
         <?php endif; ?>
     </div>
diff --git a/Theme/Backend/help.tpl.php b/Theme/Backend/help.tpl.php
deleted file mode 100755
index e69de29..0000000