diff --git a/lib/ace/css/editor.css b/lib/ace/css/editor.css
index 83bac531..4f32b905 100644
--- a/lib/ace/css/editor.css
+++ b/lib/ace/css/editor.css
@@ -4,6 +4,7 @@
     font-family: 'Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'source-code-pro', monospace;
     font-size: 12px;
     line-height: normal;
+    color: black;
 }
 
 .ace_scroller {
@@ -11,6 +12,7 @@
     overflow: hidden;
     top: 0;
     bottom: 0;
+    background-color: inherit;
 }
 
 .ace_content {
@@ -135,7 +137,6 @@
 }
 
 .ace_text-layer {
-    color: black;
     font: inherit !important;
 }
 
diff --git a/lib/ace/theme/ambiance.css b/lib/ace/theme/ambiance.css
index 524ad03a..c2ac69cf 100644
--- a/lib/ace/theme/ambiance.css
+++ b/lib/ace/theme/ambiance.css
@@ -51,15 +51,15 @@
 }
 
 .ace-ambiance .ace_scroller {
-  background-color: #202020;
   -webkit-box-shadow: inset 0 0 10px black;
   -moz-box-shadow: inset 0 0 10px black;
   -o-box-shadow: inset 0 0 10px black;
   box-shadow: inset 0 0 10px black;
 }
 
