diff --git a/site/plugins/admin/templates/content/entries/add.html b/site/plugins/admin/templates/content/entries/add.html
index 780bc83c..49af6f87 100644
--- a/site/plugins/admin/templates/content/entries/add.html
+++ b/site/plugins/admin/templates/content/entries/add.html
@@ -9,19 +9,21 @@
                 <input type="hidden" id="fieldset" name="fieldset" value="{{ type }}">
 
                 <div class="form-group">
-                    <label for="title">{{ tr('admin_title') }}</label>
-                    <input type="text" id="title" name="title" value="" class="form-control" required="required" data-validation="length required" data-validation-length="min1" data-validation-error-msg="{{ tr('admin_error_title_empty_input') }}">
+                    <label for="title" class="form-control-title">{{ tr('admin_title') }}</label>
+                    <input type="text" id="title" name="title" value="" class="form-control" required="required" data-parsley-minlength="1" data-parsley-error-message="{{ tr('admin_error_title_empty_input') }}" data-parsley-required="true">
                     <small>{{ tr('admin_help_text_for_entry_label') }}</small>
                 </div>
+
                 <div class="form-group">
-                    <label for="id">{{ tr('admin_name') }}</label>
-                    <input type="text" id="id" name="id" value="" class="form-control" required="required" data-validation="length required" data-validation-length="min1" data-validation-error-msg="{{ tr('admin_error_name_empty_input') }}">
+                    <label for="id" class="form-control-title">{{ tr('admin_name') }}</label>
+                    <input type="text" id="id" name="id" value="" class="form-control" required="required" data-parsley-minlength="1" data-parsley-error-message="{{ tr('admin_error_name_empty_input') }}" data-parsley-required="true">
                     <small>{{ tr('admin_help_text_for_entry_name') }}</small>
                 </div>
+
                 <div class="flex row">
                     <div class="col w-full lg:w-6/12">
                         <div class="form-group">
-                            <label>{{ tr('admin_routable') }}</label>
+                            <label class="form-control-title">{{ tr('admin_routable') }}</label>
                             <select class="form-control js-select" name="routable">
                                 <option value="1" selected="selected">{{ tr('admin_yes') }}</option>
                                 <option value="0">{{ tr('admin_no') }}</option>
@@ -30,7 +32,7 @@
                     </div>
                     <div class="col w-full lg:w-6/12">
                         <div class="form-group">
-                            <label>{{ tr('admin_visibility') }}</label>
+                            <label class="form-control-title">{{ tr('admin_visibility') }}</label>
                             <select class="form-control js-select" name="visibility">
                                 <option value="visible" selected="selected">{{ tr('admin_visible') }}</option>
                                 <option value="hidden">{{ tr('admin_hidden') }}</option>
diff --git a/site/plugins/admin/templates/extends/fieldsets/add.html b/site/plugins/admin/templates/extends/fieldsets/add.html
index 55ec9c28..cddf7275 100644
--- a/site/plugins/admin/templates/extends/fieldsets/add.html
+++ b/site/plugins/admin/templates/extends/fieldsets/add.html
@@ -7,19 +7,19 @@
             <div class="col w-full lg:w-4/12">
                 <div class="form-group">
                     <label for="title" class="form-control-title">{{ tr('admin_title') }}</label>
-                    <input type="text" id="title" name="title" value="" class="form-control" required="required" data-validation="length required" data-validation-length="min1" data-validation-error-msg="{{ tr('admin_error_title_empty_input') }}">
+                    <input type="text" id="title" name="title" value="" class="form-control" required="required" data-parsley-minlength="1" data-parsley-error-message="{{ tr('admin_error_title_empty_input') }}" data-parsley-required="true">
                     <small>{{ tr('admin_help_text_for_fieldsets_label') }}</small>
                 </div>
                 <div class="form-group">
                     <label for="id" class="form-control-title">{{ tr('admin_name') }}</label>
-                    <input type="text" id="id" name="id" value="" class="form-control" required="required" data-validation="length required" data-validation-length="min1" data-validation-error-msg="{{ tr('admin_error_name_empty_input') }}">
+                    <input type="text" id="id" name="id" value="" class="form-control" required="required" data-parsley-minlength="1" data-parsley-error-message="{{ tr('admin_error_name_empty_input') }}" data-parsley-required="true">
                     <small>{{ tr('admin_help_text_for_fieldsets_name') }}</small>
                 </div>
                 <div class="flex row">
                     <div class="col w-full lg:w-6/12">
                         <div class="form-group">
                             <label for="icon" class="form-control-title">{{ tr('admin_icon') }}</label>
-                            <input type="text" id="fieldsetIcon" name="icon" value="far fa-file-alt" class="form-control" required="required" data-validation="length required" data-validation-length="min1" data-validation-error-msg="{{ tr('admin_error_icon_empty_input') }}">
+                            <input type="text" id="fieldsetIcon" name="icon" value="far fa-file-alt" class="form-control" required="required" data-parsley-minlength="1" data-parsley-error-message="{{ tr('admin_error_icon_empty_input') }}" data-parsley-required="true">
                             <small>{{ tr('admin_help_text_for_fieldsets_icon', {':link': '<a href="https://fontawesome.com/icons?d=gallery&m=free" target="_blank">fontawesome</a>'})|raw }}</small>
                         </div>
                     </div>
