diff --git a/.env.testing b/.env.testing
index e7363e0b..852247d7 100644
--- a/.env.testing
+++ b/.env.testing
@@ -1,5 +1,5 @@
 APP_NAME=Laravel
-APP_ENV=testing
+APP_ENV=local
 APP_KEY=base64:47yorkyoH3qCrKKO4eG6LpZUogoTC51qey5vYq/O3AM=
 APP_DEBUG=true
 APP_URL=http://localhost
diff --git a/app/Console/Commands/SetupDevEnvironment.php b/app/Console/Commands/SetupDevEnvironment.php
index bc01b141..0da6e090 100644
--- a/app/Console/Commands/SetupDevEnvironment.php
+++ b/app/Console/Commands/SetupDevEnvironment.php
@@ -117,6 +117,14 @@ class SetupDevEnvironment extends Command
                 'user_id'    => $user->id,
                 'user_scope' => 'master',
                 'name'       => 'Shared Folder',
+                'emoji'      => [
+                    "codes"    => "1F680",
+                    "char"     => "\ud83d\ude80",
+                    "name"     => "rocket",
+                    "category" => "Travel & Places (transport-air)",
+                    "group"    => "Travel & Places",
+                    "subgroup" => "transport-air"
+                ],
             ]);
 
         Share::factory(Share::class)
@@ -143,6 +151,14 @@ class SetupDevEnvironment extends Command
                 'user_id'    => $user->id,
                 'user_scope' => 'master',
                 'name'       => 'Random Pics',
+                'emoji'      => [
+                    'codes'    => '1F4F7',
+                    'char'     => '📷',
+                    'name'     => 'camera',
+                    'category' => 'Objects (light & video)',
+                    'group'    => 'Objects',
+                    'subgroup' => 'light & video',
+                ],
             ]);
 
         $nature = Folder::factory(Folder::class)
@@ -151,6 +167,14 @@ class SetupDevEnvironment extends Command
                 'parent_id'  => $random_pics->id,
                 'user_scope' => 'master',
                 'name'       => "Nature",
+                'emoji'      => [
+                    'codes'    => '26F0',
+                    'char'     => '⛰',
+                    'name'     => 'mountain',
+                    'category' => 'Travel & Places (place-geographic)',
+                    'group'    => 'Travel & Places',
+                    'subgroup' => 'place-geographic',
+                ],
             ]);
 
         $apartments = Folder::factory(Folder::class)
@@ -159,6 +183,14 @@ class SetupDevEnvironment extends Command
                 'parent_id'  => $random_pics->id,
                 'user_scope' => 'master',
                 'name'       => "Apartments",
+                'emoji'      => [
+                    'codes'    => '1F3E0',
+                    'char'     => '🏠',
+                    'name'     => 'house',
+                    'category' => 'Travel & Places (place-building)',
+                    'group'    => 'Travel & Places',
+                    'subgroup' => 'place-building',
+                ],
             ]);
 
         // 3.
diff --git a/app/Http/Controllers/FileManager/EditItemsController.php b/app/Http/Controllers/FileManager/EditItemsController.php
index 4d0f6a42..983958c8 100644
--- a/app/Http/Controllers/FileManager/EditItemsController.php
+++ b/app/Http/Controllers/FileManager/EditItemsController.php
@@ -47,7 +47,7 @@ class EditItemsController extends Controller
         }
 
         // Check permission to create folder for authenticated editor
-        if ($request->user()->tokenCan('editor')) {
+        /*if ($request->user()->tokenCan('editor')) {
 
             // check if shared_token cookie exist
             if (!$request->hasCookie('shared_token')) abort('401');
@@ -57,7 +57,7 @@ class EditItemsController extends Controller
 
             // Check access to requested directory
             $this->helper->check_item_access($request->parent_id, $shared);
-        }
+        }*/
 
         // Create new folder
         return $this->filemanager->create_folder($request);
@@ -79,7 +79,7 @@ class EditItemsController extends Controller
         }
 
         // Check permission to rename item for authenticated editor
