diff --git a/config/install/field.field.media.image.category.yml b/config/install/field.field.media.image.category.yml
index 9584452..3444e82 100644
--- a/config/install/field.field.media.image.category.yml
+++ b/config/install/field.field.media.image.category.yml
@@ -1,17 +1,27 @@
+langcode: und
+status: true
+dependencies:
+  config:
+    - field.storage.media.category
+    - media_entity.bundle.image
+  module:
+    - entity_reference
 id: media.image.category
+field_name: category
 entity_type: media
 bundle: image
-field_name: category
-field_type: taxonomy_term_reference
 label: Category
 description: 'Select category media belongs to.'
 required: true
+translatable: true
 default_value: {  }
-default_value_callback: 'media_pinkeye_category_default_value'
-settings: {  }
-status: true
-langcode: und
-dependencies:
-  config:
-    - field.storage.media.category
-    - media_entity.bundle.image
+default_value_callback: media_pinkeye_category_default_value
+settings:
+  handler: 'default:taxonomy_term'
+  handler_settings:
+    target_bundles:
+      media: media
+    sort:
+      field: _none
+    auto_create: false
+field_type: entity_reference
diff --git a/config/install/field.field.media.image.image.yml b/config/install/field.field.media.image.image.yml
index 93e8c57..c344d50 100644
--- a/config/install/field.field.media.image.image.yml
+++ b/config/install/field.field.media.image.image.yml
@@ -33,5 +33,5 @@ settings:
     width: null
     height: null
   handler: default
-third_party_settings: {  }
+  handler_settings: {  }
 field_type: image
diff --git a/config/install/field.field.media.instagram.category.yml b/config/install/field.field.media.instagram.category.yml
index f17a00e..e29388e 100644
--- a/config/install/field.field.media.instagram.category.yml
+++ b/config/install/field.field.media.instagram.category.yml
@@ -1,17 +1,27 @@
+langcode: und
+status: true
+dependencies:
+  config:
+    - field.storage.media.category
+    - media_entity.bundle.instagram
+  module:
+    - entity_reference
 id: media.instagram.category
+field_name: category
 entity_type: media
 bundle: instagram
-field_name: category
-field_type: taxonomy_term_reference
 label: Category
 description: 'Select category media belongs to.'
 required: true
+translatable: true
 default_value: {  }
-default_value_callback: 'media_pinkeye_category_default_value'
-settings: {  }
-status: true
-langcode: und
-dependencies:
-  config:
-    - field.storage.media.category
-    - media_entity.bundle.instagram
+default_value_callback: media_pinkeye_category_default_value
+settings:
+  handler: 'default:taxonomy_term'
+  handler_settings:
+    target_bundles:
+      media: media
+    sort:
+      field: _none
+    auto_create: false
+field_type: entity_reference
diff --git a/config/install/field.field.media.instagram.instagram.yml b/config/install/field.field.media.instagram.instagram.yml
index 88cfe52..2a51aa0 100644
--- a/config/install/field.field.media.instagram.instagram.yml
+++ b/config/install/field.field.media.instagram.instagram.yml
@@ -8,12 +8,11 @@ id: media.instagram.instagram
 field_name: instagram
 entity_type: media
 bundle: instagram
-label: Instagram post
+label: 'Instagram post'
 description: 'Paste media post URL or embed code.'
 required: true
 translatable: false
-default_value: { }
+default_value: {  }
 default_value_callback: ''
 settings: {  }
-third_party_settings: {  }
 field_type: string_long
diff --git a/config/install/field.field.media.slideshow.category.yml b/config/install/field.field.media.slideshow.category.yml
index 106f631..2fae090 100644
--- a/config/install/field.field.media.slideshow.category.yml
+++ b/config/install/field.field.media.slideshow.category.yml
@@ -1,17 +1,27 @@
+langcode: und
+status: true
+dependencies:
+  config:
+    - field.storage.media.category
+    - media_entity.bundle.slideshow
+  module:
+    - entity_reference
 id: media.slideshow.category
+field_name: category
 entity_type: media
 bundle: slideshow
-field_name: category
-field_type: taxonomy_term_reference
 label: Category
 description: 'Select category media belongs to.'
 required: true
+translatable: true
 default_value: {  }
