diff --git a/src/blocks/balloon/edit.js b/src/blocks/balloon/edit.js
index cac92434..055be838 100644
--- a/src/blocks/balloon/edit.js
+++ b/src/blocks/balloon/edit.js
@@ -325,7 +325,7 @@ export default function ( { attributes, setAttributes, className } ) {
 			</InspectorControls>
 
 			{ showAvatar && (
-				<BlockControls gruop="block">
+				<BlockControls group="block">
 					<ToolbarGroup>
 						<ToolbarButton
 							icon={ pullLeft }
diff --git a/src/blocks/btn-box/edit.js b/src/blocks/btn-box/edit.js
index 82c2752b..8638320c 100644
--- a/src/blocks/btn-box/edit.js
+++ b/src/blocks/btn-box/edit.js
@@ -110,7 +110,7 @@ export default function ( {
 
 	return (
 		<>
-			<InspectorControls>
+			<InspectorControls group="styles">
 				<PanelColorGradientSettings
 					title={ __( 'Color', 'snow-monkey-blocks' ) }
 					initialOpen={ false }
@@ -130,7 +130,9 @@ export default function ( {
 					__experimentalHasMultipleOrigins={ true }
 					__experimentalIsRenderedInSidebar={ true }
 				></PanelColorGradientSettings>
+			</InspectorControls>
 
+			<InspectorControls>
 				<ToolsPanel
 					label={ __( 'Button settings', 'snow-monkey-blocks' ) }
 				>
diff --git a/src/blocks/btn/edit.js b/src/blocks/btn/edit.js
index 19ff0f55..1387d328 100644
--- a/src/blocks/btn/edit.js
+++ b/src/blocks/btn/edit.js
@@ -107,7 +107,7 @@ export default function ( {
 
 	return (
 		<>
-			<InspectorControls>
+			<InspectorControls group="styles">
 				<PanelColorGradientSettings
 					title={ __( 'Color', 'snow-monkey-blocks' ) }
 					initialOpen={ false }
@@ -146,6 +146,34 @@ export default function ( {
 					/>
 				</PanelColorGradientSettings>
 
+				<ToolsPanel label={ __( 'Border', 'snow-monkey-blocks' ) }>
+					<ToolsPanelItem
+						hasValue={ () =>
+							borderRadius !==
+							metadata.attributes.borderRadius.default
+						}
+						isShownByDefault
+						label={ __( 'Border radius', 'snow-monkey-blocks' ) }
+						onDeselect={ () =>
+							setAttributes( {
+								borderRadius:
+									metadata.attributes.borderRadius.default,
+							} )
+						}
+					>
+						<div className="smb-border-radius-control">
+							<BorderRadiusControl
+								values={ borderRadius }
+								onChange={ ( value ) => {
+									setAttributes( { borderRadius: value } );
+								} }
+							/>
+						</div>
+					</ToolsPanelItem>
+				</ToolsPanel>
+			</InspectorControls>
+
+			<InspectorControls>
 				<ToolsPanel
 					label={ __( 'Block settings', 'snow-monkey-blocks' ) }
 				>
@@ -206,30 +234,6 @@ export default function ( {
 						/>
 					</ToolsPanelItem>
 
-					<ToolsPanelItem
-						hasValue={ () =>
-							borderRadius !==
-							metadata.attributes.borderRadius.default
-						}
-						isShownByDefault
-						label={ __( 'Border radius', 'snow-monkey-blocks' ) }
-						onDeselect={ () =>
-							setAttributes( {
-								borderRadius:
-									metadata.attributes.borderRadius.default,
-							} )
-						}
-					>
-						<div className="smb-border-radius-control">
-							<BorderRadiusControl
-								values={ borderRadius }
-								onChange={ ( value ) => {
-									setAttributes( { borderRadius: value } );
-								} }
-							/>
-						</div>
-					</ToolsPanelItem>
-
 					<ToolsPanelItem
 						hasValue={ () =>
 							wrap !== metadata.attributes.wrap.default
diff --git a/src/blocks/countdown/edit.js b/src/blocks/countdown/edit.js
index 570da6ec..686a9d53 100644
--- a/src/blocks/countdown/edit.js
+++ b/src/blocks/countdown/edit.js
@@ -51,7 +51,7 @@ export default function ( { attributes, setAttributes, className } ) {
 				/>
 			</BlockControls>
 
-			<InspectorControls>
+			<InspectorControls group="styles">
 				<PanelColorGradientSettings
 					title={ __( 'Color', 'snow-monkey-blocks' ) }
 					initialOpen={ false }
@@ -76,7 +76,9 @@ export default function ( { attributes, setAttributes, className } ) {
 					__experimentalHasMultipleOrigins={ true }
 					__experimentalIsRenderedInSidebar={ true }
 				></PanelColorGradientSettings>
+			</InspectorControls>
 
+			<InspectorControls>
 				<ToolsPanel
 					label={ __( 'Block settings', 'snow-monkey-blocks' ) }
 				>
diff --git a/src/blocks/directory-structure/item/directory/edit.js b/src/blocks/directory-structure/item/directory/edit.js
index 33edfd6a..427e79fe 100644
--- a/src/blocks/directory-structure/item/directory/edit.js
+++ b/src/blocks/directory-structure/item/directory/edit.js
@@ -113,7 +113,7 @@ export default function ( { attributes, setAttributes, className, clientId } ) {
 
 	return (
 		<>
-			<InspectorControls>
+			<InspectorControls group="styles">
 				<PanelColorGradientSettings
 					title={ __( 'Color', 'snow-monkey-blocks' ) }
 					initialOpen={ false }
@@ -130,7 +130,9 @@ export default function ( { attributes, setAttributes, className, clientId } ) {
 					__experimentalHasMultipleOrigins={ true }
 					__experimentalIsRenderedInSidebar={ true }
 				/>
+			</InspectorControls>
 
+			<InspectorControls>
 				<ToolsPanel
 					label={ __( 'Block settings', 'snow-monkey-blocks' ) }
 				>
diff --git a/src/blocks/directory-structure/item/file/edit.js b/src/blocks/directory-structure/item/file/edit.js
index 5059fae2..72efb317 100644
--- a/src/blocks/directory-structure/item/file/edit.js
+++ b/src/blocks/directory-structure/item/file/edit.js
@@ -57,7 +57,7 @@ export default function ( { attributes, setAttributes, className } ) {
 
 	return (
 		<>
-			<InspectorControls>
+			<InspectorControls group="styles">
 				<PanelColorGradientSettings
 					title={ __( 'Color', 'snow-monkey-blocks' ) }
 					initialOpen={ false }
@@ -74,7 +74,9 @@ export default function ( { attributes, setAttributes, className } ) {
 					__experimentalHasMultipleOrigins={ true }
 					__experimentalIsRenderedInSidebar={ true }
 				/>
+			</InspectorControls>
 
+			<InspectorControls>
 				<ToolsPanel
 					label={ __( 'Block settings', 'snow-monkey-blocks' ) }
 				>
diff --git a/src/blocks/evaluation-star/edit.js b/src/blocks/evaluation-star/edit.js
index 31bb25b7..52ab0bd0 100644
--- a/src/blocks/evaluation-star/edit.js
+++ b/src/blocks/evaluation-star/edit.js
@@ -87,7 +87,7 @@ export default function ( {
 
 	return (
 		<>
-			<InspectorControls>
+			<InspectorControls group="styles">
 				<PanelColorGradientSettings
 					title={ __( 'Color', 'snow-monkey-blocks' ) }
 					initialOpen={ false }
@@ -112,7 +112,9 @@ export default function ( {
 					__experimentalHasMultipleOrigins={ true }
 					__experimentalIsRenderedInSidebar={ true }
 				></PanelColorGradientSettings>
+			</InspectorControls>
 
+			<InspectorControls>
 				<ToolsPanel
 					label={ __( 'Block settings', 'snow-monkey-blocks' ) }
 				>
diff --git a/src/blocks/faq/item/edit.js b/src/blocks/faq/item/edit.js
index d2ffee70..a0786b46 100644
--- a/src/blocks/faq/item/edit.js
+++ b/src/blocks/faq/item/edit.js
@@ -56,7 +56,7 @@ export default function ( { attributes, setAttributes, className, clientId } ) {
 
 	return (
 		<>
-			<InspectorControls>
+			<InspectorControls group="styles">
 				<PanelColorGradientSettings
 					title={ __( 'Color', 'snow-monkey-blocks' ) }
 					initialOpen={ false }
@@ -81,7 +81,9 @@ export default function ( { attributes, setAttributes, className, clientId } ) {
 					__experimentalHasMultipleOrigins={ true }
 					__experimentalIsRenderedInSidebar={ true }
 				></PanelColorGradientSettings>
+			</InspectorControls>
 
+			<InspectorControls>
 				<ToolsPanel
 					label={ __( 'Block settings', 'snow-monkey-blocks' ) }
 				>
diff --git a/src/blocks/list/edit.js b/src/blocks/list/edit.js
index 5de73f9b..1fd03812 100644
--- a/src/blocks/list/edit.js
+++ b/src/blocks/list/edit.js
@@ -84,7 +84,7 @@ export default function ( { attributes, setAttributes, className, clientId } ) {
 
 	return (
 		<>
-			<InspectorControls>
+			<InspectorControls group="styles">
 				<PanelColorGradientSettings
 					title={ __( 'Color', 'snow-monkey-blocks' ) }
 					initialOpen={ false }
@@ -101,7 +101,9 @@ export default function ( { attributes, setAttributes, className, clientId } ) {
 					__experimentalHasMultipleOrigins={ true }
 					__experimentalIsRenderedInSidebar={ true }
 				></PanelColorGradientSettings>
+			</InspectorControls>
 
+			<InspectorControls>
 				<ToolsPanel
 					label={ __( 'Block settings', 'snow-monkey-blocks' ) }
 				>
diff --git a/src/blocks/media-text/edit.js b/src/blocks/media-text/edit.js
index 513f0a86..7f0833fc 100644
--- a/src/blocks/media-text/edit.js
+++ b/src/blocks/media-text/edit.js
@@ -517,7 +517,7 @@ export default function ( {
 				</ToolsPanel>
 			</InspectorControls>
 
-			<BlockControls gruop="block">
+			<BlockControls group="block">
 				{ ! isFill && (
 					<BlockVerticalAlignmentToolbar
 						onChange={ ( value ) =>
diff --git a/src/blocks/panels/item/horizontal/edit.js b/src/blocks/panels/item/horizontal/edit.js
index fa97ab1a..8173b9bf 100644
--- a/src/blocks/panels/item/horizontal/edit.js
+++ b/src/blocks/panels/item/horizontal/edit.js
@@ -282,7 +282,7 @@ export default function ( {
 				</ToolsPanel>
 			</InspectorControls>
 
-			<BlockControls gruop="block">
+			<BlockControls group="block">
 				<ToolbarGroup>
 					<ToolbarButton
 						icon={ pullLeft }
diff --git a/src/blocks/rating-box/item/edit.js b/src/blocks/rating-box/item/edit.js
index fb88e134..bbeefb83 100644
--- a/src/blocks/rating-box/item/edit.js
+++ b/src/blocks/rating-box/item/edit.js
@@ -39,7 +39,7 @@ export default function ( { attributes, setAttributes, className } ) {
 
 	return (
 		<>
-			<InspectorControls>
+			<InspectorControls group="styles">
 				<PanelColorGradientSettings
 					title={ __( 'Color', 'snow-monkey-blocks' ) }
 					initialOpen={ false }
@@ -56,7 +56,9 @@ export default function ( { attributes, setAttributes, className } ) {
 					__experimentalHasMultipleOrigins={ true }
 					__experimentalIsRenderedInSidebar={ true }
 				></PanelColorGradientSettings>
+			</InspectorControls>
 
+			<InspectorControls>
 				<ToolsPanel
 					label={ __( 'Block settings', 'snow-monkey-blocks' ) }
 				>
diff --git a/src/blocks/section-break-the-grid/edit.js b/src/blocks/section-break-the-grid/edit.js
index 911c2c16..cc8c204f 100644
--- a/src/blocks/section-break-the-grid/edit.js
+++ b/src/blocks/section-break-the-grid/edit.js
@@ -367,7 +367,7 @@ export default function ( {
 
 	return (
 		<>
-			<InspectorControls>
+			<InspectorControls group="styles">
 				<PanelColorGradientSettings
 					title={ __( 'Color', 'snow-monkey-blocks' ) }
 					initialOpen={ false }
@@ -384,7 +384,9 @@ export default function ( {
 					__experimentalHasMultipleOrigins={ true }
 					__experimentalIsRenderedInSidebar={ true }
 				></PanelColorGradientSettings>
+			</InspectorControls>
 
+			<InspectorControls>
 				<PanelBasicSettings
 					disableIsSlim={ true }
 					disableContentsMaxWidth={ true }
@@ -1530,7 +1532,7 @@ export default function ( {
 				/>
 			</InspectorControls>
 
-			<BlockControls gruop="block">
+			<BlockControls group="block">
 				{ isAvailableVerticalAlignment && (
 					<BlockVerticalAlignmentToolbar
 						onChange={ ( value ) =>
diff --git a/src/blocks/section-side-heading/edit.js b/src/blocks/section-side-heading/edit.js
index 7b617f5a..e7dc4d76 100644
--- a/src/blocks/section-side-heading/edit.js
+++ b/src/blocks/section-side-heading/edit.js
@@ -202,7 +202,7 @@ export default function ( {
 
 	return (
 		<>
-			<InspectorControls>
+			<InspectorControls group="styles">
 				<PanelColorGradientSettings
 					title={ __( 'Color', 'snow-monkey-blocks' ) }
 					initialOpen={ false }
@@ -219,7 +219,9 @@ export default function ( {
 					__experimentalHasMultipleOrigins={ true }
 					__experimentalIsRenderedInSidebar={ true }
 				></PanelColorGradientSettings>
+			</InspectorControls>
 
+			<InspectorControls>
 				<PanelBasicSettings
 					disableIsSlim={ !! contentsMaxWidth }
 					disableContentsMaxWidth={ isSlim }
@@ -585,7 +587,7 @@ export default function ( {
 				/>
 			</InspectorControls>
 
-			<BlockControls gruop="block">
+			<BlockControls group="block">
 				{ isItemsAlignmentable && (
 					<BlockVerticalAlignmentToolbar
 						onChange={ ( value ) =>
diff --git a/src/blocks/section-with-bgimage/edit.js b/src/blocks/section-with-bgimage/edit.js
index 02fa87c5..e2f527b5 100644
--- a/src/blocks/section-with-bgimage/edit.js
+++ b/src/blocks/section-with-bgimage/edit.js
@@ -330,7 +330,7 @@ export default function ( {
 
 	return (
 		<>
-			<InspectorControls>
+			<InspectorControls group="styles">
 				<PanelColorGradientSettings
 					title={ __( 'Color', 'snow-monkey-blocks' ) }
 					initialOpen={ false }
@@ -347,7 +347,9 @@ export default function ( {
 					__experimentalHasMultipleOrigins={ true }
 					__experimentalIsRenderedInSidebar={ true }
 				></PanelColorGradientSettings>
+			</InspectorControls>
 
+			<InspectorControls>
 				<PanelBasicSettings
 					disableIsSlim={ !! contentsMaxWidth }
 					disableContentsMaxWidth={ isSlim }
@@ -1266,7 +1268,7 @@ export default function ( {
 				/>
 			</InspectorControls>
 
-			<BlockControls gruop="block">
+			<BlockControls group="block">
 				{ isItemsAlignmentable && (
 					<BlockVerticalAlignmentToolbar
 						onChange={ ( value ) =>
diff --git a/src/blocks/section-with-bgvideo/edit.js b/src/blocks/section-with-bgvideo/edit.js
index 5e4ece02..903f0637 100644
--- a/src/blocks/section-with-bgvideo/edit.js
+++ b/src/blocks/section-with-bgvideo/edit.js
@@ -192,7 +192,7 @@ export default function ( {
 
 	return (
 		<>
-			<InspectorControls>
+			<InspectorControls group="styles">
 				<PanelColorGradientSettings
 					title={ __( 'Color', 'snow-monkey-blocks' ) }
 					initialOpen={ false }
@@ -209,7 +209,9 @@ export default function ( {
 					__experimentalHasMultipleOrigins={ true }
 					__experimentalIsRenderedInSidebar={ true }
 				></PanelColorGradientSettings>
+			</InspectorControls>
 
+			<InspectorControls>
 				<PanelBasicSettings
 					disableIsSlim={ !! contentsMaxWidth }
 					disableContentsMaxWidth={ isSlim }
@@ -526,7 +528,7 @@ export default function ( {
 				/>
 			</InspectorControls>
 
-			<BlockControls gruop="block">
+			<BlockControls group="block">
 				{ isItemsAlignmentable && (
 					<BlockVerticalAlignmentToolbar
 						onChange={ ( value ) =>
diff --git a/src/blocks/section/edit.js b/src/blocks/section/edit.js
index c262fe10..0c912f81 100644
--- a/src/blocks/section/edit.js
+++ b/src/blocks/section/edit.js
@@ -196,7 +196,7 @@ export default function ( {
 
 	return (
 		<>
-			<InspectorControls>
+			<InspectorControls group="styles">
 				<PanelColorGradientSettings
 					title={ __( 'Color', 'snow-monkey-blocks' ) }
 					initialOpen={ false }
@@ -213,7 +213,9 @@ export default function ( {
 					__experimentalHasMultipleOrigins={ true }
 					__experimentalIsRenderedInSidebar={ true }
 				></PanelColorGradientSettings>
+			</InspectorControls>
 
+			<InspectorControls>
 				<PanelBasicSettings
 					disableIsSlim={ !! contentsMaxWidth }
 					disableContentsMaxWidth={ isSlim }
@@ -655,7 +657,7 @@ export default function ( {
 				/>
 			</InspectorControls>
 
-			<BlockControls gruop="block">
+			<BlockControls group="block">
 				{ isItemsAlignmentable && (
 					<BlockVerticalAlignmentToolbar
 						onChange={ ( value ) =>
diff --git a/src/blocks/spider-contents-slider/edit.js b/src/blocks/spider-contents-slider/edit.js
index 5d310441..a0c3d622 100644
--- a/src/blocks/spider-contents-slider/edit.js
+++ b/src/blocks/spider-contents-slider/edit.js
@@ -224,7 +224,7 @@ export default function ( {
 
 	return (
 		<>
-			<InspectorControls>
+			<InspectorControls group="styles">
 				<ToolsPanel label={ __( 'Dimensions', 'snow-monkey-blocks' ) }>
 					<ToolsPanelItem
 						hasValue={ () =>
@@ -253,7 +253,9 @@ export default function ( {
 						/>
 					</ToolsPanelItem>
 				</ToolsPanel>
+			</InspectorControls>
 
+			<InspectorControls>
 				<ToolsPanel
 					label={ __( 'Block settings', 'snow-monkey-blocks' ) }
 				>
diff --git a/src/blocks/spider-contents-slider/item/edit.js b/src/blocks/spider-contents-slider/item/edit.js
index af74da79..a8a5043e 100644
--- a/src/blocks/spider-contents-slider/item/edit.js
+++ b/src/blocks/spider-contents-slider/item/edit.js
@@ -128,7 +128,7 @@ export default function ( {
 
 	return (
 		<>
-			<InspectorControls>
+			<InspectorControls group="styles">
 				<ToolsPanel label={ __( 'Border', 'snow-monkey-blocks' ) }>
 					<ToolsPanelItem
 						hasValue={ () =>
diff --git a/src/blocks/spider-slider/edit.js b/src/blocks/spider-slider/edit.js
index 7337ea84..3a074ba7 100644
--- a/src/blocks/spider-slider/edit.js
+++ b/src/blocks/spider-slider/edit.js
@@ -215,7 +215,7 @@ export default function ( {
 
 	return (
 		<>
-			<InspectorControls>
+			<InspectorControls group="styles">
 				<ToolsPanel label={ __( 'Dimensions', 'snow-monkey-blocks' ) }>
 					<ToolsPanelItem
 						hasValue={ () =>
@@ -244,7 +244,9 @@ export default function ( {
 						/>
 					</ToolsPanelItem>
 				</ToolsPanel>
+			</InspectorControls>
 
+			<InspectorControls>
 				<ToolsPanel
 					label={ __( 'Block settings', 'snow-monkey-blocks' ) }
 				>
diff --git a/src/blocks/step/item/free/edit.js b/src/blocks/step/item/free/edit.js
index dc589ea5..66d5b3d6 100644
--- a/src/blocks/step/item/free/edit.js
+++ b/src/blocks/step/item/free/edit.js
@@ -56,7 +56,7 @@ export default function ( { attributes, setAttributes, className, clientId } ) {
 
 	return (
 		<>
-			<InspectorControls>
+			<InspectorControls group="styles">
 				<PanelColorGradientSettings
 					title={ __( 'Color', 'snow-monkey-blocks' ) }
 					initialOpen={ false }
diff --git a/src/blocks/step/item/standard/edit.js b/src/blocks/step/item/standard/edit.js
index 20d9018b..5a2726a9 100644
--- a/src/blocks/step/item/standard/edit.js
+++ b/src/blocks/step/item/standard/edit.js
@@ -134,7 +134,7 @@ export default function ( {
 
 	return (
 		<>
-			<InspectorControls>
+			<InspectorControls group="styles">
 				<PanelColorGradientSettings
 					title={ __( 'Color', 'snow-monkey-blocks' ) }
 					initialOpen={ false }
@@ -159,7 +159,9 @@ export default function ( {
 					__experimentalHasMultipleOrigins={ true }
 					__experimentalIsRenderedInSidebar={ true }
 				></PanelColorGradientSettings>
+			</InspectorControls>
 
+			<InspectorControls>
 				<ToolsPanel
 					label={ __( 'Block settings', 'snow-monkey-blocks' ) }
 				>