-        if ($request->user()->tokenCan('editor')) {
+        /*if ($request->user()->tokenCan('editor')) {
 
             // check if shared_token cookie exist
             if (!$request->hasCookie('shared_token')) abort('401');
@@ -96,7 +96,7 @@ class EditItemsController extends Controller
             } else {
                 $this->helper->check_item_access($item->folder_id, $shared);
             }
-        }
+        }*/
 
         // If request have a change folder icon values set the folder icon
         if ($request->type === 'folder' && ($request->filled('emoji') || $request->filled('color'))) {
@@ -125,7 +125,7 @@ class EditItemsController extends Controller
         foreach ($request->input('items') as $item) {
 
             // Check permission to delete item for authenticated editor 
-            if ($request->user()->tokenCan('editor')) {
+            /*if ($request->user()->tokenCan('editor')) {
 
                 // Prevent force delete for non-master users
                 if ($item['force_delete']) abort('401');
@@ -145,7 +145,7 @@ class EditItemsController extends Controller
                 } else {
                     $this->helper->check_item_access($item->folder_id, $shared);
                 }
-            }
+            }*/
 
             // Delete item
             $this->filemanager->delete_item($item, $item['id']);
@@ -169,7 +169,7 @@ class EditItemsController extends Controller
         }
 
         // Check permission to upload for authenticated editor
-        if ($request->user()->tokenCan('editor')) {
+        /*if ($request->user()->tokenCan('editor')) {
 
             // check if shared_token cookie exist
             if (!$request->hasCookie('shared_token')) abort('401');
@@ -179,7 +179,7 @@ class EditItemsController extends Controller
 
             // Check access to requested directory
             $this->helper->check_item_access($request->parent_id, $shared);
-        }
+        }*/
 
         // Return new uploaded file
         return $this->filemanager->upload($request);
@@ -202,7 +202,7 @@ class EditItemsController extends Controller
         $to_id = $request->input('to_id');
 
         // Check permission to upload for authenticated editor
-        if ($request->user()->tokenCan('editor')) {
+        /*if ($request->user()->tokenCan('editor')) {
 
             // check if shared_token cookie exist
             if (!$request->hasCookie('shared_token')) abort('401');
@@ -212,7 +212,7 @@ class EditItemsController extends Controller
 
             // Check access to requested directory
             $this->helper->check_item_access($to_id, $shared);
-        }
+        }*/
 
         // Move item
         $this->filemanager->move($request, $to_id);
@@ -232,7 +232,7 @@ class EditItemsController extends Controller
         $user_id = Auth::id();
 
         // Check permission to download for authenticated editor
-        if ($request->user()->tokenCan('editor')) {
+        /*if ($request->user()->tokenCan('editor')) {
 
             // check if shared_token cookie exist
             if (!$request->hasCookie('shared_token')) abort('401');
@@ -242,7 +242,7 @@ class EditItemsController extends Controller
 
             // Check access to requested directory
             $this->helper->check_item_access($id, $shared);
-        }
+        }*/
 
         // Get folder
         $folder = Folder::whereUserId($user_id)
@@ -270,7 +270,7 @@ class EditItemsController extends Controller
     public function zip_multiple_files(Request $request)
     {
         // Check permission to upload for authenticated editor
-        if ($request->user()->tokenCan('editor')) {
+        /*if ($request->user()->tokenCan('editor')) {
 
             // check if shared_token cookie exist
             if (!$request->hasCookie('shared_token')) abort('401');
@@ -286,7 +286,7 @@ class EditItemsController extends Controller
 
             // Check access to requested directory
             $this->helper->check_item_access($file_parent_folders, $shared);
-        }
+        }*/
 
         // Get requested files
         $files = File::whereUserId(Auth::id())
diff --git a/app/Http/Controllers/Sharing/BrowseShareController.php b/app/Http/Controllers/Sharing/BrowseShareController.php
index 8f3e257e..ff0c7c1a 100644
--- a/app/Http/Controllers/Sharing/BrowseShareController.php
+++ b/app/Http/Controllers/Sharing/BrowseShareController.php
@@ -73,7 +73,7 @@ class BrowseShareController extends Controller
             ->get();
 
         // Get all children content
-        $foldersIds = Folder::with('folders:id,parent_id,unique_id,name')
+        $foldersIds = Folder::with('folders:id,parent_id,id,name')
             ->where('user_id', $shared->user_id)
             ->where('parent_id', $shared->item_id)
             ->get();
diff --git a/app/Http/Requests/FileFunctions/UploadRequest.php b/app/Http/Requests/FileFunctions/UploadRequest.php
index 9cb62423..a6358e48 100644
--- a/app/Http/Requests/FileFunctions/UploadRequest.php
+++ b/app/Http/Requests/FileFunctions/UploadRequest.php
@@ -26,7 +26,6 @@ class UploadRequest extends FormRequest
     public function rules()
     {
         return [
-            'is_last'   => 'sometimes|boolean',
             'folder_id' => 'uuid|nullable',
             'file'      => ['required', 'file', new MimetypeBlacklistValidation]
         ];
diff --git a/app/Services/DemoService.php b/app/Services/DemoService.php
index 2ee2a28c..3b765928 100644
--- a/app/Services/DemoService.php
+++ b/app/Services/DemoService.php
@@ -35,15 +35,14 @@ class DemoService
 
         return [
             'user_id'    => 1,
-            'id'         => random_int(1000, 9999),
+            'id'         => Str::uuid(),
             'parent_id'  => random_int(1000, 9999),
             'name'       => $name,
             'type'       => 'folder',
-            'unique_id'  => random_int(1000, 9999),
             'user_scope' => $user_scope,
             'items'      => '0',
-            'icon_color' => isset($request->icon['color']) ? $request->icon['color'] : null,
-            'icon_emoji' => isset($request->icon['emoji']) ? $request->icon['emoji'] : null,
+            'color' => isset($request->icon['color']) ? $request->icon['color'] : null,
+            'emoji' => isset($request->icon['emoji']) ? $request->icon['emoji'] : null,
             'updated_at' => Carbon::now()->format('j M Y \a\t H:i'),
             'created_at' => Carbon::now()->format('j M Y \a\t H:i'),
         ];
@@ -53,38 +52,38 @@ class DemoService
      * Rename item name
      *
      * @param RenameItemRequest $request
-     * @param $unique_id
+     * @param $id
      * @return mixed
      */
-    function rename_item($request, $unique_id)
+    function rename_item($request, $id)
     {
         // Get item
         if ($request->type === 'folder') {
 
-            $item = Folder::where('unique_id', $unique_id)
+            $item = Folder::where('id', $id)
                 ->where('user_id', 1)
                 ->first();
 
         } else {
 
-            $item = File::where('unique_id', $unique_id)
+            $item = File::where('id', $id)
                 ->where('user_id', 1)
                 ->first();
         }
 
         if ($item) {
             $item->name = $request->name;
-            $item->icon_emoji = $request->icon['emoji'] ?? null;
-            $item->icon_color = $request->icon['color'] ?? null;
+            $item->emoji = $request->icon['emoji'] ?? null;
+            $item->color = $request->icon['color'] ?? null;
 
             return $item;
 
         } else {
 
             return [
-                'unique_id'  => $request->unique_id,
-                'name'       => $request->name,
-                'type'       => $request->type,
+                'id'   => $request->id,
+                'name' => $request->name,
+                'type' => $request->type,
             ];
         }
     }
@@ -109,8 +108,7 @@ class DemoService
         $filetype = get_file_type($file->getMimeType());
 
         return [
-            'id'         => random_int(1000, 9999),
-            'unique_id'  => random_int(1000, 9999),
+            'id'         => Str::uuid(),
             'folder_id'  => $request->parent_id,
             'thumbnail'  => 'data:' . $request->file('file')->getMimeType() . ';base64, ' . base64_encode(file_get_contents($request->file('file'))),
             'name'       => $file->getClientOriginalName(),
diff --git a/app/Services/FileManagerService.php b/app/Services/FileManagerService.php
index df40e88d..2781924c 100644
--- a/app/Services/FileManagerService.php
+++ b/app/Services/FileManagerService.php
@@ -179,8 +179,8 @@ class FileManagerService
             'user_id'    => $user_id,
             'type'       => 'folder',
             'name'       => $name,
-            'icon_color' => isset($request->icon['color']) ? $request->icon['color'] : null,
-            'icon_emoji' => isset($request->icon['emoji']) ? $request->icon['emoji'] : null,
+            'color'      => $request->color ?? null,
+            'emoji'      => $request->emoji ?? null,
         ]);;
     }
 
@@ -284,7 +284,7 @@ class FileManagerService
         }
 
         // Delete item
-        if ($item['type'] === 'file') {
+        if ($item['type'] !== 'folder') {
 
             // Get file
             $file = UserFile::withTrashed()
@@ -346,7 +346,7 @@ class FileManagerService
             }
 
             // Move file
-            if ($item['type'] === 'file') {
+            if ($item['type'] !== 'folder') {
                 UserFile::find($item['id'])
                     ->update([
                         'folder_id' => $to_id
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 7fa6c514..95d6b61d 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -3,8 +3,8 @@
     "/css/app.css": "/css/app.css",
     "/chunks/admin.js": "/chunks/admin.js?id=d2e6acc904b1c1a9387b",
     "/chunks/admin-account.js": "/chunks/admin-account.js?id=b306bc83a32911dc7bbc",
-    "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~2d9ff916.js": "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~2d9ff916.js?id=f8aa71af8223ad1df2a0",
-    "/chunks/admin-account~chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/datab~01aef58e.js": "/chunks/admin-account~chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/datab~01aef58e.js?id=bc5af3a7a82d95c71c52",
+    "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~c7a13fb0.js": "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~c7a13fb0.js?id=5842ebc2d92f96d9a14e",
+    "/chunks/admin-account~chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/datab~7cf65924.js": "/chunks/admin-account~chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/datab~7cf65924.js?id=e1ae154ca60eff2f45be",
     "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.js?id=dfc7c9e8edb8146d9bd0",
     "/chunks/app-appearance.js": "/chunks/app-appearance.js?id=bc5212d24fc85d890346",
     "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~605f4c49.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~605f4c49.js?id=1ae1e65bb6a5ed7c3e10",
@@ -29,7 +29,7 @@
     "/chunks/environment-setup.js": "/chunks/environment-setup.js?id=b835f8fdedb4bc19f4a5",
     "/chunks/files.js": "/chunks/files.js?id=9b47294bd85e1f1db78e",
     "/chunks/files~chunks/settings-subscription~chunks/shared-files~chunks/shared-page~chunks/user-subscription.js": "/chunks/files~chunks/settings-subscription~chunks/shared-files~chunks/shared-page~chunks/user-subscription.js?id=bfc9bbbc5c50bc21cad7",
-    "/chunks/files~chunks/shared-files~chunks/shared-page.js": "/chunks/files~chunks/shared-files~chunks/shared-page.js?id=b60552f07141e4e4d4a6",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.js": "/chunks/files~chunks/shared-files~chunks/shared-page.js?id=6a7f5d7c260bb41b6f75",
     "/chunks/files~chunks/shared-page.js": "/chunks/files~chunks/shared-page.js?id=c869bb74e66efcad0288",
     "/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=7f6474e743f5e147705a",
     "/chunks/installation-disclaimer.js": "/chunks/installation-disclaimer.js?id=7e924ee2e747d16a2810",
@@ -57,12 +57,11 @@
     "/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=c6b88005b133268ed88f",
     "/chunks/shared-files.js": "/chunks/shared-files.js?id=e6f7de2910d85a2dd3e4",
     "/chunks/shared-page.js": "/chunks/shared-page.js?id=04a3534a1a31f006d7de",
-    "/chunks/sign-in.js": "/chunks/sign-in.js?id=7990aa527e933e0f0ebf",
+    "/chunks/sign-in.js": "/chunks/sign-in.js?id=af61663f3e69eae3e5ee",
     "/chunks/sign-up.js": "/chunks/sign-up.js?id=2bc6c1353362c0063d45",
     "/chunks/stripe-credentials.js": "/chunks/stripe-credentials.js?id=8bfaa10b8499114b79a2",
     "/chunks/subscription-plans.js": "/chunks/subscription-plans.js?id=1790ab9aa493a483cf3c",
     "/chunks/subscription-service.js": "/chunks/subscription-service.js?id=8fc09aa45881d0c04e17",
-    "/chunks/upgrade.js": "/chunks/upgrade.js?id=6f401f5d12d22bfde1c9",
     "/chunks/upgrade-billing.js": "/chunks/upgrade-billing.js?id=8a1684e4910b4729ce56",
     "/chunks/upgrade-billing~chunks/upgrade-plan.js": "/chunks/upgrade-billing~chunks/upgrade-plan.js?id=94cfb5164e5e7f0c2943",
     "/chunks/upgrade-plan.js": "/chunks/upgrade-plan.js?id=2ce4b7a0ff69e192a968",
@@ -75,71 +74,43 @@
     "/chunks/user-storage.js": "/chunks/user-storage.js?id=d989f56de65842d84727",
     "/chunks/user-subscription.js": "/chunks/user-subscription.js?id=ce13a0e7a3ee2b607278",
     "/chunks/users.js": "/chunks/users.js?id=b26ed0a3ad0087236fd9",
-    "/js/main.acd102588e8a8be37f5a.hot-update.js": "/js/main.acd102588e8a8be37f5a.hot-update.js",
-    "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~c7a13fb0.js": "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~c7a13fb0.js?id=5842ebc2d92f96d9a14e",
-    "/chunks/admin-account~chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/datab~7cf65924.js": "/chunks/admin-account~chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/datab~7cf65924.js?id=e1ae154ca60eff2f45be",
-    "/chunks/upgrade.acd102588e8a8be37f5a.hot-update.js": "/chunks/upgrade.acd102588e8a8be37f5a.hot-update.js",
-    "/js/main.50cf26e4dfe081f6e9d8.hot-update.js": "/js/main.50cf26e4dfe081f6e9d8.hot-update.js",
-    "/chunks/setup-wizard.50cf26e4dfe081f6e9d8.hot-update.js": "/chunks/setup-wizard.50cf26e4dfe081f6e9d8.hot-update.js",
-    "/chunks/settings.cee80629f3ef6d9a48d3.hot-update.js": "/chunks/settings.cee80629f3ef6d9a48d3.hot-update.js",
-    "/chunks/profile.b8afc7952982a4fd4d0e.hot-update.js": "/chunks/profile.b8afc7952982a4fd4d0e.hot-update.js",
-    "/chunks/profile.c6e207e3f2b5aa2cfff3.hot-update.js": "/chunks/profile.c6e207e3f2b5aa2cfff3.hot-update.js",
-    "/chunks/profile.192c927aaed6e7cbdc00.hot-update.js": "/chunks/profile.192c927aaed6e7cbdc00.hot-update.js",
-    "/chunks/profile.87eff7a19b5e01529315.hot-update.js": "/chunks/profile.87eff7a19b5e01529315.hot-update.js",
-    "/chunks/dashboard.95d674ae20c836e40e96.hot-update.js": "/chunks/dashboard.95d674ae20c836e40e96.hot-update.js",
-    "/chunks/dashboard.4faee9d07770e137375f.hot-update.js": "/chunks/dashboard.4faee9d07770e137375f.hot-update.js",
-    "/chunks/dashboard.1f3f20e8f882567968b5.hot-update.js": "/chunks/dashboard.1f3f20e8f882567968b5.hot-update.js",
-    "/chunks/dashboard.975afd2837cb09ec3d93.hot-update.js": "/chunks/dashboard.975afd2837cb09ec3d93.hot-update.js",
-    "/chunks/dashboard.c44958949b4aa0440320.hot-update.js": "/chunks/dashboard.c44958949b4aa0440320.hot-update.js",
-    "/chunks/dashboard.7584873af2dfc8636e4d.hot-update.js": "/chunks/dashboard.7584873af2dfc8636e4d.hot-update.js",
-    "/chunks/dashboard.7dd853280ea6d580a0fc.hot-update.js": "/chunks/dashboard.7dd853280ea6d580a0fc.hot-update.js",
-    "/chunks/users.3cb9c0872f96ecbf98f0.hot-update.js": "/chunks/users.3cb9c0872f96ecbf98f0.hot-update.js",
-    "/chunks/users.79bdec551cc28db9798e.hot-update.js": "/chunks/users.79bdec551cc28db9798e.hot-update.js",
-    "/chunks/users.5f63771757ee59c71ab7.hot-update.js": "/chunks/users.5f63771757ee59c71ab7.hot-update.js",
-    "/chunks/users.67da0a6baae8b441589b.hot-update.js": "/chunks/users.67da0a6baae8b441589b.hot-update.js",
-    "/chunks/user.3fddfa5cd493ba39284d.hot-update.js": "/chunks/user.3fddfa5cd493ba39284d.hot-update.js",
-    "/chunks/user.138e6b07b04d718ef7b4.hot-update.js": "/chunks/user.138e6b07b04d718ef7b4.hot-update.js",
-    "/chunks/user.076cb56294ad6ec281a6.hot-update.js": "/chunks/user.076cb56294ad6ec281a6.hot-update.js",
-    "/chunks/user.22613097b84c3ddb703c.hot-update.js": "/chunks/user.22613097b84c3ddb703c.hot-update.js",
-    "/chunks/user.851daea4573084138b30.hot-update.js": "/chunks/user.851daea4573084138b30.hot-update.js",
-    "/chunks/user.ee41abbb94245be22dd2.hot-update.js": "/chunks/user.ee41abbb94245be22dd2.hot-update.js",
-    "/chunks/user.3f1437b24d3353d099a4.hot-update.js": "/chunks/user.3f1437b24d3353d099a4.hot-update.js",
-    "/chunks/user.1d618db9e20455d8bf22.hot-update.js": "/chunks/user.1d618db9e20455d8bf22.hot-update.js",
-    "/chunks/user-detail.f6d70e1f13d33dcfcae7.hot-update.js": "/chunks/user-detail.f6d70e1f13d33dcfcae7.hot-update.js",
-    "/chunks/user-delete.6fba20937425844d9cf5.hot-update.js": "/chunks/user-delete.6fba20937425844d9cf5.hot-update.js",
-    "/chunks/user-storage.4fbcc4fac1376d1e478e.hot-update.js": "/chunks/user-storage.4fbcc4fac1376d1e478e.hot-update.js",
-    "/chunks/user-storage.146ee3ac909f1fb1f5c3.hot-update.js": "/chunks/user-storage.146ee3ac909f1fb1f5c3.hot-update.js",
-    "/chunks/user-detail.bf5b21de12e279d5e41d.hot-update.js": "/chunks/user-detail.bf5b21de12e279d5e41d.hot-update.js",
-    "/chunks/user-invoices.bf5b21de12e279d5e41d.hot-update.js": "/chunks/user-invoices.bf5b21de12e279d5e41d.hot-update.js",
-    "/chunks/user-password.bf5b21de12e279d5e41d.hot-update.js": "/chunks/user-password.bf5b21de12e279d5e41d.hot-update.js",
-    "/chunks/user-storage.3d71713649a1be81cc7a.hot-update.js": "/chunks/user-storage.3d71713649a1be81cc7a.hot-update.js",
-    "/chunks/user-subscription.759a864602c6db4bd639.hot-update.js": "/chunks/user-subscription.759a864602c6db4bd639.hot-update.js",
-    "/chunks/user-create.df9e613449e0abc9c927.hot-update.js": "/chunks/user-create.df9e613449e0abc9c927.hot-update.js",
-    "/chunks/invoices.5198b050405708b07643.hot-update.js": "/chunks/invoices.5198b050405708b07643.hot-update.js",
-    "/chunks/pages.fecc0d5d9a54471490cc.hot-update.js": "/chunks/pages.fecc0d5d9a54471490cc.hot-update.js",
-    "/chunks/plan-create.ca500945cbeeb35e4763.hot-update.js": "/chunks/plan-create.ca500945cbeeb35e4763.hot-update.js",
-    "/chunks/plans.ca500945cbeeb35e4763.hot-update.js": "/chunks/plans.ca500945cbeeb35e4763.hot-update.js",
-    "/chunks/dashboard.ae8b35b4b0e457789953.hot-update.js": "/chunks/dashboard.ae8b35b4b0e457789953.hot-update.js",
-    "/chunks/page-edit.ae8b35b4b0e457789953.hot-update.js": "/chunks/page-edit.ae8b35b4b0e457789953.hot-update.js",
-    "/chunks/plan.ae8b35b4b0e457789953.hot-update.js": "/chunks/plan.ae8b35b4b0e457789953.hot-update.js",
-    "/chunks/plan-delete.ae8b35b4b0e457789953.hot-update.js": "/chunks/plan-delete.ae8b35b4b0e457789953.hot-update.js",
-    "/chunks/plan-settings.ae8b35b4b0e457789953.hot-update.js": "/chunks/plan-settings.ae8b35b4b0e457789953.hot-update.js",
-    "/chunks/plan-subscribers.ae8b35b4b0e457789953.hot-update.js": "/chunks/plan-subscribers.ae8b35b4b0e457789953.hot-update.js",
-    "/chunks/plans.ae8b35b4b0e457789953.hot-update.js": "/chunks/plans.ae8b35b4b0e457789953.hot-update.js",
-    "/chunks/app-payments.fbf17904c778df71a5a2.hot-update.js": "/chunks/app-payments.fbf17904c778df71a5a2.hot-update.js",
-    "/chunks/app-appearance.8f581dd73cc45c256cab.hot-update.js": "/chunks/app-appearance.8f581dd73cc45c256cab.hot-update.js",
-    "/chunks/app-billings.8f581dd73cc45c256cab.hot-update.js": "/chunks/app-billings.8f581dd73cc45c256cab.hot-update.js",
-    "/chunks/app-email.8f581dd73cc45c256cab.hot-update.js": "/chunks/app-email.8f581dd73cc45c256cab.hot-update.js",
-    "/chunks/app-index.8f581dd73cc45c256cab.hot-update.js": "/chunks/app-index.8f581dd73cc45c256cab.hot-update.js",
-    "/chunks/app-others.8f581dd73cc45c256cab.hot-update.js": "/chunks/app-others.8f581dd73cc45c256cab.hot-update.js",
-    "/js/main.8b15852e6652ad7df4c4.hot-update.js": "/js/main.8b15852e6652ad7df4c4.hot-update.js",
-    "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~152bcf79.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~152bcf79.js?id=1a78f1864cdc370970bf",
-    "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~e724aa94.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~e724aa94.js?id=bef61fb2d7f2feeedb08",
-    "/chunks/user-delete.8b15852e6652ad7df4c4.hot-update.js": "/chunks/user-delete.8b15852e6652ad7df4c4.hot-update.js",
-    "/js/main.89fde28708af035907b2.hot-update.js": "/js/main.89fde28708af035907b2.hot-update.js",
-    "/chunks/user-delete.89fde28708af035907b2.hot-update.js": "/chunks/user-delete.89fde28708af035907b2.hot-update.js",
-    "/chunks/app-appearance.547cc213dbf1b7f47fa1.hot-update.js": "/chunks/app-appearance.547cc213dbf1b7f47fa1.hot-update.js",
-    "/chunks/profile.db40feee26819d8809b4.hot-update.js": "/chunks/profile.db40feee26819d8809b4.hot-update.js",
-    "/chunks/profile.aa9ff62154eb1cc577e3.hot-update.js": "/chunks/profile.aa9ff62154eb1cc577e3.hot-update.js",
-    "/chunks/settings-storage.d3303207e2c793d85f99.hot-update.js": "/chunks/settings-storage.d3303207e2c793d85f99.hot-update.js"
+    "/chunks/sign-in.c0df83f38f9620d6ab71.hot-update.js": "/chunks/sign-in.c0df83f38f9620d6ab71.hot-update.js",
+    "/js/main.7417dde29297cbd69e55.hot-update.js": "/js/main.7417dde29297cbd69e55.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.8944cc718ff4bb32d069.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.8944cc718ff4bb32d069.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.fb8368ad554a2a428564.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.fb8368ad554a2a428564.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.40f9fae6c45f2df25a52.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.40f9fae6c45f2df25a52.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.11878cb3a23571f05616.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.11878cb3a23571f05616.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.a495ff2c47ac8a06dbdd.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.a495ff2c47ac8a06dbdd.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.88c9c728c54e69b1c225.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.88c9c728c54e69b1c225.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.7cd76b38051b485334e2.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.7cd76b38051b485334e2.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.ebde209595425d6ecefd.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.ebde209595425d6ecefd.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.619d37953ce70f2d9c97.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.619d37953ce70f2d9c97.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.e4e435f6df4e15c1e40f.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.e4e435f6df4e15c1e40f.hot-update.js",
+    "/js/main.20864a59a92c0129339a.hot-update.js": "/js/main.20864a59a92c0129339a.hot-update.js",
+    "/js/main.a0ecc5181365124d1abd.hot-update.js": "/js/main.a0ecc5181365124d1abd.hot-update.js",
+    "/js/main.a91c6d3b956ef3d3f1e8.hot-update.js": "/js/main.a91c6d3b956ef3d3f1e8.hot-update.js",
+    "/js/main.4ba0741466b2fd877fa5.hot-update.js": "/js/main.4ba0741466b2fd877fa5.hot-update.js",
+    "/js/main.e2cefad0246806b24af4.hot-update.js": "/js/main.e2cefad0246806b24af4.hot-update.js",
+    "/js/main.72c2861585470c2a2c10.hot-update.js": "/js/main.72c2861585470c2a2c10.hot-update.js",
+    "/js/main.8446252ef7ddc3afec51.hot-update.js": "/js/main.8446252ef7ddc3afec51.hot-update.js",
+    "/js/main.6b03f320410161b90310.hot-update.js": "/js/main.6b03f320410161b90310.hot-update.js",
+    "/js/main.2b6a3e1a38b1bf0feeb4.hot-update.js": "/js/main.2b6a3e1a38b1bf0feeb4.hot-update.js",
+    "/js/main.3a61d5e4304773dce727.hot-update.js": "/js/main.3a61d5e4304773dce727.hot-update.js",
+    "/js/main.e6c48ba61975e4559b26.hot-update.js": "/js/main.e6c48ba61975e4559b26.hot-update.js",
+    "/js/main.962fe0e076ecadbfa271.hot-update.js": "/js/main.962fe0e076ecadbfa271.hot-update.js",
+    "/js/main.d094301f874d238bb30e.hot-update.js": "/js/main.d094301f874d238bb30e.hot-update.js",
+    "/js/main.5ce03add9ec3ed119589.hot-update.js": "/js/main.5ce03add9ec3ed119589.hot-update.js",
+    "/js/main.b9dbc0aab87a27bcc71c.hot-update.js": "/js/main.b9dbc0aab87a27bcc71c.hot-update.js",
+    "/js/main.591858a32599e4d84561.hot-update.js": "/js/main.591858a32599e4d84561.hot-update.js",
+    "/js/main.b77927912541bb4e014d.hot-update.js": "/js/main.b77927912541bb4e014d.hot-update.js",
+    "/js/main.9697569c85fd0f645f8a.hot-update.js": "/js/main.9697569c85fd0f645f8a.hot-update.js",
+    "/js/main.b58aab39213782fa858f.hot-update.js": "/js/main.b58aab39213782fa858f.hot-update.js",
+    "/js/main.4ed545e82dc5273ba538.hot-update.js": "/js/main.4ed545e82dc5273ba538.hot-update.js",
+    "/js/main.ff207924ea2f4585a5cc.hot-update.js": "/js/main.ff207924ea2f4585a5cc.hot-update.js",
+    "/js/main.66e9ba4410158801c974.hot-update.js": "/js/main.66e9ba4410158801c974.hot-update.js",
+    "/js/main.0970ccdf59cbd34da77e.hot-update.js": "/js/main.0970ccdf59cbd34da77e.hot-update.js",
+    "/js/main.f7286199453d4271e692.hot-update.js": "/js/main.f7286199453d4271e692.hot-update.js",
+    "/js/main.de3eaa7ec85c41a75abc.hot-update.js": "/js/main.de3eaa7ec85c41a75abc.hot-update.js",
+    "/js/main.d211f3e62bc08a5fd565.hot-update.js": "/js/main.d211f3e62bc08a5fd565.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared-page.d211f3e62bc08a5fd565.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.d211f3e62bc08a5fd565.hot-update.js"
 }
diff --git a/resources/js/components/FilesView/ContextMenu.vue b/resources/js/components/FilesView/ContextMenu.vue
index a7a0988c..b9358947 100644
--- a/resources/js/components/FilesView/ContextMenu.vue
+++ b/resources/js/components/FilesView/ContextMenu.vue
@@ -4,16 +4,16 @@
         <!-- File Preview -->
         <div class="menu-options" id="menu-list" v-if="showFromPreview">
             <OptionGroup class="menu-option-group">
-                <Option @click.native="renameItem" :title="$t('context_menu.rename')" icon="rename"/>
-                <Option @click.native="moveItem" :title="$t('context_menu.move')" icon="move-item"/>
+                <Option @click.native="renameItem" :title="$t('context_menu.rename')" icon="rename" />
+                <Option @click.native="moveItem" :title="$t('context_menu.move')" icon="move-item" />
                 <Option @click.native="shareItem" v-if="$checkPermission('master')" :title="item.shared
                             ? $t('context_menu.share_edit')
-                            : $t('context_menu.share')" icon="share"/>
-                <Option @click.native="deleteItem" :title="$t('context_menu.delete')" icon="trash" class="menu-option"/>
+                            : $t('context_menu.share')" icon="share" />
+                <Option @click.native="deleteItem" :title="$t('context_menu.delete')" icon="trash" class="menu-option" />
             </OptionGroup>
 
             <OptionGroup>
-                <Option @click.native="downloadItem" v-if="!isFolder" :title="$t('context_menu.download')" icon="download"/>
+                <Option @click.native="downloadItem" v-if="!isFolder" :title="$t('context_menu.download')" icon="download" />
             </OptionGroup>
         </div>
 
@@ -21,26 +21,26 @@
         <div v-if="$isThisLocation(['trash', 'trash-root']) && $checkPermission('master') && !showFromPreview" id="menu-list" class="menu-options">
 
             <!-- Single options -->
-            <OptionGroup v-if="multiSelectContextMenu">
-                <Option @click.native="restoreItem" v-if="item" :title="$t('context_menu.restore')" icon="restore"/>
-                <Option @click.native="deleteItem" v-if="item" :title="$t('context_menu.delete')" icon="trash"/>
-                <Option @click.native="emptyTrash" :title="$t('context_menu.empty_trash')" icon="empty-trash"/>
+            <OptionGroup v-if="isMultiSelectContextMenu">
+                <Option @click.native="restoreItem" v-if="item" :title="$t('context_menu.restore')" icon="restore" />
+                <Option @click.native="deleteItem" v-if="item" :title="$t('context_menu.delete')" icon="trash" />
+                <Option @click.native="emptyTrash" :title="$t('context_menu.empty_trash')" icon="empty-trash" />
             </OptionGroup>
 
-            <OptionGroup v-if="item && multiSelectContextMenu">
-                <Option @click.native="ItemDetail" :title="$t('context_menu.detail')" icon="detail"/>
-                <Option @click.native="downloadItem" v-if="!isFolder" :title="$t('context_menu.download')" icon="download"/>
+            <OptionGroup v-if="item && isMultiSelectContextMenu">
+                <Option @click.native="ItemDetail" :title="$t('context_menu.detail')" icon="detail" />
+                <Option @click.native="downloadItem" v-if="!isFolder" :title="$t('context_menu.download')" icon="download" />
             </OptionGroup>
 
             <!-- Multi options -->
-            <OptionGroup v-if="!multiSelectContextMenu">
-                <Option @click.native="restoreItem" v-if="item" :title="$t('context_menu.restore')" icon="restore"/>
-                <Option @click.native="deleteItem" :title="$t('context_menu.delete')" icon="trash"/>
-                <Option @click.native="emptyTrash" :title="$t('context_menu.empty_trash')" icon="empty-trash"/>
+            <OptionGroup v-if="!isMultiSelectContextMenu">
+                <Option @click.native="restoreItem" v-if="item" :title="$t('context_menu.restore')" icon="restore" />
+                <Option @click.native="deleteItem" :title="$t('context_menu.delete')" icon="trash" />
+                <Option @click.native="emptyTrash" :title="$t('context_menu.empty_trash')" icon="empty-trash" />
             </OptionGroup>
 
-            <OptionGroup v-if="item && !multiSelectContextMenu && !hasFolder">
-                <Option @click.native="downloadItem" :title="$t('context_menu.download')" icon="download"/>
+            <OptionGroup v-if="item && !isMultiSelectContextMenu && !hasFolder">
+                <Option @click.native="downloadItem" :title="$t('context_menu.download')" icon="download" />
             </OptionGroup>
         </div>
 
@@ -48,38 +48,38 @@
         <div v-if="$isThisLocation(['shared']) && $checkPermission('master') && !showFromPreview" id="menu-list" class="menu-options">
 
             <!-- Single options -->
-            <OptionGroup class="menu-option-group" v-if="item && isFolder && multiSelectContextMenu">
-                <Option @click.native="addToFavourites" :title=" isInFavourites
+            <OptionGroup class="menu-option-group" v-if="item && isFolder && isMultiSelectContextMenu">
+                <Option @click.native="addToFavourites" :title="isInFavourites
                         ? $t('context_menu.remove_from_favourites')
-                        : $t('context_menu.add_to_favourites')" icon="favourites"/>
+                        : $t('context_menu.add_to_favourites')" icon="favourites" />
             </OptionGroup>
 
-            <OptionGroup v-if="item && multiSelectContextMenu">
-                <Option @click.native="renameItem" :title="$t('context_menu.rename')" icon="rename"/>
-                <Option @click.native="shareItem" :title=" item.shared ? $t('context_menu.share_edit'): $t('context_menu.share')" icon="share"/>
-                <Option @click.native="deleteItem" :title="$t('context_menu.delete')" icon="trash"/>
+            <OptionGroup v-if="item && isMultiSelectContextMenu">
+                <Option @click.native="renameItem" :title="$t('context_menu.rename')" icon="rename" />
+                <Option @click.native="shareItem" :title=" item.shared ? $t('context_menu.share_edit'): $t('context_menu.share')" icon="share" />
+                <Option @click.native="deleteItem" :title="$t('context_menu.delete')" icon="trash" />
             </OptionGroup>
 
-            <OptionGroup v-if="item && multiSelectContextMenu">
-                <Option @click.native="ItemDetail" :title="$t('context_menu.detail')" icon="detail"/>
-                <Option @click.native="downloadItem" v-if="!isFolder" :title="$t('context_menu.download')" icon="download"/>
-                <Option @click.native="downloadFolder" v-if="isFolder" :title="$t('context_menu.zip_folder')" icon="zip-folder"/>
+            <OptionGroup v-if="item && isMultiSelectContextMenu">
+                <Option @click.native="ItemDetail" :title="$t('context_menu.detail')" icon="detail" />
+                <Option @click.native="downloadItem" v-if="!isFolder" :title="$t('context_menu.download')" icon="download" />
+                <Option @click.native="downloadFolder" v-if="isFolder" :title="$t('context_menu.zip_folder')" icon="zip-folder" />
             </OptionGroup>
 
             <!-- Multi options -->
-            <OptionGroup class="menu-option-group" v-if="item && !hasFile && !multiSelectContextMenu">
-                <Option @click.native="addToFavourites" :title=" isInFavourites
+            <OptionGroup class="menu-option-group" v-if="item && !hasFile && !isMultiSelectContextMenu">
+                <Option @click.native="addToFavourites" :title="isInFavourites
                                 ? $t('context_menu.remove_from_favourites')
-                                : $t('context_menu.add_to_favourites')" icon="favourites"/>
+                                : $t('context_menu.add_to_favourites')" icon="favourites" />
             </OptionGroup>
 
-            <OptionGroup v-if="item && !multiSelectContextMenu">
-                <Option @click.native="shareCancel" :title="$t('context_menu.share_cancel')" icon="share"/>
-                <Option @click.native="deleteItem" :title="$t('context_menu.delete')" icon="trash"/>
+            <OptionGroup v-if="item && !isMultiSelectContextMenu">
+                <Option @click.native="shareCancel" :title="$t('context_menu.share_cancel')" icon="share" />
+                <Option @click.native="deleteItem" :title="$t('context_menu.delete')" icon="trash" />
             </OptionGroup>
 
-            <OptionGroup v-if="item && !multiSelectContextMenu && !hasFolder">
-                <Option @click.native="downloadItem" :title="$t('context_menu.download')" icon="download"/>
+            <OptionGroup v-if="item && !isMultiSelectContextMenu && !hasFolder">
+                <Option @click.native="downloadItem" :title="$t('context_menu.download')" icon="download" />
             </OptionGroup>
         </div>
 
@@ -87,46 +87,46 @@
         <div v-if="$isThisLocation(['base', 'participant_uploads', 'latest']) && $checkPermission('master') && !showFromPreview" id="menu-list" class="menu-options">
             
             <!-- No Files options -->
-            <OptionGroup v-if="!$isThisLocation(['participant_uploads', 'latest']) && multiSelectContextMenu && !item">
-                <Option @click.native="createFolder" :title="$t('context_menu.create_folder')" icon="create-folder"/>
+            <OptionGroup v-if="!$isThisLocation(['participant_uploads', 'latest']) && isMultiSelectContextMenu && !item">
+                <Option @click.native="createFolder" :title="$t('context_menu.create_folder')" icon="create-folder" />
             </OptionGroup>
 
             <!-- Single options -->
-            <OptionGroup v-if="!$isThisLocation(['participant_uploads', 'latest']) && item && multiSelectContextMenu && isFolder">
-                <Option @click.native="addToFavourites" :title="isInFavourites ? $t('context_menu.remove_from_favourites') : $t('context_menu.add_to_favourites')" icon="favourites"/>
+            <OptionGroup v-if="!$isThisLocation(['participant_uploads', 'latest']) && item && isMultiSelectContextMenu && isFolder">
+                <Option @click.native="addToFavourites" :title="isInFavourites ? $t('context_menu.remove_from_favourites') : $t('context_menu.add_to_favourites')" icon="favourites" />
             </OptionGroup>
 
 
-            <OptionGroup v-if="item && multiSelectContextMenu">
-                <Option @click.native="renameItem" :title="$t('context_menu.rename')" icon="rename"/>
-                <Option @click.native="moveItem" v-if="!$isThisLocation(['latest'])" :title="$t('context_menu.move')" icon="move-item"/>
+            <OptionGroup v-if="item && isMultiSelectContextMenu">
+                <Option @click.native="renameItem" :title="$t('context_menu.rename')" icon="rename" />
+                <Option @click.native="moveItem" v-if="!$isThisLocation(['latest'])" :title="$t('context_menu.move')" icon="move-item" />
                 <Option @click.native="shareItem" :title="item.shared
                                                             ? $t('context_menu.share_edit')
-                                                            : $t('context_menu.share')" icon="share"/>
-                <Option @click.native="deleteItem" :title="$t('context_menu.delete')" icon="trash"/>
+                                                            : $t('context_menu.share')" icon="share" />
+                <Option @click.native="deleteItem" :title="$t('context_menu.delete')" icon="trash" />
             </OptionGroup>
 
 
-            <OptionGroup v-if="item && multiSelectContextMenu ">
-                <Option @click.native="ItemDetail" :title="$t('context_menu.detail')" icon="detail"/>
-                <Option @click.native="downloadItem" v-if="!isFolder" :title="$t('context_menu.download')" icon="download"/>
-                <Option @click.native="downloadFolder" v-if="isFolder" :title="$t('context_menu.zip_folder')" icon="zip-folder"/>
+            <OptionGroup v-if="item && isMultiSelectContextMenu ">
+                <Option @click.native="ItemDetail" :title="$t('context_menu.detail')" icon="detail" />
+                <Option @click.native="downloadItem" v-if="!isFolder" :title="$t('context_menu.download')" icon="download" />
+                <Option @click.native="downloadFolder" v-if="isFolder" :title="$t('context_menu.zip_folder')" icon="zip-folder" />
             </OptionGroup>
 
             <!-- Multi options -->
-            <OptionGroup v-if="!$isThisLocation(['participant_uploads', 'latest']) && !multiSelectContextMenu && item && !hasFile">
+            <OptionGroup v-if="!$isThisLocation(['participant_uploads', 'latest']) && !isMultiSelectContextMenu && item && !hasFile">
                 <Option @click.native="addToFavourites" :title=" isInFavourites
                                                                                     ? $t('context_menu.remove_from_favourites')
-                                                                                    : $t('context_menu.add_to_favourites')" icon="favourites"/>
+                                                                                    : $t('context_menu.add_to_favourites')" icon="favourites" />
             </OptionGroup>
 
-            <OptionGroup v-if="item && !multiSelectContextMenu">
-                <Option @click.native="moveItem" v-if="!$isThisLocation(['latest'])" :title="$t('context_menu.move')" icon="move-item"/>
-                <Option @click.native="deleteItem" :title="$t('context_menu.delete')" icon="trash"/>
+            <OptionGroup v-if="item && !isMultiSelectContextMenu">
+                <Option @click.native="moveItem" v-if="!$isThisLocation(['latest'])" :title="$t('context_menu.move')" icon="move-item" />
+                <Option @click.native="deleteItem" :title="$t('context_menu.delete')" icon="trash" />
             </OptionGroup>
 
-            <OptionGroup v-if="item && !multiSelectContextMenu && !hasFolder">
-                <Option @click.native="downloadItem" :title="$t('context_menu.download')" icon="download"/>
+            <OptionGroup v-if="item && !isMultiSelectContextMenu && !hasFolder">
+                <Option @click.native="downloadItem" :title="$t('context_menu.download')" icon="download" />
             </OptionGroup>
         </div>
 
@@ -134,33 +134,33 @@
         <div v-if="$isThisLocation(['base', 'public']) && $checkPermission('editor') && !showFromPreview " id="menu-list" class="menu-options">
 
             <!-- No Files options -->
-            <OptionGroup v-if="multiSelectContextMenu && !item">
-                <Option @click.native="createFolder" :title="$t('context_menu.create_folder')" icon="create-folder"/>
+            <OptionGroup v-if="isMultiSelectContextMenu && !item">
+                <Option @click.native="createFolder" :title="$t('context_menu.create_folder')" icon="create-folder" />
             </OptionGroup>
 
             <!-- Single options -->
 
-            <OptionGroup v-if="item && multiSelectContextMenu">
-                <Option @click.native="renameItem" :title=" $t('context_menu.rename')" icon="rename"/>
-                <Option @click.native="moveItem" :title="$t('context_menu.move')" icon="move-item"/>
-                <Option @click.native="deleteItem" :title="$t('context_menu.delete')" icon="trash"/>
+            <OptionGroup v-if="item && isMultiSelectContextMenu">
+                <Option @click.native="renameItem" :title=" $t('context_menu.rename')" icon="rename" />
+                <Option @click.native="moveItem" :title="$t('context_menu.move')" icon="move-item" />
+                <Option @click.native="deleteItem" :title="$t('context_menu.delete')" icon="trash" />
             </OptionGroup>
 
-            <OptionGroup v-if="item && multiSelectContextMenu">
-                <Option @click.native="ItemDetail" :title="$t('context_menu.detail')" icon="detail"/>
-                <Option @click.native="downloadItem" v-if="!isFolder" :title="$t('context_menu.download')" icon="download"/>
-                <Option @click.native="downloadFolder" v-if="isFolder" :title="$t('context_menu.zip_folder')" icon="zip-folder"/>
+            <OptionGroup v-if="item && isMultiSelectContextMenu">
+                <Option @click.native="ItemDetail" :title="$t('context_menu.detail')" icon="detail" />
+                <Option @click.native="downloadItem" v-if="!isFolder" :title="$t('context_menu.download')" icon="download" />
+                <Option @click.native="downloadFolder" v-if="isFolder" :title="$t('context_menu.zip_folder')" icon="zip-folder" />
             </OptionGroup>
 
             <!-- Multi options -->
 
-            <OptionGroup v-if="item && !multiSelectContextMenu">
-                <Option @click.native="moveItem" :title="$t('context_menu.move')" icon="move-item"/>
-                <Option @click.native="deleteItem" :title="$t('context_menu.delete')" icon="trash"/>
+            <OptionGroup v-if="item && !isMultiSelectContextMenu">
+                <Option @click.native="moveItem" :title="$t('context_menu.move')" icon="move-item" />
+                <Option @click.native="deleteItem" :title="$t('context_menu.delete')" icon="trash" />
             </OptionGroup>
 
-            <OptionGroup v-if="item && !multiSelectContextMenu && !hasFolder">
-                <Option @click.native="downloadItem" :title="$t('context_menu.download')" icon="download"/>
+            <OptionGroup v-if="item && !isMultiSelectContextMenu && !hasFolder">
+                <Option @click.native="downloadItem" :title="$t('context_menu.download')" icon="download" />
             </OptionGroup>
         </div>
 
@@ -168,16 +168,16 @@
         <div v-if="$isThisLocation(['base', 'public']) && $checkPermission('visitor') && !showFromPreview" id="menu-list" class="menu-options">
 
             <!-- Single options -->
-            <OptionGroup v-if="item && multiSelectContextMenu">
-                <Option @click.native="ItemDetail" :title="$t('context_menu.detail')" icon="detail"/>
-                <Option @click.native="downloadItem" v-if="!isFolder" :title="$t('context_menu.download')" icon="download"/>
-                <Option @click.native="downloadFolder" v-if="isFolder" :title="$t('context_menu.zip_folder')" icon="zip-folder"/>
+            <OptionGroup v-if="item && isMultiSelectContextMenu">
+                <Option @click.native="ItemDetail" :title="$t('context_menu.detail')" icon="detail" />
+                <Option @click.native="downloadItem" v-if="!isFolder" :title="$t('context_menu.download')" icon="download" />
+                <Option @click.native="downloadFolder" v-if="isFolder" :title="$t('context_menu.zip_folder')" icon="zip-folder" />
             </OptionGroup>
 
             <!-- Multi options -->
-            <OptionGroup v-if="!multiSelectContextMenu && item ">
-                <Option @click.native="downloadItem" v-if="!hasFolder" :title="$t('context_menu.download')" icon="download"/>
-                <Option v-if="hasFolder" :title="$t('context_menu.no_options')" icon="no-options" class="no-options"/>
+            <OptionGroup v-if="!isMultiSelectContextMenu && item ">
+                <Option @click.native="downloadItem" v-if="!hasFolder" :title="$t('context_menu.download')" icon="download" />
+                <Option v-if="hasFolder" :title="$t('context_menu.no_options')" icon="no-options" class="no-options" />
             </OptionGroup>
 
         </div>
@@ -187,8 +187,8 @@
 <script>
 import OptionGroup from '@/components/FilesView/OptionGroup'
 import Option from '@/components/FilesView/Option'
-import { mapGetters } from 'vuex'
-import { events } from '@/bus'
+import {mapGetters} from 'vuex'
+import {events} from '@/bus'
 
 export default {
     name: 'ContextMenu',
@@ -199,20 +199,12 @@ export default {
     computed: {
         ...mapGetters(['user', 'fileInfoDetail']),
         hasFolder() {
-
-            // Check if selected items includes some folder
-            if (this.fileInfoDetail.find(item => item.type === 'folder'))
-                return true
-
+            return this.fileInfoDetail.find(item => item.type === 'folder')
         },
         hasFile() {
-
-            // Check if selected items includes some files
-            if (this.fileInfoDetail.find(item => item.type !== 'folder'))
-                return true
-
+            return this.fileInfoDetail.find(item => item.type !== 'folder')
         },
-        multiSelectContextMenu() {
+        isMultiSelectContextMenu() {
 
             // If is context Menu open on multi selected items open just options for the multi selected items
             if (this.fileInfoDetail.length > 1 && this.fileInfoDetail.includes(this.item))
@@ -221,10 +213,9 @@ export default {
             // If is context Menu open for the non selected item open options for the single item
             if (this.fileInfoDetail.length < 2 || !this.fileInfoDetail.includes(this.item))
                 return true
-
         },
         favourites() {
-            return this.user.relationships.favourites.data.attributes.folders
+            return this.user.data.relationships.favourites.data.attributes.folders
         },
         isFolder() {
             return this.item && this.item.type === 'folder'
@@ -241,7 +232,7 @@ export default {
             return this.item && this.item.type === 'image'
         },
         isInFavourites() {
-            return this.favourites.find((el) => el.unique_id == this.item.unique_id)
+            return this.favourites.find((el) => el.id === this.item.id)
         }
     },
     data() {
@@ -253,10 +244,9 @@ export default {
             positionY: 0
         }
     },
-
     methods: {
-        downloadFolder(){
-            this.$store.dispatch('downloadFolder' , this.item)
+        downloadFolder() {
+            this.$store.dispatch('downloadFolder', this.item)
         },
         emptyTrash() {
             this.$store.dispatch('emptyTrash')
@@ -264,36 +254,36 @@ export default {
         restoreItem() {
 
             // If is item not in selected items restore just this single item
-            if(!this.fileInfoDetail.includes(this.item))
+            if (!this.fileInfoDetail.includes(this.item))
                 this.$store.dispatch('restoreItem', this.item)
 
             // If is item in selected items restore all items from fileInfoDetail
-            if(this.fileInfoDetail.includes(this.item))
+            if (this.fileInfoDetail.includes(this.item))
                 this.$store.dispatch('restoreItem', null)
         },
         shareCancel() {
             this.$store.dispatch('shareCancel')
         },
         renameItem() {
-            events.$emit('popup:open', { name: 'rename-item', item: this.item })
+            events.$emit('popup:open', {name: 'rename-item', item: this.item})
         },
         moveItem() {
-            events.$emit('popup:open', { name: 'move', item: [this.item] })
+            events.$emit('popup:open', {name: 'move', item: [this.item]})
         },
         shareItem() {
             if (this.item.shared) {
                 // Open edit share popup
-                events.$emit('popup:open', { name: 'share-edit', item: this.item })
+                events.$emit('popup:open', {name: 'share-edit', item: this.item})
             } else {
                 // Open create share popup
-                events.$emit('popup:open', { name: 'share-create', item: this.item })
+                events.$emit('popup:open', {name: 'share-create', item: this.item})
             }
         },
         addToFavourites() {
             // Check if folder is in favourites and then add/remove from favourites
             if (
                 this.favourites &&
-                !this.favourites.find(el => el.unique_id == this.item.unique_id)
+                !this.favourites.find(el => el.id === this.item.id)
             ) {
                 // Add to favourite folder that is not selected
                 if (!this.fileInfoDetail.includes(this.item)) {
@@ -419,10 +409,8 @@ export default {
             this.isVisible = false
             this.showFromPreview = false
             this.item = undefined
-
         })
 
-
         events.$on('contextMenu:show', (event, item) => {
             // Store item
             this.item = item
diff --git a/resources/js/components/FilesView/FileItemGrid.vue b/resources/js/components/FilesView/FileItemGrid.vue
index 81f36855..e86c37b1 100644
--- a/resources/js/components/FilesView/FileItemGrid.vue
+++ b/resources/js/components/FilesView/FileItemGrid.vue
@@ -88,16 +88,16 @@ export default {
         folderEmojiOrColor() {
 
             // If folder have set some color
-            if (this.item.icon_color) {
+            if (this.item.color) {
                 this.$nextTick(() => {
-                    this.$refs[`folder${this.item.id}`].firstElementChild.style.fill = this.item.icon_color
+                    this.$refs[`folder${this.item.id}`].firstElementChild.style.fill = this.item.color
                 })
                 return false
             }
 
             // If folder have set some emoji
-            if (this.item.icon_emoji)
-                return this.item.icon_emoji
+            if (this.item.emoji)
+                return this.item.emoji
 
         },
         isClicked() {
diff --git a/resources/js/components/FilesView/FileItemList.vue b/resources/js/components/FilesView/FileItemList.vue
index 316212cc..81b9bd4e 100644
--- a/resources/js/components/FilesView/FileItemList.vue
+++ b/resources/js/components/FilesView/FileItemList.vue
@@ -289,7 +289,7 @@ export default {
         })
 
         // Change item name
-        events.$on('change:name', (item) => {
+        events.$on('change:name', item => {
             if (this.item.id === item.id) this.itemName = item.name
         })
     }
diff --git a/resources/js/components/FilesView/FilePreviewNavigationPanel.vue b/resources/js/components/FilesView/FilePreviewNavigationPanel.vue
index cbde58f9..eea11c31 100644
--- a/resources/js/components/FilesView/FilePreviewNavigationPanel.vue
+++ b/resources/js/components/FilesView/FilePreviewNavigationPanel.vue
@@ -48,7 +48,7 @@ export default {
 		showingImageIndex() {
 			let activeIndex = ''
 			this.filteredFiles.filter((element, index) => {
-				if (element.unique_id == this.fileInfoDetail[0].unique_id) {
+				if (element.id === this.fileInfoDetail[0].id) {
 					activeIndex = index + 1
 				}
 			})
diff --git a/resources/js/components/FilesView/FolderIcon.vue b/resources/js/components/FilesView/FolderIcon.vue
index 025ca6dd..4e45b29a 100644
--- a/resources/js/components/FilesView/FolderIcon.vue
+++ b/resources/js/components/FilesView/FolderIcon.vue
@@ -20,9 +20,9 @@
     export default {
         name: 'FolderIcon',
         props: [
-            'item',
             'folderIcon',
-            'location'
+            'location',
+            'item',
         ],
         components: {
             Emoji
@@ -37,7 +37,7 @@
                     return this.folderIcon.emoji ? this.folderIcon.emoji : false
 
                 // Return emoji if is already set
-                return this.item.icon_emoji ? this.item.icon_emoji : false
+                return this.item.emoji ? this.item.emoji : false
             },
             color() {
                 // Return color if is changed from rename popup
@@ -45,7 +45,7 @@
                     return this.folderIcon.color ? this.folderIcon.color : false
 
                 // Return color if is already set
-                return this.item.icon_color ? this.item.icon_color : false
+                return this.item.color ? this.item.color : false
             }
         }
     }
diff --git a/resources/js/components/Others/EmojiPicker.vue b/resources/js/components/Others/EmojiPicker.vue
index b9c0c3dd..430e4e4b 100644
--- a/resources/js/components/Others/EmojiPicker.vue
+++ b/resources/js/components/Others/EmojiPicker.vue
@@ -25,13 +25,14 @@
         <!-- Emojis List -->
         <transition name="slide-in">
             <div v-if="selectOpen">
+
                 <!-- Spinner -->
-                <div v-if="!loadedList" class="emoji-wrapper">
+                <div v-if="!isLoadedEmojis" class="emoji-wrapper">
                     <Spinner />
                 </div>
 
                 <!-- List -->
-                <div v-if="loadedList && emojis" class="emoji-wrapper">
+                <div v-if="isLoadedEmojis && emojis" class="emoji-wrapper">
 
                     <!-- Search input -->
                     <input @click.stop @input="searchEmojis" v-model="searchInput" class="emoji-input" :placeholder="$t('popup_rename.search_emoji_input_placeholder')">
@@ -100,7 +101,7 @@ export default {
             searchInput: '',
             filteredEmojis: [],
             selectOpen: false,
-            loadedList: false,
+            isLoadedEmojis: false,
             filteredEmojisLoaded: true,
             groupInView: 'Smileys & Emotion',
         }
@@ -150,8 +151,7 @@ export default {
 
         }, 800),
         openList() {
-
-            this.loadedList = false
+            this.isLoadedEmojis = false
 
             this.selectOpen = !this.selectOpen
 
@@ -160,14 +160,15 @@ export default {
 
                 axios.get('/assets/emojis.json')
                     .then(response => {
-                        this.$store.commit('LOAD_EMOJIS_LIST', response.data[0])
+                        this.$store.commit('LOAD_EMOJIS_LIST', response.data)
                     })
+                .finally(() => this.isLoadedEmojis = true)
             }
 
             // Simulate loading for the emojisList processing
             if (this.emojis) {
                 setTimeout(() => {
-                    this.loadedList = true
+                    this.isLoadedEmojis = true
                 }, 20);
             }
 
@@ -199,7 +200,7 @@ export default {
 
             this.selectOpen = false
 
-            this.loadedList = false
+            this.isLoadedEmojis = false
         })
     }
 }
diff --git a/resources/js/components/Others/MoveItem.vue b/resources/js/components/Others/MoveItem.vue
index 44a80d25..5e8d3e4e 100644
--- a/resources/js/components/Others/MoveItem.vue
+++ b/resources/js/components/Others/MoveItem.vue
@@ -7,33 +7,33 @@
         <PopupContent type="height-limited" v-if="pickedItem">
 
             <!--Show Spinner when loading folders-->
-            <Spinner v-if="isLoadingTree"/>
+            <Spinner v-if="isLoadingTree" />
 
             <!--Folder tree-->
             <div v-if="! isLoadingTree && navigation">
-                <ThumbnailItem v-if="fileInfoDetail.length < 2 || noSelectedItem" class="item-thumbnail" :item="pickedItem" info="location"/>
+                <ThumbnailItem v-if="fileInfoDetail.length < 2 || noSelectedItem" class="item-thumbnail" :item="pickedItem" info="location" />
 
-                <MultiSelected  class="multiple-selected" 
-                                :title="$t('file_detail.selected_multiple')" 
-                                :subtitle="this.fileInfoDetail.length + ' ' + $tc('file_detail.items', this.fileInfoDetail.length)"
-                                v-if="fileInfoDetail.length > 1 && !noSelectedItem"/> 
+                <MultiSelected class="multiple-selected"
+                               :title="$t('file_detail.selected_multiple')"
+                               :subtitle="this.fileInfoDetail.length + ' ' + $tc('file_detail.items', this.fileInfoDetail.length)"
+                               v-if="fileInfoDetail.length > 1 && !noSelectedItem" />
                     
-                <TreeMenu :disabled-by-id="pickedItem" :depth="1" :nodes="items" v-for="items in navigation" :key="items.unique_id"/>
+                <TreeMenu :disabled-by-id="pickedItem" :depth="1" :nodes="items" v-for="items in navigation" :key="items.id" />
             </div>
         </PopupContent>
 
         <!--Actions-->
         <PopupActions>
             <ButtonBase
-                    class="popup-button"
-                    @click.native="$closePopup()"
-                    button-style="secondary"
+                class="popup-button"
+                @click.native="$closePopup()"
+                button-style="secondary"
             >{{ $t('popup_move_item.cancel') }}
             </ButtonBase>
             <ButtonBase
-                    class="popup-button"
-                    @click.native="moveItem"
-                    :button-style="selectedFolder ? 'theme' : 'secondary'"
+                class="popup-button"
+                @click.native="moveItem"
+                :button-style="selectedFolder ? 'theme' : 'secondary'"
             >{{ $t('popup_move_item.submit') }}
             </ButtonBase>
         </PopupActions>
@@ -80,25 +80,25 @@
         methods: {
             moveItem() {
                 // Prevent empty submit
-                if (! this.selectedFolder) return
+                if (!this.selectedFolder) return
 
                 //Prevent to move items to the same parent 
-                if(this.fileInfoDetail.find(item => item.parent_id === this.selectedFolder.unique_id)) return
+                if (this.fileInfoDetail.find(item => item.parent_id === this.selectedFolder.id)) return
 
                 // Move item 
-                if(!this.noSelectedItem){
-                    this.$store.dispatch('moveItem', {to_item:this.selectedFolder ,noSelectedItem: null})
+                if (!this.noSelectedItem) {
+                    this.$store.dispatch('moveItem', {to_item: this.selectedFolder, noSelectedItem: null})
                 }
 
-                if(this.noSelectedItem){
-                    this.$store.dispatch('moveItem', {to_item:this.selectedFolder ,noSelectedItem:this.pickedItem})
+                if (this.noSelectedItem) {
+                    this.$store.dispatch('moveItem', {to_item: this.selectedFolder, noSelectedItem: this.pickedItem})
                 }
-                
+
                 // Close popup
                 events.$emit('popup:close')
 
                 // If is mobile, close the selecting mod after done the move action
-                if(this.$isMobile())
+                if (this.$isMobile())
                     events.$emit('mobileSelecting:stop')
             },
         },
@@ -107,7 +107,7 @@
             // Select folder in tree
             events.$on('pick-folder', folder => {
 
-                if (folder.unique_id === this.pickedItem.unique_id) {
+                if (folder.id === this.pickedItem.id) {
                     this.selectedFolder = undefined
                 } else {
                     this.selectedFolder = folder
@@ -118,6 +118,7 @@
             events.$on('popup:open', args => {
 
                 if (args.name !== 'move') return
+
                 // Show tree spinner
                 this.isLoadingTree = true
 
@@ -127,11 +128,12 @@
                 })
 
                 // Store picked item
-                if(!this.fileInfoDetail.includes(args.item[0])){
+                if (!this.fileInfoDetail.includes(args.item[0])) {
                     this.pickedItem = args.item[0]
                     this.noSelectedItem = true
                 }
-                if(this.fileInfoDetail.includes(args.item[0])){
+
+                if (this.fileInfoDetail.includes(args.item[0])) {
                     this.pickedItem = this.fileInfoDetail[0]
                     this.noSelectedItem = false
                 }
@@ -153,37 +155,42 @@
 @import '@assets/vue-file-manager/_variables';
 @import '@assets/vue-file-manager/_mixins';
 
-    .item-thumbnail {
-        margin-bottom: 20px;
-    }
-    .multiple-selected { 
-        padding: 0 20px;;
-        margin-bottom: 20px;
-        /deep/.text{
-            .title {
-                color: $text;
-            }
-            .count {
-                color: $text-muted;
-            }
+.item-thumbnail {
+    margin-bottom: 20px;
+}
+
+.multiple-selected {
+    padding: 0 20px;;
+    margin-bottom: 20px;
+
+    /deep/ .text {
+        .title {
+            color: $text;
         }
-        /deep/.icon-wrapper {
-            .icon { 
-                stroke: $theme;
-            }
+
+        .count {
+            color: $text-muted;
         }
     }
 
-    @media (prefers-color-scheme: dark) {
+    /deep/ .icon-wrapper {
+        .icon {
+            stroke: $theme;
+        }
+    }
+}
+
+@media (prefers-color-scheme: dark) {
     .multiple-selected {
-        /deep/.text {
+        /deep/ .text {
             .title {
                 color: $dark_mode_text_primary;
             }
+
             .count {
                 color: $dark_mode_text_secondary;
             }
-        }      
+        }
     }
 }
 </style>
diff --git a/resources/js/components/Others/RenameItem.vue b/resources/js/components/Others/RenameItem.vue
index c469757c..1bd9b005 100644
--- a/resources/js/components/Others/RenameItem.vue
+++ b/resources/js/components/Others/RenameItem.vue
@@ -1,13 +1,13 @@
 <template>
     <PopupWrapper name="rename-item">
         <!--Title-->
-        <PopupHeader :title="$t('popup_rename.title', {item: itemTypeTitle})" icon="edit"/>
+        <PopupHeader :title="$t('popup_rename.title', {item: itemTypeTitle})" icon="edit" />
 
         <!--Content-->
         <PopupContent>
 
             <!--Item Thumbnail-->
-            <ThumbnailItem class="item-thumbnail" :item="pickedItem" info="metadata" :setFolderIcon="setFolderIcon"/>
+            <ThumbnailItem class="item-thumbnail" :item="pickedItem" info="metadata" :setFolderIcon="folderIcon" />
 
             <!--Form to set sharing-->
             <ValidationObserver @submit.prevent="changeName" ref="renameForm" v-slot="{ invalid }" tag="form" class="form-wrapper">
@@ -18,33 +18,32 @@
                     <div class="input">
                         <input v-model="pickedItem.name" :class="{'is-error': errors[0]}" ref="input" type="text" :placeholder="$t('popup_rename.placeholder')">
                         <div @click="pickedItem.name = ''" class="close-icon-wrapper">
-                            <x-icon class="close-icon" size="14"/>
+                            <x-icon class="close-icon" size="14" />
                         </div>
                     </div>
                     <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                 </ValidationProvider>
 
-                <SetFolderIcon v-if="isMoreOptions" :folderData="pickedItem"/>
+                <SetFolderIcon v-if="isMoreOptions" :folderData="pickedItem" />
 
                 <ActionButton v-if="pickedItem.type === 'folder'" @click.native.stop="moreOptions" :icon="isMoreOptions ? 'x' : 'pencil-alt'">{{ moreOptionsTitle }}</ActionButton>
-
             </ValidationObserver>
-
-
         </PopupContent>
 
         <!--Actions-->
         <PopupActions>
-            <ButtonBase class="popup-button" @click.native="$closePopup()" button-style="secondary">{{ $t('popup_move_item.cancel') }}
+            <ButtonBase class="popup-button" @click.native="$closePopup()" button-style="secondary">
+                {{ $t('popup_move_item.cancel') }}
             </ButtonBase>
-            <ButtonBase class="popup-button" @click.native="changeName" button-style="theme">{{ $t('popup_share_edit.save') }}
+            <ButtonBase class="popup-button" @click.native="changeName" button-style="theme">
+                {{ $t('popup_share_edit.save') }}
             </ButtonBase>
         </PopupActions>
     </PopupWrapper>
 </template>
 
 <script>
-import { ValidationProvider, ValidationObserver } from 'vee-validate/dist/vee-validate.full'
+import {ValidationProvider, ValidationObserver} from 'vee-validate/dist/vee-validate.full'
 import PopupWrapper from '@/components/Others/Popup/PopupWrapper'
 import PopupActions from '@/components/Others/Popup/PopupActions'
 import PopupContent from '@/components/Others/Popup/PopupContent'
@@ -53,9 +52,9 @@ import SetFolderIcon from '@/components/Others/SetFolderIcon'
 import ThumbnailItem from '@/components/Others/ThumbnailItem'
 import ActionButton from '@/components/Others/ActionButton'
 import ButtonBase from '@/components/FilesView/ButtonBase'
-import { XIcon } from 'vue-feather-icons'
-import { required } from 'vee-validate/dist/rules'
-import { events } from '@/bus'
+import {XIcon} from 'vue-feather-icons'
+import {required} from 'vee-validate/dist/rules'
+import {events} from '@/bus'
 
 export default {
     name: 'RenameItem',
@@ -85,7 +84,7 @@ export default {
         return {
             pickedItem: undefined,
             isMoreOptions: false,
-            setFolderIcon: undefined
+            folderIcon: undefined
         }
     },
     methods: {
@@ -99,9 +98,14 @@ export default {
                     id: this.pickedItem.id,
                     type: this.pickedItem.type,
                     name: this.pickedItem.name,
-                    icon: this.setFolderIcon ? this.setFolderIcon : null
                 }
 
+                if (this.folderIcon.emoji)
+                    item['emoji'] = this.folderIcon.emoji
+
+                if (this.folderIcon.color)
+                    item['color'] = this.folderIcon.color
+
                 // Rename item request
                 this.$store.dispatch('renameItem', item)
 
@@ -119,20 +123,20 @@ export default {
 
             if (args.name !== 'rename-item') return
 
-            if (! this.$isMobile()) {
+            if (!this.$isMobile()) {
                 this.$nextTick(() => this.$refs.input.focus())
             }
 
             this.isMoreOptions = false
 
-            this.setFolderIcon = undefined
+            this.folderIcon = undefined
 
             // Store picked item
             this.pickedItem = args.item
         })
 
         events.$on('setFolderIcon', (icon) => {
-            this.setFolderIcon = icon
+            this.folderIcon = icon
         })
     }
 }
diff --git a/resources/js/components/Others/SetFolderIcon.vue b/resources/js/components/Others/SetFolderIcon.vue
index 9e35f626..46eb5b71 100644
--- a/resources/js/components/Others/SetFolderIcon.vue
+++ b/resources/js/components/Others/SetFolderIcon.vue
@@ -8,7 +8,7 @@
 
         <!-- Colors Picker-->
         <TabOption :title="$t('popup_rename.tab_color_title')" icon="folder">
-            <ColorPicker :picked-color="pickedColor" v-model="selectedColor"/>
+            <ColorPicker :picked-color="pickedColor" v-model="selectedColor" />
         </TabOption>
     </TabWrapper>
 </template>
@@ -18,11 +18,11 @@ import EmojiPicker from '@/components/Others/EmojiPicker'
 import ColorPicker from '@/components/Others/ColorPicker'
 import TabWrapper from '@/components/Others/TabWrapper'
 import TabOption from '@/components/Others/TabOption'
-import { events } from '@/bus'
+import {events} from '@/bus'
 
 export default {
     name: 'SetFolderIcon',
-    props: [ 'folderData' ],
+    props: ['folderData'],
     components: {
         EmojiPicker,
         ColorPicker,
@@ -30,7 +30,7 @@ export default {
         TabOption,
     },
     computed: {
-        pickedEmoji () {
+        pickedEmoji() {
             // If is color not selected and emoji is selected, push picked emoji to EmojiPicker for the EmojiSelected input
             return !this.selectedColor && this.selectedEmoji ? this.selectedEmoji : undefined
         },
@@ -46,46 +46,44 @@ export default {
         }
     },
     watch: {
-        selectedColor () {
-
+        selectedColor() {
             let color = {'color': this.selectedColor}
 
-            if( this.selectedColor ) {
+            if (this.selectedColor) {
 
                 this.selectedEmoji = undefined
-                events.$emit('setFolderIcon', color )
+                events.$emit('setFolderIcon', color)
             }
-          
         },
-        selectedEmoji () {
+        selectedEmoji() {
 
-            let emoji = { 'emoji': this.selectedEmoji }
+            let emoji = {'emoji': this.selectedEmoji}
 
-            if( this.selectedEmoji ) {
+            if (this.selectedEmoji) {
 
                 this.selectedColor = undefined
-                events.$emit('setFolderIcon', this.selectedEmoji ==='default' ? 'default' : emoji )
+                events.$emit('setFolderIcon', this.selectedEmoji === 'default' ? 'default' : emoji)
             }
         },
     },
     created() {
-        if(this.folderData) {
-            
+        if (this.folderData) {
+
             // If folder have already set some color set this color to selected color
-            this.folderData.icon_color ? this.selectedColor = this.folderData.icon_color : ''
+            this.folderData.color ? this.selectedColor = this.folderData.color : ''
 
             // If folder have already set some emojit set this emoji to selected emoji
-            this.folderData.icon_emoji ? this.selectedEmoji = this.folderData.icon_emoji : ''
+            this.folderData.emoji ? this.selectedEmoji = this.folderData.emoji : ''
         }
     },
-    destroyed () {
-        if(this.folderData) {
-            
+    destroyed() {
+        if (this.folderData) {
+
             // After close SetFolderIcon set the saved folder icon for thumbnail
-            let color = {'color': this.folderData.icon_color }
-            let emoji = {'emoji': this.folderData.icon_emoji }
-    
-            events.$emit('setFolderIcon', this.folderData.icon_emoji ? emoji : color  )
+            let color = {'color': this.folderData.color}
+            let emoji = {'emoji': this.folderData.emoji}
+
+            events.$emit('setFolderIcon', this.folderData.emoji ? emoji : color)
         }
     }
 }
diff --git a/resources/js/components/Others/TreeMenu.vue b/resources/js/components/Others/TreeMenu.vue
index a16bed11..0b159609 100644
--- a/resources/js/components/Others/TreeMenu.vue
+++ b/resources/js/components/Others/TreeMenu.vue
@@ -1,6 +1,6 @@
 <template>
     <!--Folder Icon-->
-    <div class="folder-item-wrapper" :class="{'is-inactive': disabledById && disabledById.unique_id === nodes.unique_id || !disableId} ">
+    <div class="folder-item-wrapper" :class="{'is-inactive': disabledById && disabledById.id === nodes.id || !disableId} ">
 
         <div class="folder-item" :class="{'is-selected': isSelected}" @click="getFolder" :style="indent">
             <chevron-right-icon @click.stop="showTree" size="17" class="icon-arrow" :class="{'is-opened': isVisible, 'is-visible': nodes.folders.length !== 0}"></chevron-right-icon>
@@ -9,7 +9,7 @@
             <span class="label">{{ nodes.name }}</span>
         </div>
 
-        <TreeMenu :disabled-by-id="disabledById" :depth="depth + 1" v-if="isVisible" :nodes="item" v-for="item in nodes.folders" :key="item.unique_id" />
+        <TreeMenu :disabled-by-id="disabledById" :depth="depth + 1" v-if="isVisible" :nodes="item" v-for="item in nodes.folders" :key="item.id" />
     </div>
 </template>
 
@@ -39,7 +39,7 @@
                 let canBeShow = true
                 if(this.fileInfoDetail.includes(this.disabledById)){
                     this.fileInfoDetail.map(item => {
-                        if(item.unique_id === this.nodes.unique_id) {
+                        if(item.id === this.nodes.id) {
                             canBeShow = false
                         }
                     })
@@ -73,7 +73,7 @@
             events.$on('pick-folder', node => {
                 this.isSelected = false
 
-                if (this.nodes.unique_id == node.unique_id)
+                if (this.nodes.id === node.id)
                     this.isSelected = true
             })
 
@@ -81,7 +81,7 @@
             events.$on('show-folder-item', node => {
                 this.isSelected = false
 
-                if (this.nodes.unique_id == node.unique_id)
+                if (this.nodes.id === node.id)
                     this.isSelected = true
             })
         }
diff --git a/resources/js/helpers.js b/resources/js/helpers.js
index 134bb55f..43c4764c 100644
--- a/resources/js/helpers.js
+++ b/resources/js/helpers.js
@@ -85,7 +85,7 @@ const Helpers = {
 			// Push items to file queue
 			[...files].map(item => {
 				this.$store.commit('ADD_FILES_TO_QUEUE', {
-					parent_id: store.getters.currentFolder.id,
+					folder_id: store.getters.currentFolder.id,
 					file: item,
 				})
 			});
@@ -106,7 +106,7 @@ const Helpers = {
 			// Push items to file queue
             [...event.dataTransfer.items].map(item => {
 				this.$store.commit('ADD_FILES_TO_QUEUE', {
-					parent_id: parent_id,
+                    folder_id: parent_id,
 					file: item.getAsFile(),
 				})
 			});
diff --git a/resources/js/store/modules/app.js b/resources/js/store/modules/app.js
index 908bd10e..991fd9fc 100644
--- a/resources/js/store/modules/app.js
+++ b/resources/js/store/modules/app.js
@@ -1,1055 +1,1057 @@
 import i18n from '@/i18n/index'
 
 const defaultState = {
-	fileInfoPanelVisible: localStorage.getItem('file_info_visibility') === 'true' || false,
-	FilePreviewType: localStorage.getItem('preview_type') || 'list',
-	config: undefined,
-	index: undefined,
-	authorized: undefined,
-	homeDirectory: undefined,
-	requestedPlan: undefined,
-	emojis: undefined,
-	sorting: {
-		sort: localStorage.getItem('sorting') ? JSON.parse(localStorage.getItem('sorting')).sort : 'DESC',
-		field: localStorage.getItem('sorting') ? JSON.parse(localStorage.getItem('sorting')).field : 'created_at',
-	},
-	roles: [
-		{
-			label: i18n.t('roles.admin'),
-			value: 'admin',
-		},
-		{
-			label: i18n.t('roles.user'),
-			value: 'user',
-		},
-	],
-	countries: [
-		{label: 'Afghanistan', value: 'AF'},
-		{label: 'Åland Islands', value: 'AX'},
-		{label: 'Albania', value: 'AL'},
-		{label: 'Algeria', value: 'DZ'},
-		{label: 'American Samoa', value: 'AS'},
-		{label: 'AndorrA', value: 'AD'},
-		{label: 'Angola', value: 'AO'},
-		{label: 'Anguilla', value: 'AI'},
-		{label: 'Antarctica', value: 'AQ'},
-		{label: 'Antigua and Barbuda', value: 'AG'},
-		{label: 'Argentina', value: 'AR'},
-		{label: 'Armenia', value: 'AM'},
-		{label: 'Aruba', value: 'AW'},
-		{label: 'Australia', value: 'AU'},
-		{label: 'Austria', value: 'AT'},
-		{label: 'Azerbaijan', value: 'AZ'},
-		{label: 'Bahamas', value: 'BS'},
-		{label: 'Bahrain', value: 'BH'},
-		{label: 'Bangladesh', value: 'BD'},
-		{label: 'Barbados', value: 'BB'},
-		{label: 'Belarus', value: 'BY'},
-		{label: 'Belgium', value: 'BE'},
-		{label: 'Belize', value: 'BZ'},
-		{label: 'Benin', value: 'BJ'},
-		{label: 'Bermuda', value: 'BM'},
-		{label: 'Bhutan', value: 'BT'},
-		{label: 'Bolivia', value: 'BO'},
-		{label: 'Bosnia and Herzegovina', value: 'BA'},
-		{label: 'Botswana', value: 'BW'},
-		{label: 'Bouvet Island', value: 'BV'},
-		{label: 'Brazil', value: 'BR'},
-		{label: 'British Indian Ocean Territory', value: 'IO'},
-		{label: 'Brunei Darussalam', value: 'BN'},
-		{label: 'Bulgaria', value: 'BG'},
-		{label: 'Burkina Faso', value: 'BF'},
-		{label: 'Burundi', value: 'BI'},
-		{label: 'Cambodia', value: 'KH'},
-		{label: 'Cameroon', value: 'CM'},
-		{label: 'Canada', value: 'CA'},
-		{label: 'Cape Verde', value: 'CV'},
-		{label: 'Cayman Islands', value: 'KY'},
-		{label: 'Central African Republic', value: 'CF'},
-		{label: 'Chad', value: 'TD'},
-		{label: 'Chile', value: 'CL'},
-		{label: 'China', value: 'CN'},
-		{label: 'Christmas Island', value: 'CX'},
-		{label: 'Cocos (Keeling) Islands', value: 'CC'},
-		{label: 'Colombia', value: 'CO'},
-		{label: 'Comoros', value: 'KM'},
-		{label: 'Congo', value: 'CG'},
-		{label: 'Congo, The Democratic Republic of the', value: 'CD'},
-		{label: 'Cook Islands', value: 'CK'},
-		{label: 'Costa Rica', value: 'CR'},
-		{label: 'Cote D\'Ivoire', value: 'CI'},
-		{label: 'Croatia', value: 'HR'},
-		{label: 'Cuba', value: 'CU'},
-		{label: 'Cyprus', value: 'CY'},
-		{label: 'Czech Republic', value: 'CZ'},
-		{label: 'Denmark', value: 'DK'},
-		{label: 'Djibouti', value: 'DJ'},
-		{label: 'Dominica', value: 'DM'},
-		{label: 'Dominican Republic', value: 'DO'},
-		{label: 'Ecuador', value: 'EC'},
-		{label: 'Egypt', value: 'EG'},
-		{label: 'El Salvador', value: 'SV'},
-		{label: 'Equatorial Guinea', value: 'GQ'},
-		{label: 'Eritrea', value: 'ER'},
-		{label: 'Estonia', value: 'EE'},
-		{label: 'Ethiopia', value: 'ET'},
-		{label: 'Falkland Islands (Malvinas)', value: 'FK'},
-		{label: 'Faroe Islands', value: 'FO'},
-		{label: 'Fiji', value: 'FJ'},
-		{label: 'Finland', value: 'FI'},
-		{label: 'France', value: 'FR'},
-		{label: 'French Guiana', value: 'GF'},
-		{label: 'French Polynesia', value: 'PF'},
-		{label: 'French Southern Territories', value: 'TF'},
-		{label: 'Gabon', value: 'GA'},
-		{label: 'Gambia', value: 'GM'},
-		{label: 'Georgia', value: 'GE'},
-		{label: 'Germany', value: 'DE'},
-		{label: 'Ghana', value: 'GH'},
-		{label: 'Gibraltar', value: 'GI'},
-		{label: 'Greece', value: 'GR'},
-		{label: 'Greenland', value: 'GL'},
-		{label: 'Grenada', value: 'GD'},
-		{label: 'Guadeloupe', value: 'GP'},
-		{label: 'Guam', value: 'GU'},
-		{label: 'Guatemala', value: 'GT'},
-		{label: 'Guernsey', value: 'GG'},
-		{label: 'Guinea', value: 'GN'},
-		{label: 'Guinea-Bissau', value: 'GW'},
-		{label: 'Guyana', value: 'GY'},
-		{label: 'Haiti', value: 'HT'},
-		{label: 'Heard Island and Mcdonald Islands', value: 'HM'},
-		{label: 'Holy See (Vatican City State)', value: 'VA'},
-		{label: 'Honduras', value: 'HN'},
-		{label: 'Hong Kong', value: 'HK'},
-		{label: 'Hungary', value: 'HU'},
-		{label: 'Iceland', value: 'IS'},
-		{label: 'India', value: 'IN'},
-		{label: 'Indonesia', value: 'ID'},
-		{label: 'Iran, Islamic Republic Of', value: 'IR'},
-		{label: 'Iraq', value: 'IQ'},
-		{label: 'Ireland', value: 'IE'},
-		{label: 'Isle of Man', value: 'IM'},
-		{label: 'Israel', value: 'IL'},
-		{label: 'Italy', value: 'IT'},
-		{label: 'Jamaica', value: 'JM'},
-		{label: 'Japan', value: 'JP'},
-		{label: 'Jersey', value: 'JE'},
-		{label: 'Jordan', value: 'JO'},
-		{label: 'Kazakhstan', value: 'KZ'},
-		{label: 'Kenya', value: 'KE'},
-		{label: 'Kiribati', value: 'KI'},
-		{label: 'Korea, Democratic People\'S Republic of', value: 'KP'},
-		{label: 'Korea, Republic of', value: 'KR'},
-		{label: 'Kuwait', value: 'KW'},
-		{label: 'Kyrgyzstan', value: 'KG'},
-		{label: 'Lao People\'S Democratic Republic', value: 'LA'},
-		{label: 'Latvia', value: 'LV'},
-		{label: 'Lebanon', value: 'LB'},
-		{label: 'Lesotho', value: 'LS'},
-		{label: 'Liberia', value: 'LR'},
-		{label: 'Libyan Arab Jamahiriya', value: 'LY'},
-		{label: 'Liechtenstein', value: 'LI'},
-		{label: 'Lithuania', value: 'LT'},
-		{label: 'Luxembourg', value: 'LU'},
-		{label: 'Macao', value: 'MO'},
-		{label: 'Macedonia, The Former Yugoslav Republic of', value: 'MK'},
-		{label: 'Madagascar', value: 'MG'},
-		{label: 'Malawi', value: 'MW'},
-		{label: 'Malaysia', value: 'MY'},
-		{label: 'Maldives', value: 'MV'},
-		{label: 'Mali', value: 'ML'},
-		{label: 'Malta', value: 'MT'},
-		{label: 'Marshall Islands', value: 'MH'},
-		{label: 'Martinique', value: 'MQ'},
-		{label: 'Mauritania', value: 'MR'},
-		{label: 'Mauritius', value: 'MU'},
-		{label: 'Mayotte', value: 'YT'},
-		{label: 'Mexico', value: 'MX'},
-		{label: 'Micronesia, Federated States of', value: 'FM'},
-		{label: 'Moldova, Republic of', value: 'MD'},
-		{label: 'Monaco', value: 'MC'},
-		{label: 'Mongolia', value: 'MN'},
-		{label: 'Montserrat', value: 'MS'},
-		{label: 'Morocco', value: 'MA'},
-		{label: 'Mozambique', value: 'MZ'},
-		{label: 'Myanmar', value: 'MM'},
-		{label: 'Namibia', value: 'NA'},
-		{label: 'Nauru', value: 'NR'},
-		{label: 'Nepal', value: 'NP'},
-		{label: 'Netherlands', value: 'NL'},
-		{label: 'Netherlands Antilles', value: 'AN'},
-		{label: 'New Caledonia', value: 'NC'},
-		{label: 'New Zealand', value: 'NZ'},
-		{label: 'Nicaragua', value: 'NI'},
-		{label: 'Niger', value: 'NE'},
-		{label: 'Nigeria', value: 'NG'},
-		{label: 'Niue', value: 'NU'},
-		{label: 'Norfolk Island', value: 'NF'},
-		{label: 'Northern Mariana Islands', value: 'MP'},
-		{label: 'Norway', value: 'NO'},
-		{label: 'Oman', value: 'OM'},
-		{label: 'Pakistan', value: 'PK'},
-		{label: 'Palau', value: 'PW'},
-		{label: 'Palestinian Territory, Occupied', value: 'PS'},
-		{label: 'Panama', value: 'PA'},
-		{label: 'Papua New Guinea', value: 'PG'},
-		{label: 'Paraguay', value: 'PY'},
-		{label: 'Peru', value: 'PE'},
-		{label: 'Philippines', value: 'PH'},
-		{label: 'Pitcairn', value: 'PN'},
-		{label: 'Poland', value: 'PL'},
-		{label: 'Portugal', value: 'PT'},
-		{label: 'Puerto Rico', value: 'PR'},
-		{label: 'Qatar', value: 'QA'},
-		{label: 'Reunion', value: 'RE'},
-		{label: 'Romania', value: 'RO'},
-		{label: 'Russian Federation', value: 'RU'},
-		{label: 'RWANDA', value: 'RW'},
-		{label: 'Saint Helena', value: 'SH'},
-		{label: 'Saint Kitts and Nevis', value: 'KN'},
-		{label: 'Saint Lucia', value: 'LC'},
-		{label: 'Saint Pierre and Miquelon', value: 'PM'},
-		{label: 'Saint Vincent and the Grenadines', value: 'VC'},
-		{label: 'Samoa', value: 'WS'},
-		{label: 'San Marino', value: 'SM'},
-		{label: 'Sao Tome and Principe', value: 'ST'},
-		{label: 'Saudi Arabia', value: 'SA'},
-		{label: 'Senegal', value: 'SN'},
-		{label: 'Serbia and Montenegro', value: 'CS'},
-		{label: 'Seychelles', value: 'SC'},
-		{label: 'Sierra Leone', value: 'SL'},
-		{label: 'Singapore', value: 'SG'},
-		{label: 'Slovakia', value: 'SK'},
-		{label: 'Slovenia', value: 'SI'},
-		{label: 'Solomon Islands', value: 'SB'},
-		{label: 'Somalia', value: 'SO'},
-		{label: 'South Africa', value: 'ZA'},
-		{label: 'South Georgia and the South Sandwich Islands', value: 'GS'},
-		{label: 'Spain', value: 'ES'},
-		{label: 'Sri Lanka', value: 'LK'},
-		{label: 'Sudan', value: 'SD'},
-		{label: 'Suriname', value: 'SR'},
-		{label: 'Svalbard and Jan Mayen', value: 'SJ'},
-		{label: 'Swaziland', value: 'SZ'},
-		{label: 'Sweden', value: 'SE'},
-		{label: 'Switzerland', value: 'CH'},
-		{label: 'Syrian Arab Republic', value: 'SY'},
-		{label: 'Taiwan, Province of China', value: 'TW'},
-		{label: 'Tajikistan', value: 'TJ'},
-		{label: 'Tanzania, United Republic of', value: 'TZ'},
-		{label: 'Thailand', value: 'TH'},
-		{label: 'Timor-Leste', value: 'TL'},
-		{label: 'Togo', value: 'TG'},
-		{label: 'Tokelau', value: 'TK'},
-		{label: 'Tonga', value: 'TO'},
-		{label: 'Trinidad and Tobago', value: 'TT'},
-		{label: 'Tunisia', value: 'TN'},
-		{label: 'Turkey', value: 'TR'},
-		{label: 'Turkmenistan', value: 'TM'},
-		{label: 'Turks and Caicos Islands', value: 'TC'},
-		{label: 'Tuvalu', value: 'TV'},
-		{label: 'Uganda', value: 'UG'},
-		{label: 'Ukraine', value: 'UA'},
-		{label: 'United Arab Emirates', value: 'AE'},
-		{label: 'United Kingdom', value: 'GB'},
-		{label: 'United States', value: 'US'},
-		{label: 'United States Minor Outlying Islands', value: 'UM'},
-		{label: 'Uruguay', value: 'UY'},
-		{label: 'Uzbekistan', value: 'UZ'},
-		{label: 'Vanuatu', value: 'VU'},
-		{label: 'Venezuela', value: 'VE'},
-		{label: 'Viet Nam', value: 'VN'},
-		{label: 'Virgin Islands, British', value: 'VG'},
-		{label: 'Virgin Islands, U.S.', value: 'VI'},
-		{label: 'Wallis and Futuna', value: 'WF'},
-		{label: 'Western Sahara', value: 'EH'},
-		{label: 'Yemen', value: 'YE'},
-		{label: 'Zambia', value: 'ZM'},
-		{label: 'Zimbabwe', value: 'ZW'}
-	],
-	expirationList: [
-		{
-			label: i18n.t('shared_form.expiration_hour', {value: 1}),
-			value: 1,
-		},
-		{
-			label: i18n.t('shared_form.expiration_hour', {value: 2}),
-			value: 2,
-		},
-		{
-			label: i18n.t('shared_form.expiration_hour', {value: 6}),
-			value: 6,
-		},
-		{
-			label: i18n.t('shared_form.expiration_hour', {value: 12}),
-			value: 12,
-		},
-		{
-			label: i18n.t('shared_form.expiration_day', {value: 1}),
-			value: 24,
-		},
-		{
-			label: i18n.t('shared_form.expiration_day', {value: 2}),
-			value: 48,
-		},
-		{
-			label: i18n.t('shared_form.expiration_day', {value: 7}),
-			value: 168,
-		},
-	],
-	currencyList: [
-		{
-			label: 'USD - United States Dollar',
-			value: 'USD',
-		},
-		{
-			label: 'EUR - Euro',
-			value: 'EUR',
-		},
-		{
-			label: 'GBP - British Pound',
-			value: 'GBP',
-		},
-		{
-			label: 'AFN - Afghan Afghani',
-			value: 'AFN',
-		},
-		{
-			label: 'ALL - Albanian Lek',
-			value: 'ALL',
-		},
-		{
-			label: 'DZD - Algerian Dinar',
-			value: 'DZD',
-		},
-		{
-			label: 'AOA - Angolan Kwanza',
-			value: 'AOA',
-		},
-		{
-			label: 'ARS - Argentine Peso',
-			value: 'ARS',
-		},
-		{
-			label: 'AMD - Armenian Dram',
-			value: 'AMD',
-		},
-		{
-			label: 'AWG - Aruban Florin',
-			value: 'AWG',
-		},
-		{
-			label: 'AUD - Australian Dollar',
-			value: 'AUD',
-		},
-		{
-			label: 'AZN - Azerbaijani Manat',
-			value: 'AZN',
-		},
-		{
-			label: 'BDT - Bangladeshi Taka',
-			value: 'BDT',
-		},
-		{
-			label: 'BBD - Barbadian Dollar',
-			value: 'BBD',
-		},
-		{
-			label: 'BZD - Belize Dollar',
-			value: 'BZD',
-		},
-		{
-			label: 'BMD - Bermudian Dollar',
-			value: 'BMD',
-		},
-		{
-			label: 'BOB - Bolivian Boliviano',
-			value: 'BOB',
-		},
-		{
-			label: 'BAM - Bosnia & Herzegovina Convertible Mark',
-			value: 'BAM',
-		},
-		{
-			label: 'BWP - Botswana Pula',
-			value: 'BWP',
-		},
-		{
-			label: 'BRL - Brazilian Real',
-			value: 'BRL',
-		},
-		{
-			label: 'BND - Brunei Dollar',
-			value: 'BND',
-		},
-		{
-			label: 'BGN - Bulgarian Lev',
-			value: 'BGN',
-		},
-		{
-			label: 'BIF - Burundian Franc',
-			value: 'BIF',
-		},
-		{
-			label: 'KHR - Cambodian Riel',
-			value: 'KHR',
-		},
-		{
-			label: 'CAD - Canadian Dollar',
-			value: 'CAD',
-		},
-		{
-			label: 'CVE - Cape Verdean Escudo',
-			value: 'CVE',
-		},
-		{
-			label: 'KYD - Cayman Islands Dollar',
-			value: 'KYD',
-		},
-		{
-			label: 'XAF - Central African Cfa Franc',
-			value: 'XAF',
-		},
-		{
-			label: 'XPF - Cfp Franc',
-			value: 'XPF',
-		},
-		{
-			label: 'CLP - Chilean Peso',
-			value: 'CLP',
-		},
-		{
-			label: 'CNY - Chinese Renminbi Yuan',
-			value: 'CNY',
-		},
-		{
-			label: 'COP - Colombian Peso',
-			value: 'COP',
-		},
-		{
-			label: 'KMF - Comorian Franc',
-			value: 'KMF',
-		},
-		{
-			label: 'CDF - Congolese Franc',
-			value: 'CDF',
-		},
-		{
-			label: 'CRC - Costa Rican Colón',
-			value: 'CRC',
-		},
-		{
-			label: 'HRK - Croatian Kuna',
-			value: 'HRK',
-		},
-		{
-			label: 'CZK - Czech Koruna',
-			value: 'CZK',
-		},
-		{
-			label: 'DKK - Danish Krone',
-			value: 'DKK',
-		},
-		{
-			label: 'DJF - Djiboutian Franc',
-			value: 'DJF',
-		},
-		{
-			label: 'DOP - Dominican Peso',
-			value: 'DOP',
-		},
-		{
-			label: 'XCD - East Caribbean Dollar',
-			value: 'XCD',
-		},
-		{
-			label: 'EGP - Egyptian Pound',
-			value: 'EGP',
-		},
-		{
-			label: 'ETB - Ethiopian Birr',
-			value: 'ETB',
-		},
-		{
-			label: 'FKP - Falkland Islands Pound',
-			value: 'FKP',
-		},
-		{
-			label: 'FJD - Fijian Dollar',
-			value: 'FJD',
-		},
-		{
-			label: 'GMD - Gambian Dalasi',
-			value: 'GMD',
-		},
-		{
-			label: 'GEL - Georgian Lari',
-			value: 'GEL',
-		},
-		{
-			label: 'GIP - Gibraltar Pound',
-			value: 'GIP',
-		},
-		{
-			label: 'GTQ - Guatemalan Quetzal',
-			value: 'GTQ',
-		},
-		{
-			label: 'GNF - Guinean Franc',
-			value: 'GNF',
-		},
-		{
-			label: 'GYD - Guyanese Dollar',
-			value: 'GYD',
-		},
-		{
-			label: 'HTG - Haitian Gourde',
-			value: 'HTG',
-		},
-		{
-			label: 'HNL - Honduran Lempira',
-			value: 'HNL',
-		},
-		{
-			label: 'HKD - Hong Kong Dollar',
-			value: 'HKD',
-		},
-		{
-			label: 'HUF - Hungarian Forint',
-			value: 'HUF',
-		},
-		{
-			label: 'ISK - Icelandic Króna',
-			value: 'ISK',
-		},
-		{
-			label: 'INR - Indian Rupee',
-			value: 'INR',
-		},
-		{
-			label: 'IDR - Indonesian Rupiah',
-			value: 'IDR',
-		},
-		{
-			label: 'ILS - Israeli New Sheqel',
-			value: 'ILS',
-		},
-		{
-			label: 'JMD - Jamaican Dollar',
-			value: 'JMD',
-		},
-		{
-			label: 'JPY - Japanese Yen',
-			value: 'JPY',
-		},
-		{
-			label: 'KZT - Kazakhstani Tenge',
-			value: 'KZT',
-		},
-		{
-			label: 'KES - Kenyan Shilling',
-			value: 'KES',
-		},
-		{
-			label: 'KGS - Kyrgyzstani Som',
-			value: 'KGS',
-		},
-		{
-			label: 'LAK - Lao Kip',
-			value: 'LAK',
-		},
-		{
-			label: 'LBP - Lebanese Pound',
-			value: 'LBP',
-		},
-		{
-			label: 'LSL - Lesotho Loti',
-			value: 'LSL',
-		},
-		{
-			label: 'LRD - Liberian Dollar',
-			value: 'LRD',
-		},
-		{
-			label: 'MOP - Macanese Pataca',
-			value: 'MOP',
-		},
-		{
-			label: 'MKD - Macedonian Denar',
-			value: 'MKD',
-		},
-		{
-			label: 'MGA - Malagasy Ariary',
-			value: 'MGA',
-		},
-		{
-			label: 'MWK - Malawian Kwacha',
-			value: 'MWK',
-		},
-		{
-			label: 'MYR - Malaysian Ringgit',
-			value: 'MYR',
-		},
-		{
-			label: 'MVR - Maldivian Rufiyaa',
-			value: 'MVR',
-		},
-		{
-			label: 'MRO - Mauritanian Ouguiya',
-			value: 'MRO',
-		},
-		{
-			label: 'MUR - Mauritian Rupee',
-			value: 'MUR',
-		},
-		{
-			label: 'MXN - Mexican Peso',
-			value: 'MXN',
-		},
-		{
-			label: 'MDL - Moldovan Leu',
-			value: 'MDL',
-		},
-		{
-			label: 'MNT - Mongolian Tögrög',
-			value: 'MNT',
-		},
-		{
-			label: 'MAD - Moroccan Dirham',
-			value: 'MAD',
-		},
-		{
-			label: 'MZN - Mozambican Metical',
-			value: 'MZN',
-		},
-		{
-			label: 'MMK - Myanmar Kyat',
-			value: 'MMK',
-		},
-		{
-			label: 'NAD - Namibian Dollar',
-			value: 'NAD',
-		},
-		{
-			label: 'NPR - Nepalese Rupee',
-			value: 'NPR',
-		},
-		{
-			label: 'ANG - Netherlands Antillean Gulden',
-			value: 'ANG',
-		},
-		{
-			label: 'TWD - New Taiwan Dollar',
-			value: 'TWD',
-		},
-		{
-			label: 'NZD - New Zealand Dollar',
-			value: 'NZD',
-		},
-		{
-			label: 'NIO - Nicaraguan Córdoba',
-			value: 'NIO',
-		},
-		{
-			label: 'NGN - Nigerian Naira',
-			value: 'NGN',
-		},
-		{
-			label: 'NOK - Norwegian Krone',
-			value: 'NOK',
-		},
-		{
-			label: 'PKR - Pakistani Rupee',
-			value: 'PKR',
-		},
-		{
-			label: 'PAB - Panamanian Balboa',
-			value: 'PAB',
-		},
-		{
-			label: 'PGK - Papua New Guinean Kina',
-			value: 'PGK',
-		},
-		{
-			label: 'PYG - Paraguayan Guaraní',
-			value: 'PYG',
-		},
-		{
-			label: 'PEN - Peruvian Nuevo Sol',
-			value: 'PEN',
-		},
-		{
-			label: 'PHP - Philippine Peso',
-			value: 'PHP',
-		},
-		{
-			label: 'PLN - Polish Złoty',
-			value: 'PLN',
-		},
-		{
-			label: 'QAR - Qatari Riyal',
-			value: 'QAR',
-		},
-		{
-			label: 'RON - Romanian Leu',
-			value: 'RON',
-		},
-		{
-			label: 'RUB - Russian Ruble',
-			value: 'RUB',
-		},
-		{
-			label: 'RWF - Rwandan Franc',
-			value: 'RWF',
-		},
-		{
-			label: 'STD - São Tomé and Príncipe Dobra',
-			value: 'STD',
-		},
-		{
-			label: 'SHP - Saint Helenian Pound',
-			value: 'SHP',
-		},
-		{
-			label: 'SVC - Salvadoran Colón',
-			value: 'SVC',
-		},
-		{
-			label: 'WST - Samoan Tala',
-			value: 'WST',
-		},
-		{
-			label: 'SAR - Saudi Riyal',
-			value: 'SAR',
-		},
-		{
-			label: 'RSD - Serbian Dinar',
-			value: 'RSD',
-		},
-		{
-			label: 'SCR - Seychellois Rupee',
-			value: 'SCR',
-		},
-		{
-			label: 'SLL - Sierra Leonean Leone',
-			value: 'SLL',
-		},
-		{
-			label: 'SGD - Singapore Dollar',
-			value: 'SGD',
-		},
-		{
-			label: 'SBD - Solomon Islands Dollar',
-			value: 'SBD',
-		},
-		{
-			label: 'SOS - Somali Shilling',
-			value: 'SOS',
-		},
-		{
-			label: 'ZAR - South African Rand',
-			value: 'ZAR',
-		},
-		{
-			label: 'KRW - South Korean Won',
-			value: 'KRW',
-		},
-		{
-			label: 'LKR - Sri Lankan Rupee',
-			value: 'LKR',
-		},
-		{
-			label: 'SRD - Surinamese Dollar',
-			value: 'SRD',
-		},
-		{
-			label: 'SZL - Swazi Lilangeni',
-			value: 'SZL',
-		},
-		{
-			label: 'SEK - Swedish Krona',
-			value: 'SEK',
-		},
-		{
-			label: 'CHF - Swiss Franc',
-			value: 'CHF',
-		},
-		{
-			label: 'TJS - Tajikistani Somoni',
-			value: 'TJS',
-		},
-		{
-			label: 'TZS - Tanzanian Shilling',
-			value: 'TZS',
-		},
-		{
-			label: 'THB - Thai Baht',
-			value: 'THB',
-		},
-		{
-			label: 'TOP - Tongan Paʻanga',
-			value: 'TOP',
-		},
-		{
-			label: 'TTD - Trinidad and Tobago Dollar',
-			value: 'TTD',
-		},
-		{
-			label: 'TRY - Turkish Lira',
-			value: 'TRY',
-		},
-		{
-			label: 'UGX - Ugandan Shilling',
-			value: 'UGX',
-		},
-		{
-			label: 'UAH - Ukrainian Hryvnia',
-			value: 'UAH',
-		},
-		{
-			label: 'AED - United Arab Emirates Dirham',
-			value: 'AED',
-		},
-		{
-			label: 'UYU - Uruguayan Peso',
-			value: 'UYU',
-		},
-		{
-			label: 'UZS - Uzbekistani Som',
-			value: 'UZS',
-		},
-		{
-			label: 'VUV - Vanuatu Vatu',
-			value: 'VUV',
-		},
-		{
-			label: 'VND - Vietnamese Đồng',
-			value: 'VND',
-		},
-		{
-			label: 'XOF - West African Cfa Franc',
-			value: 'XOF',
-		},
-		{
-			label: 'YER - Yemeni Rial',
-			value: 'YER',
-		},
-		{
-			label: 'ZMW - Zambian Kwacha',
-			value: 'ZMW',
-		},
-	],
-	timezones : [
-		{
-			value: "-12.0",
-			label: "(GMT -12:00) Eniwetok, Kwajalein"
-		 },
-		 {
-			value: "-11.0",
-			label: "(GMT -11:00) Midway Island, Samoa"
-		 },
-		 {
-			value: "-10.0",
-			label: "(GMT -10:00) Hawaii"
-		 },
-		 {
-			value: "-9.0",
-			label: "(GMT -9:00) Alaska"
-		 },
-		 {
-			value: "-8.0",
-			label: "(GMT -8:00) Pacific Time (US & Canada)"
-		 },
-		 {
-			value: "-7.0",
-			label: "(GMT -7:00) Mountain Time (US & Canada)"
-		 },
-		 {
-			value: "-6.0",
-			label: "(GMT -6:00) Central Time (US & Canada), Mexico City"
-		 },
-		 {
-			value: "-5.0",
-			label: "(GMT -5:00) Eastern Time (US & Canada), Bogota, Lima"
-		 },
-		 {
-			value: "-4.0",
-			label: "(GMT -4:00) Atlantic Time (Canada), Caracas, La Paz"
-		 },
-		 {
-			value: "-3.5",
-			label: "(GMT -3:30) Newfoundland"
-		 },
-		 {
-			value: "-3.0",
-			label: "(GMT -3:00) Brazil, Buenos Aires, Georgetown"
-		 },
-		 {
-			value: "-2.0",
-			label: "(GMT -2:00) Mid-Atlantic"
-		 },
-		 {
-			value: "-1.0",
-			label: "(GMT -1:00) Azores, Cape Verde Islands"
-		 },
-		 {
-			value: "0.0",
-			label: "(GMT) Western Europe Time, London, Lisbon, Casablanca"
-		 },
-		 {
-			value: "1.0",
-			label: "(GMT +1:00) Brussels, Copenhagen, Madrid, Paris"
-		 },
-		 {
-			value: "2.0",
-			label: "(GMT +2:00) Kaliningrad, South Africa"
-		 },
-		 {
-			value: "3.0",
-			label: "(GMT +3:00) Baghdad, Riyadh, Moscow, St. Petersburg"
-		 },
-		 {
-			value: "3.5",
-			label: "(GMT +3:30) Tehran"
-		 },
-		 {
-			value: "4.0",
-			label: "(GMT +4:00) Abu Dhabi, Muscat, Baku, Tbilisi"
-		 },
-		 {
-			value: "4.5",
-			label: "(GMT +4:30) Kabul"
-		 },
-		 {
-			value: "5.0",
-			label: "(GMT +5:00) Ekaterinburg, Islamabad, Karachi, Tashkent"
-		 },
-		 {
-			value: "5.5",
-			label: "(GMT +5:30) Bombay, Calcutta, Madras, New Delhi"
-		 },
-		 {
-			value: "5.75",
-			label: "(GMT +5:45) Kathmandu"
-		 },
-		 {
-			value: "6.0",
-			label: "(GMT +6:00) Almaty, Dhaka, Colombo"
-		 },
-		 {
-			value: "7.0",
-			label: "(GMT +7:00) Bangkok, Hanoi, Jakarta"
-		 },
-		 {
-			value: "8.0",
-			label: "(GMT +8:00) Beijing, Perth, Singapore, Hong Kong"
-		 },
-		 {
-			value: "9.0",
-			label: "(GMT +9:00) Tokyo, Seoul, Osaka, Sapporo, Yakutsk"
-		 },
-		 {
-			value: "9.5",
-			label: "(GMT +9:30) Adelaide, Darwin"
-		 },
-		 {
-			value: "10.0",
-			label: "(GMT +10:00) Eastern Australia, Guam, Vladivostok"
-		 },
-		 {
-			value: "11.0",
-			label: "(GMT +11:00) Magadan, Solomon Islands, New Caledonia"
-		 },
-		 {
-			value: "12.0",
-			label: "(GMT +12:00) Auckland, Wellington, Fiji, Kamchatka"
-		 }
-	]
+    fileInfoPanelVisible: localStorage.getItem('file_info_visibility') === 'true' || false,
+    FilePreviewType: localStorage.getItem('preview_type') || 'list',
+    config: undefined,
+    index: undefined,
+    authorized: undefined,
+    homeDirectory: undefined,
+    requestedPlan: undefined,
+    emojis: undefined,
+    sorting: {
+        sort: localStorage.getItem('sorting') ? JSON.parse(localStorage.getItem('sorting')).sort : 'DESC',
+        field: localStorage.getItem('sorting') ? JSON.parse(localStorage.getItem('sorting')).field : 'created_at',
+    },
+    roles: [
+        {
+            label: i18n.t('roles.admin'),
+            value: 'admin',
+        },
+        {
+            label: i18n.t('roles.user'),
+            value: 'user',
+        },
+    ],
+    countries: [
+        {label: 'Afghanistan', value: 'AF'},
+        {label: 'Åland Islands', value: 'AX'},
+        {label: 'Albania', value: 'AL'},
+        {label: 'Algeria', value: 'DZ'},
+        {label: 'American Samoa', value: 'AS'},
+        {label: 'AndorrA', value: 'AD'},
+        {label: 'Angola', value: 'AO'},
+        {label: 'Anguilla', value: 'AI'},
+        {label: 'Antarctica', value: 'AQ'},
+        {label: 'Antigua and Barbuda', value: 'AG'},
+        {label: 'Argentina', value: 'AR'},
+        {label: 'Armenia', value: 'AM'},
+        {label: 'Aruba', value: 'AW'},
+        {label: 'Australia', value: 'AU'},
+        {label: 'Austria', value: 'AT'},
+        {label: 'Azerbaijan', value: 'AZ'},
+        {label: 'Bahamas', value: 'BS'},
+        {label: 'Bahrain', value: 'BH'},
+        {label: 'Bangladesh', value: 'BD'},
+        {label: 'Barbados', value: 'BB'},
+        {label: 'Belarus', value: 'BY'},
+        {label: 'Belgium', value: 'BE'},
+        {label: 'Belize', value: 'BZ'},
+        {label: 'Benin', value: 'BJ'},
+        {label: 'Bermuda', value: 'BM'},
+        {label: 'Bhutan', value: 'BT'},
+        {label: 'Bolivia', value: 'BO'},
+        {label: 'Bosnia and Herzegovina', value: 'BA'},
+        {label: 'Botswana', value: 'BW'},
+        {label: 'Bouvet Island', value: 'BV'},
+        {label: 'Brazil', value: 'BR'},
+        {label: 'British Indian Ocean Territory', value: 'IO'},
+        {label: 'Brunei Darussalam', value: 'BN'},
+        {label: 'Bulgaria', value: 'BG'},
+        {label: 'Burkina Faso', value: 'BF'},
+        {label: 'Burundi', value: 'BI'},
+        {label: 'Cambodia', value: 'KH'},
+        {label: 'Cameroon', value: 'CM'},
+        {label: 'Canada', value: 'CA'},
+        {label: 'Cape Verde', value: 'CV'},
+        {label: 'Cayman Islands', value: 'KY'},
+        {label: 'Central African Republic', value: 'CF'},
+        {label: 'Chad', value: 'TD'},
+        {label: 'Chile', value: 'CL'},
+        {label: 'China', value: 'CN'},
+        {label: 'Christmas Island', value: 'CX'},
+        {label: 'Cocos (Keeling) Islands', value: 'CC'},
+        {label: 'Colombia', value: 'CO'},
+        {label: 'Comoros', value: 'KM'},
+        {label: 'Congo', value: 'CG'},
+        {label: 'Congo, The Democratic Republic of the', value: 'CD'},
+        {label: 'Cook Islands', value: 'CK'},
+        {label: 'Costa Rica', value: 'CR'},
+        {label: 'Cote D\'Ivoire', value: 'CI'},
+        {label: 'Croatia', value: 'HR'},
+        {label: 'Cuba', value: 'CU'},
+        {label: 'Cyprus', value: 'CY'},
+        {label: 'Czech Republic', value: 'CZ'},
+        {label: 'Denmark', value: 'DK'},
+        {label: 'Djibouti', value: 'DJ'},
+        {label: 'Dominica', value: 'DM'},
+        {label: 'Dominican Republic', value: 'DO'},
+        {label: 'Ecuador', value: 'EC'},
+        {label: 'Egypt', value: 'EG'},
+        {label: 'El Salvador', value: 'SV'},
+        {label: 'Equatorial Guinea', value: 'GQ'},
+        {label: 'Eritrea', value: 'ER'},
+        {label: 'Estonia', value: 'EE'},
+        {label: 'Ethiopia', value: 'ET'},
+        {label: 'Falkland Islands (Malvinas)', value: 'FK'},
+        {label: 'Faroe Islands', value: 'FO'},
+        {label: 'Fiji', value: 'FJ'},
+        {label: 'Finland', value: 'FI'},
+        {label: 'France', value: 'FR'},
+        {label: 'French Guiana', value: 'GF'},
+        {label: 'French Polynesia', value: 'PF'},
+        {label: 'French Southern Territories', value: 'TF'},
+        {label: 'Gabon', value: 'GA'},
+        {label: 'Gambia', value: 'GM'},
+        {label: 'Georgia', value: 'GE'},
+        {label: 'Germany', value: 'DE'},
+        {label: 'Ghana', value: 'GH'},
+        {label: 'Gibraltar', value: 'GI'},
+        {label: 'Greece', value: 'GR'},
+        {label: 'Greenland', value: 'GL'},
+        {label: 'Grenada', value: 'GD'},
+        {label: 'Guadeloupe', value: 'GP'},
+        {label: 'Guam', value: 'GU'},
+        {label: 'Guatemala', value: 'GT'},
+        {label: 'Guernsey', value: 'GG'},
+        {label: 'Guinea', value: 'GN'},
+        {label: 'Guinea-Bissau', value: 'GW'},
+        {label: 'Guyana', value: 'GY'},
+        {label: 'Haiti', value: 'HT'},
+        {label: 'Heard Island and Mcdonald Islands', value: 'HM'},
+        {label: 'Holy See (Vatican City State)', value: 'VA'},
+        {label: 'Honduras', value: 'HN'},
+        {label: 'Hong Kong', value: 'HK'},
+        {label: 'Hungary', value: 'HU'},
+        {label: 'Iceland', value: 'IS'},
+        {label: 'India', value: 'IN'},
+        {label: 'Indonesia', value: 'ID'},
+        {label: 'Iran, Islamic Republic Of', value: 'IR'},
+        {label: 'Iraq', value: 'IQ'},
+        {label: 'Ireland', value: 'IE'},
+        {label: 'Isle of Man', value: 'IM'},
+        {label: 'Israel', value: 'IL'},
+        {label: 'Italy', value: 'IT'},
+        {label: 'Jamaica', value: 'JM'},
+        {label: 'Japan', value: 'JP'},
+        {label: 'Jersey', value: 'JE'},
+        {label: 'Jordan', value: 'JO'},
+        {label: 'Kazakhstan', value: 'KZ'},
+        {label: 'Kenya', value: 'KE'},
+        {label: 'Kiribati', value: 'KI'},
+        {label: 'Korea, Democratic People\'S Republic of', value: 'KP'},
+        {label: 'Korea, Republic of', value: 'KR'},
+        {label: 'Kuwait', value: 'KW'},
+        {label: 'Kyrgyzstan', value: 'KG'},
+        {label: 'Lao People\'S Democratic Republic', value: 'LA'},
+        {label: 'Latvia', value: 'LV'},
+        {label: 'Lebanon', value: 'LB'},
+        {label: 'Lesotho', value: 'LS'},
+        {label: 'Liberia', value: 'LR'},
+        {label: 'Libyan Arab Jamahiriya', value: 'LY'},
+        {label: 'Liechtenstein', value: 'LI'},
+        {label: 'Lithuania', value: 'LT'},
+        {label: 'Luxembourg', value: 'LU'},
+        {label: 'Macao', value: 'MO'},
+        {label: 'Macedonia, The Former Yugoslav Republic of', value: 'MK'},
+        {label: 'Madagascar', value: 'MG'},
+        {label: 'Malawi', value: 'MW'},
+        {label: 'Malaysia', value: 'MY'},
+        {label: 'Maldives', value: 'MV'},
+        {label: 'Mali', value: 'ML'},
+        {label: 'Malta', value: 'MT'},
+        {label: 'Marshall Islands', value: 'MH'},
+        {label: 'Martinique', value: 'MQ'},
+        {label: 'Mauritania', value: 'MR'},
+        {label: 'Mauritius', value: 'MU'},
+        {label: 'Mayotte', value: 'YT'},
+        {label: 'Mexico', value: 'MX'},
+        {label: 'Micronesia, Federated States of', value: 'FM'},
+        {label: 'Moldova, Republic of', value: 'MD'},
+        {label: 'Monaco', value: 'MC'},
+        {label: 'Mongolia', value: 'MN'},
+        {label: 'Montserrat', value: 'MS'},
+        {label: 'Morocco', value: 'MA'},
+        {label: 'Mozambique', value: 'MZ'},
+        {label: 'Myanmar', value: 'MM'},
+        {label: 'Namibia', value: 'NA'},
+        {label: 'Nauru', value: 'NR'},
+        {label: 'Nepal', value: 'NP'},
+        {label: 'Netherlands', value: 'NL'},
+        {label: 'Netherlands Antilles', value: 'AN'},
+        {label: 'New Caledonia', value: 'NC'},
+        {label: 'New Zealand', value: 'NZ'},
+        {label: 'Nicaragua', value: 'NI'},
+        {label: 'Niger', value: 'NE'},
+        {label: 'Nigeria', value: 'NG'},
+        {label: 'Niue', value: 'NU'},
+        {label: 'Norfolk Island', value: 'NF'},
+        {label: 'Northern Mariana Islands', value: 'MP'},
+        {label: 'Norway', value: 'NO'},
+        {label: 'Oman', value: 'OM'},
+        {label: 'Pakistan', value: 'PK'},
+        {label: 'Palau', value: 'PW'},
+        {label: 'Palestinian Territory, Occupied', value: 'PS'},
+        {label: 'Panama', value: 'PA'},
+        {label: 'Papua New Guinea', value: 'PG'},
+        {label: 'Paraguay', value: 'PY'},
+        {label: 'Peru', value: 'PE'},
+        {label: 'Philippines', value: 'PH'},
+        {label: 'Pitcairn', value: 'PN'},
+        {label: 'Poland', value: 'PL'},
+        {label: 'Portugal', value: 'PT'},
+        {label: 'Puerto Rico', value: 'PR'},
+        {label: 'Qatar', value: 'QA'},
+        {label: 'Reunion', value: 'RE'},
+        {label: 'Romania', value: 'RO'},
+        {label: 'Russian Federation', value: 'RU'},
+        {label: 'RWANDA', value: 'RW'},
+        {label: 'Saint Helena', value: 'SH'},
+        {label: 'Saint Kitts and Nevis', value: 'KN'},
+        {label: 'Saint Lucia', value: 'LC'},
+        {label: 'Saint Pierre and Miquelon', value: 'PM'},
+        {label: 'Saint Vincent and the Grenadines', value: 'VC'},
+        {label: 'Samoa', value: 'WS'},
+        {label: 'San Marino', value: 'SM'},
+        {label: 'Sao Tome and Principe', value: 'ST'},
+        {label: 'Saudi Arabia', value: 'SA'},
+        {label: 'Senegal', value: 'SN'},
+        {label: 'Serbia and Montenegro', value: 'CS'},
+        {label: 'Seychelles', value: 'SC'},
+        {label: 'Sierra Leone', value: 'SL'},
+        {label: 'Singapore', value: 'SG'},
+        {label: 'Slovakia', value: 'SK'},
+        {label: 'Slovenia', value: 'SI'},
+        {label: 'Solomon Islands', value: 'SB'},
+        {label: 'Somalia', value: 'SO'},
+        {label: 'South Africa', value: 'ZA'},
+        {label: 'South Georgia and the South Sandwich Islands', value: 'GS'},
+        {label: 'Spain', value: 'ES'},
+        {label: 'Sri Lanka', value: 'LK'},
+        {label: 'Sudan', value: 'SD'},
+        {label: 'Suriname', value: 'SR'},
+        {label: 'Svalbard and Jan Mayen', value: 'SJ'},
+        {label: 'Swaziland', value: 'SZ'},
+        {label: 'Sweden', value: 'SE'},
+        {label: 'Switzerland', value: 'CH'},
+        {label: 'Syrian Arab Republic', value: 'SY'},
+        {label: 'Taiwan, Province of China', value: 'TW'},
+        {label: 'Tajikistan', value: 'TJ'},
+        {label: 'Tanzania, United Republic of', value: 'TZ'},
+        {label: 'Thailand', value: 'TH'},
+        {label: 'Timor-Leste', value: 'TL'},
+        {label: 'Togo', value: 'TG'},
+        {label: 'Tokelau', value: 'TK'},
+        {label: 'Tonga', value: 'TO'},
+        {label: 'Trinidad and Tobago', value: 'TT'},
+        {label: 'Tunisia', value: 'TN'},
+        {label: 'Turkey', value: 'TR'},
+        {label: 'Turkmenistan', value: 'TM'},
+        {label: 'Turks and Caicos Islands', value: 'TC'},
+        {label: 'Tuvalu', value: 'TV'},
+        {label: 'Uganda', value: 'UG'},
+        {label: 'Ukraine', value: 'UA'},
+        {label: 'United Arab Emirates', value: 'AE'},
+        {label: 'United Kingdom', value: 'GB'},
+        {label: 'United States', value: 'US'},
+        {label: 'United States Minor Outlying Islands', value: 'UM'},
+        {label: 'Uruguay', value: 'UY'},
+        {label: 'Uzbekistan', value: 'UZ'},
+        {label: 'Vanuatu', value: 'VU'},
+        {label: 'Venezuela', value: 'VE'},
+        {label: 'Viet Nam', value: 'VN'},
+        {label: 'Virgin Islands, British', value: 'VG'},
+        {label: 'Virgin Islands, U.S.', value: 'VI'},
+        {label: 'Wallis and Futuna', value: 'WF'},
+        {label: 'Western Sahara', value: 'EH'},
+        {label: 'Yemen', value: 'YE'},
+        {label: 'Zambia', value: 'ZM'},
+        {label: 'Zimbabwe', value: 'ZW'}
+    ],
+    expirationList: [
+        {
+            label: i18n.t('shared_form.expiration_hour', {value: 1}),
+            value: 1,
+        },
+        {
+            label: i18n.t('shared_form.expiration_hour', {value: 2}),
+            value: 2,
+        },
+        {
+            label: i18n.t('shared_form.expiration_hour', {value: 6}),
+            value: 6,
+        },
+        {
+            label: i18n.t('shared_form.expiration_hour', {value: 12}),
+            value: 12,
+        },
+        {
+            label: i18n.t('shared_form.expiration_day', {value: 1}),
+            value: 24,
+        },
+        {
+            label: i18n.t('shared_form.expiration_day', {value: 2}),
+            value: 48,
+        },
+        {
+            label: i18n.t('shared_form.expiration_day', {value: 7}),
+            value: 168,
+        },
+    ],
+    currencyList: [
+        {
+            label: 'USD - United States Dollar',
+            value: 'USD',
+        },
+        {
+            label: 'EUR - Euro',
+            value: 'EUR',
+        },
+        {
+            label: 'GBP - British Pound',
+            value: 'GBP',
+        },
+        {
+            label: 'AFN - Afghan Afghani',
+            value: 'AFN',
+        },
+        {
+            label: 'ALL - Albanian Lek',
+            value: 'ALL',
+        },
+        {
+            label: 'DZD - Algerian Dinar',
+            value: 'DZD',
+        },
+        {
+            label: 'AOA - Angolan Kwanza',
+            value: 'AOA',
+        },
+        {
+            label: 'ARS - Argentine Peso',
+            value: 'ARS',
+        },
+        {
+            label: 'AMD - Armenian Dram',
+            value: 'AMD',
+        },
+        {
+            label: 'AWG - Aruban Florin',
+            value: 'AWG',
+        },
+        {
+            label: 'AUD - Australian Dollar',
+            value: 'AUD',
+        },
+        {
+            label: 'AZN - Azerbaijani Manat',
+            value: 'AZN',
+        },
+        {
+            label: 'BDT - Bangladeshi Taka',
+            value: 'BDT',
+        },
+        {
+            label: 'BBD - Barbadian Dollar',
+            value: 'BBD',
+        },
+        {
+            label: 'BZD - Belize Dollar',
+            value: 'BZD',
+        },
+        {
+            label: 'BMD - Bermudian Dollar',
+            value: 'BMD',
+        },
+        {
+            label: 'BOB - Bolivian Boliviano',
+            value: 'BOB',
+        },
+        {
+            label: 'BAM - Bosnia & Herzegovina Convertible Mark',
+            value: 'BAM',
+        },
+        {
+            label: 'BWP - Botswana Pula',
+            value: 'BWP',
+        },
+        {
+            label: 'BRL - Brazilian Real',
+            value: 'BRL',
+        },
+        {
+            label: 'BND - Brunei Dollar',
+            value: 'BND',
+        },
+        {
+            label: 'BGN - Bulgarian Lev',
+            value: 'BGN',
+        },
+        {
+            label: 'BIF - Burundian Franc',
+            value: 'BIF',
+        },
+        {
+            label: 'KHR - Cambodian Riel',
+            value: 'KHR',
+        },
+        {
+            label: 'CAD - Canadian Dollar',
+            value: 'CAD',
+        },
+        {
+            label: 'CVE - Cape Verdean Escudo',
+            value: 'CVE',
+        },
+        {
+            label: 'KYD - Cayman Islands Dollar',
+            value: 'KYD',
+        },
+        {
+            label: 'XAF - Central African Cfa Franc',
+            value: 'XAF',
+        },
+        {
+            label: 'XPF - Cfp Franc',
+            value: 'XPF',
+        },
+        {
+            label: 'CLP - Chilean Peso',
+            value: 'CLP',
+        },
+        {
+            label: 'CNY - Chinese Renminbi Yuan',
+            value: 'CNY',
+        },
+        {
+            label: 'COP - Colombian Peso',
+            value: 'COP',
+        },
+        {
+            label: 'KMF - Comorian Franc',
+            value: 'KMF',
+        },
+        {
+            label: 'CDF - Congolese Franc',
+            value: 'CDF',
+        },
+        {
+            label: 'CRC - Costa Rican Colón',
+            value: 'CRC',
+        },
+        {
+            label: 'HRK - Croatian Kuna',
+            value: 'HRK',
+        },
+        {
+            label: 'CZK - Czech Koruna',
+            value: 'CZK',
+        },
+        {
+            label: 'DKK - Danish Krone',
+            value: 'DKK',
+        },
+        {
+            label: 'DJF - Djiboutian Franc',
+            value: 'DJF',
+        },
+        {
+            label: 'DOP - Dominican Peso',
+            value: 'DOP',
+        },
+        {
+            label: 'XCD - East Caribbean Dollar',
+            value: 'XCD',
+        },
+        {
+            label: 'EGP - Egyptian Pound',
+            value: 'EGP',
+        },
+        {
+            label: 'ETB - Ethiopian Birr',
+            value: 'ETB',
+        },
+        {
+            label: 'FKP - Falkland Islands Pound',
+            value: 'FKP',
+        },
+        {
+            label: 'FJD - Fijian Dollar',
+            value: 'FJD',
+        },
+        {
+            label: 'GMD - Gambian Dalasi',
+            value: 'GMD',
+        },
+        {
+            label: 'GEL - Georgian Lari',
+            value: 'GEL',
+        },
+        {
+            label: 'GIP - Gibraltar Pound',
+            value: 'GIP',
+        },
+        {
+            label: 'GTQ - Guatemalan Quetzal',
+            value: 'GTQ',
+        },
+        {
+            label: 'GNF - Guinean Franc',
+            value: 'GNF',
+        },
+        {
+            label: 'GYD - Guyanese Dollar',
+            value: 'GYD',
+        },
+        {
+            label: 'HTG - Haitian Gourde',
+            value: 'HTG',
+        },
+        {
+            label: 'HNL - Honduran Lempira',
+            value: 'HNL',
+        },
+        {
+            label: 'HKD - Hong Kong Dollar',
+            value: 'HKD',
+        },
+        {
+            label: 'HUF - Hungarian Forint',
+            value: 'HUF',
+        },
+        {
+            label: 'ISK - Icelandic Króna',
+            value: 'ISK',
+        },
+        {
+            label: 'INR - Indian Rupee',
+            value: 'INR',
+        },
+        {
+            label: 'IDR - Indonesian Rupiah',
+            value: 'IDR',
+        },
+        {
+            label: 'ILS - Israeli New Sheqel',
+            value: 'ILS',
+        },
+        {
+            label: 'JMD - Jamaican Dollar',
+            value: 'JMD',
+        },
+        {
+            label: 'JPY - Japanese Yen',
+            value: 'JPY',
+        },
+        {
+            label: 'KZT - Kazakhstani Tenge',
+            value: 'KZT',
+        },
+        {
+            label: 'KES - Kenyan Shilling',
+            value: 'KES',
+        },
+        {
+            label: 'KGS - Kyrgyzstani Som',
+            value: 'KGS',
+        },
+        {
+            label: 'LAK - Lao Kip',
+            value: 'LAK',
+        },
+        {
+            label: 'LBP - Lebanese Pound',
+            value: 'LBP',
+        },
+        {
+            label: 'LSL - Lesotho Loti',
+            value: 'LSL',
+        },
+        {
+            label: 'LRD - Liberian Dollar',
+            value: 'LRD',
+        },
+        {
+            label: 'MOP - Macanese Pataca',
+            value: 'MOP',
+        },
+        {
+            label: 'MKD - Macedonian Denar',
+            value: 'MKD',
+        },
+        {
+            label: 'MGA - Malagasy Ariary',
+            value: 'MGA',
+        },
+        {
+            label: 'MWK - Malawian Kwacha',
+            value: 'MWK',
+        },
+        {
+            label: 'MYR - Malaysian Ringgit',
+            value: 'MYR',
+        },
+        {
+            label: 'MVR - Maldivian Rufiyaa',
+            value: 'MVR',
+        },
+        {
+            label: 'MRO - Mauritanian Ouguiya',
+            value: 'MRO',
+        },
+        {
+            label: 'MUR - Mauritian Rupee',
+            value: 'MUR',
+        },
+        {
+            label: 'MXN - Mexican Peso',
+            value: 'MXN',
+        },
+        {
+            label: 'MDL - Moldovan Leu',
+            value: 'MDL',
+        },
+        {
+            label: 'MNT - Mongolian Tögrög',
+            value: 'MNT',
+        },
+        {
+            label: 'MAD - Moroccan Dirham',
+            value: 'MAD',
+        },
+        {
+            label: 'MZN - Mozambican Metical',
+            value: 'MZN',
+        },
+        {
+            label: 'MMK - Myanmar Kyat',
+            value: 'MMK',
+        },
+        {
+            label: 'NAD - Namibian Dollar',
+            value: 'NAD',
+        },
+        {
+            label: 'NPR - Nepalese Rupee',
+            value: 'NPR',
+        },
+        {
+            label: 'ANG - Netherlands Antillean Gulden',
+            value: 'ANG',
+        },
+        {
+            label: 'TWD - New Taiwan Dollar',
+            value: 'TWD',
+        },
+        {
+            label: 'NZD - New Zealand Dollar',
+            value: 'NZD',
+        },
+        {
+            label: 'NIO - Nicaraguan Córdoba',
+            value: 'NIO',
+        },
+        {
+            label: 'NGN - Nigerian Naira',
+            value: 'NGN',
+        },
+        {
+            label: 'NOK - Norwegian Krone',
+            value: 'NOK',
+        },
+        {
+            label: 'PKR - Pakistani Rupee',
+            value: 'PKR',
+        },
+        {
+            label: 'PAB - Panamanian Balboa',
+            value: 'PAB',
+        },
+        {
+            label: 'PGK - Papua New Guinean Kina',
+            value: 'PGK',
+        },
+        {
+            label: 'PYG - Paraguayan Guaraní',
+            value: 'PYG',
+        },
+        {
+            label: 'PEN - Peruvian Nuevo Sol',
+            value: 'PEN',
+        },
+        {
+            label: 'PHP - Philippine Peso',
+            value: 'PHP',
+        },
+        {
+            label: 'PLN - Polish Złoty',
+            value: 'PLN',
+        },
+        {
+            label: 'QAR - Qatari Riyal',
+            value: 'QAR',
+        },
+        {
+            label: 'RON - Romanian Leu',
+            value: 'RON',
+        },
+        {
+            label: 'RUB - Russian Ruble',
+            value: 'RUB',
+        },
+        {
+            label: 'RWF - Rwandan Franc',
+            value: 'RWF',
+        },
+        {
+            label: 'STD - São Tomé and Príncipe Dobra',
+            value: 'STD',
+        },
+        {
+            label: 'SHP - Saint Helenian Pound',
+            value: 'SHP',
+        },
+        {
+            label: 'SVC - Salvadoran Colón',
+            value: 'SVC',
+        },
+        {
+            label: 'WST - Samoan Tala',
+            value: 'WST',
+        },
+        {
+            label: 'SAR - Saudi Riyal',
+            value: 'SAR',
+        },
+        {
+            label: 'RSD - Serbian Dinar',
+            value: 'RSD',
+        },
+        {
+            label: 'SCR - Seychellois Rupee',
+            value: 'SCR',
+        },
+        {
+            label: 'SLL - Sierra Leonean Leone',
+            value: 'SLL',
+        },
+        {
+            label: 'SGD - Singapore Dollar',
+            value: 'SGD',
+        },
+        {
+            label: 'SBD - Solomon Islands Dollar',
+            value: 'SBD',
+        },
+        {
+            label: 'SOS - Somali Shilling',
+            value: 'SOS',
+        },
+        {
+            label: 'ZAR - South African Rand',
+            value: 'ZAR',
+        },
+        {
+            label: 'KRW - South Korean Won',
+            value: 'KRW',
+        },
+        {
+            label: 'LKR - Sri Lankan Rupee',
+            value: 'LKR',
+        },
+        {
+            label: 'SRD - Surinamese Dollar',
+            value: 'SRD',
+        },
+        {
+            label: 'SZL - Swazi Lilangeni',
+            value: 'SZL',
+        },
+        {
+            label: 'SEK - Swedish Krona',
+            value: 'SEK',
+        },
+        {
+            label: 'CHF - Swiss Franc',
+            value: 'CHF',
+        },
+        {
+            label: 'TJS - Tajikistani Somoni',
+            value: 'TJS',
+        },
+        {
+            label: 'TZS - Tanzanian Shilling',
+            value: 'TZS',
+        },
+        {
+            label: 'THB - Thai Baht',
+            value: 'THB',
+        },
+        {
+            label: 'TOP - Tongan Paʻanga',
+            value: 'TOP',
+        },
+        {
+            label: 'TTD - Trinidad and Tobago Dollar',
+            value: 'TTD',
+        },
+        {
+            label: 'TRY - Turkish Lira',
+            value: 'TRY',
+        },
+        {
+            label: 'UGX - Ugandan Shilling',
+            value: 'UGX',
+        },
+        {
+            label: 'UAH - Ukrainian Hryvnia',
+            value: 'UAH',
+        },
+        {
+            label: 'AED - United Arab Emirates Dirham',
+            value: 'AED',
+        },
+        {
+            label: 'UYU - Uruguayan Peso',
+            value: 'UYU',
+        },
+        {
+            label: 'UZS - Uzbekistani Som',
+            value: 'UZS',
+        },
+        {
+            label: 'VUV - Vanuatu Vatu',
+            value: 'VUV',
+        },
+        {
+            label: 'VND - Vietnamese Đồng',
+            value: 'VND',
+        },
+        {
+            label: 'XOF - West African Cfa Franc',
+            value: 'XOF',
+        },
+        {
+            label: 'YER - Yemeni Rial',
+            value: 'YER',
+        },
+        {
+            label: 'ZMW - Zambian Kwacha',
+            value: 'ZMW',
+        },
+    ],
+    timezones: [
+        {
+            value: "-12.0",
+            label: "(GMT -12:00) Eniwetok, Kwajalein"
+        },
+        {
+            value: "-11.0",
+            label: "(GMT -11:00) Midway Island, Samoa"
+        },
+        {
+            value: "-10.0",
+            label: "(GMT -10:00) Hawaii"
+        },
+        {
+            value: "-9.0",
+            label: "(GMT -9:00) Alaska"
+        },
+        {
+            value: "-8.0",
+            label: "(GMT -8:00) Pacific Time (US & Canada)"
+        },
+        {
+            value: "-7.0",
+            label: "(GMT -7:00) Mountain Time (US & Canada)"
+        },
+        {
+            value: "-6.0",
+            label: "(GMT -6:00) Central Time (US & Canada), Mexico City"
+        },
+        {
+            value: "-5.0",
+            label: "(GMT -5:00) Eastern Time (US & Canada), Bogota, Lima"
+        },
+        {
+            value: "-4.0",
+            label: "(GMT -4:00) Atlantic Time (Canada), Caracas, La Paz"
+        },
+        {
+            value: "-3.5",
+            label: "(GMT -3:30) Newfoundland"
+        },
+        {
+            value: "-3.0",
+            label: "(GMT -3:00) Brazil, Buenos Aires, Georgetown"
+        },
+        {
+            value: "-2.0",
+            label: "(GMT -2:00) Mid-Atlantic"
+        },
+        {
+            value: "-1.0",
+            label: "(GMT -1:00) Azores, Cape Verde Islands"
+        },
+        {
+            value: "0.0",
+            label: "(GMT) Western Europe Time, London, Lisbon, Casablanca"
+        },
+        {
+            value: "1.0",
+            label: "(GMT +1:00) Brussels, Copenhagen, Madrid, Paris"
+        },
+        {
+            value: "2.0",
+            label: "(GMT +2:00) Kaliningrad, South Africa"
+        },
+        {
+            value: "3.0",
+            label: "(GMT +3:00) Baghdad, Riyadh, Moscow, St. Petersburg"
+        },
+        {
+            value: "3.5",
+            label: "(GMT +3:30) Tehran"
+        },
+        {
+            value: "4.0",
+            label: "(GMT +4:00) Abu Dhabi, Muscat, Baku, Tbilisi"
+        },
+        {
+            value: "4.5",
+            label: "(GMT +4:30) Kabul"
+        },
+        {
+            value: "5.0",
+            label: "(GMT +5:00) Ekaterinburg, Islamabad, Karachi, Tashkent"
+        },
+        {
+            value: "5.5",
+            label: "(GMT +5:30) Bombay, Calcutta, Madras, New Delhi"
+        },
+        {
+            value: "5.75",
+            label: "(GMT +5:45) Kathmandu"
+        },
+        {
+            value: "6.0",
+            label: "(GMT +6:00) Almaty, Dhaka, Colombo"
+        },
+        {
+            value: "7.0",
+            label: "(GMT +7:00) Bangkok, Hanoi, Jakarta"
+        },
+        {
+            value: "8.0",
+            label: "(GMT +8:00) Beijing, Perth, Singapore, Hong Kong"
+        },
+        {
+            value: "9.0",
+            label: "(GMT +9:00) Tokyo, Seoul, Osaka, Sapporo, Yakutsk"
+        },
+        {
+            value: "9.5",
+            label: "(GMT +9:30) Adelaide, Darwin"
+        },
+        {
+            value: "10.0",
+            label: "(GMT +10:00) Eastern Australia, Guam, Vladivostok"
+        },
+        {
+            value: "11.0",
+            label: "(GMT +11:00) Magadan, Solomon Islands, New Caledonia"
+        },
+        {
+            value: "12.0",
+            label: "(GMT +12:00) Auckland, Wellington, Fiji, Kamchatka"
+        }
+    ]
 }
 const actions = {
-	changePreviewType: ({commit, state}, preview) => {
-		
-		// Get preview type
-		let previewType = preview
+    changePreviewType: ({commit, state}, preview) => {
 
-		// Store preview type to localStorage
-		localStorage.setItem('preview_type', previewType)
+        // Get preview type
+        let previewType = preview
 
-		// Change preview
-		commit('CHANGE_PREVIEW', previewType)
-	},
-	fileInfoToggle: (context, visibility = undefined) => {
-		if (!visibility) {
-			if (context.state.fileInfoPanelVisible) {
-				context.commit('FILE_INFO_TOGGLE', false)
-			} else {
-				context.commit('FILE_INFO_TOGGLE', true)
-			}
-		} else {
-			context.commit('FILE_INFO_TOGGLE', visibility)
-		}
-	},
+        // Store preview type to localStorage
+        localStorage.setItem('preview_type', previewType)
+
+        // Change preview
+        commit('CHANGE_PREVIEW', previewType)
+    },
+    fileInfoToggle: (context, visibility = undefined) => {
+        if (!visibility) {
+            if (context.state.fileInfoPanelVisible) {
+                context.commit('FILE_INFO_TOGGLE', false)
+            } else {
+                context.commit('FILE_INFO_TOGGLE', true)
+            }
+        } else {
+            context.commit('FILE_INFO_TOGGLE', visibility)
+        }
+    },
 }
+
 const mutations = {
-	LOAD_EMOJIS_LIST(state, data) {
-		state.emojis = data
-	},
-	UPDATE_SORTING(state) {
-		state.sorting.field = JSON.parse(localStorage.getItem('sorting')).field
-		state.sorting.sort = JSON.parse(localStorage.getItem('sorting')).sort
-	},
-	INIT(state, data) {
-		state.config = data.config
-		state.authorized = data.authCookie
-		state.homeDirectory = data.rootDirectory
-	},
-	SET_SAAS(state, data) {
-		state.config.isSaaS = data
-	},
-	SET_STRIPE_PUBLIC_KEY(state, data) {
-		state.config.stripe_public_key = data
-	},
-	FILE_INFO_TOGGLE(state, isVisible) {
-		state.fileInfoPanelVisible = isVisible
+    LOAD_EMOJIS_LIST(state, data) {
+        state.emojis = data
+    },
+    UPDATE_SORTING(state) {
+        state.sorting.field = JSON.parse(localStorage.getItem('sorting')).field
+        state.sorting.sort = JSON.parse(localStorage.getItem('sorting')).sort
+    },
+    INIT(state, data) {
+        state.config = data.config
+        state.authorized = data.authCookie
+        state.homeDirectory = data.rootDirectory
+    },
+    SET_SAAS(state, data) {
+        state.config.isSaaS = data
+    },
+    SET_STRIPE_PUBLIC_KEY(state, data) {
+        state.config.stripe_public_key = data
+    },
+    FILE_INFO_TOGGLE(state, isVisible) {
+        state.fileInfoPanelVisible = isVisible
 
-		localStorage.setItem('file_info_visibility', isVisible)
-	},
-	SET_AUTHORIZED(state, data) {
-		state.authorized = data
-	},
-	SET_INDEX_CONTENT(state, data) {
-		state.index = data
-	},
-	CHANGE_PREVIEW(state, type) {
-		state.FilePreviewType = type
-	},
-	STORE_REQUESTED_PLAN(state, plan) {
-		state.requestedPlan = plan
-	},
+        localStorage.setItem('file_info_visibility', isVisible)
+    },
+    SET_AUTHORIZED(state, data) {
+        state.authorized = data
+    },
+    SET_INDEX_CONTENT(state, data) {
+        state.index = data
+    },
+    CHANGE_PREVIEW(state, type) {
+        state.FilePreviewType = type
+    },
+    STORE_REQUESTED_PLAN(state, plan) {
+        state.requestedPlan = plan
+    },
 }
+
 const getters = {
-	fileInfoVisible: state => state.fileInfoPanelVisible,
-	FilePreviewType: state => state.FilePreviewType,
-	expirationList: state => state.expirationList,
-	homeDirectory: state => state.homeDirectory,
-	requestedPlan: state => state.requestedPlan,
-	currencyList: state => state.currencyList,
-	countries: state => state.countries,
-	timezones: state=> state.timezones,
-	api: state => state.config.api,
-	config: state => state.config,
-	emojis: state => state.emojis,
-	index: state => state.index,
-	roles: state => state.roles,
-	sorting: (state) => {
-		return  {sorting: state.sorting , URI: '?sort=' + state.sorting.field + '&direction=' + state.sorting.sort}
-	},
+    fileInfoVisible: state => state.fileInfoPanelVisible,
+    FilePreviewType: state => state.FilePreviewType,
+    expirationList: state => state.expirationList,
+    homeDirectory: state => state.homeDirectory,
+    requestedPlan: state => state.requestedPlan,
+    currencyList: state => state.currencyList,
+    countries: state => state.countries,
+    timezones: state => state.timezones,
+    api: state => state.config.api,
+    config: state => state.config,
+    emojis: state => state.emojis,
+    index: state => state.index,
+    roles: state => state.roles,
+    sorting: (state) => {
+        return {sorting: state.sorting, URI: '?sort=' + state.sorting.field + '&direction=' + state.sorting.sort}
+    },
 }
 
 export default {
-	state: defaultState,
-	getters,
-	actions,
-	mutations
+    state: defaultState,
+    getters,
+    actions,
+    mutations
 }
diff --git a/resources/js/store/modules/fileBrowser.js b/resources/js/store/modules/fileBrowser.js
index ae506357..9dbd58fc 100644
--- a/resources/js/store/modules/fileBrowser.js
+++ b/resources/js/store/modules/fileBrowser.js
@@ -88,7 +88,6 @@ const actions = {
         commit('LOADING_STATE', {loading: true, data: []})
         commit('FLUSH_FOLDER_HISTORY')
 
-
         let currentFolder = {
             name: i18n.t('sidebar.my_shared'),
             location: 'shared',
@@ -98,7 +97,7 @@ const actions = {
         commit('STORE_CURRENT_FOLDER', currentFolder)
 
         axios
-            .get(getters.api + '/browse/shared-all' + getters.sorting.URI)
+            .get(getters.api + '/browse/shared' + getters.sorting.URI)
             .then(response => {
                 commit('LOADING_STATE', {loading: false, data: response.data})
                 commit('STORE_PREVIOUS_FOLDER', currentFolder)
@@ -118,7 +117,7 @@ const actions = {
         })
 
         axios
-            .get(getters.api + '/browse/participant-uploads' + getters.sorting.URI)
+            .get(getters.api + '/browse/participants' + getters.sorting.URI)
             .then(response => {
                 commit('LOADING_STATE', {loading: false, data: response.data})
 
@@ -139,7 +138,7 @@ const actions = {
         commit('STORE_CURRENT_FOLDER', trash)
 
         axios
-            .get(getters.api + '/trash' + getters.sorting.URI)
+            .get(getters.api + '/browse/trash' + getters.sorting.URI)
             .then(response => {
                 commit('LOADING_STATE', {loading: false, data: response.data})
                 commit('STORE_PREVIOUS_FOLDER', trash)
@@ -156,9 +155,9 @@ const actions = {
         let route = undefined
 
         if (getters.sharedDetail && getters.sharedDetail.protected)
-            route = '/api/search/private'
+            route = '/api/browse/search/private'
         else if (getters.sharedDetail && !getters.sharedDetail.protected)
-            route = '/api/search/public/' + router.currentRoute.params.token
+            route = '/api/browse/search/public/' + router.currentRoute.params.token
         else
             route = '/api/browse/search'
 
@@ -179,9 +178,9 @@ const actions = {
             let route = undefined
 
             if (getters.sharedDetail && getters.sharedDetail.protected)
-                route = '/api/navigation/private'
+                route = '/api/browse/navigation/private'
             else if (getters.sharedDetail && !getters.sharedDetail.protected)
-                route = '/api/navigation/public/' + router.currentRoute.params.token
+                route = '/api/browse/navigation/public/' + router.currentRoute.params.token
             else
                 route = '/api/browse/navigation'
 
@@ -234,8 +233,8 @@ const mutations = {
         state.data.find(item => {
             if (item.id === updatedFile.id) {
                 item.name = updatedFile.name
-                item.icon_color = updatedFile.icon_color ? updatedFile.icon_color : null
-                item.icon_emoji = updatedFile.icon_emoji ? updatedFile.icon_emoji : null
+                item.color = updatedFile.color ? updatedFile.color : null
+                item.emoji = updatedFile.emoji ? updatedFile.emoji : null
             }
         })
     },
diff --git a/resources/js/store/modules/fileFunctions.js b/resources/js/store/modules/fileFunctions.js
index 18ebcb36..245ce82d 100644
--- a/resources/js/store/modules/fileFunctions.js
+++ b/resources/js/store/modules/fileFunctions.js
@@ -1,447 +1,439 @@
 import i18n from '@/i18n/index'
 import router from '@/router'
-import { events } from '@/bus'
-import { last } from 'lodash'
+import {events} from '@/bus'
+import {last} from 'lodash'
 import axios from 'axios'
 import Vue from 'vue'
-import store from '../index'
 
 const defaultState = {
-	processingPopup: undefined,
-	fileQueue: [],
-	filesInQueueTotal: 0,
-	filesInQueueUploaded: 0,
-
-	isProcessingFile: false,
-	uploadingProgress: 0
+    processingPopup: undefined,
+    fileQueue: [],
+    filesInQueueTotal: 0,
+    filesInQueueUploaded: 0,
+    isProcessingFile: false,
+    uploadingProgress: 0
 }
 
 const actions = {
-	downloadFolder: ({ commit, getters }, folder) => {
-
-		commit('PROCESSING_POPUP', {
-			title: i18n.t('popup_zipping.title'),
-			message: i18n.t('popup_zipping.message')
-		})
-
-		// Get route
-		let route = getters.sharedDetail && !getters.sharedDetail.protected
-			? '/api/zip-folder/' + folder.id + '/public/' + router.currentRoute.params.token
-			: '/api/zip-folder/' + folder.id
-
-		axios.get(route)
-			.then(response => {
-				Vue.prototype.$downloadFile(response.data.url, response.data.name)
-			})
-			.catch(() => {
-				Vue.prototype.$isSomethingWrong()
-			})
-			.finally(() => {
-				commit('PROCESSING_POPUP', undefined)
-			})
-
-	},
-	downloadFiles: ({ commit, getters }) => {
-		let files = []
-
-		// get ids of selected files
-		getters.fileInfoDetail.forEach(file => files.push(file.id))
-
-		// Get route
-		let route = getters.sharedDetail && !getters.sharedDetail.protected
-			? '/api/zip/public/' + router.currentRoute.params.token
-			: '/api/zip'
-
-			commit('PROCESSING_POPUP', {
-				title: i18n.t('popup_zipping.title'),
-				message: i18n.t('popup_zipping.message'),
-			})
-
-		axios.post(route, {
-			files: files
-		})
-			.then(response => {
-				Vue.prototype.$downloadFile(response.data.url, response.data.name)
-			})
-			.catch(() => {
-				Vue.prototype.$isSomethingWrong()
-			})
-			.finally(() => {
-				commit('PROCESSING_POPUP', undefined)
-			})
-	},
-	moveItem: ({ commit, getters, dispatch }, { to_item, noSelectedItem }) => {
-
-		let itemsToMove = []
-		let items = [noSelectedItem]
-
-		// If coming no selected item dont get items to move from fileInfoDetail
-		if (!noSelectedItem)
-			items = getters.fileInfoDetail
-
-		items.forEach(data => itemsToMove.push({
-			'force_delete': data.deleted_at ? true : false,
-			'id': data.id,
-			'type': data.type
-		}))
-
-		// Remove file preview
-		if (!noSelectedItem)
-			commit('CLEAR_FILEINFO_DETAIL')
-
-		// Get route
-		let route = getters.sharedDetail && !getters.sharedDetail.protected
-			? '/api/move/public/' + router.currentRoute.params.token
-			: '/api/move'
-
-		axios
-			.post(route, {
-				_method: 'post',
-				to_id: to_item.id,
-				items: itemsToMove
-			})
-			.then(() => {
-				itemsToMove.forEach(item => {
-					commit('REMOVE_ITEM', item.id)
-					commit('INCREASE_FOLDER_ITEM', to_item.id)
-
-					if (item.type === 'folder')
-						dispatch('getAppData')
-					if (getters.currentFolder.location === 'public')
-						dispatch('getFolderTree')
-				})
-			})
-			.catch(() => Vue.prototype.$isSomethingWrong())
-	},
-	createFolder: ({ commit, getters, dispatch }, folder) => {
-
-		// Get route
-		let route = getters.sharedDetail && !getters.sharedDetail.protected
-			? '/api/create-folder/public/' + router.currentRoute.params.token
-			: '/api/create-folder'
-
-		axios
-			.post(route, {
-				parent_id: getters.currentFolder.id,
-				name: folder.name,
-				icon: folder.icon
-			})
-			.then(response => {
-				commit('ADD_NEW_FOLDER', response.data)
-
-				events.$emit('scrollTop')
-
-				//Set focus on new folder name
-				setTimeout(() => {
-					events.$emit('newFolder:focus', response.data.id)
-				}, 10)
-
-				if (getters.currentFolder.location !== 'public')
-					dispatch('getAppData')
-				if (getters.currentFolder.location === 'public')
-					dispatch('getFolderTree')
-
-			})
-			.catch(() => Vue.prototype.$isSomethingWrong())
-	},
-	renameItem: ({ commit, getters, dispatch }, data) => {
-
-		// Updated name in favourites panel
-		if (getters.permission === 'master' && data.type === 'folder')
-			commit('UPDATE_NAME_IN_FAVOURITES', data)
-
-		// Get route
-		let route = getters.sharedDetail && !getters.sharedDetail.protected
-			? '/api/rename-item/' + data.id + '/public/' + router.currentRoute.params.token
-			: '/api/rename-item/' + data.id
-
-		axios
-			.post(route, {
-				name: data.name,
-				type: data.type,
-				icon: data.icon,
-				_method: 'patch'
-			})
-			.then(response => {
-				commit('CHANGE_ITEM_NAME', response.data)
-
-				if (data.type === 'folder' && getters.currentFolder.location !== 'public')
-					dispatch('getAppData')
-				if (data.type === 'folder' && getters.currentFolder.location === 'public')
-					dispatch('getFolderTree')
-			})
-			.catch(() => Vue.prototype.$isSomethingWrong())
-	},
-	uploadFiles: ({ commit, getters }, { form, fileSize, totalUploadedSize }) => {
-		return new Promise((resolve, reject) => {
-
-			// Get route
-			let route = getters.sharedDetail && !getters.sharedDetail.protected
-				? '/api/upload/public/' + router.currentRoute.params.token
-				: '/api/upload'
-
-			// Create cancel token for axios cancellation
-			const CancelToken = axios.CancelToken,
-				source = CancelToken.source()
-
-			axios
-				.post(route, form, {
-					cancelToken: source.token,
-					headers: {
-						'Content-Type': 'application/octet-stream'
-					},
-					onUploadProgress: event => {
-						var percentCompleted = Math.floor(((totalUploadedSize + event.loaded) / fileSize) * 100)
-
-						commit('UPLOADING_FILE_PROGRESS', percentCompleted >= 100 ? 100 : percentCompleted)
-
-						// Set processing file
-						if (percentCompleted >= 100)
-							commit('PROCESSING_FILE', true)
-					}
-				})
-				.then(response => {
-					resolve(response)
-
-					commit('PROCESSING_FILE', false)
-
-					// Remove first file from file queue
-					commit('SHIFT_FROM_FILE_QUEUE')
-
-					// Check if user is in uploading folder, if yes, than show new file
-					if (response.data.folder_id == getters.currentFolder.id) {
-
-						// Add uploaded item into view
-						commit('ADD_NEW_ITEMS', response.data)
-
-						// Reset file progress
-						commit('UPLOADING_FILE_PROGRESS', 0)
-
-						// Increase count in files in queue uploaded for 1
-						commit('INCREASE_FILES_IN_QUEUE_UPLOADED')
-					}
-
-					// Start uploading next file if file queue is not empty
-					if (getters.fileQueue.length) {
-						Vue.prototype.$handleUploading(getters.fileQueue[0])
-					}
-
-					// Reset upload process
-					if (! getters.fileQueue.length)
-						commit('CLEAR_UPLOAD_PROGRESS')
-
-				})
-				.catch(error => {
-					reject(error)
-
-					let messages = {
-						'423': {
-							title: i18n.t('popup_exceed_limit.title'),
-							message: i18n.t('popup_exceed_limit.message')
-						},
-						'415': {
-							title: i18n.t('popup_mimetypes_blacklist.title'),
-							message: i18n.t('popup_mimetypes_blacklist.message')
-						},
-						'413': {
-							title: i18n.t('popup_paylod_error.title'),
-							message: i18n.t('popup_paylod_error.message')
-						}
-					}
-
-					events.$emit('alert:open', {
-						emoji: '😬😬😬',
-						title: messages[error.response.status]['title'],
-						message: messages[error.response.status]['message']
-					})
-
-					commit('PROCESSING_FILE', false)
-					commit('CLEAR_UPLOAD_PROGRESS')
-				})
-
-			// Cancel the upload request
-			events.$on('cancel-upload', () => {
-				source.cancel()
-
-				// Hide upload progress bar
-				commit('PROCESSING_FILE', false)
-				commit('CLEAR_UPLOAD_PROGRESS')
-			})
-		})
-	},
-	restoreItem: ({ commit, getters }, item) => {
-
-		let itemToRestore = []
-		let items = [item]
-		let restoreToHome = false
-
-		// If coming no selected item dont get items to restore from fileInfoDetail
-		if (!item)
-			items = getters.fileInfoDetail
-
-		// Check if file can be restored to home directory
-		if (getters.currentFolder.location === 'trash')
-			restoreToHome = true
-
-		items.forEach(data => itemToRestore.push({
-			type: data.type,
-			id: data.id
-		}))
-
-		// Remove file preview
-		commit('CLEAR_FILEINFO_DETAIL')
-
-		axios
-			.post(getters.api + '/trash/restore-items', {
-				to_home: restoreToHome,
-				data: itemToRestore
-			})
-			.then(
-				// Remove file
-				items.forEach(data => commit('REMOVE_ITEM', data.id))
-			)
-			.catch(() => Vue.prototype.$isSomethingWrong())
-	},
-	deleteItem: ({ commit, getters, dispatch }, noSelectedItem) => {
-
-		let itemsToDelete = []
-		let items = [noSelectedItem]
-
-		// If coming no selected item dont get items to move from fileInfoDetail
-		if (!noSelectedItem)
-			items = getters.fileInfoDetail
-
-		items.forEach(data => {
-			itemsToDelete.push({
-				force_delete: data.deleted_at ? true : false,
-				type: data.type,
-				id: data.id
-			})
-
-			// Remove file
-			commit('REMOVE_ITEM', data.id)
-
-			// Remove item from sidebar
-			if (getters.permission === 'master') {
-
-				if (data.type === 'folder')
-					commit('REMOVE_ITEM_FROM_FAVOURITES', data)
-			}
-
-			// Remove file
-			commit('REMOVE_ITEM', data.id)
-
-			// Remove item from sidebar
-			if (getters.permission === 'master') {
-
-				if (data.type === 'folder')
-					commit('REMOVE_ITEM_FROM_FAVOURITES', data)
-			}
-		})
-
-		// Remove file preview
-		if (!noSelectedItem) {
-			commit('CLEAR_FILEINFO_DETAIL')
-		}
-
-		// Get route
-		let route = getters.sharedDetail && !getters.sharedDetail.protected
-			? '/api/remove-item/public/' + router.currentRoute.params.token
-			: '/api/remove-item'
-
-		axios
-			.post(route, {
-				_method: 'post',
-				data: itemsToDelete
-			})
-			.then(() => {
-
-				itemsToDelete.forEach(data => {
-
-					// If is folder, update app data
-					if (data.type === 'folder') {
-
-						if (data.id === getters.currentFolder.id) {
-
-							if (getters.currentFolder.location === 'public') {
-								dispatch('browseShared', [{ folder: last(getters.browseHistory), back: true, init: false }])
-							} else {
-								dispatch('getFolder', [{ folder: last(getters.browseHistory), back: true, init: false }])
-							}
-						}
-					}
-				})
-
-				if (getters.currentFolder.location !== 'public')
-					dispatch('getAppData')
-
-				if (getters.currentFolder.location === 'public')
-					dispatch('getFolderTree')
-
-			})
-			.catch(() => Vue.prototype.$isSomethingWrong())
-	},
-	emptyTrash: ({ commit, getters }) => {
-
-		// Clear file browser
-		commit('LOADING_STATE', { loading: true, data: [] })
-
-		axios
-			.post(getters.api + '/trash/empty-trash', {
-				_method: 'delete'
-			})
-			.then(() => {
-				commit('LOADING_STATE', { loading: false, data: [] })
-				events.$emit('scrollTop')
-
-				// Remove file preview
-				commit('CLEAR_FILEINFO_DETAIL')
-			})
-			.catch(() => Vue.prototype.$isSomethingWrong())
-	}
+    downloadFolder: ({commit, getters}, folder) => {
+
+        commit('PROCESSING_POPUP', {
+            title: i18n.t('popup_zipping.title'),
+            message: i18n.t('popup_zipping.message')
+        })
+
+        // Get route
+        let route = getters.sharedDetail && !getters.sharedDetail.protected
+            ? '/api/zip/folder/' + folder.id + '/public/' + router.currentRoute.params.token
+            : '/api/zip/folder/' + folder.id
+
+        axios.get(route)
+            .then(response => {
+                Vue.prototype.$downloadFile(response.data.url, response.data.name)
+            })
+            .catch(() => {
+                Vue.prototype.$isSomethingWrong()
+            })
+            .finally(() => {
+                commit('PROCESSING_POPUP', undefined)
+            })
+
+    },
+    downloadFiles: ({commit, getters}) => {
+        let files = []
+
+        // get ids of selected files
+        getters.fileInfoDetail.forEach(file => files.push(file.id))
+
+        // Get route
+        let route = getters.sharedDetail && !getters.sharedDetail.protected
+            ? '/api/zip/files/public/' + router.currentRoute.params.token
+            : '/api/zip/files'
+
+        commit('PROCESSING_POPUP', {
+            title: i18n.t('popup_zipping.title'),
+            message: i18n.t('popup_zipping.message'),
+        })
+
+        axios.post(route, {
+            files: files
+        })
+            .then(response => {
+                Vue.prototype.$downloadFile(response.data.url, response.data.name)
+            })
+            .catch(() => {
+                Vue.prototype.$isSomethingWrong()
+            })
+            .finally(() => {
+                commit('PROCESSING_POPUP', undefined)
+            })
+    },
+    moveItem: ({commit, getters, dispatch}, {to_item, noSelectedItem}) => {
+
+        let itemsToMove = []
+        let items = [noSelectedItem]
+
+        // If coming no selected item dont get items to move from fileInfoDetail
+        if (!noSelectedItem)
+            items = getters.fileInfoDetail
+
+        items.forEach(data => itemsToMove.push({
+            'id': data.id,
+            'type': data.type
+        }))
+
+        // Remove file preview
+        if (!noSelectedItem)
+            commit('CLEAR_FILEINFO_DETAIL')
+
+        // Get route
+        let route = getters.sharedDetail && !getters.sharedDetail.protected
+            ? '/api/editor/move/public/' + router.currentRoute.params.token
+            : '/api/move'
+
+        axios
+            .post(route, {
+                to_id: to_item.id,
+                items: itemsToMove
+            })
+            .then(() => {
+                itemsToMove.forEach(item => {
+                    commit('REMOVE_ITEM', item.id)
+                    commit('INCREASE_FOLDER_ITEM', to_item.id)
+
+                    if (item.type === 'folder')
+                        dispatch('getAppData')
+                    if (getters.currentFolder.location === 'public')
+                        dispatch('getFolderTree')
+                })
+            })
+            .catch(() => Vue.prototype.$isSomethingWrong())
+    },
+    createFolder: ({commit, getters, dispatch}, folder) => {
+
+        // Get route
+        let route = getters.sharedDetail && !getters.sharedDetail.protected
+            ? '/api/editor/create-folder/public/' + router.currentRoute.params.token
+            : '/api/create-folder'
+
+        axios
+            .post(route, {
+                parent_id: getters.currentFolder.id,
+                name: folder.name,
+                icon: folder.icon
+            })
+            .then(response => {
+                commit('ADD_NEW_FOLDER', response.data)
+
+                events.$emit('scrollTop')
+
+                // Set focus on new folder name
+                setTimeout(() => {
+                    events.$emit('newFolder:focus', response.data.id)
+                }, 10)
+
+                if (getters.currentFolder.location !== 'public')
+                    dispatch('getAppData')
+                if (getters.currentFolder.location === 'public')
+                    dispatch('getFolderTree')
+
+            })
+            .catch(() => Vue.prototype.$isSomethingWrong())
+    },
+    renameItem: ({commit, getters, dispatch}, data) => {
+
+        // Updated name in favourites panel
+        if (getters.permission === 'master' && data.type === 'folder')
+            commit('UPDATE_NAME_IN_FAVOURITES', data)
+
+        // Get route
+        let route = getters.sharedDetail && !getters.sharedDetail.protected
+            ? '/api/editor/rename/' + data.id + '/public/' + router.currentRoute.params.token
+            : '/api/rename/' + data.id
+
+        axios
+            .post(route, {
+                ...data,
+                _method: 'patch'
+            })
+            .then(response => {
+                commit('CHANGE_ITEM_NAME', response.data)
+
+                if (data.type === 'folder' && getters.currentFolder.location !== 'public')
+                    dispatch('getAppData')
+                if (data.type === 'folder' && getters.currentFolder.location === 'public')
+                    dispatch('getFolderTree')
+            })
+            .catch(() => Vue.prototype.$isSomethingWrong())
+    },
+    uploadFiles: ({commit, getters}, {form, fileSize, totalUploadedSize}) => {
+        return new Promise((resolve, reject) => {
+
+            // Get route
+            let route = getters.sharedDetail && !getters.sharedDetail.protected
+                ? '/api/editor/upload/public/' + router.currentRoute.params.token
+                : '/api/upload'
+
+            // Create cancel token for axios cancellation
+            const CancelToken = axios.CancelToken,
+                source = CancelToken.source()
+
+            axios
+                .post(route, form, {
+                    cancelToken: source.token,
+                    headers: {
+                        'Content-Type': 'application/octet-stream'
+                    },
+                    onUploadProgress: event => {
+                        var percentCompleted = Math.floor(((totalUploadedSize + event.loaded) / fileSize) * 100)
+
+                        commit('UPLOADING_FILE_PROGRESS', percentCompleted >= 100 ? 100 : percentCompleted)
+
+                        // Set processing file
+                        if (percentCompleted >= 100)
+                            commit('PROCESSING_FILE', true)
+                    }
+                })
+                .then(response => {
+                    resolve(response)
+
+                    commit('PROCESSING_FILE', false)
+
+                    // Remove first file from file queue
+                    commit('SHIFT_FROM_FILE_QUEUE')
+
+                    // Check if user is in uploading folder, if yes, than show new file
+                    if (response.data.folder_id == getters.currentFolder.id) {
+
+                        // Add uploaded item into view
+                        commit('ADD_NEW_ITEMS', response.data)
+
+                        // Reset file progress
+                        commit('UPLOADING_FILE_PROGRESS', 0)
+
+                        // Increase count in files in queue uploaded for 1
+                        commit('INCREASE_FILES_IN_QUEUE_UPLOADED')
+                    }
+
+                    // Start uploading next file if file queue is not empty
+                    if (getters.fileQueue.length) {
+                        Vue.prototype.$handleUploading(getters.fileQueue[0])
+                    }
+
+                    // Reset upload process
+                    if (!getters.fileQueue.length)
+                        commit('CLEAR_UPLOAD_PROGRESS')
+
+                })
+                .catch(error => {
+                    reject(error)
+
+                    let messages = {
+                        '423': {
+                            title: i18n.t('popup_exceed_limit.title'),
+                            message: i18n.t('popup_exceed_limit.message')
+                        },
+                        '415': {
+                            title: i18n.t('popup_mimetypes_blacklist.title'),
+                            message: i18n.t('popup_mimetypes_blacklist.message')
+                        },
+                        '413': {
+                            title: i18n.t('popup_paylod_error.title'),
+                            message: i18n.t('popup_paylod_error.message')
+                        }
+                    }
+
+                    events.$emit('alert:open', {
+                        emoji: '😬😬😬',
+                        title: messages[error.response.status]['title'],
+                        message: messages[error.response.status]['message']
+                    })
+
+                    commit('PROCESSING_FILE', false)
+                    commit('CLEAR_UPLOAD_PROGRESS')
+                })
+
+            // Cancel the upload request
+            events.$on('cancel-upload', () => {
+                source.cancel()
+
+                // Hide upload progress bar
+                commit('PROCESSING_FILE', false)
+                commit('CLEAR_UPLOAD_PROGRESS')
+            })
+        })
+    },
+    restoreItem: ({commit, getters}, item) => {
+
+        let itemToRestore = []
+        let items = [item]
+        let restoreToHome = false
+
+        // If coming no selected item dont get items to restore from fileInfoDetail
+        if (!item)
+            items = getters.fileInfoDetail
+
+        // Check if file can be restored to home directory
+        if (getters.currentFolder.location === 'trash')
+            restoreToHome = true
+
+        items.forEach(data => itemToRestore.push({
+            type: data.type,
+            id: data.id
+        }))
+
+        // Remove file preview
+        commit('CLEAR_FILEINFO_DETAIL')
+
+        axios
+            .post(getters.api + '/trash/restore', {
+                to_home: restoreToHome,
+                items: itemToRestore
+            })
+            .then(
+                // Remove file
+                items.forEach(data => commit('REMOVE_ITEM', data.id))
+            )
+            .catch(() => Vue.prototype.$isSomethingWrong())
+    },
+    deleteItem: ({commit, getters, dispatch}, noSelectedItem) => {
+
+        let itemsToDelete = []
+        let items = [noSelectedItem]
+
+        // If coming no selected item dont get items to move from fileInfoDetail
+        if (!noSelectedItem)
+            items = getters.fileInfoDetail
+
+            items.forEach(data => {
+                itemsToDelete.push({
+                    force_delete: data.deleted_at ? true : false,
+                    type: data.type,
+                    id: data.id
+                })
+
+            // Remove file
+            commit('REMOVE_ITEM', data.id)
+
+            // Remove item from sidebar
+            if (getters.permission === 'master') {
+
+                if (data.type === 'folder')
+                    commit('REMOVE_ITEM_FROM_FAVOURITES', data)
+            }
+
+            // Remove file
+            commit('REMOVE_ITEM', data.id)
+
+            // Remove item from sidebar
+            if (getters.permission === 'master') {
+
+                if (data.type === 'folder')
+                    commit('REMOVE_ITEM_FROM_FAVOURITES', data)
+            }
+        })
+
+        // Remove file preview
+        if (!noSelectedItem) {
+            commit('CLEAR_FILEINFO_DETAIL')
+        }
+
+        // Get route
+        let route = getters.sharedDetail && !getters.sharedDetail.protected
+            ? '/api/editor/remove/public/' + router.currentRoute.params.token
+            : '/api/remove'
+
+        axios
+            .post(route, {
+                items: itemsToDelete
+            })
+            .then(() => {
+
+                itemsToDelete.forEach(data => {
+
+                    // If is folder, update app data
+                    if (data.type === 'folder') {
+
+                        if (data.id === getters.currentFolder.id) {
+
+                            if (getters.currentFolder.location === 'public') {
+                                dispatch('browseShared', [{folder: last(getters.browseHistory), back: true, init: false}])
+                            } else {
+                                dispatch('getFolder', [{folder: last(getters.browseHistory), back: true, init: false}])
+                            }
+                        }
+                    }
+                })
+
+                if (getters.currentFolder.location !== 'public')
+                    dispatch('getAppData')
+
+                if (getters.currentFolder.location === 'public')
+                    dispatch('getFolderTree')
+
+            })
+            .catch(() => Vue.prototype.$isSomethingWrong())
+    },
+    emptyTrash: ({commit, getters}) => {
+
+        // Clear file browser
+        commit('LOADING_STATE', {loading: true, data: []})
+
+        axios
+            .post(getters.api + '/trash/dump', {
+                _method: 'delete'
+            })
+            .then(() => {
+                commit('LOADING_STATE', {loading: false, data: []})
+                events.$emit('scrollTop')
+
+                commit('CLEAR_FILEINFO_DETAIL')
+            })
+            .catch(() => Vue.prototype.$isSomethingWrong())
+    }
 }
 
 const mutations = {
-	PROCESSING_POPUP(state, status) {
-		state.processingPopup = status
-	},
-	ADD_FILES_TO_QUEUE(state, file) {
-		state.fileQueue.push(file)
-	},
-	SHIFT_FROM_FILE_QUEUE(state) {
-		state.fileQueue.shift()
-	},
-	PROCESSING_FILE(state, status) {
-		state.isProcessingFile = status
-	},
-	UPLOADING_FILE_PROGRESS(state, percentage) {
-		state.uploadingProgress = percentage
-	},
-	INCREASE_FILES_IN_QUEUES_TOTAL(state, count) {
-		state.filesInQueueTotal += count
-	},
-	INCREASE_FILES_IN_QUEUE_UPLOADED(state) {
-		state.filesInQueueUploaded++
-	},
-	CLEAR_UPLOAD_PROGRESS(state) {
-		state.filesInQueueUploaded = 0
-		state.filesInQueueTotal = 0
-		state.fileQueue = []
-	}
+    PROCESSING_POPUP(state, status) {
+        state.processingPopup = status
+    },
+    ADD_FILES_TO_QUEUE(state, file) {
+        state.fileQueue.push(file)
+    },
+    SHIFT_FROM_FILE_QUEUE(state) {
+        state.fileQueue.shift()
+    },
+    PROCESSING_FILE(state, status) {
+        state.isProcessingFile = status
+    },
+    UPLOADING_FILE_PROGRESS(state, percentage) {
+        state.uploadingProgress = percentage
+    },
+    INCREASE_FILES_IN_QUEUES_TOTAL(state, count) {
+        state.filesInQueueTotal += count
+    },
+    INCREASE_FILES_IN_QUEUE_UPLOADED(state) {
+        state.filesInQueueUploaded++
+    },
+    CLEAR_UPLOAD_PROGRESS(state) {
+        state.filesInQueueUploaded = 0
+        state.filesInQueueTotal = 0
+        state.fileQueue = []
+    }
 }
 
 const getters = {
-	filesInQueueUploaded: state => state.filesInQueueUploaded,
-	filesInQueueTotal: state => state.filesInQueueTotal,
-	uploadingProgress: state => state.uploadingProgress,
-	isProcessingFile: state => state.isProcessingFile,
-	processingPopup: state => state.processingPopup,
-	fileQueue: state => state.fileQueue
+    filesInQueueUploaded: state => state.filesInQueueUploaded,
+    filesInQueueTotal: state => state.filesInQueueTotal,
+    uploadingProgress: state => state.uploadingProgress,
+    isProcessingFile: state => state.isProcessingFile,
+    processingPopup: state => state.processingPopup,
+    fileQueue: state => state.fileQueue
 }
 
 export default {
-	state: defaultState,
-	mutations,
-	actions,
-	getters
+    state: defaultState,
+    mutations,
+    actions,
+    getters
 }
diff --git a/resources/js/store/modules/sharing.js b/resources/js/store/modules/sharing.js
index 312d821e..cbefe688 100644
--- a/resources/js/store/modules/sharing.js
+++ b/resources/js/store/modules/sharing.js
@@ -81,8 +81,7 @@ const actions = {
             })
 
             axios
-                .post('/api/share/cancel', {
-                    _method: 'post',
+                .post('/api/share/revoke', {
                     tokens: tokens
                 })
                 .then(() => {
@@ -90,7 +89,7 @@ const actions = {
                     items.forEach(item => {
 
                         // Remove item from file browser
-                        if ( getters.currentFolder , getters.currentFolder.location === 'shared' ) {
+                        if ( getters.currentFolder && getters.currentFolder.location === 'shared' ) {
                             commit('REMOVE_ITEM', item.id)
                         }
 
@@ -112,8 +111,8 @@ const actions = {
     getSingleFile: ({commit, state}) => {
 
         let route = state.sharedDetail.protected
-            ? '/api/files/private'
-            : '/api/files/' + router.currentRoute.params.token + '/public'
+            ? '/api/browse/files/private'
+            : '/api/browse/files/' + router.currentRoute.params.token + '/public'
 
         axios.get(route)
             .then(response => {
diff --git a/resources/js/store/modules/userAuth.js b/resources/js/store/modules/userAuth.js
index 0e2b05fc..5c1894e1 100644
--- a/resources/js/store/modules/userAuth.js
+++ b/resources/js/store/modules/userAuth.js
@@ -21,7 +21,7 @@ const actions = {
 
                     // Redirect user if is logged
                     if (router.currentRoute.name === 'SignIn')
-                        router.push({ name: 'Files' })
+                        router.push({name: 'Files'})
 
                     commit('RETRIEVE_USER', response.data)
 
@@ -61,13 +61,13 @@ const actions = {
         let items = [folder]
 
         // If dont coming single folder get folders to add to favourites from fileInfoDetail
-        if(!folder)
+        if (!folder)
             items = context.getters.fileInfoDetail
 
         items.forEach((data) => {
-            if(data.type === 'folder' ) {
+            if (data.type === 'folder') {
 
-                if(context.getters.user.data.relationships.favourites.data.attributes.folders.find(folder => folder.id === data.id)) return
+                if (context.getters.user.data.relationships.favourites.data.attributes.folders.find(folder => folder.id === data.id)) return
 
                 addFavourites.push({
                     id: data.id
@@ -76,24 +76,24 @@ const actions = {
         })
 
         // If dont coming single folder clear the selected folders in fileInfoDetail
-        if(!folder) {
+        if (!folder) {
             context.commit('CLEAR_FILEINFO_DETAIL')
         }
 
         let pushToFavorites = []
-        
+
         // Check is favorites already don't include some of pushed folders
         items.map(data => {
-            if(!context.getters.user.data.relationships.favourites.data.attributes.folders.find(folder => folder.id === data.id)){
+            if (!context.getters.user.data.relationships.favourites.data.attributes.folders.find(folder => folder.id === data.id)) {
                 pushToFavorites.push(data)
             }
         })
-        
+
         // Add to storage
         context.commit('ADD_TO_FAVOURITES', pushToFavorites)
 
         axios
-            .post(context.getters.api + '/browse/folders/favourites', {
+            .post(context.getters.api + '/folders/favourites', {
                 folders: addFavourites
             })
             .catch(() => {
@@ -127,13 +127,13 @@ const mutations = {
         state.app = undefined
     },
     ADD_TO_FAVOURITES(state, folder) {
-        folder.forEach(item => { 
-        state.user.data.relationships.favourites.data.attributes.folders.push({
-            id: item.id,
-            name: item.name,
-            type: item.type,
+        folder.forEach(item => {
+            state.user.data.relationships.favourites.data.attributes.folders.push({
+                id: item.id,
+                name: item.name,
+                type: item.type,
+            })
         })
-    })
     },
     UPDATE_NAME(state, name) {
         state.user.data.relationships.settings.data.attributes.name = name
@@ -155,7 +155,7 @@ const mutations = {
 
 const getters = {
     permission: state => state.permission,
-    isGuest: state => ! state.authorized,
+    isGuest: state => !state.authorized,
     isLogged: state => state.authorized,
     user: state => state.user,
 }
diff --git a/resources/js/views/Auth/SignIn.vue b/resources/js/views/Auth/SignIn.vue
index 7148c2e0..2ab72cd1 100644
--- a/resources/js/views/Auth/SignIn.vue
+++ b/resources/js/views/Auth/SignIn.vue
@@ -210,10 +210,10 @@
             this.$scrollTop()
             this.$store.commit('PROCESSING_POPUP', undefined)
 
-            if (this.config.isDemo) {
+            //if (this.config.isDemo) {
                 this.loginEmail = 'howdy@hi5ve.digital'
                 this.loginPassword = 'vuefilemanager'
-            }
+            //}
         }
     }
 </script>
diff --git a/tests/Feature/Accounts/UserAccountTest.php b/tests/Feature/Accounts/UserAccountTest.php
index 6eae01ed..770a70d8 100644
--- a/tests/Feature/Accounts/UserAccountTest.php
+++ b/tests/Feature/Accounts/UserAccountTest.php
@@ -99,70 +99,56 @@ class UserAccountTest extends TestCase
         $this->getJson('/api/user')
             ->assertStatus(200)
             ->assertExactJson([
-                "data"          => [
-                    "id"         => (string) $user->id,
-                    "type"       => "user",
-                    "attributes" => [
+                "data" => [
+                    "id"            => (string)$user->id,
+                    "type"          => "user",
+                    "attributes"    => [
                         "storage_capacity"     => "5",
                         "subscription"         => false,
                         "incomplete_payment"   => null,
                         "stripe_customer"      => false,
                         "email"                => $user->email,
                         "role"                 => $user->role,
+                        "folders"              => [],
+                        "storage"              => [
+                            "used"               => 0,
+                            "used_formatted"     => "0.00%",
+                            "capacity"           => "5",
+                            "capacity_formatted" => "5GB",
+                        ],
                         "created_at_formatted" => format_date($user->created_at, '%d. %B. %Y'),
                         "created_at"           => $user->created_at->toJson(),
                         "updated_at"           => $user->updated_at->toJson(),
+                    ],
+                    "relationships" => [
+                        "settings"   => [
+                            "data" => [
+                                "id"         => (string)$user->id,
+                                "type"       => "settings",
+                                "attributes" => [
+                                    'avatar'               => $user->settings->avatar,
+                                    'name'         => $user->settings->name,
+                                    'address'      => $user->settings->address,
+                                    'state'        => $user->settings->state,
+                                    'city'         => $user->settings->city,
+                                    'postal_code'  => $user->settings->postal_code,
+                                    'country'      => $user->settings->country,
+                                    'phone_number' => $user->settings->phone_number,
+                                    'timezone'             => $user->settings->timezone
+                                ]
+                            ]
+                        ],
+                        "favourites" => [
+                            "data" => [
+                                "id"         => (string)$user->id,
+                                "type"       => "favourite_folders",
+                                "attributes" => [
+                                    "folders" => []
+                                ]
+                            ]
+                        ],
                     ]
                 ],
-                "relationships" => [
-                    "settings"   => [
-                        "data" => [
-                            "id"         => (string) $user->id,
-                            "type"       => "settings",
-                            "attributes" => [
-                                'avatar'               => $user->settings->avatar,
-                                'billing_name'         => $user->settings->name,
-                                'billing_address'      => $user->settings->address,
-                                'billing_state'        => $user->settings->state,
-                                'billing_city'         => $user->settings->city,
-                                'billing_postal_code'  => $user->settings->postal_code,
-                                'billing_country'      => $user->settings->country,
-                                'billing_phone_number' => $user->settings->phone_number,
-                                'timezone'             => $user->settings->timezone
-                            ]
-                        ]
-                    ],
-                    "storage"    => [
-                        "data" => [
-                            "id"         => "1",
-                            "type"       => "storage",
-                            "attributes" => [
-                                "used"               => 0,
-                                "used_formatted"     => "0.00%",
-                                "capacity"           => "5",
-                                "capacity_formatted" => "5GB",
-                            ]
-                        ]
-                    ],
-                    "favourites" => [
-                        "data" => [
-                            "id"         => "1",
-                            "type"       => "folders_favourite",
-                            "attributes" => [
-                                "folders" => []
-                            ]
-                        ]
-                    ],
-                    "tree"       => [
-                        "data" => [
-                            "id"         => "1",
-                            "type"       => "folders_tree",
-                            "attributes" => [
-                                "folders" => [],
-                            ]
-                        ]
-                    ],
-                ]
             ]);
     }
 }