diff --git a/app/[locale]/(public)/audio/detail/[slug]/page.tsx b/app/[locale]/(public)/audio/detail/[slug]/page.tsx
index df29c9c6..1cf117e1 100644
--- a/app/[locale]/(public)/audio/detail/[slug]/page.tsx
+++ b/app/[locale]/(public)/audio/detail/[slug]/page.tsx
@@ -592,7 +592,7 @@ const DetailAudio = () => {
             <div className="text-gray-500 flex flex-col lg:flex-row justify-between items-center border-t mt-4">
               <div className="flex flex-col lg:flex-row items-center mt-3 lg:justify-between">
                 <p className="text-xs lg:text-sm">
-                  {t("by")}&nbsp;<span className="font-semibold text-black">{detailDataAudio?.uploadedBy?.userLevel?.name}</span>
+                  {t("by")}&nbsp;<span className="font-semibold text-black dark:text-white">{detailDataAudio?.uploadedBy?.userLevel?.name}</span>
                 </p>
                 {/* <p className="text-xs lg:text-sm">
                   &nbsp;|&nbsp;{t("updatedOn")} {detailDataAudio?.updatedAt} WIB &nbsp;|&nbsp;
@@ -621,7 +621,7 @@ const DetailAudio = () => {
           </div>
 
           {/* Bagian Kanan */}
-          <div className="md:w-1/4 p-4 h-fit bg-gray-300 rounded-lg mx-4">
+          <div className="md:w-1/4 p-4 h-fit bg-[#f7f7f7] dark:bg-slate-600 rounded-lg mx-4">
             {isSaved ? (
               <a onClick={() => handleDeleteWishlist()} className="flex flex-col mb-3 items-center justify-center cursor-pointer">
                 <Icon icon="material-symbols:bookmark" width={40} />
@@ -724,7 +724,7 @@ const DetailAudio = () => {
 
       <div className="w-full mb-8">
         {/* Comment */}
-        <div className="flex flex-col my-16 p-4 lg:p-10 bg-[#f7f7f7]">
+        <div className="flex flex-col my-16 p-4 lg:p-10 bg-[#f7f7f7] dark:bg-slate-600">
           <div className="gap-5 flex flex-col px-4 lg:px-14">
             <p className="flex items-start text-lg">{t("comment")}</p>
             <Textarea placeholder="Type your comments here." className="flex w-full pb-12" onChange={getInputValue} />
diff --git a/app/[locale]/(public)/audio/filter/page.tsx b/app/[locale]/(public)/audio/filter/page.tsx
index 4f8e5261..eb5b1b81 100644
--- a/app/[locale]/(public)/audio/filter/page.tsx
+++ b/app/[locale]/(public)/audio/filter/page.tsx
@@ -14,6 +14,7 @@ import "react-datepicker/dist/react-datepicker.css";
 import { close, loading } from "@/config/swal";
 import { useTranslations } from "next-intl";
 import { Skeleton } from "@/components/ui/skeleton";
+import { Reveal } from "@/components/landing-page/Reveal";
 
 const columns: ColumnDef<any>[] = [
   {
@@ -475,83 +476,85 @@ const FilterPage = () => {
 
         {/* Right */}
         <div className="w-full lg:w-[75%]">
-          <div className="flex flex-col items-end mb-4">
-            <h2 className="text-lg font-semibold">{t("sortBy")} </h2>
-            <select defaultValue={sortBy == "popular" ? "terpopuler" : "terbaru"} onChange={(e) => handleSorting(e)} className="border rounded-md py-2 px-3 focus:ring-red-500 focus:border-red-500">
-              <option value="latest">{t("latest")}</option>
-              <option value="popular">{t("mostPopular")}</option>
-            </select>
-          </div>
+          <Reveal>
+            <div className="flex flex-col items-end mb-4">
+              <h2 className="text-lg font-semibold">{t("sortBy")} </h2>
+              <select defaultValue={sortBy == "popular" ? "terpopuler" : "terbaru"} onChange={(e) => handleSorting(e)} className="border rounded-md py-2 px-3 focus:ring-red-500 focus:border-red-500">
+                <option value="latest">{t("latest")}</option>
+                <option value="popular">{t("mostPopular")}</option>
+              </select>
+            </div>
 
-          {isLoading ? (
-            <>
-              <div className="flex flex-col space-y-3 w-full justify-center items-center gap-3">
-                <Skeleton className="h-[100px] w-full rounded-xl" />
-                <Skeleton className="h-[100px] w-full rounded-xl" />
-                <Skeleton className="h-[100px] w-full rounded-xl" />
-                <Skeleton className="h-[100px] w-full rounded-xl" />
-                <Skeleton className="h-[100px] w-full rounded-xl" />
-                <Skeleton className="h-[100px] w-full rounded-xl" />
-              </div>
-            </>
-          ) : (
-            <>
-              {audioData?.length > 0 ? (
-                <div className="flex flex-col gap-3">
-                  {audioData?.map((audio: any) => (
-                    <div key={audio?.id}>
-                      <Link href={`/audio/detail/${audio?.slug}`} className="flex flex-row items-center bg-white dark:bg-gray-800 cursor-pointer shadow-md rounded-lg p-4 gap-4 w-full">
-                        <div className="flex justify-center lg:justify-between w-full gap-2 lg:gap-6">
-                          <div className="flex flex-row gap-3">
-                            <div className="flex items-center justify-center bg-red-500 text-white rounded-lg w-16 h-full lg:h-16">
-                              <svg width="32" height="34" viewBox="0 0 32 34" fill="null" xmlns="http://www.w3.org/2000/svg">
+            {isLoading ? (
+              <>
+                <div className="flex flex-col space-y-3 w-full justify-center items-center gap-3">
+                  <Skeleton className="h-[100px] w-full rounded-xl" />
+                  <Skeleton className="h-[100px] w-full rounded-xl" />
+                  <Skeleton className="h-[100px] w-full rounded-xl" />
+                  <Skeleton className="h-[100px] w-full rounded-xl" />
+                  <Skeleton className="h-[100px] w-full rounded-xl" />
+                  <Skeleton className="h-[100px] w-full rounded-xl" />
+                </div>
+              </>
+            ) : (
+              <>
+                {audioData?.length > 0 ? (
+                  <div className="flex flex-col gap-3">
+                    {audioData?.map((audio: any) => (
+                      <div key={audio?.id}>
+                        <Link href={`/audio/detail/${audio?.slug}`} className="flex flex-row items-center bg-white dark:bg-gray-800 cursor-pointer shadow-md rounded-lg p-4 gap-4 w-full">
+                          <div className="flex justify-center lg:justify-between w-full gap-2 lg:gap-6">
+                            <div className="flex flex-row gap-3">
+                              <div className="flex items-center justify-center bg-red-500 text-white rounded-lg w-16 h-full lg:h-16">
+                                <svg width="32" height="34" viewBox="0 0 32 34" fill="null" xmlns="http://www.w3.org/2000/svg">
+                                  <path
+                                    d="M23.404 0.452014C23.7033 0.35857 24.0204 0.336816 24.3297 0.388509C24.639 0.440203 24.9318 0.563895 25.1845 0.749599C25.4371 0.935304 25.6426 1.17782 25.7843 1.45756C25.9259 1.73731 25.9998 2.04644 26 2.36001V14.414C25.3462 14.2296 24.6766 14.1064 24 14.046V8.36001L10 12.736V27C10 28.1264 9.6197 29.2197 8.92071 30.1029C8.22172 30.9861 7.24499 31.6075 6.14877 31.8663C5.05255 32.125 3.90107 32.0061 2.88089 31.5287C1.86071 31.0514 1.03159 30.2435 0.52787 29.2361C0.024152 28.2286 -0.124656 27.0806 0.105556 25.9781C0.335768 24.8755 0.931513 23.883 1.79627 23.1613C2.66102 22.4396 3.74413 22.031 4.87009 22.0017C5.99606 21.9724 7.09893 22.3242 8.00001 23V6.73601C7.99982 6.30956 8.13596 5.8942 8.38854 5.55059C8.64112 5.20698 8.99692 4.9531 9.40401 4.82601L23.404 0.452014ZM10 10.64L24 6.26601V2.36001L10 6.73601V10.64ZM5.00001 24C4.20436 24 3.44129 24.3161 2.87869 24.8787C2.31608 25.4413 2.00001 26.2044 2.00001 27C2.00001 27.7957 2.31608 28.5587 2.87869 29.1213C3.44129 29.6839 4.20436 30 5.00001 30C5.79566 30 6.55872 29.6839 7.12133 29.1213C7.68394 28.5587 8.00001 27.7957 8.00001 27C8.00001 26.2044 7.68394 25.4413 7.12133 24.8787C6.55872 24.3161 5.79566 24 5.00001 24ZM32 25C32 27.387 31.0518 29.6761 29.364 31.364C27.6761 33.0518 25.387 34 23 34C20.6131 34 18.3239 33.0518 16.636 31.364C14.9482 29.6761 14 27.387 14 25C14 22.6131 14.9482 20.3239 16.636 18.6361C18.3239 16.9482 20.6131 16 23 16C25.387 16 27.6761 16.9482 29.364 18.6361C31.0518 20.3239 32 22.6131 32 25ZM27.47 24.128L21.482 20.828C21.3298 20.7443 21.1583 20.7016 20.9846 20.7043C20.8108 20.707 20.6408 20.7549 20.4912 20.8433C20.3416 20.9317 20.2176 21.0576 20.1315 21.2086C20.0453 21.3595 20 21.5302 20 21.704V28.304C20 28.4778 20.0453 28.6486 20.1315 28.7995C20.2176 28.9504 20.3416 29.0763 20.4912 29.1647C20.6408 29.2531 20.8108 29.301 20.9846 29.3037C21.1583 29.3064 21.3298 29.2638 21.482 29.18L27.47 25.88C27.6268 25.7937 27.7575 25.6669 27.8486 25.5128C27.9397 25.3587 27.9877 25.183 27.9877 25.004C27.9877 24.825 27.9397 24.6493 27.8486 24.4952C27.7575 24.3412 27.6268 24.2143 27.47 24.128Z"
+                                    fill="white"
+                                  />
+                                </svg>
+                              </div>
+                              <div className="flex flex-col">
+                                <div className="flex flex-col lg:flex-row lg:gap-2">
+                                  <div className="text-gray-500 dark:text-gray-400 flex flex-row text-sm items-center">
+                                    {formatDateToIndonesian(new Date(audio?.createdAt))} {audio?.timezone ? audio?.timezone : "WIB"}
+                                  </div>
+                                  <div className="text-gray-500 dark:text-gray-400 flex flex-row text-sm items-center">
+                                    |&nbsp;
+                                    <Icon icon="formkit:eye" width="15" height="15" />
+                                    &nbsp;{audio?.clickCount}{" "}
+                                  </div>
+                                </div>
+
+                                <div className="font-semibold text-gray-900 dark:text-white mt-1 text-sm h-5 hover:h-auto truncate hover:whitespace-normal hover:overflow-visible">{audio?.title}</div>
+                              </div>
+                            </div>
+
+                            <div className="flex flex-col lg:flex-row items-center place-content-end gap-3">
+                              <img src="/assets/wave.svg" alt="wave" className="h-5 lg:h-16" />
+                              <svg width="17" height="20" viewBox="0 0 32 34" fill="null" xmlns="http://www.w3.org/2000/svg">
                                 <path
                                   d="M23.404 0.452014C23.7033 0.35857 24.0204 0.336816 24.3297 0.388509C24.639 0.440203 24.9318 0.563895 25.1845 0.749599C25.4371 0.935304 25.6426 1.17782 25.7843 1.45756C25.9259 1.73731 25.9998 2.04644 26 2.36001V14.414C25.3462 14.2296 24.6766 14.1064 24 14.046V8.36001L10 12.736V27C10 28.1264 9.6197 29.2197 8.92071 30.1029C8.22172 30.9861 7.24499 31.6075 6.14877 31.8663C5.05255 32.125 3.90107 32.0061 2.88089 31.5287C1.86071 31.0514 1.03159 30.2435 0.52787 29.2361C0.024152 28.2286 -0.124656 27.0806 0.105556 25.9781C0.335768 24.8755 0.931513 23.883 1.79627 23.1613C2.66102 22.4396 3.74413 22.031 4.87009 22.0017C5.99606 21.9724 7.09893 22.3242 8.00001 23V6.73601C7.99982 6.30956 8.13596 5.8942 8.38854 5.55059C8.64112 5.20698 8.99692 4.9531 9.40401 4.82601L23.404 0.452014ZM10 10.64L24 6.26601V2.36001L10 6.73601V10.64ZM5.00001 24C4.20436 24 3.44129 24.3161 2.87869 24.8787C2.31608 25.4413 2.00001 26.2044 2.00001 27C2.00001 27.7957 2.31608 28.5587 2.87869 29.1213C3.44129 29.6839 4.20436 30 5.00001 30C5.79566 30 6.55872 29.6839 7.12133 29.1213C7.68394 28.5587 8.00001 27.7957 8.00001 27C8.00001 26.2044 7.68394 25.4413 7.12133 24.8787C6.55872 24.3161 5.79566 24 5.00001 24ZM32 25C32 27.387 31.0518 29.6761 29.364 31.364C27.6761 33.0518 25.387 34 23 34C20.6131 34 18.3239 33.0518 16.636 31.364C14.9482 29.6761 14 27.387 14 25C14 22.6131 14.9482 20.3239 16.636 18.6361C18.3239 16.9482 20.6131 16 23 16C25.387 16 27.6761 16.9482 29.364 18.6361C31.0518 20.3239 32 22.6131 32 25ZM27.47 24.128L21.482 20.828C21.3298 20.7443 21.1583 20.7016 20.9846 20.7043C20.8108 20.707 20.6408 20.7549 20.4912 20.8433C20.3416 20.9317 20.2176 21.0576 20.1315 21.2086C20.0453 21.3595 20 21.5302 20 21.704V28.304C20 28.4778 20.0453 28.6486 20.1315 28.7995C20.2176 28.9504 20.3416 29.0763 20.4912 29.1647C20.6408 29.2531 20.8108 29.301 20.9846 29.3037C21.1583 29.3064 21.3298 29.2638 21.482 29.18L27.47 25.88C27.6268 25.7937 27.7575 25.6669 27.8486 25.5128C27.9397 25.3587 27.9877 25.183 27.9877 25.004C27.9877 24.825 27.9397 24.6493 27.8486 24.4952C27.7575 24.3412 27.6268 24.2143 27.47 24.128Z"
-                                  fill="white"
+                                  fill="black"
                                 />
                               </svg>
-                            </div>
-                            <div className="flex flex-col">
-                              <div className="flex flex-col lg:flex-row lg:gap-2">
-                                <div className="text-gray-500 dark:text-gray-400 flex flex-row text-sm items-center">
-                                  {formatDateToIndonesian(new Date(audio?.createdAt))} {audio?.timezone ? audio?.timezone : "WIB"}
-                                </div>
-                                <div className="text-gray-500 dark:text-gray-400 flex flex-row text-sm items-center">
-                                  |&nbsp;
-                                  <Icon icon="formkit:eye" width="15" height="15" />
-                                  &nbsp;{audio?.clickCount}{" "}
-                                </div>
-                              </div>
-
-                              <div className="font-semibold text-gray-900 dark:text-white mt-1 text-sm h-5 hover:h-auto truncate hover:whitespace-normal hover:overflow-visible">{audio?.title}</div>
+                              <p className="text-xs lg:text-sm text-center"> {audio?.duration ? secondToTimes(Number(audio?.duration)) : "00:00:00"}</p>
+                              <Icon icon="ph:download-fill" className="text-red-500" fontSize={20} />
                             </div>
                           </div>
+                        </Link>
+                      </div>
+                    ))}
+                  </div>
+                ) : (
+                  <p className="flex items-center justify-center text-black">
+                    <img src="/assets/empty-data.png" alt="empty" className="h-60 w-60 my-4" />
+                  </p>
+                )}
+              </>
+            )}
 
-                          <div className="flex flex-col lg:flex-row items-center place-content-end gap-3">
-                            <img src="/assets/wave.svg" alt="wave" className="h-5 lg:h-16" />
-                            <svg width="17" height="20" viewBox="0 0 32 34" fill="null" xmlns="http://www.w3.org/2000/svg">
-                              <path
-                                d="M23.404 0.452014C23.7033 0.35857 24.0204 0.336816 24.3297 0.388509C24.639 0.440203 24.9318 0.563895 25.1845 0.749599C25.4371 0.935304 25.6426 1.17782 25.7843 1.45756C25.9259 1.73731 25.9998 2.04644 26 2.36001V14.414C25.3462 14.2296 24.6766 14.1064 24 14.046V8.36001L10 12.736V27C10 28.1264 9.6197 29.2197 8.92071 30.1029C8.22172 30.9861 7.24499 31.6075 6.14877 31.8663C5.05255 32.125 3.90107 32.0061 2.88089 31.5287C1.86071 31.0514 1.03159 30.2435 0.52787 29.2361C0.024152 28.2286 -0.124656 27.0806 0.105556 25.9781C0.335768 24.8755 0.931513 23.883 1.79627 23.1613C2.66102 22.4396 3.74413 22.031 4.87009 22.0017C5.99606 21.9724 7.09893 22.3242 8.00001 23V6.73601C7.99982 6.30956 8.13596 5.8942 8.38854 5.55059C8.64112 5.20698 8.99692 4.9531 9.40401 4.82601L23.404 0.452014ZM10 10.64L24 6.26601V2.36001L10 6.73601V10.64ZM5.00001 24C4.20436 24 3.44129 24.3161 2.87869 24.8787C2.31608 25.4413 2.00001 26.2044 2.00001 27C2.00001 27.7957 2.31608 28.5587 2.87869 29.1213C3.44129 29.6839 4.20436 30 5.00001 30C5.79566 30 6.55872 29.6839 7.12133 29.1213C7.68394 28.5587 8.00001 27.7957 8.00001 27C8.00001 26.2044 7.68394 25.4413 7.12133 24.8787C6.55872 24.3161 5.79566 24 5.00001 24ZM32 25C32 27.387 31.0518 29.6761 29.364 31.364C27.6761 33.0518 25.387 34 23 34C20.6131 34 18.3239 33.0518 16.636 31.364C14.9482 29.6761 14 27.387 14 25C14 22.6131 14.9482 20.3239 16.636 18.6361C18.3239 16.9482 20.6131 16 23 16C25.387 16 27.6761 16.9482 29.364 18.6361C31.0518 20.3239 32 22.6131 32 25ZM27.47 24.128L21.482 20.828C21.3298 20.7443 21.1583 20.7016 20.9846 20.7043C20.8108 20.707 20.6408 20.7549 20.4912 20.8433C20.3416 20.9317 20.2176 21.0576 20.1315 21.2086C20.0453 21.3595 20 21.5302 20 21.704V28.304C20 28.4778 20.0453 28.6486 20.1315 28.7995C20.2176 28.9504 20.3416 29.0763 20.4912 29.1647C20.6408 29.2531 20.8108 29.301 20.9846 29.3037C21.1583 29.3064 21.3298 29.2638 21.482 29.18L27.47 25.88C27.6268 25.7937 27.7575 25.6669 27.8486 25.5128C27.9397 25.3587 27.9877 25.183 27.9877 25.004C27.9877 24.825 27.9397 24.6493 27.8486 24.4952C27.7575 24.3412 27.6268 24.2143 27.47 24.128Z"
-                                fill="black"
-                              />
-                            </svg>
-                            <p className="text-xs lg:text-sm text-center"> {audio?.duration ? secondToTimes(Number(audio?.duration)) : "00:00:00"}</p>
-                            <Icon icon="ph:download-fill" className="text-red-500" fontSize={20} />
-                          </div>
-                        </div>
-                      </Link>
-                    </div>
-                  ))}
-                </div>
-              ) : (
-                <p className="flex items-center justify-center text-black">
-                  <img src="/assets/empty-data.png" alt="empty" className="h-60 w-60 my-4" />
-                </p>
-              )}
-            </>
-          )}
-
-          <LandingPagination table={table} totalData={totalData} totalPage={totalPage} />
+            <LandingPagination table={table} totalData={totalData} totalPage={totalPage} />
+          </Reveal>
         </div>
       </div>
     </div>
diff --git a/app/[locale]/(public)/contact/page.tsx b/app/[locale]/(public)/contact/page.tsx
index 20306100..68ff5a15 100644
--- a/app/[locale]/(public)/contact/page.tsx
+++ b/app/[locale]/(public)/contact/page.tsx
@@ -95,35 +95,35 @@ const ContactForm = () => {
   };
 
   return (
-    <form method="POST" id="form" onSubmit={handleSubmit(onSubmit)} className="max-w-2xl mx-auto bg-white p-6">
+    <form method="POST" id="form" onSubmit={handleSubmit(onSubmit)} className="max-w-2xl mx-auto bg-white dark:bg-black p-6">
       <Reveal>
         {/* Header */}
         <div className="flex items-center justify-center mb-6">
           <img src="/assets/icons-contact.png" alt="contact" />
           <h2 className="ml-4 text-2xl font-bold">{t("contactUs")}</h2>
         </div>
-        <h3 className="text-lg font-semibold text-gray-800 mb-1">{t("writeMessage")}</h3>
-        <p className="text-sm text-gray-600 mb-6">{t("leaveMessage")}</p>
+        <h3 className="text-lg font-semibold text-gray-800 dark:text-white mb-1">{t("writeMessage")}</h3>
+        <p className="text-sm text-gray-600 dark:text-white mb-6">{t("leaveMessage")}</p>
 
         {/* Form */}
         <form>
           <div className="mb-4">
-            <label className="block text-sm font-medium text-gray-700 mb-1">{t("name")}</label>
+            <label className="block text-sm font-medium text-gray-700 dark:text-white mb-1">{t("name")}</label>
             <input type="text" placeholder={t("enterName")} className={`w-full p-2 border border-gray-300 rounded-md focus:outline-none focus:ring-2 focus:ring-blue-500 ${errors.name ? "block" : ""}`} {...register("name")} required />
           </div>
 
           <div className="mb-4">
-            <label className="block text-sm font-medium text-gray-700 mb-1">Email</label>
+            <label className="block text-sm font-medium text-gray-700 dark:text-white mb-1">Email</label>
             <input type="email" placeholder="name@mail.com" className={`w-full p-2 border border-gray-300 rounded-md focus:outline-none focus:ring-2 focus:ring-blue-500 ${errors.email ? "block" : ""}`} {...register("email")} required />
           </div>
 
           <div className="mb-4">
-            <label className="block text-sm font-medium text-gray-700 mb-1">{t("number")} (Optional)</label>
+            <label className="block text-sm font-medium text-gray-700 dark:text-white mb-1">{t("number")} (Optional)</label>
             <input type="text" placeholder={t("enterNumber")} className="w-full p-2 border border-gray-300 rounded-md focus:outline-none focus:ring-2 focus:ring-blue-500" />
           </div>
 
           <div className="mb-4">
-            <label className="block text-sm font-medium text-gray-700 mb-1">{t("subject")}</label>
+            <label className="block text-sm font-medium text-gray-700 dark:text-white mb-1">{t("subject")}</label>
             <select
               className={`w-full p-2 border border-gray-300 rounded-md focus:outline-none focus:ring-2 focus:ring-blue-500 ${errors.subjects ? "block" : ""}`}
               {...register("subjects", { onChange: (e) => handleSubjects(e) })}
@@ -144,7 +144,7 @@ const ContactForm = () => {
           </div>
 
           <div className="mb-4">
-            <label className="block text-sm font-medium text-gray-700 mb-1">{t("messages")}</label>
+            <label className="block text-sm font-medium text-gray-700 dark:text-white mb-1">{t("messages")}</label>
             <textarea placeholder={t("writeYourMessage")} rows={4} className="w-full p-2 border border-gray-300 rounded-md focus:outline-none focus:ring-2 focus:ring-blue-500"></textarea>
           </div>
 
diff --git a/app/[locale]/(public)/content-management/rewrite/detail/[id]/page.tsx b/app/[locale]/(public)/content-management/rewrite/detail/[id]/page.tsx
index 27740dad..ed58c1cd 100644
--- a/app/[locale]/(public)/content-management/rewrite/detail/[id]/page.tsx
+++ b/app/[locale]/(public)/content-management/rewrite/detail/[id]/page.tsx
@@ -280,8 +280,10 @@ const page = () => {
                     </div>
 
                     <div className="w-full">
-                      <div className="font-semibold mb-3">
-                        <label htmlFor="description">Deskripsi Artikel</label>
+                      <div className="font-semibold mb-3 text-black gap-2">
+                        <label htmlFor="description" className="text-black dark:text-white">
+                          Deskripsi Artikel
+                        </label>
                         <CustomEditor onChange={(e: any) => {}} initialData={articleBody || ""} />
                       </div>
                     </div>
diff --git a/app/[locale]/(public)/content-management/users/page.tsx b/app/[locale]/(public)/content-management/users/page.tsx
index 6f047011..3342a832 100644
--- a/app/[locale]/(public)/content-management/users/page.tsx
+++ b/app/[locale]/(public)/content-management/users/page.tsx
@@ -132,10 +132,10 @@ const page = () => {
               <div key={row?.id}>
                 <Dialog>
                   <DialogTrigger>
-                    <div className="flex flex-col items-center border border-gray-500 p-2 bg-[#f8f8f8] rounded-md">
+                    <div className="flex flex-col items-center border border-gray-500 p-2 bg-[#f8f8f8]  rounded-md">
                       <Image src="/assets/gg-profile.png" alt="" width={1280} height={720} className="h-10 w-10 mb-4" />
-                      <p className="font-bold text-base ">{row?.fullname}</p>
-                      <p className="text-sm font-light">{row?.username || "username"}</p>
+                      <p className="font-bold text-base text-black">{row?.fullname}</p>
+                      <p className="text-sm font-light text-black">{row?.username || "username"}</p>
                     </div>
                   </DialogTrigger>
                   <DialogContent className="flex flex-row justify-center" size="sm">
diff --git a/app/[locale]/(public)/document/detail/[slug]/page.tsx b/app/[locale]/(public)/document/detail/[slug]/page.tsx
index c6c27d58..a9d3a4ce 100644
--- a/app/[locale]/(public)/document/detail/[slug]/page.tsx
+++ b/app/[locale]/(public)/document/detail/[slug]/page.tsx
@@ -140,11 +140,19 @@ const DetailDocument = () => {
     }
   };
 
-  const sizes = [
-    { label: "DOC", value: "...KB" },
-    { label: "PPT", value: "...KB" },
-    { label: "PDF", value: "...KB" },
-  ];
+  const size = [{ label: "DOC" }, { label: "PPT" }, { label: "PDF" }];
+
+  function formatBytes(kb: any, decimals = 2) {
+    if (kb == 0 || kb == null) return "0 KB";
+
+    const k = 1024;
+    const dm = decimals < 0 ? 0 : decimals;
+    const sizes = ["KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"];
+
+    const i = Math.floor(Math.log(kb) / Math.log(k));
+
+    return `${parseFloat((kb / k ** i).toFixed(dm))} ${sizes[i]}`;
+  }
 
   async function sendActivityLog(activityTypeId: number) {
     const data = {
@@ -422,6 +430,7 @@ const DetailDocument = () => {
               <img src={detailDataDocument?.files[selectedDocument]?.url} alt="Main" className="rounded-lg w-auto h-fit" />
               <div className="absolute top-4 left-4"></div>
             </div>
+
             {/* Footer Informasi */}
             <div className="text-gray-500 flex flex-col lg:flex-row justify-between items-center border-t mt-4">
               {/* <p className="flex flex-row items-center mt-3">
@@ -433,7 +442,7 @@ const DetailDocument = () => {
               <p className="mt-3">Kreator: {detailDataDocument?.creatorName}</p> */}
               <div className="flex flex-col lg:flex-row items-center mt-3 lg:justify-between">
                 <p className="text-xs lg:text-sm">
-                  {t("by")}&nbsp;<span className="font-semibold text-black">{detailDataDocument?.uploadedBy?.userLevel?.name}</span>
+                  {t("by")}&nbsp;<span className="font-semibold text-black dark:text-white">{detailDataDocument?.uploadedBy?.userLevel?.name}</span>
                 </p>
                 {/* <p className="text-xs lg:text-sm">
                   &nbsp;|&nbsp; {t("updatedOn")} {detailDataDocument?.updatedAt} WIB &nbsp;|&nbsp;
@@ -443,7 +452,8 @@ const DetailDocument = () => {
                   {formatDateToIndonesian(new Date(detailDataDocument?.updatedAt))} {"WIB"}
                 </p>
                 <p className="text-xs lg:text-sm flex justify-center items-center">
-                &nbsp;| &nbsp;<Icon icon="formkit:eye" width="15" height="15" />
+                  &nbsp;| &nbsp;
+                  <Icon icon="formkit:eye" width="15" height="15" />
                   &nbsp;{detailDataDocument?.clickCount}&nbsp;
                 </p>
               </div>
@@ -457,13 +467,13 @@ const DetailDocument = () => {
 
             {/* Keterangan */}
             <div className="">
-              <h1 className="flex flex-row font-bold text-lg lg:text-2xl my-8 text-justify space-y-4">{detailDataDocument?.title}</h1>
-              <div dangerouslySetInnerHTML={{ __html: detailDataDocument?.htmlDescription }} />
+              <h1 className="flex flex-row font-bold text-lg lg:text-2xl my-8 text-justify">{detailDataDocument?.title}</h1>
+              <div className="font-light text-justify mb-5 space-y-4 lg:mb-0" dangerouslySetInnerHTML={{ __html: detailDataDocument?.htmlDescription }} />
             </div>
           </div>
 
           {/* Bagian Kanan */}
-          <div className="md:w-1/4 p-4 bg-[#f7f7f7] h-fit rounded-lg mx-4">
+          <div className="md:w-1/4 p-4 bg-[#f7f7f7] dark:bg-slate-600 h-fit rounded-lg mx-4">
             {isSaved ? (
               <a onClick={() => handleDeleteWishlist()} className="flex flex-col mb-3 items-center justify-center cursor-pointer">
                 <Icon icon="material-symbols:bookmark" width={40} />
@@ -497,14 +507,14 @@ const DetailDocument = () => {
             <h4 className="flex text-lg justify-center items-center font-semibold my-3">{t("docSize")}</h4>
             <div className="border-t border-black my-4"></div>
             <div className="space-y-2">
-              {sizes.map((size: any) => (
+              {size.map((size: any) => (
                 <div className="flex flex-row justify-between">
                   <div key={size.label} className="items-center flex flex-row  gap-2 cursor-pointer">
                     <input type="radio" name="size" value={size.label} checked={selectedSize === size.label} onChange={() => setSelectedSize(size.label)} className="text-red-600 focus:ring-red-600" />
                     <div className="text-sm">{size.label}</div>
                   </div>
                   <div className="">
-                    <div className="text-sm">{size.value}</div>
+                    <div className="text-sm">{formatBytes(size?.size)}</div>
                   </div>
                 </div>
               ))}
@@ -564,7 +574,7 @@ const DetailDocument = () => {
 
       <div className="w-full mb-8">
         {/* Comment */}
-        <div className="flex flex-col my-16 p-4 lg:p-10 bg-[#f7f7f7]">
+        <div className="flex flex-col my-16 p-4 lg:p-10 bg-[#f7f7f7] dark:bg-slate-600">
           <div className="gap-5 flex flex-col px-4 lg:px-14">
             <p className="flex items-start text-lg">{t("comment")}</p>
             <Textarea placeholder="Type your comments here." className="flex w-full pb-12" onChange={getInputValue} />
diff --git a/app/[locale]/(public)/document/filter/page.tsx b/app/[locale]/(public)/document/filter/page.tsx
index 164e8857..bda1f297 100644
--- a/app/[locale]/(public)/document/filter/page.tsx
+++ b/app/[locale]/(public)/document/filter/page.tsx
@@ -394,7 +394,7 @@ const FilterPage = () => {
 
       {/* Left */}
       <div className="flex flex-col lg:flex-row gap-6 p-4">
-        <div className="lg:w-[45%] w-full bg-[#f7f7f7] dark:bg-black p-4 rounded-lg shadow-md">
+        <div className="lg:w-[25%] w-full bg-[#f7f7f7] dark:bg-black p-4 rounded-lg shadow-md">
           <h2 className="text-lg font-semibold mb-4 flex items-center gap-1">
             <Icon icon="stash:filter-light" fontSize={30} />
             Filter
@@ -508,71 +508,73 @@ const FilterPage = () => {
         </div>
 
         {/* Right */}
-        <Reveal>
-          <div className="flex-1">
-            <div className="flex flex-col items-end mb-4">
-              <h2 className="text-lg font-semibold">{t("sortBy")}</h2>
-              <select defaultValue={sortBy == "popular" ? "terpopuler" : "terbaru"} onChange={(e) => handleSorting(e)} className="border rounded-md py-2 px-3 focus:ring-red-500 focus:border-red-500">
-                <option value="latest">{t("latest")}</option>
-                <option value="popular">{t("mostPopular")}</option>
-              </select>
-            </div>
-
-            {isLoading ? (
-              <div className="flex flex-col gap-4">
-                <div className="flex flex-col lg:flex-row space-y-3 w-full justify-center items-center gap-3">
-                  <Skeleton className="h-[100px] w-[500px] rounded-xl" />
-                  <Skeleton className="h-[100px] w-[500px] rounded-xl" />
-                </div>
-                <div className="flex flex-col lg:flex-row space-y-3 w-full justify-center items-center gap-3">
-                  <Skeleton className="h-[100px] w-[500px] rounded-xl" />
-                  <Skeleton className="h-[100px] w-[500px] rounded-xl" />
-                </div>
-                <div className="flex flex-col lg:flex-row space-y-3 w-full justify-center items-center gap-3">
-                  <Skeleton className="h-[100px] w-[500px] rounded-xl" />
-                  <Skeleton className="h-[100px] w-[500px] rounded-xl" />
-                </div>
+        <div className="w-full lg:w-[75%]">
+          <Reveal>
+            <div className="flex-1">
+              <div className="flex flex-col items-end mb-4">
+                <h2 className="text-lg font-semibold">{t("sortBy")}</h2>
+                <select defaultValue={sortBy == "popular" ? "terpopuler" : "terbaru"} onChange={(e) => handleSorting(e)} className="border rounded-md py-2 px-3 focus:ring-red-500 focus:border-red-500">
+                  <option value="latest">{t("latest")}</option>
+                  <option value="popular">{t("mostPopular")}</option>
+                </select>
               </div>
-            ) : (
-              <>
-                {documentData?.length > 0 ? (
-                  <div className=" grid grid-cols-1 md:grid-cols-2 gap-6">
-                    {documentData?.map((document: any) => (
-                      <Link href={`/document/detail/${document?.slug}`} key={document?.id} className="flex flex-col bg-yellow-500 sm:flex-row items-center dark:bg-gray-800 cursor-pointer shadow-md rounded-lg p-4 gap-4 w-full">
-                        <div className="flex items-center justify-center rounded-lg w-16 h-16">
-                          <svg width="28" height="34" viewBox="0 0 28 34" fill="none" xmlns="http://www.w3.org/2000/svg">
-                            <path
-                              d="M5.6665 17.4167C5.6665 17.0851 5.7982 16.7672 6.03262 16.5328C6.26704 16.2984 6.58498 16.1667 6.9165 16.1667C7.24802 16.1667 7.56597 16.2984 7.80039 16.5328C8.03481 16.7672 8.1665 17.0851 8.1665 17.4167C8.1665 17.7482 8.03481 18.0661 7.80039 18.3005C7.56597 18.535 7.24802 18.6667 6.9165 18.6667C6.58498 18.6667 6.26704 18.535 6.03262 18.3005C5.7982 18.0661 5.6665 17.7482 5.6665 17.4167ZM6.9165 21.1667C6.58498 21.1667 6.26704 21.2984 6.03262 21.5328C5.7982 21.7672 5.6665 22.0851 5.6665 22.4167C5.6665 22.7482 5.7982 23.0661 6.03262 23.3005C6.26704 23.535 6.58498 23.6667 6.9165 23.6667C7.24802 23.6667 7.56597 23.535 7.80039 23.3005C8.03481 23.0661 8.1665 22.7482 8.1665 22.4167C8.1665 22.0851 8.03481 21.7672 7.80039 21.5328C7.56597 21.2984 7.24802 21.1667 6.9165 21.1667ZM5.6665 27.4167C5.6665 27.0851 5.7982 26.7672 6.03262 26.5328C6.26704 26.2984 6.58498 26.1667 6.9165 26.1667C7.24802 26.1667 7.56597 26.2984 7.80039 26.5328C8.03481 26.7672 8.1665 27.0851 8.1665 27.4167C8.1665 27.7482 8.03481 28.0661 7.80039 28.3005C7.56597 28.535 7.24802 28.6667 6.9165 28.6667C6.58498 28.6667 6.26704 28.535 6.03262 28.3005C5.7982 28.0661 5.6665 27.7482 5.6665 27.4167ZM11.9165 16.1667C11.585 16.1667 11.267 16.2984 11.0326 16.5328C10.7982 16.7672 10.6665 17.0851 10.6665 17.4167C10.6665 17.7482 10.7982 18.0661 11.0326 18.3005C11.267 18.535 11.585 18.6667 11.9165 18.6667H21.0832C21.4147 18.6667 21.7326 18.535 21.9671 18.3005C22.2015 18.0661 22.3332 17.7482 22.3332 17.4167C22.3332 17.0851 22.2015 16.7672 21.9671 16.5328C21.7326 16.2984 21.4147 16.1667 21.0832 16.1667H11.9165ZM10.6665 22.4167C10.6665 22.0851 10.7982 21.7672 11.0326 21.5328C11.267 21.2984 11.585 21.1667 11.9165 21.1667H21.0832C21.4147 21.1667 21.7326 21.2984 21.9671 21.5328C22.2015 21.7672 22.3332 22.0851 22.3332 22.4167C22.3332 22.7482 22.2015 23.0661 21.9671 23.3005C21.7326 23.535 21.4147 23.6667 21.0832 23.6667H11.9165C11.585 23.6667 11.267 23.535 11.0326 23.3005C10.7982 23.0661 10.6665 22.7482 10.6665 22.4167ZM11.9165 26.1667C11.585 26.1667 11.267 26.2984 11.0326 26.5328C10.7982 26.7672 10.6665 27.0851 10.6665 27.4167C10.6665 27.7482 10.7982 28.0661 11.0326 28.3005C11.267 28.535 11.585 28.6667 11.9165 28.6667H21.0832C21.4147 28.6667 21.7326 28.535 21.9671 28.3005C22.2015 28.0661 22.3332 27.7482 22.3332 27.4167C22.3332 27.0851 22.2015 26.7672 21.9671 26.5328C21.7326 26.2984 21.4147 26.1667 21.0832 26.1667H11.9165ZM26.3565 11.0233L16.6415 1.31C16.6157 1.28605 16.5885 1.26378 16.5598 1.24333C16.5392 1.22742 16.5192 1.21074 16.4998 1.19333C16.3852 1.08512 16.2632 0.984882 16.1348 0.893332C16.0922 0.865802 16.0476 0.841298 16.0015 0.819999L15.9215 0.779999L15.8382 0.731666C15.7482 0.679999 15.6565 0.626665 15.5615 0.586665C15.2296 0.454104 14.8783 0.376423 14.5215 0.356665C14.4885 0.354519 14.4557 0.350625 14.4232 0.344999C14.3779 0.338012 14.3323 0.334114 14.2865 0.333332H3.99984C3.11578 0.333332 2.26794 0.684521 1.64281 1.30964C1.01769 1.93476 0.666504 2.78261 0.666504 3.66667V30.3333C0.666504 31.2174 1.01769 32.0652 1.64281 32.6904C2.26794 33.3155 3.11578 33.6667 3.99984 33.6667H23.9998C24.8839 33.6667 25.7317 33.3155 26.3569 32.6904C26.982 32.0652 27.3332 31.2174 27.3332 30.3333V13.38C27.333 12.496 26.9817 11.6483 26.3565 11.0233ZM24.8332 30.3333C24.8332 30.5543 24.7454 30.7663 24.5891 30.9226C24.4328 31.0789 24.2208 31.1667 23.9998 31.1667H3.99984C3.77882 31.1667 3.56686 31.0789 3.41058 30.9226C3.2543 30.7663 3.1665 30.5543 3.1665 30.3333V3.66667C3.1665 3.44565 3.2543 3.23369 3.41058 3.07741C3.56686 2.92113 3.77882 2.83333 3.99984 2.83333H13.9998V10.3333C13.9998 11.2174 14.351 12.0652 14.9761 12.6904C15.6013 13.3155 16.4491 13.6667 17.3332 13.6667H24.8332V30.3333ZM16.4998 4.70166L22.9632 11.1667H17.3332C17.1122 11.1667 16.9002 11.0789 16.7439 10.9226C16.5876 10.7663 16.4998 10.5543 16.4998 10.3333V4.70166Z"
-                              fill="black"
-                            />
-                          </svg>
-                        </div>
-                        <div className="flex flex-col flex-1 gap-2">
-                          <div className="text-gray-500 dark:text-gray-400 flex flex-row items-center gap-2 text-xs">
-                            {formatDateToIndonesian(new Date(document?.createdAt))} {document?.timezone ? document?.timezone : "WIB"} | <Icon icon="formkit:eye" width="15" height="15" /> 518
-                          </div>
-                          <div className="font-semibold text-gray-900 dark:text-white mt-1 text-sm">{document?.title}</div>
-                          <div className="flex gap-2 items-center text-xs text-red-500 dark:text-red-500">
-                            <svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 512 512">
-                              <path fill="#f00" d="M224 30v256h-64l96 128l96-128h-64V30zM32 434v48h448v-48z" />
-                            </svg>
-                            Download Dokumen
-                          </div>
-                        </div>
-                      </Link>
-                    ))}
-                  </div>
-                ) : (
-                  <p className="flex items-center justify-center">
-                    <img src="/assets/empty-data.png" alt="empty" className="h-60 w-60 my-4" />
-                  </p>
-                )}
-              </>
-            )}
 
-            <LandingPagination table={table} totalData={totalData} totalPage={totalPage} />
-          </div>
-        </Reveal>
+              {isLoading ? (
+                <div className="flex flex-col gap-4">
+                  <div className="flex flex-col lg:flex-row space-y-3 w-full justify-center items-center gap-3">
+                    <Skeleton className="h-[100px] w-[500px] rounded-xl" />
+                    <Skeleton className="h-[100px] w-[500px] rounded-xl" />
+                  </div>
+                  <div className="flex flex-col lg:flex-row space-y-3 w-full justify-center items-center gap-3">
+                    <Skeleton className="h-[100px] w-[500px] rounded-xl" />
+                    <Skeleton className="h-[100px] w-[500px] rounded-xl" />
+                  </div>
+                  <div className="flex flex-col lg:flex-row space-y-3 w-full justify-center items-center gap-3">
+                    <Skeleton className="h-[100px] w-[500px] rounded-xl" />
+                    <Skeleton className="h-[100px] w-[500px] rounded-xl" />
+                  </div>
+                </div>
+              ) : (
+                <>
+                  {documentData?.length > 0 ? (
+                    <div className=" grid grid-cols-1 md:grid-cols-2 gap-6">
+                      {documentData?.map((document: any) => (
+                        <Link href={`/document/detail/${document?.slug}`} key={document?.id} className="flex flex-col bg-yellow-500 sm:flex-row items-center dark:bg-gray-800 cursor-pointer shadow-md rounded-lg p-4 gap-4 w-full">
+                          <div className="flex items-center justify-center rounded-lg w-16 h-16">
+                            <svg width="28" height="34" viewBox="0 0 28 34" fill="none" xmlns="http://www.w3.org/2000/svg">
+                              <path
+                                d="M5.6665 17.4167C5.6665 17.0851 5.7982 16.7672 6.03262 16.5328C6.26704 16.2984 6.58498 16.1667 6.9165 16.1667C7.24802 16.1667 7.56597 16.2984 7.80039 16.5328C8.03481 16.7672 8.1665 17.0851 8.1665 17.4167C8.1665 17.7482 8.03481 18.0661 7.80039 18.3005C7.56597 18.535 7.24802 18.6667 6.9165 18.6667C6.58498 18.6667 6.26704 18.535 6.03262 18.3005C5.7982 18.0661 5.6665 17.7482 5.6665 17.4167ZM6.9165 21.1667C6.58498 21.1667 6.26704 21.2984 6.03262 21.5328C5.7982 21.7672 5.6665 22.0851 5.6665 22.4167C5.6665 22.7482 5.7982 23.0661 6.03262 23.3005C6.26704 23.535 6.58498 23.6667 6.9165 23.6667C7.24802 23.6667 7.56597 23.535 7.80039 23.3005C8.03481 23.0661 8.1665 22.7482 8.1665 22.4167C8.1665 22.0851 8.03481 21.7672 7.80039 21.5328C7.56597 21.2984 7.24802 21.1667 6.9165 21.1667ZM5.6665 27.4167C5.6665 27.0851 5.7982 26.7672 6.03262 26.5328C6.26704 26.2984 6.58498 26.1667 6.9165 26.1667C7.24802 26.1667 7.56597 26.2984 7.80039 26.5328C8.03481 26.7672 8.1665 27.0851 8.1665 27.4167C8.1665 27.7482 8.03481 28.0661 7.80039 28.3005C7.56597 28.535 7.24802 28.6667 6.9165 28.6667C6.58498 28.6667 6.26704 28.535 6.03262 28.3005C5.7982 28.0661 5.6665 27.7482 5.6665 27.4167ZM11.9165 16.1667C11.585 16.1667 11.267 16.2984 11.0326 16.5328C10.7982 16.7672 10.6665 17.0851 10.6665 17.4167C10.6665 17.7482 10.7982 18.0661 11.0326 18.3005C11.267 18.535 11.585 18.6667 11.9165 18.6667H21.0832C21.4147 18.6667 21.7326 18.535 21.9671 18.3005C22.2015 18.0661 22.3332 17.7482 22.3332 17.4167C22.3332 17.0851 22.2015 16.7672 21.9671 16.5328C21.7326 16.2984 21.4147 16.1667 21.0832 16.1667H11.9165ZM10.6665 22.4167C10.6665 22.0851 10.7982 21.7672 11.0326 21.5328C11.267 21.2984 11.585 21.1667 11.9165 21.1667H21.0832C21.4147 21.1667 21.7326 21.2984 21.9671 21.5328C22.2015 21.7672 22.3332 22.0851 22.3332 22.4167C22.3332 22.7482 22.2015 23.0661 21.9671 23.3005C21.7326 23.535 21.4147 23.6667 21.0832 23.6667H11.9165C11.585 23.6667 11.267 23.535 11.0326 23.3005C10.7982 23.0661 10.6665 22.7482 10.6665 22.4167ZM11.9165 26.1667C11.585 26.1667 11.267 26.2984 11.0326 26.5328C10.7982 26.7672 10.6665 27.0851 10.6665 27.4167C10.6665 27.7482 10.7982 28.0661 11.0326 28.3005C11.267 28.535 11.585 28.6667 11.9165 28.6667H21.0832C21.4147 28.6667 21.7326 28.535 21.9671 28.3005C22.2015 28.0661 22.3332 27.7482 22.3332 27.4167C22.3332 27.0851 22.2015 26.7672 21.9671 26.5328C21.7326 26.2984 21.4147 26.1667 21.0832 26.1667H11.9165ZM26.3565 11.0233L16.6415 1.31C16.6157 1.28605 16.5885 1.26378 16.5598 1.24333C16.5392 1.22742 16.5192 1.21074 16.4998 1.19333C16.3852 1.08512 16.2632 0.984882 16.1348 0.893332C16.0922 0.865802 16.0476 0.841298 16.0015 0.819999L15.9215 0.779999L15.8382 0.731666C15.7482 0.679999 15.6565 0.626665 15.5615 0.586665C15.2296 0.454104 14.8783 0.376423 14.5215 0.356665C14.4885 0.354519 14.4557 0.350625 14.4232 0.344999C14.3779 0.338012 14.3323 0.334114 14.2865 0.333332H3.99984C3.11578 0.333332 2.26794 0.684521 1.64281 1.30964C1.01769 1.93476 0.666504 2.78261 0.666504 3.66667V30.3333C0.666504 31.2174 1.01769 32.0652 1.64281 32.6904C2.26794 33.3155 3.11578 33.6667 3.99984 33.6667H23.9998C24.8839 33.6667 25.7317 33.3155 26.3569 32.6904C26.982 32.0652 27.3332 31.2174 27.3332 30.3333V13.38C27.333 12.496 26.9817 11.6483 26.3565 11.0233ZM24.8332 30.3333C24.8332 30.5543 24.7454 30.7663 24.5891 30.9226C24.4328 31.0789 24.2208 31.1667 23.9998 31.1667H3.99984C3.77882 31.1667 3.56686 31.0789 3.41058 30.9226C3.2543 30.7663 3.1665 30.5543 3.1665 30.3333V3.66667C3.1665 3.44565 3.2543 3.23369 3.41058 3.07741C3.56686 2.92113 3.77882 2.83333 3.99984 2.83333H13.9998V10.3333C13.9998 11.2174 14.351 12.0652 14.9761 12.6904C15.6013 13.3155 16.4491 13.6667 17.3332 13.6667H24.8332V30.3333ZM16.4998 4.70166L22.9632 11.1667H17.3332C17.1122 11.1667 16.9002 11.0789 16.7439 10.9226C16.5876 10.7663 16.4998 10.5543 16.4998 10.3333V4.70166Z"
+                                fill="black"
+                              />
+                            </svg>
+                          </div>
+                          <div className="flex flex-col flex-1 gap-2">
+                            <div className="text-gray-500 dark:text-gray-400 flex flex-row items-center gap-2 text-xs">
+                              {formatDateToIndonesian(new Date(document?.createdAt))} {document?.timezone ? document?.timezone : "WIB"} | <Icon icon="formkit:eye" width="15" height="15" /> 518
+                            </div>
+                            <div className="font-semibold text-gray-900 dark:text-white mt-1 text-sm">{document?.title}</div>
+                            <div className="flex gap-2 items-center text-xs text-red-500 dark:text-red-500">
+                              <svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 512 512">
+                                <path fill="#f00" d="M224 30v256h-64l96 128l96-128h-64V30zM32 434v48h448v-48z" />
+                              </svg>
+                              Download Dokumen
+                            </div>
+                          </div>
+                        </Link>
+                      ))}
+                    </div>
+                  ) : (
+                    <p className="flex items-center justify-center">
+                      <img src="/assets/empty-data.png" alt="empty" className="h-60 w-60 my-4" />
+                    </p>
+                  )}
+                </>
+              )}
+
+              <LandingPagination table={table} totalData={totalData} totalPage={totalPage} />
+            </div>
+          </Reveal>
+        </div>
       </div>
     </div>
   );
diff --git a/app/[locale]/(public)/faqs/page.tsx b/app/[locale]/(public)/faqs/page.tsx
index 9d42ae18..d4ebf029 100644
--- a/app/[locale]/(public)/faqs/page.tsx
+++ b/app/[locale]/(public)/faqs/page.tsx
@@ -42,7 +42,7 @@ const FAQS: React.FC = () => {
       <Reveal>
         <div className="flex items-center justify-center mb-6">
           <img src="/assets/icons-faqs.png" alt="Faqs" />
-          <h2 className="ml-4 text-lg lg:text-2xl font-bold text-gray-800">Frequently Asked Questions</h2>
+          <h2 className="ml-4 text-lg lg:text-2xl font-bold text-gray-800 dark:text-white">Frequently Asked Questions</h2>
         </div>
 
         {/* FAQS Items */}
@@ -50,10 +50,10 @@ const FAQS: React.FC = () => {
           {faqs?.map((faq, index) => (
             <div key={index} className="border-b border-gray-300 pb-2 cursor-pointer">
               <div className="flex justify-between items-center" onClick={() => toggleFAQ(index)}>
-                <h3 className="text-sm font-semibold text-gray-800">{faq.question}</h3>
-                <span className="text-gray-500 text-xl">{openIndex === index ? "−" : "+"}</span>
+                <h3 className="text-sm font-semibold text-gray-800 dark:text-white">{faq.question}</h3>
+                <span className="text-gray-500 dark:text-white text-xl">{openIndex === index ? "−" : "+"}</span>
               </div>
-              {openIndex === index && <p className="text-gray-600 mt-2 text-sm">{faq.answer}</p>}
+              {openIndex === index && <p className="text-gray-600 dark:text-white mt-2 text-sm">{faq.answer}</p>}
             </div>
           ))}
         </div>
diff --git a/app/[locale]/(public)/feedback/page.tsx b/app/[locale]/(public)/feedback/page.tsx
index 1e02bd46..1b1652c2 100644
--- a/app/[locale]/(public)/feedback/page.tsx
+++ b/app/[locale]/(public)/feedback/page.tsx
@@ -21,7 +21,7 @@ const Rating: React.FC<RatingProps> = ({ label, onRate }) => {
 
   return (
     <div className="flex justify-between items-center mb-4">
-      <span className="text-gray-800">{label}</span>
+      <span className="text-gray-800 dark:text-white">{label}</span>
       <div className="flex space-x-1">
         {[1, 2, 3, 4, 5].map((star) => (
           <button key={star} onClick={() => handleClick(star)} className={`text-2xl ${star <= selected ? "text-yellow-500" : "text-gray-300"}`}>
@@ -117,14 +117,16 @@ const FeedbackForm: React.FC = () => {
 
   return (
     <Reveal>
-      <div className="max-w-6xl flex flex-col mx-auto p-4 lg:p-40 gap-5">
+      <div className="max-w-6xl flex flex-col mx-auto p-4 lg:p-40 gap-5 ">
         <div className="flex items-center justify-center mb-6">
           <img src="/assets/icons-feedback.png" alt="Feedback" />
-          <h2 className="ml-4 text-[15px] lg:text-[32px] font-bold text-gray-800">{t("userFeedback")}</h2>
+          <h2 className="ml-4 text-[15px] lg:text-[32px] font-bold text-gray-800 dark:text-white">{t("userFeedback")}</h2>
+        </div>
+        <div className="text-black dark:text-white">
+          <Rating label={t("ratings")} onRate={(rating) => handleRatingChange("accessibility", rating)} />
+          <Rating label={t("ratings2")} onRate={(rating) => handleRatingChange("appearance", rating)} />
+          <Rating label={t("ratings3")} onRate={(rating) => handleRatingChange("content", rating)} />
         </div>
-        <Rating label={t("ratings")} onRate={(rating) => handleRatingChange("accessibility", rating)} />
-        <Rating label={t("ratings2")} onRate={(rating) => handleRatingChange("appearance", rating)} />
-        <Rating label={t("ratings3")} onRate={(rating) => handleRatingChange("content", rating)} />
         <div className="flex justify-center">
           <button onClick={handleSubmit} className="w-fit lg:w-32 bg-[#2F80ED] text-white py-2 px-4 gap-4 rounded-md hover:bg-blue-600 transition text-sm lg:text-base">
             {t("send")}
diff --git a/app/[locale]/(public)/image/detail/[slug]/page.tsx b/app/[locale]/(public)/image/detail/[slug]/page.tsx
index 8e398cc9..6e74dac7 100644
--- a/app/[locale]/(public)/image/detail/[slug]/page.tsx
+++ b/app/[locale]/(public)/image/detail/[slug]/page.tsx
@@ -22,6 +22,11 @@ import { Skeleton } from "@/components/ui/skeleton";
 import { useTranslations } from "next-intl";
 import Image from "next/image";
 
+interface Size {
+  label: string;
+  value: string;
+}
+
 const DetailInfo = () => {
   const MySwal = withReactContent(Swal);
   const [selectedSize, setSelectedSize] = useState<string>("L");
@@ -56,6 +61,7 @@ const DetailInfo = () => {
   let typeString = "image";
   const t = useTranslations("LandingPage");
 
+
   useEffect(() => {
     const timer = setTimeout(() => {
       setIsLoading(false);
@@ -149,13 +155,34 @@ const DetailInfo = () => {
     }
   };
 
-  const sizes = [
-    { label: "XL", value: "3198 x 1798 px" },
-    { label: "L", value: "2399 x 1349 px" },
-    { label: "M", value: "1599 x 899 px" },
-    { label: "S", value: "1066 x 599 px" },
-    { label: "XS", value: "800 x 450 px" },
-  ];
+  // const sizes = [
+  //   { label: "XL", value: "3198 x 1798 px" },
+  //   { label: "L", value: "2399 x 1349 px" },
+  //   { label: "M", value: "1599 x 899 px" },
+  //   { label: "S", value: "1066 x 599 px" },
+  //   { label: "XS", value: "800 x 450 px" },
+  // ];
+
+  const scaleFactors = {
+    XL: 2,
+    L: 1.5,
+    M: 1.25,
+    S: 1,
+    XS: 0.75,
+  };
+  const sizes: Size[] = Object.entries(scaleFactors).map(([label, factor]) => {
+    const width = Number(main?.widthPixel);
+    const height = Number(main?.heightPixel);
+  
+    if (isNaN(width) || isNaN(height) || width === 0) {
+      return { label, value: "Invalid size" };
+    }
+  
+    const newWidth = Math.round(width * factor);
+    const newHeight = Math.round((width * factor) / (width / height));
+  
+    return { label, value: `${newWidth} x ${newHeight} px` };
+  });
 
   async function sendActivityLog(activityTypeId: number) {
     const data = {
@@ -471,7 +498,7 @@ const DetailInfo = () => {
             <div className="text-gray-500 flex flex-col lg:flex-row justify-between items-center border-t mt-4">
               <div className="flex flex-col lg:flex-row items-center mt-3 lg:justify-between">
                 <p className="text-xs lg:text-sm">
-                  {t("by")}&nbsp;<span className="font-semibold text-black">{detailDataImage?.uploadedBy?.userLevel?.name}</span>
+                  {t("by")}&nbsp;<span className="font-semibold text-black dark:text-white">{detailDataImage?.uploadedBy?.userLevel?.name}</span>
                 </p>
                 {/* <p className="text-xs lg:text-sm">
                   &nbsp;|&nbsp;{t("updatedOn")}
@@ -503,7 +530,7 @@ const DetailInfo = () => {
           </div>
 
           {/* Bagian Kanan */}
-          <div className="md:w-1/4 p-4 bg-[#f7f7f7] h-fit rounded-lg mx-4">
+          <div className="md:w-1/4 p-4 bg-[#f7f7f7] dark:bg-slate-600 h-fit rounded-lg mx-4">
             {isSaved ? (
               <a onClick={() => handleDeleteWishlist()} className="flex flex-col mb-3 items-center justify-center cursor-pointer">
                 <Icon icon="material-symbols:bookmark" width={40} />
@@ -540,13 +567,11 @@ const DetailInfo = () => {
             <div className="space-y-2">
               {sizes.map((size: any) => (
                 <div className="flex flex-row justify-between">
-                  <div key={size.label} className="items-center flex flex-row  gap-2 cursor-pointer">
-                    <input type="radio" name="size" value={size.label} checked={selectedSize === size.label} onChange={(e) => setImageSizeSelected(e.target.value)} className="text-red-600 focus:ring-red-600" />
-                    <div className="text-sm">{size.label}</div>
-                  </div>
-                  <div className="">
-                    <div className="text-sm">{size.value}</div>
+                  <div key={size?.label} className="items-center flex flex-row  gap-2 cursor-pointer">
+                    <input type="radio" name="size" value={size?.label} checked={selectedSize === size?.label} onChange={(e) => setImageSizeSelected(e.target.value)} className="text-red-600 focus:ring-red-600" />
+                    <div className="text-sm">{size?.label}</div>
                   </div>
+                  <div className="text-sm">{size?.value}</div>
                 </div>
               ))}
             </div>
@@ -605,7 +630,7 @@ const DetailInfo = () => {
 
       <div className="w-full mb-8">
         {/* Comment */}
-        <div className="flex flex-col my-16 p-4 lg:p-10 bg-[#f7f7f7]">
+        <div className="flex flex-col my-16 p-4 lg:p-10 bg-[#f7f7f7] dark:bg-slate-600">
           <div className="gap-5 flex flex-col px-4 lg:px-14">
             <p className="flex items-start text-lg">{t("comment")}</p>
             <Textarea placeholder={t("leaveComment")} className="flex w-full pb-12" onChange={getInputValue} />
diff --git a/app/[locale]/(public)/image/filter/page.tsx b/app/[locale]/(public)/image/filter/page.tsx
index 4e4e24b9..e6b30eac 100644
--- a/app/[locale]/(public)/image/filter/page.tsx
+++ b/app/[locale]/(public)/image/filter/page.tsx
@@ -382,7 +382,7 @@ const FilterPage = () => {
 
       {/* Left */}
       <div className="flex flex-col lg:flex-row gap-6 p-4">
-        <div className="lg:w-[30%] h-fit w-full bg-[#f7f7f7] dark:bg-black p-4 rounded-lg shadow-md">
+        <div className="lg:w-[25%] h-fit w-full bg-[#f7f7f7] dark:bg-black p-4 rounded-lg shadow-md">
           <h2 className="text-lg font-semibold mb-4 flex items-center gap-1">
             <Icon icon="stash:filter-light" fontSize={30} />
             Filter
@@ -484,7 +484,7 @@ const FilterPage = () => {
         </div>
 
         {/* Right */}
-        <div className="w-full">
+        <div className="w-full lg:w-[75%]">
           <Reveal>
             <div className="w-full">
               <div className="flex flex-col items-end mb-4">
diff --git a/app/[locale]/(public)/inbox/update/page.tsx b/app/[locale]/(public)/inbox/update/page.tsx
index e3cc404e..7efdd068 100644
--- a/app/[locale]/(public)/inbox/update/page.tsx
+++ b/app/[locale]/(public)/inbox/update/page.tsx
@@ -42,7 +42,7 @@ const UpdateSection = () => {
   }, [pages]);
 
   return (
-    <div className="max-w-6xl h-screen flex flex-col mx-auto p-4 lg:p-24 gap-5">
+    <div className="max-w-6xl flex flex-col mx-auto p-4 lg:p-24 gap-5">
       <div className="flex items-center justify-center mb-6">
         <svg xmlns="http://www.w3.org/2000/svg" width="60px" height="60px" viewBox="0 0 24 24">
           <g fill="#bb3523" fill-rule="evenodd" clip-rule="evenodd">
@@ -64,7 +64,7 @@ const UpdateSection = () => {
         </div>
         <div className="py-10 px-8 w-[400px] mt-3 border border-black rounded-lg flex flex-col">
           <h1 className="mb-3 text-lg font-semibold">{t("notifList")}</h1>
-          <div className="hover:bg-slate-200 rounded-md">
+          <div className="rounded-md overflow-y-auto space-y-3">
             {notifications?.map((list: any) => (
               <a className="flex flex-row items-center ml-1" href={"/" + list.redirectUrl}>
                 {(() => {
@@ -134,8 +134,8 @@ const UpdateSection = () => {
                       );
                   }
                 })()}
-                <div className="ml-3">
-                  <span className="block">{list.message}</span>
+                <div className="flex flex-col ml-3">
+                  <span className="">{list.message}</span>
                   <span className="text-xs">{getTimestamp(new Date(list.createdAt))}</span>
                 </div>
               </a>
diff --git a/app/[locale]/(public)/indeks/detail/[slug]/page.tsx b/app/[locale]/(public)/indeks/detail/[slug]/page.tsx
index 4cc35e68..a9842038 100644
--- a/app/[locale]/(public)/indeks/detail/[slug]/page.tsx
+++ b/app/[locale]/(public)/indeks/detail/[slug]/page.tsx
@@ -165,10 +165,10 @@ const IndeksDetail = () => {
           <Image width={2560} height={1440} src={indeksData?.thumbnailLink} alt="Main" className="h-fit lg:h-[550px] w-full rounded-lg" />
         </div>
         {/* Footer Informasi */}
-        <div className="text-gray-500 flex border-t mt-4">
+        <div className="text-gray-500  flex border-t mt-4">
           <div className="flex mt-2">
-            <p className="text-xs lg:text-sm mb-2">
-              {t("by")}&nbsp;<span className="font-semibold text-black">{indeksData?.uploaderName}</span>&nbsp; | &nbsp;{t("updatedOn")} {indeksData?.createdAt} WIB &nbsp;
+            <p className="text-xs lg:text-sm mb-2 ">
+              {t("by")}&nbsp;<span className="font-semibold text-gray-500">{indeksData?.uploaderName}</span>&nbsp; | &nbsp;{t("updatedOn")} {indeksData?.createdAt} WIB &nbsp;
             </p>
           </div>
         </div>
@@ -181,7 +181,7 @@ const IndeksDetail = () => {
 
       {/* Comment */}
       <div className="w-full">
-        <div className="flex flex-col py-5 p-0 lg:p-10 bg-[#f7f7f7]">
+        <div className="flex flex-col py-5 p-0 lg:p-10 bg-[#f7f7f7] dark:bg-slate-600">
           <div className="gap-5 flex flex-col px-4 lg:px-16">
             <p className="flex items-start text-bases lg:text-lg">{t("comment")}</p>
             <Textarea placeholder="Type your comments here." className="flex w-full" onChange={getInputValue} value={message} />
@@ -197,7 +197,7 @@ const IndeksDetail = () => {
               <div className="flex flex-col">
                 <div className="flex flex-row mt-2 px-4 lg:px-14">
                   <Image width={512} height={512} className="h-10 lg:h-20 w-10 lg:w-20" src="/assets/img/user-avatar-yellow.svg" alt="#" />
-                  <div className="border border-slate-300 w-full p-4 bg-white gap-1">
+                  <div className="border border-slate-300 w-full p-4 bg-white  gap-1">
                     <p className="flex justify-between text-sm text-slate-500 lg:text-base border-b-2 border-slate-200 mb-2">
                       <b>{Number(data.commentFrom?.roleId) == 2 || Number(data.commentFrom?.roleId) == 3 || Number(data.commentFrom?.roleId) == 4 ? "HUMAS POLRI" : data.commentFrom?.fullname}</b>
                       {`${new Date(data.createdAt).getDate()}/${new Date(data.createdAt).getMonth() + 1}/${new Date(data.createdAt).getFullYear()} ${new Date(data.createdAt).getHours()}:${new Date(data.createdAt).getMinutes()}`}
diff --git a/app/[locale]/(public)/indeks/page.tsx b/app/[locale]/(public)/indeks/page.tsx
index 2e471bdc..e45c6537 100644
--- a/app/[locale]/(public)/indeks/page.tsx
+++ b/app/[locale]/(public)/indeks/page.tsx
@@ -61,7 +61,7 @@ const Indeks: React.FC = () => {
                         <h2 className="text-2xl font-bold mt-2">{indeks?.title}</h2>
                       </Link>
                       <p className="text-xs flex flex-row items-center gap-1 mt-1">
-                        {formatDateToIndonesian(new Date(indeks?.createdAt))} {indeks?.timezone ? indeks?.timezone : "WIB"} | {" "}
+                        {formatDateToIndonesian(new Date(indeks?.createdAt))} {indeks?.timezone ? indeks?.timezone : "WIB"} |{" "}
                         <svg xmlns="http://www.w3.org/2000/svg" width="1.2em" height="1.2em" viewBox="0 0 24 24">
                           <path
                             fill="currentColor"
@@ -152,10 +152,10 @@ const Indeks: React.FC = () => {
                     <Image width={2560} height={1440} src={indeksBottom?.thumbnailLink} alt="" className="h-40 object-cover rounded-lg w-full lg:w-full lg:h-[300px]" />
                     <div className="flex flex-col justify-between w-full">
                       <p className="text-sm">{indeksBottom?.date}</p>
-                      <Link href={`/indeks/detail/${indeksBottom?.slug}`} className="text-2xl font-semibold text-gray-800">
+                      <Link href={`/indeks/detail/${indeksBottom?.slug}`} className="text-2xl font-semibold text-gray-800 dark:text-white">
                         {indeksBottom?.title}
                       </Link>
-                      <p className="text-sm text-gray-600 mt-2">{indeksBottom?.description}</p>
+                      <p className="text-sm text-gray-600 dark:text-white mt-2">{indeksBottom?.description}</p>
                     </div>
                   </div>
                 )
diff --git a/app/[locale]/(public)/schedule/page.tsx b/app/[locale]/(public)/schedule/page.tsx
index 8d78c7a4..585c58de 100644
--- a/app/[locale]/(public)/schedule/page.tsx
+++ b/app/[locale]/(public)/schedule/page.tsx
@@ -503,9 +503,9 @@ const Schedule = (props: any) => {
         <div className="container relative py-4">
           <Popover>
             <PopoverTrigger asChild>
-              <a className="text-black flex flex-row w-fit gap-2 py-4 items-center cursor-pointer">
+              <a className="text-black dark:text-white flex flex-row w-fit gap-2 py-4 items-center cursor-pointer">
                 <svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24">
-                  <path fill="#000" d="M20 3H4a1 1 0 0 0-1 1v2.227l.008.223a3 3 0 0 0 .772 1.795L8 12.886V21a1 1 0 0 0 1.316.949l6-2l.108-.043A1 1 0 0 0 16 19v-6.586l4.121-4.12A3 3 0 0 0 21 6.171V4a1 1 0 0 0-1-1" />
+                  <path fill="currentColor" d="M20 3H4a1 1 0 0 0-1 1v2.227l.008.223a3 3 0 0 0 .772 1.795L8 12.886V21a1 1 0 0 0 1.316.949l6-2l.108-.043A1 1 0 0 0 16 19v-6.586l4.121-4.12A3 3 0 0 0 21 6.171V4a1 1 0 0 0-1-1" />
                 </svg>
                 Filter
                 <svg className="flex items-center justify-center" xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24">
@@ -856,8 +856,8 @@ const Schedule = (props: any) => {
               </p>
             </AlertDialogDescription>
             <AlertDialogDescription>
-              <p className="flex flex-row items-start gap-2 ">
-                <Icon icon="bxs:map" width={30} />
+              <p className="flex flex-row items-center gap-2 ">
+                <Icon icon="bxs:map" fontSize={20} />
                 {detail?.address}
               </p>
             </AlertDialogDescription>
diff --git a/app/[locale]/(public)/video/detail/[slug]/page.tsx b/app/[locale]/(public)/video/detail/[slug]/page.tsx
index 3cdcb2d9..21cd37eb 100644
--- a/app/[locale]/(public)/video/detail/[slug]/page.tsx
+++ b/app/[locale]/(public)/video/detail/[slug]/page.tsx
@@ -22,6 +22,11 @@ import parse from "html-react-parser";
 import { useTranslations } from "next-intl";
 import Image from "next/image";
 
+interface Size {
+  label: string;
+  value: string;
+}
+
 const DetailVideo = () => {
   const [selectedSize, setSelectedSize] = useState<string>("L");
   const [selectedTab, setSelectedTab] = useState("video");
@@ -140,11 +145,10 @@ const DetailVideo = () => {
   };
 
   const sizes = [
-    { label: "XL", value: "3198 x 1798 px" },
-    { label: "L", value: "2399 x 1349 px" },
-    { label: "M", value: "1599 x 899 px" },
-    { label: "S", value: "1066 x 599 px" },
-    { label: "XS", value: "800 x 450 px" },
+    { label: "FULL HD", value: "1920 x 1080 px" },
+    { label: "HD", value: "1280 x 720 px" },
+    { label: "SD", value: "720 x 480 px" },
+    { label: "WEB", value: "640 x 360 px" },
   ];
 
   async function sendActivityLog(activityTypeId: number) {
@@ -438,7 +442,7 @@ const DetailVideo = () => {
               <p className="mt-3">Kreator: {detailDataVideo?.creatorName}</p> */}
               <div className="flex flex-col lg:flex-row items-center mt-3 lg:justify-between">
                 <p className="text-xs lg:text-sm">
-                  {t("by")}&nbsp;<span className="font-semibold text-black">{detailDataVideo?.uploadedBy?.userLevel?.name}</span>
+                  {t("by")}&nbsp;<span className="font-semibold text-black dark:text-white">{detailDataVideo?.uploadedBy?.userLevel?.name}</span>
                 </p>
                 {/* <p className="text-xs lg:text-sm">
                   &nbsp;|&nbsp;{t("updatedOn")}
@@ -475,7 +479,7 @@ const DetailVideo = () => {
           </div>
 
           {/* Bagian Kanan */}
-          <div className="md:w-1/4 p-4 bg-[#f7f7f7] rounded-lg mx-4 h-fit">
+          <div className="md:w-1/4 p-4 bg-[#f7f7f7] dark:bg-slate-600 rounded-lg mx-4 h-fit">
             {isSaved ? (
               <a onClick={() => handleDeleteWishlist()} className="flex flex-col mb-3 items-center justify-center cursor-pointer">
                 <Icon icon="material-symbols:bookmark" width={40} />
@@ -577,7 +581,7 @@ const DetailVideo = () => {
       </div>
       <div className="w-full mb-8">
         {/* Comment */}
-        <div className="flex flex-col my-16 p-4 lg:p-10 bg-[#f7f7f7]">
+        <div className="flex flex-col my-16 p-4 lg:p-10 bg-[#f7f7f7] dark:bg-slate-600">
           <div className="gap-5 flex flex-col px-4 lg:px-14">
             <p className="flex items-start text-lg">{t("comment")}</p>
             <Textarea placeholder="Type your comments here." className="flex w-full pb-12" onChange={getInputValue} />
diff --git a/app/[locale]/(public)/video/filter/page.tsx b/app/[locale]/(public)/video/filter/page.tsx
index 2d711740..1cafffa5 100644
--- a/app/[locale]/(public)/video/filter/page.tsx
+++ b/app/[locale]/(public)/video/filter/page.tsx
@@ -396,7 +396,7 @@ const FilterPage = () => {
 
       {/* Left */}
       <div className="flex flex-col lg:flex-row gap-6 p-4">
-        <div className="lg:w-[55%] w-full bg-[#f7f7f7] dark:bg-black p-4 rounded-lg shadow-md">
+        <div className="lg:w-[25%] w-full bg-[#f7f7f7] dark:bg-black p-4 rounded-lg shadow-md">
           <h2 className="text-lg font-semibold mb-4 flex items-center gap-1">
             <Icon icon="stash:filter-light" fontSize={30} />
             Filter
@@ -510,68 +510,70 @@ const FilterPage = () => {
         </div>
 
         {/* Right */}
-        <Reveal>
-          <div className="flex-1">
-            <div className="flex flex-col items-end mb-4">
-              <h2 className="text-lg font-semibold">{t("sortBy")}</h2>
-              <select defaultValue={sortBy == "popular" ? "terpopuler" : "terbaru"} onChange={(e) => handleSorting(e)} className="border rounded-md py-2 px-3 focus:ring-red-500 focus:border-red-500">
-                <option value="latest">{t("latest")}</option>
-                <option value="popular">{t("mostPopular")}</option>
-              </select>
-            </div>
-
-            {isLoading ? (
-              <div className="flex flex-col gap-4">
-                <div className="flex flex-col lg:flex-row space-y-3 w-full justify-center items-center gap-3">
-                  <Skeleton className="h-[280px] w-[380px] rounded-xl" />
-                  <Skeleton className="h-[280px] w-[380px] rounded-xl" />
-                  <Skeleton className="h-[280px] w-[380px] rounded-xl" />
-                </div>
-                <div className="flex flex-col lg:flex-row space-y-3 w-full justify-center items-center gap-3">
-                  <Skeleton className="h-[280px] w-[380px] rounded-xl" />
-                  <Skeleton className="h-[280px] w-[380px] rounded-xl" />
-                  <Skeleton className="h-[280px] w-[380px] rounded-xl" />
-                </div>
+        <div className="w-full lg:w-[75%]">
+          <Reveal>
+            <div className="w-full">
+              <div className="flex flex-col items-end mb-4">
+                <h2 className="text-lg font-semibold">{t("sortBy")}</h2>
+                <select defaultValue={sortBy == "popular" ? "terpopuler" : "terbaru"} onChange={(e) => handleSorting(e)} className="border rounded-md py-2 px-3 focus:ring-red-500 focus:border-red-500">
+                  <option value="latest">{t("latest")}</option>
+                  <option value="popular">{t("mostPopular")}</option>
+                </select>
               </div>
-            ) : (
-              <>
-                {videoData?.length > 0 ? (
-                  <div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-6">
-                    {videoData?.map((video: any) => (
-                      <Card key={video?.id} className="hover:scale-110 transition-transform duration-300">
-                        <CardContent className="flex flex-col text-xs lg:text-sm w-full p-0">
-                          <Link href={`/video/detail/${video?.slug}`}>
-                            {/* <img src={video?.thumbnailLink} className="h-60 object-cover items-center justify-center cursor-pointer rounded-lg place-self-center" /> */}
-                            <div className="img-container h-60 bg-[#e9e9e9] cursor-pointer rounded-lg">
-                              <ImageBlurry src={video?.thumbnailLink} alt={video?.title} style={{ objectFit: "contain", width: "100%", height: "100%" }} />
-                            </div>
-                            <div className="flex flex-row items-center gap-2 text-[10px] mx-2">
-                              {formatDateToIndonesian(new Date(video?.createdAt))} {video?.timezone ? video?.timezone : "WIB"}| <Icon icon="formkit:eye" width="15" height="15" />
-                              {video?.clickCount}{" "}
-                              <svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 20 20">
-                                <path
-                                  fill="#f00"
-                                  d="M7.707 10.293a1 1 0 1 0-1.414 1.414l3 3a1 1 0 0 0 1.414 0l3-3a1 1 0 0 0-1.414-1.414L11 11.586V6h5a2 2 0 0 1 2 2v7a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h5v5.586zM9 4a1 1 0 0 1 2 0v2H9z"
-                                />
-                              </svg>{" "}
-                            </div>
-                            <div className="font-semibold pr-3 pb-3 mx-2 hover:h-auto truncate hover:whitespace-normal hover:overflow-visible w-full">{video?.title}</div>
-                          </Link>
-                        </CardContent>
-                      </Card>
-                    ))}
-                  </div>
-                ) : (
-                  <p className="flex items-center justify-center">
-                    <Image width={1920} height={1080} src="/assets/empty-data.png" alt="empty" className="h-60 w-60 my-4" />
-                  </p>
-                )}
-              </>
-            )}
 
-            <LandingPagination table={table} totalData={totalData} totalPage={totalPage} />
-          </div>
-        </Reveal>
+              {isLoading ? (
+                <div className="flex flex-col gap-4">
+                  <div className="flex flex-col lg:flex-row space-y-3 w-full justify-center items-center gap-3">
+                    <Skeleton className="h-[260px] w-[360px] rounded-xl" />
+                    <Skeleton className="h-[260px] w-[360px] rounded-xl" />
+                    <Skeleton className="h-[260px] w-[360px] rounded-xl" />
+                  </div>
+                  <div className="flex flex-col lg:flex-row space-y-3 w-full justify-center items-center gap-3">
+                    <Skeleton className="h-[260px] w-[360px] rounded-xl" />
+                    <Skeleton className="h-[260px] w-[360px] rounded-xl" />
+                    <Skeleton className="h-[260px] w-[360px] rounded-xl" />
+                  </div>
+                </div>
+              ) : (
+                <>
+                  {videoData?.length > 0 ? (
+                    <div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-6">
+                      {videoData?.map((video: any) => (
+                        <Card key={video?.id} className="hover:scale-110 transition-transform duration-300">
+                          <CardContent className="flex flex-col text-xs lg:text-sm w-full p-0">
+                            <Link href={`/video/detail/${video?.slug}`}>
+                              {/* <img src={video?.thumbnailLink} className="h-60 object-cover items-center justify-center cursor-pointer rounded-lg place-self-center" /> */}
+                              <div className="img-container h-60 bg-[#e9e9e9] cursor-pointer rounded-lg">
+                                <ImageBlurry src={video?.thumbnailLink} alt={video?.title} style={{ objectFit: "contain", width: "100%", height: "100%" }} />
+                              </div>
+                              <div className="flex flex-row items-center gap-2 text-[10px] mx-2">
+                                {formatDateToIndonesian(new Date(video?.createdAt))} {video?.timezone ? video?.timezone : "WIB"}| <Icon icon="formkit:eye" width="15" height="15" />
+                                {video?.clickCount}{" "}
+                                <svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 20 20">
+                                  <path
+                                    fill="#f00"
+                                    d="M7.707 10.293a1 1 0 1 0-1.414 1.414l3 3a1 1 0 0 0 1.414 0l3-3a1 1 0 0 0-1.414-1.414L11 11.586V6h5a2 2 0 0 1 2 2v7a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h5v5.586zM9 4a1 1 0 0 1 2 0v2H9z"
+                                  />
+                                </svg>{" "}
+                              </div>
+                              <div className="font-semibold pr-3 pb-3 mx-2 hover:h-auto truncate hover:whitespace-normal hover:overflow-visible w-full">{video?.title}</div>
+                            </Link>
+                          </CardContent>
+                        </Card>
+                      ))}
+                    </div>
+                  ) : (
+                    <p className="flex items-center justify-center">
+                      <Image width={1920} height={1080} src="/assets/empty-data.png" alt="empty" className="h-60 w-60 my-4" />
+                    </p>
+                  )}
+                </>
+              )}
+
+              <LandingPagination table={table} totalData={totalData} totalPage={totalPage} />
+            </div>
+          </Reveal>
+        </div>
       </div>
     </div>
   );
diff --git a/app/[locale]/auth/forgot-password/page.tsx b/app/[locale]/auth/forgot-password/page.tsx
index 45f2f7d0..7aaa1ffe 100644
--- a/app/[locale]/auth/forgot-password/page.tsx
+++ b/app/[locale]/auth/forgot-password/page.tsx
@@ -21,9 +21,9 @@ const ForgotPassPage = () => {
           <div className=" h-full flex flex-col ">
             <div className="max-w-[524px] mx-auto  w-full  md:px-[42px] md:py-[44px] p-7 text-2xl text-default-900  mb-3 flex flex-col justify-center h-full">
               <div className="flex justify-center items-center text-center mb-6 lg:hidden ">
-                <Link href="/">
+                {/* <Link href="/">
                   <Logo />
-                </Link>
+                </Link> */}
               </div>
               <div className="text-center 2xl:mb-10 mb-5">
                 <h4 className="font-medium mb-4">Forgot Your Password?</h4>
diff --git a/app/[locale]/auth/registration/page.tsx b/app/[locale]/auth/registration/page.tsx
index 4d84dcfc..abf8a63d 100644
--- a/app/[locale]/auth/registration/page.tsx
+++ b/app/[locale]/auth/registration/page.tsx
@@ -482,8 +482,8 @@ const page = () => {
       if (category != undefined) {
         const resInstiution = await listInstitusi(category);
         const res = await listProvince();
-        setInstitution(resInstiution?.data.data);
-        setProvince(res?.data.data);
+        setInstitution(resInstiution?.data?.data);
+        setProvince(res?.data?.data);
       }
     }
 
@@ -518,7 +518,7 @@ const page = () => {
       </div>
 
       <form
-        className="flex-1 w-full bg-white"
+        className="flex-1 w-full bg-white dark:bg-slate-600"
         onSubmit={handleSubmit(onSubmit)}
         style={
           Number(category) < 5
@@ -580,7 +580,7 @@ const page = () => {
                   : {}
               }
             >
-              <p className="text-black text-2xl px-0 lg:px-20 font-semibold">{t("enterOTP")}</p>
+              <p className="text-black dark:text-white text-2xl px-0 lg:px-20 font-semibold">{t("enterOTP")}</p>
               <p className="text-red-500 text-sm px-0 lg:px-20">{t("checkInbox")}</p>
             </div>
           </div>
@@ -600,7 +600,7 @@ const page = () => {
                 {t("member")} <span className="text-red-500">*</span>
               </Label>
               <select
-                className={`py-2 px-1 rounded-md border text-sm text-slate-400 border-slate-300 bg-white ${errors.association ? "block" : ""}`}
+                className={`py-2 px-1 rounded-md border text-sm text-slate-400  border-slate-300 bg-white dark:bg-slate-600 ${errors.association ? "block" : ""}`}
                 {...register("association")}
                 id="association"
                 onChange={(e) => setAssociation(e.target.value)}
@@ -689,7 +689,7 @@ const page = () => {
               <b>{otpValidate}</b>
             </p>
             <div className="flex flex-row px-0 lg:px-28 justify-between items-center my-4">
-              <a className="bg-slate-300 text-center rounded-lg mr-1 w-[200px] py-2 text-base cursor-pointer" onClick={() => handleResendOTP()}>
+              <a className="bg-slate-300 dark:bg-black text-center rounded-lg mr-1 w-[200px] py-2 text-base cursor-pointer" onClick={() => handleResendOTP()}>
                 {t("resending")} ({convertMilisecondsToHour(timerCount)})
               </a>
               <a className="bg-red-700 w-[200px] py-2 text-center text-white rounded-lg ml-1  cursor-pointer" onClick={() => handleVerifyOTP()}>
@@ -753,7 +753,7 @@ const page = () => {
                 <Label className="mb-2">
                   Email <span className="text-red-500">*</span>
                 </Label>
-                <Input type="email" autoComplete="off" className={`${errors.email ? "block" : ""}`} {...register("email")} placeholder="Masukan Email Anda" disabled />
+                <Input type="email" autoComplete="off" className={`${errors.email ? "block" : "text-white"}`} {...register("email")} placeholder="Masukan Email Anda" disabled />
                 <div className="text-red-500">{errors.email?.message}</div>
               </div>
             </div>
@@ -781,7 +781,7 @@ const page = () => {
                     <option disabled selected>
                       {t("selectInst")}
                     </option>
-                    {institution.map((row: any) => (
+                    {institution?.map((row: any) => (
                       <option value={row.id} key={row.id}>
                         {row?.name}
                       </option>
diff --git a/components/landing-page/division.tsx b/components/landing-page/division.tsx
index 39608ce1..714a3d5b 100644
--- a/components/landing-page/division.tsx
+++ b/components/landing-page/division.tsx
@@ -10,6 +10,7 @@ const regions = [
   { name: "SIBER", slug: "siber", logo: "/assets/satker/siber.png" },
   { name: "DIVKUM", slug: "divkum", logo: "/assets/satker/divkum.png" },
   { name: "PUSKEU", slug: "puskeu", logo: "/assets/satker/puskeu.png" },
+  { name: "YANMA", slug: "yanma", logo: "/assets/satker/logo-yanma.png" },
   { name: "SSDM", slug: "ssdm", logo: "/assets/satker/ssdm.png" },
   { name: "ITWASUM", slug: "itwasum", logo: "/assets/satker/itwasum.png" },
   { name: "STIK-PTIK", slug: "stik-ptik", logo: "/assets/satker/stik-ptik.png" },
diff --git a/components/landing-page/footer.tsx b/components/landing-page/footer.tsx
index 9a0c1088..99e71e4b 100644
--- a/components/landing-page/footer.tsx
+++ b/components/landing-page/footer.tsx
@@ -60,7 +60,7 @@ const Footer = () => {
                 <img src="/assets/icon-privacy.png" alt="Privacy" />
                 <p className="font-semibold text-lg">{t("privacy")}</p>
               </div>
-              <div className="container text-black space-y-2">{parse(String(privacy))}</div>
+              <div className="container text-black dark:text-white space-y-2">{parse(String(privacy))}</div>
             </DialogContent>
           </Dialog>
         </div>
diff --git a/components/landing-page/hero.tsx b/components/landing-page/hero.tsx
index 301da675..16dafb3b 100644
--- a/components/landing-page/hero.tsx
+++ b/components/landing-page/hero.tsx
@@ -68,13 +68,13 @@ const Hero: React.FC = () => {
             {heroData?.map((list: any) => (
               <CarouselItem key={list?.id}>
                 <div className="relative h-[310px] lg:h-[420px]">
-                  <Image src={list?.thumbnailLink} alt="gambar-utama" width={1920} height={1080} className="w-full h-[310px] lg:h-[420px] rounded-lg object-cover" />
+                  <Image src={list?.thumbnailLink} alt="gambar-utama" width={1920} height={1080} className="w-full lg:w-[850px] h-[310px] lg:h-[420px] rounded-lg object-cover" />
                   <div className="absolute bottom-0 left-0 right-0 bg-transparent backdrop-blur-sm text-black dark:text-white p-4 rounded-b-lg">
                     <span className="text-white bg-[#bb3523] rounded-md w-full h-full font-semibold uppercase text-xs px-2 py-1">{list?.categoryName}</span>
                     <Link href={`${locale}/image/detail/${list?.slug}`}>
-                      <h2 className="text-lg font-bold mt-2">{list?.title}</h2>
+                      <h2 className="text-lg text-slate-200 dark:text-white font-bold mt-2">{list?.title}</h2>
                     </Link>
-                    <p className="text-xs flex flex-row items-center gap-1 mt-1">
+                    <p className="text-xs flex flex-row items-center text-slate-200 dark:text-white gap-1 mt-1">
                       {formatDateToIndonesian(new Date(list?.createdAt))} {list?.timezone ? list?.timezone : "WIB"}|{" "}
                       <svg xmlns="http://www.w3.org/2000/svg" width="1.2em" height="1.2em" viewBox="0 0 24 24">
                         <path
@@ -89,8 +89,8 @@ const Hero: React.FC = () => {
               </CarouselItem>
             ))}
           </CarouselContent>
-          <CarouselPrevious />
-          <CarouselNext />
+          <CarouselPrevious className="hover:bg-black ml-1 lg:ml-0" />
+          <CarouselNext className="hover:bg-black mr-1 lg:mr-0" />
         </Carousel>
       )}
 
@@ -144,7 +144,7 @@ const Hero: React.FC = () => {
                 <div className="w-[280px] lg:w-auto">
                   <span className="text-white bg-[#bb3523] px-4 py-1 rounded-lg flex text-[8px] font-bold uppercase w-fit">{item?.categoryName}</span>
                   <Link href={`${locale}/image/detail/${item?.slug}`}>
-                    <h3 className="text-base font-bold mt-2">{textEllipsis(item?.title, 30)}</h3>
+                    <h3 className="text-base font-bold mt-2  h-6 hover:h-auto truncate hover:whitespace-normal hover:overflow-visible">{item?.title}</h3>
                   </Link>
                   <p className="text-[10px] flex flex-row items-center gap-1 text-gray-500 mt-1">
                     {formatDateToIndonesian(new Date(item?.createdAt))} {item?.timezone ? item?.timezone : "WIB"} |{" "}
diff --git a/components/landing-page/navbar.tsx b/components/landing-page/navbar.tsx
index 7ffb9e70..37f5b6d1 100644
--- a/components/landing-page/navbar.tsx
+++ b/components/landing-page/navbar.tsx
@@ -144,114 +144,118 @@ const Navbar = () => {
   return (
     <div className="bg-[#f7f7f7] dark:bg-black shadow-md sticky top-0 z-50">
       <div className="flex items-center justify-between px-4 lg:px-20 py-4 gap-3">
-        {/* Logo */}
-        <Link href={prefixPath} className="flex items-center">
-          <Image src="/assets/mediahub-logo.gif" alt="Media Hub Logo" width={200} height={300} className="object-contain" />
-        </Link>
+        <div className="flex flex-row gap-8">
+          {/* Logo */}
+          <Link href={prefixPath} className="flex items-center">
+            <Image src="/assets/mediahub-logo.gif" alt="Media Hub Logo" width={200} height={300} className="object-contain" />
+          </Link>
+
+          {/* Nav Menu */}
+          <div className="hidden lg:flex items-center gap-5">
+            <NavigationMenu>
+              <NavigationMenuList>
+                <NavigationMenuItem>
+                  <NavigationMenuTrigger>
+                    <a className="dark:text-white text-black flex flex-row justify-center items-center cursor-pointer">
+                      <svg className="mx-2 dark:" width="25" height="24" viewBox="0 0 25 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+                        <path
+                          d="M20 7.5H5C4.6023 7.5004 4.221 7.65856 3.93978 7.93978C3.65856 8.221 3.5004 8.6023 3.5 9V19.5C3.5004 19.8977 3.65856 20.279 3.93978 20.5602C4.221 20.8414 4.6023 20.9996 5 21H20C20.3977 20.9996 20.779 20.8414 21.0602 20.5602C21.3414 20.279 21.4996 19.8977 21.5 19.5V9C21.4996 8.6023 21.3414 8.221 21.0602 7.93978C20.779 7.65856 20.3977 7.5004 20 7.5ZM10.25 17.25V11.25L15.5 14.25L10.25 17.25ZM5 4.5H20V6H5V4.5ZM6.5 1.5H18.5V3H6.5V1.5Z"
+                          fill="currentColor"
+                        />
+                      </svg>
+                      {t("content")}
+                    </a>
+                  </NavigationMenuTrigger>
+                  <NavigationMenuContent className="flex flex-col place-content-start rounded-md overflow-hidden ">
+                    <NavigationMenuLink onClick={() => router.push(prefixPath + "/image/filter")} className="flex place-items-start gap-1.5 p-2 w-36">
+                      <p className="text-slate-600  dark:text-white hover:text-[#bb3523] flex flex-row items-center py-2 cursor-pointer">
+                        <FiImage className="mr-2" />
+                        {t("image")}
+                      </p>
+                    </NavigationMenuLink>
+                    <NavigationMenuLink onClick={() => router.push(prefixPath + "/video/filter")} className="flex items-start gap-1.5 p-2 ">
+                      {pathname?.split("/")[1] == "in" ? (
+                        <>
+                          <p className="text-slate-600 text-left dark:text-white hover:text-[#bb3523] flex flex-row justify-center items-center py-2 cursor-pointer">
+                            <FiYoutube className="mr-2" />
+                            {t("video")}
+                          </p>
+                        </>
+                      ) : (
+                        <>
+                          <p className="text-slate-600 text-left dark:text-white hover:text-[#bb3523] flex flex-row justify-center items-center py-2 cursor-pointer">
+                            <FiYoutube className="mr-2" />
+                            {t("video")}
+                          </p>
+                        </>
+                      )}
+                    </NavigationMenuLink>
+                    <NavigationMenuLink onClick={() => router.push(prefixPath + "/document/filter")} className="flex place-items-start gap-1.5 p-2">
+                      <p className="text-slate-600 text-left dark:text-white hover:text-[#bb3523] flex flex-row justify-center items-center py-2 cursor-pointer">
+                        <FiFile className="mr-2" />
+                        {t("text")}
+                      </p>
+                    </NavigationMenuLink>
+                    <NavigationMenuLink onClick={() => router.push(prefixPath + "/audio/filter")} className="flex place-items-start gap-1.5 p-2 ">
+                      <p className="text-slate-600 text-left dark:text-white hover:text-[#bb3523] flex flex-row justify-center items-center py-2 cursor-pointer">
+                        <FiMusic className="mr-2" />
+                        {t("audio")}{" "}
+                      </p>
+                    </NavigationMenuLink>
+                  </NavigationMenuContent>
+                </NavigationMenuItem>
+                <NavigationMenuItem>
+                  <Link href={prefixPath + "/schedule"} legacyBehavior passHref>
+                    <NavigationMenuLink className={navigationMenuTriggerStyle()}>
+                      <span>
+                        <svg className="mr-2" width="25" height="24" viewBox="0 0 25 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+                          <path
+                            d="M19.5 4H18.5V3C18.5 2.4 18.1 2 17.5 2C16.9 2 16.5 2.4 16.5 3V4H8.5V3C8.5 2.4 8.1 2 7.5 2C6.9 2 6.5 2.4 6.5 3V4H5.5C3.8 4 2.5 5.3 2.5 7V8H22.5V7C22.5 5.3 21.2 4 19.5 4ZM2.5 19C2.5 20.7 3.8 22 5.5 22H19.5C21.2 22 22.5 20.7 22.5 19V10H2.5V19ZM17.5 12C18.1 12 18.5 12.4 18.5 13C18.5 13.6 18.1 14 17.5 14C16.9 14 16.5 13.6 16.5 13C16.5 12.4 16.9 12 17.5 12ZM17.5 16C18.1 16 18.5 16.4 18.5 17C18.5 17.6 18.1 18 17.5 18C16.9 18 16.5 17.6 16.5 17C16.5 16.4 16.9 16 17.5 16ZM12.5 12C13.1 12 13.5 12.4 13.5 13C13.5 13.6 13.1 14 12.5 14C11.9 14 11.5 13.6 11.5 13C11.5 12.4 11.9 12 12.5 12ZM12.5 16C13.1 16 13.5 16.4 13.5 17C13.5 17.6 13.1 18 12.5 18C11.9 18 11.5 17.6 11.5 17C11.5 16.4 11.9 16 12.5 16ZM7.5 12C8.1 12 8.5 12.4 8.5 13C8.5 13.6 8.1 14 7.5 14C6.9 14 6.5 13.6 6.5 13C6.5 12.4 6.9 12 7.5 12ZM7.5 16C8.1 16 8.5 16.4 8.5 17C8.5 17.6 8.1 18 7.5 18C6.9 18 6.5 17.6 6.5 17C6.5 16.4 6.9 16 7.5 16Z"
+                            fill="currentColor"
+                          />
+                        </svg>
+                      </span>
+                      {t("schedule")}
+                    </NavigationMenuLink>
+                  </Link>
+                </NavigationMenuItem>
+                <NavigationMenuItem>
+                  <Link href={prefixPath + "/indeks"} legacyBehavior passHref>
+                    <NavigationMenuLink className={navigationMenuTriggerStyle()}>
+                      <span>
+                        <svg className="mr-2" width="25" height="24" viewBox="0 0 25 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+                          <path
+                            fill-rule="evenodd"
+                            clip-rule="evenodd"
+                            d="M2.5 6C2.5 5.20435 2.81607 4.44129 3.37868 3.87868C3.94129 3.31607 4.70435 3 5.5 3H19.5C20.2956 3 21.0587 3.31607 21.6213 3.87868C22.1839 4.44129 22.5 5.20435 22.5 6V18C22.5 18.7956 22.1839 19.5587 21.6213 20.1213C21.0587 20.6839 20.2956 21 19.5 21H5.5C4.70435 21 3.94129 20.6839 3.37868 20.1213C2.81607 19.5587 2.5 18.7956 2.5 18V6ZM7.5 7C7.23478 7 6.98043 7.10536 6.79289 7.29289C6.60536 7.48043 6.5 7.73478 6.5 8V12C6.5 12.2652 6.60536 12.5196 6.79289 12.7071C6.98043 12.8946 7.23478 13 7.5 13H11.5C11.7652 13 12.0196 12.8946 12.2071 12.7071C12.3946 12.5196 12.5 12.2652 12.5 12V8C12.5 7.73478 12.3946 7.48043 12.2071 7.29289C12.0196 7.10536 11.7652 7 11.5 7H7.5ZM8.5 11V9H10.5V11H8.5ZM15.5 7C15.2348 7 14.9804 7.10536 14.7929 7.29289C14.6054 7.48043 14.5 7.73478 14.5 8C14.5 8.26522 14.6054 8.51957 14.7929 8.70711C14.9804 8.89464 15.2348 9 15.5 9H17.5C17.7652 9 18.0196 8.89464 18.2071 8.70711C18.3946 8.51957 18.5 8.26522 18.5 8C18.5 7.73478 18.3946 7.48043 18.2071 7.29289C18.0196 7.10536 17.7652 7 17.5 7H15.5ZM15.5 11C15.2348 11 14.9804 11.1054 14.7929 11.2929C14.6054 11.4804 14.5 11.7348 14.5 12C14.5 12.2652 14.6054 12.5196 14.7929 12.7071C14.9804 12.8946 15.2348 13 15.5 13H17.5C17.7652 13 18.0196 12.8946 18.2071 12.7071C18.3946 12.5196 18.5 12.2652 18.5 12C18.5 11.7348 18.3946 11.4804 18.2071 11.2929C18.0196 11.1054 17.7652 11 17.5 11H15.5ZM7.5 15C7.23478 15 6.98043 15.1054 6.79289 15.2929C6.60536 15.4804 6.5 15.7348 6.5 16C6.5 16.2652 6.60536 16.5196 6.79289 16.7071C6.98043 16.8946 7.23478 17 7.5 17H17.5C17.7652 17 18.0196 16.8946 18.2071 16.7071C18.3946 16.5196 18.5 16.2652 18.5 16C18.5 15.7348 18.3946 15.4804 18.2071 15.2929C18.0196 15.1054 17.7652 15 17.5 15H7.5Z"
+                            fill="currentColor"
+                          />
+                        </svg>
+                      </span>
+                      {t("index")}
+                    </NavigationMenuLink>
+                  </Link>
+                </NavigationMenuItem>
+              </NavigationMenuList>
+            </NavigationMenu>
+          </div>
+        </div>
 
         {/* Mobile Menu Toggle */}
         <button className="text-black dark:text-white right-0 size-20 h-10 w-10 lg:hidden" onClick={() => setMenuOpen(!menuOpen)}>
           {menuOpen ? (
             <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
-              <path fill="#000" d="m13.41 12l4.3-4.29a1 1 0 1 0-1.42-1.42L12 10.59l-4.29-4.3a1 1 0 0 0-1.42 1.42l4.3 4.29l-4.3 4.29a1 1 0 0 0 0 1.42a1 1 0 0 0 1.42 0l4.29-4.3l4.29 4.3a1 1 0 0 0 1.42 0a1 1 0 0 0 0-1.42Z" />
+              <path fill="currentColor" d="m13.41 12l4.3-4.29a1 1 0 1 0-1.42-1.42L12 10.59l-4.29-4.3a1 1 0 0 0-1.42 1.42l4.3 4.29l-4.3 4.29a1 1 0 0 0 0 1.42a1 1 0 0 0 1.42 0l4.29-4.3l4.29 4.3a1 1 0 0 0 1.42 0a1 1 0 0 0 0-1.42Z" />
             </svg>
           ) : (
             <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
-              <path fill="#000" d="M4 6a1 1 0 0 1 1-1h14a1 1 0 1 1 0 2H5a1 1 0 0 1-1-1m0 6a1 1 0 0 1 1-1h14a1 1 0 1 1 0 2H5a1 1 0 0 1-1-1m1 5a1 1 0 1 0 0 2h14a1 1 0 1 0 0-2z" />
+              <path fill="currentColor" d="M4 6a1 1 0 0 1 1-1h14a1 1 0 1 1 0 2H5a1 1 0 0 1-1-1m0 6a1 1 0 0 1 1-1h14a1 1 0 1 1 0 2H5a1 1 0 0 1-1-1m1 5a1 1 0 1 0 0 2h14a1 1 0 1 0 0-2z" />
             </svg>
           )}
         </button>
 
         {/* Desktop Navigation */}
         <div className="hidden lg:flex items-center gap-5">
-          {/* Nav Menu */}
-          <NavigationMenu>
-            <NavigationMenuList>
-              <NavigationMenuItem>
-                <NavigationMenuTrigger>
-                  <a className="dark:text-white text-black flex flex-row justify-center items-center cursor-pointer">
-                    <svg className="mx-2 dark:" width="25" height="24" viewBox="0 0 25 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-                      <path
-                        d="M20 7.5H5C4.6023 7.5004 4.221 7.65856 3.93978 7.93978C3.65856 8.221 3.5004 8.6023 3.5 9V19.5C3.5004 19.8977 3.65856 20.279 3.93978 20.5602C4.221 20.8414 4.6023 20.9996 5 21H20C20.3977 20.9996 20.779 20.8414 21.0602 20.5602C21.3414 20.279 21.4996 19.8977 21.5 19.5V9C21.4996 8.6023 21.3414 8.221 21.0602 7.93978C20.779 7.65856 20.3977 7.5004 20 7.5ZM10.25 17.25V11.25L15.5 14.25L10.25 17.25ZM5 4.5H20V6H5V4.5ZM6.5 1.5H18.5V3H6.5V1.5Z"
-                        fill="currentColor"
-                      />
-                    </svg>
-                    {t("content")}
-                  </a>
-                </NavigationMenuTrigger>
-                <NavigationMenuContent className="flex flex-col place-content-start rounded-md overflow-hidden ">
-                  <NavigationMenuLink onClick={() => router.push(prefixPath + "/image/filter")} className="flex place-items-start gap-1.5 p-2 w-36">
-                    <p className="text-slate-600  dark:text-white hover:text-[#bb3523] flex flex-row items-center py-2 cursor-pointer">
-                      <FiImage className="mr-2" />
-                      {t("image")}
-                    </p>
-                  </NavigationMenuLink>
-                  <NavigationMenuLink onClick={() => router.push(prefixPath + "/video/filter")} className="flex items-start gap-1.5 p-2 ">
-                    {pathname?.split("/")[1] == "in" ? (
-                      <>
-                        <p className="text-slate-600 text-left dark:text-white hover:text-[#bb3523] flex flex-row justify-center items-center py-2 cursor-pointer">
-                          <FiYoutube className="mr-2" />
-                          {t("video")}
-                        </p>
-                      </>
-                    ) : (
-                      <>
-                        <p className="text-slate-600 text-left dark:text-white hover:text-[#bb3523] flex flex-row justify-center items-center py-2 cursor-pointer">
-                          <FiYoutube className="mr-2" />
-                          {t("video")}
-                        </p>
-                      </>
-                    )}
-                  </NavigationMenuLink>
-                  <NavigationMenuLink onClick={() => router.push(prefixPath + "/document/filter")} className="flex place-items-start gap-1.5 p-2">
-                    <p className="text-slate-600 text-left dark:text-white hover:text-[#bb3523] flex flex-row justify-center items-center py-2 cursor-pointer">
-                      <FiFile className="mr-2" />
-                      {t("text")}
-                    </p>
-                  </NavigationMenuLink>
-                  <NavigationMenuLink onClick={() => router.push(prefixPath + "/audio/filter")} className="flex place-items-start gap-1.5 p-2 ">
-                    <p className="text-slate-600 text-left dark:text-white hover:text-[#bb3523] flex flex-row justify-center items-center py-2 cursor-pointer">
-                      <FiMusic className="mr-2" />
-                      {t("audio")}{" "}
-                    </p>
-                  </NavigationMenuLink>
-                </NavigationMenuContent>
-              </NavigationMenuItem>
-              <NavigationMenuItem>
-                <Link href={prefixPath + "/schedule"} legacyBehavior passHref>
-                  <NavigationMenuLink className={navigationMenuTriggerStyle()}>
-                    <span>
-                      <svg className="mr-2" width="25" height="24" viewBox="0 0 25 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-                        <path
-                          d="M19.5 4H18.5V3C18.5 2.4 18.1 2 17.5 2C16.9 2 16.5 2.4 16.5 3V4H8.5V3C8.5 2.4 8.1 2 7.5 2C6.9 2 6.5 2.4 6.5 3V4H5.5C3.8 4 2.5 5.3 2.5 7V8H22.5V7C22.5 5.3 21.2 4 19.5 4ZM2.5 19C2.5 20.7 3.8 22 5.5 22H19.5C21.2 22 22.5 20.7 22.5 19V10H2.5V19ZM17.5 12C18.1 12 18.5 12.4 18.5 13C18.5 13.6 18.1 14 17.5 14C16.9 14 16.5 13.6 16.5 13C16.5 12.4 16.9 12 17.5 12ZM17.5 16C18.1 16 18.5 16.4 18.5 17C18.5 17.6 18.1 18 17.5 18C16.9 18 16.5 17.6 16.5 17C16.5 16.4 16.9 16 17.5 16ZM12.5 12C13.1 12 13.5 12.4 13.5 13C13.5 13.6 13.1 14 12.5 14C11.9 14 11.5 13.6 11.5 13C11.5 12.4 11.9 12 12.5 12ZM12.5 16C13.1 16 13.5 16.4 13.5 17C13.5 17.6 13.1 18 12.5 18C11.9 18 11.5 17.6 11.5 17C11.5 16.4 11.9 16 12.5 16ZM7.5 12C8.1 12 8.5 12.4 8.5 13C8.5 13.6 8.1 14 7.5 14C6.9 14 6.5 13.6 6.5 13C6.5 12.4 6.9 12 7.5 12ZM7.5 16C8.1 16 8.5 16.4 8.5 17C8.5 17.6 8.1 18 7.5 18C6.9 18 6.5 17.6 6.5 17C6.5 16.4 6.9 16 7.5 16Z"
-                          fill="currentColor"
-                        />
-                      </svg>
-                    </span>
-                    {t("schedule")}
-                  </NavigationMenuLink>
-                </Link>
-              </NavigationMenuItem>
-              <NavigationMenuItem>
-                <Link href={prefixPath + "/indeks"} legacyBehavior passHref>
-                  <NavigationMenuLink className={navigationMenuTriggerStyle()}>
-                    <span>
-                      <svg className="mr-2" width="25" height="24" viewBox="0 0 25 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-                        <path
-                          fill-rule="evenodd"
-                          clip-rule="evenodd"
-                          d="M2.5 6C2.5 5.20435 2.81607 4.44129 3.37868 3.87868C3.94129 3.31607 4.70435 3 5.5 3H19.5C20.2956 3 21.0587 3.31607 21.6213 3.87868C22.1839 4.44129 22.5 5.20435 22.5 6V18C22.5 18.7956 22.1839 19.5587 21.6213 20.1213C21.0587 20.6839 20.2956 21 19.5 21H5.5C4.70435 21 3.94129 20.6839 3.37868 20.1213C2.81607 19.5587 2.5 18.7956 2.5 18V6ZM7.5 7C7.23478 7 6.98043 7.10536 6.79289 7.29289C6.60536 7.48043 6.5 7.73478 6.5 8V12C6.5 12.2652 6.60536 12.5196 6.79289 12.7071C6.98043 12.8946 7.23478 13 7.5 13H11.5C11.7652 13 12.0196 12.8946 12.2071 12.7071C12.3946 12.5196 12.5 12.2652 12.5 12V8C12.5 7.73478 12.3946 7.48043 12.2071 7.29289C12.0196 7.10536 11.7652 7 11.5 7H7.5ZM8.5 11V9H10.5V11H8.5ZM15.5 7C15.2348 7 14.9804 7.10536 14.7929 7.29289C14.6054 7.48043 14.5 7.73478 14.5 8C14.5 8.26522 14.6054 8.51957 14.7929 8.70711C14.9804 8.89464 15.2348 9 15.5 9H17.5C17.7652 9 18.0196 8.89464 18.2071 8.70711C18.3946 8.51957 18.5 8.26522 18.5 8C18.5 7.73478 18.3946 7.48043 18.2071 7.29289C18.0196 7.10536 17.7652 7 17.5 7H15.5ZM15.5 11C15.2348 11 14.9804 11.1054 14.7929 11.2929C14.6054 11.4804 14.5 11.7348 14.5 12C14.5 12.2652 14.6054 12.5196 14.7929 12.7071C14.9804 12.8946 15.2348 13 15.5 13H17.5C17.7652 13 18.0196 12.8946 18.2071 12.7071C18.3946 12.5196 18.5 12.2652 18.5 12C18.5 11.7348 18.3946 11.4804 18.2071 11.2929C18.0196 11.1054 17.7652 11 17.5 11H15.5ZM7.5 15C7.23478 15 6.98043 15.1054 6.79289 15.2929C6.60536 15.4804 6.5 15.7348 6.5 16C6.5 16.2652 6.60536 16.5196 6.79289 16.7071C6.98043 16.8946 7.23478 17 7.5 17H17.5C17.7652 17 18.0196 16.8946 18.2071 16.7071C18.3946 16.5196 18.5 16.2652 18.5 16C18.5 15.7348 18.3946 15.4804 18.2071 15.2929C18.0196 15.1054 17.7652 15 17.5 15H7.5Z"
-                          fill="currentColor"
-                        />
-                      </svg>
-                    </span>
-                    {t("index")}
-                  </NavigationMenuLink>
-                </Link>
-              </NavigationMenuItem>
-            </NavigationMenuList>
-          </NavigationMenu>
-
           {roleId == undefined ? (
             ""
           ) : (
@@ -292,7 +296,7 @@ const Navbar = () => {
             <span className="w-2 h-2 bg-red-500 rounded-full"></span>
             <span className="font-medium">{t("live")}</span>
           </Link> */}
-          <div className="flex items-center space-x-1  ">
+          <div className="flex items-center">
             <a href="https://tvradio.polri.go.id/">
               <Image src="/assets/polriTv.png" width={100} height={120} alt="polritv" className="object-contain flex-auto " />
             </a>
@@ -379,7 +383,7 @@ const Navbar = () => {
                 <PopoverTrigger asChild>
                   <a className="cursor-pointer" onClick={() => test()}>
                     {" "}
-                    <Icon icon="basil:envelope-outline" color="black" width="30" />
+                    <Icon icon="basil:envelope-outline" color="currentColor" width="30" className="text-black dark:text-white" />
                   </a>
                 </PopoverTrigger>
                 <PopoverContent className="w-[320px] p-0 flex flex-col mt-2" align="end">
@@ -666,7 +670,7 @@ const Navbar = () => {
             </>
           ) : (
             // Masuk and Daftar buttons for roleId === null
-            <div className="flex justify-center items-center mx-3 gap-5">
+            <div className="flex justify-center items-center mx-3 gap-8">
               <Link href="/auth" className="w-full lg:w-max px-4 py-1  bg-[#bb3523] text-white font-semibold rounded-md hover:bg-red-700 text-center">
                 {t("logIn")}
               </Link>
@@ -704,7 +708,7 @@ const Navbar = () => {
 
       {/* Mobile Menu */}
       {menuOpen && (
-        <div className="lg:hidden absolute bg-[#f7f7f7] px-4 py-3 w-full space-y-3 z-50">
+        <div className="lg:hidden absolute bg-[#f7f7f7] dark:bg-slate-600 px-4 py-3 w-full space-y-3 z-50">
           <NavigationMenu>
             <NavigationMenuList>
               <NavigationMenuItem>
diff --git a/components/landing-page/new-content.tsx b/components/landing-page/new-content.tsx
index 3301eecf..284317cb 100644
--- a/components/landing-page/new-content.tsx
+++ b/components/landing-page/new-content.tsx
@@ -129,8 +129,8 @@ const NewContent = (props: { group: string; type: string }) => {
                         </CarouselItem>
                       ))}
                     </CarouselContent>
-                    <CarouselPrevious />
-                    <CarouselNext />
+                    <CarouselPrevious className="hover:bg-black" />
+                    <CarouselNext className="hover:bg-black -mr-6" />
                   </Carousel>
                 ) : (
                   <p className="flex items-center justify-center">
diff --git a/components/landing-page/news-tickers.tsx b/components/landing-page/news-tickers.tsx
index 13171697..72b01cdc 100644
--- a/components/landing-page/news-tickers.tsx
+++ b/components/landing-page/news-tickers.tsx
@@ -44,7 +44,7 @@ export default function NewsTicker() {
     }, 7000);
 
     return () => clearInterval(interval);
-  }, [article.length]);
+  }, [article?.length]);
 
   return (
     <div className="fixed bottom-0 z-50 flex flex-row h-[60px] gap-3 w-full justify-between dark:bg-stone-800 bg-gray-50">
diff --git a/components/partials/header/locale-switcher.tsx b/components/partials/header/locale-switcher.tsx
index b65a1b77..94d4bdaf 100644
--- a/components/partials/header/locale-switcher.tsx
+++ b/components/partials/header/locale-switcher.tsx
@@ -1,70 +1,45 @@
-'use client';
+"use client";
 
-import { useLocale } from 'next-intl';
-import { useParams } from 'next/navigation';
-import { locales } from '@/config';
-import { usePathname, useRouter } from '@/i18n/routing';
+import { useLocale } from "next-intl";
+import { useParams } from "next/navigation";
+import { locales } from "@/config";
+import { usePathname, useRouter } from "@/i18n/routing";
 
-import { useTransition } from 'react';
-import {
-    Select,
-    SelectContent,
-    SelectItem,
-    SelectTrigger,
-    SelectValue,
-} from "@/components/ui/select"
-import Image from 'next/image';
+import { useTransition } from "react";
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
+import Image from "next/image";
 
 export default function LocalSwitcher() {
-    const [isPending, startTransition] = useTransition();
-    const router = useRouter();
-    const pathname = usePathname();
-    const params = useParams();
-    const localActive = useLocale();
+  const [isPending, startTransition] = useTransition();
+  const router = useRouter();
+  const pathname = usePathname();
+  const params = useParams();
+  const localActive = useLocale();
 
-    const onSelectChange = (nextLocale: string) => {
-        startTransition(() => {
-
-            router.replace(pathname, { locale: nextLocale });
-        });
-    };
-    return (
-        <Select onValueChange={onSelectChange} defaultValue={localActive}>
-            <SelectTrigger className='w-[94px] border-none read-only:bg-transparent'>
-                <SelectValue placeholder="Select a language" />
-            </SelectTrigger>
-            <SelectContent >
-                <SelectItem
-                    value="en"
-                    className='border-none'
-                >
-                    <div className='flex items-center gap-1'>
-                        <Image
-                            src="/images/all-img/flag-1.png"
-                            alt='flag'
-                            width={24}
-                            height={24}
-                            className='w-6 h-6 rounded-full'
-                        />
-                        <span className='font-medium text-sm text-default-600 dark:text-default-700'>En</span>
-                    </div>
-                </SelectItem>
-                <SelectItem
-                    value="in"
-                    className='border-none'
-                >
-                    <div className='flex items-center gap-1'>
-                        <Image
-                            src="/images/all-img/flag-3.png"
-                            alt='flag'
-                            width={24}
-                            height={24}
-                            className='w-6 h-6 rounded-full'
-                        />
-                        <span className='font-medium text-sm text-default-600 dark:text-default-700'>In</span>
-                    </div>
-                </SelectItem>
-                {/* <SelectItem value="ar">
+  const onSelectChange = (nextLocale: string) => {
+    startTransition(() => {
+      router.replace(pathname, { locale: nextLocale });
+    });
+  };
+  return (
+    <Select onValueChange={onSelectChange} defaultValue={localActive}>
+      <SelectTrigger className="w-[94px] border-none read-only:bg-transparent">
+        <SelectValue placeholder="Select a language" />
+      </SelectTrigger>
+      <SelectContent>
+        <SelectItem value="en" className="border-none">
+          <div className="flex items-center gap-1">
+            <Image src="/images/all-img/flag-1.png" alt="flag" width={24} height={24} className="w-6 h-6 rounded-full" />
+            <span className="font-medium text-sm text-default-600 dark:text-default-700">En</span>
+          </div>
+        </SelectItem>
+        <SelectItem value="in" className="border-none">
+          <div className="flex items-center gap-1">
+            <Image src="/images/all-img/flag-3.png" alt="flag" width={24} height={24} className="w-6 h-6 rounded-full" />
+            <span className="font-medium text-sm text-default-600 dark:text-default-700">In</span>
+          </div>
+        </SelectItem>
+        {/* <SelectItem value="ar">
                     <div className='flex items-center gap-1'>
                         <Image
                             src="/images/all-img/flag-2.png"
@@ -76,8 +51,7 @@ export default function LocalSwitcher() {
                         <span className='font-medium text-sm text-default-600 dark:text-default-700'>Ar</span>
                     </div>
                 </SelectItem> */}
-            </SelectContent>
-        </Select>
-
-    );
-}
\ No newline at end of file
+      </SelectContent>
+    </Select>
+  );
+}
diff --git a/components/ui/carousel.tsx b/components/ui/carousel.tsx
index a56cc9de..e97c697a 100644
--- a/components/ui/carousel.tsx
+++ b/components/ui/carousel.tsx
@@ -1,9 +1,7 @@
 "use client";
 
 import * as React from "react";
-import useEmblaCarousel, {
-  type UseEmblaCarouselType,
-} from "embla-carousel-react";
+import useEmblaCarousel, { type UseEmblaCarouselType } from "embla-carousel-react";
 import { ArrowLeft, ArrowRight } from "lucide-react";
 
 import { cn } from "@/lib/utils";
@@ -42,162 +40,109 @@ function useCarousel() {
   return context;
 }
 
-const Carousel = React.forwardRef<
-  HTMLDivElement,
-  React.HTMLAttributes<HTMLDivElement> & CarouselProps
->(
-  (
+const Carousel = React.forwardRef<HTMLDivElement, React.HTMLAttributes<HTMLDivElement> & CarouselProps>(({ orientation = "horizontal", opts, setApi, plugins, className, children, ...props }, ref) => {
+  const [carouselRef, api] = useEmblaCarousel(
     {
-      orientation = "horizontal",
-      opts,
-      setApi,
-      plugins,
-      className,
-      children,
-      ...props
+      ...opts,
+      axis: orientation === "horizontal" ? "x" : "y",
     },
-    ref
-  ) => {
-    const [carouselRef, api] = useEmblaCarousel(
-      {
-        ...opts,
-        axis: orientation === "horizontal" ? "x" : "y",
-      },
-      plugins
-    );
-    const [canScrollPrev, setCanScrollPrev] = React.useState(false);
-    const [canScrollNext, setCanScrollNext] = React.useState(false);
+    plugins
+  );
+  const [canScrollPrev, setCanScrollPrev] = React.useState(false);
+  const [canScrollNext, setCanScrollNext] = React.useState(false);
 
-    const onSelect = React.useCallback((api: CarouselApi) => {
-      if (!api) {
-        return;
+  const onSelect = React.useCallback((api: CarouselApi) => {
+    if (!api) {
+      return;
+    }
+
+    setCanScrollPrev(api.canScrollPrev());
+    setCanScrollNext(api.canScrollNext());
+  }, []);
+
+  const scrollPrev = React.useCallback(() => {
+    api?.scrollPrev();
+  }, [api]);
+
+  const scrollNext = React.useCallback(() => {
+    api?.scrollNext();
+  }, [api]);
+
+  const handleKeyDown = React.useCallback(
+    (event: React.KeyboardEvent<HTMLDivElement>) => {
+      if (event.key === "ArrowLeft") {
+        event.preventDefault();
+        scrollPrev();
+      } else if (event.key === "ArrowRight") {
+        event.preventDefault();
+        scrollNext();
       }
+    },
+    [scrollPrev, scrollNext]
+  );
 
-      setCanScrollPrev(api.canScrollPrev());
-      setCanScrollNext(api.canScrollNext());
-    }, []);
+  React.useEffect(() => {
+    if (!api || !setApi) {
+      return;
+    }
 
-    const scrollPrev = React.useCallback(() => {
-      api?.scrollPrev();
-    }, [api]);
+    setApi(api);
+  }, [api, setApi]);
 
-    const scrollNext = React.useCallback(() => {
-      api?.scrollNext();
-    }, [api]);
+  React.useEffect(() => {
+    if (!api) {
+      return;
+    }
 
-    const handleKeyDown = React.useCallback(
-      (event: React.KeyboardEvent<HTMLDivElement>) => {
-        if (event.key === "ArrowLeft") {
-          event.preventDefault();
-          scrollPrev();
-        } else if (event.key === "ArrowRight") {
-          event.preventDefault();
-          scrollNext();
-        }
-      },
-      [scrollPrev, scrollNext]
-    );
+    onSelect(api);
+    api.on("reInit", onSelect);
+    api.on("select", onSelect);
 
-    React.useEffect(() => {
-      if (!api || !setApi) {
-        return;
-      }
+    return () => {
+      api?.off("select", onSelect);
+    };
+  }, [api, onSelect]);
 
-      setApi(api);
-    }, [api, setApi]);
-
-    React.useEffect(() => {
-      if (!api) {
-        return;
-      }
-
-      onSelect(api);
-      api.on("reInit", onSelect);
-      api.on("select", onSelect);
-
-      return () => {
-        api?.off("select", onSelect);
-      };
-    }, [api, onSelect]);
-
-    return (
-      <CarouselContext.Provider
-        value={{
-          carouselRef,
-          api: api,
-          opts,
-          orientation:
-            orientation || (opts?.axis === "y" ? "vertical" : "horizontal"),
-          scrollPrev,
-          scrollNext,
-          canScrollPrev,
-          canScrollNext,
-        }}
-      >
-        <div
-          ref={ref}
-          onKeyDownCapture={handleKeyDown}
-          className={cn("relative", className)}
-          role="region"
-          aria-roledescription="carousel"
-          {...props}
-        >
-          {children}
-        </div>
-      </CarouselContext.Provider>
-    );
-  }
-);
+  return (
+    <CarouselContext.Provider
+      value={{
+        carouselRef,
+        api: api,
+        opts,
+        orientation: orientation || (opts?.axis === "y" ? "vertical" : "horizontal"),
+        scrollPrev,
+        scrollNext,
+        canScrollPrev,
+        canScrollNext,
+      }}
+    >
+      <div ref={ref} onKeyDownCapture={handleKeyDown} className={cn("relative", className)} role="region" aria-roledescription="carousel" {...props}>
+        {children}
+      </div>
+    </CarouselContext.Provider>
+  );
+});
 Carousel.displayName = "Carousel";
 
-const CarouselContent = React.forwardRef<
-  HTMLDivElement,
-  React.HTMLAttributes<HTMLDivElement>
->(({ className, ...props }, ref) => {
+const CarouselContent = React.forwardRef<HTMLDivElement, React.HTMLAttributes<HTMLDivElement>>(({ className, ...props }, ref) => {
   const { carouselRef, orientation } = useCarousel();
 
   return (
     <div ref={carouselRef} className="overflow-hidden">
-      <div
-        ref={ref}
-        className={cn(
-          "flex",
-          orientation === "horizontal" ? "-ml-4" : "-mt-4 flex-col",
-          className
-        )}
-        {...props}
-      />
+      <div ref={ref} className={cn("flex", orientation === "horizontal" ? "-ml-4" : "-mt-4 flex-col", className)} {...props} />
     </div>
   );
 });
 CarouselContent.displayName = "CarouselContent";
 
-const CarouselItem = React.forwardRef<
-  HTMLDivElement,
-  React.HTMLAttributes<HTMLDivElement>
->(({ className, ...props }, ref) => {
+const CarouselItem = React.forwardRef<HTMLDivElement, React.HTMLAttributes<HTMLDivElement>>(({ className, ...props }, ref) => {
   const { orientation } = useCarousel();
 
-  return (
-    <div
-      ref={ref}
-      role="group"
-      aria-roledescription="slide"
-      className={cn(
-        "min-w-0 shrink-0 grow-0 basis-full",
-        orientation === "horizontal" ? "pl-4" : "pt-4",
-        className
-      )}
-      {...props}
-    />
-  );
+  return <div ref={ref} role="group" aria-roledescription="slide" className={cn("min-w-0 shrink-0 grow-0 basis-full", orientation === "horizontal" ? "pl-4" : "pt-4", className)} {...props} />;
 });
 CarouselItem.displayName = "CarouselItem";
 
-const CarouselPrevious = React.forwardRef<
-  HTMLButtonElement,
-  React.ComponentProps<typeof Button>
->(({ className, variant = "outline", size = "icon", ...props }, ref) => {
+const CarouselPrevious = React.forwardRef<HTMLButtonElement, React.ComponentProps<typeof Button>>(({ className, variant = "outline", size = "icon", ...props }, ref) => {
   const { orientation, scrollPrev, canScrollPrev } = useCarousel();
 
   return (
@@ -205,13 +150,7 @@ const CarouselPrevious = React.forwardRef<
       ref={ref}
       variant={variant}
       size={size}
-      className={cn(
-        "absolute h-6 w-6 rounded-full text-white bg-black -ml-6",
-        orientation === "horizontal"
-          ? "-left-0 top-1/2 -translate-y-1/2"
-          : "-top-0 left-1/2 -translate-x-1/2 rotate-90",
-        className
-      )}
+      className={cn("absolute h-6 w-6 rounded-full text-white bg-black -ml-6", orientation === "horizontal" ? "-left-0 top-1/2 -translate-y-1/2" : "-top-0 left-1/2 -translate-x-1/2 rotate-90", className)}
       disabled={!canScrollPrev}
       onClick={scrollPrev}
       {...props}
@@ -223,10 +162,7 @@ const CarouselPrevious = React.forwardRef<
 });
 CarouselPrevious.displayName = "CarouselPrevious";
 
-const CarouselNext = React.forwardRef<
-  HTMLButtonElement,
-  React.ComponentProps<typeof Button>
->(({ className, variant = "outline", size = "icon", ...props }, ref) => {
+const CarouselNext = React.forwardRef<HTMLButtonElement, React.ComponentProps<typeof Button>>(({ className, variant = "outline", size = "icon", ...props }, ref) => {
   const { orientation, scrollNext, canScrollNext } = useCarousel();
 
   return (
@@ -234,13 +170,7 @@ const CarouselNext = React.forwardRef<
       ref={ref}
       variant={variant}
       size={size}
-      className={cn(
-        "absolute h-6 w-6 rounded-full bg-black text-white -mr-4",
-        orientation === "horizontal"
-          ? "-right-0 top-1/2 -translate-y-1/2"
-          : "-bottom-0 left-1/2 -translate-x-1/2 rotate-90",
-        className
-      )}
+      className={cn("absolute h-6 w-6 rounded-full bg-black text-white -mr-6", orientation === "horizontal" ? "-right-0 top-1/2 -translate-y-1/2" : "-bottom-0 left-1/2 -translate-x-1/2 rotate-90", className)}
       disabled={!canScrollNext}
       onClick={scrollNext}
       {...props}
@@ -252,11 +182,4 @@ const CarouselNext = React.forwardRef<
 });
 CarouselNext.displayName = "CarouselNext";
 
-export {
-  type CarouselApi,
-  Carousel,
-  CarouselContent,
-  CarouselItem,
-  CarouselPrevious,
-  CarouselNext,
-};
+export { type CarouselApi, Carousel, CarouselContent, CarouselItem, CarouselPrevious, CarouselNext };
diff --git a/messages/en.json b/messages/en.json
index cfd86192..47676da0 100644
--- a/messages/en.json
+++ b/messages/en.json
@@ -433,7 +433,6 @@
     "terms": "Terms and Conditions",
     "enterOTP": "Enter OTP Code",
     "checkInbox": "Please check your email inbox or spam box.",
-    "resending": "Resending",
     "fullName": "Full Name",
     "enterFullName": "Insert your full name",
     "enterUsername": "Insert your Username",
@@ -545,7 +544,8 @@
     "answer4": "MediaHub is a platform that provides various informative and educational content. Key features include search, download, and personalization of content.",
     "welcome": "Welcome To",
     "polda": "Official coverage sourced from Polri activities at Polda",
-    "satker": "Official coverage sourced from Polri activities at Satker"
+    "satker": "Official coverage sourced from Polri activities at Satker",
+    "resending": "Resending"
   },
   "FilterPage": {
     "image": "Image",
diff --git a/messages/in.json b/messages/in.json
index ec095da5..557df9fd 100644
--- a/messages/in.json
+++ b/messages/in.json
@@ -434,7 +434,6 @@
     "terms": "Syarat dan Ketentuan",
     "enterOTP": "Masukkan kode OTP",
     "checkInbox": "Silahkan cek inbox atau kotak spam pada email Anda.",
-    "resending": "Kirim Ulang",
     "fullName": "Nama Lengkap",
     "enterFullName": "Masukkan Nama Lengkap Anda",
     "enterUsername": "Masukkan Username Anda",
@@ -546,7 +545,8 @@
     "answer4": "MediaHub adalah platform yang menyediakan berbagai konten informatif dan edukatif. Fitur utama meliputi pencarian, pengunduhan, dan personalisasi konten.",
     "welcome": "Selamat Datang di",
     "polda": "Liputan resmi yang bersumber dari kegiatan Polri di Polda",
-    "satker": "Liputan resmi yang bersumber dari kegiatan Polri di Satker"
+    "satker": "Liputan resmi yang bersumber dari kegiatan Polri di Satker",
+    "resending": "Kirim Ulang"
   },
   "FilterPage": {
     "image": "Foto",
diff --git a/public/assets/satker/logo-yanma.png b/public/assets/satker/logo-yanma.png
new file mode 100644
index 00000000..a95a4895
Binary files /dev/null and b/public/assets/satker/logo-yanma.png differ