diff --git a/.env.example b/.env.example
index a82d36de..6f3fc12a 100644
--- a/.env.example
+++ b/.env.example
@@ -67,7 +67,11 @@ STRIPE_MINI_PRICE_ID_EAP=
 STRIPE_PRO_PRICE_ID=
 STRIPE_PRO_PRICE_ID_EAP=
 STRIPE_MAX_PRICE_ID=
+STRIPE_MAX_PRICE_ID_MONTHLY=
 STRIPE_MAX_PRICE_ID_EAP=
+STRIPE_ULTRA_COMP_PRICE_ID=
+STRIPE_EXTRA_SEAT_PRICE_ID=
+STRIPE_EXTRA_SEAT_PRICE_ID_MONTHLY=
 STRIPE_FOREVER_PRICE_ID=
 STRIPE_TRIAL_PRICE_ID=
 STRIPE_MINI_PAYMENT_LINK=
diff --git a/app/Console/Commands/CompUltraSubscription.php b/app/Console/Commands/CompUltraSubscription.php
new file mode 100644
index 00000000..170f339f
--- /dev/null
+++ b/app/Console/Commands/CompUltraSubscription.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Enums\Subscription;
+use App\Models\User;
+use Illuminate\Console\Command;
+
+class CompUltraSubscription extends Command
+{
+    protected $signature = 'ultra:comp {email : The email address of the user to comp}';
+
+    protected $description = 'Create a comped Ultra subscription for a user using the dedicated $0 Stripe price';
+
+    public function handle(): int
+    {
+        $compedPriceId = config('subscriptions.plans.max.stripe_price_id_comped');
+
+        if (! $compedPriceId) {
+            $this->error('STRIPE_ULTRA_COMP_PRICE_ID is not configured.');
+
+            return self::FAILURE;
+        }
+
+        $email = $this->argument('email');
+        $user = User::where('email', $email)->first();
+
+        if (! $user) {
+            $this->error("User not found: {$email}");
+
+            return self::FAILURE;
+        }
+
+        $existingSubscription = $user->subscription('default');
+
+        if ($existingSubscription && $existingSubscription->active()) {
+            $currentPlan = 'unknown';
+
+            try {
+                $currentPlan = Subscription::fromStripePriceId(
+                    $existingSubscription->items->first()?->stripe_price ?? $existingSubscription->stripe_price
+                )->name();
+            } catch (\Exception) {
+            }
+
+            $this->error("User already has an active {$currentPlan} subscription. Cancel it first or use swap.");
+
+            return self::FAILURE;
+        }
+
+        $user->createOrGetStripeCustomer();
+
+        $user->newSubscription('default', $compedPriceId)->create();
+
+        $this->info("Comped Ultra subscription created for {$email}.");
+
+        return self::SUCCESS;
+    }
+}
diff --git a/app/Console/Commands/MarkCompedSubscriptions.php b/app/Console/Commands/MarkCompedSubscriptions.php
new file mode 100644
index 00000000..11a67e7e
--- /dev/null
+++ b/app/Console/Commands/MarkCompedSubscriptions.php
@@ -0,0 +1,125 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\User;
+use Illuminate\Console\Command;
+use Laravel\Cashier\Subscription;
+
+class MarkCompedSubscriptions extends Command
+{
+    protected $signature = 'subscriptions:mark-comped
+        {file : Path to a CSV file containing email addresses (one per line or in an "email" column)}';
+
+    protected $description = 'Mark subscriptions as comped for email addresses in a CSV file';
+
+    public function handle(): int
+    {
+        $path = $this->argument('file');
+
+        if (! file_exists($path)) {
+            $this->error("File not found: {$path}");
+
+            return self::FAILURE;
+        }
+
+        $emails = $this->parseEmails($path);
+
+        if (empty($emails)) {
+            $this->error('No valid email addresses found in the file.');
+
+            return self::FAILURE;
+        }
+
+        $this->info('Found '.count($emails).' email(s) to process.');
+
+        $updated = 0;
+        $skipped = [];
+
+        foreach ($emails as $email) {
+            $user = User::where('email', $email)->first();
+
+            if (! $user) {
+                $skipped[] = "{$email} — user not found";
+
+                continue;
+            }
+
+            $subscription = Subscription::where('user_id', $user->id)
+                ->where('stripe_status', 'active')
+                ->first();
+
+            if (! $subscription) {
+                $skipped[] = "{$email} — no active subscription";
+
+                continue;
+            }
+
+            if ($subscription->is_comped) {
+                $skipped[] = "{$email} — already marked as comped";
+
+                continue;
+            }
+
+            $subscription->update(['is_comped' => true]);
+            $updated++;
+            $this->info("Marked {$email} as comped (subscription #{$subscription->id})");
+        }
+
+        if (count($skipped) > 0) {
+            $this->warn('Skipped:');
+            foreach ($skipped as $reason) {
+                $this->warn("  - {$reason}");
+            }
+        }
+
+        $this->info("Done. {$updated} subscription(s) marked as comped.");
+
+        return self::SUCCESS;
+    }
+
+    /**
+     * Parse email addresses from a CSV file.
+     * Supports: plain list (one email per line), or CSV with an "email" column header.
+     *
+     * @return array<string>
+     */
+    private function parseEmails(string $path): array
+    {
+        $handle = fopen($path, 'r');
+
+        if (! $handle) {
+            return [];
+        }
+
+        $emails = [];
+        $emailColumnIndex = null;
+        $isFirstRow = true;
+
+        while (($row = fgetcsv($handle)) !== false) {
+            if ($isFirstRow) {
+                $isFirstRow = false;
+                $headers = array_map(fn ($h) => strtolower(trim($h)), $row);
+                $emailColumnIndex = array_search('email', $headers);
+
+                // If the first row looks like an email itself (no header), treat it as data
+                if ($emailColumnIndex === false && filter_var(trim($row[0]), FILTER_VALIDATE_EMAIL)) {
+                    $emailColumnIndex = 0;
+                    $emails[] = strtolower(trim($row[0]));
+                }
+
+                continue;
+            }
+
+            $value = trim($row[$emailColumnIndex] ?? '');
+
+            if (filter_var($value, FILTER_VALIDATE_EMAIL)) {
+                $emails[] = strtolower($value);
+            }
+        }
+
+        fclose($handle);
+
+        return array_unique($emails);
+    }
+}
diff --git a/app/Console/Commands/SendMaxToUltraAnnouncement.php b/app/Console/Commands/SendMaxToUltraAnnouncement.php
new file mode 100644
index 00000000..1515b5a9
--- /dev/null
+++ b/app/Console/Commands/SendMaxToUltraAnnouncement.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\User;
+use App\Notifications\MaxToUltraAnnouncement;
+use Illuminate\Console\Command;
+
+class SendMaxToUltraAnnouncement extends Command
+{
+    protected $signature = 'ultra:send-announcement
+                            {--dry-run : Show what would be sent without actually sending}';
+
+    protected $description = 'Send a one-time announcement email to paying Max subscribers about the Ultra upgrade';
+
+    public function handle(): int
+    {
+        $dryRun = $this->option('dry-run');
+
+        if ($dryRun) {
+            $this->info('DRY RUN - No emails will be sent');
+        }
+
+        $maxPriceIds = array_filter([
+            config('subscriptions.plans.max.stripe_price_id'),
+            config('subscriptions.plans.max.stripe_price_id_monthly'),
+            config('subscriptions.plans.max.stripe_price_id_eap'),
+            config('subscriptions.plans.max.stripe_price_id_discounted'),
+        ]);
+
+        $users = User::query()
+            ->whereHas('subscriptions', function ($query) use ($maxPriceIds) {
+                $query->where('stripe_status', 'active')
+                    ->where('is_comped', false)
+                    ->whereIn('stripe_price', $maxPriceIds);
+            })
+            ->get();
+
+        $this->info("Found {$users->count()} paying Max subscriber(s)");
+
+        $sent = 0;
+
+        foreach ($users as $user) {
+            if ($dryRun) {
+                $this->line("Would send to: {$user->email}");
+            } else {
+                $user->notify(new MaxToUltraAnnouncement);
+                $this->line("Sent to: {$user->email}");
+            }
+
+            $sent++;
+        }
+
+        $this->newLine();
+        $this->info($dryRun ? "Would send: {$sent} email(s)" : "Sent: {$sent} email(s)");
+
+        return Command::SUCCESS;
+    }
+}
diff --git a/app/Console/Commands/SendUltraLicenseHolderPromotion.php b/app/Console/Commands/SendUltraLicenseHolderPromotion.php
new file mode 100644
index 00000000..29a03243
--- /dev/null
+++ b/app/Console/Commands/SendUltraLicenseHolderPromotion.php
@@ -0,0 +1,78 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Enums\Subscription;
+use App\Models\License;
+use App\Notifications\UltraLicenseHolderPromotion;
+use Illuminate\Console\Command;
+
+class SendUltraLicenseHolderPromotion extends Command
+{
+    protected $signature = 'ultra:send-license-holder-promo
+                            {--dry-run : Show what would be sent without actually sending}';
+
+    protected $description = 'Send a promotional email to license holders without an active subscription encouraging them to subscribe to Ultra';
+
+    public function handle(): int
+    {
+        $dryRun = $this->option('dry-run');
+
+        if ($dryRun) {
+            $this->info('DRY RUN - No emails will be sent');
+        }
+
+        $legacyLicenses = License::query()
+            ->whereNull('subscription_item_id')
+            ->whereHas('user')
+            ->with('user')
+            ->get();
+
+        // Group by user to avoid sending multiple emails to the same person
+        $userLicenses = $legacyLicenses->groupBy('user_id');
+
+        $eligible = 0;
+        $skipped = 0;
+
+        foreach ($userLicenses as $userId => $licenses) {
+            $user = $licenses->first()->user;
+
+            if (! $user) {
+                $skipped++;
+
+                continue;
+            }
+
+            // Skip users who already have an active subscription
+            $hasActiveSubscription = $user->subscriptions()
+                ->where('stripe_status', 'active')
+                ->exists();
+
+            if ($hasActiveSubscription) {
+                $this->line("Skipping {$user->email} - already has active subscription");
+                $skipped++;
+
+                continue;
+            }
+
+            $license = $licenses->sortBy('created_at')->first();
+            $planName = Subscription::from($license->policy_name)->name();
+
+            if ($dryRun) {
+                $this->line("Would send to: {$user->email} ({$planName})");
+            } else {
+                $user->notify(new UltraLicenseHolderPromotion($planName));
+                $this->line("Sent to: {$user->email} ({$planName})");
+            }
+
+            $eligible++;
+        }
+
+        $this->newLine();
+        $this->info("Found {$eligible} eligible license holder(s)");
+        $this->info($dryRun ? "Would send: {$eligible} email(s)" : "Sent: {$eligible} email(s)");
+        $this->info("Skipped: {$skipped} user(s)");
+
+        return Command::SUCCESS;
+    }
+}
diff --git a/app/Console/Commands/SendUltraUpgradePromotion.php b/app/Console/Commands/SendUltraUpgradePromotion.php
new file mode 100644
index 00000000..4b1fcbfb
--- /dev/null
+++ b/app/Console/Commands/SendUltraUpgradePromotion.php
@@ -0,0 +1,74 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Enums\Subscription;
+use App\Models\User;
+use App\Notifications\UltraUpgradePromotion;
+use Illuminate\Console\Command;
+
+class SendUltraUpgradePromotion extends Command
+{
+    protected $signature = 'ultra:send-upgrade-promo
+                            {--dry-run : Show what would be sent without actually sending}';
+
+    protected $description = 'Send a promotional email to Mini and Pro subscribers encouraging them to upgrade to Ultra';
+
+    public function handle(): int
+    {
+        $dryRun = $this->option('dry-run');
+
+        if ($dryRun) {
+            $this->info('DRY RUN - No emails will be sent');
+        }
+
+        $miniPriceIds = array_filter([
+            config('subscriptions.plans.mini.stripe_price_id'),
+            config('subscriptions.plans.mini.stripe_price_id_eap'),
+        ]);
+
+        $proPriceIds = array_filter([
+            config('subscriptions.plans.pro.stripe_price_id'),
+            config('subscriptions.plans.pro.stripe_price_id_eap'),
+            config('subscriptions.plans.pro.stripe_price_id_discounted'),
+        ]);
+
+        $eligiblePriceIds = array_merge($miniPriceIds, $proPriceIds);
+
+        $users = User::query()
+            ->whereHas('subscriptions', function ($query) use ($eligiblePriceIds) {
+                $query->where('stripe_status', 'active')
+                    ->where('is_comped', false)
+                    ->whereIn('stripe_price', $eligiblePriceIds);
+            })
+            ->get();
+
+        $this->info("Found {$users->count()} eligible subscriber(s)");
+
+        $sent = 0;
+
+        foreach ($users as $user) {
+            $priceId = $user->subscriptions()
+                ->where('stripe_status', 'active')
+                ->where('is_comped', false)
+                ->whereIn('stripe_price', $eligiblePriceIds)
+                ->value('stripe_price');
+
+            $planName = Subscription::fromStripePriceId($priceId)->name();
+
+            if ($dryRun) {
+                $this->line("Would send to: {$user->email} ({$planName})");
+            } else {
+                $user->notify(new UltraUpgradePromotion($planName));
+                $this->line("Sent to: {$user->email} ({$planName})");
+            }
+
+            $sent++;
+        }
+
+        $this->newLine();
+        $this->info($dryRun ? "Would send: {$sent} email(s)" : "Sent: {$sent} email(s)");
+
+        return Command::SUCCESS;
+    }
+}
diff --git a/app/Enums/Subscription.php b/app/Enums/Subscription.php
index 29d2a3c8..0b06551b 100644
--- a/app/Enums/Subscription.php
+++ b/app/Enums/Subscription.php
@@ -14,13 +14,35 @@ enum Subscription: string
 
     public static function fromStripeSubscription(\Stripe\Subscription $subscription): self
     {
-        $priceId = $subscription->items->first()?->price->id;
+        // Iterate items, skipping extra seat prices (multi-item subscriptions)
+        foreach ($subscription->items as $item) {
+            $priceId = $item->price->id;
 
-        if (! $priceId) {
-            throw new RuntimeException('Could not resolve Stripe price id from subscription object.');
+            if (self::isExtraSeatPrice($priceId)) {
+                continue;
+            }
+
+            return self::fromStripePriceId($priceId);
         }
 
-        return self::fromStripePriceId($priceId);
+        throw new RuntimeException('Could not resolve a plan price id from subscription items.');
+    }
+
+    public static function isExtraSeatPrice(string $priceId): bool
+    {
+        return in_array($priceId, array_filter([
+            config('subscriptions.plans.max.stripe_extra_seat_price_id'),
+            config('subscriptions.plans.max.stripe_extra_seat_price_id_monthly'),
+        ]));
+    }
+
+    public static function extraSeatStripePriceId(string $interval): ?string
+    {
+        return match ($interval) {
+            'year' => config('subscriptions.plans.max.stripe_extra_seat_price_id'),
+            'month' => config('subscriptions.plans.max.stripe_extra_seat_price_id_monthly'),
+            default => null,
+        };
     }
 
     public static function fromStripePriceId(string $priceId): self
@@ -34,8 +56,10 @@ public static function fromStripePriceId(string $priceId): self
             config('subscriptions.plans.pro.stripe_price_id_eap') => self::Pro,
             'price_1RoZk0AyFo6rlwXqjkLj4hZ0',
             config('subscriptions.plans.max.stripe_price_id'),
+            config('subscriptions.plans.max.stripe_price_id_monthly'),
             config('subscriptions.plans.max.stripe_price_id_discounted'),
-            config('subscriptions.plans.max.stripe_price_id_eap') => self::Max,
+            config('subscriptions.plans.max.stripe_price_id_eap'),
+            config('subscriptions.plans.max.stripe_price_id_comped') => self::Max,
             default => throw new RuntimeException("Unknown Stripe price id: {$priceId}"),
         };
     }
@@ -57,7 +81,7 @@ public function name(): string
         return config("subscriptions.plans.{$this->value}.name");
     }
 
-    public function stripePriceId(bool $forceEap = false, bool $discounted = false): string
+    public function stripePriceId(bool $forceEap = false, bool $discounted = false, string $interval = 'year'): string
     {
         // EAP ends June 1st at midnight UTC
         if (now()->isBefore('2025-06-01 00:00:00') || $forceEap) {
@@ -68,6 +92,10 @@ public function stripePriceId(bool $forceEap = false, bool $discounted = false):
             return config("subscriptions.plans.{$this->value}.stripe_price_id_discounted");
         }
 
+        if ($interval === 'month') {
+            return config("subscriptions.plans.{$this->value}.stripe_price_id_monthly");
+        }
+
         return config("subscriptions.plans.{$this->value}.stripe_price_id");
     }
 
diff --git a/app/Enums/TeamUserRole.php b/app/Enums/TeamUserRole.php
new file mode 100644
index 00000000..95fa8f29
--- /dev/null
+++ b/app/Enums/TeamUserRole.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace App\Enums;
+
+enum TeamUserRole: string
+{
+    case Owner = 'owner';
+    case Member = 'member';
+}
diff --git a/app/Enums/TeamUserStatus.php b/app/Enums/TeamUserStatus.php
new file mode 100644
index 00000000..f5ee3ecc
--- /dev/null
+++ b/app/Enums/TeamUserStatus.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Enums;
+
+enum TeamUserStatus: string
+{
+    case Pending = 'pending';
+    case Active = 'active';
+    case Removed = 'removed';
+}
diff --git a/app/Filament/Resources/UserResource/Pages/EditUser.php b/app/Filament/Resources/UserResource/Pages/EditUser.php
index e4a7199e..5774ad7c 100644
--- a/app/Filament/Resources/UserResource/Pages/EditUser.php
+++ b/app/Filament/Resources/UserResource/Pages/EditUser.php
@@ -7,6 +7,8 @@
 use App\Jobs\CreateAnystackLicenseJob;
 use App\Models\User;
 use Filament\Actions;
+use Filament\Forms\Components\Placeholder;
+use Filament\Forms\Components\Radio;
 use Filament\Forms\Components\Select;
 use Filament\Notifications\Notification;
 use Filament\Resources\Pages\EditRecord;
@@ -38,6 +40,98 @@ protected function getHeaderActions(): array
                     })
                     ->visible(fn (User $record) => empty($record->stripe_id)),
 
+                Actions\Action::make('compUltraSubscription')
+                    ->label('Comp Ultra Subscription')
+                    ->color('warning')
+                    ->icon('heroicon-o-sparkles')
+                    ->modalHeading('Comp Ultra Subscription')
+                    ->modalSubmitActionLabel('Comp Ultra')
+                    ->form(function (User $record): array {
+                        $existingSubscription = $record->subscription('default');
+                        $hasActiveSubscription = $existingSubscription && $existingSubscription->active();
+
+                        $fields = [];
+
+                        if ($hasActiveSubscription) {
+                            $currentPlan = 'their current plan';
+
+                            try {
+                                $currentPlan = Subscription::fromStripePriceId(
+                                    $existingSubscription->items->first()?->stripe_price ?? $existingSubscription->stripe_price
+                                )->name();
+                            } catch (\Exception) {
+                            }
+
+                            $fields[] = Placeholder::make('info')
+                                ->label('')
+                                ->content("This user has an active {$currentPlan} subscription. Choose when to switch them to the comped Ultra plan.");
+
+                            $fields[] = Radio::make('timing')
+                                ->label('When to switch')
+                                ->options([
+                                    'now' => 'Immediately — swap now and credit remaining value (swapAndInvoice)',
+                                    'renewal' => 'At renewal — keep current plan until period ends, then switch (swap)',
+                                ])
+                                ->default('now')
+                                ->required();
+                        } else {
+                            $fields[] = Placeholder::make('info')
+                                ->label('')
+                                ->content("This will create a free Ultra subscription for {$record->email}. A Stripe customer will be created if one doesn't exist.");
+                        }
+
+                        return $fields;
+                    })
+                    ->action(function (array $data, User $record): void {
+                        $compedPriceId = config('subscriptions.plans.max.stripe_price_id_comped');
+
+                        if (! $compedPriceId) {
+                            Notification::make()
+                                ->danger()
+                                ->title('STRIPE_ULTRA_COMP_PRICE_ID is not configured.')
+                                ->send();
+
+                            return;
+                        }
+
+                        $record->createOrGetStripeCustomer();
+
+                        $existingSubscription = $record->subscription('default');
+
+                        if ($existingSubscription && $existingSubscription->active()) {
+                            $timing = $data['timing'] ?? 'now';
+
+                            if ($timing === 'now') {
+                                $existingSubscription->skipTrial()->swapAndInvoice($compedPriceId);
+                                $message = 'Subscription swapped to comped Ultra immediately. Remaining value has been credited.';
+                            } else {
+                                $existingSubscription->skipTrial()->swap($compedPriceId);
+                                $message = 'Subscription will switch to comped Ultra at the end of the current billing period.';
+                            }
+
+                            Notification::make()
+                                ->success()
+                                ->title('Comped Ultra subscription applied.')
+                                ->body($message)
+                                ->send();
+                        } else {
+                            $record->newSubscription('default', $compedPriceId)->create();
+
+                            Notification::make()
+                                ->success()
+                                ->title('Comped Ultra subscription created.')
+                                ->body("Ultra subscription created for {$record->email}.")
+                                ->send();
+                        }
+                    })
+                    ->visible(function (User $record): bool {
+                        if (! config('subscriptions.plans.max.stripe_price_id_comped')) {
+                            return false;
+                        }
+
+                        return ! $record->hasActiveUltraSubscription();
+                    }),
+
                 Actions\Action::make('createAnystackLicense')
                     ->label('Create Anystack License')
                     ->color('gray')
diff --git a/app/Http/Controllers/Api/PluginAccessController.php b/app/Http/Controllers/Api/PluginAccessController.php
index 9e2a332b..e56d63ad 100644
--- a/app/Http/Controllers/Api/PluginAccessController.php
+++ b/app/Http/Controllers/Api/PluginAccessController.php
@@ -152,6 +152,45 @@ protected function getAccessiblePlugins(User $user): array
             }
         }
 
+        // Team members get access to official plugins and owner's purchased plugins
+        if ($user->isUltraTeamMember()) {
+            $officialPlugins = Plugin::query()
+                ->where('type', PluginType::Paid)
+                ->where('is_official', true)
+                ->whereNotNull('name')
+                ->get(['name']);
+
+            foreach ($officialPlugins as $plugin) {
+                if (! collect($plugins)->contains('name', $plugin->name)) {
+                    $plugins[] = [
+                        'name' => $plugin->name,
+                        'access' => 'team',
+                    ];
+                }
+            }
+        }
+
+        $teamOwner = $user->getTeamOwner();
+
+        if ($teamOwner) {
+            $teamPlugins = $teamOwner->pluginLicenses()
+                ->active()
+                ->with('plugin:id,name')
+                ->get()
+                ->pluck('plugin')
+                ->filter()
+                ->unique('id');
+
+            foreach ($teamPlugins as $plugin) {
+                if (! collect($plugins)->contains('name', $plugin->name)) {
+                    $plugins[] = [
+                        'name' => $plugin->name,
+                        'access' => 'team',
+                    ];
+                }
+            }
+        }
+
         return $plugins;
     }
 }
diff --git a/app/Http/Controllers/Auth/CustomerAuthController.php b/app/Http/Controllers/Auth/CustomerAuthController.php
index 9e13cd89..67a5e7e8 100644
--- a/app/Http/Controllers/Auth/CustomerAuthController.php
+++ b/app/Http/Controllers/Auth/CustomerAuthController.php
@@ -2,9 +2,11 @@
 
 namespace App\Http\Controllers\Auth;
 
+use App\Enums\TeamUserStatus;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\Auth\LoginRequest;
 use App\Models\Plugin;
+use App\Models\TeamUser;
 use App\Models\User;
 use App\Services\CartService;
 use Illuminate\Auth\Passwords\PasswordBroker;
@@ -48,6 +50,9 @@ public function register(Request $request): RedirectResponse
         // Transfer guest cart to user
         $this->cartService->transferGuestCartToUser($user);
 
+        // Check for pending team invitation
+        $this->acceptPendingTeamInvitation($user);
+
         // Check for pending add-to-cart action
         $pendingPluginId = session()->pull('pending_add_to_cart');
         if ($pendingPluginId) {
@@ -79,6 +84,9 @@ public function login(LoginRequest $request): RedirectResponse
         // Transfer guest cart to user
         $this->cartService->transferGuestCartToUser($user);
 
+        // Check for pending team invitation
+        $this->acceptPendingTeamInvitation($user);
+
         // Check for pending add-to-cart action
         $pendingPluginId = session()->pull('pending_add_to_cart');
         if ($pendingPluginId) {
@@ -157,4 +165,23 @@ function ($user, $password): void {
             ? to_route('customer.login')->with('status', __($status))
             : back()->withErrors(['email' => [__($status)]]);
     }
+
+    private function acceptPendingTeamInvitation(User $user): void
+    {
+        $token = session()->pull('pending_team_invitation_token');
+
+        if (! $token) {
+            return;
+        }
+
+        $teamUser = TeamUser::where('invitation_token', $token)
+            ->where('email', $user->email)
+            ->where('status', TeamUserStatus::Pending)
+            ->first();
+
+        if ($teamUser) {
+            $teamUser->accept($user);
+            session()->flash('success', "You've joined {$teamUser->team->name}!");
+        }
+    }
 }
diff --git a/app/Http/Controllers/CartController.php b/app/Http/Controllers/CartController.php
index 82fd3743..1f891091 100644
--- a/app/Http/Controllers/CartController.php
+++ b/app/Http/Controllers/CartController.php
@@ -2,8 +2,10 @@
 
 namespace App\Http\Controllers;
 
+use App\Models\Cart;
 use App\Models\Plugin;
 use App\Models\PluginBundle;
+use App\Models\PluginLicense;
 use App\Models\Product;
 use App\Services\CartService;
 use Illuminate\Http\JsonResponse;
@@ -266,6 +268,11 @@ public function checkout(Request $request): RedirectResponse
         // Refresh prices
         $this->cartService->refreshPrices($cart);
 
+        // If total is $0, skip Stripe entirely and create licenses directly
+        if ($cart->getSubtotal() === 0) {
+            return $this->processFreeCheckout($cart, $user);
+        }
+
         try {
             $session = $this->createMultiItemCheckoutSession($cart, $user);
 
@@ -287,6 +294,22 @@ public function checkout(Request $request): RedirectResponse
 
     public function success(Request $request): View|RedirectResponse
     {
+        if ($request->query('free')) {
+            $user = Auth::user();
+
+            $cart = Cart::where('user_id', $user->id)
+                ->whereNotNull('completed_at')
+                ->latest('completed_at')
+                ->with('items.plugin', 'items.pluginBundle.plugins', 'items.product')
+                ->first();
+
+            return view('cart.success', [
+                'sessionId' => null,
+                'isFreeCheckout' => true,
+                'cart' => $cart,
+            ]);
+        }
+
         $sessionId = $request->query('session_id');
 
         // Validate session ID exists and looks like a real Stripe session ID
@@ -299,6 +322,51 @@ public function success(Request $request): View|RedirectResponse
 
         return view('cart.success', [
             'sessionId' => $sessionId,
+            'isFreeCheckout' => false,
+            'cart' => null,
+        ]);
+    }
+
+    protected function processFreeCheckout(Cart $cart, $user): RedirectResponse
+    {
+        $cart->load('items.plugin', 'items.pluginBundle.plugins', 'items.product');
+
+        foreach ($cart->items as $item) {
+            if ($item->isBundle()) {
+                foreach ($item->pluginBundle->plugins as $plugin) {
+                    $this->createFreePluginLicense($user, $plugin);
+                }
+            } elseif (! $item->isProduct() && $item->plugin) {
+                $this->createFreePluginLicense($user, $item->plugin);
+            }
+        }
+
+        $cart->markAsCompleted();
+
+        $user->getPluginLicenseKey();
+
+        Log::info('Free checkout completed', [
+            'cart_id' => $cart->id,
+            'user_id' => $user->id,
+            'item_count' => $cart->items->count(),
+        ]);
+
+        return to_route('cart.success', ['free' => 1]);
+    }
+
+    protected function createFreePluginLicense($user, Plugin $plugin): void
+    {
+        if ($user->pluginLicenses()->forPlugin($plugin)->active()->exists()) {
+            return;
+        }
+
+        PluginLicense::create([
+            'user_id' => $user->id,
+            'plugin_id' => $plugin->id,
+            'price_paid' => 0,
+            'currency' => 'USD',
+            'is_grandfathered' => false,
+            'purchased_at' => now(),
         ]);
     }
 
diff --git a/app/Http/Controllers/CustomerLicenseController.php b/app/Http/Controllers/CustomerLicenseController.php
index fd365ac9..4a8f0de4 100644
--- a/app/Http/Controllers/CustomerLicenseController.php
+++ b/app/Http/Controllers/CustomerLicenseController.php
@@ -27,18 +27,44 @@ public function index(): View
         $licenseCount = $user->licenses()->count();
         $isEapCustomer = $user->isEapCustomer();
         $activeSubscription = $user->subscription();
-        $pluginLicenseCount = $user->pluginLicenses()->count();
+        $ownPluginIds = $user->pluginLicenses()->pluck('plugin_id');
+        $teamPluginCount = 0;
+        $teamMembership = $user->activeTeamMembership();
+
+        if ($teamMembership) {
+            $teamPluginCount = $teamMembership->team->owner
+                ->pluginLicenses()
+                ->active()
+                ->whereNotIn('plugin_id', $ownPluginIds)
+                ->distinct('plugin_id')
+                ->count('plugin_id');
+        }
+
+        $pluginLicenseCount = $ownPluginIds->count() + $teamPluginCount;
 
         // Get subscription plan name
         $subscriptionName = null;
         if ($activeSubscription) {
-            if ($activeSubscription->stripe_price) {
-                try {
-                    $subscriptionName = Subscription::fromStripePriceId($activeSubscription->stripe_price)->name();
-                } catch (\RuntimeException) {
+            try {
+                // On multi-item subscriptions, stripe_price may be null.
+                // Find the plan price from subscription items, skipping extra seat prices.
+                $planPriceId = $activeSubscription->stripe_price;
+
+                if (! $planPriceId) {
+                    foreach ($activeSubscription->items as $item) {
+                        if (! Subscription::isExtraSeatPrice($item->stripe_price)) {
+                            $planPriceId = $item->stripe_price;
+                            break;
+                        }
+                    }
+                }
+
+                if ($planPriceId) {
+                    $subscriptionName = Subscription::fromStripePriceId($planPriceId)->name();
+                } else {
                     $subscriptionName = ucfirst($activeSubscription->type);
                 }
-            } else {
+            } catch (\RuntimeException) {
                 $subscriptionName = ucfirst($activeSubscription->type);
             }
         }
@@ -70,6 +96,15 @@ public function index(): View
 
         $developerAccount = $user->developerAccount;
 
+        // Team info
+        $ownedTeam = $user->ownedTeam;
+        $hasTeam = $ownedTeam !== null;
+        $teamName = $ownedTeam?->name;
+        $teamMemberCount = $ownedTeam?->activeUserCount() ?? 0;
+        $teamPendingCount = $ownedTeam?->pendingInvitations()->count() ?? 0;
+        $hasMaxAccess = $user->hasActiveUltraSubscription();
+        $showUltraUpsell = ! $hasMaxAccess && ($licenseCount > 0 || $activeSubscription);
+
         return view('customer.dashboard', compact(
             'licenseCount',
             'isEapCustomer',
@@ -80,7 +115,13 @@ public function index(): View
             'connectedAccountsCount',
             'connectedAccountsDescription',
             'totalPurchases',
-            'developerAccount'
+            'developerAccount',
+            'hasTeam',
+            'teamName',
+            'teamMemberCount',
+            'teamPendingCount',
+            'hasMaxAccess',
+            'showUltraUpsell'
         ));
     }
 
diff --git a/app/Http/Controllers/CustomerPurchasedPluginsController.php b/app/Http/Controllers/CustomerPurchasedPluginsController.php
index 35a53669..53d16bee 100644
--- a/app/Http/Controllers/CustomerPurchasedPluginsController.php
+++ b/app/Http/Controllers/CustomerPurchasedPluginsController.php
@@ -23,6 +23,28 @@ public function index(): View
             ->orderBy('purchased_at', 'desc')
             ->get();
 
-        return view('customer.purchased-plugins.index', compact('pluginLicenses', 'pluginLicenseKey'));
+        // Team plugins for team members
+        $teamPlugins = collect();
+        $teamOwnerName = null;
+        $teamMembership = $user->activeTeamMembership();
+
+        if ($teamMembership) {
+            $teamOwner = $teamMembership->team->owner;
+            $teamOwnerName = $teamOwner->display_name;
+            $teamPlugins = $teamOwner->pluginLicenses()
+                ->active()
+                ->with('plugin')
+                ->get()
+                ->pluck('plugin')
+                ->filter()
+                ->unique('id');
+        }
+
+        return view('customer.purchased-plugins.index', compact(
+            'pluginLicenses',
+            'pluginLicenseKey',
+            'teamPlugins',
+            'teamOwnerName',
+        ));
     }
 }
diff --git a/app/Http/Controllers/GitHubIntegrationController.php b/app/Http/Controllers/GitHubIntegrationController.php
index de99b114..8298de3b 100644
--- a/app/Http/Controllers/GitHubIntegrationController.php
+++ b/app/Http/Controllers/GitHubIntegrationController.php
@@ -164,11 +164,11 @@ public function requestClaudePluginsAccess(): RedirectResponse
             return back()->with('error', 'Please connect your GitHub account first.');
         }
 
-        // Check if user has a Plugin Dev Kit license
+        // Check if user has a Plugin Dev Kit license or is an Ultra team member
         $pluginDevKit = Product::where('slug', 'plugin-dev-kit')->first();
 
-        if (! $pluginDevKit || ! $user->hasProductLicense($pluginDevKit)) {
-            return back()->with('error', 'You need a Plugin Dev Kit license to access the claude-code repository.');
+        if (! $user->isUltraTeamMember() && (! $pluginDevKit || ! $user->hasProductLicense($pluginDevKit))) {
+            return back()->with('error', 'You need a Plugin Dev Kit license or Ultra team membership to access the claude-code repository.');
         }
 
         $github = GitHubOAuth::make();
diff --git a/app/Http/Controllers/LicenseRenewalController.php b/app/Http/Controllers/LicenseRenewalController.php
index 88f77b41..4076bdf2 100644
--- a/app/Http/Controllers/LicenseRenewalController.php
+++ b/app/Http/Controllers/LicenseRenewalController.php
@@ -18,37 +18,31 @@ public function show(Request $request, string $licenseKey): View
             ->with('user')
             ->firstOrFail();
 
-        // Ensure the user owns this license (if they're logged in)
-        if (auth()->check() && $license->user_id !== auth()->id()) {
+        if ($license->user_id !== auth()->id()) {
             abort(403, 'You can only renew your own licenses.');
         }
 
-        $subscriptionType = Subscription::from($license->policy_name);
-        $isNearExpiry = $license->expires_at->isPast() || $license->expires_at->diffInDays(now()) <= 30;
-
         return view('license.renewal', [
             'license' => $license,
-            'subscriptionType' => $subscriptionType,
-            'isNearExpiry' => $isNearExpiry,
-            'stripePriceId' => $subscriptionType->stripePriceId(forceEap: true), // Will use EAP pricing
-            'stripePublishableKey' => config('cashier.key'),
         ]);
     }
 
     public function createCheckoutSession(Request $request, string $licenseKey)
     {
+        $request->validate([
+            'billing_period' => ['required', 'in:yearly,monthly'],
+        ]);
+
         $license = License::where('key', $licenseKey)
             ->whereNull('subscription_item_id') // Only legacy licenses
             ->whereNotNull('expires_at') // Must have an expiry date
             ->with('user')
             ->firstOrFail();
 
-        // Ensure the user owns this license (if they're logged in)
-        if (auth()->check() && $license->user_id !== auth()->id()) {
+        if ($license->user_id !== auth()->id()) {
             abort(403, 'You can only renew your own licenses.');
         }
 
-        $subscriptionType = Subscription::from($license->policy_name);
         $user = $license->user;
 
         // Ensure the user has a Stripe customer ID
@@ -56,27 +50,33 @@ public function createCheckoutSession(Request $request, string $licenseKey)
             $user->createAsStripeCustomer();
         }
 
+        // Always upgrade to Ultra (Max) - EAP yearly or standard monthly
+        $ultra = Subscription::Max;
+        $priceId = $request->billing_period === 'monthly'
+            ? $ultra->stripePriceId(interval: 'month')
+            : $ultra->stripePriceId(forceEap: true);
+
         // Create Stripe checkout session
         $stripe = new StripeClient(config('cashier.secret'));
 
         $checkoutSession = $stripe->checkout->sessions->create([
             'payment_method_types' => ['card'],
             'line_items' => [[
-                'price' => $subscriptionType->stripePriceId(forceEap: true), // Uses EAP pricing
+                'price' => $priceId,
                 'quantity' => 1,
             ]],
             'mode' => 'subscription',
             'success_url' => route('license.renewal.success', ['license' => $licenseKey]).'?session_id={CHECKOUT_SESSION_ID}',
             'cancel_url' => route('license.renewal', ['license' => $licenseKey]),
-            'customer' => $user->stripe_id, // Use existing customer ID
+            'customer' => $user->stripe_id,
             'customer_update' => [
-                'name' => 'auto', // Allow Stripe to update customer name for tax ID collection
-                'address' => 'auto', // Allow Stripe to update customer address for tax ID collection
+                'name' => 'auto',
+                'address' => 'auto',
             ],
             'metadata' => [
                 'license_key' => $licenseKey,
                 'license_id' => $license->id,
-                'renewal' => 'true', // Flag this as a renewal, not a new purchase
+                'renewal' => 'true',
             ],
             'consent_collection' => [
                 'terms_of_service' => 'required',
diff --git a/app/Http/Controllers/TeamController.php b/app/Http/Controllers/TeamController.php
new file mode 100644
index 00000000..fac09023
--- /dev/null
+++ b/app/Http/Controllers/TeamController.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\View\View;
+
+class TeamController extends Controller
+{
+    public function __construct()
+    {
+        $this->middleware('auth');
+    }
+
+    public function index(): View
+    {
+        $user = Auth::user();
+        $team = $user->ownedTeam;
+        $membership = $user->activeTeamMembership();
+
+        return view('customer.team.index', compact('team', 'membership'));
+    }
+
+    public function store(Request $request): RedirectResponse
+    {
+        $user = Auth::user();
+
+        if (! $user->hasActiveUltraSubscription()) {
+            return back()->with('error', 'You need an active Ultra subscription to create a team.');
+        }
+
+        if ($user->ownedTeam) {
+            return back()->with('error', 'You already have a team.');
+        }
+
+        $request->validate([
+            'name' => ['required', 'string', 'max:255'],
+        ]);
+
+        $user->ownedTeam()->create([
+            'name' => $request->name,
+        ]);
+
+        return to_route('customer.team.index')
+            ->with('success', 'Team created successfully!');
+    }
+
+    public function update(Request $request): RedirectResponse
+    {
+        $user = Auth::user();
+        $team = $user->ownedTeam;
+
+        if (! $team) {
+            return back()->with('error', 'You do not own a team.');
+        }
+
+        $request->validate([
+            'name' => ['required', 'string', 'max:255'],
+        ]);
+
+        $team->update(['name' => $request->name]);
+
+        return back()->with('success', 'Team name updated.');
+    }
+}
diff --git a/app/Http/Controllers/TeamUserController.php b/app/Http/Controllers/TeamUserController.php
new file mode 100644
index 00000000..40ae2ba4
--- /dev/null
+++ b/app/Http/Controllers/TeamUserController.php
@@ -0,0 +1,148 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Enums\TeamUserStatus;
+use App\Http\Requests\InviteTeamUserRequest;
+use App\Jobs\RevokeTeamUserAccessJob;
+use App\Models\TeamUser;
+use App\Notifications\TeamInvitation;
+use App\Notifications\TeamUserRemoved;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Notification;
+use Illuminate\Support\Facades\RateLimiter;
+
+class TeamUserController extends Controller
+{
+    public function __construct()
+    {
+        $this->middleware('auth')->except('accept');
+    }
+
+    public function invite(InviteTeamUserRequest $request): RedirectResponse
+    {
+        $user = Auth::user();
+        $team = $user->ownedTeam;
+
+        if (! $team) {
+            return back()->with('error', 'You do not have a team.');
+        }
+
+        if ($team->is_suspended) {
+            return back()->with('error', 'Your team is currently suspended.');
+        }
+
+        // Rate limit: 5 invites per minute per team
+        $rateLimitKey = "team-invite:{$team->id}";
+        if (RateLimiter::tooManyAttempts($rateLimitKey, 5)) {
+            return back()->with('error', 'Too many invitations sent. Please wait a moment.');
+        }
+        RateLimiter::hit($rateLimitKey, 60);
+
+        $email = $request->validated()['email'];
+
+        // Check for duplicate (active or pending)
+        $existingMember = $team->users()
+            ->where('email', $email)
+            ->whereIn('status', [TeamUserStatus::Pending, TeamUserStatus::Active])
+            ->first();
+
+        if ($existingMember) {
+            return back()->with('error', 'This email has already been invited or is an active member.');
+        }
+
+        if ($team->isOverIncludedLimit()) {
+            return back()->with('show_add_seats', true);
+        }
+
+        $member = $team->users()->create([
+            'email' => $email,
+            'invitation_token' => bin2hex(random_bytes(32)),
+            'invited_at' => now(),
+        ]);
+
+        Notification::route('mail', $email)
+            ->notify(new TeamInvitation($member));
+
+        return back()->with('success', "Invitation sent to {$email}.");
+    }
+
+    public function remove(TeamUser $teamUser): RedirectResponse
+    {
+        $user = Auth::user();
+
+        if (! $user->ownedTeam || $teamUser->team_id !== $user->ownedTeam->id) {
+            return back()->with('error', 'You are not authorized to remove this member.');
+        }
+
+        $teamUser->remove();
+
+        Notification::route('mail', $teamUser->email)
+            ->notify(new TeamUserRemoved($teamUser));
+
+        if ($teamUser->user_id) {
+            dispatch(new RevokeTeamUserAccessJob($teamUser->user_id));
+        }
+
+        return back()->with('success', "{$teamUser->email} has been removed from the team.");
+    }
+
+    public function resend(TeamUser $teamUser): RedirectResponse
+    {
+        $user = Auth::user();
+
+        if (! $user->ownedTeam || $teamUser->team_id !== $user->ownedTeam->id) {
+            return back()->with('error', 'You are not authorized to resend this invitation.');
+        }
+
+        if (! $teamUser->isPending()) {
+            return back()->with('error', 'This invitation cannot be resent.');
+        }
+
+        // Rate limit: 1 resend per minute per member
+        $rateLimitKey = "team-resend:{$teamUser->id}";
+        if (RateLimiter::tooManyAttempts($rateLimitKey, 1)) {
+            return back()->with('error', 'Please wait before resending this invitation.');
+        }
+        RateLimiter::hit($rateLimitKey, 60);
+
+        Notification::route('mail', $teamUser->email)
+            ->notify(new TeamInvitation($teamUser));
+
+        return back()->with('success', "Invitation resent to {$teamUser->email}.");
+    }
+
+    public function accept(string $token): RedirectResponse
+    {
+        $teamUser = TeamUser::where('invitation_token', $token)
+            ->where('status', TeamUserStatus::Pending)
+            ->first();
+
+        if (! $teamUser) {
+            return to_route('dashboard')
+                ->with('error', 'This invitation is invalid or has already been used.');
+        }
+
+        $user = Auth::user();
+
+        if ($user) {
+            // Authenticated user
+            if (strtolower($user->email) !== strtolower($teamUser->email)) {
+                return to_route('dashboard')
+                    ->with('error', 'This invitation was sent to a different email address.');
+            }
+
+            $teamUser->accept($user);
+
+            return to_route('dashboard')
+                ->with('success', "You've joined {$teamUser->team->name}!");
+        }
+
+        // Not authenticated — store token in session and redirect to login
+        session(['pending_team_invitation_token' => $token]);
+
+        return to_route('customer.login')
+            ->with('message', 'Please log in or register to accept your team invitation.');
+    }
+}
diff --git a/app/Http/Requests/InviteTeamUserRequest.php b/app/Http/Requests/InviteTeamUserRequest.php
new file mode 100644
index 00000000..52e2f064
--- /dev/null
+++ b/app/Http/Requests/InviteTeamUserRequest.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class InviteTeamUserRequest extends FormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    /**
+     * @return array<string, array<int, string>>
+     */
+    public function rules(): array
+    {
+        return [
+            'email' => ['required', 'email', 'max:255'],
+        ];
+    }
+}
diff --git a/app/Jobs/HandleInvoicePaidJob.php b/app/Jobs/HandleInvoicePaidJob.php
index 12b5dcf6..3f5316f2 100644
--- a/app/Jobs/HandleInvoicePaidJob.php
+++ b/app/Jobs/HandleInvoicePaidJob.php
@@ -29,6 +29,7 @@
 use Laravel\Cashier\Cashier;
 use Laravel\Cashier\SubscriptionItem;
 use Stripe\Invoice;
+use Stripe\StripeObject;
 use UnexpectedValueException;
 
 class HandleInvoicePaidJob implements ShouldQueue
@@ -49,13 +50,22 @@ public function handle(): void
 
         match ($this->invoice->billing_reason) {
             Invoice::BILLING_REASON_SUBSCRIPTION_CREATE => $this->handleSubscriptionCreated(),
-            Invoice::BILLING_REASON_SUBSCRIPTION_UPDATE => null, // TODO: Handle subscription update
+            Invoice::BILLING_REASON_SUBSCRIPTION_UPDATE => $this->handleSubscriptionUpdate(),
             Invoice::BILLING_REASON_SUBSCRIPTION_CYCLE => $this->handleSubscriptionRenewal(),
             Invoice::BILLING_REASON_MANUAL => $this->handleManualInvoice(),
             default => null,
         };
     }
 
+    private function handleSubscriptionUpdate(): void
+    {
+        Log::info('HandleInvoicePaidJob: subscription update invoice received, no license action needed.', [
+            'invoice_id' => $this->invoice->id,
+        ]);
+
+        $this->updateSubscriptionCompedStatus();
+    }
+
     private function handleSubscriptionCreated(): void
     {
         // Get the subscription to check for renewal metadata
@@ -68,12 +78,14 @@ private function handleSubscriptionCreated(): void
 
         if ($isRenewal && $licenseKey && $licenseId) {
             $this->handleLegacyLicenseRenewal($subscription, $licenseKey, $licenseId);
+            $this->updateSubscriptionCompedStatus();
 
             return;
         }
 
         // Normal flow - create a new license
         $this->createLicense();
+        $this->updateSubscriptionCompedStatus();
     }
 
     private function handleLegacyLicenseRenewal($subscription, string $licenseKey, string $licenseId): void
@@ -100,7 +112,7 @@ private function handleLegacyLicenseRenewal($subscription, string $licenseKey, s
         }
 
         // Get the subscription item
-        if (blank($subscriptionItemId = $this->invoice->lines->first()->subscription_item)) {
+        if (blank($subscriptionItemId = $this->findPlanLineItem()->subscription_item)) {
             throw new UnexpectedValueException('Failed to retrieve the Stripe subscription item id from invoice lines.');
         }
 
@@ -134,10 +146,10 @@ private function createLicense(): void
         Sleep::sleep(10);
 
         // Assert the invoice line item is for a price_id that relates to a license plan.
-        $plan = Subscription::fromStripePriceId($this->invoice->lines->first()->price->id);
+        $plan = Subscription::fromStripePriceId($this->findPlanLineItem()->price->id);
 
         // Assert the invoice line item relates to a subscription and has a subscription item id.
-        if (blank($subscriptionItemId = $this->invoice->lines->first()->subscription_item)) {
+        if (blank($subscriptionItemId = $this->findPlanLineItem()->subscription_item)) {
             throw new UnexpectedValueException('Failed to retrieve the Stripe subscription item id from invoice lines.');
         }
 
@@ -163,7 +175,7 @@ private function createLicense(): void
     private function handleSubscriptionRenewal(): void
     {
         // Get the subscription item ID from the invoice line
-        if (blank($subscriptionItemId = $this->invoice->lines->first()->subscription_item)) {
+        if (blank($subscriptionItemId = $this->findPlanLineItem()->subscription_item)) {
             throw new UnexpectedValueException('Failed to retrieve the Stripe subscription item id from invoice lines.');
         }
 
@@ -197,6 +209,8 @@ private function handleSubscriptionRenewal(): void
             'subscription_id' => $this->invoice->subscription,
             'invoice_id' => $this->invoice->id,
         ]);
+
+        $this->updateSubscriptionCompedStatus();
     }
 
     private function handleManualInvoice(): void
@@ -609,6 +623,42 @@ private function createBundlePluginLicense(User $user, Plugin $plugin, PluginBun
         return $license;
     }
 
+    /**
+     * Mark the local Cashier subscription as comped if the invoice total is zero.
+     */
+    private function updateSubscriptionCompedStatus(): void
+    {
+        if (! $this->invoice->subscription) {
+            return;
+        }
+
+        $subscription = \Laravel\Cashier\Subscription::where('stripe_id', $this->invoice->subscription)->first();
+
+        if ($subscription) {
+            $invoiceTotal = $this->invoice->total ?? 0;
+
+            $subscription->update([
+                'is_comped' => $invoiceTotal <= 0,
+            ]);
+        }
+    }
+
+    /**
+     * Find the plan line item from invoice lines, filtering out extra seat price items.
+     */
+    private function findPlanLineItem(): ?StripeObject
+    {
+        foreach ($this->invoice->lines->data as $line) {
+            if ($line->price && Subscription::isExtraSeatPrice($line->price->id)) {
+                continue;
+            }
+
+            return $line;
+        }
+
+        return null;
+    }
+
     private function sendDeveloperSaleNotifications(string $invoiceId): void
     {
         $payouts = PluginPayout::query()
diff --git a/app/Jobs/RevokeTeamUserAccessJob.php b/app/Jobs/RevokeTeamUserAccessJob.php
new file mode 100644
index 00000000..702f1bf0
--- /dev/null
+++ b/app/Jobs/RevokeTeamUserAccessJob.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Models\Product;
+use App\Models\User;
+use App\Support\GitHubOAuth;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Log;
+
+class RevokeTeamUserAccessJob implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    public int $tries = 3;
+
+    public int $backoff = 60;
+
+    public function __construct(public int $userId) {}
+
+    public function handle(): void
+    {
+        $user = User::find($this->userId);
+
+        if (! $user) {
+            return;
+        }
+
+        $pluginDevKit = Product::where('slug', 'plugin-dev-kit')->first();
+
+        if (! $pluginDevKit) {
+            return;
+        }
+
+        // If user still has access via direct license or another team, skip
+        if ($user->productLicenses()->forProduct($pluginDevKit)->exists()) {
+            return;
+        }
+
+        if ($user->isUltraTeamMember()) {
+            return;
+        }
+
+        if (! $user->github_username || ! $user->claude_plugins_repo_access_granted_at) {
+            return;
+        }
+
+        $github = GitHubOAuth::make();
+        $github->removeFromClaudePluginsRepo($user->github_username);
+
+        $user->update(['claude_plugins_repo_access_granted_at' => null]);
+
+        Log::info('Revoked claude-plugins repo access for removed team member', [
+            'user_id' => $user->id,
+        ]);
+    }
+}
diff --git a/app/Jobs/SuspendTeamJob.php b/app/Jobs/SuspendTeamJob.php
new file mode 100644
index 00000000..7b59451e
--- /dev/null
+++ b/app/Jobs/SuspendTeamJob.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Models\User;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Log;
+
+class SuspendTeamJob implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    public int $tries = 3;
+
+    public int $backoff = 60;
+
+    public function __construct(public int $userId) {}
+
+    public function handle(): void
+    {
+        $user = User::find($this->userId);
+
+        if (! $user) {
+            return;
+        }
+
+        $team = $user->ownedTeam;
+
+        if (! $team) {
+            return;
+        }
+
+        $team->suspend();
+
+        Log::info('Team suspended due to subscription change', [
+            'team_id' => $team->id,
+            'user_id' => $user->id,
+        ]);
+
+        // Revoke access for all active members
+        $team->activeUsers()
+            ->whereNotNull('user_id')
+            ->each(function ($member): void {
+                dispatch(new RevokeTeamUserAccessJob($member->user_id));
+            });
+    }
+}
diff --git a/app/Jobs/UnsuspendTeamJob.php b/app/Jobs/UnsuspendTeamJob.php
new file mode 100644
index 00000000..fe5a2158
--- /dev/null
+++ b/app/Jobs/UnsuspendTeamJob.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Models\User;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Log;
+
+class UnsuspendTeamJob implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    public int $tries = 3;
+
+    public int $backoff = 60;
+
+    public function __construct(public int $userId) {}
+
+    public function handle(): void
+    {
+        $user = User::find($this->userId);
+
+        if (! $user) {
+            return;
+        }
+
+        $team = $user->ownedTeam;
+
+        if (! $team || ! $team->is_suspended) {
+            return;
+        }
+
+        if (! $user->hasMaxAccess()) {
+            return;
+        }
+
+        $team->unsuspend();
+
+        Log::info('Team unsuspended due to subscription reactivation', [
+            'team_id' => $team->id,
+            'user_id' => $user->id,
+        ]);
+    }
+}
diff --git a/app/Listeners/StripeWebhookReceivedListener.php b/app/Listeners/StripeWebhookReceivedListener.php
index b8274812..7544b010 100644
--- a/app/Listeners/StripeWebhookReceivedListener.php
+++ b/app/Listeners/StripeWebhookReceivedListener.php
@@ -5,6 +5,8 @@
 use App\Jobs\CreateUserFromStripeCustomer;
 use App\Jobs\HandleInvoicePaidJob;
 use App\Jobs\RemoveDiscordMaxRoleJob;
+use App\Jobs\SuspendTeamJob;
+use App\Jobs\UnsuspendTeamJob;
 use App\Models\User;
 use App\Notifications\SubscriptionCancelled;
 use Exception;
@@ -73,6 +75,8 @@ private function handleSubscriptionDeleted(WebhookReceived $event): void
         }
 
         $this->removeDiscordRoleIfNoMaxLicense($user);
+
+        dispatch(new SuspendTeamJob($user->id));
     }
 
     private function handleSubscriptionUpdated(WebhookReceived $event): void
@@ -96,6 +100,12 @@ private function handleSubscriptionUpdated(WebhookReceived $event): void
 
         if (in_array($status, ['canceled', 'unpaid', 'past_due', 'incomplete_expired'])) {
             $this->removeDiscordRoleIfNoMaxLicense($user);
+            dispatch(new SuspendTeamJob($user->id));
+        }
+
+        // Detect reactivation: status changed to active from a non-active state
+        if ($status === 'active' && isset($previousAttributes['status'])) {
+            dispatch(new UnsuspendTeamJob($user->id));
         }
     }
 
diff --git a/app/Livewire/Customer/Dashboard.php b/app/Livewire/Customer/Dashboard.php
index 2063320e..9818a50f 100644
--- a/app/Livewire/Customer/Dashboard.php
+++ b/app/Livewire/Customer/Dashboard.php
@@ -3,6 +3,7 @@
 namespace App\Livewire\Customer;
 
 use App\Enums\Subscription;
+use App\Models\Team;
 use Livewire\Attributes\Computed;
 use Livewire\Attributes\Layout;
 use Livewire\Attributes\Title;
@@ -50,6 +51,24 @@ public function subscriptionName(): ?string
         return ucfirst($subscription->type);
     }
 
+    #[Computed]
+    public function hasUltraSubscription(): bool
+    {
+        return auth()->user()->hasActiveUltraSubscription();
+    }
+
+    #[Computed]
+    public function ownedTeam(): ?Team
+    {
+        return auth()->user()->ownedTeam;
+    }
+
+    #[Computed]
+    public function teamMemberCount(): int
+    {
+        return $this->ownedTeam?->activeUserCount() ?? 0;
+    }
+
     #[Computed]
     public function pluginLicenseCount(): int
     {
diff --git a/app/Livewire/Customer/Plugins/Create.php b/app/Livewire/Customer/Plugins/Create.php
index f4612445..deddedb0 100644
--- a/app/Livewire/Customer/Plugins/Create.php
+++ b/app/Livewire/Customer/Plugins/Create.php
@@ -9,7 +9,9 @@
 use App\Notifications\PluginSubmitted;
 use App\Services\GitHubUserService;
 use App\Services\PluginSyncService;
+use Illuminate\Support\Facades\Cache;
 use Laravel\Pennant\Feature;
+use Livewire\Attributes\Computed;
 use Livewire\Attributes\Layout;
 use Livewire\Attributes\Title;
 use Livewire\Component;
@@ -20,25 +22,57 @@ class Create extends Component
 {
     public string $pluginType = 'free';
 
+    public string $selectedOwner = '';
+
     public string $repository = '';
 
-    /** @var array<int, array{id: int, full_name: string, private: bool}> */
+    /** @var array<int, array{id: int, full_name: string, name: string, owner: string, private: bool}> */
     public array $repositories = [];
 
     public bool $loadingRepos = false;
 
     public bool $reposLoaded = false;
 
+    #[Computed]
+    public function owners(): array
+    {
+        return collect($this->repositories)
+            ->pluck('owner')
+            ->unique()
+            ->sort(SORT_NATURAL | SORT_FLAG_CASE)
+            ->values()
+            ->toArray();
+    }
+
+    #[Computed]
+    public function ownerRepositories(): array
+    {
+        if ($this->selectedOwner === '') {
+            return [];
+        }
+
+        return collect($this->repositories)
+            ->where('owner', $this->selectedOwner)
+            ->sortBy('name', SORT_NATURAL | SORT_FLAG_CASE)
+            ->values()
+            ->toArray();
+    }
+
+    public function updatedSelectedOwner(): void
+    {
+        $this->repository = '';
+    }
+
     public function mount(): void
     {
         if (auth()->user()->github_id) {
-            $this->loadRepositories();
+            $this->loadingRepos = true;
         }
     }
 
     public function loadRepositories(): void
     {
-        if ($this->loadingRepos || $this->reposLoaded) {
+        if ($this->reposLoaded) {
             return;
         }
 
@@ -48,14 +82,23 @@ public function loadRepositories(): void
             $user = auth()->user();
 
             if ($user->hasGitHubToken()) {
-                $githubService = GitHubUserService::for($user);
-                $this->repositories = $githubService->getRepositories()
-                    ->map(fn ($repo) => [
-                        'id' => $repo['id'],
-                        'full_name' => $repo['full_name'],
-                        'private' => $repo['private'] ?? false,
-                    ])
-                    ->toArray();
+                $cacheKey = "github_repos_{$user->id}";
+
+                $repos = Cache::remember($cacheKey, now()->addMinutes(5), function () use ($user) {
+                    $githubService = GitHubUserService::for($user);
+
+                    return $githubService->getRepositories()
+                        ->map(fn ($repo) => [
+                            'id' => $repo['id'],
+                            'full_name' => $repo['full_name'],
+                            'name' => $repo['name'],
+                            'owner' => explode('/', $repo['full_name'])[0],
+                            'private' => $repo['private'] ?? false,
+                        ])
+                        ->all();
+                });
+
+                $this->repositories = collect($repos)->values()->all();
             }
 
             $this->reposLoaded = true;
@@ -101,15 +144,38 @@ function ($attribute, $value, $fail): void {
             return;
         }
 
+        $repository = trim($this->repository, '/');
+        $repositoryUrl = 'https://github.com/'.$repository;
+        [$owner, $repo] = explode('/', $repository);
+
+        // Check composer.json and namespace availability before creating the plugin
+        $githubService = GitHubUserService::for($user);
+        $composerJson = $githubService->getComposerJson($owner, $repo);
+
+        if (! $composerJson || empty($composerJson['name'])) {
+            session()->flash('error', 'Could not find a valid composer.json in the repository. Please ensure your repository contains a composer.json with a valid package name.');
+
+            return;
+        }
+
+        $packageName = $composerJson['name'];
+        $namespace = explode('/', $packageName)[0] ?? null;
+
+        if ($namespace && ! Plugin::isNamespaceAvailableForUser($namespace, $user->id)) {
+            $errorMessage = Plugin::isReservedNamespace($namespace)
+                ? "The namespace '{$namespace}' is reserved and cannot be used for plugin submissions."
+                : "The namespace '{$namespace}' is already claimed by another user. You cannot submit plugins under this namespace.";
+
+            session()->flash('error', $errorMessage);
+
+            return;
+        }
+
         $developerAccountId = null;
         if ($this->pluginType === 'paid' && $user->developerAccount) {
             $developerAccountId = $user->developerAccount->id;
         }
 
-        $repository = trim($this->repository, '/');
-        $repositoryUrl = 'https://github.com/'.$repository;
-        [$owner, $repo] = explode('/', $repository);
-
         $plugin = $user->plugins()->create([
             'repository_url' => $repositoryUrl,
             'type' => $this->pluginType,
@@ -121,7 +187,6 @@ function ($attribute, $value, $fail): void {
 
         $webhookInstalled = false;
         if ($user->hasGitHubToken()) {
-            $githubService = GitHubUserService::for($user);
             $webhookResult = $githubService->createWebhook(
                 $owner,
                 $repo,
@@ -145,19 +210,6 @@ function ($attribute, $value, $fail): void {
             return;
         }
 
-        $namespace = $plugin->getVendorNamespace();
-        if ($namespace && ! Plugin::isNamespaceAvailableForUser($namespace, $user->id)) {
-            $plugin->delete();
-
-            $errorMessage = Plugin::isReservedNamespace($namespace)
-                ? "The namespace '{$namespace}' is reserved and cannot be used for plugin submissions."
-                : "The namespace '{$namespace}' is already claimed by another user. You cannot submit plugins under this namespace.";
-
-            session()->flash('error', $errorMessage);
-
-            return;
-        }
-
         $user->notify(new PluginSubmitted($plugin));
 
         $successMessage = 'Your plugin has been submitted for review!';
diff --git a/app/Livewire/Customer/PurchasedPlugins/Index.php b/app/Livewire/Customer/PurchasedPlugins/Index.php
index fbec8e25..984d81e3 100644
--- a/app/Livewire/Customer/PurchasedPlugins/Index.php
+++ b/app/Livewire/Customer/PurchasedPlugins/Index.php
@@ -3,6 +3,7 @@
 namespace App\Livewire\Customer\PurchasedPlugins;
 
 use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Support\Collection as SupportCollection;
 use Livewire\Attributes\Computed;
 use Livewire\Attributes\Layout;
 use Livewire\Attributes\Title;
@@ -27,6 +28,32 @@ public function pluginLicenseKey(): string
         return auth()->user()->getPluginLicenseKey();
     }
 
+    #[Computed]
+    public function teamPlugins(): SupportCollection
+    {
+        $membership = auth()->user()->activeTeamMembership();
+
+        if (! $membership) {
+            return collect();
+        }
+
+        return $membership->team->owner->pluginLicenses()
+            ->active()
+            ->with('plugin')
+            ->get()
+            ->pluck('plugin')
+            ->filter()
+            ->unique('id');
+    }
+
+    #[Computed]
+    public function teamOwnerName(): ?string
+    {
+        $membership = auth()->user()->activeTeamMembership();
+
+        return $membership?->team->owner->display_name;
+    }
+
     public function rotateKey(): void
     {
         auth()->user()->regeneratePluginLicenseKey();
diff --git a/app/Livewire/MobilePricing.php b/app/Livewire/MobilePricing.php
index dbf437e6..4d1b73cf 100644
--- a/app/Livewire/MobilePricing.php
+++ b/app/Livewire/MobilePricing.php
@@ -15,13 +15,12 @@
 
 class MobilePricing extends Component
 {
-    #[Locked]
-    public bool $discounted = false;
+    public string $interval = 'month';
 
     #[Locked]
     public $user;
 
-    public function mount()
+    public function mount(): void
     {
         if (request()->has('email')) {
             $this->user = $this->findOrCreateUser(request()->query('email'));
@@ -53,16 +52,12 @@ public function createCheckoutSession(?string $plan, ?User $user = null)
         $user = $user?->exists ? $user : Auth::user();
 
         if (! $user) {
-            // TODO: return a flash message or notification to the user that there
-            //   was an error.
             Log::error('Failed to create checkout session. User does not exist and user is not authenticated.');
 
             return;
         }
 
         if (! ($subscription = Subscription::tryFrom($plan))) {
-            // TODO: return a flash message or notification to the user that there
-            //   was an error.
             Log::error('Failed to create checkout session. Invalid subscription plan name provided.');
 
             return;
@@ -71,7 +66,7 @@ public function createCheckoutSession(?string $plan, ?User $user = null)
         $user->createOrGetStripeCustomer();
 
         $checkout = $user
-            ->newSubscription('default', $subscription->stripePriceId(discounted: $this->discounted))
+            ->newSubscription('default', $subscription->stripePriceId(interval: $this->interval))
             ->allowPromotionCodes()
             ->checkout([
                 'success_url' => $this->successUrl(),
@@ -91,6 +86,31 @@ public function createCheckoutSession(?string $plan, ?User $user = null)
         return redirect($checkout->url);
     }
 
+    public function upgradeSubscription(): mixed
+    {
+        $user = Auth::user();
+
+        if (! $user) {
+            Log::error('Failed to upgrade subscription. User is not authenticated.');
+
+            return null;
+        }
+
+        $subscription = $user->subscription('default');
+
+        if (! $subscription || ! $subscription->active()) {
+            Log::error('Failed to upgrade subscription. No active subscription found.');
+
+            return null;
+        }
+
+        $newPriceId = Subscription::Max->stripePriceId(interval: $this->interval);
+
+        $subscription->skipTrial()->swapAndInvoice($newPriceId);
+
+        return redirect(route('customer.dashboard'))->with('success', 'Your subscription has been upgraded to Ultra!');
+    }
+
     private function findOrCreateUser(string $email): User
     {
         Validator::validate(['email' => $email], [
@@ -118,6 +138,31 @@ private function successUrl(): string
 
     public function render()
     {
-        return view('livewire.mobile-pricing');
+        $hasExistingSubscription = false;
+        $currentPlanName = null;
+        $isAlreadyUltra = false;
+
+        if ($user = Auth::user()) {
+            $subscription = $user->subscription('default');
+
+            if ($subscription && $subscription->active()) {
+                $hasExistingSubscription = true;
+                $isAlreadyUltra = $user->hasActiveUltraSubscription();
+
+                try {
+                    $currentPlanName = Subscription::fromStripePriceId(
+                        $subscription->items->first()?->stripe_price ?? $subscription->stripe_price
+                    )->name();
+                } catch (\Exception $e) {
+                    $currentPlanName = 'your current plan';
+                }
+            }
+        }
+
+        return view('livewire.mobile-pricing', [
+            'hasExistingSubscription' => $hasExistingSubscription,
+            'currentPlanName' => $currentPlanName,
+            'isAlreadyUltra' => $isAlreadyUltra,
+        ]);
     }
 }
diff --git a/app/Livewire/SubLicenseManager.php b/app/Livewire/SubLicenseManager.php
index fc5aa507..934c21ef 100644
--- a/app/Livewire/SubLicenseManager.php
+++ b/app/Livewire/SubLicenseManager.php
@@ -2,7 +2,12 @@
 
 namespace App\Livewire;
 
+use App\Jobs\CreateAnystackSubLicenseJob;
+use App\Jobs\RevokeMaxAccessJob;
+use App\Jobs\UpdateAnystackContactAssociationJob;
 use App\Models\License;
+use App\Models\SubLicense;
+use Flux;
 use Livewire\Component;
 
 class SubLicenseManager extends Component
@@ -13,15 +18,93 @@ class SubLicenseManager extends Component
 
     public int $initialSubLicenseCount;
 
+    public string $createName = '';
+
+    public string $createAssignedEmail = '';
+
+    public ?int $editingSubLicenseId = null;
+
+    public string $editName = '';
+
+    public string $editAssignedEmail = '';
+
     public function mount(License $license): void
     {
         $this->license = $license;
         $this->initialSubLicenseCount = $license->subLicenses->count();
     }
 
-    public function startPolling(): void
+    public function openCreateModal(): void
     {
+        $this->reset(['createName', 'createAssignedEmail']);
+        Flux::modal('create-sub-license')->show();
+    }
+
+    public function createSubLicense(): void
+    {
+        $this->validate([
+            'createName' => ['nullable', 'string', 'max:255'],
+            'createAssignedEmail' => ['nullable', 'email', 'max:255'],
+        ]);
+
+        if (! $this->license->canCreateSubLicense()) {
+            return;
+        }
+
+        dispatch(new CreateAnystackSubLicenseJob(
+            $this->license,
+            $this->createName ?: null,
+            $this->createAssignedEmail ?: null,
+        ));
+
         $this->isPolling = true;
+        $this->reset(['createName', 'createAssignedEmail']);
+        Flux::modal('create-sub-license')->close();
+    }
+
+    public function editSubLicense(int $subLicenseId): void
+    {
+        $subLicense = $this->license->subLicenses->firstWhere('id', $subLicenseId);
+
+        if (! $subLicense) {
+            return;
+        }
+
+        $this->editingSubLicenseId = $subLicenseId;
+        $this->editName = $subLicense->name ?? '';
+        $this->editAssignedEmail = $subLicense->assigned_email ?? '';
+
+        Flux::modal('edit-sub-license')->show();
+    }
+
+    public function updateSubLicense(): void
+    {
+        $this->validate([
+            'editName' => ['nullable', 'string', 'max:255'],
+            'editAssignedEmail' => ['nullable', 'email', 'max:255'],
+        ]);
+
+        $subLicense = SubLicense::where('id', $this->editingSubLicenseId)
+            ->where('parent_license_id', $this->license->id)
+            ->firstOrFail();
+
+        $oldEmail = $subLicense->assigned_email;
+
+        $subLicense->update([
+            'name' => $this->editName ?: null,
+            'assigned_email' => $this->editAssignedEmail ?: null,
+        ]);
+
+        if ($oldEmail !== ($this->editAssignedEmail ?: null) && $this->editAssignedEmail) {
+            dispatch(new UpdateAnystackContactAssociationJob($subLicense, $this->editAssignedEmail));
+        }
+
+        if ($oldEmail && $oldEmail !== ($this->editAssignedEmail ?: null) && $this->license->policy_name === 'max') {
+            dispatch(new RevokeMaxAccessJob($oldEmail));
+        }
+
+        $this->reset(['editingSubLicenseId', 'editName', 'editAssignedEmail']);
+        Flux::modal('edit-sub-license')->close();
     }
 
     public function render()
diff --git a/app/Livewire/TeamManager.php b/app/Livewire/TeamManager.php
new file mode 100644
index 00000000..512bb3a0
--- /dev/null
+++ b/app/Livewire/TeamManager.php
@@ -0,0 +1,142 @@
+<?php
+
+namespace App\Livewire;
+
+use App\Enums\Subscription;
+use App\Enums\TeamUserStatus;
+use App\Models\Team;
+use Flux;
+use Livewire\Component;
+
+class TeamManager extends Component
+{
+    public Team $team;
+
+    public function mount(Team $team): void
+    {
+        $this->team = $team;
+    }
+
+    public function addSeats(int $count = 1): void
+    {
+        $owner = $this->team->owner;
+        $subscription = $owner->subscription();
+
+        if (! $subscription) {
+            return;
+        }
+
+        // Determine the correct extra seat price based on subscription interval
+        $planPriceId = $subscription->stripe_price;
+
+        if (! $planPriceId) {
+            foreach ($subscription->items as $item) {
+                if (! Subscription::isExtraSeatPrice($item->stripe_price)) {
+                    $planPriceId = $item->stripe_price;
+                    break;
+                }
+            }
+        }
+
+        $isMonthly = $planPriceId === config('subscriptions.plans.max.stripe_price_id_monthly');
+        $interval = $isMonthly ? 'month' : 'year';
+        $priceId = Subscription::extraSeatStripePriceId($interval);
+
+        if (! $priceId) {
+            return;
+        }
+
+        // Check if subscription already has this price item
+        $existingItem = $subscription->items->firstWhere('stripe_price', $priceId);
+
+        if ($existingItem) {
+            $subscription->incrementAndInvoice($count, $priceId);
+        } else {
+            $subscription->addPriceAndInvoice($priceId, $count);
+        }
+
+        $this->team->increment('extra_seats', $count);
+        $this->team->refresh();
+
+        Flux::modal('add-seats')->close();
+    }
+
+    public function removeSeats(int $count = 1): void
+    {
+        if ($this->team->extra_seats < $count) {
+            return;
+        }
+
+        // Don't allow removing seats if it would go below occupied count
+        $newCapacity = $this->team->totalSeatCapacity() - $count;
+        if ($newCapacity < $this->team->occupiedSeatCount()) {
+            return;
+        }
+
+        $owner = $this->team->owner;
+        $subscription = $owner->subscription();
+
+        if (! $subscription) {
+            return;
+        }
+
+        $planPriceId = $subscription->stripe_price;
+
+        if (! $planPriceId) {
+            foreach ($subscription->items as $item) {
+                if (! Subscription::isExtraSeatPrice($item->stripe_price)) {
+                    $planPriceId = $item->stripe_price;
+                    break;
+                }
+            }
+        }
+
+        $isMonthly = $planPriceId === config('subscriptions.plans.max.stripe_price_id_monthly');
+        $interval = $isMonthly ? 'month' : 'year';
+        $priceId = Subscription::extraSeatStripePriceId($interval);
+
+        if (! $priceId) {
+            return;
+        }
+
+        $existingItem = $subscription->items->firstWhere('stripe_price', $priceId);
+
+        if ($existingItem) {
+            if ($existingItem->quantity <= $count) {
+                $subscription->removePrice($priceId);
+            } else {
+                $subscription->decrementQuantity($count, $priceId);
+            }
+        }
+
+        $this->team->decrement('extra_seats', $count);
+        $this->team->refresh();
+
+        Flux::modal('remove-seats')->close();
+    }
+
+    public function render()
+    {
+        $this->team->refresh();
+        $this->team->load('users');
+
+        $activeMembers = $this->team->users->where('status', TeamUserStatus::Active);
+        $pendingInvitations = $this->team->users->where('status', TeamUserStatus::Pending);
+
+        $extraSeatPriceYearly = config('subscriptions.plans.max.extra_seat_price_yearly', 4);
+        $extraSeatPriceMonthly = config('subscriptions.plans.max.extra_seat_price_monthly', 5);
+
+        $removableSeats = min(
+            $this->team->extra_seats,
+            $this->team->totalSeatCapacity() - $this->team->occupiedSeatCount()
+        );
+
+        return view('livewire.team-manager', [
+            'activeMembers' => $activeMembers,
+            'pendingInvitations' => $pendingInvitations,
+            'extraSeatPriceYearly' => $extraSeatPriceYearly,
+            'extraSeatPriceMonthly' => $extraSeatPriceMonthly,
+            'removableSeats' => max(0, $removableSeats),
+        ]);
+    }
+}
diff --git a/app/Models/Plugin.php b/app/Models/Plugin.php
index 44a41b84..192fd4f3 100644
--- a/app/Models/Plugin.php
+++ b/app/Models/Plugin.php
@@ -172,11 +172,23 @@ public function getBestPriceForUser(?User $user): ?PluginPrice
         $eligibleTiers = $user ? $user->getEligiblePriceTiers() : [PriceTier::Regular];
 
         // Get the lowest active price for the user's eligible tiers
-        return $this->prices()
+        $bestPrice = $this->prices()
             ->active()
             ->forTiers($eligibleTiers)
             ->orderBy('amount', 'asc')
             ->first();
+
+        // Ultra subscribers get official plugins for free
+        if ($bestPrice && $user && $this->isOfficial() && $user->hasUltraAccess()) {
+            $freePrice = $bestPrice->replicate();
+            $freePrice->amount = 0;
+            $freePrice->id = $bestPrice->id;
+            $freePrice->exists = true;
+
+            return $freePrice;
+        }
+
+        return $bestPrice;
     }
 
     /**
diff --git a/app/Models/Team.php b/app/Models/Team.php
new file mode 100644
index 00000000..e4dec82c
--- /dev/null
+++ b/app/Models/Team.php
@@ -0,0 +1,107 @@
+<?php
+
+namespace App\Models;
+
+use App\Enums\TeamUserStatus;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+
+class Team extends Model
+{
+    use HasFactory;
+
+    protected $fillable = [
+        'user_id',
+        'name',
+        'is_suspended',
+        'extra_seats',
+    ];
+
+    /**
+     * @return BelongsTo<User>
+     */
+    public function owner(): BelongsTo
+    {
+        return $this->belongsTo(User::class, 'user_id');
+    }
+
+    /**
+     * @return HasMany<TeamUser>
+     */
+    public function users(): HasMany
+    {
+        return $this->hasMany(TeamUser::class);
+    }
+
+    /**
+     * @return HasMany<TeamUser>
+     */
+    public function activeUsers(): HasMany
+    {
+        return $this->hasMany(TeamUser::class)
+            ->where('status', TeamUserStatus::Active);
+    }
+
+    /**
+     * @return HasMany<TeamUser>
+     */
+    public function pendingInvitations(): HasMany
+    {
+        return $this->hasMany(TeamUser::class)
+            ->where('status', TeamUserStatus::Pending);
+    }
+
+    public function activeUserCount(): int
+    {
+        return $this->activeUsers()->count();
+    }
+
+    public function includedSeats(): int
+    {
+        return config('subscriptions.plans.max.included_seats', 10);
+    }
+
+    public function totalSeatCapacity(): int
+    {
+        return $this->includedSeats() + ($this->extra_seats ?? 0);
+    }
+
+    public function occupiedSeatCount(): int
+    {
+        return $this->activeUserCount() + $this->pendingInvitations()->count();
+    }
+
+    public function availableSeats(): int
+    {
+        return max(0, $this->totalSeatCapacity() - $this->occupiedSeatCount());
+    }
+
+    public function isOverIncludedLimit(): bool
+    {
+        return $this->occupiedSeatCount() >= $this->totalSeatCapacity();
+    }
+
+    public function extraSeatsCount(): int
+    {
+        return max(0, $this->activeUserCount() - $this->includedSeats());
+    }
+
+    public function suspend(): bool
+    {
+        return $this->update(['is_suspended' => true]);
+    }
+
+    public function unsuspend(): bool
+    {
+        return $this->update(['is_suspended' => false]);
+    }
+
+    protected function casts(): array
+    {
+        return [
+            'is_suspended' => 'boolean',
+        ];
+    }
+}
diff --git a/app/Models/TeamUser.php b/app/Models/TeamUser.php
new file mode 100644
index 00000000..9711e7e8
--- /dev/null
+++ b/app/Models/TeamUser.php
@@ -0,0 +1,84 @@
+<?php
+
+namespace App\Models;
+
+use App\Enums\TeamUserRole;
+use App\Enums\TeamUserStatus;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+class TeamUser extends Model
+{
+    use HasFactory;
+
+    protected $fillable = [
+        'team_id',
+        'user_id',
+        'email',
+        'role',
+        'status',
+        'invitation_token',
+        'invited_at',
+        'accepted_at',
+    ];
+
+    /**
+     * @return BelongsTo<Team>
+     */
+    public function team(): BelongsTo
+    {
+        return $this->belongsTo(Team::class);
+    }
+
+    /**
+     * @return BelongsTo<User>
+     */
+    public function user(): BelongsTo
+    {
+        return $this->belongsTo(User::class);
+    }
+
+    public function isActive(): bool
+    {
+        return $this->status === TeamUserStatus::Active;
+    }
+
+    public function isPending(): bool
+    {
+        return $this->status === TeamUserStatus::Pending;
+    }
+
+    public function isRemoved(): bool
+    {
+        return $this->status === TeamUserStatus::Removed;
+    }
+
+    public function accept(User $user): void
+    {
+        $this->update([
+            'user_id' => $user->id,
+            'status' => TeamUserStatus::Active,
+            'invitation_token' => null,
+            'accepted_at' => now(),
+        ]);
+    }
+
+    public function remove(): void
+    {
+        $this->update([
+            'status' => TeamUserStatus::Removed,
+            'invitation_token' => null,
+        ]);
+    }
+
+    protected function casts(): array
+    {
+        return [
+            'status' => TeamUserStatus::class,
+            'role' => TeamUserRole::class,
+            'invited_at' => 'datetime',
+            'accepted_at' => 'datetime',
+        ];
+    }
+}
diff --git a/app/Models/User.php b/app/Models/User.php
index 39b7c08b..b5bf66fa 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -4,6 +4,8 @@
 
 // use Illuminate\Contracts\Auth\MustVerifyEmail;
 use App\Enums\PriceTier;
+use App\Enums\Subscription;
+use App\Enums\TeamUserStatus;
 use Filament\Models\Contracts\FilamentUser;
 use Filament\Panel;
 use Illuminate\Database\Eloquent\Casts\Attribute;
@@ -38,6 +40,28 @@ public function isAdmin(): bool
         return in_array($this->email, config('filament.users'), true);
     }
 
+    /**
+     * @return HasOne<Team>
+     */
+    public function ownedTeam(): HasOne
+    {
+        return $this->hasOne(Team::class);
+    }
+
+    /**
+     * Get the team owner if this user is an active team member.
+     */
+    public function getTeamOwner(): ?self
+    {
+        $membership = $this->activeTeamMembership();
+
+        if (! $membership) {
+            return null;
+        }
+
+        return $membership->team->owner;
+    }
+
     /**
      * @return HasMany<License>
      */
@@ -83,9 +107,11 @@ public function productLicenses(): HasMany
      */
     public function hasProductLicense(Product $product): bool
     {
-        return $this->productLicenses()
-            ->forProduct($product)
-            ->exists();
+        if ($this->productLicenses()->forProduct($product)->exists()) {
+            return true;
+        }
+
+        return $this->hasProductAccessViaTeam($product);
     }
 
     /**
@@ -96,6 +122,52 @@ public function developerAccount(): HasOne
         return $this->hasOne(DeveloperAccount::class);
     }
 
+    /**
+     * @return HasMany<TeamUser>
+     */
+    public function teamMemberships(): HasMany
+    {
+        return $this->hasMany(TeamUser::class);
+    }
+
+    public function isUltraTeamMember(): bool
+    {
+        // Team owners count as members
+        if ($this->ownedTeam && ! $this->ownedTeam->is_suspended) {
+            return true;
+        }
+
+        return TeamUser::query()
+            ->where('user_id', $this->id)
+            ->where('status', TeamUserStatus::Active)
+            ->whereHas('team', fn ($query) => $query->where('is_suspended', false))
+            ->exists();
+    }
+
+    public function activeTeamMembership(): ?TeamUser
+    {
+        return TeamUser::query()
+            ->where('user_id', $this->id)
+            ->where('status', TeamUserStatus::Active)
+            ->whereHas('team', fn ($query) => $query->where('is_suspended', false))
+            ->with('team')
+            ->first();
+    }
+
+    public function hasProductAccessViaTeam(Product $product): bool
+    {
+        $membership = $this->activeTeamMembership();
+
+        if (! $membership) {
+            return false;
+        }
+
+        // Check the owner's direct product licenses only (not via team) to avoid recursion
+        return $membership->team->owner->productLicenses()
+            ->forProduct($product)
+            ->exists();
+    }
+
     public function hasActiveMaxLicense(): bool
     {
         return $this->licenses()
@@ -124,6 +196,80 @@ public function hasMaxAccess(): bool
         return $this->hasActiveMaxLicense() || $this->hasActiveMaxSubLicense();
     }
 
+    public function hasActiveUltraSubscription(): bool
+    {
+        $subscription = $this->subscription();
+
+        if (! $subscription) {
+            return false;
+        }
+
+        // Comped Ultra subs use a dedicated price — always grant Ultra access
+        $compedUltraPriceId = config('subscriptions.plans.max.stripe_price_id_comped');
+
+        if ($compedUltraPriceId && $this->subscribedToPrice($compedUltraPriceId)) {
+            return true;
+        }
+
+        // Legacy comped Max subs should not get Ultra access
+        if ($subscription->is_comped) {
+            return false;
+        }
+
+        return $this->subscribedToPrice(array_filter([
+            config('subscriptions.plans.max.stripe_price_id'),
+            config('subscriptions.plans.max.stripe_price_id_monthly'),
+            config('subscriptions.plans.max.stripe_price_id_eap'),
+            config('subscriptions.plans.max.stripe_price_id_discounted'),
+        ]));
+    }
+
+    /**
+     * Check if the user has Ultra access (paying or comped Ultra),
+     * qualifying them for Ultra benefits like Teams and free plugins.
+     */
+    public function hasUltraAccess(): bool
+    {
+        $subscription = $this->subscription();
+
+        if (! $subscription || ! $subscription->active()) {
+            return false;
+        }
+
+        // Comped Ultra subs always get full access
+        $compedUltraPriceId = config('subscriptions.plans.max.stripe_price_id_comped');
+
+        if ($compedUltraPriceId && $this->subscribedToPrice($compedUltraPriceId)) {
+            return true;
+        }
+
+        $planPriceId = $subscription->stripe_price;
+
+        if (! $planPriceId) {
+            foreach ($subscription->items as $item) {
+                if (! Subscription::isExtraSeatPrice($item->stripe_price)) {
+                    $planPriceId = $item->stripe_price;
+                    break;
+                }
+            }
+        }
+
+        if (! $planPriceId) {
+            return false;
+        }
+
+        try {
+            if (Subscription::fromStripePriceId($planPriceId) !== Subscription::Max) {
+                return false;
+            }
+        } catch (\RuntimeException) {
+            return false;
+        }
+
+        // Legacy comped Max subs don't get Ultra access
+        return ! $subscription->is_comped;
+    }
+
     /**
      * Check if user was an Early Access Program customer.
      * EAP customers purchased before June 1, 2025.
@@ -145,7 +291,7 @@ public function getEligiblePriceTiers(): array
     {
         $tiers = [PriceTier::Regular];
 
-        if ($this->subscribed()) {
+        if ($this->subscribed() || $this->isUltraTeamMember()) {
             $tiers[] = PriceTier::Subscriber;
         }
 
@@ -235,10 +381,16 @@ public function hasPluginAccess(Plugin $plugin): bool
             return true;
         }
 
-        return $this->pluginLicenses()
-            ->forPlugin($plugin)
-            ->active()
-            ->exists();
+        if ($this->pluginLicenses()->forPlugin($plugin)->active()->exists()) {
+            return true;
+        }
+
+        // Ultra team members get access to all official (first-party) plugins
+        if ($plugin->isOfficial() && $this->isUltraTeamMember()) {
+            return true;
+        }
+
+        return false;
     }
 
     public function getGitHubToken(): ?string
diff --git a/app/Notifications/MaxToUltraAnnouncement.php b/app/Notifications/MaxToUltraAnnouncement.php
new file mode 100644
index 00000000..6e756d9c
--- /dev/null
+++ b/app/Notifications/MaxToUltraAnnouncement.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Notifications;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Notifications\Notification;
+
+class MaxToUltraAnnouncement extends Notification implements ShouldQueue
+{
+    use Queueable;
+
+    public function via($notifiable): array
+    {
+        return ['mail'];
+    }
+
+    public function toMail($notifiable): MailMessage
+    {
+        $firstName = $notifiable->name ? explode(' ', $notifiable->name)[0] : null;
+        $greeting = $firstName ? "Hi {$firstName}," : 'Hi there,';
+
+        return (new MailMessage)
+            ->subject('Your Max Plan is Now NativePHP Ultra')
+            ->greeting($greeting)
+            ->line('We have some exciting news: **your Max plan has been upgraded to NativePHP Ultra** - at no extra cost.')
+            ->line('Here\'s what you now get as an Ultra subscriber:')
+            ->line('- **Teams** - invite up to 10 collaborators to share your plugin access')
+            ->line('- **Free official plugins** - every NativePHP-published plugin, included with your subscription')
+            ->line('- **Plugin Dev Kit** - tools and resources to build and publish your own plugins')
+            ->line('- **Priority support** - get help faster when you need it')
+            ->line('- **Early access** - be first to try new features and plugins')
+            ->line('- **Exclusive content** - tutorials, guides, and deep dives just for Ultra members')
+            ->line('- **Shape the roadmap** - your feedback directly influences what we build next')
+            ->line('---')
+            ->line('**Nothing changes on your end.** Your billing stays exactly the same - you just get more.')
+            ->action('See All Ultra Benefits', route('pricing'))
+            ->salutation("Cheers,\n\nThe NativePHP Team");
+    }
+}
diff --git a/app/Notifications/TeamInvitation.php b/app/Notifications/TeamInvitation.php
new file mode 100644
index 00000000..0b5deca6
--- /dev/null
+++ b/app/Notifications/TeamInvitation.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace App\Notifications;
+
+use App\Models\TeamUser;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Notifications\Notification;
+
+class TeamInvitation extends Notification implements ShouldQueue
+{
+    use Queueable;
+
+    public function __construct(
+        public TeamUser $teamUser
+    ) {}
+
+    /**
+     * @return array<int, string>
+     */
+    public function via(object $notifiable): array
+    {
+        return ['mail'];
+    }
+
+    public function toMail(object $notifiable): MailMessage
+    {
+        $team = $this->teamUser->team;
+        $ownerName = $team->owner->display_name;
+
+        return (new MailMessage)
+            ->subject("You've been invited to join {$team->name} on NativePHP")
+            ->greeting('Hello!')
+            ->line("**{$ownerName}** ({$team->owner->email}) has invited you to join **{$team->name}** on NativePHP.")
+            ->line('As a team member, you will receive:')
+            ->line('- Free access to all first-party NativePHP plugins')
+            ->line('- Subscriber-tier pricing on third-party plugins')
+            ->line('- Access to the Plugin Dev Kit GitHub repository')
+            ->action('Accept Invitation', route('team.invitation.accept', $this->teamUser->invitation_token))
+            ->line('If you did not expect this invitation, you can safely ignore this email.');
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    public function toArray(object $notifiable): array
+    {
+        return [
+            'team_user_id' => $this->teamUser->id,
+            'team_name' => $this->teamUser->team->name,
+            'email' => $this->teamUser->email,
+        ];
+    }
+}
diff --git a/app/Notifications/TeamUserRemoved.php b/app/Notifications/TeamUserRemoved.php
new file mode 100644
index 00000000..8e81d065
--- /dev/null
+++ b/app/Notifications/TeamUserRemoved.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace App\Notifications;
+
+use App\Models\TeamUser;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Notifications\Notification;
+
+class TeamUserRemoved extends Notification implements ShouldQueue
+{
+    use Queueable;
+
+    public function __construct(
+        public TeamUser $teamUser
+    ) {}
+
+    /**
+     * @return array<int, string>
+     */
+    public function via(object $notifiable): array
+    {
+        return ['mail'];
+    }
+
+    public function toMail(object $notifiable): MailMessage
+    {
+        $teamName = $this->teamUser->team->name;
+
+        return (new MailMessage)
+            ->subject("You have been removed from {$teamName}")
+            ->greeting('Hello!')
+            ->line("You have been removed from **{$teamName}** on NativePHP.")
+            ->line('Your team benefits, including free plugin access and subscriber-tier pricing, have been revoked.')
+            ->action('View Plans', route('pricing'))
+            ->line('If you believe this was a mistake, please contact the team owner.');
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    public function toArray(object $notifiable): array
+    {
+        return [
+            'team_user_id' => $this->teamUser->id,
+            'team_name' => $this->teamUser->team->name,
+        ];
+    }
+}
diff --git a/app/Notifications/UltraLicenseHolderPromotion.php b/app/Notifications/UltraLicenseHolderPromotion.php
new file mode 100644
index 00000000..b2242db3
--- /dev/null
+++ b/app/Notifications/UltraLicenseHolderPromotion.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Notifications;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Notifications\Notification;
+
+class UltraLicenseHolderPromotion extends Notification implements ShouldQueue
+{
+    use Queueable;
+
+    public function __construct(public string $planName) {}
+
+    public function via($notifiable): array
+    {
+        return ['mail'];
+    }
+
+    public function toMail($notifiable): MailMessage
+    {
+        $firstName = $notifiable->name ? explode(' ', $notifiable->name)[0] : null;
+        $greeting = $firstName ? "Hi {$firstName}," : 'Hi there,';
+
+        return (new MailMessage)
+            ->subject('Unlock More with NativePHP Ultra')
+            ->greeting($greeting)
+            ->line("You previously purchased a **{$this->planName}** license - thank you for supporting NativePHP early on!")
+            ->line('Although NativePHP for Mobile is now free and open source and doesn\'t require licenses any more, we\'ve created a subscription plan that gives you some incredible benefits:')
+            ->line('- **Teams** - invite up to 10 collaborators to share your plugin access')
+            ->line('- **Free official plugins** - every NativePHP-published plugin, included with your subscription')
+            ->line('- **Plugin Dev Kit** - tools and resources to build and publish your own plugins')
+            ->line('- **Priority support** - get help faster when you need it')
+            ->line('- **Early access** - be first to try new features and plugins')
+            ->line('- **Exclusive content** - tutorials, guides, and deep dives just for Ultra members')
+            ->line('- **Shape the roadmap** - your feedback directly influences what we build next')
+            ->line('---')
+            ->line('Ultra is available with **annual or monthly billing** - choose what works best for you.')
+            ->action('See Ultra Plans', route('pricing'))
+            ->salutation("Cheers,\n\nThe NativePHP Team");
+    }
+}
diff --git a/app/Notifications/UltraUpgradePromotion.php b/app/Notifications/UltraUpgradePromotion.php
new file mode 100644
index 00000000..e779a715
--- /dev/null
+++ b/app/Notifications/UltraUpgradePromotion.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Notifications;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Notifications\Notification;
+
+class UltraUpgradePromotion extends Notification implements ShouldQueue
+{
+    use Queueable;
+
+    public function __construct(public string $currentPlanName) {}
+
+    public function via($notifiable): array
+    {
+        return ['mail'];
+    }
+
+    public function toMail($notifiable): MailMessage
+    {
+        $firstName = $notifiable->name ? explode(' ', $notifiable->name)[0] : null;
+        $greeting = $firstName ? "Hi {$firstName}," : 'Hi there,';
+
+        return (new MailMessage)
+            ->subject('Unlock More with NativePHP Ultra')
+            ->greeting($greeting)
+            ->line("You're currently on the **{$this->currentPlanName}** plan - and we'd love to show you what you're missing.")
+            ->line('**NativePHP Ultra** gives you everything you need to build and ship faster:')
+            ->line('- **Teams** - invite up to 10 collaborators to share your plugin access')
+            ->line('- **Free official plugins** - every NativePHP-published plugin, included with your subscription')
+            ->line('- **Plugin Dev Kit** - tools and resources to build and publish your own plugins')
+            ->line('- **Priority support** - get help faster when you need it')
+            ->line('- **Early access** - be first to try new features and plugins')
+            ->line('- **Exclusive content** - tutorials, guides, and deep dives just for Ultra members')
+            ->line('- **Shape the roadmap** - your feedback directly influences what we build next')
+            ->line('---')
+            ->line('**Upgrading is seamless.** You\'ll only pay the prorated difference for the rest of your billing cycle - no double charges. Ultra is available with **annual or monthly billing**.')
+            ->action('Upgrade to Ultra', route('pricing'))
+            ->salutation("Cheers,\n\nThe NativePHP Team");
+    }
+}
diff --git a/config/database.php b/config/database.php
index 137ad18c..4621f85a 100644
--- a/config/database.php
+++ b/config/database.php
@@ -1,6 +1,7 @@
 <?php
 
 use Illuminate\Support\Str;
+use Pdo\Mysql;
 
 return [
 
@@ -59,7 +60,7 @@
             'strict' => true,
             'engine' => null,
             'options' => extension_loaded('pdo_mysql') ? array_filter([
-                PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'),
+                Mysql::ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'),
             ]) : [],
         ],
 
diff --git a/config/subscriptions.php b/config/subscriptions.php
index 2f4727b7..ac98da5d 100644
--- a/config/subscriptions.php
+++ b/config/subscriptions.php
@@ -20,13 +20,20 @@
             'anystack_policy_id' => env('ANYSTACK_PRO_POLICY_ID'),
         ],
         'max' => [
-            'name' => 'Max',
+            'name' => 'Ultra',
             'stripe_price_id' => env('STRIPE_MAX_PRICE_ID'),
+            'stripe_price_id_monthly' => env('STRIPE_MAX_PRICE_ID_MONTHLY'),
             'stripe_price_id_eap' => env('STRIPE_MAX_PRICE_ID_EAP'),
             'stripe_price_id_discounted' => env('STRIPE_MAX_PRICE_ID_DISCOUNTED'),
+            'stripe_price_id_comped' => env('STRIPE_ULTRA_COMP_PRICE_ID'),
             'stripe_payment_link' => env('STRIPE_MAX_PAYMENT_LINK'),
             'anystack_product_id' => env('ANYSTACK_PRODUCT_ID'),
             'anystack_policy_id' => env('ANYSTACK_MAX_POLICY_ID'),
+            'stripe_extra_seat_price_id' => env('STRIPE_EXTRA_SEAT_PRICE_ID'),
+            'stripe_extra_seat_price_id_monthly' => env('STRIPE_EXTRA_SEAT_PRICE_ID_MONTHLY'),
+            'included_seats' => 10,
+            'extra_seat_price_yearly' => 4,
+            'extra_seat_price_monthly' => 5,
         ],
         'forever' => [
             'name' => 'Forever',
diff --git a/database/factories/TeamFactory.php b/database/factories/TeamFactory.php
new file mode 100644
index 00000000..1c2fe493
--- /dev/null
+++ b/database/factories/TeamFactory.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace Database\Factories;
+
+use App\Models\Team;
+use App\Models\User;
+use Illuminate\Database\Eloquent\Factories\Factory;
+
+/**
+ * @extends Factory<Team>
+ */
+class TeamFactory extends Factory
+{
+    /**
+     * Define the model's default state.
+     *
+     * @return array<string, mixed>
+     */
+    public function definition(): array
+    {
+        return [
+            'user_id' => User::factory(),
+            'name' => fake()->company(),
+            'is_suspended' => false,
+        ];
+    }
+
+    /**
+     * Indicate that the team is suspended.
+     */
+    public function suspended(): static
+    {
+        return $this->state(fn (array $attributes) => [
+            'is_suspended' => true,
+        ]);
+    }
+}
diff --git a/database/factories/TeamUserFactory.php b/database/factories/TeamUserFactory.php
new file mode 100644
index 00000000..7ff3a46e
--- /dev/null
+++ b/database/factories/TeamUserFactory.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace Database\Factories;
+
+use App\Enums\TeamUserRole;
+use App\Enums\TeamUserStatus;
+use App\Models\Team;
+use App\Models\TeamUser;
+use App\Models\User;
+use Illuminate\Database\Eloquent\Factories\Factory;
+
+/**
+ * @extends Factory<TeamUser>
+ */
+class TeamUserFactory extends Factory
+{
+    /**
+     * Define the model's default state.
+     *
+     * @return array<string, mixed>
+     */
+    public function definition(): array
+    {
+        return [
+            'team_id' => Team::factory(),
+            'user_id' => null,
+            'email' => fake()->unique()->safeEmail(),
+            'role' => TeamUserRole::Member,
+            'status' => TeamUserStatus::Pending,
+            'invitation_token' => bin2hex(random_bytes(32)),
+            'invited_at' => now(),
+            'accepted_at' => null,
+        ];
+    }
+
+    /**
+     * Indicate the team user is active (accepted invitation).
+     */
+    public function active(): static
+    {
+        return $this->state(fn (array $attributes) => [
+            'user_id' => User::factory(),
+            'status' => TeamUserStatus::Active,
+            'invitation_token' => null,
+            'accepted_at' => now(),
+        ]);
+    }
+
+    /**
+     * Indicate the team user has been removed.
+     */
+    public function removed(): static
+    {
+        return $this->state(fn (array $attributes) => [
+            'status' => TeamUserStatus::Removed,
+            'invitation_token' => null,
+        ]);
+    }
+}
diff --git a/database/migrations/2026_02_23_230918_create_teams_table.php b/database/migrations/2026_02_23_230918_create_teams_table.php
new file mode 100644
index 00000000..e94da65d
--- /dev/null
+++ b/database/migrations/2026_02_23_230918_create_teams_table.php
@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('teams', function (Blueprint $table) {
+            $table->id();
+            $table->foreignId('user_id')->constrained()->cascadeOnDelete();
+            $table->string('name');
+            $table->boolean('is_suspended')->default(false);
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('teams');
+    }
+};
diff --git a/database/migrations/2026_02_23_230919_create_team_users_table.php b/database/migrations/2026_02_23_230919_create_team_users_table.php
new file mode 100644
index 00000000..b0715b91
--- /dev/null
+++ b/database/migrations/2026_02_23_230919_create_team_users_table.php
@@ -0,0 +1,37 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('team_users', function (Blueprint $table) {
+            $table->id();
+            $table->foreignId('team_id')->constrained()->cascadeOnDelete();
+            $table->foreignId('user_id')->nullable()->constrained()->nullOnDelete();
+            $table->string('email');
+            $table->string('role')->default('member');
+            $table->string('status')->default('pending');
+            $table->string('invitation_token', 64)->unique()->nullable();
+            $table->timestamp('invited_at')->nullable();
+            $table->timestamp('accepted_at')->nullable();
+            $table->timestamps();
+
+            $table->unique(['team_id', 'email']);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('team_users');
+    }
+};
diff --git a/database/migrations/2026_03_05_114700_create_teams_tables.php b/database/migrations/2026_03_05_114700_create_teams_tables.php
new file mode 100644
index 00000000..2d2ed3d9
--- /dev/null
+++ b/database/migrations/2026_03_05_114700_create_teams_tables.php
@@ -0,0 +1,44 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    public function up(): void
+    {
+        if (! Schema::hasTable('teams')) {
+            Schema::create('teams', function (Blueprint $table) {
+                $table->id();
+                $table->foreignId('user_id')->constrained()->cascadeOnDelete();
+                $table->string('name');
+                $table->boolean('is_suspended')->default(false);
+                $table->timestamps();
+            });
+        }
+
+        if (! Schema::hasTable('team_users')) {
+            Schema::create('team_users', function (Blueprint $table) {
+                $table->id();
+                $table->foreignId('team_id')->constrained()->cascadeOnDelete();
+                $table->foreignId('user_id')->nullable()->constrained()->nullOnDelete();
+                $table->string('email');
+                $table->string('role')->default('member');
+                $table->string('status')->default('pending');
+                $table->string('invitation_token')->unique()->nullable();
+                $table->timestamp('invited_at')->nullable();
+                $table->timestamp('accepted_at')->nullable();
+                $table->timestamps();
+
+                $table->unique(['team_id', 'email']);
+            });
+        }
+    }
+
+    public function down(): void
+    {
+        Schema::dropIfExists('team_users');
+        Schema::dropIfExists('teams');
+    }
+};
diff --git a/database/migrations/2026_03_05_114737_add_extra_seats_to_teams_table.php b/database/migrations/2026_03_05_114737_add_extra_seats_to_teams_table.php
new file mode 100644
index 00000000..0b13e5d0
--- /dev/null
+++ b/database/migrations/2026_03_05_114737_add_extra_seats_to_teams_table.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        if (Schema::hasColumn('teams', 'extra_seats')) {
+            return;
+        }
+
+        Schema::table('teams', function (Blueprint $table) {
+            $table->unsignedInteger('extra_seats')->default(0)->after('is_suspended');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('teams', function (Blueprint $table) {
+            $table->dropColumn('extra_seats');
+        });
+    }
+};
diff --git a/database/migrations/2026_03_05_130556_add_is_comped_to_subscriptions_table.php b/database/migrations/2026_03_05_130556_add_is_comped_to_subscriptions_table.php
new file mode 100644
index 00000000..03d52a5d
--- /dev/null
+++ b/database/migrations/2026_03_05_130556_add_is_comped_to_subscriptions_table.php
@@ -0,0 +1,25 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('subscriptions', function (Blueprint $table) {
+            $table->boolean('is_comped')->default(false)->after('quantity');
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::table('subscriptions', function (Blueprint $table) {
+            $table->dropColumn('is_comped');
+        });
+    }
+};
diff --git a/resources/views/alt-pricing.blade.php b/resources/views/alt-pricing.blade.php
deleted file mode 100644
index caaae847..00000000
--- a/resources/views/alt-pricing.blade.php
+++ /dev/null
@@ -1,191 +0,0 @@
-<x-layout title="NativePHP for iOS and Android">
-    {{-- Hero Section --}}
-    <section
-        class="mt-10 md:mt-14"
-        aria-labelledby="hero-heading"
-    >
-        <header class="relative z-10 grid place-items-center text-center">
-            {{-- Primary Heading --}}
-            <h1
-                id="hero-heading"
-                x-init="
-                    () => {
-                        motion.inView($el, (element) => {
-                            motion.animate(
-                                $el,
-                                {
-                                    opacity: [0, 1],
-                                    y: [-10, 0],
-                                },
-                                {
-                                    duration: 0.7,
-                                    ease: motion.easeOut,
-                                },
-                            )
-                        })
-                    }
-                "
-                class="text-3xl font-extrabold sm:text-4xl"
-            >
-                Discounted Licenses
-            </h1>
-
-            {{-- Introduction Description --}}
-            <h2
-                x-init="
-                    () => {
-                        motion.inView($el, (element) => {
-                            motion.animate(
-                                $el,
-                                {
-                                    opacity: [0, 1],
-                                    y: [10, 0],
-                                },
-                                {
-                                    duration: 0.7,
-                                    ease: motion.easeOut,
-                                },
-                            )
-                        })
-                    }
-                "
-                class="mx-auto max-w-xl pt-4 text-base/relaxed text-gray-600 sm:text-lg/relaxed dark:text-gray-400"
-            >
-                Thanks for supporting NativePHP and Bifrost.<br>
-                Now go get your discounted license!
-            </h2>
-        </header>
-    </section>
-
-    {{-- Pricing Section --}}
-    <livewire:mobile-pricing :discounted="true" />
-
-    {{-- Ultra Section --}}
-    <x-ultra-plan />
-
-    {{-- Testimonials Section --}}
-    {{-- <x-testimonials /> --}}
-
-    {{-- FAQ Section --}}
-    <section
-        class="mt-24"
-        aria-labelledby="faq-heading"
-    >
-        {{-- Section Heading --}}
-        <h2
-            id="faq-heading"
-            x-init="
-                () => {
-                    motion.inView($el, (element) => {
-                        motion.animate(
-                            $el,
-                            {
-                                opacity: [0, 1],
-                                y: [-10, 0],
-                            },
-                            {
-                                duration: 0.7,
-                                ease: motion.easeOut,
-                            },
-                        )
-                    })
-                }
-            "
-            class="text-center text-3xl font-semibold opacity-0"
-        >
-            Frequently Asked Questions
-        </h2>
-
-        {{-- FAQ List --}}
-        <div
-            x-init="
-                () => {
-                    motion.inView($el, (element) => {
-                        motion.animate(
-                            Array.from($el.children),
-                            {
-                                x: [-50, 0],
-                                opacity: [0, 1],
-                            },
-                            {
-                                duration: 0.7,
-                                ease: motion.circOut,
-                                delay: motion.stagger(0.1),
-                            },
-                        )
-                    })
-                }
-            "
-            class="mx-auto flex w-full max-w-2xl flex-col items-center gap-4 pt-10"
-            aria-labelledby="faq-heading"
-        >
-            <x-faq-card question="Are these discounted licenses different somehow? What's the catch?">
-                <p>
-                    No catch! They're the same licenses.
-                </p>
-            </x-faq-card>
-
-            <x-faq-card
-                question="When my discounted license renews, will it renew at the same price or go up to the regular price?"
-            >
-                <p>
-                    It'll renew at the <em>discounted</em> price. As long as you keep up your subscription, you'll
-                    benefit from that discounted price.
-                </p>
-            </x-faq-card>
-
-            <x-faq-card
-                question="Can I still build apps if I choose not to renew my license?"
-            >
-                <p>
-                    Yes. Renewing your license entitles you to receive the
-                    latest package updates but isn't required to build and
-                    release apps.
-                </p>
-            </x-faq-card>
-
-            <x-faq-card question="Can I upgrade or downgrade my license later?">
-                <p>That's not currently possible.</p>
-            </x-faq-card>
-
-            <x-faq-card question="Can I use NativePHP for commercial projects?">
-                <p>
-                    Absolutely! You can use NativePHP for any kind of project,
-                    including commercial ones. We can't wait to see what you
-                    build!
-                </p>
-            </x-faq-card>
-
-            <x-faq-card question="Can I get an invoice?">
-                <p>
-                    You'll get an invoice with your receipt via email and you can always retrieve past invoices
-                    in the
-                    <a
-                        href="https://billing.stripe.com/p/login/4gwaGV5VK0uU44E288"
-                        onclick="event.stopPropagation()"
-                        class="inline-block underline hover:text-violet-400"
-                        aria-label="Stripe billing portal"
-                        target="_blank"
-                    >
-                        Stripe billing portal.
-                    </a>
-                </p>
-            </x-faq-card>
-
-            <x-faq-card question="How can I manage my subscription?">
-                <p>
-                    You can manage your subscription via the
-                    <a
-                        href="https://billing.stripe.com/p/login/4gwaGV5VK0uU44E288"
-                        onclick="event.stopPropagation()"
-                        class="inline-block underline hover:text-violet-400"
-                        aria-label="Stripe billing portal"
-                        target="_blank"
-                    >
-                        Stripe billing portal.
-                    </a>
-                </p>
-            </x-faq-card>
-        </div>
-    </section>
-</x-layout>
diff --git a/resources/views/cart/show.blade.php b/resources/views/cart/show.blade.php
index 382265bd..d014e8eb 100644
--- a/resources/views/cart/show.blade.php
+++ b/resources/views/cart/show.blade.php
@@ -232,9 +232,14 @@ class="flex gap-4 p-6"
                                                         by {{ $item->plugin->user->display_name }}
                                                     </p>
                                                 </div>
-                                                <p class="text-sm font-medium text-gray-900 dark:text-white">
-                                                    {{ $item->getFormattedPrice() }}
-                                                </p>
+                                                <div class="text-right">
+                                                    <p class="text-sm font-medium text-gray-900 dark:text-white">
+                                                        {{ $item->getFormattedPrice() }}
+                                                    </p>
+                                                    @if ($item->price_at_addition === 0 && $item->plugin->isOfficial())
+                                                        <span class="text-xs text-green-600 dark:text-green-400">Included with Ultra</span>
+                                                    @endif
+                                                </div>
                                             </div>
 
                                             <div class="mt-4 flex justify-end">
diff --git a/resources/views/cart/success.blade.php b/resources/views/cart/success.blade.php
index fd3e5111..972975de 100644
--- a/resources/views/cart/success.blade.php
+++ b/resources/views/cart/success.blade.php
@@ -1,238 +1,331 @@
 <x-layout title="Purchase Complete">
     <div class="mx-auto mt-10 max-w-2xl px-4 sm:px-6 lg:px-8">
-        <div
-            x-data="{
-                status: 'pending',
-                licenses: [],
-                products: [],
-                needsGitHubConnection: false,
-                hasGitHubConnected: false,
-                pollCount: 0,
-                maxPolls: 30,
-                pollInterval: null,
-                init() {
-                    this.checkStatus();
-                    this.pollInterval = setInterval(() => {
-                        if (this.status === 'complete' || this.pollCount >= this.maxPolls) {
-                            clearInterval(this.pollInterval);
-                            return;
-                        }
-                        this.checkStatus();
-                    }, 2000);
-                },
-                async checkStatus() {
-                    this.pollCount++;
-                    try {
-                        const response = await fetch('{{ route('cart.status', ['sessionId' => $sessionId]) }}');
-                        const data = await response.json();
-                        console.log(data);
-                        this.status = data.status;
-                        if (data.licenses) {
-                            this.licenses = data.licenses;
-                        }
-                        if (data.products) {
-                            this.products = data.products;
-                        }
-                        if (data.needs_github_connection !== undefined) {
-                            this.needsGitHubConnection = data.needs_github_connection;
-                        }
-                        if (data.has_github_connected !== undefined) {
-                            this.hasGitHubConnected = data.has_github_connected;
-                        }
-                    } catch (e) {
-                        console.error('Failed to check status', e);
-                    }
-                }
-            }"
-            class="rounded-lg border border-gray-200 bg-white p-8 text-center dark:border-gray-700 dark:bg-gray-800"
-        >
-            {{-- Loading State --}}
-            <template x-if="status === 'pending' && pollCount < maxPolls">
-                <div>
-                    <div class="mx-auto flex size-16 items-center justify-center rounded-full bg-indigo-100 dark:bg-indigo-900/30">
-                        <svg class="size-8 animate-spin text-indigo-600 dark:text-indigo-400" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
-                            <circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle>
-                            <path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path>
-                        </svg>
-                    </div>
-                    <h1 class="mt-6 text-2xl font-bold text-gray-900 dark:text-white">Processing Your Purchase...</h1>
-                    <p class="mt-2 text-gray-600 dark:text-gray-400">
-                        Please wait while we confirm your payment and set up your licenses.
-                    </p>
-                    <p class="mt-4 text-sm text-gray-500 dark:text-gray-500">
-                        This usually takes just a few seconds.
-                    </p>
+        @if ($isFreeCheckout ?? false)
+            {{-- Free Checkout: Immediate success, no polling --}}
+            <div class="rounded-lg border border-gray-200 bg-white p-8 text-center dark:border-gray-700 dark:bg-gray-800">
+                <div class="mx-auto flex size-16 items-center justify-center rounded-full bg-green-100 dark:bg-green-900/30">
+                    <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-8 text-green-600 dark:text-green-400">
+                        <path stroke-linecap="round" stroke-linejoin="round" d="M9 12.75 11.25 15 15 9.75M21 12a9 9 0 1 1-18 0 9 9 0 0 1 18 0Z" />
+                    </svg>
                 </div>
-            </template>
 
-            {{-- Success State --}}
-            <template x-if="status === 'complete'">
-                <div>
-                    {{-- Success Icon --}}
-                    <div class="mx-auto flex size-16 items-center justify-center rounded-full bg-green-100 dark:bg-green-900/30">
-                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-8 text-green-600 dark:text-green-400">
-                            <path stroke-linecap="round" stroke-linejoin="round" d="M9 12.75 11.25 15 15 9.75M21 12a9 9 0 1 1-18 0 9 9 0 0 1 18 0Z" />
-                        </svg>
-                    </div>
-
-                    <h1 class="mt-6 text-2xl font-bold text-gray-900 dark:text-white">Thank You for Your Purchase!</h1>
-                    <p class="mt-2 text-gray-600 dark:text-gray-400">
-                        Your payment was successful.
-                    </p>
+                <h1 class="mt-6 text-2xl font-bold text-gray-900 dark:text-white">Plugins Added!</h1>
+                <p class="mt-2 text-gray-600 dark:text-gray-400">
+                    Your plugins are ready to use.
+                </p>
 
-                    {{-- Purchased Products --}}
-                    <template x-if="products.length > 0">
-                        <div class="mt-8">
-                            <h3 class="text-left text-sm font-medium text-gray-500 dark:text-gray-400">Products</h3>
-                            <div class="mt-3 space-y-4">
-                                <template x-for="product in products" :key="product.id">
+                @if ($cart && $cart->items->isNotEmpty())
+                    <div class="mt-8">
+                        <h3 class="text-left text-sm font-medium text-gray-500 dark:text-gray-400">Plugins</h3>
+                        <div class="mt-3 space-y-4">
+                            @foreach ($cart->items as $item)
+                                @if ($item->plugin)
                                     <div class="flex items-center justify-between rounded-lg border border-gray-200 bg-gray-50 p-4 dark:border-gray-700 dark:bg-gray-700/50">
                                         <div class="flex items-center gap-4">
-                                            <div class="grid size-10 place-items-center rounded-lg bg-gradient-to-br from-purple-500 to-indigo-600 text-white">
-                                                <x-heroicon-s-cube class="size-5" />
+                                            <div class="grid size-10 place-items-center rounded-lg bg-gradient-to-br from-indigo-500 to-purple-600 text-white">
+                                                <x-vaadin-plug class="size-5" />
                                             </div>
                                             <div class="text-left">
-                                                <span class="font-mono text-sm font-medium text-gray-900 dark:text-white" x-text="product.product_name"></span>
-                                                <template x-if="product.github_repo">
-                                                    <p class="text-xs text-gray-500 dark:text-gray-400">
-                                                        Includes access to <code class="rounded bg-gray-200 px-1 dark:bg-gray-600" x-text="'nativephp/' + product.github_repo"></code>
-                                                    </p>
-                                                </template>
+                                                <span class="font-mono text-sm font-medium text-gray-900 dark:text-white">{{ $item->plugin->name }}</span>
+                                                @if ($item->price_at_addition === 0 && $item->plugin->isOfficial())
+                                                    <p class="text-xs text-green-600 dark:text-green-400">Included with Ultra</p>
+                                                @endif
                                             </div>
                                         </div>
+                                        <a href="{{ route('plugins.show', $item->plugin->routeParams()) }}" class="text-sm font-medium text-indigo-600 hover:text-indigo-700 dark:text-indigo-400 dark:hover:text-indigo-300">
+                                            View Plugin
+                                        </a>
                                     </div>
-                                </template>
-                            </div>
+                                @endif
+
+                                @if ($item->isBundle() && $item->pluginBundle)
+                                    @foreach ($item->pluginBundle->plugins as $plugin)
+                                        <div class="flex items-center justify-between rounded-lg border border-gray-200 bg-gray-50 p-4 dark:border-gray-700 dark:bg-gray-700/50">
+                                            <div class="flex items-center gap-4">
+                                                <div class="grid size-10 place-items-center rounded-lg bg-gradient-to-br from-indigo-500 to-purple-600 text-white">
+                                                    <x-vaadin-plug class="size-5" />
+                                                </div>
+                                                <span class="font-mono text-sm font-medium text-gray-900 dark:text-white">{{ $plugin->name }}</span>
+                                            </div>
+                                        </div>
+                                    @endforeach
+                                @endif
+                            @endforeach
                         </div>
-                    </template>
+                    </div>
+                @endif
 
-                    {{-- Purchased Plugins --}}
-                    <template x-if="licenses.length > 0">
-                        <div class="mt-8">
-                            <h3 class="text-left text-sm font-medium text-gray-500 dark:text-gray-400">Plugins</h3>
-                            <div class="mt-3 space-y-4">
-                                <template x-for="license in licenses" :key="license.id">
-                                    <div class="flex items-center justify-between rounded-lg border border-gray-200 bg-gray-50 p-4 dark:border-gray-700 dark:bg-gray-700/50">
-                                        <div class="flex items-center gap-4">
-                                            <div class="grid size-10 place-items-center rounded-lg bg-gradient-to-br from-indigo-500 to-purple-600 text-white">
-                                                <x-vaadin-plug class="size-5" />
+                {{-- Plugin Installation --}}
+                <div class="mt-8 rounded-lg bg-indigo-50 p-6 text-left dark:bg-indigo-900/20">
+                    <h3 class="font-medium text-indigo-900 dark:text-indigo-200">Plugin Installation</h3>
+                    <ul class="mt-3 space-y-2 text-sm text-indigo-700 dark:text-indigo-300">
+                        <li class="flex items-start gap-2">
+                            <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="mt-0.5 size-4 shrink-0">
+                                <path fill-rule="evenodd" d="M16.704 4.153a.75.75 0 0 1 .143 1.052l-8 10.5a.75.75 0 0 1-1.127.075l-4.5-4.5a.75.75 0 0 1 1.06-1.06l3.894 3.893 7.48-9.817a.75.75 0 0 1 1.05-.143Z" clip-rule="evenodd" />
+                            </svg>
+                            Configure your Composer credentials in your project
+                        </li>
+                        <li class="flex items-start gap-2">
+                            <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="mt-0.5 size-4 shrink-0">
+                                <path fill-rule="evenodd" d="M16.704 4.153a.75.75 0 0 1 .143 1.052l-8 10.5a.75.75 0 0 1-1.127.075l-4.5-4.5a.75.75 0 0 1 1.06-1.06l3.894 3.893 7.48-9.817a.75.75 0 0 1 1.05-.143Z" clip-rule="evenodd" />
+                            </svg>
+                            Run <code class="rounded bg-indigo-100 px-1 dark:bg-indigo-900/50">composer require [package-name]</code>
+                        </li>
+                        <li class="flex items-start gap-2">
+                            <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="mt-0.5 size-4 shrink-0">
+                                <path fill-rule="evenodd" d="M16.704 4.153a.75.75 0 0 1 .143 1.052l-8 10.5a.75.75 0 0 1-1.127.075l-4.5-4.5a.75.75 0 0 1 1.06-1.06l3.894 3.893 7.48-9.817a.75.75 0 0 1 1.05-.143Z" clip-rule="evenodd" />
+                            </svg>
+                            Follow the plugin's installation instructions
+                        </li>
+                    </ul>
+                </div>
+
+                {{-- Actions --}}
+                <div class="mt-8 flex flex-col gap-4 sm:flex-row sm:justify-center">
+                    <a href="{{ route('dashboard') }}" class="inline-flex items-center justify-center rounded-md bg-indigo-600 px-6 py-3 text-sm font-medium text-white hover:bg-indigo-700">
+                        Go to Dashboard
+                    </a>
+                    <a href="{{ route('plugins.marketplace') }}" class="inline-flex items-center justify-center rounded-md border border-gray-300 bg-white px-6 py-3 text-sm font-medium text-gray-700 hover:bg-gray-50 dark:border-gray-600 dark:bg-gray-700 dark:text-gray-300 dark:hover:bg-gray-600">
+                        Browse More Plugins
+                    </a>
+                </div>
+            </div>
+        @else
+            {{-- Paid Checkout: Alpine.js polling for Stripe webhook --}}
+            <div
+                x-data="{
+                    status: 'pending',
+                    licenses: [],
+                    products: [],
+                    needsGitHubConnection: false,
+                    hasGitHubConnected: false,
+                    pollCount: 0,
+                    maxPolls: 30,
+                    pollInterval: null,
+                    init() {
+                        this.checkStatus();
+                        this.pollInterval = setInterval(() => {
+                            if (this.status === 'complete' || this.pollCount >= this.maxPolls) {
+                                clearInterval(this.pollInterval);
+                                return;
+                            }
+                            this.checkStatus();
+                        }, 2000);
+                    },
+                    async checkStatus() {
+                        this.pollCount++;
+                        try {
+                            const response = await fetch('{{ route('cart.status', ['sessionId' => $sessionId]) }}');
+                            const data = await response.json();
+                            console.log(data);
+                            this.status = data.status;
+                            if (data.licenses) {
+                                this.licenses = data.licenses;
+                            }
+                            if (data.products) {
+                                this.products = data.products;
+                            }
+                            if (data.needs_github_connection !== undefined) {
+                                this.needsGitHubConnection = data.needs_github_connection;
+                            }
+                            if (data.has_github_connected !== undefined) {
+                                this.hasGitHubConnected = data.has_github_connected;
+                            }
+                        } catch (e) {
+                            console.error('Failed to check status', e);
+                        }
+                    }
+                }"
+                class="rounded-lg border border-gray-200 bg-white p-8 text-center dark:border-gray-700 dark:bg-gray-800"
+            >
+                {{-- Loading State --}}
+                <template x-if="status === 'pending' && pollCount < maxPolls">
+                    <div>
+                        <div class="mx-auto flex size-16 items-center justify-center rounded-full bg-indigo-100 dark:bg-indigo-900/30">
+                            <svg class="size-8 animate-spin text-indigo-600 dark:text-indigo-400" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
+                                <circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle>
+                                <path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path>
+                            </svg>
+                        </div>
+                        <h1 class="mt-6 text-2xl font-bold text-gray-900 dark:text-white">Processing Your Purchase...</h1>
+                        <p class="mt-2 text-gray-600 dark:text-gray-400">
+                            Please wait while we confirm your payment and set up your licenses.
+                        </p>
+                        <p class="mt-4 text-sm text-gray-500 dark:text-gray-500">
+                            This usually takes just a few seconds.
+                        </p>
+                    </div>
+                </template>
+
+                {{-- Success State --}}
+                <template x-if="status === 'complete'">
+                    <div>
+                        {{-- Success Icon --}}
+                        <div class="mx-auto flex size-16 items-center justify-center rounded-full bg-green-100 dark:bg-green-900/30">
+                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-8 text-green-600 dark:text-green-400">
+                                <path stroke-linecap="round" stroke-linejoin="round" d="M9 12.75 11.25 15 15 9.75M21 12a9 9 0 1 1-18 0 9 9 0 0 1 18 0Z" />
+                            </svg>
+                        </div>
+
+                        <h1 class="mt-6 text-2xl font-bold text-gray-900 dark:text-white">Thank You for Your Purchase!</h1>
+                        <p class="mt-2 text-gray-600 dark:text-gray-400">
+                            Your payment was successful.
+                        </p>
+
+                        {{-- Purchased Products --}}
+                        <template x-if="products.length > 0">
+                            <div class="mt-8">
+                                <h3 class="text-left text-sm font-medium text-gray-500 dark:text-gray-400">Products</h3>
+                                <div class="mt-3 space-y-4">
+                                    <template x-for="product in products" :key="product.id">
+                                        <div class="flex items-center justify-between rounded-lg border border-gray-200 bg-gray-50 p-4 dark:border-gray-700 dark:bg-gray-700/50">
+                                            <div class="flex items-center gap-4">
+                                                <div class="grid size-10 place-items-center rounded-lg bg-gradient-to-br from-purple-500 to-indigo-600 text-white">
+                                                    <x-heroicon-s-cube class="size-5" />
+                                                </div>
+                                                <div class="text-left">
+                                                    <span class="font-mono text-sm font-medium text-gray-900 dark:text-white" x-text="product.product_name"></span>
+                                                    <template x-if="product.github_repo">
+                                                        <p class="text-xs text-gray-500 dark:text-gray-400">
+                                                            Includes access to <code class="rounded bg-gray-200 px-1 dark:bg-gray-600" x-text="'nativephp/' + product.github_repo"></code>
+                                                        </p>
+                                                    </template>
+                                                </div>
                                             </div>
-                                            <span class="font-mono text-sm font-medium text-gray-900 dark:text-white" x-text="license.plugin_name"></span>
                                         </div>
-                                        <a :href="'/plugins/' + license.plugin_name" class="text-sm font-medium text-indigo-600 hover:text-indigo-700 dark:text-indigo-400 dark:hover:text-indigo-300">
-                                            View Plugin
-                                        </a>
-                                    </div>
-                                </template>
+                                    </template>
+                                </div>
                             </div>
-                        </div>
-                    </template>
+                        </template>
 
-                    {{-- GitHub Connection CTA --}}
-                    <template x-if="needsGitHubConnection">
-                        <div class="mt-8 rounded-lg border-2 border-purple-200 bg-purple-50 p-6 text-left dark:border-purple-700 dark:bg-purple-900/20">
-                            <div class="flex items-start gap-4">
-                                <div class="grid size-10 shrink-0 place-items-center rounded-full bg-purple-100 dark:bg-purple-900/50">
-                                    <svg class="size-5 text-purple-600 dark:text-purple-400" fill="currentColor" viewBox="0 0 24 24">
-                                        <path fill-rule="evenodd" d="M12 2C6.477 2 2 6.484 2 12.017c0 4.425 2.865 8.18 6.839 9.504.5.092.682-.217.682-.483 0-.237-.008-.868-.013-1.703-2.782.605-3.369-1.343-3.369-1.343-.454-1.158-1.11-1.466-1.11-1.466-.908-.62.069-.608.069-.608 1.003.07 1.531 1.032 1.531 1.032.892 1.53 2.341 1.088 2.91.832.092-.647.35-1.088.636-1.338-2.22-.253-4.555-1.113-4.555-4.951 0-1.093.39-1.988 1.029-2.688-.103-.253-.446-1.272.098-2.65 0 0 .84-.27 2.75 1.026A9.564 9.564 0 0112 6.844c.85.004 1.705.115 2.504.337 1.909-1.296 2.747-1.027 2.747-1.027.546 1.379.202 2.398.1 2.651.64.7 1.028 1.595 1.028 2.688 0 3.848-2.339 4.695-4.566 4.943.359.309.678.92.678 1.855 0 1.338-.012 2.419-.012 2.747 0 .268.18.58.688.482A10.019 10.019 0 0022 12.017C22 6.484 17.522 2 12 2z" clip-rule="evenodd" />
-                                    </svg>
+                        {{-- Purchased Plugins --}}
+                        <template x-if="licenses.length > 0">
+                            <div class="mt-8">
+                                <h3 class="text-left text-sm font-medium text-gray-500 dark:text-gray-400">Plugins</h3>
+                                <div class="mt-3 space-y-4">
+                                    <template x-for="license in licenses" :key="license.id">
+                                        <div class="flex items-center justify-between rounded-lg border border-gray-200 bg-gray-50 p-4 dark:border-gray-700 dark:bg-gray-700/50">
+                                            <div class="flex items-center gap-4">
+                                                <div class="grid size-10 place-items-center rounded-lg bg-gradient-to-br from-indigo-500 to-purple-600 text-white">
+                                                    <x-vaadin-plug class="size-5" />
+                                                </div>
+                                                <span class="font-mono text-sm font-medium text-gray-900 dark:text-white" x-text="license.plugin_name"></span>
+                                            </div>
+                                            <a :href="'/plugins/' + license.plugin_name" class="text-sm font-medium text-indigo-600 hover:text-indigo-700 dark:text-indigo-400 dark:hover:text-indigo-300">
+                                                View Plugin
+                                            </a>
+                                        </div>
+                                    </template>
                                 </div>
-                                <div>
-                                    <h3 class="font-semibold text-purple-900 dark:text-purple-200">Connect GitHub to Access Your Repositories</h3>
-                                    <p class="mt-1 text-sm text-purple-700 dark:text-purple-300">
-                                        Your purchase includes access to private GitHub repositories. Connect your GitHub account to get access.
-                                    </p>
-                                    <a href="{{ route('customer.integrations') }}" class="mt-4 inline-flex items-center gap-2 rounded-md bg-purple-600 px-4 py-2 text-sm font-medium text-white transition hover:bg-purple-500">
-                                        Go to Integrations
-                                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" class="size-4">
-                                            <path stroke-linecap="round" stroke-linejoin="round" d="M13.5 4.5 21 12m0 0-7.5 7.5M21 12H3" />
+                            </div>
+                        </template>
+
+                        {{-- GitHub Connection CTA --}}
+                        <template x-if="needsGitHubConnection">
+                            <div class="mt-8 rounded-lg border-2 border-purple-200 bg-purple-50 p-6 text-left dark:border-purple-700 dark:bg-purple-900/20">
+                                <div class="flex items-start gap-4">
+                                    <div class="grid size-10 shrink-0 place-items-center rounded-full bg-purple-100 dark:bg-purple-900/50">
+                                        <svg class="size-5 text-purple-600 dark:text-purple-400" fill="currentColor" viewBox="0 0 24 24">
+                                            <path fill-rule="evenodd" d="M12 2C6.477 2 2 6.484 2 12.017c0 4.425 2.865 8.18 6.839 9.504.5.092.682-.217.682-.483 0-.237-.008-.868-.013-1.703-2.782.605-3.369-1.343-3.369-1.343-.454-1.158-1.11-1.466-1.11-1.466-.908-.62.069-.608.069-.608 1.003.07 1.531 1.032 1.531 1.032.892 1.53 2.341 1.088 2.91.832.092-.647.35-1.088.636-1.338-2.22-.253-4.555-1.113-4.555-4.951 0-1.093.39-1.988 1.029-2.688-.103-.253-.446-1.272.098-2.65 0 0 .84-.27 2.75 1.026A9.564 9.564 0 0112 6.844c.85.004 1.705.115 2.504.337 1.909-1.296 2.747-1.027 2.747-1.027.546 1.379.202 2.398.1 2.651.64.7 1.028 1.595 1.028 2.688 0 3.848-2.339 4.695-4.566 4.943.359.309.678.92.678 1.855 0 1.338-.012 2.419-.012 2.747 0 .268.18.58.688.482A10.019 10.019 0 0022 12.017C22 6.484 17.522 2 12 2z" clip-rule="evenodd" />
                                         </svg>
-                                    </a>
+                                    </div>
+                                    <div>
+                                        <h3 class="font-semibold text-purple-900 dark:text-purple-200">Connect GitHub to Access Your Repositories</h3>
+                                        <p class="mt-1 text-sm text-purple-700 dark:text-purple-300">
+                                            Your purchase includes access to private GitHub repositories. Connect your GitHub account to get access.
+                                        </p>
+                                        <a href="{{ route('customer.integrations') }}" class="mt-4 inline-flex items-center gap-2 rounded-md bg-purple-600 px-4 py-2 text-sm font-medium text-white transition hover:bg-purple-500">
+                                            Go to Integrations
+                                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" class="size-4">
+                                                <path stroke-linecap="round" stroke-linejoin="round" d="M13.5 4.5 21 12m0 0-7.5 7.5M21 12H3" />
+                                            </svg>
+                                        </a>
+                                    </div>
                                 </div>
                             </div>
-                        </div>
-                    </template>
+                        </template>
 
-                    {{-- GitHub Access Granted --}}
-                    <template x-if="hasGitHubConnected && products.some(p => p.github_repo)">
-                        <div class="mt-8 rounded-lg bg-green-50 p-6 text-left dark:bg-green-900/20">
-                            <div class="flex items-start gap-4">
-                                <div class="grid size-10 shrink-0 place-items-center rounded-full bg-green-100 dark:bg-green-900/50">
-                                    <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" class="size-5 text-green-600 dark:text-green-400">
-                                        <path stroke-linecap="round" stroke-linejoin="round" d="m4.5 12.75 6 6 9-13.5" />
-                                    </svg>
-                                </div>
-                                <div>
-                                    <h3 class="font-semibold text-green-900 dark:text-green-200">Repository Access Granted</h3>
-                                    <p class="mt-1 text-sm text-green-700 dark:text-green-300">
-                                        Check your GitHub notifications for repository invitations. Accept the invitations to access your new repositories.
-                                    </p>
+                        {{-- GitHub Access Granted --}}
+                        <template x-if="hasGitHubConnected && products.some(p => p.github_repo)">
+                            <div class="mt-8 rounded-lg bg-green-50 p-6 text-left dark:bg-green-900/20">
+                                <div class="flex items-start gap-4">
+                                    <div class="grid size-10 shrink-0 place-items-center rounded-full bg-green-100 dark:bg-green-900/50">
+                                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" class="size-5 text-green-600 dark:text-green-400">
+                                            <path stroke-linecap="round" stroke-linejoin="round" d="m4.5 12.75 6 6 9-13.5" />
+                                        </svg>
+                                    </div>
+                                    <div>
+                                        <h3 class="font-semibold text-green-900 dark:text-green-200">Repository Access Granted</h3>
+                                        <p class="mt-1 text-sm text-green-700 dark:text-green-300">
+                                            Check your GitHub notifications for repository invitations. Accept the invitations to access your new repositories.
+                                        </p>
+                                    </div>
                                 </div>
                             </div>
-                        </div>
-                    </template>
+                        </template>
 
-                    {{-- Next Steps for Plugins --}}
-                    <template x-if="licenses.length > 0">
-                        <div class="mt-8 rounded-lg bg-indigo-50 p-6 text-left dark:bg-indigo-900/20">
-                            <h3 class="font-medium text-indigo-900 dark:text-indigo-200">Plugin Installation</h3>
-                            <ul class="mt-3 space-y-2 text-sm text-indigo-700 dark:text-indigo-300">
-                                <li class="flex items-start gap-2">
-                                    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="mt-0.5 size-4 shrink-0">
-                                        <path fill-rule="evenodd" d="M16.704 4.153a.75.75 0 0 1 .143 1.052l-8 10.5a.75.75 0 0 1-1.127.075l-4.5-4.5a.75.75 0 0 1 1.06-1.06l3.894 3.893 7.48-9.817a.75.75 0 0 1 1.05-.143Z" clip-rule="evenodd" />
-                                    </svg>
-                                    Configure your Composer credentials in your project
-                                </li>
-                                <li class="flex items-start gap-2">
-                                    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="mt-0.5 size-4 shrink-0">
-                                        <path fill-rule="evenodd" d="M16.704 4.153a.75.75 0 0 1 .143 1.052l-8 10.5a.75.75 0 0 1-1.127.075l-4.5-4.5a.75.75 0 0 1 1.06-1.06l3.894 3.893 7.48-9.817a.75.75 0 0 1 1.05-.143Z" clip-rule="evenodd" />
-                                    </svg>
-                                    Run <code class="rounded bg-indigo-100 px-1 dark:bg-indigo-900/50">composer require [package-name]</code>
-                                </li>
-                                <li class="flex items-start gap-2">
-                                    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="mt-0.5 size-4 shrink-0">
-                                        <path fill-rule="evenodd" d="M16.704 4.153a.75.75 0 0 1 .143 1.052l-8 10.5a.75.75 0 0 1-1.127.075l-4.5-4.5a.75.75 0 0 1 1.06-1.06l3.894 3.893 7.48-9.817a.75.75 0 0 1 1.05-.143Z" clip-rule="evenodd" />
-                                    </svg>
-                                    Follow the plugin's installation instructions
-                                </li>
-                            </ul>
-                        </div>
-                    </template>
+                        {{-- Next Steps for Plugins --}}
+                        <template x-if="licenses.length > 0">
+                            <div class="mt-8 rounded-lg bg-indigo-50 p-6 text-left dark:bg-indigo-900/20">
+                                <h3 class="font-medium text-indigo-900 dark:text-indigo-200">Plugin Installation</h3>
+                                <ul class="mt-3 space-y-2 text-sm text-indigo-700 dark:text-indigo-300">
+                                    <li class="flex items-start gap-2">
+                                        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="mt-0.5 size-4 shrink-0">
+                                            <path fill-rule="evenodd" d="M16.704 4.153a.75.75 0 0 1 .143 1.052l-8 10.5a.75.75 0 0 1-1.127.075l-4.5-4.5a.75.75 0 0 1 1.06-1.06l3.894 3.893 7.48-9.817a.75.75 0 0 1 1.05-.143Z" clip-rule="evenodd" />
+                                        </svg>
+                                        Configure your Composer credentials in your project
+                                    </li>
+                                    <li class="flex items-start gap-2">
+                                        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="mt-0.5 size-4 shrink-0">
+                                            <path fill-rule="evenodd" d="M16.704 4.153a.75.75 0 0 1 .143 1.052l-8 10.5a.75.75 0 0 1-1.127.075l-4.5-4.5a.75.75 0 0 1 1.06-1.06l3.894 3.893 7.48-9.817a.75.75 0 0 1 1.05-.143Z" clip-rule="evenodd" />
+                                        </svg>
+                                        Run <code class="rounded bg-indigo-100 px-1 dark:bg-indigo-900/50">composer require [package-name]</code>
+                                    </li>
+                                    <li class="flex items-start gap-2">
+                                        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="mt-0.5 size-4 shrink-0">
+                                            <path fill-rule="evenodd" d="M16.704 4.153a.75.75 0 0 1 .143 1.052l-8 10.5a.75.75 0 0 1-1.127.075l-4.5-4.5a.75.75 0 0 1 1.06-1.06l3.894 3.893 7.48-9.817a.75.75 0 0 1 1.05-.143Z" clip-rule="evenodd" />
+                                        </svg>
+                                        Follow the plugin's installation instructions
+                                    </li>
+                                </ul>
+                            </div>
+                        </template>
 
-                    {{-- Actions --}}
-                    <div class="mt-8 flex flex-col gap-4 sm:flex-row sm:justify-center">
-                        <a href="{{ route('dashboard') }}" class="inline-flex items-center justify-center rounded-md bg-indigo-600 px-6 py-3 text-sm font-medium text-white hover:bg-indigo-700">
-                            Go to Dashboard
-                        </a>
-                        <a href="{{ route('plugins.marketplace') }}" class="inline-flex items-center justify-center rounded-md border border-gray-300 bg-white px-6 py-3 text-sm font-medium text-gray-700 hover:bg-gray-50 dark:border-gray-600 dark:bg-gray-700 dark:text-gray-300 dark:hover:bg-gray-600">
-                            Browse More Plugins
-                        </a>
+                        {{-- Actions --}}
+                        <div class="mt-8 flex flex-col gap-4 sm:flex-row sm:justify-center">
+                            <a href="{{ route('dashboard') }}" class="inline-flex items-center justify-center rounded-md bg-indigo-600 px-6 py-3 text-sm font-medium text-white hover:bg-indigo-700">
+                                Go to Dashboard
+                            </a>
+                            <a href="{{ route('plugins.marketplace') }}" class="inline-flex items-center justify-center rounded-md border border-gray-300 bg-white px-6 py-3 text-sm font-medium text-gray-700 hover:bg-gray-50 dark:border-gray-600 dark:bg-gray-700 dark:text-gray-300 dark:hover:bg-gray-600">
+                                Browse More Plugins
+                            </a>
+                        </div>
                     </div>
-                </div>
-            </template>
+                </template>
 
-            {{-- Timeout/Error State --}}
-            <template x-if="status === 'pending' && pollCount >= maxPolls">
-                <div>
-                    <div class="mx-auto flex size-16 items-center justify-center rounded-full bg-yellow-100 dark:bg-yellow-900/30">
-                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-8 text-yellow-600 dark:text-yellow-400">
-                            <path stroke-linecap="round" stroke-linejoin="round" d="M12 9v3.75m9-.75a9 9 0 1 1-18 0 9 9 0 0 1 18 0Zm-9 3.75h.008v.008H12v-.008Z" />
-                        </svg>
-                    </div>
-                    <h1 class="mt-6 text-2xl font-bold text-gray-900 dark:text-white">Taking Longer Than Expected</h1>
-                    <p class="mt-2 text-gray-600 dark:text-gray-400">
-                        Your payment is being processed, but it's taking longer than usual. Don't worry - your purchase is confirmed.
-                    </p>
-                    <p class="mt-4 text-sm text-gray-500 dark:text-gray-500">
-                        Please check your dashboard in a few minutes, or contact support if you don't see your items.
-                    </p>
-                    <div class="mt-8 flex justify-center">
-                        <a href="{{ route('dashboard') }}" class="inline-flex items-center justify-center rounded-md bg-indigo-600 px-6 py-3 text-sm font-medium text-white hover:bg-indigo-700">
-                            Go to Dashboard
-                        </a>
+                {{-- Timeout/Error State --}}
+                <template x-if="status === 'pending' && pollCount >= maxPolls">
+                    <div>
+                        <div class="mx-auto flex size-16 items-center justify-center rounded-full bg-yellow-100 dark:bg-yellow-900/30">
+                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-8 text-yellow-600 dark:text-yellow-400">
+                                <path stroke-linecap="round" stroke-linejoin="round" d="M12 9v3.75m9-.75a9 9 0 1 1-18 0 9 9 0 0 1 18 0Zm-9 3.75h.008v.008H12v-.008Z" />
+                            </svg>
+                        </div>
+                        <h1 class="mt-6 text-2xl font-bold text-gray-900 dark:text-white">Taking Longer Than Expected</h1>
+                        <p class="mt-2 text-gray-600 dark:text-gray-400">
+                            Your payment is being processed, but it's taking longer than usual. Don't worry - your purchase is confirmed.
+                        </p>
+                        <p class="mt-4 text-sm text-gray-500 dark:text-gray-500">
+                            Please check your dashboard in a few minutes, or contact support if you don't see your items.
+                        </p>
+                        <div class="mt-8 flex justify-center">
+                            <a href="{{ route('dashboard') }}" class="inline-flex items-center justify-center rounded-md bg-indigo-600 px-6 py-3 text-sm font-medium text-white hover:bg-indigo-700">
+                                Go to Dashboard
+                            </a>
+                        </div>
                     </div>
-                </div>
-            </template>
-        </div>
+                </template>
+            </div>
+        @endif
     </div>
 </x-layout>
diff --git a/resources/views/components/customer/masked-key.blade.php b/resources/views/components/customer/masked-key.blade.php
new file mode 100644
index 00000000..72c35a75
--- /dev/null
+++ b/resources/views/components/customer/masked-key.blade.php
@@ -0,0 +1,16 @@
+@props(['key-value'])
+
+<span
+    x-data="{ copied: false }"
+    class="inline-flex items-center gap-2"
+>
+    <code class="font-mono text-sm text-zinc-500 dark:text-zinc-400 select-none">{{ Str::substr($keyValue, 0, 4) }}****{{ Str::substr($keyValue, -4) }}</code>
+    <flux:button
+        size="xs"
+        variant="ghost"
+        x-on:click="navigator.clipboard.writeText('{{ $keyValue }}').then(() => { copied = true; setTimeout(() => copied = false, 2000) })"
+    >
+        <span x-show="!copied">Copy</span>
+        <span x-show="copied" x-cloak>Copied!</span>
+    </flux:button>
+</span>
diff --git a/resources/views/components/dashboard-card.blade.php b/resources/views/components/dashboard-card.blade.php
index 7c8126a5..b6319092 100644
--- a/resources/views/components/dashboard-card.blade.php
+++ b/resources/views/components/dashboard-card.blade.php
@@ -9,6 +9,8 @@
     'description' => null,
     'badge' => null,
     'badgeColor' => 'green',
+    'secondBadge' => null,
+    'secondBadgeColor' => 'yellow',
 ])
 
 @php
@@ -20,17 +22,9 @@
         'indigo' => 'bg-indigo-100 text-indigo-600 dark:bg-indigo-900/30 dark:text-indigo-400',
         'gray' => 'bg-gray-100 text-gray-600 dark:bg-gray-700 dark:text-gray-400',
     ];
-
-    $badgeClasses = [
-        'green' => 'bg-green-100 text-green-800 dark:bg-green-900/30 dark:text-green-400',
-        'blue' => 'bg-blue-100 text-blue-800 dark:bg-blue-900/30 dark:text-blue-400',
-        'yellow' => 'bg-yellow-100 text-yellow-800 dark:bg-yellow-900/30 dark:text-yellow-400',
-        'red' => 'bg-red-100 text-red-800 dark:bg-red-900/30 dark:text-red-400',
-        'gray' => 'bg-gray-100 text-gray-800 dark:bg-gray-700 dark:text-gray-400',
-    ];
 @endphp
 
-<div class="flex h-full flex-col overflow-hidden rounded-lg bg-white shadow dark:bg-gray-800">
+<flux:card class="flex h-full flex-col !p-0">
     <div class="flex-1 p-5">
         <div class="flex items-center">
             @if($icon)
@@ -41,41 +35,36 @@
                 </div>
             @endif
             <div class="{{ $icon ? 'ml-5' : '' }} w-0 flex-1">
-                <dl>
-                    <dt class="truncate text-sm font-medium text-gray-500 dark:text-gray-400">
-                        {{ $title }}
-                    </dt>
-                    <dd class="flex items-baseline">
-                        @if($count !== null)
-                            <span class="text-2xl font-semibold text-gray-900 dark:text-white">
-                                {{ $count }}
-                            </span>
-                        @elseif($value !== null)
-                            <span class="text-lg font-semibold text-gray-900 dark:text-white">
-                                {{ $value }}
-                            </span>
-                        @endif
-                        @if($badge)
-                            <span class="{{ $badgeClasses[$badgeColor] ?? $badgeClasses['green'] }} ml-2 inline-flex items-center rounded-full px-2.5 py-0.5 text-xs font-medium">
-                                {{ $badge }}
-                            </span>
-                        @endif
-                    </dd>
-                    @if($description)
-                        <dd class="mt-1 text-sm text-gray-500 dark:text-gray-400">
-                            {{ $description }}
-                        </dd>
+                <flux:text class="truncate text-sm font-medium">{{ $title }}</flux:text>
+                <div class="flex flex-wrap items-baseline gap-y-1">
+                    @if($count !== null)
+                        <flux:heading size="xl">{{ $count }}</flux:heading>
+                    @elseif($value !== null)
+                        <flux:heading size="lg">{{ $value }}</flux:heading>
                     @endif
-                </dl>
+                    @if($badge || $secondBadge)
+                        <span class="flex w-full items-center gap-1.5 lg:ml-2 lg:w-auto">
+                            @if($badge)
+                                <flux:badge size="sm" :color="$badgeColor">{{ $badge }}</flux:badge>
+                            @endif
+                            @if($secondBadge)
+                                <flux:badge size="sm" :color="$secondBadgeColor">{{ $secondBadge }}</flux:badge>
+                            @endif
+                        </span>
+                    @endif
+                </div>
+                @if($description)
+                    <flux:text class="mt-1 text-sm">{{ $description }}</flux:text>
+                @endif
             </div>
         </div>
     </div>
     @if($href)
-        <div class="border-t border-gray-200 bg-gray-50 px-5 py-3 dark:border-gray-700 dark:bg-gray-800/50">
+        <div class="border-t border-zinc-200 px-5 py-3 dark:border-zinc-700">
             <a href="{{ $href }}" class="text-sm font-medium text-blue-600 hover:text-blue-500 dark:text-blue-400 dark:hover:text-blue-300">
                 {{ $linkText }}
                 <span aria-hidden="true"> &rarr;</span>
             </a>
         </div>
     @endif
-</div>
+</flux:card>
diff --git a/resources/views/components/dashboard-menu.blade.php b/resources/views/components/dashboard-menu.blade.php
index cedcb3c4..09d8ea41 100644
--- a/resources/views/components/dashboard-menu.blade.php
+++ b/resources/views/components/dashboard-menu.blade.php
@@ -48,6 +48,11 @@ class="absolute right-0 z-10 mt-2 w-48 origin-top-right rounded-md bg-white py-1
         <a href="{{ route('customer.integrations') }}" class="block px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 dark:text-gray-300 dark:hover:bg-gray-700">
             Integrations
         </a>
+        @if(auth()->user()->hasActiveUltraSubscription() || auth()->user()->ownedTeam)
+            <a href="{{ route('customer.team.index') }}" class="block px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 dark:text-gray-300 dark:hover:bg-gray-700">
+                Team
+            </a>
+        @endif
         <a href="{{ route('customer.billing-portal') }}" class="block px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 dark:text-gray-300 dark:hover:bg-gray-700">
             Manage Subscription
         </a>
diff --git a/resources/views/components/layouts/dashboard.blade.php b/resources/views/components/layouts/dashboard.blade.php
index 0fda420c..fbba3982 100644
--- a/resources/views/components/layouts/dashboard.blade.php
+++ b/resources/views/components/layouts/dashboard.blade.php
@@ -120,6 +120,14 @@ class="min-h-screen bg-white font-poppins antialiased dark:bg-zinc-900 dark:text
                     </flux:sidebar.item>
                 </flux:sidebar.group>
 
+                @if(auth()->user()->hasActiveUltraSubscription() || auth()->user()->isUltraTeamMember())
+                    <flux:sidebar.group expandable heading="Team" class="grid">
+                        <flux:sidebar.item href="{{ route('customer.team.index') }}" :current="request()->routeIs('customer.team.*')">
+                            {{ auth()->user()->ownedTeam ? 'Manage' : 'Create Team' }}
+                        </flux:sidebar.item>
+                    </flux:sidebar.group>
+                @endif
+
                 @feature(App\Features\ShowPlugins::class)
                     <flux:sidebar.group expandable heading="Developer" class="grid">
                         <flux:sidebar.item href="{{ route('customer.developer.onboarding') }}" :current="request()->routeIs('customer.developer.onboarding', 'customer.developer.dashboard')">
diff --git a/resources/views/components/navbar/mobile-menu.blade.php b/resources/views/components/navbar/mobile-menu.blade.php
index b174d2ef..7d45170f 100644
--- a/resources/views/components/navbar/mobile-menu.blade.php
+++ b/resources/views/components/navbar/mobile-menu.blade.php
@@ -88,7 +88,7 @@ class="@md:grid-cols-3 grid grid-cols-2 text-xl"
             >
                 @php
                     $isHomeActive = request()->routeIs('welcome*');
-                    $isDocsActive = request()->is('docs*');
+                    $isUltraActive = request()->routeIs('pricing');
                     $isBlogActive = request()->routeIs('blog*');
                     $isPartnersActive = request()->routeIs('partners*');
                     $isServicesActive = request()->routeIs('build-my-app');
@@ -120,18 +120,18 @@ class="size-4 shrink-0"
                     </a>
                 </div>
 
-                {{-- Docs Link --}}
+                {{-- Ultra Link --}}
                 <div>
                     <a
-                        href="/docs/"
+                        href="{{ route('pricing') }}"
                         @class([
                             'flex items-center gap-2 py-3 transition duration-200',
-                            'font-medium' => $isDocsActive,
-                            'opacity-50 hover:translate-x-1 hover:opacity-100' => ! $isDocsActive,
+                            'font-medium' => $isUltraActive,
+                            'opacity-50 hover:translate-x-1 hover:opacity-100' => ! $isUltraActive,
                         ])
-                        aria-current="{{ $isDocsActive ? 'page' : 'false' }}"
+                        aria-current="{{ $isUltraActive ? 'page' : 'false' }}"
                     >
-                        @if ($isDocsActive)
+                        @if ($isUltraActive)
                             <x-icons.right-arrow
                                 class="size-4 shrink-0"
                                 aria-hidden="true"
@@ -139,7 +139,7 @@ class="size-4 shrink-0"
                             />
                         @endif
 
-                        <div>Docs</div>
+                        <div>Ultra</div>
                     </a>
                 </div>
 
@@ -406,7 +406,7 @@ class="mx-auto mt-4 flex"
                 aria-label="Social media"
             >
                 <div
-                    class="flex flex-wrap justify-center-safe gap-4 contrast-120"
+                    class="flex flex-wrap justify-center-safe gap-2 contrast-120"
                 >
                     <x-social-networks-all />
                 </div>
diff --git a/resources/views/components/navigation-bar.blade.php b/resources/views/components/navigation-bar.blade.php
index 65f18de9..0ff7a278 100644
--- a/resources/views/components/navigation-bar.blade.php
+++ b/resources/views/components/navigation-bar.blade.php
@@ -168,6 +168,25 @@ class="size-[3px] rotate-45 rounded-xs bg-gray-400 transition duration-200 dark:
                     aria-hidden="true"
                 ></div>
 
+                {{-- Link --}}
+                <a
+                    href="{{ route('pricing') }}"
+                    @class([
+                        'transition duration-200',
+                        'font-medium' => request()->routeIs('pricing'),
+                        'opacity-60 hover:opacity-100' => ! request()->routeIs('pricing'),
+                    ])
+                    aria-current="{{ request()->routeIs('pricing') ? 'page' : 'false' }}"
+                >
+                    Ultra
+                </a>
+
+                {{-- Decorative circle --}}
+                <div
+                    class="size-[3px] rotate-45 rounded-xs bg-gray-400 transition duration-200 dark:opacity-60"
+                    aria-hidden="true"
+                ></div>
+
                 {{-- Link --}}
                 <a
                     href="{{ route('course') }}"
diff --git a/resources/views/components/plugin-card.blade.php b/resources/views/components/plugin-card.blade.php
index 2db18917..498abd3f 100644
--- a/resources/views/components/plugin-card.blade.php
+++ b/resources/views/components/plugin-card.blade.php
@@ -20,7 +20,11 @@ class="size-12 shrink-0 rounded-xl object-cover"
                 <x-vaadin-plug class="size-6" />
             </div>
         @endif
-        @if ($plugin->isPaid())
+        @if ($plugin->isPaid() && $plugin->isOfficial() && auth()->user()?->hasUltraAccess())
+            <span class="inline-flex items-center rounded-full bg-green-100 px-2.5 py-0.5 text-xs font-medium text-green-800 dark:bg-green-900/30 dark:text-green-400">
+                Free with Ultra
+            </span>
+        @elseif ($plugin->isPaid())
             <span class="inline-flex items-center rounded-full bg-emerald-100 px-2.5 py-0.5 text-xs font-medium text-emerald-800 dark:bg-emerald-900/30 dark:text-emerald-400">
                 Paid
             </span>
diff --git a/resources/views/components/pricing-plan-features.blade.php b/resources/views/components/pricing-plan-features.blade.php
index 4018ccbf..fca19834 100644
--- a/resources/views/components/pricing-plan-features.blade.php
+++ b/resources/views/components/pricing-plan-features.blade.php
@@ -48,6 +48,20 @@ class="size-5 shrink-0"
             developer seats (keys)
         </div>
     </div>
+    @if($features['teams'] ?? false)
+        <div class="flex items-center gap-2">
+            <x-icons.user-single
+                class="size-5 shrink-0"
+                aria-hidden="true"
+            />
+            <div class="text-zinc-500">
+                Teams support &mdash;
+                <span class="font-medium text-black dark:text-white">10 seats</span>
+                included
+                <span class="text-xs">(extra: $5/seat/mo or $4/seat/yr)</span>
+            </div>
+        </div>
+    @endif
 </div>
 
 {{-- Divider - Decorative --}}
diff --git a/resources/views/customer/dashboard.blade.php b/resources/views/customer/dashboard.blade.php
index 78608b03..3f434af2 100644
--- a/resources/views/customer/dashboard.blade.php
+++ b/resources/views/customer/dashboard.blade.php
@@ -15,6 +15,50 @@
             </div>
         </header>
 
+        {{-- Session Messages --}}
+        <div class="mx-auto max-w-7xl px-4 sm:px-6 lg:px-8">
+            @if (session('success'))
+                <div class="mb-6 rounded-lg border border-emerald-200 bg-emerald-50 p-4 dark:border-emerald-800 dark:bg-emerald-900/20">
+                    <p class="text-sm text-emerald-800 dark:text-emerald-200">{{ session('success') }}</p>
+                </div>
+            @endif
+
+            @if (session('message'))
+                <div class="mb-6 rounded-lg border border-blue-200 bg-blue-50 p-4 dark:border-blue-800 dark:bg-blue-900/20">
+                    <p class="text-sm text-blue-800 dark:text-blue-200">{{ session('message') }}</p>
+                </div>
+            @endif
+
+            @if (session('error'))
+                <div class="mb-6 rounded-lg border border-red-200 bg-red-50 p-4 dark:border-red-800 dark:bg-red-900/20">
+                    <p class="text-sm text-red-800 dark:text-red-200">{{ session('error') }}</p>
+                </div>
+            @endif
+        </div>
+
+        {{-- Ultra Upsell --}}
+        @if($showUltraUpsell)
+            <div class="mx-auto mb-6 max-w-7xl px-4 sm:px-6 lg:px-8">
+                <div class="relative overflow-hidden rounded-lg border border-indigo-200 bg-gradient-to-r from-indigo-50 to-purple-50 p-6 shadow-sm dark:border-indigo-800 dark:from-indigo-950/50 dark:to-purple-950/50">
+                    <div class="absolute -right-6 -top-6 size-32 rounded-full bg-indigo-500/10 dark:bg-indigo-400/10"></div>
+                    <div class="relative flex items-center justify-between gap-4">
+                        <div>
+                            <h3 class="text-lg font-semibold text-indigo-900 dark:text-indigo-100">Upgrade to Ultra</h3>
+                            <p class="mt-1 text-sm text-indigo-700 dark:text-indigo-300">
+                                Get access to all official plugins, team sharing, and more with an Ultra subscription.
+                            </p>
+                        </div>
+                        <a href="{{ route('pricing') }}" class="inline-flex shrink-0 items-center rounded-md bg-indigo-600 px-4 py-2 text-sm font-medium text-white shadow-sm hover:bg-indigo-700 dark:bg-indigo-500 dark:hover:bg-indigo-600">
+                            Learn more
+                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="ml-2 size-4">
+                                <path stroke-linecap="round" stroke-linejoin="round" d="M13.5 4.5 21 12m0 0-7.5 7.5M21 12H3" />
+                            </svg>
+                        </a>
+                    </div>
+                </div>
+            </div>
+        @endif
+
         {{-- Banners --}}
         <div class="mx-auto mb-6 max-w-7xl px-4 sm:px-6 lg:px-8">
             <div class="grid grid-cols-1 gap-6 lg:grid-cols-2">
@@ -117,8 +161,35 @@
                         :href="route('customer.plugins.create')"
                         link-text="Submit a plugin"
                     />
+
                 @endfeature
 
+                {{-- Team Card --}}
+                @if($hasTeam)
+                    <x-dashboard-card
+                        title="Team"
+                        :value="$teamName"
+                        :badge="$teamMemberCount . ' members'"
+                        badge-color="blue"
+                        :second-badge="$teamPendingCount > 0 ? $teamPendingCount . ' pending' : null"
+                        second-badge-color="yellow"
+                        icon="user-group"
+                        color="teal"
+                        :href="route('customer.team.index')"
+                        link-text="Manage team"
+                    />
+                @elseif($hasMaxAccess)
+                    <x-dashboard-card
+                        title="Team"
+                        value="No team yet"
+                        icon="user-group"
+                        color="gray"
+                        :href="route('customer.team.index')"
+                        link-text="Create a team"
+                        description="Share your Ultra benefits with your team"
+                    />
+                @endif
+
                 {{-- Connected Accounts Card --}}
                 <x-dashboard-card
                     title="Connected Accounts"
@@ -142,25 +213,5 @@
             </div>
         </div>
 
-        {{-- Session Messages --}}
-        <div class="mx-auto max-w-7xl px-4 sm:px-6 lg:px-8">
-            @if (session('success'))
-                <div class="mb-6 rounded-lg border border-emerald-200 bg-emerald-50 p-4 dark:border-emerald-800 dark:bg-emerald-900/20">
-                    <p class="text-sm text-emerald-800 dark:text-emerald-200">{{ session('success') }}</p>
-                </div>
-            @endif
-
-            @if (session('message'))
-                <div class="mb-6 rounded-lg border border-blue-200 bg-blue-50 p-4 dark:border-blue-800 dark:bg-blue-900/20">
-                    <p class="text-sm text-blue-800 dark:text-blue-200">{{ session('message') }}</p>
-                </div>
-            @endif
-
-            @if (session('error'))
-                <div class="mb-6 rounded-lg border border-red-200 bg-red-50 p-4 dark:border-red-800 dark:bg-red-900/20">
-                    <p class="text-sm text-red-800 dark:text-red-200">{{ session('error') }}</p>
-                </div>
-            @endif
-        </div>
     </div>
 </x-layout>
diff --git a/resources/views/customer/licenses/index.blade.php b/resources/views/customer/licenses/index.blade.php
index c319521c..6655b490 100644
--- a/resources/views/customer/licenses/index.blade.php
+++ b/resources/views/customer/licenses/index.blade.php
@@ -296,9 +296,16 @@ class="mt-3 inline-flex w-full justify-center rounded-md bg-white px-3 py-2 text
                                                             </span>
                                                         @endif
                                                     </div>
-                                                    <p class="mt-1 text-sm text-gray-500 dark:text-gray-400 font-mono">
-                                                        {{ $license->key }}
-                                                    </p>
+                                                    <div class="mt-1 flex items-center gap-1" x-data="{ show: false }">
+                                                        <p class="font-mono text-sm text-gray-500 dark:text-gray-400">
+                                                            <span x-show="!show">{{ Str::mask($license->key, '*', 8, -4) }}</span>
+                                                            <span x-show="show" x-cloak>{{ $license->key }}</span>
+                                                        </p>
+                                                        <button type="button" @click.prevent="show = !show" class="text-gray-400 hover:text-gray-600 dark:hover:text-gray-300">
+                                                            <svg x-show="!show" class="size-4" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 12a3 3 0 11-6 0 3 3 0 016 0z" /><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M2.458 12C3.732 7.943 7.523 5 12 5c4.478 0 8.268 2.943 9.542 7-1.274 4.057-5.064 7-9.542 7-4.477 0-8.268-2.943-9.542-7z" /></svg>
+                                                            <svg x-show="show" x-cloak class="size-4" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13.875 18.825A10.05 10.05 0 0112 19c-4.478 0-8.268-2.943-9.543-7a9.97 9.97 0 011.563-3.029m5.858.908a3 3 0 114.243 4.243M9.878 9.878l4.242 4.242M9.88 9.88l-3.29-3.29m7.532 7.532l3.29 3.29M3 3l3.59 3.59m0 0A9.953 9.953 0 0112 5c4.478 0 8.268 2.943 9.543 7a10.025 10.025 0 01-4.132 5.411m0 0L21 21" /></svg>
+                                                        </button>
+                                                    </div>
                                                 </div>
                                             </div>
                                             <div class="flex flex-col items-end">
@@ -378,9 +385,16 @@ class="mt-3 inline-flex w-full justify-center rounded-md bg-white px-3 py-2 text
                                                             </span>
                                                         @endif
                                                     </div>
-                                                    <p class="mt-1 text-sm text-gray-500 dark:text-gray-400 font-mono">
-                                                        {{ $subLicense->key }}
-                                                    </p>
+                                                    <div class="mt-1 flex items-center gap-1" x-data="{ show: false }">
+                                                        <p class="font-mono text-sm text-gray-500 dark:text-gray-400">
+                                                            <span x-show="!show">{{ Str::mask($subLicense->key, '*', 8, -4) }}</span>
+                                                            <span x-show="show" x-cloak>{{ $subLicense->key }}</span>
+                                                        </p>
+                                                        <button type="button" @click.prevent="show = !show" class="text-gray-400 hover:text-gray-600 dark:hover:text-gray-300">
+                                                            <svg x-show="!show" class="size-4" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 12a3 3 0 11-6 0 3 3 0 016 0z" /><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M2.458 12C3.732 7.943 7.523 5 12 5c4.478 0 8.268 2.943 9.542 7-1.274 4.057-5.064 7-9.542 7-4.477 0-8.268-2.943-9.542-7z" /></svg>
+                                                            <svg x-show="show" x-cloak class="size-4" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13.875 18.825A10.05 10.05 0 0112 19c-4.478 0-8.268-2.943-9.543-7a9.97 9.97 0 011.563-3.029m5.858.908a3 3 0 114.243 4.243M9.878 9.878l4.242 4.242M9.88 9.88l-3.29-3.29m7.532 7.532l3.29 3.29M3 3l3.59 3.59m0 0A9.953 9.953 0 0112 5c4.478 0 8.268 2.943 9.543 7a10.025 10.025 0 01-4.132 5.411m0 0L21 21" /></svg>
+                                                        </button>
+                                                    </div>
                                                 </div>
                                             </div>
                                             <div class="flex flex-col items-end">
diff --git a/resources/views/customer/licenses/list.blade.php b/resources/views/customer/licenses/list.blade.php
index 70c05a92..ef147e1f 100644
--- a/resources/views/customer/licenses/list.blade.php
+++ b/resources/views/customer/licenses/list.blade.php
@@ -82,9 +82,16 @@
                                                             </span>
                                                         @endif
                                                     </div>
-                                                    <p class="mt-1 font-mono text-sm text-gray-500 dark:text-gray-400">
-                                                        {{ $license->key }}
-                                                    </p>
+                                                    <div class="mt-1 flex items-center gap-1" x-data="{ show: false }">
+                                                        <p class="font-mono text-sm text-gray-500 dark:text-gray-400">
+                                                            <span x-show="!show">{{ Str::mask($license->key, '*', 8, -4) }}</span>
+                                                            <span x-show="show" x-cloak>{{ $license->key }}</span>
+                                                        </p>
+                                                        <button type="button" @click.prevent="show = !show" class="text-gray-400 hover:text-gray-600 dark:hover:text-gray-300">
+                                                            <svg x-show="!show" class="size-4" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 12a3 3 0 11-6 0 3 3 0 016 0z" /><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M2.458 12C3.732 7.943 7.523 5 12 5c4.478 0 8.268 2.943 9.542 7-1.274 4.057-5.064 7-9.542 7-4.477 0-8.268-2.943-9.542-7z" /></svg>
+                                                            <svg x-show="show" x-cloak class="size-4" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13.875 18.825A10.05 10.05 0 0112 19c-4.478 0-8.268-2.943-9.543-7a9.97 9.97 0 011.563-3.029m5.858.908a3 3 0 114.243 4.243M9.878 9.878l4.242 4.242M9.88 9.88l-3.29-3.29m7.532 7.532l3.29 3.29M3 3l3.59 3.59m0 0A9.953 9.953 0 0112 5c4.478 0 8.268 2.943 9.543 7a10.025 10.025 0 01-4.132 5.411m0 0L21 21" /></svg>
+                                                        </button>
+                                                    </div>
                                                 </div>
                                             </div>
                                             <div class="flex flex-col items-end">
@@ -164,9 +171,16 @@
                                                             </span>
                                                         @endif
                                                     </div>
-                                                    <p class="mt-1 font-mono text-sm text-gray-500 dark:text-gray-400">
-                                                        {{ $subLicense->key }}
-                                                    </p>
+                                                    <div class="mt-1 flex items-center gap-1" x-data="{ show: false }">
+                                                        <p class="font-mono text-sm text-gray-500 dark:text-gray-400">
+                                                            <span x-show="!show">{{ Str::mask($subLicense->key, '*', 8, -4) }}</span>
+                                                            <span x-show="show" x-cloak>{{ $subLicense->key }}</span>
+                                                        </p>
+                                                        <button type="button" @click.prevent="show = !show" class="text-gray-400 hover:text-gray-600 dark:hover:text-gray-300">
+                                                            <svg x-show="!show" class="size-4" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 12a3 3 0 11-6 0 3 3 0 016 0z" /><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M2.458 12C3.732 7.943 7.523 5 12 5c4.478 0 8.268 2.943 9.542 7-1.274 4.057-5.064 7-9.542 7-4.477 0-8.268-2.943-9.542-7z" /></svg>
+                                                            <svg x-show="show" x-cloak class="size-4" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13.875 18.825A10.05 10.05 0 0112 19c-4.478 0-8.268-2.943-9.543-7a9.97 9.97 0 011.563-3.029m5.858.908a3 3 0 114.243 4.243M9.878 9.878l4.242 4.242M9.88 9.88l-3.29-3.29m7.532 7.532l3.29 3.29M3 3l3.59 3.59m0 0A9.953 9.953 0 0112 5c4.478 0 8.268 2.943 9.543 7a10.025 10.025 0 01-4.132 5.411m0 0L21 21" /></svg>
+                                                        </button>
+                                                    </div>
                                                 </div>
                                             </div>
                                             <div class="flex flex-col items-end">
diff --git a/resources/views/customer/licenses/show.blade.php b/resources/views/customer/licenses/show.blade.php
index dc88a35a..b813da62 100644
--- a/resources/views/customer/licenses/show.blade.php
+++ b/resources/views/customer/licenses/show.blade.php
@@ -5,11 +5,11 @@
             <div class="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8">
                 <div class="flex justify-between items-center py-6">
                     <div>
-                        <a href="{{ route('dashboard') }}" class="inline-flex items-center space-x-2 text-gray-400 hover:text-gray-500 dark:text-gray-500 dark:hover:text-gray-400">
+                        <a href="{{ route('customer.licenses.list') }}" class="inline-flex items-center space-x-2 text-gray-400 hover:text-gray-500 dark:text-gray-500 dark:hover:text-gray-400">
                             <svg class="size-4" fill="currentColor" viewBox="0 0 20 20">
                                 <path fill-rule="evenodd" d="M9.707 16.707a1 1 0 01-1.414 0l-6-6a1 1 0 010-1.414l6-6a1 1 0 011.414 1.414L5.414 9H17a1 1 0 110 2H5.414l4.293 4.293a1 1 0 010 1.414z" clip-rule="evenodd"></path>
                             </svg>
-                            <span class="text-sm font-medium">Dashboard</span>
+                            <span class="text-sm font-medium">Licenses</span>
                         </a>
                         <h1 class="mt-2 text-2xl font-bold text-gray-900 dark:text-white">
                             {{ $license->name ?: $license->policy_name }}
@@ -68,18 +68,29 @@
                             <dt class="text-sm font-medium text-gray-500 dark:text-gray-400 flex items-center">
                                 License Key
                             </dt>
-                            <dd class="mt-1 text-sm text-gray-900 dark:text-white sm:mt-0 sm:col-span-2 flex items-center">
+                            <dd class="mt-1 text-sm text-gray-900 dark:text-white sm:mt-0 sm:col-span-2 flex items-center" x-data="{ show: false }">
                                 <div class="flex items-center justify-between w-full">
                                     <code class="bg-gray-100 dark:bg-gray-800 px-2 py-1 rounded text-sm font-mono">
-                                        {{ $license->key }}
+                                        <span x-show="!show">{{ Str::mask($license->key, '*', 8, -4) }}</span>
+                                        <span x-show="show" x-cloak>{{ $license->key }}</span>
                                     </code>
-                                    <button
-                                        type="button"
-                                        onclick="copyToClipboard('{{ $license->key }}')"
-                                        class="ml-2 inline-flex items-center px-2.5 py-1.5 border border-gray-300 dark:border-gray-600 shadow-sm text-xs font-medium rounded text-gray-700 dark:text-gray-300 bg-white dark:bg-gray-700 hover:bg-gray-50 dark:hover:bg-gray-600 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500"
-                                    >
-                                        Copy
-                                    </button>
+                                    <div class="ml-2 flex items-center gap-2">
+                                        <button
+                                            type="button"
+                                            @click="show = !show"
+                                            class="inline-flex items-center text-gray-400 hover:text-gray-600 dark:hover:text-gray-300"
+                                        >
+                                            <svg x-show="!show" class="size-5" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 12a3 3 0 11-6 0 3 3 0 016 0z" /><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M2.458 12C3.732 7.943 7.523 5 12 5c4.478 0 8.268 2.943 9.542 7-1.274 4.057-5.064 7-9.542 7-4.477 0-8.268-2.943-9.542-7z" /></svg>
+                                            <svg x-show="show" x-cloak class="size-5" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13.875 18.825A10.05 10.05 0 0112 19c-4.478 0-8.268-2.943-9.543-7a9.97 9.97 0 011.563-3.029m5.858.908a3 3 0 114.243 4.243M9.878 9.878l4.242 4.242M9.88 9.88l-3.29-3.29m7.532 7.532l3.29 3.29M3 3l3.59 3.59m0 0A9.953 9.953 0 0112 5c4.478 0 8.268 2.943 9.543 7a10.025 10.025 0 01-4.132 5.411m0 0L21 21" /></svg>
+                                        </button>
+                                        <button
+                                            type="button"
+                                            onclick="copyToClipboard('{{ $license->key }}')"
+                                            class="inline-flex items-center px-2.5 py-1.5 border border-gray-300 dark:border-gray-600 shadow-sm text-xs font-medium rounded text-gray-700 dark:text-gray-300 bg-white dark:bg-gray-700 hover:bg-gray-50 dark:hover:bg-gray-600 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500"
+                                        >
+                                            Copy
+                                        </button>
+                                    </div>
                                 </div>
                             </dd>
                         </div>
diff --git a/resources/views/customer/plugins/create.blade.php b/resources/views/customer/plugins/create.blade.php
index c0fece78..a6cad783 100644
--- a/resources/views/customer/plugins/create.blade.php
+++ b/resources/views/customer/plugins/create.blade.php
@@ -242,6 +242,100 @@ class="sr-only"
                 <input type="hidden" name="type" value="free" />
                 @endfeature
 
+                {{-- Author Display Name (only show if not set) --}}
+                @unless(auth()->user()->display_name)
+                <div class="rounded-lg border border-gray-200 bg-white p-6 shadow-sm dark:border-gray-700 dark:bg-gray-800">
+                    <h2 class="text-lg font-semibold text-gray-900 dark:text-white">Author Display Name</h2>
+                    <p class="mt-1 text-sm text-gray-600 dark:text-gray-400">
+                        This is how your name will appear on your plugins in the directory. You can change this later.
+                    </p>
+                    <div class="mt-4">
+                        <input
+                            type="text"
+                            name="display_name"
+                            value="{{ old('display_name') }}"
+                            placeholder="{{ auth()->user()->name }}"
+                            class="block w-full rounded-md border border-gray-300 px-3 py-2 text-sm shadow-sm focus:border-indigo-500 focus:outline-none focus:ring-indigo-500 dark:border-gray-600 dark:bg-gray-700 dark:text-white"
+                        />
+                        <p class="mt-2 text-xs text-gray-500 dark:text-gray-500">
+                            Leave blank to use your account name: <span class="font-medium">{{ auth()->user()->name }}</span>
+                        </p>
+                    </div>
+                </div>
+                @endunless
+
+                {{-- Stripe Connect (only show when paid selected and not connected) --}}
+                @feature(App\Features\AllowPaidPlugins::class)
+                <div
+                    x-show="pluginType === 'paid'"
+                    x-transition:enter="transition ease-out duration-200"
+                    x-transition:enter-start="opacity-0 -translate-y-2"
+                    x-transition:enter-end="opacity-100 translate-y-0"
+                >
+                    @if ($developerAccount && $developerAccount->hasCompletedOnboarding())
+                        <div class="rounded-lg border border-green-200 bg-green-50 p-6 dark:border-green-800 dark:bg-green-900/20">
+                            <div class="flex items-start gap-4">
+                                <div class="flex size-10 shrink-0 items-center justify-center rounded-lg bg-green-100 text-green-600 dark:bg-green-900/50 dark:text-green-400">
+                                    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="size-5">
+                                        <path fill-rule="evenodd" d="M16.704 4.153a.75.75 0 0 1 .143 1.052l-8 10.5a.75.75 0 0 1-1.127.075l-4.5-4.5a.75.75 0 0 1 1.06-1.06l3.894 3.893 7.48-9.817a.75.75 0 0 1 1.05-.143Z" clip-rule="evenodd" />
+                                    </svg>
+                                </div>
+                                <div>
+                                    <h3 class="text-sm font-semibold text-green-900 dark:text-green-100">Stripe Connect Active</h3>
+                                    <p class="mt-1 text-sm text-green-700 dark:text-green-300">
+                                        Your account is ready to receive payouts for paid plugin sales.
+                                    </p>
+                                </div>
+                            </div>
+                        </div>
+                    @elseif ($developerAccount)
+                        <div class="rounded-lg border border-yellow-200 bg-yellow-50 p-6 dark:border-yellow-800 dark:bg-yellow-900/20">
+                            <div class="flex items-start gap-4">
+                                <div class="flex size-10 shrink-0 items-center justify-center rounded-lg bg-yellow-100 text-yellow-600 dark:bg-yellow-900/50 dark:text-yellow-400">
+                                    <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-5">
+                                        <path stroke-linecap="round" stroke-linejoin="round" d="M12 6v6h4.5m4.5 0a9 9 0 1 1-18 0 9 9 0 0 1 18 0Z" />
+                                    </svg>
+                                </div>
+                                <div>
+                                    <h3 class="text-sm font-semibold text-yellow-900 dark:text-yellow-100">Stripe Setup Incomplete</h3>
+                                    <p class="mt-1 text-sm text-yellow-700 dark:text-yellow-300">
+                                        You need to complete your Stripe Connect setup before you can submit a paid plugin.
+                                    </p>
+                                    <a href="{{ route('customer.developer.onboarding.refresh') }}" class="mt-3 inline-flex items-center rounded-md bg-yellow-600 px-3 py-1.5 text-sm font-medium text-white shadow-sm hover:bg-yellow-700">
+                                        Continue Setup
+                                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="ml-1.5 size-4">
+                                            <path stroke-linecap="round" stroke-linejoin="round" d="M13.5 4.5 21 12m0 0-7.5 7.5M21 12H3" />
+                                        </svg>
+                                    </a>
+                                </div>
+                            </div>
+                        </div>
+                    @else
+                        <div class="rounded-lg border border-gray-200 bg-white p-6 shadow-sm dark:border-gray-700 dark:bg-gray-800">
+                            <div class="flex items-start gap-4">
+                                <div class="flex size-10 shrink-0 items-center justify-center rounded-lg bg-indigo-100 text-indigo-600 dark:bg-indigo-900/50 dark:text-indigo-400">
+                                    <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-5">
+                                        <path stroke-linecap="round" stroke-linejoin="round" d="M2.25 8.25h19.5M2.25 9h19.5m-16.5 5.25h6m-6 2.25h3m-3.75 3h15a2.25 2.25 0 0 0 2.25-2.25V6.75A2.25 2.25 0 0 0 19.5 4.5h-15a2.25 2.25 0 0 0-2.25 2.25v10.5A2.25 2.25 0 0 0 4.5 19.5Z" />
+                                    </svg>
+                                </div>
+                                <div>
+                                    <h3 class="text-sm font-semibold text-gray-900 dark:text-white">Connect Stripe to Sell Plugins</h3>
+                                    <p class="mt-1 text-sm text-gray-600 dark:text-gray-400">
+                                        To submit a paid plugin, you need to connect your Stripe account. You'll earn 70% of each sale.
+                                    </p>
+                                    <a href="{{ route('customer.developer.onboarding') }}" class="mt-3 inline-flex items-center rounded-md bg-indigo-600 px-3 py-1.5 text-sm font-medium text-white shadow-sm hover:bg-indigo-700 dark:bg-indigo-500 dark:hover:bg-indigo-600">
+                                        Connect Stripe
+                                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="ml-1.5 size-4">
+                                            <path stroke-linecap="round" stroke-linejoin="round" d="M13.5 4.5 21 12m0 0-7.5 7.5M21 12H3" />
+                                        </svg>
+                                    </a>
+                                </div>
+                            </div>
+                        </div>
+                    @endif
+                </div>
+                @endfeature
+
                 {{-- Repository Selection (for all plugins) --}}
                 <div class="rounded-lg border border-gray-200 bg-white p-6 shadow-sm dark:border-gray-700 dark:bg-gray-800">
                     <div class="mb-4 flex items-center justify-between">
diff --git a/resources/views/customer/plugins/index.blade.php b/resources/views/customer/plugins/index.blade.php
index d6dfc827..7211faec 100644
--- a/resources/views/customer/plugins/index.blade.php
+++ b/resources/views/customer/plugins/index.blade.php
@@ -84,151 +84,75 @@
                 </div>
             </div>
 
-            {{-- Author Display Name Section --}}
-            <div class="mt-8">
-                <div class="rounded-lg border border-gray-200 bg-white p-6 shadow-sm dark:border-gray-700 dark:bg-gray-800">
-                    <div class="flex items-start justify-between">
-                        <div class="flex items-start gap-4">
-                            <div class="flex size-12 shrink-0 items-center justify-center rounded-lg bg-gray-100 text-gray-600 dark:bg-gray-700 dark:text-gray-400">
-                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-6">
-                                    <path stroke-linecap="round" stroke-linejoin="round" d="M15.75 6a3.75 3.75 0 1 1-7.5 0 3.75 3.75 0 0 1 7.5 0ZM4.501 20.118a7.5 7.5 0 0 1 14.998 0A17.933 17.933 0 0 1 12 21.75c-2.676 0-5.216-.584-7.499-1.632Z" />
-                                </svg>
-                            </div>
-                            <div class="flex-1">
-                                <h3 class="text-lg font-semibold text-gray-900 dark:text-white">Author Display Name</h3>
-                                <p class="mt-1 text-sm text-gray-600 dark:text-gray-400">
-                                    This is how your name will appear on your plugins in the directory.
-                                </p>
-                                <form
-                                    method="POST"
-                                    action="{{ route('customer.plugins.display-name') }}"
-                                    class="mt-4 flex gap-3"
-                                    x-data="{ displayName: '{{ old('display_name', auth()->user()->display_name) }}' }"
-                                >
-                                    @csrf
-                                    @method('PATCH')
-                                    <div class="flex-1">
-                                        <input
-                                            type="text"
-                                            name="display_name"
-                                            x-model="displayName"
-                                            placeholder="{{ auth()->user()->name }}"
-                                            class="block w-full rounded-md border border-gray-300 px-3 py-2 text-sm shadow-sm focus:border-indigo-500 focus:outline-none focus:ring-indigo-500 dark:border-gray-600 dark:bg-gray-700 dark:text-white @error('display_name') border-red-500 dark:border-red-500 @enderror"
-                                        />
-                                        @error('display_name')
-                                            <p class="mt-1 text-sm text-red-600 dark:text-red-400">{{ $message }}</p>
-                                        @enderror
-                                    </div>
-                                    <button
-                                        type="submit"
-                                        class="inline-flex items-center rounded-md bg-indigo-600 px-4 py-2 text-sm font-medium text-white shadow-sm hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 dark:bg-indigo-500 dark:hover:bg-indigo-600"
-                                    >
-                                        Save
-                                    </button>
-                                </form>
-                                <p class="mt-2 text-xs text-gray-500 dark:text-gray-500">
-                                    Leave blank to use your account name: <span class="font-medium">{{ auth()->user()->name }}</span>
-                                </p>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-            {{-- Stripe Connect Section (only show when paid plugins are enabled) --}}
+            {{-- Stripe Connect Status (only show when connected or in progress) --}}
             @feature(App\Features\AllowPaidPlugins::class)
-            <div class="mt-8">
                 @if ($developerAccount && $developerAccount->hasCompletedOnboarding())
-                    {{-- Connected Account --}}
-                    <div class="rounded-lg border border-green-200 bg-green-50 p-6 dark:border-green-800 dark:bg-green-900/20">
-                        <div class="flex items-start justify-between">
-                            <div class="flex items-start gap-4">
-                                <div class="flex size-12 shrink-0 items-center justify-center rounded-lg bg-green-100 text-green-600 dark:bg-green-900/50 dark:text-green-400">
-                                    <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-6">
-                                        <path stroke-linecap="round" stroke-linejoin="round" d="M9 12.75 11.25 15 15 9.75M21 12a9 9 0 1 1-18 0 9 9 0 0 1 18 0Z" />
-                                    </svg>
-                                </div>
-                                <div>
-                                    <h3 class="text-lg font-semibold text-green-900 dark:text-green-100">Stripe Connect Active</h3>
-                                    <p class="mt-1 text-sm text-green-700 dark:text-green-300">
-                                        Your developer account is set up and ready to receive payouts for paid plugin sales.
-                                    </p>
-                                    <div class="mt-2 flex items-center gap-4 text-sm">
-                                        <span class="inline-flex items-center gap-1 text-green-700 dark:text-green-300">
-                                            <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="size-4">
-                                                <path fill-rule="evenodd" d="M16.704 4.153a.75.75 0 0 1 .143 1.052l-8 10.5a.75.75 0 0 1-1.127.075l-4.5-4.5a.75.75 0 0 1 1.06-1.06l3.894 3.893 7.48-9.817a.75.75 0 0 1 1.05-.143Z" clip-rule="evenodd" />
-                                            </svg>
-                                            Payouts {{ $developerAccount->payouts_enabled ? 'Enabled' : 'Pending' }}
-                                        </span>
-                                        <span class="inline-flex items-center gap-1 text-green-700 dark:text-green-300">
-                                            <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="size-4">
-                                                <path fill-rule="evenodd" d="M16.704 4.153a.75.75 0 0 1 .143 1.052l-8 10.5a.75.75 0 0 1-1.127.075l-4.5-4.5a.75.75 0 0 1 1.06-1.06l3.894 3.893 7.48-9.817a.75.75 0 0 1 1.05-.143Z" clip-rule="evenodd" />
-                                            </svg>
-                                            {{ $developerAccount->stripe_connect_status->label() }}
-                                        </span>
+                    <div class="mt-8">
+                        <div class="rounded-lg border border-green-200 bg-green-50 p-6 dark:border-green-800 dark:bg-green-900/20">
+                            <div class="flex items-start justify-between">
+                                <div class="flex items-start gap-4">
+                                    <div class="flex size-12 shrink-0 items-center justify-center rounded-lg bg-green-100 text-green-600 dark:bg-green-900/50 dark:text-green-400">
+                                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-6">
+                                            <path stroke-linecap="round" stroke-linejoin="round" d="M9 12.75 11.25 15 15 9.75M21 12a9 9 0 1 1-18 0 9 9 0 0 1 18 0Z" />
+                                        </svg>
+                                    </div>
+                                    <div>
+                                        <h3 class="text-lg font-semibold text-green-900 dark:text-green-100">Stripe Connect Active</h3>
+                                        <p class="mt-1 text-sm text-green-700 dark:text-green-300">
+                                            Your developer account is set up and ready to receive payouts for paid plugin sales.
+                                        </p>
+                                        <div class="mt-2 flex items-center gap-4 text-sm">
+                                            <span class="inline-flex items-center gap-1 text-green-700 dark:text-green-300">
+                                                <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="size-4">
+                                                    <path fill-rule="evenodd" d="M16.704 4.153a.75.75 0 0 1 .143 1.052l-8 10.5a.75.75 0 0 1-1.127.075l-4.5-4.5a.75.75 0 0 1 1.06-1.06l3.894 3.893 7.48-9.817a.75.75 0 0 1 1.05-.143Z" clip-rule="evenodd" />
+                                                </svg>
+                                                Payouts {{ $developerAccount->payouts_enabled ? 'Enabled' : 'Pending' }}
+                                            </span>
+                                            <span class="inline-flex items-center gap-1 text-green-700 dark:text-green-300">
+                                                <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="size-4">
+                                                    <path fill-rule="evenodd" d="M16.704 4.153a.75.75 0 0 1 .143 1.052l-8 10.5a.75.75 0 0 1-1.127.075l-4.5-4.5a.75.75 0 0 1 1.06-1.06l3.894 3.893 7.48-9.817a.75.75 0 0 1 1.05-.143Z" clip-rule="evenodd" />
+                                                </svg>
+                                                {{ $developerAccount->stripe_connect_status->label() }}
+                                            </span>
+                                        </div>
                                     </div>
                                 </div>
+                                <a href="{{ route('customer.developer.dashboard') }}" class="inline-flex items-center rounded-md bg-green-600 px-4 py-2 text-sm font-medium text-white shadow-sm hover:bg-green-700 focus:outline-none focus:ring-2 focus:ring-green-500 focus:ring-offset-2 dark:bg-green-700 dark:hover:bg-green-600">
+                                    View Dashboard
+                                    <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="ml-2 size-4">
+                                        <path stroke-linecap="round" stroke-linejoin="round" d="M13.5 4.5 21 12m0 0-7.5 7.5M21 12H3" />
+                                    </svg>
+                                </a>
                             </div>
-                            <a href="{{ route('customer.developer.dashboard') }}" class="inline-flex items-center rounded-md bg-green-600 px-4 py-2 text-sm font-medium text-white shadow-sm hover:bg-green-700 focus:outline-none focus:ring-2 focus:ring-green-500 focus:ring-offset-2 dark:bg-green-700 dark:hover:bg-green-600">
-                                View Dashboard
-                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="ml-2 size-4">
-                                    <path stroke-linecap="round" stroke-linejoin="round" d="M13.5 4.5 21 12m0 0-7.5 7.5M21 12H3" />
-                                </svg>
-                            </a>
                         </div>
                     </div>
                 @elseif ($developerAccount)
-                    {{-- Onboarding In Progress --}}
-                    <div class="rounded-lg border border-yellow-200 bg-yellow-50 p-6 dark:border-yellow-800 dark:bg-yellow-900/20">
-                        <div class="flex items-start justify-between">
-                            <div class="flex items-start gap-4">
-                                <div class="flex size-12 shrink-0 items-center justify-center rounded-lg bg-yellow-100 text-yellow-600 dark:bg-yellow-900/50 dark:text-yellow-400">
-                                    <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-6">
-                                        <path stroke-linecap="round" stroke-linejoin="round" d="M12 6v6h4.5m4.5 0a9 9 0 1 1-18 0 9 9 0 0 1 18 0Z" />
-                                    </svg>
-                                </div>
-                                <div>
-                                    <h3 class="text-lg font-semibold text-yellow-900 dark:text-yellow-100">Complete Your Stripe Setup</h3>
-                                    <p class="mt-1 text-sm text-yellow-700 dark:text-yellow-300">
-                                        You've started the Stripe Connect setup but there are still some steps remaining. Complete the onboarding to start receiving payouts.
-                                    </p>
+                    <div class="mt-8">
+                        <div class="rounded-lg border border-yellow-200 bg-yellow-50 p-6 dark:border-yellow-800 dark:bg-yellow-900/20">
+                            <div class="flex items-start justify-between">
+                                <div class="flex items-start gap-4">
+                                    <div class="flex size-12 shrink-0 items-center justify-center rounded-lg bg-yellow-100 text-yellow-600 dark:bg-yellow-900/50 dark:text-yellow-400">
+                                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-6">
+                                            <path stroke-linecap="round" stroke-linejoin="round" d="M12 6v6h4.5m4.5 0a9 9 0 1 1-18 0 9 9 0 0 1 18 0Z" />
+                                        </svg>
+                                    </div>
+                                    <div>
+                                        <h3 class="text-lg font-semibold text-yellow-900 dark:text-yellow-100">Complete Your Stripe Setup</h3>
+                                        <p class="mt-1 text-sm text-yellow-700 dark:text-yellow-300">
+                                            You've started the Stripe Connect setup but there are still some steps remaining. Complete the onboarding to start receiving payouts.
+                                        </p>
+                                    </div>
                                 </div>
-                            </div>
-                            <a href="{{ route('customer.developer.onboarding.refresh') }}" class="inline-flex items-center rounded-md bg-yellow-600 px-4 py-2 text-sm font-medium text-white shadow-sm hover:bg-yellow-700 focus:outline-none focus:ring-2 focus:ring-yellow-500 focus:ring-offset-2 dark:bg-yellow-700 dark:hover:bg-yellow-600">
-                                Continue Setup
-                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="ml-2 size-4">
-                                    <path stroke-linecap="round" stroke-linejoin="round" d="M13.5 4.5 21 12m0 0-7.5 7.5M21 12H3" />
-                                </svg>
-                            </a>
-                        </div>
-                    </div>
-                @else
-                    {{-- No Developer Account --}}
-                    <div class="rounded-lg border border-gray-200 bg-white p-6 shadow-sm dark:border-gray-700 dark:bg-gray-800">
-                        <div class="flex items-start justify-between">
-                            <div class="flex items-start gap-4">
-                                <div class="flex size-12 shrink-0 items-center justify-center rounded-lg bg-indigo-100 text-indigo-600 dark:bg-indigo-900/50 dark:text-indigo-400">
-                                    <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-6">
-                                        <path stroke-linecap="round" stroke-linejoin="round" d="M2.25 8.25h19.5M2.25 9h19.5m-16.5 5.25h6m-6 2.25h3m-3.75 3h15a2.25 2.25 0 0 0 2.25-2.25V6.75A2.25 2.25 0 0 0 19.5 4.5h-15a2.25 2.25 0 0 0-2.25 2.25v10.5A2.25 2.25 0 0 0 4.5 19.5Z" />
+                                <a href="{{ route('customer.developer.onboarding.refresh') }}" class="inline-flex items-center rounded-md bg-yellow-600 px-4 py-2 text-sm font-medium text-white shadow-sm hover:bg-yellow-700 focus:outline-none focus:ring-2 focus:ring-yellow-500 focus:ring-offset-2 dark:bg-yellow-700 dark:hover:bg-yellow-600">
+                                    Continue Setup
+                                    <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="ml-2 size-4">
+                                        <path stroke-linecap="round" stroke-linejoin="round" d="M13.5 4.5 21 12m0 0-7.5 7.5M21 12H3" />
                                     </svg>
-                                </div>
-                                <div>
-                                    <h3 class="text-lg font-semibold text-gray-900 dark:text-white">Sell Paid Plugins</h3>
-                                    <p class="mt-1 text-sm text-gray-600 dark:text-gray-400">
-                                        Want to sell premium plugins? Connect your Stripe account to receive payouts when customers purchase your paid plugins. You'll earn 70% of each sale.
-                                    </p>
-                                </div>
+                                </a>
                             </div>
-                            <a href="{{ route('customer.developer.onboarding') }}" class="inline-flex items-center rounded-md bg-indigo-600 px-4 py-2 text-sm font-medium text-white shadow-sm hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 dark:bg-indigo-500 dark:hover:bg-indigo-600">
-                                Connect Stripe
-                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="ml-2 size-4">
-                                    <path stroke-linecap="round" stroke-linejoin="round" d="M13.5 4.5 21 12m0 0-7.5 7.5M21 12H3" />
-                                </svg>
-                            </a>
                         </div>
                     </div>
                 @endif
-            </div>
             @endfeature
 
             {{-- Success Message --}}
diff --git a/resources/views/customer/purchased-plugins/index.blade.php b/resources/views/customer/purchased-plugins/index.blade.php
index 53b96f0c..82862b75 100644
--- a/resources/views/customer/purchased-plugins/index.blade.php
+++ b/resources/views/customer/purchased-plugins/index.blade.php
@@ -247,6 +247,53 @@ class="mt-3 inline-flex w-full justify-center rounded-md bg-white px-3 py-2 text
                     </div>
                 </div>
             @endif
+
+            {{-- Team Plugins --}}
+            @if ($teamPlugins->isNotEmpty())
+                <h3 class="text-md mb-3 mt-8 font-medium text-gray-900 dark:text-white">
+                    Team Plugins
+                    <span class="text-sm font-normal text-gray-500 dark:text-gray-400">— shared by {{ $teamOwnerName }}</span>
+                </h3>
+                <div class="overflow-hidden rounded-md bg-white shadow dark:bg-gray-800">
+                    <ul class="divide-y divide-gray-200 dark:divide-gray-700">
+                        @foreach ($teamPlugins as $plugin)
+                            <li>
+                                <a href="{{ route('plugins.show', $plugin->routeParams()) }}" class="block hover:bg-gray-50 dark:hover:bg-gray-700">
+                                    <div class="px-4 py-4 sm:px-6">
+                                        <div class="flex items-center justify-between">
+                                            <div class="flex items-center">
+                                                <div class="shrink-0">
+                                                    @if ($plugin->hasLogo())
+                                                        <img src="{{ $plugin->getLogoUrl() }}" alt="{{ $plugin->name }}" class="size-10 rounded-lg object-cover">
+                                                    @elseif ($plugin->hasGradientIcon())
+                                                        <div class="grid size-10 place-items-center rounded-lg bg-gradient-to-br {{ $plugin->getGradientClasses() }} text-white">
+                                                            <x-dynamic-component :component="'heroicon-o-' . $plugin->icon_name" class="size-5" />
+                                                        </div>
+                                                    @else
+                                                        <div class="grid size-10 place-items-center rounded-lg bg-gradient-to-br from-indigo-500 to-purple-600 text-white">
+                                                            <x-vaadin-plug class="size-5" />
+                                                        </div>
+                                                    @endif
+                                                </div>
+                                                <div class="ml-4">
+                                                    <p class="text-sm font-medium text-blue-600 dark:text-blue-400">
+                                                        {{ $plugin->name }}
+                                                    </p>
+                                                    @if ($plugin->description)
+                                                        <p class="mt-0.5 line-clamp-1 text-xs text-gray-500 dark:text-gray-400">
+                                                            {{ $plugin->description }}
+                                                        </p>
+                                                    @endif
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </a>
+                            </li>
+                        @endforeach
+                    </ul>
+                </div>
+            @endif
         </div>
     </div>
 </x-layout>
diff --git a/resources/views/customer/team/index.blade.php b/resources/views/customer/team/index.blade.php
new file mode 100644
index 00000000..42670687
--- /dev/null
+++ b/resources/views/customer/team/index.blade.php
@@ -0,0 +1,95 @@
+<x-layouts.dashboard title="Team">
+    <div>
+        <div class="mb-6" x-data="{ editingName: {{ $errors->has('name') ? 'true' : 'false' }} }">
+            @if($team)
+                <div class="flex items-center gap-3">
+                    <flux:heading size="xl">{{ $team->name }}</flux:heading>
+                    <flux:button variant="ghost" size="sm" icon="pencil" x-show="!editingName" x-on:click="editingName = true" />
+                </div>
+                <flux:text>Manage your team and share your Ultra benefits</flux:text>
+
+                {{-- Inline Team Name Edit --}}
+                <div x-show="editingName" x-cloak class="mt-4">
+                    <form method="POST" action="{{ route('customer.team.update') }}" class="flex items-start gap-3">
+                        @csrf
+                        @method('PATCH')
+                        <div class="flex-1">
+                            <flux:input name="name" :value="old('name', $team->name)" placeholder="Team name" />
+                            @error('name')
+                                <flux:text class="mt-1 text-red-600 dark:text-red-400">{{ $message }}</flux:text>
+                            @enderror
+                        </div>
+                        <flux:button type="submit" variant="primary">Save</flux:button>
+                        <flux:button type="button" variant="ghost" x-on:click="editingName = false">Cancel</flux:button>
+                    </form>
+                </div>
+            @else
+                <flux:heading size="xl">Team</flux:heading>
+                <flux:text>Manage your team and share your Ultra benefits</flux:text>
+            @endif
+        </div>
+
+        {{-- Flash Messages --}}
+        @if(session('success'))
+            <flux:callout variant="success" icon="check-circle" class="mb-6">
+                <flux:callout.text>{{ session('success') }}</flux:callout.text>
+            </flux:callout>
+        @endif
+
+        @if(session('error'))
+            <flux:callout variant="danger" icon="x-circle" class="mb-6">
+                <flux:callout.text>{{ session('error') }}</flux:callout.text>
+            </flux:callout>
+        @endif
+
+        <div class="max-w-3xl">
+            @if($team)
+                {{-- User owns a team --}}
+                <livewire:team-manager :team="$team" />
+            @elseif($membership)
+                {{-- User is a member of another team --}}
+                <flux:card>
+                    <flux:heading size="lg">Team Membership</flux:heading>
+                    <flux:text class="mt-2">
+                        You are a member of <strong>{{ $membership->team->name }}</strong>.
+                    </flux:text>
+                    <div class="mt-4">
+                        <flux:heading size="sm">Your benefits include:</flux:heading>
+                        <ul class="mt-2 list-inside list-disc space-y-1 text-sm text-zinc-500 dark:text-zinc-400">
+                            <li>Free access to all first-party NativePHP plugins</li>
+                            <li>Subscriber-tier pricing on third-party plugins</li>
+                            <li>Access to the Plugin Dev Kit GitHub repository</li>
+                        </ul>
+                    </div>
+                </flux:card>
+            @elseif(auth()->user()->hasActiveUltraSubscription())
+                {{-- User has Ultra but no team --}}
+                <flux:card>
+                    <flux:heading size="lg">Create a Team</flux:heading>
+                    <flux:text class="mb-4">As an Ultra subscriber, you can create a team and invite up to 10 members who will share your benefits.</flux:text>
+
+                    <form method="POST" action="{{ route('customer.team.store') }}">
+                        @csrf
+                        <div class="flex gap-4">
+                            <div class="flex-1">
+                                <flux:input name="name" placeholder="Team name" required />
+                            </div>
+                            <flux:button type="submit" variant="primary">Create Team</flux:button>
+                        </div>
+                        @error('name')
+                            <flux:text class="mt-2 text-red-600 dark:text-red-400">{{ $message }}</flux:text>
+                        @enderror
+                    </form>
+                </flux:card>
+            @else
+                {{-- User doesn't have Ultra --}}
+                <flux:card>
+                    <flux:heading size="lg">Teams</flux:heading>
+                    <flux:text class="mb-4">Teams are available to Ultra subscribers. Upgrade to Ultra to create a team and share benefits with up to 10 members.</flux:text>
+
+                    <flux:button variant="primary" :href="route('pricing')">View Plans</flux:button>
+                </flux:card>
+            @endif
+        </div>
+    </div>
+</x-layouts.dashboard>
diff --git a/resources/views/license/renewal.blade.php b/resources/views/license/renewal.blade.php
index d6eb2039..338e3f98 100644
--- a/resources/views/license/renewal.blade.php
+++ b/resources/views/license/renewal.blade.php
@@ -1,106 +1,64 @@
-<x-layout title="Renew Your License">
-    <div class="min-h-screen py-12">
-        <div class="max-w-3xl mx-auto px-4 sm:px-6 lg:px-8">
-            <div class="bg-white dark:bg-gray-800 shadow overflow-hidden sm:rounded-lg">
-                {{-- Header --}}
-                <div class="px-4 py-5 sm:px-6">
-                    <h3 class="text-lg leading-6 font-medium text-gray-900 dark:text-white">
-                        Renew Your NativePHP License
-                    </h3>
-                    <p class="mt-1 max-w-2xl text-sm text-gray-500 dark:text-gray-400">
-                        Set up automatic renewal to keep your license active beyond its expiry date.
-                    </p>
-                </div>
-
-                {{-- License Information --}}
-                <div class="border-t border-gray-200 dark:border-gray-700">
-                    <dl>
-                        <div class="bg-gray-50 dark:bg-gray-700 px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-                            <dt class="text-sm font-medium text-gray-500 dark:text-gray-400">License</dt>
-                            <dd class="mt-1 text-sm text-gray-900 dark:text-white sm:mt-0 sm:col-span-2">
-                                {{ $license->name ?: $subscriptionType->name() }}
-                            </dd>
-                        </div>
-                        <div class="bg-white dark:bg-gray-800 px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-                            <dt class="text-sm font-medium text-gray-500 dark:text-gray-400">License Key</dt>
-                            <dd class="mt-1 text-sm text-gray-900 dark:text-white sm:mt-0 sm:col-span-2">
-                                <code class="bg-gray-100 dark:bg-gray-700 px-2 py-1 rounded text-sm font-mono">
-                                    {{ $license->key }}
-                                </code>
-                            </dd>
-                        </div>
-                        <div class="bg-gray-50 dark:bg-gray-700 px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-                            <dt class="text-sm font-medium text-gray-500 dark:text-gray-400">Current Expiry</dt>
-                            <dd class="mt-1 text-sm text-gray-900 dark:text-white sm:mt-0 sm:col-span-2">
-                                {{ $license->expires_at->format('F j, Y \a\t g:i A T') }}
-                                <span class="text-sm text-gray-500 dark:text-gray-400">
-                                    ({{ $license->expires_at->diffForHumans() }})
-                                </span>
-                            </dd>
-                        </div>
-                    </dl>
-                </div>
+<x-layouts.dashboard title="Upgrade to Ultra">
+    <div class="max-w-2xl">
+        <div class="mb-6">
+            <flux:heading size="xl">Upgrade to Ultra</flux:heading>
+            <flux:text>Your Early Access license qualifies you for special upgrade pricing.</flux:text>
+        </div>
 
-                {{-- Renewal Information --}}
-                <div class="px-4 py-5 sm:px-6 border-t border-gray-200 dark:border-gray-700">
-                    <div class="bg-blue-50 dark:bg-blue-900/20 rounded-lg p-6 mb-6">
-                        <h4 class="text-lg font-semibold text-blue-900 dark:text-blue-100 mb-2">
-                            🎉 Early Access Pricing Available!
-                        </h4>
-                        <p class="text-blue-800 dark:text-blue-200">
-                            As an early adopter, you're eligible for our special Early Access Pricing - the same great
-                            rates you enjoyed when you first purchased your license. This pricing is only available
-                            until your license expires. After that you will have to renew at full price.
-                        </p>
-                    </div>
+        <flux:callout variant="info" icon="star" class="mb-6">
+            <flux:callout.heading>Early Access Pricing</flux:callout.heading>
+            <flux:callout.text>
+                As an early adopter, you can upgrade to Ultra at a special discounted rate.
+                This pricing is only available until your license expires. After that you will have to renew at full price.
+            </flux:callout.text>
+        </flux:callout>
 
-                    <div class="space-y-4">
-                        <h4 class="text-lg font-medium text-gray-900 dark:text-white">What happens when you renew:</h4>
-                        <ul class="space-y-2 text-sm text-gray-600 dark:text-gray-400">
-                            <li class="flex items-start">
-                                <svg class="flex-shrink-0 h-5 w-5 text-green-400 mt-0.5 mr-2" fill="currentColor" viewBox="0 0 20 20">
-                                    <path fill-rule="evenodd" d="M16.707 5.293a1 1 0 010 1.414l-8 8a1 1 0 01-1.414 0l-4-4a1 1 0 011.414-1.414L8 12.586l7.293-7.293a1 1 0 011.414 0z" clip-rule="evenodd"></path>
-                                </svg>
-                                Your existing license will continue to work without interruption
-                            </li>
-                            <li class="flex items-start">
-                                <svg class="flex-shrink-0 h-5 w-5 text-green-400 mt-0.5 mr-2" fill="currentColor" viewBox="0 0 20 20">
-                                    <path fill-rule="evenodd" d="M16.707 5.293a1 1 0 010 1.414l-8 8a1 1 0 01-1.414 0l-4-4a1 1 0 011.414-1.414L8 12.586l7.293-7.293a1 1 0 011.414 0z" clip-rule="evenodd"></path>
-                                </svg>
-                                Automatic renewal will be set up to prevent future expiry
-                            </li>
-                            <li class="flex items-start">
-                                <svg class="flex-shrink-0 h-5 w-5 text-green-400 mt-0.5 mr-2" fill="currentColor" viewBox="0 0 20 20">
-                                    <path fill-rule="evenodd" d="M16.707 5.293a1 1 0 010 1.414l-8 8a1 1 0 01-1.414 0l-4-4a1 1 0 011.414-1.414L8 12.586l7.293-7.293a1 1 0 011.414 0z" clip-rule="evenodd"></path>
-                                </svg>
-                                You'll receive Early Access Pricing for your renewal
-                            </li>
-                            <li class="flex items-start">
-                                <svg class="flex-shrink-0 h-5 w-5 text-green-400 mt-0.5 mr-2" fill="currentColor" viewBox="0 0 20 20">
-                                    <path fill-rule="evenodd" d="M16.707 5.293a1 1 0 010 1.414l-8 8a1 1 0 01-1.414 0l-4-4a1 1 0 011.414-1.414L8 12.586l7.293-7.293a1 1 0 011.414 0z" clip-rule="evenodd"></path>
-                                </svg>
-                                No new license key - your existing key continues to work
-                            </li>
-                        </ul>
+        <div class="grid grid-cols-1 gap-4 sm:grid-cols-2">
+            {{-- Yearly Option --}}
+            <flux:card>
+                <div class="flex flex-col items-center text-center">
+                    <flux:badge color="green" class="mb-3">Recommended</flux:badge>
+                    <flux:heading size="lg">Yearly</flux:heading>
+                    <div class="mt-2 mb-1">
+                        <span class="text-3xl font-bold text-zinc-900 dark:text-white">$250</span>
+                        <flux:text class="inline">/year</flux:text>
                     </div>
+                    <flux:text class="mb-4 text-xs">Early Access Price</flux:text>
 
-                    <div class="mt-8">
-                        <form method="POST" action="{{ route('license.renewal.checkout', $license->key) }}">
-                            @csrf
-                            <button type="submit" class="w-full flex justify-center items-center px-6 py-3 border border-transparent text-base font-medium rounded-md text-white bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500">
-                                Set Up Automatic Renewal
-                                <svg class="ml-2 -mr-1 w-5 h-5" fill="currentColor" viewBox="0 0 20 20">
-                                    <path fill-rule="evenodd" d="M10.293 3.293a1 1 0 011.414 0l6 6a1 1 0 010 1.414l-6 6a1 1 0 01-1.414-1.414L14.586 11H3a1 1 0 110-2h11.586l-4.293-4.293a1 1 0 010-1.414z" clip-rule="evenodd"></path>
-                                </svg>
-                            </button>
-                        </form>
+                    <form method="POST" action="{{ route('license.renewal.checkout', $license->key) }}" class="w-full">
+                        @csrf
+                        <input type="hidden" name="billing_period" value="yearly">
+                        <flux:button type="submit" variant="primary" class="w-full">
+                            Upgrade Yearly
+                        </flux:button>
+                    </form>
+                </div>
+            </flux:card>
 
-                        <p class="mt-3 text-xs text-gray-500 dark:text-gray-400 text-center">
-                            You'll be redirected to Stripe to complete your subscription setup.
-                        </p>
+            {{-- Monthly Option --}}
+            <flux:card>
+                <div class="flex flex-col items-center text-center">
+                    <div class="mb-3 h-5"></div>
+                    <flux:heading size="lg">Monthly</flux:heading>
+                    <div class="mt-2 mb-1">
+                        <span class="text-3xl font-bold text-zinc-900 dark:text-white">$35</span>
+                        <flux:text class="inline">/month</flux:text>
                     </div>
+                    <flux:text class="mb-4 text-xs">Billed monthly</flux:text>
+
+                    <form method="POST" action="{{ route('license.renewal.checkout', $license->key) }}" class="w-full">
+                        @csrf
+                        <input type="hidden" name="billing_period" value="monthly">
+                        <flux:button type="submit" variant="ghost" class="w-full">
+                            Upgrade Monthly
+                        </flux:button>
+                    </form>
                 </div>
-            </div>
+            </flux:card>
         </div>
+
+        <flux:text class="mt-4 text-center text-xs">
+            You'll be redirected to Stripe to complete your subscription setup.
+        </flux:text>
     </div>
-</x-layout>
+</x-layouts.dashboard>
diff --git a/resources/views/livewire/customer/dashboard.blade.php b/resources/views/livewire/customer/dashboard.blade.php
index 9272a682..a2aa7343 100644
--- a/resources/views/livewire/customer/dashboard.blade.php
+++ b/resources/views/livewire/customer/dashboard.blade.php
@@ -81,6 +81,31 @@
             />
         @endif
 
+        {{-- Team Card --}}
+        @if($this->hasUltraSubscription)
+            @if($this->ownedTeam)
+                <x-dashboard-card
+                    title="Team"
+                    :value="$this->ownedTeam->name"
+                    icon="user-group"
+                    color="purple"
+                    :href="route('customer.team.index')"
+                    link-text="Manage members"
+                    :description="$this->teamMemberCount === 1 ? '1 active member' : $this->teamMemberCount . ' active members'"
+                />
+            @else
+                <x-dashboard-card
+                    title="Team"
+                    value="No team yet"
+                    icon="user-group"
+                    color="gray"
+                    :href="route('customer.team.index')"
+                    link-text="Create a team"
+                    description="Invite up to 10 members to share Ultra benefits"
+                />
+            @endif
+        @endif
+
         {{-- Premium Plugins Card --}}
         @feature(App\Features\ShowPlugins::class)
             <x-dashboard-card
diff --git a/resources/views/livewire/customer/licenses.blade.php b/resources/views/livewire/customer/licenses.blade.php
index 5b4bd4fb..bacf71a7 100644
--- a/resources/views/livewire/customer/licenses.blade.php
+++ b/resources/views/livewire/customer/licenses.blade.php
@@ -17,7 +17,7 @@
                 @foreach($this->licenses as $license)
                     @php
                         $isLegacyLicense = $license->isLegacy();
-                        $daysUntilExpiry = $license->expires_at ? $license->expires_at->diffInDays(now()) : null;
+                        $daysUntilExpiry = $license->expires_at ? (int) round(abs(now()->diffInDays($license->expires_at))) : null;
                         $needsRenewal = $isLegacyLicense && $daysUntilExpiry !== null && !$license->expires_at->isPast();
 
                         $status = match(true) {
@@ -40,7 +40,7 @@
                         </flux:table.cell>
 
                         <flux:table.cell>
-                            <code class="font-mono text-sm text-zinc-500 dark:text-zinc-400">{{ $license->key }}</code>
+                            <x-customer.masked-key :key-value="$license->key" />
                         </flux:table.cell>
 
                         <flux:table.cell>
@@ -58,7 +58,12 @@
                                     @endif
                                 </div>
                             @elseif($license->expires_at)
-                                {{ $license->expires_at->format('M j, Y') }}
+                                <div>
+                                    {{ $license->expires_at->format('M j, Y') }}
+                                    @if($license->expires_at->isPast())
+                                        <flux:text class="text-xs">Expired {{ $license->expires_at->diffForHumans() }}</flux:text>
+                                    @endif
+                                </div>
                             @else
                                 No expiration
                             @endif
@@ -99,7 +104,7 @@
                             </flux:table.cell>
 
                             <flux:table.cell>
-                                <code class="font-mono text-sm text-zinc-500 dark:text-zinc-400">{{ $subLicense->key }}</code>
+                                <x-customer.masked-key :key-value="$subLicense->key" />
                             </flux:table.cell>
 
                             <flux:table.cell>
@@ -108,7 +113,12 @@
 
                             <flux:table.cell>
                                 @if($subLicense->expires_at)
-                                    {{ $subLicense->expires_at->format('M j, Y') }}
+                                    <div>
+                                        {{ $subLicense->expires_at->format('M j, Y') }}
+                                        @if($subLicense->expires_at->isPast())
+                                            <flux:text class="text-xs">Expired {{ $subLicense->expires_at->diffForHumans() }}</flux:text>
+                                        @endif
+                                    </div>
                                 @else
                                     No expiration
                                 @endif
diff --git a/resources/views/livewire/customer/licenses/show.blade.php b/resources/views/livewire/customer/licenses/show.blade.php
index 6a0ba815..98fbb9a1 100644
--- a/resources/views/livewire/customer/licenses/show.blade.php
+++ b/resources/views/livewire/customer/licenses/show.blade.php
@@ -24,71 +24,64 @@
 
         <flux:separator />
 
-        <dl class="divide-y divide-gray-200 dark:divide-gray-700">
-            {{-- License Key --}}
-            <div class="py-4 sm:grid sm:grid-cols-3 sm:gap-4">
-                <dt class="text-sm font-medium text-gray-500 dark:text-gray-400">License Key</dt>
-                <dd class="mt-1 text-sm sm:col-span-2 sm:mt-0">
-                    <div class="flex items-center justify-between">
-                        <code class="rounded bg-gray-100 px-2 py-1 font-mono text-sm dark:bg-gray-700">{{ $license->key }}</code>
-                        <flux:button size="xs" variant="ghost" x-on:click="navigator.clipboard.writeText('{{ $license->key }}')">
-                            Copy
-                        </flux:button>
-                    </div>
-                </dd>
-            </div>
+        <flux:table>
+            <flux:table.rows>
+                {{-- License Key --}}
+                <flux:table.row>
+                    <flux:table.cell class="font-medium text-zinc-500 dark:text-zinc-400">License Key</flux:table.cell>
+                    <flux:table.cell>
+                        <x-customer.masked-key :key-value="$license->key" />
+                    </flux:table.cell>
+                </flux:table.row>
 
-            {{-- License Name --}}
-            <div class="py-4 sm:grid sm:grid-cols-3 sm:gap-4">
-                <dt class="text-sm font-medium text-gray-500 dark:text-gray-400">License Name</dt>
-                <dd class="mt-1 text-sm sm:col-span-2 sm:mt-0">
-                    <div class="flex items-center justify-between">
-                        <span class="{{ $license->name ? '' : 'italic text-gray-500 dark:text-gray-400' }}">
-                            {{ $license->name ?: 'No name set' }}
-                        </span>
-                        <flux:button size="xs" variant="ghost" wire:click="$set('showEditNameModal', true)">
-                            Edit
-                        </flux:button>
-                    </div>
-                </dd>
-            </div>
+                {{-- License Name --}}
+                <flux:table.row>
+                    <flux:table.cell class="font-medium text-zinc-500 dark:text-zinc-400">License Name</flux:table.cell>
+                    <flux:table.cell>
+                        <div class="flex items-center justify-between">
+                            <span class="{{ $license->name ? '' : 'italic text-zinc-500 dark:text-zinc-400' }}">
+                                {{ $license->name ?: 'No name set' }}
+                            </span>
+                            <flux:button size="xs" variant="ghost" wire:click="$set('showEditNameModal', true)">
+                                Edit
+                            </flux:button>
+                        </div>
+                    </flux:table.cell>
+                </flux:table.row>
 
-            {{-- License Type --}}
-            <div class="py-4 sm:grid sm:grid-cols-3 sm:gap-4">
-                <dt class="text-sm font-medium text-gray-500 dark:text-gray-400">License Type</dt>
-                <dd class="mt-1 text-sm sm:col-span-2 sm:mt-0">{{ $license->policy_name }}</dd>
-            </div>
+                {{-- License Type --}}
+                <flux:table.row>
+                    <flux:table.cell class="font-medium text-zinc-500 dark:text-zinc-400">License Type</flux:table.cell>
+                    <flux:table.cell>{{ $license->policy_name }}</flux:table.cell>
+                </flux:table.row>
 
-            {{-- Created --}}
-            <div class="py-4 sm:grid sm:grid-cols-3 sm:gap-4">
-                <dt class="text-sm font-medium text-gray-500 dark:text-gray-400">Created</dt>
-                <dd class="mt-1 text-sm sm:col-span-2 sm:mt-0">
-                    {{ $license->created_at->format('F j, Y \a\t g:i A') }}
-                    <span class="ml-1 text-gray-500 dark:text-gray-400">
-                        ({{ $license->created_at->diffForHumans() }})
-                    </span>
-                </dd>
-            </div>
+                {{-- Created --}}
+                <flux:table.row>
+                    <flux:table.cell class="font-medium text-zinc-500 dark:text-zinc-400">Created</flux:table.cell>
+                    <flux:table.cell>
+                        {{ $license->created_at->format('F j, Y \a\t g:i A') }}
+                        <flux:text class="inline text-xs">({{ $license->created_at->diffForHumans() }})</flux:text>
+                    </flux:table.cell>
+                </flux:table.row>
 
-            {{-- Expires --}}
-            <div class="py-4 sm:grid sm:grid-cols-3 sm:gap-4">
-                <dt class="text-sm font-medium text-gray-500 dark:text-gray-400">Expires</dt>
-                <dd class="mt-1 text-sm sm:col-span-2 sm:mt-0">
-                    @if($license->expires_at)
-                        {{ $license->expires_at->format('F j, Y \a\t g:i A') }}
-                        <span class="ml-1 text-gray-500 dark:text-gray-400">
+                {{-- Expires --}}
+                <flux:table.row>
+                    <flux:table.cell class="font-medium text-zinc-500 dark:text-zinc-400">Expires</flux:table.cell>
+                    <flux:table.cell>
+                        @if($license->expires_at)
+                            {{ $license->expires_at->format('F j, Y \a\t g:i A') }}
                             @if($license->expires_at->isPast())
-                                (Expired {{ $license->expires_at->diffForHumans() }})
+                                <flux:text class="inline text-xs">(Expired {{ $license->expires_at->diffForHumans() }})</flux:text>
                             @else
-                                ({{ $license->expires_at->diffForHumans() }})
+                                <flux:text class="inline text-xs">({{ $license->expires_at->diffForHumans() }})</flux:text>
                             @endif
-                        </span>
-                    @else
-                        Never
-                    @endif
-                </dd>
-            </div>
-        </dl>
+                        @else
+                            Never
+                        @endif
+                    </flux:table.cell>
+                </flux:table.row>
+            </flux:table.rows>
+        </flux:table>
     </flux:card>
 
     {{-- Sub-license Manager --}}
@@ -99,7 +92,7 @@
     {{-- Renewal CTA --}}
     @php
         $isLegacyLicense = $license->isLegacy();
-        $daysUntilExpiry = $license->expires_at ? $license->expires_at->diffInDays(now()) : null;
+        $daysUntilExpiry = $license->expires_at ? (int) round(abs(now()->diffInDays($license->expires_at))) : null;
         $needsRenewal = $isLegacyLicense && $daysUntilExpiry !== null;
     @endphp
 
@@ -108,7 +101,7 @@
             <flux:callout.heading>Renewal Available with Early Access Pricing</flux:callout.heading>
             <flux:callout.text>
                 Your license expires in {{ $daysUntilExpiry }} day{{ $daysUntilExpiry === 1 ? '' : 's' }}.
-                Set up automatic renewal now to avoid interruption and lock in your Early Access Pricing!
+                Set up automatic renewal now to upgrade to Ultra with your Early Access Pricing!
             </flux:callout.text>
             <x-slot name="actions">
                 <flux:button variant="primary" href="{{ route('license.renewal', $license->key) }}">Set Up Renewal</flux:button>
@@ -148,8 +141,7 @@
                 <flux:text class="mt-1 text-xs">Give your license a descriptive name to help organize your licenses.</flux:text>
             </div>
 
-            <div class="mt-6 flex justify-end gap-3">
-                <flux:button variant="ghost" x-on:click="$flux.close()">Cancel</flux:button>
+            <div class="mt-6 flex justify-end">
                 <flux:button type="submit" variant="primary">Update Name</flux:button>
             </div>
         </form>
diff --git a/resources/views/livewire/customer/plugins/create.blade.php b/resources/views/livewire/customer/plugins/create.blade.php
index cd93a94b..36cd6efc 100644
--- a/resources/views/livewire/customer/plugins/create.blade.php
+++ b/resources/views/livewire/customer/plugins/create.blade.php
@@ -1,4 +1,4 @@
-<div>
+<div wire:init="loadRepositories">
     <div class="mb-6">
         <nav class="flex" aria-label="Breadcrumb">
             <ol class="flex items-center gap-2">
@@ -56,7 +56,7 @@
                 </x-slot>
             </flux:callout>
         @else
-            <form wire:submit="submitPlugin">
+            <form wire:submit="submitPlugin" class="space-y-8">
                 {{-- Plugin Type --}}
                 @feature(App\Features\AllowPaidPlugins::class)
                 <flux:card>
@@ -105,20 +105,26 @@
                         Choose the repository containing your plugin. We'll automatically set up a webhook to keep your plugin in sync.
                     </flux:text>
 
-                    <div class="mt-6">
+                    <div class="mt-6 space-y-4">
                         @if($loadingRepos)
                             <div class="flex items-center gap-2 text-sm text-gray-500 dark:text-gray-400">
                                 <flux:icon.loading class="size-5" />
                                 <span>Loading repositories...</span>
                             </div>
                         @elseif($reposLoaded)
-                            <flux:select wire:model="repository" label="Repository" placeholder="Select a repository...">
-                                @foreach($repositories as $repo)
-                                    <flux:select.option value="{{ $repo['full_name'] }}">
-                                        {{ $repo['full_name'] }}{{ $repo['private'] ? ' (private)' : '' }}
-                                    </flux:select.option>
+                            <flux:select variant="listbox" searchable wire:model.live="selectedOwner" label="Account" placeholder="Select an account...">
+                                @foreach($this->owners as $owner)
+                                    <flux:select.option value="{{ $owner }}">{{ $owner }}</flux:select.option>
                                 @endforeach
                             </flux:select>
+
+                            @if($selectedOwner)
+                                <flux:select wire:key="repo-search-{{ $selectedOwner }}" variant="combobox" wire:model.live="repository" label="Repository" placeholder="Search repositories...">
+                                    @foreach($this->ownerRepositories as $repo)
+                                        <flux:select.option value="{{ $repo['full_name'] }}">{{ $repo['name'] }}@if($repo['private']) (private)@endif</flux:select.option>
+                                    @endforeach
+                                </flux:select>
+                            @endif
                         @endif
                         @error('repository')
                             <flux:text class="mt-2 text-sm text-red-600 dark:text-red-400">{{ $message }}</flux:text>
diff --git a/resources/views/livewire/customer/plugins/index.blade.php b/resources/views/livewire/customer/plugins/index.blade.php
index 561ac73f..4f5afe2e 100644
--- a/resources/views/livewire/customer/plugins/index.blade.php
+++ b/resources/views/livewire/customer/plugins/index.blade.php
@@ -48,48 +48,6 @@
         </flux:card>
     </div>
 
-    {{-- Stripe Connect Section --}}
-    @feature(App\Features\AllowPaidPlugins::class)
-    <div class="mt-8">
-        @if ($this->developerAccount && $this->developerAccount->hasCompletedOnboarding())
-            <flux:callout variant="success" icon="check-circle">
-                <flux:callout.heading>Stripe Connect Active</flux:callout.heading>
-                <flux:callout.text>
-                    Your developer account is set up and ready to receive payouts for paid plugin sales.
-                </flux:callout.text>
-                <x-slot name="actions">
-                    <flux:button variant="primary" href="{{ route('customer.developer.dashboard') }}">View Dashboard</flux:button>
-                </x-slot>
-            </flux:callout>
-        @elseif ($this->developerAccount)
-            <flux:callout variant="warning" icon="clock">
-                <flux:callout.heading>Complete Your Stripe Setup</flux:callout.heading>
-                <flux:callout.text>
-                    You've started the Stripe Connect setup but there are still some steps remaining. Complete the onboarding to start receiving payouts.
-                </flux:callout.text>
-                <x-slot name="actions">
-                    <flux:button variant="primary" href="{{ route('customer.developer.onboarding.refresh') }}">Continue Setup</flux:button>
-                </x-slot>
-            </flux:callout>
-        @else
-            <flux:card>
-                <div class="flex items-start gap-4">
-                    <div class="flex size-12 shrink-0 items-center justify-center rounded-lg bg-indigo-100 text-indigo-600 dark:bg-indigo-900/50 dark:text-indigo-400">
-                        <x-heroicon-o-credit-card class="size-6" />
-                    </div>
-                    <div class="flex-1">
-                        <flux:heading size="lg">Sell Paid Plugins</flux:heading>
-                        <flux:text class="mt-1">
-                            Want to sell premium plugins? Connect your Stripe account to receive payouts when customers purchase your paid plugins. You'll earn 70% of each sale.
-                        </flux:text>
-                    </div>
-                    <flux:button variant="primary" href="{{ route('customer.developer.onboarding') }}">Connect Stripe</flux:button>
-                </div>
-            </flux:card>
-        @endif
-    </div>
-    @endfeature
-
     {{-- Success/Error Messages --}}
     @if (session('success'))
         <flux:callout variant="success" icon="check-circle" class="mt-6">
diff --git a/resources/views/livewire/customer/purchase-history.blade.php b/resources/views/livewire/customer/purchase-history.blade.php
index abf835fd..0e14aa0e 100644
--- a/resources/views/livewire/customer/purchase-history.blade.php
+++ b/resources/views/livewire/customer/purchase-history.blade.php
@@ -1,16 +1,14 @@
 <div>
     <div class="mb-6">
         <flux:heading size="xl">Purchase History</flux:heading>
-        <flux:text>All your NativePHP purchases in one place</flux:text>
+        <flux:text>All your NativePHP purchases in one place. Bifrost subscriptions are managed separately and won't appear here.</flux:text>
     </div>
 
     @if($this->purchases->count() > 0)
         <flux:table>
             <flux:table.columns>
                 <flux:table.column>Purchase</flux:table.column>
-                <flux:table.column>Type</flux:table.column>
                 <flux:table.column>Price</flux:table.column>
-                <flux:table.column>Status</flux:table.column>
                 <flux:table.column>Date</flux:table.column>
             </flux:table.columns>
 
@@ -18,7 +16,7 @@
                 @foreach($this->purchases as $purchase)
                     <flux:table.row :key="$loop->index">
                         <flux:table.cell>
-                            <div>
+                            <div class="max-w-xs">
                                 @if($purchase['href'])
                                     <a href="{{ $purchase['href'] }}" class="font-medium text-blue-600 hover:text-blue-800 dark:text-blue-400 dark:hover:text-blue-300">
                                         {{ $purchase['name'] }}
@@ -27,27 +25,11 @@
                                     <span class="font-medium">{{ $purchase['name'] }}</span>
                                 @endif
                                 @if($purchase['description'])
-                                    <flux:text class="text-xs">{{ $purchase['description'] }}</flux:text>
+                                    <flux:text class="truncate text-xs">{{ $purchase['description'] }}</flux:text>
                                 @endif
                             </div>
                         </flux:table.cell>
 
-                        <flux:table.cell>
-                            @php
-                                $typeColor = match($purchase['type']) {
-                                    'subscription' => 'blue',
-                                    'product' => 'amber',
-                                    'plugin' => 'purple',
-                                    default => 'zinc',
-                                };
-                                $typeLabel = ucfirst($purchase['type'] === 'subscription' ? 'license' : $purchase['type']);
-                            @endphp
-                            <flux:badge color="{{ $typeColor }}">{{ $typeLabel }}</flux:badge>
-                            @if(isset($purchase['is_grandfathered']) && $purchase['is_grandfathered'])
-                                <flux:badge color="yellow" class="ml-1">Free</flux:badge>
-                            @endif
-                        </flux:table.cell>
-
                         <flux:table.cell>
                             @if($purchase['price'] !== null && $purchase['price'] > 0)
                                 ${{ number_format($purchase['price'] / 100, 2) }}
@@ -58,10 +40,6 @@
                             @endif
                         </flux:table.cell>
 
-                        <flux:table.cell>
-                            <x-customer.status-badge :status="$purchase['is_active'] ? 'Active' : 'Expired'" />
-                        </flux:table.cell>
-
                         <flux:table.cell>
                             <div>
                                 {{ $purchase['purchased_at']->format('M j, Y') }}
diff --git a/resources/views/livewire/customer/purchased-plugins.blade.php b/resources/views/livewire/customer/purchased-plugins.blade.php
index 0eb8ec75..e8ed8c8a 100644
--- a/resources/views/livewire/customer/purchased-plugins.blade.php
+++ b/resources/views/livewire/customer/purchased-plugins.blade.php
@@ -78,4 +78,54 @@
             <flux:button variant="primary" href="{{ route('plugins.marketplace') }}">Browse Plugins</flux:button>
         </x-customer.empty-state>
     @endif
+
+    {{-- Team Plugins --}}
+    @if($this->teamPlugins->isNotEmpty())
+        <flux:heading class="mb-3 mt-8">
+            Team Plugins
+            <span class="text-sm font-normal text-zinc-500 dark:text-white/70">— shared by {{ $this->teamOwnerName }}</span>
+        </flux:heading>
+        <flux:table>
+            <flux:table.columns>
+                <flux:table.column>Plugin</flux:table.column>
+                <flux:table.column>Access</flux:table.column>
+            </flux:table.columns>
+
+            <flux:table.rows>
+                @foreach($this->teamPlugins as $plugin)
+                    <flux:table.row :key="'team-' . $plugin->id">
+                        <flux:table.cell>
+                            <div class="flex items-center gap-3">
+                                <div class="shrink-0">
+                                    @if($plugin->hasLogo())
+                                        <img src="{{ $plugin->getLogoUrl() }}" alt="{{ $plugin->name }}" class="size-10 rounded-lg object-cover">
+                                    @elseif($plugin->hasGradientIcon())
+                                        <div class="grid size-10 place-items-center rounded-lg bg-gradient-to-br {{ $plugin->getGradientClasses() }} text-white">
+                                            <x-dynamic-component :component="'heroicon-o-' . $plugin->icon_name" class="size-5" />
+                                        </div>
+                                    @else
+                                        <div class="grid size-10 place-items-center rounded-lg bg-gradient-to-br from-indigo-500 to-purple-600 text-white">
+                                            <x-vaadin-plug class="size-5" />
+                                        </div>
+                                    @endif
+                                </div>
+                                <div>
+                                    <a href="{{ route('plugins.show', $plugin->routeParams()) }}" class="font-medium text-blue-600 hover:text-blue-800 dark:text-blue-400 dark:hover:text-blue-300">
+                                        {{ $plugin->name }}
+                                    </a>
+                                    @if($plugin->description)
+                                        <flux:text class="text-xs line-clamp-1">{{ $plugin->description }}</flux:text>
+                                    @endif
+                                </div>
+                            </div>
+                        </flux:table.cell>
+
+                        <flux:table.cell>
+                            <x-customer.status-badge status="Team" />
+                        </flux:table.cell>
+                    </flux:table.row>
+                @endforeach
+            </flux:table.rows>
+        </flux:table>
+    @endif
 </div>
diff --git a/resources/views/livewire/customer/settings.blade.php b/resources/views/livewire/customer/settings.blade.php
index e0f9eeeb..46dcb680 100644
--- a/resources/views/livewire/customer/settings.blade.php
+++ b/resources/views/livewire/customer/settings.blade.php
@@ -24,6 +24,14 @@
         </form>
     </flux:card>
 
+    {{-- Email Address --}}
+    <flux:card class="mb-6">
+        <flux:heading size="lg">Email Address</flux:heading>
+        <flux:text class="mb-4">The email address associated with your account.</flux:text>
+
+        <flux:input label="Email" :value="auth()->user()->email" readonly />
+    </flux:card>
+
     {{-- Change Password --}}
     <flux:card class="mb-6">
         <flux:heading size="lg">Password</flux:heading>
diff --git a/resources/views/livewire/mobile-pricing.blade.php b/resources/views/livewire/mobile-pricing.blade.php
index 71bc19df..29fdf420 100644
--- a/resources/views/livewire/mobile-pricing.blade.php
+++ b/resources/views/livewire/mobile-pricing.blade.php
@@ -1,192 +1,344 @@
 <section
     id="pricing"
-    class="mx-auto mt-24 max-w-6xl"
+    class="mx-auto mt-24 max-w-2xl"
     aria-labelledby="pricing-heading"
 >
-    @if (! $discounted)
-        <header class="relative z-10 grid place-items-center text-center">
-            {{-- Section Heading --}}
-            <h2
-                id="pricing-heading"
-                x-init="
-                    () => {
-                        motion.inView($el, (element) => {
-                            motion.animate(
-                                $el,
-                                {
-                                    opacity: [0, 1],
-                                    x: [-10, 0],
-                                },
-                                {
-                                    duration: 0.7,
-                                    ease: motion.easeOut,
-                                },
-                            )
-                        })
-                    }
-                "
-                class="text-3xl font-semibold opacity-0"
-            >
-                Purchase a license
-            </h2>
+    <header class="relative z-10 grid place-items-center text-center">
+        <h2
+            id="pricing-heading"
+            x-init="
+                () => {
+                    motion.inView($el, (element) => {
+                        motion.animate(
+                            $el,
+                            {
+                                opacity: [0, 1],
+                                x: [-10, 0],
+                            },
+                            {
+                                duration: 0.7,
+                                ease: motion.easeOut,
+                            },
+                        )
+                    })
+                }
+            "
+            class="text-3xl font-semibold opacity-0"
+        >
+            Choose your plan
+        </h2>
 
-            {{-- Section Description --}}
-            <p
-                x-init="
-                    () => {
-                        motion.inView($el, (element) => {
-                            motion.animate(
-                                $el,
-                                {
-                                    opacity: [0, 1],
-                                    x: [10, 0],
-                                },
-                                {
-                                    duration: 0.7,
-                                    ease: motion.easeOut,
-                                },
-                            )
-                        })
-                    }
-                "
-                class="mx-auto max-w-xl pt-2 text-base/relaxed text-gray-600 opacity-0"
-            >
-                Start your journey to become a mobile developer
-            </p>
-        </header>
-    @endif
+        <p
+            x-init="
+                () => {
+                    motion.inView($el, (element) => {
+                        motion.animate(
+                            $el,
+                            {
+                                opacity: [0, 1],
+                                x: [10, 0],
+                            },
+                            {
+                                duration: 0.7,
+                                ease: motion.easeOut,
+                            },
+                        )
+                    })
+                }
+            "
+            class="mx-auto max-w-xl pt-2 text-base/relaxed text-gray-600 opacity-0 dark:text-gray-400"
+        >
+            Get the most out of NativePHP
+        </p>
+    </header>
 
-    {{-- Pricing Plans --}}
+    {{-- Interval Toggle --}}
     <div
-        x-init="
-            () => {
-                motion.inView($el, (element) => {
-                    motion.animate(
-                        Array.from($el.children),
-                        {
-                            y: [10, 0],
-                            opacity: [0, 1],
-                        },
-                        {
-                            duration: 0.7,
-                            ease: motion.circOut,
-                            delay: motion.stagger(0.1),
-                        },
-                    )
-                })
-            }
-        "
-        class="{{ $discounted ? 'grid-cols-1 md:grid-cols-2' : 'grid-cols-[repeat(auto-fill,minmax(19rem,1fr))]' }} mt-10 grid items-start gap-x-6 gap-y-8"
-        aria-label="Pricing plans"
+        x-data="{ interval: @entangle('interval'), showUpgradeModal: false }"
+        class="mt-8 flex flex-col items-center gap-6"
     >
-        @if (! $discounted)
-            {{-- Mini Plan --}}
-            <div
-                class="h-full rounded-2xl bg-gray-100 p-7 opacity-0 dark:bg-mirage"
-                aria-labelledby="pro-plan-heading"
+        <div
+            class="inline-flex items-center gap-1 rounded-full bg-gray-100 p-1 dark:bg-mirage"
+            role="radiogroup"
+            aria-label="Billing interval"
+        >
+            <button
+                type="button"
+                @click="interval = 'month'"
+                :class="interval === 'month'
+                    ? 'bg-white text-black shadow-sm dark:bg-zinc-700 dark:text-white'
+                    : 'text-zinc-500 hover:text-zinc-700 dark:hover:text-zinc-300'"
+                class="rounded-full px-5 py-2 text-sm font-medium transition"
+                role="radio"
+                :aria-checked="interval === 'month'"
             >
-                {{-- Plan Name --}}
-                <h3
-                    id="pro-plan-heading"
-                    class="text-3xl font-semibold"
-                >
-                    <span
-                        class="rounded-full bg-zinc-300 px-4 dark:bg-zinc-600"
-                    >
-                        Mini
-                    </span>
-                </h3>
+                Monthly
+            </button>
+            <button
+                type="button"
+                @click="interval = 'year'"
+                :class="interval === 'year'
+                    ? 'bg-white text-black shadow-sm dark:bg-zinc-700 dark:text-white'
+                    : 'text-zinc-500 hover:text-zinc-700 dark:hover:text-zinc-300'"
+                class="relative rounded-full px-5 py-2 text-sm font-medium transition"
+                role="radio"
+                :aria-checked="interval === 'year'"
+            >
+                Annual
+                <span class="absolute -right-2 -top-2.5 rounded-full bg-emerald-100 px-1.5 py-0.5 text-[10px] font-semibold text-emerald-700 dark:bg-emerald-900/50 dark:text-emerald-300">
+                    Save 16%
+                </span>
+            </button>
+        </div>
 
-                {{-- Price --}}
-                <div
-                    class="flex items-start gap-1.5 pt-5"
-                    aria-label="Price: FREE (with Bifrost subscription or OpenCollective donation)"
-                >
-                    <div class="text-5xl font-semibold">FREE</div>
-                    <div class="self-end pb-1.5 text-zinc-500">
-                        with
-                        <a
-                            href="/bifrost"
-                            target="_blank"
-                            class="underline underline-offset-2 transition-colors hover:text-zinc-400 dark:text-zinc-300 dark:hover:text-zinc-100"
-                        >
-                            Bifrost
-                        </a>
-                    </div>
+        {{-- Ultra Plan Card --}}
+        <div
+            x-init="
+                () => {
+                    motion.inView($el, (element) => {
+                        motion.animate(
+                            $el,
+                            {
+                                y: [10, 0],
+                                opacity: [0, 1],
+                            },
+                            {
+                                duration: 0.7,
+                                ease: motion.circOut,
+                            },
+                        )
+                    })
+                }
+            "
+            class="w-full rounded-2xl bg-gray-100 p-7 opacity-0 ring-1 ring-black dark:bg-black/50 dark:ring-white/20"
+            aria-labelledby="ultra-plan-heading"
+        >
+            {{-- Plan Name --}}
+            <h3
+                id="ultra-plan-heading"
+                class="text-3xl font-semibold"
+            >
+                <span class="rounded-full bg-zinc-300 px-4 dark:bg-zinc-600">
+                    Ultra
+                </span>
+            </h3>
+
+            {{-- Price --}}
+            <div
+                class="flex items-start gap-1.5 pt-5"
+                :aria-label="interval === 'month'
+                    ? 'Price: $35 per month'
+                    : 'Price: $350 per year'"
+            >
+                <div class="text-5xl font-semibold">
+                    $<span x-text="interval === 'month' ? '35' : '350'"></span>
+                </div>
+                <div class="self-end pb-1.5 text-zinc-500">
+                    <span x-text="interval === 'month' ? 'per month' : 'per year'"></span>
                 </div>
+            </div>
 
-                <a
-                    href="https://bifrost.nativephp.com/register"
-                    class="my-5 block w-full rounded-2xl bg-zinc-200 py-4 text-center text-sm font-medium transition duration-200 ease-in-out hover:bg-zinc-800 hover:text-white dark:bg-slate-700/30 dark:hover:bg-slate-700/40"
-                    aria-label="Get started with a FREE Mini license via Bifrost"
+            {{-- Savings note --}}
+            <div
+                x-show="interval === 'year'"
+                x-transition
+                class="pt-1 text-sm text-emerald-600 dark:text-emerald-400"
+            >
+                Save $70/year vs monthly
+            </div>
+
+            {{-- CTA Button --}}
+            @auth
+                @if($isAlreadyUltra)
+                    <div class="my-5 block w-full rounded-2xl bg-emerald-100 py-4 text-center text-sm font-medium text-emerald-800 dark:bg-emerald-900/30 dark:text-emerald-300">
+                        You're on Ultra
+                    </div>
+                @elseif($hasExistingSubscription)
+                    <button
+                        type="button"
+                        @click="showUpgradeModal = true"
+                        class="my-5 block w-full rounded-2xl bg-zinc-800 py-4 text-center text-sm font-medium text-white transition duration-200 ease-in-out hover:bg-zinc-700 dark:bg-white dark:text-black dark:hover:bg-zinc-200"
+                        aria-label="Upgrade to Ultra plan"
+                    >
+                        Upgrade to Ultra
+                    </button>
+                @else
+                    <button
+                        type="button"
+                        wire:click="createCheckoutSession('max')"
+                        class="my-5 block w-full rounded-2xl bg-zinc-800 py-4 text-center text-sm font-medium text-white transition duration-200 ease-in-out hover:bg-zinc-700 dark:bg-white dark:text-black dark:hover:bg-zinc-200"
+                        aria-label="Get started with Ultra plan"
+                    >
+                        Get started
+                    </button>
+                @endif
+            @else
+                <button
+                    type="button"
+                    @click="$dispatch('open-purchase-modal', { plan: 'max' })"
+                    class="my-5 block w-full rounded-2xl bg-zinc-800 py-4 text-center text-sm font-medium text-white transition duration-200 ease-in-out hover:bg-zinc-700 dark:bg-white dark:text-black dark:hover:bg-zinc-200"
+                    aria-label="Get started with Ultra plan"
                 >
-                    Get started with Bifrost
-                </a>
+                    Get started
+                </button>
+            @endauth
 
-                {{-- OpenCollective Alternative --}}
-                <div class="relative my-5">
-                    <div class="absolute inset-0 flex items-center">
-                        <div class="w-full border-t border-zinc-300 dark:border-zinc-600"></div>
+            {{-- Features --}}
+            <div
+                class="space-y-2.5 text-sm"
+                aria-label="Ultra plan features"
+            >
+                <div class="flex items-center gap-2">
+                    <div
+                        class="grid size-7 shrink-0 place-items-center rounded-xl bg-[#D4FD7D] dark:bg-[#d68ffe] dark:text-black"
+                        aria-hidden="true"
+                    >
+                        <x-icons.checkmark class="size-5 shrink-0" />
                     </div>
-                    <div class="relative flex justify-center text-sm">
-                        <span class="bg-gray-100 px-2 text-zinc-500 dark:bg-mirage">or</span>
+                    <div class="font-medium">All first-party plugins for free</div>
+                </div>
+                <div class="flex items-center gap-2">
+                    <div
+                        class="grid size-7 shrink-0 place-items-center rounded-xl bg-[#D4FD7D] dark:bg-[#d68ffe] dark:text-black"
+                        aria-hidden="true"
+                    >
+                        <x-icons.checkmark class="size-5 shrink-0" />
                     </div>
+                    <div class="font-medium">Discounts on third-party plugins</div>
                 </div>
-
-                <div class="mb-6 text-center">
-                    <p class="text-sm text-zinc-600 dark:text-zinc-400">
-                        Donate any amount via
-                        <a
-                            href="https://opencollective.com/nativephp"
-                            target="_blank"
-                            class="font-medium text-zinc-800 underline underline-offset-2 transition-colors hover:text-zinc-600 dark:text-zinc-200 dark:hover:text-zinc-100"
-                        >
-                            OpenCollective
-                        </a>
-                    </p>
-                    <a
-                        href="{{ route('opencollective.claim') }}"
-                        class="mt-3 inline-block rounded-xl bg-zinc-200 px-6 py-3 text-center text-sm font-medium transition duration-200 ease-in-out hover:bg-zinc-800 hover:text-white dark:bg-slate-700/30 dark:hover:bg-slate-700/40"
-                        aria-label="Claim your Mini license from an OpenCollective donation"
+                <div class="flex items-center gap-2">
+                    <div
+                        class="grid size-7 shrink-0 place-items-center rounded-xl bg-[#D4FD7D] dark:bg-[#d68ffe] dark:text-black"
+                        aria-hidden="true"
                     >
-                        Already donated? Claim your license
-                    </a>
+                        <x-icons.checkmark class="size-5 shrink-0" />
+                    </div>
+                    <div class="font-medium">Claude Code Plugin Dev Kit for free</div>
+                </div>
+                <div class="flex items-center gap-2">
+                    <div
+                        class="grid size-7 shrink-0 place-items-center rounded-xl bg-[#D4FD7D] dark:bg-[#d68ffe] dark:text-black"
+                        aria-hidden="true"
+                    >
+                        <x-icons.checkmark class="size-5 shrink-0" />
+                    </div>
+                    <div class="font-medium">Discounts on NativePHP courses and apps</div>
+                </div>
+                <div class="flex items-center gap-2">
+                    <div
+                        class="grid size-7 shrink-0 place-items-center rounded-xl bg-[#D4FD7D] dark:bg-[#d68ffe] dark:text-black"
+                        aria-hidden="true"
+                    >
+                        <x-icons.checkmark class="size-5 shrink-0" />
+                    </div>
+                    <div class="font-medium">Premium support &mdash; expedited turnaround</div>
+                </div>
+                <div class="flex items-center gap-2">
+                    <div
+                        class="grid size-7 shrink-0 place-items-center rounded-xl bg-[#D4FD7D] dark:bg-[#d68ffe] dark:text-black"
+                        aria-hidden="true"
+                    >
+                        <x-icons.checkmark class="size-5 shrink-0" />
+                    </div>
+                    <div class="font-medium">Teams support &mdash; invite and manage members</div>
                 </div>
-
-                <x-pricing-plan-features plan-name="Mini" />
             </div>
-        @endif
+        </div>
 
-        {{-- Pro Plan --}}
-        <x-pricing-plan
-            name="Pro"
-            id="pro"
-            :features="[
-                'apps' => 'unlimited',
-                'keys' => 10,
-            ]"
-            price="200"
-            discounted_price="150"
-            :$discounted
-        />
+        {{-- Upgrade Confirmation Modal --}}
+        @auth
+            @if($hasExistingSubscription && !$isAlreadyUltra)
+                <template x-teleport="body">
+                    <div
+                        x-show="showUpgradeModal"
+                        x-transition.opacity
+                        class="fixed inset-0 z-50 flex items-center justify-center bg-black/50 p-4"
+                        @keydown.escape.window="showUpgradeModal = false"
+                    >
+                        <div
+                            x-show="showUpgradeModal"
+                            x-transition
+                            @click.outside="showUpgradeModal = false"
+                            class="w-full max-w-md rounded-2xl bg-white p-6 shadow-xl dark:bg-zinc-900"
+                        >
+                            <h3 class="text-lg font-semibold text-gray-900 dark:text-white">Upgrade to Ultra</h3>
+                            <p class="mt-2 text-sm text-gray-600 dark:text-gray-400">
+                                You're upgrading from <strong>{{ $currentPlanName }}</strong> to <strong>Ultra</strong>.
+                                You'll be charged the prorated difference immediately and your new billing cycle will begin.
+                            </p>
+
+                            {{-- Interval Toggle --}}
+                            <div class="mt-4">
+                                <label class="text-sm font-medium text-gray-700 dark:text-gray-300">Billing interval</label>
+                                <div class="mt-2 inline-flex items-center gap-1 rounded-full bg-gray-100 p-1 dark:bg-zinc-800" role="radiogroup" aria-label="Upgrade billing interval">
+                                    <button
+                                        type="button"
+                                        @click="interval = 'month'"
+                                        :class="interval === 'month'
+                                            ? 'bg-white text-black shadow-sm dark:bg-zinc-600 dark:text-white'
+                                            : 'text-zinc-500 hover:text-zinc-700 dark:hover:text-zinc-300'"
+                                        class="rounded-full px-4 py-1.5 text-sm font-medium transition"
+                                        role="radio"
+                                        :aria-checked="interval === 'month'"
+                                    >
+                                        Monthly
+                                    </button>
+                                    <button
+                                        type="button"
+                                        @click="interval = 'year'"
+                                        :class="interval === 'year'
+                                            ? 'bg-white text-black shadow-sm dark:bg-zinc-600 dark:text-white'
+                                            : 'text-zinc-500 hover:text-zinc-700 dark:hover:text-zinc-300'"
+                                        class="rounded-full px-4 py-1.5 text-sm font-medium transition"
+                                        role="radio"
+                                        :aria-checked="interval === 'year'"
+                                    >
+                                        Annual
+                                    </button>
+                                </div>
+                            </div>
 
-        {{-- Max Plan - Most Popular --}}
-        <x-pricing-plan
-            name="Max"
-            id="max"
-            :features="[
-                'apps' => 'unlimited',
-                'keys' => 'Unlimited',
-                'discord' => true,
-                'github' => true,
-                'priority' => true,
-                'support' => true,
-            ]"
-            price="350"
-            discounted_price="250"
-            :$discounted
-            :popular="true"
-        />
+                            {{-- Price Preview --}}
+                            <div class="mt-4 rounded-lg bg-gray-50 p-3 dark:bg-zinc-800">
+                                <div class="flex items-baseline justify-between">
+                                    <span class="text-sm text-gray-600 dark:text-gray-400">Ultra</span>
+                                    <span class="text-lg font-semibold text-gray-900 dark:text-white">
+                                        $<span x-text="interval === 'month' ? '35' : '350'"></span><span class="text-sm font-normal text-gray-500">/<span x-text="interval === 'month' ? 'mo' : 'yr'"></span></span>
+                                    </span>
+                                </div>
+                                <div
+                                    x-show="interval === 'year'"
+                                    x-transition
+                                    class="mt-1 text-xs text-emerald-600 dark:text-emerald-400"
+                                >
+                                    Save $70/year vs monthly
+                                </div>
+                            </div>
+
+                            {{-- Actions --}}
+                            <div class="mt-6 flex gap-3">
+                                <button
+                                    type="button"
+                                    @click="showUpgradeModal = false"
+                                    class="flex-1 rounded-xl border border-gray-300 px-4 py-2.5 text-sm font-medium text-gray-700 transition hover:bg-gray-50 dark:border-zinc-700 dark:text-gray-300 dark:hover:bg-zinc-800"
+                                >
+                                    Cancel
+                                </button>
+                                <button
+                                    type="button"
+                                    wire:click="upgradeSubscription"
+                                    wire:loading.attr="disabled"
+                                    class="flex-1 rounded-xl bg-zinc-800 px-4 py-2.5 text-sm font-medium text-white transition hover:bg-zinc-700 disabled:opacity-50 dark:bg-white dark:text-black dark:hover:bg-zinc-200"
+                                >
+                                    <span wire:loading.remove wire:target="upgradeSubscription">Confirm upgrade</span>
+                                    <span wire:loading wire:target="upgradeSubscription">Upgrading...</span>
+                                </button>
+                            </div>
+                        </div>
+                    </div>
+                </template>
+            @endif
+        @endauth
     </div>
 
     @guest
diff --git a/resources/views/livewire/sub-license-manager.blade.php b/resources/views/livewire/sub-license-manager.blade.php
index 3e3c4d1d..26c46c20 100644
--- a/resources/views/livewire/sub-license-manager.blade.php
+++ b/resources/views/livewire/sub-license-manager.blade.php
@@ -1,185 +1,203 @@
 <div @if($isPolling) wire:poll.5s @endif>
-    <div class="mt-6 bg-white dark:bg-gray-800 shadow overflow-hidden sm:rounded-lg">
-        <div class="px-4 py-5 sm:px-6">
-            <div class="flex items-center justify-between">
-                <div>
-                    <h3 class="text-lg leading-6 font-medium text-gray-900 dark:text-white">
-                        Keys
-                        <span class="ml-2 text-sm text-gray-500 dark:text-gray-400">
-                            ({{ $activeSubLicenses->count() }}{{ $license->subLicenseLimit ? '/' . $license->subLicenseLimit : '' }})
-                        </span>
-                    </h3>
-                    <p class="mt-1 max-w-2xl text-sm text-gray-500 dark:text-gray-400">
-                        Manage license keys for team members or additional devices.
-                    </p>
-                </div>
-                @if($license->canCreateSubLicense())
-                    <button
-                        type="button"
-                        onclick="showCreateKeyModal()"
-                        wire:click="startPolling"
-                        class="inline-flex items-center px-4 py-2 border border-transparent text-sm font-medium rounded-md shadow-sm text-white bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500"
-                    >
-                        Create Key
-                    </button>
-                @endif
+    <flux:card class="mt-6">
+        <div class="flex items-center justify-between">
+            <div>
+                <flux:heading size="lg">
+                    Keys
+                    <span class="ml-2 text-sm text-zinc-500 dark:text-zinc-400">
+                        ({{ $activeSubLicenses->count() }}{{ $license->subLicenseLimit ? '/' . $license->subLicenseLimit : '' }})
+                    </span>
+                </flux:heading>
+                <flux:text>Manage license keys for team members or additional devices.</flux:text>
             </div>
+            @if($license->canCreateSubLicense())
+                <flux:button variant="primary" wire:click="openCreateModal">
+                    Create Key
+                </flux:button>
+            @endif
         </div>
 
         @if($license->subLicenses->isEmpty())
-            <div class="border-t border-gray-200 dark:border-gray-700 px-4 py-8 text-center">
-                <div class="text-gray-500 dark:text-gray-400">
-                    <h3 class="mt-2 text-sm font-medium text-gray-900 dark:text-white">No keys</h3>
-                    <p class="mt-1 text-sm text-gray-500 dark:text-gray-400">Get started by creating your first key.</p>
-                </div>
+            <div class="py-8 text-center">
+                <flux:heading size="sm">No keys</flux:heading>
+                <flux:text>Get started by creating your first key.</flux:text>
             </div>
         @else
             {{-- Active Sub-Licenses --}}
             @if($activeSubLicenses->isNotEmpty())
-                <div class="border-t border-gray-200 dark:border-gray-700">
-                    <ul role="list" class="divide-y divide-gray-200 dark:divide-gray-700">
+                <flux:table class="mt-4">
+                    <flux:table.columns>
+                        <flux:table.column>Key</flux:table.column>
+                        <flux:table.column>Assigned To</flux:table.column>
+                        <flux:table.column>Actions</flux:table.column>
+                    </flux:table.columns>
+
+                    <flux:table.rows>
                         @foreach($activeSubLicenses as $subLicense)
-                        <li class="px-4 py-4" wire:key="sublicense-{{ $subLicense->id }}">
-                            <div class="flex items-center justify-between">
-                                <div class="flex-1">
-                                    <div class="flex items-center">
-                                        <div class="flex-1">
-                                            @if($subLicense->name)
-                                                <div>
-                                                    <p class="text-sm font-medium text-gray-900 dark:text-white">
-                                                        {{ $subLicense->name }}
-                                                    </p>
-                                                </div>
-                                            @endif
-                                            <div class="mt-1 flex items-center text-sm text-gray-500 dark:text-gray-400">
-                                                <code class="bg-gray-100 dark:bg-gray-700 px-2 py-1 rounded text-xs font-mono">
-                                                    {{ $subLicense->key }}
-                                                </code>
-                                                <button
-                                                    type="button"
-                                                    onclick="copyToClipboard('{{ $subLicense->key }}')"
-                                                    class="ml-2 text-xs text-blue-600 hover:text-blue-500"
-                                                >
-                                                    Copy
-                                                </button>
-                                            </div>
-                                            @if($subLicense->assigned_email)
-                                                <div class="mt-1 flex items-center text-sm text-gray-500 dark:text-gray-400">
-                                                    <span class="text-xs">Assigned to: {{ $subLicense->assigned_email }}</span>
-                                                </div>
-                                            @endif
-                                        </div>
-                                        <div class="ml-4 flex items-center space-x-2">
-                                            @if($subLicense->assigned_email)
-                                                <form method="POST" action="{{ route('customer.licenses.sub-licenses.send-email', [$license->key, $subLicense]) }}" class="inline">
-                                                    @csrf
-                                                    <button type="submit" class="text-green-600 hover:text-green-500 text-sm">
-                                                        Send License
-                                                    </button>
-                                                </form>
-                                            @endif
-                                            <button
-                                                type="button"
-                                                onclick="showEditSubLicenseModal({{ $subLicense->id }}, '{{ $subLicense->name }}', '{{ $subLicense->assigned_email }}')"
-                                                class="text-blue-600 hover:text-blue-500 text-sm"
-                                            >
-                                                Edit
-                                            </button>
-                                            <form method="POST" action="{{ route('customer.licenses.sub-licenses.suspend', [$license->key, $subLicense]) }}" class="inline" onsubmit="return confirmSuspension(event)">
+                            <flux:table.row wire:key="sublicense-{{ $subLicense->id }}">
+                                <flux:table.cell>
+                                    <div>
+                                        @if($subLicense->name)
+                                            <span class="font-medium">{{ $subLicense->name }}</span>
+                                        @endif
+                                        <x-customer.masked-key :key-value="$subLicense->key" />
+                                    </div>
+                                </flux:table.cell>
+
+                                <flux:table.cell>
+                                    @if($subLicense->assigned_email)
+                                        <flux:text class="text-sm">{{ $subLicense->assigned_email }}</flux:text>
+                                    @else
+                                        <flux:text class="text-sm italic">Unassigned</flux:text>
+                                    @endif
+                                </flux:table.cell>
+
+                                <flux:table.cell>
+                                    <div class="flex items-center gap-2">
+                                        <flux:button size="xs" variant="ghost" wire:click="editSubLicense({{ $subLicense->id }})">
+                                            Edit
+                                        </flux:button>
+                                        @if($subLicense->assigned_email)
+                                            <form method="POST" action="{{ route('customer.licenses.sub-licenses.send-email', [$license->key, $subLicense]) }}" class="inline">
                                                 @csrf
-                                                @method('PATCH')
-                                                <button type="submit" class="text-yellow-600 hover:text-yellow-500 text-sm">
-                                                    Suspend
-                                                </button>
+                                                <flux:button type="submit" size="xs" variant="ghost">Send License</flux:button>
                                             </form>
-                                        </div>
+                                        @endif
+                                        <form method="POST" action="{{ route('customer.licenses.sub-licenses.suspend', [$license->key, $subLicense]) }}" class="inline" onsubmit="return confirmSuspension(event)">
+                                            @csrf
+                                            @method('PATCH')
+                                            <flux:button type="submit" size="xs" variant="ghost" class="!text-amber-600 hover:!text-amber-500">Suspend</flux:button>
+                                        </form>
                                     </div>
-                                </div>
-                            </div>
-                        </li>
+                                </flux:table.cell>
+                            </flux:table.row>
                         @endforeach
-                    </ul>
-                </div>
+                    </flux:table.rows>
+                </flux:table>
             @endif
 
             {{-- Suspended Sub-Licenses --}}
             @if($suspendedSubLicenses->isNotEmpty())
-                <div class="mt-6 bg-white dark:bg-gray-800 shadow overflow-hidden sm:rounded-lg">
-                    <div class="px-4 py-5 sm:px-6">
-                        <div class="flex items-center justify-between">
-                            <div>
-                                <h3 class="text-lg leading-6 font-medium text-gray-900 dark:text-white">
-                                    Suspended Keys
-                                    <span class="ml-2 text-sm text-gray-500 dark:text-gray-400">
-                                        ({{ $suspendedSubLicenses->count() }})
-                                    </span>
-                                </h3>
-                                <p class="mt-1 max-w-2xl text-sm text-gray-500 dark:text-gray-400">
-                                    These keys are permanently suspended and cannot be used or reactivated.
-                                </p>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="border-t border-gray-200 dark:border-gray-700">
-                        <ul role="list" class="divide-y divide-gray-200 dark:divide-gray-700">
+                <div class="mt-6">
+                    <flux:heading size="base">
+                        Suspended Keys
+                        <span class="ml-2 text-sm text-zinc-500 dark:text-zinc-400">
+                            ({{ $suspendedSubLicenses->count() }})
+                        </span>
+                    </flux:heading>
+                    <flux:text>These keys are permanently suspended and cannot be used or reactivated.</flux:text>
+
+                    <flux:table class="mt-4">
+                        <flux:table.columns>
+                            <flux:table.column>Key</flux:table.column>
+                            <flux:table.column>Assigned To</flux:table.column>
+                        </flux:table.columns>
+
+                        <flux:table.rows>
                             @foreach($suspendedSubLicenses as $subLicense)
-                            <li class="px-4 py-4 bg-red-50 dark:bg-red-900/20" wire:key="suspended-sublicense-{{ $subLicense->id }}">
-                                <div class="flex items-center justify-between">
-                                    <div class="flex-1">
-                                        <div class="flex items-center">
-                                            <div class="flex-1">
-                                                @if($subLicense->name)
-                                                    <div>
-                                                        <p class="text-sm font-medium text-gray-900 dark:text-white">
-                                                            {{ $subLicense->name }}
-                                                        </p>
-                                                    </div>
-                                                @endif
-                                                <div class="mt-1 flex items-center text-sm text-gray-500 dark:text-gray-400">
-                                                    <code class="bg-gray-100 dark:bg-gray-700 px-2 py-1 rounded text-xs font-mono">
-                                                        {{ $subLicense->key }}
-                                                    </code>
-                                                </div>
-                                                @if($subLicense->assigned_email)
-                                                    <div class="mt-1 flex items-center text-sm text-gray-500 dark:text-gray-400">
-                                                        <span class="text-xs">Assigned to: {{ $subLicense->assigned_email }}</span>
-                                                    </div>
-                                                @endif
-                                            </div>
+                                <flux:table.row wire:key="suspended-sublicense-{{ $subLicense->id }}">
+                                    <flux:table.cell>
+                                        <div>
+                                            @if($subLicense->name)
+                                                <span class="font-medium">{{ $subLicense->name }}</span>
+                                            @endif
+                                            <x-customer.masked-key :key-value="$subLicense->key" />
                                         </div>
-                                    </div>
-                                </div>
-                            </li>
+                                    </flux:table.cell>
+
+                                    <flux:table.cell>
+                                        @if($subLicense->assigned_email)
+                                            <flux:text class="text-sm">{{ $subLicense->assigned_email }}</flux:text>
+                                        @else
+                                            <flux:text class="text-sm italic">Unassigned</flux:text>
+                                        @endif
+                                    </flux:table.cell>
+                                </flux:table.row>
                             @endforeach
-                        </ul>
-                    </div>
+                        </flux:table.rows>
+                    </flux:table>
                 </div>
             @endif
         @endif
 
         @if(!$license->canCreateSubLicense())
-            <div class="border-t border-gray-200 dark:border-gray-700 px-4 py-3 bg-yellow-50 dark:bg-yellow-900/20">
-                <div class="flex">
-                    <div class="flex-shrink-0">
-                        <svg class="h-5 w-5 text-yellow-400" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor">
-                            <path fill-rule="evenodd" d="M8.257 3.099c.765-1.36 2.722-1.36 3.486 0l5.58 9.92c.75 1.334-.213 2.98-1.742 2.98H4.42c-1.53 0-2.493-1.646-1.743-2.98l5.58-9.92zM11 13a1 1 0 11-2 0 1 1 0 012 0zm-1-8a1 1 0 00-1 1v3a1 1 0 002 0V6a1 1 0 00-1-1z" clip-rule="evenodd" />
-                        </svg>
-                    </div>
-                    <div class="ml-3">
-                        <p class="text-sm text-yellow-700 dark:text-yellow-300">
-                            @if($license->remainingSubLicenses === 0)
-                                You have reached the maximum number of keys for this plan.
-                            @elseif($license->is_suspended)
-                                Keys cannot be created for suspended licenses.
-                            @elseif($license->expires_at && $license->expires_at->isPast())
-                                Keys cannot be created for expired licenses.
-                            @else
-                                Keys cannot be created at this time.
-                            @endif
-                        </p>
-                    </div>
+            <flux:callout variant="warning" icon="exclamation-triangle" class="mt-4">
+                <flux:callout.text>
+                    @if($license->remainingSubLicenses === 0)
+                        You have reached the maximum number of keys for this plan.
+                    @elseif($license->is_suspended)
+                        Keys cannot be created for suspended licenses.
+                    @elseif($license->expires_at && $license->expires_at->isPast())
+                        Keys cannot be created for expired licenses.
+                    @else
+                        Keys cannot be created at this time.
+                    @endif
+                </flux:callout.text>
+            </flux:callout>
+        @endif
+    </flux:card>
+
+    {{-- Create Sub-License Modal --}}
+    <flux:modal name="create-sub-license">
+        <form wire:submit="createSubLicense">
+            <flux:heading size="lg">Create Key</flux:heading>
+
+            <div class="mt-4 space-y-4">
+                <div>
+                    <flux:input
+                        wire:model="createName"
+                        label="Name (Optional)"
+                        placeholder="e.g., Development Team, John's Machine"
+                    />
+                    <flux:text class="mt-1 text-xs">Give your key a descriptive name to help identify its purpose.</flux:text>
+                </div>
+
+                <div>
+                    <flux:input
+                        wire:model="createAssignedEmail"
+                        type="email"
+                        label="Assign to Email (Optional)"
+                        placeholder="e.g., john@company.com"
+                    />
+                    <flux:text class="mt-1 text-xs">Assign this license to a team member.</flux:text>
                 </div>
             </div>
-        @endif
-    </div>
+
+            <div class="mt-6 flex justify-end">
+                <flux:button type="submit" variant="primary">Create Key</flux:button>
+            </div>
+        </form>
+    </flux:modal>
+
+    {{-- Edit Sub-License Modal --}}
+    <flux:modal name="edit-sub-license">
+        <form wire:submit="updateSubLicense">
+            <flux:heading size="lg">Edit Key</flux:heading>
+
+            <div class="mt-4 space-y-4">
+                <div>
+                    <flux:input
+                        wire:model="editName"
+                        label="Name (Optional)"
+                        placeholder="e.g., Development Team, John's Machine"
+                    />
+                    <flux:text class="mt-1 text-xs">Give your key a descriptive name to help identify its purpose.</flux:text>
+                </div>
+
+                <div>
+                    <flux:input
+                        wire:model="editAssignedEmail"
+                        type="email"
+                        label="Assign to Email (Optional)"
+                        placeholder="e.g., john@company.com"
+                    />
+                    <flux:text class="mt-1 text-xs">Assign this license to a team member.</flux:text>
+                </div>
+            </div>
+
+            <div class="mt-6 flex justify-end">
+                <flux:button type="submit" variant="primary">Update Key</flux:button>
+            </div>
+        </form>
+    </flux:modal>
 </div>
diff --git a/resources/views/livewire/team-manager.blade.php b/resources/views/livewire/team-manager.blade.php
new file mode 100644
index 00000000..9425be20
--- /dev/null
+++ b/resources/views/livewire/team-manager.blade.php
@@ -0,0 +1,178 @@
+<div>
+    @if($team->is_suspended)
+        <flux:callout variant="warning" icon="exclamation-triangle" class="mb-6">
+            <flux:callout.text>Your team is currently suspended. Reactivate your Ultra subscription to restore team benefits.</flux:callout.text>
+        </flux:callout>
+    @endif
+
+    {{-- Invite Form --}}
+    @if(!$team->is_suspended)
+        <flux:card class="mb-6">
+            <flux:heading size="lg">Invite a Team Member</flux:heading>
+            <form method="POST" action="{{ route('customer.team.invite') }}" class="mt-4 flex gap-4">
+                @csrf
+                <div class="flex-1">
+                    <flux:input type="email" name="email" placeholder="email@example.com" required />
+                </div>
+                <flux:button type="submit" variant="primary">Send Invite</flux:button>
+            </form>
+            @error('email')
+                <flux:text class="mt-2 text-red-600 dark:text-red-400">{{ $message }}</flux:text>
+            @enderror
+        </flux:card>
+    @endif
+
+    {{-- Seat Management --}}
+    <flux:card class="mb-6">
+        <div class="flex items-center justify-between">
+            <div>
+                <flux:heading size="lg">Seats</flux:heading>
+                <flux:text class="mt-1">
+                    {{ $team->occupiedSeatCount() }} of {{ $team->totalSeatCapacity() }} seats used
+                    @if($team->extra_seats > 0)
+                        <span class="text-indigo-600 dark:text-indigo-400">({{ $team->extra_seats }} extra)</span>
+                    @endif
+                </flux:text>
+            </div>
+            @if(!$team->is_suspended)
+                <div class="flex items-center gap-2">
+                    <flux:modal.trigger name="add-seats">
+                        <flux:button variant="primary" size="sm" icon="plus">Add Seats</flux:button>
+                    </flux:modal.trigger>
+                    @if($removableSeats > 0)
+                        <flux:modal.trigger name="remove-seats">
+                            <flux:button variant="ghost" size="sm" icon="minus">Remove Seats</flux:button>
+                        </flux:modal.trigger>
+                    @endif
+                </div>
+            @endif
+        </div>
+    </flux:card>
+
+    {{-- Add Seats Modal --}}
+    <flux:modal name="add-seats" class="max-w-md" x-init="{{ session('show_add_seats') ? '$flux.modal(\'add-seats\').show()' : '' }}">
+        <div x-data="{ addQty: 1 }">
+            <flux:heading size="lg">Add Extra Seats</flux:heading>
+            <flux:text class="mt-2">
+                Extra seats cost ${{ $extraSeatPriceMonthly }}/mo or ${{ $extraSeatPriceYearly }}/yr per seat, matching your current billing interval.
+            </flux:text>
+            <div class="mt-4">
+                <flux:input type="number" label="Quantity" x-model.number="addQty" min="1" max="50" class="w-24" />
+            </div>
+            <div class="mt-6 flex justify-end gap-3">
+                <flux:modal.close>
+                    <flux:button variant="ghost">Cancel</flux:button>
+                </flux:modal.close>
+                <flux:button
+                    variant="primary"
+                    x-on:click="$wire.addSeats(addQty)"
+                    wire:loading.attr="disabled"
+                >
+                    <span wire:loading.remove wire:target="addSeats">Confirm</span>
+                    <span wire:loading wire:target="addSeats">Processing...</span>
+                </flux:button>
+            </div>
+        </div>
+    </flux:modal>
+
+    {{-- Remove Seats Modal --}}
+    @if($removableSeats > 0)
+        <flux:modal name="remove-seats" class="max-w-md">
+            <div x-data="{ removeQty: 1 }">
+                <flux:heading size="lg">Remove Extra Seats</flux:heading>
+                <flux:text class="mt-2">
+                    You currently have {{ $team->extra_seats }} extra seat(s). Seats are removed immediately and you'll be credited for the unused time on your next bill.
+                </flux:text>
+                <div class="mt-4">
+                    <flux:input type="number" label="Quantity" x-model.number="removeQty" min="1" max="{{ $removableSeats }}" class="w-24" />
+                </div>
+                <div class="mt-6 flex justify-end gap-3">
+                    <flux:modal.close>
+                        <flux:button variant="ghost">Cancel</flux:button>
+                    </flux:modal.close>
+                    <flux:button
+                        variant="danger"
+                        x-on:click="$wire.removeSeats(removeQty)"
+                        wire:loading.attr="disabled"
+                    >
+                        <span wire:loading.remove wire:target="removeSeats">Remove</span>
+                        <span wire:loading wire:target="removeSeats">Processing...</span>
+                    </flux:button>
+                </div>
+            </div>
+        </flux:modal>
+    @endif
+
+    {{-- Pending Invitations --}}
+    @if($pendingInvitations->isNotEmpty())
+        <div class="mb-6">
+            <flux:heading size="lg" class="mb-4">
+                Pending Invitations
+                <flux:badge size="sm" class="ml-2">{{ $pendingInvitations->count() }}</flux:badge>
+            </flux:heading>
+            <flux:card class="!p-0">
+                <flux:table>
+                    <flux:table.rows>
+                        @foreach($pendingInvitations as $invitation)
+                            <flux:table.row wire:key="invitation-{{ $invitation->id }}">
+                                <flux:table.cell class="flex-1">
+                                    <flux:text class="font-medium">{{ $invitation->email }}</flux:text>
+                                    @if($invitation->invited_at)
+                                        <flux:text class="text-xs">Invited {{ $invitation->invited_at->diffForHumans() }}</flux:text>
+                                    @endif
+                                </flux:table.cell>
+                                <flux:table.cell class="flex justify-end gap-3">
+                                    <form method="POST" action="{{ route('customer.team.users.resend', $invitation) }}">
+                                        @csrf
+                                        <flux:button type="submit" variant="ghost" size="sm">Resend</flux:button>
+                                    </form>
+                                    <form method="POST" action="{{ route('customer.team.users.remove', $invitation) }}" onsubmit="return confirm('Cancel this invitation?')">
+                                        @csrf
+                                        @method('DELETE')
+                                        <flux:button type="submit" variant="ghost" size="sm" class="text-red-600 hover:text-red-500 dark:text-red-400">Cancel</flux:button>
+                                    </form>
+                                </flux:table.cell>
+                            </flux:table.row>
+                        @endforeach
+                    </flux:table.rows>
+                </flux:table>
+            </flux:card>
+        </div>
+    @endif
+
+    {{-- Team Members --}}
+    <div class="mb-4">
+        <flux:heading size="lg">Team Members</flux:heading>
+    </div>
+
+    @if($activeMembers->isNotEmpty())
+        <flux:card class="!p-0">
+            <flux:table>
+                <flux:table.rows>
+                    @foreach($activeMembers as $member)
+                        <flux:table.row wire:key="member-{{ $member->id }}">
+                            <flux:table.cell class="flex-1">
+                                <flux:text class="font-medium">{{ $member->user?->display_name ?? $member->email }}</flux:text>
+                                <flux:text class="text-sm">{{ $member->email }}</flux:text>
+                                @if($member->accepted_at)
+                                    <flux:text class="text-xs">Joined {{ $member->accepted_at->diffForHumans() }}</flux:text>
+                                @endif
+                            </flux:table.cell>
+                            <flux:table.cell class="flex justify-end">
+                                <form method="POST" action="{{ route('customer.team.users.remove', $member) }}" onsubmit="return confirm('Are you sure you want to remove this member?')">
+                                    @csrf
+                                    @method('DELETE')
+                                    <flux:button type="submit" variant="ghost" size="sm" class="text-red-600 hover:text-red-500 dark:text-red-400">Remove</flux:button>
+                                </form>
+                            </flux:table.cell>
+                        </flux:table.row>
+                    @endforeach
+                </flux:table.rows>
+            </flux:table>
+        </flux:card>
+    @else
+        <flux:card>
+            <flux:text class="text-center">No active team members yet. Invite someone to get started.</flux:text>
+        </flux:card>
+    @endif
+</div>
diff --git a/resources/views/plugin-show.blade.php b/resources/views/plugin-show.blade.php
index a0963e4f..8750c93a 100644
--- a/resources/views/plugin-show.blade.php
+++ b/resources/views/plugin-show.blade.php
@@ -133,8 +133,16 @@ class="w-full shrink-0 lg:sticky lg:top-24 lg:w-80"
                 @if ($plugin->isPaid() && $bestPrice && $plugin->is_active)
                     <div class="mb-4 rounded-2xl border-2 border-indigo-500 bg-gradient-to-br from-indigo-50 to-purple-50 p-6 dark:border-indigo-400 dark:from-indigo-950/50 dark:to-purple-950/50">
                         <div class="text-center">
-                            <p class="text-sm font-medium text-gray-600 dark:text-gray-400">Price</p>
-                            @if ($hasDiscount && $regularPrice)
+                            @if ($bestPrice->amount === 0 && $plugin->isOfficial())
+                                <p class="text-sm font-medium text-green-600 dark:text-green-400">Included with Ultra</p>
+                                <p class="mt-1 text-4xl font-bold text-gray-900 dark:text-white">Free</p>
+                                @if ($regularPrice)
+                                    <p class="mt-1 text-sm text-gray-400 line-through dark:text-gray-500">
+                                        ${{ number_format($regularPrice->amount / 100) }}
+                                    </p>
+                                @endif
+                            @elseif ($hasDiscount && $regularPrice)
+                                <p class="text-sm font-medium text-gray-600 dark:text-gray-400">Price</p>
                                 <p class="mt-1 text-lg text-gray-400 line-through dark:text-gray-500">
                                     ${{ number_format($regularPrice->amount / 100) }}
                                 </p>
@@ -144,12 +152,14 @@ class="w-full shrink-0 lg:sticky lg:top-24 lg:w-80"
                                 <p class="mt-1 text-xs font-medium text-green-600 dark:text-green-400">
                                     {{ $bestPrice->tier->label() }} pricing applied
                                 </p>
+                                <p class="mt-1 text-xs text-gray-500 dark:text-gray-400">One-time purchase</p>
                             @else
+                                <p class="text-sm font-medium text-gray-600 dark:text-gray-400">Price</p>
                                 <p class="mt-1 text-4xl font-bold text-gray-900 dark:text-white">
                                     ${{ number_format($bestPrice->amount / 100) }}
                                 </p>
+                                <p class="mt-1 text-xs text-gray-500 dark:text-gray-400">One-time purchase</p>
                             @endif
-                            <p class="mt-1 text-xs text-gray-500 dark:text-gray-400">One-time purchase</p>
                         </div>
                         <form action="{{ route('cart.add', $plugin->routeParams()) }}" method="POST" class="mt-4">
                             @csrf
diff --git a/resources/views/pricing.blade.php b/resources/views/pricing.blade.php
index 6863466d..7152d7fd 100644
--- a/resources/views/pricing.blade.php
+++ b/resources/views/pricing.blade.php
@@ -1,11 +1,10 @@
-<x-layout title="NativePHP for iOS and Android">
+<x-layout title="NativePHP Ultra">
     {{-- Hero Section --}}
     <section
         class="mt-10 md:mt-14"
         aria-labelledby="hero-heading"
     >
         <header class="relative z-10 grid place-items-center text-center">
-            {{-- Primary Heading --}}
             <h1
                 id="hero-heading"
                 x-init="
@@ -27,10 +26,9 @@ class="mt-10 md:mt-14"
                 "
                 class="text-3xl font-extrabold sm:text-4xl"
             >
-                NativePHP for Mobile
+                NativePHP Ultra
             </h1>
 
-            {{-- Introduction Description --}}
             <h2
                 x-init="
                     () => {
@@ -51,576 +49,20 @@ class="text-3xl font-extrabold sm:text-4xl"
                 "
                 class="mx-auto max-w-xl pt-4 text-base/relaxed text-gray-600 sm:text-lg/relaxed dark:text-gray-400"
             >
-                This changes everything! Now you can use the tools you already
-                know to build rich, native,
-                <em>mobile</em>
-                apps... right now!
+                Premium plugins, tools, and support to supercharge your
+                NativePHP development.
             </h2>
         </header>
-
-        {{-- Platform Cards --}}
-        <div
-            class="flex flex-wrap items-center justify-center gap-6 pt-10"
-            aria-label="Available platforms"
-        >
-            {{-- iOS Card --}}
-            <div
-                x-init="
-                    () => {
-                        motion.inView($el, (element) => {
-                            motion.animate(
-                                $el,
-                                {
-                                    opacity: [0, 1],
-                                    x: [-10, 0],
-                                },
-                                {
-                                    duration: 0.7,
-                                    ease: motion.easeOut,
-                                },
-                            )
-                        })
-                    }
-                "
-                class="relative"
-                aria-labelledby="ios-heading"
-            >
-                <div
-                    class="relative isolate z-10 flex w-full max-w-xs flex-col items-center overflow-hidden rounded-2xl bg-[#EBECF6] p-8 text-center ring-4 ring-white/60 ring-inset dark:bg-black/50 dark:ring-white/5"
-                >
-                    {{-- Subtitle --}}
-                    <p class="text-sm text-gray-500">Available now for</p>
-                    {{-- Title --}}
-                    <h3
-                        id="ios-heading"
-                        class="pt-1 text-4xl font-semibold"
-                    >
-                        iOS
-                    </h3>
-                    {{-- Text --}}
-                    <p class="pt-2.5 text-sm dark:text-gray-400">
-                        Build and ship App Store approved iOS apps today!
-                    </p>
-                    {{-- Mockup --}}
-                    <div class="pt-10">
-                        <img
-                            src="{{ Vite::asset('resources/images/mobile/ios_phone_mockup.webp') }}"
-                            alt="iOS phone mockup displaying a NativePHP application"
-                            class="-mb-44 w-40 dark:mix-blend-hard-light"
-                        />
-                    </div>
-                    {{-- White blurred circle - Decorative --}}
-                    <div
-                        class="absolute -top-5 right-1/2 -z-10 h-40 w-14 translate-x-1/2 rounded-full bg-white blur-2xl dark:bg-[#3a3f67]"
-                        aria-hidden="true"
-                    ></div>
-                    {{-- Blue blurred circle - Decorative --}}
-                    <div
-                        class="absolute right-1/2 bottom-0 -z-10 h-52 w-72 translate-x-1/2 rounded-full bg-[#9CA8D9]/40 blur-2xl dark:bg-blue-800/40"
-                        aria-hidden="true"
-                    ></div>
-                </div>
-
-                {{-- Blurred circle - Decorative --}}
-                <div
-                    class="absolute -top-1/2 left-0 -z-20 h-60 w-full rounded-full bg-[#DDE2F3] blur-[100px] dark:bg-[#444892]/50"
-                    aria-hidden="true"
-                ></div>
-            </div>
-
-            {{-- Android Card --}}
-            <div
-                x-init="
-                    () => {
-                        motion.inView($el, (element) => {
-                            motion.animate(
-                                $el,
-                                {
-                                    opacity: [0, 1],
-                                    x: [10, 0],
-                                },
-                                {
-                                    duration: 0.7,
-                                    ease: motion.easeOut,
-                                },
-                            )
-                        })
-                    }
-                "
-                class="relative"
-                aria-labelledby="android-heading"
-            >
-                <div
-                    class="relative isolate z-10 flex w-full max-w-xs flex-col items-center overflow-hidden rounded-2xl bg-[#F6F1EB] p-8 text-center ring-4 ring-white/60 ring-inset dark:bg-black/50 dark:ring-white/5"
-                >
-                    {{-- Subtitle --}}
-                    <p class="text-sm text-gray-500">Available now for</p>
-                    {{-- Title --}}
-                    <h3
-                        id="android-heading"
-                        class="pt-1 text-4xl font-semibold"
-                    >
-                        Android
-                    </h3>
-                    {{-- Text --}}
-                    <p class="pt-2.5 text-sm dark:text-gray-400">
-                        Sign up and build apps for Android today!
-                    </p>
-                    {{-- Mockup --}}
-                    <div class="pt-10">
-                        <img
-                            src="{{ Vite::asset('resources/images/mobile/android_phone_mockup.webp') }}"
-                            alt="Android phone mockup displaying a NativePHP application"
-                            class="-mb-[10.7rem] w-40"
-                        />
-                    </div>
-                    {{-- White blurred circle - Decorative --}}
-                    <div
-                        class="absolute -top-5 right-1/2 -z-10 h-40 w-14 translate-x-1/2 rounded-full bg-white blur-2xl dark:bg-[#3a3f67]"
-                        aria-hidden="true"
-                    ></div>
-                    {{-- Center blurred circle - Decorative --}}
-                    <div
-                        class="absolute right-1/2 bottom-0 -z-10 h-52 w-72 translate-x-1/2 rounded-full bg-[#E0D7CE] blur-2xl dark:bg-slate-700/50"
-                        aria-hidden="true"
-                    ></div>
-                </div>
-
-                {{-- Blurred circle - Decorative --}}
-                <div
-                    class="absolute -top-1/2 left-0 -z-20 h-60 w-full rounded-full bg-[#FBF2E7] blur-[100px] dark:bg-slate-500/40"
-                    aria-hidden="true"
-                ></div>
-            </div>
-        </div>
-    </section>
-
-    {{-- Quick Instructions Section --}}
-    <section
-        class="mt-20"
-        aria-labelledby="instructions-heading"
-    >
-        <header class="relative z-10 grid place-items-center text-center">
-            {{-- Section Heading --}}
-            <h2
-                id="instructions-heading"
-                x-init="
-                    () => {
-                        motion.inView($el, (element) => {
-                            motion.animate(
-                                $el,
-                                {
-                                    opacity: [0, 1],
-                                    x: [-10, 0],
-                                },
-                                {
-                                    duration: 0.7,
-                                    ease: motion.easeOut,
-                                },
-                            )
-                        })
-                    }
-                "
-                class="text-3xl font-semibold opacity-0"
-            >
-                Quick instructions
-            </h2>
-
-            {{-- Section Description --}}
-            <p
-                x-init="
-                    () => {
-                        motion.inView($el, (element) => {
-                            motion.animate(
-                                $el,
-                                {
-                                    opacity: [0, 1],
-                                    x: [10, 0],
-                                },
-                                {
-                                    duration: 0.7,
-                                    ease: motion.easeOut,
-                                },
-                            )
-                        })
-                    }
-                "
-                class="mx-auto max-w-xl pt-2 text-base/relaxed text-gray-600 opacity-0 dark:text-gray-400"
-            >
-                Get your app up and running in minutes.
-            </p>
-        </header>
-
-        {{-- Installation Steps --}}
-        <div
-            x-init="
-                    () => {
-                        motion.inView($el, (element) => {
-                            motion.animate([
-                                {{-- Slide 1 --}}
-                                [
-                                    $refs.slide1.querySelector('h3'),
-                                    {
-                                        opacity: [0, 1],
-                                        x: [-10, 0],
-                                    },
-                                    {
-                                        duration: 0.7,
-                                        ease: motion.circOut,
-                                    },
-                                ],
-                                [
-                                    $refs.slide1.querySelector('p'),
-                                    {
-                                        opacity: [0, 1],
-                                        x: [-10, 0],
-                                    },
-                                    {
-                                        duration: 0.7,
-                                        ease: motion.circOut,
-                                        at: '-0.5',
-                                    },
-                                ],
-                                [
-                                    $refs.slide1.querySelector('[x-ref=box]'),
-                                    {
-                                        opacity: [0, 1],
-                                        scale: [0, 1],
-                                    },
-                                    {
-                                        duration: 0.8,
-                                        ease: motion.backOut,
-                                        at: '-0.8',
-                                    },
-                                ],
-                                [
-                                    $refs.slide1.querySelector('[x-ref=checkmark]'),
-                                    {
-                                        opacity: [0, 1],
-                                        scale: [0, 1],
-                                    },
-                                    {
-                                        duration: 0.5,
-                                        ease: motion.backOut,
-                                        at: '-0.5',
-                                    },
-                                ],
-                                [
-                                    $refs.slide1.querySelector('[x-ref=success_title]'),
-                                    {
-                                        opacity: [0, 1],
-                                        y: [-10, 0],
-                                    },
-                                    {
-                                        duration: 0.5,
-                                        ease: motion.circOut,
-                                        at: '-0.5',
-                                    },
-                                ],
-                                [
-                                    $refs.slide1.querySelector('[x-ref=success_subtitle]'),
-                                    {
-                                        opacity: [0, 0.5],
-                                        y: [10, 0],
-                                    },
-                                    {
-                                        duration: 0.5,
-                                        ease: motion.circOut,
-                                        at: '-0.5',
-                                    },
-                                ],
-                                {{-- Slide 2 --}}
-                                [
-                                    $refs.slide2.querySelector('h3'),
-                                    {
-                                        opacity: [0, 1],
-                                        x: [-10, 0],
-                                    },
-                                    {
-                                        duration: 0.7,
-                                        ease: motion.circOut,
-                                        at: 0.2,
-                                    },
-                                ],
-                                [
-                                    $refs.slide2.querySelector('p'),
-                                    {
-                                        opacity: [0, 1],
-                                        x: [-10, 0],
-                                    },
-                                    {
-                                        duration: 0.7,
-                                        ease: motion.circOut,
-                                        at: '-0.5',
-                                    },
-                                ],
-                                [
-                                    $refs.slide2.querySelector('[x-ref=box]'),
-                                    {
-                                        opacity: [0, 1],
-                                        scale: [0, 1],
-                                    },
-                                    {
-                                        duration: 0.8,
-                                        ease: motion.backOut,
-                                        at: '-0.8',
-                                    },
-                                ],
-                                [
-                                    $refs.slide2.querySelector('[x-ref=terminal]'),
-                                    {
-                                        opacity: [0, 1],
-                                        x: [-10, 0],
-                                    },
-                                    {
-                                        duration: 0.7,
-                                        ease: motion.circOut,
-                                        at: '-0.7',
-                                    },
-                                ],
-                                [
-                                    $refs.bashline1,
-                                    { clipPath: ['inset(0 100% 0 0)', 'inset(0 0% 0 0)'] },
-                                    {
-                                        duration: 1.5,
-                                        ease: 'steps(16)',
-                                        at: '-0.3',
-                                    },
-                                ],
-                                [
-                                    $refs.bashline2,
-                                    { clipPath: ['inset(0 100% 0 0)', 'inset(0 0% 0 0)'] },
-                                    {
-                                        duration: 1.8,
-                                        ease: 'steps(31)',
-                                        at: '-0.8',
-                                    },
-                                ],
-                                {{-- Slide 3 --}}
-                                [
-                                    $refs.slide3.querySelector('h3'),
-                                    {
-                                        opacity: [0, 1],
-                                        x: [-10, 0],
-                                    },
-                                    {
-                                        duration: 0.7,
-                                        ease: motion.circOut,
-                                        at: 0.35,
-                                    },
-                                ],
-                                [
-                                    $refs.slide3.querySelector('p'),
-                                    {
-                                        opacity: [0, 1],
-                                        x: [-10, 0],
-                                    },
-                                    {
-                                        duration: 0.7,
-                                        ease: motion.circOut,
-                                        at: '-0.5',
-                                    },
-                                ],
-                                [
-                                    $refs.slide3.querySelector('[x-ref=box]'),
-                                    {
-                                        opacity: [0, 1],
-                                        scale: [0, 1],
-                                    },
-                                    {
-                                        duration: 0.8,
-                                        ease: motion.backOut,
-                                        at: '-0.8',
-                                    },
-                                ],
-                            ])
-                        })
-                    }
-                "
-            class="flex flex-wrap items-center justify-center gap-x-10 gap-y-5 pt-7"
-            aria-label="Installation steps"
-        >
-            {{-- Step 1 --}}
-            <div
-                x-ref="slide1"
-                aria-labelledby="step1-heading"
-            >
-                {{-- Step number --}}
-                <h3
-                    id="step1-heading"
-                    class="font-medium opacity-0"
-                >
-                    Step 1
-                </h3>
-                {{-- Step description --}}
-                <p
-                    class="pt-0.5 text-sm text-gray-500 opacity-0 dark:text-gray-400"
-                >
-                    Buy a license.
-                </p>
-                {{-- Box --}}
-                <div
-                    x-ref="box"
-                    class="dark:bg-mirage mt-3 grid h-52 w-72 place-items-center rounded-xl bg-[#f4f1ee] p-5 opacity-0"
-                    aria-label="Purchase confirmation visualization"
-                >
-                    <div class="flex flex-col items-center gap-5 text-center">
-                        {{-- Checkmark --}}
-                        <div
-                            x-ref="checkmark"
-                            class="relative grid size-7 place-items-center rounded-full bg-emerald-400 text-black opacity-0 ring-[9px] ring-emerald-400/20"
-                            aria-hidden="true"
-                        >
-                            <x-icons.checkmark class="size-6" />
-
-                            <div
-                                class="absolute top-1/2 right-1/2 hidden size-24 translate-x-1/2 -translate-y-1/2 rounded-full bg-emerald-400/20 blur-2xl dark:block"
-                                aria-hidden="true"
-                            ></div>
-                        </div>
-                        {{-- Success message --}}
-                        <div class="space-y-1 dark:text-white">
-                            <div
-                                x-ref="success_title"
-                                class="text-sm font-medium opacity-0"
-                            >
-                                Payment successful!
-                            </div>
-                            <div
-                                x-ref="success_subtitle"
-                                class="text-xs opacity-0"
-                            >
-                                You've purchased a license.
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-            {{-- Step 2 --}}
-            <div
-                x-ref="slide2"
-                aria-labelledby="step2-heading"
-            >
-                {{-- Step number --}}
-                <h3
-                    id="step2-heading"
-                    class="font-medium opacity-0"
-                >
-                    Step 2
-                </h3>
-                {{-- Step description --}}
-                <p
-                    class="pt-0.5 text-sm text-gray-500 opacity-0 dark:text-gray-400"
-                >
-                    Install the private Composer package.
-                </p>
-                {{-- Box --}}
-                <div
-                    x-ref="box"
-                    class="relative isolate z-0 mt-3 grid h-52 w-72 place-items-center overflow-hidden rounded-xl opacity-0"
-                    aria-label="Terminal command example"
-                >
-                    {{-- Terminal --}}
-                    <div
-                        x-ref="terminal"
-                        class="-mr-12 -mb-12 h-52 w-72 overflow-hidden rounded-xl bg-white opacity-0 dark:bg-gray-900"
-                    >
-                        <div
-                            class="flex items-center gap-1 bg-gray-100 px-3 py-3.5 dark:bg-gray-800"
-                        >
-                            <div
-                                class="size-1.5 rounded-full bg-rose-400"
-                                aria-hidden="true"
-                            ></div>
-                            <div
-                                class="size-1.5 rounded-full bg-yellow-400"
-                                aria-hidden="true"
-                            ></div>
-                            <div
-                                class="size-1.5 rounded-full bg-green-400"
-                                aria-hidden="true"
-                            ></div>
-                        </div>
-                        <div class="space-y-1 p-4 text-xs">
-                            <div
-                                x-ref="bashline1"
-                                class="text-gray-500"
-                                aria-label="Terminal directory path"
-                            >
-                                ~/native-php-app
-                            </div>
-                            <div
-                                x-ref="bashline2"
-                                class="font-medium"
-                                aria-label="Composer install command"
-                            >
-                                composer require nativephp/mobile
-                            </div>
-                        </div>
-                    </div>
-                    {{-- Background image - Decorative --}}
-                    <img
-                        src="{{ Vite::asset('resources/images/mobile/macos_wallpaper.webp') }}"
-                        alt=""
-                        class="absolute inset-0 -z-10 h-full w-full object-cover"
-                        loading="lazy"
-                        aria-hidden="true"
-                    />
-                </div>
-            </div>
-
-            {{-- Step 3 --}}
-            <div
-                x-ref="slide3"
-                aria-labelledby="step3-heading"
-            >
-                {{-- Step number --}}
-                <h3
-                    id="step3-heading"
-                    class="font-medium opacity-0"
-                >
-                    Step 3
-                </h3>
-                {{-- Step description --}}
-                <p
-                    class="pt-0.5 text-sm text-gray-500 opacity-0 dark:text-gray-400"
-                >
-                    Build your app.
-                </p>
-                {{-- Box --}}
-                <div
-                    x-ref="box"
-                    class="relative isolate z-0 mt-3 grid h-52 w-72 place-items-center overflow-hidden rounded-xl opacity-0"
-                    aria-label="Developer using an app built with NativePHP for Mobile"
-                >
-                    {{-- Background image --}}
-                    <img
-                        src="{{ Vite::asset('resources/images/mobile/developer_holding_phone.webp') }}"
-                        alt="Developer holding a phone with NativePHP application"
-                        class="absolute inset-0 -z-10 h-full w-full object-cover"
-                        loading="lazy"
-                    />
-                </div>
-            </div>
-        </div>
     </section>
 
     {{-- Pricing Section --}}
-    <livewire:mobile-pricing :discounted="auth()->user()?->hasActualLicense() ?? false" />
-
-    {{-- Ultra Section --}}
-    <x-ultra-plan />
-
-    {{-- Testimonials Section --}}
-    {{-- <x-testimonials /> --}}
+    <livewire:mobile-pricing />
 
     {{-- FAQ Section --}}
     <section
         class="mt-24"
         aria-labelledby="faq-heading"
     >
-        {{-- Section Heading --}}
         <h2
             id="faq-heading"
             x-init="
@@ -645,7 +87,6 @@ class="text-center text-3xl font-semibold opacity-0"
             Frequently Asked Questions
         </h2>
 
-        {{-- FAQ List --}}
         <div
             x-init="
                 () => {
@@ -668,160 +109,100 @@ class="text-center text-3xl font-semibold opacity-0"
             class="mx-auto flex w-full max-w-2xl flex-col items-center gap-4 pt-10"
             aria-labelledby="faq-heading"
         >
-            <x-faq-card question="Why isn't this open source and free?">
+            <x-faq-card question="What is NativePHP Ultra?">
                 <p>
-                    We want to build an amazing tool and make it sustainable. A
-                    lot of NativePHP is already fully open source. With
-                    NativePHP for Mobile, we need to take a different path to
-                    ensure that the entire project continues to get the support
-                    it deserves.
+                    NativePHP Ultra is a premium subscription that gives you
+                    access to all first-party plugins, discounts on
+                    third-party plugins, the Claude Code Plugin Dev Kit,
+                    discounts on NativePHP courses and apps, Teams
+                    support, and premium support with expedited
+                    turnaround times.
                 </p>
             </x-faq-card>
 
-            <x-faq-card
-                question="Will there ever be a free & open source version?"
-            >
+            <x-faq-card question="Do I need Ultra to use NativePHP?">
                 <p>
-                    Yes! Once we've hit sustainability and can afford to
-                    continue investing in this project indirectly, then a
-                    version of it will be fully open source and made available
-                    for free.
+                    No! NativePHP for Mobile is completely free. Ultra is
+                    an optional premium subscription for developers who
+                    want access to additional tools, plugins, and
+                    priority support.
                 </p>
             </x-faq-card>
 
-            <x-faq-card
-                question="Can I create both iOS and Android apps with one license?"
-            >
+            <x-faq-card question="What first-party plugins are included?">
                 <p>
-                    Yes, a single license will let you build apps for both iOS
-                    and Android.
+                    All first-party NativePHP plugins are included with
+                    your Ultra subscription at no additional cost. As we
+                    release new first-party plugins, they will be
+                    automatically available to you.
                 </p>
             </x-faq-card>
 
-            <x-faq-card
-                question="What does 'build unlimited apps, release X production apps' mean?"
-            >
-                <p>
-                    Every NativePHP for Mobile license entitles you to
-                    <i>release</i>
-                    a certain number of applications. A 'released' app is when
-                    it's published or distributed (typically through an app
-                    store).
-                </p>
-                <br />
+            <x-faq-card question="What is the Claude Code Plugin Dev Kit?">
                 <p>
-                    However, you are welcome to
-                    <i>build</i>
-                    (develop), as many apps as you want. If no one else besides
-                    you and other license holders have access to your app, then
-                    it doesn't count towards your quota of 'released' apps.
+                    The Claude Code Plugin Dev Kit is a set of tools and
+                    resources that help you build NativePHP plugins using
+                    Claude Code. It's available for free to Ultra
+                    subscribers.
                 </p>
             </x-faq-card>
 
-            <x-faq-card question="What is a 'developer seat'?">
-                <p>
-                    A 'developer seat' represents an individual developer that
-                    can build apps under that license plan.
-                </p>
-                <br />
-                <p>
-                    For example, on the Pro plan, the license holder can create
-                    up to 10 unique license keys that can be assigned to
-                    individual developers, one key per developer.
-                </p>
-                <br />
+            <x-faq-card question="What discounts do I get on courses and apps?">
                 <p>
-                    This allows the license holder to control who has the
-                    ability to use their license for building apps. You can add
-                    or remove developers and each will get their own unique
-                    license key. If a developer leaves your team, you can revoke
-                    their license key to prevent abuse.
+                    Ultra subscribers get discounts on NativePHP courses
+                    and apps. As we release new educational content and
+                    tools, you'll automatically be eligible for
+                    subscriber pricing.
                 </p>
             </x-faq-card>
 
-            <x-faq-card question="What does 'repo access' mean?">
+            <x-faq-card question="How does Teams support work?">
                 <p>
-                    You will get direct access to our GitHub repository for NativePHP for Mobile. This will allow you
-                    to raise issues directly with the team, which are prioritized higher than issues we see on Discord.
+                    Ultra includes Teams support, which lets you invite
+                    other users into your team so they can share your
+                    plugins and other Ultra benefits. As the account
+                    owner, you can manage your team members and remove
+                    access at any time.
                 </p>
-                <p class="mt-4">
-                    It also means you can try out features that are still in development before they're generally
-                    available and help us to shape and refine them for release.
-                </p>
-            </x-faq-card>
-
-            <x-faq-card
-                question="Is it possible to purchase additional developer seats or released apps?"
-            >
-                <p>You can purchase more Pro licenses as needed.</p>
             </x-faq-card>
 
-            <x-faq-card question="What was the EAP and when did it end?">
+            <x-faq-card question="Can I purchase additional team seats?">
                 <p>
-                    The Early Access Program (EAP) provided initial access to
-                    the NativePHP for Mobile platform for early adopters at
-                    reduced pricing while we worked on releasing v1 of the
-                    technology. The EAP started in February and ended in May
-                    2025.
+                    Ultra includes 10 team seats. If you need more, extra
+                    seats can be purchased at $5/seat/month or $4/seat/year
+                    from your team settings page.
                 </p>
             </x-faq-card>
 
-            <x-faq-card question="Which price will my license renew at?">
+            <x-faq-card question="What does premium support include?">
                 <p>
-                    Your license will renew at the price you originally paid, as
-                    long as you renew before it expires. If you renew after it
-                    expires, then you will have to pay the prices available at
-                    that time.
+                    Premium support gives you expedited turnaround on
+                    support issues. When you need help, your requests are
+                    prioritized so you can get back to building faster.
                 </p>
             </x-faq-card>
 
-            <x-faq-card
-                question="Can I still build apps if I choose not to renew my license?"
-            >
+            <x-faq-card question="Can I switch between monthly and annual billing?">
                 <p>
-                    Yes. Renewing your license entitles you to receive the
-                    latest package updates but isn't required to build and
-                    release apps.
+                    You can manage your billing via the Stripe billing
+                    portal. If you'd like to switch between monthly and
+                    annual, you can cancel your current subscription and
+                    start a new one on the billing interval you prefer.
                 </p>
             </x-faq-card>
 
-            <x-faq-card question="Can I upgrade or downgrade my license later?">
-                <p>That's not currently possible.</p>
-            </x-faq-card>
-
-            <x-faq-card question="Will my apps built with NativePHP be secure?">
-                <p>
-                    Definitely. NativePHP for Mobile apps are just like other
-                    iOS and Android apps - they're as secure as you make them.
-                </p>
-            </x-faq-card>
-            {{-- <x-faq-card question="Can I try NativePHP before purchasing?"> --}}
-            {{-- <p> --}}
-            {{-- </p> --}}
-            {{-- </x-faq-card> --}}
-            <x-faq-card question="Can I use NativePHP for commercial projects?">
+            <x-faq-card question="Can I cancel my subscription?">
                 <p>
-                    Absolutely! You can use NativePHP for any kind of project,
-                    including commercial ones. We can't wait to see what you
-                    build!
+                    Yes, you can cancel at any time. You'll continue to
+                    have access to Ultra benefits until the end of your
+                    current billing period.
                 </p>
             </x-faq-card>
 
             <x-faq-card question="Can I get an invoice?">
                 <p>
-                    If you purchased after May 6, 2025, you should get an
-                    invoice with your receipt via email.
-                </p>
-                <p class="mt-4">
-                    For purchases made before this, you simply need to
-                    <a
-                        href="https://zenvoice.io/p/67a61665e7a3400c73fb75af"
-                        onclick="event.stopPropagation()"
-                        class="inline-block underline hover:text-violet-400"
-                    >
-                        follow the instructions here
-                    </a>
-                    to generate your invoice.
+                    Yes, invoices are sent automatically with your receipt
+                    via email after each payment.
                 </p>
             </x-faq-card>
 
diff --git a/routes/web.php b/routes/web.php
index 0cbb98e8..2226d573 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -20,6 +20,8 @@
 use App\Http\Controllers\ShowBlogController;
 use App\Http\Controllers\ShowcaseController;
 use App\Http\Controllers\ShowDocumentationController;
+use App\Http\Controllers\TeamController;
+use App\Http\Controllers\TeamUserController;
 use App\Livewire\ClaimDonationLicense;
 use App\Livewire\Customer\Dashboard;
 use App\Livewire\Customer\Developer\Onboarding;
@@ -81,7 +83,7 @@
 Route::get('opencollective/claim', ClaimDonationLicense::class)->name('opencollective.claim');
 
 Route::view('/', 'welcome')->name('welcome');
-Route::redirect('pricing', 'blog/nativephp-for-mobile-is-now-free')->name('pricing');
+Route::view('ultra', 'pricing')->name('pricing');
 Route::view('alt-pricing', 'alt-pricing')->name('alt-pricing')->middleware('signed');
 Route::get('course', function () {
     $user = auth()->user();
@@ -262,10 +264,8 @@
 
 Route::get('order/{checkoutSessionId}', OrderSuccess::class)->name('order.success');
 
-// License renewal routes
+// License renewal routes (public success page)
 Route::get('license/{license:key}/renewal/success', LicenseRenewalSuccess::class)->name('license.renewal.success');
-Route::get('license/{license}/renewal', [LicenseRenewalController::class, 'show'])->name('license.renewal');
-Route::post('license/{license}/renewal/checkout', [LicenseRenewalController::class, 'createCheckoutSession'])->name('license.renewal.checkout');
 
 // Customer authentication routes
 Route::middleware(['guest'])->group(function (): void {
@@ -317,12 +317,21 @@
     return response('Goodbye');
 })->name('callback');
 
+// Team invitation acceptance (public route - no auth required)
+Route::get('team/invitation/{token}', [TeamUserController::class, 'accept'])->name('team.invitation.accept');
+
 // Dashboard route
 Route::middleware(['auth', EnsureFeaturesAreActive::using(ShowAuthButtons::class)])->group(function (): void {
     Route::livewire('dashboard', Dashboard::class)->name('dashboard');
 });
 
 // Customer license management routes
+Route::middleware(['auth', EnsureFeaturesAreActive::using(ShowAuthButtons::class)])->prefix('dashboard')->group(function (): void {
+    // License renewal routes (no customer. prefix to preserve route names)
+    Route::get('license/{license}/renewal', [LicenseRenewalController::class, 'show'])->name('license.renewal');
+    Route::post('license/{license}/renewal/checkout', [LicenseRenewalController::class, 'createCheckoutSession'])->name('license.renewal.checkout');
+});
+
 Route::middleware(['auth', EnsureFeaturesAreActive::using(ShowAuthButtons::class)])->prefix('dashboard')->name('customer.')->group(function (): void {
     // Settings page
     Route::livewire('settings', Settings::class)->name('settings');
@@ -366,6 +375,14 @@
         return $user->redirectToBillingPortal(route('dashboard'));
     })->name('billing-portal');
 
+    // Team management routes
+    Route::get('team', [TeamController::class, 'index'])->name('team.index');
+    Route::post('team', [TeamController::class, 'store'])->name('team.store');
+    Route::patch('team', [TeamController::class, 'update'])->name('team.update');
+    Route::post('team/invite', [TeamUserController::class, 'invite'])->name('team.invite');
+    Route::delete('team/users/{teamUser}', [TeamUserController::class, 'remove'])->name('team.users.remove');
+    Route::post('team/users/{teamUser}/resend', [TeamUserController::class, 'resend'])->name('team.users.resend');
+
     // Sub-license management routes
     Route::post('licenses/{licenseKey}/sub-licenses', [CustomerSubLicenseController::class, 'store'])->name('licenses.sub-licenses.store');
     Route::patch('licenses/{licenseKey}/sub-licenses/{subLicense}', [CustomerSubLicenseController::class, 'update'])->name('licenses.sub-licenses.update');
diff --git a/tests/Feature/CustomerPluginReviewChecksTest.php b/tests/Feature/CustomerPluginReviewChecksTest.php
index 9475e718..35162c86 100644
--- a/tests/Feature/CustomerPluginReviewChecksTest.php
+++ b/tests/Feature/CustomerPluginReviewChecksTest.php
@@ -23,6 +23,7 @@ public function submitting_a_plugin_runs_review_checks(): void
 
         $user = User::factory()->create([
             'github_id' => '12345',
+            'github_token' => encrypt('fake-token'),
         ]);
         DeveloperAccount::factory()->withAcceptedTerms()->create([
             'user_id' => $user->id,
@@ -45,7 +46,7 @@ public function submitting_a_plugin_runs_review_checks(): void
                 'content' => base64_encode("# Test Plugin\n\nSupport: dev@testplugin.io"),
                 'encoding' => 'base64',
             ]),
-            "{$base}/contents/composer.json" => Http::response([
+            "{$base}/contents/composer.json*" => Http::response([
                 'content' => base64_encode($composerJson),
                 'encoding' => 'base64',
             ]),
@@ -55,6 +56,9 @@ public function submitting_a_plugin_runs_review_checks(): void
             "{$base}/tags*" => Http::response([]),
             "https://raw.githubusercontent.com/{$repoSlug}/*" => Http::response('', 404),
 
+            // Webhook creation
+            "{$base}/hooks" => Http::response(['id' => 1], 201),
+
             // ReviewPluginRepository calls
             $base => Http::response(['default_branch' => 'main']),
             "{$base}/git/trees/main*" => Http::response([
@@ -103,6 +107,7 @@ public function plugin_submitted_email_includes_failing_checks(): void
 
         $user = User::factory()->create([
             'github_id' => '12345',
+            'github_token' => encrypt('fake-token'),
         ]);
         DeveloperAccount::factory()->withAcceptedTerms()->create([
             'user_id' => $user->id,
@@ -121,7 +126,7 @@ public function plugin_submitted_email_includes_failing_checks(): void
                 'content' => base64_encode('# Bare Plugin'),
                 'encoding' => 'base64',
             ]),
-            "{$base}/contents/composer.json" => Http::response([
+            "{$base}/contents/composer.json*" => Http::response([
                 'content' => base64_encode($composerJson),
                 'encoding' => 'base64',
             ]),
@@ -131,6 +136,9 @@ public function plugin_submitted_email_includes_failing_checks(): void
             "{$base}/tags*" => Http::response([]),
             "https://raw.githubusercontent.com/{$repoSlug}/*" => Http::response('', 404),
 
+            // Webhook creation
+            "{$base}/hooks" => Http::response(['id' => 1], 201),
+
             $base => Http::response(['default_branch' => 'main']),
             "{$base}/git/trees/main*" => Http::response([
                 'tree' => [
diff --git a/tests/Feature/CustomerSubLicenseManagementTest.php b/tests/Feature/CustomerSubLicenseManagementTest.php
index 9adfc087..5cf01958 100644
--- a/tests/Feature/CustomerSubLicenseManagementTest.php
+++ b/tests/Feature/CustomerSubLicenseManagementTest.php
@@ -4,6 +4,7 @@
 
 use App\Features\ShowAuthButtons;
 use App\Jobs\CreateAnystackSubLicenseJob;
+use App\Jobs\UpdateAnystackContactAssociationJob;
 use App\Livewire\SubLicenseManager;
 use App\Models\License;
 use App\Models\SubLicense;
@@ -355,28 +356,64 @@ public function test_validation_for_sub_license_name(): void
         $response->assertSessionHasErrors(['name']);
     }
 
-    public function test_livewire_component_starts_polling_when_create_key_button_clicked(): void
+    public function test_livewire_create_sub_license_dispatches_job_and_starts_polling(): void
     {
+        Queue::fake();
+
         $user = User::factory()->create();
         $license = License::factory()->create([
             'user_id' => $user->id,
             'policy_name' => 'pro',
+            'is_suspended' => false,
+            'expires_at' => now()->addDays(30),
+            'anystack_id' => fake()->uuid(),
         ]);
 
         $this->actingAs($user);
 
         Livewire::test(SubLicenseManager::class, ['license' => $license])
             ->assertSet('isPolling', false)
-            ->call('startPolling')
-            ->assertSet('isPolling', true);
+            ->call('openCreateModal')
+            ->set('createName', 'Dev Team')
+            ->set('createAssignedEmail', 'dev@example.com')
+            ->call('createSubLicense')
+            ->assertSet('isPolling', true)
+            ->assertSet('createName', '')
+            ->assertSet('createAssignedEmail', '');
+
+        Queue::assertPushed(CreateAnystackSubLicenseJob::class);
+    }
+
+    public function test_livewire_create_sub_license_validates_email(): void
+    {
+        $user = User::factory()->create();
+        $license = License::factory()->create([
+            'user_id' => $user->id,
+            'policy_name' => 'pro',
+            'is_suspended' => false,
+            'expires_at' => now()->addDays(30),
+        ]);
+
+        $this->actingAs($user);
+
+        Livewire::test(SubLicenseManager::class, ['license' => $license])
+            ->call('openCreateModal')
+            ->set('createAssignedEmail', 'not-an-email')
+            ->call('createSubLicense')
+            ->assertHasErrors(['createAssignedEmail']);
     }
 
     public function test_livewire_component_stops_polling_when_new_sublicense_appears(): void
     {
+        Queue::fake();
+
         $user = User::factory()->create();
         $license = License::factory()->create([
             'user_id' => $user->id,
             'policy_name' => 'pro',
+            'is_suspended' => false,
+            'expires_at' => now()->addDays(30),
+            'anystack_id' => fake()->uuid(),
         ]);
 
         $this->actingAs($user);
@@ -384,10 +421,12 @@ public function test_livewire_component_stops_polling_when_new_sublicense_appear
         $component = Livewire::test(SubLicenseManager::class, ['license' => $license])
             ->assertSet('isPolling', false)
             ->assertSet('initialSubLicenseCount', 0)
-            ->call('startPolling')
+            ->call('openCreateModal')
+            ->set('createName', 'Test')
+            ->call('createSubLicense')
             ->assertSet('isPolling', true);
 
-        // Create a new sublicense
+        // Create a new sublicense (simulating the async job completing)
         SubLicense::factory()->create([
             'parent_license_id' => $license->id,
         ]);
@@ -398,6 +437,61 @@ public function test_livewire_component_stops_polling_when_new_sublicense_appear
             ->assertSet('initialSubLicenseCount', 1);
     }
 
+    public function test_livewire_edit_sub_license_updates_name_and_email(): void
+    {
+        Queue::fake();
+
+        $user = User::factory()->create();
+        $license = License::factory()->create([
+            'user_id' => $user->id,
+            'policy_name' => 'pro',
+        ]);
+        $subLicense = SubLicense::factory()->create([
+            'parent_license_id' => $license->id,
+            'name' => 'Old Name',
+            'assigned_email' => null,
+        ]);
+
+        $this->actingAs($user);
+
+        Livewire::test(SubLicenseManager::class, ['license' => $license])
+            ->call('editSubLicense', $subLicense->id)
+            ->assertSet('editingSubLicenseId', $subLicense->id)
+            ->assertSet('editName', 'Old Name')
+            ->assertSet('editAssignedEmail', '')
+            ->set('editName', 'New Name')
+            ->set('editAssignedEmail', 'team@example.com')
+            ->call('updateSubLicense');
+
+        $this->assertDatabaseHas('sub_licenses', [
+            'id' => $subLicense->id,
+            'name' => 'New Name',
+            'assigned_email' => 'team@example.com',
+        ]);
+
+        Queue::assertPushed(UpdateAnystackContactAssociationJob::class);
+    }
+
+    public function test_livewire_edit_sub_license_validates_email(): void
+    {
+        $user = User::factory()->create();
+        $license = License::factory()->create([
+            'user_id' => $user->id,
+            'policy_name' => 'pro',
+        ]);
+        $subLicense = SubLicense::factory()->create([
+            'parent_license_id' => $license->id,
+        ]);
+
+        $this->actingAs($user);
+
+        Livewire::test(SubLicenseManager::class, ['license' => $license])
+            ->call('editSubLicense', $subLicense->id)
+            ->set('editAssignedEmail', 'not-an-email')
+            ->call('updateSubLicense')
+            ->assertHasErrors(['editAssignedEmail']);
+    }
+
     public function test_livewire_component_displays_sublicenses(): void
     {
         $user = User::factory()->create();
diff --git a/tests/Feature/DashboardLayoutTest.php b/tests/Feature/DashboardLayoutTest.php
index a58db5c5..7f5c65f0 100644
--- a/tests/Feature/DashboardLayoutTest.php
+++ b/tests/Feature/DashboardLayoutTest.php
@@ -2,14 +2,42 @@
 
 namespace Tests\Feature;
 
+use App\Features\ShowAuthButtons;
+use App\Livewire\Customer\Dashboard;
+use App\Models\Team;
+use App\Models\TeamUser;
 use App\Models\User;
 use Illuminate\Foundation\Testing\RefreshDatabase;
+use Laravel\Cashier\Subscription;
+use Laravel\Pennant\Feature;
+use Livewire\Livewire;
 use Tests\TestCase;
 
 class DashboardLayoutTest extends TestCase
 {
     use RefreshDatabase;
 
+    private const MAX_PRICE_ID = 'price_test_max_yearly';
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        Feature::define(ShowAuthButtons::class, true);
+
+        config(['subscriptions.plans.max.stripe_price_id' => self::MAX_PRICE_ID]);
+    }
+
+    private function createUltraUser(): User
+    {
+        $user = User::factory()->create();
+        Subscription::factory()->for($user)->active()->create([
+            'stripe_price' => self::MAX_PRICE_ID,
+        ]);
+
+        return $user;
+    }
+
     public function test_user_name_with_apostrophe_is_not_double_escaped_in_dashboard(): void
     {
         $user = User::factory()->create([
@@ -22,4 +50,97 @@ public function test_user_name_with_apostrophe_is_not_double_escaped_in_dashboar
         $response->assertDontSee('D&amp;#039;Hooghe', false);
         $response->assertSee("Timmy D'Hooghe");
     }
+
+    // ========================================
+    // Sidebar Team Item Tests
+    // ========================================
+
+    public function test_sidebar_shows_create_team_for_ultra_subscriber_without_team(): void
+    {
+        $user = $this->createUltraUser();
+
+        $response = $this->withoutVite()->actingAs($user)->get('/dashboard');
+
+        $response->assertOk();
+        $response->assertSee('Create Team');
+    }
+
+    public function test_sidebar_shows_manage_for_ultra_subscriber_with_team(): void
+    {
+        $user = $this->createUltraUser();
+        Team::factory()->create(['user_id' => $user->id]);
+
+        $response = $this->withoutVite()->actingAs($user)->get('/dashboard');
+
+        $response->assertOk();
+        $response->assertSee('Manage');
+    }
+
+    public function test_sidebar_shows_team_item_for_ultra_team_member(): void
+    {
+        $owner = $this->createUltraUser();
+        $team = Team::factory()->create(['user_id' => $owner->id]);
+
+        $member = User::factory()->create();
+        TeamUser::factory()->active()->create([
+            'team_id' => $team->id,
+            'user_id' => $member->id,
+            'email' => $member->email,
+        ]);
+
+        $response = $this->withoutVite()->actingAs($member)->get('/dashboard');
+
+        $response->assertOk();
+        $response->assertSee('Create Team');
+    }
+
+    public function test_sidebar_hides_team_item_for_non_ultra_user(): void
+    {
+        $user = User::factory()->create();
+
+        $response = $this->withoutVite()->actingAs($user)->get('/dashboard');
+
+        $response->assertOk();
+        $response->assertDontSee('Create Team');
+    }
+
+    // ========================================
+    // Dashboard Team Card Tests
+    // ========================================
+
+    public function test_dashboard_shows_team_card_for_ultra_subscriber_with_team(): void
+    {
+        $user = $this->createUltraUser();
+        $team = Team::factory()->create(['user_id' => $user->id, 'name' => 'My Ultra Team']);
+        TeamUser::factory()->active()->count(3)->create(['team_id' => $team->id]);
+
+        Livewire::actingAs($user)
+            ->test(Dashboard::class)
+            ->assertOk()
+            ->assertSee('My Ultra Team')
+            ->assertSee('3 active members')
+            ->assertSee('Manage members');
+    }
+
+    public function test_dashboard_shows_create_team_cta_for_ultra_subscriber_without_team(): void
+    {
+        $user = $this->createUltraUser();
+
+        Livewire::actingAs($user)
+            ->test(Dashboard::class)
+            ->assertOk()
+            ->assertSee('No team yet')
+            ->assertSee('Create a team');
+    }
+
+    public function test_dashboard_hides_team_card_for_non_ultra_user(): void
+    {
+        $user = User::factory()->create();
+
+        Livewire::actingAs($user)
+            ->test(Dashboard::class)
+            ->assertOk()
+            ->assertDontSee('No team yet')
+            ->assertDontSee('Create a team');
+    }
 }
diff --git a/tests/Feature/LicenseRenewalTest.php b/tests/Feature/LicenseRenewalTest.php
new file mode 100644
index 00000000..d34ed80a
--- /dev/null
+++ b/tests/Feature/LicenseRenewalTest.php
@@ -0,0 +1,195 @@
+<?php
+
+namespace Tests\Feature;
+
+use App\Features\ShowAuthButtons;
+use App\Models\License;
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Laravel\Pennant\Feature;
+use Tests\TestCase;
+
+class LicenseRenewalTest extends TestCase
+{
+    use RefreshDatabase;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        Feature::define(ShowAuthButtons::class, true);
+
+        config([
+            'subscriptions.plans.max.stripe_price_id_eap' => 'price_test_max_eap',
+            'subscriptions.plans.max.stripe_price_id_monthly' => 'price_test_max_monthly',
+        ]);
+    }
+
+    private function createLegacyLicense(?User $user = null): License
+    {
+        return License::factory()
+            ->for($user ?? User::factory()->create())
+            ->withoutSubscriptionItem()
+            ->active()
+            ->max()
+            ->create();
+    }
+
+    public function test_renewal_page_requires_authentication(): void
+    {
+        $license = $this->createLegacyLicense();
+
+        $response = $this->withoutVite()->get(route('license.renewal', $license->key));
+
+        $response->assertRedirect(route('customer.login'));
+    }
+
+    public function test_renewal_page_shows_upgrade_to_ultra_heading(): void
+    {
+        $license = $this->createLegacyLicense();
+
+        $response = $this->withoutVite()
+            ->actingAs($license->user)
+            ->get(route('license.renewal', $license->key));
+
+        $response->assertStatus(200);
+        $response->assertSee('Upgrade to Ultra');
+        $response->assertSee('Early Access Pricing');
+    }
+
+    public function test_renewal_page_shows_yearly_and_monthly_options(): void
+    {
+        $license = $this->createLegacyLicense();
+
+        $response = $this->withoutVite()
+            ->actingAs($license->user)
+            ->get(route('license.renewal', $license->key));
+
+        $response->assertStatus(200);
+        $response->assertSee('$250');
+        $response->assertSee('/year');
+        $response->assertSee('$35');
+        $response->assertSee('/month');
+    }
+
+    public function test_renewal_page_does_not_show_license_details(): void
+    {
+        $license = $this->createLegacyLicense();
+
+        $response = $this->withoutVite()
+            ->actingAs($license->user)
+            ->get(route('license.renewal', $license->key));
+
+        $response->assertStatus(200);
+        $response->assertDontSee('License Key');
+        $response->assertDontSee('Current Expiry');
+    }
+
+    public function test_renewal_page_does_not_show_what_happens_section(): void
+    {
+        $license = $this->createLegacyLicense();
+
+        $response = $this->withoutVite()
+            ->actingAs($license->user)
+            ->get(route('license.renewal', $license->key));
+
+        $response->assertStatus(200);
+        $response->assertDontSee('What happens when you renew');
+    }
+
+    public function test_renewal_page_does_not_show_same_great_rates(): void
+    {
+        $license = $this->createLegacyLicense();
+
+        $response = $this->withoutVite()
+            ->actingAs($license->user)
+            ->get(route('license.renewal', $license->key));
+
+        $response->assertStatus(200);
+        $response->assertDontSee('same great rates');
+    }
+
+    public function test_renewal_page_uses_dashboard_layout(): void
+    {
+        $license = $this->createLegacyLicense();
+
+        $response = $this->withoutVite()
+            ->actingAs($license->user)
+            ->get(route('license.renewal', $license->key));
+
+        $response->assertStatus(200);
+        // Dashboard layout includes sidebar with navigation items
+        $response->assertSee('Manage Subscription');
+    }
+
+    public function test_renewal_page_returns_403_for_other_users_license(): void
+    {
+        $owner = User::factory()->create();
+        $otherUser = User::factory()->create();
+        $license = $this->createLegacyLicense($owner);
+
+        $response = $this->withoutVite()
+            ->actingAs($otherUser)
+            ->get(route('license.renewal', $license->key));
+
+        $response->assertStatus(403);
+    }
+
+    public function test_renewal_page_returns_404_for_non_legacy_license(): void
+    {
+        $user = User::factory()->create();
+        $license = License::factory()
+            ->for($user)
+            ->active()
+            ->max()
+            ->create(); // Has subscription_item_id (not legacy)
+
+        $response = $this->withoutVite()
+            ->actingAs($user)
+            ->get(route('license.renewal', $license->key));
+
+        $response->assertStatus(404);
+    }
+
+    public function test_checkout_requires_billing_period(): void
+    {
+        $license = $this->createLegacyLicense();
+
+        $response = $this->actingAs($license->user)
+            ->post(route('license.renewal.checkout', $license->key));
+
+        $response->assertSessionHasErrors('billing_period');
+    }
+
+    public function test_checkout_rejects_invalid_billing_period(): void
+    {
+        $license = $this->createLegacyLicense();
+
+        $response = $this->actingAs($license->user)
+            ->post(route('license.renewal.checkout', $license->key), [
+                'billing_period' => 'weekly',
+            ]);
+
+        $response->assertSessionHasErrors('billing_period');
+    }
+
+    public function test_renewal_route_is_under_dashboard_prefix(): void
+    {
+        $license = $this->createLegacyLicense();
+
+        $url = route('license.renewal', $license->key);
+
+        $this->assertStringContains('/dashboard/license/', $url);
+    }
+
+    /**
+     * Assert that a string contains a substring.
+     */
+    private function assertStringContains(string $needle, string $haystack): void
+    {
+        $this->assertTrue(
+            str_contains($haystack, $needle),
+            "Failed asserting that '{$haystack}' contains '{$needle}'."
+        );
+    }
+}
diff --git a/tests/Feature/Livewire/Customer/PluginCreateTest.php b/tests/Feature/Livewire/Customer/PluginCreateTest.php
new file mode 100644
index 00000000..c4312731
--- /dev/null
+++ b/tests/Feature/Livewire/Customer/PluginCreateTest.php
@@ -0,0 +1,220 @@
+<?php
+
+namespace Tests\Feature\Livewire\Customer;
+
+use App\Features\ShowAuthButtons;
+use App\Features\ShowPlugins;
+use App\Livewire\Customer\Plugins\Create;
+use App\Models\Plugin;
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\Http;
+use Laravel\Pennant\Feature;
+use Livewire\Livewire;
+use Tests\TestCase;
+
+class PluginCreateTest extends TestCase
+{
+    use RefreshDatabase;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        Feature::define(ShowAuthButtons::class, true);
+        Feature::define(ShowPlugins::class, true);
+    }
+
+    private function createGitHubUser(): User
+    {
+        return User::factory()->create([
+            'github_id' => '12345',
+            'github_username' => 'testuser',
+            'github_token' => encrypt('fake-token'),
+        ]);
+    }
+
+    private function sampleRepos(): array
+    {
+        return [
+            ['id' => 1, 'full_name' => 'testuser/alpha-plugin', 'name' => 'alpha-plugin', 'owner' => 'testuser', 'private' => false],
+            ['id' => 2, 'full_name' => 'testuser/beta-plugin', 'name' => 'beta-plugin', 'owner' => 'testuser', 'private' => true],
+            ['id' => 3, 'full_name' => 'my-org/org-repo', 'name' => 'org-repo', 'owner' => 'my-org', 'private' => false],
+            ['id' => 4, 'full_name' => 'my-org/another-repo', 'name' => 'another-repo', 'owner' => 'my-org', 'private' => false],
+        ];
+    }
+
+    private function fakeComposerJson(string $owner, string $repo, string $packageName): void
+    {
+        $composerJson = base64_encode(json_encode(['name' => $packageName]));
+
+        Http::fake([
+            "api.github.com/repos/{$owner}/{$repo}/contents/composer.json*" => Http::response([
+                'content' => $composerJson,
+            ]),
+            'api.github.com/*' => Http::response([], 404),
+        ]);
+    }
+
+    // ========================================
+    // Owner/Repository Selection Tests
+    // ========================================
+
+    public function test_owners_are_extracted_from_repositories(): void
+    {
+        $user = $this->createGitHubUser();
+
+        $component = Livewire::actingAs($user)->test(Create::class)
+            ->set('repositories', $this->sampleRepos())
+            ->set('reposLoaded', true);
+
+        $owners = $component->get('owners');
+
+        $this->assertCount(2, $owners);
+        $this->assertContains('testuser', $owners);
+        $this->assertContains('my-org', $owners);
+    }
+
+    public function test_selecting_owner_filters_repositories(): void
+    {
+        $user = $this->createGitHubUser();
+
+        $component = Livewire::actingAs($user)->test(Create::class)
+            ->set('repositories', $this->sampleRepos())
+            ->set('reposLoaded', true)
+            ->set('selectedOwner', 'my-org');
+
+        $ownerRepos = $component->get('ownerRepositories');
+
+        $this->assertCount(2, $ownerRepos);
+        $this->assertEquals('another-repo', $ownerRepos[0]['name']);
+        $this->assertEquals('org-repo', $ownerRepos[1]['name']);
+    }
+
+    public function test_changing_owner_resets_repository_selection(): void
+    {
+        $user = $this->createGitHubUser();
+
+        Livewire::actingAs($user)->test(Create::class)
+            ->set('repositories', $this->sampleRepos())
+            ->set('reposLoaded', true)
+            ->set('selectedOwner', 'testuser')
+            ->set('repository', 'testuser/alpha-plugin')
+            ->set('selectedOwner', 'my-org')
+            ->assertSet('repository', '');
+    }
+
+    public function test_owner_repositories_sorted_alphabetically(): void
+    {
+        $user = $this->createGitHubUser();
+
+        $component = Livewire::actingAs($user)->test(Create::class)
+            ->set('repositories', $this->sampleRepos())
+            ->set('reposLoaded', true)
+            ->set('selectedOwner', 'testuser');
+
+        $ownerRepos = $component->get('ownerRepositories');
+
+        $this->assertEquals('alpha-plugin', $ownerRepos[0]['name']);
+        $this->assertEquals('beta-plugin', $ownerRepos[1]['name']);
+    }
+
+    public function test_no_owner_selected_returns_empty_repositories(): void
+    {
+        $user = $this->createGitHubUser();
+
+        $component = Livewire::actingAs($user)->test(Create::class)
+            ->set('repositories', $this->sampleRepos())
+            ->set('reposLoaded', true);
+
+        $ownerRepos = $component->get('ownerRepositories');
+
+        $this->assertEmpty($ownerRepos);
+    }
+
+    // ========================================
+    // Namespace Validation Tests
+    // ========================================
+
+    public function test_submission_blocked_when_namespace_claimed_by_another_user(): void
+    {
+        $existingUser = User::factory()->create();
+        Plugin::factory()->for($existingUser)->create(['name' => 'acme/existing-plugin']);
+
+        $user = $this->createGitHubUser();
+
+        $this->fakeComposerJson('acme', 'new-plugin', 'acme/new-plugin');
+
+        Livewire::actingAs($user)->test(Create::class)
+            ->set('repository', 'acme/new-plugin')
+            ->set('pluginType', 'free')
+            ->call('submitPlugin')
+            ->assertNoRedirect();
+
+        $this->assertDatabaseMissing('plugins', [
+            'repository_url' => 'https://github.com/acme/new-plugin',
+        ]);
+    }
+
+    public function test_submission_blocked_for_reserved_namespace(): void
+    {
+        $user = $this->createGitHubUser();
+
+        $this->fakeComposerJson('nativephp', 'my-plugin', 'nativephp/my-plugin');
+
+        Livewire::actingAs($user)->test(Create::class)
+            ->set('repository', 'nativephp/my-plugin')
+            ->set('pluginType', 'free')
+            ->call('submitPlugin')
+            ->assertNoRedirect();
+
+        $this->assertDatabaseMissing('plugins', [
+            'repository_url' => 'https://github.com/nativephp/my-plugin',
+        ]);
+    }
+
+    public function test_submission_allowed_for_own_namespace(): void
+    {
+        $user = $this->createGitHubUser();
+        Plugin::factory()->for($user)->create(['name' => 'myvendor/first-plugin']);
+
+        $composerJson = base64_encode(json_encode(['name' => 'myvendor/second-plugin']));
+
+        Http::fake([
+            'api.github.com/repos/myvendor/second-plugin/contents/composer.json*' => Http::response([
+                'content' => $composerJson,
+            ]),
+            'api.github.com/repos/myvendor/second-plugin/hooks' => Http::response(['id' => 1]),
+            'api.github.com/*' => Http::response([], 404),
+        ]);
+
+        Livewire::actingAs($user)->test(Create::class)
+            ->set('repository', 'myvendor/second-plugin')
+            ->set('pluginType', 'free')
+            ->call('submitPlugin');
+
+        $this->assertDatabaseHas('plugins', [
+            'repository_url' => 'https://github.com/myvendor/second-plugin',
+            'user_id' => $user->id,
+        ]);
+    }
+
+    public function test_submission_blocked_when_composer_json_missing(): void
+    {
+        $user = $this->createGitHubUser();
+
+        Http::fake([
+            'api.github.com/*' => Http::response([], 404),
+        ]);
+
+        Livewire::actingAs($user)->test(Create::class)
+            ->set('repository', 'testuser/no-composer')
+            ->set('pluginType', 'free')
+            ->call('submitPlugin')
+            ->assertNoRedirect();
+
+        $this->assertDatabaseMissing('plugins', [
+            'repository_url' => 'https://github.com/testuser/no-composer',
+        ]);
+    }
+}
diff --git a/tests/Feature/Livewire/Customer/SettingsTest.php b/tests/Feature/Livewire/Customer/SettingsTest.php
index 15023e44..77a0b0b7 100644
--- a/tests/Feature/Livewire/Customer/SettingsTest.php
+++ b/tests/Feature/Livewire/Customer/SettingsTest.php
@@ -50,11 +50,22 @@ public function test_settings_component_renders_headings(): void
             ->test(Settings::class)
             ->assertSee('Settings')
             ->assertSee('Name')
+            ->assertSee('Email Address')
             ->assertSee('Password')
             ->assertSee('Delete Account')
             ->assertStatus(200);
     }
 
+    public function test_settings_page_displays_user_email(): void
+    {
+        $user = User::factory()->create(['email' => 'jane@example.com']);
+
+        $response = $this->withoutVite()->actingAs($user)->get('/dashboard/settings');
+
+        $response->assertOk();
+        $response->assertSee('jane@example.com');
+    }
+
     // --- Update Name ---
 
     public function test_user_can_update_name(): void
diff --git a/tests/Feature/MobilePricingTest.php b/tests/Feature/MobilePricingTest.php
index 756ed61b..05abf52e 100644
--- a/tests/Feature/MobilePricingTest.php
+++ b/tests/Feature/MobilePricingTest.php
@@ -6,6 +6,7 @@
 use App\Models\User;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Auth;
+use Laravel\Cashier\Cashier;
 use Livewire\Livewire;
 use PHPUnit\Framework\Attributes\Test;
 use Tests\TestCase;
@@ -14,21 +15,31 @@ class MobilePricingTest extends TestCase
 {
     use RefreshDatabase;
 
+    private const PRO_PRICE_ID = 'price_test_pro_yearly';
+
+    private const MAX_PRICE_ID = 'price_test_max_yearly';
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        config([
+            'subscriptions.plans.pro.stripe_price_id' => self::PRO_PRICE_ID,
+            'subscriptions.plans.max.stripe_price_id' => self::MAX_PRICE_ID,
+        ]);
+    }
+
     #[Test]
-    public function authenticated_users_will_directly_create_checkout_session()
+    public function authenticated_users_without_subscription_see_checkout_button()
     {
         $user = User::factory()->create();
         Auth::login($user);
 
         $component = Livewire::test(MobilePricing::class);
         $component->assertSeeHtml([
-            // 'wire:click="createCheckoutSession(\'mini\')"',
-            'wire:click="createCheckoutSession(\'pro\')"',
             'wire:click="createCheckoutSession(\'max\')"',
         ]);
         $component->assertDontSeeHtml([
-            // '@click="$dispatch(\'open-purchase-modal\', { plan: \'mini\' })"',
-            '@click="$dispatch(\'open-purchase-modal\', { plan: \'pro\' })"',
             '@click="$dispatch(\'open-purchase-modal\', { plan: \'max\' })"',
         ]);
     }
@@ -41,13 +52,9 @@ public function guest_users_see_purchase_modal_component()
         Livewire::test(MobilePricing::class)
             ->assertSeeLivewire('purchase-modal')
             ->assertSeeHtml([
-                // '@click="$dispatch(\'open-purchase-modal\', { plan: \'mini\' })"',
-                '@click="$dispatch(\'open-purchase-modal\', { plan: \'pro\' })"',
                 '@click="$dispatch(\'open-purchase-modal\', { plan: \'max\' })"',
             ])
             ->assertDontSeeHtml([
-                // 'wire:click="createCheckoutSession(\'mini\')"',
-                'wire:click="createCheckoutSession(\'pro\')"',
                 'wire:click="createCheckoutSession(\'max\')"',
             ]);
     }
@@ -68,4 +75,117 @@ public function it_validates_email_before_creating_user()
             ->call('handlePurchaseRequest', ['email' => 'invalid-email'])
             ->assertHasErrors('email');
     }
+
+    #[Test]
+    public function default_interval_is_month()
+    {
+        Livewire::test(MobilePricing::class)
+            ->assertSet('interval', 'month');
+    }
+
+    #[Test]
+    public function interval_can_be_set_to_year()
+    {
+        Livewire::test(MobilePricing::class)
+            ->set('interval', 'year')
+            ->assertSet('interval', 'year');
+    }
+
+    #[Test]
+    public function existing_subscriber_sees_upgrade_button()
+    {
+        $user = User::factory()->create(['stripe_id' => 'cus_'.uniqid()]);
+        Auth::login($user);
+
+        $subscription = Cashier::$subscriptionModel::factory()
+            ->for($user)
+            ->active()
+            ->create(['stripe_price' => self::PRO_PRICE_ID]);
+
+        Cashier::$subscriptionItemModel::factory()
+            ->for($subscription, 'subscription')
+            ->create(['stripe_price' => self::PRO_PRICE_ID]);
+
+        Livewire::test(MobilePricing::class)
+            ->assertSee('Upgrade to Ultra')
+            ->assertDontSeeHtml('wire:click="createCheckoutSession(\'max\')"');
+    }
+
+    #[Test]
+    public function ultra_subscriber_sees_already_on_ultra_message()
+    {
+        $user = User::factory()->create(['stripe_id' => 'cus_'.uniqid()]);
+        Auth::login($user);
+
+        $subscription = Cashier::$subscriptionModel::factory()
+            ->for($user)
+            ->active()
+            ->create([
+                'stripe_price' => self::MAX_PRICE_ID,
+                'is_comped' => false,
+            ]);
+
+        Cashier::$subscriptionItemModel::factory()
+            ->for($subscription, 'subscription')
+            ->create(['stripe_price' => self::MAX_PRICE_ID]);
+
+        Livewire::test(MobilePricing::class)
+            ->assertSee('on Ultra', escape: false)
+            ->assertDontSee('Upgrade to Ultra')
+            ->assertDontSeeHtml('wire:click="createCheckoutSession(\'max\')"');
+    }
+
+    #[Test]
+    public function comped_max_subscriber_sees_upgrade_button()
+    {
+        $user = User::factory()->create(['stripe_id' => 'cus_'.uniqid()]);
+        Auth::login($user);
+
+        $subscription = Cashier::$subscriptionModel::factory()
+            ->for($user)
+            ->active()
+            ->create([
+                'stripe_price' => self::MAX_PRICE_ID,
+                'is_comped' => true,
+            ]);
+
+        Cashier::$subscriptionItemModel::factory()
+            ->for($subscription, 'subscription')
+            ->create(['stripe_price' => self::MAX_PRICE_ID]);
+
+        Livewire::test(MobilePricing::class)
+            ->assertSee('Upgrade to Ultra')
+            ->assertDontSee('on Ultra', escape: false);
+    }
+
+    #[Test]
+    public function upgrade_modal_shows_confirm_button_for_existing_subscriber()
+    {
+        $user = User::factory()->create(['stripe_id' => 'cus_'.uniqid()]);
+        Auth::login($user);
+
+        $subscription = Cashier::$subscriptionModel::factory()
+            ->for($user)
+            ->active()
+            ->create(['stripe_price' => self::PRO_PRICE_ID]);
+
+        Cashier::$subscriptionItemModel::factory()
+            ->for($subscription, 'subscription')
+            ->create(['stripe_price' => self::PRO_PRICE_ID]);
+
+        Livewire::test(MobilePricing::class)
+            ->assertSeeHtml('wire:click="upgradeSubscription"')
+            ->assertSee('Confirm upgrade');
+    }
+
+    #[Test]
+    public function upgrade_modal_not_shown_for_users_without_subscription()
+    {
+        $user = User::factory()->create();
+        Auth::login($user);
+
+        Livewire::test(MobilePricing::class)
+            ->assertDontSeeHtml('wire:click="upgradeSubscription"')
+            ->assertDontSee('Confirm upgrade');
+    }
 }
diff --git a/tests/Feature/MobileRouteTest.php b/tests/Feature/MobileRouteTest.php
index 090438bc..d02166a7 100644
--- a/tests/Feature/MobileRouteTest.php
+++ b/tests/Feature/MobileRouteTest.php
@@ -4,7 +4,6 @@
 
 use App\Features\ShowAuthButtons;
 use Illuminate\Foundation\Testing\RefreshDatabase;
-use Illuminate\Support\Facades\URL;
 use Laravel\Pennant\Feature;
 use PHPUnit\Framework\Attributes\Test;
 use Tests\TestCase;
@@ -17,33 +16,16 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        // Enable the auth feature flag since the pricing page might reference it
         Feature::define(ShowAuthButtons::class, false);
     }
 
     #[Test]
-    public function pricing_route_redirects_to_blog_post()
-    {
-        $this
-            ->get(route('pricing'))
-            ->assertRedirect('blog/nativephp-for-mobile-is-now-free');
-    }
-
-    #[Test]
-    public function alt_pricing_route_does_not_include_stripe_payment_links()
+    public function pricing_route_returns_pricing_page()
     {
         $this
             ->withoutVite()
-            ->get(URL::signedRoute('alt-pricing'))
-            ->assertDontSee('buy.stripe.com');
-    }
-
-    #[Test]
-    public function alt_pricing_route_includes_mobile_pricing_livewire_component()
-    {
-        $this
-            ->withoutVite()
-            ->get(URL::signedRoute('alt-pricing'))
+            ->get(route('pricing'))
+            ->assertOk()
             ->assertSeeLivewire('mobile-pricing');
     }
 }
diff --git a/tests/Feature/PurchaseHistoryTest.php b/tests/Feature/PurchaseHistoryTest.php
index 4a697c1b..a0213a0b 100644
--- a/tests/Feature/PurchaseHistoryTest.php
+++ b/tests/Feature/PurchaseHistoryTest.php
@@ -47,7 +47,6 @@ public function test_purchase_history_shows_product_licenses(): void
 
         $response->assertStatus(200);
         $response->assertSee('Plugin Dev Kit');
-        $response->assertSee('Product');
         $response->assertSee('$49.00');
     }
 
@@ -106,7 +105,7 @@ public function test_purchase_history_shows_empty_state_when_no_purchases(): voi
         $response->assertSee('No purchases yet');
     }
 
-    public function test_product_purchases_show_as_active(): void
+    public function test_product_purchases_show_on_page(): void
     {
         $user = User::factory()->create();
         $product = Product::factory()->create(['name' => 'Plugin Dev Kit']);
@@ -120,6 +119,6 @@ public function test_product_purchases_show_as_active(): void
         $response = $this->actingAs($user)->get('/dashboard/purchase-history');
 
         $response->assertStatus(200);
-        $response->assertSee('Active');
+        $response->assertSee('Plugin Dev Kit');
     }
 }
diff --git a/tests/Feature/SendMaxToUltraAnnouncementTest.php b/tests/Feature/SendMaxToUltraAnnouncementTest.php
new file mode 100644
index 00000000..293fd282
--- /dev/null
+++ b/tests/Feature/SendMaxToUltraAnnouncementTest.php
@@ -0,0 +1,255 @@
+<?php
+
+namespace Tests\Feature;
+
+use App\Enums\Subscription;
+use App\Models\User;
+use App\Notifications\MaxToUltraAnnouncement;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\Notification;
+use Laravel\Cashier\SubscriptionItem;
+use Tests\TestCase;
+
+class SendMaxToUltraAnnouncementTest extends TestCase
+{
+    use RefreshDatabase;
+
+    private const COMPED_ULTRA_PRICE_ID = 'price_test_ultra_comped';
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        config(['subscriptions.plans.max.stripe_price_id_comped' => self::COMPED_ULTRA_PRICE_ID]);
+    }
+
+    private function createPaidMaxSubscription(User $user, ?string $priceId = null): \Laravel\Cashier\Subscription
+    {
+        $user->update(['stripe_id' => 'cus_'.uniqid()]);
+
+        $price = $priceId ?? Subscription::Max->stripePriceId();
+
+        $subscription = \Laravel\Cashier\Subscription::factory()
+            ->for($user)
+            ->active()
+            ->create([
+                'stripe_price' => $price,
+                'is_comped' => false,
+            ]);
+
+        SubscriptionItem::factory()
+            ->for($subscription, 'subscription')
+            ->create([
+                'stripe_price' => $price,
+                'quantity' => 1,
+            ]);
+
+        return $subscription;
+    }
+
+    private function createCompedMaxSubscription(User $user): \Laravel\Cashier\Subscription
+    {
+        $user->update(['stripe_id' => 'cus_'.uniqid()]);
+
+        $subscription = \Laravel\Cashier\Subscription::factory()
+            ->for($user)
+            ->active()
+            ->create([
+                'stripe_price' => Subscription::Max->stripePriceId(),
+                'is_comped' => true,
+            ]);
+
+        SubscriptionItem::factory()
+            ->for($subscription, 'subscription')
+            ->create([
+                'stripe_price' => Subscription::Max->stripePriceId(),
+                'quantity' => 1,
+            ]);
+
+        return $subscription;
+    }
+
+    private function createProSubscription(User $user): \Laravel\Cashier\Subscription
+    {
+        $user->update(['stripe_id' => 'cus_'.uniqid()]);
+
+        $subscription = \Laravel\Cashier\Subscription::factory()
+            ->for($user)
+            ->active()
+            ->create([
+                'stripe_price' => Subscription::Pro->stripePriceId(),
+                'is_comped' => false,
+            ]);
+
+        SubscriptionItem::factory()
+            ->for($subscription, 'subscription')
+            ->create([
+                'stripe_price' => Subscription::Pro->stripePriceId(),
+                'quantity' => 1,
+            ]);
+
+        return $subscription;
+    }
+
+    private function createCompedUltraSubscription(User $user): \Laravel\Cashier\Subscription
+    {
+        $user->update(['stripe_id' => 'cus_'.uniqid()]);
+
+        $subscription = \Laravel\Cashier\Subscription::factory()
+            ->for($user)
+            ->active()
+            ->create([
+                'stripe_price' => self::COMPED_ULTRA_PRICE_ID,
+            ]);
+
+        SubscriptionItem::factory()
+            ->for($subscription, 'subscription')
+            ->create([
+                'stripe_price' => self::COMPED_ULTRA_PRICE_ID,
+                'quantity' => 1,
+            ]);
+
+        return $subscription;
+    }
+
+    public function test_sends_to_paying_max_subscriber(): void
+    {
+        Notification::fake();
+
+        $user = User::factory()->create();
+        $this->createPaidMaxSubscription($user);
+
+        $this->artisan('ultra:send-announcement')
+            ->expectsOutputToContain('Found 1 paying Max subscriber(s)')
+            ->expectsOutputToContain('Sent: 1 email(s)')
+            ->assertSuccessful();
+
+        Notification::assertSentTo($user, MaxToUltraAnnouncement::class);
+    }
+
+    public function test_sends_to_monthly_max_subscriber(): void
+    {
+        Notification::fake();
+
+        $monthlyPriceId = config('subscriptions.plans.max.stripe_price_id_monthly');
+
+        if (! $monthlyPriceId) {
+            $this->markTestSkipped('Monthly Max price ID not configured');
+        }
+
+        $user = User::factory()->create();
+        $this->createPaidMaxSubscription($user, $monthlyPriceId);
+
+        $this->artisan('ultra:send-announcement')
+            ->expectsOutputToContain('Sent: 1 email(s)')
+            ->assertSuccessful();
+
+        Notification::assertSentTo($user, MaxToUltraAnnouncement::class);
+    }
+
+    public function test_skips_comped_max_subscriber(): void
+    {
+        Notification::fake();
+
+        $user = User::factory()->create();
+        $this->createCompedMaxSubscription($user);
+
+        $this->artisan('ultra:send-announcement')
+            ->expectsOutputToContain('Found 0 paying Max subscriber(s)')
+            ->assertSuccessful();
+
+        Notification::assertNotSentTo($user, MaxToUltraAnnouncement::class);
+    }
+
+    public function test_skips_comped_ultra_subscriber(): void
+    {
+        Notification::fake();
+
+        $user = User::factory()->create();
+        $this->createCompedUltraSubscription($user);
+
+        $this->artisan('ultra:send-announcement')
+            ->expectsOutputToContain('Found 0 paying Max subscriber(s)')
+            ->assertSuccessful();
+
+        Notification::assertNotSentTo($user, MaxToUltraAnnouncement::class);
+    }
+
+    public function test_skips_pro_subscriber(): void
+    {
+        Notification::fake();
+
+        $user = User::factory()->create();
+        $this->createProSubscription($user);
+
+        $this->artisan('ultra:send-announcement')
+            ->expectsOutputToContain('Found 0 paying Max subscriber(s)')
+            ->assertSuccessful();
+
+        Notification::assertNotSentTo($user, MaxToUltraAnnouncement::class);
+    }
+
+    public function test_dry_run_does_not_send(): void
+    {
+        Notification::fake();
+
+        $user = User::factory()->create();
+        $this->createPaidMaxSubscription($user);
+
+        $this->artisan('ultra:send-announcement --dry-run')
+            ->expectsOutputToContain('DRY RUN')
+            ->expectsOutputToContain("Would send to: {$user->email}")
+            ->expectsOutputToContain('Would send: 1 email(s)')
+            ->assertSuccessful();
+
+        Notification::assertNotSentTo($user, MaxToUltraAnnouncement::class);
+    }
+
+    public function test_notification_has_correct_subject(): void
+    {
+        $user = User::factory()->create(['name' => 'Jane Doe']);
+
+        $notification = new MaxToUltraAnnouncement;
+        $mail = $notification->toMail($user);
+
+        $this->assertEquals('Your Max Plan is Now NativePHP Ultra', $mail->subject);
+    }
+
+    public function test_notification_greeting_uses_first_name(): void
+    {
+        $user = User::factory()->create(['name' => 'Jane Doe']);
+
+        $notification = new MaxToUltraAnnouncement;
+        $mail = $notification->toMail($user);
+
+        $this->assertEquals('Hi Jane,', $mail->greeting);
+    }
+
+    public function test_notification_greeting_fallback_when_no_name(): void
+    {
+        $user = User::factory()->create(['name' => null]);
+
+        $notification = new MaxToUltraAnnouncement;
+        $mail = $notification->toMail($user);
+
+        $this->assertEquals('Hi there,', $mail->greeting);
+    }
+
+    public function test_notification_contains_ultra_benefits(): void
+    {
+        $user = User::factory()->create(['name' => 'Test']);
+
+        $notification = new MaxToUltraAnnouncement;
+        $mail = $notification->toMail($user);
+
+        $rendered = $mail->render()->__toString();
+
+        $this->assertStringContainsString('Teams', $rendered);
+        $this->assertStringContainsString('Free official plugins', $rendered);
+        $this->assertStringContainsString('Plugin Dev Kit', $rendered);
+        $this->assertStringContainsString('Priority support', $rendered);
+        $this->assertStringContainsString('Early access', $rendered);
+        $this->assertStringContainsString('Exclusive content', $rendered);
+        $this->assertStringContainsString('Shape the roadmap', $rendered);
+    }
+}
diff --git a/tests/Feature/SendUltraLicenseHolderPromotionTest.php b/tests/Feature/SendUltraLicenseHolderPromotionTest.php
new file mode 100644
index 00000000..50d4155a
--- /dev/null
+++ b/tests/Feature/SendUltraLicenseHolderPromotionTest.php
@@ -0,0 +1,267 @@
+<?php
+
+namespace Tests\Feature;
+
+use App\Enums\Subscription;
+use App\Models\License;
+use App\Models\User;
+use App\Notifications\UltraLicenseHolderPromotion;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\Notification;
+use Laravel\Cashier\SubscriptionItem;
+use Tests\TestCase;
+
+class SendUltraLicenseHolderPromotionTest extends TestCase
+{
+    use RefreshDatabase;
+
+    private function createLegacyLicense(User $user, string $policyName = 'mini'): License
+    {
+        return License::factory()
+            ->for($user)
+            ->withoutSubscriptionItem()
+            ->state(['policy_name' => $policyName])
+            ->create();
+    }
+
+    private function createActiveSubscription(User $user, string $priceId): \Laravel\Cashier\Subscription
+    {
+        $user->update(['stripe_id' => 'cus_'.uniqid()]);
+
+        $subscription = \Laravel\Cashier\Subscription::factory()
+            ->for($user)
+            ->active()
+            ->create([
+                'stripe_price' => $priceId,
+                'is_comped' => false,
+            ]);
+
+        SubscriptionItem::factory()
+            ->for($subscription, 'subscription')
+            ->create([
+                'stripe_price' => $priceId,
+                'quantity' => 1,
+            ]);
+
+        return $subscription;
+    }
+
+    public function test_sends_to_legacy_mini_license_holder(): void
+    {
+        Notification::fake();
+
+        $user = User::factory()->create();
+        $this->createLegacyLicense($user, 'mini');
+
+        $this->artisan('ultra:send-license-holder-promo')
+            ->expectsOutputToContain('Found 1 eligible license holder(s)')
+            ->expectsOutputToContain('Sent: 1 email(s)')
+            ->assertSuccessful();
+
+        Notification::assertSentTo($user, UltraLicenseHolderPromotion::class);
+    }
+
+    public function test_sends_to_legacy_pro_license_holder(): void
+    {
+        Notification::fake();
+
+        $user = User::factory()->create();
+        $this->createLegacyLicense($user, 'pro');
+
+        $this->artisan('ultra:send-license-holder-promo')
+            ->expectsOutputToContain('Found 1 eligible license holder(s)')
+            ->assertSuccessful();
+
+        Notification::assertSentTo($user, UltraLicenseHolderPromotion::class);
+    }
+
+    public function test_sends_to_legacy_max_license_holder(): void
+    {
+        Notification::fake();
+
+        $user = User::factory()->create();
+        $this->createLegacyLicense($user, 'max');
+
+        $this->artisan('ultra:send-license-holder-promo')
+            ->expectsOutputToContain('Found 1 eligible license holder(s)')
+            ->assertSuccessful();
+
+        Notification::assertSentTo($user, UltraLicenseHolderPromotion::class);
+    }
+
+    public function test_skips_user_with_active_subscription(): void
+    {
+        Notification::fake();
+
+        $user = User::factory()->create();
+        $this->createLegacyLicense($user, 'pro');
+        $this->createActiveSubscription($user, Subscription::Pro->stripePriceId());
+
+        $this->artisan('ultra:send-license-holder-promo')
+            ->expectsOutputToContain("Skipping {$user->email} - already has active subscription")
+            ->expectsOutputToContain('Found 0 eligible license holder(s)')
+            ->assertSuccessful();
+
+        Notification::assertNotSentTo($user, UltraLicenseHolderPromotion::class);
+    }
+
+    public function test_skips_license_tied_to_subscription_item(): void
+    {
+        Notification::fake();
+
+        $user = User::factory()->create(['stripe_id' => 'cus_'.uniqid()]);
+
+        // License with a subscription_item_id (not legacy)
+        License::factory()
+            ->for($user)
+            ->state(['policy_name' => 'pro'])
+            ->create();
+
+        $this->artisan('ultra:send-license-holder-promo')
+            ->expectsOutputToContain('Found 0 eligible license holder(s)')
+            ->assertSuccessful();
+
+        Notification::assertNotSentTo($user, UltraLicenseHolderPromotion::class);
+    }
+
+    public function test_sends_only_one_email_per_user_with_multiple_licenses(): void
+    {
+        Notification::fake();
+
+        $user = User::factory()->create();
+        $this->createLegacyLicense($user, 'mini');
+        $this->createLegacyLicense($user, 'pro');
+
+        $this->artisan('ultra:send-license-holder-promo')
+            ->expectsOutputToContain('Found 1 eligible license holder(s)')
+            ->expectsOutputToContain('Sent: 1 email(s)')
+            ->assertSuccessful();
+
+        Notification::assertSentToTimes($user, UltraLicenseHolderPromotion::class, 1);
+    }
+
+    public function test_dry_run_does_not_send(): void
+    {
+        Notification::fake();
+
+        $user = User::factory()->create();
+        $this->createLegacyLicense($user, 'mini');
+
+        $this->artisan('ultra:send-license-holder-promo --dry-run')
+            ->expectsOutputToContain('DRY RUN')
+            ->expectsOutputToContain("Would send to: {$user->email}")
+            ->expectsOutputToContain('Would send: 1 email(s)')
+            ->assertSuccessful();
+
+        Notification::assertNotSentTo($user, UltraLicenseHolderPromotion::class);
+    }
+
+    public function test_notification_has_correct_subject(): void
+    {
+        $user = User::factory()->create(['name' => 'Jane Doe']);
+
+        $notification = new UltraLicenseHolderPromotion('Mini');
+        $mail = $notification->toMail($user);
+
+        $this->assertEquals('Unlock More with NativePHP Ultra', $mail->subject);
+    }
+
+    public function test_notification_greeting_uses_first_name(): void
+    {
+        $user = User::factory()->create(['name' => 'Jane Doe']);
+
+        $notification = new UltraLicenseHolderPromotion('Mini');
+        $mail = $notification->toMail($user);
+
+        $this->assertEquals('Hi Jane,', $mail->greeting);
+    }
+
+    public function test_notification_greeting_fallback_when_no_name(): void
+    {
+        $user = User::factory()->create(['name' => null]);
+
+        $notification = new UltraLicenseHolderPromotion('Mini');
+        $mail = $notification->toMail($user);
+
+        $this->assertEquals('Hi there,', $mail->greeting);
+    }
+
+    public function test_notification_contains_plan_name(): void
+    {
+        $user = User::factory()->create(['name' => 'Test']);
+
+        $notification = new UltraLicenseHolderPromotion('Pro');
+        $mail = $notification->toMail($user);
+
+        $rendered = $mail->render()->__toString();
+
+        $this->assertStringContainsString('Pro', $rendered);
+    }
+
+    public function test_notification_contains_ultra_benefits(): void
+    {
+        $user = User::factory()->create(['name' => 'Test']);
+
+        $notification = new UltraLicenseHolderPromotion('Mini');
+        $mail = $notification->toMail($user);
+
+        $rendered = $mail->render()->__toString();
+
+        $this->assertStringContainsString('Teams', $rendered);
+        $this->assertStringContainsString('Free official plugins', $rendered);
+        $this->assertStringContainsString('Plugin Dev Kit', $rendered);
+        $this->assertStringContainsString('Priority support', $rendered);
+        $this->assertStringContainsString('Early access', $rendered);
+        $this->assertStringContainsString('Exclusive content', $rendered);
+        $this->assertStringContainsString('Shape the roadmap', $rendered);
+        $this->assertStringContainsString('monthly billing', $rendered);
+    }
+
+    public function test_personalizes_plan_name_for_mini(): void
+    {
+        Notification::fake();
+
+        $user = User::factory()->create();
+        $this->createLegacyLicense($user, 'mini');
+
+        $this->artisan('ultra:send-license-holder-promo')
+            ->expectsOutputToContain('(Mini)')
+            ->assertSuccessful();
+
+        Notification::assertSentTo($user, UltraLicenseHolderPromotion::class, function ($notification) {
+            return $notification->planName === 'Mini';
+        });
+    }
+
+    public function test_personalizes_plan_name_for_pro(): void
+    {
+        Notification::fake();
+
+        $user = User::factory()->create();
+        $this->createLegacyLicense($user, 'pro');
+
+        $this->artisan('ultra:send-license-holder-promo')
+            ->expectsOutputToContain('(Pro)')
+            ->assertSuccessful();
+
+        Notification::assertSentTo($user, UltraLicenseHolderPromotion::class, function ($notification) {
+            return $notification->planName === 'Pro';
+        });
+    }
+
+    public function test_personalizes_plan_name_for_max(): void
+    {
+        Notification::fake();
+
+        $user = User::factory()->create();
+        $this->createLegacyLicense($user, 'max');
+
+        $this->artisan('ultra:send-license-holder-promo')
+            ->expectsOutputToContain('(Ultra)')
+            ->assertSuccessful();
+
+        Notification::assertSentTo($user, UltraLicenseHolderPromotion::class, function ($notification) {
+            return $notification->planName === 'Ultra';
+        });
+    }
+}
diff --git a/tests/Feature/SendUltraUpgradePromotionTest.php b/tests/Feature/SendUltraUpgradePromotionTest.php
new file mode 100644
index 00000000..05a406b9
--- /dev/null
+++ b/tests/Feature/SendUltraUpgradePromotionTest.php
@@ -0,0 +1,254 @@
+<?php
+
+namespace Tests\Feature;
+
+use App\Enums\Subscription;
+use App\Models\User;
+use App\Notifications\UltraUpgradePromotion;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\Notification;
+use Laravel\Cashier\SubscriptionItem;
+use Tests\TestCase;
+
+class SendUltraUpgradePromotionTest extends TestCase
+{
+    use RefreshDatabase;
+
+    private const COMPED_ULTRA_PRICE_ID = 'price_test_ultra_comped';
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        config(['subscriptions.plans.max.stripe_price_id_comped' => self::COMPED_ULTRA_PRICE_ID]);
+    }
+
+    private function createSubscription(User $user, string $priceId, bool $isComped = false): \Laravel\Cashier\Subscription
+    {
+        $user->update(['stripe_id' => 'cus_'.uniqid()]);
+
+        $subscription = \Laravel\Cashier\Subscription::factory()
+            ->for($user)
+            ->active()
+            ->create([
+                'stripe_price' => $priceId,
+                'is_comped' => $isComped,
+            ]);
+
+        SubscriptionItem::factory()
+            ->for($subscription, 'subscription')
+            ->create([
+                'stripe_price' => $priceId,
+                'quantity' => 1,
+            ]);
+
+        return $subscription;
+    }
+
+    public function test_sends_to_mini_subscriber(): void
+    {
+        Notification::fake();
+
+        $user = User::factory()->create();
+        $this->createSubscription($user, Subscription::Mini->stripePriceId());
+
+        $this->artisan('ultra:send-upgrade-promo')
+            ->expectsOutputToContain('Found 1 eligible subscriber(s)')
+            ->expectsOutputToContain('Sent: 1 email(s)')
+            ->assertSuccessful();
+
+        Notification::assertSentTo($user, UltraUpgradePromotion::class);
+    }
+
+    public function test_sends_to_pro_subscriber(): void
+    {
+        Notification::fake();
+
+        $user = User::factory()->create();
+        $this->createSubscription($user, Subscription::Pro->stripePriceId());
+
+        $this->artisan('ultra:send-upgrade-promo')
+            ->expectsOutputToContain('Found 1 eligible subscriber(s)')
+            ->expectsOutputToContain('Sent: 1 email(s)')
+            ->assertSuccessful();
+
+        Notification::assertSentTo($user, UltraUpgradePromotion::class);
+    }
+
+    public function test_skips_max_subscriber(): void
+    {
+        Notification::fake();
+
+        $user = User::factory()->create();
+        $this->createSubscription($user, Subscription::Max->stripePriceId());
+
+        $this->artisan('ultra:send-upgrade-promo')
+            ->expectsOutputToContain('Found 0 eligible subscriber(s)')
+            ->assertSuccessful();
+
+        Notification::assertNotSentTo($user, UltraUpgradePromotion::class);
+    }
+
+    public function test_skips_comped_ultra_subscriber(): void
+    {
+        Notification::fake();
+
+        $user = User::factory()->create();
+        $this->createSubscription($user, self::COMPED_ULTRA_PRICE_ID);
+
+        $this->artisan('ultra:send-upgrade-promo')
+            ->expectsOutputToContain('Found 0 eligible subscriber(s)')
+            ->assertSuccessful();
+
+        Notification::assertNotSentTo($user, UltraUpgradePromotion::class);
+    }
+
+    public function test_skips_comped_mini_subscriber(): void
+    {
+        Notification::fake();
+
+        $user = User::factory()->create();
+        $this->createSubscription($user, Subscription::Mini->stripePriceId(), isComped: true);
+
+        $this->artisan('ultra:send-upgrade-promo')
+            ->expectsOutputToContain('Found 0 eligible subscriber(s)')
+            ->assertSuccessful();
+
+        Notification::assertNotSentTo($user, UltraUpgradePromotion::class);
+    }
+
+    public function test_skips_comped_pro_subscriber(): void
+    {
+        Notification::fake();
+
+        $user = User::factory()->create();
+        $this->createSubscription($user, Subscription::Pro->stripePriceId(), isComped: true);
+
+        $this->artisan('ultra:send-upgrade-promo')
+            ->expectsOutputToContain('Found 0 eligible subscriber(s)')
+            ->assertSuccessful();
+
+        Notification::assertNotSentTo($user, UltraUpgradePromotion::class);
+    }
+
+    public function test_dry_run_does_not_send(): void
+    {
+        Notification::fake();
+
+        $user = User::factory()->create();
+        $this->createSubscription($user, Subscription::Mini->stripePriceId());
+
+        $this->artisan('ultra:send-upgrade-promo --dry-run')
+            ->expectsOutputToContain('DRY RUN')
+            ->expectsOutputToContain("Would send to: {$user->email}")
+            ->expectsOutputToContain('Would send: 1 email(s)')
+            ->assertSuccessful();
+
+        Notification::assertNotSentTo($user, UltraUpgradePromotion::class);
+    }
+
+    public function test_notification_has_correct_subject(): void
+    {
+        $user = User::factory()->create(['name' => 'Jane Doe']);
+
+        $notification = new UltraUpgradePromotion('Mini');
+        $mail = $notification->toMail($user);
+
+        $this->assertEquals('Unlock More with NativePHP Ultra', $mail->subject);
+    }
+
+    public function test_notification_greeting_uses_first_name(): void
+    {
+        $user = User::factory()->create(['name' => 'Jane Doe']);
+
+        $notification = new UltraUpgradePromotion('Mini');
+        $mail = $notification->toMail($user);
+
+        $this->assertEquals('Hi Jane,', $mail->greeting);
+    }
+
+    public function test_notification_greeting_fallback_when_no_name(): void
+    {
+        $user = User::factory()->create(['name' => null]);
+
+        $notification = new UltraUpgradePromotion('Mini');
+        $mail = $notification->toMail($user);
+
+        $this->assertEquals('Hi there,', $mail->greeting);
+    }
+
+    public function test_notification_contains_current_plan_name(): void
+    {
+        $user = User::factory()->create(['name' => 'Test']);
+
+        $notification = new UltraUpgradePromotion('Mini');
+        $mail = $notification->toMail($user);
+
+        $rendered = $mail->render()->__toString();
+
+        $this->assertStringContainsString('Mini', $rendered);
+    }
+
+    public function test_notification_contains_ultra_benefits(): void
+    {
+        $user = User::factory()->create(['name' => 'Test']);
+
+        $notification = new UltraUpgradePromotion('Pro');
+        $mail = $notification->toMail($user);
+
+        $rendered = $mail->render()->__toString();
+
+        $this->assertStringContainsString('Teams', $rendered);
+        $this->assertStringContainsString('Free official plugins', $rendered);
+        $this->assertStringContainsString('Plugin Dev Kit', $rendered);
+        $this->assertStringContainsString('Priority support', $rendered);
+        $this->assertStringContainsString('Early access', $rendered);
+        $this->assertStringContainsString('Exclusive content', $rendered);
+        $this->assertStringContainsString('Shape the roadmap', $rendered);
+        $this->assertStringContainsString('monthly billing', $rendered);
+    }
+
+    public function test_notification_mentions_prorated_billing(): void
+    {
+        $user = User::factory()->create(['name' => 'Test']);
+
+        $notification = new UltraUpgradePromotion('Mini');
+        $mail = $notification->toMail($user);
+
+        $rendered = $mail->render()->__toString();
+
+        $this->assertStringContainsString('prorated', $rendered);
+    }
+
+    public function test_personalizes_plan_name_for_mini(): void
+    {
+        Notification::fake();
+
+        $user = User::factory()->create();
+        $this->createSubscription($user, Subscription::Mini->stripePriceId());
+
+        $this->artisan('ultra:send-upgrade-promo')
+            ->expectsOutputToContain('(Mini)')
+            ->assertSuccessful();
+
+        Notification::assertSentTo($user, UltraUpgradePromotion::class, function ($notification) {
+            return $notification->currentPlanName === 'Mini';
+        });
+    }
+
+    public function test_personalizes_plan_name_for_pro(): void
+    {
+        Notification::fake();
+
+        $user = User::factory()->create();
+        $this->createSubscription($user, Subscription::Pro->stripePriceId());
+
+        $this->artisan('ultra:send-upgrade-promo')
+            ->expectsOutputToContain('(Pro)')
+            ->assertSuccessful();
+
+        Notification::assertSentTo($user, UltraUpgradePromotion::class, function ($notification) {
+            return $notification->currentPlanName === 'Pro';
+        });
+    }
+}
diff --git a/tests/Feature/TeamManagementTest.php b/tests/Feature/TeamManagementTest.php
new file mode 100644
index 00000000..313d6ce9
--- /dev/null
+++ b/tests/Feature/TeamManagementTest.php
@@ -0,0 +1,726 @@
+<?php
+
+namespace Tests\Feature;
+
+use App\Enums\PriceTier;
+use App\Enums\TeamUserStatus;
+use App\Features\ShowAuthButtons;
+use App\Jobs\RevokeTeamUserAccessJob;
+use App\Jobs\SuspendTeamJob;
+use App\Jobs\UnsuspendTeamJob;
+use App\Models\License;
+use App\Models\Plugin;
+use App\Models\Product;
+use App\Models\ProductLicense;
+use App\Models\Team;
+use App\Models\TeamUser;
+use App\Models\User;
+use App\Notifications\TeamInvitation;
+use App\Notifications\TeamUserRemoved;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\Http;
+use Illuminate\Support\Facades\Notification;
+use Illuminate\Support\Facades\Queue;
+use Laravel\Cashier\Events\WebhookReceived;
+use Laravel\Cashier\Subscription;
+use Laravel\Pennant\Feature;
+use Tests\TestCase;
+
+class TeamManagementTest extends TestCase
+{
+    use RefreshDatabase;
+
+    private const MAX_PRICE_ID = 'price_test_max_yearly';
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        Feature::define(ShowAuthButtons::class, true);
+
+        config(['subscriptions.plans.max.stripe_price_id' => self::MAX_PRICE_ID]);
+    }
+
+    private function createUltraUser(): User
+    {
+        $user = User::factory()->create();
+        License::factory()->max()->active()->create(['user_id' => $user->id]);
+        Subscription::factory()->for($user)->active()->create([
+            'stripe_price' => self::MAX_PRICE_ID,
+        ]);
+
+        return $user;
+    }
+
+    private function createTeamWithOwner(): array
+    {
+        $owner = $this->createUltraUser();
+        $team = Team::factory()->create(['user_id' => $owner->id, 'name' => 'Test Team']);
+
+        return [$owner, $team];
+    }
+
+    // ========================================
+    // Team Creation Tests
+    // ========================================
+
+    public function test_ultra_subscriber_can_create_team(): void
+    {
+        $user = $this->createUltraUser();
+
+        $response = $this->actingAs($user)
+            ->post(route('customer.team.store'), ['name' => 'My Team']);
+
+        $response->assertRedirect(route('customer.team.index'));
+        $response->assertSessionHas('success');
+
+        $this->assertDatabaseHas('teams', [
+            'user_id' => $user->id,
+            'name' => 'My Team',
+            'is_suspended' => false,
+        ]);
+    }
+
+    public function test_non_ultra_user_cannot_create_team(): void
+    {
+        $user = User::factory()->create();
+
+        $response = $this->actingAs($user)
+            ->post(route('customer.team.store'), ['name' => 'My Team']);
+
+        $response->assertSessionHas('error');
+        $this->assertDatabaseMissing('teams', ['user_id' => $user->id]);
+    }
+
+    public function test_cannot_create_duplicate_team(): void
+    {
+        [$owner, $team] = $this->createTeamWithOwner();
+
+        $response = $this->actingAs($owner)
+            ->post(route('customer.team.store'), ['name' => 'Another Team']);
+
+        $response->assertSessionHas('error');
+        $this->assertCount(1, Team::where('user_id', $owner->id)->get());
+    }
+
+    public function test_team_name_is_required(): void
+    {
+        $user = $this->createUltraUser();
+
+        $response = $this->actingAs($user)
+            ->post(route('customer.team.store'), ['name' => '']);
+
+        $response->assertSessionHasErrors('name');
+    }
+
+    // ========================================
+    // Invitation Tests
+    // ========================================
+
+    public function test_owner_can_invite_member_by_email(): void
+    {
+        Notification::fake();
+
+        [$owner, $team] = $this->createTeamWithOwner();
+
+        $response = $this->actingAs($owner)
+            ->post(route('customer.team.invite'), ['email' => 'member@example.com']);
+
+        $response->assertSessionHas('success');
+
+        $this->assertDatabaseHas('team_users', [
+            'team_id' => $team->id,
+            'email' => 'member@example.com',
+            'status' => TeamUserStatus::Pending->value,
+        ]);
+
+        Notification::assertSentOnDemand(TeamInvitation::class);
+    }
+
+    public function test_cannot_invite_duplicate_email(): void
+    {
+        Notification::fake();
+
+        [$owner, $team] = $this->createTeamWithOwner();
+
+        TeamUser::factory()->create([
+            'team_id' => $team->id,
+            'email' => 'member@example.com',
+            'status' => TeamUserStatus::Active,
+        ]);
+
+        $response = $this->actingAs($owner)
+            ->post(route('customer.team.invite'), ['email' => 'member@example.com']);
+
+        $response->assertSessionHas('error');
+    }
+
+    public function test_cannot_invite_when_team_suspended(): void
+    {
+        Notification::fake();
+
+        $owner = $this->createUltraUser();
+        $team = Team::factory()->suspended()->create(['user_id' => $owner->id]);
+
+        $response = $this->actingAs($owner)
+            ->post(route('customer.team.invite'), ['email' => 'member@example.com']);
+
+        $response->assertSessionHas('error');
+        Notification::assertNothingSent();
+    }
+
+    public function test_cannot_invite_beyond_seat_limit(): void
+    {
+        Notification::fake();
+
+        [$owner, $team] = $this->createTeamWithOwner();
+
+        // Create 10 active members to fill all seats
+        TeamUser::factory()->count(10)->active()->create(['team_id' => $team->id]);
+
+        $response = $this->actingAs($owner)
+            ->post(route('customer.team.invite'), ['email' => 'extra@example.com']);
+
+        $response->assertSessionHas('show_add_seats', true);
+        Notification::assertNothingSent();
+    }
+
+    // ========================================
+    // Member Removal Tests
+    // ========================================
+
+    public function test_owner_can_remove_member(): void
+    {
+        Notification::fake();
+        Queue::fake();
+
+        [$owner, $team] = $this->createTeamWithOwner();
+
+        $member = TeamUser::factory()->active()->create([
+            'team_id' => $team->id,
+            'email' => 'member@example.com',
+        ]);
+
+        $response = $this->actingAs($owner)
+            ->delete(route('customer.team.users.remove', $member));
+
+        $response->assertSessionHas('success');
+
+        $member->refresh();
+        $this->assertEquals(TeamUserStatus::Removed, $member->status);
+
+        Notification::assertSentOnDemand(TeamUserRemoved::class);
+        Queue::assertPushed(RevokeTeamUserAccessJob::class);
+    }
+
+    public function test_non_owner_cannot_remove_member(): void
+    {
+        [$owner, $team] = $this->createTeamWithOwner();
+        $otherUser = User::factory()->create();
+
+        $member = TeamUser::factory()->active()->create(['team_id' => $team->id]);
+
+        $response = $this->actingAs($otherUser)
+            ->delete(route('customer.team.users.remove', $member));
+
+        $response->assertSessionHas('error');
+    }
+
+    // ========================================
+    // Invitation Acceptance Tests
+    // ========================================
+
+    public function test_authenticated_user_can_accept_invitation(): void
+    {
+        [$owner, $team] = $this->createTeamWithOwner();
+
+        $member = User::factory()->create(['email' => 'member@example.com']);
+        $teamUser = TeamUser::factory()->create([
+            'team_id' => $team->id,
+            'email' => 'member@example.com',
+            'invitation_token' => 'test-token-123',
+        ]);
+
+        $response = $this->actingAs($member)
+            ->get(route('team.invitation.accept', 'test-token-123'));
+
+        $response->assertRedirect(route('dashboard'));
+        $response->assertSessionHas('success');
+
+        $teamUser->refresh();
+        $this->assertEquals(TeamUserStatus::Active, $teamUser->status);
+        $this->assertEquals($member->id, $teamUser->user_id);
+        $this->assertNull($teamUser->invitation_token);
+    }
+
+    public function test_email_mismatch_rejects_acceptance(): void
+    {
+        [$owner, $team] = $this->createTeamWithOwner();
+
+        $otherUser = User::factory()->create(['email' => 'other@example.com']);
+        $teamUser = TeamUser::factory()->create([
+            'team_id' => $team->id,
+            'email' => 'member@example.com',
+            'invitation_token' => 'test-token-456',
+        ]);
+
+        $response = $this->actingAs($otherUser)
+            ->get(route('team.invitation.accept', 'test-token-456'));
+
+        $response->assertRedirect(route('dashboard'));
+        $response->assertSessionHas('error');
+
+        $teamUser->refresh();
+        $this->assertEquals(TeamUserStatus::Pending, $teamUser->status);
+    }
+
+    public function test_unauthenticated_user_stores_token_in_session(): void
+    {
+        [$owner, $team] = $this->createTeamWithOwner();
+
+        TeamUser::factory()->create([
+            'team_id' => $team->id,
+            'email' => 'newuser@example.com',
+            'invitation_token' => 'test-token-789',
+        ]);
+
+        $response = $this->get(route('team.invitation.accept', 'test-token-789'));
+
+        $response->assertRedirect(route('customer.login'));
+        $response->assertSessionHas('pending_team_invitation_token', 'test-token-789');
+    }
+
+    public function test_invitation_accepted_after_registration(): void
+    {
+        [$owner, $team] = $this->createTeamWithOwner();
+
+        $email = 'testuser@gmail.com';
+
+        $teamUser = TeamUser::factory()->create([
+            'team_id' => $team->id,
+            'email' => $email,
+            'invitation_token' => 'test-token-abc',
+        ]);
+
+        $response = $this->withSession(['pending_team_invitation_token' => 'test-token-abc'])
+            ->post(route('customer.register'), [
+                'name' => 'New User',
+                'email' => $email,
+                'password' => 'password123',
+                'password_confirmation' => 'password123',
+            ]);
+
+        $teamUser->refresh();
+        $this->assertEquals(TeamUserStatus::Active, $teamUser->status);
+        $this->assertNotNull($teamUser->user_id);
+    }
+
+    public function test_invitation_accepted_after_login(): void
+    {
+        [$owner, $team] = $this->createTeamWithOwner();
+
+        $member = User::factory()->create([
+            'email' => 'member@example.com',
+            'password' => bcrypt('password123'),
+        ]);
+
+        $teamUser = TeamUser::factory()->create([
+            'team_id' => $team->id,
+            'email' => 'member@example.com',
+            'invitation_token' => 'test-token-def',
+        ]);
+
+        $response = $this->withSession(['pending_team_invitation_token' => 'test-token-def'])
+            ->post(route('customer.login'), [
+                'email' => 'member@example.com',
+                'password' => 'password123',
+            ]);
+
+        $teamUser->refresh();
+        $this->assertEquals(TeamUserStatus::Active, $teamUser->status);
+        $this->assertEquals($member->id, $teamUser->user_id);
+    }
+
+    // ========================================
+    // Access Tests
+    // ========================================
+
+    public function test_team_owner_is_ultra_team_member(): void
+    {
+        [$owner, $team] = $this->createTeamWithOwner();
+
+        $this->assertTrue($owner->isUltraTeamMember());
+    }
+
+    public function test_team_owner_gets_official_plugin_access(): void
+    {
+        [$owner, $team] = $this->createTeamWithOwner();
+
+        $officialPlugin = Plugin::factory()->paid()->approved()->create([
+            'is_official' => true,
+        ]);
+
+        $this->assertTrue($owner->hasPluginAccess($officialPlugin));
+    }
+
+    public function test_suspended_team_owner_is_not_ultra_team_member(): void
+    {
+        $owner = $this->createUltraUser();
+        $team = Team::factory()->suspended()->create(['user_id' => $owner->id]);
+
+        $this->assertFalse($owner->isUltraTeamMember());
+    }
+
+    public function test_team_member_gets_official_plugin_access(): void
+    {
+        [$owner, $team] = $this->createTeamWithOwner();
+
+        $member = User::factory()->create();
+        TeamUser::factory()->active()->create([
+            'team_id' => $team->id,
+            'user_id' => $member->id,
+            'email' => $member->email,
+        ]);
+
+        $officialPlugin = Plugin::factory()->paid()->approved()->create([
+            'is_official' => true,
+        ]);
+
+        $this->assertTrue($member->hasPluginAccess($officialPlugin));
+    }
+
+    public function test_team_member_does_not_get_third_party_plugin_access(): void
+    {
+        [$owner, $team] = $this->createTeamWithOwner();
+
+        $member = User::factory()->create();
+        TeamUser::factory()->active()->create([
+            'team_id' => $team->id,
+            'user_id' => $member->id,
+            'email' => $member->email,
+        ]);
+
+        $thirdPartyPlugin = Plugin::factory()->paid()->approved()->create([
+            'is_official' => false,
+        ]);
+
+        $this->assertFalse($member->hasPluginAccess($thirdPartyPlugin));
+    }
+
+    public function test_team_member_gets_subscriber_pricing(): void
+    {
+        [$owner, $team] = $this->createTeamWithOwner();
+
+        $member = User::factory()->create();
+        TeamUser::factory()->active()->create([
+            'team_id' => $team->id,
+            'user_id' => $member->id,
+            'email' => $member->email,
+        ]);
+
+        $tiers = $member->getEligiblePriceTiers();
+
+        $this->assertContains(PriceTier::Subscriber, $tiers);
+    }
+
+    public function test_non_team_member_does_not_get_subscriber_pricing(): void
+    {
+        $user = User::factory()->create();
+
+        $tiers = $user->getEligiblePriceTiers();
+
+        $this->assertNotContains(PriceTier::Subscriber, $tiers);
+    }
+
+    public function test_team_member_gets_product_access_via_team(): void
+    {
+        $owner = $this->createUltraUser();
+        $team = Team::factory()->create(['user_id' => $owner->id]);
+
+        $product = Product::factory()->create(['slug' => 'plugin-dev-kit']);
+        ProductLicense::factory()->create([
+            'user_id' => $owner->id,
+            'product_id' => $product->id,
+        ]);
+
+        $member = User::factory()->create();
+        TeamUser::factory()->active()->create([
+            'team_id' => $team->id,
+            'user_id' => $member->id,
+            'email' => $member->email,
+        ]);
+
+        $this->assertTrue($member->hasProductLicense($product));
+    }
+
+    // ========================================
+    // Suspension Tests
+    // ========================================
+
+    public function test_team_suspended_on_subscription_cancel(): void
+    {
+        Queue::fake();
+
+        [$owner, $team] = $this->createTeamWithOwner();
+
+        $event = new WebhookReceived([
+            'type' => 'customer.subscription.deleted',
+            'data' => [
+                'object' => [
+                    'customer' => $owner->stripe_id ?? 'cus_test',
+                ],
+            ],
+        ]);
+
+        // We can't fully simulate Stripe, but we can test the job dispatch
+        // by calling SuspendTeamJob directly
+        $job = new SuspendTeamJob($owner->id);
+        $job->handle();
+
+        $team->refresh();
+        $this->assertTrue($team->is_suspended);
+    }
+
+    public function test_team_unsuspended_on_resubscribe(): void
+    {
+        $owner = $this->createUltraUser();
+        $team = Team::factory()->suspended()->create(['user_id' => $owner->id]);
+
+        $job = new UnsuspendTeamJob($owner->id);
+        $job->handle();
+
+        $team->refresh();
+        $this->assertFalse($team->is_suspended);
+    }
+
+    public function test_suspended_team_member_loses_access(): void
+    {
+        $owner = $this->createUltraUser();
+        $team = Team::factory()->suspended()->create(['user_id' => $owner->id]);
+
+        $member = User::factory()->create();
+        TeamUser::factory()->active()->create([
+            'team_id' => $team->id,
+            'user_id' => $member->id,
+            'email' => $member->email,
+        ]);
+
+        $this->assertFalse($member->isUltraTeamMember());
+    }
+
+    public function test_removed_member_loses_plugin_access(): void
+    {
+        [$owner, $team] = $this->createTeamWithOwner();
+
+        $member = User::factory()->create();
+        $teamUser = TeamUser::factory()->active()->create([
+            'team_id' => $team->id,
+            'user_id' => $member->id,
+            'email' => $member->email,
+        ]);
+
+        $officialPlugin = Plugin::factory()->paid()->approved()->create([
+            'is_official' => true,
+        ]);
+
+        $this->assertTrue($member->hasPluginAccess($officialPlugin));
+
+        $teamUser->remove();
+
+        // Clear cached state
+        $member->refresh();
+
+        $this->assertFalse($member->hasPluginAccess($officialPlugin));
+    }
+
+    // ========================================
+    // API Plugin Access Tests
+    // ========================================
+
+    public function test_api_returns_team_based_plugin_access(): void
+    {
+        config(['services.bifrost.api_key' => 'test-api-key']);
+
+        [$owner, $team] = $this->createTeamWithOwner();
+
+        $member = User::factory()->create([
+            'plugin_license_key' => 'test-key-123',
+        ]);
+        TeamUser::factory()->active()->create([
+            'team_id' => $team->id,
+            'user_id' => $member->id,
+            'email' => $member->email,
+        ]);
+
+        $officialPlugin = Plugin::factory()->paid()->approved()->create([
+            'is_official' => true,
+            'name' => 'nativephp/test-plugin',
+        ]);
+
+        $response = $this->withHeaders([
+            'X-API-Key' => 'test-api-key',
+            'PHP_AUTH_USER' => $member->email,
+            'PHP_AUTH_PW' => 'test-key-123',
+        ])->getJson('/api/plugins/access');
+
+        $response->assertOk();
+        $response->assertJsonFragment([
+            'name' => 'nativephp/test-plugin',
+            'access' => 'team',
+        ]);
+    }
+
+    // ========================================
+    // GitHub Dev Kit Access Tests
+    // ========================================
+
+    public function test_ultra_team_member_can_request_claude_plugins_access(): void
+    {
+        Http::fake(['github.com/*' => Http::response([], 201)]);
+
+        [$owner, $team] = $this->createTeamWithOwner();
+
+        $member = User::factory()->create(['github_username' => 'testuser']);
+        TeamUser::factory()->active()->create([
+            'team_id' => $team->id,
+            'user_id' => $member->id,
+            'email' => $member->email,
+        ]);
+
+        $response = $this->actingAs($member)
+            ->post(route('github.request-claude-plugins-access'));
+
+        $response->assertSessionHas('success');
+        $this->assertNotNull($member->fresh()->claude_plugins_repo_access_granted_at);
+    }
+
+    public function test_team_owner_can_request_claude_plugins_access(): void
+    {
+        Http::fake(['github.com/*' => Http::response([], 201)]);
+
+        [$owner, $team] = $this->createTeamWithOwner();
+        $owner->update(['github_username' => 'owneruser']);
+
+        $response = $this->actingAs($owner)
+            ->post(route('github.request-claude-plugins-access'));
+
+        $response->assertSessionHas('success');
+        $this->assertNotNull($owner->fresh()->claude_plugins_repo_access_granted_at);
+    }
+
+    public function test_non_team_member_without_product_license_cannot_request_claude_plugins_access(): void
+    {
+        $user = User::factory()->create(['github_username' => 'someuser']);
+
+        $response = $this->actingAs($user)
+            ->post(route('github.request-claude-plugins-access'));
+
+        $response->assertSessionHas('error');
+        $this->assertNull($user->fresh()->claude_plugins_repo_access_granted_at);
+    }
+
+    // ========================================
+    // Resend Invitation Tests
+    // ========================================
+
+    public function test_owner_can_resend_invitation(): void
+    {
+        Notification::fake();
+
+        [$owner, $team] = $this->createTeamWithOwner();
+
+        $invitation = TeamUser::factory()->create([
+            'team_id' => $team->id,
+            'email' => 'pending@example.com',
+        ]);
+
+        $response = $this->actingAs($owner)
+            ->post(route('customer.team.users.resend', $invitation));
+
+        $response->assertSessionHas('success');
+        Notification::assertSentOnDemand(TeamInvitation::class);
+    }
+
+    // ========================================
+    // View Tests
+    // ========================================
+
+    public function test_team_page_accessible_for_authenticated_user(): void
+    {
+        $user = User::factory()->create();
+
+        $response = $this->actingAs($user)->get(route('customer.team.index'));
+
+        $response->assertOk();
+    }
+
+    public function test_team_page_shows_create_form_for_ultra_user(): void
+    {
+        $user = $this->createUltraUser();
+
+        $response = $this->actingAs($user)->get(route('customer.team.index'));
+
+        $response->assertOk();
+        $response->assertSee('Create a Team');
+    }
+
+    public function test_team_page_shows_view_plans_for_non_ultra(): void
+    {
+        $user = User::factory()->create();
+
+        $response = $this->actingAs($user)->get(route('customer.team.index'));
+
+        $response->assertOk();
+        $response->assertSee('View Plans');
+    }
+
+    // ========================================
+    // Team Name Update Tests
+    // ========================================
+
+    public function test_owner_can_update_team_name(): void
+    {
+        [$owner, $team] = $this->createTeamWithOwner();
+
+        $response = $this->actingAs($owner)
+            ->patch(route('customer.team.update'), ['name' => 'New Team Name']);
+
+        $response->assertRedirect();
+        $response->assertSessionHas('success');
+
+        $this->assertDatabaseHas('teams', [
+            'id' => $team->id,
+            'name' => 'New Team Name',
+        ]);
+    }
+
+    public function test_non_owner_cannot_update_team_name(): void
+    {
+        $user = User::factory()->create();
+
+        $response = $this->actingAs($user)
+            ->patch(route('customer.team.update'), ['name' => 'Hacked']);
+
+        $response->assertSessionHas('error');
+    }
+
+    public function test_team_name_update_requires_name(): void
+    {
+        [$owner, $team] = $this->createTeamWithOwner();
+
+        $response = $this->actingAs($owner)
+            ->patch(route('customer.team.update'), ['name' => '']);
+
+        $response->assertSessionHasErrors('name');
+    }
+
+    public function test_team_page_shows_team_name_as_heading_for_owner(): void
+    {
+        [$owner, $team] = $this->createTeamWithOwner();
+
+        $response = $this->actingAs($owner)->get(route('customer.team.index'));
+
+        $response->assertOk();
+        $response->assertSee($team->name);
+    }
+}
diff --git a/tests/Feature/UltraPluginAccessTest.php b/tests/Feature/UltraPluginAccessTest.php
new file mode 100644
index 00000000..9bedfc41
--- /dev/null
+++ b/tests/Feature/UltraPluginAccessTest.php
@@ -0,0 +1,560 @@
+<?php
+
+namespace Tests\Feature;
+
+use App\Enums\PluginStatus;
+use App\Enums\PluginType;
+use App\Enums\Subscription;
+use App\Models\Plugin;
+use App\Models\PluginLicense;
+use App\Models\PluginPrice;
+use App\Models\Team;
+use App\Models\TeamUser;
+use App\Models\User;
+use App\Services\CartService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Laravel\Cashier\SubscriptionItem;
+use Tests\TestCase;
+
+class UltraPluginAccessTest extends TestCase
+{
+    use RefreshDatabase;
+
+    private const COMPED_ULTRA_PRICE_ID = 'price_test_ultra_comped';
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        config(['subscriptions.plans.max.stripe_price_id_comped' => self::COMPED_ULTRA_PRICE_ID]);
+    }
+
+    private function createCompedUltraSubscription(User $user): \Laravel\Cashier\Subscription
+    {
+        $user->update(['stripe_id' => 'cus_'.uniqid()]);
+
+        $subscription = \Laravel\Cashier\Subscription::factory()
+            ->for($user)
+            ->active()
+            ->create([
+                'stripe_price' => self::COMPED_ULTRA_PRICE_ID,
+            ]);
+
+        SubscriptionItem::factory()
+            ->for($subscription, 'subscription')
+            ->create([
+                'stripe_price' => self::COMPED_ULTRA_PRICE_ID,
+                'quantity' => 1,
+            ]);
+
+        return $subscription;
+    }
+
+    private function createPaidMaxSubscription(User $user): \Laravel\Cashier\Subscription
+    {
+        $user->update(['stripe_id' => 'cus_'.uniqid()]);
+
+        $subscription = \Laravel\Cashier\Subscription::factory()
+            ->for($user)
+            ->active()
+            ->create([
+                'stripe_price' => Subscription::Max->stripePriceId(),
+                'is_comped' => false,
+            ]);
+
+        SubscriptionItem::factory()
+            ->for($subscription, 'subscription')
+            ->create([
+                'stripe_price' => Subscription::Max->stripePriceId(),
+                'quantity' => 1,
+            ]);
+
+        return $subscription;
+    }
+
+    private function createCompedMaxSubscription(User $user): \Laravel\Cashier\Subscription
+    {
+        $user->update(['stripe_id' => 'cus_'.uniqid()]);
+
+        $subscription = \Laravel\Cashier\Subscription::factory()
+            ->for($user)
+            ->active()
+            ->create([
+                'stripe_price' => Subscription::Max->stripePriceId(),
+                'is_comped' => true,
+            ]);
+
+        SubscriptionItem::factory()
+            ->for($subscription, 'subscription')
+            ->create([
+                'stripe_price' => Subscription::Max->stripePriceId(),
+                'quantity' => 1,
+            ]);
+
+        return $subscription;
+    }
+
+    private function createOfficialPlugin(): Plugin
+    {
+        $plugin = Plugin::factory()->approved()->paid()->create([
+            'name' => 'nativephp/test-plugin',
+            'is_active' => true,
+            'is_official' => true,
+        ]);
+
+        PluginPrice::factory()->regular()->amount(2999)->create(['plugin_id' => $plugin->id]);
+        PluginPrice::factory()->subscriber()->amount(1999)->create(['plugin_id' => $plugin->id]);
+
+        return $plugin;
+    }
+
+    private function createThirdPartyPlugin(): Plugin
+    {
+        $plugin = Plugin::factory()->approved()->paid()->create([
+            'name' => 'vendor/third-party-plugin',
+            'is_active' => true,
+            'is_official' => false,
+        ]);
+
+        PluginPrice::factory()->regular()->amount(4900)->create(['plugin_id' => $plugin->id]);
+        PluginPrice::factory()->subscriber()->amount(2900)->create(['plugin_id' => $plugin->id]);
+
+        return $plugin;
+    }
+
+    // ---- Phase 1: Free official plugins for Ultra ----
+
+    public function test_ultra_user_gets_zero_price_for_official_plugin(): void
+    {
+        $user = User::factory()->create();
+        $this->createPaidMaxSubscription($user);
+        $plugin = $this->createOfficialPlugin();
+
+        $bestPrice = $plugin->getBestPriceForUser($user);
+
+        $this->assertNotNull($bestPrice);
+        $this->assertEquals(0, $bestPrice->amount);
+    }
+
+    public function test_ultra_user_gets_normal_subscriber_price_for_third_party_plugin(): void
+    {
+        $user = User::factory()->create();
+        $this->createPaidMaxSubscription($user);
+        $plugin = $this->createThirdPartyPlugin();
+
+        $bestPrice = $plugin->getBestPriceForUser($user);
+
+        $this->assertNotNull($bestPrice);
+        $this->assertEquals(2900, $bestPrice->amount);
+    }
+
+    public function test_comped_ultra_user_does_not_get_free_official_plugin(): void
+    {
+        $user = User::factory()->create();
+        $this->createCompedMaxSubscription($user);
+        $plugin = $this->createOfficialPlugin();
+
+        $bestPrice = $plugin->getBestPriceForUser($user);
+
+        $this->assertNotNull($bestPrice);
+        $this->assertGreaterThan(0, $bestPrice->amount);
+    }
+
+    public function test_non_subscriber_gets_regular_price_for_official_plugin(): void
+    {
+        $user = User::factory()->create();
+        $plugin = $this->createOfficialPlugin();
+
+        $bestPrice = $plugin->getBestPriceForUser($user);
+
+        $this->assertNotNull($bestPrice);
+        $this->assertEquals(2999, $bestPrice->amount);
+    }
+
+    public function test_guest_gets_regular_price_for_official_plugin(): void
+    {
+        $plugin = $this->createOfficialPlugin();
+
+        $bestPrice = $plugin->getBestPriceForUser(null);
+
+        $this->assertNotNull($bestPrice);
+        $this->assertEquals(2999, $bestPrice->amount);
+    }
+
+    // ---- Phase 2: $0 cart checkout ----
+
+    public function test_zero_cart_skips_stripe_and_creates_licenses(): void
+    {
+        $user = User::factory()->create();
+        $this->createPaidMaxSubscription($user);
+        $plugin = $this->createOfficialPlugin();
+
+        $this->actingAs($user);
+
+        $cartService = resolve(CartService::class);
+        $cart = $cartService->getCart($user);
+        $cartService->addPlugin($cart, $plugin);
+
+        // Verify the price was captured as $0
+        $cartItem = $cart->items()->first();
+        $this->assertEquals(0, $cartItem->price_at_addition);
+
+        // Checkout should skip Stripe and redirect to free success
+        $response = $this->post(route('cart.checkout'));
+        $response->assertRedirect(route('cart.success', ['free' => 1]));
+
+        // License should have been created
+        $this->assertTrue(
+            $user->pluginLicenses()->forPlugin($plugin)->active()->exists()
+        );
+
+        // Cart should be completed
+        $this->assertNotNull($cart->fresh()->completed_at);
+    }
+
+    public function test_free_checkout_does_not_create_duplicate_licenses(): void
+    {
+        $user = User::factory()->create();
+        $this->createPaidMaxSubscription($user);
+        $plugin = $this->createOfficialPlugin();
+
+        // Pre-existing license
+        PluginLicense::factory()->create([
+            'user_id' => $user->id,
+            'plugin_id' => $plugin->id,
+            'expires_at' => null,
+        ]);
+
+        $this->actingAs($user);
+
+        $cartService = resolve(CartService::class);
+        $cart = $cartService->getCart($user);
+        $cartService->addPlugin($cart, $plugin);
+
+        $this->post(route('cart.checkout'));
+
+        // Should still only have 1 license
+        $this->assertEquals(1, $user->pluginLicenses()->forPlugin($plugin)->count());
+    }
+
+    public function test_free_checkout_success_page_renders(): void
+    {
+        $user = User::factory()->create();
+        $this->actingAs($user);
+
+        $response = $this->get(route('cart.success', ['free' => 1]));
+        $response->assertStatus(200);
+        $response->assertSee('Plugins Added!');
+    }
+
+    // ---- Phase 3: Team plugin access ----
+
+    public function test_team_member_has_plugin_access_via_owner_license(): void
+    {
+        $owner = User::factory()->create();
+        $this->createPaidMaxSubscription($owner);
+
+        $team = Team::factory()->create(['user_id' => $owner->id]);
+        $member = User::factory()->create();
+
+        TeamUser::create([
+            'team_id' => $team->id,
+            'user_id' => $member->id,
+            'email' => $member->email,
+            'status' => 'active',
+            'role' => 'member',
+            'accepted_at' => now(),
+        ]);
+
+        $plugin = Plugin::factory()->approved()->paid()->create([
+            'name' => 'nativephp/licensed-plugin',
+            'type' => PluginType::Paid,
+            'is_active' => true,
+            'is_official' => true,
+        ]);
+
+        $this->assertTrue($member->hasPluginAccess($plugin));
+    }
+
+    public function test_team_member_loses_access_when_removed(): void
+    {
+        $owner = User::factory()->create();
+        $this->createPaidMaxSubscription($owner);
+
+        $team = Team::factory()->create(['user_id' => $owner->id]);
+        $member = User::factory()->create();
+
+        $teamUser = TeamUser::create([
+            'team_id' => $team->id,
+            'user_id' => $member->id,
+            'email' => $member->email,
+            'status' => 'active',
+            'role' => 'member',
+            'accepted_at' => now(),
+        ]);
+
+        $plugin = Plugin::factory()->approved()->paid()->create([
+            'name' => 'nativephp/licensed-plugin',
+            'type' => PluginType::Paid,
+            'is_active' => true,
+            'is_official' => true,
+        ]);
+
+        $this->assertTrue($member->hasPluginAccess($plugin));
+
+        // Remove from team
+        $teamUser->delete();
+
+        $this->assertFalse($member->hasPluginAccess($plugin));
+    }
+
+    public function test_non_team_member_does_not_get_team_plugin_access(): void
+    {
+        $owner = User::factory()->create();
+        $this->createPaidMaxSubscription($owner);
+
+        Team::factory()->create(['user_id' => $owner->id]);
+        $nonMember = User::factory()->create();
+
+        $plugin = Plugin::factory()->approved()->paid()->create([
+            'name' => 'nativephp/licensed-plugin',
+            'type' => PluginType::Paid,
+            'is_active' => true,
+            'is_official' => true,
+        ]);
+
+        PluginLicense::factory()->create([
+            'user_id' => $owner->id,
+            'plugin_id' => $plugin->id,
+            'expires_at' => null,
+        ]);
+
+        $this->assertFalse($nonMember->hasPluginAccess($plugin));
+    }
+
+    public function test_pending_team_member_does_not_get_plugin_access(): void
+    {
+        $owner = User::factory()->create();
+        $this->createPaidMaxSubscription($owner);
+
+        $team = Team::factory()->create(['user_id' => $owner->id]);
+        $member = User::factory()->create();
+
+        TeamUser::create([
+            'team_id' => $team->id,
+            'user_id' => $member->id,
+            'email' => $member->email,
+            'status' => 'pending',
+            'role' => 'member',
+            'invited_at' => now(),
+        ]);
+
+        $plugin = Plugin::factory()->approved()->paid()->create([
+            'name' => 'nativephp/licensed-plugin',
+            'type' => PluginType::Paid,
+            'is_active' => true,
+            'is_official' => true,
+        ]);
+
+        PluginLicense::factory()->create([
+            'user_id' => $owner->id,
+            'plugin_id' => $plugin->id,
+            'expires_at' => null,
+        ]);
+
+        $this->assertFalse($member->hasPluginAccess($plugin));
+    }
+
+    public function test_satis_api_includes_team_plugins(): void
+    {
+        $owner = User::factory()->create([
+            'plugin_license_key' => 'owner-key',
+        ]);
+        $this->createPaidMaxSubscription($owner);
+
+        $team = Team::factory()->create(['user_id' => $owner->id]);
+        $member = User::factory()->create([
+            'plugin_license_key' => 'member-key',
+        ]);
+
+        TeamUser::create([
+            'team_id' => $team->id,
+            'user_id' => $member->id,
+            'email' => $member->email,
+            'status' => 'active',
+            'role' => 'member',
+            'accepted_at' => now(),
+        ]);
+
+        $plugin = Plugin::factory()->create([
+            'name' => 'nativephp/team-plugin',
+            'type' => PluginType::Paid,
+            'status' => PluginStatus::Approved,
+            'is_active' => true,
+            'is_official' => true,
+        ]);
+
+        PluginLicense::factory()->create([
+            'user_id' => $owner->id,
+            'plugin_id' => $plugin->id,
+            'expires_at' => null,
+        ]);
+
+        $response = $this->withHeaders([
+            'X-API-Key' => config('services.bifrost.api_key'),
+            'Authorization' => 'Basic '.base64_encode("{$member->email}:member-key"),
+        ])->getJson('/api/plugins/access');
+
+        $response->assertStatus(200);
+
+        $plugins = $response->json('plugins');
+        $pluginNames = array_column($plugins, 'name');
+
+        $this->assertContains('nativephp/team-plugin', $pluginNames);
+
+        $teamPlugin = collect($plugins)->firstWhere('name', 'nativephp/team-plugin');
+        $this->assertEquals('team', $teamPlugin['access']);
+    }
+
+    public function test_satis_check_access_returns_true_for_team_member(): void
+    {
+        $owner = User::factory()->create([
+            'plugin_license_key' => 'owner-key',
+        ]);
+        $this->createPaidMaxSubscription($owner);
+
+        $team = Team::factory()->create(['user_id' => $owner->id]);
+        $member = User::factory()->create([
+            'plugin_license_key' => 'member-key',
+        ]);
+
+        TeamUser::create([
+            'team_id' => $team->id,
+            'user_id' => $member->id,
+            'email' => $member->email,
+            'status' => 'active',
+            'role' => 'member',
+            'accepted_at' => now(),
+        ]);
+
+        $plugin = Plugin::factory()->create([
+            'name' => 'nativephp/team-plugin',
+            'type' => PluginType::Paid,
+            'status' => PluginStatus::Approved,
+            'is_active' => true,
+            'is_official' => true,
+        ]);
+
+        PluginLicense::factory()->create([
+            'user_id' => $owner->id,
+            'plugin_id' => $plugin->id,
+            'expires_at' => null,
+        ]);
+
+        $response = $this->withHeaders([
+            'X-API-Key' => config('services.bifrost.api_key'),
+            'Authorization' => 'Basic '.base64_encode("{$member->email}:member-key"),
+        ])->getJson('/api/plugins/access/nativephp/team-plugin');
+
+        $response->assertStatus(200)
+            ->assertJson([
+                'has_access' => true,
+            ]);
+    }
+
+    // ---- Phase 4: Team Plugins on Purchased Plugins page ----
+
+    public function test_purchased_plugins_page_shows_team_plugins_for_team_member(): void
+    {
+        $owner = User::factory()->create();
+        $this->createPaidMaxSubscription($owner);
+
+        $team = Team::factory()->create(['user_id' => $owner->id]);
+        $member = User::factory()->create();
+
+        TeamUser::create([
+            'team_id' => $team->id,
+            'user_id' => $member->id,
+            'email' => $member->email,
+            'status' => 'active',
+            'role' => 'member',
+            'accepted_at' => now(),
+        ]);
+
+        $plugin = Plugin::factory()->approved()->paid()->create([
+            'name' => 'nativephp/shared-plugin',
+            'is_active' => true,
+        ]);
+
+        PluginLicense::factory()->create([
+            'user_id' => $owner->id,
+            'plugin_id' => $plugin->id,
+            'expires_at' => null,
+        ]);
+
+        $this->actingAs($member);
+        $response = $this->get(route('customer.purchased-plugins.index'));
+
+        $response->assertStatus(200);
+        $response->assertSee('Team Plugins');
+        $response->assertSee($owner->display_name);
+        $response->assertSee('nativephp/shared-plugin');
+    }
+
+    public function test_purchased_plugins_page_does_not_show_team_plugins_for_non_member(): void
+    {
+        $user = User::factory()->create();
+        $this->actingAs($user);
+
+        $response = $this->get(route('customer.purchased-plugins.index'));
+
+        $response->assertStatus(200);
+        $response->assertDontSee('Team Plugins');
+    }
+
+    // ---- Comped Ultra subscriptions ----
+
+    public function test_comped_ultra_user_has_active_ultra_subscription(): void
+    {
+        $user = User::factory()->create();
+        $this->createCompedUltraSubscription($user);
+
+        $this->assertTrue($user->hasActiveUltraSubscription());
+    }
+
+    public function test_comped_ultra_user_has_ultra_access(): void
+    {
+        $user = User::factory()->create();
+        $this->createCompedUltraSubscription($user);
+
+        $this->assertTrue($user->hasUltraAccess());
+    }
+
+    public function test_comped_ultra_user_gets_free_official_plugin(): void
+    {
+        $user = User::factory()->create();
+        $this->createCompedUltraSubscription($user);
+        $plugin = $this->createOfficialPlugin();
+
+        $bestPrice = $plugin->getBestPriceForUser($user);
+
+        $this->assertNotNull($bestPrice);
+        $this->assertEquals(0, $bestPrice->amount);
+    }
+
+    public function test_legacy_comped_max_does_not_have_active_ultra_subscription(): void
+    {
+        $user = User::factory()->create();
+        $this->createCompedMaxSubscription($user);
+
+        $this->assertFalse($user->hasActiveUltraSubscription());
+    }
+
+    public function test_legacy_comped_max_does_not_have_ultra_access(): void
+    {
+        $user = User::factory()->create();
+        $this->createCompedMaxSubscription($user);
+
+        $this->assertFalse($user->hasUltraAccess());
+    }
+}