-default_value_callback: 'media_pinkeye_category_default_value'
-settings: {  }
-status: true
-langcode: und
-dependencies:
-  config:
-    - field.storage.media.category
-    - media_entity.bundle.slideshow
+default_value_callback: media_pinkeye_category_default_value
+settings:
+  handler: 'default:taxonomy_term'
+  handler_settings:
+    target_bundles:
+      media: media
+    sort:
+      field: _none
+    auto_create: false
+field_type: entity_reference
diff --git a/config/install/field.field.media.slideshow.slideshow_items.yml b/config/install/field.field.media.slideshow.slideshow_items.yml
index 4c6b675..05c23e0 100644
--- a/config/install/field.field.media.slideshow.slideshow_items.yml
+++ b/config/install/field.field.media.slideshow.slideshow_items.yml
@@ -15,7 +15,7 @@ translatable: true
 default_value: {  }
 default_value_callback: ''
 settings:
-  handler: default
+  handler: 'default:media'
   handler_settings:
     target_bundles:
       image: image
@@ -23,5 +23,4 @@ settings:
       tweet: tweet
     sort:
       field: _none
-third_party_settings: {  }
 field_type: entity_reference
diff --git a/config/install/field.field.media.tweet.category.yml b/config/install/field.field.media.tweet.category.yml
index 8883b79..241b67b 100644
--- a/config/install/field.field.media.tweet.category.yml
+++ b/config/install/field.field.media.tweet.category.yml
@@ -1,17 +1,27 @@
+langcode: und
+status: true
+dependencies:
+  config:
+    - field.storage.media.category
+    - media_entity.bundle.tweet
+  module:
+    - entity_reference
 id: media.tweet.category
+field_name: category
 entity_type: media
 bundle: tweet
-field_name: category
-field_type: taxonomy_term_reference
 label: Category
 description: 'Select category media belongs to.'
 required: true
+translatable: true
 default_value: {  }
-default_value_callback: 'media_pinkeye_category_default_value'
-settings: {  }
-status: true
-langcode: und
-dependencies:
-  config:
-    - field.storage.media.category
-    - media_entity.bundle.tweet
+default_value_callback: media_pinkeye_category_default_value
+settings:
+  handler: 'default:taxonomy_term'
+  handler_settings:
+    target_bundles:
+      media: media
+    sort:
+      field: _none
+    auto_create: false
+field_type: entity_reference
diff --git a/config/install/field.field.media.tweet.tweet.yml b/config/install/field.field.media.tweet.tweet.yml
index 67d48df..8e577e5 100644
--- a/config/install/field.field.media.tweet.tweet.yml
+++ b/config/install/field.field.media.tweet.tweet.yml
@@ -12,8 +12,7 @@ label: Tweet
 description: 'Paste tweet''s URL or embed code.'
 required: true
 translatable: false
-default_value: { }
+default_value: {  }
 default_value_callback: ''
 settings: {  }
-third_party_settings: {  }
 field_type: string_long
diff --git a/config/install/field.storage.media.category.yml b/config/install/field.storage.media.category.yml
index 3099738..0f7a4bd 100644
--- a/config/install/field.storage.media.category.yml
+++ b/config/install/field.storage.media.category.yml
@@ -1,23 +1,20 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - media_entity
+    - taxonomy
 id: media.category
 field_name: category
 entity_type: media
-type: taxonomy_term_reference
-module: taxonomy
+type: entity_reference
 settings:
-  allowed_values:
-    -
-      vocabulary: media
-      parent: 0
+  target_type: taxonomy_term
+module: entity_reference
 locked: false
 cardinality: -1
 translatable: true
 indexes:
   target_id:
     - target_id
-status: true
-langcode: en
-dependencies:
-  module:
-    - media_entity
-    - taxonomy
 persist_with_no_fields: false
diff --git a/config/install/field.storage.media.instagram.yml b/config/install/field.storage.media.instagram.yml
index 2850a85..e42df7b 100644
--- a/config/install/field.storage.media.instagram.yml
+++ b/config/install/field.storage.media.instagram.yml
@@ -7,7 +7,8 @@ id: media.instagram
 field_name: instagram
 entity_type: media
 type: string_long
-settings: {  }
+settings:
+  case_sensitive: false
 module: core
 locked: false
 cardinality: 1
