diff --git a/ds.module b/ds.module
index eab805f..92be1d8 100644
--- a/ds.module
+++ b/ds.module
@@ -94,6 +94,11 @@ function ds_theme_registry_alter(&$theme_registry) {
       }
 
       $theme_registry[$theme_hook]['preprocess functions'][] = 'ds_preprocess_ds_layout';
+
+      // In case type is theme_engine, remove base hook.
+      if ($theme_registry[$theme_hook]['type'] == 'theme_engine') {
+        unset($theme_registry[$theme_hook]['base hook']);
+      }
     }
   }
 
diff --git a/includes/field_ui.inc b/includes/field_ui.inc
index 4927f07..b18036b 100644
--- a/includes/field_ui.inc
+++ b/includes/field_ui.inc
@@ -903,17 +903,17 @@ function _ds_field_ui_table_layouts_preview(array &$form, FormStateInterface $fo
   }
 
   if (!empty($layout_string)) {
+    /** @var \Drupal\Core\Layout\LayoutDefinition $chosen_layout */
     $chosen_layout = $ds_layouts[$layout_string];
     $selected = '<strong>' . $chosen_layout->getLabel() . '</strong>';
-    // TOTO bring back
-//    $selected .= '<br/>' . t('The default template can be found in %path', array('%path' => $chosen_layout['template_path']));
+    $selected .= '<br/>' . t('The default template can be found in %path', array('%path' => $chosen_layout->getPath() . '/' . $chosen_layout->getTemplate()));
     $suggestions_array = array();
-    $suggestions_array[0] = $layout_string . '--' . $display->getTargetEntityTypeId();
-    $suggestions_array[2] = $layout_string . '--' . $display->getTargetEntityTypeId() . '-' . $display->getTargetBundle();
-    $suggestions_array[4] = $layout_string . '--' . $display->getTargetEntityTypeId() . '--{id}';
+    $suggestions_array[0] = $chosen_layout->getTemplate() . '--' . $display->getTargetEntityTypeId();
+    $suggestions_array[2] = $chosen_layout->getTemplate() . '--' . $display->getTargetEntityTypeId() . '-' . $display->getTargetBundle();
+    $suggestions_array[4] = $chosen_layout->getTemplate() . '--' . $display->getTargetEntityTypeId() . '--{id}';
     if ($display->getMode() != 'default') {
-      $suggestions_array[1] = $layout_string . '--' . $display->getTargetEntityTypeId() . '-' . $display->getMode();
-      $suggestions_array[3] = $layout_string . '--' . $display->getTargetEntityTypeId() . '-' . $display->getTargetBundle() . '-' . $display->getMode();
+      $suggestions_array[1] = $chosen_layout->getTemplate() . '--' . $display->getTargetEntityTypeId() . '-' . $display->getMode();
+      $suggestions_array[3] = $chosen_layout->getTemplate() . '--' . $display->getTargetEntityTypeId() . '-' . $display->getTargetBundle() . '-' . $display->getMode();
     }
 
     ksort($suggestions_array);
diff --git a/src/Tests/LayoutPluginTest.php b/src/Tests/LayoutPluginTest.php
index ca5af6d..91357ed 100644
--- a/src/Tests/LayoutPluginTest.php
+++ b/src/Tests/LayoutPluginTest.php
@@ -114,8 +114,23 @@ class LayoutPluginTest extends FastTestBase {
     $this->drupalGet('node/' . $node->id());
 
     // Check we don't have empty wrappers.
-    $this->assertRaw('ds-1col');
-    $this->assertNoRaw('<>', 'No empty wrappers found');
+    $xpath = $this->xpath('//div[@class="node node--type-article node--view-mode-full ds-1col clearfix"]');
+    $this->assertTrue(count($xpath) == 1);
+    $this->assertTrimEqual($xpath[0]->div->p, $node->get('body')->value);
+
+    // Switch theme.
+    $this->container->get('theme_installer')->install(['ds_test_layout_theme']);
+    $config = \Drupal::configFactory()->getEditable('system.theme');
+    $config->set('default', 'ds_test_layout_theme')->save();
+    drupal_flush_all_caches();
+
+    // Go to the node.
+    $this->drupalGet('node/' . $node->id());
+    $this->assertRaw('id="overridden-ds-1-col-template"');
+    $xpath = $this->xpath('//div[@class="node node--type-article node--view-mode-full ds-1col clearfix"]');
+    $this->assertTrue(count($xpath) == 1);
+    $this->assertTrimEqual($xpath[0]->div->p, $node->get('body')->value);
+
   }
 
 }
diff --git a/tests/themes/ds_test_layout_theme/templates/ds-1col--node.html.twig b/tests/themes/ds_test_layout_theme/templates/ds-1col--node.html.twig
new file mode 100644
index 0000000..c18dbc4
--- /dev/null
+++ b/tests/themes/ds_test_layout_theme/templates/ds-1col--node.html.twig
@@ -0,0 +1,18 @@
+{#
+/**
+ * @file
+ * Display Suite 1 column template.
+ *
+ * Available variables:
+ * - ds_content_wrapper: wrapper around content
+ * - attributes: content region attributes
+ * - ds_content: content region
+ */
+#}
+<{{ ds_content_wrapper }}{{ attributes.addClass('ds-1col', 'clearfix') }} id="overridden-ds-1-col-template">
+
+  {{ title_suffix.contextual_links }}
+
+  {{ ds_content }}
+
+</{{ ds_content_wrapper }}>