diff --git a/ds.layouts.yml b/ds.layouts.yml
index d8aa2e3..5fb370e 100644
--- a/ds.layouts.yml
+++ b/ds.layouts.yml
@@ -24,7 +24,7 @@ ds_2col:
   class: '\Drupal\ds\Plugin\DsLayout'
   type: partial
   template: templates/ds-2col
-  css: css/ds-2col.css
+  library: ds/ds_2col
   icon: images/ds-2col.png
   regions:
     left:
@@ -37,7 +37,7 @@ ds_2col_fluid:
   class: '\Drupal\ds\Plugin\DsLayout'
   type: partial
   template: templates/ds-2col-fluid
-  css: css/ds-2col-fluid.css
+  library: ds/ds_2col_fluid
   icon: images/ds-2col-fluid.png
   regions:
     left:
@@ -50,7 +50,7 @@ ds_2col_stacked:
   class: '\Drupal\ds\Plugin\DsLayout'
   type: partial
   template: templates/ds-2col-stacked
-  css: css/ds-2col-stacked.css
+  library: ds/ds_2col_stacked
   icon: images/ds-2col-stacked.png
   regions:
     header:
@@ -67,7 +67,7 @@ ds_2col_stacked_fluid:
   class: '\Drupal\ds\Plugin\DsLayout'
   type: partial
   template: templates/ds-2col-stacked-fluid
-  css: css/ds-2col-stacked-fluid.css
+  library: ds/ds_2col_stacked_fluid
   icon: images/ds-2col-stacked-fluid.png
   regions:
     header:
@@ -84,7 +84,7 @@ ds_3col:
   class: '\Drupal\ds\Plugin\DsLayout'
   type: partial
   template: templates/ds-3col
-  css: css/ds-3col.css
+  library: ds/ds_3col
   icon: images/ds-3col.png
   regions:
     left:
@@ -99,7 +99,7 @@ ds_3col_equal_width:
   class: '\Drupal\ds\Plugin\DsLayout'
   type: partial
   template: templates/ds-3col-equal-width
-  css: css/ds-3col-equal-width.css
+  library: ds/ds_3col_equal_width
   icon: images/ds-3col-equal-width.png
   regions:
     left:
@@ -114,7 +114,7 @@ ds_3col_stacked:
   class: '\Drupal\ds\Plugin\DsLayout'
   type: partial
   template: templates/ds-3col-stacked
-  css: css/ds-3col-stacked.css
+  library: ds/ds_3col_stacked
   icon: images/ds-3col-stacked.png
   regions:
     header:
@@ -133,7 +133,7 @@ ds_3col_stacked_fluid:
   class: '\Drupal\ds\Plugin\DsLayout'
   type: partial
   template: templates/ds-3col-stacked-fluid
-  css: css/ds-3col-stacked-fluid.css
+  library: ds/ds_3col_stacked_fluid
   icon: images/ds-3col-stacked-fluid.png
   regions:
     header:
@@ -152,7 +152,7 @@ ds_3col_stacked_equal_width:
   class: '\Drupal\ds\Plugin\DsLayout'
   type: partial
   template: templates/ds-3col-stacked-equal-width
-  css: css/ds-3col-stacked-equal-width.css
+  library: ds/ds_3col_stacked_equal_width
   icon: images/ds-3col-stacked-equal-width.png
   regions:
     header:
@@ -171,7 +171,7 @@ ds_4col:
   class: '\Drupal\ds\Plugin\DsLayout'
   type: partial
   template: templates/ds-4col
-  css: css/ds-4col.css
+  library: ds/ds_4col
   icon: images/ds-4col.png
   regions:
     first:
diff --git a/ds.libraries.yml b/ds.libraries.yml
index b7a62e4..7137935 100644
--- a/ds.libraries.yml
+++ b/ds.libraries.yml
@@ -9,3 +9,53 @@ admin:
     - core/jquery
     - core/drupal
     - core/drupal.form
