diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 33d3bc03cc..75328646b4 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -1,2421 +1,2421 @@
 <?php
 
 /**
  * This file is automatically generated. Use 'bin/celerity map' to rebuild it.
  *
  * @generated
  */
 return array(
   'names' => array(
     'conpherence.pkg.css' => '3c8a0668',
     'conpherence.pkg.js' => '020aebcf',
-    'core.pkg.css' => '86f155f9',
-    'core.pkg.js' => '705aec2c',
+    'core.pkg.css' => 'a4a2417c',
+    'core.pkg.js' => '4355a8d3',
     'differential.pkg.css' => '607c84be',
-    'differential.pkg.js' => '99e2cb01',
+    'differential.pkg.js' => 'ececaeef',
     'diffusion.pkg.css' => '42c75c37',
     'diffusion.pkg.js' => 'a98c0bf7',
     'maniphest.pkg.css' => '35995d6d',
     'maniphest.pkg.js' => 'c9308721',
     'rsrc/audio/basic/alert.mp3' => '17889334',
     'rsrc/audio/basic/bing.mp3' => 'a817a0c3',
     'rsrc/audio/basic/pock.mp3' => '0fa843d0',
     'rsrc/audio/basic/tap.mp3' => '02d16994',
     'rsrc/audio/basic/ting.mp3' => 'a6b6540e',
     'rsrc/css/aphront/aphront-bars.css' => '4a327b4a',
     'rsrc/css/aphront/dark-console.css' => '7f06cda2',
     'rsrc/css/aphront/dialog-view.css' => '874f5c06',
     'rsrc/css/aphront/list-filter-view.css' => 'feb64255',
     'rsrc/css/aphront/multi-column.css' => 'fbc00ba3',
     'rsrc/css/aphront/notification.css' => '30240bd2',
     'rsrc/css/aphront/panel-view.css' => '46923d46',
     'rsrc/css/aphront/phabricator-nav-view.css' => 'f8a0c1bf',
     'rsrc/css/aphront/table-view.css' => '0bb61df1',
     'rsrc/css/aphront/tokenizer.css' => '34e2a838',
     'rsrc/css/aphront/tooltip.css' => 'e3f2412f',
     'rsrc/css/aphront/typeahead-browse.css' => 'b7ed02d2',
     'rsrc/css/aphront/typeahead.css' => '8779483d',
     'rsrc/css/application/almanac/almanac.css' => '2e050f4f',
     'rsrc/css/application/auth/auth.css' => 'c2f23d74',
     'rsrc/css/application/base/main-menu-view.css' => 'bcec20f0',
     'rsrc/css/application/base/notification-menu.css' => '4df1ee30',
     'rsrc/css/application/base/phui-theme.css' => '35883b37',
-    'rsrc/css/application/base/standard-page-view.css' => '8a295cb9',
+    'rsrc/css/application/base/standard-page-view.css' => 'ed076e5a',
     'rsrc/css/application/chatlog/chatlog.css' => 'abdc76ee',
     'rsrc/css/application/conduit/conduit-api.css' => 'ce2cfc41',
     'rsrc/css/application/config/config-options.css' => '16c920ae',
     'rsrc/css/application/config/config-template.css' => '20babf50',
     'rsrc/css/application/config/setup-issue.css' => '5eed85b2',
     'rsrc/css/application/config/unhandled-exception.css' => '9ecfc00d',
     'rsrc/css/application/conpherence/color.css' => 'b17746b0',
     'rsrc/css/application/conpherence/durable-column.css' => '2d57072b',
     'rsrc/css/application/conpherence/header-pane.css' => 'c9a3db8e',
     'rsrc/css/application/conpherence/menu.css' => '67f4680d',
     'rsrc/css/application/conpherence/message-pane.css' => 'd244db1e',
     'rsrc/css/application/conpherence/notification.css' => '6a3d4e58',
     'rsrc/css/application/conpherence/participant-pane.css' => '69e0058a',
     'rsrc/css/application/conpherence/transaction.css' => '3a3f5e7e',
     'rsrc/css/application/contentsource/content-source-view.css' => 'cdf0d579',
     'rsrc/css/application/countdown/timer.css' => 'bff8012f',
     'rsrc/css/application/daemon/bulk-job.css' => '73af99f5',
     'rsrc/css/application/dashboard/dashboard.css' => '5a205b9d',
     'rsrc/css/application/diff/inline-comment-summary.css' => '81eb368d',
     'rsrc/css/application/differential/add-comment.css' => '7e5900d9',
     'rsrc/css/application/differential/changeset-view.css' => '489b6995',
     'rsrc/css/application/differential/core.css' => '7300a73e',
     'rsrc/css/application/differential/phui-inline-comment.css' => '48acce5b',
     'rsrc/css/application/differential/revision-comment.css' => '7dbc8d1d',
     'rsrc/css/application/differential/revision-history.css' => '8aa3eac5',
     'rsrc/css/application/differential/revision-list.css' => '93d2df7d',
     'rsrc/css/application/differential/table-of-contents.css' => '0e3364c7',
     'rsrc/css/application/diffusion/diffusion-icons.css' => '23b31a1b',
     'rsrc/css/application/diffusion/diffusion-readme.css' => 'b68a76e4',
     'rsrc/css/application/diffusion/diffusion-repository.css' => 'b89e8c6c',
     'rsrc/css/application/diffusion/diffusion.css' => 'b54c77b0',
     'rsrc/css/application/feed/feed.css' => 'd8b6e3f8',
     'rsrc/css/application/files/global-drag-and-drop.css' => '1d2713a4',
     'rsrc/css/application/flag/flag.css' => '2b77be8d',
     'rsrc/css/application/harbormaster/harbormaster.css' => '8dfe16b2',
     'rsrc/css/application/herald/herald-test.css' => 'e004176f',
     'rsrc/css/application/herald/herald.css' => '648d39e2',
     'rsrc/css/application/maniphest/report.css' => '3d53188b',
     'rsrc/css/application/maniphest/task-edit.css' => '272daa84',
     'rsrc/css/application/maniphest/task-summary.css' => '61d1667e',
     'rsrc/css/application/objectselector/object-selector.css' => 'ee77366f',
     'rsrc/css/application/owners/owners-path-editor.css' => 'fa7c13ef',
     'rsrc/css/application/paste/paste.css' => 'b37bcd38',
     'rsrc/css/application/people/people-picture-menu-item.css' => 'fe8e07cf',
     'rsrc/css/application/people/people-profile.css' => '2ea2daa1',
     'rsrc/css/application/phame/phame.css' => 'bb442327',
     'rsrc/css/application/pholio/pholio-edit.css' => '4df55b3b',
     'rsrc/css/application/pholio/pholio-inline-comments.css' => '722b48c2',
     'rsrc/css/application/pholio/pholio.css' => '88ef5ef1',
     'rsrc/css/application/phortune/phortune-credit-card-form.css' => '3b9868a8',
     'rsrc/css/application/phortune/phortune-invoice.css' => '4436b241',
     'rsrc/css/application/phortune/phortune.css' => '508a1a5e',
     'rsrc/css/application/phrequent/phrequent.css' => 'bd79cc67',
     'rsrc/css/application/phriction/phriction-document-css.css' => '03380da0',
     'rsrc/css/application/policy/policy-edit.css' => '8794e2ed',
     'rsrc/css/application/policy/policy-transaction-detail.css' => 'c02b8384',
     'rsrc/css/application/policy/policy.css' => 'ceb56a08',
     'rsrc/css/application/ponder/ponder-view.css' => '05a09d0a',
     'rsrc/css/application/project/project-card-view.css' => '4e7371cd',
     'rsrc/css/application/project/project-triggers.css' => 'cd9c8bb9',
     'rsrc/css/application/project/project-view.css' => '567858b3',
     'rsrc/css/application/releeph/releeph-core.css' => 'f81ff2db',
     'rsrc/css/application/releeph/releeph-preview-branch.css' => '22db5c07',
     'rsrc/css/application/releeph/releeph-request-differential-create-dialog.css' => '0ac1ea31',
     'rsrc/css/application/releeph/releeph-request-typeahead.css' => 'bce37359',
     'rsrc/css/application/search/application-search-view.css' => '0f7c06d8',
     'rsrc/css/application/search/search-results.css' => '9ea70ace',
     'rsrc/css/application/slowvote/slowvote.css' => '1694baed',
     'rsrc/css/application/tokens/tokens.css' => 'ce5a50bd',
     'rsrc/css/application/uiexample/example.css' => 'b4795059',
     'rsrc/css/core/core.css' => '1b29ed61',
     'rsrc/css/core/remarkup.css' => 'c286eaef',
     'rsrc/css/core/syntax.css' => '220b85f9',
     'rsrc/css/core/z-index.css' => '99c0f5eb',
     'rsrc/css/diviner/diviner-shared.css' => '4bd263b0',
     'rsrc/css/font/font-awesome.css' => '3883938a',
     'rsrc/css/font/font-lato.css' => '23631304',
     'rsrc/css/font/phui-font-icon-base.css' => 'd7994e06',
     'rsrc/css/layout/phabricator-filetree-view.css' => '56cdd875',
     'rsrc/css/layout/phabricator-source-code-view.css' => '03d7ac28',
     'rsrc/css/phui/button/phui-button-bar.css' => 'a4aa75c4',
     'rsrc/css/phui/button/phui-button-simple.css' => '1ff278aa',
     'rsrc/css/phui/button/phui-button.css' => 'ea704902',
     'rsrc/css/phui/calendar/phui-calendar-day.css' => '9597d706',
     'rsrc/css/phui/calendar/phui-calendar-list.css' => 'ccd7e4e2',
     'rsrc/css/phui/calendar/phui-calendar-month.css' => 'cb758c42',
     'rsrc/css/phui/calendar/phui-calendar.css' => 'f11073aa',
     'rsrc/css/phui/object-item/phui-oi-big-ui.css' => 'fa74cc35',
     'rsrc/css/phui/object-item/phui-oi-color.css' => 'b517bfa0',
     'rsrc/css/phui/object-item/phui-oi-drag-ui.css' => 'da15d3dc',
     'rsrc/css/phui/object-item/phui-oi-flush-ui.css' => '490e2e2e',
     'rsrc/css/phui/object-item/phui-oi-list-view.css' => 'd7723ecc',
     'rsrc/css/phui/object-item/phui-oi-simple-ui.css' => '6a30fa46',
     'rsrc/css/phui/phui-action-list.css' => 'e820263c',
     'rsrc/css/phui/phui-action-panel.css' => '6c386cbf',
     'rsrc/css/phui/phui-badge.css' => '666e25ad',
     'rsrc/css/phui/phui-basic-nav-view.css' => '56ebd66d',
     'rsrc/css/phui/phui-big-info-view.css' => '362ad37b',
     'rsrc/css/phui/phui-box.css' => '5ed3b8cb',
     'rsrc/css/phui/phui-bulk-editor.css' => '374d5e30',
     'rsrc/css/phui/phui-chart.css' => '14df9ae3',
     'rsrc/css/phui/phui-cms.css' => '8c05c41e',
     'rsrc/css/phui/phui-comment-form.css' => '68a2d99a',
     'rsrc/css/phui/phui-comment-panel.css' => 'ec4e31c0',
     'rsrc/css/phui/phui-crumbs-view.css' => '614f43cf',
     'rsrc/css/phui/phui-curtain-object-ref-view.css' => '12404744',
     'rsrc/css/phui/phui-curtain-view.css' => '68c5efb6',
     'rsrc/css/phui/phui-document-pro.css' => 'b9613a10',
     'rsrc/css/phui/phui-document-summary.css' => 'b068eed1',
     'rsrc/css/phui/phui-document.css' => '52b748a5',
     'rsrc/css/phui/phui-feed-story.css' => 'a0c05029',
     'rsrc/css/phui/phui-fontkit.css' => '1ec937e5',
     'rsrc/css/phui/phui-form-view.css' => '01b796c0',
     'rsrc/css/phui/phui-form.css' => '1f177cb7',
     'rsrc/css/phui/phui-head-thing.css' => 'd7f293df',
     'rsrc/css/phui/phui-header-view.css' => '36c86a58',
     'rsrc/css/phui/phui-hovercard.css' => '6ca90fa0',
     'rsrc/css/phui/phui-icon-set-selector.css' => '7aa5f3ec',
     'rsrc/css/phui/phui-icon.css' => '4cbc684a',
     'rsrc/css/phui/phui-image-mask.css' => '62c7f4d2',
     'rsrc/css/phui/phui-info-view.css' => 'a10a909b',
     'rsrc/css/phui/phui-invisible-character-view.css' => 'c694c4a4',
     'rsrc/css/phui/phui-left-right.css' => '68513c34',
     'rsrc/css/phui/phui-lightbox.css' => '4ebf22da',
-    'rsrc/css/phui/phui-list.css' => 'b05144dd',
+    'rsrc/css/phui/phui-list.css' => '2f253c22',
     'rsrc/css/phui/phui-object-box.css' => 'b8d7eea0',
     'rsrc/css/phui/phui-pager.css' => 'd022c7ad',
     'rsrc/css/phui/phui-pinboard-view.css' => '1f08f5d8',
     'rsrc/css/phui/phui-policy-section-view.css' => '139fdc64',
     'rsrc/css/phui/phui-property-list-view.css' => '9c477af1',
     'rsrc/css/phui/phui-remarkup-preview.css' => '91767007',
     'rsrc/css/phui/phui-segment-bar-view.css' => '5166b370',
     'rsrc/css/phui/phui-spacing.css' => 'b05cadc3',
     'rsrc/css/phui/phui-status.css' => 'e5ff8be0',
     'rsrc/css/phui/phui-tag-view.css' => '8519160a',
     'rsrc/css/phui/phui-timeline-view.css' => '1e348e4b',
     'rsrc/css/phui/phui-two-column-view.css' => 'f96d319f',
     'rsrc/css/phui/workboards/phui-workboard-color.css' => 'e86de308',
     'rsrc/css/phui/workboards/phui-workboard.css' => '74fc9d98',
     'rsrc/css/phui/workboards/phui-workcard.css' => '913441b6',
     'rsrc/css/phui/workboards/phui-workpanel.css' => '3ae89b20',
     'rsrc/css/sprite-login.css' => '18b368a6',
     'rsrc/css/sprite-tokens.css' => 'f1896dc5',
     'rsrc/css/syntax/syntax-default.css' => '055fc231',
     'rsrc/externals/d3/d3.min.js' => '9d068042',
     'rsrc/externals/font/fontawesome/fontawesome-webfont.eot' => '23f8c698',
     'rsrc/externals/font/fontawesome/fontawesome-webfont.ttf' => '70983df0',
     'rsrc/externals/font/fontawesome/fontawesome-webfont.woff' => 'cd02f93b',
     'rsrc/externals/font/fontawesome/fontawesome-webfont.woff2' => '351fd46a',
     'rsrc/externals/font/lato/lato-bold.eot' => '7367aa5e',
     'rsrc/externals/font/lato/lato-bold.svg' => '681aa4f5',
     'rsrc/externals/font/lato/lato-bold.ttf' => '66d3c296',
     'rsrc/externals/font/lato/lato-bold.woff' => '89d9fba7',
     'rsrc/externals/font/lato/lato-bold.woff2' => '389fcdb1',
     'rsrc/externals/font/lato/lato-bolditalic.eot' => '03eeb4da',
     'rsrc/externals/font/lato/lato-bolditalic.svg' => 'f56fa11c',
     'rsrc/externals/font/lato/lato-bolditalic.ttf' => '9c3aec21',
     'rsrc/externals/font/lato/lato-bolditalic.woff' => 'bfbd0616',
     'rsrc/externals/font/lato/lato-bolditalic.woff2' => 'bc7d1274',
     'rsrc/externals/font/lato/lato-italic.eot' => '7db5b247',
     'rsrc/externals/font/lato/lato-italic.svg' => 'b1ae496f',
     'rsrc/externals/font/lato/lato-italic.ttf' => '43eed813',
     'rsrc/externals/font/lato/lato-italic.woff' => 'c28975e1',
     'rsrc/externals/font/lato/lato-italic.woff2' => 'fffc0d8c',
     'rsrc/externals/font/lato/lato-regular.eot' => '06e0c291',
     'rsrc/externals/font/lato/lato-regular.svg' => '3ad95f53',
     'rsrc/externals/font/lato/lato-regular.ttf' => 'e2e9c398',
     'rsrc/externals/font/lato/lato-regular.woff' => '0b13d332',
     'rsrc/externals/font/lato/lato-regular.woff2' => '8f846797',
     'rsrc/externals/javelin/core/Event.js' => 'c03f2fb4',
     'rsrc/externals/javelin/core/Stratcom.js' => '0889b835',
     'rsrc/externals/javelin/core/__tests__/event-stop-and-kill.js' => '048472d2',
     'rsrc/externals/javelin/core/__tests__/install.js' => '14a7e671',
     'rsrc/externals/javelin/core/__tests__/stratcom.js' => 'a28464bb',
     'rsrc/externals/javelin/core/__tests__/util.js' => 'e29a4354',
     'rsrc/externals/javelin/core/init.js' => '98e6504a',
     'rsrc/externals/javelin/core/init_node.js' => '16961339',
     'rsrc/externals/javelin/core/install.js' => '5902260c',
     'rsrc/externals/javelin/core/util.js' => 'edb4d8c9',
     'rsrc/externals/javelin/docs/Base.js' => '5a401d7d',
     'rsrc/externals/javelin/docs/onload.js' => 'ee58fb62',
     'rsrc/externals/javelin/ext/fx/Color.js' => '78f811c9',
     'rsrc/externals/javelin/ext/fx/FX.js' => '34450586',
     'rsrc/externals/javelin/ext/reactor/core/DynVal.js' => '202a2e85',
     'rsrc/externals/javelin/ext/reactor/core/Reactor.js' => '1c850a26',
     'rsrc/externals/javelin/ext/reactor/core/ReactorNode.js' => '72960bc1',
     'rsrc/externals/javelin/ext/reactor/core/ReactorNodeCalmer.js' => '225bbb98',
     'rsrc/externals/javelin/ext/reactor/dom/RDOM.js' => '6cfa0008',
     'rsrc/externals/javelin/ext/view/HTMLView.js' => 'f8c4e135',
     'rsrc/externals/javelin/ext/view/View.js' => '289bf236',
     'rsrc/externals/javelin/ext/view/ViewInterpreter.js' => '876506b6',
     'rsrc/externals/javelin/ext/view/ViewPlaceholder.js' => 'a9942052',
     'rsrc/externals/javelin/ext/view/ViewRenderer.js' => '9aae2b66',
     'rsrc/externals/javelin/ext/view/ViewVisitor.js' => '308f9fe4',
     'rsrc/externals/javelin/ext/view/__tests__/HTMLView.js' => '6e50a13f',
     'rsrc/externals/javelin/ext/view/__tests__/View.js' => 'd284be5d',
     'rsrc/externals/javelin/ext/view/__tests__/ViewInterpreter.js' => 'a9f35511',
     'rsrc/externals/javelin/ext/view/__tests__/ViewRenderer.js' => '3a1b81f6',
     'rsrc/externals/javelin/lib/Cookie.js' => '05d290ef',
     'rsrc/externals/javelin/lib/DOM.js' => '94681e22',
     'rsrc/externals/javelin/lib/History.js' => '030b4f7a',
     'rsrc/externals/javelin/lib/JSON.js' => '541f81c3',
     'rsrc/externals/javelin/lib/Leader.js' => '0d2490ce',
     'rsrc/externals/javelin/lib/Mask.js' => '7c4d8998',
     'rsrc/externals/javelin/lib/Quicksand.js' => 'd3799cb4',
     'rsrc/externals/javelin/lib/Request.js' => '84e6891f',
     'rsrc/externals/javelin/lib/Resource.js' => '740956e1',
     'rsrc/externals/javelin/lib/Routable.js' => '6a18c42e',
     'rsrc/externals/javelin/lib/Router.js' => '32755edb',
     'rsrc/externals/javelin/lib/Scrollbar.js' => 'a43ae2ae',
     'rsrc/externals/javelin/lib/Sound.js' => 'd4cc2d2a',
     'rsrc/externals/javelin/lib/URI.js' => '2e255291',
     'rsrc/externals/javelin/lib/Vector.js' => 'e9c80beb',
     'rsrc/externals/javelin/lib/WebSocket.js' => 'fdc13e4e',
     'rsrc/externals/javelin/lib/Workflow.js' => '945ff654',
     'rsrc/externals/javelin/lib/__tests__/Cookie.js' => 'ca686f71',
     'rsrc/externals/javelin/lib/__tests__/DOM.js' => '4566e249',
     'rsrc/externals/javelin/lib/__tests__/JSON.js' => '710377ae',
     'rsrc/externals/javelin/lib/__tests__/URI.js' => '6fff0c2b',
     'rsrc/externals/javelin/lib/__tests__/behavior.js' => '8426ebeb',
     'rsrc/externals/javelin/lib/behavior.js' => '1b6acc2a',
     'rsrc/externals/javelin/lib/control/tokenizer/Tokenizer.js' => '89a1ae3a',
     'rsrc/externals/javelin/lib/control/typeahead/Typeahead.js' => 'a4356cde',
     'rsrc/externals/javelin/lib/control/typeahead/normalizer/TypeaheadNormalizer.js' => 'a241536a',
     'rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadCompositeSource.js' => '22ee68a5',
     'rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadOnDemandSource.js' => '23387297',
     'rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadPreloadedSource.js' => '5a79f6c3',
     'rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadSource.js' => '8badee71',
     'rsrc/externals/javelin/lib/control/typeahead/source/TypeaheadStaticSource.js' => '80bff3af',
     'rsrc/favicons/favicon-16x16.png' => '4c51a03a',
     'rsrc/favicons/mask-icon.svg' => 'db699fe1',
     'rsrc/image/BFCFDA.png' => '74b5c88b',
     'rsrc/image/actions/edit.png' => 'fd987dff',
     'rsrc/image/avatar.png' => '0d17c6c4',
     'rsrc/image/checker_dark.png' => '7fc8fa7b',
     'rsrc/image/checker_light.png' => '3157a202',
     'rsrc/image/checker_lighter.png' => 'c45928c1',
     'rsrc/image/chevron-in.png' => '1aa2f88f',
     'rsrc/image/chevron-out.png' => 'c815e272',
     'rsrc/image/controls/checkbox-checked.png' => '1770d7a0',
     'rsrc/image/controls/checkbox-unchecked.png' => 'e1deba0a',
     'rsrc/image/d5d8e1.png' => '6764616e',
     'rsrc/image/darkload.gif' => '5bd41a89',
     'rsrc/image/divot.png' => '0fbe2453',
     'rsrc/image/examples/hero.png' => '5d8c4b21',
     'rsrc/image/grippy_texture.png' => 'a7d222b5',
     'rsrc/image/icon/fatcow/arrow_branch.png' => '98149d9f',
     'rsrc/image/icon/fatcow/arrow_merge.png' => 'e142f4f8',
     'rsrc/image/icon/fatcow/calendar_edit.png' => '5ff44a08',
     'rsrc/image/icon/fatcow/document_black.png' => 'd3515fa5',
     'rsrc/image/icon/fatcow/flag_blue.png' => '54db2e5c',
     'rsrc/image/icon/fatcow/flag_finish.png' => '2953a51b',
     'rsrc/image/icon/fatcow/flag_ghost.png' => '7d9ada92',
     'rsrc/image/icon/fatcow/flag_green.png' => '010f7161',
     'rsrc/image/icon/fatcow/flag_orange.png' => '6c384ca5',
     'rsrc/image/icon/fatcow/flag_pink.png' => '11ac6b12',
     'rsrc/image/icon/fatcow/flag_purple.png' => 'c4f423a4',
     'rsrc/image/icon/fatcow/flag_red.png' => '9e6d8817',
     'rsrc/image/icon/fatcow/flag_yellow.png' => '906733f4',
     'rsrc/image/icon/fatcow/key_question.png' => 'c10c26db',
     'rsrc/image/icon/fatcow/link.png' => '8edbf327',
     'rsrc/image/icon/fatcow/page_white_edit.png' => '17ef5625',
     'rsrc/image/icon/fatcow/page_white_put.png' => '82430c91',
     'rsrc/image/icon/fatcow/source/conduit.png' => '5b55130c',
     'rsrc/image/icon/fatcow/source/email.png' => '8a32b77f',
     'rsrc/image/icon/fatcow/source/fax.png' => '8bc2a49b',
     'rsrc/image/icon/fatcow/source/mobile.png' => '0a918412',
     'rsrc/image/icon/fatcow/source/tablet.png' => 'fc50b050',
     'rsrc/image/icon/fatcow/source/web.png' => '70433af3',
     'rsrc/image/icon/subscribe.png' => '07ef454e',
     'rsrc/image/icon/tango/attachment.png' => 'bac9032d',
     'rsrc/image/icon/tango/edit.png' => 'e6296206',
     'rsrc/image/icon/tango/go-down.png' => '0b903712',
     'rsrc/image/icon/tango/log.png' => '86b6a6f4',
     'rsrc/image/icon/tango/upload.png' => '3fe6b92d',
     'rsrc/image/icon/unsubscribe.png' => 'db04378a',
     'rsrc/image/lightblue-header.png' => 'e6d483c6',
     'rsrc/image/logo/light-eye.png' => '72337472',
     'rsrc/image/main_texture.png' => '894d03c4',
     'rsrc/image/menu_texture.png' => '896c9ade',
     'rsrc/image/people/harding.png' => '95b2db63',
     'rsrc/image/people/jefferson.png' => 'e883a3a2',
     'rsrc/image/people/lincoln.png' => 'be2c07c5',
     'rsrc/image/people/mckinley.png' => '6af510a0',
     'rsrc/image/people/taft.png' => 'b15ab07e',
     'rsrc/image/people/user0.png' => '4bc64b40',
     'rsrc/image/people/user1.png' => '8063f445',
     'rsrc/image/people/user2.png' => 'd28246c0',
     'rsrc/image/people/user3.png' => 'fb1ac12d',
     'rsrc/image/people/user4.png' => 'fe4fac8f',
     'rsrc/image/people/user5.png' => '3d07065c',
     'rsrc/image/people/user6.png' => 'e4bd47c8',
     'rsrc/image/people/user7.png' => '71d8fe8b',
     'rsrc/image/people/user8.png' => '85f86bf7',
     'rsrc/image/people/user9.png' => '523db8aa',
     'rsrc/image/people/washington.png' => '86159e68',
     'rsrc/image/phrequent_active.png' => 'de66dc50',
     'rsrc/image/phrequent_inactive.png' => '79c61baf',
     'rsrc/image/resize.png' => '9cc83373',
     'rsrc/image/sprite-login-X2.png' => '604545f6',
     'rsrc/image/sprite-login.png' => '7a001a9a',
     'rsrc/image/sprite-tokens-X2.png' => '21621dd9',
     'rsrc/image/sprite-tokens.png' => 'bede2580',
     'rsrc/image/texture/card-gradient.png' => 'e6892cb4',
     'rsrc/image/texture/dark-menu-hover.png' => '390a4fa1',
     'rsrc/image/texture/dark-menu.png' => '542f699c',
     'rsrc/image/texture/grip.png' => 'bc80753a',
     'rsrc/image/texture/panel-header-gradient.png' => '65004dbf',
     'rsrc/image/texture/phlnx-bg.png' => '6c9cd31d',
     'rsrc/image/texture/pholio-background.gif' => '84910bfc',
     'rsrc/image/texture/table_header.png' => '7652d1ad',
     'rsrc/image/texture/table_header_hover.png' => '12ea5236',
     'rsrc/image/texture/table_header_tall.png' => '5cc420c4',
     'rsrc/js/application/aphlict/Aphlict.js' => '022516b4',
     'rsrc/js/application/aphlict/behavior-aphlict-dropdown.js' => 'e9a2940f',
     'rsrc/js/application/aphlict/behavior-aphlict-listen.js' => '4e61fa88',
     'rsrc/js/application/aphlict/behavior-aphlict-status.js' => 'c3703a16',
     'rsrc/js/application/aphlict/behavior-desktop-notifications-control.js' => '070679fe',
     'rsrc/js/application/calendar/behavior-day-view.js' => '727a5a61',
     'rsrc/js/application/calendar/behavior-event-all-day.js' => '0b1bc990',
     'rsrc/js/application/calendar/behavior-month-view.js' => '158c64e0',
     'rsrc/js/application/config/behavior-reorder-fields.js' => '2539f834',
     'rsrc/js/application/conpherence/ConpherenceThreadManager.js' => 'aec8e38c',
     'rsrc/js/application/conpherence/behavior-conpherence-search.js' => '91befbcc',
     'rsrc/js/application/conpherence/behavior-durable-column.js' => 'fa6f30b2',
     'rsrc/js/application/conpherence/behavior-menu.js' => '8c2ed2bf',
     'rsrc/js/application/conpherence/behavior-participant-pane.js' => '43ba89a2',
     'rsrc/js/application/conpherence/behavior-pontificate.js' => '4ae58b5a',
     'rsrc/js/application/conpherence/behavior-quicksand-blacklist.js' => '5a6f6a06',
     'rsrc/js/application/conpherence/behavior-toggle-widget.js' => '8f959ad0',
     'rsrc/js/application/countdown/timer.js' => '6a162524',
     'rsrc/js/application/daemon/behavior-bulk-job-reload.js' => '3829a3cf',
     'rsrc/js/application/dashboard/behavior-dashboard-async-panel.js' => '9c01e364',
     'rsrc/js/application/dashboard/behavior-dashboard-move-panels.js' => 'a2ab19be',
     'rsrc/js/application/dashboard/behavior-dashboard-query-panel-select.js' => '1e413dc9',
     'rsrc/js/application/dashboard/behavior-dashboard-tab-panel.js' => '0116d3e8',
     'rsrc/js/application/diff/DiffChangeset.js' => '5a4e4a3b',
-    'rsrc/js/application/diff/DiffChangesetList.js' => '4769cfe7',
+    'rsrc/js/application/diff/DiffChangesetList.js' => 'f813ef26',
     'rsrc/js/application/diff/DiffInline.js' => '16e97ebc',
     'rsrc/js/application/diff/behavior-preview-link.js' => 'f51e9c17',
     'rsrc/js/application/differential/behavior-diff-radios.js' => '925fe8cd',
     'rsrc/js/application/differential/behavior-populate.js' => 'dfa1d313',
     'rsrc/js/application/diffusion/DiffusionLocateFileSource.js' => '94243d89',
     'rsrc/js/application/diffusion/behavior-audit-preview.js' => 'b7b73831',
     'rsrc/js/application/diffusion/behavior-commit-branches.js' => '4b671572',
     'rsrc/js/application/diffusion/behavior-commit-graph.js' => 'ef836bf2',
     'rsrc/js/application/diffusion/behavior-locate-file.js' => '87428eb2',
     'rsrc/js/application/diffusion/behavior-pull-lastmodified.js' => 'c715c123',
     'rsrc/js/application/doorkeeper/behavior-doorkeeper-tag.js' => '6a85bc5a',
     'rsrc/js/application/drydock/drydock-live-operation-status.js' => '47a0728b',
     'rsrc/js/application/fact/Chart.js' => '52e3ff03',
     'rsrc/js/application/fact/ChartCurtainView.js' => '86954222',
     'rsrc/js/application/fact/ChartFunctionLabel.js' => '81de1dab',
     'rsrc/js/application/files/behavior-document-engine.js' => '243d6c22',
     'rsrc/js/application/files/behavior-icon-composer.js' => '38a6cedb',
     'rsrc/js/application/files/behavior-launch-icon-composer.js' => 'a17b84f1',
     'rsrc/js/application/harbormaster/behavior-harbormaster-log.js' => 'b347a301',
     'rsrc/js/application/herald/HeraldRuleEditor.js' => '2633bef7',
     'rsrc/js/application/herald/PathTypeahead.js' => 'ad486db3',
     'rsrc/js/application/herald/herald-rule-editor.js' => '0922e81d',
     'rsrc/js/application/maniphest/behavior-batch-selector.js' => '139ef688',
     'rsrc/js/application/maniphest/behavior-line-chart.js' => 'ad258e28',
     'rsrc/js/application/maniphest/behavior-list-edit.js' => 'c687e867',
     'rsrc/js/application/owners/OwnersPathEditor.js' => '2a8b62d9',
     'rsrc/js/application/owners/owners-path-editor.js' => 'ff688a7a',
     'rsrc/js/application/passphrase/passphrase-credential-control.js' => '48fe33d0',
     'rsrc/js/application/pholio/behavior-pholio-mock-edit.js' => '3eed1f2b',
     'rsrc/js/application/pholio/behavior-pholio-mock-view.js' => '5aa1544e',
     'rsrc/js/application/phortune/behavior-stripe-payment-form.js' => '02cb4398',
     'rsrc/js/application/phortune/behavior-test-payment-form.js' => '4a7fb02b',
     'rsrc/js/application/phortune/phortune-credit-card-form.js' => 'd12d214f',
     'rsrc/js/application/policy/behavior-policy-control.js' => '0eaa33a9',
     'rsrc/js/application/policy/behavior-policy-rule-editor.js' => '9347f172',
     'rsrc/js/application/projects/WorkboardBoard.js' => 'b46d88c5',
     'rsrc/js/application/projects/WorkboardCard.js' => '0392a5d8',
     'rsrc/js/application/projects/WorkboardCardTemplate.js' => '84f82dad',
     'rsrc/js/application/projects/WorkboardColumn.js' => 'c3d24e63',
     'rsrc/js/application/projects/WorkboardController.js' => 'b9d0c2f3',
     'rsrc/js/application/projects/WorkboardDropEffect.js' => '8e0aa661',
     'rsrc/js/application/projects/WorkboardHeader.js' => '111bfd2d',
     'rsrc/js/application/projects/WorkboardHeaderTemplate.js' => 'ebe83a6b',
     'rsrc/js/application/projects/WorkboardOrderTemplate.js' => '03e8891f',
     'rsrc/js/application/projects/behavior-project-boards.js' => '58cb6a88',
     'rsrc/js/application/projects/behavior-project-create.js' => '34c53422',
     'rsrc/js/application/projects/behavior-reorder-columns.js' => '8ac32fd9',
     'rsrc/js/application/releeph/releeph-preview-branch.js' => '75184d68',
     'rsrc/js/application/releeph/releeph-request-state-change.js' => '9f081f05',
     'rsrc/js/application/releeph/releeph-request-typeahead.js' => 'aa3a100c',
     'rsrc/js/application/repository/repository-crossreference.js' => '1c95ea63',
     'rsrc/js/application/search/behavior-reorder-profile-menu-items.js' => 'e5bdb730',
     'rsrc/js/application/search/behavior-reorder-queries.js' => 'b86f297f',
     'rsrc/js/application/transactions/behavior-comment-actions.js' => '4dffaeb2',
     'rsrc/js/application/transactions/behavior-reorder-configs.js' => '4842f137',
     'rsrc/js/application/transactions/behavior-reorder-fields.js' => '0ad8d31f',
-    'rsrc/js/application/transactions/behavior-show-older-transactions.js' => '600f440c',
+    'rsrc/js/application/transactions/behavior-show-older-transactions.js' => '8b5c7d65',
     'rsrc/js/application/transactions/behavior-transaction-comment-form.js' => '2bdadf1a',
     'rsrc/js/application/transactions/behavior-transaction-list.js' => '9cec214e',
     'rsrc/js/application/trigger/TriggerRule.js' => '41b7b4f6',
     'rsrc/js/application/trigger/TriggerRuleControl.js' => '5faf27b9',
     'rsrc/js/application/trigger/TriggerRuleEditor.js' => 'b49fd60c',
     'rsrc/js/application/trigger/TriggerRuleType.js' => '4feea7d3',
     'rsrc/js/application/trigger/trigger-rule-editor.js' => '398fdf13',
     'rsrc/js/application/typeahead/behavior-typeahead-browse.js' => '70245195',
     'rsrc/js/application/typeahead/behavior-typeahead-search.js' => '7b139193',
     'rsrc/js/application/uiexample/gesture-example.js' => '242dedd0',
     'rsrc/js/application/uiexample/notification-example.js' => '29819b75',
     'rsrc/js/core/Busy.js' => '5202e831',
     'rsrc/js/core/DragAndDropFileUpload.js' => '4370900d',
     'rsrc/js/core/DraggableList.js' => '0169e425',
     'rsrc/js/core/Favicon.js' => '7930776a',
     'rsrc/js/core/FileUpload.js' => 'ab85e184',
     'rsrc/js/core/Hovercard.js' => '074f0783',
-    'rsrc/js/core/KeyboardShortcut.js' => 'c9749dcd',
-    'rsrc/js/core/KeyboardShortcutManager.js' => '37b8a04a',
+    'rsrc/js/core/KeyboardShortcut.js' => '1a844c06',
+    'rsrc/js/core/KeyboardShortcutManager.js' => 'ef926938',
     'rsrc/js/core/MultirowRowManager.js' => '5b54c823',
     'rsrc/js/core/Notification.js' => 'a9b91e3f',
     'rsrc/js/core/Prefab.js' => '5793d835',
     'rsrc/js/core/ShapedRequest.js' => 'abf88db8',
     'rsrc/js/core/TextAreaUtils.js' => 'f340a484',
     'rsrc/js/core/Title.js' => '43bc9360',
     'rsrc/js/core/ToolTip.js' => '83754533',
     'rsrc/js/core/behavior-active-nav.js' => '7353f43d',
     'rsrc/js/core/behavior-audio-source.js' => '3dc5ad43',
     'rsrc/js/core/behavior-autofocus.js' => '65bb0011',
     'rsrc/js/core/behavior-badge-view.js' => '92cdd7b6',
     'rsrc/js/core/behavior-bulk-editor.js' => 'aa6d2308',
     'rsrc/js/core/behavior-choose-control.js' => '04f8a1e3',
     'rsrc/js/core/behavior-copy.js' => 'cf32921f',
     'rsrc/js/core/behavior-detect-timezone.js' => '78bc5d94',
     'rsrc/js/core/behavior-device.js' => '0cf79f45',
     'rsrc/js/core/behavior-drag-and-drop-textarea.js' => '7ad020a5',
     'rsrc/js/core/behavior-fancy-datepicker.js' => '956f3eeb',
-    'rsrc/js/core/behavior-file-tree.js' => 'ee82cedb',
+    'rsrc/js/core/behavior-file-tree.js' => 'a61c2d11',
     'rsrc/js/core/behavior-form.js' => '55d7b788',
     'rsrc/js/core/behavior-gesture.js' => 'b58d1a2a',
     'rsrc/js/core/behavior-global-drag-and-drop.js' => '1cab0e9a',
     'rsrc/js/core/behavior-high-security-warning.js' => 'dae2d55b',
     'rsrc/js/core/behavior-history-install.js' => '6a1583a8',
     'rsrc/js/core/behavior-hovercard.js' => '6c379000',
     'rsrc/js/core/behavior-keyboard-pager.js' => '1325b731',
-    'rsrc/js/core/behavior-keyboard-shortcuts.js' => '2cc87f49',
+    'rsrc/js/core/behavior-keyboard-shortcuts.js' => '42c44e8b',
     'rsrc/js/core/behavior-lightbox-attachments.js' => 'c7e748bf',
     'rsrc/js/core/behavior-line-linker.js' => 'e15c8b1f',
     'rsrc/js/core/behavior-linked-container.js' => '74446546',
     'rsrc/js/core/behavior-more.js' => '506aa3f4',
     'rsrc/js/core/behavior-object-selector.js' => '98ef467f',
     'rsrc/js/core/behavior-oncopy.js' => 'ff7b3f22',
     'rsrc/js/core/behavior-phabricator-nav.js' => 'f166c949',
-    'rsrc/js/core/behavior-phabricator-remarkup-assist.js' => '2f80333f',
+    'rsrc/js/core/behavior-phabricator-remarkup-assist.js' => '54262396',
     'rsrc/js/core/behavior-read-only-warning.js' => 'b9109f8f',
     'rsrc/js/core/behavior-redirect.js' => '407ee861',
     'rsrc/js/core/behavior-refresh-csrf.js' => '46116c01',
     'rsrc/js/core/behavior-remarkup-load-image.js' => '202bfa3f',
     'rsrc/js/core/behavior-remarkup-preview.js' => 'd8a86cfb',
     'rsrc/js/core/behavior-reorder-applications.js' => 'aa371860',
     'rsrc/js/core/behavior-reveal-content.js' => 'b105a3a6',
     'rsrc/js/core/behavior-scrollbar.js' => '92388bae',
     'rsrc/js/core/behavior-search-typeahead.js' => '1cb7d027',
     'rsrc/js/core/behavior-select-content.js' => 'e8240b50',
     'rsrc/js/core/behavior-select-on-click.js' => '66365ee2',
     'rsrc/js/core/behavior-setup-check-https.js' => '01384686',
     'rsrc/js/core/behavior-time-typeahead.js' => '5803b9e7',
     'rsrc/js/core/behavior-toggle-class.js' => '32db8374',
     'rsrc/js/core/behavior-tokenizer.js' => '3b4899b0',
     'rsrc/js/core/behavior-tooltip.js' => '73ecc1f8',
     'rsrc/js/core/behavior-user-menu.js' => '60cd9241',
     'rsrc/js/core/behavior-watch-anchor.js' => '3972dadb',
     'rsrc/js/core/behavior-workflow.js' => '9623adc1',
     'rsrc/js/core/darkconsole/DarkLog.js' => '3b869402',
     'rsrc/js/core/darkconsole/DarkMessage.js' => '26cd4b73',
-    'rsrc/js/core/darkconsole/behavior-dark-console.js' => 'f39d968b',
+    'rsrc/js/core/darkconsole/behavior-dark-console.js' => '457f4d16',
     'rsrc/js/core/phtize.js' => '2f1db1ed',
     'rsrc/js/phui/behavior-phui-dropdown-menu.js' => '5cf0501a',
     'rsrc/js/phui/behavior-phui-file-upload.js' => 'e150bd50',
     'rsrc/js/phui/behavior-phui-selectable-list.js' => 'b26a41e4',
     'rsrc/js/phui/behavior-phui-submenu.js' => 'b5e9bff9',
     'rsrc/js/phui/behavior-phui-tab-group.js' => '242aa08b',
     'rsrc/js/phui/behavior-phui-timer-control.js' => 'f84bcbf4',
     'rsrc/js/phuix/PHUIXActionListView.js' => 'c68f183f',
     'rsrc/js/phuix/PHUIXActionView.js' => 'aaa08f3b',
     'rsrc/js/phuix/PHUIXAutocomplete.js' => '2fbe234d',
     'rsrc/js/phuix/PHUIXButtonView.js' => '55a24e84',
     'rsrc/js/phuix/PHUIXDropdownMenu.js' => '7acfd98b',
     'rsrc/js/phuix/PHUIXExample.js' => 'c2c500a7',
     'rsrc/js/phuix/PHUIXFormControl.js' => '38c1f3fb',
     'rsrc/js/phuix/PHUIXIconView.js' => 'a5257c4e',
   ),
   'symbols' => array(
     'almanac-css' => '2e050f4f',
     'aphront-bars' => '4a327b4a',
     'aphront-dark-console-css' => '7f06cda2',
     'aphront-dialog-view-css' => '874f5c06',
     'aphront-list-filter-view-css' => 'feb64255',
     'aphront-multi-column-view-css' => 'fbc00ba3',
     'aphront-panel-view-css' => '46923d46',
     'aphront-table-view-css' => '0bb61df1',
     'aphront-tokenizer-control-css' => '34e2a838',
     'aphront-tooltip-css' => 'e3f2412f',
     'aphront-typeahead-control-css' => '8779483d',
     'application-search-view-css' => '0f7c06d8',
     'auth-css' => 'c2f23d74',
     'bulk-job-css' => '73af99f5',
     'conduit-api-css' => 'ce2cfc41',
     'config-options-css' => '16c920ae',
     'conpherence-color-css' => 'b17746b0',
     'conpherence-durable-column-view' => '2d57072b',
     'conpherence-header-pane-css' => 'c9a3db8e',
     'conpherence-menu-css' => '67f4680d',
     'conpherence-message-pane-css' => 'd244db1e',
     'conpherence-notification-css' => '6a3d4e58',
     'conpherence-participant-pane-css' => '69e0058a',
     'conpherence-thread-manager' => 'aec8e38c',
     'conpherence-transaction-css' => '3a3f5e7e',
     'd3' => '9d068042',
     'differential-changeset-view-css' => '489b6995',
     'differential-core-view-css' => '7300a73e',
     'differential-revision-add-comment-css' => '7e5900d9',
     'differential-revision-comment-css' => '7dbc8d1d',
     'differential-revision-history-css' => '8aa3eac5',
     'differential-revision-list-css' => '93d2df7d',
     'differential-table-of-contents-css' => '0e3364c7',
     'diffusion-css' => 'b54c77b0',
     'diffusion-icons-css' => '23b31a1b',
     'diffusion-readme-css' => 'b68a76e4',
     'diffusion-repository-css' => 'b89e8c6c',
     'diviner-shared-css' => '4bd263b0',
     'font-fontawesome' => '3883938a',
     'font-lato' => '23631304',
     'global-drag-and-drop-css' => '1d2713a4',
     'harbormaster-css' => '8dfe16b2',
     'herald-css' => '648d39e2',
     'herald-rule-editor' => '2633bef7',
     'herald-test-css' => 'e004176f',
     'inline-comment-summary-css' => '81eb368d',
     'javelin-aphlict' => '022516b4',
     'javelin-behavior' => '1b6acc2a',
     'javelin-behavior-aphlict-dropdown' => 'e9a2940f',
     'javelin-behavior-aphlict-listen' => '4e61fa88',
     'javelin-behavior-aphlict-status' => 'c3703a16',
     'javelin-behavior-aphront-basic-tokenizer' => '3b4899b0',
     'javelin-behavior-aphront-drag-and-drop-textarea' => '7ad020a5',
     'javelin-behavior-aphront-form-disable-on-submit' => '55d7b788',
     'javelin-behavior-aphront-more' => '506aa3f4',
     'javelin-behavior-audio-source' => '3dc5ad43',
     'javelin-behavior-audit-preview' => 'b7b73831',
     'javelin-behavior-badge-view' => '92cdd7b6',
     'javelin-behavior-bulk-editor' => 'aa6d2308',
     'javelin-behavior-bulk-job-reload' => '3829a3cf',
     'javelin-behavior-calendar-month-view' => '158c64e0',
     'javelin-behavior-choose-control' => '04f8a1e3',
     'javelin-behavior-comment-actions' => '4dffaeb2',
     'javelin-behavior-config-reorder-fields' => '2539f834',
     'javelin-behavior-conpherence-menu' => '8c2ed2bf',
     'javelin-behavior-conpherence-participant-pane' => '43ba89a2',
     'javelin-behavior-conpherence-pontificate' => '4ae58b5a',
     'javelin-behavior-conpherence-search' => '91befbcc',
     'javelin-behavior-countdown-timer' => '6a162524',
-    'javelin-behavior-dark-console' => 'f39d968b',
+    'javelin-behavior-dark-console' => '457f4d16',
     'javelin-behavior-dashboard-async-panel' => '9c01e364',
     'javelin-behavior-dashboard-move-panels' => 'a2ab19be',
     'javelin-behavior-dashboard-query-panel-select' => '1e413dc9',
     'javelin-behavior-dashboard-tab-panel' => '0116d3e8',
     'javelin-behavior-day-view' => '727a5a61',
     'javelin-behavior-desktop-notifications-control' => '070679fe',
     'javelin-behavior-detect-timezone' => '78bc5d94',
     'javelin-behavior-device' => '0cf79f45',
     'javelin-behavior-diff-preview-link' => 'f51e9c17',
     'javelin-behavior-differential-diff-radios' => '925fe8cd',
     'javelin-behavior-differential-populate' => 'dfa1d313',
     'javelin-behavior-diffusion-commit-branches' => '4b671572',
     'javelin-behavior-diffusion-commit-graph' => 'ef836bf2',
     'javelin-behavior-diffusion-locate-file' => '87428eb2',
     'javelin-behavior-diffusion-pull-lastmodified' => 'c715c123',
     'javelin-behavior-document-engine' => '243d6c22',
     'javelin-behavior-doorkeeper-tag' => '6a85bc5a',
     'javelin-behavior-drydock-live-operation-status' => '47a0728b',
     'javelin-behavior-durable-column' => 'fa6f30b2',
     'javelin-behavior-editengine-reorder-configs' => '4842f137',
     'javelin-behavior-editengine-reorder-fields' => '0ad8d31f',
     'javelin-behavior-event-all-day' => '0b1bc990',
     'javelin-behavior-fancy-datepicker' => '956f3eeb',
     'javelin-behavior-global-drag-and-drop' => '1cab0e9a',
     'javelin-behavior-harbormaster-log' => 'b347a301',
     'javelin-behavior-herald-rule-editor' => '0922e81d',
     'javelin-behavior-high-security-warning' => 'dae2d55b',
     'javelin-behavior-history-install' => '6a1583a8',
     'javelin-behavior-icon-composer' => '38a6cedb',
     'javelin-behavior-launch-icon-composer' => 'a17b84f1',
     'javelin-behavior-lightbox-attachments' => 'c7e748bf',
     'javelin-behavior-line-chart' => 'ad258e28',
     'javelin-behavior-linked-container' => '74446546',
     'javelin-behavior-maniphest-batch-selector' => '139ef688',
     'javelin-behavior-maniphest-list-editor' => 'c687e867',
     'javelin-behavior-owners-path-editor' => 'ff688a7a',
     'javelin-behavior-passphrase-credential-control' => '48fe33d0',
     'javelin-behavior-phabricator-active-nav' => '7353f43d',
     'javelin-behavior-phabricator-autofocus' => '65bb0011',
     'javelin-behavior-phabricator-clipboard-copy' => 'cf32921f',
-    'javelin-behavior-phabricator-file-tree' => 'ee82cedb',
+    'javelin-behavior-phabricator-file-tree' => 'a61c2d11',
     'javelin-behavior-phabricator-gesture' => 'b58d1a2a',
     'javelin-behavior-phabricator-gesture-example' => '242dedd0',
     'javelin-behavior-phabricator-keyboard-pager' => '1325b731',
-    'javelin-behavior-phabricator-keyboard-shortcuts' => '2cc87f49',
+    'javelin-behavior-phabricator-keyboard-shortcuts' => '42c44e8b',
     'javelin-behavior-phabricator-line-linker' => 'e15c8b1f',
     'javelin-behavior-phabricator-nav' => 'f166c949',
     'javelin-behavior-phabricator-notification-example' => '29819b75',
     'javelin-behavior-phabricator-object-selector' => '98ef467f',
     'javelin-behavior-phabricator-oncopy' => 'ff7b3f22',
-    'javelin-behavior-phabricator-remarkup-assist' => '2f80333f',
+    'javelin-behavior-phabricator-remarkup-assist' => '54262396',
     'javelin-behavior-phabricator-reveal-content' => 'b105a3a6',
     'javelin-behavior-phabricator-search-typeahead' => '1cb7d027',
-    'javelin-behavior-phabricator-show-older-transactions' => '600f440c',
+    'javelin-behavior-phabricator-show-older-transactions' => '8b5c7d65',
     'javelin-behavior-phabricator-tooltips' => '73ecc1f8',
     'javelin-behavior-phabricator-transaction-comment-form' => '2bdadf1a',
     'javelin-behavior-phabricator-transaction-list' => '9cec214e',
     'javelin-behavior-phabricator-watch-anchor' => '3972dadb',
     'javelin-behavior-pholio-mock-edit' => '3eed1f2b',
     'javelin-behavior-pholio-mock-view' => '5aa1544e',
     'javelin-behavior-phui-dropdown-menu' => '5cf0501a',
     'javelin-behavior-phui-file-upload' => 'e150bd50',
     'javelin-behavior-phui-hovercards' => '6c379000',
     'javelin-behavior-phui-selectable-list' => 'b26a41e4',
     'javelin-behavior-phui-submenu' => 'b5e9bff9',
     'javelin-behavior-phui-tab-group' => '242aa08b',
     'javelin-behavior-phui-timer-control' => 'f84bcbf4',
     'javelin-behavior-phuix-example' => 'c2c500a7',
     'javelin-behavior-policy-control' => '0eaa33a9',
     'javelin-behavior-policy-rule-editor' => '9347f172',
     'javelin-behavior-project-boards' => '58cb6a88',
     'javelin-behavior-project-create' => '34c53422',
     'javelin-behavior-quicksand-blacklist' => '5a6f6a06',
     'javelin-behavior-read-only-warning' => 'b9109f8f',
     'javelin-behavior-redirect' => '407ee861',
     'javelin-behavior-refresh-csrf' => '46116c01',
     'javelin-behavior-releeph-preview-branch' => '75184d68',
     'javelin-behavior-releeph-request-state-change' => '9f081f05',
     'javelin-behavior-releeph-request-typeahead' => 'aa3a100c',
     'javelin-behavior-remarkup-load-image' => '202bfa3f',
     'javelin-behavior-remarkup-preview' => 'd8a86cfb',
     'javelin-behavior-reorder-applications' => 'aa371860',
     'javelin-behavior-reorder-columns' => '8ac32fd9',
     'javelin-behavior-reorder-profile-menu-items' => 'e5bdb730',
     'javelin-behavior-repository-crossreference' => '1c95ea63',
     'javelin-behavior-scrollbar' => '92388bae',
     'javelin-behavior-search-reorder-queries' => 'b86f297f',
     'javelin-behavior-select-content' => 'e8240b50',
     'javelin-behavior-select-on-click' => '66365ee2',
     'javelin-behavior-setup-check-https' => '01384686',
     'javelin-behavior-stripe-payment-form' => '02cb4398',
     'javelin-behavior-test-payment-form' => '4a7fb02b',
     'javelin-behavior-time-typeahead' => '5803b9e7',
     'javelin-behavior-toggle-class' => '32db8374',
     'javelin-behavior-toggle-widget' => '8f959ad0',
     'javelin-behavior-trigger-rule-editor' => '398fdf13',
     'javelin-behavior-typeahead-browse' => '70245195',
     'javelin-behavior-typeahead-search' => '7b139193',
     'javelin-behavior-user-menu' => '60cd9241',
     'javelin-behavior-view-placeholder' => 'a9942052',
     'javelin-behavior-workflow' => '9623adc1',
     'javelin-chart' => '52e3ff03',
     'javelin-chart-curtain-view' => '86954222',
     'javelin-chart-function-label' => '81de1dab',
     'javelin-color' => '78f811c9',
     'javelin-cookie' => '05d290ef',
     'javelin-diffusion-locate-file-source' => '94243d89',
     'javelin-dom' => '94681e22',
     'javelin-dynval' => '202a2e85',
     'javelin-event' => 'c03f2fb4',
     'javelin-fx' => '34450586',
     'javelin-history' => '030b4f7a',
     'javelin-install' => '5902260c',
     'javelin-json' => '541f81c3',
     'javelin-leader' => '0d2490ce',
     'javelin-magical-init' => '98e6504a',
     'javelin-mask' => '7c4d8998',
     'javelin-quicksand' => 'd3799cb4',
     'javelin-reactor' => '1c850a26',
     'javelin-reactor-dom' => '6cfa0008',
     'javelin-reactor-node-calmer' => '225bbb98',
     'javelin-reactornode' => '72960bc1',
     'javelin-request' => '84e6891f',
     'javelin-resource' => '740956e1',
     'javelin-routable' => '6a18c42e',
     'javelin-router' => '32755edb',
     'javelin-scrollbar' => 'a43ae2ae',
     'javelin-sound' => 'd4cc2d2a',
     'javelin-stratcom' => '0889b835',
     'javelin-tokenizer' => '89a1ae3a',
     'javelin-typeahead' => 'a4356cde',
     'javelin-typeahead-composite-source' => '22ee68a5',
     'javelin-typeahead-normalizer' => 'a241536a',
     'javelin-typeahead-ondemand-source' => '23387297',
     'javelin-typeahead-preloaded-source' => '5a79f6c3',
     'javelin-typeahead-source' => '8badee71',
     'javelin-typeahead-static-source' => '80bff3af',
     'javelin-uri' => '2e255291',
     'javelin-util' => 'edb4d8c9',
     'javelin-vector' => 'e9c80beb',
     'javelin-view' => '289bf236',
     'javelin-view-html' => 'f8c4e135',
     'javelin-view-interpreter' => '876506b6',
     'javelin-view-renderer' => '9aae2b66',
     'javelin-view-visitor' => '308f9fe4',
     'javelin-websocket' => 'fdc13e4e',
     'javelin-workboard-board' => 'b46d88c5',
     'javelin-workboard-card' => '0392a5d8',
     'javelin-workboard-card-template' => '84f82dad',
     'javelin-workboard-column' => 'c3d24e63',
     'javelin-workboard-controller' => 'b9d0c2f3',
     'javelin-workboard-drop-effect' => '8e0aa661',
     'javelin-workboard-header' => '111bfd2d',
     'javelin-workboard-header-template' => 'ebe83a6b',
     'javelin-workboard-order-template' => '03e8891f',
     'javelin-workflow' => '945ff654',
     'maniphest-report-css' => '3d53188b',
     'maniphest-task-edit-css' => '272daa84',
     'maniphest-task-summary-css' => '61d1667e',
     'multirow-row-manager' => '5b54c823',
     'owners-path-editor' => '2a8b62d9',
     'owners-path-editor-css' => 'fa7c13ef',
     'paste-css' => 'b37bcd38',
     'path-typeahead' => 'ad486db3',
     'people-picture-menu-item-css' => 'fe8e07cf',
     'people-profile-css' => '2ea2daa1',
     'phabricator-action-list-view-css' => 'e820263c',
     'phabricator-busy' => '5202e831',
     'phabricator-chatlog-css' => 'abdc76ee',
     'phabricator-content-source-view-css' => 'cdf0d579',
     'phabricator-core-css' => '1b29ed61',
     'phabricator-countdown-css' => 'bff8012f',
     'phabricator-darklog' => '3b869402',
     'phabricator-darkmessage' => '26cd4b73',
     'phabricator-dashboard-css' => '5a205b9d',
     'phabricator-diff-changeset' => '5a4e4a3b',
-    'phabricator-diff-changeset-list' => '4769cfe7',
+    'phabricator-diff-changeset-list' => 'f813ef26',
     'phabricator-diff-inline' => '16e97ebc',
     'phabricator-drag-and-drop-file-upload' => '4370900d',
     'phabricator-draggable-list' => '0169e425',
     'phabricator-fatal-config-template-css' => '20babf50',
     'phabricator-favicon' => '7930776a',
     'phabricator-feed-css' => 'd8b6e3f8',
     'phabricator-file-upload' => 'ab85e184',
     'phabricator-filetree-view-css' => '56cdd875',
     'phabricator-flag-css' => '2b77be8d',
-    'phabricator-keyboard-shortcut' => 'c9749dcd',
-    'phabricator-keyboard-shortcut-manager' => '37b8a04a',
+    'phabricator-keyboard-shortcut' => '1a844c06',
+    'phabricator-keyboard-shortcut-manager' => 'ef926938',
     'phabricator-main-menu-view' => 'bcec20f0',
     'phabricator-nav-view-css' => 'f8a0c1bf',
     'phabricator-notification' => 'a9b91e3f',
     'phabricator-notification-css' => '30240bd2',
     'phabricator-notification-menu-css' => '4df1ee30',
     'phabricator-object-selector-css' => 'ee77366f',
     'phabricator-phtize' => '2f1db1ed',
     'phabricator-prefab' => '5793d835',
     'phabricator-remarkup-css' => 'c286eaef',
     'phabricator-search-results-css' => '9ea70ace',
     'phabricator-shaped-request' => 'abf88db8',
     'phabricator-slowvote-css' => '1694baed',
     'phabricator-source-code-view-css' => '03d7ac28',
-    'phabricator-standard-page-view' => '8a295cb9',
+    'phabricator-standard-page-view' => 'ed076e5a',
     'phabricator-textareautils' => 'f340a484',
     'phabricator-title' => '43bc9360',
     'phabricator-tooltip' => '83754533',
     'phabricator-ui-example-css' => 'b4795059',
     'phabricator-zindex-css' => '99c0f5eb',
     'phame-css' => 'bb442327',
     'pholio-css' => '88ef5ef1',
     'pholio-edit-css' => '4df55b3b',
     'pholio-inline-comments-css' => '722b48c2',
     'phortune-credit-card-form' => 'd12d214f',
     'phortune-credit-card-form-css' => '3b9868a8',
     'phortune-css' => '508a1a5e',
     'phortune-invoice-css' => '4436b241',
     'phrequent-css' => 'bd79cc67',
     'phriction-document-css' => '03380da0',
     'phui-action-panel-css' => '6c386cbf',
     'phui-badge-view-css' => '666e25ad',
     'phui-basic-nav-view-css' => '56ebd66d',
     'phui-big-info-view-css' => '362ad37b',
     'phui-box-css' => '5ed3b8cb',
     'phui-bulk-editor-css' => '374d5e30',
     'phui-button-bar-css' => 'a4aa75c4',
     'phui-button-css' => 'ea704902',
     'phui-button-simple-css' => '1ff278aa',
     'phui-calendar-css' => 'f11073aa',
     'phui-calendar-day-css' => '9597d706',
     'phui-calendar-list-css' => 'ccd7e4e2',
     'phui-calendar-month-css' => 'cb758c42',
     'phui-chart-css' => '14df9ae3',
     'phui-cms-css' => '8c05c41e',
     'phui-comment-form-css' => '68a2d99a',
     'phui-comment-panel-css' => 'ec4e31c0',
     'phui-crumbs-view-css' => '614f43cf',
     'phui-curtain-object-ref-view-css' => '12404744',
     'phui-curtain-view-css' => '68c5efb6',
     'phui-document-summary-view-css' => 'b068eed1',
     'phui-document-view-css' => '52b748a5',
     'phui-document-view-pro-css' => 'b9613a10',
     'phui-feed-story-css' => 'a0c05029',
     'phui-font-icon-base-css' => 'd7994e06',
     'phui-fontkit-css' => '1ec937e5',
     'phui-form-css' => '1f177cb7',
     'phui-form-view-css' => '01b796c0',
     'phui-head-thing-view-css' => 'd7f293df',
     'phui-header-view-css' => '36c86a58',
     'phui-hovercard' => '074f0783',
     'phui-hovercard-view-css' => '6ca90fa0',
     'phui-icon-set-selector-css' => '7aa5f3ec',
     'phui-icon-view-css' => '4cbc684a',
     'phui-image-mask-css' => '62c7f4d2',
     'phui-info-view-css' => 'a10a909b',
     'phui-inline-comment-view-css' => '48acce5b',
     'phui-invisible-character-view-css' => 'c694c4a4',
     'phui-left-right-css' => '68513c34',
     'phui-lightbox-css' => '4ebf22da',
-    'phui-list-view-css' => 'b05144dd',
+    'phui-list-view-css' => '2f253c22',
     'phui-object-box-css' => 'b8d7eea0',
     'phui-oi-big-ui-css' => 'fa74cc35',
     'phui-oi-color-css' => 'b517bfa0',
     'phui-oi-drag-ui-css' => 'da15d3dc',
     'phui-oi-flush-ui-css' => '490e2e2e',
     'phui-oi-list-view-css' => 'd7723ecc',
     'phui-oi-simple-ui-css' => '6a30fa46',
     'phui-pager-css' => 'd022c7ad',
     'phui-pinboard-view-css' => '1f08f5d8',
     'phui-policy-section-view-css' => '139fdc64',
     'phui-property-list-view-css' => '9c477af1',
     'phui-remarkup-preview-css' => '91767007',
     'phui-segment-bar-view-css' => '5166b370',
     'phui-spacing-css' => 'b05cadc3',
     'phui-status-list-view-css' => 'e5ff8be0',
     'phui-tag-view-css' => '8519160a',
     'phui-theme-css' => '35883b37',
     'phui-timeline-view-css' => '1e348e4b',
     'phui-two-column-view-css' => 'f96d319f',
     'phui-workboard-color-css' => 'e86de308',
     'phui-workboard-view-css' => '74fc9d98',
     'phui-workcard-view-css' => '913441b6',
     'phui-workpanel-view-css' => '3ae89b20',
     'phuix-action-list-view' => 'c68f183f',
     'phuix-action-view' => 'aaa08f3b',
     'phuix-autocomplete' => '2fbe234d',
     'phuix-button-view' => '55a24e84',
     'phuix-dropdown-menu' => '7acfd98b',
     'phuix-form-control-view' => '38c1f3fb',
     'phuix-icon-view' => 'a5257c4e',
     'policy-css' => 'ceb56a08',
     'policy-edit-css' => '8794e2ed',
     'policy-transaction-detail-css' => 'c02b8384',
     'ponder-view-css' => '05a09d0a',
     'project-card-view-css' => '4e7371cd',
     'project-triggers-css' => 'cd9c8bb9',
     'project-view-css' => '567858b3',
     'releeph-core' => 'f81ff2db',
     'releeph-preview-branch' => '22db5c07',
     'releeph-request-differential-create-dialog' => '0ac1ea31',
     'releeph-request-typeahead-css' => 'bce37359',
     'setup-issue-css' => '5eed85b2',
     'sprite-login-css' => '18b368a6',
     'sprite-tokens-css' => 'f1896dc5',
     'syntax-default-css' => '055fc231',
     'syntax-highlighting-css' => '220b85f9',
     'tokens-css' => 'ce5a50bd',
     'trigger-rule' => '41b7b4f6',
     'trigger-rule-control' => '5faf27b9',
     'trigger-rule-editor' => 'b49fd60c',
     'trigger-rule-type' => '4feea7d3',
     'typeahead-browse-css' => 'b7ed02d2',
     'unhandled-exception-css' => '9ecfc00d',
   ),
   'requires' => array(
     '0116d3e8' => array(
       'javelin-behavior',
       'javelin-dom',
       'javelin-stratcom',
     ),
     '01384686' => array(
       'javelin-behavior',
       'javelin-uri',
       'phabricator-notification',
     ),
     '0169e425' => array(
       'javelin-install',
       'javelin-dom',
       'javelin-stratcom',
       'javelin-util',
       'javelin-vector',
       'javelin-magical-init',
     ),
     '022516b4' => array(
       'javelin-install',
       'javelin-util',
       'javelin-websocket',
       'javelin-leader',
       'javelin-json',
     ),
     '02cb4398' => array(
       'javelin-behavior',
       'javelin-dom',
       'phortune-credit-card-form',
     ),
     '030b4f7a' => array(
       'javelin-stratcom',
       'javelin-install',
       'javelin-uri',
       'javelin-util',
     ),
     '0392a5d8' => array(
       'javelin-install',
     ),
     '03e8891f' => array(
       'javelin-install',
     ),
     '04f8a1e3' => array(
       'javelin-behavior',
       'javelin-stratcom',
       'javelin-dom',
       'javelin-workflow',
     ),
     '05d290ef' => array(
       'javelin-install',
       'javelin-util',
     ),
     '070679fe' => array(
       'javelin-behavior',
       'javelin-stratcom',
       'javelin-dom',
       'javelin-uri',
       'phabricator-notification',
     ),
     '074f0783' => array(
       'javelin-install',
       'javelin-dom',
       'javelin-vector',
       'javelin-request',
       'javelin-uri',
     ),
     '0889b835' => array(
       'javelin-install',
       'javelin-event',
       'javelin-util',
       'javelin-magical-init',
     ),
     '0922e81d' => array(
       'herald-rule-editor',
       'javelin-behavior',
     ),
     '0ad8d31f' => array(
       'javelin-behavior',
       'javelin-stratcom',
       'javelin-workflow',
       'javelin-dom',
       'phabricator-draggable-list',
     ),
     '0cf79f45' => array(
       'javelin-behavior',
       'javelin-stratcom',
       'javelin-dom',
       'javelin-vector',
       'javelin-install',
     ),
     '0d2490ce' => array(
       'javelin-install',
     ),
     '0eaa33a9' => array(
       'javelin-behavior',
       'javelin-dom',
       'javelin-util',
       'phuix-dropdown-menu',
       'phuix-action-list-view',
       'phuix-action-view',
       'javelin-workflow',
       'phuix-icon-view',
     ),
     '111bfd2d' => array(
       'javelin-install',
     ),
     '1325b731' => array(
       'javelin-behavior',
       'javelin-uri',
       'phabricator-keyboard-shortcut',
     ),
     '139ef688' => array(
       'javelin-behavior',
       'javelin-dom',
       'javelin-stratcom',
       'javelin-util',
     ),
     '16e97ebc' => array(
       'javelin-dom',
     ),
+    '1a844c06' => array(
+      'javelin-install',
+      'javelin-util',
+      'phabricator-keyboard-shortcut-manager',
+    ),
     '1b6acc2a' => array(
       'javelin-magical-init',
       'javelin-util',
     ),
     '1c850a26' => array(
       'javelin-install',
       'javelin-util',
     ),
     '1c95ea63' => array(
       'javelin-behavior',
       'javelin-dom',
       'javelin-stratcom',
       'javelin-uri',
     ),
     '1cab0e9a' => array(
       'javelin-behavior',
       'javelin-dom',
       'javelin-uri',
       'javelin-mask',
       'phabricator-drag-and-drop-file-upload',
     ),
     '1cb7d027' => array(
       'javelin-behavior',
       'javelin-typeahead-ondemand-source',
       'javelin-typeahead',
       'javelin-dom',
       'javelin-uri',
       'javelin-util',
       'javelin-stratcom',
       'phabricator-prefab',
       'phuix-icon-view',
     ),
     '1e413dc9' => array(
       'javelin-behavior',
       'javelin-dom',
     ),
     '1ff278aa' => array(
       'phui-button-css',
     ),
     '202a2e85' => array(
       'javelin-install',
       'javelin-reactornode',
       'javelin-util',
       'javelin-reactor',
     ),
     '202bfa3f' => array(
       'javelin-behavior',
       'javelin-request',
     ),
     '220b85f9' => array(
       'syntax-default-css',
     ),
     '225bbb98' => array(
       'javelin-install',
       'javelin-reactor',
       'javelin-util',
     ),
     '22ee68a5' => array(
       'javelin-install',
       'javelin-typeahead-source',
       'javelin-util',
     ),
     23387297 => array(
       'javelin-install',
       'javelin-util',
       'javelin-request',
       'javelin-typeahead-source',
     ),
     23631304 => array(
       'phui-fontkit-css',
     ),
     '242aa08b' => array(
       'javelin-behavior',
       'javelin-stratcom',
       'javelin-dom',
     ),
     '242dedd0' => array(
       'javelin-stratcom',
       'javelin-behavior',
       'javelin-vector',
       'javelin-dom',
     ),
     '243d6c22' => array(
       'javelin-behavior',
       'javelin-dom',
       'javelin-stratcom',
     ),
     '2539f834' => array(
       'javelin-behavior',
       'javelin-stratcom',
       'javelin-dom',
       'javelin-json',
       'phabricator-draggable-list',
     ),
     '2633bef7' => array(
       'multirow-row-manager',
       'javelin-install',
       'javelin-util',
       'javelin-dom',
       'javelin-stratcom',
       'javelin-json',
       'phabricator-prefab',
     ),
     '289bf236' => array(
       'javelin-install',
       'javelin-util',
     ),
     '29819b75' => array(
       'phabricator-notification',
       'javelin-stratcom',
       'javelin-behavior',
     ),
     '2a8b62d9' => array(
       'multirow-row-manager',
       'javelin-install',
       'path-typeahead',
       'javelin-dom',
       'javelin-util',
       'phabricator-prefab',
       'phuix-form-control-view',
     ),
     '2bdadf1a' => array(
       'javelin-behavior',
       'javelin-dom',
       'javelin-util',
       'javelin-request',
       'phabricator-shaped-request',
     ),
-    '2cc87f49' => array(
-      'javelin-behavior',
-      'javelin-workflow',
-      'javelin-json',
-      'javelin-dom',
-      'phabricator-keyboard-shortcut',
-    ),
     '2e255291' => array(
       'javelin-install',
       'javelin-util',
       'javelin-stratcom',
     ),
     '2f1db1ed' => array(
       'javelin-util',
     ),
-    '2f80333f' => array(
-      'javelin-behavior',
-      'javelin-stratcom',
-      'javelin-dom',
-      'phabricator-phtize',
-      'phabricator-textareautils',
-      'javelin-workflow',
-      'javelin-vector',
-      'phuix-autocomplete',
-      'javelin-mask',
-    ),
     '2fbe234d' => array(
       'javelin-install',
       'javelin-dom',
       'phuix-icon-view',
       'phabricator-prefab',
     ),
     '308f9fe4' => array(
       'javelin-install',
       'javelin-util',
     ),
     '32755edb' => array(
       'javelin-install',
       'javelin-util',
     ),
     '32db8374' => array(
       'javelin-behavior',
       'javelin-stratcom',
       'javelin-dom',
     ),
     34450586 => array(
       'javelin-color',
       'javelin-install',
       'javelin-util',
     ),
     '34c53422' => array(
       'javelin-behavior',
       'javelin-dom',
       'javelin-stratcom',
       'javelin-workflow',
     ),
     '34e2a838' => array(
       'aphront-typeahead-control-css',
       'phui-tag-view-css',
     ),
-    '37b8a04a' => array(
-      'javelin-install',
-      'javelin-util',
-      'javelin-stratcom',
-      'javelin-dom',
-      'javelin-vector',
-    ),
     '3829a3cf' => array(
       'javelin-behavior',
       'javelin-uri',
     ),
     '38a6cedb' => array(
       'javelin-behavior',
       'javelin-dom',
       'javelin-stratcom',
     ),
     '38c1f3fb' => array(
       'javelin-install',
       'javelin-dom',
     ),
     '3972dadb' => array(
       'javelin-behavior',
       'javelin-stratcom',
       'javelin-dom',
       'javelin-vector',
     ),
     '398fdf13' => array(
       'javelin-behavior',
       'trigger-rule-editor',
       'trigger-rule',
       'trigger-rule-type',
     ),
     '3ae89b20' => array(
       'phui-workcard-view-css',
     ),
     '3b4899b0' => array(
       'javelin-behavior',
       'phabricator-prefab',
     ),
     '3dc5ad43' => array(
       'javelin-behavior',
       'javelin-stratcom',
       'javelin-vector',
       'javelin-dom',
     ),
     '3eed1f2b' => array(
       'javelin-behavior',
       'javelin-stratcom',
       'javelin-dom',
       'javelin-workflow',
       'javelin-quicksand',
       'phabricator-phtize',
       'phabricator-drag-and-drop-file-upload',
       'phabricator-draggable-list',
     ),
     '407ee861' => array(
       'javelin-behavior',
       'javelin-uri',
     ),
+    '42c44e8b' => array(
+      'javelin-behavior',
+      'javelin-workflow',
+      'javelin-json',
+      'javelin-dom',
+      'phabricator-keyboard-shortcut',
+    ),
     '4370900d' => array(
       'javelin-install',
       'javelin-util',
       'javelin-request',
       'javelin-dom',
       'javelin-uri',
       'phabricator-file-upload',
     ),
     '43ba89a2' => array(
       'javelin-behavior',
       'javelin-dom',
       'javelin-stratcom',
       'javelin-workflow',
       'javelin-util',
       'phabricator-notification',
       'conpherence-thread-manager',
     ),
     '43bc9360' => array(
       'javelin-install',
     ),
+    '457f4d16' => array(
+      'javelin-behavior',
+      'javelin-stratcom',
+      'javelin-util',
+      'javelin-dom',
+      'javelin-request',
+      'phabricator-keyboard-shortcut',
+      'phabricator-darklog',
+      'phabricator-darkmessage',
+    ),
     '46116c01' => array(
       'javelin-request',
       'javelin-behavior',
       'javelin-dom',
       'javelin-router',
       'javelin-util',
       'phabricator-busy',
     ),
-    '4769cfe7' => array(
-      'javelin-install',
-      'phuix-button-view',
-    ),
     '47a0728b' => array(
       'javelin-behavior',
       'javelin-dom',
       'javelin-request',
     ),
     '4842f137' => array(
       'javelin-behavior',
       'javelin-stratcom',
       'javelin-workflow',
       'javelin-dom',
       'phabricator-draggable-list',
     ),
     '489b6995' => array(
       'phui-inline-comment-view-css',
     ),
     '48fe33d0' => array(
       'javelin-behavior',
       'javelin-dom',
       'javelin-stratcom',
       'javelin-workflow',
       'javelin-util',
       'javelin-uri',
     ),
     '490e2e2e' => array(
       'phui-oi-list-view-css',
     ),
     '4a7fb02b' => array(
       'javelin-behavior',
       'javelin-dom',
       'phortune-credit-card-form',
     ),
     '4ae58b5a' => array(
       'javelin-behavior',
       'javelin-dom',
       'javelin-util',
       'javelin-workflow',
       'javelin-stratcom',
       'conpherence-thread-manager',
     ),
     '4b671572' => array(
       'javelin-behavior',
       'javelin-dom',
       'javelin-util',
       'javelin-request',
     ),
     '4dffaeb2' => array(
       'javelin-behavior',
       'javelin-stratcom',
       'javelin-workflow',
       'javelin-dom',
       'phuix-form-control-view',
       'phuix-icon-view',
       'javelin-behavior-phabricator-gesture',
     ),
     '4e61fa88' => array(
       'javelin-behavior',
       'javelin-aphlict',
       'javelin-stratcom',
       'javelin-request',
       'javelin-uri',
       'javelin-dom',
       'javelin-json',
       'javelin-router',
       'javelin-util',
       'javelin-leader',
       'javelin-sound',
       'phabricator-notification',
     ),
     '4feea7d3' => array(
       'trigger-rule-control',
     ),
     '506aa3f4' => array(
       'javelin-behavior',
       'javelin-stratcom',
       'javelin-dom',
     ),
     '5202e831' => array(
       'javelin-install',
       'javelin-dom',
       'javelin-fx',
     ),
     '52e3ff03' => array(
       'phui-chart-css',
       'd3',
       'javelin-chart-curtain-view',
       'javelin-chart-function-label',
     ),
     '541f81c3' => array(
       'javelin-install',
     ),
+    54262396 => array(
+      'javelin-behavior',
+      'javelin-stratcom',
+      'javelin-dom',
+      'phabricator-phtize',
+      'phabricator-textareautils',
+      'javelin-workflow',
+      'javelin-vector',
+      'phuix-autocomplete',
+      'javelin-mask',
+    ),
     '55a24e84' => array(
       'javelin-install',
       'javelin-dom',
     ),
     '55d7b788' => array(
       'javelin-behavior',
       'javelin-stratcom',
       'javelin-dom',
     ),
     '5793d835' => array(
       'javelin-install',
       'javelin-util',
       'javelin-dom',
       'javelin-typeahead',
       'javelin-tokenizer',
       'javelin-typeahead-preloaded-source',
       'javelin-typeahead-ondemand-source',
       'javelin-dom',
       'javelin-stratcom',
       'javelin-util',
     ),
     '5803b9e7' => array(
       'javelin-behavior',
       'javelin-util',
       'javelin-dom',
       'javelin-stratcom',
       'javelin-vector',
       'javelin-typeahead-static-source',
     ),
     '58cb6a88' => array(
       'javelin-behavior',
       'javelin-dom',
       'javelin-util',
       'javelin-vector',
       'javelin-stratcom',
       'javelin-workflow',
       'javelin-workboard-controller',
       'javelin-workboard-drop-effect',
     ),
     '5902260c' => array(
       'javelin-util',
       'javelin-magical-init',
     ),
     '5a4e4a3b' => array(
       'javelin-dom',
       'javelin-util',
       'javelin-stratcom',
       'javelin-install',
       'javelin-workflow',
       'javelin-router',
       'javelin-behavior-device',
       'javelin-vector',
       'phabricator-diff-inline',
     ),
     '5a6f6a06' => array(
       'javelin-behavior',
       'javelin-quicksand',
     ),
     '5a79f6c3' => array(
       'javelin-install',
       'javelin-util',
       'javelin-request',
       'javelin-typeahead-source',
     ),
     '5aa1544e' => array(
       'javelin-behavior',
       'javelin-util',
       'javelin-stratcom',
       'javelin-dom',
       'javelin-vector',
       'javelin-magical-init',
       'javelin-request',
       'javelin-history',
       'javelin-workflow',
       'javelin-mask',
       'javelin-behavior-device',
       'phabricator-keyboard-shortcut',
     ),
     '5b54c823' => array(
       'javelin-install',
       'javelin-stratcom',
       'javelin-dom',
       'javelin-util',
     ),
     '5cf0501a' => array(
       'javelin-behavior',
       'javelin-stratcom',
       'javelin-dom',
       'phuix-dropdown-menu',
     ),
     '5faf27b9' => array(
       'phuix-form-control-view',
     ),
-    '600f440c' => array(
-      'javelin-behavior',
-      'javelin-stratcom',
-      'javelin-dom',
-      'phabricator-busy',
-    ),
     '60cd9241' => array(
       'javelin-behavior',
     ),
     '65bb0011' => array(
       'javelin-behavior',
       'javelin-dom',
     ),
     '66365ee2' => array(
       'javelin-behavior',
       'javelin-stratcom',
       'javelin-dom',
     ),
     '6a1583a8' => array(
       'javelin-behavior',
       'javelin-history',
     ),
     '6a162524' => array(
       'javelin-behavior',
       'javelin-dom',
     ),
     '6a18c42e' => array(
       'javelin-install',
     ),
     '6a30fa46' => array(
       'phui-oi-list-view-css',
     ),
     '6a85bc5a' => array(
       'javelin-behavior',
       'javelin-dom',
       'javelin-json',
       'javelin-workflow',
       'javelin-magical-init',
     ),
     '6c379000' => array(
       'javelin-behavior',
       'javelin-behavior-device',
       'javelin-stratcom',
       'javelin-vector',
       'phui-hovercard',
     ),
     '6cfa0008' => array(
       'javelin-dom',
       'javelin-dynval',
       'javelin-reactor',
       'javelin-reactornode',
       'javelin-install',
       'javelin-util',
     ),
     70245195 => array(
       'javelin-behavior',
       'javelin-stratcom',
       'javelin-workflow',
       'javelin-dom',
     ),
     '727a5a61' => array(
       'phuix-icon-view',
     ),
     '72960bc1' => array(
       'javelin-install',
       'javelin-reactor',
       'javelin-util',
       'javelin-reactor-node-calmer',
     ),
     '7353f43d' => array(
       'javelin-behavior',
       'javelin-stratcom',
       'javelin-vector',
       'javelin-dom',
       'javelin-uri',
     ),
     '73ecc1f8' => array(
       'javelin-behavior',
       'javelin-behavior-device',
       'javelin-stratcom',
       'phabricator-tooltip',
     ),
     '740956e1' => array(
       'javelin-util',
       'javelin-uri',
       'javelin-install',
     ),
     74446546 => array(
       'javelin-behavior',
       'javelin-dom',
     ),
     '75184d68' => array(
       'javelin-behavior',
       'javelin-dom',
       'javelin-uri',
       'javelin-request',
     ),
     '78bc5d94' => array(
       'javelin-behavior',
       'javelin-uri',
       'phabricator-notification',
     ),
     '78f811c9' => array(
       'javelin-install',
     ),
     '7930776a' => array(
       'javelin-install',
       'javelin-dom',
     ),
     '7acfd98b' => array(
       'javelin-install',
       'javelin-util',
       'javelin-dom',
       'javelin-vector',
       'javelin-stratcom',
     ),
     '7ad020a5' => array(
       'javelin-behavior',
       'javelin-dom',
       'phabricator-drag-and-drop-file-upload',
       'phabricator-textareautils',
     ),
     '7b139193' => array(
       'javelin-behavior',
       'javelin-stratcom',
       'javelin-workflow',
       'javelin-dom',
     ),
     '7c4d8998' => array(
       'javelin-install',
       'javelin-dom',
     ),
     '80bff3af' => array(
       'javelin-install',
       'javelin-typeahead-source',
     ),
     83754533 => array(
       'javelin-install',
       'javelin-util',
       'javelin-dom',
       'javelin-vector',
     ),
     '84e6891f' => array(
       'javelin-install',
       'javelin-stratcom',
       'javelin-util',
       'javelin-behavior',
       'javelin-json',
       'javelin-dom',
       'javelin-resource',
       'javelin-routable',
     ),
     '84f82dad' => array(
       'javelin-install',
     ),
     '87428eb2' => array(
       'javelin-behavior',
       'javelin-diffusion-locate-file-source',
       'javelin-dom',
       'javelin-typeahead',
       'javelin-uri',
     ),
     '876506b6' => array(
       'javelin-view',
       'javelin-install',
       'javelin-dom',
     ),
     '89a1ae3a' => array(
       'javelin-dom',
       'javelin-util',
       'javelin-stratcom',
       'javelin-install',
     ),
     '8ac32fd9' => array(
       'javelin-behavior',
       'javelin-stratcom',
       'javelin-workflow',
       'javelin-dom',
       'phabricator-draggable-list',
     ),
+    '8b5c7d65' => array(
+      'javelin-behavior',
+      'javelin-stratcom',
+      'javelin-dom',
+      'phabricator-busy',
+    ),
     '8badee71' => array(
       'javelin-install',
       'javelin-util',
       'javelin-dom',
       'javelin-typeahead-normalizer',
     ),
     '8c2ed2bf' => array(
       'javelin-behavior',
       'javelin-dom',
       'javelin-util',
       'javelin-stratcom',
       'javelin-workflow',
       'javelin-behavior-device',
       'javelin-history',
       'javelin-vector',
       'javelin-scrollbar',
       'phabricator-title',
       'phabricator-shaped-request',
       'conpherence-thread-manager',
     ),
     '8e0aa661' => array(
       'javelin-install',
       'javelin-dom',
     ),
     '8f959ad0' => array(
       'javelin-behavior',
       'javelin-dom',
       'javelin-util',
       'javelin-workflow',
       'javelin-stratcom',
     ),
     '91befbcc' => array(
       'javelin-behavior',
       'javelin-dom',
       'javelin-util',
       'javelin-workflow',
       'javelin-stratcom',
     ),
     '92388bae' => array(
       'javelin-behavior',
       'javelin-scrollbar',
     ),
     '925fe8cd' => array(
       'javelin-behavior',
       'javelin-stratcom',
       'javelin-dom',
     ),
     '92cdd7b6' => array(
       'javelin-behavior',
       'javelin-stratcom',
       'javelin-dom',
     ),
     '9347f172' => array(
       'javelin-behavior',
       'multirow-row-manager',
       'javelin-dom',
       'javelin-util',
       'phabricator-prefab',
       'javelin-json',
     ),
     '94243d89' => array(
       'javelin-install',
       'javelin-dom',
       'javelin-typeahead-preloaded-source',
       'javelin-util',
     ),
     '945ff654' => array(
       'javelin-stratcom',
       'javelin-request',
       'javelin-dom',
       'javelin-vector',
       'javelin-install',
       'javelin-util',
       'javelin-mask',
       'javelin-uri',
       'javelin-routable',
     ),
     '94681e22' => array(
       'javelin-magical-init',
       'javelin-install',
       'javelin-util',
       'javelin-vector',
       'javelin-stratcom',
     ),
     '956f3eeb' => array(
       'javelin-behavior',
       'javelin-util',
       'javelin-dom',
       'javelin-stratcom',
       'javelin-vector',
     ),
     '9623adc1' => array(
       'javelin-behavior',
       'javelin-stratcom',
       'javelin-workflow',
       'javelin-dom',
       'javelin-router',
     ),
     '98ef467f' => array(
       'javelin-behavior',
       'javelin-dom',
       'javelin-request',
       'javelin-util',
     ),
     '9aae2b66' => array(
       'javelin-install',
       'javelin-util',
     ),
     '9c01e364' => array(
       'javelin-behavior',
       'javelin-dom',
       'javelin-workflow',
     ),
     '9cec214e' => array(
       'javelin-behavior',
       'javelin-stratcom',
       'javelin-workflow',
       'javelin-dom',
       'javelin-uri',
       'phabricator-textareautils',
     ),
     '9f081f05' => array(
       'javelin-behavior',
       'javelin-dom',
       'javelin-stratcom',
       'javelin-workflow',
       'javelin-util',
       'phabricator-keyboard-shortcut',
     ),
     'a17b84f1' => array(
       'javelin-behavior',
       'javelin-dom',
       'javelin-workflow',
     ),
     'a241536a' => array(
       'javelin-install',
     ),
     'a2ab19be' => array(
       'javelin-behavior',
       'javelin-dom',
       'javelin-util',
       'javelin-stratcom',
       'javelin-workflow',
       'phabricator-draggable-list',
     ),
     'a4356cde' => array(
       'javelin-install',
       'javelin-dom',
       'javelin-vector',
       'javelin-util',
     ),
     'a43ae2ae' => array(
       'javelin-install',
       'javelin-dom',
       'javelin-stratcom',
       'javelin-vector',
     ),
     'a4aa75c4' => array(
       'phui-button-css',
       'phui-button-simple-css',
     ),
     'a5257c4e' => array(
       'javelin-install',
       'javelin-dom',
     ),
+    'a61c2d11' => array(
+      'javelin-behavior',
+      'phabricator-keyboard-shortcut',
+      'javelin-stratcom',
+    ),
     'a9942052' => array(
       'javelin-behavior',
       'javelin-dom',
       'javelin-view-renderer',
       'javelin-install',
     ),
     'a9b91e3f' => array(
       'javelin-install',
       'javelin-dom',
       'javelin-stratcom',
       'javelin-util',
       'phabricator-notification-css',
     ),
     'aa371860' => array(
       'javelin-behavior',
       'javelin-stratcom',
       'javelin-workflow',
       'javelin-dom',
       'phabricator-draggable-list',
     ),
     'aa3a100c' => array(
       'javelin-behavior',
       'javelin-dom',
       'javelin-typeahead',
       'javelin-typeahead-ondemand-source',
       'javelin-dom',
     ),
     'aa6d2308' => array(
       'javelin-behavior',
       'javelin-dom',
       'javelin-util',
       'multirow-row-manager',
       'javelin-json',
       'phuix-form-control-view',
     ),
     'aaa08f3b' => array(
       'javelin-install',
       'javelin-dom',
       'javelin-util',
     ),
     'ab85e184' => array(
       'javelin-install',
       'javelin-dom',
       'phabricator-notification',
     ),
     'abf88db8' => array(
       'javelin-install',
       'javelin-util',
       'javelin-request',
       'javelin-router',
     ),
     'ad258e28' => array(
       'javelin-behavior',
       'javelin-dom',
       'javelin-chart',
     ),
     'ad486db3' => array(
       'javelin-install',
       'javelin-typeahead',
       'javelin-dom',
       'javelin-request',
       'javelin-typeahead-ondemand-source',
       'javelin-util',
     ),
     'aec8e38c' => array(
       'javelin-dom',
       'javelin-util',
       'javelin-stratcom',
       'javelin-install',
       'javelin-aphlict',
       'javelin-workflow',
       'javelin-router',
       'javelin-behavior-device',
       'javelin-vector',
     ),
     'b105a3a6' => array(
       'javelin-behavior',
       'javelin-stratcom',
       'javelin-dom',
     ),
     'b26a41e4' => array(
       'javelin-behavior',
       'javelin-stratcom',
       'javelin-dom',
     ),
     'b347a301' => array(
       'javelin-behavior',
     ),
     'b46d88c5' => array(
       'javelin-install',
       'javelin-dom',
       'javelin-util',
       'javelin-stratcom',
       'javelin-workflow',
       'phabricator-draggable-list',
       'javelin-workboard-column',
       'javelin-workboard-header-template',
       'javelin-workboard-card-template',
       'javelin-workboard-order-template',
     ),
     'b49fd60c' => array(
       'multirow-row-manager',
       'trigger-rule',
     ),
     'b517bfa0' => array(
       'phui-oi-list-view-css',
     ),
     'b58d1a2a' => array(
       'javelin-behavior',
       'javelin-behavior-device',
       'javelin-stratcom',
       'javelin-vector',
       'javelin-dom',
       'javelin-magical-init',
     ),
     'b5e9bff9' => array(
       'javelin-behavior',
       'javelin-stratcom',
       'javelin-dom',
     ),
     'b7b73831' => array(
       'javelin-behavior',
       'javelin-dom',
       'javelin-util',
       'phabricator-shaped-request',
     ),
     'b86f297f' => array(
       'javelin-behavior',
       'javelin-stratcom',
       'javelin-workflow',
       'javelin-dom',
       'phabricator-draggable-list',
     ),
     'b9109f8f' => array(
       'javelin-behavior',
       'javelin-uri',
       'phabricator-notification',
     ),
     'b9d0c2f3' => array(
       'javelin-install',
       'javelin-dom',
       'javelin-util',
       'javelin-vector',
       'javelin-stratcom',
       'javelin-workflow',
       'phabricator-drag-and-drop-file-upload',
       'javelin-workboard-board',
     ),
     'bcec20f0' => array(
       'phui-theme-css',
     ),
     'c03f2fb4' => array(
       'javelin-install',
     ),
     'c2c500a7' => array(
       'javelin-install',
       'javelin-dom',
       'phuix-button-view',
     ),
     'c3703a16' => array(
       'javelin-behavior',
       'javelin-aphlict',
       'phabricator-phtize',
       'javelin-dom',
     ),
     'c3d24e63' => array(
       'javelin-install',
       'javelin-workboard-card',
       'javelin-workboard-header',
     ),
     'c687e867' => array(
       'javelin-behavior',
       'javelin-dom',
       'javelin-stratcom',
       'javelin-workflow',
       'javelin-fx',
       'javelin-util',
     ),
     'c68f183f' => array(
       'javelin-install',
       'javelin-dom',
     ),
     'c715c123' => array(
       'javelin-behavior',
       'javelin-dom',
       'javelin-util',
       'javelin-workflow',
       'javelin-json',
     ),
     'c7e748bf' => array(
       'javelin-behavior',
       'javelin-stratcom',
       'javelin-dom',
       'javelin-mask',
       'javelin-util',
       'phuix-icon-view',
       'phabricator-busy',
     ),
-    'c9749dcd' => array(
-      'javelin-install',
-      'javelin-util',
-      'phabricator-keyboard-shortcut-manager',
-    ),
     'cf32921f' => array(
       'javelin-behavior',
       'javelin-dom',
       'javelin-stratcom',
     ),
     'd12d214f' => array(
       'javelin-install',
       'javelin-dom',
       'javelin-json',
       'javelin-workflow',
       'javelin-util',
     ),
     'd3799cb4' => array(
       'javelin-install',
     ),
     'd4cc2d2a' => array(
       'javelin-install',
     ),
     'd8a86cfb' => array(
       'javelin-behavior',
       'javelin-dom',
       'javelin-util',
       'phabricator-shaped-request',
     ),
     'da15d3dc' => array(
       'phui-oi-list-view-css',
     ),
     'dae2d55b' => array(
       'javelin-behavior',
       'javelin-uri',
       'phabricator-notification',
     ),
     'dfa1d313' => array(
       'javelin-behavior',
       'javelin-dom',
       'javelin-stratcom',
       'phabricator-tooltip',
       'phabricator-diff-changeset-list',
       'phabricator-diff-changeset',
     ),
     'e150bd50' => array(
       'javelin-behavior',
       'javelin-stratcom',
       'javelin-dom',
       'phuix-dropdown-menu',
     ),
     'e15c8b1f' => array(
       'javelin-behavior',
       'javelin-stratcom',
       'javelin-dom',
       'javelin-history',
     ),
     'e5bdb730' => array(
       'javelin-behavior',
       'javelin-stratcom',
       'javelin-workflow',
       'javelin-dom',
       'phabricator-draggable-list',
     ),
     'e8240b50' => array(
       'javelin-behavior',
       'javelin-stratcom',
       'javelin-dom',
     ),
     'e9a2940f' => array(
       'javelin-behavior',
       'javelin-request',
       'javelin-stratcom',
       'javelin-vector',
       'javelin-dom',
       'javelin-uri',
       'javelin-behavior-device',
       'phabricator-title',
       'phabricator-favicon',
     ),
     'e9c80beb' => array(
       'javelin-install',
       'javelin-event',
     ),
     'ebe83a6b' => array(
       'javelin-install',
     ),
     'ec4e31c0' => array(
       'phui-timeline-view-css',
     ),
     'ee77366f' => array(
       'aphront-dialog-view-css',
     ),
-    'ee82cedb' => array(
-      'javelin-behavior',
-      'phabricator-keyboard-shortcut',
-      'javelin-stratcom',
-    ),
     'ef836bf2' => array(
       'javelin-behavior',
       'javelin-dom',
       'javelin-stratcom',
     ),
+    'ef926938' => array(
+      'javelin-install',
+      'javelin-util',
+      'javelin-stratcom',
+      'javelin-dom',
+      'javelin-vector',
+    ),
     'f166c949' => array(
       'javelin-behavior',
       'javelin-behavior-device',
       'javelin-stratcom',
       'javelin-dom',
       'javelin-magical-init',
       'javelin-vector',
       'javelin-request',
       'javelin-util',
     ),
     'f340a484' => array(
       'javelin-install',
       'javelin-dom',
       'javelin-vector',
     ),
-    'f39d968b' => array(
-      'javelin-behavior',
-      'javelin-stratcom',
-      'javelin-util',
-      'javelin-dom',
-      'javelin-request',
-      'phabricator-keyboard-shortcut',
-      'phabricator-darklog',
-      'phabricator-darkmessage',
-    ),
     'f51e9c17' => array(
       'javelin-behavior',
       'javelin-stratcom',
       'javelin-dom',
     ),
+    'f813ef26' => array(
+      'javelin-install',
+      'phuix-button-view',
+    ),
     'f84bcbf4' => array(
       'javelin-behavior',
       'javelin-stratcom',
       'javelin-dom',
     ),
     'f8c4e135' => array(
       'javelin-install',
       'javelin-dom',
       'javelin-view-visitor',
       'javelin-util',
     ),
     'fa6f30b2' => array(
       'javelin-behavior',
       'javelin-dom',
       'javelin-stratcom',
       'javelin-behavior-device',
       'javelin-scrollbar',
       'javelin-quicksand',
       'phabricator-keyboard-shortcut',
       'conpherence-thread-manager',
     ),
     'fa74cc35' => array(
       'phui-oi-list-view-css',
     ),
     'fdc13e4e' => array(
       'javelin-install',
     ),
     'ff688a7a' => array(
       'owners-path-editor',
       'javelin-behavior',
     ),
     'ff7b3f22' => array(
       'javelin-behavior',
       'javelin-dom',
     ),
   ),
   'packages' => array(
     'conpherence.pkg.css' => array(
       'conpherence-durable-column-view',
       'conpherence-menu-css',
       'conpherence-color-css',
       'conpherence-message-pane-css',
       'conpherence-notification-css',
       'conpherence-transaction-css',
       'conpherence-participant-pane-css',
       'conpherence-header-pane-css',
     ),
     'conpherence.pkg.js' => array(
       'javelin-behavior-conpherence-menu',
       'javelin-behavior-conpherence-participant-pane',
       'javelin-behavior-conpherence-pontificate',
       'javelin-behavior-toggle-widget',
     ),
     'core.pkg.css' => array(
       'phabricator-core-css',
       'phabricator-zindex-css',
       'phui-button-css',
       'phui-button-simple-css',
       'phui-theme-css',
       'phabricator-standard-page-view',
       'aphront-dialog-view-css',
       'phui-form-view-css',
       'aphront-panel-view-css',
       'aphront-table-view-css',
       'aphront-tokenizer-control-css',
       'aphront-typeahead-control-css',
       'aphront-list-filter-view-css',
       'application-search-view-css',
       'phabricator-remarkup-css',
       'syntax-highlighting-css',
       'syntax-default-css',
       'phui-pager-css',
       'aphront-tooltip-css',
       'phabricator-flag-css',
       'phui-info-view-css',
       'phabricator-main-menu-view',
       'phabricator-notification-css',
       'phabricator-notification-menu-css',
       'phui-lightbox-css',
       'phui-comment-panel-css',
       'phui-header-view-css',
       'phabricator-nav-view-css',
       'phui-basic-nav-view-css',
       'phui-crumbs-view-css',
       'phui-oi-list-view-css',
       'phui-oi-color-css',
       'phui-oi-big-ui-css',
       'phui-oi-drag-ui-css',
       'phui-oi-simple-ui-css',
       'phui-oi-flush-ui-css',
       'global-drag-and-drop-css',
       'phui-spacing-css',
       'phui-form-css',
       'phui-icon-view-css',
       'phabricator-action-list-view-css',
       'phui-property-list-view-css',
       'phui-tag-view-css',
       'phui-list-view-css',
       'font-fontawesome',
       'font-lato',
       'phui-font-icon-base-css',
       'phui-fontkit-css',
       'phui-box-css',
       'phui-object-box-css',
       'phui-timeline-view-css',
       'phui-two-column-view-css',
       'phui-curtain-view-css',
       'sprite-login-css',
       'sprite-tokens-css',
       'tokens-css',
       'auth-css',
       'phui-status-list-view-css',
       'phui-feed-story-css',
       'phabricator-feed-css',
       'phabricator-dashboard-css',
       'aphront-multi-column-view-css',
     ),
     'core.pkg.js' => array(
       'javelin-util',
       'javelin-install',
       'javelin-event',
       'javelin-stratcom',
       'javelin-behavior',
       'javelin-resource',
       'javelin-request',
       'javelin-vector',
       'javelin-dom',
       'javelin-json',
       'javelin-uri',
       'javelin-workflow',
       'javelin-mask',
       'javelin-typeahead',
       'javelin-typeahead-normalizer',
       'javelin-typeahead-source',
       'javelin-typeahead-preloaded-source',
       'javelin-typeahead-ondemand-source',
       'javelin-tokenizer',
       'javelin-history',
       'javelin-router',
       'javelin-routable',
       'javelin-behavior-aphront-basic-tokenizer',
       'javelin-behavior-workflow',
       'javelin-behavior-aphront-form-disable-on-submit',
       'phabricator-keyboard-shortcut-manager',
       'phabricator-keyboard-shortcut',
       'javelin-behavior-phabricator-keyboard-shortcuts',
       'javelin-behavior-refresh-csrf',
       'javelin-behavior-phabricator-watch-anchor',
       'javelin-behavior-phabricator-autofocus',
       'phuix-dropdown-menu',
       'phuix-action-list-view',
       'phuix-action-view',
       'phuix-icon-view',
       'phabricator-phtize',
       'javelin-behavior-phabricator-oncopy',
       'phabricator-tooltip',
       'javelin-behavior-phabricator-tooltips',
       'phabricator-prefab',
       'javelin-behavior-device',
       'javelin-behavior-toggle-class',
       'javelin-behavior-lightbox-attachments',
       'phabricator-busy',
       'javelin-sound',
       'javelin-aphlict',
       'phabricator-notification',
       'javelin-behavior-aphlict-listen',
       'javelin-behavior-phabricator-search-typeahead',
       'javelin-behavior-aphlict-dropdown',
       'javelin-behavior-history-install',
       'javelin-behavior-phabricator-gesture',
       'javelin-behavior-phabricator-active-nav',
       'javelin-behavior-phabricator-nav',
       'javelin-behavior-phabricator-remarkup-assist',
       'phabricator-textareautils',
       'phabricator-file-upload',
       'javelin-behavior-global-drag-and-drop',
       'javelin-behavior-phabricator-reveal-content',
       'phui-hovercard',
       'javelin-behavior-phui-hovercards',
       'javelin-color',
       'javelin-fx',
       'phabricator-draggable-list',
       'javelin-behavior-phabricator-transaction-list',
       'javelin-behavior-phabricator-show-older-transactions',
       'javelin-behavior-phui-dropdown-menu',
       'javelin-behavior-doorkeeper-tag',
       'phabricator-title',
       'javelin-leader',
       'javelin-websocket',
       'javelin-behavior-dashboard-async-panel',
       'javelin-behavior-dashboard-tab-panel',
       'javelin-quicksand',
       'javelin-behavior-quicksand-blacklist',
       'javelin-behavior-high-security-warning',
       'javelin-behavior-read-only-warning',
       'javelin-scrollbar',
       'javelin-behavior-scrollbar',
       'javelin-behavior-durable-column',
       'conpherence-thread-manager',
       'javelin-behavior-detect-timezone',
       'javelin-behavior-setup-check-https',
       'javelin-behavior-aphlict-status',
       'javelin-behavior-user-menu',
       'phabricator-favicon',
     ),
     'differential.pkg.css' => array(
       'differential-core-view-css',
       'differential-changeset-view-css',
       'differential-revision-history-css',
       'differential-revision-list-css',
       'differential-table-of-contents-css',
       'differential-revision-comment-css',
       'differential-revision-add-comment-css',
       'phabricator-object-selector-css',
       'phabricator-content-source-view-css',
       'inline-comment-summary-css',
       'phui-inline-comment-view-css',
       'phabricator-filetree-view-css',
     ),
     'differential.pkg.js' => array(
       'phabricator-drag-and-drop-file-upload',
       'phabricator-shaped-request',
       'javelin-behavior-differential-populate',
       'javelin-behavior-differential-diff-radios',
       'javelin-behavior-aphront-drag-and-drop-textarea',
       'javelin-behavior-phabricator-object-selector',
       'javelin-behavior-repository-crossreference',
       'javelin-behavior-aphront-more',
       'phabricator-diff-inline',
       'phabricator-diff-changeset',
       'phabricator-diff-changeset-list',
     ),
     'diffusion.pkg.css' => array(
       'diffusion-icons-css',
     ),
     'diffusion.pkg.js' => array(
       'javelin-behavior-diffusion-pull-lastmodified',
       'javelin-behavior-diffusion-commit-graph',
       'javelin-behavior-audit-preview',
     ),
     'maniphest.pkg.css' => array(
       'maniphest-task-summary-css',
     ),
     'maniphest.pkg.js' => array(
       'javelin-behavior-maniphest-batch-selector',
       'javelin-behavior-maniphest-list-editor',
     ),
   ),
 );
