diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 03237c92..ef6d3415 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,12 +5,9 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="7c8f7059-cd40-417c-936e-48dbc0507d86" name="Changes" comment="Add static Vuexy files">
-      <change afterPath="$PROJECT_DIR$/ci4/app/Views/themes/backend/vuexy/main/general_settings_layout.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ci4/app/Config/Routes.php" beforeDir="false" afterPath="$PROJECT_DIR$/ci4/app/Config/Routes.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/ci4/app/Controllers/Profile.php" beforeDir="false" afterPath="$PROJECT_DIR$/ci4/app/Controllers/Profile.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/ci4/app/Views/themes/backend/vuexy/form/profile/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/ci4/app/Views/themes/backend/vuexy/form/profile/index.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ci4/app/Views/themes/backend/vuexy/main/header.php" beforeDir="false" afterPath="$PROJECT_DIR$/ci4/app/Views/themes/backend/vuexy/main/header.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -32,21 +29,21 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "RunOnceActivity.OpenProjectViewOnStart": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "WebServerToolWindowFactoryState": "false",
-    "last_opened_file_path": "C:/temp-sk/safekat/ci4/app/Views/themes/backend/vuexy/main",
-    "node.js.detected.package.eslint": "true",
-    "node.js.detected.package.tslint": "true",
-    "node.js.selected.package.eslint": "(autodetect)",
-    "node.js.selected.package.tslint": "(autodetect)",
-    "nodejs_package_manager_path": "npm",
-    "settings.editor.selected.configurable": "preferences.pluginManager",
-    "vue.rearranger.settings.migration": "true"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
+    &quot;last_opened_file_path&quot;: &quot;C:/temp-sk/safekat/ci4/app/Views/themes/backend/vuexy/main&quot;,
+    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
+    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
+    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
+    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
+    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;preferences.pluginManager&quot;,
+    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
   }
-}]]></component>
+}</component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
       <recent name="C:\temp-sk\safekat\ci4\app\Views\themes\backend\vuexy\main" />
@@ -88,6 +85,7 @@
       <workItem from="1684415370137" duration="889000" />
       <workItem from="1684761592479" duration="626000" />
       <workItem from="1684829967827" duration="8241000" />
+      <workItem from="1684869825991" duration="3082000" />
     </task>
     <task id="LOCAL-00001" summary="Starting Vuexy Theme creation">
       <created>1682339938559</created>
diff --git a/ci4/app/Controllers/Profile.php b/ci4/app/Controllers/Profile.php
index cb90b824..a8f3c8ae 100644
--- a/ci4/app/Controllers/Profile.php
+++ b/ci4/app/Controllers/Profile.php
@@ -96,9 +96,8 @@ class Profile extends BaseController
             }
         }
 
-        echo view(getenv('theme.path').'main/header');
         echo view(getenv('theme.path').'form/profile/index', $data);
-        echo view(getenv('theme.path').'main/footer');
+
     }
 
     public function store()
diff --git a/ci4/app/Views/themes/backend/vuexy/form/profile/index.php b/ci4/app/Views/themes/backend/vuexy/form/profile/index.php
index 01a1c235..bdf468de 100644
--- a/ci4/app/Views/themes/backend/vuexy/form/profile/index.php
+++ b/ci4/app/Views/themes/backend/vuexy/form/profile/index.php
@@ -1,6 +1,7 @@
+<?= $this->include("themes/_commonPartialsBs/select2bs5") ?>
 <?= $this->extend('themes/backend/vuexy/main/general_settings_layout') ?>
-<?= $this->section('content'); ?>
 
+<?= $this->section('content'); ?>
 <!--Content Body-->
 <div class="row">
     <div class="col-md-12">
@@ -23,14 +24,14 @@
             <div class="card-body">
                 <div class="d-flex align-items-start align-items-sm-center gap-4">
                     <img
