diff --git a/clientside_validation_jquery/clientside_validation_jquery.libraries.yml b/clientside_validation_jquery/clientside_validation_jquery.libraries.yml
index 2d38751..0276f1f 100755
--- a/clientside_validation_jquery/clientside_validation_jquery.libraries.yml
+++ b/clientside_validation_jquery/clientside_validation_jquery.libraries.yml
@@ -8,6 +8,7 @@ jquery.validate:
     /libraries/jqueryvalidate/dist/jquery.validate.js: {}
   dependencies:
     - core/drupal
+    - core/drupalSettings
     - core/jquery
 jquery.validate.additional:
   remote: https://jqueryvalidation.org/
diff --git a/clientside_validation_jquery/js/cv.jquery.validate.js b/clientside_validation_jquery/js/cv.jquery.validate.js
index 257e37d..af20855 100644
--- a/clientside_validation_jquery/js/cv.jquery.validate.js
+++ b/clientside_validation_jquery/js/cv.jquery.validate.js
@@ -2,7 +2,8 @@
  * @file
  * Attaches behaviors for the Clientside Validation jQuery module.
  */
-(function ($, Drupal) {
+(function ($, Drupal, drupalSettings) {
+
   /**
    * Attaches jQuery validate behavoir to forms.
    *
@@ -13,9 +14,39 @@
    */
   Drupal.behaviors.cvJqueryValidate = {
     attach: function (context) {
+      if (typeof drupalSettings.cvJqueryValidateOptions === 'undefined') {
+        drupalSettings.cvJqueryValidateOptions = {};
+      }
+
+      // Allow all modules to update the validate options.
+      // Example of how to do this is shown below.
+      $(document).trigger('cv-jquery-validate-options-update', drupalSettings.cvJqueryValidateOptions);
+
       $(context).find('form').each(function() {
-        $(this).validate();
+        $(this).validate(drupalSettings.cvJqueryValidateOptions);
+      });
+
+      // Override clientside validation jquery validation options.
+      // We do this to display the error markup same as in inline_form_errors.
+      $(document).once('cvjquery').on('cv-jquery-validate-options-update', function (event, options) {
+        options.errorElement = 'strong';
+        options.showErrors = function(errorMap, errorList) {
+          // First remove all errors.
+          for (var i in errorList) {
+            $(errorList[i].element).parent().find('.form-item--error-message').remove();
+          }
+
+          // Show errors using defaultShowErrors().
+          this.defaultShowErrors();
+
+          // Wrap all errors with div.form-item--error-message.
+          $(this.currentForm).find('strong.error').each(function () {
+            if (!$(this).parent().hasClass('form-item--error-message')) {
+              $(this).wrap('<div class="form-item--error-message"/>');
+            }
+          });
+        };
       });
     }
   };
-})(jQuery, Drupal);
+})(jQuery, Drupal, drupalSettings);