diff --git a/src/components/pengaturan/umum.tsx b/src/components/pengaturan/umum.tsx
index 2b6499d..ec5b814 100644
--- a/src/components/pengaturan/umum.tsx
+++ b/src/components/pengaturan/umum.tsx
@@ -1,5 +1,6 @@
 import {
 	Alert,
+	Box,
 	Button,
 	Card,
 	Group,
@@ -11,34 +12,19 @@ import {
 	Title,
 	useMantineColorScheme,
 } from "@mantine/core";
+import { DateInput } from "@mantine/dates";
 import { IconInfoCircle } from "@tabler/icons-react";
 
 const UmumSettings = () => {
 	const { colorScheme } = useMantineColorScheme();
 	const dark = colorScheme === "dark";
 	return (
-		<Card
-			withBorder
-			radius="md"
-			p="xl"
-			bg={dark ? "#141D34" : "white"}
-			style={{ borderColor: dark ? "#141D34" : "white" }}
+		<Box
+			pr={"50%"}
 		>
 			<Title order={2} mb="lg">
-				Pengaturan Umum
+				Preferensi Tampilan
 			</Title>
-			<Text color="dimmed" mb="xl">
-				Kelola pengaturan umum aplikasi Anda
-			</Text>
-
-			<Space h="lg" />
-
-			<TextInput
-				label="Nama Aplikasi"
-				placeholder="Masukkan nama aplikasi"
-				defaultValue="Dashboard Desa Plus"
-				mb="md"
-			/>
 
 			<Select
 				label="Bahasa Aplikasi"
@@ -61,25 +47,48 @@ const UmumSettings = () => {
 				mb="md"
 			/>
 
-			<Group mb="md">
-				<Switch label="Notifikasi Email" defaultChecked />
+			<DateInput
+				label="Format Tanggal"
+				mb={"xl"}
+			/>
+
+			<Title order={2} mb="lg">
+				Dashboard
+			</Title>
+
+			<Group mb="md" justify="space-between">
+				<Text fw={"bold"} fz={"sm"}>Refresh Otomatis</Text>
+				<Switch defaultChecked />
 			</Group>
 
-			<Alert
-				icon={<IconInfoCircle size={16} />}
-				title="Informasi"
-				color="blue"
-				mb="md"
-			>
-				Beberapa pengaturan mungkin memerlukan restart aplikasi untuk diterapkan
-				sepenuhnya.
-			</Alert>
+			<Group mb="md" justify="space-between">
+				<Text fw={"bold"} fz={"sm"}>Interval Refresh</Text>
+				<Select
+					data={[
+						{ value: "1", label: "30d" },
+						{ value: "2", label: "60d" },
+						{ value: "3", label: "90d" },
+					]}
+					defaultValue="1"
+					w={90}
+				/>
+			</Group>
+
+			<Group mb="md" justify="space-between">
+				<Text fw={"bold"} fz={"sm"}>Tampilkan Grid</Text>
+				<Switch defaultChecked />
+			</Group>
+
+			<Group mb="md" justify="space-between">
+				<Text fw={"bold"} fz={"sm"}>Animasi Transisi</Text>
+				<Switch defaultChecked />
+			</Group>
 
 			<Group justify="flex-end" mt="xl">
 				<Button variant="outline">Batal</Button>
 				<Button>Simpan Perubahan</Button>
 			</Group>
-		</Card>
+		</Box>
 	);
 };
 
diff --git a/src/routes/pengaturan/akses-dan-tim.tsx b/src/routes/pengaturan/akses-dan-tim.tsx
index c02f08f..cb5e763 100644
--- a/src/routes/pengaturan/akses-dan-tim.tsx
+++ b/src/routes/pengaturan/akses-dan-tim.tsx
@@ -1,9 +1,10 @@
 import { createFileRoute } from "@tanstack/react-router";
+import AksesDanTimSettings from "@/components/pengaturan/akses-dan-tim";
 
 export const Route = createFileRoute("/pengaturan/akses-dan-tim")({
 	component: RouteComponent,
 });
 
 function RouteComponent() {
-	return <div>Hello "/pengaturan/akses-dan-tim"!</div>;
+	return <AksesDanTimSettings />;
 }
diff --git a/src/routes/pengaturan/keamanan.tsx b/src/routes/pengaturan/keamanan.tsx
index 57e3cd0..e3e5987 100644
--- a/src/routes/pengaturan/keamanan.tsx
+++ b/src/routes/pengaturan/keamanan.tsx
@@ -1,9 +1,10 @@
 import { createFileRoute } from "@tanstack/react-router";
+import KeamananSettings from "@/components/pengaturan/keamanan";
 
 export const Route = createFileRoute("/pengaturan/keamanan")({
 	component: RouteComponent,
 });
 
 function RouteComponent() {
-	return <div>Hello "/pengaturan/keamanan"!</div>;
+	return <KeamananSettings />;
 }
diff --git a/src/routes/pengaturan/notifikasi.tsx b/src/routes/pengaturan/notifikasi.tsx
index 8717f80..6913a10 100644
--- a/src/routes/pengaturan/notifikasi.tsx
+++ b/src/routes/pengaturan/notifikasi.tsx
@@ -1,9 +1,10 @@
 import { createFileRoute } from "@tanstack/react-router";
+import NotifikasiSettings from "@/components/pengaturan/notifikasi";
 
 export const Route = createFileRoute("/pengaturan/notifikasi")({
 	component: RouteComponent,
 });
 
 function RouteComponent() {
-	return <div>Hello "/pengaturan/notifikasi"!</div>;
+	return <NotifikasiSettings />;
 }