diff --git a/django_forms_bootstrap/templates/bootstrap/_field_errors.html b/django_forms_bootstrap/templates/bootstrap/_field_errors.html
index 85ffdc0..5203117 100644
--- a/django_forms_bootstrap/templates/bootstrap/_field_errors.html
+++ b/django_forms_bootstrap/templates/bootstrap/_field_errors.html
@@ -1,3 +1,3 @@
 {% for error in field.errors %}
-    <span id="error_{{ field.auto_id }}_{{ forloop.counter }}" class="error-msg">{{ error }}</span>
+    <div id="error_{{ field.auto_id }}_{{ forloop.counter }}" class="invalid-feedback">{{ error }}</div>
 {% endfor %}
\ No newline at end of file
diff --git a/django_forms_bootstrap/templates/bootstrap/_field_errors_block.html b/django_forms_bootstrap/templates/bootstrap/_field_errors_block.html
index f4f24ea..5203117 100644
--- a/django_forms_bootstrap/templates/bootstrap/_field_errors_block.html
+++ b/django_forms_bootstrap/templates/bootstrap/_field_errors_block.html
@@ -1,3 +1,3 @@
 {% for error in field.errors %}
-    <p id="error_{{ field.auto_id }}_{{ forloop.counter }}" class="help-block">{{ error }}</p>
+    <div id="error_{{ field.auto_id }}_{{ forloop.counter }}" class="invalid-feedback">{{ error }}</div>
 {% endfor %}
\ No newline at end of file
diff --git a/django_forms_bootstrap/templates/bootstrap/_field_help_text.html b/django_forms_bootstrap/templates/bootstrap/_field_help_text.html
index cfbe3d9..9fc0998 100644
--- a/django_forms_bootstrap/templates/bootstrap/_field_help_text.html
+++ b/django_forms_bootstrap/templates/bootstrap/_field_help_text.html
@@ -1,3 +1,3 @@
 {% if field.help_text %}
-    <p class="help-block">{{ field.help_text|safe }}</p>
+    <small class="form-text text-muted">{{ field.help_text|safe }}</small>
 {% endif %}
\ No newline at end of file
diff --git a/django_forms_bootstrap/templatetags/bootstrap_tags.py b/django_forms_bootstrap/templatetags/bootstrap_tags.py
index d4325d3..ec16811 100644
--- a/django_forms_bootstrap/templatetags/bootstrap_tags.py
+++ b/django_forms_bootstrap/templatetags/bootstrap_tags.py
@@ -14,13 +14,24 @@
 
 
 def _preprocess_fields(form):
+    invalid_form = True if len(form.errors) > 0 else False
+
     for field in form.fields:
         name = form.fields[field].widget.__class__.__name__.lower()
         if not name.startswith("radio") and not name.startswith("checkbox"):
+
+            if invalid_form:
+                if field in form.errors:
+                    validation_state = ' is-invalid'
+                else:
+                    validation_state = ' is-valid'
+            else:
+                validation_state = ''
+
             try:
-                form.fields[field].widget.attrs["class"] += " form-control"
+                form.fields[field].widget.attrs["class"] += ' form-control' + validation_state
             except KeyError:
-                form.fields[field].widget.attrs["class"] = " form-control"
+                form.fields[field].widget.attrs["class"] = ' form-control' + validation_state
     return form