diff --git a/src/files-ui/components/loader/DefaultLoader/DefaultLoader.tsx b/src/files-ui/components/loader/DefaultLoader/DefaultLoader.tsx
index 891190f30e43bbe475b8583fe79fa6ad2503f794..b9668fd5bb691feef4068079c18c18a487795db5 100644
--- a/src/files-ui/components/loader/DefaultLoader/DefaultLoader.tsx
+++ b/src/files-ui/components/loader/DefaultLoader/DefaultLoader.tsx
@@ -1,19 +1,17 @@
-
-
 import * as React from "react";
-import { asureColor, colourNameToHex, hexColorToRGB } from "../../../core/color";
+import { completeAsureColor } from "../../../core";
 import "./DefaultLoader.scss";
 interface DefaultLoaderNeoProps {
   color?: string;
   label?: string;
 }
 const makeDefaultLoaderNeoColor = (color?: string): string => {
-  return hexColorToRGB(asureColor(colourNameToHex(color)), 0.5);
+  return completeAsureColor(color, 0.5);
 };
 const DefaultLoader: React.FC<DefaultLoaderNeoProps> = (
   props: DefaultLoaderNeoProps
 ) => {
-  const { color = "#8b6b10",label } = props;
+  const { color = "#8b6b10", label } = props;
   //console.log("color label loader", color,label);
   return (
     <svg
@@ -130,7 +128,7 @@ const DefaultLoader: React.FC<DefaultLoaderNeoProps> = (
         y={`90`}
         fill={`${color}`}
       >
-        {label ||`loading`}
+        {label || `loading`}
       </text>
     </svg>
   );
diff --git a/src/files-ui/components/material-button/utils/MaterialButtonStyleManager.ts b/src/files-ui/components/material-button/utils/MaterialButtonStyleManager.ts
index 0114833574e9c9f76098297d7d300795f77b768c..c9c8876a3b95db0e33e301986539ed57481db5da 100644
--- a/src/files-ui/components/material-button/utils/MaterialButtonStyleManager.ts
+++ b/src/files-ui/components/material-button/utils/MaterialButtonStyleManager.ts
@@ -1,4 +1,4 @@
-import { asureColor, colourNameToHex, darkerColor, hexColorToRGB } from "../../../core";
+import { asureColor, colourNameToHex, completeAsureColor, darkerColor } from "../../../core";
 import { DynamicSheet, DynamicSheetRule } from "@dynamicss/dynamicss";
 
 export default class MaterialButtonStyleManager {
@@ -55,58 +55,40 @@ export default class MaterialButtonStyleManager {
                 case "contained":
                     sheetRules[0].rules = {
                         color: asureColor(colourNameToHex(textColor)),
-                        backgroundColor: hexColorToRGB(
-                            asureColor(colourNameToHex(color)),
-                            1
-                        ),
+                        backgroundColor: completeAsureColor(color),
                         textDecoration: textDecoration
                     };
                     sheetRules[1].rules = {
                         ":hover": {
                             backgroundColor: darkerColor(
-                                hexColorToRGB(
-                                    asureColor(colourNameToHex(color)),
-                                    1
-                                )
+                                completeAsureColor(color)
                             ),
                         },
                     };
                     break;
                 case "outlined":
                     sheetRules[0].rules = {
-                        border: `1px solid ${hexColorToRGB(
-                            asureColor(colourNameToHex(color)),
-                            0.5
-                        )}`,
-                        color: asureColor(colourNameToHex(color)),
+                        border: `1px solid ${completeAsureColor(color, 0.5)}`,
+                        color: completeAsureColor(color),
                         backgroundColor: "transparent",
                         textDecoration: textDecoration
                     };
                     sheetRules[1].rules = {
                         ":hover": {
-                            border: `1px solid ${hexColorToRGB(
-                                asureColor(colourNameToHex(color)),
-                                1
-                            )}`,
-                            backgroundColor: hexColorToRGB(
-                                asureColor(colourNameToHex(color)),
-                                0.085
-                            ),
+                            border: `1px solid ${completeAsureColor(color, 1)}`,
+                            backgroundColor: completeAsureColor(color, 0.085),
                         },
                     };
                     break;
                 case "text":
                     sheetRules[0].rules = {
-                        color: asureColor(colourNameToHex(color)),
+                        color: completeAsureColor(color),
                         backgroundColor: "transparent",
                         textDecoration: textDecoration
                     };
                     sheetRules[1].rules = {
                         ":hover": {
-                            backgroundColor: hexColorToRGB(
-                                asureColor(colourNameToHex(color)),
-                                0.085
-                            ),
+                            backgroundColor: completeAsureColor(color, 0.085),
                         },
                     };
                     break;