From 05d60dba54f3d56c62855946a7a21bc97389f6a1 Mon Sep 17 00:00:00 2001
From: Simon Lydell <simon.lydell@gmail.com>
Date: Sat, 24 Jan 2015 16:41:38 +0100
Subject: [PATCH] Improve markable elements matching

- Each 'f' command now gets its own set of markable elements. For example, it
  does not make sense to open a button in a new tab.
- The above made it really easy to fix #227: Add 'gf' to follow link in new
  foreground/focused tab.
- Links are now opened in new tabs using Firefox APIs instead of simulating
  ctrl-clicks on the links. This is more reliable (and required in order to
  implement the above point).
- XPath is no longer used. Instead, every element in every frame of the page is
  checked with code. This might sound expensive, but it isn't since that's what
  the XPath matcher needs to do behind the scenes anyway. The benefit of doing
  it with code is that we can do more advanced checks (see below), and no
  information is lost along the way: For example, whether or not an element is
  considered "semantic" is saved, instead of needing to be re-calculated
  afterwards.
- The above fixes #320 in a better way than what was already done in commit
  016574212: Elements that have "button" in their class now must not contain an
  `<a>` or `<button>` element, so a marker for a "button-wrapper" is likely not
  even made and therefore cannot cover the real button inside.
- The above also significantly reduced the number of hints on reddit.com, which
  made the all hints shorter.
- While at it, I implemented #450: 'vf' now selects the contents of text inputs.
---
 extension/lib/commands.coffee           | 229 ++++++++++++++++--------
 extension/lib/hints.coffee              |  58 +++---
 extension/lib/marker.coffee             |   6 +-
 extension/lib/modes.coffee              |  31 +++-
 extension/lib/utils.coffee              | 132 +++-----------
 extension/locale/de/vimfx.properties    |   7 +-
 extension/locale/el-GR/vimfx.properties |   7 +-
 extension/locale/en-US/vimfx.properties |   7 +-
 extension/locale/hu/vimfx.properties    |   7 +-
 extension/locale/id/vimfx.properties    |   7 +-
 extension/locale/it/vimfx.properties    |   7 +-
 extension/locale/ja/vimfx.properties    |   7 +-
 extension/locale/nl/vimfx.properties    |   7 +-
 extension/locale/pl/vimfx.properties    |   7 +-
 extension/locale/ru/vimfx.properties    |   7 +-
 extension/locale/sv-SE/vimfx.properties |   9 +-
 extension/locale/zh-CN/vimfx.properties |   7 +-
 extension/locale/zh-TW/vimfx.properties |   7 +-
 extension/resources/style.css           |   3 +-
 19 files changed, 287 insertions(+), 265 deletions(-)

diff --git a/extension/lib/commands.coffee b/extension/lib/commands.coffee
index 32b78ed..d12247a 100644
--- a/extension/lib/commands.coffee
+++ b/extension/lib/commands.coffee
@@ -19,15 +19,18 @@
 # along with VimFx.  If not, see <http://www.gnu.org/licenses/>.
 ###
 
-notation = require('vim-like-key-notation')
-legacy   = require('./legacy')
-utils    = require('./utils')
-help     = require('./help')
-_        = require('./l10n')
+notation   = require('vim-like-key-notation')
+{ Marker } = require('./marker')
+legacy     = require('./legacy')
+utils      = require('./utils')
+help       = require('./help')
+_          = require('./l10n')
 { getPref
 , setPref
 , isPrefSet } = require('./prefs')
 
+{ isProperLink, isTextInputElement, isContentEditable } = utils
+
 { classes: Cc, interfaces: Ci, utils: Cu } = Components
 
 # “Selecting an element” means “focusing and selecting the text, if any, of an
@@ -64,23 +67,6 @@ command_paste_tab = (vim) ->
   vim.rootWindow.gBrowser.selectedTab =
     vim.rootWindow.gBrowser.addTab(url, null, null, postData, null, false)
 
-# Copy the URL or text of a marker element to the system clipboard.
-command_marker_yank = (vim) ->
-  callback = (marker) ->
-    if url = marker.element.href
-      marker.element.focus()
-      utils.writeToClipboard(url)
-    else if utils.isTextInputElement(marker.element)
-      utils.writeToClipboard(marker.element.value)
-
-  vim.enterMode('hints', callback)
-
-# Focus element.
-command_marker_focus = (vim) ->
-  callback = (marker) -> marker.element.focus()
-
-  vim.enterMode('hints', callback)
-
 # Copy the current URL to the system clipboard.
 command_yank = (vim) ->
   utils.writeToClipboard(vim.window.location.href)
@@ -261,68 +247,160 @@ command_close_tab = (vim, event, count) ->
 command_restore_tab = (vim, event, count) ->
   vim.rootWindow.undoCloseTab() for [1..count]
 
-helper_follow = ({ inTab, multiple }, vim, event, count) ->
-  callback = (matchedMarker, markers) ->
-    if matchedMarker.element.target == '_blank'
-      targetReset = matchedMarker.element.target
-      matchedMarker.element.target = ''
-
-    matchedMarker.element.focus()
-
-    inTab = if count > 1 then true else inTab
-    utils.simulateClick(matchedMarker.element, {metaKey: inTab, ctrlKey: inTab})
+# Follow links, focus text inputs and click buttons with hint markers.
+command_follow = (vim, event, count) ->
+  filter = (element, getElementShape) ->
+    semantic = true
+    switch
+      when isProperLink(element)
+        type = 'link'
+      when isTextInputElement(element), isContentEditable(element)
+        type = 'text'
+      when element.tabIndex > -1
+        type = 'clickable'
+        unless element.nodeName in ['A', 'INPUT', 'BUTTON', 'SELECT']
+          semantic = false
+      when element.hasAttribute('onclick') or
+           element.hasAttribute('onmousedown') or
+           element.hasAttribute('onmouseup') or
+           element.hasAttribute('oncommand') or
+           element.getAttribute('role') in ['link', 'button'] or
+           # Twitter special-case.
+           element.classList.contains('js-new-tweets-bar')
+        type = 'clickable'
+        semantic = false
+      # Putting markers on `<label>` elements is generally redundant, because
+      # its `<input>` gets one. However, some sites hide the actual `<input>`
+      # but keeps the `<label>` to click, either for styling purposes or to keep
+      # the `<input>` hidden until it is used. In those cases we should add a
+      # marker for the `<label>`.
+      when element.nodeName == 'LABEL'
+        if element.htmlFor
+          input = element.ownerDocument.getElementById(element.htmlFor)
+          if input and not getElementShape(input)
+            type = 'clickable'
+      # Elements that have “button” somewhere in the class might be clickable,
+      # unless they contain a real link or button in which case they likely are
+      # “button-wrapper”s. (`<SVG element>.className` is not a string!)
+      when typeof element.className == 'string' and
+           element.className.toLowerCase().contains('button')
+        unless element.querySelector('a, button')
+          type = 'clickable'
+          semantic = false
+      # When viewing an image it should get a marker to toggle zoom.
+      when element.ownerDocument.body.childElementCount == 1 and
+           element.nodeName == 'IMG' and
+           (element.classList.contains('overflowing') or
+            element.classList.contains('shrinkToFit'))
+        type = 'clickable'
+    return unless type
+    return unless shape = getElementShape(element)
+    return new Marker(element, shape, {semantic, type})
 
