diff --git a/templates/blocks/block--page-title-block.html.twig b/templates/blocks/block--page-title-block.html.twig
index a8dd45399586f14f97822cd1b68bfcd1868cad57..a8f06feda739bfa6b92774cc5ccdf236331a3c69 100644
--- a/templates/blocks/block--page-title-block.html.twig
+++ b/templates/blocks/block--page-title-block.html.twig
@@ -21,3 +21,40 @@
     {% endblock %}
   </div>
 {% endif %}
+{# // OHANA // OHANA // OHANA // OHANA
+
+/**
+ * @file
+ * Theme override for page title block.
+ */
+
+
+{% set classes = [
+  'l-block--provider-' ~ configuration.provider|clean_class,
+  'l-block--id-' ~ plugin_id|clean_class,
+] %}
+
+{% set attributes = attributes.addClass(classes) %}
+
+{% embed '@layouts/block/block.twig' with {
+  'attributes': attributes,
+  'block_wrapper': true,
+  'constrain': '',
+  'title_prefix': title_prefix,
+  'title_suffix': title_suffix,
+  'label': label is not empty ? label : false,
+  'content_wrapper': true
+} %}
+
+  {% block content %}
+    {% include '@components/page-title/page-title.twig' with {
+      'page_title': content['#title']
+    } %}
+  {% endblock %}
+
+{% endembed %}
+
+
+
+ OHANA // OHANA // OHANA // OHANA #}
+
diff --git a/templates/blocks/block.html.twig b/templates/blocks/block.html.twig
new file mode 100644
index 0000000000000000000000000000000000000000..cf54090cf2c0a8d19a5848b1a0c7620f24cb5faf
--- /dev/null
+++ b/templates/blocks/block.html.twig
@@ -0,0 +1,46 @@
+{#
+ /**
+  * @file
+  * Theme override to display a block.
+  *
+  * Available variables:
+  * - plugin_id: The ID of the block implementation.
+  * - label: The configured label of the block if visible.
+  * - configuration: A list of the block's configuration values.
+  *   - label: The configured label for the block.
+  *   - label_display: The display settings for the label.
+  *   - provider: The module or other provider that provided this block plugin.
+  *   - Block plugin specific settings will also be stored here.
+  * - content: The content of this block.
+  * - attributes: array of HTML attributes populated by modules, intended to be added to the main container tag of this template.
+  *   - id: A valid HTML ID and guaranteed unique.
+  * - title_attributes: Same as attributes, except applied to the main title tag that appears in the template.
+  * - title_prefix: Additional output populated by modules, intended to be displayed in front of the main title tag that appears in the template.
+  * - title_suffix: Additional output populated by modules, intended to be displayed after the main title tag that appears in the template.
+  *
+  * @see template_preprocess_block()
+  */
+#}
+
+{% set classes = [
+  'l-block--provider-' ~ configuration.provider|clean_class,
+  'l-block--id-' ~ plugin_id|clean_class,
+] %}
+
+{% set attributes = attributes.addClass(classes) %}
+
+{% embed '@layouts/block/block.twig' with {
+  'attributes': attributes,
+  'block_wrapper': true,
+  'constrain': '',
+  'title_prefix': title_prefix,
+  'title_suffix': title_suffix,
+  'label': label is not empty ? label : false,
+  'content_wrapper': true
+} %}
+
+  {% block content %}
+    {{ content }}
+  {% endblock %}
+
+{% endembed %}