diff --git a/app/Community/Actions/DropGameClaimAction.php b/app/Community/Actions/DropGameClaimAction.php
index d2bec60142..4efb04f37a 100644
--- a/app/Community/Actions/DropGameClaimAction.php
+++ b/app/Community/Actions/DropGameClaimAction.php
@@ -43,9 +43,9 @@ public function execute(Game $game): ?AchievementSetClaim
 
                 Cache::forget(CacheKey::buildUserExpiringClaimsCacheKey($firstCollabClaim->user->User));
 
-                addArticleComment("Server", ArticleType::SetClaim, $game->ID, "Primary claim dropped by {$currentUser->User}, transferred to {$firstCollabClaim->user->User}");
+                addArticleComment("Server", ArticleType::SetClaim, $game->ID, "Primary claim dropped by {$currentUser->display_name}, transferred to {$firstCollabClaim->user->display_name}");
             } else {
-                addArticleComment("Server", ArticleType::SetClaim, $game->ID, ClaimType::toString($claim->ClaimType) . " claim dropped by {$currentUser->User}");
+                addArticleComment("Server", ArticleType::SetClaim, $game->ID, ClaimType::toString($claim->ClaimType) . " claim dropped by {$currentUser->display_name}");
             }
 
             $webhookUrl = config('services.discord.webhook.claims');
diff --git a/app/Community/Actions/FetchDynamicShortcodeContentAction.php b/app/Community/Actions/FetchDynamicShortcodeContentAction.php
new file mode 100644
index 0000000000..16bedf7a2c
--- /dev/null
+++ b/app/Community/Actions/FetchDynamicShortcodeContentAction.php
@@ -0,0 +1,100 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Community\Actions;
+
+use App\Data\UserData;
+use App\Models\Achievement;
+use App\Models\Game;
+use App\Models\Ticket;
+use App\Models\User;
+use App\Platform\Data\AchievementData;
+use App\Platform\Data\GameData;
+use App\Platform\Data\TicketData;
+use Illuminate\Support\Collection;
+
+class FetchDynamicShortcodeContentAction
+{
+    public function execute(
+        array $usernames = [],
+        array $ticketIds = [],
+        array $achievementIds = [],
+        array $gameIds = [],
+    ): array {
+        $results = collect([
+            'users' => $this->fetchUsers($usernames),
+            'tickets' => $this->fetchTickets($ticketIds),
+            'achievements' => $this->fetchAchievements($achievementIds),
+            'games' => $this->fetchGames($gameIds),
+        ]);
+
+        return $results->toArray();
+    }
+
+    /**
+     * @return Collection<int, UserData>
+     */
+    private function fetchUsers(array $usernames): Collection
+    {
+        if (empty($usernames)) {
+            return collect();
+        }
+
+        $users = User::query()
+            ->where(function ($query) use ($usernames) {
+                $query->whereIn('User', $usernames)
+                    ->orWhereIn('display_name', $usernames);
+            })
+            ->get();
+
+        return $users->map(fn (User $user) => UserData::fromUser($user));
+    }
+
+    /**
+     * @return Collection<int, TicketData>
+     */
+    private function fetchTickets(array $ticketIds): Collection
+    {
+        if (empty($ticketIds)) {
+            return collect();
+        }
+
+        return Ticket::with('achievement')
+            ->whereIn('ID', $ticketIds)
+            ->get()
+            ->map(fn (Ticket $ticket) => TicketData::fromTicket($ticket)->include('state', 'ticketable'));
+    }
+
+    /**
+     * @return Collection<int, AchievementData>
+     */
+    private function fetchAchievements(array $achievementIds): Collection
+    {
+        if (empty($achievementIds)) {
+            return collect();
+        }
+
+        return Achievement::whereIn('ID', $achievementIds)
+            ->get()
+            ->map(fn (Achievement $achievement) => AchievementData::fromAchievement($achievement)->include(
+                'badgeUnlockedUrl',
+                'points'
+            ));
+    }
+
+    /**
+     * @return Collection<int, GameData>
+     */
+    private function fetchGames(array $gameIds): Collection
+    {
+        if (empty($gameIds)) {
+            return collect();
+        }
+
+        return Game::with('system')
+            ->whereIn('ID', $gameIds)
+            ->get()
+            ->map(fn (Game $game) => GameData::fromGame($game)->include('badgeUrl', 'system.name'));
+    }
+}
diff --git a/app/Community/Actions/ReplaceUserShortcodesWithUsernamesAction.php b/app/Community/Actions/ReplaceUserShortcodesWithUsernamesAction.php
index bae7154b39..c9a5225708 100644
--- a/app/Community/Actions/ReplaceUserShortcodesWithUsernamesAction.php
+++ b/app/Community/Actions/ReplaceUserShortcodesWithUsernamesAction.php
@@ -19,14 +19,18 @@ public function execute(string $messageBody): string
             return $messageBody;
         }
 
-        $users = User::whereIn('ID', $userIds)->get()->keyBy('ID');
+        $users = User::whereIn('ID', $userIds)
+            ->get(['ID', 'User', 'display_name'])
+            ->keyBy('ID');
 
         // Replace each shortcode with the corresponding username.
         return preg_replace_callback('/\[user=(\d+)\]/', function ($matches) use ($users) {
             $userId = $matches[1];
             $user = $users->get($userId);
 
-            return '[user=' . ($user ? $user->username : $userId) . ']';
+            $username = $user ? ($user->display_name ?? $user->username) : $userId;
+
+            return "[user={$username}]";
         }, $messageBody);
     }
 }
diff --git a/app/Community/Commands/GenerateAnnualRecap.php b/app/Community/Commands/GenerateAnnualRecap.php
index af0445db0f..69cd474e38 100644
--- a/app/Community/Commands/GenerateAnnualRecap.php
+++ b/app/Community/Commands/GenerateAnnualRecap.php
@@ -29,7 +29,7 @@ public function handle(): void
         if ($userId) {
             $user = is_numeric($userId)
                 ? User::findOrFail($userId)
-                : User::where('User', $userId)->firstOrFail();
+                : User::whereName($userId)->firstOrFail();
 
             $this->generateAnnualRecapAction->execute($user);
         } else {
diff --git a/app/Community/Components/UserCard.php b/app/Community/Components/UserCard.php
index 1c0be2c679..240686c8a8 100644
--- a/app/Community/Components/UserCard.php
+++ b/app/Community/Components/UserCard.php
@@ -58,7 +58,7 @@ private function getUserData(string $username): ?array
         return Cache::store('array')->rememberForever(
             CacheKey::buildUserCardDataCacheKey($username),
             function () use ($username): ?array {
-                $foundUser = User::firstWhere('User', $username);
+                $foundUser = User::whereName($username)->first();
 
                 return $foundUser ? [
                     ...$foundUser->toArray(),
@@ -79,7 +79,7 @@ private function buildAllCardViewValues(string $username, array $rawUserData): a
 
     private function buildCardBioData(array $rawUserData): array
     {
-        $username = $rawUserData['User'] ?? "";
+        $username = $rawUserData['display_name'] ?? $rawUserData['User'] ?? "";
         $motto = $rawUserData['Motto'] && !$rawUserData['isMuted'] ? $rawUserData['Motto'] : null;
         $avatarUrl = $rawUserData['avatarUrl'] ?? null;
         $hardcorePoints = $rawUserData['RAPoints'] ?? 0;
diff --git a/app/Community/Components/UserProfileMeta.php b/app/Community/Components/UserProfileMeta.php
index 15f3754367..9392f477fb 100644
--- a/app/Community/Components/UserProfileMeta.php
+++ b/app/Community/Components/UserProfileMeta.php
@@ -75,7 +75,7 @@ private function buildDeveloperStats(User $user, array $userMassData): array
         $setsWorkedOnStat = [
             'label' => 'Achievement sets worked on',
             'value' => localized_number($gameAuthoredAchievementsCount),
-            'href' => $gameAuthoredAchievementsCount ? route('developer.sets', ['user' => $user]) : null,
+            'href' => $gameAuthoredAchievementsCount ? route('developer.sets', ['user' => $user->display_name]) : null,
             'isMuted' => !$gameAuthoredAchievementsCount,
         ];
 
@@ -83,7 +83,7 @@ private function buildDeveloperStats(User $user, array $userMassData): array
         $achievementsUnlockedByPlayersStat = [
             'label' => 'Achievements unlocked by players',
             'value' => localized_number($userMassData['ContribCount']),
-            'href' => $userMassData['ContribCount'] > 0 ? route('user.achievement-author.feed', ['user' => $user]) : null,
+            'href' => $userMassData['ContribCount'] > 0 ? route('user.achievement-author.feed', ['user' => $user->display_name]) : null,
             'isMuted' => !$userMassData['ContribCount'],
         ];
 
@@ -91,7 +91,7 @@ private function buildDeveloperStats(User $user, array $userMassData): array
         $pointsAwardedToPlayersStat = [
             'label' => 'Points awarded to players',
             'value' => localized_number($userMassData['ContribYield']),
-            'href' => $userMassData['ContribYield'] > 0 ? route('user.achievement-author.feed', ['user' => $user]) : null,
+            'href' => $userMassData['ContribYield'] > 0 ? route('user.achievement-author.feed', ['user' => $user->display_name]) : null,
             'isMuted' => !$userMassData['ContribYield'],
         ];
 
@@ -100,7 +100,7 @@ private function buildDeveloperStats(User $user, array $userMassData): array
         $codeNotesCreatedStat = [
             'label' => 'Code notes created',
             'value' => localized_number($totalAuthoredCodeNotes),
-            'href' => $totalAuthoredCodeNotes ? '/individualdevstats.php?u=' . $user->User . '#code-notes' : null,
+            'href' => $totalAuthoredCodeNotes ? '/individualdevstats.php?u=' . $user->display_name . '#code-notes' : null,
             'isMuted' => !$totalAuthoredCodeNotes,
         ];
 
@@ -111,7 +111,7 @@ private function buildDeveloperStats(User $user, array $userMassData): array
         $leaderboardsCreatedStat = [
             'label' => 'Leaderboards created',
             'value' => localized_number($totalAuthoredLeaderboards),
-            'href' => $totalAuthoredLeaderboards ? '/individualdevstats.php?u=' . $user->User : null,
+            'href' => $totalAuthoredLeaderboards ? '/individualdevstats.php?u=' . $user->display_name : null,
             'isMuted' => !$totalAuthoredLeaderboards,
         ];
 
@@ -122,8 +122,8 @@ private function buildDeveloperStats(User $user, array $userMassData): array
         }
         $openTicketsStat = [
             'label' => 'Open tickets',
-            'value' => $openTickets === null ? "Tickets can't be assigned to {$user->User}." : localized_number($openTickets),
-            'href' => $openTickets ? route('developer.tickets', ['user' => $user]) : null,
+            'value' => $openTickets === null ? "Tickets can't be assigned to {$user->display_name}." : localized_number($openTickets),
+            'href' => $openTickets ? route('developer.tickets', ['user' => $user->display_name]) : null,
             'isMuted' => !$openTickets,
         ];
 
@@ -242,7 +242,7 @@ private function buildPlayerStats(
             'value' => localized_number($totalGamesBeaten),
             'isHrefLabelBeforeLabel' => false,
             'isMuted' => !$totalGamesBeaten,
-            'href' => $retailGamesBeaten ? route('ranking.beaten-games', ['filter[user]' => $user->username]) : null,
+            'href' => $retailGamesBeaten ? route('ranking.beaten-games', ['filter[user]' => $user->display_name]) : null,
         ];
 
         // Started games beaten
@@ -329,7 +329,7 @@ private function buildSocialStats(User $user): array
         $forumPostsStat = [
             'label' => 'Forum posts',
             'value' => localized_number($numForumPosts),
-            'href' => $numForumPosts ? route('user.posts.index', ['user' => $user]) : null,
+            'href' => $numForumPosts ? route('user.posts.index', ['user' => $user->display_name]) : null,
             'isMuted' => $numForumPosts === 0,
         ];
 
diff --git a/app/Community/Controllers/Api/ForumTopicCommentApiController.php b/app/Community/Controllers/Api/ForumTopicCommentApiController.php
new file mode 100644
index 0000000000..e25c7fcd32
--- /dev/null
+++ b/app/Community/Controllers/Api/ForumTopicCommentApiController.php
@@ -0,0 +1,57 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Community\Controllers\Api;
+
+use App\Community\Actions\FetchDynamicShortcodeContentAction;
+use App\Community\Requests\PreviewForumPostRequest;
+use App\Community\Requests\UpdateForumTopicCommentRequest;
+use App\Http\Controller;
+use App\Models\ForumTopicComment;
+use App\Support\Shortcode\Shortcode;
+use Illuminate\Http\JsonResponse;
+
+class ForumTopicCommentApiController extends Controller
+{
+    public function store(): void
+    {
+    }
+
+    public function update(
+        UpdateForumTopicCommentRequest $request,
+        ForumTopicComment $comment
+    ): JsonResponse {
+        $this->authorize('update', $comment);
+
+        // Take any RA links and convert them to relevant shortcodes.
+        // eg: "https://retroachievements.org/game/1" --> "[game=1]"
+        $newPayload = normalize_shortcodes($request->input('body'));
+
+        // Convert [user=$user->username] to [user=$user->id].
+        $newPayload = Shortcode::convertUserShortcodesToUseIds($newPayload);
+
+        $comment->body = $newPayload;
+        $comment->save();
+
+        return response()->json(['success' => true]);
+    }
+
+    public function destroy(): void
+    {
+    }
+
+    public function preview(
+        PreviewForumPostRequest $request,
+        FetchDynamicShortcodeContentAction $action
+    ): JsonResponse {
+        $entities = $action->execute(
+            usernames: $request->input('usernames'),
+            ticketIds: $request->input('ticketIds'),
+            achievementIds: $request->input('achievementIds'),
+            gameIds: $request->input('gameIds'),
+        );
+
+        return response()->json($entities);
+    }
+}
diff --git a/app/Community/Controllers/ForumTopicCommentController.php b/app/Community/Controllers/ForumTopicCommentController.php
index 7033da7f9c..3f35838643 100644
--- a/app/Community/Controllers/ForumTopicCommentController.php
+++ b/app/Community/Controllers/ForumTopicCommentController.php
@@ -6,11 +6,15 @@
 
 use App\Community\Actions\AddCommentAction;
 use App\Community\Actions\GetUrlToCommentDestinationAction;
+use App\Community\Actions\ReplaceUserShortcodesWithUsernamesAction;
 use App\Community\Requests\ForumTopicCommentRequest;
+use App\Data\EditForumTopicCommentPagePropsData;
+use App\Data\ForumTopicCommentData;
 use App\Models\ForumTopic;
 use App\Models\ForumTopicComment;
-use Illuminate\Contracts\View\View;
 use Illuminate\Http\RedirectResponse;
+use Inertia\Inertia;
+use Inertia\Response as InertiaResponse;
 
 class ForumTopicCommentController extends CommentController
 {
@@ -44,12 +48,22 @@ public function store(
         //     ->with('success', $this->resourceActionSuccessMessage('comment', 'create'));
     }
 
-    public function edit(ForumTopicComment $comment): View
+    public function edit(ForumTopicComment $comment): InertiaResponse
     {
         $this->authorize('update', $comment);
 
-        return view('forum-topic-comment.edit')
-            ->with('comment', $comment);
+        // "[user=1]" -> "[user=Scott]"
+        $comment->body = (new ReplaceUserShortcodesWithUsernamesAction())->execute($comment->body);
+
+        $props = new EditForumTopicCommentPagePropsData(
+            forumTopicComment: ForumTopicCommentData::from($comment)->include(
+                'forumTopic',
+                'forumTopic.forum',
+                'forumTopic.forum.category',
+            ),
+        );
+
+        return Inertia::render('forums/post/[comment]/edit', $props);
     }
 
     protected function update(
diff --git a/app/Community/Controllers/MessageController.php b/app/Community/Controllers/MessageController.php
index 72a504c303..3828c3c555 100644
--- a/app/Community/Controllers/MessageController.php
+++ b/app/Community/Controllers/MessageController.php
@@ -53,7 +53,7 @@ public function store(MessageRequest $request): RedirectResponse
 
             (new AddToMessageThreadAction())->execute($thread, $user, $body);
         } else {
-            $recipient = User::firstWhere('User', $input['recipient']);
+            $recipient = User::whereName($input['recipient'])->first();
 
             if (!$user->can('sendToRecipient', [Message::class, $recipient])) {
                 return back()->withErrors($user->isMuted() ?
diff --git a/app/Community/Controllers/UserSettingsController.php b/app/Community/Controllers/UserSettingsController.php
index 550dc9cd63..f6a396cf35 100644
--- a/app/Community/Controllers/UserSettingsController.php
+++ b/app/Community/Controllers/UserSettingsController.php
@@ -95,7 +95,7 @@ public function updateEmail(UpdateEmailRequest $request): JsonResponse
             'Server',
             ArticleType::UserModeration,
             $user->id,
-            "{$user->username} changed their email address"
+            "{$user->display_name} changed their email address"
         );
 
         return response()->json(['success' => true]);
diff --git a/app/Community/Enums/TicketState.php b/app/Community/Enums/TicketState.php
index 07f16246c5..c13910ba2e 100644
--- a/app/Community/Enums/TicketState.php
+++ b/app/Community/Enums/TicketState.php
@@ -4,6 +4,9 @@
 
 namespace App\Community\Enums;
 
+use Spatie\TypeScriptTransformer\Attributes\TypeScript;
+
+#[TypeScript]
 abstract class TicketState
 {
     public const Closed = 0;
diff --git a/app/Community/Listeners/NotifyMessageThreadParticipants.php b/app/Community/Listeners/NotifyMessageThreadParticipants.php
index da50b91093..65506776ea 100644
--- a/app/Community/Listeners/NotifyMessageThreadParticipants.php
+++ b/app/Community/Listeners/NotifyMessageThreadParticipants.php
@@ -61,7 +61,7 @@ public function handle(MessageCreated $event): void
 
             // send email?
             if (BitSet($userTo->websitePrefs, UserPreference::EmailOn_PrivateMessage)) {
-                sendPrivateMessageEmail($userTo->User, $userTo->EmailAddress, $thread->title, $message->body, $userFrom->User);
+                sendPrivateMessageEmail($userTo->display_name, $userTo->EmailAddress, $thread->title, $message->body, $userFrom->display_name);
             }
 
             $this->forwardToDiscord($userFrom, $userTo, $thread, $message);
@@ -156,9 +156,9 @@ private function forwardToDiscord(
             'embeds' => [
                 [
                     'author' => [
-                        'name' => $userFrom->username,
+                        'name' => $userFrom->display_name,
                         // TODO 'url' => route('user.show', $userFrom),
-                        'url' => url('user/' . $userFrom->username),
+                        'url' => url('user/' . $userFrom->display_name),
                         'icon_url' => $userFrom->avatar_url,
                     ],
                     'title' => mb_substr($messageThread->title, 0, 100),
diff --git a/app/Community/Requests/PreviewForumPostRequest.php b/app/Community/Requests/PreviewForumPostRequest.php
new file mode 100644
index 0000000000..5b56475114
--- /dev/null
+++ b/app/Community/Requests/PreviewForumPostRequest.php
@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Community\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class PreviewForumPostRequest extends FormRequest
+{
+    public function rules(): array
+    {
+        return [
+            'usernames' => 'present|array',
+            'usernames.*' => 'string',
+            'ticketIds' => 'present|array',
+            'ticketIds.*' => 'integer',
+            'achievementIds' => 'present|array',
+            'achievementIds.*' => 'integer',
+            'gameIds' => 'present|array',
+            'gameIds.*' => 'integer',
+        ];
+    }
+}
diff --git a/app/Community/Requests/UpdateForumTopicCommentRequest.php b/app/Community/Requests/UpdateForumTopicCommentRequest.php
new file mode 100644
index 0000000000..b5e4b97a5b
--- /dev/null
+++ b/app/Community/Requests/UpdateForumTopicCommentRequest.php
@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Community\Requests;
+
+use App\Support\Rules\ContainsRegularCharacter;
+use Illuminate\Foundation\Http\FormRequest;
+
+class UpdateForumTopicCommentRequest extends FormRequest
+{
+    public function rules(): array
+    {
+        return [
+            'body' => [
+                'required',
+                'string',
+                'max:60000',
+                new ContainsRegularCharacter(),
+            ],
+        ];
+    }
+}
diff --git a/app/Community/RouteServiceProvider.php b/app/Community/RouteServiceProvider.php
index 4e883cc49d..9a35ceeb54 100755
--- a/app/Community/RouteServiceProvider.php
+++ b/app/Community/RouteServiceProvider.php
@@ -9,6 +9,7 @@
 use App\Community\Controllers\AchievementSetClaimController;
 use App\Community\Controllers\Api\AchievementCommentApiController;
 use App\Community\Controllers\Api\ActivePlayersApiController;
+use App\Community\Controllers\Api\ForumTopicCommentApiController;
 use App\Community\Controllers\Api\GameClaimsCommentApiController;
 use App\Community\Controllers\Api\GameCommentApiController;
 use App\Community\Controllers\Api\GameHashesCommentApiController;
@@ -68,6 +69,9 @@ protected function mapWebRoutes(): void
                     Route::group(['prefix' => 'internal-api'], function () {
                         Route::post('achievement/{achievement}/comment', [AchievementCommentApiController::class, 'store'])->name('api.achievement.comment.store');
 
+                        Route::post('forums/post/preview', [ForumTopicCommentApiController::class, 'preview'])->name('api.forum-topic-comment.preview');
+                        Route::patch('forums/post/{comment}', [ForumTopicCommentApiController::class, 'update'])->name('api.forum-topic-comment.update');
+
                         Route::post('game/{game}/claims/comment', [GameClaimsCommentApiController::class, 'store'])->name('api.game.claims.comment.store');
                         Route::post('game/{game}/comment', [GameCommentApiController::class, 'store'])->name('api.game.comment.store');
                         Route::post('game/{game}/hashes/comment', [GameHashesCommentApiController::class, 'store'])->name('api.game.hashes.comment.store');
@@ -114,6 +118,7 @@ protected function mapWebRoutes(): void
                     Route::get('user/{user}/moderation-comments', [UserModerationCommentController::class, 'index'])->name('user.moderation-comment.index');
 
                     Route::get('forums/recent-posts', [ForumTopicController::class, 'recentPosts'])->name('forum.recent-posts');
+                    Route::get('forums/post/{comment}/edit2', [ForumTopicCommentController::class, 'edit'])->name('forum-topic-comment.edit');
 
                     Route::get('user/{user}/posts', [UserForumTopicCommentController::class, 'index'])->name('user.posts.index');
                     Route::get('user/{user}/achievement-checklist', [UserAchievementChecklistController::class, 'index'])->name('user.achievement-checklist');
diff --git a/app/Components/GeneralNotificationsIcon.php b/app/Components/GeneralNotificationsIcon.php
index 4f71f1b3ca..ecac8c4663 100644
--- a/app/Components/GeneralNotificationsIcon.php
+++ b/app/Components/GeneralNotificationsIcon.php
@@ -33,7 +33,7 @@ public function render(): View
             $ticketFeedback = countRequestTicketsByUser($user);
             if ($ticketFeedback) {
                 $notifications->push([
-                    'link' => route('reporter.tickets', ['user' => $user]),
+                    'link' => route('reporter.tickets', ['user' => $user->display_name]),
                     'title' => $ticketFeedback . ' ' . __res('ticket', $ticketFeedback) . ' awaiting your feedback',
                 ]);
             }
@@ -44,13 +44,13 @@ public function render(): View
             $expiringClaims = getExpiringClaim($user);
             if ($expiringClaims['Expired'] ?? 0) {
                 $notifications->push([
-                    'link' => route('developer.claims', ['user' => $user]),
+                    'link' => route('developer.claims', ['user' => $user->display_name]),
                     'title' => 'Claim Expired',
                     'class' => 'text-danger',
                 ]);
             } elseif ($expiringClaims['Expiring'] ?? 0) {
                 $notifications->push([
-                    'link' => route('developer.claims', ['user' => $user]),
+                    'link' => route('developer.claims', ['user' => $user->display_name]),
                     'title' => 'Claim Expiring Soon',
                     'class' => 'text-danger',
                 ]);
diff --git a/app/Components/TicketNotificationsIcon.php b/app/Components/TicketNotificationsIcon.php
index 569bcdd295..2095fc9f1a 100644
--- a/app/Components/TicketNotificationsIcon.php
+++ b/app/Components/TicketNotificationsIcon.php
@@ -24,14 +24,14 @@ public function render(): View
         $openTicketsData = countOpenTicketsByDev($user);
         if ($openTicketsData[TicketState::Open]) {
             $notifications->push([
-                'link' => route('developer.tickets', ['user' => $user]),
+                'link' => route('developer.tickets', ['user' => $user->display_name]),
                 'title' => $openTicketsData[TicketState::Open] . ' ' . __res('ticket', (int) $openTicketsData[TicketState::Open]) . ' for you to resolve',
                 'class' => 'text-danger',
             ]);
         }
         if ($openTicketsData[TicketState::Request]) {
             $notifications->push([
-                'link' => route('developer.tickets', ['user' => $user]),
+                'link' => route('developer.tickets', ['user' => $user->display_name]),
                 'title' => $openTicketsData[TicketState::Request] . ' ' . __res('ticket', (int) $openTicketsData[TicketState::Request]) . ' pending feedback',
                 'read' => true,
             ]);
@@ -40,7 +40,7 @@ public function render(): View
         $ticketFeedback = countRequestTicketsByUser($user);
         if ($ticketFeedback) {
             $notifications->push([
-                'link' => route('reporter.tickets', ['user' => $user]),
+                'link' => route('reporter.tickets', ['user' => $user->display_name]),
                 'title' => $ticketFeedback . ' ' . __res('ticket', $ticketFeedback) . ' awaiting your feedback',
             ]);
         }
diff --git a/app/Data/EditForumTopicCommentPagePropsData.php b/app/Data/EditForumTopicCommentPagePropsData.php
new file mode 100644
index 0000000000..68a0a5cb16
--- /dev/null
+++ b/app/Data/EditForumTopicCommentPagePropsData.php
@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Data;
+
+use Spatie\LaravelData\Data;
+use Spatie\TypeScriptTransformer\Attributes\TypeScript;
+
+#[TypeScript('EditForumTopicCommentPageProps')]
+class EditForumTopicCommentPagePropsData extends Data
+{
+    public function __construct(
+        public ForumTopicCommentData $forumTopicComment,
+    ) {
+    }
+}
diff --git a/app/Data/ForumCategoryData.php b/app/Data/ForumCategoryData.php
new file mode 100644
index 0000000000..cbd95c7e63
--- /dev/null
+++ b/app/Data/ForumCategoryData.php
@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Data;
+
+use App\Models\ForumCategory;
+use Spatie\LaravelData\Data;
+use Spatie\LaravelData\Lazy;
+use Spatie\TypeScriptTransformer\Attributes\TypeScript;
+
+#[TypeScript('ForumCategory')]
+class ForumCategoryData extends Data
+{
+    public function __construct(
+        public int $id,
+        public string $title,
+        public Lazy|string $description,
+        public Lazy|int $orderColumn,
+    ) {
+    }
+
+    public static function fromForumCategory(ForumCategory $category): self
+    {
+        return new self(
+            id: $category->id,
+            title: $category->title,
+            description: Lazy::create(fn () => $category->description),
+            orderColumn: Lazy::create(fn () => $category->order_column),
+        );
+    }
+}
diff --git a/app/Data/ForumData.php b/app/Data/ForumData.php
new file mode 100644
index 0000000000..e4fa09a893
--- /dev/null
+++ b/app/Data/ForumData.php
@@ -0,0 +1,34 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Data;
+
+use App\Models\Forum;
+use Spatie\LaravelData\Data;
+use Spatie\LaravelData\Lazy;
+use Spatie\TypeScriptTransformer\Attributes\TypeScript;
+
+#[TypeScript('Forum')]
+class ForumData extends Data
+{
+    public function __construct(
+        public int $id,
+        public string $title,
+        public Lazy|string $description,
+        public Lazy|int $orderColumn,
+        public Lazy|ForumCategoryData $category,
+    ) {
+    }
+
+    public static function fromForum(Forum $forum): self
+    {
+        return new self(
+            id: $forum->id,
+            title: $forum->title,
+            description: Lazy::create(fn () => $forum->description),
+            orderColumn: Lazy::create(fn () => $forum->order_column),
+            category: Lazy::create(fn () => ForumCategoryData::fromForumCategory($forum->category)),
+        );
+    }
+}
diff --git a/app/Data/ForumTopicCommentData.php b/app/Data/ForumTopicCommentData.php
index 4def7b0662..72a35534dd 100644
--- a/app/Data/ForumTopicCommentData.php
+++ b/app/Data/ForumTopicCommentData.php
@@ -4,8 +4,10 @@
 
 namespace App\Data;
 
-use Illuminate\Support\Carbon;
+use App\Models\ForumTopicComment;
+use Carbon\Carbon;
 use Spatie\LaravelData\Data;
+use Spatie\LaravelData\Lazy;
 use Spatie\TypeScriptTransformer\Attributes\TypeScript;
 
 #[TypeScript('ForumTopicComment')]
@@ -18,7 +20,21 @@ public function __construct(
         public ?Carbon $updatedAt,
         public ?UserData $user,
         public bool $isAuthorized, // TODO migrate to $authorizedAt
-        public ?int $forumTopicId = null,
+        public ?int $forumTopicId = null, // TODO remove and use $forumTopic instead
+        public Lazy|ForumTopicData|null $forumTopic = null,
     ) {
     }
+
+    public static function fromForumTopicComment(ForumTopicComment $comment): self
+    {
+        return new self(
+            id: $comment->id,
+            body: $comment->body,
+            createdAt: $comment->created_at,
+            updatedAt: $comment->updated_at,
+            user: UserData::from($comment->user),
+            isAuthorized: $comment->is_authorized,
+            forumTopic: Lazy::create(fn () => ForumTopicData::from($comment->forumTopic)),
+        );
+    }
 }
diff --git a/app/Data/ForumTopicData.php b/app/Data/ForumTopicData.php
index b6992170fa..5fad8ee75e 100644
--- a/app/Data/ForumTopicData.php
+++ b/app/Data/ForumTopicData.php
@@ -4,8 +4,9 @@
 
 namespace App\Data;
 
+use App\Models\ForumTopic;
 use App\Support\Shortcode\Shortcode;
-use Illuminate\Support\Carbon;
+use Carbon\Carbon;
 use Spatie\LaravelData\Data;
 use Spatie\LaravelData\Lazy;
 use Spatie\TypeScriptTransformer\Attributes\TypeScript;
@@ -17,15 +18,33 @@ public function __construct(
         public int $id,
         public string $title,
         public Carbon $createdAt,
-        public Lazy|ForumTopicCommentData $latestComment,
-        public Lazy|int|null $commentCount24h,
-        public Lazy|int|null $oldestComment24hId,
-        public Lazy|int|null $commentCount7d,
-        public Lazy|int|null $oldestComment7dId,
+        public Lazy|ForumData|null $forum,
+        public Lazy|ForumTopicCommentData|null $latestComment, // TODO move to separate DTO
+        public Lazy|int|null $commentCount24h, // TODO move to separate DTO
+        public Lazy|int|null $oldestComment24hId, // TODO move to separate DTO
+        public Lazy|int|null $commentCount7d, // TODO move to separate DTO
+        public Lazy|int|null $oldestComment7dId, // TODO move to separate DTO
         public ?UserData $user = null,
         ) {
     }
 
+    public static function fromForumTopic(ForumTopic $topic): self
+    {
+        return new self(
+            id: $topic->id,
+            title: $topic->title,
+            createdAt: $topic->created_at,
+            forum: Lazy::create(fn () => ForumData::fromForum($topic->forum)),
+            user: UserData::from($topic->user),
+
+            latestComment: null,
+            commentCount24h: null,
+            oldestComment24hId: null,
+            commentCount7d: null,
+            oldestComment7dId: null,
+        );
+    }
+
     public static function fromHomePageQuery(array $comment): self
     {
         return new self(
@@ -33,6 +52,7 @@ public static function fromHomePageQuery(array $comment): self
             title: $comment['ForumTopicTitle'],
             createdAt: Carbon::parse($comment['PostedAt']),
 
+            forum: null,
             user: null,
 
             commentCount24h: null,
@@ -58,6 +78,7 @@ public static function fromRecentlyActiveTopic(array $topic): self
             title: $topic['ForumTopicTitle'],
             createdAt: Carbon::parse($topic['PostedAt']),
 
+            forum: null,
             user: null,
 
             commentCount24h: Lazy::create(fn () => $topic['Count_1d']),
@@ -87,6 +108,7 @@ public static function fromUserPost(array $userPost): self
             title: $userPost['ForumTopicTitle'],
             createdAt: Carbon::parse($userPost['PostedAt']),
 
+            forum: null,
             user: null,
 
             commentCount24h: null,
diff --git a/app/Filament/Actions/ProcessUploadedImageAction.php b/app/Filament/Actions/ProcessUploadedImageAction.php
index bac344b922..743bad825e 100644
--- a/app/Filament/Actions/ProcessUploadedImageAction.php
+++ b/app/Filament/Actions/ProcessUploadedImageAction.php
@@ -41,6 +41,7 @@ public function execute(string $tempImagePath, ImageUploadType $imageUploadType)
                     ImageUploadType::GameBoxArt => ImageType::GameBoxArt,
                     ImageUploadType::GameTitle => ImageType::GameTitle,
                     ImageUploadType::GameInGame => ImageType::GameInGame,
+                    ImageUploadType::EventAward => ImageType::GameIcon,
                 };
 
                 $file = createFileArrayFromDataUrl($dataUrl);
diff --git a/app/Filament/Enums/ImageUploadType.php b/app/Filament/Enums/ImageUploadType.php
index 51900cd3fc..61b4c8f32f 100644
--- a/app/Filament/Enums/ImageUploadType.php
+++ b/app/Filament/Enums/ImageUploadType.php
@@ -12,4 +12,5 @@ enum ImageUploadType
     case GameBoxArt;
     case GameTitle;
     case GameInGame;
+    case EventAward;
 }
diff --git a/app/Filament/Resources/EventResource.php b/app/Filament/Resources/EventResource.php
index 3a80cd7fa6..5279449bb6 100644
--- a/app/Filament/Resources/EventResource.php
+++ b/app/Filament/Resources/EventResource.php
@@ -9,6 +9,7 @@
 use App\Filament\Extensions\Resources\Resource;
 use App\Filament\Resources\EventResource\Pages;
 use App\Filament\Resources\EventResource\RelationManagers\AchievementsRelationManager;
+use App\Filament\Resources\EventResource\RelationManagers\EventAwardsRelationManager;
 use App\Filament\Resources\EventResource\RelationManagers\HubsRelationManager;
 use App\Filament\Rules\ExistsInForumTopics;
 use App\Models\Event;
@@ -54,10 +55,10 @@ public static function infolist(Infolist $infolist): Infolist
                     ->icon('heroicon-m-key')
                     ->columns(['md' => 2, 'xl' => 3, '2xl' => 4])
                     ->schema([
-                        Infolists\Components\TextEntry::make('game.title')
+                        Infolists\Components\TextEntry::make('legacyGame.title')
                             ->label('Title'),
 
-                        Infolists\Components\TextEntry::make('game.sort_title')
+                        Infolists\Components\TextEntry::make('legacyGame.sort_title')
                             ->label('Sort Title'),
 
                         Infolists\Components\TextEntry::make('slug')
@@ -71,7 +72,7 @@ public static function infolist(Infolist $infolist): Infolist
                             ->extraAttributes(['class' => 'underline'])
                             ->openUrlInNewTab(),
 
-                        Infolists\Components\TextEntry::make('game.forumTopic.id')
+                        Infolists\Components\TextEntry::make('legacyGame.forumTopic.id')
                             ->label('Forum Topic ID')
                             ->url(fn (?int $state) => url("viewtopic.php?t={$state}"))
                             ->extraAttributes(['class' => 'underline']),
@@ -92,11 +93,11 @@ public static function infolist(Infolist $infolist): Infolist
                     ")
                     ->columns(['md' => 2, 'xl' => 3, '2xl' => 4])
                     ->schema([
-                        Infolists\Components\TextEntry::make('game.players_total')
+                        Infolists\Components\TextEntry::make('legacyGame.players_total')
                             ->label('Players')
                             ->numeric(),
 
-                        Infolists\Components\TextEntry::make('game.achievements_published')
+                        Infolists\Components\TextEntry::make('legacyGame.achievements_published')
                             ->label('Achievements')
                             ->numeric(),
                     ]),
@@ -108,7 +109,7 @@ public static function form(Form $form): Form
         return $form
             ->schema([
                 Forms\Components\Section::make()
-                    ->relationship('game')
+                    ->relationship('legacyGame')
                     ->columns(['md' => 2, 'xl' => 3, '2xl' => 4])
                     ->schema([
                         Forms\Components\TextInput::make('Title')
@@ -179,7 +180,7 @@ public static function form(Form $form): Form
                 //       https://discord.com/channels/310192285306454017/758865736072167474/1326712584623099927
                 Forms\Components\Section::make('Media from Game Record')
                     ->icon('heroicon-s-photo')
-                    ->relationship('game')
+                    ->relationship('legacyGame')
                     ->schema([
                         // Store a temporary file on disk until the user submits.
                         // When the user submits, put in storage.
@@ -249,7 +250,7 @@ public static function table(Table $table): Table
                     ->sortable()
                     ->searchable(),
 
-                Tables\Columns\TextColumn::make('game.title')
+                Tables\Columns\TextColumn::make('legacyGame.title')
                     ->sortable()
                     ->searchable(),
 
@@ -263,19 +264,19 @@ public static function table(Table $table): Table
                     ->sortable(['active_until'])
                     ->toggleable(),
 
-                Tables\Columns\TextColumn::make('game.forumTopic.id')
+                Tables\Columns\TextColumn::make('legacyGame.forumTopic.id')
                     ->label('Forum Topic')
                     ->url(fn (?int $state) => url("viewtopic.php?t={$state}"))
                     ->toggleable(isToggledHiddenByDefault: true),
 
-                Tables\Columns\TextColumn::make('game.players_hardcore')
+                Tables\Columns\TextColumn::make('legacyGame.players_hardcore')
                     ->label('Players')
                     ->numeric()
                     ->sortable()
                     ->alignEnd()
                     ->toggleable(isToggledHiddenByDefault: true),
 
-                Tables\Columns\TextColumn::make('game.achievements_published')
+                Tables\Columns\TextColumn::make('legacyGame.achievements_published')
                     ->label('Achievements')
                     ->numeric()
                     ->sortable()
@@ -301,6 +302,7 @@ public static function getRelations(): array
     {
         return [
             AchievementsRelationManager::class,
+            EventAwardsRelationManager::class,
             HubsRelationManager::class,
         ];
     }
@@ -330,6 +332,6 @@ public static function getPages(): array
     public static function getEloquentQuery(): Builder
     {
         return parent::getEloquentQuery()
-            ->with(['game']);
+            ->with(['legacyGame']);
     }
 }
diff --git a/app/Filament/Resources/EventResource/RelationManagers/EventAwardsRelationManager.php b/app/Filament/Resources/EventResource/RelationManagers/EventAwardsRelationManager.php
new file mode 100644
index 0000000000..5678af908e
--- /dev/null
+++ b/app/Filament/Resources/EventResource/RelationManagers/EventAwardsRelationManager.php
@@ -0,0 +1,159 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Filament\Resources\EventResource\RelationManagers;
+
+use App\Filament\Actions\ProcessUploadedImageAction;
+use App\Filament\Enums\ImageUploadType;
+use App\Models\Event;
+use App\Models\EventAward;
+use App\Models\User;
+use Filament\Forms;
+use Filament\Forms\Form;
+use Filament\Resources\RelationManagers\RelationManager;
+use Filament\Tables;
+use Filament\Tables\Table;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\Auth;
+
+class EventAwardsRelationManager extends RelationManager
+{
+    protected static string $relationship = 'awards';
+
+    public static function canViewForRecord(Model $ownerRecord, string $pageClass): bool
+    {
+        /** @var User $user */
+        $user = Auth::user();
+
+        return $user->can('manage', EventAward::class);
+    }
+
+    public function form(Form $form): Form
+    {
+        /** @var Event $event */
+        $event = $this->getOwnerRecord();
+        $minAchievements = 1;
+        $maxAchievements = $event->achievements()->count();
+        $isNew = true;
+
+        if (!$event->awards()->exists()) {
+            $tierIndex = 1;
+        } else {
+            /** @var EventAward $award */
+            $award = $form->model;
+            if (is_a($award, EventAward::class)) {
+                $tierIndex = $award->tier_index;
+                $isNew = false;
+            } else { // new record just passes the class name as $form->model
+                $maxTier = $event->awards()->max('tier_index');
+                $tierIndex = $maxTier + 1;
+            }
+
+            $previousTier = $event->awards()->where('tier_index', $tierIndex - 1)->first();
+            if ($previousTier) {
+                $minAchievements = $previousTier->achievements_required + 1;
+            }
+
+            $nextTier = $event->awards()->where('tier_index', $tierIndex + 1)->first();
+            if ($nextTier) {
+                $maxAchievements = $nextTier->achievements_required - 1;
+            }
+        }
+
+        return $form
+            ->schema([
+                Forms\Components\TextInput::make('label')
+                    ->minLength(2)
+                    ->maxLength(40)
+                    ->required(),
+
+                Forms\Components\TextInput::make('achievements_required')
+                    ->default($maxAchievements)
+                    ->numeric()
+                    ->minValue($minAchievements)
+                    ->maxValue($maxAchievements)
+                    ->required(),
+
+                Forms\Components\TextInput::make('tier_index')
+                    ->default($tierIndex)
+                    ->numeric()
+                    ->readOnly()
+                    ->required(),
+
+                Forms\Components\Section::make('Media')
+                    ->icon('heroicon-s-photo')
+                    ->schema([
+                        // Store a temporary file on disk until the user submits.
+                        // When the user submits, put in storage.
+                        Forms\Components\FileUpload::make('image_asset_path')
+                            ->label('Badge')
+                            ->disk('livewire-tmp') // Use Livewire's self-cleaning temporary disk
+                            ->image()
+                            ->rules([
+                                'dimensions:width=96,height=96',
+                            ])
+                            ->acceptedFileTypes(['image/jpeg', 'image/png', 'image/gif'])
+                            ->maxSize(1024)
+                            ->maxFiles(1)
+                            ->required($isNew)
+                            ->previewable(true),
+                    ])
+                    ->columns(2),
+            ]);
+    }
+
+    public function table(Table $table): Table
+    {
+        return $table
+            ->recordTitleAttribute('label')
+            ->columns([
+                Tables\Columns\TextColumn::make('tier_index'),
+
+                Tables\Columns\ImageColumn::make('badgeUrl')
+                    ->label('Badge')
+                    ->size(config('media.icon.md.width')),
+
+                Tables\Columns\TextColumn::make('label')
+                    ->label('Label'),
+
+                Tables\Columns\TextColumn::make('achievements_required'),
+            ])
+            ->filters([
+
+            ])
+            ->headerActions([
+                Tables\Actions\CreateAction::make()
+                    ->mutateFormDataUsing(function (array $data): array {
+                        $this->processUploadedImage($data, null);
+
+                        return $data;
+                    })
+                    ->createAnother(false), // Create Another doesn't update tier_index, which causes a unique constraint error
+            ])
+            ->actions([
+                Tables\Actions\ActionGroup::make([
+                    Tables\Actions\EditAction::make()
+                        ->mutateFormDataUsing(function (Model $record, array $data): array {
+                            /** @var EventAward $record */
+                            $this->processUploadedImage($data, $record);
+
+                            return $data;
+                        }),
+                ]),
+            ]);
+    }
+
+    protected function processUploadedImage(array &$data, ?EventAward $record): void
+    {
+        if (isset($data['image_asset_path'])) {
+            $data['image_asset_path'] = (new ProcessUploadedImageAction())->execute(
+                $data['image_asset_path'],
+                ImageUploadType::EventAward,
+            );
+        } else {
+            // If no new image was uploaded, retain the existing image.
+            unset($data['image_asset_path']);
+        }
+    }
+}
diff --git a/app/Filament/Resources/EventResource/RelationManagers/HubsRelationManager.php b/app/Filament/Resources/EventResource/RelationManagers/HubsRelationManager.php
index 9b78235cd1..aa7d4055c8 100644
--- a/app/Filament/Resources/EventResource/RelationManagers/HubsRelationManager.php
+++ b/app/Filament/Resources/EventResource/RelationManagers/HubsRelationManager.php
@@ -100,7 +100,7 @@ public function table(Table $table): Table
                         $event = $this->getOwnerRecord();
                         foreach ($data['hub_ids'] as $hubId) {
                             $gameSet = GameSet::find($hubId);
-                            (new AttachGamesToGameSetAction())->execute($gameSet, [$event->game->id]);
+                            (new AttachGamesToGameSetAction())->execute($gameSet, [$event->legacyGame->id]);
                         }
                     }),
             ])
@@ -116,7 +116,7 @@ public function table(Table $table): Table
                         /** @var Event $event */
                         $event = $this->getOwnerRecord();
 
-                        (new DetachGamesFromGameSetAction())->execute($gameSetToDetach, [$event->game->id]);
+                        (new DetachGamesFromGameSetAction())->execute($gameSetToDetach, [$event->legacyGame->id]);
                     }),
 
                 Tables\Actions\Action::make('visit')
@@ -138,7 +138,7 @@ public function table(Table $table): Table
                         $event = $this->getOwnerRecord();
 
                         foreach ($gameSets as $gameSet) {
-                            (new DetachGamesFromGameSetAction())->execute($gameSet, [$event->game->id]);
+                            (new DetachGamesFromGameSetAction())->execute($gameSet, [$event->legacyGame->id]);
                         }
 
                         $this->deselectAllTableRecords();
diff --git a/app/Filament/Resources/GameResource.php b/app/Filament/Resources/GameResource.php
index ca62b13d4c..f643dd68eb 100644
--- a/app/Filament/Resources/GameResource.php
+++ b/app/Filament/Resources/GameResource.php
@@ -530,6 +530,8 @@ public static function getRecordSubNavigation(Page $page): array
     {
         return $page->generateNavigationItems([
             Pages\Details::class,
+            Pages\Hubs::class,
+            Pages\SimilarGames::class,
             Pages\Hashes::class,
             Pages\AuditLog::class,
         ]);
@@ -542,6 +544,8 @@ public static function getPages(): array
             'create' => Pages\Create::route('/create'),
             'view' => Pages\Details::route('/{record}'),
             'edit' => Pages\Edit::route('/{record}/edit'),
+            'hubs' => Pages\Hubs::route('/{record}/hubs'),
+            'similar-games' => Pages\SimilarGames::route('/{record}/similar-games'),
             'hashes' => Pages\Hashes::route('/{record}/hashes'),
             'audit-log' => Pages\AuditLog::route('/{record}/audit-log'),
         ];
diff --git a/app/Filament/Resources/GameResource/Pages/Hubs.php b/app/Filament/Resources/GameResource/Pages/Hubs.php
new file mode 100644
index 0000000000..4afc2f0795
--- /dev/null
+++ b/app/Filament/Resources/GameResource/Pages/Hubs.php
@@ -0,0 +1,166 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Filament\Resources\GameResource\Pages;
+
+use App\Filament\Resources\GameResource;
+use App\Models\Game;
+use App\Models\GameSet;
+use App\Models\User;
+use App\Platform\Actions\AttachGamesToGameSetAction;
+use App\Platform\Actions\DetachGamesFromGameSetAction;
+use App\Platform\Enums\GameSetType;
+use Filament\Forms;
+use Filament\Notifications\Notification;
+use Filament\Resources\Pages\ManageRelatedRecords;
+use Filament\Tables;
+use Filament\Tables\Table;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Auth;
+use Livewire;
+
+class Hubs extends ManageRelatedRecords
+{
+    protected static string $resource = GameResource::class;
+
+    protected static string $relationship = 'hubs';
+
+    protected static ?string $navigationIcon = 'fas-sitemap';
+
+    public static function canAccess(array $arguments = []): bool
+    {
+        /** @var User $user */
+        $user = Auth::user();
+
+        return $user->can('manage', GameSet::class);
+    }
+
+    public static function getNavigationBadge(): ?string
+    {
+        return (string) Livewire::current()->getRecord()->hubs->count();
+    }
+
+    public function table(Table $table): Table
+    {
+        return $table
+            ->columns([
+                Tables\Columns\ImageColumn::make('badge_url')
+                    ->label('')
+                    ->size(config('media.icon.sm.width')),
+
+                Tables\Columns\TextColumn::make('id')
+                    ->label('ID')
+                    ->sortable()
+                    ->searchable(),
+
+                Tables\Columns\TextColumn::make('title')
+                    ->label('Title')
+                    ->searchable(),
+            ])
+            ->filters([
+
+            ])
+            ->headerActions([
+                Tables\Actions\Action::make('add')
+                    ->label('Add hubs')
+                    ->form([
+                        Forms\Components\Select::make('hub_ids')
+                            ->label('Hubs')
+                            ->multiple()
+                            ->options(function () {
+                                return GameSet::whereType(GameSetType::Hub)
+                                    ->whereNotIn('id', $this->getOwnerRecord()->hubs->pluck('id'))
+                                    ->limit(50)
+                                    ->get()
+                                    ->mapWithKeys(fn ($hub) => [$hub->id => "[{$hub->id}] {$hub->title}"]);
+                            })
+                            ->getOptionLabelsUsing(function (array $values): array {
+                                return GameSet::whereType(GameSetType::Hub)
+                                    ->whereIn('id', $values)
+                                    ->get()
+                                    ->mapWithKeys(fn ($hub) => [$hub->id => "[{$hub->id}] {$hub->title}"])
+                                    ->toArray();
+                            })
+                            ->searchable()
+                            ->getSearchResultsUsing(function (string $search) {
+                                return GameSet::whereType(GameSetType::Hub)
+                                    ->whereNotIn('id', $this->getOwnerRecord()->hubs->pluck('id'))
+                                    ->where(function ($query) use ($search) {
+                                        $query->where('id', 'LIKE', "%{$search}%")
+                                            ->orWhere('title', 'LIKE', "%{$search}%");
+                                    })
+                                    ->limit(50)
+                                    ->get()
+                                    ->mapWithKeys(fn ($hub) => [$hub->id => "[{$hub->id}] {$hub->title}"]);
+                            }),
+                    ])
+                    ->modalHeading('Add hubs to game')
+                    ->modalAutofocus(false)
+                    ->action(function (array $data): void {
+                        /** @var Game $game */
+                        $game = $this->getOwnerRecord();
+
+                        $gameSets = GameSet::whereType(GameSetType::Hub)
+                            ->whereIn('id', $data['hub_ids'])
+                            ->get();
+
+                        foreach ($gameSets as $gameSet) {
+                            (new AttachGamesToGameSetAction())->execute($gameSet, [$game->id]);
+                        }
+                    }),
+            ])
+            ->actions([
+                Tables\Actions\Action::make('remove')
+                    ->tooltip('Remove')
+                    ->icon('heroicon-o-trash')
+                    ->iconButton()
+                    ->requiresConfirmation()
+                    ->color('danger')
+                    ->modalHeading('Remove hub from game')
+                    ->action(function (GameSet $gameSet): void {
+                        /** @var Game $game */
+                        $game = $this->getOwnerRecord();
+
+                        (new DetachGamesFromGameSetAction())->execute($gameSet, [$game->id]);
+
+                        Notification::make()
+                            ->success()
+                            ->title('Success')
+                            ->body('Removed hub from the game.')
+                            ->send();
+                    }),
+
+                Tables\Actions\Action::make('visit')
+                    ->tooltip('View on Site')
+                    ->icon('heroicon-m-arrow-top-right-on-square')
+                    ->iconButton()
+                    ->url(fn (GameSet $record): string => route('hub.show', $record))
+                    ->openUrlInNewTab(),
+            ])
+            ->bulkActions([
+                Tables\Actions\BulkAction::make('remove')
+                    ->label('Remove selected')
+                    ->modalHeading('Remove selected hubs from game')
+                    ->modalDescription('Are you sure you would like to do this?')
+                    ->requiresConfirmation()
+                    ->color('danger')
+                    ->action(function (Collection $gameSets): void {
+                        /** @var Game $game */
+                        $game = $this->getOwnerRecord();
+
+                        foreach ($gameSets as $gameSet) {
+                            (new DetachGamesFromGameSetAction())->execute($gameSet, [$game->id]);
+                        }
+
+                        $this->deselectAllTableRecords();
+
+                        Notification::make()
+                            ->success()
+                            ->title('Success')
+                            ->body('Removed selected hubs from the game.')
+                            ->send();
+                    }),
+            ]);
+    }
+}
diff --git a/app/Filament/Resources/GameResource/Pages/SimilarGames.php b/app/Filament/Resources/GameResource/Pages/SimilarGames.php
new file mode 100644
index 0000000000..74ba408030
--- /dev/null
+++ b/app/Filament/Resources/GameResource/Pages/SimilarGames.php
@@ -0,0 +1,197 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Filament\Resources\GameResource\Pages;
+
+use App\Filament\Resources\GameResource;
+use App\Filament\Resources\SystemResource;
+use App\Models\Game;
+use App\Models\GameSet;
+use App\Models\System;
+use App\Models\User;
+use App\Platform\Actions\LinkSimilarGamesAction;
+use App\Platform\Actions\UnlinkSimilarGamesAction;
+use Filament\Forms;
+use Filament\Notifications\Notification;
+use Filament\Resources\Pages\ManageRelatedRecords;
+use Filament\Tables;
+use Filament\Tables\Table;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Auth;
+use Livewire;
+
+class SimilarGames extends ManageRelatedRecords
+{
+    protected static string $resource = GameResource::class;
+
+    protected static string $relationship = 'similarGamesList';
+
+    protected static ?string $navigationIcon = 'fas-gamepad';
+
+    public static function canAccess(array $arguments = []): bool
+    {
+        /** @var User $user */
+        $user = Auth::user();
+
+        return $user->can('manage', GameSet::class);
+    }
+
+    public static function getNavigationBadge(): ?string
+    {
+        return (string) Livewire::current()->getRecord()->similarGamesList->count();
+    }
+
+    public function table(Table $table): Table
+    {
+        return $table
+            ->columns([
+                Tables\Columns\ImageColumn::make('badge_url')
+                    ->label('')
+                    ->size(config('media.icon.sm.width')),
+
+                Tables\Columns\TextColumn::make('id')
+                    ->label('ID')
+                    ->sortable()
+                    ->searchable(),
+
+                Tables\Columns\TextColumn::make('Title')
+                    ->sortable()
+                    ->searchable(),
+
+                Tables\Columns\TextColumn::make('system')
+                    ->label('System')
+                    ->formatStateUsing(fn (System $state) => "[{$state->id}] {$state->name}")
+                    ->url(function (System $state) {
+                        if (request()->user()->can('manage', System::class)) {
+                            return SystemResource::getUrl('view', ['record' => $state->id]);
+                        }
+
+                        return null;
+                    }),
+
+                Tables\Columns\TextColumn::make('achievements_published')
+                    ->label('Achievements (Published)')
+                    ->numeric()
+                    ->sortable()
+                    ->alignEnd(),
+            ])
+            ->filters([
+                Tables\Filters\TernaryFilter::make('achievements_published')
+                    ->label('Has core set')
+                    ->placeholder('Any')
+                    ->trueLabel('Yes')
+                    ->falseLabel('No')
+                    ->queries(
+                        true: fn (Builder $query): Builder => $query->where('achievements_published', '>=', 6),
+                        false: fn (Builder $query): Builder => $query->where('achievements_published', '<', 6),
+                        blank: fn (Builder $query): Builder => $query,
+                    ),
+            ])
+            ->headerActions([
+                Tables\Actions\Action::make('add')
+                    ->label('Add similar games')
+                    ->form([
+                        Forms\Components\Select::make('game_ids')
+                            ->label('Games')
+                            ->multiple()
+                            ->options(function () {
+                                return Game::whereNot('ID', $this->getOwnerRecord()->id)
+                                    ->limit(50)
+                                    ->with('system')
+                                    ->get()
+                                    ->mapWithKeys(fn ($game) => [$game->id => "[{$game->id}] {$game->title} ({$game->system->name})"]);
+                            })
+                            ->getOptionLabelsUsing(function (array $values): array {
+                                return Game::whereIn('ID', $values)
+                                    ->with('system')
+                                    ->get()
+                                    ->mapWithKeys(fn ($game) => [$game->id => "[{$game->id}] {$game->title} ({$game->system->name})"])
+                                    ->toArray();
+                            })
+                            ->searchable()
+                            ->getSearchResultsUsing(function (string $search) {
+                                return Game::whereNot('ID', $this->getOwnerRecord()->id)
+                                    ->where(function ($query) use ($search) {
+                                        $query->where('ID', 'LIKE', "%{$search}%")
+                                            ->orWhere('Title', 'LIKE', "%{$search}%");
+                                    })
+                                    ->limit(50)
+                                    ->with('system')
+                                    ->get()
+                                    ->mapWithKeys(fn ($game) => [$game->id => "[{$game->id}] {$game->title} ({$game->system->name})"]);
+                            }),
+                    ])
+                    ->modalHeading('Add similar games')
+                    ->modalAutofocus(false)
+                    ->action(function (array $data): void {
+                        /** @var Game $game */
+                        $game = $this->getOwnerRecord();
+
+                        (new LinkSimilarGamesAction())->execute($game, $data['game_ids']);
+
+                        Notification::make()
+                            ->success()
+                            ->title('Success')
+                            ->body('Added similar game.')
+                            ->send();
+                    }),
+            ])
+            ->actions([
+                Tables\Actions\Action::make('remove')
+                    ->tooltip('Remove')
+                    ->icon('heroicon-o-trash')
+                    ->iconButton()
+                    ->requiresConfirmation()
+                    ->color('danger')
+                    ->modalHeading('Remove similar game')
+                    ->action(function (Game $similarGame): void {
+                        /** @var Game $game */
+                        $game = $this->getOwnerRecord();
+
+                        (new UnlinkSimilarGamesAction())->execute($game, [$similarGame->id]);
+
+                        Notification::make()
+                            ->success()
+                            ->title('Success')
+                            ->body('Removed similar game.')
+                            ->send();
+                    }),
+            ])
+            ->bulkActions([
+                Tables\Actions\BulkAction::make('remove')
+                    ->label('Remove selected')
+                    ->modalHeading('Remove selected similar games')
+                    ->modalDescription('Are you sure you would like to do this?')
+                    ->requiresConfirmation()
+                    ->color('danger')
+                    ->action(function (Collection $similarGames): void {
+                        /** @var Game $game */
+                        $game = $this->getOwnerRecord();
+
+                        (new UnlinkSimilarGamesAction())->execute(
+                            $game,
+                            $similarGames->pluck('id')->toArray()
+                        );
+
+                        $this->deselectAllTableRecords();
+
+                        Notification::make()
+                            ->success()
+                            ->title('Success')
+                            ->body('Removed selected similar games.')
+                            ->send();
+                    }),
+            ]);
+    }
+
+    /**
+     * @param Builder<Game> $query
+     * @return Builder<Game>
+     */
+    protected function modifyQueryWithActiveTab(Builder $query): Builder
+    {
+        return $query->with(['system']);
+    }
+}
diff --git a/app/Filament/Resources/HubResource/RelationManagers/GamesRelationManager.php b/app/Filament/Resources/HubResource/RelationManagers/GamesRelationManager.php
index 04e43ab95e..e0690f3353 100644
--- a/app/Filament/Resources/HubResource/RelationManagers/GamesRelationManager.php
+++ b/app/Filament/Resources/HubResource/RelationManagers/GamesRelationManager.php
@@ -12,6 +12,7 @@
 use App\Platform\Actions\AttachGamesToGameSetAction;
 use App\Platform\Actions\DetachGamesFromGameSetAction;
 use Filament\Forms;
+use Filament\Notifications\Notification;
 use Filament\Resources\RelationManagers\RelationManager;
 use Filament\Tables;
 use Filament\Tables\Table;
@@ -189,6 +190,12 @@ public function table(Table $table): Table
                         $gameSet = $this->getOwnerRecord();
 
                         (new DetachGamesFromGameSetAction())->execute($gameSet, [$game->id]);
+
+                        Notification::make()
+                            ->success()
+                            ->title('Success')
+                            ->body('Removed game from the hub.')
+                            ->send();
                     }),
 
                 Tables\Actions\Action::make('visit')
@@ -213,6 +220,12 @@ public function table(Table $table): Table
                         (new DetachGamesFromGameSetAction())->execute($gameSet, $games->pluck('id')->toArray());
 
                         $this->deselectAllTableRecords();
+
+                        Notification::make()
+                            ->success()
+                            ->title('Success')
+                            ->body('Removed selected games from the hub.')
+                            ->send();
                     }),
             ])
             ->paginated([50, 100, 150]);
diff --git a/app/Filament/Resources/RoleResource/RelationManager/Users.php b/app/Filament/Resources/RoleResource/RelationManager/Users.php
index 67ac05b3b8..c515f78724 100644
--- a/app/Filament/Resources/RoleResource/RelationManager/Users.php
+++ b/app/Filament/Resources/RoleResource/RelationManager/Users.php
@@ -25,9 +25,12 @@ public function table(Table $table): Table
                     ->label('')
                     ->size(config('media.icon.sm.width'))
                     ->url(fn (User $record) => UserResource::getUrl('view', ['record' => $record])),
-                Tables\Columns\TextColumn::make('User')
+
+                Tables\Columns\TextColumn::make('display_name')
+                    ->label('User')
                     ->url(fn (User $record) => UserResource::getUrl('view', ['record' => $record]))
                     ->grow(true),
+
             ])
             ->defaultSort('User', 'asc')
             ->headerActions([
diff --git a/app/Filament/Resources/UserResource.php b/app/Filament/Resources/UserResource.php
index c9b2714f1b..296e3d9639 100644
--- a/app/Filament/Resources/UserResource.php
+++ b/app/Filament/Resources/UserResource.php
@@ -32,18 +32,21 @@ class UserResource extends Resource
 
     protected static ?int $navigationSort = 1;
 
-    protected static ?string $recordRouteKeyName = 'User';
-
-    protected static ?string $recordTitleAttribute = 'username';
+    protected static ?string $recordTitleAttribute = 'display_name';
 
     protected static int $globalSearchResultsLimit = 5;
 
+    public static function resolveRecordRouteBinding(int|string $key): ?Model
+    {
+        return User::whereName($key)->first();
+    }
+
     /**
      * @param User $record
      */
     public static function getGlobalSearchResultTitle(Model $record): string|Htmlable
     {
-        return $record->User;
+        return $record->display_name;
     }
 
     public static function getGlobalSearchResultDetails(Model $record): array
@@ -102,6 +105,10 @@ public static function infolist(Infolist $infolist): Infolist
                                 ]),
                             Infolists\Components\Group::make()
                                 ->schema([
+                                    Infolists\Components\TextEntry::make('username')
+                                        ->label('Original Username')
+                                        ->hidden(fn (User $record) => $record->display_name === $record->username),
+
                                     Infolists\Components\TextEntry::make('canonical_url')
                                         ->label('Canonical URL')
                                         ->url(fn (User $record): string => $record->getCanonicalUrlAttribute())
@@ -222,15 +229,11 @@ public static function table(Table $table): Table
                     ->searchable()
                     ->sortable(),
 
-                Tables\Columns\TextColumn::make('User')
-                    ->description(fn (User $record): string => $record->display_name)
+                Tables\Columns\TextColumn::make('display_name')
+                    ->description(fn (User $record): string => $record->username !== $record->display_name ? $record->username : '')
                     ->label('Username')
                     ->searchable(),
 
-                Tables\Columns\TextColumn::make('display_name')
-                    ->searchable()
-                    ->toggleable(isToggledHiddenByDefault: true),
-
                 // Tables\Columns\TextColumn::make('email_verified_at')
                 //     ->dateTime()
                 //     ->sortable()
diff --git a/app/Helpers/database/achievement.php b/app/Helpers/database/achievement.php
index 8ad8c6fd06..c936edab65 100644
--- a/app/Helpers/database/achievement.php
+++ b/app/Helpers/database/achievement.php
@@ -5,6 +5,7 @@
 use App\Models\Achievement;
 use App\Models\User;
 use App\Platform\Actions\SyncAchievementSetOrderColumnsFromDisplayOrdersAction;
+use App\Platform\Actions\UpsertTriggerVersionAction;
 use App\Platform\Enums\AchievementAuthorTask;
 use App\Platform\Enums\AchievementFlag;
 use App\Platform\Enums\AchievementPoints;
@@ -184,7 +185,7 @@ function GetAchievementData(int $achievementId): ?array
         'TrueRatio' => $achievement->points_weighted,
         'Flags' => $achievement->Flags,
         'type' => $achievement->type,
-        'Author' => $achievement->developer?->User,
+        'Author' => $achievement->developer?->display_name,
         'DateCreated' => $achievement->DateCreated->format('Y-m-d H:i:s'),
         'DateModified' => $achievement->DateModified->format('Y-m-d H:i:s'),
         'BadgeName' => $achievement->badge_name,
@@ -216,7 +217,7 @@ function UploadNewAchievement(
     $consoleName = $gameData['ConsoleName'];
     $isEventGame = $consoleName == 'Events';
 
-    $author = User::firstWhere('User', $authorUsername);
+    $author = User::whereName($authorUsername)->first();
     $authorPermissions = (int) $author?->getAttribute('Permissions');
 
     // Prevent <= registered users from uploading or modifying achievements
@@ -299,6 +300,14 @@ function UploadNewAchievement(
         $achievement->save();
         $idInOut = $achievement->ID;
 
+        // It's a new achievement, so create the initial trigger version.
+        (new UpsertTriggerVersionAction())->execute(
+            $achievement,
+            $mem,
+            versioned: $flag === AchievementFlag::OfficialCore->value,
+            user: $author
+        );
+
         $achievement->ensureAuthorshipCredit($author, AchievementAuthorTask::Logic);
 
         static_addnewachievement($idInOut);
@@ -306,8 +315,8 @@ function UploadNewAchievement(
             "Server",
             ArticleType::Achievement,
             $idInOut,
-            "$authorUsername uploaded this achievement.",
-            $authorUsername
+            "{$author->display_name} uploaded this achievement.",
+            $author->display_name
         );
 
         return true;
@@ -390,6 +399,21 @@ function UploadNewAchievement(
 
             if ($changingLogic) {
                 $achievement->ensureAuthorshipCredit($author, AchievementAuthorTask::Logic);
+
+                (new UpsertTriggerVersionAction())->execute(
+                    $achievement,
+                    $achievement->MemAddr,
+                    versioned: $achievement->Flags === AchievementFlag::OfficialCore->value,
+                    user: $author
+                );
+            } elseif ($changingAchSet && $achievement->trigger && $achievement->Flags === AchievementFlag::OfficialCore->value) {
+                // If only flags changed, re-version the existing trigger (if it exists).
+                (new UpsertTriggerVersionAction())->execute(
+                    $achievement,
+                    $achievement->trigger->conditions,
+                    versioned: true,
+                    user: $author
+                );
             }
 
             if ($changingAchSet) {
@@ -398,16 +422,16 @@ function UploadNewAchievement(
                         "Server",
                         ArticleType::Achievement,
                         $idInOut,
-                        "$authorUsername promoted this achievement to the Core set.",
-                        $authorUsername
+                        "{$author->display_name} promoted this achievement to the Core set.",
+                        $author->display_name
                     );
                 } elseif ($flag === AchievementFlag::Unofficial->value) {
                     addArticleComment(
                         "Server",
                         ArticleType::Achievement,
                         $idInOut,
-                        "$authorUsername demoted this achievement to Unofficial.",
-                        $authorUsername
+                        "{$author->display_name} demoted this achievement to Unofficial.",
+                        $author->display_name
                     );
                 }
                 expireGameTopAchievers($gameID);
@@ -419,8 +443,8 @@ function UploadNewAchievement(
                         "Server",
                         ArticleType::Achievement,
                         $idInOut,
-                        "$authorUsername edited this achievement's $editString.",
-                        $authorUsername
+                        "{$author->display_name} edited this achievement's $editString.",
+                        $author->display_name
                     );
                 }
             }
diff --git a/app/Helpers/database/code-note.php b/app/Helpers/database/code-note.php
index 30f334dd23..9721f6eb78 100644
--- a/app/Helpers/database/code-note.php
+++ b/app/Helpers/database/code-note.php
@@ -6,7 +6,7 @@
 
 function loadCodeNotes(int $gameId): ?array
 {
-    $query = "SELECT ua.User, mn.address AS Address, mn.body AS Note
+    $query = "SELECT ua.display_name AS User, mn.address AS Address, mn.body AS Note
               FROM memory_notes AS mn
               LEFT JOIN UserAccounts AS ua ON ua.ID = mn.user_id
               WHERE mn.game_id = '$gameId'
@@ -47,7 +47,7 @@ function getCodeNotes(int $gameId, ?array &$codeNotesOut): bool
 function submitCodeNote2(string $username, int $gameID, int $address, string $note): bool
 {
     /** @var ?User $user */
-    $user = User::firstWhere('User', $username);
+    $user = User::whereName($username)->first();
 
     if (!$user?->can('create', MemoryNote::class)) {
         return false;
@@ -87,10 +87,8 @@ function submitCodeNote2(string $username, int $gameID, int $address, string $no
 /**
  * Gets the number of code notes created for each game the user has created any notes for.
  */
-function getCodeNoteCounts(string $username): array
+function getCodeNoteCounts(User $user): array
 {
-    /** @var ?User $user */
-    $user = User::firstWhere('User', $username);
     $userId = $user->ID;
 
     $retVal = [];
diff --git a/app/Helpers/database/forum.php b/app/Helpers/database/forum.php
index 5140061995..8874c60203 100644
--- a/app/Helpers/database/forum.php
+++ b/app/Helpers/database/forum.php
@@ -236,7 +236,7 @@ function notifyUsersAboutForumActivity(int $topicID, string $topicTitle, User $a
 
     $urlTarget = "viewtopic.php?t=$topicID&c=$commentID#$commentID";
     foreach ($subscribers as $sub) {
-        sendActivityEmail($sub['User'], $sub['EmailAddress'], $topicID, $author->User, ArticleType::Forum, $topicTitle, $urlTarget, payload: $payload);
+        sendActivityEmail($sub['User'], $sub['EmailAddress'], $topicID, $author->display_name, ArticleType::Forum, $topicTitle, $urlTarget, payload: $payload);
     }
 }
 
diff --git a/app/Helpers/database/game.php b/app/Helpers/database/game.php
index b019769e40..1b1c11d057 100644
--- a/app/Helpers/database/game.php
+++ b/app/Helpers/database/game.php
@@ -6,7 +6,7 @@
 use App\Models\Game;
 use App\Models\User;
 use App\Platform\Actions\TrimGameMetadataAction;
-use App\Platform\Actions\UpdateGameSetFromGameAlternativesModificationAction;
+use App\Platform\Actions\UpsertTriggerVersionAction;
 use App\Platform\Actions\WriteGameSortTitleFromGameTitleAction;
 use App\Platform\Enums\AchievementFlag;
 use Illuminate\Support\Facades\Log;
@@ -118,7 +118,7 @@ function getGameMetadata(
         ach.Description,
         ach.Points,
         ach.TrueRatio,
-        ua.User AS Author,
+        COALESCE(ua.display_name, ua.User) AS Author,
         ach.DateModified,
         ach.DateCreated,
         ach.BadgeName,
@@ -585,7 +585,7 @@ function getGameIDFromTitle(string $gameTitle, int $consoleID): int
 }
 
 function modifyGameData(
-    string $username,
+    User $user,
     int $gameId,
     ?string $developer,
     ?string $publisher,
@@ -630,7 +630,7 @@ function modifyGameData(
         "Server",
         ArticleType::GameModification,
         $gameId,
-        "{$username} changed the " .
+        "{$user->display_name} changed the " .
             implode(", ", $modifications) .
             (count($modifications) == 1 ? " field" : " fields"),
     );
@@ -644,6 +644,7 @@ function modifyGameTitle(string $username, int $gameId, string $value): bool
         return false;
     }
 
+    $user = User::whereName($username)->first();
     $game = Game::find($gameId);
     if (!$game) {
         return false;
@@ -664,86 +665,12 @@ function modifyGameTitle(string $username, int $gameId, string $value): bool
 
     if ($game->isDirty()) {
         $game->save();
-        addArticleComment('Server', ArticleType::GameModification, $gameId, "{$username} changed the game name");
+        addArticleComment('Server', ArticleType::GameModification, $gameId, "{$user->display_name} changed the game name");
     }
 
     return true;
 }
 
-function modifyGameAlternatives(string $user, int $gameID, int|string|null $toAdd = null, int|string|array|null $toRemove = null): void
-{
-    $arrayFromParameter = function ($parameter): array {
-        $ids = [];
-        if (is_int($parameter)) {
-            $ids[] = $parameter;
-        } elseif (is_string($parameter)) {
-            // Replace all non-numeric characters with comma so the string has a common delimiter.
-            $toAdd = preg_replace("/[^0-9]+/", ",", $parameter);
-            $tok = strtok($toAdd, ",");
-            while ($tok !== false && $tok > 0) {
-                $ids[] = (int) $tok;
-                $tok = strtok(",");
-            }
-        } elseif (is_array($parameter)) {
-            foreach ($parameter as $id) {
-                $ids[] = (int) $id;
-            }
-        }
-
-        return $ids;
-    };
-
-    $createAuditLogEntries = function (string $action, array $ids) use ($user, $gameID) {
-        $message = (count($ids) == 1) ? "$user $action related game id " . $ids[0] :
-            "$user $action related game ids: " . implode(', ', $ids);
-
-        addArticleComment('Server', ArticleType::GameModification, $gameID, $message);
-
-        $message = "$user $action related game id $gameID";
-        foreach ($ids as $id) {
-            addArticleComment('Server', ArticleType::GameModification, $id, $message);
-        }
-    };
-
-    if (!empty($toAdd)) {
-        $ids = $arrayFromParameter($toAdd);
-        if (!empty($ids)) {
-            $valuesArray = [];
-            foreach ($ids as $id) {
-                $valuesArray[] = "({$gameID}, {$id}), ({$id}, {$gameID})";
-            }
-            $values = implode(", ", $valuesArray);
-
-            $query = "INSERT INTO GameAlternatives (gameID, gameIDAlt) VALUES $values ON DUPLICATE KEY UPDATE Updated = CURRENT_TIMESTAMP";
-            s_mysql_query($query);
-
-            $createAuditLogEntries('added', $ids);
-
-            // Double writes to game_sets.
-            foreach ($ids as $childId) {
-                (new UpdateGameSetFromGameAlternativesModificationAction())->execute($gameID, $childId);
-            }
-        }
-    }
-
-    if (!empty($toRemove)) {
-        $ids = $arrayFromParameter($toRemove);
-        if (!empty($ids)) {
-            $values = implode(',', $ids);
-            $query = "DELETE FROM GameAlternatives
-                      WHERE ( gameID = $gameID AND gameIDAlt IN ($values) ) || ( gameIDAlt = $gameID AND gameID IN ($values) )";
-            s_mysql_query($query);
-
-            $createAuditLogEntries('removed', $ids);
-
-            // Double writes to game_sets.
-            foreach ($ids as $childId) {
-                (new UpdateGameSetFromGameAlternativesModificationAction())->execute($gameID, $childId, isAttaching: false);
-            }
-        }
-    }
-}
-
 function modifyGameForumTopic(string $username, int $gameId, int $newForumTopicId): bool
 {
     if ($gameId == 0 || $newForumTopicId == 0) {
@@ -754,6 +681,7 @@ function modifyGameForumTopic(string $username, int $gameId, int $newForumTopicI
         return false;
     }
 
+    $user = User::whereName($username)->first();
     $game = Game::find($gameId);
     if (!$game) {
         return false;
@@ -762,7 +690,7 @@ function modifyGameForumTopic(string $username, int $gameId, int $newForumTopicI
     $game->ForumTopicID = $newForumTopicId;
     $game->save();
 
-    addArticleComment('Server', ArticleType::GameModification, $gameId, "{$username} changed the forum topic");
+    addArticleComment('Server', ArticleType::GameModification, $gameId, "{$user->display_name} changed the forum topic");
 
     return true;
 }
@@ -850,7 +778,7 @@ function submitNewGameTitleJSON(
     $retVal['GameTitle'] = $titleIn;
     $retVal['Success'] = true;
 
-    $userModel = User::where('User', $username)->first();
+    $userModel = User::whereName($username)->first();
     $permissions = (int) $userModel->getAttribute('Permissions');
     $userId = $userModel->id;
     CauserResolver::setCauser($userModel);
@@ -920,9 +848,9 @@ function submitNewGameTitleJSON(
 
                 // Log hash linked
                 if (!empty($unsanitizedDescription)) {
-                    addArticleComment("Server", ArticleType::GameHash, $gameID, $md5 . " linked by " . $username . ". Description: \"" . $unsanitizedDescription . "\"");
+                    addArticleComment("Server", ArticleType::GameHash, $gameID, $md5 . " linked by " . $userModel->display_name . ". Description: \"" . $unsanitizedDescription . "\"");
                 } else {
-                    addArticleComment("Server", ArticleType::GameHash, $gameID, $md5 . " linked by " . $username);
+                    addArticleComment("Server", ArticleType::GameHash, $gameID, $md5 . " linked by " . $userModel->display_name);
                 }
             } else {
                 /*
@@ -937,7 +865,7 @@ function submitNewGameTitleJSON(
     return $retVal;
 }
 
-function modifyGameRichPresence(string $username, int $gameId, string $dataIn): bool
+function modifyGameRichPresence(User $user, int $gameId, string $dataIn): bool
 {
     getRichPresencePatch($gameId, $existingData);
     if ($existingData == $dataIn) {
@@ -952,7 +880,14 @@ function modifyGameRichPresence(string $username, int $gameId, string $dataIn):
     $game->RichPresencePatch = $dataIn;
     $game->save();
 
-    addArticleComment('Server', ArticleType::GameModification, $gameId, "{$username} changed the rich presence script");
+    (new UpsertTriggerVersionAction())->execute(
+        $game,
+        $dataIn,
+        versioned: true, // rich presence is always published
+        user: $user
+    );
+
+    addArticleComment('Server', ArticleType::GameModification, $gameId, "{$user->display_name} changed the rich presence script");
 
     return true;
 }
diff --git a/app/Helpers/database/leaderboard.php b/app/Helpers/database/leaderboard.php
index 30f003ae29..384beb17fa 100644
--- a/app/Helpers/database/leaderboard.php
+++ b/app/Helpers/database/leaderboard.php
@@ -7,6 +7,7 @@
 use App\Models\LeaderboardEntry;
 use App\Models\User;
 use App\Platform\Actions\ResumePlayerSessionAction;
+use App\Platform\Actions\UpsertTriggerVersionAction;
 use App\Platform\Enums\ValueFormat;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Carbon;
@@ -190,6 +191,7 @@ function GetLeaderboardData(
 
         $retVal['Entries'][] = [
             'User' => $entry->user->display_name,
+            'AvatarUrl' => $entry->user->avatar_url,
             'DateSubmitted' => $entry->updated_at->unix(),
             'Score' => $entry->score,
             'Rank' => $rank,
@@ -309,14 +311,14 @@ function UploadNewLeaderboard(
     $displayOrder = 0;
     $originalAuthor = null;
 
+    /** @var ?Leaderboard $foundLeaderboard */
+    $foundLeaderboard = null;
+
     if ($idInOut > 0) {
         $foundLeaderboard = Leaderboard::find($idInOut);
         if ($foundLeaderboard) {
             $displayOrder = $foundLeaderboard->order_column;
             $originalAuthor = $foundLeaderboard->developer;
-
-            $data['DisplayOrder'] = $displayOrder;
-            $data['Author'] = $originalAuthor?->display_name ?? "Unknown";
         } else {
             $errorOut = "Unknown leaderboard";
 
@@ -324,7 +326,7 @@ function UploadNewLeaderboard(
         }
     }
 
-    $authorModel = User::firstWhere('User', $authorUsername);
+    $authorModel = User::whereName($authorUsername)->first();
 
     // Prevent non-developers from uploading or modifying leaderboards
     $userPermissions = (int) $authorModel->getAttribute('Permissions');
@@ -361,7 +363,6 @@ function UploadNewLeaderboard(
         $foundLeaderboard = Leaderboard::find($idInOut);
         if ($foundLeaderboard) {
             $displayOrder = $foundLeaderboard->order_column;
-            $data['DisplayOrder'] = $displayOrder;
         }
     }
 
@@ -377,5 +378,12 @@ function UploadNewLeaderboard(
         );
     }
 
+    (new UpsertTriggerVersionAction())->execute(
+        $foundLeaderboard,
+        $mem,
+        versioned: true, // we don't currently support unpublished leaderboards
+        user: $authorModel,
+    );
+
     return true;
 }
diff --git a/app/Helpers/database/player-achievement.php b/app/Helpers/database/player-achievement.php
index b9ad53b403..3285fd83c1 100644
--- a/app/Helpers/database/player-achievement.php
+++ b/app/Helpers/database/player-achievement.php
@@ -147,13 +147,13 @@ function getAchievementUnlocksData(
     return PlayerAchievement::where('achievement_id', $achievementId)
         ->join('UserAccounts', 'UserAccounts.ID', '=', 'user_id')
         ->orderByRaw('COALESCE(unlocked_hardcore_at, unlocked_at) DESC')
-        ->select(['UserAccounts.User', 'UserAccounts.RAPoints', 'UserAccounts.RASoftcorePoints', 'unlocked_at', 'unlocked_hardcore_at'])
+        ->select(['UserAccounts.User', 'UserAccounts.display_name', 'UserAccounts.RAPoints', 'UserAccounts.RASoftcorePoints', 'unlocked_at', 'unlocked_hardcore_at'])
         ->offset($offset)
         ->limit($limit)
         ->get()
         ->map(function ($row) {
             return [
-                'User' => $row->User,
+                'User' => !empty($row->display_name) ? $row->display_name : $row->User,
                 'RAPoints' => $row->RAPoints,
                 'RASoftcorePoints' => $row->RASoftcorePoints,
                 'DateAwarded' => $row->unlocked_hardcore_at ?? $row->unlocked_at,
@@ -197,7 +197,7 @@ function getRecentUnlocksPlayersData(
     }
 
     // Get recent winners, and their most recent activity:
-    $query = "SELECT u.User, u.RAPoints, " . unixTimestampStatement('pa.unlocked_at', 'DateAwarded') . "
+    $query = "SELECT u.User, u.display_name AS DisplayName, u.RAPoints, " . unixTimestampStatement('pa.unlocked_at', 'DateAwarded') . "
               FROM player_achievements AS pa
               LEFT JOIN UserAccounts AS u ON u.ID = pa.user_id
               WHERE pa.achievement_id = $achID $extraWhere
@@ -205,6 +205,10 @@ function getRecentUnlocksPlayersData(
               LIMIT $offset, $count";
 
     foreach (legacyDbFetchAll($query) as $db_entry) {
+        $db_entry['AvatarUrl'] = media_asset('UserPic/' . $db_entry['User'] . '.png');
+        $db_entry['User'] = $db_entry['DisplayName'];
+        unset($db_entry['DisplayName']);
+
         $db_entry['RAPoints'] = (int) $db_entry['RAPoints'];
         $db_entry['DateAwarded'] = (int) $db_entry['DateAwarded'];
         $retVal['RecentWinner'][] = $db_entry;
diff --git a/app/Helpers/database/player-game.php b/app/Helpers/database/player-game.php
index c0775c965f..d656743ae5 100644
--- a/app/Helpers/database/player-game.php
+++ b/app/Helpers/database/player-game.php
@@ -206,7 +206,7 @@ function getUserProgress(User $user, array $gameIDs, int $numRecentAchievements
 
 function getUserAchievementUnlocksForGame(User|string $user, int $gameID, AchievementFlag $flag = AchievementFlag::OfficialCore): array
 {
-    $user = is_string($user) ? User::firstWhere('User', $user) : $user;
+    $user = is_string($user) ? User::whereName($user)->first() : $user;
 
     $playerAchievements = $user
         ->playerAchievements()
@@ -327,11 +327,11 @@ function getUsersCompletedGamesAndMax(string $user): array
         LEFT JOIN GameData AS gd ON gd.ID = pg.game_id
         LEFT JOIN Console AS c ON c.ID = gd.ConsoleID
         LEFT JOIN UserAccounts ua ON ua.ID = pg.user_id
-        WHERE ua.User = :user
+        WHERE (ua.User = :user OR ua.display_name = :user2)
         AND gd.achievements_published > $minAchievementsForCompletion
         ORDER BY PctWon DESC, PctWonHC DESC, MaxPossible DESC, gd.Title";
 
-    return legacyDbFetchAll($query, ['user' => $user])->toArray();
+    return legacyDbFetchAll($query, ['user' => $user, 'user2' => $user])->toArray();
 }
 
 function getGameRecentPlayers(int $gameID, int $maximum_results = 10): array
@@ -353,7 +353,7 @@ function getGameRecentPlayers(int $gameID, int $maximum_results = 10): array
         ->join('UserAccounts', 'UserAccounts.ID', '=', 'player_sessions.user_id')
         ->where('UserAccounts.Permissions', '>=', Permissions::Unregistered)
         ->orderBy('rich_presence_updated_at', 'DESC')
-        ->select(['player_sessions.user_id', 'User', 'player_sessions.rich_presence', 'player_sessions.rich_presence_updated_at']);
+        ->select(['player_sessions.user_id', 'display_name', 'player_sessions.rich_presence', 'player_sessions.rich_presence_updated_at']);
 
     if ($maximum_results) {
         $sessions = $sessions->limit($maximum_results);
@@ -362,7 +362,7 @@ function getGameRecentPlayers(int $gameID, int $maximum_results = 10): array
     foreach ($sessions->get() as $session) {
         $retval[] = [
             'UserID' => $session->user_id,
-            'User' => $session->User,
+            'User' => $session->display_name,
             'Date' => $session->rich_presence_updated_at->__toString(),
             'Activity' => $session->rich_presence,
             'NumAwarded' => 0,
diff --git a/app/Helpers/database/player-history.php b/app/Helpers/database/player-history.php
index e3d9cbdf46..cc7baece77 100644
--- a/app/Helpers/database/player-history.php
+++ b/app/Helpers/database/player-history.php
@@ -61,7 +61,8 @@ function getAchievementsEarnedBetween(string $dateStart, string $dateEnd, User $
     $query = "SELECT COALESCE(pa.unlocked_hardcore_at, pa.unlocked_at) AS Date,
                      CASE WHEN pa.unlocked_hardcore_at IS NOT NULL THEN 1 ELSE 0 END AS HardcoreMode,
                      ach.ID AS AchievementID, ach.Title, ach.Description,
-                     ach.BadgeName, ach.Points, ach.TrueRatio, ach.type as Type, ua.User AS Author,
+                     ach.BadgeName, ach.Points, ach.TrueRatio, ach.type as Type,
+                     COALESCE(ua.display_name, ua.User) AS Author,
                      gd.Title AS GameTitle, gd.ImageIcon AS GameIcon, ach.GameID,
                      c.Name AS ConsoleName
               FROM player_achievements pa
diff --git a/app/Helpers/database/player-rank.php b/app/Helpers/database/player-rank.php
index e35857db82..bf9be831ea 100644
--- a/app/Helpers/database/player-rank.php
+++ b/app/Helpers/database/player-rank.php
@@ -12,35 +12,11 @@ function SetUserUntrackedStatus(string $usernameIn, int $isUntracked): void
 {
     legacyDbStatement("UPDATE UserAccounts SET Untracked = $isUntracked, Updated=NOW() WHERE User = '$usernameIn'");
 
-    PlayerRankedStatusChanged::dispatch(User::firstWhere('User', $usernameIn), (bool) $isUntracked);
+    PlayerRankedStatusChanged::dispatch(User::whereName($usernameIn)->first(), (bool) $isUntracked);
 
     // TODO update games that are affected by this user's library
 }
 
-/**
- * @deprecated take from authenticated user directly
- */
-function getPlayerPoints(?string $user, ?array &$dataOut): bool
-{
-    if (empty($user) || !isValidUsername($user)) {
-        return false;
-    }
-
-    $query = "SELECT ua.RAPoints, ua.RASoftcorePoints
-              FROM UserAccounts AS ua
-              WHERE ua.User=:username";
-
-    $dataOut = legacyDbFetch($query, ['username' => $user]);
-    if ($dataOut) {
-        $dataOut['RAPoints'] = (int) $dataOut['RAPoints'];
-        $dataOut['RASoftcorePoints'] = (int) $dataOut['RASoftcorePoints'];
-
-        return true;
-    }
-
-    return false;
-}
-
 function countRankedUsers(int $type = RankType::Hardcore): int
 {
     return Cache::remember("rankedUserCount:$type",
@@ -69,21 +45,18 @@ function () use ($type) {
 
 function getTopUsersByScore(int $count): array
 {
-    if ($count > 10) {
-        $count = 10;
-    }
-
-    $query = "SELECT User, RAPoints, TrueRAPoints
-              FROM UserAccounts AS ua
-              WHERE NOT ua.Untracked
-              ORDER BY RAPoints DESC, TrueRAPoints DESC
-              LIMIT 0, $count ";
-
-    return legacyDbFetchAll($query)->map(fn ($row) => [
-        1 => $row['User'],
-        2 => $row['RAPoints'],
-        3 => $row['TrueRAPoints'],
-    ])->toArray();
+    return User::select(['display_name', 'User', 'RAPoints', 'TrueRAPoints'])
+        ->where('Untracked', false)
+        ->orderBy('RAPoints', 'desc')
+        ->orderBy('TrueRAPoints', 'desc')
+        ->take(min($count, 10))
+        ->get()
+        ->map(fn ($user) => [
+            1 => $user->display_name ?? $user->User,
+            2 => $user->RAPoints,
+            3 => $user->TrueRAPoints,
+        ])
+        ->toArray();
 }
 
 /**
@@ -94,7 +67,7 @@ function getUserRank(string $username, int $type = RankType::Hardcore): ?int
     $key = CacheKey::buildUserRankCacheKey($username, $type);
 
     return Cache::remember($key, Carbon::now()->addMinutes(15), function () use ($username, $type) {
-        $user = User::firstWhere('User', $username);
+        $user = User::whereName($username)->first();
         if (!$user || $user->Untracked) {
             return null;
         }
diff --git a/app/Helpers/database/search.php b/app/Helpers/database/search.php
index f195deffea..fd447a7501 100644
--- a/app/Helpers/database/search.php
+++ b/app/Helpers/database/search.php
@@ -69,14 +69,14 @@ function performSearch(
     }
 
     if (in_array(SearchType::User, $searchType)) {
-        $counts[] = "SELECT COUNT(*) AS Count FROM UserAccounts WHERE User LIKE '%$searchQuery%'";
+        $counts[] = "SELECT COUNT(*) AS Count FROM UserAccounts WHERE display_name LIKE '%$searchQuery%'";
         $parts[] = "
-        SELECT " . SearchType::User . " AS Type, ua.User AS ID,
-               CONCAT( '/user/', ua.User ) AS Target, ua.User AS Title,
-               CASE WHEN ua.User LIKE '$searchQuery%' THEN 0 ELSE 1 END AS SecondarySort
-        FROM UserAccounts AS ua
-        WHERE ua.User LIKE '%$searchQuery%' AND ua.Permissions >= 0 AND ua.Deleted IS NULL
-        ORDER BY SecondarySort, ua.User";
+            SELECT " . SearchType::User . " AS Type, ua.display_name AS ID,
+                CONCAT( '/user/', ua.display_name ) AS Target, ua.display_name AS Title,
+                CASE WHEN ua.display_name LIKE '$searchQuery%' THEN 0 ELSE 1 END AS SecondarySort
+            FROM UserAccounts AS ua
+            WHERE ua.display_name LIKE '%$searchQuery%' AND ua.Permissions >= 0 AND ua.Deleted IS NULL
+            ORDER BY SecondarySort, ua.display_name";
     }
 
     if (in_array(SearchType::Forum, $searchType)) {
diff --git a/app/Helpers/database/set-claim.php b/app/Helpers/database/set-claim.php
index 01847280a4..eec070bfed 100644
--- a/app/Helpers/database/set-claim.php
+++ b/app/Helpers/database/set-claim.php
@@ -250,7 +250,8 @@ function getFilteredClaims(
     $userCondition = '';
     if (isset($username)) {
         $bindings['username'] = $username;
-        $userCondition = "AND ua.User = :username";
+        $bindings['display_name'] = $username;
+        $userCondition = "AND (ua.User = :username OR ua.display_name = :display_name)";
     }
 
     $gameCondition = '';
@@ -268,7 +269,7 @@ function getFilteredClaims(
     // Get either the filtered count or the filtered data
     $selectCondition = "
         sc.ID AS ID,
-        ua.User AS User,
+        COALESCE(ua.display_name, ua.User) AS User,
         sc.game_id AS GameID,
         gd.Title AS GameTitle,
         gd.ImageIcon AS GameIcon,
diff --git a/app/Helpers/database/static.php b/app/Helpers/database/static.php
index 012ca819f2..13bf5acb8e 100644
--- a/app/Helpers/database/static.php
+++ b/app/Helpers/database/static.php
@@ -33,7 +33,7 @@ function static_addnewregistereduser(string $user): void
  */
 function static_addnewhardcoremastery(int $gameId, string $username): void
 {
-    $foundUser = User::firstWhere('User', $username);
+    $foundUser = User::whereName($username)->first();
     if ($foundUser->Untracked) {
         return;
     }
@@ -54,7 +54,7 @@ function static_addnewhardcoremastery(int $gameId, string $username): void
  */
 function static_addnewhardcoregamebeaten(int $gameId, string $username): void
 {
-    $foundUser = User::firstWhere('User', $username);
+    $foundUser = User::whereName($username)->first();
     if ($foundUser->Untracked) {
         return;
     }
diff --git a/app/Helpers/database/subscription.php b/app/Helpers/database/subscription.php
index e050804d19..fe60d05539 100644
--- a/app/Helpers/database/subscription.php
+++ b/app/Helpers/database/subscription.php
@@ -52,7 +52,11 @@ function isUserSubscribedTo(string $subjectType, int $topicID, int $userID): boo
  */
 function getSubscribersOf(string $subjectType, int $subjectID, ?int $reqWebsitePrefs = null, ?string $implicitSubscriptionQry = null): array
 {
-    $explicitSubscribers = User::select('User', 'EmailAddress')
+    $explicitSubscribers = User::query()
+        ->select(
+            DB::raw('COALESCE(display_name, User) as User'),
+            'EmailAddress'
+        )
         ->whereHas('subscriptions', fn ($q) => $q
             ->where('subject_type', $subjectType)
             ->where('subject_id', $subjectID)
@@ -67,7 +71,10 @@ function getSubscribersOf(string $subjectType, int $subjectID, ?int $reqWebsiteP
     }
 
     return DB::table(DB::raw("($implicitSubscriptionQry) as ua"))
-        ->select('User', 'EmailAddress')
+        ->select([
+            DB::raw('COALESCE(ua.display_name, ua.User) as User'),
+            'ua.EmailAddress',
+        ])
         ->leftJoin('subscriptions as sub', fn ($join) => $join
             ->on('sub.user_id', '=', 'ua.ID')
             ->where('sub.subject_type', '=', $subjectType)
@@ -146,13 +153,13 @@ function getSubscribersOfArticle(
     ?string $subjectAuthor = null,
     bool $noExplicitSubscriptions = false
 ): array {
-    $websitePrefsFilter = $noExplicitSubscriptions ? "AND (_ua.websitePrefs & $reqWebsitePrefs) != 0" : "";
+    $websitePrefsFilter = $noExplicitSubscriptions ? "AND (_ua.websitePrefs & :websitePrefs) != 0" : "";
 
     $authorQry = ($subjectAuthor === null ? "" : "
         UNION
         SELECT _ua.*
         FROM UserAccounts as _ua
-        WHERE _ua.User = '$subjectAuthor'
+        WHERE (_ua.User = :subjectAuthor OR _ua.display_name = :subjectAuthor)
               $websitePrefsFilter
     ");
 
@@ -160,12 +167,21 @@ function getSubscribersOfArticle(
         SELECT DISTINCT _ua.*
         FROM Comment AS _c
         INNER JOIN UserAccounts as _ua ON _ua.ID = _c.user_id
-        WHERE _c.ArticleType = $articleType
-              AND _c.ArticleID = $articleID
+        WHERE _c.ArticleType = :articleType
+              AND _c.ArticleID = :articleID
               $websitePrefsFilter
         $authorQry
     ";
 
+    $bindings = [
+        'articleType' => $articleType,
+        'articleID' => $articleID,
+        'websitePrefs' => $reqWebsitePrefs,
+    ];
+    if ($subjectAuthor !== null) {
+        $bindings['subjectAuthor'] = $subjectAuthor;
+    }
+
     if ($noExplicitSubscriptions) {
         $dbResult = s_mysql_query($qry);
         if (!$dbResult) {
@@ -182,11 +198,17 @@ function getSubscribersOfArticle(
         return [];
     }
 
+    // getSubscribersOf doesn't accept bindings, so just bind them here.
+    $preparedQry = $qry;
+    foreach ($bindings as $key => $value) {
+        $preparedQry = str_replace(":$key", DB::getPdo()->quote($value), $preparedQry);
+    }
+
     return getSubscribersOf(
         $subjectType,
         $articleID,
         1 << UserPreference::EmailOn_ActivityComment,  // code suggests the value of $reqWebsitePrefs should be used, but the feature is disabled for now
-        $qry
+        $preparedQry,
     );
 }
 
diff --git a/app/Helpers/database/ticket.php b/app/Helpers/database/ticket.php
index cf3290ffdf..7ad74ac1e3 100644
--- a/app/Helpers/database/ticket.php
+++ b/app/Helpers/database/ticket.php
@@ -28,7 +28,7 @@ function submitNewTicketsJSON(
     $returnMsg = [];
 
     /** @var User $user */
-    $user = User::firstWhere('User', $userSubmitter);
+    $user = User::whereName($userSubmitter)->first();
 
     if (!$user->exists() || !$user->can('create', Ticket::class)) {
         $returnMsg['Success'] = false;
@@ -192,8 +192,8 @@ function getExistingTicketID(User $user, int $achievementID): int
 function getTicket(int $ticketID): ?array
 {
     $query = "SELECT tick.ID, tick.AchievementID, ach.Title AS AchievementTitle, ach.Description AS AchievementDesc, ach.type AS AchievementType, ach.Points, ach.BadgeName,
-                ua3.User AS AchievementAuthor, ach.GameID, c.Name AS ConsoleName, gd.Title AS GameTitle, gd.ImageIcon AS GameIcon,
-                tick.ReportedAt, tick.ReportType, tick.ReportState, tick.Hardcore, tick.ReportNotes, ua.User AS ReportedBy, tick.ResolvedAt, ua2.User AS ResolvedBy
+                COALESCE(ua3.display_name, ua3.User) AS AchievementAuthor, ach.GameID, c.Name AS ConsoleName, gd.Title AS GameTitle, gd.ImageIcon AS GameIcon,
+                tick.ReportedAt, tick.ReportType, tick.ReportState, tick.Hardcore, tick.ReportNotes, COALESCE(ua.display_name, ua.User) AS ReportedBy, tick.ResolvedAt, COALESCE(ua2.display_name, ua2.User) AS ResolvedBy
               FROM Ticket AS tick
               LEFT JOIN Achievements AS ach ON ach.ID = tick.AchievementID
               LEFT JOIN GameData AS gd ON gd.ID = ach.GameID
@@ -209,14 +209,14 @@ function getTicket(int $ticketID): ?array
 
 function updateTicket(string $user, int $ticketID, int $ticketVal, ?string $reason = null): bool
 {
-    $userID = getUserIDFromUser($user);
+    $userModel = User::whereName($user)->first();
 
     // get the ticket data before updating so we know what the previous state was
     $ticketData = getTicket($ticketID);
 
     $resolvedFields = "";
     if ($ticketVal == TicketState::Resolved || $ticketVal == TicketState::Closed) {
-        $resolvedFields = ", ResolvedAt=NOW(), resolver_id=$userID ";
+        $resolvedFields = ", ResolvedAt=NOW(), resolver_id={$userModel->id} ";
     } elseif ($ticketData['ReportState'] == TicketState::Resolved || $ticketData['ReportState'] == TicketState::Closed) {
         $resolvedFields = ", ResolvedAt=NULL, resolver_id=NULL ";
     }
@@ -245,25 +245,25 @@ function updateTicket(string $user, int $ticketID, int $ticketVal, ?string $reas
         case TicketState::Closed:
             if ($reason == TicketState::REASON_DEMOTED) {
                 updateAchievementFlag($achID, AchievementFlag::Unofficial);
-                addArticleComment("Server", ArticleType::Achievement, $achID, "$user demoted this achievement to Unofficial.", $user);
+                addArticleComment("Server", ArticleType::Achievement, $achID, "{$userModel->display_name} demoted this achievement to Unofficial.", $userModel->display_name);
             }
-            $comment = "Ticket closed by $user. Reason: \"$reason\".";
+            $comment = "Ticket closed by {$userModel->display_name}. Reason: \"$reason\".";
             break;
 
         case TicketState::Open:
             if ($ticketData['ReportState'] == TicketState::Request) {
-                $comment = "Ticket reassigned to author by $user.";
+                $comment = "Ticket reassigned to author by {$userModel->display_name}.";
             } else {
-                $comment = "Ticket reopened by $user.";
+                $comment = "Ticket reopened by {$userModel->display_name}.";
             }
             break;
 
         case TicketState::Resolved:
-            $comment = "Ticket resolved as fixed by $user.";
+            $comment = "Ticket resolved as fixed by {$userModel->display_name}.";
             break;
 
         case TicketState::Request:
-            $comment = "Ticket reassigned to reporter by $user.";
+            $comment = "Ticket reassigned to reporter by {$userModel->display_name}.";
             break;
     }
 
@@ -295,7 +295,7 @@ function updateTicket(string $user, int $ticketID, int $ticketVal, ?string $reas
         "<br>" .
         "$achTitle - $gameTitle ($consoleName)<br>" .
         "<br>" .
-        "The ticket you opened for the above achievement had its status changed to \"$status\" by \"$user\".<br>" .
+        "The ticket you opened for the above achievement had its status changed to \"$status\" by \"{$userModel->display_name}\".<br>" .
         "<br>Comment: $comment" .
         "<br>" .
         "Click <a href='" . route('ticket.show', ['ticket' => $ticketID]) . "'>here</a> to view the ticket" .
diff --git a/app/Helpers/database/user-account-deletion.php b/app/Helpers/database/user-account-deletion.php
index f03ce26897..9acb001304 100644
--- a/app/Helpers/database/user-account-deletion.php
+++ b/app/Helpers/database/user-account-deletion.php
@@ -1,6 +1,7 @@
 <?php
 
 use App\Community\Enums\ArticleType;
+use App\Models\User;
 use Carbon\Carbon;
 
 function getDeleteDate(string|Carbon $deleteRequested): string
@@ -18,15 +19,16 @@ function getDeleteDate(string|Carbon $deleteRequested): string
 
 function cancelDeleteRequest(string $username): bool
 {
-    $user = [];
-    getAccountDetails($username, $user);
+    $user = User::whereName($username)->first();
 
-    $query = "UPDATE UserAccounts u SET u.DeleteRequested = NULL WHERE u.User = '$username'";
+    $query = "UPDATE UserAccounts u 
+        SET u.DeleteRequested = NULL 
+        WHERE u.User = '$username' OR u.display_name = '$username'";
     $dbResult = s_mysql_query($query);
 
     if ($dbResult !== false) {
-        addArticleComment('Server', ArticleType::UserModeration, $user['ID'],
-            $username . ' canceled account deletion'
+        addArticleComment('Server', ArticleType::UserModeration, $user->id,
+            $user->display_name . ' canceled account deletion'
         );
     }
 
diff --git a/app/Helpers/database/user-activity.php b/app/Helpers/database/user-activity.php
index 95f7605023..af74fd16ec 100644
--- a/app/Helpers/database/user-activity.php
+++ b/app/Helpers/database/user-activity.php
@@ -65,12 +65,12 @@ function addArticleComment(
 
     // Note: $user is the person who just made a comment.
 
-    $userID = getUserIDFromUser($user);
-    if ($userID === 0) {
+    $user = User::whereName($user)->first();
+    if (!$user) {
         return false;
     }
 
-    if ($user !== "Server" && getIsCommentDoublePost($userID, $articleID, $commentPayload)) {
+    if ($user !== "Server" && getIsCommentDoublePost($user->id, $articleID, $commentPayload)) {
         // Fail silently.
         return true;
     }
@@ -80,11 +80,11 @@ function addArticleComment(
         $comment = Comment::create([
             'ArticleType' => $articleType,
             'ArticleID' => $id,
-            'user_id' => $userID,
+            'user_id' => $user->id,
             'Payload' => $commentPayload,
         ]);
 
-        informAllSubscribersAboutActivity($articleType, $id, $user, $comment->ID, $onBehalfOfUser);
+        informAllSubscribersAboutActivity($articleType, $id, $user->display_name, $comment->ID, $onBehalfOfUser);
     }
 
     return true;
diff --git a/app/Helpers/database/user-auth.php b/app/Helpers/database/user-auth.php
index 9a09a56a64..2c442045f7 100644
--- a/app/Helpers/database/user-auth.php
+++ b/app/Helpers/database/user-auth.php
@@ -25,13 +25,13 @@ function authenticateForConnect(?string $username, ?string $pass = null, ?string
     if ($passwordProvided) {
         // Password provided, validate it
         if (authenticateFromPassword($username, $pass)) {
-            $user = User::firstWhere('User', $username);
+            $user = User::whereName($username)->first();
         }
 
         $tokenProvided = false; // ignore token if provided
     } elseif ($tokenProvided) {
         // Token provided, look for match
-        $user = User::where('User', $username)->where('appToken', $token)->first();
+        $user = User::whereName($username)->where('appToken', $token)->first();
     }
 
     if (!$user) {
@@ -82,7 +82,8 @@ function authenticateForConnect(?string $username, ?string $pass = null, ?string
 
     return [
         'Success' => true,
-        'User' => $user->User,
+        'User' => $user->display_name,
+        'AvatarUrl' => $user->avatar_url,
         'Token' => $user->appToken,
         'Score' => $user->RAPoints,
         'SoftcoreScore' => $user->RASoftcorePoints,
@@ -99,8 +100,11 @@ function authenticateFromPassword(string &$username, string $password): bool
     }
 
     // use raw query to access non-visible fields
-    $query = "SELECT ID, User, Password, SaltedPass, Permissions FROM UserAccounts WHERE User=:user AND Deleted IS NULL";
-    $row = legacyDbFetch($query, ['user' => $username]);
+    $query = "SELECT ID, User, Password, SaltedPass, Permissions 
+        FROM UserAccounts 
+        WHERE (User = :user OR display_name = :user2) 
+        AND Deleted IS NULL";
+    $row = legacyDbFetch($query, ['user' => $username, 'user2' => $username]);
     if (!$row) {
         return false;
     }
@@ -144,7 +148,7 @@ function changePassword(string $username, string $password): string
 {
     $hashedPassword = Hash::make($password);
 
-    $user = User::firstWhere('User', $username);
+    $user = User::whereName($username)->first();
 
     $user->Password = $hashedPassword;
     $user->SaltedPass = '';
@@ -219,11 +223,16 @@ function authenticateFromAppToken(
     /** @var ?User $user */
     $user = auth('connect-token')->user();
 
-    if (!$user || strcasecmp($user->User, $userOut) != 0) {
+    $doesUsernameMatch = $user && (
+        strcasecmp($user->User, $userOut) == 0
+        || strcasecmp($user->display_name, $userOut) == 0
+    );
+
+    if (!$doesUsernameMatch) {
         return false;
     }
 
-    $userOut = $user->User;
+    $userOut = $user->User; // always normalize to the username field
     $permissionOut = $user->Permissions;
 
     return true;
@@ -231,7 +240,7 @@ function authenticateFromAppToken(
 
 function generateAppToken(string $username, ?string &$tokenOut): bool
 {
-    $user = User::firstWhere('User', $username);
+    $user = User::whereName($username)->first();
     if (!$user) {
         return false;
     }
@@ -255,7 +264,7 @@ function newAppToken(): string
 
 function generateAPIKey(string $username): string
 {
-    $user = User::firstWhere('User', $username);
+    $user = User::whereName($username)->first();
     if (!$user || !$user->isEmailVerified()) {
         return '';
     }
diff --git a/app/Helpers/database/user-email-verify.php b/app/Helpers/database/user-email-verify.php
index 3c33d9d202..8d60bc9130 100644
--- a/app/Helpers/database/user-email-verify.php
+++ b/app/Helpers/database/user-email-verify.php
@@ -40,7 +40,7 @@ function validateEmailVerificationToken(string $emailCookie, ?string &$user): bo
     $user = User::find($emailConfirmation->user_id);
     // TODO delete after dropping User from EmailConfirmations
     if (!$user) {
-        $user = User::firstWhere('User', $emailConfirmation->User);
+        $user = User::whereName($emailConfirmation->User)->first();
     }
     // ENDTODO delete after dropping User from EmailConfirmations
 
diff --git a/app/Helpers/database/user-password-reset.php b/app/Helpers/database/user-password-reset.php
index 052294ffa9..c8ea0c39aa 100644
--- a/app/Helpers/database/user-password-reset.php
+++ b/app/Helpers/database/user-password-reset.php
@@ -12,7 +12,8 @@ function isValidPasswordResetToken(string $usernameIn, string $passwordResetToke
 
     if (mb_strlen($passwordResetToken) == 20) {
         $query = "SELECT * FROM UserAccounts AS ua "
-            . "WHERE ua.User='$usernameIn' AND ua.PasswordResetToken='$passwordResetToken'";
+            . "WHERE (ua.User='$usernameIn' OR ua.display_name='$usernameIn') "
+            . "AND ua.PasswordResetToken='$passwordResetToken'";
 
         $dbResult = s_mysql_query($query);
 
@@ -29,14 +30,14 @@ function isValidPasswordResetToken(string $usernameIn, string $passwordResetToke
  */
 function RequestPasswordReset(User $user): bool
 {
-    $username = $user->username;
+    $username = $user->display_name;
     $emailAddress = $user->EmailAddress;
 
     $newToken = Str::random(20);
 
     s_mysql_query("UPDATE UserAccounts AS ua
               SET ua.PasswordResetToken = '$newToken', Updated=NOW()
-              WHERE ua.User='$username'");
+              WHERE ua.User='$username' OR ua.display_name='$username'");
 
     SendPasswordResetEmail($username, $emailAddress, $newToken);
 
diff --git a/app/Helpers/database/user-permission.php b/app/Helpers/database/user-permission.php
index 5edf52b091..6c98ffebf3 100644
--- a/app/Helpers/database/user-permission.php
+++ b/app/Helpers/database/user-permission.php
@@ -25,7 +25,7 @@ function SetAccountPermissionsJSON(
 ): array {
     $retVal = [];
 
-    $targetUser = User::firstWhere('User', $targetUsername);
+    $targetUser = User::whereName($targetUsername)->first();
     if (!$targetUser) {
         $retVal['Success'] = false;
         $retVal['Error'] = "$targetUsername not found";
@@ -131,7 +131,7 @@ function setAccountForumPostAuth(User $sourceUser, int $sourcePermissions, User
     authorizeAllForumPostsForUser($targetUser);
 
     addArticleComment('Server', ArticleType::UserModeration, $targetUser->id,
-        $sourceUser->User . ' authorized user\'s forum posts'
+        $sourceUser->display_name . ' authorized user\'s forum posts'
     );
 
     // SUCCESS! Upgraded $user to allow forum posts, authorised by $sourceUser ($sourcePermissions)
@@ -145,7 +145,7 @@ function setAccountForumPostAuth(User $sourceUser, int $sourcePermissions, User
  */
 function banAccountByUsername(string $username, int $permissions): void
 {
-    $user = User::firstWhere('User', $username);
+    $user = User::whereName($username)->first();
 
     if (!$user) {
         return;
diff --git a/app/Helpers/database/user-relationship.php b/app/Helpers/database/user-relationship.php
index ea3cb3fa2e..7d26864354 100644
--- a/app/Helpers/database/user-relationship.php
+++ b/app/Helpers/database/user-relationship.php
@@ -78,7 +78,8 @@ function GetFriendList(User $user): array
         ->get()
         ->map(function ($friend) {
             return [
-                'Friend' => $friend->User,
+                'Friend' => $friend->display_name,
+                'AvatarUrl' => $friend->avatar_url,
                 'RAPoints' => $friend->points,
                 'LastSeen' => empty($friend->RichPresenceMsg) ? 'Unknown' : strip_tags($friend->RichPresenceMsg),
                 'ID' => $friend->id,
@@ -97,7 +98,7 @@ function GetExtendedFriendsList(User $user): array
         ->get()
         ->map(function ($friend) {
             return [
-                'User' => $friend->User,
+                'User' => $friend->display_name,
                 'Friendship' => (int) $friend->pivot->Friendship,
                 'LastGameID' => (int) $friend->LastGameID,
                 'LastSeen' => empty($friend->RichPresenceMsg) ? 'Unknown' : strip_tags($friend->RichPresenceMsg),
@@ -110,7 +111,7 @@ function GetExtendedFriendsList(User $user): array
 
 function GetFriendsSubquery(string $user, bool $includeUser = true, bool $returnUserIds = false): string
 {
-    $userModel = User::firstWhere('User', $user);
+    $userModel = User::whereName($user)->first();
     $userId = $userModel->id;
 
     $selectColumn = $returnUserIds ? 'ua.ID' : 'ua.User';
diff --git a/app/Helpers/database/user.php b/app/Helpers/database/user.php
index 316f6f0474..b844ff5f4b 100644
--- a/app/Helpers/database/user.php
+++ b/app/Helpers/database/user.php
@@ -9,7 +9,7 @@
 
 function GetUserData(string $username): ?array
 {
-    return User::firstWhere('User', $username)?->toArray();
+    return User::whereName($username)->first()?->toArray();
 }
 
 function getAccountDetails(?string &$username = null, ?array &$dataOut = []): bool
@@ -46,7 +46,7 @@ function getUserIDFromUser(?string $user): int
         return 0;
     }
 
-    $userModel = User::firstWhere('User', $user);
+    $userModel = User::whereName($user)->first();
     if (!$userModel) {
         return 0;
     }
@@ -68,21 +68,24 @@ function getUserMetadataFromID(int $userID): ?array
 
 function validateUsername(string $userIn): ?string
 {
-    $user = User::firstWhere('User', $userIn);
+    $user = User::whereName($userIn)->first();
 
     return ($user !== null) ? $user->User : null;
 }
 
+/**
+ * @deprecated use Eloquent ORM
+ */
 function getUserPageInfo(string $username, int $numGames = 0, int $numRecentAchievements = 0): array
 {
-    $user = User::firstWhere('User', $username);
+    $user = User::whereName($username)->first();
     if (!$user) {
         return [];
     }
 
     $libraryOut = [];
 
-    $libraryOut['User'] = $user->User;
+    $libraryOut['User'] = $user->display_name;
     $libraryOut['MemberSince'] = $user->created_at->__toString();
     $libraryOut['LastActivity'] = $user->LastLogin?->__toString();
     $libraryOut['LastActivityID'] = $user->LastActivityID;
@@ -147,22 +150,22 @@ function getUserListByPerms(int $sortBy, int $offset, int $count, ?array &$dataO
             $whereQuery = "WHERE $permsFilter ";
         }
     } else {
-        $whereQuery = "WHERE ( NOT ua.Untracked || ua.User = \"$requestedBy\" ) AND $permsFilter";
+        $whereQuery = "WHERE ( NOT ua.Untracked || ua.User = \"$requestedBy\" OR ua.display_name = \"$requestedBy\" ) AND $permsFilter";
     }
 
     $orderBy = match ($sortBy) {
-        1 => "ua.User ASC ",
-        11 => "ua.User DESC ",
+        1 => "COALESCE(ua.display_name, ua.User) ASC ",
+        11 => "COALESCE(ua.display_name, ua.User) DESC ",
         2 => "ua.RAPoints DESC ",
         12 => "ua.RAPoints ASC ",
         3 => "NumAwarded DESC ",
         13 => "NumAwarded ASC ",
         4 => "ua.LastLogin DESC ",
         14 => "ua.LastLogin ASC ",
-        default => "ua.User ASC ",
+        default => "COALESCE(ua.display_name, ua.User) ASC ",
     };
 
-    $query = "SELECT ua.ID, ua.User, ua.RAPoints, ua.TrueRAPoints, ua.LastLogin,
+   $query = "SELECT ua.ID, COALESCE(ua.display_name, ua.User) AS User, ua.RAPoints, ua.TrueRAPoints, ua.LastLogin,
                 ua.achievements_unlocked NumAwarded
                 FROM UserAccounts AS ua
                 $whereQuery
@@ -232,7 +235,7 @@ function GetDeveloperStatsFull(int $count, int $offset = 0, int $sortBy = 0, int
         $populateDevs = empty($devs);
         foreach (legacyDbFetchAll($query) as $row) {
             $data[$row['ID']] = [
-                'Author' => $row['User'],
+                'Author' => $row['display_name'],
                 'Permissions' => $row['Permissions'],
                 'ContribCount' => $row['ContribCount'],
                 'ContribYield' => $row['ContribYield'],
@@ -261,7 +264,7 @@ function GetDeveloperStatsFull(int $count, int $offset = 0, int $sortBy = 0, int
         $devList = implode(',', $devs);
 
         // user data (this must be a LEFT JOIN to pick up users with 0 published achievements)
-        $query = "SELECT ua.ID, ua.User, ua.Permissions, ua.ContribCount, ua.ContribYield,
+        $query = "SELECT ua.ID, ua.display_name, ua.Permissions, ua.ContribCount, ua.ContribYield,
                          ua.LastLogin, SUM(!ISNULL(ach.ID)) AS NumAchievements
                   FROM UserAccounts ua
                   LEFT JOIN Achievements ach ON ach.user_id = ua.ID AND ach.Flags = " . AchievementFlag::OfficialCore->value . "
@@ -279,7 +282,7 @@ function GetDeveloperStatsFull(int $count, int $offset = 0, int $sortBy = 0, int
                   LEFT JOIN Ticket tick ON tick.AchievementID=ach.ID AND tick.ReportState IN (1,3)
                   WHERE $stateCond
                   GROUP BY ua.ID
-                  ORDER BY OpenTickets DESC, ua.User";
+                  ORDER BY OpenTickets DESC, ua.display_name";
         $buildDevList($query);
     } elseif ($sortBy == 4) { // TicketsResolvedForOthers DESC
         $query = "SELECT ua.ID, SUM(!ISNULL(ach.ID)) as total
@@ -288,7 +291,7 @@ function GetDeveloperStatsFull(int $count, int $offset = 0, int $sortBy = 0, int
                   LEFT JOIN Achievements as ach ON ach.ID = tick.AchievementID AND ach.flags = 3 AND ach.user_id != ua.ID
                   WHERE $stateCond
                   GROUP BY ua.ID
-                  ORDER BY total DESC, ua.User";
+                  ORDER BY total DESC, ua.display_name";
         $buildDevList($query);
     } elseif ($sortBy == 7) { // ActiveClaims DESC
         $query = "SELECT ua.ID, SUM(!ISNULL(sc.ID)) AS ActiveClaims
@@ -296,22 +299,22 @@ function GetDeveloperStatsFull(int $count, int $offset = 0, int $sortBy = 0, int
                   LEFT JOIN SetClaim sc ON sc.user_id=ua.ID AND sc.Status IN (" . ClaimStatus::Active . ',' . ClaimStatus::InReview . ")
                   WHERE $stateCond
                   GROUP BY ua.ID
-                  ORDER BY ActiveClaims DESC, ua.User";
+                  ORDER BY ActiveClaims DESC, ua.display_name";
         $buildDevList($query);
     } else {
         $order = match ($sortBy) {
-            1 => "ua.ContribYield DESC, ua.User",
-            2 => "ua.ContribCount DESC, ua.User",
-            5 => "ua.LastLogin DESC, ua.User",
-            6 => "ua.User ASC",
-            default => "NumAchievements DESC, ua.User",
+            1 => "ua.ContribYield DESC, ua.display_name",
+            2 => "ua.ContribCount DESC, ua.display_name",
+            5 => "ua.LastLogin DESC, ua.display_name",
+            6 => "ua.display_name ASC",
+            default => "NumAchievements DESC, ua.display_name",
         };
 
         // ASSERT: ContribYield cannot be > 0 unless NumAchievements > 0, so use
         //         INNER JOIN and COUNT for maximum performance.
         // also, build the $dev list directly from these results instead of using
         // one query to build the list and a second query to fetch the user details
-        $query = "SELECT ua.ID, ua.User, ua.Permissions, ua.ContribCount, ua.ContribYield,
+        $query = "SELECT ua.ID, ua.display_name, ua.Permissions, ua.ContribCount, ua.ContribYield,
                          ua.LastLogin, COUNT(*) AS NumAchievements
                   FROM UserAccounts ua
                   INNER JOIN Achievements ach ON ach.user_id = ua.ID AND ach.Flags = 3
diff --git a/app/Helpers/render/code-note.php b/app/Helpers/render/code-note.php
index 7ec889bdeb..0741986751 100644
--- a/app/Helpers/render/code-note.php
+++ b/app/Helpers/render/code-note.php
@@ -60,7 +60,7 @@ function RenderCodeNotes(array $codeNotes, ?string $editingUser = null, ?int $ed
         HTML;
 
         echo "<td class='note-author-avatar' data-current-author='" . $nextCodeNote['User'] . "'>";
-        echo userAvatar($nextCodeNote['User'], label: false, iconSize: 24);
+        echo userAvatar($nextCodeNote['DisplayName'], label: false, iconSize: 24);
         echo "</td>";
 
         if ($canEditNote) {
diff --git a/app/Helpers/render/user.php b/app/Helpers/render/user.php
index 60ba5dbf54..08a6f29b3d 100644
--- a/app/Helpers/render/user.php
+++ b/app/Helpers/render/user.php
@@ -30,7 +30,7 @@ function userAvatar(
             CacheKey::buildUserCardDataCacheKey($username),
             Carbon::now()->addMonths(3),
             function () use ($username): ?array {
-                $foundUser = User::firstWhere('User', $username);
+                $foundUser = User::whereName($username)->first();
 
                 return $foundUser ? $foundUser->toArray() : null;
             }
@@ -42,6 +42,7 @@ function () use ($username): ?array {
     }
 
     $username = $user['User'] ?? null;
+    $displayName = $user['display_name'] ?? $user['User'] ?? null;
 
     if ($user['Deleted'] ?? false) {
         $userSanitized = $username;
@@ -63,8 +64,8 @@ function () use ($username): ?array {
     return avatar(
         resource: 'user',
         id: $username,
-        label: $label !== false && ($label || !$icon) ? $username : null,
-        link: $link ?: route('user.show', $username),
+        label: $label !== false && ($label || !$icon) ? $displayName : null,
+        link: $link ?: route('user.show', $displayName),
         tooltip: is_array($tooltip) ? renderUserCard($tooltip) : $tooltip,
         class: 'inline whitespace-nowrap',
         iconUrl: $icon !== false && ($icon || !$label) ? media_asset('/UserPic/' . $username . '.png') : null,
diff --git a/app/Helpers/util/mail.php b/app/Helpers/util/mail.php
index a9ccef3c87..720ca172c9 100644
--- a/app/Helpers/util/mail.php
+++ b/app/Helpers/util/mail.php
@@ -233,11 +233,11 @@ function informAllSubscribersAboutActivity(
             break;
 
         case ArticleType::User:  // User wall
-            $wallUserData = getUserMetadataFromID($articleID);
+            $wallUserData = User::find($articleID);
             $subscribers = getSubscribersOfUserWall($articleID, $wallUserData['User']);
-            $subjectAuthor = $wallUserData['User'];
-            $articleTitle = $wallUserData['User'];
-            $urlTarget = "user/" . $wallUserData['User'];
+            $subjectAuthor = $wallUserData->display_name;
+            $articleTitle = $wallUserData->display_name;
+            $urlTarget = "user/" . $wallUserData->display_name;
             break;
 
         case ArticleType::News:  // News
diff --git a/app/Http/Actions/BuildAchievementOfTheWeekDataAction.php b/app/Http/Actions/BuildAchievementOfTheWeekDataAction.php
index fd79242f39..0457d27c9c 100644
--- a/app/Http/Actions/BuildAchievementOfTheWeekDataAction.php
+++ b/app/Http/Actions/BuildAchievementOfTheWeekDataAction.php
@@ -4,15 +4,12 @@
 
 namespace App\Http\Actions;
 
-use App\Models\Achievement;
 use App\Models\EventAchievement;
-use App\Models\StaticData;
 use App\Platform\Data\EventAchievementData;
 
 class BuildAchievementOfTheWeekDataAction
 {
-    // TODO remove $staticData arg once event is actually run using EventAchievements
-    public function execute(?StaticData $staticData): ?EventAchievementData
+    public function execute(): ?EventAchievementData
     {
         $achievementOfTheWeek = EventAchievement::active()
             ->whereNotNull('active_from')
@@ -24,25 +21,8 @@ public function execute(?StaticData $staticData): ?EventAchievementData
             ->with(['achievement.game', 'sourceAchievement.game'])
             ->first();
 
-        if (!$achievementOfTheWeek || !$achievementOfTheWeek->source_achievement_id) {
-            if (!$staticData?->Event_AOTW_AchievementID) {
-                return null;
-            }
-
-            $targetAchievementId = $staticData->Event_AOTW_AchievementID;
-
-            $achievement = Achievement::find($targetAchievementId);
-            if (!$achievement) {
-                return null;
-            }
-
-            // make a new EventAchievment object (and modify the related records) to
-            // mimic the behavior of a valid EventAchievement. DO NOT SAVE THESE!
-            $achievement->game->ForumTopicID = $staticData->Event_AOTW_ForumID;
-
-            $achievementOfTheWeek = new EventAchievement();
-            $achievementOfTheWeek->setRelation('achievement', $achievement);
-            $achievementOfTheWeek->setRelation('sourceAchievement', $achievement);
+        if (!$achievementOfTheWeek?->source_achievement_id) {
+            return null;
         }
 
         $data = EventAchievementData::from($achievementOfTheWeek)->include(
@@ -53,7 +33,8 @@ public function execute(?StaticData $staticData): ?EventAchievementData
             'sourceAchievement.game.badgeUrl',
             'sourceAchievement.game.system.iconUrl',
             'sourceAchievement.game.system.nameShort',
-            'forumTopicId',
+            'event',
+            'event.legacyGame',
             'activeUntil',
         );
 
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index d921654892..1f035fe090 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -41,7 +41,7 @@ public function index(
         $staticData = StaticData::first();
         $staticDataData = StaticDataData::fromStaticData($staticData);
 
-        $achievementOfTheWeek = $buildAchievementOfTheWeekData->execute($staticData);
+        $achievementOfTheWeek = $buildAchievementOfTheWeekData->execute();
         $mostRecentGameMastered = $buildMostRecentGameAwardData->execute($staticData, AwardType::Mastery);
         $mostRecentGameBeaten = $buildMostRecentGameAwardData->execute($staticData, AwardType::GameBeaten);
         $recentNews = $buildNewsData->execute();
diff --git a/app/Models/Achievement.php b/app/Models/Achievement.php
index 9bbade66b5..31d1115aca 100644
--- a/app/Models/Achievement.php
+++ b/app/Models/Achievement.php
@@ -7,6 +7,7 @@
 use App\Community\Concerns\HasAchievementCommunityFeatures;
 use App\Community\Contracts\HasComments;
 use App\Community\Enums\ArticleType;
+use App\Platform\Contracts\HasVersionedTrigger;
 use App\Platform\Enums\AchievementAuthorTask;
 use App\Platform\Enums\AchievementFlag;
 use App\Platform\Enums\AchievementType;
@@ -24,6 +25,8 @@
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\HasOne;
+use Illuminate\Database\Eloquent\Relations\MorphMany;
+use Illuminate\Database\Eloquent\Relations\MorphOne;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Carbon;
@@ -37,7 +40,10 @@
 
 // TODO implements HasComments
 
-class Achievement extends BaseModel
+/**
+ * @implements HasVersionedTrigger<Achievement>
+ */
+class Achievement extends BaseModel implements HasVersionedTrigger
 {
     /*
      * Community Traits
@@ -94,6 +100,7 @@ class Achievement extends BaseModel
         'type',
         'MemAddr',
         'user_id',
+        'trigger_id',
     ];
 
     // TODO cast Flags to AchievementFlag if it isn't dropped from the table
@@ -362,6 +369,7 @@ public function game(): BelongsTo
     }
 
     /**
+     * @deprecated use comments()
      * @return HasMany<Comment>
      *
      * TODO use ->comments() after commentable_type and commentable_id are synced in Comments table
@@ -428,6 +436,26 @@ public function visibleComments(?User $user = null): HasMany
         return $this->comments()->visibleTo($currentUser);
     }
 
+    /**
+     * @return BelongsTo<Trigger, Achievement>
+     */
+    public function currentTrigger(): BelongsTo
+    {
+        return $this->belongsTo(Trigger::class, 'trigger_id', 'ID');
+    }
+
+    public function trigger(): MorphOne
+    {
+        return $this->morphOne(Trigger::class, 'triggerable')
+            ->latest('version');
+    }
+
+    public function triggers(): MorphMany
+    {
+        return $this->morphMany(Trigger::class, 'triggerable')
+            ->orderBy('version');
+    }
+
     // == scopes
 
     /**
diff --git a/app/Models/Event.php b/app/Models/Event.php
index 39f8cfacf2..91e1dec7f4 100644
--- a/app/Models/Event.php
+++ b/app/Models/Event.php
@@ -8,6 +8,7 @@
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\HasManyThrough;
 use Spatie\Activitylog\LogOptions;
 use Spatie\Activitylog\Traits\LogsActivity;
@@ -57,7 +58,7 @@ public function getActivitylogOptions(): LogOptions
 
     public function getTitleAttribute(): string
     {
-        return $this->game->title;
+        return $this->legacyGame->title;
     }
 
     public function getActiveThroughAttribute(): ?Carbon
@@ -73,14 +74,14 @@ public function getBadgeUrlAttribute(): string
     public function getPermalinkAttribute(): string
     {
         // TODO: use slug (implies slug is immutable)
-        return $this->game->getPermalinkAttribute();
+        return $this->legacyGame->getPermalinkAttribute();
     }
 
     // == mutators
 
     public function setTitleAttribute(string $value): void
     {
-        $this->game->title = $value;
+        $this->legacyGame->title = $value;
     }
 
     public function setActiveThroughAttribute(Carbon|string|null $value): void
@@ -94,10 +95,18 @@ public function setActiveThroughAttribute(Carbon|string|null $value): void
 
     // == relations
 
+    /**
+     * @return HasMany<EventAward>
+     */
+    public function awards(): HasMany
+    {
+        return $this->hasMany(EventAward::class, 'event_id');
+    }
+
     /**
      * @return BelongsTo<Game, Event>
      */
-    public function game(): BelongsTo
+    public function legacyGame(): BelongsTo
     {
         return $this->belongsTo(Game::class, 'legacy_game_id', 'ID');
     }
@@ -107,13 +116,13 @@ public function game(): BelongsTo
      */
     public function achievements(): HasManyThrough
     {
-        return $this->game->hasManyThrough(
+        return $this->legacyGame->hasManyThrough(
             EventAchievement::class,
             Achievement::class,
             'GameID',         // Achievements.GameID
             'achievement_id', // event_achievements.achievement_id
-            'ID',             // Game.ID
-            'ID',             // Achievement.ID
+            'ID',             // GameData.ID
+            'ID',             // Achievements.ID
         )->with('achievement.game');
     }
 
@@ -122,7 +131,7 @@ public function achievements(): HasManyThrough
      */
     public function hubs(): BelongsToMany
     {
-        return $this->game->gameSets();
+        return $this->legacyGame->gameSets();
     }
 
     // == scopes
diff --git a/app/Models/EventAchievement.php b/app/Models/EventAchievement.php
index 3ab3930f96..0dcbf59421 100644
--- a/app/Models/EventAchievement.php
+++ b/app/Models/EventAchievement.php
@@ -8,6 +8,7 @@
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasOneThrough;
 use Spatie\Activitylog\LogOptions;
 use Spatie\Activitylog\Traits\LogsActivity;
 
@@ -78,6 +79,21 @@ public function setActiveThroughAttribute(Carbon|string|null $value): void
 
     // == relations
 
+    /**
+     * @return HasOneThrough<Event>
+     */
+    public function event(): HasOneThrough
+    {
+        return $this->hasOneThrough(
+            Event::class,
+            Achievement::class,
+            'ID',             // Achievements.ID
+            'legacy_game_id', // events.legacy_game_id
+            'achievement_id', // event_achievements.achievement_id
+            'GameID'          // Achievements.GameID
+        );
+    }
+
     /**
      * @return BelongsTo<Achievement, EventAchievement>
      */
diff --git a/app/Models/EventAward.php b/app/Models/EventAward.php
new file mode 100644
index 0000000000..5b56ea04a9
--- /dev/null
+++ b/app/Models/EventAward.php
@@ -0,0 +1,42 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Models;
+
+use App\Support\Database\Eloquent\BaseModel;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+class EventAward extends BaseModel
+{
+    protected $table = 'event_awards';
+
+    protected $fillable = [
+        'event_id',
+        'tier_index',
+        'label',
+        'achievements_required',
+        'image_asset_path',
+    ];
+
+    // == accessors
+
+    public function getBadgeUrlAttribute(): string
+    {
+        return media_asset($this->image_asset_path);
+    }
+
+    // == mutators
+
+    // == relations
+
+    /**
+     * @return BelongsTo<Event, EventAward>
+     */
+    public function event(): BelongsTo
+    {
+        return $this->belongsTo(Event::class, 'event_id', 'id');
+    }
+
+    // == scopes
+}
diff --git a/app/Models/Game.php b/app/Models/Game.php
index 39ce73b49d..24772c1ec3 100644
--- a/app/Models/Game.php
+++ b/app/Models/Game.php
@@ -9,6 +9,7 @@
 use App\Community\Enums\ArticleType;
 use App\Platform\Actions\SyncGameTagsFromTitleAction;
 use App\Platform\Actions\WriteGameSortTitleFromGameTitleAction;
+use App\Platform\Contracts\HasVersionedTrigger;
 use App\Platform\Enums\AchievementFlag;
 use App\Platform\Enums\AchievementSetType;
 use App\Platform\Enums\GameSetType;
@@ -23,6 +24,8 @@
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\HasManyThrough;
 use Illuminate\Database\Eloquent\Relations\HasOne;
+use Illuminate\Database\Eloquent\Relations\MorphMany;
+use Illuminate\Database\Eloquent\Relations\MorphOne;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Collection;
@@ -37,7 +40,11 @@
 use Spatie\Tags\HasTags;
 
 // TODO implements HasComments
-class Game extends BaseModel implements HasMedia
+
+/**
+ * @implements HasVersionedTrigger<Game>
+ */
+class Game extends BaseModel implements HasMedia, HasVersionedTrigger
 {
     /*
      * Community Traits
@@ -92,6 +99,7 @@ class Game extends BaseModel implements HasMedia
         'Genre',
         'released_at',
         'released_at_granularity',
+        'trigger_id',
         'GuideURL',
         'ImageIcon',
         'ImageTitle',
@@ -634,7 +642,43 @@ public function gameAchievementSets(): HasMany
     public function gameSets(): BelongsToMany
     {
         return $this->belongsToMany(GameSet::class, 'game_set_games', 'game_id', 'game_set_id')
-            ->withPivot('created_at', 'updated_at', 'deleted_at');
+            ->withPivot(['created_at', 'updated_at', 'deleted_at'])
+            ->withTimestamps('created_at', 'updated_at');
+    }
+
+    /**
+     * @return BelongsToMany<GameSet>
+     */
+    public function hubs(): BelongsToMany
+    {
+        return $this->gameSets()->whereType(GameSetType::Hub);
+    }
+
+    /**
+     * @return BelongsToMany<GameSet>
+     */
+    public function similarGames(): BelongsToMany
+    {
+        return $this->gameSets()->whereType(GameSetType::SimilarGames);
+    }
+
+    /**
+     * @return BelongsToMany<Game>
+     */
+    public function similarGamesList(): BelongsToMany
+    {
+        // This should always be truthy.
+        $gameSet = GameSet::query()
+            ->whereGameId($this->id)
+            ->whereType(GameSetType::SimilarGames)
+            ->first();
+
+        // Return an empty relationship if no game set exists.
+        if (!$gameSet) {
+            return $this->belongsToMany(Game::class, 'game_set_games')->whereRaw('1 = 0');
+        }
+
+        return $gameSet->games()->with('system')->withTimestamps(['created_at', 'updated_at']);
     }
 
     /**
@@ -685,6 +729,26 @@ public function unresolvedTickets(): HasManyThrough
         return $this->tickets()->unresolved();
     }
 
+    /**
+     * @return BelongsTo<Trigger, Game>
+     */
+    public function currentTrigger(): BelongsTo
+    {
+        return $this->belongsTo(Trigger::class, 'trigger_id', 'ID');
+    }
+
+    public function trigger(): MorphOne
+    {
+        return $this->morphOne(Trigger::class, 'triggerable')
+            ->latest('version');
+    }
+
+    public function triggers(): MorphMany
+    {
+        return $this->morphMany(Trigger::class, 'triggerable')
+            ->orderBy('version');
+    }
+
     /**
      * @return HasOne<Event>
      */
diff --git a/app/Models/GameHashSet.php b/app/Models/GameHashSet.php
index bb44b2750f..9390c35eb6 100644
--- a/app/Models/GameHashSet.php
+++ b/app/Models/GameHashSet.php
@@ -4,17 +4,16 @@
 
 namespace App\Models;
 
-use App\Platform\Contracts\HasVersionedTrigger;
 use App\Support\Database\Eloquent\BaseModel;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
-use Illuminate\Database\Eloquent\Relations\MorphOne;
-use Illuminate\Database\Eloquent\Relations\MorphToMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
-class GameHashSet extends BaseModel implements HasVersionedTrigger
+// currently unused
+// TODO HasVersionedTrigger (?)
+class GameHashSet extends BaseModel
 {
     use SoftDeletes;
 
@@ -57,22 +56,6 @@ public function memoryNotes(): HasMany
         return $this->hasMany(MemoryNote::class);
     }
 
-    public function trigger(): MorphOne
-    {
-        return $this->morphOne(Trigger::class, 'triggerable')
-            ->whereNotNull('version')
-            ->orderByDesc('version');
-    }
-
-    /**
-     * @return MorphToMany<Trigger>
-     */
-    public function triggers(): MorphToMany
-    {
-        return $this->morphToMany(Trigger::class, 'triggerable')
-            ->orderByDesc('version');
-    }
-
     // == scopes
 
     /**
diff --git a/app/Models/Leaderboard.php b/app/Models/Leaderboard.php
index 816371640e..0da22418e2 100644
--- a/app/Models/Leaderboard.php
+++ b/app/Models/Leaderboard.php
@@ -5,6 +5,7 @@
 namespace App\Models;
 
 use App\Community\Enums\ArticleType;
+use App\Platform\Contracts\HasVersionedTrigger;
 use App\Platform\Enums\ValueFormat;
 use App\Support\Database\Eloquent\BaseModel;
 use Database\Factories\LeaderboardFactory;
@@ -12,6 +13,8 @@
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Relations\MorphMany;
+use Illuminate\Database\Eloquent\Relations\MorphOne;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\Auth;
@@ -21,7 +24,11 @@
 use Spatie\Activitylog\Traits\LogsActivity;
 
 // TODO implements HasComments
-class Leaderboard extends BaseModel
+
+/**
+ * @implements HasVersionedTrigger<Leaderboard>
+ */
+class Leaderboard extends BaseModel implements HasVersionedTrigger
 {
     /*
      * Shared Traits
@@ -61,6 +68,7 @@ class Leaderboard extends BaseModel
         'Format',
         'LowerIsBetter',
         'DisplayOrder',
+        'trigger_id',
     ];
 
     protected static function newFactory(): LeaderboardFactory
@@ -250,6 +258,26 @@ public function visibleComments(?User $user = null): HasMany
         return $this->comments()->visibleTo($currentUser);
     }
 
+    /**
+     * @return BelongsTo<Trigger, Leaderboard>
+     */
+    public function currentTrigger(): BelongsTo
+    {
+        return $this->belongsTo(Trigger::class, 'trigger_id', 'ID');
+    }
+
+    public function trigger(): MorphOne
+    {
+        return $this->morphOne(Trigger::class, 'triggerable')
+            ->latest('version');
+    }
+
+    public function triggers(): MorphMany
+    {
+        return $this->morphMany(Trigger::class, 'triggerable')
+            ->orderBy('version');
+    }
+
     // == scopes
 
     /**
diff --git a/app/Models/Ticket.php b/app/Models/Ticket.php
index 9e8e906d84..8533695c1b 100644
--- a/app/Models/Ticket.php
+++ b/app/Models/Ticket.php
@@ -31,6 +31,7 @@ class Ticket extends BaseModel
     // TODO rename Updated column to updated_at
     // TODO drop AchievementID, use ticketable morph instead
     // TODO drop Hardcore, derived from player_session
+    // TODO rename ticketable_model to ticketable_type
     protected $table = 'Ticket';
 
     protected $primaryKey = 'ID';
diff --git a/app/Models/Trigger.php b/app/Models/Trigger.php
index a97b95581d..a2425fa522 100644
--- a/app/Models/Trigger.php
+++ b/app/Models/Trigger.php
@@ -4,23 +4,76 @@
 
 namespace App\Models;
 
+use App\Platform\Enums\TriggerableType;
 use App\Support\Database\Eloquent\BaseModel;
+use Database\Factories\TriggerFactory;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasOne;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 class Trigger extends BaseModel
 {
+    /** @use HasFactory<TriggerFactory> */
+    use HasFactory;
     use SoftDeletes;
 
     protected $fillable = [
+        'triggerable_type',
+        'triggerable_id',
+        'user_id',
         'conditions',
         'version',
         'parent_id',
+        'created_at', // TODO remove after initial sync
+        'updated_at', // TODO remove after initial sync
     ];
 
+    protected $casts = [
+        'triggerable_type' => TriggerableType::class,
+        'version' => 'integer',
+    ];
+
+    protected static function newFactory(): TriggerFactory
+    {
+        return TriggerFactory::new();
+    }
+
+    // == accessors
+
+    public function getIsInitialVersionAttribute(): bool
+    {
+        return $this->parent_id === null;
+    }
+
+    public function getIsLatestVersionAttribute(): bool
+    {
+        return !$this->nextVersion()->exists();
+    }
+
+    // == mutators
+
     // == relations
 
+    /**
+     * @return HasOne<Trigger>
+     */
+    public function nextVersion(): HasOne
+    {
+        return $this->hasOne(Trigger::class, 'parent_id');
+    }
+
+    /**
+     * @return BelongsTo<Trigger, Trigger>
+     */
+    public function previousVersion(): BelongsTo
+    {
+        return $this->belongsTo(Trigger::class, 'parent_id');
+    }
+
     /**
      * @return MorphTo<Model, Trigger>
      */
@@ -28,4 +81,63 @@ public function triggerable(): MorphTo
     {
         return $this->morphTo();
     }
+
+    // == scopes
+
+    /**
+     * @param Builder<Trigger> $query
+     * @return Builder<Trigger>
+     */
+    public function scopeLatestVersion(Builder $query): Builder
+    {
+        return $query->whereNotExists(function ($query) {
+            $query->from('triggers', 't2')
+                ->whereColumn('t2.parent_id', 'triggers.id');
+        });
+    }
+
+    /**
+     * @param Builder<Trigger> $query
+     * @return Builder<Trigger>
+     */
+    public function scopeInitialVersion(Builder $query): Builder
+    {
+        return $query->whereNull('parent_id');
+    }
+
+    /**
+     * @param Builder<Trigger> $query
+     * @return Builder<Trigger>
+     */
+    public function scopeVersion(Builder $query, int $version): Builder
+    {
+        return $query->whereVersion($version);
+    }
+
+    /**
+     * @param Builder<Trigger> $query
+     * @return Builder<Trigger>
+     */
+    public function scopeOfType(Builder $query, TriggerableType $type): Builder
+    {
+        return $query->whereTriggerableType($type);
+    }
+
+    /**
+     * @param Builder<Trigger> $query
+     * @return Builder<Trigger>
+     */
+    public function scopeVersioned(Builder $query): Builder
+    {
+        return $query->whereNotNull('version');
+    }
+
+    /**
+     * @param Builder<Trigger> $query
+     * @return Builder<Trigger>
+     */
+    public function scopeUnversioned(Builder $query): Builder
+    {
+        return $query->whereNull('version');
+    }
 }
diff --git a/app/Models/User.php b/app/Models/User.php
index 1882b768e6..c9f1dada92 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -177,6 +177,7 @@ class User extends Authenticatable implements CommunityMember, Developer, HasLoc
         "ContribYield",
         "Created",
         "Deleted",
+        'display_name',
         "ID",
         "isMuted",
         "LastLogin",
@@ -280,7 +281,7 @@ public function canAccessPanel(Panel $panel): bool
 
     public function getFilamentName(): string
     {
-        return $this->username;
+        return $this->getDisplayNameAttribute();
     }
 
     // search
@@ -348,6 +349,24 @@ public function registerMediaCollections(): void
         $this->registerAvatarMediaCollection();
     }
 
+    // == actions
+
+    /**
+     * @return Builder<User>
+     */
+    public static function whereName(?string $displayNameOrUsername): Builder
+    {
+        if ($displayNameOrUsername === null) {
+            return static::query();
+        }
+
+        return static::query()
+            ->where(function ($query) use ($displayNameOrUsername) {
+                $query->where('display_name', $displayNameOrUsername)
+                    ->orWhere('User', $displayNameOrUsername);
+            });
+    }
+
     // == accessors
 
     public function preferredLocale()
@@ -355,12 +374,16 @@ public function preferredLocale()
         return $this->locale;
     }
 
-    public function getRouteKeyName(): string
+    public function getRouteKey(): string
     {
-        /*
-         * TODO: this might not hold up for changeable usernames -> find a better solution
-         */
-        return 'User';
+        return !empty($this->display_name) ? $this->display_name : 'User';
+    }
+
+    public function resolveRouteBinding($value, $field = null): ?self
+    {
+        return $this->where('display_name', $value)
+            ->orWhere('User', $value)
+            ->firstOrFail();
     }
 
     public function isModerated(): bool
@@ -414,8 +437,11 @@ public function getCreatedAtAttribute(): Carbon
 
     public function getDisplayNameAttribute(): ?string
     {
-        // return $this->attributes['display_name'] ?? $this->attributes['username'] ?? null;
-        return $this->getAttribute('User');
+       if (!empty($this->attributes['display_name'])) {
+           return $this->attributes['display_name'];
+       }
+
+       return $this->username ?? null;
     }
 
     public function getUsernameAttribute(): string
@@ -547,18 +573,6 @@ public function getEmailForVerification(): string
 
     // == scopes
 
-    /**
-     * To make the transition to customizable usernames a little easier
-     * once `display_name` is populated in the database.
-     *
-     * @param Builder<User> $query
-     * @return Builder<User>
-     */
-    public function scopeByDisplayName(Builder $query, string $username): Builder
-    {
-        return $query->where('User', $username);
-    }
-
     /**
      * @param Builder<User> $query
      * @return Builder<User>
diff --git a/app/Platform/Actions/LinkSimilarGamesAction.php b/app/Platform/Actions/LinkSimilarGamesAction.php
new file mode 100644
index 0000000000..31cfa9d6cf
--- /dev/null
+++ b/app/Platform/Actions/LinkSimilarGamesAction.php
@@ -0,0 +1,43 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Platform\Actions;
+
+use App\Models\Game;
+use App\Models\GameAlternative;
+use App\Models\GameSet;
+use App\Platform\Enums\GameSetType;
+
+class LinkSimilarGamesAction
+{
+    public function execute(Game $parentGame, array $gameIdsToLink): void
+    {
+        // Add bidirectional alternative game links.
+        foreach ($gameIdsToLink as $gameId) {
+            GameAlternative::create([
+                'gameID' => $parentGame->id,
+                'gameIDAlt' => $gameId,
+            ]);
+            GameAlternative::create([
+                'gameID' => $gameId,
+                'gameIDAlt' => $parentGame->id,
+            ]);
+        }
+
+        $parentSimilarGamesSet = GameSet::firstOrCreate([
+            'type' => GameSetType::SimilarGames,
+            'game_id' => $parentGame->id,
+        ]);
+        $parentSimilarGamesSet->games()->attach($gameIdsToLink);
+
+        // Link each game's similar games set to include the parent game.
+        foreach ($gameIdsToLink as $gameId) {
+            $similarGamesSet = GameSet::firstOrCreate([
+                'type' => GameSetType::SimilarGames,
+                'game_id' => $gameId,
+            ]);
+            $similarGamesSet->games()->attach($parentGame->id);
+        }
+    }
+}
diff --git a/app/Platform/Actions/RemoveLeaderboardEntryAction.php b/app/Platform/Actions/RemoveLeaderboardEntryAction.php
index ad32c95d48..6504a86d91 100644
--- a/app/Platform/Actions/RemoveLeaderboardEntryAction.php
+++ b/app/Platform/Actions/RemoveLeaderboardEntryAction.php
@@ -36,7 +36,7 @@ public function execute(LeaderboardEntry $entry, ?string $reason): void
                 ArticleType::Leaderboard,
                 $entry->leaderboard->id,
                 "{$currentUser->display_name} {$commentText}",
-                $currentUser->username
+                $currentUser->display_name
             );
         }
     }
diff --git a/app/Platform/Actions/RequestAccountDeletionAction.php b/app/Platform/Actions/RequestAccountDeletionAction.php
index 37d30ed819..6c845f21f8 100644
--- a/app/Platform/Actions/RequestAccountDeletionAction.php
+++ b/app/Platform/Actions/RequestAccountDeletionAction.php
@@ -33,11 +33,11 @@ public function execute(User $user): bool
         $user->save();
 
         addArticleComment('Server', ArticleType::UserModeration, $user->ID,
-            $user->User . ' requested account deletion'
+            $user->display_name . ' requested account deletion'
         );
 
         mail_utf8($user->EmailAddress, "Account Deletion Request",
-            "Hello {$user->User},<br><br>" .
+            "Hello {$user->display_name},<br><br>" .
             "Your account has been marked for deletion.<br>" .
             "If you do not cancel this request before " . getDeleteDate($user->DeleteRequested) . ", " .
             "you will no longer be able to access your account.<br><br>" .
diff --git a/app/Platform/Actions/ResetPlayerProgressAction.php b/app/Platform/Actions/ResetPlayerProgressAction.php
index 1ba0acbf90..3b929f71b7 100644
--- a/app/Platform/Actions/ResetPlayerProgressAction.php
+++ b/app/Platform/Actions/ResetPlayerProgressAction.php
@@ -26,7 +26,7 @@ public function execute(User $user, ?int $achievementID = null, ?int $gameID = n
 
         $affectedAchievements = legacyDbFetchAll("
             SELECT
-                ua.User AS Author,
+                COALESCE(ua.display_name, ua.User) AS Author,
                 ach.GameID,
                 CASE WHEN pa.unlocked_hardcore_at THEN 1 ELSE 0 END AS HardcoreMode,
                 COUNT(ach.ID) AS Count, SUM(ach.Points) AS Points,
@@ -92,7 +92,12 @@ public function execute(User $user, ?int $achievementID = null, ?int $gameID = n
             $user->save();
         }
 
-        $authors = User::whereIn('User', $authorUsernames->unique())->get('ID');
+        $authors = User::query()
+            ->where(function ($query) use ($authorUsernames) {
+                $query->whereIn('User', $authorUsernames->unique())
+                    ->orWhereIn('display_name', $authorUsernames->unique());
+            })
+            ->get('ID');
         foreach ($authors as $author) {
             dispatch(new UpdateDeveloperContributionYieldJob($author->id));
         }
diff --git a/app/Platform/Actions/UnlinkSimilarGamesAction.php b/app/Platform/Actions/UnlinkSimilarGamesAction.php
new file mode 100644
index 0000000000..d586627c3d
--- /dev/null
+++ b/app/Platform/Actions/UnlinkSimilarGamesAction.php
@@ -0,0 +1,49 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Platform\Actions;
+
+use App\Models\Game;
+use App\Models\GameAlternative;
+use App\Models\GameSet;
+use App\Platform\Enums\GameSetType;
+
+class UnlinkSimilarGamesAction
+{
+    public function execute(Game $parentGame, array $gameIdsToUnlink): void
+    {
+        // Remove bidirectional alternative game links.
+        foreach ($gameIdsToUnlink as $gameId) {
+            GameAlternative::where([
+                'gameID' => $parentGame->id,
+                'gameIDAlt' => $gameId,
+            ])->delete();
+
+            GameAlternative::where([
+                'gameID' => $gameId,
+                'gameIDAlt' => $parentGame->id,
+            ])->delete();
+        }
+
+        $parentSimilarGamesSet = GameSet::where([
+            'type' => GameSetType::SimilarGames,
+            'game_id' => $parentGame->id,
+        ])->first();
+        if ($parentSimilarGamesSet) {
+            $parentSimilarGamesSet->games()->detach($gameIdsToUnlink);
+        }
+
+        // Remove parent game from each game's similar games set.
+        foreach ($gameIdsToUnlink as $gameId) {
+            $similarGamesSet = GameSet::where([
+                'type' => GameSetType::SimilarGames,
+                'game_id' => $gameId,
+            ])->first();
+
+            if ($similarGamesSet) {
+                $similarGamesSet->games()->detach($parentGame->id);
+            }
+        }
+    }
+}
diff --git a/app/Platform/Actions/UpsertTriggerVersionAction.php b/app/Platform/Actions/UpsertTriggerVersionAction.php
index bd8a15f68c..58ad76c4ca 100644
--- a/app/Platform/Actions/UpsertTriggerVersionAction.php
+++ b/app/Platform/Actions/UpsertTriggerVersionAction.php
@@ -4,51 +4,99 @@
 
 namespace App\Platform\Actions;
 
+use App\Models\Achievement;
 use App\Models\Trigger;
+use App\Models\User;
 use App\Platform\Contracts\HasVersionedTrigger;
 use Illuminate\Database\Eloquent\Model;
+use RuntimeException;
 
 class UpsertTriggerVersionAction
 {
-    public function execute(Model $triggerable, string $conditions, bool $versioned = true): ?Trigger
-    {
+    public function execute(
+        Model $triggerable,
+        string $conditions,
+        bool $versioned = true,
+        ?User $user = null,
+    ): ?Trigger {
         if (!$triggerable instanceof HasVersionedTrigger) {
             return null;
         }
 
         $triggerable->loadMissing('trigger');
 
-        /** @var ?Trigger $currentTrigger */
-        $currentTrigger = $triggerable->trigger;
+        // Check if this triggerable has version history (for maintaining versions when demoted).
+        $hasVersionHistory = $triggerable->triggers()->whereNotNull('version')->exists();
+        $shouldKeepVersion = $versioned || $hasVersionHistory;
 
-        /*
-         * No trigger exists yet -> create one
-         * Attention: when $versioned = false make sure to check if another entry should even be created beforehand
-         * Otherwise the unique check will not be triggered and multiple unversioned triggers will be created
-         */
-        if (!$currentTrigger) {
-            $trigger = new Trigger([
+        // For unversioned triggers, explicitly check if one already exists.
+        // MySQL/MariaDB ignore uniqueness constraints on NULL column values (version),
+        // so if we're not careful, we can wind up with lots of unversioned triggers
+        // for the same triggerable asset (achievement).
+        if (!$shouldKeepVersion) {
+            $currentTrigger = $triggerable->triggers()->unversioned()->first();
+
+            if (!$currentTrigger && $triggerable->triggers()->unversioned()->exists()) {
+                throw new RuntimeException('Multiple unversioned triggers detected for ' . get_class($triggerable) . ' #' . $triggerable->getKey());
+            }
+
+            // If there's already an unversioned trigger for this asset, just update it in-place.
+            if ($currentTrigger) {
+                $currentTrigger->update([
+                    'conditions' => $conditions,
+                    'user_id' => $user?->id,
+                ]);
+                $triggerable->update(['trigger_id' => $currentTrigger->id]);
+
+                return $currentTrigger;
+            }
+
+            // Otherwise, create a new unversioned trigger. It'll get its first version on publish.
+            $trigger = $triggerable->trigger()->save(new Trigger([
                 'conditions' => $conditions,
-                'version' => $versioned ? 1 : null,
-            ]);
-            /** @var Trigger $newTrigger */
-            $newTrigger = $triggerable->trigger()->save($trigger);
+                'version' => null,
+                'user_id' => $user?->id,
+            ]));
+            $triggerable->update(['trigger_id' => $trigger->id]);
 
-            return $newTrigger;
+            return $trigger;
         }
 
-        if ($currentTrigger->conditions === $conditions) {
+        /**
+         * Versioned triggers are handled a bit differently than unversioned triggers.
+         * Versions are stored almost like a linked list in the database. Version numbers
+         * increase via a simple integer counter (1 -> 2 -> 3 -> etc...), and each versioned
+         * trigger has a parent_id which points to the previous version's row in the table.
+         * With this, we can build a chain of the triggerable asset's logic history.
+         */
+        $currentTrigger = $triggerable->trigger;
+
+        // If conditions haven't changed and we're converting unversioned -> versioned,
+        // just update the trigger's version in-place.
+        if ($currentTrigger && $currentTrigger->conditions === $conditions) {
+            // If conditions match and it's unversioned, convert to version 1.
+            if ($currentTrigger->version === null) {
+                $currentTrigger->update([
+                    'version' => 1,
+                    'user_id' => $user?->id,
+                ]);
+                $triggerable->update(['trigger_id' => $currentTrigger->id]);
+            }
+
             return $currentTrigger;
         }
 
-        $trigger = new Trigger([
+        $latestVersion = $triggerable->triggers()->whereNotNull('version')->max('version') ?? 0;
+
+        // If we ultimately made it here, create a new versioned trigger.
+        $trigger = $triggerable->trigger()->save(new Trigger([
             'conditions' => $conditions,
-            'version' => $versioned ? $currentTrigger->version + 1 : null,
-            'parent_id' => $currentTrigger->id,
-        ]);
-        /** @var Trigger $newTrigger */
-        $newTrigger = $triggerable->trigger()->save($trigger);
+            'version' => $latestVersion + 1,
+            'parent_id' => $currentTrigger?->id,
+            'user_id' => $user?->id,
+        ]));
+        $triggerable->update(['trigger_id' => $trigger->id]);
 
-        return $newTrigger;
+        return $trigger;
     }
 }
diff --git a/app/Platform/AppServiceProvider.php b/app/Platform/AppServiceProvider.php
index 171b0e2d00..4c1775b199 100644
--- a/app/Platform/AppServiceProvider.php
+++ b/app/Platform/AppServiceProvider.php
@@ -45,6 +45,7 @@
 use App\Platform\Commands\SyncPlayerBadges;
 use App\Platform\Commands\SyncPlayerRichPresence;
 use App\Platform\Commands\SyncPlayerSession;
+use App\Platform\Commands\SyncTriggers;
 use App\Platform\Commands\TrimGameMetadata;
 use App\Platform\Commands\UnlockPlayerAchievement;
 use App\Platform\Commands\UpdateAwardsStaticData;
@@ -128,6 +129,7 @@ public function boot(): void
                 SyncPlayerBadges::class,
                 SyncPlayerRichPresence::class,
                 SyncPlayerSession::class,
+                SyncTriggers::class,
             ]);
         }
 
diff --git a/app/Platform/Commands/ResetPlayerAchievement.php b/app/Platform/Commands/ResetPlayerAchievement.php
index e924fe7281..fe8314e485 100644
--- a/app/Platform/Commands/ResetPlayerAchievement.php
+++ b/app/Platform/Commands/ResetPlayerAchievement.php
@@ -34,7 +34,7 @@ public function handle(): void
 
         $user = is_numeric($userId)
             ? User::findOrFail($userId)
-            : User::where('User', $userId)->firstOrFail();
+            : User::whereName($userId)->firstOrFail();
 
         $achievements = PlayerAchievement::where('user_id', $user->id)
             ->whereIn('achievement_id', $achievementIds);
diff --git a/app/Platform/Commands/SyncGameSetsInternalNotes.php b/app/Platform/Commands/SyncGameSetsInternalNotes.php
index 2eb85c9ff5..122230782e 100644
--- a/app/Platform/Commands/SyncGameSetsInternalNotes.php
+++ b/app/Platform/Commands/SyncGameSetsInternalNotes.php
@@ -14,9 +14,6 @@ class SyncGameSetsInternalNotes extends Command
     protected $signature = 'ra:sync:game-sets:internal-notes';
     protected $description = 'Sync internal notes for hub-type game sets from their legacy games.';
 
-    /**
-     * Execute the console command.
-     */
     public function handle(): void
     {
         $this->info('Starting internal notes sync for hub game sets...');
diff --git a/app/Platform/Commands/SyncTriggers.php b/app/Platform/Commands/SyncTriggers.php
new file mode 100644
index 0000000000..4723a90dae
--- /dev/null
+++ b/app/Platform/Commands/SyncTriggers.php
@@ -0,0 +1,271 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Platform\Commands;
+
+use App\Models\Achievement;
+use App\Models\Game;
+use App\Models\Leaderboard;
+use App\Models\Trigger;
+use App\Models\User;
+use App\Platform\Actions\UpsertTriggerVersionAction;
+use App\Platform\Enums\AchievementFlag;
+use Illuminate\Console\Command;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\DB;
+
+class SyncTriggers extends Command
+{
+    protected $signature = 'ra:sync:triggers';
+    protected $description = 'Sync memory triggers from achievements, leaderboards, and rich presence.';
+
+    public function handle(): void
+    {
+        // This will be a full reset. Delete any existing triggers data.
+        // We'll use TRUNCATE to reset the auto-incrementing ID counter back to 1.
+        $this->info("\nDeleting any existing triggers data...");
+        $this->wipeAllTriggersData();
+        $this->info("Deleted all existing triggers data.");
+
+        $this->info('Syncing triggers for achievements, leaderboards, and rich presence scripts.');
+
+        $this->syncAchievementTriggers();
+        $this->syncLeaderboardTriggers();
+        $this->syncRichPresenceTriggers();
+
+        $this->newLine();
+        $this->info('Done syncing all triggers.');
+    }
+
+    private function syncAchievementTriggers(): void
+    {
+        $achievementCount = Achievement::where('MemAddr', '!=', '')->count();
+        $this->info("Syncing triggers for {$achievementCount} achievements...");
+
+        $progressBar = $this->output->createProgressBar($achievementCount);
+
+        Achievement::query()
+            ->where('MemAddr', '!=', '')
+            ->with(['comments' => function ($query) {
+                $query->automated()
+                    ->whereRaw("LOWER(Payload) LIKE '% edited%logic%'")
+                    ->latest('Submitted')
+                    ->limit(1);
+            }])
+            ->chunk(1000, function ($achievements) use ($progressBar) {
+                foreach ($achievements as $achievement) {
+                    $lastEditor = $this->findLastEditor($achievement);
+
+                    $newTrigger = (new UpsertTriggerVersionAction())->execute(
+                        $achievement,
+                        $achievement->MemAddr,
+                        versioned: $achievement->Flags === AchievementFlag::OfficialCore->value,
+                        user: $lastEditor,
+                    );
+
+                    // Try our best to backdate the new trigger's timestamps.
+                    if ($newTrigger) {
+                        // Get the achievement's creation date for both timestamps.
+                        // For the updated timestamp, prefer the latest logic edit comment's timestamp if it exists.
+                        // DateModified unfortunately could be all kinds of different things other than logic.
+                        $createdTimestamp = $achievement->DateCreated ?? now();
+                        $updatedTimestamp = $achievement->comments->first()?->Submitted ?? $createdTimestamp;
+
+                        $newTrigger->timestamps = false;
+                        $newTrigger->update([
+                            'created_at' => $createdTimestamp,
+                            'updated_at' => $updatedTimestamp,
+                        ]);
+                    }
+
+                    $progressBar->advance();
+                }
+            });
+
+        $progressBar->finish();
+        $this->newLine();
+        $this->info('Done syncing triggers for achievements.');
+    }
+
+    private function syncLeaderboardTriggers(): void
+    {
+        $leaderboardCount = Leaderboard::count();
+        $this->info("Syncing triggers for {$leaderboardCount} leaderboards...");
+
+        $progressBar = $this->output->createProgressBar($leaderboardCount);
+
+        Leaderboard::query()
+            ->with(['comments' => function ($query) {
+                $query->automated()
+                    ->whereRaw("LOWER(Payload) LIKE '% edited this leaderboard%'")
+                    ->latest('Submitted')
+                    ->limit(1);
+            }])
+            ->chunk(1000, function ($leaderboards) use ($progressBar) {
+                foreach ($leaderboards as $leaderboard) {
+                    $lastEditor = $this->findLastEditor($leaderboard);
+
+                    $newTrigger = (new UpsertTriggerVersionAction())->execute(
+                        $leaderboard,
+                        $leaderboard->Mem,
+                        versioned: true,
+                        user: $lastEditor,
+                    );
+
+                    // Try our best to backdate the new trigger's timestamps.
+                    if ($newTrigger) {
+                        // First determine the creation date.
+                        $createdTimestamp =
+                            $leaderboard->Created
+                            ?? $leaderboard->Updated
+                            ?? now();
+
+                        // Then ensure updated is never before created.
+                        $updatedTimestamp = max(
+                            $createdTimestamp,
+                            $leaderboard->comments->first()?->Submitted
+                            ?? $leaderboard->Updated
+                            ?? $createdTimestamp
+                        );
+
+                        $newTrigger->timestamps = false;
+                        $newTrigger->update([
+                            'created_at' => $createdTimestamp,
+                            'updated_at' => $updatedTimestamp,
+                        ]);
+                    }
+
+                    $progressBar->advance();
+                }
+            });
+
+        $progressBar->finish();
+        $this->newLine();
+        $this->info('Done syncing triggers for leaderboards.');
+    }
+
+    private function syncRichPresenceTriggers(): void
+    {
+       $gamesCount = Game::whereNotNull('RichPresencePatch')
+           ->where('RichPresencePatch', '!=', '')
+           ->count();
+
+       $this->info("Syncing triggers for {$gamesCount} rich presence scripts...");
+
+       $progressBar = $this->output->createProgressBar($gamesCount);
+
+       Game::query()
+           ->whereNotNull('RichPresencePatch')
+           ->where('RichPresencePatch', '!=', '')
+           ->with(['modificationsComments' => function ($query) {
+                $query->automated()
+                    ->whereRaw("LOWER(Payload) LIKE '%changed the rich presence%'")
+                    ->latest('Submitted')
+                    ->limit(1);
+            }])
+            ->chunk(1000, function ($games) use ($progressBar) {
+                foreach ($games as $game) {
+                    $lastEditor = $this->findLastEditor($game);
+
+                    $newTrigger = (new UpsertTriggerVersionAction())->execute(
+                        $game,
+                        $game->RichPresencePatch,
+                        versioned: true,
+                        user: $lastEditor,
+                    );
+
+                    // Try our best to backdate the new trigger's timestamps.
+                    if ($newTrigger) {
+                        // When RP is edited, a comment is left. Use that comment's submitted
+                        // date, otherwise fall back to various dates of decreasing precision.
+                        $timestamp =
+                            $game->modificationsComments->first()?->Submitted
+                            ?? $game->achievements()->min('DateCreated')
+                            ?? $game->Created
+                            ?? $game->Updated;
+
+                        $newTrigger->timestamps = false;
+                        $newTrigger->update([
+                            'created_at' => $timestamp,
+                            'updated_at' => $timestamp,
+                        ]);
+                    }
+
+                   $progressBar->advance();
+                }
+            });
+
+        $progressBar->finish();
+        $this->newLine();
+        $this->info('Done syncing triggers for rich presence scripts.');
+    }
+
+    private function findLastEditor(Model $triggerable): ?User
+    {
+        if ($triggerable instanceof Game) {
+            $lastRichPresenceEdit = $triggerable->modificationsComments()
+                ->automated()
+                ->whereRaw("LOWER(Payload) LIKE '%changed the rich presence%'")
+                ->latest('Submitted')
+                ->first();
+
+            if ($lastRichPresenceEdit) {
+                $username = explode(' ', $lastRichPresenceEdit->Payload)[0];
+
+                return $this->findUserByName($username);
+            }
+
+            return null;
+        }
+
+        if ($triggerable instanceof Leaderboard) {
+            $lastLeaderboardEdit = $triggerable->comments()
+                ->automated()
+                ->whereRaw("LOWER(Payload) LIKE '% edited this leaderboard%'")
+                ->latest('Submitted')
+                ->first();
+
+            if ($lastLeaderboardEdit) {
+                $username = explode(' ', $lastLeaderboardEdit->Payload)[0];
+
+                return $this->findUserByName($username);
+            }
+
+            return User::withTrashed()->find($triggerable->author_id);
+        }
+
+        if ($triggerable instanceof Achievement) {
+            $lastLogicEdit = $triggerable->comments()
+                ->automated()
+                ->whereRaw("LOWER(Payload) LIKE '% edited%logic%'")
+                ->latest('Submitted')
+                ->first();
+
+            if ($lastLogicEdit) {
+                $username = explode(' ', $lastLogicEdit->Payload)[0];
+
+                return $this->findUserByName($username);
+            }
+
+            return User::withTrashed()->find($triggerable->user_id) ?? null;
+        }
+
+        return null;
+    }
+
+    private function findUserByName(string $name): ?User
+    {
+        return User::withTrashed()
+            ->where('display_name', $name)
+            ->orWhere('User', $name)
+            ->first();
+    }
+
+    private function wipeAllTriggersData(): void
+    {
+        DB::statement('SET FOREIGN_KEY_CHECKS=0');
+        Trigger::truncate();
+        DB::statement('SET FOREIGN_KEY_CHECKS=1');
+    }
+}
diff --git a/app/Platform/Commands/UnlockPlayerAchievement.php b/app/Platform/Commands/UnlockPlayerAchievement.php
index b431d0f728..2ed0da83e5 100644
--- a/app/Platform/Commands/UnlockPlayerAchievement.php
+++ b/app/Platform/Commands/UnlockPlayerAchievement.php
@@ -36,7 +36,7 @@ public function handle(): void
 
         $user = is_numeric($userId)
             ? User::findOrFail($userId)
-            : User::where('User', $userId)->firstOrFail();
+            : User::whereName($userId)->firstOrFail();
 
         $achievements = Achievement::whereIn('id', $achievementIds)->get();
 
diff --git a/app/Platform/Commands/UpdateDeveloperContributionYield.php b/app/Platform/Commands/UpdateDeveloperContributionYield.php
index cdb6df7fd7..3ec262d98c 100644
--- a/app/Platform/Commands/UpdateDeveloperContributionYield.php
+++ b/app/Platform/Commands/UpdateDeveloperContributionYield.php
@@ -24,7 +24,7 @@ public function handle(): void
         $username = $this->argument('username');
 
         if (!empty($username)) {
-            $users = User::where('User', $username)->get();
+            $users = User::whereName($username)->get();
         } else {
             $users = User::where('ContribCount', '>', 0)->get();
         }
diff --git a/app/Platform/Commands/UpdatePlayerBeatenGamesStats.php b/app/Platform/Commands/UpdatePlayerBeatenGamesStats.php
index dce8b1734a..993ff32c13 100644
--- a/app/Platform/Commands/UpdatePlayerBeatenGamesStats.php
+++ b/app/Platform/Commands/UpdatePlayerBeatenGamesStats.php
@@ -30,7 +30,7 @@ public function handle(): void
         if ($userId !== null) {
             $user = is_numeric($userId)
                 ? User::findOrFail($userId)
-                : User::where('User', $userId)->firstOrFail();
+                : User::whereName($userId)->firstOrFail();
 
             $this->info('Updating beaten games stats for player [' . $user->id . ':' . $user->username . ']');
 
diff --git a/app/Platform/Commands/UpdatePlayerGameMetrics.php b/app/Platform/Commands/UpdatePlayerGameMetrics.php
index 42c814cbee..db613f5713 100644
--- a/app/Platform/Commands/UpdatePlayerGameMetrics.php
+++ b/app/Platform/Commands/UpdatePlayerGameMetrics.php
@@ -34,7 +34,7 @@ public function handle(): void
 
         $user = is_numeric($userId)
             ? User::findOrFail($userId)
-            : User::where('User', $userId)->firstOrFail();
+            : User::whereName($userId)->firstOrFail();
 
         $query = $user->playerGames()
             ->with(['user', 'game']);
diff --git a/app/Platform/Commands/UpdatePlayerMetrics.php b/app/Platform/Commands/UpdatePlayerMetrics.php
index 3099f2e9c6..51c41eb92f 100644
--- a/app/Platform/Commands/UpdatePlayerMetrics.php
+++ b/app/Platform/Commands/UpdatePlayerMetrics.php
@@ -26,7 +26,7 @@ public function handle(): void
 
         $user = is_numeric($userId)
             ? User::findOrFail($userId)
-            : User::where('User', $userId)->firstOrFail();
+            : User::whereName($userId)->firstOrFail();
 
         $this->info('Updating metrics for player [' . $user->id . ':' . $user->username . ']');
 
diff --git a/app/Platform/Commands/UpdatePlayerPointsStats.php b/app/Platform/Commands/UpdatePlayerPointsStats.php
index 0d6bbdc6b8..6f7b8a8a21 100644
--- a/app/Platform/Commands/UpdatePlayerPointsStats.php
+++ b/app/Platform/Commands/UpdatePlayerPointsStats.php
@@ -39,7 +39,7 @@ public function handle(): void
         if ($userId !== null) {
             $user = is_numeric($userId)
                 ? User::findOrFail($userId)
-                : User::where('User', $userId)->firstOrFail();
+                : User::whereName($userId)->firstOrFail();
 
             $this->info("Updating points stats for player [{$user->id}:{$user->username}]");
 
diff --git a/app/Platform/Components/GameCard.php b/app/Platform/Components/GameCard.php
index 69fa569aef..14ed723417 100644
--- a/app/Platform/Components/GameCard.php
+++ b/app/Platform/Components/GameCard.php
@@ -28,7 +28,7 @@ class GameCard extends Component
     public function __construct(int $gameId, ?string $targetUsername = null)
     {
         $this->gameId = $gameId;
-        $this->userContext = User::firstWhere('User', $targetUsername) ?? Auth::user() ?? null;
+        $this->userContext = User::whereName($targetUsername)->first() ?? Auth::user() ?? null;
     }
 
     public function render(): ?View
@@ -92,7 +92,7 @@ private function getGameData(int $gameId): ?array
             $processedClaims = [];
             foreach ($foundClaims as $foundClaim) {
                 $processedClaim = $foundClaim->toArray();
-                $processedClaim['User'] = $foundClaim->user->username;
+                $processedClaim['User'] = $foundClaim->user->display_name;
 
                 $processedClaims[] = $processedClaim;
             }
diff --git a/app/Platform/Concerns/BuildsGameListQueries.php b/app/Platform/Concerns/BuildsGameListQueries.php
index 2d03eb965c..b158b569e9 100644
--- a/app/Platform/Concerns/BuildsGameListQueries.php
+++ b/app/Platform/Concerns/BuildsGameListQueries.php
@@ -323,8 +323,8 @@ private function applyReleasedAtSorting(Builder $query, string $sortDirection =
         // and SQLite. This is preferable to altering the query specifically for
         // SQLite, because if we do so then we can't actually trust any test results.
         $query
-            ->selectRaw(
-                "GameData.*,
+            ->selectRaw(<<<SQL
+                GameData.*,
                 CASE
                     WHEN GameData.released_at_granularity = 'year' THEN
                         DATE(CONCAT(SUBSTR(GameData.released_at, 1, 4), '-01-01'))
@@ -332,9 +332,16 @@ private function applyReleasedAtSorting(Builder $query, string $sortDirection =
                         DATE(CONCAT(SUBSTR(GameData.released_at, 1, 7), '-01'))
                     ELSE
                         COALESCE(GameData.released_at, '9999-12-31')
-                END AS normalized_released_at"
-            )
-            ->orderBy('normalized_released_at', $sortDirection);
+                END AS normalized_released_at,
+                CASE GameData.released_at_granularity
+                    WHEN 'year' THEN 1
+                    WHEN 'month' THEN 2
+                    WHEN 'day' THEN 3
+                    ELSE 4
+                END AS granularity_order
+            SQL)
+            ->orderBy('normalized_released_at', $sortDirection)
+            ->orderBy('granularity_order', $sortDirection);
     }
 
     /**
diff --git a/app/Platform/Contracts/HasVersionedTrigger.php b/app/Platform/Contracts/HasVersionedTrigger.php
index e70dd2852a..85d9756a46 100644
--- a/app/Platform/Contracts/HasVersionedTrigger.php
+++ b/app/Platform/Contracts/HasVersionedTrigger.php
@@ -5,12 +5,38 @@
 namespace App\Platform\Contracts;
 
 use App\Models\Trigger;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Database\Eloquent\Relations\MorphOne;
 
+/**
+ * @template TModel of Model
+ */
 interface HasVersionedTrigger
 {
     /**
+     * Get the latest trigger version via a denormalized trigger_id column.
+     * Used for efficient reading of the current trigger.
+     *
+     * trigger() as a MorphOne must remain for Eloquent ORM polymorphic
+     * queries to continue working correctly.
+     *
+     * @return BelongsTo<Trigger, TModel>
+     */
+    public function currentTrigger(): BelongsTo;
+
+    /**
+     * Get the latest trigger version.
+     *
      * @return MorphOne<Trigger>
      */
     public function trigger(): MorphOne;
+
+    /**
+     * Get all trigger versions
+     *
+     * @return MorphMany<Trigger>
+     */
+    public function triggers(): MorphMany;
 }
diff --git a/app/Platform/Data/EventAchievementData.php b/app/Platform/Data/EventAchievementData.php
index 4ce4564deb..eee93e0375 100644
--- a/app/Platform/Data/EventAchievementData.php
+++ b/app/Platform/Data/EventAchievementData.php
@@ -16,6 +16,7 @@ class EventAchievementData extends Data
     public function __construct(
         public Lazy|AchievementData $achievement,
         public Lazy|AchievementData $sourceAchievement,
+        public Lazy|EventData $event,
         public Lazy|Carbon $activeUntil,
         public Lazy|int $forumTopicId,
     ) {
@@ -27,6 +28,7 @@ public static function fromEventAchievement(
         return new self(
             achievement: Lazy::create(fn () => AchievementData::fromAchievement($eventAchievement->achievement)),
             sourceAchievement: Lazy::create(fn () => AchievementData::fromAchievement($eventAchievement->sourceAchievement)),
+            event: Lazy::create(fn () => EventData::fromEvent($eventAchievement->event)),
             activeUntil: Lazy::create(fn () => $eventAchievement->active_until),
             forumTopicId: Lazy::create(fn () => $eventAchievement->achievement->game->ForumTopicID),
         );
diff --git a/app/Platform/Data/EventData.php b/app/Platform/Data/EventData.php
new file mode 100644
index 0000000000..2667d5efa8
--- /dev/null
+++ b/app/Platform/Data/EventData.php
@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Platform\Data;
+
+use App\Models\Event;
+use Spatie\LaravelData\Data;
+use Spatie\LaravelData\Lazy;
+use Spatie\TypeScriptTransformer\Attributes\TypeScript;
+
+#[TypeScript('Event')]
+class EventData extends Data
+{
+    public function __construct(
+        public int $id,
+        public Lazy|GameData $legacyGame,
+    ) {
+    }
+
+    public static function fromEvent(Event $event): self
+    {
+        return new self(
+            id: $event->id,
+            legacyGame: Lazy::create(fn () => GameData::fromGame($event->legacyGame)),
+        );
+    }
+}
diff --git a/app/Platform/Data/TicketData.php b/app/Platform/Data/TicketData.php
new file mode 100644
index 0000000000..460e5a234e
--- /dev/null
+++ b/app/Platform/Data/TicketData.php
@@ -0,0 +1,33 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Platform\Data;
+
+use App\Models\Ticket;
+use App\Platform\Enums\TicketableType;
+use Spatie\LaravelData\Data;
+use Spatie\LaravelData\Lazy;
+use Spatie\TypeScriptTransformer\Attributes\TypeScript;
+
+#[TypeScript('Ticket')]
+class TicketData extends Data
+{
+    public function __construct(
+        public int $id,
+        public TicketableType $ticketableType,
+        public Lazy|int $state,
+        public Lazy|AchievementData|LeaderboardData|GameData $ticketable,
+    ) {
+    }
+
+    public static function fromTicket(Ticket $ticket): self
+    {
+        return new self(
+            id: $ticket->id,
+            ticketableType: TicketableType::Achievement,
+            state: Lazy::create(fn () => $ticket->state),
+            ticketable: Lazy::create(fn () => AchievementData::fromAchievement($ticket->achievement)->include('badgeUnlockedUrl'))
+        );
+    }
+}
diff --git a/app/Platform/Enums/TicketableType.php b/app/Platform/Enums/TicketableType.php
new file mode 100644
index 0000000000..0b21b1f3c2
--- /dev/null
+++ b/app/Platform/Enums/TicketableType.php
@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Platform\Enums;
+
+use Spatie\TypeScriptTransformer\Attributes\TypeScript;
+
+#[TypeScript]
+enum TicketableType: string
+{
+    case Achievement = 'achievement';
+    case Leaderboard = 'leaderboard';
+    case RichPresence = 'rich-presence';
+}
diff --git a/app/Platform/Enums/TriggerableType.php b/app/Platform/Enums/TriggerableType.php
new file mode 100644
index 0000000000..d06d85caeb
--- /dev/null
+++ b/app/Platform/Enums/TriggerableType.php
@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Platform\Enums;
+
+enum TriggerableType: string
+{
+    case Achievement = 'achievement';
+
+    case Leaderboard = 'leaderboard';
+
+    /**
+     * This is actually rich presence.
+     * It must be named "game" because that's where the morph is attached.
+     */
+    case Game = 'game';
+}
diff --git a/app/Platform/Services/BeatenGamesLeaderboardService.php b/app/Platform/Services/BeatenGamesLeaderboardService.php
index 2abd758389..33cb46cbeb 100644
--- a/app/Platform/Services/BeatenGamesLeaderboardService.php
+++ b/app/Platform/Services/BeatenGamesLeaderboardService.php
@@ -30,7 +30,7 @@ public function buildViewData(Request $request): array|RedirectResponse
         $foundUserByFilter = null;
         $isUserFilterSet = isset($validatedData['filter']['user']);
         if ($isUserFilterSet) {
-            $foundUserByFilter = User::byDisplayName($validatedData['filter']['user'])->first();
+            $foundUserByFilter = User::whereName($validatedData['filter']['user'])->first();
 
             if (!$foundUserByFilter) {
                 return ['redirect' => route('ranking.beaten-games')];
diff --git a/app/Policies/EventAwardPolicy.php b/app/Policies/EventAwardPolicy.php
new file mode 100644
index 0000000000..3689dbbae7
--- /dev/null
+++ b/app/Policies/EventAwardPolicy.php
@@ -0,0 +1,57 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Policies;
+
+use App\Models\EventAward;
+use App\Models\Role;
+use App\Models\User;
+use Illuminate\Auth\Access\HandlesAuthorization;
+
+class EventAwardPolicy
+{
+    use HandlesAuthorization;
+
+    public function manage(User $user): bool
+    {
+        return $user->hasAnyRole([
+            Role::EVENT_MANAGER,
+            Role::ADMINISTRATOR,
+        ]);
+    }
+
+    public function viewAny(?User $user): bool
+    {
+        return true;
+    }
+
+    public function view(?User $user, EventAward $eventAward): bool
+    {
+        return true;
+    }
+
+    public function create(User $user): bool
+    {
+        return $user->hasAnyRole([
+            Role::EVENT_MANAGER,
+            Role::ADMINISTRATOR,
+        ]);
+    }
+
+    public function update(User $user, EventAward $eventAward): bool
+    {
+        return $user->hasAnyRole([
+            Role::EVENT_MANAGER,
+            Role::ADMINISTRATOR,
+        ]);
+    }
+
+    public function delete(User $user, EventAward $eventAward): bool
+    {
+        return $user->hasAnyRole([
+            Role::EVENT_MANAGER,
+            Role::ADMINISTRATOR,
+        ]);
+    }
+}
diff --git a/app/Policies/ForumTopicCommentPolicy.php b/app/Policies/ForumTopicCommentPolicy.php
index 392c69e489..5891df911d 100644
--- a/app/Policies/ForumTopicCommentPolicy.php
+++ b/app/Policies/ForumTopicCommentPolicy.php
@@ -4,7 +4,6 @@
 
 namespace App\Policies;
 
-use App\Enums\Permissions;
 use App\Models\ForumTopic;
 use App\Models\ForumTopicComment;
 use App\Models\Role;
@@ -18,10 +17,10 @@ class ForumTopicCommentPolicy
     public function manage(User $user): bool
     {
         return $user->hasAnyRole([
+            Role::ADMINISTRATOR,
             Role::MODERATOR,
             Role::FORUM_MANAGER,
-        ])
-            || $user->getAttribute('Permissions') >= Permissions::Moderator;
+        ]);
     }
 
     public function viewAny(?User $user): bool
diff --git a/app/Providers/FortifyServiceProvider.php b/app/Providers/FortifyServiceProvider.php
index b005be152d..a823dc802f 100644
--- a/app/Providers/FortifyServiceProvider.php
+++ b/app/Providers/FortifyServiceProvider.php
@@ -11,6 +11,7 @@
 use App\Enums\Permissions;
 use App\Http\Responses\LoginResponse;
 use App\Models\User;
+use Hash;
 use Illuminate\Cache\RateLimiting\Limit;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\RateLimiter;
@@ -56,12 +57,48 @@ public function register(): void
         $this->app->singleton(LoginResponseContract::class, LoginResponse::class);
         $this->app->singleton(TwoFactorLoginResponse::class, LoginResponse::class);
 
+        Fortify::authenticateUsing(function (Request $request) {
+            $user = User::where('User', $request->input(Fortify::username()))
+                ->orWhere('display_name', $request->input(Fortify::username()))
+                ->first();
+
+            if (!$user) {
+                return null;
+            }
+
+            // banned users should not have a password anymore. make sure they cannot get back in when a password still exists
+            if ($user->getAttribute('Permissions') < Permissions::Unregistered) {
+                return null;
+            }
+
+            // if the user hasn't logged in for a while, they may still have a salted password, upgrade it
+            if (mb_strlen($user->SaltedPass) === 32) {
+                $pepperedPassword = md5($request->input('password') . config('app.legacy_password_salt'));
+                if ($user->SaltedPass === $pepperedPassword) {
+                    changePassword($user->User, $request->input('password'));
+
+                    return $user;
+                }
+
+                return null;
+            }
+
+            // Standard password check
+            if (Hash::check($request->input('password'), $user->Password)) {
+                return $user;
+            }
+
+            return null;
+        });
+
         Fortify::authenticateThrough(function (Request $request) {
             return array_filter([
                 config('fortify.limiters.login') ? null : EnsureLoginIsNotThrottled::class,
                 Features::enabled(Features::twoFactorAuthentication()) ? RedirectIfTwoFactorAuthenticatable::class : null,
                 function ($request, $next) {
-                    $user = User::firstWhere(Fortify::username(), $request->input(Fortify::username()));
+                    $user = User::where('User', $request->input(Fortify::username()))
+                        ->orWhere('display_name', $request->input(Fortify::username()))
+                        ->first();
 
                     // banned users should not have a password anymore. make sure they cannot get back in when a password still exists
                     if ($user && $user->getAttribute('Permissions') < Permissions::Unregistered) {
diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php
index 1398c68b23..734a71f433 100755
--- a/app/Providers/RouteServiceProvider.php
+++ b/app/Providers/RouteServiceProvider.php
@@ -8,6 +8,7 @@
 use App\Http\Controllers\HomeController;
 use App\Http\Controllers\RedirectController;
 use App\Http\Controllers\UserController;
+use App\Models\User;
 use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
 use Illuminate\Support\Facades\Route;
 use Inertia\Inertia;
@@ -31,21 +32,6 @@ public function boot(): void
          */
         Route::pattern('slug', '-[a-zA-Z0-9_-]+');
         Route::pattern('user', '[a-zA-Z0-9_]{1,20}');
-
-        // TODO v2
-        // Route::bind('user', function ($value) {
-        //     /**
-        //      * TODO: resolve user by username, hashId, or both
-        //      */
-        //     $query = User::where('username', Str::lower($value));
-        //
-        //     /*
-        //      * add last activity
-        //      */
-        //     $query->withLastActivity();
-        //
-        //     return $query->firstOrFail();
-        // });
     }
 
     public function map(): void
diff --git a/app/Support/Shortcode/Shortcode.php b/app/Support/Shortcode/Shortcode.php
index 8e8102ff85..be493f2a6a 100644
--- a/app/Support/Shortcode/Shortcode.php
+++ b/app/Support/Shortcode/Shortcode.php
@@ -60,16 +60,29 @@ public static function convertUserShortcodesToUseIds(string $input): string
 
         // Fetch all users by username in a single query.
         $users = User::withTrashed()
-            ->whereIn(DB::raw('LOWER(User)'), $normalizedUsernames)
-            ->get(['ID', 'User'])
-            ->keyBy(fn ($user) => strtolower($user->User));
+            ->where(function ($query) use ($normalizedUsernames) {
+                $query->whereIn(DB::raw('LOWER(User)'), $normalizedUsernames)
+                    ->orWhereIn(DB::raw('LOWER(display_name)'), $normalizedUsernames);
+            })
+            ->get(['ID', 'User', 'display_name']);
+
+        // Create a lookup map that includes both username and display name as keys.
+        $userMap = collect();
+        foreach ($users as $user) {
+            if ($user->User) {
+                $userMap[strtolower($user->username)] = $user;
+            }
+            if ($user->display_name) {
+                $userMap[strtolower($user->display_name)] = $user;
+            }
+        }
 
         // Replace each username with the corresponding user ID.
-        return preg_replace_callback('/\[user=(.*?)\]/', function ($matches) use ($users) {
+        return preg_replace_callback('/\[user=(.*?)\]/', function ($matches) use ($userMap) {
             $username = strtolower($matches[1]);
-            $user = $users->get($username);
+            $user = $userMap->get($username);
 
-            return $user ? "[user={$user->id}]" : $matches[0];
+            return $user ? "[user={$user->ID}]" : $matches[0];
         }, $input);
     }
 
diff --git a/app/Support/Sync/SyncTrait.php b/app/Support/Sync/SyncTrait.php
index 675db8c077..183ff5ce49 100644
--- a/app/Support/Sync/SyncTrait.php
+++ b/app/Support/Sync/SyncTrait.php
@@ -542,7 +542,7 @@ protected function getUserId(string $username): ?int
         $userId = $this->userIds[$username] ?? null;
         if ($userId === null) {
             /** @var ?User $user */
-            $user = User::where('User', Str::lower($username))->first();
+            $user = User::whereName(Str::lower($username))->first();
             if (!$user) {
                 $this->userIds[$username] = 0;
 
diff --git a/config/missing-page-redirector.php b/config/missing-page-redirector.php
index 1588a7b658..25febd4f08 100644
--- a/config/missing-page-redirector.php
+++ b/config/missing-page-redirector.php
@@ -98,7 +98,7 @@
         '/userList.php' => '/users',
         '/history.php' => '/user/{u}/history',
         '/historyexamine.php' => '/user/{u}/history/{d}',
-        '/usergameactivity.php' => '/user/{f}/game/{ID}',
+        // '/usergameactivity.php' => '/user/{f}/game/{ID}',
         '/gamecompare.php' => '/user/{f}/game/{ID}/compare',
 
         /*
diff --git a/database/factories/TriggerFactory.php b/database/factories/TriggerFactory.php
new file mode 100644
index 0000000000..6d21920776
--- /dev/null
+++ b/database/factories/TriggerFactory.php
@@ -0,0 +1,34 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Database\Factories;
+
+use App\Models\Achievement;
+use App\Models\Trigger;
+use App\Models\User;
+use App\Platform\Enums\TriggerableType;
+use Illuminate\Database\Eloquent\Factories\Factory;
+
+/**
+ * @extends Factory<Trigger>
+ */
+class TriggerFactory extends Factory
+{
+    protected $model = Trigger::class;
+
+    /**
+     * @return array<string, mixed>
+     */
+    public function definition(): array
+    {
+        return [
+            'conditions' => '0xH00fffb=0_0xH00fe10=1_0xH00fe11=2_0xH00f7d0>=32',
+            'version' => 1,
+            'parent_id' => null,
+            'user_id' => User::factory()->create()->id,
+            'triggerable_type' => TriggerableType::Achievement,
+            'triggerable_id' => Achievement::factory()->create()->id,
+        ];
+    }
+}
diff --git a/database/migrations/2025_01_07_000000_denormalize_triggerables.php b/database/migrations/2025_01_07_000000_denormalize_triggerables.php
new file mode 100644
index 0000000000..489b097eaf
--- /dev/null
+++ b/database/migrations/2025_01_07_000000_denormalize_triggerables.php
@@ -0,0 +1,63 @@
+<?php
+
+declare(strict_types=1);
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class() extends Migration {
+    public function up(): void
+    {
+        Schema::table('Achievements', function (Blueprint $table) {
+            $table->foreignId('trigger_id')
+                ->nullable()
+                ->after('user_id')
+                ->constrained('triggers')
+                ->nullOnDelete();
+
+            $table->index('trigger_id');
+        });
+
+        Schema::table('LeaderboardDef', function (Blueprint $table) {
+            $table->foreignId('trigger_id')
+                ->nullable()
+                ->after('author_id')
+                ->constrained('triggers')
+                ->nullOnDelete();
+
+            $table->index('trigger_id');
+        });
+
+        Schema::table('GameData', function (Blueprint $table) {
+            $table->foreignId('trigger_id')
+                ->nullable()
+                ->after('releases')
+                ->constrained('triggers')
+                ->nullOnDelete();
+
+            $table->index('trigger_id');
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::table('GameData', function (Blueprint $table) {
+            $table->dropForeign(['trigger_id']);
+            $table->dropIndex(['trigger_id']);
+            $table->dropColumn('trigger_id');
+        });
+
+        Schema::table('LeaderboardDef', function (Blueprint $table) {
+            $table->dropForeign(['trigger_id']);
+            $table->dropIndex(['trigger_id']);
+            $table->dropColumn('trigger_id');
+        });
+
+        Schema::table('Achievements', function (Blueprint $table) {
+            $table->dropForeign(['trigger_id']);
+            $table->dropIndex(['trigger_id']);
+            $table->dropColumn('trigger_id');
+        });
+    }
+};
diff --git a/database/migrations/2025_01_07_000001_update_triggers_table.php b/database/migrations/2025_01_07_000001_update_triggers_table.php
new file mode 100644
index 0000000000..2d630ac860
--- /dev/null
+++ b/database/migrations/2025_01_07_000001_update_triggers_table.php
@@ -0,0 +1,38 @@
+<?php
+
+declare(strict_types=1);
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class() extends Migration {
+    public function up(): void
+    {
+        Schema::table('triggers', function (Blueprint $table) {
+            $table->foreign('parent_id')
+                ->references('id')
+                ->on('triggers')
+                ->nullOnDelete();
+
+            $table->index('parent_id');
+        });
+
+        Schema::table('triggers', function (Blueprint $table) {
+            $table->dropColumn(['type', 'stat', 'stat_goal', 'stat_format']);
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::table('triggers', function (Blueprint $table) {
+            $table->dropForeign(['parent_id']);
+            $table->dropIndex(['parent_id']);
+
+            $table->text('type')->nullable();
+            $table->string('stat')->nullable();
+            $table->string('stat_goal')->nullable();
+            $table->string('stat_format', 50)->nullable();
+        });
+    }
+};
diff --git a/database/migrations/2026_01_10_000000_create_event_awards_table.php b/database/migrations/2026_01_10_000000_create_event_awards_table.php
new file mode 100644
index 0000000000..e04e00c456
--- /dev/null
+++ b/database/migrations/2026_01_10_000000_create_event_awards_table.php
@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class() extends Migration {
+    public function up(): void
+    {
+        Schema::create('event_awards', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->unsignedBigInteger('event_id');
+            $table->integer('tier_index');
+            $table->string('label', 40);
+            $table->integer('achievements_required');
+            $table->string('image_asset_path', 50);
+            $table->timestamps();
+        });
+
+        Schema::table('event_awards', function (Blueprint $table) {
+            $table->foreign('event_id')
+                ->references('id')
+                ->on('events')
+                ->onDelete('cascade');
+
+            $table->unique(['event_id', 'tier_index']);
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::dropIfExists('event_awards');
+    }
+};
diff --git a/lang/de_DE.json b/lang/de_DE.json
index 0afcd46fb0..f7568a555c 100644
--- a/lang/de_DE.json
+++ b/lang/de_DE.json
@@ -14,6 +14,7 @@
     "Accountability for content": "Verantwortung über Inhalte",
     "Accountability for links": "Verantwortung über Links",
     "Achievement": "Erfolg",
+    "Achievement Checklist": "Erfolgs-Checkliste",
     "Achievement Unlocks": "Freigeschaltene Erfolge",
     "Achievement of the Week": "Erfolg der Woche",
     "Achievements": "Erfolge",
@@ -135,6 +136,7 @@
     "Forum Index": "Forum-Index",
     "Forum Posts": "Forumsbeiträge",
     "Forum Posts - {{user}}": "Forumsbeiträge - {{user}}",
+    "from": "von",
     "Game": "Spiel",
     "Game Details": "Spiel-Details",
     "Games": "Spiele",
@@ -165,6 +167,7 @@
     "Important": "Wichtig",
     "Including your correct emulator version helps developers more quickly identify and resolve issues.": "Das Erwähnen deiner korrekten Emulator-Version hilft Entwicklern Probleme schneller zu erkennen und zu lösen.",
     "Information about cookies": "Information zu Cookies",
+    "Invalid list": "Ungültige Liste",
     "Issue": "Problem",
     "Join us on Discord": "Trette unserem Discord bei",
     "Just Released": "Vor kurzem veröffentlicht",
@@ -352,6 +355,7 @@
     "Type / to focus the search field.": "Tippe / um das Suchfeld zu fokussieren.",
     "Type your comment here. Do not post or request any links to copyrighted ROMs.": "Schreibe deinen Kommentar hier. Poste oder fordere keine Links zu urheberrechtlich geschützten ROMs.",
     "Undo": "Rückgängig",
+    "Unlocked {{when}}": "Freigeschaltet am {{when}}",
     "Unpublished": "Unveröffentlicht",
     "Unsubscribe": "Abonnent beenden",
     "Unsubscribed!": "Abonnent wurde beendet!",
@@ -572,6 +576,25 @@
     "{{user}} has not played <1>{{game}}</1>.": "{{user}} hat <1>{{game}}</1> nicht gespielt.",
     "Start of reconstructed timeline.": "Beginn der rekonstruierten Zeitleiste.",
     "Manually unlocked by <1>{{user}}</1>.": "Manuell freigeschaltet von <1>{{user}}</1>.",
+    "Game Suggestions - {{user}}": "Game Suggestions - {{user}}",
+    "Reasoning": "Reasoning",
+    "Game Suggestions": "Game Suggestions",
+    "Personalized Game Suggestions": "Personalized Game Suggestions",
+    "In <1><2><3>hub</3></2><4>{{hubName}}</4></1> with": "In <1><2><3>hub</3></2><4>{{hubName}}</4></1> with",
+    "Same <1>dev</1> as": "Same <1>dev</1> as",
+    "By <1>same developer</1> as": "By <1>same developer</1> as",
+    "Similar to beaten": "Similar to beaten",
+    "Similar to mastered": "Similar to mastered",
+    "Similar to backlog": "Similar to backlog",
+    "Random": "Random",
+    "Randomly selected": "Randomly selected",
+    "In your backlog": "In your backlog",
+    "Revised": "Revised",
+    "Similar beats": "Similar beats",
+    "Similar masteries": "Similar masteries",
+    "Beaten by players of": "Beaten by players of",
+    "Mastered by players of": "Mastered by players of",
+    "Roll again": "Roll again",
     "supportedGameFilesCountLabel_one": "Aktuell gibt es <1>{{count, number}}</1> registrierten Spieldatei-Hash, welcher für dieses Spiel unterstützt wird.",
     "supportedGameFilesCountLabel_other": "Aktuell gibt es <1>{{count, number}}</1> registrierte Spieldatei-Hashes, welche für dieses Spiel unterstützt werden.",
     "userCount_one": "<1>{{userCount, number}}</1> Benutzer ist gerade online.",
diff --git a/lang/en_GB.json b/lang/en_GB.json
index 7196d231f1..1bc3af44fc 100644
--- a/lang/en_GB.json
+++ b/lang/en_GB.json
@@ -14,6 +14,7 @@
     "Accountability for content": "Accountability for content",
     "Accountability for links": "Accountability for links",
     "Achievement": "Achievement",
+    "Achievement Checklist": "Achievement Checklist",
     "Achievement Unlocks": "Achievement Unlocks",
     "Achievement of the Week": "Achievement of the Week",
     "Achievements": "Achievements",
@@ -135,6 +136,7 @@
     "Forum Index": "Forum Index",
     "Forum Posts": "Forum Posts",
     "Forum Posts - {{user}}": "Forum Posts - {{user}}",
+    "from": "from",
     "Game": "Game",
     "Game Details": "Game Details",
     "Games": "Games",
@@ -165,6 +167,7 @@
     "Important": "Important",
     "Including your correct emulator version helps developers more quickly identify and resolve issues.": "Including your correct emulator version helps developers more quickly identify and resolve issues.",
     "Information about cookies": "Information about cookies",
+    "Invalid list": "Invalid list",
     "Issue": "Issue",
     "Join us on Discord": "Join us on Discord",
     "Just Released": "Just Released",
@@ -352,6 +355,7 @@
     "Type / to focus the search field.": "Type / to focus the search field.",
     "Type your comment here. Do not post or request any links to copyrighted ROMs.": "Type your comment here. Do not post or request any links to copyrighted ROMs.",
     "Undo": "Undo",
+    "Unlocked {{when}}": "Unlocked {{when}}",
     "Unpublished": "Unpublished",
     "Unsubscribe": "Unsubscribe",
     "Unsubscribed!": "Unsubscribed!",
@@ -572,6 +576,25 @@
     "{{user}} has not played <1>{{game}}</1>.": "{{user}} has not played <1>{{game}}</1>.",
     "Start of reconstructed timeline.": "Start of reconstructed timeline.",
     "Manually unlocked by <1>{{user}}</1>.": "Manually unlocked by <1>{{user}}</1>.",
+    "Game Suggestions - {{user}}": "Game Suggestions - {{user}}",
+    "Reasoning": "Reasoning",
+    "Game Suggestions": "Game Suggestions",
+    "Personalized Game Suggestions": "Personalised Game Suggestions",
+    "In <1><2><3>hub</3></2><4>{{hubName}}</4></1> with": "In <1><2><3>hub</3></2><4>{{hubName}}</4></1> with",
+    "Same <1>dev</1> as": "Same <1>dev</1> as",
+    "By <1>same developer</1> as": "By <1>same developer</1> as",
+    "Similar to beaten": "Similar to beaten",
+    "Similar to mastered": "Similar to mastered",
+    "Similar to backlog": "Similar to backlog",
+    "Random": "Random",
+    "Randomly selected": "Randomly selected",
+    "In your backlog": "In your backlog",
+    "Revised": "Revised",
+    "Similar beats": "Similar beats",
+    "Similar masteries": "Similar masteries",
+    "Beaten by players of": "Beaten by players of",
+    "Mastered by players of": "Mastered by players of",
+    "Roll again": "Roll again",
     "supportedGameFilesCountLabel_one": "There is currently <1>{{count, number}}</1> supported game file hash registered for this game.",
     "supportedGameFilesCountLabel_other": "There are currently <1>{{count, number}}</1> supported game file hashes registered for this game.",
     "userCount_one": "<1>{{userCount, number}}</1> user is currently online.",
diff --git a/lang/en_US.json b/lang/en_US.json
index d406bd1efb..ae23e31f19 100644
--- a/lang/en_US.json
+++ b/lang/en_US.json
@@ -177,7 +177,6 @@
     "Latest": "Latest",
     "Latest Sets in Progress": "Latest Sets in Progress",
     "Leaderboards": "Leaderboards",
-    "Learn more about this event": "Learn more about this event",
     "Legal & Terms": "Legal & Terms",
     "Less": "Less",
     "Load more": "Load more",
@@ -595,6 +594,20 @@
     "{{user}} has not played <1>{{game}}</1>.": "{{user}} has not played <1>{{game}}</1>.",
     "Start of reconstructed timeline.": "Start of reconstructed timeline.",
     "Manually unlocked by <1>{{user}}</1>.": "Manually unlocked by <1>{{user}}</1>.",
+    "Edit Post": "Edit Post",
+    "Bold": "Bold",
+    "Italic": "Italic",
+    "Underline": "Underline",
+    "Strikethrough": "Strikethrough",
+    "Code": "Code",
+    "Spoiler": "Spoiler",
+    "Image": "Image",
+    "Link": "Link",
+    "Ticket": "Ticket",
+    "Ticket #{{ticketId}}": "Ticket #{{ticketId}}",
+    "Body": "Body",
+    "Preview": "Preview",
+    "View this year's event": "View this year's event",
     "Game Suggestions - {{user}}": "Game Suggestions - {{user}}",
     "Reasoning": "Reasoning",
     "Game Suggestions": "Game Suggestions",
diff --git a/lang/es_ES.json b/lang/es_ES.json
index cc684f7a94..a06d33ab6f 100644
--- a/lang/es_ES.json
+++ b/lang/es_ES.json
@@ -14,6 +14,7 @@
     "Accountability for content": "Responsabilidad por el contenido",
     "Accountability for links": "Responsabilidad por enlaces",
     "Achievement": "Logro",
+    "Achievement Checklist": "Lista de verificación de logros",
     "Achievement Unlocks": "Logros desbloqueados",
     "Achievement of the Week": "Logro de la semana",
     "Achievements": "Logros",
@@ -135,6 +136,7 @@
     "Forum Index": "Índice del foro",
     "Forum Posts": "Publicaciones en el foro",
     "Forum Posts - {{user}}": "Publicaciones en el foro - {{user}}",
+    "from": "en",
     "Game": "Juego",
     "Game Details": "Detalles del juego",
     "Games": "Juegos",
@@ -165,6 +167,7 @@
     "Important": "Importante",
     "Including your correct emulator version helps developers more quickly identify and resolve issues.": "Incluyendo la versión correcta de tu emulador ayudará a los desarrolladores a identificar y a resolver el problema más rápidamente.",
     "Information about cookies": "Información sobre cookies",
+    "Invalid list": "Lista incorrecta",
     "Issue": "Problema",
     "Join us on Discord": "Únete a nosotros en Discord",
     "Just Released": "Recién lanzados",
@@ -352,6 +355,7 @@
     "Type / to focus the search field.": "Escribe / para poner el foco en el campo de búsqueda.",
     "Type your comment here. Do not post or request any links to copyrighted ROMs.": "Escriba aquí tu comentario. No publiques ni solicites enlaces a ROM protegidas con derechos de autor.",
     "Undo": "Deshacer",
+    "Unlocked {{when}}": "Desbloqueado el {{when}}",
     "Unpublished": "Sin publicar",
     "Unsubscribe": "Cancelar subscripción",
     "Unsubscribed!": "¡Subscripción cancelada!",
@@ -572,6 +576,25 @@
     "{{user}} has not played <1>{{game}}</1>.": "{{user}} no ha jugado a <1>{{game}}</1>.",
     "Start of reconstructed timeline.": "Inicio de la línea de tiempo recreada.",
     "Manually unlocked by <1>{{user}}</1>.": "Desbloqueado manualmente por <1>{{user}}</1>.",
+    "Game Suggestions - {{user}}": "Sugerencias de juegos - {{user}}",
+    "Reasoning": "Justificación",
+    "Game Suggestions": "Sugerencias de juegos",
+    "Personalized Game Suggestions": "Sugerencias de juegos personalizadas",
+    "In <1><2><3>hub</3></2><4>{{hubName}}</4></1> with": "En <1><2><3>hub</3></2><4>{{hubName}}</4></1> con",
+    "Same <1>dev</1> as": "El mismo <1>desarrollador</1> que",
+    "By <1>same developer</1> as": "Del <1>mismo desarrollador</1> que",
+    "Similar to beaten": "Similar al superado",
+    "Similar to mastered": "Similar al dominado",
+    "Similar to backlog": "Similar al pendiente",
+    "Random": "Aleatorio",
+    "Randomly selected": "Seleccionado aleatoriamente",
+    "In your backlog": "En tu lista de pendientes",
+    "Revised": "Revisado",
+    "Similar beats": "Superado similar",
+    "Similar masteries": "Dominado similar",
+    "Beaten by players of": "Superado por jugadores de",
+    "Mastered by players of": "Dominado por jugadores de",
+    "Roll again": "Probar de nuevo",
     "supportedGameFilesCountLabel_one": "Actualmente <1>{{count, number}}</1> registro de hash de archivo soportado registrado para este juego.",
     "supportedGameFilesCountLabel_other": "Actualmente hay registrados <1>{{count, number}}</1> hashes de archivos soportados registrados para este juego.",
     "userCount_one": "Hay <1>{{userCount, number}}</1> usuario en línea.",
diff --git a/lang/fr_FR.json b/lang/fr_FR.json
index 07826198be..d0fe7569df 100644
--- a/lang/fr_FR.json
+++ b/lang/fr_FR.json
@@ -14,6 +14,7 @@
     "Accountability for content": "Responsabilité pour le contenu",
     "Accountability for links": "Responsabilité pour les liens",
     "Achievement": "Succès",
+    "Achievement Checklist": "Liste de Succès",
     "Achievement Unlocks": "Obtentions de Succès",
     "Achievement of the Week": "Succès de la Semaine",
     "Achievements": "Succès",
@@ -135,6 +136,7 @@
     "Forum Index": "Index du Forum",
     "Forum Posts": "Messages du Forum",
     "Forum Posts - {{user}}": "Messages du Forum - {{user}}",
+    "from": "de",
     "Game": "Jeu",
     "Game Details": "Détails du jeu",
     "Games": "Jeux",
@@ -165,6 +167,7 @@
     "Important": "Important",
     "Including your correct emulator version helps developers more quickly identify and resolve issues.": "Inclure la version correcte de votre émulateur aide les développeurs à identifier et résoudre les problèmes plus rapidement.",
     "Information about cookies": "Informations sur les cookies",
+    "Invalid list": "Liste invalide",
     "Issue": "Problème",
     "Join us on Discord": "Rejoignez-nous sur Discord",
     "Just Released": "Vient de sortir",
@@ -352,6 +355,7 @@
     "Type / to focus the search field.": "Tapez / pour focaliser le champ de recherche.",
     "Type your comment here. Do not post or request any links to copyrighted ROMs.": "Tapez votre commentaire ici. Ne publiez ni ne demandez de liens vers des ROMs protégées par le droit d'auteur.",
     "Undo": "Annuler",
+    "Unlocked {{when}}": "Débloqué le {{when}}",
     "Unpublished": "Non-publié",
     "Unsubscribe": "Se désabonner",
     "Unsubscribed!": "Désabonné !",
@@ -572,6 +576,25 @@
     "{{user}} has not played <1>{{game}}</1>.": "{{user}} n'a pas joué à <1>{{game}}</1>.",
     "Start of reconstructed timeline.": "Début de la timeline reconstruite.",
     "Manually unlocked by <1>{{user}}</1>.": "Débloqué manuellement par <1>{{user}}</1>.",
+    "Game Suggestions - {{user}}": "Game Suggestions - {{user}}",
+    "Reasoning": "Reasoning",
+    "Game Suggestions": "Game Suggestions",
+    "Personalized Game Suggestions": "Personalized Game Suggestions",
+    "In <1><2><3>hub</3></2><4>{{hubName}}</4></1> with": "In <1><2><3>hub</3></2><4>{{hubName}}</4></1> with",
+    "Same <1>dev</1> as": "Same <1>dev</1> as",
+    "By <1>same developer</1> as": "By <1>same developer</1> as",
+    "Similar to beaten": "Similar to beaten",
+    "Similar to mastered": "Similar to mastered",
+    "Similar to backlog": "Similar to backlog",
+    "Random": "Random",
+    "Randomly selected": "Randomly selected",
+    "In your backlog": "In your backlog",
+    "Revised": "Revised",
+    "Similar beats": "Similar beats",
+    "Similar masteries": "Similar masteries",
+    "Beaten by players of": "Beaten by players of",
+    "Mastered by players of": "Mastered by players of",
+    "Roll again": "Roll again",
     "supportedGameFilesCountLabel_one": "Il y a actuellement <1>{{count, number}}</1> empreinte de fichier de jeu pris en charge enregistrée pour ce jeu.",
     "supportedGameFilesCountLabel_other": "Il y a actuellement <1>{{count, number}}</1> empreintes de fichiers de jeu pris en charge enregistrées pour ce jeu.",
     "userCount_one": "<1>{{userCount, number}}</1> utilisateur est actuellement en ligne.",
diff --git a/lang/pl_PL.json b/lang/pl_PL.json
index f7291af580..c27a04452e 100644
--- a/lang/pl_PL.json
+++ b/lang/pl_PL.json
@@ -14,6 +14,7 @@
     "Accountability for content": "Odpowiedzialność za treści",
     "Accountability for links": "Odpowiedzialność za linki",
     "Achievement": "Osiągnięcie",
+    "Achievement Checklist": "Achievement Checklist",
     "Achievement Unlocks": "Odblokowane osiągnięcia",
     "Achievement of the Week": "Achievement of the Week",
     "Achievements": "Osiągnięcia",
@@ -135,6 +136,7 @@
     "Forum Index": "Forum",
     "Forum Posts": "Posty na Forum",
     "Forum Posts - {{user}}": "Posty na forum - {{user}}",
+    "from": "from",
     "Game": "Gra",
     "Game Details": "Szczegóły gry",
     "Games": "Gry",
@@ -165,6 +167,7 @@
     "Important": "Ważne",
     "Including your correct emulator version helps developers more quickly identify and resolve issues.": "Zamieszczenie właściwej wersji emulatora pomaga deweloperom szybciej zidentyfikować i naprawić problemy.",
     "Information about cookies": "Informacja o cookies",
+    "Invalid list": "Invalid list",
     "Issue": "Problem",
     "Join us on Discord": "Dołącz do nas na Discord",
     "Just Released": "Ostatnio wydane",
@@ -352,6 +355,7 @@
     "Type / to focus the search field.": "Naciśnij / aby przejść do pola wyszukiwania.",
     "Type your comment here. Do not post or request any links to copyrighted ROMs.": "Wpisz swój komentarz tutaj. Nie umieszczaj próśb ani żadnych linków do ROM-ów objętych prawami autorskimi.",
     "Undo": "Cofnij",
+    "Unlocked {{when}}": "Odblokowano {{when}}",
     "Unpublished": "Nieopublikowane",
     "Unsubscribe": "Wypisz się",
     "Unsubscribed!": "Wypisano!",
@@ -474,13 +478,13 @@
     "Awards - Exact": "Nagrody - dokładnie",
     "Special Filters": "Specjalne filtry",
     "All {{systemName}} Games": "Wszystkie gry {{systemName}}",
-    "{{hubTitle}} (Hub)": "{{hubTitle}} (Hub)",
-    "Related Hubs": "Related Hubs",
-    "Manage": "Manage",
-    "Hub": "Hub",
-    "Links": "Links",
-    "No related hubs.": "No related hubs.",
-    "All Hubs": "All Hubs",
+    "{{hubTitle}} (Hub)": "{{hubTitle}} (Zbiór)",
+    "Related Hubs": "Powiązane zbiory",
+    "Manage": "Zarządzaj",
+    "Hub": "Zbiór",
+    "Links": "Powiązania",
+    "No related hubs.": "Brak powiązanych zbiorów.",
+    "All Hubs": "Wszystkie zbiory",
     "Go to previous news page": "Przejdź na poprzednią stronę nowości",
     "Go to next news page": "Przejdź na następną stronę nowości",
     "Swipe to view more": "Przeciągnij, aby zobaczyć więcej",
@@ -506,17 +510,17 @@
     "Leaderboard": "Tabela wyników",
     "Entry": "Wpis",
     "Submitted": "Przesłane",
-    "Unlocked": "Unlocked",
-    "Recent Unlocks": "Recent Unlocks",
+    "Unlocked": "Odblokowane",
+    "Recent Unlocks": "Ostatnie odblokowania",
     "Award Kind": "Award Kind",
     "Earned": "Earned",
     "Recent Awards": "Ostatnie nagrody",
     "Developer Feed - {{user}}": "Developer Feed - {{user}}",
-    "Current Players": "Current Players",
+    "Current Players": "Obecni gracze",
     "Couldn't find any recent achievement unlocks.": "Couldn't find any recent achievement unlocks.",
     "Couldn't find any recent leaderboard entries.": "Couldn't find any recent leaderboard entries.",
     "Couldn't find any recent awards.": "Couldn't find any recent awards.",
-    "Pinned {{pinnedAt}}": "Pinned {{pinnedAt}}",
+    "Pinned {{pinnedAt}}": "Przypięto {{pinnedAt}}",
     "Pinned": "Przypięte",
     "new": "nowe",
     "View Forum Topic": "Zobacz wątek na forum",
@@ -538,10 +542,10 @@
     "{{earned, number}} of {{total, number}}": "{{earned, number}} z {{total, number}}",
     "No sessions": "Brak sesji",
     "1 session": "1 sesja",
-    "{{count}} sessions over {{days}} day": "{{count}} sessions over {{days}} day",
-    "{{count}} sessions over {{days}} days": "{{count}} sessions over {{days}} days",
-    "{{count}} sessions over 1 hour": "{{count}} sessions over 1 hour",
-    "{{count}} sessions over {{hours}} hours": "{{count}} sessions over {{hours}} hours",
+    "{{count}} sessions over {{days}} day": "{{count}} sesji w ciągu {{days}} dnia",
+    "{{count}} sessions over {{days}} days": "{{count}} sesji w ciągu {{days}} dni",
+    "{{count}} sessions over 1 hour": "{{count}} sesji w ciągu godziny",
+    "{{count}} sessions over {{hours}} hours": "{{count}} sesji w ciągu {{hours}} godzin",
     "All time the player spent in the game across all sessions, even when they did not earn achievements.": "All time the player spent in the game across all sessions, even when they did not earn achievements.",
     "Only counts time from sessions where achievements were unlocked.": "Only counts time from sessions where achievements were unlocked.",
     "The count of sessions where achievements were unlocked.": "The count of sessions where achievements were unlocked.",
@@ -554,17 +558,17 @@
     "Immediately after previous.": "Immediately after previous.",
     "Rich Presence": "Rich Presence",
     "Unknown": "Unknown",
-    "(estimated)": "(estimated)",
+    "(estimated)": "(szacowane)",
     "This player has sessions for the game where the playtime recorded to the server is not precise.": "This player has sessions for the game where the playtime recorded to the server is not precise.",
-    "Unofficial Achievement.": "Unofficial Achievement.",
+    "Unofficial Achievement.": "Nieoficjalne osiągnięcie.",
     "This is a game with multiple discs. The hash shown here will only reflect the first disc loaded in the session.": "This is a game with multiple discs. The hash shown here will only reflect the first disc loaded in the session.",
-    "<1>{{user}}</1> awarded a Manual Unlock": "<1>{{user}}</1> awarded a Manual Unlock",
+    "<1>{{user}}</1> awarded a Manual Unlock": "<1>{{user}}</1> przyznał ręczne odblokowanie",
     "Boot Only": "Boot Only",
     "The player launched the game and then either experienced network issues or closed the game within 60 seconds.": "The player launched the game and then either experienced network issues or closed the game within 60 seconds.",
     "Unknown Hash": "Nieznany hash",
     "Either the user's emulator isn't reporting what hash they're using, the user's session was created before we started recording hashes, the user closed the game very quickly, or the user's hash was later unlinked from the game.": "Either the user's emulator isn't reporting what hash they're using, the user's session was created before we started recording hashes, the user closed the game very quickly, or the user's hash was later unlinked from the game.",
     "(Softcore)": "(Softcore)",
-    "No emulator usage data is available.": "No emulator usage data is available.",
+    "No emulator usage data is available.": "Brak danych dotyczących użycia emulatora.",
     "Hide all player sessions where achievements were not earned": "Hide all player sessions where achievements were not earned",
     "Emulator usage breakdown": "Emulator usage breakdown",
     "+{{count}} more": "+{{count}} więcej",
@@ -572,6 +576,25 @@
     "{{user}} has not played <1>{{game}}</1>.": "{{user}} nie zagrał w <1>{{game}}</1>.",
     "Start of reconstructed timeline.": "Początek zrekonstruowanej osi czasu.",
     "Manually unlocked by <1>{{user}}</1>.": "Ręcznie odblokowane przez <1>{{user}}</1>.",
+    "Game Suggestions - {{user}}": "Propozycje gier - {{user}}",
+    "Reasoning": "Reasoning",
+    "Game Suggestions": "Propozycje gier",
+    "Personalized Game Suggestions": "Spersonalizowane propozycje gier",
+    "In <1><2><3>hub</3></2><4>{{hubName}}</4></1> with": "W <1><2><3>zbiorze</3></2><4>{{hubName}}</4></1> z",
+    "Same <1>dev</1> as": "Ten sam <1>dev</1> jak w",
+    "By <1>same developer</1> as": "Przez <1>tego samego dewelopera</1> jak w",
+    "Similar to beaten": "Podobne do ukończonego",
+    "Similar to mastered": "Podobne do wymasterowanego",
+    "Similar to backlog": "Podobne do zaległego",
+    "Random": "Losowy",
+    "Randomly selected": "Losowo wybrane",
+    "In your backlog": "W Twoich zaległościach",
+    "Revised": "Zrewizowany",
+    "Similar beats": "Podobne do ukończonych",
+    "Similar masteries": "Podobne do wymasterowanych",
+    "Beaten by players of": "Ukończone przez graczy z",
+    "Mastered by players of": "Wymasterowane przez graczy z",
+    "Roll again": "Losuj ponownie",
     "supportedGameFilesCountLabel_one": "Obecnie jest <1>{{count, number}}</1> zarejestrowany hash pliku gry",
     "supportedGameFilesCountLabel_few": "Obecnie są <1>{{count, number}}</1> zarejestrowane hashe plików gry",
     "supportedGameFilesCountLabel_many": "Obecnie jest <1>{{count, number}}</1> zarejestrowanych hashów plików gry",
diff --git a/lang/pt_BR.json b/lang/pt_BR.json
index 0b0c2f6fbf..d03bcee73e 100755
--- a/lang/pt_BR.json
+++ b/lang/pt_BR.json
@@ -1,21 +1,22 @@
 {
     "(Hardcore)": "(Hardcore)",
-    "<1>Be very descriptive</1> about what you were doing when the problem happened. Mention if you were using any <2>non-default settings, a non-English language, in-game cheats, glitches</2> or were otherwise playing in some unusual way. If possible, include a <3>link to a save state or save game</3> to help us reproduce the issue.": "<1>Seja bem detalhado</1> sobre o que estava fazendo quando o problema aconteceu. Mencione se estava usando alguma <2>configuração não padrão, um idioma diferente, trapaças no jogo</2>, ou se estava jogando de alguma maneira <2>não usual</2>. Se possível, inclua um <3>link para um estado de salvamento ou arquivo de jogo</3> para nos ajudar a reproduzir o problema.",
+    "<1>Be very descriptive</1> about what you were doing when the problem happened. Mention if you were using any <2>non-default settings, a non-English language, in-game cheats, glitches</2> or were otherwise playing in some unusual way. If possible, include a <3>link to a save state or save game</3> to help us reproduce the issue.": "<1>Seja bem descritivo</1> sobre o que você estava fazendo quando o problema aconteceu. Mencione se estava usando alguma <2>configuração não padrão, uma língua diferente, trapaças no jogo</2>, ou se estava jogando de alguma maneira não usual. Se possível, inclua um <3>link para um save state ou save de jogo seu</3> para nos ajudar a reproduzir o problema.",
     "<1>Send a message to DevCompliance</1> for:": "<1>Enviar uma mensagem para DevCompliance</1> para:",
     "<1>Send a message to DevQuest</1> for submissions, questions, ideas, or reporting issues related to <2>DevQuest</2>.": "<1>Enviar uma mensagem para DevQuest</1> para submissões, perguntas, ideias ou reportar problemas relacionados a <2>DevQuest</2>.",
     "<1>Send a message to QATeam</1> for:": "<1>Enviar uma mensagem para QATeam</1> para:",
     "<1>Send a message to RAArtTeam</1> for:": "<1>Enviar uma mensagem para RAArtTeam</1> para:",
-    "<1>Send a message to RACheats</1> if you believe someone is in violation of our <2>Global Leaderboard and Achievement Hunting Rules</2>.": "<1>Enviar uma mensagem para RACheats</1> se você acredita que alguém está violando nossos <2>Regras Globais de Leaderboard e Caça a Conquistas</2>.",
+    "<1>Send a message to RACheats</1> if you believe someone is in violation of our <2>Global Leaderboard and Achievement Hunting Rules</2>.": "<1>Envie uma mensagem para RACheats</1> se você acredita que alguém está violando nossas <2>Regras Globais de Leaderboard e Caçada de Conquistas</2>.",
     "<1>Send a message to RAEvents</1> for submissions, questions, ideas, or reporting issues related to <2>community events</2>.": "<1>Enviar uma mensagem para RAEvents</1> para submissões, perguntas, ideias ou reportar problemas relacionados a <2>eventos comunitários</2>.",
     "<1>Send a message to RANews</1> for:": "<1>Enviar uma mensagem para RANews</1> para:",
     "<1>Send a message to RAdmin</1> for:": "<1>Enviar uma mensagem para RAdmin</1> para:",
     "<1>Send a message to TheUnwanted</1> for submissions, questions, ideas, or reporting issues specifically related to <2>The Unwanted</2>.": "<1>Enviar uma mensagem para TheUnwanted</1> para submissões, perguntas, ideias ou reportar problemas especificamente relacionados a <2>The Unwanted</2>.",
-    "<1>Send a message to WritingTeam</1> for:": "<1>Enviar uma mensagem para WritingTeam</1> para:",
+    "<1>Send a message to WritingTeam</1> for:": "<1>Envie uma mensagem para WritingTeam</1> para:",
     "Accountability for content": "Responsabilidade pelo conteúdo",
     "Accountability for links": "Responsabilidade por links",
     "Achievement": "Conquista",
+    "Achievement Checklist": "Checklist de Conquistas",
     "Achievement Unlocks": "Conquistas Desbloqueadas",
-    "Achievement of the Week": "Conquista da semana",
+    "Achievement of the Week": "Conquista da Semana",
     "Achievements": "Conquistas",
     "Active Players": "Jogadores Ativos",
     "Add to Want to Play Games": "Adicionar a Jogos que Quero Jogar",
@@ -28,7 +29,7 @@
     "After requesting account deletion you may cancel your request within 14 days.": "Após solicitar a exclusão da conta, você pode cancelar sua solicitação dentro de 14 dias.",
     "After uploading, press Ctrl + F5. This refreshes your browser cache making the new image visible.": "Após o envio, pressione Ctrl + F5. Isso atualiza o cache do seu navegador, tornando a nova imagem visível.",
     "All Games": "Todos os Jogos",
-    "All Systems": "Todos as Consoles",
+    "All Systems": "Todos os Consoles",
     "All Users": "Todos os Usuários",
     "All won achievements for this game": "Todas as conquistas desbloqueadas para este jogo",
     "All-time High: {{val, number}} ({{date}})": "Máximo Histórico: {{val, number}} ({{date}})",
@@ -46,7 +47,7 @@
     "Ascending (A - Z)": "Ascendente (A - Z)",
     "Automatically opt in to all game sets": "Inscrever-se automaticamente em todos os sets de jogos",
     "Avatar": "Foto de perfil",
-    "Be as descriptive as possible. Give exact steps to reproduce the issue. Consider linking to a save state.": "Seja o mais descritivo possível. Dê os passos exatos para reproduzir o problema. Considere incluir um link para um estado de salvamento.",
+    "Be as descriptive as possible. Give exact steps to reproduce the issue. Consider linking to a save state.": "Seja o mais descritivo possível. Dê os passos exatos para reproduzir o problema. Considere incluir um link para um save state seu.",
     "Beaten": "Zerado",
     "Beaten (softcore)": "Zerado (softcore)",
     "Become a Patron": "Torne-se um Apoiador",
@@ -80,7 +81,7 @@
     "Comments on a forum topic I'm involved in": "Comentários em um tópico do fórum do qual participo",
     "Comments on an achievement I created": "Comentários em uma conquista que criei",
     "Comments on my activity": "Comentários na minha atividade",
-    "Comments on my user wall": "Comentários na minha parede de usuário",
+    "Comments on my user wall": "Comentários no meu mural",
     "Comments: {{leaderboardTitle}}": "Comentários: {{leaderboardTitle}}",
     "Completed": "Completado",
     "Confirm New Email Address": "Confirmar Novo Endereço de E-mail",
@@ -97,12 +98,12 @@
     "Create Ticket": "Criar Ticket",
     "Create Ticket - {{achievementTitle}}": "Criar Ticket - {{achievementTitle}}",
     "Current Email Address": "Endereço de E-mail Atual",
-    "Current Locale": "Local Atual",
+    "Current Locale": "Idioma Atual",
     "Current Password": "Senha Atual",
     "Currently Online": "Online",
     "Customize View": "Personalizar Visualização",
     "Delete Account": "Excluir Conta",
-    "Delete All Comments on My User Wall": "Excluir Todos os Comentários na Minha Parede de Usuário",
+    "Delete All Comments on My User Wall": "Excluir Todos os Comentários no Meu Mural",
     "Delete comment": "Excluir comentário",
     "Deleted!": "Excluído!",
     "Deleting...": "Excluindo...",
@@ -112,7 +113,7 @@
     "Details on how the hash is generated for each system can be found <1>here</1>.": "Detalhes sobre como o hash é gerado para cada console podem ser encontrados <1>aqui</1>.",
     "Dev": "Desenvolvedor",
     "DevQuest": "DevQuest",
-    "Developer Compliance": "Conformidade de Desenvolvedor",
+    "Developer Compliance": "Developer Compliance",
     "Did not trigger": "Não foi ativado",
     "Disclaimer about ROMs": "Aviso sobre as ROMs",
     "Disclaimers": "Isenções de Responsabilidade",
@@ -135,6 +136,7 @@
     "Forum Index": "Índice do Fórum",
     "Forum Posts": "Postagens no Fórum",
     "Forum Posts - {{user}}": "Postagens no Fórum - {{user}}",
+    "from": "de",
     "Game": "Jogo",
     "Game Details": "Detalhes do Jogo",
     "Games": "Jogos",
@@ -165,6 +167,7 @@
     "Important": "Importante",
     "Including your correct emulator version helps developers more quickly identify and resolve issues.": "Incluir a versão correta do seu emulador ajuda os desenvolvedores a identificar e resolver problemas mais rapidamente.",
     "Information about cookies": "Informações sobre cookies",
+    "Invalid list": "Lista inválida",
     "Issue": "Problema",
     "Join us on Discord": "Entre no Discord",
     "Just Released": "Lançamento recente",
@@ -352,6 +355,7 @@
     "Type / to focus the search field.": "Digite / para focar no campo de pesquisa.",
     "Type your comment here. Do not post or request any links to copyrighted ROMs.": "Digite seu comentário aqui. Não poste ou solicite links de ROMs protegidas por direitos autorais.",
     "Undo": "Desfazer",
+    "Unlocked {{when}}": "Desbloqueado {{when}}",
     "Unpublished": "Não publicado",
     "Unsubscribe": "Cancelar inscrição",
     "Unsubscribed!": "Inscrição cancelada!",
@@ -572,6 +576,25 @@
     "{{user}} has not played <1>{{game}}</1>.": "{{user}} não jogou <1>{{game}}</1>.",
     "Start of reconstructed timeline.": "Início da linha do tempo reconstruída.",
     "Manually unlocked by <1>{{user}}</1>.": "Desbloqueado manualmente por <1>{{user}}</1>.",
+    "Game Suggestions - {{user}}": "Sugestões de Jogo - {{user}}",
+    "Reasoning": "Justificativa",
+    "Game Suggestions": "Sugestões de Jogo",
+    "Personalized Game Suggestions": "Sugestões Personalizadas de Jogos",
+    "In <1><2><3>hub</3></2><4>{{hubName}}</4></1> with": "No <1><2><3>centro</3></2><4>{{hubName}}</4></1> com",
+    "Same <1>dev</1> as": "Mesmo <1>desenvolvedor</1> de",
+    "By <1>same developer</1> as": "Pelo <1>mesmo desenvolvedor</1> de",
+    "Similar to beaten": "Similar ao zerado",
+    "Similar to mastered": "Similar à platina",
+    "Similar to backlog": "Similar à atividade",
+    "Random": "Aleatório",
+    "Randomly selected": "Selecionado aleatoriamente",
+    "In your backlog": "Em seu registro",
+    "Revised": "Revisado",
+    "Similar beats": "Concluídos similares",
+    "Similar masteries": "Platinas similares",
+    "Beaten by players of": "Zerado por jogadores de",
+    "Mastered by players of": "Platinado por jogadores de",
+    "Roll again": "Rolar novamente",
     "supportedGameFilesCountLabel_one": "Atualmente existe <1>{{count, number}}</1> hash de arquivo de jogo suportado registrado para este jogo.",
     "supportedGameFilesCountLabel_other": "Atualmente existem <1>{{count, number}}</1> hashes de arquivos de jogo suportados registrados para este jogo.",
     "userCount_one": "<1>{{userCount, number}}</1> usuário está atualmente online.",
diff --git a/lang/ru_RU.json b/lang/ru_RU.json
index 3ddba4ca0d..1cc9342018 100644
--- a/lang/ru_RU.json
+++ b/lang/ru_RU.json
@@ -14,6 +14,7 @@
     "Accountability for content": "Ответственность за контент",
     "Accountability for links": "Ответственность за ссылки",
     "Achievement": "Достижение",
+    "Achievement Checklist": "Чек-лист достижений",
     "Achievement Unlocks": "Разблокированных достижений",
     "Achievement of the Week": "Достижение Недели",
     "Achievements": "Достижения",
@@ -135,6 +136,7 @@
     "Forum Index": "Список форумов",
     "Forum Posts": "Посты на форуме",
     "Forum Posts - {{user}}": "Посты на форуме - {{user}}",
+    "from": "от",
     "Game": "Игра",
     "Game Details": "Подробности игры",
     "Games": "Игры",
@@ -165,6 +167,7 @@
     "Important": "Важно",
     "Including your correct emulator version helps developers more quickly identify and resolve issues.": "Указание точной версии вашего эмулятора помогает разработчикам быстрее выявить и решить проблемы.",
     "Information about cookies": "Информация о cookies",
+    "Invalid list": "Неверный список",
     "Issue": "Проблема",
     "Join us on Discord": "Присоединяйтесь к нам в Discord",
     "Just Released": "Только что вышедшее",
@@ -352,6 +355,7 @@
     "Type / to focus the search field.": "Напишите / чтобы сфокусироваться на поле поиска.",
     "Type your comment here. Do not post or request any links to copyrighted ROMs.": "Пишите свой комментарий здесь. Не публикуйте и не запрашивайте любые ссылки на защищённые авторским правом ROM файлы.",
     "Undo": "Отменить",
+    "Unlocked {{when}}": "Разблокировано {{when}}",
     "Unpublished": "Не опубликовано",
     "Unsubscribe": "Отписаться",
     "Unsubscribed!": "Вы отписались!",
@@ -572,6 +576,25 @@
     "{{user}} has not played <1>{{game}}</1>.": "{{user}} не играл <1>{{game}}</1>.",
     "Start of reconstructed timeline.": "Начало воссозданного таймлайна.",
     "Manually unlocked by <1>{{user}}</1>.": "Разблокировано вручную <1>{{user}}</1>.",
+    "Game Suggestions - {{user}}": "Game Suggestions - {{user}}",
+    "Reasoning": "Reasoning",
+    "Game Suggestions": "Game Suggestions",
+    "Personalized Game Suggestions": "Personalized Game Suggestions",
+    "In <1><2><3>hub</3></2><4>{{hubName}}</4></1> with": "In <1><2><3>hub</3></2><4>{{hubName}}</4></1> with",
+    "Same <1>dev</1> as": "Same <1>dev</1> as",
+    "By <1>same developer</1> as": "By <1>same developer</1> as",
+    "Similar to beaten": "Similar to beaten",
+    "Similar to mastered": "Similar to mastered",
+    "Similar to backlog": "Similar to backlog",
+    "Random": "Random",
+    "Randomly selected": "Randomly selected",
+    "In your backlog": "In your backlog",
+    "Revised": "Revised",
+    "Similar beats": "Similar beats",
+    "Similar masteries": "Similar masteries",
+    "Beaten by players of": "Beaten by players of",
+    "Mastered by players of": "Mastered by players of",
+    "Roll again": "Roll again",
     "supportedGameFilesCountLabel_one": "На данный момент известен <1>{{count, number}}</1> поддерживаемый хэш ROM файлов для этой игры.",
     "supportedGameFilesCountLabel_few": "На данный момент известны <1>{{count, number}}</1> поддерживаемых хэша ROM файлов для этой игры.",
     "supportedGameFilesCountLabel_many": "На данный момент известны <1>{{count, number}}</1> поддерживаемый хэшей ROM файлов для этой игры.",
diff --git a/package.json b/package.json
index 1faf392625..9e1d73d9fe 100644
--- a/package.json
+++ b/package.json
@@ -19,12 +19,16 @@
         "crowdin:upload": "tsx resources/js/tools/crowdin-upload.ts"
     },
     "dependencies": {
+        "@bbob/plugin-helper": "^4.2.0",
+        "@bbob/preset-react": "^4.2.0",
+        "@bbob/react": "^4.2.0",
         "@floating-ui/core": "^1.6.8",
         "@floating-ui/dom": "^1.5.1",
         "@hookform/resolvers": "^3.9.0",
         "@inertiajs/core": "^1.2.0",
         "@radix-ui/react-alert-dialog": "^1.1.4",
         "@radix-ui/react-checkbox": "^1.1.1",
+        "@radix-ui/react-collapsible": "^1.1.2",
         "@radix-ui/react-dialog": "^1.1.2",
         "@radix-ui/react-dropdown-menu": "^2.1.1",
         "@radix-ui/react-label": "^2.1.0",
@@ -131,5 +135,11 @@
     "engines": {
         "node": "20.x",
         "pnpm": ">=9"
+    },
+    "pnpm": {
+        "patchedDependencies": {
+            "@bbob/react": "patches/@bbob__react.patch",
+            "@bbob/preset-react": "patches/@bbob__preset-react.patch"
+        }
     }
 }
diff --git a/patches/@bbob__preset-react.patch b/patches/@bbob__preset-react.patch
new file mode 100644
index 0000000000..125cb28aac
--- /dev/null
+++ b/patches/@bbob__preset-react.patch
@@ -0,0 +1,77 @@
+diff --git a/es/index.js b/es/index.js
+index ae798e7be9727d886cb248ce6eb08cb9bb4a80f4..d58beb5a14f775f98cf376fdeef8338fb454e900 100644
+--- a/es/index.js
++++ b/es/index.js
+@@ -1,34 +1,38 @@
+-import presetHTML5 from '@bbob/preset-html5';
+-const tagAttr = (style)=>({
+-        attrs: {
+-            style
+-        }
+-    });
+-const presetReact = presetHTML5.extend((tags)=>({
+-        ...tags,
+-        b: (...args)=>({
+-                ...tags.b(...args),
+-                ...tagAttr({
+-                    fontWeight: 'bold'
+-                })
+-            }),
+-        i: (...args)=>({
+-                ...tags.i(...args),
+-                ...tagAttr({
+-                    fontStyle: 'italic'
+-                })
+-            }),
+-        u: (...args)=>({
+-                ...tags.u(...args),
+-                ...tagAttr({
+-                    textDecoration: 'underline'
+-                })
+-            }),
+-        s: (...args)=>({
+-                ...tags.s(...args),
+-                ...tagAttr({
+-                    textDecoration: 'line-through'
+-                })
+-            })
+-    }));
+-export default presetReact;
++const presetHTML5 = require('@bbob/preset-html5').default;
++
++const tagAttr = (style) => ({
++    attrs: {
++        style
++    }
++});
++
++const presetReact = presetHTML5.extend((tags) => ({
++    ...tags,
++    b: (...args) => ({
++        ...tags.b(...args),
++        ...tagAttr({
++            fontWeight: 'bold'
++        })
++    }),
++    i: (...args) => ({
++        ...tags.i(...args),
++        ...tagAttr({
++            fontStyle: 'italic'
++        })
++    }),
++    u: (...args) => ({
++        ...tags.u(...args),
++        ...tagAttr({
++            textDecoration: 'underline'
++        })
++    }),
++    s: (...args) => ({
++        ...tags.s(...args),
++        ...tagAttr({
++            textDecoration: 'line-through'
++        })
++    })
++}));
++
++module.exports = presetReact;
++module.exports.default = presetReact;
diff --git a/patches/@bbob__react.patch b/patches/@bbob__react.patch
new file mode 100644
index 0000000000..fea7b05b9f
--- /dev/null
+++ b/patches/@bbob__react.patch
@@ -0,0 +1,113 @@
+diff --git a/es/Component.js b/es/Component.js
+index a4ab307b0c48628dedec0431845f972f2bde005c..a349964c49382b691ae1477fab6fae3ea3949f69 100644
+--- a/es/Component.js
++++ b/es/Component.js
+@@ -1,10 +1,15 @@
+-import React from 'react';
+-import { render } from './render';
+-const content = (children, plugins, options)=>React.Children.map(children, (child)=>{
+-        if (typeof child === 'string') {
+-            return render(child, plugins, options);
+-        }
+-        return child;
+-    });
+-const Component = ({ container = 'span', componentProps = {}, children, plugins = [], options = {} })=>React.createElement(container, componentProps, content(children, plugins, options));
+-export default Component;
++const React = require('react');
++const render = require('./render').render;
++
++const content = (children, plugins, options) => React.Children.map(children, (child) => {
++    if (typeof child === 'string') {
++        return render(child, plugins, options);
++    }
++    return child;
++});
++
++const Component = ({ container = 'span', componentProps = {}, children, plugins = [], options = {} }) => 
++    React.createElement(container, componentProps, content(children, plugins, options));
++
++module.exports = Component;
++module.exports.default = Component;
+diff --git a/es/index.js b/es/index.js
+index 5a4aadb175e5607a6e0128292ebb6101197dff5a..ac4ea782b745bb5b30a86ccd676cd7bc9a9f1f54 100644
+--- a/es/index.js
++++ b/es/index.js
+@@ -1,2 +1,6 @@
+-export { default } from './Component';
+-export { render } from './render';
++const Component = require('./Component');
++const render = require('./render').render;
++
++module.exports = Component;
++module.exports.default = Component;
++module.exports.render = render;
+diff --git a/es/render.js b/es/render.js
+index 4d996dc9821c8b2beb58465fd28d7bc12b4104a7..78ad60ef4064b685a14376b024bc0f20cfc7161e 100644
+--- a/es/render.js
++++ b/es/render.js
+@@ -1,16 +1,19 @@
+-/* eslint-disable no-use-before-define */ import React from "react";
+-import { render as htmlrender } from "@bbob/html";
+-import core from "@bbob/core";
+-import { isTagNode, isStringNode, isEOL } from "@bbob/plugin-helper";
+-const toAST = (source, plugins, options)=>core(plugins).process(source, {
+-        ...options,
+-        render: (input)=>{
+-            return htmlrender(input, {
+-                stripTags: true
+-            });
+-        }
+-    }).tree;
+-const isContentEmpty = (content)=>{
++/* eslint-disable no-use-before-define */ 
++const React = require("react");
++const htmlrender = require("@bbob/html").render;
++const core = require("@bbob/core").default;
++const { isTagNode, isStringNode, isEOL } = require("@bbob/plugin-helper");
++
++const toAST = (source, plugins, options) => core(plugins).process(source, {
++    ...options,
++    render: (input) => {
++        return htmlrender(input, {
++            stripTags: true
++        });
++    }
++}).tree;
++
++const isContentEmpty = (content) => {
+     if (!content) {
+         return true;
+     }
+@@ -19,15 +22,17 @@ const isContentEmpty = (content)=>{
+     }
+     return Array.isArray(content) ? content.length === 0 : !content;
+ };
++
+ function tagToReactElement(node, index) {
+     return React.createElement(node.tag, {
+         ...node.attrs,
+         key: index
+     }, isContentEmpty(node.content) ? null : renderToReactNodes(node.content));
+ }
++
+ function renderToReactNodes(nodes) {
+     if (nodes && Array.isArray(nodes) && nodes.length) {
+-        return nodes.reduce((arr, node, index)=>{
++        return nodes.reduce((arr, node, index) => {
+             if (isTagNode(node)) {
+                 arr.push(tagToReactElement(node, index));
+                 return arr;
+@@ -51,8 +56,11 @@ function renderToReactNodes(nodes) {
+     }
+     return [];
+ }
++
+ function render(source, plugins, options) {
+     return renderToReactNodes(toAST(source, plugins, options));
+ }
+-export { render };
+-export default render;
++
++module.exports = render;
++module.exports.render = render;
++module.exports.default = render;
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 9aa2ac48e3..e2c5c55eba 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -4,10 +4,27 @@ settings:
   autoInstallPeers: true
   excludeLinksFromLockfile: false
 
+patchedDependencies:
+  '@bbob/preset-react':
+    hash: 6fcyyetkfscdlydksvco5tvshq
+    path: patches/@bbob__preset-react.patch
+  '@bbob/react':
+    hash: 4mxrnkjgb572sb5wk5jdditwqy
+    path: patches/@bbob__react.patch
+
 importers:
 
   .:
     dependencies:
+      '@bbob/plugin-helper':
+        specifier: ^4.2.0
+        version: 4.2.0
+      '@bbob/preset-react':
+        specifier: ^4.2.0
+        version: 4.2.0(patch_hash=6fcyyetkfscdlydksvco5tvshq)(react@18.3.1)
+      '@bbob/react':
+        specifier: ^4.2.0
+        version: 4.2.0(patch_hash=4mxrnkjgb572sb5wk5jdditwqy)(react@18.3.1)
       '@floating-ui/core':
         specifier: ^1.6.8
         version: 1.6.8
@@ -26,6 +43,9 @@ importers:
       '@radix-ui/react-checkbox':
         specifier: ^1.1.1
         version: 1.1.2(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@radix-ui/react-collapsible':
+        specifier: ^1.1.2
+        version: 1.1.2(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       '@radix-ui/react-dialog':
         specifier: ^1.1.2
         version: 1.1.2(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
@@ -424,6 +444,37 @@ packages:
     resolution: {integrity: sha512-Z/yiTPj+lDVnF7lWeKCIJzaIkI0vYO87dMpZ4bg4TDrFe4XXLFWL1TbXU27gBP3QccxV9mZICCrnjnYlJjXHOA==}
     engines: {node: '>=6.9.0'}
 
+  '@bbob/core@4.2.0':
+    resolution: {integrity: sha512-i5VUIO6xx+TCrBE8plQF9KpW1z+0QcCh9GawCCWYG9KcZrEsyRy57my5/kem0a2lFxXjh0o+tgjQY9sCP5b3bw==}
+
+  '@bbob/html@4.2.0':
+    resolution: {integrity: sha512-mZG7MmE/YluH1/FNCr2Jv/Vz3Mq5stZ5tFAjBmYpVVN6Ndus4+FA84vKoHFdUHDiuU1p/e2/o/VUrwsWwLdoIA==}
+
+  '@bbob/parser@4.2.0':
+    resolution: {integrity: sha512-l8BppXjdQClrUiv+qIN0Oe6aS/vlH7CEduMreDaxYDadUPC0RMzxj9lXVjO0xTbFEVEIUJCGc53qnpiApLbx2g==}
+
+  '@bbob/plugin-helper@4.2.0':
+    resolution: {integrity: sha512-Uxs/UJROnkpcq5EJfz/8NCEYAcme8l6oAgMeWLX1nxWeieUhRgpY8BWQ9eQwUOXEKa0tsKVPnlmbUAjFhppVPw==}
+
+  '@bbob/preset-html5@4.2.0':
+    resolution: {integrity: sha512-X2EIeb2vqTz/n34KWQXEL5IC0SuB6i2/ltRpEaMTyK7IoDEs0XGIWcqVpenb7Z2d4eNA3gTWhkoUUkKlZmfQRQ==}
+
+  '@bbob/preset-react@4.2.0':
+    resolution: {integrity: sha512-f6VoTaFVxtx4dVWCYjbSkeK2roYgjj/mMc7TJtPOReSjLZqxk0sV0LUcNfbEeNdCcygASjKZAX5FOhDZ4qADng==}
+    peerDependencies:
+      react: '> 15.0'
+
+  '@bbob/preset@4.2.0':
+    resolution: {integrity: sha512-IA+kxlrRcYBXE634B8W6uU2DO7VvrxeOqWUzIDKV2CgzTMpmCG875ihGp+Q3T+QxGwzG5S0L4GdmCIULTbzC4A==}
+
+  '@bbob/react@4.2.0':
+    resolution: {integrity: sha512-gmcTg3vrN5Qc6Epp91f4pU4rf8GCb9AO8CGaTgdvmLMYH4LWoAyZdTGn4J0m3QKAhTdUWvnZjG9YOkI4zXw94A==}
+    peerDependencies:
+      react: '> 15.0'
+
+  '@bbob/types@4.2.0':
+    resolution: {integrity: sha512-bSCZnNg0VrPosBBUVkjBDYVKNEqwT0jTNuzvAuNrZkuILgUKtLYI9GHuT8rY4lZecCb7UqGDsHsYt0YJO36eJg==}
+
   '@bcoe/v8-coverage@0.2.3':
     resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==}
 
@@ -1052,6 +1103,19 @@ packages:
       '@types/react-dom':
         optional: true
 
+  '@radix-ui/react-collapsible@1.1.2':
+    resolution: {integrity: sha512-PliMB63vxz7vggcyq0IxNYk8vGDrLXVWw4+W4B8YnwI1s18x7YZYqlG9PLX7XxAJUi0g2DxP4XKJMFHh/iVh9A==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
   '@radix-ui/react-collection@1.1.0':
     resolution: {integrity: sha512-GZsZslMJEyo1VKm5L1ZJY8tGDxZNPAoUeQUIbKeJfoi7Q4kmig5AsgLMYYuyYbfjd8fBmFORAIwYAkXMnXZgZw==}
     peerDependencies:
@@ -4936,6 +5000,54 @@ snapshots:
       '@babel/helper-string-parser': 7.25.9
       '@babel/helper-validator-identifier': 7.25.9
 
+  '@bbob/core@4.2.0':
+    dependencies:
+      '@bbob/parser': 4.2.0
+      '@bbob/plugin-helper': 4.2.0
+      '@bbob/types': 4.2.0
+
+  '@bbob/html@4.2.0':
+    dependencies:
+      '@bbob/core': 4.2.0
+      '@bbob/plugin-helper': 4.2.0
+      '@bbob/types': 4.2.0
+
+  '@bbob/parser@4.2.0':
+    dependencies:
+      '@bbob/plugin-helper': 4.2.0
+      '@bbob/types': 4.2.0
+
+  '@bbob/plugin-helper@4.2.0':
+    dependencies:
+      '@bbob/types': 4.2.0
+
+  '@bbob/preset-html5@4.2.0':
+    dependencies:
+      '@bbob/plugin-helper': 4.2.0
+      '@bbob/preset': 4.2.0
+      '@bbob/types': 4.2.0
+
+  '@bbob/preset-react@4.2.0(patch_hash=6fcyyetkfscdlydksvco5tvshq)(react@18.3.1)':
+    dependencies:
+      '@bbob/preset-html5': 4.2.0
+      '@bbob/types': 4.2.0
+      react: 18.3.1
+
+  '@bbob/preset@4.2.0':
+    dependencies:
+      '@bbob/plugin-helper': 4.2.0
+      '@bbob/types': 4.2.0
+
+  '@bbob/react@4.2.0(patch_hash=4mxrnkjgb572sb5wk5jdditwqy)(react@18.3.1)':
+    dependencies:
+      '@bbob/core': 4.2.0
+      '@bbob/html': 4.2.0
+      '@bbob/plugin-helper': 4.2.0
+      '@bbob/types': 4.2.0
+      react: 18.3.1
+
+  '@bbob/types@4.2.0': {}
+
   '@bcoe/v8-coverage@0.2.3': {}
 
   '@crowdin/crowdin-api-client@1.39.1':
@@ -5364,6 +5476,22 @@ snapshots:
       '@types/react': 18.3.12
       '@types/react-dom': 18.3.1
 
+  '@radix-ui/react-collapsible@1.1.2(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
+    dependencies:
+      '@radix-ui/primitive': 1.1.1
+      '@radix-ui/react-compose-refs': 1.1.1(@types/react@18.3.12)(react@18.3.1)
+      '@radix-ui/react-context': 1.1.1(@types/react@18.3.12)(react@18.3.1)
+      '@radix-ui/react-id': 1.1.0(@types/react@18.3.12)(react@18.3.1)
+      '@radix-ui/react-presence': 1.1.2(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@radix-ui/react-primitive': 2.0.1(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.3.12)(react@18.3.1)
+      '@radix-ui/react-use-layout-effect': 1.1.0(@types/react@18.3.12)(react@18.3.1)
+      react: 18.3.1
+      react-dom: 18.3.1(react@18.3.1)
+    optionalDependencies:
+      '@types/react': 18.3.12
+      '@types/react-dom': 18.3.1
+
   '@radix-ui/react-collection@1.1.0(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
     dependencies:
       '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.12)(react@18.3.1)
diff --git a/public/API/API_GetAchievementOfTheWeek.php b/public/API/API_GetAchievementOfTheWeek.php
index 2b9ec1757f..046f1dcd16 100644
--- a/public/API/API_GetAchievementOfTheWeek.php
+++ b/public/API/API_GetAchievementOfTheWeek.php
@@ -3,8 +3,6 @@
 use App\Http\Actions\BuildAchievementOfTheWeekDataAction;
 use App\Models\Achievement;
 use App\Models\EventAchievement;
-use App\Models\StaticData;
-use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\DB;
 
 /*
@@ -49,20 +47,20 @@
  *       filters the Unlocks to just those entries after StartAt.
  */
 
-$staticData = StaticData::first();
-$aotwData = (new BuildAchievementOfTheWeekDataAction())->execute($staticData);
+$aotwData = (new BuildAchievementOfTheWeekDataAction())->execute();
 
 $achievementId = $aotwData->achievement->id ?? 0;
 $eventAchievement = EventAchievement::active()->where('achievement_id', $achievementId)->first();
 
-$sourceAchievement = $eventAchievement ? $eventAchievement->sourceAchievement : Achievement::find($achievementId);
-if (!$sourceAchievement) {
+if (!$eventAchievement?->sourceAchievement) {
     return response()->json([
         'Achievement' => ['ID' => null],
         'StartAt' => null,
     ]);
 }
 
+$sourceAchievement = $eventAchievement->sourceAchievement;
+
 $achievement = [
     'ID' => $sourceAchievement->ID ?? null,
     'Title' => $sourceAchievement->Title ?? null,
@@ -91,54 +89,33 @@
     'ID' => $aotwData->forumTopicId->resolve() ?? null,
 ];
 
-if ($eventAchievement) {
-    $unlocks = collect();
-
-    $playerAchievements = $eventAchievement->achievement->playerAchievements()
-        ->with('user')
-        ->orderByDesc(DB::raw('IFNULL(unlocked_hardcore_at, unlocked_at)')) // newest winners first
-        ->limit(500)
-        ->get();
-    $numWinners = $playerAchievements->count();
-    $numWinnersHardcore = 0;
-
-    foreach ($playerAchievements as $playerAchievement) {
-        $unlocks[] = [
-            'User' => $playerAchievement->user->display_name,
-            'RAPoints' => $playerAchievement->user->RAPoints,
-            'RASoftcorePoints' => $playerAchievement->user->RASoftcorePoints,
-            'HardcoreMode' => $playerAchievement->unlocked_hardcore_at !== null ? 1 : 0,
-            'DateAwarded' => $playerAchievement->unlocked_hardcore_at ?? $playerAchievement->unlocked_at,
-        ];
-
-        if ($playerAchievement->unlocked_hardcore_at !== null) {
-            $numWinnersHardcore++;
-        }
-    }
-
-    $numPossibleWinners = $eventAchievement->achievement->game->players_total;
-    $startAt = $eventAchievement->active_from;
-
-} else {
-    $parentGame = getParentGameFromGameTitle($game['Title'], $console['ID']);
-    $unlocks = getAchievementUnlocksData($achievementId, null, $numWinners, $numWinnersHardcore, $numPossibleWinners, $parentGame?->id, 0, 500);
-
-    /*
-    * reset unlocks if there is no start date to prevent listing invalid entries
-    */
-    $startAt = $staticData->Event_AOTW_StartAt;
-    if (empty($startAt)) {
-        $unlocks = collect();
+$unlocks = collect();
+
+$playerAchievements = $eventAchievement->achievement->playerAchievements()
+    ->with('user')
+    ->orderByDesc(DB::raw('IFNULL(unlocked_hardcore_at, unlocked_at)')) // newest winners first
+    ->limit(500)
+    ->get();
+$numWinners = $playerAchievements->count();
+$numWinnersHardcore = 0;
+
+foreach ($playerAchievements as $playerAchievement) {
+    $unlocks[] = [
+        'User' => $playerAchievement->user->display_name,
+        'RAPoints' => $playerAchievement->user->RAPoints,
+        'RASoftcorePoints' => $playerAchievement->user->RASoftcorePoints,
+        'HardcoreMode' => $playerAchievement->unlocked_hardcore_at !== null ? 1 : 0,
+        'DateAwarded' => $playerAchievement->unlocked_hardcore_at ?? $playerAchievement->unlocked_at,
+    ];
+
+    if ($playerAchievement->unlocked_hardcore_at !== null) {
+        $numWinnersHardcore++;
     }
-
-    if (!empty($startAt)) {
-        $unlocks = $unlocks->filter(fn ($unlock) => Carbon::parse($unlock['DateAwarded'])->gte($startAt));
-    }
-
-    // sort so newest winners are first
-    $unlocks->sortByDesc('DateAwarded');
 }
 
+$numPossibleWinners = $eventAchievement->achievement->game->players_total;
+$startAt = $eventAchievement->active_from;
+
 return response()->json([
     'Achievement' => $achievement,
     'Console' => $console,
@@ -148,5 +125,5 @@
     'TotalPlayers' => $numPossibleWinners ?? 0,
     'Unlocks' => $unlocks->values(),
     'UnlocksCount' => $numWinners ?? 0,
-    'UnlocksHardcoreCount' => $numWinnersHardcore ?? 0,
+    'UnlocksHardcoreCount' => $numWinnersHardcore,
 ]);
diff --git a/public/API/API_GetAchievementsEarnedBetween.php b/public/API/API_GetAchievementsEarnedBetween.php
index a9dcaae492..fad537532d 100644
--- a/public/API/API_GetAchievementsEarnedBetween.php
+++ b/public/API/API_GetAchievementsEarnedBetween.php
@@ -29,7 +29,7 @@
 
 use App\Models\User;
 
-$user = User::firstWhere('User', request()->query('u'));
+$user = User::whereName(request()->query('u'))->first();
 if (!$user) {
     return response()->json([]);
 }
diff --git a/public/API/API_GetAchievementsEarnedOnDay.php b/public/API/API_GetAchievementsEarnedOnDay.php
index 07ebf70ab6..8b82f7c935 100644
--- a/public/API/API_GetAchievementsEarnedOnDay.php
+++ b/public/API/API_GetAchievementsEarnedOnDay.php
@@ -35,7 +35,7 @@
     'd' => ['required', 'date'],
 ]);
 
-$user = User::firstWhere('User', request()->query('u'));
+$user = User::whereName(request()->query('u'))->first();
 if (!$user) {
     return response()->json([]);
 }
diff --git a/public/API/API_GetComments.php b/public/API/API_GetComments.php
index 4267a0eb32..acf8400f4d 100644
--- a/public/API/API_GetComments.php
+++ b/public/API/API_GetComments.php
@@ -66,7 +66,7 @@
 $userPolicy = new UserCommentPolicy();
 
 if ($username) {
-    $user = User::firstWhere('User', $username);
+    $user = User::whereName($username)->first();
 
     if (!$user || !$userPolicy->viewAny(null, $user)) {
         return response()->json([], 404);
@@ -104,7 +104,7 @@
     return $commentPolicy->view($user, $nextComment);
 })->map(function ($nextComment) {
     return [
-        'User' => $nextComment->user->username,
+        'User' => $nextComment->user->display_name,
         'Submitted' => $nextComment->Submitted,
         'CommentText' => $nextComment->Payload,
     ];
diff --git a/public/API/API_GetGameInfoAndUserProgress.php b/public/API/API_GetGameInfoAndUserProgress.php
index 6309d2554c..6d6a3869b4 100644
--- a/public/API/API_GetGameInfoAndUserProgress.php
+++ b/public/API/API_GetGameInfoAndUserProgress.php
@@ -58,7 +58,7 @@
  use Illuminate\Support\Carbon;
 
 $gameID = (int) request()->query('g');
-$targetUser = User::firstWhere('User', request()->query('u'));
+$targetUser = User::whereName(request()->query('u'))->first();
 if (!$targetUser) {
     return response()->json([]);
 }
diff --git a/public/API/API_GetGameLeaderboards.php b/public/API/API_GetGameLeaderboards.php
index a3aee8d094..ab60863320 100644
--- a/public/API/API_GetGameLeaderboards.php
+++ b/public/API/API_GetGameLeaderboards.php
@@ -62,7 +62,7 @@
 
     if ($leaderboard->topEntry) {
         $topEntry = [
-            'User' => $leaderboard->topEntry->user->User,
+            'User' => $leaderboard->topEntry->user->display_name,
             'Score' => $leaderboard->topEntry->score,
             'FormattedScore' => ValueFormat::format($leaderboard->topEntry->score, $leaderboard->Format),
         ];
diff --git a/public/API/API_GetGameRankAndScore.php b/public/API/API_GetGameRankAndScore.php
index 5d711e1225..0a25fb3697 100644
--- a/public/API/API_GetGameRankAndScore.php
+++ b/public/API/API_GetGameRankAndScore.php
@@ -41,7 +41,7 @@
     // or the top earners if there are less than 10 masteries.
     foreach ($topAchievers as $playerGame) {
         $gameTopAchievers[] = [
-            'User' => User::find($playerGame['user_id'])->User,
+            'User' => User::find($playerGame['user_id'])->display_name, // FIXME: N+1 query problem
             'NumAchievements' => $playerGame['achievements_unlocked_hardcore'],
             'TotalScore' => $playerGame['points_hardcore'],
             'LastAward' => Carbon::createFromTimestamp($playerGame['last_unlock_hardcore_at'])->format('Y-m-d H:i:s'),
diff --git a/public/API/API_GetTicketData.php b/public/API/API_GetTicketData.php
index 7273febbca..4a737e736f 100644
--- a/public/API/API_GetTicketData.php
+++ b/public/API/API_GetTicketData.php
@@ -179,12 +179,12 @@
 // getting ticket info for a specific user
 $assignedToUser = request()->query('u');
 if (!empty($assignedToUser)) {
-    $foundUser = User::firstWhere('User', $assignedToUser);
+    $foundUser = User::whereName($assignedToUser)->first();
     if (!$foundUser) {
         return response()->json(['error' => "User $assignedToUser not found"], 404);
     }
 
-    $ticketData['User'] = $assignedToUser;
+    $ticketData['User'] = $foundUser->display_name;
     $ticketData['Open'] = 0;
     $ticketData['Closed'] = 0;
     $ticketData['Resolved'] = 0;
@@ -211,7 +211,7 @@
             $prevID = $ticket['AchievementID'];
         }
     }
-    $ticketData['URL'] = route('developer.tickets', ['user' => $assignedToUser]);
+    $ticketData['URL'] = route('developer.tickets', ['user' => $foundUser->display_name]);
 
     return response()->json($ticketData);
 }
@@ -246,9 +246,9 @@
             'ReportType' => $ticket->ReportType,
             'ReportTypeDescription' => TicketType::toString($ticket->ReportType),
             'ReportNotes' => $ticket->ReportNotes,
-            'ReportedBy' => $ticket->reporter?->User,
+            'ReportedBy' => $ticket->reporter?->display_name,
             'ResolvedAt' => $ticket->ResolvedAt?->__toString(),
-            'ResolvedBy' => $ticket->resolver?->User,
+            'ResolvedBy' => $ticket->resolver?->display_name,
             'ReportState' => $ticket->ReportState,
             'ReportStateDescription' => TicketState::toString($ticket->ReportState),
             'Hardcore' => $ticket->Hardcore,
diff --git a/public/API/API_GetUserAwards.php b/public/API/API_GetUserAwards.php
index 0713fa8d22..cf1a31cf55 100644
--- a/public/API/API_GetUserAwards.php
+++ b/public/API/API_GetUserAwards.php
@@ -40,7 +40,7 @@
 
 $user = request()->query('u');
 
-$userModel = User::firstWhere('User', $user);
+$userModel = User::whereName($user)->first();
 $userAwards = getUsersSiteAwards($userModel);
 [$gameMasteryAwards, $eventAwards, $siteAwards] = SeparateAwards($userAwards);
 
diff --git a/public/API/API_GetUserCompletionProgress.php b/public/API/API_GetUserCompletionProgress.php
index 25aef0491d..f2a11c9d5a 100644
--- a/public/API/API_GetUserCompletionProgress.php
+++ b/public/API/API_GetUserCompletionProgress.php
@@ -42,7 +42,7 @@
 $count = $input['c'] ?? 100;
 $user = request()->query('u');
 
-$userModel = User::firstWhere('User', $user);
+$userModel = User::whereName($user)->first();
 
 $playerProgressionService = new PlayerProgressionService();
 
diff --git a/public/API/API_GetUserGameLeaderboards.php b/public/API/API_GetUserGameLeaderboards.php
index eed0208594..1a0adb2414 100644
--- a/public/API/API_GetUserGameLeaderboards.php
+++ b/public/API/API_GetUserGameLeaderboards.php
@@ -43,7 +43,7 @@
 $offset = $input['o'] ?? 0;
 $count = $input['c'] ?? 200;
 
-$user = User::firstWhere('User', request()->query('u'));
+$user = User::whereName(request()->query('u'))->first();
 if (!$user) {
     return response()->json(['User not found'], 404);
 }
diff --git a/public/API/API_GetUserGameRankAndScore.php b/public/API/API_GetUserGameRankAndScore.php
index f3d6f58422..357ea932c7 100644
--- a/public/API/API_GetUserGameRankAndScore.php
+++ b/public/API/API_GetUserGameRankAndScore.php
@@ -17,7 +17,7 @@
 
 $gameId = (int) request()->query('g');
 
-$user = User::firstWhere('User', request()->query('u'));
+$user = User::whereName(request()->query('u'))->first();
 if (!$user) {
     return response()->json([]);
 }
diff --git a/public/API/API_GetUserPoints.php b/public/API/API_GetUserPoints.php
index 95e946e3f2..45f98245e6 100644
--- a/public/API/API_GetUserPoints.php
+++ b/public/API/API_GetUserPoints.php
@@ -8,15 +8,19 @@
  *  int        SoftcorePoints          number of softcore points the user has
  */
 
-$user = request()->query('u');
+use App\Models\User;
 
-if (!getPlayerPoints($user, $userDetails)) {
+$username = request()->query('u');
+
+$foundUser = User::whereName($username)->first();
+
+if (!$foundUser) {
     return response()->json([
-        'User' => $user,
+        'User' => $username,
     ], 404);
 }
 
 return response()->json(array_map('intval', [
-    'Points' => $userDetails['RAPoints'],
-    'SoftcorePoints' => $userDetails['RASoftcorePoints'],
+    'Points' => $foundUser->points,
+    'SoftcorePoints' => $foundUser->points_softcore,
 ]));
diff --git a/public/API/API_GetUserProfile.php b/public/API/API_GetUserProfile.php
index bb2af5dcec..7f193ea760 100644
--- a/public/API/API_GetUserProfile.php
+++ b/public/API/API_GetUserProfile.php
@@ -30,15 +30,15 @@
     'u' => ['required', 'min:2', 'max:20', new CtypeAlnum()],
 ]);
 
-$user = User::firstWhere('User', request()->query('u'));
+$user = User::whereName(request()->query('u'))->first();
 
 if (!$user) {
     return response()->json([], 404);
 }
 
 return response()->json([
-    'User' => $user->User,
-    'UserPic' => sprintf("/UserPic/%s.png", $user->User),
+    'User' => $user->display_name,
+    'UserPic' => sprintf("/UserPic/%s.png", $user->username),
     'MemberSince' => $user->created_at->toDateTimeString(),
     'RichPresenceMsg' => empty($user->RichPresenceMsg) || $user->RichPresenceMsg === 'Unknown' ? null : $user->RichPresenceMsg,
     'LastGameID' => $user->LastGameID,
diff --git a/public/API/API_GetUserProgress.php b/public/API/API_GetUserProgress.php
index 9d6e9f36f3..0e45a1479c 100644
--- a/public/API/API_GetUserProgress.php
+++ b/public/API/API_GetUserProgress.php
@@ -17,7 +17,7 @@
 
  use App\Models\User;
 
-$user = User::firstWhere('User', request()->query('u'));
+$user = User::whereName(request()->query('u'))->first();
 if (!$user) {
     return response()->json([]);
 }
diff --git a/public/API/API_GetUserRankAndScore.php b/public/API/API_GetUserRankAndScore.php
index d8b7e774a5..e083be8ac5 100644
--- a/public/API/API_GetUserRankAndScore.php
+++ b/public/API/API_GetUserRankAndScore.php
@@ -10,6 +10,7 @@
  *  int        TotalRanked     total number of ranked users
  */
 
+use App\Models\User;
 use App\Support\Rules\CtypeAlnum;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Validator;
@@ -18,18 +19,21 @@
     'u' => ['required', 'min:2', 'max:20', new CtypeAlnum()],
 ]);
 
-$user = request()->query('u');
+$username = request()->query('u');
 
 $points = 0;
 $softcorePoints = 0;
-if (getPlayerPoints($user, $playerPoints)) {
-    $points = $playerPoints['RAPoints'];
-    $softcorePoints = $playerPoints['RASoftcorePoints'];
+
+$foundUser = User::whereName($username)->first();
+
+if ($foundUser) {
+    $points = $foundUser?->points ?? 0;
+    $softcorePoints = $foundUser?->points_softcore ?? 0;
 }
 
 return response()->json([
     'Score' => $points,
     'SoftcoreScore' => $softcorePoints,
-    'Rank' => getUserRank($user),
+    'Rank' => $foundUser ? getUserRank($foundUser->display_name) : null,
     'TotalRanked' => countRankedUsers(),
 ]);
diff --git a/public/API/API_GetUserRecentAchievements.php b/public/API/API_GetUserRecentAchievements.php
index 1aaebee4f5..683c184898 100644
--- a/public/API/API_GetUserRecentAchievements.php
+++ b/public/API/API_GetUserRecentAchievements.php
@@ -29,7 +29,7 @@
  *    string     GameURL                  site-relative path to the game page
  */
 
-$user = User::firstWhere('User', request()->query('u'));
+$user = User::whereName(request()->query('u'))->first();
 if (!$user) {
     return response()->json([]);
 }
diff --git a/public/API/API_GetUserRecentlyPlayedGames.php b/public/API/API_GetUserRecentlyPlayedGames.php
index df402c9f2f..76caf8fdfb 100644
--- a/public/API/API_GetUserRecentlyPlayedGames.php
+++ b/public/API/API_GetUserRecentlyPlayedGames.php
@@ -36,7 +36,7 @@
     'o' => 'nullable|integer|min:0',
 ]);
 
-$user = User::firstWhere('User', request()->query('u'));
+$user = User::whereName(request()->query('u'))->first();
 if (!$user) {
     return response()->json([]);
 }
diff --git a/public/API/API_GetUserSetRequests.php b/public/API/API_GetUserSetRequests.php
index abb4e241e5..dce8f0053d 100644
--- a/public/API/API_GetUserSetRequests.php
+++ b/public/API/API_GetUserSetRequests.php
@@ -28,7 +28,7 @@
     't' => ['nullable', 'in:0,1'],
 ]);
 
-$user = User::firstWhere('User', request()->query('u'));
+$user = User::whereName(request()->query('u'))->first();
 if (!$user) {
     return response()->json([], 404);
 }
diff --git a/public/API/API_GetUserSummary.php b/public/API/API_GetUserSummary.php
index f5637eb891..048d6d4edb 100644
--- a/public/API/API_GetUserSummary.php
+++ b/public/API/API_GetUserSummary.php
@@ -86,6 +86,7 @@
  *  int        ContribYield            points awarded to others
  */
 
+use App\Models\User;
 use App\Support\Rules\CtypeAlnum;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Validator;
@@ -96,7 +97,7 @@
     'a' => 'nullable|integer|min:0',
 ]);
 
-$user = request()->query('u');
+$username = request()->query('u');
 $recentGamesPlayed = (int) request()->query('g', '0');
 $recentAchievementsEarned = (int) request()->query('a', '10');
 
@@ -105,16 +106,17 @@
     $recentGamesPlayed = 100;
 }
 
-$retVal = getUserPageInfo($user, $recentGamesPlayed, $recentAchievementsEarned);
+$userModel = User::whereName($username)->first();
+$retVal = getUserPageInfo($username, $recentGamesPlayed, $recentAchievementsEarned);
 
 if (empty($retVal)) {
     return response()->json([
         'ID' => null,
-        'User' => $user,
+        'User' => $username,
     ], 404);
 }
 
-$retVal['UserPic'] = "/UserPic/" . $retVal['User'] . ".png";
+$retVal['UserPic'] = "/UserPic/" . $userModel->username . ".png";
 $retVal['TotalRanked'] = countRankedUsers();
 
 // assume caller doesn't care about the rich presence script for the last game played
diff --git a/public/API/API_GetUserWantToPlayList.php b/public/API/API_GetUserWantToPlayList.php
index f3355245f3..35b574e87b 100644
--- a/public/API/API_GetUserWantToPlayList.php
+++ b/public/API/API_GetUserWantToPlayList.php
@@ -37,7 +37,7 @@
 $offset = $input['o'] ?? 0;
 $count = $input['c'] ?? 100;
 
-$targetUser = User::firstWhere('User', request()->query('u'));
+$targetUser = User::whereName(request()->query('u'))->first();
 if (!$targetUser) {
     return response()->json([], 404);
 }
diff --git a/public/dorequest.php b/public/dorequest.php
index e43d45f71a..44cdeac2bb 100644
--- a/public/dorequest.php
+++ b/public/dorequest.php
@@ -149,7 +149,7 @@ function DoRequestError(string $error, ?int $status = 200, ?string $code = null)
         return DoRequestError('Access denied.', 405, 'access_denied');
     }
 
-    $foundDelegateToUser = User::firstWhere('User', $delegateTo);
+    $foundDelegateToUser = User::whereName($delegateTo)->first();
     if (!$foundDelegateToUser) {
         return DoRequestError("The target user couldn't be found.", 404, 'not_found');
     }
@@ -454,7 +454,7 @@ function DoRequestError(string $error, ?int $status = 200, ?string $code = null)
             return DoRequestError('Access denied.', 403, 'access_denied');
         }
 
-        $targetUser = User::firstWhere('User', $delegateTo);
+        $targetUser = User::whereName($delegateTo)->first();
         if (!$targetUser) {
             return DoRequestError("The target user couldn't be found.", 404, 'not_found');
         }
@@ -543,7 +543,7 @@ function DoRequestError(string $error, ?int $status = 200, ?string $code = null)
         // TBD: friendsOnly
         $leaderboard = Leaderboard::find($lbID);
         $response['LeaderboardData'] = $leaderboard ?
-            GetLeaderboardData($leaderboard, User::firstWhere('User', $username), $count, $offset, nearby: true) : [];
+            GetLeaderboardData($leaderboard, User::whereName($username)->first(), $count, $offset, nearby: true) : [];
         break;
 
     case "patch":
@@ -621,7 +621,7 @@ function DoRequestError(string $error, ?int $status = 200, ?string $code = null)
         PlayerSessionHeartbeat::dispatch($user, $game, null, $gameHash);
 
         $response['Success'] = true;
-        $userModel = User::firstWhere('User', $username);
+        $userModel = User::whereName($username)->first();
         $userUnlocks = getUserAchievementUnlocksForGame($userModel, $gameID);
         $userUnlocks = reactivateUserEventAchievements($userModel, $userUnlocks);
         foreach ($userUnlocks as $achId => $unlock) {
@@ -744,7 +744,7 @@ function DoRequestError(string $error, ?int $status = 200, ?string $code = null)
 
     case "unlocks":
         $hardcoreMode = (int) request()->input('h', 0) === UnlockMode::Hardcore;
-        $userModel = User::firstWhere('User', $username);
+        $userModel = User::whereName($username)->first();
         $userUnlocks = getUserAchievementUnlocksForGame($userModel, $gameID);
         if ($hardcoreMode) {
             $userUnlocks = reactivateUserEventAchievements($userModel, $userUnlocks);
diff --git a/public/js/all.js b/public/js/all.js
index 0fb529de63..327a00dcef 100644
--- a/public/js/all.js
+++ b/public/js/all.js
@@ -59,15 +59,15 @@ jQuery(document).ready(function onReady($) {
     select: function (event, ui) {
       var TABKEY = 9;
       if (event.keyCode === TABKEY) {
-        $('.searchusericon').attr('src', mediaAsset('/UserPic/' + ui.item.label + '.png'));
+        $('.searchusericon').attr('src', mediaAsset('/UserPic/' + ui.item.username + '.png'));
       }
 
       return false;
     },
   });
   $searchUser.on('autocompleteselect', function (event, ui) {
-    $searchUser.val(ui.item.label);
-    $('.searchusericon').attr('src', mediaAsset('/UserPic/' + ui.item.label + '.png'));
+    $searchUser.val(ui.item.username);
+    $('.searchusericon').attr('src', mediaAsset('/UserPic/' + ui.item.username + '.png'));
 
     return false;
   });
diff --git a/public/request/achievement/update-display-order.php b/public/request/achievement/update-display-order.php
index 59738198b4..71b0a2452c 100644
--- a/public/request/achievement/update-display-order.php
+++ b/public/request/achievement/update-display-order.php
@@ -20,7 +20,7 @@
 $gameId = (int) $input['game'];
 $number = (int) $input['number'];
 
-$userModel = User::firstWhere('User', $user);
+$userModel = User::whereName($user)->first();
 
 // Only allow jr. devs to update the display order if they are the sole author of the set or have the primary claim
 if (
diff --git a/public/request/achievement/update-flag.php b/public/request/achievement/update-flag.php
index 6703201989..90c789a1dc 100644
--- a/public/request/achievement/update-flag.php
+++ b/public/request/achievement/update-flag.php
@@ -2,6 +2,7 @@
 
 use App\Community\Enums\ArticleType;
 use App\Enums\Permissions;
+use App\Models\User;
 use App\Platform\Enums\AchievementFlag;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Validator;
@@ -26,6 +27,8 @@
 
 updateAchievementFlag($achievementIds, $flag);
 
+$userModel = User::whereName($user)->first();
+
 $commentText = '';
 if ($flag === AchievementFlag::OfficialCore) {
     $commentText = 'promoted this achievement to the Core set';
@@ -33,7 +36,7 @@
 if ($flag === AchievementFlag::Unofficial) {
     $commentText = 'demoted this achievement to Unofficial';
 }
-addArticleComment("Server", ArticleType::Achievement, $achievementIds, "$user $commentText.", $user);
+addArticleComment("Server", ArticleType::Achievement, $achievementIds, "{$userModel->display_name} $commentText.", $userModel->display_name);
 expireGameTopAchievers($achievement['GameID']);
 
 return response()->json(['message' => __('legacy.success.ok')]);
diff --git a/public/request/achievement/update-image.php b/public/request/achievement/update-image.php
index fffb56a68b..72be26efb3 100644
--- a/public/request/achievement/update-image.php
+++ b/public/request/achievement/update-image.php
@@ -3,6 +3,7 @@
 use App\Community\Enums\ArticleType;
 use App\Enums\Permissions;
 use App\Models\Achievement;
+use App\Models\User;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Validator;
 
@@ -37,6 +38,14 @@
     return back()->withErrors(__('legacy.error.image_upload'));
 }
 
-addArticleComment('Server', ArticleType::Achievement, $achievementId, "$user edited this achievement's badge.", $user);
+$userModel = User::whereName($user)->first();
+
+addArticleComment(
+    'Server',
+    ArticleType::Achievement,
+    $achievementId,
+    "{$userModel->display_name} edited this achievement's badge.",
+    $userModel->display_name
+);
 
 return back()->with('success', __('legacy.success.image_upload'));
diff --git a/public/request/achievement/update-type.php b/public/request/achievement/update-type.php
index abc08b6619..a61a2fdde5 100644
--- a/public/request/achievement/update-type.php
+++ b/public/request/achievement/update-type.php
@@ -13,7 +13,7 @@
     abort(401);
 }
 
-$userModel = User::firstWhere('User', $user);
+$userModel = User::whereName($user)->first();
 
 $input = Validator::validate(Arr::wrap(request()->post()), [
     'achievements' => 'required',
@@ -56,6 +56,6 @@
 if (!$value) {
     $commentText = "removed this achievement's type";
 }
-addArticleComment("Server", ArticleType::Achievement, $achievementIds, "$user $commentText.", $user);
+addArticleComment("Server", ArticleType::Achievement, $achievementIds, "{$userModel->display_name} $commentText.", $userModel->display_name);
 
 return response()->json(['message' => __('legacy.success.ok')]);
diff --git a/public/request/achievement/update-video.php b/public/request/achievement/update-video.php
index 82bc2ea329..c4cb266782 100644
--- a/public/request/achievement/update-video.php
+++ b/public/request/achievement/update-video.php
@@ -3,6 +3,7 @@
 use App\Community\Enums\ArticleType;
 use App\Enums\Permissions;
 use App\Models\Achievement;
+use App\Models\User;
 use App\Platform\Enums\AchievementFlag;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Validator;
@@ -31,11 +32,13 @@
     abort(403);
 }
 
+$userModel = User::whereName($user)->first();
+
 $achievement->AssocVideo = strip_tags($embedUrl);
 $achievement->save();
 
-$auditLog = "$user set this achievement's embed URL.";
+$auditLog = "{$userModel->display_name} set this achievement's embed URL.";
 
-addArticleComment('Server', ArticleType::Achievement, $achievementId, $auditLog, $user);
+addArticleComment('Server', ArticleType::Achievement, $achievementId, $auditLog, $userModel->display_name);
 
 return response()->json(['message' => __('legacy.success.ok')]);
diff --git a/public/request/admin.php b/public/request/admin.php
index d47fe6c991..283b720519 100644
--- a/public/request/admin.php
+++ b/public/request/admin.php
@@ -21,7 +21,7 @@
     if (isset($awardAchievementID) && isset($awardAchievementUser)) {
         $usersToAward = preg_split('/\W+/', $awardAchievementUser);
         foreach ($usersToAward as $nextUser) {
-            $player = User::firstWhere('User', $nextUser);
+            $player = User::whereName($nextUser)->first();
             if (!$player) {
                 continue;
             }
@@ -82,23 +82,3 @@
 
     return back()->with('success', __('legacy.success.ok'));
 }
-
-if ($action === 'aotw') {
-    $aotwAchID = requestInputSanitized('a', 0, 'integer');
-    $aotwForumID = requestInputSanitized('f', 0, 'integer');
-    $aotwStartAt = requestInputSanitized('s', null, 'string');
-
-    $query = "UPDATE StaticData SET
-        Event_AOTW_AchievementID='$aotwAchID',
-        Event_AOTW_ForumID='$aotwForumID',
-        Event_AOTW_StartAt='$aotwStartAt'";
-
-    $db = getMysqliConnection();
-    $result = s_mysql_query($query);
-
-    if ($result) {
-        return back()->with('success', __('legacy.success.ok'));
-    }
-
-    return back()->withErrors(__('legacy.error.error'));
-}
diff --git a/public/request/auth/register.php b/public/request/auth/register.php
index 0773d98f56..961956d289 100644
--- a/public/request/auth/register.php
+++ b/public/request/auth/register.php
@@ -10,6 +10,7 @@
     'username' => [
         'required',
         'unique:mysql.UserAccounts,User',
+        'unique:mysql.UserAccounts,display_name',
         'min:4',
         'max:20',
         new CtypeAlnum(),
@@ -49,8 +50,8 @@
 
 $hashedPassword = Hash::make($pass);
 
-$query = "INSERT INTO UserAccounts (User, Password, SaltedPass, EmailAddress, Permissions, RAPoints, fbUser, fbPrefs, cookie, appToken, appTokenExpiry, websitePrefs, LastLogin, LastActivityID, Motto, ContribCount, ContribYield, APIKey, APIUses, LastGameID, RichPresenceMsg, RichPresenceMsgDate, ManuallyVerified, UnreadMessageCount, TrueRAPoints, UserWallActive, PasswordResetToken, Untracked, email_backup)
-VALUES ( '$username', '$hashedPassword', '', '$email', 0, 0, 0, 0, '', '', NULL, 127, null, 0, '', 0, 0, '', 0, 0, '', NULL, 0, 0, 0, 1, NULL, false, '$email')";
+$query = "INSERT INTO UserAccounts (User, display_name, Password, SaltedPass, EmailAddress, Permissions, RAPoints, fbUser, fbPrefs, cookie, appToken, appTokenExpiry, websitePrefs, LastLogin, LastActivityID, Motto, ContribCount, ContribYield, APIKey, APIUses, LastGameID, RichPresenceMsg, RichPresenceMsgDate, ManuallyVerified, UnreadMessageCount, TrueRAPoints, UserWallActive, PasswordResetToken, Untracked, email_backup)
+VALUES ( '$username', '$username', '$hashedPassword', '', '$email', 0, 0, 0, 0, '', '', NULL, 127, null, 0, '', 0, 0, '', 0, 0, '', NULL, 0, 0, 0, 1, NULL, false, '$email')";
 $dbResult = s_mysql_query($query);
 
 if (!$dbResult) {
@@ -63,7 +64,7 @@
 // Registered::dispatch($user);
 
 // Create an email validation token and send an email
-$userModel = User::firstWhere('User', $username);
+$userModel = User::whereName($username)->first();
 sendValidationEmail($userModel, $email);
 
 return back()->with('message', __('legacy.email_validate'));
diff --git a/public/request/auth/reset-password.php b/public/request/auth/reset-password.php
index 8ad857bf65..2b6e25b9f0 100644
--- a/public/request/auth/reset-password.php
+++ b/public/request/auth/reset-password.php
@@ -1,12 +1,13 @@
 <?php
 
 use App\Models\User;
+use App\Support\Rules\CtypeAlnum;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Validator;
 
 $input = Validator::validate(Arr::wrap(request()->post()), [
-    'username' => 'required|string|exists:UserAccounts,User|alpha_num|max:20',
+    'username' => ['required', 'min:2', 'max:20', new CtypeAlnum()],
     'token' => 'required',
     'password' => 'required|confirmed|min:8|different:username',
 ]);
@@ -14,7 +15,7 @@
 $passResetToken = $input['token'];
 $newPass = $input['password'];
 
-$targetUser = User::firstWhere('User', $input['username']);
+$targetUser = User::whereName($input['username'])->first();
 
 if (!$targetUser || $targetUser->isBanned() || !isValidPasswordResetToken($targetUser->username, $passResetToken)) {
     return back()->withErrors(__('legacy.error.token'));
diff --git a/public/request/auth/send-password-reset-email.php b/public/request/auth/send-password-reset-email.php
index 52a38cc6e9..821554abb9 100644
--- a/public/request/auth/send-password-reset-email.php
+++ b/public/request/auth/send-password-reset-email.php
@@ -8,7 +8,7 @@
     'username' => 'required',
 ]);
 
-$targetUser = User::firstWhere('User', $input['username']);
+$targetUser = User::whereName($input['username'])->first();
 
 if ($targetUser && !$targetUser->isBanned()) {
     RequestPasswordReset($targetUser);
diff --git a/public/request/forum-topic-comment/create.php b/public/request/forum-topic-comment/create.php
index 3f5d616f7e..825d59e517 100644
--- a/public/request/forum-topic-comment/create.php
+++ b/public/request/forum-topic-comment/create.php
@@ -20,7 +20,7 @@
     ],
 ]);
 
-$userModel = User::firstWhere('User', $user);
+$userModel = User::whereName($user)->first();
 $forumTopic = ForumTopic::find((int) $input['topic']);
 
 if (!$forumTopic || !$userModel->can('create', [App\Models\ForumTopicComment::class, $forumTopic])) {
diff --git a/public/request/forum-topic/delete.php b/public/request/forum-topic/delete.php
index a362ffb460..a0fab431f7 100644
--- a/public/request/forum-topic/delete.php
+++ b/public/request/forum-topic/delete.php
@@ -16,7 +16,7 @@
 /** @var ForumTopic $topic */
 $topic = ForumTopic::find($input['topic']);
 
-$userModel = User::firstWhere('User', $username);
+$userModel = User::whereName($username)->first();
 
 if (!$userModel->can('delete', $topic)) {
     return back()->withErrors(__('legacy.error.permissions'));
diff --git a/public/request/forum-topic/update-permissions.php b/public/request/forum-topic/update-permissions.php
index 145c27d18c..bb94de21da 100644
--- a/public/request/forum-topic/update-permissions.php
+++ b/public/request/forum-topic/update-permissions.php
@@ -10,7 +10,7 @@
     return back()->withErrors(__('legacy.error.permissions'));
 }
 
-$userModel = User::firstWhere('User', $user);
+$userModel = User::whereName($user)->first();
 
 if (!$userModel->can('manage', App\Models\ForumTopic::class)) {
     return back()->withErrors(__('legacy.error.permissions'));
diff --git a/public/request/forum-topic/update-title.php b/public/request/forum-topic/update-title.php
index 30ceda2760..6e04c86fc9 100644
--- a/public/request/forum-topic/update-title.php
+++ b/public/request/forum-topic/update-title.php
@@ -14,7 +14,7 @@
     'title' => 'required|string|max:255',
 ]);
 
-$userModel = User::firstWhere('User', $username);
+$userModel = User::whereName($username)->first();
 
 /** @var ForumTopic $forumTopic */
 $forumTopic = ForumTopic::find((int) $input['topic']);
diff --git a/public/request/game-relation/create.php b/public/request/game-relation/create.php
deleted file mode 100644
index 62e4edbb5a..0000000000
--- a/public/request/game-relation/create.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-use App\Enums\Permissions;
-use Illuminate\Support\Arr;
-use Illuminate\Support\Facades\Validator;
-
-if (!authenticateFromCookie($user, $permissions, $userDetails, Permissions::Developer)) {
-    return back()->withErrors(__('legacy.error.permissions'));
-}
-
-$input = Validator::validate(Arr::wrap(request()->post()), [
-    'game' => 'required|integer|exists:GameData,ID',
-    'relations' => 'required|string',
-]);
-
-$gameId = (int) $input['game'];
-
-// Filter out instances where a game might be linked to itself.
-$relationsArray = explode(",", $input['relations']);
-$filteredArray = array_diff($relationsArray, [$input['game']]);
-$filteredRelationsCsv = implode(",", $filteredArray);
-
-modifyGameAlternatives($user, $gameId, toAdd: $filteredRelationsCsv);
-
-return back()->with('success', __('legacy.success.ok'));
diff --git a/public/request/game-relation/delete.php b/public/request/game-relation/delete.php
deleted file mode 100644
index be9c3cc90e..0000000000
--- a/public/request/game-relation/delete.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-use App\Enums\Permissions;
-use Illuminate\Support\Arr;
-use Illuminate\Support\Facades\Validator;
-
-if (!authenticateFromCookie($user, $permissions, $userDetails, Permissions::Developer)) {
-    return back()->withErrors(__('legacy.error.permissions'));
-}
-
-$input = Validator::validate(Arr::wrap(request()->post()), [
-    'game' => 'required|integer|exists:GameData,ID',
-    'relations' => 'required|array',
-]);
-
-modifyGameAlternatives($user, (int) $input['game'], toRemove: $input['relations']);
-
-return back()->with('success', __('legacy.success.ok'));
diff --git a/public/request/game/generate-forum-topic.php b/public/request/game/generate-forum-topic.php
index 887a886401..088a956846 100644
--- a/public/request/game/generate-forum-topic.php
+++ b/public/request/game/generate-forum-topic.php
@@ -13,7 +13,7 @@
     'game' => 'required|integer|exists:GameData,ID',
 ]);
 
-$userModel = User::firstWhere('User', $user);
+$userModel = User::whereName($user)->first();
 
 $forumTopicComment = generateGameForumTopic($userModel, (int) $input['game']);
 if ($forumTopicComment) {
diff --git a/public/request/game/update-image.php b/public/request/game/update-image.php
index 436cd191f7..45a1a3732c 100644
--- a/public/request/game/update-image.php
+++ b/public/request/game/update-image.php
@@ -35,7 +35,7 @@
 $gameID = (int) $input['game'];
 $imageType = $input['type'];
 
-$userModel = User::firstWhere('User', $user);
+$userModel = User::whereName($user)->first();
 
 // Only allow jr. devs if they are the sole author of the set or have the primary claim
 if (
@@ -95,6 +95,6 @@
     default => '?', // should never hit this because of the match above
 };
 
-addArticleComment('Server', ArticleType::GameModification, $gameID, "$user changed the $label");
+addArticleComment('Server', ArticleType::GameModification, $gameID, "{$userModel->display_name} changed the $label");
 
 return back()->with('success', __('legacy.success.image_upload'));
diff --git a/public/request/game/update-meta.php b/public/request/game/update-meta.php
index 4e869a6ae6..37aef19d86 100644
--- a/public/request/game/update-meta.php
+++ b/public/request/game/update-meta.php
@@ -26,7 +26,7 @@
 
 $gameId = (int) $input['game'];
 
-$userModel = User::firstWhere('User', $user);
+$userModel = User::whereName($user)->first();
 
 // Only allow jr. devs if they are the sole author of the set or have the primary claim
 if (
@@ -36,7 +36,7 @@
     return back()->withErrors(__('legacy.error.permissions'));
 }
 
-if (modifyGameData($user, $gameId, $input['developer'], $input['publisher'], $input['genre'], $input['guide_url'])) {
+if (modifyGameData($userModel, $gameId, $input['developer'], $input['publisher'], $input['genre'], $input['guide_url'])) {
     return back()->with('success', __('legacy.success.update'));
 }
 
diff --git a/public/request/game/update-rich-presence.php b/public/request/game/update-rich-presence.php
index e0d3230e44..75e9fa6911 100644
--- a/public/request/game/update-rich-presence.php
+++ b/public/request/game/update-rich-presence.php
@@ -17,7 +17,7 @@
 
 $gameId = (int) $input['game'];
 
-$userModel = User::firstWhere('User', $user);
+$userModel = User::whereName($user)->first();
 
 // Only allow jr. devs if they are the sole author of the set or have the primary claim
 if (
@@ -27,7 +27,7 @@
     return back()->withErrors(__('legacy.error.permissions'));
 }
 
-if (modifyGameRichPresence($user, $gameId, (string) $input['rich_presence'])) {
+if (modifyGameRichPresence($userModel, $gameId, (string) $input['rich_presence'])) {
     return back()->with('success', __('legacy.success.ok'));
 }
 
diff --git a/public/request/leaderboard/remove-entry.php b/public/request/leaderboard/remove-entry.php
index 1101726bc9..e469f6807b 100644
--- a/public/request/leaderboard/remove-entry.php
+++ b/public/request/leaderboard/remove-entry.php
@@ -14,13 +14,13 @@
 $currentUser = User::find($userDetails['ID']);
 
 $input = Validator::validate(Arr::wrap(request()->post()), [
-    'user' => 'required|string|exists:UserAccounts,User',
+    'user' => 'required|string|exists:UserAccounts,display_name',
     'leaderboard' => 'required|integer|exists:LeaderboardDef,ID',
     'reason' => 'nullable|string|max:200',
 ]);
 
 $leaderboardId = (int) $input['leaderboard'];
-$targetUser = User::firstWhere('User', $input['user']);
+$targetUser = User::whereName($input['user'])->first();
 $reason = $input['reason'];
 
 if (!$targetUser) {
diff --git a/public/request/search.php b/public/request/search.php
index 8894343c3e..af2a7ac824 100644
--- a/public/request/search.php
+++ b/public/request/search.php
@@ -32,10 +32,16 @@
 
 $dataOut = [];
 foreach ($results as $nextRow) {
-    $dataOut[] = [
+    $result = [
         'label' => $nextRow['Title'] ?? null,
         'mylink' => $nextRow['Target'] ?? null,
     ];
+
+    if ($source === 'user' || $source === 'game-compare') {
+        $result['username'] = $nextRow['ID'] ?? null;
+    }
+
+    $dataOut[] = $result;
 }
 
 return response()->json($dataOut);
diff --git a/public/request/user-game-list/set-requests.php b/public/request/user-game-list/set-requests.php
index 0a9cb8f1eb..ddad600b3e 100644
--- a/public/request/user-game-list/set-requests.php
+++ b/public/request/user-game-list/set-requests.php
@@ -6,13 +6,13 @@
 
 $input = Validator::validate(Arr::wrap(request()->post()), [
     'game' => 'required|integer|exists:GameData,ID',
-    'user' => 'required|string|exists:UserAccounts,User',
+    'user' => 'required|string|exists:UserAccounts,display_name',
 ]);
 
 $gameId = (int) $input['game'];
 $user = $input['user'];
 
-$userModel = User::firstWhere('User', $user);
+$userModel = User::whereName($user)->first();
 
 $totalRequests = getUserRequestsInformation($userModel, $gameId);
 $totalRequests['gameRequests'] = getSetRequestCount($gameId);
diff --git a/public/request/user/award-achievement.php b/public/request/user/award-achievement.php
index 46cca63e03..277edea528 100644
--- a/public/request/user/award-achievement.php
+++ b/public/request/user/award-achievement.php
@@ -17,12 +17,12 @@
 }
 
 $input = Validator::validate(Arr::wrap(request()->post()), [
-    'user' => 'required|string|exists:UserAccounts,User',
+    'user' => 'required|string|exists:UserAccounts,display_name',
     'achievement' => 'required|integer|exists:Achievements,ID',
     'hardcore' => 'required|integer|min:0|max:1',
 ]);
 
-$player = User::firstWhere('User', $input['user']);
+$player = User::whereName($input['user'])->first();
 
 $achievementId = $input['achievement'];
 $awardHardcore = (bool) $input['hardcore'];
diff --git a/public/request/user/update-relationship.php b/public/request/user/update-relationship.php
index 6d85b8f935..0663fa872a 100644
--- a/public/request/user/update-relationship.php
+++ b/public/request/user/update-relationship.php
@@ -3,6 +3,7 @@
 use App\Community\Enums\UserRelationship;
 use App\Models\User;
 use Illuminate\Support\Arr;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Validation\Rule;
 
@@ -11,12 +12,13 @@
 }
 
 $input = Validator::validate(Arr::wrap(request()->post()), [
-    'user' => 'required|string|exists:UserAccounts,User',
+    'user' => 'required|string|exists:UserAccounts,display_name',
     'action' => ['required', 'integer', Rule::in(UserRelationship::cases())],
 ]);
 
-$senderUser = auth()->user();
-$targetUser = User::firstWhere('User', $input['user']);
+/** @var User $senderUser */
+$senderUser = Auth::user();
+$targetUser = User::whereName($input['user'])->first();
 
 if (!$targetUser) {
     return back()->withErrors(__('legacy.error.error'));
diff --git a/public/request/user/update-site-awards.php b/public/request/user/update-site-awards.php
index 123bc0e768..24875ccd08 100644
--- a/public/request/user/update-site-awards.php
+++ b/public/request/user/update-site-awards.php
@@ -76,7 +76,7 @@
     }
 }
 
-$userModel = User::firstWhere('User', $user);
+$userModel = User::whereName($user)->first();
 $userAwards = getUsersSiteAwards($userModel);
 $updatedAwardsHTML = '';
 ob_start();
diff --git a/public/request/user/update.php b/public/request/user/update.php
index 9247462619..eb1cd2a910 100644
--- a/public/request/user/update.php
+++ b/public/request/user/update.php
@@ -14,7 +14,7 @@
 }
 
 $input = Validator::validate(Arr::wrap(request()->post()), [
-    'target' => 'required|string|exists:UserAccounts,User',
+    'target' => 'required|string|exists:UserAccounts,display_name',
     'property' => ['required', 'integer', Rule::in(UserAction::cases())],
     'value' => 'required|integer',
 ]);
@@ -23,11 +23,11 @@
 $propertyType = (int) $input['property'];
 $value = (int) $input['value'];
 
-$foundSourceUser = User::firstWhere('User', $user);
-$foundTargetUser = User::firstWhere('User', $targetUsername);
+$foundSourceUser = User::whereName($user)->first();
+$foundTargetUser = User::whereName($targetUsername)->first();
 
 if ($propertyType === UserAction::UpdatePermissions) {
-    $response = SetAccountPermissionsJSON($foundSourceUser->User, $permissions, $targetUsername, $value);
+    $response = SetAccountPermissionsJSON($foundSourceUser->display_name, $permissions, $targetUsername, $value);
 
     if ($response['Success']) {
         // Auto-apply forums permissions.
@@ -79,7 +79,7 @@
             'Server',
             ArticleType::UserModeration,
             $foundTargetUser->id,
-            $foundSourceUser->User . ($hasBadge ? ' revoked' : ' awarded') . ' Patreon badge'
+            $foundSourceUser->display_name . ($hasBadge ? ' revoked' : ' awarded') . ' Patreon badge'
         );
     }
 
@@ -95,7 +95,7 @@
             'Server',
             ArticleType::UserModeration,
             $foundTargetUser->id,
-            $foundSourceUser->User . ($hasBadge ? ' revoked' : ' awarded') . ' Certified Legend badge'
+            $foundSourceUser->display_name . ($hasBadge ? ' revoked' : ' awarded') . ' Certified Legend badge'
         );
     }
 
@@ -110,7 +110,7 @@
             'Server',
             ArticleType::UserModeration,
             $foundTargetUser->id,
-            $foundSourceUser->User . ' set status to ' . ($value ? 'Untracked' : 'Tracked')
+            $foundSourceUser->display_name . ' set status to ' . ($value ? 'Untracked' : 'Tracked')
         );
     }
 
diff --git a/resources/js/common/components/+vendor/BaseAutosizeTextarea.tsx b/resources/js/common/components/+vendor/BaseAutosizeTextarea.tsx
new file mode 100644
index 0000000000..75919a8cf2
--- /dev/null
+++ b/resources/js/common/components/+vendor/BaseAutosizeTextarea.tsx
@@ -0,0 +1,137 @@
+import * as React from 'react';
+import { useImperativeHandle } from 'react';
+import { useIsomorphicLayoutEffect } from 'react-use';
+
+import { cn } from '@/common/utils/cn';
+
+interface UseBaseAutosizeTextAreaProps {
+  textAreaRef: React.MutableRefObject<HTMLTextAreaElement | null>;
+  minHeight?: number;
+  maxHeight?: number;
+  triggerAutoSize: string;
+}
+
+export const useBaseAutosizeTextArea = ({
+  textAreaRef,
+  triggerAutoSize,
+  maxHeight = Number.MAX_SAFE_INTEGER,
+  minHeight = 0,
+}: UseBaseAutosizeTextAreaProps) => {
+  const [init, setInit] = React.useState(true);
+
+  // Use useIsomorphicLayoutEffect to prevent layout flickering on client hydration.
+  useIsomorphicLayoutEffect(() => {
+    // We need to reset the height momentarily to get the correct scrollHeight for the textarea.
+    const offsetBorder = 6;
+    const textAreaElement = textAreaRef.current;
+
+    if (textAreaElement) {
+      if (init) {
+        textAreaElement.style.minHeight = `${minHeight + offsetBorder}px`;
+        if (maxHeight > minHeight) {
+          textAreaElement.style.maxHeight = `${maxHeight}px`;
+        }
+        setInit(false);
+      }
+
+      // Store the current scroll position to restore it after resizing.
+      const scrollPos = window.scrollY;
+
+      textAreaElement.style.height = `${minHeight + offsetBorder}px`;
+      const scrollHeight = textAreaElement.scrollHeight;
+
+      // We then set the height directly, outside of the render loop.
+      // Trying to set this with state or a ref will produce an incorrect value.
+      if (scrollHeight > maxHeight) {
+        textAreaElement.style.height = `${maxHeight}px`;
+      } else {
+        textAreaElement.style.height = `${scrollHeight + offsetBorder}px`;
+      }
+
+      // Restore the scroll position to prevent page jumps.
+      if (typeof window !== 'undefined') {
+        window.scrollTo(0, scrollPos);
+      }
+    }
+  }, [textAreaRef.current, triggerAutoSize, init, maxHeight, minHeight]);
+};
+
+export type BaseAutosizeTextAreaRef = {
+  textArea: HTMLTextAreaElement;
+  maxHeight: number;
+  minHeight: number;
+  focus: () => void;
+};
+
+type BaseAutosizeTextAreaProps = {
+  maxHeight?: number;
+  minHeight?: number;
+} & React.TextareaHTMLAttributes<HTMLTextAreaElement>;
+
+export const BaseAutosizeTextarea = React.forwardRef<
+  BaseAutosizeTextAreaRef,
+  BaseAutosizeTextAreaProps
+>(
+  (
+    {
+      maxHeight = Number.MAX_SAFE_INTEGER,
+      minHeight = 52,
+      className,
+      onChange,
+      value,
+      style,
+      ...props
+    }: BaseAutosizeTextAreaProps,
+    ref: React.Ref<BaseAutosizeTextAreaRef>,
+  ) => {
+    const textAreaRef = React.useRef<HTMLTextAreaElement | null>(null);
+    const [triggerAutoSize, setTriggerAutoSize] = React.useState('');
+
+    // Set initial height for SSR to prevent layout shift.
+    const initialStyle = {
+      ...style,
+      height: `${minHeight}px`,
+      minHeight: `${minHeight}px`,
+      ...(maxHeight > minHeight ? { maxHeight: `${maxHeight}px` } : {}),
+    };
+
+    useBaseAutosizeTextArea({
+      textAreaRef,
+      triggerAutoSize,
+      maxHeight,
+      minHeight,
+    });
+
+    useImperativeHandle(ref, () => ({
+      textArea: textAreaRef.current as HTMLTextAreaElement,
+      focus: () => textAreaRef?.current?.focus(),
+      maxHeight,
+      minHeight,
+    }));
+
+    React.useEffect(() => {
+      setTriggerAutoSize(value as string);
+    }, [props?.defaultValue, value]);
+
+    return (
+      <textarea
+        {...props}
+        value={value}
+        ref={textAreaRef}
+        style={initialStyle}
+        className={cn(
+          'border-input bg-background ring-offset-background placeholder:text-muted-foreground',
+          'focus-visible:ring-ring flex w-full rounded-md border px-3 py-2 text-sm',
+          'focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-offset-1',
+          'disabled:cursor-not-allowed disabled:opacity-50',
+          className,
+        )}
+        onChange={(e) => {
+          setTriggerAutoSize(e.target.value);
+          onChange?.(e);
+        }}
+      />
+    );
+  },
+);
+BaseAutosizeTextarea.displayName = 'BaseAutosizeTextarea';
diff --git a/resources/js/common/components/+vendor/BaseCollapsible.tsx b/resources/js/common/components/+vendor/BaseCollapsible.tsx
new file mode 100644
index 0000000000..bd6c3724a9
--- /dev/null
+++ b/resources/js/common/components/+vendor/BaseCollapsible.tsx
@@ -0,0 +1,11 @@
+/* eslint-disable no-restricted-imports -- base components can import from @radix-ui */
+
+import * as CollapsiblePrimitive from '@radix-ui/react-collapsible';
+
+const BaseCollapsible = CollapsiblePrimitive.Root;
+
+const BaseCollapsibleTrigger = CollapsiblePrimitive.CollapsibleTrigger;
+
+const BaseCollapsibleContent = CollapsiblePrimitive.CollapsibleContent;
+
+export { BaseCollapsible, BaseCollapsibleContent, BaseCollapsibleTrigger };
diff --git a/resources/js/common/components/AchievementAvatar/AchievementAvatar.test.tsx b/resources/js/common/components/AchievementAvatar/AchievementAvatar.test.tsx
index 82998c83da..eb0803f14e 100644
--- a/resources/js/common/components/AchievementAvatar/AchievementAvatar.test.tsx
+++ b/resources/js/common/components/AchievementAvatar/AchievementAvatar.test.tsx
@@ -150,19 +150,6 @@ describe('Component: AchievementAvatar', () => {
     expect(screen.getByText(/sublabel content/i)).toBeVisible();
   });
 
-  it('given showLabel is false with sublabelSlot, does not show the title text', () => {
-    // ARRANGE
-    const achievement = createAchievement();
-
-    render(
-      <AchievementAvatar {...achievement} showLabel={false} sublabelSlot={<span>Sublabel</span>} />,
-    );
-
-    // ASSERT
-    expect(screen.queryByText(achievement.title)).not.toBeInTheDocument();
-    expect(screen.getByText(/sublabel/i)).toBeVisible();
-  });
-
   it('given showHardcoreUnlockBorder is false, applies the correct gap spacing', () => {
     // ARRANGE
     const achievement = createAchievement();
@@ -187,4 +174,90 @@ describe('Component: AchievementAvatar', () => {
     const imgEl = screen.getByRole('img');
     expect(imgEl).not.toHaveClass('outline-2');
   });
+
+  it('given the variant is base, applies the correct classes', () => {
+    // ARRANGE
+    const achievement = createAchievement();
+
+    // ACT
+    render(<AchievementAvatar {...achievement} variant="base" />);
+
+    // ASSERT
+    const containerEl = screen.getByTestId('ach-avatar-root');
+    expect(containerEl).toHaveClass('flex max-w-fit items-center');
+    expect(containerEl).not.toHaveClass('inline-block min-h-[26px]');
+  });
+
+  it('given the variant is inline, applies the correct classes', () => {
+    // ARRANGE
+    const achievement = createAchievement();
+
+    // ACT
+    render(<AchievementAvatar {...achievement} variant="inline" />);
+
+    // ASSERT
+    const containerEl = screen.getByTestId('ach-avatar-root');
+    expect(containerEl).toHaveClass('inline-block min-h-[26px]');
+    expect(containerEl).not.toHaveClass('flex max-w-fit items-center');
+  });
+
+  it('given showLabel is false but the image should be shown, only renders the badge image with a link', () => {
+    // ARRANGE
+    const achievement = createAchievement({
+      badgeUnlockedUrl: 'https://example.com/badge.png',
+    });
+
+    // ACT
+    render(<AchievementAvatar {...achievement} showLabel={false} showImage={true} />);
+
+    // ASSERT
+    const anchorEl = screen.getByRole('link');
+    const imgEl = screen.getByRole('img');
+
+    expect(screen.queryByText(achievement.title)).not.toBeInTheDocument();
+    expect(anchorEl).toBeVisible();
+    expect(imgEl).toBeVisible();
+    expect(anchorEl).toContainElement(imgEl);
+  });
+
+  it('given title is undefined but showLabel is true, does not render a title link', () => {
+    // ARRANGE
+    const achievement = createAchievement({
+      title: undefined,
+    });
+
+    // ACT
+    render(<AchievementAvatar {...achievement} showLabel={true} />);
+
+    // ASSERT
+    expect(screen.queryByRole('link')).not.toBeInTheDocument();
+  });
+
+  it('given badgeUnlockedUrl is undefined, does not render an image even if showImage is true', () => {
+    // ARRANGE
+    const achievement = createAchievement({
+      badgeUnlockedUrl: undefined,
+    });
+
+    // ACT
+    render(<AchievementAvatar {...achievement} showImage={true} />);
+
+    // ASSERT
+    expect(screen.queryByRole('img')).not.toBeInTheDocument();
+  });
+
+  it('given sublabelSlot exists but title is undefined, only renders the sublabel content with a flex column wrapper', () => {
+    // ARRANGE
+    const achievement = createAchievement({
+      title: undefined,
+    });
+
+    // ACT
+    render(<AchievementAvatar {...achievement} sublabelSlot={<span>Sublabel content</span>} />);
+
+    // ASSERT
+    const sublabelEl = screen.getByText(/sublabel content/i);
+    expect(sublabelEl.parentElement).toHaveClass('flex flex-col');
+    expect(screen.queryByRole('link')).not.toBeInTheDocument();
+  });
 });
diff --git a/resources/js/common/components/AchievementAvatar/AchievementAvatar.tsx b/resources/js/common/components/AchievementAvatar/AchievementAvatar.tsx
index 2cd9e130b1..da85e8ba97 100644
--- a/resources/js/common/components/AchievementAvatar/AchievementAvatar.tsx
+++ b/resources/js/common/components/AchievementAvatar/AchievementAvatar.tsx
@@ -13,10 +13,11 @@ type AchievementAvatarProps = BaseAvatarProps &
     showHardcoreUnlockBorder?: boolean;
     showPointsInTitle?: boolean;
     sublabelSlot?: ReactNode;
+    variant?: 'base' | 'inline';
   };
 
 export const AchievementAvatar: FC<AchievementAvatarProps> = ({
-  badgeUnlockedUrl,
+  badgeUnlockedUrl, // see TODO above
   id,
   imgClassName,
   points,
@@ -24,10 +25,11 @@ export const AchievementAvatar: FC<AchievementAvatarProps> = ({
   title,
   hasTooltip = true,
   showHardcoreUnlockBorder = true,
-  showPointsInTitle = false,
   showImage = true,
   showLabel = true,
+  showPointsInTitle = false,
   size = 32,
+  variant = 'base',
 }) => {
   const { cardTooltipProps } = useCardTooltip({ dynamicType: 'achievement', dynamicId: id });
 
@@ -36,39 +38,49 @@ export const AchievementAvatar: FC<AchievementAvatarProps> = ({
     titleLabel = `${title} (${points ?? 0})`;
   }
 
-  const achievementLink = (label: React.ReactNode) => (
+  const achievementLink = (children: React.ReactNode) => (
     <a
       href={route('achievement.show', { achievement: id })}
       className="max-w-fit"
       {...(hasTooltip ? cardTooltipProps : undefined)}
     >
-      {label}
+      {children}
     </a>
   );
 
+  if (!showLabel && showImage && badgeUnlockedUrl) {
+    return achievementLink(
+      <AchievementBadge
+        badgeUrl={badgeUnlockedUrl}
+        title={title}
+        size={size}
+        showHardcoreUnlockBorder={showHardcoreUnlockBorder}
+        variant={variant}
+        imgClassName={imgClassName}
+      />,
+    );
+  }
+
   return (
     <div
-      className={cn('flex max-w-fit items-center', showHardcoreUnlockBorder ? 'gap-2.5' : 'gap-2')}
+      data-testid="ach-avatar-root"
+      className={cn(
+        variant === 'base' ? 'flex max-w-fit items-center' : null,
+        variant === 'inline' ? 'inline-block min-h-[26px]' : null,
+
+        showHardcoreUnlockBorder ? 'gap-2.5' : 'gap-2',
+      )}
     >
-      {showImage
-        ? achievementLink(
-            <img
-              loading="lazy"
-              decoding="async"
-              width={size}
-              height={size}
-              src={badgeUnlockedUrl}
-              alt={title ?? 'Achievement'}
-              className={cn(
-                'rounded-sm',
-                showHardcoreUnlockBorder
-                  ? 'rounded-[1px] outline outline-2 outline-offset-1 outline-[gold] light:outline-amber-500'
-                  : null,
-                imgClassName,
-              )}
-            />,
-          )
-        : null}
+      {showImage && badgeUnlockedUrl ? (
+        <AchievementBadge
+          badgeUrl={badgeUnlockedUrl}
+          title={title}
+          size={size}
+          showHardcoreUnlockBorder={showHardcoreUnlockBorder}
+          variant={variant}
+          imgClassName={imgClassName}
+        />
+      ) : null}
 
       {sublabelSlot ? (
         <div className="flex flex-col">
@@ -81,3 +93,38 @@ export const AchievementAvatar: FC<AchievementAvatarProps> = ({
     </div>
   );
 };
+
+type AchievementBadgeProps = Partial<AchievementAvatarProps> & {
+  badgeUrl: string;
+};
+
+const AchievementBadge: FC<AchievementBadgeProps> = ({
+  badgeUrl,
+  title,
+  size,
+  showHardcoreUnlockBorder,
+  variant,
+  imgClassName,
+}) => {
+  return (
+    <img
+      loading="lazy"
+      decoding="async"
+      width={size}
+      height={size}
+      src={badgeUrl}
+      alt={title ?? 'Achievement'}
+      className={cn(
+        'rounded-sm',
+
+        showHardcoreUnlockBorder
+          ? 'rounded-[1px] outline outline-2 outline-offset-1 outline-[gold] light:outline-amber-500'
+          : null,
+
+        variant === 'inline' ? 'mr-1.5' : null,
+
+        imgClassName,
+      )}
+    />
+  );
+};
diff --git a/resources/js/common/components/ForumBreadcrumbs/ForumBreadcrumbs.test.tsx b/resources/js/common/components/ForumBreadcrumbs/ForumBreadcrumbs.test.tsx
index 1758366048..bc984a2d15 100644
--- a/resources/js/common/components/ForumBreadcrumbs/ForumBreadcrumbs.test.tsx
+++ b/resources/js/common/components/ForumBreadcrumbs/ForumBreadcrumbs.test.tsx
@@ -1,5 +1,6 @@
 import i18n from '@/i18n-client';
 import { render, screen } from '@/test';
+import { createForum, createForumCategory, createForumTopic } from '@/test/factories';
 
 import { ForumBreadcrumbs } from './ForumBreadcrumbs';
 
@@ -33,4 +34,40 @@ describe('Component: ForumBreadcrumbs', () => {
     expect(activeLinkEl).toHaveAttribute('aria-disabled', 'true');
     expect(activeLinkEl).toHaveAttribute('aria-current', 'page');
   });
+
+  it('given a category, has a link to the category', () => {
+    // ARRANGE
+    const category = createForumCategory({ title: 'Category' });
+
+    render(<ForumBreadcrumbs forumCategory={category} t_currentPageLabel={i18n.t('Edit Post')} />);
+
+    // ASSERT
+    const categoryEl = screen.getByRole('link', { name: /category/i });
+    expect(categoryEl).toBeVisible();
+    expect(categoryEl).toHaveAttribute('href', `/forum.php?c=${category.id}`);
+  });
+
+  it('given a forum, has a link to the forum', () => {
+    // ARRANGE
+    const forum = createForum({ title: 'Chit Chat' });
+
+    render(<ForumBreadcrumbs forum={forum} t_currentPageLabel={i18n.t('Edit Post')} />);
+
+    // ASSERT
+    const forumEl = screen.getByRole('link', { name: /chit chat/i });
+    expect(forumEl).toBeVisible();
+    expect(forumEl).toHaveAttribute('href', `/viewforum.php?f=${forum.id}`);
+  });
+
+  it('given a topic, has a link to the topic', () => {
+    // ARRANGE
+    const topic = createForumTopic({ title: 'Dragon Quest III' });
+
+    render(<ForumBreadcrumbs forumTopic={topic} t_currentPageLabel={i18n.t('Edit Post')} />);
+
+    // ASSERT
+    const topicEl = screen.getByRole('link', { name: /dragon quest iii/i });
+    expect(topicEl).toBeVisible();
+    expect(topicEl).toHaveAttribute('href', `/viewtopic.php?t=${topic.id}`);
+  });
 });
diff --git a/resources/js/common/components/ForumBreadcrumbs/ForumBreadcrumbs.tsx b/resources/js/common/components/ForumBreadcrumbs/ForumBreadcrumbs.tsx
index b2317c222d..69972ff585 100644
--- a/resources/js/common/components/ForumBreadcrumbs/ForumBreadcrumbs.tsx
+++ b/resources/js/common/components/ForumBreadcrumbs/ForumBreadcrumbs.tsx
@@ -12,12 +12,20 @@ import {
   BaseBreadcrumbSeparator,
 } from '../+vendor/BaseBreadcrumb';
 
-// TODO support ForumCategory and Forum
 interface ForumBreadcrumbsProps {
   t_currentPageLabel: TranslatedString;
+
+  forum?: App.Data.Forum | null;
+  forumCategory?: App.Data.ForumCategory | null;
+  forumTopic?: App.Data.ForumTopic | null;
 }
 
-export const ForumBreadcrumbs: FC<ForumBreadcrumbsProps> = ({ t_currentPageLabel }) => {
+export const ForumBreadcrumbs: FC<ForumBreadcrumbsProps> = ({
+  forum,
+  forumCategory,
+  forumTopic,
+  t_currentPageLabel,
+}) => {
   const { t } = useTranslation();
 
   return (
@@ -28,6 +36,39 @@ export const ForumBreadcrumbs: FC<ForumBreadcrumbsProps> = ({ t_currentPageLabel
             <BaseBreadcrumbLink href="/forum.php">{t('Forum Index')}</BaseBreadcrumbLink>
           </BaseBreadcrumbItem>
 
+          {forumCategory ? (
+            <>
+              <BaseBreadcrumbSeparator />
+              <BaseBreadcrumbItem aria-label={forumCategory.title}>
+                <BaseBreadcrumbLink href={`/forum.php?c=${forumCategory.id}`}>
+                  {forumCategory.title}
+                </BaseBreadcrumbLink>
+              </BaseBreadcrumbItem>
+            </>
+          ) : null}
+
+          {forum ? (
+            <>
+              <BaseBreadcrumbSeparator />
+              <BaseBreadcrumbItem aria-label={forum.title}>
+                <BaseBreadcrumbLink href={`/viewforum.php?f=${forum.id}`}>
+                  {forum.title}
+                </BaseBreadcrumbLink>
+              </BaseBreadcrumbItem>
+            </>
+          ) : null}
+
+          {forumTopic ? (
+            <>
+              <BaseBreadcrumbSeparator />
+              <BaseBreadcrumbItem aria-label={forumTopic.title}>
+                <BaseBreadcrumbLink href={`/viewtopic.php?t=${forumTopic.id}`}>
+                  {forumTopic.title}
+                </BaseBreadcrumbLink>
+              </BaseBreadcrumbItem>
+            </>
+          ) : null}
+
           <BaseBreadcrumbSeparator />
 
           <BaseBreadcrumbItem aria-label={t_currentPageLabel}>
diff --git a/resources/js/common/components/GameAvatar/GameAvatar.test.tsx b/resources/js/common/components/GameAvatar/GameAvatar.test.tsx
index 31e3cff959..1fd478c46a 100644
--- a/resources/js/common/components/GameAvatar/GameAvatar.test.tsx
+++ b/resources/js/common/components/GameAvatar/GameAvatar.test.tsx
@@ -1,6 +1,6 @@
 import { createAuthenticatedUser } from '@/common/models';
 import { render, screen } from '@/test';
-import { createGame } from '@/test/factories';
+import { createGame, createSystem } from '@/test/factories';
 
 import { GameAvatar } from './GameAvatar';
 
@@ -159,4 +159,38 @@ describe('Component: GameAvatar', () => {
     expect(screen.queryByRole('link')).not.toBeInTheDocument();
     expect(screen.getByText(/sonic the hedgehog/i)).toBeVisible();
   });
+
+  it('given showSystemInTitle is true, includes the system name in the game title', () => {
+    // ARRANGE
+    const system = createSystem({ id: 1, name: 'Sega Genesis', nameShort: 'MD' });
+    const game = createGame({ system, title: 'Sonic the Hedgehog' });
+
+    render(<GameAvatar {...game} showSystemInTitle={true} />);
+
+    // ASSERT
+    expect(screen.getByText('Sonic the Hedgehog (Sega Genesis)')).toBeVisible();
+  });
+
+  it('given the variant is base, applies correct classes', () => {
+    // ARRANGE
+    const game = createGame();
+
+    render(<GameAvatar {...game} variant="base" />);
+
+    // ASSERT
+    const wrapperEl = screen.getByRole('link');
+    expect(wrapperEl).toHaveClass('flex', 'max-w-fit', 'items-center', 'gap-2');
+  });
+
+  it('given the variant is inline, applies correct classes', () => {
+    // ARRANGE
+    const game = createGame();
+
+    render(<GameAvatar {...game} variant="inline" />);
+
+    // ASSERT
+    const wrapperEl = screen.getByRole('link');
+    expect(wrapperEl).toHaveClass('ml-0.5', 'mt-0.5', 'inline-block', 'min-h-7', 'gap-2');
+    expect(screen.getByRole('img')).toHaveClass('mr-1.5');
+  });
 });
diff --git a/resources/js/common/components/GameAvatar/GameAvatar.tsx b/resources/js/common/components/GameAvatar/GameAvatar.tsx
index 15119e5871..340a0c3553 100644
--- a/resources/js/common/components/GameAvatar/GameAvatar.tsx
+++ b/resources/js/common/components/GameAvatar/GameAvatar.tsx
@@ -18,6 +18,8 @@ type GameAvatarProps = BaseAvatarProps &
     shouldGlow?: boolean;
     showHoverCardProgressForUsername?: string;
     showSystemChip?: boolean;
+    showSystemInTitle?: boolean;
+    variant?: 'base' | 'inline';
     wrapperClassName?: string;
   };
 
@@ -36,8 +38,10 @@ export const GameAvatar: FC<GameAvatarProps> = ({
   showLabel = true,
   shouldLink = true,
   showSystemChip = false,
+  showSystemInTitle = false,
   size = 32,
   hasTooltip = true,
+  variant = 'base',
 }) => {
   const { auth } = usePageProps();
 
@@ -49,10 +53,16 @@ export const GameAvatar: FC<GameAvatarProps> = ({
 
   const Wrapper = shouldLink ? 'a' : 'div';
 
+  const gameTitle = showSystemInTitle ? `${title} (${system?.name})` : title;
+
   return (
     <Wrapper
       href={shouldLink ? route('game.show', { game: id }) : undefined}
-      className={cn('flex max-w-fit items-center gap-2', wrapperClassName)}
+      className={cn(
+        variant === 'base' ? 'flex max-w-fit items-center gap-2' : null,
+        variant === 'inline' ? 'ml-0.5 mt-0.5 inline-block min-h-7 gap-2' : null,
+        wrapperClassName,
+      )}
       {...(hasTooltip && shouldLink ? cardTooltipProps : undefined)}
     >
       {showImage ? (
@@ -67,14 +77,19 @@ export const GameAvatar: FC<GameAvatarProps> = ({
               height={size}
               src={badgeUrl}
               alt={title ?? 'Game'}
-              className="rounded-sm"
+              className={cn('rounded-sm', variant === 'inline' ? 'mr-1.5' : null)}
             />
           )}
         </>
       ) : null}
 
-      <div className="flex flex-col gap-0.5">
-        {title && showLabel ? <GameTitle title={title} className={gameTitleClassName} /> : null}
+      <div
+        className={cn(
+          variant === 'base' ? 'flex flex-col gap-0.5' : null,
+          variant === 'inline' ? 'inline-block' : null,
+        )}
+      >
+        {title && showLabel ? <GameTitle title={gameTitle} className={gameTitleClassName} /> : null}
 
         {system && showSystemChip ? (
           <SystemChip {...system} className="text-text hover:text-text" />
diff --git a/resources/js/common/components/RecentPostsCards/RecentPostsCards.test.tsx b/resources/js/common/components/RecentPostsCards/RecentPostsCards.test.tsx
index dc589f97e8..23a4f693dc 100644
--- a/resources/js/common/components/RecentPostsCards/RecentPostsCards.test.tsx
+++ b/resources/js/common/components/RecentPostsCards/RecentPostsCards.test.tsx
@@ -41,7 +41,7 @@ describe('Component: RecentPostsCards', () => {
 
     // ASSERT
     expect(screen.getByText(recentActiveForumTopic.title)).toBeVisible();
-    expect(screen.getByText(recentActiveForumTopic.latestComment.body)).toBeVisible();
+    expect(screen.getByText(recentActiveForumTopic.latestComment!.body)).toBeVisible();
   });
 
   it('shows user metadata by default', () => {
diff --git a/resources/js/common/components/RecentPostsTable/RecentPostsTable.test.tsx b/resources/js/common/components/RecentPostsTable/RecentPostsTable.test.tsx
index e0abd01214..a9ed4f7799 100644
--- a/resources/js/common/components/RecentPostsTable/RecentPostsTable.test.tsx
+++ b/resources/js/common/components/RecentPostsTable/RecentPostsTable.test.tsx
@@ -41,7 +41,7 @@ describe('Component: RecentPostsTable', () => {
 
     // ASSERT
     expect(screen.getByText(recentActiveForumTopic.title)).toBeVisible();
-    expect(screen.getByText(recentActiveForumTopic.latestComment.body)).toBeVisible();
+    expect(screen.getByText(recentActiveForumTopic.latestComment!.body)).toBeVisible();
   });
 
   it('displays metadata if there are multiple recent posts on the topic', () => {
diff --git a/resources/js/common/components/UserAvatar/UserAvatar.tsx b/resources/js/common/components/UserAvatar/UserAvatar.tsx
index e1bab893bf..6e227a7620 100644
--- a/resources/js/common/components/UserAvatar/UserAvatar.tsx
+++ b/resources/js/common/components/UserAvatar/UserAvatar.tsx
@@ -10,6 +10,7 @@ type UserAvatarProps = BaseAvatarProps &
   };
 
 export const UserAvatar: FC<UserAvatarProps> = ({
+  avatarUrl,
   displayName,
   deletedAt,
   imgClassName,
@@ -36,7 +37,7 @@ export const UserAvatar: FC<UserAvatarProps> = ({
           decoding="async"
           width={size}
           height={size}
-          src={`http://media.retroachievements.org/UserPic/${displayName}.png`}
+          src={avatarUrl}
           alt={displayName ?? 'Deleted User'}
           className={cn('rounded-sm', imgClassName)}
         />
diff --git a/resources/js/common/utils/+vendor/bbobLineBreakPlugin.ts b/resources/js/common/utils/+vendor/bbobLineBreakPlugin.ts
new file mode 100644
index 0000000000..4715784ce9
--- /dev/null
+++ b/resources/js/common/utils/+vendor/bbobLineBreakPlugin.ts
@@ -0,0 +1,131 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+
+/**
+ * @see https://github.com/JiLiZART/BBob/issues/125#issuecomment-1774257527
+ */
+
+/**
+ * Plugin that converts line breaks to `<br/>` tags.
+ * Multiple consecutive newlines will be folded down to maximum of 2.
+ * After spoiler tags, only one br tag is allowed.
+ */
+
+const isEOL = (el: string) => el === '\n';
+
+/**
+ * Checks if input is an object.
+ * @param value input
+ * @returns if value is an object
+ */
+const isObj = (value: any) => typeof value === 'object';
+
+/**
+ * Creates a br tag node.
+ * @returns br tag object
+ */
+const createBrNode = () => ({
+  tag: 'br',
+  content: null,
+});
+
+/**
+ * Checks if node is a br tag.
+ * @param node node to check
+ * @returns true if node is a br tag
+ */
+const isBrTag = (node: any): boolean => {
+  return isObj(node) && node.tag === 'br';
+};
+
+/**
+ * Checks if a node is a spoiler block based on its structure.
+ * @param node node to check
+ * @returns true if node is a spoiler block
+ */
+const isSpoilerBlock = (node: any): boolean => {
+  return isObj(node) && 'start' in node && 'end' in node && 'content' in node;
+};
+
+/**
+ * Process a sequence of nodes to handle br tags appropriately.
+ * @param nodes array of nodes to process
+ * @returns processed array with correct br tag placement
+ */
+const processNodeSequence = (nodes: any[]): any[] => {
+  const result: any[] = [];
+  let consecutiveBrs = 0;
+  let afterSpoiler = false;
+
+  for (let i = 0; i < nodes.length; i++) {
+    const node = nodes[i];
+    const isNewline = isEOL(node);
+
+    // Handle non-newline nodes
+    if (!isNewline) {
+      if (isSpoilerBlock(node)) {
+        // Process spoiler content
+        if (node.content) {
+          node.content = Array.isArray(node.content)
+            ? processNodeSequence(node.content)
+            : node.content;
+        }
+        result.push(node);
+        afterSpoiler = true;
+        consecutiveBrs = 0;
+        continue;
+      }
+
+      // Reset counters for regular content
+      if (!isBrTag(node)) {
+        afterSpoiler = false;
+        consecutiveBrs = 0;
+      }
+
+      result.push(node);
+      continue;
+    }
+
+    // Handle newlines
+    if (afterSpoiler) {
+      // Only allow one br after spoiler
+      if (consecutiveBrs === 0) {
+        result.push(createBrNode(), '\n');
+        consecutiveBrs++;
+      }
+    } else {
+      // Allow up to two brs elsewhere
+      if (consecutiveBrs < 2) {
+        result.push(createBrNode(), '\n');
+        consecutiveBrs++;
+      }
+    }
+  }
+
+  return result;
+};
+
+/**
+ * Converts `\n` to `<br/>` self closing tag. Supply this as the last plugin in the preset lists.
+ * Limits consecutive newlines to 2, except after spoiler blocks where limit is 1.
+ *
+ * @example converts all line breaks to br
+ * ```ts
+ * const output = bbob([preset(), lineBreakPlugin()]).process(input, {render}).html
+ * ```
+ * @example will not convert line breaks inside [nobr]
+ * ```ts
+ * const nobr = (node: TagNode) => {return { disableLineBreakConversion: true, content: node.content }}; \\ tag in preset
+ * ...
+ * const output = bbob([preset(), lineBreakPlugin()]).process(input, {render}).html
+ * ```
+ * @returns plugin to be used in BBob process
+ */
+export const bbobLineBreakPlugin = () => {
+  return (tree: any): any => {
+    if (Array.isArray(tree)) {
+      return processNodeSequence(tree);
+    }
+
+    return tree;
+  };
+};
diff --git a/resources/js/common/utils/generatedAppConstants.ts b/resources/js/common/utils/generatedAppConstants.ts
index 91b516c339..9b16642200 100644
--- a/resources/js/common/utils/generatedAppConstants.ts
+++ b/resources/js/common/utils/generatedAppConstants.ts
@@ -195,6 +195,15 @@ export const UserGameListType = {
 } as const;
 
 
+export const TicketState = {
+    Closed: 0,
+    Open: 1,
+    Resolved: 2,
+    Request: 3,
+    REASON_DEMOTED: 'Demoted',
+} as const;
+
+
 export const ClaimSetType = {
     NewSet: 0,
     Revision: 1,
diff --git a/resources/js/tall-stack/utils/getStringByteCount.test.ts b/resources/js/common/utils/getStringByteCount.test.ts
similarity index 100%
rename from resources/js/tall-stack/utils/getStringByteCount.test.ts
rename to resources/js/common/utils/getStringByteCount.test.ts
diff --git a/resources/js/tall-stack/utils/getStringByteCount.ts b/resources/js/common/utils/getStringByteCount.ts
similarity index 100%
rename from resources/js/tall-stack/utils/getStringByteCount.ts
rename to resources/js/common/utils/getStringByteCount.ts
diff --git a/resources/js/features/forums/components/EditPostMainRoot/EditPostForm/EditPostForm.test.tsx b/resources/js/features/forums/components/EditPostMainRoot/EditPostForm/EditPostForm.test.tsx
new file mode 100644
index 0000000000..0b7be37882
--- /dev/null
+++ b/resources/js/features/forums/components/EditPostMainRoot/EditPostForm/EditPostForm.test.tsx
@@ -0,0 +1,165 @@
+import userEvent from '@testing-library/user-event';
+import axios from 'axios';
+
+import { render, screen, waitFor } from '@/test';
+import { createForumTopic, createForumTopicComment } from '@/test/factories';
+
+import { EditPostForm } from './EditPostForm';
+
+// Prevent the autosize textarea from flooding the console with errors.
+window.scrollTo = vi.fn();
+
+describe('Component: EditPostForm', () => {
+  it('renders without crashing', () => {
+    // ARRANGE
+    const { container } = render(<EditPostForm onPreview={vi.fn()} />, {
+      pageProps: {
+        forumTopicComment: createForumTopicComment(),
+      },
+    });
+
+    // ASSERT
+    expect(container).toBeTruthy();
+  });
+
+  it('given the user has not entered any text, disables the preview and submit buttons', () => {
+    // ARRANGE
+    render(<EditPostForm onPreview={vi.fn()} />, {
+      pageProps: {
+        forumTopicComment: createForumTopicComment({ body: '' }),
+      },
+    });
+
+    // ASSERT
+    expect(screen.getByRole('button', { name: /preview/i })).toBeDisabled();
+    expect(screen.getByRole('button', { name: /submit/i })).toBeDisabled();
+  });
+
+  it('given the user enters text, enables the preview and submit buttons', async () => {
+    // ARRANGE
+    render(<EditPostForm onPreview={vi.fn()} />, {
+      pageProps: {
+        forumTopicComment: createForumTopicComment({ body: '' }),
+      },
+    });
+
+    // ACT
+    await userEvent.type(screen.getByPlaceholderText(/don't ask for links/i), 'Hello world');
+
+    // ASSERT
+    expect(screen.getByRole('button', { name: /preview/i })).toBeEnabled();
+    expect(screen.getByRole('button', { name: /submit/i })).toBeEnabled();
+  });
+
+  it('given the user clicks preview, calls the preview callback with the current text', async () => {
+    // ARRANGE
+    const previewSpy = vi.fn();
+
+    render(<EditPostForm onPreview={previewSpy} />, {
+      pageProps: {
+        forumTopicComment: createForumTopicComment({ body: '' }),
+      },
+    });
+
+    // ACT
+    await userEvent.type(screen.getByPlaceholderText(/don't ask for links/i), 'Hello world');
+    await userEvent.click(screen.getByRole('button', { name: /preview/i }));
+
+    // ASSERT
+    expect(previewSpy).toHaveBeenCalledWith('Hello world');
+  });
+
+  it('given the user submits the form, makes the correct PATCH call to the server', async () => {
+    // ARRANGE
+    const comment = createForumTopicComment({ id: 123, body: 'Initial text' });
+    const patchSpy = vi.spyOn(axios, 'patch').mockResolvedValueOnce({ data: {} });
+
+    render(<EditPostForm onPreview={vi.fn()} />, {
+      pageProps: {
+        forumTopicComment: comment,
+      },
+    });
+
+    // ACT
+    await userEvent.clear(screen.getByPlaceholderText(/don't ask for links/i));
+    await userEvent.type(screen.getByPlaceholderText(/don't ask for links/i), 'Updated text');
+    await userEvent.click(screen.getByRole('button', { name: /submit/i }));
+
+    // ASSERT
+    await waitFor(() => {
+      expect(patchSpy).toHaveBeenCalledWith(
+        route('api.forum-topic-comment.update', { comment: comment.id }),
+        { body: 'Updated text' },
+      );
+    });
+  });
+
+  it('given the form submission succeeds, shows a success message', async () => {
+    // ARRANGE
+    const mockLocationAssign = vi.fn();
+    Object.defineProperty(window, 'location', {
+      value: { assign: mockLocationAssign },
+      writable: true,
+    });
+
+    const comment = createForumTopicComment({
+      id: 123,
+      body: 'Initial text',
+      forumTopic: createForumTopic({ id: 1 }),
+    });
+
+    vi.spyOn(axios, 'patch').mockResolvedValueOnce({ data: {} });
+
+    render(<EditPostForm onPreview={vi.fn()} />, {
+      pageProps: {
+        forumTopicComment: comment,
+      },
+    });
+
+    // ACT
+    await userEvent.clear(screen.getByPlaceholderText(/don't ask for links/i));
+    await userEvent.type(screen.getByPlaceholderText(/don't ask for links/i), 'Updated text');
+    await userEvent.click(screen.getByRole('button', { name: /submit/i }));
+
+    // ASSERT
+    await waitFor(() => {
+      expect(screen.getAllByText(/updated/i)[0]).toBeVisible();
+    });
+  });
+
+  it('given the form submission fails, shows an error message', async () => {
+    // ARRANGE
+    const comment = createForumTopicComment({ id: 123, body: 'Initial text' });
+    vi.spyOn(axios, 'patch').mockRejectedValueOnce(new Error('API Error'));
+
+    render(<EditPostForm onPreview={vi.fn()} />, {
+      pageProps: {
+        forumTopicComment: comment,
+      },
+    });
+
+    // ACT
+    await userEvent.clear(screen.getByPlaceholderText(/don't ask for links/i));
+    await userEvent.type(screen.getByPlaceholderText(/don't ask for links/i), 'Updated text');
+    await userEvent.click(screen.getByRole('button', { name: /submit/i }));
+
+    // ASSERT
+    await waitFor(() => {
+      expect(screen.getByText(/something went wrong/i)).toBeVisible();
+    });
+  });
+
+  it('shows the current character count and maximum allowed characters', () => {
+    // ARRANGE
+    const comment = createForumTopicComment({ body: 'Hello' });
+
+    render(<EditPostForm onPreview={vi.fn()} />, {
+      pageProps: {
+        forumTopicComment: comment,
+      },
+    });
+
+    // ASSERT
+    expect(screen.getByText(/5.*60,000/)).toBeVisible();
+  });
+});
diff --git a/resources/js/features/forums/components/EditPostMainRoot/EditPostForm/EditPostForm.tsx b/resources/js/features/forums/components/EditPostMainRoot/EditPostForm/EditPostForm.tsx
new file mode 100644
index 0000000000..47413d7d20
--- /dev/null
+++ b/resources/js/features/forums/components/EditPostMainRoot/EditPostForm/EditPostForm.tsx
@@ -0,0 +1,84 @@
+import type { FC } from 'react';
+import { useTranslation } from 'react-i18next';
+
+import { BaseAutosizeTextarea } from '@/common/components/+vendor/BaseAutosizeTextarea';
+import { BaseButton } from '@/common/components/+vendor/BaseButton';
+import {
+  BaseFormControl,
+  BaseFormField,
+  BaseFormItem,
+  BaseFormLabel,
+  BaseFormMessage,
+  BaseFormProvider,
+} from '@/common/components/+vendor/BaseForm';
+import { usePageProps } from '@/common/hooks/usePageProps';
+import { getStringByteCount } from '@/common/utils/getStringByteCount';
+
+import { ShortcodePanel } from '../../ShortcodePanel';
+import { useEditPostForm } from './useEditPostForm';
+
+interface EditPostFormProps {
+  onPreview: (content: string) => void;
+}
+
+export const EditPostForm: FC<EditPostFormProps> = ({ onPreview }) => {
+  const { forumTopicComment } = usePageProps<App.Data.EditForumTopicCommentPageProps>();
+
+  const { t } = useTranslation();
+
+  const { form, mutation, onSubmit } = useEditPostForm(forumTopicComment, {
+    body: forumTopicComment.body,
+  });
+
+  const [body] = form.watch(['body']);
+
+  return (
+    <BaseFormProvider {...form}>
+      <form onSubmit={form.handleSubmit(onSubmit)}>
+        <div className="flex flex-col gap-3">
+          <ShortcodePanel />
+
+          <BaseFormField
+            control={form.control}
+            name="body"
+            render={({ field }) => (
+              <BaseFormItem>
+                <BaseFormLabel className="sr-only">{t('Body')}</BaseFormLabel>
+                <BaseFormControl>
+                  <BaseAutosizeTextarea
+                    className="min-h-[308px] p-3"
+                    placeholder="Don't ask for links to copyrighted ROMs. Don't share links to copyrighted ROMs."
+                    minHeight={308}
+                    maxLength={60_000}
+                    {...field}
+                  />
+                </BaseFormControl>
+
+                <BaseFormMessage />
+              </BaseFormItem>
+            )}
+          />
+
+          <div className="flex w-full justify-between gap-3">
+            <span className="text-neutral-400">
+              {t('{{current, number}} / {{max, number}}', {
+                current: getStringByteCount(body),
+                max: 60_000,
+              })}
+            </span>
+
+            <div className="flex gap-3">
+              <BaseButton type="button" onClick={() => onPreview(body)} disabled={!body.length}>
+                {t('Preview')}
+              </BaseButton>
+
+              <BaseButton type="submit" disabled={!body.length || mutation.isPending}>
+                {t('Submit')}
+              </BaseButton>
+            </div>
+          </div>
+        </div>
+      </form>
+    </BaseFormProvider>
+  );
+};
diff --git a/resources/js/features/forums/components/EditPostMainRoot/EditPostForm/index.ts b/resources/js/features/forums/components/EditPostMainRoot/EditPostForm/index.ts
new file mode 100644
index 0000000000..4074bc8dff
--- /dev/null
+++ b/resources/js/features/forums/components/EditPostMainRoot/EditPostForm/index.ts
@@ -0,0 +1 @@
+export * from './EditPostForm';
diff --git a/resources/js/features/forums/components/EditPostMainRoot/EditPostForm/useEditPostForm.ts b/resources/js/features/forums/components/EditPostMainRoot/EditPostForm/useEditPostForm.ts
new file mode 100644
index 0000000000..6d60c2e64c
--- /dev/null
+++ b/resources/js/features/forums/components/EditPostMainRoot/EditPostForm/useEditPostForm.ts
@@ -0,0 +1,54 @@
+import { zodResolver } from '@hookform/resolvers/zod';
+import { useMutation } from '@tanstack/react-query';
+import axios from 'axios';
+import { useForm } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
+import { z } from 'zod';
+
+import { toastMessage } from '@/common/components/+vendor/BaseToaster';
+import { preProcessShortcodesInBody } from '@/features/forums/utils/preProcessShortcodesInBody';
+
+const formSchema = z.object({
+  body: z.string().min(1).max(60_000),
+});
+
+type FormValues = z.infer<typeof formSchema>;
+
+export function useEditPostForm(comment: App.Data.ForumTopicComment, initialValues: FormValues) {
+  const { t } = useTranslation();
+
+  const form = useForm<FormValues>({
+    resolver: zodResolver(formSchema),
+    defaultValues: initialValues,
+  });
+
+  const mutation = useMutation({
+    mutationFn: (payload: FormValues) => {
+      const normalizedPayload: FormValues = {
+        ...payload,
+        body: preProcessShortcodesInBody(payload.body),
+      };
+
+      return axios.patch(
+        route('api.forum-topic-comment.update', { comment: comment.id }),
+        normalizedPayload,
+      );
+    },
+  });
+
+  const onSubmit = (formValues: FormValues) => {
+    toastMessage.promise(mutation.mutateAsync(formValues), {
+      loading: t('Updating...'),
+      success: () => {
+        window.location.assign(
+          `/viewtopic.php?t=${comment.forumTopic!.id}&c=${comment.id}#${comment.id}`,
+        );
+
+        return t('Updated.');
+      },
+      error: t('Something went wrong.'),
+    });
+  };
+
+  return { form, mutation, onSubmit };
+}
diff --git a/resources/js/features/forums/components/EditPostMainRoot/EditPostMainRoot.test.tsx b/resources/js/features/forums/components/EditPostMainRoot/EditPostMainRoot.test.tsx
new file mode 100644
index 0000000000..5d2b767e4d
--- /dev/null
+++ b/resources/js/features/forums/components/EditPostMainRoot/EditPostMainRoot.test.tsx
@@ -0,0 +1,92 @@
+import { render, screen } from '@/test';
+import {
+  createForum,
+  createForumCategory,
+  createForumTopic,
+  createForumTopicComment,
+} from '@/test/factories';
+
+import * as UseForumPostPreviewModule from '../../hooks/useForumPostPreview';
+import { EditPostMainRoot } from './EditPostMainRoot';
+
+// Prevent the autosize textarea from flooding the console with errors.
+window.scrollTo = vi.fn();
+
+describe('Component: EditPostMainRoot', () => {
+  it('renders without crashing', () => {
+    // ARRANGE
+    const category = createForumCategory();
+    const forum = createForum({ category });
+    const forumTopic = createForumTopic({ forum });
+    const forumTopicComment = createForumTopicComment({ forumTopic });
+
+    const { container } = render<App.Data.EditForumTopicCommentPageProps>(<EditPostMainRoot />, {
+      pageProps: {
+        forumTopicComment,
+      },
+    });
+
+    // ASSERT
+    expect(container).toBeTruthy();
+  });
+
+  it('displays breadcrumbs', () => {
+    // ARRANGE
+    const category = createForumCategory();
+    const forum = createForum({ category });
+    const forumTopic = createForumTopic({ forum });
+    const forumTopicComment = createForumTopicComment({ forumTopic });
+
+    render<App.Data.EditForumTopicCommentPageProps>(<EditPostMainRoot />, {
+      pageProps: {
+        forumTopicComment,
+      },
+    });
+
+    // ASSERT
+    expect(screen.getByRole('navigation', { name: /breadcrumb/i })).toBeVisible();
+    expect(screen.getByRole('link', { name: /forum index/i })).toBeVisible();
+  });
+
+  it('does not render the preview card when preview content is not present', () => {
+    // ARRANGE
+    const category = createForumCategory();
+    const forum = createForum({ category });
+    const forumTopic = createForumTopic({ forum });
+    const forumTopicComment = createForumTopicComment({ forumTopic });
+
+    render<App.Data.EditForumTopicCommentPageProps>(<EditPostMainRoot />, {
+      pageProps: {
+        forumTopicComment,
+      },
+    });
+
+    // ASSERT
+    expect(screen.queryByTestId('preview-content')).not.toBeInTheDocument();
+  });
+
+  it('given preview content exists, displays it', () => {
+    // ARRANGE
+    const category = createForumCategory();
+    const forum = createForum({ category });
+    const forumTopic = createForumTopic({ forum });
+    const forumTopicComment = createForumTopicComment({ forumTopic });
+
+    const mockPreviewContent = 'Test preview content.';
+
+    vi.spyOn(UseForumPostPreviewModule, 'useForumPostPreview').mockReturnValue({
+      initiatePreview: vi.fn(),
+      previewContent: mockPreviewContent,
+    } as any);
+
+    render<App.Data.EditForumTopicCommentPageProps>(<EditPostMainRoot />, {
+      pageProps: {
+        forumTopicComment,
+      },
+    });
+
+    // ASSERT
+    expect(screen.getByTestId('preview-content')).toBeVisible();
+    expect(screen.getByText(mockPreviewContent)).toBeVisible();
+  });
+});
diff --git a/resources/js/features/forums/components/EditPostMainRoot/EditPostMainRoot.tsx b/resources/js/features/forums/components/EditPostMainRoot/EditPostMainRoot.tsx
new file mode 100644
index 0000000000..b0f3317b37
--- /dev/null
+++ b/resources/js/features/forums/components/EditPostMainRoot/EditPostMainRoot.tsx
@@ -0,0 +1,36 @@
+import { type FC, memo } from 'react';
+import { useTranslation } from 'react-i18next';
+
+import { ForumBreadcrumbs } from '@/common/components/ForumBreadcrumbs';
+import { usePageProps } from '@/common/hooks/usePageProps';
+
+import { useForumPostPreview } from '../../hooks/useForumPostPreview';
+import { ForumPostCard } from '../ForumPostCard';
+import { EditPostForm } from './EditPostForm';
+
+export const EditPostMainRoot: FC = memo(() => {
+  const { forumTopicComment } = usePageProps<App.Data.EditForumTopicCommentPageProps>();
+
+  const { t } = useTranslation();
+
+  const { initiatePreview, previewContent } = useForumPostPreview();
+
+  return (
+    <div>
+      <ForumBreadcrumbs
+        forum={forumTopicComment.forumTopic!.forum}
+        forumCategory={forumTopicComment.forumTopic!.forum!.category}
+        forumTopic={forumTopicComment.forumTopic}
+        t_currentPageLabel={t('Edit Post')}
+      />
+
+      <EditPostForm onPreview={initiatePreview} />
+
+      {previewContent ? (
+        <div data-testid="preview-content" className="mt-4">
+          <ForumPostCard body={previewContent} />
+        </div>
+      ) : null}
+    </div>
+  );
+});
diff --git a/resources/js/features/forums/components/EditPostMainRoot/index.ts b/resources/js/features/forums/components/EditPostMainRoot/index.ts
new file mode 100644
index 0000000000..3ce2588aca
--- /dev/null
+++ b/resources/js/features/forums/components/EditPostMainRoot/index.ts
@@ -0,0 +1 @@
+export * from './EditPostMainRoot';
diff --git a/resources/js/features/forums/components/ForumPostCard/ForumPostCard.test.tsx b/resources/js/features/forums/components/ForumPostCard/ForumPostCard.test.tsx
new file mode 100644
index 0000000000..9a3296d86c
--- /dev/null
+++ b/resources/js/features/forums/components/ForumPostCard/ForumPostCard.test.tsx
@@ -0,0 +1,26 @@
+import { render, screen } from '@/test';
+
+import { ForumPostCard } from './ForumPostCard';
+
+describe('Component: ForumPostCard', () => {
+  it('renders without crashing', () => {
+    // ARRANGE
+    const { container } = render(<ForumPostCard body="Test content" />);
+
+    // ASSERT
+    expect(container).toBeTruthy();
+  });
+
+  it('given a post body, renders it correctly', () => {
+    // ARRANGE
+    const body = '[b]Breaking News[/b] this is a test case';
+    render(<ForumPostCard body={body} />);
+
+    // ASSERT
+    const boldEl = screen.getByText(/breaking news/i);
+    expect(boldEl.nodeName).toEqual('SPAN');
+    expect(boldEl).toHaveStyle('font-weight: bold');
+
+    expect(screen.getByText(/this is a test case/i)).toBeVisible();
+  });
+});
diff --git a/resources/js/features/forums/components/ForumPostCard/ForumPostCard.tsx b/resources/js/features/forums/components/ForumPostCard/ForumPostCard.tsx
new file mode 100644
index 0000000000..3c680eff39
--- /dev/null
+++ b/resources/js/features/forums/components/ForumPostCard/ForumPostCard.tsx
@@ -0,0 +1,34 @@
+import type { FC } from 'react';
+import { useTranslation } from 'react-i18next';
+
+import { ShortcodeRenderer } from '../ShortcodeRenderer';
+
+interface ForumPostCardProps {
+  body: string;
+}
+
+export const ForumPostCard: FC<ForumPostCardProps> = ({ body }) => {
+  const { t } = useTranslation();
+
+  return (
+    <div>
+      <div className="relative my-2">
+        <div className="relative -mx-2 w-[calc(100%+16px)] rounded-lg bg-embed-highlight px-1 py-2 even:bg-embed sm:mx-0 sm:w-full lg:flex">
+          <div className="border-neutral-700 px-0.5 lg:border-b-0 lg:border-r lg:py-2">
+            <div className="flex w-full items-center lg:w-44 lg:flex-col lg:text-center" />
+          </div>
+
+          <div className="w-full py-2 lg:px-6 lg:py-2" style={{ wordBreak: 'break-word' }}>
+            <div className="mb-4 flex w-full flex-col items-start justify-between gap-x-2 gap-y-2 sm:flex-row lg:mb-3">
+              <p className="text-2xs leading-[14px] text-neutral-400">{t('Preview')}</p>
+            </div>
+
+            <div>
+              <ShortcodeRenderer body={body} />
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+};
diff --git a/resources/js/features/forums/components/ForumPostCard/index.ts b/resources/js/features/forums/components/ForumPostCard/index.ts
new file mode 100644
index 0000000000..8c0063c6fd
--- /dev/null
+++ b/resources/js/features/forums/components/ForumPostCard/index.ts
@@ -0,0 +1 @@
+export * from './ForumPostCard';
diff --git a/resources/js/features/forums/components/ShortcodePanel/ShortcodePanel.test.tsx b/resources/js/features/forums/components/ShortcodePanel/ShortcodePanel.test.tsx
new file mode 100644
index 0000000000..5738df8b9f
--- /dev/null
+++ b/resources/js/features/forums/components/ShortcodePanel/ShortcodePanel.test.tsx
@@ -0,0 +1,124 @@
+import userEvent from '@testing-library/user-event';
+import { FormProvider, useForm } from 'react-hook-form';
+
+import { BaseFormControl, BaseFormField, BaseFormItem } from '@/common/components/+vendor/BaseForm';
+import { render, screen } from '@/test';
+
+import { ShortcodePanel } from './ShortcodePanel';
+
+const TestWrapper = () => {
+  const form = useForm({
+    defaultValues: {
+      body: 'Hello world.',
+    },
+  });
+
+  return (
+    <FormProvider {...form}>
+      <form>
+        <ShortcodePanel />
+        <BaseFormField
+          control={form.control}
+          name="body"
+          render={({ field }) => (
+            <BaseFormItem>
+              <BaseFormControl>
+                <textarea {...field} />
+              </BaseFormControl>
+            </BaseFormItem>
+          )}
+        />
+      </form>
+    </FormProvider>
+  );
+};
+
+describe('Component: ShortcodePanel', () => {
+  it('renders without crashing', () => {
+    // ARRANGE
+    const { container } = render(<TestWrapper />);
+
+    // ASSERT
+    expect(container).toBeTruthy();
+  });
+
+  it('given the user clicks the bold button, wraps the selected text with the bold shortcode', async () => {
+    // ARRANGE
+    render(<TestWrapper />);
+
+    const textarea = screen.getByRole('textbox') as HTMLTextAreaElement;
+    textarea.focus();
+    textarea.selectionStart = 6;
+    textarea.selectionEnd = 11;
+
+    // ACT
+    await userEvent.click(screen.getByRole('button', { name: /bold/i }));
+
+    // ASSERT
+    expect(textarea.value).toEqual('Hello [b]world[/b].');
+  });
+
+  it('given there is no selected text, injects an empty shortcode at cursor position', async () => {
+    // ARRANGE
+    render(<TestWrapper />);
+
+    const textarea = screen.getByRole('textbox') as HTMLTextAreaElement;
+    textarea.focus();
+    textarea.selectionStart = 5;
+    textarea.selectionEnd = 5;
+
+    // ACT
+    await userEvent.click(screen.getByRole('button', { name: /bold/i }));
+
+    // ASSERT
+    expect(textarea.value).toEqual('Hello[b][/b] world.');
+  });
+
+  it('given the user clicks the link button, wraps the selected text with the url shortcode', async () => {
+    // ARRANGE
+    render(<TestWrapper />);
+
+    const textarea = screen.getByRole('textbox') as HTMLTextAreaElement;
+    textarea.focus();
+    textarea.selectionStart = 6;
+    textarea.selectionEnd = 11;
+
+    // ACT
+    await userEvent.click(screen.getByRole('button', { name: /link/i }));
+
+    // ASSERT
+    expect(textarea.value).toEqual('Hello [url=world].');
+  });
+
+  it('given the user clicks the image button, wraps the selected text with the img shortcode', async () => {
+    // ARRANGE
+    render(<TestWrapper />);
+
+    const textarea = screen.getByRole('textbox') as HTMLTextAreaElement;
+    textarea.focus();
+    textarea.selectionStart = 6;
+    textarea.selectionEnd = 11;
+
+    // ACT
+    await userEvent.click(screen.getByRole('button', { name: /image/i }));
+
+    // ASSERT
+    expect(textarea.value).toEqual('Hello [img=world].');
+  });
+
+  it('maintains focus on the textarea after injecting a shortcode', async () => {
+    // ARRANGE
+    render(<TestWrapper />);
+
+    const textarea = screen.getByRole('textbox') as HTMLTextAreaElement;
+    textarea.focus();
+    textarea.selectionStart = 6;
+    textarea.selectionEnd = 11;
+
+    // ACT
+    await userEvent.click(screen.getByRole('button', { name: /bold/i }));
+
+    // ASSERT
+    expect(textarea).toHaveFocus();
+  });
+});
diff --git a/resources/js/features/forums/components/ShortcodePanel/ShortcodePanel.tsx b/resources/js/features/forums/components/ShortcodePanel/ShortcodePanel.tsx
new file mode 100644
index 0000000000..3b94751174
--- /dev/null
+++ b/resources/js/features/forums/components/ShortcodePanel/ShortcodePanel.tsx
@@ -0,0 +1,36 @@
+import type { FC } from 'react';
+
+import { BaseButton } from '@/common/components/+vendor/BaseButton';
+import {
+  BaseTooltip,
+  BaseTooltipContent,
+  BaseTooltipTrigger,
+} from '@/common/components/+vendor/BaseTooltip';
+
+import { useShortcodeInjection } from '../../hooks/useShortcodeInjection';
+import { useShortcodesList } from '../../hooks/useShortcodesList';
+
+export const ShortcodePanel: FC = () => {
+  const { shortcodesList } = useShortcodesList();
+
+  const { injectShortcode } = useShortcodeInjection({ fieldName: 'body' });
+
+  return (
+    <div className="w-full rounded bg-embed p-2">
+      <div className="flex flex-wrap gap-2">
+        {shortcodesList.map((shortcode) => (
+          <BaseTooltip key={shortcode.t_label}>
+            <BaseTooltipTrigger asChild>
+              <BaseButton size="sm" type="button" onClick={() => injectShortcode(shortcode)}>
+                <span className="sr-only">{shortcode.t_label}</span>
+                <shortcode.icon className="size-4" />
+              </BaseButton>
+            </BaseTooltipTrigger>
+
+            <BaseTooltipContent>{shortcode.t_label}</BaseTooltipContent>
+          </BaseTooltip>
+        ))}
+      </div>
+    </div>
+  );
+};
diff --git a/resources/js/features/forums/components/ShortcodePanel/index.ts b/resources/js/features/forums/components/ShortcodePanel/index.ts
new file mode 100644
index 0000000000..37c4912001
--- /dev/null
+++ b/resources/js/features/forums/components/ShortcodePanel/index.ts
@@ -0,0 +1 @@
+export * from './ShortcodePanel';
diff --git a/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeAch/ShortcodeAch.test.tsx b/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeAch/ShortcodeAch.test.tsx
new file mode 100644
index 0000000000..154e64229a
--- /dev/null
+++ b/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeAch/ShortcodeAch.test.tsx
@@ -0,0 +1,43 @@
+import { persistedAchievementsAtom } from '@/features/forums/state/forum.atoms';
+import { render, screen } from '@/test';
+import { createAchievement } from '@/test/factories';
+
+import { ShortcodeAch } from './ShortcodeAch';
+
+describe('Component: ShortcodeAch', () => {
+  it('renders without crashing', () => {
+    // ARRANGE
+    const { container } = render(<ShortcodeAch achievementId={1} />, {
+      jotaiAtoms: [[persistedAchievementsAtom, []]],
+    });
+
+    // ASSERT
+    expect(container).toBeTruthy();
+  });
+
+  it('given no matching achievement is found, renders nothing', () => {
+    // ARRANGE
+    const achievement = createAchievement({ id: 1 });
+
+    render(<ShortcodeAch achievementId={999} />, {
+      jotaiAtoms: [[persistedAchievementsAtom, [achievement]]],
+    });
+
+    // ASSERT
+    expect(screen.queryByTestId('achievement-embed')).not.toBeInTheDocument();
+  });
+
+  it('given a matching achievement is found, renders the achievement avatar', () => {
+    // ARRANGE
+    const achievement = createAchievement({ id: 1, title: 'Test Achievement', points: 5 });
+
+    render(<ShortcodeAch achievementId={1} />, {
+      jotaiAtoms: [[persistedAchievementsAtom, [achievement]]],
+    });
+
+    // ASSERT
+    expect(screen.getByRole('img', { name: /test achievement/i })).toBeVisible();
+    expect(screen.getAllByRole('link')[0]).toBeVisible();
+    expect(screen.getByText('Test Achievement (5)')).toBeVisible();
+  });
+});
diff --git a/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeAch/ShortcodeAch.tsx b/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeAch/ShortcodeAch.tsx
new file mode 100644
index 0000000000..0020077c78
--- /dev/null
+++ b/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeAch/ShortcodeAch.tsx
@@ -0,0 +1,33 @@
+import { useAtom } from 'jotai';
+import type { FC } from 'react';
+
+import { AchievementAvatar } from '@/common/components/AchievementAvatar';
+import { persistedAchievementsAtom } from '@/features/forums/state/forum.atoms';
+
+interface ShortcodeAchievementProps {
+  achievementId: number;
+}
+
+export const ShortcodeAch: FC<ShortcodeAchievementProps> = ({ achievementId }) => {
+  const [persistedAchievements] = useAtom(persistedAchievementsAtom);
+
+  const foundAchievement = persistedAchievements?.find(
+    (achievement) => achievement.id === achievementId,
+  );
+
+  if (!foundAchievement) {
+    return null;
+  }
+
+  return (
+    <span data-testid="achievement-embed" className="ml-0.5 inline-block">
+      <AchievementAvatar
+        {...foundAchievement}
+        size={24}
+        showHardcoreUnlockBorder={false}
+        showPointsInTitle={true}
+        variant="inline"
+      />
+    </span>
+  );
+};
diff --git a/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeAch/index.ts b/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeAch/index.ts
new file mode 100644
index 0000000000..96ef48292d
--- /dev/null
+++ b/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeAch/index.ts
@@ -0,0 +1 @@
+export * from './ShortcodeAch';
diff --git a/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeCode/ShortcodeCode.test.tsx b/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeCode/ShortcodeCode.test.tsx
new file mode 100644
index 0000000000..3d86e1a27a
--- /dev/null
+++ b/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeCode/ShortcodeCode.test.tsx
@@ -0,0 +1,47 @@
+import { render, screen } from '@/test';
+
+import { ShortcodeCode } from './ShortcodeCode';
+
+describe('Component: ShortcodeCode', () => {
+  it('renders without crashing', () => {
+    // ARRANGE
+    const { container } = render(<ShortcodeCode>test</ShortcodeCode>);
+
+    // ASSERT
+    expect(container).toBeTruthy();
+  });
+
+  it('given a simple string child, renders it inside a span with the codetags class', () => {
+    // ARRANGE
+    render(<ShortcodeCode>test content</ShortcodeCode>);
+
+    // ASSERT
+    const spanEl = screen.getByText(/test content/i);
+
+    expect(spanEl).toBeVisible();
+    expect(spanEl).toHaveClass('codetags');
+  });
+
+  it('given multiple children including a leading br element, filters out the br element', () => {
+    // ARRANGE
+    render(<ShortcodeCode>{[<br key="br" />, 'test content', ' more content']}</ShortcodeCode>);
+
+    // ASSERT
+    const spanEl = screen.getByText(/test content more content/i);
+
+    expect(spanEl).toBeVisible();
+    expect(spanEl.innerHTML).toEqual('test content more content');
+  });
+
+  it('given an array of children with no br element, renders all content with the font-mono class', () => {
+    // ARRANGE
+    render(<ShortcodeCode>{['first content', ' second content']}</ShortcodeCode>);
+
+    // ASSERT
+    const spanEl = screen.getByText(/first content second content/i);
+
+    expect(spanEl).toBeVisible();
+    expect(spanEl).toHaveClass('font-mono');
+    expect(spanEl).toHaveClass('codetags');
+  });
+});
diff --git a/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeCode/ShortcodeCode.tsx b/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeCode/ShortcodeCode.tsx
new file mode 100644
index 0000000000..55856bed36
--- /dev/null
+++ b/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeCode/ShortcodeCode.tsx
@@ -0,0 +1,22 @@
+import type { FC, ReactNode } from 'react';
+
+interface ShortcodeCodeProps {
+  children: ReactNode;
+}
+
+export const ShortcodeCode: FC<ShortcodeCodeProps> = ({ children }) => {
+  if (Array.isArray(children)) {
+    // Remove any leading newlines.
+    const processedChildren = children.filter((child, index) => {
+      if (index === 0 && typeof child === 'object' && 'type' in child && child.type === 'br') {
+        return false;
+      }
+
+      return true;
+    });
+
+    return <span className="codetags font-mono">{processedChildren}</span>;
+  }
+
+  return <span className="codetags">{children}</span>;
+};
diff --git a/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeCode/index.ts b/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeCode/index.ts
new file mode 100644
index 0000000000..3424163525
--- /dev/null
+++ b/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeCode/index.ts
@@ -0,0 +1 @@
+export * from './ShortcodeCode';
diff --git a/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeGame/ShortcodeGame.test.tsx b/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeGame/ShortcodeGame.test.tsx
new file mode 100644
index 0000000000..3f0e032ba4
--- /dev/null
+++ b/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeGame/ShortcodeGame.test.tsx
@@ -0,0 +1,42 @@
+import { persistedGamesAtom } from '@/features/forums/state/forum.atoms';
+import { render, screen } from '@/test';
+import { createGame, createSystem } from '@/test/factories';
+
+import { ShortcodeGame } from './ShortcodeGame';
+
+describe('Component: ShortcodeGame', () => {
+  it('renders without crashing', () => {
+    // ARRANGE
+    const { container } = render(<ShortcodeGame gameId={1} />, {
+      jotaiAtoms: [[persistedGamesAtom, []]],
+    });
+
+    // ASSERT
+    expect(container).toBeTruthy();
+  });
+
+  it('given the game ID is not found in persisted games, renders nothing', () => {
+    // ARRANGE
+    render(<ShortcodeGame gameId={999999} />, {
+      jotaiAtoms: [[persistedGamesAtom, [createGame({ id: 1 })]]],
+    });
+
+    // ASSERT
+    expect(screen.queryByTestId('game-embed')).not.toBeInTheDocument();
+  });
+
+  it('given the game ID is found in persisted games, renders the game avatar', () => {
+    // ARRANGE
+    const system = createSystem({ name: 'Sega Genesis', nameShort: 'MD' });
+    const game = createGame({ system, id: 1, title: 'Sonic the Hedgehog' });
+
+    render(<ShortcodeGame gameId={1} />, {
+      jotaiAtoms: [[persistedGamesAtom, [game]]],
+    });
+
+    // ASSERT
+    expect(screen.getByRole('img', { name: /sonic the hedgehog/i })).toBeVisible();
+    expect(screen.getByText(/sega genesis/i)).toBeVisible();
+    expect(screen.getByRole('link')).toBeVisible();
+  });
+});
diff --git a/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeGame/ShortcodeGame.tsx b/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeGame/ShortcodeGame.tsx
new file mode 100644
index 0000000000..e7e60f079c
--- /dev/null
+++ b/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeGame/ShortcodeGame.tsx
@@ -0,0 +1,25 @@
+import { useAtom } from 'jotai';
+import type { FC } from 'react';
+
+import { GameAvatar } from '@/common/components/GameAvatar';
+import { persistedGamesAtom } from '@/features/forums/state/forum.atoms';
+
+interface ShortcodeGameProps {
+  gameId: number;
+}
+
+export const ShortcodeGame: FC<ShortcodeGameProps> = ({ gameId }) => {
+  const [persistedGames] = useAtom(persistedGamesAtom);
+
+  const foundGame = persistedGames?.find((game) => game.id === gameId);
+
+  if (!foundGame) {
+    return null;
+  }
+
+  return (
+    <span data-testid="game-embed" className="inline">
+      <GameAvatar {...foundGame} showSystemInTitle={true} size={24} variant="inline" />
+    </span>
+  );
+};
diff --git a/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeGame/index.ts b/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeGame/index.ts
new file mode 100644
index 0000000000..bd7cf44737
--- /dev/null
+++ b/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeGame/index.ts
@@ -0,0 +1 @@
+export * from './ShortcodeGame';
diff --git a/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeImg/ShortcodeImg.test.tsx b/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeImg/ShortcodeImg.test.tsx
new file mode 100644
index 0000000000..bd4d909809
--- /dev/null
+++ b/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeImg/ShortcodeImg.test.tsx
@@ -0,0 +1,32 @@
+import { render, screen } from '@/test';
+
+import { ShortcodeImg } from './ShortcodeImg';
+
+describe('Component: ShortcodeImg', () => {
+  it('renders without crashing', () => {
+    // ARRANGE
+    const { container } = render(<ShortcodeImg src="test.jpg" />);
+
+    // ASSERT
+    expect(container).toBeTruthy();
+  });
+
+  it('given a src prop, renders an image with that source', () => {
+    // ARRANGE
+    const testSrc = 'test-image.jpg';
+    render(<ShortcodeImg src={testSrc} />);
+
+    // ASSERT
+    const imgEl = screen.getByRole('img');
+    expect(imgEl.getAttribute('src')).toEqual(testSrc);
+  });
+
+  it('given a src prop, renders with the inline-image class', () => {
+    // ARRANGE
+    render(<ShortcodeImg src="test.jpg" />);
+
+    // ASSERT
+    const imgEl = screen.getByRole('img');
+    expect(imgEl).toHaveClass('inline-image');
+  });
+});
diff --git a/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeImg/ShortcodeImg.tsx b/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeImg/ShortcodeImg.tsx
new file mode 100644
index 0000000000..a6a8266108
--- /dev/null
+++ b/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeImg/ShortcodeImg.tsx
@@ -0,0 +1,9 @@
+import type { FC } from 'react';
+
+interface ShortcodeImgProps {
+  src: string;
+}
+
+export const ShortcodeImg: FC<ShortcodeImgProps> = ({ src }) => {
+  return <img className="inline-image" src={src} />;
+};
diff --git a/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeImg/index.ts b/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeImg/index.ts
new file mode 100644
index 0000000000..8be89b8cb1
--- /dev/null
+++ b/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeImg/index.ts
@@ -0,0 +1 @@
+export * from './ShortcodeImg';
diff --git a/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeRenderer.test.tsx b/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeRenderer.test.tsx
new file mode 100644
index 0000000000..d98d845f1c
--- /dev/null
+++ b/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeRenderer.test.tsx
@@ -0,0 +1,168 @@
+import {
+  persistedAchievementsAtom,
+  persistedGamesAtom,
+  persistedTicketsAtom,
+  persistedUsersAtom,
+} from '@/features/forums/state/forum.atoms';
+import { render, screen } from '@/test';
+import {
+  createAchievement,
+  createGame,
+  createSystem,
+  createTicket,
+  createUser,
+} from '@/test/factories';
+
+import { ShortcodeRenderer } from './ShortcodeRenderer';
+
+describe('Component: ShortcodeRenderer', () => {
+  it('renders without crashing', () => {
+    // ARRANGE
+    const { container } = render(<ShortcodeRenderer body="" />);
+
+    // ASSERT
+    expect(container).toBeTruthy();
+  });
+
+  it('given a body with a URL tag, renders the URL shortcode component', () => {
+    // ARRANGE
+    const body = '[url]https://example.com[/url]';
+
+    render(<ShortcodeRenderer body={body} />);
+
+    // ASSERT
+    expect(screen.getByTestId('url-embed-https://example.com/')).toBeVisible();
+  });
+
+  it('given a body with a self-closing URL tag, renders the URL shortcode component', () => {
+    // ARRANGE
+    const body = '[url=https://example.com]';
+
+    render(<ShortcodeRenderer body={body} />);
+
+    // ASSERT
+    expect(screen.getByTestId('url-embed-https://example.com/')).toBeVisible();
+  });
+
+  it('given a body with a code tag, renders the code shortcode component', () => {
+    // ARRANGE
+    const body = '[code]this is some stuff inside code tags[/code]';
+
+    render(<ShortcodeRenderer body={body} />);
+
+    // ASSERT
+    const textEl = screen.getByText(/this is some stuff/i);
+
+    expect(textEl).toBeVisible();
+    expect(textEl.nodeName).toEqual('SPAN');
+    expect(textEl).toHaveClass('codetags');
+  });
+
+  it('given a body with a spoiler tag, renders the spoiler shortcode component', () => {
+    // ARRANGE
+    const body = '[spoiler]this is a spoiler![/spoiler]';
+
+    render(<ShortcodeRenderer body={body} />);
+
+    // ASSERT
+    expect(screen.getByRole('button', { name: /spoiler/i })).toBeVisible();
+  });
+
+  it('given a body with an img tag, renders the img shortcode component', () => {
+    // ARRANGE
+    const body = '[img]https://i.imgur.com/ov30jeD.jpg[/img]';
+
+    render(<ShortcodeRenderer body={body} />);
+
+    // ASSERT
+    const imgEl = screen.getByRole('img');
+    expect(imgEl).toBeVisible();
+    expect(imgEl).toHaveAttribute('src', 'https://i.imgur.com/ov30jeD.jpg');
+  });
+
+  it('given a body with a user tag and an unknown user, does not render a user embed', () => {
+    // ARRANGE
+    const body = '[user=Scott]';
+
+    render(<ShortcodeRenderer body={body} />, {
+      jotaiAtoms: [[persistedUsersAtom, []]],
+    });
+
+    // ASSERT
+    expect(screen.queryByTestId('user-embed')).not.toBeInTheDocument();
+  });
+
+  it('given a body with a user tag and a found persisted user, renders the user shortcode component', () => {
+    // ARRANGE
+    const body = '[user=Scott]';
+
+    render(<ShortcodeRenderer body={body} />, {
+      jotaiAtoms: [[persistedUsersAtom, [createUser({ displayName: 'Scott' })]]],
+    });
+
+    // ASSERT
+    expect(screen.getByRole('link', { name: /scott/i })).toBeVisible();
+  });
+
+  it('given a body with a game tag and a found persisted game, renders the game shortcode component', () => {
+    // ARRANGE
+    const system = createSystem({ name: 'Sega Genesis', nameShort: 'MD' });
+    const game = createGame({ system, id: 1, title: 'Sonic the Hedgehog' });
+
+    const body = '[game=1]';
+
+    render(<ShortcodeRenderer body={body} />, {
+      jotaiAtoms: [[persistedGamesAtom, [game]]],
+    });
+
+    // ASSERT
+    expect(screen.getByRole('link')).toBeVisible();
+    expect(screen.getByRole('img')).toBeVisible();
+    expect(screen.getByText('Sonic the Hedgehog (Sega Genesis)')).toBeVisible();
+  });
+
+  it('given a body with an achievement tag and a found persisted achievement, renders the ach shortcode component', () => {
+    // ARRANGE
+    const achievement = createAchievement({ title: 'That Was Easy!', points: 5, id: 9 });
+
+    const body = '[ach=9]';
+
+    render(<ShortcodeRenderer body={body} />, {
+      jotaiAtoms: [[persistedAchievementsAtom, [achievement]]],
+    });
+
+    // ASSERT
+    expect(screen.getByRole('link')).toBeVisible();
+    expect(screen.getByRole('img')).toBeVisible();
+    expect(screen.getByText('That Was Easy! (5)')).toBeVisible();
+  });
+
+  it('given a body with a ticket tag and a found persisted ticket, renders the ticket shortcode component', () => {
+    // ARRANGE
+    const ticket = createTicket({
+      id: 12345,
+      ticketable: createAchievement({ title: 'That Was Easy!' }),
+    });
+
+    const body = '[ticket=12345]';
+
+    render(<ShortcodeRenderer body={body} />, {
+      jotaiAtoms: [[persistedTicketsAtom, [ticket]]],
+    });
+
+    // ASSERT
+    expect(screen.getByRole('link')).toBeVisible();
+    expect(screen.getByRole('img')).toBeVisible();
+    expect(screen.getByText('Ticket #12345')).toBeVisible();
+  });
+
+  it('given a body with a video tag, displays the video', () => {
+    // ARRANGE
+    const body = '[video]https://www.youtube.com/watch?v=7oiNxHvNJk0[/video]';
+
+    render(<ShortcodeRenderer body={body} />);
+
+    // ASSERT
+    expect(screen.getByTestId('video-embed')).toBeVisible();
+  });
+});
diff --git a/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeRenderer.tsx b/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeRenderer.tsx
new file mode 100644
index 0000000000..6be2c96307
--- /dev/null
+++ b/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeRenderer.tsx
@@ -0,0 +1,128 @@
+import presetReact from '@bbob/preset-react';
+import BBCode from '@bbob/react';
+import type { FC } from 'react';
+
+import { bbobLineBreakPlugin } from '@/common/utils/+vendor/bbobLineBreakPlugin';
+
+import { postProcessShortcodesInBody } from '../../utils/postProcessShortcodesInBody';
+import { ShortcodeAch } from './ShortcodeAch';
+import { ShortcodeCode } from './ShortcodeCode';
+import { ShortcodeGame } from './ShortcodeGame';
+import { ShortcodeImg } from './ShortcodeImg';
+import { ShortcodeSpoiler } from './ShortcodeSpoiler';
+import { ShortcodeTicket } from './ShortcodeTicket';
+import { ShortcodeUrl } from './ShortcodeUrl';
+import { ShortcodeUser } from './ShortcodeUser';
+import { ShortcodeVideo } from './ShortcodeVideo';
+
+const retroachievementsPreset = presetReact.extend((tags) => ({
+  ...tags,
+
+  url: (node) => {
+    let href = '';
+    if (node.attrs && Object.values(node.attrs).length) {
+      href = Object.values(node.attrs as Record<string, string>)[0];
+    } else {
+      href = (node.content as string[]).join();
+    }
+
+    return {
+      tag: ShortcodeUrl,
+      attrs: {
+        href,
+        children: (node.content as string[]).join(),
+      },
+      content: node.content,
+    };
+  },
+
+  code: (node) => ({
+    ...node,
+    tag: ShortcodeCode,
+  }),
+
+  spoiler: (node) => ({
+    ...node,
+    tag: ShortcodeSpoiler,
+  }),
+
+  img: (node) => {
+    return {
+      tag: ShortcodeImg,
+      attrs: {
+        src: node.content,
+      },
+    };
+  },
+
+  user: (node) => ({
+    tag: ShortcodeUser,
+    attrs: {
+      displayName: (node.content as string[]).join(),
+    },
+  }),
+
+  game: (node) => ({
+    tag: ShortcodeGame,
+    attrs: {
+      gameId: Number((node.content as string[]).join()),
+    },
+  }),
+
+  ach: (node) => ({
+    tag: ShortcodeAch,
+    attrs: {
+      achievementId: Number((node.content as string[]).join()),
+    },
+  }),
+
+  ticket: (node) => ({
+    tag: ShortcodeTicket,
+    attrs: {
+      ticketId: Number((node.content as string[]).join()),
+    },
+  }),
+
+  video: (node) => {
+    return {
+      tag: ShortcodeVideo,
+      attrs: {
+        src: (node.content as string[]).join(),
+      },
+    };
+  },
+}));
+
+const plugins = [retroachievementsPreset(), bbobLineBreakPlugin()];
+
+interface ShortcodeRendererProps {
+  body: string;
+}
+
+export const ShortcodeRenderer: FC<ShortcodeRendererProps> = ({ body }) => {
+  return (
+    <BBCode
+      container="div"
+      plugins={plugins}
+      options={{
+        onlyAllowTags: [
+          'b',
+          'i',
+          'u',
+          's',
+          'code',
+          'spoiler',
+          'img',
+          'url',
+          'user',
+          'ach',
+          'game',
+          'ticket',
+          'video',
+        ],
+      }}
+    >
+      {postProcessShortcodesInBody(body)}
+    </BBCode>
+  );
+};
diff --git a/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeSpoiler/ShortcodeSpoiler.test.tsx b/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeSpoiler/ShortcodeSpoiler.test.tsx
new file mode 100644
index 0000000000..3506f004f1
--- /dev/null
+++ b/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeSpoiler/ShortcodeSpoiler.test.tsx
@@ -0,0 +1,34 @@
+import userEvent from '@testing-library/user-event';
+
+import { render, screen } from '@/test';
+
+import { ShortcodeSpoiler } from './ShortcodeSpoiler';
+
+describe('Component: ShortcodeSpoiler', () => {
+  it('renders without crashing', () => {
+    // ARRANGE
+    const { container } = render(<ShortcodeSpoiler>Test content</ShortcodeSpoiler>);
+
+    // ASSERT
+    expect(container).toBeTruthy();
+  });
+
+  it('given the component is rendered, shows a button labeled Spoiler', () => {
+    // ARRANGE
+    render(<ShortcodeSpoiler>Test content</ShortcodeSpoiler>);
+
+    // ASSERT
+    expect(screen.getByRole('button', { name: /spoiler/i })).toBeVisible();
+  });
+
+  it('given the user clicks the Spoiler button, reveals the hidden content', async () => {
+    // ARRANGE
+    render(<ShortcodeSpoiler>Hidden spoiler content</ShortcodeSpoiler>);
+
+    // ACT
+    await userEvent.click(screen.getByRole('button', { name: /spoiler/i }));
+
+    // ASSERT
+    expect(screen.getByText(/hidden spoiler content/i)).toBeVisible();
+  });
+});
diff --git a/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeSpoiler/ShortcodeSpoiler.tsx b/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeSpoiler/ShortcodeSpoiler.tsx
new file mode 100644
index 0000000000..f210c242dd
--- /dev/null
+++ b/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeSpoiler/ShortcodeSpoiler.tsx
@@ -0,0 +1,29 @@
+import type { FC, ReactNode } from 'react';
+import { useTranslation } from 'react-i18next';
+
+import { BaseButton } from '@/common/components/+vendor/BaseButton';
+import {
+  BaseCollapsible,
+  BaseCollapsibleContent,
+  BaseCollapsibleTrigger,
+} from '@/common/components/+vendor/BaseCollapsible';
+
+interface ShortcodeSpoilerProps {
+  children: ReactNode;
+}
+
+export const ShortcodeSpoiler: FC<ShortcodeSpoilerProps> = ({ children }) => {
+  const { t } = useTranslation();
+
+  return (
+    <BaseCollapsible>
+      <BaseCollapsibleTrigger asChild>
+        <BaseButton size="sm">{t('Spoiler')}</BaseButton>
+      </BaseCollapsibleTrigger>
+
+      <BaseCollapsibleContent className="rounded border border-dashed border-text-muted px-3 py-2">
+        {children}
+      </BaseCollapsibleContent>
+    </BaseCollapsible>
+  );
+};
diff --git a/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeSpoiler/index.ts b/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeSpoiler/index.ts
new file mode 100644
index 0000000000..d2651ecf46
--- /dev/null
+++ b/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeSpoiler/index.ts
@@ -0,0 +1 @@
+export * from './ShortcodeSpoiler';
diff --git a/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeTicket/ShortcodeTicket.test.tsx b/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeTicket/ShortcodeTicket.test.tsx
new file mode 100644
index 0000000000..20a2d27213
--- /dev/null
+++ b/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeTicket/ShortcodeTicket.test.tsx
@@ -0,0 +1,190 @@
+import { TicketState } from '@/common/utils/generatedAppConstants';
+import { persistedTicketsAtom } from '@/features/forums/state/forum.atoms';
+import { render, screen } from '@/test';
+import { createAchievement, createTicket } from '@/test/factories';
+
+import { ShortcodeTicket } from './ShortcodeTicket';
+
+describe('Component: ShortcodeTicket', () => {
+  it('renders without crashing', () => {
+    // ARRANGE
+    const ticket = createTicket({
+      id: 123,
+      ticketableType: 'achievement',
+      state: TicketState.Open,
+      ticketable: createAchievement({ badgeUnlockedUrl: 'test-badge.png' }),
+    });
+
+    const { container } = render(<ShortcodeTicket ticketId={123} />, {
+      jotaiAtoms: [[persistedTicketsAtom, [ticket]]],
+    });
+
+    // ASSERT
+    expect(container).toBeTruthy();
+  });
+
+  it('given no matching ticket is found, renders nothing', () => {
+    // ARRANGE
+    const ticket = createTicket({
+      id: 123,
+      ticketableType: 'achievement',
+      state: TicketState.Open,
+      ticketable: createAchievement({ badgeUnlockedUrl: 'test-badge.png' }),
+    });
+
+    // !! using id 999
+    render(<ShortcodeTicket ticketId={999} />, {
+      jotaiAtoms: [[persistedTicketsAtom, [ticket]]],
+    });
+
+    // ASSERT
+    expect(screen.queryByTestId('achievement-ticket-embed')).not.toBeInTheDocument();
+  });
+
+  it('given an achievement ticket is found, renders it properly', () => {
+    // ARRANGE
+    const ticket = createTicket({
+      id: 123,
+      ticketableType: 'achievement',
+      state: TicketState.Open,
+      ticketable: createAchievement({ badgeUnlockedUrl: 'test-badge.png' }),
+    });
+
+    render(<ShortcodeTicket ticketId={123} />, {
+      jotaiAtoms: [[persistedTicketsAtom, [ticket]]],
+    });
+
+    // ASSERT
+    const linkEl = screen.getByRole('link');
+    expect(linkEl).toBeVisible();
+    expect(linkEl).toHaveAttribute('href', expect.stringContaining('ticket.show'));
+
+    const imageEl = screen.getByRole('img');
+    expect(imageEl).toHaveAttribute('src', 'test-badge.png');
+    expect(screen.getByText(/ticket #123/i)).toBeVisible();
+  });
+
+  it('given a non-achievement ticket is found, renders nothing', () => {
+    // ARRANGE
+    const ticket = createTicket({
+      id: 123,
+      ticketableType: 'leaderboard',
+      state: TicketState.Open,
+      ticketable: createAchievement({ badgeUnlockedUrl: 'test-badge.png' }),
+    });
+
+    render(<ShortcodeTicket ticketId={123} />, {
+      jotaiAtoms: [[persistedTicketsAtom, [ticket]]],
+    });
+
+    // ASSERT
+    expect(screen.queryByTestId('achievement-ticket-embed')).not.toBeInTheDocument();
+    expect(screen.queryByTestId('leaderboard-ticket-embed')).not.toBeInTheDocument();
+  });
+
+  it('given an open ticket, applies green border styling', () => {
+    // ARRANGE
+    const ticket = createTicket({
+      id: 123,
+      ticketableType: 'achievement',
+      state: TicketState.Open, // !!
+      ticketable: createAchievement({ badgeUnlockedUrl: 'test-badge.png' }),
+    });
+
+    render(<ShortcodeTicket ticketId={123} />, {
+      jotaiAtoms: [[persistedTicketsAtom, [ticket]]],
+    });
+
+    // ASSERT
+    expect(screen.getByRole('link')).toHaveClass('border-green-600');
+  });
+
+  it('given a request ticket, applies green border styling', () => {
+    // ARRANGE
+    const ticket = createTicket({
+      id: 123,
+      ticketableType: 'achievement',
+      state: TicketState.Request, // !!
+      ticketable: createAchievement({ badgeUnlockedUrl: 'test-badge.png' }),
+    });
+
+    render(<ShortcodeTicket ticketId={123} />, {
+      jotaiAtoms: [[persistedTicketsAtom, [ticket]]],
+    });
+
+    // ASSERT
+    expect(screen.getByRole('link')).toHaveClass('border-green-600');
+  });
+
+  it('given a closed ticket, applies red border styling', () => {
+    // ARRANGE
+    const ticket = createTicket({
+      id: 123,
+      ticketableType: 'achievement',
+      state: TicketState.Closed, // !!
+      ticketable: createAchievement({ badgeUnlockedUrl: 'test-badge.png' }),
+    });
+
+    render(<ShortcodeTicket ticketId={123} />, {
+      jotaiAtoms: [[persistedTicketsAtom, [ticket]]],
+    });
+
+    // ASSERT
+    expect(screen.getByRole('link')).toHaveClass('border-red-600');
+  });
+
+  it('given a resolved ticket, applies red border styling', () => {
+    // ARRANGE
+    const ticket = createTicket({
+      id: 123,
+      ticketableType: 'achievement',
+      state: TicketState.Resolved, // !!
+      ticketable: createAchievement({ badgeUnlockedUrl: 'test-badge.png' }),
+    });
+
+    render(<ShortcodeTicket ticketId={123} />, {
+      jotaiAtoms: [[persistedTicketsAtom, [ticket]]],
+    });
+
+    // ASSERT
+    expect(screen.getByRole('link')).toHaveClass('border-red-600');
+  });
+
+  it('given an unknown ticket state, applies no border styling', () => {
+    // ARRANGE
+    const ticket = createTicket({
+      id: 123,
+      ticketableType: 'achievement',
+      state: -1, // !!
+      ticketable: createAchievement({ badgeUnlockedUrl: 'test-badge.png' }),
+    });
+
+    render(<ShortcodeTicket ticketId={123} />, {
+      jotaiAtoms: [[persistedTicketsAtom, [ticket]]],
+    });
+
+    // ASSERT
+    const linkEl = screen.getByRole('link');
+    expect(linkEl).not.toHaveClass('border-green-600');
+    expect(linkEl).not.toHaveClass('border-red-600');
+  });
+
+  it('given an undefined ticket state, applies no border styling', () => {
+    // ARRANGE
+    const ticket = createTicket({
+      id: 123,
+      ticketableType: 'achievement',
+      state: undefined, // !!
+      ticketable: createAchievement({ badgeUnlockedUrl: 'test-badge.png' }),
+    });
+
+    render(<ShortcodeTicket ticketId={123} />, {
+      jotaiAtoms: [[persistedTicketsAtom, [ticket]]],
+    });
+
+    // ASSERT
+    const linkEl = screen.getByRole('link');
+    expect(linkEl).not.toHaveClass('border-green-600');
+    expect(linkEl).not.toHaveClass('border-red-600');
+  });
+});
diff --git a/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeTicket/ShortcodeTicket.tsx b/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeTicket/ShortcodeTicket.tsx
new file mode 100644
index 0000000000..2bf9781766
--- /dev/null
+++ b/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeTicket/ShortcodeTicket.tsx
@@ -0,0 +1,70 @@
+import { useAtom } from 'jotai';
+import type { FC } from 'react';
+import { useTranslation } from 'react-i18next';
+
+import { useCardTooltip } from '@/common/hooks/useCardTooltip';
+import { cn } from '@/common/utils/cn';
+import { TicketState } from '@/common/utils/generatedAppConstants';
+
+import { persistedTicketsAtom } from '../../../state/forum.atoms';
+
+interface ShortcodeTicketProps {
+  ticketId: number;
+}
+
+export const ShortcodeTicket: FC<ShortcodeTicketProps> = ({ ticketId }) => {
+  const [persistedTickets] = useAtom(persistedTicketsAtom);
+
+  const { t } = useTranslation();
+
+  const foundTicket = persistedTickets?.find((ticket) => ticket.id === ticketId);
+
+  const { cardTooltipProps } = useCardTooltip({ dynamicType: 'ticket', dynamicId: ticketId });
+
+  if (!foundTicket) {
+    return null;
+  }
+
+  if (
+    foundTicket.ticketableType === 'achievement' &&
+    foundTicket.ticketable &&
+    'badgeUnlockedUrl' in foundTicket.ticketable
+  ) {
+    return (
+      <a
+        data-testid="achievement-ticket-embed"
+        href={route('ticket.show', { ticket: ticketId })}
+        {...cardTooltipProps}
+        className={cn('inline-block rounded', getTicketStateClassName(foundTicket.state ?? -1))}
+      >
+        <img
+          loading="lazy"
+          decoding="async"
+          width={28}
+          height={28}
+          src={foundTicket.ticketable.badgeUnlockedUrl}
+          alt={'ticket'}
+          className="rounded-sm border-2 border-transparent"
+        />
+
+        <span className="px-1">{t('Ticket #{{ticketId}}', { ticketId })}</span>
+      </a>
+    );
+  }
+
+  // Other ticketable types aren't supported yet.
+  return null;
+};
+
+function getTicketStateClassName(ticketState: number): string {
+  // Match the state to return appropriate class name.
+  if (ticketState === TicketState.Open || ticketState === TicketState.Request) {
+    return 'border border-green-600';
+  }
+
+  if (ticketState === TicketState.Closed || ticketState === TicketState.Resolved) {
+    return 'border border-red-600';
+  }
+
+  return '';
+}
diff --git a/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeTicket/index.ts b/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeTicket/index.ts
new file mode 100644
index 0000000000..ed46d01d0c
--- /dev/null
+++ b/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeTicket/index.ts
@@ -0,0 +1 @@
+export * from './ShortcodeTicket';
diff --git a/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeUrl/ShortcodeUrl.test.tsx b/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeUrl/ShortcodeUrl.test.tsx
new file mode 100644
index 0000000000..dba7686796
--- /dev/null
+++ b/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeUrl/ShortcodeUrl.test.tsx
@@ -0,0 +1,69 @@
+import { render, screen } from '@/test';
+
+import { ShortcodeUrl } from './ShortcodeUrl';
+
+describe('Component: ShortcodeUrl', () => {
+  it('renders without crashing', () => {
+    // ARRANGE
+    const { container } = render(<ShortcodeUrl href="https://example.com">Click me</ShortcodeUrl>);
+
+    // ASSERT
+    expect(container).toBeTruthy();
+  });
+
+  it('given an internal RetroAchievements URL, renders a direct link', () => {
+    // ARRANGE
+    render(
+      <ShortcodeUrl href="https://retroachievements.org/user/Scott/progress">
+        Progress Page
+      </ShortcodeUrl>,
+    );
+
+    // ASSERT
+    const link = screen.getByText(/progress page/i);
+    expect(link).toBeVisible();
+    expect(link.getAttribute('href')).toEqual('https://retroachievements.org/user/Scott/progress');
+    expect(link.getAttribute('rel')).toBeNull();
+  });
+
+  it('given an external URL, renders a link through the redirect route', () => {
+    // ARRANGE
+    render(<ShortcodeUrl href="https://example.com">External link</ShortcodeUrl>);
+
+    // ASSERT
+    const link = screen.getByText(/external link/i);
+    expect(link).toBeVisible();
+    expect(link.getAttribute('href')).toContain(route('redirect'));
+    expect(link.getAttribute('rel')).toEqual('nofollow noopener');
+  });
+
+  it('given an HTTP internal URL, upgrades it to HTTPS', () => {
+    // ARRANGE
+    render(
+      <ShortcodeUrl href="http://retroachievements.org/game/1/top-achievers">
+        HTTP link
+      </ShortcodeUrl>,
+    );
+
+    // ASSERT
+    expect(
+      screen.getByTestId(`url-embed-https://retroachievements.org/game/1/top-achievers`),
+    ).toBeVisible();
+  });
+
+  it('given an invalid URL, attempts to normalize it', () => {
+    // ARRANGE
+    render(<ShortcodeUrl href="///example.com">Invalid URL</ShortcodeUrl>);
+
+    // ASSERT
+    expect(screen.getByTestId(`url-embed-https://example.com/`)).toBeVisible();
+  });
+
+  it('given an empty URL, renders an empty href', () => {
+    // ARRANGE
+    render(<ShortcodeUrl href="">Empty link</ShortcodeUrl>);
+
+    // ASSERT
+    expect(screen.getByTestId(`url-embed-`)).toBeVisible();
+  });
+});
diff --git a/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeUrl/ShortcodeUrl.tsx b/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeUrl/ShortcodeUrl.tsx
new file mode 100644
index 0000000000..40b2d637ab
--- /dev/null
+++ b/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeUrl/ShortcodeUrl.tsx
@@ -0,0 +1,41 @@
+import type { FC, ReactNode } from 'react';
+
+interface ShortcodeUrlProps {
+  children: ReactNode;
+  href: string;
+}
+
+export const ShortcodeUrl: FC<ShortcodeUrlProps> = ({ children, href }) => {
+  const normalizedHref = normalizeUrl(href);
+
+  // For external URLs, use the redirect route.
+  const finalUrl = normalizedHref.includes('retroachievements.org')
+    ? normalizedHref
+    : route('redirect', { url: normalizedHref });
+
+  return (
+    <a
+      href={finalUrl}
+      data-testid={`url-embed-${normalizedHref}`}
+      className="inline-block"
+      rel={!normalizedHref.includes('retroachievements.org') ? 'nofollow noopener' : undefined}
+    >
+      {children}
+    </a>
+  );
+};
+
+function normalizeUrl(href: string): string {
+  if (!href) {
+    return '';
+  }
+
+  const url = new URL(href.startsWith('http') ? href : `https://${href}`);
+
+  // Force HTTPS for internal links.
+  if (url.hostname.endsWith('retroachievements.org') && url.protocol === 'http:') {
+    url.protocol = 'https:';
+  }
+
+  return url.toString();
+}
diff --git a/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeUrl/index.ts b/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeUrl/index.ts
new file mode 100644
index 0000000000..4b50e489c8
--- /dev/null
+++ b/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeUrl/index.ts
@@ -0,0 +1 @@
+export * from './ShortcodeUrl';
diff --git a/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeUser/ShortcodeUser.test.tsx b/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeUser/ShortcodeUser.test.tsx
new file mode 100644
index 0000000000..d04175a8ae
--- /dev/null
+++ b/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeUser/ShortcodeUser.test.tsx
@@ -0,0 +1,41 @@
+import { persistedUsersAtom } from '@/features/forums/state/forum.atoms';
+import { render, screen } from '@/test';
+import { createUser } from '@/test/factories';
+
+import { ShortcodeUser } from './ShortcodeUser';
+
+describe('Component: ShortcodeUser', () => {
+  it('renders without crashing', () => {
+    // ARRANGE
+    const { container } = render(<ShortcodeUser displayName="test-user" />, {
+      jotaiAtoms: [[persistedUsersAtom, []]],
+    });
+
+    // ASSERT
+    expect(container).toBeTruthy();
+  });
+
+  it('given the display name matches a persisted user, renders the user avatar', () => {
+    // ARRANGE
+    const testUser = createUser({ displayName: 'test-user' });
+
+    render(<ShortcodeUser displayName="test-user" />, {
+      jotaiAtoms: [[persistedUsersAtom, [testUser]]],
+    });
+
+    // ASSERT
+    expect(screen.getByRole('link', { name: /test-user/i })).toBeVisible();
+  });
+
+  it('given the display name does not match any persisted users, renders nothing', () => {
+    // ARRANGE
+    const testUser = createUser({ displayName: 'test-user' });
+
+    render(<ShortcodeUser displayName="non-existent-user" />, {
+      jotaiAtoms: [[persistedUsersAtom, [testUser]]],
+    });
+
+    // ASSERT
+    expect(screen.queryByRole('link')).not.toBeInTheDocument();
+  });
+});
diff --git a/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeUser/ShortcodeUser.tsx b/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeUser/ShortcodeUser.tsx
new file mode 100644
index 0000000000..7cdc087424
--- /dev/null
+++ b/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeUser/ShortcodeUser.tsx
@@ -0,0 +1,25 @@
+import { useAtom } from 'jotai';
+import type { FC } from 'react';
+
+import { UserAvatar } from '@/common/components/UserAvatar';
+import { persistedUsersAtom } from '@/features/forums/state/forum.atoms';
+
+interface ShortcodeUserProps {
+  displayName: string;
+}
+
+export const ShortcodeUser: FC<ShortcodeUserProps> = ({ displayName }) => {
+  const [persistedUsers] = useAtom(persistedUsersAtom);
+
+  const foundUser = persistedUsers?.find((user) => user.displayName === displayName);
+
+  if (!foundUser) {
+    return null;
+  }
+
+  return (
+    <span data-testid="user-embed" className="inline-block">
+      <UserAvatar {...foundUser} showImage={false} />
+    </span>
+  );
+};
diff --git a/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeUser/index.ts b/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeUser/index.ts
new file mode 100644
index 0000000000..709c13b78f
--- /dev/null
+++ b/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeUser/index.ts
@@ -0,0 +1 @@
+export * from './ShortcodeUser';
diff --git a/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeVideo/ShortcodeVideo.test.tsx b/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeVideo/ShortcodeVideo.test.tsx
new file mode 100644
index 0000000000..265f0f6610
--- /dev/null
+++ b/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeVideo/ShortcodeVideo.test.tsx
@@ -0,0 +1,78 @@
+import { render, screen } from '@/test';
+
+import { ShortcodeVideo } from './ShortcodeVideo';
+
+describe('Component: ShortcodeVideo', () => {
+  it('renders without crashing', () => {
+    // ARRANGE
+    const { container } = render(<ShortcodeVideo src="https://youtube.com/watch?v=123" />);
+
+    // ASSERT
+    expect(container).toBeTruthy();
+  });
+
+  it('given an invalid video URL, renders nothing', () => {
+    // ARRANGE
+    render(<ShortcodeVideo src="https://invalid-url.com" />);
+
+    // ASSERT
+    expect(screen.queryByTestId('video-embed')).not.toBeInTheDocument();
+  });
+
+  it('given a YouTube URL, renders a YouTube embed iframe', () => {
+    // ARRANGE
+    render(<ShortcodeVideo src="https://youtube.com/watch?v=dQw4w9WgXcQ" />);
+
+    // ASSERT
+    const iframeEl = screen.getByTestId('video-embed-iframe');
+    expect(iframeEl).toBeVisible();
+    expect(iframeEl.getAttribute('src')).toEqual('//www.youtube-nocookie.com/embed/dQw4w9WgXcQ');
+  });
+
+  it('given a YouTube URL with params, preserves them in the embed URL', () => {
+    // ARRANGE
+    render(<ShortcodeVideo src="https://youtube.com/watch?v=dQw4w9WgXcQ&t=123" />);
+
+    // ASSERT
+    const iframeEl = screen.getByTestId('video-embed-iframe');
+    expect(iframeEl.getAttribute('src')).toEqual(
+      '//www.youtube-nocookie.com/embed/dQw4w9WgXcQ?start=123',
+    );
+  });
+
+  it('given a Twitch video URL, renders a Twitch video embed iframe', () => {
+    // ARRANGE
+    render(<ShortcodeVideo src="https://twitch.tv/videos/123456789" />);
+
+    // ASSERT
+    const iframeEl = screen.getByTestId('video-embed-iframe');
+    expect(iframeEl).toBeVisible();
+    expect(iframeEl.getAttribute('src')).toEqual(
+      '//player.twitch.tv/?video=123456789&parent=localhost&autoplay=false',
+    );
+  });
+
+  it('given a Twitch collection URL, renders a Twitch collection embed iframe', () => {
+    // ARRANGE
+    render(<ShortcodeVideo src="https://twitch.tv/collections/abc123" />);
+
+    // ASSERT
+    const iframeEl = screen.getByTestId('video-embed-iframe');
+    expect(iframeEl).toBeVisible();
+    expect(iframeEl.getAttribute('src')).toEqual(
+      '//player.twitch.tv/?collection=abc123&parent=localhost&autoplay=false',
+    );
+  });
+
+  it('given a Twitch clip URL, renders a Twitch clip embed iframe', () => {
+    // ARRANGE
+    render(<ShortcodeVideo src="https://clips.twitch.tv/ClipName" />);
+
+    // ASSERT
+    const iframeEl = screen.getByTestId('video-embed-iframe');
+    expect(iframeEl).toBeVisible();
+    expect(iframeEl.getAttribute('src')).toEqual(
+      '//clips.twitch.tv/embed?clip=ClipName&parent=localhost&autoplay=false',
+    );
+  });
+});
diff --git a/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeVideo/ShortcodeVideo.tsx b/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeVideo/ShortcodeVideo.tsx
new file mode 100644
index 0000000000..a785819b40
--- /dev/null
+++ b/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeVideo/ShortcodeVideo.tsx
@@ -0,0 +1,65 @@
+import type { FC } from 'react';
+
+import { processVideoUrl } from '@/features/forums/utils/processVideoUrl';
+
+interface ShortcodeVideoProps {
+  src: string;
+}
+
+export const ShortcodeVideo: FC<ShortcodeVideoProps> = ({ src }) => {
+  const processedVideo = processVideoUrl(src);
+
+  if (!processedVideo) {
+    return null;
+  }
+
+  let embedUrl = '';
+  switch (processedVideo.type) {
+    case 'youtube': {
+      const params = new URLSearchParams(processedVideo.params);
+      embedUrl = `//www.youtube-nocookie.com/embed/${processedVideo.videoId}${params.toString() ? '?' + params.toString() : ''}`;
+      break;
+    }
+
+    case 'twitch-video': {
+      const params = new URLSearchParams({
+        video: processedVideo.videoId,
+        parent: window.location.hostname,
+        autoplay: 'false',
+      });
+      embedUrl = `//player.twitch.tv/?${params.toString()}`;
+      break;
+    }
+
+    case 'twitch-collection': {
+      const params = new URLSearchParams({
+        collection: processedVideo.videoId,
+        parent: window.location.hostname,
+        autoplay: 'false',
+      });
+      embedUrl = `//player.twitch.tv/?${params.toString()}`;
+      break;
+    }
+
+    case 'twitch-clip': {
+      const params = new URLSearchParams({
+        clip: processedVideo.videoId,
+        parent: window.location.hostname,
+        autoplay: 'false',
+      });
+      embedUrl = `//clips.twitch.tv/embed?${params.toString()}`;
+      break;
+    }
+  }
+
+  return (
+    <div data-testid="video-embed" className="embed-responsive aspect-[16/9]">
+      <iframe
+        data-testid="video-embed-iframe"
+        className="embed-responsive-item"
+        src={embedUrl}
+        allowFullScreen={true}
+      />
+    </div>
+  );
+};
diff --git a/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeVideo/index.ts b/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeVideo/index.ts
new file mode 100644
index 0000000000..18167a5f68
--- /dev/null
+++ b/resources/js/features/forums/components/ShortcodeRenderer/ShortcodeVideo/index.ts
@@ -0,0 +1 @@
+export * from './ShortcodeVideo';
diff --git a/resources/js/features/forums/components/ShortcodeRenderer/index.ts b/resources/js/features/forums/components/ShortcodeRenderer/index.ts
new file mode 100644
index 0000000000..f1b526bc2c
--- /dev/null
+++ b/resources/js/features/forums/components/ShortcodeRenderer/index.ts
@@ -0,0 +1 @@
+export * from './ShortcodeRenderer';
diff --git a/resources/js/features/forums/hooks/useForumPostPreview.test.ts b/resources/js/features/forums/hooks/useForumPostPreview.test.ts
new file mode 100644
index 0000000000..5eba4a9e0e
--- /dev/null
+++ b/resources/js/features/forums/hooks/useForumPostPreview.test.ts
@@ -0,0 +1,110 @@
+import axios from 'axios';
+
+import { act, renderHook, waitFor } from '@/test';
+import { createAchievement, createGame, createTicket, createUser } from '@/test/factories';
+
+import { persistedGamesAtom } from '../state/forum.atoms';
+import { useForumPostPreview } from './useForumPostPreview';
+
+describe('Hook: useForumPostPreview', () => {
+  it('renders without crashing', () => {
+    // ARRANGE
+    const { result } = renderHook(() => useForumPostPreview());
+
+    // ASSERT
+    expect(result.current).toBeTruthy();
+  });
+
+  it('given content with no dynamic entities, sets preview content without making an API call', async () => {
+    // ARRANGE
+    const postSpy = vi.spyOn(axios, 'post');
+
+    const { result } = renderHook(() => useForumPostPreview());
+
+    const simpleContent = 'Hello world!';
+
+    // ACT
+    await act(async () => {
+      await result.current.initiatePreview(simpleContent);
+    });
+
+    // ASSERT
+    expect(postSpy).not.toHaveBeenCalled();
+
+    await waitFor(() => {
+      expect(result.current.previewContent).toEqual(simpleContent);
+    });
+  });
+
+  it('given content with dynamic entities, fetches and merges new entities', async () => {
+    // ARRANGE
+    const contentWithEntities = '@username and [game=123]';
+    const mockResponse = {
+      data: {
+        achievements: [],
+        games: [createGame({ id: 123, title: 'Test Game' })],
+        tickets: [],
+        users: [createUser({ displayName: 'username' })],
+      },
+    };
+
+    vi.spyOn(axios, 'post').mockResolvedValueOnce(mockResponse);
+
+    const { result } = renderHook(() => useForumPostPreview());
+
+    // ACT
+    await act(async () => {
+      await result.current.initiatePreview(contentWithEntities);
+    });
+
+    // ASSERT
+    await waitFor(() => {
+      expect(result.current.previewContent).toEqual(contentWithEntities);
+    });
+  });
+
+  it('given content with dynamic entities, updates persisted atoms with new data', async () => {
+    // ARRANGE
+    const contentWithEntities = '@username and [game=123]';
+    const mockResponse = {
+      data: {
+        achievements: [createAchievement({ id: 9 })],
+        games: [createGame({ id: 123, title: 'Test Game' })],
+        tickets: [createTicket({ id: 12345 })],
+        users: [createUser({ displayName: 'username' })],
+      },
+    };
+
+    vi.spyOn(axios, 'post').mockResolvedValueOnce(mockResponse);
+
+    const initialGames = [{ id: 456, name: 'Existing Game' }];
+    const { result } = renderHook(() => useForumPostPreview(), {
+      jotaiAtoms: [[persistedGamesAtom, initialGames]],
+    });
+
+    // ACT
+    await act(async () => {
+      await result.current.initiatePreview(contentWithEntities);
+    });
+
+    // ASSERT
+    await waitFor(() => {
+      expect(result.current.previewContent).toEqual(contentWithEntities);
+    });
+
+    const { persistedGames, persistedAchievements, persistedTickets, persistedUsers } =
+      result.current.unsafe_getPersistedValues();
+
+    expect(persistedGames).toHaveLength(2);
+    expect(persistedGames).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({ id: 123 }),
+        expect.objectContaining({ id: 456 }),
+      ]),
+    );
+
+    expect(persistedAchievements).toHaveLength(1);
+    expect(persistedTickets).toHaveLength(1);
+    expect(persistedUsers).toHaveLength(1);
+  });
+});
diff --git a/resources/js/features/forums/hooks/useForumPostPreview.ts b/resources/js/features/forums/hooks/useForumPostPreview.ts
new file mode 100644
index 0000000000..dfc24ae441
--- /dev/null
+++ b/resources/js/features/forums/hooks/useForumPostPreview.ts
@@ -0,0 +1,85 @@
+import { useAtom } from 'jotai';
+import { useState } from 'react';
+
+import {
+  persistedAchievementsAtom,
+  persistedGamesAtom,
+  persistedTicketsAtom,
+  persistedUsersAtom,
+} from '../state/forum.atoms';
+import { extractDynamicEntitiesFromBody } from '../utils/extractDynamicEntitiesFromBody';
+import { preProcessShortcodesInBody } from '../utils/preProcessShortcodesInBody';
+import type { ForumPostPreviewMutationResponse } from './useForumPostPreviewMutation';
+import { useForumPostPreviewMutation } from './useForumPostPreviewMutation';
+
+export function useForumPostPreview() {
+  const [previewContent, setPreviewContent] = useState<string | null>(null);
+
+  const [persistedAchievements, setPersistedAchievements] = useAtom(persistedAchievementsAtom);
+  const [persistedGames, setPersistedGames] = useAtom(persistedGamesAtom);
+  const [persistedTickets, setPersistedTickets] = useAtom(persistedTicketsAtom);
+  const [persistedUsers, setPersistedUsers] = useAtom(persistedUsersAtom);
+
+  const mutation = useForumPostPreviewMutation();
+
+  const mergeRetrievedEntities = (responseData: ForumPostPreviewMutationResponse) => {
+    setPersistedAchievements((prev) =>
+      mergeEntities(prev, responseData.achievements, (item) => item.id),
+    );
+    setPersistedGames((prev) => mergeEntities(prev, responseData.games, (item) => item.id));
+    setPersistedTickets((prev) => mergeEntities(prev, responseData.tickets, (item) => item.id));
+    setPersistedUsers((prev) =>
+      mergeEntities(prev, responseData.users, (item) => item.displayName),
+    );
+  };
+
+  const initiatePreview = async (body: string) => {
+    // Normalize any internal URLs to shortcode format.
+    const normalizedBody = preProcessShortcodesInBody(body);
+
+    // Then, extract dynamic entities from the normalized content.
+    const dynamicEntities = extractDynamicEntitiesFromBody(normalizedBody);
+
+    // Do we have any dynamic entities to fetch from the server?
+    // If not, we'll skip a round trip to the server to make the preview seem instantaneous.
+    const hasDynamicEntities = Object.values(dynamicEntities).some((arr) => arr.length > 0);
+
+    // If there are no dynamic entities in the post content, skip the round trip to the server.
+    if (hasDynamicEntities) {
+      const response = await mutation.mutateAsync(dynamicEntities);
+      mergeRetrievedEntities(response.data);
+    }
+
+    setPreviewContent(normalizedBody);
+  };
+
+  /**
+   * Intended for testing. In components, reach for `useAtom()`.
+   */
+  const unsafe_getPersistedValues = () => {
+    return {
+      persistedAchievements,
+      persistedGames,
+      persistedTickets,
+      persistedUsers,
+    };
+  };
+
+  return { initiatePreview, unsafe_getPersistedValues, previewContent };
+}
+
+function mergeEntities<TEntity>(
+  existing: TEntity[] | null | undefined,
+  newItems: TEntity[],
+  getKey: (item: TEntity) => string | number,
+): TEntity[] {
+  const existingMap = new Map(existing?.map((item) => [getKey(item), item]) ?? []);
+
+  for (const item of newItems) {
+    if (!existingMap.has(getKey(item))) {
+      existingMap.set(getKey(item), item);
+    }
+  }
+
+  return Array.from(existingMap.values());
+}
diff --git a/resources/js/features/forums/hooks/useForumPostPreviewMutation.ts b/resources/js/features/forums/hooks/useForumPostPreviewMutation.ts
new file mode 100644
index 0000000000..6762556e61
--- /dev/null
+++ b/resources/js/features/forums/hooks/useForumPostPreviewMutation.ts
@@ -0,0 +1,21 @@
+import { useMutation } from '@tanstack/react-query';
+import axios from 'axios';
+
+import type { DynamicShortcodeEntities } from '../models';
+
+export interface ForumPostPreviewMutationResponse {
+  achievements: App.Platform.Data.Achievement[];
+  games: App.Platform.Data.Game[];
+  tickets: App.Platform.Data.Ticket[];
+  users: App.Data.User[];
+}
+
+export function useForumPostPreviewMutation() {
+  return useMutation({
+    mutationFn: (payload: DynamicShortcodeEntities) =>
+      axios.post<ForumPostPreviewMutationResponse>(
+        route('api.forum-topic-comment.preview'),
+        payload,
+      ),
+  });
+}
diff --git a/resources/js/features/forums/hooks/useShortcodeInjection.test.tsx b/resources/js/features/forums/hooks/useShortcodeInjection.test.tsx
new file mode 100644
index 0000000000..c192ce4915
--- /dev/null
+++ b/resources/js/features/forums/hooks/useShortcodeInjection.test.tsx
@@ -0,0 +1,55 @@
+import type { FC, ReactNode } from 'react';
+import { FormProvider, useForm } from 'react-hook-form';
+import { LuBold } from 'react-icons/lu';
+
+import { renderHook } from '@/test';
+import type { TranslatedString } from '@/types/i18next';
+
+import { useShortcodeInjection } from './useShortcodeInjection';
+
+const Wrapper: FC<{ children: ReactNode }> = ({ children }) => {
+  const form = useForm();
+
+  return <FormProvider {...form}>{children}</FormProvider>;
+};
+
+describe('Hook: useShortcodeInjection', () => {
+  it('renders without crashing', () => {
+    // ARRANGE
+    const { result } = renderHook(
+      () =>
+        useShortcodeInjection({
+          fieldName: 'description',
+        }),
+      {
+        wrapper: Wrapper,
+      },
+    );
+
+    // ASSERT
+    expect(result.current).toBeTruthy();
+  });
+
+  it('given the textarea element does not exist in the DOM, returns early without throwing errors', () => {
+    // ARRANGE
+    const { result } = renderHook(
+      () =>
+        useShortcodeInjection({
+          fieldName: 'description',
+        }),
+      {
+        wrapper: Wrapper,
+      },
+    );
+
+    // ASSERT
+    expect(() =>
+      result.current.injectShortcode({
+        start: '[b]',
+        end: '[/b]',
+        icon: LuBold,
+        t_label: 'Bold' as TranslatedString,
+      }),
+    ).not.toThrow();
+  });
+});
diff --git a/resources/js/features/forums/hooks/useShortcodeInjection.ts b/resources/js/features/forums/hooks/useShortcodeInjection.ts
new file mode 100644
index 0000000000..ebb4e75323
--- /dev/null
+++ b/resources/js/features/forums/hooks/useShortcodeInjection.ts
@@ -0,0 +1,49 @@
+import type { FieldValues, Path } from 'react-hook-form';
+import { useFormContext } from 'react-hook-form';
+
+import type { Shortcode } from '../models';
+
+export function useShortcodeInjection<TFieldValues extends FieldValues>(props: {
+  fieldName: Path<TFieldValues>;
+}) {
+  const { fieldName } = props;
+
+  const { getValues, setValue } = useFormContext<TFieldValues>();
+
+  const injectShortcode = (shortcode: Shortcode) => {
+    const textareaEl = document.querySelector(
+      `textarea[name="${fieldName}"]`,
+    ) as HTMLTextAreaElement;
+
+    if (!textareaEl) {
+      return;
+    }
+
+    const currentValue = getValues(fieldName) as string;
+    const selectionStart = textareaEl.selectionStart;
+    const selectionEnd = textareaEl.selectionEnd;
+    const selectedText = currentValue.substring(selectionStart, selectionEnd);
+
+    // Build the new text with the injected shortcode.
+    const beforeSelection = currentValue.slice(0, selectionStart);
+    const afterSelection = currentValue.slice(selectionEnd);
+    const content = selectedText;
+
+    const newText = `${beforeSelection}${shortcode.start}${content}${shortcode.end}${afterSelection}`;
+
+    // Update the form value (render the injected shortcode to the screen).
+    setValue(fieldName, newText as TFieldValues[typeof fieldName], {
+      shouldDirty: true,
+    });
+
+    // Wait for React to update the DOM (this is async), then restore the user's highlighted text selection.
+    setTimeout(() => {
+      textareaEl.focus();
+
+      const newPosition = selectionStart + shortcode.start.length;
+      textareaEl.setSelectionRange(newPosition, newPosition + selectedText.length);
+    }, 0);
+  };
+
+  return { injectShortcode };
+}
diff --git a/resources/js/features/forums/hooks/useShortcodesList.test.ts b/resources/js/features/forums/hooks/useShortcodesList.test.ts
new file mode 100644
index 0000000000..d2c156e1e6
--- /dev/null
+++ b/resources/js/features/forums/hooks/useShortcodesList.test.ts
@@ -0,0 +1,57 @@
+import { renderHook } from '@/test';
+
+import { useShortcodesList } from './useShortcodesList';
+
+describe('Hook: useShortcodesList', () => {
+  it('renders without crashing', () => {
+    // ARRANGE
+    const { result } = renderHook(() => useShortcodesList());
+
+    // ASSERT
+    expect(result.current).toBeTruthy();
+  });
+
+  it('given the hook is invoked, returns a list of shortcodes with the expected structure', () => {
+    // ARRANGE
+    const { result } = renderHook(() => useShortcodesList());
+
+    // ASSERT
+    const { shortcodesList } = result.current;
+    expect(shortcodesList).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({
+          icon: expect.any(Function),
+          t_label: expect.any(String),
+          start: expect.any(String),
+          end: expect.any(String),
+        }),
+      ]),
+    );
+  });
+
+  it('given the hook is invoked, returns all expected shortcode types', () => {
+    // ARRANGE
+    const { result } = renderHook(() => useShortcodesList());
+
+    // ASSERT
+    const { shortcodesList } = result.current;
+    const shortcodeTypes = shortcodesList.map((code) => code.start);
+
+    expect(shortcodeTypes).toEqual(
+      expect.arrayContaining([
+        '[b]',
+        '[i]',
+        '[u]',
+        '[s]',
+        '[code]',
+        '[spoiler]',
+        '[img=',
+        '[url=',
+        '[ach=',
+        '[game=',
+        '[user=',
+        '[ticket=',
+      ]),
+    );
+  });
+});
diff --git a/resources/js/features/forums/hooks/useShortcodesList.ts b/resources/js/features/forums/hooks/useShortcodesList.ts
new file mode 100644
index 0000000000..e9fedd157e
--- /dev/null
+++ b/resources/js/features/forums/hooks/useShortcodesList.ts
@@ -0,0 +1,36 @@
+import { useTranslation } from 'react-i18next';
+import { BsImageFill } from 'react-icons/bs';
+import { FaGamepad, FaTicketAlt, FaUser } from 'react-icons/fa';
+import { ImTrophy } from 'react-icons/im';
+import {
+  LuBold,
+  LuCode2,
+  LuEyeOff,
+  LuItalic,
+  LuLink,
+  LuStrikethrough,
+  LuUnderline,
+} from 'react-icons/lu';
+
+import type { Shortcode } from '../models';
+
+export function useShortcodesList() {
+  const { t } = useTranslation();
+
+  const shortcodesList: Shortcode[] = [
+    { icon: LuBold, t_label: t('Bold'), start: '[b]', end: '[/b]' },
+    { icon: LuItalic, t_label: t('Italic'), start: '[i]', end: '[/i]' },
+    { icon: LuUnderline, t_label: t('Underline'), start: '[u]', end: '[/u]' },
+    { icon: LuStrikethrough, t_label: t('Strikethrough'), start: '[s]', end: '[/s]' },
+    { icon: LuCode2, t_label: t('Code'), start: '[code]', end: '[/code]' },
+    { icon: LuEyeOff, t_label: t('Spoiler'), start: '[spoiler]', end: '[/spoiler]' },
+    { icon: BsImageFill, t_label: t('Image'), start: '[img=', end: ']' },
+    { icon: LuLink, t_label: t('Link'), start: '[url=', end: ']' },
+    { icon: ImTrophy, t_label: t('Achievement'), start: '[ach=', end: ']' },
+    { icon: FaGamepad, t_label: t('Game'), start: '[game=', end: ']' },
+    { icon: FaUser, t_label: t('User'), start: '[user=', end: ']' },
+    { icon: FaTicketAlt, t_label: t('Ticket'), start: '[ticket=', end: ']' },
+  ];
+
+  return { shortcodesList };
+}
diff --git a/resources/js/features/forums/models/dynamic-shortcode-entities.model.ts b/resources/js/features/forums/models/dynamic-shortcode-entities.model.ts
new file mode 100644
index 0000000000..2569516ef0
--- /dev/null
+++ b/resources/js/features/forums/models/dynamic-shortcode-entities.model.ts
@@ -0,0 +1,6 @@
+export interface DynamicShortcodeEntities {
+  usernames: string[];
+  ticketIds: number[];
+  gameIds: number[];
+  achievementIds: number[];
+}
diff --git a/resources/js/features/forums/models/index.ts b/resources/js/features/forums/models/index.ts
new file mode 100644
index 0000000000..8c7ee02b9f
--- /dev/null
+++ b/resources/js/features/forums/models/index.ts
@@ -0,0 +1,4 @@
+export * from './dynamic-shortcode-entities.model';
+export * from './processed-video.model';
+export * from './shortcode.model';
+export * from './video-type.model';
diff --git a/resources/js/features/forums/models/processed-video.model.ts b/resources/js/features/forums/models/processed-video.model.ts
new file mode 100644
index 0000000000..dd61246263
--- /dev/null
+++ b/resources/js/features/forums/models/processed-video.model.ts
@@ -0,0 +1,7 @@
+import type { VideoType } from './video-type.model';
+
+export interface ProcessedVideo {
+  type: VideoType;
+  videoId: string;
+  params: Record<string, string>;
+}
diff --git a/resources/js/features/forums/models/shortcode.model.ts b/resources/js/features/forums/models/shortcode.model.ts
new file mode 100644
index 0000000000..6eb98d94b4
--- /dev/null
+++ b/resources/js/features/forums/models/shortcode.model.ts
@@ -0,0 +1,10 @@
+import type { IconType } from 'react-icons/lib';
+
+import type { TranslatedString } from '@/types/i18next';
+
+export interface Shortcode {
+  icon: IconType;
+  t_label: TranslatedString;
+  start: string;
+  end: string;
+}
diff --git a/resources/js/features/forums/models/video-type.model.ts b/resources/js/features/forums/models/video-type.model.ts
new file mode 100644
index 0000000000..d5407befa4
--- /dev/null
+++ b/resources/js/features/forums/models/video-type.model.ts
@@ -0,0 +1 @@
+export type VideoType = 'youtube' | 'twitch-video' | 'twitch-collection' | 'twitch-clip';
diff --git a/resources/js/features/forums/state/forum.atoms.ts b/resources/js/features/forums/state/forum.atoms.ts
new file mode 100644
index 0000000000..189f6bd2d3
--- /dev/null
+++ b/resources/js/features/forums/state/forum.atoms.ts
@@ -0,0 +1,9 @@
+import { atom } from 'jotai';
+
+export const persistedUsersAtom = atom<App.Data.User[]>();
+
+export const persistedGamesAtom = atom<App.Platform.Data.Game[]>();
+
+export const persistedAchievementsAtom = atom<App.Platform.Data.Achievement[]>();
+
+export const persistedTicketsAtom = atom<App.Platform.Data.Ticket[]>();
diff --git a/resources/js/features/forums/utils/convertYouTubeTime.test.ts b/resources/js/features/forums/utils/convertYouTubeTime.test.ts
new file mode 100644
index 0000000000..e2d90aae5d
--- /dev/null
+++ b/resources/js/features/forums/utils/convertYouTubeTime.test.ts
@@ -0,0 +1,56 @@
+import { convertYouTubeTime } from './convertYouTubeTime';
+
+describe('Util: convertYouTubeTime', () => {
+  it('is defined', () => {
+    // ASSERT
+    expect(convertYouTubeTime).toBeDefined();
+  });
+
+  it('given the input is already in seconds, returns that number of seconds', () => {
+    // ACT
+    const result = convertYouTubeTime('45');
+
+    // ASSERT
+    expect(result).toEqual(45);
+  });
+
+  it('given the input contains only seconds, converts to seconds', () => {
+    // ACT
+    const result = convertYouTubeTime('45s');
+
+    // ASSERT
+    expect(result).toEqual(45);
+  });
+
+  it('given the input contains minutes and seconds, converts to total seconds', () => {
+    // ACT
+    const result = convertYouTubeTime('2m30s');
+
+    // ASSERT
+    expect(result).toEqual(150); // (2 * 60) + 30
+  });
+
+  it('given the input contains hours, minutes, and seconds, converts to total seconds', () => {
+    // ACT
+    const result = convertYouTubeTime('1h30m15s');
+
+    // ASSERT
+    expect(result).toEqual(5415);
+  });
+
+  it('given the input contains only minutes, converts to total seconds', () => {
+    // ACT
+    const result = convertYouTubeTime('90m');
+
+    // ASSERT
+    expect(result).toEqual(5400); // 90 * 60
+  });
+
+  it('given the input is an invalid format, returns 0', () => {
+    // ACT
+    const result = convertYouTubeTime('invalid');
+
+    // ASSERT
+    expect(result).toEqual(0);
+  });
+});
diff --git a/resources/js/features/forums/utils/convertYouTubeTime.ts b/resources/js/features/forums/utils/convertYouTubeTime.ts
new file mode 100644
index 0000000000..19f6e45a9b
--- /dev/null
+++ b/resources/js/features/forums/utils/convertYouTubeTime.ts
@@ -0,0 +1,19 @@
+/**
+ * Converts YouTube time format to seconds.
+ * Handles both numeric seconds and formatted time (ie: 1h30m15s, 30m15s, 15s, 90m, etc).
+ */
+export function convertYouTubeTime(time: string): number {
+  // If the time is numeric, it's already in seconds.
+  if (!isNaN(Number(time))) {
+    return parseInt(time, 10);
+  }
+
+  // Parse time in format 1h30m15s, 30m15s, 15s, 90m, etc.
+  const matches = time.match(/(?:(\d+)h)?(?:(\d+)m)?(?:(\d+)s)?/) as RegExpMatchArray;
+
+  const hours = matches[1] ? parseInt(matches[1], 10) : 0;
+  const minutes = matches[2] ? parseInt(matches[2], 10) : 0;
+  const seconds = matches[3] ? parseInt(matches[3], 10) : 0;
+
+  return hours * 3600 + minutes * 60 + seconds;
+}
diff --git a/resources/js/features/forums/utils/extractDynamicEntitiesFromBody.test.ts b/resources/js/features/forums/utils/extractDynamicEntitiesFromBody.test.ts
new file mode 100644
index 0000000000..066faec155
--- /dev/null
+++ b/resources/js/features/forums/utils/extractDynamicEntitiesFromBody.test.ts
@@ -0,0 +1,79 @@
+import { extractDynamicEntitiesFromBody } from './extractDynamicEntitiesFromBody';
+
+describe('Util: extractDynamicEntitiesFromBody', () => {
+  it('is defined', () => {
+    // ASSERT
+    expect(extractDynamicEntitiesFromBody).toBeDefined();
+  });
+
+  it('given the input contains user shortcodes, extracts and dedupes all usernames', () => {
+    // ARRANGE
+    const input = 'Hello [user=Jamiras] and [user=Scott] and [user=Jamiras] again';
+
+    // ACT
+    const result = extractDynamicEntitiesFromBody(input);
+
+    // ASSERT
+    expect(result.usernames).toEqual(['Jamiras', 'Scott']);
+  });
+
+  it('given the input contains ticket shortcodes, extracts and dedupes all ticket IDs', () => {
+    // ARRANGE
+    const input = 'Check tickets [ticket=123] and [ticket=456] and [ticket=123].';
+
+    // ACT
+    const result = extractDynamicEntitiesFromBody(input);
+
+    // ASSERT
+    expect(result.ticketIds).toEqual([123, 456]);
+  });
+
+  it('given the input contains achievement shortcodes, extracts all achievement IDs', () => {
+    // ARRANGE
+    const input = 'I earned [ach=9] and [ach=14402]!';
+
+    // ACT
+    const result = extractDynamicEntitiesFromBody(input);
+
+    // ASSERT
+    expect(result.achievementIds).toEqual([9, 14402]);
+  });
+
+  it('given the input contains game shortcodes, extracts and dedupes all game IDs', () => {
+    // ARRANGE
+    const input = 'I like to play [game=1] and [game=14402] and [game=1].';
+
+    // ACT
+    const result = extractDynamicEntitiesFromBody(input);
+
+    // ASSERT
+    expect(result.gameIds).toEqual([1, 14402]);
+  });
+
+  it('given the input contains invalid numeric IDs, ignores them', () => {
+    // ARRANGE
+    const input = '[ticket=abc] [ach=def] [game=xyz]';
+
+    // ACT
+    const result = extractDynamicEntitiesFromBody(input);
+
+    // ASSERT
+    expect(result.ticketIds).toEqual([]);
+    expect(result.achievementIds).toEqual([]);
+    expect(result.gameIds).toEqual([]);
+  });
+
+  it('given the input contains multiple types of shortcodes, extracts all entities correctly', () => {
+    // ARRANGE
+    const input = '[user=xelnia] completed [ach=9] in [game=1] and created [ticket=12345].';
+
+    // ACT
+    const result = extractDynamicEntitiesFromBody(input);
+
+    // ASSERT
+    expect(result.usernames).toEqual(['xelnia']);
+    expect(result.achievementIds).toEqual([9]);
+    expect(result.gameIds).toEqual([1]);
+    expect(result.ticketIds).toEqual([12345]);
+  });
+});
diff --git a/resources/js/features/forums/utils/extractDynamicEntitiesFromBody.ts b/resources/js/features/forums/utils/extractDynamicEntitiesFromBody.ts
new file mode 100644
index 0000000000..14c7455041
--- /dev/null
+++ b/resources/js/features/forums/utils/extractDynamicEntitiesFromBody.ts
@@ -0,0 +1,47 @@
+import type { DynamicShortcodeEntities } from '../models';
+
+const shortcodePatterns = {
+  user: /\[user=([^\]]+)\]/g,
+  game: /\[game=([^\]]+)\]/g,
+  achievement: /\[ach=([^\]]+)\]/g,
+  ticket: /\[ticket=([^\]]+)\]/g,
+};
+
+export function extractDynamicEntitiesFromBody(input: string): DynamicShortcodeEntities {
+  const entities: DynamicShortcodeEntities = {
+    usernames: [],
+    ticketIds: [],
+    achievementIds: [],
+    gameIds: [],
+  };
+
+  // Extract usernames.
+  for (const match of input.matchAll(shortcodePatterns.user)) {
+    entities.usernames.push(match[1]);
+  }
+
+  // Extract ticket IDs.
+  for (const match of input.matchAll(shortcodePatterns.ticket)) {
+    const id = parseInt(match[1], 10);
+    if (!isNaN(id)) entities.ticketIds.push(id);
+  }
+
+  // Extract achievement IDs.
+  for (const match of input.matchAll(shortcodePatterns.achievement)) {
+    const id = parseInt(match[1], 10);
+    if (!isNaN(id)) entities.achievementIds.push(id);
+  }
+
+  // Extract game IDs.
+  for (const match of input.matchAll(shortcodePatterns.game)) {
+    const id = parseInt(match[1], 10);
+    if (!isNaN(id)) entities.gameIds.push(id);
+  }
+
+  return {
+    usernames: [...new Set(entities.usernames)],
+    ticketIds: [...new Set(entities.ticketIds)],
+    achievementIds: [...new Set(entities.achievementIds)],
+    gameIds: [...new Set(entities.gameIds)],
+  };
+}
diff --git a/resources/js/features/forums/utils/postProcessShortcodesInBody.test.ts b/resources/js/features/forums/utils/postProcessShortcodesInBody.test.ts
new file mode 100644
index 0000000000..4d6825c9c7
--- /dev/null
+++ b/resources/js/features/forums/utils/postProcessShortcodesInBody.test.ts
@@ -0,0 +1,194 @@
+import { postProcessShortcodesInBody } from './postProcessShortcodesInBody';
+import { processAllVideoUrls } from './processAllVideoUrls';
+
+vi.mock('./processAllVideoUrls');
+
+describe('Util: postProcessShortcodesInBody', () => {
+  beforeEach(() => {
+    vi.mocked(processAllVideoUrls).mockImplementation((text) => text);
+  });
+
+  it('is defined', () => {
+    // ASSERT
+    expect(postProcessShortcodesInBody).toBeDefined();
+  });
+
+  it('given a body with existing shortcodes, does not modify them', () => {
+    // ARRANGE
+    const input = 'Check [b]bold[/b] and [i]italic[/i] text';
+
+    // ACT
+    const result = postProcessShortcodesInBody(input);
+
+    // ASSERT
+    expect(result).toBe(input);
+  });
+
+  it('given a self-closing url tag, expands it to include the URL as content', () => {
+    // ARRANGE
+    const body = '[url=https://example.com]';
+
+    // ACT
+    const result = postProcessShortcodesInBody(body);
+
+    // ASSERT
+    expect(result).toEqual('[url="https://example.com"]https://example.com[/url]');
+  });
+
+  it('given a plain text with URLs outside of tags, wraps non-video URLs in [url] tags', () => {
+    // ARRANGE
+    const input = 'Check out this site: https://example.com and this one http://test.com';
+
+    // ACT
+    const result = postProcessShortcodesInBody(input);
+
+    // ASSERT
+    expect(result).toBe(
+      'Check out this site: [url]https://example.com[/url] and this one [url]http://test.com[/url]',
+    );
+  });
+
+  it('given a self-closing url tag with single quotes, handles it correctly', () => {
+    // ARRANGE
+    const body = "[url='https://example.com']";
+
+    // ACT
+    const result = postProcessShortcodesInBody(body);
+
+    // ASSERT
+    expect(result).toEqual('[url="https://example.com"]https://example.com[/url]');
+  });
+
+  it('given a self-closing url tag without quotes, handles it correctly', () => {
+    // ARRANGE
+    const body = '[url=https://example.com]';
+
+    // ACT
+    const result = postProcessShortcodesInBody(body);
+
+    // ASSERT
+    expect(result).toEqual('[url="https://example.com"]https://example.com[/url]');
+  });
+
+  it('given a properly closed url tag, does not modify it', () => {
+    // ARRANGE
+    const body = '[url="https://example.com"]Click here[/url]';
+
+    // ACT
+    const result = postProcessShortcodesInBody(body);
+
+    // ASSERT
+    expect(result).toEqual(body);
+  });
+
+  it('given a self-closing tag that is not a url tag, expands it to include the value as content', () => {
+    // ARRANGE
+    const body = '[color="#ff0000"]';
+
+    // ACT
+    const result = postProcessShortcodesInBody(body);
+
+    // ASSERT
+    expect(result).toEqual('[color]#ff0000[/color]');
+  });
+
+  it('given multiple shortcodes, processes them all correctly', () => {
+    // ARRANGE
+    const body = '[url="https://example.com"] [color="#ff0000"] [size=12]';
+
+    // ACT
+    const result = postProcessShortcodesInBody(body);
+
+    // ASSERT
+    expect(result).toEqual(
+      '[url="https://example.com"]https://example.com[/url] [color]#ff0000[/color] [size]12[/size]',
+    );
+  });
+
+  it('given text with URLs, processes them for video embeds', () => {
+    // ARRANGE
+    const body = 'Check out https://youtube.com/watch?v=123';
+    vi.mocked(processAllVideoUrls).mockReturnValue(
+      'Check out [video]https://youtube.com/watch?v=123[/video]',
+    );
+
+    // ACT
+    const result = postProcessShortcodesInBody(body);
+
+    // ASSERT
+    expect(result).toEqual('Check out [video]https://youtube.com/watch?v=123[/video]');
+  });
+
+  it('does not double wrap url tags', () => {
+    // ARRANGE
+    const body = '[url]https://example.com[/url]';
+
+    // ACT
+    const result = postProcessShortcodesInBody(body);
+
+    // ASSERT
+    expect(result).not.toContain('[url][url]');
+    expect(result).toEqual('[url]https://example.com[/url]');
+  });
+
+  it('does not nest img links within url tags', () => {
+    // ARRANGE
+    const body = '[img]https://i.imgur.com/ov30jeD.jpg[/img]';
+
+    // ACT
+    const result = postProcessShortcodesInBody(body);
+
+    // ASSERT
+    expect(result).not.toContain('[img][url]');
+    expect(result).toEqual('[img]https://i.imgur.com/ov30jeD.jpg[/img]');
+  });
+
+  it('can handle complex inference even when mixed with self-closing url shortcodes', () => {
+    // ARRANGE
+    const body =
+      '[url=https://google.com]my link[/url] [url=google.com] [url=https://google.com] asdf [user=WCopeland] https://retroachievements.org/user/WCopeland/progress https://retroachievements.org';
+
+    // ACT
+    const result = postProcessShortcodesInBody(body);
+
+    // ASSERT
+    expect(result).toEqual(
+      '[url=https://google.com]my link[/url] [url="google.com"]google.com[/url] [url="https://google.com"]https://google.com[/url] asdf [user]WCopeland[/user] [url]https://retroachievements.org/user/WCopeland/progress[/url] [url]https://retroachievements.org[/url]',
+    );
+  });
+
+  it('handles URLs inside nested BBCode tags correctly', () => {
+    // ARRANGE
+    const body = '[spoiler][b]Check this out: https://example.com[/b][/spoiler]';
+
+    // ACT
+    const result = postProcessShortcodesInBody(body);
+
+    // ASSERT
+    expect(result).toEqual(
+      '[spoiler][b]Check this out: [url]https://example.com[/url][/b][/spoiler]',
+    );
+  });
+
+  it('completely removes empty self-closing tags', () => {
+    // ARRANGE
+    const body = '[url=""]';
+
+    // ACT
+    const result = postProcessShortcodesInBody(body);
+
+    // ASSERT
+    expect(result).toEqual('');
+  });
+
+  it('strips body content from img tags', () => {
+    // ARRANGE
+    const body = '[img=https://i.imgur.com/ov30jeD.jpeg]body[/img]';
+
+    // ACT
+    const result = postProcessShortcodesInBody(body);
+
+    // ASSERT
+    expect(result).toEqual('[img=https://i.imgur.com/ov30jeD.jpeg][/img]');
+  });
+});
diff --git a/resources/js/features/forums/utils/postProcessShortcodesInBody.ts b/resources/js/features/forums/utils/postProcessShortcodesInBody.ts
new file mode 100644
index 0000000000..4204cad622
--- /dev/null
+++ b/resources/js/features/forums/utils/postProcessShortcodesInBody.ts
@@ -0,0 +1,71 @@
+import { processAllVideoUrls } from './processAllVideoUrls';
+
+export function postProcessShortcodesInBody(body: string): string {
+  let result = body;
+
+  // Helper to check if we're inside a specific BBCode tag.
+  const isInsideTag = (index: number, text: string, tagName: string): boolean => {
+    const beforeText = text.slice(0, index);
+    const openTagPattern = new RegExp(`\\[${tagName}[\\]=]`, 'g');
+    const closeTagPattern = new RegExp(`\\[\\/${tagName}\\]`, 'g');
+
+    const openMatches = [...beforeText.matchAll(openTagPattern)];
+    const closeMatches = [...beforeText.matchAll(closeTagPattern)];
+
+    return openMatches.length > closeMatches.length;
+  };
+
+  // First, remove any empty self-closing tags.
+  result = result.replace(/\[(\w+)=["']?["']?\]/g, '');
+
+  // Strip body content from img tags while preserving the img=url format.
+  result = result.replace(/\[img=([^\]]+)\].*?\[\/img\]/g, '[img=$1][/img]');
+
+  // Handle self-closing url tags.
+  result = result.replace(
+    /\[url=["']?([^"'\]]+)["']?\](?!\s*[^\n\[]*\[\/url\])/g,
+    '[url="$1"]$1[/url]',
+  );
+
+  // Then, handle all other [tag=value] formats, excluding url tags.
+  result = result.replace(
+    /\[(?!url\b)(?!img\b)(\w+)=["']?([^"'\]]+)["']?\]/g,
+    (_, tag, value) => `[${tag}]${value}[/${tag}]`,
+  );
+
+  // Finally, wrap bare URLs in [url] tags, but only if they're not inside any tags.
+  const urlPattern =
+    /https?:\/\/(?!(?:(?:www\.)?(?:youtube\.com|youtu\.be|twitch\.tv)|clips\.twitch\.tv))[\w-]+(?:\.[\w-]+)+[^\s[\]()]*/gi;
+  let lastIndex = 0;
+  let newResult = '';
+
+  // eslint-disable-next-line no-constant-condition -- this is fine
+  while (true) {
+    const match = urlPattern.exec(result);
+    if (!match) break;
+
+    const matchText = match[0];
+    const matchIndex = match.index;
+
+    // Add text before this match.
+    newResult += result.slice(lastIndex, matchIndex);
+
+    // Only wrap if not inside url or img tags.
+    if (!isInsideTag(matchIndex, result, 'url') && !isInsideTag(matchIndex, result, 'img')) {
+      newResult += `[url]${matchText}[/url]`;
+    } else {
+      newResult += matchText;
+    }
+
+    lastIndex = matchIndex + matchText.length;
+    urlPattern.lastIndex = lastIndex;
+  }
+
+  // Add remaining text.
+  newResult += result.slice(lastIndex);
+  result = newResult;
+
+  result = processAllVideoUrls(result);
+
+  return result;
+}
diff --git a/resources/js/features/forums/utils/preProcessShortcodesInBody.test.ts b/resources/js/features/forums/utils/preProcessShortcodesInBody.test.ts
new file mode 100644
index 0000000000..06de3421b6
--- /dev/null
+++ b/resources/js/features/forums/utils/preProcessShortcodesInBody.test.ts
@@ -0,0 +1,86 @@
+import { preProcessShortcodesInBody } from './preProcessShortcodesInBody';
+
+describe('Util: preProcessShortcodesInBody', () => {
+  it('is defined', () => {
+    // ASSERT
+    expect(preProcessShortcodesInBody).toBeDefined();
+  });
+
+  it('given a user profile link, converts it to a user shortcode', () => {
+    // ARRANGE
+    const input = 'https://retroachievements.org/user/ScottAdams';
+
+    // ACT
+    const result = preProcessShortcodesInBody(input);
+
+    // ASSERT
+    expect(result).toEqual('[user=ScottAdams]');
+  });
+
+  it('given a game BBCode url tag, converts it to a game shortcode', () => {
+    // ARRANGE
+    const input = '[url=https://retroachievements.org/game/1234]Cool Game[/url]';
+
+    // ACT
+    const result = preProcessShortcodesInBody(input);
+
+    // ASSERT
+    expect(result).toEqual('[game=1234]');
+  });
+
+  it('given an achievement direct production URL, converts it to an achievement shortcode', () => {
+    // ARRANGE
+    const input = 'Check out https://retroachievements.org/achievement/12345';
+
+    // ACT
+    const result = preProcessShortcodesInBody(input);
+
+    // ASSERT
+    expect(result).toEqual('Check out [ach=12345]');
+  });
+
+  it('given a local development URL, converts it to the appropriate shortcode', () => {
+    // ARRANGE
+    const input = 'Dev link: http://localhost:3000/ticket/67890';
+
+    // ACT
+    const result = preProcessShortcodesInBody(input);
+
+    // ASSERT
+    expect(result).toEqual('Dev link: [ticket=67890]');
+  });
+
+  it('given nested shortcodes in url tags, removes the url tag', () => {
+    // ARRANGE
+    const input = '[url=[user=ScottAdams]]';
+
+    // ACT
+    const result = preProcessShortcodesInBody(input);
+
+    // ASSERT
+    expect(result).toEqual('[user=ScottAdams]');
+  });
+
+  it('given multiple different shortcode types in a single string, converts all of them', () => {
+    // ARRANGE
+    const input =
+      'Check out https://retroachievements.org/user/ScottAdams and https://retroachievements.org/game/1234';
+
+    // ACT
+    const result = preProcessShortcodesInBody(input);
+
+    // ASSERT
+    expect(result).toEqual('Check out [user=ScottAdams] and [game=1234]');
+  });
+
+  it('preserves text that does not match shortcode patterns', () => {
+    // ARRANGE
+    const input = 'This is a regular text without any special links.';
+
+    // ACT
+    const result = preProcessShortcodesInBody(input);
+
+    // ASSERT
+    expect(result).toEqual(input);
+  });
+});
diff --git a/resources/js/features/forums/utils/preProcessShortcodesInBody.ts b/resources/js/features/forums/utils/preProcessShortcodesInBody.ts
new file mode 100644
index 0000000000..e0524cc73a
--- /dev/null
+++ b/resources/js/features/forums/utils/preProcessShortcodesInBody.ts
@@ -0,0 +1,47 @@
+const shortcodeTypes = [
+  { type: 'user', shortcode: 'user' },
+  { type: 'game', shortcode: 'game' },
+  { type: 'achievement', shortcode: 'ach' },
+  { type: 'ticket', shortcode: 'ticket' },
+] as const;
+
+const createPatterns = (type: string) => [
+  // HTML anchor tags.
+  new RegExp(
+    `<a [^/>]*retroachievements\\.org/${type}/(\\w{1,20})(/?(?![\\w/?]))[^/>]*\\][^</a>]*</a>`,
+    'gi',
+  ),
+
+  // BBCode url tags.
+  new RegExp(
+    `\\[url[^\\]]*retroachievements\\.org/${type}/(\\w{1,20})(/?(?![\\w/?]))[^\\]]*\\][^\\[]*\\[/url\\]`,
+    'gi',
+  ),
+  new RegExp(`\\[url[^\\]]*?${type}/(\\w{1,20})(/?(?![\\w/?])).*?\\[/url\\]`, 'gi'),
+
+  // Direct production URLs.
+  new RegExp(
+    `https?://(?:[\\w-]+\\.)?retroachievements\\.org/${type}/(\\w{1,20})(/?(?![\\w/?]))`,
+    'gi',
+  ),
+
+  // Local development URLs.
+  new RegExp(`https?://localhost(?::\\d{1,5})?/${type}/(\\w{1,20})(/?(?![\\w/?]))`, 'gi'),
+];
+
+export function preProcessShortcodesInBody(body: string): string {
+  let result = body;
+
+  for (const { type, shortcode } of shortcodeTypes) {
+    const patterns = createPatterns(type);
+    for (const regex of patterns) {
+      result = result.replaceAll(regex, `[${shortcode}=$1]`);
+    }
+  }
+
+  // Clean up nested shortcodes in url tags.
+  // "[url=[user=Scott]]" -> "[user=Scott]"
+  result = result.replace(/\[url=\[(\w+=[^\]]+)\]\]/g, '[$1]');
+
+  return result;
+}
diff --git a/resources/js/features/forums/utils/processAllVideoUrls.test.ts b/resources/js/features/forums/utils/processAllVideoUrls.test.ts
new file mode 100644
index 0000000000..746f9c58e1
--- /dev/null
+++ b/resources/js/features/forums/utils/processAllVideoUrls.test.ts
@@ -0,0 +1,102 @@
+import { processAllVideoUrls } from './processAllVideoUrls';
+import { processVideoUrl } from './processVideoUrl';
+
+vi.mock('./processVideoUrl');
+
+describe('Util: processAllVideoUrls', () => {
+  it('is defined', () => {
+    // ASSERT
+    expect(processAllVideoUrls).toBeDefined();
+  });
+
+  it('given text with no URLs, returns the original text', () => {
+    // ARRANGE
+    const text = 'This is some text without any URLs.';
+
+    // ACT
+    const result = processAllVideoUrls(text);
+
+    // ASSERT
+    expect(result).toEqual(text);
+  });
+
+  it('given text with non-video URLs, returns the original text unchanged', () => {
+    // ARRANGE
+    const text = 'Check out https://example.com and https://google.com';
+    vi.mocked(processVideoUrl).mockReturnValue(null);
+
+    // ACT
+    const result = processAllVideoUrls(text);
+
+    // ASSERT
+    expect(result).toEqual(text);
+  });
+
+  it('given text with a video URL, wraps the URL in video tags', () => {
+    // ARRANGE
+    const videoUrl = 'https://youtube.com/watch?v=123';
+    const text = `Check out this video: ${videoUrl}`;
+
+    vi.mocked(processVideoUrl).mockReturnValue({
+      videoId: '123',
+      params: {},
+      type: 'youtube',
+    });
+
+    // ACT
+    const result = processAllVideoUrls(text);
+
+    // ASSERT
+    expect(result).toEqual(`Check out this video: [video]${videoUrl}[/video]`);
+  });
+
+  it('given text with multiple video URLs, wraps each URL in video tags', () => {
+    // ARRANGE
+    const youtubeUrl = 'https://youtube.com/watch?v=123';
+    const twitchUrl = 'https://twitch.tv/videos/456';
+    const text = `First video: ${youtubeUrl}\nSecond video: ${twitchUrl}`;
+
+    vi.mocked(processVideoUrl)
+      .mockReturnValueOnce({
+        videoId: '123',
+        params: {},
+        type: 'youtube',
+      })
+      .mockReturnValueOnce({
+        videoId: '456',
+        params: {},
+        type: 'twitch-video',
+      });
+
+    // ACT
+    const result = processAllVideoUrls(text);
+
+    // ASSERT
+    expect(result).toEqual(
+      `First video: [video]${youtubeUrl}[/video]\nSecond video: [video]${twitchUrl}[/video]`,
+    );
+  });
+
+  it('given text with mixed video and non-video URLs, only wraps video URLs', () => {
+    // ARRANGE
+    const videoUrl = 'https://youtube.com/watch?v=123';
+    const normalUrl = 'https://example.com';
+    const text = `Video: ${videoUrl}, Website: ${normalUrl}`;
+
+    vi.mocked(processVideoUrl)
+      .mockReturnValueOnce({
+        videoId: '123',
+        params: {},
+        type: 'youtube',
+      })
+      .mockReturnValueOnce(null);
+
+    // ACT
+    const result = processAllVideoUrls(text);
+
+    // ASSERT
+    expect(result).toEqual(
+      'Video: [video]https://youtube.com/watch?v=123[/video], Website: https://example.com',
+    );
+  });
+});
diff --git a/resources/js/features/forums/utils/processAllVideoUrls.ts b/resources/js/features/forums/utils/processAllVideoUrls.ts
new file mode 100644
index 0000000000..be9d0e8c00
--- /dev/null
+++ b/resources/js/features/forums/utils/processAllVideoUrls.ts
@@ -0,0 +1,19 @@
+import { processVideoUrl } from './processVideoUrl';
+
+/**
+ * Converts plain video URLs in text to video shortcodes.
+ * Handles both YouTube and Twitch URLs, preserving any parameters.
+ */
+export function processAllVideoUrls(text: string): string {
+  const urls = text.match(/https?:\/\/[^\s<>]+\b/g) ?? [];
+
+  let processedText = text;
+  for (const url of urls) {
+    const videoInfo = processVideoUrl(url);
+    if (videoInfo) {
+      processedText = processedText.replace(url, `[video]${url}[/video]`);
+    }
+  }
+
+  return processedText;
+}
diff --git a/resources/js/features/forums/utils/processTwitchUrl.test.ts b/resources/js/features/forums/utils/processTwitchUrl.test.ts
new file mode 100644
index 0000000000..291b42f0c8
--- /dev/null
+++ b/resources/js/features/forums/utils/processTwitchUrl.test.ts
@@ -0,0 +1,131 @@
+import { processTwitchUrl } from './processTwitchUrl';
+
+describe('Util: processTwitchUrl', () => {
+  it('is defined', () => {
+    // ASSERT
+    expect(processTwitchUrl).toBeDefined();
+  });
+
+  it('given an invalid URL, returns null', () => {
+    // ARRANGE
+    const invalidUrls = [
+      'https://example.com/video',
+      '',
+      'not a url at all',
+      'twitch',
+      'twitch.tv',
+      'https://twitch.tv/',
+      'https://www.twitch.tv/somechannel',
+    ];
+
+    // ASSERT
+    for (const url of invalidUrls) {
+      expect(processTwitchUrl(url)).toEqual(null);
+    }
+  });
+
+  it('given a standard video URL, returns the video details', () => {
+    // ARRANGE
+    const url = 'https://www.twitch.tv/videos/12345';
+
+    // ACT
+    const result = processTwitchUrl(url);
+
+    // ASSERT
+    expect(result).toEqual({
+      type: 'twitch-video',
+      videoId: '12345',
+      params: {},
+    });
+  });
+
+  it('given a channel video URL, returns the video details', () => {
+    // ARRANGE
+    const url = 'https://www.twitch.tv/user/v/12345';
+
+    // ACT
+    const result = processTwitchUrl(url);
+
+    // ASSERT
+    expect(result).toEqual({
+      type: 'twitch-video',
+      videoId: '12345',
+      params: {},
+    });
+  });
+
+  it('given a video URL without protocol, still processes it correctly', () => {
+    // ARRANGE
+    const url = 'twitch.tv/videos/12345';
+
+    // ACT
+    const result = processTwitchUrl(url);
+
+    // ASSERT
+    expect(result).toEqual({
+      type: 'twitch-video',
+      videoId: '12345',
+      params: {},
+    });
+  });
+
+  it('given a collection URL, returns the collection details', () => {
+    // ARRANGE
+    const url = 'https://www.twitch.tv/collections/aabbccdd';
+
+    // ACT
+    const result = processTwitchUrl(url);
+
+    // ASSERT
+    expect(result).toEqual({
+      type: 'twitch-collection',
+      videoId: 'aabbccdd',
+      params: {},
+    });
+  });
+
+  it('given a collection URL without protocol, still processes it correctly', () => {
+    // ARRANGE
+    const url = 'twitch.tv/collections/aabbccdd';
+
+    // ACT
+    const result = processTwitchUrl(url);
+
+    // ASSERT
+    expect(result).toEqual({
+      type: 'twitch-collection',
+      videoId: 'aabbccdd',
+      params: {},
+    });
+  });
+
+  it('given a clip URL, returns the clip details', () => {
+    // ARRANGE
+    const url = 'https://clips.twitch.tv/aabbccdd';
+
+    // ACT
+    const result = processTwitchUrl(url);
+
+    // ASSERT
+    expect(result).toEqual({
+      type: 'twitch-clip',
+      videoId: 'aabbccdd',
+      params: {},
+    });
+  });
+
+  it('given a clip URL without protocol, still processes it correctly', () => {
+    // ARRANGE
+    const url = 'clips.twitch.tv/aabbccdd';
+
+    // ACT
+    const result = processTwitchUrl(url);
+
+    // ASSERT
+    expect(result).toEqual({
+      type: 'twitch-clip',
+      videoId: 'aabbccdd',
+      params: {},
+    });
+  });
+});
diff --git a/resources/js/features/forums/utils/processTwitchUrl.ts b/resources/js/features/forums/utils/processTwitchUrl.ts
new file mode 100644
index 0000000000..403dcb6375
--- /dev/null
+++ b/resources/js/features/forums/utils/processTwitchUrl.ts
@@ -0,0 +1,66 @@
+import type { ProcessedVideo } from '../models';
+
+/**
+ * Supports three types of Twitch URLs:
+ * 1. Video URLs: https://www.twitch.tv/videos/270709956 or https://www.twitch.tv/gamingwithmist/v/40482810
+ * 2. Collection URLs: https://www.twitch.tv/collections/cWHCMbAY1xQVDA
+ * 3. Clip URLs: https://clips.twitch.tv/AmorphousCautiousLegPanicVis
+ */
+export function processTwitchUrl(url: string): ProcessedVideo | null {
+  // Twitch video regex pattern:
+  // (?:https?://)?      # Optional scheme. Either http or https.
+  // (?:www.)?           # Optional subdomain.
+  // twitch.tv/.*        # Host.
+  // (?:videos|[^/]+/v)  # Match either "videos" or "{username}/v"
+  // /(\d+)              # Video ID (numeric)
+  // (?!                 # Assert URL is not pre-linked.
+  //   [?=&+%\w.-]*      # Allow URL (query) remainder.
+  //   (?:               # Group pre-linked alternatives.
+  //     [^<>]*>         # Either inside a start tag,
+  //   | [^<>]*</a>      # or inside <a> element text contents.
+  //   )                 # End recognized pre-linked alts.
+  // )                   # End negative lookahead assertion.
+  // ([?=&+%\w.-]*)      # Consume any URL (query) remainder.
+  const videoRegex =
+    /(?:https?:\/\/)?(?:www\.)?twitch\.tv\/.*(?:videos|[^/]+\/v)\/(\d+)([?=&+%\w.-]*)/i;
+
+  // Matches URLs like: https://www.twitch.tv/collections/cWHCMbAY1xQVDA.
+  const collectionRegex = /(?:https?:\/\/)?(?:www\.)?twitch\.tv\/collections\/([a-z0-9]+)/i;
+
+  // Matches URLs like: https://clips.twitch.tv/AmorphousCautiousLegPanicVis.
+  const clipRegex = /(?:https?:\/\/)?clips\.twitch\.tv\/([a-zA-Z0-9-_]+)/i;
+
+  let matches;
+
+  // Check for video URLs.
+  matches = url.match(videoRegex);
+  if (matches) {
+    return {
+      type: 'twitch-video',
+      videoId: matches[1],
+      params: {},
+    };
+  }
+
+  // Check for collection URLs.
+  matches = url.match(collectionRegex);
+  if (matches) {
+    return {
+      type: 'twitch-collection',
+      videoId: matches[1],
+      params: {},
+    };
+  }
+
+  // Check for clip URLs.
+  matches = url.match(clipRegex);
+  if (matches) {
+    return {
+      type: 'twitch-clip',
+      videoId: matches[1],
+      params: {},
+    };
+  }
+
+  return null;
+}
diff --git a/resources/js/features/forums/utils/processVideoUrl.test.ts b/resources/js/features/forums/utils/processVideoUrl.test.ts
new file mode 100644
index 0000000000..2f5a72b7e1
--- /dev/null
+++ b/resources/js/features/forums/utils/processVideoUrl.test.ts
@@ -0,0 +1,76 @@
+import type { ProcessedVideo } from '../models';
+import { processTwitchUrl } from './processTwitchUrl';
+import { processVideoUrl } from './processVideoUrl';
+import { processYouTubeUrl } from './processYouTubeUrl';
+
+vi.mock('./processYouTubeUrl');
+vi.mock('./processTwitchUrl');
+
+describe('Util: processVideoUrl', () => {
+  it('is defined', () => {
+    // ASSERT
+    expect(processVideoUrl).toBeDefined();
+  });
+
+  it('given an invalid URL, returns null', () => {
+    // ARRANGE
+    vi.mocked(processYouTubeUrl).mockReturnValue(null);
+    vi.mocked(processTwitchUrl).mockReturnValue(null);
+
+    // ACT
+    const result = processVideoUrl('not a valid url');
+
+    // ASSERT
+    expect(result).toEqual(null);
+  });
+
+  it('given a YouTube URL, returns the processed YouTube video details', () => {
+    // ARRANGE
+    const youtubeResult: ProcessedVideo = {
+      videoId: '123',
+      params: {},
+      type: 'youtube',
+    };
+    vi.mocked(processYouTubeUrl).mockReturnValue(youtubeResult);
+
+    // ACT
+    const result = processVideoUrl('some-youtube-url');
+
+    // ASSERT
+    expect(result).toEqual(youtubeResult);
+    expect(processTwitchUrl).not.toHaveBeenCalled();
+  });
+
+  it('given a Twitch URL, returns the processed Twitch video details', () => {
+    // ARRANGE
+    const twitchResult: ProcessedVideo = {
+      videoId: '456',
+      params: {},
+      type: 'twitch-video',
+    };
+    vi.mocked(processYouTubeUrl).mockReturnValue(null);
+    vi.mocked(processTwitchUrl).mockReturnValue(twitchResult);
+
+    // ACT
+    const result = processVideoUrl('some-twitch-url');
+
+    // ASSERT
+    expect(result).toEqual(twitchResult);
+  });
+
+  it('given a YouTube URL, does not check if it is a Twitch URL', () => {
+    // ARRANGE
+    const youtubeResult: ProcessedVideo = {
+      videoId: '123',
+      params: {},
+      type: 'youtube',
+    };
+    vi.mocked(processYouTubeUrl).mockReturnValue(youtubeResult);
+
+    // ACT
+    processVideoUrl('some-youtube-url');
+
+    // ASSERT
+    expect(processTwitchUrl).not.toHaveBeenCalled();
+  });
+});
diff --git a/resources/js/features/forums/utils/processVideoUrl.ts b/resources/js/features/forums/utils/processVideoUrl.ts
new file mode 100644
index 0000000000..fdf6e8f49d
--- /dev/null
+++ b/resources/js/features/forums/utils/processVideoUrl.ts
@@ -0,0 +1,19 @@
+import type { ProcessedVideo } from '../models';
+import { processTwitchUrl } from './processTwitchUrl';
+import { processYouTubeUrl } from './processYouTubeUrl';
+
+/**
+ * Process any video URL, supporting both YouTube and Twitch formats.
+ * Returns null if the URL doesn't match any supported video format.
+ */
+export function processVideoUrl(url: string): ProcessedVideo | null {
+  // First, try YouTube.
+  const youtubeResult = processYouTubeUrl(url);
+  if (youtubeResult) return youtubeResult;
+
+  // Next, try Twitch.
+  const twitchResult = processTwitchUrl(url);
+  if (twitchResult) return twitchResult;
+
+  return null;
+}
diff --git a/resources/js/features/forums/utils/processYouTubeUrl.test.ts b/resources/js/features/forums/utils/processYouTubeUrl.test.ts
new file mode 100644
index 0000000000..c864df3d2a
--- /dev/null
+++ b/resources/js/features/forums/utils/processYouTubeUrl.test.ts
@@ -0,0 +1,156 @@
+import { processYouTubeUrl } from './processYouTubeUrl';
+
+describe('Util: processYouTubeUrl', () => {
+  it('is defined', () => {
+    // ASSERT
+    expect(processYouTubeUrl).toBeDefined();
+  });
+
+  it('given an invalid URL, returns null', () => {
+    // ARRANGE
+    const invalidUrls = [
+      'https://example.com/video',
+      '',
+      'not a url at all',
+      'youtube',
+      'youtube.com',
+      'https://youtube.com/',
+    ];
+
+    // ASSERT
+    for (const url of invalidUrls) {
+      expect(processYouTubeUrl(url)).toEqual(null);
+    }
+  });
+
+  it('given a standard youtube.com URL, returns the video details', () => {
+    // ARRANGE
+    const url = 'https://www.youtube.com/watch?v=dQw4w9WgXcQ';
+
+    // ACT
+    const result = processYouTubeUrl(url);
+
+    // ASSERT
+    expect(result).toEqual({
+      videoId: 'dQw4w9WgXcQ',
+      params: {},
+      type: 'youtube',
+    });
+  });
+
+  it('given a youtu.be short URL, returns the video details', () => {
+    // ARRANGE
+    const url = 'https://youtu.be/dQw4w9WgXcQ';
+
+    // ACT
+    const result = processYouTubeUrl(url);
+
+    // ASSERT
+    expect(result).toEqual({
+      videoId: 'dQw4w9WgXcQ',
+      params: {},
+      type: 'youtube',
+    });
+  });
+
+  it('given a URL with a timestamp in seconds, converts it to the proper format', () => {
+    // ARRANGE
+    const url = 'https://www.youtube.com/watch?v=dQw4w9WgXcQ&t=30';
+
+    // ACT
+    const result = processYouTubeUrl(url);
+
+    // ASSERT
+    expect(result).toEqual({
+      videoId: 'dQw4w9WgXcQ',
+      params: {
+        start: '30',
+      },
+      type: 'youtube',
+    });
+  });
+
+  it('given a URL with other query parameters, preserves them in the result', () => {
+    // ARRANGE
+    const url = 'https://www.youtube.com/watch?v=dQw4w9WgXcQ&feature=share&ab_channel=user';
+
+    // ACT
+    const result = processYouTubeUrl(url);
+
+    // ASSERT
+    expect(result).toEqual({
+      videoId: 'dQw4w9WgXcQ',
+      params: {
+        feature: 'share',
+        ab_channel: 'user',
+      },
+      type: 'youtube',
+    });
+  });
+
+  it('given a URL without protocol, still processes it correctly', () => {
+    // ARRANGE
+    const url = 'youtube.com/watch?v=dQw4w9WgXcQ';
+
+    // ACT
+    const result = processYouTubeUrl(url);
+
+    // ASSERT
+    expect(result).toEqual({
+      videoId: 'dQw4w9WgXcQ',
+      params: {},
+      type: 'youtube',
+    });
+  });
+
+  it('given a URL with a timestamp in minutes and seconds format, converts it correctly', () => {
+    // ARRANGE
+    const url = 'https://www.youtube.com/watch?v=dQw4w9WgXcQ&t=1m30s';
+
+    // ACT
+    const result = processYouTubeUrl(url);
+
+    // ASSERT
+    expect(result).toEqual({
+      videoId: 'dQw4w9WgXcQ',
+      params: {
+        start: '90',
+      },
+      type: 'youtube',
+    });
+  });
+
+  it('given a URL with a query string missing the ? prefix, still processes parameters correctly', () => {
+    // ARRANGE
+    const url = 'https://www.youtube.com/watch&v=dQw4w9WgXcQ&feature=share';
+
+    // ACT
+    const result = processYouTubeUrl(url);
+
+    // ASSERT
+    expect(result).toEqual({
+      videoId: 'dQw4w9WgXcQ',
+      params: {
+        feature: 'share',
+      },
+      type: 'youtube',
+    });
+  });
+
+  it('given a URL with an embedded video ID and additional parameters, processes parameters correctly', () => {
+    // ARRANGE
+    const url = 'https://www.youtube.com/embed/dQw4w9WgXcQ&controls=0';
+
+    // ACT
+    const result = processYouTubeUrl(url);
+
+    // ASSERT
+    expect(result).toEqual({
+      videoId: 'dQw4w9WgXcQ',
+      params: {
+        controls: '0',
+      },
+      type: 'youtube',
+    });
+  });
+});
diff --git a/resources/js/features/forums/utils/processYouTubeUrl.ts b/resources/js/features/forums/utils/processYouTubeUrl.ts
new file mode 100644
index 0000000000..e58d411baf
--- /dev/null
+++ b/resources/js/features/forums/utils/processYouTubeUrl.ts
@@ -0,0 +1,54 @@
+import type { ProcessedVideo } from '../models';
+import { convertYouTubeTime } from './convertYouTubeTime';
+
+/**
+ * @see http://stackoverflow.com/questions/5830387/how-to-find-all-youtube-video-ids-in-a-string-using-a-regex
+ * Enhanced to support timestamp parameters.
+ */
+export function processYouTubeUrl(url: string): ProcessedVideo | null {
+  // This regex pattern matches YouTube URLs with the following structure:
+  // (?:https?://)?      # Optional scheme. Either http or https.
+  // (?:[0-9A-Z-]+\.)?   # Optional subdomain.
+  // (?:                 # Group host alternatives.
+  //   youtu\.be/        # Either youtu.be (trailing slash required),
+  // | youtube\.com      # or youtube.com followed by
+  //   \S*               # Allow anything up to VIDEO_ID,
+  //   [^\w\\-\s]        # but char before ID is non-ID char.
+  // )                   # End host alternatives.
+  // ([\w\-]{11})        # $1: VIDEO_ID is exactly 11 chars.
+  // (?=[^\w\-]|$)       # Assert next char is non-ID or EOS.
+  // (?!                 # Assert URL is not pre-linked.
+  //   (?:               # Group pre-linked alternatives.
+  //     [^<>]*>         # Either inside a start tag,
+  //   | [^<>]*</a>      # or inside <a> element text contents.
+  //   )                 # End recognized pre-linked alts.
+  // )                   # End negative lookahead assertion.
+  // ([?=&+%\w.-]*)      # Consume any URL (query) remainder.
+  const youtubeRegex =
+    /(?:https?:\/\/)?(?:[0-9A-Z-]+\.)?(?:youtu\.be\/|youtube\.com\S*[^\w\s-])([\w-]{11})(?=[^\w-]|$)(?![?=&+%\w.-]*(?:['"][^<>]*>|<\/a>))([?&=+%\w.-]*)/i;
+  const matches = url.match(youtubeRegex);
+
+  if (!matches) {
+    return null;
+  }
+
+  const videoId = matches[1];
+  const queryString = matches[2];
+  const params: Record<string, string> = {};
+
+  // Parse query parameters.
+  if (queryString) {
+    const searchParams = new URLSearchParams(queryString);
+
+    for (const [key, value] of searchParams) {
+      if (key === 't') {
+        // "t" has to be converted to a time compatible with youtube-nocookie.com embeds.
+        params['start'] = convertYouTubeTime(value).toString();
+      } else {
+        params[key] = value;
+      }
+    }
+  }
+
+  return { params, videoId, type: 'youtube' };
+}
diff --git a/resources/js/features/game-list/components/SystemGamesMainRoot/SystemGamesMainRoot.test.tsx b/resources/js/features/game-list/components/SystemGamesMainRoot/SystemGamesMainRoot.test.tsx
index 74671bb3a1..08b245a26f 100644
--- a/resources/js/features/game-list/components/SystemGamesMainRoot/SystemGamesMainRoot.test.tsx
+++ b/resources/js/features/game-list/components/SystemGamesMainRoot/SystemGamesMainRoot.test.tsx
@@ -42,6 +42,25 @@ describe('Component: SystemGamesMainRoot', () => {
     expect(container).toBeTruthy();
   });
 
+  it('displays accessible breadcrumbs', () => {
+    // ARRANGE
+    const system = createSystem({ name: 'Nintendo 64' });
+
+    render<App.Platform.Data.SystemGameListPageProps>(<SystemGamesMainRoot />, {
+      pageProps: {
+        system,
+        defaultDesktopPageSize: 100,
+        paginatedGameListEntries: createPaginatedData([]),
+        can: { develop: false },
+        ziggy: createZiggyProps({ device: 'desktop' }),
+      },
+    });
+
+    // ASSERT
+    expect(screen.getByRole('listitem', { name: /all games/i })).toBeVisible();
+    expect(screen.getByRole('listitem', { name: system.name })).toBeVisible();
+  });
+
   it('displays default columns', async () => {
     // ARRANGE
     render<App.Platform.Data.SystemGameListPageProps>(<SystemGamesMainRoot />, {
@@ -763,9 +782,7 @@ describe('Component: SystemGamesMainRoot', () => {
     });
 
     // ASSERT
-    expect(await screen.findByRole('list')).toBeVisible();
-    expect(screen.queryByRole('table')).not.toBeInTheDocument();
-
     expect(await screen.findByText(/sonic the hedgehog/i)).toBeVisible();
+    expect(screen.queryByRole('table')).not.toBeInTheDocument();
   });
 });
diff --git a/resources/js/features/game-list/components/SystemGamesMainRoot/SystemGamesMainRoot.tsx b/resources/js/features/game-list/components/SystemGamesMainRoot/SystemGamesMainRoot.tsx
index 5c6bf47691..4dd4053f5e 100644
--- a/resources/js/features/game-list/components/SystemGamesMainRoot/SystemGamesMainRoot.tsx
+++ b/resources/js/features/game-list/components/SystemGamesMainRoot/SystemGamesMainRoot.tsx
@@ -3,7 +3,9 @@ import { useAtom } from 'jotai';
 import { type FC, memo } from 'react';
 import { useTranslation } from 'react-i18next';
 
+import { GameBreadcrumbs } from '@/common/components/GameBreadcrumbs';
 import { usePageProps } from '@/common/hooks/usePageProps';
+import type { TranslatedString } from '@/types/i18next';
 
 import { useGameListState } from '../../hooks/useGameListState';
 import { usePreloadedTableDataQueryClient } from '../../hooks/usePreloadedTableDataQueryClient';
@@ -59,6 +61,8 @@ export const SystemGamesMainRoot: FC = memo(() => {
 
   return (
     <div>
+      <GameBreadcrumbs t_currentPageLabel={system.name as TranslatedString} />
+
       <DataTablePaginationScrollTarget>
         <div className="mb-3 flex w-full items-center">
           <h1 className="text-h3 w-full sm:!text-[2.0em]">
diff --git a/resources/js/features/home/components/+sidebar/AchievementOfTheWeek/AchievementOfTheWeek.test.tsx b/resources/js/features/home/components/+sidebar/AchievementOfTheWeek/AchievementOfTheWeek.test.tsx
index eb34e254f0..8d935c013a 100644
--- a/resources/js/features/home/components/+sidebar/AchievementOfTheWeek/AchievementOfTheWeek.test.tsx
+++ b/resources/js/features/home/components/+sidebar/AchievementOfTheWeek/AchievementOfTheWeek.test.tsx
@@ -5,6 +5,7 @@ import {
   createEventAchievement,
   createGame,
   createHomePageProps,
+  createRaEvent,
   createSystem,
 } from '@/test/factories';
 
@@ -41,31 +42,34 @@ describe('Component: AchievementOfTheWeek', () => {
 
   it('displays an accessible link to the event page', () => {
     // ARRANGE
+    const legacyGame = createGame();
+    const event = createRaEvent({ legacyGame });
+
     render<App.Http.Data.HomePageProps>(<AchievementOfTheWeek />, {
       pageProps: createHomePageProps({
-        achievementOfTheWeek: createEventAchievement({ forumTopicId: 100 }),
+        achievementOfTheWeek: createEventAchievement({ event }),
       }),
     });
 
     // ASSERT
-    const linkEl = screen.getByRole('link', { name: /learn more about this event/i });
+    const linkEl = screen.getByRole('link', { name: /view this year's event/i });
 
     expect(linkEl).toBeVisible();
-    expect(linkEl).toHaveAttribute('href', '/viewtopic.php?t=100');
+    expect(linkEl).toHaveAttribute('href', expect.stringContaining('game.show'));
   });
 
   it('given there is no accessible link to the event page, does not render a link', () => {
     // ARRANGE
+    const event = createRaEvent({ legacyGame: undefined });
+
     render<App.Http.Data.HomePageProps>(<AchievementOfTheWeek />, {
       pageProps: createHomePageProps({
-        achievementOfTheWeek: createEventAchievement({ forumTopicId: undefined }),
+        achievementOfTheWeek: createEventAchievement({ event }),
       }),
     });
 
     // ASSERT
-    expect(
-      screen.queryByRole('link', { name: /learn more about this event/i }),
-    ).not.toBeInTheDocument();
+    expect(screen.queryByRole('link', { name: /view this year's event/i })).not.toBeInTheDocument();
   });
 
   it('has a link to the achievement', () => {
diff --git a/resources/js/features/home/components/+sidebar/AchievementOfTheWeek/AchievementOfTheWeek.tsx b/resources/js/features/home/components/+sidebar/AchievementOfTheWeek/AchievementOfTheWeek.tsx
index 6c61da12f4..0d5840377c 100644
--- a/resources/js/features/home/components/+sidebar/AchievementOfTheWeek/AchievementOfTheWeek.tsx
+++ b/resources/js/features/home/components/+sidebar/AchievementOfTheWeek/AchievementOfTheWeek.tsx
@@ -7,6 +7,8 @@ import { GameAvatar } from '@/common/components/GameAvatar';
 import { SystemChip } from '@/common/components/SystemChip';
 import { usePageProps } from '@/common/hooks/usePageProps';
 import type { AvatarSize } from '@/common/models';
+import { buildTrackingClassNames } from '@/common/utils/buildTrackingClassNames';
+import { cn } from '@/common/utils/cn';
 
 import { HomeHeading } from '../../HomeHeading';
 
@@ -80,10 +82,13 @@ export const AchievementOfTheWeek: FC = () => {
           </div>
         </div>
 
-        {achievementOfTheWeek.forumTopicId ? (
+        {achievementOfTheWeek.event?.legacyGame ? (
           <div className="w-ful flex justify-end">
-            <a className="text-xs" href={`/viewtopic.php?t=${achievementOfTheWeek.forumTopicId}`}>
-              {t('Learn more about this event')}
+            <a
+              className={cn('text-xs', buildTrackingClassNames('Click AOTW Link'))}
+              href={route('game.show', { game: achievementOfTheWeek.event.legacyGame.id })}
+            >
+              {t("View this year's event")}
             </a>
           </div>
         ) : null}
diff --git a/resources/js/pages/forums/post/[comment]/edit.tsx b/resources/js/pages/forums/post/[comment]/edit.tsx
new file mode 100644
index 0000000000..1e9daddc65
--- /dev/null
+++ b/resources/js/pages/forums/post/[comment]/edit.tsx
@@ -0,0 +1,24 @@
+import { useTranslation } from 'react-i18next';
+
+import { SEO } from '@/common/components/SEO';
+import { AppLayout } from '@/common/layouts/AppLayout';
+import type { AppPage } from '@/common/models';
+import { EditPostMainRoot } from '@/features/forums/components/EditPostMainRoot';
+
+const ForumTopicCommentEdit: AppPage = () => {
+  const { t } = useTranslation();
+
+  return (
+    <>
+      <SEO title={t('Edit Post')} description="Edit a forum post you've made" />
+
+      <AppLayout.Main>
+        <EditPostMainRoot />
+      </AppLayout.Main>
+    </>
+  );
+};
+
+ForumTopicCommentEdit.layout = (page) => <AppLayout withSidebar={false}>{page}</AppLayout>;
+
+export default ForumTopicCommentEdit;
diff --git a/resources/js/tall-stack/app.ts b/resources/js/tall-stack/app.ts
index e0eef1599c..3febf399c3 100644
--- a/resources/js/tall-stack/app.ts
+++ b/resources/js/tall-stack/app.ts
@@ -6,6 +6,8 @@
 // eslint-disable-next-line camelcase
 // import { livewire_hot_reload } from 'virtual:livewire-hot-reload';
 
+import { getStringByteCount } from '@/common/utils/getStringByteCount';
+
 import { Alpine, Livewire } from '../../../vendor/livewire/livewire/dist/livewire.esm';
 import {
   linkifyDirective,
@@ -21,7 +23,6 @@ import {
   deleteCookie,
   fetcher,
   getCookie,
-  getStringByteCount,
   handleLeaderboardTabClick,
   initializeTextareaCounter,
   injectShortcode,
diff --git a/resources/js/tall-stack/utils/index.ts b/resources/js/tall-stack/utils/index.ts
index 6d25ebd8a9..45b6b1ca8f 100644
--- a/resources/js/tall-stack/utils/index.ts
+++ b/resources/js/tall-stack/utils/index.ts
@@ -2,7 +2,6 @@ export * from './autoExpandTextInput';
 export * from './cookie';
 export * from './copyToClipboard';
 export * from './fetcher';
-export * from './getStringByteCount';
 export * from './handleLeaderboardTabClick';
 export * from './helpers';
 export * from './initializeTextareaCounter';
diff --git a/resources/js/tall-stack/utils/initializeTextareaCounter.ts b/resources/js/tall-stack/utils/initializeTextareaCounter.ts
index 3a36690696..73ccca2042 100644
--- a/resources/js/tall-stack/utils/initializeTextareaCounter.ts
+++ b/resources/js/tall-stack/utils/initializeTextareaCounter.ts
@@ -1,6 +1,5 @@
-import { getStringByteCount } from './getStringByteCount';
+import { getStringByteCount } from '@/common/utils/getStringByteCount';
 
-// TODO: Refactor to use Alpine.js instead.
 export function initializeTextareaCounter() {
   const textareaCounterEls = document.getElementsByClassName(
     'textarea-counter',
diff --git a/resources/js/test/factories/createEventAchievement.ts b/resources/js/test/factories/createEventAchievement.ts
index 0336470ab2..bcc9362876 100644
--- a/resources/js/test/factories/createEventAchievement.ts
+++ b/resources/js/test/factories/createEventAchievement.ts
@@ -1,10 +1,12 @@
 import { createFactory } from '../createFactory';
 import { createAchievement } from './createAchievement';
+import { createRaEvent } from './createRaEvent';
 
 export const createEventAchievement = createFactory<App.Platform.Data.EventAchievement>((faker) => {
   return {
     achievement: createAchievement(),
     sourceAchievement: createAchievement(),
     forumTopicId: faker.number.int({ min: 0, max: 99999 }),
+    event: createRaEvent(),
   };
 });
diff --git a/resources/js/test/factories/createForum.ts b/resources/js/test/factories/createForum.ts
new file mode 100644
index 0000000000..8fadb07156
--- /dev/null
+++ b/resources/js/test/factories/createForum.ts
@@ -0,0 +1,8 @@
+import { createFactory } from '../createFactory';
+
+export const createForum = createFactory<App.Data.Forum>((faker) => {
+  return {
+    id: faker.number.int({ min: 1, max: 1000 }),
+    title: faker.word.words(5),
+  };
+});
diff --git a/resources/js/test/factories/createForumCategory.ts b/resources/js/test/factories/createForumCategory.ts
new file mode 100644
index 0000000000..a5097d0f03
--- /dev/null
+++ b/resources/js/test/factories/createForumCategory.ts
@@ -0,0 +1,8 @@
+import { createFactory } from '../createFactory';
+
+export const createForumCategory = createFactory<App.Data.ForumCategory>((faker) => {
+  return {
+    id: faker.number.int({ min: 1, max: 10000 }),
+    title: faker.word.words(3),
+  };
+});
diff --git a/resources/js/test/factories/createForumTopic.ts b/resources/js/test/factories/createForumTopic.ts
new file mode 100644
index 0000000000..15cd504219
--- /dev/null
+++ b/resources/js/test/factories/createForumTopic.ts
@@ -0,0 +1,11 @@
+import { createFactory } from '../createFactory';
+
+export const createForumTopic = createFactory<App.Data.ForumTopic>((faker) => {
+  return {
+    id: faker.number.int({ min: 1, max: 9999 }),
+    title: faker.word.words(3),
+    createdAt: faker.date.recent().toISOString(),
+    updatedAt: null,
+    user: null,
+  };
+});
diff --git a/resources/js/test/factories/createRaEvent.ts b/resources/js/test/factories/createRaEvent.ts
new file mode 100644
index 0000000000..61464a1a7f
--- /dev/null
+++ b/resources/js/test/factories/createRaEvent.ts
@@ -0,0 +1,14 @@
+import { createFactory } from '../createFactory';
+import { createGame } from './createGame';
+
+/**
+ * This is not named `createEvent` because @testing-library/react already has
+ * an export named `createEvent`. If these two exports from our @/test module
+ * share the same name, IDEs get very confused.
+ */
+export const createRaEvent = createFactory<App.Platform.Data.Event>((faker) => {
+  return {
+    id: faker.number.int({ min: 1, max: 10000 }),
+    legacyGame: createGame(),
+  };
+});
diff --git a/resources/js/test/factories/createTicket.ts b/resources/js/test/factories/createTicket.ts
new file mode 100644
index 0000000000..ba4a0997c1
--- /dev/null
+++ b/resources/js/test/factories/createTicket.ts
@@ -0,0 +1,11 @@
+import { createFactory } from '@/test/createFactory';
+
+import { createAchievement } from './createAchievement';
+
+export const createTicket = createFactory<App.Platform.Data.Ticket>((faker) => {
+  return {
+    id: faker.number.int({ min: 1, max: 99999 }),
+    ticketableType: 'achievement',
+    ticketable: createAchievement(),
+  };
+});
diff --git a/resources/js/test/factories/index.ts b/resources/js/test/factories/index.ts
index ff28928310..522bd01457 100644
--- a/resources/js/test/factories/index.ts
+++ b/resources/js/test/factories/index.ts
@@ -5,6 +5,9 @@ export * from './createActivePlayer';
 export * from './createComment';
 export * from './createEmulator';
 export * from './createEventAchievement';
+export * from './createForum';
+export * from './createForumCategory';
+export * from './createForumTopic';
 export * from './createForumTopicComment';
 export * from './createGame';
 export * from './createGameClaimant';
@@ -28,12 +31,14 @@ export * from './createPlayerGameActivitySummary';
 export * from './createPlayerGameClientBreakdown';
 export * from './createPlayerResettableGame';
 export * from './createPlayerResettableGameAchievement';
+export * from './createRaEvent';
 export * from './createRecentActiveForumTopic';
 export * from './createRecentLeaderboardEntry';
 export * from './createRecentPlayerBadge';
 export * from './createRecentUnlock';
 export * from './createSubscription';
 export * from './createSystem';
+export * from './createTicket';
 export * from './createTrendingGame';
 export * from './createUser';
 export * from './createZiggyProps';
diff --git a/resources/js/test/setup.tsx b/resources/js/test/setup.tsx
index fa0ed7e429..5749e1153e 100644
--- a/resources/js/test/setup.tsx
+++ b/resources/js/test/setup.tsx
@@ -116,6 +116,7 @@ export function render<TPageProps = Record<string, unknown>>(
 */
 
 type RenderHookOptions<Props> = RTLRenderHookOptions<Props> & {
+  jotaiAtoms?: [WritableAtom<unknown, any[], unknown>, unknown][];
   pageProps?: Partial<AppGlobalProps>;
   url?: any;
 };
@@ -123,9 +124,10 @@ type RenderHookOptions<Props> = RTLRenderHookOptions<Props> & {
 export function renderHook<Result, Props = undefined>(
   callback: (props: Props) => Result,
   {
-    wrapper,
     initialProps,
+    jotaiAtoms,
     url,
+    wrapper,
     pageProps = {} as Partial<AppGlobalProps>,
     ...options
   }: RenderHookOptions<Props> = {},
@@ -142,7 +144,11 @@ export function renderHook<Result, Props = undefined>(
   }));
 
   if (!wrapper) {
-    wrapper = ({ children }: WrapperProps) => <AppProviders i18n={i18n}>{children}</AppProviders>;
+    wrapper = ({ children }: WrapperProps) => (
+      <AppProviders i18n={i18n}>
+        <HydrateAtoms initialValues={toHydrateValues(jotaiAtoms)}>{children}</HydrateAtoms>
+      </AppProviders>
+    );
   }
 
   return defaultRenderHook(callback, { wrapper, initialProps, ...options });
diff --git a/resources/js/types/generated.d.ts b/resources/js/types/generated.d.ts
index 6f7f9280d7..b9a8299f08 100644
--- a/resources/js/types/generated.d.ts
+++ b/resources/js/types/generated.d.ts
@@ -145,6 +145,7 @@ declare namespace App.Community.Enums {
     | 'Achievement'
     | 'GameTickets'
     | 'GameAchievements';
+  export type TicketState = 0 | 1 | 2 | 3 | 'Demoted';
   export type TicketType = 1 | 2;
   export type UserGameListType = 'achievement_set_request' | 'play' | 'develop';
 }
@@ -165,6 +166,22 @@ declare namespace App.Data {
     allTimeHighPlayers: number;
     allTimeHighDate: string | null;
   };
+  export type EditForumTopicCommentPageProps = {
+    forumTopicComment: App.Data.ForumTopicComment;
+  };
+  export type ForumCategory = {
+    id: number;
+    title: string;
+    description?: string;
+    orderColumn?: number;
+  };
+  export type Forum = {
+    id: number;
+    title: string;
+    description?: string;
+    orderColumn?: number;
+    category?: App.Data.ForumCategory;
+  };
   export type ForumTopicComment = {
     id: number;
     body: string;
@@ -173,12 +190,14 @@ declare namespace App.Data {
     user: App.Data.User | null;
     isAuthorized: boolean;
     forumTopicId: number | null;
+    forumTopic?: App.Data.ForumTopic | null;
   };
   export type ForumTopic = {
     id: number;
     title: string;
     createdAt: string;
-    latestComment?: App.Data.ForumTopicComment;
+    forum?: App.Data.Forum | null;
+    latestComment?: App.Data.ForumTopicComment | null;
     commentCount24h?: number | null;
     oldestComment24hId?: number | null;
     commentCount7d?: number | null;
@@ -372,9 +391,14 @@ declare namespace App.Platform.Data {
   export type EventAchievement = {
     achievement?: App.Platform.Data.Achievement;
     sourceAchievement?: App.Platform.Data.Achievement;
+    event?: App.Platform.Data.Event;
     activeUntil?: string;
     forumTopicId?: number;
   };
+  export type Event = {
+    id: number;
+    legacyGame?: App.Platform.Data.Game;
+  };
   export type GameClaimant = {
     user: App.Data.User;
     claimType: string;
@@ -597,6 +621,15 @@ declare namespace App.Platform.Data {
     persistedViewPreferences: Record<string, any> | null;
     defaultDesktopPageSize: number;
   };
+  export type Ticket = {
+    id: number;
+    ticketableType: App.Platform.Enums.TicketableType;
+    state?: number;
+    ticketable?:
+      | App.Platform.Data.Achievement
+      | App.Platform.Data.Leaderboard
+      | App.Platform.Data.Game;
+  };
 }
 declare namespace App.Platform.Enums {
   export type UnlockMode = 0 | 1;
@@ -647,6 +680,7 @@ declare namespace App.Platform.Enums {
     | 'want-to-play';
   export type PlayerPreferredMode = 'softcore' | 'hardcore' | 'mixed';
   export type ReleasedAtGranularity = 'day' | 'month' | 'year';
+  export type TicketableType = 'achievement' | 'leaderboard' | 'rich-presence';
 }
 declare namespace App.Platform.Services.GameSuggestions.Enums {
   export type SourceGameKind = 'beaten' | 'mastered' | 'want-to-play';
diff --git a/resources/js/types/global.d.ts b/resources/js/types/global.d.ts
index f2294780b7..fbf00bc12d 100644
--- a/resources/js/types/global.d.ts
+++ b/resources/js/types/global.d.ts
@@ -2,6 +2,7 @@ import type { Alpine } from 'alpinejs';
 import type { IconType } from 'react-icons/lib';
 import type { route as routeFn } from 'ziggy-js';
 
+import type { getStringByteCount as GetStringByteCount } from '@/common/utils/getStringByteCount';
 import type {
   modalComponent as ModalComponent,
   navbarSearchComponent as NavbarSearchComponent,
@@ -15,7 +16,6 @@ import type {
   setCookie as SetCookie,
 } from '@/tall-stack/utils/cookie';
 import type { fetcher as Fetcher } from '@/tall-stack/utils/fetcher';
-import type { getStringByteCount as GetStringByteCount } from '@/tall-stack/utils/getStringByteCount';
 import type { handleLeaderboardTabClick as HandleLeaderboardTabClick } from '@/tall-stack/utils/handleLeaderboardTabClick';
 import type { initializeTextareaCounter as InitializeTextareaCounter } from '@/tall-stack/utils/initializeTextareaCounter';
 import type { injectShortcode as InjectShortcode } from '@/tall-stack/utils/injectShortcode';
diff --git a/resources/js/ziggy.d.ts b/resources/js/ziggy.d.ts
index 2195b10820..cb2f48d4b7 100644
--- a/resources/js/ziggy.d.ts
+++ b/resources/js/ziggy.d.ts
@@ -266,6 +266,14 @@ declare module 'ziggy-js' {
             "binding": "ID"
         }
     ],
+    "api.forum-topic-comment.preview": [],
+    "api.forum-topic-comment.update": [
+        {
+            "name": "comment",
+            "required": true,
+            "binding": "id"
+        }
+    ],
     "api.game.claims.comment.store": [
         {
             "name": "game",
@@ -506,6 +514,13 @@ declare module 'ziggy-js' {
         }
     ],
     "forum.recent-posts": [],
+    "forum-topic-comment.edit": [
+        {
+            "name": "comment",
+            "required": true,
+            "binding": "id"
+        }
+    ],
     "user.posts.index": [
         {
             "name": "user",
diff --git a/resources/views/components/base/form/user-select.blade.php b/resources/views/components/base/form/user-select.blade.php
index ec761c0d97..a4dc18c3bc 100644
--- a/resources/views/components/base/form/user-select.blade.php
+++ b/resources/views/components/base/form/user-select.blade.php
@@ -9,6 +9,7 @@
     'fullWidth' => false,
     'help' => null,
     'id' => null,
+    'initialStableUsername' => null, // ?string
     'inline' => false,
     'isLabelVisible' => true,
     'label' => null,
@@ -29,17 +30,19 @@
 $id = $id ?: 'input_' . Str::random();
 
 $value = $name ? old($name, $model?->getAttribute($name) ?? $value) : $value;
-$username = $value ?: '_User';
+$username = $initialStableUsername ?? $value ?: '_User';
 $imageSource = media_asset("/UserPic/$username.png");
 ?>
 
 <script>
-function onUserChange(fieldId, imageId) {
+let selectedUsername = null;
+
+function onUserChange(fieldId, imageId, selectedUsername) {
     const fieldValue = $('#' + fieldId).val();
-    if (fieldValue.length > 2) {
+    if (fieldValue.length > 2 && selectedUsername) {
         const fieldIcon = $('#' + imageId);
         if (fieldIcon) {
-            fieldIcon.attr('src', mediaAsset('/UserPic/' + fieldValue + '.png'));
+            fieldIcon.attr('src', mediaAsset('/UserPic/' + selectedUsername + '.png'));
         }
     }
 }
@@ -47,6 +50,9 @@ function onUserChange(fieldId, imageId) {
 $(function () {
     const $searchUser = $('#{{ $id }}');
 
+    const fieldId = '{{ $id }}';
+    const imageId = 'select-user-avatar-{{ $id }}';
+
     $searchUser.autocomplete({
         source: function (request, response) {
           request.source = 'user';
@@ -62,14 +68,17 @@ function onUserChange(fieldId, imageId) {
         select: function (event, ui) {
           var TABKEY = 9;
           if (event.keyCode === TABKEY) {
-            $('.searchusericon').attr('src', mediaAsset('/UserPic/' + ui.item.label + '.png'));
+            selectedUsername = ui.item.username;
+            onUserChange(fieldId, imageId, selectedUsername);
           }
         },
     });
 
     $searchUser.on('autocompleteselect', function (event, ui) {
-        $searchUser.val(ui.item.label);
-        $('.searchusericon').attr('src', mediaAsset('/UserPic/' + ui.item.label + '.png'));
+        $searchUser.val(ui.item.username);
+
+        selectedUsername = ui.item.username;
+        onUserChange(fieldId, imageId, selectedUsername);
     });
 });
 </script>
diff --git a/resources/views/components/menu/account.blade.php b/resources/views/components/menu/account.blade.php
index 16e065dccb..af56ea1833 100644
--- a/resources/views/components/menu/account.blade.php
+++ b/resources/views/components/menu/account.blade.php
@@ -49,9 +49,9 @@
         <x-slot name="trigger">
             <x-user.avatar :user="$user" display="icon" :hasHref="false" iconSize="sm" :tooltip="false" class="rounded-sm userpic" />
         </x-slot>
-        <x-dropdown-header>{{ $user->username }}</x-dropdown-header>
-        <x-dropdown-item :href="route('user.show', $user)">{{ __res('profile', 1) }}</x-dropdown-item>
-        <x-dropdown-item :href="route('user.completion-progress', ['user' => $user])">Completion Progress</x-dropdown-item>
+        <x-dropdown-header>{{ $user->display_name }}</x-dropdown-header>
+        <x-dropdown-item :href="route('user.show', $user->display_name)">{{ __res('profile', 1) }}</x-dropdown-item>
+        <x-dropdown-item :href="route('user.completion-progress', ['user' => $user->display_name])">Completion Progress</x-dropdown-item>
 
         @if($user->Permissions >= Permissions::Registered)
             <x-dropdown-item :href="route('game-list.play.index')">Want to Play Games</x-dropdown-item>
@@ -60,26 +60,26 @@
         @if($user->ContribCount > 0 || $user->Permissions >= Permissions::JuniorDeveloper)
             <div class="dropdown-divider"></div>
             @if($user->ContribCount > 0)
-                <x-dropdown-item :href="url('individualdevstats.php?u=' . $user->username)">Developer Profile</x-dropdown-item>
+                <x-dropdown-item :href="url('individualdevstats.php?u=' . $user->display_name)">Developer Profile</x-dropdown-item>
             @endif
             @if($user->Permissions >= Permissions::Developer)
                 <x-dropdown-item :href="url('gameList.php?t=develop&f=2')">Want to Develop Games</x-dropdown-item>
             @endif
             @if($user->ContribCount > 0)
-                <x-dropdown-item :href="route('user.achievement-author.feed', ['user' => $user])">Feed</x-dropdown-item>
+                <x-dropdown-item :href="route('user.achievement-author.feed', ['user' => $user->display_name])">Feed</x-dropdown-item>
             @endif
             @if($user->ContribCount > 0)
-                <x-dropdown-item :href="route('developer.tickets', ['user' => $user])">Tickets</x-dropdown-item>
-                <x-dropdown-item :href="route('developer.sets', ['user' => $user])">Sets</x-dropdown-item>
+                <x-dropdown-item :href="route('developer.tickets', ['user' => $user->display_name])">Tickets</x-dropdown-item>
+                <x-dropdown-item :href="route('developer.sets', ['user' => $user->display_name])">Sets</x-dropdown-item>
             @endif
             @if($user->Permissions >= Permissions::JuniorDeveloper)
-                <x-dropdown-item :href="route('developer.claims', ['user' => $user])">Claims</x-dropdown-item>
+                <x-dropdown-item :href="route('developer.claims', ['user' => $user->display_name])">Claims</x-dropdown-item>
             @endif
         @endif
         <div class="dropdown-divider"></div>
         <x-dropdown-item :href="url('achievementList.php?s=19&p=1')">Unlocked Achievements</x-dropdown-item>
-        <x-dropdown-item :href="url('setRequestList.php?u=' . $user->username)">Requested Sets</x-dropdown-item>
-        <x-dropdown-item :href="route('user.tickets.created', ['user' => $user])">Created Tickets</x-dropdown-item>
+        <x-dropdown-item :href="url('setRequestList.php?u=' . $user->display_name)">Requested Sets</x-dropdown-item>
+        <x-dropdown-item :href="route('user.tickets.created', ['user' => $user->display_name])">Created Tickets</x-dropdown-item>
         {{--<a class="dropdown-item" href="{{ route('history.index') }}">History</a>--}}
         <x-dropdown-item :href="url('history.php')">History</x-dropdown-item>
         {{--<x-dropdown-item :href="route('follower.index')">{{ __res('follower') }}</x-dropdown-item>--}}
diff --git a/resources/views/components/user/breadcrumbs.blade.php b/resources/views/components/user/breadcrumbs.blade.php
index 29167cf648..8b083179fa 100644
--- a/resources/views/components/user/breadcrumbs.blade.php
+++ b/resources/views/components/user/breadcrumbs.blade.php
@@ -1,5 +1,5 @@
 @props([
-    'targetUsername' => '',
+    'targetDisplayName' => '',
     'parentPage' => '',
     'parentPageUrl' => '',
     'currentPage' => '',
@@ -9,9 +9,9 @@
     <a href='/userList.php'>All Users</a>
     &raquo;
     @if (empty($currentPage))
-        <span class="font-bold"><a href="{{ route('user.show', $targetUsername) }}">{{ $targetUsername }}</a></span>
+        <span class="font-bold"><a href="{{ route('user.show', $targetDisplayName) }}">{{ $targetDisplayName }}</a></span>
     @else
-        <a href="{{ route('user.show', $targetUsername) }}">{{ $targetUsername }}</a>
+        <a href="{{ route('user.show', $targetDisplayName) }}">{{ $targetDisplayName }}</a>
         &raquo;
         @if (!empty($parentPage))
             <a href="{!! $parentPageUrl !!}">{{ $parentPage }}</a>
diff --git a/resources/views/components/user/completion-progress/index.blade.php b/resources/views/components/user/completion-progress/index.blade.php
index 166e2e195f..54bb953f1b 100644
--- a/resources/views/components/user/completion-progress/index.blade.php
+++ b/resources/views/components/user/completion-progress/index.blade.php
@@ -1,6 +1,6 @@
 @props([
     'userJoinedGamesAndAwards' => [],
-    'username' => '',
+    'username' => '', // this is display_name
 ])
 
 <?php
diff --git a/resources/views/components/user/profile/primary-meta.blade.php b/resources/views/components/user/profile/primary-meta.blade.php
index 84e796cb93..fa1eea3af1 100644
--- a/resources/views/components/user/profile/primary-meta.blade.php
+++ b/resources/views/components/user/profile/primary-meta.blade.php
@@ -30,15 +30,15 @@
 
 <div class="relative flex border-x border-embed-highlight flex-row-reverse sm:flex-row gap-x-4 pb-5 bg-embed -mx-5 px-5 mt-[-15px] pt-5">
     <img
-        src="{{ media_asset('/UserPic/' . $user->User . '.png') }}"
-        alt="{{ $user->User }}'s avatar"
+        src="{{ $user->avatar_url }}"
+        alt="{{ $user->display_name }}'s avatar"
         class="rounded-sm h-[64px] w-[64px] sm:max-h-[128px] sm:max-w-[128px] sm:min-w-[128px] sm:min-h-[128px]"
     >
 
     <div class="w-full">
         <div class="flex sm:-mt-1 sm:flex-row sm:justify-start sm:items-center gap-x-2 {{ $hasVisibleRole ? 'mb-2 sm:mb-0' : '' }} {{ $shouldMoveRoleToNextLine ? 'flex-col' : 'items-center' }}">
             {{-- Username --}}
-            <h1 class='border-0 text-lg sm:text-2xl font-semibold mb-0'>{{ $user->User }}</h1>
+            <h1 class='border-0 text-lg sm:text-2xl font-semibold mb-0'>{{ $user->display_name }}</h1>
 
             {{-- Legacy Role --}}
             {{-- TODO: Support N roles. --}}
diff --git a/resources/views/components/user/profile/social-interactivity.blade.php b/resources/views/components/user/profile/social-interactivity.blade.php
index 1114dbdef4..dddd57945b 100644
--- a/resources/views/components/user/profile/social-interactivity.blade.php
+++ b/resources/views/components/user/profile/social-interactivity.blade.php
@@ -17,20 +17,20 @@
         @if ($myFriendshipType !== UserRelationship::Blocked)
             <form action="/request/user/update-relationship.php" method="POST">
                 {!! csrf_field() !!}
-                <input type="hidden" name="user" value="{{ $user->User }}">
+                <input type="hidden" name="user" value="{{ $user->display_name }}">
                 <input type="hidden" name="action" value="{{ UserRelationship::Blocked }}">
                 <button class="btn btn-link">Block</button>
             </form>
         @else
             <form action="/request/user/update-relationship.php" method="POST">
                 {!! csrf_field() !!}
-                <input type="hidden" name="user" value="{{ $user->User }}">
+                <input type="hidden" name="user" value="{{ $user->display_name }}">
                 <input type="hidden" name="action" value="{{ UserRelationship::NotFollowing }}">
                 <button class="btn btn-link">Unblock</button>
             </form>
         @endif
 
-        <a class="btn max-h-[24px] flex items-center" href="{{ route('message.create', ['to' => $user->User]) }}">
+        <a class="btn max-h-[24px] flex items-center" href="{{ route('message.create', ['to' => $user->display_name]) }}">
             <x-fas-envelope />
             <span class="sr-only">Message</span>
         </a>
@@ -38,14 +38,14 @@
         @if ($myFriendshipType === UserRelationship::Following)
             <form action="/request/user/update-relationship.php" method="POST">
                 {!! csrf_field() !!}
-                <input type="hidden" name="user" value="{{ $user->User }}">
+                <input type="hidden" name="user" value="{{ $user->display_name }}">
                 <input type="hidden" name="action" value="{{ UserRelationship::NotFollowing }}">
                 <button class="btn btn max-h-[24px] flex items-center">Unfollow</button>
             </form>
         @elseif ($myFriendshipType === UserRelationship::NotFollowing)
             <form action="/request/user/update-relationship.php" method="POST">
                 {!! csrf_field() !!}
-                <input type="hidden" name="user" value="{{ $user->User }}">
+                <input type="hidden" name="user" value="{{ $user->display_name }}">
                 <input type="hidden" name="action" value="{{ UserRelationship::Following }}">
                 <button class="btn max-h-[24px] flex items-center">
                     Follow
diff --git a/resources/views/filament/pages/audit-log.blade.php b/resources/views/filament/pages/audit-log.blade.php
index 5c3f1f28a5..f267e24b66 100644
--- a/resources/views/filament/pages/audit-log.blade.php
+++ b/resources/views/filament/pages/audit-log.blade.php
@@ -12,7 +12,7 @@
                                 <x-filament-panels::avatar.user :user="$auditLogItem->causer" />
                             @endif
                             <div class="flex flex-col text-left">
-                                <span class="font-bold">{{ $auditLogItem->causer?->User }}</span>
+                                <span class="font-bold">{{ $auditLogItem->causer?->display_name }}</span>
                                 <span class="text-xs text-gray-500">
                                     <div class="inline-block">
                                         <x-filament::badge
diff --git a/resources/views/livewire/forum/edit-topic-comment-form.blade.php b/resources/views/livewire/forum/edit-topic-comment-form.blade.php
index 39207f8068..71960b6132 100644
--- a/resources/views/livewire/forum/edit-topic-comment-form.blade.php
+++ b/resources/views/livewire/forum/edit-topic-comment-form.blade.php
@@ -34,7 +34,6 @@
 
             <x-base.form.textarea
                 wire:model="form.body"
-                :value="$forumTopicComment->body"
                 id="input_compose"
                 maxlength="60000"
                 name="form.body"
diff --git a/resources/views/livewire/game/user-achievements-grid.blade.php b/resources/views/livewire/game/user-achievements-grid.blade.php
index a6af8b1525..05bd5cadbc 100644
--- a/resources/views/livewire/game/user-achievements-grid.blade.php
+++ b/resources/views/livewire/game/user-achievements-grid.blade.php
@@ -19,7 +19,7 @@
 // == actions
 $loadContent = function() {
     $game = Game::find($this->gameId);
-    $user = User::firstWhere('User', $this->targetUsername);
+    $user = User::whereName($this->targetUsername)->first();
 
     $service = new GameUserAchievementsGridService();
     $this->gameAchievementsWithProgress = $service->getGameAchievementsWithUserProgress(
diff --git a/resources/views/pages-legacy/achievementInfo.blade.php b/resources/views/pages-legacy/achievementInfo.blade.php
index df9cf9d1e4..a2b7190776 100644
--- a/resources/views/pages-legacy/achievementInfo.blade.php
+++ b/resources/views/pages-legacy/achievementInfo.blade.php
@@ -19,7 +19,7 @@
 
 authenticateFromCookie($user, $permissions, $userDetails);
 
-$userModel = User::firstWhere('User', $user);
+$userModel = User::whereName($user)->first();
 
 $achievementID = (int) request('achievement');
 if (empty($achievementID)) {
@@ -84,9 +84,9 @@
     50
 );
 
-$trackedUnlocksUsers = User::whereIn('User', $unlocks->pluck('User')->unique())
+$trackedUnlocksUsers = User::whereIn('display_name', $unlocks->pluck('User')->unique())
     ->where('Untracked', false)
-    ->pluck('User');
+    ->pluck('display_name');
 
 $unlocks = $unlocks->filter(fn ($unlock) => $trackedUnlocksUsers->contains($unlock['User']));
 
diff --git a/resources/views/pages-legacy/achievementList.blade.php b/resources/views/pages-legacy/achievementList.blade.php
index e5cf3f043b..8364bbcfb9 100644
--- a/resources/views/pages-legacy/achievementList.blade.php
+++ b/resources/views/pages-legacy/achievementList.blade.php
@@ -13,7 +13,7 @@
 
 authenticateFromCookie($user, $permissions, $userDetails);
 
-$userModel = $user ? User::firstWhere('User', $user) : null;
+$userModel = $user ? User::whereName($user)->first() : null;
 
 $maxCount = 25;
 
@@ -34,7 +34,10 @@
 $devUser = null;
 if ($dev != null) {
     $dev_param .= "&d=$dev";
-    $devUser = User::firstWhere('User', $dev);
+    $devUser = User::whereName($dev)->first();
+}
+if (is_string($dev) && !$devUser) {
+    $devUser = User::whereName($dev)->first();
 }
 
 $sortBy = (int) request()->input('s', 17);
@@ -60,7 +63,7 @@
 
     echo "<h3>";
     if ($dev != null) {
-        echo "<a href='/user/$dev'>$dev</a>'s ";
+        echo "<a href='/user/$dev'>{$devUser->display_name}</a>'s ";
     }
     echo "Achievement List</h3>";
 
diff --git a/resources/views/pages-legacy/admin.blade.php b/resources/views/pages-legacy/admin.blade.php
index 7e9f7363b6..5b316fa6db 100644
--- a/resources/views/pages-legacy/admin.blade.php
+++ b/resources/views/pages-legacy/admin.blade.php
@@ -15,7 +15,7 @@
 if ($action === 'alt_identifier') {
     $altsForUser = request()->input('u');
 
-    $forUser = User::where('User', $altsForUser)->first();
+    $forUser = User::whereName($altsForUser)->first();
     if ($forUser == null) {
         $message = "Unknown user: $altsForUser";
     } else {
@@ -153,70 +153,6 @@
         </form>
     </section>
 
-    <section class="mb-4">
-        <?php
-        $eventAotwAchievementID = $staticData['Event_AOTW_AchievementID'] ?? null;
-        $eventAotwStartAt = $staticData['Event_AOTW_StartAt'] ?? null;
-        $eventAotwForumTopicID = $staticData['Event_AOTW_ForumID'] ?? null;
-        ?>
-        <h4>Achievement of the Week</h4>
-        <form method="post" action="request/admin.php">
-            @csrf()
-            <input type="hidden" name="action" value="aotw">
-            <table class="mb-1">
-                <colgroup>
-                    <col>
-                    <col>
-                    <col class="w-full">
-                </colgroup>
-                <tbody>
-                <tr>
-                    <td class="whitespace-nowrap">
-                        <label for="event_aotw_achievement_id">Achievement ID</label>
-                    </td>
-                    <td>
-                        <input id="event_aotw_achievement_id" name="a" value="<?= $eventAotwAchievementID ?>">
-                    </td>
-                    <td>
-                        <a href="/achievement/<?= $eventAotwAchievementID ?>">Link</a>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="whitespace-nowrap">
-                        <label for="event_aotw_start_at">Start At (UTC time)</label>
-                    </td>
-                    <td>
-                        <input id="event_aotw_start_at" name="s" value="<?= $eventAotwStartAt ?>">
-                    </td>
-                    <td>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="whitespace-nowrap">
-                        <label for="event_aotw_forum_topic_id">Forum Topic ID</label>
-                    </td>
-                    <td>
-                        <input id="event_aotw_forum_topic_id" name="f" value="<?= $eventAotwForumTopicID ?>">
-                    </td>
-                    <td>
-                        <a href="/viewtopic.php?t=<?= $eventAotwForumTopicID ?>">Link</a>
-                    </td>
-                </tr>
-                </tbody>
-            </table>
-            <button class="btn">Submit</button>
-        </form>
-
-        <div id="aotw_entries"></div>
-
-        <script>
-            jQuery('#event_aotw_start_at').datetimepicker({
-                format: 'Y-m-d H:i:s',
-                mask: true, // '9999/19/39 29:59' - digit is the maximum possible for a cell
-            });
-        </script>
-    </section>
-
     <section class="mb-4">
         <h4>Alt Identifier</h4>
         <form action="admin.php">
diff --git a/resources/views/pages-legacy/codenotes.blade.php b/resources/views/pages-legacy/codenotes.blade.php
index ba08a7b899..1f19e33581 100644
--- a/resources/views/pages-legacy/codenotes.blade.php
+++ b/resources/views/pages-legacy/codenotes.blade.php
@@ -1,6 +1,7 @@
 <?php
 
 use App\Enums\Permissions;
+use App\Models\User;
 
 authenticateFromCookie($user, $permissions, $userDetails);
 
@@ -10,6 +11,8 @@
     abort(404);
 }
 
+$userModel = User::find($userDetails['ID']);
+
 getCodeNotes($gameID, $codeNotes);
 $codeNoteCount = count(array_filter($codeNotes, function ($x) { return $x['Note'] !== "" && $x['Note'] !== "''"; }));
 
diff --git a/resources/views/pages-legacy/friends.blade.php b/resources/views/pages-legacy/friends.blade.php
index 35dd5f189c..4b46f963cc 100644
--- a/resources/views/pages-legacy/friends.blade.php
+++ b/resources/views/pages-legacy/friends.blade.php
@@ -25,7 +25,7 @@
 // GetExtendedFriendsList() returns most recent users first. sort by name for block list
 asort($blockedUsersList);
 
-$followersList = $userModel->followerUsers()->pluck('UserAccounts.User')->toArray();
+$followersList = $userModel->followerUsers()->pluck('UserAccounts.display_name')->toArray();
 ?>
 
 <x-app-layout pageTitle="Following">
diff --git a/resources/views/pages-legacy/gameInfo.blade.php b/resources/views/pages-legacy/gameInfo.blade.php
index aed0ae1011..17e94fe2cc 100644
--- a/resources/views/pages-legacy/gameInfo.blade.php
+++ b/resources/views/pages-legacy/gameInfo.blade.php
@@ -776,37 +776,14 @@ function resize() {
                 echo "</form>";
             }
 
-            if ($permissions >= Permissions::Developer) {
-                echo "<form class='mb-2' method='post' action='/request/game-relation/create.php'>";
-                echo csrf_field();
-                echo "<input type='hidden' name='game' value='$gameID'>";
-                echo "<div class='md:grid grid-cols-[180px_1fr_100px] gap-1 items-center mb-1'>";
-                echo "<label for='game_relation_add'>Add Related Games<br>(CSV of game IDs)</label>";
-                echo "<input type='text' name='relations' id='game_relation_add' class='w-full'>";
-                echo "<div class='text-right'><button class='btn'>Add</button></div>";
-                echo "</div>";
-                echo "</form>";
+            if ($userModel && $userModel->can('manage', [\App\Models\GameSet::class])) {
+                $manageSimilarGamesHref = route('filament.admin.resources.games.similar-games', ['record' => $gameID]);
+                $manageHubsHref = route('filament.admin.resources.games.hubs', ['record' => $gameID]);
 
-                if (!empty($relatedGames)) {
-                    echo "<form class='mb-2' method='post' action='/request/game-relation/delete.php'>";
-                    echo csrf_field();
-                    echo "<input type='hidden' name='game' value='$gameID'>";
-                    echo "<div><label for='game_relations'>Related Games</label></div>";
-                    echo "<select class='resize-y w-full overflow-auto h-[125px] mb-1' name='relations[]' id='game_relations' multiple>";
-                    foreach ($relatedGames as $gameAlt) {
-                        $gameAltID = $gameAlt['gameIDAlt'];
-                        $gameAltTitle = $gameAlt['Title'];
-                        $gameAltConsole = $gameAlt['ConsoleName'];
-                        sanitize_outputs(
-                            $gameAltTitle,
-                            $gameAltConsole,
-                        );
-                        echo "<option value='$gameAltID'>$gameAltTitle ($gameAltConsole)</option>";
-                    }
-                    echo "</select>";
-                    echo "<div class='text-right'><button class='btn btn-danger' onclick='return confirm(\"Are you sure you want to remove the selected relations?\")'>Remove</button></div>";
-                    echo "</form>";
-                }
+                echo "<div class='mb-2 flex flex-col gap-2'>";
+                echo "<a href='{$manageHubsHref}'>Manage Related Hubs</a>";
+                echo "<a href='{$manageSimilarGamesHref}'>Manage Similar Games</a>";
+                echo "</div>";
             }
             if ($isFullyFeaturedGame) {
                 echo "<div><label for='game_rich_presence'><a href='https://docs.retroachievements.org/developer-docs/rich-presence.html'>Rich Presence</a> Script</label></div>";
diff --git a/resources/views/pages-legacy/history.blade.php b/resources/views/pages-legacy/history.blade.php
index 7601de1e0e..0bd124893b 100644
--- a/resources/views/pages-legacy/history.blade.php
+++ b/resources/views/pages-legacy/history.blade.php
@@ -6,13 +6,11 @@
 authenticateFromCookie($user, $permissions, $userDetails);
 
 $userPage = requestInputSanitized('u', $user);
+$userDetails = User::whereName($userPage)->first();
 
-if (!isset($userPage) || !isValidUsername($userPage)) {
-    abort(404);
-}
+$userPage = $userDetails?->display_name ?? $userDetails?->username;
 
-$userDetails = User::firstWhere('User', $userPage);
-if (!$userDetails) {
+if (!isset($userPage) || !$userDetails) {
     abort(404);
 }
 
@@ -208,7 +206,7 @@ function convertDate() {
     echo "<h3>History</h3>";
 
     echo "<div>";
-    echo "<img src='" . media_asset('/UserPic/' . $userPage . '.png') . "' alt='$userPage' align='right' width='64' height='64' class='rounded-sm'>";
+    echo "<img src='" . media_asset('/UserPic/' . $userDetails->username . '.png') . "' alt='$userPage' align='right' width='64' height='64' class='rounded-sm'>";
     echo "<b><a href='/user/$userPage'><strong>$userPage</strong></a> ";
     if ($userPageHardcorePoints > 0) {
         echo "(" . localized_number($userPageHardcorePoints) . ") ";
diff --git a/resources/views/pages-legacy/historyexamine.blade.php b/resources/views/pages-legacy/historyexamine.blade.php
index 1e9d5cc2aa..53b75d3db4 100644
--- a/resources/views/pages-legacy/historyexamine.blade.php
+++ b/resources/views/pages-legacy/historyexamine.blade.php
@@ -10,11 +10,13 @@
     abort(404);
 }
 
-$userDetails = User::firstWhere('User', $userPage);
+$userDetails = User::whereName($userPage)->first();
 if (!$userDetails) {
     abort(404);
 }
 
+$userPage = $userDetails->display_name;
+
 $dateInput = (int) request()->input('d', 0);
 
 $userPageHardcorePoints = $userDetails->RAPoints;
diff --git a/resources/views/pages-legacy/individualdevstats.blade.php b/resources/views/pages-legacy/individualdevstats.blade.php
index 0e717538e9..c7e33d88fb 100644
--- a/resources/views/pages-legacy/individualdevstats.blade.php
+++ b/resources/views/pages-legacy/individualdevstats.blade.php
@@ -12,11 +12,11 @@
 }
 
 /** @var ?User $devUser */
-$devUser = User::firstWhere('User', $dev);
+$devUser = User::whereName($dev)->first();
 if (!$devUser) {
     abort(404);
 }
-$dev = $devUser->User; // get case-corrected username
+$dev = $devUser->display_name; // get case-corrected username
 
 $userArchInfo = getUserAchievementInformation($devUser);
 
@@ -215,7 +215,7 @@
 $userCodeNoteCount = 0;
 
 // Get code note information for user
-$codeNotes = collect(getCodeNoteCounts($dev));
+$codeNotes = collect(getCodeNoteCounts($devUser));
 $userCodeNoteCount = $codeNotes->sum('NoteCount');
 
 // Initialize ticket information variables
@@ -648,7 +648,7 @@ function drawChart() {
         echo "</tbody></table>";
 
         // Recently Obtained achievements
-        $feedRoute = route('user.achievement-author.feed', ['user' => $devUser]);
+        $feedRoute = route('user.achievement-author.feed', ['user' => $devUser->display_name]);
         echo <<<HTML
             <p class="text-center text-lg font-semibold my-8">
                 View Recently Obtained Achievements in the
diff --git a/resources/views/pages-legacy/leaderboardinfo.blade.php b/resources/views/pages-legacy/leaderboardinfo.blade.php
index 0d97abe8b2..f0638c932d 100644
--- a/resources/views/pages-legacy/leaderboardinfo.blade.php
+++ b/resources/views/pages-legacy/leaderboardinfo.blade.php
@@ -34,7 +34,7 @@
 $lbTitle = $leaderboard->title;
 $lbDescription = $leaderboard->description;
 $lbFormat = $leaderboard->format;
-$lbAuthor = $leaderboard?->developer?->User;
+$lbAuthor = $leaderboard?->developer?->display_name;
 $lbCreated = $leaderboard->created_at;
 $lbUpdated = $leaderboard->updated_at;
 $lbMemory = $leaderboard->Mem;
diff --git a/resources/views/pages-legacy/reorderSiteAwards.blade.php b/resources/views/pages-legacy/reorderSiteAwards.blade.php
index 10e486eae0..3324df22f6 100644
--- a/resources/views/pages-legacy/reorderSiteAwards.blade.php
+++ b/resources/views/pages-legacy/reorderSiteAwards.blade.php
@@ -10,7 +10,7 @@
 
 $prefersSeeingSavedHiddenRows = request()->cookie('prefers_seeing_saved_hidden_rows_when_reordering') === 'true';
 
-$targetUser = User::firstWhere('User', $user);
+$targetUser = User::whereName($user)->first();
 
 $userAwards = getUsersSiteAwards($targetUser, true);
 [$gameAwards, $eventAwards, $siteAwards] = SeparateAwards($userAwards);
diff --git a/resources/views/pages-legacy/setRequestList.blade.php b/resources/views/pages-legacy/setRequestList.blade.php
index d7c7320052..c5eb1e46a3 100644
--- a/resources/views/pages-legacy/setRequestList.blade.php
+++ b/resources/views/pages-legacy/setRequestList.blade.php
@@ -51,7 +51,7 @@
         $totalRequestedGames = getGamesWithRequests($selectedConsoleId, $selectedRequestStatus);
     }
 } else {
-    $userModel = User::firstWhere('User', $username);
+    $userModel = User::whereName($username)->first();
     if (!$userModel) {
         abort(404);
     }
diff --git a/resources/views/pages-legacy/userInfo.blade.php b/resources/views/pages-legacy/userInfo.blade.php
index 9ea73da8cf..11c8f70944 100644
--- a/resources/views/pages-legacy/userInfo.blade.php
+++ b/resources/views/pages-legacy/userInfo.blade.php
@@ -11,7 +11,8 @@
 use App\Platform\Services\PlayerProgressionService;
 
 $userPage = request('user');
-if (empty($userPage) || !isValidUsername($userPage)) {
+$userPageModel = User::whereName($userPage)->first();
+if (empty($userPage) || !$userPageModel) {
     abort(404);
 }
 
@@ -23,11 +24,6 @@
     abort(400);
 }
 
-$userPageModel = User::firstWhere('User', $userPage);
-if (!$userPageModel) {
-    abort(404);
-}
-
 $userMassData = getUserPageInfo($userPage, numGames: $maxNumGamesToFetch);
 if (empty($userMassData)) {
     abort(404);
diff --git a/resources/views/pages/messages/create.blade.php b/resources/views/pages/messages/create.blade.php
index ceba190989..7ec97b1372 100644
--- a/resources/views/pages/messages/create.blade.php
+++ b/resources/views/pages/messages/create.blade.php
@@ -1,6 +1,7 @@
 <?php
 
 use App\Models\Message;
+use App\Models\User;
 use Illuminate\View\View;
 
 use function Laravel\Folio\{middleware, name, render};
@@ -9,11 +10,18 @@
 name('message.create');
 
 render(function (View $view) {
+    $to = request()->input('to') ?? '';
+    $toUser = null;
+    if ($to) {
+        $toUser = User::whereName($to)->first();
+    }
+
     return $view->with([
         'message' => request()->input('message') ?? '',
         'subject' => request()->input('subject') ?? '',
         'templateKind' => request()->input('templateKind') ?? null,
-        'toUser' => request()->input('to') ?? '',
+        'toUsername' => $to,
+        'toUser' => $toUser,
     ]);
 });
 
@@ -23,7 +31,8 @@
     'message' => '',
     'subject' => '',
     'templateKind' => null, // 'manual-unlock' | 'writing-error' | 'misclassification' | 'unwelcome-concept' | 'achievement-issue' | null
-    'toUser' => '',
+    'toUsername' => '',
+    'toUser' => null, // ?User
 ])
 
 <x-app-layout
@@ -45,13 +54,14 @@
             <div class="flex flex-col gap-y-3">
                 <x-base.form.user-select
                     :disabled="!!$templateKind"
+                    initialStableUsername="{{ $toUser?->username }}"
                     name="recipient"
-                    value="{{ $toUser }}"
+                    value="{{ $toUsername }}"
                     requiredSilent
                     inline
                 />
                 @if ($templateKind)
-                    <input type="hidden" name="recipient" value="{{ $toUser }}">
+                    <input type="hidden" name="recipient" value="{{ $toUsername }}">
                 @endif
 
                 <x-base.form.input
diff --git a/resources/views/pages/ticket/[ticket].blade.php b/resources/views/pages/ticket/[ticket].blade.php
index ab6d3a4fba..f6e3c87f5d 100644
--- a/resources/views/pages/ticket/[ticket].blade.php
+++ b/resources/views/pages/ticket/[ticket].blade.php
@@ -256,7 +256,7 @@ function AwardManually(hardcore) {
                             $commentUser = 
                                 ($comment['User'] === $ticket->reporter?->User) ? $ticket->reporter :
                                 (($comment['User'] === $user->User) ? $user :
-                                    User::firstWhere('User', $comment['User']));
+                                    User::whereName($comment['User'])->first());
                         @endphp
                         <x-comment.item
                             :author="$commentUser"
diff --git a/resources/views/pages/user/[user]/developer/claims.blade.php b/resources/views/pages/user/[user]/developer/claims.blade.php
index e05d0ac3ad..a8864cfd9b 100644
--- a/resources/views/pages/user/[user]/developer/claims.blade.php
+++ b/resources/views/pages/user/[user]/developer/claims.blade.php
@@ -74,7 +74,7 @@
 ])
 
 <x-app-layout pageTitle="{{ $user->display_name }}'s Claims">
-    <x-user.breadcrumbs :targetUsername="$user->User" currentPage="Claims" />
+    <x-user.breadcrumbs :targetDisplayName="$user->display_name" currentPage="Claims" />
 
     <div class="mt-3 mb-6 w-full flex gap-x-3">
         {!! userAvatar($user, label: false, iconSize: 48, iconClass: 'rounded-sm') !!}
diff --git a/resources/views/pages/user/[user]/developer/sets.blade.php b/resources/views/pages/user/[user]/developer/sets.blade.php
index 9a6626dcf1..d021c2a2ab 100644
--- a/resources/views/pages/user/[user]/developer/sets.blade.php
+++ b/resources/views/pages/user/[user]/developer/sets.blade.php
@@ -6,8 +6,6 @@
 
 use function Laravel\Folio\{name, render, withTrashed};
 
-withTrashed();
-
 name('developer.sets');
 
 render(function (View $view, User $user, DeveloperSetsService $pageService) {
@@ -28,14 +26,14 @@
 ])
 
 <x-app-layout
-    pageTitle="{{ $user->User }} - Developed Sets"
-    pageDescription="View achievement sets developed by {{ $user->User }} for various games on RetroAchievements"
+    pageTitle="{{ $user->display_name }} - Developed Sets"
+    pageDescription="View achievement sets developed by {{ $user->display_name }} for various games on RetroAchievements"
 >
-    <x-user.breadcrumbs :targetUsername="$user->User" currentPage="Developed Sets" />
+    <x-user.breadcrumbs :targetDisplayName="$user->display_name" currentPage="Developed Sets" />
 
     <div class="mt-3 -mb-3 w-full flex gap-x-3">
-        {!! userAvatar($user->User, label: false, iconSize: 48, iconClass: 'rounded-sm') !!}
-        <h1 class="mt-[10px] w-full">{{ $user->User }}'s Developed Sets</h1>
+        {!! userAvatar($user, label: false, iconSize: 48, iconClass: 'rounded-sm') !!}
+        <h1 class="mt-[10px] w-full">{{ $user->display_name }}'s Developed Sets</h1>
     </div>
 
     <x-game.game-list
diff --git a/resources/views/pages/user/[user]/game/[game]/compare.blade.php b/resources/views/pages/user/[user]/game/[game]/compare.blade.php
index 2bc1a39eed..d1232af3d0 100644
--- a/resources/views/pages/user/[user]/game/[game]/compare.blade.php
+++ b/resources/views/pages/user/[user]/game/[game]/compare.blade.php
@@ -31,10 +31,10 @@
 
 <x-app-layout
     pageTitle="Compare Unlocks - {{ $game->Title }}"
-    pageDescription="Compares unlocks between {{ $user->User }} and {{ $otherUser->User }} for {{ $game->Title }}"
+    pageDescription="Compares unlocks between {{ $user->display_name }} and {{ $otherUser->display_name }} for {{ $game->Title }}"
 >
     <x-user.breadcrumbs
-        :targetUsername="$otherUser->User"
+        :targetDisplayName="$otherUser->display_name"
         :parentPage="$game->Title"
         :parentPageUrl="$game->permalink"
         currentPage="Compare Unlocks"
@@ -91,10 +91,10 @@
                     <tr class="do-not-highlight lg:sticky lg:top-[42px] z-[1] bg-box">
                         <th style="width:40%">Achievement</th>
                         <th style="width:30%">
-                        {!! userAvatar($otherUser->User, label: true, icon: true, iconSize: 24, iconClass: 'rounded-sm') !!}
+                        {!! userAvatar($otherUser, label: true, icon: true, iconSize: 24, iconClass: 'rounded-sm') !!}
                         </th>
                         <th style="width:30%">
-                        {!! userAvatar($user->User, label: true, icon: true, iconSize: 24, iconClass: 'rounded-sm') !!}
+                        {!! userAvatar($user, label: true, icon: true, iconSize: 24, iconClass: 'rounded-sm') !!}
                         </th>
                     </tr>
                 </thead>
diff --git a/resources/views/pages/user/[user]/progress.blade.php b/resources/views/pages/user/[user]/progress.blade.php
index bfe6549fbf..f96c63bcb0 100644
--- a/resources/views/pages/user/[user]/progress.blade.php
+++ b/resources/views/pages/user/[user]/progress.blade.php
@@ -40,7 +40,7 @@
     :pageDescription="$seo['pageDescription']"
 >
     <div>
-        <x-user.breadcrumbs :targetUsername="$targetUsername" currentPage="Completion Progress" />
+        <x-user.breadcrumbs :targetDisplayName="$user->display_name" currentPage="Completion Progress" />
 
         <div class="mt-3 -mb-3 w-full flex gap-x-3">
             {!! userAvatar($targetUsername, label: false, iconSize: 48, iconClass: 'rounded-sm') !!}
@@ -93,7 +93,7 @@
             <div class="w-full flex flex-col gap-y-2 items-center justify-center bg-embed rounded py-8">
                 <img src="/assets/images/cheevo/confused.webp" alt="No sets in progress">
                 <p>
-                    {{ $isMe ? "You don't" : $targetUsername . " doesn't" }}
+                    {{ $isMe ? "You don't" : $user->display_name . " doesn't" }}
                     have any
                     {{ $isFiltering ? "games matching your current filter criteria." : "games with achievement unlocks yet." }}
                 </p>
diff --git a/resources/views/pages/user/[user]/tickets/created.blade.php b/resources/views/pages/user/[user]/tickets/created.blade.php
index d5827d31ca..e2f49cf51a 100644
--- a/resources/views/pages/user/[user]/tickets/created.blade.php
+++ b/resources/views/pages/user/[user]/tickets/created.blade.php
@@ -47,14 +47,14 @@
     'totalPages' => 1,
 ])
 
-<x-app-layout pageTitle="{{ $pageTitle }} - {{ $user->User }}">
+<x-app-layout pageTitle="{{ $pageTitle }} - {{ $user->display_name }}">
     <x-user.breadcrumbs
-        :targetUsername="$user->User"
+        :targetDisplayName="$user->display_name"
         :currentPage="$pageTitle"
     />
 
     <div class="mt-3 mb-1 w-full flex gap-x-3">
-        {!! userAvatar($user->User, label: false, iconSize: 48, iconClass: 'rounded-sm') !!}
+        {!! userAvatar($user, label: false, iconSize: 48, iconClass: 'rounded-sm') !!}
         <h1 class="mt-[10px] w-full">{{ $pageTitle }}</h1>
     </div>
 
diff --git a/resources/views/pages/user/[user]/tickets/feedback.blade.php b/resources/views/pages/user/[user]/tickets/feedback.blade.php
index fbec271fac..2ddc50ab7b 100644
--- a/resources/views/pages/user/[user]/tickets/feedback.blade.php
+++ b/resources/views/pages/user/[user]/tickets/feedback.blade.php
@@ -40,14 +40,14 @@
     'numFilteredTickets' => 0,
 ])
 
-<x-app-layout pageTitle="{{ $pageTitle }} - {{ $user->User }}">
+<x-app-layout pageTitle="{{ $pageTitle }} - {{ $user->display_name }}">
     <x-user.breadcrumbs
-        :targetUsername="$user->User"
+        :targetDisplayName="$user->display_name"
         :currentPage="$pageTitle"
     />
 
     <div class="mt-3 mb-1 w-full flex gap-x-3">
-        {!! userAvatar($user->User, label: false, iconSize: 48, iconClass: 'rounded-sm') !!}
+        {!! userAvatar($user, label: false, iconSize: 48, iconClass: 'rounded-sm') !!}
         <h1 class="mt-[10px] w-full">{{ $pageTitle }}</h1>
     </div>
 
diff --git a/resources/views/pages/user/[user]/tickets/index.blade.php b/resources/views/pages/user/[user]/tickets/index.blade.php
index bd004b253d..f0ac9e5730 100644
--- a/resources/views/pages/user/[user]/tickets/index.blade.php
+++ b/resources/views/pages/user/[user]/tickets/index.blade.php
@@ -5,9 +5,7 @@
 use App\Platform\Services\TicketListService;
 use Illuminate\View\View;
 
-use function Laravel\Folio\{middleware, name, render, withTrashed};
-
-withTrashed();
+use function Laravel\Folio\{middleware, name, render};
 
 middleware(['auth', 'can:viewAny,' . App\Models\Ticket::class]);
 name('developer.tickets');
@@ -43,14 +41,14 @@
     'totalPages' => 1,
 ])
 
-<x-app-layout pageTitle="Tickets - {{ $user->User }}">
+<x-app-layout pageTitle="Tickets - {{ $user->display_name }}">
     <x-user.breadcrumbs
-        :targetUsername="$user->User"
+        :targetDisplayName="$user->display_name"
         currentPage="Tickets"
     />
 
     <div class="mt-3 mb-1 w-full flex gap-x-3">
-        {!! userAvatar($user->User, label: false, iconSize: 48, iconClass: 'rounded-sm') !!}
+        {!! userAvatar($user, label: false, iconSize: 48, iconClass: 'rounded-sm') !!}
         <h1 class="mt-[10px] w-full">Tickets</h1>
     </div>
 
diff --git a/resources/views/pages/user/[user]/tickets/resolved.blade.php b/resources/views/pages/user/[user]/tickets/resolved.blade.php
index 3128f2b9cd..2678fe83b8 100644
--- a/resources/views/pages/user/[user]/tickets/resolved.blade.php
+++ b/resources/views/pages/user/[user]/tickets/resolved.blade.php
@@ -50,14 +50,14 @@
     'totalPages' => 1,
 ])
 
-<x-app-layout pageTitle="{{ $pageTitle }} - {{ $user->User }}">
+<x-app-layout pageTitle="{{ $pageTitle }} - {{ $user->display_name }}">
     <x-user.breadcrumbs
-        :targetUsername="$user->User"
+        :targetDisplayName="$user->display_name"
         :currentPage="$pageTitle"
     />
 
     <div class="mt-3 mb-1 w-full flex gap-x-3">
-        {!! userAvatar($user->User, label: false, iconSize: 48, iconClass: 'rounded-sm') !!}
+        {!! userAvatar($user, label: false, iconSize: 48, iconClass: 'rounded-sm') !!}
         <h1 class="mt-[10px] w-full">{{ $pageTitle }}</h1>
     </div>
 
diff --git a/tests/Feature/Api/V1/AchievementOfTheWeekTest.php b/tests/Feature/Api/V1/AchievementOfTheWeekTest.php
index c82fe90889..d0a1397f49 100644
--- a/tests/Feature/Api/V1/AchievementOfTheWeekTest.php
+++ b/tests/Feature/Api/V1/AchievementOfTheWeekTest.php
@@ -107,72 +107,4 @@ public function testGetAchievementOfTheWeekEventAchievement(): void
                 'UnlocksHardcoreCount' => 2,
             ]);
     }
-
-    public function testGetAchievementOfTheWeekStaticData(): void
-    {
-        /** @var User $user2 */
-        $user2 = User::factory()->create();
-        /** @var User $user3 */
-        $user3 = User::factory()->create();
-        $game = $this->seedGame(withHash: false);
-        /** @var Achievement $achievement */
-        $achievement = Achievement::factory()->published()->create(['GameID' => $game->ID]);
-        $now = Carbon::now();
-        $time1 = $now->startOfSecond();
-        $this->addSoftcoreUnlock($this->user, $achievement, $time1);
-        $time2 = $time1->clone()->subMinutes(5);
-        $this->addSoftcoreUnlock($user2, $achievement, $time2);
-        $time3 = $time2->clone()->addMinutes(10);
-        $this->addHardcoreUnlock($user3, $achievement, $time3);
-
-        // fallback to static data until AotW data is populated
-        $staticData = StaticData::factory()->create([
-            'Event_AOTW_AchievementID' => $achievement->ID,
-            'Event_AOTW_StartAt' => $now->clone()->subDay(),
-        ]);
-
-        $this->get($this->apiUrl('GetAchievementOfTheWeek'))
-            ->assertSuccessful()
-            ->assertJson([
-                'Achievement' => [
-                    'ID' => $achievement->ID,
-                ],
-                'Console' => [
-                    'ID' => $game->system_id,
-                ],
-                'ForumTopic' => [
-                    'ID' => 1,
-                ],
-                'Game' => [
-                    'ID' => $game->ID,
-                ],
-                'StartAt' => $staticData->Event_AOTW_StartAt->jsonSerialize(),
-                'TotalPlayers' => 3,
-                'Unlocks' => [
-                    [
-                        'User' => $user3->User,
-                        'RAPoints' => $user3->RAPoints,
-                        'RASoftcorePoints' => $user3->RASoftcorePoints,
-                        'HardcoreMode' => 1,
-                        'DateAwarded' => $time3->jsonSerialize(),
-                    ],
-                    [
-                        'User' => $this->user->User,
-                        'RAPoints' => $this->user->RAPoints,
-                        'RASoftcorePoints' => $this->user->RASoftcorePoints,
-                        'HardcoreMode' => 0,
-                        'DateAwarded' => $time1->jsonSerialize(),
-                    ],
-                    [
-                        'User' => $user2->User,
-                        'RAPoints' => $user2->RAPoints,
-                        'RASoftcorePoints' => $user2->RASoftcorePoints,
-                        'HardcoreMode' => 0,
-                        'DateAwarded' => $time2->jsonSerialize(),
-                    ],
-                ],
-                'UnlocksCount' => 3,
-                'UnlocksHardcoreCount' => 1,
-            ]);
-    }
 }
diff --git a/tests/Feature/Api/V1Test.php b/tests/Feature/Api/V1Test.php
index ab7104efc1..7fe0d5a9d2 100644
--- a/tests/Feature/Api/V1Test.php
+++ b/tests/Feature/Api/V1Test.php
@@ -6,7 +6,6 @@
 
 use App\Models\Achievement;
 use App\Models\Game;
-use App\Models\StaticData;
 use App\Models\System;
 use App\Models\User;
 use App\Platform\Enums\AchievementFlag;
@@ -144,52 +143,6 @@ public function testGetAchievementOfTheWeekEmptyResponse(): void
             ->assertJson(['Achievement' => ['ID' => null], 'StartAt' => null]);
     }
 
-    public function testGetAchievementOfTheWeek(): void
-    {
-        /** @var System $system */
-        $system = System::factory()->create();
-        /** @var Game $game */
-        $game = Game::factory()->create(['ConsoleID' => $system->ID]);
-        /** @var Achievement $achievement */
-        $achievement = Achievement::factory()->published()->create(['GameID' => $game->ID]);
-        $this->addSoftcoreUnlock($this->user, $achievement);
-
-        $staticData = StaticData::factory()->create([
-            'Event_AOTW_AchievementID' => $achievement->ID,
-            'Event_AOTW_StartAt' => Carbon::now()->subDay(),
-        ]);
-
-        $this->get($this->apiUrl('GetAchievementOfTheWeek'))
-            ->assertSuccessful()
-            ->assertJson([
-                'Achievement' => [
-                    'ID' => $achievement->ID,
-                    'BadgeName' => $achievement->BadgeName,
-                    'BadgeURL' => "/Badge/{$achievement->BadgeName}.png",
-                ],
-                'Console' => [
-                    'ID' => $system->ID,
-                ],
-                'ForumTopic' => [
-                    'ID' => 1,
-                ],
-                'Game' => [
-                    'ID' => $game->ID,
-                ],
-                'StartAt' => $staticData->Event_AOTW_StartAt->jsonSerialize(),
-                'TotalPlayers' => 1,
-                'Unlocks' => [
-                    [
-                        'User' => $this->user->User,
-                        'RAPoints' => $this->user->RAPoints,
-                        'HardcoreMode' => 0,
-                    ],
-                ],
-                'UnlocksCount' => 1,
-                'UnlocksHardcoreCount' => 0,
-            ]);
-    }
-
     public function testGetAchievementsEarnedBetweenEmptyResponse(): void
     {
         $this->get($this->apiUrl('GetAchievementsEarnedBetween'))
diff --git a/tests/Feature/Connect/AchievementWonDataTest.php b/tests/Feature/Connect/AchievementWonDataTest.php
index cf94a8f486..7c1aa99551 100644
--- a/tests/Feature/Connect/AchievementWonDataTest.php
+++ b/tests/Feature/Connect/AchievementWonDataTest.php
@@ -61,6 +61,9 @@ public function testRecentWinners(): void
                 $this->addSoftcoreUnlock($user, $achievement2, $now);
             }
 
+            $user->display_name = $user->username;
+            $user->save();
+
             // 1 and 13 will have only unlocked achievement2
             // 5,9,17 will not have unlocked either
         }
@@ -78,11 +81,11 @@ public function testRecentWinners(): void
                     'GameID' => $game->ID,
                     'TotalPlayers' => 16,
                     'RecentWinner' => [
-                        ['User' => $users[19]->User, 'RAPoints' => $users[19]->RAPoints, 'DateAwarded' => $unlocks[19]],
-                        ['User' => $users[18]->User, 'RAPoints' => $users[18]->RAPoints, 'DateAwarded' => $unlocks[18]],
-                        ['User' => $users[16]->User, 'RAPoints' => $users[16]->RAPoints, 'DateAwarded' => $unlocks[16]],
-                        ['User' => $users[15]->User, 'RAPoints' => $users[15]->RAPoints, 'DateAwarded' => $unlocks[15]],
-                        ['User' => $users[14]->User, 'RAPoints' => $users[14]->RAPoints, 'DateAwarded' => $unlocks[14]],
+                        ['User' => $users[19]->display_name, 'AvatarUrl' => $users[19]->avatar_url, 'RAPoints' => $users[19]->RAPoints, 'DateAwarded' => $unlocks[19]],
+                        ['User' => $users[18]->display_name, 'AvatarUrl' => $users[18]->avatar_url, 'RAPoints' => $users[18]->RAPoints, 'DateAwarded' => $unlocks[18]],
+                        ['User' => $users[16]->display_name, 'AvatarUrl' => $users[16]->avatar_url, 'RAPoints' => $users[16]->RAPoints, 'DateAwarded' => $unlocks[16]],
+                        ['User' => $users[15]->display_name, 'AvatarUrl' => $users[15]->avatar_url, 'RAPoints' => $users[15]->RAPoints, 'DateAwarded' => $unlocks[15]],
+                        ['User' => $users[14]->display_name, 'AvatarUrl' => $users[14]->avatar_url, 'RAPoints' => $users[14]->RAPoints, 'DateAwarded' => $unlocks[14]],
                     ],
                 ],
             ]);
@@ -100,8 +103,8 @@ public function testRecentWinners(): void
                     'GameID' => $game->ID,
                     'TotalPlayers' => 16,
                     'RecentWinner' => [
-                        ['User' => $users[3]->User, 'RAPoints' => $users[3]->RAPoints, 'DateAwarded' => $unlocks[3]],
-                        ['User' => $users[2]->User, 'RAPoints' => $users[2]->RAPoints, 'DateAwarded' => $unlocks[2]],
+                        ['User' => $users[3]->display_name, 'AvatarUrl' => $users[3]->avatar_url, 'RAPoints' => $users[3]->RAPoints, 'DateAwarded' => $unlocks[3]],
+                        ['User' => $users[2]->display_name, 'AvatarUrl' => $users[2]->avatar_url, 'RAPoints' => $users[2]->RAPoints, 'DateAwarded' => $unlocks[2]],
                     ],
                 ],
             ]);
@@ -119,10 +122,10 @@ public function testRecentWinners(): void
                     'GameID' => $game->ID,
                     'TotalPlayers' => 16,
                     'RecentWinner' => [
-                        ['User' => $users[10]->User, 'RAPoints' => $users[10]->RAPoints, 'DateAwarded' => $unlocks[10]],
-                        ['User' => $users[7]->User, 'RAPoints' => $users[7]->RAPoints, 'DateAwarded' => $unlocks[7]],
-                        ['User' => $users[4]->User, 'RAPoints' => $users[4]->RAPoints, 'DateAwarded' => $unlocks[4]],
-                        ['User' => $users[1]->User, 'RAPoints' => $users[1]->RAPoints, 'DateAwarded' => $unlocks[1]],
+                        ['User' => $users[10]->display_name, 'AvatarUrl' => $users[10]->avatar_url, 'RAPoints' => $users[10]->RAPoints, 'DateAwarded' => $unlocks[10]],
+                        ['User' => $users[7]->display_name, 'AvatarUrl' => $users[7]->avatar_url, 'RAPoints' => $users[7]->RAPoints, 'DateAwarded' => $unlocks[7]],
+                        ['User' => $users[4]->display_name, 'AvatarUrl' => $users[4]->avatar_url, 'RAPoints' => $users[4]->RAPoints, 'DateAwarded' => $unlocks[4]],
+                        ['User' => $users[1]->display_name, 'AvatarUrl' => $users[1]->avatar_url, 'RAPoints' => $users[1]->RAPoints, 'DateAwarded' => $unlocks[1]],
                     ],
                 ],
             ]);
@@ -185,8 +188,8 @@ public function testRecentWinners(): void
                     'GameID' => $game->ID,
                     'TotalPlayers' => 16,
                     'RecentWinner' => [
-                        ['User' => $users[10]->User, 'RAPoints' => $users[10]->RAPoints, 'DateAwarded' => $unlocks[10]],
-                        ['User' => $users[4]->User, 'RAPoints' => $users[4]->RAPoints, 'DateAwarded' => $unlocks[4]],
+                        ['User' => $users[10]->display_name, 'AvatarUrl' => $users[10]->avatar_url, 'RAPoints' => $users[10]->RAPoints, 'DateAwarded' => $unlocks[10]],
+                        ['User' => $users[4]->display_name, 'AvatarUrl' => $users[4]->avatar_url, 'RAPoints' => $users[4]->RAPoints, 'DateAwarded' => $unlocks[4]],
                         // $users[1] is not their own friend, so won't be in the list
                     ],
                 ],
diff --git a/tests/Feature/Connect/AwardAchievementTest.php b/tests/Feature/Connect/AwardAchievementTest.php
index 7cdf41367f..a881766a4b 100644
--- a/tests/Feature/Connect/AwardAchievementTest.php
+++ b/tests/Feature/Connect/AwardAchievementTest.php
@@ -125,7 +125,7 @@ public function testHardcoreUnlock(): void
         $this->assertEquals($playerAchievement->player_session_id, $playerSession2->id);
 
         // player score should have increased
-        $user1 = User::firstWhere('User', $this->user->User);
+        $user1 = User::whereName($this->user->User)->first();
         $this->assertEquals($scoreBefore + $achievement3->Points, $user1->RAPoints);
         $this->assertEquals($softcoreScoreBefore, $user1->RASoftcorePoints);
 
@@ -156,7 +156,7 @@ public function testHardcoreUnlock(): void
             ]);
 
         // player score should not have increased
-        $user2 = User::firstWhere('User', $this->user->User);
+        $user2 = User::whereName($this->user->User)->first();
         $this->assertEquals($scoreBefore, $user2->RAPoints);
         $this->assertEquals($softcoreScoreBefore, $user2->RASoftcorePoints);
         $this->assertEquals($truePointsBefore, $user2->TrueRAPoints);
@@ -279,7 +279,7 @@ public function testSoftcoreUnlockPromotedToHardcore(): void
             ]);
 
         // player score should not have increased
-        $user2 = User::firstWhere('User', $this->user->User);
+        $user2 = User::whereName($this->user->User)->first();
         $this->assertEquals($scoreBefore, $user2->RAPoints);
         $this->assertEquals($softcoreScoreBefore, $user2->RASoftcorePoints);
         $this->assertEquals($truePointsBefore, $user2->TrueRAPoints);
@@ -452,7 +452,7 @@ public function testDelegatedUnlock(): void
         $this->assertEquals($playerAchievement->player_session_id, $playerSession2->id);
 
         // player score should have increased
-        $user1 = User::firstWhere('User', $delegatedUser->User);
+        $user1 = User::whereName($delegatedUser->User)->first();
         $this->assertEquals($scoreBefore + $achievement3->Points, $user1->RAPoints);
         $this->assertEquals($softcoreScoreBefore, $user1->RASoftcorePoints);
 
@@ -727,7 +727,7 @@ public function testErrors(): void
             ]);
 
        // player score should not have adjusted
-       $user1 = User::firstWhere('User', $this->user->User);
+       $user1 = User::whereName($this->user->User)->first();
        $this->assertEquals($scoreBefore, $user1->RAPoints);
        $this->assertEquals($softcoreScoreBefore, $user1->RASoftcorePoints);
     }
@@ -802,7 +802,7 @@ public function testHardcoreEventUnlock(): void
         $this->assertHasHardcoreUnlock($this->user, $eventAchievement1);
 
         // player score should not have increased
-        $user1 = User::firstWhere('User', $this->user->User);
+        $user1 = User::whereName($this->user->User)->first();
         $this->assertEquals($scoreBefore, $user1->RAPoints);
         $this->assertEquals($softcoreScoreBefore, $user1->RASoftcorePoints);
 
diff --git a/tests/Feature/Connect/AwardAchievementsTest.php b/tests/Feature/Connect/AwardAchievementsTest.php
index 9477c88ffa..62b622e8c9 100644
--- a/tests/Feature/Connect/AwardAchievementsTest.php
+++ b/tests/Feature/Connect/AwardAchievementsTest.php
@@ -141,7 +141,7 @@ public function testAwardMultipleAchievements(): void
         $this->assertEquals($playerAchievement3->player_session_id, $playerSession2->id);
 
         // player score should have increased
-        $user1 = User::firstWhere('User', $delegatedUser->User);
+        $user1 = User::whereName($delegatedUser->User)->first();
         $this->assertEquals(
             $scoreBefore + $achievement2->Points + $achievement3->Points + $achievement4->Points,
             $user1->RAPoints
diff --git a/tests/Feature/Connect/LeaderboardInfoTest.php b/tests/Feature/Connect/LeaderboardInfoTest.php
index 1976de24a8..5e9d5d580c 100644
--- a/tests/Feature/Connect/LeaderboardInfoTest.php
+++ b/tests/Feature/Connect/LeaderboardInfoTest.php
@@ -77,6 +77,7 @@ public function testLeaderboardInfo(): void
                             'Rank' => 1,
                             'Score' => 500,
                             'User' => $playerTwo->display_name,
+                            'AvatarUrl' => $playerTwo->avatar_url,
                         ],
                         [
                             'DateSubmitted' => $now->getTimestamp(),
@@ -84,6 +85,7 @@ public function testLeaderboardInfo(): void
                             'Rank' => 2,
                             'Score' => 300,
                             'User' => $playerOne->display_name,
+                            'AvatarUrl' => $playerOne->avatar_url,
                         ],
                         [
                             'DateSubmitted' => $now->getTimestamp(),
@@ -91,6 +93,7 @@ public function testLeaderboardInfo(): void
                             'Rank' => 3,
                             'Score' => 100,
                             'User' => $playerThree->display_name,
+                            'AvatarUrl' => $playerThree->avatar_url,
                         ],
                     ],
                     'GameID' => $game->id,
diff --git a/tests/Feature/Connect/LoginTest.php b/tests/Feature/Connect/LoginTest.php
index faa9986538..3b7a47989c 100644
--- a/tests/Feature/Connect/LoginTest.php
+++ b/tests/Feature/Connect/LoginTest.php
@@ -26,6 +26,7 @@ public function testLogin(): void
 
         /** @var User $user */
         $user = User::factory()->create([
+            'display_name' => 'MyDisplayName',
             'appToken' => Str::random(16),
             'Password' => Hash::make($password),
             'Permissions' => Permissions::JuniorDeveloper,
@@ -37,7 +38,8 @@ public function testLogin(): void
             ->assertStatus(200)
             ->assertExactJson([
                 'Success' => true,
-                'User' => $user->User,
+                'User' => $user->display_name,
+                'AvatarUrl' => $user->avatar_url,
                 'Token' => $user->appToken,
                 'Score' => 12345,
                 'SoftcoreScore' => 4321,
@@ -47,7 +49,7 @@ public function testLogin(): void
             ]);
 
         /** @var User $user1 */
-        $user1 = User::firstWhere('User', $user->User);
+        $user1 = User::whereName($user->User)->first();
         $this->assertEquals(Carbon::now()->clone()->addDays(14)->startOfSecond(), $user1->appTokenExpiry);
 
         // === with token ===
@@ -56,7 +58,8 @@ public function testLogin(): void
             ->assertStatus(200)
             ->assertExactJson([
                 'Success' => true,
-                'User' => $user->User,
+                'User' => $user->display_name,
+                'AvatarUrl' => $user->avatar_url,
                 'Token' => $user->appToken,
                 'Score' => 12345,
                 'SoftcoreScore' => 4321,
@@ -86,7 +89,8 @@ public function testLogin(): void
 
         $response->assertStatus(200)->assertExactJson([
             'Success' => true,
-            'User' => $user2->User,
+            'User' => $user2->display_name,
+            'AvatarUrl' => $user2->avatar_url,
             'Token' => $data['appToken'],
             'Score' => 99999,
             'SoftcoreScore' => 99,
diff --git a/tests/Feature/Connect/PingTest.php b/tests/Feature/Connect/PingTest.php
index 5fb1f5cc3e..fae65b7d60 100644
--- a/tests/Feature/Connect/PingTest.php
+++ b/tests/Feature/Connect/PingTest.php
@@ -55,7 +55,7 @@ public function testPing(): void
         $this->assertEquals($gameHash->id, $playerSession->game_hash_id);
 
         /** @var User $user1 */
-        $user1 = User::firstWhere('User', $this->user->User);
+        $user1 = User::whereName($this->user->User)->first();
         $this->assertEquals($game->ID, $user1->LastGameID);
         $this->assertEquals('Doing good', $user1->RichPresenceMsg);
 
@@ -75,7 +75,7 @@ public function testPing(): void
         $this->assertEquals(1, $playerSession2->duration);
         $this->assertEquals('Doing good', $playerSession2->rich_presence);
 
-        $user1 = User::firstWhere('User', $this->user->User);
+        $user1 = User::whereName($this->user->User)->first();
         $this->assertEquals($game->ID, $user1->LastGameID);
         $this->assertEquals('Doing good', $user1->RichPresenceMsg);
 
@@ -96,7 +96,7 @@ public function testPing(): void
         $this->assertEquals('Tést t?st', $playerSession2->rich_presence);
         $this->assertEquals($gameHash->id, $playerSession2->game_hash_id);
 
-        $user1 = User::firstWhere('User', $this->user->User);
+        $user1 = User::whereName($this->user->User)->first();
         $this->assertEquals($game->ID, $user1->LastGameID);
         $this->assertEquals('Tést t?st', $user1->RichPresenceMsg);
     }
diff --git a/tests/Feature/Connect/PostActivityTest.php b/tests/Feature/Connect/PostActivityTest.php
index ac494a25a7..998c46d71b 100644
--- a/tests/Feature/Connect/PostActivityTest.php
+++ b/tests/Feature/Connect/PostActivityTest.php
@@ -45,7 +45,7 @@ public function testPostActivity(): void
         $this->assertEquals('Playing ' . $game->title, $playerSession->rich_presence);
 
         /** @var User $user1 */
-        $user1 = User::firstWhere('User', $this->user->User);
+        $user1 = User::whereName($this->user->User)->first();
         $this->assertEquals($game->ID, $user1->LastGameID);
         $this->assertEquals("Playing " . $game->Title, $user1->RichPresenceMsg);
 
diff --git a/tests/Feature/Connect/StartSessionTest.php b/tests/Feature/Connect/StartSessionTest.php
index 81021ff84f..3d57340d02 100644
--- a/tests/Feature/Connect/StartSessionTest.php
+++ b/tests/Feature/Connect/StartSessionTest.php
@@ -95,7 +95,7 @@ public function testStartSession(): void
         $this->assertEquals($gameHash->id, $playerSession->game_hash_id);
 
         /** @var User $user1 */
-        $user1 = User::firstWhere('User', $this->user->User);
+        $user1 = User::whereName($this->user->User)->first();
         $this->assertEquals($game->ID, $user1->LastGameID);
         $this->assertEquals("Playing " . $game->Title, $user1->RichPresenceMsg);
 
@@ -140,7 +140,7 @@ public function testStartSession(): void
         $this->assertEquals('Playing ' . $game2->title, $playerSession->rich_presence);
         $this->assertEquals($gameHash2->id, $playerSession->game_hash_id);
 
-        $user1 = User::firstWhere('User', $this->user->User);
+        $user1 = User::whereName($this->user->User)->first();
         $this->assertEquals($game2->ID, $user1->LastGameID);
         $this->assertEquals("Playing " . $game2->Title, $user1->RichPresenceMsg);
 
diff --git a/tests/Feature/Connect/UploadAchievementTest.php b/tests/Feature/Connect/UploadAchievementTest.php
index d596a03414..a0b19bce17 100644
--- a/tests/Feature/Connect/UploadAchievementTest.php
+++ b/tests/Feature/Connect/UploadAchievementTest.php
@@ -8,8 +8,10 @@
 use App\Models\Achievement;
 use App\Models\AchievementSetClaim;
 use App\Models\System;
+use App\Models\Trigger;
 use App\Models\User;
 use App\Platform\Enums\AchievementFlag;
+use App\Platform\Enums\TriggerableType;
 use App\Platform\Events\AchievementCreated;
 use App\Platform\Events\AchievementPublished;
 use Illuminate\Foundation\Testing\RefreshDatabase;
@@ -1085,4 +1087,204 @@ public function testOtherErrors(): void
                 'Error' => 'Invalid achievement type',
             ]);
     }
+
+    public function testWhenCreatingNewAchievementItsTriggerIsUnversioned(): void
+    {
+        // Arrange
+        $author = User::factory()->create([
+            'Permissions' => Permissions::Developer,
+            'appToken' => Str::random(16),
+        ]);
+        $game = $this->seedGame(withHash: false);
+
+        AchievementSetClaim::factory()->create([
+            'user_id' => $author->id,
+            'game_id' => $game->id,
+        ]);
+
+        // Act
+        $response = $this->get($this->apiUrl('uploadachievement', [
+            'u' => $author->username,
+            't' => $author->appToken,
+            'g' => $game->id,
+            'n' => 'Test Achievement',
+            'd' => 'Test Description',
+            'z' => 5,
+            'm' => '0xH0000=1',
+            'f' => AchievementFlag::Unofficial->value,
+            'b' => 'test-badge',
+        ]));
+
+        // Assert
+        $this->assertArrayHasKey('Success', $response);
+        $this->assertTrue($response['Success']);
+        $this->assertArrayHasKey('AchievementID', $response);
+
+        $achievement = Achievement::find($response['AchievementID']);
+        $this->assertNotNull($achievement);
+
+        $trigger = $achievement->trigger;
+        $this->assertNotNull($trigger);
+        $this->assertEquals('0xH0000=1', $trigger->conditions);
+        $this->assertNull($trigger->version); // !! trigger should be unversioned
+    }
+
+    public function testWhenEditingUnversionedAchievementTriggerIsUpdatedInPlace(): void
+    {
+        // Arrange
+        $author = User::factory()->create([
+            'Permissions' => Permissions::Developer,
+            'appToken' => Str::random(16),
+        ]);
+        $game = $this->seedGame(withHash: false);
+
+        $achievement = Achievement::factory()->create([
+            'GameID' => $game->id,
+            'user_id' => $author->id,
+            'Flags' => AchievementFlag::Unofficial->value,
+            'MemAddr' => '0xH0000=1',
+        ]);
+        $trigger = Trigger::factory()->create([
+            'triggerable_id' => $achievement->id,
+            'triggerable_type' => TriggerableType::Achievement,
+            'conditions' => '0xH0000=1',
+            'version' => null, // !!
+            'user_id' => $author->id,
+        ]);
+
+        AchievementSetClaim::factory()->create([
+            'user_id' => $author->id,
+            'game_id' => $game->id,
+        ]);
+
+        // Act
+        $response = $this->get($this->apiUrl('uploadachievement', [
+            'u' => $author->username,
+            't' => $author->appToken,
+            'g' => $game->id,
+            'n' => 'Test Achievement',
+            'd' => 'Test Description',
+            'z' => 5,
+            'm' => '0xHaaaa=1', // !! the dev is updating the achievement's logic
+            'f' => AchievementFlag::Unofficial->value, // !! still unofficial, though.
+            'b' => 'test-badge',
+            'a' => $achievement->id,
+        ]));
+
+        // Assert
+        $this->assertArrayHasKey('Success', $response);
+        $this->assertTrue($response['Success']);
+
+        $achievement->refresh();
+        $this->assertEquals('0xHaaaa=1', $achievement->MemAddr);
+
+        $newTrigger = $achievement->trigger;
+        $this->assertNotNull($newTrigger);
+        $this->assertEquals($trigger->id, $newTrigger->id); // !! same trigger ID - it was updated in place.
+        $this->assertEquals('0xHaaaa=1', $newTrigger->conditions);
+        $this->assertNull($newTrigger->version); // the trigger is also still unversioned.
+    }
+
+    public function testWhenPromotingAchievementTheTriggerBecomesVersioned(): void
+    {
+        // Arrange
+        $author = User::factory()->create([
+            'Permissions' => Permissions::Developer,
+            'appToken' => Str::random(16),
+        ]);
+        $game = $this->seedGame(withHash: false);
+
+        $achievement = Achievement::factory()->create([
+            'GameID' => $game->id,
+            'user_id' => $author->id,
+            'Flags' => AchievementFlag::Unofficial->value, // !! currently sitting in unofficial.
+            'MemAddr' => '0xH0000=1',
+        ]);
+        $trigger = Trigger::factory()->create([
+            'triggerable_id' => $achievement->id,
+            'triggerable_type' => TriggerableType::Achievement,
+            'conditions' => '0xH0000=1',
+            'version' => null, // !! currently unversioned, never been published.
+            'user_id' => $author->id,
+        ]);
+
+        AchievementSetClaim::factory()->create([
+            'user_id' => $author->id,
+            'game_id' => $game->id,
+        ]);
+
+        // Act
+        $response = $this->get($this->apiUrl('uploadachievement', [
+            'u' => $author->username,
+            't' => $author->appToken,
+            'g' => $game->id,
+            'n' => 'Test Achievement',
+            'd' => 'Test Description',
+            'z' => 5,
+            'm' => '0xH0000=1', // the logic didn't change!
+            'f' => AchievementFlag::OfficialCore->value, // promoted to core!
+            'b' => 'test-badge',
+            'a' => $achievement->id,
+        ]));
+
+        // Assert
+        $this->assertArrayHasKey('Success', $response);
+        $this->assertTrue($response['Success']);
+
+        $achievement->refresh();
+        $trigger = $achievement->trigger;
+        $this->assertNotNull($trigger);
+        $this->assertEquals('0xH0000=1', $trigger->conditions);
+        $this->assertEquals(1, $trigger->version); // the trigger now is at version 1
+    }
+
+    public function testWhenEditingVersionedAchievementNewTriggerVersionIsCreated(): void
+    {
+        // Arrange
+        $author = User::factory()->create([
+            'Permissions' => Permissions::Developer,
+            'appToken' => Str::random(16),
+        ]);
+        $game = $this->seedGame(withHash: false);
+
+        $achievement = Achievement::factory()->create([
+            'GameID' => $game->id,
+            'user_id' => $author->id,
+            'Flags' => AchievementFlag::OfficialCore->value, // !!
+            'MemAddr' => '0xH0000=1',
+        ]);
+        $trigger = Trigger::factory()->create([
+            'triggerable_id' => $achievement->id,
+            'triggerable_type' => TriggerableType::Achievement,
+            'conditions' => '0xH0000=1',
+            'version' => 1, // !!
+            'user_id' => $author->id,
+        ]);
+
+        // Act
+        $response = $this->get($this->apiUrl('uploadachievement', [
+            'u' => $author->username,
+            't' => $author->appToken,
+            'g' => $game->id,
+            'n' => 'Test Achievement',
+            'd' => 'Test Description',
+            'z' => 5,
+            'm' => '0xHaaaa=1', // logic changed!
+            'f' => AchievementFlag::OfficialCore->value,
+            'b' => 'test-badge',
+            'a' => $achievement->id,
+        ]));
+
+        // Assert
+        $this->assertArrayHasKey('Success', $response);
+        $this->assertTrue($response['Success']);
+
+        $achievement->refresh();
+        $newTrigger = $achievement->trigger;
+        $this->assertNotNull($newTrigger);
+        $this->assertNotEquals($trigger->id, $newTrigger->id); // new version was created, so new ID
+        $this->assertEquals('0xHaaaa=1', $newTrigger->conditions);
+        $this->assertEquals(2, $newTrigger->version); // previous version was 1, so we're on 2 now.
+        $this->assertEquals($trigger->id, $newTrigger->parent_id); // we also have a stable link to the previous version.
+    }
 }
diff --git a/tests/Feature/Http/Controllers/HomeControllerTest.php b/tests/Feature/Http/Controllers/HomeControllerTest.php
index d8059bf7af..0e8a3601d8 100644
--- a/tests/Feature/Http/Controllers/HomeControllerTest.php
+++ b/tests/Feature/Http/Controllers/HomeControllerTest.php
@@ -10,6 +10,7 @@
 use App\Enums\Permissions;
 use App\Models\Achievement;
 use App\Models\AchievementSetClaim;
+use App\Models\Event;
 use App\Models\EventAchievement;
 use App\Models\ForumTopic;
 use App\Models\ForumTopicComment;
@@ -170,6 +171,12 @@ public function testItCorrectlySendsAchievementOfTheWeekProps(): void
             'active_from' => Carbon::now()->subDays(3),
             'active_until' => Carbon::now()->addDays(3),
         ]);
+        $event = Event::create([
+            'legacy_game_id' => $eventGame->id,
+            'slug' => 'foo',
+            'active_from' => Carbon::now()->subDays(3),
+            'active_until' => Carbon::now()->addDays(3),
+        ]);
 
         // Act
         $response = $this->get(route('home'));
@@ -187,7 +194,43 @@ public function testItCorrectlySendsAchievementOfTheWeekProps(): void
             ->where('achievementOfTheWeek.sourceAchievement.game.system.name', $system->name)
             ->where('achievementOfTheWeek.sourceAchievement.game.system.iconUrl', $system->iconUrl)
 
-            ->where('achievementOfTheWeek.forumTopicId', 14029)
+            ->where('achievementOfTheWeek.event.id', $event->id)
+            ->where('achievementOfTheWeek.event.legacyGame.id', $eventGame->id)
+        );
+    }
+
+    public function testItHandlesAotwEventAchievementsWithoutSourceAchievement(): void
+    {
+        // Arrange
+        System::factory()->create(['ID' => System::Events]);
+        $eventGame = Game::factory()->create([
+            'ConsoleID' => System::Events,
+            'Title' => 'Achievement of the Week',
+            'ForumTopicId' => 14029,
+        ]);
+
+        $eventAchievement = Achievement::factory()->published()->create(['GameID' => $eventGame->id]);
+
+        EventAchievement::create([
+            'achievement_id' => $eventAchievement->id,
+            'source_achievement_id' => null, // !! explicitly set to null
+            'active_from' => Carbon::now()->subDays(3),
+            'active_until' => Carbon::now()->addDays(3),
+        ]);
+        Event::create([
+            'legacy_game_id' => $eventGame->id,
+            'slug' => 'foo',
+            'active_from' => Carbon::now()->subDays(3),
+            'active_until' => Carbon::now()->addDays(3),
+        ]);
+
+        // Act
+        $response = $this->get(route('home'));
+
+        // Assert
+        $response->assertOk();
+        $response->assertInertia(fn (Assert $page) => $page
+            ->where('achievementOfTheWeek', null)
         );
     }
 
diff --git a/tests/Feature/Platform/Action/UpsertTriggerVersionActionTest.php b/tests/Feature/Platform/Action/UpsertTriggerVersionActionTest.php
new file mode 100644
index 0000000000..cdd095653b
--- /dev/null
+++ b/tests/Feature/Platform/Action/UpsertTriggerVersionActionTest.php
@@ -0,0 +1,201 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Feature\Platform\Actions;
+
+use App\Models\Achievement;
+use App\Models\Game;
+use App\Models\Leaderboard;
+use App\Models\Trigger;
+use App\Models\User;
+use App\Platform\Actions\UpsertTriggerVersionAction;
+use App\Platform\Enums\TriggerableType;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Tests\TestCase;
+
+class UpsertTriggerVersionActionTest extends TestCase
+{
+    use RefreshDatabase;
+
+    private UpsertTriggerVersionAction $action;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->action = new UpsertTriggerVersionAction();
+    }
+
+    public function testItIgnoresModelsWithoutHasVersionedTriggerContract(): void
+    {
+        // Arrange
+        $user = User::factory()->create();
+
+        // Act
+        $trigger = $this->action->execute($user, 'test conditions');
+
+        // Assert
+        $this->assertNull($trigger);
+    }
+
+    public function testItCanCreateNewVersionedTriggersCorrectly(): void
+    {
+        // Arrange
+        $achievement = Achievement::factory()->create();
+        $user = User::factory()->create();
+
+        // Act
+        $trigger = $this->action->execute($achievement, '0xHaaaa=0', versioned: true, user: $user);
+
+        // Assert
+        $this->assertNotNull($trigger);
+        $this->assertEquals('0xHaaaa=0', $trigger->conditions);
+        $this->assertEquals(1, $trigger->version);
+        $this->assertEquals($user->id, $trigger->user_id);
+        $this->assertNull($trigger->parent_id);
+
+        $achievement->refresh();
+        $this->assertEquals($achievement->trigger->conditions, $trigger->conditions);
+    }
+
+    public function testItUpdatesExistingUnversionedTriggers(): void
+    {
+        // Arrange
+        $achievement = Achievement::factory()->create();
+        $user = User::factory()->create();
+
+        $existingTrigger = Trigger::factory()->create([
+            'triggerable_id' => $achievement->id,
+            'triggerable_type' => TriggerableType::Achievement,
+            'conditions' => '0xHaaaa=0',
+            'version' => null, // !!
+            'user_id' => User::factory()->create()->id,
+        ]);
+
+        // Act
+        $trigger = $this->action->execute($achievement, '0xHbbbb=0', versioned: false, user: $user);
+
+        // Assert
+        $this->assertNotNull($trigger);
+        $this->assertEquals($existingTrigger->id, $trigger->id);
+        $this->assertEquals('0xHbbbb=0', $trigger->conditions);
+        $this->assertNull($trigger->version);
+        $this->assertEquals($user->id, $trigger->user_id);
+
+        $achievement->refresh();
+        $this->assertEquals($achievement->triggers()->unversioned()->first()->conditions, $trigger->conditions);
+    }
+
+    public function testItCreatesNewTriggerVersionsWhenConditionsForVersionedTriggersChange(): void
+    {
+        // Arrange
+        $achievement = Achievement::factory()->create();
+        $user = User::factory()->create();
+
+        $existingTrigger = Trigger::factory()->create([
+            'triggerable_id' => $achievement->id,
+            'triggerable_type' => TriggerableType::Achievement,
+            'conditions' => '0xHaaaa=0',
+            'version' => 1, // !!
+            'user_id' => User::factory()->create()->id,
+        ]);
+
+        // Act
+        $trigger = $this->action->execute($achievement, '0xHbbbb=0', versioned: true, user: $user);
+
+        // Assert
+        $this->assertNotNull($trigger);
+        $this->assertNotEquals($existingTrigger->id, $trigger->id);
+        $this->assertEquals('0xHbbbb=0', $trigger->conditions);
+        $this->assertEquals(2, $trigger->version); // !!
+        $this->assertEquals($existingTrigger->id, $trigger->parent_id);
+        $this->assertEquals($user->id, $trigger->user_id);
+
+        $achievement->refresh();
+        $this->assertEquals($achievement->trigger->conditions, $trigger->conditions);
+    }
+
+    public function testItReturnsExistingTriggerWhenConditionsUnchanged(): void
+    {
+        // Arrange
+        $achievement = Achievement::factory()->create();
+        $user = User::factory()->create();
+
+        $existingTrigger = Trigger::factory()->create([
+            'triggerable_id' => $achievement->id,
+            'triggerable_type' => TriggerableType::Achievement,
+            'conditions' => '0xHaaaa=0', // !!
+            'version' => 1,
+            'user_id' => User::factory()->create()->id,
+        ]);
+
+        // Act
+        $trigger = $this->action->execute(
+            $achievement,
+            '0xHaaaa=0', // !!
+            versioned: true,
+            user: $user
+        );
+
+        // Assert
+        $this->assertNotNull($trigger);
+        $this->assertEquals($existingTrigger->id, $trigger->id);
+        $this->assertEquals('0xHaaaa=0', $trigger->conditions);
+        $this->assertEquals(1, $trigger->version);
+    }
+
+    public function testItConvertsUnversionedTriggersToVersionedInPlace(): void
+    {
+        // Arrange
+        $achievement = Achievement::factory()->create();
+        $user = User::factory()->create();
+
+        $existingTrigger = Trigger::factory()->create([
+            'triggerable_id' => $achievement->id,
+            'triggerable_type' => TriggerableType::Achievement,
+            'conditions' => '0xHaaaa=0',
+            'version' => null, // !!
+            'user_id' => User::factory()->create()->id,
+        ]);
+
+        // Act
+        $trigger = $this->action->execute(
+            $achievement,
+            '0xHaaaa=0', // !! we're not changing the condition
+            versioned: true, // !! just setting the thing to versioned (publishing the achievement)
+            user: $user
+        );
+
+        // Assert
+        $this->assertNotNull($trigger);
+        $this->assertEquals($existingTrigger->id, $trigger->id); // !! the id didn't change
+        $this->assertEquals('0xHaaaa=0', $trigger->conditions);
+        $this->assertEquals(1, $trigger->version); // !! versioned now
+        $this->assertEquals($user->id, $trigger->user_id);
+    }
+
+    public function testItUpdatesTheDenormalizedTriggerIdOnModels(): void
+    {
+        // Arrange
+        $user = User::factory()->create();
+
+        $achievement = Achievement::factory()->create(['trigger_id' => null]);
+        $leaderboard = Leaderboard::factory()->create(['trigger_id' => null]);
+        $game = Game::factory()->create(['trigger_id' => null]);
+
+        // Act
+        $achievementTrigger = $this->action->execute($achievement, '0xH1234=1', user: $user);
+        $leaderboardTrigger = $this->action->execute($leaderboard, '0xH5678=1', user: $user);
+        $gameTrigger = $this->action->execute($game, '0xH1234=1', user: $user);
+
+        // Assert
+        $achievement->refresh();
+        $leaderboard->refresh();
+        $game->refresh();
+
+        $this->assertEquals($achievementTrigger->id, $achievement->trigger_id);
+        $this->assertEquals($leaderboardTrigger->id, $leaderboard->trigger_id);
+        $this->assertEquals($gameTrigger->id, $game->trigger_id);
+    }
+}
diff --git a/vite.config.ts b/vite.config.ts
index 5787960c6f..c2e3ee201e 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -80,6 +80,7 @@ export default defineConfig(({ mode, isSsrBuild }) => {
         ],
         exclude: [
           'resources/js/common/components/+vendor', // shadcn/ui lib code
+          'resources/js/common/utils/+vendor', // 3rd party utils
           '**/index.ts',
           '**/*.model.ts',
           '**/*.test.ts',