diff --git a/core/modules/color/color.module b/core/modules/color/color.module
index dd48e4a..1cab4b0 100644
--- a/core/modules/color/color.module
+++ b/core/modules/color/color.module
@@ -118,6 +118,7 @@ function color_block_view_system_branding_block_alter(array &$build, BlockPlugin
  */
 function color_block_view_pre_render(array $build) {
   $theme_key = \Drupal::theme()->getActiveTheme()->getName();
+  $build['#cache']['tags'][] = 'config:color.theme.' . $theme_key;
 
   // Override logo.
   $logo = \Drupal::config('color.theme.' . $theme_key)->get('logo');
@@ -193,7 +194,6 @@ function color_get_palette($theme, $default = FALSE) {
  * @see color_scheme_form_submit()
  */
 function color_scheme_form($complete_form, FormStateInterface $form_state, $theme) {
-  $base = drupal_get_path('module', 'color');
   $info = color_get_info($theme);
 
   $info['schemes'][''] = array('title' => t('Custom'), 'colors' => array());
@@ -429,6 +429,8 @@ function color_scheme_form_submit($form, FormStateInterface $form_state) {
   // No change in color config, use the standard theme from color.inc.
   if (implode(',', color_get_palette($theme, TRUE)) == implode(',', $palette)) {
     $config->delete();
+    // Clear the library cache.
+    Cache::invalidateTags(['library_info']);
     return;
   }
 
diff --git a/core/modules/page_cache/src/Tests/PageCacheTagsIntegrationTest.php b/core/modules/page_cache/src/Tests/PageCacheTagsIntegrationTest.php
index 22ae7b2..ab1c8f2 100644
--- a/core/modules/page_cache/src/Tests/PageCacheTagsIntegrationTest.php
+++ b/core/modules/page_cache/src/Tests/PageCacheTagsIntegrationTest.php
@@ -105,6 +105,7 @@ function testPageCacheTags() {
       'user:0',
       'user:' . $author_1->id(),
       'config:filter.format.basic_html',
+      'config:color.theme.bartik',
       'config:search.settings',
       'config:system.menu.account',
       'config:system.menu.tools',
@@ -142,6 +143,7 @@ function testPageCacheTags() {
       'node_view',
       'node:' . $node_2->id(),
       'user:' . $author_2->id(),
+      'config:color.theme.bartik',
       'config:filter.format.full_html',
       'config:search.settings',
       'config:system.menu.account',