diff --git a/config/content.php b/config/content.php
index 29164eea..467b11e4 100644
--- a/config/content.php
+++ b/config/content.php
@@ -193,7 +193,7 @@ return [
             ],
             [
                 'name'  => 'allowed_registration_bonus',
-                'value' => '0',
+                'value' => 0,
             ],
             [
                 'name'  => 'registration_bonus_amount',
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index ed0204bc..178717c3 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -25,14 +25,14 @@
     "/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~d6def0d7.js": "/chunks/app-language~chunks/dashboard~chunks/invoices~chunks/page-edit~chunks/pages~chunks/plan-creat~d6def0d7.js?id=a1836cdd057c0e63adc0",
     "/chunks/app-others.js": "/chunks/app-others.js?id=dcb25c15345b97c47871",
-    "/chunks/app-payments.js": "/chunks/app-payments.js?id=7b138db0bc1917cab2c6",
+    "/chunks/app-payments.js": "/chunks/app-payments.js?id=e1b37ac1d8d495edd774",
     "/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~2c1222b7.js": "/chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/database~chunks/email-veri~2c1222b7.js?id=5963f5d9fb4e759c600a",
     "/chunks/billing.js": "/chunks/billing.js?id=131b8be8787e1bdbc407",
     "/chunks/billings-detail.js": "/chunks/billings-detail.js?id=ad632d6f7e088dab55a3",
     "/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=2760050e539cc5e9b8ab",
+    "/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=3f0a914bca8e3106d9ce",
     "/chunks/contact-us.js": "/chunks/contact-us.js?id=b3feaa361fc486e6a0b3",
     "/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=8451872075acf5b1b9ab",
@@ -396,5 +396,10 @@
     "/chunks/billing.461dc4a34199e68429ee.hot-update.js": "/chunks/billing.461dc4a34199e68429ee.hot-update.js",
     "/chunks/billing.eaf0631ae5f10538907d.hot-update.js": "/chunks/billing.eaf0631ae5f10538907d.hot-update.js",
     "/chunks/billing.2aeee7e82b62920e2451.hot-update.js": "/chunks/billing.2aeee7e82b62920e2451.hot-update.js",
-    "/chunks/billing.3153d134251a9670bbe8.hot-update.js": "/chunks/billing.3153d134251a9670bbe8.hot-update.js"
+    "/chunks/billing.3153d134251a9670bbe8.hot-update.js": "/chunks/billing.3153d134251a9670bbe8.hot-update.js",
+    "/chunks/app-payments.13240e9f411923858d1b.hot-update.js": "/chunks/app-payments.13240e9f411923858d1b.hot-update.js",
+    "/chunks/billing~chunks/settings-storage~chunks/user-storage~chunks/user-subscription.fc96502ee414d46390b8.hot-update.js": "/chunks/billing~chunks/settings-storage~chunks/user-storage~chunks/user-subscription.fc96502ee414d46390b8.hot-update.js",
+    "/chunks/billing~chunks/settings-storage~chunks/user-storage~chunks/user-subscription.ab77530f6a2a35df1ddd.hot-update.js": "/chunks/billing~chunks/settings-storage~chunks/user-storage~chunks/user-subscription.ab77530f6a2a35df1ddd.hot-update.js",
+    "/chunks/billing~chunks/settings-storage~chunks/user-storage~chunks/user-subscription.82770ea7f4382984a333.hot-update.js": "/chunks/billing~chunks/settings-storage~chunks/user-storage~chunks/user-subscription.82770ea7f4382984a333.hot-update.js",
+    "/chunks/billing~chunks/settings-storage~chunks/user-storage~chunks/user-subscription.bd1a0faf9bc919e624a5.hot-update.js": "/chunks/billing~chunks/settings-storage~chunks/user-storage~chunks/user-subscription.bd1a0faf9bc919e624a5.hot-update.js"
 }
diff --git a/resources/js/components/Admin/ProgressLine.vue b/resources/js/components/Admin/ProgressLine.vue
index e0b74afb..0e380d4f 100644
--- a/resources/js/components/Admin/ProgressLine.vue
+++ b/resources/js/components/Admin/ProgressLine.vue
@@ -1,6 +1,6 @@
 <template>
     <div>
