diff --git a/lib/component/modal/Modal.tsx b/lib/component/modal/Modal.tsx
index 3c40541..fb06d63 100644
--- a/lib/component/modal/Modal.tsx
+++ b/lib/component/modal/Modal.tsx
@@ -3,17 +3,14 @@ import { Dialog, DialogBackdrop, DialogPanel } from "@headlessui/react";
 import clsx from "clsx";
 
 
-export default function Modal(props: ModalProps){
-	const {
-		display,
-		onClose,
-		className,
-		backgroundType = "blur",
-		top,
-		children
-	} = props;
-
-
+export default function Modal({
+	display,
+	onClose,
+	className,
+	backgroundType = "blur",
+	top,
+	children
+}: Readonly<ModalProps>){
 	return (
 		<Dialog
 			open={display}
diff --git a/lib/component/modal/ModalBody.tsx b/lib/component/modal/ModalBody.tsx
index ae89e8d..e5f389d 100644
--- a/lib/component/modal/ModalBody.tsx
+++ b/lib/component/modal/ModalBody.tsx
@@ -2,19 +2,18 @@ import type { ModalBodyProps } from "$/types/ModalTypes";
 import clsx from "clsx";
 
 
-export default function ModalBody(props: ModalBodyProps){
-	const {
-		className,
-		children
-	} = props;
-
-
+export default function ModalBody({
+	className,
+	children,
+	...props
+}: Readonly<ModalBodyProps>){
 	return (
 		<div
 			className={clsx(
 				"flex flex-col items-center justify-start h-full w-full overflow-scroll",
 				className
 			)}
+			{...props}
 		>
 			{children}
 		</div>
diff --git a/lib/component/modal/ModalFooter.tsx b/lib/component/modal/ModalFooter.tsx
index a85fcb2..a81c321 100644
--- a/lib/component/modal/ModalFooter.tsx
+++ b/lib/component/modal/ModalFooter.tsx
@@ -2,19 +2,18 @@ import type { ModalFooterProps } from "$/types/ModalTypes";
 import clsx from "clsx";
 
 
-export default function ModalFooter(props: ModalFooterProps){
-	const {
-		className,
-		children
-	} = props;
-
-
+export default function ModalFooter({
+	className,
+	children,
+	...props
+}: Readonly<ModalFooterProps>){
 	return (
 		<div
 			className={clsx(
 				"flex flex-row items-center justify-center w-full rounded-b-lg",
 				className
 			)}
+			{...props}
 		>
 			<div
 				className="flex flex-row items-center justify-center mx-8 my-3"
diff --git a/lib/component/modal/ModalHeader.tsx b/lib/component/modal/ModalHeader.tsx
index a0bc603..bcd1378 100644
--- a/lib/component/modal/ModalHeader.tsx
+++ b/lib/component/modal/ModalHeader.tsx
@@ -1,23 +1,23 @@
+import Button from "$/component/button/Button";
 import type { ModalHeaderProps } from "$/types/ModalTypes";
 import { DialogTitle } from "@headlessui/react";
 import clsx from "clsx";
 import { BsXLg } from "react-icons/bs";
 
 
-export default function ModalHeader(props: ModalHeaderProps){
-	const {
-		onClose,
-		className,
-		children
-	} = props;
-
-
+export default function ModalHeader({
+	onClose,
+	className,
+	children,
+	...props
+}: Readonly<ModalHeaderProps>){
 	return (
 		<div
 			className={clsx(
 				"flex flex-row items-center justify-center w-full rounded-t-lg",
 				className
 			)}
+			{...props}
 		>
 			<DialogTitle
 				as="div"
@@ -27,14 +27,14 @@ export default function ModalHeader(props: ModalHeaderProps){
 			</DialogTitle>
 			{
 				onClose &&
-				<div
+				<Button
 					className="absolute top-1 right-1 cursor-pointer"
 					onClick={onClose}
 				>
 					<BsXLg
 						size={20}
 					/>
-				</div>
+				</Button>
 			}
 		</div>
 	);
diff --git a/lib/component/nav/DarkModeSwitch.tsx b/lib/component/nav/DarkModeSwitch.tsx
index 5aef88e..c2ab836 100644
--- a/lib/component/nav/DarkModeSwitch.tsx
+++ b/lib/component/nav/DarkModeSwitch.tsx
@@ -8,7 +8,7 @@ export default function DarkModeSwitch(){
 
 	const updateTheme = () => {
 		if(theme === "system"){
-			if(window.document.documentElement.classList.contains("dark")){
+			if(globalThis.document.documentElement.classList.contains("dark")){
 				setTheme("light");
 			}
 			else{
diff --git a/lib/component/nav/NavBar.tsx b/lib/component/nav/NavBar.tsx
index 10f1744..44239b7 100644
--- a/lib/component/nav/NavBar.tsx
+++ b/lib/component/nav/NavBar.tsx
@@ -2,13 +2,11 @@ import type { NavBarProps } from "$/types/NavTypes";
 import clsx from "clsx";
 
 
-export default function NavBar(props: NavBarProps){
-	const {
-		className,
-		children
-	} = props;
-
-
+export default function NavBar({
+	className,
+	children,
+	...props
+}: Readonly<NavBarProps>){
 	return (
 		<nav
 			className={clsx(
@@ -16,6 +14,7 @@ export default function NavBar(props: NavBarProps){
 				"fixed top-0 left-0 w-full z-10",
 				"flex flex-row flex-nowrap items-center justify-center"
 			)}
+			{...props}
 		>
 			{children}
 		</nav>
diff --git a/lib/component/nav/PopoverMenu.tsx b/lib/component/nav/PopoverMenu.tsx
index 7068ef4..baa973d 100644
--- a/lib/component/nav/PopoverMenu.tsx
+++ b/lib/component/nav/PopoverMenu.tsx
@@ -3,14 +3,11 @@ import { Popover, PopoverButton, PopoverPanel } from "@headlessui/react";
 import clsx from "clsx";
 import { RiArrowRightSLine } from "react-icons/ri";
 
-export default function PopoverMenu(props: PopoverMenuProps){
-	const {
-		buttonContent,
-		anchor,
-		children
-	} = props;
-
-
+export default function PopoverMenu({
+	buttonContent,
+	anchor,
+	children
+}: Readonly<PopoverMenuProps>){
 	return (
 		<Popover>
 			<PopoverButton
diff --git a/lib/component/tab/MattrixwvTab.tsx b/lib/component/tab/MattrixwvTab.tsx
index 16f7b66..076db81 100644
--- a/lib/component/tab/MattrixwvTab.tsx
+++ b/lib/component/tab/MattrixwvTab.tsx
@@ -3,12 +3,9 @@ import { Tab } from "@headlessui/react";
 import clsx from "clsx";
 
 
-export default function MattrixwvTab(props: MattrixwvTabProps){
-	const {
-		children
-	} = props;
-
-
+export default function MattrixwvTab({
+	children
+}: Readonly<MattrixwvTabProps>){
 	return (
 		<Tab
 			className={clsx(
diff --git a/lib/component/tab/MattrixwvTabGroup.tsx b/lib/component/tab/MattrixwvTabGroup.tsx
index 964519d..9b27690 100644
--- a/lib/component/tab/MattrixwvTabGroup.tsx
+++ b/lib/component/tab/MattrixwvTabGroup.tsx
@@ -7,13 +7,10 @@ import MattrixwvTabPanel from "./MattrixwvTabPanel";
 import MattrixwvTabPanels from "./MattrixwvTabPanels";
 
 
-export default function MattrixwvTabGroup(props: MattrixwvTabGroupProps){
-	const {
-		tabs,
-		className
-	} = props;
-
-
+export default function MattrixwvTabGroup({
+	tabs,
+	className
+}: Readonly<MattrixwvTabGroupProps>){
 	return (
 		<TabGroup
 			className={clsx(
@@ -24,9 +21,7 @@ export default function MattrixwvTabGroup(props: MattrixwvTabGroupProps){
 			<MattrixwvTabList>
 				{
 					tabs.map((tab, index) => (
-						<MattrixwvTab
-							key={index}
-						>
+						<MattrixwvTab key={index}>
 							{tab.tab}
 						</MattrixwvTab>
 					))
@@ -35,9 +30,7 @@ export default function MattrixwvTabGroup(props: MattrixwvTabGroupProps){
 			<MattrixwvTabPanels>
 				{
 					tabs.map((tab, index) => (
-						<MattrixwvTabPanel
-							key={index}
-						>
+						<MattrixwvTabPanel key={index}>
 							{tab.content}
 						</MattrixwvTabPanel>
 					))
diff --git a/lib/component/tab/MattrixwvTabList.tsx b/lib/component/tab/MattrixwvTabList.tsx
index c2dd3c9..749e77d 100644
--- a/lib/component/tab/MattrixwvTabList.tsx
+++ b/lib/component/tab/MattrixwvTabList.tsx
@@ -2,16 +2,11 @@ import type { MattrixwvTabListProps } from "$/types/TabTypes";
 import { TabList } from "@headlessui/react";
 
 
-export default function MattrixwvTabList(props: MattrixwvTabListProps){
-	const {
-		children
-	} = props;
-
-
+export default function MattrixwvTabList({
+	children
+}: Readonly<MattrixwvTabListProps>){
 	return (
-		<TabList
-			className="flex flex-row items-center justify-start w-full border-b"
-		>
+		<TabList className="flex flex-row items-center justify-start w-full border-b">
 			{children}
 		</TabList>
 	);
diff --git a/lib/component/tab/MattrixwvTabPanel.tsx b/lib/component/tab/MattrixwvTabPanel.tsx
index da9a8ed..ea42a55 100644
--- a/lib/component/tab/MattrixwvTabPanel.tsx
+++ b/lib/component/tab/MattrixwvTabPanel.tsx
@@ -2,16 +2,11 @@ import type { MattrixwvTabPanelProps } from "$/types/TabTypes";
 import { TabPanel } from "@headlessui/react";
 
 
-export default function MattrixwvTabPanel(props: MattrixwvTabPanelProps){
-	const {
-		children
-	} = props;
-
-
+export default function MattrixwvTabPanel({
+	children
+}: Readonly<MattrixwvTabPanelProps>){
 	return (
-		<TabPanel
-			className="flex flex-row items-start justify-center w-full h-full"
-		>
+		<TabPanel className="flex flex-row items-start justify-center w-full h-full">
 			{children}
 		</TabPanel>
 	);
diff --git a/lib/component/tab/MattrixwvTabPanels.tsx b/lib/component/tab/MattrixwvTabPanels.tsx
index 9e4f37f..b5cb09e 100644
--- a/lib/component/tab/MattrixwvTabPanels.tsx
+++ b/lib/component/tab/MattrixwvTabPanels.tsx
@@ -2,16 +2,11 @@ import type { MattrixwvTabPanelsProps } from "$/types/TabTypes";
 import { TabPanels } from "@headlessui/react";
 
 
-export default function MattrixwvTabPanels(props: MattrixwvTabPanelsProps){
-	const {
-		children
-	} = props;
-
-
+export default function MattrixwvTabPanels({
+	children
+}: Readonly<MattrixwvTabPanelsProps>){
 	return (
-		<TabPanels
-			className="flex flex-row items-start justify-center w-full h-full overflow-scroll"
-		>
+		<TabPanels className="flex flex-row items-start justify-center w-full h-full overflow-scroll">
 			{children}
 		</TabPanels>
 	);
diff --git a/lib/component/toaster/Toaster.tsx b/lib/component/toaster/Toaster.tsx
index 1ea3980..323d439 100644
--- a/lib/component/toaster/Toaster.tsx
+++ b/lib/component/toaster/Toaster.tsx
@@ -6,7 +6,7 @@ import clsx from "clsx";
 export default function Toaster({
 	toast,
 	className
-}: ToasterProps){
+}: Readonly<ToasterProps>){
 	return (
 		<Transition
 			show={toast.length > 1 || (toast.length === 1 && toast[0].hideTime > new Date())}
diff --git a/lib/providers/theme/ThemeProvider.tsx b/lib/providers/theme/ThemeProvider.tsx
index 36e736a..cf49ca0 100644
--- a/lib/providers/theme/ThemeProvider.tsx
+++ b/lib/providers/theme/ThemeProvider.tsx
@@ -10,7 +10,7 @@ const themeInitialState: ThemeProviderState = {
 const ThemeProviderContext = createContext<ThemeProviderState>(themeInitialState);
 
 
-export default function ThemeProvider(props: ThemeProviderProps){
+export default function ThemeProvider(props: Readonly<ThemeProviderProps>){
 	const {
 		children,
 		defaultTheme = "system",
@@ -20,12 +20,12 @@ export default function ThemeProvider(props: ThemeProviderProps){
 	const [ theme, setTheme ] = useState<Theme>((localStorage.getItem(storageKey) as Theme) || defaultTheme);
 
 	useEffect(() => {
-		const root = window.document.documentElement;
+		const root = globalThis.document.documentElement;
 
 		root.classList.remove("light", "dark");
 
 		if(theme === "system"){
-			const systemTheme = window.matchMedia("(prefers-color-scheme: light)").matches ? "light" : "dark";
+			const systemTheme = globalThis.matchMedia("(prefers-color-scheme: light)").matches ? "light" : "dark";
 
 			root.classList.add(systemTheme);
 		}
diff --git a/lib/providers/toaster/ToasterProvider.tsx b/lib/providers/toaster/ToasterProvider.tsx
index 908c1c7..f488488 100644
--- a/lib/providers/toaster/ToasterProvider.tsx
+++ b/lib/providers/toaster/ToasterProvider.tsx
@@ -19,7 +19,7 @@ const ToasterProviderContext = createContext<ToastProviderState>(toastInitialSta
 export default function ToasterProvider({
 	className,
 	children
-}: ToastProviderProps){
+}: Readonly<ToastProviderProps>){
 	const [ toast, setToast ] = useState<Toast[]>([]);
 
 
diff --git a/lib/types/ButtonTypes.ts b/lib/types/ButtonTypes.ts
index 96ba797..35a88f4 100644
--- a/lib/types/ButtonTypes.ts
+++ b/lib/types/ButtonTypes.ts
@@ -1,4 +1,4 @@
-import type { ButtonHTMLAttributes } from "react";
+import type { ComponentProps } from "react";
 
 
 export type ButtonRounding = "none" | "sm" | "md" | "lg" | "full";
@@ -7,7 +7,7 @@ export type ButtonSize = "xs" | "sm" | "md" | "lg" | "xl";
 export type ButtonVariant = "standard" | "outline" | "ghost" | "outline-ghost" | "icon";
 
 
-export interface ButtonProps extends Omit<ButtonHTMLAttributes<HTMLButtonElement>, "size" | "type"> {
+export interface ButtonProps extends Omit<ComponentProps<"button">, "size" | "type"> {
 	type?: "button" | "submit" | "reset";
 	rounding?: ButtonRounding;
 	shape?: ButtonShape;
diff --git a/lib/types/InputTypes.ts b/lib/types/InputTypes.ts
index 9518792..06b5c73 100644
--- a/lib/types/InputTypes.ts
+++ b/lib/types/InputTypes.ts
@@ -1,5 +1,5 @@
 import type React from "react";
-import type { ChangeEventHandler, InputHTMLAttributes } from "react";
+import type { ChangeEventHandler, ComponentProps } from "react";
 
 
 export interface TextInputProps {
@@ -167,7 +167,7 @@ export interface RadioListProps {
 }
 
 
-export interface DateInputProps extends Omit<InputHTMLAttributes<HTMLInputElement>, "value" | "onChange" | "step">{
+export interface DateInputProps extends Omit<ComponentProps<"input">, "value" | "onChange" | "step">{
 	step?: number;
 	value: Date | undefined;
 	onChange: (newValue: Date | undefined) => void;
diff --git a/lib/types/MessageTypes.ts b/lib/types/MessageTypes.ts
index 36a9e61..f336639 100644
--- a/lib/types/MessageTypes.ts
+++ b/lib/types/MessageTypes.ts
@@ -1,7 +1,7 @@
-import type { HTMLProps } from "react";
+import type { ComponentProps } from "react";
 
 
-export interface MessageBlockProps extends HTMLProps<HTMLDivElement> {
+export interface MessageBlockProps extends ComponentProps<"div"> {
 	outline?: "none" | "sm" | "md" | "lg";
 	rounded?: "none" | "xs" | "sm" | "md" | "lg" | "xl";
 }
diff --git a/lib/types/ModalTypes.ts b/lib/types/ModalTypes.ts
index 6984e12..d828589 100644
--- a/lib/types/ModalTypes.ts
+++ b/lib/types/ModalTypes.ts
@@ -1,18 +1,21 @@
+import type { ComponentProps } from "react";
+
+
 export type ModalBackgroundType = "darken" | "lighten" | "blur" | "darken-blur" | "lighten-blur" | "darken-blur-radial" | "lighten-blur-radial" | "transparent" | "none";
 
 
-export interface ModalHeaderProps {
+export interface ModalHeaderProps extends ComponentProps<"div"> {
 	onClose?: () => void;
 	className?: string;
 	children: React.ReactNode;
 }
 
-export interface ModalFooterProps {
+export interface ModalFooterProps extends ComponentProps<"div"> {
 	className?: string;
 	children: React.ReactNode;
 }
 
-export interface ModalBodyProps {
+export interface ModalBodyProps extends ComponentProps<"div"> {
 	className?: string;
 	children: React.ReactNode;
 }
diff --git a/lib/types/NavTypes.ts b/lib/types/NavTypes.ts
index b4f2289..c4511a2 100644
--- a/lib/types/NavTypes.ts
+++ b/lib/types/NavTypes.ts
@@ -1,3 +1,6 @@
+import type { ComponentProps } from "react";
+
+
 export type Align = "start" | "end";
 export type Placement = "top" | "bottom" | "left" | "right";
 export type AnchorTo = `${Placement}` | `${Placement} ${Align}`;
@@ -9,7 +12,7 @@ export interface PopoverMenuProps {
 	children: React.ReactNode;
 }
 
-export interface NavBarProps {
+export interface NavBarProps extends ComponentProps<"nav"> {
 	className?: string;
 	children: React.ReactNode;
 }