diff --git a/composer.json b/composer.json
index 716265e..aea4a15 100644
--- a/composer.json
+++ b/composer.json
@@ -11,6 +11,6 @@
         }
     ],
     "require": {
-        "drupal/fences": "^8.2"
+        "drupal/fences": "^2.0@alpha"
     }
 }
diff --git a/fences_block.module b/fences_block.module
index 79f522f..61682ef 100644
--- a/fences_block.module
+++ b/fences_block.module
@@ -10,11 +10,13 @@ use Drupal\fences_block\FencesBlock;
 
 /**
  * Implements hook_theme_registry_alter().
+ * // #webksde#JP20171211: Hack: This is killing custom theme overrides: => Removed <=
+ * https://www.drupal.org/project/2856428/issues/2929951
  */
-function fences_block_theme_registry_alter(array &$theme_registry) {
-  $path = drupal_get_path('module', 'fences_block');
-  $theme_registry['block']['path'] = $path . '/templates';
-}
+//function fences_block_theme_registry_alter(array &$theme_registry) {
+  //  $path = drupal_get_path('module', 'fences_block');
+  //  $theme_registry['block']['path'] = $path . '/templates';
+//}
 
 /**
  * Implements hook_form_FORM_ID_alter().
diff --git a/src/FencesBlock.php b/src/FencesBlock.php
index a9167b9..37c0010 100644
--- a/src/FencesBlock.php
+++ b/src/FencesBlock.php
@@ -3,7 +3,7 @@
 namespace Drupal\fences_block;
 
 use Drupal\Core\Config\Entity\ThirdPartySettingsInterface;
-use Drupal\Core\Entity\Entity;
+use Drupal\block\BlockInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\StringTranslation\TranslatableMarkup;
 use Drupal\block\Entity\Block;
@@ -96,7 +96,7 @@ public static function addConfigForm(array &$form, FormStateInterface $form_stat
    *
    * @param string $entity_type_id
    *   The entity type identifier.
-   * @param \Drupal\Core\Entity\Entity $entity
+   * @param \Drupal\block\BlockInterface $entity
    *   The entity object.
    * @param array &$form
    *   An array of form elements.
@@ -105,7 +105,7 @@ public static function addConfigForm(array &$form, FormStateInterface $form_stat
    */
   public static function buildBlockEntity(
     $entity_type_id,
-    Entity $entity,
+    BlockInterface $entity,
     array &$form,
     FormStateInterface &$form_state
   ) {