diff --git a/scripts/debug.js b/scripts/debug.js
index 33489d5..55c8d2e 100644
--- a/scripts/debug.js
+++ b/scripts/debug.js
@@ -2,13 +2,10 @@ const fs = require('fs');
 const html = fs.readFileSync('_site/index.html', 'utf8');
 const css = html.match(/<style>([\s\S]*?)<\/style>/g)[0];
 
-// Find dark: selectors
-const darks = css.match(/\.dark\\:[a-z0-9\-]+/g);
-console.log('Dark selectors sample:', darks ? darks.slice(0, 5) : 'none');
+// Find selectors that have c## AND dark\:
+const mappedDark = css.match(/\.c[0-9]+[^{]*{[^}]*dark/g);
+console.log('Mapped dark selectors:', mappedDark ? mappedDark.length : 0);
 
-// Both dark and normal have same styles - we could create mappings
-const text300dark = css.includes('.dark\\:text-primary-300');
-const text300norm = css.includes('.text-primary-300');
-
-// If we map text-primary-300 to cXX, we also need to map dark:text-primary-300 to SAME cXX
-console.log('Same base class:', text300dark && text300norm);
\ No newline at end of file
+// Check for broken patterns - selectors starting with dark\:
+const brokenDark = css.match(/dark\\:[a-z][^\\}]*{/g);
+console.log('Broken dark selectors:', brokenDark ? brokenDark.slice(0, 3) : 'none');
\ No newline at end of file
diff --git a/scripts/post-build.js b/scripts/post-build.js
index a471d8b..bfc0b3c 100644
--- a/scripts/post-build.js
+++ b/scripts/post-build.js
@@ -62,9 +62,14 @@ function processFile(filePath) {
       newStyle = newStyle.replace(regex, '.' + short + '$1');
       
       // Dark variant: .dark\:class → .short
-      const darkEscaped = '.dark\\\\:' + escaped;
-      regex = new RegExp(darkEscaped + '([{:, >~]+)', 'g');
-      newStyle = newStyle.replace(regex, '.' + short + '$1');
+      // CSS selector is .dark\:baseclass, regex needs \.dark\\:baseclass
+      if (orig.startsWith('dark:')) {
+        const baseClass = orig.slice(5);
+        const baseEscaped = baseClass.replace(/-/g, '\\-');
+        const darkPattern = '\\.dark\\\\:' + baseEscaped;
+        const regex = new RegExp(darkPattern + '([{:, ])');
+        newStyle = newStyle.replace(regex, '.' + short + '$1');
+      }
     });
     
     if (newStyle !== styleBlock) {