@lukso/web-components 1.172.19 → 1.173.0

package/tools/cn.js

@@ -1,6 +1,35 @@
-import { l as lineHeights, a as heights, s as scales, f as fontWeights, b as fontSizes, c as boxShadows, d as borderRadius, e as colorPalette } from './tailwind-config-DYc3Xng1.js';
+import { b as boxShadows, c as colorPalette, l as lineHeights, a as heights, s as scales, d as borderRadius, f as fontWeights, e as fontSizes } from './tailwind-config-aE2JwROh.js';
 
+/**
+ * Concatenates two arrays faster than the array spread operator.
+ */
+const concatArrays = (array1, array2) => {
+  // Pre-allocate for better V8 optimization
+  const combinedArray = new Array(array1.length + array2.length);
+  for (let i = 0; i < array1.length; i++) {
+    combinedArray[i] = array1[i];
+  }
+  for (let i = 0; i < array2.length; i++) {
+    combinedArray[array1.length + i] = array2[i];
+  }
+  return combinedArray;
+};
+
+// Factory function ensures consistent object shapes
+const createClassValidatorObject = (classGroupId, validator) => ({
+  classGroupId,
+  validator
+});
+// Factory ensures consistent ClassPartObject shape
+const createClassPartObject = (nextPart = new Map(), validators = null, classGroupId) => ({
+  nextPart,
+  validators,
+  classGroupId
+});
 const CLASS_PART_SEPARATOR = '-';
