diff --git a/.gitignore b/.gitignore
index ac005ae1..fa5a6480 100644
--- a/.gitignore
+++ b/.gitignore
@@ -68,6 +68,8 @@ plugins/c9.account.*/node_modules/
 
 test/selenium/notify/
 test/selenium/results/
+testresults
+cfresult
 
 .c9revisions
 .settings
diff --git a/local/index.html b/local/index.html
index 08375f35..6b2257c9 100644
--- a/local/index.html
+++ b/local/index.html
@@ -94,7 +94,7 @@
         /*::dev::*/ }
         
         // have to use this since new-instance windows have wrong root module path
-        var __dirname = unescape(document.baseURI).substr(
+        var __dirname = decodeURIComponent(document.baseURI).substr(
             "file://".length + (process.platform == "win32" ? 1 : 0)
         ).replace(/\/*$/, "/local");
         
@@ -109,7 +109,7 @@
 
         var server = require(__dirname + "/server.js");
         var windowManager = server.windowManager;
-        windowManager.registerWindow(win, unescape(/id=([^&#?=]+)/.exec(window.location)[1]));
+        windowManager.registerWindow(win, decodeURIComponent(/id=([^&#?=]+)/.exec(window.location)[1]));
         
         var performance = window.performance;
         var time = {
diff --git a/local/projectManager.html b/local/projectManager.html
index 07f77aa5..78bc0295 100644
--- a/local/projectManager.html
+++ b/local/projectManager.html
@@ -1,5 +1,6 @@
 <!doctype html>
 <html>
+    <meta charset="utf-8">
     <!-- Node.js Context -->
     <script>    
         var nwGui = require("nw.gui");
diff --git a/package.json b/package.json
index 225270e1..ca256afc 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.404",
+    "version": "3.1.409",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",
@@ -75,7 +75,7 @@
         "c9.automate": "#47e2c429c9",
         "c9.ide.ace.emmet": "#6dc4585e02",
         "c9.ide.ace.gotoline": "#a8ff07c8f4",
-        "c9.ide.ace.keymaps": "#2e3c6e3c8f",
+        "c9.ide.ace.keymaps": "#e8d5eedc37",
         "c9.ide.ace.repl": "#4b88a85b7b",
         "c9.ide.ace.split": "#0ae0151c78",
         "c9.ide.ace.statusbar": "#2155083cf6",