diff --git a/src/package/website-blocks/box.tsx b/src/package/website-blocks/box.tsx
deleted file mode 100644
index 7cba69b..0000000
--- a/src/package/website-blocks/box.tsx
+++ /dev/null
@@ -1,65 +0,0 @@
-import * as React from "react";
-import { Image, SelectOption, Styles } from "../controls";
-import { registerChaiBlock } from "../runtime/builder-blocks";
-import { isEmpty } from "lodash-es";
-import EmptySlot from "./empty-slot";
-
-const BoxBlock = React.memo(
-  (
-    props: any & {
-      children: React.ReactNode;
-      styles: any;
-      tag: string;
-      backgroundImage: string;
-      blockProps: Record<string, string>;
-    },
-  ) => {
-    const { blockProps, backgroundImage, children, tag = "div", styles } = props;
-
-    if (!children && isEmpty(styles?.className)) {
-      return <EmptySlot blockProps={blockProps} styles={styles} />;
-    }
-    let cssStyles = {};
-    if (backgroundImage) {
-      cssStyles = { backgroundImage: `url(${backgroundImage})` };
-    }
-
-    return React.createElement(tag, { ...blockProps, ...styles, style: cssStyles }, children);
-  },
-);
-
-registerChaiBlock(BoxBlock, {
-  type: "Box",
-  label: "Box",
-  category: "core",
-  group: "basic",
-  props: {
-    styles: Styles({ default: "" }),
-    tag: SelectOption({
-      title: "Tag",
-      default: "div",
-      options: [
-        { value: "div", title: "div" },
-        { value: "header", title: "header" },
-        { value: "footer", title: "footer" },
-        { value: "section", title: "section" },
-        { value: "article", title: "article" },
-        { value: "aside", title: "aside" },
-        { value: "main", title: "main" },
-        { value: "nav", title: "nav" },
-        { value: "figure", title: "figure" },
-        { value: "details", title: "details" },
-        { value: "summary", title: "summary" },
-        { value: "dialog", title: "dialog" },
-        { value: "strike", title: "strike" },
-        { value: "caption", title: "caption" },
-        { value: "legend", title: "legend" },
-        { value: "figcaption", title: "figcaption" },
-        { value: "mark", title: "mark" },
-      ],
-    }),
-    backgroundImage: Image({ title: "Background Image" }),
-  },
-});
-
-export default BoxBlock;
diff --git a/src/package/website-blocks/button.tsx b/src/package/website-blocks/button.tsx
deleted file mode 100644
index ccc7934..0000000
--- a/src/package/website-blocks/button.tsx
+++ /dev/null
@@ -1,53 +0,0 @@
-import * as React from "react";
-import { ButtonIcon } from "@radix-ui/react-icons";
-import { Icon, Link, SelectOption, Numeric, SingleLineText, Styles } from "../controls";
-import { registerChaiBlock } from "../runtime/builder-blocks";
-import { ChaiBlock } from "../helper/types/ChaiBlock.ts";
-
-const ButtonBlock = (
-  block: ChaiBlock & {
-    blockProps: Record<string, string>;
-    styles: Record<string, string>;
-  },
-) => {
-  const { blockProps, iconSize, icon, content, iconPos, styles, children } = block;
-  const _icon = icon;
-  const child = children || (
-    <>
-      {content}
-      {_icon && (
-        <div
-          style={{ width: iconSize + "px" }}
-          className={iconPos + (iconPos === "order-first" ? " mr-2" : "ml-2") || ""}
-          dangerouslySetInnerHTML={{ __html: _icon }}
-        />
-      )}
-    </>
-  );
-  return React.createElement("button", { ...blockProps, ...styles, type: "button" }, child);
-};
-
-registerChaiBlock(ButtonBlock, {
-  type: "Button",
-  label: "Button",
-  category: "core",
-  icon: ButtonIcon,
-  group: "basic",
-  props: {
-    content: SingleLineText({ title: "Label", default: "Button", multiLingual: true }),
-    styles: Styles({ default: "text-white bg-primary px-4 py-2 rounded-global flex items-center" }),
-    link: Link({ title: "Link", default: { type: "page", href: "", target: "_blank" } }),
-    icon: Icon({ title: "Icon", default: "" }),
-    iconSize: Numeric({ title: "Icon Size", default: 24 }),
-    iconPos: SelectOption({
-      title: "Icon Position",
-      default: "order-last",
-      options: [
-        { title: "Start", value: "order-first" },
-        { title: "End", value: "order-last" },
-      ],
-    }),
-  },
-});
-
-export default ButtonBlock;
diff --git a/src/package/website-blocks/chaibuilder-link.tsx b/src/package/website-blocks/chaibuilder-link.tsx
deleted file mode 100644
index ea91e37..0000000
--- a/src/package/website-blocks/chaibuilder-link.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-type LinkProps = {
-  inBuilder?: boolean;
-  style?: Record<string, string>;
-  href: string;
-  children: any;
-};
-const ChaiBuilderLink = ({
-  inBuilder = false,
-  style = {},
-  href,
-  children,
-}: LinkProps) => {
-  if (inBuilder) {
-    return (
-      <span data-simulate={"a"} {...style}>
-        {children}
-      </span>
-    );
-  }
-
-  return (
-    <a href={href} {...style}>
-      {children}
-    </a>
-  );
-};
-
-export default ChaiBuilderLink;
diff --git a/src/package/website-blocks/custom-html.tsx b/src/package/website-blocks/custom-html.tsx
deleted file mode 100644
index 165ba23..0000000
--- a/src/package/website-blocks/custom-html.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import * as React from "react";
-import { CodeIcon } from "@radix-ui/react-icons";
-import { MultilineText, Styles } from "../controls";
-import { registerChaiBlock } from "../runtime/builder-blocks";
-import { ChaiBlock } from "../helper/types/ChaiBlock.ts";
-
-const CustomHTMLBlock = React.memo(
-  (
-    props: ChaiBlock & {
-      blockProps: Record<string, string>;
-      styles: Record<string, string>;
-    },
-  ) => {
-    const { blockProps, styles, content } = props;
-    return React.createElement("div", {
-      ...styles,
-      ...blockProps,
-      dangerouslySetInnerHTML: { __html: content },
-    });
-  },
-);
-
-registerChaiBlock(CustomHTMLBlock as React.FC<any>, {
-  type: "CustomHTML",
-  label: "CustomHTML",
-  category: "core",
-  icon: CodeIcon,
-  group: "basic",
-  props: {
-    styles: Styles({ default: "" }),
-    content: MultilineText({
-      title: "HTML Content",
-      default: "",
-      placeholder: "Enter custom HTML code here",
-    }),
-  },
-});
-
-export default CustomHTMLBlock;
diff --git a/src/package/website-blocks/divider.tsx b/src/package/website-blocks/divider.tsx
deleted file mode 100644
index 1893ec5..0000000
--- a/src/package/website-blocks/divider.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import * as React from "react";
-import { DividerHorizontalIcon } from "@radix-ui/react-icons";
-import { Styles } from "../controls";
-import { registerChaiBlock } from "../runtime/builder-blocks";
-import { ChaiBlock } from "../helper/types/ChaiBlock.ts";
-
-/**
- * Divider component
- * @param props
- * @constructor
- */
-const DividerBlock = (
-  props: ChaiBlock & {
-    blockProps: Record<string, string>;
-    styles: Record<string, string>;
-  },
-) => {
-  const { blockProps, styles } = props;
-  return React.createElement("hr", { ...styles, ...blockProps });
-};
-
-registerChaiBlock(DividerBlock, {
-  type: "Divider",
-  label: "Divider",
-  category: "core",
-  icon: DividerHorizontalIcon,
-  group: "basic",
-  props: {
-    styles: Styles({ default: "bg-gray-900 h-0.5 py-2 my-1" }),
-  },
-});
-
-export default DividerBlock;
diff --git a/src/package/website-blocks/empty-slot.tsx b/src/package/website-blocks/empty-slot.tsx
deleted file mode 100644
index 041b45b..0000000
--- a/src/package/website-blocks/empty-slot.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import { omit } from "lodash-es";
-import { cn } from "../helper/lib";
-
-type EmptySlotProps = {
-  blockProps?: any;
-  className?: any;
-  text?: string;
-  styles?: any;
-};
-const EmptySlot = ({ blockProps, className = "", styles = {} }: EmptySlotProps) => {
-  return (
-    <div
-      {...blockProps}
-      className={cn("flex h-20 flex-col items-center justify-center", className)}
-      {...omit(styles, ["className"])}>
-      <div className="flex h-full w-full items-center justify-center  outline-dashed outline-1 -outline-offset-1 outline-gray-400 duration-300">
-        <span className="opacit flex items-center gap-x-1.5 text-xs font-semibold text-gray-400"></span>
-      </div>
-    </div>
-  );
-};
-
-export default EmptySlot;
diff --git a/src/package/website-blocks/form/checkbox.tsx b/src/package/website-blocks/form/checkbox.tsx
deleted file mode 100644
index d6a00cf..0000000
--- a/src/package/website-blocks/form/checkbox.tsx
+++ /dev/null
@@ -1,63 +0,0 @@
-import { CheckboxIcon } from "@radix-ui/react-icons";
-import { Checkbox, SingleLineText, Styles } from "../../controls";
-import { ChaiBlock } from "../../helper/types/ChaiBlock.ts";
-import { generateUUID } from "../../helper/lib.ts";
-import { registerChaiBlock } from "../../runtime";
-
-const CheckboxBlock = (
-  block: ChaiBlock & {
-    blockProps: Record<string, string>;
-    styles: Record<string, string>;
-    inputStyles: Record<string, string>;
-    required: boolean;
-    checked: boolean;
-  },
-) => {
-  const { blockProps, fieldName, label, styles, inputStyles, required, checked, showLabel = true } = block;
-  const fieldId = generateUUID();
-
-  if (!showLabel)
-    return (
-      <input
-        id={fieldId}
-        {...blockProps}
-        {...inputStyles}
-        {...styles}
-        type="checkbox"
-        required={required}
-        name={fieldName}
-      />
-    );
-
-  return (
-    <div {...styles} {...blockProps}>
-      <input
-        {...inputStyles}
-        name={fieldName}
-        id={fieldId}
-        type="checkbox"
-        required={required}
-        defaultChecked={checked}
-      />
-      {label && label !== "Label" && <label htmlFor={fieldId}>{label}</label>}
-    </div>
-  );
-};
-
-registerChaiBlock(CheckboxBlock, {
-  type: "Checkbox",
-  label: "Checkbox",
-  category: "core",
-  icon: CheckboxIcon,
-  group: "form",
-  hidden: true,
-  props: {
-    fieldName: SingleLineText({ title: "Field Name", default: "checkbox" }),
-    styles: Styles({ default: "flex items-center gap-x-2" }),
-    label: SingleLineText({ title: "Label", default: "Label" }),
-    checked: Checkbox({ title: "Checked", default: false }),
-    required: Checkbox({ title: "Required", default: false }),
-  },
-});
-
-export default CheckboxBlock;
diff --git a/src/package/website-blocks/form/form-button.tsx b/src/package/website-blocks/form/form-button.tsx
deleted file mode 100644
index 74e27e9..0000000
--- a/src/package/website-blocks/form/form-button.tsx
+++ /dev/null
@@ -1,60 +0,0 @@
-import { ButtonIcon } from "@radix-ui/react-icons";
-import { Icon, SelectOption, SingleLineText, Styles } from "../../controls";
-import { registerChaiBlock } from "../../runtime";
-import { ChaiBlock } from "../../helper/types/ChaiBlock.ts";
-import { generateUUID } from "../../helper/lib.ts";
-const FormButtonBlock = (
-  block: ChaiBlock & {
-    blockProps: Record<string, string>;
-    styles: Record<string, string>;
-    inputStyles: Record<string, string>;
-  },
-) => {
-  const { blockProps, inBuilder, label, placeholder, styles, inputStyles, icon, iconPos } = block;
-  const fieldId = generateUUID();
-
-  // alpine js attrs
-  const attrs = {
-    "x-bind:disabled": "formLoading",
-  };
-
-  return (
-    <button
-      id={fieldId}
-      {...attrs}
-      {...inputStyles}
-      {...styles}
-      {...(blockProps || {})}
-      type={inBuilder ? "button" : "submit"}
-      placeholder={placeholder}>
-      {label}
-      {icon && <span className={iconPos} dangerouslySetInnerHTML={{ __html: icon }} />}
-    </button>
-  );
-};
-
-registerChaiBlock(FormButtonBlock, {
-  type: "FormButton",
-  label: "Submit Button",
-  category: "core",
-  icon: ButtonIcon,
-  group: "form",
-  hidden: true,
-  props: {
-    label: SingleLineText({ title: "Label", default: "Submit" }),
-    styles: Styles({
-      default: "text-white bg-primary disabled:bg-gray-400 px-4 py-2 rounded-global flex items-center gap-x-2",
-    }),
-    icon: Icon({ title: "Icon", default: "" }),
-    iconPos: SelectOption({
-      title: "Icon Position",
-      default: "order-last",
-      options: [
-        { title: "Start", value: "order-first" },
-        { title: "End", value: "order-last" },
-      ],
-    }),
-  },
-});
-
-export default FormButtonBlock;
diff --git a/src/package/website-blocks/form/form.tsx b/src/package/website-blocks/form/form.tsx
deleted file mode 100644
index 96b0453..0000000
--- a/src/package/website-blocks/form/form.tsx
+++ /dev/null
@@ -1,103 +0,0 @@
-import * as React from "react";
-import { isEmpty } from "lodash-es";
-import { GroupIcon, LetterCaseToggleIcon } from "@radix-ui/react-icons";
-import { RichText, SingleLineText, Styles } from "../../controls";
-import { registerChaiBlock } from "../../runtime";
-import EmptySlot from "../empty-slot.tsx";
-import { ChaiBlock } from "../../helper/types/ChaiBlock.ts";
-
-const FormBlock = (
-  props: ChaiBlock & {
-    children: React.ReactNode;
-    styles: any;
-    tag: string;
-    inBuilder: boolean;
-    blockProps: Record<string, string>;
-  },
-) => {
-  const { blockProps, errorMessage, name, _type, successMessage, action, styles, children } = props;
-
-  if (!children && isEmpty(styles?.className)) {
-    return <EmptySlot blockProps={blockProps} text="FORM FIELDS" />;
-  }
-
-  const alpineAttrs = {
-    "x-data": "useForm",
-    "x-on:submit.prevent": "post",
-  };
-  const formResponseAttr = {
-    "x-html": "formResponse",
-    ":class": "{'text-red-500': formStatus === 'ERROR', 'text-green-500': formStatus === 'SUCCESS'}",
-  };
-  return (
-    <form
-      {...alpineAttrs}
-      data-error={errorMessage}
-      data-success={successMessage}
-      method={"post"}
-      action={action}
-      {...blockProps}
-      {...styles}>
-      <div {...formResponseAttr}></div>
-      <input name={"formname"} type={"hidden"} value={name || _type} />
-      {children}
-    </form>
-  );
-};
-
-export default FormBlock;
-
-registerChaiBlock(FormBlock, {
-  type: "Form",
-  label: "Form",
-  category: "core",
-  icon: GroupIcon,
-  group: "form",
-  hidden: true,
-  props: {
-    styles: Styles({ default: "" }),
-    action: SingleLineText({
-      title: "Submit URL",
-      default: "/api/form/submit",
-    }),
-    errorMessage: RichText({
-      title: "Error Message",
-      default: "Something went wrong. Please try again",
-    }),
-    successMessage: RichText({
-      title: "Success Message",
-      default: "Thank you for your submission.",
-    }),
-  },
-});
-
-const LabelBlock = (
-  props: ChaiBlock & {
-    children: React.ReactNode;
-    styles: any;
-    content: string;
-    blockProps: Record<string, string>;
-  },
-) => {
-  const { blockProps, content, styles, children } = props;
-  const labelProps = { ...styles, ...blockProps };
-
-  if (children) return React.createElement("label", labelProps, children);
-  return React.createElement("label", {
-    ...labelProps,
-    dangerouslySetInnerHTML: { __html: content },
-  });
-};
-
-registerChaiBlock(LabelBlock, {
-  type: "Label",
-  label: "Label",
-  category: "core",
-  icon: LetterCaseToggleIcon,
-  group: "form",
-  hidden: true,
-  props: {
-    styles: Styles({ default: "" }),
-    content: SingleLineText({ title: "Content", default: "Label" }),
-  },
-});
diff --git a/src/package/website-blocks/form/input.tsx b/src/package/website-blocks/form/input.tsx
deleted file mode 100644
index 9f8d7f2..0000000
--- a/src/package/website-blocks/form/input.tsx
+++ /dev/null
@@ -1,100 +0,0 @@
-import * as React from "react";
-import { InputIcon } from "@radix-ui/react-icons";
-import { map } from "lodash-es";
-import { Checkbox, SelectOption, SingleLineText, Styles } from "../../controls";
-import { registerChaiBlock } from "../../runtime";
-import { ChaiBlock } from "../../helper/types/ChaiBlock.ts";
-import { generateUUID } from "../../helper/lib.ts";
-
-const InputBlock = (
-  block: ChaiBlock & {
-    inBuilder: boolean;
-    blockProps: Record<string, string>;
-    styles: Record<string, string>;
-    inputStyles: Record<string, string>;
-    required: boolean;
-    value: string;
-    name: string;
-  },
-) => {
-  const {
-    blockProps,
-    label,
-    placeholder,
-    styles,
-    inputStyles,
-    showLabel,
-    required,
-    inputType = "text",
-    inBuilder,
-    fieldName,
-  } = block;
-  const fieldId = generateUUID();
-
-  if (!showLabel || inputType === "submit") {
-    if (inputType === "submit") blockProps.value = label;
-
-    return (
-      <input
-        id={fieldId}
-        name={fieldName}
-        readOnly={inBuilder}
-        {...blockProps}
-        {...inputStyles}
-        {...styles}
-        type={inputType}
-        placeholder={placeholder}
-        required={required}
-      />
-    );
-  }
-  return (
-    <div {...styles} {...blockProps}>
-      {showLabel && <label htmlFor={fieldId}>{label}</label>}
-      <input
-        name={fieldName}
-        readOnly={inBuilder}
-        {...inputStyles}
-        id={fieldId}
-        type={inputType}
-        placeholder={placeholder}
-        required={required}
-      />
-    </div>
-  );
-};
-
-registerChaiBlock(InputBlock as React.FC<any>, {
-  type: "Input",
-  label: "Input",
-  category: "core",
-  icon: InputIcon,
-  group: "form",
-  hidden: true,
-  props: {
-    styles: Styles({ default: "" }),
-    fieldName: SingleLineText({ title: "Field Name", default: "input" }),
-    inputType: SelectOption({
-      title: "Type",
-      options: map(
-        ["text", "email", "password", "number", "tel", "file", "hidden", "range", "submit", "color", "date", "time"],
-        (type) => ({
-          value: type,
-          title: type,
-        }),
-      ),
-      default: "text",
-    }),
-    value: SingleLineText({ title: "Value", default: "" }),
-    showLabel: Checkbox({ title: "Show label", default: true }),
-    inputStyles: Styles({ default: "w-full p-1" }),
-    label: SingleLineText({ title: "Label", default: "Label" }),
-    placeholder: SingleLineText({
-      title: "Placeholder",
-      default: "Placeholder",
-    }),
-    required: Checkbox({ title: "Required", default: false }),
-  },
-});
-
-export default InputBlock;
diff --git a/src/package/website-blocks/form/radio.tsx b/src/package/website-blocks/form/radio.tsx
deleted file mode 100644
index 4806aa4..0000000
--- a/src/package/website-blocks/form/radio.tsx
+++ /dev/null
@@ -1,56 +0,0 @@
-import { RadiobuttonIcon } from "@radix-ui/react-icons";
-import { Checkbox, SingleLineText, Styles } from "../../controls";
-import { registerChaiBlock } from "../../runtime";
-import { generateUUID } from "../../helper/lib.ts";
-import { ChaiBlock } from "../../helper/types/ChaiBlock.ts";
-
-const RadioBlock = (
-  block: ChaiBlock & {
-    blockProps: Record<string, string>;
-    styles: Record<string, string>;
-    inputStyles: Record<string, string>;
-    required: boolean;
-    checked: boolean;
-  },
-) => {
-  const { blockProps, fieldName, label, styles, inputStyles, checked, required, showLabel = true } = block;
-  const fieldId = generateUUID();
-
-  if (!showLabel)
-    return (
-      <input
-        id={fieldId}
-        {...blockProps}
-        {...inputStyles}
-        {...styles}
-        type="radio"
-        required={required}
-        checked={checked}
-        name={fieldName}
-      />
-    );
-  return (
-    <div {...styles} {...blockProps}>
-      <input {...inputStyles} name={fieldName} id={fieldId} type="radio" required={required} defaultChecked={checked} />
-      {label && <label htmlFor={fieldId}>{label}</label>}
-    </div>
-  );
-};
-
-registerChaiBlock(RadioBlock, {
-  type: "Radio",
-  label: "Radio",
-  category: "core",
-  icon: RadiobuttonIcon,
-  group: "form",
-  hidden: true,
-  props: {
-    styles: Styles({ default: "flex items-center w-max gap-x-2" }),
-    fieldName: SingleLineText({ title: "Field Name", default: "radio" }),
-    label: SingleLineText({ title: "Label", default: "Label" }),
-    checked: Checkbox({ title: "Checked", default: false }),
-    required: Checkbox({ title: "Required", default: false }),
-  },
-});
-
-export default RadioBlock;
diff --git a/src/package/website-blocks/form/select.tsx b/src/package/website-blocks/form/select.tsx
deleted file mode 100644
index 269fabf..0000000
--- a/src/package/website-blocks/form/select.tsx
+++ /dev/null
@@ -1,110 +0,0 @@
-import { DropdownMenuIcon } from "@radix-ui/react-icons";
-import { get, map } from "lodash-es";
-import { Checkbox, List, SingleLineText, Styles } from "../../controls";
-import { registerChaiBlock } from "../../runtime";
-import { ChaiBlock } from "../../helper/types/ChaiBlock.ts";
-import { generateUUID } from "../../helper/lib.ts";
-
-const SelectBlock = (
-  block: ChaiBlock & {
-    blockProps: Record<string, string>;
-    styles: Record<string, string>;
-    inputStyles: Record<string, string>;
-    required: boolean;
-    options: { label: string; value: string }[];
-  },
-) => {
-  const {
-    blockProps,
-    fieldName,
-    label,
-    placeholder,
-    styles,
-    inputStyles,
-    required,
-    showLabel,
-    _multiple = false,
-  } = block;
-  const fieldId = generateUUID();
-
-  if (!showLabel) {
-    return (
-      <select
-        id={fieldId}
-        {...styles}
-        {...blockProps}
-        placeholder={placeholder}
-        required={required}
-        multiple={_multiple as boolean}
-        name={fieldName}>
-        <option value="" disabled selected hidden>
-          {placeholder}
-        </option>
-        {map(block.options, (option) => (
-          <option
-            selected={get(option, "selected", false)}
-            key={option.value}
-            value={option.value}
-            dangerouslySetInnerHTML={{ __html: option.label }}
-          />
-        ))}
-      </select>
-    );
-  }
-
-  return (
-    <div {...styles}>
-      {showLabel && <label htmlFor={fieldId}>{label}</label>}
-      <select
-        {...inputStyles}
-        id={fieldId}
-        placeholder={placeholder}
-        required={required}
-        multiple={_multiple as boolean}
-        name={fieldName}>
-        <option value="" disabled selected hidden>
-          {placeholder}
-        </option>
-        {map(block.options, (option) => (
-          <option
-            key={option.value}
-            selected={get(option, "selected", false)}
-            value={option.value}
-            dangerouslySetInnerHTML={{ __html: option.label }}
-          />
-        ))}
-      </select>
-    </div>
-  );
-};
-
-registerChaiBlock(SelectBlock, {
-  type: "Select",
-  label: "Select",
-  category: "core",
-  icon: DropdownMenuIcon,
-  group: "form",
-  hidden: true,
-  props: {
-    styles: Styles({ default: "" }),
-    fieldName: SingleLineText({ title: "Field Name", default: "select" }),
-    showLabel: Checkbox({ title: "Show label", default: true }),
-    inputStyles: Styles({ default: "w-full p-1" }),
-    label: SingleLineText({ title: "Label", default: "Label" }),
-    placeholder: SingleLineText({
-      title: "Placeholder",
-      default: "Placeholder",
-    }),
-    required: Checkbox({ title: "Required", default: false }),
-    _multiple: Checkbox({ title: "Multiple Choice", default: false }),
-    options: List({
-      title: "Options",
-      itemProperties: {
-        label: SingleLineText({ title: "Label", default: "" }),
-        value: SingleLineText({ title: "Value", default: "" }),
-      },
-    }),
-  },
-});
-
-export default SelectBlock;
diff --git a/src/package/website-blocks/form/textarea.tsx b/src/package/website-blocks/form/textarea.tsx
deleted file mode 100644
index efa8da4..0000000
--- a/src/package/website-blocks/form/textarea.tsx
+++ /dev/null
@@ -1,63 +0,0 @@
-import { InputIcon } from "@radix-ui/react-icons";
-import { Checkbox, Numeric, SingleLineText, Styles } from "../../controls";
-import { registerChaiBlock } from "../../runtime";
-import { ChaiBlock } from "../../helper/types/ChaiBlock.ts";
-import { generateUUID } from "../../helper/lib.ts";
-
-const InputBlock = (
-  block: ChaiBlock & {
-    blockProps: Record<string, string>;
-    styles: Record<string, string>;
-    inputStyles: Record<string, string>;
-    required: boolean;
-    options: { label: string; value: string }[];
-    _rows: number;
-  },
-) => {
-  const { blockProps, fieldName, label, placeholder, styles, inputStyles, _rows, showLabel } = block;
-  const fieldId = generateUUID();
-
-  if (!showLabel) {
-    return (
-      <textarea
-        id={fieldId}
-        name={fieldName}
-        {...blockProps}
-        {...inputStyles}
-        {...styles}
-        placeholder={placeholder}
-        rows={_rows}
-      />
-    );
-  }
-
-  return (
-    <div {...styles} {...blockProps}>
-      {showLabel && <label htmlFor={fieldId}>{label}</label>}
-      <textarea name={fieldName} {...inputStyles} id={fieldId} placeholder={placeholder} rows={_rows} />
-    </div>
-  );
-};
-
-registerChaiBlock(InputBlock, {
-  type: "TextArea",
-  label: "TextArea",
-  category: "core",
-  icon: InputIcon,
-  group: "form",
-  hidden: true,
-  props: {
-    fieldName: SingleLineText({ title: "Field Name", default: "textarea" }),
-    showLabel: Checkbox({ title: "Show label", default: true }),
-    styles: Styles({ default: "" }),
-    inputStyles: Styles({ default: "w-full p-1" }),
-    label: SingleLineText({ title: "Label", default: "Label" }),
-    placeholder: SingleLineText({
-      title: "Placeholder",
-      default: "Placeholder",
-    }),
-    _rows: Numeric({ title: "Rows", default: 3 }),
-  },
-});
-
-export default InputBlock;
diff --git a/src/package/website-blocks/heading.tsx b/src/package/website-blocks/heading.tsx
deleted file mode 100644
index d993b55..0000000
--- a/src/package/website-blocks/heading.tsx
+++ /dev/null
@@ -1,55 +0,0 @@
-import * as React from "react";
-import { HeadingIcon } from "@radix-ui/react-icons";
-import { MultilineText, SelectOption, Styles } from "../controls";
-import { registerChaiBlock } from "../runtime/builder-blocks";
-import { ChaiBlock } from "../helper/types/ChaiBlock.ts";
-
-/**
- * Heading component
- * @param props
- * @constructor
- */
-const HeadingBlock = (
-  props: ChaiBlock & {
-    level: string;
-    blockProps: Record<string, string>;
-    styles: Record<string, string>;
-  },
-) => {
-  const { blockProps, styles, content, level = "h1", children = null } = props;
-
-  if (children) return React.createElement(level, { ...styles, ...blockProps }, children);
-
-  return React.createElement(level, {
-    ...styles,
-    ...blockProps,
-    dangerouslySetInnerHTML: { __html: content },
-  });
-};
-
-registerChaiBlock(HeadingBlock, {
-  type: "Heading",
-  label: "Heading",
-  category: "core",
-  icon: HeadingIcon,
-  group: "basic",
-  props: {
-    level: SelectOption({
-      title: "Level",
-      default: "h1",
-      binding: false,
-      options: [
-        { value: "h1", title: "h1" },
-        { value: "h2", title: "h2" },
-        { value: "h3", title: "h3" },
-        { value: "h4", title: "h4" },
-        { value: "h5", title: "h5" },
-        { value: "h6", title: "h6" },
-      ],
-    }),
-    styles: Styles({ default: "text-3xl" }),
-    content: MultilineText({ title: "Content", default: "Heading goes here" }),
-  },
-});
-
-export default HeadingBlock;
diff --git a/src/package/website-blocks/icon.tsx b/src/package/website-blocks/icon.tsx
deleted file mode 100644
index e5250bf..0000000
--- a/src/package/website-blocks/icon.tsx
+++ /dev/null
@@ -1,48 +0,0 @@
-import * as React from "react";
-import { SketchLogoIcon } from "@radix-ui/react-icons";
-import { Icon, Styles } from "../controls";
-import { registerChaiBlock } from "../runtime/builder-blocks";
-import { isEmpty } from "lodash-es";
-import EmptySlot from "./empty-slot";
-import { ChaiBlock } from "../helper/types/ChaiBlock.ts";
-import { cn } from "../helper/lib";
-
-const IconBlock = (
-  block: ChaiBlock & {
-    blockProps: Record<string, string>;
-    styles: Record<string, string>;
-  },
-) => {
-  const { blockProps, icon, styles } = block;
-  const iStyles = {
-    ...styles,
-    className: cn(styles.className, "inline-block c-inline-block"),
-  };
-
-  if (isEmpty(icon)) {
-    return <EmptySlot blockProps={blockProps} text="" className="h-8 w-14" />;
-  }
-
-  return React.createElement("span", {
-    ...blockProps,
-    ...iStyles,
-    dangerouslySetInnerHTML: { __html: icon },
-  });
-};
-
-registerChaiBlock(IconBlock, {
-  type: "Icon",
-  label: "Icon",
-  category: "core",
-  icon: SketchLogoIcon,
-  group: "basic",
-  props: {
-    styles: Styles({ default: "text-black" }),
-    icon: Icon({
-      title: "Icon",
-      default: `<svg stroke="currentColor" fill="currentColor" stroke-width="0" viewBox="0 0 16 16" height="1em" width="1em" xmlns="http://www.w3.org/2000/svg"><path d="M8 16c4.418 0 8-3.582 8-8s-3.582-8-8-8-8 3.582-8 8 3.582 8 8 8zM8 1.5c3.59 0 6.5 2.91 6.5 6.5s-2.91 6.5-6.5 6.5-6.5-2.91-6.5-6.5 2.91-6.5 6.5-6.5zM8 9.356c1.812 0 3.535-0.481 5-1.327-0.228 2.788-2.393 4.971-5 4.971s-4.772-2.186-5-4.973c1.465 0.845 3.188 1.329 5 1.329zM4 5.5c0-0.828 0.448-1.5 1-1.5s1 0.672 1 1.5c0 0.828-0.448 1.5-1 1.5s-1-0.672-1-1.5zM10 5.5c0-0.828 0.448-1.5 1-1.5s1 0.672 1 1.5c0 0.828-0.448 1.5-1 1.5s-1-0.672-1-1.5z"></path></svg>`,
-    }),
-  },
-});
-
-export default IconBlock;
diff --git a/src/package/website-blocks/iframe.tsx b/src/package/website-blocks/iframe.tsx
deleted file mode 100644
index 63ae587..0000000
--- a/src/package/website-blocks/iframe.tsx
+++ /dev/null
@@ -1,38 +0,0 @@
-import * as React from "react";
-import { MultilineText, Styles } from "../controls";
-import { registerChaiBlock } from "../runtime/builder-blocks";
-import { ChaiBlock } from "../helper/types/ChaiBlock.ts";
-
-const IframeBlock = React.memo(
-  (
-    props: ChaiBlock & {
-      blockProps: Record<string, string>;
-      styles: Record<string, string>;
-      src: string;
-    },
-  ) => {
-    const { blockProps, src, styles } = props;
-    return React.createElement("iframe", {
-      ...styles,
-      ...blockProps,
-      src,
-    });
-  },
-);
-
-registerChaiBlock(IframeBlock as React.ComponentType<any>, {
-  type: "Iframe",
-  label: "Iframe",
-  category: "core",
-  group: "basic",
-  props: {
-    styles: Styles({ default: "" }),
-    src: MultilineText({
-      title: "Source",
-      default: "",
-      placeholder: "Enter iframe source",
-    }),
-  },
-});
-
-export default IframeBlock;
diff --git a/src/package/website-blocks/image.tsx b/src/package/website-blocks/image.tsx
deleted file mode 100644
index 50188b9..0000000
--- a/src/package/website-blocks/image.tsx
+++ /dev/null
@@ -1,50 +0,0 @@
-import * as React from "react";
-import { ImageIcon } from "@radix-ui/react-icons";
-import { Image, SingleLineText, Styles } from "../controls";
-import { isEmpty } from "lodash-es";
-import { registerChaiBlock } from "../runtime/builder-blocks";
-import EmptySlot from "./empty-slot";
-import { ChaiBlock } from "../helper/types/ChaiBlock.ts";
-
-const ImageBlock = (
-  block: ChaiBlock & {
-    blockProps: Record<string, string>;
-    height: number;
-    width: number;
-    alt: string;
-    styles: Record<string, string>;
-  },
-) => {
-  const { blockProps, image, styles, alt, height = 200, width = 200 } = block;
-
-  if (isEmpty(image)) return <EmptySlot blockProps={blockProps} text="IMAGE URL" className="h-36" />;
-
-  return React.createElement("img", {
-    ...blockProps,
-    ...styles,
-    src: image,
-    alt: alt,
-    height: height,
-    width: width,
-  });
-};
-
-registerChaiBlock(ImageBlock, {
-  type: "Image",
-  label: "Image",
-  category: "core",
-  icon: ImageIcon,
-  group: "basic",
-  props: {
-    styles: Styles({ default: "" }),
-    image: Image({
-      title: "Image",
-      default: "https://fakeimg.pl/400x200?text=Choose&font=bebas",
-    }),
-    alt: SingleLineText({ title: "Alt", default: "" }),
-    width: SingleLineText({ title: "Width", default: "" }),
-    height: SingleLineText({ title: "Height", default: "" }),
-  },
-});
-
-export default ImageBlock;
diff --git a/src/package/website-blocks/index.ts b/src/package/website-blocks/index.ts
deleted file mode 100644
index 2ee5352..0000000
--- a/src/package/website-blocks/index.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import "./box";
-import "./heading";
-import "./paragraph";
-import "./rte";
-import "./button";
-import "./link";
-import "./list";
-import "./icon";
-import "./image";
-import "./slot";
-import "./video";
-import "./iframe";
-import "./custom-html";
-import "./span";
-import "./divider";
-import "./line-break";
-import "./text";
-import "./table";
-import "./form/form.tsx";
-import "./form/input.tsx";
-import "./form/textarea.tsx";
-import "./form/select.tsx";
-import "./form/checkbox.tsx";
-import "./form/radio.tsx";
-import "./form/form-button.tsx";
-
-export default "";
diff --git a/src/package/website-blocks/line-break.tsx b/src/package/website-blocks/line-break.tsx
deleted file mode 100644
index 38cde09..0000000
--- a/src/package/website-blocks/line-break.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import * as React from "react";
-import { Styles } from "../controls";
-import { registerChaiBlock } from "../runtime/builder-blocks";
-import { SpaceBetweenVerticallyIcon } from "@radix-ui/react-icons";
-import { ChaiBlock } from "../helper/types/ChaiBlock.ts";
-
-const LineBreakComponent = (props: ChaiBlock & { styles: any; blockProps: Record<string, string> }) => {
-  const { blockProps, styles } = props;
-  return React.createElement("br", { ...blockProps, ...styles });
-};
-
-registerChaiBlock(LineBreakComponent, {
-  type: "LineBreak",
-  label: "Line Break",
-  category: "core",
-  group: "basic",
-  icon: SpaceBetweenVerticallyIcon,
-  props: {
-    styles: Styles({ default: "" }),
-  },
-});
-
-export default LineBreakComponent;
diff --git a/src/package/website-blocks/link.tsx b/src/package/website-blocks/link.tsx
deleted file mode 100644
index fe0892c..0000000
--- a/src/package/website-blocks/link.tsx
+++ /dev/null
@@ -1,76 +0,0 @@
-import * as React from "react";
-import { isEmpty } from "lodash-es";
-import { Link1Icon } from "@radix-ui/react-icons";
-import { Link, SingleLineText, Styles } from "../controls";
-import { registerChaiBlock } from "../runtime/builder-blocks";
-import EmptySlot from "./empty-slot";
-import { ChaiBlock } from "../helper/types/ChaiBlock.ts";
-
-const LinkBlock = (
-  props: ChaiBlock & {
-    styles: any;
-    link: any;
-    inBuilder: boolean;
-    blockProps: Record<string, string>;
-    children: React.ReactNode;
-  },
-) => {
-  const { blockProps, link, children, styles, inBuilder, content } = props;
-
-  if (!children && isEmpty(styles?.className) && isEmpty(content)) {
-    return <EmptySlot blockProps={blockProps} />;
-  }
-
-  if (inBuilder) {
-    if (children) {
-      return (
-        <span data-simulate={"a"} {...blockProps} {...styles}>
-          {children}
-        </span>
-      );
-    } else {
-      return React.createElement("span", {
-        ...blockProps,
-        ...styles,
-        href: link.href || "#",
-        target: link.target || "_self",
-        dangerouslySetInnerHTML: { __html: content },
-        "data-simulate": "a",
-      });
-    }
-  }
-
-  if (children) {
-    return (
-      <a href={link.href || "#/"} target={link.target} {...blockProps} {...styles}>
-        {children}
-      </a>
-    );
-  }
-
-  return React.createElement("a", {
-    ...blockProps,
-    ...styles,
-    href: link.href || "#",
-    target: link.target || "_self",
-    dangerouslySetInnerHTML: { __html: content },
-  });
-};
-
-registerChaiBlock(LinkBlock, {
-  type: "Link",
-  label: "Link",
-  category: "core",
-  icon: Link1Icon,
-  group: "basic",
-  props: {
-    styles: Styles({ default: "" }),
-    content: SingleLineText({ title: "Content", default: "" }),
-    link: Link({
-      title: "Link",
-      default: { type: "page", target: "_self", href: "" },
-    }),
-  },
-});
-
-export default LinkBlock;
diff --git a/src/package/website-blocks/list.tsx b/src/package/website-blocks/list.tsx
deleted file mode 100644
index f061942..0000000
--- a/src/package/website-blocks/list.tsx
+++ /dev/null
@@ -1,104 +0,0 @@
-import * as React from "react";
-import { ColumnsIcon, RowsIcon } from "@radix-ui/react-icons";
-import { get, isEmpty } from "lodash-es";
-import { cn } from "../helper/lib.ts";
-import { MultilineText, SelectOption, Styles } from "../controls";
-import { registerChaiBlock } from "../runtime/builder-blocks";
-import EmptySlot from "./empty-slot";
-import { ChaiBlock } from "../helper/types/ChaiBlock.ts";
-
-const ListBlock = (
-  props: ChaiBlock & {
-    blockProps: Record<string, string>;
-    styles: Record<string, string>;
-  },
-) => {
-  const { blockProps, children, listType, styles, tag } = props;
-  const className = cn(get(styles, "className", ""), listType);
-
-  if (!children && isEmpty(styles?.className)) {
-    return <EmptySlot blockProps={blockProps} text="LIST ITEM" />;
-  }
-
-  return React.createElement(
-    tag ? tag : listType === "list-decimal" ? "ol" : "ul",
-    { ...blockProps, ...styles, className },
-    children,
-  );
-};
-
-registerChaiBlock(ListBlock, {
-  type: "List",
-  label: "List",
-  icon: RowsIcon,
-  category: "core",
-  group: "basic",
-  props: {
-    styles: Styles({ default: "" }),
-    listType: SelectOption({
-      title: "List type",
-      default: "list-disc",
-      options: [
-        { value: "list-none", title: "None" },
-        { value: "list-disc", title: "Disc" },
-        { value: "list-decimal", title: "Number" },
-      ],
-    }),
-  },
-  blocks: [
-    { _type: "List", _id: "a", listType: "list-none", styles: "#styles:," },
-    {
-      _type: "ListItem",
-      _id: "b",
-      _parent: "a",
-      styles: "#styles:,",
-      content: "Item 1",
-    },
-    {
-      _type: "ListItem",
-      _id: "c",
-      _parent: "a",
-      styles: "#styles:,",
-      content: "Item 2",
-    },
-    {
-      _type: "ListItem",
-      _id: "d",
-      _parent: "a",
-      styles: "#styles:,",
-      content: "Item 3",
-    },
-  ],
-});
-
-const ListItemBlock = (
-  props: ChaiBlock & {
-    content: string;
-    blockProps: Record<string, string>;
-    styles: Record<string, string>;
-  },
-) => {
-  const { blockProps, content, styles, children, tag } = props;
-  if (!children) {
-    return React.createElement(tag || "li", {
-      ...styles,
-      ...blockProps,
-      dangerouslySetInnerHTML: { __html: content },
-    });
-  }
-  return React.createElement(tag || "li", { ...styles, ...blockProps }, children);
-};
-
-registerChaiBlock(ListItemBlock, {
-  type: "ListItem",
-  label: "List Item",
-  icon: ColumnsIcon,
-  category: "core",
-  group: "basic",
-  props: {
-    styles: Styles({ default: "" }),
-    content: MultilineText({ title: "Content", default: "List item" }),
-  },
-});
-
-export default ListBlock;
diff --git a/src/package/website-blocks/paragraph.tsx b/src/package/website-blocks/paragraph.tsx
deleted file mode 100644
index 4b55393..0000000
--- a/src/package/website-blocks/paragraph.tsx
+++ /dev/null
@@ -1,48 +0,0 @@
-import * as React from "react";
-import { TextIcon } from "@radix-ui/react-icons";
-import { MultilineText, Styles } from "../controls";
-import { registerChaiBlock } from "../runtime/builder-blocks";
-
-import { isNull } from "lodash-es";
-
-/**
- * Heading component
- * @param props
- * @constructor
- */
-const ParagraphBlock = (
-  props: any & {
-    blockProps: Record<string, string>;
-    styles: Record<string, string>;
-    children: React.ReactNode;
-  },
-) => {
-  const { blockProps, styles, content } = props;
-
-  if (!isNull(props.children)) return React.createElement("p", { ...styles, ...blockProps }, props.children);
-
-  // eslint-disable-next-line react/no-danger
-  return React.createElement("div", {
-    ...styles,
-    ...blockProps,
-    dangerouslySetInnerHTML: { __html: content },
-  });
-};
-
-registerChaiBlock(ParagraphBlock as React.FC<any>, {
-  type: "Paragraph",
-  label: "Paragraph",
-  category: "core",
-  icon: TextIcon,
-  group: "basic",
-  props: {
-    styles: Styles({ default: "" }),
-    content: MultilineText({
-      title: "Content",
-      default:
-        "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse varius enim in eros elementum tristique. Duis cursus, mi quis viverra ornare, eros dolor interdum nulla, ut commodo diam libero vitae erat. Aenean faucibus nibh et justo cursus id rutrum lorem imperdiet. Nunc ut sem vitae risus tristique posuere.",
-    }),
-  },
-});
-
-export default ParagraphBlock;
diff --git a/src/package/website-blocks/row.tsx b/src/package/website-blocks/row.tsx
deleted file mode 100644
index 0e8f084..0000000
--- a/src/package/website-blocks/row.tsx
+++ /dev/null
@@ -1,102 +0,0 @@
-import * as React from "react";
-import { ColumnsIcon, RowsIcon } from "@radix-ui/react-icons";
-import { get } from "lodash-es";
-import { Numeric, Styles } from "../controls";
-import { registerChaiBlock } from "../runtime/builder-blocks";
-import { ChaiBlock } from "../helper/types/ChaiBlock.ts";
-import { cn } from "../helper/lib";
-
-const RowBlock = (
-  props: ChaiBlock & {
-    blockProps: Record<string, string>;
-    styles: Record<string, string>;
-  },
-) => {
-  const { blockProps, children, styles } = props;
-  const className = cn(get(styles, "className", ""), "grid grid-cols-12");
-  return React.createElement("div", { ...blockProps, ...styles, className }, children);
-};
-
-registerChaiBlock(RowBlock, {
-  type: "Row",
-  label: "Row",
-  icon: RowsIcon,
-  category: "core",
-  group: "layout",
-  hidden: true,
-  props: {
-    styles: Styles({ default: "grid grid-cols-12" }),
-  },
-  blocks: [
-    { _type: "Row", _id: "a", styles: "#styles:," },
-    {
-      _type: "Column",
-      _id: "b",
-      _parent: "a",
-      colSpan: "6",
-      styles: "#styles:,",
-    },
-    {
-      _type: "Column",
-      _id: "c",
-      _parent: "a",
-      colSpan: "6",
-      styles: "#styles:,",
-    },
-  ],
-});
-
-const ColumnBlock = (
-  props: ChaiBlock & {
-    blockProps: Record<string, string>;
-    styles: Record<string, string>;
-  },
-) => {
-  const { blockProps, styles, _colSpan, children } = props;
-
-  let emptySlot: React.ReactNode | null = null;
-  if (!children) {
-    emptySlot = (
-      <div className={cn("flex h-20 flex-col items-center justify-center", styles?.className)}>
-        <div className="h-full w-full rounded-md border-4 border-dashed" />
-      </div>
-    );
-  }
-
-  const cols: { [key: number | string]: string } = {
-    1: "col-span-1",
-    2: "col-span-2",
-    3: "col-span-3",
-    4: "col-span-4",
-    5: "col-span-5",
-    6: "col-span-6",
-    7: "col-span-7",
-    8: "col-span-8",
-    9: "col-span-9",
-    10: "col-span-10",
-    11: "col-span-11",
-    12: "col-span-12",
-  };
-  const className = cn(get(styles, "className", ""), cols[_colSpan]);
-  return React.createElement("div", { ...styles, ...blockProps, droppable: "yes", className }, children || emptySlot);
-};
-
-registerChaiBlock(ColumnBlock, {
-  type: "Column",
-  label: "Column",
-  icon: ColumnsIcon,
-  category: "core",
-  group: "layout",
-  hidden: true,
-  props: {
-    styles: Styles({ default: "" }),
-    _colSpan: Numeric({
-      title: "Columns",
-      default: 6,
-      minimum: 1,
-      maximum: 12,
-    }),
-  },
-});
-
-export { RowBlock, ColumnBlock };
diff --git a/src/package/website-blocks/rte.tsx b/src/package/website-blocks/rte.tsx
deleted file mode 100644
index 571fe57..0000000
--- a/src/package/website-blocks/rte.tsx
+++ /dev/null
@@ -1,51 +0,0 @@
-import * as React from "react";
-import { CursorTextIcon } from "@radix-ui/react-icons";
-import { RichText, Styles } from "../controls";
-import { registerChaiBlock } from "../runtime/builder-blocks";
-import { ChaiBlock } from "../helper/types/ChaiBlock.ts";
-
-/**
- * Heading component
- * @param props
- * @constructor
- */
-const RichTextBlock = (
-  props: ChaiBlock & {
-    blockProps: Record<string, string>;
-    styles: Record<string, string>;
-  },
-) => {
-  const { blockProps, content, styles } = props;
-  // eslint-disable-next-line react/no-danger
-  return (
-    <div className="prose max-w-full">
-      <div {...blockProps} {...styles} dangerouslySetInnerHTML={{ __html: content }} />
-    </div>
-  );
-};
-
-registerChaiBlock(RichTextBlock as React.FC<any>, {
-  type: "RichText",
-  label: "Rich Text",
-  category: "core",
-  icon: CursorTextIcon,
-  group: "basic",
-  props: {
-    styles: Styles({ default: "" }),
-    content: RichText({
-      title: "Content",
-      default:
-        "Lorem Ipsum Rich Text Editor Demo\n" +
-        "\n" +
-        "Welcome to our rich text editor demo! With our powerful editor, you can create stunning documents with ease. Let's explore some of its features:\n" +
-        "\n" +
-        "Text Formatting: You can make text bold, italic, or underline it.\n" +
-        "Lists:\n" +
-        "Create ordered lists.\n" +
-        "Craft unordered lists.\n" +
-        "Utilize nested lists for organization.",
-    }),
-  },
-});
-
-export default RichTextBlock;
diff --git a/src/package/website-blocks/slot.tsx b/src/package/website-blocks/slot.tsx
deleted file mode 100644
index ba44fd2..0000000
--- a/src/package/website-blocks/slot.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import * as React from "react";
-import { Styles } from "../controls";
-import { registerChaiBlock } from "../runtime/builder-blocks";
-import { ChaiBlock } from "../helper/types/ChaiBlock.ts";
-import { cn } from "../helper/lib";
-
-const SlotBlock = (
-  props: ChaiBlock & { children: React.ReactNode } & {
-    blockProps: Record<string, string>;
-    styles: Record<string, string>;
-    emptyStyles?: Record<string, string>;
-  },
-) => {
-  const { blockProps, styles, children } = props;
-  let emptySlot: React.ReactNode | null = null;
-  if (!children) {
-    emptySlot = (
-      // @ts-ignore
-      <div className={cn("flex flex-col items-center justify-center", props.emptyStyles?.className)}>
-        <div className="h-full w-full rounded-md border-4 border-dashed">
-          <p className="truncate p-1 text-left text-xs text-gray-400">Slot: {props.name}</p>
-        </div>
-      </div>
-    );
-  }
-  return React.createElement("div", { ...styles, ...blockProps, droppable: "yes" }, children || emptySlot);
-};
-
-registerChaiBlock(SlotBlock, {
-  type: "Slot",
-  label: "Slot",
-  group: "basic",
-  category: "core",
-  hidden: true,
-  props: {
-    styles: Styles({ default: "" }),
-    emptyStyles: Styles({ default: "" }),
-  },
-});
-
-export default SlotBlock;
diff --git a/src/package/website-blocks/span.tsx b/src/package/website-blocks/span.tsx
deleted file mode 100644
index 2b0c8b3..0000000
--- a/src/package/website-blocks/span.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-import * as React from "react";
-import { MultilineText, Styles } from "../controls";
-import { registerChaiBlock } from "../runtime/builder-blocks";
-import { ChaiBlock } from "../helper/types/ChaiBlock.ts";
-
-const SpanBlock = (
-  props: ChaiBlock & {
-    children: React.ReactNode;
-    styles: any;
-    blockProps: Record<string, string>;
-  },
-) => {
-  const { blockProps, styles, content, children = null, tag } = props;
-
-  if (children) return React.createElement("span", { ...styles, ...blockProps }, children);
-
-  return React.createElement(tag || "span", {
-    ...styles,
-    ...blockProps,
-    dangerouslySetInnerHTML: { __html: content },
-  });
-};
-
-registerChaiBlock(SpanBlock, {
-  type: "Span",
-  label: "Span",
-  category: "core",
-  group: "basic",
-  props: {
-    styles: Styles({ default: "" }),
-    content: MultilineText({ title: "Content", default: "Enter your content" }),
-  },
-});
-
-export default SpanBlock;
diff --git a/src/package/website-blocks/table.tsx b/src/package/website-blocks/table.tsx
deleted file mode 100644
index fa44845..0000000
--- a/src/package/website-blocks/table.tsx
+++ /dev/null
@@ -1,228 +0,0 @@
-import * as React from "react";
-import { RichText, Styles } from "../controls";
-import { registerChaiBlock } from "../runtime/builder-blocks";
-import {
-  BorderAllIcon,
-  BorderTopIcon,
-  DragHandleHorizontalIcon,
-  TableIcon,
-  ViewHorizontalIcon,
-} from "@radix-ui/react-icons";
-import { isEmpty } from "lodash-es";
-import EmptySlot from "./empty-slot";
-import { generateUUID } from "../helper/lib.ts";
-import { ChaiBlock } from "../helper/types/ChaiBlock.ts";
-
-const getDefaultBlocks = (type: string): ChaiBlock[] => {
-  const td = (id: string, content: string) => ({
-    _id: generateUUID(),
-    _parent: id,
-    _type: "TableCell",
-    styles: "#styles:,",
-    content: `${type === "TableHead" ? "Table Head" : "Table Cell " + content}`,
-  });
-
-  const tr = (id?: string) => {
-    const trId = generateUUID();
-    const rootBlock: any = {
-      _type: "TableRow",
-      _id: trId,
-      styles: "#styles:,border-b",
-    };
-    if (id) rootBlock._parent = id;
-    return [rootBlock, td(trId, "1"), td(trId, "2"), td(trId, "3")];
-  };
-
-  const thead = (id?: string) => {
-    const theadId = generateUUID();
-    const rootBlock: any = {
-      _id: theadId,
-      _type: "TableHead",
-      styles: "#styles:,font-medium",
-    };
-    if (id) rootBlock._parent = id;
-    return [rootBlock, ...tr(theadId)];
-  };
-
-  const tbody = (id?: string) => {
-    const tbodyId = generateUUID();
-    const rootBlock: any = {
-      _id: tbodyId,
-      _type: "TableBody",
-      styles: "#styles:,",
-    };
-    if (id) rootBlock._parent = id;
-    return [rootBlock, ...tr(tbodyId), ...tr(tbodyId)];
-  };
-
-  if (type === "Table") {
-    const tableId = generateUUID();
-    return [
-      {
-        _id: tableId,
-        _type: "Table",
-        styles: "#styles:,w-full text-left text-gray-500 dark:text-gray-400",
-      },
-      ...thead(tableId),
-      ...tbody(tableId),
-    ];
-  }
-
-  if (type === "TableRow") return tr();
-  if (type === "TableHead") return thead();
-  if (type === "TableBody") return tbody();
-
-  return [];
-};
-
-const TableBlock = (
-  props: ChaiBlock & {
-    children: React.ReactNode;
-    styles: any;
-    tag: string;
-    blockProps: Record<string, string>;
-  },
-) => {
-  const { blockProps, children, styles } = props;
-  if (!children) {
-    return <EmptySlot blockProps={blockProps} text="TABLE HEAD / BODY" />;
-  }
-  return React.createElement("table", { ...blockProps, ...styles }, children);
-};
-
-registerChaiBlock(TableBlock, {
-  type: "Table",
-  label: "Table",
-  category: "core",
-  group: "table",
-  hidden: true,
-  icon: TableIcon,
-  props: {
-    styles: Styles({ default: "" }),
-  },
-  blocks: getDefaultBlocks("Table"),
-});
-
-const TableHeadBlock = (
-  props: ChaiBlock & {
-    children: React.ReactNode;
-    styles: any;
-    tag: string;
-    blockProps: Record<string, string>;
-  },
-) => {
-  const { blockProps, children, styles } = props;
-  if (!children) {
-    return <EmptySlot blockProps={blockProps} text="TABLE ROW" />;
-  }
-  return React.createElement("thead", { ...blockProps, ...styles }, children);
-};
-
-registerChaiBlock(TableHeadBlock, {
-  type: "TableHead",
-  label: "Table Head",
-  category: "core",
-  group: "table",
-  hidden: true,
-  icon: BorderTopIcon,
-  props: {
-    styles: Styles({ default: "" }),
-  },
-  blocks: getDefaultBlocks("TableHead"),
-});
-
-const TableBodyBlock = (
-  props: ChaiBlock & {
-    children: React.ReactNode;
-    styles: any;
-    tag: string;
-    blockProps: Record<string, string>;
-  },
-) => {
-  const { blockProps, children, styles } = props;
-  if (!children) {
-    return <EmptySlot blockProps={blockProps} text="TABLE ROW" />;
-  }
-  return React.createElement("tbody", { ...blockProps, ...styles }, children);
-};
-
-registerChaiBlock(TableBodyBlock, {
-  type: "TableBody",
-  label: "Table Body",
-  category: "core",
-  group: "table",
-  hidden: true,
-  icon: BorderAllIcon,
-  props: {
-    styles: Styles({ default: "" }),
-  },
-  blocks: getDefaultBlocks("TableBody"),
-});
-
-const TableRowBlock = (
-  props: ChaiBlock & {
-    children: React.ReactNode;
-    styles: any;
-    tag: string;
-    blockProps: Record<string, string>;
-  },
-) => {
-  const { blockProps, children, styles } = props;
-  if (!children) {
-    return <EmptySlot blockProps={blockProps} text="TABLE CELL" />;
-  }
-
-  return React.createElement("tr", { ...blockProps, ...styles }, children);
-};
-
-registerChaiBlock(TableRowBlock, {
-  type: "TableRow",
-  label: "Table Row",
-  category: "core",
-  group: "table",
-  hidden: true,
-  icon: ViewHorizontalIcon,
-  props: {
-    styles: Styles({ default: "w-full" }),
-  },
-  blocks: getDefaultBlocks("TableRow"),
-});
-
-const TableCellBlock = (
-  props: ChaiBlock & {
-    children: React.ReactNode;
-    styles: any;
-    tag: string;
-    blockProps: Record<string, string>;
-  },
-) => {
-  const { blockProps, children, content, styles } = props;
-
-  if (!children && isEmpty(content)) {
-    return <EmptySlot blockProps={blockProps} />;
-  }
-
-  if (!children) {
-    return React.createElement("td", {
-      ...blockProps,
-      ...styles,
-      dangerouslySetInnerHTML: { __html: content },
-    });
-  }
-  return React.createElement("td", { ...blockProps, ...styles }, children);
-};
-
-registerChaiBlock(TableCellBlock, {
-  type: "TableCell",
-  label: "Table Cell",
-  category: "core",
-  group: "table",
-  hidden: true,
-  icon: DragHandleHorizontalIcon,
-  props: {
-    styles: Styles({ default: "" }),
-    content: RichText({ title: "Content", default: "Table cell item" }),
-  },
-});
-
-export default TableBlock;
diff --git a/src/package/website-blocks/text.tsx b/src/package/website-blocks/text.tsx
deleted file mode 100644
index c82ca19..0000000
--- a/src/package/website-blocks/text.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-import { MultilineText } from "../controls";
-import { registerChaiBlock } from "../runtime/builder-blocks";
-import { SpaceBetweenVerticallyIcon } from "@radix-ui/react-icons";
-import { ChaiBlock } from "../helper/types/ChaiBlock.ts";
-
-const RawTextBlock = (
-  props: ChaiBlock & {
-    content: string;
-    inBuilder: boolean;
-    blockProps: Record<string, string>;
-  },
-) => {
-  if (props.inBuilder) {
-    return (
-      <span className={"inline"} {...props.blockProps}>
-        {props.content}
-      </span>
-    );
-  }
-  return `${props.content}`;
-};
-
-registerChaiBlock(RawTextBlock, {
-  type: "Text",
-  label: "Text",
-  hidden: true,
-  category: "core",
-  group: "basic",
-  icon: SpaceBetweenVerticallyIcon,
-  props: {
-    content: MultilineText({ title: "Content", defaultValue: "" }),
-  },
-});
-
-export default RawTextBlock;
diff --git a/src/package/website-blocks/video.tsx b/src/package/website-blocks/video.tsx
deleted file mode 100644
index 340a617..0000000
--- a/src/package/website-blocks/video.tsx
+++ /dev/null
@@ -1,126 +0,0 @@
-import * as React from "react";
-import { VideoIcon } from "@radix-ui/react-icons";
-import { isEmpty } from "lodash-es";
-import { Checkbox, Model, SingleLineText, Styles } from "../controls";
-import { registerChaiBlock } from "../runtime/builder-blocks";
-import EmptySlot from "./empty-slot";
-import { ChaiBlock } from "../helper/types/ChaiBlock.ts";
-
-const YOUTUBE_REGEX = /^(https?:\/\/)?(www\.)?youtube\.com\/(watch\?v=|embed\/)([a-zA-Z0-9_-]{11})/;
-const VIMEO_REGEX = /^(https?:\/\/)?(www\.)?vimeo\.com\/(\d+)/;
-const DAILYMOTION_REGEX = /^(https?:\/\/)?(www\.)?dailymotion\.com\/(video|embed\/video)\/([a-zA-Z0-9_-]+)/;
-
-const getEmbedURL = (url: string): string | null => {
-  if (YOUTUBE_REGEX.test(url)) {
-    const match = url.match(YOUTUBE_REGEX);
-    if (match) {
-      const videoId = match[4];
-      return `https://www.youtube.com/embed/${videoId}`;
-    }
-    return url;
-  }
-
-  if (VIMEO_REGEX.test(url)) {
-    const match = url.match(VIMEO_REGEX);
-    if (match) {
-      const videoId = match[3];
-      return `https://player.vimeo.com/video/${videoId}`;
-    }
-    return url;
-  }
-
-  if (DAILYMOTION_REGEX.test(url)) {
-    const match = url.match(DAILYMOTION_REGEX);
-    if (match) {
-      const videoId = match[4];
-      return `https://www.dailymotion.com/embed/video/${videoId}`;
-    }
-    return url;
-  }
-
-  return null;
-};
-
-const VideoBlock = React.memo(
-  (
-    block: ChaiBlock & {
-      controls: Record<string, any>;
-      blockProps: Record<string, string>;
-      styles: Record<string, string>;
-      inBuilder: boolean;
-    },
-  ) => {
-    const { blockProps, inBuilder, styles, url, controls } = block;
-
-    const autoplay = controls.autoPlay;
-    const _controls = controls.controls;
-    const muted = autoplay || controls.muted;
-    const loop = controls.loop;
-
-    if (isEmpty(url)) return <EmptySlot blockProps={blockProps} text="VIDEO URL" className="h-36" />;
-
-    let embedURL = getEmbedURL(url);
-    let videoElement = null;
-    if (embedURL) {
-      if (!isEmpty(embedURL)) {
-        const iframeControls = [];
-        iframeControls.push(`autoplay=${autoplay ? 1 : 0}`);
-        iframeControls.push(`controls=${controls ? 1 : 0}`);
-        iframeControls.push(`mute=${muted ? 1 : 0}&muted=${muted ? 1 : 0}`);
-        iframeControls.push(`loop=${loop ? 1 : 0}`);
-        embedURL = `${embedURL}?${iframeControls.join("&")}`;
-      }
-      videoElement = React.createElement("iframe", {
-        ...blockProps,
-        ...styles,
-        src: embedURL,
-        allow: inBuilder ? "" : "autoplay *; fullscreen *",
-        allowFullScreen: true,
-        frameBorder: 0,
-      });
-    } else {
-      videoElement = React.createElement("video", {
-        ...blockProps,
-        ...styles,
-        src: url,
-        controls: _controls,
-        muted,
-        autoPlay: inBuilder ? false : autoplay,
-        loop,
-      });
-    }
-
-    return (
-      <div className="relative overflow-hidden" style={{ paddingBottom: "56.25%" }}>
-        {inBuilder ? <div {...blockProps} {...styles} className="absolute h-full w-full z-20" /> : null}
-        {videoElement}
-      </div>
-    );
-  },
-);
-
-registerChaiBlock(VideoBlock, {
-  type: "Video",
-  label: "Video",
-  category: "core",
-  icon: VideoIcon,
-  group: "basic",
-  props: {
-    styles: Styles({ default: "absolute top-0 left-0 w-full h-full" }),
-    url: SingleLineText({
-      title: "Video URL",
-      default: "https://www.youtube.com/watch?v=9xwazD5SyVg&ab_channel=MaximilianMustermann",
-    }),
-    controls: Model({
-      title: "Controls",
-      properties: {
-        autoPlay: Checkbox({ title: "Autoplay", default: true }),
-        controls: Checkbox({ title: "Show widgets", default: false }),
-        loop: Checkbox({ title: "Loop", default: false }),
-        muted: Checkbox({ title: "Muted", default: true }),
-      },
-    }),
-  },
-});
-
-export default VideoBlock;