diff --git a/config/install/field.storage.media.slideshow_items.yml b/config/install/field.storage.media.slideshow_items.yml
index 1cd132d..9f3d33c 100644
--- a/config/install/field.storage.media.slideshow_items.yml
+++ b/config/install/field.storage.media.slideshow_items.yml
@@ -17,3 +17,4 @@ translatable: true
 indexes:
   target_id:
     - target_id
+persist_with_no_fields: false
diff --git a/config/install/field.storage.media.tweet.yml b/config/install/field.storage.media.tweet.yml
index ed3add1..1d5ef19 100644
--- a/config/install/field.storage.media.tweet.yml
+++ b/config/install/field.storage.media.tweet.yml
@@ -7,7 +7,8 @@ id: media.tweet
 field_name: tweet
 entity_type: media
 type: string_long
-settings: {  }
+settings:
+  case_sensitive: false
 module: core
 locked: false
 cardinality: 1
diff --git a/config/install/image.style.media_library.yml b/config/install/image.style.media_library.yml
index e3805ec..bdd0dbb 100644
--- a/config/install/image.style.media_library.yml
+++ b/config/install/image.style.media_library.yml
@@ -1,11 +1,13 @@
+langcode: en
+status: true
+dependencies: {  }
 name: media_library
 label: 'Media library item'
 effects:
   7e94d373-e027-4592-b865-5f72a0946f96:
+    uuid: 7e94d373-e027-4592-b865-5f72a0946f96
     id: image_scale_and_crop
+    weight: 0
     data:
       width: 180
       height: 180
-    weight: 0
-    uuid: 7e94d373-e027-4592-b865-5f72a0946f96
-langcode: en
diff --git a/config/install/media_entity.bundle.image.yml b/config/install/media_entity.bundle.image.yml
index aaf8a34..a0fcf87 100644
--- a/config/install/media_entity.bundle.image.yml
+++ b/config/install/media_entity.bundle.image.yml
@@ -7,7 +7,6 @@ id: image
 label: Image
 description: 'Locally hosted images.'
 type: image
-third_party_settings: {  }
 type_configuration:
   source_field: image
   gather_exif: '0'
diff --git a/config/install/media_entity.bundle.instagram.yml b/config/install/media_entity.bundle.instagram.yml
index ab2fe2d..4a9cf69 100644
--- a/config/install/media_entity.bundle.instagram.yml
+++ b/config/install/media_entity.bundle.instagram.yml
@@ -7,7 +7,6 @@ id: instagram
 label: Instagram
 description: 'Instagram posts.'
 type: instagram
-third_party_settings: {  }
 type_configuration:
   source_field: instagram
   use_instagram_api: 0
diff --git a/config/install/media_entity.bundle.slideshow.yml b/config/install/media_entity.bundle.slideshow.yml
index 7e09c40..c6ee972 100644
--- a/config/install/media_entity.bundle.slideshow.yml
+++ b/config/install/media_entity.bundle.slideshow.yml
@@ -7,7 +7,6 @@ id: slideshow
 label: Slideshow
 description: 'Slideshows of media items.'
 type: slideshow
-third_party_settings: {  }
 type_configuration:
   source_field: slideshow_items
 field_map: {  }
diff --git a/config/install/media_entity.bundle.tweet.yml b/config/install/media_entity.bundle.tweet.yml
index fa674c8..c2b7052 100644
--- a/config/install/media_entity.bundle.tweet.yml
+++ b/config/install/media_entity.bundle.tweet.yml
@@ -7,7 +7,6 @@ id: tweet
 label: Tweet
 description: 'Represents a tweet.'
 type: twitter
-third_party_settings: {  }
 type_configuration:
   source_field: tweet
   use_twitter_api: 0
diff --git a/config/install/taxonomy.vocabulary.media.yml b/config/install/taxonomy.vocabulary.media.yml
index 9b45802..b568021 100644
--- a/config/install/taxonomy.vocabulary.media.yml
+++ b/config/install/taxonomy.vocabulary.media.yml
@@ -1,7 +1,8 @@
+langcode: und
+status: true
+dependencies: {  }
+name: 'Media categorization'
 vid: media
-name: Media categorization
 description: 'Categorization of site-wide media.'
 hierarchy: 1
 weight: 0
-status: true
-langcode: und