-    matchedMarker.element.target = targetReset if targetReset
-
-    count -= 1
-    isEditable = utils.isElementEditable(matchedMarker.element)
-    if (multiple or count > 0) and not isEditable
-      # By not resetting immediately one is able to see the last char being
-      # matched, which gives some nice visual feedback that you've typed the
-      # right char.
-      vim.window.setTimeout((-> marker.reset() for marker in markers), 100)
-      return true
-
-  vim.enterMode('hints', callback)
-
-# Follow links with hint markers.
-command_follow = helper_follow.bind(undefined, {inTab: false})
+  callback = (marker) ->
+    { element } = marker
+    element.focus()
+    last = (count == 1)
+    if not last and marker.type == 'link'
+      vim.rootWindow.gBrowser.loadOneTab(element.href, {
+        inBackground: true
+        relatedToCurrent: true
+      })
+    else
+      if element.target == '_blank'
+        targetReset = element.target
+        element.target = ''
+      utils.simulateClick(element)
+      element.target = targetReset if targetReset
+    count--
+    return (not last and marker.type != 'text')
+
+  vim.enterMode('hints', filter, callback)
+
+# Like command_follow but multiple times.
+command_follow_multiple = (vim, event) ->
+  command_follow(vim, event, Infinity)
+
+# Follow links in a new background tab with hint markers.
+command_follow_in_tab = (vim, event, count, inBackground = true) ->
+  filter = (element, getElementShape) ->
+    return unless isProperLink(element)
+    return unless shape = getElementShape(element)
+    return new Marker(element, shape, {semantic: true})
 
-# Follow links in a new Tab with hint markers.
-command_follow_in_tab = helper_follow.bind(undefined, {inTab: true})
+  callback = (marker) ->
+    last = (count == 1)
+    vim.rootWindow.gBrowser.loadOneTab(marker.element.href, {
+      inBackground: if last then inBackground else true
+      relatedToCurrent: true
+    })
+    count--
+    return not last
 
-# Follow multiple links with hint markers.
-command_follow_multiple = helper_follow.bind(undefined,
-                                             {inTab: true, multiple: true})
+  vim.enterMode('hints', filter, callback)
 
-helper_follow_pattern = do ->
-  # Search for the prev/next patterns in the following attributes of the
-  # element. `rel` should be kept as the first attribute, since the standard
-  # way of marking up prev/next links (`rel="prev"` and `rel="next"`) should be
-  # favored. Even though some of these attributes only allow a fixed set of
-  # keywords, we pattern-match them anyways since lots of sites don’t follow
-  # the spec and use the attributes arbitrarily.
-  attrs = ['rel', 'role', 'data-tooltip', 'aria-label']
+# Follow links in a new foreground tab with hint markers.
+command_follow_in_focused_tab = (vim, event, count) ->
+  command_follow_in_tab(vim, event, count, false)
 
-  return (type, vim) ->
-    { document } = vim.window
+# Copy the URL or text of a markable element to the system clipboard.
+command_marker_yank = (vim) ->
+  filter = (element, getElementShape) ->
+    type = switch
+      when isProperLink(element)       then 'link'
+      when isTextInputElement(element) then 'textInput'
+      when isContentEditable(element)  then 'contenteditable'
+    return unless type
+    return unless shape = getElementShape(element)
+    return new Marker(element, shape, {semantic: true, type})
 
-    # If there’s a `<link rel=prev/next>` element we use that.
-    for linkElement in document.head.getElementsByTagName('link')
-      # Also support `rel=previous`, just like Google.
-      if type == linkElement.rel.toLowerCase().replace(/^previous$/, 'prev')
-        vim.rootWindow.gBrowser.loadURI(linkElement.href)
-        return
+  callback = (marker) ->
+    { element } = marker
+    text = switch marker.type
+      when 'link'            then element.href
+      when 'textInput'       then element.value
+      when 'contenteditable' then element.textContent
+    utils.writeToClipboard(text)
 
-    # Otherwise we look for a link on the page that seems to go to the previous
-    # or next page.
-    links = utils.getMarkableElements(document, {type: 'action'})
-      .filter(utils.isElementVisible)
+  vim.enterMode('hints', filter, callback)
 
-    patterns = utils.splitListString(getPref("#{ type }_patterns"))
+# Focus element with hint markers.
+command_marker_focus = (vim) ->
+  filter = (element, getElementShape) ->
+    return unless element.tabIndex > -1
+    return unless shape = getElementShape(element)
+    return new Marker(element, shape, {semantic: true})
 
-    if matchingLink = utils.getBestPatternMatch(patterns, attrs, links)
-      utils.simulateClick(matchingLink, {metaKey: false, ctrlKey: false})
+  callback = (marker) ->
+    { element } = marker
+    element.focus()
+    element.select?()
+
+  vim.enterMode('hints', filter, callback)
+
+# Search for the prev/next patterns in the following attributes of the element.
+# `rel` should be kept as the first attribute, since the standard way of marking
+# up prev/next links (`rel="prev"` and `rel="next"`) should be favored. Even
+# though some of these attributes only allow a fixed set of keywords, we
+# pattern-match them anyways since lots of sites don’t follow the spec and use
+# the attributes arbitrarily.
+attrs = ['rel', 'role', 'data-tooltip', 'aria-label']
+helper_follow_pattern = (type, vim) ->
+  { document } = vim.window
+
+  # If there’s a `<link rel=prev/next>` element we use that.
+  for link in document.head.getElementsByTagName('link')
+    # Also support `rel=previous`, just like Google.
+    if type == link.rel.toLowerCase().replace(/^previous$/, 'prev')
+      vim.rootWindow.gBrowser.loadURI(link.href)
+      return
+
+  # Otherwise we look for a link or button on the page that seems to go to the
+  # previous or next page.
+  candidates = document.querySelectorAll('a, button')
+  patterns = utils.splitListString(getPref("#{ type }_patterns"))
+  if matchingLink = utils.getBestPatternMatch(patterns, attrs, candidates)
+    utils.simulateClick(matchingLink)
 
 # Follow previous page.
 command_follow_prev = helper_follow_pattern.bind(undefined, 'prev')
