diff --git a/core/modules/system/lib/Drupal/system/Form/ModulesListForm.php b/core/modules/system/lib/Drupal/system/Form/ModulesListForm.php
index a090c67..a0427e4 100644
--- a/core/modules/system/lib/Drupal/system/Form/ModulesListForm.php
+++ b/core/modules/system/lib/Drupal/system/Form/ModulesListForm.php
@@ -117,18 +117,21 @@ public function buildForm(array $form, array &$form_state) {
 
     // Add a wrapper around every package.
     foreach (element_children($form['modules']) as $package) {
-      $form['modules'][$package] += array(
-        '#type' => 'details',
-        '#title' => $this->t($package),
-        '#theme' => 'system_modules_details',
+      $table = array(
+        '#type' => 'table',
         '#header' => array(
           array('data' => '<span class="visually-hidden">' . $this->t('Installed') . '</span>', 'class' => array('checkbox')),
           array('data' => $this->t('Name'), 'class' => array('name')),
           array('data' => $this->t('Description'), 'class' => array('description', RESPONSIVE_PRIORITY_LOW)),
         ),
-        '#attributes' => array('class' => array('package-listing')),
+      ) + $form['modules'][$package];
+      $form['modules'][$package] = array(
+        '#type' => 'details',
+        '#title' => $this->t($package),
         // Ensure that the "Core" package comes first.
         '#weight' => $package == 'Core' ? -10 : NULL,
+        '#attributes' => array('class' => array('package-listing')),
+        'table' => $table,
       );
     }
 
@@ -159,13 +162,9 @@ public function buildForm(array $form, array &$form_state) {
    */
   protected function buildRow(array $modules, $module, $distribution) {
     // Set the basic properties.
-    $row['#required'] = array();
-    $row['#requires'] = array();
-    $row['#required_by'] = array();
-
-    $row['name']['#markup'] = $module->info['name'];
-    $row['description']['#markup'] = $this->t($module->info['description']);
-    $row['version']['#markup'] = $module->info['version'];
+    $row['#version'] = $module->info['version'];
+    $row['#requires'] = isset($row['#requires']) ? $row['#requires'] : FALSE;
+    $row['#required_by'] = isset($row['#required_by']) ? $row['#required_by'] : FALSE;
 
     // Add links for each module.
     // Used when checking if a module implements a help page.
@@ -217,7 +216,6 @@ protected function buildRow(array $modules, $module, $distribution) {
     // Present a checkbox for installing and indicating the status of a module.
     $row['enable'] = array(
       '#type' => 'checkbox',
-      '#title' => $this->t('Install'),
       '#default_value' => (bool) $module->status,
       '#disabled' => (bool) $module->status,
     );
@@ -309,6 +307,64 @@ protected function buildRow(array $modules, $module, $distribution) {
       }
     }
 
+    // Set id for checkbox here so module label can reference it.
+    $id = drupal_html_class('edit-modules-' . $module->info['package'] . '-' . $module->name . '-enable');
+
+    $row['name']['#markup'] = $module->info['name'];
+
+    $row['enable'] += array(
+      '#wrapper_attributes' => array(
+        'class' => array('checkbox'),
+      ),
+      '#id' => $id,
+      '#parents' => array('modules', $module->info['package'], $module->name, 'enable'),
+    );
+
+    // Add the module label and expand/collapse functionalty.
+    $row['name'] = array(
+      '#prefix' => '<label id="module-' . $module->name . '" for="' . $id . '" class="module-name table-filter-text-source">',
+      '#markup' => $module->info['name'],
+      '#suffix' => '</label>',
+      '#wrapper_attributes' => array(
+        'class' => array('module'),
+      ),
+    );
+
+    // Add the description, along with any modules it requires.
+    $description = '';
+    if ($module->info['version'] || $row['#requires'] || $row['#required_by']) {
+      $description .= ' <div class="requirements">';
+      if ($module->info['version']) {
+        $description .= '<div class="admin-requirements">' . t('Version: !module-version', array('!module-version' => $module->info['version'])) . '</div>';
+      }
+      if ($row['#requires']) {
+        $description .= '<div class="admin-requirements">' . t('Requires: !module-list', array('!module-list' => implode(', ', $row['#requires']))) . '</div>';
+      }
+      if ($row['#required_by']) {
+        $description .= '<div class="admin-requirements">' . t('Required by: !module-list', array('!module-list' => implode(', ', $row['#required_by']))) . '</div>';
+      }
+      $description .= '</div>';
+    }
+
+    $links = '';
+    foreach (array('help', 'permissions', 'configure') as $key) {
+      $links .= (isset($row['links'][$key]) ? drupal_render($row['links'][$key]) : '');
+    }
+
+    if ($links) {
+      $description .= '  <div class="links">';
+      $description .= $links;
+      $description .= '</div>';
+    }
+
+    $row['description'] = array(
+      '#type' => 'details',
+      '#title' => '<span class="text"> ' . t($module->info['description']) . '</span>',
+      '#attributes' => array('id' => $id . '-description'),
+      '#description' => $description,
+      '#collapsed' => TRUE,
+    );
+
     return $row;
   }
 
@@ -341,6 +397,7 @@ protected function buildModuleList(array $form_state) {
 
     // First, build a list of all modules that were selected.
     foreach ($packages as $items) {
+      unset($items['table']);
       foreach ($items as $name => $checkbox) {
         if ($checkbox['enable'] && !$this->moduleHandler->moduleExists($name)) {
           $modules['install'][$name] = $data[$name]->info['name'];
diff --git a/core/modules/system/lib/Drupal/system/Form/ModulesUninstallForm.php b/core/modules/system/lib/Drupal/system/Form/ModulesUninstallForm.php
index 93bf906..fc0438d 100644
--- a/core/modules/system/lib/Drupal/system/Form/ModulesUninstallForm.php
+++ b/core/modules/system/lib/Drupal/system/Form/ModulesUninstallForm.php
@@ -87,35 +87,51 @@ public function buildForm(array $form, array &$form_state) {
     // Sort all modules by their name.
     uasort($uninstallable, 'system_sort_modules_by_info_name');
 
-    $form['uninstall'] = array('#tree' => TRUE);
+    $form['uninstall'] = array(
+      '#type' => 'table',
+      '#header' => array(t('Uninstall'), t('Name'), t('Description')),
+      '#empty' => t('There are no items yet. <a href="@add-url">Disable a module</a>', array(
+        '@add-url' => url('admin/modules'),
+      )),
+      '#tableselect' => TRUE,
+    );
+
     foreach ($uninstallable as $module) {
       $name = $module->info['name'] ?: $module->name;
-      $form['modules'][$module->name]['#module_name'] = $name;
-      $form['modules'][$module->name]['name']['#markup'] = $name;
-      $form['modules'][$module->name]['description']['#markup'] = $this->t($module->info['description']);
-
-      $form['uninstall'][$module->name] = array(
-        '#type' => 'checkbox',
-        '#title' => $this->t('Uninstall @module module', array('@module' => $name)),
-        '#title_display' => 'invisible',
-      );
+      $form['uninstall'][$module->name]['name']['#markup'] = $name;
+      $form['uninstall'][$module->name]['description']['#markup'] = $this->t($module->info['description']);
 
       // All modules which depend on this one must be uninstalled first, before
       // we can allow this module to be uninstalled. (The installation profile
       // is excluded from this list.)
+      $required_modules = array();
       foreach (array_keys($module->required_by) as $dependent) {
         if ($dependent != $profile && drupal_get_installed_schema_version($dependent) != SCHEMA_UNINSTALLED) {
           $name = isset($modules[$dependent]->info['name']) ? $modules[$dependent]->info['name'] : $dependent;
           $form['modules'][$module->name]['#required_by'][] = $name;
           $form['uninstall'][$module->name]['#disabled'] = TRUE;
+          $required_modules[] = $name;
         }
       }
+
+      if (!empty($required_modules)) {
+        $disabled_message = format_plural(count($required_modules),
+        'To uninstall @module, the following module must be uninstalled first: @required_modules',
+        'To uninstall @module, the following modules must be uninstalled first: @required_modules',
+        array('@module' => $module->name, '@required_modules' => implode(', ', $required_modules)));
+        $disabled_message = '<div class="admin-requirements">' . $disabled_message . '</div>';
+      }
+      else {
+        $disabled_message = '';
+      }
+      $form['uninstall'][$module->name]['uninstall']['#markup'] = t($disabled_message);
     }
 
     $form['actions'] = array('#type' => 'actions');
     $form['actions']['submit'] = array(
       '#type' => 'submit',
       '#value' => $this->t('Uninstall'),
+      '#tableselect' => TRUE,
     );
 
     return $form;
diff --git a/core/modules/system/system.admin.inc b/core/modules/system/system.admin.inc
index 4a6005d..1963f67 100644
--- a/core/modules/system/system.admin.inc
+++ b/core/modules/system/system.admin.inc
@@ -328,86 +328,6 @@ function template_preprocess_status_report(&$variables) {
 }
 
 /**
- * Returns HTML for the modules form.
- *
- * @param $variables
- *   An associative array containing:
- *   - form: A render element representing the form.
- *
- * @ingroup themeable
- */
-function theme_system_modules_details($variables) {
-  $form = $variables['form'];
-
-  // Individual table headers.
-  $rows = array();
-  // Iterate through all the modules, which are children of this element.
-  foreach (element_children($form) as $key) {
-    // Stick the key into $module for easier access.
-    $module = $form[$key];
-    // Create the row for the table.
-    $row = array();
-    // Add the checkbox into the first cell.
-    unset($module['enable']['#title']);
-    $module['#requires'] = array_filter($module['#requires']);
-    $module['#required_by'] = array_filter($module['#required_by']);
-
-    $requires = !empty($module['#requires']);
-    $required_by = !empty($module['#required_by']);
-    $version = !empty($module['version']['#markup']);
-
-    $row[] = array('class' => array('checkbox'), 'data' => drupal_render($module['enable']));
-
-    // Add the module label and expand/collapse functionalty.
-    $col2 = '<label id="module-' . $key . '" for="' . $module['enable']['#id'] . '" class="module-name table-filter-text-source">' . drupal_render($module['name']) . '</label>';
-    $row[] = array('class' => array('module'), 'data' => $col2);
-
-    // Add the description, along with any modules it requires.
-    $description = '';
-    if ($version || $requires || $required_by) {
-      $description .= ' <div class="requirements">';
-      if ($version) {
-        $description .= '<div class="admin-requirements">' . t('Version: !module-version', array('!module-version' => drupal_render($module['version']))) . '</div>';
-      }
-      if ($requires) {
-        $description .= '<div class="admin-requirements">' . t('Requires: !module-list', array('!module-list' => implode(', ', $module['#requires']))) . '</div>';
-      }
-      if ($required_by) {
-        $description .= '<div class="admin-requirements">' . t('Required by: !module-list', array('!module-list' => implode(', ', $module['#required_by']))) . '</div>';
-      }
-      $description .= '</div>';
-    }
-    $links = '';
-    foreach (array('help', 'permissions', 'configure') as $key) {
-      $links .= drupal_render($module['links'][$key]);
-    }
-    if ($links) {
-      $description .= '  <div class="links">';
-      $description .= $links;
-      $description .= '</div>';
-    }
-    $details = array(
-      '#type' => 'details',
-      '#title' => '<span class="text"> ' . drupal_render($module['description']) . '</span>',
-      '#attributes' => array('id' => $module['enable']['#id'] . '-description'),
-      '#description' => $description,
-      '#collapsed' => TRUE,
-    );
-    $col4 = drupal_render($details);
-    $row[] = array('class' => array('description', 'expand'), 'data' => $col4);
-
-    $rows[] = $row;
-  }
-
-  $table = array(
-    '#theme' => 'table',
-    '#header' => $form['#header'],
-    '#rows' => $rows,
-  );
-  return drupal_render($table);
-}
-
-/**
  * Returns HTML for a message about incompatible modules.
  *
  * @param $variables
@@ -421,61 +341,6 @@ function theme_system_modules_incompatible($variables) {
 }
 
 /**
- * Returns HTML for a table of currently disabled modules.
- *
- * @param $variables
- *   An associative array containing:
- *   - form: A render element representing the form.
- *
- * @ingroup themeable
- */
-function theme_system_modules_uninstall($variables) {
-  $form = $variables['form'];
-
-  // No theming for the confirm form.
-  if (isset($form['confirm'])) {
-    return drupal_render($form);
-  }
-
-  // Table headers.
-  $header = array(t('Uninstall'),
-    t('Name'),
-    t('Description'),
-  );
-
-  // Display table.
-  $rows = array();
-  foreach (element_children($form['modules']) as $module) {
-    if (!empty($form['modules'][$module]['#required_by'])) {
-      $disabled_message = format_plural(count($form['modules'][$module]['#required_by']),
-        'To uninstall @module, the following module must be uninstalled first: @required_modules',
-        'To uninstall @module, the following modules must be uninstalled first: @required_modules',
-        array('@module' => $form['modules'][$module]['#module_name'], '@required_modules' => implode(', ', $form['modules'][$module]['#required_by'])));
-      $disabled_message = '<div class="admin-requirements">' . $disabled_message . '</div>';
-    }
-    else {
-      $disabled_message = '';
-    }
-    $rows[] = array(
-      array('data' => drupal_render($form['uninstall'][$module]), 'align' => 'center'),
-      '<strong><label for="' . $form['uninstall'][$module]['#id'] . '">' . drupal_render($form['modules'][$module]['name']) . '</label></strong>',
-      array('data' => drupal_render($form['modules'][$module]['description']) . $disabled_message, 'class' => array('description')),
-    );
-  }
-
-  $table = array(
-    '#theme' => 'table',
-    '#header' => $header,
-    '#rows' => $rows,
-    '#empty' => t('No modules are available to uninstall.'),
-  );
-  $output  = drupal_render($table);
-  $output .= drupal_render_children($form);
-
-  return $output;
-}
-
-/**
  * Returns HTML for the Appearance page.
  *
  * @param $variables
diff --git a/core/modules/system/system.module b/core/modules/system/system.module
index 1657f9f..c9281fa 100644
--- a/core/modules/system/system.module
+++ b/core/modules/system/system.module
@@ -165,18 +165,10 @@ function system_theme() {
     'confirm_form' => array(
       'render element' => 'form',
     ),
-    'system_modules_details' => array(
-      '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(
       'variables' => array('requirements' => NULL),
       'file' => 'system.admin.inc',