diff --git a/app-modules/activity/database/migrations/2026_03_18_000000_create_interactions_table.php b/app-modules/activity/database/migrations/2026_03_18_000000_create_interactions_table.php
index 35861eb81..b71c60124 100644
--- a/app-modules/activity/database/migrations/2026_03_18_000000_create_interactions_table.php
+++ b/app-modules/activity/database/migrations/2026_03_18_000000_create_interactions_table.php
@@ -13,7 +13,7 @@ public function up(): void
         Schema::create('interactions', function (Blueprint $table): void {
             $table->uuid('id')->primary();
             $table->foreignUuid('character_id')->constrained('characters');
-            $table->foreignId('tenant_id')->constrained('tenants');
+            $table->foreignUuid('tenant_id')->constrained('tenants');
             $table->string('type');
             $table->string('provider');
             $table->string('value_tier');
diff --git a/app-modules/activity/database/migrations/2026_04_17_000001_add_metadata_to_messages_table.php b/app-modules/activity/database/migrations/2026_04_17_000001_add_metadata_to_messages_table.php
index d3842a1e0..756e1f70b 100644
--- a/app-modules/activity/database/migrations/2026_04_17_000001_add_metadata_to_messages_table.php
+++ b/app-modules/activity/database/migrations/2026_04_17_000001_add_metadata_to_messages_table.php
@@ -12,13 +12,13 @@ public function up(): void
     {
         if (!Schema::hasColumn('messages', 'tenant_id')) {
             Schema::table('messages', function (Blueprint $table): void {
-                $table->foreignId('tenant_id')->nullable()->after('id')->constrained('tenants');
+                $table->foreignUuid('tenant_id')->nullable()->after('id')->constrained('tenants');
             });
         }
 
         if (!Schema::hasColumn('voice_messages', 'tenant_id')) {
             Schema::table('voice_messages', function (Blueprint $table): void {
-                $table->foreignId('tenant_id')->nullable()->after('id')->constrained('tenants');
+                $table->foreignUuid('tenant_id')->nullable()->after('id')->constrained('tenants');
             });
         }
 
diff --git a/app-modules/activity/database/migrations/2026_04_17_000002_create_moderation_events_table.php b/app-modules/activity/database/migrations/2026_04_17_000002_create_moderation_events_table.php
index e997bde34..860997603 100644
--- a/app-modules/activity/database/migrations/2026_04_17_000002_create_moderation_events_table.php
+++ b/app-modules/activity/database/migrations/2026_04_17_000002_create_moderation_events_table.php
@@ -12,7 +12,7 @@ public function up(): void
     {
         Schema::create('moderation_events', function (Blueprint $table): void {
             $table->uuid('id')->primary();
-            $table->foreignId('tenant_id')->constrained('tenants');
+            $table->foreignUuid('tenant_id')->constrained('tenants');
             $table->foreignUuid('external_identity_id')->nullable()->constrained('external_identities');
             $table->foreignUuid('moderator_identity_id')->nullable()->constrained('external_identities');
             $table->string('type');
diff --git a/app-modules/activity/database/migrations/2026_04_17_000003_create_activity_reactions_table.php b/app-modules/activity/database/migrations/2026_04_17_000003_create_activity_reactions_table.php
index 6617425da..e1469e670 100644
--- a/app-modules/activity/database/migrations/2026_04_17_000003_create_activity_reactions_table.php
+++ b/app-modules/activity/database/migrations/2026_04_17_000003_create_activity_reactions_table.php
@@ -12,7 +12,7 @@ public function up(): void
     {
         Schema::create('activity_reactions', function (Blueprint $table): void {
             $table->uuid('id')->primary();
-            $table->foreignId('tenant_id')->constrained('tenants');
+            $table->foreignUuid('tenant_id')->constrained('tenants');
             $table->uuidMorphs('reactable');
 
             $table->string('emoji_key', 128);
diff --git a/app-modules/activity/database/migrations/2026_04_18_000000_cleanup_duplicate_messages_for_tenant_2.php b/app-modules/activity/database/migrations/2026_04_18_000000_cleanup_duplicate_messages_for_tenant_2.php
deleted file mode 100644
index 07f150cc1..000000000
--- a/app-modules/activity/database/migrations/2026_04_18_000000_cleanup_duplicate_messages_for_tenant_2.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Support\Facades\DB;
-
-return new class extends Migration
-{
-    public function up(): void
-    {
-        DB::statement('
-            DELETE FROM messages
-            WHERE tenant_id = 2
-              AND id IN (
-                SELECT id FROM (
-                    SELECT id, ROW_NUMBER() OVER (
-                        PARTITION BY tenant_id, provider_message_id
-                        ORDER BY created_at ASC, id ASC
-                    ) AS rn
-                    FROM messages
-                    WHERE tenant_id = 2
-                      AND provider_message_id IS NOT NULL
-                ) ranked
-                WHERE rn > 1
-            )
-        ');
-    }
-
-    public function down(): void {}
-};
diff --git a/app-modules/activity/database/migrations/2026_04_20_110053_create_message_mentions_and_threads.php b/app-modules/activity/database/migrations/2026_04_20_110053_create_message_mentions_and_threads.php
index 03f752ff9..8bdee176c 100644
--- a/app-modules/activity/database/migrations/2026_04_20_110053_create_message_mentions_and_threads.php
+++ b/app-modules/activity/database/migrations/2026_04_20_110053_create_message_mentions_and_threads.php
@@ -12,7 +12,7 @@ public function up(): void
     {
         Schema::create('message_mentions', function (Blueprint $table): void {
             $table->uuid('id')->primary();
-            $table->foreignId('tenant_id')->constrained('tenants');
+            $table->foreignUuid('tenant_id')->constrained('tenants');
             $table->foreignUuid('message_id')->constrained('messages')->cascadeOnDelete();
             $table->foreignUuid('mentioned_identity_id')->nullable()->constrained('external_identities');
             $table->string('mentioned_provider_account_id');
@@ -36,7 +36,7 @@ public function up(): void
 
         Schema::create('message_threads', function (Blueprint $table): void {
             $table->uuid('id')->primary();
-            $table->foreignId('tenant_id')->constrained('tenants');
+            $table->foreignUuid('tenant_id')->constrained('tenants');
             $table->foreignUuid('message_id')->constrained('messages')->cascadeOnDelete();
             $table->string('provider_thread_id');
             $table->string('name')->nullable();
diff --git a/app-modules/activity/database/migrations/2026_04_20_111057_create_fase3_activity_tables.php b/app-modules/activity/database/migrations/2026_04_20_111057_create_fase3_activity_tables.php
index 41f5b75e8..19499269e 100644
--- a/app-modules/activity/database/migrations/2026_04_20_111057_create_fase3_activity_tables.php
+++ b/app-modules/activity/database/migrations/2026_04_20_111057_create_fase3_activity_tables.php
@@ -13,7 +13,7 @@ public function up(): void
     {
         Schema::create('message_attachments', function (Blueprint $table): void {
             $table->uuid('id')->primary();
-            $table->foreignId('tenant_id')->constrained('tenants');
+            $table->foreignUuid('tenant_id')->constrained('tenants');
             $table->foreignUuid('message_id')->constrained('messages')->cascadeOnDelete();
             $table->string('provider_attachment_id')->nullable();
             $table->text('url');
@@ -29,7 +29,7 @@ public function up(): void
 
         Schema::create('message_embeds', function (Blueprint $table): void {
             $table->uuid('id')->primary();
-            $table->foreignId('tenant_id')->constrained('tenants');
+            $table->foreignUuid('tenant_id')->constrained('tenants');
             $table->foreignUuid('message_id')->constrained('messages')->cascadeOnDelete();
             $table->text('url')->nullable();
             $table->text('title')->nullable();
@@ -48,7 +48,7 @@ public function up(): void
 
         Schema::create('membership_events', function (Blueprint $table): void {
             $table->uuid('id')->primary();
-            $table->foreignId('tenant_id')->constrained('tenants');
+            $table->foreignUuid('tenant_id')->constrained('tenants');
             $table->foreignUuid('external_identity_id')->constrained('external_identities');
             $table->string('kind');
             $table->timestamp('occurred_at');
diff --git a/app-modules/activity/database/migrations/2026_05_09_154113_create_activity_timeline_table.php b/app-modules/activity/database/migrations/2026_05_09_154113_create_activity_timeline_table.php
index dc0542c3e..85af46c87 100644
--- a/app-modules/activity/database/migrations/2026_05_09_154113_create_activity_timeline_table.php
+++ b/app-modules/activity/database/migrations/2026_05_09_154113_create_activity_timeline_table.php
@@ -2,8 +2,6 @@
 
 declare(strict_types=1);
 
-use He4rt\Identity\Tenant\Models\Tenant;
-use He4rt\Identity\User\Models\User;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
@@ -14,8 +12,8 @@ public function up(): void
     {
         Schema::create('activity_timeline', function (Blueprint $table): void {
             $table->uuid('id')->primary();
-            $table->foreignIdFor(User::class, 'user_id');
-            $table->foreignIdFor(Tenant::class, 'tenant_id');
+            $table->foreignUuid('user_id');
+            $table->foreignUuid('tenant_id');
             $table->uuidMorphs('postable');
             $table->foreignUuid('root_id')->nullable();
             $table->foreignUuid('parent_id')->nullable();
diff --git a/app-modules/identity/database/migrations/2025_11_02_172528_create_tenants_table.php b/app-modules/identity/database/migrations/2025_11_02_172528_create_tenants_table.php
index b30e74425..646dd32da 100644
--- a/app-modules/identity/database/migrations/2025_11_02_172528_create_tenants_table.php
+++ b/app-modules/identity/database/migrations/2025_11_02_172528_create_tenants_table.php
@@ -2,7 +2,6 @@
 
 declare(strict_types=1);
 
-use He4rt\Identity\User\Models\User;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
@@ -12,10 +11,10 @@
     public function up(): void
     {
         Schema::create('tenants', function (Blueprint $table): void {
-            $table->id();
+            $table->uuid('id')->primary();
             $table->string('name');
             $table->string('slug');
-            $table->foreignIdFor(User::class, 'owner_id')->constrained('users');
+            $table->foreignUuid('owner_id')->constrained('users');
             $table->boolean('active');
             $table->timestamps();
             $table->softDeletes();
diff --git a/app-modules/identity/database/migrations/2025_11_02_172618_set_up_tenant_module.php b/app-modules/identity/database/migrations/2025_11_02_172618_set_up_tenant_module.php
index 501319570..253c2bc7e 100644
--- a/app-modules/identity/database/migrations/2025_11_02_172618_set_up_tenant_module.php
+++ b/app-modules/identity/database/migrations/2025_11_02_172618_set_up_tenant_module.php
@@ -26,7 +26,7 @@ public function up(): void
 
         foreach ($tables as $table => $indexableColumns) {
             Schema::table($table, function (Blueprint $table) use ($indexableColumns): void {
-                $table->foreignId('tenant_id')
+                $table->foreignUuid('tenant_id')
                     ->after('id')
                     ->constrained('tenants')
                     ->nullOnDelete();
@@ -36,12 +36,7 @@ public function up(): void
                 }
             });
         }
-
     }
 
-    public function down(): void
-    {
-        // Don't listen to the haters
-        // Schema::dropIfExists('tenant');
-    }
+    public function down(): void {}
 };
diff --git a/app-modules/identity/database/migrations/2025_11_08_161609_create_tenant_users_table.php b/app-modules/identity/database/migrations/2025_11_08_161609_create_tenant_users_table.php
index 0c707cebc..7fa0dde1c 100644
--- a/app-modules/identity/database/migrations/2025_11_08_161609_create_tenant_users_table.php
+++ b/app-modules/identity/database/migrations/2025_11_08_161609_create_tenant_users_table.php
@@ -14,7 +14,7 @@
     public function up(): void
     {
         Schema::create('tenant_users', function (Blueprint $table): void {
-            $table->foreignId('tenant_id')->constrained('tenants')->cascadeOnDelete();
+            $table->foreignUuid('tenant_id')->constrained('tenants')->cascadeOnDelete();
             $table->foreignUuid('user_id')->constrained('users')->cascadeOnDelete();
             $table->timestamps();
         });
diff --git a/app-modules/identity/database/migrations/2026_05_26_020000_restore_tenant_id_indexes_and_foreign_keys.php b/app-modules/identity/database/migrations/2026_05_26_020000_restore_tenant_id_indexes_and_foreign_keys.php
deleted file mode 100644
index bf6e92c63..000000000
--- a/app-modules/identity/database/migrations/2026_05_26_020000_restore_tenant_id_indexes_and_foreign_keys.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Support\Facades\DB;
-
-return new class extends Migration
-{
-    public $withinTransaction = false;
-
-    public function up(): void
-    {
-        DB::statement("SET maintenance_work_mem = '1GB'");
-
-        // Tier 1 — critical: large tables + high-frequency queries
-        DB::statement('CREATE INDEX CONCURRENTLY IF NOT EXISTS messages_tenant_id_idx ON messages (tenant_id)');
-        DB::statement('CREATE INDEX CONCURRENTLY IF NOT EXISTS messages_tenant_sent_at_idx ON messages (tenant_id, sent_at DESC)');
-        DB::statement('CREATE INDEX CONCURRENTLY IF NOT EXISTS tenant_users_tenant_id_idx ON tenant_users (tenant_id)');
-        DB::statement('CREATE INDEX CONCURRENTLY IF NOT EXISTS tenant_users_user_id_idx ON tenant_users (user_id)');
-        DB::statement('CREATE INDEX CONCURRENTLY IF NOT EXISTS external_identities_provider_account_idx ON external_identities (provider, external_account_id)');
-        DB::statement('CREATE INDEX CONCURRENTLY IF NOT EXISTS voice_messages_tenant_id_idx ON voice_messages (tenant_id)');
-
-        // Tier 2 — medium tables, listing queries
-        DB::statement('CREATE INDEX CONCURRENTLY IF NOT EXISTS message_embeds_tenant_id_idx ON message_embeds (tenant_id)');
-        DB::statement('CREATE INDEX CONCURRENTLY IF NOT EXISTS message_mentions_tenant_id_idx ON message_mentions (tenant_id)');
-        DB::statement('CREATE INDEX CONCURRENTLY IF NOT EXISTS message_attachments_tenant_id_idx ON message_attachments (tenant_id)');
-        DB::statement('CREATE INDEX CONCURRENTLY IF NOT EXISTS activity_reactions_tenant_id_idx ON activity_reactions (tenant_id)');
-        DB::statement('CREATE INDEX CONCURRENTLY IF NOT EXISTS characters_tenant_id_idx ON characters (tenant_id)');
-        DB::statement('CREATE INDEX CONCURRENTLY IF NOT EXISTS external_identities_tenant_id_idx ON external_identities (tenant_id)');
-
-        // Tier 3 — small tables, completeness
-        DB::statement('CREATE INDEX CONCURRENTLY IF NOT EXISTS activity_timeline_tenant_id_idx ON activity_timeline (tenant_id)');
-        DB::statement('CREATE INDEX CONCURRENTLY IF NOT EXISTS badges_tenant_id_idx ON badges (tenant_id)');
-        DB::statement('CREATE INDEX CONCURRENTLY IF NOT EXISTS characters_badges_tenant_id_idx ON characters_badges (tenant_id)');
-        DB::statement('CREATE INDEX CONCURRENTLY IF NOT EXISTS discord_guilds_tenant_id_idx ON discord_guilds (tenant_id)');
-        DB::statement('CREATE INDEX CONCURRENTLY IF NOT EXISTS feedback_reviews_tenant_id_idx ON feedback_reviews (tenant_id)');
-        DB::statement('CREATE INDEX CONCURRENTLY IF NOT EXISTS feedbacks_tenant_id_idx ON feedbacks (tenant_id)');
-        DB::statement('CREATE INDEX CONCURRENTLY IF NOT EXISTS interactions_tenant_id_idx ON interactions (tenant_id)');
-        DB::statement('CREATE INDEX CONCURRENTLY IF NOT EXISTS meetings_tenant_id_idx ON meetings (tenant_id)');
-        DB::statement('CREATE INDEX CONCURRENTLY IF NOT EXISTS membership_events_tenant_id_idx ON membership_events (tenant_id)');
-        DB::statement('CREATE INDEX CONCURRENTLY IF NOT EXISTS message_threads_tenant_id_idx ON message_threads (tenant_id)');
-        DB::statement('CREATE INDEX CONCURRENTLY IF NOT EXISTS moderation_actions_tenant_id_idx ON moderation_actions (tenant_id)');
-        DB::statement('CREATE INDEX CONCURRENTLY IF NOT EXISTS moderation_appeals_tenant_id_idx ON moderation_appeals (tenant_id)');
-        DB::statement('CREATE INDEX CONCURRENTLY IF NOT EXISTS moderation_audit_log_tenant_id_idx ON moderation_audit_log (tenant_id)');
-        DB::statement('CREATE INDEX CONCURRENTLY IF NOT EXISTS moderation_cases_tenant_id_idx ON moderation_cases (tenant_id)');
-        DB::statement('CREATE INDEX CONCURRENTLY IF NOT EXISTS moderation_events_tenant_id_idx ON moderation_events (tenant_id)');
-        DB::statement('CREATE INDEX CONCURRENTLY IF NOT EXISTS moderation_rules_tenant_id_idx ON moderation_rules (tenant_id)');
-        DB::statement('CREATE INDEX CONCURRENTLY IF NOT EXISTS seasons_tenant_id_idx ON seasons (tenant_id)');
-        DB::statement('CREATE INDEX CONCURRENTLY IF NOT EXISTS seasons_rankings_tenant_id_idx ON seasons_rankings (tenant_id)');
-        DB::statement('CREATE INDEX CONCURRENTLY IF NOT EXISTS twitch_event_logs_tenant_id_idx ON twitch_event_logs (tenant_id)');
-        DB::statement('CREATE INDEX CONCURRENTLY IF NOT EXISTS twitch_subscriptions_tenant_id_idx ON twitch_subscriptions (tenant_id)');
-        DB::statement('CREATE INDEX CONCURRENTLY IF NOT EXISTS user_profiles_tenant_id_idx ON user_profiles (tenant_id)');
-
-        DB::statement('SET maintenance_work_mem = DEFAULT');
-    }
-
-    public function down(): void
-    {
-        $indexes = [
-            'messages_tenant_id_idx',
-            'messages_tenant_sent_at_idx',
-            'tenant_users_tenant_id_idx',
-            'tenant_users_user_id_idx',
-            'external_identities_provider_account_idx',
-            'external_identities_tenant_id_idx',
-            'voice_messages_tenant_id_idx',
-            'message_embeds_tenant_id_idx',
-            'message_mentions_tenant_id_idx',
-            'message_attachments_tenant_id_idx',
-            'activity_reactions_tenant_id_idx',
-            'characters_tenant_id_idx',
-            'activity_timeline_tenant_id_idx',
-            'badges_tenant_id_idx',
-            'characters_badges_tenant_id_idx',
-            'discord_guilds_tenant_id_idx',
-            'feedback_reviews_tenant_id_idx',
-            'feedbacks_tenant_id_idx',
-            'interactions_tenant_id_idx',
-            'meetings_tenant_id_idx',
-            'membership_events_tenant_id_idx',
-            'message_threads_tenant_id_idx',
-            'moderation_actions_tenant_id_idx',
-            'moderation_appeals_tenant_id_idx',
-            'moderation_audit_log_tenant_id_idx',
-            'moderation_cases_tenant_id_idx',
-            'moderation_events_tenant_id_idx',
-            'moderation_rules_tenant_id_idx',
-            'seasons_tenant_id_idx',
-            'seasons_rankings_tenant_id_idx',
-            'twitch_event_logs_tenant_id_idx',
-            'twitch_subscriptions_tenant_id_idx',
-            'user_profiles_tenant_id_idx',
-        ];
-
-        foreach ($indexes as $index) {
-            DB::statement(sprintf('DROP INDEX IF EXISTS %s', $index));
-        }
-    }
-};
diff --git a/app-modules/identity/src/Auth/Actions/AttachProviderToUser.php b/app-modules/identity/src/Auth/Actions/AttachProviderToUser.php
index f226d6f36..a7533acb9 100644
--- a/app-modules/identity/src/Auth/Actions/AttachProviderToUser.php
+++ b/app-modules/identity/src/Auth/Actions/AttachProviderToUser.php
@@ -32,6 +32,7 @@ public function execute(User|Tenant $owner, Tenant $tenant, OAuthUserDTO $oauthU
                     'username' => $oauthUser->username,
                 ]),
                 'connected_at' => now(),
+                'disconnected_at' => null,
                 'connected_by' => auth()->id(),
             ]
         );
diff --git a/app-modules/identity/src/Auth/Exceptions/OAuthFlowException.php b/app-modules/identity/src/Auth/Exceptions/OAuthFlowException.php
index 9f746e9a0..5ea3d8362 100644
--- a/app-modules/identity/src/Auth/Exceptions/OAuthFlowException.php
+++ b/app-modules/identity/src/Auth/Exceptions/OAuthFlowException.php
@@ -28,4 +28,9 @@ public static function tenantNotFound(string $identifier): self
     {
         return new self(sprintf('Tenant "%s" not found.', $identifier));
     }
+
+    public static function tokenExchangeFailed(string $provider, string $error): self
+    {
+        return new self(sprintf('Token exchange failed for "%s": %s', $provider, $error));
+    }
 }
diff --git a/app-modules/identity/src/Auth/Http/Controllers/OAuthController.php b/app-modules/identity/src/Auth/Http/Controllers/OAuthController.php
index 8e0503822..a5381a94a 100644
--- a/app-modules/identity/src/Auth/Http/Controllers/OAuthController.php
+++ b/app-modules/identity/src/Auth/Http/Controllers/OAuthController.php
@@ -9,9 +9,12 @@
 use He4rt\Identity\Auth\Actions\HandleOAuthCallbackAction;
 use He4rt\Identity\Auth\DTOs\OAuthStateDTO;
 use He4rt\Identity\Auth\Enums\OAuthIntent;
+use He4rt\Identity\Auth\Exceptions\OAuthFlowException;
 use He4rt\Identity\ExternalIdentity\Enums\IdentityProvider;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Log;
+use RuntimeException;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 final class OAuthController extends Controller
@@ -22,7 +25,13 @@ public function getRedirect(string $tenant, string $panel, string $provider): Re
 
         throw_if($identityProvider === null, NotFoundHttpException::class);
 
-        $client = $identityProvider->getClient();
+        try {
+            $client = $identityProvider->getClient();
+        } catch (RuntimeException $runtimeException) {
+            Log::warning('OAuth client not configured', ['provider' => $provider, 'error' => $runtimeException->getMessage()]);
+
+            return redirect()->to('/');
+        }
 
         throw_unless($client instanceof OAuthClientContract, NotFoundHttpException::class);
 
@@ -45,7 +54,22 @@ public function getAuthenticate(string $provider, HandleOAuthCallbackAction $act
 
         $state = OAuthStateDTO::fromEncryptedString(request()->input('state'));
 
-        $result = $action->execute($state, $identityProvider, request()->input('code'));
+        $code = request()->input('code');
+        $oauthDenied = $code === null || request()->has('error');
+
+        if ($oauthDenied) {
+            $fallbackUrl = $state->returnUrl ?? '/';
+
+            return redirect()->to($fallbackUrl);
+        }
+
+        try {
+            $result = $action->execute($state, $identityProvider, $code);
+        } catch (OAuthFlowException $oAuthFlowException) {
+            Log::warning('OAuth flow failed', ['provider' => $provider, 'error' => $oAuthFlowException->getMessage()]);
+
+            return redirect()->to($state->returnUrl ?? '/');
+        }
 
         if ($result->hasMergeConflict()) {
             session()->put('oauth_merge_pending', $result->mergeConflict->toSession());
diff --git a/app-modules/integration-discord/database/migrations/2026_05_19_200000_create_discord_guilds_table.php b/app-modules/integration-discord/database/migrations/2026_05_19_200000_create_discord_guilds_table.php
index d97166134..a2bfa0709 100644
--- a/app-modules/integration-discord/database/migrations/2026_05_19_200000_create_discord_guilds_table.php
+++ b/app-modules/integration-discord/database/migrations/2026_05_19_200000_create_discord_guilds_table.php
@@ -15,7 +15,7 @@ public function up(): void
     {
         Schema::create('discord_guilds', function (Blueprint $table): void {
             $table->id();
-            $table->foreignId('tenant_id')->nullable()->constrained('tenants')->nullOnDelete();
+            $table->foreignUuid('tenant_id')->nullable()->constrained('tenants')->nullOnDelete();
             $table->string('discord_guild_id')->unique();
             $table->string('name');
             $table->string('icon')->nullable();
diff --git a/app-modules/integration-discord/src/OAuth/DiscordOAuthClient.php b/app-modules/integration-discord/src/OAuth/DiscordOAuthClient.php
index 701d42386..c5baf73b3 100644
--- a/app-modules/integration-discord/src/OAuth/DiscordOAuthClient.php
+++ b/app-modules/integration-discord/src/OAuth/DiscordOAuthClient.php
@@ -8,6 +8,7 @@
 use He4rt\Identity\Auth\DTOs\OAuthAccessDTO;
 use He4rt\Identity\Auth\DTOs\OAuthStateDTO;
 use He4rt\Identity\Auth\DTOs\OAuthUserDTO;
+use He4rt\Identity\Auth\Exceptions\OAuthFlowException;
 use He4rt\IntegrationDiscord\Transport\DiscordOAuthConnector;
 use He4rt\IntegrationDiscord\Transport\Requests\OAuth\ExchangeCodeForToken;
 use He4rt\IntegrationDiscord\Transport\Requests\OAuth\GetCurrentUser;
@@ -38,7 +39,14 @@ public function auth(string $code): OAuthAccessDTO
             redirectUri: $this->callbackUrl(),
         ));
 
-        return DiscordOAuthAccessDTO::make($response->json());
+        $payload = $response->json();
+        $tokenExchangeFailed = !isset($payload['access_token']);
+
+        if ($tokenExchangeFailed) {
+            throw OAuthFlowException::tokenExchangeFailed('discord', $payload['error'] ?? 'unknown');
+        }
+
+        return DiscordOAuthAccessDTO::make($payload);
     }
 
     public function getAuthenticatedUser(OAuthAccessDTO $credentials): OAuthUserDTO
diff --git a/app-modules/integration-github/src/IntegrationGithubServiceProvider.php b/app-modules/integration-github/src/IntegrationGithubServiceProvider.php
index d596c9df8..9fad34ace 100644
--- a/app-modules/integration-github/src/IntegrationGithubServiceProvider.php
+++ b/app-modules/integration-github/src/IntegrationGithubServiceProvider.php
@@ -7,15 +7,23 @@
 use He4rt\IntegrationGithub\Transport\GitHubApiConnector;
 use He4rt\IntegrationGithub\Transport\GitHubOAuthConnector;
 use Illuminate\Support\ServiceProvider;
+use RuntimeException;
 
 class IntegrationGithubServiceProvider extends ServiceProvider
 {
     public function register(): void
     {
-        $this->app->singleton(GitHubOAuthConnector::class, fn () => new GitHubOAuthConnector(
-            clientId: config('services.github.client_id'),
-            clientSecret: config('services.github.client_secret'),
-        ));
+        $this->app->singleton(GitHubOAuthConnector::class, function (): GitHubOAuthConnector {
+            $clientId = config('services.github.client_id');
+            $clientSecret = config('services.github.client_secret');
+
+            throw_if($clientId === null || $clientSecret === null, RuntimeException::class, 'GitHub OAuth credentials are not configured (services.github.client_id / client_secret).');
+
+            return new GitHubOAuthConnector(
+                clientId: $clientId,
+                clientSecret: $clientSecret,
+            );
+        });
 
         $this->app->singleton(GitHubApiConnector::class, fn () => new GitHubApiConnector());
     }
diff --git a/app-modules/integration-github/src/OAuth/GitHubOAuthClient.php b/app-modules/integration-github/src/OAuth/GitHubOAuthClient.php
index b83d00421..c098d18d3 100644
--- a/app-modules/integration-github/src/OAuth/GitHubOAuthClient.php
+++ b/app-modules/integration-github/src/OAuth/GitHubOAuthClient.php
@@ -7,6 +7,7 @@
 use App\Contracts\OAuthClientContract;
 use He4rt\Identity\Auth\DTOs\OAuthAccessDTO;
 use He4rt\Identity\Auth\DTOs\OAuthStateDTO;
+use He4rt\Identity\Auth\Exceptions\OAuthFlowException;
 use He4rt\IntegrationGithub\OAuth\DTO\GitHubOAuthAccessDTO;
 use He4rt\IntegrationGithub\OAuth\DTO\GitHubOAuthUserDTO;
 use He4rt\IntegrationGithub\Transport\GitHubApiConnector;
@@ -40,7 +41,14 @@ public function auth(string $code): GitHubOAuthAccessDTO
             redirectUri: $this->callbackUrl(),
         ));
 
-        return GitHubOAuthAccessDTO::make($response->json());
+        $payload = $response->json();
+        $tokenExchangeFailed = !isset($payload['access_token']);
+
+        if ($tokenExchangeFailed) {
+            throw OAuthFlowException::tokenExchangeFailed('github', $payload['error_description'] ?? $payload['error'] ?? 'unknown');
+        }
+
+        return GitHubOAuthAccessDTO::make($payload);
     }
 
     public function getAuthenticatedUser(OAuthAccessDTO $credentials): GitHubOAuthUserDTO
diff --git a/app-modules/integration-twitch/database/migrations/2026_05_22_000001_create_twitch_subscriptions_table.php b/app-modules/integration-twitch/database/migrations/2026_05_22_000001_create_twitch_subscriptions_table.php
index f97c03307..3cc876a10 100644
--- a/app-modules/integration-twitch/database/migrations/2026_05_22_000001_create_twitch_subscriptions_table.php
+++ b/app-modules/integration-twitch/database/migrations/2026_05_22_000001_create_twitch_subscriptions_table.php
@@ -21,7 +21,7 @@ public function up(): void
             $table->string('callback_url')->nullable();
             $table->integer('cost')->default(0);
             $table->string('version')->default('1');
-            $table->foreignId('tenant_id')->constrained()->cascadeOnDelete();
+            $table->foreignUuid('tenant_id')->constrained()->cascadeOnDelete();
             $table->timestamps();
 
             $table->index('type');
diff --git a/app-modules/integration-twitch/database/migrations/2026_05_22_000002_add_tenant_id_to_twitch_event_logs_table.php b/app-modules/integration-twitch/database/migrations/2026_05_22_000002_add_tenant_id_to_twitch_event_logs_table.php
index e02ec95ce..07304e3ae 100644
--- a/app-modules/integration-twitch/database/migrations/2026_05_22_000002_add_tenant_id_to_twitch_event_logs_table.php
+++ b/app-modules/integration-twitch/database/migrations/2026_05_22_000002_add_tenant_id_to_twitch_event_logs_table.php
@@ -11,7 +11,7 @@
     public function up(): void
     {
         Schema::table('twitch_event_logs', function (Blueprint $table): void {
-            $table->foreignId('tenant_id')->nullable()->after('id')->constrained()->nullOnDelete();
+            $table->foreignUuid('tenant_id')->nullable()->after('id')->constrained()->nullOnDelete();
         });
     }
 
diff --git a/app-modules/integration-twitch/src/OAuth/TwitchOAuthClient.php b/app-modules/integration-twitch/src/OAuth/TwitchOAuthClient.php
index e634fc7ac..cb0f2a189 100644
--- a/app-modules/integration-twitch/src/OAuth/TwitchOAuthClient.php
+++ b/app-modules/integration-twitch/src/OAuth/TwitchOAuthClient.php
@@ -7,6 +7,7 @@
 use App\Contracts\OAuthClientContract;
 use He4rt\Identity\Auth\DTOs\OAuthAccessDTO;
 use He4rt\Identity\Auth\DTOs\OAuthStateDTO;
+use He4rt\Identity\Auth\Exceptions\OAuthFlowException;
 use He4rt\IntegrationTwitch\OAuth\DTO\TwitchOAuthAccessDTO;
 use He4rt\IntegrationTwitch\OAuth\DTO\TwitchOAuthDTO;
 use He4rt\IntegrationTwitch\Transport\Requests\OAuth\ExchangeCodeForToken;
@@ -46,7 +47,14 @@ public function auth(string $code): TwitchOAuthAccessDTO
             redirectUri: $this->callbackUrl(),
         ));
 
-        return TwitchOAuthAccessDTO::make($response->json());
+        $payload = $response->json();
+        $tokenExchangeFailed = !isset($payload['access_token']);
+
+        if ($tokenExchangeFailed) {
+            throw OAuthFlowException::tokenExchangeFailed('twitch', $payload['message'] ?? $payload['error'] ?? 'unknown');
+        }
+
+        return TwitchOAuthAccessDTO::make($payload);
     }
 
     public function getAuthenticatedUser(OAuthAccessDTO $credentials): TwitchOAuthDTO
diff --git a/app-modules/moderation/database/migrations/2026_05_02_000001_create_moderation_cases_table.php b/app-modules/moderation/database/migrations/2026_05_02_000001_create_moderation_cases_table.php
index 067c6db07..7aa2b87cf 100644
--- a/app-modules/moderation/database/migrations/2026_05_02_000001_create_moderation_cases_table.php
+++ b/app-modules/moderation/database/migrations/2026_05_02_000001_create_moderation_cases_table.php
@@ -28,7 +28,7 @@ public function up(): void
             $table->timestampTz('assigned_at')->nullable();
             $table->timestampTz('resolved_at')->nullable();
             $table->foreignUuid('author_id')->nullable()->constrained('users')->nullOnDelete();
-            $table->foreignId('tenant_id')->nullable()->constrained('tenants')->nullOnDelete();
+            $table->foreignUuid('tenant_id')->nullable()->constrained('tenants')->nullOnDelete();
             $table->timestampsTz();
 
             $table->index(['tenant_id', 'status', 'priority', 'created_at'], 'idx_cases_queue');
diff --git a/app-modules/moderation/database/migrations/2026_05_02_000005_create_moderation_rules_table.php b/app-modules/moderation/database/migrations/2026_05_02_000005_create_moderation_rules_table.php
index 58f7737ac..9d13477de 100644
--- a/app-modules/moderation/database/migrations/2026_05_02_000005_create_moderation_rules_table.php
+++ b/app-modules/moderation/database/migrations/2026_05_02_000005_create_moderation_rules_table.php
@@ -20,7 +20,7 @@ public function up(): void
             $table->string('severity', 20);
             $table->string('action_on_match', 30);
             $table->boolean('is_active')->default(true);
-            $table->foreignId('tenant_id')->nullable()->constrained('tenants')->nullOnDelete();
+            $table->foreignUuid('tenant_id')->nullable()->constrained('tenants')->nullOnDelete();
             $table->timestampsTz();
 
             $table->index(['is_active', 'tenant_id'], 'idx_rules_active');
diff --git a/app-modules/moderation/database/migrations/2026_05_02_000006_create_moderation_audit_log_table.php b/app-modules/moderation/database/migrations/2026_05_02_000006_create_moderation_audit_log_table.php
index 615d7099e..fec7a6dc1 100644
--- a/app-modules/moderation/database/migrations/2026_05_02_000006_create_moderation_audit_log_table.php
+++ b/app-modules/moderation/database/migrations/2026_05_02_000006_create_moderation_audit_log_table.php
@@ -18,7 +18,7 @@ public function up(): void
             $table->uuid('case_id')->nullable();
             $table->jsonb('details');
             $table->string('platform', 20)->nullable();
-            $table->unsignedBigInteger('tenant_id')->nullable();
+            $table->uuid('tenant_id')->nullable();
             $table->timestampTz('created_at')->useCurrent();
 
             $table->index(['tenant_id', 'created_at'], 'idx_audit_tenant_date');
diff --git a/app-modules/moderation/database/migrations/2026_05_02_142344_add_tenant_id_to_moderation_actions_and_appeals.php b/app-modules/moderation/database/migrations/2026_05_02_142344_add_tenant_id_to_moderation_actions_and_appeals.php
index b3244c1df..5d1035bb6 100644
--- a/app-modules/moderation/database/migrations/2026_05_02_142344_add_tenant_id_to_moderation_actions_and_appeals.php
+++ b/app-modules/moderation/database/migrations/2026_05_02_142344_add_tenant_id_to_moderation_actions_and_appeals.php
@@ -12,11 +12,11 @@
     public function up(): void
     {
         Schema::table('moderation_actions', function (Blueprint $table): void {
-            $table->foreignId('tenant_id')->nullable()->after('automated')->constrained('tenants')->nullOnDelete();
+            $table->foreignUuid('tenant_id')->nullable()->after('automated')->constrained('tenants')->nullOnDelete();
         });
 
         Schema::table('moderation_appeals', function (Blueprint $table): void {
-            $table->foreignId('tenant_id')->nullable()->after('sla_deadline')->constrained('tenants')->nullOnDelete();
+            $table->foreignUuid('tenant_id')->nullable()->after('sla_deadline')->constrained('tenants')->nullOnDelete();
         });
 
         DB::statement('
diff --git a/app-modules/panel-app/resources/views/auth/login.blade.php b/app-modules/panel-app/resources/views/auth/login.blade.php
index 7165646de..67b2fdb93 100644
--- a/app-modules/panel-app/resources/views/auth/login.blade.php
+++ b/app-modules/panel-app/resources/views/auth/login.blade.php
@@ -96,6 +96,14 @@ class="flex items-center justify-center gap-2.5 rounded-lg bg-zinc-800 px-4 py-2
                         @svg ('fab-github', 'h-5 w-5')
                         Continuar com GitHub
                     </a>
+
+                    <a
+                        href="{{ route('oauth.redirect', ['tenant' => request()->getHost(), 'panel' => 'app', 'provider' => 'twitch']) }}"
+                        class="flex items-center justify-center gap-2.5 rounded-lg bg-[#9146FF] px-4 py-2.5 text-sm font-medium text-white transition hover:bg-[#7B2FF0]"
+                    >
+                        @svg ('fab-twitch', 'h-5 w-5')
+                        Continuar com Twitch
+                    </a>
                 </div>
 
                 {{-- Divider --}}
diff --git a/app-modules/panel-app/resources/views/pages/profile.blade.php b/app-modules/panel-app/resources/views/pages/profile.blade.php
index 6b6c573a4..3ccd6abb3 100644
--- a/app-modules/panel-app/resources/views/pages/profile.blade.php
+++ b/app-modules/panel-app/resources/views/pages/profile.blade.php
@@ -29,8 +29,8 @@
                     'coverPreviewUrl' => $this->coverPreviewUrl
                 ])
 
-            <div class="rounded-xl bg-gray-900 p-4">
-                <h3 class="mb-3 text-sm font-semibold text-white">
+            <div class="rounded-xl bg-white p-4 ring-1 ring-gray-950/5 dark:bg-gray-900 dark:ring-white/10">
+                <h3 class="mb-3 text-sm font-semibold text-gray-900 dark:text-white">
                     {{ __('panel-app::profile.sections.connections') }}
                 </h3>
                 <livewire:connection-hub />
diff --git a/app-modules/portal/resources/views/components/navbar.blade.php b/app-modules/portal/resources/views/components/navbar.blade.php
index 2ed4fd2f1..a4c6efcc4 100644
--- a/app-modules/portal/resources/views/components/navbar.blade.php
+++ b/app-modules/portal/resources/views/components/navbar.blade.php
@@ -23,21 +23,27 @@ class="relative pb-1 text-sm font-medium text-gray-400 transition-colors after:a
             @endforeach
         </div>
 
-        <x-he4rt::button
-            href="https://discord.gg/he4rt"
-            size="xs"
-            icon="fab-discord"
-            iconPosition="leading"
-            iconOnly
-            class="w-auto! md:hidden"
-        >
-            Discord
-        </x-he4rt::button>
+        <div class="flex items-center gap-4">
+            <x-he4rt::button href="/app" size="sm" variant="outline" class="hidden md:inline-flex">
+                Área do Usuário
+            </x-he4rt::button>
 
-        <div class="hidden md:block">
-            <x-he4rt::button href="https://discord.gg/he4rt" size="sm" icon="fab-discord" iconPosition="leading">
+            <x-he4rt::button
+                href="https://discord.gg/he4rt"
+                size="xs"
+                icon="fab-discord"
+                iconPosition="leading"
+                iconOnly
+                class="w-auto! md:hidden"
+            >
                 Discord
             </x-he4rt::button>
+
+            <div class="hidden md:block">
+                <x-he4rt::button href="https://discord.gg/he4rt" size="sm" icon="fab-discord" iconPosition="leading">
+                    Discord
+                </x-he4rt::button>
+            </div>
         </div>
     </div>
 </nav>
diff --git a/app-modules/portal/src/Livewire/HeroSection.php b/app-modules/portal/src/Livewire/HeroSection.php
index 843bd6285..536562863 100644
--- a/app-modules/portal/src/Livewire/HeroSection.php
+++ b/app-modules/portal/src/Livewire/HeroSection.php
@@ -78,13 +78,18 @@ private function fetchAvatars(): array
             return [];
         }
 
+        $githubHandle = fn (array $metadata): ?string => $metadata['username'] ?? $metadata['name'] ?? null;
+
         return ExternalIdentity::query()
             ->where('provider', IdentityProvider::GitHub)
             ->whereIn('model_id', $activeUserIds)
             ->inRandomOrder()
             ->limit(10)
             ->pluck('metadata')
-            ->map(fn (array $metadata) => sprintf('https://github.com/%s.png', $metadata['name']))
+            ->map(fn (array $metadata) => $githubHandle($metadata))
+            ->filter()
+            ->map(fn (string $handle) => sprintf('https://github.com/%s.png', $handle))
+            ->values()
             ->all();
     }
 
diff --git a/app-modules/profile/database/migrations/2026_05_21_000000_create_user_profiles_table.php b/app-modules/profile/database/migrations/2026_05_21_000000_create_user_profiles_table.php
index 2474cb0b0..3c511e245 100644
--- a/app-modules/profile/database/migrations/2026_05_21_000000_create_user_profiles_table.php
+++ b/app-modules/profile/database/migrations/2026_05_21_000000_create_user_profiles_table.php
@@ -14,7 +14,7 @@ public function up(): void
         Schema::create('user_profiles', function (Blueprint $table): void {
             $table->uuid('id')->primary();
             $table->foreignUuid('user_id')->constrained('users')->cascadeOnDelete();
-            $table->foreignId('tenant_id')->constrained('tenants')->cascadeOnDelete();
+            $table->foreignUuid('tenant_id')->constrained('tenants')->cascadeOnDelete();
             $table->string('nickname')->nullable();
             $table->date('birthdate')->nullable();
             $table->text('about')->nullable();
diff --git a/resources/views/livewire/connection-hub.blade.php b/resources/views/livewire/connection-hub.blade.php
index f77655673..a419c0789 100644
--- a/resources/views/livewire/connection-hub.blade.php
+++ b/resources/views/livewire/connection-hub.blade.php
@@ -25,10 +25,11 @@
         @endphp
         <div
             wire:key="provider-{{ $provider->value }}"
-            class="relative overflow-hidden rounded-lg border transition-all duration-200"
-            style="{{ $connected
-                ? "border-color: {$brandColor}30;"
-                : 'border-color: rgb(55 65 81 / 0.4);' }}"
+            @class ([
+                'relative overflow-hidden rounded-lg border transition-all duration-200',
+                'border-gray-200 dark:border-gray-700/40' => !$connected
+            ])
+            @if ($connected) style="border-color: {{ $brandColor }}30;" @endif
         >
             <div class="flex items-center gap-2.5 p-2.5">
                 {{-- Provider icon --}}
@@ -45,7 +46,7 @@ class="h-4 w-4"
                     </div>
                     @if ($connected)
                         <div
-                            class="absolute -right-0.5 -bottom-0.5 h-2.5 w-2.5 rounded-full border-2 border-gray-900 bg-emerald-400"
+                            class="absolute -right-0.5 -bottom-0.5 h-2.5 w-2.5 rounded-full border-2 border-white bg-emerald-400 dark:border-gray-900"
                         ></div>
                     @endif
                 </div>
@@ -53,9 +54,12 @@ class="absolute -right-0.5 -bottom-0.5 h-2.5 w-2.5 rounded-full border-2 border-
                 {{-- Content --}}
                 <div class="min-w-0 flex-1">
                     <div class="flex items-baseline gap-2">
-                        <span class="truncate text-sm font-medium text-white">{{ $provider->getLabel() }}</span>
+                        <span
+                            class="truncate text-sm font-medium text-gray-900 dark:text-white"
+                            >{{ $provider->getLabel() }}</span
+                        >
                         @if ($connected)
-                            <span class="shrink-0 text-[10px] text-gray-500">
+                            <span class="shrink-0 text-[10px] text-gray-400 dark:text-gray-500">
                                 {{
                                     $connected->connected_at
                                         ->timezone(config('app.display_timezone'))
@@ -75,7 +79,7 @@ class="h-3.5 w-3.5 rounded-full"
                                     loading="lazy"
                                 />
                             @endif
-                            <span class="truncate text-gray-300">{{
+                            <span class="truncate text-gray-500 dark:text-gray-300">{{
                                 $connected->metadata['username'] ??
                                     $connected->external_account_id
                             }}</span>
@@ -88,7 +92,7 @@ class="h-3.5 w-3.5 rounded-full"
                     <button
                         wire:click="disconnect('{{ $provider->value }}')"
                         type="button"
-                        class="shrink-0 rounded-md px-2 py-0.5 text-[11px] font-medium text-gray-400 ring-1 ring-gray-700/60 transition-all hover:text-red-400 hover:ring-red-500/40"
+                        class="shrink-0 rounded-md px-2 py-0.5 text-[11px] font-medium text-gray-500 ring-1 ring-gray-300 transition-all hover:text-red-500 hover:ring-red-400/40 dark:text-gray-400 dark:ring-gray-700/60 dark:hover:text-red-400 dark:hover:ring-red-500/40"
                     >
                         Disconnect
                     </button>
@@ -101,17 +105,17 @@ class="shrink-0 rounded-md px-2 py-0.5 text-[11px] font-medium text-gray-400 rin
 
             {{-- Permissions --}}
             @if (!$connected && count($scopes) > 0)
-                <div x-data="{ open: false }" class="border-t border-gray-800/50">
+                <div x-data="{ open: false }" class="border-t border-gray-200 dark:border-gray-800/50">
                     <button
                         @click="open = !open"
                         type="button"
-                        class="flex w-full items-center gap-1 px-2.5 py-1.5 text-[10px] font-medium tracking-wider text-gray-500 uppercase transition-colors hover:text-gray-400"
+                        class="flex w-full items-center gap-1 px-2.5 py-1.5 text-[10px] font-medium tracking-wider text-gray-400 uppercase transition-colors hover:text-gray-600 dark:text-gray-500 dark:hover:text-gray-400"
                     >
                         <span class="transition-transform duration-200" :class="open && 'rotate-90'">
                             <x-filament::icon icon="heroicon-m-chevron-right" class="h-2.5 w-2.5" />
                         </span>
                         <span>Permissions</span>
-                        <span class="text-gray-600">({{ count($scopes) }})</span>
+                        <span class="text-gray-300 dark:text-gray-600">({{ count($scopes) }})</span>
                     </button>
                     <div
                         x-show="open"
@@ -127,7 +131,7 @@ class="px-2.5 pb-2"
                         <div class="flex flex-wrap gap-1">
                             @foreach ($scopes as $scope)
                                 <code
-                                    class="rounded bg-gray-800/80 px-1 py-0.5 font-mono text-[9px] text-gray-400 ring-1 ring-gray-700/50"
+                                    class="rounded bg-gray-100 px-1 py-0.5 font-mono text-[9px] text-gray-500 ring-1 ring-gray-200 dark:bg-gray-800/80 dark:text-gray-400 dark:ring-gray-700/50"
                                 >
                                     {{ $scope }}
                                 </code>
@@ -147,27 +151,33 @@ class="rounded bg-gray-800/80 px-1 py-0.5 font-mono text-[9px] text-gray-400 rin
             x-transition
             class="fixed inset-0 z-50 flex items-center justify-center bg-black/60 p-4"
         >
-            <div class="w-full max-w-sm rounded-xl border border-gray-700 bg-gray-900 p-6 shadow-2xl">
+            <div
+                class="w-full max-w-sm rounded-xl border border-gray-200 bg-white p-6 shadow-2xl dark:border-gray-700 dark:bg-gray-900"
+            >
                 <div class="mb-4 flex items-center gap-2">
                     <x-filament::icon icon="heroicon-o-link" class="h-5 w-5 text-amber-400" />
-                    <h3 class="text-base font-semibold text-white">Conta existente encontrada</h3>
+                    <h3 class="text-base font-semibold text-gray-900 dark:text-white">Conta existente encontrada</h3>
                 </div>
 
-                <p class="mb-4 text-sm text-gray-300">Já existe uma conta vinculada a esse provedor:</p>
+                <p class="mb-4 text-sm text-gray-600 dark:text-gray-300">Já existe uma conta vinculada a esse provedor:</p>
 
-                <div class="mb-4 rounded-lg border border-gray-700/60 bg-gray-800/50 p-3">
+                <div
+                    class="mb-4 rounded-lg border border-gray-200 bg-gray-50 p-3 dark:border-gray-700/60 dark:bg-gray-800/50"
+                >
                     <div class="flex items-center justify-between">
-                        <span class="text-sm font-medium text-white">@ {{ $mergeTarget['username'] }}</span>
-                        <span class="text-xs text-gray-400">{{ $mergeTarget['created_at'] }}</span>
+                        <span class="text-sm font-medium text-gray-900 dark:text-white"
+                            >@ {{ $mergeTarget['username'] }}</span
+                        >
+                        <span class="text-xs text-gray-500 dark:text-gray-400">{{ $mergeTarget['created_at'] }}</span>
                     </div>
                     @if ($mergeTarget['messages_count'] > 0)
-                        <div class="mt-1 text-xs text-gray-400">
+                        <div class="mt-1 text-xs text-gray-500 dark:text-gray-400">
                             {{ number_format($mergeTarget['messages_count']) }} mensagens
                         </div>
                     @endif
                 </div>
 
-                <p class="mb-5 text-xs text-gray-400">Ao unificar, sua conta atual será absorvida por essa conta e você será relogado automaticamente.</p>
+                <p class="mb-5 text-xs text-gray-500 dark:text-gray-400">Ao unificar, sua conta atual será absorvida por essa conta e você será relogado automaticamente.</p>
 
                 <div class="flex gap-2">
                     <x-filament::button wire:click="confirmMerge" color="warning" class="flex-1">