move background color to the root element

tool/package.json

@@ -3,7 +3,7 @@
     "version": "0.1.0",
     "dependencies": {
         "plist": "",
-        "css-parse": "",
-        "css-stringify": ""
+        "css-parse": "1.0.3",
+        "css-stringify": "1.0.3"
     }
 }

tool/theme.tmpl.css

@@ -10,11 +10,8 @@
   background: %printMargin%;
 }
 
-.%cssClass% .ace_scroller {
+.%cssClass% {
   background-color: %background%;
-}
-
-.%cssClass% .ace_text-layer {
   color: %foreground%;
 }
 

tool/tmtheme.js

@@ -248,7 +248,6 @@ var themes = {
     "solarized_dark": "Solarized-dark",
     "solarized_light": "Solarized-light",
     //"textmate": "Textmate (Mac Classic)",
-    "terminal": "Terminal"
     "tomorrow": "Tomorrow",
     "tomorrow_night": "Tomorrow-Night",
     "tomorrow_night_blue": "Tomorrow-Night-Blue",
@@ -256,7 +255,7 @@ var themes = {
     "tomorrow_night_eighties": "Tomorrow-Night-Eighties",
     "twilight": "Twilight",
     "vibrant_ink": "Vibrant Ink",
-    //"xcode": "Xcode_default"
+    "xcode": "Xcode_default"
 };
 
 function convertTheme(name) {
@@ -277,13 +276,6 @@ function convertTheme(name) {
                 i.replace(/^|\./g, ".ace_") + "{" + styles[i] + "}";
         }
 
-        var js = fillTemplate(jsTemplate, {
-            name: name,
-            css: 'require("../requirejs/text!./' + name + '.css")', // quoteString(css), //
-            cssClass: "ace-" + hyphenate(name),
-            isDark: styles.isDark
-        });
-
         // we're going to look for NEW rules in the parsed content only
         // if such a rule exists, add it to the destination file
         // this way, we preserve all hand-modified rules in the <theme>.css rules,
@@ -319,6 +311,13 @@ function convertTheme(name) {
             console.log("Creating new file: " +  name + ".css")
         }
         
+        var js = fillTemplate(jsTemplate, {
+            name: name,
+            css: 'require("../requirejs/text!./' + name + '.css")', // quoteString(css), //
+            cssClass: "ace-" + hyphenate(name),
+            isDark: styles.isDark
+        });
+
         fs.writeFileSync(__dirname + "/../lib/ace/theme/" + name + ".js", js);
         fs.writeFileSync(__dirname + "/../lib/ace/theme/" + name + ".css", css);
     })