diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 49eefb87..d88e1f9d 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -2,9 +2,9 @@
     "/js/main.js": "/js/main.js",
     "/css/app.css": "/css/app.css",
     "/css/tailwind.css": "/css/tailwind.css",
-    "/chunks/admin.js": "/chunks/admin.js?id=7aa09ec2b08174f9f707",
-    "/chunks/admin-account.js": "/chunks/admin-account.js?id=201b909bbc7bf74c25bc",
-    "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~640155e3.js": "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~640155e3.js?id=c9eb40bfacc2b268290f",
+    "/chunks/admin.js": "/chunks/admin.js?id=c429b52ae033a73d8889",
+    "/chunks/admin-account.js": "/chunks/admin-account.js?id=44b21179dc9ca2916572",
+    "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~640155e3.js": "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~640155e3.js?id=1a6ee671d49f6a457e61",
     "/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/~e871233b.js": "/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/~e871233b.js?id=7df5c5c997a6f638efdf",
     "/chunks/admin~chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-item~3b21240c.js": "/chunks/admin~chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-item~3b21240c.js?id=1e02bcb6e880e4c679a1",
     "/chunks/admin~chunks/files~chunks/invitation~chunks/my-shared-items~chunks/platform~chunks/recent-upl~dfa67595.js": "/chunks/admin~chunks/files~chunks/invitation~chunks/my-shared-items~chunks/platform~chunks/recent-upl~dfa67595.js?id=0ae7b3d840e0e20fe358",
@@ -19,87 +19,87 @@
     "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~217928f6.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~217928f6.js?id=9c4d17d768dc543a0e4b",
     "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~5acee76d.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~5acee76d.js?id=9dd101339ae6d85c6175",
     "/chunks/app-billings.js": "/chunks/app-billings.js?id=6f363efa7ba2f45c9d24",
-    "/chunks/app-email.js": "/chunks/app-email.js?id=1d73ba91bbe96eafb9c9",
-    "/chunks/app-index.js": "/chunks/app-index.js?id=fee803b8bdc0032fb1dd",
-    "/chunks/app-language.js": "/chunks/app-language.js?id=a967d0b3622aca43e0ee",
+    "/chunks/app-email.js": "/chunks/app-email.js?id=fdcf6b4cfbbe617d597c",
+    "/chunks/app-index.js": "/chunks/app-index.js?id=3308a3a9b812b8fb85d9",
+    "/chunks/app-language.js": "/chunks/app-language.js?id=36747f3c971f3dbb78fa",
     "/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-items~chunks/page~8729b0a3.js": "/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-items~chunks/page~8729b0a3.js?id=50f7067283a882b798bd",
     "/chunks/app-language~chunks/dashboard~chunks/invoices~chunks/page-edit~chunks/pages~chunks/plan-creat~d6690165.js": "/chunks/app-language~chunks/dashboard~chunks/invoices~chunks/page-edit~chunks/pages~chunks/plan-creat~d6690165.js?id=2f03fbbe27b922063d16",
-    "/chunks/app-others.js": "/chunks/app-others.js?id=de0ffebcdff5845abac0",
-    "/chunks/app-payments.js": "/chunks/app-payments.js?id=4a1fb42abd35be7e860d",
-    "/chunks/app-settings.js": "/chunks/app-settings.js?id=2a96295eef59bd6c8921",
-    "/chunks/app-setup.js": "/chunks/app-setup.js?id=e4f5e75cb491be2d0755",
+    "/chunks/app-others.js": "/chunks/app-others.js?id=c1e42f111fd531672466",
+    "/chunks/app-payments.js": "/chunks/app-payments.js?id=2f2fee047430783b42fe",
+    "/chunks/app-settings.js": "/chunks/app-settings.js?id=5968eed91e41e99efd4c",
+    "/chunks/app-setup.js": "/chunks/app-setup.js?id=c3a013b11ae7bde6f39d",
     "/chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/database~chunks/email-veri~5d0bfc57.js": "/chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/database~chunks/email-veri~5d0bfc57.js?id=107a78323eef0c1d4c81",
-    "/chunks/billing.js": "/chunks/billing.js?id=79ea868dda710a87535e",
-    "/chunks/billings-detail.js": "/chunks/billings-detail.js?id=0ba329dda55f7e75fb57",
+    "/chunks/billing.js": "/chunks/billing.js?id=5bbff1d619ff14679f3a",
+    "/chunks/billings-detail.js": "/chunks/billings-detail.js?id=4d68b2eeb70f7ebfb555",
     "/chunks/billing~chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~ch~5d1c5841.js": "/chunks/billing~chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~ch~5d1c5841.js?id=9b836534302d97ac5c73",
-    "/chunks/billing~chunks/settings-storage~chunks/user-storage~chunks/user-subscription.js": "/chunks/billing~chunks/settings-storage~chunks/user-storage~chunks/user-subscription.js?id=4ac050401e5153de933d",
-    "/chunks/contact-us.js": "/chunks/contact-us.js?id=970f98276222264cefe7",
+    "/chunks/billing~chunks/settings-storage~chunks/user-storage~chunks/user-subscription.js": "/chunks/billing~chunks/settings-storage~chunks/user-storage~chunks/user-subscription.js?id=6f4c4f1579d308779af6",
+    "/chunks/contact-us.js": "/chunks/contact-us.js?id=9b96e9e20407a82f963c",
     "/chunks/contact-us~chunks/dynamic-page~chunks/homepage.js": "/chunks/contact-us~chunks/dynamic-page~chunks/homepage.js?id=65ee559ca803555be568",
-    "/chunks/create-new-password.js": "/chunks/create-new-password.js?id=e3979bb4635ddd58f49b",
+    "/chunks/create-new-password.js": "/chunks/create-new-password.js?id=8451872075acf5b1b9ab",
     "/chunks/dashboard.js": "/chunks/dashboard.js?id=e7df8df40a669c9f60d1",
     "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plans~chunks/subscriptions.js": "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plans~chunks/subscriptions.js?id=38a29ef278e752bcd895",
     "/chunks/dashboard~chunks/invoices~chunks/plan-subscribers~chunks/users.js": "/chunks/dashboard~chunks/invoices~chunks/plan-subscribers~chunks/users.js?id=c4e25f3ee5acf4145ace",
-    "/chunks/database.js": "/chunks/database.js?id=1096c197d96d5d77a5a7",
+    "/chunks/database.js": "/chunks/database.js?id=73aa6a4e47e3f09946c0",
     "/chunks/dynamic-page.js": "/chunks/dynamic-page.js?id=6c86916c6c6f679fa86b",
     "/chunks/email-verified.js": "/chunks/email-verified.js?id=253ce639751cc8799458",
-    "/chunks/environment-setup.js": "/chunks/environment-setup.js?id=344da8fc3585d4d4a961",
+    "/chunks/environment-setup.js": "/chunks/environment-setup.js?id=8aabf07d6aa1324f6d43",
     "/chunks/files.js": "/chunks/files.js?id=f0a4d97bafb958087749",
     "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~c7960950.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~c7960950.js?id=64ac90ff8ae7d3ee3ed1",
     "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.js?id=fd09338f95a63dfa9f95",
     "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~bf3ddedc.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~bf3ddedc.js?id=95a21dc98f0b9a5ba0cb",
-    "/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=03178bb58e92ab505135",
+    "/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=fa15218717f1f705423f",
     "/chunks/homepage.js": "/chunks/homepage.js?id=b89dd81804b8a0bd3f0b",
-    "/chunks/installation-disclaimer.js": "/chunks/installation-disclaimer.js?id=415ad1ced431e61c380b",
+    "/chunks/installation-disclaimer.js": "/chunks/installation-disclaimer.js?id=e0f7ff60ef9e7818ba32",
     "/chunks/invitation.js": "/chunks/invitation.js?id=b3a04d44ea7e75c6203a",
     "/chunks/invoices.js": "/chunks/invoices.js?id=2032e4f8e4f5ed58b8b4",
     "/chunks/my-shared-items.js": "/chunks/my-shared-items.js?id=ef0a2dbe808eaee42c1f",
     "/chunks/not-found.js": "/chunks/not-found.js?id=9b179edd89e9b0544566",
-    "/chunks/page-edit.js": "/chunks/page-edit.js?id=1b8c9a0eee76fcb52f12",
+    "/chunks/page-edit.js": "/chunks/page-edit.js?id=198cd5182028658a141c",
     "/chunks/pages.js": "/chunks/pages.js?id=8c6772e3224fadca2bf2",
     "/chunks/plan.js": "/chunks/plan.js?id=f62a5bd64fb706b2f0e2",
-    "/chunks/plan-create/fixed.js": "/chunks/plan-create/fixed.js?id=a4953ff0aa90efbde155",
-    "/chunks/plan-create/metered.js": "/chunks/plan-create/metered.js?id=d81d2382c0bb116f12f6",
-    "/chunks/plan-delete.js": "/chunks/plan-delete.js?id=0b43b759df9f6f29acfc",
-    "/chunks/plan-settings.js": "/chunks/plan-settings.js?id=8a959e196d628d0efc4b",
+    "/chunks/plan-create/fixed.js": "/chunks/plan-create/fixed.js?id=cc70720033821b259bdb",
+    "/chunks/plan-create/metered.js": "/chunks/plan-create/metered.js?id=5d98f5a2b93b4c741cd9",
+    "/chunks/plan-delete.js": "/chunks/plan-delete.js?id=03ad9b201eaff9d84ca0",
+    "/chunks/plan-settings.js": "/chunks/plan-settings.js?id=162c17e8608dafa5fc17",
     "/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=7eff560fea52770a642f",
     "/chunks/plans.js": "/chunks/plans.js?id=854c232c29d88c5b541a",
-    "/chunks/platform.js": "/chunks/platform.js?id=7fa553e21d908a4746a9",
-    "/chunks/platform~chunks/shared.js": "/chunks/platform~chunks/shared.js?id=47d27133d169cdf34588",
+    "/chunks/platform.js": "/chunks/platform.js?id=5ab4646e34000c740516",
+    "/chunks/platform~chunks/shared.js": "/chunks/platform~chunks/shared.js?id=54a3bfb4094cb949b571",
     "/chunks/platform~chunks/shared~chunks/shared-with-me~chunks/team-folders.js": "/chunks/platform~chunks/shared~chunks/shared-with-me~chunks/team-folders.js?id=ca9ca67afd5839597647",
     "/chunks/profile.js": "/chunks/profile.js?id=8688d9c7ff850e6989e6",
-    "/chunks/profile~chunks/settings-password.js": "/chunks/profile~chunks/settings-password.js?id=dfa4128d68360d5e1b3b",
-    "/chunks/purchase-code.js": "/chunks/purchase-code.js?id=9e948882ae2315eb6132",
+    "/chunks/profile~chunks/settings-password.js": "/chunks/profile~chunks/settings-password.js?id=a52c81995d29f51dfe05",
+    "/chunks/purchase-code.js": "/chunks/purchase-code.js?id=2da6b9e5f951fb7f4312",
     "/chunks/recent-uploads.js": "/chunks/recent-uploads.js?id=8577d4c771602671b38a",
-    "/chunks/settings.js": "/chunks/settings.js?id=2d4f5dd69eb1afe4f5c6",
-    "/chunks/settings-password.js": "/chunks/settings-password.js?id=b6eb94764cc7b47f835e",
-    "/chunks/settings-storage.js": "/chunks/settings-storage.js?id=affbca0ce630d1547947",
-    "/chunks/settings~chunks/settings-password.js": "/chunks/settings~chunks/settings-password.js?id=aafc9cd6aa47b01bc25a",
+    "/chunks/settings.js": "/chunks/settings.js?id=6e2c487262e41cdda921",
+    "/chunks/settings-password.js": "/chunks/settings-password.js?id=1ab825f0be1d756e231b",
+    "/chunks/settings-storage.js": "/chunks/settings-storage.js?id=6e69a64a01e345af8b55",
+    "/chunks/settings~chunks/settings-password.js": "/chunks/settings~chunks/settings-password.js?id=2af24f8d9f3412ae0662",
     "/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=651d5accf401908724c5",
     "/chunks/shared.js": "/chunks/shared.js?id=db60726012b6d246bd77",
     "/chunks/shared-with-me.js": "/chunks/shared-with-me.js?id=cf39d503eef93bcc7f1c",
     "/chunks/shared-with-me~chunks/team-folders.js": "/chunks/shared-with-me~chunks/team-folders.js?id=abf65131397ea2b12355",
-    "/chunks/shared/authenticate.js": "/chunks/shared/authenticate.js?id=e19e444844d1495d900f",
+    "/chunks/shared/authenticate.js": "/chunks/shared/authenticate.js?id=4bac60e6cf1a4a5bd770",
     "/chunks/shared/files.js": "/chunks/shared/files.js?id=75150f652f04adac3f7a",
     "/chunks/shared/single-file.js": "/chunks/shared/single-file.js?id=1abb5dd58d0ed626cd6e",
-    "/chunks/sign-in.js": "/chunks/sign-in.js?id=61485081b6d7451152b1",
-    "/chunks/sign-up.js": "/chunks/sign-up.js?id=abe7d112a75d8654d404",
-    "/chunks/status-check.js": "/chunks/status-check.js?id=ed6c1c544811ce760088",
-    "/chunks/stripe-credentials.js": "/chunks/stripe-credentials.js?id=e3ad18d1f279fb2e79b4",
-    "/chunks/subscription-plans.js": "/chunks/subscription-plans.js?id=f90f9b873debbf45d7c9",
+    "/chunks/sign-in.js": "/chunks/sign-in.js?id=79453ab0ccbf178e1e9a",
+    "/chunks/sign-up.js": "/chunks/sign-up.js?id=64a21b2684ac57ce5cd6",
+    "/chunks/status-check.js": "/chunks/status-check.js?id=263e2987d3a6d5e91f7c",
+    "/chunks/stripe-credentials.js": "/chunks/stripe-credentials.js?id=fb0ee2fd445b341538a9",
+    "/chunks/subscription-plans.js": "/chunks/subscription-plans.js?id=60f1a5c9b7d84ddbedc4",
     "/chunks/subscription-service.js": "/chunks/subscription-service.js?id=8ac19b3fcfd57d79e5b1",
     "/chunks/subscriptions.js": "/chunks/subscriptions.js?id=bb462df01054c6fc0e48",
     "/chunks/team-folders.js": "/chunks/team-folders.js?id=aa0351b975cf45efac3b",
     "/chunks/trash.js": "/chunks/trash.js?id=1f5f349fb9ec23ba2e93",
-    "/chunks/upgrade-billing.js": "/chunks/upgrade-billing.js?id=bec2b4d216868ea65380",
+    "/chunks/upgrade-billing.js": "/chunks/upgrade-billing.js?id=3243a1107d2b519584ba",
     "/chunks/upgrade-billing~chunks/upgrade-plan.js": "/chunks/upgrade-billing~chunks/upgrade-plan.js?id=8bd237c632018a537d76",
     "/chunks/upgrade-plan.js": "/chunks/upgrade-plan.js?id=7ee9b84ffed9bf544997",
     "/chunks/user.js": "/chunks/user.js?id=c707b86c3e900cf09794",
-    "/chunks/user-create.js": "/chunks/user-create.js?id=71c26d62c328752c99cc",
-    "/chunks/user-delete.js": "/chunks/user-delete.js?id=1940d1b2805d0d62e2df",
-    "/chunks/user-detail.js": "/chunks/user-detail.js?id=775d2cec74472c338fec",
-    "/chunks/user-password.js": "/chunks/user-password.js?id=ccab1d400bb3a4ceeedd",
-    "/chunks/user-storage.js": "/chunks/user-storage.js?id=b99ceaa8aa6751e540b2",
-    "/chunks/user-subscription.js": "/chunks/user-subscription.js?id=d92d5d455d64497b623f",
+    "/chunks/user-create.js": "/chunks/user-create.js?id=0cffd1c7eae592e62d2f",
+    "/chunks/user-delete.js": "/chunks/user-delete.js?id=e6ceb3ab5d8322cbf494",
+    "/chunks/user-detail.js": "/chunks/user-detail.js?id=c39c69b94b015b68dbc9",
+    "/chunks/user-password.js": "/chunks/user-password.js?id=43b0c6c043d3e141936f",
+    "/chunks/user-storage.js": "/chunks/user-storage.js?id=cb90a19834070ee1a4c7",
+    "/chunks/user-subscription.js": "/chunks/user-subscription.js?id=472cb77ed7a80684c233",
     "/chunks/users.js": "/chunks/users.js?id=ab7eeac6e8559dc1eb2b",
     "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~5ef927fd.js": "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~5ef927fd.js?id=6a87fba09173d8d5f5b6",
     "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~81844718.js": "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~81844718.js?id=d2f4a0c6226e4fcbd776",
@@ -509,5 +509,210 @@
     "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.ee3931986228d0d84b7e.hot-update.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.ee3931986228d0d84b7e.hot-update.js",
     "/js/main.ec8d91dfb6b0752e58ba.hot-update.js": "/js/main.ec8d91dfb6b0752e58ba.hot-update.js",
     "/js/main.acf3827e961d3aa0bb54.hot-update.js": "/js/main.acf3827e961d3aa0bb54.hot-update.js",
