diff --git a/core/modules/system/lib/Drupal/system/Controller/ThemeController.php b/core/modules/system/lib/Drupal/system/Controller/ThemeController.php
index 6b42cca..61d931c 100644
--- a/core/modules/system/lib/Drupal/system/Controller/ThemeController.php
+++ b/core/modules/system/lib/Drupal/system/Controller/ThemeController.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\system\Controller;
 
-use Drupal\Core\Config\ConfigFactory;
+use Drupal\Core\Config\Config;
 use Drupal\Core\Controller\ControllerInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
@@ -20,20 +20,20 @@
 class ThemeController implements ControllerInterface {
 
   /**
-   * The config factory for getting the current system and admin themes.
+   * The system.theme config object.
    *
-   * @var \Drupal\Core\Config\ConfigFactory
+   * @var \Drupal\Core\Config\Config
    */
-  protected $configFactory;
+  protected $config;
 
   /**
    * Constructs a ThemeController object.
    *
-   * @param \Drupal\Core\Config\ConfigFactory $config_factory
-   *   The config factory.
+   * @param \Drupal\Core\Config\Config $config
+   *   The config.
    */
-  public function __construct(ConfigFactory $config_factory) {
-    $this->configFactory = $config_factory;
+  public function __construct(Config $config) {
+    $this->config = $config;
   }
 
   /**
@@ -41,7 +41,7 @@ public function __construct(ConfigFactory $config_factory) {
    */
   public static function create(ContainerInterface $container) {
     return new static(
-      $container->get('config.factory')
+      $container->get('config.factory')->get('system.theme')
     );
   }
 
@@ -69,7 +69,7 @@ public function disable(Request $request) {
       // Check if the specified theme is one recognized by the system.
       if (!empty($themes[$theme])) {
         // Do not disable the default or admin theme.
-        if ($theme === $this->configFactory->get('system.theme')->get('default') || $theme === $this->configFactory->get('system.theme')->get('admin')) {
+        if ($theme === $this->config->get('default') || $theme === $this->config->get('admin')) {
           drupal_set_message(t('%theme is the default theme and cannot be disabled.', array('%theme' => $themes[$theme]->info['name'])), 'error');
         }
         else {
@@ -81,7 +81,7 @@ public function disable(Request $request) {
         drupal_set_message(t('The %theme theme was not found.', array('%theme' => $theme)), 'error');
       }
 
-      return new RedirectResponse(url("admin/appearance", array('absolute' => TRUE)));
+      return new RedirectResponse(url('admin/appearance', array('absolute' => TRUE)));
     }
 
     throw new AccessDeniedHttpException();
@@ -117,7 +117,7 @@ public function enable(Request $request) {
         drupal_set_message(t('The %theme theme was not found.', array('%theme' => $theme)), 'error');
       }
 
-      return new RedirectResponse(url("admin/appearance", array('absolute' => TRUE)));
+      return new RedirectResponse(url('admin/appearance', array('absolute' => TRUE)));
     }
 
     throw new AccessDeniedHttpException();
diff --git a/core/modules/system/system.module b/core/modules/system/system.module
index 0443a01..3e34c4a 100644
--- a/core/modules/system/system.module
+++ b/core/modules/system/system.module
@@ -702,16 +702,6 @@ function system_menu() {
     'type' => MENU_DEFAULT_LOCAL_TASK,
     'file' => 'system.admin.inc',
   );
-  $items['admin/appearance/enable'] = array(
-    'title' => 'Enable theme',
-    'route_name' => 'system_theme_enable',
-    'type' => MENU_CALLBACK,
-  );
-  $items['admin/appearance/disable'] = array(
-    'title' => 'Disable theme',
-    'route_name' => 'system_theme_disable',
-    'type' => MENU_CALLBACK,
-  );
   $items['admin/appearance/default'] = array(
     'title' => 'Set default theme',
     'page callback' => 'system_theme_default',