diff --git a/package.json b/package.json
index e3f14758fa..6fc6a55ee4 100644
--- a/package.json
+++ b/package.json
@@ -10,8 +10,9 @@
     "docs-dev": "pnpm --filter docs dev",
     "dev": "TURBO_TELEMETRY_DISABLED=1 turbo run dev --no-cache --continue",
     "lint": "TURBO_TELEMETRY_DISABLED=1 turbo run lint",
-    "clean": "TURBO_TELEMETRY_DISABLED=1 turbo run clean && rm -rf node_modules",
+    "clean": "TURBO_TELEMETRY_DISABLED=1 turbo run clean && pnpm clean-root",
     "clean-dist": "TURBO_TELEMETRY_DISABLED=1 turbo run clean-dist",
+    "clean-root": "rm -rf .turbo coverage node_modules",
     "test": "TURBO_TELEMETRY_DISABLED=1 turbo run test --concurrency=1",
     "typecheck": "TURBO_TELEMETRY_DISABLED=1 turbo run typecheck",
     "validate": "pnpm run lint && pnpm run typecheck",
diff --git a/packages/codemod/transforms/v5-to-v6/coreExportMap.ts b/packages/codemod/transforms/v5-to-v6/coreExportMap.ts
index d491ecb7ce..87799e66f2 100644
--- a/packages/codemod/transforms/v5-to-v6/coreExportMap.ts
+++ b/packages/codemod/transforms/v5-to-v6/coreExportMap.ts
@@ -64,6 +64,7 @@ export const TYPES: ReadonlySet<string> = new Set([
   "AutocompleteUncontrolledQuery",
   "AutocompleteUncontrolledValue",
   "AutocompleteUnknownQueryAndValueOptions",
+  "AutocompleteUpdateQueryOnSelect",
   "AutocompleteValue",
   "AutocompleteWithQueryImplementation",
   "AvatarClassNameOptions",
@@ -74,7 +75,6 @@ export const TYPES: ReadonlySet<string> = new Set([
   "BadgeClassNameOptions",
   "BadgeProps",
   "BadgeTheme",
-  "BaseComboboxOptions",
   "BaseDialogProps",
   "BaseDraggableOptions",
   "BaseDropdownMenuProps",
@@ -164,6 +164,7 @@ export const TYPES: ReadonlySet<string> = new Set([
   "ColorSchemeProviderOptions",
   "CombinedCheckboxGroupReturnValue",
   "CombinedRadioGroupReturnValue",
+  "ComboboxGetEnterDefaultFocusedIndexOptions",
   "ComboboxImplementation",
   "ComboboxKeyboardMovementData",
   "ComboboxKeyboardMovementOptions",
@@ -171,14 +172,17 @@ export const TYPES: ReadonlySet<string> = new Set([
   "ComboboxOptions",
   "ComboboxTransitionCallbacks",
   "ComboboxTransitionOptions",
+  "ComboboxVisibilityOptions",
   "ComboboxWidgetPopupProps",
   "ComboboxWidgetProps",
   "CompletedFileUploadStats",
+  "ComponentWithRippleProps",
   "ConfigurableAutocompleteClearButtonProps",
   "ConfigurableAutocompleteDropdownButtonProps",
   "ConfigurableAutocompleteListboxProps",
   "ConfigurableAutocompleteOptionProps",
   "ConfigurableComboboxMenuProps",
+  "ConfigurableComboboxOptions",
   "ConfigurableIconName",
   "ConfigurableIcons",
   "ConfigurableTextFieldAddonProps",
@@ -235,7 +239,7 @@ export const TYPES: ReadonlySet<string> = new Set([
   "DelegatedEventTarget",
   "DeserializeDraggableValueOptions",
   "DialogClassNameOptions",
-  "DialogContainerProps",
+  "DialogContainerClassNameOptions",
   "DialogContentClassNameOptions",
   "DialogContentProps",
   "DialogFooterAlignment",
@@ -448,7 +452,6 @@ export const TYPES: ReadonlySet<string> = new Set([
   "LinkProps",
   "ListboxContext",
   "ListboxProps",
-  "ListboxSelectedIconProps",
   "ListboxValue",
   "ListClassNameOptions",
   "ListElement",
@@ -1203,7 +1206,7 @@ export const VARIABLES: ReadonlySet<string> = new Set([
   "deserializeDraggableValue",
   "Dialog",
   "dialog",
-  "DialogContainer",
+  "dialogContainer",
   "DialogContent",
   "dialogContent",
   "DialogFooter",
@@ -1376,6 +1379,7 @@ export const VARIABLES: ReadonlySet<string> = new Set([
   "isImageFile",
   "isMediaFile",
   "isMouseDragStartEvent",
+  "isMultipleValues",
   "isNotFocusable",
   "isSearchableEvent",
   "isTableFooterStickyActive",
@@ -1994,6 +1998,7 @@ export const EXPORT_MAP: Record<string, string> = {
   AutocompleteUncontrolledQuery: "@react-md/core/autocomplete/types",
   AutocompleteUncontrolledValue: "@react-md/core/autocomplete/types",
   AutocompleteUnknownQueryAndValueOptions: "@react-md/core/autocomplete/types",
+  AutocompleteUpdateQueryOnSelect: "@react-md/core/autocomplete/types",
   AutocompleteValue: "@react-md/core/autocomplete/types",
   AutocompleteWithQueryImplementation: "@react-md/core/autocomplete/types",
   Avatar: "@react-md/core/avatar/Avatar",
@@ -2010,7 +2015,6 @@ export const EXPORT_MAP: Record<string, string> = {
   BadgeClassNameOptions: "@react-md/core/badge/Badge",
   BadgeProps: "@react-md/core/badge/Badge",
   BadgeTheme: "@react-md/core/badge/Badge",
-  BaseComboboxOptions: "@react-md/core/form/useCombobox",
   BaseDialogProps: "@react-md/core/dialog/Dialog",
   BaseDraggableOptions: "@react-md/core/draggable/useDraggable",
   BaseDropdownMenuProps: "@react-md/core/menu/DropdownMenu",
@@ -2187,6 +2191,7 @@ export const EXPORT_MAP: Record<string, string> = {
   ColorSchemeProviderOptions: "@react-md/core/theme/useColorSchemeProvider",
   CombinedCheckboxGroupReturnValue: "@react-md/core/form/useCheckboxGroup",
   CombinedRadioGroupReturnValue: "@react-md/core/form/useRadioGroup",
+  ComboboxGetEnterDefaultFocusedIndexOptions: "@react-md/core/form/useCombobox",
   ComboboxImplementation: "@react-md/core/form/useCombobox",
   ComboboxKeyboardMovementData: "@react-md/core/form/useCombobox",
   ComboboxKeyboardMovementOptions: "@react-md/core/form/useCombobox",
@@ -2194,15 +2199,18 @@ export const EXPORT_MAP: Record<string, string> = {
   ComboboxOptions: "@react-md/core/form/useCombobox",
   ComboboxTransitionCallbacks: "@react-md/core/form/useCombobox",
   ComboboxTransitionOptions: "@react-md/core/form/useCombobox",
+  ComboboxVisibilityOptions: "@react-md/core/form/useCombobox",
   ComboboxWidgetPopupProps: "@react-md/core/form/useCombobox",
   ComboboxWidgetProps: "@react-md/core/form/useCombobox",
   CompletedFileUploadStats: "@react-md/core/files/utils",
+  ComponentWithRippleProps: "@react-md/core/interaction/types",
   ConfigurableAutocompleteClearButtonProps: "@react-md/core/autocomplete/types",
   ConfigurableAutocompleteDropdownButtonProps:
     "@react-md/core/autocomplete/types",
   ConfigurableAutocompleteListboxProps: "@react-md/core/autocomplete/types",
   ConfigurableAutocompleteOptionProps: "@react-md/core/autocomplete/types",
   ConfigurableComboboxMenuProps: "@react-md/core/form/useCombobox",
+  ConfigurableComboboxOptions: "@react-md/core/form/useCombobox",
   ConfigurableIconName: "@react-md/core/icon/iconConfig",
   ConfigurableIcons: "@react-md/core/icon/iconConfig",
   ConfigurableTextFieldAddonProps: "@react-md/core/form/types",
@@ -2395,8 +2403,8 @@ export const EXPORT_MAP: Record<string, string> = {
   Dialog: "@react-md/core/dialog/Dialog",
   dialog: "@react-md/core/dialog/styles",
   DialogClassNameOptions: "@react-md/core/dialog/styles",
-  DialogContainer: "@react-md/core/dialog/DialogContainer",
-  DialogContainerProps: "@react-md/core/dialog/DialogContainer",
+  dialogContainer: "@react-md/core/dialog/styles",
+  DialogContainerClassNameOptions: "@react-md/core/dialog/styles",
   DialogContent: "@react-md/core/dialog/DialogContent",
   dialogContent: "@react-md/core/dialog/styles",
   DialogContentClassNameOptions: "@react-md/core/dialog/styles",
@@ -2763,6 +2771,7 @@ export const EXPORT_MAP: Record<string, string> = {
   isImageFile: "@react-md/core/files/utils",
   isMediaFile: "@react-md/core/files/utils",
   isMouseDragStartEvent: "@react-md/core/draggable/utils",
+  isMultipleValues: "@react-md/core/autocomplete/utils",
   isNotFocusable: "@react-md/core/movement/utils",
   isSearchableEvent: "@react-md/core/movement/utils",
   IsStickyTableSectionActive: "@react-md/core/table/types",
@@ -2868,7 +2877,6 @@ export const EXPORT_MAP: Record<string, string> = {
   ListboxContext: "@react-md/core/form/ListboxProvider",
   ListboxProps: "@react-md/core/form/Listbox",
   ListboxProvider: "@react-md/core/form/ListboxProvider",
-  ListboxSelectedIconProps: "@react-md/core/form/Listbox",
   ListboxValue: "@react-md/core/form/Listbox",
   ListClassNameOptions: "@react-md/core/list/listStyles",
   ListElement: "@react-md/core/list/List",
diff --git a/packages/codemod/tsconfig.build.json b/packages/codemod/tsconfig.build.json
index 3548725491..a811888477 100644
--- a/packages/codemod/tsconfig.build.json
+++ b/packages/codemod/tsconfig.build.json
@@ -1,4 +1,10 @@
 {
   "extends": "./tsconfig.json",
-  "exclude": ["**/__tests__/**", "**/__testfixtures__/**", "*.mjs"]
+  "exclude": [
+    "**/__tests__/**",
+    "**/__testfixtures__/**",
+    "jest.config.ts",
+    "eslint.config.mjs",
+    "updateDocs.cjs"
+  ]
 }
diff --git a/packages/core/src/autocomplete/Autocomplete.tsx b/packages/core/src/autocomplete/Autocomplete.tsx
index 981fac751f..2490517e20 100644
--- a/packages/core/src/autocomplete/Autocomplete.tsx
+++ b/packages/core/src/autocomplete/Autocomplete.tsx
@@ -186,6 +186,7 @@ export function Autocomplete<Option extends AutocompleteOption>(
             index,
             query: currentQuery,
             option,
+            extractor: getOptionLabel,
           });
           return (
             <AutocompleteChip
diff --git a/packages/core/src/autocomplete/AutocompleteListboxChildren.tsx b/packages/core/src/autocomplete/AutocompleteListboxChildren.tsx
index c3e10890c3..84da4e792c 100644
--- a/packages/core/src/autocomplete/AutocompleteListboxChildren.tsx
+++ b/packages/core/src/autocomplete/AutocompleteListboxChildren.tsx
@@ -54,6 +54,7 @@ export function AutocompleteListboxChildren<Option extends AutocompleteOption>(
           query,
           option,
           selected: isOptionSelected(option),
+          extractor: getOptionLabel,
         });
 
         return (
diff --git a/packages/core/src/autocomplete/types.ts b/packages/core/src/autocomplete/types.ts
index fbae389c38..d2cc5686d8 100644
--- a/packages/core/src/autocomplete/types.ts
+++ b/packages/core/src/autocomplete/types.ts
@@ -29,7 +29,11 @@ import { type IconRotatorProps } from "../icon/IconRotator.js";
 import { type CircularProgressProps } from "../progress/CircularProgress.js";
 import { type ProgressTheme } from "../progress/types.js";
 import { type BaseSearchOptions } from "../searching/types.js";
-import { type PropsWithRef, type UseStateInitializer } from "../types.js";
+import {
+  type PropsWithRef,
+  type TextExtractor,
+  type UseStateInitializer,
+} from "../types.js";
 
 /**
  * If a autocomplete value is one of these types, no additional code is required
@@ -74,6 +78,7 @@ export interface AutocompleteGetOptionPropsOptions<
   query: string;
   option: Option;
   selected: boolean;
+  extractor: TextExtractor<Option>;
 }
 
 /**
diff --git a/packages/docs-generator/src/utils/generateDemoFile.ts b/packages/docs-generator/src/utils/generateDemoFile.ts
index bbc6070910..01f6f211e3 100644
--- a/packages/docs-generator/src/utils/generateDemoFile.ts
+++ b/packages/docs-generator/src/utils/generateDemoFile.ts
@@ -19,6 +19,13 @@ import {
 import { type ReactElement } from "react";
 `;
 
+/**
+ * These packages fail with the `import * ` notation
+ */
+function isCjsOnly(key: string): boolean {
+  return /^autosuggest-highlight/.test(key);
+}
+
 export interface GenerateDemoFileOptions extends ParseCompleteDemoFileOptions {
   props: InlineDemoProps;
   demoOutDir: string;
@@ -57,10 +64,18 @@ export async function generateDemoFile(
     const sortedValues = alphaNumericSort([...values]);
     const key = sortedValues.join("_");
     importScope[name] = key;
-    sourceFile.addImportDeclaration({
-      namespaceImport: key,
-      moduleSpecifier: name,
-    });
+
+    if (isCjsOnly(name)) {
+      sourceFile.addImportDeclaration({
+        defaultImport: key,
+        moduleSpecifier: name,
+      });
+    } else {
+      sourceFile.addImportDeclaration({
+        namespaceImport: key,
+        moduleSpecifier: name,
+      });
+    }
   });
 
   sourceFile.addVariableStatement({
diff --git a/packages/react-md/src/index.ts b/packages/react-md/src/index.ts
index 35f8217d76..29e191da87 100644
--- a/packages/react-md/src/index.ts
+++ b/packages/react-md/src/index.ts
@@ -54,7 +54,6 @@ export * from "@react-md/core/CoreProviders";
 export * from "@react-md/core/cssUtils";
 export * from "@react-md/core/delegateEvent";
 export * from "@react-md/core/dialog/Dialog";
-export * from "@react-md/core/dialog/DialogContainer";
 export * from "@react-md/core/dialog/DialogContent";
 export * from "@react-md/core/dialog/DialogFooter";
 export * from "@react-md/core/dialog/DialogHeader";
diff --git a/turbo.json b/turbo.json
index 47c96b5e2a..43cf0c70f7 100644
--- a/turbo.json
+++ b/turbo.json
@@ -5,6 +5,9 @@
     "@react-md/material-icons#build": {
       "outputs": ["*.d.ts", "*.js"]
     },
+    "@react-md/codemod#build": {
+      "outputs": ["bin/**"]
+    },
     "build": {
       "dependsOn": ["^build"],
       "outputs": [