diff --git a/packages/docs/pages/components/_meta.json b/packages/docs/pages/components/_meta.json
index 28284d186d..fab92b8f97 100644
--- a/packages/docs/pages/components/_meta.json
+++ b/packages/docs/pages/components/_meta.json
@@ -32,14 +32,11 @@
   "textarea": "Textarea",
   "toast-stack": "ToastStack",
   "tooltip": "Tooltip",
+
   "Primitives": { "type": "separator", "title": "Primitives" },
   "accessible-icon": "AccessibleIcon",
   "clickable": "Clickable",
-  "combobox-input": "ComboboxInput",
-  "combobox-item": "ComboboxItem",
-  "combobox-list": "ComboboxList",
-  "combobox-popover": "ComboboxPopover",
-  "composable": "Composable",
+  "combobox": "Combobox",
   "compose": "Compose",
   "locale-provider": "LocaleProvider",
   "visually-hidden": "VisuallyHidden",
@@ -47,7 +44,6 @@
   "Layout": { "type": "separator", "title": "Layout" },
   "bleed": "Bleed",
   "center": "Center",
-  "container": "Container",
   "content": "Content",
   "flex": "Flex",
   "grid": "Grid",
diff --git a/packages/docs/pages/components/center.mdx b/packages/docs/pages/components/center.mdx
index af17b614d4..a19e6e82c1 100644
--- a/packages/docs/pages/components/center.mdx
+++ b/packages/docs/pages/components/center.mdx
@@ -1,5 +1,9 @@
 # Center
 
-Center is a layout component that centers its child within itself.
+<ComponentDescription name="center" />
 
-![Center example](public/assets/overview-center.webp)
\ No newline at end of file
+<Preview name="center" />
+
+## Optional props
+
+<PropsDocs name="center" />
\ No newline at end of file
diff --git a/packages/docs/pages/components/center/_meta.json b/packages/docs/pages/components/center/_meta.json
deleted file mode 100644
index dd335de314..0000000000
--- a/packages/docs/pages/components/center/_meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "api-reference": "API Reference" }
diff --git a/packages/docs/pages/components/center/api-reference.mdx b/packages/docs/pages/components/center/api-reference.mdx
deleted file mode 100644
index 349fe8e5ce..0000000000
--- a/packages/docs/pages/components/center/api-reference.mdx
+++ /dev/null
@@ -1,11 +0,0 @@
-# API Reference
-
-Centralizes its content
-
-<Preview name="center" />
-
-## Props
-
-### Optional
-
-<PropsDocs name="center" />
diff --git a/packages/docs/pages/components/checkbox.mdx b/packages/docs/pages/components/checkbox.mdx
index deedd1e894..afa59e9d5c 100644
--- a/packages/docs/pages/components/checkbox.mdx
+++ b/packages/docs/pages/components/checkbox.mdx
@@ -1,10 +1,17 @@
 # Checkbox
 
-A single Checkbox represents binary choices, such as accepting terms and conditions or activating and deactivating notifications.
+<ComponentDescription name="checkbox" />
 
-![Checkbox example](public/assets/overview-checkbox.webp)
+## Required props
+
+<PropsDocs name="checkbox" required />
+
+## Optional props
+
+<PropsDocs name="checkbox" />
+
+## Related components
 
-### Related components
 <RelatedComponentList>
   <RelatedComponent
     title="RadioGroup"
diff --git a/packages/docs/pages/components/clickable.mdx b/packages/docs/pages/components/clickable.mdx
index d89e5c6ad0..50917e0243 100644
--- a/packages/docs/pages/components/clickable.mdx
+++ b/packages/docs/pages/components/clickable.mdx
@@ -1,5 +1,13 @@
 # Clickable
 
-Represents clickable surfaces.
+<ComponentDescription name="clickable" />
 