-                            src="../../assets/img/avatars/14.png"
+                            src="<?= $obj->picture ?? '' ?>"
                             alt="user-avatar"
                             class="d-block w-px-100 h-px-100 rounded"
                             id="uploadedAvatar"
                     />
                     <div class="button-wrapper">
                         <label for="upload" class="btn btn-primary me-2 mb-3" tabindex="0">
-                            <span class="d-none d-sm-block">Upload new photo</span>
+                            <span class="d-none d-sm-block"><?= lang("App.profile_change_photo") ?></span>
                             <i class="ti ti-upload d-block d-sm-none"></i>
                             <input
                                     type="file"
@@ -123,18 +124,25 @@
                             />
                         </div>
                         <div class="mb-3 col-md-6">
-                            <label for="state" class="form-label">State</label>
-                            <input class="form-control" type="text" id="state" name="state" placeholder="California"/>
+                            <label for="state" class="form-label"><?= lang("App.profile_state") ?></label>
+                            <input
+                                    class="form-control"
+                                    type="text"
+                                    id="state"
+                                    name="state"
+                                    placeholder="<?= lang("App.profile_state_ph") ?>"
+                                    value="<?= (isset($obj)) ? $obj->state : set_value('state'); ?>"
+                            />
                         </div>
                         <div class="mb-3 col-md-6">
-                            <label for="zipCode" class="form-label">Zip Code</label>
+                            <label for="city" class="form-label"><?= lang("App.profile_city") ?></label>
                             <input
                                     type="text"
                                     class="form-control"
-                                    id="zipCode"
-                                    name="zipCode"
-                                    placeholder="231465"
-                                    maxlength="6"
+                                    id="city"
+                                    name="city"
+                                    placeholder="<?= lang("App.profile_city_ph") ?>"
+                                    value="<?= (isset($obj)) ? $obj->city : set_value('city'); ?>"
                             />
                         </div>
                         <div class="mb-3 col-md-6">
@@ -157,44 +165,10 @@
                                 <option value="pt" <?= $id_select == "pt" ? 'selected' : '' ?>><?= lang("App.lang_pt") ?></option>
                             </select>
                         </div>
-                        <div class="mb-3 col-md-6">
-                            <label for="timeZones" class="form-label">Timezone</label>
-                            <select id="timeZones" class="select2 form-select">
-                                <option value="">Select Timezone</option>
-                                <option value="-12">(GMT-12:00) International Date Line West</option>
-                                <option value="-11">(GMT-11:00) Midway Island, Samoa</option>
-                                <option value="-10">(GMT-10:00) Hawaii</option>
-                                <option value="-9">(GMT-09:00) Alaska</option>
-                                <option value="-8">(GMT-08:00) Pacific Time (US & Canada)</option>
-                                <option value="-8">(GMT-08:00) Tijuana, Baja California</option>
-                                <option value="-7">(GMT-07:00) Arizona</option>
-                                <option value="-7">(GMT-07:00) Chihuahua, La Paz, Mazatlan</option>
-                                <option value="-7">(GMT-07:00) Mountain Time (US & Canada)</option>
-                                <option value="-6">(GMT-06:00) Central America</option>
-                                <option value="-6">(GMT-06:00) Central Time (US & Canada)</option>
-                                <option value="-6">(GMT-06:00) Guadalajara, Mexico City, Monterrey</option>
-                                <option value="-6">(GMT-06:00) Saskatchewan</option>
-                                <option value="-5">(GMT-05:00) Bogota, Lima, Quito, Rio Branco</option>
-                                <option value="-5">(GMT-05:00) Eastern Time (US & Canada)</option>
-                                <option value="-5">(GMT-05:00) Indiana (East)</option>
-                                <option value="-4">(GMT-04:00) Atlantic Time (Canada)</option>
-                                <option value="-4">(GMT-04:00) Caracas, La Paz</option>
-                            </select>
-                        </div>
-                        <div class="mb-3 col-md-6">
-                            <label for="currency" class="form-label">Currency</label>
-                            <select id="currency" class="select2 form-select">
-                                <option value="">Select Currency</option>
-                                <option value="usd">USD</option>
-                                <option value="euro">Euro</option>
-                                <option value="pound">Pound</option>
-                                <option value="bitcoin">Bitcoin</option>
-                            </select>
-                        </div>
                     </div>
                     <div class="mt-2">
