diff --git a/src/ace/Editor.js b/src/ace/Editor.js
index a899c84c..f7fbc0be 100644
--- a/src/ace/Editor.js
+++ b/src/ace/Editor.js
@@ -861,7 +861,6 @@ var Editor = function(renderer, doc) {
         options = options || {};
         options.needle = needle;
         this.$search.set(options);
-        console.log("options: ", JSON.stringify(this.$search.$options));
         this.$find();
     },
 
diff --git a/src/ace/conf/keybindings/default_mac.js b/src/ace/conf/keybindings/default_mac.js
index 5036b19e..ad1c9f26 100644
--- a/src/ace/conf/keybindings/default_mac.js
+++ b/src/ace/conf/keybindings/default_mac.js
@@ -8,38 +8,39 @@
 require.def("ace/conf/keybindings/default_mac", function() {
 
 return {
-    "selectall": "Meta-A",
-    "removeline": "Meta-D",
-    "gotoline": "Meta-L",
-    "togglecomment": "Meta-7",
-    "findnext": "Meta-K",
-    "findprevious": "Meta-Shift-K",
-    "find": "Meta-F",
-    "undo": "Meta-Z",
-    "redo": "Meta-Shift-Z|Meta-Y",
+    "selectall": "Command-A",
+    "removeline": "Command-D",
+    "gotoline": "Command-L",
+    "togglecomment": "Command-7",
+    "findnext": "Command-K",
+    "findprevious": "Command-Shift-K",
+    "find": "Command-F",
+    "replace": "Command-R",
+    "undo": "Command-Z",
+    "redo": "Command-Shift-Z|Command-Y",
     "overwrite": "Insert",
-    "copylinesup": "Meta-Alt-Up",
-    "movelinesup": "Alt-Up",
-    "selecttostart": "Meta-Shift-Up",
-    "gotostart": "Meta-Home|Meta-Up",
+    "copylinesup": "Command-Option-Up",
+    "movelinesup": "Option-Up",
+    "selecttostart": "Command-Shift-Up",
+    "gotostart": "Command-Home|Command-Up",
     "selectup": "Shift-Up",
     "golineup": "Up",
-    "copylinesdown": "Meta-Alt-Down",
-    "movelinsedown": "Alt-Down",
-    "selecttoend": "Meta-Shift-Down",
-    "gotoend": "Meta-End|Meta-Down",
+    "copylinesdown": "Command-Option-Down",
+    "movelinsedown": "Option-Down",
+    "selecttoend": "Command-Shift-Down",
+    "gotoend": "Command-End|Command-Down",
     "selectdown": "Shift-Down",
     "godown": "Down",
-    "selectwordleft": "Alt-Shift-Left",
-    "gotowordleft": "Alt-Left",
-    "selecttolinestart": "Meta-Shift-Left",
-    "gotolinestart": "Meta-Left|Home",
+    "selectwordleft": "Option-Shift-Left",
+    "gotowordleft": "Option-Left",
+    "selecttolinestart": "Command-Shift-Left",
+    "gotolinestart": "Command-Left|Home",
     "selectleft": "Shift-Left",
     "gotoleft": "Left",
-    "selectwordright": "Alt-Shift-Right",
-    "gotowordright": "Alt-Right",
-    "selecttolineend": "Meta-Shift-Right",
-    "gotolineend": "Meta-Right|End",
+    "selectwordright": "Option-Shift-Right",
+    "gotowordright": "Option-Right",
+    "selecttolineend": "Command-Shift-Right",
+    "gotolineend": "Command-Right|End",
     "selectright": "Shift-Right",
     "gotoright": "Right",
     "selectpagedown": "Shift-PageDown",
diff --git a/src/ace/conf/keybindings/default_win.js b/src/ace/conf/keybindings/default_win.js
index 52d829f6..6bcb1960 100644
--- a/src/ace/conf/keybindings/default_win.js
+++ b/src/ace/conf/keybindings/default_win.js
@@ -8,38 +8,39 @@
 require.def("ace/conf/keybindings/default_win", function() {
 
 return {
-    "selectall": "Control-A",
-    "removeline": "Control-D",
-    "gotoline": "Control-L",
-    "togglecomment": "Control-7",
-    "findnext": "Control-K",
-    "findprevious": "Control-Shift-K",
-    "find": "Control-F",
-    "undo": "Control-Z",
-    "redo": "Control-Shift-Z|Control-Y",
+    "selectall": "Ctrl-A",
+    "removeline": "Ctrl-D",
+    "gotoline": "Ctrl-L",
+    "togglecomment": "Ctrl-7",
+    "findnext": "Ctrl-K",
+    "findprevious": "Ctrl-Shift-K",
+    "find": "Ctrl-F",
+    "replace": "Ctrl-R",
+    "undo": "Ctrl-Z",
+    "redo": "Ctrl-Shift-Z|Ctrl-Y",
     "overwrite": "Insert",
-    "copylinesup": "Control-Alt-Up",
+    "copylinesup": "Ctrl-Alt-Up",
     "movelinesup": "Alt-Up",
-    "selecttostart": "Control-Shift-Up",
-    "gotostart": "Control-Home|Control-Up",
+    "selecttostart": "Ctrl-Shift-Up",
+    "gotostart": "Ctrl-Home|Ctrl-Up",
     "selectup": "Shift-Up",
     "golineup": "Up",
-    "copylinesdown": "Control-Alt-Down",
+    "copylinesdown": "Ctrl-Alt-Down",
     "movelinsedown": "Alt-Down",
-    "selecttoend": "Control-Shift-Down",
-    "gotoend": "Control-End|Control-Down",
+    "selecttoend": "Ctrl-Shift-Down",
+    "gotoend": "Ctrl-End|Ctrl-Down",
     "selectdown": "Shift-Down",
     "godown": "Down",
     "selectwordleft": "Alt-Shift-Left",
     "gotowordleft": "Alt-Left",
-    "selecttolinestart": "Control-Shift-Left",
-    "gotolinestart": "Control-Left|Home",
+    "selecttolinestart": "Ctrl-Shift-Left",
+    "gotolinestart": "Ctrl-Left|Home",
     "selectleft": "Shift-Left",
     "gotoleft": "Left",
     "selectwordright": "Alt-Shift-Right",
     "gotowordright": "Alt-Right",
-    "selecttolineend": "Control-Shift-Right",
-    "gotolineend": "Control-Right|End",
+    "selecttolineend": "Ctrl-Shift-Right",
+    "gotolineend": "Ctrl-Right|End",
     "selectright": "Shift-Right",
     "gotoright": "Right",
     "selectpagedown": "Shift-PageDown",