@@ -499,6 +577,7 @@ commands = [
 
   new Command('browse', 'follow',                command_follow,                [['f']])
   new Command('browse', 'follow_in_tab',         command_follow_in_tab,         [['F']])
+  new Command('browse', 'follow_in_focused_tab', command_follow_in_focused_tab, [['g', 'f']])
   new Command('browse', 'follow_multiple',       command_follow_multiple,       [['a', 'f']])
   new Command('browse', 'follow_previous',       command_follow_prev,           [['[']])
   new Command('browse', 'follow_next',           command_follow_next,           [[']']])
diff --git a/extension/lib/hints.coffee b/extension/lib/hints.coffee
index c84b85e..dd8763a 100644
--- a/extension/lib/hints.coffee
+++ b/extension/lib/hints.coffee
@@ -19,7 +19,6 @@
 ###
 
 utils      = require('./utils')
-{ Marker } = require('./marker')
 huffman    = require('n-ary-huffman')
 
 { interfaces: Ci } = Components
@@ -27,7 +26,7 @@ huffman    = require('n-ary-huffman')
 HTMLDocument = Ci.nsIDOMHTMLDocument
 XULDocument  = Ci.nsIDOMXULDocument
 
-injectHints = (rootWindow, window) ->
+injectHints = (rootWindow, window, filter) ->
   {
     clientWidth, clientHeight # Viewport size excluding scrollbars, usually.
     scrollWidth, scrollHeight
@@ -47,7 +46,10 @@ injectHints = (rootWindow, window) ->
     height
   }
 
-  markers = createMarkers(window, viewport)
+  groups = {semantic: [], unsemantic: []}
+  createMarkers(window, viewport, groups, filter)
+  { semantic, unsemantic } = groups
+  markers = semantic.concat(unsemantic)
 
   return [[], null] if markers.length == 0
 
@@ -66,18 +68,9 @@ injectHints = (rootWindow, window) ->
   createHuffmanTree = (markers) ->
     return huffman.createTree(markers, hintChars.length, {sorted: true})
 
-  semantic   = []
-  unsemantic = []
-  for marker in markers
-    marker.weight = marker.elementShape.area
-    if utils.isElementClickable(marker.element)
-      semantic.push(marker)
-    else
-      unsemantic.push(marker)
-
-  # Semantic elements should always get better hints than unsemantic ones, even
-  # if they are smaller. This is achieved by putting the unsemantic elements in
-  # their own branch of the huffman tree.
+  # Semantic elements should always get better hints and higher `z-index`:es
+  # than unsemantic ones, even if they are smaller. The latter is achieved by
+  # putting the unsemantic elements in their own branch of the huffman tree.
   if unsemantic.length > 0
     if markers.length > hintChars.length
       setZIndexes(unsemantic)
@@ -103,20 +96,26 @@ injectHints = (rootWindow, window) ->
 
   return [markers, container]
 
-createMarkers = (window, viewport, parents = []) ->
+# `filter` is a function that is given every element in every frame of the page.
+# It should return new `Marker`s for markable elements and a falsy value for all
+# other elements. All returned `Marker`s are added to `groups`. `groups` is
+# modified instead of using return values to avoid array concatenation for each
+# frame. It might sound expensive to go through _every_ element, but that’s
+# actually what other methods like using XPath or CSS selectors would need to do
+# anyway behind the scenes.
+createMarkers = (window, viewport, groups, filter, parents = []) ->
   { document } = window
-  markers = []
 
   # For now we aren't able to handle hint markers in XUL Documents :(
   return [] unless document instanceof HTMLDocument
 
-  candidates = utils.getMarkableElements(document, {type: 'all'})
-  for element in candidates
-    shape = getElementShape(window, element, viewport, parents)
-    # If `element` has no visible shape then it shouldn’t get any marker.
-    continue unless shape
-
-    markers.push(new Marker(element, shape))
+  localGetElementShape = getElementShape.bind(null, window, viewport, parents)
+  for element in document.getElementsByTagName('*')
+    continue unless marker = filter(element, localGetElementShape)
+    if marker.semantic
+      groups.semantic.push(marker)
+    else
+      groups.unsemantic.push(marker)
 
   for frame in window.frames
     rect = frame.frameElement.getBoundingClientRect() # Frames only have one.
@@ -141,11 +140,10 @@ createMarkers = (window, viewport, parents = []) ->
         parseFloat(computedStyle.getPropertyValue('border-top-width')) +
         parseFloat(computedStyle.getPropertyValue('padding-top'))
 
-    frameMarkers = createMarkers(frame, frameViewport,
-                                 parents.concat({ window, offset }))
-    markers.push(frameMarkers...)
+    createMarkers(frame, frameViewport, groups, filter,
+                  parents.concat({ window, offset }))
 
-  return markers
+  return
 
 # Returns the “shape” of `element`:
 #
@@ -160,7 +158,7 @@ createMarkers = (window, viewport, parents = []) ->
 #
 # Returns `null` if `element` is outside `viewport` or entirely covered by other
 # elements.
-getElementShape = (window, element, viewport, parents) ->
+getElementShape = (window, viewport, parents, element) ->
   # `element.getClientRects()` returns a list of rectangles, usually just one,
   # which is identical to the one returned by `element.getBoundingClientRect()`.
   # However, if `element` is inline and line-wrapped, then it returns one
@@ -186,7 +184,7 @@ getElementShape = (window, element, viewport, parents) ->
         # Those are still clickable. Therefore we return the shape of the first
         # visible child instead. At least in that example, that’s the best bet.
         for child in element.children
-          shape = getElementShape(window, child, viewport, parents)
+          shape = getElementShape(window, viewport, parents, child)
           return shape if shape
     return null
 
diff --git a/extension/lib/marker.coffee b/extension/lib/marker.coffee
index e0a35af..8847c10 100644
--- a/extension/lib/marker.coffee
+++ b/extension/lib/marker.coffee
@@ -21,10 +21,11 @@
 # Wraps the markable element and provides methods to manipulate the markers.
 class Marker
   # Creates the marker DOM node.
-  constructor: (@element, @elementShape) ->
+  constructor: (@element, @elementShape, { @semantic, @type }) ->
     document = @element.ownerDocument
     @markerElement = document.createElement('div')
     @markerElement.classList.add('VimFxHintMarker')
+    @weight = @elementShape.area
 
   reset: ->
     @setHint(@hint)
@@ -105,4 +106,7 @@ class Marker
 
   isMatched: -> (@hintIndex == @hint.length)
 
+  markMatched: (matched) ->
+    @markerElement.classList.toggle('VimFxMatchedHintMarker', matched)
+
 exports.Marker = Marker
diff --git a/extension/lib/modes.coffee b/extension/lib/modes.coffee
index fc6d80c..56703a1 100644
--- a/extension/lib/modes.coffee
+++ b/extension/lib/modes.coffee
@@ -129,8 +129,9 @@ exports['find'] =
     exit: ['<escape>', '<enter>']
 
 exports['hints'] =
-  onEnter: (vim, storage, callback) ->
-    [ markers, container ] = hints.injectHints(vim.rootWindow, vim.window)
+  onEnter: (vim, storage, filter, callback) ->
+    [ markers, container ] = hints.injectHints(vim.rootWindow, vim.window,
+                                               filter)
     if markers.length > 0
       storage.markers   = markers
       storage.container = container
@@ -140,7 +141,10 @@ exports['hints'] =
       vim.enterMode('normal')
 
   onLeave: (vim, storage) ->
-    storage.container?.remove()
+    { container } = storage
+    vim.rootWindow.setTimeout((->
+      container?.remove()
+    ), @timeout)
     for key of storage
       storage[key] = null
 
@@ -149,6 +153,8 @@ exports['hints'] =
 
     switch
       when @commands['exit'].match(keyStr)
+        # Remove the hints immediately.
+        storage.container?.remove()
         vim.enterMode('normal')
         return true
 
@@ -167,17 +173,30 @@ exports['hints'] =
       else
         if keyStr not in utils.getHintChars()
           return true
+        matchedMarker = null
         for marker in markers when marker.hintIndex == storage.numEnteredChars
           match = marker.matchHintChar(keyStr)
           marker.hide() unless match
           if marker.isMatched()
-            dontEnterNormalMode = callback(marker, markers)
-            vim.enterMode('normal') unless dontEnterNormalMode
-            break
+            marker.markMatched(true)
+            matchedMarker = marker
+        if matchedMarker
+          again = callback(matchedMarker)
+          if again
+            vim.rootWindow.setTimeout((->
+              matchedMarker.markMatched(false)
+            ), @timeout)
+            marker.reset() for marker in markers
+            storage.numEnteredChars = 0
+          else
+            vim.enterMode('normal')
+          return true
         storage.numEnteredChars++
 
     return true
 
+  timeout: 200
+
   commands:
     exit:                    ['<escape>']
     rotate_markers_forward:  ['<space>']
diff --git a/extension/lib/utils.coffee b/extension/lib/utils.coffee
index d561b28..1fe6c67 100644
--- a/extension/lib/utils.coffee
+++ b/extension/lib/utils.coffee
@@ -92,38 +92,33 @@ blurActiveElement = (window) ->
   if activeElement and isElementEditable(activeElement)
     activeElement.blur()
 
+isProperLink = (element) ->
+  return element instanceof HTMLAnchorElement and
+         not element.href.endsWith('#') and
+         not element.href.startsWith('javascript:')
+
 isTextInputElement = (element) ->
-  return element instanceof HTMLInputElement or
+  return (element instanceof HTMLInputElement and element.type in [
+           'text', 'search', 'tel', 'url', 'email', 'password', 'number'
+         ]) or
          element instanceof HTMLTextAreaElement
 
-isElementEditable = (element) ->
-  return element instanceof HTMLInputElement or
-         element instanceof HTMLTextAreaElement or
-         element instanceof HTMLSelectElement or
-         element instanceof XULMenuListElement or
-         element.isContentEditable or
-         isElementGoogleEditable(element)
+isContentEditable = (element) ->
+  return element.isContentEditable or
+         isGoogleEditable(element)
 
-isElementGoogleEditable = (element) ->
+isGoogleEditable = (element) ->
   # `g_editable` is a non-standard attribute commonly used by Google.
   return element.getAttribute?('g_editable') == 'true' or
          (element instanceof HTMLElement and
           element.ownerDocument.body?.getAttribute('g_editable') == 'true')
 
-isElementClickable = (element) ->
-  return element instanceof HTMLAnchorElement or
-         element instanceof HTMLButtonElement or
-         isElementEditable(element)
-
-isElementVisible = (element) ->
-  document = element.ownerDocument
-  window   = document.defaultView
-  # `.getComputedStyle()` may return `null` if the computed style isn’t
-  # availble yet. If so, consider the element not visible.
-  return false unless computedStyle = window.getComputedStyle(element, null)
-  return computedStyle.getPropertyValue('visibility') == 'visible' and
-         computedStyle.getPropertyValue('display') != 'none' and
-         computedStyle.getPropertyValue('opacity') != '0'
+isElementEditable = (element) ->
+  return element instanceof HTMLInputElement or
+         element instanceof HTMLTextAreaElement or
+         element instanceof HTMLSelectElement or
+         element instanceof XULMenuListElement or
+         isContentEditable(element)
 
 getSessionStore = ->
   Cc['@mozilla.org/browser/sessionstore;1'].getService(Ci.nsISessionStore)
@@ -373,90 +368,6 @@ removeDuplicates = (array) ->
   return `[...new Set(array)]`
   # coffeelint: enable=no_backticks
 
-# Why isn’t `a[@href]` used, when `area[@href]` is? Some sites (such as
-# StackExchange sites) leave out the `href` property and use the anchor as a
-# JavaScript-powered button (instead of just using the `button` element).
-ACTION_ELEMENT_TAGS = [
-  'a'
-  'area[@href]'
-  'button'
-  # When viewing an image directly, and it is larger than the viewport,
-  # clicking it toggles zoom.
-  'img[contains(@class, "decoded") and
-     (contains(@class, "overflowing") or
-     contains(@class, "shrinkToFit"))]'
-]
-
-ACTION_ELEMENT_PROPERTIES = [
-  '@onclick'
-  '@onmousedown'
-  '@onmouseup'
-  '@oncommand'
-  '@role="link"'
-  '@role="button"'
-  'contains(@class, "button")'
-  'contains(@class, "js-new-tweets-bar")'
-]
-
-EDITABLE_ELEMENT_TAGS = [
-  'textarea'
-  'select'
-  'input[not(@type="hidden" or @disabled)]'
-]
-
-EDITABLE_ELEMENT_PROPERTIES = [
-  '@contenteditable=""'
-  'translate(@contenteditable, "TRUE", "true")="true"'
-]
-
-FOCUSABLE_ELEMENT_TAGS = [
-  'frame'
-  'iframe'
-  'embed'
-  'object'
-]
-
-FOCUSABLE_ELEMENT_PROPERTIES = [
-  '@tabindex!=-1'
-]
-
-getMarkableElements = do ->
-  xpathify = (tags, properties) ->
-    return tags
-      .concat("*[#{ properties.join(' or ') }]")
-      .map((rule) -> "//#{ rule } | //xhtml:#{ rule }")
-      .join(' | ')
-
-  xpaths =
-    action:    xpathify(ACTION_ELEMENT_TAGS,    ACTION_ELEMENT_PROPERTIES   )
-    editable:  xpathify(EDITABLE_ELEMENT_TAGS,  EDITABLE_ELEMENT_PROPERTIES )
-    focusable: xpathify(FOCUSABLE_ELEMENT_TAGS, FOCUSABLE_ELEMENT_PROPERTIES)
-    all: xpathify(
-      # coffeelint: disable=max_line_length
-      [ACTION_ELEMENT_TAGS...,       EDITABLE_ELEMENT_TAGS...,       FOCUSABLE_ELEMENT_TAGS...      ],
-      [ACTION_ELEMENT_PROPERTIES..., EDITABLE_ELEMENT_PROPERTIES..., FOCUSABLE_ELEMENT_PROPERTIES...]
-      # coffeelint: enable=max_line_length
-    )
-
-  # The actual function that will return the desired elements.
-  return (document, { type }) ->
-    return xpathQueryAll(document, xpaths[type])
-
-xpathHelper = (node, query, resultType) ->
-  document = node.ownerDocument ? node
-  namespaceResolver = (namespace) ->
-    if namespace == 'xhtml' then 'http://www.w3.org/1999/xhtml' else null
-  return document.evaluate(query, node, namespaceResolver, resultType, null)
-
-xpathQuery = (node, query) ->
-  result = xpathHelper(node, query, XPathResult.FIRST_ORDERED_NODE_TYPE)
-  return result.singleNodeValue
-
-xpathQueryAll = (node, query) ->
-  result = xpathHelper(node, query, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE)
-  return (result.snapshotItem(i) for i in [0...result.snapshotLength] by 1)
-
-
 exports.Bucket                    = Bucket
 exports.getEventWindow            = getEventWindow
 exports.getEventRootWindow        = getEventRootWindow
