diff --git a/core/core.library.yml b/core/core.library.yml
index c834afa..cf99afd 100644
--- a/core/core.library.yml
+++ b/core/core.library.yml
@@ -1,8 +1,8 @@
 backbone:
-  remote: https://github.com/jashkenas/backbone/
+  remote: https://github.com/jashkenas/backbone
   version: 0.9.2
   js:
-    - { file: assets/vendor/backbone/backbone.js, group: -100, weight: -19 }
+    - { file: assets/vendor/backbone/backbone.js, weight: -19 }
   dependencies:
     - core/underscore
 
@@ -19,12 +19,12 @@ domready:
   # @todo Stable release required for Drupal 8.0.
   version: master
   js:
-    - { file: assets/vendor/domready/ready.min.js, group: -100, weight: -21 }
+    - { file: assets/vendor/domready/ready.min.js, weight: -21 }
 
 drupal:
   version: VERSION
   js:
-    - { file: misc/drupal.js, group: -100, weight: -18 }
+    - { file: misc/drupal.js, weight: -18 }
   dependencies:
     - core/domready
 
@@ -36,7 +36,7 @@ drupalSettings:
 drupal.ajax:
   version: VERSION
   js:
-    - { file: misc/ajax.js, group: -100, weight: 2 }
+    - { file: misc/ajax.js, weight: 2 }
   dependencies:
     - core/jquery
     - core/drupal
@@ -47,7 +47,7 @@ drupal.ajax:
 drupal.announce:
   version: VERSION
   js:
-    - { file: misc/announce.js, group: -100 }
+    - { file: misc/announce.js }
   dependencies:
     - core/drupal
     - core/drupal.debounce
@@ -55,7 +55,7 @@ drupal.announce:
 drupal.autocomplete:
   version: VERSION
   js:
-    - { file: misc/autocomplete.js, group: -100, weight: -1 }
+    - { file: misc/autocomplete.js, weight: -1 }
   dependencies:
     - core/jquery
     - core/drupal
@@ -89,15 +89,16 @@ drupal.collapse:
 drupal.debounce:
   version: VERSION
   js:
-    - { file: misc/debounce.js, group: -100 }
+    - { file: misc/debounce.js }
   dependencies:
+    # @todo Remove Drupal dependency.
     - core/drupal
 
 drupal.dialog:
   version: VERSION
   js:
-    - { file: misc/dialog.js, group: -100 }
-    - { file: misc/dialog.position.js, group: -100 }
+    - { file: misc/dialog.js }
+    - { file: misc/dialog.position.js }
   css:
     - { file: misc/dialog.theme.css, weight: 1 }
   dependencies:
@@ -111,7 +112,7 @@ drupal.dialog:
 drupal.dialog.ajax:
   version: VERSION
   js:
-    - { file: misc/dialog.ajax.js, group: -100, weight: 3 }
+    - { file: misc/dialog.ajax.js, weight: 3 }
   dependencies:
     - core/jquery
     - core/drupal
@@ -122,7 +123,7 @@ drupal.dialog.ajax:
 drupal.displace:
   version: VERSION
   js:
-    - { file: misc/displace.js, group: -100 }
+    - { file: misc/displace.js }
   dependencies:
     - core/jquery
     - core/drupal
@@ -144,7 +145,7 @@ drupal.dropbutton:
 drupal.form:
   version: VERSION
   js:
-    - { file: misc/form.js, group: -100, weight: 1 }
+    - { file: misc/form.js, weight: 1 }
   dependencies:
     - core/jquery
     - core/drupal
@@ -173,7 +174,7 @@ drupal.progress:
 drupal.states:
   version: VERSION
   js:
-    - { file: misc/states.js, group: -100, weight: 1 }
+    - { file: misc/states.js, weight: 1 }
   dependencies:
     - core/jquery
     - core/drupal
@@ -183,16 +184,17 @@ drupal.states:
 drupal.tabbingmanager:
   version: VERSION
   js:
-    - { file: misc/tabbingmanager.js, group: -100 }
+    - { file: misc/tabbingmanager.js }
   dependencies:
     - core/jquery