-![Clickable example](public/assets/overview-clickable.webp)
\ No newline at end of file
+```jsx
+<Clickable>
+  Text <button>Click Me</button>
+</Clickable>
+```
+
+## Optional props
+
+<PropsDocs name="clickable" />
\ No newline at end of file
diff --git a/packages/docs/pages/components/clickable/_meta.json b/packages/docs/pages/components/clickable/_meta.json
index 32e3fb5d54..6254ea0bbd 100644
--- a/packages/docs/pages/components/clickable/_meta.json
+++ b/packages/docs/pages/components/clickable/_meta.json
@@ -1 +1 @@
-{ "api-reference": "API Reference", "clickable-bubble": "ClickableBubble" }
+{ "clickable-bubble": "ClickableBubble" }
diff --git a/packages/docs/pages/components/clickable/api-reference.mdx b/packages/docs/pages/components/clickable/api-reference.mdx
deleted file mode 100644
index 6b665d3214..0000000000
--- a/packages/docs/pages/components/clickable/api-reference.mdx
+++ /dev/null
@@ -1,25 +0,0 @@
-# API Reference
-
-Represents clickable surfaces
-
-```jsx
-<Clickable>
-  Text <button>Click Me</button>
-</Clickable>
-```
-
-## Parameters
-
-### `props`
-
-- Type: `@vtex/shoreline-primitives.ClickableProps & @types/react.React.RefAttributes<typescript.HTMLDivElement>`
-
-## Props
-
-### `asChild` (optional)
-
-Enable children composition
-
-- Type: `boolean`
-
-- Default: `false`
diff --git a/packages/docs/pages/components/clickable/clickable-bubble.mdx b/packages/docs/pages/components/clickable/clickable-bubble.mdx
index e4b3522f70..186614f27e 100644
--- a/packages/docs/pages/components/clickable/clickable-bubble.mdx
+++ b/packages/docs/pages/components/clickable/clickable-bubble.mdx
@@ -1,5 +1,15 @@
 # ClickableBubble
 
-Bubbles events to Clickable.
+<ComponentDescription name="clickable-bubble" />
 
