diff --git a/configs/client-default.js b/configs/client-default.js
index a01313ee..ef29d895 100644
--- a/configs/client-default.js
+++ b/configs/client-default.js
@@ -355,6 +355,8 @@ module.exports = function(options) {
         "plugins/c9.ide.run.debug/variables",
         "plugins/c9.ide.run.debug/watches",
         "plugins/c9.ide.run.debug/liveinspect",
+
+        "plugins/c9.ide.run.debug.xdebug/xdebug",
         
         // Console
         {
diff --git a/package.json b/package.json
index 107997a8..2e54d29f 100644
--- a/package.json
+++ b/package.json
@@ -65,7 +65,7 @@
         "c9.ide.find": "#989c06e6a7",
         "c9.ide.find.infiles": "#f98dfef554",
         "c9.ide.find.replace": "#e4daf722b8",
-        "c9.ide.run.debug": "#379e508be6",
+        "c9.ide.run.debug": "#5b3e30ce44",
         "c9.ide.ace.emmet": "#e5f1a92ac3",
         "c9.ide.ace.gotoline": "#4d1a93172c",
         "c9.ide.ace.keymaps": "#6c4bb65b1f",
@@ -81,7 +81,7 @@
         "c9.ide.format": "#4295dcca4d",
         "c9.ide.help.support": "#60e88f5680",
         "c9.ide.imgeditor": "#08bbc53578",
-        "c9.ide.immediate": "#e9ba147cc2",
+        "c9.ide.immediate": "#6845a93705",
         "c9.ide.installer": "#24e7d6f399",
         "c9.ide.mount": "#32e79866ee",
         "c9.ide.navigate": "#64156c7f4a",
@@ -94,7 +94,7 @@
         "c9.ide.readonly": "#f6f07bbe42",
         "c9.ide.recentfiles": "#7c099abf40",
         "c9.ide.remote": "#f531d62cfb",
-        "c9.ide.run": "#3349df7c52",
+        "c9.ide.run": "#dd21c8c310",
         "c9.ide.run.build": "#915e48b363",
         "c9.ide.save": "#a32a8f4346",
         "c9.ide.terminal.monitor": "#b0b4d03280",
diff --git a/plugins/c9.vfs.standalone/www/test.html b/plugins/c9.vfs.standalone/www/test.html
index 49578f7c..6df502d7 100644
--- a/plugins/c9.vfs.standalone/www/test.html
+++ b/plugins/c9.vfs.standalone/www/test.html
@@ -186,7 +186,7 @@
             tests = JSON.parse(tests);
             allFiles = tests.list.slice();
             
-            if (!files.length && location.href.slice(-1) == "?") {
+            if (!files.length && (location.search === "?" || location.search === "")) {
                 var disabled = tests.blacklist.slice().sort();
                 var enabled = tests.list.slice().sort();
                 var all = "<span style='font-size: 14px;'><a href='/static/test.html''>run all</a></span>";