diff --git a/client/components/open/forms/OpenCompleteForm.vue b/client/components/open/forms/OpenCompleteForm.vue
index 472c861f..dd5c3890 100644
--- a/client/components/open/forms/OpenCompleteForm.vue
+++ b/client/components/open/forms/OpenCompleteForm.vue
@@ -45,7 +45,7 @@
     <v-transition>
       <div
         v-if="!form.is_password_protected && form.password && !hidePasswordDisabledMsg"
-        class="border shadow-sm p-2 my-4 flex items-center rounded-md bg-yellow-100 border-yellow-500"
+        class="border shadow-sm p-2 my-4 flex items-center rounded-md bg-yellow-100 dark:bg-yellow-600/20 border-yellow-500 dark:border-yellow-500/20"
       >
         <div class="flex flex-grow">
           <p class="mb-0 py-2 px-4 text-yellow-600 dark:text-yellow-600">
@@ -63,7 +63,7 @@
 
     <div
       v-if="isPublicFormPage && (form.is_closed || form.visibility=='closed')"
-      class="border shadow-sm p-2 my-4 flex items-center rounded-md bg-yellow-100 border-yellow-500"
+      class="border shadow-sm p-2 my-4 flex items-center rounded-md bg-yellow-100 dark:bg-yellow-600/20 border-yellow-500 dark:border-yellow-500/20"
     >
       <div class="flex-grow">
         <p
@@ -75,11 +75,11 @@
 
     <div
       v-if="isPublicFormPage && form.max_number_of_submissions_reached"
-      class="border shadow-sm p-2 my-4 flex items-center rounded-md bg-yellow-100 border-yellow-500"
+      class="border shadow-sm p-2 my-4 flex items-center rounded-md bg-yellow-100 dark:bg-yellow-600/20 border-yellow-500 dark:border-yellow-500/20"
     >
       <div class="flex-grow">
-        <p
-          class="mb-0 py-2 px-4 text-yellow-600"
+        <div
+          class="mb-0 py-2 px-4 text-yellow-600 dark:text-yellow-600"
           v-html="form.max_submissions_reached_text"
         />
       </div>
diff --git a/client/components/open/forms/OpenFormField.vue b/client/components/open/forms/OpenFormField.vue
index 7a1fbf10..fe52b40c 100644
--- a/client/components/open/forms/OpenFormField.vue
+++ b/client/components/open/forms/OpenFormField.vue
@@ -6,7 +6,7 @@
     :class="[
       getFieldWidthClasses(field),
       {
-        'group/nffield hover:bg-gray-100/50 relative hover:z-10 transition-colors hover:border-gray-200 dark:hover:bg-gray-900 border-dashed border border-transparent box-border dark:hover:border-blue-900 rounded-md':adminPreview,
+        'group/nffield hover:bg-gray-100/50 relative hover:z-10 transition-colors hover:border-gray-200 dark:hover:bg-gray-900 border-dashed hover:border border-transparent box-border dark:hover:border-blue-900 rounded-md':adminPreview,
         'bg-blue-50 hover:!bg-blue-50 dark:bg-gray-800 rounded-md': beingEdited,
       }]"
   >