@@ -465,10 +376,10 @@ exports.getRootWindow             = getRootWindow
 exports.getCurrentTabWindow       = getCurrentTabWindow
 
 exports.blurActiveElement         = blurActiveElement
+exports.isProperLink              = isProperLink
 exports.isTextInputElement        = isTextInputElement
+exports.isContentEditable         = isContentEditable
 exports.isElementEditable         = isElementEditable
-exports.isElementClickable        = isElementClickable
-exports.isElementVisible          = isElementVisible
 exports.getSessionStore           = getSessionStore
 
 exports.loadCss                   = loadCss
@@ -500,7 +411,4 @@ exports.getHintChars              = getHintChars
 exports.removeDuplicates          = removeDuplicates
 exports.removeDuplicateCharacters = removeDuplicateCharacters
 exports.getResourceURI            = getResourceURI
-exports.getMarkableElements       = getMarkableElements
-exports.xpathQuery                = xpathQuery
-exports.xpathQueryAll             = xpathQueryAll
 exports.ADDON_ID                  = ADDON_ID
diff --git a/extension/locale/de/vimfx.properties b/extension/locale/de/vimfx.properties
index 632e9a6..2c5d16c 100644
--- a/extension/locale/de/vimfx.properties
+++ b/extension/locale/de/vimfx.properties
@@ -12,7 +12,7 @@ help_command_focus_search=Suchleiste fokussieren
 help_command_paste=Adresse aus Zwischenablage öffnen
 help_command_paste_tab=Adresse aus Zwischenablage in neuem Tab öffnen
 help_command_marker_yank=Links oder Text-Eingabewerte in Zwischenablage kopieren