-![No-visual component](public/assets/no-visual-component.webp)
\ No newline at end of file
+```jsx
+<Clickable>
+  <ClickableBubble>
+    <p>Clicking the text will bubble the Click event to Clickable</p>
+  </ClickableBubble>
+</Clickable>
+```
+
+## Required props
+
+<PropsDocs name="clickable-bubble" required />
\ No newline at end of file
diff --git a/packages/docs/pages/components/clickable/clickable-bubble/_meta.json b/packages/docs/pages/components/clickable/clickable-bubble/_meta.json
deleted file mode 100644
index dd335de314..0000000000
--- a/packages/docs/pages/components/clickable/clickable-bubble/_meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "api-reference": "API Reference" }
diff --git a/packages/docs/pages/components/clickable/clickable-bubble/api-reference.mdx b/packages/docs/pages/components/clickable/clickable-bubble/api-reference.mdx
deleted file mode 100644
index 910f22187d..0000000000
--- a/packages/docs/pages/components/clickable/clickable-bubble/api-reference.mdx
+++ /dev/null
@@ -1,25 +0,0 @@
-# API Reference
-
-Bubbles events to Clickable
-
-```jsx
-<Clickable>
-  <ClickableBubble>
-    <p>Clicking the text will bubble the Click event to Clickable</p>
-  </ClickableBubble>
-</Clickable>
-```
-
-## Parameters
-
-### `props`
-
-- Type: `@vtex/shoreline-primitives.ClickableBubbleProps & @types/react.React.RefAttributes<typescript.HTMLDivElement>`
-
-## Props
-
-### `children`
-
-Children to bubble event
-
-- Type: `@types/react.React.ReactNode`
diff --git a/packages/docs/pages/components/combobox-input.mdx b/packages/docs/pages/components/combobox-input.mdx
deleted file mode 100644
index 49caf4da72..0000000000
--- a/packages/docs/pages/components/combobox-input.mdx
+++ /dev/null
@@ -1,5 +0,0 @@
-# ComboboxInput
-
-Renders a combobox input.
-
-![ComboboxInput example](public/assets/overview-combobox-input.webp)
\ No newline at end of file
diff --git a/packages/docs/pages/components/combobox-input/_meta.json b/packages/docs/pages/components/combobox-input/_meta.json
deleted file mode 100644
index dd335de314..0000000000
--- a/packages/docs/pages/components/combobox-input/_meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "api-reference": "API Reference" }
diff --git a/packages/docs/pages/components/combobox-input/api-reference.mdx b/packages/docs/pages/components/combobox-input/api-reference.mdx
deleted file mode 100644
index 0c8e2050c0..0000000000
--- a/packages/docs/pages/components/combobox-input/api-reference.mdx
+++ /dev/null
@@ -1,19 +0,0 @@
-# API Reference
-
-Renders a combobox input
-
-## Parameters
-
-### `props`
-
-- Type: `@vtex/shoreline-primitives.ComboboxInputProps & @types/react.React.RefAttributes<typescript.HTMLInputElement>`
-
-## Props
-
-### `asChild` (optional)
-
-Enable children composition
-
-- Type: `boolean`
-
-- Default: `false`
diff --git a/packages/docs/pages/components/combobox-item.mdx b/packages/docs/pages/components/combobox-item.mdx
deleted file mode 100644
index c1f659c0ca..0000000000
--- a/packages/docs/pages/components/combobox-item.mdx
+++ /dev/null
@@ -1,5 +0,0 @@
-# ComboboxItem
-
-Renders an item for the combobox.
-
-![ComboboxItem example](public/assets/overview-combobox-item.webp)
\ No newline at end of file
diff --git a/packages/docs/pages/components/combobox-item/_meta.json b/packages/docs/pages/components/combobox-item/_meta.json
deleted file mode 100644
index dd335de314..0000000000
--- a/packages/docs/pages/components/combobox-item/_meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "api-reference": "API Reference" }
diff --git a/packages/docs/pages/components/combobox-item/api-reference.mdx b/packages/docs/pages/components/combobox-item/api-reference.mdx
deleted file mode 100644
index e3a81e3f41..0000000000
--- a/packages/docs/pages/components/combobox-item/api-reference.mdx
+++ /dev/null
@@ -1,19 +0,0 @@
-# API Reference
-
-Renders an item for the combobox
-
-## Parameters
-
-### `props`
-
-- Type: `@vtex/shoreline-primitives.ComboboxItemProps & @types/react.React.RefAttributes<typescript.HTMLDivElement>`
-
-## Props
-
-### `asChild` (optional)
-
-Enable children composition
-
-- Type: `boolean`
-
-- Default: `false`
diff --git a/packages/docs/pages/components/combobox-list.mdx b/packages/docs/pages/components/combobox-list.mdx
deleted file mode 100644
index eb8e2a43a4..0000000000
--- a/packages/docs/pages/components/combobox-list.mdx
+++ /dev/null
@@ -1,5 +0,0 @@
-# ComboboxList
-
-Renders a list for the combobox.
-
-![ComboboxList example](public/assets/overview-combobox-list.webp)
\ No newline at end of file
diff --git a/packages/docs/pages/components/combobox-list/_meta.json b/packages/docs/pages/components/combobox-list/_meta.json
deleted file mode 100644
index dd335de314..0000000000
--- a/packages/docs/pages/components/combobox-list/_meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "api-reference": "API Reference" }
diff --git a/packages/docs/pages/components/combobox-list/api-reference.mdx b/packages/docs/pages/components/combobox-list/api-reference.mdx
deleted file mode 100644
index 31e01c1e6c..0000000000
--- a/packages/docs/pages/components/combobox-list/api-reference.mdx
+++ /dev/null
@@ -1,19 +0,0 @@
-# API Reference
-
-Renders a list for the combobox
-
-## Parameters
-
-### `props`
-
-- Type: `@vtex/shoreline-primitives.ComboboxListProps & @types/react.React.RefAttributes<typescript.HTMLDivElement>`
-
-## Props
-
-### `asChild` (optional)
-
-Enable children composition
-
-- Type: `boolean`
-
-- Default: `false`
diff --git a/packages/docs/pages/components/combobox-popover.mdx b/packages/docs/pages/components/combobox-popover.mdx
deleted file mode 100644
index eed1923b7a..0000000000
--- a/packages/docs/pages/components/combobox-popover.mdx
+++ /dev/null
@@ -1,5 +0,0 @@
-# ComboboxPopover
-
-Renders a popover for the combobox.
-
-![Combobox example](public/assets/overview-combobox.webp)
\ No newline at end of file
diff --git a/packages/docs/pages/components/combobox-popover/_meta.json b/packages/docs/pages/components/combobox-popover/_meta.json
deleted file mode 100644
index dd335de314..0000000000
--- a/packages/docs/pages/components/combobox-popover/_meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "api-reference": "API Reference" }
diff --git a/packages/docs/pages/components/combobox-popover/api-reference.mdx b/packages/docs/pages/components/combobox-popover/api-reference.mdx
deleted file mode 100644
index 8cb77b9e25..0000000000
--- a/packages/docs/pages/components/combobox-popover/api-reference.mdx
+++ /dev/null
@@ -1,19 +0,0 @@
-# API Reference
-
-Renders a popover for the combobox
-
-## Parameters
-
-### `props`
-
-- Type: `@vtex/shoreline-primitives.ComboboxPopoverProps & @types/react.React.RefAttributes<typescript.HTMLDivElement>`
-
-## Props
-
-### `asChild` (optional)
-
-Enable children composition
-
-- Type: `boolean`
-
-- Default: `false`
diff --git a/packages/docs/pages/components/combobox/_meta.json b/packages/docs/pages/components/combobox/_meta.json
new file mode 100644
index 0000000000..8e48eac5bd
--- /dev/null
+++ b/packages/docs/pages/components/combobox/_meta.json
@@ -0,0 +1,6 @@
+{
+  "combobox-input": "ComboboxInput",
+  "combobox-item": "ComboboxItem",
+  "combobox-list": "ComboboxList",
+  "combobox-popover": "ComboboxPopover"
+}
diff --git a/packages/docs/pages/components/combobox/combobox-input.mdx b/packages/docs/pages/components/combobox/combobox-input.mdx
new file mode 100644
index 0000000000..6c92a8a989
--- /dev/null
+++ b/packages/docs/pages/components/combobox/combobox-input.mdx
@@ -0,0 +1,7 @@
+# ComboboxInput
+
+<ComponentDescription name="combobox-input" />
+
+## Optional props
+
+<PropsDocs name="combobox-input" />
\ No newline at end of file
diff --git a/packages/docs/pages/components/combobox/combobox-item.mdx b/packages/docs/pages/components/combobox/combobox-item.mdx
new file mode 100644
index 0000000000..81f17c49e7
--- /dev/null
+++ b/packages/docs/pages/components/combobox/combobox-item.mdx
@@ -0,0 +1,7 @@
+# ComboboxItem
+
+<ComponentDescription name="combobox-item" />
+
+## Optional props
+
+<PropsDocs name="combobox-item" />
\ No newline at end of file
diff --git a/packages/docs/pages/components/combobox/combobox-list.mdx b/packages/docs/pages/components/combobox/combobox-list.mdx
new file mode 100644
index 0000000000..19e332d304
--- /dev/null
+++ b/packages/docs/pages/components/combobox/combobox-list.mdx
@@ -0,0 +1,7 @@
+# ComboboxList
+
+<ComponentDescription name="combobox-list" />
+
+## Optional props
+
+<PropsDocs name="combobox-list" />
\ No newline at end of file
diff --git a/packages/docs/pages/components/combobox/combobox-popover.mdx b/packages/docs/pages/components/combobox/combobox-popover.mdx
new file mode 100644
index 0000000000..d02bd65803
--- /dev/null
+++ b/packages/docs/pages/components/combobox/combobox-popover.mdx
@@ -0,0 +1,7 @@
+# ComboboxPopover
+
+<ComponentDescription name="combobox-popover" />
+
+## Optional props
+
+<PropsDocs name="combobox-popover" />
\ No newline at end of file
diff --git a/packages/docs/pages/components/composable.mdx b/packages/docs/pages/components/composable.mdx
deleted file mode 100644
index 8941b5507b..0000000000
--- a/packages/docs/pages/components/composable.mdx
+++ /dev/null
@@ -1,5 +0,0 @@
-# Composable
-
-Defines a composable child inside of a Compose component.
-
-![No-visual component](public/assets/no-visual-component.webp)
\ No newline at end of file
diff --git a/packages/docs/pages/components/composable/_meta.json b/packages/docs/pages/components/composable/_meta.json
deleted file mode 100644
index dd335de314..0000000000
--- a/packages/docs/pages/components/composable/_meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "api-reference": "API Reference" }
diff --git a/packages/docs/pages/components/composable/api-reference.mdx b/packages/docs/pages/components/composable/api-reference.mdx
deleted file mode 100644
index 926a234547..0000000000
--- a/packages/docs/pages/components/composable/api-reference.mdx
+++ /dev/null
@@ -1,30 +0,0 @@
-# API Reference
-
-Defines a composable child inside of a Compose component
-
-```jsx
-function Button({ asChild, children, ...props }) {
-  const Composition = asChild ? Compose : "button";
-  return (
-    <Composition {...props}>
-      Prefix <Composable>{children}</Composable>
-    </Composition>
-  );
-}
-```
-
-## Parameters
-
-### `props`
-
-- Type: `@vtex/shoreline-primitives.ComposableProps`
-
-## Props
-
-### `children`
-
-- Type: `@types/react.React.ReactNode`
-
-### `render` (optional)
-
-- Type: `@vtex/shoreline-utils.RenderProps`
diff --git a/packages/docs/pages/components/compose.mdx b/packages/docs/pages/components/compose.mdx
index c0dff63765..91fc33272a 100644
--- a/packages/docs/pages/components/compose.mdx
+++ b/packages/docs/pages/components/compose.mdx
@@ -1,6 +1,14 @@
 # Compose
 
