diff --git a/app/FileManagerFile.php b/app/FileManagerFile.php
index 5067ccc5..b6d29e56 100644
--- a/app/FileManagerFile.php
+++ b/app/FileManagerFile.php
@@ -102,7 +102,7 @@ class FileManagerFile extends Model
      */
     public function getCreatedAtAttribute()
     {
-        return format_date(set_time_by_user_timezone($this->attributes['created_at']), __('vuefilemanager.time'));
+        return format_date(set_time_by_user_timezone($this->attributes['created_at']), __t('time'));
     }
 
     /**
@@ -114,7 +114,7 @@ class FileManagerFile extends Model
     {
         if (!$this->attributes['deleted_at']) return null;
 
-        return format_date(set_time_by_user_timezone($this->attributes['deleted_at']), __('vuefilemanager.time'));
+        return format_date(set_time_by_user_timezone($this->attributes['deleted_at']), __t('time'));
     }
 
     /**
diff --git a/app/FileManagerFolder.php b/app/FileManagerFolder.php
index 7d8b1593..910977e3 100644
--- a/app/FileManagerFolder.php
+++ b/app/FileManagerFolder.php
@@ -137,7 +137,7 @@ class FileManagerFolder extends Model
      */
     public function getCreatedAtAttribute()
     {
-        return format_date(set_time_by_user_timezone($this->attributes['created_at']), __('vuefilemanager.time'));
+        return format_date(set_time_by_user_timezone($this->attributes['created_at']), __t('time'));
     }
 
     /**
@@ -149,7 +149,7 @@ class FileManagerFolder extends Model
     {
         if (! $this->attributes['deleted_at']) return null;
 
-        return format_date(set_time_by_user_timezone($this->attributes['deleted_at']), __('vuefilemanager.time'));
+        return format_date(set_time_by_user_timezone($this->attributes['deleted_at']), __t('time'));
     }
 
     /**
diff --git a/app/Http/Controllers/AppFunctionsController.php b/app/Http/Controllers/AppFunctionsController.php
index ea8309c8..88326132 100644
--- a/app/Http/Controllers/AppFunctionsController.php
+++ b/app/Http/Controllers/AppFunctionsController.php
@@ -13,7 +13,7 @@ use App\FileManagerFile;
 use App\Http\Tools\Demo;
 use App\FileManagerFolder;
 use Illuminate\Http\Request;
-use App\Mail\SendSupportForm;
+use App\Http\Mail\SendSupportForm;
 use App\Http\Resources\PageResource;
 use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Facades\Cache;
diff --git a/app/Http/Controllers/Auth/AuthController.php b/app/Http/Controllers/Auth/AuthController.php
index 240c630c..84c7ffa6 100644
--- a/app/Http/Controllers/Auth/AuthController.php
+++ b/app/Http/Controllers/Auth/AuthController.php
@@ -33,7 +33,7 @@ class AuthController extends Controller
         ];
 
         // Abort with 404, user not found
-        return abort('404', __('vuefilemanager.user_not_fount'));
+        return abort('404', __t('user_not_fount'));
     }
 
     /**
diff --git a/app/Http/Controllers/FileBrowser/BrowseController.php b/app/Http/Controllers/FileBrowser/BrowseController.php
index 808b811b..1e6c3412 100644
--- a/app/Http/Controllers/FileBrowser/BrowseController.php
+++ b/app/Http/Controllers/FileBrowser/BrowseController.php
@@ -188,7 +188,7 @@ class BrowseController extends Controller
         return [
             [
                 'unique_id' => 0,
-                'name'      => __('vuefilemanager.home'),
+                'name'      => __t('home'),
                 'location'  => 'base',
                 'folders'  => $folders,
             ]
diff --git a/app/Http/Controllers/Sharing/FileSharingController.php b/app/Http/Controllers/Sharing/FileSharingController.php
index 1c6140f1..093bcff0 100644
--- a/app/Http/Controllers/Sharing/FileSharingController.php
+++ b/app/Http/Controllers/Sharing/FileSharingController.php
@@ -117,7 +117,7 @@ class FileSharingController extends Controller
         // Check password
         if (!Hash::check($request->password, $shared->password)) {
 
-            abort(401, __('vuefilemanager.incorrect_password'));
+            abort(401, __t('incorrect_password'));
         }
 
         // Get owner of shared content
@@ -258,7 +258,7 @@ class FileSharingController extends Controller
         return [
             [
                 'unique_id' => $shared->item_id,
-                'name'      => __('vuefilemanager.home'),
+                'name'      => __t('home'),
                 'location'  => 'public',
                 'folders'   => $folders,
             ]
@@ -289,7 +289,7 @@ class FileSharingController extends Controller
         return [
             [
                 'unique_id' => $shared->item_id,
-                'name'      => __('vuefilemanager.home'),
+                'name'      => __t('home'),
                 'location'  => 'public',
                 'folders'   => $folders,
             ]
diff --git a/app/Http/Mail/SendSupportForm.php b/app/Http/Mail/SendSupportForm.php
index 889f8a9b..74d593a3 100644
--- a/app/Http/Mail/SendSupportForm.php
+++ b/app/Http/Mail/SendSupportForm.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Mail;
+namespace App\Http\Mail;
 
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
diff --git a/app/Notifications/ResetPassword.php b/app/Notifications/ResetPassword.php
index b7d63541..8225c344 100644
--- a/app/Notifications/ResetPassword.php
+++ b/app/Notifications/ResetPassword.php
@@ -44,12 +44,12 @@ class ResetPassword extends Notification
         $app_name = get_setting('app_title') ?? 'VueFileManager';
 
         return (new MailMessage)
-            ->subject(__('vuefilemanager.reset_password_subject') .  $app_name)
-            ->greeting(__('vuefilemanager.reset_password_greeting'))
-            ->line(__('vuefilemanager.reset_password_line_1'))
-            ->action(__('vuefilemanager.reset_password_action'), $reset_url)
-            ->line(__('vuefilemanager.reset_password_line_2'))
-            ->salutation(__('vuefilemanager.salutation') . ', ' .  $app_name);
+            ->subject(__t('reset_password_subject') .  $app_name)
+            ->greeting(__t('reset_password_greeting'))
+            ->line(__t('reset_password_line_1'))
+            ->action(__t('reset_password_action'), $reset_url)
+            ->line(__t('reset_password_line_2'))
+            ->salutation(__t('salutation') . ', ' .  $app_name);
     }
 
     /**
diff --git a/app/Notifications/SharedSendViaEmail.php b/app/Notifications/SharedSendViaEmail.php
index cc1f9057..01e6008e 100644
--- a/app/Notifications/SharedSendViaEmail.php
+++ b/app/Notifications/SharedSendViaEmail.php
@@ -43,11 +43,11 @@ class SharedSendViaEmail extends Notification
     public function toMail($notifiable)
     {
         return (new MailMessage)
-            ->subject(__('vuefilemanager.shared_link_email_subject' , ['user' => $this->user->name]))
-            ->greeting(__('vuefilemanager.shared_link_email_greeting'))
-            ->line(__('vuefilemanager.shared_link_email_user', ['user' => $this->user->name, 'email' => $this->user->email]))
-            ->action(__('vuefilemanager.shared_link_email_link'), url('/shared', ['token' => $this->token]))
-            ->salutation(__('vuefilemanager.shared_link_email_salutation', ['app_name' => get_setting('app_title') ?? 'VueFileManager']));
+            ->subject(__t('shared_link_email_subject' , ['user' => $this->user->name]))
+            ->greeting(__t('shared_link_email_greeting'))
+            ->line(__t('shared_link_email_user', ['user' => $this->user->name, 'email' => $this->user->email]))
+            ->action(__t('shared_link_email_link'), url('/shared', ['token' => $this->token]))
+            ->salutation(__t('shared_link_email_salutation', ['app_name' => get_setting('app_title') ?? 'VueFileManager']));
     }
 
     /**
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 4a017330..ca919e8a 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -76,80 +76,35 @@
     "/chunks/user-storage.js": "/chunks/user-storage.js?id=5cfec8a8f8a8aef24ef2",
     "/chunks/user-subscription.js": "/chunks/user-subscription.js?id=10b3a108059d62d206c8",
     "/chunks/users.js": "/chunks/users.js?id=6e68cb068f69fba3199c",
-    "/chunks/app-language.2205bcc7f6ee689b9840.hot-update.js": "/chunks/app-language.2205bcc7f6ee689b9840.hot-update.js",
-    "/chunks/app-language.3f0bbb740122da0b673d.hot-update.js": "/chunks/app-language.3f0bbb740122da0b673d.hot-update.js",
-    "/chunks/app-language.57cfd1cb030a9f25601f.hot-update.js": "/chunks/app-language.57cfd1cb030a9f25601f.hot-update.js",
-    "/chunks/app-language.5ec497e5a9e02a176d12.hot-update.js": "/chunks/app-language.5ec497e5a9e02a176d12.hot-update.js",
-    "/chunks/app-language.f8943079f90af63054ce.hot-update.js": "/chunks/app-language.f8943079f90af63054ce.hot-update.js",
-    "/chunks/app-language.54afc673ab0932ef0e92.hot-update.js": "/chunks/app-language.54afc673ab0932ef0e92.hot-update.js",
-    "/chunks/app-language.f2aee30a97259f4a0506.hot-update.js": "/chunks/app-language.f2aee30a97259f4a0506.hot-update.js",
-    "/chunks/app-language.3cf39565af4e39a56266.hot-update.js": "/chunks/app-language.3cf39565af4e39a56266.hot-update.js",
-    "/chunks/app-language.f6f0a1f32980c917c44d.hot-update.js": "/chunks/app-language.f6f0a1f32980c917c44d.hot-update.js",
-    "/chunks/app-language.76e2368b6bd6fcd4b628.hot-update.js": "/chunks/app-language.76e2368b6bd6fcd4b628.hot-update.js",
-    "/chunks/app-language.3bc16cb03f9d669326b0.hot-update.js": "/chunks/app-language.3bc16cb03f9d669326b0.hot-update.js",
-    "/chunks/app-language.91a502fb0ba11520c582.hot-update.js": "/chunks/app-language.91a502fb0ba11520c582.hot-update.js",
-    "/chunks/app-language.4f4514565e5a3f37ad30.hot-update.js": "/chunks/app-language.4f4514565e5a3f37ad30.hot-update.js",
-    "/chunks/app-language.80068c2f265991830577.hot-update.js": "/chunks/app-language.80068c2f265991830577.hot-update.js",
-    "/chunks/app-language.22fd0622fc469111d7a2.hot-update.js": "/chunks/app-language.22fd0622fc469111d7a2.hot-update.js",
-    "/chunks/app-language.c169bd9688d83d0347f6.hot-update.js": "/chunks/app-language.c169bd9688d83d0347f6.hot-update.js",
-    "/chunks/app-language.b6f1dc94a36730e0b912.hot-update.js": "/chunks/app-language.b6f1dc94a36730e0b912.hot-update.js",
-    "/chunks/app-language.9e8710d0c67f398fbddc.hot-update.js": "/chunks/app-language.9e8710d0c67f398fbddc.hot-update.js",
-    "/chunks/app-language.4a2de5a04857f498d0c6.hot-update.js": "/chunks/app-language.4a2de5a04857f498d0c6.hot-update.js",
-    "/chunks/app-language.c3b396f18ee1e031755c.hot-update.js": "/chunks/app-language.c3b396f18ee1e031755c.hot-update.js",
-    "/chunks/app-language.ad8c7fe2060e365fff76.hot-update.js": "/chunks/app-language.ad8c7fe2060e365fff76.hot-update.js",
-    "/chunks/app-language.181b02cb039f8d8d680f.hot-update.js": "/chunks/app-language.181b02cb039f8d8d680f.hot-update.js",
-    "/chunks/app-language.fba250e9bda529813adb.hot-update.js": "/chunks/app-language.fba250e9bda529813adb.hot-update.js",
-    "/chunks/app-language.a6f8cfd33d82fc47b3a7.hot-update.js": "/chunks/app-language.a6f8cfd33d82fc47b3a7.hot-update.js",
-    "/chunks/app-language.6b7982a0e72461bbec69.hot-update.js": "/chunks/app-language.6b7982a0e72461bbec69.hot-update.js",
-    "/chunks/app-language.0f3e7cf3cf62de3e2f52.hot-update.js": "/chunks/app-language.0f3e7cf3cf62de3e2f52.hot-update.js",
-    "/chunks/app-language.b11bd599191a17ae914b.hot-update.js": "/chunks/app-language.b11bd599191a17ae914b.hot-update.js",
-    "/chunks/app-language.6d406fa3ed031fe4493e.hot-update.js": "/chunks/app-language.6d406fa3ed031fe4493e.hot-update.js",
-    "/chunks/app-language.6d0ad77a16d2689d8f69.hot-update.js": "/chunks/app-language.6d0ad77a16d2689d8f69.hot-update.js",
-    "/chunks/app-language.cda3d4412d5bce7cb1e5.hot-update.js": "/chunks/app-language.cda3d4412d5bce7cb1e5.hot-update.js",
-    "/chunks/app-language.f9514b62a434452ba4c8.hot-update.js": "/chunks/app-language.f9514b62a434452ba4c8.hot-update.js",
-    "/chunks/sign-up.652484c0dcbfc2f368b7.hot-update.js": "/chunks/sign-up.652484c0dcbfc2f368b7.hot-update.js",
-    "/chunks/sign-up.7238adafa42f256413f9.hot-update.js": "/chunks/sign-up.7238adafa42f256413f9.hot-update.js",
-    "/chunks/sign-up.49de17fd0e78616c7ad3.hot-update.js": "/chunks/sign-up.49de17fd0e78616c7ad3.hot-update.js",
-    "/chunks/user-create.107013b2d9852057ca6a.hot-update.js": "/chunks/user-create.107013b2d9852057ca6a.hot-update.js",
-    "/chunks/user-create.af162ad0a8d392cc6102.hot-update.js": "/chunks/user-create.af162ad0a8d392cc6102.hot-update.js",
-    "/chunks/user-detail.afc26c1eb03c0e6c2b37.hot-update.js": "/chunks/user-detail.afc26c1eb03c0e6c2b37.hot-update.js",
-    "/chunks/sign-up.5aeaffe0d584befaeba0.hot-update.js": "/chunks/sign-up.5aeaffe0d584befaeba0.hot-update.js",
-    "/chunks/profile.473c0ccfa89be296918c.hot-update.js": "/chunks/profile.473c0ccfa89be296918c.hot-update.js",
-    "/chunks/create-new-password.1ff6a77b4a7dd20b59e5.hot-update.js": "/chunks/create-new-password.1ff6a77b4a7dd20b59e5.hot-update.js",
-    "/chunks/user-create.c1aa3883b16d5110491e.hot-update.js": "/chunks/user-create.c1aa3883b16d5110491e.hot-update.js",
-    "/chunks/sign-up.af86da0f4c0bed397ea1.hot-update.js": "/chunks/sign-up.af86da0f4c0bed397ea1.hot-update.js",
-    "/chunks/sign-in.dcf8598e640acdbef02e.hot-update.js": "/chunks/sign-in.dcf8598e640acdbef02e.hot-update.js",
-    "/chunks/forgotten-password.6c5c9b747a5409c94ff3.hot-update.js": "/chunks/forgotten-password.6c5c9b747a5409c94ff3.hot-update.js",
-    "/chunks/create-new-password.76929662b5bf96dd6c05.hot-update.js": "/chunks/create-new-password.76929662b5bf96dd6c05.hot-update.js",
-    "/chunks/user-create.f31bc5fc0d846f4174bc.hot-update.js": "/chunks/user-create.f31bc5fc0d846f4174bc.hot-update.js",
-    "/chunks/user-detail.2d6f82d9b4ea01330cf2.hot-update.js": "/chunks/user-detail.2d6f82d9b4ea01330cf2.hot-update.js",
-    "/chunks/sign-up.36388d71c581430cfcbf.hot-update.js": "/chunks/sign-up.36388d71c581430cfcbf.hot-update.js",
-    "/chunks/profile.2113c6bf0a753609e311.hot-update.js": "/chunks/profile.2113c6bf0a753609e311.hot-update.js",
-    "/chunks/sign-in.45800c22490d5e34b2d1.hot-update.js": "/chunks/sign-in.45800c22490d5e34b2d1.hot-update.js",
-    "/chunks/shared-page.068fd94c60e7498f916d.hot-update.js": "/chunks/shared-page.068fd94c60e7498f916d.hot-update.js",
-    "/chunks/app-language.06d0786ce0d5c89e1c67.hot-update.js": "/chunks/app-language.06d0786ce0d5c89e1c67.hot-update.js",
-    "/chunks/app-language.50084d3425306c5b53ca.hot-update.js": "/chunks/app-language.50084d3425306c5b53ca.hot-update.js",
-    "/chunks/app-language.c7c541a5afa81eef13fd.hot-update.js": "/chunks/app-language.c7c541a5afa81eef13fd.hot-update.js",
-    "/chunks/app-language.07d42f6154bddb307d4c.hot-update.js": "/chunks/app-language.07d42f6154bddb307d4c.hot-update.js",
-    "/chunks/app-language.e9dc6e486602bd6edbc2.hot-update.js": "/chunks/app-language.e9dc6e486602bd6edbc2.hot-update.js",
-    "/chunks/app-language.cdff6c952adaab4a9235.hot-update.js": "/chunks/app-language.cdff6c952adaab4a9235.hot-update.js",
-    "/chunks/app-language.46408825f1c8ec423335.hot-update.js": "/chunks/app-language.46408825f1c8ec423335.hot-update.js",
-    "/chunks/app-language.6c6c0c461b1c389c4b79.hot-update.js": "/chunks/app-language.6c6c0c461b1c389c4b79.hot-update.js",
-    "/chunks/app-language.3d6b65041812f1b857a5.hot-update.js": "/chunks/app-language.3d6b65041812f1b857a5.hot-update.js",
-    "/chunks/app-language.b3e44cfb1ed4e064260b.hot-update.js": "/chunks/app-language.b3e44cfb1ed4e064260b.hot-update.js",
-    "/chunks/app-language.48ee61555d1d541aa5fe.hot-update.js": "/chunks/app-language.48ee61555d1d541aa5fe.hot-update.js",
-    "/chunks/app-language.c95b4e370a4a99517aa7.hot-update.js": "/chunks/app-language.c95b4e370a4a99517aa7.hot-update.js",
-    "/chunks/app-language.6d3e3fa2ad4e91fb5e6a.hot-update.js": "/chunks/app-language.6d3e3fa2ad4e91fb5e6a.hot-update.js",
-    "/chunks/app-language.cedbb795171698a62c32.hot-update.js": "/chunks/app-language.cedbb795171698a62c32.hot-update.js",
-    "/chunks/app-language.35c7442e55abbad5fc9b.hot-update.js": "/chunks/app-language.35c7442e55abbad5fc9b.hot-update.js",
-    "/chunks/app-language.0b860a62ccb27c8092d7.hot-update.js": "/chunks/app-language.0b860a62ccb27c8092d7.hot-update.js",
-    "/chunks/app-language.b05a3da3f91372228cf3.hot-update.js": "/chunks/app-language.b05a3da3f91372228cf3.hot-update.js",
-    "/chunks/app-language.7f0ca7b7af97f1160ce7.hot-update.js": "/chunks/app-language.7f0ca7b7af97f1160ce7.hot-update.js",
-    "/chunks/app-language.45fcc4e5a62eefb00e83.hot-update.js": "/chunks/app-language.45fcc4e5a62eefb00e83.hot-update.js",
-    "/chunks/app-language.da2401d2a9dd5113e3c7.hot-update.js": "/chunks/app-language.da2401d2a9dd5113e3c7.hot-update.js",
-    "/chunks/app-language.d689d0ac3fdc1de9a820.hot-update.js": "/chunks/app-language.d689d0ac3fdc1de9a820.hot-update.js",
-    "/chunks/app-language.f83ba6a70c9be6cf565d.hot-update.js": "/chunks/app-language.f83ba6a70c9be6cf565d.hot-update.js",
-    "/chunks/app-language.c85708a51bfe8b11c687.hot-update.js": "/chunks/app-language.c85708a51bfe8b11c687.hot-update.js",
-    "/chunks/app-language.f5031115ac662c846871.hot-update.js": "/chunks/app-language.f5031115ac662c846871.hot-update.js",
-    "/js/main.c2b409e3f934234e6d50.hot-update.js": "/js/main.c2b409e3f934234e6d50.hot-update.js"
+    "/chunks/settings.74935263cd21d2747893.hot-update.js": "/chunks/settings.74935263cd21d2747893.hot-update.js",
+    "/chunks/settings.7b44513c2ce22d705669.hot-update.js": "/chunks/settings.7b44513c2ce22d705669.hot-update.js",
+    "/chunks/settings.814d255b22ea755d4d31.hot-update.js": "/chunks/settings.814d255b22ea755d4d31.hot-update.js",
+    "/chunks/settings.5d7f9d77a665162f3938.hot-update.js": "/chunks/settings.5d7f9d77a665162f3938.hot-update.js",
+    "/chunks/files.4a78e8886a71e8f5f71d.hot-update.js": "/chunks/files.4a78e8886a71e8f5f71d.hot-update.js",
+    "/chunks/files.f8679a576d6dc0d384c8.hot-update.js": "/chunks/files.f8679a576d6dc0d384c8.hot-update.js",
+    "/js/main.8e6b7029bddb9f943d8a.hot-update.js": "/js/main.8e6b7029bddb9f943d8a.hot-update.js",
+    "/js/main.749aa3d5a7d5f33172c5.hot-update.js": "/js/main.749aa3d5a7d5f33172c5.hot-update.js",
+    "/js/main.468eb76d3024538aa62f.hot-update.js": "/js/main.468eb76d3024538aa62f.hot-update.js",
+    "/js/main.3bbc8989f8cbf2e45dd2.hot-update.js": "/js/main.3bbc8989f8cbf2e45dd2.hot-update.js",
+    "/js/main.7bf558411a46c66e382f.hot-update.js": "/js/main.7bf558411a46c66e382f.hot-update.js",
+    "/js/main.a4d8d83c090ac5a100e0.hot-update.js": "/js/main.a4d8d83c090ac5a100e0.hot-update.js",
+    "/js/main.d9d2ba63d96f66aa91c5.hot-update.js": "/js/main.d9d2ba63d96f66aa91c5.hot-update.js",
+    "/js/main.e6a10caa29d8935ca590.hot-update.js": "/js/main.e6a10caa29d8935ca590.hot-update.js",
+    "/js/main.68ffc3ee30fdcb127fcf.hot-update.js": "/js/main.68ffc3ee30fdcb127fcf.hot-update.js",
+    "/js/main.27adec0b8d0aff416c6b.hot-update.js": "/js/main.27adec0b8d0aff416c6b.hot-update.js",
+    "/js/main.6e87450211904febb7d5.hot-update.js": "/js/main.6e87450211904febb7d5.hot-update.js",
+    "/js/main.707bbcfb4e7b3b3947b5.hot-update.js": "/js/main.707bbcfb4e7b3b3947b5.hot-update.js",
+    "/js/main.bb780a4b0316f848a691.hot-update.js": "/js/main.bb780a4b0316f848a691.hot-update.js",
+    "/js/main.9ad9bc4a317640f2e443.hot-update.js": "/js/main.9ad9bc4a317640f2e443.hot-update.js",
+    "/js/main.5c5624a1a012a39f9f6d.hot-update.js": "/js/main.5c5624a1a012a39f9f6d.hot-update.js",
+    "/js/main.2cc0672410535a5f4ab1.hot-update.js": "/js/main.2cc0672410535a5f4ab1.hot-update.js",
+    "/js/main.c25b8ad44838a7f1c663.hot-update.js": "/js/main.c25b8ad44838a7f1c663.hot-update.js",
+    "/js/main.c6dc25b8b83c0006be61.hot-update.js": "/js/main.c6dc25b8b83c0006be61.hot-update.js",
+    "/js/main.a40ffa66c8b1bf0fcb2e.hot-update.js": "/js/main.a40ffa66c8b1bf0fcb2e.hot-update.js",
+    "/js/main.6f3ca8cba0a20a29305b.hot-update.js": "/js/main.6f3ca8cba0a20a29305b.hot-update.js",
+    "/js/main.3ad6b4f926ad7c14bf58.hot-update.js": "/js/main.3ad6b4f926ad7c14bf58.hot-update.js",
+    "/js/main.71a46ee364ffdae08e66.hot-update.js": "/js/main.71a46ee364ffdae08e66.hot-update.js",
+    "/js/main.b2776fafe3353e1b9312.hot-update.js": "/js/main.b2776fafe3353e1b9312.hot-update.js",
+    "/js/main.bb6b2cd62ef18c316d51.hot-update.js": "/js/main.bb6b2cd62ef18c316d51.hot-update.js",
+    "/js/main.278597db134ff8c5ad83.hot-update.js": "/js/main.278597db134ff8c5ad83.hot-update.js"
 }
diff --git a/resources/js/helpers.js b/resources/js/helpers.js
index 31f2ff06..24d2e5d4 100644
--- a/resources/js/helpers.js
+++ b/resources/js/helpers.js
@@ -27,7 +27,7 @@ const Helpers = {
            
             return new Promise((resolve, reject) => {
                 let locale = language ? language : this.$store.getters.config.language
-                axios.get(`/api/language/${locale}`)
+                axios.get(`/language/${locale}`)
                     .then((response) => {
             
                         let lang = response.data.language_strings
diff --git a/resources/lang/en/vuefilemanager.php b/resources/lang/en/vuefilemanager.php
index 1efa8a32..d2894cb7 100644
--- a/resources/lang/en/vuefilemanager.php
+++ b/resources/lang/en/vuefilemanager.php
@@ -1,66 +1,66 @@
 <?php
 
-return [
-    'app_description'         => __t('app_description'),
-    'user_not_fount'          => __t('user_not_fount'),
-    'incorrect_password'      => __t('incorrect_password'),
-    'time'                    => __t('time'),
-    'home'                    => __t('home'),
+// return [
+    // 'app_description'         => __t('app_description'),
+    // 'user_not_fount'          => __t('user_not_fount'),
+    // 'incorrect_password'      => __t('incorrect_password'),
+    // 'time'                    => __t('time'),
+    // 'home'                    => __t('home'),
 
-    //Shared link email message
-    'shared_link_email_subject'     => __t('shared_link_email_subject'),
-    'shared_link_email_greeting'    => __t('shared_link_email_greeting'),
-    'shared_link_email_user'        => __t('shared_link_email_user'),
-    'shared_link_email_link'        => __t('shared_link_email_link'),
-    'shared_link_email_salutation'  => __t('shared_link_email_salutation'),
+    // //Shared link email message
+    // 'shared_link_email_subject'     => __t('shared_link_email_subject'),
+    // 'shared_link_email_greeting'    => __t('shared_link_email_greeting'),
+    // 'shared_link_email_user'        => __t('shared_link_email_user'),
+    // 'shared_link_email_link'        => __t('shared_link_email_link'),
+    // 'shared_link_email_salutation'  => __t('shared_link_email_salutation'),
 
-    // Reset password email
-    'reset_password_greeting' => __t('reset_password_greeting'),
-    'reset_password_subject'  => __t('reset_password_subject'),
-    'reset_password_line_1'   => __t('reset_password_line_1'),
-    'reset_password_line_2'   => __t('reset_password_line_2'),
-    'reset_password_action'   => __t('reset_password_action'),
+    // // Reset password email
+    // 'reset_password_greeting' => __t('reset_password_greeting'),
+    // 'reset_password_subject'  => __t('reset_password_subject'),
+    // 'reset_password_line_1'   => __t('reset_password_line_1'),
+    // 'reset_password_line_2'   => __t('reset_password_line_2'),
+    // 'reset_password_action'   => __t('reset_password_action'),
 
-    'salutation'   => __t('salutation'),
+    // 'salutation'   => __t('salutation'),
 
     // Invoice
-    'print_button' => __t('print_button'),
+    // 'print_button' => __t('print_button'),
 
-    'vat'          => __t('vat'),
-    'vat_included' => __t('vat_included'),
-    'subtotal'     => __t('subtotal'),
+    // 'vat'          => __t('vat'),
+    // 'vat_included' => __t('vat_included'),
+    // 'subtotal'     => __t('subtotal'),
 
-    'tax_exempted'        => __t('tax_exempted'),
-    'tax_be_paid_reverse' => __t('tax_be_paid_reverse'),
+    // 'tax_exempted'        => __t('tax_exempted'),
+    // 'tax_be_paid_reverse' => __t('tax_be_paid_reverse'),
 
-    'invoice_title'  => __t('invoice_title'),
-    'date'           => __t('date'),
-    'product'        => __t('product'),
-    'subscription'   => __t('subscription'),
-    'invoice_number' => __t('invoice_number'),
+    // 'invoice_title'  => __t('invoice_title'),
+    // 'date'           => __t('date'),
+    // 'product'        => __t('product'),
+    // 'subscription'   => __t('subscription'),
+    // 'invoice_number' => __t('invoice_number'),
 
-    'seller' => __t('seller'),
-    'client' => __t('client'),
+    // 'seller' => __t('seller'),
+    // 'client' => __t('client'),
 
-    'seller_vat'   => __t('seller_vat'),
-    'seller_name'  => __t('seller_name'),
-    'seller_phone' => __t('seller_phone'),
+    // 'seller_vat'   => __t('seller_vat'),
+    // 'seller_name'  => __t('seller_name'),
+    // 'seller_phone' => __t('seller_phone'),
 
-    'name'        => __t('name'),
-    'phone'       => __t('phone'),
-    'address'     => __t('address'),
-    'city'        => __t('city'),
-    'state'       => __t('state'),
-    'postal_code' => __t('postal_code'),
-    'country'     => __t('country'),
+    // 'name'        => __t('name'),
+    // 'phone'       => __t('phone'),
+    // 'address'     => __t('address'),
+    // 'city'        => __t('city'),
+    // 'state'       => __t('state'),
+    // 'postal_code' => __t('postal_code'),
+    // 'country'     => __t('country'),
 
-    'col_description' => __t('col_description'),
-    'col_date'        => __t('col_date'),
-    'col_amount'      => __t('col_amount'),
+    // 'col_description' => __t('col_description'),
+    // 'col_date'        => __t('col_date'),
+    // 'col_amount'      => __t('col_amount'),
 
-    'total' => __t('total'),
+    // 'total' => __t('total'),
 
     // OG Page
-    'user_sending' => __t('user_sending'),
-    'protected_file' => __t('protected_file'),
-];
\ No newline at end of file
+    // 'user_sending' => __t('user_sending'),
+    // 'protected_file' => __t('protected_file'),
+// ];
\ No newline at end of file
diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php
index 7a9c6ee7..e0754e03 100644
--- a/resources/views/index.blade.php
+++ b/resources/views/index.blade.php
@@ -4,17 +4,17 @@
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no">
-    <meta name="description" content="{{ isset($settings->app_description) && $settings->app_description ? $settings->app_description : __('vuefilemanager.app_description') }}">
+    <meta name="description" content="{{ isset($settings->app_description) && $settings->app_description ? $settings->app_description : __t('app_description') }}">
 
-    <title>{{ isset($settings->app_title) && $settings->app_title ? $settings->app_title : 'VueFileManager' }} | {{ isset($settings->app_description) && $settings->app_description ? $settings->app_description : __('vuefilemanager.app_description') }}</title>
+    <title>{{ isset($settings->app_title) && $settings->app_title ? $settings->app_title : 'VueFileManager' }} | {{ isset($settings->app_description) && $settings->app_description ? $settings->app_description : __t('app_description') }}</title>
 
     {{--StyleSheet--}}
     <link href="{{ asset('css/app.css') }}?v={{ get_version() }}" rel="stylesheet">
 
     {{--OG items--}}
     <meta property="og:url" content="{{ url('/') }}">
-    <meta property="og:title" content="{{ isset($settings->app_title) && $settings->app_title ? $settings->app_title : 'VueFileManager' }} | {{ isset($settings->app_description) && $settings->app_description ? $settings->app_description : __('vuefilemanager.app_description') }}">
-    <meta property="og:description" content="{{ isset($settings->app_description) && $settings->app_description ? $settings->app_description : __('vuefilemanager.app_description') }}">
+    <meta property="og:title" content="{{ isset($settings->app_title) && $settings->app_title ? $settings->app_title : 'VueFileManager' }} | {{ isset($settings->app_description) && $settings->app_description ? $settings->app_description : __t('app_description') }}">
+    <meta property="og:description" content="{{ isset($settings->app_description) && $settings->app_description ? $settings->app_description : __t('app_description') }}">
     <meta property="og:image" content="{{ asset('assets/images/vuefilemanager-og-image.jpg') }}">
 
     {{-- Apple Mobile Web App--}}
diff --git a/resources/views/og-view.blade.php b/resources/views/og-view.blade.php
index 62066b00..056211f2 100644
--- a/resources/views/og-view.blade.php
+++ b/resources/views/og-view.blade.php
@@ -7,16 +7,16 @@
     <meta name="fragment" content="!">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
-    <meta name="description" content="{{ __('vuefilemanager.user_sending', ['name' => $metadata['user']]) }}">
+    <meta name="description" content="{{ __t('user_sending', ['name' => $metadata['user']]) }}">
 
     {{--OG Public items--}}
     <meta property="og:url" content="{{ $metadata['url'] }}">
-    <meta property="og:description" content="{{ __('vuefilemanager.user_sending', ['name' => $metadata['user']]) }}">
+    <meta property="og:description" content="{{ __t('user_sending', ['name' => $metadata['user']]) }}">
 
     {{--Show protected og metadata--}}
     @if($metadata['is_protected'])
-        <meta property="og:title" content="{{ __('vuefilemanager.protected_file') }} | {{ isset($settings->app_title) && $settings->app_title ? $settings->app_title : 'VueFileManager' }}">
-        <title>{{ __('vuefilemanager.protected_file') }} | {{ isset($settings->app_title) && $settings->app_title ? $settings->app_title : 'VueFileManager' }}</title>
+        <meta property="og:title" content="{{ __t('protected_file') }} | {{ isset($settings->app_title) && $settings->app_title ? $settings->app_title : 'VueFileManager' }}">
+        <title>{{ __t('protected_file') }} | {{ isset($settings->app_title) && $settings->app_title ? $settings->app_title : 'VueFileManager' }}</title>
     @endif
 
     {{--Show public og metadata--}}
diff --git a/resources/views/vuefilemanager/invoice.blade.php b/resources/views/vuefilemanager/invoice.blade.php
index 526d6e2f..13a2e752 100644
--- a/resources/views/vuefilemanager/invoice.blade.php
+++ b/resources/views/vuefilemanager/invoice.blade.php
@@ -2,7 +2,7 @@
 <html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
 <head>
     <meta charset="utf-8">
-    <title>@lang('vuefilemanager.invoice_title')</title>
+    <title>{{ __t('invoice_title') }}</title>
 
     <link href="https://fonts.googleapis.com/css2?family=Nunito:wght@200;300;400;600;700;900&display=swap"
           rel="stylesheet">
@@ -28,7 +28,7 @@
             <path d="M6 18H4a2 2 0 0 1-2-2v-5a2 2 0 0 1 2-2h16a2 2 0 0 1 2 2v5a2 2 0 0 1-2 2h-2"></path>
             <rect x="6" y="14" width="12" height="8"></rect>
         </svg>
-        <span class="label">@lang('vuefilemanager.print_button')</span>
+        <span class="label">{{ __t('print_button') }}</span>
     </button>
 </div>
 <div id="invoice-wrapper">
@@ -42,28 +42,28 @@
             @endif
         </div>
         <div class="title">
-            <h1>@lang('vuefilemanager.invoice_title')</h1>
+            <h1>{{ __t('invoice_title') }}</h1>
         </div>
     </header>
     <section class="invoice-subject">
         <ul class="list">
             <li class="list-item">
-                <b>@lang('vuefilemanager.date'):</b>
+                <b>{{ __t('date') }}:</b>
                 <span>{{ format_date($invoice->date()) }}</span>
             </li>
             <li class="list-item">
-                <b>@lang('vuefilemanager.product'):</b>
-                <span>@lang('vuefilemanager.subscription')</span>
+                <b>{{ __t('product') }}:</b>
+                <span>{{ __t('subscription') }}</span>
             </li>
             <li class="list-item">
-                <b>@lang('vuefilemanager.invoice_number'):</b>
+                <b>{{ __t('invoice_number') }}:</b>
                 <span>{{ $invoice->number }}</span>
             </li>
 
             <!-- Extra / VAT Information -->
             @if (isset($vat))
                 <li class="list-item">
-                    <b>@lang('vuefilemanager.vat'):</b>
+                    <b>{{ __t('vat') }}:</b>
                     <span>{{ $vat }}</span>
                 </li>
             @endif
@@ -71,25 +71,25 @@
     </section>
     <div class="invoice-partners">
         <div class="partner">
-            <h2 class="partner-title">@lang('vuefilemanager.seller'):</h2>
+            <h2 class="partner-title">{{ __t('seller') }}:</h2>
             <ul class="list">
                 @isset($settings->billing_vat_number)
                     <li class="list-item">
-                        <b>@lang('vuefilemanager.seller_vat'):</b>
+                        <b>{{ __t('seller_vat') }}:</b>
                         <span>{{ $settings->billing_vat_number }}</span>
                     </li>
                 @endisset
 
                 @isset($settings->billing_name)
                     <li class="list-item">
-                        <b>@lang('vuefilemanager.seller_name'):</b>
+                        <b>{{ __t('seller_name') }}:</b>
                         <span>{{ $settings->billing_name }}</span>
                     </li>
                 @endisset
 
                 @isset($settings->billing_phone_number)
                     <li class="list-item">
-                        <b>@lang('vuefilemanager.seller_phone'):</b>
+                        <b>{{ __t('seller_phone') }}:</b>
                         <span>{{ $settings->billing_phone_number }}</span>
                     </li>
                 @endisset
@@ -97,54 +97,54 @@
             <ul class="list">
                 @isset($settings->billing_address)
                     <li class="list-item">
-                        <b>@lang('vuefilemanager.address'):</b>
+                        <b>{{ __t('address') }}:</b>
                         <span>{{ $settings->billing_address }}</span>
                     </li>
                 @endisset
 
                 @isset($settings->billing_city)
                     <li class="list-item">
-                        <b>@lang('vuefilemanager.city'):</b>
+                        <b>{{ __t('city') }}:</b>
                         <span>{{ $settings->billing_city }}</span>
                     </li>
                 @endisset
 
                 @isset($settings->billing_state)
                     <li class="list-item">
-                        <b>@lang('vuefilemanager.state'):</b>
+                        <b>{{ __t('state') }}:</b>
                         <span>{{ $settings->billing_state }}</span>
                     </li>
                 @endisset
 
                 @isset($settings->billing_postal_code)
                     <li class="list-item">
-                        <b>@lang('vuefilemanager.postal_code'):</b>
+                        <b>{{ __t('postal_code') }}:</b>
                         <span>{{ $settings->billing_postal_code }}</span>
                     </li>
                 @endisset
 
                 @isset($settings->billing_country)
                     <li class="list-item">
-                        <b>@lang('vuefilemanager.country'):</b>
+                        <b>{{ __t('country') }}:</b>
                         <span>{{ $settings->billing_country }}</span>
                     </li>
                 @endisset
             </ul>
         </div>
         <div class="partner">
-            <h2 class="partner-title">@lang('vuefilemanager.client'):</h2>
+            <h2 class="partner-title">{{ __t('client') }}:</h2>
             <ul class="list">
 
                 @isset($invoice->customer_name)
                     <li class="list-item">
-                        <b>@lang('vuefilemanager.name'):</b>
+                        <b>{{ __t('name') }}:</b>
                         <span>{{ $invoice->customer_name }}</span>
                     </li>
                 @endisset
 
                 @isset($invoice->customer_phone)
                     <li class="list-item">
-                        <b>@lang('vuefilemanager.phone'):</b>
+                        <b>{{ __t('phone') }}:</b>
                         <span>{{ $invoice->customer_phone }}</span>
                     </li>
                 @endisset
@@ -152,35 +152,35 @@
             <ul class="list">
                 @isset($invoice->customer_address['line1'])
                     <li class="list-item">
-                        <b>@lang('vuefilemanager.address'):</b>
+                        <b>{{ __t('address') }}:</b>
                         <span>{{ $invoice->customer_address['line1'] }}</span>
                     </li>
                 @endisset
 
                 @isset($invoice->customer_address['city'])
                     <li class="list-item">
-                        <b>@lang('vuefilemanager.city'):</b>
+                        <b>{{ __t('city') }}:</b>
                         <span>{{ $invoice->customer_address['city'] }}</span>
                     </li>
                 @endisset
 
                 @isset($invoice->customer_address['state'])
                     <li class="list-item">
-                        <b>@lang('vuefilemanager.state'):</b>
+                        <b>{{ __t('state') }}:</b>
                         <span>{{ $invoice->customer_address['state'] }}</span>
                     </li>
                 @endisset
 
                 @isset($invoice->customer_address['postal_code'])
                     <li class="list-item">
-                        <b>@lang('vuefilemanager.postal_code'):</b>
+                        <b>{{ __t('postal_code') }}:</b>
                         <span>{{ $invoice->customer_address['postal_code'] }}</span>
                     </li>
                 @endisset
 
                 @isset($invoice->customer_address['country'])
                     <li class="list-item">
-                        <b>@lang('vuefilemanager.country'):</b>
+                        <b>{{ __t('country') }}:</b>
                         <span>{{ $invoice->customer_address['country'] }}</span>
                     </li>
                 @endisset
@@ -209,7 +209,7 @@
             --}}{{--Display subscription--}}{{--
             @foreach($invoice->subscriptions() as $subscription)
                 <tr>
-                    <td>@lang('vuefilemanager.subscription') ({{ $subscription->quantity }})</td>
+                    <td>{{ __t('subscription') }} ({{ $subscription->quantity }})</td>
                     <td>{{ $subscription->startDateAsCarbon()->formatLocalized('%d. %B. %Y') }} -
                         {{ $subscription->endDateAsCarbon()->formatLocalized('%d. %B. %Y') }}</td>
                     <td>{{ $subscription->total() }}</td>
@@ -246,12 +246,12 @@
         <table width="100%" class="table" border="0">
             <thead class="table-header">
             <tr>
-                <td>@lang('vuefilemanager.col_description')</td>
-                <td>@lang('vuefilemanager.col_date')</td>
+                <td>{{ __t('col_description') }}</td>
+                <td>{{ __t('col_date') }}</td>
                 @if ($invoice->hasTax())
-                    <td align="right">@lang('vuefilemanager.vat')</td>
+                    <td align="right">{{ __t('vat')}}</td>
                 @endif
-                <td>@lang('vuefilemanager.col_amount')</td>
+                <td>{{ __t('col_amount') }}</td>
             </tr>
             </thead>
 
@@ -285,7 +285,7 @@
                 <!-- Display The Subscriptions -->
                 @foreach ($invoice->subscriptions() as $subscription)
                     <tr class="row">
-                        <td>@lang('vuefilemanager.subscription') ({{ $subscription->quantity }})</td>
+                        <td>{{ __t('subscription') }} ({{ $subscription->quantity }})</td>
                         <td>
                             {{ $subscription->startDateAsCarbon()->formatLocalized('%B %e, %Y') }} -
                             {{ $subscription->endDateAsCarbon()->formatLocalized('%B %e, %Y') }}
@@ -294,7 +294,7 @@
                         @if ($invoice->hasTax())
                             <td>
                                 @if ($inclusiveTaxPercentage = $subscription->inclusiveTaxPercentage())
-                                    {{ $inclusiveTaxPercentage }}% @lang('vuefilemanager.vat_included')
+                                    {{ $inclusiveTaxPercentage }}% {{ __t('vat_included') }}
                                 @endif
 
                                 @if ($subscription->hasBothInclusiveAndExclusiveTax())
@@ -314,7 +314,7 @@
                 <!-- Display The Subtotal -->
                 @if ($invoice->hasDiscount() || $invoice->hasTax() || $invoice->hasStartingBalance())
                     <tr>
-                        <td colspan="{{ $invoice->hasTax() ? 3 : 2 }}" style="text-align: right;">@lang('vuefilemanager.subtotal')</td>
+                        <td colspan="{{ $invoice->hasTax() ? 3 : 2 }}" style="text-align: right;">{{ __t('subtotal')}}</td>
                         <td>{{ $invoice->subtotal() }}</td>
                     </tr>
                 @endif
@@ -324,9 +324,9 @@
                     <tr>
                         <td colspan="{{ $invoice->hasTax() ? 3 : 2 }}" style="text-align: right;">
                             @if ($invoice->isTaxExempt())
-                                @lang('vuefilemanager.tax_exempted')
+                                {{ __t('tax_exempted')}}
                             @else
-                                @lang('vuefilemanager.tax_be_paid_reverse')
+                                {{ __t('tax_be_paid_reverse') }}
                             @endif
                         </td>
                         <td></td>
@@ -336,7 +336,7 @@
                         <tr>
                             <td colspan="3" style="text-align: right;">
                                 {{ $tax->display_name }} {{ $tax->jurisdiction ? ' - '.$tax->jurisdiction : '' }}
-                                ({{ $tax->percentage }}%{{ $tax->isInclusive() ? ' ' . __('vuefilemanager.vat_included') : '' }})
+                                ({{ $tax->percentage }}%{{ $tax->isInclusive() ? ' ' . __t('vat_included') : '' }})
                             </td>
                             <td>{{ $tax->amount() }}</td>
                         </tr>
@@ -346,7 +346,7 @@
                 <!-- Display The Final Total -->
                 <tr>
                     <td colspan="{{ $invoice->hasTax() ? 3 : 2 }}" style="text-align: right;">
-                        <strong>@lang('vuefilemanager.total')</strong>
+                        <strong>{{ __t('total') }}</strong>
                     </td>
                     <td>
                         <strong>{{ $invoice->total() }}</strong>
@@ -357,7 +357,7 @@
         </table>
     </div>
     <div class="invoice-summary">
-        <b>@lang('vuefilemanager.total') {{ $invoice->total() }}</b>
+        <b>{{ __t('total') }} {{ $invoice->total() }}</b>
     </div>
 </div>
 </body>
diff --git a/routes/api.php b/routes/api.php
index 378bca58..7d690533 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -208,5 +208,3 @@ Route::group(['middleware' => ['auth:api', 'auth.shared', 'auth.master', 'scope:
     Route::get('/emojis-list', 'AppFunctionsController@get_emojis_list');
 });
 
-//Get translate
-Route::get('/language/{lang}', 'AppFunctionsController@get_translate');
diff --git a/routes/web.php b/routes/web.php
index 39cc3b1e..e5347be1 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -11,6 +11,9 @@
 |
 */
 
+//Translation language
+Route::get('/language/{lang}', 'AppFunctionsController@get_translate');
+
 // Stripe WebHook
 Route::post('/stripe/webhook', 'WebhookController@handleWebhook');