-help_command_marker_focus=Element fokussieren
+help_command_marker_focus=Focus/select element
 help_command_yank=URL der aktuellen Seite in Zwischenablage kopieren
 help_command_reload=Seite aktualisieren
 help_command_reload_force=Seite inklusive aller Zusatzelemente aktualisieren (js, css, img)
@@ -52,8 +52,9 @@ help_command_restore_tab=Zuletzt geschlossenen Tab wieder öffnen
 
 help_section_browse=Links und Chronik
 help_command_follow=Einem Link auf der aktuellen Seite folgen
-help_command_follow_in_tab=Einem Link auf der aktuellen Seite in neuem Tab folgen
-help_command_follow_multiple=Mehreren Links auf der aktuellen Seite folgen
+help_command_follow_in_tab=Follow link in a new background tab
+help_command_follow_in_focused_tab=Follow link in a new foreground tab
+help_command_follow_multiple=Follow multiple links in new background tabs, focus text input or click multiple buttons
 help_command_follow_previous=Zur vorherigen Seite springen
 help_command_follow_next=Zur nächsten Seite springen
 help_command_go_up_path=Einen Level nach oben in der URL-Hierarchie springen
diff --git a/extension/locale/el-GR/vimfx.properties b/extension/locale/el-GR/vimfx.properties
index 60f474e..b839d56 100644
--- a/extension/locale/el-GR/vimfx.properties
+++ b/extension/locale/el-GR/vimfx.properties
@@ -12,7 +12,7 @@ help_command_focus_search=Εστίασε την Γραμμή Αναζήτηση
 help_command_paste=Πήγαινε στην διεύθυνση που έχω κάνει αντιγραφή
 help_command_paste_tab=Άνοιξε νέα καρτέλα και πήγαινε στην διεύθυνση που έχω κάνει αντιγραφή
 help_command_marker_yank=Κάνε αντιγραφή την διεύθυνση του συνδέσμου ή την τιμή της περιοχής κειμένου
