diff --git a/demo/autocompletion.html b/demo/autocompletion.html
new file mode 100644
index 00000000..9ebb1678
--- /dev/null
+++ b/demo/autocompletion.html
@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>ACE Autocompletion demo</title>
+  <style type="text/css" media="screen">
+    body {
+        overflow: hidden;
+    }
+    
+    #editor { 
+        margin: 0;
+        position: absolute;
+        top: 0;
+        bottom: 0;
+        left: 0;
+        right: 0;
+    }
+  </style>
+</head>
+<body>
+
+<pre id="editor"></pre>
+
+<!-- load ace -->
+<script src="../build/src-noconflict/ace.js"></script>
+<!-- load ace language tools -->
+<script src="../build/src-noconflict/ext-language_tools.js"></script>
+<script>
+    // trigger extension
+    ace.require("ace/ext/language_tools");
+    var editor = ace.edit("editor");
+    editor.session.setMode("ace/mode/html");
+    editor.setTheme("ace/theme/tomorrow");
+    // enable autocompletion and snippets
+    editor.setOptions({
+        enableBasicAutocompletion: true,
+        enableSnippets: true
+    });
+</script>
+
+<script src="./show_own_source.js"></script>
+</body>
+</html>
diff --git a/demo/emmet.html b/demo/emmet.html
new file mode 100644
index 00000000..65b59bf7
--- /dev/null
+++ b/demo/emmet.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>ACE Emmet demo</title>
+  <style type="text/css" media="screen">
+    body {
+        overflow: hidden;
+    }
+    
+    #editor { 
+        margin: 0;
+        position: absolute;
+        top: 0;
+        bottom: 0;
+        left: 0;
+        right: 0;
+    }
+  </style>
+</head>
+<body>
+
+<pre id="editor"></pre>
+
+<!-- load ace -->
+<script src="../build/src-noconflict/ace.js"></script>
+<!-- load ace emmet extension -->
+<script src="../build/src-noconflict/ext-emmet.js"></script>
+<!-- load core emmet files -->
+<script src="http://nightwing.github.io/emmet-core/emmet.js"></script>
+<script>
+    // trigger extension
+    ace.require("ace/ext/emmet");
+    var editor = ace.edit("editor");
+    editor.setTheme("ace/theme/tomorrow");
+    editor.session.setMode("ace/mode/html");
+    // enable emmet on the current editor
+    editor.setOption("enableEmmet", true);    
+</script>
+
+<script src="./show_own_source.js"></script>
+</body>
+</html>
diff --git a/demo/keyboard_shortcuts.html b/demo/keyboard_shortcuts.html
index 4a579d37..988e1918 100644
--- a/demo/keyboard_shortcuts.html
+++ b/demo/keyboard_shortcuts.html
@@ -41,6 +41,6 @@
     })
 </script>
 
-<script src="./demo_helper.js"></script>
+<script src="./show_own_source.js"></script>
 </body>
 </html>
diff --git a/demo/modelist.html b/demo/modelist.html
index 659e3805..d7f525fa 100644
--- a/demo/modelist.html
+++ b/demo/modelist.html
@@ -43,6 +43,6 @@
     
 </script>
 
-<script src="./demo_helper.js"></script>
+<script src="./show_own_source.js"></script>
 </body>
 </html>
diff --git a/demo/settings_menu.html b/demo/settings_menu.html
index cc453a53..7eaf0e42 100644
--- a/demo/settings_menu.html
+++ b/demo/settings_menu.html
@@ -40,6 +40,6 @@
 	}]);
 </script>
 
-<script src="./demo_helper.js"></script>
+<script src="./show_own_source.js"></script>
 </body>
 </html>
diff --git a/demo/demo_helper.js b/demo/show_own_source.js
similarity index 100%
rename from demo/demo_helper.js
rename to demo/show_own_source.js
diff --git a/demo/statusbar.html b/demo/statusbar.html
index 9fc6583c..47341d3b 100644
--- a/demo/statusbar.html
+++ b/demo/statusbar.html
@@ -52,6 +52,6 @@
     editor.session.setMode("ace/mode/html");
 </script>
 
-<script src="./demo_helper.js"></script>
+<script src="./show_own_source.js"></script>
 </body>
 </html>