-                        <button type="submit" class="btn btn-primary me-2">Save changes</button>
-                        <button type="reset" class="btn btn-label-secondary">Cancel</button>
+                        <button type="submit" class="btn btn-primary me-2"><?= $btn_submit['title'] ?? '' ?></button>
+                        <button type="reset" class="btn btn-label-secondary"><?= $btn_return['title'] ?? '' ?></button>
                     </div>
                 </form>
             </div>
@@ -231,271 +205,7 @@
     </div>
 
 
-    <div class="row page-titles mx-0">
-        <div class="col-sm-6 p-md-0">
-            <div class="welcome-text">
-                <h4><i class="<?= $title['icon'] ?? '' ?>"></i> <?= $title['module'] ?? '' ?></h4>
-                <span class="ml-1"><?= $title['page'] ?? '' ?></span>
-            </div>
-        </div>
-        <div class="col-sm-6 p-md-0 justify-content-sm-end mt-2 mt-sm-0 d-flex">
-            <ol class="breadcrumb">
-                <?php foreach ($breadcrumb ?? [] as $item) : ?>
-                    <?php if (!$item['active']) : ?>
-                        <li class="breadcrumb-item"><a
-                                    href="<?= site_url($item['route']) ?>"><?= $item['title'] ?></a></li>
-                    <?php else : ?>
-                        <li class="breadcrumb-item active"><?= $item['title'] ?></li>
-                    <?php endif; ?>
-                <?php endforeach; ?>
-            </ol>
-        </div>
-    </div>
-    <div class="row">
-        <div class="col-lg-8">
-            <div class="card">
-                <div class="card-header">
-                    <h4 class="card-title"><?= $title['page'] ?? '' ?></h4>
-                </div>
-                <div class="card-body">
-                    <?= formAlert() ?>
-                    <form class="form" action="<?= site_url("profile/store") ?>" method="post">
-                        <?= csrf_field() ?>
-                        <div class="form-body">
-                            <div class="row">
-                                <div class="col-lg-12">
-                                    <label class="text-primary"><?= lang("App.profile_msg_desc_1") ?></label>
-                                </div>
-                                <div class="col-lg-6">
-                                    <div class="form-group">
-                                        <label class="text-dark"><?= lang("App.profile_first_name") ?></label>
-                                        <input type="text" id="first_name" name="first_name" class="form-control"
-                                               placeholder="<?= lang("App.profile_first_name_ph") ?>"
-                                               value="<?= (isset($obj)) ? $obj->first_name : set_value('first_name'); ?>">
-                                    </div>
-                                </div>
-                                <div class="col-lg-6">
-                                    <div class="form-group">
-                                        <label class="text-dark"><?= lang("App.profile_last_name") ?></label>
-                                        <input type="text" id="last_name" name="last_name" class="form-control"
-                                               placeholder="<?= lang("App.profile_last_name_ph") ?>"
-                                               value="<?= (isset($obj)) ? $obj->last_name : set_value('last_name'); ?>">
-                                    </div>
-                                </div>
-                                <div class="col-lg-4">
-                                    <div class="form-group">
-                                        <label class="text-dark"><?= lang("App.profile_date_birth") ?></label>
-                                        <input type="text" class="form-control"
-                                               placeholder="<?= lang("App.profile_date_birth_ph") ?>"
-                                               id="date_birth" name="date_birth"
-                                               value="<?= (isset($obj)) ? $obj->date_birth : set_value('date_birth'); ?>">
-                                    </div>
-                                </div>
-                                <div class="col-lg-8">
-                                    <div class="form-group">
-                                        <label class="text-dark"><?= lang("App.profile_email") ?></label>
-                                        <input type="text" id="email" name="email" class="form-control"
-                                               placeholder="<?= lang("App.profile_email_ph") ?>"
-                                               value="<?= (isset($obj)) ? $obj->email : set_value('email'); ?>"
-                                               disabled>
-                                    </div>
-                                </div>
-                                <div class="col-lg-4">
-                                    <div class="form-group">
-                                        <label for="mobile"
-                                               class="text-dark"><?= lang("App.profile_mobile") ?></label>
-                                        <input type="text" id="mobile" name="mobile" class="form-control"
-                                               placeholder="<?= lang("App.profile_mobile_ph") ?>"
-                                               value="<?= (isset($obj)) ? $obj->mobile : set_value('mobile'); ?>">
-                                    </div>
-                                </div>
-                                <div class="col-lg-4">
-                                    <div class="form-group">
-                                        <label for="password"
-                                               class="text-dark"><?= lang("App.profile_password") ?></label>
-                                        <input type="password" id="password" name="password" class="form-control"
-                                               placeholder="<?= lang("App.profile_password_ph") ?>">
-                                    </div>
-                                </div>
-                                <div class="col-lg-4">
-                                    <div class="form-group">
-                                        <label for="confirm_password"
-                                               class="text-dark"><?= lang("App.profile_confirm_password") ?></label>
-                                        <input type="password" id="confirm_password" name="confirm_password"
-                                               class="form-control"
-                                               placeholder="<?= lang("App.profile_confirm_password_ph") ?>">
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="row">
-                                <div class="col-lg-12">
-                                    <label class="text-primary"><?= lang("App.profile_msg_desc_2") ?></label>
-                                </div>
-                                <div class="col-lg-8">
-                                    <div class="form-group">
-                                        <label class="text-dark"><?= lang("App.profile_address") ?></label>
-                                        <input type="text" id="address" name="address" class="form-control"
-                                               placeholder="<?= lang("App.profile_address_ph") ?>"
-                                               value="<?= (isset($obj)) ? $obj->address : set_value('address'); ?>">
-                                    </div>
-                                </div>
-                                <div class="col-lg-4">
-                                    <div class="form-group">
-                                        <label for="city" class="text-dark"><?= lang("App.profile_city") ?></label>
-                                        <input type="text" id="city" name="city" class="form-control"
-                                               placeholder="<?= lang("App.profile_city_ph") ?>"
-                                               value="<?= (isset($obj)) ? $obj->city : set_value('city'); ?>">
-                                    </div>
-                                </div>
-                                <div class="col-lg-4">
-                                    <div class="form-group">
-                                        <label for="state"
-                                               class="text-dark"><?= lang("App.profile_state") ?></label>
-                                        <input type="text" id="state" name="state" class="form-control"
-                                               placeholder="<?= lang("App.profile_state_ph") ?>"
-                                               value="<?= (isset($obj)) ? $obj->state : set_value('state'); ?>">
-                                    </div>
-                                </div>
-                                <div class="col-lg-4">
-                                    <div class="form-group">
-                                        <label for="country"
-                                               class="text-dark"><?= lang("App.profile_country") ?></label>
-                                        <?php $id_select = (isset($obj)) ? $obj->country ?? [] : set_value('country'); ?>
-                                        <select name="country" id="country" class="form-control">
-                                            <option value=""><?= lang("App.global_select") ?></option>
-                                            <?php foreach ($country ?? [] as $item) : ?>
-                                                <option value="<?= $item['code'] ?? '' ?>" <?= $id_select == $item['code'] ? 'selected' : '' ?>><?= $item['name'] ?? '' ?></option>
-                                            <?php endforeach; ?>
-                                        </select>
-                                    </div>
-                                </div>
-                                <div class="col-lg-4">
-                                    <div class="form-group">
-                                        <label for="language"
-                                               class="text-dark"><?= lang("App.profile_language") ?></label>
-                                        <?php $id_select = (isset($obj)) ? $obj->language ?? [] : set_value('language'); ?>
-                                        <select name="language" id="language" class="form-control">
-                                            <option value=""><?= lang("App.global_select") ?></option>
-                                            <option value="en" <?= $id_select == "en" ? 'selected' : '' ?>><?= lang("App.lang_en") ?></option>
-                                            <option value="es" <?= $id_select == "es" ? 'selected' : '' ?>><?= lang("App.lang_es") ?></option>
-                                            <option value="pt" <?= $id_select == "pt" ? 'selected' : '' ?>><?= lang("App.lang_pt") ?></option>
-                                        </select>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="form-actions">
-                            <a href="<?= site_url($btn_return['route'] ?? '#') ?>"
-                               class="<?= $btn_return['class'] ?? '' ?>">
-                                <i class="<?= $btn_return['icon'] ?? '' ?>"></i> <?= $btn_return['title'] ?? '' ?>
-                            </a>
-                            <button type="submit" class="<?= $btn_submit['class'] ?? '' ?>">
-                                <i class="<?= $btn_submit['icon'] ?? '' ?>"></i> <?= $btn_submit['title'] ?? '' ?>
-                            </button>
-                        </div>
-                    </form>
-                </div>
-            </div>
-        </div>
-        <div class="col-lg-4">
-            <div class="card">
-                <div class="card-header">
-                    <h4 class="card-title"><?= lang("App.profile_subtitle_image") ?></h4>
-                </div>
-                <div class="card-body">
-                    <div class="row">
-                        <div class="col-lg-12 justify-content-center d-flex">
-                            <img src="<?= $obj->picture ?? '' ?>" class="btn-circle btn-circle-md">
-                        </div>
-                        <div class="col-lg-12 text-center mt-3">
-                            <span><b><?= $obj->first_name ?? '' ?></b></span><br>
-                            <span><?= $obj->email ?? '' ?></span>
-                        </div>
-                        <div class="col-lg-12 mt-3">
-                            <button type="button" class="btn btn-primary btn-block" data-toggle="modal"
-                                    data-target="#photoModalCenter"><i
-                                        class="fas fa-camera"></i> <?= lang("App.profile_change_photo") ?></button>
-                        </div>
-                        <!-- Modal -->
-                        <div class="modal fade" id="photoModalCenter">
-                            <div class="modal-dialog modal-dialog-centered" role="document">
-                                <div class="modal-content">
-                                    <div class="modal-body">
-                                        <div class="row">
-                                            <div class="col-lg-12 mb-2">
-                                                <h5><?= lang("App.profile_change_image") ?></h5>
-                                            </div>
-                                            <div class="col-lg-3 mt-2">
-                                                <div class="row">
-                                                    <div class="col-lg-12 justify-content-center d-flex">
-                                                        <form name="form_upload" class="form"
-                                                              action="<?= site_url("profile") ?>"
-                                                              enctype="multipart/form-data" method="post">
-                                                            <?= csrf_field() ?>
-                                                            <input type="file" name="file" id="file"
-                                                                   class="input_hidden"
-                                                                   onchange="form_upload.submit()" accept="image/*">
-                                                            <div class="btn btn-light btn-circle btn-circle-md"><a
-                                                                        href="#" class="file-upload"><i
-                                                                            class="fas fa-cloud-upload-alt fa-2xl"></i></a>
-                                                            </div>
-                                                        </form>
-                                                    </div>
-                                                    <div class="col-lg-12 text-center mt-1">
-                                                        <b><i class="fas fa-upload"></i> <?= strtoupper(lang("App.profile_upload_msg")) ?>
-                                                        </b>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                            <div class="col-lg-3 mt-2">
-                                                <div class="row">
-                                                    <div class="col-lg-12 justify-content-center d-flex">
-                                                        <form name="form_not" action="<?= site_url("profile") ?>"
-                                                              method="post">
-                                                            <?= csrf_field() ?>
-                                                            <input type="hidden" id="image_not" name="image_not"
-                                                                   value="<?= site_url("assets/img/default-user.png") ?>">
-                                                            <a href="javascript:form_not.submit()"><img
-                                                                        src="<?= site_url("assets/img/default-user.png") ?>"
-                                                                        class="btn-circle btn-circle-md"></a>
-                                                        </form>
-                                                    </div>
-                                                    <div class="col-lg-12 text-center mt-1">
-                                                        <b><i class="fas fa-user-slash"></i> <?= strtoupper(lang("App.profile_no_image_msg")) ?>
-                                                        </b>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                            <div class="col-lg-3 mt-2">
-                                                <div class="row">
-                                                    <div class="col-lg-12 justify-content-center d-flex">
-                                                        <form name="form_gravatar"
-                                                              action="<?= site_url("profile") ?>" method="post">
-                                                            <?= csrf_field() ?>
-                                                            <input type="hidden" id="image_gravatar"
-                                                                   name="image_gravatar"
-                                                                   value="https://s.gravatar.com/avatar/<?= MD5($obj->email ?? '') ?>?s=150">
-                                                            <a href="javascript:form_gravatar.submit()"><img
-                                                                        src="https://s.gravatar.com/avatar/<?= MD5($obj->email ?? '') ?>?s=150"
-                                                                        class="btn-circle btn-circle-md"></a>
-                                                        </form>
-                                                    </div>
-                                                    <div class="col-lg-12 text-center mt-1">
-                                                        <b><i class="fas fa-user-circle"></i> <?= strtoupper(lang("App.profile_gravatar_msg")) ?>
-                                                        </b>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
+
     <?php $settings = session()->get('settings'); ?>
 
     <?php if ($settings['two_factor_auth']) : ?>