-.ace-ambiance .ace_text-layer {
+.ace-ambiance {
   color: #E6E1DC;
+  background-color: #202020;
 }
 
 .ace-ambiance .ace_cursor {
diff --git a/lib/ace/theme/chaos.css b/lib/ace/theme/chaos.css
index e45c95c7..f57e59b3 100644
--- a/lib/ace/theme/chaos.css
+++ b/lib/ace/theme/chaos.css
@@ -23,13 +23,11 @@
   right: 0;
   background: #1D1D1D;
 }
-.ace-chaos .ace_scroller {
+.ace-chaos {
   background-color: #161616;
-}
-.ace-chaos .ace_text-layer {
-  cursor: text;
   color: #E6E1DC;
 }
+
 .ace-chaos .ace_cursor {
   border-left: 2px solid #FFFFFF;
 }
diff --git a/lib/ace/theme/chrome.css b/lib/ace/theme/chrome.css
index 773c213c..e2bcb11d 100644
--- a/lib/ace/theme/chrome.css
+++ b/lib/ace/theme/chrome.css
@@ -9,7 +9,7 @@
   background: #e8e8e8;
 }
 
-.ace-chrome .ace_scroller {
+.ace-chrome {
   background-color: #FFFFFF;
 }
 
diff --git a/lib/ace/theme/clouds.css b/lib/ace/theme/clouds.css
index 4ff7e7c2..b89cc7c3 100644
--- a/lib/ace/theme/clouds.css
+++ b/lib/ace/theme/clouds.css
@@ -8,11 +8,8 @@
   background: #e8e8e8
 }
 
-.ace-clouds .ace_scroller {
-  background-color: #FFFFFF
-}
-
-.ace-clouds .ace_text-layer {
+.ace-clouds {
+  background-color: #FFFFFF;
   color: #000000
 }
 
diff --git a/lib/ace/theme/clouds.js b/lib/ace/theme/clouds.js
index f9b7c6bf..aa36edcf 100644
--- a/lib/ace/theme/clouds.js
+++ b/lib/ace/theme/clouds.js
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2010, Ajax.org B.V.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
diff --git a/lib/ace/theme/clouds_midnight.css b/lib/ace/theme/clouds_midnight.css
index 6bc319d1..5230db2e 100644
--- a/lib/ace/theme/clouds_midnight.css
+++ b/lib/ace/theme/clouds_midnight.css
@@ -8,11 +8,8 @@
   background: #232323
 }
 
-.ace-clouds-midnight .ace_scroller {
-  background-color: #191919
-}
-
-.ace-clouds-midnight .ace_text-layer {
+.ace-clouds-midnight{
+  background-color: #191919;
   color: #929292
 }
 
diff --git a/lib/ace/theme/clouds_midnight.js b/lib/ace/theme/clouds_midnight.js
index a7b76d65..e704d57c 100644
--- a/lib/ace/theme/clouds_midnight.js
+++ b/lib/ace/theme/clouds_midnight.js
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2010, Ajax.org B.V.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
diff --git a/lib/ace/theme/cobalt.css b/lib/ace/theme/cobalt.css
index 3717ba64..ec6dabd2 100644
--- a/lib/ace/theme/cobalt.css
+++ b/lib/ace/theme/cobalt.css
@@ -8,11 +8,8 @@
   background: #011e3a
 }
 
-.ace-cobalt .ace_scroller {
-  background-color: #002240
-}
-
-.ace-cobalt .ace_text-layer {
+.ace-cobalt {
+  background-color: #002240;
   color: #FFFFFF
 }
 
diff --git a/lib/ace/theme/cobalt.js b/lib/ace/theme/cobalt.js
index 6e2f3d0a..a466dd6c 100644
--- a/lib/ace/theme/cobalt.js
+++ b/lib/ace/theme/cobalt.js
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2010, Ajax.org B.V.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
diff --git a/lib/ace/theme/crimson_editor.css b/lib/ace/theme/crimson_editor.css
index 2d4a0eef..f8e9f653 100644
--- a/lib/ace/theme/crimson_editor.css
+++ b/lib/ace/theme/crimson_editor.css
@@ -14,11 +14,8 @@
   background: #e8e8e8;
 }
 
-.ace-crimson-editor .ace_scroller {
+.ace-crimson-editor {
   background-color: #FFFFFF;
-}
-
-.ace-crimson-editor .ace_text-layer {
   color: rgb(64, 64, 64);
 }
 
diff --git a/lib/ace/theme/dawn.css b/lib/ace/theme/dawn.css
index ca544fea..58f7f841 100644
--- a/lib/ace/theme/dawn.css
+++ b/lib/ace/theme/dawn.css
@@ -8,11 +8,8 @@
   background: #e8e8e8
 }
 
-.ace-dawn .ace_scroller {
-  background-color: #F9F9F9
-}
-
-.ace-dawn .ace_text-layer {
+.ace-dawn {
+  background-color: #F9F9F9;
   color: #080808
 }
 
diff --git a/lib/ace/theme/dawn.js b/lib/ace/theme/dawn.js
index f31f00b8..2498aa3b 100644
--- a/lib/ace/theme/dawn.js
+++ b/lib/ace/theme/dawn.js
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2010, Ajax.org B.V.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
diff --git a/lib/ace/theme/dreamweaver.css b/lib/ace/theme/dreamweaver.css
index 30f77cbf..a0b42806 100644
--- a/lib/ace/theme/dreamweaver.css
+++ b/lib/ace/theme/dreamweaver.css
@@ -8,7 +8,7 @@
   background: #e8e8e8;
 }
 
-.ace-dreamweaver .ace_scroller {
+.ace-dreamweaver {
   background-color: #FFFFFF;
 }
 
@@ -16,9 +16,6 @@
     background-color: #757AD8;
 }
 
-.ace-dreamweaver .ace_text-layer {
-}
-
 .ace-dreamweaver .ace_cursor {
   border-left: 2px solid black;
 }
diff --git a/lib/ace/theme/eclipse.css b/lib/ace/theme/eclipse.css
index 9a423e8d..b1c84a74 100644
--- a/lib/ace/theme/eclipse.css
+++ b/lib/ace/theme/eclipse.css
@@ -9,7 +9,7 @@
   background: #ebebeb;
 }
 
-.ace-eclipse .ace_scroller {
+.ace-eclipse {
   background-color: #FFFFFF;
 }
 
@@ -17,9 +17,6 @@
     background-color: rgb(60, 76, 114);
 }
 
