diff --git a/app/javascript/template_builder/field_context_menu.vue b/app/javascript/template_builder/field_context_menu.vue
index ce304a14..9dda498e 100644
--- a/app/javascript/template_builder/field_context_menu.vue
+++ b/app/javascript/template_builder/field_context_menu.vue
@@ -3,7 +3,7 @@
     <div
       v-if="!isShowFormulaModal && !isShowFontModal && !isShowConditionsModal && !isShowDescriptionModal && !isShowCustomValidationModal && !isShowLengthValidationModal && !isShowNumberRangeModal && !isShowPriceModal && !isShowPaymentLinkModal"
       ref="menu"
-      class="fixed z-50 p-1 bg-white shadow-lg rounded-lg border border-base-300 cursor-default"
+      class="fixed z-50 p-1 bg-white shadow-lg rounded-lg border border-neutral-200 cursor-default"
       style="min-width: 170px"
       :style="menuStyle"
       @mousedown.stop
@@ -121,7 +121,7 @@
       />
       <hr
         v-if="showRequired || showReadOnly || showPrefillable || showSetSigningDate || showWithLogo || showSignatureId"
-        class="my-1 border-base-300"
+        class="my-1 border-neutral-200"
       >
       <ContextSubmenu
         v-if="showFormatSubmenu"
@@ -190,7 +190,7 @@
         </span>
         <span
           v-if="field.conditions?.length"
-          class="bg-base-200 rounded px-1 leading-3"
+          class="bg-neutral-200 rounded px-1 leading-3"
           style="font-size: 9px;"
         >{{ field.conditions.length }}</span>
       </button>
@@ -204,7 +204,7 @@
       </button>
       <hr
         v-if="(showFont || showDescription || showCondition || showFormula || showPaymentSettings)"
-        class="my-1 border-base-300"
+        class="my-1 border-neutral-200"
       >
       <button
         class="w-full px-2 py-1 rounded-md hover:bg-neutral-100 flex items-center justify-between text-sm"
diff --git a/app/javascript/template_builder/field_context_submenu.vue b/app/javascript/template_builder/field_context_submenu.vue
index 4ba3fb29..fee5960d 100644
--- a/app/javascript/template_builder/field_context_submenu.vue
+++ b/app/javascript/template_builder/field_context_submenu.vue
@@ -20,7 +20,7 @@
     <div
       v-if="isOpen"
       ref="submenu"
-      class="absolute p-1 z-50 left-full bg-white shadow-lg rounded-lg border border-base-300 cursor-default"
+      class="absolute p-1 z-50 left-full bg-white shadow-lg rounded-lg border border-neutral-200 cursor-default"
       style="min-width: 170px"
       :style="submenuStyle"
       :class="menuClass"
diff --git a/app/javascript/template_builder/page_context_menu.vue b/app/javascript/template_builder/page_context_menu.vue
index 61d49d23..3cec3c65 100644
--- a/app/javascript/template_builder/page_context_menu.vue
+++ b/app/javascript/template_builder/page_context_menu.vue
@@ -1,7 +1,7 @@
 <template>
   <div
     ref="menu"
-    class="fixed z-50 p-1 bg-white shadow-lg rounded-lg border border-base-300 cursor-default"
+    class="fixed z-50 p-1 bg-white shadow-lg rounded-lg border border-neutral-200 cursor-default"
     style="min-width: 170px"
     :style="menuStyle"
     @mousedown.stop
@@ -38,7 +38,7 @@
     </button>
     <hr
       v-if="showAutodetectFields"
-      class="my-1 border-base-300"
+      class="my-1 border-neutral-200"
     >
     <button
       v-if="showAutodetectFields"
diff --git a/app/javascript/template_builder/selection_context_menu.vue b/app/javascript/template_builder/selection_context_menu.vue
index d5328268..f5bf6a00 100644
--- a/app/javascript/template_builder/selection_context_menu.vue
+++ b/app/javascript/template_builder/selection_context_menu.vue
@@ -3,7 +3,7 @@
     <div
       v-if="!isShowFontModal && !isShowConditionsModal"
       ref="menu"
-      class="fixed z-50 p-1 bg-white shadow-lg rounded-lg border border-base-300 cursor-default"
+      class="fixed z-50 p-1 bg-white shadow-lg rounded-lg border border-neutral-200 cursor-default"
       style="min-width: 170px"
       :style="menuStyle"
       @mousedown.stop
@@ -63,7 +63,7 @@
       </ContextSubmenu>
       <hr
         v-if="showFont || showCondition"
-        class="my-1 border-base-300"
+        class="my-1 border-neutral-200"
       >
       <button
         v-if="showFont"
@@ -81,7 +81,7 @@
         <IconRouteAltLeft class="w-4 h-4" />
         <span>{{ t('condition') }}</span>
       </button>
-      <hr class="my-1 border-base-300">
+      <hr class="my-1 border-neutral-200">
       <button
         class="w-full px-2 py-1 rounded-md hover:bg-neutral-100 flex items-center justify-between text-sm"
         @click.stop="$emit('copy')"