diff --git a/core/modules/system/src/Form/ModulesListForm.php b/core/modules/system/src/Form/ModulesListForm.php
index 1fa64f5..7ab587e 100644
--- a/core/modules/system/src/Form/ModulesListForm.php
+++ b/core/modules/system/src/Form/ModulesListForm.php
@@ -194,19 +194,22 @@ public function buildForm(array $form, FormStateInterface $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),
-        '#open' => TRUE,
-        '#theme' => 'system_modules_details',
+      $table = array(
+        '#type' => 'table',
         '#header' => array(
           array('data' => $this->t('Installed'), 'class' => array('checkbox', 'visually-hidden')),
           array('data' => $this->t('Name'), 'class' => array('name', 'visually-hidden')),
           array('data' => $this->t('Description'), 'class' => array('description', 'visually-hidden', RESPONSIVE_PRIORITY_LOW)),
         ),
-        '#attributes' => array('class' => array('package-listing')),
+      ) + $form['modules'][$package];
+      $form['modules'][$package] = array(
+        '#type' => 'details',
+        '#title' => $this->t($package),
+        '#open' => TRUE,
         // Ensure that the "Core" package comes first.
         '#weight' => $package == 'Core' ? -10 : NULL,
+        '#attributes' => array('class' => array('package-listing')),
+        'table' => $table,
       );
     }
 
