diff --git a/inc/setup.php b/inc/setup.php
index 2e23f83..339c01b 100644
--- a/inc/setup.php
+++ b/inc/setup.php
@@ -91,6 +91,9 @@ function setup() {
 	add_theme_support( 'editor-styles' );
 	add_editor_style( 'dist/css/editor.css' );
 
+	// Add support for Block Template Part.
+	add_theme_support( 'block-template-parts' );
+
 	/**
 	 * Remove theme support declarations.
 	 */
@@ -120,26 +123,6 @@ function menus() {
 }
 add_action( 'init', __NAMESPACE__ . '\\menus' );
 
-/**
- * Register widget areas.
- *
- * @link https://developer.wordpress.org/themes/functionality/sidebars/#registering-a-sidebar
- */
-function widget_areas() {
-	register_sidebar(
-		array(
-			'name'          => esc_html__( 'Footer', 'themescaffold' ),
-			'id'            => 'footer',
-			'description'   => esc_html__( 'Footer blocks.', 'themescaffold' ),
-			'before_widget' => '',
-			'after_widget'  => '',
-			'before_title'  => '<h2 class="widget-title">',
-			'after_title'   => '</h2>',
-		)
-	);
-}
-add_action( 'widgets_init', __NAMESPACE__ . '\\widget_areas' );
-
 /**
  * Register scripts and styles.
  *
diff --git a/parts/footer.html b/parts/footer.html
new file mode 100644
index 0000000..e69de29
diff --git a/template-parts/site/footer.php b/template-parts/site/footer.php
index ff3a580..37a1565 100644
--- a/template-parts/site/footer.php
+++ b/template-parts/site/footer.php
@@ -15,7 +15,7 @@
 		</nav>
 
 		<div class="site-footer__widgets">
-			<?php get_sidebar( 'footer' ); ?>
+			<?php block_template_part( 'footer' ); ?>
 		</div>
 	</div>
 </footer><!-- .site-footer -->