diff --git a/fet2020/templates/baseform/checkbox.html b/fet2020/templates/baseform/checkbox.html
index 8db6190b..8a65c044 100644
--- a/fet2020/templates/baseform/checkbox.html
+++ b/fet2020/templates/baseform/checkbox.html
@@ -13,5 +13,5 @@
         {% if field.field.autofocus %}autofocus{% endif %}
         class="rounded border-gray-300 dark:border-none text-proprietary shadow-sm focus:border-blue-300 focus:ring focus:ring-offset-0 focus:ring-blue-200 dark:focus:ring-sky-700 focus:ring-opacity-50"
     >
-    <span class="text-gray-700 dark:text-gray-200">{{ field.label }} {% if not field.field.required %}(optional){% endif %}</span>
+    <span>{{ field.label }} {% if not field.field.required %}(optional){% endif %}</span>
 </label>
diff --git a/fet2020/templates/baseform/date.html b/fet2020/templates/baseform/date.html
index 359f8ec4..bd09fc49 100644
--- a/fet2020/templates/baseform/date.html
+++ b/fet2020/templates/baseform/date.html
@@ -1,5 +1,5 @@
 <label>
-    <span class="text-gray-700 dark:text-gray-200">{{ field.label }} {% if not field.field.required %}(optional){% endif %}</span>
+    <span>{{ field.label }} {% if not field.field.required %}(optional){% endif %}</span>
     {% if field.errors %}
         <div class="alert alert-danger">
             <div class="alert-body">{{ field.errors }}</div>
@@ -13,9 +13,9 @@
         {% if field.field.required %}required{% endif %}
         {% if field.field.disabled %}disabled{% endif %}
         {% if field.field.autofocus %}autofocus{% endif %}
-        class="block w-full mt-1 rounded-md border-gray-300 dark:border-none shadow-sm focus:border-none focus:ring focus:ring-blue-200 dark:focus:ring-sky-700 focus:ring-opacity-50"
+        class="w-full"
     >
     {% if field.help_text %}
-        <span class="text-gray-700 dark:text-gray-200">{{ field.help_text }}</span>
+        <small class="text-gray-700 dark:text-gray-200">{{ field.help_text }}</small>
     {% endif %}
 </label>
diff --git a/fet2020/templates/baseform/date_time.html b/fet2020/templates/baseform/date_time.html
index 8a535fac..e755900f 100644
--- a/fet2020/templates/baseform/date_time.html
+++ b/fet2020/templates/baseform/date_time.html
@@ -1,5 +1,5 @@
 <label>
-    <span class="text-gray-700 dark:text-gray-200">{{ field.label }} {% if not field.field.required %}(optional){% endif %}</span>
+    <span>{{ field.label }} {% if not field.field.required %}(optional){% endif %}</span>
     {% if field.errors %}
         <div class="alert alert-danger">
             <div class="alert-body">{{ field.errors }}</div>
@@ -26,6 +26,6 @@
         class="block w-full mt-1 rounded-md border-gray-300 dark:border-none shadow-sm focus:border-none focus:ring focus:ring-blue-200 dark:focus:ring-sky-700 focus:ring-opacity-50"
     >
     {% if field.help_text %}
-        <span class="text-gray-700 dark:text-gray-200">{{ field.help_text }}</span>
+        <small class="text-gray-700 dark:text-gray-200">{{ field.help_text }}</small>
     {% endif %}
 </label>
diff --git a/fet2020/templates/baseform/file.html b/fet2020/templates/baseform/file.html
index bed9585e..6199af54 100644
--- a/fet2020/templates/baseform/file.html
+++ b/fet2020/templates/baseform/file.html
@@ -1,5 +1,5 @@
 <label>
-    <span class="text-gray-700 dark:text-gray-200">{{ field.label }} {% if not field.field.required %}(optional){% endif %}</span>
+    <span>{{ field.label }} {% if not field.field.required %}(optional){% endif %}</span>
     {% if field.errors %}
         <div class="alert alert-danger">
             <div class="alert-body">{{ field.errors }}</div>
@@ -7,10 +7,9 @@
     {% endif %}
     <input
         type="file"
-        name={{ field.name }}
+        name="{{ field.name }}"
         {% if field.field.required %}required{% endif %}
         {% if field.field.disabled %}disabled{% endif %}
         {% if field.field.autofocus %}autofocus{% endif %}
-        class="text-gray-700 dark:text-gray-200 block w-full mt-1 rounded-md border-gray-300 dark:border-none shadow-sm focus:border-none focus:ring focus:ring-blue-200 dark:focus:ring-sky-700 focus:ring-opacity-50"
     >
 </label>
diff --git a/fet2020/templates/baseform/password.html b/fet2020/templates/baseform/password.html
index a319a80b..85244570 100644
--- a/fet2020/templates/baseform/password.html
+++ b/fet2020/templates/baseform/password.html
@@ -1,5 +1,5 @@
-<label class="block">
-    <span class="text-gray-700 dark:text-gray-200">{{ field.label }} {% if not field.field.required %}(optional){% endif %}</span>
+<label>
+    <span>{{ field.label }} {% if not field.field.required %}(optional){% endif %}</span>
     {% if field.errors %}
         <div class="alert alert-danger">
             <div class="alert-body">{{ field.errors }}</div>
