diff --git a/core/lib/Drupal/Core/Extension/ModuleInstaller.php b/core/lib/Drupal/Core/Extension/ModuleInstaller.php
index e523943..ef63b04 100644
--- a/core/lib/Drupal/Core/Extension/ModuleInstaller.php
+++ b/core/lib/Drupal/Core/Extension/ModuleInstaller.php
@@ -330,7 +330,7 @@ public function uninstall(array $module_list, $uninstall_dependents = TRUE) {
       foreach ($reasons as $reason) {
         $reason_message[] = implode(', ', $reason);
       }
-      throw new ModuleUninstallValidatorException(format_string('The following reasons prevents the modules from being uninstalled: @reasons', array(
+      throw new ModuleUninstallValidatorException(format_string('The following reasons prevent the modules from being uninstalled: @reasons', array(
         '@reasons' => implode('; ', $reason_message),
       )));
     }
diff --git a/core/modules/system/css/system.admin.css b/core/modules/system/css/system.admin.css
index 1dd5da9..b4af1d0 100644
--- a/core/modules/system/css/system.admin.css
+++ b/core/modules/system/css/system.admin.css
@@ -157,7 +157,8 @@ small .admin-link:after {
   margin-bottom: 0;
 }
 .admin-requirements,
-.admin-required {
+.admin-required,
+.validation-reasons {
   font-size: 0.9em;
   color: #666;
 }
diff --git a/core/modules/system/src/Form/ModulesUninstallForm.php b/core/modules/system/src/Form/ModulesUninstallForm.php
index f72fa43..6755dca 100644
--- a/core/modules/system/src/Form/ModulesUninstallForm.php
+++ b/core/modules/system/src/Form/ModulesUninstallForm.php
@@ -7,12 +7,14 @@
 
 namespace Drupal\system\Form;
 
+use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\Extension\ModuleInstallerInterface;
 use Drupal\Core\Form\FormBase;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\KeyValueStore\KeyValueStoreExpirableInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
+use Drupal\Core\StringTranslation\TranslationInterface;
 
 /**
  * Provides a form for uninstalling modules.
@@ -41,13 +43,21 @@ class ModulesUninstallForm extends FormBase {
   protected $keyValueExpirable;
 
   /**
+   * The string translation manager.
+   *
+   * @var \Drupal\Core\StringTranslation\TranslationInterface
+   */
+  protected $stringTranslation;
+
+  /**
    * {@inheritdoc}
    */
   public static function create(ContainerInterface $container) {
     return new static(
       $container->get('module_handler'),
       $container->get('module_installer'),
-      $container->get('keyvalue.expirable')->get('modules_uninstall')
+      $container->get('keyvalue.expirable')->get('modules_uninstall'),
+      $container->get('string_translation')
     );
   }
 
@@ -60,11 +70,14 @@ public static function create(ContainerInterface $container) {
    *   The module installer.
    * @param \Drupal\Core\KeyValueStore\KeyValueStoreExpirableInterface $key_value_expirable
    *   The key value expirable factory.
+   * @param \Drupal\Core\StringTranslation\TranslationInterface $stringTranslation
+   *   The string translation manager.
    */
-  public function __construct(ModuleHandlerInterface $module_handler, ModuleInstallerInterface $module_installer, KeyValueStoreExpirableInterface $key_value_expirable) {
+  public function __construct(ModuleHandlerInterface $module_handler, ModuleInstallerInterface $module_installer, KeyValueStoreExpirableInterface $key_value_expirable, TranslationInterface $stringTranslation) {
     $this->moduleHandler = $module_handler;
     $this->moduleInstaller = $module_installer;
     $this->keyValueExpirable = $key_value_expirable;
+    $this->stringTranslation = $stringTranslation;
   }
 
   /**
@@ -110,7 +123,23 @@ 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');
+      $validation_reasons = $this->moduleInstaller->validateUninstall(array_keys($uninstallable));
+    }
+
+    $form['uninstall'] = [
+      '#type' => 'table',
+      '#header' => [
+        'title' => $this->t('Name'),
+        'description' => $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;
@@ -118,41 +147,51 @@ 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');
-    $validation_reasons = $this->moduleInstaller->validateUninstall(array_keys($uninstallable));
-
-    $form['uninstall'] = array('#tree' => TRUE);
     foreach ($uninstallable as $module_key => $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']);
+      // 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()] = array(
-        '#type' => 'checkbox',
-        '#title' => $this->t('Uninstall @module module', array('@module' => $name)),
-        '#title_display' => 'invisible',
-      );
+      $form['uninstall'][$module->getName()]['description'] = [
+        '#markup' => $this->t($module->info['description']),
+        '#wrapper_attributes' => ['class' => ['description']],
+      ];
 
       // If a validator returns reasons not to uninstall a module,
       // list the reasons and disable the check box.
       if (isset($validation_reasons[$module_key])) {
-        $form['modules'][$module->getName()]['#validation_reasons'] = $validation_reasons[$module_key];
         $form['uninstall'][$module->getName()]['#disabled'] = TRUE;
       }
       // 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 = $this->stringTranslation->formatPlural(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' => SafeMarkup::checkAdminXss(implode(', ', $required_modules))));
+        $disabled_message = SafeMarkup::format('<div class="admin-requirements">@disabled_message</div>', ['@disabled_message' => $disabled_message]);
+      }
+      else {
+        $disabled_message = '';
+      }
+      if (isset($validation_reasons[$module_key])) {
+        $disabled_message = $this->stringTranslation->formatPlural(count($validation_reasons[$module_key]),
+          'The following reason prevents @module from being uninstalled: @reasons',
+          'The following reasons prevent @module from being uninstalled: @reasons',
+          array('@module' => $module->getName(), '@reasons' => SafeMarkup::checkAdminXss(implode('; ', $validation_reasons[$module_key]))));
+        $disabled_message = SafeMarkup::format('<div class="validation-reasons">@disabled_message</div>', ['@disabled_message' => $disabled_message]);
+      }
+
+      $form['uninstall'][$module->getName()]['description']['uninstall']['#markup'] = $disabled_message;
     }
 
     $form['#attached']['library'][] = 'system/drupal.system.modules';
diff --git a/core/modules/system/src/Tests/Field/FieldModuleUninstallValidatorTest.php b/core/modules/system/src/Tests/Field/FieldModuleUninstallValidatorTest.php
index 0bed70b..be356ab 100644
--- a/core/modules/system/src/Tests/Field/FieldModuleUninstallValidatorTest.php
+++ b/core/modules/system/src/Tests/Field/FieldModuleUninstallValidatorTest.php
@@ -83,7 +83,7 @@ public function testUninstallingModule() {
     }
     catch (ModuleUninstallValidatorException $e) {
       $this->pass($message);
-      $this->assertEqual($e->getMessage(), 'The following reasons prevents the modules from being uninstalled: There is data for the field extra_base_field on entity type Test entity');
+      $this->assertEqual($e->getMessage(), 'The following reasons prevent the modules from being uninstalled: There is data for the field extra_base_field on entity type Test entity');
     }
 
     // Verify uninstalling entity_test is not possible when there is content for
diff --git a/core/modules/system/src/Tests/Module/UninstallTest.php b/core/modules/system/src/Tests/Module/UninstallTest.php
index aa8a169..4c8836a 100644
--- a/core/modules/system/src/Tests/Module/UninstallTest.php
+++ b/core/modules/system/src/Tests/Module/UninstallTest.php
@@ -56,7 +56,7 @@ function testUninstallPage() {
     $this->drupalGet('admin/modules/uninstall');
     $this->assertTitle(t('Uninstall') . ' | Drupal');
 
-    $this->assertText(\Drupal::translation()->translate('The following reason prevents Node from being uninstalled:'));
+    $this->assertText(\Drupal::translation()->translate('The following reason prevents node from being uninstalled:'));
     $this->assertText(\Drupal::translation()->translate('There is content for the entity type: Content'));
     // Delete the node to allow node to be uninstalled.
     $node->delete();
diff --git a/core/modules/system/system.admin.inc b/core/modules/system/system.admin.inc
index 276e393..65c1c95 100644
--- a/core/modules/system/system.admin.inc
+++ b/core/modules/system/system.admin.inc
@@ -278,86 +278,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) {
-    $disabled_header = '';
-    $disabled_reasons = '';
-    // Add the modules requiring the module in question as a validation reason.
-    if (!empty($form['modules'][$module]['#required_by'])) {
-      $form['modules'][$module]['#validation_reasons'][] = \Drupal::translation()->translate('Required by: @modules', array('@modules' => implode(', ',$form['modules'][$module]['#required_by'])));
-    }
-    if (!empty($form['modules'][$module]['#validation_reasons'])) {
-      $disabled_reasons = [
-        '#theme' => 'item_list',
-        '#items' => $form['modules'][$module]['#validation_reasons'],
-      ];
-      $disabled_reasons = drupal_render($disabled_reasons);
-      $disabled_header = \Drupal::translation()->formatPlural(count($form['modules'][$module]['#validation_reasons']),
-        'The following reason prevents @module from being uninstalled:',
-        'The following reasons prevents @module from being uninstalled:',
-        array('@module' => $form['modules'][$module]['#module_name']));
-    }
-    $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_header is not empty %} <div class="admin-requirements">{{ disabled_header }}{{ disabled_reasons }}</div> {% endif %}',
-          '#context' => array(
-            'module_description' => drupal_render($form['modules'][$module]['description']),
-            'disabled_header' => $disabled_header,
-            'disabled_reasons' => $disabled_reasons,
-          ),
-        ),
-        '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 96f0083..5b672fd 100644
--- a/core/modules/system/system.module
+++ b/core/modules/system/system.module
@@ -191,11 +191,6 @@ function system_theme() {
       'file' => 'system.admin.inc',
       'function' => 'theme_system_modules_details',
     ),
-    'system_modules_uninstall' => array(
-      'render element' => 'form',
-      'file' => 'system.admin.inc',
-      'function' => 'theme_system_modules_uninstall',
-    ),
     'status_report' => array(
       'variables' => array('requirements' => NULL),
       'file' => 'system.admin.inc',