diff --git a/inc/vk-blocks/vk-blocks-functions.php b/inc/vk-blocks/vk-blocks-functions.php
index 955593c50..cc0e8f958 100644
--- a/inc/vk-blocks/vk-blocks-functions.php
+++ b/inc/vk-blocks/vk-blocks-functions.php
@@ -254,8 +254,12 @@ function vkblocks_blocks_categories( $categories, $post ) {
 
 		return $categories;
 	}
-
-	add_filter( 'block_categories', 'vkblocks_blocks_categories', 10, 2 );
+	// ver5.8.0 block_categories_all
+	if ( function_exists( 'get_default_block_categories' ) && function_exists( 'get_block_editor_settings' ) ) {
+		add_filter( 'block_categories_all', 'vkblocks_blocks_categories', 10, 2 );
+	} else {
+		add_filter( 'block_categories', 'vkblocks_blocks_categories', 10, 2 );
+	}
 }
 
 if ( ! function_exists( 'vkblocks_set_wp_version' ) ) {
diff --git a/src/blocks/pr-content/block.json b/src/blocks/pr-content/block.json
index 34768137c..fd4c0eb8c 100644
--- a/src/blocks/pr-content/block.json
+++ b/src/blocks/pr-content/block.json
@@ -64,5 +64,8 @@
 			"type": "string",
 			"default": "<i class='fas fa-user'></i>"
 		}
+	},
+	"supports": {
+		"className": true
 	}
 }
diff --git a/src/blocks/staff/block.json b/src/blocks/staff/block.json
index 61b53fa37..dac2ad6a9 100644
--- a/src/blocks/staff/block.json
+++ b/src/blocks/staff/block.json
@@ -68,5 +68,8 @@
             "type": "string",
             "default": "0"
         }
-    }
+    },
+	"supports": {
+		"className": true
+	}
 }