@@ -12,9 +12,9 @@
         {% if field.field.required %}required{% endif %}
         {% if field.field.disabled %}disabled{% endif %}
         {% if field.field.autofocus %}autofocus{% endif %}
-        class="mt-1 block w-full rounded-md border-gray-300 dark:border-none shadow-sm focus:border-none focus:ring focus:ring-blue-200 dark:focus:ring-sky-700 focus:ring-opacity-50"
+        class="w-full"
     >
     {% if field.help_text %}
-        <span class="text-gray-700 dark:text-gray-200">{{ field.help_text }}</span>
+        <small class="text-gray-700 dark:text-gray-200">{{ field.help_text }}</small>
     {% endif %}
 </label>
diff --git a/fet2020/templates/baseform/select.html b/fet2020/templates/baseform/select.html
index f32d05ff..27e1b031 100644
--- a/fet2020/templates/baseform/select.html
+++ b/fet2020/templates/baseform/select.html
@@ -1,5 +1,5 @@
 <label>
-    <span class="text-gray-700 dark:text-gray-200">{{ field.label }} {% if not field.field.required %}(optional){% endif %}</span>
+    <span>{{ field.label }} {% if not field.field.required %}(optional){% endif %}</span>
     {% if field.errors %}
         <div class="alert alert-danger">
             <div class="alert-body">{{ field.errors }}</div>
@@ -10,7 +10,7 @@
         {% if field.field.required %}required{% endif %}
         {% if field.field.disabled %}disabled{% endif %}
         {% if field.field.autofocus %}autofocus{% endif %}
-        class="block {% if field.field.disabled %}bg-gray-200 dark:text-gray-500{% endif %} w-full mt-1 rounded-md border-gray-300 dark:border-none shadow-sm focus:border-none focus:ring focus:ring-blue-200 dark:focus:ring-sky-700 focus:ring-opacity-50"
+        class="w-full"
     >
     {% for elem in field %}
         {{ elem }}
diff --git a/fet2020/templates/baseform/text.html b/fet2020/templates/baseform/text.html
index 6f5a051e..a4447221 100644
--- a/fet2020/templates/baseform/text.html
+++ b/fet2020/templates/baseform/text.html
@@ -1,5 +1,5 @@
-<label class="block">
-    <span class="text-gray-700 dark:text-gray-200">{{ field.label }} {% if not field.field.required %}(optional){% endif %}</span>
+<label>
+    <span>{{ field.label }} {% if not field.field.required %}(optional){% endif %}</span>
     {% if field.errors %}
         <div class="alert alert-danger">
             <div class="alert-body">{{ field.errors }}</div>
@@ -12,9 +12,9 @@
         {% if field.field.required %}required{% endif %}
         {% if field.field.disabled %}disabled{% endif %}
         {% if field.field.autofocus %}autofocus{% endif %}
-        class="mt-1 block w-full disabled:bg-gray-200 rounded-md border-gray-300 dark:border-none shadow-sm focus:border-none focus:ring focus:ring-blue-200 dark:focus:ring-sky-700 focus:ring-opacity-50"
+        class="w-full"
     >
     {% if field.help_text %}
-        <span class="text-gray-700 dark:text-gray-200">{{ field.help_text }}</span>
+        <small class="text-gray-700 dark:text-gray-200">{{ field.help_text }}</small>
     {% endif %}
 </label>
diff --git a/fet2020/templates/baseform/textarea.html b/fet2020/templates/baseform/textarea.html
index 123d5229..af68787c 100644
--- a/fet2020/templates/baseform/textarea.html
+++ b/fet2020/templates/baseform/textarea.html
@@ -1,5 +1,5 @@
-<label class="block">
-    <span class="text-gray-700 dark:text-gray-200">{{ field.label }} {% if not field.field.required %}(optional){% endif %}</span>
+<label>
+    <span>{{ field.label }} {% if not field.field.required %}(optional){% endif %}</span>
     {% if field.errors %}
         <div class="alert alert-danger">
             <div class="alert-body">{{ field.errors }}</div>
@@ -13,9 +13,9 @@
         {% if field.field.placeholder %}placeholder="{{ field.field.placeholder }}"{% endif %}
         {% if field.field.cols %}cols="{{ field.field.cols }}"{% endif %}
         {% if field.field.rows %}rows="{{ field.field.rows }}"{% endif %}
-        class="mt-1 block w-full disabled:bg-gray-200 rounded-md border-gray-300 dark:border-none shadow-sm focus:border-none focus:ring focus:ring-blue-200 dark:focus:ring-sky-700 focus:ring-opacity-50"
+        class="w-full"
     >{% if field.value %}{{ field.value }}{% endif %}</textarea>
     {% if field.help_text %}
-        <span class="text-gray-700 dark:text-gray-200">{{ field.help_text }}</span>
+        <small class="text-gray-700 dark:text-gray-200">{{ field.help_text }}</small>
     {% endif %}
 </label>