-.ace-eclipse .ace_text-layer {
-}
-
 .ace-eclipse .ace_cursor {
   border-left: 2px solid black;
 }
diff --git a/lib/ace/theme/github.css b/lib/ace/theme/github.css
index 5b059727..318824da 100644
--- a/lib/ace/theme/github.css
+++ b/lib/ace/theme/github.css
@@ -5,8 +5,9 @@
   color: #AAA;
 }
 
-.ace-github .ace_scroller {
+.ace-github  {
   background: #fff;
+  color: #000;
 }
 
 .ace-github .ace_keyword {
@@ -63,9 +64,6 @@
   font-weight: bold;
 }
 
-.ace-github .ace_text-layer {
-}
-
 .ace-github .ace_cursor {
   border-left: 2px solid black;
 }
diff --git a/lib/ace/theme/idle_fingers.css b/lib/ace/theme/idle_fingers.css
index 43eff698..58ccca78 100644
--- a/lib/ace/theme/idle_fingers.css
+++ b/lib/ace/theme/idle_fingers.css
@@ -8,8 +8,9 @@
   background: #3b3b3b
 }
 
-.ace-idle-fingers .ace_scroller {
-  background-color: #323232
+.ace-idle-fingers {
+  background-color: #323232;
+  color: #FFFFFF
 }
 
 .ace-idle-fingers .ace_text-layer {
diff --git a/lib/ace/theme/idle_fingers.js b/lib/ace/theme/idle_fingers.js
index 5da497f0..096a2314 100644
--- a/lib/ace/theme/idle_fingers.js
+++ b/lib/ace/theme/idle_fingers.js
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2010, Ajax.org B.V.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
diff --git a/lib/ace/theme/kr_theme.css b/lib/ace/theme/kr_theme.css
index 0f42c384..32660e06 100644
--- a/lib/ace/theme/kr_theme.css
+++ b/lib/ace/theme/kr_theme.css
@@ -8,11 +8,8 @@
   background: #1c1917
 }
 
-.ace-kr-theme .ace_scroller {
-  background-color: #0B0A09
-}
-
-.ace-kr-theme .ace_text-layer {
+.ace-kr-theme {
+  background-color: #0B0A09;
   color: #FCFFE0
 }
 
diff --git a/lib/ace/theme/kr_theme.js b/lib/ace/theme/kr_theme.js
index 2018a962..fb6a5abe 100644
--- a/lib/ace/theme/kr_theme.js
+++ b/lib/ace/theme/kr_theme.js
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2010, Ajax.org B.V.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
diff --git a/lib/ace/theme/merbivore.css b/lib/ace/theme/merbivore.css
index 69e81376..f50d5124 100644
--- a/lib/ace/theme/merbivore.css
+++ b/lib/ace/theme/merbivore.css
@@ -8,11 +8,8 @@
   background: #555651
 }
 
-.ace-merbivore .ace_scroller {
-  background-color: #161616
-}
-
-.ace-merbivore .ace_text-layer {
+.ace-merbivore {
+  background-color: #161616;
   color: #E6E1DC
 }
 
diff --git a/lib/ace/theme/merbivore.js b/lib/ace/theme/merbivore.js
index 699fb2eb..9b29db1c 100644
--- a/lib/ace/theme/merbivore.js
+++ b/lib/ace/theme/merbivore.js
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2010, Ajax.org B.V.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
diff --git a/lib/ace/theme/merbivore_soft.css b/lib/ace/theme/merbivore_soft.css
index ddd417f8..315bbbf6 100644
--- a/lib/ace/theme/merbivore_soft.css
+++ b/lib/ace/theme/merbivore_soft.css
@@ -8,11 +8,8 @@
   background: #262424
 }
 
-.ace-merbivore-soft .ace_scroller {
-  background-color: #1C1C1C
-}
-
-.ace-merbivore-soft .ace_text-layer {
+.ace-merbivore-soft {
+  background-color: #1C1C1C;
   color: #E6E1DC
 }
 
diff --git a/lib/ace/theme/merbivore_soft.js b/lib/ace/theme/merbivore_soft.js
index 873a6023..c0ffd910 100644
--- a/lib/ace/theme/merbivore_soft.js
+++ b/lib/ace/theme/merbivore_soft.js
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2010, Ajax.org B.V.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
diff --git a/lib/ace/theme/mono_industrial.css b/lib/ace/theme/mono_industrial.css
index f9a318fc..9e3f2467 100644
--- a/lib/ace/theme/mono_industrial.css
+++ b/lib/ace/theme/mono_industrial.css
@@ -8,11 +8,8 @@
   background: #555651
 }
 
-.ace-mono-industrial .ace_scroller {
-  background-color: #222C28
-}
-
-.ace-mono-industrial .ace_text-layer {
+.ace-mono-industrial {
+  background-color: #222C28;
   color: #FFFFFF
 }
 
@@ -135,4 +132,4 @@
 
 .ace-mono-industrial .ace_indent-guide {
   background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNQ0tH4zzBz5sz/ABAOBECKH+evAAAAAElFTkSuQmCC) right repeat-y
-}
+}
\ No newline at end of file
diff --git a/lib/ace/theme/mono_industrial.js b/lib/ace/theme/mono_industrial.js
index af763292..cf0d0e48 100644
--- a/lib/ace/theme/mono_industrial.js
+++ b/lib/ace/theme/mono_industrial.js
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2010, Ajax.org B.V.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
diff --git a/lib/ace/theme/monokai.css b/lib/ace/theme/monokai.css
index 3514fdf6..f5f8ea63 100644
--- a/lib/ace/theme/monokai.css
+++ b/lib/ace/theme/monokai.css
@@ -8,11 +8,8 @@
   background: #555651
 }
 