-        <div class="flex items-center mb-4 rounded dark:bg-2x-dark-foreground bg-light-300">
+        <div class="flex items-center mb-4 rounded dark:bg-2x-dark-foreground bg-light-300 h-2.5">
             <div v-for="(chart, i) in data" :key="i" :style="{width: (chart.progress > 1 ? chart.progress : 0) + '%'}" class="chart-wrapper">
 				<!--<DotLabel class="label" :class="{'offset-top': chart.progress < 5}" :color="chart.color" :title="chart.value" />-->
 
@@ -18,7 +18,7 @@
 
 				<!--Multiple line-->
 				<span
-					v-if="data.length > 1"
+					v-if="data.length > 1 && chart.progress > 0"
 					:class="[{
 						'rounded-tl-lg rounded-bl-lg border-r-2 dark:border-gray-800 border-white': i === 0,
 						'border-r-2 dark:border-gray-800 border-white': i < (data.length - 1),
@@ -29,7 +29,7 @@
             </div>
         </div>
 
-        <footer class="flex items-center">
+        <footer class="flex items-center w-full overflow-x-auto">
             <DotLabel v-for="(chart, i) in data" :key="i" :color="chart.color" :title="chart.title" class="mr-5" />
         </footer>
     </div>
diff --git a/routes/console.php b/routes/console.php
index 75dd0cde..31d2fa05 100644
--- a/routes/console.php
+++ b/routes/console.php
@@ -1,6 +1,6 @@
 <?php
 
-use Illuminate\Foundation\Inspiring;
+use Support\Scheduler\Actions\ReportUsageAction;
 
 /*
 |--------------------------------------------------------------------------
@@ -13,6 +13,5 @@ use Illuminate\Foundation\Inspiring;
 |
 */
 
-Artisan::command('inspire', function () {
-    $this->comment(Inspiring::quote());
-})->describe('Display an inspiring quote');
+Artisan::command('report:usage', fn () => resolve(ReportUsageAction::class)())
+    ->describe('Store user usage estimates for metered billing');
diff --git a/src/App/Console/Commands/SetupDevEnvironment.php b/src/App/Console/Commands/SetupDevEnvironment.php
index eeaed982..cb8b8c0d 100644
--- a/src/App/Console/Commands/SetupDevEnvironment.php
+++ b/src/App/Console/Commands/SetupDevEnvironment.php
@@ -57,11 +57,10 @@ class SetupDevEnvironment extends Command
         $this->migrate_and_generate();
 
         $this->info('Storing default settings and content...');
-        $this->store_default_settings();
-
         ($this->seedDefaultPages)();
         ($this->seedDefaultSettings)($this->license);
         ($this->seedDefaultLanguage)();
+        $this->store_default_settings();
 
         $this->info('Creating default admin...');
         $this->create_admin();
