diff --git a/blockbase/theme.json b/blockbase/theme.json
index 7ed7679a8..010c02eab 100644
--- a/blockbase/theme.json
+++ b/blockbase/theme.json
@@ -33,6 +33,10 @@
 		{
 			"name": "footer",
 			"area": "footer"
+		},
+		{
+			"name": "post-meta-icons",
+			"area": "uncategorized"
 		}
 	],
 	"customTemplates": [
diff --git a/erma/templates/archive.html b/erma/templates/archive.html
index d3e95daf7..b8b689e42 100644
--- a/erma/templates/archive.html
+++ b/erma/templates/archive.html
@@ -1,4 +1,4 @@
-<!-- wp:template-part {"slug":"header","theme":"erma","tagName":"header"} /-->
+<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
 
 <!-- wp:group {"style":{"spacing":{"padding":{"right":"var:preset|spacing|70","left":"var:preset|spacing|70"}}},"layout":{"type":"constrained"}} -->
 <div class="wp-block-group" style="padding-right:var(--wp--preset--spacing--70);padding-left:var(--wp--preset--spacing--70)"><!-- wp:query {"queryId":31,"query":{"perPage":10,"pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true,"taxQuery":null,"parents":[]},"tagName":"main","displayLayout":{"type":"flex","columns":5},"align":"wide","layout":{"type":"default"}} -->
@@ -24,4 +24,4 @@
 <!-- /wp:query --></div>
 <!-- /wp:group -->
 
-<!-- wp:template-part {"slug":"footer","theme":"erma","tagName":"footer"} /-->
\ No newline at end of file
+<!-- wp:template-part {"slug":"footer","tagName":"footer"} /-->
\ No newline at end of file
diff --git a/erma/templates/home.html b/erma/templates/home.html
index 53b034c81..b7690560f 100644
--- a/erma/templates/home.html
+++ b/erma/templates/home.html
@@ -1,4 +1,4 @@
-<!-- wp:template-part {"slug":"header","theme":"erma","tagName":"header"} /-->
+<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
 
 <!-- wp:group {"style":{"spacing":{"padding":{"right":"var:preset|spacing|70","left":"var:preset|spacing|70"}}},"layout":{"type":"constrained"}} -->
 <div class="wp-block-group" style="padding-right:var(--wp--preset--spacing--70);padding-left:var(--wp--preset--spacing--70)"><!-- wp:columns {"align":"wide"} -->
@@ -152,4 +152,4 @@
 <!-- /wp:columns --></div>
 <!-- /wp:group -->
 
-<!-- wp:template-part {"slug":"footer","theme":"erma","tagName":"footer"} /-->
\ No newline at end of file
+<!-- wp:template-part {"slug":"footer","tagName":"footer"} /-->
\ No newline at end of file
diff --git a/erma/templates/index.html b/erma/templates/index.html
index 0d5712823..5108e832d 100644
--- a/erma/templates/index.html
+++ b/erma/templates/index.html
@@ -1,4 +1,4 @@
-<!-- wp:template-part {"slug":"header","theme":"erma","tagName":"header"} /-->
+<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
 
 <!-- wp:group {"style":{"spacing":{"padding":{"right":"var:preset|spacing|70","left":"var:preset|spacing|70"}}},"layout":{"type":"constrained"}} -->
 <div class="wp-block-group" style="padding-right:var(--wp--preset--spacing--70);padding-left:var(--wp--preset--spacing--70)"><!-- wp:query {"queryId":15,"query":{"perPage":10,"pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":false,"taxQuery":null,"parents":[]},"tagName":"main","displayLayout":{"type":"flex","columns":5},"align":"wide","layout":{"type":"default"}} -->
@@ -22,4 +22,4 @@
 <!-- /wp:query-pagination --></div>
 <!-- /wp:group -->
 
-<!-- wp:template-part {"slug":"footer","theme":"erma","tagName":"footer"} /-->
\ No newline at end of file
+<!-- wp:template-part {"slug":"footer","tagName":"footer"} /-->
\ No newline at end of file
diff --git a/erma/templates/page.html b/erma/templates/page.html
index 485c21fe4..00f30fd86 100644
--- a/erma/templates/page.html
+++ b/erma/templates/page.html
@@ -1,4 +1,4 @@
-<!-- wp:template-part {"slug":"header","theme":"erma","tagName":"header"} /-->
+<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
 
 <!-- wp:group {"style":{"spacing":{"padding":{"right":"var:preset|spacing|70","left":"var:preset|spacing|70"}}},"layout":{"type":"constrained"}} -->
 <div class="wp-block-group" style="padding-right:var(--wp--preset--spacing--70);padding-left:var(--wp--preset--spacing--70)"><!-- wp:columns {"align":"wide","style":{"spacing":{"blockGap":{"top":"var:preset|spacing|80","left":"var:preset|spacing|80"}}}} -->
@@ -14,4 +14,4 @@
 <!-- /wp:columns --></div>
 <!-- /wp:group -->
 
-<!-- wp:template-part {"slug":"footer","theme":"erma","tagName":"footer"} /-->
\ No newline at end of file
+<!-- wp:template-part {"slug":"footer","tagName":"footer"} /-->
\ No newline at end of file
diff --git a/erma/templates/search.html b/erma/templates/search.html
index 6124302b6..6c2acedbb 100644
--- a/erma/templates/search.html
+++ b/erma/templates/search.html
@@ -1,4 +1,4 @@
-<!-- wp:template-part {"slug":"header","theme":"erma","tagName":"header"} /-->
+<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
 
 <!-- wp:group {"style":{"spacing":{"padding":{"right":"var:preset|spacing|70","left":"var:preset|spacing|70"}}},"layout":{"type":"constrained"}} -->
 <div class="wp-block-group" style="padding-right:var(--wp--preset--spacing--70);padding-left:var(--wp--preset--spacing--70)"><!-- wp:query {"queryId":31,"query":{"perPage":10,"pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true,"taxQuery":null,"parents":[]},"tagName":"main","displayLayout":{"type":"flex","columns":5},"align":"wide","layout":{"type":"default"}} -->
@@ -34,4 +34,4 @@
 <!-- /wp:query --></div>
 <!-- /wp:group -->
 
-<!-- wp:template-part {"slug":"footer","theme":"erma","tagName":"footer"} /-->
\ No newline at end of file
+<!-- wp:template-part {"slug":"footer","tagName":"footer"} /-->
\ No newline at end of file
diff --git a/erma/templates/single.html b/erma/templates/single.html
index 54c947a7b..ddcbf902f 100644
--- a/erma/templates/single.html
+++ b/erma/templates/single.html
@@ -1,4 +1,4 @@
-<!-- wp:template-part {"slug":"header","theme":"erma","tagName":"header"} /-->
+<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
 
 <!-- wp:group {"align":"full","style":{"spacing":{"padding":{"right":"var:preset|spacing|70","left":"var:preset|spacing|70"}}},"layout":{"type":"constrained"}} -->
 <div class="wp-block-group alignfull" style="padding-right:var(--wp--preset--spacing--70);padding-left:var(--wp--preset--spacing--70)"><!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"right":"0","left":"0"}}},"layout":{"type":"default"}} -->
@@ -22,7 +22,7 @@
 <!-- wp:column -->
 <div class="wp-block-column"><!-- wp:post-content {"lock":{"move":false,"remove":false},"layout":{"type":"default"}} /-->
 
-<!-- wp:template-part {"slug":"post-meta","theme":"erma"} /--></div>
+<!-- wp:template-part {"slug":"post-meta"} /--></div>
 <!-- /wp:column --></div>
 <!-- /wp:columns --></div>
 <!-- /wp:group -->
@@ -38,4 +38,4 @@
 <!-- /wp:group --></div>
 <!-- /wp:group -->
 
-<!-- wp:template-part {"slug":"footer","theme":"erma","tagName":"footer"} /-->
\ No newline at end of file
+<!-- wp:template-part {"slug":"footer","tagName":"footer"} /-->
\ No newline at end of file
diff --git a/erma/theme.json b/erma/theme.json
index 401207b9c..370e8720f 100644
--- a/erma/theme.json
+++ b/erma/theme.json
@@ -640,6 +640,10 @@
 		{
 			"area": "footer",
 			"name": "footer"
+		},
+		{
+			"area": "uncategorized",
+			"name": "post-meta"
 		}
 	],
 	"version": 2,
diff --git a/poesis/templates/single.html b/poesis/templates/single.html
index fd0cc494e..a565d0712 100644
--- a/poesis/templates/single.html
+++ b/poesis/templates/single.html
@@ -32,7 +32,7 @@
 <div style="height:40px" aria-hidden="true" class="wp-block-spacer"></div>
 <!-- /wp:spacer -->
 
-<!-- wp:template-part {"slug":"post-meta","theme":"poesis","area":"uncategorized"} /--></div>
+<!-- wp:template-part {"slug":"post-meta","area":"uncategorized"} /--></div>
 <!-- /wp:column -->
 
 <!-- wp:column {"width":"10%"} -->
diff --git a/poesis/theme.json b/poesis/theme.json
index 345736292..69c69480c 100644
--- a/poesis/theme.json
+++ b/poesis/theme.json
@@ -539,6 +539,10 @@
 		{
 			"area": "footer",
 			"name": "footer"
+		},
+		{
+			"area": "uncategorized",
+			"name": "post-meta"
 		}
 	],
 	"version": 2,