-    "/chunks/platform.18acb84d78309bf59b64.hot-update.js": "/chunks/platform.18acb84d78309bf59b64.hot-update.js"
+    "/chunks/platform.18acb84d78309bf59b64.hot-update.js": "/chunks/platform.18acb84d78309bf59b64.hot-update.js",
+    "/js/main.a80e135b66baecfb1262.hot-update.js": "/js/main.a80e135b66baecfb1262.hot-update.js",
+    "/js/main.5c1ae9fa1b722f2bd9dc.hot-update.js": "/js/main.5c1ae9fa1b722f2bd9dc.hot-update.js",
+    "/js/main.a24fe5b91c458f6ebad8.hot-update.js": "/js/main.a24fe5b91c458f6ebad8.hot-update.js",
+    "/js/main.7c5db91cf0b0f94207b6.hot-update.js": "/js/main.7c5db91cf0b0f94207b6.hot-update.js",
+    "/js/main.934ef2c54a3a5fb75c4c.hot-update.js": "/js/main.934ef2c54a3a5fb75c4c.hot-update.js",
+    "/js/main.93b3ce5e39e79d1ab371.hot-update.js": "/js/main.93b3ce5e39e79d1ab371.hot-update.js",
+    "/js/main.fb05b75c7579508aa991.hot-update.js": "/js/main.fb05b75c7579508aa991.hot-update.js",
+    "/js/main.f1e5e7127dab12b8bfd7.hot-update.js": "/js/main.f1e5e7127dab12b8bfd7.hot-update.js",
+    "/js/main.62f3dc6ecb14bf3fe121.hot-update.js": "/js/main.62f3dc6ecb14bf3fe121.hot-update.js",
+    "/js/main.fa3313d60ccd4596a05d.hot-update.js": "/js/main.fa3313d60ccd4596a05d.hot-update.js",
+    "/chunks/settings-storage.7b1bd46960ab75c9956f.hot-update.js": "/chunks/settings-storage.7b1bd46960ab75c9956f.hot-update.js",
+    "/js/main.61fc6e4beaec3141f367.hot-update.js": "/js/main.61fc6e4beaec3141f367.hot-update.js",
+    "/chunks/app-payments.19fc655c0958b072f32c.hot-update.js": "/chunks/app-payments.19fc655c0958b072f32c.hot-update.js",
+    "/chunks/app-payments.3ade452bc3240bd0b09d.hot-update.js": "/chunks/app-payments.3ade452bc3240bd0b09d.hot-update.js",
+    "/chunks/app-payments.ca4f447cc931e612b98c.hot-update.js": "/chunks/app-payments.ca4f447cc931e612b98c.hot-update.js",
+    "/chunks/app-payments.1a01c451fb709efb3291.hot-update.js": "/chunks/app-payments.1a01c451fb709efb3291.hot-update.js",
+    "/chunks/app-payments.9df790ad36f0a55423ca.hot-update.js": "/chunks/app-payments.9df790ad36f0a55423ca.hot-update.js",
+    "/chunks/app-payments.c70bc5dbfbbbb3222c02.hot-update.js": "/chunks/app-payments.c70bc5dbfbbbb3222c02.hot-update.js",
+    "/chunks/app-payments.3031763dc42db9fbe632.hot-update.js": "/chunks/app-payments.3031763dc42db9fbe632.hot-update.js",
+    "/chunks/app-payments.8dee5c7337a9b5419d0f.hot-update.js": "/chunks/app-payments.8dee5c7337a9b5419d0f.hot-update.js",
+    "/chunks/app-payments.25cec04d114f37d85500.hot-update.js": "/chunks/app-payments.25cec04d114f37d85500.hot-update.js",
+    "/chunks/app-payments.f027d95fda175884f8c4.hot-update.js": "/chunks/app-payments.f027d95fda175884f8c4.hot-update.js",
+    "/chunks/app-payments.418f3b96642f2f25d48d.hot-update.js": "/chunks/app-payments.418f3b96642f2f25d48d.hot-update.js",
+    "/chunks/app-payments.fe09fb55f9fa23cbb1ab.hot-update.js": "/chunks/app-payments.fe09fb55f9fa23cbb1ab.hot-update.js",
+    "/chunks/app-payments.b743386e92d9daabd130.hot-update.js": "/chunks/app-payments.b743386e92d9daabd130.hot-update.js",
+    "/chunks/app-payments.9748e3a999949732ab58.hot-update.js": "/chunks/app-payments.9748e3a999949732ab58.hot-update.js",
+    "/chunks/app-payments.63ed80ad87755afd8d86.hot-update.js": "/chunks/app-payments.63ed80ad87755afd8d86.hot-update.js",
+    "/chunks/app-payments.03ea7ae3de28bbe5805e.hot-update.js": "/chunks/app-payments.03ea7ae3de28bbe5805e.hot-update.js",
+    "/chunks/app-payments.e4f3d231458abed953f9.hot-update.js": "/chunks/app-payments.e4f3d231458abed953f9.hot-update.js",
+    "/chunks/app-payments.965b04a6740d7b84e225.hot-update.js": "/chunks/app-payments.965b04a6740d7b84e225.hot-update.js",
+    "/chunks/app-payments.2d9a5f6772589ced82c0.hot-update.js": "/chunks/app-payments.2d9a5f6772589ced82c0.hot-update.js",
+    "/chunks/app-payments.c514b6cb3b34f4fc0790.hot-update.js": "/chunks/app-payments.c514b6cb3b34f4fc0790.hot-update.js",
+    "/chunks/app-payments.346ce09f694b263dd584.hot-update.js": "/chunks/app-payments.346ce09f694b263dd584.hot-update.js",
+    "/chunks/app-payments.7af2800b026955b83b45.hot-update.js": "/chunks/app-payments.7af2800b026955b83b45.hot-update.js",
+    "/chunks/app-payments.4b2ca070637091578a99.hot-update.js": "/chunks/app-payments.4b2ca070637091578a99.hot-update.js",
+    "/chunks/app-payments.b565239843745bb88292.hot-update.js": "/chunks/app-payments.b565239843745bb88292.hot-update.js",
+    "/chunks/app-payments.655ad1903b9efdfca837.hot-update.js": "/chunks/app-payments.655ad1903b9efdfca837.hot-update.js",
+    "/chunks/app-payments.53d89e5a75315d6ef954.hot-update.js": "/chunks/app-payments.53d89e5a75315d6ef954.hot-update.js",
+    "/chunks/app-payments.d361d05d0d1ceb5f8266.hot-update.js": "/chunks/app-payments.d361d05d0d1ceb5f8266.hot-update.js",
+    "/chunks/app-payments.70d220c79fd0ad67410c.hot-update.js": "/chunks/app-payments.70d220c79fd0ad67410c.hot-update.js",
+    "/chunks/app-payments.43254437032f210948d8.hot-update.js": "/chunks/app-payments.43254437032f210948d8.hot-update.js",
+    "/chunks/app-payments.18ecb3f0f7d63467a041.hot-update.js": "/chunks/app-payments.18ecb3f0f7d63467a041.hot-update.js",
+    "/chunks/app-payments.930a05c618894b02b56c.hot-update.js": "/chunks/app-payments.930a05c618894b02b56c.hot-update.js",
+    "/chunks/app-payments.887a4754882b8df35290.hot-update.js": "/chunks/app-payments.887a4754882b8df35290.hot-update.js",
+    "/chunks/app-payments.fbbb6310df072d5e1117.hot-update.js": "/chunks/app-payments.fbbb6310df072d5e1117.hot-update.js",
+    "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~640155e3.09eeff861113a13e17a9.hot-update.js": "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~640155e3.09eeff861113a13e17a9.hot-update.js",
+    "/chunks/app-language.09eeff861113a13e17a9.hot-update.js": "/chunks/app-language.09eeff861113a13e17a9.hot-update.js",
+    "/chunks/billings-detail.09eeff861113a13e17a9.hot-update.js": "/chunks/billings-detail.09eeff861113a13e17a9.hot-update.js",
+    "/chunks/billing~chunks/settings-storage~chunks/user-storage~chunks/user-subscription.09eeff861113a13e17a9.hot-update.js": "/chunks/billing~chunks/settings-storage~chunks/user-storage~chunks/user-subscription.09eeff861113a13e17a9.hot-update.js",
+    "/chunks/database.09eeff861113a13e17a9.hot-update.js": "/chunks/database.09eeff861113a13e17a9.hot-update.js",
+    "/chunks/environment-setup.09eeff861113a13e17a9.hot-update.js": "/chunks/environment-setup.09eeff861113a13e17a9.hot-update.js",
+    "/chunks/installation-disclaimer.09eeff861113a13e17a9.hot-update.js": "/chunks/installation-disclaimer.09eeff861113a13e17a9.hot-update.js",
+    "/chunks/page-edit.09eeff861113a13e17a9.hot-update.js": "/chunks/page-edit.09eeff861113a13e17a9.hot-update.js",
+    "/chunks/plan-delete.09eeff861113a13e17a9.hot-update.js": "/chunks/plan-delete.09eeff861113a13e17a9.hot-update.js",
+    "/chunks/plan-settings.09eeff861113a13e17a9.hot-update.js": "/chunks/plan-settings.09eeff861113a13e17a9.hot-update.js",
+    "/chunks/profile~chunks/settings-password.09eeff861113a13e17a9.hot-update.js": "/chunks/profile~chunks/settings-password.09eeff861113a13e17a9.hot-update.js",
+    "/chunks/status-check.09eeff861113a13e17a9.hot-update.js": "/chunks/status-check.09eeff861113a13e17a9.hot-update.js",
+    "/chunks/stripe-credentials.09eeff861113a13e17a9.hot-update.js": "/chunks/stripe-credentials.09eeff861113a13e17a9.hot-update.js",
+    "/chunks/subscription-plans.09eeff861113a13e17a9.hot-update.js": "/chunks/subscription-plans.09eeff861113a13e17a9.hot-update.js",
+    "/chunks/upgrade-billing.09eeff861113a13e17a9.hot-update.js": "/chunks/upgrade-billing.09eeff861113a13e17a9.hot-update.js",
+    "/chunks/user-delete.09eeff861113a13e17a9.hot-update.js": "/chunks/user-delete.09eeff861113a13e17a9.hot-update.js",
+    "/chunks/user-detail.09eeff861113a13e17a9.hot-update.js": "/chunks/user-detail.09eeff861113a13e17a9.hot-update.js",
+    "/chunks/user-password.09eeff861113a13e17a9.hot-update.js": "/chunks/user-password.09eeff861113a13e17a9.hot-update.js",
+    "/chunks/app-payments.96470b756ef19b9169b2.hot-update.js": "/chunks/app-payments.96470b756ef19b9169b2.hot-update.js",
+    "/chunks/app-payments.632063d3cfc6ba91ae72.hot-update.js": "/chunks/app-payments.632063d3cfc6ba91ae72.hot-update.js",
+    "/chunks/app-payments.403be67c7a4de5a07ae5.hot-update.js": "/chunks/app-payments.403be67c7a4de5a07ae5.hot-update.js",
+    "/chunks/app-payments.47efac9951274822c544.hot-update.js": "/chunks/app-payments.47efac9951274822c544.hot-update.js",
+    "/chunks/app-payments.311a27709951f9ec8898.hot-update.js": "/chunks/app-payments.311a27709951f9ec8898.hot-update.js",
+    "/chunks/app-payments.576172af8996b5e92c23.hot-update.js": "/chunks/app-payments.576172af8996b5e92c23.hot-update.js",
+    "/chunks/app-payments.5c331dd2756e53e74627.hot-update.js": "/chunks/app-payments.5c331dd2756e53e74627.hot-update.js",
+    "/chunks/app-payments.a61ddd29bfe8679d8317.hot-update.js": "/chunks/app-payments.a61ddd29bfe8679d8317.hot-update.js",
+    "/chunks/app-payments.aeee7219e4c4335af1af.hot-update.js": "/chunks/app-payments.aeee7219e4c4335af1af.hot-update.js",
+    "/chunks/app-payments.2a1c1351d148b2f0ecb3.hot-update.js": "/chunks/app-payments.2a1c1351d148b2f0ecb3.hot-update.js",
+    "/chunks/app-payments.32c453f9ab30e448e46f.hot-update.js": "/chunks/app-payments.32c453f9ab30e448e46f.hot-update.js",
+    "/chunks/app-payments.f440cd76e78b98b90998.hot-update.js": "/chunks/app-payments.f440cd76e78b98b90998.hot-update.js",
+    "/chunks/app-payments.2f982c111931c6cff7f9.hot-update.js": "/chunks/app-payments.2f982c111931c6cff7f9.hot-update.js",
+    "/chunks/app-payments.462e05054d82cc368751.hot-update.js": "/chunks/app-payments.462e05054d82cc368751.hot-update.js",
+    "/chunks/app-payments.92cab739dd4b166e6c77.hot-update.js": "/chunks/app-payments.92cab739dd4b166e6c77.hot-update.js",
+    "/chunks/app-payments.ce1394b330f325aed01e.hot-update.js": "/chunks/app-payments.ce1394b330f325aed01e.hot-update.js",
+    "/chunks/app-payments.1b4b1ab9d47c41c2af58.hot-update.js": "/chunks/app-payments.1b4b1ab9d47c41c2af58.hot-update.js",
+    "/chunks/app-payments.de0725418090ee419763.hot-update.js": "/chunks/app-payments.de0725418090ee419763.hot-update.js",
+    "/chunks/app-payments.b956b36c43b06c3103a5.hot-update.js": "/chunks/app-payments.b956b36c43b06c3103a5.hot-update.js",
+    "/chunks/app-payments.737963d0be195857977c.hot-update.js": "/chunks/app-payments.737963d0be195857977c.hot-update.js",
+    "/chunks/app-payments.00f2ae77b8b5a2cc7900.hot-update.js": "/chunks/app-payments.00f2ae77b8b5a2cc7900.hot-update.js",
+    "/chunks/admin.3b31b5d7b0b257fd8067.hot-update.js": "/chunks/admin.3b31b5d7b0b257fd8067.hot-update.js",
+    "/chunks/admin-account.3b31b5d7b0b257fd8067.hot-update.js": "/chunks/admin-account.3b31b5d7b0b257fd8067.hot-update.js",
+    "/chunks/app-email.3b31b5d7b0b257fd8067.hot-update.js": "/chunks/app-email.3b31b5d7b0b257fd8067.hot-update.js",
+    "/chunks/app-index.3b31b5d7b0b257fd8067.hot-update.js": "/chunks/app-index.3b31b5d7b0b257fd8067.hot-update.js",
+    "/chunks/app-language.3b31b5d7b0b257fd8067.hot-update.js": "/chunks/app-language.3b31b5d7b0b257fd8067.hot-update.js",
+    "/chunks/app-payments.3b31b5d7b0b257fd8067.hot-update.js": "/chunks/app-payments.3b31b5d7b0b257fd8067.hot-update.js",
+    "/chunks/app-setup.3b31b5d7b0b257fd8067.hot-update.js": "/chunks/app-setup.3b31b5d7b0b257fd8067.hot-update.js",
+    "/chunks/billing.3b31b5d7b0b257fd8067.hot-update.js": "/chunks/billing.3b31b5d7b0b257fd8067.hot-update.js",
+    "/chunks/billings-detail.3b31b5d7b0b257fd8067.hot-update.js": "/chunks/billings-detail.3b31b5d7b0b257fd8067.hot-update.js",
+    "/chunks/contact-us.3b31b5d7b0b257fd8067.hot-update.js": "/chunks/contact-us.3b31b5d7b0b257fd8067.hot-update.js",
+    "/chunks/create-new-password.3b31b5d7b0b257fd8067.hot-update.js": "/chunks/create-new-password.3b31b5d7b0b257fd8067.hot-update.js",
+    "/chunks/database.3b31b5d7b0b257fd8067.hot-update.js": "/chunks/database.3b31b5d7b0b257fd8067.hot-update.js",
+    "/chunks/environment-setup.3b31b5d7b0b257fd8067.hot-update.js": "/chunks/environment-setup.3b31b5d7b0b257fd8067.hot-update.js",
+    "/chunks/forgotten-password.3b31b5d7b0b257fd8067.hot-update.js": "/chunks/forgotten-password.3b31b5d7b0b257fd8067.hot-update.js",
+    "/chunks/plan-create/fixed.3b31b5d7b0b257fd8067.hot-update.js": "/chunks/plan-create/fixed.3b31b5d7b0b257fd8067.hot-update.js",
+    "/chunks/plan-create/metered.3b31b5d7b0b257fd8067.hot-update.js": "/chunks/plan-create/metered.3b31b5d7b0b257fd8067.hot-update.js",
+    "/chunks/plan-delete.3b31b5d7b0b257fd8067.hot-update.js": "/chunks/plan-delete.3b31b5d7b0b257fd8067.hot-update.js",
+    "/chunks/platform.3b31b5d7b0b257fd8067.hot-update.js": "/chunks/platform.3b31b5d7b0b257fd8067.hot-update.js",
+    "/chunks/platform~chunks/shared.3b31b5d7b0b257fd8067.hot-update.js": "/chunks/platform~chunks/shared.3b31b5d7b0b257fd8067.hot-update.js",
+    "/chunks/purchase-code.3b31b5d7b0b257fd8067.hot-update.js": "/chunks/purchase-code.3b31b5d7b0b257fd8067.hot-update.js",
+    "/chunks/settings.3b31b5d7b0b257fd8067.hot-update.js": "/chunks/settings.3b31b5d7b0b257fd8067.hot-update.js",
+    "/chunks/settings-password.3b31b5d7b0b257fd8067.hot-update.js": "/chunks/settings-password.3b31b5d7b0b257fd8067.hot-update.js",
+    "/chunks/shared/authenticate.3b31b5d7b0b257fd8067.hot-update.js": "/chunks/shared/authenticate.3b31b5d7b0b257fd8067.hot-update.js",
+    "/chunks/sign-in.3b31b5d7b0b257fd8067.hot-update.js": "/chunks/sign-in.3b31b5d7b0b257fd8067.hot-update.js",
+    "/chunks/sign-up.3b31b5d7b0b257fd8067.hot-update.js": "/chunks/sign-up.3b31b5d7b0b257fd8067.hot-update.js",
+    "/chunks/stripe-credentials.3b31b5d7b0b257fd8067.hot-update.js": "/chunks/stripe-credentials.3b31b5d7b0b257fd8067.hot-update.js",
+    "/chunks/subscription-plans.3b31b5d7b0b257fd8067.hot-update.js": "/chunks/subscription-plans.3b31b5d7b0b257fd8067.hot-update.js",
+    "/chunks/upgrade-billing.3b31b5d7b0b257fd8067.hot-update.js": "/chunks/upgrade-billing.3b31b5d7b0b257fd8067.hot-update.js",
+    "/chunks/user-create.3b31b5d7b0b257fd8067.hot-update.js": "/chunks/user-create.3b31b5d7b0b257fd8067.hot-update.js",
+    "/chunks/user-delete.3b31b5d7b0b257fd8067.hot-update.js": "/chunks/user-delete.3b31b5d7b0b257fd8067.hot-update.js",
+    "/chunks/user-storage.3b31b5d7b0b257fd8067.hot-update.js": "/chunks/user-storage.3b31b5d7b0b257fd8067.hot-update.js",
+    "/chunks/user-subscription.3b31b5d7b0b257fd8067.hot-update.js": "/chunks/user-subscription.3b31b5d7b0b257fd8067.hot-update.js",
+    "/chunks/app-payments.e54a0e46d3fba585d553.hot-update.js": "/chunks/app-payments.e54a0e46d3fba585d553.hot-update.js",
+    "/chunks/app-payments.dc399f1c0f7bc3f5b636.hot-update.js": "/chunks/app-payments.dc399f1c0f7bc3f5b636.hot-update.js",
+    "/chunks/app-payments.913f40151de1db47c947.hot-update.js": "/chunks/app-payments.913f40151de1db47c947.hot-update.js",
+    "/chunks/app-payments.d99a40b1029e45010c78.hot-update.js": "/chunks/app-payments.d99a40b1029e45010c78.hot-update.js",
+    "/chunks/app-payments.14918f77b6832eff7b41.hot-update.js": "/chunks/app-payments.14918f77b6832eff7b41.hot-update.js",
+    "/chunks/app-payments.5fc0ca5e2d9d6b66e5f0.hot-update.js": "/chunks/app-payments.5fc0ca5e2d9d6b66e5f0.hot-update.js",
+    "/chunks/app-payments.6a170e970ba8f59a7eb0.hot-update.js": "/chunks/app-payments.6a170e970ba8f59a7eb0.hot-update.js",
+    "/chunks/app-payments.b9d52eb10e5a02ed9b4f.hot-update.js": "/chunks/app-payments.b9d52eb10e5a02ed9b4f.hot-update.js",
+    "/chunks/app-payments.d023982ae26ebef9ec14.hot-update.js": "/chunks/app-payments.d023982ae26ebef9ec14.hot-update.js",
+    "/chunks/app-payments.b71c508c2a44635e3171.hot-update.js": "/chunks/app-payments.b71c508c2a44635e3171.hot-update.js",
+    "/chunks/app-payments.3fd3884fc231b9cc3856.hot-update.js": "/chunks/app-payments.3fd3884fc231b9cc3856.hot-update.js",
+    "/chunks/app-payments.9eaa1a5301389a8380c3.hot-update.js": "/chunks/app-payments.9eaa1a5301389a8380c3.hot-update.js",
+    "/chunks/app-payments.20ca40a2d00cc0edf976.hot-update.js": "/chunks/app-payments.20ca40a2d00cc0edf976.hot-update.js",
+    "/chunks/app-payments.2c9b8e5d7ebc078bbff9.hot-update.js": "/chunks/app-payments.2c9b8e5d7ebc078bbff9.hot-update.js",
+    "/chunks/app-payments.a21b53988b8aa0260ec7.hot-update.js": "/chunks/app-payments.a21b53988b8aa0260ec7.hot-update.js",
+    "/chunks/app-payments.c5a122aa2d9c348d2212.hot-update.js": "/chunks/app-payments.c5a122aa2d9c348d2212.hot-update.js",
+    "/chunks/app-payments.c1b56b0289b66be9022d.hot-update.js": "/chunks/app-payments.c1b56b0289b66be9022d.hot-update.js",
+    "/chunks/app-payments.941a554f6bbc85c19a22.hot-update.js": "/chunks/app-payments.941a554f6bbc85c19a22.hot-update.js",
+    "/chunks/app-payments.1dd4b58711712ce4f0df.hot-update.js": "/chunks/app-payments.1dd4b58711712ce4f0df.hot-update.js",
+    "/chunks/app-payments.ee51b329f4525ed92af3.hot-update.js": "/chunks/app-payments.ee51b329f4525ed92af3.hot-update.js",
+    "/chunks/app-payments.03d74e5c9185118da577.hot-update.js": "/chunks/app-payments.03d74e5c9185118da577.hot-update.js",
+    "/chunks/app-payments.f13ba9e60067b225d302.hot-update.js": "/chunks/app-payments.f13ba9e60067b225d302.hot-update.js",
+    "/chunks/app-payments.da51fd639624d98f6901.hot-update.js": "/chunks/app-payments.da51fd639624d98f6901.hot-update.js",
+    "/chunks/app-payments.4f7641bc24100d2244ba.hot-update.js": "/chunks/app-payments.4f7641bc24100d2244ba.hot-update.js",
+    "/chunks/app-payments.e3883d63ccead6f22467.hot-update.js": "/chunks/app-payments.e3883d63ccead6f22467.hot-update.js",
+    "/chunks/app-payments.fe25c28c6aa376fc9256.hot-update.js": "/chunks/app-payments.fe25c28c6aa376fc9256.hot-update.js",
+    "/chunks/app-payments.db6cc7c5e9471b1f9c24.hot-update.js": "/chunks/app-payments.db6cc7c5e9471b1f9c24.hot-update.js",
+    "/chunks/app-payments.9c2566292127918cad9c.hot-update.js": "/chunks/app-payments.9c2566292127918cad9c.hot-update.js",
+    "/chunks/app-payments.e67fb20f2c4aff3dc500.hot-update.js": "/chunks/app-payments.e67fb20f2c4aff3dc500.hot-update.js",
+    "/chunks/app-payments.e3da4e871fa070d91b0a.hot-update.js": "/chunks/app-payments.e3da4e871fa070d91b0a.hot-update.js",
+    "/chunks/app-payments.057d057939be031bd6d7.hot-update.js": "/chunks/app-payments.057d057939be031bd6d7.hot-update.js",
+    "/chunks/app-payments.3780ef155707ef7910dd.hot-update.js": "/chunks/app-payments.3780ef155707ef7910dd.hot-update.js",
+    "/chunks/app-payments.8790f7acd6323b6b6108.hot-update.js": "/chunks/app-payments.8790f7acd6323b6b6108.hot-update.js",
+    "/chunks/app-payments.124a3b702cfb578955aa.hot-update.js": "/chunks/app-payments.124a3b702cfb578955aa.hot-update.js",
+    "/chunks/app-payments.1917c29d44f7cfb4af84.hot-update.js": "/chunks/app-payments.1917c29d44f7cfb4af84.hot-update.js",
+    "/chunks/app-payments.3da8a1b6e71e4cf42f9b.hot-update.js": "/chunks/app-payments.3da8a1b6e71e4cf42f9b.hot-update.js",
+    "/chunks/app-payments.07078680668420a3f50e.hot-update.js": "/chunks/app-payments.07078680668420a3f50e.hot-update.js",
+    "/chunks/app-payments.2cbdd63db64cabb2037b.hot-update.js": "/chunks/app-payments.2cbdd63db64cabb2037b.hot-update.js",
+    "/chunks/app-payments.8ce2eb34e1cfcee85f49.hot-update.js": "/chunks/app-payments.8ce2eb34e1cfcee85f49.hot-update.js",
+    "/chunks/app-payments.e48e9a67057d0f1e82d7.hot-update.js": "/chunks/app-payments.e48e9a67057d0f1e82d7.hot-update.js",
+    "/chunks/app-payments.8a6aadd6cd4830e9214d.hot-update.js": "/chunks/app-payments.8a6aadd6cd4830e9214d.hot-update.js",
+    "/chunks/app-payments.2545ace6a43206e7cb28.hot-update.js": "/chunks/app-payments.2545ace6a43206e7cb28.hot-update.js",
+    "/chunks/app-payments.ae6bf235ad9c0082e140.hot-update.js": "/chunks/app-payments.ae6bf235ad9c0082e140.hot-update.js",
+    "/chunks/app-payments.7ad6fc967534023b5bed.hot-update.js": "/chunks/app-payments.7ad6fc967534023b5bed.hot-update.js",
+    "/chunks/app-payments.3f070979128839078c89.hot-update.js": "/chunks/app-payments.3f070979128839078c89.hot-update.js",
+    "/chunks/app-payments.1558235dce940dd76bb4.hot-update.js": "/chunks/app-payments.1558235dce940dd76bb4.hot-update.js",
+    "/chunks/app-payments.277a5d521c9f6f11532e.hot-update.js": "/chunks/app-payments.277a5d521c9f6f11532e.hot-update.js",
+    "/chunks/app-payments.6f5c79f051956d5ed691.hot-update.js": "/chunks/app-payments.6f5c79f051956d5ed691.hot-update.js",
+    "/js/main.954bf2e1a086112934cc.hot-update.js": "/js/main.954bf2e1a086112934cc.hot-update.js",
+    "/chunks/app-payments.954bf2e1a086112934cc.hot-update.js": "/chunks/app-payments.954bf2e1a086112934cc.hot-update.js",
+    "/chunks/app-payments~chunks/settings.js": "/chunks/app-payments~chunks/settings.js?id=ec4c3e5b27d7ee2e2cd1",
+    "/chunks/settings.954bf2e1a086112934cc.hot-update.js": "/chunks/settings.954bf2e1a086112934cc.hot-update.js",
+    "/chunks/settings~chunks/settings-password.954bf2e1a086112934cc.hot-update.js": "/chunks/settings~chunks/settings-password.954bf2e1a086112934cc.hot-update.js",
+    "/chunks/app-payments.ddbb1bbdd9a44ea061a5.hot-update.js": "/chunks/app-payments.ddbb1bbdd9a44ea061a5.hot-update.js",
+    "/chunks/app-payments.8a409a2552faf4fd77c5.hot-update.js": "/chunks/app-payments.8a409a2552faf4fd77c5.hot-update.js",
+    "/chunks/app-payments.98540e0229320687b3a8.hot-update.js": "/chunks/app-payments.98540e0229320687b3a8.hot-update.js",
+    "/chunks/app-settings.f7f24fa49e9870d2b03e.hot-update.js": "/chunks/app-settings.f7f24fa49e9870d2b03e.hot-update.js",
+    "/chunks/app-settings.37a4b790399b7a387ee7.hot-update.js": "/chunks/app-settings.37a4b790399b7a387ee7.hot-update.js",
+    "/chunks/app-settings.a6ae9d763b8f3d5bb449.hot-update.js": "/chunks/app-settings.a6ae9d763b8f3d5bb449.hot-update.js",
+    "/chunks/app-others.0d242250225826ebe7c6.hot-update.js": "/chunks/app-others.0d242250225826ebe7c6.hot-update.js",
+    "/chunks/app-others.883e09059a4471b31b6e.hot-update.js": "/chunks/app-others.883e09059a4471b31b6e.hot-update.js",
+    "/chunks/app-others.65c5b9d1e246de13f015.hot-update.js": "/chunks/app-others.65c5b9d1e246de13f015.hot-update.js",
+    "/chunks/app-settings.577298fb1e5e2cba6c0c.hot-update.js": "/chunks/app-settings.577298fb1e5e2cba6c0c.hot-update.js",
+    "/chunks/app-payments.058d8d73f0f64ace017a.hot-update.js": "/chunks/app-payments.058d8d73f0f64ace017a.hot-update.js",
+    "/chunks/app-payments.9ccef9ff084de2bf2fb7.hot-update.js": "/chunks/app-payments.9ccef9ff084de2bf2fb7.hot-update.js",
+    "/chunks/app-payments.860780045a205e256f67.hot-update.js": "/chunks/app-payments.860780045a205e256f67.hot-update.js",
+    "/chunks/app-payments.41c7969dbbeac06ba099.hot-update.js": "/chunks/app-payments.41c7969dbbeac06ba099.hot-update.js",
+    "/chunks/app-payments.b80ac7c6ecc332cfcccc.hot-update.js": "/chunks/app-payments.b80ac7c6ecc332cfcccc.hot-update.js",
+    "/chunks/app-payments.6d57c170b4ce98205e52.hot-update.js": "/chunks/app-payments.6d57c170b4ce98205e52.hot-update.js",
+    "/chunks/app-payments.151c9af91092234b4402.hot-update.js": "/chunks/app-payments.151c9af91092234b4402.hot-update.js",
+    "/chunks/app-payments.eb4bbd90763904951dba.hot-update.js": "/chunks/app-payments.eb4bbd90763904951dba.hot-update.js",
+    "/chunks/app-payments.53611834dc55311f1a29.hot-update.js": "/chunks/app-payments.53611834dc55311f1a29.hot-update.js",
+    "/chunks/app-payments.70ef16d35538d0073b8b.hot-update.js": "/chunks/app-payments.70ef16d35538d0073b8b.hot-update.js",
+    "/chunks/app-payments.375803b7329c210d5f33.hot-update.js": "/chunks/app-payments.375803b7329c210d5f33.hot-update.js",
+    "/js/main.c0435834d830f7d0eda1.hot-update.js": "/js/main.c0435834d830f7d0eda1.hot-update.js",
+    "/js/main.1a8ad4ce0a95d596bdff.hot-update.js": "/js/main.1a8ad4ce0a95d596bdff.hot-update.js",
+    "/chunks/app-payments.a9854db0983e4e1e51c6.hot-update.js": "/chunks/app-payments.a9854db0983e4e1e51c6.hot-update.js",
+    "/chunks/app-payments.daab684852110413b22f.hot-update.js": "/chunks/app-payments.daab684852110413b22f.hot-update.js",
+    "/chunks/app-payments.7f6bac717f960982b7a0.hot-update.js": "/chunks/app-payments.7f6bac717f960982b7a0.hot-update.js",
+    "/chunks/app-payments.23225c985f25d548d60b.hot-update.js": "/chunks/app-payments.23225c985f25d548d60b.hot-update.js",
+    "/js/main.243d9d5041c13621985b.hot-update.js": "/js/main.243d9d5041c13621985b.hot-update.js",
+    "/js/main.cdcf8cac88c04468b678.hot-update.js": "/js/main.cdcf8cac88c04468b678.hot-update.js",
+    "/chunks/app-payments.5cf0b26f00ea9cf36230.hot-update.js": "/chunks/app-payments.5cf0b26f00ea9cf36230.hot-update.js",
+    "/chunks/app-payments.cece453ee840eac2a452.hot-update.js": "/chunks/app-payments.cece453ee840eac2a452.hot-update.js",
+    "/chunks/app-payments.67014f7147a6746a8f11.hot-update.js": "/chunks/app-payments.67014f7147a6746a8f11.hot-update.js",
+    "/chunks/app-payments.88614bcfda1d03b6ef4b.hot-update.js": "/chunks/app-payments.88614bcfda1d03b6ef4b.hot-update.js",
+    "/chunks/app-payments.38d32421cd0c154b4256.hot-update.js": "/chunks/app-payments.38d32421cd0c154b4256.hot-update.js",
+    "/chunks/app-payments.8a0f2bb3a32ef1a11fb0.hot-update.js": "/chunks/app-payments.8a0f2bb3a32ef1a11fb0.hot-update.js",
+    "/chunks/app-payments.7785b9a69b1e813917ae.hot-update.js": "/chunks/app-payments.7785b9a69b1e813917ae.hot-update.js"
 }
