diff --git a/color-module/src/schemes/q_style_2/baseline.rs b/color-module/src/schemes/q_style_2/baseline.rs
index b076bbb..1fd498d 100644
--- a/color-module/src/schemes/q_style_2/baseline.rs
+++ b/color-module/src/schemes/q_style_2/baseline.rs
@@ -147,6 +147,13 @@ impl Baseline {
         settings: &Arc<SchemeSetting>,
         is_dark: bool,
     ) -> Self {
+        // Ensure neutral_lightest has higher lightness than neutral_darkest, swap if necessary
+        let (neutral_lightest, neutral_darkest) = if neutral_lightest.l >= neutral_darkest.l {
+            (*neutral_lightest, *neutral_darkest)
+        } else {
+            (*neutral_darkest, *neutral_lightest)
+        };
+
         let (final_secondary, final_tertiary, final_accent) = match settings.expand_method {
             ColorExpand::Complementary => {
                 let sec_color = secondary.cloned().or(Some(primary.complementary()));
@@ -209,7 +216,7 @@ impl Baseline {
         } else {
             neutral_lightest.l
         };
-        let neutral_swatch = Arc::new(NeutralSwatch::new(*neutral_lightest, *neutral_darkest));
+        let neutral_swatch = Arc::new(NeutralSwatch::new(neutral_lightest, neutral_darkest));
         let outline_color = neutral_swatch.get(if is_dark { 0.25 } else { 0.7 });
         let outline_variant_color = neutral_swatch.get(if is_dark { 0.2 } else { 0.8 });
         let shadow_color = neutral_swatch.get(0.1);
@@ -308,13 +315,13 @@ impl Baseline {
         let (foreground, background) = if is_dark {
             // Dark mode: foreground = neutral_lightest, background = neutral_darkest with +10% lightness
             let background_darkest = Oklch {
-                l: (neutral_darkest.l * 1.2).min(1.0),
-                ..*neutral_darkest
+                l: (neutral_darkest.l * 1.3).min(1.0),
+                ..neutral_darkest
             };
-            (*neutral_lightest, background_darkest)
+            (neutral_lightest, background_darkest)
         } else {
             // Light mode: foreground = neutral_darkest, background = neutral_lightest
-            (*neutral_darkest, *neutral_lightest)
+            (neutral_darkest, neutral_lightest)
         };
 
         Self {