diff --git a/site/plugins/admin/templates/extends/themes/templates/add.html b/site/plugins/admin/templates/extends/themes/templates/add.html
index ca9110b9..a2fea363 100644
--- a/site/plugins/admin/templates/extends/themes/templates/add.html
+++ b/site/plugins/admin/templates/extends/themes/templates/add.html
@@ -13,20 +13,18 @@
                 </div>
                 <div class="form-group">
                     <label for="type" class="form-control-title">{{ tr('admin_type') }}</label>
-                    <select class="form-control" name="type">
+                    <select class="form-control js-select" 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 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>
diff --git a/site/plugins/admin/templates/extends/themes/templates/edit.html b/site/plugins/admin/templates/extends/themes/templates/edit.html
index 5fef62e3..4d2080ea 100644
--- a/site/plugins/admin/templates/extends/themes/templates/edit.html
+++ b/site/plugins/admin/templates/extends/themes/templates/edit.html
@@ -7,10 +7,6 @@
         <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>
+        <textarea name="data" rows="0" cols="0" class="js-code">{{ data }}</textarea>
     </form>
 {% endblock %}
\ No newline at end of file
diff --git a/site/plugins/admin/templates/extends/themes/templates/index.html b/site/plugins/admin/templates/extends/themes/templates/index.html
index c3012d2f..48a4e531 100644
--- a/site/plugins/admin/templates/extends/themes/templates/index.html
+++ b/site/plugins/admin/templates/extends/themes/templates/index.html
@@ -114,7 +114,7 @@
             </tbody>
         </table>
     {% else %}
-        <div class="text-center flex justify-center items-center h-full">
+        <div class="flex justify-center items-center text-center h-full">
             <div>
                 <i class="icon icon--4xl">{{ icon('fas fa-layer-group') }}</i>
                 <h3 class="text-2xl pt-4 pb-8">{{ tr('admin_you_have_not_created_any_templates_yet') }}</h3>
diff --git a/site/plugins/admin/templates/extends/themes/templates/rename.html b/site/plugins/admin/templates/extends/themes/templates/rename.html
index 01fe0ee3..78e65f68 100644
--- a/site/plugins/admin/templates/extends/themes/templates/rename.html
+++ b/site/plugins/admin/templates/extends/themes/templates/rename.html
@@ -13,7 +13,7 @@
                     <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">
+                <div class="button-group">
                     <input type="submit" id="renameTemplate" name="rename_template" value="{{ tr('admin_save') }}" class="button">
                 </div>
             </div>