diff --git a/resources/js/components/Others/CreateFolderPopup.vue b/resources/js/components/Others/CreateFolderPopup.vue
index b1899c9a..74a1b820 100644
--- a/resources/js/components/Others/CreateFolderPopup.vue
+++ b/resources/js/components/Others/CreateFolderPopup.vue
@@ -13,7 +13,7 @@
                 <!--Set folder name-->
                 <ValidationProvider tag="div" mode="passive" name="Title" rules="required" v-slot="{ errors }">
 					<AppInputText :title="$t('popup_create_folder.label')" :error="errors[0]">
-    	                <input v-model="name" :class="{'border-red-700': errors[0]}" type="text" ref="input" class="focus-border-theme input-dark" :placeholder="$t('popup_create_folder.placeholder')">
+    	                <input v-model="name" :class="{'border-red': errors[0]}" type="text" ref="input" class="focus-border-theme input-dark" :placeholder="$t('popup_create_folder.placeholder')">
 					</AppInputText>
                 </ValidationProvider>
 
diff --git a/resources/js/components/Others/CreateLanguage.vue b/resources/js/components/Others/CreateLanguage.vue
index fc3b9ab6..173f3f47 100644
--- a/resources/js/components/Others/CreateLanguage.vue
+++ b/resources/js/components/Others/CreateLanguage.vue
@@ -16,7 +16,7 @@
 				</ValidationProvider>
 				<ValidationProvider tag="div" mode="passive" name="Language Name" rules="required" v-slot="{ errors }">
 					<AppInputText :title="$t('locale_name')" :error="errors[0]" :is-last="true">
-						<input v-model="form.name" :class="{'border-red-700': errors[0]}" type="text" ref="input" class="focus-border-theme input-dark" :placeholder="$t('type_language_name')">
+						<input v-model="form.name" :class="{'border-red': errors[0]}" type="text" ref="input" class="focus-border-theme input-dark" :placeholder="$t('type_language_name')">
 					</AppInputText>
 				</ValidationProvider>
             </ValidationObserver>
diff --git a/resources/js/components/Others/CreatePersonaTokenPopup.vue b/resources/js/components/Others/CreatePersonaTokenPopup.vue
index 274af48e..5a8ec907 100644
--- a/resources/js/components/Others/CreatePersonaTokenPopup.vue
+++ b/resources/js/components/Others/CreatePersonaTokenPopup.vue
@@ -8,7 +8,7 @@
 
                 <ValidationProvider tag="div" mode="passive" name="Token Name" rules="required" v-slot="{ errors }">
 					<AppInputText :title="$t('popup_personal_token.label')" :error="errors[0]" :is-last="true">
-    	                <input v-model="name" :class="{'border-red-700': errors[0]}" type="text" ref="input" class="focus-border-theme input-dark" :placeholder="$t('popup_personal_token.plc')">
+    	                <input v-model="name" :class="{'border-red': errors[0]}" type="text" ref="input" class="focus-border-theme input-dark" :placeholder="$t('popup_personal_token.plc')">
 					</AppInputText>
                 </ValidationProvider>
 
diff --git a/resources/js/components/Others/Forms/FormLabel.vue b/resources/js/components/Others/Forms/FormLabel.vue
index 119e870c..f3552242 100644
--- a/resources/js/components/Others/Forms/FormLabel.vue
+++ b/resources/js/components/Others/Forms/FormLabel.vue
@@ -9,6 +9,7 @@
         <settings-icon v-if="icon === 'settings'" size="22" class="mr-3 vue-feather text-theme dark-text-theme" />
         <hard-drive-icon v-if="icon === 'hard-drive'" size="22" class="mr-3 vue-feather text-theme dark-text-theme" />
         <smartphone-icon v-if="icon === 'smartphone'" size="22" class="mr-3 vue-feather text-theme dark-text-theme" />
+        <shield-icon v-if="icon === 'shield'" size="22" class="mr-3 vue-feather text-theme dark-text-theme" />
         <bell-icon v-if="icon === 'bell'" size="22" class="mr-3 vue-feather text-theme dark-text-theme" />
         <key-icon v-if="icon === 'key'" size="22" class="mr-3 vue-feather text-theme dark-text-theme" />
         <b class="font-bold text-lg">
@@ -19,6 +20,7 @@
 
 <script>
     import {
+		ShieldIcon,
 		CreditCardIcon,
 		DollarSignIcon,
 		SmartphoneIcon,
@@ -45,6 +47,7 @@
 			BarChartIcon,
 			SettingsIcon,
 			FileTextIcon,
+			ShieldIcon,
 			FrownIcon,
 			Edit2Icon,
 			BellIcon,
diff --git a/resources/js/components/Others/RenameItemPopup.vue b/resources/js/components/Others/RenameItemPopup.vue
index 2738301d..103c4fd4 100644
--- a/resources/js/components/Others/RenameItemPopup.vue
+++ b/resources/js/components/Others/RenameItemPopup.vue
@@ -16,7 +16,7 @@
                 <ValidationProvider tag="div" mode="passive" name="Name" rules="required" v-slot="{ errors }">
 					<AppInputText :title="$t('popup_rename.label')" :error="errors[0]">
 						<div class="flex items-center relative">
-							<input v-model="pickedItem.data.attributes.name" :class="{'border-red-700': errors[0]}" ref="input" type="text" class="focus-border-theme input-dark" :placeholder="$t('popup_rename.placeholder')">
+							<input v-model="pickedItem.data.attributes.name" :class="{'border-red': errors[0]}" ref="input" type="text" class="focus-border-theme input-dark" :placeholder="$t('popup_rename.placeholder')">
 							<div @click="pickedItem.data.attributes.name = ''" class="absolute right-4">
 								<x-icon class="close-icon hover-text-theme" size="14" />
 							</div>
diff --git a/resources/js/components/Others/ShareCreatePopup.vue b/resources/js/components/Others/ShareCreatePopup.vue
index a5a275cd..3cfc63c4 100644
--- a/resources/js/components/Others/ShareCreatePopup.vue
+++ b/resources/js/components/Others/ShareCreatePopup.vue
@@ -28,7 +28,7 @@
 					<!--Set password-->
 					<ValidationProvider v-if="shareOptions.isPassword" tag="div" mode="passive" name="Password" rules="required" v-slot="{ errors }">
 						<AppInputText :error="errors[0]" class="-mt-2">
-							<input v-model="shareOptions.password" :class="{'border-red-700': errors[0]}" type="text" class="focus-border-theme input-dark" :placeholder="$t('page_sign_in.placeholder_password')">
+							<input v-model="shareOptions.password" :class="{'border-red': errors[0]}" type="text" class="focus-border-theme input-dark" :placeholder="$t('page_sign_in.placeholder_password')">
 						</AppInputText>
 					</ValidationProvider>
 				</div>
diff --git a/resources/js/components/Others/ShareEditPopup.vue b/resources/js/components/Others/ShareEditPopup.vue
index d51ed401..72b156b1 100644
--- a/resources/js/components/Others/ShareEditPopup.vue
+++ b/resources/js/components/Others/ShareEditPopup.vue
@@ -47,7 +47,7 @@
 					<!--Set password-->
 					<ValidationProvider v-if="shareOptions.isProtected && ! canChangePassword" tag="div" mode="passive" name="Password" rules="required" v-slot="{ errors }">
 						<AppInputText :error="errors[0]" class="-mt-2">
-							<input v-model="shareOptions.password" :class="{'border-red-700': errors[0]}" type="text" class="focus-border-theme input-dark" :placeholder="$t('page_sign_in.placeholder_password')">
+							<input v-model="shareOptions.password" :class="{'border-red': errors[0]}" type="text" class="focus-border-theme input-dark" :placeholder="$t('page_sign_in.placeholder_password')">
 						</AppInputText>
 					</ValidationProvider>
 				</div>
diff --git a/resources/js/components/Others/TwoFactorSetupPopup.vue b/resources/js/components/Others/TwoFactorSetupPopup.vue
index c3019de3..2393c8c5 100644
--- a/resources/js/components/Others/TwoFactorSetupPopup.vue
+++ b/resources/js/components/Others/TwoFactorSetupPopup.vue
@@ -7,7 +7,7 @@
              <ValidationObserver @submit.prevent="confirmPassword" v-if="! qrCode" ref="passwordForm" v-slot="{ invalid }" tag="form" class="form-wrapper">
                 <ValidationProvider tag="div" mode="passive" name="Password" rules="required" v-slot="{ errors }">
 					<AppInputText :title="$t('popup_2fa.input_label')" :error="errors[0]" :is-last="true">
-						<input v-model="password" :class="{'border-red-700': errors[0]}" type="password" ref="input" class="focus-border-theme input-dark" :placeholder="$t('page_sign_in.placeholder_password')">
+						<input v-model="password" :class="{'border-red': errors[0]}" type="password" ref="input" class="focus-border-theme input-dark" :placeholder="$t('page_sign_in.placeholder_password')">
 					</AppInputText>
                 </ValidationProvider>
             </ValidationObserver>
diff --git a/resources/js/components/Subscription/UserBalance.vue b/resources/js/components/Subscription/UserBalance.vue
index ca8e74cc..cc4e3d12 100644
--- a/resources/js/components/Subscription/UserBalance.vue
+++ b/resources/js/components/Subscription/UserBalance.vue
@@ -19,7 +19,7 @@
 							   min="1"
 							   max="999999999"
 							   class="focus-border-theme input-dark"
-							   :class="{'border-red-700': errors[0]}"
+							   :class="{'border-red': errors[0]}"
 						/>
 						<ButtonBase type="submit" button-style="theme" class="sm:w-auto w-full">
 							{{ $t('Make a Payment') }}
diff --git a/resources/js/components/Subscription/UserBillingAlerts.vue b/resources/js/components/Subscription/UserBillingAlerts.vue
index 24ebf6e4..fcba1435 100644
--- a/resources/js/components/Subscription/UserBillingAlerts.vue
+++ b/resources/js/components/Subscription/UserBillingAlerts.vue
@@ -26,7 +26,7 @@
 							   min="1"
 							   max="999999999"
 							   class="focus-border-theme input-dark"
-							   :class="{'border-red-700': errors[0]}"
+							   :class="{'border-red': errors[0]}"
 						/>
 						<ButtonBase :loadint="isSendingBillingAlert" :disabled="isSendingBillingAlert" type="submit" button-style="theme" class="sm:w-auto w-full">
 							{{ $t('Update Alert') }}
@@ -46,7 +46,7 @@
 							   min="1"
 							   max="999999999"
 							   class="focus-border-theme input-dark"
-							   :class="{'border-red-700': errors[0]}"
+							   :class="{'border-red': errors[0]}"
 						/>
 						<ButtonBase :loadint="isSendingBillingAlert" :disabled="isSendingBillingAlert" type="submit" button-style="theme" class="sm:w-auto w-full">
 							{{ $t('Set Alert') }}
diff --git a/resources/js/components/Teams/CreateTeamFolderPopup.vue b/resources/js/components/Teams/CreateTeamFolderPopup.vue
index 3a4adf1a..b75ded47 100644
--- a/resources/js/components/Teams/CreateTeamFolderPopup.vue
+++ b/resources/js/components/Teams/CreateTeamFolderPopup.vue
@@ -16,7 +16,7 @@
                 <!--Set folder name-->
                 <ValidationProvider v-if="isNewFolderTeamCreation" tag="div" mode="passive" name="Name" rules="required" v-slot="{ errors }">
 					<AppInputText :title="$t('popup_create_folder.label')" :error="errors[0]">
-						<input v-model="name" :class="{'border-red-700': errors[0]}" type="text" ref="name" class="focus-border-theme input-dark" :placeholder="$t('popup_create_folder.placeholder')">
+						<input v-model="name" :class="{'border-red': errors[0]}" type="text" ref="name" class="focus-border-theme input-dark" :placeholder="$t('popup_create_folder.placeholder')">
 					</AppInputText>
                 </ValidationProvider>
 
@@ -31,7 +31,7 @@
 							>
 								Add
 							</span>
-							<input @keypress.enter.stop.prevent="addMember" ref="email" v-model="email" :class="{'border-red-700': errors[0]}" type="email" class="focus-border-theme input-dark" :placeholder="$t('Type member email...')">
+							<input @keypress.enter.stop.prevent="addMember" ref="email" v-model="email" :class="{'border-red': errors[0]}" type="email" class="focus-border-theme input-dark" :placeholder="$t('Type member email...')">
 						</div>
 					</AppInputText>
 				</ValidationProvider>
diff --git a/resources/js/components/Teams/EditTeamFolderPopup.vue b/resources/js/components/Teams/EditTeamFolderPopup.vue
index db1d0873..ec0927c9 100644
--- a/resources/js/components/Teams/EditTeamFolderPopup.vue
+++ b/resources/js/components/Teams/EditTeamFolderPopup.vue
@@ -26,7 +26,7 @@
 							</span>
 
 							<!--TODO: Fix !pr-20 after JIT official release-->
-							<input @keypress.enter.stop.prevent="addMember" ref="email" v-model="email" :class="{'border-red-700': errors[0]}" type="email" class="focus-border-theme !pr-20 input-dark" :placeholder="$t('Type member email...')">
+							<input @keypress.enter.stop.prevent="addMember" ref="email" v-model="email" :class="{'border-red': errors[0]}" type="email" class="focus-border-theme !pr-20 input-dark" :placeholder="$t('Type member email...')">
 						</div>
 					</AppInputText>
 				</ValidationProvider>
diff --git a/resources/js/helpers/functionHelpers.js b/resources/js/helpers/functionHelpers.js
index 4ab62c3f..289f8762 100644
--- a/resources/js/helpers/functionHelpers.js
+++ b/resources/js/helpers/functionHelpers.js
@@ -124,7 +124,7 @@ const FunctionHelpers = {
             distribution = orderBy(distribution, ['progress'], ['desc'])
 
             // Push at the end empty space data
-            if (config.subscriptionType === 'fixed' || config.storageLimit) {
+            if (config.subscriptionType === 'fixed' || (config.subscriptionType === 'none' && config.storageLimit)) {
                 distribution.push({
                     progress: 100 - storage.data.attributes.percentage,
                     color: 'secondary',
diff --git a/resources/js/store/index.js b/resources/js/store/index.js
index acb26669..0f0a7506 100644
--- a/resources/js/store/index.js
+++ b/resources/js/store/index.js
@@ -6,6 +6,7 @@ import fileBrowser from './modules/fileBrowser'
 import payments from './modules/payments'
 import userAuth from './modules/userAuth'
 import sharing from './modules/sharing'
+import lists from './modules/lists'
 import teams from './modules/teams'
 import app from './modules/app'
 
@@ -18,6 +19,7 @@ export default new Vuex.Store({
         payments,
         userAuth,
         sharing,
+        lists,
         teams,
         app,
     }
diff --git a/resources/js/store/modules/app.js b/resources/js/store/modules/app.js
index 41c98f72..d39c034c 100644
--- a/resources/js/store/modules/app.js
+++ b/resources/js/store/modules/app.js
@@ -14,973 +14,6 @@ const defaultState = {
         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: 'roles.admin',
-            value: 'admin',
-        },
-        {
-            label: 'roles.user',
-            value: 'user',
-        },
-    ],
-    teamPermissions: {
-        'can-edit': 'Can Edit',
-        'can-view': 'Can View',
-    },
-    countries: [
-        {label: 'Czech Republic', value: 'CZ'},
-        {label: 'Slovakia', value: 'SK'},
-        {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: '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: '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: ['shared_form.expiration_hour', {value: 1}],
-            value: 1,
-        },
-        {
-            label: ['shared_form.expiration_hour', {value: 2}],
-            value: 2,
-        },
-        {
-            label: ['shared_form.expiration_hour', {value: 6}],
-            value: 6,
-        },
-        {
-            label: ['shared_form.expiration_hour', {value: 12}],
-            value: 12,
-        },
-        {
-            label: ['shared_form.expiration_day', {value: 1}],
-            value: 24,
-        },
-        {
-            label: ['shared_form.expiration_day', {value: 2}],
-            value: 48,
-        },
-        {
-            label: ['shared_form.expiration_day', {value: 7}],
-            value: 168,
-        },
-    ],
-    intervalList: [
-        {
-            label: 'Monthly',
-            value: 'month',
-        },
-        {
-            label: 'Annually',
-            value: 'year',
-        },
-    ],
-    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 = {
     toggleDarkMode: ({commit}, visibility) => {
@@ -1000,9 +33,8 @@ const actions = {
         commit('TOGGLE_NAVIGATION_BARS')
     },
     togglePreviewType: ({commit, state}, preview) => {
-
         // Get preview type
-        let previewType = preview || state.itemViewType === 'list' ? 'grid' : 'list'
+        let previewType = preview ? preview : state.itemViewType === 'list' ? 'grid' : 'list';
 
         // Store preview type to localStorage
         localStorage.setItem('preview_type', previewType)
@@ -1081,19 +113,12 @@ const mutations = {
 const getters = {
     isVisibleNavigationBars: state => state.isVisibleNavigationBars,
     isVisibleSidebar: state => state.isVisibleSidebar,
-    teamPermissions: state => state.teamPermissions,
     itemViewType: state => state.itemViewType,
-    expirationList: state => state.expirationList,
     requestedPlan: state => state.requestedPlan,
-    currencyList: state => state.currencyList,
-    intervalList: state => state.intervalList,
-    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,
     isDarkMode: state => state.darkMode,
     sorting: (state) => {
         return {sorting: state.sorting, URI: '?sort=' + state.sorting.field + '&direction=' + state.sorting.sort}
diff --git a/resources/js/store/modules/lists.js b/resources/js/store/modules/lists.js
new file mode 100644
index 00000000..ce156377
--- /dev/null
+++ b/resources/js/store/modules/lists.js
@@ -0,0 +1,995 @@
+const defaultState = {
+	roles: [
+		{
+			label: 'roles.admin',
+			value: 'admin',
+		},
+		{
+			label: 'roles.user',
+			value: 'user',
+		},
+	],
+	subscriptionTypes: [
+		{
+			label: 'Metered',
+			value: 'metered',
+		},
+		{
+			label: 'Fixed',
+			value: 'fixed',
+		},
+	],
+	teamPermissions: {
+		'can-edit': 'Can Edit',
+		'can-view': 'Can View',
+	},
+	countries: [
+		{label: 'Czech Republic', value: 'CZ'},
+		{label: 'Slovakia', value: 'SK'},
+		{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: '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: '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: ['shared_form.expiration_hour', {value: 1}],
+			value: 1,
+		},
+		{
+			label: ['shared_form.expiration_hour', {value: 2}],
+			value: 2,
+		},
+		{
+			label: ['shared_form.expiration_hour', {value: 6}],
+			value: 6,
+		},
+		{
+			label: ['shared_form.expiration_hour', {value: 12}],
+			value: 12,
+		},
+		{
+			label: ['shared_form.expiration_day', {value: 1}],
+			value: 24,
+		},
+		{
+			label: ['shared_form.expiration_day', {value: 2}],
+			value: 48,
+		},
+		{
+			label: ['shared_form.expiration_day', {value: 7}],
+			value: 168,
+		},
+	],
+	intervalList: [
+		{
+			label: 'Monthly',
+			value: 'month',
+		},
+		{
+			label: 'Annually',
+			value: 'year',
+		},
+	],
+	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 getters = {
+	subscriptionTypes: state => state.subscriptionTypes,
+	teamPermissions: state => state.teamPermissions,
+	expirationList: state => state.expirationList,
+	currencyList: state => state.currencyList,
+	intervalList: state => state.intervalList,
+	timezones: state => state.timezones,
+	countries: state => state.countries,
+	roles: state => state.roles,
+}
+
+export default {
+	state: defaultState,
+	getters,
+}
\ No newline at end of file
diff --git a/resources/js/views/Admin/AppSettings/AppSettings.vue b/resources/js/views/Admin/AppSettings/AppSettings.vue
index 171fcfbf..3ea9df6c 100644
--- a/resources/js/views/Admin/AppSettings/AppSettings.vue
+++ b/resources/js/views/Admin/AppSettings/AppSettings.vue
@@ -2,7 +2,7 @@
     <div>
 		<!--Page Tab links-->
 		<div class="card shadow-card py-0 sticky top-0 z-10">
-			<CardNavigation :pages="pages" class="-mx-6" />
+			<CardNavigation :pages="pages" class="-mx-1" />
 		</div>
 
 		<!--Page Content-->
@@ -19,11 +19,6 @@
 		components: {
 			CardNavigation,
 		},
-		computed: {
-			...mapGetters([
-				'config'
-			]),
-		},
 		data() {
 			return {
 				pages: [
@@ -35,14 +30,14 @@
 						title: this.$t('admin_settings.tabs.appearance'),
 						route: 'AppAppearance',
 					},
-					{
-						title: this.$t('admin_settings.tabs.billings'),
-						route: 'AppBillings',
-					},
 					{
 						title: this.$t('admin_settings.tabs.payments'),
 						route: 'AppPayments',
 					},
+					{
+						title: this.$t('admin_settings.tabs.billings'),
+						route: 'AppBillings',
+					},
 					{
 						title: this.$t('Homepage'),
 						route: 'AppIndex',
diff --git a/resources/js/views/Admin/AppSettings/AppSettingsTabs/Email.vue b/resources/js/views/Admin/AppSettings/AppSettingsTabs/Email.vue
index 295eb984..472b7131 100644
--- a/resources/js/views/Admin/AppSettings/AppSettingsTabs/Email.vue
+++ b/resources/js/views/Admin/AppSettings/AppSettingsTabs/Email.vue
@@ -7,27 +7,27 @@
             </InfoBox>
             <ValidationProvider tag="div" mode="passive" name="Mail Driver" rules="required" v-slot="{ errors }">
                 <AppInputText :title="$t('admin_settings.email.driver')" :error="errors[0]">
-                    <input v-model="mail.driver" :placeholder="$t('admin_settings.email.driver_plac')" type="text" :class="{'border-red-700': errors[0]}" class="focus-border-theme input-dark" />
+                    <input v-model="mail.driver" :placeholder="$t('admin_settings.email.driver_plac')" type="text" :class="{'border-red': errors[0]}" class="focus-border-theme input-dark" />
                 </AppInputText>
             </ValidationProvider>
             <ValidationProvider tag="div" mode="passive" name="Mail Host" rules="required" v-slot="{ errors }">
                 <AppInputText :title="$t('admin_settings.email.host')" :error="errors[0]">
-                    <input v-model="mail.host" :placeholder="$t('admin_settings.email.host_plac')" type="text" :class="{'border-red-700': errors[0]}" class="focus-border-theme input-dark" />
+                    <input v-model="mail.host" :placeholder="$t('admin_settings.email.host_plac')" type="text" :class="{'border-red': errors[0]}" class="focus-border-theme input-dark" />
                 </AppInputText>
             </ValidationProvider>
             <ValidationProvider tag="div" mode="passive" name="Mail Port" rules="required" v-slot="{ errors }">
                 <AppInputText :title="$t('admin_settings.email.port')" :error="errors[0]">
-                    <input v-model="mail.port" :placeholder="$t('admin_settings.email.port_plac')" type="text" :class="{'border-red-700': errors[0]}" class="focus-border-theme input-dark" />
+                    <input v-model="mail.port" :placeholder="$t('admin_settings.email.port_plac')" type="text" :class="{'border-red': errors[0]}" class="focus-border-theme input-dark" />
                 </AppInputText>
             </ValidationProvider>
             <ValidationProvider tag="div" mode="passive" name="Mail Username" rules="required" v-slot="{ errors }">
                 <AppInputText :title="$t('admin_settings.email.username')" :error="errors[0]">
-                    <input v-model="mail.username" :placeholder="$t('admin_settings.email.username_plac')" type="text" :class="{'border-red-700': errors[0]}" class="focus-border-theme input-dark" />
+                    <input v-model="mail.username" :placeholder="$t('admin_settings.email.username_plac')" type="text" :class="{'border-red': errors[0]}" class="focus-border-theme input-dark" />
                 </AppInputText>
             </ValidationProvider>
             <ValidationProvider tag="div" mode="passive" name="Mail Password" rules="required" v-slot="{ errors }">
                 <AppInputText :title="$t('admin_settings.email.password')" :error="errors[0]">
-                    <input v-model="mail.password" :placeholder="$t('admin_settings.email.password_plac')" type="text" :class="{'border-red-700': errors[0]}" class="focus-border-theme input-dark" />
+                    <input v-model="mail.password" :placeholder="$t('admin_settings.email.password_plac')" type="text" :class="{'border-red': errors[0]}" class="focus-border-theme input-dark" />
                 </AppInputText>
             </ValidationProvider>
             <ValidationProvider tag="div" mode="passive" name="Mail Encryption" rules="required" v-slot="{ errors }">
diff --git a/resources/js/views/Admin/AppSettings/AppSettingsTabs/Index.vue b/resources/js/views/Admin/AppSettings/AppSettingsTabs/Index.vue
index 2b0b3d6f..38878398 100644
--- a/resources/js/views/Admin/AppSettings/AppSettingsTabs/Index.vue
+++ b/resources/js/views/Admin/AppSettings/AppSettingsTabs/Index.vue
@@ -25,7 +25,7 @@
                     <div class="block-wrapper">
                         <label>Title:</label>
                         <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="App Title" rules="required" v-slot="{ errors }">
-                            <input @input="$updateText('/admin/settings', 'header_title', app.header_title)" v-model="app.header_title" type="text" :class="{'border-red-700': errors[0]}" class="focus-border-theme input-dark"/>
+                            <input @input="$updateText('/admin/settings', 'header_title', app.header_title)" v-model="app.header_title" type="text" :class="{'border-red': errors[0]}" class="focus-border-theme input-dark"/>
                             <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                         </ValidationProvider>
                     </div>
@@ -33,7 +33,7 @@
                     <div class="block-wrapper">
                         <label>Description:</label>
                         <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="App Description" rules="required" v-slot="{ errors }">
-                            <textarea @input="$updateText('/admin/settings', 'header_description', app.header_description)" rows="2" v-model="app.header_description" :class="{'border-red-700': errors[0]}" class="focus-border-theme input-dark"></textarea>
+                            <textarea @input="$updateText('/admin/settings', 'header_description', app.header_description)" rows="2" v-model="app.header_description" :class="{'border-red': errors[0]}" class="focus-border-theme input-dark"></textarea>
                             <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                         </ValidationProvider>
                     </div>
@@ -65,7 +65,7 @@
                         <div class="block-wrapper">
                             <label>Title:</label>
                             <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="App Title" rules="required" v-slot="{ errors }">
-                                <input @input="$updateText('/admin/settings', 'features_title', app.features_title)" v-model="app.features_title" type="text" :class="{'border-red-700': errors[0]}" class="focus-border-theme input-dark"/>
+                                <input @input="$updateText('/admin/settings', 'features_title', app.features_title)" v-model="app.features_title" type="text" :class="{'border-red': errors[0]}" class="focus-border-theme input-dark"/>
                                 <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                             </ValidationProvider>
                         </div>
@@ -73,7 +73,7 @@
                         <div class="block-wrapper">
                             <label>Description:</label>
                             <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="App Description" rules="required" v-slot="{ errors }">
-                                <textarea @input="$updateText('/admin/settings', 'features_description', app.features_description)" rows="2" v-model="app.features_description" :class="{'border-red-700': errors[0]}" class="focus-border-theme input-dark"></textarea>
+                                <textarea @input="$updateText('/admin/settings', 'features_description', app.features_description)" rows="2" v-model="app.features_description" :class="{'border-red': errors[0]}" class="focus-border-theme input-dark"></textarea>
                                 <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                             </ValidationProvider>
                         </div>
@@ -104,42 +104,42 @@
                         <div class="block-wrapper">
                             <label>First Box Title:</label>
                             <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="Feature Title 1" rules="required" v-slot="{ errors }">
-                                <input @input="$updateText('/admin/settings', 'feature_title_1', app.feature_title_1)" v-model="app.feature_title_1" type="text" :class="{'border-red-700': errors[0]}" class="focus-border-theme input-dark"/>
+                                <input @input="$updateText('/admin/settings', 'feature_title_1', app.feature_title_1)" v-model="app.feature_title_1" type="text" :class="{'border-red': errors[0]}" class="focus-border-theme input-dark"/>
                                 <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                             </ValidationProvider>
                         </div>
                         <div class="block-wrapper">
                             <label>First Box Description:</label>
                             <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="Feature Description 1" rules="required" v-slot="{ errors }">
-                                <textarea @input="$updateText('/admin/settings', 'feature_description_1', app.feature_description_1)" rows="2" v-model="app.feature_description_1" :class="{'border-red-700': errors[0]}" class="focus-border-theme input-dark"></textarea>
+                                <textarea @input="$updateText('/admin/settings', 'feature_description_1', app.feature_description_1)" rows="2" v-model="app.feature_description_1" :class="{'border-red': errors[0]}" class="focus-border-theme input-dark"></textarea>
                                 <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                             </ValidationProvider>
                         </div>
                         <div class="block-wrapper">
                             <label>Second Box Title:</label>
                             <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="Feature Title 2" rules="required" v-slot="{ errors }">
-                                <input @input="$updateText('/admin/settings', 'feature_title_2', app.feature_title_2)" v-model="app.feature_title_2" type="text" :class="{'border-red-700': errors[0]}" class="focus-border-theme input-dark"/>
+                                <input @input="$updateText('/admin/settings', 'feature_title_2', app.feature_title_2)" v-model="app.feature_title_2" type="text" :class="{'border-red': errors[0]}" class="focus-border-theme input-dark"/>
                                 <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                             </ValidationProvider>
                         </div>
                         <div class="block-wrapper">
                             <label>Second Box Description:</label>
                             <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="Feature Description 2" rules="required" v-slot="{ errors }">
-                                <textarea @input="$updateText('/admin/settings', 'feature_description_2', app.feature_description_2)" rows="2" v-model="app.feature_description_2" :class="{'border-red-700': errors[0]}" class="focus-border-theme input-dark"></textarea>
+                                <textarea @input="$updateText('/admin/settings', 'feature_description_2', app.feature_description_2)" rows="2" v-model="app.feature_description_2" :class="{'border-red': errors[0]}" class="focus-border-theme input-dark"></textarea>
                                 <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                             </ValidationProvider>
                         </div>
                         <div class="block-wrapper">
                             <label>Third Box Title:</label>
                             <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="Feature Title 3" rules="required" v-slot="{ errors }">
-                                <input @input="$updateText('/admin/settings', 'feature_title_3', app.feature_title_3)" v-model="app.feature_title_3" type="text" :class="{'border-red-700': errors[0]}" class="focus-border-theme input-dark"/>
+                                <input @input="$updateText('/admin/settings', 'feature_title_3', app.feature_title_3)" v-model="app.feature_title_3" type="text" :class="{'border-red': errors[0]}" class="focus-border-theme input-dark"/>
                                 <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                             </ValidationProvider>
                         </div>
                         <div class="block-wrapper">
                             <label>Third Box Description:</label>
                             <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="Feature Description 3" rules="required" v-slot="{ errors }">
-                                <textarea @input="$updateText('/admin/settings', 'feature_description_3', app.feature_description_3)" rows="2" v-model="app.feature_description_3" :class="{'border-red-700': errors[0]}" class="focus-border-theme input-dark"></textarea>
+                                <textarea @input="$updateText('/admin/settings', 'feature_description_3', app.feature_description_3)" rows="2" v-model="app.feature_description_3" :class="{'border-red': errors[0]}" class="focus-border-theme input-dark"></textarea>
                                 <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                             </ValidationProvider>
                         </div>
@@ -170,7 +170,7 @@
                         <div class="block-wrapper">
                             <label>Title:</label>
                             <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="App Title" rules="required" v-slot="{ errors }">
-                                <input @input="$updateText('/admin/settings', 'pricing_title', app.pricing_title)" v-model="app.pricing_title" type="text" :class="{'border-red-700': errors[0]}" class="focus-border-theme input-dark"/>
+                                <input @input="$updateText('/admin/settings', 'pricing_title', app.pricing_title)" v-model="app.pricing_title" type="text" :class="{'border-red': errors[0]}" class="focus-border-theme input-dark"/>
                                 <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                             </ValidationProvider>
                         </div>
@@ -178,7 +178,7 @@
                         <div class="block-wrapper">
                             <label>Description:</label>
                             <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="App Description" rules="required" v-slot="{ errors }">
-                                <textarea @input="$updateText('/admin/settings', 'pricing_description', app.pricing_description)" rows="2" v-model="app.pricing_description" :class="{'border-red-700': errors[0]}" class="focus-border-theme input-dark"></textarea>
+                                <textarea @input="$updateText('/admin/settings', 'pricing_description', app.pricing_description)" rows="2" v-model="app.pricing_description" :class="{'border-red': errors[0]}" class="focus-border-theme input-dark"></textarea>
                                 <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                             </ValidationProvider>
                         </div>
@@ -210,7 +210,7 @@
                         <div class="block-wrapper">
                             <label>Title:</label>
                             <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="App Title" rules="required" v-slot="{ errors }">
-                                <input @input="$updateText('/admin/settings', 'get_started_title', app.get_started_title)" v-model="app.get_started_title" type="text" :class="{'border-red-700': errors[0]}" class="focus-border-theme input-dark"/>
+                                <input @input="$updateText('/admin/settings', 'get_started_title', app.get_started_title)" v-model="app.get_started_title" type="text" :class="{'border-red': errors[0]}" class="focus-border-theme input-dark"/>
                                 <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                             </ValidationProvider>
                         </div>
@@ -218,7 +218,7 @@
                         <div class="block-wrapper">
                             <label>Description:</label>
                             <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="App Description" rules="required" v-slot="{ errors }">
-                            <textarea @input="$updateText('/admin/settings', 'get_started_description', app.get_started_description)" rows="2" v-model="app.get_started_description" :class="{'border-red-700': errors[0]}" class="focus-border-theme input-dark"></textarea>
+                            <textarea @input="$updateText('/admin/settings', 'get_started_description', app.get_started_description)" rows="2" v-model="app.get_started_description" :class="{'border-red': errors[0]}" class="focus-border-theme input-dark"></textarea>
                                 <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                             </ValidationProvider>
                         </div>
@@ -232,7 +232,7 @@
                     <div class="block-wrapper">
                         <label>Footer content:</label>
                         <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="App Title" rules="required" v-slot="{ errors }">
-                            <input @input="$updateText('/admin/settings', 'footer_content', app.footer_content)" v-model="app.footer_content" type="text" :class="{'border-red-700': errors[0]}" class="focus-border-theme input-dark"/>
+                            <input @input="$updateText('/admin/settings', 'footer_content', app.footer_content)" v-model="app.footer_content" type="text" :class="{'border-red': errors[0]}" class="focus-border-theme input-dark"/>
                             <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                         </ValidationProvider>
                     </div>
diff --git a/resources/js/views/Admin/AppSettings/AppSettingsTabs/Others.vue b/resources/js/views/Admin/AppSettings/AppSettingsTabs/Others.vue
index a43b66be..e753f766 100644
--- a/resources/js/views/Admin/AppSettings/AppSettingsTabs/Others.vue
+++ b/resources/js/views/Admin/AppSettings/AppSettingsTabs/Others.vue
@@ -66,14 +66,14 @@
 		</div>
 		<div class="card shadow-card">
 			<FormLabel>
-				{{ $t('admin_settings.others.section_cache') }}
+				{{ $t('Cache') }}
 			</FormLabel>
-			<InfoBox>
-				{{ $t('admin_settings.others.cache_disclaimer') }}
-			</InfoBox>
-			<ButtonBase @click.native="flushCache" :loading="isFlushingCache" :disabled="isFlushingCache" type="submit" button-style="theme" class="submit-button">
-				{{ $t('admin_settings.others.cache_clear') }}
-			</ButtonBase>
+
+			<AppInputSwitch :title="$t('admin_settings.others.section_cache')" :description="$t('admin_settings.others.cache_disclaimer')" :is-last="true">
+				<ButtonBase @click.native="flushCache" :loading="isFlushingCache" :disabled="isFlushingCache" class="sm:w-auto w-full" button-style="theme">
+					{{ $t('admin_settings.others.cache_clear') }}
+				</ButtonBase>
+			</AppInputSwitch>
 		</div>
     </PageTab>
 </template>
diff --git a/resources/js/views/Admin/AppSettings/AppSettingsTabs/Payments.vue b/resources/js/views/Admin/AppSettings/AppSettingsTabs/Payments.vue
index e6fb1820..856b1fce 100644
--- a/resources/js/views/Admin/AppSettings/AppSettingsTabs/Payments.vue
+++ b/resources/js/views/Admin/AppSettings/AppSettingsTabs/Payments.vue
@@ -1,113 +1,120 @@
 <template>
-    <PageTab :is-loading="isLoading">
+    <PageTab>
+		<div class="card shadow-card">
+			<FormLabel icon="dollar">
+				{{ $t('Subscription Payments') }}
+			</FormLabel>
 
-		<!--Stripe Information-->
-		<PageTabGroup v-if="config.stripe_public_key && payments">
-			<div class="card shadow-card">
-				<FormLabel>
-					{{ $t('admin_settings.payments.section_payments') }}
-				</FormLabel>
-				<InfoBox>
-					<p v-html="$t('admin_settings.payments.credentials_disclaimer')"></p>
-				</InfoBox>
-				<AppInputSwitch :title="$t('admin_settings.payments.allow_payments')">
-					<SwitchInput @input="$updateText('/admin/settings', 'payments_active', payments.status)" v-model="payments.status" class="switch" :state="payments.status" />
-				</AppInputSwitch>
-				<AppInputText :title="$t('admin_settings.payments.webhook_url')">
-					<input :value="stripeWebhookEndpoint" type="text" class="focus-border-theme input-dark" disabled />
-				</AppInputText>
+			<AppInputSwitch :title="$t('Allow Subscription Payments')" :description="$t('User can subscribe to fixed or metered plan')" :is-last="! allowedPayments">
+				<SwitchInput @input="$updateText('/admin/settings', 'allowedPayments', allowedPayments)" v-model="allowedPayments" :state="allowedPayments" />
+			</AppInputSwitch>
+
+			<AppInputText v-if="allowedPayments" :title="$t('Subscription Type')" :is-last="true">
+				<SelectInput :default="config.subscriptionType" :options="subscriptionTypes" :placeholder="$t('Select your subscription type')"/>
+			</AppInputText>
+		</div>
+
+		<!--Stripe method configuration-->
+		<div v-if="allowedPayments" class="card shadow-card">
+			<FormLabel icon="credit-card">
+				{{ $t('Stripe') }}
+			</FormLabel>
+
+			<AppInputSwitch :title="$t('Allow Stripe Service')" :description="$t('Allow your users pay by their credit card')" :is-last="! stripe.allowStripe">
+				<SwitchInput @input="$updateText('/admin/settings', 'payments_active', stripe.allowStripe)" v-model="stripe.allowStripe" :state="stripe.allowStripe" />
+			</AppInputSwitch>
+
+			<!--Stripe credentials are set up-->
+			<div v-if="stripe.allowStripe">
+				<div v-if="stripe.isConfigured">
+					<AppInputText :title="$t('Payment Description')" :description="$t('The description showed below user payment method selection.')">
+						<textarea rows="2" @input="$updateText('/admin/settings', 'stripe_payment_description', stripe.paymentDescription, true)" v-model="stripe.paymentDescription" :placeholder="$t('Describe in short which methods user can pay with this payment method...')" type="text" class="focus-border-theme input-dark" />
+					</AppInputText>
+
+					<AppInputText :title="$t('Your Stripe Webhook URL')" :description="$t('Please copy your url and paste it to the Stripe webhook setup.')">
+						<CopyInput size="small" :str="stripeWebhookEndpoint" />
+					</AppInputText>
+
+					<div @click="stripe.isVisibleCredentialsForm = !stripe.isVisibleCredentialsForm" class="flex items-center cursor-pointer" :class="{'mb-4': stripe.isVisibleCredentialsForm}">
+						<edit2-icon size="14" class="vue-feather text-theme mr-2.5" />
+						<b class="text-sm">{{ $t('Update Stripe Credentials') }}</b>
+					</div>
+				</div>
+
+				<!--Set up Stripe credentials-->
+				<ValidationObserver v-if="! stripe.isConfigured || stripe.isVisibleCredentialsForm" @submit.prevent="stripeCredentialsSubmit" ref="stripeCredentials" v-slot="{ invalid }" tag="form" class="p-5 border rounded-xl">
+					<FormLabel icon="shield">
+						{{ $t('Configure Your Stripe Credentials') }}
+					</FormLabel>
+					<ValidationProvider tag="div" mode="passive" name="Publishable Key" rules="required" v-slot="{ errors }">
+						<AppInputText :title="$t('admin_settings.payments.stripe_pub_key')" :error="errors[0]">
+							<input v-model="stripe.credentials.key" :placeholder="$t('admin_settings.payments.stripe_pub_key_plac')" type="text" :class="{'border-red': errors[0]}" class="focus-border-theme input-dark" />
+						</AppInputText>
+					</ValidationProvider>
+					<ValidationProvider tag="div" mode="passive" name="Secret Key" rules="required" v-slot="{ errors }">
+						<AppInputText :title="$t('admin_settings.payments.stripe_sec_key')" :error="errors[0]">
+							<input v-model="stripe.credentials.secret" :placeholder="$t('admin_settings.payments.stripe_sec_key_plac')" type="text" :class="{'border-red': errors[0]}" class="focus-border-theme input-dark" />
+						</AppInputText>
+					</ValidationProvider>
+
+					<ButtonBase :disabled="isLoading" :loading="isLoading" button-style="theme" type="submit" class="w-full">
+						{{ $t('Store Stripe Credentials') }}
+					</ButtonBase>
+				</ValidationObserver>
 			</div>
-		</PageTabGroup>
-
-		<!--Stripe Set up-->
-		<PageTabGroup v-if="! config.stripe_public_key">
-			<ValidationObserver @submit.prevent="stripeCredentialsSubmit" ref="stripeCredentials" v-slot="{ invalid }" tag="form" class="card shadow-card">
-				<FormLabel>
-					{{ $t('admin_settings.payments.stripe_setup') }}
-				</FormLabel>
-				<InfoBox>
-					<p v-html="$t('admin_settings.payments.stripe_create_acc')"></p>
-				</InfoBox>
-				<ValidationProvider tag="div" mode="passive" name="Currency" rules="required" v-slot="{ errors }">
-					<AppInputText :title="$t('admin_settings.payments.stripe_currency')" :error="errors[0]">
-						<SelectInput v-model="stripeCredentials.currency" :options="currencyList" :placeholder="$t('admin_settings.payments.stripe_currency_plac')" :isError="errors[0]" />
-					</AppInputText>
-				</ValidationProvider>
-				<ValidationProvider tag="div" mode="passive" name="Publishable Key" rules="required" v-slot="{ errors }">
-					<AppInputText :title="$t('admin_settings.payments.stripe_pub_key')" :error="errors[0]">
-						<input v-model="stripeCredentials.key" :placeholder="$t('admin_settings.payments.stripe_pub_key_plac')" type="text" :class="{'border-red-700': errors[0]}" class="focus-border-theme input-dark" />
-					</AppInputText>
-				</ValidationProvider>
-				<ValidationProvider tag="div" mode="passive" name="Secret Key" rules="required" v-slot="{ errors }">
-					<AppInputText :title="$t('admin_settings.payments.stripe_sec_key')" :error="errors[0]">
-						<input v-model="stripeCredentials.secret" :placeholder="$t('admin_settings.payments.stripe_sec_key_plac')" type="text" :class="{'border-red-700': errors[0]}" class="focus-border-theme input-dark" />
-					</AppInputText>
-				</ValidationProvider>
-				<ValidationProvider tag="div" mode="passive" name="Webhook URL" rules="required" v-slot="{ errors }">
-					<AppInputText :title="$t('Webhook URL')" :error="errors[0]">
-						<InfoBox>
-							<p v-html="$t('admin_settings.payments.stripe_create_webhook')"></p>
-						</InfoBox>
-						<input :value="stripeWebhookEndpoint" type="text" class="focus-border-theme input-dark" disabled />
-					</AppInputText>
-				</ValidationProvider>
-				<ValidationProvider tag="div" mode="passive" name="Webhook Secret" rules="required" v-slot="{ errors }">
-					<AppInputText :title="$t('Webhook Secret')" :error="errors[0]">
-						<input v-model="stripeCredentials.webhookSecret" :placeholder="$t('admin_settings.payments.stripe_webhook_key_plac')" type="text" :class="{'border-red-700': errors[0]}" class="focus-border-theme input-dark" />
-					</AppInputText>
-				</ValidationProvider>
-				<InfoBox v-if="isError" type="error">
-					<p>{{ errorMessage }}</p>
-				</InfoBox>
-				<ButtonBase :loading="isLoading" :disabled="isLoading" type="submit"
-							button-style="theme" class="submit-button">
-					{{ submitButtonText }}
-				</ButtonBase>
-			</ValidationObserver>
-		</PageTabGroup>
+		</div>
 	</PageTab>
 </template>
 
 <script>
-	import AppInputText from "../../../../components/Admin/AppInputText";
+    import {
+		Edit2Icon,
+	} from 'vue-feather-icons'
 	import {ValidationProvider, ValidationObserver} from 'vee-validate/dist/vee-validate.full'
 	import PageTabGroup from '/resources/js/components/Others/Layout/PageTabGroup'
 	import SelectInput from '/resources/js/components/Others/Forms/SelectInput'
 	import SwitchInput from '/resources/js/components/Others/Forms/SwitchInput'
 	import ImageInput from '/resources/js/components/Others/Forms/ImageInput'
+	import AppInputSwitch from "../../../../components/Admin/AppInputSwitch"
 	import FormLabel from '/resources/js/components/Others/Forms/FormLabel'
 	import ButtonBase from '/resources/js/components/FilesView/ButtonBase'
+	import CopyInput from "../../../../components/Others/Forms/CopyInput"
 	import SetupBox from '/resources/js/components/Others/Forms/SetupBox'
+	import AppInputText from "../../../../components/Admin/AppInputText"
 	import PageTab from '/resources/js/components/Others/Layout/PageTab'
 	import InfoBox from '/resources/js/components/Others/Forms/InfoBox'
 	import {required} from 'vee-validate/dist/rules'
-	import {mapGetters} from 'vuex'
 	import {events} from '/resources/js/bus'
+	import {mapGetters} from 'vuex'
 	import axios from 'axios'
-	import AppInputSwitch from "../../../../components/Admin/AppInputSwitch";
 
 	export default {
 		name: 'AppPayments',
 		components: {
-			AppInputSwitch,
-			AppInputText,
 			ValidationObserver,
 			ValidationProvider,
+			AppInputSwitch,
+			AppInputText,
 			PageTabGroup,
 			SwitchInput,
 			SelectInput,
 			ImageInput,
 			ButtonBase,
+			CopyInput,
 			FormLabel,
+			Edit2Icon,
 			SetupBox,
 			required,
 			PageTab,
 			InfoBox,
 		},
 		computed: {
-			...mapGetters(['config', 'currencyList']),
+			...mapGetters([
+				'subscriptionTypes',
+				'config',
+			]),
 			stripeWebhookEndpoint() {
-				return this.config.host + '/stripe/webhook'
+				return `${this.config.host}/api/subscriptions/stripe/webhook`
 			},
 			submitButtonText() {
 				return this.isLoading ? this.$t('admin_settings.payments.button_testing') : this.$t('admin_settings.payments.button_submit')
@@ -118,12 +125,16 @@
 				isLoading: true,
 				isError: false,
 				errorMessage: '',
-				payments: undefined,
-				stripeCredentials: {
-					key: '',
-					secret: '',
-					webhookSecret: '',
-					currency: '',
+				allowedPayments: true,
+				stripe: {
+					allowStripe: true,
+					isConfigured: true,
+					isVisibleCredentialsForm: false,
+					paymentDescription: undefined,
+					credentials: {
+						key: undefined,
+						secret: undefined,
+					}
 				},
 			}
 		},
diff --git a/resources/js/views/Admin/Languages/Language.vue b/resources/js/views/Admin/Languages/Language.vue
index aada44fa..cb2866a9 100644
--- a/resources/js/views/Admin/Languages/Language.vue
+++ b/resources/js/views/Admin/Languages/Language.vue
@@ -64,7 +64,7 @@
 
 						<ValidationProvider tag="div" mode="passive" name="Language name" rules="required" v-slot="{ errors }">
 							<AppInputText :title="$t('language_name')" :error="errors[0]">
-								<input @input="$updateText(`/admin/languages/${selectedLanguage.data.id}`, 'name', selectedLanguage.data.attributes.name)" v-model="selectedLanguage.data.attributes.name" :placeholder="$t('admin_settings.appearance.description_plac')" type="text" :class="{'border-red-700': errors[0]}" class="focus-border-theme input-dark" />
+								<input @input="$updateText(`/admin/languages/${selectedLanguage.data.id}`, 'name', selectedLanguage.data.attributes.name)" v-model="selectedLanguage.data.attributes.name" :placeholder="$t('admin_settings.appearance.description_plac')" type="text" :class="{'border-red': errors[0]}" class="focus-border-theme input-dark" />
 							</AppInputText>
 						</ValidationProvider>
 
@@ -100,7 +100,7 @@
 									@input="$updateText(`/admin/languages/${selectedLanguage.data.id}/strings`, key, selectedLanguage.data.attributes.translations[key])"
 									:rows="selectedLanguage.data.attributes.translations[key].length >= 80 ? 3 : 1"
 									class="focus-border-theme input-dark"
-									:class="{'border-red-700': errors[0]}"
+									:class="{'border-red': errors[0]}"
 								></textarea>
 							</AppInputText>
 						</ValidationProvider>
diff --git a/resources/js/views/Admin/Plans/Create/CreateFixedPlan.vue b/resources/js/views/Admin/Plans/Create/CreateFixedPlan.vue
index 5439b2a5..198b7fc2 100644
--- a/resources/js/views/Admin/Plans/Create/CreateFixedPlan.vue
+++ b/resources/js/views/Admin/Plans/Create/CreateFixedPlan.vue
@@ -9,14 +9,14 @@
 			<!--Name-->
 			<ValidationProvider tag="div" mode="passive" name="Name" rules="required" v-slot="{ errors }">
 				<AppInputText :title="$t('admin_page_plans.form.name')">
-					<input v-model="plan.name" :placeholder="$t('admin_page_plans.form.name_plac')" type="text" :class="{'border-red-700': errors[0]}" class="focus-border-theme input-dark" />
+					<input v-model="plan.name" :placeholder="$t('admin_page_plans.form.name_plac')" type="text" :class="{'border-red': errors[0]}" class="focus-border-theme input-dark" />
 				</AppInputText>
 			</ValidationProvider>
 
 			<!--Description-->
 			<ValidationProvider tag="div" mode="passive" name="Description" v-slot="{ errors }">
 				<AppInputText :title="$t('admin_page_plans.form.description')" :is-last="true">
-					<textarea v-model="plan.description" :placeholder="$t('admin_page_plans.form.description_plac')" :class="{'border-red-700': errors[0]}" class="focus-border-theme input-dark"></textarea>
+					<textarea v-model="plan.description" :placeholder="$t('admin_page_plans.form.description_plac')" :class="{'border-red': errors[0]}" class="focus-border-theme input-dark"></textarea>
 				</AppInputText>
 			</ValidationProvider>
 		</div>
@@ -30,7 +30,7 @@
 				<!--Price-->
 				<ValidationProvider tag="div" mode="passive" name="Price" rules="required" v-slot="{ errors }" class="w-full">
 					<AppInputText :title="$t('admin_page_plans.form.price')" class="w-full">
-						<input v-model="plan.amount" :placeholder="$t('admin_page_plans.form.price_plac')" type="number" step="0.01" min="1" max="999999999999" :class="{'border-red-700': errors[0]}" class="focus-border-theme input-dark" />
+						<input v-model="plan.amount" :placeholder="$t('admin_page_plans.form.price_plac')" type="number" step="0.01" min="1" max="999999999999" :class="{'border-red': errors[0]}" class="focus-border-theme input-dark" />
 					</AppInputText>
 				</ValidationProvider>
 
@@ -58,14 +58,14 @@
 			<!--Storage Capacity-->
 			<ValidationProvider tag="div" mode="passive" name="Max Storage Capacity" rules="required" v-slot="{ errors }">
 				<AppInputText :title="$t('admin_page_plans.form.storage')" :description="$t('admin_page_plans.form.storage_helper')">
-					<input v-model="plan.features.max_storage_amount" :placeholder="$t('admin_page_plans.form.storage_plac')" type="number" min="1" max="999999999" :class="{'border-red-700': errors[0]}" class="focus-border-theme input-dark" />
+					<input v-model="plan.features.max_storage_amount" :placeholder="$t('admin_page_plans.form.storage_plac')" type="number" min="1" max="999999999" :class="{'border-red': errors[0]}" class="focus-border-theme input-dark" />
 				</AppInputText>
 			</ValidationProvider>
 
 			<!--Team Members-->
 			<ValidationProvider tag="div" mode="passive" name="Max Team Members" rules="required" v-slot="{ errors }">
 				<AppInputText :title="$t('Team Members')" :description="$t('To set unlimited team members, type -1 into form')" :is-last="true">
-					<input v-model="plan.features.max_team_members" :placeholder="$t('Add max team members in number')" type="number" min="1" max="999999999" :class="{'border-red-700': errors[0]}" class="focus-border-theme input-dark" />
+					<input v-model="plan.features.max_team_members" :placeholder="$t('Add max team members in number')" type="number" min="1" max="999999999" :class="{'border-red': errors[0]}" class="focus-border-theme input-dark" />
 				</AppInputText>
 			</ValidationProvider>
 		</div>
diff --git a/resources/js/views/Admin/Plans/Create/CreateMeteredPlan.vue b/resources/js/views/Admin/Plans/Create/CreateMeteredPlan.vue
index 16604219..5d7620ee 100644
--- a/resources/js/views/Admin/Plans/Create/CreateMeteredPlan.vue
+++ b/resources/js/views/Admin/Plans/Create/CreateMeteredPlan.vue
@@ -9,14 +9,14 @@
 			<!--Name-->
 			<ValidationProvider tag="div" mode="passive" name="Name" rules="required" v-slot="{ errors }">
 				<AppInputText :title="$t('admin_page_plans.form.name')">
-					<input v-model="plan.name" :placeholder="$t('admin_page_plans.form.name_plac')" type="text" :class="{'border-red-700': errors[0]}" class="focus-border-theme input-dark" />
+					<input v-model="plan.name" :placeholder="$t('admin_page_plans.form.name_plac')" type="text" :class="{'border-red': errors[0]}" class="focus-border-theme input-dark" />
 				</AppInputText>
 			</ValidationProvider>
 
 			<!--Description-->
 			<ValidationProvider tag="div" mode="passive" name="Description" v-slot="{ errors }">
 				<AppInputText :title="$t('admin_page_plans.form.description')">
-					<textarea v-model="plan.description" :placeholder="$t('admin_page_plans.form.description_plac')" :class="{'border-red-700': errors[0]}" class="focus-border-theme input-dark"></textarea>
+					<textarea v-model="plan.description" :placeholder="$t('admin_page_plans.form.description_plac')" :class="{'border-red': errors[0]}" class="focus-border-theme input-dark"></textarea>
 				</AppInputText>
 			</ValidationProvider>
 
@@ -41,7 +41,7 @@
 
 				<ValidationProvider v-if="plan.features.bandwidth.active" class="-mt-3" tag="div" mode="passive" name="Bandwidth Price" rules="required" v-slot="{ errors }">
 					<AppInputText class="w-full">
-						<input v-model="plan.features.bandwidth.per_unit" :placeholder="$t('Type the price per 1GB...')" type="number" step="0.01" min="0.01" max="999999999999" :class="{'border-red-700': errors[0]}" class="focus-border-theme input-dark" />
+						<input v-model="plan.features.bandwidth.per_unit" :placeholder="$t('Type the price per 1GB...')" type="number" step="0.01" min="0.01" max="999999999999" :class="{'border-red': errors[0]}" class="focus-border-theme input-dark" />
 					</AppInputText>
 				</ValidationProvider>
 			</div>
@@ -55,7 +55,7 @@
 
 			<ValidationProvider v-if="plan.features.storage.active" class="-mt-3" tag="div" mode="passive" name="Storage Price" rules="required" v-slot="{ errors }">
 				<AppInputText class="w-full">
-					<input v-model="plan.features.storage.per_unit" :placeholder="$t('Type the price per 1GB...')" type="number" step="0.01" min="0.01" max="999999999999" :class="{'border-red-700': errors[0]}" class="focus-border-theme input-dark" />
+					<input v-model="plan.features.storage.per_unit" :placeholder="$t('Type the price per 1GB...')" type="number" step="0.01" min="0.01" max="999999999999" :class="{'border-red': errors[0]}" class="focus-border-theme input-dark" />
 				</AppInputText>
 			</ValidationProvider>
 
@@ -68,7 +68,7 @@
 
 			<ValidationProvider v-if="plan.features.member.active" class="-mt-3" tag="div" mode="passive" name="Member Price" rules="required" v-slot="{ errors }">
 				<AppInputText class="w-full">
-					<input v-model="plan.features.member.per_unit" :placeholder="$t('Type the price per 1 member...')" type="number" step="0.01" min="0.01" max="999999999999" :class="{'border-red-700': errors[0]}" class="focus-border-theme input-dark" />
+					<input v-model="plan.features.member.per_unit" :placeholder="$t('Type the price per 1 member...')" type="number" step="0.01" min="0.01" max="999999999999" :class="{'border-red': errors[0]}" class="focus-border-theme input-dark" />
 				</AppInputText>
 			</ValidationProvider>
 
@@ -80,7 +80,7 @@
 
 				<ValidationProvider v-if="plan.features.flatFee.active" class="-mt-3" tag="div" mode="passive" name="FlatFee Price" rules="required" v-slot="{ errors }">
 					<AppInputText class="w-full" :is-last="true">
-						<input v-model="plan.features.flatFee.per_unit" :placeholder="$t('Type the price...')" type="number" step="0.01" min="0.01" max="999999999999" :class="{'border-red-700': errors[0]}" class="focus-border-theme input-dark" />
+						<input v-model="plan.features.flatFee.per_unit" :placeholder="$t('Type the price...')" type="number" step="0.01" min="0.01" max="999999999999" :class="{'border-red': errors[0]}" class="focus-border-theme input-dark" />
 					</AppInputText>
 				</ValidationProvider>
 			</div>
diff --git a/resources/js/views/Admin/Plans/Tabs/PlanDelete.vue b/resources/js/views/Admin/Plans/Tabs/PlanDelete.vue
index 46ba1a5f..ea9fba17 100644
--- a/resources/js/views/Admin/Plans/Tabs/PlanDelete.vue
+++ b/resources/js/views/Admin/Plans/Tabs/PlanDelete.vue
@@ -7,7 +7,7 @@
 			<ValidationProvider tag="div" v-slot="{ errors }" mode="passive" name="Plan name" :rules="'required|is:' + plan.attributes.name">
 				<AppInputText :title="$t('admin_page_user.label_delete_user', {user: plan.attributes.name})" :description="$t('admin_page_plans.disclaimer_delete_plan')" :error="errors[0]" :is-last="true">
 					<div class="sm:flex sm:space-x-4 sm:space-y-0 space-y-4">
-						<input v-model="planName" :placeholder="$t('admin_page_plans.form.name_delete_plac')" type="text" :class="{'border-red-700': errors[0]}" class="focus-border-theme input-dark" />
+						<input v-model="planName" :placeholder="$t('admin_page_plans.form.name_delete_plac')" type="text" :class="{'border-red': errors[0]}" class="focus-border-theme input-dark" />
 						<ButtonBase :loading="isSendingRequest" :disabled="isSendingRequest" type="submit" button-style="danger" class="sm:w-auto w-full">
 							{{ $t('admin_page_plans.delete_plan_button') }}
 						</ButtonBase>
diff --git a/resources/js/views/Admin/Users/UserCreate.vue b/resources/js/views/Admin/Users/UserCreate.vue
index 7c3d8e8a..63836110 100644
--- a/resources/js/views/Admin/Users/UserCreate.vue
+++ b/resources/js/views/Admin/Users/UserCreate.vue
@@ -13,14 +13,14 @@
 			<!--Email-->
             <ValidationProvider tag="div" mode="passive" name="email" rules="required" v-slot="{ errors }">
                 <AppInputText :title="$t('page_registration.label_email')" :error="errors[0]">
-                    <input v-model="user.email" :placeholder="$t('admin_page_user.create_user.label_email')" type="email" class="focus-border-theme input-dark" :class="{'border-red-700': errors[0]}"/>
+                    <input v-model="user.email" :placeholder="$t('admin_page_user.create_user.label_email')" type="email" class="focus-border-theme input-dark" :class="{'border-red': errors[0]}"/>
                 </AppInputText>
             </ValidationProvider>
 
 			<!--Name-->
             <ValidationProvider tag="div" mode="passive" name="user name" rules="required" v-slot="{ errors }">
                 <AppInputText :title="$t('page_registration.label_name')" :error="errors[0]">
-                    <input v-model="user.name" :placeholder="$t('admin_page_user.create_user.label_name')" type="text" class="focus-border-theme input-dark" :class="{'border-red-700': errors[0]}"/>
+                    <input v-model="user.name" :placeholder="$t('admin_page_user.create_user.label_name')" type="text" class="focus-border-theme input-dark" :class="{'border-red': errors[0]}"/>
                 </AppInputText>
             </ValidationProvider>
 
@@ -28,12 +28,12 @@
             <div class="flex space-x-4">
                 <ValidationProvider tag="div" mode="passive" name="password" rules="required" v-slot="{ errors }" class="w-full">
                     <AppInputText :title="$t('page_registration.label_pass')" :error="errors[0]">
-                        <input v-model="user.password" :placeholder="$t('page_registration.placeholder_pass')" type="password" class="focus-border-theme input-dark" :class="{'border-red-700': errors[0]}"/>
+                        <input v-model="user.password" :placeholder="$t('page_registration.placeholder_pass')" type="password" class="focus-border-theme input-dark" :class="{'border-red': errors[0]}"/>
                     </AppInputText>
                 </ValidationProvider>
                 <ValidationProvider tag="div" mode="passive" name="password confirm" rules="required" v-slot="{ errors }" class="w-full">
                     <AppInputText :title="$t('page_registration.label_confirm_pass')" :error="errors[0]">
-                        <input v-model="user.password_confirmation" :placeholder="$t('admin_page_user.create_user.label_conf_pass')" type="password" class="focus-border-theme input-dark" :class="{'border-red-700': errors[0]}"/>
+                        <input v-model="user.password_confirmation" :placeholder="$t('admin_page_user.create_user.label_conf_pass')" type="password" class="focus-border-theme input-dark" :class="{'border-red': errors[0]}"/>
                     </AppInputText>
                 </ValidationProvider>
             </div>
@@ -51,7 +51,7 @@
 			<!--Storage Capacity-->
             <ValidationProvider tag="div" mode="passive" name="storage capacity" rules="required" v-slot="{ errors }">
                 <AppInputText :title="$t('admin_page_user.label_change_capacity')" :error="errors[0]">
-                    <input v-model="user.max_storage_amount" min="1" max="999999999" :placeholder="$t('admin_page_user.label_change_capacity')" type="number" class="focus-border-theme input-dark" :class="{'border-red-700': errors[0]}"/>
+                    <input v-model="user.max_storage_amount" min="1" max="999999999" :placeholder="$t('admin_page_user.label_change_capacity')" type="number" class="focus-border-theme input-dark" :class="{'border-red': errors[0]}"/>
                 </AppInputText>
             </ValidationProvider>
         </div>
diff --git a/resources/js/views/Admin/Users/UserTabs/UserDelete.vue b/resources/js/views/Admin/Users/UserTabs/UserDelete.vue
index e12fc033..a793c5c8 100644
--- a/resources/js/views/Admin/Users/UserTabs/UserDelete.vue
+++ b/resources/js/views/Admin/Users/UserTabs/UserDelete.vue
@@ -11,7 +11,7 @@
 							   :placeholder="$t('admin_page_user.placeholder_delete_user')"
 							   type="text"
 							   class="focus-border-theme input-dark"
-							   :class="{'border-red-700': errors[0]}"
+							   :class="{'border-red': errors[0]}"
 						/>
 						<ButtonBase :loading="isSendingRequest" :disabled="isSendingRequest" type="submit" button-style="danger" class="sm:w-auto w-full">
 							{{ $t('admin_page_user.delete_user') }}
diff --git a/resources/js/views/Admin/Users/UserTabs/UserMeteredSubscription.vue b/resources/js/views/Admin/Users/UserTabs/UserMeteredSubscription.vue
index 5fc1ce6d..ecb2a617 100644
--- a/resources/js/views/Admin/Users/UserTabs/UserMeteredSubscription.vue
+++ b/resources/js/views/Admin/Users/UserTabs/UserMeteredSubscription.vue
@@ -20,7 +20,7 @@
 								   min="1"
 								   max="999999999"
 								   class="focus-border-theme input-dark"
-								   :class="{'border-red-700': errors[0]}"
+								   :class="{'border-red': errors[0]}"
 							/>
 							<ButtonBase type="submit" button-style="theme" class="submit-button"
 								:loading="isUpdatingBalanceAmount"
diff --git a/resources/js/views/Admin/Users/UserTabs/UserStorage.vue b/resources/js/views/Admin/Users/UserTabs/UserStorage.vue
index b4fd74f1..a7884efb 100644
--- a/resources/js/views/Admin/Users/UserTabs/UserStorage.vue
+++ b/resources/js/views/Admin/Users/UserTabs/UserStorage.vue
@@ -67,7 +67,7 @@
 								   min="1"
 								   max="999999999"
 								   class="focus-border-theme input-dark"
-								   :class="{'border-red-700': errors[0]}"
+								   :class="{'border-red': errors[0]}"
 							/>
 							<ButtonBase :loading="isSendingRequest" :disabled="isSendingRequest" type="submit" button-style="theme" class="submit-button">
 								{{ $t('admin_page_user.change_capacity') }}
diff --git a/resources/js/views/Auth/CreateNewPassword.vue b/resources/js/views/Auth/CreateNewPassword.vue
index 6fca553e..af9ac0da 100644
--- a/resources/js/views/Auth/CreateNewPassword.vue
+++ b/resources/js/views/Auth/CreateNewPassword.vue
@@ -16,7 +16,7 @@
                     <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="E-Mail" rules="required"
                                         v-slot="{ errors }">
                         <input v-model="recoverPassword.email" :placeholder="$t('page_login.placeholder_email')" type="email"
-                               :class="{'border-red-700': errors[0]}"/>
+                               :class="{'border-red': errors[0]}"/>
                         <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                     </ValidationProvider>
                 </div>
@@ -26,7 +26,7 @@
                     <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="New Password"
                                         rules="required" v-slot="{ errors }">
                         <input v-model="recoverPassword.newPassword" :placeholder="$t('page_create_password.label_new_pass')" type="password"
-                               :class="{'border-red-700': errors[0]}"/>
+                               :class="{'border-red': errors[0]}"/>
                         <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                     </ValidationProvider>
                 </div>
@@ -36,7 +36,7 @@
                     <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="Confirm Password"
                                         rules="required" v-slot="{ errors }">
                         <input v-model="recoverPassword.newPasswordConfirm" :placeholder="$t('page_create_password.label_confirm_pass')"
-                               type="password" :class="{'border-red-700': errors[0]}"/>
+                               type="password" :class="{'border-red': errors[0]}"/>
                         <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                     </ValidationProvider>
                 </div>
diff --git a/resources/js/views/Auth/ForgottenPassword.vue b/resources/js/views/Auth/ForgottenPassword.vue
index 0ed6d818..0066edc5 100644
--- a/resources/js/views/Auth/ForgottenPassword.vue
+++ b/resources/js/views/Auth/ForgottenPassword.vue
@@ -14,7 +14,7 @@
                                     v-slot="{ errors }">
                     <input v-model="recoverEmail" :placeholder="$t('page_login.placeholder_email')" type="email"
                            class="focus-border-theme"
-                           :class="{'border-red-700': errors[0]}"/>
+                           :class="{'border-red': errors[0]}"/>
                     <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                 </ValidationProvider>
 
diff --git a/resources/js/views/Auth/SignIn.vue b/resources/js/views/Auth/SignIn.vue
index 82588bc7..3ed819c1 100644
--- a/resources/js/views/Auth/SignIn.vue
+++ b/resources/js/views/Auth/SignIn.vue
@@ -14,7 +14,7 @@
                                     v-slot="{ errors }">
                     <input v-model="loginEmail" :placeholder="$t('page_login.placeholder_email')" type="email"
                            class="focus-border-theme"
-                           :class="{'border-red-700': errors[0]}" />
+                           :class="{'border-red': errors[0]}" />
                     <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                 </ValidationProvider>
 
@@ -46,7 +46,7 @@
                     <input v-model="loginPassword" :placeholder="$t('page_sign_in.placeholder_password')"
                            type="password"
                            class="focus-border-theme"
-                           :class="{'border-red-700': errors[0]}" />
+                           :class="{'border-red': errors[0]}" />
                     <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                 </ValidationProvider>
 
@@ -92,7 +92,7 @@
                            type="text"
                            maxlength="6"
                            class="focus-border-theme"
-                           :class="{'border-red-700': errors[0]}" />
+                           :class="{'border-red': errors[0]}" />
                     <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                 </ValidationProvider>
 
@@ -128,7 +128,7 @@
                            type="text"
                            maxlength="21"
                            class="focus-border-theme"
-                           :class="{'border-red-700': errors[0]}" />
+                           :class="{'border-red': errors[0]}" />
                     <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                 </ValidationProvider>
 
diff --git a/resources/js/views/Auth/SignUp.vue b/resources/js/views/Auth/SignUp.vue
index d8369b98..351b88a6 100644
--- a/resources/js/views/Auth/SignUp.vue
+++ b/resources/js/views/Auth/SignUp.vue
@@ -15,7 +15,7 @@
                                         v-slot="{ errors }">
                         <input v-model="register.email" :placeholder="$t('page_registration.placeholder_email')" type="email"
                                class="focus-border-theme"
-                               :class="{'border-red-700': errors[0]}"/>
+                               :class="{'border-red': errors[0]}"/>
                         <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                     </ValidationProvider>
                 </div>
@@ -26,7 +26,7 @@
                                         v-slot="{ errors }">
                         <input v-model="register.name" :placeholder="$t('page_registration.placeholder_name')" type="text"
                                class="focus-border-theme"
-                               :class="{'border-red-700': errors[0]}"/>
+                               :class="{'border-red': errors[0]}"/>
                         <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                     </ValidationProvider>
                 </div>
@@ -37,7 +37,7 @@
                                         rules="required" v-slot="{ errors }">
                         <input v-model="register.password" :placeholder="$t('page_registration.placeholder_pass')" type="password"
                                class="focus-border-theme"
-                               :class="{'border-red-700': errors[0]}"/>
+                               :class="{'border-red': errors[0]}"/>
                         <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                     </ValidationProvider>
                 </div>
@@ -48,7 +48,7 @@
                                         rules="required" v-slot="{ errors }">
                         <input v-model="register.password_confirmation" :placeholder="$t('page_registration.placeholder_confirm_pass')"
                                class="focus-border-theme"
-                               type="password" :class="{'border-red-700': errors[0]}"/>
+                               type="password" :class="{'border-red': errors[0]}"/>
                         <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                     </ValidationProvider>
                 </div>
diff --git a/resources/js/views/Frontpage/ContactUs.vue b/resources/js/views/Frontpage/ContactUs.vue
index 349757b9..47bebeb8 100644
--- a/resources/js/views/Frontpage/ContactUs.vue
+++ b/resources/js/views/Frontpage/ContactUs.vue
@@ -23,7 +23,7 @@
                                         v-slot="{ errors }">
                         <input v-model="contact.email" :placeholder="$t('page_contact_us.form.email_plac')" type="email"
                                class="focus-border-theme"
-                               :class="{'border-red-700': errors[0]}"/>
+                               :class="{'border-red': errors[0]}"/>
                         <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                     </ValidationProvider>
                 </div>
@@ -34,7 +34,7 @@
                                         v-slot="{ errors }">
                         <textarea v-model="contact.message" :placeholder="$t('page_contact_us.form.message_plac')" rows="6"
                                   class="focus-border-theme"
-                                  :class="{'border-red-700': errors[0]}"
+                                  :class="{'border-red': errors[0]}"
                         ></textarea>
                         <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                     </ValidationProvider>
diff --git a/resources/js/views/SetupWizard/AdminAccount.vue b/resources/js/views/SetupWizard/AdminAccount.vue
index 862d5adc..76ca22d0 100644
--- a/resources/js/views/SetupWizard/AdminAccount.vue
+++ b/resources/js/views/SetupWizard/AdminAccount.vue
@@ -22,7 +22,7 @@
                 <div class="block-wrapper">
                     <label>Full Name:</label>
                     <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="Full Name" rules="required" v-slot="{ errors }">
-                        <input v-model="admin.name" placeholder="Type your full name" type="text" :class="{'border-red-700': errors[0]}" />
+                        <input v-model="admin.name" placeholder="Type your full name" type="text" :class="{'border-red': errors[0]}" />
                         <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                     </ValidationProvider>
                 </div>
@@ -30,7 +30,7 @@
                 <div class="block-wrapper">
                     <label>Email:</label>
                     <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="Email" rules="required" v-slot="{ errors }">
-                        <input v-model="admin.email" placeholder="Type your email" type="email" :class="{'border-red-700': errors[0]}" />
+                        <input v-model="admin.email" placeholder="Type your email" type="email" :class="{'border-red': errors[0]}" />
                         <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                     </ValidationProvider>
                 </div>
@@ -38,7 +38,7 @@
                 <div class="block-wrapper">
                     <label>Password:</label>
                     <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="Password" rules="required|confirmed:confirmation" v-slot="{ errors }">
-                        <input v-model="admin.password" placeholder="Type your password" type="password" :class="{'border-red-700': errors[0]}" />
+                        <input v-model="admin.password" placeholder="Type your password" type="password" :class="{'border-red': errors[0]}" />
                         <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                     </ValidationProvider>
                 </div>
@@ -46,7 +46,7 @@
                 <div class="block-wrapper">
                     <label>Password Confirmation:</label>
                     <ValidationProvider tag="div" class="input-wrapper" name="confirmation" rules="required" vid="confirmation" v-slot="{ errors }">
-                        <input v-model="admin.password_confirmation" placeholder="Confirm your password" type="password" :class="{'border-red-700': errors[0]}" />
+                        <input v-model="admin.password_confirmation" placeholder="Confirm your password" type="password" :class="{'border-red': errors[0]}" />
                         <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                     </ValidationProvider>
                 </div>
diff --git a/resources/js/views/SetupWizard/AppSetup.vue b/resources/js/views/SetupWizard/AppSetup.vue
index 91efd147..879522ba 100644
--- a/resources/js/views/SetupWizard/AppSetup.vue
+++ b/resources/js/views/SetupWizard/AppSetup.vue
@@ -18,7 +18,7 @@
                 <div class="block-wrapper">
                     <label>App Title:</label>
                     <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="App Title" rules="required" v-slot="{ errors }">
-                        <input v-model="app.title" placeholder="Type your app title" type="text" :class="{'border-red-700': errors[0]}"/>
+                        <input v-model="app.title" placeholder="Type your app title" type="text" :class="{'border-red': errors[0]}"/>
                         <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                     </ValidationProvider>
                 </div>
@@ -26,7 +26,7 @@
                 <div class="block-wrapper">
                     <label>App Description:</label>
                     <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="App Description" rules="required" v-slot="{ errors }">
-                        <input v-model="app.description" placeholder="Type your app description" type="text" :class="{'border-red-700': errors[0]}"/>
+                        <input v-model="app.description" placeholder="Type your app description" type="text" :class="{'border-red': errors[0]}"/>
                         <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                     </ValidationProvider>
                 </div>
@@ -74,7 +74,7 @@
                     <label>Contact Email:</label>
                     <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="Contact Email"
                                         rules="required" v-slot="{ errors }">
-                        <input v-model="app.contactMail" placeholder="Type your contact email" type="email" :class="{'border-red-700': errors[0]}"/>
+                        <input v-model="app.contactMail" placeholder="Type your contact email" type="email" :class="{'border-red': errors[0]}"/>
                         <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                     </ValidationProvider>
                 </div>
@@ -84,7 +84,7 @@
                     <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="Google Analytics Code"
                                         v-slot="{ errors }">
                         <input v-model="app.googleAnalytics" placeholder="Paste your Google Analytics Code"
-                               type="text" :class="{'border-red-700': errors[0]}"/>
+                               type="text" :class="{'border-red': errors[0]}"/>
                         <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                     </ValidationProvider>
                 </div>
@@ -109,7 +109,7 @@
                                max="999999999"
                                placeholder="Set default storage space in GB"
                                type="number"
-                               :class="{'border-red-700': errors[0]}"
+                               :class="{'border-red': errors[0]}"
                         />
                         <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                     </ValidationProvider>
diff --git a/resources/js/views/SetupWizard/BillingsDetail.vue b/resources/js/views/SetupWizard/BillingsDetail.vue
index 6852d766..136650ed 100644
--- a/resources/js/views/SetupWizard/BillingsDetail.vue
+++ b/resources/js/views/SetupWizard/BillingsDetail.vue
@@ -19,7 +19,7 @@
                     <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="Billing Name"
                                         rules="required" v-slot="{ errors }">
                         <input v-model="billingInformation.billing_name" placeholder="Type your company name"
-                               type="text" :class="{'border-red-700': errors[0]}"/>
+                               type="text" :class="{'border-red': errors[0]}"/>
                         <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                     </ValidationProvider>
                 </div>
@@ -29,7 +29,7 @@
                     <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="Billing Vat Number"
                                         rules="required" v-slot="{ errors }">
                         <input v-model="billingInformation.billing_vat_number" placeholder="Type your VAT number"
-                               type="text" :class="{'border-red-700': errors[0]}"/>
+                               type="text" :class="{'border-red': errors[0]}"/>
                         <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                     </ValidationProvider>
                 </div>
@@ -50,7 +50,7 @@
                     <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="Billing Address"
                                         rules="required" v-slot="{ errors }">
                         <input v-model="billingInformation.billing_address" placeholder="Type your billing address"
-                               type="text" :class="{'border-red-700': errors[0]}"/>
+                               type="text" :class="{'border-red': errors[0]}"/>
                         <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                     </ValidationProvider>
                 </div>
@@ -61,7 +61,7 @@
                         <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="Billing City"
                                             rules="required" v-slot="{ errors }">
                             <input v-model="billingInformation.billing_city" placeholder="Type your billing city"
-                                   type="text" :class="{'border-red-700': errors[0]}"/>
+                                   type="text" :class="{'border-red': errors[0]}"/>
                             <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                         </ValidationProvider>
                     </div>
@@ -70,7 +70,7 @@
                         <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="Billing Postal Code"
                                             rules="required" v-slot="{ errors }">
                             <input v-model="billingInformation.billing_postal_code"
-                                   placeholder="Type your billing postal code" type="text" :class="{'border-red-700': errors[0]}"/>
+                                   placeholder="Type your billing postal code" type="text" :class="{'border-red': errors[0]}"/>
                             <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                         </ValidationProvider>
                     </div>
@@ -81,7 +81,7 @@
                     <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="Billing State"
                                         rules="required" v-slot="{ errors }">
                         <input v-model="billingInformation.billing_state" placeholder="Type your billing state"
-                               type="text" :class="{'border-red-700': errors[0]}"/>
+                               type="text" :class="{'border-red': errors[0]}"/>
                         <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                     </ValidationProvider>
                 </div>
@@ -91,7 +91,7 @@
                     <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="Billing Phone Number"
                                         v-slot="{ errors }">
                         <input v-model="billingInformation.billing_phone_number" placeholder="Type your billing phone number"
-                               type="text" :class="{'border-red-700': errors[0]}"/>
+                               type="text" :class="{'border-red': errors[0]}"/>
                         <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                     </ValidationProvider>
                 </div>
diff --git a/resources/js/views/SetupWizard/Database.vue b/resources/js/views/SetupWizard/Database.vue
index bf799854..6b0647a2 100644
--- a/resources/js/views/SetupWizard/Database.vue
+++ b/resources/js/views/SetupWizard/Database.vue
@@ -34,7 +34,7 @@
                 <div class="block-wrapper">
                     <label>Host:</label>
                     <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="Host" rules="required" v-slot="{ errors }">
-                        <input v-model="databaseCredentials.host" placeholder="Type your database host" type="text" :class="{'border-red-700': errors[0]}" />
+                        <input v-model="databaseCredentials.host" placeholder="Type your database host" type="text" :class="{'border-red': errors[0]}" />
                         <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                     </ValidationProvider>
                 </div>
@@ -42,7 +42,7 @@
                 <div class="block-wrapper">
                     <label>Port:</label>
                     <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="Port" rules="required" v-slot="{ errors }">
-                        <input v-model="databaseCredentials.port" placeholder="Type your database port" type="text" :class="{'border-red-700': errors[0]}" />
+                        <input v-model="databaseCredentials.port" placeholder="Type your database port" type="text" :class="{'border-red': errors[0]}" />
                         <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                     </ValidationProvider>
                 </div>
@@ -50,7 +50,7 @@
                 <div class="block-wrapper">
                     <label>Database Name:</label>
                     <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="Database Name" rules="required" v-slot="{ errors }">
-                        <input v-model="databaseCredentials.name" placeholder="Select your database name" type="text" :class="{'border-red-700': errors[0]}" />
+                        <input v-model="databaseCredentials.name" placeholder="Select your database name" type="text" :class="{'border-red': errors[0]}" />
                         <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                     </ValidationProvider>
                 </div>
@@ -58,7 +58,7 @@
                 <div class="block-wrapper">
                     <label>Database Username:</label>
                     <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="Database Username" rules="required" v-slot="{ errors }">
-                        <input v-model="databaseCredentials.username" placeholder="Select your database name" type="text" :class="{'border-red-700': errors[0]}" />
+                        <input v-model="databaseCredentials.username" placeholder="Select your database name" type="text" :class="{'border-red': errors[0]}" />
                         <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                     </ValidationProvider>
                 </div>
@@ -66,7 +66,7 @@
                 <div class="block-wrapper">
                     <label>Database Password:</label>
                     <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="Database Password" rules="required" v-slot="{ errors }">
-                        <input v-model="databaseCredentials.password" placeholder="Select your database password" type="text" :class="{'border-red-700': errors[0]}" />
+                        <input v-model="databaseCredentials.password" placeholder="Select your database password" type="text" :class="{'border-red': errors[0]}" />
                         <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                     </ValidationProvider>
                 </div>
diff --git a/resources/js/views/SetupWizard/EnvironmentSetup.vue b/resources/js/views/SetupWizard/EnvironmentSetup.vue
index a45ab711..b1370aee 100644
--- a/resources/js/views/SetupWizard/EnvironmentSetup.vue
+++ b/resources/js/views/SetupWizard/EnvironmentSetup.vue
@@ -30,14 +30,14 @@
                     <div class="block-wrapper">
                         <label>Key:</label>
                         <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="Key" rules="required" v-slot="{ errors }">
-                            <input v-model="storage.key" placeholder="Paste your key" type="text" :class="{'border-red-700': errors[0]}"/>
+                            <input v-model="storage.key" placeholder="Paste your key" type="text" :class="{'border-red': errors[0]}"/>
                             <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                         </ValidationProvider>
                     </div>
                     <div class="block-wrapper">
                         <label>Secret:</label>
                         <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="Secret" rules="required" v-slot="{ errors }">
-                            <input v-model="storage.secret" placeholder="Paste your secret" type="text" :class="{'border-red-700': errors[0]}"/>
+                            <input v-model="storage.secret" placeholder="Paste your secret" type="text" :class="{'border-red': errors[0]}"/>
                             <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                         </ValidationProvider>
                     </div>
@@ -54,14 +54,14 @@
                     <div class="block-wrapper" v-if="storage.driver !== 's3'">
                         <label>Endpoint URL:</label>
                         <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="Endpoint" rules="required" v-slot="{ errors }">
-                            <input v-model="storage.endpoint" placeholder="Type your endpoint" type="text" :class="{'border-red-700': errors[0]}" readonly/>
+                            <input v-model="storage.endpoint" placeholder="Type your endpoint" type="text" :class="{'border-red': errors[0]}" readonly/>
                             <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                         </ValidationProvider>
                     </div>
                     <div class="block-wrapper">
                         <label>Bucket:</label>
                         <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="Bucket" rules="required" v-slot="{ errors }">
-                            <input v-model="storage.bucket" placeholder="Type your bucket name" type="text" :class="{'border-red-700': errors[0]}"/>
+                            <input v-model="storage.bucket" placeholder="Type your bucket name" type="text" :class="{'border-red': errors[0]}"/>
                             <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                             <small class="input-help">
                                 Provide your created unique bucket name
@@ -87,7 +87,7 @@
                 <div class="block-wrapper">
                     <label>Mail Host:</label>
                     <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="Mail Host" rules="required" v-slot="{ errors }">
-                        <input v-model="mail.host" placeholder="Type your mail host" type="text" :class="{'border-red-700': errors[0]}"/>
+                        <input v-model="mail.host" placeholder="Type your mail host" type="text" :class="{'border-red': errors[0]}"/>
                         <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                     </ValidationProvider>
                 </div>
@@ -95,7 +95,7 @@
                 <div class="block-wrapper">
                     <label>Mail Port:</label>
                     <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="Mail Port" rules="required" v-slot="{ errors }">
-                        <input v-model="mail.port" placeholder="Type your mail port" type="text" :class="{'border-red-700': errors[0]}"/>
+                        <input v-model="mail.port" placeholder="Type your mail port" type="text" :class="{'border-red': errors[0]}"/>
                         <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                     </ValidationProvider>
                 </div>
@@ -103,7 +103,7 @@
                 <div class="block-wrapper">
                     <label>Mail Username:</label>
                     <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="Mail Username" rules="required" v-slot="{ errors }">
-                        <input v-model="mail.username" placeholder="Type your mail username" type="text" :class="{'border-red-700': errors[0]}"/>
+                        <input v-model="mail.username" placeholder="Type your mail username" type="text" :class="{'border-red': errors[0]}"/>
                         <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                     </ValidationProvider>
                 </div>
@@ -111,7 +111,7 @@
                 <div class="block-wrapper">
                     <label>Mail Password:</label>
                     <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="Mail Password" rules="required" v-slot="{ errors }">
-                        <input v-model="mail.password" placeholder="Type your mail password" type="text" :class="{'border-red-700': errors[0]}"/>
+                        <input v-model="mail.password" placeholder="Type your mail password" type="text" :class="{'border-red': errors[0]}"/>
                         <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                     </ValidationProvider>
                 </div>
diff --git a/resources/js/views/SetupWizard/PurchaseCode.vue b/resources/js/views/SetupWizard/PurchaseCode.vue
index 29a28ea8..039c8c5a 100644
--- a/resources/js/views/SetupWizard/PurchaseCode.vue
+++ b/resources/js/views/SetupWizard/PurchaseCode.vue
@@ -14,7 +14,7 @@
 
             <ValidationObserver @submit.prevent="verifyPurchaseCode" ref="verifyPurchaseCode" v-slot="{ invalid }" tag="form" class="form inline-form">
                 <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="Purchase Code" rules="required" v-slot="{ errors }">
-                    <input v-model="purchaseCode" placeholder="Paste your purchase code" type="text" :class="{'border-red-700': errors[0]}"/>
+                    <input v-model="purchaseCode" placeholder="Paste your purchase code" type="text" :class="{'border-red': errors[0]}"/>
                     <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                 </ValidationProvider>
                 <AuthButton icon="chevron-right" text="Verify" :loading="isLoading" :disabled="isLoading"/>
diff --git a/resources/js/views/SetupWizard/StripeCredentials.vue b/resources/js/views/SetupWizard/StripeCredentials.vue
index b61f9512..69972021 100644
--- a/resources/js/views/SetupWizard/StripeCredentials.vue
+++ b/resources/js/views/SetupWizard/StripeCredentials.vue
@@ -32,7 +32,7 @@
                 <div class="block-wrapper">
                     <label>Publishable Key:</label>
                     <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="Publishable Key" rules="required" v-slot="{ errors }">
-                        <input v-model="stripeCredentials.key" placeholder="Paste your publishable key" type="text" :class="{'border-red-700': errors[0]}"/>
+                        <input v-model="stripeCredentials.key" placeholder="Paste your publishable key" type="text" :class="{'border-red': errors[0]}"/>
                         <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                     </ValidationProvider>
                 </div>
@@ -40,7 +40,7 @@
                 <div class="block-wrapper">
                     <label>Secret Key:</label>
                     <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="Secret Key" rules="required" v-slot="{ errors }">
-                        <input v-model="stripeCredentials.secret" placeholder="Paste your secret key" type="text" :class="{'border-red-700': errors[0]}"/>
+                        <input v-model="stripeCredentials.secret" placeholder="Paste your secret key" type="text" :class="{'border-red': errors[0]}"/>
                         <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                     </ValidationProvider>
                 </div>
@@ -63,7 +63,7 @@
                 <div class="block-wrapper">
                     <label>Webhook Secret:</label>
                     <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="Webhook Secret" rules="required" v-slot="{ errors }">
-                        <input v-model="stripeCredentials.webhookSecret" placeholder="Type your stripe webhook secret" type="text" :class="{'border-red-700': errors[0]}"/>
+                        <input v-model="stripeCredentials.webhookSecret" placeholder="Type your stripe webhook secret" type="text" :class="{'border-red': errors[0]}"/>
                         <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                     </ValidationProvider>
                 </div>
diff --git a/resources/js/views/SetupWizard/SubscriptionPlans.vue b/resources/js/views/SetupWizard/SubscriptionPlans.vue
index 3f9325ef..a3159d6d 100644
--- a/resources/js/views/SetupWizard/SubscriptionPlans.vue
+++ b/resources/js/views/SetupWizard/SubscriptionPlans.vue
@@ -28,7 +28,7 @@
                             <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="Name"
                                                 rules="required" v-slot="{ errors }">
                                 <input v-model="plan.attributes.name" placeholder="Type your plan name"
-                                       type="text" :class="{'border-red-700': errors[0]}"/>
+                                       type="text" :class="{'border-red': errors[0]}"/>
                                 <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                             </ValidationProvider>
                         </div>
@@ -38,7 +38,7 @@
                             <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="Description"
                                                 v-slot="{ errors }">
                                 <textarea v-model="plan.attributes.description"
-                                          placeholder="Type your plan description" :class="{'border-red-700': errors[0]}"></textarea>
+                                          placeholder="Type your plan description" :class="{'border-red': errors[0]}"></textarea>
                                 <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                             </ValidationProvider>
                         </div>
@@ -49,7 +49,7 @@
                                                 rules="required" v-slot="{ errors }">
                                 <input v-model="plan.attributes.price" placeholder="Type your plan price" type="number"
                                        step="0.01" min="1" max="999999999999"
-                                       :class="{'border-red-700': errors[0]}"/>
+                                       :class="{'border-red': errors[0]}"/>
                                 <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                             </ValidationProvider>
                         </div>
@@ -63,7 +63,7 @@
                                        max="999999999"
                                        placeholder="Type storage capacity in GB"
                                        type="number"
-                                       :class="{'border-red-700': errors[0]}"/>
+                                       :class="{'border-red': errors[0]}"/>
                                 <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                             </ValidationProvider>
                         </div>
diff --git a/resources/js/views/Shared/SharedAuthentication.vue b/resources/js/views/Shared/SharedAuthentication.vue
index 1f00e6ab..41c68349 100644
--- a/resources/js/views/Shared/SharedAuthentication.vue
+++ b/resources/js/views/Shared/SharedAuthentication.vue
@@ -9,7 +9,7 @@
             <ValidationObserver @submit.prevent="authenticateProtected" ref="authenticateProtected" v-slot="{ invalid }" tag="form" class="form inline-form">
 
                 <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="Password" rules="required" v-slot="{ errors }">
-                    <input v-model="password" :placeholder="$t('page_shared.placeholder_pass')" type="password" :class="{'border-red-700': errors[0]}" />
+                    <input v-model="password" :placeholder="$t('page_shared.placeholder_pass')" type="password" :class="{'border-red': errors[0]}" />
                     <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                 </ValidationProvider>
 
diff --git a/resources/js/views/Upgrade/UpgradeBilling.vue b/resources/js/views/Upgrade/UpgradeBilling.vue
index b232adb4..7a03cfb9 100644
--- a/resources/js/views/Upgrade/UpgradeBilling.vue
+++ b/resources/js/views/Upgrade/UpgradeBilling.vue
@@ -94,7 +94,7 @@
                                             <input v-model="billing.name"
                                                    :placeholder="$t('user_settings.name_plac')"
                                                    type="text"
-                                                   :class="{'border-red-700': errors[0]}"
+                                                   :class="{'border-red': errors[0]}"
                                                    class="focus-border-theme"
                                             />
                                             <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
@@ -109,7 +109,7 @@
                                             <input v-model="billing.address"
                                                    :placeholder="$t('user_settings.address_plac')"
                                                    type="text"
-                                                   :class="{'border-red-700': errors[0]}"
+                                                   :class="{'border-red': errors[0]}"
                                                    class="focus-border-theme"
                                             />
                                             <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
@@ -125,7 +125,7 @@
                                                 <input v-model="billing.city"
                                                        :placeholder="$t('user_settings.city_plac')"
                                                        type="text"
-                                                       :class="{'border-red-700': errors[0]}"
+                                                       :class="{'border-red': errors[0]}"
                                                        class="focus-border-theme"
                                                 />
                                                 <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
@@ -140,7 +140,7 @@
                                                 <input v-model="billing.postal_code"
                                                        :placeholder="$t('user_settings.postal_code_plac')"
                                                        type="text"
-                                                       :class="{'border-red-700': errors[0]}"
+                                                       :class="{'border-red': errors[0]}"
                                                        class="focus-border-theme"
                                                 />
                                                 <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
@@ -170,7 +170,7 @@
                                             <input v-model="billing.state"
                                                    :placeholder="$t('user_settings.state_plac')"
                                                    type="text"
-                                                   :class="{'border-red-700': errors[0]}"
+                                                   :class="{'border-red': errors[0]}"
                                                    class="focus-border-theme"
                                             />
                                             <small class="input-help">
@@ -188,7 +188,7 @@
                                             <input v-model="billing.phone_number"
                                                    :placeholder="$t('user_settings.phone_number_plac')"
                                                    type="text"
-                                                   :class="{'border-red-700': errors[0]}"
+                                                   :class="{'border-red': errors[0]}"
                                                    class="focus-border-theme"
                                             />
                                             <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
diff --git a/resources/js/views/User/Password.vue b/resources/js/views/User/Password.vue
index a5894fe4..a952c62b 100644
--- a/resources/js/views/User/Password.vue
+++ b/resources/js/views/User/Password.vue
@@ -52,7 +52,7 @@
                         <input v-model="newPassword" :placeholder="$t('page_create_password.label_new_pass')"
 							   type="password"
 							   class="focus-border-theme input-dark"
-							   :class="{'border-red-700': errors[0]}"
+							   :class="{'border-red': errors[0]}"
 						/>
                     </AppInputText>
                 </ValidationProvider>
@@ -62,7 +62,7 @@
 							   :placeholder="$t('page_create_password.label_confirm_pass')"
 							   type="password"
 							   class="focus-border-theme input-dark"
-							   :class="{'border-red-700': errors[0]}"
+							   :class="{'border-red': errors[0]}"
 						/>
                     </AppInputText>
                 </ValidationProvider>
diff --git a/resources/js/views/User/Storage.vue b/resources/js/views/User/Storage.vue
index ad81d715..6443268d 100644
--- a/resources/js/views/User/Storage.vue
+++ b/resources/js/views/User/Storage.vue
@@ -9,7 +9,7 @@
 				{{ storage.data.attributes.used }}
 			</b>
 
-			<b v-if="config.subscriptionType === 'fixed' || config.storageLimit" class="mt-0.5 block text-sm text-gray-400">
+			<b v-if="config.subscriptionType === 'fixed' || (config.subscriptionType === 'none' && config.storageLimit)" class="mt-0.5 block text-sm text-gray-400">
 				{{ $t('Total of') }} {{ storage.data.attributes.capacity }} {{ $t('Used') }}
 			</b>
 
diff --git a/src/Support/helpers.php b/src/Support/helpers.php
index 098fd002..1ec4d2ba 100644
--- a/src/Support/helpers.php
+++ b/src/Support/helpers.php
@@ -474,7 +474,7 @@ if (! function_exists('get_storage_percentage')) {
     /**
      * Get storage usage in percent
      */
-    function get_storage_percentage(int $used, int $maxAmount): float
+    function get_storage_percentage(int $used, float $maxAmount): float
     {
         // Format gigabytes to bytes
         $total = intval(Metric::gigabytes($maxAmount)->numberOfBytes());