diff --git a/block-template-parts/category-tag-clouds.html b/block-template-parts/category-tag-clouds.html
new file mode 100644
index 0000000..9b5e12b
--- /dev/null
+++ b/block-template-parts/category-tag-clouds.html
@@ -0,0 +1,9 @@
+<!-- wp:columns {"style":{"color":{"link":"var:preset|color|darker-gray"}},"textColor":"cyan-bluish-gray"} -->
+<div class="wp-block-columns has-cyan-bluish-gray-color has-text-color has-background has-link-color" style="--wp--style--color--link:var(--wp--preset--color--darker-gray)"><!-- wp:column -->
+    <div class="wp-block-column"><!-- wp:tag-cloud {"taxonomy":"category"} /--></div>
+    <!-- /wp:column -->
+
+    <!-- wp:column -->
+    <div class="wp-block-column"><!-- wp:tag-cloud /--></div>
+    <!-- /wp:column --></div>
+<!-- /wp:columns -->
\ No newline at end of file
diff --git a/block-template-parts/template-part-3.html b/block-template-parts/latest-posts.html
similarity index 100%
rename from block-template-parts/template-part-3.html
rename to block-template-parts/latest-posts.html
diff --git a/block-template-parts/page-tree.html b/block-template-parts/page-tree.html
index 287eb98..33c772b 100644
--- a/block-template-parts/page-tree.html
+++ b/block-template-parts/page-tree.html
@@ -19,5 +19,5 @@ <h3>Page Tree ( shortcode )</h3>
 <!-- /wp:heading -->
 
 <!-- wp:html -->
-[bw_tree post_type=page post_parent=0 orderby=menu_order,title,ID order=ASC exclude=-1]
+[bw_tree post_type=page post_parent=0 orderby="menu_order title ID" order=ASC exclude=-1]
 <!-- /wp:html -->
\ No newline at end of file
diff --git a/block-template-parts/template-part.html b/block-template-parts/query-pagination.html
similarity index 100%
rename from block-template-parts/template-part.html
rename to block-template-parts/query-pagination.html
diff --git a/block-template-parts/template-part-2.html b/block-template-parts/template-part-2.html
deleted file mode 100644
index 2b6626a..0000000
--- a/block-template-parts/template-part-2.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!-- wp:columns {"style":{"color":{"link":"var:preset|color|darker-gray"}},"backgroundColor":"very-light-gray","textColor":"cyan-bluish-gray"} -->
-<div class="wp-block-columns has-cyan-bluish-gray-color has-very-light-gray-background-color has-text-color has-background has-link-color" style="--wp--style--color--link:var(--wp--preset--color--darker-gray)"><!-- wp:column -->
-    <div class="wp-block-column"><!-- wp:tag-cloud {"taxonomy":"category"} /--></div>
-    <!-- /wp:column -->
-
-    <!-- wp:column -->
-    <div class="wp-block-column"><!-- wp:tag-cloud /--></div>
-    <!-- /wp:column --></div>
-<!-- /wp:columns -->
\ No newline at end of file