diff --git a/src/page-components/scheme/q-2-scheme/Preview.tsx b/src/page-components/scheme/q-2-scheme/Preview.tsx
index 4975d99..db408c6 100644
--- a/src/page-components/scheme/q-2-scheme/Preview.tsx
+++ b/src/page-components/scheme/q-2-scheme/Preview.tsx
@@ -140,10 +140,10 @@ const PreviewBlock: FC<PreviewBlockProps> = ({ baseline, title }) => {
         <PreviewCell bg={baseline.overlay} fg={baseline.neutralVariant.onRoot}>
           Overlay
         </PreviewCell>
-        <PreviewCell bg={baseline.outline} fg={baseline.surface.onRoot}>
+        <PreviewCell bg={baseline.outline} fg={baseline.foreground}>
           Outline
         </PreviewCell>
-        <PreviewCell bg={baseline.outlineVariant} fg={baseline.surface.onRoot}>
+        <PreviewCell bg={baseline.outlineVariant} fg={baseline.foreground}>
           Outline Variant
         </PreviewCell>
       </div>
diff --git a/src/page-components/scheme/q-scheme/Builder.tsx b/src/page-components/scheme/q-scheme/Builder.tsx
index 5bbfb02..e53e128 100644
--- a/src/page-components/scheme/q-scheme/Builder.tsx
+++ b/src/page-components/scheme/q-scheme/Builder.tsx
@@ -1,4 +1,4 @@
-import { ColorExpand, ColorShifting, SchemeSetting, WACGSetting } from 'color-module';
+import { ColorExpand, ColorShifting, SchemeSelect, SchemeSetting, WACGSetting } from 'color-module';
 import { every, isEmpty, isNil } from 'lodash-es';
 import { useActionState, useMemo } from 'react';
 import { useColorFunction } from '../../../ColorFunctionContext';
@@ -53,6 +53,7 @@ export function QSchemeBuilder({ scheme, onBuildCompleted }: QSchemeBuilderProps
           ),
           scheme.schemeStorage.source?.setting?.expand_method ?? defaultValues.expand_method,
           scheme.schemeStorage.source?.setting?.wacg_follows ?? defaultValues.wacg_follows,
+          scheme.schemeStorage.source?.setting?.scheme_select ?? defaultValues.scheme_select,
         );
       return defaultValues;
     } catch (e) {
@@ -103,6 +104,7 @@ export function QSchemeBuilder({ scheme, onBuildCompleted }: QSchemeBuilderProps
       ),
       Number(formData.get('expanding')) as ColorExpand,
       Number(formData.get('wacg')) as WACGSetting,
+      SchemeSelect.Both,
     );
     const dumpedSetting = schemeSetting.toJsValue() as QSchemeSetting;
     return [