2c2
< index 31bebf9..34fcba2 100644
---
> index 31bebf9..8b7aca3 100644
5,6c5
< @@ -197,8 +197,8 @@ class BackgroundImageManager implements BackgroundImageManagerInterface {
<     * {@inheritdoc}
---
> @@ -198,7 +198,7 @@ class BackgroundImageManager implements BackgroundImageManagerInterface {
9c8
< -    file_scan_directory('public://background_image/css', '/.*/', ['callback' => function ($uri) {
---
>      file_scan_directory('public://background_image/css', '/.*/', ['callback' => function ($uri) {
11d9
< +    $this->fileSystem->scanDirectory('public://background_image/css', '/.*/', ['callback' => function ($uri) {
17c15
< index 0535b09..cd62cc7 100644
---
> index 0535b09..9812f85 100644
115c113
< +    $valid = !empty($background_image) && \Drupal::service('stream_wrapper_manager')->isValidScheme($scheme) && $background_image->access('view');
---
> +    $valid = !empty($background_image) && $this->fileSystem->validScheme($scheme) && $background_image->access('view');
120c118
< index ccf6d35..4839c53 100644
---
> index ccf6d35..59da196 100644
123,128c121
< @@ -13,6 +13,7 @@ use Drupal\Core\Entity\EntityInterface;
<  use Drupal\Core\Entity\EntityStorageInterface;
<  use Drupal\Core\Entity\EntityTypeInterface;
<  use Drupal\Core\Field\BaseFieldDefinition;
< +use Drupal\Core\Link;
<  use Drupal\Core\StringTranslation\StringTranslationTrait;
---
> @@ -17,6 +17,7 @@ use Drupal\Core\StringTranslation\StringTranslationTrait;
131,139c124,128
< @@ -310,7 +311,7 @@ class BackgroundImage extends ContentEntityBase implements BackgroundImageInterf
<     * {@inheritdoc}
<     */
<    public function getCssUri() {
< -    $default_scheme = file_default_scheme();
< +    $default_scheme = \Drupal::config('system.file')->get('default_scheme');
<      $min = $this->getBackgroundImageManager()->useMinifiedCssUri() ? '.min' : '';
<      return "$default_scheme://background_image/css/{$this->id()}/$default_scheme/{$this->getImageHash()}$min.css";
<    }
---
>  use Symfony\Component\DependencyInjection\ContainerAwareTrait;
> +use Drupal\Core\Link;
>  
>  /**
>   * Defines the Background Image entity.
150c139
< index f547fdb..d688076 100644
---
> index f547fdb..f68ca7a 100644
153,155c142
< @@ -9,6 +9,7 @@ use Drupal\Component\Utility\NestedArray;
<  use Drupal\Core\DependencyInjection\DependencySerializationTrait;
<  use Drupal\Core\Entity\EntityInterface;
---
> @@ -11,6 +11,7 @@ use Drupal\Core\Entity\EntityInterface;
157d143
< +use Drupal\Core\Messenger\MessengerTrait;
159a146,148
> +use Drupal\Core\Messenger\MessengerTrait;
>  
>  class BackgroundImageForm {
161,162c150
< @@ -19,6 +20,7 @@ class BackgroundImageForm {
<      setSubformState as traitSetSubformState;
---
> @@ -20,6 +21,7 @@ class BackgroundImageForm {
165d152
< +  use MessengerTrait;
166a154
> +  use MessengerTrait;
168a157
>     * @var \Drupal\background_image\BackgroundImageInterface