diff --git a/ace.d.ts b/ace.d.ts
index fc8f81416a..7d2d86411d 100644
--- a/ace.d.ts
+++ b/ace.d.ts
@@ -883,7 +883,7 @@ export namespace Ace {
     setStyle(style: string): void;
     unsetStyle(style: string): void;
     getFontSize(): string;
-    setFontSize(size: number): void;
+    setFontSize(size: number|string): void;
     focus(): void;
     isFocused(): boolean;
     blur(): void;
@@ -1096,6 +1096,9 @@ export const EditSession: {
 export const UndoManager: {
   new(): Ace.UndoManager;
 };
+export const Editor: {
+  new(): Ace.Editor;
+};
 export const Range: {
   new(startRow: number, startColumn: number, endRow: number, endColumn: number): Ace.Range;
   fromPoints(start: Ace.Point, end: Ace.Point): Ace.Range;
diff --git a/src/config.js b/src/config.js
index 26f14f21dd..1c4a25ad9b 100644
--- a/src/config.js
+++ b/src/config.js
@@ -77,15 +77,26 @@ exports.setModuleUrl = function(name, subst) {
 var loader = function(moduleName, cb) {
     if (moduleName === "ace/theme/textmate" || moduleName === "./theme/textmate")
         return cb(null, require("./theme/textmate"));
-    return console.error("loader is not configured");
+    if (typeof module.require == "function") {
+        // backwards compatibility for node
+        try {
+            var req = "require";
+            return cb(null, module[req](moduleName));
+        } catch (e) {
+        }
+    }
+    if (customLoader)
+        return customLoader(moduleName, cb);
+    console.error("loader is not configured");
 };
-
+var customLoader;
 exports.setLoader = function(cb) {
-    loader = cb;
+    customLoader = cb;
 };
 
 exports.dynamicModules = Object.create(null);
 exports.$loading = {};
+exports.$loaded = {};
 exports.loadModule = function(moduleName, onLoad) {
     var module, moduleType;
     if (Array.isArray(moduleName)) {
@@ -105,6 +116,7 @@ exports.loadModule = function(moduleName, onLoad) {
 
         var afterLoad = function() {
             loader(moduleName, function(err, module) {
+                if (module) exports.$loaded[moduleName] = module;
                 exports._emit("load.module", {name: moduleName, module: module});
                 var listeners = exports.$loading[moduleName];
                 exports.$loading[moduleName] = null;
@@ -130,10 +142,7 @@ exports.loadModule = function(moduleName, onLoad) {
             }
         });
     } else {
-        try {
-            module = require(moduleName);
-        } catch (e) {}
-        load(module);
+        load(module || exports.$loaded[moduleName]);
     }
 };
 
diff --git a/src/css/editor.css.js b/src/css/editor-css.js
similarity index 100%
rename from src/css/editor.css.js
rename to src/css/editor-css.js
diff --git a/src/ext/textarea.js b/src/ext/textarea.js
index 9319780215..e2c74f4d43 100644
--- a/src/ext/textarea.js
+++ b/src/ext/textarea.js
@@ -2,7 +2,6 @@
 
 var event = require("../lib/event");
 var UA = require("../lib/useragent");
-var net = require("../lib/net");
 var ace = require("../ace");
 
 module.exports = exports = ace;
@@ -231,16 +230,7 @@ exports.transformTextarea = function(element, options) {
     return editor;
 };
 
-function load(url, module, callback) {
-    net.loadScript(url, function() {
-        require([module], callback);
-    });
-}
-
 function setupApi(editor, editorDiv, settingDiv, ace, options) {
-    var session = editor.getSession();
-    var renderer = editor.renderer;
-
     function toBool(value) {
         return value === "true" || value == true;
     }
diff --git a/src/lib/keys.js b/src/lib/keys.js
index 527bc35c9d..0c67bf0dfa 100644
--- a/src/lib/keys.js
+++ b/src/lib/keys.js
@@ -137,7 +137,7 @@ var Keys = (function() {
     
     (function() {
         var mods = ["cmd", "ctrl", "alt", "shift"];
-        for (var i = Math.pow(2, mods.length); i--;) {            
+        for (var i = Math.pow(2, mods.length); i--;) {
             ret.KEY_MODS[i] = mods.filter(function(x) {
                 return i & ret.KEY_MODS[x];
             }).join("-") + "-";
@@ -151,6 +151,8 @@ var Keys = (function() {
 })();
 oop.mixin(exports, Keys);
 
+exports.default = exports;
+
 exports.keyCodeToString = function(keyCode) {
     // Language-switching keystroke in Chrome/Linux emits keyCode 0.
     var keyString = Keys[keyCode];
diff --git a/src/theme/ambiance.css.js b/src/theme/ambiance-css.js
similarity index 100%
rename from src/theme/ambiance.css.js
rename to src/theme/ambiance-css.js
diff --git a/src/theme/ambiance.js b/src/theme/ambiance.js
index a0bd807b66..4677a0b094 100644
--- a/src/theme/ambiance.js
+++ b/src/theme/ambiance.js
@@ -1,6 +1,6 @@
 exports.isDark = true;
 exports.cssClass = "ace-ambiance";
-exports.cssText = require("./ambiance.css");
+exports.cssText = require("./ambiance-css");
 
 var dom = require("../lib/dom");
 dom.importCssString(exports.cssText, exports.cssClass, false);
diff --git a/src/theme/chaos.css.js b/src/theme/chaos-css.js
similarity index 100%
rename from src/theme/chaos.css.js
rename to src/theme/chaos-css.js
diff --git a/src/theme/chaos.js b/src/theme/chaos.js
index 0e6eb40b42..e856358c06 100644
--- a/src/theme/chaos.js
+++ b/src/theme/chaos.js
@@ -1,6 +1,6 @@
 exports.isDark = true;
 exports.cssClass = "ace-chaos";
-exports.cssText = require("./chaos.css");
+exports.cssText = require("./chaos-css");
 
 var dom = require("../lib/dom");
 dom.importCssString(exports.cssText, exports.cssClass, false);
diff --git a/src/theme/chrome.css.js b/src/theme/chrome-css.js
similarity index 100%
rename from src/theme/chrome.css.js
rename to src/theme/chrome-css.js
diff --git a/src/theme/chrome.js b/src/theme/chrome.js
index eabb6f945a..e5210c1a72 100644
--- a/src/theme/chrome.js
+++ b/src/theme/chrome.js
@@ -1,6 +1,6 @@
 exports.isDark = false;
 exports.cssClass = "ace-chrome";
-exports.cssText = require("./chrome.css");
+exports.cssText = require("./chrome-css");
 
 var dom = require("../lib/dom");
 dom.importCssString(exports.cssText, exports.cssClass, false);
diff --git a/src/theme/cloud9_day.css.js b/src/theme/cloud9_day-css.js
similarity index 100%
rename from src/theme/cloud9_day.css.js
rename to src/theme/cloud9_day-css.js
diff --git a/src/theme/cloud9_day.js b/src/theme/cloud9_day.js
index e925deff18..2c1f483d74 100644
--- a/src/theme/cloud9_day.js
+++ b/src/theme/cloud9_day.js
@@ -2,7 +2,7 @@
 
   exports.isDark = false;
   exports.cssClass = "ace-cloud9-day";
-  exports.cssText = require("./cloud9_day.css");
+  exports.cssText = require("./cloud9_day-css");
 
   var dom = require("../lib/dom");
   dom.importCssString(exports.cssText, exports.cssClass);
diff --git a/src/theme/cloud9_night.css.js b/src/theme/cloud9_night-css.js
similarity index 100%
rename from src/theme/cloud9_night.css.js
rename to src/theme/cloud9_night-css.js
diff --git a/src/theme/cloud9_night.js b/src/theme/cloud9_night.js
index 4dff4ea499..c84eb3ef10 100644
--- a/src/theme/cloud9_night.js
+++ b/src/theme/cloud9_night.js
@@ -1,6 +1,6 @@
 exports.isDark = true;
   exports.cssClass = "ace-cloud9-night";
-  exports.cssText = require("./cloud9_night.css");
+  exports.cssText = require("./cloud9_night-css");
 
   var dom = require("../lib/dom");
   dom.importCssString(exports.cssText, exports.cssClass);
diff --git a/src/theme/cloud9_night_low_color.css.js b/src/theme/cloud9_night_low_color-css.js
similarity index 100%
rename from src/theme/cloud9_night_low_color.css.js
rename to src/theme/cloud9_night_low_color-css.js
diff --git a/src/theme/cloud9_night_low_color.js b/src/theme/cloud9_night_low_color.js
index 55ad28b1f5..456b54b103 100644
--- a/src/theme/cloud9_night_low_color.js
+++ b/src/theme/cloud9_night_low_color.js
@@ -1,6 +1,6 @@
 exports.isDark = true;
   exports.cssClass = "ace-cloud9-night-low-color";
-  exports.cssText = require("./cloud9_night_low_color.css");
+  exports.cssText = require("./cloud9_night_low_color-css");
 
   var dom = require("../lib/dom");
   dom.importCssString(exports.cssText, exports.cssClass);
diff --git a/src/theme/clouds.css.js b/src/theme/clouds-css.js
similarity index 100%
rename from src/theme/clouds.css.js
rename to src/theme/clouds-css.js
diff --git a/src/theme/clouds.js b/src/theme/clouds.js
index 98eb3965ff..fd80fda06f 100644
--- a/src/theme/clouds.js
+++ b/src/theme/clouds.js
@@ -1,6 +1,6 @@
 exports.isDark = false;
 exports.cssClass = "ace-clouds";
-exports.cssText = require("./clouds.css");
+exports.cssText = require("./clouds-css");
 
 var dom = require("../lib/dom");
 dom.importCssString(exports.cssText, exports.cssClass, false);
diff --git a/src/theme/clouds_midnight.css.js b/src/theme/clouds_midnight-css.js
similarity index 100%
rename from src/theme/clouds_midnight.css.js
rename to src/theme/clouds_midnight-css.js
diff --git a/src/theme/clouds_midnight.js b/src/theme/clouds_midnight.js
index 283df81d00..a2d40fd68c 100644
--- a/src/theme/clouds_midnight.js
+++ b/src/theme/clouds_midnight.js
@@ -1,6 +1,6 @@
 exports.isDark = true;
 exports.cssClass = "ace-clouds-midnight";
-exports.cssText = require("./clouds_midnight.css");
+exports.cssText = require("./clouds_midnight-css");
 
 var dom = require("../lib/dom");
 dom.importCssString(exports.cssText, exports.cssClass, false);
diff --git a/src/theme/cobalt.css.js b/src/theme/cobalt-css.js
similarity index 100%
rename from src/theme/cobalt.css.js
rename to src/theme/cobalt-css.js
diff --git a/src/theme/cobalt.js b/src/theme/cobalt.js
index 17ac8bff33..04341821c2 100644
--- a/src/theme/cobalt.js
+++ b/src/theme/cobalt.js
@@ -1,6 +1,6 @@
 exports.isDark = true;
 exports.cssClass = "ace-cobalt";
-exports.cssText = require("./cobalt.css");
+exports.cssText = require("./cobalt-css");
 
 var dom = require("../lib/dom");
 dom.importCssString(exports.cssText, exports.cssClass, false);
diff --git a/src/theme/crimson_editor.css.js b/src/theme/crimson_editor-css.js
similarity index 100%
rename from src/theme/crimson_editor.css.js
rename to src/theme/crimson_editor-css.js
diff --git a/src/theme/crimson_editor.js b/src/theme/crimson_editor.js
index fb96a71476..ec80f1dde8 100644
--- a/src/theme/crimson_editor.js
+++ b/src/theme/crimson_editor.js
@@ -1,5 +1,5 @@
 exports.isDark = false;
-exports.cssText = require("./crimson_editor.css");
+exports.cssText = require("./crimson_editor-css");
 
 exports.cssClass = "ace-crimson-editor";
 
diff --git a/src/theme/dawn.css.js b/src/theme/dawn-css.js
similarity index 100%
rename from src/theme/dawn.css.js
rename to src/theme/dawn-css.js
diff --git a/src/theme/dawn.js b/src/theme/dawn.js
index 32061f3cd1..88b4106835 100644
--- a/src/theme/dawn.js
+++ b/src/theme/dawn.js
@@ -1,6 +1,6 @@
 exports.isDark = false;
 exports.cssClass = "ace-dawn";
-exports.cssText = require("./dawn.css");
+exports.cssText = require("./dawn-css");
 
 var dom = require("../lib/dom");
 dom.importCssString(exports.cssText, exports.cssClass, false);
diff --git a/src/theme/dracula.css.js b/src/theme/dracula-css.js
similarity index 100%
rename from src/theme/dracula.css.js
rename to src/theme/dracula-css.js
diff --git a/src/theme/dracula.js b/src/theme/dracula.js
index 74df9a6bac..7e65097388 100644
--- a/src/theme/dracula.js
+++ b/src/theme/dracula.js
@@ -1,6 +1,6 @@
 exports.isDark = true;
 exports.cssClass = "ace-dracula";
-exports.cssText = require("./dracula.css");
+exports.cssText = require("./dracula-css");
 exports.$selectionColorConflict = true;
 
 var dom = require("../lib/dom");
diff --git a/src/theme/dreamweaver.css.js b/src/theme/dreamweaver-css.js
similarity index 100%
rename from src/theme/dreamweaver.css.js
rename to src/theme/dreamweaver-css.js
diff --git a/src/theme/dreamweaver.js b/src/theme/dreamweaver.js
index 7235fe9dab..09e0a6f04e 100644
--- a/src/theme/dreamweaver.js
+++ b/src/theme/dreamweaver.js
@@ -1,6 +1,6 @@
 exports.isDark = false;
 exports.cssClass = "ace-dreamweaver";
-exports.cssText = require("./dreamweaver.css");
+exports.cssText = require("./dreamweaver-css");
 
 var dom = require("../lib/dom");
 dom.importCssString(exports.cssText, exports.cssClass, false);
diff --git a/src/theme/eclipse.css.js b/src/theme/eclipse-css.js
similarity index 100%
rename from src/theme/eclipse.css.js
rename to src/theme/eclipse-css.js
diff --git a/src/theme/eclipse.js b/src/theme/eclipse.js
index 826680eae2..328463d212 100644
--- a/src/theme/eclipse.js
+++ b/src/theme/eclipse.js
@@ -1,7 +1,7 @@
 "use strict";
 
 exports.isDark = false;
-exports.cssText = require("./eclipse.css");
+exports.cssText = require("./eclipse-css");
 
 exports.cssClass = "ace-eclipse";
 
diff --git a/src/theme/github.css.js b/src/theme/github-css.js
similarity index 100%
rename from src/theme/github.css.js
rename to src/theme/github-css.js
diff --git a/src/theme/github.js b/src/theme/github.js
index c27bd6e8fb..755acdaf51 100644
--- a/src/theme/github.js
+++ b/src/theme/github.js
@@ -1,6 +1,6 @@
 exports.isDark = false;
 exports.cssClass = "ace-github";
-exports.cssText = require("./github.css");
+exports.cssText = require("./github-css");
 
     var dom = require("../lib/dom");
     dom.importCssString(exports.cssText, exports.cssClass, false);
diff --git a/src/theme/github_dark.css.js b/src/theme/github_dark-css.js
similarity index 100%
rename from src/theme/github_dark.css.js
rename to src/theme/github_dark-css.js
diff --git a/src/theme/github_dark.js b/src/theme/github_dark.js
index cb66c090ed..8cf8f0b574 100644
--- a/src/theme/github_dark.js
+++ b/src/theme/github_dark.js
@@ -1,6 +1,6 @@
 exports.isDark = true;
 exports.cssClass = "ace-github-dark";
-exports.cssText = require("./github_dark.css");
+exports.cssText = require("./github_dark-css");
 
     var dom = require("../lib/dom");
     dom.importCssString(exports.cssText, exports.cssClass, false);
diff --git a/src/theme/gob.css.js b/src/theme/gob-css.js
similarity index 100%
rename from src/theme/gob.css.js
rename to src/theme/gob-css.js
diff --git a/src/theme/gob.js b/src/theme/gob.js
index 151aabf34e..1b0816f403 100644
--- a/src/theme/gob.js
+++ b/src/theme/gob.js
@@ -1,6 +1,6 @@
 exports.isDark = true;
 exports.cssClass = "ace-gob";
-exports.cssText = require("./gob.css");
+exports.cssText = require("./gob-css");
 
 var dom = require("../lib/dom");
 dom.importCssString(exports.cssText, exports.cssClass, false);
diff --git a/src/theme/gruvbox.css.js b/src/theme/gruvbox-css.js
similarity index 100%
rename from src/theme/gruvbox.css.js
rename to src/theme/gruvbox-css.js
diff --git a/src/theme/gruvbox.js b/src/theme/gruvbox.js
index cea12f25ad..226e9193a9 100644
--- a/src/theme/gruvbox.js
+++ b/src/theme/gruvbox.js
@@ -1,6 +1,6 @@
 exports.isDark = true;
 exports.cssClass = "ace-gruvbox";
-exports.cssText = require("./gruvbox.css");
+exports.cssText = require("./gruvbox-css");
 
 var dom = require("../lib/dom");
 dom.importCssString(exports.cssText, exports.cssClass, false);
diff --git a/src/theme/gruvbox_dark_hard.css.js b/src/theme/gruvbox_dark_hard-css.js
similarity index 100%
rename from src/theme/gruvbox_dark_hard.css.js
rename to src/theme/gruvbox_dark_hard-css.js
diff --git a/src/theme/gruvbox_dark_hard.js b/src/theme/gruvbox_dark_hard.js
index 399138160c..ee56d96f7c 100644
--- a/src/theme/gruvbox_dark_hard.js
+++ b/src/theme/gruvbox_dark_hard.js
@@ -1,6 +1,6 @@
 exports.isDark = true;
 exports.cssClass = "ace-gruvbox-dark-hard";
-exports.cssText = require("./gruvbox_dark_hard.css");
+exports.cssText = require("./gruvbox_dark_hard-css");
 
 var dom = require("../lib/dom");
 dom.importCssString(exports.cssText, exports.cssClass);
diff --git a/src/theme/gruvbox_light_hard.css.js b/src/theme/gruvbox_light_hard-css.js
similarity index 100%
rename from src/theme/gruvbox_light_hard.css.js
rename to src/theme/gruvbox_light_hard-css.js
diff --git a/src/theme/gruvbox_light_hard.js b/src/theme/gruvbox_light_hard.js
index 3d3db64912..27de4ef66d 100644
--- a/src/theme/gruvbox_light_hard.js
+++ b/src/theme/gruvbox_light_hard.js
@@ -1,6 +1,6 @@
 exports.isDark = false;
 exports.cssClass = "ace-gruvbox-light-hard";
-exports.cssText = require("./gruvbox_light_hard.css");
+exports.cssText = require("./gruvbox_light_hard-css");
 
 var dom = require("../lib/dom");
 dom.importCssString(exports.cssText, exports.cssClass);
diff --git a/src/theme/idle_fingers.css.js b/src/theme/idle_fingers-css.js
similarity index 100%
rename from src/theme/idle_fingers.css.js
rename to src/theme/idle_fingers-css.js
diff --git a/src/theme/idle_fingers.js b/src/theme/idle_fingers.js
index 1750092a9d..d0d1521cbf 100644
--- a/src/theme/idle_fingers.js
+++ b/src/theme/idle_fingers.js
@@ -1,6 +1,6 @@
 exports.isDark = true;
 exports.cssClass = "ace-idle-fingers";
-exports.cssText = require("./idle_fingers.css");
+exports.cssText = require("./idle_fingers-css");
 
 var dom = require("../lib/dom");
 dom.importCssString(exports.cssText, exports.cssClass, false);
diff --git a/src/theme/iplastic.css.js b/src/theme/iplastic-css.js
similarity index 100%
rename from src/theme/iplastic.css.js
rename to src/theme/iplastic-css.js
diff --git a/src/theme/iplastic.js b/src/theme/iplastic.js
index 0bcd280b43..a233cdb6a3 100644
--- a/src/theme/iplastic.js
+++ b/src/theme/iplastic.js
@@ -1,6 +1,6 @@
 exports.isDark = false;
 exports.cssClass = "ace-iplastic";
-exports.cssText = require("./iplastic.css");
+exports.cssText = require("./iplastic-css");
 
 var dom = require("../lib/dom");
 dom.importCssString(exports.cssText, exports.cssClass, false);
diff --git a/src/theme/katzenmilch.css.js b/src/theme/katzenmilch-css.js
similarity index 100%
rename from src/theme/katzenmilch.css.js
rename to src/theme/katzenmilch-css.js
diff --git a/src/theme/katzenmilch.js b/src/theme/katzenmilch.js
index 83209a77ac..fc59956435 100644
--- a/src/theme/katzenmilch.js
+++ b/src/theme/katzenmilch.js
@@ -1,6 +1,6 @@
 exports.isDark = false;
 exports.cssClass = "ace-katzenmilch";
-exports.cssText = require("./katzenmilch.css");
+exports.cssText = require("./katzenmilch-css");
 
 var dom = require("../lib/dom");
 dom.importCssString(exports.cssText, exports.cssClass, false);
diff --git a/src/theme/kr_theme.css.js b/src/theme/kr_theme-css.js
similarity index 100%
rename from src/theme/kr_theme.css.js
rename to src/theme/kr_theme-css.js
diff --git a/src/theme/kr_theme.js b/src/theme/kr_theme.js
index ae8f0f927c..573a9fd6e1 100644
--- a/src/theme/kr_theme.js
+++ b/src/theme/kr_theme.js
@@ -1,6 +1,6 @@
 exports.isDark = true;
 exports.cssClass = "ace-kr-theme";
-exports.cssText = require("./kr_theme.css");
+exports.cssText = require("./kr_theme-css");
 
 var dom = require("../lib/dom");
 dom.importCssString(exports.cssText, exports.cssClass, false);
diff --git a/src/theme/kuroir.css.js b/src/theme/kuroir-css.js
similarity index 100%
rename from src/theme/kuroir.css.js
rename to src/theme/kuroir-css.js
diff --git a/src/theme/kuroir.js b/src/theme/kuroir.js
index 76f6408b4a..a4fbeaf7e9 100644
--- a/src/theme/kuroir.js
+++ b/src/theme/kuroir.js
@@ -1,6 +1,6 @@
 exports.isDark = false;
 exports.cssClass = "ace-kuroir";
-exports.cssText = require("./kuroir.css");
+exports.cssText = require("./kuroir-css");
 
 var dom = require("../lib/dom");
 dom.importCssString(exports.cssText, exports.cssClass, false);
diff --git a/src/theme/merbivore.css.js b/src/theme/merbivore-css.js
similarity index 100%
rename from src/theme/merbivore.css.js
rename to src/theme/merbivore-css.js
diff --git a/src/theme/merbivore.js b/src/theme/merbivore.js
index c758c9a798..5d867378bb 100644
--- a/src/theme/merbivore.js
+++ b/src/theme/merbivore.js
@@ -1,6 +1,6 @@
 exports.isDark = true;
 exports.cssClass = "ace-merbivore";
-exports.cssText = require("./merbivore.css");
+exports.cssText = require("./merbivore-css");
 
 var dom = require("../lib/dom");
 dom.importCssString(exports.cssText, exports.cssClass, false);
diff --git a/src/theme/merbivore_soft.css.js b/src/theme/merbivore_soft-css.js
similarity index 100%
rename from src/theme/merbivore_soft.css.js
rename to src/theme/merbivore_soft-css.js
diff --git a/src/theme/merbivore_soft.js b/src/theme/merbivore_soft.js
index 4e2b32a236..e31ffd2b7e 100644
--- a/src/theme/merbivore_soft.js
+++ b/src/theme/merbivore_soft.js
@@ -1,6 +1,6 @@
 exports.isDark = true;
 exports.cssClass = "ace-merbivore-soft";
-exports.cssText = require("./merbivore_soft.css");
+exports.cssText = require("./merbivore_soft-css");
 
 var dom = require("../lib/dom");
 dom.importCssString(exports.cssText, exports.cssClass, false);
diff --git a/src/theme/mono_industrial.css.js b/src/theme/mono_industrial-css.js
similarity index 100%
rename from src/theme/mono_industrial.css.js
rename to src/theme/mono_industrial-css.js
diff --git a/src/theme/mono_industrial.js b/src/theme/mono_industrial.js
index d44352471d..d0b6572817 100644
--- a/src/theme/mono_industrial.js
+++ b/src/theme/mono_industrial.js
@@ -1,6 +1,6 @@
 exports.isDark = true;
 exports.cssClass = "ace-mono-industrial";
-exports.cssText = require("./mono_industrial.css");
+exports.cssText = require("./mono_industrial-css");
 
 var dom = require("../lib/dom");
 dom.importCssString(exports.cssText, exports.cssClass, false);
diff --git a/src/theme/monokai.css.js b/src/theme/monokai-css.js
similarity index 100%
rename from src/theme/monokai.css.js
rename to src/theme/monokai-css.js
diff --git a/src/theme/monokai.js b/src/theme/monokai.js
index 41ea5c4211..7477167672 100644
--- a/src/theme/monokai.js
+++ b/src/theme/monokai.js
@@ -1,6 +1,6 @@
 exports.isDark = true;
 exports.cssClass = "ace-monokai";
-exports.cssText = require("./monokai.css");
+exports.cssText = require("./monokai-css");
 
 var dom = require("../lib/dom");
 dom.importCssString(exports.cssText, exports.cssClass, false);
diff --git a/src/theme/nord_dark.css.js b/src/theme/nord_dark-css.js
similarity index 100%
rename from src/theme/nord_dark.css.js
rename to src/theme/nord_dark-css.js
diff --git a/src/theme/nord_dark.js b/src/theme/nord_dark.js
index b0331c7fc4..e014fd8e16 100644
--- a/src/theme/nord_dark.js
+++ b/src/theme/nord_dark.js
@@ -1,6 +1,6 @@
 exports.isDark = true;
 exports.cssClass = "ace-nord-dark";
-exports.cssText = require("./nord_dark.css");
+exports.cssText = require("./nord_dark-css");
 exports.$selectionColorConflict = true;
 
 var dom = require("../lib/dom");
diff --git a/src/theme/one_dark.css.js b/src/theme/one_dark-css.js
similarity index 100%
rename from src/theme/one_dark.css.js
rename to src/theme/one_dark-css.js
diff --git a/src/theme/one_dark.js b/src/theme/one_dark.js
index bb2617bf43..3fd6fd61c4 100644
--- a/src/theme/one_dark.js
+++ b/src/theme/one_dark.js
@@ -1,6 +1,6 @@
 exports.isDark = true;
     exports.cssClass = "ace-one-dark";
-    exports.cssText = require("./one_dark.css");
+    exports.cssText = require("./one_dark-css");
     
     var dom = require("../lib/dom");
     dom.importCssString(exports.cssText, exports.cssClass, false);
diff --git a/src/theme/pastel_on_dark.css.js b/src/theme/pastel_on_dark-css.js
similarity index 100%
rename from src/theme/pastel_on_dark.css.js
rename to src/theme/pastel_on_dark-css.js
diff --git a/src/theme/pastel_on_dark.js b/src/theme/pastel_on_dark.js
index 07ecd76321..936aea78be 100644
--- a/src/theme/pastel_on_dark.js
+++ b/src/theme/pastel_on_dark.js
@@ -1,6 +1,6 @@
 exports.isDark = true;
 exports.cssClass = "ace-pastel-on-dark";
-exports.cssText = require("./pastel_on_dark.css");
+exports.cssText = require("./pastel_on_dark-css");
 
 var dom = require("../lib/dom");
 dom.importCssString(exports.cssText, exports.cssClass, false);
diff --git a/src/theme/solarized_dark.css.js b/src/theme/solarized_dark-css.js
similarity index 100%
rename from src/theme/solarized_dark.css.js
rename to src/theme/solarized_dark-css.js
diff --git a/src/theme/solarized_dark.js b/src/theme/solarized_dark.js
index 52ba6001eb..ec7b64ac81 100644
--- a/src/theme/solarized_dark.js
+++ b/src/theme/solarized_dark.js
@@ -1,6 +1,6 @@
 exports.isDark = true;
 exports.cssClass = "ace-solarized-dark";
-exports.cssText = require("./solarized_dark.css");
+exports.cssText = require("./solarized_dark-css");
 
 var dom = require("../lib/dom");
 dom.importCssString(exports.cssText, exports.cssClass, false);
diff --git a/src/theme/solarized_light.css.js b/src/theme/solarized_light-css.js
similarity index 100%
rename from src/theme/solarized_light.css.js
rename to src/theme/solarized_light-css.js
diff --git a/src/theme/solarized_light.js b/src/theme/solarized_light.js
index ab9cfb210d..e189700784 100644
--- a/src/theme/solarized_light.js
+++ b/src/theme/solarized_light.js
@@ -1,6 +1,6 @@
 exports.isDark = false;
 exports.cssClass = "ace-solarized-light";
-exports.cssText = require("./solarized_light.css");
+exports.cssText = require("./solarized_light-css");
 
 var dom = require("../lib/dom");
 dom.importCssString(exports.cssText, exports.cssClass, false);
diff --git a/src/theme/sqlserver.css.js b/src/theme/sqlserver-css.js
similarity index 100%
rename from src/theme/sqlserver.css.js
rename to src/theme/sqlserver-css.js
diff --git a/src/theme/sqlserver.js b/src/theme/sqlserver.js
index bca6bb7dde..38bdd5dcd9 100644
--- a/src/theme/sqlserver.js
+++ b/src/theme/sqlserver.js
@@ -1,6 +1,6 @@
 exports.isDark = false;
 exports.cssClass = "ace-sqlserver";
-exports.cssText = require("./sqlserver.css");
+exports.cssText = require("./sqlserver-css");
 
 var dom = require("../lib/dom");
 dom.importCssString(exports.cssText, exports.cssClass, false);
diff --git a/src/theme/terminal.css.js b/src/theme/terminal-css.js
similarity index 100%
rename from src/theme/terminal.css.js
rename to src/theme/terminal-css.js
diff --git a/src/theme/terminal.js b/src/theme/terminal.js
index 2f69d4ba53..b857bc956f 100644
--- a/src/theme/terminal.js
+++ b/src/theme/terminal.js
@@ -1,6 +1,6 @@
 exports.isDark = true;
 exports.cssClass = "ace-terminal-theme";
-exports.cssText = require("./terminal.css");
+exports.cssText = require("./terminal-css");
 
 var dom = require("../lib/dom");
 dom.importCssString(exports.cssText, exports.cssClass, false);
diff --git a/src/theme/textmate.css.js b/src/theme/textmate-css.js
similarity index 100%
rename from src/theme/textmate.css.js
rename to src/theme/textmate-css.js
diff --git a/src/theme/textmate.js b/src/theme/textmate.js
index c96d55b60e..37285fefd3 100644
--- a/src/theme/textmate.js
+++ b/src/theme/textmate.js
@@ -2,7 +2,7 @@
 
 exports.isDark = false;
 exports.cssClass = "ace-tm";
-exports.cssText = require("./textmate.css");
+exports.cssText = require("./textmate-css");
 exports.$id = "ace/theme/textmate";
 
 var dom = require("../lib/dom");
diff --git a/src/theme/tomorrow.css.js b/src/theme/tomorrow-css.js
similarity index 100%
rename from src/theme/tomorrow.css.js
rename to src/theme/tomorrow-css.js
diff --git a/src/theme/tomorrow.js b/src/theme/tomorrow.js
index 9853c82333..35ece40f83 100644
--- a/src/theme/tomorrow.js
+++ b/src/theme/tomorrow.js
@@ -1,6 +1,6 @@
 exports.isDark = false;
 exports.cssClass = "ace-tomorrow";
-exports.cssText = require("./tomorrow.css");
+exports.cssText = require("./tomorrow-css");
 
 var dom = require("../lib/dom");
 dom.importCssString(exports.cssText, exports.cssClass, false);
diff --git a/src/theme/tomorrow_night.css.js b/src/theme/tomorrow_night-css.js
similarity index 100%
rename from src/theme/tomorrow_night.css.js
rename to src/theme/tomorrow_night-css.js
diff --git a/src/theme/tomorrow_night.js b/src/theme/tomorrow_night.js
index 679fa2b9f8..caa3c8f040 100644
--- a/src/theme/tomorrow_night.js
+++ b/src/theme/tomorrow_night.js
@@ -1,6 +1,6 @@
 exports.isDark = true;
 exports.cssClass = "ace-tomorrow-night";
-exports.cssText = require("./tomorrow_night.css");
+exports.cssText = require("./tomorrow_night-css");
 
 var dom = require("../lib/dom");
 dom.importCssString(exports.cssText, exports.cssClass, false);
diff --git a/src/theme/tomorrow_night_blue.css.js b/src/theme/tomorrow_night_blue-css.js
similarity index 100%
rename from src/theme/tomorrow_night_blue.css.js
rename to src/theme/tomorrow_night_blue-css.js
diff --git a/src/theme/tomorrow_night_blue.js b/src/theme/tomorrow_night_blue.js
index bae7f32119..68b29e77da 100644
--- a/src/theme/tomorrow_night_blue.js
+++ b/src/theme/tomorrow_night_blue.js
@@ -1,6 +1,6 @@
 exports.isDark = true;
 exports.cssClass = "ace-tomorrow-night-blue";
-exports.cssText = require("./tomorrow_night_blue.css");
+exports.cssText = require("./tomorrow_night_blue-css");
 
 var dom = require("../lib/dom");
 dom.importCssString(exports.cssText, exports.cssClass, false);
diff --git a/src/theme/tomorrow_night_bright.css.js b/src/theme/tomorrow_night_bright-css.js
similarity index 100%
rename from src/theme/tomorrow_night_bright.css.js
rename to src/theme/tomorrow_night_bright-css.js
diff --git a/src/theme/tomorrow_night_bright.js b/src/theme/tomorrow_night_bright.js
index e92ac6c901..dc88a67d86 100644
--- a/src/theme/tomorrow_night_bright.js
+++ b/src/theme/tomorrow_night_bright.js
@@ -1,6 +1,6 @@
 exports.isDark = true;
 exports.cssClass = "ace-tomorrow-night-bright";
-exports.cssText = require("./tomorrow_night_bright.css");
+exports.cssText = require("./tomorrow_night_bright-css");
 
 var dom = require("../lib/dom");
 dom.importCssString(exports.cssText, exports.cssClass, false);
diff --git a/src/theme/tomorrow_night_eighties.css.js b/src/theme/tomorrow_night_eighties-css.js
similarity index 100%
rename from src/theme/tomorrow_night_eighties.css.js
rename to src/theme/tomorrow_night_eighties-css.js
diff --git a/src/theme/tomorrow_night_eighties.js b/src/theme/tomorrow_night_eighties.js
index 9607e2a733..a132ee52a3 100644
--- a/src/theme/tomorrow_night_eighties.js
+++ b/src/theme/tomorrow_night_eighties.js
@@ -1,6 +1,6 @@
 exports.isDark = true;
 exports.cssClass = "ace-tomorrow-night-eighties";
-exports.cssText = require("./tomorrow_night_eighties.css");
+exports.cssText = require("./tomorrow_night_eighties-css");
 
 var dom = require("../lib/dom");
 dom.importCssString(exports.cssText, exports.cssClass, false);
diff --git a/src/theme/twilight.css.js b/src/theme/twilight-css.js
similarity index 100%
rename from src/theme/twilight.css.js
rename to src/theme/twilight-css.js
diff --git a/src/theme/twilight.js b/src/theme/twilight.js
index 3f47f36360..9502d84223 100644
--- a/src/theme/twilight.js
+++ b/src/theme/twilight.js
@@ -1,6 +1,6 @@
 exports.isDark = true;
 exports.cssClass = "ace-twilight";
-exports.cssText = require("./twilight.css");
+exports.cssText = require("./twilight-css");
 
 var dom = require("../lib/dom");
 dom.importCssString(exports.cssText, exports.cssClass, false);
diff --git a/src/theme/vibrant_ink.css.js b/src/theme/vibrant_ink-css.js
similarity index 100%
rename from src/theme/vibrant_ink.css.js
rename to src/theme/vibrant_ink-css.js
diff --git a/src/theme/vibrant_ink.js b/src/theme/vibrant_ink.js
index 27f4b93fb6..ec155f75a4 100644
--- a/src/theme/vibrant_ink.js
+++ b/src/theme/vibrant_ink.js
@@ -1,6 +1,6 @@
 exports.isDark = true;
 exports.cssClass = "ace-vibrant-ink";
-exports.cssText = require("./vibrant_ink.css");
+exports.cssText = require("./vibrant_ink-css");
 
 var dom = require("../lib/dom");
 dom.importCssString(exports.cssText, exports.cssClass, false);
diff --git a/src/theme/xcode.css.js b/src/theme/xcode-css.js
similarity index 100%
rename from src/theme/xcode.css.js
rename to src/theme/xcode-css.js
diff --git a/src/theme/xcode.js b/src/theme/xcode.js
index 36615389ea..8f85701143 100644
--- a/src/theme/xcode.js
+++ b/src/theme/xcode.js
@@ -1,6 +1,6 @@
 exports.isDark = false;
 exports.cssClass = "ace-xcode";
-exports.cssText = require("./xcode.css");
+exports.cssText = require("./xcode-css");
 
 var dom = require("../lib/dom");
 dom.importCssString(exports.cssText, exports.cssClass, false);
diff --git a/src/virtual_renderer.js b/src/virtual_renderer.js
index b6b3baaa54..13f8581f8f 100644
--- a/src/virtual_renderer.js
+++ b/src/virtual_renderer.js
@@ -15,7 +15,7 @@ var VScrollBarCustom = require("./scrollbar_custom").VScrollBar;
 var RenderLoop = require("./renderloop").RenderLoop;
 var FontMetrics = require("./layer/font_metrics").FontMetrics;
 var EventEmitter = require("./lib/event_emitter").EventEmitter;
-var editorCss = require("./css/editor.css");
+var editorCss = require("./css/editor-css");
 var Decorator = require("./layer/decorators").Decorator;
 
 var useragent = require("./lib/useragent");