diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index ff8e5e24..811f7f13 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -1,75 +1,75 @@
 {
     "/js/main.js": "/js/main.js",
-    "/chunks/request.js": "/chunks/request.js?id=2612a0666f7c5288",
-    "/chunks/request-upload.js": "/chunks/request-upload.js?id=fd51df8575a7dee1",
-    "/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=e00d8661d9309daf",
-    "/chunks/status-check.js": "/chunks/status-check.js?id=63d576ce787c1ced",
-    "/chunks/purchase-code.js": "/chunks/purchase-code.js?id=9805de5bb941797f",
-    "/chunks/database.js": "/chunks/database.js?id=91cbfea9fce46de8",
-    "/chunks/environment-setup.js": "/chunks/environment-setup.js?id=4355a418b292c1c7",
-    "/chunks/app-setup.js": "/chunks/app-setup.js?id=de913045c953752a",
-    "/chunks/admin-account.js": "/chunks/admin-account.js?id=205b419d198f8fdc",
-    "/chunks/shared.js": "/chunks/shared.js?id=4c20e49c6ccc5da8",
-    "/chunks/shared/browser.js": "/chunks/shared/browser.js?id=e056607bd53721b0",
-    "/chunks/shared/single-file.js": "/chunks/shared/single-file.js?id=a0e3467219aa86d9",
-    "/chunks/shared/authenticate.js": "/chunks/shared/authenticate.js?id=b5f3d082a586c619",
-    "/chunks/not-found.js": "/chunks/not-found.js?id=913fb0f40976e1a8",
-    "/chunks/temporary-unavailable.js": "/chunks/temporary-unavailable.js?id=250d923cb7001cf2",
-    "/chunks/admin.js": "/chunks/admin.js?id=51bf991d3cddbcd6",
-    "/chunks/dashboard.js": "/chunks/dashboard.js?id=67eb430a1f049498",
-    "/chunks/invoices.js": "/chunks/invoices.js?id=1344281edac589dd",
-    "/chunks/subscriptions.js": "/chunks/subscriptions.js?id=5eb4e2a4cdd4cee7",
-    "/chunks/pages.js": "/chunks/pages.js?id=e730474753a9e86c",
-    "/chunks/page-edit.js": "/chunks/page-edit.js?id=4f54f01640f91ea4",
-    "/chunks/plans.js": "/chunks/plans.js?id=c5ae80b5680fd972",
-    "/chunks/users.js": "/chunks/users.js?id=57e2b88c5d64eeaf",
-    "/chunks/user-create.js": "/chunks/user-create.js?id=94cb6de3fa97532f",
-    "/chunks/plan-create/fixed.js": "/chunks/plan-create/fixed.js?id=233b503c533785b6",
-    "/chunks/plan-create/metered.js": "/chunks/plan-create/metered.js?id=399dc36da3ead2dd",
-    "/chunks/user.js": "/chunks/user.js?id=be6451917a05f8bb",
-    "/chunks/user-detail.js": "/chunks/user-detail.js?id=d24d758ff91cabaa",
-    "/chunks/user-storage.js": "/chunks/user-storage.js?id=f975fec0bf4fc7e0",
-    "/chunks/user-subscription.js": "/chunks/user-subscription.js?id=1c86ce0edbb859df",
-    "/chunks/user-password.js": "/chunks/user-password.js?id=204e36cbf11279ab",
-    "/chunks/user-delete.js": "/chunks/user-delete.js?id=bbf64bfbcc6eb5f9",
-    "/chunks/plan.js": "/chunks/plan.js?id=2444730c1a0a42fc",
-    "/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=f38b09679bd4aee8",
-    "/chunks/plan-settings.js": "/chunks/plan-settings.js?id=887502be9ee6ef81",
-    "/chunks/plan-delete.js": "/chunks/plan-delete.js?id=f11556bf815870ba",
-    "/chunks/payments.js": "/chunks/payments.js?id=5ea275fedd8d638a",
-    "/chunks/payments/billings.js": "/chunks/payments/billings.js?id=d81a724698921629",
-    "/chunks/payments/settings.js": "/chunks/payments/settings.js?id=3ce158149a48ae6b",
-    "/chunks/app-settings.js": "/chunks/app-settings.js?id=b0ca7cdad56e46fd",
-    "/chunks/app-appearance.js": "/chunks/app-appearance.js?id=ef490b0cab8308f1",
-    "/chunks/app-index.js": "/chunks/app-index.js?id=2be003c6977e905c",
-    "/chunks/app-environment.js": "/chunks/app-environment.js?id=819c23db13c00210",
-    "/chunks/app-others.js": "/chunks/app-others.js?id=2d437d95f3823ded",
-    "/chunks/app-sign-in-out.js": "/chunks/app-sign-in-out.js?id=8b0999957ba0a5fc",
-    "/chunks/app-adsense.js": "/chunks/app-adsense.js?id=30a7d6424225bcd0",
-    "/chunks/app-server.js": "/chunks/app-server.js?id=212f36990ede9cb9",
-    "/chunks/app-language.js": "/chunks/app-language.js?id=77ba96928bbd9ed6",
-    "/chunks/homepage.js": "/chunks/homepage.js?id=3babb68ac329a2e4",
-    "/chunks/dynamic-page.js": "/chunks/dynamic-page.js?id=a20e623585f77df6",
-    "/chunks/contact-us.js": "/chunks/contact-us.js?id=e99f7a5acb98eb08",
-    "/chunks/successfully-email-verified.js": "/chunks/successfully-email-verified.js?id=5228b9bf9ceec486",
-    "/chunks/successfully-email-send.js": "/chunks/successfully-email-send.js?id=35e61510310ad1b4",
-    "/chunks/sign-in.js": "/chunks/sign-in.js?id=a16e70643a831be0",
-    "/chunks/sign-up.js": "/chunks/sign-up.js?id=cf84811cb369d980",
-    "/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=48c8a5f422239bde",
-    "/chunks/create-new-password.js": "/chunks/create-new-password.js?id=f196d33db637620f",
-    "/chunks/settings.js": "/chunks/settings.js?id=6185ba1b3f91cab1",
-    "/chunks/profile.js": "/chunks/profile.js?id=6f41d5db05622afd",
-    "/chunks/settings-password.js": "/chunks/settings-password.js?id=5aed9d38b48443d7",
-    "/chunks/settings-storage.js": "/chunks/settings-storage.js?id=0a158de7fef68126",
-    "/chunks/billing.js": "/chunks/billing.js?id=e0068be5f76f4e11",
-    "/chunks/platform.js": "/chunks/platform.js?id=9a15187a99ab498f",
-    "/chunks/files.js": "/chunks/files.js?id=d1ac47f0c9b9f5e8",
-    "/chunks/recent-uploads.js": "/chunks/recent-uploads.js?id=c531b15d076872fa",
-    "/chunks/my-shared-items.js": "/chunks/my-shared-items.js?id=fa1e0a8c108ba841",
-    "/chunks/trash.js": "/chunks/trash.js?id=aac7dfa09f8ff31e",
-    "/chunks/team-folders.js": "/chunks/team-folders.js?id=e77840edab57bfba",
-    "/chunks/shared-with-me.js": "/chunks/shared-with-me.js?id=b2cec49089d1c61a",
-    "/chunks/invitation.js": "/chunks/invitation.js?id=82c68bb809caa64b",
+    "/chunks/request.js": "/chunks/request.js?id=a5f743139d4e768b",
+    "/chunks/request-upload.js": "/chunks/request-upload.js?id=b06b5de5aa8923db",
+    "/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=19a0784e59d768ec",
+    "/chunks/status-check.js": "/chunks/status-check.js?id=d619c9a715d82eac",
+    "/chunks/purchase-code.js": "/chunks/purchase-code.js?id=8ce2150648a811b5",
+    "/chunks/database.js": "/chunks/database.js?id=2abed3c6d692416a",
+    "/chunks/environment-setup.js": "/chunks/environment-setup.js?id=7f6a9af36bfcd706",
+    "/chunks/app-setup.js": "/chunks/app-setup.js?id=0df2494d2269a949",
+    "/chunks/admin-account.js": "/chunks/admin-account.js?id=2d131d1d784c98b9",
+    "/chunks/shared.js": "/chunks/shared.js?id=808cd1441d45eb60",
+    "/chunks/shared/browser.js": "/chunks/shared/browser.js?id=1ab7e36802e75351",
+    "/chunks/shared/single-file.js": "/chunks/shared/single-file.js?id=34e05a8b937a1436",
+    "/chunks/shared/authenticate.js": "/chunks/shared/authenticate.js?id=2b7cf12984397d27",
+    "/chunks/not-found.js": "/chunks/not-found.js?id=36763aa314e00327",
+    "/chunks/temporary-unavailable.js": "/chunks/temporary-unavailable.js?id=a3906226272982b1",
+    "/chunks/admin.js": "/chunks/admin.js?id=8588ba3248a14ac2",
+    "/chunks/dashboard.js": "/chunks/dashboard.js?id=0ba6b75f07f739e2",
+    "/chunks/invoices.js": "/chunks/invoices.js?id=f89964a5a55ace45",
+    "/chunks/subscriptions.js": "/chunks/subscriptions.js?id=62582c26b6288d7d",
+    "/chunks/pages.js": "/chunks/pages.js?id=38c76f5552161514",
+    "/chunks/page-edit.js": "/chunks/page-edit.js?id=a329cda46342b4cf",
+    "/chunks/plans.js": "/chunks/plans.js?id=b5e1384c6e697927",
+    "/chunks/users.js": "/chunks/users.js?id=f41910a94ca4e36f",
+    "/chunks/user-create.js": "/chunks/user-create.js?id=1f16a20ef51b3217",
+    "/chunks/plan-create/fixed.js": "/chunks/plan-create/fixed.js?id=793e8f43eb5d9c13",
+    "/chunks/plan-create/metered.js": "/chunks/plan-create/metered.js?id=e33392f21fa044d9",
+    "/chunks/user.js": "/chunks/user.js?id=7e567c0cb7f641d6",
+    "/chunks/user-detail.js": "/chunks/user-detail.js?id=a09c26113827d1d5",
+    "/chunks/user-storage.js": "/chunks/user-storage.js?id=6437079d1b7db03a",
+    "/chunks/user-subscription.js": "/chunks/user-subscription.js?id=0acc28aa56454710",
+    "/chunks/user-password.js": "/chunks/user-password.js?id=9e00dc08b4d46b30",
+    "/chunks/user-delete.js": "/chunks/user-delete.js?id=73d823437e4a414a",
+    "/chunks/plan.js": "/chunks/plan.js?id=37a04161ac1973ad",
+    "/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=2cc70b67d00bbda1",
+    "/chunks/plan-settings.js": "/chunks/plan-settings.js?id=6739dd41ab5749ff",
+    "/chunks/plan-delete.js": "/chunks/plan-delete.js?id=e56fd84d4718e2f3",
+    "/chunks/payments.js": "/chunks/payments.js?id=2a6dba57de536b0d",
+    "/chunks/payments/billings.js": "/chunks/payments/billings.js?id=8ff91573838e18e0",
+    "/chunks/payments/settings.js": "/chunks/payments/settings.js?id=730f776273bc9f09",
+    "/chunks/app-settings.js": "/chunks/app-settings.js?id=ac94675bfea2ac48",
+    "/chunks/app-appearance.js": "/chunks/app-appearance.js?id=7801199064bd834b",
+    "/chunks/app-index.js": "/chunks/app-index.js?id=80eed2df9c7ef155",
+    "/chunks/app-environment.js": "/chunks/app-environment.js?id=5be816eb94bd9a78",
+    "/chunks/app-others.js": "/chunks/app-others.js?id=33040c1f2fbb9b63",
+    "/chunks/app-sign-in-out.js": "/chunks/app-sign-in-out.js?id=80ab5897c46993b5",
+    "/chunks/app-adsense.js": "/chunks/app-adsense.js?id=5ce9441ee0eadd98",
+    "/chunks/app-server.js": "/chunks/app-server.js?id=8964b98aee4cca69",
+    "/chunks/app-language.js": "/chunks/app-language.js?id=dfb26ea66227b657",
+    "/chunks/homepage.js": "/chunks/homepage.js?id=9894f8229fc1373e",
+    "/chunks/dynamic-page.js": "/chunks/dynamic-page.js?id=f8c67b2a376ff03e",
+    "/chunks/contact-us.js": "/chunks/contact-us.js?id=6812adfb9e719126",
+    "/chunks/successfully-email-verified.js": "/chunks/successfully-email-verified.js?id=261b02aed36069be",
+    "/chunks/successfully-email-send.js": "/chunks/successfully-email-send.js?id=fe054c1e34d7863b",
+    "/chunks/sign-in.js": "/chunks/sign-in.js?id=c556d810c572f596",
+    "/chunks/sign-up.js": "/chunks/sign-up.js?id=849c274b322f055b",
+    "/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=3c5ba5865e21da37",
+    "/chunks/create-new-password.js": "/chunks/create-new-password.js?id=8654bf89e7d9685b",
+    "/chunks/settings.js": "/chunks/settings.js?id=64ea716b0b8823b0",
+    "/chunks/profile.js": "/chunks/profile.js?id=4ba370c98d374788",
+    "/chunks/settings-password.js": "/chunks/settings-password.js?id=11e766eb42e485cf",
+    "/chunks/settings-storage.js": "/chunks/settings-storage.js?id=90ba712f3728443b",
+    "/chunks/billing.js": "/chunks/billing.js?id=f04fe6a3e9fb5c13",
+    "/chunks/platform.js": "/chunks/platform.js?id=83a3de51355e4327",
+    "/chunks/files.js": "/chunks/files.js?id=4f124bd91e9a31fe",
+    "/chunks/recent-uploads.js": "/chunks/recent-uploads.js?id=956d635a35edd94a",
+    "/chunks/my-shared-items.js": "/chunks/my-shared-items.js?id=78cb8cde75196617",
+    "/chunks/trash.js": "/chunks/trash.js?id=e828206647a94788",
+    "/chunks/team-folders.js": "/chunks/team-folders.js?id=0eb60fff4de7e4f4",
+    "/chunks/shared-with-me.js": "/chunks/shared-with-me.js?id=f3c7f65d81be4196",
+    "/chunks/invitation.js": "/chunks/invitation.js?id=d9f64dbf0aad8554",
     "/css/tailwind.css": "/css/tailwind.css",
     "/css/app.css": "/css/app.css"
 }