+ds_2col:
+  version: VERSION
+  css:
+    theme:
+      css/ds-2col.css: {}
+ds_2col_fluid:
+  version: VERSION
+  css:
+    theme:
+      css/ds-2col-fluid.css: {}
+ds_2col_stacked:
+  version: VERSION
+  css:
+    theme:
+      css/ds-2col-stacked.css: {}
+ds_2col_stacked_fluid:
+  version: VERSION
+  css:
+    theme:
+      css/ds-2col-stacked-fluid.css: {}
+ds_3col:
+  version: VERSION
+  css:
+    theme:
+      css/ds-3col.css: {}
+ds_3col_equal_width:
+  version: VERSION
+  css:
+    theme:
+      css/ds-3col-equal-width.css: {}
+ds_3col_stacked:
+  version: VERSION
+  css:
+    theme:
+      css/ds-3col-stacked.css: {}
+ds_3col_stacked_fluid:
+  version: VERSION
+  css:
+    theme:
+      css/ds-3col-stacked-fluid.css: {}
+ds_3col_stacked_equal_width:
+  version: VERSION
+  css:
+    theme:
+      css/ds-3col-stacked-equal-width.css: {}
+ds_4col:
+  version: VERSION
+  css:
+    theme:
+      css/ds-4col.css: {}
diff --git a/ds.module b/ds.module
index 1c1c6b9..7ac3b75 100644
--- a/ds.module
+++ b/ds.module
@@ -19,8 +19,8 @@
 use Drupal\Core\Url;
 use Drupal\ds\Ds;
 use Drupal\ds\DsAttribute;
+use Drupal\ds\Plugin\DsLayout;
 use Drupal\field\Entity\FieldConfig;
-use Drupal\layout_plugin\Layout;
 
 /**
  * Implements hook_help().
@@ -77,8 +77,8 @@ function ds_theme_registry_alter(&$theme_registry) {
   $layouts = Ds::getLayouts();
   $layout_theme_hooks = [];
   foreach ($layouts as $info) {
-    if ($info['class'] == '\Drupal\ds\Plugin\DsLayout') {
-      $layout_theme_hooks[] = $info['theme'];
+    if ($info->getClass() == DsLayout::class) {
+      $layout_theme_hooks[] = $info->getThemeHook();
     }
   }
 
@@ -315,7 +315,7 @@ function template_preprocess_ds_entity_view(&$variables) {
     }
   }
 
-  $layout = Layout::layoutPluginManager()->createInstance($configuration['layout']['id'], $configuration['layout']['settings']);
+  $layout = \Drupal::service('plugin.manager.layout_plugin')->createInstance($configuration['layout']['id'], $configuration['layout']['settings']);
   $build = array_merge($build, $layout->build($regions));
 
   // Disable CSS files when needed.
diff --git a/includes/field_ui.inc b/includes/field_ui.inc
index f4b86a1..00c4f99 100644
--- a/includes/field_ui.inc
+++ b/includes/field_ui.inc
@@ -11,13 +11,14 @@
 use Drupal\Core\Entity\Entity\EntityViewDisplay;
 use Drupal\Core\Form\FormState;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Plugin\PluginFormInterface;
 use Drupal\Core\Render\Element;
 use Drupal\Core\Url;
 use Drupal\ds\Ds;
 use Drupal\ds\Plugin\DsField\DsFieldInterface;
 use Drupal\field\FieldConfigInterface;
 use Drupal\field_ui\FieldUI;
-use Drupal\layout_plugin\Layout;
+use Drupal\layout_plugin\Plugin\Layout\LayoutDefinition;
 
 /**
  * Adds the Display Suite fields and layouts to the form.
@@ -149,7 +150,7 @@ function ds_field_ui_regions($form, FormStateInterface $form_state) {
 
   // Change UI to add Region column if we have a layout.
   if ($layout) {
-    foreach ($layout['regions'] as $region_name => $field_names) {
+    foreach ($layout->get('region_info') as $region_name => $field_names) {
       foreach ($field_names as $field_name) {
         $field_regions[$field_name] = $region_name;
       }
@@ -173,7 +174,7 @@ function ds_field_ui_regions($form, FormStateInterface $form_state) {
 
     $table['#regions'] = array();
     $region_options = array();
-    foreach ($layout['region_names'] as $region_key => $region_info) {
+    foreach ($layout->getRegions() as $region_key => $region_info) {
       $region_options[$region_key] = $region_info['label'];
       $table['#regions'][$region_key] = array(
         'title' => $region_info['label'],
@@ -266,15 +267,17 @@ function ds_field_ui_layouts_validate($form, FormStateInterface $form_state) {
   // Only validate the layout settings if the layout hasn't changed.
   if (!$new_layout && !empty($layout)) {
     /* @var \Drupal\layout_plugin\Plugin\Layout\LayoutInterface $layout_plugin */
