diff --git a/app/[locale]/(protected)/admin/settings/banner/component/table.tsx b/app/[locale]/(protected)/admin/settings/banner/component/table.tsx
index acd5a223..f28b331e 100644
--- a/app/[locale]/(protected)/admin/settings/banner/component/table.tsx
+++ b/app/[locale]/(protected)/admin/settings/banner/component/table.tsx
@@ -423,7 +423,7 @@ const ContentListBanner = () => {
               checked={selectedItems.length === data.length}
               onCheckedChange={handleSelectAll}
             />
-            <span>Pilih Semua</span>
+            <span className="text-black dark:text-white">Pilih Semua</span>
           </div>
           {selectedItems.length > 0 && (
             <Button color="primary" onClick={() => handleBanner(selectedItems)}>
diff --git a/app/[locale]/(protected)/admin/settings/banner/page.tsx b/app/[locale]/(protected)/admin/settings/banner/page.tsx
index 510e102c..a9a2e349 100644
--- a/app/[locale]/(protected)/admin/settings/banner/page.tsx
+++ b/app/[locale]/(protected)/admin/settings/banner/page.tsx
@@ -13,7 +13,7 @@ export default function AdminBanner() {
   return (
     <div>
       <SiteBreadcrumb />
-      <div className="w-full overflow-x-auto bg-white p-4 rounded-sm space-y-3">
+      <div className="w-full overflow-x-auto bg-white dark:bg-black p-4 rounded-sm space-y-3">
         <div className="flex justify-between">
           {selectedTab === "content" ? "List Media" : " List Banner"}
 
diff --git a/app/[locale]/(protected)/admin/settings/category/component/edit.tsx b/app/[locale]/(protected)/admin/settings/category/component/edit.tsx
index 249992cd..3a7667ec 100644
--- a/app/[locale]/(protected)/admin/settings/category/component/edit.tsx
+++ b/app/[locale]/(protected)/admin/settings/category/component/edit.tsx
@@ -162,11 +162,11 @@ export default function EditCategoryModal(props: {
   }, [id]);
 
   function removeAndReturn(inputString: string, toRemove: number[]) {
-    const numbers = inputString.split(",").map(Number);
+    const numbers = inputString?.split(",").map(Number);
 
-    const filteredNumbers = numbers.filter((num) => !toRemove.includes(num));
+    const filteredNumbers = numbers?.filter((num) => !toRemove?.includes(num));
 
-    return filteredNumbers.map(String);
+    return filteredNumbers?.map(String);
   }
 
   function filterString(inputString: string, type: string) {
diff --git a/components/form/content/image-form.tsx b/components/form/content/image-form.tsx
index c0704b89..b517d519 100644
--- a/components/form/content/image-form.tsx
+++ b/components/form/content/image-form.tsx
@@ -167,6 +167,7 @@ export default function FormImage() {
       "image/png": [],
       "image/jpg": [],
     },
+    multiple: true,
     onDrop: (acceptedFiles) => {
       const validFiles = acceptedFiles
         .filter(
@@ -187,8 +188,11 @@ export default function FormImage() {
         return;
       }
 
-      setFiles(validFiles);
-      setValue("files", validFiles);
+      setFiles((prev) => {
+        const next = [...prev, ...validFiles];
+        setValue("files", next, { shouldDirty: true });
+        return next;
+      });
     },
   });
 
@@ -1167,12 +1171,13 @@ export default function FormImage() {
                       render={({ field: { onChange, value } }) =>
                         isLoadingData ? (
                           <div className="flex justify-center items-center h-40">
-                            <p className="text-gray-500">
+                            <p className="text-gray-500 dark:text-black">
                               Loading Proses Data...
                             </p>
                           </div>
                         ) : (
                           <CustomEditor
+                            className="dark:text-black"
                             onChange={(value: any) => {
                               onChange(value);
                               setEditorContent(value);
@@ -1498,8 +1503,8 @@ export default function FormImage() {
                           }
                         }
 
-                        field.onChange(updated); 
-                        setPublishedFor(updated); 
+                        field.onChange(updated);
+                        setPublishedFor(updated);
                       };
 
                       return (
diff --git a/components/landing-page/navbar.tsx b/components/landing-page/navbar.tsx
index a98bfe86..00c8f3e1 100644
--- a/components/landing-page/navbar.tsx
+++ b/components/landing-page/navbar.tsx
@@ -726,17 +726,16 @@ const Navbar = () => {
               {/* Inbox */}
               <Popover>
                 <PopoverTrigger asChild>
-                  <a className="cursor-pointer" onClick={() => test()}>
+                  <a
+                    className="cursor-pointer text-black dark:text-white"
+                    onClick={() => test()}
+                  >
                     {" "}
-                    <Icon
-                      icon="basil:envelope-outline"
-                      color="black"
-                      width="30"
-                    />
+                    <Icon icon="basil:envelope-outline" width="30" />
                   </a>
                 </PopoverTrigger>
                 <PopoverContent
-                  className=" p-0 h-32 flex flex-col mt-2"
+                  className="overflow-y-scroll p-0 h-full flex flex-col mt-2"
                   align="end"
                 >
                   <Tabs
@@ -1214,6 +1213,15 @@ const Navbar = () => {
                 </a>
               </div>
 
+              {/* Languange */}
+              <div
+                className={`${
+                  isHidden ? "hidden" : "custom-lg-button:flex"
+                } relative text-left`}
+              >
+                <LocalSwitcher />
+              </div>
+
               <div className="relative inline-block mx-3 text-left">
                 <ThemeSwitcher />