diff --git a/Makefile b/Makefile
index b6c48d63..33e1d4e2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,11 @@
 build:
 	mkdir -p build/src
+	mkdir -p build/demo
 	mkdir -p build/textarea/src
+	
+	cp demo/styles.css build/demo/styles.css
+	cp demo/logo.png build/demo/logo.png
+	
 	./Makefile.dryice.js normal
 	./Makefile.dryice.js bm
 
diff --git a/Makefile.dryice.js b/Makefile.dryice.js
index d317409c..a25c7b02 100755
--- a/Makefile.dryice.js
+++ b/Makefile.dryice.js
@@ -80,7 +80,9 @@ console.log('# ace ---------');
 
 var aceProject = [
     aceHome + '/support/pilot/lib',
-    aceHome + '/lib'
+    aceHome + '/support/cockpit/lib',
+    aceHome + '/lib',
+    aceHome
 ];
 
 if (target == "normal") {
@@ -90,6 +92,8 @@ if (target == "normal") {
         source: "build_support/editor.html",
         dest:   targetDir + '/editor.html'
     });
+    
+    demo();
 } else if(target == "bm") {
     copy({
         source: "build_support/editor_textarea.html",
@@ -309,7 +313,6 @@ project.assumeAllFilesLoaded();
 console.log('# cockpit ---------');
 
 project.assumeAllFilesLoaded();
-project.addRoot(aceHome + '/support/cockpit/lib');
 
 var cockpit = copy.createDataObject();
 copy({
@@ -350,4 +353,67 @@ copy({
 copy({
     source: cockpit,
     dest: 'build/src/cockpit-uncompressed.js'
-});
\ No newline at end of file
+});
+
+function demo() {
+    console.log('# kitchen sink ---------');
+
+    copy({
+        source: "index.html",
+        dest:   "build/kitchen-sink.html",
+        filter: [ function(data) {
+            return (data
+                .replace("DEVEL-->", "")
+                .replace("<!--DEVEL", "")
+                .replace("PACKAGE-->", "")
+                .replace("<!--PACKAGE", ""));
+        }]
+    });
+
+    var project = copy.createCommonJsProject(aceProject);
+    var demo = copy.createDataObject();
+    copy({
+        source: [
+            'build_support/mini_require.js'
+        ],
+        dest: demo
+    });
+    copy({
+        source: [
+            copy.source.commonjs({
+                project: project,
+                require: [ "cockpit/index", "pilot/index", "ace/defaults", "demo/boot" ]
+            })
+        ],
+        filter: [ copy.filter.moduleDefines ],
+        dest: demo
+    });
+    copy({
+        source: {
+            root: project,
+            include: /.*\.css$/,
+            exclude: /tests?\//
+        },
+        filter: [ copy.filter.addDefines ],
+        dest: demo
+    });
+    copy({
+        source: {
+            root: aceHome + '/support/cockpit/lib',
+            include: /.*\.css$|.*\.html$/,
+            exclude: /tests?\//
+        },
+        filter: [ copy.filter.addDefines ],
+        dest: demo
+    });
+
+    copy({
+        source: demo,
+        filter: copy.filter.uglifyjs,
+        dest: 'build/demo/kitchen-sink.js'
+    });
+    copy({
+        source: demo,
+        dest: 'build/demo/kitchen-sink-uncompressed.js'
+    });
+}
\ No newline at end of file
diff --git a/demo/demo.js b/demo/demo.js
index cb89d0f4..3a1fc37e 100644
--- a/demo/demo.js
+++ b/demo/demo.js
@@ -351,7 +351,14 @@ exports.launch = function(env) {
     });
 
     bindDropdown("theme", function(value) {
-        env.editor.setTheme(value);
+        if (require.packaged) {
+            loadTheme(value, function() {
+                env.editor.setTheme(value);
+            });
+        }
+        else {
+            env.editor.setTheme(value);
+        }
     });
 
     bindDropdown("keybinding", function(value) {
@@ -702,4 +709,25 @@ exports.launch = function(env) {
     }
 };
 
+var themes = {};
+function loadTheme(name, callback) {
+    if (themes[name])
+        return;
+        
+    themes[name] = 1;
+    var base = name.split("/").pop();
+    var fileName = "src/theme-" + base + ".js";
+    loadScriptFile(fileName, callback)
+}
+
+function loadScriptFile(path, callback) {
+    var head = document.getElementsByTagName('head')[0];
+    var s = document.createElement('script');
+
+    s.src = path;
+    head.appendChild(s);
+    
+    s.onload = callback;
+}
+
 });
diff --git a/index.html b/index.html
index 39275075..941cf169 100644
--- a/index.html
+++ b/index.html
@@ -4,7 +4,7 @@
 <html lang="en">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-    <title>Editor</title>
+    <title>Ace Kitchen Sink</title>
     <meta name="author" content="Fabian Jakobs">
     <link rel="stylesheet" href="demo/styles.css" type="text/css" media="screen" charset="utf-8">
 </head>
@@ -685,6 +685,7 @@ object implicits extends Application {
 }</script>
   <input id="cockpitInput" type="text"/>
 
+<!-- DEVEL-->
   <script type="text/javascript">
       var require = {
           paths: {
@@ -696,5 +697,14 @@ object implicits extends Application {
       };
   </script>
   <script src="demo/require.js" data-main="demo/boot" type="text/javascript" charset="utf-8"></script>
+<!--DEVEL -->
+  
+<!--PACKAGE
+  <script src="demo/kitchen-sink.js" data-ace-base="src" type="text/javascript" charset="utf-8"></script>
+  <script type="text/javascript" charset="utf-8">
+    require("demo/boot");
+  </script>
+PACKAGE-->
+
 </body>
 </html>
diff --git a/lib/ace/worker/worker_client.js b/lib/ace/worker/worker_client.js
index 03ebd22b..f441ce44 100644
--- a/lib/ace/worker/worker_client.js
+++ b/lib/ace/worker/worker_client.js
@@ -114,14 +114,19 @@ var WorkerClient = function(topLevelNamespaces, packagedJs, module, classname) {
         
         var scripts = document.getElementsByTagName("script");
         for (var i=0; i<scripts.length; i++) {
-            var src = scripts[i].src || scripts[i].getAttribute("src");
+            var script = scripts[i];
+
+            var base = script.getAttribute("data-ace-base");
+            if (base)
+                return base.replace(/\/*$/, "/");
+            
+            var src = script.src || script.getAttribute("src");
             if (!src) {
                 continue;
             }
             var m = src.match(/^(?:(.*\/)ace\.js|(.*\/)ace-uncompressed\.js)(?:\?|$)/);
-            if (m) {
+            if (m)
                 return m[1] || m[2];
-            }
         }
         return "";
     };