diff --git a/core/modules/outside_in/css/outside_in.theme.css b/core/modules/outside_in/css/outside_in.theme.css
index 1a17850..71f006d 100644
--- a/core/modules/outside_in/css/outside_in.theme.css
+++ b/core/modules/outside_in/css/outside_in.theme.css
@@ -64,25 +64,25 @@ button.toolbar-icon.toolbar-icon-edit.toolbar-item:hover > .toolbar-icon-edit:be
  */
 
 /* Highlight editable regions in edit mode. */
-#main-canvas.js-outside-in-edit-mode .outside-in-editable {
+#page-wrapper.js-outside-in-edit-mode .outside-in-editable {
   outline: 1px dashed rgba(0,0,0,0.5);
   box-shadow: 0 0 0 1px rgba(255,255,255,0.7);
 }
-#main-canvas.js-outside-in-edit-mode .outside-in-editable:hover {
+#page-wrapper.js-outside-in-edit-mode .outside-in-editable:hover {
   outline: 1px dashed rgba(0,0,0,0.5);
   box-shadow: 0 0 0 1px rgba(255,255,255,0.7);
   background-color: rgba(0,0,0,0.2);
 }
 /* Turn off the outlines on editables when the tray is open. */
-#main-canvas-wrapper.js-tray-open .outside-in-editable {
+#page-wrapper.js-tray-open .outside-in-editable {
   outline: transparent;
   outline-color: transparent;
   box-shadow: none;
 }
-#main-canvas-wrapper.js-tray-open .contextual {
+#page-wrapper.js-tray-open .contextual {
   opacity: 0;
 }
-#main-canvas-wrapper.js-tray-open .contextual:hover {
+#page-wrapper.js-tray-open .contextual:hover {
   opacity: 1;
 }
 
diff --git a/core/modules/outside_in/js/offcanvas.js b/core/modules/outside_in/js/offcanvas.js
index 1b06259..63bc6cf 100644
--- a/core/modules/outside_in/js/offcanvas.js
+++ b/core/modules/outside_in/js/offcanvas.js
@@ -58,7 +58,7 @@
     if (width !== bodyPadding) {
       $body.css('padding-right', width + 'px');
       $widget.attr('data-offset-right', width);
-      Drupal.displace();
+      displace();
     }
   }
 
diff --git a/core/modules/outside_in/js/outside_in.js b/core/modules/outside_in/js/outside_in.js
index b25b29c..995b54b 100644
--- a/core/modules/outside_in/js/outside_in.js
+++ b/core/modules/outside_in/js/outside_in.js
@@ -3,7 +3,7 @@
  * Drupal's Outside-In library.
  */
 
-(function ($, Drupal) {
+(function ($, window, Drupal) {
 
   'use strict';
 
@@ -86,7 +86,7 @@
    *   Items that should be toggled.
    */
   var getItemsToToggle = function () {
-    return $('#main-canvas, #toolbar-bar, .outside-in-editable a, .outside-in-editable button')
+    return $('#page-wrapper, #toolbar-bar, .outside-in-editable a, .outside-in-editable button')
       .not('div.contextual a, div.contextual button');
   };
 
@@ -144,4 +144,4 @@
       });
     }
   };
-})(jQuery, Drupal);
+})(jQuery, window, Drupal);