diff --git a/WebServer/AppLoader.js b/WebServer/AppLoader.js
index 7c82084be..9a0e77413 100644
--- a/WebServer/AppLoader.js
+++ b/WebServer/AppLoader.js
@@ -28,6 +28,7 @@ function newAppLoader() {
                 'Globals.js',
 
                 'AppSchema.js',
+                'DocSchema.js',
                 'Workspace.js',
 
                 'ChartingSpace/EdgeEditor.js',
diff --git a/WebServer/main.css b/WebServer/main.css
index c059db77a..ccfbe389c 100644
--- a/WebServer/main.css
+++ b/WebServer/main.css
@@ -255,11 +255,11 @@
 /* Tooltip text */
 .tooltip .tooltiptext {
   visibility: hidden;
-  width: 120px;
-  background-color: #555;
+  width: 240px;
+  background-color: #0295aa;
   color: #fff;
   text-align: center;
-  padding: 5px 0;
+  padding: 5px 10;
   border-radius: 6px;
 
   /* Position the tooltip text */
@@ -267,7 +267,8 @@
   z-index: 1;
   bottom: 125%;
   left: 50%;
-  margin-left: -60px;
+  margin-left: -120px;
+   
 
   /* Fade in tooltip */
   opacity: 0;
@@ -283,7 +284,7 @@
   margin-left: -5px;
   border-width: 5px;
   border-style: solid;
-  border-color: #555 transparent transparent transparent;
+  border-color: #0295aa transparent transparent transparent;
 }
 
 /* Show the tooltip text when you mouse over the tooltip container */
diff --git a/webServer.js b/webServer.js
index 2989be3e3..5601285af 100644
--- a/webServer.js
+++ b/webServer.js
@@ -493,23 +493,13 @@ exports.newWebServer = function newWebServer(EVENTS_SERVER) {
 
             case 'AppSchema.js':
                 {
-                    let fs = require('fs')
+                    sendSchema(process.env.APP_SCHEMA_PATH, 'AppSchema', 'getAppSchema')
+                }
+                break
 
-                    try {
-                        let filePath = process.env.APP_SCHEMA_PATH + 'AppSchema.json'
-                        fs.readFile(filePath, onFileRead)
-                    } catch (e) {
-                        console.log('[ERROR] Error reading the App Schema.', e)
-                    }
-
-                    function onFileRead(err, appSchema) {
-                        if (err) {
-                            respondWithContent(undefined, response)
-                        } else {
-                            let responseContent = 'function getAppSchema(){ return ' + appSchema + '}'
-                            respondWithContent(responseContent, response)
-                        }
-                    }
+            case 'DocSchema.js':
+                {
+                    sendSchema(process.env.DOC_SCHEMA_PATH, 'DocSchema', 'getDocSchema')
                 }
                 break
 
@@ -708,6 +698,26 @@ exports.newWebServer = function newWebServer(EVENTS_SERVER) {
                 }
         }
 
+        function sendSchema(filePath, fileName, functionName) {
+            let fs = require('fs')
+
+            try {
+                filePath = filePath + fileName + '.json'
+                fs.readFile(filePath, onFileRead)
+            } catch (e) {
+                console.log('[ERROR] Error reading the ' + fileName, e)
+            }
+
+            function onFileRead(err, schema) {
+                if (err) {
+                    respondWithContent(undefined, response)
+                } else {
+                    let responseContent = 'function ' + functionName + '(){ return ' + schema + '}'
+                    respondWithContent(responseContent, response)
+                }
+            }
+        }
+
         function sendStyleSheet(fileName) {
             let fs = require('fs')
             try {