-.ace-monokai .ace_scroller {
-  background-color: #272822
-}
-
-.ace-monokai .ace_text-layer {
+.ace-monokai {
+  background-color: #272822;
   color: #F8F8F2
 }
 
@@ -102,6 +99,7 @@
 
 .ace-monokai .ace_entity.ace_name.ace_function,
 .ace-monokai .ace_entity.ace_other,
+.ace-monokai .ace_entity.ace_other.ace_attribute-name,
 .ace-monokai .ace_variable {
   color: #A6E22E
 }
diff --git a/lib/ace/theme/monokai.js b/lib/ace/theme/monokai.js
index a33326bd..87d07786 100644
--- a/lib/ace/theme/monokai.js
+++ b/lib/ace/theme/monokai.js
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2010, Ajax.org B.V.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
diff --git a/lib/ace/theme/pastel_on_dark.css b/lib/ace/theme/pastel_on_dark.css
index b517f22a..537c04f0 100644
--- a/lib/ace/theme/pastel_on_dark.css
+++ b/lib/ace/theme/pastel_on_dark.css
@@ -8,11 +8,8 @@
   background: #353030
 }
 
-.ace-pastel-on-dark .ace_scroller {
-  background-color: #2C2828
-}
-
-.ace-pastel-on-dark .ace_text-layer {
+.ace-pastel-on-dark {
+  background-color: #2C2828;
   color: #8F938F
 }
 
diff --git a/lib/ace/theme/pastel_on_dark.js b/lib/ace/theme/pastel_on_dark.js
index 5c11fd4c..6eea03a4 100644
--- a/lib/ace/theme/pastel_on_dark.js
+++ b/lib/ace/theme/pastel_on_dark.js
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2010, Ajax.org B.V.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
diff --git a/lib/ace/theme/solarized_dark.css b/lib/ace/theme/solarized_dark.css
index 4d47fb76..2911e347 100644
--- a/lib/ace/theme/solarized_dark.css
+++ b/lib/ace/theme/solarized_dark.css
@@ -8,8 +8,9 @@
   background: #33555E
 }
 