-Composes immediate child with its props and child own props.
-Used to implement Shoreline composition.
+<ComponentDescription name="compose" />
 
-![Compose example](public/assets/overview-compose.webp)
\ No newline at end of file
+```jsx
+function Button({ asChild, ...props }) {
+  const Composition = asChild ? Compose : "button";
+  return <Composition {...props} />;
+}
+```
+
+## Optional props
+
+<PropsDocs name="compose" />
\ No newline at end of file
diff --git a/packages/docs/pages/components/compose/_meta.json b/packages/docs/pages/components/compose/_meta.json
deleted file mode 100644
index dd335de314..0000000000
--- a/packages/docs/pages/components/compose/_meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "api-reference": "API Reference" }
diff --git a/packages/docs/pages/components/compose/api-reference.mdx b/packages/docs/pages/components/compose/api-reference.mdx
deleted file mode 100644
index 5ab4ad01d8..0000000000
--- a/packages/docs/pages/components/compose/api-reference.mdx
+++ /dev/null
@@ -1,23 +0,0 @@
-# API Reference
-
-Composes immediate child with its props and child own props.
-Used to implement Shoreline composition]
-
-```jsx
-function Button({ asChild, ...props }) {
-  const Composition = asChild ? Compose : "button";
-  return <Composition {...props} />;
-}
-```
-
-## Parameters
-
-### `props`
-
-- Type: `@vtex/shoreline-primitives.ComposeProps & @types/react.React.RefAttributes<any>`
-
-## Props
-
-### `children` (optional)
-
-- Type: `@types/react.React.ReactNode`
diff --git a/packages/docs/pages/components/compose/composable.mdx b/packages/docs/pages/components/compose/composable.mdx
new file mode 100644
index 0000000000..b62f9f7428
--- /dev/null
+++ b/packages/docs/pages/components/compose/composable.mdx
@@ -0,0 +1,22 @@
+# Composable
+
+<ComponentDescription name="composable" />
+
+```jsx
+function Button({ asChild, children, ...props }) {
+  const Composition = asChild ? Compose : "button";
+  return (
+    <Composition {...props}>
+      Prefix <Composable>{children}</Composable>
+    </Composition>
+  );
+}
+```
+
+## Required props
+
+<PropsDocs name="composable" required />
+
+## Optional props
+
+<PropsDocs name="composable" />
\ No newline at end of file
diff --git a/packages/docs/pages/components/confirmation-modal.mdx b/packages/docs/pages/components/confirmation-modal.mdx
index cdd6fd5a1d..643ed70ccd 100644
--- a/packages/docs/pages/components/confirmation-modal.mdx
+++ b/packages/docs/pages/components/confirmation-modal.mdx
@@ -8,7 +8,6 @@
 
 <PropsDocs name="confirmation-modal" />
 
