1 files changed, 14 insertions, 8 deletions
diff --git a/commands.js b/commands.js
index c360729b..d4613c12 100644
--- a/commands.js
+++ b/commands.js
@@ -117,9 +117,9 @@ function clearKeyMappingsAndSetDefaults() {
 
     "gi": "focusInput",
 
-    "f":     "activateLinkHintsMode",
-    "F":     "activateLinkHintsModeToOpenInNewTab",
-    "<a-f>": "activateLinkHintsModeWithQueue",
+    "f":     "linkHints.activateMode",
+    "F":     "linkHints.activateModeToOpenInNewTab",
+    "<a-f>": "linkHints.activateModeWithQueue",
 
     "/": "enterFindMode",
     "n": "performFind",
@@ -139,6 +139,9 @@ function clearKeyMappingsAndSetDefaults() {
     "x": "removeTab",
     "X": "restoreTab",
 
+    "b": "activateBookmarkFindMode",
+    "B": "activateBookmarkFindModeToOpenInNewTab",
+
     "gf": "nextFrame"
   };
 
@@ -175,9 +178,9 @@ var commandDescriptions = {
 
   focusInput: ["Focus the first (or n-th) text box on the page", { passCountToFunction: true }],
 
-  activateLinkHintsMode: ["Open a link in the current tab"],
-  activateLinkHintsModeToOpenInNewTab: ["Open a link in a new tab"],
-  activateLinkHintsModeWithQueue: ["Open multiple links in a new tab"],
+  'linkHints.activateMode': ["Open a link in the current tab"],
+  'linkHints.activateModeToOpenInNewTab': ["Open a link in a new tab"],
+  'linkHints.activateModeWithQueue': ["Open multiple links in a new tab"],
 
   enterFindMode: ["Enter find mode"],
   performFind: ["Cycle forward to the next find match"],
@@ -200,6 +203,9 @@ var commandDescriptions = {
   removeTab: ["Close current tab", { background: true }],
   restoreTab: ["Restore closed tab", { background: true }],
 
+  activateBookmarkFindMode: ["Open a bookmark in the current tab"],
+  activateBookmarkFindModeToOpenInNewTab: ["Open a bookmark in a new tab"],
+
   nextFrame: ["Cycle forward to the next frame on the page", { background: true, passCountToFunction: true }]
 };
 
@@ -216,7 +222,7 @@ var commandGroups = {
      "scrollPageUp", "scrollFullPageUp", "scrollFullPageDown",
      "reload", "toggleViewSource", "zoomIn", "zoomOut", "zoomReset", "copyCurrentUrl", "goUp",
      "enterInsertMode", "focusInput",
-     "activateLinkHintsMode", "activateLinkHintsModeToOpenInNewTab", "activateLinkHintsModeWithQueue",
+     "linkHints.activateMode", "linkHints.activateModeToOpenInNewTab", "linkHints.activateModeWithQueue",
      "goPrevious", "goNext", "nextFrame"],
   findCommands: ["enterFindMode", "performFind", "performBackwardsFind"],
   historyNavigation:
@@ -232,5 +238,5 @@ var commandGroups = {
 // from Vimium will uncover these gems.
 var advancedCommands = [
     "scrollToLeft", "scrollToRight",
-    "zoomReset", "goUp", "focusInput", "activateLinkHintsModeWithQueue",
+    "zoomReset", "goUp", "focusInput", "linkHints.activateModeWithQueue",
     "goPrevious", "goNext"];