-.ace-solarized-dark .ace_scroller {
-  background-color: #002B36
+.ace-solarized-dark {
+  background-color: #002B36;
+  color: #93A1A1
 }
 
 .ace-solarized-dark .ace_entity.ace_other.ace_attribute-name,
diff --git a/lib/ace/theme/solarized_dark.js b/lib/ace/theme/solarized_dark.js
index d7ad4f90..71812c28 100644
--- a/lib/ace/theme/solarized_dark.js
+++ b/lib/ace/theme/solarized_dark.js
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2010, Ajax.org B.V.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
diff --git a/lib/ace/theme/solarized_light.css b/lib/ace/theme/solarized_light.css
index 65dfe8df..22eb2de5 100644
--- a/lib/ace/theme/solarized_light.css
+++ b/lib/ace/theme/solarized_light.css
@@ -8,11 +8,8 @@
   background: #e8e8e8
 }
 
-.ace-solarized-light .ace_scroller {
-  background-color: #FDF6E3
-}
-
-.ace-solarized-light .ace_text-layer {
+.ace-solarized-light {
+  background-color: #FDF6E3;
   color: #586E75
 }
 
diff --git a/lib/ace/theme/solarized_light.js b/lib/ace/theme/solarized_light.js
index eda2c45c..35ec219e 100644
--- a/lib/ace/theme/solarized_light.js
+++ b/lib/ace/theme/solarized_light.js
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2010, Ajax.org B.V.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
diff --git a/lib/ace/theme/terminal.css b/lib/ace/theme/terminal.css
index a2d3a415..ffd93f36 100644
--- a/lib/ace/theme/terminal.css
+++ b/lib/ace/theme/terminal.css
@@ -8,11 +8,8 @@
   background: #1a1a1a
 }
 
-.ace-terminal-theme .ace_scroller {
+.ace-terminal-theme {
   background-color: black
-}
-
-.ace-terminal-theme .ace_text-layer {
   color: #DEDEDE
 }
 
diff --git a/lib/ace/theme/textmate.css b/lib/ace/theme/textmate.css
index 538700f2..eb657170 100644
--- a/lib/ace/theme/textmate.css
+++ b/lib/ace/theme/textmate.css
@@ -12,7 +12,7 @@
     background-color: #6B72E6;
 }
 
-.ace-tm .ace_scroller {
+.ace-tm {
   background-color: #FFFFFF;
 }
 
diff --git a/lib/ace/theme/tomorrow.css b/lib/ace/theme/tomorrow.css
index a5d88b6c..210b0e18 100644
--- a/lib/ace/theme/tomorrow.css
+++ b/lib/ace/theme/tomorrow.css
@@ -8,11 +8,9 @@
   background: #f6f6f6
 }
 
+.ace-tomorrow,
 .ace-tomorrow .ace_scroller {
-  background-color: #FFFFFF
-}
-
-.ace-tomorrow .ace_text-layer {
+  background-color: #FFFFFF;
   color: #4D4D4C
 }
 
diff --git a/lib/ace/theme/tomorrow.js b/lib/ace/theme/tomorrow.js
index 603c92a5..1f02d7d9 100644
--- a/lib/ace/theme/tomorrow.js
+++ b/lib/ace/theme/tomorrow.js
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2010, Ajax.org B.V.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
diff --git a/lib/ace/theme/tomorrow_night.css b/lib/ace/theme/tomorrow_night.css
index 0baaf323..c8041676 100644
--- a/lib/ace/theme/tomorrow_night.css
+++ b/lib/ace/theme/tomorrow_night.css
@@ -8,11 +8,8 @@
   background: #25282c
 }
 