-help_command_marker_focus=Εστίασε σε στοιχείο
+help_command_marker_focus=Focus/select element
 help_command_yank=Κάνε αντιγραφή τη διεύθυνση της σελίδας στην οποία βρίσκομαι
 help_command_reload=Ανανέωσε την σελίδα στην οποία βρίσκομαι
 help_command_reload_force=Ανανέωσε την σελίδα στην οποία βρίσκομαι και όλα τα στοιχεία της (js, css, img)
@@ -53,8 +53,9 @@ help_command_restore_tab=Επαναφορά τελευταίας καρτέλα
 
 help_section_browse=Περιήγηση
 help_command_follow=Πήγαινε σε σύνδεσμο που υπάρχει στην καρτέλα που βρίσκομαι
-help_command_follow_in_tab=Άνοιξε σε νέα καρτέλα σύνδεσμο που υπάρχει στην καρτέλα που βρίσκομαι
-help_command_follow_multiple=Ακολούθα πολλαπλούς συνδέσμους στην τρέχουσα σελίδα
+help_command_follow_in_tab=Follow link in a new background tab
+help_command_follow_in_focused_tab=Follow link in a new foreground tab
+help_command_follow_multiple=Follow multiple links in new background tabs, focus text input or click multiple buttons
 help_command_follow_previous=Πήγαινε στην προηγούμενη σελίδα
 help_command_follow_next=Πήγαινε στην επόμενη σελίδα
 help_command_go_up_path=Πήγαινε ένα επίπεδο πάνω στην ιεραρχία του URL
diff --git a/extension/locale/en-US/vimfx.properties b/extension/locale/en-US/vimfx.properties
index a101044..151a5eb 100644
--- a/extension/locale/en-US/vimfx.properties
+++ b/extension/locale/en-US/vimfx.properties
@@ -12,7 +12,7 @@ help_command_focus_search=Focus the Search Bar
 help_command_paste=Paste and go
 help_command_paste_tab=Paste and go in a new tab
 help_command_marker_yank=Copy link or text input value
-help_command_marker_focus=Focus element
+help_command_marker_focus=Focus/select element
 help_command_yank=Copy current URL
 help_command_reload=Reload
 help_command_reload_force=Reload (override cache)
@@ -53,8 +53,9 @@ help_command_restore_tab=Restore closed tab
 
 help_section_browse=Browsing
 help_command_follow=Follow link, focus text input or click button
-help_command_follow_in_tab=Follow link in a new tab
-help_command_follow_multiple=Follow multiple links in new tabs
+help_command_follow_in_tab=Follow link in a new background tab
+help_command_follow_in_focused_tab=Follow link in a new foreground tab
+help_command_follow_multiple=Follow multiple links in new background tabs, focus text input or click multiple buttons
 help_command_follow_previous=Go to the previous page
 help_command_follow_next=Go to the next page
 help_command_go_up_path=Go up one level in the URL
diff --git a/extension/locale/hu/vimfx.properties b/extension/locale/hu/vimfx.properties
index c530bb9..2d54329 100644
--- a/extension/locale/hu/vimfx.properties
+++ b/extension/locale/hu/vimfx.properties
@@ -12,7 +12,7 @@ help_command_focus_search=Focus the Search Bar
 help_command_paste=A vágólapon található link megnyitása
 help_command_paste_tab=A vágólapon található link megnyitása új tabban
 help_command_marker_yank=Copy link url or text input value to the clipboard
-help_command_marker_focus=Focus element
+help_command_marker_focus=Focus/select element
 help_command_yank=Aktuális oldal címének másolása vágólapra
 help_command_reload=Oldal újratöltése
 help_command_reload_force=Oldal újratöltése minden elemmel együtt (js, css, img)
@@ -52,8 +52,9 @@ help_command_restore_tab=Utoljára bezárt tab visszatöltése
 
 help_section_browse=Böngészés
 help_command_follow=Link követése
-help_command_follow_in_tab=Link követése új tabban
-help_command_follow_multiple=Follow multiple links on the current page
+help_command_follow_in_tab=Follow link in a new background tab
+help_command_follow_in_focused_tab=Follow link in a new foreground tab
+help_command_follow_multiple=Follow multiple links in new background tabs, focus text input or click multiple buttons
 help_command_follow_previous=Go to previous page
 help_command_follow_next=Go to next page
 help_command_go_up_path=Go up one level in the URL hierarchy
diff --git a/extension/locale/id/vimfx.properties b/extension/locale/id/vimfx.properties
index 52244fa..058d7a2 100644
--- a/extension/locale/id/vimfx.properties
+++ b/extension/locale/id/vimfx.properties
@@ -11,7 +11,7 @@ help_command_focus=Fokus pada Address Bar
 help_command_paste=Navigasi ke alamat dalam clipboard
 help_command_paste_tab=Buka tab baru dan navigasi ke alamat dalam clipboard
 help_command_marker_yank=Salin pranala atau teks ke dalam clipboard
-help_command_marker_focus=Fokuskan elemen
+help_command_marker_focus=Focus/select element
 help_command_yank=Salin pranala halaman sekarang ke clipboard
 help_command_reload=Muat ulang halaman sekarang
 help_command_reload_force=Muat ulang halaman sekarang dan seluruh aset (js, css, gambar)
@@ -52,8 +52,9 @@ help_command_restore_tab=Buka tab terakhir ditutup
 
 help_section_browse=Berselancar
 help_command_follow=Ikuti pranala pada halaman sekarang
-help_command_follow_in_tab=Ikuti pranala pada halaman sekarang di tab baru
-help_command_follow_multiple=Follow multiple links on the current page
+help_command_follow_in_tab=Follow link in a new background tab
+help_command_follow_in_focused_tab=Follow link in a new foreground tab
+help_command_follow_multiple=Follow multiple links in new background tabs, focus text input or click multiple buttons
 help_command_follow_previous=Go to previous page
 help_command_follow_next=Go to next page
 help_command_go_up_path=Go up one level in the URL hierarchy
diff --git a/extension/locale/it/vimfx.properties b/extension/locale/it/vimfx.properties
index 72d0aac..3117b97 100644
--- a/extension/locale/it/vimfx.properties
+++ b/extension/locale/it/vimfx.properties
@@ -12,7 +12,7 @@ help_command_focus_search=Sposta il focus sulla barra di ricerca.
 help_command_paste=Vai all'indirizzo presente negli appunti
 help_command_paste_tab=Apri un nuovo tab e vai all'indirizzo presente negli appunti
 help_command_marker_yank=Copia il link o il testo nella casella negli appunti