-
 ## Related components
 
 <RelatedComponentList>
diff --git a/packages/docs/pages/components/empty-state.mdx b/packages/docs/pages/components/empty-state.mdx
index f0fbeee6ce..4e5293a28a 100644
--- a/packages/docs/pages/components/empty-state.mdx
+++ b/packages/docs/pages/components/empty-state.mdx
@@ -1,5 +1,16 @@
 # EmptyState
 
-An Empty State represents the state of a container, such as when there are no items to display or when the user isn't allowed to access items.
+<ComponentDescription name="empty-state" />
 
-![EmptyState example](public/assets/overview-empty-state.webp)
\ No newline at end of file
+```jsx
+<EmptyState>
+  <Heading>Title goes here</Heading>
+  <Slot name="actions">
+    <Button variant="primary">label</Button>
+  </Slot>
+</EmptyState>
+```
+
+## Optional props
+
+<PropsDocs name="empty-state" />
\ No newline at end of file
diff --git a/packages/docs/pages/components/locale-provider.mdx b/packages/docs/pages/components/locale-provider.mdx
index eb90e88f47..7b57baeb7d 100644
--- a/packages/docs/pages/components/locale-provider.mdx
+++ b/packages/docs/pages/components/locale-provider.mdx
@@ -1,5 +1,11 @@
 # LocaleProvider
 