@@ -579,27 +289,12 @@
 
 <?= $this->endSection() ?>
 
-<!-- Required vendors -->
-<script src="<?= site_url("themes/focus2/vendor/global/global.min.js") ?>">></script>
-<script src="<?= site_url("themes/focus2/js/quixnav-init.js") ?>">></script>
-<script src="<?= site_url("themes/focus2/js/custom.min.js") ?>">></script>
-<script src="<?= site_url("themes/focus2/vendor/select2/js/select2.full.min.js") ?>">></script>
-<!-- Alert -->
-<script src="<?= site_url("themes/focus2/vendor/sweetalert2/dist/sweetalert2.min.js") ?>">></script>
-<script src="<?= site_url("themes/focus2/vendor/toastr/js/toastr.min.js") ?>">></script>
-<!-- Date Range Picker -->
-<!-- momment js is must -->
-<script src="<?= site_url("themes/focus2/vendor/moment/moment.min.js") ?>">></script>
-<script src="<?= site_url("themes/focus2/vendor/bootstrap-daterangepicker/daterangepicker.js") ?>">></script>
-<!-- Material color picker -->
-<script src="<?= site_url("themes/focus2/vendor/bootstrap-material-datetimepicker/js/bootstrap-material-datetimepicker.js") ?>">></script>
-<!-- Form -->
-<script>
+
+
+<?= $this->section('additionalInlineJs') ?>
     "use strict";
     $(document).ready(function () {
         $('#first_name').focus();
-        $("#country").select2();
-        $("#language").select2();
         $('#date_birth').bootstrapMaterialDatePicker({
             format: '<?=momentDateJS()?>',
             time: false
@@ -610,6 +305,7 @@
         $('#file').trigger('click');
     });
 
+    <?php if ($settings['two_factor_auth']) : ?>
     function download(text, filename) {
         let blob = new Blob([text], {type: "text/plain;charset=utf-8"});
         let url = window.URL.createObjectURL(blob);
@@ -622,5 +318,6 @@
     function tfaView() {
         document.getElementById("sendFormTFA").submit();
     }
-</script>
-<?= sweetAlert() ?>
+    <?php endif; ?>
+
+<?= $this->endSection() ?>