diff --git a/package.json b/package.json
index 2b67c1e8..048b64cd 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,7 @@
         "c9"
     ],
     "c9plugins": {
-        "c9.ide.language": "#f964d18f12",
+        "c9.ide.language": "#9ecb087000",
         "c9.ide.language.css": "#be07d72209",
         "c9.ide.language.generic": "#a4023db7f6",
         "c9.ide.language.html": "#22fdc74869",
@@ -67,10 +67,10 @@
         "c9.ide.language.javascript.tern": "#bf1072b11a",
         "c9.ide.language.javascript.infer": "#0561c69d67",
         "c9.ide.language.jsonalyzer": "#bf12af3d0a",
-        "c9.ide.collab": "#550ee7894a",
-        "c9.ide.local": "#a6e689e33b",
+        "c9.ide.collab": "#6a1d678a0c",
+        "c9.ide.local": "#ded0db8949",
         "c9.ide.find": "#e33fbaed2f",
-        "c9.ide.find.infiles": "#c3bf17286d",
+        "c9.ide.find.infiles": "#f0149b05ff",
         "c9.ide.find.replace": "#8cbce45290",
         "c9.ide.run.debug": "#7406555669",
         "c9.automate": "#47e2c429c9",
@@ -101,14 +101,14 @@
         "c9.ide.preview.browser": "#04760484d1",
         "c9.ide.preview.markdown": "#bc846e1562",
         "c9.ide.pubsub": "#a85fb27eca",
-        "c9.ide.readonly": "#e67bb593bd",
+        "c9.ide.readonly": "#f5121c3a57",
         "c9.ide.recentfiles": "#7c099abf40",
         "c9.ide.remote": "#301d2ab519",
         "c9.ide.processlist": "#2b12cd1bdd",
-        "c9.ide.run": "#1a5a660c44",
+        "c9.ide.run": "#aa78804818",
         "c9.ide.run.build": "#0598fff697",
         "c9.ide.run.debug.xdebug": "#9956689819",
-        "c9.ide.save": "#2de9fd7c2d",
+        "c9.ide.save": "#262a41aedc",
         "c9.ide.scm": "#ca3c94b84f",
         "c9.ide.terminal.monitor": "#1ccac33b0d",
         "c9.ide.test": "#a282ec1619",
diff --git a/plugins/c9.ide.dialog.common/confirm.js b/plugins/c9.ide.dialog.common/confirm.js
index 6c248a64..73f0ec93 100644
--- a/plugins/c9.ide.dialog.common/confirm.js
+++ b/plugins/c9.ide.dialog.common/confirm.js
@@ -27,6 +27,9 @@ define(function(require, module, exports) {
                 plugin.heading = options && options.isHTML ? header : util.escapeXml(header);
                 plugin.body = options && options.isHTML ? msg : util.escapeXml(msg).replace(/\n/g, "<br>");
                 
+                plugin.getElement("ok").setCaption(options.yes || options.ok || "OK");
+                plugin.getElement("cancel").setCaption(options.no || options.cancel || "Cancel");
+                
                 plugin.update([
                     { id: "ok", onclick: function(){ plugin.hide(); onconfirm(); } },
                     { id: "cancel", onclick: function(){ plugin.hide(); oncancel && oncancel(); } },
diff --git a/plugins/c9.ide.dialog.common/question.js b/plugins/c9.ide.dialog.common/question.js
index 4491b1e8..1314083b 100644
--- a/plugins/c9.ide.dialog.common/question.js
+++ b/plugins/c9.ide.dialog.common/question.js
@@ -40,6 +40,11 @@ define(function(require, module, exports) {
                 plugin.heading = options && options.isHTML ? header : util.escapeXml(header);
                 plugin.body = options && options.isHTML ? msg : util.escapeXml(msg).replace(/\n/g, "<br>");
                 
+                plugin.getElement("yes").setCaption(options.yes || options.ok || "Yes");
+                plugin.getElement("no").setCaption(options.no || options.cancel || "No");
+                plugin.getElement("yestoall").setCaption(options.yestoall || "Yes to All");
+                plugin.getElement("notoall").setCaption(options.notoall || "No to All");
+                
                 plugin.allowClose = cancel;
                 
                 var gotYesNo = false;
diff --git a/plugins/c9.ide.keys/editor.js b/plugins/c9.ide.keys/editor.js
index 654e7ddd..60d88662 100644
--- a/plugins/c9.ide.keys/editor.js
+++ b/plugins/c9.ide.keys/editor.js
@@ -186,7 +186,12 @@ define(function(require, exports, module) {
                                 settings.set("user/ace/@keyboardmode", "default");
                                 settings.set("user/key-bindings/@platform", "auto");
                                 commands.reset(false, true);
-                            }, function(){});
+                            },
+                            function(){},
+                            {
+                                yes: "Reset Settings",
+                                no: "Cancel"
+                            });
                     },
                     position: 90
                 },
diff --git a/plugins/c9.ide.preferences/general.js b/plugins/c9.ide.preferences/general.js
index d2293bb5..1d36976a 100644
--- a/plugins/c9.ide.preferences/general.js
+++ b/plugins/c9.ide.preferences/general.js
@@ -68,7 +68,8 @@ define(function(require, exports, module) {
                                     + "Cloud9 will return to it's original configuration", 
                                     function(){
                                         settings.reset();
-                                    }, function(){});
+                                    }, function(){},
+                                    { yes: "Reset settings", no: "Cancel" });
                             }
                         }
                     },
diff --git a/plugins/c9.ide.terminal/terminal.js b/plugins/c9.ide.terminal/terminal.js
index 9ae0d835..cbb4e66c 100644
--- a/plugins/c9.ide.terminal/terminal.js
+++ b/plugins/c9.ide.terminal/terminal.js
@@ -808,6 +808,10 @@ define(function(require, exports, module) {
                             },
                             function(){ // No
                                 // Do nothing
+                            },
+                            {
+                                yes: "Update",
+                                no: "Not now",
                             });
                     }
                 }
@@ -1002,7 +1006,7 @@ define(function(require, exports, module) {
                                 if (question.dontAsk)
                                     settings.set("user/terminal/noclosequestion", "true");
                             },
-                            { showDontAsk: true });
+                            { showDontAsk: true, yes: "Close", no: "Cancel" });
                         return false;
                     }
                 }, session);