+const EMPTY_CONFLICTS = [];
+// I use two dots here because one dot is used as prefix for class groups in plugins
+const ARBITRARY_PROPERTY_PREFIX = 'arbitrary..';
 const createClassGroupUtils = config => {
   const classMap = createClassMap(config);
   const {
@@ -8,128 +37,152 @@ const createClassGroupUtils = config => {
     conflictingClassGroupModifiers
   } = config;
   const getClassGroupId = className => {
-    const classParts = className.split(CLASS_PART_SEPARATOR);
-    // Classes like `-inset-1` produce an empty string as first classPart. We assume that classes for negative values are used correctly and remove it from classParts.
-    if (classParts[0] === '' && classParts.length !== 1) {
-      classParts.shift();
+    if (className.startsWith('[') && className.endsWith(']')) {
+      return getGroupIdForArbitraryProperty(className);
     }
-    return getGroupRecursive(classParts, classMap) || getGroupIdForArbitraryProperty(className);
+    const classParts = className.split(CLASS_PART_SEPARATOR);
+    // Classes like `-inset-1` produce an empty string as first classPart. We assume that classes for negative values are used correctly and skip it.
+    const startIndex = classParts[0] === '' && classParts.length > 1 ? 1 : 0;
+    return getGroupRecursive(classParts, startIndex, classMap);
   };
   const getConflictingClassGroupIds = (classGroupId, hasPostfixModifier) => {
-    const conflicts = conflictingClassGroups[classGroupId] || [];
-    if (hasPostfixModifier && conflictingClassGroupModifiers[classGroupId]) {
-      return [...conflicts, ...conflictingClassGroupModifiers[classGroupId]];
+    if (hasPostfixModifier) {
+      const modifierConflicts = conflictingClassGroupModifiers[classGroupId];
+      const baseConflicts = conflictingClassGroups[classGroupId];
+      if (modifierConflicts) {
+        if (baseConflicts) {
+          // Merge base conflicts with modifier conflicts
+          return concatArrays(baseConflicts, modifierConflicts);
+        }
+        // Only modifier conflicts
+        return modifierConflicts;
+      }
+      // Fall back to without postfix if no modifier conflicts
+      return baseConflicts || EMPTY_CONFLICTS;
     }
-    return conflicts;
+    return conflictingClassGroups[classGroupId] || EMPTY_CONFLICTS;
   };
   return {
     getClassGroupId,
     getConflictingClassGroupIds
   };
 };
-const getGroupRecursive = (classParts, classPartObject) => {
-  if (classParts.length === 0) {
+const getGroupRecursive = (classParts, startIndex, classPartObject) => {
+  const classPathsLength = classParts.length - startIndex;
+  if (classPathsLength === 0) {
     return classPartObject.classGroupId;
   }
-  const currentClassPart = classParts[0];
+  const currentClassPart = classParts[startIndex];
   const nextClassPartObject = classPartObject.nextPart.get(currentClassPart);
-  const classGroupFromNextClassPart = nextClassPartObject ? getGroupRecursive(classParts.slice(1), nextClassPartObject) : undefined;
-  if (classGroupFromNextClassPart) {
-    return classGroupFromNextClassPart;
+  if (nextClassPartObject) {
+    const result = getGroupRecursive(classParts, startIndex + 1, nextClassPartObject);
+    if (result) return result;
   }
-  if (classPartObject.validators.length === 0) {
+  const validators = classPartObject.validators;
+  if (validators === null) {
     return undefined;
   }
-  const classRest = classParts.join(CLASS_PART_SEPARATOR);
-  return classPartObject.validators.find(({
-    validator
-  }) => validator(classRest))?.classGroupId;
-};
-const arbitraryPropertyRegex = /^\[(.+)\]$/;
-const getGroupIdForArbitraryProperty = className => {
-  if (arbitraryPropertyRegex.test(className)) {
-    const arbitraryPropertyClassName = arbitraryPropertyRegex.exec(className)[1];
-    const property = arbitraryPropertyClassName?.substring(0, arbitraryPropertyClassName.indexOf(':'));
-    if (property) {
-      // I use two dots here because one dot is used as prefix for class groups in plugins
-      return 'arbitrary..' + property;
+  // Build classRest string efficiently by joining from startIndex onwards
+  const classRest = startIndex === 0 ? classParts.join(CLASS_PART_SEPARATOR) : classParts.slice(startIndex).join(CLASS_PART_SEPARATOR);
+  const validatorsLength = validators.length;
+  for (let i = 0; i < validatorsLength; i++) {
+    const validatorObj = validators[i];
+    if (validatorObj.validator(classRest)) {
+      return validatorObj.classGroupId;
     }
   }
+  return undefined;
 };
+/**
+ * Get the class group ID for an arbitrary property.
+ *
+ * @param className - The class name to get the group ID for. Is expected to be string starting with `[` and ending with `]`.
+ */
+const getGroupIdForArbitraryProperty = className => className.slice(1, -1).indexOf(':') === -1 ? undefined : (() => {
+  const content = className.slice(1, -1);
+  const colonIndex = content.indexOf(':');
+  const property = content.slice(0, colonIndex);
+  return property ? ARBITRARY_PROPERTY_PREFIX + property : undefined;
+})();
 /**
  * Exported for testing only
  */
 const createClassMap = config => {
   const {
     theme,
-    prefix
+    classGroups
   } = config;
-  const classMap = {
-    nextPart: new Map(),
-    validators: []
-  };
-  const prefixedClassGroupEntries = getPrefixedClassGroupEntries(Object.entries(config.classGroups), prefix);
-  prefixedClassGroupEntries.forEach(([classGroupId, classGroup]) => {
-    processClassesRecursively(classGroup, classMap, classGroupId, theme);
-  });
+  return processClassGroups(classGroups, theme);
+};
+// Split into separate functions to maintain monomorphic call sites
+const processClassGroups = (classGroups, theme) => {
+  const classMap = createClassPartObject();
+  for (const classGroupId in classGroups) {
+    const group = classGroups[classGroupId];
+    processClassesRecursively(group, classMap, classGroupId, theme);
+  }
   return classMap;
 };
 const processClassesRecursively = (classGroup, classPartObject, classGroupId, theme) => {
-  classGroup.forEach(classDefinition => {
-    if (typeof classDefinition === 'string') {
-      const classPartObjectToEdit = classDefinition === '' ? classPartObject : getPart(classPartObject, classDefinition);
-      classPartObjectToEdit.classGroupId = classGroupId;
-      return;
-    }
-    if (typeof classDefinition === 'function') {
-      if (isThemeGetter(classDefinition)) {
-        processClassesRecursively(classDefinition(theme), classPartObject, classGroupId, theme);
-        return;
-      }
-      classPartObject.validators.push({
-        validator: classDefinition,
-        classGroupId
-      });
-      return;
-    }
-    Object.entries(classDefinition).forEach(([key, classGroup]) => {
-      processClassesRecursively(classGroup, getPart(classPartObject, key), classGroupId, theme);
-    });
-  });
+  const len = classGroup.length;
+  for (let i = 0; i < len; i++) {
+    const classDefinition = classGroup[i];
+    processClassDefinition(classDefinition, classPartObject, classGroupId, theme);
+  }
+};
+// Split into separate functions for each type to maintain monomorphic call sites
+const processClassDefinition = (classDefinition, classPartObject, classGroupId, theme) => {
+  if (typeof classDefinition === 'string') {
+    processStringDefinition(classDefinition, classPartObject, classGroupId);
+    return;
+  }
+  if (typeof classDefinition === 'function') {
+    processFunctionDefinition(classDefinition, classPartObject, classGroupId, theme);
+    return;
+  }
+  processObjectDefinition(classDefinition, classPartObject, classGroupId, theme);
+};
+const processStringDefinition = (classDefinition, classPartObject, classGroupId) => {
+  const classPartObjectToEdit = classDefinition === '' ? classPartObject : getPart(classPartObject, classDefinition);
+  classPartObjectToEdit.classGroupId = classGroupId;
+};
+const processFunctionDefinition = (classDefinition, classPartObject, classGroupId, theme) => {
+  if (isThemeGetter(classDefinition)) {
+    processClassesRecursively(classDefinition(theme), classPartObject, classGroupId, theme);
+    return;
+  }
+  if (classPartObject.validators === null) {
+    classPartObject.validators = [];
+  }
+  classPartObject.validators.push(createClassValidatorObject(classGroupId, classDefinition));
+};
+const processObjectDefinition = (classDefinition, classPartObject, classGroupId, theme) => {
+  const entries = Object.entries(classDefinition);
+  const len = entries.length;
+  for (let i = 0; i < len; i++) {
+    const [key, value] = entries[i];
+    processClassesRecursively(value, getPart(classPartObject, key), classGroupId, theme);
+  }
 };
 const getPart = (classPartObject, path) => {
-  let currentClassPartObject = classPartObject;
-  path.split(CLASS_PART_SEPARATOR).forEach(pathPart => {
-    if (!currentClassPartObject.nextPart.has(pathPart)) {
-      currentClassPartObject.nextPart.set(pathPart, {
-        nextPart: new Map(),
-        validators: []
-      });
+  let current = classPartObject;
+  const parts = path.split(CLASS_PART_SEPARATOR);
+  const len = parts.length;
+  for (let i = 0; i < len; i++) {
+    const part = parts[i];
+    let next = current.nextPart.get(part);
+    if (!next) {
+      next = createClassPartObject();
+      current.nextPart.set(part, next);
     }
-    currentClassPartObject = currentClassPartObject.nextPart.get(pathPart);
-  });
-  return currentClassPartObject;
-};
-const isThemeGetter = func => func.isThemeGetter;
-const getPrefixedClassGroupEntries = (classGroupEntries, prefix) => {
-  if (!prefix) {
-    return classGroupEntries;
+    current = next;
   }
-  return classGroupEntries.map(([classGroupId, classGroup]) => {
-    const prefixedClassGroup = classGroup.map(classDefinition => {
-      if (typeof classDefinition === 'string') {
-        return prefix + classDefinition;
-      }
-      if (typeof classDefinition === 'object') {
-        return Object.fromEntries(Object.entries(classDefinition).map(([key, value]) => [prefix + key, value]));
-      }
-      return classDefinition;
-    });
-    return [classGroupId, prefixedClassGroup];
-  });
+  return current;
 };
+// Type guard maintains monomorphic check
+const isThemeGetter = func => 'isThemeGetter' in func && func.isThemeGetter === true;
 
-// LRU cache inspired from hashlru (https://github.com/dominictarr/hashlru/blob/v1.0.4/index.js) but object replaced with Map to improve performance
+// LRU cache implementation using plain objects for simplicity
 const createLruCache = maxCacheSize => {
   if (maxCacheSize < 1) {
     return {
@@ -138,31 +191,31 @@ const createLruCache = maxCacheSize => {
     };
   }
   let cacheSize = 0;
-  let cache = new Map();
-  let previousCache = new Map();
+  let cache = Object.create(null);
+  let previousCache = Object.create(null);
   const update = (key, value) => {
-    cache.set(key, value);
+    cache[key] = value;
     cacheSize++;
     if (cacheSize > maxCacheSize) {
       cacheSize = 0;
       previousCache = cache;
-      cache = new Map();
+      cache = Object.create(null);
     }
   };
   return {
     get(key) {
-      let value = cache.get(key);
+      let value = cache[key];
       if (value !== undefined) {
         return value;
       }
-      if ((value = previousCache.get(key)) !== undefined) {
+      if ((value = previousCache[key]) !== undefined) {
         update(key, value);
         return value;
       }
     },
     set(key, value) {
-      if (cache.has(key)) {
-        cache.set(key, value);
+      if (key in cache) {
+        cache[key] = value;
       } else {
         update(key, value);
       }
@@ -170,26 +223,41 @@ const createLruCache = maxCacheSize => {
   };
 };
 const IMPORTANT_MODIFIER = '!';
+const MODIFIER_SEPARATOR = ':';
+const EMPTY_MODIFIERS = [];
+// Pre-allocated result object shape for consistency
+const createResultObject = (modifiers, hasImportantModifier, baseClassName, maybePostfixModifierPosition, isExternal) => ({
+  modifiers,
+  hasImportantModifier,
+  baseClassName,
+  maybePostfixModifierPosition,
+  isExternal
+});
 const createParseClassName = config => {
   const {
-    separator,
+    prefix,
     experimentalParseClassName
   } = config;
-  const isSeparatorSingleCharacter = separator.length === 1;
-  const firstSeparatorCharacter = separator[0];
-  const separatorLength = separator.length;
-  // parseClassName inspired by https://github.com/tailwindlabs/tailwindcss/blob/v3.2.2/src/util/splitAtTopLevelOnly.js
-  const parseClassName = className => {
+  /**
+   * Parse class name into parts.
+   *
+   * Inspired by `splitAtTopLevelOnly` used in Tailwind CSS
+   * @see https://github.com/tailwindlabs/tailwindcss/blob/v3.2.2/src/util/splitAtTopLevelOnly.js
+   */
+  let parseClassName = className => {
+    // Use simple array with push for better performance
     const modifiers = [];
     let bracketDepth = 0;
+    let parenDepth = 0;
     let modifierStart = 0;
     let postfixModifierPosition;
-    for (let index = 0; index < className.length; index++) {
-      let currentCharacter = className[index];
-      if (bracketDepth === 0) {
-        if (currentCharacter === firstSeparatorCharacter && (isSeparatorSingleCharacter || className.slice(index, index + separatorLength) === separator)) {
+    const len = className.length;
+    for (let index = 0; index < len; index++) {
+      const currentCharacter = className[index];
+      if (bracketDepth === 0 && parenDepth === 0) {
+        if (currentCharacter === MODIFIER_SEPARATOR) {
           modifiers.push(className.slice(modifierStart, index));
-          modifierStart = index + separatorLength;
+          modifierStart = index + 1;
           continue;
         }
         if (currentCharacter === '/') {
@@ -197,57 +265,88 @@ const createParseClassName = config => {
           continue;
         }
       }
-      if (currentCharacter === '[') {
-        bracketDepth++;
-      } else if (currentCharacter === ']') {
-        bracketDepth--;
-      }
+      if (currentCharacter === '[') bracketDepth++;else if (currentCharacter === ']') bracketDepth--;else if (currentCharacter === '(') parenDepth++;else if (currentCharacter === ')') parenDepth--;
+    }
+    const baseClassNameWithImportantModifier = modifiers.length === 0 ? className : className.slice(modifierStart);
+    // Inline important modifier check
+    let baseClassName = baseClassNameWithImportantModifier;
+    let hasImportantModifier = false;
+    if (baseClassNameWithImportantModifier.endsWith(IMPORTANT_MODIFIER)) {
+      baseClassName = baseClassNameWithImportantModifier.slice(0, -1);
+      hasImportantModifier = true;
+    } else if (
+    /**
+     * In Tailwind CSS v3 the important modifier was at the start of the base class name. This is still supported for legacy reasons.
+     * @see https://github.com/dcastil/tailwind-merge/issues/513#issuecomment-2614029864
+     */
+    baseClassNameWithImportantModifier.startsWith(IMPORTANT_MODIFIER)) {
+      baseClassName = baseClassNameWithImportantModifier.slice(1);
+      hasImportantModifier = true;
     }
-    const baseClassNameWithImportantModifier = modifiers.length === 0 ? className : className.substring(modifierStart);
-    const hasImportantModifier = baseClassNameWithImportantModifier.startsWith(IMPORTANT_MODIFIER);
-    const baseClassName = hasImportantModifier ? baseClassNameWithImportantModifier.substring(1) : baseClassNameWithImportantModifier;
     const maybePostfixModifierPosition = postfixModifierPosition && postfixModifierPosition > modifierStart ? postfixModifierPosition - modifierStart : undefined;
-    return {
-      modifiers,
-      hasImportantModifier,
-      baseClassName,
-      maybePostfixModifierPosition
-    };
+    return createResultObject(modifiers, hasImportantModifier, baseClassName, maybePostfixModifierPosition);
   };
+  if (prefix) {
+    const fullPrefix = prefix + MODIFIER_SEPARATOR;
+    const parseClassNameOriginal = parseClassName;
+    parseClassName = className => className.startsWith(fullPrefix) ? parseClassNameOriginal(className.slice(fullPrefix.length)) : createResultObject(EMPTY_MODIFIERS, false, className, undefined, true);
+  }
   if (experimentalParseClassName) {
-    return className => experimentalParseClassName({
+    const parseClassNameOriginal = parseClassName;
+    parseClassName = className => experimentalParseClassName({
       className,
-      parseClassName
+      parseClassName: parseClassNameOriginal
     });
   }
   return parseClassName;
 };
+
 /**
  * Sorts modifiers according to following schema:
  * - Predefined modifiers are sorted alphabetically
  * - When an arbitrary variant appears, it must be preserved which modifiers are before and after it
  */
-const sortModifiers = modifiers => {
-  if (modifiers.length <= 1) {
-    return modifiers;
-  }
-  const sortedModifiers = [];
-  let unsortedModifiers = [];
-  modifiers.forEach(modifier => {
-    const isArbitraryVariant = modifier[0] === '[';
-    if (isArbitraryVariant) {
-      sortedModifiers.push(...unsortedModifiers.sort(), modifier);
-      unsortedModifiers = [];
-    } else {
-      unsortedModifiers.push(modifier);
-    }
+const createSortModifiers = config => {
+  // Pre-compute weights for all known modifiers for O(1) comparison
+  const modifierWeights = new Map();
+  // Assign weights to sensitive modifiers (highest priority, but preserve order)
+  config.orderSensitiveModifiers.forEach((mod, index) => {
+    modifierWeights.set(mod, 1000000 + index); // High weights for sensitive mods
   });
-  sortedModifiers.push(...unsortedModifiers.sort());
-  return sortedModifiers;
+  return modifiers => {
+    const result = [];
+    let currentSegment = [];
+    // Process modifiers in one pass
+    for (let i = 0; i < modifiers.length; i++) {
+      const modifier = modifiers[i];
+      // Check if modifier is sensitive (starts with '[' or in orderSensitiveModifiers)
+      const isArbitrary = modifier[0] === '[';
+      const isOrderSensitive = modifierWeights.has(modifier);
+      if (isArbitrary || isOrderSensitive) {
+        // Sort and flush current segment alphabetically
+        if (currentSegment.length > 0) {
+          currentSegment.sort();
+          result.push(...currentSegment);
+          currentSegment = [];
+        }
+        result.push(modifier);
+      } else {
+        // Regular modifier - add to current segment for batch sorting
+        currentSegment.push(modifier);
+      }
+    }
+    // Sort and add any remaining segment items
+    if (currentSegment.length > 0) {
+      currentSegment.sort();
+      result.push(...currentSegment);
+    }
+    return result;
+  };
 };
 const createConfigUtils = config => ({
   cache: createLruCache(config.cacheSize),
   parseClassName: createParseClassName(config),
+  sortModifiers: createSortModifiers(config),
   ...createClassGroupUtils(config)
 });
 const SPLIT_CLASSES_REGEX = /\s+/;
@@ -255,7 +354,8 @@ const mergeClassList = (classList, configUtils) => {
   const {
     parseClassName,
     getClassGroupId,
-    getConflictingClassGroupIds
+    getConflictingClassGroupIds,
+    sortModifiers
   } = configUtils;
   /**
    * Set of classGroupIds in following format:
@@ -270,12 +370,17 @@ const mergeClassList = (classList, configUtils) => {
   for (let index = classNames.length - 1; index >= 0; index -= 1) {
     const originalClassName = classNames[index];
     const {
+      isExternal,
       modifiers,
       hasImportantModifier,
       baseClassName,
       maybePostfixModifierPosition
     } = parseClassName(originalClassName);
-    let hasPostfixModifier = Boolean(maybePostfixModifierPosition);
+    if (isExternal) {
+      result = originalClassName + (result.length > 0 ? ' ' + result : result);
+      continue;
+    }
+    let hasPostfixModifier = !!maybePostfixModifierPosition;
     let classGroupId = getClassGroupId(hasPostfixModifier ? baseClassName.substring(0, maybePostfixModifierPosition) : baseClassName);
     if (!classGroupId) {
       if (!hasPostfixModifier) {
@@ -291,10 +396,11 @@ const mergeClassList = (classList, configUtils) => {
       }
       hasPostfixModifier = false;
     }
-    const variantModifier = sortModifiers(modifiers).join(':');
+    // Fast path: skip sorting for empty or single modifier
+    const variantModifier = modifiers.length === 0 ? '' : modifiers.length === 1 ? modifiers[0] : sortModifiers(modifiers).join(':');
     const modifierId = hasImportantModifier ? variantModifier + IMPORTANT_MODIFIER : variantModifier;
     const classId = modifierId + classGroupId;
-    if (classGroupsInConflict.includes(classId)) {
+    if (classGroupsInConflict.indexOf(classId) > -1) {
       // Tailwind class omitted due to conflict
       continue;
     }
@@ -319,13 +425,13 @@ const mergeClassList = (classList, configUtils) => {
  *
  * Original code has MIT license: Copyright (c) Luke Edwards <luke.edwards05@gmail.com> (lukeed.com)
  */
-function twJoin() {
+const twJoin = (...classLists) => {
   let index = 0;
   let argument;
   let resolvedValue;
   let string = '';
-  while (index < arguments.length) {
-    if (argument = arguments[index++]) {
+  while (index < classLists.length) {
+    if (argument = classLists[index++]) {
       if (resolvedValue = toValue(argument)) {
         string && (string += ' ');
         string += resolvedValue;
@@ -333,8 +439,9 @@ function twJoin() {
     }
   }
   return string;
-}
+};
 const toValue = mix => {
+  // Fast path for strings
   if (typeof mix === 'string') {
     return mix;
   }
@@ -350,20 +457,20 @@ const toValue = mix => {
   }
   return string;
 };
-function createTailwindMerge(createConfigFirst, ...createConfigRest) {
+const createTailwindMerge = (createConfigFirst, ...createConfigRest) => {
   let configUtils;
   let cacheGet;
   let cacheSet;
-  let functionToCall = initTailwindMerge;
-  function initTailwindMerge(classList) {
+  let functionToCall;
+  const initTailwindMerge = classList => {
     const config = createConfigRest.reduce((previousConfig, createConfigCurrent) => createConfigCurrent(previousConfig), createConfigFirst());
     configUtils = createConfigUtils(config);
     cacheGet = configUtils.cache.get;
     cacheSet = configUtils.cache.set;
     functionToCall = tailwindMerge;
     return tailwindMerge(classList);
-  }
-  function tailwindMerge(classList) {
+  };
+  const tailwindMerge = classList => {
     const cachedResult = cacheGet(classList);
     if (cachedResult) {
       return cachedResult;
@@ -371,50 +478,31 @@ function createTailwindMerge(createConfigFirst, ...createConfigRest) {
     const result = mergeClassList(classList, configUtils);
     cacheSet(classList, result);
     return result;
-  }
-  return function callTailwindMerge() {
-    return functionToCall(twJoin.apply(null, arguments));
   };
-}
+  functionToCall = initTailwindMerge;
+  return (...args) => functionToCall(twJoin(...args));
+};
+const fallbackThemeArr = [];
 const fromTheme = key => {
-  const themeGetter = theme => theme[key] || [];
+  const themeGetter = theme => theme[key] || fallbackThemeArr;
   themeGetter.isThemeGetter = true;
   return themeGetter;
 };
-const arbitraryValueRegex = /^\[(?:([a-z-]+):)?(.+)\]$/i;
+const arbitraryValueRegex = /^\[(?:(\w[\w-]*):)?(.+)\]$/i;
+const arbitraryVariableRegex = /^\((?:(\w[\w-]*):)?(.+)\)$/i;
 const fractionRegex = /^\d+\/\d+$/;
-const stringLengths = /*#__PURE__*/new Set(['px', 'full', 'screen']);
 const tshirtUnitRegex = /^(\d+(\.\d+)?)?(xs|sm|md|lg|xl)$/;
 const lengthUnitRegex = /\d+(%|px|r?em|[sdl]?v([hwib]|min|max)|pt|pc|in|cm|mm|cap|ch|ex|r?lh|cq(w|h|i|b|min|max))|\b(calc|min|max|clamp)\(.+\)|^0$/;
-const colorFunctionRegex = /^(rgba?|hsla?|hwb|(ok)?(lab|lch))\(.+\)$/;
+const colorFunctionRegex = /^(rgba?|hsla?|hwb|(ok)?(lab|lch)|color-mix)\(.+\)$/;
 // Shadow always begins with x and y offset separated by underscore optionally prepended by inset
 const shadowRegex = /^(inset_)?-?((\d+)?\.?(\d+)[a-z]+|0)_-?((\d+)?\.?(\d+)[a-z]+|0)/;
 const imageRegex = /^(url|image|image-set|cross-fade|element|(repeating-)?(linear|radial|conic)-gradient)\(.+\)$/;
-const isLength = value => isNumber(value) || stringLengths.has(value) || fractionRegex.test(value);
-const isArbitraryLength = value => getIsArbitraryValue(value, 'length', isLengthOnly);
-const isNumber = value => Boolean(value) && !Number.isNaN(Number(value));
-const isArbitraryNumber = value => getIsArbitraryValue(value, 'number', isNumber);
-const isInteger = value => Boolean(value) && Number.isInteger(Number(value));
+const isFraction = value => fractionRegex.test(value);
+const isNumber = value => !!value && !Number.isNaN(Number(value));
+const isInteger = value => !!value && Number.isInteger(Number(value));
 const isPercent = value => value.endsWith('%') && isNumber(value.slice(0, -1));
-const isArbitraryValue = value => arbitraryValueRegex.test(value);
 const isTshirtSize = value => tshirtUnitRegex.test(value);
-const sizeLabels = /*#__PURE__*/new Set(['length', 'size', 'percentage']);
-const isArbitrarySize = value => getIsArbitraryValue(value, sizeLabels, isNever);
-const isArbitraryPosition = value => getIsArbitraryValue(value, 'position', isNever);
-const imageLabels = /*#__PURE__*/new Set(['image', 'url']);
-const isArbitraryImage = value => getIsArbitraryValue(value, imageLabels, isImage);
-const isArbitraryShadow = value => getIsArbitraryValue(value, '', isShadow);
 const isAny = () => true;
-const getIsArbitraryValue = (value, label, testValue) => {
-  const result = arbitraryValueRegex.exec(value);
-  if (result) {
-    if (result[1]) {
-      return typeof label === 'string' ? result[1] === label : label.has(result[1]);
-    }
-    return testValue(result[2]);
-  }
-  return false;
-};
 const isLengthOnly = value =>
 // `colorFunctionRegex` check is necessary because color functions can have percentages in them which which would be incorrectly classified as lengths.
 // For example, `hsl(0 0% 0%)` would be classified as a length without this check.
@@ -423,87 +511,170 @@ lengthUnitRegex.test(value) && !colorFunctionRegex.test(value);
 const isNever = () => false;
 const isShadow = value => shadowRegex.test(value);
 const isImage = value => imageRegex.test(value);
+const isAnyNonArbitrary = value => !isArbitraryValue(value) && !isArbitraryVariable(value);
+const isArbitrarySize = value => getIsArbitraryValue(value, isLabelSize, isNever);
+const isArbitraryValue = value => arbitraryValueRegex.test(value);
+const isArbitraryLength = value => getIsArbitraryValue(value, isLabelLength, isLengthOnly);
+const isArbitraryNumber = value => getIsArbitraryValue(value, isLabelNumber, isNumber);
+const isArbitraryPosition = value => getIsArbitraryValue(value, isLabelPosition, isNever);
+const isArbitraryImage = value => getIsArbitraryValue(value, isLabelImage, isImage);
+const isArbitraryShadow = value => getIsArbitraryValue(value, isLabelShadow, isShadow);
+const isArbitraryVariable = value => arbitraryVariableRegex.test(value);
+const isArbitraryVariableLength = value => getIsArbitraryVariable(value, isLabelLength);
+const isArbitraryVariableFamilyName = value => getIsArbitraryVariable(value, isLabelFamilyName);
+const isArbitraryVariablePosition = value => getIsArbitraryVariable(value, isLabelPosition);
+const isArbitraryVariableSize = value => getIsArbitraryVariable(value, isLabelSize);
+const isArbitraryVariableImage = value => getIsArbitraryVariable(value, isLabelImage);
+const isArbitraryVariableShadow = value => getIsArbitraryVariable(value, isLabelShadow, true);
+// Helpers
+const getIsArbitraryValue = (value, testLabel, testValue) => {
+  const result = arbitraryValueRegex.exec(value);
+  if (result) {
+    if (result[1]) {
+      return testLabel(result[1]);
+    }
+    return testValue(result[2]);
+  }
+  return false;
+};
+const getIsArbitraryVariable = (value, testLabel, shouldMatchNoLabel = false) => {
+  const result = arbitraryVariableRegex.exec(value);
+  if (result) {
+    if (result[1]) {
+      return testLabel(result[1]);
+    }
+    return shouldMatchNoLabel;
+  }
+  return false;
+};
+// Labels
+const isLabelPosition = label => label === 'position' || label === 'percentage';
+const isLabelImage = label => label === 'image' || label === 'url';
+const isLabelSize = label => label === 'length' || label === 'size' || label === 'bg-size';
+const isLabelLength = label => label === 'length';
+const isLabelNumber = label => label === 'number';
+const isLabelFamilyName = label => label === 'family-name';
+const isLabelShadow = label => label === 'shadow';
 const getDefaultConfig = () => {
-  const colors = fromTheme('colors');
-  const spacing = fromTheme('spacing');
-  const blur = fromTheme('blur');
-  const brightness = fromTheme('brightness');
-  const borderColor = fromTheme('borderColor');
-  const borderRadius = fromTheme('borderRadius');
-  const borderSpacing = fromTheme('borderSpacing');
-  const borderWidth = fromTheme('borderWidth');
-  const contrast = fromTheme('contrast');
-  const grayscale = fromTheme('grayscale');
-  const hueRotate = fromTheme('hueRotate');
-  const invert = fromTheme('invert');
-  const gap = fromTheme('gap');
-  const gradientColorStops = fromTheme('gradientColorStops');
-  const gradientColorStopPositions = fromTheme('gradientColorStopPositions');
-  const inset = fromTheme('inset');
-  const margin = fromTheme('margin');
-  const opacity = fromTheme('opacity');
-  const padding = fromTheme('padding');
-  const saturate = fromTheme('saturate');
-  const scale = fromTheme('scale');
-  const sepia = fromTheme('sepia');
-  const skew = fromTheme('skew');
-  const space = fromTheme('space');
-  const translate = fromTheme('translate');
-  const getOverscroll = () => ['auto', 'contain', 'none'];
-  const getOverflow = () => ['auto', 'hidden', 'clip', 'visible', 'scroll'];
-  const getSpacingWithAutoAndArbitrary = () => ['auto', isArbitraryValue, spacing];
-  const getSpacingWithArbitrary = () => [isArbitraryValue, spacing];
-  const getLengthWithEmptyAndArbitrary = () => ['', isLength, isArbitraryLength];
-  const getNumberWithAutoAndArbitrary = () => ['auto', isNumber, isArbitraryValue];
-  const getPositions = () => ['bottom', 'center', 'left', 'left-bottom', 'left-top', 'right', 'right-bottom', 'right-top', 'top'];
-  const getLineStyles = () => ['solid', 'dashed', 'dotted', 'double', 'none'];
-  const getBlendModes = () => ['normal', 'multiply', 'screen', 'overlay', 'darken', 'lighten', 'color-dodge', 'color-burn', 'hard-light', 'soft-light', 'difference', 'exclusion', 'hue', 'saturation', 'color', 'luminosity'];
-  const getAlign = () => ['start', 'end', 'center', 'between', 'around', 'evenly', 'stretch'];
-  const getZeroAndEmpty = () => ['', '0', isArbitraryValue];
-  const getBreaks = () => ['auto', 'avoid', 'all', 'avoid-page', 'page', 'left', 'right', 'column'];
-  const getNumberAndArbitrary = () => [isNumber, isArbitraryValue];
+  /**
+   * Theme getters for theme variable namespaces
+   * @see https://tailwindcss.com/docs/theme#theme-variable-namespaces
+   */
+  /***/
+  const themeColor = fromTheme('color');
+  const themeFont = fromTheme('font');
+  const themeText = fromTheme('text');
+  const themeFontWeight = fromTheme('font-weight');
+  const themeTracking = fromTheme('tracking');
+  const themeLeading = fromTheme('leading');
+  const themeBreakpoint = fromTheme('breakpoint');
+  const themeContainer = fromTheme('container');
+  const themeSpacing = fromTheme('spacing');
+  const themeRadius = fromTheme('radius');
+  const themeShadow = fromTheme('shadow');
+  const themeInsetShadow = fromTheme('inset-shadow');
+  const themeTextShadow = fromTheme('text-shadow');
+  const themeDropShadow = fromTheme('drop-shadow');
+  const themeBlur = fromTheme('blur');
+  const themePerspective = fromTheme('perspective');
+  const themeAspect = fromTheme('aspect');
+  const themeEase = fromTheme('ease');
+  const themeAnimate = fromTheme('animate');
+  /**
+   * Helpers to avoid repeating the same scales
+   *
+   * We use functions that create a new array every time they're called instead of static arrays.
+   * This ensures that users who modify any scale by mutating the array (e.g. with `array.push(element)`) don't accidentally mutate arrays in other parts of the config.
+   */
+  /***/
+  const scaleBreak = () => ['auto', 'avoid', 'all', 'avoid-page', 'page', 'left', 'right', 'column'];
+  const scalePosition = () => ['center', 'top', 'bottom', 'left', 'right', 'top-left',
+  // Deprecated since Tailwind CSS v4.1.0, see https://github.com/tailwindlabs/tailwindcss/pull/17378
+  'left-top', 'top-right',
+  // Deprecated since Tailwind CSS v4.1.0, see https://github.com/tailwindlabs/tailwindcss/pull/17378
+  'right-top', 'bottom-right',
+  // Deprecated since Tailwind CSS v4.1.0, see https://github.com/tailwindlabs/tailwindcss/pull/17378
+  'right-bottom', 'bottom-left',
+  // Deprecated since Tailwind CSS v4.1.0, see https://github.com/tailwindlabs/tailwindcss/pull/17378
+  'left-bottom'];
+  const scalePositionWithArbitrary = () => [...scalePosition(), isArbitraryVariable, isArbitraryValue];
+  const scaleOverflow = () => ['auto', 'hidden', 'clip', 'visible', 'scroll'];
+  const scaleOverscroll = () => ['auto', 'contain', 'none'];
+  const scaleUnambiguousSpacing = () => [isArbitraryVariable, isArbitraryValue, themeSpacing];
+  const scaleInset = () => [isFraction, 'full', 'auto', ...scaleUnambiguousSpacing()];
+  const scaleGridTemplateColsRows = () => [isInteger, 'none', 'subgrid', isArbitraryVariable, isArbitraryValue];
+  const scaleGridColRowStartAndEnd = () => ['auto', {
+    span: ['full', isInteger, isArbitraryVariable, isArbitraryValue]
+  }, isInteger, isArbitraryVariable, isArbitraryValue];
+  const scaleGridColRowStartOrEnd = () => [isInteger, 'auto', isArbitraryVariable, isArbitraryValue];
+  const scaleGridAutoColsRows = () => ['auto', 'min', 'max', 'fr', isArbitraryVariable, isArbitraryValue];
+  const scaleAlignPrimaryAxis = () => ['start', 'end', 'center', 'between', 'around', 'evenly', 'stretch', 'baseline', 'center-safe', 'end-safe'];
+  const scaleAlignSecondaryAxis = () => ['start', 'end', 'center', 'stretch', 'center-safe', 'end-safe'];
+  const scaleMargin = () => ['auto', ...scaleUnambiguousSpacing()];
+  const scaleSizing = () => [isFraction, 'auto', 'full', 'dvw', 'dvh', 'lvw', 'lvh', 'svw', 'svh', 'min', 'max', 'fit', ...scaleUnambiguousSpacing()];
+  const scaleColor = () => [themeColor, isArbitraryVariable, isArbitraryValue];
+  const scaleBgPosition = () => [...scalePosition(), isArbitraryVariablePosition, isArbitraryPosition, {
+    position: [isArbitraryVariable, isArbitraryValue]
+  }];
+  const scaleBgRepeat = () => ['no-repeat', {
+    repeat: ['', 'x', 'y', 'space', 'round']
+  }];
+  const scaleBgSize = () => ['auto', 'cover', 'contain', isArbitraryVariableSize, isArbitrarySize, {
+    size: [isArbitraryVariable, isArbitraryValue]
+  }];
+  const scaleGradientStopPosition = () => [isPercent, isArbitraryVariableLength, isArbitraryLength];
+  const scaleRadius = () => [
+  // Deprecated since Tailwind CSS v4.0.0
+  '', 'none', 'full', themeRadius, isArbitraryVariable, isArbitraryValue];
+  const scaleBorderWidth = () => ['', isNumber, isArbitraryVariableLength, isArbitraryLength];
+  const scaleLineStyle = () => ['solid', 'dashed', 'dotted', 'double'];
+  const scaleBlendMode = () => ['normal', 'multiply', 'screen', 'overlay', 'darken', 'lighten', 'color-dodge', 'color-burn', 'hard-light', 'soft-light', 'difference', 'exclusion', 'hue', 'saturation', 'color', 'luminosity'];
+  const scaleMaskImagePosition = () => [isNumber, isPercent, isArbitraryVariablePosition, isArbitraryPosition];
+  const scaleBlur = () => [
+  // Deprecated since Tailwind CSS v4.0.0
+  '', 'none', themeBlur, isArbitraryVariable, isArbitraryValue];
+  const scaleRotate = () => ['none', isNumber, isArbitraryVariable, isArbitraryValue];
+  const scaleScale = () => ['none', isNumber, isArbitraryVariable, isArbitraryValue];
+  const scaleSkew = () => [isNumber, isArbitraryVariable, isArbitraryValue];
+  const scaleTranslate = () => [isFraction, 'full', ...scaleUnambiguousSpacing()];
   return {
     cacheSize: 500,
-    separator: ':',
     theme: {
-      colors: [isAny],
-      spacing: [isLength, isArbitraryLength],
-      blur: ['none', '', isTshirtSize, isArbitraryValue],
-      brightness: getNumberAndArbitrary(),
-      borderColor: [colors],
-      borderRadius: ['none', '', 'full', isTshirtSize, isArbitraryValue],
-      borderSpacing: getSpacingWithArbitrary(),
-      borderWidth: getLengthWithEmptyAndArbitrary(),
-      contrast: getNumberAndArbitrary(),
-      grayscale: getZeroAndEmpty(),
-      hueRotate: getNumberAndArbitrary(),
-      invert: getZeroAndEmpty(),
-      gap: getSpacingWithArbitrary(),
-      gradientColorStops: [colors],
-      gradientColorStopPositions: [isPercent, isArbitraryLength],
-      inset: getSpacingWithAutoAndArbitrary(),
-      margin: getSpacingWithAutoAndArbitrary(),
-      opacity: getNumberAndArbitrary(),
-      padding: getSpacingWithArbitrary(),
-      saturate: getNumberAndArbitrary(),
-      scale: getNumberAndArbitrary(),
-      sepia: getZeroAndEmpty(),
-      skew: getNumberAndArbitrary(),
-      space: getSpacingWithArbitrary(),
-      translate: getSpacingWithArbitrary()
+      animate: ['spin', 'ping', 'pulse', 'bounce'],
+      aspect: ['video'],
+      blur: [isTshirtSize],
+      breakpoint: [isTshirtSize],
+      color: [isAny],
+      container: [isTshirtSize],
+      'drop-shadow': [isTshirtSize],
+      ease: ['in', 'out', 'in-out'],
+      font: [isAnyNonArbitrary],
+      'font-weight': ['thin', 'extralight', 'light', 'normal', 'medium', 'semibold', 'bold', 'extrabold', 'black'],
+      'inset-shadow': [isTshirtSize],
+      leading: ['none', 'tight', 'snug', 'normal', 'relaxed', 'loose'],
+      perspective: ['dramatic', 'near', 'normal', 'midrange', 'distant', 'none'],
+      radius: [isTshirtSize],
+      shadow: [isTshirtSize],
+      spacing: ['px', isNumber],
+      text: [isTshirtSize],
+      'text-shadow': [isTshirtSize],
+      tracking: ['tighter', 'tight', 'normal', 'wide', 'wider', 'widest']
     },
     classGroups: {
-      // Layout
+      // --------------
+      // --- Layout ---
+      // --------------
       /**
        * Aspect Ratio
        * @see https://tailwindcss.com/docs/aspect-ratio
        */
       aspect: [{
-        aspect: ['auto', 'square', 'video', isArbitraryValue]
+        aspect: ['auto', 'square', isFraction, isArbitraryValue, isArbitraryVariable, themeAspect]
       }],
       /**
        * Container
        * @see https://tailwindcss.com/docs/container
+       * @deprecated since Tailwind CSS v4.0.0
        */
       container: ['container'],
       /**
@@ -511,21 +682,21 @@ const getDefaultConfig = () => {
        * @see https://tailwindcss.com/docs/columns
        */
       columns: [{
-        columns: [isTshirtSize]
+        columns: [isNumber, isArbitraryValue, isArbitraryVariable, themeContainer]
       }],
       /**
        * Break After
        * @see https://tailwindcss.com/docs/break-after
        */
       'break-after': [{
-        'break-after': getBreaks()
+        'break-after': scaleBreak()
       }],
       /**
        * Break Before
        * @see https://tailwindcss.com/docs/break-before
        */
       'break-before': [{
-        'break-before': getBreaks()
+        'break-before': scaleBreak()
       }],
       /**
        * Break Inside
@@ -553,6 +724,11 @@ const getDefaultConfig = () => {
        * @see https://tailwindcss.com/docs/display
        */
       display: ['block', 'inline-block', 'inline', 'flex', 'inline-flex', 'table', 'inline-table', 'table-caption', 'table-cell', 'table-column', 'table-column-group', 'table-footer-group', 'table-header-group', 'table-row-group', 'table-row', 'flow-root', 'grid', 'inline-grid', 'contents', 'list-item', 'hidden'],
+      /**
+       * Screen Reader Only
+       * @see https://tailwindcss.com/docs/display#screen-reader-only
+       */
+      sr: ['sr-only', 'not-sr-only'],
       /**
        * Floats
        * @see https://tailwindcss.com/docs/float
@@ -584,49 +760,49 @@ const getDefaultConfig = () => {
        * @see https://tailwindcss.com/docs/object-position
        */
       'object-position': [{
-        object: [...getPositions(), isArbitraryValue]
+        object: scalePositionWithArbitrary()
       }],
       /**
        * Overflow
        * @see https://tailwindcss.com/docs/overflow
        */
       overflow: [{
-        overflow: getOverflow()
+        overflow: scaleOverflow()
       }],
       /**
        * Overflow X
        * @see https://tailwindcss.com/docs/overflow
        */
       'overflow-x': [{
-        'overflow-x': getOverflow()
+        'overflow-x': scaleOverflow()
       }],
       /**
        * Overflow Y
        * @see https://tailwindcss.com/docs/overflow
        */
       'overflow-y': [{
-        'overflow-y': getOverflow()
+        'overflow-y': scaleOverflow()
       }],
       /**
        * Overscroll Behavior
        * @see https://tailwindcss.com/docs/overscroll-behavior
        */
       overscroll: [{
-        overscroll: getOverscroll()
+        overscroll: scaleOverscroll()
       }],
       /**
        * Overscroll Behavior X
        * @see https://tailwindcss.com/docs/overscroll-behavior
        */
       'overscroll-x': [{
-        'overscroll-x': getOverscroll()
+        'overscroll-x': scaleOverscroll()
       }],
       /**
        * Overscroll Behavior Y
        * @see https://tailwindcss.com/docs/overscroll-behavior
        */
       'overscroll-y': [{
-        'overscroll-y': getOverscroll()
+        'overscroll-y': scaleOverscroll()
       }],
       /**
        * Position
@@ -638,63 +814,63 @@ const getDefaultConfig = () => {
        * @see https://tailwindcss.com/docs/top-right-bottom-left
        */
       inset: [{
-        inset: [inset]
+        inset: scaleInset()
       }],
       /**
        * Right / Left
        * @see https://tailwindcss.com/docs/top-right-bottom-left
        */
       'inset-x': [{
-        'inset-x': [inset]
+        'inset-x': scaleInset()
       }],
       /**
        * Top / Bottom
        * @see https://tailwindcss.com/docs/top-right-bottom-left
        */
       'inset-y': [{
-        'inset-y': [inset]
+        'inset-y': scaleInset()
       }],
       /**
        * Start
        * @see https://tailwindcss.com/docs/top-right-bottom-left
        */
       start: [{
-        start: [inset]
+        start: scaleInset()
       }],
       /**
        * End
        * @see https://tailwindcss.com/docs/top-right-bottom-left
        */
       end: [{
-        end: [inset]
+        end: scaleInset()
       }],
       /**
        * Top
        * @see https://tailwindcss.com/docs/top-right-bottom-left
        */
       top: [{
-        top: [inset]
+        top: scaleInset()
       }],
       /**
        * Right
        * @see https://tailwindcss.com/docs/top-right-bottom-left
        */
       right: [{
-        right: [inset]
+        right: scaleInset()
       }],
       /**
        * Bottom
        * @see https://tailwindcss.com/docs/top-right-bottom-left
        */
       bottom: [{
-        bottom: [inset]
+        bottom: scaleInset()
       }],
       /**
        * Left
        * @see https://tailwindcss.com/docs/top-right-bottom-left
        */
       left: [{
-        left: [inset]
+        left: scaleInset()
       }],
       /**
        * Visibility
@@ -706,15 +882,17 @@ const getDefaultConfig = () => {
        * @see https://tailwindcss.com/docs/z-index
        */
       z: [{
-        z: ['auto', isInteger, isArbitraryValue]
+        z: [isInteger, 'auto', isArbitraryVariable, isArbitraryValue]
       }],
-      // Flexbox and Grid
+      // ------------------------
+      // --- Flexbox and Grid ---
+      // ------------------------
       /**
        * Flex Basis
        * @see https://tailwindcss.com/docs/flex-basis
        */
       basis: [{
-        basis: getSpacingWithAutoAndArbitrary()
+        basis: [isFraction, 'full', 'auto', themeContainer, ...scaleUnambiguousSpacing()]
       }],
       /**
        * Flex Direction
@@ -728,95 +906,91 @@ const getDefaultConfig = () => {
        * @see https://tailwindcss.com/docs/flex-wrap
        */
       'flex-wrap': [{
-        flex: ['wrap', 'wrap-reverse', 'nowrap']
+        flex: ['nowrap', 'wrap', 'wrap-reverse']
       }],
       /**
        * Flex
        * @see https://tailwindcss.com/docs/flex
        */
       flex: [{
-        flex: ['1', 'auto', 'initial', 'none', isArbitraryValue]
+        flex: [isNumber, isFraction, 'auto', 'initial', 'none', isArbitraryValue]
       }],
       /**
        * Flex Grow
        * @see https://tailwindcss.com/docs/flex-grow
        */
       grow: [{
-        grow: getZeroAndEmpty()
+        grow: ['', isNumber, isArbitraryVariable, isArbitraryValue]
       }],
       /**
        * Flex Shrink
        * @see https://tailwindcss.com/docs/flex-shrink
        */
       shrink: [{
-        shrink: getZeroAndEmpty()
+        shrink: ['', isNumber, isArbitraryVariable, isArbitraryValue]
       }],
       /**
        * Order
        * @see https://tailwindcss.com/docs/order
        */
       order: [{
-        order: ['first', 'last', 'none', isInteger, isArbitraryValue]
+        order: [isInteger, 'first', 'last', 'none', isArbitraryVariable, isArbitraryValue]
       }],
       /**
        * Grid Template Columns
        * @see https://tailwindcss.com/docs/grid-template-columns
        */
       'grid-cols': [{
-        'grid-cols': [isAny]
+        'grid-cols': scaleGridTemplateColsRows()
       }],
       /**
        * Grid Column Start / End
        * @see https://tailwindcss.com/docs/grid-column
        */
       'col-start-end': [{
-        col: ['auto', {
-          span: ['full', isInteger, isArbitraryValue]
-        }, isArbitraryValue]
+        col: scaleGridColRowStartAndEnd()
       }],
       /**
        * Grid Column Start
        * @see https://tailwindcss.com/docs/grid-column
        */
       'col-start': [{
-        'col-start': getNumberWithAutoAndArbitrary()
+        'col-start': scaleGridColRowStartOrEnd()
       }],
       /**
        * Grid Column End
        * @see https://tailwindcss.com/docs/grid-column
        */
       'col-end': [{
-        'col-end': getNumberWithAutoAndArbitrary()
+        'col-end': scaleGridColRowStartOrEnd()
       }],
       /**
        * Grid Template Rows
        * @see https://tailwindcss.com/docs/grid-template-rows
        */
       'grid-rows': [{
-        'grid-rows': [isAny]
+        'grid-rows': scaleGridTemplateColsRows()
       }],
       /**
        * Grid Row Start / End
        * @see https://tailwindcss.com/docs/grid-row
        */
       'row-start-end': [{
-        row: ['auto', {
-          span: [isInteger, isArbitraryValue]
-        }, isArbitraryValue]
+        row: scaleGridColRowStartAndEnd()
       }],
       /**
        * Grid Row Start
        * @see https://tailwindcss.com/docs/grid-row
        */
       'row-start': [{
-        'row-start': getNumberWithAutoAndArbitrary()
+        'row-start': scaleGridColRowStartOrEnd()
       }],
       /**
        * Grid Row End
        * @see https://tailwindcss.com/docs/grid-row
        */
       'row-end': [{
-        'row-end': getNumberWithAutoAndArbitrary()
+        'row-end': scaleGridColRowStartOrEnd()
       }],
       /**
        * Grid Auto Flow
@@ -830,98 +1004,102 @@ const getDefaultConfig = () => {
        * @see https://tailwindcss.com/docs/grid-auto-columns
        */
       'auto-cols': [{
-        'auto-cols': ['auto', 'min', 'max', 'fr', isArbitraryValue]
+        'auto-cols': scaleGridAutoColsRows()
       }],
       /**
        * Grid Auto Rows
        * @see https://tailwindcss.com/docs/grid-auto-rows
        */
       'auto-rows': [{
-        'auto-rows': ['auto', 'min', 'max', 'fr', isArbitraryValue]
+        'auto-rows': scaleGridAutoColsRows()
       }],
       /**
        * Gap
        * @see https://tailwindcss.com/docs/gap
        */
       gap: [{
-        gap: [gap]
+        gap: scaleUnambiguousSpacing()
       }],
       /**
        * Gap X
        * @see https://tailwindcss.com/docs/gap
        */
       'gap-x': [{
-        'gap-x': [gap]
+        'gap-x': scaleUnambiguousSpacing()
       }],
       /**
        * Gap Y
        * @see https://tailwindcss.com/docs/gap
        */
       'gap-y': [{
-        'gap-y': [gap]
+        'gap-y': scaleUnambiguousSpacing()
       }],
       /**
        * Justify Content
        * @see https://tailwindcss.com/docs/justify-content
        */
       'justify-content': [{
-        justify: ['normal', ...getAlign()]
+        justify: [...scaleAlignPrimaryAxis(), 'normal']
       }],
       /**
        * Justify Items
        * @see https://tailwindcss.com/docs/justify-items
        */
       'justify-items': [{
-        'justify-items': ['start', 'end', 'center', 'stretch']
+        'justify-items': [...scaleAlignSecondaryAxis(), 'normal']
       }],
       /**
        * Justify Self
        * @see https://tailwindcss.com/docs/justify-self
        */
       'justify-self': [{
-        'justify-self': ['auto', 'start', 'end', 'center', 'stretch']
+        'justify-self': ['auto', ...scaleAlignSecondaryAxis()]
       }],
       /**
        * Align Content
        * @see https://tailwindcss.com/docs/align-content
        */
       'align-content': [{
-        content: ['normal', ...getAlign(), 'baseline']
+        content: ['normal', ...scaleAlignPrimaryAxis()]
       }],
       /**
        * Align Items
        * @see https://tailwindcss.com/docs/align-items
        */
       'align-items': [{
-        items: ['start', 'end', 'center', 'baseline', 'stretch']
+        items: [...scaleAlignSecondaryAxis(), {
+          baseline: ['', 'last']
+        }]
       }],
       /**
        * Align Self
        * @see https://tailwindcss.com/docs/align-self
        */
       'align-self': [{
-        self: ['auto', 'start', 'end', 'center', 'stretch', 'baseline']
+        self: ['auto', ...scaleAlignSecondaryAxis(), {
+          baseline: ['', 'last']
+        }]
       }],
       /**
        * Place Content
        * @see https://tailwindcss.com/docs/place-content
        */
       'place-content': [{
-        'place-content': [...getAlign(), 'baseline']
+        'place-content': scaleAlignPrimaryAxis()
       }],
       /**
        * Place Items
        * @see https://tailwindcss.com/docs/place-items
        */
       'place-items': [{
-        'place-items': ['start', 'end', 'center', 'baseline', 'stretch']
+        'place-items': [...scaleAlignSecondaryAxis(), 'baseline']
       }],
       /**
        * Place Self
        * @see https://tailwindcss.com/docs/place-self
        */
       'place-self': [{
-        'place-self': ['auto', 'start', 'end', 'center', 'stretch']
+        'place-self': ['auto', ...scaleAlignSecondaryAxis()]
       }],
       // Spacing
       /**
@@ -929,210 +1107,217 @@ const getDefaultConfig = () => {
        * @see https://tailwindcss.com/docs/padding
        */
       p: [{
-        p: [padding]
+        p: scaleUnambiguousSpacing()
       }],
       /**
        * Padding X
        * @see https://tailwindcss.com/docs/padding
        */
       px: [{
-        px: [padding]
+        px: scaleUnambiguousSpacing()
       }],
       /**
        * Padding Y
        * @see https://tailwindcss.com/docs/padding
        */
       py: [{
-        py: [padding]
+        py: scaleUnambiguousSpacing()
       }],
       /**
        * Padding Start
        * @see https://tailwindcss.com/docs/padding
        */
       ps: [{
-        ps: [padding]
+        ps: scaleUnambiguousSpacing()
       }],
       /**
        * Padding End
        * @see https://tailwindcss.com/docs/padding
        */
       pe: [{
-        pe: [padding]
+        pe: scaleUnambiguousSpacing()
       }],
       /**
        * Padding Top
        * @see https://tailwindcss.com/docs/padding
        */
       pt: [{
-        pt: [padding]
+        pt: scaleUnambiguousSpacing()
       }],
       /**
        * Padding Right
        * @see https://tailwindcss.com/docs/padding
        */
       pr: [{
-        pr: [padding]
+        pr: scaleUnambiguousSpacing()
       }],
       /**
        * Padding Bottom
        * @see https://tailwindcss.com/docs/padding
        */
       pb: [{
-        pb: [padding]
+        pb: scaleUnambiguousSpacing()
       }],
       /**
        * Padding Left
        * @see https://tailwindcss.com/docs/padding
        */
       pl: [{
-        pl: [padding]
+        pl: scaleUnambiguousSpacing()
       }],
       /**
        * Margin
        * @see https://tailwindcss.com/docs/margin
        */
       m: [{
-        m: [margin]
+        m: scaleMargin()
       }],
       /**
        * Margin X
        * @see https://tailwindcss.com/docs/margin
        */
       mx: [{
-        mx: [margin]
+        mx: scaleMargin()
       }],
       /**
        * Margin Y
        * @see https://tailwindcss.com/docs/margin
        */
       my: [{
-        my: [margin]
+        my: scaleMargin()
       }],
       /**
        * Margin Start
        * @see https://tailwindcss.com/docs/margin
        */
       ms: [{
-        ms: [margin]
+        ms: scaleMargin()
       }],
       /**
        * Margin End
        * @see https://tailwindcss.com/docs/margin
        */
       me: [{
-        me: [margin]
+        me: scaleMargin()
       }],
       /**
        * Margin Top
        * @see https://tailwindcss.com/docs/margin
        */
       mt: [{
-        mt: [margin]
+        mt: scaleMargin()
       }],
       /**
        * Margin Right
        * @see https://tailwindcss.com/docs/margin
        */
       mr: [{
-        mr: [margin]
+        mr: scaleMargin()
       }],
       /**
        * Margin Bottom
        * @see https://tailwindcss.com/docs/margin
        */
       mb: [{
-        mb: [margin]
+        mb: scaleMargin()
       }],
       /**
        * Margin Left
        * @see https://tailwindcss.com/docs/margin
        */
       ml: [{
-        ml: [margin]
+        ml: scaleMargin()
       }],
       /**
        * Space Between X
-       * @see https://tailwindcss.com/docs/space
+       * @see https://tailwindcss.com/docs/margin#adding-space-between-children
        */
       'space-x': [{
-        'space-x': [space]
+        'space-x': scaleUnambiguousSpacing()
       }],
       /**
        * Space Between X Reverse
-       * @see https://tailwindcss.com/docs/space
+       * @see https://tailwindcss.com/docs/margin#adding-space-between-children
        */
       'space-x-reverse': ['space-x-reverse'],
       /**
        * Space Between Y
-       * @see https://tailwindcss.com/docs/space
+       * @see https://tailwindcss.com/docs/margin#adding-space-between-children
        */
       'space-y': [{
-        'space-y': [space]
+        'space-y': scaleUnambiguousSpacing()
       }],
       /**
        * Space Between Y Reverse
-       * @see https://tailwindcss.com/docs/space
+       * @see https://tailwindcss.com/docs/margin#adding-space-between-children
        */
       'space-y-reverse': ['space-y-reverse'],
-      // Sizing
+      // --------------
+      // --- Sizing ---
+      // --------------
+      /**
+       * Size
+       * @see https://tailwindcss.com/docs/width#setting-both-width-and-height
+       */
+      size: [{
+        size: scaleSizing()
+      }],
       /**
        * Width
        * @see https://tailwindcss.com/docs/width
        */
       w: [{
-        w: ['auto', 'min', 'max', 'fit', 'svw', 'lvw', 'dvw', isArbitraryValue, spacing]
+        w: [themeContainer, 'screen', ...scaleSizing()]
       }],
       /**
        * Min-Width
        * @see https://tailwindcss.com/docs/min-width
        */
       'min-w': [{
-        'min-w': [isArbitraryValue, spacing, 'min', 'max', 'fit']
+        'min-w': [themeContainer, 'screen', /** Deprecated. @see https://github.com/tailwindlabs/tailwindcss.com/issues/2027#issuecomment-2620152757 */
+        'none', ...scaleSizing()]
       }],
       /**
        * Max-Width
        * @see https://tailwindcss.com/docs/max-width
        */
       'max-w': [{
-        'max-w': [isArbitraryValue, spacing, 'none', 'full', 'min', 'max', 'fit', 'prose', {
-          screen: [isTshirtSize]
-        }, isTshirtSize]
+        'max-w': [themeContainer, 'screen', 'none', /** Deprecated since Tailwind CSS v4.0.0. @see https://github.com/tailwindlabs/tailwindcss.com/issues/2027#issuecomment-2620152757 */
+        'prose', /** Deprecated since Tailwind CSS v4.0.0. @see https://github.com/tailwindlabs/tailwindcss.com/issues/2027#issuecomment-2620152757 */
+        {
+          screen: [themeBreakpoint]
+        }, ...scaleSizing()]
       }],
       /**
        * Height
        * @see https://tailwindcss.com/docs/height
        */
       h: [{
-        h: [isArbitraryValue, spacing, 'auto', 'min', 'max', 'fit', 'svh', 'lvh', 'dvh']
+        h: ['screen', 'lh', ...scaleSizing()]
       }],
       /**
        * Min-Height
        * @see https://tailwindcss.com/docs/min-height
        */
       'min-h': [{
-        'min-h': [isArbitraryValue, spacing, 'min', 'max', 'fit', 'svh', 'lvh', 'dvh']
+        'min-h': ['screen', 'lh', 'none', ...scaleSizing()]
       }],
       /**
        * Max-Height
        * @see https://tailwindcss.com/docs/max-height
        */
       'max-h': [{
-        'max-h': [isArbitraryValue, spacing, 'min', 'max', 'fit', 'svh', 'lvh', 'dvh']
-      }],
-      /**
-       * Size
-       * @see https://tailwindcss.com/docs/size
-       */
-      size: [{
-        size: [isArbitraryValue, spacing, 'auto', 'min', 'max', 'fit']
+        'max-h': ['screen', 'lh', ...scaleSizing()]
       }],
-      // Typography
+      // ------------------
+      // --- Typography ---
+      // ------------------
       /**
        * Font Size
        * @see https://tailwindcss.com/docs/font-size
        */
       'font-size': [{
-        text: ['base', isTshirtSize, isArbitraryLength]
+        text: ['base', themeText, isArbitraryVariableLength, isArbitraryLength]
       }],
       /**
        * Font Smoothing
@@ -1149,14 +1334,21 @@ const getDefaultConfig = () => {
        * @see https://tailwindcss.com/docs/font-weight
        */
       'font-weight': [{
-        font: ['thin', 'extralight', 'light', 'normal', 'medium', 'semibold', 'bold', 'extrabold', 'black', isArbitraryNumber]
+        font: [themeFontWeight, isArbitraryVariable, isArbitraryNumber]
+      }],
+      /**
+       * Font Stretch
+       * @see https://tailwindcss.com/docs/font-stretch
+       */
+      'font-stretch': [{
+        'font-stretch': ['ultra-condensed', 'extra-condensed', 'condensed', 'semi-condensed', 'normal', 'semi-expanded', 'expanded', 'extra-expanded', 'ultra-expanded', isPercent, isArbitraryValue]
       }],
       /**
        * Font Family
        * @see https://tailwindcss.com/docs/font-family
        */
       'font-family': [{
-        font: [isAny]
+        font: [isArbitraryVariableFamilyName, isArbitraryValue, themeFont]
       }],
       /**
        * Font Variant Numeric
@@ -1193,35 +1385,29 @@ const getDefaultConfig = () => {
        * @see https://tailwindcss.com/docs/letter-spacing
        */
       tracking: [{
-        tracking: ['tighter', 'tight', 'normal', 'wide', 'wider', 'widest', isArbitraryValue]
+        tracking: [themeTracking, isArbitraryVariable, isArbitraryValue]
       }],
       /**
        * Line Clamp
        * @see https://tailwindcss.com/docs/line-clamp
        */
       'line-clamp': [{
-        'line-clamp': ['none', isNumber, isArbitraryNumber]
+        'line-clamp': [isNumber, 'none', isArbitraryVariable, isArbitraryNumber]
       }],
       /**
        * Line Height
        * @see https://tailwindcss.com/docs/line-height
        */
       leading: [{
-        leading: ['none', 'tight', 'snug', 'normal', 'relaxed', 'loose', isLength, isArbitraryValue]
+        leading: [/** Deprecated since Tailwind CSS v4.0.0. @see https://github.com/tailwindlabs/tailwindcss.com/issues/2027#issuecomment-2620152757 */
+        themeLeading, ...scaleUnambiguousSpacing()]
       }],
       /**
        * List Style Image
        * @see https://tailwindcss.com/docs/list-style-image
        */
       'list-image': [{
-        'list-image': ['none', isArbitraryValue]
-      }],
-      /**
-       * List Style Type
-       * @see https://tailwindcss.com/docs/list-style-type
-       */
-      'list-style-type': [{
-        list: ['none', 'disc', 'decimal', isArbitraryValue]
+        'list-image': ['none', isArbitraryVariable, isArbitraryValue]
       }],
       /**
        * List Style Position
@@ -1231,19 +1417,11 @@ const getDefaultConfig = () => {
         list: ['inside', 'outside']
       }],
       /**
-       * Placeholder Color
-       * @deprecated since Tailwind CSS v3.0.0
-       * @see https://tailwindcss.com/docs/placeholder-color
-       */
-      'placeholder-color': [{
-        placeholder: [colors]
-      }],
-      /**
-       * Placeholder Opacity
-       * @see https://tailwindcss.com/docs/placeholder-opacity
+       * List Style Type
+       * @see https://tailwindcss.com/docs/list-style-type
        */
-      'placeholder-opacity': [{
-        'placeholder-opacity': [opacity]
+      'list-style-type': [{
+        list: ['disc', 'decimal', 'none', isArbitraryVariable, isArbitraryValue]
       }],
       /**
        * Text Alignment
@@ -1253,18 +1431,19 @@ const getDefaultConfig = () => {
         text: ['left', 'center', 'right', 'justify', 'start', 'end']
       }],
       /**
-       * Text Color
-       * @see https://tailwindcss.com/docs/text-color
+       * Placeholder Color
+       * @deprecated since Tailwind CSS v3.0.0
+       * @see https://v3.tailwindcss.com/docs/placeholder-color
        */
-      'text-color': [{
-        text: [colors]
+      'placeholder-color': [{
+        placeholder: scaleColor()
       }],
       /**
-       * Text Opacity
-       * @see https://tailwindcss.com/docs/text-opacity
+       * Text Color
+       * @see https://tailwindcss.com/docs/text-color
        */
-      'text-opacity': [{
-        'text-opacity': [opacity]
+      'text-color': [{
+        text: scaleColor()
       }],
       /**
        * Text Decoration
@@ -1276,28 +1455,28 @@ const getDefaultConfig = () => {
        * @see https://tailwindcss.com/docs/text-decoration-style
        */
       'text-decoration-style': [{
-        decoration: [...getLineStyles(), 'wavy']
+        decoration: [...scaleLineStyle(), 'wavy']
       }],
       /**
        * Text Decoration Thickness
        * @see https://tailwindcss.com/docs/text-decoration-thickness
        */
       'text-decoration-thickness': [{
-        decoration: ['auto', 'from-font', isLength, isArbitraryLength]
-      }],
-      /**
-       * Text Underline Offset
-       * @see https://tailwindcss.com/docs/text-underline-offset
-       */
-      'underline-offset': [{
-        'underline-offset': ['auto', isLength, isArbitraryValue]
+        decoration: [isNumber, 'from-font', 'auto', isArbitraryVariable, isArbitraryLength]
       }],
       /**
        * Text Decoration Color
        * @see https://tailwindcss.com/docs/text-decoration-color
        */
       'text-decoration-color': [{
-        decoration: [colors]
+        decoration: scaleColor()
+      }],
+      /**
+       * Text Underline Offset
+       * @see https://tailwindcss.com/docs/text-underline-offset
+       */
+      'underline-offset': [{
+        'underline-offset': [isNumber, 'auto', isArbitraryVariable, isArbitraryValue]
       }],
       /**
        * Text Transform
@@ -1321,14 +1500,14 @@ const getDefaultConfig = () => {
        * @see https://tailwindcss.com/docs/text-indent
        */
       indent: [{
-        indent: getSpacingWithArbitrary()
+        indent: scaleUnambiguousSpacing()
       }],
       /**
        * Vertical Alignment
        * @see https://tailwindcss.com/docs/vertical-align
        */
       'vertical-align': [{
-        align: ['baseline', 'top', 'middle', 'bottom', 'text-top', 'text-bottom', 'sub', 'super', isArbitraryValue]
+        align: ['baseline', 'top', 'middle', 'bottom', 'text-top', 'text-bottom', 'sub', 'super', isArbitraryVariable, isArbitraryValue]
       }],
       /**
        * Whitespace
@@ -1344,6 +1523,13 @@ const getDefaultConfig = () => {
       break: [{
         break: ['normal', 'words', 'all', 'keep']
       }],
+      /**
+       * Overflow Wrap
+       * @see https://tailwindcss.com/docs/overflow-wrap
+       */
+      wrap: [{
+        wrap: ['break-word', 'anywhere', 'normal']
+      }],
       /**
        * Hyphens
        * @see https://tailwindcss.com/docs/hyphens
@@ -1356,9 +1542,11 @@ const getDefaultConfig = () => {
        * @see https://tailwindcss.com/docs/content
        */
       content: [{
-        content: ['none', isArbitraryValue]
+        content: ['none', isArbitraryVariable, isArbitraryValue]
       }],
-      // Backgrounds
+      // -------------------
+      // --- Backgrounds ---
+      // -------------------
       /**
        * Background Attachment
        * @see https://tailwindcss.com/docs/background-attachment
@@ -1373,14 +1561,6 @@ const getDefaultConfig = () => {
       'bg-clip': [{
         'bg-clip': ['border', 'padding', 'content', 'text']
       }],
-      /**
-       * Background Opacity
-       * @deprecated since Tailwind CSS v3.0.0
-       * @see https://tailwindcss.com/docs/background-opacity
-       */
-      'bg-opacity': [{
-        'bg-opacity': [opacity]
-      }],
       /**
        * Background Origin
        * @see https://tailwindcss.com/docs/background-origin
@@ -1393,23 +1573,21 @@ const getDefaultConfig = () => {
        * @see https://tailwindcss.com/docs/background-position
        */
       'bg-position': [{
-        bg: [...getPositions(), isArbitraryPosition]
+        bg: scaleBgPosition()
       }],
       /**
        * Background Repeat
        * @see https://tailwindcss.com/docs/background-repeat
        */
       'bg-repeat': [{
-        bg: ['no-repeat', {
-          repeat: ['', 'x', 'y', 'round', 'space']
-        }]
+        bg: scaleBgRepeat()
       }],
       /**
        * Background Size
        * @see https://tailwindcss.com/docs/background-size
        */
       'bg-size': [{
-        bg: ['auto', 'cover', 'contain', isArbitrarySize]
+        bg: scaleBgSize()
       }],
       /**
        * Background Image
@@ -1417,597 +1595,845 @@ const getDefaultConfig = () => {
        */
       'bg-image': [{
         bg: ['none', {
-          'gradient-to': ['t', 'tr', 'r', 'br', 'b', 'bl', 'l', 'tl']
-        }, isArbitraryImage]
+          linear: [{
+            to: ['t', 'tr', 'r', 'br', 'b', 'bl', 'l', 'tl']
+          }, isInteger, isArbitraryVariable, isArbitraryValue],
+          radial: ['', isArbitraryVariable, isArbitraryValue],
+          conic: [isInteger, isArbitraryVariable, isArbitraryValue]
+        }, isArbitraryVariableImage, isArbitraryImage]
       }],
       /**
        * Background Color
        * @see https://tailwindcss.com/docs/background-color
        */
       'bg-color': [{
-        bg: [colors]
+        bg: scaleColor()
       }],
       /**
        * Gradient Color Stops From Position
        * @see https://tailwindcss.com/docs/gradient-color-stops
        */
       'gradient-from-pos': [{
-        from: [gradientColorStopPositions]
+        from: scaleGradientStopPosition()
       }],
       /**
        * Gradient Color Stops Via Position
        * @see https://tailwindcss.com/docs/gradient-color-stops
        */
       'gradient-via-pos': [{
-        via: [gradientColorStopPositions]
+        via: scaleGradientStopPosition()
       }],
       /**
        * Gradient Color Stops To Position
        * @see https://tailwindcss.com/docs/gradient-color-stops
        */
       'gradient-to-pos': [{
-        to: [gradientColorStopPositions]
+        to: scaleGradientStopPosition()
       }],
       /**
        * Gradient Color Stops From
        * @see https://tailwindcss.com/docs/gradient-color-stops
        */
       'gradient-from': [{
-        from: [gradientColorStops]
+        from: scaleColor()
       }],
       /**
        * Gradient Color Stops Via
        * @see https://tailwindcss.com/docs/gradient-color-stops
        */
       'gradient-via': [{
-        via: [gradientColorStops]
+        via: scaleColor()
       }],
       /**
        * Gradient Color Stops To
        * @see https://tailwindcss.com/docs/gradient-color-stops
        */
       'gradient-to': [{
-        to: [gradientColorStops]
+        to: scaleColor()
       }],
-      // Borders
+      // ---------------
+      // --- Borders ---
+      // ---------------
       /**
        * Border Radius
        * @see https://tailwindcss.com/docs/border-radius
        */
       rounded: [{
-        rounded: [borderRadius]
+        rounded: scaleRadius()
       }],
       /**
        * Border Radius Start
        * @see https://tailwindcss.com/docs/border-radius
        */
       'rounded-s': [{
-        'rounded-s': [borderRadius]
+        'rounded-s': scaleRadius()
       }],
       /**
        * Border Radius End
        * @see https://tailwindcss.com/docs/border-radius
        */
       'rounded-e': [{
-        'rounded-e': [borderRadius]
+        'rounded-e': scaleRadius()
       }],
       /**
        * Border Radius Top
        * @see https://tailwindcss.com/docs/border-radius
        */
       'rounded-t': [{
-        'rounded-t': [borderRadius]
+        'rounded-t': scaleRadius()
       }],
       /**
        * Border Radius Right
        * @see https://tailwindcss.com/docs/border-radius
        */
       'rounded-r': [{
-        'rounded-r': [borderRadius]
+        'rounded-r': scaleRadius()
       }],
       /**
        * Border Radius Bottom
        * @see https://tailwindcss.com/docs/border-radius
        */
       'rounded-b': [{
-        'rounded-b': [borderRadius]
+        'rounded-b': scaleRadius()
       }],
       /**
        * Border Radius Left
        * @see https://tailwindcss.com/docs/border-radius
        */
       'rounded-l': [{
-        'rounded-l': [borderRadius]
+        'rounded-l': scaleRadius()
       }],
       /**
        * Border Radius Start Start
        * @see https://tailwindcss.com/docs/border-radius
        */
       'rounded-ss': [{
-        'rounded-ss': [borderRadius]
+        'rounded-ss': scaleRadius()
       }],
       /**
        * Border Radius Start End
        * @see https://tailwindcss.com/docs/border-radius
        */
       'rounded-se': [{
-        'rounded-se': [borderRadius]
+        'rounded-se': scaleRadius()
       }],
       /**
        * Border Radius End End
        * @see https://tailwindcss.com/docs/border-radius
        */
       'rounded-ee': [{
-        'rounded-ee': [borderRadius]
+        'rounded-ee': scaleRadius()
       }],
       /**
        * Border Radius End Start
        * @see https://tailwindcss.com/docs/border-radius
        */
       'rounded-es': [{
-        'rounded-es': [borderRadius]
+        'rounded-es': scaleRadius()
       }],
       /**
        * Border Radius Top Left
        * @see https://tailwindcss.com/docs/border-radius
        */
       'rounded-tl': [{
-        'rounded-tl': [borderRadius]
+        'rounded-tl': scaleRadius()
       }],
       /**
        * Border Radius Top Right
        * @see https://tailwindcss.com/docs/border-radius
        */
       'rounded-tr': [{
-        'rounded-tr': [borderRadius]
+        'rounded-tr': scaleRadius()
       }],
       /**
        * Border Radius Bottom Right
        * @see https://tailwindcss.com/docs/border-radius
        */
       'rounded-br': [{
-        'rounded-br': [borderRadius]
+        'rounded-br': scaleRadius()
       }],
       /**
        * Border Radius Bottom Left
        * @see https://tailwindcss.com/docs/border-radius
        */
       'rounded-bl': [{
-        'rounded-bl': [borderRadius]
+        'rounded-bl': scaleRadius()
       }],
       /**
        * Border Width
        * @see https://tailwindcss.com/docs/border-width
        */
       'border-w': [{
-        border: [borderWidth]
+        border: scaleBorderWidth()
       }],
       /**
        * Border Width X
        * @see https://tailwindcss.com/docs/border-width
        */
       'border-w-x': [{
-        'border-x': [borderWidth]
+        'border-x': scaleBorderWidth()
       }],
       /**
        * Border Width Y
        * @see https://tailwindcss.com/docs/border-width
        */
       'border-w-y': [{
-        'border-y': [borderWidth]
+        'border-y': scaleBorderWidth()
       }],
       /**
        * Border Width Start
        * @see https://tailwindcss.com/docs/border-width
        */
       'border-w-s': [{
-        'border-s': [borderWidth]
+        'border-s': scaleBorderWidth()
       }],
       /**
        * Border Width End
        * @see https://tailwindcss.com/docs/border-width
        */
       'border-w-e': [{
-        'border-e': [borderWidth]
+        'border-e': scaleBorderWidth()
       }],
       /**
        * Border Width Top
        * @see https://tailwindcss.com/docs/border-width
        */
       'border-w-t': [{
-        'border-t': [borderWidth]
+        'border-t': scaleBorderWidth()
       }],
       /**
        * Border Width Right
        * @see https://tailwindcss.com/docs/border-width
        */
       'border-w-r': [{
-        'border-r': [borderWidth]
+        'border-r': scaleBorderWidth()
       }],
       /**
        * Border Width Bottom
        * @see https://tailwindcss.com/docs/border-width
        */
       'border-w-b': [{
-        'border-b': [borderWidth]
+        'border-b': scaleBorderWidth()
       }],
       /**
        * Border Width Left
        * @see https://tailwindcss.com/docs/border-width
        */
       'border-w-l': [{
-        'border-l': [borderWidth]
-      }],
-      /**
-       * Border Opacity
-       * @see https://tailwindcss.com/docs/border-opacity
-       */
-      'border-opacity': [{
-        'border-opacity': [opacity]
-      }],
-      /**
-       * Border Style
-       * @see https://tailwindcss.com/docs/border-style
-       */
-      'border-style': [{
-        border: [...getLineStyles(), 'hidden']
+        'border-l': scaleBorderWidth()
       }],
       /**
        * Divide Width X
-       * @see https://tailwindcss.com/docs/divide-width
+       * @see https://tailwindcss.com/docs/border-width#between-children
        */
       'divide-x': [{
-        'divide-x': [borderWidth]
+        'divide-x': scaleBorderWidth()
       }],
       /**
        * Divide Width X Reverse
-       * @see https://tailwindcss.com/docs/divide-width
+       * @see https://tailwindcss.com/docs/border-width#between-children
        */
       'divide-x-reverse': ['divide-x-reverse'],
       /**
        * Divide Width Y
-       * @see https://tailwindcss.com/docs/divide-width
+       * @see https://tailwindcss.com/docs/border-width#between-children
        */
       'divide-y': [{
-        'divide-y': [borderWidth]
+        'divide-y': scaleBorderWidth()
       }],
       /**
        * Divide Width Y Reverse
-       * @see https://tailwindcss.com/docs/divide-width
+       * @see https://tailwindcss.com/docs/border-width#between-children
        */
       'divide-y-reverse': ['divide-y-reverse'],
       /**
-       * Divide Opacity
-       * @see https://tailwindcss.com/docs/divide-opacity
+       * Border Style
+       * @see https://tailwindcss.com/docs/border-style
        */
-      'divide-opacity': [{
-        'divide-opacity': [opacity]
+      'border-style': [{
+        border: [...scaleLineStyle(), 'hidden', 'none']
       }],
       /**
        * Divide Style
-       * @see https://tailwindcss.com/docs/divide-style
+       * @see https://tailwindcss.com/docs/border-style#setting-the-divider-style
        */
       'divide-style': [{
-        divide: getLineStyles()
+        divide: [...scaleLineStyle(), 'hidden', 'none']
       }],
       /**
        * Border Color
        * @see https://tailwindcss.com/docs/border-color
        */
       'border-color': [{
-        border: [borderColor]
+        border: scaleColor()
       }],
       /**
        * Border Color X
        * @see https://tailwindcss.com/docs/border-color
        */
       'border-color-x': [{
-        'border-x': [borderColor]
+        'border-x': scaleColor()
       }],
       /**
        * Border Color Y
        * @see https://tailwindcss.com/docs/border-color
        */
       'border-color-y': [{
-        'border-y': [borderColor]
+        'border-y': scaleColor()
       }],
       /**
        * Border Color S
        * @see https://tailwindcss.com/docs/border-color
        */
       'border-color-s': [{
-        'border-s': [borderColor]
+        'border-s': scaleColor()
       }],
       /**
        * Border Color E
        * @see https://tailwindcss.com/docs/border-color
        */
       'border-color-e': [{
-        'border-e': [borderColor]
+        'border-e': scaleColor()
       }],
       /**
        * Border Color Top
        * @see https://tailwindcss.com/docs/border-color
        */
       'border-color-t': [{
-        'border-t': [borderColor]
+        'border-t': scaleColor()
       }],
       /**
        * Border Color Right
        * @see https://tailwindcss.com/docs/border-color
        */
       'border-color-r': [{
-        'border-r': [borderColor]
+        'border-r': scaleColor()
       }],
       /**
        * Border Color Bottom
        * @see https://tailwindcss.com/docs/border-color
        */
       'border-color-b': [{
-        'border-b': [borderColor]
+        'border-b': scaleColor()
       }],
       /**
        * Border Color Left
        * @see https://tailwindcss.com/docs/border-color
        */
       'border-color-l': [{
-        'border-l': [borderColor]
+        'border-l': scaleColor()
       }],
       /**
        * Divide Color
        * @see https://tailwindcss.com/docs/divide-color
        */
       'divide-color': [{
-        divide: [borderColor]
+        divide: scaleColor()
       }],
       /**
        * Outline Style
        * @see https://tailwindcss.com/docs/outline-style
        */
       'outline-style': [{
-        outline: ['', ...getLineStyles()]
+        outline: [...scaleLineStyle(), 'none', 'hidden']
       }],
       /**
        * Outline Offset
        * @see https://tailwindcss.com/docs/outline-offset
        */
       'outline-offset': [{
-        'outline-offset': [isLength, isArbitraryValue]
+        'outline-offset': [isNumber, isArbitraryVariable, isArbitraryValue]
       }],
       /**
        * Outline Width
        * @see https://tailwindcss.com/docs/outline-width
        */
       'outline-w': [{
-        outline: [isLength, isArbitraryLength]
+        outline: ['', isNumber, isArbitraryVariableLength, isArbitraryLength]
       }],
       /**
        * Outline Color
        * @see https://tailwindcss.com/docs/outline-color
        */
       'outline-color': [{
-        outline: [colors]
+        outline: scaleColor()
+      }],
+      // ---------------
+      // --- Effects ---
+      // ---------------
+      /**
+       * Box Shadow
+       * @see https://tailwindcss.com/docs/box-shadow
+       */
+      shadow: [{
+        shadow: [
+        // Deprecated since Tailwind CSS v4.0.0
+        '', 'none', themeShadow, isArbitraryVariableShadow, isArbitraryShadow]
+      }],
+      /**
+       * Box Shadow Color
+       * @see https://tailwindcss.com/docs/box-shadow#setting-the-shadow-color
+       */
+      'shadow-color': [{
+        shadow: scaleColor()
+      }],
+      /**
+       * Inset Box Shadow
+       * @see https://tailwindcss.com/docs/box-shadow#adding-an-inset-shadow
+       */
+      'inset-shadow': [{
+        'inset-shadow': ['none', themeInsetShadow, isArbitraryVariableShadow, isArbitraryShadow]
+      }],
+      /**
+       * Inset Box Shadow Color
+       * @see https://tailwindcss.com/docs/box-shadow#setting-the-inset-shadow-color
+       */
+      'inset-shadow-color': [{
+        'inset-shadow': scaleColor()
       }],
       /**
        * Ring Width
-       * @see https://tailwindcss.com/docs/ring-width
+       * @see https://tailwindcss.com/docs/box-shadow#adding-a-ring
        */
       'ring-w': [{
-        ring: getLengthWithEmptyAndArbitrary()
+        ring: scaleBorderWidth()
       }],
       /**
        * Ring Width Inset
-       * @see https://tailwindcss.com/docs/ring-width
+       * @see https://v3.tailwindcss.com/docs/ring-width#inset-rings
+       * @deprecated since Tailwind CSS v4.0.0
+       * @see https://github.com/tailwindlabs/tailwindcss/blob/v4.0.0/packages/tailwindcss/src/utilities.ts#L4158
        */
       'ring-w-inset': ['ring-inset'],
       /**
        * Ring Color
-       * @see https://tailwindcss.com/docs/ring-color
+       * @see https://tailwindcss.com/docs/box-shadow#setting-the-ring-color
        */
       'ring-color': [{
-        ring: [colors]
-      }],
-      /**
-       * Ring Opacity
-       * @see https://tailwindcss.com/docs/ring-opacity
-       */
-      'ring-opacity': [{
-        'ring-opacity': [opacity]
+        ring: scaleColor()
       }],
       /**
        * Ring Offset Width
-       * @see https://tailwindcss.com/docs/ring-offset-width
+       * @see https://v3.tailwindcss.com/docs/ring-offset-width
+       * @deprecated since Tailwind CSS v4.0.0
+       * @see https://github.com/tailwindlabs/tailwindcss/blob/v4.0.0/packages/tailwindcss/src/utilities.ts#L4158
        */
       'ring-offset-w': [{
-        'ring-offset': [isLength, isArbitraryLength]
+        'ring-offset': [isNumber, isArbitraryLength]
       }],
       /**
        * Ring Offset Color
-       * @see https://tailwindcss.com/docs/ring-offset-color
+       * @see https://v3.tailwindcss.com/docs/ring-offset-color
+       * @deprecated since Tailwind CSS v4.0.0
+       * @see https://github.com/tailwindlabs/tailwindcss/blob/v4.0.0/packages/tailwindcss/src/utilities.ts#L4158
        */
       'ring-offset-color': [{
-        'ring-offset': [colors]
+        'ring-offset': scaleColor()
       }],
-      // Effects
       /**
-       * Box Shadow
-       * @see https://tailwindcss.com/docs/box-shadow
+       * Inset Ring Width
+       * @see https://tailwindcss.com/docs/box-shadow#adding-an-inset-ring
        */
-      shadow: [{
-        shadow: ['', 'inner', 'none', isTshirtSize, isArbitraryShadow]
+      'inset-ring-w': [{
+        'inset-ring': scaleBorderWidth()
       }],
       /**
-       * Box Shadow Color
-       * @see https://tailwindcss.com/docs/box-shadow-color
+       * Inset Ring Color
+       * @see https://tailwindcss.com/docs/box-shadow#setting-the-inset-ring-color
        */
-      'shadow-color': [{
-        shadow: [isAny]
+      'inset-ring-color': [{
+        'inset-ring': scaleColor()
+      }],
+      /**
+       * Text Shadow
+       * @see https://tailwindcss.com/docs/text-shadow
+       */
+      'text-shadow': [{
+        'text-shadow': ['none', themeTextShadow, isArbitraryVariableShadow, isArbitraryShadow]
+      }],
+      /**
+       * Text Shadow Color
+       * @see https://tailwindcss.com/docs/text-shadow#setting-the-shadow-color
+       */
+      'text-shadow-color': [{
+        'text-shadow': scaleColor()
       }],
       /**
        * Opacity
        * @see https://tailwindcss.com/docs/opacity
        */
       opacity: [{
-        opacity: [opacity]
+        opacity: [isNumber, isArbitraryVariable, isArbitraryValue]
       }],
       /**
        * Mix Blend Mode
        * @see https://tailwindcss.com/docs/mix-blend-mode
        */
       'mix-blend': [{
-        'mix-blend': [...getBlendModes(), 'plus-lighter', 'plus-darker']
+        'mix-blend': [...scaleBlendMode(), 'plus-darker', 'plus-lighter']
       }],
       /**
        * Background Blend Mode
        * @see https://tailwindcss.com/docs/background-blend-mode
        */
       'bg-blend': [{
-        'bg-blend': getBlendModes()
+        'bg-blend': scaleBlendMode()
+      }],
+      /**
+       * Mask Clip
+       * @see https://tailwindcss.com/docs/mask-clip
+       */
+      'mask-clip': [{
+        'mask-clip': ['border', 'padding', 'content', 'fill', 'stroke', 'view']
+      }, 'mask-no-clip'],
+      /**
+       * Mask Composite
+       * @see https://tailwindcss.com/docs/mask-composite
+       */
+      'mask-composite': [{
+        mask: ['add', 'subtract', 'intersect', 'exclude']
+      }],
+      /**
+       * Mask Image
+       * @see https://tailwindcss.com/docs/mask-image
+       */
+      'mask-image-linear-pos': [{
+        'mask-linear': [isNumber]
+      }],
+      'mask-image-linear-from-pos': [{
+        'mask-linear-from': scaleMaskImagePosition()
+      }],
+      'mask-image-linear-to-pos': [{
+        'mask-linear-to': scaleMaskImagePosition()
+      }],
+      'mask-image-linear-from-color': [{
+        'mask-linear-from': scaleColor()
+      }],
+      'mask-image-linear-to-color': [{
+        'mask-linear-to': scaleColor()
+      }],
+      'mask-image-t-from-pos': [{
+        'mask-t-from': scaleMaskImagePosition()
+      }],
+      'mask-image-t-to-pos': [{
+        'mask-t-to': scaleMaskImagePosition()
+      }],
+      'mask-image-t-from-color': [{
+        'mask-t-from': scaleColor()
+      }],
+      'mask-image-t-to-color': [{
+        'mask-t-to': scaleColor()
+      }],
+      'mask-image-r-from-pos': [{
+        'mask-r-from': scaleMaskImagePosition()
+      }],
+      'mask-image-r-to-pos': [{
+        'mask-r-to': scaleMaskImagePosition()
+      }],
+      'mask-image-r-from-color': [{
+        'mask-r-from': scaleColor()
+      }],
+      'mask-image-r-to-color': [{
+        'mask-r-to': scaleColor()
+      }],
+      'mask-image-b-from-pos': [{
+        'mask-b-from': scaleMaskImagePosition()
+      }],
+      'mask-image-b-to-pos': [{
+        'mask-b-to': scaleMaskImagePosition()
+      }],
+      'mask-image-b-from-color': [{
+        'mask-b-from': scaleColor()
+      }],
+      'mask-image-b-to-color': [{
+        'mask-b-to': scaleColor()
+      }],
+      'mask-image-l-from-pos': [{
+        'mask-l-from': scaleMaskImagePosition()
+      }],
+      'mask-image-l-to-pos': [{
+        'mask-l-to': scaleMaskImagePosition()
+      }],
+      'mask-image-l-from-color': [{
+        'mask-l-from': scaleColor()
+      }],
+      'mask-image-l-to-color': [{
+        'mask-l-to': scaleColor()
+      }],
+      'mask-image-x-from-pos': [{
+        'mask-x-from': scaleMaskImagePosition()
+      }],
+      'mask-image-x-to-pos': [{
+        'mask-x-to': scaleMaskImagePosition()
+      }],
+      'mask-image-x-from-color': [{
+        'mask-x-from': scaleColor()
+      }],
+      'mask-image-x-to-color': [{
+        'mask-x-to': scaleColor()
+      }],
+      'mask-image-y-from-pos': [{
+        'mask-y-from': scaleMaskImagePosition()
+      }],
+      'mask-image-y-to-pos': [{
+        'mask-y-to': scaleMaskImagePosition()
+      }],
+      'mask-image-y-from-color': [{
+        'mask-y-from': scaleColor()
+      }],
+      'mask-image-y-to-color': [{
+        'mask-y-to': scaleColor()
+      }],
+      'mask-image-radial': [{
+        'mask-radial': [isArbitraryVariable, isArbitraryValue]
+      }],
+      'mask-image-radial-from-pos': [{
+        'mask-radial-from': scaleMaskImagePosition()
+      }],
+      'mask-image-radial-to-pos': [{
+        'mask-radial-to': scaleMaskImagePosition()
+      }],
+      'mask-image-radial-from-color': [{
+        'mask-radial-from': scaleColor()
+      }],
+      'mask-image-radial-to-color': [{
+        'mask-radial-to': scaleColor()
+      }],
+      'mask-image-radial-shape': [{
+        'mask-radial': ['circle', 'ellipse']
+      }],
+      'mask-image-radial-size': [{
+        'mask-radial': [{
+          closest: ['side', 'corner'],
+          farthest: ['side', 'corner']
+        }]
+      }],
+      'mask-image-radial-pos': [{
+        'mask-radial-at': scalePosition()
+      }],
+      'mask-image-conic-pos': [{
+        'mask-conic': [isNumber]
+      }],
+      'mask-image-conic-from-pos': [{
+        'mask-conic-from': scaleMaskImagePosition()
+      }],
+      'mask-image-conic-to-pos': [{
+        'mask-conic-to': scaleMaskImagePosition()
+      }],
+      'mask-image-conic-from-color': [{
+        'mask-conic-from': scaleColor()
+      }],
+      'mask-image-conic-to-color': [{
+        'mask-conic-to': scaleColor()
+      }],
+      /**
+       * Mask Mode
+       * @see https://tailwindcss.com/docs/mask-mode
+       */
+      'mask-mode': [{
+        mask: ['alpha', 'luminance', 'match']
+      }],
+      /**
+       * Mask Origin
+       * @see https://tailwindcss.com/docs/mask-origin
+       */
+      'mask-origin': [{
+        'mask-origin': ['border', 'padding', 'content', 'fill', 'stroke', 'view']
       }],
-      // Filters
+      /**
+       * Mask Position
+       * @see https://tailwindcss.com/docs/mask-position
+       */
+      'mask-position': [{
+        mask: scaleBgPosition()
+      }],
+      /**
+       * Mask Repeat
+       * @see https://tailwindcss.com/docs/mask-repeat
+       */
+      'mask-repeat': [{
+        mask: scaleBgRepeat()
+      }],
+      /**
+       * Mask Size
+       * @see https://tailwindcss.com/docs/mask-size
+       */
+      'mask-size': [{
+        mask: scaleBgSize()
+      }],
+      /**
+       * Mask Type
+       * @see https://tailwindcss.com/docs/mask-type
+       */
+      'mask-type': [{
+        'mask-type': ['alpha', 'luminance']
+      }],
+      /**
+       * Mask Image
+       * @see https://tailwindcss.com/docs/mask-image
+       */
+      'mask-image': [{
+        mask: ['none', isArbitraryVariable, isArbitraryValue]
+      }],
+      // ---------------
+      // --- Filters ---
+      // ---------------
       /**
        * Filter
-       * @deprecated since Tailwind CSS v3.0.0
        * @see https://tailwindcss.com/docs/filter
        */
       filter: [{
-        filter: ['', 'none']
+        filter: [
+        // Deprecated since Tailwind CSS v3.0.0
+        '', 'none', isArbitraryVariable, isArbitraryValue]
       }],
       /**
        * Blur
        * @see https://tailwindcss.com/docs/blur
        */
       blur: [{
-        blur: [blur]
+        blur: scaleBlur()
       }],
       /**
        * Brightness
        * @see https://tailwindcss.com/docs/brightness
        */
       brightness: [{
-        brightness: [brightness]
+        brightness: [isNumber, isArbitraryVariable, isArbitraryValue]
       }],
       /**
        * Contrast
        * @see https://tailwindcss.com/docs/contrast
        */
       contrast: [{
-        contrast: [contrast]
+        contrast: [isNumber, isArbitraryVariable, isArbitraryValue]
       }],
       /**
        * Drop Shadow
        * @see https://tailwindcss.com/docs/drop-shadow
        */
       'drop-shadow': [{
-        'drop-shadow': ['', 'none', isTshirtSize, isArbitraryValue]
+        'drop-shadow': [
+        // Deprecated since Tailwind CSS v4.0.0
+        '', 'none', themeDropShadow, isArbitraryVariableShadow, isArbitraryShadow]
+      }],
+      /**
+       * Drop Shadow Color
+       * @see https://tailwindcss.com/docs/filter-drop-shadow#setting-the-shadow-color
+       */
+      'drop-shadow-color': [{
+        'drop-shadow': scaleColor()
       }],
       /**
        * Grayscale
        * @see https://tailwindcss.com/docs/grayscale
        */
       grayscale: [{
-        grayscale: [grayscale]
+        grayscale: ['', isNumber, isArbitraryVariable, isArbitraryValue]
       }],
       /**
        * Hue Rotate
        * @see https://tailwindcss.com/docs/hue-rotate
        */
       'hue-rotate': [{
-        'hue-rotate': [hueRotate]
+        'hue-rotate': [isNumber, isArbitraryVariable, isArbitraryValue]
       }],
       /**
        * Invert
        * @see https://tailwindcss.com/docs/invert
        */
       invert: [{
-        invert: [invert]
+        invert: ['', isNumber, isArbitraryVariable, isArbitraryValue]
       }],
       /**
        * Saturate
        * @see https://tailwindcss.com/docs/saturate
        */
       saturate: [{
-        saturate: [saturate]
+        saturate: [isNumber, isArbitraryVariable, isArbitraryValue]
       }],
       /**
        * Sepia
        * @see https://tailwindcss.com/docs/sepia
        */
       sepia: [{
-        sepia: [sepia]
+        sepia: ['', isNumber, isArbitraryVariable, isArbitraryValue]
       }],
       /**
        * Backdrop Filter
-       * @deprecated since Tailwind CSS v3.0.0
        * @see https://tailwindcss.com/docs/backdrop-filter
        */
       'backdrop-filter': [{
-        'backdrop-filter': ['', 'none']
+        'backdrop-filter': [
+        // Deprecated since Tailwind CSS v3.0.0
+        '', 'none', isArbitraryVariable, isArbitraryValue]
       }],
       /**
        * Backdrop Blur
        * @see https://tailwindcss.com/docs/backdrop-blur
        */
       'backdrop-blur': [{
-        'backdrop-blur': [blur]
+        'backdrop-blur': scaleBlur()
       }],
       /**
        * Backdrop Brightness
        * @see https://tailwindcss.com/docs/backdrop-brightness
        */
       'backdrop-brightness': [{
-        'backdrop-brightness': [brightness]
+        'backdrop-brightness': [isNumber, isArbitraryVariable, isArbitraryValue]
       }],
       /**
        * Backdrop Contrast
        * @see https://tailwindcss.com/docs/backdrop-contrast
        */
       'backdrop-contrast': [{
-        'backdrop-contrast': [contrast]
+        'backdrop-contrast': [isNumber, isArbitraryVariable, isArbitraryValue]
       }],
       /**
        * Backdrop Grayscale
        * @see https://tailwindcss.com/docs/backdrop-grayscale
        */
       'backdrop-grayscale': [{
-        'backdrop-grayscale': [grayscale]
+        'backdrop-grayscale': ['', isNumber, isArbitraryVariable, isArbitraryValue]
       }],
       /**
        * Backdrop Hue Rotate
        * @see https://tailwindcss.com/docs/backdrop-hue-rotate
        */
       'backdrop-hue-rotate': [{
-        'backdrop-hue-rotate': [hueRotate]
+        'backdrop-hue-rotate': [isNumber, isArbitraryVariable, isArbitraryValue]
       }],
       /**
        * Backdrop Invert
        * @see https://tailwindcss.com/docs/backdrop-invert
        */
       'backdrop-invert': [{
-        'backdrop-invert': [invert]
+        'backdrop-invert': ['', isNumber, isArbitraryVariable, isArbitraryValue]
       }],
       /**
        * Backdrop Opacity
        * @see https://tailwindcss.com/docs/backdrop-opacity
        */
       'backdrop-opacity': [{
-        'backdrop-opacity': [opacity]
+        'backdrop-opacity': [isNumber, isArbitraryVariable, isArbitraryValue]
       }],
       /**
        * Backdrop Saturate
        * @see https://tailwindcss.com/docs/backdrop-saturate
        */
       'backdrop-saturate': [{
-        'backdrop-saturate': [saturate]
+        'backdrop-saturate': [isNumber, isArbitraryVariable, isArbitraryValue]
       }],
       /**
        * Backdrop Sepia
        * @see https://tailwindcss.com/docs/backdrop-sepia
        */
       'backdrop-sepia': [{
-        'backdrop-sepia': [sepia]
+        'backdrop-sepia': ['', isNumber, isArbitraryVariable, isArbitraryValue]
       }],
-      // Tables
+      // --------------
+      // --- Tables ---
+      // --------------
       /**
        * Border Collapse
        * @see https://tailwindcss.com/docs/border-collapse
@@ -2020,21 +2446,21 @@ const getDefaultConfig = () => {
        * @see https://tailwindcss.com/docs/border-spacing
        */
       'border-spacing': [{
-        'border-spacing': [borderSpacing]
+        'border-spacing': scaleUnambiguousSpacing()
       }],
       /**
        * Border Spacing X
        * @see https://tailwindcss.com/docs/border-spacing
        */
       'border-spacing-x': [{
-        'border-spacing-x': [borderSpacing]
+        'border-spacing-x': scaleUnambiguousSpacing()
       }],
       /**
        * Border Spacing Y
        * @see https://tailwindcss.com/docs/border-spacing
        */
       'border-spacing-y': [{
-        'border-spacing-y': [borderSpacing]
+        'border-spacing-y': scaleUnambiguousSpacing()
       }],
       /**
        * Table Layout
@@ -2050,120 +2476,220 @@ const getDefaultConfig = () => {
       caption: [{
         caption: ['top', 'bottom']
       }],
-      // Transitions and Animation
+      // ---------------------------------
+      // --- Transitions and Animation ---
+      // ---------------------------------
       /**
-       * Tranisition Property
+       * Transition Property
        * @see https://tailwindcss.com/docs/transition-property
        */
       transition: [{
-        transition: ['none', 'all', '', 'colors', 'opacity', 'shadow', 'transform', isArbitraryValue]
+        transition: ['', 'all', 'colors', 'opacity', 'shadow', 'transform', 'none', isArbitraryVariable, isArbitraryValue]
+      }],
+      /**
+       * Transition Behavior
+       * @see https://tailwindcss.com/docs/transition-behavior
+       */
+      'transition-behavior': [{
+        transition: ['normal', 'discrete']
       }],
       /**
        * Transition Duration
        * @see https://tailwindcss.com/docs/transition-duration
        */
       duration: [{
-        duration: getNumberAndArbitrary()
+        duration: [isNumber, 'initial', isArbitraryVariable, isArbitraryValue]
       }],
       /**
        * Transition Timing Function
        * @see https://tailwindcss.com/docs/transition-timing-function
        */
       ease: [{
-        ease: ['linear', 'in', 'out', 'in-out', isArbitraryValue]
+        ease: ['linear', 'initial', themeEase, isArbitraryVariable, isArbitraryValue]
       }],
       /**
        * Transition Delay
        * @see https://tailwindcss.com/docs/transition-delay
        */
       delay: [{
-        delay: getNumberAndArbitrary()
+        delay: [isNumber, isArbitraryVariable, isArbitraryValue]
       }],
       /**
        * Animation
        * @see https://tailwindcss.com/docs/animation
        */
       animate: [{
-        animate: ['none', 'spin', 'ping', 'pulse', 'bounce', isArbitraryValue]
+        animate: ['none', themeAnimate, isArbitraryVariable, isArbitraryValue]
       }],
-      // Transforms
+      // ------------------
+      // --- Transforms ---
+      // ------------------
       /**
-       * Transform
-       * @see https://tailwindcss.com/docs/transform
+       * Backface Visibility
+       * @see https://tailwindcss.com/docs/backface-visibility
        */
-      transform: [{
-        transform: ['', 'gpu', 'none']
+      backface: [{
+        backface: ['hidden', 'visible']
+      }],
+      /**
+       * Perspective
+       * @see https://tailwindcss.com/docs/perspective
+       */
+      perspective: [{
+        perspective: [themePerspective, isArbitraryVariable, isArbitraryValue]
+      }],
+      /**
+       * Perspective Origin
+       * @see https://tailwindcss.com/docs/perspective-origin
+       */
+      'perspective-origin': [{
+        'perspective-origin': scalePositionWithArbitrary()
+      }],
+      /**
+       * Rotate
+       * @see https://tailwindcss.com/docs/rotate
+       */
+      rotate: [{
+        rotate: scaleRotate()
+      }],
+      /**
+       * Rotate X
+       * @see https://tailwindcss.com/docs/rotate
+       */
+      'rotate-x': [{
+        'rotate-x': scaleRotate()
+      }],
+      /**
+       * Rotate Y
+       * @see https://tailwindcss.com/docs/rotate
+       */
+      'rotate-y': [{
+        'rotate-y': scaleRotate()
+      }],
+      /**
+       * Rotate Z
+       * @see https://tailwindcss.com/docs/rotate
+       */
+      'rotate-z': [{
+        'rotate-z': scaleRotate()
       }],
       /**
        * Scale
        * @see https://tailwindcss.com/docs/scale
        */
       scale: [{
-        scale: [scale]
+        scale: scaleScale()
       }],
       /**
        * Scale X
        * @see https://tailwindcss.com/docs/scale
        */
       'scale-x': [{
-        'scale-x': [scale]
+        'scale-x': scaleScale()
       }],
       /**
        * Scale Y
        * @see https://tailwindcss.com/docs/scale
        */
       'scale-y': [{
-        'scale-y': [scale]
+        'scale-y': scaleScale()
       }],
       /**
-       * Rotate
-       * @see https://tailwindcss.com/docs/rotate
+       * Scale Z
+       * @see https://tailwindcss.com/docs/scale
        */
-      rotate: [{
-        rotate: [isInteger, isArbitraryValue]
+      'scale-z': [{
+        'scale-z': scaleScale()
       }],
       /**
-       * Translate X
-       * @see https://tailwindcss.com/docs/translate
+       * Scale 3D
+       * @see https://tailwindcss.com/docs/scale
        */
-      'translate-x': [{
-        'translate-x': [translate]
-      }],
+      'scale-3d': ['scale-3d'],
       /**
-       * Translate Y
-       * @see https://tailwindcss.com/docs/translate
+       * Skew
+       * @see https://tailwindcss.com/docs/skew
        */
-      'translate-y': [{
-        'translate-y': [translate]
+      skew: [{
+        skew: scaleSkew()
       }],
       /**
        * Skew X
        * @see https://tailwindcss.com/docs/skew
        */
       'skew-x': [{
-        'skew-x': [skew]
+        'skew-x': scaleSkew()
       }],
       /**
        * Skew Y
        * @see https://tailwindcss.com/docs/skew
        */
       'skew-y': [{
-        'skew-y': [skew]
+        'skew-y': scaleSkew()
+      }],
+      /**
+       * Transform
+       * @see https://tailwindcss.com/docs/transform
+       */
+      transform: [{
+        transform: [isArbitraryVariable, isArbitraryValue, '', 'none', 'gpu', 'cpu']
       }],
       /**
        * Transform Origin
        * @see https://tailwindcss.com/docs/transform-origin
        */
       'transform-origin': [{
-        origin: ['center', 'top', 'top-right', 'right', 'bottom-right', 'bottom', 'bottom-left', 'left', 'top-left', isArbitraryValue]
+        origin: scalePositionWithArbitrary()
+      }],
+      /**
+       * Transform Style
+       * @see https://tailwindcss.com/docs/transform-style
+       */
+      'transform-style': [{
+        transform: ['3d', 'flat']
+      }],
+      /**
+       * Translate
+       * @see https://tailwindcss.com/docs/translate
+       */
+      translate: [{
+        translate: scaleTranslate()
+      }],
+      /**
+       * Translate X
+       * @see https://tailwindcss.com/docs/translate
+       */
+      'translate-x': [{
+        'translate-x': scaleTranslate()
       }],
-      // Interactivity
+      /**
+       * Translate Y
+       * @see https://tailwindcss.com/docs/translate
+       */
+      'translate-y': [{
+        'translate-y': scaleTranslate()
+      }],
+      /**
+       * Translate Z
+       * @see https://tailwindcss.com/docs/translate
+       */
+      'translate-z': [{
+        'translate-z': scaleTranslate()
+      }],
+      /**
+       * Translate None
+       * @see https://tailwindcss.com/docs/translate
+       */
+      'translate-none': ['translate-none'],
+      // ---------------------
+      // --- Interactivity ---
+      // ---------------------
       /**
        * Accent Color
        * @see https://tailwindcss.com/docs/accent-color
        */
       accent: [{
-        accent: ['auto', colors]
+        accent: scaleColor()
       }],
       /**
        * Appearance
@@ -2172,33 +2698,47 @@ const getDefaultConfig = () => {
       appearance: [{
         appearance: ['none', 'auto']
       }],
+      /**
+       * Caret Color
+       * @see https://tailwindcss.com/docs/just-in-time-mode#caret-color-utilities
+       */
+      'caret-color': [{
+        caret: scaleColor()
+      }],
+      /**
+       * Color Scheme
+       * @see https://tailwindcss.com/docs/color-scheme
+       */
+      'color-scheme': [{
+        scheme: ['normal', 'dark', 'light', 'light-dark', 'only-dark', 'only-light']
+      }],
       /**
        * Cursor
        * @see https://tailwindcss.com/docs/cursor
        */
       cursor: [{
-        cursor: ['auto', 'default', 'pointer', 'wait', 'text', 'move', 'help', 'not-allowed', 'none', 'context-menu', 'progress', 'cell', 'crosshair', 'vertical-text', 'alias', 'copy', 'no-drop', 'grab', 'grabbing', 'all-scroll', 'col-resize', 'row-resize', 'n-resize', 'e-resize', 's-resize', 'w-resize', 'ne-resize', 'nw-resize', 'se-resize', 'sw-resize', 'ew-resize', 'ns-resize', 'nesw-resize', 'nwse-resize', 'zoom-in', 'zoom-out', isArbitraryValue]
+        cursor: ['auto', 'default', 'pointer', 'wait', 'text', 'move', 'help', 'not-allowed', 'none', 'context-menu', 'progress', 'cell', 'crosshair', 'vertical-text', 'alias', 'copy', 'no-drop', 'grab', 'grabbing', 'all-scroll', 'col-resize', 'row-resize', 'n-resize', 'e-resize', 's-resize', 'w-resize', 'ne-resize', 'nw-resize', 'se-resize', 'sw-resize', 'ew-resize', 'ns-resize', 'nesw-resize', 'nwse-resize', 'zoom-in', 'zoom-out', isArbitraryVariable, isArbitraryValue]
       }],
       /**
-       * Caret Color
-       * @see https://tailwindcss.com/docs/just-in-time-mode#caret-color-utilities
+       * Field Sizing
+       * @see https://tailwindcss.com/docs/field-sizing
        */
-      'caret-color': [{
-        caret: [colors]
+      'field-sizing': [{
+        'field-sizing': ['fixed', 'content']
       }],
       /**
        * Pointer Events
        * @see https://tailwindcss.com/docs/pointer-events
        */
       'pointer-events': [{
-        'pointer-events': ['none', 'auto']
+        'pointer-events': ['auto', 'none']
       }],
       /**
        * Resize
        * @see https://tailwindcss.com/docs/resize
        */
       resize: [{
-        resize: ['none', 'y', 'x', '']
+        resize: ['none', '', 'y', 'x']
       }],
       /**
        * Scroll Behavior
@@ -2212,126 +2752,126 @@ const getDefaultConfig = () => {
        * @see https://tailwindcss.com/docs/scroll-margin
        */
       'scroll-m': [{
-        'scroll-m': getSpacingWithArbitrary()
+        'scroll-m': scaleUnambiguousSpacing()
       }],
       /**
        * Scroll Margin X
        * @see https://tailwindcss.com/docs/scroll-margin
        */
       'scroll-mx': [{
-        'scroll-mx': getSpacingWithArbitrary()
+        'scroll-mx': scaleUnambiguousSpacing()
       }],
       /**
        * Scroll Margin Y
        * @see https://tailwindcss.com/docs/scroll-margin
        */
       'scroll-my': [{
-        'scroll-my': getSpacingWithArbitrary()
+        'scroll-my': scaleUnambiguousSpacing()
       }],
       /**
        * Scroll Margin Start
        * @see https://tailwindcss.com/docs/scroll-margin
        */
       'scroll-ms': [{
-        'scroll-ms': getSpacingWithArbitrary()
+        'scroll-ms': scaleUnambiguousSpacing()
       }],
       /**
        * Scroll Margin End
        * @see https://tailwindcss.com/docs/scroll-margin
        */
       'scroll-me': [{
-        'scroll-me': getSpacingWithArbitrary()
+        'scroll-me': scaleUnambiguousSpacing()
       }],
       /**
        * Scroll Margin Top
        * @see https://tailwindcss.com/docs/scroll-margin
        */
       'scroll-mt': [{
-        'scroll-mt': getSpacingWithArbitrary()
+        'scroll-mt': scaleUnambiguousSpacing()
       }],
       /**
        * Scroll Margin Right
        * @see https://tailwindcss.com/docs/scroll-margin
        */
       'scroll-mr': [{
-        'scroll-mr': getSpacingWithArbitrary()
+        'scroll-mr': scaleUnambiguousSpacing()
       }],
       /**
        * Scroll Margin Bottom
        * @see https://tailwindcss.com/docs/scroll-margin
        */
       'scroll-mb': [{
-        'scroll-mb': getSpacingWithArbitrary()
+        'scroll-mb': scaleUnambiguousSpacing()
       }],
       /**
        * Scroll Margin Left
        * @see https://tailwindcss.com/docs/scroll-margin
        */
       'scroll-ml': [{
-        'scroll-ml': getSpacingWithArbitrary()
+        'scroll-ml': scaleUnambiguousSpacing()
       }],
       /**
        * Scroll Padding
        * @see https://tailwindcss.com/docs/scroll-padding
        */
       'scroll-p': [{
-        'scroll-p': getSpacingWithArbitrary()
+        'scroll-p': scaleUnambiguousSpacing()
       }],
       /**
        * Scroll Padding X
        * @see https://tailwindcss.com/docs/scroll-padding
        */
       'scroll-px': [{
-        'scroll-px': getSpacingWithArbitrary()
+        'scroll-px': scaleUnambiguousSpacing()
       }],
       /**
        * Scroll Padding Y
        * @see https://tailwindcss.com/docs/scroll-padding
        */
       'scroll-py': [{
-        'scroll-py': getSpacingWithArbitrary()
+        'scroll-py': scaleUnambiguousSpacing()
       }],
       /**
        * Scroll Padding Start
        * @see https://tailwindcss.com/docs/scroll-padding
        */
       'scroll-ps': [{
-        'scroll-ps': getSpacingWithArbitrary()
+        'scroll-ps': scaleUnambiguousSpacing()
       }],
       /**
        * Scroll Padding End
        * @see https://tailwindcss.com/docs/scroll-padding
        */
       'scroll-pe': [{
-        'scroll-pe': getSpacingWithArbitrary()
+        'scroll-pe': scaleUnambiguousSpacing()
       }],
       /**
        * Scroll Padding Top
        * @see https://tailwindcss.com/docs/scroll-padding
        */
       'scroll-pt': [{
-        'scroll-pt': getSpacingWithArbitrary()
+        'scroll-pt': scaleUnambiguousSpacing()
       }],
       /**
        * Scroll Padding Right
        * @see https://tailwindcss.com/docs/scroll-padding
        */
       'scroll-pr': [{
-        'scroll-pr': getSpacingWithArbitrary()
+        'scroll-pr': scaleUnambiguousSpacing()
       }],
       /**
        * Scroll Padding Bottom
        * @see https://tailwindcss.com/docs/scroll-padding
        */
       'scroll-pb': [{
-        'scroll-pb': getSpacingWithArbitrary()
+        'scroll-pb': scaleUnambiguousSpacing()
       }],
       /**
        * Scroll Padding Left
        * @see https://tailwindcss.com/docs/scroll-padding
        */
       'scroll-pl': [{
-        'scroll-pl': getSpacingWithArbitrary()
+        'scroll-pl': scaleUnambiguousSpacing()
       }],
       /**
        * Scroll Snap Align
@@ -2399,36 +2939,35 @@ const getDefaultConfig = () => {
        * @see https://tailwindcss.com/docs/will-change
        */
       'will-change': [{
-        'will-change': ['auto', 'scroll', 'contents', 'transform', isArbitraryValue]
+        'will-change': ['auto', 'scroll', 'contents', 'transform', isArbitraryVariable, isArbitraryValue]
       }],
-      // SVG
+      // -----------
+      // --- SVG ---
+      // -----------
       /**
        * Fill
        * @see https://tailwindcss.com/docs/fill
        */
       fill: [{
-        fill: [colors, 'none']
+        fill: ['none', ...scaleColor()]
       }],
       /**
        * Stroke Width
        * @see https://tailwindcss.com/docs/stroke-width
        */
       'stroke-w': [{
-        stroke: [isLength, isArbitraryLength, isArbitraryNumber]
+        stroke: [isNumber, isArbitraryVariableLength, isArbitraryLength, isArbitraryNumber]
       }],
       /**
        * Stroke
        * @see https://tailwindcss.com/docs/stroke
        */
       stroke: [{
-        stroke: [colors, 'none']
+        stroke: ['none', ...scaleColor()]
       }],
-      // Accessibility
-      /**
-       * Screen Readers
-       * @see https://tailwindcss.com/docs/screen-readers
-       */
-      sr: ['sr-only', 'not-sr-only'],
+      // ---------------------
+      // --- Accessibility ---
+      // ---------------------
       /**
        * Forced Color Adjust
        * @see https://tailwindcss.com/docs/forced-color-adjust
@@ -2468,12 +3007,14 @@ const getDefaultConfig = () => {
       'rounded-b': ['rounded-br', 'rounded-bl'],
       'rounded-l': ['rounded-tl', 'rounded-bl'],
       'border-spacing': ['border-spacing-x', 'border-spacing-y'],
-      'border-w': ['border-w-s', 'border-w-e', 'border-w-t', 'border-w-r', 'border-w-b', 'border-w-l'],
+      'border-w': ['border-w-x', 'border-w-y', 'border-w-s', 'border-w-e', 'border-w-t', 'border-w-r', 'border-w-b', 'border-w-l'],
       'border-w-x': ['border-w-r', 'border-w-l'],
       'border-w-y': ['border-w-t', 'border-w-b'],
-      'border-color': ['border-color-s', 'border-color-e', 'border-color-t', 'border-color-r', 'border-color-b', 'border-color-l'],
+      'border-color': ['border-color-x', 'border-color-y', 'border-color-s', 'border-color-e', 'border-color-t', 'border-color-r', 'border-color-b', 'border-color-l'],
       'border-color-x': ['border-color-r', 'border-color-l'],
       'border-color-y': ['border-color-t', 'border-color-b'],
+      translate: ['translate-x', 'translate-y', 'translate-none'],
+      'translate-none': ['translate', 'translate-x', 'translate-y', 'translate-z'],
       'scroll-m': ['scroll-mx', 'scroll-my', 'scroll-ms', 'scroll-me', 'scroll-mt', 'scroll-mr', 'scroll-mb', 'scroll-ml'],
       'scroll-mx': ['scroll-mr', 'scroll-ml'],
       'scroll-my': ['scroll-mt', 'scroll-mb'],
@@ -2487,7 +3028,8 @@ const getDefaultConfig = () => {
     },
     conflictingClassGroupModifiers: {
       'font-size': ['leading']
-    }
+    },
+    orderSensitiveModifiers: ['*', '**', 'after', 'backdrop', 'before', 'details-content', 'file', 'first-letter', 'first-line', 'marker', 'placeholder', 'selection']
   };
 };
 
@@ -2498,21 +3040,23 @@ const getDefaultConfig = () => {
 const mergeConfigs = (baseConfig, {
   cacheSize,
   prefix,
-  separator,
   experimentalParseClassName,
   extend = {},
   override = {}
 }) => {
   overrideProperty(baseConfig, 'cacheSize', cacheSize);
   overrideProperty(baseConfig, 'prefix', prefix);
-  overrideProperty(baseConfig, 'separator', separator);
   overrideProperty(baseConfig, 'experimentalParseClassName', experimentalParseClassName);
-  for (const configKey in override) {
-    overrideConfigProperties(baseConfig[configKey], override[configKey]);
-  }
-  for (const key in extend) {
-    mergeConfigProperties(baseConfig[key], extend[key]);
-  }
+  overrideConfigProperties(baseConfig.theme, override.theme);
+  overrideConfigProperties(baseConfig.classGroups, override.classGroups);
+  overrideConfigProperties(baseConfig.conflictingClassGroups, override.conflictingClassGroups);
+  overrideConfigProperties(baseConfig.conflictingClassGroupModifiers, override.conflictingClassGroupModifiers);
+  overrideProperty(baseConfig, 'orderSensitiveModifiers', override.orderSensitiveModifiers);
+  mergeConfigProperties(baseConfig.theme, extend.theme);
+  mergeConfigProperties(baseConfig.classGroups, extend.classGroups);
+  mergeConfigProperties(baseConfig.conflictingClassGroups, extend.conflictingClassGroups);
+  mergeConfigProperties(baseConfig.conflictingClassGroupModifiers, extend.conflictingClassGroupModifiers);
+  mergeArrayProperties(baseConfig, extend, 'orderSensitiveModifiers');
   return baseConfig;
 };
 const overrideProperty = (baseObject, overrideKey, overrideValue) => {
@@ -2530,13 +3074,16 @@ const overrideConfigProperties = (baseObject, overrideObject) => {
 const mergeConfigProperties = (baseObject, mergeObject) => {
   if (mergeObject) {
     for (const key in mergeObject) {
-      const mergeValue = mergeObject[key];
-      if (mergeValue !== undefined) {
-        baseObject[key] = (baseObject[key] || []).concat(mergeValue);
-      }
+      mergeArrayProperties(baseObject, mergeObject, key);
     }
   }
 };
+const mergeArrayProperties = (baseObject, mergeObject, key) => {
+  const mergeValue = mergeObject[key];
+  if (mergeValue !== undefined) {
+    baseObject[key] = baseObject[key] ? baseObject[key].concat(mergeValue) : mergeValue;
+  }
+};
 const extendTailwindMerge = (configExtension, ...createConfig) => typeof configExtension === 'function' ? createTailwindMerge(getDefaultConfig, configExtension, ...createConfig) : createTailwindMerge(() => mergeConfigs(getDefaultConfig(), configExtension), ...createConfig);
 
 function r(e){var t,f,n="";if("string"==typeof e||"number"==typeof e)n+=e;else if("object"==typeof e)if(Array.isArray(e)){var o=e.length;for(t=0;t<o;t++)e[t]&&(f=r(e[t]))&&(n&&(n+=" "),n+=f);}else for(f in e)e[f]&&(n&&(n+=" "),n+=f);return n}function clsx(){for(var e,t,f=0,n="",o=arguments.length;f<o;f++)(e=arguments[f])&&(t=r(e))&&(n&&(n+=" "),n+=t);return n}
@@ -2544,21 +3091,21 @@ function r(e){var t,f,n="";if("string"==typeof e||"number"==typeof e)n+=e;else i
 const customTwMerge = extendTailwindMerge({
   extend: {
     theme: {
-      colors: Object.entries(colorPalette).reduce((acc, currentVal) => {
+      color: Object.entries(colorPalette).reduce((acc, currentVal) => {
         const colors = Object.keys(currentVal[1]).map(
-          (c) => `text-${currentVal[0]}-${c}`
+          (c) => `${currentVal[0]}-${c}`
         );
         return acc.concat(colors);
-      }, []),
-      borderRadius: Object.keys(borderRadius).map((s) => `rounded-${s}`)
+      }, [])
     },
     classGroups: {
-      shadow: [{ shadow: Object.keys(boxShadows).map((s) => `shadow-${s}`) }],
-      "font-size": Object.keys(fontSizes).map((s) => `text-${s}`),
-      "font-weight": Object.keys(fontWeights).map((s) => `font-${s}`),
-      scale: Object.keys(scales).map((s) => `scale-${s}`),
-      h: Object.keys(heights).map((s) => `h-${s}`),
-      leading: Object.keys(lineHeights).map((s) => `leading-${s}`)
+      shadow: [{ shadow: Object.keys(boxShadows).map((s) => `${s}`) }],
+      "font-size": [{ text: Object.keys(fontSizes) }],
+      "font-weight": [{ font: Object.keys(fontWeights) }],
+      rounded: [{ rounded: Object.keys(borderRadius) }],
+      scale: [{ scale: Object.keys(scales) }],
+      h: [{ h: Object.keys(heights) }],
+      leading: [{ leading: Object.keys(lineHeights) }]
     }
   }
 });