diff --git a/src/page-components/scheme/swatch-scheme/Builder.tsx b/src/page-components/scheme/swatch-scheme/Builder.tsx
index 114d42b..3db0e81 100644
--- a/src/page-components/scheme/swatch-scheme/Builder.tsx
+++ b/src/page-components/scheme/swatch-scheme/Builder.tsx
@@ -150,10 +150,19 @@ export function SwatchSchemeBuilder({ scheme, onBuildCompleted }: SwatchSchemeBu
 
         if (!isEmpty(errMsg)) return errMsg;
 
-        const generatedScheme = colorFn?.generate_swatch_scheme(
-          collected.colors,
-          collected.setting,
+        // todo: Convert colors to SwatchEntry[], and settings to SwtachSettings.
+        const swatchSettings = new SwatchSchemeSetting(
+          collected.setting.amount,
+          collected.setting.min_lightness,
+          collected.setting.max_lightness,
+          collected.setting.include_primary,
+          new ColorShifting(
+            collected.setting.dark_convert.chroma,
+            collected.setting.dark_convert.lightness,
+          ),
         );
+        const colors = collected.colors.map((c) => new SwatchEntry(c.name, c.color));
+        const generatedScheme = colorFn?.generate_swatch_scheme(colors, swatchSettings);
         updateScheme((prev) => {
           prev.schemeStorage.source = collected;
           prev.schemeStorage.scheme = mapToObject(generatedScheme[0]) as SwatchScheme;