diff --git a/core/modules/layout/layouts/static/one-col/one-col.tpl.php b/core/modules/layout/layouts/static/one-col/one-col.tpl.php
new file mode 100644
index 0000000..61af832
--- /dev/null
+++ b/core/modules/layout/layouts/static/one-col/one-col.tpl.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * @file
+ * Template for a 1 column layout.
+ *
+ * This template provides a simple one column display layout.
+ *
+ * Variables:
+ * - $content: An array of content, each item in the array is keyed to one
+ *   region of the layout. This layout supports only one section:
+ *   - $content['content']: Content in the content column.
+ */
+?>
+<div class="layout-display layout-one-col <?php print $attributes['class']; ?>"<?php print $attributes; ?>>
+  <div class="layout-region">
+    <?php print $content['content']; ?>
+  </div>
+</div>
diff --git a/core/modules/layout/layouts/static/one-col/one-col.yml b/core/modules/layout/layouts/static/one-col/one-col.yml
new file mode 100644
index 0000000..deaa7f8
--- /dev/null
+++ b/core/modules/layout/layouts/static/one-col/one-col.yml
@@ -0,0 +1,5 @@
+title: One column
+category: Columns: 1
+template: one-col
+regions:
+  content: 'Content'
diff --git a/core/modules/layout/layouts/static/twocol/two-col.css b/core/modules/layout/layouts/static/twocol/two-col.css
new file mode 100644
index 0000000..4e80fa6
--- /dev/null
+++ b/core/modules/layout/layouts/static/twocol/two-col.css
@@ -0,0 +1,16 @@
+.layout-two-col {
+  display: table;
+  width: 100%;
+}
+
+.layout-two-col .layout-region {
+  display: table-cell;
+  width: 50%;
+}
+
+/* Small devices [portrait + landscape] */
+@media only screen and (max-width: 480px) {
+  .layout-two-col .layout-region {
+    width: 100%;
+  }
+}
diff --git a/core/modules/layout/layouts/static/twocol/two-col.tpl.php b/core/modules/layout/layouts/static/twocol/two-col.tpl.php
new file mode 100644
index 0000000..82c9c1d
--- /dev/null
+++ b/core/modules/layout/layouts/static/twocol/two-col.tpl.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * @file
+ * Template for a 2 column layout.
+ *
+ * This template provides a two column display layout, with each column equal in
+ * width.
+ *
+ * Variables:
+ * - $content: An array of content, each item in the array is keyed to one
+ *   region of the layout. This layout supports the following sections:
+ *   - $content['first']: Content in the first column.
+ *   - $content['second']: Content in the second column.
+ */
+?>
+<div class="layout-display layout-two-col <?php print $attributes['class']; ?>"<?php print $attributes; ?>>
+  <div class="layout-region layout-col-first">
+    <?php print $content['first']; ?>
+  </div>
+
+  <div class="layout-region layout-col-second">
+    <?php print $content['second']; ?>
+  </div>
+</div>
diff --git a/core/modules/layout/layouts/static/twocol/two-col.yml b/core/modules/layout/layouts/static/twocol/two-col.yml
new file mode 100644
index 0000000..9df31fb
--- /dev/null
+++ b/core/modules/layout/layouts/static/twocol/two-col.yml
@@ -0,0 +1,8 @@
+title: Two column
+category: Columns: 2
+template: two-col
+stylesheets:
+  - two-col.css
+regions:
+  first: 'First column'
+  second: 'Second column'
diff --git a/core/modules/layout/lib/Drupal/layout/Tests/LayoutDerivativesTest.php b/core/modules/layout/lib/Drupal/layout/Tests/LayoutDerivativesTest.php
index 1071713..0766838 100644
--- a/core/modules/layout/lib/Drupal/layout/Tests/LayoutDerivativesTest.php
+++ b/core/modules/layout/lib/Drupal/layout/Tests/LayoutDerivativesTest.php
@@ -37,7 +37,7 @@ function testDerivatives() {
 
     $definitions = $manager->getDefinitions();
     $this->assertTrue(is_array($definitions), 'Definitions found.');
-    $this->assertTrue(count($definitions) == 2, 'Two definitions available.');
+    $this->assertTrue(count($definitions) == 4, 'Four definitions available.');
     $this->assertTrue(isset($definitions['static_layout:layout_test__one-col']), 'One column layout found.');
     $this->assertTrue(isset($definitions['static_layout:layout_test_theme__two-col']), 'Two column layout found.');
 
diff --git a/core/modules/layout/tests/layout_test.module b/core/modules/layout/tests/layout_test.module
index 36c3915..52ab4a3 100644
--- a/core/modules/layout/tests/layout_test.module
+++ b/core/modules/layout/tests/layout_test.module
@@ -9,6 +9,7 @@
  * Implementation of hook_menu().
  */
 function layout_test_menu() {
+  $items = array();
   $items['layout-test'] = array(
     'title' => 'Layout test',
     'page callback' => 'layout_test_page',