-Provides the locale.
+<ComponentDescription name="locale-provider" />
 
-![Locale example](public/assets/overview-locale.webp)
\ No newline at end of file
+```jsx
+<LocaleProvider locale="pt-BR">...</LocaleProvider>
+```
+
+## Optional props
+
+<PropsDocs name="locale-provider" />
\ No newline at end of file
diff --git a/packages/docs/pages/components/locale-provider/_meta.json b/packages/docs/pages/components/locale-provider/_meta.json
deleted file mode 100644
index dd335de314..0000000000
--- a/packages/docs/pages/components/locale-provider/_meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "api-reference": "API Reference" }
diff --git a/packages/docs/pages/components/locale-provider/api-reference.mdx b/packages/docs/pages/components/locale-provider/api-reference.mdx
deleted file mode 100644
index a0230e3b33..0000000000
--- a/packages/docs/pages/components/locale-provider/api-reference.mdx
+++ /dev/null
@@ -1,25 +0,0 @@
-# API Reference
-
-Provides the locale
-
-```jsx
-<LocaleProvider locale="pt-BR">...</LocaleProvider>
-```
-
-## Parameters
-
-### `props`
-
-- Type: `@vtex/shoreline-primitives.LocaleProviderProps`
-
-## Props
-
-### `children` (optional)
-
-- Type: `@types/react.React.ReactNode`
-
-### `locale` (optional)
-
-The BCP47 language code for the locale.
-
-- Type: `string`
diff --git a/packages/docs/pages/components/visually-hidden.mdx b/packages/docs/pages/components/visually-hidden.mdx
index 8b1d250de4..fdb570348f 100644
--- a/packages/docs/pages/components/visually-hidden.mdx
+++ b/packages/docs/pages/components/visually-hidden.mdx
@@ -1,5 +1,13 @@
 # VisuallyHidden
 
