diff --git a/app/Admin/Blocks.php b/app/Admin/Blocks.php
deleted file mode 100644
index 8a7e51f..0000000
--- a/app/Admin/Blocks.php
+++ /dev/null
@@ -1,155 +0,0 @@
-<?php
-
-namespace App\Admin;
-use Blocks\Editor;
-
-class Blocks
-{
-    public function __construct()
-    {
-        add_filter( 'block_categories_all' ,   [$this, 'categories']);
-        add_action('allowed_block_types_all', [$this, 'blacklist'], 100, 2);
-    }
-
-    public function categories( $categories )
-    {
-
-        // Adding a new category.
-        $categories = array_merge([
-            [
-                'slug'  => 'badegg',
-                'title' => __('Provided by Bad Egg Digital'),
-            ],
-        ], $categories);
-
-        return $categories;
-    }
-
-    public function blacklist()
-    {
-        // Reference:
-        // https://www.wpexplorer.com/how-to-remove-gutenberg-blocks/
-        // https://www.wpexplorer.com/wordpress-core-blocks-list/
-
-        // Existing blocks with Blade templates
-        // https://roots.io/acorn/docs/rendering-blade-views/#existing-blocks-with-blade-templates
-
-        $blocks = array_keys( \WP_Block_Type_Registry::get_instance()->get_all_registered() );
-
-        $blacklist = [
-            // Design
-            'core/button',
-            'core/comment-template',
-            'core/home-link',
-            'core/navigation-link',
-            'core/navigation-submenu',
-            'core/buttons',
-            'core/column',
-            'core/columns',
-            'core/group',
-            'core/more',
-            'core/nextpage',
-            'core/separator',
-            'core/spacer',
-            'core/text-columns',
-
-            // Embed
-            'core/embed',
-
-            // Media
-            'core/cover',
-            'core/file',
-            'core/gallery',
-            'core/image',
-            'core/media-text',
-            'core/audio',
-            'core/video',
-
-            // Reusable
-            'core/block',
-
-            // Text
-            'core/footnotes',
-            'core/heading',
-            'core/list',
-            'core/code',
-            'core/details',
-            'core/freeform',
-            'core/list-item',
-            'core/missing',
-            'core/paragraph',
-            'core/preformatted',
-            'core/pullquote',
-            'core/quote',
-            'core/table',
-            'core/verse',
-
-            // Theme
-            'core/avatar',
-            'core/comment-author-name',
-            'core/comment-content',
-            'core/comment-date',
-            'core/comment-edit-link',
-            'core/comment-reply-link',
-            'core/comments',
-            'core/comments-pagination',
-            'core/comments-pagination-next',
-            'core/comments-pagination-numbers',
-            'core/comments-pagination-previous',
-            'core/comments-title',
-            'core/loginout',
-            'core/navigation',
-            'core/pattern',
-            'core/post-author',
-            'core/post-author-biography',
-            'core/post-author-name',
-            'core/post-comments-form',
-            'core/post-content',
-            'core/post-date',
-            'core/post-excerpt',
-            'core/post-featured-image',
-            'core/post-navigation-link',
-            'core/post-template',
-            'core/post-terms',
-            'core/post-title',
-            'core/query',
-            'core/query-no-results',
-            'core/query-pagination',
-            'core/query-pagination-next',
-            'core/query-pagination-numbers',
-            'core/query-pagination-previous',
-            'core/query-title',
-            'core/read-more',
-            'core/site-logo',
-            'core/site-tagline',
-            'core/site-title',
-            'core/template-part',
-            'core/term-description',
-            'core/post-comments',
-
-            // Widgets
-            'core/legacy-widget',
-            'core/widget-group',
-            'core/archives',
-            'core/calendar',
-            'core/categories',
-            'core/latest-comments',
-            'core/latest-posts',
-            'core/page-list',
-            'core/page-list-item',
-            'core/rss',
-            'core/search',
-            'core/shortcode',
-            'core/social-link',
-            'core/tag-cloud',
-            'core/html',
-            'core/social-links',
-        ];
-
-        $Editor = new Editor\Editor();
-
-        $blacklist = array_diff($blacklist, $Editor->inner_blocks());
-
-        return array_values( array_diff( $blocks, $blacklist ) );
-    }
-}
diff --git a/app/blocks.php b/app/blocks.php
new file mode 100644
index 0000000..b343a72
--- /dev/null
+++ b/app/blocks.php
@@ -0,0 +1,51 @@
+<?php
+
+/**
+ * Theme Blocks.
+ */
+
+namespace App;
+
+add_filter( 'block_categories_all' , function ( $categories ) {
+
+        // Adding a new category.
+        $categories = array_merge([
+            [
+                'slug'  => 'badegg',
+                'title' => __('Provided by Bad Egg Digital'),
+            ],
+        ], $categories);
+
+        return $categories;
+});
+
+add_action('allowed_block_types_all', function(){
+    $blocks = block_all();
+    $blacklist = array_diff($blocks, block_whitelist());
+
+    return array_values( array_diff( $blocks, $blacklist ) );
+}, 100, 2);
+
+function block_whitelist()
+{
+    $file = file_get_contents(get_theme_file_path("resources/json/core-block-whitelist.json"));
+    $json = json_decode($file);
+
+    return $json;
+}
+
+function block_all()
+{
+    $enabled_blocks = array_map(function($block) {
+        $name = $block->name;
+
+        return $block->name;
+
+    }, \WP_Block_Type_Registry::get_instance()->get_all_registered());
+
+    return array_values($enabled_blocks);
+}
+
+add_action('wp_footer', function(){
+    echo '<pre>',print_r(block_all()),'</pre>';
+});
diff --git a/functions.php b/functions.php
index d5eb088..247a50a 100644
--- a/functions.php
+++ b/functions.php
@@ -85,7 +85,7 @@ autoload_psr4_blocks();
 |
 */
 
-collect(['setup', 'filters'])
+collect(['setup', 'filters', 'blocks'])
     ->each(function ($file) {
         if (! locate_template($file = "app/{$file}.php", true, true)) {
             wp_die(