diff --git a/demo/editor.html b/demo/editor.html
index b00d6679..69b4a619 100644
--- a/demo/editor.html
+++ b/demo/editor.html
@@ -76,11 +76,11 @@
       <td>
         <label for="theme">Theme:</label>
         <select id="theme" size="1">
-          <option value="ace/theme/TextMate">TextMate</option>
-          <option value="ace/theme/Eclipse">Eclipse</option>
-          <option value="ace/theme/Dawn">Dawn</option>
-          <option value="ace/theme/IdleFingers">idleFingers</option>
-          <option value="ace/theme/Twilight">Twilight</option>
+          <option value="ace/theme/textmate">TextMate</option>
+          <option value="ace/theme/eclipse">Eclipse</option>
+          <option value="ace/theme/dawn">Dawn</option>
+          <option value="ace/theme/idle_fingers">idleFingers</option>
+          <option value="ace/theme/twilight">Twilight</option>
         </select>
       </td>
       <td>
@@ -137,16 +137,16 @@ require(
     {baseUrl: "../lib"},
     [
         "ace/lib/event",
-        "ace/Editor",
-        "ace/VirtualRenderer",
-        "ace/theme/TextMate",
-        "ace/Document",
-        "ace/mode/JavaScript",
-        "ace/mode/Css",
-        "ace/mode/Html",
-        "ace/mode/Xml",
-        "ace/mode/Text",
-        "ace/UndoManager"
+        "ace/editor",
+        "ace/virtual_renderer",
+        "ace/theme/textmate",
+        "ace/document",
+        "ace/mode/javascript",
+        "ace/mode/css",
+        "ace/mode/html",
+        "ace/mode/xml",
+        "ace/mode/text",
+        "ace/undomanager"
     ], function(event, Editor, Renderer, theme, Document, JavaScriptMode, CssMode, HtmlMode, XmlMode, TextMode, UndoManager) { 
 
 var docs = {}
diff --git a/lib/ace/Document.js b/lib/ace/Document.js
index ab28e841..979fef65 100644
--- a/lib/ace/Document.js
+++ b/lib/ace/Document.js
@@ -5,15 +5,14 @@
  * @license LGPLv3 <http://www.gnu.org/licenses/lgpl-3.0.txt>
  * @author Fabian Jakobs <fabian AT ajax DOT org>
  */
-require.def("ace/Document",
-    [
-        "ace/lib/oop",
-        "ace/lib/lang",
-        "ace/MEventEmitter",
-        "ace/Selection",
-        "ace/mode/Text",
-        "ace/Range"
-    ], function(oop, lang, MEventEmitter, Selection, TextMode, Range) {
+define(function(require, exports, module) {
+    
+var oop = require("./lib/oop");
+var lang = require("./lib/lang");
+var MEventEmitter = require("./mevent_emitter");
+var Selection = require("./selection");
+var TextMode = require("./mode/text");
+var Range = require("./range");
 
 var Document = function(text, mode) {
     this.modified = true;
@@ -33,7 +32,6 @@ var Document = function(text, mode) {
     }
 };
 
-
 (function() {
 
     oop.implement(this, MEventEmitter);
@@ -718,4 +716,4 @@ var Document = function(text, mode) {
 }).call(Document.prototype);
 
 return Document;
-});
+});
\ No newline at end of file
diff --git a/lib/ace/Editor.js b/lib/ace/Editor.js
index 18d66f06..af558db0 100644
--- a/lib/ace/Editor.js
+++ b/lib/ace/Editor.js
@@ -5,20 +5,20 @@
  * @license LGPLv3 <http://www.gnu.org/licenses/lgpl-3.0.txt>
  * @author Fabian Jakobs <fabian AT ajax DOT org>
  */
-require.def("ace/Editor",
-    [
-        "ace/lib/oop",
-        "ace/lib/event",
-        "ace/lib/lang",
-        "ace/TextInput",    
-        "ace/KeyBinding",
-        "ace/Document",
-        "ace/Search",
-        "ace/BackgroundTokenizer",
-        "ace/Range",
-        "ace/MEventEmitter"
-    ], function(oop, event, lang, TextInput, KeyBinding, Document, Search, BackgroundTokenizer, Range, MEventEmitter) {
 
+ define(function(require, exports, module) {
+
+ var oop = require("./lib/oop");
+ var event = require("./lib/event");
+ var lang = require("./lib/lang");
+ var TextInput = require("./textinput");
+ var KeyBinding = require("./keybinding");
+ var Document = require("./document");
+ var Search = require("./search");
+ var BackgroundTokenizer = require("./background_tokenizer");
+ var Range = require("./range");
+ var MEventEmitter = require("./mevent_emitter");
+ 
 var Editor =function(renderer, doc) {
     var container = renderer.getContainerElement();
     this.container = container;
diff --git a/lib/ace/KeyBinding.js b/lib/ace/KeyBinding.js
index e46c420c..8621cf78 100644
--- a/lib/ace/KeyBinding.js
+++ b/lib/ace/KeyBinding.js
@@ -5,14 +5,15 @@
  * @license LGPLv3 <http://www.gnu.org/licenses/lgpl-3.0.txt>
  * @author Fabian Jakobs <fabian AT ajax DOT org>
  */
-require.def("ace/KeyBinding",
-    ["ace/lib/core",
-     "ace/lib/event",
-     "ace/conf/keybindings/default_mac",
-     "ace/conf/keybindings/default_win",
-     "ace/PluginManager",
-     "ace/commands/DefaultCommands"],
-    function(core, event, default_mac, default_win, PluginManager) {
+
+define(function(require, exports, module) {
+
+var core = require("./lib/core");
+var event = require("./lib/event");
+var default_mac = require("./conf/keybindings/default_mac");
+var default_win = require("./conf/keybindings/default_win");
+var PluginManager = require("./pluginmanager");
+var DefaultCommands = require("./commands/default_commands");
 
 var KeyBinding = function(element, editor, config) {
     this.setConfig(config);
diff --git a/lib/ace/PluginManager.js b/lib/ace/PluginManager.js
index 18025088..338a5c20 100644
--- a/lib/ace/PluginManager.js
+++ b/lib/ace/PluginManager.js
@@ -5,7 +5,7 @@
  * @license LGPLv3 <http://www.gnu.org/licenses/lgpl-3.0.txt>
  * @author Fabian Jakobs <fabian AT ajax DOT org>
  */
-require.def("ace/PluginManager", [], function() {
+define(function(require, exports, module) {
 
 var PluginManager = {
     commands : {},
diff --git a/lib/ace/Range.js b/lib/ace/Range.js
index 57783a85..1724fc59 100644
--- a/lib/ace/Range.js
+++ b/lib/ace/Range.js
@@ -5,7 +5,7 @@
  * @license LGPLv3 <http://www.gnu.org/licenses/lgpl-3.0.txt>
  * @author Fabian Jakobs <fabian AT ajax DOT org>
  */
-require.def("ace/Range", function() {
+define(function(require, exports, module) {
 
 var Range = function(startRow, startColumn, endRow, endColumn) {
     this.start = {
diff --git a/lib/ace/RenderLoop.js b/lib/ace/RenderLoop.js
index c1fcd490..d27d46ce 100644
--- a/lib/ace/RenderLoop.js
+++ b/lib/ace/RenderLoop.js
@@ -5,7 +5,7 @@
  * @license LGPLv3 <http://www.gnu.org/licenses/lgpl-3.0.txt>
  * @author Fabian Jakobs <fabian AT ajax DOT org>
  */
-require.def("ace/RenderLoop", function() {
+define(function(require, exports, module) {
 
 var RenderLoop = function(onRender) {
     this.onRender = onRender;
diff --git a/lib/ace/ScrollBar.js b/lib/ace/ScrollBar.js
index a0dece62..6012a8cf 100644
--- a/lib/ace/ScrollBar.js
+++ b/lib/ace/ScrollBar.js
@@ -5,13 +5,14 @@
  * @license LGPLv3 <http://www.gnu.org/licenses/lgpl-3.0.txt>
  * @author Fabian Jakobs <fabian AT ajax DOT org>
  */
-require.def("ace/ScrollBar", [
-    "ace/lib/oop",
-    "ace/lib/lang",
-    "ace/lib/dom",
-    "ace/lib/event",
-    "ace/MEventEmitter"
-], function(oop, lang, dom, event, MEventEmitter) {
+ 
+define(function(require, exports, module) {
+
+var oop = require("./lib/oop");
+var lang = require("./lib/lang");
+var dom = require("./lib/dom");
+var event = require("./lib/event");
+var MEventEmitter = require("./mevent_emitter");
 
 var ScrollBar = function(parent) {
     this.element = document.createElement("div");
diff --git a/lib/ace/Search.js b/lib/ace/Search.js
index 2399f172..d549a65a 100644
--- a/lib/ace/Search.js
+++ b/lib/ace/Search.js
@@ -5,11 +5,11 @@
  * @license LGPLv3 <http://www.gnu.org/licenses/lgpl-3.0.txt>
  * @author Fabian Jakobs <fabian AT ajax DOT org>
  */
-require.def("ace/Search",
-    ["ace/lib/lang",
-     "ace/lib/oop",
-     "ace/Range"],
-    function(lang, oop, Range) {
+define(function(require, exports, module) {
+
+var oop = require("./lib/oop");
+var lang = require("./lib/lang");
+var Range = require("./range");
 
 var Search = function() {
     this.$options = {
diff --git a/lib/ace/Selection.js b/lib/ace/Selection.js
index 7915481c..a6bd7d98 100644
--- a/lib/ace/Selection.js
+++ b/lib/ace/Selection.js
@@ -5,12 +5,12 @@
  * @license LGPLv3 <http://www.gnu.org/licenses/lgpl-3.0.txt>
  * @author Fabian Jakobs <fabian AT ajax DOT org>
  */
-require.def("ace/Selection", [
-    "ace/lib/oop",
-    "ace/lib/lang",
-    "ace/MEventEmitter",
-    "ace/Range"
-], function(oop, lang, MEventEmitter, Range) {
+define(function(require, exports, module) {
+
+var oop = require("./lib/oop");
+var lang = require("./lib/lang");
+var MEventEmitter = require("./mevent_emitter");
+var Range = require("./range");
 
 var Selection = function(doc) {
     this.doc = doc;
diff --git a/lib/ace/TextInput.js b/lib/ace/TextInput.js
index b29bac8c..755429d4 100644
--- a/lib/ace/TextInput.js
+++ b/lib/ace/TextInput.js
@@ -5,7 +5,9 @@
  * @license LGPLv3 <http://www.gnu.org/licenses/lgpl-3.0.txt>
  * @author Fabian Jakobs <fabian AT ajax DOT org>
  */
-require.def("ace/TextInput", ["ace/lib/event"], function(event) {
+define(function(require, exports, module) {
+
+var event = require("./lib/event");
 
 var TextInput = function(parentNode, host) {
 
diff --git a/lib/ace/Tokenizer.js b/lib/ace/Tokenizer.js
index 4be24df4..aedc5546 100644
--- a/lib/ace/Tokenizer.js
+++ b/lib/ace/Tokenizer.js
@@ -5,7 +5,7 @@
  * @license LGPLv3 <http://www.gnu.org/licenses/lgpl-3.0.txt>
  * @author Fabian Jakobs <fabian AT ajax DOT org>
  */
-require.def("ace/Tokenizer", [], function() {
+define(function(require, exports, module) {
 
 var Tokenizer = function(rules) {
     this.rules = rules;
diff --git a/lib/ace/UndoManager.js b/lib/ace/UndoManager.js
index 6d7d2260..c0a8ec76 100644
--- a/lib/ace/UndoManager.js
+++ b/lib/ace/UndoManager.js
@@ -5,7 +5,7 @@
  * @license LGPLv3 <http://www.gnu.org/licenses/lgpl-3.0.txt>
  * @author Fabian Jakobs <fabian AT ajax DOT org>
  */
-require.def("ace/UndoManager", function() {
+define(function(require, exports, module) {
 
 var UndoManager = function() {
     this.$undoStack = [];
diff --git a/lib/ace/BackgroundTokenizer.js b/lib/ace/background_tokenizer.js
similarity index 96%
rename from lib/ace/BackgroundTokenizer.js
rename to lib/ace/background_tokenizer.js
index c9075639..d278c738 100644
--- a/lib/ace/BackgroundTokenizer.js
+++ b/lib/ace/background_tokenizer.js
@@ -5,7 +5,10 @@
  * @license LGPLv3 <http://www.gnu.org/licenses/lgpl-3.0.txt>
  * @author Fabian Jakobs <fabian AT ajax DOT org>
  */
-require.def("ace/BackgroundTokenizer", ["ace/lib/oop", "ace/MEventEmitter"], function(oop, MEventEmitter) {
+define(function(require, exports, module) {
+
+var oop = require("./lib/oop");
+var MEventEmitter = require("./mevent_emitter");
 
 var BackgroundTokenizer = function(tokenizer, editor) {
     this.running = false;
diff --git a/lib/ace/commands/DefaultCommands.js b/lib/ace/commands/default_commands.js
similarity index 98%
rename from lib/ace/commands/DefaultCommands.js
rename to lib/ace/commands/default_commands.js
index f0877051..db3ea4ab 100644
--- a/lib/ace/commands/DefaultCommands.js
+++ b/lib/ace/commands/default_commands.js
@@ -5,8 +5,10 @@
  * @license LGPLv3 <http://www.gnu.org/licenses/lgpl-3.0.txt>
  * @author Fabian Jakobs <fabian AT ajax DOT org>
  */
-require.def("ace/commands/DefaultCommands",
-    ["ace/PluginManager"], function(PluginManager) {
+ 
+define(function(require, exports, module) {
+
+var PluginManager = require("../PluginManager");
 
 PluginManager.registerCommand("selectall", function(editor, selection) {
     selection.selectAll();
diff --git a/lib/ace/conf/keybindings/default_mac.js b/lib/ace/conf/keybindings/default_mac.js
index 0a652dda..91699d52 100644
--- a/lib/ace/conf/keybindings/default_mac.js
+++ b/lib/ace/conf/keybindings/default_mac.js
@@ -5,7 +5,7 @@
  * @license LGPLv3 <http://www.gnu.org/licenses/lgpl-3.0.txt>
  * @author Fabian Jakobs <fabian AT ajax DOT org>
  */
-require.def("ace/conf/keybindings/default_mac", function() {
+define(function(require, exports, module) {
 
 return {
     "selectall": "Command-A",
diff --git a/lib/ace/conf/keybindings/default_win.js b/lib/ace/conf/keybindings/default_win.js
index fd5d393c..781bf696 100644
--- a/lib/ace/conf/keybindings/default_win.js
+++ b/lib/ace/conf/keybindings/default_win.js
@@ -5,7 +5,7 @@
  * @license LGPLv3 <http://www.gnu.org/licenses/lgpl-3.0.txt>
  * @author Fabian Jakobs <fabian AT ajax DOT org>
  */
-require.def("ace/conf/keybindings/default_win", function() {
+define(function(require, exports, module) {
 
 return {
     "selectall": "Ctrl-A",
diff --git a/lib/ace/layer/Cursor.js b/lib/ace/layer/Cursor.js
index 4141269d..a8a74232 100644
--- a/lib/ace/layer/Cursor.js
+++ b/lib/ace/layer/Cursor.js
@@ -5,7 +5,10 @@
  * @license LGPLv3 <http://www.gnu.org/licenses/lgpl-3.0.txt>
  * @author Fabian Jakobs <fabian AT ajax DOT org>
  */
-require.def("ace/layer/Cursor", ["ace/lib/dom"], function(dom) {
+
+define(function(require, exports, module) {
+
+var dom = require("../lib/dom");
 
 var Cursor = function(parentEl) {
     this.element = document.createElement("div");
diff --git a/lib/ace/layer/Gutter.js b/lib/ace/layer/Gutter.js
index d3e8c3ea..9696f275 100644
--- a/lib/ace/layer/Gutter.js
+++ b/lib/ace/layer/Gutter.js
@@ -5,7 +5,7 @@
  * @license LGPLv3 <http://www.gnu.org/licenses/lgpl-3.0.txt>
  * @author Fabian Jakobs <fabian AT ajax DOT org>
  */
-require.def("ace/layer/Gutter", [], function() {
+define(function(require, exports, module) {
 
 var Gutter = function(parentEl) {
     this.element = document.createElement("div");
diff --git a/lib/ace/layer/Marker.js b/lib/ace/layer/Marker.js
index 506cec07..818ce8fb 100644
--- a/lib/ace/layer/Marker.js
+++ b/lib/ace/layer/Marker.js
@@ -5,7 +5,9 @@
  * @license LGPLv3 <http://www.gnu.org/licenses/lgpl-3.0.txt>
  * @author Fabian Jakobs <fabian AT ajax DOT org>
  */
-require.def("ace/layer/Marker", ["ace/Range"], function(Range) {
+define(function(require, exports, module) {
+
+var Range = require("../range");
 
 var Marker = function(parentEl) {
     this.element = document.createElement("div");
diff --git a/lib/ace/layer/Text.js b/lib/ace/layer/Text.js
index 8a43e005..b8a3dd95 100644
--- a/lib/ace/layer/Text.js
+++ b/lib/ace/layer/Text.js
@@ -5,7 +5,11 @@
  * @license LGPLv3 <http://www.gnu.org/licenses/lgpl-3.0.txt>
  * @author Fabian Jakobs <fabian AT ajax DOT org>
  */
-require.def("ace/layer/Text", ["ace/lib/oop", "ace/lib/dom", "ace/MEventEmitter"], function(oop, dom, MEventEmitter) {
+define(function(require, exports, module) {
+
+var oop = require("../lib/oop");
+var dom = require("../lib/dom");
+var MEventEmitter = require("../mevent_emitter");
 
 var Text = function(parentEl) {
     this.element = document.createElement("div");
diff --git a/lib/ace/lib/core.js b/lib/ace/lib/core.js
index 6e0541e0..5ddb7b91 100644
--- a/lib/ace/lib/core.js
+++ b/lib/ace/lib/core.js
@@ -5,11 +5,7 @@
  * @license LGPLv3 <http://www.gnu.org/licenses/lgpl-3.0.txt>
  * @author Fabian Jakobs <fabian AT ajax DOT org>
  */
-
-if (!require.def) require.def = require("requireJS-node")(module, require);
-
-require.def("ace/lib/core", function() {
-
+define(function(require, exports, module) {
     var core = {};
     var os = (navigator.platform.match(/mac|win|linux/i) || ["other"])[0].toLowerCase();
 
@@ -32,5 +28,4 @@ require.def("ace/lib/core", function() {
     };
 
     return core;
-
 });
\ No newline at end of file
diff --git a/lib/ace/lib/dom.js b/lib/ace/lib/dom.js
index fbd7d7e2..217eeda0 100644
--- a/lib/ace/lib/dom.js
+++ b/lib/ace/lib/dom.js
@@ -6,9 +6,9 @@
  * @author Fabian Jakobs <fabian AT ajax DOT org>
  */
 
-if (!require.def) require.def = require("requireJS-node")(module, require);
+define(function(require, exports, module) {
 
-require.def("ace/lib/dom", ["ace/lib/lang"], function(lang) {
+    var lang = require("./lang");
 
     var dom = {};
 
diff --git a/lib/ace/lib/event.js b/lib/ace/lib/event.js
index 803ee803..31a0be68 100644
--- a/lib/ace/lib/event.js
+++ b/lib/ace/lib/event.js
@@ -6,9 +6,9 @@
  * @author Fabian Jakobs <fabian AT ajax DOT org>
  */
 
-if (!require.def) require.def = require("requireJS-node")(module, require);
+define(function(require, exports, module) {
 
-require.def("ace/lib/event", ["ace/lib/core"], function(core) {
+    var core = require("./core");
 
     var event = {};
 
diff --git a/lib/ace/lib/lang.js b/lib/ace/lib/lang.js
index 49942ece..fd8eb0de 100644
--- a/lib/ace/lib/lang.js
+++ b/lib/ace/lib/lang.js
@@ -5,10 +5,7 @@
  * @license LGPLv3 <http://www.gnu.org/licenses/lgpl-3.0.txt>
  * @author Fabian Jakobs <fabian AT ajax DOT org>
  */
-
-if (!require.def) require.def = require("requireJS-node")(module, require);
-
-require.def("ace/lib/lang", function() {
+define(function(require, exports, module) {
 
     var lang = {};
 
diff --git a/lib/ace/lib/oop.js b/lib/ace/lib/oop.js
index ea78639e..24adf510 100644
--- a/lib/ace/lib/oop.js
+++ b/lib/ace/lib/oop.js
@@ -5,10 +5,7 @@
  * @license LGPLv3 <http://www.gnu.org/licenses/lgpl-3.0.txt>
  * @author Fabian Jakobs <fabian AT ajax DOT org>
  */
-
-if (!require.def) require.def = require("requireJS-node")(module, require);
-
-require.def("ace/lib/oop", function() {
+define(function(require, exports, module) {
 
     var oop = {};
 
diff --git a/lib/ace/MEventEmitter.js b/lib/ace/mevent_emitter.js
similarity index 90%
rename from lib/ace/MEventEmitter.js
rename to lib/ace/mevent_emitter.js
index 117cd266..f4e8417b 100644
--- a/lib/ace/MEventEmitter.js
+++ b/lib/ace/mevent_emitter.js
@@ -5,10 +5,9 @@
  * @license LGPLv3 <http://www.gnu.org/licenses/lgpl-3.0.txt>
  * @author Fabian Jakobs <fabian AT ajax DOT org>
  */
+define(function(require, exports, module) {
 
-if (!require.def) require.def = require("requireJS-node")(module, require);
-
-require.def("ace/MEventEmitter", ["ace/lib/lang"], function(lang) {
+    var lang = require("./lib/lang");
 
     var MEventEmitter = {}
 
diff --git a/lib/ace/mode/Css.js b/lib/ace/mode/Css.js
index 652c8229..46092981 100644
--- a/lib/ace/mode/Css.js
+++ b/lib/ace/mode/Css.js
@@ -5,15 +5,14 @@
  * @license LGPLv3 <http://www.gnu.org/licenses/lgpl-3.0.txt>
  * @author Fabian Jakobs <fabian AT ajax DOT org>
  */
-require.def("ace/mode/Css",
-    [
-        "ace/lib/oop",
-        "ace/mode/Text",
-        "ace/Tokenizer",
-        "ace/mode/CssHighlightRules",
-        "ace/mode/MatchingBraceOutdent"
-    ], function(oop, TextMode, Tokenizer, CssHighlightRules, MatchingBraceOutdent) {
+define(function(require, exports, module) {
 
+var oop = require("../lib/oop");
+var Text = require("./text");
+var Tokenizer = require("../tokenizer");
+var CssHighlightRules = require("./css_highlight_rules");
+var MatchingBraceOutdent = require("./matching_brace_outdent");
+ 
 var Css = function() {
     this.$tokenizer = new Tokenizer(new CssHighlightRules().getRules());
     this.$outdent = new MatchingBraceOutdent();
diff --git a/lib/ace/mode/Html.js b/lib/ace/mode/Html.js
index 87c8e33c..8d90826f 100644
--- a/lib/ace/mode/Html.js
+++ b/lib/ace/mode/Html.js
@@ -5,15 +5,14 @@
  * @license LGPLv3 <http://www.gnu.org/licenses/lgpl-3.0.txt>
  * @author Fabian Jakobs <fabian AT ajax DOT org>
  */
-require.def("ace/mode/Html",
-    [
-        "ace/lib/oop",
-        "ace/mode/Text",
-        "ace/mode/JavaScript",
-        "ace/mode/Css",
-        "ace/Tokenizer",
-        "ace/mode/HtmlHighlightRules"
-    ], function(oop, TextMode, JavaScriptMode, CssMode, Tokenizer, HtmlHighlightRules) {
+define(function(require, exports, module) {
+
+var oop = require("../lib/oop");
+var Text = require("./text");
+var JavaScript = require("./javascript");
+var Css = require("./css");
+var Tokenizer = require("../tokenizer");
+var HtmlHighlightRules = require("./html_highlight_rules");
 
 var Html = function() {
     this.$tokenizer = new Tokenizer(new HtmlHighlightRules().getRules());
diff --git a/lib/ace/mode/JavaScript.js b/lib/ace/mode/JavaScript.js
index c5833baa..9ad1945c 100644
--- a/lib/ace/mode/JavaScript.js
+++ b/lib/ace/mode/JavaScript.js
@@ -5,15 +5,15 @@
  * @license LGPLv3 <http://www.gnu.org/licenses/lgpl-3.0.txt>
  * @author Fabian Jakobs <fabian AT ajax DOT org>
  */
-require.def("ace/mode/JavaScript",
-    [
-        "ace/lib/oop",
-        "ace/mode/Text",
-        "ace/Tokenizer",
-        "ace/mode/JavaScriptHighlightRules",
-        "ace/mode/MatchingBraceOutdent",
-        "ace/Range"
-    ], function(oop, TextMode, Tokenizer, JavaScriptHighlightRules, MatchingBraceOutdent, Range) {
+
+define(function(require, exports, module) {
+
+var oop = require("../lib/oop");
+var Text = require("./text");
+var Tokenizer = require("../tokenizer");
+var JavaScriptHighlightRules = require("./javascript_highlight_rules");
+var MatchingBraceOutdent = require("./matching_brace_outdent");
+var Range = require("../range");
 
 var JavaScript = function() {
     this.$tokenizer = new Tokenizer(new JavaScriptHighlightRules().getRules());
diff --git a/lib/ace/mode/Text.js b/lib/ace/mode/Text.js
index ba97cc9f..fba2c7d2 100644
--- a/lib/ace/mode/Text.js
+++ b/lib/ace/mode/Text.js
@@ -5,11 +5,10 @@
  * @license LGPLv3 <http://www.gnu.org/licenses/lgpl-3.0.txt>
  * @author Fabian Jakobs <fabian AT ajax DOT org>
  */
-require.def("ace/mode/Text",
-    [
-        "ace/Tokenizer",
-        "ace/mode/TextHighlightRules"
-    ], function(Tokenizer, TextHighlightRules) {
+define(function(require, exports, module) {
+
+var Tokenizer = require("../tokenizer");
+var TextHighlightRules = require("./text_highlight_rules");
 
 var Text = function() {
     this.$tokenizer = new Tokenizer(new TextHighlightRules().getRules());
diff --git a/lib/ace/mode/Xml.js b/lib/ace/mode/Xml.js
index 37417386..d17f7532 100644
--- a/lib/ace/mode/Xml.js
+++ b/lib/ace/mode/Xml.js
@@ -5,13 +5,12 @@
  * @license LGPLv3 <http://www.gnu.org/licenses/lgpl-3.0.txt>
  * @author Fabian Jakobs <fabian AT ajax DOT org>
  */
-require.def("ace/mode/Xml",
-    [
-        "ace/lib/oop",
-        "ace/mode/Text",
-        "ace/Tokenizer",
-        "ace/mode/XmlHighlightRules"
-    ], function(oop, TextMode, Tokenizer, XmlHighlightRules) {
+define(function(require, exports, module) {
+
+var oop = require("../lib/oop");
+var Text = require("./text");
+var Tokenizer = require("../tokenizer");
+var XmlHighlightRules = require("./xml_highlight_rules");
 
 var Xml = function() {
     this.$tokenizer = new Tokenizer(new XmlHighlightRules().getRules());
diff --git a/lib/ace/mode/CssHighlightRules.js b/lib/ace/mode/css_highlight_rules.js
similarity index 97%
rename from lib/ace/mode/CssHighlightRules.js
rename to lib/ace/mode/css_highlight_rules.js
index 9d25aab0..cd94676e 100644
--- a/lib/ace/mode/CssHighlightRules.js
+++ b/lib/ace/mode/css_highlight_rules.js
@@ -5,6 +5,12 @@
  * @license LGPLv3 <http://www.gnu.org/licenses/lgpl-3.0.txt>
  * @author Fabian Jakobs <fabian AT ajax DOT org>
  */
+define(function(require, exports, module) {
+
+var oop = require("../lib/oop");
+var lang = require("../lib/lang");
+var TextHighlightRules = require("./text_highlight_rules");
+
 require.def("ace/mode/CssHighlightRules",
      [
          "ace/lib/oop",
diff --git a/lib/ace/mode/DocCommentHighlightRules.js b/lib/ace/mode/doc_comment_highlight_rules.js
similarity index 87%
rename from lib/ace/mode/DocCommentHighlightRules.js
rename to lib/ace/mode/doc_comment_highlight_rules.js
index 915c7d29..8a6758d5 100644
--- a/lib/ace/mode/DocCommentHighlightRules.js
+++ b/lib/ace/mode/doc_comment_highlight_rules.js
@@ -5,11 +5,10 @@
  * @license LGPLv3 <http://www.gnu.org/licenses/lgpl-3.0.txt>
  * @author Fabian Jakobs <fabian AT ajax DOT org>
  */
-require.def("ace/mode/DocCommentHighlightRules",
-    [
-        "ace/lib/oop",
-        "ace/mode/TextHighlightRules"
-    ], function(oop, TextHighlightRules) {
+define(function(require, exports, module) {
+
+var oop = require("../lib/oop");
+var TextHighlightRules = require("./text_highlight_rules");
 
 var DocCommentHighlightRules = function() {
 
diff --git a/lib/ace/mode/HtmlHighlightRules.js b/lib/ace/mode/html_highlight_rules.js
similarity index 92%
rename from lib/ace/mode/HtmlHighlightRules.js
rename to lib/ace/mode/html_highlight_rules.js
index 21e7b07c..06b901b9 100644
--- a/lib/ace/mode/HtmlHighlightRules.js
+++ b/lib/ace/mode/html_highlight_rules.js
@@ -5,13 +5,13 @@
  * @license LGPLv3 <http://www.gnu.org/licenses/lgpl-3.0.txt>
  * @author Fabian Jakobs <fabian AT ajax DOT org>
  */
-require.def("ace/mode/HtmlHighlightRules",
-    [
-        "ace/lib/oop",
-        "ace/mode/CssHighlightRules",
-        "ace/mode/JavaScriptHighlightRules",
-        "ace/mode/TextHighlightRules"
-    ], function(oop, CssHighlightRules, JavaScriptHighlightRules, TextHighlightRules) {
+ 
+define(function(require, exports, module) {
+
+var oop = require("../lib/oop");
+var CssHighlightRules = require("./css_highlight_rules");
+var JavaScriptHighlightRules = require("./javascript_highlight_rules");
+var TextHighlightRules = require("./text_highlight_rules");
 
 var HtmlHighlightRules = function() {
 
diff --git a/lib/ace/mode/JavaScriptHighlightRules.js b/lib/ace/mode/javascript_highlight_rules.js
similarity index 94%
rename from lib/ace/mode/JavaScriptHighlightRules.js
rename to lib/ace/mode/javascript_highlight_rules.js
index 5552f7f9..f34e79ee 100644
--- a/lib/ace/mode/JavaScriptHighlightRules.js
+++ b/lib/ace/mode/javascript_highlight_rules.js
@@ -5,14 +5,13 @@
  * @license LGPLv3 <http://www.gnu.org/licenses/lgpl-3.0.txt>
  * @author Fabian Jakobs <fabian AT ajax DOT org>
  */
-require.def("ace/mode/JavaScriptHighlightRules",
-     [
-         "ace/lib/oop",
-         "ace/lib/lang",
-         "ace/mode/DocCommentHighlightRules",
-         "ace/mode/TextHighlightRules"
-     ], function(oop, lang, DocCommentHighlightRules, TextHighlightRules) {
+ 
+define(function(require, exports, module) {
 
+var oop = require("../lib/oop");
+var lang = require("../lib/lang");
+var DocCommentHighlightRules = require("./doc_comment_highlight_rules");
+var TextHighlightRules = require("./text_highlight_rules");
 
 JavaScriptHighlightRules = function() {
 
diff --git a/lib/ace/mode/MatchingBraceOutdent.js b/lib/ace/mode/matching_brace_outdent.js
similarity index 93%
rename from lib/ace/mode/MatchingBraceOutdent.js
rename to lib/ace/mode/matching_brace_outdent.js
index 455ff1df..9418d206 100644
--- a/lib/ace/mode/MatchingBraceOutdent.js
+++ b/lib/ace/mode/matching_brace_outdent.js
@@ -5,9 +5,9 @@
  * @license LGPLv3 <http://www.gnu.org/licenses/lgpl-3.0.txt>
  * @author Fabian Jakobs <fabian AT ajax DOT org>
  */
-require.def("ace/mode/MatchingBraceOutdent",
-    ["ace/Range"],
-    function(Range) {
+define(function(require, exports, module) {
+
+var Range = require("../range");
 
 var MatchingBraceOutdent = function() {};
 
diff --git a/lib/ace/mode/TextHighlightRules.js b/lib/ace/mode/text_highlight_rules.js
similarity index 94%
rename from lib/ace/mode/TextHighlightRules.js
rename to lib/ace/mode/text_highlight_rules.js
index 3918c55e..399cc209 100644
--- a/lib/ace/mode/TextHighlightRules.js
+++ b/lib/ace/mode/text_highlight_rules.js
@@ -5,7 +5,7 @@
  * @license LGPLv3 <http://www.gnu.org/licenses/lgpl-3.0.txt>
  * @author Fabian Jakobs <fabian AT ajax DOT org>
  */
-require.def("ace/mode/TextHighlightRules", [], function() {
+define(function(require, exports, module) {
 
 var TextHighlightRules = function() {
 
diff --git a/lib/ace/mode/XmlHighlightRules.js b/lib/ace/mode/xml_highlight_rules.js
similarity index 92%
rename from lib/ace/mode/XmlHighlightRules.js
rename to lib/ace/mode/xml_highlight_rules.js
index 21a85c36..a64eac84 100644
--- a/lib/ace/mode/XmlHighlightRules.js
+++ b/lib/ace/mode/xml_highlight_rules.js
@@ -5,11 +5,11 @@
  * @license LGPLv3 <http://www.gnu.org/licenses/lgpl-3.0.txt>
  * @author Fabian Jakobs <fabian AT ajax DOT org>
  */
-require.def("ace/mode/XmlHighlightRules",
-    [
-        "ace/lib/oop",
-        "ace/mode/TextHighlightRules"
-    ], function(oop, TextHighlightRules) {
+ 
+define(function(require, exports, module) {
+
+var oop = require("../lib/oop");
+var TextHighlightRules = require("./text_highlight_rules");
 
 var XmlHighlightRules = function() {
 
diff --git a/lib/ace/theme/Eclipse.js b/lib/ace/theme/Eclipse.js
index 224d9165..8f29c75f 100644
--- a/lib/ace/theme/Eclipse.js
+++ b/lib/ace/theme/Eclipse.js
@@ -1,5 +1,4 @@
-require.def("ace/theme/Eclipse",
-    ["ace/lib/dom", "text!ace/theme/eclipse.css"], function(dom, cssText) {
+define(["./lib/dom", "text!./theme/eclipse.css"], function(dom, cssText) {
         
     // import CSS once
     dom.importCssString(cssText);
diff --git a/lib/ace/theme/TextMate.js b/lib/ace/theme/TextMate.js
index c4f74dd5..b1b64eb9 100644
--- a/lib/ace/theme/TextMate.js
+++ b/lib/ace/theme/TextMate.js
@@ -1,5 +1,4 @@
-require.def("ace/theme/TextMate",
-    ["ace/lib/dom", "text!ace/theme/tm.css"], function(dom, cssText) {
+define(["./lib/dom", "text!./theme/tm.css"], function(dom, cssText) {
 
     // import CSS once
     dom.importCssString(cssText);
diff --git a/lib/ace/theme/CloudsMidnight.js b/lib/ace/theme/clouds_midnight.js
similarity index 100%
rename from lib/ace/theme/CloudsMidnight.js
rename to lib/ace/theme/clouds_midnight.js
diff --git a/lib/ace/VirtualRenderer.js b/lib/ace/virtual_renderer.js
similarity index 98%
rename from lib/ace/VirtualRenderer.js
rename to lib/ace/virtual_renderer.js
index d56d62f9..e644751e 100644
--- a/lib/ace/VirtualRenderer.js
+++ b/lib/ace/virtual_renderer.js
@@ -5,20 +5,20 @@
  * @license LGPLv3 <http://www.gnu.org/licenses/lgpl-3.0.txt>
  * @author Fabian Jakobs <fabian AT ajax DOT org>
  */
-require.def("ace/VirtualRenderer",
+define(
     [
-         "ace/lib/oop",
-         "ace/lib/lang",
-         "ace/lib/dom",
-         "ace/lib/event",
-         "ace/layer/Gutter",
-         "ace/layer/Marker",
-         "ace/layer/Text",
-         "ace/layer/Cursor",
-         "ace/ScrollBar",
-         "ace/RenderLoop",
-         "ace/MEventEmitter",
-         "text!ace/css/editor.css"
+         "./lib/oop",
+         "./lib/lang",
+         "./lib/dom",
+         "./lib/event",
+         "./layer/Gutter",
+         "./layer/Marker",
+         "./layer/Text",
+         "./layer/Cursor",
+         "./ScrollBar",
+         "./RenderLoop",
+         "./MEventEmitter",
+         "text!./css/editor.css"
     ], function(
         oop, lang, dom, event, GutterLayer, MarkerLayer, TextLayer,
         CursorLayer, ScrollBar, RenderLoop, MEventEmitter, editorCss) {
diff --git a/tool/theme.tmpl.js b/tool/theme.tmpl.js
index 90cdf6eb..b4eed087 100644
--- a/tool/theme.tmpl.js
+++ b/tool/theme.tmpl.js
@@ -1,6 +1,5 @@
-require.def("ace/theme/%name%",
-    ["ace/lib/dom"], function(dom) {
-
+define(function(require, exports, module) {
+    var dom = require("./lib/dom");
     var cssText = %css%;
     
     // import CSS once
diff --git a/tool/tmtheme.js b/tool/tmtheme.js
index d7a6b05f..fcb7b121 100644
--- a/tool/tmtheme.js
+++ b/tool/tmtheme.js
@@ -176,21 +176,21 @@ var cssTemplate = fs.readFileSync(__dirname + "/Theme.tmpl.css", "utf8");
 var jsTemplate = fs.readFileSync(__dirname + "/Theme.tmpl.js", "utf8");
 
 var themes = {
-    "Dawn": "Dawn",
-    "IdleFingers": "idleFingers",
-    "Twilight": "Twilight",
-    "Monokai": "Monokai",
-    "Cobalt": "Cobalt",
-    "MonoIndustrial": "monoindustrial",
-    "Clouds": "Clouds",
-    "CloudsMidnight": "Clouds Midnight",
-    "KrTheme": "krTheme"
+    "dawn": "Dawn",
+    "idle_fingers": "idleFingers",
+    "twilight": "Twilight",
+    "monokai": "Monokai",
+    "cobalt": "Cobalt",
+    "mono_industrial": "monoindustrial",
+    "clouds": "Clouds",
+    "clouds_midnight": "Clouds Midnight",
+    "kr_theme": "krTheme"
 }
 
 for (var name in themes) {
     console.log("Converting " + name);
-	var tmTheme = fs.readFileSync(__dirname + "/tmthemes/" + themes[name] + ".tmTheme", "utf8");
+    var tmTheme = fs.readFileSync(__dirname + "/tmthemes/" + themes[name] + ".tmTheme", "utf8");
 
-	var styles = extractStyles(parseTheme(tmTheme));
-	fs.writeFileSync(__dirname + "/../src/ace/theme/" + name + ".js", createTheme(name, styles, cssTemplate, jsTemplate));
+    var styles = extractStyles(parseTheme(tmTheme));
+    fs.writeFileSync(__dirname + "/../src/ace/theme/" + name + ".js", createTheme(name, styles, cssTemplate, jsTemplate));
 }