-    $layout_plugin = Layout::layoutPluginManager()->createInstance($form_state->getValue('layout'), []);
-    $layout_form = isset($form['layout_configuration']) ? $form['layout_configuration'] : [];
-    foreach (Element::children($form) as $name) {
-      if (!empty($form[$name]['#ds_layout_configuration'])) {
-        $layout_form[$name] = $form[$name];
+    $layout_plugin = \Drupal::service('plugin.manager.layout_plugin')->createInstance($form_state->getValue('layout'), []);
+    if ($layout_plugin instanceof PluginFormInterface) {
+      $layout_form = isset($form['layout_configuration']) ? $form['layout_configuration'] : [];
+      foreach (Element::children($form) as $name) {
+        if (!empty($form[$name]['#ds_layout_configuration'])) {
+          $layout_form[$name] = $form[$name];
+        }
       }
+      $layout_form_state = (new FormState())->setValues($form_state->getValue('layout_configuration', []));
+      $layout_plugin->validateConfigurationForm($layout_form, $layout_form_state);
     }
-    $layout_form_state = (new FormState())->setValues($form_state->getValue('layout_configuration', []));
-    $layout_plugin->validateConfigurationForm($layout_form, $layout_form_state);
   }
 
   // Move the view modes so Field UI can handle them.
@@ -326,8 +329,8 @@ function ds_field_ui_layouts_save($form, FormStateInterface $form_state) {
   $record = array();
   $record['layout'] = array(
     'id' => $layout,
-    'path' => !empty($layout) ? $ds_layouts[$layout]['path'] : '',
-    'library' => isset($ds_layouts[$layout]['library']) ? $ds_layouts[$layout]['library'] : FALSE,
+    'path' => !empty($layout) ? $ds_layouts[$layout]->getPath() : '',
+    'library' => $ds_layouts[$layout]->getLibrary() ?: FALSE,
     'disable_css' => $disable_css ? TRUE : FALSE,
     'entity_classes' => $entity_classes,
   );
@@ -347,11 +350,11 @@ function ds_field_ui_layouts_save($form, FormStateInterface $form_state) {
     // we keep their current settings.
     $layouts = Ds::getLayouts();
     $sl = $layouts[$layout];
-    $first_region = key($sl['regions']);
+    $first_region = $sl->getDefaultRegion();
     $record['layout']['settings']['classes'] = array();
     $record['layout']['settings']['wrappers'] = array();
     // Set default region values.
-    foreach ($sl['regions'] as $region_name => $content) {
+    foreach ($sl->getRegionNames() as $region_name) {
       $record['layout']['settings']['wrappers'][$region_name] = 'div';
     }
     $record['layout']['settings']['outer_wrapper'] = 'div';
@@ -401,15 +404,17 @@ function ds_field_ui_layouts_save($form, FormStateInterface $form_state) {
     }
 
     /* @var \Drupal\layout_plugin\Plugin\Layout\LayoutInterface $layout_plugin */
-    $layout_plugin = Layout::layoutPluginManager()->createInstance($layout, []);
-    $layout_form = isset($form['layout_configuration']) ? $form['layout_configuration'] : [];
-    foreach (Element::children($form) as $name) {
-      if (!empty($form[$name]['#ds_layout_configuration'])) {
-        $layout_form[$name] = $form[$name];
+    $layout_plugin = \Drupal::service('plugin.manager.layout_plugin')->createInstance($layout, []);
+    if ($layout_plugin instanceof PluginFormInterface) {
+      $layout_form = isset($form['layout_configuration']) ? $form['layout_configuration'] : [];
+      foreach (Element::children($form) as $name) {
+        if (!empty($form[$name]['#ds_layout_configuration'])) {
+          $layout_form[$name] = $form[$name];
+        }
       }
+      $layout_form_state = (new FormState())->setValues($form_state->getValue('layout_configuration', []));
+      $layout_plugin->submitConfigurationForm($layout_form, $layout_form_state);
     }
-    $layout_form_state = (new FormState())->setValues($form_state->getValue('layout_configuration', []));
-    $layout_plugin->submitConfigurationForm($layout_form, $layout_form_state);
 
     // Get the layout settings from the layout_plugin.
     $record['layout']['settings'] = $layout_plugin->getConfiguration();
@@ -677,8 +682,8 @@ function _ds_field_ui_table_layouts($entity_type, $bundle, $view_mode, &$form, F
     $optgroup = t('Other');
 
     // Create new layout option group.
-    if (!empty($layout_definition['category'])) {
-      $optgroup = (string) $layout_definition['category'];
+    if ($category = $layout_definition->getCategory()) {
+      $optgroup = (string) $category;
     }
 
     if (!isset($layout_options[$optgroup])) {
@@ -686,7 +691,7 @@ function _ds_field_ui_table_layouts($entity_type, $bundle, $view_mode, &$form, F
     }
 
     // Stack the layout.
-    $layout_options[$optgroup][$key] = $layout_definition['label'];
+    $layout_options[$optgroup][$key] = $layout_definition->getLabel();
   }
 
   // If there is only one $optgroup, move it to the root.
@@ -709,7 +714,7 @@ function _ds_field_ui_table_layouts($entity_type, $bundle, $view_mode, &$form, F
   );
 
   // @todo cleanup
-  $layout = array();
+  $layout = new LayoutDefinition([]);
   /* @var \Drupal\Core\Entity\EntityFormInterface $entity_form */
   $entity_form = $form_state->getFormObject();
   /* @var \Drupal\Core\Entity\Display\EntityViewDisplayInterface $display */
@@ -717,55 +722,52 @@ function _ds_field_ui_table_layouts($entity_type, $bundle, $view_mode, &$form, F
   if ($display->getThirdPartySetting('ds', 'layout')) {
     $layout_configuration = $display->getThirdPartySetting('ds', 'layout');
     $layout = $ds_layouts[$layout_configuration['id']];
-    $layout['layout'] = $layout_configuration['id'];
-    $layout['disable_css'] = $layout_configuration['disable_css'];
-    $layout['entity_classes'] = $layout_configuration['entity_classes'];
-    $layout['settings'] = $layout_configuration['settings'] ?: [];
-    $layout['regions'] = $display->getThirdPartySetting('ds', 'regions');
-    $layout['fields'] = $display->getThirdPartySetting('ds', 'fields');
-  }
-
-  if (!empty($layout) && isset($layout['layout']) && isset($ds_layouts[$layout['layout']])) {
-    $layout['region_names'] = $ds_layouts[$layout['layout']]['regions'];
+    $layout->set('disable_css', $layout_configuration['disable_css']);
+    $layout->set('entity_classes', $layout_configuration['entity_classes']);
+    $layout->set('settings', $layout_configuration['settings'] ?: []);
+    $layout->set('region_info', $display->getThirdPartySetting('ds', 'regions'));
+    $layout->set('fields', $display->getThirdPartySetting('ds', 'fields'));
     $form['#ds_layout'] = $layout;
   }
 
   // Load the layout preview form.
-  $layout['layout_options'] = $layout_options;
+  $layout->set('layout_options', $layout_options);
   _ds_field_ui_table_layouts_preview($form, $form_state, $ds_layouts, $layout, $display);
 
-  if (!empty($layout) && !empty($layout['settings'])) {
+  if ($layout->get('settings')) {
     /* @var \Drupal\layout_plugin\Plugin\Layout\LayoutInterface $layout_plugin */
-    $layout_plugin = Layout::layoutPluginManager()->createInstance($layout['layout'], $layout['settings'] ?: []);
+    $layout_plugin = \Drupal::service('plugin.manager.layout_plugin')->createInstance($layout->id(), $layout->get('settings'));
 
-    $layout_configuration_form = $layout_plugin->buildConfigurationForm([], $form_state);
+    if ($layout_plugin instanceof PluginFormInterface) {
+      $layout_configuration_form = $layout_plugin->buildConfigurationForm([], $form_state);
 
-    // Merge 'details' elements in 'additional_settings' group into the main
-    // form.
-    foreach (Element::children($layout_configuration_form) as $name) {
-      $element = $layout_configuration_form[$name];
-      if ($element['#type'] == 'details' && $element['#group'] == 'additional_settings') {
-        $form[$name] = $layout_configuration_form[$name];
-        unset($layout_configuration_form[$name]);
+      // Merge 'details' elements in 'additional_settings' group into the main
+      // form.
+      foreach (Element::children($layout_configuration_form) as $name) {
+        $element = $layout_configuration_form[$name];
+        if ($element['#type'] == 'details' && $element['#group'] == 'additional_settings') {
+          $form[$name] = $layout_configuration_form[$name];
+          unset($layout_configuration_form[$name]);
 
-        $form[$name]['#ds_layout_configuration'] = TRUE;
-        $form[$name]['#parents'] = ['layout_configuration', $name];
-        $form[$name]['#tree'] = TRUE;
+          $form[$name]['#ds_layout_configuration'] = TRUE;
+          $form[$name]['#parents'] = ['layout_configuration', $name];
+          $form[$name]['#tree'] = TRUE;
 
-        if ($layout['layout'] === 'ds_reset') {
-          $form[$name]['#access'] = FALSE;
+          if ($layout->id() === 'ds_reset') {
+            $form[$name]['#access'] = FALSE;
+          }
         }
       }
-    }
 
-    // If anything is left, then we put it on it's own vertial tab.
-    if (!Element::isEmpty($layout_configuration_form)) {
-      $form['layout_configuration'] = array_merge($layout_configuration_form, [
-        '#group' => 'additional_settings',
-        '#type' => 'details',
-        '#title' => t('Layout settings'),
-        '#tree' => TRUE,
-      ]);
+      // If anything is left, then we put it on it's own vertial tab.
+      if (!Element::isEmpty($layout_configuration_form)) {
+        $form['layout_configuration'] = array_merge($layout_configuration_form, [
+          '#group' => 'additional_settings',
+          '#type' => 'details',
+          '#title' => t('Layout settings'),
+          '#tree' => TRUE,
+        ]);
+      }
     }
   }
   else {
@@ -809,7 +811,7 @@ function _ds_field_ui_table_layouts($entity_type, $bundle, $view_mode, &$form, F
 
   $form['ds_layouts']['old_layout'] = array(
     '#type' => 'value',
-    '#value' => isset($layout['layout']) ? $layout['layout'] : 0,
+    '#value' => $layout->id() ?: 0,
   );
 
   // Add validate and submit handlers. Layout needs be first so
@@ -826,21 +828,21 @@ function _ds_field_ui_table_layouts($entity_type, $bundle, $view_mode, &$form, F
  *   A collection of form properties.
  * @param FormStateInterface $form_state
  *   The state of the form.
- * @param array $ds_layouts
+ * @param \Drupal\layout_plugin\Plugin\Layout\LayoutDefinition[] $ds_layouts
  *   Collection of all the layouts.
- * @param array $layout
+ * @param \Drupal\layout_plugin\Plugin\Layout\LayoutDefinition $layout
  *   Current selected layout.
  * @param \Drupal\Core\Entity\Display\EntityViewDisplayInterface $display
  *   The entity display object.
  */
-function _ds_field_ui_table_layouts_preview(&$form, FormStateInterface $form_state, $ds_layouts, $layout, EntityViewDisplayInterface $display) {
+function _ds_field_ui_table_layouts_preview(&$form, FormStateInterface $form_state, $ds_layouts, LayoutDefinition $layout, EntityViewDisplayInterface $display) {
   $layout_string = '';
 
   $form['ds_layouts']['layout'] = array(
     '#type' => 'select',
     '#title' => t('Select a layout'),
-    '#options' => $layout['layout_options'],
-    '#default_value' => isset($layout['layout']) ? $layout['layout'] : '',
+    '#options' => $layout->get('layout_options'),
+    '#default_value' => $layout->id(),
     '#weight' => -1,
     '#ajax' => array(
       'callback' => 'ds_field_ui_table_layouts_preview_callback',
@@ -848,7 +850,7 @@ function _ds_field_ui_table_layouts_preview(&$form, FormStateInterface $form_sta
     ),
   );
 
-  if (!isset($layout['layout'])) {
+  if (!$layout->id()) {
     $form['ds_layouts']['layout']['#description'] = t("A layout must be selected to enable Display Suite functionality.");
   }
 
@@ -859,14 +861,14 @@ function _ds_field_ui_table_layouts_preview(&$form, FormStateInterface $form_sta
     '#weight' => -3,
   );
 
-  if (isset($layout['layout']) || $form_state->hasValue('layout')) {
-    $layout_string = $form_state->hasValue('layout') ? $form_state->getValue('layout') : $layout['layout'];
+  if ($layout->id() || $form_state->hasValue('layout')) {
+    $layout_string = $form_state->hasValue('layout') ? $form_state->getValue('layout') : $layout->id();
   }
 
   if (!empty($layout_string)) {
     $chosen_layout = $ds_layouts[$layout_string];
-    $selected = '<strong>' . $chosen_layout['label'] . '</strong>';
-    $selected .= '<br/>' . t('The default template can be found in %path', array('%path' => $chosen_layout['template_path']));
+    $selected = '<strong>' . $chosen_layout->getLabel() . '</strong>';
+    $selected .= '<br/>' . t('The default template can be found in %path', array('%path' => $chosen_layout->getTemplatePath()));
     $suggestions_array = array();
     $suggestions_array[0] = $layout_string . '--' . $display->getTargetEntityTypeId();
     $suggestions_array[2] = $layout_string . '--' . $display->getTargetBundle() . '-' . $display->getTargetBundle();
@@ -884,10 +886,10 @@ function _ds_field_ui_table_layouts_preview(&$form, FormStateInterface $form_sta
       $suggestions_array[$key] = $suggestion_replace . '.html.twig';
     }
 
-    if ($form_state->hasValue('layout') || (!empty($layout) && isset($layout['regions']))) {
+    if ($form_state->hasValue('layout') || (!empty($layout) && $layout->get('region_info'))) {
       $fallback_image = drupal_get_path('module', 'ds') . '/images/preview.png';
       $current_layout = $form_state->hasValue('layout') && (!isset($layout->layout) || $form_state->getValue('layout') != $layout->layout) ? t('Current layout (after save)') : t('Current layout');
-      $image = (isset($chosen_layout['icon']) && !empty($chosen_layout['icon'])) ? $chosen_layout['icon'] : $fallback_image;
+      $image = $chosen_layout->getIconPath() ?: $fallback_image;
 
       $form['ds_layouts']['preview']['title'] = array(
         '#markup' => '<div class="ds-layout-preview-title">' . $current_layout . '</div>',
@@ -909,12 +911,8 @@ function _ds_field_ui_table_layouts_preview(&$form, FormStateInterface $form_sta
         '#items' => $suggestions_array,
       );
 
-      if (!empty($chosen_layout['css'])) {
-        $disable_css = FALSE;
-
-        if (isset($layout['disable_css'])) {
-          $disable_css = $layout['disable_css'];
-        }
+      if ($chosen_layout->getLibrary()) {
+        $disable_css = $layout->get('disable_css') ?: FALSE;
         if ($form_state->hasValue('disable_css') && $disable_css !== $form_state->getValue('disable_css')) {
           $disable_css = $form_state->getValue('disable_css');
         }
@@ -928,8 +926,8 @@ function _ds_field_ui_table_layouts_preview(&$form, FormStateInterface $form_sta
       }
 
       $entity_classes = 'all_classes';
-      if (isset($layout['entity_classes'])) {
-        $entity_classes = $layout['entity_classes'];
+      if ($layout->get('entity_classes')) {
+        $entity_classes = $layout->get('entity_classes');
       }
       if ($form_state->hasValue('entity_classes') && $entity_classes !== $form_state->getValue('entity_classes')) {
         $entity_classes = $form_state->getValue('entity_classes');
@@ -952,8 +950,7 @@ function _ds_field_ui_table_layouts_preview(&$form, FormStateInterface $form_sta
       );
     }
 
-    if (!isset($layout['layout']) || $layout_string != $layout['layout']) {
-
+    if ($layout_string != $layout->id()) {
       // Get admin path.
       $route = FieldUI::getOverviewRouteInfo($display->getTargetEntityTypeId(), $display->getTargetBundle());
       $route_parameters = $route->getRouteParameters();
@@ -965,7 +962,7 @@ function _ds_field_ui_table_layouts_preview(&$form, FormStateInterface $form_sta
       $destination_url = '';
 
       // If regions aren't set we don't have to move fields.
-      if (isset($layout['regions'])) {
+      if ($layout->get('region_info')) {
         $route_name = 'ds.change_layout';
         $route_parameters = array(
           'entity_type' => $display->getTargetEntityTypeId(),
@@ -1046,7 +1043,7 @@ function _ds_field_ui_fields($entity_type, $bundle, $view_mode, &$form, FormStat
   $fields = Ds::getFields($entity_type);
 
   // Get field settings.
-  $field_settings = $form['#ds_layout']['fields'];
+  $field_settings = $form['#ds_layout']->get('fields');
   $form['#field_settings'] = $field_settings;
 
   $table = &$form['fields'];
diff --git a/modules/ds_extras/config/optional/core.entity_view_mode.node.revision.yml b/modules/ds_extras/config/optional/core.entity_view_mode.node.revision.yml
index 7533cba..05f4c94 100644
--- a/modules/ds_extras/config/optional/core.entity_view_mode.node.revision.yml
+++ b/modules/ds_extras/config/optional/core.entity_view_mode.node.revision.yml
@@ -7,5 +7,4 @@ dependencies:
   enforced:
     module:
       - ds_extras
-  module:
-    - node
+      - node
diff --git a/modules/ds_switch_view_mode/ds_switch_view_mode.module b/modules/ds_switch_view_mode/ds_switch_view_mode.module
index 1c5d2eb..569aae3 100644
--- a/modules/ds_switch_view_mode/ds_switch_view_mode.module
+++ b/modules/ds_switch_view_mode/ds_switch_view_mode.module
@@ -121,7 +121,7 @@ function ds_switch_view_mode_form_node_form_alter(&$form, FormStateInterface $fo
 
       if (isset($layout_settings['layout'])) {
         $chosen_layout = $ds_layouts[$layout_settings['layout']['id']];
-        $image = (isset($chosen_layout['icon']) && !empty($chosen_layout['icon'])) ? $chosen_layout['icon'] : $fallback_image;
+        $image = $chosen_layout->getIconPath() ?: $fallback_image;
       }
       else {
         $image = $fallback_image;
diff --git a/src/Ds.php b/src/Ds.php
index 8acc559..580688d 100644
--- a/src/Ds.php
+++ b/src/Ds.php
@@ -4,7 +4,6 @@
 
 use Drupal\Component\Utility\Html;
 use Drupal\Core\Entity\EntityInterface;
-use Drupal\layout_plugin\Layout;
 
 /**
  * Helper class that holds all the main Display Suite helper functions.
@@ -80,12 +79,14 @@ public static function getFieldInstance($key, $field, EntityInterface $entity, $
 
   /**
    * Gets Display Suite layouts.
+   *
+   * @return \Drupal\layout_plugin\Plugin\Layout\LayoutDefinition[]
    */
   public static function getLayouts() {
     static $layouts = FALSE;
 
     if (!$layouts) {
-      $layouts = Layout::layoutPluginManager()->getDefinitions();
+      $layouts = \Drupal::service('plugin.manager.layout_plugin')->getDefinitions();
     }
 
     return $layouts;
diff --git a/src/Form/ChangeLayoutForm.php b/src/Form/ChangeLayoutForm.php
index 7ad2247..b713609 100644
--- a/src/Form/ChangeLayoutForm.php
+++ b/src/Form/ChangeLayoutForm.php
@@ -49,8 +49,8 @@ public function buildForm(array $form, FormStateInterface $form_state, $entity_t
       $form['info'] = array(
         '#markup' => $this->t('You are changing from @old to @new layout for @bundle in @view_mode view mode.',
           array(
-            '@old' => $old_layout_info['label'],
-            '@new' => $new_layout['label'],
+            '@old' => $old_layout_info->getLabel(),
+            '@new' => $new_layout->getLabel(),
             '@bundle' => $bundle,
             '@view_mode' => $display_mode,
           )
@@ -61,7 +61,7 @@ public function buildForm(array $form, FormStateInterface $form_state, $entity_t
 
       // Old region options.
       $regions = array();
-      foreach ($old_layout_info['regions'] as $key => $info) {
+      foreach ($old_layout_info->getRegions() as $key => $info) {
         $regions[$key] = $info['label'];
       }
 
@@ -77,22 +77,21 @@ public function buildForm(array $form, FormStateInterface $form_state, $entity_t
       );
       \Drupal::moduleHandler()->alter('ds_layout_region', $context, $region_info);
       $regions = $region_info['region_options'];
-      $form['#old_layout_info']['layout']['regions'] = $regions;
+      $form['#old_layout_info']->setRegions($regions);
 
       // For new regions.
       $new_regions = array();
-      foreach ($new_layout['regions'] as $key => $info) {
+      foreach ($new_layout->getRegions() as $key => $info) {
         $new_regions[$key] = $info['label'];
       }
       $region_info = array(
         'region_options' => $new_regions,
       );
       \Drupal::moduleHandler()->alter('ds_layout_region', $context, $region_info);
-      $new_layout['regions'] = $region_info['region_options'];
-      $form['#new_layout']['regions'] = $new_layout['regions'];
+      $new_layout->setRegions($region_info['region_options']);
 
       // Display the region options.
-      $selectable_regions = array('' => $this->t('- None -')) + $new_layout['regions'];
+      $selectable_regions = array('' => $this->t('- None -')) + $new_layout->getRegions();
       $form['regions_pre']['#markup'] = '<div class="ds-layout-regions">';
       foreach ($regions as $region => $region_title) {
         $form['region_' . $region] = array(
@@ -117,8 +116,8 @@ public function buildForm(array $form, FormStateInterface $form_state, $entity_t
       );
 
       $fallback_image = drupal_get_path('module', 'ds') . '/images/preview.png';
-      $old_image = (isset($old_layout_info['icon']) && !empty($old_layout_info['icon'])) ? $old_layout_info['icon'] : $fallback_image;
-      $new_image = (isset($new_layout['icon']) &&  !empty($new_layout['icon'])) ? $new_layout['icon'] : $fallback_image;
+      $old_image = $old_layout_info->getIconPath() ?: $fallback_image;
+      $new_image = $new_layout->getIconPath() ?: $fallback_image;
       $arrow = drupal_get_path('module', 'ds') . '/images/arrow.png';
 
       $form['preview']['old_layout'] = array(
@@ -164,14 +163,14 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
     // Create new third party settings.
     $third_party_settings = $old_layout;
     $third_party_settings['layout']['id'] = $new_layout_key;
-    if (!empty($new_layout['library'])) {
-      $third_party_settings['layout']['library'] = $new_layout['library'];
+    if ($library = $new_layout->getLibrary()) {
+      $third_party_settings['layout']['library'] = $library;
     }
-    $third_party_settings['layout']['path'] = $new_layout['path'];
+    $third_party_settings['layout']['path'] = $new_layout->getPath();
     unset($third_party_settings['regions']);
 
     // Map old regions to new ones.
-    foreach ($old_layout_info['layout']['regions'] as $region => $region_title) {
+    foreach ($old_layout_info->getRegions() as $region => $region_title) {
       $new_region = $form_state->getValue('ds_' . $region);
       if ($new_region != '' && isset($old_layout['regions'][$region])) {
         foreach ($old_layout['regions'][$region] as $field) {
diff --git a/src/Plugin/DsLayout.php b/src/Plugin/DsLayout.php
index 7b56eb0..38fdc1c 100644
--- a/src/Plugin/DsLayout.php
+++ b/src/Plugin/DsLayout.php
@@ -4,6 +4,7 @@
 
 use Drupal\Component\Utility\Xss;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Plugin\PluginFormInterface;
 use Drupal\Core\Url;
 use Drupal\ds\Ds;
 use Drupal\layout_plugin\Plugin\Layout\LayoutBase;
@@ -11,7 +12,7 @@
 /**
  * Layout class for all Display Suite layouts.
  */
-class DsLayout extends LayoutBase {
+class DsLayout extends LayoutBase implements PluginFormInterface {
 
   /**
    * {@inheritdoc}
@@ -33,9 +34,8 @@ public function defaultConfiguration() {
    * {@inheritdoc}
    */
   public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
-    $form = parent::buildConfigurationForm($form, $form_state);
     $configuration = $this->getConfiguration();
-    $regions = $this->getRegionDefinitions();
+    $regions = $this->pluginDefinition->getRegions();
 
     // Add wrappers.
     $wrapper_options = array(
@@ -209,4 +209,10 @@ public function submitConfigurationForm(array &$form, FormStateInterface $form_s
     }
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function validateConfigurationForm(array &$form, FormStateInterface $form_state) {
+  }
+
 }