diff --git a/src/applications/help/controller/PhabricatorHelpKeyboardShortcutController.php b/src/applications/help/controller/PhabricatorHelpKeyboardShortcutController.php
index 80bd259c48..0679d32b6a 100644
--- a/src/applications/help/controller/PhabricatorHelpKeyboardShortcutController.php
+++ b/src/applications/help/controller/PhabricatorHelpKeyboardShortcutController.php
@@ -1,67 +1,132 @@
 <?php
 
 final class PhabricatorHelpKeyboardShortcutController
   extends PhabricatorHelpController {
 
   public function shouldAllowPublic() {
     return true;
   }
 
   public function handleRequest(AphrontRequest $request) {
     $viewer = $request->getViewer();
 
     $keys = $request->getStr('keys');
     try {
       $keys = phutil_json_decode($keys);
     } catch (PhutilJSONParserException $ex) {
       return new Aphront400Response();
     }
 
     // There have been at least two users asking for a keyboard shortcut to
     // close the dialog, so be explicit that escape works since it isn't
     // terribly discoverable.
     $keys[] = array(
-      'keys'        => array('esc'),
+      'keys' => array('Esc'),
       'description' => pht('Close any dialog, including this one.'),
+      'group' => 'global',
+    );
+
+    $groups = array(
+      'default' => array(
+        'name' => pht('Page Shortcuts'),
+        'icon' => 'fa-keyboard-o',
+      ),
+      'diff-nav' => array(
+        'name' => pht('Diff Navigation'),
+        'icon' => 'fa-arrows',
+      ),
+      'diff-vis' => array(
+        'name' => pht('Hiding Content'),
+        'icon' => 'fa-eye-slash',
+      ),
+      'inline' => array(
+        'name' => pht('Editing Inline Comments'),
+        'icon' => 'fa-pencil',
+      ),
+      'xactions' => array(
+        'name' => pht('Comments'),
+        'icon' => 'fa-comments-o',
+      ),
+      'global' => array(
+        'name' => pht('Global Shortcuts'),
+        'icon' => 'fa-globe',
+      ),
     );
 
     $stroke_map = array(
       'left' => "\xE2\x86\x90",
       'right' => "\xE2\x86\x92",
       'up' => "\xE2\x86\x91",
       'down' => "\xE2\x86\x93",
       'return' => "\xE2\x8F\x8E",
       'tab' => "\xE2\x87\xA5",
       'delete' => "\xE2\x8C\xAB",
     );
 
-    $rows = array();
+    $row_maps = array();
     foreach ($keys as $shortcut) {
       $keystrokes = array();
       foreach ($shortcut['keys'] as $stroke) {
         $stroke = idx($stroke_map, $stroke, $stroke);
-        $keystrokes[] = phutil_tag('kbd', array(), $stroke);
+        $keystrokes[] = phutil_tag(
+          'span',
+          array(
+            'class' => 'keyboard-shortcut-key',
+          ),
+          $stroke);
       }
       $keystrokes = phutil_implode_html(' or ', $keystrokes);
-      $rows[] = phutil_tag(
+
+      $group_key = idx($shortcut, 'group');
+      if (!isset($groups[$group_key])) {
+        $group_key = 'default';
+      }
+
+      $row = phutil_tag(
         'tr',
         array(),
         array(
           phutil_tag('th', array(), $keystrokes),
           phutil_tag('td', array(), $shortcut['description']),
         ));
+
+      $row_maps[$group_key][] = $row;
     }
 
-    $table = phutil_tag(
-      'table',
-      array('class' => 'keyboard-shortcut-help'),
-      $rows);
+    $tab_group = id(new PHUITabGroupView())
+      ->setVertical(true);
+
+    foreach ($groups as $key => $group) {
+      $rows = idx($row_maps, $key);
+      if (!$rows) {
+        continue;
+      }
+
+      $icon = id(new PHUIIconView())
+        ->setIcon($group['icon']);
+
+      $tab = id(new PHUITabView())
+        ->setKey($key)
+        ->setName($group['name'])
+        ->setIcon($icon);
+
+      $table = phutil_tag(
+        'table',
+        array('class' => 'keyboard-shortcut-help'),
+        $rows);
+
+      $tab->appendChild($table);
+
+      $tab_group->addTab($tab);
+    }
 
     return $this->newDialog()
       ->setTitle(pht('Keyboard Shortcuts'))
-      ->appendChild($table)
+      ->setWidth(AphrontDialogView::WIDTH_FULL)
+      ->setFlush(true)
+      ->appendChild($tab_group)
       ->addCancelButton('#', pht('Close'));
 
   }
 
 }
diff --git a/src/view/phui/PHUIIconView.php b/src/view/phui/PHUIIconView.php
index d907cb3343..e3f9f076c2 100644
--- a/src/view/phui/PHUIIconView.php
+++ b/src/view/phui/PHUIIconView.php
@@ -1,902 +1,906 @@
 <?php
 
 final class PHUIIconView extends AphrontTagView {
 
   const SPRITE_TOKENS = 'tokens';
   const SPRITE_LOGIN = 'login';
 
   const HEAD_SMALL = 'phuihead-small';
   const HEAD_MEDIUM = 'phuihead-medium';
 
   private $href = null;
   private $image;
   private $text;
   private $headSize = null;
 
   private $spriteIcon;
   private $spriteSheet;
   private $iconFont;
   private $iconColor;
   private $iconBackground;
   private $tooltip;
   private $emblemColor;
 
   public function setHref($href) {
     $this->href = $href;
     return $this;
   }
 
   public function setImage($image) {
     $this->image = $image;
     return $this;
   }
 
   public function setText($text) {
     $this->text = $text;
     return $this;
   }
 
   public function setHeadSize($size) {
     $this->headSize = $size;
     return $this;
   }
 
   public function setSpriteIcon($sprite) {
     $this->spriteIcon = $sprite;
     return $this;
   }
 
   public function setSpriteSheet($sheet) {
     $this->spriteSheet = $sheet;
     return $this;
   }
 
   public function setIcon($icon, $color = null) {
     $this->iconFont = $icon;
     $this->iconColor = $color;
     return $this;
   }
 
+  public function getIconName() {
+    return $this->iconFont;
+  }
+
   public function setBackground($color) {
     $this->iconBackground = $color;
     return $this;
   }
 
   public function setTooltip($text) {
     $this->tooltip = $text;
     return $this;
   }
 
   public function setEmblemColor($emblem_color) {
     $this->emblemColor = $emblem_color;
     return $this;
   }
 
   public function getEmblemColor() {
     return $this->emblemColor;
   }
 
   protected function getTagName() {
     $tag = 'span';
     if ($this->href) {
       $tag = 'a';
     }
     return $tag;
   }
 
   protected function getTagAttributes() {
     require_celerity_resource('phui-icon-view-css');
     $style = null;
     $classes = array();
     $classes[] = 'phui-icon-view';
     if ($this->spriteIcon) {
       require_celerity_resource('sprite-'.$this->spriteSheet.'-css');
       $classes[] = 'sprite-'.$this->spriteSheet;
       $classes[] = $this->spriteSheet.'-'.$this->spriteIcon;
     } else if ($this->iconFont) {
       require_celerity_resource('phui-font-icon-base-css');
       require_celerity_resource('font-fontawesome');
       $classes[] = 'phui-font-fa';
       $classes[] = $this->iconFont;
       if ($this->iconColor) {
         $classes[] = $this->iconColor;
       }
       if ($this->iconBackground) {
         $classes[] = 'phui-icon-square';
         $classes[] = $this->iconBackground;
       }
     } else {
       if ($this->headSize) {
         $classes[] = $this->headSize;
       }
       $style = 'background-image: url('.$this->image.');';
     }
     if ($this->text) {
       $classes[] = 'phui-icon-has-text';
       $this->appendChild($this->text);
     }
 
     if ($this->emblemColor) {
       $classes[] = 'phui-icon-emblem phui-icon-emblem-'.$this->emblemColor;
     }
 
     $sigil = null;
     $meta = array();
     if ($this->tooltip) {
       Javelin::initBehavior('phabricator-tooltips');
       require_celerity_resource('aphront-tooltip-css');
       $sigil = 'has-tooltip';
       $meta = array(
         'tip' => $this->tooltip,
       );
     }
 
     return array(
       'href' => $this->href,
       'style' => $style,
       'aural' => false,
       'class' => $classes,
       'sigil' => $sigil,
       'meta' => $meta,
     );
   }
 
   public static function getSheetManifest($sheet) {
     $root = dirname(phutil_get_library_root('phabricator'));
     $path = $root.'/resources/sprite/manifest/'.$sheet.'.json';
     $data = Filesystem::readFile($path);
     return idx(phutil_json_decode($data), 'sprites');
   }
 
   public static function getIcons() {
     return array(
       'fa-glass',
       'fa-music',
       'fa-search',
       'fa-envelope-o',
       'fa-heart',
       'fa-star',
       'fa-star-o',
       'fa-user',
       'fa-film',
       'fa-th-large',
       'fa-th',
       'fa-th-list',
       'fa-check',
       'fa-times',
       'fa-search-plus',
       'fa-search-minus',
       'fa-power-off',
       'fa-signal',
       'fa-cog',
       'fa-trash-o',
       'fa-home',
       'fa-file-o',
       'fa-clock-o',
       'fa-road',
       'fa-download',
       'fa-arrow-circle-o-down',
       'fa-arrow-circle-o-up',
       'fa-inbox',
       'fa-play-circle-o',
       'fa-repeat',
       'fa-refresh',
       'fa-list-alt',
       'fa-lock',
       'fa-flag',
       'fa-headphones',
       'fa-volume-off',
       'fa-volume-down',
       'fa-volume-up',
       'fa-qrcode',
       'fa-barcode',
       'fa-tag',
       'fa-tags',
       'fa-book',
       'fa-bookmark',
       'fa-print',
       'fa-camera',
       'fa-font',
       'fa-bold',
       'fa-italic',
       'fa-text-height',
       'fa-text-width',
       'fa-align-left',
       'fa-align-center',
       'fa-align-right',
       'fa-align-justify',
       'fa-list',
       'fa-outdent',
       'fa-indent',
       'fa-video-camera',
       'fa-picture-o',
       'fa-pencil',
       'fa-map-marker',
       'fa-adjust',
       'fa-tint',
       'fa-pencil-square-o',
       'fa-share-square-o',
       'fa-check-square-o',
       'fa-arrows',
       'fa-step-backward',
       'fa-fast-backward',
       'fa-backward',
       'fa-play',
       'fa-pause',
       'fa-stop',
       'fa-forward',
       'fa-fast-forward',
       'fa-step-forward',
       'fa-eject',
       'fa-chevron-left',
       'fa-chevron-right',
       'fa-plus-circle',
       'fa-minus-circle',
       'fa-times-circle',
       'fa-check-circle',
       'fa-question-circle',
       'fa-info-circle',
       'fa-crosshairs',
       'fa-times-circle-o',
       'fa-check-circle-o',
       'fa-ban',
       'fa-arrow-left',
       'fa-arrow-right',
       'fa-arrow-up',
       'fa-arrow-down',
       'fa-share',
       'fa-expand',
       'fa-compress',
       'fa-plus',
       'fa-minus',
       'fa-asterisk',
       'fa-exclamation-circle',
       'fa-gift',
       'fa-leaf',
       'fa-fire',
       'fa-eye',
       'fa-eye-slash',
       'fa-exclamation-triangle',
       'fa-plane',
       'fa-calendar',
       'fa-random',
       'fa-comment',
       'fa-magnet',
       'fa-chevron-up',
       'fa-chevron-down',
       'fa-retweet',
       'fa-shopping-cart',
       'fa-folder',
       'fa-folder-open',
       'fa-arrows-v',
       'fa-arrows-h',
       'fa-bar-chart-o',
       'fa-twitter-square',
       'fa-facebook-square',
       'fa-camera-retro',
       'fa-key',
       'fa-cogs',
       'fa-comments',
       'fa-thumbs-o-up',
       'fa-thumbs-o-down',
       'fa-star-half',
       'fa-heart-o',
       'fa-sign-out',
       'fa-linkedin-square',
       'fa-thumb-tack',
       'fa-external-link',
       'fa-sign-in',
       'fa-trophy',
       'fa-github-square',
       'fa-upload',
       'fa-lemon-o',
       'fa-phone',
       'fa-square-o',
       'fa-bookmark-o',
       'fa-phone-square',
       'fa-twitter',
       'fa-facebook',
       'fa-github',
       'fa-unlock',
       'fa-credit-card',
       'fa-rss',
       'fa-hdd-o',
       'fa-bullhorn',
       'fa-bell',
       'fa-certificate',
       'fa-hand-o-right',
       'fa-hand-o-left',
       'fa-hand-o-up',
       'fa-hand-o-down',
       'fa-arrow-circle-left',
       'fa-arrow-circle-right',
       'fa-arrow-circle-up',
       'fa-arrow-circle-down',
       'fa-globe',
       'fa-wrench',
       'fa-tasks',
       'fa-filter',
       'fa-briefcase',
       'fa-arrows-alt',
       'fa-users',
       'fa-link',
       'fa-cloud',
       'fa-flask',
       'fa-scissors',
       'fa-files-o',
       'fa-paperclip',
       'fa-floppy-o',
       'fa-square',
       'fa-bars',
       'fa-list-ul',
       'fa-list-ol',
       'fa-strikethrough',
       'fa-underline',
       'fa-table',
       'fa-magic',
       'fa-truck',
       'fa-pinterest',
       'fa-pinterest-square',
       'fa-google-plus-square',
       'fa-google-plus',
       'fa-money',
       'fa-caret-down',
       'fa-caret-up',
       'fa-caret-left',
       'fa-caret-right',
       'fa-columns',
       'fa-sort',
       'fa-sort-asc',
       'fa-sort-desc',
       'fa-envelope',
       'fa-linkedin',
       'fa-undo',
       'fa-gavel',
       'fa-tachometer',
       'fa-comment-o',
       'fa-comments-o',
       'fa-bolt',
       'fa-sitemap',
       'fa-umbrella',
       'fa-clipboard',
       'fa-lightbulb-o',
       'fa-exchange',
       'fa-cloud-download',
       'fa-cloud-upload',
       'fa-user-md',
       'fa-stethoscope',
       'fa-suitcase',
       'fa-bell-o',
       'fa-coffee',
       'fa-cutlery',
       'fa-file-text-o',
       'fa-building-o',
       'fa-hospital-o',
       'fa-ambulance',
       'fa-medkit',
       'fa-fighter-jet',
       'fa-beer',
       'fa-h-square',
       'fa-plus-square',
       'fa-angle-double-left',
       'fa-angle-double-right',
       'fa-angle-double-up',
       'fa-angle-double-down',
       'fa-angle-left',
       'fa-angle-right',
       'fa-angle-up',
       'fa-angle-down',
       'fa-desktop',
       'fa-laptop',
       'fa-tablet',
       'fa-mobile',
       'fa-circle-o',
       'fa-quote-left',
       'fa-quote-right',
       'fa-spinner',
       'fa-circle',
       'fa-reply',
       'fa-github-alt',
       'fa-folder-o',
       'fa-folder-open-o',
       'fa-smile-o',
       'fa-frown-o',
       'fa-meh-o',
       'fa-gamepad',
       'fa-keyboard-o',
       'fa-flag-o',
       'fa-flag-checkered',
       'fa-terminal',
       'fa-code',
       'fa-reply-all',
       'fa-mail-reply-all',
       'fa-star-half-o',
       'fa-location-arrow',
       'fa-crop',
       'fa-code-fork',
       'fa-chain-broken',
       'fa-question',
       'fa-info',
       'fa-exclamation',
       'fa-superscript',
       'fa-subscript',
       'fa-eraser',
       'fa-puzzle-piece',
       'fa-microphone',
       'fa-microphone-slash',
       'fa-shield',
       'fa-calendar-o',
       'fa-fire-extinguisher',
       'fa-rocket',
       'fa-maxcdn',
       'fa-chevron-circle-left',
       'fa-chevron-circle-right',
       'fa-chevron-circle-up',
       'fa-chevron-circle-down',
       'fa-html5',
       'fa-css3',
       'fa-anchor',
       'fa-unlock-alt',
       'fa-bullseye',
       'fa-ellipsis-h',
       'fa-ellipsis-v',
       'fa-rss-square',
       'fa-play-circle',
       'fa-ticket',
       'fa-minus-square',
       'fa-minus-square-o',
       'fa-level-up',
       'fa-level-down',
       'fa-check-square',
       'fa-pencil-square',
       'fa-external-link-square',
       'fa-share-square',
       'fa-compass',
       'fa-caret-square-o-down',
       'fa-caret-square-o-up',
       'fa-caret-square-o-right',
       'fa-eur',
       'fa-gbp',
       'fa-usd',
       'fa-inr',
       'fa-jpy',
       'fa-rub',
       'fa-krw',
       'fa-btc',
       'fa-file',
       'fa-file-text',
       'fa-sort-alpha-asc',
       'fa-sort-alpha-desc',
       'fa-sort-amount-asc',
       'fa-sort-amount-desc',
       'fa-sort-numeric-asc',
       'fa-sort-numeric-desc',
       'fa-thumbs-up',
       'fa-thumbs-down',
       'fa-youtube-square',
       'fa-youtube',
       'fa-xing',
       'fa-xing-square',
       'fa-youtube-play',
       'fa-dropbox',
       'fa-stack-overflow',
       'fa-instagram',
       'fa-flickr',
       'fa-adn',
       'fa-bitbucket',
       'fa-bitbucket-square',
       'fa-tumblr',
       'fa-tumblr-square',
       'fa-long-arrow-down',
       'fa-long-arrow-up',
       'fa-long-arrow-left',
       'fa-long-arrow-right',
       'fa-apple',
       'fa-windows',
       'fa-android',
       'fa-linux',
       'fa-dribbble',
       'fa-skype',
       'fa-foursquare',
       'fa-trello',
       'fa-female',
       'fa-male',
       'fa-gittip',
       'fa-sun-o',
       'fa-moon-o',
       'fa-archive',
       'fa-bug',
       'fa-vk',
       'fa-weibo',
       'fa-renren',
       'fa-pagelines',
       'fa-stack-exchange',
       'fa-arrow-circle-o-right',
       'fa-arrow-circle-o-left',
       'fa-caret-square-o-left',
       'fa-dot-circle-o',
       'fa-wheelchair',
       'fa-vimeo-square',
       'fa-try',
       'fa-plus-square-o',
       'fa-space-shuttle',
       'fa-slack',
       'fa-envelope-square',
       'fa-wordpress',
       'fa-openid',
       'fa-institution',
       'fa-bank',
       'fa-university',
       'fa-mortar-board',
       'fa-graduation-cap',
       'fa-yahoo',
       'fa-google',
       'fa-reddit',
       'fa-reddit-square',
       'fa-stumbleupon-circle',
       'fa-stumbleupon',
       'fa-delicious',
       'fa-digg',
       'fa-pied-piper-square',
       'fa-pied-piper',
       'fa-pied-piper-alt',
       'fa-pied-piper-pp',
       'fa-drupal',
       'fa-joomla',
       'fa-language',
       'fa-fax',
       'fa-building',
       'fa-child',
       'fa-paw',
       'fa-spoon',
       'fa-cube',
       'fa-cubes',
       'fa-behance',
       'fa-behance-square',
       'fa-steam',
       'fa-steam-square',
       'fa-recycle',
       'fa-automobile',
       'fa-car',
       'fa-cab',
       'fa-tree',
       'fa-spotify',
       'fa-deviantart',
       'fa-soundcloud',
       'fa-database',
       'fa-file-pdf-o',
       'fa-file-word-o',
       'fa-file-excel-o',
       'fa-file-powerpoint-o',
       'fa-file-photo-o',
       'fa-file-picture-o',
       'fa-file-image-o',
       'fa-file-zip-o',
       'fa-file-archive-o',
       'fa-file-sound-o',
       'fa-file-movie-o',
       'fa-file-code-o',
       'fa-vine',
       'fa-codepen',
       'fa-jsfiddle',
       'fa-life-bouy',
       'fa-support',
       'fa-life-ring',
       'fa-circle-o-notch',
       'fa-rebel',
       'fa-empire',
       'fa-git-square',
       'fa-git',
       'fa-hacker-news',
       'fa-tencent-weibo',
       'fa-qq',
       'fa-wechat',
       'fa-send',
       'fa-paper-plane',
       'fa-send-o',
       'fa-paper-plane-o',
       'fa-history',
       'fa-circle-thin',
       'fa-header',
       'fa-paragraph',
       'fa-sliders',
       'fa-share-alt',
       'fa-share-alt-square',
       'fa-bomb',
       'fa-soccer-ball',
       'fa-futbol-o',
       'fa-tty',
       'fa-binoculars',
       'fa-plug',
       'fa-slideshare',
       'fa-twitch',
       'fa-yelp',
       'fa-newspaper-o',
       'fa-wifi',
       'fa-calculator',
       'fa-paypal',
       'fa-google-wallet',
       'fa-cc-visa',
       'fa-cc-mastercard',
       'fa-cc-discover',
       'fa-cc-amex',
       'fa-cc-paypal',
       'fa-cc-stripe',
       'fa-bell-slash',
       'fa-bell-slash-o',
       'fa-trash',
       'fa-copyright',
       'fa-at',
       'fa-eyedropper',
       'fa-paint-brush',
       'fa-birthday-cake',
       'fa-area-chart',
       'fa-pie-chart',
       'fa-line-chart',
       'fa-lastfm',
       'fa-lastfm-square',
       'fa-toggle-off',
       'fa-toggle-on',
       'fa-bicycle',
       'fa-bus',
       'fa-ioxhost',
       'fa-angellist',
       'fa-cc',
       'fa-shekel',
       'fa-sheqel',
       'fa-ils',
       'fa-meanpath',
       'fa-buysellads',
       'fa-connectdevelop',
       'fa-dashcube',
       'fa-forumbee',
       'fa-leanpub',
       'fa-sellsy',
       'fa-shirtsinbulk',
       'fa-simplybuilt',
       'fa-skyatlas',
       'fa-cart-plus',
       'fa-cart-arrow-down',
       'fa-diamond',
       'fa-ship',
       'fa-user-secret',
       'fa-motorcycle',
       'fa-street-view',
       'fa-heartbeat',
       'fa-venus',
       'fa-mars',
       'fa-mercury',
       'fa-transgender',
       'fa-transgender-alt',
       'fa-venus-double',
       'fa-mars-double',
       'fa-venus-mars',
       'fa-mars-stroke',
       'fa-mars-stroke-v',
       'fa-mars-stroke-h',
       'fa-neuter',
       'fa-facebook-official',
       'fa-pinterest-p',
       'fa-whatsapp',
       'fa-server',
       'fa-user-plus',
       'fa-user-times',
       'fa-hotel',
       'fa-bed',
       'fa-viacoin',
       'fa-train',
       'fa-subway',
       'fa-medium',
       'fa-git',
       'fa-y-combinator-square',
       'fa-yc-square',
       'fa-hacker-news',
       'fa-yc',
       'fa-y-combinator',
       'fa-optin-monster',
       'fa-opencart',
       'fa-expeditedssl',
       'fa-battery-4',
       'fa-battery-full',
       'fa-battery-3',
       'fa-battery-three-quarters',
       'fa-battery-2',
       'fa-battery-half',
       'fa-battery-1',
       'fa-battery-quarter',
       'fa-battery-0',
       'fa-battery-empty',
       'fa-mouse-pointer',
       'fa-i-cursor',
       'fa-object-group',
       'fa-object-ungroup',
       'fa-sticky-note',
       'fa-sticky-note-o',
       'fa-cc-jcb',
       'fa-cc-diners-club',
       'fa-clone',
       'fa-balance-scale',
       'fa-hourglass-o',
       'fa-hourglass-1',
       'fa-hourglass-start',
       'fa-hourglass-2',
       'fa-hourglass-half',
       'fa-hourglass-3',
       'fa-hourglass-end',
       'fa-hourglass',
       'fa-hand-grab-o',
       'fa-hand-rock-o',
       'fa-hand-stop-o',
       'fa-hand-paper-o',
       'fa-hand-scissors-o',
       'fa-hand-lizard-o',
       'fa-hand-spock-o',
       'fa-hand-pointer-o',
       'fa-hand-peace-o',
       'fa-trademark',
       'fa-registered',
       'fa-creative-commons',
       'fa-gg',
       'fa-gg-circle',
       'fa-tripadvisor',
       'fa-odnoklassniki',
       'fa-odnoklassniki-square',
       'fa-get-pocket',
       'fa-wikipedia-w',
       'fa-safari',
       'fa-chrome',
       'fa-firefox',
       'fa-opera',
       'fa-internet-explorer',
       'fa-tv',
       'fa-television',
       'fa-contao',
       'fa-500px',
       'fa-amazon',
       'fa-calendar-plus-o',
       'fa-calendar-minus-o',
       'fa-calendar-times-o',
       'fa-calendar-check-o',
       'fa-industry',
       'fa-map-pin',
       'fa-map-signs',
       'fa-map-o',
       'fa-map',
       'fa-commenting',
       'fa-commenting-o',
       'fa-houzz',
       'fa-vimeo',
       'fa-black-tie',
       'fa-fonticons',
       'fa-reddit-alien',
       'fa-edge',
       'fa-credit-card-alt',
       'fa-codiepie:before',
       'fa-modx',
       'fa-fort-awesome',
       'fa-usb',
       'fa-product-hunt',
       'fa-mixcloud',
       'fa-scribd',
       'fa-pause-circle',
       'fa-pause-circle-o',
       'fa-stop-circle',
       'fa-stop-circle-o',
       'fa-shopping-bag',
       'fa-shopping-basket',
       'fa-hashtag',
       'fa-bluetooth',
       'fa-bluetooth-b',
       'fa-percent',
       'fa-gitlab',
       'fa-wpbeginner',
       'fa-wpforms',
       'fa-envira',
       'fa-universal-access',
       'fa-wheelchair-alt',
       'fa-question-circle-o',
       'fa-blind',
       'fa-audio-description',
       'fa-volume-control-phone',
       'fa-braille',
       'fa-assistive-listening-systems',
       'fa-asl-interpreting',
       'fa-american-sign-language-interpreting',
       'fa-deafness',
       'fa-hard-of-hearing',
       'fa-deaf',
       'fa-glide',
       'fa-glide-g',
       'fa-signing',
       'fa-sign-language',
       'fa-low-vision',
       'fa-viadeo',
       'fa-viadeo-square',
       'fa-snapchat',
       'fa-snapchat-ghost',
       'fa-snapchat-square',
       'fa-first-order',
       'fa-yoast',
       'fa-themeisle',
       'fa-google-plus-circle',
       'fa-google-plus-official',
       'fa-fa',
       'fa-font-awesome',
       'fa-handshake-o',
       'fa-envelope-open',
       'fa-envelope-open-o',
       'fa-linode',
       'fa-address-book',
       'fa-address-book-o',
       'fa-vcard',
       'fa-address-card',
       'fa-vcard-o',
       'fa-address-card-o',
       'fa-user-circle',
       'fa-user-circle-o',
       'fa-user-o:before',
       'fa-id-badge',
       'fa-drivers-license',
       'fa-id-card',
       'fa-drivers-license-o',
       'fa-id-card-o',
       'fa-quora',
       'fa-free-code-camp',
       'fa-telegram',
       'fa-thermometer-4',
       'fa-thermometer',
       'fa-thermometer-full',
       'fa-thermometer-3',
       'fa-thermometer-three-quarters',
       'fa-thermometer-2',
       'fa-thermometer-half',
       'fa-thermometer-1',
       'fa-thermometer-quarter',
       'fa-thermometer-0:',
       'fa-thermometer-empty',
       'fa-shower',
       'fa-bathtub',
       'fa-s15',
       'fa-bath',
       'fa-podcast',
       'fa-window-maximize',
       'fa-window-minimize',
       'fa-window-restore',
       'fa-times-rectangle',
       'fa-window-close',
       'fa-times-rectangle-o',
       'fa-window-close-o',
       'fa-bandcamp',
       'fa-grav',
       'fa-etsy',
       'fa-imdb',
       'fa-ravelry',
       'fa-eercast',
       'fa-microchip',
       'fa-snowflake-o',
       'fa-superpowers',
       'fa-wpexplorer',
       'fa-meetup',
 
     );
   }
 
   public static function getIconColors() {
     return array(
       'bluegrey',
       'white',
       'red',
       'orange',
       'yellow',
       'green',
       'blue',
       'sky',
       'indigo',
       'violet',
       'pink',
       'lightgreytext',
       'lightbluetext',
     );
   }
 
 }
diff --git a/src/view/phui/PHUIListView.php b/src/view/phui/PHUIListView.php
index 2a8180e5be..4c412ce23e 100644
--- a/src/view/phui/PHUIListView.php
+++ b/src/view/phui/PHUIListView.php
@@ -1,193 +1,207 @@
 <?php
 
 final class PHUIListView extends AphrontTagView {
 
   const NAVBAR_LIST = 'phui-list-navbar';
+  const NAVBAR_VERTICAL = 'phui-list-navbar-vertical';
   const SIDENAV_LIST = 'phui-list-sidenav';
   const TABBAR_LIST = 'phui-list-tabbar';
 
   private $items = array();
   private $type;
 
   protected function canAppendChild() {
     return false;
   }
 
   public function newLabel($name, $key = null) {
     $item = id(new PHUIListItemView())
       ->setType(PHUIListItemView::TYPE_LABEL)
       ->setName($name);
 
     if ($key !== null) {
       $item->setKey($key);
     }
 
     $this->addMenuItem($item);
 
     return $item;
   }
 
   public function newLink($name, $href, $key = null) {
     $item = id(new PHUIListItemView())
       ->setType(PHUIListItemView::TYPE_LINK)
       ->setName($name)
       ->setHref($href);
 
     if ($key !== null) {
       $item->setKey($key);
     }
 
     $this->addMenuItem($item);
 
     return $item;
   }
 
   public function newButton($name, $href) {
     $item = id(new PHUIListItemView())
       ->setType(PHUIListItemView::TYPE_BUTTON)
       ->setName($name)
       ->setHref($href);
 
     $this->addMenuItem($item);
 
     return $item;
   }
 
   public function addMenuItem(PHUIListItemView $item) {
     return $this->addMenuItemAfter(null, $item);
   }
 
   public function addMenuItemAfter($key, PHUIListItemView $item) {
     if ($key === null) {
       $this->items[] = $item;
       return $this;
     }
 
     if (!$this->getItem($key)) {
       throw new Exception(pht("No such key '%s' to add menu item after!",
         $key));
     }
 
     $result = array();
     foreach ($this->items as $other) {
       $result[] = $other;
       if ($other->getKey() == $key) {
         $result[] = $item;
       }
     }
 
     $this->items = $result;
     return $this;
   }
 
   public function addMenuItemBefore($key, PHUIListItemView $item) {
     if ($key === null) {
       array_unshift($this->items, $item);
       return $this;
     }
 
     $this->requireKey($key);
 
     $result = array();
     foreach ($this->items as $other) {
       if ($other->getKey() == $key) {
         $result[] = $item;
       }
       $result[] = $other;
     }
 
     $this->items = $result;
     return $this;
   }
 
   public function addMenuItemToLabel($key, PHUIListItemView $item) {
     $this->requireKey($key);
 
     $other = $this->getItem($key);
     if ($other->getType() != PHUIListItemView::TYPE_LABEL) {
       throw new Exception(pht("Menu item '%s' is not a label!", $key));
     }
 
     $seen = false;
     $after = null;
     foreach ($this->items as $other) {
       if (!$seen) {
         if ($other->getKey() == $key) {
           $seen = true;
         }
       } else {
         if ($other->getType() == PHUIListItemView::TYPE_LABEL) {
           break;
         }
       }
       $after = $other->getKey();
     }
 
     return $this->addMenuItemAfter($after, $item);
   }
 
   private function requireKey($key) {
     if (!$this->getItem($key)) {
       throw new Exception(pht("No menu item with key '%s' exists!", $key));
     }
   }
 
   public function getItem($key) {
     $key = (string)$key;
 
     // NOTE: We could optimize this, but need to update any map when items have
     // their keys change. Since that's moderately complex, wait for a profile
     // or use case.
 
     foreach ($this->items as $item) {
       if ($item->getKey() == $key) {
         return $item;
       }
     }
 
     return null;
   }
 
   public function getItems() {
     return $this->items;
   }
 
   public function willRender() {
     $key_map = array();
     foreach ($this->items as $item) {
       $key = $item->getKey();
       if ($key !== null) {
         if (isset($key_map[$key])) {
           throw new Exception(
             pht("Menu contains duplicate items with key '%s'!", $key));
         }
         $key_map[$key] = $item;
       }
     }
   }
 
   protected function getTagName() {
     return 'ul';
   }
 
   public function setType($type) {
     $this->type = $type;
     return $this;
   }
 
   protected function getTagAttributes() {
     require_celerity_resource('phui-list-view-css');
     $classes = array();
     $classes[] = 'phui-list-view';
     if ($this->type) {
-      $classes[] = $this->type;
+      switch ($this->type) {
+        case self::NAVBAR_LIST:
+          $classes[] = 'phui-list-navbar';
+          $classes[] = 'phui-list-navbar-horizontal';
+          break;
+        case self::NAVBAR_VERTICAL:
+          $classes[] = 'phui-list-navbar';
+          $classes[] = 'phui-list-navbar-vertical';
+          break;
+        default:
+          $classes[] = $this->type;
+          break;
+      }
     }
+
     return array(
       'class' => implode(' ', $classes),
     );
   }
 
   protected function getTagContent() {
     return $this->items;
   }
 }
diff --git a/src/view/phui/PHUITabGroupView.php b/src/view/phui/PHUITabGroupView.php
index 4a1963e050..65e9e1c821 100644
--- a/src/view/phui/PHUITabGroupView.php
+++ b/src/view/phui/PHUITabGroupView.php
@@ -1,116 +1,165 @@
 <?php
 
 final class PHUITabGroupView extends AphrontTagView {
 
   private $tabs = array();
   private $selectedTab;
+  private $vertical;
 
   private $hideSingleTab;
 
   protected function canAppendChild() {
     return false;
   }
 
+  public function setVertical($vertical) {
+    $this->vertical = $vertical;
+    return $this;
+  }
+
+  public function getVertical() {
+    return $this->vertical;
+  }
+
   public function setHideSingleTab($hide_single_tab) {
     $this->hideSingleTab = $hide_single_tab;
     return $this;
   }
 
   public function getHideSingleTab() {
     return $this->hideSingleTab;
   }
 
   public function addTab(PHUITabView $tab) {
     $key = $tab->getKey();
     $tab->lockKey();
 
     if (isset($this->tabs[$key])) {
       throw new Exception(
         pht(
           'Each tab in a tab group must have a unique key; attempting to add '.
           'a second tab with a duplicate key ("%s").',
           $key));
     }
 
     $this->tabs[$key] = $tab;
 
     return $this;
   }
 
   public function selectTab($key) {
     if (empty($this->tabs[$key])) {
       throw new Exception(
         pht(
           'Unable to select tab ("%s") which does not exist.',
           $key));
     }
 
     $this->selectedTab = $key;
 
     return $this;
   }
 
   public function getSelectedTabKey() {
     if (!$this->tabs) {
       return null;
     }
 
     if ($this->selectedTab !== null) {
       return $this->selectedTab;
     }
 
     return head($this->tabs)->getKey();
   }
 
   protected function getTagAttributes() {
     $tab_map = mpull($this->tabs, 'getContentID', 'getKey');
 
+    $classes = array();
+    if ($this->getVertical()) {
+      $classes[] = 'phui-tab-group-view-vertical';
+    }
+
     return array(
+      'class' => $classes,
       'sigil' => 'phui-tab-group-view',
       'meta' => array(
         'tabMap' => $tab_map,
       ),
     );
   }
 
   protected function getTagContent() {
     Javelin::initBehavior('phui-tab-group');
 
-    $tabs = id(new PHUIListView())
-      ->setType(PHUIListView::NAVBAR_LIST);
+    $tabs = new PHUIListView();
+
+    if ($this->getVertical()) {
+      $tabs->setType(PHUIListView::NAVBAR_VERTICAL);
+    } else {
+      $tabs->setType(PHUIListView::NAVBAR_LIST);
+    }
+
     $content = array();
 
     $selected_tab = $this->getSelectedTabKey();
     foreach ($this->tabs as $tab) {
       $item = $tab->newMenuItem();
       $tab_key = $tab->getKey();
 
       if ($tab_key == $selected_tab) {
         $item->setSelected(true);
         $style = null;
       } else {
         $style = 'display: none;';
       }
 
       $tabs->addMenuItem($item);
 
       $content[] = javelin_tag(
         'div',
         array(
           'style' => $style,
           'id' => $tab->getContentID(),
         ),
         $tab);
     }
 
     if ($this->hideSingleTab && (count($this->tabs) == 1)) {
       $tabs = null;
     }
 
+    if ($tabs && $this->getVertical()) {
+      $content = phutil_tag(
+        'table',
+        array(
+          'style' => 'width: 100%',
+        ),
+        phutil_tag(
+          'tbody',
+          array(),
+          phutil_tag(
+            'tr',
+            array(),
+            array(
+              phutil_tag(
+                'td',
+                array(
+                  'class' => 'phui-tab-group-view-tab-column',
+                ),
+                $tabs),
+              phutil_tag(
+                'td',
+                array(),
+                $content),
+            ))));
+      $tabs = null;
+    }
+
     return array(
       $tabs,
       $content,
     );
   }
 
 }
diff --git a/src/view/phui/PHUITabView.php b/src/view/phui/PHUITabView.php
index bcc80bf774..e50dbcbc4e 100644
--- a/src/view/phui/PHUITabView.php
+++ b/src/view/phui/PHUITabView.php
@@ -1,91 +1,106 @@
 <?php
 
 final class PHUITabView extends AphrontTagView {
 
+  private $icon;
   private $name;
   private $key;
   private $keyLocked;
   private $contentID;
   private $color;
 
   public function setKey($key) {
     if ($this->keyLocked) {
       throw new Exception(
         pht(
           'Attempting to change the key of a tab with a locked key ("%s").',
           $this->key));
     }
 
     $this->key = $key;
     return $this;
   }
 
   public function hasKey() {
     return ($this->key !== null);
   }
 
   public function getKey() {
     if (!$this->hasKey()) {
       throw new PhutilInvalidStateException('setKey');
     }
 
     return $this->key;
   }
 
   public function lockKey() {
     if (!$this->hasKey()) {
       throw new PhutilInvalidStateException('setKey');
     }
 
     $this->keyLocked = true;
 
     return $this;
   }
 
   public function setName($name) {
     $this->name = $name;
     return $this;
   }
 
   public function getName() {
     return $this->name;
   }
 
+  public function setIcon(PHUIIconView $icon) {
+    $this->icon = $icon;
+    return $this;
+  }
+
+  public function getIcon() {
+    return $this->icon;
+  }
+
   public function getContentID() {
     if ($this->contentID === null) {
       $this->contentID = celerity_generate_unique_node_id();
     }
 
     return $this->contentID;
   }
 
   public function setColor($color) {
     $this->color = $color;
     return $this;
   }
 
   public function getColor() {
     return $this->color;
   }
 
   public function newMenuItem() {
     $item = id(new PHUIListItemView())
       ->setName($this->getName())
       ->setKey($this->getKey())
       ->setType(PHUIListItemView::TYPE_LINK)
       ->setHref('#')
       ->addSigil('phui-tab-view')
       ->setMetadata(
         array(
           'tabKey' => $this->getKey(),
         ));
 
+    $icon = $this->getIcon();
+    if ($icon) {
+      $item->setIcon($icon->getIconName());
+    }
+
     $color = $this->getColor();
     if ($color !== null) {
       $item->setStatusColor($color);
     }
 
     return $item;
   }
 
 }
diff --git a/webroot/rsrc/css/application/base/standard-page-view.css b/webroot/rsrc/css/application/base/standard-page-view.css
index 755ed1d59c..6952710938 100644
--- a/webroot/rsrc/css/application/base/standard-page-view.css
+++ b/webroot/rsrc/css/application/base/standard-page-view.css
@@ -1,204 +1,224 @@
 /**
  * @provides phabricator-standard-page-view
  */
 
 .phabricator-anchor-view,
 .phabricator-anchor-navigation-marker {
   position: absolute;
   margin-top: -15px;
 }
 
 .phabricator-chromeless-page .phabricator-standard-page {
   background: transparent;
   border-width: 0px;
 }
 
 .phabricator-standard-page-body {
   clear: both;
 }
 
 body.white-background {
   background: {$page.content};
 }
 
 .phabricator-standard-page-footer {
   text-align: right;
   margin: 44px 16px 16px;
   padding: 12px 0;
   border-top: 1px solid rgba({$alphagrey},.1);
   color: {$greytext};
 }
 
 .with-durable-column .phabricator-standard-page-footer {
   margin: 36px 16px 28px;
 }
 
 .device .phabricator-standard-page-footer {
   margin: 24px 8px 16px;
 }
 
 !print .phabricator-standard-page-footer {
   display: none;
 }
 
 .device-desktop .has-local-nav + .phabricator-standard-page-footer {
   margin-left: 221px;
 }
 
 .device .phabricator-side-menu-home + .phabricator-standard-page-footer {
   display: none;
 }
 
+.keyboard-shortcut-help {
+  margin: 4px 12px;
+}
+
 .keyboard-shortcut-help td,
 .keyboard-shortcut-help th {
-  padding: 8px;
+  padding: 6px;
   vertical-align: middle;
 }
 
 .keyboard-shortcut-help th {
   white-space: nowrap;
   color: {$greytext};
 }
 
+.keyboard-shortcut-key {
+  display: inline-block;
+  min-width: 1em;
+  min-height: 1em;
+  padding: 4px 6px;
+  font-weight: normal;
+  text-align: center;
+  text-decoration: none;
+  border-radius: 3px;
+  box-shadow: inset 0 -1px 0 rgba({$alphablue}, 0.08);
+  user-select: none;
+  color: {$darkgreytext};
+  background: {$lightgreybackground};
+  border: 1px solid {$lightgreyborder};
+}
+
 .keyboard-focus-focus-reticle {
   background: rgba(255, 255, 211, 0.15);
   position: absolute;
   border: 1px solid {$yellow};
   pointer-events: none;
 }
 
 a.handle-status-closed {
   text-decoration: line-through;
   color: #676767;
 }
 
 a.handle-status-closed:hover {
   text-decoration: line-through;
   color: #19558D;
 }
 
 .handle-availability-none .perfect-circle {
   color: {$red};
 }
 
 .handle-availability-partial .perfect-circle {
   color: {$orange};
 }
 
 .handle-availability-no-email .perfect-circle {
   color: {$violet};
 }
 
 .handle-availability-disabled .perfect-circle {
   color: {$greytext};
 }
 
 .aphront-developer-error-callout {
   position: relative;
   padding: 2em;
   background: #aa0000;
   color: white;
   text-align: center;
   font-size: {$smallerfontsize};
 }
 
 .phui-handle.phui-link-person {
   /* Prevent linebreaks between user availability markers and usernames. */
   white-space: nowrap;
 }
 
 .phui-handle .phui-icon-view {
   display: inline-block;
   margin: 2px 2px -2px 0;
 }
 
 .jx-scrollbar-frame {
   position: relative;
   overflow: hidden;
 }
 
 .jx-scrollbar-viewport {
   position: absolute;
   overflow-x: hidden;
   overflow-y: scroll;
   top: 0;
   bottom: 0;
   left: 0;
   right: 0;
 }
 
 .jx-scrollbar-test {
   position: absolute;
   left: -300px;
 }
 
 .jx-scrollbar-bar {
   position: absolute;
   top: 0;
   right: 0;
   bottom: 7px;
   width: 11px;
 }
 
 .jx-scrollbar-bar .jx-scrollbar-handle {
   position: absolute;
   right: 2px;
   -webkit-border-radius: 7px;
   -moz-border-radius: 7px;
   border-radius: 7px;
   min-height: 10px;
   width: 7px;
   opacity: 0;
   -webkit-transition: opacity 0.2s linear;
   -moz-transition: opacity 0.2s linear;
   -o-transition: opacity 0.2s linear;
   -ms-transition: opacity 0.2s linear;
   transition: opacity 0.2s linear;
   background: #6c6e71;
   -webkit-background-clip: padding-box;
   -moz-background-clip: padding;
 }
 
 .jx-scrollbar-bar:hover .jx-scrollbar-handle {
   opacity: 0.7;
   -webkit-transition: opacity 0 linear;
   -moz-transition: opacity 0 linear;
   -o-transition: opacity 0 linear;
   -ms-transition: opacity 0 linear;
   transition: opacity 0 linear;
 }
 
 .jx-scrollbar-bar .jx-scrollbar-visible {
   opacity: 0.7;
 }
 
 .jx-scrollbar-link {
   position: absolute;
   left: -50px;
 }
 
 .phabricator-standard-page-tabs {
   padding: 0 32px;
   margin-bottom: 32px;
   background: {$page.content};
   box-shadow: 0 0 3px 0 rgba(0,0,0,0.2);
 }
 
 .device .phabricator-standard-page-tabs {
   margin-bottom: 20px;
   padding: 0 12px;
 }
 
 .device-phone .phabricator-standard-page-tabs {
   text-align: center;
 }
 
 .device-phone
   .phabricator-standard-page-tabs.phui-list-view.phui-list-tabbar > li {
     display: inline-block;
     float: none;
 }
 
 .phabricator-standard-page-tabs.phui-list-tabbar .phui-list-item-href {
   padding: 12px 24px;
 }
diff --git a/webroot/rsrc/css/phui/phui-list.css b/webroot/rsrc/css/phui/phui-list.css
index 6932d9f29b..e6395302ea 100644
--- a/webroot/rsrc/css/phui/phui-list.css
+++ b/webroot/rsrc/css/phui/phui-list.css
@@ -1,315 +1,351 @@
 /**
  * @provides phui-list-view-css
  */
 
 .phui-list-item-view {
   position: relative;
 }
 
 .phui-list-item-header,
 .phui-list-item-header a {
   color: {$bluetext};
   font-weight: bold;
   -webkit-font-smoothing: antialiased;
 }
 
 /* - Sidenav and Actions -------------------------------------------------------
 
   Sidebar and Action Menus
 
 */
 
 .phui-list-sidenav {
   padding: 4px 0;
 }
 
 .phui-list-sidenav .phui-list-item-type-label .phui-list-item-name {
   font-weight: bold;
   color: {$bluetext};
   padding: 4px 8px 6px 8px;
   display: block;
   -webkit-font-smoothing: antialiased;
 }
 
 .phui-list-sidenav .phui-list-item-type-divider {
   margin: 8px 8px 12px 8px;
   border-bottom: 1px solid {$thinblueborder};
 }
 
 .phui-list-sidenav .phui-list-item-icon {
   height: 14px;
   width: 14px;
   display: inline-block;
   position: absolute;
   top: 6px;
   text-align: center;
 }
 
 .phui-list-sidenav .phui-list-item-icon + .phui-list-item-name {
   padding-left: 20px;
 }
 
 .phui-list-sidenav .phui-list-item-has-icon {
   margin: 0;
   position: relative;
 }
 
 .phui-list-sidenav .phui-list-item-view {
   overflow: hidden;
 }
 
 .phui-list-sidenav .phui-list-item-href {
   display: block;
   padding: 4px 16px;
   clear: both;
   color: {$darkgreytext};
   line-height: 18px;
 }
 
 .phabricator-side-menu .phui-list-item-disabled .phui-list-item-href,
 .phui-list-sidenav .phui-list-item-disabled .phui-list-item-href {
   color: {$lightgreytext};
 }
 
 .phui-list-sidenav .phui-list-item-has-icon .phui-list-item-href {
   padding: 4px 10px;
 }
 
 .phui-list-sidenav .phui-list-item-has-icon .phui-list-item-indented {
   padding-left: 18px;
 }
 
 
 .device-desktop .phui-list-sidenav .phui-list-item-href:hover {
   background: {$sky};
   color: white;
   cursor: pointer;
   text-decoration: none;
 }
 
 .device-desktop .phui-list-sidenav .phui-list-item-href:hover .phui-icon-view {
   color: {$page.content};
 }
 
 /* - Top, Full Width Navigations -----------------------------------------------
 
   Sets a page or box with a top navbar
 
 */
 
 .phui-list-view.phui-list-navbar {
   list-style: none;
   overflow: hidden;
+}
+
+.phui-list-view.phui-list-navbar-horizontal {
   border-bottom: 1px solid {$thinblueborder};
 }
 
 .phui-list-view.phui-list-navbar > li {
   list-style: none;
-  float: left;
   display: block;
+}
+
+.phui-list-view.phui-list-navbar-horizontal > li {
+  float: left;
   border-right: 1px solid {$thinblueborder};
 }
 
 .phui-list-navbar .phui-list-item-href {
   color: {$bluetext};
-  padding: 8px 16px;
   line-height: 16px;
 }
 
+.phui-list-navbar-horizontal .phui-list-item-href {
+  padding: 8px 16px;
+}
+
+.phui-list-navbar-vertical .phui-list-item-href {
+  padding: 8px 12px;
+}
+
+.phui-list-navbar-vertical {
+  box-shadow: 0 1px 0 rgba({$alphablue}, 0.05);
+}
+
+.phui-list-navbar-vertical .phui-list-item-href {
+  display: block;
+  background: #ffffff;
+}
+
 .phui-list-navbar .phui-list-item-selected .phui-list-item-href {
   background: {$lightbluebackground};
   color: {$darkbluetext};
   font-weight: bold;
 }
 
+.phui-tab-group-view-tab-column {
+  width: 220px;
+  border-right: 1px solid {$thinblueborder};
+  background: {$lightgreybackground};
+}
+
 .phui-list-navbar .phui-list-item-href:hover {
   background: rgba(100,100,100,.1);
   color: {$darkgreytext};
   text-decoration: none;
 }
 
 .phui-list-navbar .phui-list-item-icon {
   height: 14px;
   width: 14px;
-  display: block;
   font-size: 14px;
+  text-align: center;
 }
 
-.device-phone .phui-list-view.phui-list-navbar > li {
+.phui-list-navbar-vertical .phui-list-item-icon {
+  margin-right: 8px;
+}
+
+.phui-list-navbar-horizontal .phui-list-item-icon {
+  display: block;
+}
+
+.device-phone .phui-list-view.phui-list-navbar-horizontal > li {
   float: none;
   border: none;
 }
 
 /* - Two Column View, Responsive Navigations -----------------------------------
 
   Sets a two column page with a responsive, top navbar
 
 */
 
 .phui-list-view.phui-list-tabbar {
   list-style: none;
   overflow: hidden;
 }
 
 .phui-list-view.phui-list-tabbar > li {
   list-style: none;
   float: left;
   display: block;
 }
 
 .phui-list-view.phui-list-tabbar > li > * {
   display: block;
 }
 
 .phui-list-tabbar .phui-list-item-href {
   color: {$bluetext};
   padding: 8px 24px;
   line-height: 24px;
   font-weight: bold;
   font-size: {$biggerfontsize};
   border-top: 4px solid transparent;
 }
 
 .phui-list-tabbar .phui-list-item-selected .phui-list-item-href {
   color: {$sky};
   border-bottom: 4px solid {$sky};
 }
 
 .phui-list-tabbar .phui-list-item-selected .phui-list-item-href
   .phui-icon-view {
     color: {$sky};
 }
 
 .device-desktop .phui-list-tabbar .phui-list-item-href:hover {
   color: {$sky};
   text-decoration: none;
 }
 
 .phui-list-tabbar .phui-list-item-icon {
   height: 20px;
   width: 20px;
   display: none;
   font-size: 20px;
   text-align: center;
 }
 
 .device-phone .phui-list-tabbar .phui-list-item-icon {
   display: inline-block;
 }
 
 .device-phone .phui-list-tabbar .phui-list-item-name {
   display: none;
 }
 
 .device-phone .phui-list-tabbar .phui-list-item-href {
   padding: 8px 16px;
 }
 
 .device-phone .phui-list-view.phui-list-navbar > li {
   float: none;
   border: none;
 }
 
 /* - Status Colors -------------------------------------------------------------
 
   Colors for navbars
 
 */
 
 .phui-list-item-warn .phui-list-item-href {
   color: #bc7837;
 }
 
 .phui-list-item-fail .phui-list-item-href {
   color: {$red};
 }
 
 .phui-list-item-warn.phui-list-item-selected .phui-list-item-href,
 .phui-list-item-warn .phui-list-item-href:hover {
   background: {$lightyellow};
   color: #bc7837;
 }
 
 .phui-list-item-fail.phui-list-item-selected .phui-list-item-href,
 .phui-list-item-fail .phui-list-item-href:hover {
   background: {$lightred};
   color: {$red};
 }
 
 .phui-list-item-warn.phui-list-item-selected .phui-list-item-href:hover {
   background: #fcf0bd;
 }
 
 .phui-list-item-fail.phui-list-item-selected .phui-list-item-href:hover {
   background: #f5d3d0;
 }
 
 /* - Dashboards ------------------------------------------------------------ */
 
 .dashboard-panel .phui-list-view.phui-list-navbar {
   border-left: 1px solid {$lightblueborder};
   border-right: 1px solid {$lightblueborder};
   border-bottom: 1px solid {$thinblueborder};
 }
 
 /* - Info Stack ------------------------------------------------------------ */
 
 .phui-info-view + .phui-list-view {
   margin-top: 16px;
   border-top: 1px solid {$thinblueborder};
 }
 
 /* - Action Icon ----------------------------------------------------------- */
 
 .phabricator-nav-local .phui-list-item-has-action-icon
   .phui-list-item-action-href {
   position: absolute;
   width: 28px;
   top: 0;
   right: 0;
   bottom: 0;
   text-align: center;
   line-height: 28px;
   background-color: transparent;
   display: none;
 }
 
 .phabricator-nav-local .phui-list-item-has-action-icon.phui-list-item-selected
   .phui-list-item-href {
   padding-right: 32px;
 }
 
 .phabricator-nav-local .phui-list-item-has-action-icon.phui-list-item-selected
   .phui-list-item-action-href {
     display: block;
 }
 
 .phabricator-nav-local .phui-list-item-has-action-icon
   .phui-list-item-action-href:hover {
   background-color: rgba({$alphablack},.05);
 }
 
 .phabricator-nav-local .phui-list-item-has-action-icon
   .phui-list-item-action-icon {
   opacity: 0.5;
 }
 
 .phabricator-nav-local .phui-list-item-has-action-icon
   .phui-list-item-action-href:hover
   .phui-list-item-action-icon {
   opacity: 1;
 }
 
 /* - Item Counts ----------------------------------------------------------- */
 
 .phui-list-item-count {
   position: absolute;
   right: 7px;
   top: 7px;
   background: {$blue};
   border-radius: 2px;
   color: #fff;
   font-weight: bold;
   padding: 0 5px 1px;
   font-size: {$smallestfontsize};
 }
diff --git a/webroot/rsrc/js/application/diff/DiffChangesetList.js b/webroot/rsrc/js/application/diff/DiffChangesetList.js
index 862926bdfa..9f5af9a63b 100644
--- a/webroot/rsrc/js/application/diff/DiffChangesetList.js
+++ b/webroot/rsrc/js/application/diff/DiffChangesetList.js
@@ -1,1949 +1,1954 @@
 /**
  * @provides phabricator-diff-changeset-list
  * @requires javelin-install
  *           phuix-button-view
  * @javelin
  */
 
 JX.install('DiffChangesetList', {
 
   construct: function() {
     this._changesets = [];
 
     var onload = JX.bind(this, this._ifawake, this._onload);
     JX.Stratcom.listen('click', 'differential-load', onload);
 
     var onmore = JX.bind(this, this._ifawake, this._onmore);
     JX.Stratcom.listen('click', 'show-more', onmore);
 
     var onmenu = JX.bind(this, this._ifawake, this._onmenu);
     JX.Stratcom.listen('click', 'differential-view-options', onmenu);
 
     var oncollapse = JX.bind(this, this._ifawake, this._oncollapse, true);
     JX.Stratcom.listen('click', 'hide-inline', oncollapse);
 
     var onexpand = JX.bind(this, this._ifawake, this._oncollapse, false);
     JX.Stratcom.listen('click', 'reveal-inline', onexpand);
 
     var onedit = JX.bind(this, this._ifawake, this._onaction, 'edit');
     JX.Stratcom.listen(
       'click',
       ['differential-inline-comment', 'differential-inline-edit'],
       onedit);
 
     var ondone = JX.bind(this, this._ifawake, this._onaction, 'done');
     JX.Stratcom.listen(
       'click',
       ['differential-inline-comment', 'differential-inline-done'],
       ondone);
 
     var ondelete = JX.bind(this, this._ifawake, this._onaction, 'delete');
     JX.Stratcom.listen(
       'click',
       ['differential-inline-comment', 'differential-inline-delete'],
       ondelete);
 
     var onreply = JX.bind(this, this._ifawake, this._onaction, 'reply');
     JX.Stratcom.listen(
       'click',
       ['differential-inline-comment', 'differential-inline-reply'],
       onreply);
 
     var onresize = JX.bind(this, this._ifawake, this._onresize);
     JX.Stratcom.listen('resize', null, onresize);
 
     var onscroll = JX.bind(this, this._ifawake, this._onscroll);
     JX.Stratcom.listen('scroll', null, onscroll);
 
     var onselect = JX.bind(this, this._ifawake, this._onselect);
     JX.Stratcom.listen(
       'mousedown',
       ['differential-inline-comment', 'differential-inline-header'],
       onselect);
 
     var onhover = JX.bind(this, this._ifawake, this._onhover);
     JX.Stratcom.listen(
       ['mouseover', 'mouseout'],
       'differential-inline-comment',
       onhover);
 
     var onrangedown = JX.bind(this, this._ifawake, this._onrangedown);
     JX.Stratcom.listen(
       'mousedown',
       ['differential-changeset', 'tag:td'],
       onrangedown);
 
     var onrangemove = JX.bind(this, this._ifawake, this._onrangemove);
     JX.Stratcom.listen(
       ['mouseover', 'mouseout'],
       ['differential-changeset', 'tag:td'],
       onrangemove);
 
     var onrangeup = JX.bind(this, this._ifawake, this._onrangeup);
     JX.Stratcom.listen(
       'mouseup',
       null,
       onrangeup);
   },
 
   properties: {
     translations: null,
     inlineURI: null,
     inlineListURI: null,
     isStandalone: false
   },
 
   members: {
     _initialized: false,
     _asleep: true,
     _changesets: null,
 
     _cursorItem: null,
 
     _focusNode: null,
     _focusStart: null,
     _focusEnd: null,
 
     _hoverNode: null,
     _hoverInline: null,
     _hoverOrigin: null,
     _hoverTarget: null,
 
     _rangeActive: false,
     _rangeOrigin: null,
     _rangeTarget: null,
 
     _bannerNode: null,
     _unsavedButton: null,
     _unsubmittedButton: null,
     _doneButton: null,
     _doneMode: null,
 
     _dropdownMenu: null,
     _menuButton: null,
     _menuItems: null,
 
     sleep: function() {
       this._asleep = true;
 
       this._redrawFocus();
       this._redrawSelection();
       this.resetHover();
 
       this._bannerChangeset = null;
       this._redrawBanner();
     },
 
     wake: function() {
       this._asleep = false;
 
       this._redrawFocus();
       this._redrawSelection();
 
       this._bannerChangeset = null;
       this._redrawBanner();
 
       if (this._initialized) {
         return;
       }
 
       this._initialized = true;
       var pht = this.getTranslations();
 
       // We may be viewing the normal "/D123" view (with all the changesets)
       // or the standalone view (with just one changeset). In the standalone
       // view, some options (like jumping to next or previous file) do not
       // make sense and do not function.
       var standalone = this.getIsStandalone();
 
       var label;
 
+      if (!standalone) {
+        label = pht('Jump to the table of contents.');
+        this._installKey('t', 'diff-nav', label, this._ontoc);
+      }
+
       label = pht('Jump to next change.');
       this._installJumpKey('j', label, 1);
 
       label = pht('Jump to previous change.');
       this._installJumpKey('k', label, -1);
 
       if (!standalone) {
         label = pht('Jump to next file.');
         this._installJumpKey('J', label, 1, 'file');
 
         label = pht('Jump to previous file.');
         this._installJumpKey('K', label, -1, 'file');
       }
 
       label = pht('Jump to next inline comment.');
       this._installJumpKey('n', label, 1, 'comment');
 
       label = pht('Jump to previous inline comment.');
       this._installJumpKey('p', label, -1, 'comment');
 
       label = pht('Jump to next inline comment, including collapsed comments.');
       this._installJumpKey('N', label, 1, 'comment', true);
 
       label = pht(
         'Jump to previous inline comment, including collapsed comments.');
       this._installJumpKey('P', label, -1, 'comment', true);
 
       if (!standalone) {
         label = pht('Hide or show the current file.');
-        this._installKey('h', label, this._onkeytogglefile);
-
-        label = pht('Jump to the table of contents.');
-        this._installKey('t', label, this._ontoc);
+        this._installKey('h', 'diff-vis', label, this._onkeytogglefile);
       }
 
       label = pht('Reply to selected inline comment or change.');
-      this._installKey('r', label, JX.bind(this, this._onkeyreply, false));
+      this._installKey('r', 'inline', label,
+        JX.bind(this, this._onkeyreply, false));
 
       label = pht('Reply and quote selected inline comment.');
-      this._installKey('R', label, JX.bind(this, this._onkeyreply, true));
+      this._installKey('R', 'inline', label,
+        JX.bind(this, this._onkeyreply, true));
 
       label = pht('Edit selected inline comment.');
-      this._installKey('e', label, this._onkeyedit);
+      this._installKey('e', 'inline', label, this._onkeyedit);
 
       label = pht('Mark or unmark selected inline comment as done.');
-      this._installKey('w', label, this._onkeydone);
+      this._installKey('w', 'inline', label, this._onkeydone);
 
       label = pht('Collapse or expand inline comment.');
-      this._installKey('q', label, this._onkeycollapse);
+      this._installKey('q', 'diff-vis', label, this._onkeycollapse);
 
       label = pht('Hide or show all inline comments.');
-      this._installKey('A', label, this._onkeyhideall);
+      this._installKey('A', 'diff-vis', label, this._onkeyhideall);
 
       label = pht('Open file in external editor.');
-      this._installKey('\\', label, this._onkeyopeneditor);
+      this._installKey('\\', 'diff-nav', label, this._onkeyopeneditor);
 
     },
 
     isAsleep: function() {
       return this._asleep;
     },
 
     newChangesetForNode: function(node) {
       var changeset = JX.DiffChangeset.getForNode(node);
 
       this._changesets.push(changeset);
       changeset.setChangesetList(this);
 
       return changeset;
     },
 
     getChangesetForNode: function(node) {
       return JX.DiffChangeset.getForNode(node);
     },
 
     getInlineByID: function(id) {
       var inline = null;
 
       for (var ii = 0; ii < this._changesets.length; ii++) {
         inline = this._changesets[ii].getInlineByID(id);
         if (inline) {
           break;
         }
       }
 
       return inline;
     },
 
     _ifawake: function(f) {
       // This function takes another function and only calls it if the
       // changeset list is awake, so we basically just ignore events when we
       // are asleep. This may move up the stack at some point as we do more
       // with Quicksand/Sheets.
 
       if (this.isAsleep()) {
         return;
       }
 
       return f.apply(this, [].slice.call(arguments, 1));
     },
 
     _onload: function(e) {
       var data = e.getNodeData('differential-load');
 
       // NOTE: We can trigger a load from either an explicit "Load" link on
       // the changeset, or by clicking a link in the table of contents. If
       // the event was a table of contents link, we let the anchor behavior
       // run normally.
       if (data.kill) {
         e.kill();
       }
 
       var node = JX.$(data.id);
       var changeset = this.getChangesetForNode(node);
 
       changeset.load();
 
       // TODO: Move this into Changeset.
       var routable = changeset.getRoutable();
       if (routable) {
         routable.setPriority(2000);
       }
     },
 
-    _installKey: function(key, label, handler) {
+    _installKey: function(key, group, label, handler) {
       handler = JX.bind(this, this._ifawake, handler);
 
       return new JX.KeyboardShortcut(key, label)
         .setHandler(handler)
+        .setGroup(group)
         .register();
     },
 
     _installJumpKey: function(key, label, delta, filter, show_collapsed) {
       filter = filter || null;
 
       var options = {
         filter: filter,
         collapsed: show_collapsed
       };
 
       var handler = JX.bind(this, this._onjumpkey, delta, options);
-      return this._installKey(key, label, handler);
+      return this._installKey(key, 'diff-nav', label, handler);
     },
 
     _ontoc: function(manager) {
       var toc = JX.$('toc');
       manager.scrollTo(toc);
     },
 
     getSelectedInline: function() {
       var cursor = this._cursorItem;
 
       if (cursor) {
         if (cursor.type == 'comment') {
           return cursor.target;
         }
       }
 
       return null;
     },
 
     _onkeyreply: function(is_quote) {
       var cursor = this._cursorItem;
 
       if (cursor) {
         if (cursor.type == 'comment') {
           var inline = cursor.target;
           if (inline.canReply()) {
             this.setFocus(null);
 
             var text;
             if (is_quote) {
               text = inline.getRawText();
               text = '> ' + text.replace(/\n/g, '\n> ') + '\n\n';
             } else {
               text = '';
             }
 
             inline.reply(text);
             return;
           }
         }
 
         // If the keyboard cursor is selecting a range of lines, we may have
         // a mixture of old and new changes on the selected rows. It is not
         // entirely unambiguous what the user means when they say they want
         // to reply to this, but we use this logic: reply on the new file if
         // there are any new lines. Otherwise (if there are only removed
         // lines) reply on the old file.
 
         if (cursor.type == 'change') {
           var origin = cursor.nodes.begin;
           var target = cursor.nodes.end;
 
           // The "origin" and "target" are entire rows, but we need to find
           // a range of "<th />" nodes to actually create an inline, so go
           // fishing.
 
           var old_list = [];
           var new_list = [];
 
           var row = origin;
           while (row) {
             var header = row.firstChild;
             while (header) {
               if (this.getLineNumberFromHeader(header)) {
                 if (header.className.indexOf('old') !== -1) {
                   old_list.push(header);
                 } else if (header.className.indexOf('new') !== -1) {
                   new_list.push(header);
                 }
               }
               header = header.nextSibling;
             }
 
             if (row == target) {
               break;
             }
 
             row = row.nextSibling;
           }
 
           var use_list;
           if (new_list.length) {
             use_list = new_list;
           } else {
             use_list = old_list;
           }
 
           var src = use_list[0];
           var dst = use_list[use_list.length - 1];
 
           cursor.changeset.newInlineForRange(src, dst);
 
           this.setFocus(null);
           return;
         }
       }
 
       var pht = this.getTranslations();
       this._warnUser(pht('You must select a comment or change to reply to.'));
     },
 
     _onkeyedit: function() {
       var cursor = this._cursorItem;
 
       if (cursor) {
         if (cursor.type == 'comment') {
           var inline = cursor.target;
           if (inline.canEdit()) {
             this.setFocus(null);
 
             inline.edit();
             return;
           }
         }
       }
 
       var pht = this.getTranslations();
       this._warnUser(pht('You must select a comment to edit.'));
     },
 
     _onkeydone: function() {
       var cursor = this._cursorItem;
 
       if (cursor) {
         if (cursor.type == 'comment') {
           var inline = cursor.target;
           if (inline.canDone()) {
             this.setFocus(null);
 
             inline.toggleDone();
             return;
           }
         }
       }
 
       var pht = this.getTranslations();
       this._warnUser(pht('You must select a comment to mark done.'));
     },
 
     _onkeytogglefile: function() {
       var cursor = this._cursorItem;
 
       if (cursor) {
         if (cursor.type == 'file') {
           cursor.changeset.toggleVisibility();
           return;
         }
       }
 
       var pht = this.getTranslations();
       this._warnUser(pht('You must select a file to hide or show.'));
     },
 
     _onkeyopeneditor: function() {
       var pht = this.getTranslations();
       var cursor = this._cursorItem;
 
       if (cursor) {
         if (cursor.type == 'file') {
           var changeset = cursor.changeset;
           var editor_uri = changeset.getEditorURI();
 
           if (editor_uri === null) {
             this._warnUser(pht('No external editor is configured.'));
             return;
           }
 
           JX.$U(editor_uri).go();
 
           return;
         }
       }
 
       this._warnUser(pht('You must select a file to edit.'));
     },
 
     _onkeycollapse: function() {
       var cursor = this._cursorItem;
 
       if (cursor) {
         if (cursor.type == 'comment') {
           var inline = cursor.target;
           if (inline.canCollapse()) {
             this.setFocus(null);
 
             inline.setCollapsed(!inline.isCollapsed());
             return;
           }
         }
       }
 
       var pht = this.getTranslations();
       this._warnUser(pht('You must select a comment to hide.'));
     },
 
     _onkeyhideall: function() {
       var inlines = this._getInlinesByType();
       if (inlines.visible.length) {
         this._toggleInlines('all');
       } else {
         this._toggleInlines('show');
       }
     },
 
     _warnUser: function(message) {
       new JX.Notification()
         .setContent(message)
         .alterClassName('jx-notification-alert', true)
         .setDuration(3000)
         .show();
     },
 
     _onjumpkey: function(delta, options) {
       var state = this._getSelectionState();
 
       var filter = options.filter || null;
       var collapsed = options.collapsed || false;
       var wrap = options.wrap || false;
       var attribute = options.attribute || null;
       var show = options.show || false;
 
       var cursor = state.cursor;
       var items = state.items;
 
       // If there's currently no selection and the user tries to go back,
       // don't do anything.
       if ((cursor === null) && (delta < 0)) {
         return;
       }
 
       var did_wrap = false;
       while (true) {
         if (cursor === null) {
           cursor = 0;
         } else {
           cursor = cursor + delta;
         }
 
         // If we've gone backward past the first change, bail out.
         if (cursor < 0) {
           return;
         }
 
         // If we've gone forward off the end of the list, figure out where we
         // should end up.
         if (cursor >= items.length) {
           if (!wrap) {
             // If we aren't wrapping around, we're done.
             return;
           }
 
           if (did_wrap) {
             // If we're already wrapped around, we're done.
             return;
           }
 
           // Otherwise, wrap the cursor back to the top.
           cursor = 0;
           did_wrap = true;
         }
 
         // If we're selecting things of a particular type (like only files)
         // and the next item isn't of that type, move past it.
         if (filter !== null) {
           if (items[cursor].type !== filter) {
             continue;
           }
         }
 
         // If the item is collapsed, don't select it when iterating with jump
         // keys. It can still potentially be selected in other ways.
         if (!collapsed) {
           if (items[cursor].collapsed) {
             continue;
           }
         }
 
         // If the item has been deleted, don't select it when iterating. The
         // cursor may remain on it until it is removed.
         if (items[cursor].deleted) {
           continue;
         }
 
         // If we're selecting things with a particular attribute, like
         // "unsaved", skip items without the attribute.
         if (attribute !== null) {
           if (!(items[cursor].attributes || {})[attribute]) {
             continue;
           }
         }
 
         // If this item is a hidden inline but we're clicking a button which
         // selects inlines of a particular type, make it visible again.
         if (items[cursor].hidden) {
           if (!show) {
             continue;
           }
           items[cursor].target.setHidden(false);
         }
 
         // Otherwise, we've found a valid item to select.
         break;
       }
 
       this._setSelectionState(items[cursor], true);
     },
 
     _getSelectionState: function() {
       var items = this._getSelectableItems();
 
       var cursor = null;
       if (this._cursorItem !== null) {
         for (var ii = 0; ii < items.length; ii++) {
           var item = items[ii];
           if (this._cursorItem.target === item.target) {
             cursor = ii;
             break;
           }
         }
       }
 
       return {
         cursor: cursor,
         items: items
       };
     },
 
     _setSelectionState: function(item, scroll) {
       this._cursorItem = item;
       this._redrawSelection(scroll);
 
       return this;
     },
 
     _redrawSelection: function(scroll) {
       var cursor = this._cursorItem;
       if (!cursor) {
         this.setFocus(null);
         return;
       }
 
       // If this item has been removed from the document (for example: create
       // a new empty comment, then use the "Unsaved" button to select it, then
       // cancel it), we can still keep the cursor here but do not want to show
       // a selection reticle over an invisible node.
       if (cursor.deleted) {
         this.setFocus(null);
         return;
       }
 
       this.setFocus(cursor.nodes.begin, cursor.nodes.end);
 
       if (scroll) {
         var pos = JX.$V(cursor.nodes.begin);
         JX.DOM.scrollToPosition(0, pos.y - 60);
       }
 
       return this;
     },
 
     redrawCursor: function() {
       // NOTE: This is setting the cursor to the current cursor. Usually, this
       // would have no effect.
 
       // However, if the old cursor pointed at an inline and the inline has
       // been edited so the rows have changed, this updates the cursor to point
       // at the new inline with the proper rows for the current state, and
       // redraws the reticle correctly.
 
       var state = this._getSelectionState();
       if (state.cursor !== null) {
         this._setSelectionState(state.items[state.cursor], false);
       }
     },
 
     _getSelectableItems: function() {
       var result = [];
 
       for (var ii = 0; ii < this._changesets.length; ii++) {
         var items = this._changesets[ii].getSelectableItems();
         for (var jj = 0; jj < items.length; jj++) {
           result.push(items[jj]);
         }
       }
 
       return result;
     },
 
     _onhover: function(e) {
       if (e.getIsTouchEvent()) {
         return;
       }
 
       var inline;
       if (e.getType() == 'mouseout') {
         inline = null;
       } else {
         inline = this._getInlineForEvent(e);
       }
 
       this._setHoverInline(inline);
     },
 
     _onmore: function(e) {
       e.kill();
 
       var node = e.getNode('differential-changeset');
       var changeset = this.getChangesetForNode(node);
 
       var data = e.getNodeData('show-more');
       var target = e.getNode('context-target');
 
       changeset.loadContext(data.range, target);
     },
 
     _onmenu: function(e) {
       var button = e.getNode('differential-view-options');
 
       var data = JX.Stratcom.getData(button);
       if (data.menu) {
         // We've already built this menu, so we can let the menu itself handle
         // the event.
         return;
       }
 
       e.prevent();
 
       var pht = this.getTranslations();
 
       var node = JX.DOM.findAbove(
         button,
         'div',
         'differential-changeset');
 
       var changeset_list = this;
       var changeset = this.getChangesetForNode(node);
 
       var menu = new JX.PHUIXDropdownMenu(button);
       var list = new JX.PHUIXActionListView();
 
       var add_link = function(icon, name, href, local) {
         if (!href) {
           return;
         }
 
         var link = new JX.PHUIXActionView()
           .setIcon(icon)
           .setName(name)
           .setHref(href)
           .setHandler(function(e) {
             if (local) {
               window.location.assign(href);
             } else {
               window.open(href);
             }
             menu.close();
             e.prevent();
           });
 
         list.addItem(link);
         return link;
       };
 
       var reveal_item = new JX.PHUIXActionView()
         .setIcon('fa-eye');
       list.addItem(reveal_item);
 
       var visible_item = new JX.PHUIXActionView()
         .setHandler(function(e) {
           e.prevent();
           menu.close();
 
           changeset.toggleVisibility();
         });
       list.addItem(visible_item);
 
       add_link('fa-file-text', pht('Browse in Diffusion'), data.diffusionURI);
       add_link('fa-file-o', pht('View Standalone'), data.standaloneURI);
 
       var up_item = new JX.PHUIXActionView()
         .setHandler(function(e) {
           if (changeset.isLoaded()) {
 
             // Don't let the user swap display modes if a comment is being
             // edited, since they might lose their work. See PHI180.
             var inlines = changeset.getInlines();
             for (var ii = 0; ii < inlines.length; ii++) {
               if (inlines[ii].isEditing()) {
                 changeset_list._warnUser(
                   pht(
                     'Finish editing inline comments before changing display ' +
                     'modes.'));
                 e.prevent();
                 menu.close();
                 return;
               }
             }
 
             var renderer = changeset.getRendererKey();
             if (renderer == '1up') {
               renderer = '2up';
             } else {
               renderer = '1up';
             }
             changeset.reload({renderer: renderer});
           } else {
             changeset.reload();
           }
 
           e.prevent();
           menu.close();
         });
       list.addItem(up_item);
 
       var encoding_item = new JX.PHUIXActionView()
         .setIcon('fa-font')
         .setName(pht('Change Text Encoding...'))
         .setHandler(function(e) {
           var params = {
             encoding: changeset.getCharacterEncoding()
           };
 
           new JX.Workflow('/services/encoding/', params)
             .setHandler(function(r) {
               changeset.reload({encoding: r.encoding});
             })
             .start();
 
           e.prevent();
           menu.close();
         });
       list.addItem(encoding_item);
 
       var highlight_item = new JX.PHUIXActionView()
         .setIcon('fa-sun-o')
         .setName(pht('Highlight As...'))
         .setHandler(function(e) {
           var params = {
             highlight: changeset.getHighlight()
           };
 
           new JX.Workflow('/services/highlight/', params)
             .setHandler(function(r) {
               changeset.reload({highlight: r.highlight});
             })
             .start();
 
           e.prevent();
           menu.close();
         });
       list.addItem(highlight_item);
 
       var engine_item = new JX.PHUIXActionView()
         .setIcon('fa-file-image-o')
         .setName(pht('View As...'))
         .setHandler(function(e) {
           var params = {
             engine: changeset.getDocumentEngine(),
           };
 
           new JX.Workflow('/services/viewas/', params)
             .setHandler(function(r) {
               changeset.reload({engine: r.engine});
             })
             .start();
 
           e.prevent();
           menu.close();
         });
       list.addItem(engine_item);
 
       add_link('fa-arrow-left', pht('Show Raw File (Left)'), data.leftURI);
       add_link('fa-arrow-right', pht('Show Raw File (Right)'), data.rightURI);
 
       var editor_uri = changeset.getEditorURI();
       if (editor_uri !== null) {
         add_link('fa-pencil', pht('Open in Editor'), editor_uri, true);
       } else {
         var configure_uri = changeset.getEditorConfigureURI();
         if (configure_uri !== null) {
           add_link('fa-wrench', pht('Configure Editor'), configure_uri);
         }
       }
 
       menu.setContent(list.getNode());
 
       menu.listen('open', function() {
         // When the user opens the menu, check if there are any "Show More"
         // links in the changeset body. If there aren't, disable the "Show
         // Entire File" menu item since it won't change anything.
 
         var nodes = JX.DOM.scry(JX.$(data.containerID), 'a', 'show-more');
         if (nodes.length) {
           reveal_item
             .setDisabled(false)
             .setName(pht('Show All Context'))
             .setIcon('fa-file-o')
             .setHandler(function(e) {
               changeset.loadAllContext();
               e.prevent();
               menu.close();
             });
         } else {
           reveal_item
             .setDisabled(true)
             .setIcon('fa-file')
             .setName(pht('All Context Shown'))
             .setHandler(function(e) { e.prevent(); });
         }
 
         encoding_item.setDisabled(!changeset.isLoaded());
         highlight_item.setDisabled(!changeset.isLoaded());
         engine_item.setDisabled(!changeset.isLoaded());
 
         if (changeset.isLoaded()) {
           if (changeset.getRendererKey() == '2up') {
             up_item
               .setIcon('fa-list-alt')
               .setName(pht('View Unified'));
           } else {
             up_item
               .setIcon('fa-files-o')
               .setName(pht('View Side-by-Side'));
           }
         } else {
           up_item
             .setIcon('fa-refresh')
             .setName(pht('Load Changes'));
         }
 
         visible_item
           .setDisabled(true)
           .setIcon('fa-expand')
           .setName(pht('Can\'t Toggle Unloaded File'));
         var diffs = JX.DOM.scry(
           JX.$(data.containerID),
           'table',
           'differential-diff');
 
         if (diffs.length > 1) {
           JX.$E(
             'More than one node with sigil "differential-diff" was found in "'+
             data.containerID+'."');
         } else if (diffs.length == 1) {
           var diff = diffs[0];
           visible_item.setDisabled(false);
           if (!changeset.isVisible()) {
             visible_item
               .setName(pht('Expand File'))
               .setIcon('fa-expand');
           } else {
             visible_item
               .setName(pht('Collapse File'))
               .setIcon('fa-compress');
           }
         } else {
           // Do nothing when there is no diff shown in the table. For example,
           // the file is binary.
         }
 
       });
 
       data.menu = menu;
       menu.open();
     },
 
     _oncollapse: function(is_collapse, e) {
       e.kill();
 
       var inline = this._getInlineForEvent(e);
 
       inline.setCollapsed(is_collapse);
     },
 
     _onresize: function() {
       this._redrawFocus();
       this._redrawSelection();
       this._redrawHover();
 
       // Force a banner redraw after a resize event. Particularly, this makes
       // sure the inline state updates immediately after an inline edit
       // operation, even if the changeset itself has not changed.
       this._bannerChangeset = null;
 
       this._redrawBanner();
 
       var changesets = this._changesets;
       for (var ii = 0; ii < changesets.length; ii++) {
         changesets[ii].redrawFileTree();
       }
     },
 
     _onscroll: function() {
       this._redrawBanner();
     },
 
     _onselect: function(e) {
       // If the user clicked some element inside the header, like an action
       // icon, ignore the event. They have to click the header element itself.
       if (e.getTarget() !== e.getNode('differential-inline-header')) {
         return;
       }
 
       var inline = this._getInlineForEvent(e);
       if (!inline) {
         return;
       }
 
       // The user definitely clicked an inline, so we're going to handle the
       // event.
       e.kill();
 
       this.selectInline(inline);
     },
 
     selectInline: function(inline) {
       var selection = this._getSelectionState();
       var item;
 
       // If the comment the user clicked is currently selected, deselect it.
       // This makes it easy to undo things if you clicked by mistake.
       if (selection.cursor !== null) {
         item = selection.items[selection.cursor];
         if (item.target === inline) {
           this._setSelectionState(null, false);
           return;
         }
       }
 
       // Otherwise, select the item that the user clicked. This makes it
       // easier to resume keyboard operations after using the mouse to do
       // something else.
       var items = selection.items;
       for (var ii = 0; ii < items.length; ii++) {
         item = items[ii];
         if (item.target === inline) {
           this._setSelectionState(item, false);
         }
       }
     },
 
     _onaction: function(action, e) {
       e.kill();
 
       var inline = this._getInlineForEvent(e);
       var is_ref = false;
 
       // If we don't have a natural inline object, the user may have clicked
       // an action (like "Delete") inside a preview element at the bottom of
       // the page.
 
       // If they did, try to find an associated normal inline to act on, and
       // pretend they clicked that instead. This makes the overall state of
       // the page more consistent.
 
       // However, there may be no normal inline (for example, because it is
       // on a version of the diff which is not visible). In this case, we
       // act by reference.
 
       if (inline === null) {
         var data = e.getNodeData('differential-inline-comment');
         inline = this.getInlineByID(data.id);
         if (inline) {
           is_ref = true;
         } else {
           switch (action) {
             case 'delete':
               this._deleteInlineByID(data.id);
               return;
           }
         }
       }
 
       // TODO: For normal operations, highlight the inline range here.
 
       switch (action) {
         case 'edit':
           inline.edit();
           break;
         case 'done':
           inline.toggleDone();
           break;
         case 'delete':
           inline.delete(is_ref);
           break;
         case 'reply':
           inline.reply();
           break;
       }
     },
 
     redrawPreview: function() {
       // TODO: This isn't the cleanest way to find the preview form, but
       // rendering no longer has direct access to it.
       var forms = JX.DOM.scry(document.body, 'form', 'transaction-append');
       if (forms.length) {
         JX.DOM.invoke(forms[0], 'shouldRefresh');
       }
 
       // Clear the mouse hover reticle after a substantive edit: we don't get
       // a "mouseout" event if the row vanished because of row being removed
       // after an edit.
       this.resetHover();
     },
 
     setFocus: function(node, extended_node) {
       this._focusStart = node;
       this._focusEnd = extended_node;
       this._redrawFocus();
     },
 
     _redrawFocus: function() {
       var node = this._focusStart;
       var extended_node = this._focusEnd || node;
 
       var reticle = this._getFocusNode();
       if (!node || this.isAsleep()) {
         JX.DOM.remove(reticle);
         return;
       }
 
       // Outset the reticle some pixels away from the element, so there's some
       // space between the focused element and the outline.
       var p = JX.Vector.getPos(node);
       var s = JX.Vector.getAggregateScrollForNode(node);
 
       p.add(s).add(-4, -4).setPos(reticle);
       // Compute the size we need to extend to the full extent of the focused
       // nodes.
       JX.Vector.getPos(extended_node)
         .add(-p.x, -p.y)
         .add(JX.Vector.getDim(extended_node))
         .add(8, 8)
         .setDim(reticle);
 
       JX.DOM.getContentFrame().appendChild(reticle);
     },
 
     _getFocusNode: function() {
       if (!this._focusNode) {
         var node = JX.$N('div', {className : 'keyboard-focus-focus-reticle'});
         this._focusNode = node;
       }
       return this._focusNode;
     },
 
     _setHoverInline: function(inline) {
       this._hoverInline = inline;
 
       if (inline) {
         var changeset = inline.getChangeset();
 
         var changeset_id;
         var side = inline.getDisplaySide();
         if (side == 'right') {
           changeset_id = changeset.getRightChangesetID();
         } else {
           changeset_id = changeset.getLeftChangesetID();
         }
 
         var new_part;
         if (inline.isNewFile()) {
           new_part = 'N';
         } else {
           new_part = 'O';
         }
 
         var prefix = 'C' + changeset_id + new_part + 'L';
 
         var number = inline.getLineNumber();
         var length = inline.getLineLength();
 
         try {
           var origin = JX.$(prefix + number);
           var target = JX.$(prefix + (number + length));
 
           this._hoverOrigin = origin;
           this._hoverTarget = target;
         } catch (error) {
           // There may not be any nodes present in the document. A case where
           // this occurs is when you reply to a ghost inline which was made
           // on lines near the bottom of "long.txt" in an earlier diff, and
           // the file was later shortened so those lines no longer exist. For
           // more details, see T11662.
 
           this._hoverOrigin = null;
           this._hoverTarget = null;
         }
       } else {
         this._hoverOrigin = null;
         this._hoverTarget = null;
       }
 
       this._redrawHover();
     },
 
     _setHoverRange: function(origin, target) {
       this._hoverOrigin = origin;
       this._hoverTarget = target;
 
       this._redrawHover();
     },
 
     resetHover: function() {
       this._setHoverInline(null);
 
       this._hoverOrigin = null;
       this._hoverTarget = null;
     },
 
     _redrawHover: function() {
       var reticle = this._getHoverNode();
       if (!this._hoverOrigin || this.isAsleep()) {
         JX.DOM.remove(reticle);
         return;
       }
 
       JX.DOM.getContentFrame().appendChild(reticle);
 
       var top = this._hoverOrigin;
       var bot = this._hoverTarget;
       if (JX.$V(top).y > JX.$V(bot).y) {
         var tmp = top;
         top = bot;
         bot = tmp;
       }
 
       // Find the leftmost cell that we're going to highlight. This is the
       // next sibling with a "data-copy-mode" attribute, which is a marker
       // for the cell with actual content in it.
       var content_cell = top;
       while (content_cell && !content_cell.getAttribute('data-copy-mode')) {
         content_cell = content_cell.nextSibling;
       }
 
       // If we didn't find a cell to highlight, don't highlight anything.
       if (!content_cell) {
         return;
       }
 
       var pos = JX.$V(content_cell)
         .add(JX.Vector.getAggregateScrollForNode(content_cell));
 
       var dim = JX.$V(content_cell)
         .add(JX.Vector.getAggregateScrollForNode(content_cell))
         .add(-pos.x, -pos.y)
         .add(JX.Vector.getDim(content_cell));
 
       var bpos = JX.$V(bot)
         .add(JX.Vector.getAggregateScrollForNode(bot));
       dim.y = (bpos.y - pos.y) + JX.Vector.getDim(bot).y;
 
       pos.setPos(reticle);
       dim.setDim(reticle);
 
       JX.DOM.show(reticle);
     },
 
     _getHoverNode: function() {
       if (!this._hoverNode) {
         var attributes = {
           className: 'differential-reticle'
         };
         this._hoverNode = JX.$N('div', attributes);
       }
 
       return this._hoverNode;
     },
 
     _deleteInlineByID: function(id) {
       var uri = this.getInlineURI();
       var data = {
         op: 'refdelete',
         id: id
       };
 
       var handler = JX.bind(this, this.redrawPreview);
 
       new JX.Workflow(uri, data)
         .setHandler(handler)
         .start();
     },
 
     _getInlineForEvent: function(e) {
       var node = e.getNode('differential-changeset');
       if (!node) {
         return null;
       }
 
       var changeset = this.getChangesetForNode(node);
 
       var inline_row = e.getNode('inline-row');
       return changeset.getInlineForRow(inline_row);
     },
 
     getLineNumberFromHeader: function(node) {
       var n = parseInt(node.getAttribute('data-n'));
 
       if (!n) {
         return null;
       }
 
       // If this is a line number that's part of a row showing more context,
       // we don't want to let users leave inlines here.
 
       try {
         JX.DOM.findAbove(node, 'tr', 'context-target');
         return null;
       } catch (ex) {
         // Ignore.
       }
 
       return n;
     },
 
     getDisplaySideFromHeader: function(th) {
       return (th.parentNode.firstChild != th) ? 'right' : 'left';
     },
 
     _onrangedown: function(e) {
       // NOTE: We're allowing "mousedown" from a touch event through so users
       // can leave inlines on a single line.
 
       // See PHI985. We want to exclude both right-mouse and middle-mouse
       // clicks from continuing.
       if (!e.isLeftButton()) {
         return;
       }
 
       if (this._rangeActive) {
         return;
       }
 
       var target = e.getTarget();
       var number = this.getLineNumberFromHeader(target);
       if (!number) {
         return;
       }
 
       e.kill();
       this._rangeActive = true;
 
       this._rangeOrigin = target;
       this._rangeTarget = target;
 
       this._setHoverRange(this._rangeOrigin, this._rangeTarget);
     },
 
     _onrangemove: function(e) {
       if (e.getIsTouchEvent()) {
         return;
       }
 
       var is_out = (e.getType() == 'mouseout');
       var target = e.getTarget();
 
       this._updateRange(target, is_out);
     },
 
     _updateRange: function(target, is_out) {
       // Don't update the range if this target doesn't correspond to a line
       // number. For instance, this may be a dead line number, like the empty
       // line numbers on the left hand side of a newly added file.
       var number = this.getLineNumberFromHeader(target);
       if (!number) {
         return;
       }
 
       if (this._rangeActive) {
         var origin = this._hoverOrigin;
 
         // Don't update the reticle if we're selecting a line range and the
         // "<th />" under the cursor is on the wrong side of the file. You can
         // only leave inline comments on the left or right side of a file, not
         // across lines on both sides.
         var origin_side = this.getDisplaySideFromHeader(origin);
         var target_side = this.getDisplaySideFromHeader(target);
         if (origin_side != target_side) {
           return;
         }
 
         // Don't update the reticle if we're selecting a line range and the
         // "<th />" under the cursor corresponds to a different file. You can
         // only leave inline comments on lines in a single file, not across
         // multiple files.
         var origin_table = JX.DOM.findAbove(origin, 'table');
         var target_table = JX.DOM.findAbove(target, 'table');
         if (origin_table != target_table) {
           return;
         }
       }
 
       if (is_out) {
         if (this._rangeActive) {
           // If we're dragging a range, just leave the state as it is. This
           // allows you to drag over something invalid while selecting a
           // range without the range flickering or getting lost.
         } else {
           // Otherwise, clear the current range.
           this.resetHover();
         }
         return;
       }
 
       if (this._rangeActive) {
         this._rangeTarget = target;
       } else {
         this._rangeOrigin = target;
         this._rangeTarget = target;
       }
 
       this._setHoverRange(this._rangeOrigin, this._rangeTarget);
     },
 
     _onrangeup: function(e) {
       if (!this._rangeActive) {
         return;
       }
 
       e.kill();
 
       var origin = this._rangeOrigin;
       var target = this._rangeTarget;
 
       // If the user dragged a range from the bottom to the top, swap the node
       // order around.
       if (JX.$V(origin).y > JX.$V(target).y) {
         var tmp = target;
         target = origin;
         origin = tmp;
       }
 
       var node = JX.DOM.findAbove(origin, null, 'differential-changeset');
       var changeset = this.getChangesetForNode(node);
 
       changeset.newInlineForRange(origin, target);
 
       this._rangeActive = false;
       this._rangeOrigin = null;
       this._rangeTarget = null;
 
       this.resetHover();
     },
 
     _redrawBanner: function() {
       // If the inline comment menu is open and we've done a redraw, close it.
       // In particular, this makes it close when you scroll the document:
       // otherwise, it stays open but the banner moves underneath it.
       if (this._dropdownMenu) {
         this._dropdownMenu.close();
       }
 
       var node = this._getBannerNode();
       var changeset = this._getVisibleChangeset();
 
       if (!changeset) {
         this._bannerChangeset = null;
         JX.DOM.remove(node);
         return;
       }
 
       // Don't do anything if nothing has changed. This seems to avoid some
       // flickering issues in Safari, at least.
       if (this._bannerChangeset === changeset) {
         return;
       }
       this._bannerChangeset = changeset;
 
       var inlines = this._getInlinesByType();
 
       var unsaved = inlines.unsaved;
       var unsubmitted = inlines.unsubmitted;
       var undone = inlines.undone;
       var done = inlines.done;
       var draft_done = inlines.draftDone;
 
       JX.DOM.alterClass(
         node,
         'diff-banner-has-unsaved',
         !!unsaved.length);
 
       JX.DOM.alterClass(
         node,
         'diff-banner-has-unsubmitted',
         !!unsubmitted.length);
 
       JX.DOM.alterClass(
         node,
         'diff-banner-has-draft-done',
         !!draft_done.length);
 
       var pht = this.getTranslations();
       var unsaved_button = this._getUnsavedButton();
       var unsubmitted_button = this._getUnsubmittedButton();
       var done_button = this._getDoneButton();
       var menu_button = this._getMenuButton();
 
       if (unsaved.length) {
         unsaved_button.setText(unsaved.length + ' ' + pht('Unsaved'));
         JX.DOM.show(unsaved_button.getNode());
       } else {
         JX.DOM.hide(unsaved_button.getNode());
       }
 
       if (unsubmitted.length || draft_done.length) {
         var any_draft_count = unsubmitted.length + draft_done.length;
 
         unsubmitted_button.setText(any_draft_count + ' ' + pht('Unsubmitted'));
         JX.DOM.show(unsubmitted_button.getNode());
       } else {
         JX.DOM.hide(unsubmitted_button.getNode());
       }
 
       if (done.length || undone.length) {
         // If you haven't marked any comments as "Done", we just show text
         // like "3 Comments". If you've marked at least one done, we show
         // "1 / 3 Comments".
 
         var done_text;
         if (done.length) {
           done_text = [
             done.length,
             ' / ',
             (done.length + undone.length),
             ' ',
             pht('Comments')
           ];
         } else {
           done_text = [
             undone.length,
             ' ',
             pht('Comments')
           ];
         }
 
         done_button.setText(done_text);
 
         JX.DOM.show(done_button.getNode());
 
         // If any comments are not marked "Done", this cycles through the
         // missing comments. Otherwise, it cycles through all the saved
         // comments.
         if (undone.length) {
           this._doneMode = 'undone';
         } else {
           this._doneMode = 'done';
         }
 
       } else {
         JX.DOM.hide(done_button.getNode());
       }
 
       var path_view = [icon, ' ', changeset.getDisplayPath()];
 
       var buttons_attrs = {
         className: 'diff-banner-buttons'
       };
 
       var buttons_list = [
         unsaved_button.getNode(),
         unsubmitted_button.getNode(),
         done_button.getNode(),
         menu_button.getNode()
       ];
 
       var buttons_view = JX.$N('div', buttons_attrs, buttons_list);
 
       var icon = new JX.PHUIXIconView()
         .setIcon(changeset.getIcon())
         .getNode();
       JX.DOM.setContent(node, [buttons_view, path_view]);
 
       document.body.appendChild(node);
     },
 
     _getInlinesByType: function() {
       var changesets = this._changesets;
       var unsaved = [];
       var unsubmitted = [];
       var undone = [];
       var done = [];
       var draft_done = [];
 
       var visible_done = [];
       var visible_collapsed = [];
       var visible_ghosts = [];
       var visible = [];
       var hidden = [];
 
       for (var ii = 0; ii < changesets.length; ii++) {
         var inlines = changesets[ii].getInlines();
         var inline;
         var jj;
         for (jj = 0; jj < inlines.length; jj++) {
           inline = inlines[jj];
 
           if (inline.isDeleted()) {
             continue;
           }
 
           if (inline.isSynthetic()) {
             continue;
           }
 
           if (inline.isEditing()) {
             unsaved.push(inline);
           } else if (!inline.getID()) {
             // These are new comments which have been cancelled, and do not
             // count as anything.
             continue;
           } else if (inline.isDraft()) {
             unsubmitted.push(inline);
           } else {
             // NOTE: Unlike other states, an inline may be marked with a
             // draft checkmark and still be a "done" or "undone" comment.
             if (inline.isDraftDone()) {
               draft_done.push(inline);
             }
 
             if (!inline.isDone()) {
               undone.push(inline);
             } else {
               done.push(inline);
             }
           }
         }
 
         for (jj = 0; jj < inlines.length; jj++) {
           inline = inlines[jj];
           if (inline.isDeleted()) {
             continue;
           }
 
           if (inline.isEditing()) {
             continue;
           }
 
           if (inline.isHidden()) {
             hidden.push(inline);
             continue;
           }
 
           visible.push(inline);
 
           if (inline.isDone()) {
             visible_done.push(inline);
           }
 
           if (inline.isCollapsed()) {
             visible_collapsed.push(inline);
           }
 
           if (inline.isGhost()) {
             visible_ghosts.push(inline);
           }
         }
       }
 
       return {
         unsaved: unsaved,
         unsubmitted: unsubmitted,
         undone: undone,
         done: done,
         draftDone: draft_done,
         visibleDone: visible_done,
         visibleGhosts: visible_ghosts,
         visibleCollapsed: visible_collapsed,
         visible: visible,
         hidden: hidden
       };
 
     },
 
     _getUnsavedButton: function() {
       if (!this._unsavedButton) {
         var button = new JX.PHUIXButtonView()
           .setIcon('fa-commenting-o')
           .setButtonType(JX.PHUIXButtonView.BUTTONTYPE_SIMPLE);
 
         var node = button.getNode();
 
         var onunsaved = JX.bind(this, this._onunsavedclick);
         JX.DOM.listen(node, 'click', null, onunsaved);
 
         this._unsavedButton = button;
       }
 
       return this._unsavedButton;
     },
 
     _getUnsubmittedButton: function() {
       if (!this._unsubmittedButton) {
         var button = new JX.PHUIXButtonView()
           .setIcon('fa-comment-o')
           .setButtonType(JX.PHUIXButtonView.BUTTONTYPE_SIMPLE);
 
         var node = button.getNode();
 
         var onunsubmitted = JX.bind(this, this._onunsubmittedclick);
         JX.DOM.listen(node, 'click', null, onunsubmitted);
 
         this._unsubmittedButton = button;
       }
 
       return this._unsubmittedButton;
     },
 
     _getDoneButton: function() {
       if (!this._doneButton) {
         var button = new JX.PHUIXButtonView()
           .setIcon('fa-comment')
           .setButtonType(JX.PHUIXButtonView.BUTTONTYPE_SIMPLE);
 
         var node = button.getNode();
 
         var ondone = JX.bind(this, this._ondoneclick);
         JX.DOM.listen(node, 'click', null, ondone);
 
         this._doneButton = button;
       }
 
       return this._doneButton;
     },
 
     _getMenuButton: function() {
       if (!this._menuButton) {
         var pht = this.getTranslations();
 
         var button = new JX.PHUIXButtonView()
           .setIcon('fa-bars')
           .setButtonType(JX.PHUIXButtonView.BUTTONTYPE_SIMPLE)
           .setAuralLabel(pht('Display Options'));
 
         var dropdown = new JX.PHUIXDropdownMenu(button.getNode());
         this._menuItems = {};
 
         var list = new JX.PHUIXActionListView();
         dropdown.setContent(list.getNode());
 
         var map = {
           hideDone: {
             type: 'done'
           },
           hideCollapsed: {
             type: 'collapsed'
           },
           hideGhosts: {
             type: 'ghosts'
           },
           hideAll: {
             type: 'all'
           },
           showAll: {
             type: 'show'
           }
         };
 
         for (var k in map) {
           var spec = map[k];
 
           var handler = JX.bind(this, this._onhideinlines, spec.type);
           var item = new JX.PHUIXActionView()
             .setHandler(handler);
 
           list.addItem(item);
           this._menuItems[k] = item;
         }
 
         dropdown.listen('open', JX.bind(this, this._ondropdown));
 
         if (this.getInlineListURI()) {
           list.addItem(
             new JX.PHUIXActionView()
               .setDivider(true));
 
           list.addItem(
             new JX.PHUIXActionView()
               .setIcon('fa-external-link')
               .setName(pht('List Inline Comments'))
               .setHref(this.getInlineListURI()));
         }
 
         this._menuButton = button;
         this._dropdownMenu = dropdown;
       }
 
       return this._menuButton;
     },
 
     _ondropdown: function() {
       var inlines = this._getInlinesByType();
       var items = this._menuItems;
       var pht = this.getTranslations();
 
       items.hideDone
         .setName(pht('Hide "Done" Inlines'))
         .setDisabled(!inlines.visibleDone.length);
 
       items.hideCollapsed
         .setName(pht('Hide Collapsed Inlines'))
         .setDisabled(!inlines.visibleCollapsed.length);
 
       items.hideGhosts
         .setName(pht('Hide Older Inlines'))
         .setDisabled(!inlines.visibleGhosts.length);
 
       items.hideAll
         .setName(pht('Hide All Inlines'))
         .setDisabled(!inlines.visible.length);
 
       items.showAll
         .setName(pht('Show All Inlines'))
         .setDisabled(!inlines.hidden.length);
     },
 
     _onhideinlines: function(type, e) {
       this._dropdownMenu.close();
       e.prevent();
 
       this._toggleInlines(type);
     },
 
     _toggleInlines: function(type) {
       var inlines = this._getInlinesByType();
 
       // Clear the selection state since we end up in a weird place if the
       // user hides the selected inline.
       this._setSelectionState(null);
 
       var targets;
       var mode = true;
       switch (type) {
         case 'done':
           targets = inlines.visibleDone;
           break;
         case 'collapsed':
           targets = inlines.visibleCollapsed;
           break;
         case 'ghosts':
           targets = inlines.visibleGhosts;
           break;
         case 'all':
           targets = inlines.visible;
           break;
         case 'show':
           targets = inlines.hidden;
           mode = false;
           break;
       }
 
       for (var ii = 0; ii < targets.length; ii++) {
         targets[ii].setHidden(mode);
       }
     },
 
     _onunsavedclick: function(e) {
       e.kill();
 
       var options = {
         filter: 'comment',
         wrap: true,
         show: true,
         attribute: 'unsaved'
       };
 
       this._onjumpkey(1, options);
     },
 
     _onunsubmittedclick: function(e) {
       e.kill();
 
       var options = {
         filter: 'comment',
         wrap: true,
         show: true,
         attribute: 'anyDraft'
       };
 
       this._onjumpkey(1, options);
     },
 
     _ondoneclick: function(e) {
       e.kill();
 
       var options = {
         filter: 'comment',
         wrap: true,
         show: true,
         attribute: this._doneMode
       };
 
       this._onjumpkey(1, options);
     },
 
     _getBannerNode: function() {
       if (!this._bannerNode) {
         var attributes = {
           className: 'diff-banner',
           id: 'diff-banner'
         };
 
         this._bannerNode = JX.$N('div', attributes);
       }
 
       return this._bannerNode;
     },
 
     _getVisibleChangeset: function() {
       if (this.isAsleep()) {
         return null;
       }
 
       if (JX.Device.getDevice() != 'desktop') {
         return null;
       }
 
       // Never show the banner if we're very near the top of the page.
       var margin = 480;
       var s = JX.Vector.getScroll();
       if (s.y < margin) {
         return null;
       }
 
       // We're going to find the changeset which spans an invisible line a
       // little underneath the bottom of the banner. This makes the header
       // tick over from "A.txt" to "B.txt" just as "A.txt" scrolls completely
       // offscreen.
       var detect_height = 64;
 
       for (var ii = 0; ii < this._changesets.length; ii++) {
         var changeset = this._changesets[ii];
         var c = changeset.getVectors();
 
         // If the changeset starts above the line...
         if (c.pos.y <= (s.y + detect_height)) {
           // ...and ends below the line, this is the current visible changeset.
           if ((c.pos.y + c.dim.y) >= (s.y + detect_height)) {
             return changeset;
           }
         }
       }
 
       return null;
     }
   }
 
 });
diff --git a/webroot/rsrc/js/application/transactions/behavior-show-older-transactions.js b/webroot/rsrc/js/application/transactions/behavior-show-older-transactions.js
index 74b17cd45c..5e76b1608f 100644
--- a/webroot/rsrc/js/application/transactions/behavior-show-older-transactions.js
+++ b/webroot/rsrc/js/application/transactions/behavior-show-older-transactions.js
@@ -1,119 +1,120 @@
 /**
  * @provides javelin-behavior-phabricator-show-older-transactions
  * @requires javelin-behavior
  *           javelin-stratcom
  *           javelin-dom
  *           phabricator-busy
  */
 
 JX.behavior('phabricator-show-older-transactions', function(config) {
 
   function get_hash() {
     return window.location.hash.replace(/^#/, '');
   }
 
   function hash_is_hidden() {
     var hash = get_hash();
     if (!hash) {
       return false;
     }
 
     // If the hash isn't purely numeric, ignore it. Comments always have
     // numeric hashes. See PHI43 and T12970.
     if (!hash.match(/^\d+$/)) {
       return false;
     }
 
     var id = 'anchor-'+hash;
     try {
       JX.$(id);
     } catch (not_found_exception) {
       return true;
     }
     return false;
   }
 
   function check_hash() {
     if (hash_is_hidden()) {
       load_older(load_hidden_hash_callback);
     }
   }
 
   function load_older(callback) {
     var showOlderBlock = null;
     try {
       showOlderBlock = JX.DOM.find(
         JX.$(config.timelineID),
         'div',
         'show-older-block');
     } catch (not_found_exception) {
       // we loaded everything...!
       return;
     }
 
     var showOlderLink = JX.DOM.find(
       showOlderBlock,
       'a',
       'show-older-link');
     var workflow = fetch_older_workflow(
       showOlderLink.href,
       callback,
       showOlderBlock);
     var routable = workflow.getRoutable()
       .setPriority(2000)
       .setType('workflow');
     JX.Router.getInstance().queue(routable);
   }
 
   var show_older = function(swap, r) {
     JX.DOM.replace(swap, JX.$H(r.timeline).getFragment());
     JX.Stratcom.invoke('resize');
   };
 
   var load_hidden_hash_callback = function(swap, r) {
     show_older(swap, r);
 
     // We aren't actually doing a scroll position because
     // `behavior-watch-anchor` will handle that for us.
   };
 
   var load_all_older_callback = function(swap, r) {
     show_older(swap, r);
     load_older(load_all_older_callback);
   };
 
   var fetch_older_workflow = function(href, callback, swap) {
     var params = {
       viewData: JX.JSON.stringify(config.viewData)
     };
 
     return new JX.Workflow(href, params)
       .setHandler(JX.bind(null, callback, swap));
   };
 
   JX.Stratcom.listen(
     'click',
     ['show-older-block'],
     function(e) {
       e.kill();
       var workflow = fetch_older_workflow(
         JX.DOM.find(
           e.getNode('show-older-block'),
           'a',
           'show-older-link').href,
         show_older,
         e.getNode('show-older-block'));
       var routable = workflow.getRoutable()
         .setPriority(2000)
         .setType('workflow');
       JX.Router.getInstance().queue(routable);
     });
 
   JX.Stratcom.listen('hashchange', null, check_hash);
 
   check_hash();
 
   new JX.KeyboardShortcut(['@'], 'Show all older changes in the timeline.')
+    .setGroup('xactions')
     .setHandler(JX.bind(null, load_older, load_all_older_callback))
     .register();
 });
diff --git a/webroot/rsrc/js/core/KeyboardShortcut.js b/webroot/rsrc/js/core/KeyboardShortcut.js
index 173a7b8ee2..9d34cce8ad 100644
--- a/webroot/rsrc/js/core/KeyboardShortcut.js
+++ b/webroot/rsrc/js/core/KeyboardShortcut.js
@@ -1,35 +1,36 @@
 /**
  * @provides phabricator-keyboard-shortcut
  * @requires javelin-install
  *           javelin-util
  *           phabricator-keyboard-shortcut-manager
  * @javelin
  */
 
 /**
  * Register a keyboard shortcut, which does something when the user presses a
  * key with no other inputs focused.
  */
 JX.install('KeyboardShortcut', {
 
   construct : function(keys, description) {
     keys = JX.$AX(keys);
     this.setKeys(keys);
     this.setDescription(description);
   },
 
   properties : {
     keys : null,
+    group: null,
     description : null,
     handler : null,
     tooltipHandler : null
   },
 
   members : {
     register : function() {
       JX.KeyboardShortcutManager.getInstance().addKeyboardShortcut(this);
       return this;
     }
   }
 
 });
diff --git a/webroot/rsrc/js/core/KeyboardShortcutManager.js b/webroot/rsrc/js/core/KeyboardShortcutManager.js
index 281c12a8f3..03406051a1 100644
--- a/webroot/rsrc/js/core/KeyboardShortcutManager.js
+++ b/webroot/rsrc/js/core/KeyboardShortcutManager.js
@@ -1,158 +1,160 @@
 /**
  * @provides phabricator-keyboard-shortcut-manager
  * @requires javelin-install
  *           javelin-util
  *           javelin-stratcom
  *           javelin-dom
  *           javelin-vector
  * @javelin
  */
 
 JX.install('KeyboardShortcutManager', {
 
   construct : function() {
     this._shortcuts = [];
 
     JX.Stratcom.listen('keypress', null, JX.bind(this, this._onkeypress));
     JX.Stratcom.listen('keydown', null, JX.bind(this, this._onkeydown));
     JX.Stratcom.listen('keyup', null, JX.bind(this, this._onkeyup));
   },
 
   statics : {
     _instance : null,
 
     /**
      * Some keys don't invoke keypress events in some browsers. We handle these
      * on keydown instead of keypress.
      */
     _downkeys : {
       left: 1,
       right: 1,
       up: 1,
       down: 1
     },
 
     /**
      * Some keys require Alt to be pressed in order to type them on certain
      * keyboard layouts.
      */
     _altkeys: {
       // "Alt+L" on German layouts.
       '@': 1,
 
       // "Alt+Shift+7" on German layouts.
       '\\': 1
     },
 
     getInstance : function() {
       if (!JX.KeyboardShortcutManager._instance) {
         JX.KeyboardShortcutManager._instance = new JX.KeyboardShortcutManager();
       }
       return JX.KeyboardShortcutManager._instance;
     }
   },
 
   members : {
     _shortcuts : null,
 
     /**
      * Instead of calling this directly, you should call
      * KeyboardShortcut.register().
      */
     addKeyboardShortcut : function(s) {
       this._shortcuts.push(s);
     },
     getShortcutDescriptions : function() {
       var desc = [];
       for (var ii = 0; ii < this._shortcuts.length; ii++) {
+        var shortcut = this._shortcuts[ii];
         desc.push({
-          keys : this._shortcuts[ii].getKeys(),
-          description : this._shortcuts[ii].getDescription()
+          keys : shortcut.getKeys(),
+          group: shortcut.getGroup(),
+          description : shortcut.getDescription()
         });
       }
       return desc;
     },
 
     /**
      * Scroll an element into view.
      */
     scrollTo : function(node) {
       var scroll_distance = JX.Vector.getAggregateScrollForNode(node);
       var node_position = JX.$V(node);
       JX.DOM.scrollToPosition(0, node_position.y + scroll_distance.y - 60);
     },
 
     _onkeypress : function(e) {
       if (!(this._getKey(e) in JX.KeyboardShortcutManager._downkeys)) {
         this._onkeyhit(e);
       }
     },
     _onkeyhit : function(e) {
       var self = JX.KeyboardShortcutManager;
 
       var raw = e.getRawEvent();
 
       if (raw.ctrlKey || raw.metaKey) {
         // Never activate keyboard shortcuts if modifier keys are also
         // depressed.
         return;
       }
 
       // For most keystrokes, don't activate keyboard shortcuts if the Alt
       // key is depressed. However, we continue if the character requires the
       // use of Alt to type it on some keyboard layouts.
       var key = this._getKey(e);
       if (raw.altKey && !(key in self._altkeys)) {
         return;
       }
 
       var target = e.getTarget();
       var ignore = ['input', 'select', 'textarea', 'object', 'embed'];
       if (JX.DOM.isType(target, ignore)) {
         // Never activate keyboard shortcuts if the user has some other control
         // focused.
         return;
       }
 
       var key = this._getKey(e);
 
       var shortcuts = this._shortcuts;
       for (var ii = 0; ii < shortcuts.length; ii++) {
         var keys = shortcuts[ii].getKeys();
         for (var jj = 0; jj < keys.length; jj++) {
           if (keys[jj] == key) {
             shortcuts[ii].getHandler()(this);
             e.kill(); // Consume the event
             return;
           }
         }
       }
     },
     _onkeydown : function(e) {
       this._handleTooltipKeyEvent(e, true);
 
       if (this._getKey(e) in JX.KeyboardShortcutManager._downkeys) {
         this._onkeyhit(e);
       }
     },
     _onkeyup : function(e) {
       this._handleTooltipKeyEvent(e, false);
     },
     _getKey : function(e) {
       return e.getSpecialKey() || String.fromCharCode(e.getRawEvent().charCode);
     },
     _handleTooltipKeyEvent : function(e, is_keydown) {
       if (e.getRawEvent().keyCode != 18) {
         // If this isn't the alt/option key, don't do anything.
         return;
       }
       // Fire all the shortcut handlers.
       var shortcuts = this._shortcuts;
       for (var ii = 0; ii < shortcuts.length; ii++) {
         var handler = shortcuts[ii].getTooltipHandler();
         handler && handler(this, is_keydown);
       }
     }
 
   }
 });
diff --git a/webroot/rsrc/js/core/behavior-file-tree.js b/webroot/rsrc/js/core/behavior-file-tree.js
index 69faf05f3c..ae4a8abf8d 100644
--- a/webroot/rsrc/js/core/behavior-file-tree.js
+++ b/webroot/rsrc/js/core/behavior-file-tree.js
@@ -1,16 +1,17 @@
 /**
  * @provides javelin-behavior-phabricator-file-tree
  * @requires javelin-behavior
  *           phabricator-keyboard-shortcut
  *           javelin-stratcom
  */
 
 JX.behavior('phabricator-file-tree', function() {
 
   new JX.KeyboardShortcut('f', 'Toggle file tree.')
+    .setGroup('diff-vis')
     .setHandler(function() {
       JX.Stratcom.invoke('differential-filetree-toggle');
     })
     .register();
 
 });
diff --git a/webroot/rsrc/js/core/behavior-keyboard-shortcuts.js b/webroot/rsrc/js/core/behavior-keyboard-shortcuts.js
index e1c6fa97d8..3a0f5163be 100644
--- a/webroot/rsrc/js/core/behavior-keyboard-shortcuts.js
+++ b/webroot/rsrc/js/core/behavior-keyboard-shortcuts.js
@@ -1,43 +1,45 @@
 /**
  * @provides javelin-behavior-phabricator-keyboard-shortcuts
  * @requires javelin-behavior
  *           javelin-workflow
  *           javelin-json
  *           javelin-dom
  *           phabricator-keyboard-shortcut
  */
 
 /**
  * Define global keyboard shortcuts.
  */
 JX.behavior('phabricator-keyboard-shortcuts', function(config) {
   var pht = JX.phtize(config.pht);
   var workflow = null;
 
   new JX.KeyboardShortcut('?', pht('?'))
+    .setGroup('global')
     .setHandler(function(manager) {
       if (workflow) {
         // Already showing the dialog.
         return;
       }
       var desc = manager.getShortcutDescriptions();
       var data = {keys : JX.JSON.stringify(desc)};
       workflow = new JX.Workflow(config.helpURI, data)
         .setCloseHandler(function() {
           workflow = null;
         });
       workflow.start();
     })
     .register();
 
   if (config.searchID) {
     new JX.KeyboardShortcut('/', pht('/'))
+      .setGroup('global')
       .setHandler(function() {
         var search = JX.$(config.searchID);
         search.focus();
         search.select();
       })
       .register();
   }
 
 });
diff --git a/webroot/rsrc/js/core/behavior-phabricator-remarkup-assist.js b/webroot/rsrc/js/core/behavior-phabricator-remarkup-assist.js
index e4d987c425..89d23ef60f 100644
--- a/webroot/rsrc/js/core/behavior-phabricator-remarkup-assist.js
+++ b/webroot/rsrc/js/core/behavior-phabricator-remarkup-assist.js
@@ -1,425 +1,426 @@
 /**
  * @provides javelin-behavior-phabricator-remarkup-assist
  * @requires javelin-behavior
  *           javelin-stratcom
  *           javelin-dom
  *           phabricator-phtize
  *           phabricator-textareautils
  *           javelin-workflow
  *           javelin-vector
  *           phuix-autocomplete
  *           javelin-mask
  */
 
 JX.behavior('phabricator-remarkup-assist', function(config) {
   var pht = JX.phtize(config.pht);
   var root = JX.$(config.rootID);
   var area = JX.DOM.find(root, 'textarea');
 
   var edit_mode = 'normal';
   var edit_root = null;
   var preview = null;
   var pinned = false;
 
   // When we pin the comment area to the bottom of the window, we need to put
   // an extra spacer element at the bottom of the document so that it is
   // possible to scroll down far enough to see content at the end. Otherwise,
   // the last part of the document will be hidden behind the comment area when
   // the document is fully scrolled.
   var pinned_spacer = JX.$N(
     'div',
     {className: 'remarkup-assist-pinned-spacer'});
 
   function set_edit_mode(root, mode) {
     if (mode == edit_mode) {
       return;
     }
 
     // First, disable any active mode.
     if (edit_root) {
       if (edit_mode == 'fullscreen') {
         JX.DOM.alterClass(edit_root, 'remarkup-control-fullscreen-mode', false);
         JX.DOM.alterClass(document.body, 'remarkup-fullscreen-mode', false);
         JX.Mask.hide('jx-light-mask');
       }
 
       area.style.height = '';
 
       // If we're in preview mode, kick the preview back down to default
       // size.
       if (preview) {
         JX.DOM.show(area);
         resize_preview();
         JX.DOM.hide(area);
       }
     }
 
     edit_root = root;
     edit_mode = mode;
 
     // Now, apply the new mode.
     if (mode == 'fullscreen') {
       JX.DOM.alterClass(edit_root, 'remarkup-control-fullscreen-mode', true);
       JX.DOM.alterClass(document.body, 'remarkup-fullscreen-mode', true);
       JX.Mask.show('jx-light-mask');
 
       // If we're in preview mode, expand the preview to full-size.
       if (preview) {
         JX.DOM.show(area);
       }
 
       resizearea();
 
       if (preview) {
         resize_preview();
         JX.DOM.hide(area);
       }
     }
 
     JX.DOM.focus(area);
   }
 
   function set_pinned_mode(root, mode) {
     if (mode === pinned) {
       return;
     }
 
     pinned = mode;
 
     var container = get_pinned_container(root);
     JX.DOM.alterClass(container, 'remarkup-assist-pinned', pinned);
 
     if (pinned) {
       JX.DOM.appendContent(document.body, pinned_spacer);
     } else {
       JX.DOM.remove(pinned_spacer);
     }
 
     resizearea();
 
     JX.DOM.focus(area);
   }
 
   function get_pinned_container(root) {
     return JX.DOM.findAbove(root, 'div', 'phui-comment-form');
   }
 
   function resizearea() {
     // If we're in the pinned comment mode, resize the pinned spacer to be the
     // same size as the pinned form. This allows users to scroll to the bottom
     // of the document by creating extra footer space to scroll through.
     if (pinned) {
       var container = get_pinned_container(root);
       var d = JX.Vector.getDim(container);
       d.x = null;
       d.setDim(pinned_spacer);
     }
 
     if (!edit_root) {
       return;
     }
     if (edit_mode != 'fullscreen') {
       return;
     }
 
     // In Firefox, a textarea with position "absolute" or "fixed", anchored
     // "top" and "bottom", and height "auto" renders as two lines high. Force
     // it to the correct height with Javascript.
 
     var v = JX.Vector.getViewport();
     v.x = null;
     v.y -= 26;
 
     v.setDim(area);
   }
 
   JX.Stratcom.listen('resize', null, resizearea);
 
   JX.Stratcom.listen('keydown', null, function(e) {
     if (e.getSpecialKey() != 'esc') {
       return;
     }
 
     if (edit_mode != 'fullscreen') {
       return;
     }
 
     e.kill();
     set_edit_mode(edit_root, 'normal');
     set_pinned_mode(root, false);
   });
 
   function update(area, l, m, r) {
     // Replace the selection with the entire assisted text.
     JX.TextAreaUtils.setSelectionText(area, l + m + r, true);
 
     // Now, select just the middle part. For instance, if the user clicked
     // "B" to create bold text, we insert '**bold**' but just select the word
     // "bold" so if they type stuff they'll be editing the bold text.
     var range = JX.TextAreaUtils.getSelectionRange(area);
     JX.TextAreaUtils.setSelectionRange(
       area,
       range.start + l.length,
       range.start + l.length + m.length);
   }
 
   function prepend_char_to_lines(ch, sel, def) {
     if (sel) {
       sel = sel.split('\n');
     } else {
       sel = [def];
     }
 
     if (ch === '>') {
       for(var i=0; i < sel.length; i++) {
         if (sel[i][0] === '>') {
           ch = '>';
         } else {
           ch = '> ';
         }
         sel[i] = ch + sel[i];
       }
       return sel.join('\n');
     }
 
     return sel.join('\n' + ch);
   }
 
   function assist(area, action, root, button) {
     // If the user has some text selected, we'll try to use that (for example,
     // if they have a word selected and want to bold it). Otherwise we'll insert
     // generic text.
     var sel = JX.TextAreaUtils.getSelectionText(area);
     var r = JX.TextAreaUtils.getSelectionRange(area);
     var ch;
 
     switch (action) {
       case 'fa-bold':
         update(area, '**', sel || pht('bold text'), '**');
         break;
       case 'fa-italic':
         update(area, '//', sel || pht('italic text'), '//');
         break;
       case 'fa-link':
         var name = pht('name');
         if (/^https?:/i.test(sel)) {
           update(area, '[[ ' + sel + ' | ', name, ' ]]');
         } else {
           update(area, '[[ ', pht('URL'), ' | ' + (sel || name) + ' ]]');
         }
         break;
       case 'fa-text-width':
         update(area, '`', sel || pht('monospaced text'), '`');
         break;
       case 'fa-list-ul':
       case 'fa-list-ol':
         ch = (action == 'fa-list-ol') ? '  # ' : '  - ';
         sel = prepend_char_to_lines(ch, sel, pht('List Item'));
         update(area, ((r.start === 0) ? '' : '\n\n') + ch, sel, '\n\n');
         break;
       case 'fa-code':
         sel = sel || 'foreach ($list as $item) {\n  work_miracles($item);\n}';
         var code_prefix = (r.start === 0) ? '' : '\n';
         update(area, code_prefix + '```\n', sel, '\n```');
         break;
       case 'fa-quote-right':
         ch = '>';
         sel = prepend_char_to_lines(ch, sel, pht('Quoted Text'));
         update(area, ((r.start === 0) ? '' : '\n\n'), sel, '\n\n');
         break;
       case 'fa-table':
         var table_prefix = (r.start === 0 ? '' : '\n\n');
         update(area, table_prefix + '| ', sel || pht('data'), ' |');
         break;
       case 'fa-meh-o':
         new JX.Workflow('/macro/meme/create/')
           .setHandler(function(response) {
             update(
               area,
               '',
               sel,
               (r.start === 0 ? '' : '\n\n') + response.text + '\n\n');
           })
           .start();
         break;
       case 'fa-cloud-upload':
         new JX.Workflow('/file/uploaddialog/')
           .setHandler(function(response) {
             var files = response.files;
             for (var ii = 0; ii < files.length; ii++) {
               var file = files[ii];
 
               var upload = new JX.PhabricatorFileUpload()
                 .setID(file.id)
                 .setPHID(file.phid)
                 .setURI(file.uri);
 
               JX.TextAreaUtils.insertFileReference(area, upload);
             }
           })
           .start();
         break;
       case 'fa-arrows-alt':
         set_pinned_mode(root, false);
         if (edit_mode == 'fullscreen') {
           set_edit_mode(root, 'normal');
         } else {
           set_edit_mode(root, 'fullscreen');
         }
         break;
       case 'fa-eye':
         if (!preview) {
           preview = JX.$N(
             'div',
             {
               className: 'remarkup-inline-preview'
             },
             null);
 
           area.parentNode.insertBefore(preview, area);
           JX.DOM.alterClass(button, 'preview-active', true);
           JX.DOM.alterClass(root, 'remarkup-preview-active', true);
           resize_preview();
           JX.DOM.hide(area);
 
           update_preview();
         } else {
           JX.DOM.show(area);
           resize_preview(true);
           JX.DOM.remove(preview);
           preview = null;
 
           JX.DOM.alterClass(button, 'preview-active', false);
           JX.DOM.alterClass(root, 'remarkup-preview-active', false);
         }
         break;
       case 'fa-thumb-tack':
         // If we're pinning, kick us out of fullscreen mode first.
         set_edit_mode(edit_root, 'normal');
 
         // Now pin or unpin the area.
         set_pinned_mode(root, !pinned);
         break;
 
     }
   }
 
   function resize_preview(restore) {
     if (!preview) {
       return;
     }
 
     var src;
     var dst;
 
     if (restore) {
       src = preview;
       dst = area;
     } else {
       src = area;
       dst = preview;
     }
 
     var d = JX.Vector.getDim(src);
     d.x = null;
     d.setDim(dst);
   }
 
   function update_preview() {
     var value = area.value;
 
     var data = {
       text: value
     };
 
     var onupdate = function(r) {
       if (area.value !== value) {
         return;
       }
 
       if (!preview) {
         return;
       }
 
       JX.DOM.setContent(preview, JX.$H(r.content).getFragment());
     };
 
     new JX.Workflow('/transactions/remarkuppreview/', data)
       .setHandler(onupdate)
       .start();
   }
 
   JX.DOM.listen(
     root,
     'click',
     'remarkup-assist',
     function(e) {
       var data = e.getNodeData('remarkup-assist');
       if (!data.action) {
         return;
       }
 
       e.kill();
 
       if (config.disabled) {
         return;
       }
 
       assist(area, data.action, root, e.getNode('remarkup-assist'));
     });
 
   var autocomplete = new JX.PHUIXAutocomplete()
     .setArea(area);
 
   for (var k in config.autocompleteMap) {
     autocomplete.addAutocomplete(k, config.autocompleteMap[k]);
   }
 
   autocomplete.start();
 
   if (config.canPin) {
     new JX.KeyboardShortcut('z', pht('key-help'))
+      .setGroup('xactions')
       .setHandler(function() {
         set_pinned_mode(root, !pinned);
       })
       .register();
   }
 
   if (config.sendOnEnter) {
     // Send on enter if the shift key is not held.
     JX.DOM.listen(area, 'keydown', null,
       function(e) {
         if (e.getSpecialKey() != 'return') {
           return;
         }
 
         // Let other listeners (particularly the inline autocomplete) have a
         // chance to handle this event.
         if (JX.Stratcom.pass()) {
           return;
         }
 
         var raw = e.getRawEvent();
         if (raw.shiftKey) {
           // If the shift key is pressed, let the browser write a newline into
           // the textarea.
           return;
         }
 
         if (edit_mode == 'fullscreen') {
           // Don't send on enter in fullscreen
           return;
         }
 
         // From here on, interpret this as a "send" action, not a literal
         // newline.
         e.kill();
 
         // This allows 'workflow' and similar actions to take effect.
         // Such as pontificate in Conpherence
         var form = e.getNode('tag:form');
         JX.DOM.invoke(form, 'didSyntheticSubmit');
       });
   }
 
 });
diff --git a/webroot/rsrc/js/core/darkconsole/behavior-dark-console.js b/webroot/rsrc/js/core/darkconsole/behavior-dark-console.js
index a9f33d4594..fc7b04210b 100644
--- a/webroot/rsrc/js/core/darkconsole/behavior-dark-console.js
+++ b/webroot/rsrc/js/core/darkconsole/behavior-dark-console.js
@@ -1,427 +1,428 @@
 /**
  * @provides javelin-behavior-dark-console
  * @requires javelin-behavior
  *           javelin-stratcom
  *           javelin-util
  *           javelin-dom
  *           javelin-request
  *           phabricator-keyboard-shortcut
  *           phabricator-darklog
  *           phabricator-darkmessage
  */
 
 JX.behavior('dark-console', function(config, statics) {
 
   // Do first-time setup.
   function setup_console() {
     init_console(config.visible);
 
     statics.selected = config.selected;
 
     install_shortcut();
 
     if (config.headers) {
       // If the main page had profiling enabled, also enable it for any Ajax
       // requests.
       JX.Request.listen('open', function(r) {
         for (var k in config.headers) {
           r.getTransport().setRequestHeader(k, config.headers[k]);
         }
       });
     }
 
     // When the user clicks a tab, select it.
     JX.Stratcom.listen('click', 'dark-console-tab', function(e) {
       e.kill();
       select_tab(e.getNodeData('dark-console-tab')['class']);
     });
 
     JX.Stratcom.listen(
       'quicksand-redraw',
       null,
       function (e) {
         var data = e.getData();
         var new_console;
         if (data.fromServer) {
           new_console = JX.$('darkconsole');
           // The correct key has to be pulled from the rendered console
           statics.quicksand_key = new_console.getAttribute('data-console-key');
           statics.quicksand_color =
             new_console.getAttribute('data-console-color');
         } else {
           // we need to add a console holder back in since we blew it away
           new_console = JX.$N(
             'div',
             { id : 'darkconsole', class : 'dark-console' });
           JX.DOM.prependContent(
             JX.$('phabricator-standard-page-body'),
             new_console);
         }
         JX.DOM.replace(new_console, statics.root);
       });
 
     return statics.root;
   }
 
   function init_console(visible) {
     statics.root = JX.$('darkconsole');
     statics.req = {all: {}, current: null};
     statics.tab = {all: {}, current: null};
 
     statics.el = {};
 
     statics.el.reqs = JX.$N('div', {className: 'dark-console-requests'});
     statics.root.appendChild(statics.el.reqs);
 
     statics.el.tabs = JX.$N('div', {className: 'dark-console-tabs'});
     statics.root.appendChild(statics.el.tabs);
 
     statics.el.panel = JX.$N('div', {className: 'dark-console-panel'});
     statics.root.appendChild(statics.el.panel);
 
     statics.el.load = JX.$N('div', {className: 'dark-console-load'});
     statics.root.appendChild(statics.el.load);
 
     statics.cache = {};
 
     statics.visible = visible;
 
     return statics.root;
   }
 
   // Add a new request to the console (initial page load, or new Ajax response).
   function add_request(config) {
 
     // Ignore DarkConsole data requests.
     if (config.uri.match(new RegExp('^/~/data/'))) {
       return;
     }
 
     var attr = {
       className: 'dark-console-request',
       sigil: 'dark-console-request',
       title: config.uri,
       meta: config,
       href: '#'
     };
 
     var link = JX.$N('a', attr, [get_bullet(config.color), ' ', config.uri]);
     statics.el.reqs.appendChild(link);
     statics.req.all[config.key] = link;
 
     // When the user clicks a request, select it.
     JX.DOM.listen(
       link,
       'click',
       'dark-console-request',
       function(e) {
         e.kill();
         select_request(e.getNodeData('dark-console-request').key);
       });
 
     if (!statics.req.current) {
       select_request(config.key);
     }
   }
 
   function get_bullet(color) {
     if (!color) {
       return null;
     }
     return JX.$N('span', {style: {color: color}}, '\u2022');
   }
 
   // Select a request (on load, or when the user clicks one).
   function select_request(key) {
     if (statics.req.current) {
       JX.DOM.alterClass(
         statics.req.all[statics.req.current],
         'dark-selected',
         false);
     }
     statics.req.current = key;
     JX.DOM.alterClass(
       statics.req.all[statics.req.current],
       'dark-selected',
       true);
 
     if (statics.visible) {
       draw_request(key);
     }
   }
 
   // After the user selects a request, draw its tabs.
   function draw_request(key) {
     var cache = statics.cache;
 
     if (cache[key]) {
       render_request(key);
       return;
     }
 
     new JX.Request(
       '/~/data/' + key + '/',
       function(r) {
         cache[key] = r;
         if (statics.req.current == key) {
           render_request(key);
         }
       })
     .send();
 
     show_loading();
   }
 
   // Show the loading indicator.
   function show_loading() {
     JX.DOM.hide(statics.el.tabs);
     JX.DOM.hide(statics.el.panel);
     JX.DOM.show(statics.el.load);
   }
 
   // Hide the loading indicator.
   function hide_loading() {
     JX.DOM.show(statics.el.tabs);
     JX.DOM.show(statics.el.panel);
     JX.DOM.hide(statics.el.load);
   }
 
   function render_request(key) {
     var data = statics.cache[key];
 
     statics.tab.all = {};
 
     var links = [];
     var first = null;
     for (var ii = 0; ii < data.tabs.length; ii++) {
       var tab = data.tabs[ii];
       var attr = {
         className: 'dark-console-tab',
         sigil: 'dark-console-tab',
         meta: tab,
         href: '#'
       };
 
       var link = JX.$N('a', attr, [get_bullet(tab.color), ' ', tab.name]);
       links.push(link);
       statics.tab.all[tab['class']] = link;
       first = first || tab['class'];
     }
 
     JX.DOM.setContent(statics.el.tabs, links);
 
     if (statics.tab.current in statics.tab.all) {
       select_tab(statics.tab.current);
     } else if (statics.selected in statics.tab.all) {
       select_tab(statics.selected);
     } else {
       select_tab(first);
     }
 
     hide_loading();
   }
 
   function select_tab(tclass) {
     var tabs = statics.tab;
 
     if (tabs.current) {
       JX.DOM.alterClass(tabs.current, 'dark-selected', false);
     }
     tabs.current = tabs.all[tclass];
     JX.DOM.alterClass(tabs.current, 'dark-selected', true);
 
     if (tclass != statics.selected) {
       // Save user preference.
       new JX.Request('/~/', JX.bag)
         .setData({ tab : tclass })
         .send();
       statics.selected = tclass;
     }
 
     draw_panel();
   }
 
   function draw_panel() {
     var data = statics.cache[statics.req.current];
     var tclass = JX.Stratcom.getData(statics.tab.current)['class'];
     var html = data.panel[tclass];
 
     var div = JX.$N('div', {className: 'dark-console-panel-core'}, JX.$H(html));
     JX.DOM.setContent(statics.el.panel, div);
 
     var params = {
       panel: tclass
     };
 
     JX.Stratcom.invoke('darkconsole.draw', null, params);
   }
 
   function install_shortcut() {
     var desc = 'Toggle visibility of DarkConsole.';
     new JX.KeyboardShortcut('`', desc)
+      .setGroup('global')
       .setHandler(function() {
         statics.visible = !statics.visible;
 
         if (statics.visible) {
           JX.DOM.show(statics.root);
           if (statics.req.current) {
             draw_request(statics.req.current);
           }
         } else {
           JX.DOM.hide(statics.root);
         }
 
         // Save user preference.
         new JX.Request('/~/', JX.bag)
           .setData({visible: statics.visible ? 1 : 0})
           .send();
 
         // Force resize listeners to take effect.
         JX.Stratcom.invoke('resize');
       })
       .register();
   }
 
   statics.root = statics.root || setup_console();
   if (config.quicksand && statics.quicksand_key) {
     config.key = statics.quicksand_key;
     config.color = statics.quicksand_color;
     statics.quicksand_key = null;
     statics.quicksand_color = null;
   }
   config.key = config.key || statics.root.getAttribute('data-console-key');
   if (!('color' in config)) {
     config.color = statics.root.getAttribute('data-console-color');
   }
   add_request(config);
 
 
 /* -(  Realtime Panel  )----------------------------------------------------- */
 
 
   if (!statics.realtime) {
     statics.realtime = true;
 
     var realtime_log = new JX.DarkLog();
     var realtime_id = 'dark-console-realtime-log';
 
     JX.Stratcom.listen('darkconsole.draw', null, function(e) {
       var data = e.getData();
       if (data.panel != 'DarkConsoleRealtimePlugin') {
         return;
       }
 
       var node = JX.$(realtime_id);
       realtime_log.setNode(node);
     });
 
     // If the panel is initially visible, try rendering.
     try {
       var node = JX.$(realtime_id);
       realtime_log.setNode(node);
     } catch (exception) {
       // Ignore.
     }
 
     var leader_log = function(event_name, type, is_leader, details) {
       var parts = [];
       if (is_leader === true) {
         parts.push('+');
       } else if (is_leader === false) {
         parts.push('-');
       } else {
         parts.push('~');
       }
 
       parts.push('[Leader/' + event_name + ']');
 
       if (type) {
         parts.push('(' + type + ')');
       }
 
       if (details) {
         parts.push(details);
       }
 
       parts = parts.join(' ');
 
       var message = new JX.DarkMessage()
         .setMessage(parts);
 
       realtime_log.addMessage(message);
     };
 
     JX.Leader.listen('onReceiveBroadcast', function(message, is_leader) {
       var json = JX.JSON.stringify(message.data);
 
       if (message.type == 'aphlict.status') {
         if (message.data == 'closed') {
           var ws = JX.Aphlict.getInstance().getWebsocket();
           if (ws) {
             var delay = ws.getReconnectDelay();
             json += ' [Reconnect: ' + delay + 'ms]';
           }
         }
       }
 
       leader_log('onReceiveBroadcast', message.type, is_leader, json);
     });
 
     JX.Leader.listen('onBecomeLeader', function() {
       leader_log('onBecomeLeader');
     });
 
     var action_log = function(action) {
       var message = new JX.DarkMessage()
         .setMessage('> ' + action);
 
       realtime_log.addMessage(message);
     };
 
     JX.Stratcom.listen('click', 'dark-console-realtime-action', function(e) {
       var node = e.getNode('dark-console-realtime-action');
       var data = JX.Stratcom.getData(node);
 
       action_log(data.label);
 
       var action = data.action;
       switch (action) {
         case 'reconnect':
           var ws = JX.Aphlict.getInstance().getWebsocket();
           if (ws) {
             ws.reconnect();
           }
           break;
         case 'replay':
           JX.Aphlict.getInstance().replay();
           break;
         case 'repaint':
           JX.Aphlict.getInstance().reconnect();
           break;
       }
 
     });
 
   }
 
   if (!statics.expand) {
     statics.expand = true;
 
     var current_details = null;
     JX.Stratcom.listen('click', 'darkconsole-expand', function(e) {
       e.kill();
 
       if (current_details) {
         current_details.style.display = 'none';
         current_details = null;
       }
 
       var id = e.getNodeData('darkconsole-expand').expandID;
       var node = JX.$(id);
 
       node.style.display = 'block';
       current_details = node;
     });
   }
 
 });