diff --git a/.DS_Store b/.DS_Store
index 9f69533..e1b43c7 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/packages/blocks-library/src/input-base/block.json b/packages/blocks-library/src/input-base/block.json
index c9e99bb..0a3036b 100644
--- a/packages/blocks-library/src/input-base/block.json
+++ b/packages/blocks-library/src/input-base/block.json
@@ -79,7 +79,7 @@
                 "textarea"
             ]
         },
-        "styles": {
+        "style": {
             "type": "object",
             "default": {
                 "spacing": {
diff --git a/packages/blocks-library/src/selection-base/block.json b/packages/blocks-library/src/selection-base/block.json
index 2a56538..27671f7 100644
--- a/packages/blocks-library/src/selection-base/block.json
+++ b/packages/blocks-library/src/selection-base/block.json
@@ -68,8 +68,25 @@
         "autogeneratedName": {
             "type": "string",
             "default": ""
+        },
+        "style": {
+            "type": "object",
+            "default": {
+                "spacing": {
+                    "margin": {
+                        "top": "0",
+                        "right": "0",
+                        "left": "0",
+                        "bottom": "20px"
+                    }
+                }
+            }
+        }
+    },
+    "supports": {
+        "spacing": {
+            "margin": true
         }
     },
-    "supports": {},
     "styles": []
 }
\ No newline at end of file
diff --git a/packages/blocks-library/src/submit/block.json b/packages/blocks-library/src/submit/block.json
index 23f93c8..8ae7ce3 100644
--- a/packages/blocks-library/src/submit/block.json
+++ b/packages/blocks-library/src/submit/block.json
@@ -18,17 +18,25 @@
         "id": {
             "type": "string",
             "default": ""
+        },
+        "style": {
+            "type": "object",
+            "default": {
+                "spacing": {
+                    "margin": {
+                        "top": "0",
+                        "right": "0",
+                        "left": "0",
+                        "bottom": "20px"
+                    }
+                }
+            }
         }
     },
     "supports": {
         "multiple": false,
         "spacing": {
-            "margin": true,
-            "padding": true
-        },
-        "typography": {
-            "fontSize": true,
-            "lineHeight": true
+            "margin": true
         }
     },
     "styles": []
diff --git a/packages/blocks-library/src/submit/edit.js b/packages/blocks-library/src/submit/edit.js
index 5d3725b..61b08d8 100644
--- a/packages/blocks-library/src/submit/edit.js
+++ b/packages/blocks-library/src/submit/edit.js
@@ -1,7 +1,7 @@
 /**
  * WordPress Dependencies
  */
-import { isEmpty, omit, pick } from 'lodash';
+import { isEmpty } from 'lodash';
 import { __ } from '@wordpress/i18n';
 import { useBlockProps } from '@wordpress/block-editor';
 /**
@@ -15,31 +15,15 @@ export default function edit( props ) {
 		className: classnames( 'cf7-submit-field' ),
 	} );
 
-	const blockPropsWithoutStyles = omit( blockProps, [ 'style' ] );
-
 	const { id, label } = props.attributes;
 
-	const buttonStyleProps = [
-		'paddingTop',
-		'paddingRight',
-		'paddingBottom',
-		'paddingLeft',
-		'padding',
-		'fontSize',
-		'lineHeight',
-	];
-
 	return (
 		<>
-			<div
-				{ ...blockPropsWithoutStyles }
-				style={ omit( blockProps?.style, buttonStyleProps ) }
-			>
+			<div { ...blockProps }>
 				<input
 					id={ id }
 					type="submit"
 					value={ isEmpty( label ) ? 'Submit' : label }
-					style={ pick( blockProps?.style, buttonStyleProps ) }
 				/>
 			</div>
 			<Inspector { ...props } />