@@ -46,4 +46,4 @@
             </div>
         </div>
     </form>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/site/plugins/admin/templates/extends/fieldsets/rename.html b/site/plugins/admin/templates/extends/fieldsets/rename.html
index 59ad8ea6..ef766392 100644
--- a/site/plugins/admin/templates/extends/fieldsets/rename.html
+++ b/site/plugins/admin/templates/extends/fieldsets/rename.html
@@ -4,11 +4,11 @@
     <form method="post" id="form">
         {{ csrf() }}
         <input type="hidden" id="fieldset-id-current-{{ id }}" name="fieldset-id-current" value="{{ id }}">
-<div class="flex row">
-    <div class="col w-full lg:w-4/12">
+        <div class="flex row">
+            <div class="col w-full lg:w-4/12">
                 <div class="form-group">
                     <label for="id" class="form-control-title">{{ tr('admin_name') }}</label>
-                    <input type="text" id="id" name="id" value="{{ id }}" class="form-control" required="required" data-validation="length required" data-validation-length="min1" data-validation-error-msg="{{ tr('admin_error_name_empty_input') }}">
+                    <input type="text" id="id" name="id" value="{{ id }}" class="form-control" required="required" data-parsley-minlength="1" data-parsley-error-message="{{ tr('admin_error_name_empty_input') }}" data-parsley-required="true">
                     <small>{{ tr('admin_help_text_for_fieldsets_name') }}</small>
                 </div>
                 <div class="button-group">
@@ -17,4 +17,4 @@
             </div>
         </div>
     </form>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/site/plugins/admin/templates/extends/snippets/add.html b/site/plugins/admin/templates/extends/snippets/add.html
index ed9776c0..5de7f842 100644
--- a/site/plugins/admin/templates/extends/snippets/add.html
+++ b/site/plugins/admin/templates/extends/snippets/add.html
@@ -7,7 +7,7 @@
             <div class="col w-full lg:w-4/12">
                 <div class="form-group">
                     <label for="id" class="form-control-title">{{ tr('admin_name') }}</label>
-                    <input type="text" id="id" name="id" value="" class="form-control" required="required" data-validation="length required" data-validation-length="min1" data-validation-error-msg="{{ tr('admin_error_name_empty_input') }}">
+                    <input type="text" id="id" name="id" value="" class="form-control" required="required" data-parsley-minlength="1" data-parsley-error-message="{{ tr('admin_error_name_empty_input') }}" data-parsley-required="true">
                     <small>{{ tr('admin_help_text_for_snippets_name') }}</small>
                 </div>
                 <div class="button-group">
diff --git a/site/plugins/admin/templates/extends/snippets/rename.html b/site/plugins/admin/templates/extends/snippets/rename.html
index fd7b60a8..1fd29fb5 100644
--- a/site/plugins/admin/templates/extends/snippets/rename.html
+++ b/site/plugins/admin/templates/extends/snippets/rename.html
@@ -8,7 +8,7 @@
             <div class="col w-full lg:w-3/12">
                 <div class="form-group">
                     <label for="id" class="form-control-title">{{ tr('admin_name') }}</label>
-                    <input type="text" id="id" name="id" value="{{ id_current }}" class="form-control" required="required" data-validation="length required" data-validation-length="min1" data-validation-error-msg="{{ tr('admin_error_name_empty_input') }}">
+                    <input type="text" id="id" name="id" value="{{ id_current }}" class="form-control" required="required" data-parsley-minlength="1" data-parsley-error-message="{{ tr('admin_error_name_empty_input') }}" data-parsley-required="true">
                     <small>{{ tr('admin_help_text_for_snippets_name') }}</small>
                 </div>
                 <div class="button-group">
diff --git a/site/plugins/admin/templates/extends/themes/templates/add.html b/site/plugins/admin/templates/extends/themes/templates/add.html
index 1c959597..45c2e80e 100644
--- a/site/plugins/admin/templates/extends/themes/templates/add.html
+++ b/site/plugins/admin/templates/extends/themes/templates/add.html
@@ -8,7 +8,7 @@
             <div class="w-full lg:w-4/12">
                 <div class="form-group">
                     <label for="id" class="form-control-title">{{ tr('admin_name') }}</label>
-                    <input type="text" id="id" name="id" value="" class="form-control" required="required" data-validation="length required" data-validation-length="min1" data-validation-error-msg="{{ tr('admin_error_name_empty_input') }}">
+                    <input type="text" id="id" name="id" value="" class="form-control" required="required" data-parsley-minlength="1" data-parsley-error-message="{{ tr('admin_error_name_empty_input') }}" data-parsley-required="true">
                     <small>{{ tr('admin_help_text_for_temlates_name') }}</small>
                 </div>
                 <div class="form-group">
diff --git a/site/plugins/admin/templates/system/api/delivery/add.html b/site/plugins/admin/templates/system/api/delivery/add.html
index 79f7aacf..6393bb9e 100644
--- a/site/plugins/admin/templates/system/api/delivery/add.html
+++ b/site/plugins/admin/templates/system/api/delivery/add.html
@@ -44,4 +44,4 @@
             </div>
         </div>
     </form>
-{% endblock %}
\ No newline at end of file
+{% endblock %}