   '9': 'vim-mode:set-count'
   # '"': 'vim-mode:set-count'
 
+# normal
+# -------------------------
 'atom-text-editor.vim-mode.normal-mode':
-  'i': 'vim-mode:activate-insert-mode'
-  'R': 'vim-mode:activate-replace-mode'
-  'v': 'vim-mode:activate-characterwise-visual-mode'
-  'V': 'vim-mode:activate-linewise-visual-mode'
+  'i':      'vim-mode:activate-insert-mode'
+  'R':      'vim-mode:activate-replace-mode'
+  'v':      'vim-mode:activate-characterwise-visual-mode'
+  'V':      'vim-mode:activate-linewise-visual-mode'
   'ctrl-v': 'vim-mode:activate-blockwise-visual-mode'
-
-  'u': 'vim-mode:undo'
+  'u':      'vim-mode:undo'
   'ctrl-r': 'core:redo'
-
-  'O': 'vim-mode:insert-above-with-newline'
-  'o': 'vim-mode:insert-below-with-newline'
-  'a': 'vim-mode:insert-after'
-  'A': 'vim-mode:insert-after-end-of-line'
-  'x': 'vim-mode:delete-right'
-  'X': 'vim-mode:delete-left'
-  's': 'vim-mode:substitute'
-  '.': 'vim-mode:repeat'
-
+  'O':      'vim-mode:insert-above-with-newline'
+  'o':      'vim-mode:insert-below-with-newline'
+  'a':      'vim-mode:insert-after'
+  'A':      'vim-mode:insert-after-end-of-line'
+  'x':      'vim-mode:delete-right'
+  'X':      'vim-mode:delete-left'
+  's':      'vim-mode:substitute'
+  '.':      'vim-mode:repeat'
   'ctrl-]': 'symbols-view:go-to-declaration'
   'ctrl-t': 'symbols-view:return-from-declaration'
-
   'ctrl-a': 'vim-mode:increase'
   'ctrl-x': 'vim-mode:decrease'
-
-  '"': 'vim-mode:set-register-name'
-
+  '"':      'vim-mode:set-register-name'
+
+# operator-pending, visual
+# -------------------------
 'atom-text-editor.vim-mode.operator-pending-mode, atom-text-editor.vim-mode.visual-mode':
+  'x': 'vim-mode:reset-normal-mode'
+  '~': 'vim-mode:toggle-case'
+  'U': 'vim-mode:upper-case'
+  'u': 'vim-mode:lower-case'
+
+  # Text object inner-, a- order
   'i w':  'vim-mode:inner-word'
+  'a w':  'vim-mode:a-word'
+
   'i W':  'vim-mode:inner-whole-word'
+  'a W':  'vim-mode:a-whole-word'
+
   'i s':  'vim-mode:inner-any-pair'
+  'a s':  'vim-mode:a-any-pair'
+
   'i "':  'vim-mode:inner-double-quotes'
+  'a "':  'vim-mode:a-double-quotes'
+
   'i \'': 'vim-mode:inner-single-quotes'
+  'a \'': 'vim-mode:a-single-quotes'
+
   'i `':  'vim-mode:inner-back-ticks'
+  'a `':  'vim-mode:a-back-ticks'
+
   'i {':  'vim-mode:inner-curly-brackets'
+  'a {':  'vim-mode:a-curly-brackets'
+
   'i }':  'vim-mode:inner-curly-brackets'
+  'a }':  'vim-mode:a-curly-brackets'
+
   'i B':  'vim-mode:inner-curly-brackets'
+  'a B':  'vim-mode:a-curly-brackets'
+
   'i <':  'vim-mode:inner-angle-brackets'
   'i >':  'vim-mode:inner-angle-brackets'
+  'a <':  'vim-mode:a-angle-brackets'
+  'a >':  'vim-mode:a-angle-brackets'
+
   'i t':  'vim-mode:inner-tags'
+
   'i [':  'vim-mode:inner-square-brackets'
   'i ]':  'vim-mode:inner-square-brackets'
+  'a [':  'vim-mode:a-square-brackets'
+  'a ]':  'vim-mode:a-square-brackets'
+
   'i (':  'vim-mode:inner-parentheses'
   'i )':  'vim-mode:inner-parentheses'
-  'i b':  'vim-mode:inner-parentheses'
-  'i p':  'vim-mode:inner-paragraph'
-  'i /':  'vim-mode:inner-comment'
-  'i i':  'vim-mode:inner-indentation'
-  'i l':  'vim-mode:inner-current-line'
-  'i e':  'vim-mode:inner-entire'
-  'a w':  'vim-mode:a-word'
-  'a W':  'vim-mode:a-whole-word'
-  'a s':  'vim-mode:a-any-pair'
-  'a "':  'vim-mode:a-double-quotes'
-  'a \'': 'vim-mode:a-single-quotes'
-  'a `':  'vim-mode:a-back-ticks'
-  'a {':  'vim-mode:a-curly-brackets'
-  'a }':  'vim-mode:a-curly-brackets'
-  'a B':  'vim-mode:a-curly-brackets'
-  'a <':  'vim-mode:a-angle-brackets'
-  'a >':  'vim-mode:a-angle-brackets'
-  'a [':  'vim-mode:a-square-brackets'
-  'a ]':  'vim-mode:a-square-brackets'
   'a (':  'vim-mode:a-parentheses'
   'a )':  'vim-mode:a-parentheses'
