diff --git a/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointThemeTest.php b/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointThemeTest.php
index 153df41..1e25edd 100644
--- a/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointThemeTest.php
+++ b/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointThemeTest.php
@@ -25,7 +25,7 @@ public static function getInfo() {
 
   public function setUp() {
     parent::setUp();
-    theme_enable(array('breakpoint_test_theme'));
+    \Drupal::service('theme_handler')->enable(array('breakpoint_test_theme'));
   }
 
   /**
@@ -53,7 +53,7 @@ public function testThemeBreakpoints() {
     $this->verifyBreakpointGroup($breakpoint_group_obj);
 
     // Disable the test theme and verify the breakpoint group is deleted.
-    theme_disable(array('breakpoint_test_theme'));
+    \Drupal::service('theme_handler')->disable(array('breakpoint_test_theme'));
     $this->assertFalse(entity_load('breakpoint_group', $breakpoint_group_obj->id()), 'breakpoint_group_load: Loading a deleted breakpoint group returns false.', 'Breakpoint API');
   }
 
@@ -81,7 +81,7 @@ public function testThemeBreakpointGroup() {
     $this->verifyBreakpointGroup($breakpoint_group_obj);
 
     // Disable the test theme and verify the breakpoint group is deleted.
-    theme_disable(array('breakpoint_test_theme'));
+    \Drupal::service('theme_handler')->disable(array('breakpoint_test_theme'));
     $this->assertFalse(entity_load('breakpoint_group', $breakpoint_group_obj->id()), 'breakpoint_group_load: Loading a deleted breakpoint group returns false.', 'Breakpoint API');
   }
 
diff --git a/core/modules/color/lib/Drupal/color/Tests/ColorTest.php b/core/modules/color/lib/Drupal/color/Tests/ColorTest.php
index 2e14d68..9eec044 100644
--- a/core/modules/color/lib/Drupal/color/Tests/ColorTest.php
+++ b/core/modules/color/lib/Drupal/color/Tests/ColorTest.php
@@ -52,7 +52,7 @@ function setUp() {
         'scheme_color' => '#3b3b3b',
       ),
     );
-    theme_enable(array_keys($this->themes));
+    \Drupal::service('theme_handler')->enable(array_keys($this->themes));
 
     // Array filled with valid and not valid color values
     $this->colorTests = array(
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentLinksTest.php b/core/modules/comment/lib/Drupal/comment/Tests/CommentLinksTest.php
index cf7af82..d41bdd0 100644
--- a/core/modules/comment/lib/Drupal/comment/Tests/CommentLinksTest.php
+++ b/core/modules/comment/lib/Drupal/comment/Tests/CommentLinksTest.php
@@ -47,7 +47,7 @@ public static function getInfo() {
    */
   function testCommentLinks() {
     // Bartik theme alters comment links, so use a different theme.
-    theme_enable(array('stark'));
+    \Drupal::service('theme_handler')->enable(array('stark'));
     \Drupal::config('system.theme')
       ->set('default', 'stark')
       ->save();
diff --git a/core/modules/comment/tests/Drupal/comment/Tests/Entity/CommentLockTest.php b/core/modules/comment/tests/Drupal/comment/Tests/Entity/CommentLockTest.php
index 1d54be4..a0afe1a 100644
--- a/core/modules/comment/tests/Drupal/comment/Tests/Entity/CommentLockTest.php
+++ b/core/modules/comment/tests/Drupal/comment/Tests/Entity/CommentLockTest.php
@@ -54,7 +54,6 @@ public function testLocks() {
     unset($methods[array_search('preSave', $methods)]);
     unset($methods[array_search('postSave', $methods)]);
     $methods[] = 'onSaveOrDelete';
-    $methods[] = 'onUpdateBundleEntity';
     $comment = $this->getMockBuilder('Drupal\comment\Entity\Comment')
       ->disableOriginalConstructor()
       ->setMethods($methods)
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/ThemeTest.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/ThemeTest.php
index ee8cc38..b5ca140 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/ThemeTest.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/ThemeTest.php
@@ -25,7 +25,7 @@ function setUp() {
 
     // Make sure we are using distinct default and administrative themes for
     // the duration of these tests.
-    theme_enable(array('bartik', 'seven'));
+    \Drupal::service('theme_handler')->enable(array('bartik','seven'));
     \Drupal::config('system.theme')
       ->set('default', 'bartik')
       ->set('admin', 'seven')
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/VocabularyStorageController.php b/core/modules/taxonomy/lib/Drupal/taxonomy/VocabularyStorageController.php
index 249b0b8..e98c36f 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/VocabularyStorageController.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/VocabularyStorageController.php
@@ -16,11 +16,12 @@
 class VocabularyStorageController extends ConfigStorageController implements VocabularyStorageControllerInterface {
 
   /**
-   * {@inheritdoc}
+   * Overrides Drupal\Core\Config\Entity\ConfigStorageController::resetCache().
    */
   public function resetCache(array $ids = NULL) {
     drupal_static_reset('taxonomy_vocabulary_get_names');
     parent::resetCache($ids);
+    Cache::invalidateTags(array('content' => TRUE));
     entity_info_cache_clear();
   }
 
diff --git a/core/modules/tour/lib/Drupal/tour/Tests/TourTestBasic.php b/core/modules/tour/lib/Drupal/tour/Tests/TourTestBasic.php
index e6da900..3194d6f 100644
--- a/core/modules/tour/lib/Drupal/tour/Tests/TourTestBasic.php
+++ b/core/modules/tour/lib/Drupal/tour/Tests/TourTestBasic.php
@@ -53,7 +53,7 @@ protected function setUp() {
       ->get('system.theme')
       ->set('default', 'bartik')
       ->save();
-    theme_enable(array('seven'));
+    \Drupal::service('theme_handler')->enable(array('seven'));
     $this->container->get('config.factory')
       ->get('system.theme')
       ->set('admin', 'seven')
diff --git a/core/modules/update/lib/Drupal/update/Tests/UpdateContribTest.php b/core/modules/update/lib/Drupal/update/Tests/UpdateContribTest.php
index a184092..4adab8a 100644
--- a/core/modules/update/lib/Drupal/update/Tests/UpdateContribTest.php
+++ b/core/modules/update/lib/Drupal/update/Tests/UpdateContribTest.php
@@ -168,7 +168,7 @@ function testUpdateContribOrder() {
    */
   function testUpdateBaseThemeSecurityUpdate() {
     // Only enable the subtheme, not the base theme.
-    theme_enable(array('update_test_subtheme'));
+    \Drupal::service('theme_handler')->enable(array('update_test_subtheme'));
 
     // Define the initial state for core and the subtheme.
     $system_info = array(
@@ -271,7 +271,7 @@ function testUpdateHiddenBaseTheme() {
     module_load_include('compare.inc', 'update');
 
     // Enable the subtheme.
-    theme_enable(array('update_test_subtheme'));
+    \Drupal::service('theme_handler')->enable(array('update_test_subtheme'));
 
     // Add a project and initial state for base theme and subtheme.
     $system_info = array(
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Form/BasicSettingsForm.php b/core/modules/views_ui/lib/Drupal/views_ui/Form/BasicSettingsForm.php
index caade6e..7cbee4e 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/Form/BasicSettingsForm.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Form/BasicSettingsForm.php
@@ -29,7 +29,7 @@ public function buildForm(array $form, array &$form_state) {
 
     $config = $this->configFactory->get('views.settings');
     $options = array();
-    foreach (list_themes() as $name => $theme) {
+    foreach (\Drupal::service('theme_handler')->listInfo() as $name => $theme) {
       if ($theme->status) {
         $options[$name] = $theme->info['name'];
       }
diff --git a/core/profiles/standard/standard.install b/core/profiles/standard/standard.install
index bec1107..849af9e 100644
--- a/core/profiles/standard/standard.install
+++ b/core/profiles/standard/standard.install
@@ -20,8 +20,9 @@ function standard_install() {
   \Drupal::config('system.theme')
     ->set('default', $default_theme)
     ->save();
-  theme_enable(array($default_theme));
-  theme_disable(array('stark'));
+  $theme_handler = \Drupal::service('theme_handler');
+  $theme_handler->enable(array($default_theme));
+  $theme_handler->disable(array('stark'));
 
   // Set front page to "node".
   \Drupal::config('system.site')->set('page.front', 'node')->save();
@@ -78,7 +79,7 @@ function standard_install() {
   $shortcut->save();
 
   // Enable the admin theme.
-  theme_enable(array('seven'));
+  $theme_handler->enable(array('seven'));
   \Drupal::config('system.theme')->set('admin', 'seven')->save();
   \Drupal::config('node.settings')->set('use_admin_theme', '1')->save();
 }