diff --git a/core/modules/block/custom_block/custom_block.module b/core/modules/block/custom_block/custom_block.module
index 83117c8..05bb72a 100644
--- a/core/modules/block/custom_block/custom_block.module
+++ b/core/modules/block/custom_block/custom_block.module
@@ -139,10 +139,6 @@ function custom_block_theme($existing, $type, $theme, $path) {
     'custom_block_block' => array(
       'variables' => array('body' => NULL, 'format' => NULL),
     ),
-    'custom_block_add_list' => array(
-      'variables' => array('content' => NULL),
-      'file' => 'custom_block.pages.inc',
-    ),
   );
 }
 
diff --git a/core/modules/block/templates/block-admin-display-form.html.twig b/core/modules/block/templates/block-admin-display-form.html.twig
new file mode 100644
index 0000000..23d7064
--- /dev/null
+++ b/core/modules/block/templates/block-admin-display-form.html.twig
@@ -0,0 +1,57 @@
+{#
+/**
+ * @file
+ * Default theme implementation to configure blocks.
+ *
+ * Available variables:
+ * - block_regions: An array of regions. Keyed by name with the title as value.
+ * - block_listing: An array of blocks keyed by region and then delta.
+ * - form_submit: A renderable form submit button.
+ *
+ * Each block_listing[region] contains an array of blocks for that region.
+ *
+ * Each data in block_listing[region] contains:
+ * - data.region_title: Region title for the listed block.
+ * - data.block_title: Block title.
+ * - data.region_select: Drop-down menu for assigning a region.
+ * - data.weight_select: Drop-down menu for setting weights.
+ * - data.configure_link: Block configuration link.
+ * - data.delete_link: For deleting user added blocks.
+ *
+ * @see template_preprocess()
+ * @see template_preprocess_block_admin_display_form()
+ * @see theme_block_admin_display()
+ *
+ * @ingroup themeable
+ */
+#}
+<table id="blocks" class="sticky-enabled">
+  <thead>
+    <tr>
+      <th>{{ 'Block' | t }}</th>
+      <th>{{ 'Region' | t }}</th>
+      <th>{{ 'Weight' | t }}</th>
+      <th colspan="2">{{ 'Operations' | t }}</th>
+    </tr>
+  </thead>
+  <tbody>
+    {% for region, title in block_regions %}
+      <tr class="region-title region-title-{{ region }}">
+        <td colspan="5">{{ title }}</td>
+      </tr>
+      <tr class="region-message region-{{ region }}-message  {{ block_listing[region] ? 'region-empty' : 'region-populated' }}">
+        <td colspan="5"><em>{{ 'No blocks in this region' | t }}</em></td>
+      </tr>
+      {% for delta, data in block_listing[region] %}
+      <tr class="draggable {{ cycle(["even", "odd"], loop.index) }}{{ data.row_class ? data.row_class : '' }}">
+        <td class="block">{{ data.block_title }}</td>
+        <td>{{ data.region_select }}</td>
+        <td>{{ data.weight_select }}</td>
+        <td>{{ data.configure_link }}</td>
+        <td>{{ data.delete_link }}</td>
+      </tr>
+      {% endfor %}
+    {% endfor %}
+  </tbody>
+</table>
+{{ render_var(form_submit) }}
diff --git a/core/modules/block/templates/block.html.twig b/core/modules/block/templates/block.html.twig
new file mode 100644
index 0000000..3da287c
--- /dev/null
+++ b/core/modules/block/templates/block.html.twig
@@ -0,0 +1,50 @@
+{#
+/**
+ * @file
+ * Default theme implementation to display a container.
+ *
+ * Available variables:
+ * - subject: Block subject.
+ * - contents: The contents of this block.
+ * - attributes: Remaining html attributes for the containing element.
+ * - attributes.id: A valid html ID and guaranteed unique.
+ * - attributes.class: Classes that can be used to style contextually through
+ *   CSS. These can be manipulated through from preprocess functions. The
+ *   default values can be one or more of the following:
+ *   - block: The current template type, i.e., "theming hook".
+ *   - block-[module]: The module generating the block. For example, the user
+ *     module is responsible for handling the default user navigation block. In
+ *     that case the class would be 'block-user'.
+ * - block.module: Module that generated the block.
+ * - block.delta: An ID for the block, unique within each module.
+ * - block.region: The block region embedding the current block.
+ *
+ * Helper variables:
+ * - block_id: Counter dependent on each block region.
+ * - id: Same output as $block_id but independent of any block region.
+ * - is_front: Flags true when presented in the front page.
+ * - logged_in: Flags true when the current user is a logged-in member.
+ * - is_admin: Flags true when the current user is an administrator.
+ *
+ * @TODO update include path once http://drupal.org/node/1777532 is resolved.
+ *
+ * @see template_preprocess()
+ * @see template_preprocess_container()
+ *
+ * @ingroup themeable
+ */
+ @todo: remove the ID since blocks can be added more than once on a page.
+ @todo: remove the div around content - and make sure this doesn't break any
+  CSS defined in modules.
+#}
+<div id="{{ attributes.id }}" class="{{ attributes.class }}"{{ attributes }}>
+  {{ title_prefix }}
+  {% if subject %}
+    <h2{{ title_attributes }}>{{ subject }}</h2>
+  {% endif %}
+  {{ title_suffix }}
+
+  <div class="content {{ content_attributes.class }}"{{ content_attributes }}>
+   {{ content }}
+  </div>
+</div>