-help_command_marker_focus=Sposta il focus sull'elemento
+help_command_marker_focus=Focus/select element
 help_command_yank=Copia la pagina corrente negli appunti
 help_command_reload=Ricarica la pagina corrente
 help_command_reload_force=Ricarica la pagina corrente e tutte le risorse relative (js, css, img)
@@ -53,8 +53,9 @@ help_command_restore_tab=Riapri l'ulitmo tab chiuso
 
 help_section_browse=Navigazione
 help_command_follow=Apri un link nella pagina corrente
-help_command_follow_in_tab=Apri un link nella pagina corrente in un nuovo tab
-help_command_follow_multiple=Apri più link nella pagina corrente
+help_command_follow_in_tab=Follow link in a new background tab
+help_command_follow_in_focused_tab=Follow link in a new foreground tab
+help_command_follow_multiple=Follow multiple links in new background tabs, focus text input or click multiple buttons
 help_command_follow_previous=Vai alla pagina precedente
 help_command_follow_next=Vai alla prossima pagina
 help_command_go_up_path=Sali di un livello nella gerarchia dell'URL
diff --git a/extension/locale/ja/vimfx.properties b/extension/locale/ja/vimfx.properties
index 343dc26..bf8b0b5 100644
--- a/extension/locale/ja/vimfx.properties
+++ b/extension/locale/ja/vimfx.properties
@@ -12,7 +12,7 @@ help_command_focus_search=検索バーにフォーカス
 help_command_paste=クリップボードのアドレスに移動
 help_command_paste_tab=新しいタブを開いてクリップボードのアドレスに移動
 help_command_marker_yank=URLまたは入力値をクリップボードにコピー
-help_command_marker_focus=要素にフォーカス
+help_command_marker_focus=Focus/select element
 help_command_yank=現在のページへのリンクをクリップボードにコピー
 help_command_reload=現在のページを再読み込み
 help_command_reload_force=現在のページとその全てのファイル(js, css, img)を再読み込み
@@ -53,8 +53,9 @@ help_command_restore_tab=最後に閉じたタブを復元する
 
 help_section_browse=ブラウジング
 help_command_follow=現在のページにあるリンクをたどる
-help_command_follow_in_tab=現在のページにあるリンクを新しいタブでたどる
-help_command_follow_multiple=現在のページにあるリンクを複数たどる
+help_command_follow_in_tab=Follow link in a new background tab
+help_command_follow_in_focused_tab=Follow link in a new foreground tab
+help_command_follow_multiple=Follow multiple links in new background tabs, focus text input or click multiple buttons
 help_command_follow_previous=前のページに移動
 help_command_follow_next=次のページに移動
 help_command_go_up_path=URLを一階層上る
diff --git a/extension/locale/nl/vimfx.properties b/extension/locale/nl/vimfx.properties
index da4e28e..3ad5964 100644
--- a/extension/locale/nl/vimfx.properties
+++ b/extension/locale/nl/vimfx.properties
@@ -12,7 +12,7 @@ help_command_focus_search=Focus the Search Bar
 help_command_paste=Open het adres op het klembord
 help_command_paste_tab=Open het adres op het klembord in een nieuw tabblad
 help_command_marker_yank=Kopieer link URL of tekstinvoer naar klembord
-help_command_marker_focus=Focus element
+help_command_marker_focus=Focus/select element
 help_command_yank=Kopieer link van huidige pagina naar klembord
 help_command_reload=Herlaad huidige pagina
 help_command_reload_force=Herlaad huidige pagina inclusief javascript, css en plaatjes
@@ -53,8 +53,9 @@ help_command_restore_tab=Heropen laatst gesloten tabblad
 
 help_section_browse=Browsen
 help_command_follow=Volg een link op de huidige pagina
-help_command_follow_in_tab=Volg een link op de huidige pagina in een nieuw tabblad
-help_command_follow_multiple=Follow multiple links on the current page
+help_command_follow_in_tab=Follow link in a new background tab
+help_command_follow_in_focused_tab=Follow link in a new foreground tab
+help_command_follow_multiple=Follow multiple links in new background tabs, focus text input or click multiple buttons
 help_command_follow_previous=Go to previous page
 help_command_follow_next=Go to next page
 help_command_go_up_path=Go up one level in the URL hierarchy
diff --git a/extension/locale/pl/vimfx.properties b/extension/locale/pl/vimfx.properties
index 19cedd3..d63f16b 100644
--- a/extension/locale/pl/vimfx.properties
+++ b/extension/locale/pl/vimfx.properties
@@ -12,7 +12,7 @@ help_command_focus_search=Przejdź do paska wyszukiwania
 help_command_paste=Przejdź pod adres w schowku
 help_command_paste_tab=Przejdź pod adres w schowku w nowej karcie
 help_command_marker_yank=Kopiuj adres odnośnika lub treść pola do schowka
-help_command_marker_focus=Daj elementowi focus
+help_command_marker_focus=Focus/select element
 help_command_yank=Kopiuj adres bieżącej strony do schowka
 help_command_reload=Odśwież bieżącą stronę
 help_command_reload_force=Odśwież bieżącą stronę wraz z zasobami (js, css, img)
@@ -53,8 +53,9 @@ help_command_restore_tab=Przywróć ostatnio zamkniętą kartę
 
 help_section_browse=Przeglądanie
 help_command_follow=Otwórz link z bieżącej strony
-help_command_follow_in_tab=Otwórz link z bieżącej strony w nowej karcie
-help_command_follow_multiple=Otwórz kilka linków
+help_command_follow_in_tab=Follow link in a new background tab
+help_command_follow_in_focused_tab=Follow link in a new foreground tab
+help_command_follow_multiple=Follow multiple links in new background tabs, focus text input or click multiple buttons
 help_command_follow_previous=Idź do poprzedniej strony
 help_command_follow_next=Idź do następnej strony
 help_command_go_up_path=Idź poziom wyżej w hierarchii URL
diff --git a/extension/locale/ru/vimfx.properties b/extension/locale/ru/vimfx.properties
index 7c69b17..c2248cd 100644
--- a/extension/locale/ru/vimfx.properties
+++ b/extension/locale/ru/vimfx.properties
@@ -12,7 +12,7 @@ help_command_focus_search=Фокус на строку поиска
 help_command_paste=Перейти по адресу в буфере обмена
 help_command_paste_tab=Открыть новую вкладку и перейти по адресу в буфере обмена
 help_command_marker_yank=Скопировать в буфер обмена адрес ссылки или текст в элементе ввода