-.ace-tomorrow-night .ace_scroller {
-  background-color: #1D1F21
-}
-
-.ace-tomorrow-night .ace_text-layer {
+.ace-tomorrow-night  {
+  background-color: #1D1F21;
   color: #C5C8C6
 }
 
diff --git a/lib/ace/theme/tomorrow_night.js b/lib/ace/theme/tomorrow_night.js
index 8a2454ea..e7137ffc 100644
--- a/lib/ace/theme/tomorrow_night.js
+++ b/lib/ace/theme/tomorrow_night.js
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2010, Ajax.org B.V.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
diff --git a/lib/ace/theme/tomorrow_night_blue.css b/lib/ace/theme/tomorrow_night_blue.css
index daebddb1..97613186 100644
--- a/lib/ace/theme/tomorrow_night_blue.css
+++ b/lib/ace/theme/tomorrow_night_blue.css
@@ -8,12 +8,12 @@
   background: #00204b
 }
 
-.ace-tomorrow-night-blue .ace_scroller {
-  background-color: #002451
+.ace-tomorrow-night-blue {
+  background-color: #002451;
+  color: #FFFFFF
 }
 
-.ace-tomorrow-night-blue .ace_constant.ace_other,
-.ace-tomorrow-night-blue .ace_text-layer {
+.ace-tomorrow-night-blue .ace_constant.ace_other {
   color: #FFFFFF
 }
 
diff --git a/lib/ace/theme/tomorrow_night_blue.js b/lib/ace/theme/tomorrow_night_blue.js
index dafd1f53..dcdf4adc 100644
--- a/lib/ace/theme/tomorrow_night_blue.js
+++ b/lib/ace/theme/tomorrow_night_blue.js
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2010, Ajax.org B.V.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
diff --git a/lib/ace/theme/tomorrow_night_bright.css b/lib/ace/theme/tomorrow_night_bright.css
index 065e2f00..01897b41 100644
--- a/lib/ace/theme/tomorrow_night_bright.css
+++ b/lib/ace/theme/tomorrow_night_bright.css
@@ -8,11 +8,8 @@
   background: #1a1a1a
 }
 
-.ace-tomorrow-night-bright .ace_scroller {
-  background-color: #000000
-}
-
-.ace-tomorrow-night-bright .ace_text-layer {
+.ace-tomorrow-night-bright {
+  background-color: #000000;
   color: #DEDEDE
 }
 
diff --git a/lib/ace/theme/tomorrow_night_bright.js b/lib/ace/theme/tomorrow_night_bright.js
index 12c961ef..4b285668 100644
--- a/lib/ace/theme/tomorrow_night_bright.js
+++ b/lib/ace/theme/tomorrow_night_bright.js
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2010, Ajax.org B.V.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
diff --git a/lib/ace/theme/tomorrow_night_eighties.css b/lib/ace/theme/tomorrow_night_eighties.css
index 5584d62d..9537e756 100644
--- a/lib/ace/theme/tomorrow_night_eighties.css
+++ b/lib/ace/theme/tomorrow_night_eighties.css
@@ -8,12 +8,12 @@
   background: #272727
 }
 
-.ace-tomorrow-night-eighties .ace_scroller {
-  background-color: #2D2D2D
+.ace-tomorrow-night-eighties {
+  background-color: #2D2D2D;
+  color: #CCCCCC
 }
 
-.ace-tomorrow-night-eighties .ace_constant.ace_other,
-.ace-tomorrow-night-eighties .ace_text-layer {
+.ace-tomorrow-night-eighties .ace_constant.ace_other {
   color: #CCCCCC
 }
 
diff --git a/lib/ace/theme/tomorrow_night_eighties.js b/lib/ace/theme/tomorrow_night_eighties.js
index fc2cd15c..9ac7be67 100644
--- a/lib/ace/theme/tomorrow_night_eighties.js
+++ b/lib/ace/theme/tomorrow_night_eighties.js
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2010, Ajax.org B.V.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
diff --git a/lib/ace/theme/twilight.css b/lib/ace/theme/twilight.css
index 3ef9de2e..b7c5ddba 100644
--- a/lib/ace/theme/twilight.css
+++ b/lib/ace/theme/twilight.css
@@ -8,11 +8,8 @@
   background: #232323
 }
 
-.ace-twilight .ace_scroller {
-  background-color: #141414
-}
-
-.ace-twilight .ace_text-layer {
+.ace-twilight {
+  background-color: #141414;
   color: #F8F8F8
 }
 
diff --git a/lib/ace/theme/twilight.js b/lib/ace/theme/twilight.js
index 216f09de..904f7ef6 100644
--- a/lib/ace/theme/twilight.js
+++ b/lib/ace/theme/twilight.js
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2010, Ajax.org B.V.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
diff --git a/lib/ace/theme/vibrant_ink.css b/lib/ace/theme/vibrant_ink.css
index c611681d..b34ae540 100644
--- a/lib/ace/theme/vibrant_ink.css
+++ b/lib/ace/theme/vibrant_ink.css
@@ -8,11 +8,8 @@
   background: #1a1a1a
 }
 
-.ace-vibrant-ink .ace_scroller {
-  background-color: #0F0F0F
-}
-
-.ace-vibrant-ink .ace_text-layer {
+.ace-vibrant-ink {
+  background-color: #0F0F0F;
   color: #FFFFFF
 }
 
diff --git a/lib/ace/theme/vibrant_ink.js b/lib/ace/theme/vibrant_ink.js
index b41b1d47..7156e5de 100644
--- a/lib/ace/theme/vibrant_ink.js
+++ b/lib/ace/theme/vibrant_ink.js
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2010, Ajax.org B.V.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
diff --git a/lib/ace/theme/xcode.css b/lib/ace/theme/xcode.css
index 463703b0..782a0837 100644
--- a/lib/ace/theme/xcode.css
+++ b/lib/ace/theme/xcode.css
@@ -10,11 +10,8 @@
   background: #e8e8e8
 }
 
-.ace-xcode .ace_scroller {
-  background-color: #FFFFFF
-}
-
-.ace-xcode .ace_text-layer {
+.ace-xcode {
+  background-color: #FFFFFF;
   color: #000000
 }
 
@@ -107,5 +104,5 @@
 }
 
 .ace-xcode .ace_indent-guide {
-  background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAE0lEQVQImWP4////f4bLly//BwAmVgd1/w11/gAAAABJRU5ErkJggg==) right repeat-y;
+  background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAE0lEQVQImWP4////f4bLly//BwAmVgd1/w11/gAAAABJRU5ErkJggg==) right repeat-y
 }
\ No newline at end of file
diff --git a/lib/ace/theme/xcode.js b/lib/ace/theme/xcode.js
index 19827338..e17d708d 100644
--- a/lib/ace/theme/xcode.js
+++ b/lib/ace/theme/xcode.js
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2010, Ajax.org B.V.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
diff --git a/tool/package.json b/tool/package.json
index a96e830d..2d33713a 100644
--- a/tool/package.json
+++ b/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"
     }
 }
diff --git a/tool/theme.tmpl.css b/tool/theme.tmpl.css
index 180132f2..58d16360 100644
--- a/tool/theme.tmpl.css
+++ b/tool/theme.tmpl.css
@@ -10,11 +10,8 @@
   background: %printMargin%;
 }
 
-.%cssClass% .ace_scroller {
+.%cssClass% {
   background-color: %background%;
-}
-
-.%cssClass% .ace_text-layer {
   color: %foreground%;
 }
 
diff --git a/tool/tmtheme.js b/tool/tmtheme.js
index 6c6416ff..7bfc07ea 100755
--- a/tool/tmtheme.js
+++ b/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);
     })