+    # Supplies the ':tabbable' pseudo selector.
     - core/jquery.ui
     - core/drupal
 
 drupal.tabledrag:
   version: VERSION
   js:
-    - { file: misc/tabledrag.js, group: -100, weight: -1 }
+    - { file: misc/tabledrag.js, weight: -1 }
   dependencies:
     - core/jquery
     - core/modernizr
@@ -215,7 +217,7 @@ drupal.tableheader:
 drupal.tableresponsive:
   version: VERSION
   js:
-    - { file: misc/tableresponsive.js, group: -100 }
+    - { file: misc/tableresponsive.js }
   dependencies:
     - core/jquery
     - core/drupal
@@ -253,28 +255,19 @@ html5shiv:
   remote: https://github.com/aFarkas/html5shiv
   version: 3.6.2
   js:
-    - { file: assets/vendor/html5shiv/html5.js, group: -100, weight: -22, browsers: { IE: 'lte IE 8', '!IE': false } }
+    - { file: assets/vendor/html5shiv/html5.js, weight: -22, browsers: { IE: 'lte IE 8', '!IE': false } }
 
 jquery:
   remote: https://github.com/jquery/jquery
   version: 2.0.3
   js:
-    - { file: assets/vendor/jquery/jquery.js, group: -100, weight: -20 }
-
-jquery.bbq:
-  remote: https://github.com/cowboy/jquery-bbq
-  # @todo Ping @benalman to create stable release.
-  version: v1.3pre
-  js:
-    - { file: assets/vendor/jquery-bbq/jquery.ba-bbq.js }
-  dependencies:
-    - core/jquery
+    - { file: assets/vendor/jquery/jquery.js, weight: -20 }
 
 jquery.cookie:
-  # @todo jquery.cookie.js no longer exists in the latest jQuery UI.
-  # @see https://github.com/jquery/jquery-ui/tree/master/external
-  # @see https://github.com/carhartl/jquery-cookie
-  version: 1.10.2
+  # @todo jquery.cookie.js was never supposed to be distributed with jQuery UI.
+  # @see https://drupal.org/node/2161217
+  remote: https://github.com/carhartl/jquery-cookie
+  version: v1.0
   js:
     - { file: assets/vendor/jquery.ui/external/jquery.cookie.js }
   dependencies:
@@ -304,7 +297,7 @@ jquery.once:
   remote: https://github.com/RobLoach/jquery-once
   version: 1.2.3
   js:
-    - { file: assets/vendor/jquery-once/jquery.once.js, group: -100, weight: -19 }
+    - { file: assets/vendor/jquery-once/jquery.once.js, weight: -19 }
   dependencies:
     - core/jquery
 
@@ -312,7 +305,7 @@ jquery.ui:
   remote: https://github.com/jquery/jquery-ui
   version: &jquery.ui 1.10.2
   js:
-    - { file: assets/vendor/jquery.ui/ui/jquery.ui.core.js, group: -100, weight: -11 }
+    - { file: assets/vendor/jquery.ui/ui/jquery.ui.core.js, weight: -11 }
   css:
     - { file: assets/vendor/jquery.ui/themes/base/jquery.ui.core.css }
     - { file: assets/vendor/jquery.ui/themes/base/jquery.ui.theme.css }
@@ -397,7 +390,7 @@ jquery.ui.droppable:
 jquery.ui.effects.core:
   version: *jquery.ui
   js:
-    - { file: assets/vendor/jquery.ui/ui/jquery.effects.core.js, group: -100, weight: -9 }
+    - { file: assets/vendor/jquery.ui/ui/jquery.effects.core.js, weight: -9 }
 
 jquery.ui.effects.blind:
   version: *jquery.ui
@@ -605,13 +598,14 @@ jquery.ui.touch-punch:
 jquery.ui.widget:
   version: *jquery.ui
   js:
-    - { file: assets/vendor/jquery.ui/ui/jquery.ui.widget.js, group: -100, weight: -10 }
+    - { file: assets/vendor/jquery.ui/ui/jquery.ui.widget.js, weight: -10 }
   dependencies:
     - core/jquery.ui
 
 matchmedia:
   remote: https://github.com/paulirish/matchMedia.js
   # @todo Contribute upstream and replace with upstream version.