@@ -651,13 +650,13 @@ class SetupDevEnvironment extends Command
 
         // Get apartments gallery
         collect([
-            'demo/images/apartments/Apartment Architecture Ceiling Chairs.jpg',
-            'demo/images/apartments/Apartment Chair.jpg',
-            'demo/images/apartments/Apartment Contemporary Couch Curtains.jpg',
-            'demo/images/apartments/Brown Wooden Center Table.jpg',
-            'demo/images/apartments/Home.jpg',
-            'demo/images/apartments/Kitchen Appliances.jpg',
-            'demo/images/apartments/Kitchen Island.jpg',
+            'demo/images/apartments/Apartment Architecture Ceiling Chairs.jpeg',
+            'demo/images/apartments/Apartment Chair.jpeg',
+            'demo/images/apartments/Apartment Contemporary Couch Curtains.jpeg',
+            'demo/images/apartments/Brown Wooden Center Table.jpeg',
+            'demo/images/apartments/Home.jpeg',
+            'demo/images/apartments/Kitchen Appliances.jpeg',
+            'demo/images/apartments/Kitchen Island.jpeg',
         ])
             ->each(function ($file) use ($user, $apartments) {
                 $thumbnail = $this->generate_thumbnails($file, $user);
@@ -678,17 +677,17 @@ class SetupDevEnvironment extends Command
 
         // Get nature gallery
         collect([
-            'demo/images/nature/Bird Patterncolorful Green.jpg',
-            'demo/images/nature/Close Up Of Peacock.jpg',
-            'demo/images/nature/Close Up Photography Of Tiger.jpg',
-            'demo/images/nature/Cold Nature Cute Ice.jpg',
-            'demo/images/nature/Landscape Photo of Forest.jpg',
-            'demo/images/nature/Photo of Hawksbill Sea Turtle.jpg',
-            'demo/images/nature/Photo Of Reindeer in The Snow.jpg',
-            'demo/images/nature/View Of Elephant in Water.jpg',
-            'demo/images/nature/Waterfall Between Trees.jpg',
-            'demo/images/nature/Wildlife Photography of Elephant During Golden Hour.jpg',
-            'demo/images/nature/Yellow Animal Eyes Fur.jpg',
+            'demo/images/nature/Bird Patterncolorful Green.jpeg',
+            'demo/images/nature/Close Up Of Peacock.jpeg',
+            'demo/images/nature/Close Up Photography Of Tiger.jpeg',
+            'demo/images/nature/Cold Nature Cute Ice.jpeg',
+            'demo/images/nature/Landscape Photo of Forest.jpeg',
+            'demo/images/nature/Photo of Hawksbill Sea Turtle.jpeg',
+            'demo/images/nature/Photo Of Reindeer in The Snow.jpeg',
+            'demo/images/nature/View Of Elephant in Water.jpeg',
+            'demo/images/nature/Waterfall Between Trees.jpeg',
+            'demo/images/nature/Wildlife Photography of Elephant During Golden Hour.jpeg',
+            'demo/images/nature/Yellow Animal Eyes Fur.jpeg',
         ])
             ->each(function ($file) use ($user, $nature) {
                 $thumbnail = $this->generate_thumbnails($file, $user);
@@ -1005,7 +1004,7 @@ class SetupDevEnvironment extends Command
                 'value' => 1,
             ],
             [
-                'name'  => 'payments_active',
+                'name'  => 'allowed_payments',
                 'value' => 1,
             ],
             [
@@ -1064,9 +1063,34 @@ class SetupDevEnvironment extends Command
                 'name'  => 'billing_vat_number',
                 'value' => '41241241234',
             ],
+            [
+                'name'  => 'allowed_registration_bonus',
+                'value' => 1,
+            ],
+            [
+                'name'  => 'registration_bonus_amount',
+                'value' => 10,
+            ],
+            [
+                'name'  => 'allowed_paypal',
+                'value' => 1,
+            ],
+            [
+                'name'  => 'allowed_paystack',
+                'value' => 1,
+            ],
+            [
+                'name'  => 'allowed_stripe',
+                'value' => 1,
+            ],
+            [
+                'name'  => 'subscription_type',
+                'value' => 'metered',
+            ],
         ])->each(function ($col) {
-            Setting::forceCreate([
+            Setting::updateOrCreate([
                 'name'  => $col['name'],
+            ], [
                 'value' => $col['value'],
             ]);
         });
diff --git a/src/App/Socialite/Controllers/SocialiteCallbackController.php b/src/App/Socialite/Controllers/SocialiteCallbackController.php
index a4d0a2a4..0e207816 100644
--- a/src/App/Socialite/Controllers/SocialiteCallbackController.php
+++ b/src/App/Socialite/Controllers/SocialiteCallbackController.php
@@ -37,9 +37,9 @@ class SocialiteCallbackController extends Controller
 
         // Create data user data object
         $data = CreateUserData::fromArray([
-            'name'           => $provider_user->name,
-            'email'          => $provider_user->email,
-            'avatar'         => store_socialite_avatar($provider_user->avatar),
+            'name'           => $provider_user->getName(),
+            'email'          => $provider_user->getEmail(),
+            'avatar'         => store_socialite_avatar($provider_user->getAvatar()),
             'oauth_provider' => $provider,
         ]);
 
diff --git a/src/App/Users/Resources/UserStorageResource.php b/src/App/Users/Resources/UserStorageResource.php
index 959dea1e..f01f1331 100644
--- a/src/App/Users/Resources/UserStorageResource.php
+++ b/src/App/Users/Resources/UserStorageResource.php
@@ -132,8 +132,8 @@ class UserStorageResource extends JsonResource
             ->where('created_at', '>', $period)
             ->sum('upload');
 
-        $upload = $trafficRecords->map(fn ($record)   => round(($record->upload / $uploadMax) * 100, 2));
-        $download = $trafficRecords->map(fn ($record) => round(($record->download / $downloadMax) * 100, 2));
+        $upload = $trafficRecords->map(fn ($record)   => $uploadMax !== 0 ? round(($record->upload / $uploadMax) * 100, 2) : 0);
+        $download = $trafficRecords->map(fn ($record) => $downloadMax !== 0 ? round(($record->download / $downloadMax) * 100, 2) : 0);
 
         return [$downloadTotal, $uploadTotal, $upload, $download];
     }
diff --git a/src/Domain/Settings/Actions/SeedDefaultSettingsAction.php b/src/Domain/Settings/Actions/SeedDefaultSettingsAction.php
index 2f50d493..5c4a2b9e 100644
--- a/src/Domain/Settings/Actions/SeedDefaultSettingsAction.php
+++ b/src/Domain/Settings/Actions/SeedDefaultSettingsAction.php
@@ -13,6 +13,10 @@ class SeedDefaultSettingsAction
     ): void {
         collect(
             config('content.content.' . strtolower($license))
-        )->each(fn ($content) => Setting::forceCreate($content));
+        )->each(fn ($content) => Setting::updateOrCreate([
+            'name' => $content['name'],
+        ], [
+            'value' => $content['value'],
+        ]));
     }
 }
diff --git a/src/Support/Scheduler/Actions/ReportUsageAction.php b/src/Support/Scheduler/Actions/ReportUsageAction.php
index f736b902..42a160ae 100644
--- a/src/Support/Scheduler/Actions/ReportUsageAction.php
+++ b/src/Support/Scheduler/Actions/ReportUsageAction.php
@@ -39,7 +39,7 @@ class ReportUsageAction
             ->sum('filesize');
 
         // We count storage size in GB, e.g. 0.15 is 150mb
-        $amount = $filesize / 1000000000;
+        $amount = $filesize / 1000000;
 
         // Record storage capacity usage
         $subscription->recordUsage('storage', $amount);
@@ -51,10 +51,10 @@ class ReportUsageAction
         $record = $subscription
             ->user
             ->traffics()
-            ->where('created_at', today()->subDay())
+            ->whereDate('created_at', today()->subDay())
             ->first();
 
-        $amount = ($record->download ?? 0) / 1000000000;
+        $amount = (($record->download ?? 0) + ($record->upload ?? 0)) / 1000000;
 
         // Record storage capacity usage
         $subscription->recordUsage('bandwidth', $amount);
diff --git a/src/Support/helpers.php b/src/Support/helpers.php
index 31cf5f75..1f40f73e 100644
--- a/src/Support/helpers.php
+++ b/src/Support/helpers.php
@@ -475,7 +475,7 @@ if (! function_exists('get_storage_percentage')) {
 
         // Count progress
         if ($total == 0) {
-            $progress = 100;
+            $progress = 0;
         } else {
             $progress = ($used * 100) / $total;
         }
diff --git a/storage/demo/images/apartments/Apartment Architecture Ceiling Chairs.jpeg b/storage/demo/images/apartments/Apartment Architecture Ceiling Chairs.jpeg
new file mode 100644
index 00000000..fe3b087e
Binary files /dev/null and b/storage/demo/images/apartments/Apartment Architecture Ceiling Chairs.jpeg differ
diff --git a/storage/demo/images/apartments/Apartment Architecture Ceiling Chairs.jpg b/storage/demo/images/apartments/Apartment Architecture Ceiling Chairs.jpg
deleted file mode 100644
index 0979d777..00000000
Binary files a/storage/demo/images/apartments/Apartment Architecture Ceiling Chairs.jpg and /dev/null differ
diff --git a/storage/demo/images/apartments/Apartment Chair.jpeg b/storage/demo/images/apartments/Apartment Chair.jpeg
new file mode 100644
index 00000000..61fb5b75
Binary files /dev/null and b/storage/demo/images/apartments/Apartment Chair.jpeg differ
diff --git a/storage/demo/images/apartments/Apartment Chair.jpg b/storage/demo/images/apartments/Apartment Chair.jpg
deleted file mode 100644
index cd3d83a1..00000000
Binary files a/storage/demo/images/apartments/Apartment Chair.jpg and /dev/null differ
diff --git a/storage/demo/images/apartments/Apartment Contemporary Couch Curtains.jpeg b/storage/demo/images/apartments/Apartment Contemporary Couch Curtains.jpeg
new file mode 100644
index 00000000..7dfec247
Binary files /dev/null and b/storage/demo/images/apartments/Apartment Contemporary Couch Curtains.jpeg differ
diff --git a/storage/demo/images/apartments/Apartment Contemporary Couch Curtains.jpg b/storage/demo/images/apartments/Apartment Contemporary Couch Curtains.jpg
deleted file mode 100644
index b1a06b6f..00000000
Binary files a/storage/demo/images/apartments/Apartment Contemporary Couch Curtains.jpg and /dev/null differ
diff --git a/storage/demo/images/apartments/Brown Wooden Center Table.jpeg b/storage/demo/images/apartments/Brown Wooden Center Table.jpeg
new file mode 100644
index 00000000..f902951b
Binary files /dev/null and b/storage/demo/images/apartments/Brown Wooden Center Table.jpeg differ
diff --git a/storage/demo/images/apartments/Brown Wooden Center Table.jpg b/storage/demo/images/apartments/Brown Wooden Center Table.jpg
deleted file mode 100644
index a7d63d62..00000000
Binary files a/storage/demo/images/apartments/Brown Wooden Center Table.jpg and /dev/null differ
diff --git a/storage/demo/images/apartments/Home.jpeg b/storage/demo/images/apartments/Home.jpeg
new file mode 100644
index 00000000..740b2d1d
Binary files /dev/null and b/storage/demo/images/apartments/Home.jpeg differ
diff --git a/storage/demo/images/apartments/Home.jpg b/storage/demo/images/apartments/Home.jpg
deleted file mode 100644
index 5f646d3d..00000000
Binary files a/storage/demo/images/apartments/Home.jpg and /dev/null differ
diff --git a/storage/demo/images/apartments/Kitchen Appliances.jpeg b/storage/demo/images/apartments/Kitchen Appliances.jpeg
new file mode 100644
index 00000000..8e2ec611
Binary files /dev/null and b/storage/demo/images/apartments/Kitchen Appliances.jpeg differ
diff --git a/storage/demo/images/apartments/Kitchen Appliances.jpg b/storage/demo/images/apartments/Kitchen Appliances.jpg
deleted file mode 100644
index e9ac5f37..00000000
Binary files a/storage/demo/images/apartments/Kitchen Appliances.jpg and /dev/null differ
diff --git a/storage/demo/images/apartments/Kitchen Island.jpeg b/storage/demo/images/apartments/Kitchen Island.jpeg
new file mode 100644
index 00000000..2d0ec791
Binary files /dev/null and b/storage/demo/images/apartments/Kitchen Island.jpeg differ
diff --git a/storage/demo/images/apartments/Kitchen Island.jpg b/storage/demo/images/apartments/Kitchen Island.jpg
deleted file mode 100644
index 2962ed52..00000000
Binary files a/storage/demo/images/apartments/Kitchen Island.jpg and /dev/null differ
diff --git a/storage/demo/images/nature/Bird Patterncolorful Green.jpeg b/storage/demo/images/nature/Bird Patterncolorful Green.jpeg
new file mode 100644
index 00000000..3a8443a7
Binary files /dev/null and b/storage/demo/images/nature/Bird Patterncolorful Green.jpeg differ
diff --git a/storage/demo/images/nature/Bird Patterncolorful Green.jpg b/storage/demo/images/nature/Bird Patterncolorful Green.jpg
deleted file mode 100644
index 3d50e1fc..00000000
Binary files a/storage/demo/images/nature/Bird Patterncolorful Green.jpg and /dev/null differ
diff --git a/storage/demo/images/nature/Close Up Of Peacock.jpeg b/storage/demo/images/nature/Close Up Of Peacock.jpeg
new file mode 100644
index 00000000..64784bf6
Binary files /dev/null and b/storage/demo/images/nature/Close Up Of Peacock.jpeg differ
diff --git a/storage/demo/images/nature/Close Up Of Peacock.jpg b/storage/demo/images/nature/Close Up Of Peacock.jpg
deleted file mode 100644
index cd32ce8b..00000000
Binary files a/storage/demo/images/nature/Close Up Of Peacock.jpg and /dev/null differ
diff --git a/storage/demo/images/nature/Close Up Photography Of Tiger.jpeg b/storage/demo/images/nature/Close Up Photography Of Tiger.jpeg
new file mode 100644
index 00000000..f226121c
Binary files /dev/null and b/storage/demo/images/nature/Close Up Photography Of Tiger.jpeg differ
diff --git a/storage/demo/images/nature/Close Up Photography Of Tiger.jpg b/storage/demo/images/nature/Close Up Photography Of Tiger.jpg
deleted file mode 100644
index 2c226000..00000000
Binary files a/storage/demo/images/nature/Close Up Photography Of Tiger.jpg and /dev/null differ
diff --git a/storage/demo/images/nature/Cold Nature Cute Ice.jpeg b/storage/demo/images/nature/Cold Nature Cute Ice.jpeg
new file mode 100644
index 00000000..168e7e96
Binary files /dev/null and b/storage/demo/images/nature/Cold Nature Cute Ice.jpeg differ
diff --git a/storage/demo/images/nature/Cold Nature Cute Ice.jpg b/storage/demo/images/nature/Cold Nature Cute Ice.jpg
deleted file mode 100644
index 1e428e02..00000000
Binary files a/storage/demo/images/nature/Cold Nature Cute Ice.jpg and /dev/null differ
diff --git a/storage/demo/images/nature/Landscape Photo of Forest.jpeg b/storage/demo/images/nature/Landscape Photo of Forest.jpeg
new file mode 100644
index 00000000..0a816b67
Binary files /dev/null and b/storage/demo/images/nature/Landscape Photo of Forest.jpeg differ
diff --git a/storage/demo/images/nature/Landscape Photo of Forest.jpg b/storage/demo/images/nature/Landscape Photo of Forest.jpg
deleted file mode 100644
index 55afc6e8..00000000
Binary files a/storage/demo/images/nature/Landscape Photo of Forest.jpg and /dev/null differ
diff --git a/storage/demo/images/nature/Photo Of Reindeer in The Snow.jpeg b/storage/demo/images/nature/Photo Of Reindeer in The Snow.jpeg
new file mode 100644
index 00000000..06c8cdee
Binary files /dev/null and b/storage/demo/images/nature/Photo Of Reindeer in The Snow.jpeg differ
diff --git a/storage/demo/images/nature/Photo Of Reindeer in The Snow.jpg b/storage/demo/images/nature/Photo Of Reindeer in The Snow.jpg
deleted file mode 100644
index e7362f5e..00000000
Binary files a/storage/demo/images/nature/Photo Of Reindeer in The Snow.jpg and /dev/null differ
diff --git a/storage/demo/images/nature/Photo of Hawksbill Sea Turtle.jpeg b/storage/demo/images/nature/Photo of Hawksbill Sea Turtle.jpeg
new file mode 100644
index 00000000..13671e39
Binary files /dev/null and b/storage/demo/images/nature/Photo of Hawksbill Sea Turtle.jpeg differ
diff --git a/storage/demo/images/nature/Photo of Hawksbill Sea Turtle.jpg b/storage/demo/images/nature/Photo of Hawksbill Sea Turtle.jpg
deleted file mode 100644
index 9f3d2db7..00000000
Binary files a/storage/demo/images/nature/Photo of Hawksbill Sea Turtle.jpg and /dev/null differ
diff --git a/storage/demo/images/nature/View Of Elephant in Water.jpeg b/storage/demo/images/nature/View Of Elephant in Water.jpeg
new file mode 100644
index 00000000..dab8b605
Binary files /dev/null and b/storage/demo/images/nature/View Of Elephant in Water.jpeg differ
diff --git a/storage/demo/images/nature/View Of Elephant in Water.jpg b/storage/demo/images/nature/View Of Elephant in Water.jpg
deleted file mode 100644
index d7936255..00000000
Binary files a/storage/demo/images/nature/View Of Elephant in Water.jpg and /dev/null differ
diff --git a/storage/demo/images/nature/Waterfall Between Trees.jpeg b/storage/demo/images/nature/Waterfall Between Trees.jpeg
new file mode 100644
index 00000000..19f0e8cd
Binary files /dev/null and b/storage/demo/images/nature/Waterfall Between Trees.jpeg differ
diff --git a/storage/demo/images/nature/Waterfall Between Trees.jpg b/storage/demo/images/nature/Waterfall Between Trees.jpg
deleted file mode 100644
index b4e5447e..00000000
Binary files a/storage/demo/images/nature/Waterfall Between Trees.jpg and /dev/null differ
diff --git a/storage/demo/images/nature/Wildlife Photography of Elephant During Golden Hour.jpeg b/storage/demo/images/nature/Wildlife Photography of Elephant During Golden Hour.jpeg
new file mode 100644
index 00000000..7d477526
Binary files /dev/null and b/storage/demo/images/nature/Wildlife Photography of Elephant During Golden Hour.jpeg differ
diff --git a/storage/demo/images/nature/Wildlife Photography of Elephant During Golden Hour.jpg b/storage/demo/images/nature/Wildlife Photography of Elephant During Golden Hour.jpg
deleted file mode 100644
index 03dafcc0..00000000
Binary files a/storage/demo/images/nature/Wildlife Photography of Elephant During Golden Hour.jpg and /dev/null differ
diff --git a/storage/demo/images/nature/Yellow Animal Eyes Fur.jpeg b/storage/demo/images/nature/Yellow Animal Eyes Fur.jpeg
new file mode 100644
index 00000000..e9945b49
Binary files /dev/null and b/storage/demo/images/nature/Yellow Animal Eyes Fur.jpeg differ
diff --git a/storage/demo/images/nature/Yellow Animal Eyes Fur.jpg b/storage/demo/images/nature/Yellow Animal Eyes Fur.jpg
deleted file mode 100644
index 9305921e..00000000
Binary files a/storage/demo/images/nature/Yellow Animal Eyes Fur.jpg and /dev/null differ
diff --git a/tests/App/Socialite/SocialiteTest.php b/tests/App/Socialite/SocialiteTest.php
index af0f885d..35127d0c 100644
--- a/tests/App/Socialite/SocialiteTest.php
+++ b/tests/App/Socialite/SocialiteTest.php
@@ -1,6 +1,8 @@
 <?php
+
 namespace Tests\App\Socialite;
 
+use Mockery;
 use Storage;
 use Tests\TestCase;
 use App\Users\Models\User;
@@ -35,12 +37,16 @@ class SocialiteTest extends TestCase
         ]);
 
         // Create fake user
-        $socialiteUser = $this->createMock(\Laravel\Socialite\Two\User::class);
-        $socialiteUser->token = 'fake_token';
-        $socialiteUser->id = 'fake_id';
-        $socialiteUser->name = 'Jane Doe';
-        $socialiteUser->email = 'howdy@hi5ve.digital';
-        $socialiteUser->avatar = 'https://vuefilemanager.com/avatar.jpg';
+        $socialiteUser = Mockery::mock(\Laravel\Socialite\Two\User::class);
+        $socialiteUser
+            ->shouldReceive('getId')
+            ->andReturn('fake_id')
+            ->shouldReceive('getEmail')
+            ->andReturn('howdy@hi5ve.digital')
+            ->shouldReceive('getName')
+            ->andReturn('Jane Doe')
+            ->shouldReceive('getAvatar')
+            ->andReturn('https://vuefilemanager.com/avatar.jpg');
 
         // Mock user with FB provider
         $provider = $this->createMock(FacebookProvider::class);
@@ -75,7 +81,7 @@ class SocialiteTest extends TestCase
 
         collect(config('vuefilemanager.avatar_sizes'))
             ->each(
-                fn ($size) => Storage::disk('local')
+                fn($size) => Storage::disk('local')
                     ->assertExists("avatars/{$size['name']}-{$user->settings->getRawOriginal('avatar')}")
             );
     }