-help_command_marker_focus=Сфокусироваться на элемент
+help_command_marker_focus=Focus/select element
 help_command_yank=Скопировать в буфер обмена адрес текущей страницы
 help_command_reload=Перезагрузить текущую страницу
 help_command_reload_force=Перезагрузить текущую страницу и все ресурсы (js, css, img)
@@ -53,8 +53,9 @@ help_command_restore_tab=Восстановить последнюю закры
 
 help_section_browse=Навигация
 help_command_follow=Перейти по ссылке
-help_command_follow_in_tab=Перейти по ссылке в новой вкладке
-help_command_follow_multiple=Перейти по нескольком ссылкам в новой вкладке
+help_command_follow_in_tab=Follow link in a new background tab
+help_command_follow_in_focused_tab=Follow link in a new foreground tab
+help_command_follow_multiple=Follow multiple links in new background tabs, focus text input or click multiple buttons
 help_command_follow_previous=Go to previous page
 help_command_follow_next=Go to next page
 help_command_go_up_path=Go up one level in the URL hierarchy
diff --git a/extension/locale/sv-SE/vimfx.properties b/extension/locale/sv-SE/vimfx.properties
index 5365199..87cc800 100644
--- a/extension/locale/sv-SE/vimfx.properties
+++ b/extension/locale/sv-SE/vimfx.properties
@@ -12,7 +12,7 @@ help_command_focus_search=Fokusera sökfältet
 help_command_paste=Klistra in och kör
 help_command_paste_tab=Klistra in och kör i en ny flik
 help_command_marker_yank=Kopiera länkadress eller inmatad text
-help_command_marker_focus=Fokusera element
+help_command_marker_focus=Fokusera/markera element
 help_command_yank=Kopiera nuvarande URL
 help_command_reload=Ladda om
 help_command_reload_force=Ladda om (hoppa över cache)
@@ -52,9 +52,10 @@ help_command_restore_tab=Återställ stängd flik
 
 
 help_section_browse=Surfande
-help_command_follow=Följ länk, fokusera texruta eller klika på knapp
-help_command_follow_in_tab=Följ länk i ny flik
-help_command_follow_multiple=Följ flera länkar i nya flikar
+help_command_follow=Följ länk, fokusera textruta eller klicka på knapp
+help_command_follow_in_tab=Följ länk i ny bakgrundsflik
+help_command_follow_in_focused_tab=Följ länk i ny förgrundsflik
+help_command_follow_multiple=Följ flera länkar i nya bakgrundsflikar, fokusera textruta eller klicka på flera knappar
 help_command_follow_previous=Gå till föregående sida
 help_command_follow_next=Gå till nästa sida
 help_command_go_up_path=Gå upp en nivå i URL:en
diff --git a/extension/locale/zh-CN/vimfx.properties b/extension/locale/zh-CN/vimfx.properties
index 0c096e6..d34bfa3 100644
--- a/extension/locale/zh-CN/vimfx.properties
+++ b/extension/locale/zh-CN/vimfx.properties
@@ -12,7 +12,7 @@ help_command_focus_search=聚焦搜索栏
 help_command_paste=打开剪贴板中的链接
 help_command_paste_tab=在新标签页中打开剪贴板中的链接
 help_command_marker_yank=复制链接地址或输入框文本到剪贴板
-help_command_marker_focus=聚焦元素
+help_command_marker_focus=Focus/select element
 help_command_yank=复制当前标签页链接到剪贴板
 help_command_reload=重新载入当前页面
 help_command_reload_force=重新载入当前页面及所有外部资源（js，css，img)
@@ -53,8 +53,9 @@ help_command_restore_tab=恢复最后关闭的标签页
 
 help_section_browse=浏览
 help_command_follow=打开当前页面上的某个链接
-help_command_follow_in_tab=在新标签页中打开当前页面上的某个链接
-help_command_follow_multiple=打开当前页面上的多个链接
+help_command_follow_in_tab=Follow link in a new background tab
+help_command_follow_in_focused_tab=Follow link in a new foreground tab
+help_command_follow_multiple=Follow multiple links in new background tabs, focus text input or click multiple buttons
 help_command_follow_previous=打开上一页
 help_command_follow_next=打开下一页
 help_command_go_up_path=打开上一级页面
diff --git a/extension/locale/zh-TW/vimfx.properties b/extension/locale/zh-TW/vimfx.properties
index 69f0814..300f471 100644
--- a/extension/locale/zh-TW/vimfx.properties
+++ b/extension/locale/zh-TW/vimfx.properties
@@ -12,7 +12,7 @@ help_command_focus_search=游標移至搜尋列
 help_command_paste=打開剪貼簿中的連結
 help_command_paste_tab=在新分頁中打開剪貼簿中的連結
 help_command_marker_yank=複製連結網址或目前輸入框中的文字到剪貼簿
-help_command_marker_focus=游標移至網頁元素
+help_command_marker_focus=Focus/select element
 help_command_yank=複製目前網頁的網址至剪貼簿
 help_command_reload=重新載入目前網頁
 help_command_reload_force=重新載入目前網頁及所有外部資源（js，css，img)
@@ -53,8 +53,9 @@ help_command_restore_tab=恢復最後關閉的分頁
 
 help_section_browse=瀏覽
 help_command_follow=打開目前網頁上的某個連結
-help_command_follow_in_tab=在新分頁上打開目前網頁上的某個連結
-help_command_follow_multiple=打開目前網頁上的多個連結
+help_command_follow_in_tab=Follow link in a new background tab
+help_command_follow_in_focused_tab=Follow link in a new foreground tab
+help_command_follow_multiple=Follow multiple links in new background tabs, focus text input or click multiple buttons
 help_command_follow_previous=到上一頁
 help_command_follow_next=到下一頁
 help_command_go_up_path=打開網址的上一級目錄
diff --git a/extension/resources/style.css b/extension/resources/style.css
index 6527ece..01ae415 100644
--- a/extension/resources/style.css
+++ b/extension/resources/style.css
@@ -108,7 +108,8 @@
     text-transform: uppercase;
 }
 
-.VimFxCharMatch {
+.VimFxCharMatch,
+.VimFxMatchedHintMarker {
     color: #ffa22a;
 }
 
-- 
2.39.3