 
   'ctrl-f': 'find-and-replace:show'
 
+  # Subword motion
+  '-': 'vim-mode-plus:move-to-next-subword'
+  '_': 'vim-mode-plus:move-to-previous-subword'
+
+  # Surround
+  'S': 'vim-mode-plus:surround'
+  'S d': 'vim-mode-plus:delete-surround-any-pair'
+  'S D': 'vim-mode-plus:delete-surround-any-pair'
+  'S S d': 'vim-mode-plus:delete-surround'
+  'S S D': 'vim-mode-plus:delete-surround'
+  'S c': 'vim-mode-plus:change-surround-any-pair'
+  'S C': 'vim-mode-plus:change-surround-any-pair'
+  'S S c': 'vim-mode-plus:change-surround'
+  'S S C': 'vim-mode-plus:change-surround'
+
+  # Tab navigation
+  'g T': 'unset!'
+  'g t': 'unset!'
+
   # Pane navigation
   'space h': 'window:focus-pane-on-left'
   'space l': 'window:focus-pane-on-right'

  'space p t': 'omnisharp-atom:type-lookup'
  'space p g': 'omnisharp-atom:go-to-definition'
  'space p r': 'omnisharp-atom:rename'
  'space p /': 'omnisharp-atom:find-symbols'
  'space p \\': 'omnisharp-atom:find-symbols'

'atom-text-editor[data-grammar="text html basic"]:not([mini]), atom-text-editor[data-grammar~="erb"]:not([mini]), atom-text-editor[data-grammar~="jade"]:not([mini]), atom-text-editor[data-grammar~="css"]:not([mini]), atom-text-editor[data-grammar~="stylus"]:not([mini]), atom-text-editor[data-grammar~="sass"]:not([mini]), atom-text-editor[data-grammar~="scss"]:not([mini])':
  'tab': 'emmet:expand-abbreviation-with-tab'

'atom-pane':
  'ctrl-q': 'core:close'

  # Tab navigation
  'ctrl-h': 'pane:show-previous-item'
  'ctrl-l': 'pane:show-next-item'

# vim-mode-plus
#
## *-mode
'body, atom-text-editor':
  'ctrl-j': 'core:move-down'
  'ctrl-k': 'core:move-up'
  'ctrl-q': 'core:close'

  # Tab navigation
  'ctrl-h': 'pane:show-previous-item'
  'ctrl-l': 'pane:show-next-item'

'atom-text-editor.vim-mode-plus':
  'ctrl-c': 'core:copy'
  'ctrl-n': 'find-and-replace:select-next'

## normal-mode, visual-mode
'atom-text-editor.vim-mode-plus:not(.insert-mode)':
