diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index d8b5ab45..2423edbd 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -12,7 +12,7 @@
     "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~1bec6fe4.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~1bec6fe4.js?id=a935f1a48a77c1ab8198",
     "/chunks/admin~chunks/platform.js": "/chunks/admin~chunks/platform.js?id=90270d0c5aeb5c50dacf",
     "/chunks/admin~chunks/platform~chunks/settings.js": "/chunks/admin~chunks/platform~chunks/settings.js?id=a980b59887f54d19130b",
-    "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.js?id=a44cb148fdebc8d5af9f",
+    "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.js?id=826f3d7c3d0236d2a51c",
     "/chunks/app-appearance.js": "/chunks/app-appearance.js?id=6177253e847903d63adc",
     "/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=aa284736dda7647d5c9e",
     "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~8cc7d96f.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~8cc7d96f.js?id=6bd4516589f23ec25ae6",
@@ -59,7 +59,7 @@
     "/chunks/plans.js": "/chunks/plans.js?id=6fca685daa45f22e4c8f",
     "/chunks/platform.js": "/chunks/platform.js?id=952d1a1ab47518da8533",
     "/chunks/platform~chunks/settings-subscription~chunks/shared~chunks/user-subscription.js": "/chunks/platform~chunks/settings-subscription~chunks/shared~chunks/user-subscription.js?id=8656b69a97cace919251",
-    "/chunks/platform~chunks/shared.js": "/chunks/platform~chunks/shared.js?id=6f3b869be08364cdf267",
+    "/chunks/platform~chunks/shared.js": "/chunks/platform~chunks/shared.js?id=c6d08a9facb1c1d4d355",
     "/chunks/profile.js": "/chunks/profile.js?id=0638997b77c6f1246062",
     "/chunks/profile~chunks/settings-password.js": "/chunks/profile~chunks/settings-password.js?id=58edfb3a35062e1ba4e0",
     "/chunks/purchase-code.js": "/chunks/purchase-code.js?id=f8b2619e393a5823bf29",
@@ -448,5 +448,28 @@
     "/chunks/trash.80cfaad4be6545087c99.hot-update.js": "/chunks/trash.80cfaad4be6545087c99.hot-update.js",
     "/chunks/trash.b597c18f3454af21cc0e.hot-update.js": "/chunks/trash.b597c18f3454af21cc0e.hot-update.js",
     "/chunks/team-folders.af46a27df7cb345fed7e.hot-update.js": "/chunks/team-folders.af46a27df7cb345fed7e.hot-update.js",
-    "/chunks/shared-with-me.4f9a132575a3721fcd59.hot-update.js": "/chunks/shared-with-me.4f9a132575a3721fcd59.hot-update.js"
+    "/chunks/shared-with-me.4f9a132575a3721fcd59.hot-update.js": "/chunks/shared-with-me.4f9a132575a3721fcd59.hot-update.js",
+    "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.c906e5f6252b3975d355.hot-update.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.c906e5f6252b3975d355.hot-update.js",
+    "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.d8d79cec34df69790d58.hot-update.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.d8d79cec34df69790d58.hot-update.js",
+    "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.63e7eff4e37da4b2ca1e.hot-update.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.63e7eff4e37da4b2ca1e.hot-update.js",
+    "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.a4a7db885eebb3cde358.hot-update.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.a4a7db885eebb3cde358.hot-update.js",
+    "/chunks/platform~chunks/shared.2876a32ffbbeded219f0.hot-update.js": "/chunks/platform~chunks/shared.2876a32ffbbeded219f0.hot-update.js",
+    "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.43c74c6fb5d69a15b2f0.hot-update.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.43c74c6fb5d69a15b2f0.hot-update.js",
+    "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.78a082e1341587c5f965.hot-update.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.78a082e1341587c5f965.hot-update.js",
+    "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.be930aa44ff138757429.hot-update.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.be930aa44ff138757429.hot-update.js",
+    "/chunks/platform~chunks/shared.b809dd8e5b08a9416e45.hot-update.js": "/chunks/platform~chunks/shared.b809dd8e5b08a9416e45.hot-update.js",
+    "/chunks/platform~chunks/shared.f378e270db2b6a2e3541.hot-update.js": "/chunks/platform~chunks/shared.f378e270db2b6a2e3541.hot-update.js",
+    "/chunks/platform~chunks/shared.ef9a509a573cc00defd8.hot-update.js": "/chunks/platform~chunks/shared.ef9a509a573cc00defd8.hot-update.js",
+    "/chunks/platform~chunks/shared.6347f816b62c4c0e1ebc.hot-update.js": "/chunks/platform~chunks/shared.6347f816b62c4c0e1ebc.hot-update.js",
+    "/chunks/platform~chunks/shared.d1e3a2e8b1eda2530fc1.hot-update.js": "/chunks/platform~chunks/shared.d1e3a2e8b1eda2530fc1.hot-update.js",
+    "/chunks/platform~chunks/shared.1affbee4460ed362981b.hot-update.js": "/chunks/platform~chunks/shared.1affbee4460ed362981b.hot-update.js",
+    "/chunks/platform~chunks/shared.e59a22ea5674f40d7ec5.hot-update.js": "/chunks/platform~chunks/shared.e59a22ea5674f40d7ec5.hot-update.js",
+    "/chunks/platform~chunks/shared.61f3f8571e4bc3db5cd4.hot-update.js": "/chunks/platform~chunks/shared.61f3f8571e4bc3db5cd4.hot-update.js",
+    "/js/main.ef7b7a5b2fb5a5dd9513.hot-update.js": "/js/main.ef7b7a5b2fb5a5dd9513.hot-update.js",
+    "/js/main.eb20be2d75b9ca4848a3.hot-update.js": "/js/main.eb20be2d75b9ca4848a3.hot-update.js",
+    "/chunks/platform~chunks/shared.8e7e2f94d0022186efac.hot-update.js": "/chunks/platform~chunks/shared.8e7e2f94d0022186efac.hot-update.js",
+    "/js/main.43ae89a16a20fcd817ef.hot-update.js": "/js/main.43ae89a16a20fcd817ef.hot-update.js",
+    "/js/main.f85ed88953e67bfb2b53.hot-update.js": "/js/main.f85ed88953e67bfb2b53.hot-update.js",
+    "/vendors~chunks/admin~chunks/admin-account~chunks/app-email~chunks/app-payments~chunks/app-setup~chun~81d257bc.js": "/vendors~chunks/admin~chunks/admin-account~chunks/app-email~chunks/app-payments~chunks/app-setup~chun~81d257bc.js?id=a355eeae70079483b2f0",
+    "/js/main.0557c95a045c89e2ad94.hot-update.js": "/js/main.0557c95a045c89e2ad94.hot-update.js"
 }
