diff --git a/site/plugins/admin/templates/extends/snippets/add.html b/site/plugins/admin/templates/extends/snippets/add.html
index 39da1e8b..bb0c631f 100644
--- a/site/plugins/admin/templates/extends/snippets/add.html
+++ b/site/plugins/admin/templates/extends/snippets/add.html
@@ -1,27 +1,27 @@
 {% extends "plugins/admin/templates/partials/base.html" %}
 
 {% block content %}
-<form method="post" id="form">
-    {{ csrf() }}
-    <div class="row">
-        <div class="col-md-6">
-            <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') }}">
-                <small class="form-text text-muted">{{ tr('admin_help_text_for_snippets_name') }}</small>
-            </div>
-            <div class="form-group">
-                <div class="btn-group custom-btn-group">
-                  <input type="submit" id="create" name="create" value="{{ tr('admin_create') }}" class="buttonbtn-black">
-                  <button type="button" class="buttondropdown-toggle dropdown-toggle-split" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                    <span class="sr-only">Toggle Dropdown</span>
-                  </button>
-                  <div class="dropdown">
-                    <input type="submit" id="create-and-edit" name="create-and-edit" value="{{ tr('admin_create_and_edit') }}" class="dropdown-item">
-                  </div>
+    <form method="post" id="form">
+        {{ csrf() }}
+        <div class="flex">
+            <div class="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="" class="form-control" required="required" data-validation="length required" data-validation-length="min1" data-validation-error-msg="{{ tr('admin_error_name_empty_input') }}">
+                    <small>{{ tr('admin_help_text_for_snippets_name') }}</small>
+                </div>
+                <div class="form-group">
+                    <div class="button-group">
+                        <input type="submit" id="create" name="create" value="{{ tr('admin_create') }}" class="button">
+                        <button type="button" class="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                            <span class="sr-only">Toggle Dropdown</span>
+                        </button>
+                        <div class="dropdown">
+                            <input type="submit" id="create-and-edit" name="create-and-edit" value="{{ tr('admin_create_and_edit') }}" class="dropdown-item">
+                        </div>
+                    </div>
                 </div>
             </div>
         </div>
-    </div>
-</form>
-{% endblock %}
+    </form>
+{% endblock %}
\ No newline at end of file
diff --git a/site/plugins/admin/templates/extends/snippets/edit.html b/site/plugins/admin/templates/extends/snippets/edit.html
index c7270d42..82dde786 100644
--- a/site/plugins/admin/templates/extends/snippets/edit.html
+++ b/site/plugins/admin/templates/extends/snippets/edit.html
@@ -1,16 +1,14 @@
 {% extends "plugins/admin/templates/partials/base.html" %}
 
 {% block content %}
-<form method="post" id="form">
-    {{ csrf() }}
-    <input type="hidden" name="action" value="save-form">
-    <input type="hidden" name="id" value="{{ id }}">
-    <div class="row">
-        <div class="col-12">
-            <div class="form-group">
+    <form method="post" id="form">
+        {{ csrf() }}
+        <input type="hidden" name="action" value="save-form">
+        <input type="hidden" name="id" value="{{ id }}">
+        <div class="flex">
+            <div class="w-full">
                 <textarea name="data" rows="0" cols="0" class="form-control code-editor js-code">{{ data }}</textarea>
             </div>
         </div>
-    </div>
-</form>
-{% endblock %}
+    </form>
+{% endblock %}
\ No newline at end of file
diff --git a/site/plugins/admin/templates/extends/snippets/rename.html b/site/plugins/admin/templates/extends/snippets/rename.html
index bd839332..fa66aa17 100644
--- a/site/plugins/admin/templates/extends/snippets/rename.html
+++ b/site/plugins/admin/templates/extends/snippets/rename.html
@@ -1,20 +1,20 @@
 {% extends "plugins/admin/templates/partials/base.html" %}
 
 {% block content %}
