diff --git a/doc/site/js/main.js b/doc/site/js/main.js
index 0175a7b5..8a1fd27a 100644
--- a/doc/site/js/main.js
+++ b/doc/site/js/main.js
@@ -4,10 +4,9 @@ $(function() {
     hljs.initHighlighting();
     editor = ace.edit("ace_editor_demo");
     embedded_editor = ace.edit("embedded_ace_code");
-    var javascriptMode = require("ace/mode/javascript").Mode;
-    var htmlMode = require("ace/mode/html").Mode;
-    editor.getSession().setMode(new javascriptMode());
-    embedded_editor.getSession().setMode(new htmlMode());
+    editor.getSession().setMode("ace/mode/javascript");
+    editor.getSession().setMode("ace/mode/javascript");
+    embedded_editor.getSession().setMode("ace/mode/html");
     
     $("ul.menu-list li").click(function(e) {
         if (e.target.tagName === "LI") {
diff --git a/index.html b/index.html
index e1b27a1e..fbaad6ee 100644
--- a/index.html
+++ b/index.html
@@ -7,9 +7,7 @@
         <script src="./doc/resources/ace/skeleton/javascripts/bbq.js"></script>
         <script src="./api/resources/javascripts/bootstrap-tab.js"></script>
         <script src="./api/resources/javascripts/bootstrap-dropdown.js"></script>
-        <script src="https://raw.github.com/ajaxorg/ace-builds/master/src-min/ace.js"></script>
-        <script src="https://raw.github.com/ajaxorg/ace-builds/master/src-min/mode-javascript.js"></script>
-        <script src="https://raw.github.com/ajaxorg/ace-builds/master/src-min/mode-html.js"></script>
+        <script src="https://d1n0x3qji82z53.cloudfront.net/src-min-noconflict/ace.js"></script>
         <script src="https://yandex.st/highlightjs/7.2/highlight.min.js"></script>
         <script src="doc/site/js/main.js"></script>
         <link rel="stylesheet" href="https://yandex.st/highlightjs/7.0/styles/default.min.css">
@@ -17,8 +15,6 @@
         <link href="doc/site/style.css" rel="stylesheet" type="text/css" /> 
         <link href="api/resources/csses/ace_api.css" rel="stylesheet" type="text/css" /> 
         <link rel="stylesheet" href="./api/resources/csses/font-awesome.css">
-        <link rel="stylesheet" media="all and (max-device-width: 480px)" href="doc/site/iphone.css">
-        <link rel="stylesheet" media="all and (min-device-width: 481px) and (max-device-width: 1024px)" href="doc/site/iphone.css">
         <link href="./doc/resources/ace/skeleton/images/favicon.ico" rel="icon" type="image/x-icon">
     </head> 
     <body> 
@@ -32,7 +28,7 @@
                     <div id="top_container" class="collapse">
                         <h1>The high performance code editor for the web.</h1>
                         <div id="page_logo">
-                            <img src="doc/site/images/logo.png" />
+                            <img src="./doc/site/images/logo.png" />
                         </div>
                     </div>
                     <div style="clear: both"></div>
@@ -163,7 +159,7 @@ console.log(addResult);</div>
     return x;
 }&lt;/div>
     
-&lt;script src="https://s3.amazonaws.com/ajaxorg/src-min-noconflict/ace.js" type="text/javascript" charset="utf-8">&lt;/script>
+&lt;script src="http://d1n0x3qji82z53.cloudfront.net/src-min-noconflict/ace.js" type="text/javascript" charset="utf-8">&lt;/script>
 &lt;script>
     var editor = ace.edit("editor");
     editor.setTheme("ace/theme/twilight");
@@ -194,10 +190,9 @@ console.log(addResult);</div>
 
                             <h2>Setting the Programming Language Mode</h2>
                             <p>By default, the editor supports plain text mode. All other language modes are available as separate modules, loaded on demand like this:</p>
-                            <pre><code class="javascript">var javascriptMode = require("ace/mode/javascript").Mode;
-editor.getSession().setMode(new javascriptMode());</pre></code>
+                            <pre><code class="javascript">editor.getSession().setMode("ace/mode/javascript");</pre></code>
 
-                            <h2>One Editor, Multiple Sessions</h2>
+                            <!--h2>One Editor, Multiple Sessions</h2>
                             <p>ACE keeps everything about the state of the editor (selection, scroll position, etc.)
                                 in <code class="javascript">editor.session</code>. This means you can grab the
                                 session, store it in a var, and set the editor to another session (e.g. a tabbed editor).</p>
@@ -207,7 +202,7 @@ editor.getSession().setMode(new javascriptMode());</pre></code>
 var js = new EditSession("some js code");
 var css = new EditSession(["some", "css", "code here"]);
 // and then to load document into editor, just call
-editor.setSession(js);</code></pre>
+editor.setSession(js);</code></pre-->
                             
                             <h2>Common Operations</h2>
                             <p>Set and get content:</p>
