diff --git a/lib/units/app/index.js b/lib/units/app/index.js
index 101564e7..94cac251 100644
--- a/lib/units/app/index.js
+++ b/lib/units/app/index.js
@@ -29,8 +29,8 @@ module.exports = function(options) {
     , app = express()
     , server = http.createServer(app)
 
-  app.use('/static/docs', markdownServe.middleware({
-    rootDirectory: pathutil.root('node_modules/stf-docs')
+  app.use('/static/wiki', markdownServe.middleware({
+    rootDirectory: pathutil.root('node_modules/stf-wiki')
   , view: 'docs'
   }))
 
diff --git a/res/app/components/stf/common-ui/modals/add-adb-key-modal/add-adb-key-modal.jade b/res/app/components/stf/common-ui/modals/add-adb-key-modal/add-adb-key-modal.jade
index e6b504f3..5859dfc3 100644
--- a/res/app/components/stf/common-ui/modals/add-adb-key-modal/add-adb-key-modal.jade
+++ b/res/app/components/stf/common-ui/modals/add-adb-key-modal/add-adb-key-modal.jade
@@ -18,7 +18,7 @@
       pre(ng-bind='modal.title').selectable
 
     .modal-footer
-      a(ng-href='/#!/docs/adb-keys', target='_blank').pull-left.btn.btn-sm
+      a(ng-href='/#!/docs/ADB-Keys', target='_blank').pull-left.btn.btn-sm
         i.fa.fa-lg.fa-question-circle.fa-fw
 
       button.btn.btn-primary-outline.btn-sm.pull-right(type='submit')
diff --git a/res/app/control-panes/dashboard/remote-debug/remote-debug.jade b/res/app/control-panes/dashboard/remote-debug/remote-debug.jade
index 95e3dfde..1afa3be8 100644
--- a/res/app/control-panes/dashboard/remote-debug/remote-debug.jade
+++ b/res/app/control-panes/dashboard/remote-debug/remote-debug.jade
@@ -2,7 +2,7 @@
   .heading
     stacked-icon(icon='fa-bug', color='color-darkgreen')
     span(translate) Remote debug
-    help-icon(topic='remote-debug', tooltip='{{remoteDebugTooltip | translate}}')
+    help-icon(topic='Remote-Debug', tooltip='{{remoteDebugTooltip | translate}}')
 
   .widget-content.padded
     .form-inline
diff --git a/res/app/control-panes/dashboard/shell/shell.jade b/res/app/control-panes/dashboard/shell/shell.jade
index 3b508a47..8727de2a 100644
--- a/res/app/control-panes/dashboard/shell/shell.jade
+++ b/res/app/control-panes/dashboard/shell/shell.jade
@@ -3,7 +3,7 @@
     stacked-icon(icon='fa-terminal', color='color-darkgray')
     span(translate) Shell
     clear-button(ng-click='clear()', ng-disabled='!command && !data').btn-xs
-    help-icon(topic='remote-shell', tooltip='{{"Executes remote shell commands" | translate}}')
+    help-icon(topic='Remote-Shell', tooltip='{{"Executes remote shell commands" | translate}}')
 
   .widget-content.padded
 
diff --git a/res/app/docs/docs-controller.js b/res/app/docs/docs-controller.js
index 400facf7..cad87190 100644
--- a/res/app/docs/docs-controller.js
+++ b/res/app/docs/docs-controller.js
@@ -13,7 +13,7 @@ module.exports =
     }
 
     $scope.goHome = function () {
-      $location.path('/docs/index')
+      $location.path('/docs/Help')
     }
 
     $rootScope.$on("$routeChangeError",
diff --git a/res/app/docs/index.js b/res/app/docs/index.js
index 888e295e..a915095d 100644
--- a/res/app/docs/index.js
+++ b/res/app/docs/index.js
@@ -19,13 +19,13 @@ module.exports = angular.module('stf.help.docs', [
         templateUrl: function (params) {
           var lang = languageProvider.$get().selectedLanguage
           var document = params.document.replace('.md', '')
-          return '/static/docs/' + lang + '/' + document
+          return '/static/wiki/[' + lang + ']-' + document
         }
       })
       .when('/help', {
         templateUrl: function () {
           var lang = languageProvider.$get().selectedLanguage
-          return '/static/docs/' + lang + '/' + 'index'
+          return '/static/wiki/[' + lang + ']-' + 'Help'
         }
       })
       //.when('/docs/:lang/:document*', {
diff --git a/res/app/settings/keys/access-tokens/access-tokens.jade b/res/app/settings/keys/access-tokens/access-tokens.jade
index 8ef5366e..af6ff1b6 100644
--- a/res/app/settings/keys/access-tokens/access-tokens.jade
+++ b/res/app/settings/keys/access-tokens/access-tokens.jade
@@ -8,7 +8,7 @@
     ng-class='{ "btn-primary-outline": !showAdd, "btn-primary": showAdd }')
       i.fa.fa-plus.fa-fw
 
-    a(ng-href='/#!/docs/access-tokens').pull-right.btn.btn-sm
+    a(ng-href='/#!/docs/Access-Tokens').pull-right.btn.btn-sm
       i.fa.fa-question-circle(tooltip='{{"More about Access Tokens" | translate}}', tooltip-placement='left')
 
   .widget-content.padded
diff --git a/res/app/settings/keys/adb-keys/adb-keys.jade b/res/app/settings/keys/adb-keys/adb-keys.jade
index 3e2df587..6c0dfc5c 100644
--- a/res/app/settings/keys/adb-keys/adb-keys.jade
+++ b/res/app/settings/keys/adb-keys/adb-keys.jade
@@ -11,7 +11,7 @@
       //(tooltip='{{ "Add ADB Key" | translate }}')
       i.fa.fa-plus.fa-fw
 
-    a(ng-href='/#!/docs/adb-keys').pull-right.btn.btn-sm
+    a(ng-href='/#!/docs/ADB-Keys').pull-right.btn.btn-sm
       i.fa.fa-question-circle(tooltip='{{"More about ADB Keys" | translate}}', tooltip-placement='left')
 
   .widget-content.padded