-<form method="post" id="form">
-    {{ csrf() }}
-    <input type="hidden" name="id_current" value="{{ id_current }}">
-    <div class="row">
-        <div class="col-md-6">
-            <div class="form-group">
-                <label for="id">{{ 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') }}">
-                <small class="form-text text-muted">{{ tr('admin_help_text_for_snippets_name') }}</small>
-            </div>
-            <div class="form-group">
-                <input type="submit" id="renameTemplate" name="rename_template" value="{{ tr('admin_save') }}" class="buttonbtn-black">
+    <form method="post" id="form">
+        {{ csrf() }}
+        <input type="hidden" name="id_current" value="{{ id_current }}">
+        <div class="flex">
+            <div class="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') }}">
+                    <small>{{ tr('admin_help_text_for_snippets_name') }}</small>
+                </div>
+                <div class="button-group">
+                    <input type="submit" id="renameTemplate" name="rename_template" value="{{ tr('admin_save') }}" class="button">
+                </div>
             </div>
         </div>
-    </div>
-</form>
-{% endblock %}
+    </form>
+{% endblock %}
\ No newline at end of file
diff --git a/site/plugins/admin/templates/extends/themes/templates/add.html b/site/plugins/admin/templates/extends/themes/templates/add.html
index e250a27a..ca9110b9 100644
--- a/site/plugins/admin/templates/extends/themes/templates/add.html
+++ b/site/plugins/admin/templates/extends/themes/templates/add.html
@@ -1,35 +1,35 @@
 {% extends "plugins/admin/templates/partials/base.html" %}
 
 {% block content %}
-<form method="post" id="form">
-    {{ csrf() }}
-    <input type="hidden" name="theme" value="{{ theme }}">
-    <div class="row">
-        <div class="col-md-6">
-            <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') }}">
-                <small class="form-text text-muted">{{ tr('admin_help_text_for_temlates_name') }}</small>
-            </div>
-            <div class="form-group">
-                <label for="type">{{ tr('admin_type') }}</label>
-                <select class="form-control" name="type">
-                    <option value="partial">{{ tr('admin_partial') }}</option>
-                    <option value="template">{{ tr('admin_template') }}</option>
-                </select>
-            </div>
-            <div class="form-group">
-                <div class="btn-group custom-btn-group">
-                  <input type="submit" id="create" name="create" value="{{ tr('admin_create') }}" class="buttonbtn-black">
-                  <button type="button" class="buttondropdown-toggle dropdown-toggle-split" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                    <span class="sr-only">Toggle Dropdown</span>
-                  </button>
-                  <div class="dropdown">
-                    <input type="submit" id="create-and-edit" name="create-and-edit" value="{{ tr('admin_create_and_edit') }}" class="dropdown-item">
-                  </div>
+    <form method="post" id="form">
+        {{ csrf() }}
+        <input type="hidden" name="theme" value="{{ theme }}">
+        <div class="flex">
+            <div class="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="" class="form-control" required="required" data-validation="length required" data-validation-length="min1" data-validation-error-msg="{{ tr('admin_error_name_empty_input') }}">
+                    <small>{{ tr('admin_help_text_for_temlates_name') }}</small>
+                </div>
+                <div class="form-group">
+                    <label for="type" class="form-control-title">{{ tr('admin_type') }}</label>
+                    <select class="form-control" name="type">
+                        <option value="partial">{{ tr('admin_partial') }}</option>
+                        <option value="template">{{ tr('admin_template') }}</option>
+                    </select>
+                </div>
+                <div class="form-group">
+                    <div class="button-group">
+                        <input type="submit" id="create" name="create" value="{{ tr('admin_create') }}" class="button">
+                        <button type="button" class="buttondropdown-toggle dropdown-toggle-split" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                            <span class="sr-only">Toggle Dropdown</span>
+                        </button>
+                        <div class="dropdown">
+                            <input type="submit" id="create-and-edit" name="create-and-edit" value="{{ tr('admin_create_and_edit') }}" class="dropdown-item">
+                        </div>
+                    </div>
                 </div>
             </div>
         </div>
-    </div>
-</form>
-{% endblock %}
+    </form>
+{% endblock %}
\ No newline at end of file
diff --git a/site/plugins/admin/templates/extends/themes/templates/edit.html b/site/plugins/admin/templates/extends/themes/templates/edit.html
index 50cb10ef..5fef62e3 100644
--- a/site/plugins/admin/templates/extends/themes/templates/edit.html
+++ b/site/plugins/admin/templates/extends/themes/templates/edit.html
@@ -1,18 +1,16 @@
 {% extends "plugins/admin/templates/partials/base.html" %}
 
 {% block content %}
-<form method="post" id="form">
-    {{ csrf() }}
-    <input type="hidden" name="action" value="save-form">
-    <input type="hidden" name="type" value="{{ type }}">
-    <input type="hidden" name="id" value="{{ id }}">
-    <input type="hidden" name="theme" value="{{ theme }}">
-    <div class="row">
-        <div class="col-12">
-            <div class="form-group">
+    <form method="post" id="form">
+        {{ csrf() }}
+        <input type="hidden" name="action" value="save-form">
+        <input type="hidden" name="type" value="{{ type }}">
+        <input type="hidden" name="id" value="{{ id }}">
+        <input type="hidden" name="theme" value="{{ theme }}">
+        <div class="flex">
+            <div class="w-full">
                 <textarea name="data" rows="0" cols="0" class="form-control code-editor js-code">{{ data }}</textarea>
             </div>
         </div>
-    </div>
-</form>
-{% endblock %}
+    </form>
+{% endblock %}
\ No newline at end of file
diff --git a/site/plugins/admin/templates/extends/themes/templates/rename.html b/site/plugins/admin/templates/extends/themes/templates/rename.html
index 122d2c81..01fe0ee3 100644
--- a/site/plugins/admin/templates/extends/themes/templates/rename.html
+++ b/site/plugins/admin/templates/extends/themes/templates/rename.html
@@ -1,22 +1,22 @@
 {% extends "plugins/admin/templates/partials/base.html" %}
 
 {% block content %}
-<form method="post" id="form">
-    {{ csrf() }}
-    <input type="hidden" name="id_current" value="{{ id_current }}">
-    <input type="hidden" name="type_current" value="{{ type_current }}">
-    <input type="hidden" name="theme" value="{{ theme }}">
-    <div class="row">
-        <div class="col-md-6">
-            <div class="form-group">
-                <label for="id">{{ 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') }}">
-                <small class="form-text text-muted">{{ tr('admin_help_text_for_temlates_name') }}</small>
-            </div>
-            <div class="form-group">
-                <input type="submit" id="renameTemplate" name="rename_template" value="{{ tr('admin_save') }}" class="buttonbtn-black">
+    <form method="post" id="form">
+        {{ csrf() }}
+        <input type="hidden" name="id_current" value="{{ id_current }}">
+        <input type="hidden" name="type_current" value="{{ type_current }}">
+        <input type="hidden" name="theme" value="{{ theme }}">
+        <div class="flex">
+            <div class="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') }}">
+                    <small>{{ tr('admin_help_text_for_temlates_name') }}</small>
+                </div>
+                <div class="form-group">
+                    <input type="submit" id="renameTemplate" name="rename_template" value="{{ tr('admin_save') }}" class="button">
+                </div>
             </div>
         </div>
-    </div>
-</form>
-{% endblock %}
+    </form>
+{% endblock %}
\ No newline at end of file