+
+  'i b':  'vim-mode:inner-parentheses'
   'a b':  'vim-mode:a-parentheses'
+
+  'i p':  'vim-mode:inner-paragraph'
   'a p':  'vim-mode:a-paragraph'
+
+  'i /':  'vim-mode:inner-comment'
   'a /':  'vim-mode:a-comment'
+
+  'i i':  'vim-mode:inner-indentation'
   'a i':  'vim-mode:a-indentation'
+
+  'i l':  'vim-mode:inner-current-line'
   'a l':  'vim-mode:a-current-line'
+
+  'i e':  'vim-mode:inner-entire'
   'a e':  'vim-mode:a-entire'
-  'x':    'vim-mode:reset-normal-mode'
-
-  # works as linewise
-  'd': 'vim-mode:delete'
-  'c': 'vim-mode:change'
-  'y': 'vim-mode:yank'
-  '>': 'vim-mode:indent'
-  '<': 'vim-mode:outdent'
-  '=': 'vim-mode:auto-indent'
-
-  '~':   'vim-mode:toggle-case'
-  'g ~': 'vim-mode:toggle-case'
-  'U':   'vim-mode:upper-case'
-  'g U': 'vim-mode:upper-case'
-  'u':   'vim-mode:lower-case'
-  'g u': 'vim-mode:lower-case'
-  # 'g -': 'vim-mode:dash-case'
-  # 'g s s': 'vim-mode:surround'
-  # 'g s d': 'vim-mode:delete-surround'
-  # 'g s c': 'vim-mode:change-surround'
-
+
+# visual
+# -------------------------
 'atom-text-editor.vim-mode.visual-mode':
   'x': 'vim-mode:delete'
   's': 'vim-mode:change'
   'o': 'vim-mode:reverse-selections'
+  '"': 'vim-mode:set-register-name'
 
   'v':      'vim-mode:activate-characterwise-visual-mode'
   'V':      'vim-mode:activate-linewise-visual-mode'
   'ctrl-v': 'vim-mode:activate-blockwise-visual-mode'
 
-  '"': 'vim-mode:set-register-name'
-
+# visual-blockwise
+# -------------------------
 'atom-text-editor.vim-mode.visual-mode.blockwise':
   'o':      'vim-mode:blockwise-other-end',
   'O':      'vim-mode:reverse-selections',

  # 'g s c ;': 'vim-mode:change-surround-any-pair'

  'ctrl-w ctrl-h': 'window:focus-pane-on-left'
  'ctrl-w h': 'window:focus-pane-on-left'
  'ctrl-w left': 'window:focus-pane-on-left'
  'ctrl-w ctrl-l': 'window:focus-pane-on-right'
  'ctrl-w l': 'window:focus-pane-on-right'
  'ctrl-w right': 'window:focus-pane-on-right'
  'ctrl-w ctrl-k': 'window:focus-pane-above'
  'ctrl-w k': 'window:focus-pane-above'
  'ctrl-w up': 'window:focus-pane-above'
  'ctrl-w ctrl-j': 'window:focus-pane-below'
  'ctrl-w j': 'window:focus-pane-below'
  'ctrl-w down': 'window:focus-pane-below'
  'ctrl-w ctrl-w': 'window:focus-next-pane'
  'ctrl-w w': 'window:focus-next-pane'
  'ctrl-w ctrl-p': 'window:focus-previous-pane'
  'ctrl-w p': 'window:focus-previous-pane'
  'ctrl-w ctrl-v': 'pane:split-right'
  'ctrl-w v': 'pane:split-right'
  'ctrl-w ctrl-s': 'pane:split-down'
  'ctrl-w s': 'pane:split-down'
  'ctrl-w ctrl-c': 'pane:close'
  'ctrl-w c': 'pane:close'
  'ctrl-w ctrl-q': 'core:close'
  'ctrl-w q': 'core:close'
  'g t': 'pane:show-next-item'
  'g T': 'pane:show-previous-item'

  'm': 'vim-mode:mark'
  '`': 'vim-mode:move-to-mark'
  '\'': 'vim-mode:move-to-mark-line'

  'f': 'vim-mode:find'

  '#': 'vim-mode:reverse-search-current-word'
  'n': 'vim-mode:repeat-search'
  'N': 'vim-mode:repeat-search-backwards'
  '%': 'vim-mode:bracket-matching-motion'

  '1': 'vim-mode:set-count'
