diff --git a/.gitignore b/.gitignore
index c127a8a1..04f175ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@
 .project
 .settings/
 .settings.xml
+.settings
 .c9settings.xml
 .c9revisions
 .settings.xml.old
diff --git a/demo/kitchen-sink/demo.js b/demo/kitchen-sink/demo.js
index 7e5b0f1e..76c89025 100644
--- a/demo/kitchen-sink/demo.js
+++ b/demo/kitchen-sink/demo.js
@@ -90,6 +90,7 @@ Mode.prototype.supportsFile = function(filename) {
 };
 
 var modesByName = {
+    c9search:   ["C9Search"     , "c9search_results"],
     coffee:     ["CoffeeScript" , "coffee|^Cakefile"],
     coldfusion: ["ColdFusion"   , "cfm"],
     csharp:     ["C#"           , "cs"],
@@ -167,6 +168,7 @@ function makeHuge(txt) {
 }
 
 var docs = {
+    "docs/c9search.c9search_results": "C9 Search Results",
     "docs/javascript.js": "JavaScript",
     "docs/plaintext.txt": {name: "Plain Text", prepare: makeHuge, wrapped: true},
     "docs/coffeescript.coffee": "Coffeescript",
diff --git a/demo/kitchen-sink/docs/c9search.c9search_results b/demo/kitchen-sink/docs/c9search.c9search_results
new file mode 100644
index 00000000..bf0fdb87
--- /dev/null
+++ b/demo/kitchen-sink/docs/c9search.c9search_results
@@ -0,0 +1,25 @@
+Searching for 'var' in /workspace/configs
+
+configs/default.js:
+    1: var fs = require("fs");
+	2: var argv = require('optimist').argv;
+	3: var path = require("path");
+	5: var clientExtensions = {};
+	6: var clientDirs = fs.readdirSync(__dirname + "/../plugins-client");
+	7: for (var i = 0; i < clientDirs.length; i++) {
+	8:     var dir = clientDirs[i];
+	12:     var name = dir.split(".")[1];
+	16: var projectDir = (argv.w && path.resolve(process.cwd(), argv.w)) || process.cwd();
+	17: var fsUrl = "/workspace";
+	19: var port = argv.p || process.env.PORT || 3131;
+	20: var host = argv.l || "localhost";
+	22: var config = {
+
+configs/local.js:
+	2: var config = require("./default");
+
+configs/packed.js:
+	1: var config = require("./default");
+
+
+Found 15 matches in 3 files
\ No newline at end of file
diff --git a/lib/ace/mode/c9search_highlight_rules.js b/lib/ace/mode/c9search_highlight_rules.js
index c16b48c0..f5aae9b2 100644
--- a/lib/ace/mode/c9search_highlight_rules.js
+++ b/lib/ace/mode/c9search_highlight_rules.js
@@ -48,7 +48,7 @@ var C9SearchHighlightRules = function() {
     this.$rules = {
         "start" : [
             {
-                token : ["constant.numeric", "text", "text"],
+                token : ["c9searchresults.constant.numeric", "c9searchresults.text", "c9searchresults.text"],
                 regex : "(^\\s+[0-9]+)(:\\s*)(.+)"
             },
             {
diff --git a/lib/ace/mode/folding/c9search.js b/lib/ace/mode/folding/c9search.js
index dd501153..406222b6 100644
--- a/lib/ace/mode/folding/c9search.js
+++ b/lib/ace/mode/folding/c9search.js
@@ -19,7 +19,7 @@
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
+ *      Garen J. Torikian <gjtorikian AT gmail DOT com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
diff --git a/lib/ace/theme/clouds.css b/lib/ace/theme/clouds.css
index e490c386..fd500e91 100644
--- a/lib/ace/theme/clouds.css
+++ b/lib/ace/theme/clouds.css
@@ -45,7 +45,7 @@
 }
 
 .ace-clouds .ace_marker-layer .ace_step {
-  background: rgb(255, 255, 0);
+  background: rgb(198, 219, 174);
 }
 
 .ace-clouds .ace_marker-layer .ace_bracket {
diff --git a/lib/ace/theme/clouds_midnight.css b/lib/ace/theme/clouds_midnight.css
index 69ed51db..94dac63d 100644
--- a/lib/ace/theme/clouds_midnight.css
+++ b/lib/ace/theme/clouds_midnight.css
@@ -45,7 +45,7 @@
 }
 
 .ace-clouds-midnight .ace_marker-layer .ace_step {
-  background: rgb(102, 82, 0);
+  background: rgb(198, 219, 174);
 }
 
 .ace-clouds-midnight .ace_marker-layer .ace_bracket {
diff --git a/lib/ace/theme/cobalt.css b/lib/ace/theme/cobalt.css
index 5c9a7328..cf7175b3 100644
--- a/lib/ace/theme/cobalt.css
+++ b/lib/ace/theme/cobalt.css
@@ -45,7 +45,7 @@
 }
 
 .ace-cobalt .ace_marker-layer .ace_step {
-  background: rgb(127, 111, 19);
+  background: rgb(198, 219, 174);
 }
 
 .ace-cobalt .ace_marker-layer .ace_bracket {
diff --git a/lib/ace/theme/dawn.css b/lib/ace/theme/dawn.css
index 85d48623..afdb0c19 100644
--- a/lib/ace/theme/dawn.css
+++ b/lib/ace/theme/dawn.css
@@ -45,7 +45,7 @@
 }
 
 .ace-dawn .ace_marker-layer .ace_step {
-  background: rgb(255, 255, 0);
+  background: rgb(198, 219, 174);
 }
 
 .ace-dawn .ace_marker-layer .ace_bracket {
diff --git a/lib/ace/theme/idle_fingers.css b/lib/ace/theme/idle_fingers.css
index 4ad6ff23..4de64c9a 100644
--- a/lib/ace/theme/idle_fingers.css
+++ b/lib/ace/theme/idle_fingers.css
@@ -45,7 +45,7 @@
 }
 
 .ace-idle-fingers .ace_marker-layer .ace_step {
-  background: rgb(102, 82, 0);
+  background: rgb(198, 219, 174);
 }
 
 .ace-idle-fingers .ace_marker-layer .ace_bracket {
diff --git a/lib/ace/theme/kr_theme.css b/lib/ace/theme/kr_theme.css
index aa6c2e37..797ee682 100644
--- a/lib/ace/theme/kr_theme.css
+++ b/lib/ace/theme/kr_theme.css
@@ -45,7 +45,7 @@
 }
 
 .ace-kr-theme .ace_marker-layer .ace_step {
-  background: rgb(102, 82, 0);
+  background: rgb(198, 219, 174);
 }
 
 .ace-kr-theme .ace_marker-layer .ace_bracket {
diff --git a/lib/ace/theme/merbivore.css b/lib/ace/theme/merbivore.css
index fe957fba..0db4d0ea 100644
--- a/lib/ace/theme/merbivore.css
+++ b/lib/ace/theme/merbivore.css
@@ -45,7 +45,7 @@
 }
 
 .ace-merbivore .ace_marker-layer .ace_step {
-  background: rgb(102, 82, 0);
+  background: rgb(198, 219, 174);
 }
 
 .ace-merbivore .ace_marker-layer .ace_bracket {
diff --git a/lib/ace/theme/merbivore_soft.css b/lib/ace/theme/merbivore_soft.css
index 4b7e91f2..0a108afa 100644
--- a/lib/ace/theme/merbivore_soft.css
+++ b/lib/ace/theme/merbivore_soft.css
@@ -45,7 +45,7 @@
 }
 
 .ace-merbivore-soft .ace_marker-layer .ace_step {
-  background: rgb(102, 82, 0);
+  background: rgb(198, 219, 174);
 }
 
 .ace-merbivore-soft .ace_marker-layer .ace_bracket {
diff --git a/lib/ace/theme/mono_industrial.css b/lib/ace/theme/mono_industrial.css
index 1e2d06ba..1ae5d8dc 100644
--- a/lib/ace/theme/mono_industrial.css
+++ b/lib/ace/theme/mono_industrial.css
@@ -45,7 +45,7 @@
 }
 
 .ace-mono-industrial .ace_marker-layer .ace_step {
-  background: rgb(102, 82, 0);
+  background: rgb(198, 219, 174);
 }
 
 .ace-mono-industrial .ace_marker-layer .ace_bracket {
diff --git a/lib/ace/theme/monokai.css b/lib/ace/theme/monokai.css
index 5597ab01..44f21589 100644
--- a/lib/ace/theme/monokai.css
+++ b/lib/ace/theme/monokai.css
@@ -8,8 +8,8 @@
 }
 
 .ace-monokai .ace_gutter {
-  background: #292a24;
-  color: #f1f1f1;
+  background: #e8e8e8;
+  color: #333;
 }
 
 .ace-monokai .ace_print_margin {
@@ -45,7 +45,7 @@
 }
 
 .ace-monokai .ace_marker-layer .ace_step {
-  background: rgb(102, 82, 0);
+  background: rgb(198, 219, 174);
 }
 
 .ace-monokai .ace_marker-layer .ace_bracket {
@@ -56,8 +56,9 @@
 .ace-monokai .ace_marker-layer .ace_active_line {
   background: #49483E;
 }
+
 .ace-monokai .ace_gutter_active_line {
-  background-color: #191916;
+  background-color : #dcdcdc;
 }
 
 .ace-monokai .ace_marker-layer .ace_selected_word {
diff --git a/lib/ace/theme/pastel_on_dark.css b/lib/ace/theme/pastel_on_dark.css
index fc5155a4..a16df458 100644
--- a/lib/ace/theme/pastel_on_dark.css
+++ b/lib/ace/theme/pastel_on_dark.css
@@ -45,7 +45,7 @@
 }
 
 .ace-pastel-on-dark .ace_marker-layer .ace_step {
-  background: rgb(102, 82, 0);
+  background: rgb(198, 219, 174);
 }
 
 .ace-pastel-on-dark .ace_marker-layer .ace_bracket {
diff --git a/lib/ace/theme/solarized_dark.css b/lib/ace/theme/solarized_dark.css
index 31eed2bd..7e40803b 100644
--- a/lib/ace/theme/solarized_dark.css
+++ b/lib/ace/theme/solarized_dark.css
@@ -8,8 +8,8 @@
 }
 
 .ace-solarized-dark .ace_gutter {
-  background: #09222b;
-  color: #d0edf7;
+  background: #e8e8e8;
+  color: #333;
 }
 
 .ace-solarized-dark .ace_print_margin {
@@ -45,7 +45,7 @@
 }
 
 .ace-solarized-dark .ace_marker-layer .ace_step {
-  background: rgb(102, 82, 0);
+  background: rgb(198, 219, 174);
 }
 
 .ace-solarized-dark .ace_marker-layer .ace_bracket {
@@ -58,7 +58,7 @@
 }
 
 .ace-solarized-dark .ace_gutter_active_line {
-  background-color: #0d3440;
+  background-color : #dcdcdc;
 }
 
 .ace-solarized-dark .ace_marker-layer .ace_selected_word {
diff --git a/lib/ace/theme/solarized_light.css b/lib/ace/theme/solarized_light.css
index cc1c8699..5d626b2c 100644
--- a/lib/ace/theme/solarized_light.css
+++ b/lib/ace/theme/solarized_light.css
@@ -45,7 +45,7 @@
 }
 
 .ace-solarized-light .ace_marker-layer .ace_step {
-  background: rgb(255, 255, 0);
+  background: rgb(198, 219, 174);
 }
 
 .ace-solarized-light .ace_marker-layer .ace_bracket {
diff --git a/lib/ace/theme/tomorrow.css b/lib/ace/theme/tomorrow.css
index 95c9c0d4..dbf541c7 100644
--- a/lib/ace/theme/tomorrow.css
+++ b/lib/ace/theme/tomorrow.css
@@ -45,7 +45,7 @@
 }
 
 .ace-tomorrow .ace_marker-layer .ace_step {
-  background: rgb(255, 255, 0);
+  background: rgb(198, 219, 174);
 }
 
 .ace-tomorrow .ace_marker-layer .ace_bracket {
diff --git a/lib/ace/theme/tomorrow_night.css b/lib/ace/theme/tomorrow_night.css
index 2e74d864..53c945c3 100644
--- a/lib/ace/theme/tomorrow_night.css
+++ b/lib/ace/theme/tomorrow_night.css
@@ -45,7 +45,7 @@
 }
 
 .ace-tomorrow-night .ace_marker-layer .ace_step {
-  background: rgb(102, 82, 0);
+  background: rgb(198, 219, 174);
 }
 
 .ace-tomorrow-night .ace_marker-layer .ace_bracket {
diff --git a/lib/ace/theme/tomorrow_night_blue.css b/lib/ace/theme/tomorrow_night_blue.css
index 10c58165..3cf6d532 100644
--- a/lib/ace/theme/tomorrow_night_blue.css
+++ b/lib/ace/theme/tomorrow_night_blue.css
@@ -8,8 +8,8 @@
 }
 
 .ace-tomorrow-night-blue .ace_gutter {
-  background: #022346;
-  color: #7388b5;
+  background: #e8e8e8;
+  color: #333;
 }
 
 .ace-tomorrow-night-blue .ace_print_margin {
@@ -45,7 +45,7 @@
 }
 
 .ace-tomorrow-night-blue .ace_marker-layer .ace_step {
-  background: rgb(127, 111, 19);
+  background: rgb(198, 219, 174);
 }
 
 .ace-tomorrow-night-blue .ace_marker-layer .ace_bracket {
@@ -58,7 +58,7 @@
 }
 
 .ace-tomorrow-night-blue .ace_gutter_active_line {
-  background-color: #022040;
+  background-color : #dcdcdc;
 }
 
 .ace-tomorrow-night-blue .ace_marker-layer .ace_selected_word {
diff --git a/lib/ace/theme/tomorrow_night_bright.css b/lib/ace/theme/tomorrow_night_bright.css
index 21a928be..36b71788 100644
--- a/lib/ace/theme/tomorrow_night_bright.css
+++ b/lib/ace/theme/tomorrow_night_bright.css
@@ -45,7 +45,7 @@
 }
 
 .ace-tomorrow-night-bright .ace_marker-layer .ace_step {
-  background: rgb(102, 82, 0);
+  background: rgb(198, 219, 174);
 }
 
 .ace-tomorrow-night-bright .ace_marker-layer .ace_bracket {
diff --git a/lib/ace/theme/tomorrow_night_eighties.css b/lib/ace/theme/tomorrow_night_eighties.css
index 93f2d3b6..702b67a3 100644
--- a/lib/ace/theme/tomorrow_night_eighties.css
+++ b/lib/ace/theme/tomorrow_night_eighties.css
@@ -45,7 +45,7 @@
 }
 
 .ace-tomorrow-night-eighties .ace_marker-layer .ace_step {
-  background: rgb(102, 82, 0);
+  background: rgb(198, 219, 174);
 }
 
 .ace-tomorrow-night-eighties .ace_marker-layer .ace_bracket {
diff --git a/lib/ace/theme/twilight.css b/lib/ace/theme/twilight.css
index 6d81e4a5..f2f536a9 100644
--- a/lib/ace/theme/twilight.css
+++ b/lib/ace/theme/twilight.css
@@ -45,7 +45,7 @@
 }
 
 .ace-twilight .ace_marker-layer .ace_step {
-  background: rgb(102, 82, 0);
+  background: rgb(198, 219, 174);
 }
 
 .ace-twilight .ace_marker-layer .ace_bracket {
diff --git a/lib/ace/theme/vibrant_ink.css b/lib/ace/theme/vibrant_ink.css
index 81c54d71..d0a091ba 100644
--- a/lib/ace/theme/vibrant_ink.css
+++ b/lib/ace/theme/vibrant_ink.css
@@ -45,7 +45,7 @@
 }
 
 .ace-vibrant-ink .ace_marker-layer .ace_step {
-  background: rgb(102, 82, 0);
+  background: rgb(198, 219, 174);
 }
 
 .ace-vibrant-ink .ace_marker-layer .ace_bracket {
diff --git a/tool/tmtheme.js b/tool/tmtheme.js
index d56cf766..19839899 100755
--- a/tool/tmtheme.js
+++ b/tool/tmtheme.js
@@ -32,6 +32,8 @@ var supportedScopes = {
    "function": "function",
    "function.buildin": "function.buildin",
 
+   "c9searchresults": "c9searchresults",
+   
    "storage": "storage",
    "storage.type": "storage.type",