diff --git a/app/helpers/imports_helper.rb b/app/helpers/imports_helper.rb
index 4a0dce76..cabc31ac 100644
--- a/app/helpers/imports_helper.rb
+++ b/app/helpers/imports_helper.rb
@@ -46,11 +46,11 @@ module ImportsHelper
   end
 
   def cell_class(row, field)
-    base = "text-sm focus:ring-gray-900 focus:border-gray-900 w-full max-w-full disabled:text-subdued"
+    base = "bg-container text-sm focus:ring-gray-900 theme-dark:focus:ring-gray-100 focus:border-solid w-full max-w-full disabled:text-subdued"
 
     row.valid? # populate errors
 
-    border = row.errors.key?(field) ? "border-red-500" : "border-transparent"
+    border = row.errors.key?(field) ? "border-destructive" : "border-transparent"
 
     [ base, border ].join(" ")
   end
diff --git a/app/views/import/cleans/show.html.erb b/app/views/import/cleans/show.html.erb
index 1412cb5e..4a743d01 100644
--- a/app/views/import/cleans/show.html.erb
+++ b/app/views/import/cleans/show.html.erb
@@ -14,7 +14,7 @@
     <div class="bg-container border border-tertiary rounded-lg p-3 flex flex-col md:flex-row items-start md:items-center justify-between gap-2 md:gap-0">
       <div class="flex items-center gap-2">
         <%= icon "check-circle", size: "sm", color: "success" %>
-        <p class="text-success text-sm md:text-base">Your data has been cleaned</p>
+        <p class="text-success text-sm">Your data has been cleaned</p>
       </div>
 
       <%= render LinkComponent.new(
@@ -45,13 +45,13 @@
   <div class="pb-12">
     <div class="bg-container-inset rounded-xl p-1 mb-6">
       <div class="overflow-x-auto">
-        <div style="grid-template-columns: repeat(<%= @import.column_keys.count %>, minmax(150px, 1fr)); min-width: max-content;" class="grid items-center uppercase text-xs font-medium text-secondary py-3">
+        <div style="grid-template-columns: repeat(<%= @import.column_keys.count %>, minmax(150px, 1fr));" class="grid items-center uppercase text-xs font-medium text-secondary py-3">
           <% @import.column_keys.each do |key| %>
             <div class="px-5"><%= import_col_label(key) %></div>
           <% end %>
         </div>
 
-        <div class="bg-container shadow-border-xs rounded-xl divide-y divide-alpha-black-200">
+        <div class="bg-container shadow-border-xs rounded-xl divide-y divide-alpha-black-200 theme-dark:divide-alpha-white-200">
           <% @rows.each do |row| %>
             <%= render "import/rows/form", row: row %>
           <% end %>
diff --git a/app/views/import/rows/_form.html.erb b/app/views/import/rows/_form.html.erb
index b5057d63..e7f5a4a9 100644
--- a/app/views/import/rows/_form.html.erb
+++ b/app/views/import/rows/_form.html.erb
@@ -1,6 +1,6 @@
 <%# locals: (row:) %>
 
-<div style="grid-template-columns: repeat(<%= row.import.column_keys.count %>, minmax(150px, 1fr)); min-width: max-content;" class="first:rounded-tl-lg first:rounded-tr-lg last:rounded-bl-lg last:rounded-br-lg grid divide-x divide-alpha-black-200 group">
+<div style="grid-template-columns: repeat(<%= row.import.column_keys.count %>, minmax(150px, 1fr));" class="first:rounded-tl-lg first:rounded-tr-lg last:rounded-bl-lg last:rounded-br-lg grid divide-x divide-alpha-black-200 theme-dark:divide-alpha-white-200 group">
   <% row.import.column_keys.each_with_index do |key, idx| %>
     <%= turbo_frame_tag dom_id(row, key), title: row.valid? ? nil : row.errors.full_messages.join(", ") do %>
       <%= form_with(