diff --git a/.eslintrc b/.eslintrc
index e6595427..21a2ea9c 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,3 +1,6 @@
+ecmaFeatures:
+    jsx: true
+
 env:
     node: true
     browser: true
@@ -5,6 +8,7 @@ env:
     builtin: true
     mocha: true
     jasmine: false
+    es6: false
 
 rules:
     handle-callback-err: 1
diff --git a/package.json b/package.json
index 0a942d39..6bbf9ed8 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
         "emmet": "git://github.com/cloud9ide/emmet-core.git#2ff6dc06ad",
         "engine.io": "~1.5.1",
         "engine.io-client": "~1.5.1",
-        "eslint": "git://github.com/cloud9ide/eslint.git#e2d052aafd81ea0aa6d1d4fd9f88f3613e386160",
+        "eslint": "git://github.com/cloud9ide/eslint.git#dc500e81162bf0cb4747a4a415c121b0c46975cb",
         "http-error": "~0.0.5",
         "less": "^2.4.0",
         "mime": "~1.2.9",
@@ -49,17 +49,17 @@
     },
     "licenses": [],
     "c9plugins": {
-        "c9.ide.language": "#8ef952c6c2",
+        "c9.ide.language": "#77f75c7635",
         "c9.ide.language.css": "#ef8a28943e",
         "c9.ide.language.generic": "#32986699ac",
         "c9.ide.language.html": "#bbe81afed1",
         "c9.ide.language.html.diff": "#a7311cfc9f",
         "c9.ide.language.javascript": "#8479d0a9c1",
         "c9.ide.language.javascript.immediate": "#9a2cce9121",
-        "c9.ide.language.javascript.eslint": "#8832423ad1",
+        "c9.ide.language.javascript.eslint": "#129a16dafb",
         "c9.ide.language.javascript.tern": "#7aab8b0b6a",
         "c9.ide.language.javascript.infer": "#cfec494a3c",
-        "c9.ide.language.jsonalyzer": "#21b64e5820",
+        "c9.ide.language.jsonalyzer": "#dab3edfca5",
         "c9.ide.collab": "#da4d09ae6a",
         "c9.ide.local": "#2bfd7ff051",
         "c9.ide.find": "#6cc6d3379d",
diff --git a/plugins/c9.fs/mock/test_es6.js b/plugins/c9.fs/mock/test_es6.js
index dc01bb65..f73b6ab7 100644
--- a/plugins/c9.fs/mock/test_es6.js
+++ b/plugins/c9.fs/mock/test_es6.js
@@ -45,6 +45,10 @@ array;
 var qux = {left};
 qux;
 var {p,q} = { p: 1, q: 2};
+p;
+q;
+
+class Blie {}
 
 class Model extends Blie {
   constructor(properties) {
diff --git a/plugins/c9.ide.ace/ace.js b/plugins/c9.ide.ace/ace.js
index a06b159e..d8f6d7a0 100644
--- a/plugins/c9.ide.ace/ace.js
+++ b/plugins/c9.ide.ace/ace.js
@@ -149,7 +149,7 @@ define(function(require, exports, module) {
                 
                 // fixes a problem with Ace architect loading /lib/ace
                 // creating a conflict with themes
-                if (theme.isDark === undefined)
+                if (!theme || theme.isDark === undefined)
                     throw new Error();
             }
             catch (e) {