diff --git a/packages/features/calendars/weeklyview/components/calendar.stories.mdx b/packages/features/calendars/weeklyview/components/calendar.stories.mdx
index 2ba17e64fd..1aeea475b5 100644
--- a/packages/features/calendars/weeklyview/components/calendar.stories.mdx
+++ b/packages/features/calendars/weeklyview/components/calendar.stories.mdx
@@ -55,15 +55,31 @@ export const Template = (args) => ;
diff --git a/packages/ui/components/alert/alert.stories.mdx b/packages/ui/components/alert/alert.stories.mdx
index 0f2186a106..cfd93b8088 100644
--- a/packages/ui/components/alert/alert.stories.mdx
+++ b/packages/ui/components/alert/alert.stories.mdx
@@ -35,23 +35,37 @@ Each alert has a state to represent neutral, positive or negative responses.
diff --git a/packages/ui/components/avatar/avatar.stories.mdx b/packages/ui/components/avatar/avatar.stories.mdx
index 5e7d5fbe31..671a780a62 100644
--- a/packages/ui/components/avatar/avatar.stories.mdx
+++ b/packages/ui/components/avatar/avatar.stories.mdx
@@ -125,14 +125,29 @@ Avatar group can be composed differently based on the number of user profile.
diff --git a/packages/ui/components/badge/badge.stories.mdx b/packages/ui/components/badge/badge.stories.mdx
index 817d6dcfac..d3233ca2d4 100644
--- a/packages/ui/components/badge/badge.stories.mdx
+++ b/packages/ui/components/badge/badge.stories.mdx
@@ -56,28 +56,32 @@ Alet badge is used in conjunction with an item, profile or label to indicate num
diff --git a/packages/ui/components/button/button.stories.mdx b/packages/ui/components/button/button.stories.mdx
index c40d65bd37..fbdc1a6cca 100644
--- a/packages/ui/components/button/button.stories.mdx
+++ b/packages/ui/components/button/button.stories.mdx
@@ -1,5 +1,15 @@
import { Canvas, Meta, Story, ArgsTable } from '@storybook/addon-docs';
-import { Examples, Example, Note, Title, VariantsTable, VariantColumn, RowTitles, CustomArgsTable} from '@calcom/storybook/components'
+import {
+ Examples,
+ Example,
+ Note,
+ Title,
+ VariantsTable,
+ VariantColumn,
+ RowTitles,
+ CustomArgsTable,
+ VariantRow
+} from "@calcom/storybook/components";
import { Plus, X } from '../icon';
import { Button } from './Button';
@@ -87,7 +97,6 @@ Button are clickable elements that initiates user actions. Labels in the button
-
diff --git a/packages/ui/components/buttonGroup/buttongroup.stories.mdx b/packages/ui/components/buttonGroup/buttongroup.stories.mdx
index 4ae04619fa..7201ed4b90 100644
--- a/packages/ui/components/buttonGroup/buttongroup.stories.mdx
+++ b/packages/ui/components/buttonGroup/buttongroup.stories.mdx
@@ -47,7 +47,7 @@ Button group enables multiple buttons to be combined into a single unit. It offe
+
+
diff --git a/packages/ui/components/card/card.stories.mdx b/packages/ui/components/card/card.stories.mdx
index c58d101120..69b83f88c9 100644
--- a/packages/ui/components/card/card.stories.mdx
+++ b/packages/ui/components/card/card.stories.mdx
@@ -22,19 +22,37 @@ export const tip = {
diff --git a/packages/ui/components/empty-screen/empty-screen.stories.mdx b/packages/ui/components/empty-screen/empty-screen.stories.mdx
index d769dc393b..9d083982c7 100644
--- a/packages/ui/components/empty-screen/empty-screen.stories.mdx
+++ b/packages/ui/components/empty-screen/empty-screen.stories.mdx
@@ -13,16 +13,36 @@ The CTA button can prompt the user to add the info/ apps needed for the page.
diff --git a/packages/ui/components/form/checkbox/checkbox.stories.mdx b/packages/ui/components/form/checkbox/checkbox.stories.mdx
index ed23692733..16243c02d1 100644
--- a/packages/ui/components/form/checkbox/checkbox.stories.mdx
+++ b/packages/ui/components/form/checkbox/checkbox.stories.mdx
@@ -45,20 +45,45 @@ Checkboxes are used in forms and databases to indicate an answer to a question,
diff --git a/packages/ui/components/form/select/select.stories.mdx b/packages/ui/components/form/select/select.stories.mdx
index cc4f29bef2..32b5ff9014 100644
--- a/packages/ui/components/form/select/select.stories.mdx
+++ b/packages/ui/components/form/select/select.stories.mdx
@@ -112,6 +112,10 @@ const GoodSelect = props =>
## Select Story
diff --git a/packages/ui/components/toast/toast.stories.mdx b/packages/ui/components/toast/toast.stories.mdx
index 36eaa81f04..4a49c82e46 100644
--- a/packages/ui/components/toast/toast.stories.mdx
+++ b/packages/ui/components/toast/toast.stories.mdx
@@ -1,5 +1,15 @@
import { Canvas, Meta, Story, ArgsTable } from '@storybook/addon-docs';
-import { Examples, Example, Note, Title, VariantsTable, VariantColumn, RowTitles, CustomArgsTable} from '@calcom/storybook/components'
+import {
+ Examples,
+ Example,
+ Note,
+ Title,
+ VariantsTable,
+ VariantColumn,
+ RowTitles,
+ CustomArgsTable,
+ VariantRow
+} from "@calcom/storybook/components";
import { SuccessToast,ErrorToast,WarningToast,DefaultToast } from './';
@@ -30,3 +40,28 @@ Toasts are used to show an action has had a impact. If a user submits a form a t
+
+## Toast Story
+
+
diff --git a/packages/ui/components/tooltip/tooltip.stories.mdx b/packages/ui/components/tooltip/tooltip.stories.mdx
index 2d7e7e8fb0..a09c727fd5 100644
--- a/packages/ui/components/tooltip/tooltip.stories.mdx
+++ b/packages/ui/components/tooltip/tooltip.stories.mdx
@@ -15,21 +15,46 @@ Tooltip components can be used to provide additional information about an elemen
diff --git a/packages/ui/components/top-banner/topbanner.stories.mdx b/packages/ui/components/top-banner/topbanner.stories.mdx
index 72e7886a36..44a53efbe1 100644
--- a/packages/ui/components/top-banner/topbanner.stories.mdx
+++ b/packages/ui/components/top-banner/topbanner.stories.mdx
@@ -62,3 +62,41 @@ Each toast has a state to represent neutral, positive or negative responses.
/>
+
+