diff --git a/core/modules/field/templates/field-multiple-value-form.html.twig b/core/modules/field/templates/field-multiple-value-form.html.twig
new file mode 100644
index 0000000..fd1aba1
--- /dev/null
+++ b/core/modules/field/templates/field-multiple-value-form.html.twig
@@ -0,0 +1,39 @@
+{#
+/**
+ * @file
+ * Default theme implementation for an individual form element.
+ *
+ * Available variables for all fields:
+ * - multiple_cardinality: Whether the field is multiple cardinality or not.
+ *
+ * Available variables for single cardinality fields:
+ * - elements: Form elements to be rendered.
+ *
+ * Available variables for multiple cardinality fields:
+ * - table: Table of field items for multiple cardinality fields.
+ * - description: Description text for the form element.
+ * - button: "Add another item" button.
+ *
+ * @see template_preprocess_field()
+ * @see template_process_field()
+ *
+ * @ingroup themeable
+ */
+#}
+{% if multiple_cardinality %}
+  <div class="form-item">
+    {{ table }}
+    {% spaceless %}
+      {% if description %}
+        <div class="description">{{ description }}</div>
+      {% endif %}
+      {% if button %}
+        <div class="clearfix">{{ button }}</div>
+      {% endif %}
+    {% endspaceless %}
+  </div>
+{% else %}
+  {% for element in elements %}
+    {{ element }}
+  {% endfor %}
+{% endif %}
diff --git a/core/modules/picture/lib/Drupal/picture/Tests/PictureFieldDisplayTest.php.orig b/core/modules/picture/lib/Drupal/picture/Tests/PictureFieldDisplayTest.php.orig
new file mode 100644
index 0000000..927097d
--- /dev/null
+++ b/core/modules/picture/lib/Drupal/picture/Tests/PictureFieldDisplayTest.php.orig
@@ -0,0 +1,202 @@
+<?php
+
+/**
+ * @file
+ * Definition of Drupal\picture\Tests\PictureFieldDisplayTest.
+ */
+
+namespace Drupal\picture\Tests;
+
+use Drupal\Core\Language\Language;
+use Drupal\breakpoint\Plugin\Core\Entity\Breakpoint;
+use Drupal\image\Tests\ImageFieldTestBase;
+
+/**
+ * Test class to check that formatters and display settings are working.
+ */
+class PictureFieldDisplayTest extends ImageFieldTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('field_ui', 'picture');
+
+  /**
+   * Drupal\simpletest\WebTestBase\getInfo().
+   */
+  public static function getInfo() {
+    return array(
+      'name' => 'Picture field display tests',
+      'description' => 'Test picture display formatter.',
+      'group' => 'Picture',
+    );
+  }
+
+  /**
+   * Drupal\simpletest\WebTestBase\setUp().
+   */
+  public function setUp() {
+    parent::setUp();
+
+    // Create user.
+    $this->admin_user = $this->drupalCreateUser(array(
+      'administer pictures',
+      'access content',
+      'access administration pages',
+      'administer site configuration',
+      'administer content types',
+      'administer node display',
+      'administer nodes',
+      'create article content',
+      'edit any article content',
+      'delete any article content',
+      'administer image styles'
+    ));
+    $this->drupalLogin($this->admin_user);
+
+    // Add breakpoint_group and breakpoints.
+    $breakpoint_group = entity_create('breakpoint_group', array(
+      'id' => 'atestset',
+      'label' => 'A test set',
+      'sourceType' => Breakpoint::SOURCE_TYPE_USER_DEFINED,
+    ));
+
+    $breakpoints = array();
+    $breakpoint_names = array('small', 'medium', 'large');
+    for ($i = 0; $i < 3; $i++) {
+      $width = ($i + 1) * 200;
+      $breakpoint = entity_create('breakpoint', array(
+        'name' => $breakpoint_names[$i],
+        'mediaQuery' => "(min-width: {$width}px)",
+        'source' => 'user',
+        'sourceType' => Breakpoint::SOURCE_TYPE_USER_DEFINED,
+        'multipliers' => array(
+          '1.5x' => 0,
+          '2x' => '2x',
+        ),
+      ));
+      $breakpoint->save();
+      $breakpoint_group->breakpoints[$breakpoint->id()] = $breakpoint;
+    }
+    $breakpoint_group->save();
+
+    // Add picture mapping.
+    $picture_mapping = entity_create('picture_mapping', array(
+      'id' => 'mapping_one',
+      'label' => 'Mapping One',
+      'breakpointGroup' => 'atestset',
+    ));
+    $picture_mapping->save();
+    $picture_mapping->mappings['custom.user.small']['1x'] = 'thumbnail';
+    $picture_mapping->mappings['custom.user.medium']['1x'] = 'medium';
+    $picture_mapping->mappings['custom.user.large']['1x'] = 'large';
+    $picture_mapping->save();
+  }
+
+  /**
+   * Test picture formatters on node display for public files.
+   */
+  public function testPictureFieldFormattersPublic() {
+    $this->_testPictureFieldFormatters('public');
+  }
+
+  /**
+   * Test picture formatters on node display for private files.
+   */
+  public function testPictureFieldFormattersPrivate() {
+    // Remove access content permission from anonymous users.
+    user_role_change_permissions(DRUPAL_ANONYMOUS_RID, array('access content' => FALSE));
+    $this->_testPictureFieldFormatters('private');
+  }
+
+  /**
+   * Test picture formatters on node display.
+   */
+  public function _testPictureFieldFormatters($scheme) {
+    $field_name = drupal_strtolower($this->randomName());
+    $this->createImageField($field_name, 'article', array('uri_scheme' => $scheme));
+    // Create a new node with an image attached.
+    $test_image = current($this->drupalGetTestFiles('image'));
+    $nid = $this->uploadNodeImage($test_image, $field_name, 'article');
+    $node = node_load($nid, TRUE);
+
+    // Test that the default formatter is being used.
+    $image_uri = file_load($node->{$field_name}[Language::LANGCODE_NOT_SPECIFIED][0]['fid'])->getFileUri();
+    $image_info = array(
+      'uri' => $image_uri,
+      'width' => 40,
+      'height' => 20,
+    );
+    $default_output = theme('image', $image_info);
+    $this->assertRaw($default_output, 'Default formatter displaying correctly on full node view.');
+
+    // Use the picture formatter linked to file formatter.
+    $display_options = array(
+      'type' => 'picture',
+      'module' => 'picture',
+      'settings' => array('image_link' => 'file'),
+    );
+    $display = entity_get_display('node', 'article', 'default');
+    $display->setComponent($field_name, $display_options)
+      ->save();
+
+    $default_output = l(theme('image', $image_info), file_create_url($image_uri), array('html' => TRUE));
+    $this->drupalGet('node/' . $nid);
+    $this->assertRaw($default_output, 'Image linked to file formatter displaying correctly on full node view.');
+    // Verify that the image can be downloaded.
+    $this->assertEqual(file_get_contents($test_image->uri), $this->drupalGet(file_create_url($image_uri)), 'File was downloaded successfully.');
+    if ($scheme == 'private') {
+      // Only verify HTTP headers when using private scheme and the headers are
+      // sent by Drupal.
+      $this->assertEqual($this->drupalGetHeader('Content-Type'), 'image/png', 'Content-Type header was sent.');
+      $this->assertTrue(strstr($this->drupalGetHeader('Cache-Control'), 'private') !== FALSE, 'Cache-Control header was sent.');
+
+      // Log out and try to access the file.
+      $this->drupalLogout();
+      $this->drupalGet(file_create_url($image_uri));
+      $this->assertResponse('403', 'Access denied to original image as anonymous user.');
+
+      // Log in again.
+      $this->drupalLogin($this->admin_user);
+    }
+
+    // Use the picture formatter with a picture mapping.
+    $display_options['settings']['picture_mapping'] = 'mapping_one';
+    $display->setComponent($field_name, $display_options)
+      ->save();
+
+    // Output should contain all image styles and all breakpoints.
+    $this->drupalGet('node/' . $nid);
+    $this->assertRaw('/styles/thumbnail/');
+    $this->assertRaw('/styles/medium/');
+    $this->assertRaw('/styles/large/');
+    $this->assertRaw('media="(min-width: 200px)"');
+    $this->assertRaw('media="(min-width: 400px)"');
+    $this->assertRaw('media="(min-width: 600px)"');
+
+    // Test the fallback image style.
+    $display_options['settings']['image_link'] = '';
+    $display_options['settings']['fallback_image_style'] = 'large';
+    $display->setComponent($field_name, $display_options)
+      ->save();
+
+    $this->drupalGet(image_style_url('large', $image_uri));
+    $image_info['uri'] = $image_uri;
+    $image_info['width'] = 480;
+    $image_info['height'] = 240;
+    $image_info['style_name'] = 'large';
+    $default_output = '<noscript>' . theme('image_style', $image_info) . '</noscript>';
+    $this->drupalGet('node/' . $nid);
+    $this->assertRaw($default_output, 'Image style thumbnail formatter displaying correctly on full node view.');
+
+    if ($scheme == 'private') {
+      // Log out and try to access the file.
+      $this->drupalLogout();
+      $this->drupalGet(image_style_url('large', $image_uri));
+      $this->assertResponse('403', 'Access denied to image style thumbnail as anonymous user.');
+    }
+  }
+
+}
diff --git a/core/modules/picture/lib/Drupal/picture/Tests/PictureFieldDisplayTest.php.rej b/core/modules/picture/lib/Drupal/picture/Tests/PictureFieldDisplayTest.php.rej
new file mode 100644
index 0000000..6552901
--- /dev/null
+++ b/core/modules/picture/lib/Drupal/picture/Tests/PictureFieldDisplayTest.php.rej
@@ -0,0 +1,28 @@
+***************
+*** 124,135 ****
+  
+      // Test that the default formatter is being used.
+      $image_uri = file_load($node->{$field_name}[Language::LANGCODE_NOT_SPECIFIED][0]['fid'])->uri;
+-     $image_info = array(
+-       'uri' => $image_uri,
+-       'width' => 40,
+-       'height' => 20,
+      );
+-     $default_output = theme('image', $image_info);
+      $this->assertRaw($default_output, 'Default formatter displaying correctly on full node view.');
+  
+      // Use the picture formatter linked to file formatter.
+--- 124,136 ----
+  
+      // Test that the default formatter is being used.
+      $image_uri = file_load($node->{$field_name}[Language::LANGCODE_NOT_SPECIFIED][0]['fid'])->uri;
++     $image = array(
++       '#theme' => 'image',
++       '#uri' => $image_uri,
++       '#width' => 40,
++       '#height' => 20,
+      );
++     $default_output = drupal_render($image);
+      $this->assertRaw($default_output, 'Default formatter displaying correctly on full node view.');
+  
+      // Use the picture formatter linked to file formatter.
diff --git a/core/modules/system/lib/Drupal/system/Controller/SystemInfoController.php b/core/modules/system/lib/Drupal/system/Controller/SystemInfoController.php
index af48c1f..7f7e1f8 100644
--- a/core/modules/system/lib/Drupal/system/Controller/SystemInfoController.php
+++ b/core/modules/system/lib/Drupal/system/Controller/SystemInfoController.php
@@ -53,7 +53,10 @@ public function __construct(SystemManager $systemManager) {
   public function status() {
     $requirements = $this->systemManager->listRequirements();
     $this->systemManager->fixAnonymousUid();
-    return theme('status_report', array('requirements' => $requirements));
+    return array(
+      '#theme' => 'status_report',
+      '#requirements' => $requirements,
+    );
   }
 
   /**
diff --git a/core/modules/system/system.admin.inc b/core/modules/system/system.admin.inc
index c499692..859423e 100644
--- a/core/modules/system/system.admin.inc
+++ b/core/modules/system/system.admin.inc
@@ -12,6 +12,7 @@
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 use Drupal\Core\Datetime\DrupalDateTime;
+use Drupal\Core\Template\Attribute;
 use Drupal\system\Form\ModulesInstallConfirmForm;
 use Drupal\system\Form\ModulesUninstallConfirmForm;
 
@@ -48,10 +49,11 @@ function system_admin_config_page() {
           unset($item['localized_options']['attributes']['title']);
         }
         $block = $item;
-        $block['content'] = '';
-        $block['content'] .= theme('admin_block_content', array('content' => system_admin_menu_block($item)));
-        if (!empty($block['content'])) {
-          $block['show'] = TRUE;
+        if ($content = system_admin_menu_block($item)) {
+          $block['content'] = array(
+            '#theme' => 'admin_block_content',
+            '#content' => $content,
+          );
         }
 
         // Prepare for sorting as in function _menu_tree_check_access().
@@ -62,7 +64,10 @@ function system_admin_config_page() {
   }
   if ($blocks) {
     ksort($blocks);
-    return theme('admin_page', array('blocks' => $blocks));
+    return array(
+      '#theme' => 'admin_page',
+      '#blocks' => $blocks,
+    );
   }
   else {
     return t('You do not have any administrative items.');
@@ -83,12 +88,17 @@ function system_admin_config_page() {
 function system_admin_menu_block_page() {
   $item = menu_get_item();
   if ($content = system_admin_menu_block($item)) {
-    $output = theme('admin_block_content', array('content' => $content));
+    $build = array(
+      '#theme' => 'admin_block_content',
+      '#content' => $content,
+    );
   }
   else {
-    $output = t('You do not have any administrative items.');
+    $build = array(
+      '#markup' => t('You do not have any administrative items.'),
+    );
   }
-  return $output;
+  return $build;
 }
 
 /**
@@ -217,8 +227,12 @@ function system_themes_page() {
   uasort($theme_groups['enabled'], 'system_sort_themes');
   drupal_alter('system_themes_page', $theme_groups);
 
-  $admin_form = drupal_get_form('system_themes_admin_form', $admin_theme_options);
-  return theme('system_themes_page', array('theme_groups' => $theme_groups, 'theme_group_titles' => $theme_group_titles)) . drupal_render($admin_form);
+  return array(
+    '#theme' => 'system_themes_page',
+    '#theme_groups' => $theme_groups,
+    '#theme_group_titles' => $theme_group_titles,
+    '#admin_theme_options' => $admin_theme_options,
+  );
 }
 
 /**
@@ -993,9 +1007,12 @@ function _system_modules_build_row($info, $extra) {
   }
   else {
     $form['enable'] = array(
-      '#markup' =>  theme('image', array('uri' => 'core/misc/watchdog-error.png', 'alt' => $status_short, 'title' => $status_short)),
+      '#theme' => 'image',
+      '#uri' => 'core/misc/watchdog-error.png',
+      '#alt' => $status_short,
+      '#title' => $status_short,
     );
-    $form['description']['#markup'] .= theme('system_modules_incompatible', array('message' => $status_long));
+    $form['description']['#markup'] .= '<div class="incompatible">' . $status_long . '</div>';
   }
 
   // Build operation links.
@@ -1273,45 +1290,9 @@ function system_batch_page() {
 }
 
 /**
- * Returns HTML for an administrative block for display.
- *
- * @param $variables
- *   An associative array containing:
- *   - block: An array containing information about the block:
- *     - show: A Boolean whether to output the block. Defaults to FALSE.
- *     - title: The block's title.
- *     - content: (optional) Formatted content for the block.
- *     - description: (optional) Description of the block. Only output if
- *       'content' is not set.
+ * Prepares variables for administrative content block template.
  *
- * @ingroup themeable
- */
-function theme_admin_block($variables) {
-  $block = $variables['block'];
-  $output = '';
-
-  // Don't display the block if it has no content to display.
-  if (empty($block['show'])) {
-    return $output;
-  }
-
-  $output .= '<div class="admin-panel">';
-  if (!empty($block['title'])) {
-    $output .= '<h3>' . $block['title'] . '</h3>';
-  }
-  if (!empty($block['content'])) {
-    $output .= '<div class="body">' . $block['content'] . '</div>';
-  }
-  else {
-    $output .= '<div class="description">' . $block['description'] . '</div>';
-  }
-  $output .= '</div>';
-
-  return $output;
-}
-
-/**
- * Returns HTML for the content of an administrative block.
+ * Default template: admin-block-content.html.twig.
  *
  * @param $variables
  *   An associative array containing:
@@ -1322,29 +1303,29 @@ function theme_admin_block($variables) {
  *
  * @ingroup themeable
  */
-function theme_admin_block_content($variables) {
-  $content = $variables['content'];
-  $output = '';
-
-  if (!empty($content)) {
-    $class = 'admin-list';
-    if ($compact = system_admin_compact_mode()) {
-      $class .= ' compact';
+function template_preprocess_admin_block_content(&$variables) {
+  if (!empty($variables['content'])) {
+    $compact = system_admin_compact_mode();
+    $variables['attributes'] = array('class' => array('admin-list'));
+    if ($compact) {
+      $variables['attributes']['class'][] = 'compact';
     }
-    $output .= '<dl class="' . $class . '">';
-    foreach ($content as $item) {
-      $output .= '<dt>' . l($item['title'], $item['href'], $item['localized_options']) . '</dt>';
+    foreach ($variables['content'] as $key => $item) {
+      $variables['content'][$key]['link'] = l($item['title'], $item['href'], $item['localized_options']);
       if (!$compact && isset($item['description'])) {
-        $output .= '<dd>' . filter_xss_admin($item['description']) . '</dd>';
+        $variables['content'][$key]['description'] = filter_xss_admin($item['description']);
+      }
+      else {
+        $variables['content'][$key]['description'] = FALSE;
       }
     }
-    $output .= '</dl>';
   }
-  return $output;
 }
 
 /**
- * Returns HTML for an administrative page.
+ * Prepares variables for administrative index page templates.
+ *
+ * Default template: admin-page.html.twig.
  *
  * @param $variables
  *   An associative array containing:
@@ -1355,100 +1336,86 @@ function theme_admin_block_content($variables) {
  *
  * @ingroup themeable
  */
-function theme_admin_page($variables) {
-  $blocks = $variables['blocks'];
-
+function template_preprocess_admin_page(&$variables) {
+  $variables['system_compact_link'] = array(
+    '#theme' => 'system_compact_link',
+  );
+  $variables['containers'] = array();
   $stripe = 0;
-  $container = array();
-
-  foreach ($blocks as $block) {
-    if ($block_output = theme('admin_block', array('block' => $block))) {
+  foreach ($variables['blocks'] as $Block) {
+    $block = (array) $Block;
+    if ($block['show'] = !empty($block['content'])) {
       if (empty($block['position'])) {
         // perform automatic striping.
         $block['position'] = ++$stripe % 2 ? 'left' : 'right';
       }
-      if (!isset($container[$block['position']])) {
-        $container[$block['position']] = '';
+      if (!isset($variables['containers'][$block['position']])) {
+        $variables['containers'][$block['position']] = array('blocks' => array());
       }
-      $container[$block['position']] .= $block_output;
+      $variables['containers'][$block['position']]['blocks'][] = array(
+        '#theme' => 'admin_block',
+        '#block' => $block,
+      );
     }
   }
-
-  $output = '<div class="admin clearfix">';
-  $output .= theme('system_compact_link');
-
-  foreach ($container as $id => $data) {
-    $output .= '<div class="' . $id . ' clearfix">';
-    $output .= $data;
-    $output .= '</div>';
-  }
-  $output .= '</div>';
-  return $output;
 }
 
 /**
- * Returns HTML for the output of the admin index page.
+ * Prepares variables for admin index template.
+ *
+ * Default template: system-admin-index.html.twig.
  *
  * @param $variables
  *   An associative array containing:
  *   - menu_items: An array of modules to be displayed.
  *
+ * @todo Remove this once http://drupal.org/node/1842232 is resolved.
+ *
  * @ingroup themeable
  */
-function theme_system_admin_index($variables) {
-  $menu_items = $variables['menu_items'];
-
+function template_preprocess_system_admin_index(&$variables) {
+  $variables['system_compact_link'] = array(
+    '#theme' => 'system_compact_link'
+  );
+  $variables['containers'] = array();
   $stripe = 0;
-  $container = array('left' => '', 'right' => '');
-  $flip = array('left' => 'right', 'right' => 'left');
-  $position = 'left';
-
   // Iterate over all modules.
-  foreach ($menu_items as $module => $block) {
+  foreach ($variables['menu_items'] as $module => $block) {
     list($description, $items) = $block;
-
+    $position = ++$stripe % 2 ? 'left' : 'right';
     // Output links.
     if (count($items)) {
-      $block = array();
-      $block['title'] = $module;
-      $block['content'] = theme('admin_block_content', array('content' => $items));
-      $block['description'] = t($description);
-      $block['show'] = TRUE;
-
-      if ($block_output = theme('admin_block', array('block' => $block))) {
-        if (!isset($block['position'])) {
-          // Perform automatic striping.
-          $block['position'] = $position;
-          $position = $flip[$position];
-        }
-        $container[$block['position']] .= $block_output;
-      }
+      $variables['containers'][$position]['blocks'][] = array(
+        '#theme' => 'admin_block',
+        '#block' => array(
+          'position' => $position,
+          'title' => $module,
+          'show' => TRUE,
+          'content' => array(
+            '#theme' => 'admin_block_content',
+            '#content' => $items,
+          ),
+          'description' => t($description),
+        ),
+      );
     }
   }
-
-  $output = '<div class="admin clearfix">';
-  $output .= theme('system_compact_link');
-  foreach ($container as $id => $data) {
-    $output .= '<div class="' . $id . ' clearfix">';
-    $output .= $data;
-    $output .= '</div>';
-  }
-  $output .= '</div>';
-
-  return $output;
 }
 
 /**
- * Returns HTML for the status report.
+ * Prepares variables for status report template.
+ *
+ * Default template: status-report.html.twig.
  *
  * @param $variables
  *   An associative array containing:
  *   - requirements: An array of requirements.
+ *     Properties used: severity.title, severity.class,
+ *     requirement.title, requirement.value, requirement.description
  *
  * @ingroup themeable
  */
-function theme_status_report($variables) {
-  $requirements = $variables['requirements'];
+function template_preprocess_status_report(&$variables) {
   $severities = array(
     REQUIREMENT_INFO => array(
       'title' => t('Info'),
@@ -1574,19 +1541,6 @@ function theme_system_modules_details($variables) {
 }
 
 /**
- * Returns HTML for a message about incompatible modules.
- *
- * @param $variables
- *   An associative array containing:
- *   - message: The form array representing the currently disabled modules.
- *
- * @ingroup themeable
- */
-function theme_system_modules_incompatible($variables) {
-  return '<div class="incompatible">' . $variables['message'] . '</div>';
-}
-
-/**
  * Returns HTML for a table of currently disabled modules.
  *
  * @param $variables
@@ -1636,7 +1590,9 @@ function theme_system_modules_uninstall($variables) {
 }
 
 /**
- * Returns HTML for the Appearance page.
+ * Prepares variables for the appearance page template.
+ *
+ * Default template: system-themes-page.html.twig.
  *
  * @param $variables
  *   An associative array containing:
@@ -1644,10 +1600,10 @@ function theme_system_modules_uninstall($variables) {
  *
  * @ingroup themeable
  */
-function theme_system_themes_page($variables) {
+function template_preprocess_system_themes_page(&$variables) {
+  $groups = array();
   $theme_groups = $variables['theme_groups'];
-
-  $output = '<div id="system-themes-page">';
+  $variables['attributes']['id'] = 'system-themes-page';
 
   foreach ($variables['theme_group_titles'] as $state => $title) {
     if (!count($theme_groups[$state])) {
@@ -1655,48 +1611,68 @@ function theme_system_themes_page($variables) {
       continue;
     }
     // Start new theme group.
-    $output .= '<div class="system-themes-list system-themes-list-'. $state .' clearfix"><h2>'. $title .'</h2>';
+    $theme_group = array();
+    $theme_group['state'] = $state;
+    $theme_group['title'] = $title;
+    $theme_group['themes'] = array();
+    $theme_group['attributes'] = new Attribute(array('class' => array('system-themes-list', 'system-themes-list-' . $state, 'clearfix')));
 
-    foreach ($theme_groups[$state] as $theme) {
 
-      // Theme the screenshot.
-      $screenshot = $theme->screenshot ? theme('image', $theme->screenshot) : '<div class="no-screenshot"><div class="no-screenshot__text">' . t('no screenshot') . '</div></div>';
+    foreach ($theme_groups[$state] as $theme) {
+      $current_theme = array();
+
+      // Screenshot depicting the theme.
+      if ($theme->screenshot) {
+        $current_theme['screenshot'] = array(
+          '#theme' => 'image',
+          '#uri' => $theme->screenshot['uri'],
+          '#alt' => $theme->screenshot['alt'],
+          '#title' => $theme->screenshot['title'],
+          '#attributes' => $theme->screenshot['attributes'],
+        );
+      }
 
       // Localize the theme description.
-      $description = t($theme->info['description']);
+      $current_theme['description'] = t($theme->info['description']);
 
       // Style theme info
-      $notes = count($theme->notes) ? ' (' . join(', ', $theme->notes) . ')' : '';
       $theme->classes[] = 'theme-selector';
       $theme->classes[] = 'clearfix';
-      $output .= '<div class="'. join(' ', $theme->classes) .'">' . $screenshot . '<div class="theme-info"><h3>' . $theme->info['name'] . ' ' . (isset($theme->info['version']) ? $theme->info['version'] : '') . $notes . '</h3><div class="theme-description">' . $description . '</div>';
+      $current_theme['attributes'] = new Attribute(array('class' => $theme->classes));
+      $current_theme['name'] = $theme->info['name'];
+      $current_theme['version'] = isset($theme->info['version']) ? $theme->info['version'] : '';
+      $current_theme['notes'] = count($theme->notes) ? '(' . join(', ', $theme->notes) . ')' : '';
 
       // Make sure to provide feedback on compatibility.
       if (!empty($theme->incompatible_core)) {
-        $output .= '<div class="incompatible">' . t('This version is not compatible with Drupal !core_version and should be replaced.', array('!core_version' => DRUPAL_CORE_COMPATIBILITY)) . '</div>';
+        $current_theme['compatibility'] = t('This version is not compatible with Drupal !core_version and should be replaced.', array('!core_version' => DRUPAL_CORE_COMPATIBILITY));
       }
       elseif (!empty($theme->incompatible_php)) {
         if (substr_count($theme->info['php'], '.') < 2) {
           $theme->info['php'] .= '.*';
         }
-        $output .= '<div class="incompatible">' . t('This theme requires PHP version @php_required and is incompatible with PHP version !php_version.', array('@php_required' => $theme->info['php'], '!php_version' => phpversion())) . '</div>';
+        $current_theme['compatibility'] = t('This theme requires PHP version @php_required and is incompatible with PHP version !php_version.', array('@php_required' => $theme->info['php'], '!php_version' => phpversion()));
       }
       elseif (!empty($theme->incompatible_base)) {
-        $output .= '<div class="incompatible">' . t('This theme requires the base theme @base_theme to operate correctly.', array('@base_theme' => $theme->info['base theme'])) . '</div>';
+        $current_theme['compatibility'] = t('This theme requires the base theme @base_theme to operate correctly.', array('@base_theme' => $theme->info['base theme']));
       }
       elseif (!empty($theme->incompatible_engine)) {
-        $output .= '<div class="incompatible">' . t('This theme requires the theme engine @theme_engine to operate correctly.', array('@theme_engine' => $theme->info['engine'])) . '</div>';
+        $current_theme['compatibility'] = t('This theme requires the theme engine @theme_engine to operate correctly.', array('@theme_engine' => $theme->info['engine']));
       }
       else {
-        $output .= theme('links', array('links' => $theme->operations, 'attributes' => array('class' => array('operations', 'clearfix'))));
+        $current_theme['compatibility'] = array(
+          '#theme' => 'links',
+          '#links' => $theme->operations,
+          '#attributes' => array('class' => array('operations', 'clearfix')),
+        );
       }
-      $output .= '</div></div>';
+      $theme_group['themes'][] = $current_theme;
     }
-    $output .= '</div>';
+    $groups[] = $theme_group;
   }
-  $output .= '</div>';
+  $variables['theme_groups'] = $groups;
+  $variables['admin_form'] = drupal_get_form('system_themes_admin_form', $variables['admin_theme_options']);
 
-  return $output;
 }
 
 /**
@@ -1707,7 +1683,7 @@ function system_date_time_formats() {
     array('data' => t('Machine name'), 'field' => 'machine_name'),
     array('data' => t('Name'), 'field' => 'name'),
     array('data' => t('Pattern'), 'field' => 'pattern'),
-    array('data' => t('Operations'))
+    array('data' => t('Operations')),
   );
   $rows = array();
 
@@ -1792,7 +1768,11 @@ function system_date_format_language_overview_page() {
     $rows[] = $row;
   }
 
-  return theme('table', array('header' => $header, 'rows' => $rows));
+  return array(
+    '#theme' => 'table',
+    '#header' => $header,
+    '#rows' => $rows
+  );
 }
 
 /**
diff --git a/core/modules/system/system.module b/core/modules/system/system.module
index abc9f9c..cf667ce 100644
--- a/core/modules/system/system.module
+++ b/core/modules/system/system.module
@@ -8,8 +8,8 @@
 use Drupal\Core\Cache\CacheBackendInterface;
 use Drupal\Core\Cache\Cache;
 use Drupal\Core\Language\Language;
-use Drupal\Core\Utility\ModuleInfo;
 use Drupal\Core\TypedData\Primitive;
+use Drupal\Core\Utility\ModuleInfo;
 use Drupal\system\Plugin\Block\SystemMenuBlock;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\RedirectResponse;
@@ -140,8 +140,13 @@ function system_help($path, $arg) {
 function system_theme() {
   return array_merge(drupal_common_theme(), array(
     'system_themes_page' => array(
-      'variables' => array('theme_groups' => NULL),
+      'variables' => array(
+        'theme_groups' => array(),
+        'theme_group_titles' => array(),
+        'admin_theme_options' => array(),
+      ),
       'file' => 'system.admin.inc',
+      'template' => 'system-themes-page',
     ),
     'system_config_form' => array(
       'render element' => 'form',
@@ -153,46 +158,49 @@ function system_theme() {
       'render element' => 'form',
       'file' => 'system.admin.inc',
     ),
-    'system_modules_incompatible' => array(
-      'variables' => array('message' => NULL),
-      'file' => 'system.admin.inc',
-    ),
     'system_modules_uninstall' => array(
       'render element' => 'form',
       'file' => 'system.admin.inc',
     ),
     'status_report' => array(
-      'render element' => 'requirements',
+      'variables' => array('requirements' => NULL),
       'file' => 'system.admin.inc',
+      'template' => 'status-report'
     ),
     'admin_page' => array(
       'variables' => array('blocks' => NULL),
       'file' => 'system.admin.inc',
+      'template' => 'admin-page',
     ),
     'admin_block' => array(
       'variables' => array('block' => NULL),
       'file' => 'system.admin.inc',
+      'template' => 'admin-block',
     ),
     'admin_block_content' => array(
       'variables' => array('content' => NULL),
       'file' => 'system.admin.inc',
+      'template' => 'admin-block-content',
     ),
     'system_admin_index' => array(
       'variables' => array('menu_items' => NULL),
       'file' => 'system.admin.inc',
+      'template' => 'system-admin-index',
     ),
     'system_powered_by' => array(
       'variables' => array(),
+      'template' => 'system-powered-by',
     ),
     'system_compact_link' => array(
       'variables' => array(),
+      'template' => 'system-compact-link',
     ),
     'system_date_format_localize_form' => array(
       'render element' => 'form',
     ),
     'system_plugin_ui_form' => array(
-      'template' => 'system-plugin-ui-form',
       'render element' => 'form',
+      'template' => 'system-plugin-ui-form',
     ),
   ));
 }
@@ -2655,7 +2663,7 @@ function system_preprocess_block(&$variables) {
  * @param array $variables
  *   An associative array containing:
  *   - form: The plugin form elements.
-*/
+ */
 function template_preprocess_system_plugin_ui_form(&$variables) {
   drupal_add_css(drupal_get_path('module', 'system') . '/css/system.plugin.ui.css');
 }
@@ -3535,30 +3543,25 @@ function system_timezone($abbreviation = '', $offset = -1, $is_daylight_saving_t
 }
 
 /**
- * Returns HTML for the Powered by Drupal text.
+ * Prepare variables for system compact link templates.
  *
- * @ingroup themeable
- */
-function theme_system_powered_by() {
-  return '<span>' . t('Powered by <a href="@poweredby">Drupal</a>', array('@poweredby' => 'http://drupal.org')) . '</span>';
-}
-
-/**
- * Returns HTML for a link to show or hide inline help descriptions.
+ * Default template: system-compact-link.html.twig.
  *
  * @ingroup themeable
  */
-function theme_system_compact_link() {
-  $output = '<div class="compact-link">';
+function template_preprocess_system_compact_link(&$variables) {
   if (system_admin_compact_mode()) {
-    $output .= l(t('Show descriptions'), 'admin/compact/off', array('attributes' => array('title' => t('Expand layout to include descriptions.')), 'query' => drupal_get_destination()));
+    $variables['link'] = l(t('Show descriptions'), 'admin/compact/off', array(
+      'query' => array(drupal_get_destination()),
+      'attributes' => array('title' => t('Expand layout to include descriptions.')),
+    ));
   }
   else {
-    $output .= l(t('Hide descriptions'), 'admin/compact/on', array('attributes' => array('title' => t('Compress layout by hiding descriptions.')), 'query' => drupal_get_destination()));
+    $variables['link'] = l(t('Hide descriptions'), 'admin/compact/on', array(
+      'query' => array(drupal_get_destination()),
+      'attributes' => array('title' => t('Compress layout by hiding descriptions.')),
+    ));
   }
-  $output .= '</div>';
-
-  return $output;
 }
 
 /**
@@ -3807,6 +3810,7 @@ function theme_system_config_form($variables) {
  *   A string containing an HTML-formatted form.
  *
  * @ingroup themeable
+ * @todo Move this out of system.module and back into theme.inc.
  */
 function theme_exposed_filters($variables) {
   $form = $variables['form'];
diff --git a/core/modules/system/templates/admin-block-content.html.twig b/core/modules/system/templates/admin-block-content.html.twig
new file mode 100644
index 0000000..1900082
--- /dev/null
+++ b/core/modules/system/templates/admin-block-content.html.twig
@@ -0,0 +1,29 @@
+{#
+/**
+ * @file
+ * Default theme implementation for the content of an administrative block.
+ *
+ * Available variables:
+ * - content: A list containing information about the block. Each element
+ *   of the array represents an administrative menu item, and must at least
+ *   contain the keys 'title', 'href', and 'localized_options', which are
+ *   passed to l(). A 'description' key may also be provided.
+ * - attributes: Remaining HTML attributes to be aded to the element.
+ * - is_compact_mode: It defines if compact mode is used.
+ *
+ * @see template_preprocess()
+ * @see template_preprocess_admin_block_content()
+ *
+ * @ingroup themeable
+ */
+#}
+{% if content %}
+  <dl{{ attributes }}>
+    {% for item in content %}
+      <dt>{{ item.link }}</dt>
+      {% if item.description %}
+        <dd>{{ item.description }}</dd>
+      {% endif %}
+    {% endfor %}
+  </dl>
+{% endif %}
diff --git a/core/modules/system/templates/admin-block.html.twig b/core/modules/system/templates/admin-block.html.twig
new file mode 100644
index 0000000..8e9bc96
--- /dev/null
+++ b/core/modules/system/templates/admin-block.html.twig
@@ -0,0 +1,31 @@
+{#
+/**
+ * @file
+ * Default theme implementation for an administrative block.
+ *
+ * Available variables:
+ * - block: An array of information about the block, including:
+ *   - show: A boolean flag indicating if the block should be displayed.
+ *   - title: The block title.
+ *   - content: (optional) The content of the block.
+ *   - description: (optional) A description of the block.
+ *     (description should only be output if content is not available).
+ *
+ * @see template_preprocess()
+ * @see template_preprocess_admin_block()
+ *
+ * @ingroup themeable
+ */
+#}
+{% if block.show %}
+  <div class="admin-panel">
+    {% if block.title %}
+      <h3>{{ block.title }}</h3>
+    {% endif %}
+    {% if block.content %}
+      <div class="body">{{ block.content }}</div>
+    {% elseif block.description %}
+      <div class="description">{{ block.description }}</div>
+    {% endif %}
+  </div>
+{% endif %}
diff --git a/core/modules/system/templates/admin-page.html.twig b/core/modules/system/templates/admin-page.html.twig
new file mode 100644
index 0000000..c3c42f0
--- /dev/null
+++ b/core/modules/system/templates/admin-page.html.twig
@@ -0,0 +1,26 @@
+{#
+/**
+ * @file
+ * Default theme implementation for an administrative page.
+ *
+ * Available variables:
+ * - system_compact_link: Themed link to toggle compact view.
+ * - containers: An list of administrative blocks keyed by position: left or
+ *   right.
+ *
+ * @see template_preprocess()
+ * @see template_preprocess_admin_page()
+ *
+ * @ingroup themeable
+ */
+#}
+<div class="admin clearfix">
+  {{ system_compact_link }}
+  {% for position, container in containers %}
+    <div class="{{ position }} clearfix">
+      {% for block in container.blocks %}
+        {{ block }}
+      {% endfor %}
+    </div>
+  {% endfor %}
+</div>
diff --git a/core/modules/system/templates/status-report.html.twig b/core/modules/system/templates/status-report.html.twig
new file mode 100644
index 0000000..57b279d
--- /dev/null
+++ b/core/modules/system/templates/status-report.html.twig
@@ -0,0 +1,46 @@
+{#
+/**
+ * Default theme implementation for the status report.
+ *
+ * Available variables:
+ * - requirements: Contains multiple requirement instances.
+ *   Each requirement contains:
+ *   - title: @todo.
+ *   - value: @todo.
+ *   - description: @todo.
+ * - severity: The severity of error.
+ *   Contains:
+ *   - title: @todo.
+ *   - class: @todo.
+ *
+ * @see template_preprocess()
+ * @see template_preprocess_status_report()
+ *
+ * @ingroup themeable
+ */
+#}
+<table class="system-status-report">
+  <thead>
+    <tr class="element-invisible">
+      <th>{{ 'Status'|t }}</th><th>{{ 'Component'|t }}</th><th>{{ 'Details'|t }}</th>
+    </tr>
+  </thead>
+  <tbody>
+  {% for requirement in requirements %}
+    <tr class="{{ requirement.severity_class }}">
+      <td class="status-icon">
+        <div title="{{ requirement.severity_title }}">
+          <span class="element-invisible">{{ requirement.severity_title }}</span>
+        </div>
+      </td>
+      <td class="status-title">{{ requirement.title }}</td>
+      <td class="status-value">
+        {{ requirement.value }}
+        {% if requirement.description %}
+          <div class="description">{{ requirement.description }}</div>
+        {% endif %}
+      </td>
+    </tr>
+  {% endfor %}
+  </tbody>
+</table>
diff --git a/core/modules/system/templates/system-admin-index.html.twig b/core/modules/system/templates/system-admin-index.html.twig
new file mode 100644
index 0000000..d60f11a
--- /dev/null
+++ b/core/modules/system/templates/system-admin-index.html.twig
@@ -0,0 +1,25 @@
+{#
+/**
+ * @file
+ * Default theme implementation for the admin index page.
+ *
+ * Available variables:
+ * - system_compact_link: Themed link to toggle compact view.
+ * - container: Container for admin blocks.
+ *
+ * @see template_preprocess()
+ * @see template_preprocess_system_admin_index()
+ *
+ * @ingroup themeable
+ */
+#}
+<div class="admin clearfix">
+  {{ system_compact_link }}
+  {% for position, container in containers %}
+    <div class="{{ position }} clearfix">
+      {% for block in container.blocks %}
+        {{ block }}
+      {% endfor %}
+    </div>
+  {% endfor %}
+</div>
diff --git a/core/modules/system/templates/system-compact-link.html.twig b/core/modules/system/templates/system-compact-link.html.twig
new file mode 100644
index 0000000..a18efda
--- /dev/null
+++ b/core/modules/system/templates/system-compact-link.html.twig
@@ -0,0 +1,13 @@
+{#
+/**
+ * @file
+ * Default theme implementation for a link to show or hide inline help
+ *   descriptions.
+ *
+ * @see template_preprocess()
+ * @see template_preprocess_system_compact_link()
+ *
+ * @ingroup themeable
+ */
+#}
+<div class="compact-link">{{ link }}</div>
diff --git a/core/modules/system/templates/system-modules-details.html.twig b/core/modules/system/templates/system-modules-details.html.twig
new file mode 100644
index 0000000..0f946c4
--- /dev/null
+++ b/core/modules/system/templates/system-modules-details.html.twig
@@ -0,0 +1,15 @@
+{#
+/**
+ * @file
+ * Default theme implementation to display the modules form.
+ *
+ * Available variables:
+ * - content: File form element html.
+ *
+ * @see template_preprocess()
+ * @see template_preprocess_system_modules_details()
+ *
+ * @ingroup themeable
+ */
+#}
+{{ content }}
diff --git a/core/modules/system/templates/system-powered-by.html.twig b/core/modules/system/templates/system-powered-by.html.twig
new file mode 100644
index 0000000..fa7dd32
--- /dev/null
+++ b/core/modules/system/templates/system-powered-by.html.twig
@@ -0,0 +1,12 @@
+{#
+/**
+ * @file
+ * Default theme implementation for the Powered by Drupal text.
+ *
+ * @see template_preprocess()
+ * @see template_preprocess_system_powered_by()
+ *
+ * @ingroup themeable
+ */
+#}
+<span>{{ 'Powered by <a href="http://drupal.org">Drupal</a>'|t }}</span>
diff --git a/core/modules/system/templates/system-themes-page.html.twig b/core/modules/system/templates/system-themes-page.html.twig
new file mode 100644
index 0000000..23fc836
--- /dev/null
+++ b/core/modules/system/templates/system-themes-page.html.twig
@@ -0,0 +1,60 @@
+{#
+/**
+ * @file
+ * Default theme implementation for the Appearance page.
+ *
+ * Available variables:
+ * - attributes: HTML element attributes.
+ * - theme_groups: An array of theme groups.
+ *
+ * Each theme_groups[group] contains an array of theme groups.
+ *
+ * Each group in theme_groups[group] contains:
+ * - attributes: Element attributes specific to this group.
+ * - title: Title for the theme group.
+ * - state: State of the theme group.
+ * - themes: An array of themes within that group.
+ *
+ * Each group.themes[theme] contains an array of themes.
+ *
+ * Each theme in group.themes[theme] contains:
+ * - attributes: Element attributes specific to this theme.
+ * - screenshot: Render of theme screenshot.
+ * - description: Description of the theme.
+ * - name: Name of theme.
+ * - version: Verions number of theme.
+ * - notes: Identifies what context this theme is being used.
+ *   eg. (default theme, admin theme)
+ * - compatibility: Description of any incompatibility issues,
+ *   if the theme is compatible, provides a list of links.
+ *
+ * @see template_preprocess()
+ * @see template_preprocess_system_themes_page()
+ *
+ * @ingroup themeable
+ */
+#}
+<div{{ attributes }}>
+  {% for theme_group in theme_groups %}
+    <div{{ theme_group.attributes }}>
+      <h2>{{ theme_group.title }}</h2>
+      {% for theme in theme_group.themes %}
+        <div{{ theme.attributes }}>
+          {% if theme.screenshot %}
+            {{ theme.screenshot }}
+          {% else %}
+            <div class="no-screenshot">
+              <div class="no-screenshot__text">{{ "no screenshot"|t }}</div>
+            </div>
+          {% endif %}
+          <div class="theme-info">
+            <h3>{{ theme.name }} {{ theme.version }} {{ theme.notes }}</h3>
+            <div class="theme-description">{{ theme.description }}</div>
+            {{ theme.compatibility }}
+          </div>
+        </div>
+      {% endfor %}
+    </div>
+  {% endfor %}
+</div>
+{{ admin_form }}
diff --git a/core/themes/bartik/templates/field--taxonomy-term-reference.html.twig b/core/themes/bartik/templates/field--taxonomy-term-reference.html.twig
new file mode 100644
index 0000000..bfbe97d
--- /dev/null
+++ b/core/themes/bartik/templates/field--taxonomy-term-reference.html.twig
@@ -0,0 +1,32 @@
+{#
+/**
+ * @file
+ * Bartik theme override for taxonomy term fields.
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the containing element.
+ * - label_hidden: Whether to show the field label or not.
+ * - title_attributes: HTML attributes for the title.
+ * - label: The label for the field.
+ * - content_attributes: HTML attributes for the content.
+ * - items: List of all the field items.
+ * - item_attributes: HTML attributes for each item.
+ *
+ * @see template_preprocess_field()
+ * @see template_process_field()
+ *
+ * @ingroup themeable
+ */
+ @todo Remove even/odd striping once http://drupal.org/node/1649780 lands.
+#}
+<div class="{{ attributes.class }} clearfix"{{ attributes }}>
+  {% if not label_hidden %}
+    <h3 class="field-label">{{ label }}: </h3>
+  {% endif %}
+  <ul class="links">
+    {% for delta, item in items %}
+      {# @todo remove type casting once http://drupal.org/node/1970960 lands #}
+      <li class="taxonomy-term-reference-{{ "" ~ delta }}"{{ item_attributes[delta] }}>{{ item }}</li>
+    {% endfor %}
+  </ul>
+</div>