@@ -237,31 +240,33 @@ public function buildForm(array $form, FormStateInterface $form_state) {
    */
   protected function buildRow(array $modules, Extension $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;
 
     // Generate link for module's help page, if there is one.
-    $row['links']['help'] = array();
+    $row_links['help'] = array();
     if ($this->moduleHandler->moduleExists('help') && $module->status && in_array($module->getName(), $this->moduleHandler->getImplementations('help'))) {
       if ($this->moduleHandler->invoke($module->getName(), 'help', array('help.page.' . $module->getName(), $this->routeMatch))) {
-        $row['links']['help'] = array(
+        $row_links['help'] = array(
           '#type' => 'link',
           '#title' => $this->t('Help'),
           '#href' => 'admin/help/' . $module->getName(),
-          '#options' => array('attributes' => array('class' =>  array('module-link', 'module-link-help'), 'title' => $this->t('Help'))),
+          '#options' => array(
+            'attributes' => array(
+            'id' => 'edit-modules-core-' . $module->name . '-links-help',
+            'class' => array('module-link', 'module-link-help'),
+            'title' => $this->t('Help'),
+            ),
+          ),
         );
       }
     }
 
     // Generate link for module's permission, if the user has access to it.
-    $row['links']['permissions'] = array();
+    $row_links['permissions'] = array();
     if ($module->status && \Drupal::currentUser()->hasPermission('administer permissions') && in_array($module->getName(), $this->moduleHandler->getImplementations('permission'))) {
-      $row['links']['permissions'] = array(
+      $row_links['permissions'] = array(
         '#type' => 'link',
         '#title' => $this->t('Permissions'),
         '#href' => 'admin/people/permissions',
@@ -270,7 +275,7 @@ protected function buildRow(array $modules, Extension $module, $distribution) {
     }
 
     // Generate link for module's configuration page, if it has one.
-    $row['links']['configure'] = array();
+    $row_links['configure'] = array();
     if ($module->status && isset($module->info['configure'])) {
       $route_parameters = isset($module->info['configure_parameters']) ? $module->info['configure_parameters'] : array();
       if ($this->accessManager->checkNamedRoute($module->info['configure'], $route_parameters, $this->currentUser)) {
@@ -292,7 +297,7 @@ protected function buildRow(array $modules, Extension $module, $distribution) {
           $description = $this->titleResolver->getTitle($request, $route_object);
         }
 
-        $row['links']['configure'] = array(
+        $row_links['configure'] = array(
           '#type' => 'link',
           '#title' => $this->t('Configure'),
           '#route_name' => $module->info['configure'],
@@ -310,7 +315,7 @@ protected function buildRow(array $modules, Extension $module, $distribution) {
     // Present a checkbox for installing and indicating the status of a module.
     $row['enable'] = array(
       '#type' => 'checkbox',
-      '#title' => $this->t('Install'),
+      '#wrapper_attributes' => array('class' => array('checkbox')),
       '#default_value' => (bool) $module->status,
       '#disabled' => (bool) $module->status,
     );
@@ -404,6 +409,64 @@ protected function buildRow(array $modules, Extension $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(
+      '#id' => $id,
+      '#parents' => array('modules', $module->info['package'], $module->name, 'enable'),
+    );
+
+    // Add the module label and expand/collapse functionality.
+    $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">' . $this->t('Version: !module-version', array('!module-version' => $module->info['version'])) . '</div>';
+      }
+      if ($row['#requires']) {
+        $description .= '<div class="admin-requirements">' . $this->t('Requires: !module-list', array('!module-list' => implode(', ', $row['#requires']))) . '</div>';
+      }
+      if ($row['#required_by']) {
+        $description .= '<div class="admin-requirements">' . $this->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"> ' . $this->t($module->info['description']) . '</span>',
+      '#attributes' => array('id' => $id . '-description'),
+      '#description' => $description,
+      '#collapsed' => TRUE,
+      '#wrapper_attributes' => array(
+        'class' => array('description', 'expand'),
+      ),
+    );
+
     return $row;
   }
 
@@ -436,6 +499,7 @@ protected function buildModuleList(FormStateInterface $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/src/Form/ModulesUninstallForm.php b/core/modules/system/src/Form/ModulesUninstallForm.php
index 4285956..6b20ef0 100644
--- a/core/modules/system/src/Form/ModulesUninstallForm.php
+++ b/core/modules/system/src/Form/ModulesUninstallForm.php
@@ -98,7 +98,22 @@ public function buildForm(array $form, FormStateInterface $form_state) {
       ),
     );
 
-    $form['modules'] = array();
+    $profile = drupal_get_profile();
+
+    // Sort all modules by their name.
+    if(!empty($uninstallable)) {
+      uasort($uninstallable, 'system_sort_modules_by_info_name');
+    }
+
+    $form['uninstall'] = array(
+      '#type' => 'table',
+      '#header' => array(
+        'title' => array('data' => $this->t('Name')),
+        'description' => array('data' => $this->t('Description')),
+      ),
+      '#empty' => $this->t('There are no items available to uninstall.'),
+      '#tableselect' => TRUE,
+    );
 
     // Only build the rest of the form if there are any modules available to
     // uninstall;
@@ -106,34 +121,40 @@ public function buildForm(array $form, FormStateInterface $form_state) {
       return $form;
     }
 
-    $profile = drupal_get_profile();
-
-    // Sort all modules by their name.
-    uasort($uninstallable, 'system_sort_modules_by_info_name');
-
-    $form['uninstall'] = array('#tree' => TRUE);
     foreach ($uninstallable as $module) {
-      $name = $module->info['name'] ?: $module->getName();
-      $form['modules'][$module->getName()]['#module_name'] = $name;
-      $form['modules'][$module->getName()]['name']['#markup'] = $name;
-      $form['modules'][$module->getName()]['description']['#markup'] = $this->t($module->info['description']);
-
-      $form['uninstall'][$module->getName()] = array(
-        '#type' => 'checkbox',
-        '#title' => $this->t('Uninstall @module module', array('@module' => $name)),
-        '#title_display' => 'invisible',
+      // Define <label> element for autogenerated checkbox.
+      $form['uninstall'][$module->getName()]['title']['#type'] = 'label';
+      $form['uninstall'][$module->getName()]['title']['#title'] = $module->info['name'] ?: $module->getName();
+
+      $form['uninstall'][$module->getName()]['description'] = array(
+        '#markup' => $this->t($module->info['description']),
+        '#wrapper_attributes' => array(
+          'class' => array('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->getName()]['#required_by'][] = $name;
           $form['uninstall'][$module->getName()]['#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->getName(), '@required_modules' => implode(', ', $required_modules)));
+        $disabled_message = '<div class="admin-requirements">' . $disabled_message . '</div>';
+        }
+      else {
+        $disabled_message = '';
+        }
+      $form['uninstall'][$module->getName()]['description']['uninstall']['#markup'] = $this->t($disabled_message);
     }
 
     $form['#attached']['library'][] = 'system/drupal.system.modules';
diff --git a/core/modules/system/system.admin.inc b/core/modules/system/system.admin.inc
index 57edc26..e67c500 100644
--- a/core/modules/system/system.admin.inc
+++ b/core/modules/system/system.admin.inc
@@ -279,77 +279,6 @@ function theme_system_modules_details($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'])));
-    }
-    else {
-      $disabled_message = '';
-    }
-    $rows[] = array(
-      array('data' => drupal_render($form['uninstall'][$module]), 'align' => 'center'),
-      array(
-        'data' => array(
-          '#type' => 'inline_template',
-          '#template' => '<label for="{{ module_id }}" class="module-name table-filter-text-source">{{ module_name }}</label>',
-          '#context' => array('module_id' => $form['uninstall'][$module]['#id'], 'module_name' => drupal_render($form['modules'][$module]['name'])),
-        )
-      ),
-      array(
-        'data' => array(
-          '#type' => 'inline_template',
-          '#template' => '{{ module_description }} {% if disabled_message is not empty %} <div class="admin-requirements">{{ disabled_message }}</div> {% endif %}',
-          '#context' => array(
-            'module_description' => drupal_render($form['modules'][$module]['description']),
-            'disabled_message' => $disabled_message,
-          ),
-        ),
-        'class' => array('description'),
-      ),
-    );
-  }
-
-  $table = array(
-    '#type' => 'table',
-    '#header' => $header,
-    '#rows' => $rows,
-    '#empty' => t('No modules are available to uninstall.'),
-  );
-  $output = drupal_render($form['filters']);
-  $output .= drupal_render($table);
-  $output .= drupal_render_children($form);
-
-  return $output;
-}
-
-/**
  * Prepares variables for appearance page templates.
  *
  * Default template: system-themes-page.html.twig.
diff --git a/core/modules/system/system.module b/core/modules/system/system.module
index 54deb65..08c608a 100644
--- a/core/modules/system/system.module
+++ b/core/modules/system/system.module
@@ -177,14 +177,6 @@ function system_theme() {
       'render element' => 'form',
       'template' => 'confirm-form',
     ),
-    'system_modules_details' => array(
-      'render element' => 'form',
-      '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',