diff --git a/jaida/templates/404.html b/jaida/templates/404.html
index 21c506a845..889a220478 100644
--- a/jaida/templates/404.html
+++ b/jaida/templates/404.html
@@ -1,4 +1,4 @@
-<!-- wp:template-part {"slug":"secondary-header","theme":"jaida"} /-->
+<!-- wp:template-part {"slug":"secondary-header"} /-->
 
 <!-- wp:group {"tagName":"main","style":{"spacing":{"blockGap":"var:preset|spacing|50","margin":{"top":"16vh","bottom":"16vh"}}},"layout":{"type":"constrained","wideSize":"1400px"}} -->
 <main class="wp-block-group" style="margin-top:16vh;margin-bottom:16vh"><!-- wp:heading {"textAlign":"left","level":1,"align":"wide","className":"wp-block-heading","anchor":"oops-that-page-can-t-be-found"} -->
@@ -12,4 +12,4 @@ <h1 class="wp-block-heading alignwide has-text-align-left" id="oops-that-page-ca
 <!-- wp:search {"label":"","showLabel":false} /--></main>
 <!-- /wp:group -->
 
-<!-- wp:template-part {"slug":"footer","theme":"jaida","tagName":"footer"} /-->
\ No newline at end of file
+<!-- wp:template-part {"slug":"footer","tagName":"footer"} /-->
\ No newline at end of file
diff --git a/jaida/templates/archive.html b/jaida/templates/archive.html
index f103780795..04f9246049 100644
--- a/jaida/templates/archive.html
+++ b/jaida/templates/archive.html
@@ -1,4 +1,4 @@
-<!-- wp:template-part {"slug":"secondary-header","theme":"jaida"} /-->
+<!-- wp:template-part {"slug":"secondary-header"} /-->
 
 <!-- wp:query {"queryId":14,"query":{"perPage":"6","pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"exclude","inherit":false},"displayLayout":{"type":"flex","columns":3},"layout":{"type":"constrained","wideSize":"1400px"}} -->
 <div class="wp-block-query"><!-- wp:query-title {"type":"archive","align":"wide","style":{"spacing":{"margin":{"bottom":"10vh","top":"10vh"}}}} /-->
@@ -42,4 +42,4 @@
 <!-- /wp:spacer --></div>
 <!-- /wp:query -->
 
-<!-- wp:template-part {"slug":"footer","theme":"jaida","tagName":"footer"} /-->
\ No newline at end of file
+<!-- wp:template-part {"slug":"footer","tagName":"footer"} /-->
\ No newline at end of file
diff --git a/jaida/templates/index.html b/jaida/templates/index.html
index e9f20b52f6..ca7435a42c 100644
--- a/jaida/templates/index.html
+++ b/jaida/templates/index.html
@@ -1,4 +1,4 @@
-<!-- wp:template-part {"slug":"secondary-header","theme":"jaida"} /-->
+<!-- wp:template-part {"slug":"secondary-header"} /-->
 
 <!-- wp:query {"queryId":14,"query":{"perPage":"6","pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"exclude","inherit":false},"displayLayout":{"type":"flex","columns":3},"layout":{"type":"constrained","wideSize":"1400px"}} -->
 <div class="wp-block-query"><!-- wp:spacer {"height":""} -->
@@ -40,4 +40,4 @@
 <!-- /wp:spacer --></div>
 <!-- /wp:query -->
 
-<!-- wp:template-part {"slug":"footer","theme":"jaida"} /-->
\ No newline at end of file
+<!-- wp:template-part {"slug":"footer"} /-->
\ No newline at end of file
diff --git a/jaida/templates/page.html b/jaida/templates/page.html
index e9c2fe0e73..56547999d8 100644
--- a/jaida/templates/page.html
+++ b/jaida/templates/page.html
@@ -1,4 +1,4 @@
-<!-- wp:template-part {"slug":"secondary-header","theme":"jaida"} /-->
+<!-- wp:template-part {"slug":"secondary-header"} /-->
 
 <!-- wp:group {"tagName":"main","lock":{"move":false,"remove":true},"style":{"spacing":{"blockGap":"var:preset|spacing|50","padding":{"right":"var:preset|spacing|50","left":"var:preset|spacing|50"}}},"layout":{"type":"constrained","contentSize":"600px","wideSize":"1400px"}} -->
 <main class="wp-block-group" style="padding-right:var(--wp--preset--spacing--50);padding-left:var(--wp--preset--spacing--50)"><!-- wp:spacer {"height":"60px"} -->
@@ -17,5 +17,5 @@
 <!-- /wp:group -->
 
 <!-- wp:group {"layout":{"type":"default"}} -->
-<div class="wp-block-group"><!-- wp:template-part {"slug":"footer","theme":"jaida","tagName":"footer"} /--></div>
+<div class="wp-block-group"><!-- wp:template-part {"slug":"footer","tagName":"footer"} /--></div>
 <!-- /wp:group -->
\ No newline at end of file
diff --git a/jaida/templates/search.html b/jaida/templates/search.html
index 5dd5ef5685..2cd84f5347 100644
--- a/jaida/templates/search.html
+++ b/jaida/templates/search.html
@@ -1,4 +1,4 @@
-<!-- wp:template-part {"slug":"secondary-header","theme":"jaida"} /-->
+<!-- wp:template-part {"slug":"secondary-header"} /-->
 
 <!-- wp:query {"queryId":14,"query":{"perPage":"6","pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"exclude","inherit":true},"displayLayout":{"type":"flex","columns":3},"layout":{"type":"constrained","wideSize":"1400px"}} -->
 <div class="wp-block-query"><!-- wp:query-title {"type":"search","style":{"spacing":{"margin":{"top":"10vh","bottom":"10vh"}}}} /-->
@@ -90,4 +90,4 @@
 <!-- /wp:spacer --></div>
 <!-- /wp:query -->
 
-<!-- wp:template-part {"slug":"footer","theme":"jaida","tagName":"footer"} /-->
\ No newline at end of file
+<!-- wp:template-part {"slug":"footer","tagName":"footer"} /-->
\ No newline at end of file
diff --git a/jaida/templates/single.html b/jaida/templates/single.html
index f15aabb6dd..948defb699 100644
--- a/jaida/templates/single.html
+++ b/jaida/templates/single.html
@@ -2,7 +2,7 @@
 <div class="wp-block-group"><!-- wp:cover {"overlayColor":"primary","minHeight":40,"minHeightUnit":"vh","style":{"spacing":{"padding":{"top":"0","right":"0","bottom":"0","left":"0"}}}} -->
 <div class="wp-block-cover" style="padding-top:0;padding-right:0;padding-bottom:0;padding-left:0;min-height:40vh"><span aria-hidden="true" class="wp-block-cover__background has-primary-background-color has-background-dim-100 has-background-dim"></span><div class="wp-block-cover__inner-container"><!-- wp:cover {"useFeaturedImage":true,"dimRatio":70,"overlayColor":"primary","minHeight":40,"minHeightUnit":"vh","style":{"spacing":{"padding":{"top":"0","right":"0","bottom":"0","left":"0"}}}} -->
 <div class="wp-block-cover" style="padding-top:0;padding-right:0;padding-bottom:0;padding-left:0;min-height:40vh"><span aria-hidden="true" class="wp-block-cover__background has-primary-background-color has-background-dim-70 has-background-dim"></span><div class="wp-block-cover__inner-container"><!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|80"}},"layout":{"type":"default"}} -->
-<div class="wp-block-group"><!-- wp:template-part {"slug":"header","theme":"jaida","tagName":"header"} /-->
+<div class="wp-block-group"><!-- wp:template-part {"slug":"header","tagName":"header"} /-->
 
 <!-- wp:spacer -->
 <div style="height:100px" aria-hidden="true" class="wp-block-spacer"></div>
@@ -11,7 +11,7 @@
 <!-- wp:group {"style":{"spacing":{"padding":{"right":"var:preset|spacing|50","left":"var:preset|spacing|50"}}},"layout":{"type":"constrained","wideSize":"1100px"}} -->
 <div class="wp-block-group" style="padding-right:var(--wp--preset--spacing--50);padding-left:var(--wp--preset--spacing--50)"><!-- wp:post-title {"style":{"typography":{"fontSize":"4.6rem"}}} /-->
 
-<!-- wp:template-part {"slug":"post-meta","theme":"jaida","area":"uncategorized"} /--></div>
+<!-- wp:template-part {"slug":"post-meta","area":"uncategorized"} /--></div>
 <!-- /wp:group -->
 
 <!-- wp:spacer -->
@@ -79,7 +79,7 @@
 <!-- /wp:column -->
 
 <!-- wp:column {"width":"33.33%","lock":{"move":false,"remove":true},"style":{"spacing":{"padding":{"top":"0","right":"0","bottom":"0","left":"0"},"blockGap":"var:preset|spacing|50"}}} -->
-<div class="wp-block-column" style="padding-top:0;padding-right:0;padding-bottom:0;padding-left:0;flex-basis:33.33%"><!-- wp:template-part {"slug":"sidebar-2","theme":"jaida"} /--></div>
+<div class="wp-block-column" style="padding-top:0;padding-right:0;padding-bottom:0;padding-left:0;flex-basis:33.33%"><!-- wp:template-part {"slug":"sidebar-2"} /--></div>
 <!-- /wp:column --></div>
 <!-- /wp:columns -->
 
@@ -97,5 +97,5 @@
 <!-- /wp:group -->
 
 <!-- wp:group {"layout":{"type":"default"}} -->
-<div class="wp-block-group"><!-- wp:template-part {"slug":"footer","theme":"jaida","tagName":"footer"} /--></div>
+<div class="wp-block-group"><!-- wp:template-part {"slug":"footer","tagName":"footer"} /--></div>
 <!-- /wp:group -->
\ No newline at end of file