-Renders an element that is visually only to screen readers.
+<ComponentDescription name="visually-hidden" />
 
-![VisuallyHidden example](public/assets/overview-visually-hidden.webp)
\ No newline at end of file
+```jsx
+<a href="#">
+  Learn more<VisuallyHidden> about brazilian beaches</VisuallyHidden>
+</a>
+```
+
+## Optional props
+
+<PropsDocs name="visually-hidden" />
\ No newline at end of file
diff --git a/packages/docs/pages/components/visually-hidden/_meta.json b/packages/docs/pages/components/visually-hidden/_meta.json
deleted file mode 100644
index dd335de314..0000000000
--- a/packages/docs/pages/components/visually-hidden/_meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "api-reference": "API Reference" }
diff --git a/packages/docs/pages/components/visually-hidden/api-reference.mdx b/packages/docs/pages/components/visually-hidden/api-reference.mdx
deleted file mode 100644
index fde723997b..0000000000
--- a/packages/docs/pages/components/visually-hidden/api-reference.mdx
+++ /dev/null
@@ -1,21 +0,0 @@
-# API Reference
-
-Renders an element that is visually only to screen readers
-
-```jsx
-<a href="#">
-  Learn more<VisuallyHidden> about brazilian beaches</VisuallyHidden>
-</a>
-```
-
-## Parameters
-
-### `props`
-
-- Type: `@vtex/shoreline-primitives.VisuallyHiddenProps & @types/react.React.RefAttributes<typescript.HTMLDivElement>`
-
-## Props
-
-### `children` (optional)
-
-- Type: `@types/react.React.ReactNode`
diff --git a/packages/docs/scripts/build-props.mjs b/packages/docs/scripts/build-props.mjs
index cda74c7bf9..808aab5e11 100644
--- a/packages/docs/scripts/build-props.mjs
+++ b/packages/docs/scripts/build-props.mjs
@@ -30,7 +30,6 @@ const files = [
   getPath('primitives', 'select', 'select-item'),
   getPath('primitives', 'select', 'select-item-check'),
   getPath('primitives', 'visually-hidden', 'visually-hidden'),
-
   /**
    * Components
    */
@@ -46,6 +45,80 @@ const files = [
   getPath('components', 'content', 'content'),
   getPath('components', 'content', 'container'),
   getPath('components', 'contextual-help', 'contextual-help'),
+  getPath('components', 'divider', 'divider'),
+  getPath('components', 'empty-state', 'empty-state'),
+  getPath('components', 'field', 'field'),
+  getPath('components', 'field', 'field-provider'),
+  getPath('components', 'field', 'field-error'),
+  getPath('components', 'field', 'field-description'),
+  getPath('components', 'field', 'field-char-counter'),
+  getPath('components', 'filter', 'filter'),
+  getPath('components', 'filter', 'filter-value'),
+  getPath('components', 'filter', 'filter-trigger'),
+  getPath('components', 'filter', 'filter-provider'),
+  getPath('components', 'filter', 'filter-popover'),
+  getPath('components', 'filter', 'filter-list'),
+  getPath('components', 'filter', 'filter-list-skeleton'),
+  getPath('components', 'filter', 'filter-item'),
+  getPath('components', 'filter', 'filter-item-check'),
+  getPath('components', 'filter', 'filter-clear'),
+  getPath('components', 'filter', 'filter-apply'),
+  getPath('components', 'flex', 'flex'),
+  getPath('components', 'grid', 'grid'),
+  getPath('components', 'grid', 'grid-cell'),
+  getPath('components', 'heading', 'heading'),
+  getPath('components', 'icon-button', 'icon-button'),
+  getPath('components', 'input', 'input'),
+  getPath('components', 'label', 'label'),
+  getPath('components', 'link', 'link'),
+  getPath('components', 'menu', 'menu'),
+  getPath('components', 'menu', 'menu-trigger'),
+  getPath('components', 'menu', 'menu-separator'),
+  getPath('components', 'menu', 'menu-provider'),
+  getPath('components', 'menu', 'menu-popover'),
+  getPath('components', 'menu', 'menu-item'),
+  getPath('components', 'modal', 'modal'),
+  getPath('components', 'modal', 'modal-heading'),
+  getPath('components', 'modal', 'modal-header'),
+  getPath('components', 'modal', 'modal-footer'),
+  getPath('components', 'modal', 'modal-dismiss'),
+  getPath('components', 'modal', 'modal-content'),
+  getPath('components', 'page', 'page'),
+  getPath('components', 'page', 'page-heading'),
+  getPath('components', 'page', 'page-header'),
+  getPath('components', 'page', 'page-content'),
+  getPath('components', 'pagination', 'pagination'),
+  getPath('components', 'popover', 'popover'),
+  getPath('components', 'popover', 'popover-trigger'),
+  getPath('components', 'popover', 'popover-provider'),
+  getPath('components', 'popover', 'popover-dismiss'),
+  getPath('components', 'radio', 'radio'),
+  getPath('components', 'radio', 'radio-group'),
+  getPath('components', 'search', 'search'),
+  getPath('components', 'select', 'select'),
+  getPath('components', 'skeleton', 'skeleton'),
+  getPath('components', 'slot', 'slot'),
+  getPath('components', 'spinner', 'spinner'),
+  getPath('components', 'stack', 'stack'),
+  getPath('components', 'tab', 'tab'),
+  getPath('components', 'tab', 'tab-provider'),
+  getPath('components', 'tab', 'tab-panel'),
+  getPath('components', 'tab', 'tab-list'),
+  getPath('components', 'table', 'table'),
+  getPath('components', 'table', 'table-sort-indicator'),
+  getPath('components', 'table', 'table-row'),
+  getPath('components', 'table', 'table-header'),
+  getPath('components', 'table', 'table-header-cell'),
+  getPath('components', 'table', 'table-cell'),
+  getPath('components', 'table', 'table-body'),
+  getPath('components', 'tag', 'tag'),
+  getPath('components', 'text', 'text'),
+  getPath('components', 'textarea', 'textarea'),
+  getPath('components', 'tooltip', 'tooltip'),
+  getPath('components', 'tooltip', 'tooltip-trigger'),
+  getPath('components', 'tooltip', 'tooltip-provider'),
+  getPath('components', 'tooltip', 'tooltip-popover'),
+  getPath('components', 'tooltip', 'tooltip-arrow'),
 ]
 
 let tsCode = `
diff --git a/packages/primitives/src/compose/composable.tsx b/packages/primitives/src/compose/composable.tsx
index 5f5796bee8..d1cf341729 100644
--- a/packages/primitives/src/compose/composable.tsx
+++ b/packages/primitives/src/compose/composable.tsx
@@ -25,7 +25,13 @@ export function isComposable(child: ReactNode): child is ReactElement {
 }
 
 export interface ComposableOptions {
+  /**
+   * Render function. Use it to wrap the root with containers
+   */
   render?: RenderProps
+  /**
+   * Defines the composition root
+   */
   children: ReactNode
 }
 
diff --git a/packages/primitives/src/compose/compose.tsx b/packages/primitives/src/compose/compose.tsx
index 64961815b0..543a90b4f0 100644
--- a/packages/primitives/src/compose/compose.tsx
+++ b/packages/primitives/src/compose/compose.tsx
@@ -29,7 +29,10 @@ export const Compose = forwardRef<any, ComposeProps>(function Compose(
   )
 })
 
-export interface ComposeOptions extends HTMLAttributes<HTMLElement> {
+export interface ComposeOptions {
+  /**
+   * Children to compose
+   */
   children?: ReactNode
 }