diff --git a/demo/boot.js b/demo/boot.js
index 41f2e5f2..8ba8e433 100644
--- a/demo/boot.js
+++ b/demo/boot.js
@@ -1,4 +1,5 @@
-/* ***** BEGIN LICENSE BLOCK *****
+/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
@@ -20,6 +21,7 @@
  *
  * Contributor(s):
  *      Kevin Dangoor (kdangoor@mozilla.com)
+ *      Irakli Gozalishvili <rfobic@gmail.com> (http://jeditoolkit.com)
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -36,14 +38,12 @@
  * ***** END LICENSE BLOCK ***** */
 
 var config = {
-    baseUrl: "../../packages/",
-    packages: [
-        { name: "ace", lib: "lib/ace" },
-        { name: "cockpit", lib: "lib/cockpit" },
-        { name: "pilot", lib: "lib/pilot" },
-        { name: "demo", location: "ace/demo", lib: "." },
-        { name: "require", location: "requirejs/require", lib: "." }
-    ]
+    paths: {
+        demo: "../demo",
+        ace: "../lib/ace",
+        cockpit: "../support/cockpit/lib/cockpit",
+        pilot: "../support/pilot/lib/pilot",
+    }
 };
 
 var deps = [ "pilot/fixoldbrowsers", "pilot/plugin_manager", "pilot/settings",
diff --git a/editor.html b/editor.html
index 42a8a179..9849cbcb 100644
--- a/editor.html
+++ b/editor.html
@@ -139,7 +139,9 @@ echo $output;
 ?></script>
 
   <input id="cockpitInput" type="text"/>
-  <script type="text/javascript" src="packages/requirejs/require.js"></script>
-  <script type="text/javascript" src="demo/boot.js"></script>
+
+  <script src="demo/require.js" type="text/javascript" charset="utf-8"></script>
+  <script src="demo/boot.js" type="text/javascript"></script>
+
 </body>
 </html>
diff --git a/package.json b/package.json
index 2615c8d9..0c46000c 100644
--- a/package.json
+++ b/package.json
@@ -20,9 +20,9 @@
     "dependencies": {
         "pilot": ">=0.1.0",
         "cockpit": ">=0.1.0",
-        "teleport": ">=0.2.4",
+        "teleport": ">=0.2.6",
         "requirejs": ">=0.22.0",
-		"asyncjs": ">=0.0.2",
+        "asyncjs": ">=0.0.2",
         "jsdom": ">=0.1.23",
         "htmlparser": ">=1.7.2",
         "dryice": ">=0.1.0"
@@ -39,4 +39,4 @@
         "type": "LGPL",
         "url": "http://www.gnu.org/licenses/lgpl.html"
     }]
-}
\ No newline at end of file
+}