diff --git a/template/javascript/product_form.html b/template/javascript/product_form.html
index 9838546..9c13d3c 100644
--- a/template/javascript/product_form.html
+++ b/template/javascript/product_form.html
@@ -21,8 +21,31 @@
         labelIdle: 'Kéo thả ảnh hoặc <span class="filepond--label-action">Chọn ảnh</span>',
     })
 
+    FilePond.create(document.querySelector("#image-category-icon"), {
+        credits: false,
+        allowImageCrop: false,
+        allowImagePreview: false,
+        allowMultiple: true,
+        labelIdle: 'Kéo thả ảnh hoặc <span class="filepond--label-action">Chọn ảnh</span>',
+    })
 
 
+    FilePond.create(document.querySelector("#image-category-avatar"), {
+        credits: false,
+        allowImageCrop: false,
+        allowImagePreview: false,
+        allowMultiple: true,
+        labelIdle: 'Kéo thả ảnh hoặc <span class="filepond--label-action">Chọn ảnh</span>',
+    })
+
+    FilePond.create(document.querySelector("#image-brand"), {
+        credits: false,
+        allowImageCrop: false,
+        allowImagePreview: false,
+        allowMultiple: true,
+        labelIdle: 'Kéo thả ảnh hoặc <span class="filepond--label-action">Chọn ảnh</span>',
+    })
+
 
 
     tinymce.init({
diff --git a/template/product/addon.html b/template/product/addon.html
index e94f1a8..ffc4e9c 100644
--- a/template/product/addon.html
+++ b/template/product/addon.html
@@ -2,12 +2,12 @@
     <h1 class="text-2xl font-bold">Danh sách sản phẩm/dịch vụ bán kèm sản phẩm</h1>
 
     <div class=" flex items-center justify-end gap-3">
-        <a href="/admin/product/addon_add" class="btn btn-view btn-outline">
-            <i class="iconify lucide--circle-plus">+</i>
+        <a href="/admin/product/addon_add" class="btn btn-view btn-sm btn-outline">
+            <i data-lucide="circle-plus" class="size-3"></i>
             <span class="">Thêm danh sách mới</span>
         </a>
-        <a href="/admin/product/attribute_update" class="btn btn-view btn-outline">
-            <i class=" iconify lucide--file-x"></i>
+        <a href="/admin/product/attribute_update" class="btn btn-view btn-sm btn-outline">
+            <i data-lucide="file-x" class="size-3"></i>
             <span class="">Cập nhật Excel</span>
         </a>
     </div>
@@ -29,7 +29,7 @@
                     <td>
                         <div class="flex items-center gap-3">
                             <span>[8]</span>
-                            <a href="" class="link-primary">Bộ phím chuột không dây Kenoo KM600 trị giá 249.000 VND
+                            <a href="" class="link-active">Bộ phím chuột không dây Kenoo KM600 trị giá 249.000 VND
                                 (KBKN002)</a>
                         </div>
                         <p>Ghi chú: KM màn hình 27 1</p>
@@ -41,13 +41,13 @@
                     <td class="">
                         <div class='list-btn flex items-center gap-3'>
                             <a href="" class='btn btn-soft btn-xs btn-square btn-outline  btn-view'><i
-                                    class='iconify lucide--pencil'></i></a>
+                                    data-lucide="pencil" class='size-3'></i></a>
                             <a href="" class='btn btn-soft btn-xs btn-square btn-outline  btn-view'><i
-                                    class='iconify lucide--plus'></i></a>
-                            <a href="" class='btn btn-soft btn-xs btn-square'><i
-                                    class="iconify lucide--eye-off"></i></a>
+                                    data-lucide="plus" class='size-3'></i></a>
+                            <a href="" class='btn btn-soft btn-xs btn-square'><i data-lucide="eye-off"
+                                    class='size-3'></i></a>
                             <a href="" class='btn btn-soft btn-xs btn-square btn-outline  btn-error'><i
-                                    class='iconify lucide--trash'></i></a>
+                                    data-lucide="trash-2" class='size-3'></i></a>
                         </div>
                     </td>
                 </tr>
diff --git a/template/product/addon_add.html b/template/product/addon_add.html
index 6048bb4..c5e420e 100644
--- a/template/product/addon_add.html
+++ b/template/product/addon_add.html
@@ -1,90 +1,84 @@
-<div class="w-[100%] mb-[50px]">
+<div class="w-full mb-[50px]">
 
-    <div class="text-sm breadcrumbs ml-[10px]">
+    <div class="text-sm breadcrumbs">
         <ul>
             <li><a href="/admin/product/addon">SP/ Dịch vụ bán kèm sản phẩm</a></li>
-            <li class="text-[#0041E8]">Form sửa SP/ Dịch vụ bán kèm</li>
+            <li class="text-active">Form sửa SP/ Dịch vụ bán kèm</li>
         </ul>
     </div>
 
-    <div class="w-[1140px] my-0 mx-auto">
-        <div class="bg-white p-[10px] rounded-[10px] shadow-[0_1px_1px_0px_#0000001A] mb-[15px]">
+    <div class="w-7xl mx-auto">
+        <div class="bg-white p-3 rounded-sm shadow mt-5">
             <div class="flex items-center justify-between">
-                <h1 class="text-[20px] font-[700]">Cập nhật SP/ Dịch vụ bán kèm</h1>
-                <a href="/admin/product/attribute-add"
-                    class="flex items-center border-[1px] border-[#ECECEC] rounded-[4px] p-[5px_10px_5px_10px]">
-                    <span
-                        class="w-[14px] h-[14px] border-[1px] rounded-[50%] border-[#6B7280] text-center leading-[11px] mr-[5px] text-[#6B7280]">+</span>
-                    <span class="text-[#6B7280]">Thêm dịch vụ mới</span>
+                <h1 class="text-xl font-bold">Cập nhật SP/ Dịch vụ bán kèm</h1>
+                <a href="/admin/product/attribute-add" class="btn btn-outline btn-sm btn-view">
+                    <i data-lucide="plus" class="size-3"></i>
+                    <span class="">Thêm dịch vụ mới</span>
                 </a>
             </div>
         </div>
 
-        <div class="flex">
-            <div class="left w-[270px] mr-[10px]">
+        <div class="grid grid-cols-4 gap-5 mt-5">
+            <div class="left">
                 <div class="list-tab">
                     <a href="/admin/product/addon_add"
-                        class="item block w-[100%] h-[36px] text-white bg-[#0041E8] rounded-[10px] text-[13px] leading-[35px] px-[20px]">Nội
+                        class="item block w-full text-white bg-[#0041E8] rounded-sm text-base px-3 py-2 font-bold">Nội
                         dung</a>
                 </div>
             </div>
-            <div class="right w-[860px]">
-                <div
-                    class="bg-white p-[10px] rounded-[10px_10px_0_0] shadow-[0_-1px_1px_0px_#0000001A] border-b-[6px] border-[#FAFAFB]">
-                    <b class="block text-[20px] mb-[23px]">Thông tin sản phẩm</b>
+            <div class="right col-span-3">
+                <div class="bg-white p-3 rounded-sm  shadow">
+                    <b class="block text-xl">Thông tin sản phẩm</b>
 
-                    <div class="mb-[25px]">
-                        <label for="" class="block mb-[10px] font-[700] text-[14px] text-[#383C44]">Tên dịch vụ</label>
+                    <div class="mt-5">
+                        <label for="" class="block font-bold">Tên dịch vụ</label>
                         <input type="text" name="info[warranty]" id="warranty" value="Test"
-                            placeholder="Thông tin bảo hành"
-                            class="w-[100%] input input-md input-bordered h-[35px] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)] mr-[10px]">
+                            placeholder="Thông tin bảo hành" class="w-full input input-md  rounded-sm shadow mt-3">
                     </div>
-                    <div class="mb-[25px]">
-                        <label for="" class="block mb-[10px] font-[700] text-[14px] text-[#383C44]">Mô tả</label>
-                        <textarea id="product-desc"> </textarea>
+                    <div class="mt-5">
+                        <label for="" class="block font-bold mb-3">Mô tả</label>
+                        <textarea id="product-desc" class="mt-3"> </textarea>
                     </div>
 
-                    <div class="mb-[25px]">
-                        <label for="" class="block mb-[10px] font-[700] text-[14px] text-[#383C44]">Ghi chú (dành cho
+                    <div class="mt-5">
+                        <label for="" class="block font-bold">Ghi chú (dành cho
                             quản trị)</label>
                         <input type="text" name="info[warranty]" id="warranty" value="Test"
-                            placeholder="Thông tin bảo hành"
-                            class="w-[100%] input input-md input-bordered h-[35px] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)] mr-[10px]">
+                            placeholder="Thông tin bảo hành" class="w-full input input-md  rounded-sm shadow mt-3">
                     </div>
 
-                    <div class="grid grid-cols-2 gap-[15px]">
+                    <div class="grid grid-cols-2 gap-3 mt-5">
                         <div>
-                            <label for="" class=" block mb-[10px] font-[700] text-[14px] text-[#383C44]">Giá</label>
+                            <label for="" class=" block font-bold">Giá</label>
                             <input type="text" name="" value="0" placeholder="Giá"
-                                class="w-[100%] input input-md input-bordered h-[35px] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)] mr-[10px]">
+                                class="w-full input input-md  rounded-sm shadow mt-3" />
                         </div>
                         <div>
-                            <label for="" class=" block mb-[10px] font-[700] text-[14px] text-[#383C44]">Thứ tự hiển
+                            <label for="" class=" block font-bold ">Thứ tự hiển
                                 thị</label>
-                            <input type="text" name="" value="1" placeholder="Thứ tự hiển thị"
-                                class="w-[100%] input input-md input-bordered h-[35px] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)] mr-[10px]">
+                            <input type="text" name="" value="0" placeholder="Giá"
+                                class="w-full input input-md  rounded-sm shadow mt-3" />
                         </div>
                     </div>
 
-                    <div class="flex items-center mt-[15px]">
-                        <b class="mr-[40px]">Hiển thị</b>
-                        <label class="cursor-pointer flex items-center mr-[40px]">
-                            <input type="radio" name="info[status]" value="0" class="radio checked:bg-blue-500"
+                    <div class="flex items-center mt-5 gap-5">
+                        <b class="">Hiển thị</b>
+                        <label class="cursor-pointer flex items-center gap-3">
+                            <input type="radio" name="info[status]" value="0" class="radio radio-active radio-sm"
                                 checked="checked" />
-                            <span class="label-text ml-[10px]">Cho hiển thị</span>
+                            <span class="label-text">Cho hiển thị</span>
                         </label>
-                        <label class="cursor-pointer flex items-center">
-                            <input type="radio" name="info[status]" value="0" class="radio checked:bg-blue-500"
+                        <label class="cursor-pointer flex items-center gap-3">
+                            <input type="radio" name="info[status]" value="0" class="radio radio-active radio-sm"
                                 checked="checked" />
-                            <span class="label-text ml-[10px]">Ẩn hiển thị</span>
+                            <span class="label-text">Ẩn hiển thị</span>
                         </label>
                     </div>
 
                 </div>
-                <div class="bg-white p-[10px] rounded-[0_0_10px_10px] shadow-[0_1px_1px_0px_#0000001A] mt-[5px]">
+                <div class="bg-white p-3 rounded-sm shadow mt-5">
                     <input type="hidden" name="create" value="yes" />
-                    <input name="commit" type="submit" value="Cập nhật"
-                        class="inline-block mt-[12px] cursor-pointer h-[32px] bg-[#0041E8] text-[#fff] rounded-[4px] font-[500] p-[0_11px]" />
+                    <input name="commit" type="submit" value="Cập nhật" class="btn btn-active" />
                 </div>
             </div>
         </div>
diff --git a/template/product/attribute.html b/template/product/attribute.html
index ef44460..e704c4d 100644
--- a/template/product/attribute.html
+++ b/template/product/attribute.html
@@ -2,8 +2,8 @@
     <h1 class="text-2xl font-bold mb-3">Danh sách thuộc tính</h1>
 
     <div class="flex items-end justify-end">
-        <a href="/admin/product/attribute_add" class="btn btn-outline btn-view">
-            <i class="iconify lucide--circle-plus"></i>
+        <a href="/admin/product/attribute_add" class="btn btn-outline btn-view btn-sm">
+            <i data-lucide="circle-plus" class="size-4"></i>
             <span class="">Thêm thuộc tính mới</span>
         </a>
     </div>
@@ -41,7 +41,7 @@
                         </div>
                     </td>
                     <td>
-                        <input type="text" value="0" class="input w-24" />
+                        <input type="text" value="0" class="input w-12 input-sm" />
                     </td>
                     <td>
                         <a href="" class="badge badge-success badge-sm badge-soft">Đang hoạt động</a>
@@ -49,10 +49,11 @@
                     <td>
                         <div class='list-btn flex items-center gap-3'>
                             <a href="" class='btn btn-soft btn-xs btn-square btn-outline  btn-view'><i
-                                    class='iconify lucide--pencil'></i></a>
-                            <a href="" class='btn btn-soft btn-xs btn-square '><i class="iconify lucide--eye"></i></a>
+                                    data-lucide="pencil" class='size-3'></i></a>
+                            <a href="" class='btn btn-soft btn-xs btn-square '><i data-lucide="eye"
+                                    class="size-4"></i></a>
                             <a href="" class='btn btn-soft btn-xs btn-square btn-outline  btn-error'><i
-                                    class='iconify lucide--trash'></i></a>
+                                    data-lucide="trash" class="size-3"></i></a>
                         </div>
                     </td>
                 </tr>
@@ -73,7 +74,7 @@
                         </div>
                     </td>
                     <td>
-                        <input type="text" value="0" class="input w-24" />
+                        <input type="text" value="0" class="input w-12 input-sm" />
                     </td>
                     <td>
                         <a href="" class="badge badge-success badge-sm badge-soft">Đang hoạt động</a>
@@ -81,10 +82,11 @@
                     <td>
                         <div class='list-btn flex items-center gap-3'>
                             <a href="" class='btn btn-soft btn-xs btn-square btn-outline  btn-view'><i
-                                    class='iconify lucide--pencil'></i></a>
-                            <a href="" class='btn btn-soft btn-xs btn-square '><i class="iconify lucide--eye"></i></a>
+                                    data-lucide="pencil" class='size-3'></i></a>
+                            <a href="" class='btn btn-soft btn-xs btn-square '><i data-lucide="eye"
+                                    class="size-3"></i></a>
                             <a href="" class='btn btn-soft btn-xs btn-square btn-outline  btn-error'><i
-                                    class='iconify lucide--trash'></i></a>
+                                    data-lucide="trash-2" class="size-3"></i></a>
                         </div>
                     </td>
                 </tr>
diff --git a/template/product/attribute_add.html b/template/product/attribute_add.html
index 6387008..c18de1f 100644
--- a/template/product/attribute_add.html
+++ b/template/product/attribute_add.html
@@ -1,212 +1,214 @@
-<div class="w-[100%] mb-[50px]">
+<div class="w-full mb-10">
 
-    <div class="text-sm breadcrumbs ml-[10px]">
+    <div class="text-sm breadcrumbs">
         <ul>
             <li><a href="/admin/product/attribute">Thuộc tính sản phẩm</a></li>
-            <li class="text-[#0041E8]">Form thêm/sửa thuộc tính</li>
+            <li class="text-active">Form thêm/sửa thuộc tính</li>
         </ul>
     </div>
 
-    <div class="w-[1140px] my-0 mx-auto">
-        <div class="bg-white p-[10px] rounded-[10px] shadow-[0_1px_1px_0px_#0000001A] mb-[15px]">
+    <div class="w-7xl mx-auto">
+        <div class="bg-white p-3 rounded-sm shadow mb-4 mt-5">
             <div class="flex items-center justify-between">
-                <h1 class="text-[20px] font-[700]">Cập nhật thuộc tính sản phẩm</h1>
-                <a href="/admin/product/attribute-add"
-                    class="flex items-center border-[1px] border-[#ECECEC] rounded-[4px] p-[5px_10px_5px_10px]">
-                    <span
-                        class="w-[14px] h-[14px] border-[1px] rounded-[50%] border-[#6B7280] text-center leading-[11px] mr-[5px] text-[#6B7280]">+</span>
-                    <span class="text-[#6B7280]">Thêm thuộc tính mới</span>
+                <h1 class="text-xl font-bold">Cập nhật thuộc tính sản phẩm</h1>
+                <a href="/admin/product/attribute-add" class="btn btn-outline btn-sm btn-view">
+                    <i data-lucide="plus" class="size-3"></i>
+                    <span class="">Thêm thuộc tính mới</span>
                 </a>
             </div>
         </div>
 
-        <div class="flex">
-            <div class="left w-[270px] mr-[10px]">
+        <div class="grid grid-cols-4 gap-5">
+            <div class="left">
                 <div class="list-tab">
-                    <a href="javascript:void(0)"
-                        class="item block w-[100%] h-[36px] text-white bg-[#0041E8] rounded-[10px] text-[13px] leading-[35px] px-[10px]">Nội
-                        dung</a>
+                    <div class="list-tab">
+                        <a href="javascript:void(0)"
+                            class="item block w-full font-bold text-white bg-[#0041E8] rounded-sm text-base px-3 py-2">Nội
+                            dung</a>
+                    </div>
                 </div>
             </div>
-            <div class="right w-[860px]">
-                <div
-                    class="bg-white p-[10px] rounded-[10px_10px_0_0] shadow-[0_-1px_1px_0px_#0000001A] border-b-[6px] border-[#FAFAFB]">
-                    <b class="text-[20px] mb-[10px] block">Thông tin cơ bản</b>
+            <div class="right col-span-3">
+                <div class="bg-white p-3 rounded-sm shadow">
+                    <b class="text-xl block">Thông tin cơ bản</b>
 
-                    <div class="form-control mb-[10px]">
-                        <label class="font-[600] mb-[5px] text-[14px]">Tên thuộc tính</label>
+                    <div class="form-control mt-5">
+                        <label class="font-bold text-base">Tên thuộc tính</label>
                         <input type="text" size="60" name="info[title]" id="title" value="{{page.item_info.title}}"
-                            placeholder="Tên thuộc tính"
-                            class="w-[100%] border-[1px] border-[#D8D8D8] py-[6px] px-[10px] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)]">
+                            placeholder="Tên thuộc tính" class="w-full input rounded-sm shadow mt-3">
                     </div>
 
-                    <div class="form-control w-[100%] mb-[10px]">
-                        <label class="flex items-center mb-[5px] text-[14px]">
+                    <div class="form-control w-full mt-5">
+                        <label class="flex items-center mb-1 text-base gap-3">
                             <b>Mã nhận dạng cho quản trị</b>
-                            <span class="ml-[10px] italic text-[#6B7280] text-[13px]">v.d. kich_thuoc_quan (không có dấu
+                            <span class="italic text-gray-500 text-xs">v.d. kich_thuoc_quan (không có dấu
                                 cách, không viết dấu của tiếng Việt)</span>
                         </label>
                         <input type="text" size="60" name="redirect_url" id="redirect_url" value="0"
-                            class="w-[100%] border-[1px] border-[#D8D8D8] py-[6px] px-[10px] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)]">
+                            class="w-full input rounded-sm shadow mt-3">
                     </div>
 
-                    <div class="form-control w-[100%] mb-[10px]">
-                        <label class="flex items-center mb-[5px] text-[14px]">
+                    <div class="form-control mt-5">
+                        <label class="flex items-center mb-1 text-base gap-3">
                             <b>Mô tả tóm tắt</b>
-                            <span class="ml-[10px] italic text-[#6B7280] text-[13px]">(nếu muốn hiển thị và giải thích ý
+                            <span class="italic text-gray-500 text-xs">(nếu muốn hiển thị và giải thích ý
                                 nghĩa cho khách hàng)</span>
                         </label>
                         <textarea type="text" size="60" name="redirect_url" id="redirect_url" value="0"
-                            class="w-[100%] h-[120px] border-[1px] border-[#D8D8D8] py-[6px] px-[10px] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)]">
+                            class="w-full h-30 textarea rounded shadow-sm mt-3">
                         </textarea>
                     </div>
 
-                    <div class="form-control w-[100%] mb-[10px]">
-                        <label class="flex items-center mb-[5px] text-[14px]">
+                    <div class="form-control mt-5">
+                        <label class="flex items-center mb-1 text-base gap-3">
                             <b>Mã bộ lọc trên Url</b>
-                            <span class="ml-[10px] italic text-[#6B7280] text-[13px]">v.d. cpu (trên link lọc
+                            <span class="italic text-gray-500 text-xs">v.d. cpu (trên link lọc
                                 ?cpu=32Ghz&ram=32GB)
                             </span>
                         </label>
                         <input type="text" size="60" name="redirect_url" id="redirect_url" value="0"
-                            class="w-[100%] border-[1px] border-[#D8D8D8] py-[6px] px-[10px] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)]">
+                            class="w-full input rounded-sm shadow mt-3">
                     </div>
 
-                    <div class="form-control w-[100%] mb-[10px]">
-                        <label class="flex items-center mb-[5px] text-[14px]">
+                    <div class="form-control mt-5">
+                        <label class="flex items-center mb-1 text-base gap-3">
                             <b>Thứ tự xuất hiện</b>
-                            <span class="ml-[10px] italic text-[#6B7280] text-[13px]">(cao xếp trước)</span>
+                            <span class="italic text-gray-500 text-xs">(cao xếp trước)</span>
                         </label>
                         <input type="text" size="60" name="redirect_url" id="redirect_url" value="0"
-                            class="w-[45%] border-[1px] border-[#D8D8D8] py-[6px] px-[10px] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)]">
+                            class="w-full input rounded-sm shadow mt-3">
                     </div>
 
-                    <div class="flex mb-[10px]">
-                        <b class="w-[140px]">Lựa chọn áp dụng</b>
-                        <div class="">
-                            <div class="check-form flex items-center mb-[10px]">
+                    <div class="grid grid-cols-4 mt-5 gap-5">
+                        <b class="">Lựa chọn áp dụng</b>
+                        <div class="col-span-3">
+                            <label class="label flex items-center mb-2 gap-3">
                                 <input type="checkbox" name="change_url_on_update" value="1" checked
-                                    class="checked:bg-[#0041E8]  w-[18px] h-[18px]  rounded-[4px]">
-                                <span class="ml-[10px] text-[#6B7280]">Dùng là tiêu đề nhóm cho các thuộc tính đứng
+                                    class="checkbox checkbox-active checkbox-sm rounded-sm">
+                                <span class="">Dùng là tiêu đề nhóm cho các thuộc tính đứng
                                     sau</span>
-                            </div>
-                            <div class="check-form flex items-center mb-[10px]">
+                            </label>
+                            <label class="label flex items-center mb-2 gap-3">
                                 <input type="checkbox" name="change_url_on_update" value="1"
-                                    class="checked:bg-[#0041E8]  w-[18px] h-[18px]  rounded-[4px]">
-                                <span class="ml-[10px] text-[#6B7280]">Dùng lọc Sản phẩm ở danh mục</span>
-                            </div>
-                            <div class="check-form flex items-center mb-[10px]">
+                                    class="checkbox checkbox-active checkbox-sm rounded-sm">
+                                <span class="">Dùng lọc Sản phẩm ở danh mục</span>
+                            </label>
+                            <label class="label flex items-center mb-2 gap-3">
                                 <input type="checkbox" name="change_url_on_update" value="1"
-                                    class="checked:bg-[#0041E8]  w-[18px] h-[18px]  rounded-[4px]">
-                                <span class="ml-[10px] text-[#6B7280]">Hiển thị ở thông tin tóm tắt Sản phẩm</span>
-                            </div>
-                            <div class="check-form flex items-center mb-[10px]">
+                                    class="checkbox checkbox-active checkbox-sm rounded-sm">
+                                <span class="">Hiển thị ở thông tin tóm tắt Sản phẩm</span>
+                            </label>
+                            <label class="label flex items-center mb-2 gap-3">
                                 <input type="checkbox" name="change_url_on_update" value="1"
-                                    class="checked:bg-[#0041E8]  w-[18px] h-[18px]  rounded-[4px]">
-                                <span class="ml-[10px] text-[#6B7280]">Hiển thị ở bảng thông số kỹ thuật</span>
-                            </div>
-                            <div class="check-form flex items-center mb-[10px]">
+                                    class="checkbox checkbox-active checkbox-sm rounded-sm">
+                                <span class="">Hiển thị ở bảng thông số kỹ thuật</span>
+                            </label>
+                            <label class="label flex items-center mb-2 gap-3">
                                 <input type="checkbox" name="change_url_on_update" value="1"
-                                    class="checked:bg-[#0041E8]  w-[18px] h-[18px]  rounded-[4px]">
-                                <span class="ml-[10px] text-[#6B7280]">Dùng để tạo các cấu hình của Sản phẩm</span>
-                            </div>
+                                    class="checkbox checkbox-active checkbox-sm rounded-sm">
+                                <span class="">Dùng để tạo các cấu hình của Sản phẩm</span>
+                            </label>
                         </div>
                     </div>
 
-                    <div class="flex mb-[10px]">
-                        <b class="w-[140px]">Phân loại</b>
-                        <div>
-                            <label class="cursor-pointer flex items-center mb-[10px]">
-                                <input type="radio" name="info[scope]" value="0" class="radio checked:bg-blue-500"
+                    <div class="grid grid-cols-4 mt-5 gap-5">
+                        <b class="">Phân loại</b>
+                        <div class="col-span-3">
+                            <label class="cursor-pointer flex items-center mb-2 gap-3">
+                                <input type="radio" name="info[scope]" value="0" class="radio radio-active"
                                     checked="checked" />
-                                <span class="label-text ml-[25px] text-[#6B7280]">Local - Chỉ áp dụng cho một số loại
+                                <span class="label-text">Local - Chỉ áp dụng cho một số loại
                                     Sản
                                     phẩm</span>
                             </label>
 
-                            <label class="cursor-pointer flex items-center mb-[10px]">
-                                <input type="radio" name="info[scope]" value="1" class="radio checked:bg-blue-500" />
-                                <span class="label-text ml-[25px] text-[#6B7280]">Global - Áp dụng cho tất cả Sản phẩm
+                            <label class="cursor-pointer flex items-center mb-2 gap-3">
+                                <input type="radio" name="info[scope]" value="1" class="radio radio-active" />
+                                <span class="label-text">Global - Áp dụng cho tất cả Sản phẩm
                                     (v.d: Xuất xứ, Màu sắc, Bảo hành)</span>
                             </label>
                         </div>
                     </div>
 
-                    <div class="mb-[10px]">
-                        <b class="text-[14px] mb-[10px] block text-[#383C44]">Thông tin cơ bản</b>
-                        <table class="mt-[15px] table-value">
-                            <thead>
-                                <tr>
-                                    <th>STT</th>
-                                    <th>ID</th>
-                                    <th>Giá trị</th>
-                                    <th>Mô tả</th>
-                                    <th>Thứ tự hiển thị</th>
-                                    <th>Lựa chọn</th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                                <tr>
-                                    <td>1</td>
-                                    <td>4939</td>
-                                    <td>Nam</td>
-                                    <td class="w-[230px]"></td>
-                                    <td class="w-[120px]">
-                                        <input type="text" value="0" class="w-[120px]">
-                                    </td>
-                                    <td class="w-[85px]">
-                                        <div class='list-btn flex items-center'>
-                                            <a href=""
-                                                class='w-[30px] h-[30px] border-[1px] border-[#0041E8] rounded-[4px] text-center leading-[30px] flex items-center justify-center mr-[5px]'><i
-                                                    class='icons icon-edit'></i></a>
-                                            <a href=""
-                                                class='w-[30px] h-[30px] border-[1px] border-[#9E9E9E] rounded-[4px] text-center leading-[30px] flex items-center justify-center mr-[5px]'><i
-                                                    class='icons icon-remove'></i></a>
-                                        </div>
-                                    </td>
-                                </tr>
-                            </tbody>
-                        </table>
+                    <div class="mt-5">
+                        <b class="text-base mb-2 block">Thông tin cơ bản</b>
+                        <div class="border border-gray-200 rounded-sm p-3 mt-3">
+                            <table class="table table-sm">
+                                <thead>
+                                    <tr class="bg-base-200 font-bold text-black">
+                                        <th>STT</th>
+                                        <th>ID</th>
+                                        <th>Giá trị</th>
+                                        <th>Mô tả</th>
+                                        <th>Thứ tự hiển thị</th>
+                                        <th>Lựa chọn</th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    <tr>
+                                        <td>1</td>
+                                        <td>4939</td>
+                                        <td>Nam</td>
+                                        <td></td>
+                                        <td>
+                                            <input type="text" value="0" class="w-12 input" />
+                                        </td>
+                                        <td class="w-[85px]">
+                                            <div class='list-btn flex items-center gap-3'>
+                                                <a href=""
+                                                    class='btn btn-soft btn-xs btn-square btn-outline  btn-view'><i
+                                                        data-lucide="pencil" class='size-3'></i></a>
+                                                <a href=""
+                                                    class='btn btn-soft btn-xs btn-square btn-outline  btn-error'><i
+                                                        data-lucide="trash-2" class='size-3'></i></a>
+                                            </div>
+                                        </td>
+                                    </tr>
+                                </tbody>
+                            </table>
+                        </div>
                     </div>
 
                 </div>
-                <div class="bg-white p-[10px]">
-                    <b class="text-[20px] block">Thêm giá trị mới</b>
-                    <span class="text-[#6B7280] italic">(**) Dùng để sắp xếp Sản phẩm theo thuộc tính khi cần (v.d. theo
+                <div class="bg-white p-3  rounded-sm shadow mt-5">
+                    <b class="text-2xl block">Thêm giá trị mới</b>
+                    <span class="text-gray-500 italic mt-3">(**) Dùng để sắp xếp Sản phẩm theo thuộc tính khi cần (v.d.
+                        theo
                         dung
                         lượng ổ cứng laptop giảm
                         dần)
                     </span>
-                    <div class="flex justify-between mt-[10px]">
-                        <div class="form-control w-[30%] mb-[10px] mr-[6px]">
-                            <label class="font-[600] mb-[5px] text-[14px]">Tên (*)</label>
+                    <div class="mt-5 grid grid-cols-3 gap-5">
+                        <div class="form-control">
+                            <label class="font-bold mb-2 text-base">Tên (*)</label>
                             <input type="text" size="60" name="info[title]" id="title" value="{{page.item_info.title}}"
-                                placeholder="Tên (*)"
-                                class="w-[100%] border-[1px] border-[#D8D8D8] py-[6px] px-[10px] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)]">
+                                placeholder="Tên (*)" class="w-full input  rounded-sm shadow mt-3">
                         </div>
-                        <div class="form-control w-[30%] mb-[10px] mx-[6px]">
-                            <label class="font-[600] mb-[5px] text-[14px]">Giá trị sắp xếp (**)</label>
+                        <div class="form-control">
+                            <label class="font-base mb-2 text-base">Giá trị sắp xếp (**)</label>
                             <input type="text" size="60" name="info[title]" id="title" value="{{page.item_info.title}}"
-                                placeholder="Giá trị sắp xếp"
-                                class="w-[100%] border-[1px] border-[#D8D8D8] py-[6px] px-[10px] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)]">
+                                placeholder="Giá trị sắp xếp" class="w-full input  rounded-sm shadow mt-3">
                         </div>
-                        <div class="form-control w-[30%] mb-[10px] ml-[6px]">
-                            <label class="font-[600] mb-[5px] text-[14px]">STT</label>
-                            <input type="text" size="60" name="info[title]" id="title" value="{{page.item_info.title}}"
-                                placeholder="STT"
-                                class="w-[100%] border-[1px] border-[#D8D8D8] py-[6px] px-[10px] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)]">
+                        <div class="flex items-end gap-3">
+                            <div class="form-control">
+                                <label class="font-base mb-2 text-base">STT</label>
+                                <input type="text" size="60" name="info[title]" id="title"
+                                    value="{{page.item_info.title}}" placeholder="STT"
+                                    class="w-full input  rounded-sm shadow mt-3">
+                            </div>
+                            <a href="javascript:void(0)" class="btn btn-outline btn-view">Thêm
+                                mới</a>
                         </div>
-                        <a href="javascript:void(0)"
-                            class="w-[80px] h-[33px] border-[1px] border-[#0041E8] text-center leading-[33px] rounded-[4px] text-[#0041E8] font-[500] ml-[10px] mt-[25px] hover:bg-[#0041E8] hover:text-white">Thêm
-                            mới</a>
+
                     </div>
 
                 </div>
-
-                <div class="bg-white p-[10px] border-t-[6px] border-[#FAFAFB]">
-                    <input class="w-[82px] h-[32px] bg-[#0041E8] rounded-[4px] text-white cursor-pointer"
-                        id="submit-collection-btn" name="commit" type="submit" value="Cập nhật" />
+                <div class="mt-5 bg-white p-3 rounded-sm shadow">
+                    <input class="btn btn-active" id="submit-collection-btn" name="commit" type="submit"
+                        value="Cập nhật" />
                 </div>
             </div>
         </div>
-    </div>
\ No newline at end of file
+
+    </div>
+</div>
\ No newline at end of file
diff --git a/template/product/brand_add.html b/template/product/brand_add.html
index 4a0b029..4513a84 100644
--- a/template/product/brand_add.html
+++ b/template/product/brand_add.html
@@ -1,78 +1,63 @@
-<div class="w-[100%] mb-[50px]">
+<div class="w-full">
 
-    <div class="text-sm breadcrumbs ml-[10px]">
+    <div class="text-sm breadcrumbs">
         <ul>
             <li><a href="/admin/product/brand">Danh sách thương hiệu</a></li>
-            <li class="text-[#0041E8]">Form thêm/sửa thương hiệu</li>
+            <li class="text-active">Form thêm/sửa thương hiệu</li>
         </ul>
     </div>
 
-    <div class="w-[1140px] my-0 mx-auto">
-        <div class="bg-white p-[10px] rounded-[10px] shadow-[0_1px_1px_0px_#0000001A] mb-[15px]">
+    <div class="w-7xl  mx-auto">
+        <div class="bg-white p-3 rounded-sm shadow mb-5">
             <div class="flex items-center justify-between">
-                <h1 class="text-[20px] font-[700]">Cập nhật Thương hiệu</h1>
-                <a href="/admin/product/brand_add"
-                    class="flex items-center border-[1px] border-[#ECECEC] rounded-[4px] p-[5px_10px_5px_10px]">
-                    <span
-                        class="w-[14px] h-[14px] border-[1px] rounded-[50%] border-[#6B7280] text-center leading-[11px] mr-[5px] text-[#6B7280]">+</span>
-                    <span class="text-[#6B7280]">Thêm thương hiệu mới</span>
+                <h1 class="text-2xl font-bold">Cập nhật Thương hiệu</h1>
+                <a href="/admin/product/brand_add" class="btn btn-sm btn-outline btn-view">
+                    <i class="size-4" data-lucide="plus"></i>
+                    <span class="">Thêm thương hiệu mới</span>
                 </a>
             </div>
         </div>
 
-        <div class="flex">
-            <div class="left w-[270px] mr-[10px]">
+        <div class="grid grid-cols-4 gap-5 mt-5">
+            <div class="left">
                 <div class="list-tab">
                     <a href="javascript:void(0)"
                         class="item block w-[100%] h-[36px] text-white bg-[#0041E8] rounded-[10px] text-[13px] leading-[35px] px-[10px]">Nội
                         dung</a>
                 </div>
             </div>
-            <div class="right w-[860px]">
-                <div
-                    class="bg-white p-[10px] rounded-[10px_10px_0_0] shadow-[0_-1px_1px_0px_#0000001A] border-b-[6px] border-[#FAFAFB]">
-                    <b class="text-[20px] mb-[10px] block">Thông tin cơ bản</b>
+            <div class="right col-span-3">
+                <div class="bg-white p-3 rounded-sm shadow">
+                    <b class="text-xl block">Thông tin cơ bản</b>
 
-                    <div class="form-control mb-[10px]">
-                        <label class="font-[600] mb-[5px] text-[14px]">Tên thương hiệu</label>
+                    <div class="form-control mt-5">
+                        <label class="font-bold text-base">Tên thương hiệu</label>
                         <input type="text" size="60" name="info[title]" id="title" value="{{page.item_info.title}}"
-                            placeholder="Tên thương hiệu"
-                            class="w-[100%] border-[1px] border-[#D8D8D8] py-[6px] px-[10px] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)]">
+                            placeholder="Tên thương hiệu" class="input w-full rounded-sm shadow mt-3">
                     </div>
 
-                    <div class="form-control mb-[10px]">
-                        <label class="font-[600] mb-[5px] text-[14px]">Link Index</label>
+                    <div class="form-control mt-5">
+                        <label class="font-bold text-base">Link Index</label>
                         <input type="text" size="60" name="info[title]" id="title" value="{{page.item_info.title}}"
-                            placeholder="link index"
-                            class="w-[100%] border-[1px] border-[#D8D8D8] py-[6px] px-[10px] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)]">
+                            placeholder="link index" class="input w-full rounded-sm shadow mt-3">
                     </div>
-
-                    <div class="form-control mb-[10px]">
-                        <label class="font-[600] mb-[5px] text-[14px]">Mô tả tóm tắt</label>
+                    <div class="form-control mt-5">
+                        <label class="font-bold text-base">Mô tả tóm tắt</label>
                         <textarea type="text" size="60" name="info[title]" id="title" placeholder="Mô tả tóm tắt"
-                            class="w-[100%] h-[120px] border-[1px] border-[#D8D8D8] py-[6px] px-[10px] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)]">
+                            class="textarea w-full rounded-sm shadow mt-3">
                         </textarea>
                     </div>
 
-                    <div class="form-control mb-[10px]">
-                        <label class="font-[600] mb-[5px] text-[14px]">Ảnh logo thương hiệu</label>
-                        <div class="flex items-center">
+                    <div class="form-control mt-5">
+                        <label class="font-bold text-base">Ảnh logo thương hiệu</label>
+                        <div class="mt-3">
                             <img src="{{'brand-1.png' | asset_url }}" alt="">
-                            <div class="input-file">
-                                <input type="file" size="30" name="catThumnail" id="file_input" multiple
-                                    placeholder="No file selected">
-                                <div class="title">
-                                    <div class="btn-input-file">
-                                        <i class="fa-solid fa-file-arrow-up"></i> Upload file
-                                    </div>
-                                    <span style="color:gray;font-style: italic;">No file chosen</span>
-                                </div>
-                            </div>
+                            <div id="image-brand" class="mt-5 w-full"></div>
                         </div>
                     </div>
 
                 </div>
-                <div class="bg-white p-[10px] border-t-[6px] border-[#FAFAFB]">
+                <div class="bg-white p-3 rounded-sm shadow mt-5">
                     <div class="flex items-center justify-between">
                         <div>
                             <b>Mô tả (nếu có)</b>
diff --git a/template/product/category_form.html b/template/product/category_form.html
index 1ebbffe..61c5532 100644
--- a/template/product/category_form.html
+++ b/template/product/category_form.html
@@ -102,18 +102,18 @@
                             </div>
                         </div>
                         <p class="text-gray-300">Chưa có thư viện ảnh cho phần miêu tả</p>
-                        <div class="py-[10px]">
+                        <div class="py-2">
                             <textarea id="product-static"> </textarea>
                         </div>
 
-                        <div class="mt-3">
+                        <div class="mt-5">
                             <b class="block mb-3">Ảnh icon</b>
-                            <div id="image-preview-filepond" class="mt-5 w-full"></div>
+                            <div id="image-category-icon" class="mt-5 w-full"></div>
                         </div>
 
-                        <div class="mt-3">
+                        <div class="mt-5">
                             <b class="block mb-3">Ảnh đại diện</b>
-                            <div id="image-preview-filepond" class="mt-5 w-full"></div>
+                            <div id="image-category-avatar" class="mt-5 w-full"></div>
                         </div>
                     </div>
 
@@ -126,9 +126,8 @@
                                     dấu;</span>
                             </label>
                             <input type="text" size="60" name="priceRange" id="priceRange"
-                                value="{{page.item_info.priceRange}}"
-                                class="w-[100%] border-[1px] border-[#D8D8D8] py-[6px] px-[10px] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)]">
-                            <div class="note py-[10px] italic text-[#6B7280]">
+                                value="{{page.item_info.priceRange}}" class="input w-full rounded-sm shadow">
+                            <div class="note py-2 italic text-gray-500">
                                 <p>ví dụ: 300000;800000;1500000 có nghĩa là tạo ra 4 khoảng giá cho
                                     khách hàng lọc Sản
                                     phẩm, đó là:</p>
@@ -139,23 +138,22 @@
                             </div>
                         </div>
 
-                        <div class="flex items-center">
-                            <div class="form-control mb-[10px] mr-[10px] w-[100%]">
-                                <label class="flex items-center mb-[5px] text-[14px]">
+                        <div class="grid grid-cols-2 gap-5 mt-5">
+                            <div class="form-control">
+                                <label class="flex items-center mb-3">
                                     <b>Là danh mục con của</b>
                                 </label>
-                                <select name="parentId" id="parentId"
-                                    class="w-[100%] border-[1px] border-[#D8D8D8] py-[6px] px-[10px] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)]">
+                                <select name="parentId" id="parentId" class="select rounded-sm shadow w-full">
                                     <option value="">Danh mục gốc</option>
                                     {{page.categoryDropBox}}
                                 </select>
                             </div>
-                            <div class="form-control mb-[10px] ml-[10px] w-[100%]">
-                                <label class="flex items-center mb-[5px] text-[14px]">
+                            <div class="form-control">
+                                <label class="flex items-center mb-3">
                                     <b>Loại nội dung hiển thị</b>
                                 </label>
                                 <select name="display_option" id="display_option"
-                                    class="w-[100%] border-[1px] border-[#D8D8D8] py-[6px] px-[10px] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)]">
+                                    class="select rounded-sm shadow w-full">
                                     <option value="child_product" selected="selected">Hiển thị sản phẩm
                                         + Danh mục con
                                     </option>
@@ -163,115 +161,108 @@
                                     </option>
                                 </select>
                             </div>
-                        </div>
-
-                        <div class="flex items-center">
-                            <div class="form-control w-[100%] mr-[10px]">
-                                <label class="flex items-center mb-[5px] text-[14px]">
+                            <div class="form-control">
+                                <label class="flex items-center mb-3 gap-3">
                                     <b>Thứ tự xuất hiện</b>
-                                    <span class="ml-[10px] italic text-[#6B7280]">(cao xếp trước)</span>
+                                    <span class="">(cao xếp trước)</span>
                                 </label>
                                 <input type="text" size="60" name="ordering" id="ordering"
-                                    value="{{page.item_info.ordering}}"
-                                    class="w-[100%] border-[1px] border-[#D8D8D8] py-[6px] px-[10px] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)]">
+                                    value="{{page.item_info.ordering}}" class="input w-full rounded-sm shadow">
                             </div>
-                            <div class="form-control w-[100%] ml-[10px]">
-                                <label class="flex items-center mb-[5px] text-[14px]">
+                            <div class="form-control">
+                                <label class="flex items-center mb-3 gap-3">
                                     <b>Template File</b>
                                 </label>
                                 <input type="text" size="60" name="template" id="template"
-                                    value="{{page.item_info.template}}"
-                                    class="w-[100%] border-[1px] border-[#D8D8D8] py-[6px] px-[10px] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)]">
+                                    value="{{page.item_info.template}}" class="input w-full rounded-sm shadow">
                             </div>
                         </div>
 
-                        <div class="form-control w-[100%] my-[10px]">
-                            <label class="flex items-center mb-[5px] text-[14px]">
+                        <div class="form-control mt-5">
+                            <label class="flex items-center mb-3 gap-3">
                                 <b>Số Sản phẩm hiển thị</b>
-                                <span class="ml-[10px] italic text-[#6B7280]">(để = 0 nếu mặc định theo
+                                <span class="italic text-gray-500">(để = 0 nếu mặc định theo
                                     hệ thống cài đặt
                                     chung)
                                 </span>
                             </label>
                             <input type="text" size="60" name="number_display" id="number_display" value="0"
-                                class="w-[100%] border-[1px] border-[#D8D8D8] py-[6px] px-[10px] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)]">
+                                class="input w-full rounded-sm shadow" />
                         </div>
 
-                        <div class="form-control w-[100%] mb-[10px]">
-                            <label class="flex items-center mb-[5px] text-[14px]">
+                        <div class="form-control w-full mt-5">
+                            <label class="flex items-center mb-3 gap-3">
                                 <b>Redirect tới URL (khi truy cập danh mục sẽ chuyển sang link này)</b>
                             </label>
                             <input type="text" size="60" name="redirect_url" id="redirect_url" value="0"
-                                class="w-[100%] border-[1px] border-[#D8D8D8] py-[6px] px-[10px] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)]">
+                                class="input w-full rounded-sm shadow" />
                         </div>
 
                     </div>
 
-                    <div class="bg-white p-[10px] border-t-[6px] border-[#FAFAFB]">
-                        <b class="block text-[20px] mb-[15px]">Dùng cho SEO</b>
-                        <div class="form-control w-[100%] mb-[10px]">
-                            <label class="flex items-center mb-[5px] text-[14px]">
+                    <div class="bg-white p-3 mt-5 rounded-sm shadow">
+                        <b class="block text-xl">Dùng cho SEO</b>
+                        <div class="form-control w-full mt-5">
+                            <label class="flex items-center mb-3 gap-3">
                                 <b>Url canonical</b>
                             </label>
                             <input type="text" size="60" name="redirect_url" id="redirect_url" value="0"
-                                class="w-[100%] border-[1px] border-[#D8D8D8] py-[6px] px-[10px] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)]">
+                                class="input w-full rounded-sm shadow">
                         </div>
-                        <div class="form-control w-[100%] mb-[10px]">
-                            <label class="flex items-center mb-[5px] text-[14px]">
+                        <div class="form-control w-full mt-5">
+                            <label class="flex items-center mb-3 gap-3">
                                 <b>Link truy cập tại website</b>
                             </label>
                             <input type="text" size="60" name="redirect_url" id="redirect_url" value="0"
-                                class="w-[100%] border-[1px] border-[#D8D8D8] py-[6px] px-[10px] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)]">
+                                class="input w-full rounded-sm shadow">
                         </div>
-                        <div class="form-control w-[100%] mb-[10px]">
-                            <label class="flex items-center mb-[5px] text-[14px]">
+                        <div class="form-control w-full mt-5">
+                            <label class="flex items-center mb-3 gap-3">
                                 <b>Tên Index</b>
                             </label>
                             <input type="text" size="60" name="redirect_url" id="redirect_url" value="0"
-                                class="w-[100%] border-[1px] border-[#D8D8D8] py-[6px] px-[10px] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)]">
+                                class="input w-full rounded-sm shadow">
                         </div>
-                        <div class="form-control w-[100%] mb-[10px]">
-                            <label class="flex items-center mb-[5px] text-[14px]">
+                        <div class="form-control w-full mt-5">
+                            <label class="flex items-center mb-3 gap-3">
                                 <b>Meta Title</b>
-                                <span class="ml-[10px] italic text-[#6B7280] text-[13px]">51 ký tự , 10
+                                <span class="italic text-gray-500">51 ký tự , 10
                                     từ</span>
                             </label>
                             <input type="text" size="60" name="redirect_url" id="redirect_url" value="0"
-                                class="w-[100%] border-[1px] border-[#D8D8D8] py-[6px] px-[10px] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)]">
+                                class="input w-full rounded-sm shadow">
                         </div>
-                        <div class="form-control w-[100%] mb-[10px]">
-                            <label class="flex items-center mb-[5px] text-[14px]">
+                        <div class="form-control w-full mt-5">
+                            <label class="flex items-center mb-3 gap-3">
                                 <b>Meta Keywords</b>
-                                <span class="ml-[10px] italic text-[#6B7280] text-[13px]">76 ký tự , 14
+                                <span class="italic text-gray-500">76 ký tự , 14
                                     từ</span>
                             </label>
                             <input type="text" size="60" name="redirect_url" id="redirect_url" value="0"
-                                class="w-[100%] border-[1px] border-[#D8D8D8] py-[6px] px-[10px] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)]">
+                                class="input w-full rounded-sm shadow">
                         </div>
-                        <div class="form-control w-[100%] mb-[10px]">
-                            <label class="flex items-center mb-[5px] text-[14px]">
+                        <div class="form-control w-full mt-5">
+                            <label class="flex items-center mb-3 gap-3">
                                 <b>Meta Description</b>
-                                <span class="ml-[10px] italic text-[#6B7280] text-[13px]">142 ký tự , 28
+                                <span class="italic text-gray-500">142 ký tự , 28
                                     từ (Khuyến
                                     nghị: 160 ký tự) * nếu để trống sẽ dùng tóm tắt danh mục</span>
                             </label>
-                            <textarea name="" id="" cols="30" rows="10"
-                                class="w-[100%] h-[120px] border-[1px] border-[#D8D8D8] py-[6px] px-[10px] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)]"
+                            <textarea name="" id="" cols="30" rows="10" class="textarea w-full rounded-sm shadow"
                                 placeholder=""></textarea>
                         </div>
-                        <div class="mb-[10px] flex items-center">
-                            <b class="mr-[20px]">Thay đổi Link truy cập khi thay đổi Tên index?</b>
+                        <div class="mt-5 gap-3 flex items-center">
+                            <b class="">Thay đổi Link truy cập khi thay đổi Tên index?</b>
                             <input type="checkbox" name="change_url_on_update" value="1"
-                                class="checkbox checked:bg-[#0041E8] w-[20px] h-[20px] [--chkbg:theme(#0041E8)]  [--chkfg:white] rounded-[4px]">
-                            <span class="ml-[10px] text-[#6B7280]">Tích chọn để hiển thị hoặc dừng hiển
+                                class="checkbox checkbox-sm checkbox-active rounded-sm" checked="">
+                            <span class="text-gray-500">Tích chọn để hiển thị hoặc dừng hiển
                                 thị</span>
                         </div>
                     </div>
 
-                    <div
-                        class="bg-white p-[10px] border-t-[6px] border-[#FAFAFB] rounded-[0_0_10px_10px] shadow-[0_1px_1px_0px_#0000001A]">
-                        <input class="w-[82px] h-[32px] bg-[#0041E8] rounded-[4px] text-white cursor-pointer"
-                            id="submit-collection-btn" name="commit" type="submit" value="Cập nhật" />
+                    <div class="bg-white p-3  rounded-sm shadow mt-5">
+                        <input class="btn btn-sm btn-active" id="submit-collection-btn" name="commit" type="submit"
+                            value="Cập nhật" />
                     </div>
 
                 </form>
diff --git a/template/product/collection.html b/template/product/collection.html
index 0aafd44..7d1719a 100644
--- a/template/product/collection.html
+++ b/template/product/collection.html
@@ -21,9 +21,9 @@
         kiện nên có v..v. (mỗi bộ sưu tập sẽ bao gồm các Sản phẩm từ nhiều danh mục Sản phẩm khác nhau)
     </div>
     <div class="flex items-center justify-end mt-3">
-        <a href="javascript:void(0)" onclick="openProductListToSelect()" class="btn btn-outline btn-view ">
-            <i class="iconify lucide--circle-plus"></i>
-            <span class="">Thêm set mới</span>
+        <a href="/admin/product/collection_add" class="btn btn-outline btn-view btn-sm">
+            <i data-lucide="circle-plus" class="size-4"></i>
+            <span class="">Thêm bộ sưu tập mới</span>
         </a>
     </div>
 
@@ -48,13 +48,13 @@
                         <b>Flash Sale | Giảm Giá Cực Sốc !</b>
                         <div class="flex items-center mt-2 gap-3">
                             <p class=" whitespace-nowrap">Link</p>
-                            <input type="text" size="60" value="" placeholder="link" class="input shadow">
+                            <input type="text" size="60" value="" placeholder="link" class="input shadow input-sm" />
                         </div>
                     </td>
                     <td>
                         <div class="flex items-center gap-3">
                             <p>7 sp</p>
-                            <a href="/admin/product/collection_product" class="btn btn-outline btn-view">Xem
+                            <a href="/admin/product/collection_product" class="btn btn-outline btn-view btn-sm">Xem
                                 danh sách</a>
                         </div>
                     </td>
@@ -66,10 +66,10 @@
                             <a href="" class="btn btn-active btn-sm">Xem</a>
                             <a href="/admin/product/collection_add" title="Form sản phẩm"
                                 class="btn btn-soft btn-sm btn-square btn-outline  btn-view">
-                                <i class="iconify lucide--pencil"></i>
+                                <i data-lucide="pencil" class="size-3"></i>
                             </a>
                             <a href="" class='btn btn-soft btn-sm btn-square btn-outline  btn-error'><i
-                                    class='iconify lucide--trash'></i></a>
+                                    data-lucide="trash-2" class="size-3"></i></a>
                         </div>
                     </td>
                 </tr>
diff --git a/template/product/collection_add.html b/template/product/collection_add.html
index ed0b43e..c851670 100644
--- a/template/product/collection_add.html
+++ b/template/product/collection_add.html
@@ -1,105 +1,94 @@
-<div class="w-[100%] mb-[50px]">
-    <div class="text-sm breadcrumbs ml-[10px]">
+<div class="w-full mb-[50px]">
+    <div class="text-sm breadcrumbs">
         <ul>
             <li><a href="/admin/product/collection">Danh sách bộ sưu tập</a></li>
-            <li class="text-[#0041E8]">Form thêm/sửa sản phẩm</li>
+            <li class="text-active">Form thêm/sửa sản phẩm</li>
         </ul>
     </div>
-    <div class="w-[1140px] my-0 mx-auto">
-        <div class="bg-white p-[10px] rounded-[10px] shadow-[0_1px_1px_0px_#0000001A] my-[15px]">
+    <div class="w-7xl mx-auto">
+        <div class="bg-white p-3 rounded-sm shadow">
             <div class="flex items-center justify-between">
-                <h1 class="text-[20px] font-[700]">Cập nhật bộ sưu tập Sản phẩm</h1>
-                <div class="flex items-center">
-                    <a href="/admin/product/add_special_category=131"
-                        class="flex items-center border-[1px] border-[#ECECEC] rounded-[4px] p-[5px_10px_5px_10px]">
-                        <span
-                            class="w-[14.5px] h-[14.5px] border-[1px] rounded-[50%] border-[#6B7280] text-center leading-[10.5px] mr-[5px] text-[#6B7280]">+</span>
-                        <span class="text-[#6B7280]">Thêm sản phẩm</span>
+                <h1 class="text-xl font-bold">Cập nhật bộ sưu tập Sản phẩm</h1>
+                <div class="flex items-center gap-3">
+                    <a href="/admin/product/add_special_category=131" class="btn btn-outline btn-sm btn-view">
+                        <i data-lucide="plus" class="size-3"></i>
+                        <span class="">Thêm sản phẩm</span>
                     </a>
-                    <a href="/admin/product/collection_add"
-                        class="flex items-center border-[1px] ml-[10px] border-[#ECECEC] rounded-[4px] p-[5px_10px_5px_10px]">
-                        <span
-                            class="w-[14.5px] h-[14.5px] border-[1px] rounded-[50%] border-[#6B7280] text-center leading-[10.5px] mr-[5px] text-[#6B7280]">+</span>
-                        <span class="text-[#6B7280]">Thêm bộ sưu tập</span>
+                    <a href="/admin/product/collection_add" class="btn btn-outline btn-sm btn-view">
+                        <i data-lucide="plus" class="size-3"></i>
+                        <span class="">Thêm bộ sưu tập</span>
                     </a>
                 </div>
             </div>
             <p class="text-gray-500">Flash Sale | Giảm Giá Cực Sốc !</p>
         </div>
 
-        <div class="flex">
-            <div class="left w-[270px] mr-[10px]">
+        <div class="grid grid-cols-4 gap-5 mt-5">
+            <div class="left">
                 <div class="list-tab">
                     <a href="/admin/product/collection"
-                        class="item block w-[100%] h-[36px] text-white bg-[#0041E8] rounded-[10px] text-[13px] leading-[35px] px-[20px]">Thông
+                        class="item block w-full text-white bg-[#0041E8] rounded-sm text-base px-3 py-2 font-bold">Thông
                         tin</a>
                 </div>
             </div>
-            <div class="right w-[860px]">
-                <div
-                    class="bg-white p-[10px] rounded-[10px_10px_0_0] shadow-[0_-1px_1px_0px_#0000001A] border-b-[6px] border-[#FAFAFB]">
-                    <b class="block text-[20px] font-bold">Thông tin cơ bản</b>
+            <div class="right col-span-3">
+                <div class="bg-white p-3 rounded-sm shadow">
+                    <b class="block text-xl font-bold">Thông tin cơ bản</b>
 
-                    <div class="flex items-center my-[15px]">
-                        <p class="mr-[10px]">Ảnh icon</p>
-                        <a href=""
-                            class="flex items-center mr-[20px] border-[1px] border-[#0041E8] p-[8px_10px] rounded-[4px] bg-[#F5F7FF]">
-                            <i class="fa-solid fa-arrow-up-from-bracket text-[#0041E8]"></i>
-                            <span class="text-[#0041E8] ml-[5px]">Upload ảnh</span>
-                        </a>
+                    <div class="mt-5">
+                        <b class="text-base">Ảnh icon</b>
+                        <div id="image-brand" class="mt-5 w-full"></div>
                     </div>
 
-                    <div class="mb-[15px]">
-                        <label for="" class="block mb-[10px] font-[700] text-[14px] text-[#383C44]">Đặt tên bộ sưu
+                    <div class="mt-5">
+                        <label for="" class="block font-bold text-base">Đặt tên bộ sưu
                             tập</label>
                         <input type="text" name="" value="" placeholder="Tên bộ sưu tập"
-                            class="w-[100%] input input-md input-bordered h-[35px] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)] mr-[10px]">
+                            class="w-full input input-md  rounded-sm shadow mt-3" />
                     </div>
 
-                    <div class="mb-[15px]">
-                        <label for="" class="block mb-[10px] font-[700] text-[14px] text-[#383C44]">Url Index</label>
+                    <div class="mt-5">
+                        <label for="" class="block font-bold text-base">Url Index</label>
                         <input type="text" name="" value="" placeholder="url index"
-                            class="w-[50%] input input-md input-bordered h-[35px] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)] mr-[10px]">
+                            class="input input-md  rounded-sm shadow mt-3" />
                     </div>
 
-                    <div class="mb-[15px]">
-                        <label for="" class="block mb-[10px] font-[700] text-[14px] text-[#383C44]">Miêu tả (Nếu
+                    <div class="mt-5">
+                        <label for="" class="block font-bold text-base mb-3">Miêu tả (Nếu
                             có)</label>
-                        <textarea id="product-desc"> </textarea>
+                        <textarea id="product-desc" class="mt-3"> </textarea>
                     </div>
                 </div>
-                <div class="bg-white p-[10px] mt-[5px]">
-                    <b class="text-[20px] mb-[15px]">Dùng cho SEO</b>
-                    <div class="mb-[15px]">
-                        <label for="" class="block mb-[10px] font-[700] text-[14px] text-[#383C44]">Meta Title</label>
+                <div class="bg-white p-3 rounded-sm shadow mt-5">
+                    <b class="text-xl">Dùng cho SEO</b>
+                    <div class="mt-5">
+                        <label for="" class="block font-bold text-base">Meta Title</label>
                         <input type="text" name="" value="" placeholder="Meta title"
-                            class="w-[100%] input input-md input-bordered h-[35px] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)] mr-[10px]">
+                            class="w-full input input-md  rounded-sm shadow mt-3">
                     </div>
-                    <div class="mb-[15px]">
-                        <label for="" class="block mb-[10px] font-[700] text-[14px] text-[#383C44]">Meta
+                    <div class="mt-5">
+                        <label for="" class="block font-bold text-base">Meta
                             keywords</label>
                         <input type="text" name="" value="" placeholder="Meta keywords"
-                            class="w-[100%] input input-md input-bordered h-[35px] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)] mr-[10px]">
+                            class="w-full input input-md  rounded-sm shadow mt-3">
                     </div>
-                    <div class="mb-[15px]">
-                        <label for="" class="block mb-[10px] font-[700] text-[14px] text-[#383C44]">Meta
+                    <div class="mt-5">
+                        <label for="" class="block font-bold text-base">Meta
                             Description</label>
                         <textarea type="text" name="" value="" placeholder="Meta Description"
-                            class="w-[100%] input input-md input-bordered h-[100px] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)] mr-[10px]">
+                            class="w-full textarea rounded-sm shadow mt-3">
                             </textarea>
                     </div>
-                    <div class="mb-[15px]">
-                        <label for="" class="block mb-[10px] font-[700] text-[14px] text-[#383C44]">Thứ tự xuất hiện
+                    <div class="mt-5">
+                        <label for="" class="block font-bold text-base">Thứ tự xuất hiện
                             <span class="text-[6b7280]">(cao xếp trước)</span></label>
                         <input type="text" name="" value="" placeholder="Thứ tự xuất hiện"
-                            class="w-[50%] input input-md input-bordered h-[35px] rounded-[4px] shadow-[0_2px_4px_0_rgba(0,0,0,0.12)] mr-[10px]">
+                            class="input input-md  rounded-sm shadow mt-3">
                     </div>
                 </div>
 
-                <div class="bg-white p-[10px] rounded-[0_0_10px_10px] shadow-[0_1px_1px_0px_#0000001A] mt-[10px]">
-                    <input
-                        class="btn w-[95px] h-[35px] min-h-[35px] bg-[#0041E8] rounded-[4px] mt-[10px] text-white cursor-pointer"
-                        name="commit" type="submit" value="Cập nhật">
+                <div class="bg-white p-3 rounded-sm shadow mt-3">
+                    <input class="btn btn-active" name="commit" type="submit" value="Cập nhật">
                 </div>
             </div>
         </div>
diff --git a/template/product/config_group.html b/template/product/config_group.html
index 989e34b..bd79838 100644
--- a/template/product/config_group.html
+++ b/template/product/config_group.html
@@ -28,7 +28,7 @@
                 <tr>
                     <td>1</td>
                     <td>
-                        <a href="" class="link-primary">Máy In Canon Pixma IX6870-In Phun Mầu</a>
+                        <a href="" class="link-active">Máy In Canon Pixma IX6870-In Phun Mầu</a>
                         <p>
                             <span>Tạo lúc: 28-12-2023, 11:34 am,</span>
                             <span>cập nhật: 28-12-2023, 11:34 am</span>
@@ -37,9 +37,9 @@
                     <td>
                         <div class='list-btn flex items-center gap-3'>
                             <a href="" class='btn btn-soft btn-xs btn-square btn-outline  btn-view'><i
-                                    class='iconify lucide--pencil'></i></a>
+                                    data-lucide="pencil" class='size-3'></i></a>
                             <a href="" class='btn btn-soft btn-xs btn-square btn-outline  btn-error'><i
-                                    class='iconify lucide--trash'></i></a>
+                                    data-lucide="trash-2" class='size-3'></i></a>
                         </div>
                     </td>
                 </tr>
diff --git a/template/product/config_group_form.html b/template/product/config_group_form.html
index 6d7f18d..5aef779 100644
--- a/template/product/config_group_form.html
+++ b/template/product/config_group_form.html
@@ -1,34 +1,31 @@
-<div class="w-[100%] mb-[50px]">
+<div class="w-full mb-[50px]">
 
-    <div class="text-sm breadcrumbs ml-[10px]">
+    <div class="text-sm breadcrumbs">
         <ul>
-            <li><a href="/admin/product/config_group">Nhóm cấu hình sản phẩm</a></li>
-            <li class="text-[#0041E8]">Form thêm/sửa cấu hình</li>
+            <li><a href=" /admin/product/config_group">Nhóm cấu hình sản phẩm</a></li>
+            <li class="text-active">Form thêm/sửa cấu hình</li>
         </ul>
     </div>
 
-    <div class="w-[1140px] my-0 mx-auto">
-        <div class="bg-white p-[10px] rounded-[10px] shadow-[0_1px_1px_0px_#0000001A] my-[15px]">
+    <div class="w-7xl  mx-auto">
+        <div class="bg-white p-3 rounded-sm shadow mt-5">
             <div class="flex items-center justify-between">
-                <h1 class="text-[20px] font-[700]">Cập nhật cấu hình sản phẩm</h1>
-                <div class="flex items-center ">
-                    <a href="/admin/brand/add"
-                        class="flex items-center border-[1px] border-[#ECECEC] rounded-[4px] p-[5px_10px_5px_10px]">
-                        <span
-                            class="w-[14px] h-[14px] border-[1px] rounded-[50%] border-[#6B7280] text-center leading-[12px] mr-[5px] text-[#6B7280]">+</span>
-                        <span class="text-[#6B7280]">Thêm sp mới</span>
+                <h1 class="text-xl font-bold">Cập nhật cấu hình sản phẩm</h1>
+                <div class="flex items-center gap-3 ">
+                    <a href="/admin/brand/add" class="btn btn-sm btn-outline btn-view">
+                        <i data-lucide="plus" class="size-4"></i>
+                        <span>Thêm sp mới</span>
                     </a>
-                    <a href="/admin/brand/add"
-                        class="flex items-center border-[1px] border-[#ECECEC] rounded-[4px] p-[5px_10px_5px_10px] ml-[10px]">
-                        <i class="fa-solid fa-copy text-[#6B7280] mr-[3px]"></i>
-                        <span class="text-[#6B7280]">Tạo sp tương tự</span>
+                    <a href="/admin/brand/add" class="btn btn-sm btn-outline btn-view">
+                        <i data-lucide="copy" class="size-4"></i>
+                        <span>Tạo sp tương tự</span>
                     </a>
                 </div>
             </div>
         </div>
 
-        <div class="flex">
-            <div class="left w-[270px] mr-[10px]">
+        <div class="grid grid-cols-4 gap-5 mt-5">
+            <div class="left">
                 <div class="list-tab">
                     <a href="/admin/product/config_group_form"
                         class="item block w-[100%] h-[36px] text-white bg-[#0041E8] rounded-[10px_10px_0_0] text-[13px] leading-[35px] px-[10px]">Nội
@@ -41,7 +38,7 @@
                         phẩm</a>
                 </div>
             </div>
-            <div class="right w-[860px]">
+            <div class="right col-span-3">
                 <div
                     class="bg-white p-[10px] rounded-[10px_10px_0_0] shadow-[0_-1px_1px_0px_#0000001A] border-b-[6px] border-[#FAFAFB]">