diff --git a/demo/kitchen-sink/docs/c9search.c9search_results b/demo/kitchen-sink/docs/c9search.c9search_results
index bf0fdb87..0ad9ccd4 100644
--- a/demo/kitchen-sink/docs/c9search.c9search_results
+++ b/demo/kitchen-sink/docs/c9search.c9search_results
@@ -1,4 +1,4 @@
-Searching for 'var' in /workspace/configs
+Searching for 
var
 in
/.c9/metadata/workspace/plugins

regexp, case sensitive, whole word

 
 configs/default.js:
     1: var fs = require("fs");
diff --git a/lib/ace/mode/_test/tokens_c9search.json b/lib/ace/mode/_test/tokens_c9search.json
index 98052746..7b59deca 100644
--- a/lib/ace/mode/_test/tokens_c9search.json
+++ b/lib/ace/mode/_test/tokens_c9search.json
@@ -1,104 +1,130 @@
 [[
-   "start",
-  ["text","Searching for 'var' in /workspace/configs"]
+   ["start",{}],
+  ["text","Searching for '"],
+  ["text","var"],
+  ["text","' in"],
+  ["text"," /.c9/metadata/workspace/plugins "],
+  ["text","(regexp, case sensitive, whole word)"]
 ],[
-   "start"
+   ["start",{}]
 ],[
-   "start",
+   ["start",{}],
   ["string","configs/default.js"],
   ["text",":"]
 ],[
-   "start",
+   ["start",{}],
   ["c9searchresults.constant.numeric","    1"],
   ["c9searchresults.text",": "],
-  ["c9searchresults.text","var fs = require(\"fs\");"]
+  ["c9searchresults.keyword","var"],
+  ["c9searchresults.text"," fs = require(\"fs\");"]
 ],[
-   "start",
+   ["start",{}],
   ["c9searchresults.constant.numeric","\t2"],
   ["c9searchresults.text",": "],
-  ["c9searchresults.text","var argv = require('optimist').argv;"]
+  ["c9searchresults.keyword","var"],
+  ["c9searchresults.text"," argv = require('optimist').argv;"]
 ],[
-   "start",
+   ["start",{}],
   ["c9searchresults.constant.numeric","\t3"],
   ["c9searchresults.text",": "],
-  ["c9searchresults.text","var path = require(\"path\");"]
+  ["c9searchresults.keyword","var"],
+  ["c9searchresults.text"," path = require(\"path\");"]
 ],[
-   "start",
+   ["start",{}],
   ["c9searchresults.constant.numeric","\t5"],
   ["c9searchresults.text",": "],
-  ["c9searchresults.text","var clientExtensions = {};"]
+  ["c9searchresults.keyword","var"],
+  ["c9searchresults.text"," clientExtensions = {};"]
 ],[
-   "start",
+   ["start",{}],
   ["c9searchresults.constant.numeric","\t6"],
   ["c9searchresults.text",": "],
-  ["c9searchresults.text","var clientDirs = fs.readdirSync(__dirname + \"/../plugins-client\");"]
+  ["c9searchresults.keyword","var"],
+  ["c9searchresults.text"," clientDirs = fs.readdirSync(__dirname + \"/../plugins-client\");"]
 ],[
-   "start",
+   ["start",{}],
   ["c9searchresults.constant.numeric","\t7"],
   ["c9searchresults.text",": "],
-  ["c9searchresults.text","for (var i = 0; i < clientDirs.length; i++) {"]
+  ["c9searchresults.text","for ("],
+  ["c9searchresults.keyword","var"],
+  ["c9searchresults.text"," i = 0; i < clientDirs.length; i++) {"]
 ],[
-   "start",
+   ["start",{}],
   ["c9searchresults.constant.numeric","\t8"],
-  ["c9searchresults.text",":     "],
-  ["c9searchresults.text","var dir = clientDirs[i];"]
+  ["c9searchresults.text",": "],
+  ["c9searchresults.text","    "],
+  ["c9searchresults.keyword","var"],
+  ["c9searchresults.text"," dir = clientDirs[i];"]
 ],[
-   "start",
+   ["start",{}],
   ["c9searchresults.constant.numeric","\t12"],
-  ["c9searchresults.text",":     "],
-  ["c9searchresults.text","var name = dir.split(\".\")[1];"]
+  ["c9searchresults.text",": "],
+  ["c9searchresults.text","    "],
+  ["c9searchresults.keyword","var"],
+  ["c9searchresults.text"," name = dir.split(\".\")[1];"]
 ],[
-   "start",
+   ["start",{}],
   ["c9searchresults.constant.numeric","\t16"],
   ["c9searchresults.text",": "],
-  ["c9searchresults.text","var projectDir = (argv.w && path.resolve(process.cwd(), argv.w)) || process.cwd();"]
+  ["c9searchresults.keyword","var"],
+  ["c9searchresults.text"," projectDir = (argv.w && path.resolve(process.cwd(), argv.w)) || process.cwd();"]
 ],[
-   "start",
+   ["start",{}],
   ["c9searchresults.constant.numeric","\t17"],
   ["c9searchresults.text",": "],
-  ["c9searchresults.text","var fsUrl = \"/workspace\";"]
+  ["c9searchresults.keyword","var"],
+  ["c9searchresults.text"," fsUrl = \"/workspace\";"]
 ],[
-   "start",
+   ["start",{}],
   ["c9searchresults.constant.numeric","\t19"],
   ["c9searchresults.text",": "],
-  ["c9searchresults.text","var port = argv.p || process.env.PORT || 3131;"]
+  ["c9searchresults.keyword","var"],
+  ["c9searchresults.text"," port = argv.p || process.env.PORT || 3131;"]
 ],[
-   "start",
+   ["start",{}],
   ["c9searchresults.constant.numeric","\t20"],
   ["c9searchresults.text",": "],
-  ["c9searchresults.text","var host = argv.l || \"localhost\";"]
+  ["c9searchresults.keyword","var"],
+  ["c9searchresults.text"," host = argv.l || \"localhost\";"]
 ],[
-   "start",
+   ["start",{}],
   ["c9searchresults.constant.numeric","\t22"],
   ["c9searchresults.text",": "],
-  ["c9searchresults.text","var config = {"]
+  ["c9searchresults.keyword","var"],
+  ["c9searchresults.text"," config = {"]
 ],[
-   "start"
+   ["start",{}]
 ],[
-   "start",
+   ["start",{}],
   ["string","configs/local.js"],
   ["text",":"]
 ],[
-   "start",
+   ["start",{}],
   ["c9searchresults.constant.numeric","\t2"],
   ["c9searchresults.text",": "],
-  ["c9searchresults.text","var config = require(\"./default\");"]
+  ["c9searchresults.keyword","var"],
+  ["c9searchresults.text"," config = require(\"./default\");"]
 ],[
-   "start"
+   ["start",{}]
 ],[
-   "start",
+   ["start",{}],
   ["string","configs/packed.js"],
   ["text",":"]
 ],[
-   "start",
+   ["start",{}],
   ["c9searchresults.constant.numeric","\t1"],
   ["c9searchresults.text",": "],
-  ["c9searchresults.text","var config = require(\"./default\");"]
+  ["c9searchresults.keyword","var"],
+  ["c9searchresults.text"," config = require(\"./default\");"]
 ],[
-   "start"
+   ["start",{}]
 ],[
-   "start"
+   ["start",{}]
 ],[
-   "start",
-  ["text","Found 15 matches in 3 files"]
+   ["start",{}],
+  ["text","Found "],
+  ["constant.numeric","15"],
+  ["text"," matches in "],
+  ["constant.numeric","3"],
+  ["text"," files"]
 ]]
\ No newline at end of file