diff --git a/docs/src/COMPONENT_API.json b/docs/src/COMPONENT_API.json
index dd56f7cc..9019526b 100644
--- a/docs/src/COMPONENT_API.json
+++ b/docs/src/COMPONENT_API.json
@@ -924,7 +924,7 @@
         { "type": "forwarded", "name": "blur", "element": "input" }
       ],
       "typedefs": [],
-      "rest_props": { "type": "InlineComponent", "name": "CheckboxSkeleton" }
+      "rest_props": { "type": "Element", "name": "div" }
     },
     {
       "moduleName": "CheckboxSkeleton",
@@ -4399,7 +4399,7 @@
         { "type": "forwarded", "name": "keydown", "element": "button" }
       ],
       "typedefs": [],
-      "rest_props": { "type": "InlineComponent", "name": "Loading" }
+      "rest_props": { "type": "Element", "name": "div | button | svg" }
     },
     {
       "moduleName": "FluidForm",
@@ -4416,7 +4416,7 @@
         { "type": "forwarded", "name": "submit", "element": "Form" }
       ],
       "typedefs": [],
-      "rest_props": { "type": "InlineComponent", "name": "Form" }
+      "rest_props": { "type": "Element", "name": "form" }
     },
     {
       "moduleName": "Form",
diff --git a/src/Checkbox/Checkbox.svelte b/src/Checkbox/Checkbox.svelte
index a98efe29..775aa344 100644
--- a/src/Checkbox/Checkbox.svelte
+++ b/src/Checkbox/Checkbox.svelte
@@ -1,5 +1,6 @@
 <script>
   /**
+   * @restProps {div}
    * @event {boolean} check
    */
 
diff --git a/src/FileUploader/Filename.svelte b/src/FileUploader/Filename.svelte
index efec5171..52828e25 100644
--- a/src/FileUploader/Filename.svelte
+++ b/src/FileUploader/Filename.svelte
@@ -1,4 +1,8 @@
 <script>
+  /**
+   * @restProps {div | button | svg}
+   */
+
   /**
    * Specify the file name status
    * @type {"uploading" | "edit" | "complete"}
diff --git a/src/FluidForm/FluidForm.svelte b/src/FluidForm/FluidForm.svelte
index 12d0b1c3..cf79c0af 100644
--- a/src/FluidForm/FluidForm.svelte
+++ b/src/FluidForm/FluidForm.svelte
@@ -1,4 +1,8 @@
 <script>
+  /**
+   * @restProps {form}
+   */
+
   import { setContext } from "svelte";
   import Form from "../Form/Form.svelte";
 
diff --git a/tests/Checkbox.test.svelte b/tests/Checkbox.test.svelte
index d34306a3..bf165c23 100644
--- a/tests/Checkbox.test.svelte
+++ b/tests/Checkbox.test.svelte
@@ -2,7 +2,7 @@
   import { Checkbox } from "../types";
 </script>
 
-<Checkbox labelText="Label text" />
+<Checkbox labelText="Label text" style="margin: 1rem" />
 
 <Checkbox labelText="Label text" checked />
 
diff --git a/tests/FluidForm.test.svelte b/tests/FluidForm.test.svelte
index f1c17dce..8f39452b 100644
--- a/tests/FluidForm.test.svelte
+++ b/tests/FluidForm.test.svelte
@@ -2,7 +2,7 @@
   import { FluidForm, TextInput, PasswordInput } from "../types";
 </script>
 
-<FluidForm>
+<FluidForm action="" method="get">
   <TextInput labelText="User name" placeholder="Enter user name..." required />
   <PasswordInput
     required
diff --git a/types/Checkbox/Checkbox.svelte.d.ts b/types/Checkbox/Checkbox.svelte.d.ts
index 224b2481..0b014d3c 100644
--- a/types/Checkbox/Checkbox.svelte.d.ts
+++ b/types/Checkbox/Checkbox.svelte.d.ts
@@ -1,7 +1,8 @@
 /// <reference types="svelte" />
 import type { SvelteComponentTyped } from "svelte";
 
-export interface CheckboxProps {
+export interface CheckboxProps
+  extends svelte.JSX.HTMLAttributes<HTMLElementTagNameMap["div"]> {
   /**
    * Specify the value of the checkbox
    * @default ""
diff --git a/types/FileUploader/Filename.svelte.d.ts b/types/FileUploader/Filename.svelte.d.ts
index af4bfd4c..7600bfc7 100644
--- a/types/FileUploader/Filename.svelte.d.ts
+++ b/types/FileUploader/Filename.svelte.d.ts
@@ -1,7 +1,10 @@
 /// <reference types="svelte" />
 import type { SvelteComponentTyped } from "svelte";
 
-export interface FilenameProps {
+export interface FilenameProps
+  extends svelte.JSX.HTMLAttributes<HTMLElementTagNameMap["div"]>,
+    svelte.JSX.HTMLAttributes<HTMLElementTagNameMap["button"]>,
+    svelte.JSX.SVGAttributes<SVGSVGElement> {
   /**
    * Specify the file name status
    * @default "uploading"
diff --git a/types/FluidForm/FluidForm.svelte.d.ts b/types/FluidForm/FluidForm.svelte.d.ts
index 0474b869..1bc27300 100644
--- a/types/FluidForm/FluidForm.svelte.d.ts
+++ b/types/FluidForm/FluidForm.svelte.d.ts
@@ -1,7 +1,8 @@
 /// <reference types="svelte" />
 import type { SvelteComponentTyped } from "svelte";
 
-export interface FluidFormProps {}
+export interface FluidFormProps
+  extends svelte.JSX.HTMLAttributes<HTMLElementTagNameMap["form"]> {}
 
 export default class FluidForm extends SvelteComponentTyped<
   FluidFormProps,