From 6fbd8ae6a90eabde74fb5481c980716eba477c31 Mon Sep 17 00:00:00 2001
From: metonym <ericyl.us@gmail.com>
Date: Fri, 25 Oct 2024 16:30:10 -0700
Subject: [PATCH] fix(types): use type alias instead of interface for
 `$$restProps`

---
 types/Accordion/Accordion.svelte.d.ts                    | 4 ++--
 types/Accordion/AccordionItem.svelte.d.ts                | 8 +++++---
 types/Accordion/AccordionSkeleton.svelte.d.ts            | 8 +++++---
 types/AspectRatio/AspectRatio.svelte.d.ts                | 8 +++++---
 types/Breadcrumb/Breadcrumb.svelte.d.ts                  | 4 ++--
 types/Breadcrumb/BreadcrumbItem.svelte.d.ts              | 8 +++++---
 types/Breadcrumb/BreadcrumbSkeleton.svelte.d.ts          | 8 +++++---
 types/Breakpoint/Breakpoint.svelte.d.ts                  | 4 ++--
 types/Button/Button.svelte.d.ts                          | 8 +++++---
 types/Button/ButtonSet.svelte.d.ts                       | 8 +++++---
 types/Button/ButtonSkeleton.svelte.d.ts                  | 8 +++++---
 types/Checkbox/Checkbox.svelte.d.ts                      | 8 +++++---
 types/Checkbox/CheckboxSkeleton.svelte.d.ts              | 8 +++++---
 types/CodeSnippet/CodeSnippet.svelte.d.ts                | 4 ++--
 types/CodeSnippet/CodeSnippetSkeleton.svelte.d.ts        | 8 +++++---
 types/ComboBox/ComboBox.svelte.d.ts                      | 8 +++++---
 types/ComposedModal/ComposedModal.svelte.d.ts            | 8 +++++---
 types/ComposedModal/ModalBody.svelte.d.ts                | 8 +++++---
 types/ComposedModal/ModalFooter.svelte.d.ts              | 8 +++++---
 types/ComposedModal/ModalHeader.svelte.d.ts              | 8 +++++---
 types/ContentSwitcher/ContentSwitcher.svelte.d.ts        | 8 +++++---
 types/ContentSwitcher/Switch.svelte.d.ts                 | 8 +++++---
 types/ContextMenu/ContextMenu.svelte.d.ts                | 8 +++++---
 types/ContextMenu/ContextMenuDivider.svelte.d.ts         | 2 +-
 types/ContextMenu/ContextMenuGroup.svelte.d.ts           | 4 ++--
 types/ContextMenu/ContextMenuOption.svelte.d.ts          | 8 +++++---
 types/ContextMenu/ContextMenuRadioGroup.svelte.d.ts      | 4 ++--
 types/CopyButton/CopyButton.svelte.d.ts                  | 8 +++++---
 types/DataTable/DataTable.svelte.d.ts                    | 8 +++++---
 types/DataTable/DataTableSkeleton.svelte.d.ts            | 8 +++++---
 types/DataTable/Table.svelte.d.ts                        | 8 +++++---
 types/DataTable/TableBody.svelte.d.ts                    | 8 +++++---
 types/DataTable/TableCell.svelte.d.ts                    | 8 +++++---
 types/DataTable/TableContainer.svelte.d.ts               | 8 +++++---
 types/DataTable/TableHead.svelte.d.ts                    | 8 +++++---
 types/DataTable/TableHeader.svelte.d.ts                  | 8 +++++---
 types/DataTable/TableRow.svelte.d.ts                     | 8 +++++---
 types/DataTable/Toolbar.svelte.d.ts                      | 8 +++++---
 types/DataTable/ToolbarBatchActions.svelte.d.ts          | 8 +++++---
 types/DataTable/ToolbarContent.svelte.d.ts               | 2 +-
 types/DataTable/ToolbarMenu.svelte.d.ts                  | 2 +-
 types/DataTable/ToolbarMenuItem.svelte.d.ts              | 2 +-
 types/DataTable/ToolbarSearch.svelte.d.ts                | 8 +++++---
 types/DatePicker/DatePicker.svelte.d.ts                  | 8 +++++---
 types/DatePicker/DatePickerInput.svelte.d.ts             | 8 +++++---
 types/DatePicker/DatePickerSkeleton.svelte.d.ts          | 8 +++++---
 types/Dropdown/Dropdown.svelte.d.ts                      | 8 +++++---
 types/Dropdown/DropdownSkeleton.svelte.d.ts              | 8 +++++---
 types/FileUploader/FileUploader.svelte.d.ts              | 8 +++++---
 types/FileUploader/FileUploaderButton.svelte.d.ts        | 8 +++++---
 types/FileUploader/FileUploaderDropContainer.svelte.d.ts | 9 ++++++---
 types/FileUploader/FileUploaderItem.svelte.d.ts          | 8 +++++---
 types/FileUploader/FileUploaderSkeleton.svelte.d.ts      | 8 +++++---
 types/FileUploader/Filename.svelte.d.ts                  | 8 +++++---
 types/FluidForm/FluidForm.svelte.d.ts                    | 8 +++++---
 types/Form/Form.svelte.d.ts                              | 8 +++++---
 types/FormGroup/FormGroup.svelte.d.ts                    | 8 +++++---
 types/FormItem/FormItem.svelte.d.ts                      | 8 +++++---
 types/FormLabel/FormLabel.svelte.d.ts                    | 8 +++++---
 types/Grid/Column.svelte.d.ts                            | 8 +++++---
 types/Grid/Grid.svelte.d.ts                              | 8 +++++---
 types/Grid/Row.svelte.d.ts                               | 8 +++++---
 types/ImageLoader/ImageLoader.svelte.d.ts                | 8 +++++---
 types/InlineLoading/InlineLoading.svelte.d.ts            | 8 +++++---
 types/Link/Link.svelte.d.ts                              | 8 +++++---
 types/Link/OutboundLink.svelte.d.ts                      | 2 +-
 types/ListBox/ListBox.svelte.d.ts                        | 8 +++++---
 types/ListBox/ListBoxField.svelte.d.ts                   | 8 +++++---
 types/ListBox/ListBoxMenu.svelte.d.ts                    | 8 +++++---
 types/ListBox/ListBoxMenuIcon.svelte.d.ts                | 8 +++++---
 types/ListBox/ListBoxMenuItem.svelte.d.ts                | 8 +++++---
 types/ListBox/ListBoxSelection.svelte.d.ts               | 8 +++++---
 types/ListItem/ListItem.svelte.d.ts                      | 8 +++++---
 types/Loading/Loading.svelte.d.ts                        | 8 +++++---
 types/LocalStorage/LocalStorage.svelte.d.ts              | 4 ++--
 types/Modal/Modal.svelte.d.ts                            | 8 +++++---
 types/MultiSelect/MultiSelect.svelte.d.ts                | 8 +++++---
 types/Notification/InlineNotification.svelte.d.ts        | 8 +++++---
 types/Notification/NotificationActionButton.svelte.d.ts  | 2 +-
 types/Notification/NotificationButton.svelte.d.ts        | 8 +++++---
 types/Notification/NotificationIcon.svelte.d.ts          | 4 ++--
 types/Notification/ToastNotification.svelte.d.ts         | 8 +++++---
 types/NumberInput/NumberInput.svelte.d.ts                | 8 +++++---
 types/NumberInput/NumberInputSkeleton.svelte.d.ts        | 8 +++++---
 types/OrderedList/OrderedList.svelte.d.ts                | 8 +++++---
 types/OverflowMenu/OverflowMenu.svelte.d.ts              | 8 +++++---
 types/OverflowMenu/OverflowMenuItem.svelte.d.ts          | 8 +++++---
 types/Pagination/Pagination.svelte.d.ts                  | 8 +++++---
 types/Pagination/PaginationSkeleton.svelte.d.ts          | 8 +++++---
 types/PaginationNav/PaginationNav.svelte.d.ts            | 8 +++++---
 types/Popover/Popover.svelte.d.ts                        | 8 +++++---
 types/ProgressBar/ProgressBar.svelte.d.ts                | 8 +++++---
 types/ProgressIndicator/ProgressIndicator.svelte.d.ts    | 8 +++++---
 .../ProgressIndicatorSkeleton.svelte.d.ts                | 9 ++++++---
 types/ProgressIndicator/ProgressStep.svelte.d.ts         | 8 +++++---
 types/RadioButton/RadioButton.svelte.d.ts                | 8 +++++---
 types/RadioButton/RadioButtonSkeleton.svelte.d.ts        | 8 +++++---
 types/RadioButtonGroup/RadioButtonGroup.svelte.d.ts      | 8 +++++---
 types/RecursiveList/RecursiveList.svelte.d.ts            | 8 +++++---
 types/Search/Search.svelte.d.ts                          | 8 +++++---
 types/Search/SearchSkeleton.svelte.d.ts                  | 8 +++++---
 types/Select/Select.svelte.d.ts                          | 8 +++++---
 types/Select/SelectItem.svelte.d.ts                      | 4 ++--
 types/Select/SelectItemGroup.svelte.d.ts                 | 8 +++++---
 types/Select/SelectSkeleton.svelte.d.ts                  | 8 +++++---
 .../SkeletonPlaceholder/SkeletonPlaceholder.svelte.d.ts  | 8 +++++---
 types/SkeletonText/SkeletonText.svelte.d.ts              | 8 +++++---
 types/Slider/Slider.svelte.d.ts                          | 8 +++++---
 types/Slider/SliderSkeleton.svelte.d.ts                  | 8 +++++---
 types/StructuredList/StructuredList.svelte.d.ts          | 8 +++++---
 types/StructuredList/StructuredListBody.svelte.d.ts      | 8 +++++---
 types/StructuredList/StructuredListCell.svelte.d.ts      | 8 +++++---
 types/StructuredList/StructuredListHead.svelte.d.ts      | 8 +++++---
 types/StructuredList/StructuredListInput.svelte.d.ts     | 8 +++++---
 types/StructuredList/StructuredListRow.svelte.d.ts       | 8 +++++---
 types/StructuredList/StructuredListSkeleton.svelte.d.ts  | 9 ++++++---
 types/Tabs/Tab.svelte.d.ts                               | 8 +++++---
 types/Tabs/TabContent.svelte.d.ts                        | 8 +++++---
 types/Tabs/Tabs.svelte.d.ts                              | 8 +++++---
 types/Tabs/TabsSkeleton.svelte.d.ts                      | 8 +++++---
 types/Tag/Tag.svelte.d.ts                                | 8 +++++---
 types/Tag/TagSkeleton.svelte.d.ts                        | 8 +++++---
 types/TextArea/TextArea.svelte.d.ts                      | 8 +++++---
 types/TextArea/TextAreaSkeleton.svelte.d.ts              | 8 +++++---
 types/TextInput/PasswordInput.svelte.d.ts                | 8 +++++---
 types/TextInput/TextInput.svelte.d.ts                    | 8 +++++---
 types/TextInput/TextInputSkeleton.svelte.d.ts            | 8 +++++---
 types/Theme/Theme.svelte.d.ts                            | 4 ++--
 types/Tile/ClickableTile.svelte.d.ts                     | 8 +++++---
 types/Tile/ExpandableTile.svelte.d.ts                    | 8 +++++---
 types/Tile/RadioTile.svelte.d.ts                         | 8 +++++---
 types/Tile/SelectableTile.svelte.d.ts                    | 8 +++++---
 types/Tile/Tile.svelte.d.ts                              | 8 +++++---
 types/Tile/TileGroup.svelte.d.ts                         | 8 +++++---
 types/TimePicker/TimePicker.svelte.d.ts                  | 8 +++++---
 types/TimePicker/TimePickerSelect.svelte.d.ts            | 8 +++++---
 types/Toggle/Toggle.svelte.d.ts                          | 8 +++++---
 types/Toggle/ToggleSkeleton.svelte.d.ts                  | 8 +++++---
 types/Tooltip/Tooltip.svelte.d.ts                        | 8 +++++---
 types/Tooltip/TooltipFooter.svelte.d.ts                  | 4 ++--
 types/TooltipDefinition/TooltipDefinition.svelte.d.ts    | 8 +++++---
 types/TooltipIcon/TooltipIcon.svelte.d.ts                | 8 +++++---
 types/TreeView/TreeView.svelte.d.ts                      | 8 +++++---
 types/Truncate/Truncate.svelte.d.ts                      | 8 +++++---
 types/UIShell/Content.svelte.d.ts                        | 8 +++++---
 types/UIShell/Header.svelte.d.ts                         | 8 +++++---
 types/UIShell/HeaderAction.svelte.d.ts                   | 8 +++++---
 types/UIShell/HeaderActionLink.svelte.d.ts               | 8 +++++---
 types/UIShell/HeaderGlobalAction.svelte.d.ts             | 4 ++--
 types/UIShell/HeaderNav.svelte.d.ts                      | 8 +++++---
 types/UIShell/HeaderNavItem.svelte.d.ts                  | 8 +++++---
 types/UIShell/HeaderNavMenu.svelte.d.ts                  | 8 +++++---
 types/UIShell/HeaderPanelDivider.svelte.d.ts             | 2 +-
 types/UIShell/HeaderPanelLink.svelte.d.ts                | 8 +++++---
 types/UIShell/HeaderPanelLinks.svelte.d.ts               | 2 +-
 types/UIShell/HeaderSearch.svelte.d.ts                   | 8 +++++---
 types/UIShell/HeaderUtilities.svelte.d.ts                | 2 +-
 types/UIShell/SideNav.svelte.d.ts                        | 8 +++++---
 types/UIShell/SideNavDivider.svelte.d.ts                 | 8 +++++---
 types/UIShell/SideNavItems.svelte.d.ts                   | 2 +-
 types/UIShell/SideNavLink.svelte.d.ts                    | 8 +++++---
 types/UIShell/SideNavMenu.svelte.d.ts                    | 8 +++++---
 types/UIShell/SideNavMenuItem.svelte.d.ts                | 8 +++++---
 types/UIShell/SkipToContent.svelte.d.ts                  | 8 +++++---
 types/UnorderedList/UnorderedList.svelte.d.ts            | 8 +++++---
 165 files changed, 752 insertions(+), 463 deletions(-)

diff --git a/types/Accordion/Accordion.svelte.d.ts b/types/Accordion/Accordion.svelte.d.ts
index 3d97910e..1e36b317 100644
--- a/types/Accordion/Accordion.svelte.d.ts
+++ b/types/Accordion/Accordion.svelte.d.ts
@@ -1,7 +1,7 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { AccordionSkeletonProps } from "./AccordionSkeleton.svelte";
 
-export interface AccordionProps extends AccordionSkeletonProps {
+export type AccordionProps = AccordionSkeletonProps & {
   /**
    * Specify alignment of accordion item chevron icon
    * @default "end"
@@ -25,7 +25,7 @@ export interface AccordionProps extends AccordionSkeletonProps {
    * @default false
    */
   skeleton?: boolean;
-}
+};
 
 export default class Accordion extends SvelteComponentTyped<
   AccordionProps,
diff --git a/types/Accordion/AccordionItem.svelte.d.ts b/types/Accordion/AccordionItem.svelte.d.ts
index 320d460a..6c5f0c4b 100644
--- a/types/Accordion/AccordionItem.svelte.d.ts
+++ b/types/Accordion/AccordionItem.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["li"];
+type $RestProps = SvelteHTMLElements["li"];
 
-export interface AccordionItemProps extends RestProps {
+type $Props = {
   /**
    * Specify the title of the accordion item heading.
    * Alternatively, use the "title" slot (e.g., `<div slot="title">...</div>`)
@@ -30,7 +30,9 @@ export interface AccordionItemProps extends RestProps {
   iconDescription?: string;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type AccordionItemProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class AccordionItem extends SvelteComponentTyped<
   AccordionItemProps,
diff --git a/types/Accordion/AccordionSkeleton.svelte.d.ts b/types/Accordion/AccordionSkeleton.svelte.d.ts
index d28fe6f0..2ce1dc07 100644
--- a/types/Accordion/AccordionSkeleton.svelte.d.ts
+++ b/types/Accordion/AccordionSkeleton.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["ul"];
+type $RestProps = SvelteHTMLElements["ul"];
 
-export interface AccordionSkeletonProps extends RestProps {
+type $Props = {
   /**
    * Specify the number of accordion items to render
    * @default 4
@@ -29,7 +29,9 @@ export interface AccordionSkeletonProps extends RestProps {
   open?: boolean;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type AccordionSkeletonProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class AccordionSkeleton extends SvelteComponentTyped<
   AccordionSkeletonProps,
diff --git a/types/AspectRatio/AspectRatio.svelte.d.ts b/types/AspectRatio/AspectRatio.svelte.d.ts
index 36ded804..d11a5035 100644
--- a/types/AspectRatio/AspectRatio.svelte.d.ts
+++ b/types/AspectRatio/AspectRatio.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["div"];
+type $RestProps = SvelteHTMLElements["div"];
 
-export interface AspectRatioProps extends RestProps {
+type $Props = {
   /**
    * Specify the aspect ratio
    * @default "2x1"
@@ -20,7 +20,9 @@ export interface AspectRatioProps extends RestProps {
     | "1x2";
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type AspectRatioProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class AspectRatio extends SvelteComponentTyped<
   AspectRatioProps,
diff --git a/types/Breadcrumb/Breadcrumb.svelte.d.ts b/types/Breadcrumb/Breadcrumb.svelte.d.ts
index 6b005545..55d24edb 100644
--- a/types/Breadcrumb/Breadcrumb.svelte.d.ts
+++ b/types/Breadcrumb/Breadcrumb.svelte.d.ts
@@ -1,7 +1,7 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { BreadcrumbSkeletonProps } from "./BreadcrumbSkeleton.svelte";
 
-export interface BreadcrumbProps extends BreadcrumbSkeletonProps {
+export type BreadcrumbProps = BreadcrumbSkeletonProps & {
   /**
    * Set to `true` to hide the breadcrumb trailing slash
    * @default false
@@ -13,7 +13,7 @@ export interface BreadcrumbProps extends BreadcrumbSkeletonProps {
    * @default false
    */
   skeleton?: boolean;
-}
+};
 
 export default class Breadcrumb extends SvelteComponentTyped<
   BreadcrumbProps,
diff --git a/types/Breadcrumb/BreadcrumbItem.svelte.d.ts b/types/Breadcrumb/BreadcrumbItem.svelte.d.ts
index bdf2aee8..f7c12c1a 100644
--- a/types/Breadcrumb/BreadcrumbItem.svelte.d.ts
+++ b/types/Breadcrumb/BreadcrumbItem.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["li"];
+type $RestProps = SvelteHTMLElements["li"];
 
-export interface BreadcrumbItemProps extends RestProps {
+type $Props = {
   /**
    * Set the `href` to use an anchor link
    * @default undefined
@@ -17,7 +17,9 @@ export interface BreadcrumbItemProps extends RestProps {
   isCurrentPage?: boolean;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type BreadcrumbItemProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class BreadcrumbItem extends SvelteComponentTyped<
   BreadcrumbItemProps,
diff --git a/types/Breadcrumb/BreadcrumbSkeleton.svelte.d.ts b/types/Breadcrumb/BreadcrumbSkeleton.svelte.d.ts
index 85bddbe5..822b3aaf 100644
--- a/types/Breadcrumb/BreadcrumbSkeleton.svelte.d.ts
+++ b/types/Breadcrumb/BreadcrumbSkeleton.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["div"];
+type $RestProps = SvelteHTMLElements["div"];
 
-export interface BreadcrumbSkeletonProps extends RestProps {
+type $Props = {
   /**
    * Set to `true` to hide the breadcrumb trailing slash
    * @default false
@@ -17,7 +17,9 @@ export interface BreadcrumbSkeletonProps extends RestProps {
   count?: number;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type BreadcrumbSkeletonProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class BreadcrumbSkeleton extends SvelteComponentTyped<
   BreadcrumbSkeletonProps,
diff --git a/types/Breakpoint/Breakpoint.svelte.d.ts b/types/Breakpoint/Breakpoint.svelte.d.ts
index f608070d..00c6ecd0 100644
--- a/types/Breakpoint/Breakpoint.svelte.d.ts
+++ b/types/Breakpoint/Breakpoint.svelte.d.ts
@@ -4,7 +4,7 @@ export type BreakpointSize = "sm" | "md" | "lg" | "xlg" | "max";
 
 export type BreakpointValue = 320 | 672 | 1056 | 1312 | 1584;
 
-export interface BreakpointProps {
+export type BreakpointProps = {
   /**
    * Determine the current Carbon grid breakpoint size
    * @default undefined
@@ -16,7 +16,7 @@ export interface BreakpointProps {
    * @default { sm: false, md: false, lg: false, xlg: false, max: false, }
    */
   sizes?: Record<BreakpointSize, boolean>;
-}
+};
 
 export default class Breakpoint extends SvelteComponentTyped<
   BreakpointProps,
diff --git a/types/Button/Button.svelte.d.ts b/types/Button/Button.svelte.d.ts
index 56d2023f..4fcd8403 100644
--- a/types/Button/Button.svelte.d.ts
+++ b/types/Button/Button.svelte.d.ts
@@ -3,11 +3,11 @@ import type { SvelteHTMLElements } from "svelte/elements";
 
 import type { ButtonSkeletonProps } from "./ButtonSkeleton.svelte";
 
-type RestProps = SvelteHTMLElements["button"] &
+type $RestProps = SvelteHTMLElements["button"] &
   SvelteHTMLElements["a"] &
   SvelteHTMLElements["div"];
 
-export interface ButtonProps extends ButtonSkeletonProps, RestProps {
+type $Props = {
   /**
    * Specify the kind of button
    * @default "primary"
@@ -109,7 +109,9 @@ export interface ButtonProps extends ButtonSkeletonProps, RestProps {
   ref?: null | HTMLAnchorElement | HTMLButtonElement;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type ButtonProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class Button extends SvelteComponentTyped<
   ButtonProps,
diff --git a/types/Button/ButtonSet.svelte.d.ts b/types/Button/ButtonSet.svelte.d.ts
index 8acba64e..15aacd7e 100644
--- a/types/Button/ButtonSet.svelte.d.ts
+++ b/types/Button/ButtonSet.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["div"];
+type $RestProps = SvelteHTMLElements["div"];
 
-export interface ButtonSetProps extends RestProps {
+type $Props = {
   /**
    * Set to `true` to stack the buttons vertically
    * @default false
@@ -11,7 +11,9 @@ export interface ButtonSetProps extends RestProps {
   stacked?: boolean;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type ButtonSetProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class ButtonSet extends SvelteComponentTyped<
   ButtonSetProps,
diff --git a/types/Button/ButtonSkeleton.svelte.d.ts b/types/Button/ButtonSkeleton.svelte.d.ts
index 4e8b177c..0c0a3753 100644
--- a/types/Button/ButtonSkeleton.svelte.d.ts
+++ b/types/Button/ButtonSkeleton.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["a"];
+type $RestProps = SvelteHTMLElements["a"];
 
-export interface ButtonSkeletonProps extends RestProps {
+type $Props = {
   /**
    * Set the `href` to use an anchor link
    * @default undefined
@@ -17,7 +17,9 @@ export interface ButtonSkeletonProps extends RestProps {
   size?: "default" | "field" | "small" | "lg" | "xl";
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type ButtonSkeletonProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class ButtonSkeleton extends SvelteComponentTyped<
   ButtonSkeletonProps,
diff --git a/types/Checkbox/Checkbox.svelte.d.ts b/types/Checkbox/Checkbox.svelte.d.ts
index 78fc4658..19b0ae00 100644
--- a/types/Checkbox/Checkbox.svelte.d.ts
+++ b/types/Checkbox/Checkbox.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["div"];
+type $RestProps = SvelteHTMLElements["div"];
 
-export interface CheckboxProps extends RestProps {
+type $Props = {
   /**
    * Specify the value of the checkbox
    * @default ""
@@ -89,7 +89,9 @@ export interface CheckboxProps extends RestProps {
   ref?: null | HTMLInputElement;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type CheckboxProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class Checkbox extends SvelteComponentTyped<
   CheckboxProps,
diff --git a/types/Checkbox/CheckboxSkeleton.svelte.d.ts b/types/Checkbox/CheckboxSkeleton.svelte.d.ts
index bb6f526c..7cff1584 100644
--- a/types/Checkbox/CheckboxSkeleton.svelte.d.ts
+++ b/types/Checkbox/CheckboxSkeleton.svelte.d.ts
@@ -1,11 +1,13 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["div"];
+type $RestProps = SvelteHTMLElements["div"];
 
-export interface CheckboxSkeletonProps extends RestProps {
+type $Props = {
   [key: `data-${string}`]: any;
-}
+};
+
+export type CheckboxSkeletonProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class CheckboxSkeleton extends SvelteComponentTyped<
   CheckboxSkeletonProps,
diff --git a/types/CodeSnippet/CodeSnippet.svelte.d.ts b/types/CodeSnippet/CodeSnippet.svelte.d.ts
index a5c74456..72073913 100644
--- a/types/CodeSnippet/CodeSnippet.svelte.d.ts
+++ b/types/CodeSnippet/CodeSnippet.svelte.d.ts
@@ -1,6 +1,6 @@
 import type { SvelteComponentTyped } from "svelte";
 
-export interface CodeSnippetProps {
+export type CodeSnippetProps = {
   /**
    * Set the type of code snippet
    * @default "single"
@@ -122,7 +122,7 @@ export interface CodeSnippetProps {
    * @default null
    */
   ref?: null | HTMLPreElement;
-}
+};
 
 export default class CodeSnippet extends SvelteComponentTyped<
   CodeSnippetProps,
diff --git a/types/CodeSnippet/CodeSnippetSkeleton.svelte.d.ts b/types/CodeSnippet/CodeSnippetSkeleton.svelte.d.ts
index ce474105..2274cf54 100644
--- a/types/CodeSnippet/CodeSnippetSkeleton.svelte.d.ts
+++ b/types/CodeSnippet/CodeSnippetSkeleton.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["div"];
+type $RestProps = SvelteHTMLElements["div"];
 
-export interface CodeSnippetSkeletonProps extends RestProps {
+type $Props = {
   /**
    * Set the type of code snippet
    * @default "single"
@@ -11,7 +11,9 @@ export interface CodeSnippetSkeletonProps extends RestProps {
   type?: "single" | "multi";
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type CodeSnippetSkeletonProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class CodeSnippetSkeleton extends SvelteComponentTyped<
   CodeSnippetSkeletonProps,
diff --git a/types/ComboBox/ComboBox.svelte.d.ts b/types/ComboBox/ComboBox.svelte.d.ts
index c28555d1..34be8595 100644
--- a/types/ComboBox/ComboBox.svelte.d.ts
+++ b/types/ComboBox/ComboBox.svelte.d.ts
@@ -9,9 +9,9 @@ export interface ComboBoxItem {
   disabled?: boolean;
 }
 
-type RestProps = SvelteHTMLElements["input"];
+type $RestProps = SvelteHTMLElements["input"];
 
-export interface ComboBoxProps extends RestProps {
+type $Props = {
   /**
    * Set the combobox items
    * @default []
@@ -155,7 +155,9 @@ export interface ComboBoxProps extends RestProps {
   listRef?: null | HTMLDivElement;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type ComboBoxProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class ComboBox extends SvelteComponentTyped<
   ComboBoxProps,
diff --git a/types/ComposedModal/ComposedModal.svelte.d.ts b/types/ComposedModal/ComposedModal.svelte.d.ts
index be04f0ca..bf5ed54f 100644
--- a/types/ComposedModal/ComposedModal.svelte.d.ts
+++ b/types/ComposedModal/ComposedModal.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["div"];
+type $RestProps = SvelteHTMLElements["div"];
 
-export interface ComposedModalProps extends RestProps {
+type $Props = {
   /**
    * Set the size of the composed modal
    * @default undefined
@@ -47,7 +47,9 @@ export interface ComposedModalProps extends RestProps {
   ref?: null | HTMLDivElement;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type ComposedModalProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class ComposedModal extends SvelteComponentTyped<
   ComposedModalProps,
diff --git a/types/ComposedModal/ModalBody.svelte.d.ts b/types/ComposedModal/ModalBody.svelte.d.ts
index d541b65f..ed9bccb5 100644
--- a/types/ComposedModal/ModalBody.svelte.d.ts
+++ b/types/ComposedModal/ModalBody.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["div"];
+type $RestProps = SvelteHTMLElements["div"];
 
-export interface ModalBodyProps extends RestProps {
+type $Props = {
   /**
    * Set to `true` if the modal contains form elements
    * @default false
@@ -17,7 +17,9 @@ export interface ModalBodyProps extends RestProps {
   hasScrollingContent?: boolean;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type ModalBodyProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class ModalBody extends SvelteComponentTyped<
   ModalBodyProps,
diff --git a/types/ComposedModal/ModalFooter.svelte.d.ts b/types/ComposedModal/ModalFooter.svelte.d.ts
index 77c7f71b..3b60ed95 100644
--- a/types/ComposedModal/ModalFooter.svelte.d.ts
+++ b/types/ComposedModal/ModalFooter.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["div"];
+type $RestProps = SvelteHTMLElements["div"];
 
-export interface ModalFooterProps extends RestProps {
+type $Props = {
   /**
    * Specify the primary button text
    * @default ""
@@ -54,7 +54,9 @@ export interface ModalFooterProps extends RestProps {
   danger?: boolean;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type ModalFooterProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class ModalFooter extends SvelteComponentTyped<
   ModalFooterProps,
diff --git a/types/ComposedModal/ModalHeader.svelte.d.ts b/types/ComposedModal/ModalHeader.svelte.d.ts
index 2769e76b..9f8b2ca4 100644
--- a/types/ComposedModal/ModalHeader.svelte.d.ts
+++ b/types/ComposedModal/ModalHeader.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["div"];
+type $RestProps = SvelteHTMLElements["div"];
 
-export interface ModalHeaderProps extends RestProps {
+type $Props = {
   /**
    * Specify the modal title
    * @default ""
@@ -47,7 +47,9 @@ export interface ModalHeaderProps extends RestProps {
   iconDescription?: string;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type ModalHeaderProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class ModalHeader extends SvelteComponentTyped<
   ModalHeaderProps,
diff --git a/types/ContentSwitcher/ContentSwitcher.svelte.d.ts b/types/ContentSwitcher/ContentSwitcher.svelte.d.ts
index 9e7920d2..09a48ff3 100644
--- a/types/ContentSwitcher/ContentSwitcher.svelte.d.ts
+++ b/types/ContentSwitcher/ContentSwitcher.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["div"];
+type $RestProps = SvelteHTMLElements["div"];
 
-export interface ContentSwitcherProps extends RestProps {
+type $Props = {
   /**
    * Set the selected index of the switch item
    * @default 0
@@ -17,7 +17,9 @@ export interface ContentSwitcherProps extends RestProps {
   size?: "sm" | "xl";
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type ContentSwitcherProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class ContentSwitcher extends SvelteComponentTyped<
   ContentSwitcherProps,
diff --git a/types/ContentSwitcher/Switch.svelte.d.ts b/types/ContentSwitcher/Switch.svelte.d.ts
index cd609ebe..cbe3114c 100644
--- a/types/ContentSwitcher/Switch.svelte.d.ts
+++ b/types/ContentSwitcher/Switch.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["button"];
+type $RestProps = SvelteHTMLElements["button"];
 
-export interface SwitchProps extends RestProps {
+type $Props = {
   /**
    * Specify the switch text.
    * Alternatively, use the "text" slot  (e.g., `<span slot="text">...</span>`)
@@ -36,7 +36,9 @@ export interface SwitchProps extends RestProps {
   ref?: null | HTMLButtonElement;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type SwitchProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class Switch extends SvelteComponentTyped<
   SwitchProps,
diff --git a/types/ContextMenu/ContextMenu.svelte.d.ts b/types/ContextMenu/ContextMenu.svelte.d.ts
index 89db0dc5..6322cbda 100644
--- a/types/ContextMenu/ContextMenu.svelte.d.ts
+++ b/types/ContextMenu/ContextMenu.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["ul"];
+type $RestProps = SvelteHTMLElements["ul"];
 
-export interface ContextMenuProps extends RestProps {
+type $Props = {
   /**
    * Specify an element or list of elements to trigger the context menu.
    * If no element is specified, the context menu applies to the entire window
@@ -37,7 +37,9 @@ export interface ContextMenuProps extends RestProps {
   ref?: null | HTMLUListElement;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type ContextMenuProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class ContextMenu extends SvelteComponentTyped<
   ContextMenuProps,
diff --git a/types/ContextMenu/ContextMenuDivider.svelte.d.ts b/types/ContextMenu/ContextMenuDivider.svelte.d.ts
index 83edab0f..f2a34d39 100644
--- a/types/ContextMenu/ContextMenuDivider.svelte.d.ts
+++ b/types/ContextMenu/ContextMenuDivider.svelte.d.ts
@@ -1,6 +1,6 @@
 import type { SvelteComponentTyped } from "svelte";
 
-export interface ContextMenuDividerProps {}
+export type ContextMenuDividerProps = {};
 
 export default class ContextMenuDivider extends SvelteComponentTyped<
   ContextMenuDividerProps,
diff --git a/types/ContextMenu/ContextMenuGroup.svelte.d.ts b/types/ContextMenu/ContextMenuGroup.svelte.d.ts
index 4b2292f8..895139ae 100644
--- a/types/ContextMenu/ContextMenuGroup.svelte.d.ts
+++ b/types/ContextMenu/ContextMenuGroup.svelte.d.ts
@@ -1,6 +1,6 @@
 import type { SvelteComponentTyped } from "svelte";
 
-export interface ContextMenuGroupProps {
+export type ContextMenuGroupProps = {
   /**
    * @default []
    */
@@ -11,7 +11,7 @@ export interface ContextMenuGroupProps {
    * @default ""
    */
   labelText?: string;
-}
+};
 
 export default class ContextMenuGroup extends SvelteComponentTyped<
   ContextMenuGroupProps,
diff --git a/types/ContextMenu/ContextMenuOption.svelte.d.ts b/types/ContextMenu/ContextMenuOption.svelte.d.ts
index c31bcf81..69913d8f 100644
--- a/types/ContextMenu/ContextMenuOption.svelte.d.ts
+++ b/types/ContextMenu/ContextMenuOption.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["li"];
+type $RestProps = SvelteHTMLElements["li"];
 
-export interface ContextMenuOptionProps extends RestProps {
+type $Props = {
   /**
    * Specify the kind of option
    * @default "default"
@@ -70,7 +70,9 @@ export interface ContextMenuOptionProps extends RestProps {
   ref?: null | HTMLLIElement;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type ContextMenuOptionProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class ContextMenuOption extends SvelteComponentTyped<
   ContextMenuOptionProps,
diff --git a/types/ContextMenu/ContextMenuRadioGroup.svelte.d.ts b/types/ContextMenu/ContextMenuRadioGroup.svelte.d.ts
index 4411bc65..dac0c5d4 100644
--- a/types/ContextMenu/ContextMenuRadioGroup.svelte.d.ts
+++ b/types/ContextMenu/ContextMenuRadioGroup.svelte.d.ts
@@ -1,6 +1,6 @@
 import type { SvelteComponentTyped } from "svelte";
 
-export interface ContextMenuRadioGroupProps {
+export type ContextMenuRadioGroupProps = {
   /**
    * Set the selected radio group id
    * @default ""
@@ -12,7 +12,7 @@ export interface ContextMenuRadioGroupProps {
    * @default ""
    */
   labelText?: string;
-}
+};
 
 export default class ContextMenuRadioGroup extends SvelteComponentTyped<
   ContextMenuRadioGroupProps,
diff --git a/types/CopyButton/CopyButton.svelte.d.ts b/types/CopyButton/CopyButton.svelte.d.ts
index a090adfd..c0319f9d 100644
--- a/types/CopyButton/CopyButton.svelte.d.ts
+++ b/types/CopyButton/CopyButton.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["button"];
+type $RestProps = SvelteHTMLElements["button"];
 
-export interface CopyButtonProps extends RestProps {
+type $Props = {
   /**
    * Set the feedback text shown after clicking the button
    * @default "Copied!"
@@ -35,7 +35,9 @@ export interface CopyButtonProps extends RestProps {
   copy?: (text: string) => void;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type CopyButtonProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class CopyButton extends SvelteComponentTyped<
   CopyButtonProps,
diff --git a/types/DataTable/DataTable.svelte.d.ts b/types/DataTable/DataTable.svelte.d.ts
index 7e26a826..7697e41d 100644
--- a/types/DataTable/DataTable.svelte.d.ts
+++ b/types/DataTable/DataTable.svelte.d.ts
@@ -40,9 +40,9 @@ export interface DataTableCell {
   display?: (item: DataTableValue, row: DataTableRow) => DataTableValue;
 }
 
-type RestProps = SvelteHTMLElements["div"];
+type $RestProps = SvelteHTMLElements["div"];
 
-export interface DataTableProps extends RestProps {
+type $Props = {
   /**
    * Specify the data table headers
    * @default []
@@ -179,7 +179,9 @@ export interface DataTableProps extends RestProps {
   page?: number;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type DataTableProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class DataTable extends SvelteComponentTyped<
   DataTableProps,
diff --git a/types/DataTable/DataTableSkeleton.svelte.d.ts b/types/DataTable/DataTableSkeleton.svelte.d.ts
index 4d7d507b..1ace782e 100644
--- a/types/DataTable/DataTableSkeleton.svelte.d.ts
+++ b/types/DataTable/DataTableSkeleton.svelte.d.ts
@@ -3,9 +3,9 @@ import type { SvelteHTMLElements } from "svelte/elements";
 
 import type { DataTableHeader } from "./DataTable.svelte";
 
-type RestProps = SvelteHTMLElements["div"];
+type $RestProps = SvelteHTMLElements["div"];
 
-export interface DataTableSkeletonProps extends DataTableHeader, RestProps {
+type $Props = {
   /**
    * Specify the number of columns
    * Superseded by `headers` if `headers` is a non-empty array
@@ -51,7 +51,9 @@ export interface DataTableSkeletonProps extends DataTableHeader, RestProps {
   showToolbar?: boolean;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type DataTableSkeletonProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class DataTableSkeleton extends SvelteComponentTyped<
   DataTableSkeletonProps,
diff --git a/types/DataTable/Table.svelte.d.ts b/types/DataTable/Table.svelte.d.ts
index 7312318f..c8621f5a 100644
--- a/types/DataTable/Table.svelte.d.ts
+++ b/types/DataTable/Table.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["section"];
+type $RestProps = SvelteHTMLElements["section"];
 
-export interface TableProps extends RestProps {
+type $Props = {
   /**
    * Set the size of the table
    * @default undefined
@@ -41,7 +41,9 @@ export interface TableProps extends RestProps {
   tableStyle?: string;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type TableProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class Table extends SvelteComponentTyped<
   TableProps,
diff --git a/types/DataTable/TableBody.svelte.d.ts b/types/DataTable/TableBody.svelte.d.ts
index 9e2b749e..a9a060bb 100644
--- a/types/DataTable/TableBody.svelte.d.ts
+++ b/types/DataTable/TableBody.svelte.d.ts
@@ -1,11 +1,13 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["tbody"];
+type $RestProps = SvelteHTMLElements["tbody"];
 
-export interface TableBodyProps extends RestProps {
+type $Props = {
   [key: `data-${string}`]: any;
-}
+};
+
+export type TableBodyProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class TableBody extends SvelteComponentTyped<
   TableBodyProps,
diff --git a/types/DataTable/TableCell.svelte.d.ts b/types/DataTable/TableCell.svelte.d.ts
index b08e57fd..db31dbac 100644
--- a/types/DataTable/TableCell.svelte.d.ts
+++ b/types/DataTable/TableCell.svelte.d.ts
@@ -1,11 +1,13 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["td"];
+type $RestProps = SvelteHTMLElements["td"];
 
-export interface TableCellProps extends RestProps {
+type $Props = {
   [key: `data-${string}`]: any;
-}
+};
+
+export type TableCellProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class TableCell extends SvelteComponentTyped<
   TableCellProps,
diff --git a/types/DataTable/TableContainer.svelte.d.ts b/types/DataTable/TableContainer.svelte.d.ts
index 21218c2b..09382e23 100644
--- a/types/DataTable/TableContainer.svelte.d.ts
+++ b/types/DataTable/TableContainer.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["div"];
+type $RestProps = SvelteHTMLElements["div"];
 
-export interface TableContainerProps extends RestProps {
+type $Props = {
   /**
    * Specify the title of the data table
    * @default ""
@@ -29,7 +29,9 @@ export interface TableContainerProps extends RestProps {
   useStaticWidth?: boolean;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type TableContainerProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class TableContainer extends SvelteComponentTyped<
   TableContainerProps,
diff --git a/types/DataTable/TableHead.svelte.d.ts b/types/DataTable/TableHead.svelte.d.ts
index 0ef1f57e..b7be26dc 100644
--- a/types/DataTable/TableHead.svelte.d.ts
+++ b/types/DataTable/TableHead.svelte.d.ts
@@ -1,11 +1,13 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["thead"];
+type $RestProps = SvelteHTMLElements["thead"];
 
-export interface TableHeadProps extends RestProps {
+type $Props = {
   [key: `data-${string}`]: any;
-}
+};
+
+export type TableHeadProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class TableHead extends SvelteComponentTyped<
   TableHeadProps,
diff --git a/types/DataTable/TableHeader.svelte.d.ts b/types/DataTable/TableHeader.svelte.d.ts
index 58e145ee..b0dd2925 100644
--- a/types/DataTable/TableHeader.svelte.d.ts
+++ b/types/DataTable/TableHeader.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["th"];
+type $RestProps = SvelteHTMLElements["th"];
 
-export interface TableHeaderProps extends RestProps {
+type $Props = {
   /**
    * Set to `true` for the sortable variant
    * @default false
@@ -41,7 +41,9 @@ export interface TableHeaderProps extends RestProps {
   id?: string;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type TableHeaderProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class TableHeader extends SvelteComponentTyped<
   TableHeaderProps,
diff --git a/types/DataTable/TableRow.svelte.d.ts b/types/DataTable/TableRow.svelte.d.ts
index 6a651be3..f4b30b83 100644
--- a/types/DataTable/TableRow.svelte.d.ts
+++ b/types/DataTable/TableRow.svelte.d.ts
@@ -1,11 +1,13 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["tr"];
+type $RestProps = SvelteHTMLElements["tr"];
 
-export interface TableRowProps extends RestProps {
+type $Props = {
   [key: `data-${string}`]: any;
-}
+};
+
+export type TableRowProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class TableRow extends SvelteComponentTyped<
   TableRowProps,
diff --git a/types/DataTable/Toolbar.svelte.d.ts b/types/DataTable/Toolbar.svelte.d.ts
index c7facb75..e70e1955 100644
--- a/types/DataTable/Toolbar.svelte.d.ts
+++ b/types/DataTable/Toolbar.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["section"];
+type $RestProps = SvelteHTMLElements["section"];
 
-export interface ToolbarProps extends RestProps {
+type $Props = {
   /**
    * Specify the toolbar size
    * @default "default"
@@ -11,7 +11,9 @@ export interface ToolbarProps extends RestProps {
   size?: "sm" | "default";
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type ToolbarProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class Toolbar extends SvelteComponentTyped<
   ToolbarProps,
diff --git a/types/DataTable/ToolbarBatchActions.svelte.d.ts b/types/DataTable/ToolbarBatchActions.svelte.d.ts
index 65102884..109466dd 100644
--- a/types/DataTable/ToolbarBatchActions.svelte.d.ts
+++ b/types/DataTable/ToolbarBatchActions.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["div"];
+type $RestProps = SvelteHTMLElements["div"];
 
-export interface ToolbarBatchActionsProps extends RestProps {
+type $Props = {
   /**
    * Override the total items selected text
    * @default (totalSelected) => `${totalSelected} item${totalSelected === 1 ? "" : "s"} selected`
@@ -17,7 +17,9 @@ export interface ToolbarBatchActionsProps extends RestProps {
   active?: undefined | boolean;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type ToolbarBatchActionsProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class ToolbarBatchActions extends SvelteComponentTyped<
   ToolbarBatchActionsProps,
diff --git a/types/DataTable/ToolbarContent.svelte.d.ts b/types/DataTable/ToolbarContent.svelte.d.ts
index 8596c593..de27dc36 100644
--- a/types/DataTable/ToolbarContent.svelte.d.ts
+++ b/types/DataTable/ToolbarContent.svelte.d.ts
@@ -1,6 +1,6 @@
 import type { SvelteComponentTyped } from "svelte";
 
-export interface ToolbarContentProps {}
+export type ToolbarContentProps = {};
 
 export default class ToolbarContent extends SvelteComponentTyped<
   ToolbarContentProps,
diff --git a/types/DataTable/ToolbarMenu.svelte.d.ts b/types/DataTable/ToolbarMenu.svelte.d.ts
index e21d0710..564df6fb 100644
--- a/types/DataTable/ToolbarMenu.svelte.d.ts
+++ b/types/DataTable/ToolbarMenu.svelte.d.ts
@@ -1,7 +1,7 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { OverflowMenuProps } from "../OverflowMenu/OverflowMenu.svelte";
 
-export interface ToolbarMenuProps extends OverflowMenuProps {}
+export type ToolbarMenuProps = OverflowMenuProps & {};
 
 export default class ToolbarMenu extends SvelteComponentTyped<
   ToolbarMenuProps,
diff --git a/types/DataTable/ToolbarMenuItem.svelte.d.ts b/types/DataTable/ToolbarMenuItem.svelte.d.ts
index 02ed51b3..cf55221d 100644
--- a/types/DataTable/ToolbarMenuItem.svelte.d.ts
+++ b/types/DataTable/ToolbarMenuItem.svelte.d.ts
@@ -1,7 +1,7 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { OverflowMenuItemProps } from "../OverflowMenu/OverflowMenuItem.svelte";
 
-export interface ToolbarMenuItemProps extends OverflowMenuItemProps {}
+export type ToolbarMenuItemProps = OverflowMenuItemProps & {};
 
 export default class ToolbarMenuItem extends SvelteComponentTyped<
   ToolbarMenuItemProps,
diff --git a/types/DataTable/ToolbarSearch.svelte.d.ts b/types/DataTable/ToolbarSearch.svelte.d.ts
index 5f1fc4ce..079d230b 100644
--- a/types/DataTable/ToolbarSearch.svelte.d.ts
+++ b/types/DataTable/ToolbarSearch.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["input"];
+type $RestProps = SvelteHTMLElements["input"];
 
-export interface ToolbarSearchProps extends RestProps {
+type $Props = {
   /**
    * Specify the value of the search input
    * @default ""
@@ -64,7 +64,9 @@ export interface ToolbarSearchProps extends RestProps {
   ref?: null | HTMLInputElement;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type ToolbarSearchProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class ToolbarSearch extends SvelteComponentTyped<
   ToolbarSearchProps,
diff --git a/types/DatePicker/DatePicker.svelte.d.ts b/types/DatePicker/DatePicker.svelte.d.ts
index 842164ef..6ce1c818 100644
--- a/types/DatePicker/DatePicker.svelte.d.ts
+++ b/types/DatePicker/DatePicker.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["div"];
+type $RestProps = SvelteHTMLElements["div"];
 
-export interface DatePickerProps extends RestProps {
+type $Props = {
   /**
    * Specify the date picker type
    * @default "simple"
@@ -82,7 +82,9 @@ export interface DatePickerProps extends RestProps {
   flatpickrProps?: import("flatpickr/dist/types/options").Options;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type DatePickerProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class DatePicker extends SvelteComponentTyped<
   DatePickerProps,
diff --git a/types/DatePicker/DatePickerInput.svelte.d.ts b/types/DatePicker/DatePickerInput.svelte.d.ts
index 29f15071..bf45d72c 100644
--- a/types/DatePicker/DatePickerInput.svelte.d.ts
+++ b/types/DatePicker/DatePickerInput.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["input"];
+type $RestProps = SvelteHTMLElements["input"];
 
-export interface DatePickerInputProps extends RestProps {
+type $Props = {
   /**
    * Set the size of the input
    * @default undefined
@@ -101,7 +101,9 @@ export interface DatePickerInputProps extends RestProps {
   ref?: null | HTMLInputElement;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type DatePickerInputProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class DatePickerInput extends SvelteComponentTyped<
   DatePickerInputProps,
diff --git a/types/DatePicker/DatePickerSkeleton.svelte.d.ts b/types/DatePicker/DatePickerSkeleton.svelte.d.ts
index 8f65c5c2..d8ed10c8 100644
--- a/types/DatePicker/DatePickerSkeleton.svelte.d.ts
+++ b/types/DatePicker/DatePickerSkeleton.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["div"];
+type $RestProps = SvelteHTMLElements["div"];
 
-export interface DatePickerSkeletonProps extends RestProps {
+type $Props = {
   /**
    * Set to `true` to use the range variant
    * @default false
@@ -17,7 +17,9 @@ export interface DatePickerSkeletonProps extends RestProps {
   id?: string;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type DatePickerSkeletonProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class DatePickerSkeleton extends SvelteComponentTyped<
   DatePickerSkeletonProps,
diff --git a/types/Dropdown/Dropdown.svelte.d.ts b/types/Dropdown/Dropdown.svelte.d.ts
index 01d97229..1f02435f 100644
--- a/types/Dropdown/Dropdown.svelte.d.ts
+++ b/types/Dropdown/Dropdown.svelte.d.ts
@@ -11,9 +11,9 @@ export interface DropdownItem {
   disabled?: boolean;
 }
 
-type RestProps = SvelteHTMLElements["div"];
+type $RestProps = SvelteHTMLElements["div"];
 
-export interface DropdownProps extends RestProps {
+type $Props = {
   /**
    * Set the dropdown items
    * @default []
@@ -144,7 +144,9 @@ export interface DropdownProps extends RestProps {
   ref?: null | HTMLButtonElement;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type DropdownProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class Dropdown extends SvelteComponentTyped<
   DropdownProps,
diff --git a/types/Dropdown/DropdownSkeleton.svelte.d.ts b/types/Dropdown/DropdownSkeleton.svelte.d.ts
index 4699af9e..14c1e60c 100644
--- a/types/Dropdown/DropdownSkeleton.svelte.d.ts
+++ b/types/Dropdown/DropdownSkeleton.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["div"];
+type $RestProps = SvelteHTMLElements["div"];
 
-export interface DropdownSkeletonProps extends RestProps {
+type $Props = {
   /**
    * Set to `true` to use the inline variant
    * @default false
@@ -11,7 +11,9 @@ export interface DropdownSkeletonProps extends RestProps {
   inline?: boolean;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type DropdownSkeletonProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class DropdownSkeleton extends SvelteComponentTyped<
   DropdownSkeletonProps,
diff --git a/types/FileUploader/FileUploader.svelte.d.ts b/types/FileUploader/FileUploader.svelte.d.ts
index eabdd7d5..0b0d4fe3 100644
--- a/types/FileUploader/FileUploader.svelte.d.ts
+++ b/types/FileUploader/FileUploader.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["div"];
+type $RestProps = SvelteHTMLElements["div"];
 
-export interface FileUploaderProps extends RestProps {
+type $Props = {
   /**
    * Specify the file uploader status
    * @default "uploading"
@@ -79,7 +79,9 @@ export interface FileUploaderProps extends RestProps {
   name?: string;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type FileUploaderProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class FileUploader extends SvelteComponentTyped<
   FileUploaderProps,
diff --git a/types/FileUploader/FileUploaderButton.svelte.d.ts b/types/FileUploader/FileUploaderButton.svelte.d.ts
index ee646723..1ceff139 100644
--- a/types/FileUploader/FileUploaderButton.svelte.d.ts
+++ b/types/FileUploader/FileUploaderButton.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["input"];
+type $RestProps = SvelteHTMLElements["input"];
 
-export interface FileUploaderButtonProps extends RestProps {
+type $Props = {
   /**
    * Specify the accepted file types
    * @default []
@@ -83,7 +83,9 @@ export interface FileUploaderButtonProps extends RestProps {
   ref?: null | HTMLInputElement;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type FileUploaderButtonProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class FileUploaderButton extends SvelteComponentTyped<
   FileUploaderButtonProps,
diff --git a/types/FileUploader/FileUploaderDropContainer.svelte.d.ts b/types/FileUploader/FileUploaderDropContainer.svelte.d.ts
index 4eb67cec..65a3a5b7 100644
--- a/types/FileUploader/FileUploaderDropContainer.svelte.d.ts
+++ b/types/FileUploader/FileUploaderDropContainer.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["div"];
+type $RestProps = SvelteHTMLElements["div"];
 
-export interface FileUploaderDropContainerProps extends RestProps {
+type $Props = {
   /**
    * Specify the accepted file types
    * @default []
@@ -72,7 +72,10 @@ export interface FileUploaderDropContainerProps extends RestProps {
   ref?: null | HTMLInputElement;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type FileUploaderDropContainerProps = Omit<$RestProps, keyof $Props> &
+  $Props;
 
 export default class FileUploaderDropContainer extends SvelteComponentTyped<
   FileUploaderDropContainerProps,
diff --git a/types/FileUploader/FileUploaderItem.svelte.d.ts b/types/FileUploader/FileUploaderItem.svelte.d.ts
index b40928f4..9f5e7547 100644
--- a/types/FileUploader/FileUploaderItem.svelte.d.ts
+++ b/types/FileUploader/FileUploaderItem.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["span"];
+type $RestProps = SvelteHTMLElements["span"];
 
-export interface FileUploaderItemProps extends RestProps {
+type $Props = {
   /**
    * Specify the file uploader status
    * @default "uploading"
@@ -53,7 +53,9 @@ export interface FileUploaderItemProps extends RestProps {
   name?: string;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type FileUploaderItemProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class FileUploaderItem extends SvelteComponentTyped<
   FileUploaderItemProps,
diff --git a/types/FileUploader/FileUploaderSkeleton.svelte.d.ts b/types/FileUploader/FileUploaderSkeleton.svelte.d.ts
index 0cb303be..42574191 100644
--- a/types/FileUploader/FileUploaderSkeleton.svelte.d.ts
+++ b/types/FileUploader/FileUploaderSkeleton.svelte.d.ts
@@ -1,11 +1,13 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["div"];
+type $RestProps = SvelteHTMLElements["div"];
 
-export interface FileUploaderSkeletonProps extends RestProps {
+type $Props = {
   [key: `data-${string}`]: any;
-}
+};
+
+export type FileUploaderSkeletonProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class FileUploaderSkeleton extends SvelteComponentTyped<
   FileUploaderSkeletonProps,
diff --git a/types/FileUploader/Filename.svelte.d.ts b/types/FileUploader/Filename.svelte.d.ts
index 2a24afef..50a4e686 100644
--- a/types/FileUploader/Filename.svelte.d.ts
+++ b/types/FileUploader/Filename.svelte.d.ts
@@ -1,11 +1,11 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["div"] &
+type $RestProps = SvelteHTMLElements["div"] &
   SvelteHTMLElements["button"] &
   SvelteHTMLElements["svg"];
 
-export interface FilenameProps extends RestProps {
+type $Props = {
   /**
    * Specify the file name status
    * @default "uploading"
@@ -25,7 +25,9 @@ export interface FilenameProps extends RestProps {
   invalid?: boolean;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type FilenameProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class Filename extends SvelteComponentTyped<
   FilenameProps,
diff --git a/types/FluidForm/FluidForm.svelte.d.ts b/types/FluidForm/FluidForm.svelte.d.ts
index a873194e..6e36ffad 100644
--- a/types/FluidForm/FluidForm.svelte.d.ts
+++ b/types/FluidForm/FluidForm.svelte.d.ts
@@ -1,11 +1,13 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["form"];
+type $RestProps = SvelteHTMLElements["form"];
 
-export interface FluidFormProps extends RestProps {
+type $Props = {
   [key: `data-${string}`]: any;
-}
+};
+
+export type FluidFormProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class FluidForm extends SvelteComponentTyped<
   FluidFormProps,
diff --git a/types/Form/Form.svelte.d.ts b/types/Form/Form.svelte.d.ts
index 5e73047d..1cfad285 100644
--- a/types/Form/Form.svelte.d.ts
+++ b/types/Form/Form.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["form"];
+type $RestProps = SvelteHTMLElements["form"];
 
-export interface FormProps extends RestProps {
+type $Props = {
   /**
    * Obtain a reference to the form element
    * @default null
@@ -11,7 +11,9 @@ export interface FormProps extends RestProps {
   ref?: null | HTMLFormElement;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type FormProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class Form extends SvelteComponentTyped<
   FormProps,
diff --git a/types/FormGroup/FormGroup.svelte.d.ts b/types/FormGroup/FormGroup.svelte.d.ts
index 06ac475f..fe6f1182 100644
--- a/types/FormGroup/FormGroup.svelte.d.ts
+++ b/types/FormGroup/FormGroup.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["fieldset"];
+type $RestProps = SvelteHTMLElements["fieldset"];
 
-export interface FormGroupProps extends RestProps {
+type $Props = {
   /**
    * Set to `true` for to remove the bottom margin
    * @default false
@@ -41,7 +41,9 @@ export interface FormGroupProps extends RestProps {
   legendId?: string;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type FormGroupProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class FormGroup extends SvelteComponentTyped<
   FormGroupProps,
diff --git a/types/FormItem/FormItem.svelte.d.ts b/types/FormItem/FormItem.svelte.d.ts
index 8132f264..496356a6 100644
--- a/types/FormItem/FormItem.svelte.d.ts
+++ b/types/FormItem/FormItem.svelte.d.ts
@@ -1,11 +1,13 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["div"];
+type $RestProps = SvelteHTMLElements["div"];
 
-export interface FormItemProps extends RestProps {
+type $Props = {
   [key: `data-${string}`]: any;
-}
+};
+
+export type FormItemProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class FormItem extends SvelteComponentTyped<
   FormItemProps,
diff --git a/types/FormLabel/FormLabel.svelte.d.ts b/types/FormLabel/FormLabel.svelte.d.ts
index 4b88fa54..e7f07659 100644
--- a/types/FormLabel/FormLabel.svelte.d.ts
+++ b/types/FormLabel/FormLabel.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["label"];
+type $RestProps = SvelteHTMLElements["label"];
 
-export interface FormLabelProps extends RestProps {
+type $Props = {
   /**
    * Set an id to be used by the label element
    * @default "ccs-" + Math.random().toString(36)
@@ -11,7 +11,9 @@ export interface FormLabelProps extends RestProps {
   id?: string;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type FormLabelProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class FormLabel extends SvelteComponentTyped<
   FormLabelProps,
diff --git a/types/Grid/Column.svelte.d.ts b/types/Grid/Column.svelte.d.ts
index faee5ec9..3dab2a87 100644
--- a/types/Grid/Column.svelte.d.ts
+++ b/types/Grid/Column.svelte.d.ts
@@ -10,9 +10,9 @@ export interface ColumnSizeDescriptor {
 
 export type ColumnBreakpoint = ColumnSize | ColumnSizeDescriptor;
 
-type RestProps = SvelteHTMLElements["div"];
+type $RestProps = SvelteHTMLElements["div"];
 
-export interface ColumnProps extends RestProps {
+type $Props = {
   /**
    * Set to `true` to render a custom HTML element
    * Props are destructured as `props` in the default slot (e.g., <Column let:props><article {...props}>...</article></Column>)
@@ -81,7 +81,9 @@ export interface ColumnProps extends RestProps {
   max?: ColumnBreakpoint;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type ColumnProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class Column extends SvelteComponentTyped<
   ColumnProps,
diff --git a/types/Grid/Grid.svelte.d.ts b/types/Grid/Grid.svelte.d.ts
index 26faf7b4..c589e4c3 100644
--- a/types/Grid/Grid.svelte.d.ts
+++ b/types/Grid/Grid.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["div"];
+type $RestProps = SvelteHTMLElements["div"];
 
-export interface GridProps extends RestProps {
+type $Props = {
   /**
    * Set to `true` to render a custom HTML element
    * Props are destructured as `props` in the default slot (e.g., <Grid let:props><header {...props}>...</header></Grid>)
@@ -54,7 +54,9 @@ export interface GridProps extends RestProps {
   padding?: boolean;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type GridProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class Grid extends SvelteComponentTyped<
   GridProps,
diff --git a/types/Grid/Row.svelte.d.ts b/types/Grid/Row.svelte.d.ts
index dba292e7..6a53d9ab 100644
--- a/types/Grid/Row.svelte.d.ts
+++ b/types/Grid/Row.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["div"];
+type $RestProps = SvelteHTMLElements["div"];
 
-export interface RowProps extends RestProps {
+type $Props = {
   /**
    * Set to `true` to render a custom HTML element
    * Props are destructured as `props` in the default slot (e.g., <Row let:props><section {...props}>...</section></Row>)
@@ -48,7 +48,9 @@ export interface RowProps extends RestProps {
   padding?: boolean;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type RowProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class Row extends SvelteComponentTyped<
   RowProps,
diff --git a/types/ImageLoader/ImageLoader.svelte.d.ts b/types/ImageLoader/ImageLoader.svelte.d.ts
index c78e3ffb..304c047f 100644
--- a/types/ImageLoader/ImageLoader.svelte.d.ts
+++ b/types/ImageLoader/ImageLoader.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["img"];
+type $RestProps = SvelteHTMLElements["img"];
 
-export interface ImageLoaderProps extends RestProps {
+type $Props = {
   /**
    * Specify the image source
    * @default ""
@@ -48,7 +48,9 @@ export interface ImageLoaderProps extends RestProps {
   fadeIn?: boolean;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type ImageLoaderProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class ImageLoader extends SvelteComponentTyped<
   ImageLoaderProps,
diff --git a/types/InlineLoading/InlineLoading.svelte.d.ts b/types/InlineLoading/InlineLoading.svelte.d.ts
index 215a989e..88a2240e 100644
--- a/types/InlineLoading/InlineLoading.svelte.d.ts
+++ b/types/InlineLoading/InlineLoading.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["div"];
+type $RestProps = SvelteHTMLElements["div"];
 
-export interface InlineLoadingProps extends RestProps {
+type $Props = {
   /**
    * Set the loading status
    * @default "active"
@@ -30,7 +30,9 @@ export interface InlineLoadingProps extends RestProps {
   successDelay?: number;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type InlineLoadingProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class InlineLoading extends SvelteComponentTyped<
   InlineLoadingProps,
diff --git a/types/Link/Link.svelte.d.ts b/types/Link/Link.svelte.d.ts
index 88434cda..87f6668c 100644
--- a/types/Link/Link.svelte.d.ts
+++ b/types/Link/Link.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["a"];
+type $RestProps = SvelteHTMLElements["a"];
 
-export interface LinkProps extends RestProps {
+type $Props = {
   /**
    * Specify the size of the link
    * @default undefined
@@ -48,7 +48,9 @@ export interface LinkProps extends RestProps {
   ref?: null | HTMLAnchorElement;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type LinkProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class Link extends SvelteComponentTyped<
   LinkProps,
diff --git a/types/Link/OutboundLink.svelte.d.ts b/types/Link/OutboundLink.svelte.d.ts
index 2791b76c..3ad31e2e 100644
--- a/types/Link/OutboundLink.svelte.d.ts
+++ b/types/Link/OutboundLink.svelte.d.ts
@@ -1,7 +1,7 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { LinkProps } from "./Link.svelte";
 
-export interface OutboundLinkProps extends LinkProps {}
+export type OutboundLinkProps = LinkProps & {};
 
 export default class OutboundLink extends SvelteComponentTyped<
   OutboundLinkProps,
diff --git a/types/ListBox/ListBox.svelte.d.ts b/types/ListBox/ListBox.svelte.d.ts
index 247ef238..a0017f77 100644
--- a/types/ListBox/ListBox.svelte.d.ts
+++ b/types/ListBox/ListBox.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["div"];
+type $RestProps = SvelteHTMLElements["div"];
 
-export interface ListBoxProps extends RestProps {
+type $Props = {
   /**
    * Set the size of the list box
    * @default undefined
@@ -59,7 +59,9 @@ export interface ListBoxProps extends RestProps {
   warnText?: string;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type ListBoxProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class ListBox extends SvelteComponentTyped<
   ListBoxProps,
diff --git a/types/ListBox/ListBoxField.svelte.d.ts b/types/ListBox/ListBoxField.svelte.d.ts
index d6ddb2ca..4b4d782a 100644
--- a/types/ListBox/ListBoxField.svelte.d.ts
+++ b/types/ListBox/ListBoxField.svelte.d.ts
@@ -3,9 +3,9 @@ import type { SvelteHTMLElements } from "svelte/elements";
 
 export type ListBoxFieldTranslationId = "close" | "open";
 
-type RestProps = SvelteHTMLElements["div"];
+type $RestProps = SvelteHTMLElements["div"];
 
-export interface ListBoxFieldProps extends RestProps {
+type $Props = {
   /**
    * Set to `true` to disable the list box field
    * @default false
@@ -43,7 +43,9 @@ export interface ListBoxFieldProps extends RestProps {
   ref?: null | HTMLDivElement;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type ListBoxFieldProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class ListBoxField extends SvelteComponentTyped<
   ListBoxFieldProps,
diff --git a/types/ListBox/ListBoxMenu.svelte.d.ts b/types/ListBox/ListBoxMenu.svelte.d.ts
index 4dc9f784..72444885 100644
--- a/types/ListBox/ListBoxMenu.svelte.d.ts
+++ b/types/ListBox/ListBoxMenu.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["div"];
+type $RestProps = SvelteHTMLElements["div"];
 
-export interface ListBoxMenuProps extends RestProps {
+type $Props = {
   /**
    * Set an id for the top-level element
    * @default "ccs-" + Math.random().toString(36)
@@ -17,7 +17,9 @@ export interface ListBoxMenuProps extends RestProps {
   ref?: null | HTMLDivElement;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type ListBoxMenuProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class ListBoxMenu extends SvelteComponentTyped<
   ListBoxMenuProps,
diff --git a/types/ListBox/ListBoxMenuIcon.svelte.d.ts b/types/ListBox/ListBoxMenuIcon.svelte.d.ts
index 93662b95..a5d71e02 100644
--- a/types/ListBox/ListBoxMenuIcon.svelte.d.ts
+++ b/types/ListBox/ListBoxMenuIcon.svelte.d.ts
@@ -3,9 +3,9 @@ import type { SvelteHTMLElements } from "svelte/elements";
 
 export type ListBoxMenuIconTranslationId = "close" | "open";
 
-type RestProps = SvelteHTMLElements["div"];
+type $RestProps = SvelteHTMLElements["div"];
 
-export interface ListBoxMenuIconProps extends RestProps {
+type $Props = {
   /**
    * Set to `true` to open the list box menu icon
    * @default false
@@ -19,7 +19,9 @@ export interface ListBoxMenuIconProps extends RestProps {
   translateWithId?: (id: ListBoxMenuIconTranslationId) => string;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type ListBoxMenuIconProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class ListBoxMenuIcon extends SvelteComponentTyped<
   ListBoxMenuIconProps,
diff --git a/types/ListBox/ListBoxMenuItem.svelte.d.ts b/types/ListBox/ListBoxMenuItem.svelte.d.ts
index 1cdeb630..9c980896 100644
--- a/types/ListBox/ListBoxMenuItem.svelte.d.ts
+++ b/types/ListBox/ListBoxMenuItem.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["div"];
+type $RestProps = SvelteHTMLElements["div"];
 
-export interface ListBoxMenuItemProps extends RestProps {
+type $Props = {
   /**
    * Set to `true` to enable the active state
    * @default false
@@ -23,7 +23,9 @@ export interface ListBoxMenuItemProps extends RestProps {
   disabled?: boolean;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type ListBoxMenuItemProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class ListBoxMenuItem extends SvelteComponentTyped<
   ListBoxMenuItemProps,
diff --git a/types/ListBox/ListBoxSelection.svelte.d.ts b/types/ListBox/ListBoxSelection.svelte.d.ts
index b3414494..351bf1ab 100644
--- a/types/ListBox/ListBoxSelection.svelte.d.ts
+++ b/types/ListBox/ListBoxSelection.svelte.d.ts
@@ -3,9 +3,9 @@ import type { SvelteHTMLElements } from "svelte/elements";
 
 export type ListBoxSelectionTranslationId = "clearAll" | "clearSelection";
 
-type RestProps = SvelteHTMLElements["div"];
+type $RestProps = SvelteHTMLElements["div"];
 
-export interface ListBoxSelectionProps extends RestProps {
+type $Props = {
   /**
    * Specify the number of selected items
    * @default undefined
@@ -31,7 +31,9 @@ export interface ListBoxSelectionProps extends RestProps {
   ref?: null | HTMLDivElement;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type ListBoxSelectionProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class ListBoxSelection extends SvelteComponentTyped<
   ListBoxSelectionProps,
diff --git a/types/ListItem/ListItem.svelte.d.ts b/types/ListItem/ListItem.svelte.d.ts
index 75bbeeec..451c7b08 100644
--- a/types/ListItem/ListItem.svelte.d.ts
+++ b/types/ListItem/ListItem.svelte.d.ts
@@ -1,11 +1,13 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["li"];
+type $RestProps = SvelteHTMLElements["li"];
 
-export interface ListItemProps extends RestProps {
+type $Props = {
   [key: `data-${string}`]: any;
-}
+};
+
+export type ListItemProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class ListItem extends SvelteComponentTyped<
   ListItemProps,
diff --git a/types/Loading/Loading.svelte.d.ts b/types/Loading/Loading.svelte.d.ts
index f86fd565..a5fff650 100644
--- a/types/Loading/Loading.svelte.d.ts
+++ b/types/Loading/Loading.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["div"];
+type $RestProps = SvelteHTMLElements["div"];
 
-export interface LoadingProps extends RestProps {
+type $Props = {
   /**
    * Set to `true` to use the small variant
    * @default false
@@ -29,7 +29,9 @@ export interface LoadingProps extends RestProps {
   description?: string;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type LoadingProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class Loading extends SvelteComponentTyped<
   LoadingProps,
diff --git a/types/LocalStorage/LocalStorage.svelte.d.ts b/types/LocalStorage/LocalStorage.svelte.d.ts
index 0fa3aa83..1599cc6b 100644
--- a/types/LocalStorage/LocalStorage.svelte.d.ts
+++ b/types/LocalStorage/LocalStorage.svelte.d.ts
@@ -1,6 +1,6 @@
 import type { SvelteComponentTyped } from "svelte";
 
-export interface LocalStorageProps {
+export type LocalStorageProps = {
   /**
    * Specify the local storage key
    * @default "local-storage-key"
@@ -12,7 +12,7 @@ export interface LocalStorageProps {
    * @default ""
    */
   value?: any;
-}
+};
 
 export default class LocalStorage extends SvelteComponentTyped<
   LocalStorageProps,
diff --git a/types/Modal/Modal.svelte.d.ts b/types/Modal/Modal.svelte.d.ts
index 8956dd61..620d50fa 100644
--- a/types/Modal/Modal.svelte.d.ts
+++ b/types/Modal/Modal.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["div"];
+type $RestProps = SvelteHTMLElements["div"];
 
-export interface ModalProps extends RestProps {
+type $Props = {
   /**
    * Set the size of the modal
    * @default undefined
@@ -133,7 +133,9 @@ export interface ModalProps extends RestProps {
   ref?: null | HTMLDivElement;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type ModalProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class Modal extends SvelteComponentTyped<
   ModalProps,
diff --git a/types/MultiSelect/MultiSelect.svelte.d.ts b/types/MultiSelect/MultiSelect.svelte.d.ts
index e3d217be..3b67f003 100644
--- a/types/MultiSelect/MultiSelect.svelte.d.ts
+++ b/types/MultiSelect/MultiSelect.svelte.d.ts
@@ -11,9 +11,9 @@ export interface MultiSelectItem {
   disabled?: boolean;
 }
 
-type RestProps = SvelteHTMLElements["input"];
+type $RestProps = SvelteHTMLElements["input"];
 
-export interface MultiSelectProps extends RestProps {
+type $Props = {
   /**
    * Set the multiselect items
    * @default []
@@ -240,7 +240,9 @@ export interface MultiSelectProps extends RestProps {
   highlightedId?: null | MultiSelectItemId;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type MultiSelectProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class MultiSelect extends SvelteComponentTyped<
   MultiSelectProps,
diff --git a/types/Notification/InlineNotification.svelte.d.ts b/types/Notification/InlineNotification.svelte.d.ts
index 0b6d3312..0eedc810 100644
--- a/types/Notification/InlineNotification.svelte.d.ts
+++ b/types/Notification/InlineNotification.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["div"];
+type $RestProps = SvelteHTMLElements["div"];
 
-export interface InlineNotificationProps extends RestProps {
+type $Props = {
   /**
    * Specify the kind of notification
    * @default "error"
@@ -65,7 +65,9 @@ export interface InlineNotificationProps extends RestProps {
   closeButtonDescription?: string;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type InlineNotificationProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class InlineNotification extends SvelteComponentTyped<
   InlineNotificationProps,
diff --git a/types/Notification/NotificationActionButton.svelte.d.ts b/types/Notification/NotificationActionButton.svelte.d.ts
index 15835d55..1669c053 100644
--- a/types/Notification/NotificationActionButton.svelte.d.ts
+++ b/types/Notification/NotificationActionButton.svelte.d.ts
@@ -1,7 +1,7 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { ButtonProps } from "../Button/Button.svelte";
 
-export interface NotificationActionButtonProps extends ButtonProps {}
+export type NotificationActionButtonProps = ButtonProps & {};
 
 export default class NotificationActionButton extends SvelteComponentTyped<
   NotificationActionButtonProps,
diff --git a/types/Notification/NotificationButton.svelte.d.ts b/types/Notification/NotificationButton.svelte.d.ts
index db7c76f8..e19f4aeb 100644
--- a/types/Notification/NotificationButton.svelte.d.ts
+++ b/types/Notification/NotificationButton.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["button"];
+type $RestProps = SvelteHTMLElements["button"];
 
-export interface NotificationButtonProps extends RestProps {
+type $Props = {
   /**
    * Set the type of notification
    * @default "toast"
@@ -29,7 +29,9 @@ export interface NotificationButtonProps extends RestProps {
   iconDescription?: string;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type NotificationButtonProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class NotificationButton extends SvelteComponentTyped<
   NotificationButtonProps,
diff --git a/types/Notification/NotificationIcon.svelte.d.ts b/types/Notification/NotificationIcon.svelte.d.ts
index 941cb0f6..19736ad6 100644
--- a/types/Notification/NotificationIcon.svelte.d.ts
+++ b/types/Notification/NotificationIcon.svelte.d.ts
@@ -1,6 +1,6 @@
 import type { SvelteComponentTyped } from "svelte";
 
-export interface NotificationIconProps {
+export type NotificationIconProps = {
   /**
    * Specify the kind of notification icon
    * @default "error"
@@ -24,7 +24,7 @@ export interface NotificationIconProps {
    * @default undefined
    */
   iconDescription: undefined;
-}
+};
 
 export default class NotificationIcon extends SvelteComponentTyped<
   NotificationIconProps,
diff --git a/types/Notification/ToastNotification.svelte.d.ts b/types/Notification/ToastNotification.svelte.d.ts
index 37bd9737..66534bf7 100644
--- a/types/Notification/ToastNotification.svelte.d.ts
+++ b/types/Notification/ToastNotification.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["div"];
+type $RestProps = SvelteHTMLElements["div"];
 
-export interface ToastNotificationProps extends RestProps {
+type $Props = {
   /**
    * Specify the kind of notification
    * @default "error"
@@ -78,7 +78,9 @@ export interface ToastNotificationProps extends RestProps {
   fullWidth?: boolean;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type ToastNotificationProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class ToastNotification extends SvelteComponentTyped<
   ToastNotificationProps,
diff --git a/types/NumberInput/NumberInput.svelte.d.ts b/types/NumberInput/NumberInput.svelte.d.ts
index 1334bdd5..a0296982 100644
--- a/types/NumberInput/NumberInput.svelte.d.ts
+++ b/types/NumberInput/NumberInput.svelte.d.ts
@@ -3,9 +3,9 @@ import type { SvelteHTMLElements } from "svelte/elements";
 
 export type NumberInputTranslationId = "increment" | "decrement";
 
-type RestProps = SvelteHTMLElements["input"];
+type $RestProps = SvelteHTMLElements["input"];
 
-export interface NumberInputProps extends RestProps {
+type $Props = {
   /**
    * Set the size of the input
    * @default undefined
@@ -140,7 +140,9 @@ export interface NumberInputProps extends RestProps {
   ref?: null | HTMLInputElement;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type NumberInputProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class NumberInput extends SvelteComponentTyped<
   NumberInputProps,
diff --git a/types/NumberInput/NumberInputSkeleton.svelte.d.ts b/types/NumberInput/NumberInputSkeleton.svelte.d.ts
index 6b1e0f6d..90a6b84e 100644
--- a/types/NumberInput/NumberInputSkeleton.svelte.d.ts
+++ b/types/NumberInput/NumberInputSkeleton.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["div"];
+type $RestProps = SvelteHTMLElements["div"];
 
-export interface NumberInputSkeletonProps extends RestProps {
+type $Props = {
   /**
    * Set to `true` to hide the label text
    * @default false
@@ -11,7 +11,9 @@ export interface NumberInputSkeletonProps extends RestProps {
   hideLabel?: boolean;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type NumberInputSkeletonProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class NumberInputSkeleton extends SvelteComponentTyped<
   NumberInputSkeletonProps,
diff --git a/types/OrderedList/OrderedList.svelte.d.ts b/types/OrderedList/OrderedList.svelte.d.ts
index 0132847b..bbacabce 100644
--- a/types/OrderedList/OrderedList.svelte.d.ts
+++ b/types/OrderedList/OrderedList.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["ol"];
+type $RestProps = SvelteHTMLElements["ol"];
 
-export interface OrderedListProps extends RestProps {
+type $Props = {
   /**
    * Set to `true` to use the nested variant
    * @default false
@@ -23,7 +23,9 @@ export interface OrderedListProps extends RestProps {
   expressive?: boolean;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type OrderedListProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class OrderedList extends SvelteComponentTyped<
   OrderedListProps,
diff --git a/types/OverflowMenu/OverflowMenu.svelte.d.ts b/types/OverflowMenu/OverflowMenu.svelte.d.ts
index 894ca6ca..7a6426b8 100644
--- a/types/OverflowMenu/OverflowMenu.svelte.d.ts
+++ b/types/OverflowMenu/OverflowMenu.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["button"];
+type $RestProps = SvelteHTMLElements["button"];
 
-export interface OverflowMenuProps extends RestProps {
+type $Props = {
   /**
    * Specify the size of the overflow menu
    * @default undefined
@@ -78,7 +78,9 @@ export interface OverflowMenuProps extends RestProps {
   menuRef?: null | HTMLUListElement;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type OverflowMenuProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class OverflowMenu extends SvelteComponentTyped<
   OverflowMenuProps,
diff --git a/types/OverflowMenu/OverflowMenuItem.svelte.d.ts b/types/OverflowMenu/OverflowMenuItem.svelte.d.ts
index d95d5ca7..e025f961 100644
--- a/types/OverflowMenu/OverflowMenuItem.svelte.d.ts
+++ b/types/OverflowMenu/OverflowMenuItem.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["li"];
+type $RestProps = SvelteHTMLElements["li"];
 
-export interface OverflowMenuItemProps extends RestProps {
+type $Props = {
   /**
    * Specify the item text.
    * Alternatively, use the default slot
@@ -60,7 +60,9 @@ export interface OverflowMenuItemProps extends RestProps {
   ref?: null | HTMLAnchorElement | HTMLButtonElement;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type OverflowMenuItemProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class OverflowMenuItem extends SvelteComponentTyped<
   OverflowMenuItemProps,
diff --git a/types/Pagination/Pagination.svelte.d.ts b/types/Pagination/Pagination.svelte.d.ts
index 4392bcf8..942aff98 100644
--- a/types/Pagination/Pagination.svelte.d.ts
+++ b/types/Pagination/Pagination.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["div"];
+type $RestProps = SvelteHTMLElements["div"];
 
-export interface PaginationProps extends RestProps {
+type $Props = {
   /**
    * Specify the current page index
    * @default 1
@@ -101,7 +101,9 @@ export interface PaginationProps extends RestProps {
   id?: string;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type PaginationProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class Pagination extends SvelteComponentTyped<
   PaginationProps,
diff --git a/types/Pagination/PaginationSkeleton.svelte.d.ts b/types/Pagination/PaginationSkeleton.svelte.d.ts
index 5b18cdf0..8195dc01 100644
--- a/types/Pagination/PaginationSkeleton.svelte.d.ts
+++ b/types/Pagination/PaginationSkeleton.svelte.d.ts
@@ -1,11 +1,13 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["div"];
+type $RestProps = SvelteHTMLElements["div"];
 
-export interface PaginationSkeletonProps extends RestProps {
+type $Props = {
   [key: `data-${string}`]: any;
-}
+};
+
+export type PaginationSkeletonProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class PaginationSkeleton extends SvelteComponentTyped<
   PaginationSkeletonProps,
diff --git a/types/PaginationNav/PaginationNav.svelte.d.ts b/types/PaginationNav/PaginationNav.svelte.d.ts
index 2f9bd9fc..4412e7a9 100644
--- a/types/PaginationNav/PaginationNav.svelte.d.ts
+++ b/types/PaginationNav/PaginationNav.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["nav"];
+type $RestProps = SvelteHTMLElements["nav"];
 
-export interface PaginationNavProps extends RestProps {
+type $Props = {
   /**
    * Specify the current page index
    * @default 1
@@ -47,7 +47,9 @@ export interface PaginationNavProps extends RestProps {
   tooltipPosition?: "top" | "right" | "bottom" | "left" | "outside" | "inside";
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type PaginationNavProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class PaginationNav extends SvelteComponentTyped<
   PaginationNavProps,
diff --git a/types/Popover/Popover.svelte.d.ts b/types/Popover/Popover.svelte.d.ts
index 674a8b3c..893ed1dc 100644
--- a/types/Popover/Popover.svelte.d.ts
+++ b/types/Popover/Popover.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["div"];
+type $RestProps = SvelteHTMLElements["div"];
 
-export interface PopoverProps extends RestProps {
+type $Props = {
   /**
    * Set to `true` to display the popover
    * @default false
@@ -59,7 +59,9 @@ export interface PopoverProps extends RestProps {
   relative?: boolean;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type PopoverProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class Popover extends SvelteComponentTyped<
   PopoverProps,
diff --git a/types/ProgressBar/ProgressBar.svelte.d.ts b/types/ProgressBar/ProgressBar.svelte.d.ts
index 4c4df1f2..dc76989b 100644
--- a/types/ProgressBar/ProgressBar.svelte.d.ts
+++ b/types/ProgressBar/ProgressBar.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["div"];
+type $RestProps = SvelteHTMLElements["div"];
 
-export interface ProgressBarProps extends RestProps {
+type $Props = {
   /**
    * Specify the current value
    * @default undefined
@@ -59,7 +59,9 @@ export interface ProgressBarProps extends RestProps {
   id?: string;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type ProgressBarProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class ProgressBar extends SvelteComponentTyped<
   ProgressBarProps,
diff --git a/types/ProgressIndicator/ProgressIndicator.svelte.d.ts b/types/ProgressIndicator/ProgressIndicator.svelte.d.ts
index 7352531f..4e234b61 100644
--- a/types/ProgressIndicator/ProgressIndicator.svelte.d.ts
+++ b/types/ProgressIndicator/ProgressIndicator.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["ul"];
+type $RestProps = SvelteHTMLElements["ul"];
 
-export interface ProgressIndicatorProps extends RestProps {
+type $Props = {
   /**
    * Specify the current step index
    * @default 0
@@ -29,7 +29,9 @@ export interface ProgressIndicatorProps extends RestProps {
   preventChangeOnClick?: boolean;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type ProgressIndicatorProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class ProgressIndicator extends SvelteComponentTyped<
   ProgressIndicatorProps,
diff --git a/types/ProgressIndicator/ProgressIndicatorSkeleton.svelte.d.ts b/types/ProgressIndicator/ProgressIndicatorSkeleton.svelte.d.ts
index 883abf4e..d68ad1ac 100644
--- a/types/ProgressIndicator/ProgressIndicatorSkeleton.svelte.d.ts
+++ b/types/ProgressIndicator/ProgressIndicatorSkeleton.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["ul"];
+type $RestProps = SvelteHTMLElements["ul"];
 
-export interface ProgressIndicatorSkeletonProps extends RestProps {
+type $Props = {
   /**
    * Set to `true` to use the vertical variant
    * @default false
@@ -17,7 +17,10 @@ export interface ProgressIndicatorSkeletonProps extends RestProps {
   count?: number;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type ProgressIndicatorSkeletonProps = Omit<$RestProps, keyof $Props> &
+  $Props;
 
 export default class ProgressIndicatorSkeleton extends SvelteComponentTyped<
   ProgressIndicatorSkeletonProps,
diff --git a/types/ProgressIndicator/ProgressStep.svelte.d.ts b/types/ProgressIndicator/ProgressStep.svelte.d.ts
index 059d99eb..d85f374e 100644
--- a/types/ProgressIndicator/ProgressStep.svelte.d.ts
+++ b/types/ProgressIndicator/ProgressStep.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["li"];
+type $RestProps = SvelteHTMLElements["li"];
 
-export interface ProgressStepProps extends RestProps {
+type $Props = {
   /**
    * Set to `true` for the complete variant
    * @default false
@@ -53,7 +53,9 @@ export interface ProgressStepProps extends RestProps {
   id?: string;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type ProgressStepProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class ProgressStep extends SvelteComponentTyped<
   ProgressStepProps,
diff --git a/types/RadioButton/RadioButton.svelte.d.ts b/types/RadioButton/RadioButton.svelte.d.ts
index a7205a70..bc2e94d3 100644
--- a/types/RadioButton/RadioButton.svelte.d.ts
+++ b/types/RadioButton/RadioButton.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["div"];
+type $RestProps = SvelteHTMLElements["div"];
 
-export interface RadioButtonProps extends RestProps {
+type $Props = {
   /**
    * Specify the value of the radio button
    * @default ""
@@ -65,7 +65,9 @@ export interface RadioButtonProps extends RestProps {
   ref?: null | HTMLInputElement;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type RadioButtonProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class RadioButton extends SvelteComponentTyped<
   RadioButtonProps,
diff --git a/types/RadioButton/RadioButtonSkeleton.svelte.d.ts b/types/RadioButton/RadioButtonSkeleton.svelte.d.ts
index 30745ca8..b5f9532f 100644
--- a/types/RadioButton/RadioButtonSkeleton.svelte.d.ts
+++ b/types/RadioButton/RadioButtonSkeleton.svelte.d.ts
@@ -1,11 +1,13 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["div"];
+type $RestProps = SvelteHTMLElements["div"];
 
-export interface RadioButtonSkeletonProps extends RestProps {
+type $Props = {
   [key: `data-${string}`]: any;
-}
+};
+
+export type RadioButtonSkeletonProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class RadioButtonSkeleton extends SvelteComponentTyped<
   RadioButtonSkeletonProps,
diff --git a/types/RadioButtonGroup/RadioButtonGroup.svelte.d.ts b/types/RadioButtonGroup/RadioButtonGroup.svelte.d.ts
index 99c369af..b341e6ec 100644
--- a/types/RadioButtonGroup/RadioButtonGroup.svelte.d.ts
+++ b/types/RadioButtonGroup/RadioButtonGroup.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["div"];
+type $RestProps = SvelteHTMLElements["div"];
 
-export interface RadioButtonGroupProps extends RestProps {
+type $Props = {
   /**
    * Set the selected radio button value
    * @default undefined
@@ -59,7 +59,9 @@ export interface RadioButtonGroupProps extends RestProps {
   id?: string;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type RadioButtonGroupProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class RadioButtonGroup extends SvelteComponentTyped<
   RadioButtonGroupProps,
diff --git a/types/RecursiveList/RecursiveList.svelte.d.ts b/types/RecursiveList/RecursiveList.svelte.d.ts
index 8b4a7308..1802e4d0 100644
--- a/types/RecursiveList/RecursiveList.svelte.d.ts
+++ b/types/RecursiveList/RecursiveList.svelte.d.ts
@@ -7,9 +7,9 @@ export interface RecursiveListNode {
   html?: string;
 }
 
-type RestProps = SvelteHTMLElements["ul"] & SvelteHTMLElements["ol"];
+type $RestProps = SvelteHTMLElements["ul"] & SvelteHTMLElements["ol"];
 
-export interface RecursiveListProps extends RestProps {
+type $Props = {
   /**
    * Specify the children to render
    * @default []
@@ -23,7 +23,9 @@ export interface RecursiveListProps extends RestProps {
   type?: "unordered" | "ordered" | "ordered-native";
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type RecursiveListProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class RecursiveList extends SvelteComponentTyped<
   RecursiveListProps,
diff --git a/types/Search/Search.svelte.d.ts b/types/Search/Search.svelte.d.ts
index 3acd317b..8ed90611 100644
--- a/types/Search/Search.svelte.d.ts
+++ b/types/Search/Search.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["input"];
+type $RestProps = SvelteHTMLElements["input"];
 
-export interface SearchProps extends RestProps {
+type $Props = {
   /**
    * Specify the value of the search input
    * @default ""
@@ -102,7 +102,9 @@ export interface SearchProps extends RestProps {
   ref?: null | HTMLInputElement;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type SearchProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class Search extends SvelteComponentTyped<
   SearchProps,
diff --git a/types/Search/SearchSkeleton.svelte.d.ts b/types/Search/SearchSkeleton.svelte.d.ts
index d5590941..133849d1 100644
--- a/types/Search/SearchSkeleton.svelte.d.ts
+++ b/types/Search/SearchSkeleton.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["div"];
+type $RestProps = SvelteHTMLElements["div"];
 
-export interface SearchSkeletonProps extends RestProps {
+type $Props = {
   /**
    * Specify the size of the search input
    * @default "xl"
@@ -11,7 +11,9 @@ export interface SearchSkeletonProps extends RestProps {
   size?: "sm" | "lg" | "xl";
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type SearchSkeletonProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class SearchSkeleton extends SvelteComponentTyped<
   SearchSkeletonProps,
diff --git a/types/Select/Select.svelte.d.ts b/types/Select/Select.svelte.d.ts
index e72c9437..295837e0 100644
--- a/types/Select/Select.svelte.d.ts
+++ b/types/Select/Select.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["div"];
+type $RestProps = SvelteHTMLElements["div"];
 
-export interface SelectProps extends RestProps {
+type $Props = {
   /**
    * Specify the selected item value
    * @default undefined
@@ -107,7 +107,9 @@ export interface SelectProps extends RestProps {
   required?: boolean;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type SelectProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class Select extends SvelteComponentTyped<
   SelectProps,
diff --git a/types/Select/SelectItem.svelte.d.ts b/types/Select/SelectItem.svelte.d.ts
index 3ff8d689..9da64a80 100644
--- a/types/Select/SelectItem.svelte.d.ts
+++ b/types/Select/SelectItem.svelte.d.ts
@@ -1,6 +1,6 @@
 import type { SvelteComponentTyped } from "svelte";
 
-export interface SelectItemProps {
+export type SelectItemProps = {
   /**
    * Specify the option value
    * @default ""
@@ -36,7 +36,7 @@ export interface SelectItemProps {
    * @default undefined
    */
   style?: string;
-}
+};
 
 export default class SelectItem extends SvelteComponentTyped<
   SelectItemProps,
diff --git a/types/Select/SelectItemGroup.svelte.d.ts b/types/Select/SelectItemGroup.svelte.d.ts
index 6d61e444..679202d7 100644
--- a/types/Select/SelectItemGroup.svelte.d.ts
+++ b/types/Select/SelectItemGroup.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["optgroup"];
+type $RestProps = SvelteHTMLElements["optgroup"];
 
-export interface SelectItemGroupProps extends RestProps {
+type $Props = {
   /**
    * Set to `true` to disable the optgroup element
    * @default false
@@ -17,7 +17,9 @@ export interface SelectItemGroupProps extends RestProps {
   label?: string;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type SelectItemGroupProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class SelectItemGroup extends SvelteComponentTyped<
   SelectItemGroupProps,
diff --git a/types/Select/SelectSkeleton.svelte.d.ts b/types/Select/SelectSkeleton.svelte.d.ts
index 431bdbdd..52d7f8cf 100644
--- a/types/Select/SelectSkeleton.svelte.d.ts
+++ b/types/Select/SelectSkeleton.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["div"];
+type $RestProps = SvelteHTMLElements["div"];
 
-export interface SelectSkeletonProps extends RestProps {
+type $Props = {
   /**
    * Set to `true` to hide the label text
    * @default false
@@ -11,7 +11,9 @@ export interface SelectSkeletonProps extends RestProps {
   hideLabel?: boolean;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type SelectSkeletonProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class SelectSkeleton extends SvelteComponentTyped<
   SelectSkeletonProps,
diff --git a/types/SkeletonPlaceholder/SkeletonPlaceholder.svelte.d.ts b/types/SkeletonPlaceholder/SkeletonPlaceholder.svelte.d.ts
index a73c7d45..4e63e986 100644
--- a/types/SkeletonPlaceholder/SkeletonPlaceholder.svelte.d.ts
+++ b/types/SkeletonPlaceholder/SkeletonPlaceholder.svelte.d.ts
@@ -1,11 +1,13 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["div"];
+type $RestProps = SvelteHTMLElements["div"];
 
-export interface SkeletonPlaceholderProps extends RestProps {
+type $Props = {
   [key: `data-${string}`]: any;
-}
+};
+
+export type SkeletonPlaceholderProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class SkeletonPlaceholder extends SvelteComponentTyped<
   SkeletonPlaceholderProps,
diff --git a/types/SkeletonText/SkeletonText.svelte.d.ts b/types/SkeletonText/SkeletonText.svelte.d.ts
index 0cae6e6e..fe46653c 100644
--- a/types/SkeletonText/SkeletonText.svelte.d.ts
+++ b/types/SkeletonText/SkeletonText.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["div"];
+type $RestProps = SvelteHTMLElements["div"];
 
-export interface SkeletonTextProps extends RestProps {
+type $Props = {
   /**
    * Specify the number of lines to render
    * @default 3
@@ -29,7 +29,9 @@ export interface SkeletonTextProps extends RestProps {
   width?: string;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type SkeletonTextProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class SkeletonText extends SvelteComponentTyped<
   SkeletonTextProps,
diff --git a/types/Slider/Slider.svelte.d.ts b/types/Slider/Slider.svelte.d.ts
index 847d3447..1767186f 100644
--- a/types/Slider/Slider.svelte.d.ts
+++ b/types/Slider/Slider.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["div"];
+type $RestProps = SvelteHTMLElements["div"];
 
-export interface SliderProps extends RestProps {
+type $Props = {
   /**
    * Specify the value of the slider
    * @default 0
@@ -121,7 +121,9 @@ export interface SliderProps extends RestProps {
   ref?: null | HTMLDivElement;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type SliderProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class Slider extends SvelteComponentTyped<
   SliderProps,
diff --git a/types/Slider/SliderSkeleton.svelte.d.ts b/types/Slider/SliderSkeleton.svelte.d.ts
index d7115940..bf98628d 100644
--- a/types/Slider/SliderSkeleton.svelte.d.ts
+++ b/types/Slider/SliderSkeleton.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["div"];
+type $RestProps = SvelteHTMLElements["div"];
 
-export interface SliderSkeletonProps extends RestProps {
+type $Props = {
   /**
    * Set to `true` to hide the label text
    * @default false
@@ -11,7 +11,9 @@ export interface SliderSkeletonProps extends RestProps {
   hideLabel?: boolean;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type SliderSkeletonProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class SliderSkeleton extends SvelteComponentTyped<
   SliderSkeletonProps,
diff --git a/types/StructuredList/StructuredList.svelte.d.ts b/types/StructuredList/StructuredList.svelte.d.ts
index 04b62f6d..ce78c5e6 100644
--- a/types/StructuredList/StructuredList.svelte.d.ts
+++ b/types/StructuredList/StructuredList.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["div"];
+type $RestProps = SvelteHTMLElements["div"];
 
-export interface StructuredListProps extends RestProps {
+type $Props = {
   /**
    * Specify the selected structured list row value
    * @default undefined
@@ -29,7 +29,9 @@ export interface StructuredListProps extends RestProps {
   selection?: boolean;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type StructuredListProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class StructuredList extends SvelteComponentTyped<
   StructuredListProps,
diff --git a/types/StructuredList/StructuredListBody.svelte.d.ts b/types/StructuredList/StructuredListBody.svelte.d.ts
index b865022a..d64e16fd 100644
--- a/types/StructuredList/StructuredListBody.svelte.d.ts
+++ b/types/StructuredList/StructuredListBody.svelte.d.ts
@@ -1,11 +1,13 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["div"];
+type $RestProps = SvelteHTMLElements["div"];
 
-export interface StructuredListBodyProps extends RestProps {
+type $Props = {
   [key: `data-${string}`]: any;
-}
+};
+
+export type StructuredListBodyProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class StructuredListBody extends SvelteComponentTyped<
   StructuredListBodyProps,
diff --git a/types/StructuredList/StructuredListCell.svelte.d.ts b/types/StructuredList/StructuredListCell.svelte.d.ts
index 101ee103..b05c8e65 100644
--- a/types/StructuredList/StructuredListCell.svelte.d.ts
+++ b/types/StructuredList/StructuredListCell.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["div"];
+type $RestProps = SvelteHTMLElements["div"];
 
-export interface StructuredListCellProps extends RestProps {
+type $Props = {
   /**
    * Set to `true` to use as a header
    * @default false
@@ -17,7 +17,9 @@ export interface StructuredListCellProps extends RestProps {
   noWrap?: boolean;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type StructuredListCellProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class StructuredListCell extends SvelteComponentTyped<
   StructuredListCellProps,
diff --git a/types/StructuredList/StructuredListHead.svelte.d.ts b/types/StructuredList/StructuredListHead.svelte.d.ts
index 3b0a2890..e06697f8 100644
--- a/types/StructuredList/StructuredListHead.svelte.d.ts
+++ b/types/StructuredList/StructuredListHead.svelte.d.ts
@@ -1,11 +1,13 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["div"];
+type $RestProps = SvelteHTMLElements["div"];
 
-export interface StructuredListHeadProps extends RestProps {
+type $Props = {
   [key: `data-${string}`]: any;
-}
+};
+
+export type StructuredListHeadProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class StructuredListHead extends SvelteComponentTyped<
   StructuredListHeadProps,
diff --git a/types/StructuredList/StructuredListInput.svelte.d.ts b/types/StructuredList/StructuredListInput.svelte.d.ts
index 95282fbb..a6c85a30 100644
--- a/types/StructuredList/StructuredListInput.svelte.d.ts
+++ b/types/StructuredList/StructuredListInput.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["input"];
+type $RestProps = SvelteHTMLElements["input"];
 
-export interface StructuredListInputProps extends RestProps {
+type $Props = {
   /**
    * Set to `true` to check the input
    * @default false
@@ -41,7 +41,9 @@ export interface StructuredListInputProps extends RestProps {
   ref?: null | HTMLInputElement;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type StructuredListInputProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class StructuredListInput extends SvelteComponentTyped<
   StructuredListInputProps,
diff --git a/types/StructuredList/StructuredListRow.svelte.d.ts b/types/StructuredList/StructuredListRow.svelte.d.ts
index a7a7c8f8..e64ac5de 100644
--- a/types/StructuredList/StructuredListRow.svelte.d.ts
+++ b/types/StructuredList/StructuredListRow.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["label"];
+type $RestProps = SvelteHTMLElements["label"];
 
-export interface StructuredListRowProps extends RestProps {
+type $Props = {
   /**
    * Set to `true` to use as a header
    * @default false
@@ -23,7 +23,9 @@ export interface StructuredListRowProps extends RestProps {
   tabindex?: string;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type StructuredListRowProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class StructuredListRow extends SvelteComponentTyped<
   StructuredListRowProps,
diff --git a/types/StructuredList/StructuredListSkeleton.svelte.d.ts b/types/StructuredList/StructuredListSkeleton.svelte.d.ts
index 555a201f..1da26566 100644
--- a/types/StructuredList/StructuredListSkeleton.svelte.d.ts
+++ b/types/StructuredList/StructuredListSkeleton.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["div"];
+type $RestProps = SvelteHTMLElements["div"];
 
-export interface StructuredListSkeletonProps extends RestProps {
+type $Props = {
   /**
    * Specify the number of rows
    * @default 5
@@ -11,7 +11,10 @@ export interface StructuredListSkeletonProps extends RestProps {
   rows?: number;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type StructuredListSkeletonProps = Omit<$RestProps, keyof $Props> &
+  $Props;
 
 export default class StructuredListSkeleton extends SvelteComponentTyped<
   StructuredListSkeletonProps,
diff --git a/types/Tabs/Tab.svelte.d.ts b/types/Tabs/Tab.svelte.d.ts
index f5444607..74755b43 100644
--- a/types/Tabs/Tab.svelte.d.ts
+++ b/types/Tabs/Tab.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["li"];
+type $RestProps = SvelteHTMLElements["li"];
 
-export interface TabProps extends RestProps {
+type $Props = {
   /**
    * Specify the tab label.
    * Alternatively, use the default slot (e.g., `<Tab><span>Label</span></Tab>`)
@@ -42,7 +42,9 @@ export interface TabProps extends RestProps {
   ref?: null | HTMLAnchorElement;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type TabProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class Tab extends SvelteComponentTyped<
   TabProps,
diff --git a/types/Tabs/TabContent.svelte.d.ts b/types/Tabs/TabContent.svelte.d.ts
index 073b52bf..65e59e01 100644
--- a/types/Tabs/TabContent.svelte.d.ts
+++ b/types/Tabs/TabContent.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["div"];
+type $RestProps = SvelteHTMLElements["div"];
 
-export interface TabContentProps extends RestProps {
+type $Props = {
   /**
    * Set an id for the top-level element
    * @default "ccs-" + Math.random().toString(36)
@@ -11,7 +11,9 @@ export interface TabContentProps extends RestProps {
   id?: string;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type TabContentProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class TabContent extends SvelteComponentTyped<
   TabContentProps,
diff --git a/types/Tabs/Tabs.svelte.d.ts b/types/Tabs/Tabs.svelte.d.ts
index 14a6fe60..ad6744ca 100644
--- a/types/Tabs/Tabs.svelte.d.ts
+++ b/types/Tabs/Tabs.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["div"];
+type $RestProps = SvelteHTMLElements["div"];
 
-export interface TabsProps extends RestProps {
+type $Props = {
   /**
    * Specify the selected tab index
    * @default 0
@@ -35,7 +35,9 @@ export interface TabsProps extends RestProps {
   triggerHref?: string;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type TabsProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class Tabs extends SvelteComponentTyped<
   TabsProps,
diff --git a/types/Tabs/TabsSkeleton.svelte.d.ts b/types/Tabs/TabsSkeleton.svelte.d.ts
index 60a553f5..2634390e 100644
--- a/types/Tabs/TabsSkeleton.svelte.d.ts
+++ b/types/Tabs/TabsSkeleton.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["div"];
+type $RestProps = SvelteHTMLElements["div"];
 
-export interface TabsSkeletonProps extends RestProps {
+type $Props = {
   /**
    * Specify the number of tabs to render
    * @default 4
@@ -17,7 +17,9 @@ export interface TabsSkeletonProps extends RestProps {
   type?: "default" | "container";
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type TabsSkeletonProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class TabsSkeleton extends SvelteComponentTyped<
   TabsSkeletonProps,
diff --git a/types/Tag/Tag.svelte.d.ts b/types/Tag/Tag.svelte.d.ts
index f51dcd77..615f5b30 100644
--- a/types/Tag/Tag.svelte.d.ts
+++ b/types/Tag/Tag.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["div"] & SvelteHTMLElements["span"];
+type $RestProps = SvelteHTMLElements["div"] & SvelteHTMLElements["span"];
 
-export interface TagProps extends RestProps {
+type $Props = {
   /**
    * Specify the type of tag
    * @default undefined
@@ -70,7 +70,9 @@ export interface TagProps extends RestProps {
   id?: string;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type TagProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class Tag extends SvelteComponentTyped<
   TagProps,
diff --git a/types/Tag/TagSkeleton.svelte.d.ts b/types/Tag/TagSkeleton.svelte.d.ts
index a828a481..3aa9360d 100644
--- a/types/Tag/TagSkeleton.svelte.d.ts
+++ b/types/Tag/TagSkeleton.svelte.d.ts
@@ -1,16 +1,18 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["span"];
+type $RestProps = SvelteHTMLElements["span"];
 
-export interface TagSkeletonProps extends RestProps {
+type $Props = {
   /**
    * @default "default"
    */
   size?: "sm" | "default";
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type TagSkeletonProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class TagSkeleton extends SvelteComponentTyped<
   TagSkeletonProps,
diff --git a/types/TextArea/TextArea.svelte.d.ts b/types/TextArea/TextArea.svelte.d.ts
index c213bc33..475661fd 100644
--- a/types/TextArea/TextArea.svelte.d.ts
+++ b/types/TextArea/TextArea.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["textarea"];
+type $RestProps = SvelteHTMLElements["textarea"];
 
-export interface TextAreaProps extends RestProps {
+type $Props = {
   /**
    * Specify the textarea value.
    * @default ""
@@ -101,7 +101,9 @@ export interface TextAreaProps extends RestProps {
   ref?: null | HTMLTextAreaElement;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type TextAreaProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class TextArea extends SvelteComponentTyped<
   TextAreaProps,
diff --git a/types/TextArea/TextAreaSkeleton.svelte.d.ts b/types/TextArea/TextAreaSkeleton.svelte.d.ts
index 6b32cdaf..144ef233 100644
--- a/types/TextArea/TextAreaSkeleton.svelte.d.ts
+++ b/types/TextArea/TextAreaSkeleton.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["div"];
+type $RestProps = SvelteHTMLElements["div"];
 
-export interface TextAreaSkeletonProps extends RestProps {
+type $Props = {
   /**
    * Set to `true` to visually hide the label text
    * @default false
@@ -11,7 +11,9 @@ export interface TextAreaSkeletonProps extends RestProps {
   hideLabel?: boolean;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type TextAreaSkeletonProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class TextAreaSkeleton extends SvelteComponentTyped<
   TextAreaSkeletonProps,
diff --git a/types/TextInput/PasswordInput.svelte.d.ts b/types/TextInput/PasswordInput.svelte.d.ts
index 76ccb5a4..470d536b 100644
--- a/types/TextInput/PasswordInput.svelte.d.ts
+++ b/types/TextInput/PasswordInput.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["input"];
+type $RestProps = SvelteHTMLElements["input"];
 
-export interface PasswordInputProps extends RestProps {
+type $Props = {
   /**
    * Set the size of the input
    * @default undefined
@@ -131,7 +131,9 @@ export interface PasswordInputProps extends RestProps {
   ref?: null | HTMLInputElement;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type PasswordInputProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class PasswordInput extends SvelteComponentTyped<
   PasswordInputProps,
diff --git a/types/TextInput/TextInput.svelte.d.ts b/types/TextInput/TextInput.svelte.d.ts
index f46d3302..2d6a53ff 100644
--- a/types/TextInput/TextInput.svelte.d.ts
+++ b/types/TextInput/TextInput.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["input"];
+type $RestProps = SvelteHTMLElements["input"];
 
-export interface TextInputProps extends RestProps {
+type $Props = {
   /**
    * Set the size of the input
    * @default undefined
@@ -116,7 +116,9 @@ export interface TextInputProps extends RestProps {
   readonly?: boolean;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type TextInputProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class TextInput extends SvelteComponentTyped<
   TextInputProps,
diff --git a/types/TextInput/TextInputSkeleton.svelte.d.ts b/types/TextInput/TextInputSkeleton.svelte.d.ts
index c7291482..b2893a18 100644
--- a/types/TextInput/TextInputSkeleton.svelte.d.ts
+++ b/types/TextInput/TextInputSkeleton.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["div"];
+type $RestProps = SvelteHTMLElements["div"];
 
-export interface TextInputSkeletonProps extends RestProps {
+type $Props = {
   /**
    * Set to `true` to hide the label text
    * @default false
@@ -11,7 +11,9 @@ export interface TextInputSkeletonProps extends RestProps {
   hideLabel?: boolean;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type TextInputSkeletonProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class TextInputSkeleton extends SvelteComponentTyped<
   TextInputSkeletonProps,
diff --git a/types/Theme/Theme.svelte.d.ts b/types/Theme/Theme.svelte.d.ts
index 9a9e034d..0d497f1f 100644
--- a/types/Theme/Theme.svelte.d.ts
+++ b/types/Theme/Theme.svelte.d.ts
@@ -2,7 +2,7 @@ import type { SvelteComponentTyped } from "svelte";
 
 export type CarbonTheme = "white" | "g10" | "g80" | "g90" | "g100";
 
-export interface ThemeProps {
+export type ThemeProps = {
   /**
    * Set the current Carbon theme
    * @default "white"
@@ -49,7 +49,7 @@ export interface ThemeProps {
   select?: import("../Select/Select.svelte").SelectProps & {
     themes?: CarbonTheme[];
   };
-}
+};
 
 export default class Theme extends SvelteComponentTyped<
   ThemeProps,
diff --git a/types/Tile/ClickableTile.svelte.d.ts b/types/Tile/ClickableTile.svelte.d.ts
index 02b6c64d..e4bcbe03 100644
--- a/types/Tile/ClickableTile.svelte.d.ts
+++ b/types/Tile/ClickableTile.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["a"] & SvelteHTMLElements["p"];
+type $RestProps = SvelteHTMLElements["a"] & SvelteHTMLElements["p"];
 
-export interface ClickableTileProps extends RestProps {
+type $Props = {
   /**
    * Set to `true` to click the tile
    * @default false
@@ -29,7 +29,9 @@ export interface ClickableTileProps extends RestProps {
   href?: string;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type ClickableTileProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class ClickableTile extends SvelteComponentTyped<
   ClickableTileProps,
diff --git a/types/Tile/ExpandableTile.svelte.d.ts b/types/Tile/ExpandableTile.svelte.d.ts
index 01c6dd58..09d7064b 100644
--- a/types/Tile/ExpandableTile.svelte.d.ts
+++ b/types/Tile/ExpandableTile.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["button"];
+type $RestProps = SvelteHTMLElements["button"];
 
-export interface ExpandableTileProps extends RestProps {
+type $Props = {
   /**
    * Set to `true` to expand the tile
    * @default false
@@ -71,7 +71,9 @@ export interface ExpandableTileProps extends RestProps {
   ref?: null | HTMLButtonElement;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type ExpandableTileProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class ExpandableTile extends SvelteComponentTyped<
   ExpandableTileProps,
diff --git a/types/Tile/RadioTile.svelte.d.ts b/types/Tile/RadioTile.svelte.d.ts
index 22ba06ec..7438e03b 100644
--- a/types/Tile/RadioTile.svelte.d.ts
+++ b/types/Tile/RadioTile.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["label"];
+type $RestProps = SvelteHTMLElements["label"];
 
-export interface RadioTileProps extends RestProps {
+type $Props = {
   /**
    * Set to `true` to check the tile
    * @default false
@@ -59,7 +59,9 @@ export interface RadioTileProps extends RestProps {
   name?: string;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type RadioTileProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class RadioTile extends SvelteComponentTyped<
   RadioTileProps,
diff --git a/types/Tile/SelectableTile.svelte.d.ts b/types/Tile/SelectableTile.svelte.d.ts
index d33f863f..589716cc 100644
--- a/types/Tile/SelectableTile.svelte.d.ts
+++ b/types/Tile/SelectableTile.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["label"];
+type $RestProps = SvelteHTMLElements["label"];
 
-export interface SelectableTileProps extends RestProps {
+type $Props = {
   /**
    * Set to `true` to select the tile
    * @default false
@@ -65,7 +65,9 @@ export interface SelectableTileProps extends RestProps {
   ref?: null | HTMLInputElement;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type SelectableTileProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class SelectableTile extends SvelteComponentTyped<
   SelectableTileProps,
diff --git a/types/Tile/Tile.svelte.d.ts b/types/Tile/Tile.svelte.d.ts
index 79244986..c3aa83e2 100644
--- a/types/Tile/Tile.svelte.d.ts
+++ b/types/Tile/Tile.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["div"];
+type $RestProps = SvelteHTMLElements["div"];
 
-export interface TileProps extends RestProps {
+type $Props = {
   /**
    * Set to `true` to enable the light variant
    * @default false
@@ -11,7 +11,9 @@ export interface TileProps extends RestProps {
   light?: boolean;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type TileProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class Tile extends SvelteComponentTyped<
   TileProps,
diff --git a/types/Tile/TileGroup.svelte.d.ts b/types/Tile/TileGroup.svelte.d.ts
index dbd3c94d..16ad5de8 100644
--- a/types/Tile/TileGroup.svelte.d.ts
+++ b/types/Tile/TileGroup.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["fieldset"];
+type $RestProps = SvelteHTMLElements["fieldset"];
 
-export interface TileGroupProps extends RestProps {
+type $Props = {
   /**
    * Specify the selected tile value
    * @default undefined
@@ -35,7 +35,9 @@ export interface TileGroupProps extends RestProps {
   legend?: string;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type TileGroupProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class TileGroup extends SvelteComponentTyped<
   TileGroupProps,
diff --git a/types/TimePicker/TimePicker.svelte.d.ts b/types/TimePicker/TimePicker.svelte.d.ts
index 4bfd8d78..20c55f29 100644
--- a/types/TimePicker/TimePicker.svelte.d.ts
+++ b/types/TimePicker/TimePicker.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["input"];
+type $RestProps = SvelteHTMLElements["input"];
 
-export interface TimePickerProps extends RestProps {
+type $Props = {
   /**
    * Specify the size of the input
    * @default undefined
@@ -89,7 +89,9 @@ export interface TimePickerProps extends RestProps {
   ref?: null | HTMLInputElement;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type TimePickerProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class TimePicker extends SvelteComponentTyped<
   TimePickerProps,
diff --git a/types/TimePicker/TimePickerSelect.svelte.d.ts b/types/TimePicker/TimePickerSelect.svelte.d.ts
index be26d73b..426bc185 100644
--- a/types/TimePicker/TimePickerSelect.svelte.d.ts
+++ b/types/TimePicker/TimePickerSelect.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["div"];
+type $RestProps = SvelteHTMLElements["div"];
 
-export interface TimePickerSelectProps extends RestProps {
+type $Props = {
   /**
    * Specify the select value
    * @default ""
@@ -47,7 +47,9 @@ export interface TimePickerSelectProps extends RestProps {
   ref?: null | HTMLSelectElement;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type TimePickerSelectProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class TimePickerSelect extends SvelteComponentTyped<
   TimePickerSelectProps,
diff --git a/types/Toggle/Toggle.svelte.d.ts b/types/Toggle/Toggle.svelte.d.ts
index b7c2c806..89ac1914 100644
--- a/types/Toggle/Toggle.svelte.d.ts
+++ b/types/Toggle/Toggle.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["div"];
+type $RestProps = SvelteHTMLElements["div"];
 
-export interface ToggleProps extends RestProps {
+type $Props = {
   /**
    * Specify the toggle size
    * @default "default"
@@ -59,7 +59,9 @@ export interface ToggleProps extends RestProps {
   name?: string;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type ToggleProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class Toggle extends SvelteComponentTyped<
   ToggleProps,
diff --git a/types/Toggle/ToggleSkeleton.svelte.d.ts b/types/Toggle/ToggleSkeleton.svelte.d.ts
index 3ad8ba2c..2003a353 100644
--- a/types/Toggle/ToggleSkeleton.svelte.d.ts
+++ b/types/Toggle/ToggleSkeleton.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["div"];
+type $RestProps = SvelteHTMLElements["div"];
 
-export interface ToggleSkeletonProps extends RestProps {
+type $Props = {
   /**
    * Specify the toggle size
    * @default "default"
@@ -23,7 +23,9 @@ export interface ToggleSkeletonProps extends RestProps {
   id?: string;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type ToggleSkeletonProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class ToggleSkeleton extends SvelteComponentTyped<
   ToggleSkeletonProps,
diff --git a/types/Tooltip/Tooltip.svelte.d.ts b/types/Tooltip/Tooltip.svelte.d.ts
index 593ca8c4..3a68e7dc 100644
--- a/types/Tooltip/Tooltip.svelte.d.ts
+++ b/types/Tooltip/Tooltip.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["div"];
+type $RestProps = SvelteHTMLElements["div"];
 
-export interface TooltipProps extends RestProps {
+type $Props = {
   /**
    * Set the alignment of the tooltip relative to the icon
    * @default "center"
@@ -90,7 +90,9 @@ export interface TooltipProps extends RestProps {
   refIcon?: null | HTMLDivElement;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type TooltipProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class Tooltip extends SvelteComponentTyped<
   TooltipProps,
diff --git a/types/Tooltip/TooltipFooter.svelte.d.ts b/types/Tooltip/TooltipFooter.svelte.d.ts
index 490fb8c7..d998417c 100644
--- a/types/Tooltip/TooltipFooter.svelte.d.ts
+++ b/types/Tooltip/TooltipFooter.svelte.d.ts
@@ -1,12 +1,12 @@
 import type { SvelteComponentTyped } from "svelte";
 
-export interface TooltipFooterProps {
+export type TooltipFooterProps = {
   /**
    * Specify a selector to be focused inside the footer when opening the tooltip
    * @default "a[href], button:not([disabled])"
    */
   selectorPrimaryFocus?: string;
-}
+};
 
 export default class TooltipFooter extends SvelteComponentTyped<
   TooltipFooterProps,
diff --git a/types/TooltipDefinition/TooltipDefinition.svelte.d.ts b/types/TooltipDefinition/TooltipDefinition.svelte.d.ts
index 254848be..0af6da3b 100644
--- a/types/TooltipDefinition/TooltipDefinition.svelte.d.ts
+++ b/types/TooltipDefinition/TooltipDefinition.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["span"];
+type $RestProps = SvelteHTMLElements["span"];
 
-export interface TooltipDefinitionProps extends RestProps {
+type $Props = {
   /**
    * Specify the tooltip text
    * @default ""
@@ -41,7 +41,9 @@ export interface TooltipDefinitionProps extends RestProps {
   ref?: null | HTMLButtonElement;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type TooltipDefinitionProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class TooltipDefinition extends SvelteComponentTyped<
   TooltipDefinitionProps,
diff --git a/types/TooltipIcon/TooltipIcon.svelte.d.ts b/types/TooltipIcon/TooltipIcon.svelte.d.ts
index f13a4859..2788b839 100644
--- a/types/TooltipIcon/TooltipIcon.svelte.d.ts
+++ b/types/TooltipIcon/TooltipIcon.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["button"];
+type $RestProps = SvelteHTMLElements["button"];
 
-export interface TooltipIconProps extends RestProps {
+type $Props = {
   /**
    * Specify the tooltip text.
    * Alternatively, use the "tooltipText" slot
@@ -48,7 +48,9 @@ export interface TooltipIconProps extends RestProps {
   ref?: null | HTMLButtonElement;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type TooltipIconProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class TooltipIcon extends SvelteComponentTyped<
   TooltipIconProps,
diff --git a/types/TreeView/TreeView.svelte.d.ts b/types/TreeView/TreeView.svelte.d.ts
index 6dbdfbf6..75a55834 100644
--- a/types/TreeView/TreeView.svelte.d.ts
+++ b/types/TreeView/TreeView.svelte.d.ts
@@ -11,9 +11,9 @@ export interface TreeNode {
   children?: TreeNode[];
 }
 
-type RestProps = SvelteHTMLElements["ul"];
+type $RestProps = SvelteHTMLElements["ul"];
 
-export interface TreeViewProps extends RestProps {
+type $Props = {
   /**
    * Provide an array of children nodes to render
    * @default []
@@ -58,7 +58,9 @@ export interface TreeViewProps extends RestProps {
   hideLabel?: boolean;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type TreeViewProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class TreeView extends SvelteComponentTyped<
   TreeViewProps,
diff --git a/types/Truncate/Truncate.svelte.d.ts b/types/Truncate/Truncate.svelte.d.ts
index d7231742..c8384c3b 100644
--- a/types/Truncate/Truncate.svelte.d.ts
+++ b/types/Truncate/Truncate.svelte.d.ts
@@ -1,16 +1,18 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["p"];
+type $RestProps = SvelteHTMLElements["p"];
 
-export interface TruncateProps extends RestProps {
+type $Props = {
   /**
    * @default "end"
    */
   clamp?: "end" | "front";
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type TruncateProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class Truncate extends SvelteComponentTyped<
   TruncateProps,
diff --git a/types/UIShell/Content.svelte.d.ts b/types/UIShell/Content.svelte.d.ts
index 6ba58060..40e98e8a 100644
--- a/types/UIShell/Content.svelte.d.ts
+++ b/types/UIShell/Content.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["main"];
+type $RestProps = SvelteHTMLElements["main"];
 
-export interface ContentProps extends RestProps {
+type $Props = {
   /**
    * Specify the id for the main element
    * @default "main-content"
@@ -11,7 +11,9 @@ export interface ContentProps extends RestProps {
   id?: string;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type ContentProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class Content extends SvelteComponentTyped<
   ContentProps,
diff --git a/types/UIShell/Header.svelte.d.ts b/types/UIShell/Header.svelte.d.ts
index f16a2862..bc527005 100644
--- a/types/UIShell/Header.svelte.d.ts
+++ b/types/UIShell/Header.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["a"];
+type $RestProps = SvelteHTMLElements["a"];
 
-export interface HeaderProps extends RestProps {
+type $Props = {
   /**
    * Set to `false` to hide the side nav by default
    * @default true
@@ -82,7 +82,9 @@ export interface HeaderProps extends RestProps {
   iconClose?: typeof import("svelte").SvelteComponent<any>;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type HeaderProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class Header extends SvelteComponentTyped<
   HeaderProps,
diff --git a/types/UIShell/HeaderAction.svelte.d.ts b/types/UIShell/HeaderAction.svelte.d.ts
index 43b44833..7ef308fa 100644
--- a/types/UIShell/HeaderAction.svelte.d.ts
+++ b/types/UIShell/HeaderAction.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["button"];
+type $RestProps = SvelteHTMLElements["button"];
 
-export interface HeaderActionProps extends RestProps {
+type $Props = {
   /**
    * Set to `true` to open the panel
    * @default false
@@ -51,7 +51,9 @@ export interface HeaderActionProps extends RestProps {
   preventCloseOnClickOutside?: boolean;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type HeaderActionProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class HeaderAction extends SvelteComponentTyped<
   HeaderActionProps,
diff --git a/types/UIShell/HeaderActionLink.svelte.d.ts b/types/UIShell/HeaderActionLink.svelte.d.ts
index dbe69111..1d1031e6 100644
--- a/types/UIShell/HeaderActionLink.svelte.d.ts
+++ b/types/UIShell/HeaderActionLink.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["a"];
+type $RestProps = SvelteHTMLElements["a"];
 
-export interface HeaderActionLinkProps extends RestProps {
+type $Props = {
   /**
    * Set to `true` to use the active state
    * @default false
@@ -29,7 +29,9 @@ export interface HeaderActionLinkProps extends RestProps {
   ref?: null | HTMLAnchorElement;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type HeaderActionLinkProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class HeaderActionLink extends SvelteComponentTyped<
   HeaderActionLinkProps,
diff --git a/types/UIShell/HeaderGlobalAction.svelte.d.ts b/types/UIShell/HeaderGlobalAction.svelte.d.ts
index 36923a55..b483f09c 100644
--- a/types/UIShell/HeaderGlobalAction.svelte.d.ts
+++ b/types/UIShell/HeaderGlobalAction.svelte.d.ts
@@ -1,7 +1,7 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { ButtonProps } from "../Button/Button.svelte";
 
-export interface HeaderGlobalActionProps extends ButtonProps {
+export type HeaderGlobalActionProps = ButtonProps & {
   /**
    * Set to `true` to use the active variant
    * @default false
@@ -19,7 +19,7 @@ export interface HeaderGlobalActionProps extends ButtonProps {
    * @default null
    */
   ref?: HTMLButtonElement;
-}
+};
 
 export default class HeaderGlobalAction extends SvelteComponentTyped<
   HeaderGlobalActionProps,
diff --git a/types/UIShell/HeaderNav.svelte.d.ts b/types/UIShell/HeaderNav.svelte.d.ts
index 5bb395ef..defcc1cf 100644
--- a/types/UIShell/HeaderNav.svelte.d.ts
+++ b/types/UIShell/HeaderNav.svelte.d.ts
@@ -1,11 +1,13 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["nav"];
+type $RestProps = SvelteHTMLElements["nav"];
 
-export interface HeaderNavProps extends RestProps {
+type $Props = {
   [key: `data-${string}`]: any;
-}
+};
+
+export type HeaderNavProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class HeaderNav extends SvelteComponentTyped<
   HeaderNavProps,
diff --git a/types/UIShell/HeaderNavItem.svelte.d.ts b/types/UIShell/HeaderNavItem.svelte.d.ts
index 3b1a5248..014c3dfa 100644
--- a/types/UIShell/HeaderNavItem.svelte.d.ts
+++ b/types/UIShell/HeaderNavItem.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["a"];
+type $RestProps = SvelteHTMLElements["a"];
 
-export interface HeaderNavItemProps extends RestProps {
+type $Props = {
   /**
    * Specify the `href` attribute
    * @default undefined
@@ -29,7 +29,9 @@ export interface HeaderNavItemProps extends RestProps {
   ref?: null | HTMLAnchorElement;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type HeaderNavItemProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class HeaderNavItem extends SvelteComponentTyped<
   HeaderNavItemProps,
diff --git a/types/UIShell/HeaderNavMenu.svelte.d.ts b/types/UIShell/HeaderNavMenu.svelte.d.ts
index 9de4493f..6260b56b 100644
--- a/types/UIShell/HeaderNavMenu.svelte.d.ts
+++ b/types/UIShell/HeaderNavMenu.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["a"];
+type $RestProps = SvelteHTMLElements["a"];
 
-export interface HeaderNavMenuProps extends RestProps {
+type $Props = {
   /**
    * Set to `true` to toggle the expanded state
    * @default false
@@ -29,7 +29,9 @@ export interface HeaderNavMenuProps extends RestProps {
   ref?: null | HTMLAnchorElement;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type HeaderNavMenuProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class HeaderNavMenu extends SvelteComponentTyped<
   HeaderNavMenuProps,
diff --git a/types/UIShell/HeaderPanelDivider.svelte.d.ts b/types/UIShell/HeaderPanelDivider.svelte.d.ts
index a2ff4fb7..60b74d6c 100644
--- a/types/UIShell/HeaderPanelDivider.svelte.d.ts
+++ b/types/UIShell/HeaderPanelDivider.svelte.d.ts
@@ -1,6 +1,6 @@
 import type { SvelteComponentTyped } from "svelte";
 
-export interface HeaderPanelDividerProps {}
+export type HeaderPanelDividerProps = {};
 
 export default class HeaderPanelDivider extends SvelteComponentTyped<
   HeaderPanelDividerProps,
diff --git a/types/UIShell/HeaderPanelLink.svelte.d.ts b/types/UIShell/HeaderPanelLink.svelte.d.ts
index 18a1f13e..9d85f0f9 100644
--- a/types/UIShell/HeaderPanelLink.svelte.d.ts
+++ b/types/UIShell/HeaderPanelLink.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["a"];
+type $RestProps = SvelteHTMLElements["a"];
 
-export interface HeaderPanelLinkProps extends RestProps {
+type $Props = {
   /**
    * Specify the `href` attribute
    * @default undefined
@@ -17,7 +17,9 @@ export interface HeaderPanelLinkProps extends RestProps {
   ref?: null | HTMLAnchorElement;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type HeaderPanelLinkProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class HeaderPanelLink extends SvelteComponentTyped<
   HeaderPanelLinkProps,
diff --git a/types/UIShell/HeaderPanelLinks.svelte.d.ts b/types/UIShell/HeaderPanelLinks.svelte.d.ts
index 3c3ece33..c898380f 100644
--- a/types/UIShell/HeaderPanelLinks.svelte.d.ts
+++ b/types/UIShell/HeaderPanelLinks.svelte.d.ts
@@ -1,6 +1,6 @@
 import type { SvelteComponentTyped } from "svelte";
 
-export interface HeaderPanelLinksProps {}
+export type HeaderPanelLinksProps = {};
 
 export default class HeaderPanelLinks extends SvelteComponentTyped<
   HeaderPanelLinksProps,
diff --git a/types/UIShell/HeaderSearch.svelte.d.ts b/types/UIShell/HeaderSearch.svelte.d.ts
index c9d9a153..327f638d 100644
--- a/types/UIShell/HeaderSearch.svelte.d.ts
+++ b/types/UIShell/HeaderSearch.svelte.d.ts
@@ -7,9 +7,9 @@ export interface HeaderSearchResult {
   description?: string;
 }
 
-type RestProps = SvelteHTMLElements["input"];
+type $RestProps = SvelteHTMLElements["input"];
 
-export interface HeaderSearchProps extends RestProps {
+type $Props = {
   /**
    * Specify the search input value
    * @default ""
@@ -41,7 +41,9 @@ export interface HeaderSearchProps extends RestProps {
   selectedResultIndex?: number;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type HeaderSearchProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class HeaderSearch extends SvelteComponentTyped<
   HeaderSearchProps,
diff --git a/types/UIShell/HeaderUtilities.svelte.d.ts b/types/UIShell/HeaderUtilities.svelte.d.ts
index 8f26c9cd..277fa7f3 100644
--- a/types/UIShell/HeaderUtilities.svelte.d.ts
+++ b/types/UIShell/HeaderUtilities.svelte.d.ts
@@ -1,6 +1,6 @@
 import type { SvelteComponentTyped } from "svelte";
 
-export interface HeaderUtilitiesProps {}
+export type HeaderUtilitiesProps = {};
 
 export default class HeaderUtilities extends SvelteComponentTyped<
   HeaderUtilitiesProps,
diff --git a/types/UIShell/SideNav.svelte.d.ts b/types/UIShell/SideNav.svelte.d.ts
index 7ed6d570..72feba14 100644
--- a/types/UIShell/SideNav.svelte.d.ts
+++ b/types/UIShell/SideNav.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["nav"];
+type $RestProps = SvelteHTMLElements["nav"];
 
-export interface SideNavProps extends RestProps {
+type $Props = {
   /**
    * Set to `true` to use the fixed variant
    * @default false
@@ -41,7 +41,9 @@ export interface SideNavProps extends RestProps {
   expansionBreakpoint?: number;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type SideNavProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class SideNav extends SvelteComponentTyped<
   SideNavProps,
diff --git a/types/UIShell/SideNavDivider.svelte.d.ts b/types/UIShell/SideNavDivider.svelte.d.ts
index 4febc1a7..5dab28bf 100644
--- a/types/UIShell/SideNavDivider.svelte.d.ts
+++ b/types/UIShell/SideNavDivider.svelte.d.ts
@@ -1,11 +1,13 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["li"];
+type $RestProps = SvelteHTMLElements["li"];
 
-export interface SideNavDividerProps extends RestProps {
+type $Props = {
   [key: `data-${string}`]: any;
-}
+};
+
+export type SideNavDividerProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class SideNavDivider extends SvelteComponentTyped<
   SideNavDividerProps,
diff --git a/types/UIShell/SideNavItems.svelte.d.ts b/types/UIShell/SideNavItems.svelte.d.ts
index 21b24162..c0816bd0 100644
--- a/types/UIShell/SideNavItems.svelte.d.ts
+++ b/types/UIShell/SideNavItems.svelte.d.ts
@@ -1,6 +1,6 @@
 import type { SvelteComponentTyped } from "svelte";
 
-export interface SideNavItemsProps {}
+export type SideNavItemsProps = {};
 
 export default class SideNavItems extends SvelteComponentTyped<
   SideNavItemsProps,
diff --git a/types/UIShell/SideNavLink.svelte.d.ts b/types/UIShell/SideNavLink.svelte.d.ts
index 7d187195..3230a910 100644
--- a/types/UIShell/SideNavLink.svelte.d.ts
+++ b/types/UIShell/SideNavLink.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["a"];
+type $RestProps = SvelteHTMLElements["a"];
 
-export interface SideNavLinkProps extends RestProps {
+type $Props = {
   /**
    * Set to `true` to select the current link
    * @default false
@@ -35,7 +35,9 @@ export interface SideNavLinkProps extends RestProps {
   ref?: null | HTMLAnchorElement;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type SideNavLinkProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class SideNavLink extends SvelteComponentTyped<
   SideNavLinkProps,
diff --git a/types/UIShell/SideNavMenu.svelte.d.ts b/types/UIShell/SideNavMenu.svelte.d.ts
index 599b412e..df3a300a 100644
--- a/types/UIShell/SideNavMenu.svelte.d.ts
+++ b/types/UIShell/SideNavMenu.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["button"];
+type $RestProps = SvelteHTMLElements["button"];
 
-export interface SideNavMenuProps extends RestProps {
+type $Props = {
   /**
    * Set to `true` to toggle the expanded state
    * @default false
@@ -29,7 +29,9 @@ export interface SideNavMenuProps extends RestProps {
   ref?: null | HTMLButtonElement;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type SideNavMenuProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class SideNavMenu extends SvelteComponentTyped<
   SideNavMenuProps,
diff --git a/types/UIShell/SideNavMenuItem.svelte.d.ts b/types/UIShell/SideNavMenuItem.svelte.d.ts
index 21fa5c47..8867f995 100644
--- a/types/UIShell/SideNavMenuItem.svelte.d.ts
+++ b/types/UIShell/SideNavMenuItem.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["a"];
+type $RestProps = SvelteHTMLElements["a"];
 
-export interface SideNavMenuItemProps extends RestProps {
+type $Props = {
   /**
    * Set to `true` to select the item
    * @default false
@@ -29,7 +29,9 @@ export interface SideNavMenuItemProps extends RestProps {
   ref?: null | HTMLAnchorElement;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type SideNavMenuItemProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class SideNavMenuItem extends SvelteComponentTyped<
   SideNavMenuItemProps,
diff --git a/types/UIShell/SkipToContent.svelte.d.ts b/types/UIShell/SkipToContent.svelte.d.ts
index 406c1bf9..52c54794 100644
--- a/types/UIShell/SkipToContent.svelte.d.ts
+++ b/types/UIShell/SkipToContent.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["a"];
+type $RestProps = SvelteHTMLElements["a"];
 
-export interface SkipToContentProps extends RestProps {
+type $Props = {
   /**
    * Specify the `href` attribute
    * @default "#main-content"
@@ -17,7 +17,9 @@ export interface SkipToContentProps extends RestProps {
   tabindex?: string;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type SkipToContentProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class SkipToContent extends SvelteComponentTyped<
   SkipToContentProps,
diff --git a/types/UnorderedList/UnorderedList.svelte.d.ts b/types/UnorderedList/UnorderedList.svelte.d.ts
index a3aaac24..0ac708ca 100644
--- a/types/UnorderedList/UnorderedList.svelte.d.ts
+++ b/types/UnorderedList/UnorderedList.svelte.d.ts
@@ -1,9 +1,9 @@
 import type { SvelteComponentTyped } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
 
-type RestProps = SvelteHTMLElements["ul"];
+type $RestProps = SvelteHTMLElements["ul"];
 
-export interface UnorderedListProps extends RestProps {
+type $Props = {
   /**
    * Set to `true` to use the nested variant
    * @default false
@@ -17,7 +17,9 @@ export interface UnorderedListProps extends RestProps {
   expressive?: boolean;
 
   [key: `data-${string}`]: any;
-}
+};
+
+export type UnorderedListProps = Omit<$RestProps, keyof $Props> & $Props;
 
 export default class UnorderedList extends SvelteComponentTyped<
   UnorderedListProps,