diff --git a/resources/js/components/FilesView/FileSortingOptions.vue b/resources/js/components/FilesView/FileSortingOptions.vue
index fdf6958f..7e5c203d 100644
--- a/resources/js/components/FilesView/FileSortingOptions.vue
+++ b/resources/js/components/FilesView/FileSortingOptions.vue
@@ -72,11 +72,13 @@ export default {
             // Update sorting state in vuex
             this.$store.commit('UPDATE_SORTING')
 
-			// Get dara of user with favourites tree
+			// Get data of user with favourites tree
 			this.$store.dispatch('getAppData')
 
 			// Get data of Navigator tree
 			this.$store.dispatch('getFolderTree')
+
+			this.$getDataByLocation()
         },
         changePreview(previewType) {
             this.$store.dispatch('changePreviewType', previewType)
diff --git a/resources/js/components/FilesView/MobileToolbar.vue b/resources/js/components/FilesView/MobileToolbar.vue
index 7a48d84e..16a20c29 100644
--- a/resources/js/components/FilesView/MobileToolbar.vue
+++ b/resources/js/components/FilesView/MobileToolbar.vue
@@ -10,7 +10,7 @@
 				{{ $getCurrentLocationName() }}
 			</div>
 
-			<span v-if="currentFolder" @click.stop="showItemActions" class="py-0.5 px-1.5 ml-3 rounded-md bg-light-background">
+			<span v-if="currentFolder" @click.stop="showItemActions" class="py-0.5 px-1.5 ml-3 rounded-md dark:bg-dark-foreground bg-light-background">
 				<more-horizontal-icon size="14" />
 			</span>
         </div>
diff --git a/resources/js/components/Spotlight/Spotlight.vue b/resources/js/components/Spotlight/Spotlight.vue
index 96aff4c5..ce3f45e2 100644
--- a/resources/js/components/Spotlight/Spotlight.vue
+++ b/resources/js/components/Spotlight/Spotlight.vue
@@ -1,6 +1,6 @@
 <template>
-	<div v-if="isVisible" @keyup.esc="exit" id="spotlight" tabindex="-1">
-		<div class="spotlight-wrapper">
+	<div v-if="isVisible" @keyup.esc="exit" id="spotlight" tabindex="-1" class="dark:bg-dark-foreground">
+		<div class="spotlight-wrapper bg-white">
 
 			<!--Query bar-->
 			<div class="spotlight-search">
@@ -109,12 +109,12 @@ export default {
 
 			// Show folder
 			if (file.data.type === 'folder') {
-				this.$router.push({name: 'Files', params: {id: this.results[this.index].data.id}})
+				this.$router.push({name: 'Files', params: {id: file.data.id}})
 			} else {
 
 				// Show file
 				if (['video', 'audio', 'image'].includes(file.data.type) || file.data.attributes.mimetype === 'pdf'){
-					this.$store.commit('ADD_TO_FAST_PREVIEW', this.results[this.index])
+					this.$store.commit('ADD_TO_FAST_PREVIEW', file)
 
 					events.$emit('file-preview:show')
 				} else {
@@ -342,7 +342,6 @@ export default {
 
 @media only screen and (max-width: 690px) {
 	#spotlight {
-		background: white;
 		z-index: 99;
 
 		.spotlight-wrapper {
diff --git a/resources/js/helpers/functionHelpers.js b/resources/js/helpers/functionHelpers.js
index 92ed4098..3ad3175f 100644
--- a/resources/js/helpers/functionHelpers.js
+++ b/resources/js/helpers/functionHelpers.js
@@ -229,6 +229,20 @@ const FunctionHelpers = {
             }[this.$route.name]
         }
 
+        Vue.prototype.$getDataByLocation = function () {
+
+            let routes = {
+                'Files': ['getFolder', this.$route.params.id],
+                'RecentUploads': ['getRecentUploads'],
+                'MySharedItems': ['getMySharedItems'],
+                'Trash': ['getTrash', this.$route.params.id],
+                'TeamFolders': ['getTeamFolder', this.$route.params.id],
+                'SharedWithMe': ['getSharedWithMeFolder', this.$route.params.id],
+            }
+
+            this.$store.dispatch(...routes[this.$router.currentRoute.name])
+        }
+
         Vue.prototype.$goToFileView = function (id) {
 
             let locations = {