+  # @see http://drupal.org/node/1815602
   version: VERSION
   js:
     - { file: misc/matchmedia.js }
@@ -622,7 +616,7 @@ modernizr:
   remote: https://github.com/Modernizr/Modernizr
   version: v2.6.2
   js:
-    - { file: assets/vendor/modernizr/modernizr.min.js, every_page: true, group: -100, preprocess: 0, scope: header, weight: -21 }
+    - { file: assets/vendor/modernizr/modernizr.min.js, every_page: true, preprocess: 0, scope: header, weight: -21 }
 
 normalize:
   remote: https://github.com/necolas/normalize.css
@@ -634,5 +628,5 @@ underscore:
   remote: https://github.com/jashkenas/underscore
   version: 1.4.0
   js:
-    - { file: assets/vendor/underscore/underscore.js, group: -100, weight: -20 }
+    - { file: assets/vendor/underscore/underscore.js, weight: -20 }
 
diff --git a/core/misc/batch.js b/core/misc/batch.js
index b3013e5..ff24d7d 100644
--- a/core/misc/batch.js
+++ b/core/misc/batch.js
@@ -1,3 +1,6 @@
+/**
+ * Drupal's batch API.
+ */
 (function ($, Drupal) {
 
 "use strict";
diff --git a/core/misc/displace.js b/core/misc/displace.js
index c658694..4a9109b 100644
--- a/core/misc/displace.js
+++ b/core/misc/displace.js
@@ -1,5 +1,8 @@
 /**
  * Manages elements that can offset the size of the viewport.
+ *
+ * Measures and reports viewport offset dimensions from elements like the
+ * toolbar that can potentially displace the positioning of other elements.
  */
 (function ($, Drupal, debounce) {
 
diff --git a/core/misc/drupal.js b/core/misc/drupal.js
index 6c04130..564cd8d 100644
--- a/core/misc/drupal.js
+++ b/core/misc/drupal.js
@@ -1,3 +1,6 @@
+/**
+ * Base framework for Drupal-specific JavaScript, behaviors, and settings.
+ */
 window.Drupal = { behaviors: {}, locale: {} };
 
 // Class indicating that JS is enabled; used for styling purpose.
diff --git a/core/misc/states.js b/core/misc/states.js
index 206d521..f2b68aa 100644
--- a/core/misc/states.js
+++ b/core/misc/states.js
@@ -1,3 +1,6 @@
+/**
+ * Drupal's states library.
+ */
 (function ($) {
 
 "use strict";
diff --git a/core/modules/block/block.library.yml b/core/modules/block/block.library.yml
index 98ac0d9..e31b324 100644
--- a/core/modules/block/block.library.yml
+++ b/core/modules/block/block.library.yml
@@ -5,6 +5,7 @@ drupal.block:
   dependencies:
     - core/jquery
     - core/drupal
+
 drupal.block.admin:
   version: VERSION
   js:
diff --git a/core/modules/ckeditor/ckeditor.library.yml b/core/modules/ckeditor/ckeditor.library.yml
index e747149..757d5a9 100644
--- a/core/modules/ckeditor/ckeditor.library.yml
+++ b/core/modules/ckeditor/ckeditor.library.yml
@@ -2,7 +2,6 @@ drupal.ckeditor:
   version: VERSION
   js:
     - { file: js/ckeditor.js }
-    - { settings: { ckeditor: { modulePath: core/modules/ckeditor } } }
   css:
     - { file: css/ckeditor.css }
   dependencies:
@@ -31,7 +30,9 @@ drupal.ckeditor.admin:
     - core/drupal.announce
     - core/ckeditor
     - editor/drupal.editor.admin
+    # Ensure to run after core/drupal.vertical-tabs.
     - core/drupal.vertical-tabs
+
 drupal.ckeditor.drupalimage.admin:
   version: VERSION
   js:
@@ -42,6 +43,7 @@ drupal.ckeditor.drupalimage.admin:
     - core/jquery.once
     - core/drupal.vertical-tabs
     - core/drupalSettings
+
 drupal.ckeditor.stylescombo.admin:
   version: VERSION
   js:
@@ -52,6 +54,7 @@ drupal.ckeditor.stylescombo.admin:
     - core/jquery.once
     - core/drupal.vertical-tabs
     - core/drupalSettings
+
 drupal.ckeditor.drupalimagecaption-theme:
   version: VERSION
   js:
diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/Editor/CKEditor.php b/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/Editor/CKEditor.php
index 03f37e1..d1bfa10 100644
--- a/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/Editor/CKEditor.php
+++ b/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/Editor/CKEditor.php
@@ -250,6 +250,14 @@ public function settingsFormSubmit(array $form, array &$form_state) {
   /**
    * {@inheritdoc}
    */
+  public function getGlobalJSSettings(Editor $editor) {
+    $settings['ckeditor']['modulePath'] = drupal_get_path('module', 'ckeditor');
+    return $settings;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
   public function getJSSettings(EditorEntity $editor) {
     $settings = array();
 
diff --git a/core/modules/color/color.library.yml b/core/modules/color/color.library.yml
index 22b02c6..6086477 100644
--- a/core/modules/color/color.library.yml
+++ b/core/modules/color/color.library.yml
@@ -8,6 +8,7 @@ drupal.color:
     - core/jquery.once
     - core/jquery.farbtastic
     - color/drupal.color.preview
+
 drupal.color.preview:
   version: VERSION
   js:
diff --git a/core/modules/comment/comment.library.yml b/core/modules/comment/comment.library.yml
index 5629b4b..fe797db 100644
--- a/core/modules/comment/comment.library.yml
+++ b/core/modules/comment/comment.library.yml
@@ -6,6 +6,7 @@ drupal.comment:
     - core/jquery
     - core/drupal
     - core/drupal.form
+
 drupal.comment-by-viewer:
   version: VERSION
   js:
@@ -14,6 +15,7 @@ drupal.comment-by-viewer:
     - core/jquery
     - core/drupal
     - core/drupalSettings
+
 drupal.comment-new-indicator:
   version: VERSION
   js:
@@ -23,6 +25,7 @@ drupal.comment-new-indicator:
     - core/drupal
     - history/drupal.history
     - core/drupal.displace
+
 drupal.node-new-comments-link:
   version: VERSION
   js:
diff --git a/core/modules/contextual/contextual.library.yml b/core/modules/contextual/contextual.library.yml
index 3bf6e15..23db334 100644
--- a/core/modules/contextual/contextual.library.yml
+++ b/core/modules/contextual/contextual.library.yml
@@ -1,7 +1,8 @@
 drupal.contextual-links:
   version: VERSION
   js:
-    - { file: js/contextual.js, group: -100, weight: -2 }
+    # Ensure to run before contextual/drupal.context-toolbar.
+    - { file: js/contextual.js, weight: -2 }
   css:
     - { file: css/contextual.module.css }
     - { file: css/contextual.theme.css }
@@ -13,10 +14,11 @@ drupal.contextual-links:
     - core/backbone
     - core/modernizr
     - core/jquery.once
+
 drupal.contextual-toolbar:
   version: VERSION
   js:
-    - { file: js/contextual.toolbar.js, group: -100 }
+    - { file: js/contextual.toolbar.js }
   css:
     - { file: css/contextual.toolbar.css }
   dependencies:
diff --git a/core/modules/edit/edit.library.yml b/core/modules/edit/edit.library.yml
index 98a9f4c..c46d4c4 100644
--- a/core/modules/edit/edit.library.yml
+++ b/core/modules/edit/edit.library.yml
@@ -1,12 +1,15 @@
 edit:
   version: VERSION
   js:
+    # Core.
     - { file: js/edit.js, scope: footer }
     - { file: js/util.js, scope: footer }
+    # Models.
     - { file: js/models/AppModel.js, scope: footer }
     - { file: js/models/EntityModel.js, scope: footer }
     - { file: js/models/FieldModel.js, scope: footer }
     - { file: js/models/EditorModel.js, scope: footer }
+    # Views.
     - { file: js/views/AppView.js, scope: footer }
     - { file: js/views/FieldDecorationView.js, scope: footer }
     - { file: js/views/EntityDecorationView.js, scope: footer }
@@ -14,6 +17,7 @@ edit:
     - { file: js/views/ContextualLinkView.js, scope: footer }
     - { file: js/views/FieldToolbarView.js, scope: footer }
     - { file: js/views/EditorView.js, scope: footer }
+    # Other.
     - { file: js/theme.js, scope: footer }
   css:
     - { file: css/edit.module.css }
@@ -32,12 +36,14 @@ edit:
     - core/drupal.debounce
     - core/drupalSettings
     - core/drupal.dialog
+
 edit.inPlaceEditor.form:
   version: VERSION
   js:
     - { file: js/editors/formEditor.js, scope: footer }
   dependencies:
     - edit/edit
+
 edit.inPlaceEditor.plainText:
   version: VERSION
   js:
diff --git a/core/modules/edit/edit.module b/core/modules/edit/edit.module
index cb4be31..a47f3f3 100644
--- a/core/modules/edit/edit.module
+++ b/core/modules/edit/edit.module
@@ -47,11 +47,9 @@ function edit_page_build(&$page) {
  * the front-end.
  */
 function edit_library_info_alter(&$libraries, $module) {
-  if ($module == 'edit' && isset($libraries['edit'])) {
+  if ($module == 'edit') {
     $css = _edit_theme_css();
-    foreach ($css as $css_file => $file) {
-      $libraries['edit']['css'][$css_file] = $file;
-    }
+    $libraries['edit']['css'] = array_merge($libraries['edit']['css'], $css);
   }
 }
 
@@ -132,7 +130,7 @@ function _edit_theme_css($theme = NULL) {
     if (isset($info['edit_stylesheets'])) {
       $css = $info['edit_stylesheets'];
       foreach ($css as $key => $path) {
-        $css[$key] = array('data' => $theme_path . '/' . $path, 'type' => 'file');
+        $css[$key] = array('type' => 'file', 'data' => $theme_path . '/' . $path);
       }
     }
     if (isset($info['base theme'])) {
diff --git a/core/modules/editor/editor.api.php b/core/modules/editor/editor.api.php
index 0f44381..7c965e5 100644
--- a/core/modules/editor/editor.api.php
+++ b/core/modules/editor/editor.api.php
@@ -98,8 +98,8 @@ function hook_editor_default_settings_alter(&$default_settings, $editor) {
  */
 function hook_editor_js_settings_alter(array &$settings, array $formats) {
   if (isset($formats['basic_html'])) {
-    $settings['basic_html']['editor'][] = 'MyDifferentEditor';
-    $settings['basic_html']['editorSettings']['buttons'] = array('strong', 'italic', 'underline');
+    $settings['editor']['formats']['basic_html']['editor'][] = 'MyDifferentEditor';
+    $settings['editor']['formats']['basic_html']['editorSettings']['buttons'] = array('strong', 'italic', 'underline');
   }
 }
 
diff --git a/core/modules/editor/editor.library.yml b/core/modules/editor/editor.library.yml
index aca72d0..3681a1d 100644
--- a/core/modules/editor/editor.library.yml
+++ b/core/modules/editor/editor.library.yml
@@ -5,6 +5,7 @@ drupal.editor.admin:
   dependencies:
     - core/jquery
     - core/drupal
+
 drupal.editor:
   version: VERSION
   js:
@@ -16,6 +17,7 @@ drupal.editor:
     - core/drupal
     - core/drupalSettings
     - core/jquery.once
+
 drupal.editor.dialog:
   version: VERSION
   js:
@@ -25,11 +27,11 @@ drupal.editor.dialog:
     - core/drupal.dialog
     - core/drupal.ajax
     - core/drupalSettings
+
 edit.inPlaceEditor.formattedText:
   version: VERSION
   js:
     - { file: js/editor.formattedTextEditor.js, scope: footer, attributes: { defer: true } }
-    - { settings: { editor: { getUntransformedTextURL: /drupal8/lib.php/editor/%21entity_type/%21id/%21field_name/%21langcode/%21view_mode } } }
   dependencies:
     - edit/edit
     - editor/drupal.editor
diff --git a/core/modules/editor/lib/Drupal/editor/Plugin/EditorBase.php b/core/modules/editor/lib/Drupal/editor/Plugin/EditorBase.php
index 5610d33..db616da 100644
--- a/core/modules/editor/lib/Drupal/editor/Plugin/EditorBase.php
+++ b/core/modules/editor/lib/Drupal/editor/Plugin/EditorBase.php
@@ -65,4 +65,11 @@ public function settingsFormValidate(array $form, array &$form_state) {
   public function settingsFormSubmit(array $form, array &$form_state) {
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getGlobalJSSettings(Editor $editor) {
+    return array();
+  }
+
 }
diff --git a/core/modules/editor/lib/Drupal/editor/Plugin/EditorManager.php b/core/modules/editor/lib/Drupal/editor/Plugin/EditorManager.php
index fcc2076..57f180e 100644
--- a/core/modules/editor/lib/Drupal/editor/Plugin/EditorManager.php
+++ b/core/modules/editor/lib/Drupal/editor/Plugin/EditorManager.php
@@ -65,6 +65,7 @@ public function getAttachments(array $format_ids) {
     $attachments = array('library' => array());
 
     $settings = array();
+    $global_settings_processed = array();
     foreach ($format_ids as $format_id) {
       $editor = editor_load($format_id);
       if (!$editor) {
@@ -76,8 +77,18 @@ public function getAttachments(array $format_ids) {
       // Libraries.
       $attachments['library'] = array_merge($attachments['library'], $plugin->getLibraries($editor));
 
-      // JavaScript settings.
-      $settings[$format_id] = array(
+      // Global, format-agnostic JavaScript settings.
+      if (!isset($global_settings_processed[$editor->editor])) {
+        if ($global_settings = $plugin->getGlobalJSSettings()) {
+          // Prevent editors from manipulating Editor module settings.
+          unset($global_settings['editor']);
+          $settings = array_merge($settings, $global_settings);
+        }
+        $global_settings_processed[$editor->editor] = TRUE;
+      }
+
+      // Format-specific JavaScript settings.
+      $settings['editor']['formats'][$format_id] = array(
         'format' => $format_id,
         'editor' => $editor->editor,
         'editorSettings' => $plugin->getJSSettings($editor),
@@ -93,7 +104,7 @@ public function getAttachments(array $format_ids) {
 
     $attachments['js'][] = array(
       'type' => 'setting',
-      'data' => array('editor' => array('formats' => $settings)),
+      'data' => $settings,
     );
 
     return $attachments;
diff --git a/core/modules/editor/lib/Drupal/editor/Plugin/EditorPluginInterface.php b/core/modules/editor/lib/Drupal/editor/Plugin/EditorPluginInterface.php
index 99b6a13..affc7d3 100644
--- a/core/modules/editor/lib/Drupal/editor/Plugin/EditorPluginInterface.php
+++ b/core/modules/editor/lib/Drupal/editor/Plugin/EditorPluginInterface.php
@@ -75,6 +75,24 @@ public function settingsFormValidate(array $form, array &$form_state);
   public function settingsFormSubmit(array $form, array &$form_state);
 
   /**
+   * Returns global JavaScript settings to be attached.
+   *
+   * Allows text editors to expose global settings (independent of text format)
+   * as JavaScript variables in drupalSettings.
+   *
+   * @param \Drupal\editor\Entity\Editor $editor
+   *   A configured text editor object.
+   *
+   * @return array
+   *   An array of settings that will be added to the page for use by this text
+   *   editor's JavaScript integration.
+   *
+   * @see drupal_process_attached()
+   * @see EditorManager::getAttachments()
+   */
+  public function getGlobalJSSettings(Editor $editor);
+
+  /**
    * Returns JavaScript settings to be attached.
    *
    * Most text editors use JavaScript to provide a WYSIWYG or toolbar on the
diff --git a/core/modules/editor/lib/Drupal/editor/Plugin/InPlaceEditor/Editor.php b/core/modules/editor/lib/Drupal/editor/Plugin/InPlaceEditor/Editor.php
index 2138b57..478fb79 100644
--- a/core/modules/editor/lib/Drupal/editor/Plugin/InPlaceEditor/Editor.php
+++ b/core/modules/editor/lib/Drupal/editor/Plugin/InPlaceEditor/Editor.php
@@ -86,6 +86,13 @@ public function getAttachments() {
 
     // Also include editor.module's formatted text editor.
     $attachments['library'][] = array('editor', 'edit.inPlaceEditor.formattedText');
+    $attachments['js'][] = array(
+      'type' => 'setting',
+      'data' => array(
+        'editor' => array('getUntransformedTextURL' => url('editor/!entity_type/!id/!field_name/!langcode/!view_mode'),
+        ),
+      ),
+    );
 
     return $attachments;
   }
diff --git a/core/modules/filter/filter.library.yml b/core/modules/filter/filter.library.yml
index 6fb4cf4..181aa8f 100644
--- a/core/modules/filter/filter.library.yml
+++ b/core/modules/filter/filter.library.yml
@@ -9,6 +9,7 @@ drupal.filter.admin:
     - core/drupal
     - core/jquery.once
     - core/drupal.form
+
 drupal.filter.filter_html.admin:
   version: VERSION
   js:
@@ -17,6 +18,7 @@ drupal.filter.filter_html.admin:
     - core/jquery
     - core/jquery.once
     - core/underscore
+
 drupal.filter:
   version: VERSION
   js:
@@ -27,6 +29,7 @@ drupal.filter:
     - core/jquery
     - core/drupal
     - core/jquery.once
+
 caption:
   version: VERSION
   css:
diff --git a/core/modules/locale/locale.library.yml b/core/modules/locale/locale.library.yml
index 106ffcc..503e2bf 100644
--- a/core/modules/locale/locale.library.yml
+++ b/core/modules/locale/locale.library.yml
@@ -6,6 +6,7 @@ drupal.locale.admin:
     - core/jquery
     - core/drupal
     - core/jquery.once
+
 drupal.locale.datepicker:
   version: VERSION
   js:
diff --git a/core/modules/menu/menu.library.yml b/core/modules/menu/menu.library.yml
index 32dc303..d5b1852 100644
--- a/core/modules/menu/menu.library.yml
+++ b/core/modules/menu/menu.library.yml
@@ -6,6 +6,7 @@ drupal.menu:
     - core/jquery
     - core/drupal
     - core/drupal.form
+
 drupal.menu.admin:
   version: VERSION
   js:
diff --git a/core/modules/node/node.library.yml b/core/modules/node/node.library.yml
index e0fd4e9..3170a4b 100644
--- a/core/modules/node/node.library.yml
+++ b/core/modules/node/node.library.yml
@@ -7,6 +7,7 @@ drupal.node:
     - core/drupal
     - core/drupalSettings
     - core/drupal.form
+
 drupal.node.preview:
   version: VERSION
   js:
@@ -14,6 +15,7 @@ drupal.node.preview:
   dependencies:
     - core/jquery
     - core/drupal
+
 drupal.content_types:
   version: VERSION
   js:
diff --git a/core/modules/picture/picture.library.yml b/core/modules/picture/picture.library.yml
index eba44f5..f35d66e 100644
--- a/core/modules/picture/picture.library.yml
+++ b/core/modules/picture/picture.library.yml
@@ -1,6 +1,10 @@
+# @todo Move into /core/assets and core.library.yml.
 picturefill:
+  remote: https://github.com/scottjehl/picturefill
+  # @todo Contribute upstream and/or replace with upstream version.
+  # @see https://drupal.org/node/1775530
   version: VERSION
   js:
-    - { file: picturefill/picturefill.js, type: file, weight: -10, group: 0 }
+    - { file: picturefill/picturefill.js, weight: -10, group: 0 }
   dependencies:
     - core/matchmedia
diff --git a/core/modules/shortcut/shortcut.library.yml b/core/modules/shortcut/shortcut.library.yml
index 087784d..ea670cd 100644
--- a/core/modules/shortcut/shortcut.library.yml
+++ b/core/modules/shortcut/shortcut.library.yml
@@ -5,6 +5,7 @@ drupal.shortcut.admin:
   dependencies:
     - core/jquery
     - core/drupal
+
 drupal.shortcut:
   version: VERSION
   css:
diff --git a/core/modules/system/system.library.yml b/core/modules/system/system.library.yml
index fcd4fcb..9a398d5 100644
--- a/core/modules/system/system.library.yml
+++ b/core/modules/system/system.library.yml
@@ -7,6 +7,7 @@ drupal.system:
     - core/drupal
     - core/drupalSettings
     - core/jquery.once
+
 drupal.system.modules:
   version: VERSION
   js:
diff --git a/core/modules/toolbar/toolbar.library.yml b/core/modules/toolbar/toolbar.library.yml
index f7ef629..bd17dc3 100644
--- a/core/modules/toolbar/toolbar.library.yml
+++ b/core/modules/toolbar/toolbar.library.yml
@@ -17,6 +17,7 @@ toolbar:
     - core/jquery.once
     - core/drupal.displace
     - toolbar/toolbar.menu
+
 toolbar.menu:
   version: VERSION
   js:
@@ -27,6 +28,7 @@ toolbar.menu:
     - core/jquery
     - core/drupal
     - core/jquery.once
+
 toolbar.escapeAdmin:
   version: VERSION
   js:
diff --git a/core/modules/tour/tour.library.yml b/core/modules/tour/tour.library.yml
index 2ee0fba..d8dbb41 100644
--- a/core/modules/tour/tour.library.yml
+++ b/core/modules/tour/tour.library.yml
@@ -1,19 +1,23 @@
 tour:
   version: VERSION
   js:
-    - { file: js/tour.js, group: -100 }
+    - { file: js/tour.js }
   dependencies:
     - core/jquery
     - core/drupal
     - core/backbone
     - tour/jquery.joyride
     - tour/tour-styling
+
 tour-styling:
   version: VERSION
   css:
     - { file: css/tour.module.css, media: screen }
+
+# @todo Move into /core/assets and core.library.yml.
 jquery.joyride:
-  version: VERSION
+  remote: https://github.com/zurb/joyride
+  version: v2.0.3
   js:
     - { file: js/jquery.joyride-2.0.3.js }
   css:
diff --git a/core/modules/user/user.library.yml b/core/modules/user/user.library.yml
index 9311d2a..03e5313 100644
--- a/core/modules/user/user.library.yml
+++ b/core/modules/user/user.library.yml
@@ -8,6 +8,7 @@ drupal.user:
     - core/jquery
     - core/drupal
     - core/jquery.once
+
 drupal.user.permissions:
   version: VERSION
   js:
@@ -16,6 +17,7 @@ drupal.user.permissions:
     - core/jquery
     - core/drupal
     - core/drupalSettings
+
 drupal.user.icons:
   version: VERSION
   css:
diff --git a/core/modules/views/views.library.yml b/core/modules/views/views.library.yml
index 80467bf..6fd7c7e 100644
--- a/core/modules/views/views.library.yml
+++ b/core/modules/views/views.library.yml
@@ -2,6 +2,7 @@ views.module:
   version: VERSION
   css:
     - { file: css/views.module.css }
+
 views.ajax:
   version: VERSION
   js:
@@ -14,13 +15,16 @@ views.ajax:
     - core/jquery.once
     - core/jquery.form
     - core/drupal.ajax
+
 views.contextual-links:
   version: VERSION
   js:
-    - { file: js/views-contextual.js, group: -100, weight: -10 }
+    # Ensure to run before contextual/drupal.contextual-links.
+    - { file: js/views-contextual.js, weight: -10 }
   dependencies:
     - core/jquery
     - core/drupal
+
 views.exposed-form:
   version: VERSION
   css:
diff --git a/core/modules/views_ui/views_ui.library.yml b/core/modules/views_ui/views_ui.library.yml
index 214e325..c50f4f2 100644
--- a/core/modules/views_ui/views_ui.library.yml
+++ b/core/modules/views_ui/views_ui.library.yml
@@ -12,6 +12,7 @@ views_ui.admin:
     - core/jquery.form
     - core/drupal.ajax
     - views/views.ajax
+
 views_ui.listing:
   version: VERSION
   js: