diff --git a/src/FlexibleTable/FlexibleTable.jsx b/src/FlexibleTable/FlexibleTable.jsx
index 4296e7a4eb04b1d9d92212aa6bf87d4286d04efd..f10770dde2ec040c5af6eeb87a6c81449c15e7ad 100644
--- a/src/FlexibleTable/FlexibleTable.jsx
+++ b/src/FlexibleTable/FlexibleTable.jsx
@@ -205,10 +205,10 @@ export default function FlexibleTable({attributes, setAttributes, placeholders,
 						label={__("Border row width", 'flexible-invoices-core')}
 						values={
 							{
-								headerBorderRowWidthTop: headerBorderRowWidthTop,
-								headerBorderRowWidthLeft: headerBorderRowWidthLeft,
-								headerBorderRowWidthRight: headerBorderRowWidthRight,
-								headerBorderRowWidthBottom: headerBorderRowWidthBottom,
+								headerBorderRowWidthTop,
+								headerBorderRowWidthLeft,
+								headerBorderRowWidthRight,
+								headerBorderRowWidthBottom,
 							}
 						}
 						onChange={handleMultipleAttributesChange}
@@ -224,10 +224,10 @@ export default function FlexibleTable({attributes, setAttributes, placeholders,
 						label={__("Border cell width", 'flexible-invoices-core')}
 						values={
 							{
-								headerBorderCellWidthTop: headerBorderCellWidthTop,
-								headerBorderCellWidthLeft: headerBorderCellWidthLeft,
-								headerBorderCellWidthRight: headerBorderCellWidthRight,
-								headerBorderCellWidthBottom: headerBorderCellWidthBottom,
+								headerBorderCellWidthTop,
+								headerBorderCellWidthLeft,
+								headerBorderCellWidthRight,
+								headerBorderCellWidthBottom,
 							}
 						}
 						onChange={handleMultipleAttributesChange}
@@ -301,16 +301,17 @@ export default function FlexibleTable({attributes, setAttributes, placeholders,
 						label={__('Border row color', 'flexible-invoices-core')}
 						value={bodyBorderRowColor}
 						enableAlpha={false}
+						returnFormat={'hex'}
 						onChange={(value) => setAttributes({bodyBorderRowColor: value})}
 					/>
 					<QuatroInput
 						label={__("Border row width", 'flexible-invoices-core')}
 						values={
 							{
-								bodyBorderRowWidthTop: bodyBorderRowWidthTop,
-								bodyBorderRowWidthLeft: bodyBorderRowWidthLeft,
-								bodyBorderRowWidthRight: bodyBorderRowWidthRight,
-								bodyBorderRowWidthBottom: bodyBorderRowWidthBottom,
+								bodyBorderRowWidthTop,
+								bodyBorderRowWidthLeft,
+								bodyBorderRowWidthRight,
+								bodyBorderRowWidthBottom,
 							}
 						}
 						onChange={handleMultipleAttributesChange}
@@ -319,16 +320,17 @@ export default function FlexibleTable({attributes, setAttributes, placeholders,
 						label={__('Border cell color', 'flexible-invoices-core')}
 						value={bodyBorderCellColor}
 						enableAlpha={false}
+						returnFormat={'hex'}
 						onChange={(value) => setAttributes({bodyBorderCellColor: value})}
 					/>
 					<QuatroInput
 						label={__("Border cell width", 'flexible-invoices-core')}
 						values={
 							{
-								bodyBorderCellWidthTop: bodyBorderCellWidthTop,
-								bodyBorderCellWidthLeft: bodyBorderCellWidthLeft,
-								bodyBorderCellWidthRight: bodyBorderCellWidthRight,
-								bodyBorderCellWidthBottom: bodyBorderCellWidthBottom,
+								bodyBorderCellWidthTop,
+								bodyBorderCellWidthLeft,
+								bodyBorderCellWidthRight,
+								bodyBorderCellWidthBottom,
 							}
 						}
 						onChange={handleMultipleAttributesChange}