diff --git a/resources/js/components/FilesView/FileBrowser.vue b/resources/js/components/FilesView/FileBrowser.vue
index a88c033e..0318686a 100644
--- a/resources/js/components/FilesView/FileBrowser.vue
+++ b/resources/js/components/FilesView/FileBrowser.vue
@@ -109,7 +109,6 @@ export default {
                     })
                 }
             } else {
-                console.log(data.data.type)
                 // Get id from current folder
                 const id = data.data.type !== 'folder' ? this.currentFolder?.data.id : data.data.id
 
diff --git a/resources/js/components/Others/Popup/PopupContent.vue b/resources/js/components/Others/Popup/PopupContent.vue
index 8e0078ff..57fd0d4b 100644
--- a/resources/js/components/Others/Popup/PopupContent.vue
+++ b/resources/js/components/Others/Popup/PopupContent.vue
@@ -1,7 +1,7 @@
 <template>
     <div
         :class="type"
-        class="absolute top-16 bottom-24 left-0 right-0 h-auto overflow-x-auto overflow-y-auto px-6 md:relative md:top-0 md:bottom-0"
+        class="absolute top-16 bottom-24 left-0 right-0 h-auto lg:overflow-visible overflow-auto px-6 md:relative md:top-0 md:bottom-0"
     >
         <slot />
     </div>
diff --git a/resources/js/views/Admin/Dashboard.vue b/resources/js/views/Admin/Dashboard.vue
index f9682b4b..c3b3bc19 100644
--- a/resources/js/views/Admin/Dashboard.vue
+++ b/resources/js/views/Admin/Dashboard.vue
@@ -56,12 +56,12 @@
             <!--Create metered plan alert-->
             <div
                 v-if="config.subscriptionType === 'metered' && config.isEmptyPlans"
-                class="mb-6 flex items-center rounded-xl bg-rose-200 p-5 shadow-card"
+                class="mb-6 flex items-center rounded-xl dark:bg-rose-700/30 bg-rose-200 p-5 shadow-card"
             >
-                <alert-octagon-icon size="18" class="vue-feather mr-4 shrink-0 text-rose-700" />
-                <p class="text-sm text-rose-700">
+                <alert-octagon-icon size="18" class="vue-feather mr-4 shrink-0 dark:text-rose-500 text-rose-700" />
+                <p class="text-sm dark:text-rose-500 text-rose-700">
                     As you installed app with metered subscription type, you have to
-                    <router-link :to="{ name: 'CreateMeteredPlan' }" class="text-sm font-bold underline"
+                    <router-link :to="{ name: 'CreateMeteredPlan' }" class="dark:text-rose-500 text-sm font-bold underline"
                         >create your plan</router-link
                     >
                     as soon as possible to prevent new user registration without automatically assigned subscription
@@ -72,10 +72,10 @@
             <!--Cron Alert-->
             <div
                 v-if="!data.app.isRunningCron && !config.isDev"
-                class="mb-6 flex items-center rounded-xl bg-rose-200 p-5 shadow-card"
+                class="mb-6 flex items-center rounded-xl dark:bg-rose-700/30 bg-rose-200 p-5 shadow-card"
             >
-                <alert-octagon-icon size="18" class="vue-feather mr-4 shrink-0 text-rose-700" />
-                <p class="text-sm text-rose-700">
+                <alert-octagon-icon size="18" class="vue-feather mr-4 shrink-0 dark:text-rose-500 text-rose-700" />
+                <p class="text-sm dark:text-rose-500 text-rose-700">
                     We detect your cron jobs probably doesn't work correctly, please check it, you need it for running
                     app correctly. If you set your cron job, please get back one minute later.
                 </p>
diff --git a/resources/js/views/Admin/Plans/Create/CreateMeteredPlan.vue b/resources/js/views/Admin/Plans/Create/CreateMeteredPlan.vue
index 3b2f70e6..62f0a651 100644
--- a/resources/js/views/Admin/Plans/Create/CreateMeteredPlan.vue
+++ b/resources/js/views/Admin/Plans/Create/CreateMeteredPlan.vue
@@ -339,7 +339,6 @@ export default {
                     }
                 })
                 .catch((error) => {
-                    console.log(error)
                     events.$emit('toaster', {
                         type: 'danger',
                         message: this.$t('popup_error.title'),
diff --git a/resources/js/views/SetupWizard.vue b/resources/js/views/SetupWizard.vue
index b1911e25..58def93b 100644
--- a/resources/js/views/SetupWizard.vue
+++ b/resources/js/views/SetupWizard.vue
@@ -1,5 +1,5 @@
 <template>
-    <router-view class="dark:bg-dark-background bg-light-background" />
+    <router-view />
 </template>
 
 <script>
diff --git a/resources/js/views/SetupWizard/AppSetup.vue b/resources/js/views/SetupWizard/AppSetup.vue
index 45fa6d1d..403d4a86 100644
--- a/resources/js/views/SetupWizard/AppSetup.vue
+++ b/resources/js/views/SetupWizard/AppSetup.vue
@@ -294,12 +294,13 @@ export default {
             formData.append('title', this.app.title)
             formData.append('description', this.app.description)
             formData.append('contactMail', this.app.contactMail)
-            formData.append('subscriptionType', this.app.subscriptionType)
             formData.append('userVerification', Boolean(this.app.userVerification) ? 1 : 0)
             formData.append('userRegistration', Boolean(this.app.userRegistration) ? 1 : 0)
             formData.append('storageLimitation', Boolean(this.app.storageLimitation) ? 1 : 0)
 
-            if (this.app.googleAnalytics) formData.append('googleAnalytics', this.app.googleAnalytics)
+            if (this.app.subscriptionType) formData.append('subscriptionType', this.app.subscriptionType)
+
+			if (this.app.googleAnalytics) formData.append('googleAnalytics', this.app.googleAnalytics)
 
             if (this.app.defaultStorage) formData.append('defaultStorage', this.app.defaultStorage)
 
diff --git a/resources/js/views/SetupWizard/PurchaseCode.vue b/resources/js/views/SetupWizard/PurchaseCode.vue
index 13c36f12..14ec5671 100644
--- a/resources/js/views/SetupWizard/PurchaseCode.vue
+++ b/resources/js/views/SetupWizard/PurchaseCode.vue
@@ -117,8 +117,6 @@ export default {
                     // End loading
                     this.isLoading = false
 
-                    console.log(response)
-
                     if (response.data === 'b6896a44017217c36f4a6fdc56699728') {
                         this.isExtended = true
                         localStorage.setItem('license', 'Extended')
diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php
index 95477e8b..426d936e 100644
--- a/resources/views/index.blade.php
+++ b/resources/views/index.blade.php
@@ -28,7 +28,7 @@
 @endphp
 
         <!DOCTYPE html>
-<html style="min-height: 100%" lang="{{ str_replace('_', '-', app()->getLocale()) }}">
+<html class="{{ $installation === 'installation-needed' ? 'dark:bg-dark-background bg-light-background' : '' }}" style="min-height: 100%" lang="{{ str_replace('_', '-', app()->getLocale()) }}">
 
 <head>
 <!--    <meta name="theme-color" content="{{ $settings->app_color ?? '#00BC7E' }}">-->
@@ -66,7 +66,7 @@
 
     @include('vuefilemanager.others.color-template')
 </head>
-<body style="min-height: 100%" class="{{ $installation === 'installation-needed' ? 'bg-light-background' : '' }} {{ is_dev() ? 'debug-screens' : '' }}">
+<body style="min-height: 100%">
 
     <div id="app"></div>
 
diff --git a/src/App/Console/Commands/SetupDevEnvironment.php b/src/App/Console/Commands/SetupDevEnvironment.php
index 72fdfc28..46817582 100644
--- a/src/App/Console/Commands/SetupDevEnvironment.php
+++ b/src/App/Console/Commands/SetupDevEnvironment.php
@@ -1412,7 +1412,7 @@ class SetupDevEnvironment extends Command
             ],
             [
                 'name'  => 'subscription_type',
-                'value' => 'fixed',
+                'value' => 'none',
             ],
             [
                 'name'  => 'allowed_recaptcha',
diff --git a/src/Domain/SetupWizard/Controllers/StoreAppSettingsController.php b/src/Domain/SetupWizard/Controllers/StoreAppSettingsController.php
index d1d20825..54ab0226 100644
--- a/src/Domain/SetupWizard/Controllers/StoreAppSettingsController.php
+++ b/src/Domain/SetupWizard/Controllers/StoreAppSettingsController.php
@@ -18,7 +18,7 @@ class StoreAppSettingsController extends Controller
         collect([
             [
                 'name'  => 'subscription_type',
-                'value' => $request->input('subscriptionType'),
+                'value' => $request->input('subscriptionType') ?? 'none',
             ],
             [
                 'name'  => 'user_verification',