diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 323290891..93b5f3ea9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -264,11 +264,6 @@ jobs:
         with:
           dotnet-version: ${{ env.DOTNET_VERSION }}
 
-      - name: Install Linux Dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y libgtk-3-dev libx11-dev
-
       - name: Cache NuGet Packages
         uses: actions/cache@v3
         with:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 89588dd19..8d424e2c1 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -234,9 +234,6 @@ jobs:
         with:
           dotnet-version: ${{ env.DOTNET_VERSION }}
 
-      - name: Install Linux Dependencies
-        run: sudo apt-get update && sudo apt-get install -y libgtk-3-dev libx11-dev
-
       - name: Extract Build Info
         id: buildinfo
         run: |
diff --git a/GenHub/GenHub.Core/Constants/AppUpdateConstants.cs b/GenHub/GenHub.Core/Constants/AppUpdateConstants.cs
index e7a543023..5ee0581e1 100644
--- a/GenHub/GenHub.Core/Constants/AppUpdateConstants.cs
+++ b/GenHub/GenHub.Core/Constants/AppUpdateConstants.cs
@@ -10,6 +10,21 @@ public static class AppUpdateConstants
     /// </summary>
     public const int MaxHttpRetries = 3;
 
+    /// <summary>
+    /// Index for the Update tab in update notification views.
+    /// </summary>
+    public const int UpdateTabIndex = 0;
+
+    /// <summary>
+    /// Index for the Browse Builds tab in update notification views.
+    /// </summary>
+    public const int BrowseBuildsTabIndex = 1;
+
+    /// <summary>
+    /// Maximum valid tab index in update notification views.
+    /// </summary>
+    public const int MaxTabIndex = 1;
+
     /// <summary>
     /// Velopack directory name.
     /// </summary>
@@ -153,6 +168,101 @@ public static class AppUpdateConstants
         "3. Launch the installed version (will be in %LOCALAPPDATA%\\GenHub)\n\n" +
         "Update available: v{1}";
 
+    /// <summary>
+    /// Update available notification title for release channel.
+    /// </summary>
+    public const string UpdateAvailableNotificationTitle = "Update Available";
+
+    /// <summary>
+    /// Update available notification title for branch subscriptions.
+    /// </summary>
+    public const string BranchUpdateAvailableNotificationTitle = "Branch Update Available";
+
+    /// <summary>
+    /// Update available notification title for PR subscriptions.
+    /// </summary>
+    public const string PrUpdateAvailableNotificationTitle = "PR Update Available";
+
+    /// <summary>
+    /// Update action button text.
+    /// </summary>
+    public const string UpdateAction = "Update";
+
+    /// <summary>
+    /// Title for the update in progress notification.
+    /// </summary>
+    public const string UpdatingAppNotificationTitle = "Updating GenHub";
+
+    /// <summary>
+    /// Starting update progress message.
+    /// </summary>
+    public const string UpdateStartingMessage = "Starting update...";
+
+    /// <summary>
+    /// Title for update failed notification.
+    /// </summary>
+    public const string UpdateFailedNotificationTitle = "Update Failed";
+
+    /// <summary>
+    /// Update failed notification body format string ({0}: error message).
+    /// </summary>
+    public const string UpdateFailedNotificationFormat = "Failed to install update: {0}";
+
+    /// <summary>
+    /// View updates action button text.
+    /// </summary>
+    public const string ViewUpdatesAction = "View Updates";
+
+    /// <summary>
+    /// Release update notification body format string ({0}: version).
+    /// </summary>
+    public const string ReleaseUpdateNotificationFormat = "A new version ({0}) is available.";
+
+    /// <summary>
+    /// Branch update notification body format string ({0}: version, {1}: branch name).
+    /// </summary>
+    public const string BranchUpdateNotificationFormat = "A new build ({0}) is available on branch '{1}'.";
+
+    /// <summary>
+    /// PR update notification body format string ({0}: version, {1}: PR number).
+    /// </summary>
+    public const string PrUpdateNotificationFormat = "A new build ({0}) is available for PR #{1}.";
+
+    /// <summary>
+    /// Sort option: sort by last updated date descending.
+    /// </summary>
+    public const string SortOptionLastUpdated = "Last Updated";
+
+    /// <summary>
+    /// Sort option: sort by pull request number descending.
+    /// </summary>
+    public const string SortOptionPrNumberDesc = "PR Number (Highest)";
+
+    /// <summary>
+    /// Sort option: sort by pull request number ascending.
+    /// </summary>
+    public const string SortOptionPrNumberAsc = "PR Number (Lowest)";
+
+    /// <summary>
+    /// Default interval in minutes for periodic update checks (30 minutes).
+    /// </summary>
+    public const int DefaultPeriodicUpdateCheckIntervalMinutes = 30;
+
+    /// <summary>
+    /// Minimum interval in minutes for periodic update checks (5 minutes).
+    /// </summary>
+    public const int MinPeriodicUpdateCheckIntervalMinutes = 5;
+
+    /// <summary>
+    /// Maximum interval in minutes for periodic update checks (10080 minutes / 7 days).
+    /// </summary>
+    public const int MaxPeriodicUpdateCheckIntervalMinutes = 10080;
+
+    /// <summary>
+    /// Increment step in minutes for periodic update check interval setting (5 minutes).
+    /// </summary>
+    public const int PeriodicUpdateCheckIntervalIncrementMinutes = 5;
+
     /// <summary>
     /// Delay before exit after applying update (5 seconds).
     /// </summary>
diff --git a/GenHub/GenHub.Core/Constants/CommandLineConstants.cs b/GenHub/GenHub.Core/Constants/CommandLineConstants.cs
index 4b0821443..30cd69c4f 100644
--- a/GenHub/GenHub.Core/Constants/CommandLineConstants.cs
+++ b/GenHub/GenHub.Core/Constants/CommandLineConstants.cs
@@ -1,8 +1,13 @@
 namespace GenHub.Core.Constants;
 
 /// <summary>
-/// Constants for command line arguments and URI schemes.
+/// Constants for command line arguments and the <c>genhub://</c> URI scheme.
 /// </summary>
+/// <remarks>
+/// Subscription links use <c>genhub://subscribe?url=&lt;absolute-url&gt;</c>.
+/// Today <c>url</c> is a hosted GenHub <c>catalog.json</c>. Publisher Studio will also share
+/// Provider Definition URLs via the same scheme; GenHub will detect payload type at fetch time.
+/// </remarks>
 public static class CommandLineConstants
 {
     /// <summary>
@@ -16,22 +21,27 @@ public static class CommandLineConstants
     public const string LaunchProfileInlinePrefix = "--launch-profile=";
 
     /// <summary>
-    /// URI scheme used for protocol handling.
+    /// Scheme name for custom protocol registration.
     /// </summary>
-    public const string UriScheme = "genhub://";
+    public const string SchemeName = "genhub";
 
     /// <summary>
-    /// Command for subscribing to a catalog via URI.
+    /// Custom URI scheme registered so OS/browser links can open GenHub.
+    /// </summary>
+    public const string UriScheme = SchemeName + "://";
+
+    /// <summary>
+    /// URI path segment for content subscription (<c>genhub://subscribe?url=...</c>).
     /// </summary>
     public const string SubscribeCommand = "subscribe";
 
     /// <summary>
-    /// Full prefix for subscription URI.
+    /// Full prefix for subscription URIs (<c>genhub://subscribe</c>).
     /// </summary>
     public const string SubscribeUriPrefix = UriScheme + SubscribeCommand;
 
     /// <summary>
-    /// Query parameter name for the catalog URL in a subscription URI.
+    /// Query parameter carrying the absolute URL of a catalog (or future provider definition).
     /// </summary>
     public const string SubscribeUrlParam = "?url=";
 }
diff --git a/GenHub/GenHub.Core/Constants/ContentConstants.cs b/GenHub/GenHub.Core/Constants/ContentConstants.cs
index 0bc3c907c..96d6a6db0 100644
--- a/GenHub/GenHub.Core/Constants/ContentConstants.cs
+++ b/GenHub/GenHub.Core/Constants/ContentConstants.cs
@@ -94,4 +94,31 @@ public static class ContentConstants
     /// Maximum allowed size for the content catalog in bytes (10 MB).
     /// </summary>
     public const long MaxCatalogSizeBytes = 10 * ConversionConstants.BytesPerMegabyte;
+
+    /// <summary>
+    /// Shared resolver/display metadata key for map player counts.
+    /// Builtin and catalog publishers should set this so download cards can render a consistent badge.
+    /// </summary>
+    public const string PlayerCountMetadataKey = "playerCount";
+
+    /// <summary>
+    /// Shared resolver/display metadata key for content categories (AOA, Compstomp, ModDB category, etc.).
+    /// </summary>
+    public const string CategoryMetadataKey = "category";
+
+    /// <summary>
+    /// Display metadata key for a comma-separated list of included/required content names
+    /// (e.g. catalog ContentBundle dependencies resolved to friendly titles).
+    /// </summary>
+    public const string IncludesSummaryMetadataKey = "includesSummary";
+
+    /// <summary>
+    /// Number of recent releases and addons to eagerly preload extended details for.
+    /// </summary>
+    public const int PreloadRecentItemsLimit = 5;
+
+    /// <summary>
+    /// Maximum concurrent background requests when preloading recent item details.
+    /// </summary>
+    public const int PreloadConcurrencyLimit = 3;
 }
\ No newline at end of file
diff --git a/GenHub/GenHub.Core/Constants/DirectoryNames.cs b/GenHub/GenHub.Core/Constants/DirectoryNames.cs
index 47097cc18..19b341d80 100644
--- a/GenHub/GenHub.Core/Constants/DirectoryNames.cs
+++ b/GenHub/GenHub.Core/Constants/DirectoryNames.cs
@@ -59,4 +59,14 @@ public static class DirectoryNames
     /// Directory for storing tool workspaces.
     /// </summary>
     public const string ToolWorkspaces = "ToolWorkspaces";
+
+    /// <summary>
+    /// Directory for persistent Playwright browser profiles (cookies/storage for bot-protected sites).
+    /// </summary>
+    public const string BrowserProfiles = "BrowserProfiles";
+
+    /// <summary>
+    /// Directory for the app-owned Playwright Chromium runtime (not the system Chrome/Edge install).
+    /// </summary>
+    public const string BrowserRuntime = "BrowserRuntime";
 }
diff --git a/GenHub/GenHub.Core/Constants/IpcCommands.cs b/GenHub/GenHub.Core/Constants/IpcCommands.cs
index 1a66630f8..4096fd317 100644
--- a/GenHub/GenHub.Core/Constants/IpcCommands.cs
+++ b/GenHub/GenHub.Core/Constants/IpcCommands.cs
@@ -11,7 +11,8 @@ public static class IpcCommands
     public const string LaunchProfilePrefix = "launch-profile:";
 
     /// <summary>
-    /// Command prefix used to subscribe to a catalog via IPC.
+    /// Command prefix used to forward a subscribe URL to the primary instance
+    /// (<c>subscribe:&lt;absolute-url&gt;</c>). Same payload as <c>genhub://subscribe?url=...</c>.
     /// </summary>
     public const string SubscribePrefix = "subscribe:";
 }
diff --git a/GenHub/GenHub.Core/Constants/ModDBConstants.cs b/GenHub/GenHub.Core/Constants/ModDBConstants.cs
index 2deed935c..f8b9c8d3d 100644
--- a/GenHub/GenHub.Core/Constants/ModDBConstants.cs
+++ b/GenHub/GenHub.Core/Constants/ModDBConstants.cs
@@ -72,6 +72,12 @@ public static class ModDBConstants
     /// <summary>ModDB website URL.</summary>
     public const string PublisherWebsite = BaseUrl;
 
+    /// <summary>
+    /// On-disk Playwright browser profile name used to persist the Cloudflare clearance cookie so
+    /// the user only solves the bot challenge once per session (and across restarts until expiry).
+    /// </summary>
+    public const string BrowserProfileName = "moddb";
+
     /// <summary>Short description for publisher card display.</summary>
     public const string ShortDescription = "Community mods, maps, and content from ModDB";
 
@@ -184,6 +190,29 @@ public static class ModDBConstants
     /// <summary>Value for filter parameter when enabled.</summary>
     public const string FilterEnabledValue = "t";
 
+    // ===== Sort Values =====
+
+    /// <summary>Sort: Date descending (newest first).</summary>
+    public const string SortDateDesc = "date-desc";
+
+    /// <summary>Sort: Date ascending (oldest first).</summary>
+    public const string SortDateAsc = "date-asc";
+
+    /// <summary>Sort: Visits / Popularity descending.</summary>
+    public const string SortVisitDesc = "visit-desc";
+
+    /// <summary>Sort: Rating descending.</summary>
+    public const string SortRatingDesc = "rating-desc";
+
+    /// <summary>Sort: Name ascending (A-Z).</summary>
+    public const string SortNameAsc = "name-asc";
+
+    /// <summary>Sort: Name descending (Z-A).</summary>
+    public const string SortNameDesc = "name-desc";
+
+    /// <summary>Default sort value for ModDB searches and listings (newest first).</summary>
+    public const string DefaultSort = SortDateDesc;
+
     // ===== Category Values =====
 
     // Downloads Section - Releases
@@ -356,6 +385,34 @@ public static class ModDBConstants
     /// <summary>Metadata key for original category.</summary>
     public const string OriginalCategoryMetadataKey = "moddbCategory";
 
+    /// <summary>Metadata key for identifying if content is a mod.</summary>
+    public const string IsModMetadataKey = "IsMod";
+
+    /// <summary>Metadata key for parent mod URL.</summary>
+    public const string ParentModUrlMetadataKey = "ParentModUrl";
+
+    // ===== Playwright / Scraping Constants =====
+
+    /// <summary>Default timeout for page navigation (ms).</summary>
+    public const int DefaultGotoTimeout = 30000;
+
+    /// <summary>
+    /// Default timeout for waiting for a selector (ms). ModDB sits behind Cloudflare; the headed
+    /// browser persistent profile usually receives the clearance cookie after verification, but 15 s gives a safe margin
+    /// for manual challenge solves before the scraper parses whatever it has.
+    /// </summary>
+    public const int DefaultSelectorTimeout = 15000;
+
+    /// <summary>
+    /// How long (ms) the listing scrape waits for the user to solve a Cloudflare challenge in the
+    /// visible browser before giving up. Long enough for a manual "I am not a robot" click; the
+    /// page stays open after the deadline so the user can finish and retry.
+    /// </summary>
+    public const int VerificationWaitTimeoutMs = 120000;
+
+    /// <summary>Selector for content items in listing pages (Fallback).</summary>
+    public const string DefaultListItemSelector = "div.row.rowcontent, div.table tr";
+
     // ===== Error Messages =====
 
     /// <summary>Error message for invalid URL.</summary>
diff --git a/GenHub/GenHub.Core/Constants/ModDBParserConstants.cs b/GenHub/GenHub.Core/Constants/ModDBParserConstants.cs
index 55ab7fa3c..4f61403a9 100644
--- a/GenHub/GenHub.Core/Constants/ModDBParserConstants.cs
+++ b/GenHub/GenHub.Core/Constants/ModDBParserConstants.cs
@@ -17,6 +17,9 @@ public static class ModDBParserConstants
     /// <summary>Selector for developer/publisher links.</summary>
     public const string DeveloperSelector = "a[href*='/members/'], a[href*='/company/']";
 
+    /// <summary>Selector for the profile/mod info box that carries the real developer name.</summary>
+    public const string DeveloperProfileSelector = "#modsinfo a[href*='/members/'], #modsinfo a[href*='/company/'], .sidecolumn a[href*='/members/'], .sidecolumn a[href*='/company/']";
+
     /// <summary>Selector for release date.</summary>
     public const string ReleaseDateSelector = "time[datetime], .date, .released";
 
@@ -59,7 +62,7 @@ public static class ModDBParserConstants
     public const string FileMetadataValueSelector = "td:last-child";
 
     /// <summary>Selector for the main download button on file pages.</summary>
-    public const string MainDownloadButtonSelector = "a.download, a.downloadarea, .downloadbutton a, a[href*='/downloads/start/']";
+    public const string MainDownloadButtonSelector = "a.download, a.downloadarea, .downloadbutton a, a[href*='/downloads/start/'], a[href*='/addons/start/']";
 
     /// <summary>Selector for download size on the button.</summary>
     public const string DownloadSizeSelector = ".download .size, .downloadbutton .size";
@@ -87,10 +90,13 @@ public static class ModDBParserConstants
     // ===== Description/Summary Selectors =====
 
     /// <summary>Selector for full description content.</summary>
-    public const string FullDescriptionSelector = "#articlebrowse, .summary .content, .description .content, .modtext";
+    public const string FullDescriptionSelector = "#downloaddescription, #downloadsummary, #articlebrowse .articlebody, .articlebody, #modsummary, .modtext, #profile .description, #description, #articlebrowse, .summary .content, .description .content";
+
+    /// <summary>Selector for the file-page body copy (not the breadcrumb .summary trail).</summary>
+    public const string FileDescriptionSelector = "#downloaddescription, #downloadsummary";
 
-    /// <summary>Selector for truncated summary.</summary>
-    public const string SummarySelector = ".summary p, .description p";
+    /// <summary>Selector for summary or description container.</summary>
+    public const string SummarySelector = ".description, .rubric, p[itemprop='description']";
 
     // ===== Legacy File Selectors =====
 
@@ -98,28 +104,31 @@ public static class ModDBParserConstants
     public const string FilesTableSelector = "table.filelist, .table.files, #files";
 
     /// <summary>Selector for individual file rows.</summary>
-    public const string FileRowSelector = "tr.file, .row.file, .file";
+    public const string FileRowSelector = "tr.file, .row.file, .file, .row.rowcontent";
 
     /// <summary>Selector for file name.</summary>
-    public const string FileNameSelector = "h5, h4, .name, .title";
+    public const string FileNameSelector = "h4 a, h5 a, h3 a, .heading a, .title a, a.title, .name a, h5, h4, .name, .title";
 
     /// <summary>Selector for file version.</summary>
     public const string FileVersionSelector = ".version, .ver";
 
     /// <summary>Selector for file size.</summary>
-    public const string FileSizeSelector = ".size, .filesize";
+    public const string FileSizeSelector = ".size, .filesize, .filesizes, span.size";
+
+    /// <summary>Selector for file subheading or metadata row.</summary>
+    public const string FileSubheadingSelector = ".subheading, span.subheading, .meta, .details, .info, p.summary, .summary";
 
     /// <summary>Selector for file upload date.</summary>
-    public const string FileDateSelector = "time[datetime], .date, .uploaded";
+    public const string FileDateSelector = "time[datetime], .date, .uploaded, time";
 
     /// <summary>Selector for file category.</summary>
-    public const string FileCategorySelector = ".category, .type";
+    public const string FileCategorySelector = ".category, .type, span.category";
 
     /// <summary>Selector for file uploader.</summary>
-    public const string FileUploaderSelector = ".uploader, .author, a[href*='/members/']";
+    public const string FileUploaderSelector = ".uploader, .author, a[href*='/members/'], a[href*='/company/']";
 
     /// <summary>Selector for file download link (robust).</summary>
-    public const string FileDownloadSelector = "a.button.download, a[href*='/downloads/start/'], .download a";
+    public const string FileDownloadSelector = "a.button, a.buttonlarge, a.download, a.btn, a[href*='/downloads/start/'], a[href*='/addons/start/'], a[href*='/downloads/'], a[href*='/addons/'], .download a, .actions a";
 
     /// <summary>Selector for file MD5 hash.</summary>
     public const string FileMd5Selector = ".md5, .hash";
@@ -130,22 +139,41 @@ public static class ModDBParserConstants
     // ===== Videos Section Selectors =====
 
     /// <summary>Selector for embedded video iframes.</summary>
-    public const string VideoSelector = "iframe[src*='youtube'], iframe[src*='vimeo'], iframe[src*='youtu.be']";
+    public const string VideoSelector = "iframe[src*='youtube'], iframe[src*='youtube-nocookie'], iframe[src*='youtu.be'], iframe[src*='vimeo'], iframe[src*='dailymotion'], iframe[src*='moddb.com/media/iframe'], iframe[src*='moddb.com/media/embed'], iframe[src*='moddb.com/videos/iframe'], iframe[src*='moddb.com/videos/embed']";
+
+    /// <summary>Selector for video gallery containers and items.</summary>
+    public const string VideoGallerySelector = "#videobox, #videosbrowse, #mediabrowse, .mediarow, .mediabox";
+
+    /// <summary>Selector for video links.</summary>
+    public const string VideoLinkSelector = "a[href*='/videos/'], a[href*='youtube.com/watch'], a[href*='youtu.be/'], a[href*='vimeo.com/']";
 
     /// <summary>Selector for video thumbnails.</summary>
-    public const string VideoThumbnailSelector = ".thumbnail img, .preview img";
+    public const string VideoThumbnailSelector = ".thumbnail img, .preview img, img";
 
     /// <summary>Selector for video titles.</summary>
-    public const string VideoTitleSelector = ".title, h3, h4";
+    public const string VideoTitleSelector = ".title, h3, h4, h5, .caption";
+
+    /// <summary>Selector for recommendation and related content sections.</summary>
+    public const string RecommendationsSelector = "#recommendations, .recommendations, #related, .related, #similar, .similar, #fansalsoviewed, .fansalsoviewed, .youmayalso, [class*='recommend'], [id*='recommend'], [class*='similar'], [id*='similar']";
 
     // ===== Images Section Selectors =====
 
     /// <summary>Selector for image gallery container.</summary>
-    public const string ImageGallerySelector = ".mediarow, .screenshot, .imagebox, .gallery";
+    public const string ImageGallerySelector = "#imagebox, #mediaimage, #imagebrowse, #mediabrowse, .mediarow";
+
+    /// <summary>
+    /// Selector for gallery images only. Deliberately excludes a blanket
+    /// <c>img[src*='media.moddb.com']</c> match, which previously pulled game icons, member
+    /// avatars, and file-page chrome into the Media tab.
+    /// </summary>
+    public const string GalleryImageSelector = "#imagebox img, #mediaimage img, #imagebrowse img, #mediabrowse img, .mediarow img, .media .holder img, #downloadsummary img, #downloaddescription img, .preview img, a[href*='/mods/'][href*='/images/'] img";
 
     /// <summary>Selector for individual images.</summary>
     public const string ImageSelector = "img";
 
+    /// <summary>Sidebar/profile containers whose images are icons and avatars, not gallery media.</summary>
+    public const string ImageSidebarSelector = "#modsinfo, #downloadsprofilemenu, #profile, .sidecolumn, aside";
+
     /// <summary>Selector for image thumbnails.</summary>
     public const string ImageThumbnailSelector = ".thumbnail img, .thumb img";
 
@@ -197,20 +225,24 @@ public static class ModDBParserConstants
 
     // ===== Comments Section Selectors =====
 
-    /// <summary>Selector for comments container.</summary>
-    public const string CommentsSelector = ".comment, .post, .comments";
+    /// <summary>Selector for comments container. Do not use #commentform — that is the composer.</summary>
+    public const string CommentsSelector = "#commentsbrowse";
 
-    /// <summary>Selector for individual comment rows.</summary>
-    public const string CommentRowSelector = ".comment, .post";
+    /// <summary>
+    /// Selector for posted comment rows. Requires the exact <c>rowcomment</c> class so the
+    /// composer rows (<c>rowcommentguest</c>, <c>rowcommentsummary</c>, <c>rowcommentemail</c>)
+    /// and <c>#commentform</c> are not treated as comments.
+    /// </summary>
+    public const string CommentRowSelector = ".row.rowcomment, .rowcomment";
 
     /// <summary>Selector for comment authors.</summary>
-    public const string CommentAuthorSelector = ".author, .username, a[href*='/members/']";
+    public const string CommentAuthorSelector = ".author, .username, .heading a, a[href*='/members/']";
 
-    /// <summary>Selector for comment content.</summary>
-    public const string CommentContentSelector = ".content, .body, .text";
+    /// <summary>Selector for comment content. Avoids bare <c>p</c> which matches login chrome and CSS blobs.</summary>
+    public const string CommentContentSelector = ":scope > .commentbody, .commentbody, p.comment";
 
     /// <summary>Selector for comment dates.</summary>
-    public const string CommentDateSelector = "time[datetime], .date";
+    public const string CommentDateSelector = "time[datetime], time, .date, .datetime, span.subheading";
 
     /// <summary>Selector for comment karma/votes.</summary>
     public const string CommentKarmaSelector = ".karma, .votes, .goodkarma, .badkarma";
@@ -245,4 +277,100 @@ public static class ModDBParserConstants
 
     /// <summary>Pattern for games URLs.</summary>
     public const string GamesUrlPattern = "/games/";
+
+    // ===== Mod Detail Page Selectors =====
+
+    /// <summary>Selector for the downloads section on mod pages.</summary>
+    public const string DownloadsSectionSelector = "#downloads, .downloads, .files";
+
+    /// <summary>Selector for the addons section on mod pages.</summary>
+    public const string AddonsSectionSelector = "#addons, .addons";
+
+    /// <summary>Selector for the tabs/navigation on mod pages.</summary>
+    public const string TabsSelector = ".tabs, .navigation, nav";
+
+    /// <summary>Selector for individual tab links.</summary>
+    public const string TabLinkSelector = "a[href*='/downloads'], a[href*='/addons']";
+
+    // ===== Metadata Keys (Internal/Normalized) =====
+
+    /// <summary>Metadata key for filename.</summary>
+    public const string MetadataFilename = "filename";
+
+    /// <summary>Alternative metadata key for filename.</summary>
+    public const string MetadataFileNameAlt = "file name";
+
+    /// <summary>Alternative metadata key for file.</summary>
+    public const string MetadataFileAlt = "file";
+
+    /// <summary>Metadata key for size.</summary>
+    public const string MetadataSize = "size";
+
+    /// <summary>Alternative metadata key for size.</summary>
+    public const string MetadataFileSizeAlt = "file size";
+
+    /// <summary>Metadata key for uploader.</summary>
+    public const string MetadataUploader = "uploader";
+
+    /// <summary>Alternative metadata key for uploaded by.</summary>
+    public const string MetadataUploadedBy = "uploaded by";
+
+    /// <summary>Alternative metadata key for author.</summary>
+    public const string MetadataAuthor = "author";
+
+    /// <summary>Metadata key for category.</summary>
+    public const string MetadataCategory = "category";
+
+    /// <summary>Alternative metadata key for file category.</summary>
+    public const string MetadataFileCategory = "file category";
+
+    /// <summary>Alternative metadata key for type.</summary>
+    public const string MetadataType = "type";
+
+    /// <summary>Metadata key for MD5 hash.</summary>
+    public const string MetadataMd5Hash = "md5 hash";
+
+    /// <summary>Metadata key for MD5 hash (alternative).</summary>
+    public const string MetadataMd5HashAlt = "md5hash";
+
+    /// <summary>Alternative metadata key for MD5 checksum.</summary>
+    public const string MetadataMd5Checksum = "md5 checksum";
+
+    /// <summary>Alternative metadata key for MD5.</summary>
+    public const string MetadataMd5 = "md5";
+
+    /// <summary>Alternative metadata key for hash.</summary>
+    public const string MetadataHash = "hash";
+
+    /// <summary>Alternative metadata key for checksum.</summary>
+    public const string MetadataChecksum = "checksum";
+
+    /// <summary>Metadata key for total downloads.</summary>
+    public const string MetadataTotalDownloads = "total downloads";
+
+    /// <summary>Alternative metadata key for download count.</summary>
+    public const string MetadataDownloadCount = "download count";
+
+    /// <summary>Metadata key for added date.</summary>
+    public const string MetadataAdded = "added";
+
+    /// <summary>Metadata key for updated date.</summary>
+    public const string MetadataUpdated = "updated";
+
+    // ===== Additional Selectors =====
+
+    /// <summary>Selector for fallback titles (h1, h2, etc).</summary>
+    public const string FallbackTitleSelector = "h2 a, h1 a, h2, h1";
+
+    /// <summary>Selector for file detail page title heading outside the global headerbox.</summary>
+    public const string FilePageTitleSelector = ".midcolumn h2, .columncenter h2, #downloadsfiles h2, #downloadsinfo h2, #downloads h2, .heading h2, .title h2, h2.title, .midcolumn h3, .heading h3";
+
+    /// <summary>Selector for file detail page preview images.</summary>
+    public const string FilePreviewImagesSelector = "#downloadmedia img, #downloadsmedia img, #preview img, #media img, .mediagallery img, .imagebox img, #imagebox img, #downloaddescription img, #downloadsummary img, a[href*='/images/'] img, .previewholder img, .media .holder img";
+
+    /// <summary>Selector for file description container elements.</summary>
+    public const string FileDescriptionContainerSelector = "#downloaddescription, #downloadsummary, #description, .description, .articlebody, #profiletotal";
+
+    /// <summary>Regex pattern for extracting parent mod path.</summary>
+    public const string ParentModPathRegex = @"(/mods/[^/]+)/(?:downloads|addons)/";
 }
diff --git a/GenHub/GenHub.Core/Constants/SuperHackersConstants.cs b/GenHub/GenHub.Core/Constants/SuperHackersConstants.cs
index b15606e59..d5d3dffce 100644
--- a/GenHub/GenHub.Core/Constants/SuperHackersConstants.cs
+++ b/GenHub/GenHub.Core/Constants/SuperHackersConstants.cs
@@ -60,6 +60,21 @@ public static class SuperHackersConstants
     /// </summary>
     public const string GeneralsGameCodeRepo = "GeneralsGameCode";
 
+    /// <summary>
+    /// GitHub owner for Generals game patch 2.
+    /// </summary>
+    public const string GeneralsGamePatch2Owner = "TheSuperHackers";
+
+    /// <summary>
+    /// GitHub repo for Generals game patch 2.
+    /// </summary>
+    public const string GeneralsGamePatch2Repo = "GeneralsGamePatch2";
+
+    /// <summary>
+    /// Display name for Generals game patch 2.
+    /// </summary>
+    public const string GeneralsGamePatch2DisplayName = "Community Patch 2";
+
     // ===== Service Configuration =====
 
     /// <summary>
diff --git a/GenHub/GenHub.Core/Helpers/AppUpdateVersionHelper.cs b/GenHub/GenHub.Core/Helpers/AppUpdateVersionHelper.cs
new file mode 100644
index 000000000..b44ff9c53
--- /dev/null
+++ b/GenHub/GenHub.Core/Helpers/AppUpdateVersionHelper.cs
@@ -0,0 +1,101 @@
+using System;
+using System.Linq;
+using System.Text.RegularExpressions;
+
+namespace GenHub.Core.Helpers;
+
+/// <summary>
+/// Helper class for application update version comparison and parsing.
+/// </summary>
+public static partial class AppUpdateVersionHelper
+{
+    /// <summary>
+    /// Extracts the workflow run number from a version string (e.g., "0.0.641-pr241" -> 641).
+    /// Returns 0 for plain semantic versions without CI run markers.
+    /// </summary>
+    /// <param name="version">The version string to extract the run number from.</param>
+    /// <returns>The extracted run number, or 0 if extraction fails or not a CI build.</returns>
+    public static int ExtractRunNumber(string? version)
+    {
+        if (string.IsNullOrWhiteSpace(version))
+        {
+            return 0;
+        }
+
+        var match = CiRunNumberRegex().Match(version);
+        if (match.Success && int.TryParse(match.Groups[1].Value, out var runNumber) && runNumber > 0)
+        {
+            return runNumber;
+        }
+
+        var ciMatch = CiMarkerRegex().Match(version);
+        if (ciMatch.Success && int.TryParse(ciMatch.Groups[1].Value, out var ciRunNumber) && ciRunNumber > 0)
+        {
+            return ciRunNumber;
+        }
+
+        return 0;
+    }
+
+    /// <summary>
+    /// Checks whether an available artifact version is newer than the currently installed version.
+    /// </summary>
+    /// <param name="newVersion">The new artifact version string.</param>
+    /// <param name="currentVersion">The current version string.</param>
+    /// <returns>True if newVersion is newer than currentVersion; otherwise false.</returns>
+    public static bool IsArtifactVersionNewer(string? newVersion, string? currentVersion)
+    {
+        if (string.IsNullOrWhiteSpace(newVersion))
+        {
+            return false;
+        }
+
+        if (string.IsNullOrWhiteSpace(currentVersion))
+        {
+            return true;
+        }
+
+        var newVersionBase = newVersion.Split('+')[0].Trim();
+        var currentVersionBase = currentVersion.Split('+')[0].Trim();
+
+        var newRun = ExtractRunNumber(newVersionBase);
+        var currentRun = ExtractRunNumber(currentVersionBase);
+
+        if (newRun > 0 && currentRun > 0)
+        {
+            return newRun > currentRun;
+        }
+
+        if (newRun == 0 && currentRun > 0)
+        {
+            return false;
+        }
+
+        if (newRun > 0 && currentRun == 0)
+        {
+            return true;
+        }
+
+        var newClean = newVersionBase.Split('-')[0];
+        var currentClean = currentVersionBase.Split('-')[0];
+        if (Version.TryParse(newClean, out var newVer) && Version.TryParse(currentClean, out var currentVer))
+        {
+            return newVer > currentVer;
+        }
+
+        return false;
+    }
+
+    /// <summary>
+    /// Regex for extracting workflow run number from a 0.0.X CI version string.
+    /// Matches patterns like "0.0.1282-pr265", "0.0.1282-main", "0.0.1282".
+    /// </summary>
+    [GeneratedRegex(@"^0\.0\.(\d+)(?:-[a-zA-Z0-9_.-]+)?$", RegexOptions.IgnoreCase)]
+    private static partial Regex CiRunNumberRegex();
+
+    /// <summary>
+    /// Regex for extracting workflow run number from a -ci.X marker.
+    /// </summary>
+    [GeneratedRegex(@"-ci\.(\d+)", RegexOptions.IgnoreCase)]
+    private static partial Regex CiMarkerRegex();
+}
diff --git a/GenHub/GenHub.Core/Helpers/CommandLineParser.cs b/GenHub/GenHub.Core/Helpers/CommandLineParser.cs
index f6b570af0..d5c595d36 100644
--- a/GenHub/GenHub.Core/Helpers/CommandLineParser.cs
+++ b/GenHub/GenHub.Core/Helpers/CommandLineParser.cs
@@ -15,9 +15,9 @@ public static class CommandLineParser
     /// <returns>The extracted profile identifier if present; otherwise, <c>null</c>.</returns>
     public static string? ExtractProfileId(string[] args)
     {
-        for (var i = 0; i < args.Length; i++)
+        for (int i = 0; i < args.Length; i++)
         {
-            var arg = args[i];
+            string arg = args[i];
 
             if (arg.Equals(CommandLineConstants.LaunchProfileArg, StringComparison.OrdinalIgnoreCase) && i + 1 < args.Length)
             {
@@ -34,23 +34,48 @@ public static class CommandLineParser
     }
 
     /// <summary>
-    /// Extracts a subscription URL from command line arguments.
-    /// Supports the URI scheme format: <c>genhub://subscribe?url=&lt;url&gt;</c>.
+    /// Extracts the absolute URL from a <c>genhub://subscribe?url=...</c> startup argument.
     /// </summary>
+    /// <remarks>
+    /// The returned value is the <c>url</c> query value only (not the <c>genhub://</c> wrapper).
+    /// Callers treat it as a GenHub catalog JSON URL today; later it may also be a Provider
+    /// Definition URL without changing this parser.
+    /// </remarks>
     /// <param name="args">The command line arguments.</param>
-    /// <returns>The extracted catalog URL if present; otherwise, <c>null</c>.</returns>
+    /// <returns>The decoded absolute URL if present; otherwise, <c>null</c>.</returns>
     public static string? ExtractSubscriptionUrl(string[] args)
     {
-        foreach (var arg in args)
+        foreach (string arg in args)
         {
             if (arg.StartsWith(CommandLineConstants.SubscribeUriPrefix, StringComparison.OrdinalIgnoreCase))
             {
-                // Simple parsing for ?url=...
-                var queryStart = arg.IndexOf(CommandLineConstants.SubscribeUrlParam, StringComparison.OrdinalIgnoreCase);
+                string remainder = arg[CommandLineConstants.SubscribeUriPrefix.Length..];
+                if (!remainder.StartsWith('?') && !remainder.StartsWith("/?", StringComparison.Ordinal))
+                {
+                    continue;
+                }
+
+                int queryStart = arg.IndexOf(CommandLineConstants.SubscribeUrlParam, StringComparison.OrdinalIgnoreCase);
                 if (queryStart != -1)
                 {
-                    var url = arg[(queryStart + CommandLineConstants.SubscribeUrlParam.Length)..];
-                    return Uri.UnescapeDataString(url).Trim('"');
+                    string url = arg[(queryStart + CommandLineConstants.SubscribeUrlParam.Length)..];
+                    string unescaped = Uri.UnescapeDataString(url)
+                        .Replace("\r", string.Empty)
+                        .Replace("\n", string.Empty)
+                        .Trim('"', '\'', ' ', '\t');
+
+                    if (string.IsNullOrWhiteSpace(unescaped))
+                    {
+                        return null;
+                    }
+
+                    if (Uri.TryCreate(unescaped, UriKind.Absolute, out var uri) &&
+                        (uri.Scheme == Uri.UriSchemeHttp || uri.Scheme == Uri.UriSchemeHttps))
+                    {
+                        return unescaped;
+                    }
+
+                    return null;
                 }
             }
         }
diff --git a/GenHub/GenHub.Core/Helpers/HtmlTextHelper.cs b/GenHub/GenHub.Core/Helpers/HtmlTextHelper.cs
new file mode 100644
index 000000000..b19f11d94
--- /dev/null
+++ b/GenHub/GenHub.Core/Helpers/HtmlTextHelper.cs
@@ -0,0 +1,145 @@
+using System;
+using System.Net;
+using System.Text.RegularExpressions;
+
+namespace GenHub.Core.Helpers;
+
+/// <summary>
+/// Provides high-performance utilities for stripping HTML tags, decoding HTML entities,
+/// and normalizing text descriptions for display across the application.
+/// </summary>
+public static partial class HtmlTextHelper
+{
+    /// <summary>
+    /// Converts an HTML snippet or formatted description into clean, normalized plain text:
+    /// - Replaces &lt;br&gt; and block element closures (&lt;/p&gt;, &lt;/div&gt;, etc.) with line breaks.
+    /// - Strips all remaining HTML tags.
+    /// - Decodes HTML entities (e.g., &amp;amp;, &amp;quot;, &amp;gt;, &amp;nbsp;).
+    /// - Normalizes whitespace and excessive blank lines.
+    /// - Uses the platform newline format.
+    /// </summary>
+    /// <param name="html">The raw HTML or formatted text string to normalize.</param>
+    /// <returns>Normalized plain text, or empty string if input is null or whitespace.</returns>
+    public static string NormalizeHtml(string? html)
+    {
+        if (string.IsNullOrWhiteSpace(html))
+        {
+            return string.Empty;
+        }
+
+        // 0. Remove script and style elements along with their contents
+        var text = ScriptTagRegex().Replace(html, string.Empty);
+        text = StyleTagRegex().Replace(text, string.Empty);
+
+        // 1. Convert <br> tags to newline
+        text = BrTagRegex().Replace(text, "\n");
+
+        // 2. Convert paragraph closing tags to double newline for paragraph separation
+        text = ParagraphCloseTagRegex().Replace(text, "\n\n");
+
+        // 3. Convert other block-level closing tags and <hr> tags to newline
+        text = BlockCloseTagRegex().Replace(text, "\n");
+
+        // 4. Strip all remaining HTML/XML tags
+        text = HtmlTagRegex().Replace(text, string.Empty);
+
+        // 5. Decode HTML entities (&nbsp;, &gt;, &quot;, &#39;, numeric entities, etc.)
+        text = WebUtility.HtmlDecode(text);
+
+        // 6. Normalize non-breaking spaces and line endings
+        text = text.Replace('\u00A0', ' ')
+                   .Replace("\r\n", "\n")
+                   .Replace('\r', '\n');
+
+        // 7. Clean trailing whitespace on lines and collapse excess blank lines
+        text = TrailingWhitespaceBeforeNewlineRegex().Replace(text, "\n");
+        text = ExcessBlankLinesRegex().Replace(text, "\n\n");
+
+        // 8. Trim and unify with environment newline
+        text = text.Trim();
+        text = text.Replace("\n", Environment.NewLine);
+
+        return text;
+    }
+
+    /// <summary>
+    /// Converts an HTML snippet or multi-line text into a single-line summary without HTML tags,
+    /// collapsing all whitespace runs into a single space, and optionally truncating with an ellipsis.
+    /// </summary>
+    /// <param name="htmlOrText">The input HTML or text string.</param>
+    /// <param name="maxLength">Optional maximum character length including ellipsis.</param>
+    /// <returns>A single-line plain text summary.</returns>
+    public static string CleanToSingleLine(string? htmlOrText, int? maxLength = null)
+    {
+        if (string.IsNullOrWhiteSpace(htmlOrText))
+        {
+            return string.Empty;
+        }
+
+        // Strip HTML if tags exist, decode entities, and normalize
+        var text = NormalizeHtml(htmlOrText);
+
+        // Collapse all newlines, tabs, and multiple spaces into a single space
+        text = MultiWhitespaceRegex().Replace(text, " ").Trim();
+
+        if (maxLength.HasValue && maxLength.Value > 0 && text.Length > maxLength.Value)
+        {
+            return TruncateWithEllipsis(text, maxLength.Value);
+        }
+
+        return text;
+    }
+
+    /// <summary>
+    /// Truncates a string to a specified maximum length and appends an ellipsis ("...") if truncated.
+    /// </summary>
+    /// <param name="text">The text to truncate.</param>
+    /// <param name="maxLength">The maximum allowed length (including the ellipsis).</param>
+    /// <returns>The truncated text with an ellipsis if it exceeded maxLength, or the original text.</returns>
+    public static string TruncateWithEllipsis(string? text, int maxLength)
+    {
+        if (string.IsNullOrWhiteSpace(text) || maxLength <= 0)
+        {
+            return string.Empty;
+        }
+
+        if (text.Length <= maxLength)
+        {
+            return text;
+        }
+
+        if (maxLength <= 3)
+        {
+            return text[..maxLength];
+        }
+
+        return string.Concat(text.AsSpan(0, maxLength - 3), "...");
+    }
+
+    [GeneratedRegex(@"<script\b[^>]*>[\s\S]*?</script>", RegexOptions.IgnoreCase | RegexOptions.CultureInvariant)]
+    private static partial Regex ScriptTagRegex();
+
+    [GeneratedRegex(@"<style\b[^>]*>[\s\S]*?</style>", RegexOptions.IgnoreCase | RegexOptions.CultureInvariant)]
+    private static partial Regex StyleTagRegex();
+
+    [GeneratedRegex(@"<br\s*/?>", RegexOptions.IgnoreCase | RegexOptions.CultureInvariant)]
+    private static partial Regex BrTagRegex();
+
+    [GeneratedRegex(@"</p\s*>", RegexOptions.IgnoreCase | RegexOptions.CultureInvariant)]
+    private static partial Regex ParagraphCloseTagRegex();
+
+    [GeneratedRegex(@"</?(?:div|li|h[1-6]|tr|section|article|blockquote|header|footer|hr)\b[^>]*>", RegexOptions.IgnoreCase | RegexOptions.CultureInvariant)]
+    private static partial Regex BlockCloseTagRegex();
+
+    [GeneratedRegex(@"</?[A-Za-z][^>]*>", RegexOptions.CultureInvariant)]
+    private static partial Regex HtmlTagRegex();
+
+    [GeneratedRegex(@"[ \t]+\n", RegexOptions.CultureInvariant)]
+    private static partial Regex TrailingWhitespaceBeforeNewlineRegex();
+
+    [GeneratedRegex(@"(?:\n){3,}", RegexOptions.CultureInvariant)]
+    private static partial Regex ExcessBlankLinesRegex();
+
+    [GeneratedRegex(@"\s+", RegexOptions.CultureInvariant)]
+    private static partial Regex MultiWhitespaceRegex();
+}
diff --git a/GenHub/GenHub.Core/Interfaces/Common/IConfigurationProviderService.cs b/GenHub/GenHub.Core/Interfaces/Common/IConfigurationProviderService.cs
index d97f2f8cf..93a3536b0 100644
--- a/GenHub/GenHub.Core/Interfaces/Common/IConfigurationProviderService.cs
+++ b/GenHub/GenHub.Core/Interfaces/Common/IConfigurationProviderService.cs
@@ -64,6 +64,18 @@ public interface IConfigurationProviderService
     /// <returns>True if auto-check is enabled; otherwise, false.</returns>
     bool GetAutoCheckForUpdatesOnStartup();
 
+    /// <summary>
+    /// Gets whether to automatically check for updates periodically.
+    /// </summary>
+    /// <returns>True if periodic auto-check is enabled; otherwise, false.</returns>
+    bool GetAutoCheckForUpdatesPeriodically();
+
+    /// <summary>
+    /// Gets the interval in minutes for periodic update checks.
+    /// </summary>
+    /// <returns>The update check interval in minutes.</returns>
+    int GetPeriodicUpdateCheckIntervalMinutes();
+
     /// <summary>
     /// Gets whether detailed logging is enabled.
     /// </summary>
diff --git a/GenHub/GenHub.Core/Interfaces/Content/ILocalContentService.cs b/GenHub/GenHub.Core/Interfaces/Content/ILocalContentService.cs
index 84a4d3773..9b26f26b2 100644
--- a/GenHub/GenHub.Core/Interfaces/Content/ILocalContentService.cs
+++ b/GenHub/GenHub.Core/Interfaces/Content/ILocalContentService.cs
@@ -20,6 +20,7 @@ public interface ILocalContentService
     /// <param name="sourcePath">Optional original source path of the content.</param>
     /// <param name="progress">Optional progress reporter for tracking manifest creation.</param>
     /// <param name="cancellationToken">Cancellation token.</param>
+    /// <param name="entryPoint">Optional relative path of the main executable entry point.</param>
     /// <returns>A result containing the created manifest or errors.</returns>
     Task<OperationResult<ContentManifest>> CreateLocalContentManifestAsync(
         string directoryPath,
@@ -28,7 +29,8 @@ Task<OperationResult<ContentManifest>> CreateLocalContentManifestAsync(
         GameType targetGame,
         string? sourcePath = null,
         IProgress<ContentStorageProgress>? progress = null,
-        CancellationToken cancellationToken = default);
+        CancellationToken cancellationToken = default,
+        string? entryPoint = null);
 
     /// <summary>
     /// Adds local content by creating and storing a manifest.
@@ -66,6 +68,7 @@ Task<OperationResult<ContentManifest>> AddLocalContentAsync(
     /// <param name="sourcePath">Optional original source path of the content.</param>
     /// <param name="progress">Optional progress reporter.</param>
     /// <param name="cancellationToken">Cancellation token.</param>
+    /// <param name="entryPoint">Optional relative path of the main executable entry point.</param>
     /// <returns>A result containing the updated manifest.</returns>
     Task<OperationResult<ContentManifest>> UpdateLocalContentManifestAsync(
         string existingManifestId,
@@ -75,7 +78,8 @@ Task<OperationResult<ContentManifest>> UpdateLocalContentManifestAsync(
         GameType targetGame,
         string? sourcePath = null,
         IProgress<ContentStorageProgress>? progress = null,
-        CancellationToken cancellationToken = default);
+        CancellationToken cancellationToken = default,
+        string? entryPoint = null);
 
     /// <summary>
     /// Gets the allowed content types for local content creation.
diff --git a/GenHub/GenHub.Core/Interfaces/Notifications/INotificationService.cs b/GenHub/GenHub.Core/Interfaces/Notifications/INotificationService.cs
index 34a88df40..55800dd3e 100644
--- a/GenHub/GenHub.Core/Interfaces/Notifications/INotificationService.cs
+++ b/GenHub/GenHub.Core/Interfaces/Notifications/INotificationService.cs
@@ -28,6 +28,11 @@ public interface INotificationService
     /// </summary>
     IObservable<NotificationMessage> NotificationHistory { get; }
 
+    /// <summary>
+    /// Gets the observable stream of notification update requests.
+    /// </summary>
+    IObservable<(Guid Id, string? Title, string Message)> UpdateRequests { get; }
+
     /// <summary>
     /// Shows an informational notification.
     /// </summary>
@@ -70,6 +75,14 @@ public interface INotificationService
     /// <param name="notification">The notification to show.</param>
     void Show(NotificationMessage notification);
 
+    /// <summary>
+    /// Updates the message and optionally the title of an active notification.
+    /// </summary>
+    /// <param name="notificationId">The ID of the notification to update.</param>
+    /// <param name="message">The new message content.</param>
+    /// <param name="title">Optional new title. If null, the existing title is preserved.</param>
+    void Update(Guid notificationId, string message, string? title = null);
+
     /// <summary>
     /// Dismisses a specific notification.
     /// </summary>
diff --git a/GenHub/GenHub.Core/Interfaces/Parsers/IWebPageParser.cs b/GenHub/GenHub.Core/Interfaces/Parsers/IWebPageParser.cs
index 136018297..2d75645fe 100644
--- a/GenHub/GenHub.Core/Interfaces/Parsers/IWebPageParser.cs
+++ b/GenHub/GenHub.Core/Interfaces/Parsers/IWebPageParser.cs
@@ -1,3 +1,8 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
 using GenHub.Core.Models.Parsers;
 
 namespace GenHub.Core.Interfaces.Parsers;
@@ -36,4 +41,56 @@ public interface IWebPageParser
     /// <param name="cancellationToken">Cancellation token.</param>
     /// <returns>A parsed web page with all extracted content sections.</returns>
     Task<ParsedWebPage> ParseAsync(string url, string html, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Parses a specific file or item detail page.
+    /// Default implementation delegates to <see cref="ParseAsync(string, CancellationToken)"/>.
+    /// </summary>
+    /// <param name="url">The detail page URL.</param>
+    /// <param name="cancellationToken">Cancellation token.</param>
+    /// <returns>A parsed web page containing the detailed file information.</returns>
+    Task<ParsedWebPage> ParseFileDetailAsync(string url, CancellationToken cancellationToken = default)
+        => ParseAsync(url, cancellationToken);
+
+    /// <summary>
+    /// Parses multiple file or item detail pages in a batch.
+    /// Default implementation delegates to <see cref="ParseFileDetailAsync(string, CancellationToken)"/>.
+    /// </summary>
+    /// <param name="urls">The detail page URLs to parse.</param>
+    /// <param name="cancellationToken">Cancellation token.</param>
+    /// <returns>A dictionary mapping each URL to its parsed web page result.</returns>
+    async Task<IReadOnlyDictionary<string, ParsedWebPage>> ParseFileDetailsManyAsync(
+        IReadOnlyList<string> urls,
+        CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(urls);
+        var results = new Dictionary<string, ParsedWebPage>(StringComparer.OrdinalIgnoreCase);
+        foreach (var url in urls.Distinct(StringComparer.OrdinalIgnoreCase))
+        {
+            cancellationToken.ThrowIfCancellationRequested();
+            try
+            {
+                var page = await ParseFileDetailAsync(url, cancellationToken);
+                results[url] = page;
+            }
+            catch (HttpRequestException)
+            {
+                // soft failure per url in batch
+            }
+            catch (IOException)
+            {
+                // soft failure per url in batch
+            }
+            catch (InvalidOperationException)
+            {
+                // soft failure per url in batch
+            }
+            catch (FormatException)
+            {
+                // soft failure per url in batch
+            }
+        }
+
+        return results;
+    }
 }
diff --git a/GenHub/GenHub.Core/Interfaces/Tools/IPlaywrightService.cs b/GenHub/GenHub.Core/Interfaces/Tools/IPlaywrightService.cs
index f2007576a..df73f9827 100644
--- a/GenHub/GenHub.Core/Interfaces/Tools/IPlaywrightService.cs
+++ b/GenHub/GenHub.Core/Interfaces/Tools/IPlaywrightService.cs
@@ -6,6 +6,7 @@
 using GenHub.Core.Models.Results;
 using Microsoft.Playwright;
 using System;
+using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -25,6 +26,31 @@ public interface IPlaywrightService
     /// <returns>A new IPage instance.</returns>
     Task<IPage> CreatePageAsync(BrowserNewContextOptions? options = null, CancellationToken cancellationToken = default);
 
+    /// <summary>
+    /// Creates a page in a persistent, headed browser context whose cookies and storage survive
+    /// across calls. Use this for bot-protected sites (e.g. ModDB's Cloudflare): the user solves
+    /// the challenge once, the resulting clearance cookie is persisted to disk, and subsequent
+    /// pages in the same session (and across app restarts, until the cookie expires) load without
+    /// another challenge. A real browser window is shown while the challenge is pending.
+    /// </summary>
+    /// <param name="profileName">The on-disk profile name (scoped under the app data browser-profile root).</param>
+    /// <param name="cancellationToken">Cancellation token.</param>
+    /// <returns>A new <see cref="IPage"/> in the persistent context.</returns>
+    Task<IPage> CreatePersistentPageAsync(string profileName, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Closes a page from <see cref="CreatePersistentPageAsync"/> and shuts down the headed Chromium
+    /// window when no active pages remain. Prefer this over <c>page.CloseAsync</c> alone so
+    /// callers do not leave an about:blank window open after a successful ModDB scrape.
+    /// </summary>
+    /// <param name="page">The persistent-context page to close.</param>
+    /// <param name="keepOpen">
+    /// When <see langword="true"/>, leaves the page open (e.g. so the user can finish a Cloudflare
+    /// challenge) without closing the browser.
+    /// </param>
+    /// <returns>A task representing the asynchronous operation.</returns>
+    Task ClosePersistentPageAsync(IPage page, bool keepOpen = false);
+
     /// <summary>
     /// Fetches HTML content from a URL using Playwright.
     /// </summary>
@@ -41,6 +67,35 @@ public interface IPlaywrightService
     /// <returns>A parsed AngleSharp IDocument.</returns>
     Task<IDocument> FetchAndParseAsync(string url, CancellationToken cancellationToken = default);
 
+    /// <summary>
+    /// Fetches and parses a web page in a persistent, headed browser context whose cookies survive
+    /// across calls. Use this for bot-protected URLs (e.g. ModDB) so the Cloudflare clearance cookie
+    /// obtained from a single manual challenge solve is reused.
+    /// </summary>
+    /// <param name="profileName">The on-disk profile name (scoped under the app data browser-profile root).</param>
+    /// <param name="url">The URL to fetch and parse.</param>
+    /// <param name="cancellationToken">Cancellation token.</param>
+    /// <returns>A parsed AngleSharp IDocument.</returns>
+    Task<IDocument> FetchAndParsePersistentAsync(string profileName, string url, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Fetches and parses multiple URLs in one persistent headed page — open once, navigate each
+    /// URL in order, then close. Use this for ModDB section sweeps so Chromium does not spawn a
+    /// new window per section (and so concurrent NewPage/Close races cannot tear down the context
+    /// mid-navigation).
+    /// </summary>
+    /// <param name="profileName">The on-disk profile name (scoped under the app data browser-profile root).</param>
+    /// <param name="urls">URLs to fetch in order. Duplicates are fetched once; order of first occurrence is kept.</param>
+    /// <param name="cancellationToken">Cancellation token.</param>
+    /// <returns>
+    /// A map of URL → parsed document for every URL that loaded successfully. Failed URLs are omitted;
+    /// callers should treat a missing key as a soft failure for that section.
+    /// </returns>
+    Task<IReadOnlyDictionary<string, IDocument>> FetchAndParsePersistentManyAsync(
+        string profileName,
+        IReadOnlyList<string> urls,
+        CancellationToken cancellationToken = default);
+
     /// <summary>
     /// Downloads a file using Playwright to handle complex scenarios (like anti-bot protections).
     /// </summary>
@@ -48,4 +103,27 @@ public interface IPlaywrightService
     /// <param name="cancellationToken">Cancellation token.</param>
     /// <returns>A DownloadResult indicating success or failure.</returns>
     Task<DownloadResult> DownloadFileAsync(DownloadConfiguration configuration, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Executes an operation within a scoped persistent browser context session.
+    /// The persistent browser window stays open for the duration of the operation and closes
+    /// immediately when the operation completes, avoiding multiple window launches and idle delays.
+    /// </summary>
+    /// <typeparam name="T">The return type of the operation.</typeparam>
+    /// <param name="profileName">The on-disk profile name.</param>
+    /// <param name="operation">The asynchronous operation to execute.</param>
+    /// <param name="cancellationToken">Cancellation token.</param>
+    /// <returns>The result of the operation.</returns>
+    Task<T> ExecuteInPersistentContextAsync<T>(
+        string profileName,
+        Func<Task<T>> operation,
+        CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Asynchronously pre-warms the Playwright driver runtime in the background so subsequent
+    /// browser operations launch with minimal latency.
+    /// </summary>
+    /// <param name="cancellationToken">Cancellation token.</param>
+    /// <returns>A task representing the background warmup operation.</returns>
+    Task WarmupAsync(CancellationToken cancellationToken = default);
 }
diff --git a/GenHub/GenHub.Core/Messages/UpdateSettingsChangedMessage.cs b/GenHub/GenHub.Core/Messages/UpdateSettingsChangedMessage.cs
new file mode 100644
index 000000000..e199ff5b3
--- /dev/null
+++ b/GenHub/GenHub.Core/Messages/UpdateSettingsChangedMessage.cs
@@ -0,0 +1,12 @@
+namespace GenHub.Core.Messages;
+
+/// <summary>
+/// Message sent when update settings have changed.
+/// </summary>
+/// <param name="AutoCheckForUpdatesOnStartup">Whether to check for updates on startup.</param>
+/// <param name="AutoCheckForUpdatesPeriodically">Whether to check for updates periodically.</param>
+/// <param name="PeriodicUpdateCheckIntervalMinutes">Interval in minutes between periodic update checks.</param>
+public record UpdateSettingsChangedMessage(
+    bool AutoCheckForUpdatesOnStartup,
+    bool AutoCheckForUpdatesPeriodically,
+    int PeriodicUpdateCheckIntervalMinutes);
diff --git a/GenHub/GenHub.Core/Models/AppUpdate/PullRequestInfo.cs b/GenHub/GenHub.Core/Models/AppUpdate/PullRequestInfo.cs
index a8d2a9693..e9fc4bb56 100644
--- a/GenHub/GenHub.Core/Models/AppUpdate/PullRequestInfo.cs
+++ b/GenHub/GenHub.Core/Models/AppUpdate/PullRequestInfo.cs
@@ -50,6 +50,11 @@ public record PullRequestInfo
     /// </summary>
     public string DisplayVersion => LatestArtifact?.DisplayVersion ?? $"0.0.{Number}";
 
+    /// <summary>
+    /// Gets the display title formatted with the PR number (e.g., "#123 - PR Title").
+    /// </summary>
+    public string DisplayTitle => $"#{Number} - {Title}";
+
     /// <summary>
     /// Gets a value indicating whether this PR is still open.
     /// </summary>
diff --git a/GenHub/GenHub.Core/Models/Common/UserSettings.cs b/GenHub/GenHub.Core/Models/Common/UserSettings.cs
index 4b77fe175..c33263307 100644
--- a/GenHub/GenHub.Core/Models/Common/UserSettings.cs
+++ b/GenHub/GenHub.Core/Models/Common/UserSettings.cs
@@ -39,6 +39,12 @@ public class UserSettings
     /// <summary>Gets or sets a value indicating whether to automatically check for updates on startup.</summary>
     public bool AutoCheckForUpdatesOnStartup { get; set; } = true;
 
+    /// <summary>Gets or sets a value indicating whether to automatically check for updates periodically.</summary>
+    public bool AutoCheckForUpdatesPeriodically { get; set; } = true;
+
+    /// <summary>Gets or sets the interval in minutes between periodic update checks.</summary>
+    public int PeriodicUpdateCheckIntervalMinutes { get; set; } = GenHub.Core.Constants.AppUpdateConstants.DefaultPeriodicUpdateCheckIntervalMinutes;
+
     /// <summary>Gets or sets the timestamp of the last update check in ISO 8601 format.</summary>
     public string? LastUpdateCheckTimestamp { get; set; }
 
@@ -151,6 +157,8 @@ public UserSettings Clone()
             MaxConcurrentDownloads = MaxConcurrentDownloads,
             AllowBackgroundDownloads = AllowBackgroundDownloads,
             AutoCheckForUpdatesOnStartup = AutoCheckForUpdatesOnStartup,
+            AutoCheckForUpdatesPeriodically = AutoCheckForUpdatesPeriodically,
+            PeriodicUpdateCheckIntervalMinutes = PeriodicUpdateCheckIntervalMinutes,
             LastUpdateCheckTimestamp = LastUpdateCheckTimestamp,
             EnableDetailedLogging = EnableDetailedLogging,
             DefaultWorkspaceStrategy = DefaultWorkspaceStrategy,
diff --git a/GenHub/GenHub.Core/Models/Manifest/ManifestIdJsonConverter.cs b/GenHub/GenHub.Core/Models/Manifest/ManifestIdJsonConverter.cs
index 83d681312..7a93f17cf 100644
--- a/GenHub/GenHub.Core/Models/Manifest/ManifestIdJsonConverter.cs
+++ b/GenHub/GenHub.Core/Models/Manifest/ManifestIdJsonConverter.cs
@@ -9,7 +9,7 @@ namespace GenHub.Core.Models.Manifest;
 public sealed class ManifestIdJsonConverter : JsonConverter<ManifestId>
 {
     /// <inheritdoc/>
-    public override ManifestId Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    public override ManifestId Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) // skipcq: CS-R1138
     {
         var s = reader.GetString() ?? string.Empty;
         return ManifestId.Create(s);
diff --git a/GenHub/GenHub.Core/Models/Manifest/ManifestVariantResolver.cs b/GenHub/GenHub.Core/Models/Manifest/ManifestVariantResolver.cs
index ddb22794a..fc609db20 100644
--- a/GenHub/GenHub.Core/Models/Manifest/ManifestVariantResolver.cs
+++ b/GenHub/GenHub.Core/Models/Manifest/ManifestVariantResolver.cs
@@ -166,7 +166,13 @@ public static EntryPointResolution ResolveEntryPoint(
             files);
     }
 
-    private static bool PathsMatch(string left, string right) =>
+    /// <summary>
+    /// Determines whether two relative file paths match, normalizing directory separators and leading slashes.
+    /// </summary>
+    /// <param name="left">The first relative path.</param>
+    /// <param name="right">The second relative path.</param>
+    /// <returns><c>true</c> if the paths match; otherwise, <c>false</c>.</returns>
+    public static bool PathsMatch(string left, string right) =>
         string.Equals(
             left.Replace('\\', '/').TrimStart('/'),
             right.Replace('\\', '/').TrimStart('/'),
diff --git a/GenHub/GenHub.Core/Models/ModDB/MapDetails.cs b/GenHub/GenHub.Core/Models/ModDB/MapDetails.cs
index 347634147..979071455 100644
--- a/GenHub/GenHub.Core/Models/ModDB/MapDetails.cs
+++ b/GenHub/GenHub.Core/Models/ModDB/MapDetails.cs
@@ -37,4 +37,4 @@ public record MapDetails(
     string? FileType = null,
     float? Rating = null,
     string? RefererUrl = null,
-    List<GenHub.Core.Models.Parsers.File>? AdditionalFiles = null);
+    List<DownloadableFile>? AdditionalFiles = null);
diff --git a/GenHub/GenHub.Core/Models/ModDB/ModDBCategoryMapper.cs b/GenHub/GenHub.Core/Models/ModDB/ModDBCategoryMapper.cs
index cf2fc5920..c0f1e9a1f 100644
--- a/GenHub/GenHub.Core/Models/ModDB/ModDBCategoryMapper.cs
+++ b/GenHub/GenHub.Core/Models/ModDB/ModDBCategoryMapper.cs
@@ -19,8 +19,8 @@ public static ContentType MapCategory(string? categoryCode)
             // Releases (Mods)
             "2" => ContentType.Mod,  // Full Version
             "3" => ContentType.Mod,  // Demo
-            "4" => ContentType.Patch, // Patch
-            "28" => ContentType.Patch, // Script
+            "4" => ContentType.Mod,  // Patch (mod release/update)
+            "28" => ContentType.Mod, // Script (mod script/release)
             "29" => ContentType.Addon, // Trainer
 
             // Media
@@ -60,11 +60,11 @@ public static ContentType MapCategory(string? categoryCode)
             "131" => ContentType.Addon, // Model Pack
 
             // Addons - Skins
-            "112" => ContentType.Skin, // Player Skin
-            "133" => ContentType.Skin, // Prop Skin
-            "113" => ContentType.Skin, // Vehicle Skin
-            "114" => ContentType.Skin, // Weapon Skin
-            "134" => ContentType.Skin, // Skin Pack
+            "112" => ContentType.Addon, // Player Skin
+            "133" => ContentType.Addon, // Prop Skin
+            "113" => ContentType.Addon, // Vehicle Skin
+            "114" => ContentType.Addon, // Weapon Skin
+            "134" => ContentType.Addon, // Skin Pack
 
             // Addons - Audio
             "117" => ContentType.Addon, // Music
@@ -75,8 +75,8 @@ public static ContentType MapCategory(string? categoryCode)
             // Addons - Graphics
             "124" => ContentType.Addon, // Decal
             "136" => ContentType.Addon, // Effects GFX
-            "125" => ContentType.Skin, // GUI
-            "126" => ContentType.Skin, // HUD
+            "125" => ContentType.Addon, // GUI
+            "126" => ContentType.Addon, // HUD
             "128" => ContentType.Addon, // Sprite
             "129" => ContentType.Addon, // Texture
 
@@ -103,10 +103,15 @@ public static ContentType MapCategoryByName(string? categoryName)
         {
             var s when s.Contains("full version") => ContentType.Mod,
             var s when s.Contains("demo") => ContentType.Mod,
-            var s when s.Contains("patch") => ContentType.Patch,
-            var s when s.Contains("script") => ContentType.Patch,
+            var s when s.Contains("patch") => ContentType.Mod,
+            var s when s.Contains("script") => ContentType.Mod,
             var s when s.Contains("trainer") => ContentType.Addon,
 
+            var s when s.Contains("tool") => ContentType.ModdingTool,
+            var s when s.Contains("sdk") => ContentType.ModdingTool,
+            var s when s.Contains("ide") => ContentType.ModdingTool,
+            var s when s.Contains("source code") => ContentType.ModdingTool,
+
             var s when s.Contains("trailer") => ContentType.Video,
             var s when s.Contains("movie") => ContentType.Video,
             var s when s.Contains("video") => ContentType.Video,
@@ -116,17 +121,12 @@ var s when s.Contains("singleplayer map") => ContentType.Map,
             var s when s.Contains("map") => ContentType.Map,
             var s when s.Contains("prefab") => ContentType.Map,
 
-            var s when s.Contains("skin") => ContentType.Skin,
-            var s when s.Contains("gui") => ContentType.Skin,
-            var s when s.Contains("hud") => ContentType.Skin,
+            var s when s.Contains("skin") => ContentType.Addon,
+            var s when s.Contains("gui") => ContentType.Addon,
+            var s when s.Contains("hud") => ContentType.Addon,
 
             var s when s.Contains("language") => ContentType.LanguagePack,
 
-            var s when s.Contains("tool") => ContentType.ModdingTool,
-            var s when s.Contains("sdk") => ContentType.ModdingTool,
-            var s when s.Contains("ide") => ContentType.ModdingTool,
-            var s when s.Contains("source code") => ContentType.ModdingTool,
-
             _ => ContentType.Addon,
         };
     }
diff --git a/GenHub/GenHub.Core/Models/ModDB/ModDBFilter.cs b/GenHub/GenHub.Core/Models/ModDB/ModDBFilter.cs
index a977a5f08..88232974f 100644
--- a/GenHub/GenHub.Core/Models/ModDB/ModDBFilter.cs
+++ b/GenHub/GenHub.Core/Models/ModDB/ModDBFilter.cs
@@ -1,3 +1,7 @@
+using System;
+using System.Collections.Generic;
+using GenHub.Core.Constants;
+
 namespace GenHub.Core.Models.ModDB;
 
 /// <summary>
@@ -21,7 +25,7 @@ public class ModDBFilter
     public string? Licence { get; set; }
 
     /// <summary>Gets or sets the sort parameter.</summary>
-    public string? Sort { get; set; }
+    public string? Sort { get; set; } = ModDBConstants.DefaultSort;
 
     /// <summary>Gets or sets the page number (1-based).</summary>
     public int Page { get; set; } = 1;
diff --git a/GenHub/GenHub.Core/Models/Parsers/Comment.cs b/GenHub/GenHub.Core/Models/Parsers/Comment.cs
index 645e1fd5a..dd1532318 100644
--- a/GenHub/GenHub.Core/Models/Parsers/Comment.cs
+++ b/GenHub/GenHub.Core/Models/Parsers/Comment.cs
@@ -1,3 +1,6 @@
+using System;
+using System.Collections.Generic;
+
 namespace GenHub.Core.Models.Parsers;
 
 /// <summary>
@@ -8,9 +11,13 @@ namespace GenHub.Core.Models.Parsers;
 /// <param name="Date">The comment date (optional).</param>
 /// <param name="Karma">The karma/vote score (optional).</param>
 /// <param name="IsCreator">Whether the comment is from the content creator (optional).</param>
+/// <param name="IndentLevel">Indentation depth level for reply threads (optional).</param>
+/// <param name="Replies">Child replies to this comment (optional).</param>
 public record Comment(
     string? Author = null,
     string? Content = null,
     DateTime? Date = null,
     int? Karma = null,
-    bool? IsCreator = null) : ContentSection(SectionType.Comment, "Comment");
+    bool? IsCreator = null,
+    int IndentLevel = 0,
+    IReadOnlyList<Comment>? Replies = null) : ContentSection(SectionType.Comment, "Comment");
diff --git a/GenHub/GenHub.Core/Models/Parsers/DownloadableFile.cs b/GenHub/GenHub.Core/Models/Parsers/DownloadableFile.cs
new file mode 100644
index 000000000..0df14e67a
--- /dev/null
+++ b/GenHub/GenHub.Core/Models/Parsers/DownloadableFile.cs
@@ -0,0 +1,42 @@
+namespace GenHub.Core.Models.Parsers;
+
+/// <summary>
+/// Represents a downloadable file extracted from a web page.
+/// </summary>
+/// <param name="Name">The file name.</param>
+/// <param name="Version">The file version (optional).</param>
+/// <param name="SizeBytes">File size in bytes (optional).</param>
+/// <param name="SizeDisplay">Human-readable file size (optional).</param>
+/// <param name="UploadDate">The upload date (optional).</param>
+/// <param name="Category">The file category (optional).</param>
+/// <param name="Uploader">The uploader name (optional).</param>
+/// <param name="DownloadUrl">The download URL (optional).</param>
+/// <param name="Md5Hash">The MD5 hash of the file (optional).</param>
+/// <param name="CommentCount">Number of comments (optional).</param>
+/// <param name="ThumbnailUrl">The thumbnail image URL (optional).</param>
+/// <param name="DownloadCount">Number of downloads (optional).</param>
+/// <param name="FileSectionType">The file section type (Downloads or Addons).</param>
+/// <param name="ReleaseDate">The release date (optional, may differ from upload date).</param>
+/// <param name="DetailsUrl">The web page details URL (optional).</param>
+/// <param name="Description">The full description or release notes (optional).</param>
+/// <param name="PreviewImages">List of preview image URLs (optional).</param>
+/// <param name="Filename">The actual file archive name (optional).</param>
+public record DownloadableFile(
+    string Name,
+    string? Version = null,
+    long? SizeBytes = null,
+    string? SizeDisplay = null,
+    DateTime? UploadDate = null,
+    string? Category = null,
+    string? Uploader = null,
+    string? DownloadUrl = null,
+    string? Md5Hash = null,
+    int? CommentCount = null,
+    string? ThumbnailUrl = null,
+    int? DownloadCount = null,
+    FileSectionType FileSectionType = FileSectionType.Downloads,
+    DateTime? ReleaseDate = null,
+    string? DetailsUrl = null,
+    string? Description = null,
+    System.Collections.Generic.IReadOnlyList<string>? PreviewImages = null,
+    string? Filename = null) : ContentSection(SectionType.File, Name);
diff --git a/GenHub/GenHub.Core/Models/Parsers/FileSectionType.cs b/GenHub/GenHub.Core/Models/Parsers/FileSectionType.cs
new file mode 100644
index 000000000..9fddb1afb
--- /dev/null
+++ b/GenHub/GenHub.Core/Models/Parsers/FileSectionType.cs
@@ -0,0 +1,13 @@
+namespace GenHub.Core.Models.Parsers;
+
+/// <summary>
+/// Represents the type of file section, distinguishing between main releases and addon files.
+/// </summary>
+public enum FileSectionType
+{
+    /// <summary>Files from the main releases/downloads section.</summary>
+    Downloads,
+
+    /// <summary>Files from the addons section.</summary>
+    Addons,
+}
diff --git a/GenHub/GenHub.Core/Serialization/JsonWorkspaceStrategyConverter.cs b/GenHub/GenHub.Core/Serialization/JsonWorkspaceStrategyConverter.cs
index 24058e7d9..04375f0ea 100644
--- a/GenHub/GenHub.Core/Serialization/JsonWorkspaceStrategyConverter.cs
+++ b/GenHub/GenHub.Core/Serialization/JsonWorkspaceStrategyConverter.cs
@@ -15,7 +15,8 @@ public class JsonWorkspaceStrategyConverter : JsonConverter<WorkspaceStrategy>
     /// <inheritdoc />
     [SuppressMessage("Maintainability", "CS-R1138:Inappropriate ordering of parameters", Justification = "Signature is defined by System.Text.Json.Serialization.JsonConverter<T>.Read")]
     [SuppressMessage("DeepSource", "CS-R1138", Justification = "Signature is defined by System.Text.Json.Serialization.JsonConverter<T>.Read")]
-    public override WorkspaceStrategy Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    [SuppressMessage("csharp", "CS-R1138", Justification = "Signature is defined by System.Text.Json.Serialization.JsonConverter<T>.Read")]
+    public override WorkspaceStrategy Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) // skipcq: CS-R1138
     {
         if (reader.TokenType == JsonTokenType.Number)
         {
diff --git a/GenHub/GenHub.Core/Services/Content/LocalContentService.cs b/GenHub/GenHub.Core/Services/Content/LocalContentService.cs
index 8f544eec5..2912aa9a5 100644
--- a/GenHub/GenHub.Core/Services/Content/LocalContentService.cs
+++ b/GenHub/GenHub.Core/Services/Content/LocalContentService.cs
@@ -57,7 +57,8 @@ public async Task<OperationResult<ContentManifest>> CreateLocalContentManifestAs
         GameType targetGame,
         string? sourcePath = null,
         IProgress<ContentStorageProgress>? progress = null,
-        CancellationToken cancellationToken = default)
+        CancellationToken cancellationToken = default,
+        string? entryPoint = null)
     {
         try
         {
@@ -102,6 +103,29 @@ public async Task<OperationResult<ContentManifest>> CreateLocalContentManifestAs
             var manifest = builder.Build();
             manifest.SourcePath = !string.IsNullOrEmpty(sourcePath) ? sourcePath : directoryPath;
 
+            if (!string.IsNullOrWhiteSpace(entryPoint))
+            {
+                var normalizedEntryPoint = entryPoint.Replace('\\', '/').TrimStart('/');
+
+                var segments = normalizedEntryPoint.Split('/', StringSplitOptions.RemoveEmptyEntries);
+                if (Path.IsPathRooted(entryPoint) || segments.Any(s => s == ".."))
+                {
+                    return OperationResult<ContentManifest>.CreateFailure(
+                        $"Entry point '{entryPoint}' is invalid. It must be a relative path without parent directory traversal ('..').");
+                }
+
+                var matchedFile = manifest.Files.FirstOrDefault(f =>
+                    ManifestVariantResolver.PathsMatch(f.RelativePath, normalizedEntryPoint));
+
+                if (matchedFile == null)
+                {
+                    return OperationResult<ContentManifest>.CreateFailure(
+                        $"Entry point '{entryPoint}' was not found among the files in the directory.");
+                }
+
+                manifest.EntryPoint = matchedFile.RelativePath.Replace('\\', '/');
+            }
+
             // Auto-add GameInstallation dependency for GameClient content types
             // This ensures auto-resolution logic works correctly for locally added clients
             if (contentType == ContentType.GameClient)
@@ -195,13 +219,14 @@ public async Task<OperationResult<ContentManifest>> UpdateLocalContentManifestAs
         GameType targetGame,
         string? sourcePath = null,
         IProgress<ContentStorageProgress>? progress = null,
-        CancellationToken cancellationToken = default)
+        CancellationToken cancellationToken = default,
+        string? entryPoint = null)
     {
         try
         {
             // 1. Create the new manifest/content
             // We do this FIRST to ensure the new content is valid before deleting the old one
-            var createResult = await CreateLocalContentManifestAsync(directoryPath, name, contentType, targetGame, sourcePath, progress, cancellationToken);
+            var createResult = await CreateLocalContentManifestAsync(directoryPath, name, contentType, targetGame, sourcePath, progress, cancellationToken, entryPoint);
 
             if (!createResult.Success)
             {
diff --git a/GenHub/GenHub.Tests/GenHub.Tests.Core/Common/Services/ConfigurationProviderServiceTests.cs b/GenHub/GenHub.Tests/GenHub.Tests.Core/Common/Services/ConfigurationProviderServiceTests.cs
index 49836a2dc..7cd571b77 100644
--- a/GenHub/GenHub.Tests/GenHub.Tests.Core/Common/Services/ConfigurationProviderServiceTests.cs
+++ b/GenHub/GenHub.Tests/GenHub.Tests.Core/Common/Services/ConfigurationProviderServiceTests.cs
@@ -549,6 +549,58 @@ public void GetAutoCheckForUpdatesOnStartup_ReturnsUserSetting(bool userValue)
         Assert.Equal(userValue, result);
     }
 
+    /// <summary>
+    /// Verifies that GetAutoCheckForUpdatesPeriodically returns user setting when explicitly set.
+    /// </summary>
+    /// <param name="userValue">The value to set for AutoCheckForUpdatesPeriodically in user settings.</param>
+    [Theory]
+    [InlineData(true)]
+    [InlineData(false)]
+    public void GetAutoCheckForUpdatesPeriodically_ReturnsUserSetting(bool userValue)
+    {
+        // Arrange
+        var userSettings = new UserSettings { AutoCheckForUpdatesPeriodically = userValue };
+        userSettings.MarkAsExplicitlySet(nameof(UserSettings.AutoCheckForUpdatesPeriodically));
+        _mockUserSettings.Setup(x => x.Get()).Returns(userSettings);
+
+        var provider = CreateProvider();
+
+        // Act
+        var result = provider.GetAutoCheckForUpdatesPeriodically();
+
+        // Assert
+        Assert.Equal(userValue, result);
+    }
+
+    /// <summary>
+    /// Verifies that GetPeriodicUpdateCheckIntervalMinutes returns user setting when explicitly set.
+    /// </summary>
+    /// <param name="intervalMinutes">The interval to set in user settings.</param>
+    /// <param name="expectedMinutes">The expected clamped interval.</param>
+    [Theory]
+    [InlineData(60, 60)]
+    [InlineData(0, AppUpdateConstants.DefaultPeriodicUpdateCheckIntervalMinutes)]
+    [InlineData(20000, AppUpdateConstants.MaxPeriodicUpdateCheckIntervalMinutes)]
+    public void GetPeriodicUpdateCheckIntervalMinutes_ReturnsUserSetting(int intervalMinutes, int expectedMinutes)
+    {
+        // Arrange
+        var userSettings = new UserSettings { PeriodicUpdateCheckIntervalMinutes = intervalMinutes };
+        if (intervalMinutes > 0)
+        {
+            userSettings.MarkAsExplicitlySet(nameof(UserSettings.PeriodicUpdateCheckIntervalMinutes));
+        }
+
+        _mockUserSettings.Setup(x => x.Get()).Returns(userSettings);
+
+        var provider = CreateProvider();
+
+        // Act
+        var result = provider.GetPeriodicUpdateCheckIntervalMinutes();
+
+        // Assert
+        Assert.Equal(expectedMinutes, result);
+    }
+
     /// <summary>
     /// Verifies that GetEnableDetailedLogging returns user setting when explicitly set.
     /// </summary>
@@ -784,7 +836,8 @@ public void GetGitHubDiscoveryRepositories_WithNullUserSetting_ReturnsDefaults()
 
         // Assert
         Assert.Contains("TheSuperHackers/GeneralsGameCode", result);
-        Assert.Single(result);
+        Assert.Contains("TheSuperHackers/GeneralsGamePatch2", result);
+        Assert.Equal(2, result.Count);
     }
 
     /// <summary>
diff --git a/GenHub/GenHub.Tests/GenHub.Tests.Core/Common/Services/UserSettingsServiceTests.cs b/GenHub/GenHub.Tests/GenHub.Tests.Core/Common/Services/UserSettingsServiceTests.cs
index 9b37967c3..1e105e2ef 100644
--- a/GenHub/GenHub.Tests/GenHub.Tests.Core/Common/Services/UserSettingsServiceTests.cs
+++ b/GenHub/GenHub.Tests/GenHub.Tests.Core/Common/Services/UserSettingsServiceTests.cs
@@ -66,6 +66,8 @@ public void Get_WhenNoFileExists_ReturnsDefaultUserSettings()
         Assert.Equal(DownloadDefaults.MaxConcurrentDownloads, settings.MaxConcurrentDownloads);
         Assert.True(settings.AllowBackgroundDownloads);
         Assert.True(settings.AutoCheckForUpdatesOnStartup);
+        Assert.True(settings.AutoCheckForUpdatesPeriodically);
+        Assert.Equal(AppUpdateConstants.DefaultPeriodicUpdateCheckIntervalMinutes, settings.PeriodicUpdateCheckIntervalMinutes);
         Assert.Equal(WorkspaceConstants.DefaultWorkspaceStrategy, settings.DefaultWorkspaceStrategy);
     }
 
@@ -364,6 +366,25 @@ public void UpdateSettings_EnableDetailedLogging_CanBeSetAndRetrieved(bool enabl
         Assert.Equal(enableLogging, currentSettings.EnableDetailedLogging);
     }
 
+    /// <summary>
+    /// Verifies that periodic update settings can be set and retrieved correctly.
+    /// </summary>
+    [Fact]
+    public void UpdateSettings_PeriodicUpdateSettings_CanBeSetAndRetrieved()
+    {
+        var service = CreateService();
+
+        service.Update(settings =>
+        {
+            settings.AutoCheckForUpdatesPeriodically = false;
+            settings.PeriodicUpdateCheckIntervalMinutes = 15;
+        });
+        var currentSettings = service.Get();
+
+        Assert.False(currentSettings.AutoCheckForUpdatesPeriodically);
+        Assert.Equal(15, currentSettings.PeriodicUpdateCheckIntervalMinutes);
+    }
+
     private static IAppConfiguration CreateAppConfigMock()
     {
         var appConfig = new Mock<IAppConfiguration>();
diff --git a/GenHub/GenHub.Tests/GenHub.Tests.Core/Constants/AppUpdateConstantsTests.cs b/GenHub/GenHub.Tests/GenHub.Tests.Core/Constants/AppUpdateConstantsTests.cs
new file mode 100644
index 000000000..be8cebf08
--- /dev/null
+++ b/GenHub/GenHub.Tests/GenHub.Tests.Core/Constants/AppUpdateConstantsTests.cs
@@ -0,0 +1,95 @@
+using System;
+using GenHub.Core.Constants;
+using Xunit;
+
+namespace GenHub.Tests.Core.Constants;
+
+/// <summary>
+/// Unit tests for <see cref="AppUpdateConstants"/>.
+/// </summary>
+public class AppUpdateConstantsTests
+{
+    /// <summary>
+    /// Tests that tab index constants have expected values.
+    /// </summary>
+    [Fact]
+    public void TabIndex_Constants_ShouldHaveExpectedValues()
+    {
+        Assert.Equal(0, AppUpdateConstants.UpdateTabIndex);
+        Assert.Equal(1, AppUpdateConstants.BrowseBuildsTabIndex);
+        Assert.Equal(1, AppUpdateConstants.MaxTabIndex);
+    }
+
+    /// <summary>
+    /// Tests that platform and artifact prefix constants have expected values.
+    /// </summary>
+    [Fact]
+    public void ArtifactAndPlatform_Constants_ShouldHaveExpectedValues()
+    {
+        Assert.Equal("velopack", AppUpdateConstants.VelopackDirectory);
+        Assert.Equal("genhub-velopack-windows-", AppUpdateConstants.ArtifactPrefixWindows);
+        Assert.Equal("genhub-velopack-linux-", AppUpdateConstants.ArtifactPrefixLinux);
+        Assert.Equal("GenHub-Release", AppUpdateConstants.ArtifactNameRelease);
+        Assert.Equal("windows", AppUpdateConstants.PlatformWindows);
+        Assert.Equal("linux", AppUpdateConstants.PlatformLinux);
+    }
+
+    /// <summary>
+    /// Tests that periodic update check interval constants have expected values.
+    /// </summary>
+    [Fact]
+    public void PeriodicUpdateCheckInterval_Constants_ShouldHaveExpectedValues()
+    {
+        Assert.Equal(30, AppUpdateConstants.DefaultPeriodicUpdateCheckIntervalMinutes);
+        Assert.Equal(5, AppUpdateConstants.MinPeriodicUpdateCheckIntervalMinutes);
+        Assert.Equal(10080, AppUpdateConstants.MaxPeriodicUpdateCheckIntervalMinutes);
+        Assert.Equal(5, AppUpdateConstants.PeriodicUpdateCheckIntervalIncrementMinutes);
+        Assert.True(AppUpdateConstants.MinPeriodicUpdateCheckIntervalMinutes <= AppUpdateConstants.DefaultPeriodicUpdateCheckIntervalMinutes);
+        Assert.True(AppUpdateConstants.DefaultPeriodicUpdateCheckIntervalMinutes <= AppUpdateConstants.MaxPeriodicUpdateCheckIntervalMinutes);
+    }
+
+    /// <summary>
+    /// Tests that timespan constants have expected durations.
+    /// </summary>
+    [Fact]
+    public void TimeSpan_Constants_ShouldHaveExpectedValues()
+    {
+        Assert.Equal(TimeSpan.FromSeconds(5), AppUpdateConstants.PostUpdateExitDelay);
+        Assert.Equal(TimeSpan.FromHours(1), AppUpdateConstants.CacheDuration);
+        Assert.Equal(3, AppUpdateConstants.MaxHttpRetries);
+    }
+
+    /// <summary>
+    /// Tests that notification title and format constants are non-empty strings.
+    /// </summary>
+    [Fact]
+    public void NotificationAndFormat_Constants_ShouldBeValid()
+    {
+        Assert.False(string.IsNullOrWhiteSpace(AppUpdateConstants.UpdateAvailableNotificationTitle));
+        Assert.False(string.IsNullOrWhiteSpace(AppUpdateConstants.BranchUpdateAvailableNotificationTitle));
+        Assert.False(string.IsNullOrWhiteSpace(AppUpdateConstants.PrUpdateAvailableNotificationTitle));
+        Assert.False(string.IsNullOrWhiteSpace(AppUpdateConstants.UpdatingAppNotificationTitle));
+        Assert.False(string.IsNullOrWhiteSpace(AppUpdateConstants.UpdateFailedNotificationTitle));
+        Assert.False(string.IsNullOrWhiteSpace(AppUpdateConstants.UpdateAction));
+        Assert.False(string.IsNullOrWhiteSpace(AppUpdateConstants.ViewUpdatesAction));
+        Assert.Contains("{0}", AppUpdateConstants.ReleaseUpdateNotificationFormat);
+        Assert.Contains("{0}", AppUpdateConstants.BranchUpdateNotificationFormat);
+        Assert.Contains("{1}", AppUpdateConstants.BranchUpdateNotificationFormat);
+        Assert.Contains("{0}", AppUpdateConstants.PrUpdateNotificationFormat);
+        Assert.Contains("{1}", AppUpdateConstants.PrUpdateNotificationFormat);
+        Assert.Contains("{0}", AppUpdateConstants.UpdateFailedNotificationFormat);
+    }
+
+    /// <summary>
+    /// Tests that sort option constants are distinct non-empty strings.
+    /// </summary>
+    [Fact]
+    public void SortOption_Constants_ShouldBeDistinctAndNonEmpty()
+    {
+        Assert.False(string.IsNullOrWhiteSpace(AppUpdateConstants.SortOptionLastUpdated));
+        Assert.False(string.IsNullOrWhiteSpace(AppUpdateConstants.SortOptionPrNumberDesc));
+        Assert.False(string.IsNullOrWhiteSpace(AppUpdateConstants.SortOptionPrNumberAsc));
+        Assert.NotEqual(AppUpdateConstants.SortOptionLastUpdated, AppUpdateConstants.SortOptionPrNumberDesc);
+        Assert.NotEqual(AppUpdateConstants.SortOptionPrNumberDesc, AppUpdateConstants.SortOptionPrNumberAsc);
+    }
+}
diff --git a/GenHub/GenHub.Tests/GenHub.Tests.Core/Features/AppUpdate/ViewModels/UpdateNotificationViewModelTests.cs b/GenHub/GenHub.Tests/GenHub.Tests.Core/Features/AppUpdate/ViewModels/UpdateNotificationViewModelTests.cs
index fed2373b8..b4ea11d25 100644
--- a/GenHub/GenHub.Tests/GenHub.Tests.Core/Features/AppUpdate/ViewModels/UpdateNotificationViewModelTests.cs
+++ b/GenHub/GenHub.Tests/GenHub.Tests.Core/Features/AppUpdate/ViewModels/UpdateNotificationViewModelTests.cs
@@ -1,8 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
 using GenHub.Core.Interfaces.Common;
+using GenHub.Core.Models.AppUpdate;
+using GenHub.Core.Models.Common;
 using GenHub.Features.AppUpdate.Interfaces;
 using GenHub.Features.AppUpdate.ViewModels;
 using Microsoft.Extensions.Logging;
 using Moq;
+using Xunit;
 
 namespace GenHub.Tests.Core.Features.AppUpdate.ViewModels;
 
@@ -23,7 +30,7 @@ public async Task CheckForUpdatesCommand_WhenNoUpdateAvailable_UpdatesStatusAsyn
            .ReturnsAsync((Velopack.UpdateInfo?)null);
 
         var mockUserSettings = new Mock<IUserSettingsService>();
-        mockUserSettings.Setup(x => x.Get()).Returns(new GenHub.Core.Models.Common.UserSettings());
+        mockUserSettings.Setup(x => x.Get()).Returns(new UserSettings());
 
         var vm = new UpdateNotificationViewModel(
             mockVelopack.Object,
@@ -43,7 +50,7 @@ public async Task CheckForUpdatesCommand_WhenNoUpdateAvailable_UpdatesStatusAsyn
     public void Constructor_InitializesSuccessfully()
     {
         var mockUserSettings = new Mock<IUserSettingsService>();
-        mockUserSettings.Setup(x => x.Get()).Returns(new GenHub.Core.Models.Common.UserSettings());
+        mockUserSettings.Setup(x => x.Get()).Returns(new UserSettings());
 
         var vm = new UpdateNotificationViewModel(
             Mock.Of<IVelopackUpdateManager>(),
@@ -63,7 +70,7 @@ public void Constructor_InitializesSuccessfully()
     public void IsCheckButtonEnabled_ReflectsCheckingState()
     {
         var mockUserSettings = new Mock<IUserSettingsService>();
-        mockUserSettings.Setup(x => x.Get()).Returns(new GenHub.Core.Models.Common.UserSettings());
+        mockUserSettings.Setup(x => x.Get()).Returns(new UserSettings());
 
         var vm = new UpdateNotificationViewModel(
             Mock.Of<IVelopackUpdateManager>(),
@@ -72,4 +79,493 @@ public void IsCheckButtonEnabled_ReflectsCheckingState()
 
         Assert.True(vm.IsCheckButtonEnabled);
     }
+
+    /// <summary>
+    /// Verifies that pull request display title formats properly with PR number and title.
+    /// </summary>
+    [Fact]
+    public void PullRequestInfo_DisplayTitle_ShouldIncludePrNumberAndTitle()
+    {
+        var prInfo = new PullRequestInfo
+        {
+            Number = 265,
+            Title = "feat: UI Downloads",
+            BranchName = "feat/ui-downloads",
+            Author = "developer",
+            State = "open",
+            UpdatedAt = DateTimeOffset.UtcNow,
+        };
+
+        Assert.Equal("#265 - feat: UI Downloads", prInfo.DisplayTitle);
+    }
+
+    /// <summary>
+    /// Verifies that subscribing to a PR loads artifacts and auto-selects the latest version.
+    /// </summary>
+    /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
+    [Fact]
+    public async Task SubscribeToPr_LoadsArtifactsAndAutoSelectsLatestVersionAsync()
+    {
+        var mockVelopack = new Mock<IVelopackUpdateManager>();
+        var mockUserSettings = new Mock<IUserSettingsService>();
+        mockUserSettings.Setup(x => x.Get()).Returns(new UserSettings());
+
+        var artifacts = new List<ArtifactUpdateInfo>
+        {
+            new("0.0.1316-pr389", "e1212a5", 389, 1001, "https://github.com/test/run/1", 501, "genhub-velopack-linux-0.0.1316-pr389", DateTime.UtcNow, "https://github.com/test/art/1", 1024),
+            new("0.0.1315-pr389", "a1b2c3d", 389, 1000, "https://github.com/test/run/0", 500, "genhub-velopack-linux-0.0.1315-pr389", DateTime.UtcNow.AddMinutes(-10), "https://github.com/test/art/0", 1024),
+        };
+
+        var loadTcs = new TaskCompletionSource<IReadOnlyList<ArtifactUpdateInfo>>();
+        mockVelopack.Setup(x => x.GetArtifactsForPullRequestAsync(389, It.IsAny<CancellationToken>()))
+            .Returns(async (int _, CancellationToken ct) =>
+            {
+                ct.Register(() => loadTcs.TrySetCanceled(ct));
+                return await loadTcs.Task;
+            });
+
+        var vm = new UpdateNotificationViewModel(
+            mockVelopack.Object,
+            Mock.Of<ILogger<UpdateNotificationViewModel>>(),
+            mockUserSettings.Object);
+
+        vm.SubscribeToPrCommand.Execute(389);
+
+        Assert.True(vm.IsLoadingVersions);
+        loadTcs.SetResult(artifacts);
+
+        // wait briefly for async continuation
+        var timeout = DateTime.UtcNow.AddSeconds(2);
+        while (vm.IsLoadingVersions && DateTime.UtcNow < timeout)
+        {
+            await Task.Delay(10);
+        }
+
+        Assert.False(vm.IsLoadingVersions);
+        Assert.Equal(2, vm.AvailableVersions.Count);
+        Assert.NotNull(vm.SelectedVersion);
+        Assert.Equal("0.0.1316-pr389", vm.SelectedVersion.Version);
+        Assert.Equal("e1212a5", vm.SelectedVersion.GitHash);
+        Assert.True(vm.CanDownloadUpdate);
+    }
+
+    /// <summary>
+    /// Verifies that subscribing to a branch loads artifacts and auto-selects the latest version.
+    /// </summary>
+    /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
+    [Fact]
+    public async Task SubscribeToBranch_LoadsArtifactsAndAutoSelectsLatestVersionAsync()
+    {
+        var mockVelopack = new Mock<IVelopackUpdateManager>();
+        var mockUserSettings = new Mock<IUserSettingsService>();
+        mockUserSettings.Setup(x => x.Get()).Returns(new UserSettings());
+
+        var artifacts = new List<ArtifactUpdateInfo>
+        {
+            new("0.0.1320-development", "f4e3d2c", null, 2001, "https://github.com/test/run/2", 601, "genhub-velopack-linux-0.0.1320-development", DateTime.UtcNow, "https://github.com/test/art/2", 2048),
+        };
+
+        mockVelopack.Setup(x => x.GetArtifactsForBranchAsync("development", It.IsAny<CancellationToken>()))
+            .ReturnsAsync(artifacts);
+
+        var vm = new UpdateNotificationViewModel(
+            mockVelopack.Object,
+            Mock.Of<ILogger<UpdateNotificationViewModel>>(),
+            mockUserSettings.Object);
+
+        vm.SubscribeToBranchCommand.Execute("development");
+
+        var timeout = DateTime.UtcNow.AddSeconds(2);
+        while (vm.IsLoadingVersions && DateTime.UtcNow < timeout)
+        {
+            await Task.Delay(10);
+        }
+
+        Assert.False(vm.IsLoadingVersions);
+        Assert.Single(vm.AvailableVersions);
+        Assert.NotNull(vm.SelectedVersion);
+        Assert.Equal("0.0.1320-development", vm.SelectedVersion.Version);
+    }
+
+    /// <summary>
+    /// Verifies that when switching PR subscriptions while a previous load is in flight, the old request is cancelled and only the new subscription artifacts are applied.
+    /// </summary>
+    /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
+    [Fact]
+    public async Task SubscribeToPr_WhenSwitchedImmediately_CancelsPreviousLoadAndLoadsNewSubscriptionAsync()
+    {
+        var mockVelopack = new Mock<IVelopackUpdateManager>();
+        var mockUserSettings = new Mock<IUserSettingsService>();
+        mockUserSettings.Setup(x => x.Get()).Returns(new UserSettings());
+
+        var pr391Tcs = new TaskCompletionSource<IReadOnlyList<ArtifactUpdateInfo>>();
+        var pr389Tcs = new TaskCompletionSource<IReadOnlyList<ArtifactUpdateInfo>>();
+
+        mockVelopack.Setup(x => x.GetArtifactsForPullRequestAsync(391, It.IsAny<CancellationToken>()))
+            .Returns(async (int _, CancellationToken ct) =>
+            {
+                ct.Register(() => pr391Tcs.TrySetCanceled(ct));
+                return await pr391Tcs.Task;
+            });
+
+        mockVelopack.Setup(x => x.GetArtifactsForPullRequestAsync(389, It.IsAny<CancellationToken>()))
+            .Returns(async (int _, CancellationToken ct) =>
+            {
+                ct.Register(() => pr389Tcs.TrySetCanceled(ct));
+                return await pr389Tcs.Task;
+            });
+
+        var vm = new UpdateNotificationViewModel(
+            mockVelopack.Object,
+            Mock.Of<ILogger<UpdateNotificationViewModel>>(),
+            mockUserSettings.Object);
+
+        // subscribe to 391 first
+        vm.SubscribeToPrCommand.Execute(391);
+        Assert.True(vm.IsLoadingVersions);
+
+        // immediately switch to 389 while 391 is loading
+        vm.SubscribeToPrCommand.Execute(389);
+
+        // resolve 389 artifacts
+        var pr389Artifacts = new List<ArtifactUpdateInfo>
+        {
+            new("0.0.1316-pr389", "e1212a5", 389, 1001, "https://github.com/test/run/1", 501, "genhub-velopack-linux-0.0.1316-pr389", DateTime.UtcNow, "https://github.com/test/art/1", 1024),
+        };
+        pr389Tcs.TrySetResult(pr389Artifacts);
+
+        var timeout = DateTime.UtcNow.AddSeconds(2);
+        while (vm.IsLoadingVersions && DateTime.UtcNow < timeout)
+        {
+            await Task.Delay(10);
+        }
+
+        Assert.True(pr391Tcs.Task.IsCanceled);
+        Assert.False(vm.IsLoadingVersions);
+        Assert.Single(vm.AvailableVersions);
+        Assert.NotNull(vm.SelectedVersion);
+        Assert.Equal("0.0.1316-pr389", vm.SelectedVersion.Version);
+        Assert.Equal(389, vm.SelectedVersion.PullRequestNumber);
+    }
+
+    /// <summary>
+    /// Verifies that switching from a branch to another branch cancels the previous load and populates the new branch artifacts.
+    /// </summary>
+    /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
+    [Fact]
+    public async Task SubscribeToBranch_WhenSwitchedImmediately_CancelsPreviousLoadAndLoadsNewBranchAsync()
+    {
+        var mockVelopack = new Mock<IVelopackUpdateManager>();
+        var mockUserSettings = new Mock<IUserSettingsService>();
+        mockUserSettings.Setup(x => x.Get()).Returns(new UserSettings());
+
+        var branchOldTcs = new TaskCompletionSource<IReadOnlyList<ArtifactUpdateInfo>>();
+        var branchNewTcs = new TaskCompletionSource<IReadOnlyList<ArtifactUpdateInfo>>();
+
+        mockVelopack.Setup(x => x.GetArtifactsForBranchAsync("old-branch", It.IsAny<CancellationToken>()))
+            .Returns(async (string _, CancellationToken ct) =>
+            {
+                ct.Register(() => branchOldTcs.TrySetCanceled(ct));
+                return await branchOldTcs.Task;
+            });
+
+        mockVelopack.Setup(x => x.GetArtifactsForBranchAsync("new-branch", It.IsAny<CancellationToken>()))
+            .Returns(async (string _, CancellationToken ct) =>
+            {
+                ct.Register(() => branchNewTcs.TrySetCanceled(ct));
+                return await branchNewTcs.Task;
+            });
+
+        var vm = new UpdateNotificationViewModel(
+            mockVelopack.Object,
+            Mock.Of<ILogger<UpdateNotificationViewModel>>(),
+            mockUserSettings.Object);
+
+        vm.SubscribeToBranchCommand.Execute("old-branch");
+        Assert.True(vm.IsLoadingVersions);
+
+        vm.SubscribeToBranchCommand.Execute("new-branch");
+
+        var newArtifacts = new List<ArtifactUpdateInfo>
+        {
+            new("0.0.1400-new-branch", "9998887", null, 3001, "https://github.com/test/run/3", 701, "genhub-velopack-linux-0.0.1400-new-branch", DateTime.UtcNow, "https://github.com/test/art/3", 2048),
+        };
+        branchNewTcs.TrySetResult(newArtifacts);
+
+        var timeout = DateTime.UtcNow.AddSeconds(2);
+        while (vm.IsLoadingVersions && DateTime.UtcNow < timeout)
+        {
+            await Task.Delay(10);
+        }
+
+        Assert.True(branchOldTcs.Task.IsCanceled);
+        Assert.False(vm.IsLoadingVersions);
+        Assert.Single(vm.AvailableVersions);
+        Assert.NotNull(vm.SelectedVersion);
+        Assert.Equal("0.0.1400-new-branch", vm.SelectedVersion.Version);
+    }
+
+    /// <summary>
+    /// Verifies that unsubscribing cancels in-flight loads and clears available versions and selection.
+    /// </summary>
+    /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
+    [Fact]
+    public async Task Unsubscribe_CancelsInFlightLoadsAndClearsAvailableVersionsAsync()
+    {
+        var mockVelopack = new Mock<IVelopackUpdateManager>();
+        var mockUserSettings = new Mock<IUserSettingsService>();
+        mockUserSettings.Setup(x => x.Get()).Returns(new UserSettings());
+
+        var prTcs = new TaskCompletionSource<IReadOnlyList<ArtifactUpdateInfo>>();
+        mockVelopack.Setup(x => x.GetArtifactsForPullRequestAsync(391, It.IsAny<CancellationToken>()))
+            .Returns(async (int _, CancellationToken ct) =>
+            {
+                ct.Register(() => prTcs.TrySetCanceled(ct));
+                return await prTcs.Task;
+            });
+
+        var vm = new UpdateNotificationViewModel(
+            mockVelopack.Object,
+            Mock.Of<ILogger<UpdateNotificationViewModel>>(),
+            mockUserSettings.Object);
+
+        vm.SubscribeToPrCommand.Execute(391);
+        Assert.True(vm.IsLoadingVersions);
+
+        vm.UnsubscribeCommand.Execute(null);
+
+        var timeout = DateTime.UtcNow.AddSeconds(2);
+        while ((vm.IsLoadingVersions || vm.AvailableVersions.Count > 0) && DateTime.UtcNow < timeout)
+        {
+            await Task.Delay(10);
+        }
+
+        Assert.True(prTcs.Task.IsCanceled);
+        Assert.False(vm.IsLoadingVersions);
+        Assert.Empty(vm.AvailableVersions);
+        Assert.Null(vm.SelectedVersion);
+    }
+
+    /// <summary>
+    /// Verifies that OpenPullRequestUrlCommand executes without error for valid and invalid PR numbers.
+    /// </summary>
+    /// <param name="prNumber">The PR number under test.</param>
+    [Theory]
+    [InlineData(0)]
+    [InlineData(-1)]
+    public void OpenPullRequestUrlCommand_ExecutesWithoutException(int prNumber)
+    {
+        var mockUserSettings = new Mock<IUserSettingsService>();
+        mockUserSettings.Setup(x => x.Get()).Returns(new UserSettings());
+
+        var vm = new UpdateNotificationViewModel(
+            Mock.Of<IVelopackUpdateManager>(),
+            Mock.Of<ILogger<UpdateNotificationViewModel>>(),
+            mockUserSettings.Object);
+
+        // verify command execution does not throw
+        vm.OpenPullRequestUrlCommand.Execute(prNumber);
+        Assert.NotNull(vm);
+    }
+
+    /// <summary>
+    /// Verifies that changing the sort option reorders available pull requests accordingly.
+    /// </summary>
+    [Fact]
+    public void SelectedSortOption_ReordersAvailablePullRequests()
+    {
+        var mockUserSettings = new Mock<IUserSettingsService>();
+        mockUserSettings.Setup(x => x.Get()).Returns(new UserSettings());
+
+        var vm = new UpdateNotificationViewModel(
+            Mock.Of<IVelopackUpdateManager>(),
+            Mock.Of<ILogger<UpdateNotificationViewModel>>(),
+            mockUserSettings.Object);
+
+        var now = DateTimeOffset.UtcNow;
+        var pr100 = new PullRequestInfo { Number = 100, Title = "PR 100", BranchName = "b1", Author = "a1", State = "open", UpdatedAt = now.AddDays(-2) };
+        var pr200 = new PullRequestInfo { Number = 200, Title = "PR 200", BranchName = "b2", Author = "a2", State = "open", UpdatedAt = now.AddDays(-10) };
+        var pr300 = new PullRequestInfo { Number = 300, Title = "PR 300", BranchName = "b3", Author = "a3", State = "open", UpdatedAt = now };
+
+        vm.AvailablePullRequests.Add(pr100);
+        vm.AvailablePullRequests.Add(pr200);
+        vm.AvailablePullRequests.Add(pr300);
+
+        // sort by PR number descending
+        vm.SelectedSortOption = GenHub.Core.Constants.AppUpdateConstants.SortOptionPrNumberDesc;
+        Assert.Equal(300, vm.AvailablePullRequests[0].Number);
+        Assert.Equal(200, vm.AvailablePullRequests[1].Number);
+        Assert.Equal(100, vm.AvailablePullRequests[2].Number);
+
+        // sort by PR number ascending
+        vm.SelectedSortOption = GenHub.Core.Constants.AppUpdateConstants.SortOptionPrNumberAsc;
+        Assert.Equal(100, vm.AvailablePullRequests[0].Number);
+        Assert.Equal(200, vm.AvailablePullRequests[1].Number);
+        Assert.Equal(300, vm.AvailablePullRequests[2].Number);
+
+        // sort by last updated (newest first)
+        vm.SelectedSortOption = GenHub.Core.Constants.AppUpdateConstants.SortOptionLastUpdated;
+        Assert.Equal(300, vm.AvailablePullRequests[0].Number);
+        Assert.Equal(100, vm.AvailablePullRequests[1].Number);
+        Assert.Equal(200, vm.AvailablePullRequests[2].Number);
+    }
+
+    /// <summary>
+    /// Verifies that tab commands correctly switch between Update and Browse Builds tabs.
+    /// </summary>
+    [Fact]
+    public void TabCommands_UpdatesSelectedTabIndexAndIsBrowseTabSelected()
+    {
+        var mockUserSettings = new Mock<IUserSettingsService>();
+        mockUserSettings.Setup(x => x.Get()).Returns(new UserSettings());
+
+        var vm = new UpdateNotificationViewModel(
+            Mock.Of<IVelopackUpdateManager>(),
+            Mock.Of<ILogger<UpdateNotificationViewModel>>(),
+            mockUserSettings.Object);
+
+        Assert.Equal(0, vm.SelectedTabIndex);
+        Assert.False(vm.IsBrowseTabSelected);
+
+        vm.ShowBrowseBuildsTabCommand.Execute(null);
+        Assert.Equal(1, vm.SelectedTabIndex);
+        Assert.True(vm.IsBrowseTabSelected);
+
+        vm.ShowUpdateTabCommand.Execute(null);
+        Assert.Equal(0, vm.SelectedTabIndex);
+        Assert.False(vm.IsBrowseTabSelected);
+
+        vm.SelectTabCommand.Execute("1");
+        Assert.Equal(1, vm.SelectedTabIndex);
+        Assert.True(vm.IsBrowseTabSelected);
+
+        vm.SelectTabCommand.Execute(0);
+        Assert.Equal(0, vm.SelectedTabIndex);
+        Assert.False(vm.IsBrowseTabSelected);
+
+        // Clamping out-of-range inputs
+        vm.SelectTabCommand.Execute(-1);
+        Assert.Equal(0, vm.SelectedTabIndex);
+
+        vm.SelectTabCommand.Execute(5);
+        Assert.Equal(1, vm.SelectedTabIndex);
+
+        vm.SelectTabCommand.Execute("99");
+        Assert.Equal(1, vm.SelectedTabIndex);
+    }
+
+    /// <summary>
+    /// Verifies that DisplayCurrentVersion and InstalledVersionDisplay return a valid non-empty version string.
+    /// </summary>
+    [Fact]
+    public void DisplayCurrentVersion_ReturnsNonEmptyVersion()
+    {
+        var displayVersion = UpdateNotificationViewModel.DisplayCurrentVersion;
+        Assert.False(string.IsNullOrWhiteSpace(displayVersion));
+        Assert.StartsWith("v", displayVersion);
+
+        var mockUserSettings = new Mock<IUserSettingsService>();
+        mockUserSettings.Setup(x => x.Get()).Returns(new UserSettings());
+
+        var vm = new UpdateNotificationViewModel(
+            Mock.Of<IVelopackUpdateManager>(),
+            Mock.Of<ILogger<UpdateNotificationViewModel>>(),
+            mockUserSettings.Object);
+
+        Assert.Equal(displayVersion, vm.InstalledVersionDisplay);
+    }
+
+    /// <summary>
+    /// Verifies that setting SelectedVersion to a newer artifact updates StatusMessage and sets IsUpdateAvailable to true.
+    /// </summary>
+    [Fact]
+    public void SelectedVersion_WhenNewer_UpdatesStatusMessageAndIsUpdateAvailable()
+    {
+        var mockUserSettings = new Mock<IUserSettingsService>();
+        mockUserSettings.Setup(x => x.Get()).Returns(new UserSettings());
+
+        var vm = new UpdateNotificationViewModel(
+            Mock.Of<IVelopackUpdateManager>(),
+            Mock.Of<ILogger<UpdateNotificationViewModel>>(),
+            mockUserSettings.Object);
+
+        var newerArtifact = new ArtifactUpdateInfo("0.0.99999-pr389", "abcdef1", 389, 9999, "https://github.com/test/run/9999", 501, "genhub-linux", DateTime.UtcNow, "https://github.com/test/art/1", 1024);
+        vm.SelectedVersion = newerArtifact;
+
+        Assert.True(vm.IsUpdateAvailable);
+        Assert.Equal("0.0.99999-pr389", vm.LatestVersion);
+        Assert.Contains("0.0.99999-pr389", vm.StatusMessage);
+    }
+
+    /// <summary>
+    /// Verifies that selecting an artifact matching dismissed version clears IsUpdateAvailable, LatestVersion, and ReleaseNotesUrl.
+    /// </summary>
+    [Fact]
+    public void SelectedVersion_WhenDismissed_ClearsUpdateAvailableState()
+    {
+        var mockUserSettings = new Mock<IUserSettingsService>();
+        mockUserSettings.Setup(x => x.Get()).Returns(new UserSettings { DismissedUpdateVersion = "0.0.99999-pr389" });
+
+        var vm = new UpdateNotificationViewModel(
+            Mock.Of<IVelopackUpdateManager>(),
+            Mock.Of<ILogger<UpdateNotificationViewModel>>(),
+            mockUserSettings.Object)
+        {
+            IsUpdateAvailable = true,
+            LatestVersion = "0.0.88888",
+            ReleaseNotesUrl = "https://example.com/notes",
+        };
+
+        var dismissedArtifact = new ArtifactUpdateInfo("0.0.99999-pr389", "abcdef1", 389, 9999, "https://github.com/test/run/9999", 501, "genhub-linux", DateTime.UtcNow, "https://github.com/test/art/1", 1024);
+        vm.SelectedVersion = dismissedArtifact;
+
+        Assert.False(vm.IsUpdateAvailable);
+        Assert.Empty(vm.LatestVersion);
+        Assert.Empty(vm.ReleaseNotesUrl);
+        Assert.Contains("dismissed", vm.StatusMessage, StringComparison.OrdinalIgnoreCase);
+    }
+
+    /// <summary>
+    /// Verifies that Unsubscribe resets subscription fields, clears update available state, and updates status message.
+    /// </summary>
+    [Fact]
+    public void Unsubscribe_ClearsArtifactUpdateStateAndSwitchesToMain()
+    {
+        var mockUserSettings = new Mock<IUserSettingsService>();
+        mockUserSettings.Setup(x => x.Get()).Returns(new UserSettings { SubscribedPrNumber = 389 });
+
+        var mockVelopack = new Mock<IVelopackUpdateManager>();
+        mockVelopack.SetupProperty(x => x.SubscribedPrNumber, 389);
+        mockVelopack.SetupProperty(x => x.SubscribedBranch, null);
+
+        var vm = new UpdateNotificationViewModel(
+            mockVelopack.Object,
+            Mock.Of<ILogger<UpdateNotificationViewModel>>(),
+            mockUserSettings.Object)
+        {
+            SubscribedPr = new PullRequestInfo
+            {
+                Number = 389,
+                Title = "Test PR",
+                BranchName = "feature/test",
+                Author = "testuser",
+                State = "open",
+            },
+            SelectedVersion = new ArtifactUpdateInfo("0.0.99999-pr389", "abcdef1", 389, 9999, "https://github.com/test/run/9999", 501, "genhub-linux", DateTime.UtcNow, "https://github.com/test/art/1", 1024),
+            IsUpdateAvailable = true,
+            LatestVersion = "0.0.99999-pr389",
+            ReleaseNotesUrl = "https://example.com/notes",
+        };
+
+        vm.UnsubscribeCommand.Execute(null);
+
+        Assert.Null(vm.SubscribedPr);
+        Assert.Null(vm.SubscribedBranch);
+        Assert.Null(vm.SelectedVersion);
+        Assert.False(vm.IsUpdateAvailable);
+        Assert.Empty(vm.LatestVersion);
+        Assert.Empty(vm.ReleaseNotesUrl);
+        Assert.False(string.IsNullOrEmpty(vm.StatusMessage));
+        Assert.Null(mockVelopack.Object.SubscribedPrNumber);
+    }
 }
\ No newline at end of file
diff --git a/GenHub/GenHub.Tests/GenHub.Tests.Core/Features/Content/ContentOrchestratorTests.cs b/GenHub/GenHub.Tests/GenHub.Tests.Core/Features/Content/ContentOrchestratorTests.cs
index 5422334ce..33d4f7d2a 100644
--- a/GenHub/GenHub.Tests/GenHub.Tests.Core/Features/Content/ContentOrchestratorTests.cs
+++ b/GenHub/GenHub.Tests/GenHub.Tests.Core/Features/Content/ContentOrchestratorTests.cs
@@ -475,4 +475,62 @@ public async Task AcquireContentAsync_WhenInstallationDetectionCancels_Propagate
         await Assert.ThrowsAnyAsync<OperationCanceledException>(
             () => orchestrator.AcquireContentAsync(searchResult, progress: null, cts.Token));
     }
+
+    /// <summary>
+    /// Verifies that SearchAsync deduplicates results by manifest ID, preferring specialized providers.
+    /// </summary>
+    /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
+    [Fact]
+    public async Task SearchAsync_DeduplicatesResultsById_PrefersSpecializedProviderOverGitHubAsync()
+    {
+        // Arrange
+        var specializedProviderMock = new Mock<IContentProvider>();
+        var githubProviderMock = new Mock<IContentProvider>();
+
+        const string duplicateId = "1.0.thesuperhackers.patch.generalsgamepatch2";
+
+        var specializedResult = new ContentSearchResult
+        {
+            Id = duplicateId,
+            Name = "TheSuperHackers Patch 2",
+            ProviderName = "thesuperhackers",
+        };
+
+        var githubResult = new ContentSearchResult
+        {
+            Id = duplicateId,
+            Name = "GeneralsGamePatch2",
+            ProviderName = "GitHub",
+        };
+
+        specializedProviderMock.Setup(p => p.IsEnabled).Returns(true);
+        specializedProviderMock.Setup(p => p.SearchAsync(It.IsAny<ContentSearchQuery>(), It.IsAny<CancellationToken>()))
+            .ReturnsAsync(OperationResult<IEnumerable<ContentSearchResult>>.CreateSuccess([specializedResult]));
+
+        githubProviderMock.Setup(p => p.IsEnabled).Returns(true);
+        githubProviderMock.Setup(p => p.SearchAsync(It.IsAny<ContentSearchQuery>(), It.IsAny<CancellationToken>()))
+            .ReturnsAsync(OperationResult<IEnumerable<ContentSearchResult>>.CreateSuccess([githubResult]));
+
+        var orchestrator = new ContentOrchestrator(
+            _loggerMock.Object,
+            [githubProviderMock.Object, specializedProviderMock.Object],
+            [],
+            [],
+            _cacheMock.Object,
+            _contentValidatorMock.Object,
+            _manifestPoolMock.Object,
+            _installationServiceMock.Object,
+            _installationCasPoolServiceMock.Object);
+
+        // Act
+        var result = await orchestrator.SearchAsync(new ContentSearchQuery());
+
+        // Assert
+        Assert.True(result.Success);
+        var items = result.Data?.ToList();
+        Assert.NotNull(items);
+        Assert.Single(items);
+        Assert.Equal("thesuperhackers", items[0].ProviderName);
+        Assert.Equal("TheSuperHackers Patch 2", items[0].Name);
+    }
 }
diff --git a/GenHub/GenHub.Tests/GenHub.Tests.Core/Features/Content/ModDB/ModDBCategoryMapperTests.cs b/GenHub/GenHub.Tests/GenHub.Tests.Core/Features/Content/ModDB/ModDBCategoryMapperTests.cs
new file mode 100644
index 000000000..73e18587f
--- /dev/null
+++ b/GenHub/GenHub.Tests/GenHub.Tests.Core/Features/Content/ModDB/ModDBCategoryMapperTests.cs
@@ -0,0 +1,63 @@
+using GenHub.Core.Models.Enums;
+using GenHub.Core.Models.ModDB;
+using Xunit;
+using ContentType = GenHub.Core.Models.Enums.ContentType;
+
+namespace GenHub.Tests.Core.Features.Content.ModDB;
+
+/// <summary>
+/// Unit tests for <see cref="ModDBCategoryMapper"/>.
+/// </summary>
+public class ModDBCategoryMapperTests
+{
+    /// <summary>
+    /// Verifies that MapCategory maps ModDB category codes correctly, especially mapping patches and scripts to Mod.
+    /// </summary>
+    /// <param name="categoryCode">The category code to map.</param>
+    /// <param name="expected">The expected content type.</param>
+    [Theory]
+    [InlineData("2", ContentType.Mod)]
+    [InlineData("3", ContentType.Mod)]
+    [InlineData("4", ContentType.Mod)]
+    [InlineData("28", ContentType.Mod)]
+    [InlineData("29", ContentType.Addon)]
+    [InlineData("7", ContentType.Video)]
+    [InlineData("8", ContentType.Video)]
+    [InlineData("101", ContentType.Map)]
+    [InlineData("102", ContentType.Map)]
+    [InlineData("112", ContentType.Addon)]
+    [InlineData("125", ContentType.Addon)]
+    [InlineData("126", ContentType.Addon)]
+    [InlineData("20", ContentType.ModdingTool)]
+    [InlineData("30", ContentType.LanguagePack)]
+    public void MapCategory_MapsCategoryCodesCorrectly(string categoryCode, ContentType expected)
+    {
+        var result = ModDBCategoryMapper.MapCategory(categoryCode);
+        Assert.Equal(expected, result);
+    }
+
+    /// <summary>
+    /// Verifies that MapCategoryByName maps category names correctly, mapping patch and script names to Mod.
+    /// </summary>
+    /// <param name="categoryName">The category name to map.</param>
+    /// <param name="expected">The expected content type.</param>
+    [Theory]
+    [InlineData("Full Version", ContentType.Mod)]
+    [InlineData("Demo", ContentType.Mod)]
+    [InlineData("Patch", ContentType.Mod)]
+    [InlineData("v1.01 Patch", ContentType.Mod)]
+    [InlineData("Script", ContentType.Mod)]
+    [InlineData("Multiplayer Map", ContentType.Map)]
+    [InlineData("Singleplayer Map", ContentType.Map)]
+    [InlineData("Player Skin", ContentType.Addon)]
+    [InlineData("GUI", ContentType.Addon)]
+    [InlineData("HUD", ContentType.Addon)]
+    [InlineData("Mapping Tool", ContentType.ModdingTool)]
+    [InlineData("Language Pack", ContentType.LanguagePack)]
+    [InlineData("Trailer", ContentType.Video)]
+    public void MapCategoryByName_MapsNamesCorrectly(string categoryName, ContentType expected)
+    {
+        var result = ModDBCategoryMapper.MapCategoryByName(categoryName);
+        Assert.Equal(expected, result);
+    }
+}
diff --git a/GenHub/GenHub.Tests/GenHub.Tests.Core/Features/Content/Parsers/ModDBPageParserTests.cs b/GenHub/GenHub.Tests/GenHub.Tests.Core/Features/Content/Parsers/ModDBPageParserTests.cs
new file mode 100644
index 000000000..a630b8b5c
--- /dev/null
+++ b/GenHub/GenHub.Tests/GenHub.Tests.Core/Features/Content/Parsers/ModDBPageParserTests.cs
@@ -0,0 +1,1691 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using AngleSharp;
+using AngleSharp.Dom;
+using GenHub.Core.Constants;
+using GenHub.Core.Interfaces.Tools;
+using GenHub.Core.Models.Parsers;
+using GenHub.Features.Content.Services.Parsers;
+using Microsoft.Extensions.Logging;
+using Moq;
+using Xunit;
+
+namespace GenHub.Tests.Core.Features.Content.Parsers;
+
+/// <summary>
+/// Regression tests for the current ModDB detail markup and Cloudflare-aware section loading.
+/// </summary>
+public sealed class ModDBPageParserTests
+{
+    /// <summary>
+    /// Verifies the current game-addon detail page maps its metadata and /addons/start route into
+    /// a usable file rather than returning an empty download URL.
+    /// </summary>
+    /// <returns>A task that represents the asynchronous test.</returns>
+    [Fact]
+    public async Task ParseAsync_CurrentAddonDetailMarkup_ExtractsArchiveNameAndAddonStartUrlAsync()
+    {
+        // Arrange
+        var playwright = CreatePlaywrightMock();
+        var pageUrl = "https://www.moddb.com/games/cc-generals-zero-hour/addons/lemuria-2026-fixes";
+        var doc = await CreateDocumentAsync("""
+            <html><body>
+              <div id="downloadsinfo">
+                <div class="row clear"><h5>Filename</h5><span class="summary">Lemuria_2026_Fixes.rar</span></div>
+                <div class="row clear"><h5>Category</h5><a>Singleplayer Map</a></div>
+                <div class="row clear"><h5>Uploader</h5><a>BagaturKhan</a></div>
+                <div class="row clear"><h5>Added</h5><time>Jan 2nd, 2026</time></div>
+                <div class="row clear"><h5>Size</h5><span class="summary">1.07mb (1,125,450 bytes)</span></div>
+                <div class="row clear"><a class="button buttonlarge" href="/addons/start/302328">Download Now</a></div>
+              </div>
+            </body></html>
+            """);
+        playwright
+            .Setup(service => service.FetchAndParsePersistentManyAsync(
+                ModDBConstants.BrowserProfileName,
+                It.IsAny<IReadOnlyList<string>>(),
+                It.IsAny<CancellationToken>()))
+            .ReturnsAsync(new Dictionary<string, IDocument>(StringComparer.OrdinalIgnoreCase) { [pageUrl] = doc });
+        var parser = new ModDBPageParser(playwright.Object, new Mock<ILogger<ModDBPageParser>>().Object);
+
+        // Act
+        var parsed = await parser.ParseAsync(pageUrl);
+
+        // Assert
+        var file = Assert.Single(parsed.Sections.OfType<DownloadableFile>());
+        Assert.Equal("Lemuria_2026_Fixes.rar", file.Name);
+        Assert.Equal("https://www.moddb.com/addons/start/302328", file.DownloadUrl);
+        Assert.Equal("Singleplayer Map", file.Category);
+        Assert.Equal(1_125_450, file.SizeBytes);
+    }
+
+    /// <summary>
+    /// Game-scoped FileDetail URLs (from the ModDB downloads listing) have no parent /mods/ page
+    /// to sweep, so the detail view must still populate Community from comments on the file page
+    /// itself instead of leaving only a single Releases row.
+    /// </summary>
+    /// <returns>A task that represents the asynchronous test.</returns>
+    [Fact]
+    public async Task ParseAsync_GameFileDetail_ExtractsOnPageCommentsWithoutParentSweepAsync()
+    {
+        // Arrange
+        const string pageUrl = "https://www.moddb.com/games/cc-generals-zero-hour/downloads/genbigeditbig-editor";
+        var playwright = CreatePlaywrightMock();
+        var doc = await CreateDocumentAsync("""
+            <html><body>
+              <div id="downloadsinfo">
+                <div class="row clear"><h5>Filename</h5><span class="summary">GenBigEdit.zip</span></div>
+                <div class="row clear"><h5>Size</h5><span class="summary">174.33mb (182,801,143 bytes)</span></div>
+                <div class="row clear"><a class="button buttonlarge" href="/downloads/start/310120">Download Now</a></div>
+              </div>
+              <div id="commentsbrowse">
+                <div class="row rowcomment" id="comment501">
+                  <div class="heading"><a href="/members/mah_boi">mah_boi</a> <span class="subheading">May 30 2026</span></div>
+                  <div class="commentbody">Please, provide us the source code of this program.</div>
+                </div>
+              </div>
+            </body></html>
+            """);
+        playwright
+            .Setup(service => service.FetchAndParsePersistentManyAsync(
+                ModDBConstants.BrowserProfileName,
+                It.IsAny<IReadOnlyList<string>>(),
+                It.IsAny<CancellationToken>()))
+            .ReturnsAsync(new Dictionary<string, IDocument>(StringComparer.OrdinalIgnoreCase) { [pageUrl] = doc });
+        var parser = new ModDBPageParser(playwright.Object, new Mock<ILogger<ModDBPageParser>>().Object);
+
+        // Act
+        var parsed = await parser.ParseAsync(pageUrl);
+
+        // Assert
+        Assert.Equal(PageType.FileDetail, parsed.PageType);
+        var file = Assert.Single(parsed.Sections.OfType<DownloadableFile>());
+        Assert.Equal("GenBigEdit.zip", file.Name);
+        Assert.Equal("https://www.moddb.com/downloads/start/310120", file.DownloadUrl);
+
+        var comment = Assert.Single(parsed.Sections.OfType<Comment>());
+        Assert.Equal("mah_boi", comment.Author);
+        Assert.Equal("Please, provide us the source code of this program.", comment.Content);
+
+        // Must not attempt a parent-mod section sweep for /games/... FileDetail URLs (fetches only the single URL).
+        playwright.Verify(
+            service => service.FetchAndParsePersistentManyAsync(
+                ModDBConstants.BrowserProfileName,
+                It.Is<IReadOnlyList<string>>(urls => urls.Count == 1 && urls[0] == pageUrl),
+                It.IsAny<CancellationToken>()),
+            Times.Once);
+    }
+
+    /// <summary>
+    /// Verifies an addons-list row retains its ModDB category so a map does not become a generic
+    /// add-on later in the resolver and manifest pipeline.
+    /// </summary>
+    /// <returns>A task that represents the asynchronous test.</returns>
+    [Fact]
+    public async Task ParseAsync_AddonsListRow_ExtractsSingleplayerMapCategoryAsync()
+    {
+        // Arrange
+        const string pageUrl = "https://www.moddb.com/games/cc-generals-zero-hour/addons";
+        var playwright = CreatePlaywrightMock();
+        var doc = await CreateDocumentAsync("""
+            <html><body>
+              <div class="row rowcontent">
+                <h4>Lemuria 2026</h4>
+                <span class="category">Singleplayer Map</span>
+                <span class="size">1.07 MB</span>
+                <a href="/addons/start/302328">Download</a>
+              </div>
+            </body></html>
+            """);
+        playwright
+            .Setup(service => service.FetchAndParsePersistentManyAsync(
+                ModDBConstants.BrowserProfileName,
+                It.IsAny<IReadOnlyList<string>>(),
+                It.IsAny<CancellationToken>()))
+            .ReturnsAsync(new Dictionary<string, IDocument>(StringComparer.OrdinalIgnoreCase) { [pageUrl] = doc });
+        var parser = new ModDBPageParser(playwright.Object, new Mock<ILogger<ModDBPageParser>>().Object);
+
+        // Act
+        var parsed = await parser.ParseAsync(pageUrl);
+
+        // Assert
+        var file = Assert.Single(parsed.Sections.OfType<DownloadableFile>());
+        Assert.Equal("Singleplayer Map", file.Category);
+        Assert.Equal(FileSectionType.Addons, file.FileSectionType);
+        Assert.Equal("https://www.moddb.com/addons/start/302328", file.DownloadUrl);
+    }
+
+    /// <summary>
+    /// Verifies that rich ModDB sections use the verified persistent Chromium profile instead of
+    /// a separate headless browser that loses Cloudflare clearance.
+    /// </summary>
+    /// <returns>A task that represents the asynchronous test.</returns>
+    [Fact]
+    public async Task ParseAsync_ModDetail_UsesPersistentProfileForDownloadsAndAddonsAsync()
+    {
+        // Arrange
+        const string pageUrl = "https://www.moddb.com/mods/example-mod";
+        var documents = new Dictionary<string, IDocument>(StringComparer.OrdinalIgnoreCase)
+        {
+            [pageUrl] = await CreateDocumentAsync("<html><body><h1>Example Mod</h1></body></html>"),
+            [pageUrl + "/downloads"] = await CreateDocumentAsync("""
+                <div class="row file"><h4>Example Release</h4><span class="size">4 MB</span><a href="/downloads/start/100">Download</a></div>
+                """),
+            [pageUrl + "/addons"] = await CreateDocumentAsync("""
+                <div class="row file"><h4>Example Addon</h4><span class="size">2 MB</span><a href="/addons/start/200">Download</a></div>
+                """),
+            [pageUrl + "/videos"] = await CreateDocumentAsync("<html><body></body></html>"),
+            [pageUrl + "/images"] = await CreateDocumentAsync("<html><body></body></html>"),
+            [pageUrl + "/reviews"] = await CreateDocumentAsync("<html><body></body></html>"),
+            [pageUrl + "/articles"] = await CreateDocumentAsync("<html><body></body></html>"),
+        };
+        var playwright = CreatePlaywrightMock();
+        playwright
+            .Setup(service => service.FetchAndParsePersistentManyAsync(
+                ModDBConstants.BrowserProfileName,
+                It.IsAny<IReadOnlyList<string>>(),
+                It.IsAny<CancellationToken>()))
+            .Returns((string _, IReadOnlyList<string> urls, CancellationToken _) =>
+            {
+                var result = new Dictionary<string, IDocument>(StringComparer.OrdinalIgnoreCase);
+                foreach (var url in urls)
+                {
+                    if (documents.TryGetValue(url, out var d))
+                    {
+                        result[url] = d;
+                    }
+                }
+
+                return Task.FromResult<IReadOnlyDictionary<string, IDocument>>(result);
+            });
+        var parser = new ModDBPageParser(playwright.Object, new Mock<ILogger<ModDBPageParser>>().Object);
+
+        // Act
+        var parsed = await parser.ParseAsync(pageUrl);
+
+        // Assert
+        var files = parsed.Sections.OfType<DownloadableFile>().ToList();
+        Assert.Contains(files, file => file.Name == "Example Release" && file.DownloadUrl == "https://www.moddb.com/downloads/start/100");
+        Assert.Contains(files, file => file.Name == "Example Addon" && file.DownloadUrl == "https://www.moddb.com/addons/start/200");
+        playwright.Verify(
+            service => service.FetchAndParsePersistentManyAsync(
+                ModDBConstants.BrowserProfileName,
+                It.Is<IReadOnlyList<string>>(urls =>
+                    urls.Contains(pageUrl) && urls.Contains(pageUrl + "/downloads") && urls.Contains(pageUrl + "/addons")),
+                It.IsAny<CancellationToken>()),
+            Times.Once);
+        playwright.Verify(service => service.FetchAndParseAsync(It.IsAny<string>(), It.IsAny<CancellationToken>()), Times.Never);
+    }
+
+    /// <summary>
+    /// Verifies the file-only acquisition path resolves a FileDetail download without fetching the
+    /// parent mod's downloads/addons/videos/images/reviews/articles sections (the seven-page sweep
+    /// that previously fired on every card download).
+    /// </summary>
+    /// <returns>A task that represents the asynchronous test.</returns>
+    [Fact]
+    public async Task ParseFileDetailAsync_FetchesOnlyFileDetailPageAndSkipsSectionSweepAsync()
+    {
+        // Arrange: the FileDetail page already carries a real (non-guest) icon, so the parent-mod
+        // icon fallback fetch is skipped too — exactly one fetch total.
+        const string pageUrl = "https://www.moddb.com/mods/genspeed/downloads/genspeed-v25";
+        var playwright = CreatePlaywrightMock();
+        playwright
+            .Setup(service => service.FetchAndParsePersistentAsync(
+                ModDBConstants.BrowserProfileName,
+                pageUrl,
+                It.IsAny<CancellationToken>()))
+            .ReturnsAsync(await CreateDocumentAsync("""
+                <html><body>
+                  <h1><a>GenSpeed v2.5</a></h1>
+                  <div class="sidecolumn"><div class="profilebox"><img class="icon" src="https://static.moddb.com/mods/genspeed/icon.png" /></div></div>
+                  <div id="downloadsinfo">
+                    <div class="row clear"><h5>Filename</h5><span class="summary">GenSpeed-v2.5.zip</span></div>
+                    <div class="row clear"><h5>Size</h5><span class="summary">65.04mb (68,197,650 bytes)</span></div>
+                    <div class="row clear"><a href="/downloads/start/311183">Download Now</a></div>
+                  </div>
+                </body></html>
+                """));
+        var parser = new ModDBPageParser(playwright.Object, new Mock<ILogger<ModDBPageParser>>().Object);
+
+        // Act
+        var parsed = await parser.ParseFileDetailAsync(pageUrl);
+
+        // Assert: exactly one DownloadableFile, no section sweep, icon from the FileDetail page.
+        var file = Assert.Single(parsed.Sections.OfType<DownloadableFile>());
+        Assert.Equal("GenSpeed v2.5", file.Name);
+        Assert.Equal("GenSpeed-v2.5.zip", file.Filename);
+        Assert.Equal("https://www.moddb.com/downloads/start/311183", file.DownloadUrl);
+        Assert.Equal(68_197_650, file.SizeBytes);
+        Assert.Equal("https://static.moddb.com/mods/genspeed/icon.png", parsed.Context.IconUrl);
+
+        playwright.Verify(
+            service => service.FetchAndParsePersistentAsync(
+                ModDBConstants.BrowserProfileName,
+                It.Is<string>(url => url != pageUrl),
+                It.IsAny<CancellationToken>()),
+            Times.Never);
+    }
+
+    /// <summary>
+    /// Verifies that ParseFileDetailAsync performs only a single page fetch for file details without
+    /// secondary parent mod fetches or section sweeps.
+    /// </summary>
+    /// <returns>A task that represents the asynchronous test.</returns>
+    [Fact]
+    public async Task ParseFileDetailAsync_WithGuestIcon_FetchesOnlyFileDetailPageAsync()
+    {
+        // Arrange
+        const string pageUrl = "https://www.moddb.com/mods/genspeed/downloads/genspeed-v25";
+        var fetchedUrls = new List<string>();
+        var playwright = CreatePlaywrightMock();
+        playwright
+            .Setup(service => service.FetchAndParsePersistentAsync(
+                ModDBConstants.BrowserProfileName,
+                It.IsAny<string>(),
+                It.IsAny<CancellationToken>()))
+            .Returns((string _, string url, CancellationToken _) =>
+            {
+                fetchedUrls.Add(url);
+                return Task.FromResult(CreateDocumentAsync("""
+                    <html><body>
+                      <h1><a>GenSpeed v2.5</a></h1>
+                      <div class="sidecolumn"><img class="icon" src="https://static.moddb.com/html/cutoff/images/guest/guest4.png" /></div>
+                      <div id="downloadsinfo">
+                        <div class="row clear"><h5>Filename</h5><span class="summary">GenSpeed-v2.5.zip</span></div>
+                        <div class="row clear"><a href="/downloads/start/311183">Download Now</a></div>
+                      </div>
+                    </body></html>
+                    """).GetAwaiter().GetResult());
+            });
+        var parser = new ModDBPageParser(playwright.Object, new Mock<ILogger<ModDBPageParser>>().Object);
+
+        // Act
+        var parsed = await parser.ParseFileDetailAsync(pageUrl);
+
+        // Assert: exactly one fetch (FileDetail), never parent mod or section pages.
+        Assert.Equal(new[] { pageUrl }, fetchedUrls);
+        Assert.Contains(parsed.Sections.OfType<DownloadableFile>(), f => f.Filename == "GenSpeed-v2.5.zip");
+    }
+
+    /// <summary>
+    /// Verifies that comment parsing creates nested reply threads with correct author attribution
+    /// and cleans out ModDB action text like 'Reply Good karma Bad karma+1 vote'.
+    /// </summary>
+    /// <returns>A task representing the asynchronous test.</returns>
+    [Fact]
+    public async Task ParseAsync_NestedComments_ParsesThreadHierarchyAndCleansActionTextAsync()
+    {
+        // Arrange
+        const string pageUrl = "https://www.moddb.com/mods/example-mod/comments";
+        var playwright = CreatePlaywrightMock();
+        var doc = await CreateDocumentAsync("""
+            <html><body>
+              <div id="commentsbrowse">
+                <div class="row rowcomment" id="comment101">
+                  <div class="heading"><a href="/members/scorpionwins">Scorpionwins</a> <span class="subheading">Jul 31 2026</span></div>
+                  <div class="commentbody">
+                    How to activate additional weapons?
+                    <div class="actions">Reply Good karma Bad karma+1 vote</div>
+                  </div>
+                  <div class="children">
+                    <div class="row rowcomment" id="comment102">
+                      <div class="heading"><a href="/members/bagaturkhan">BagaturKhan</a> <span class="subheading">Jul 31 2026</span></div>
+                      <div class="commentbody">
+                        If you are talking about stolen tech, train your infiltrator.
+                        <div class="actions">Reply Good karma Bad karma+1 vote</div>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </body></html>
+            """);
+        playwright
+            .Setup(service => service.FetchAndParsePersistentManyAsync(
+                ModDBConstants.BrowserProfileName,
+                It.IsAny<IReadOnlyList<string>>(),
+                It.IsAny<CancellationToken>()))
+            .ReturnsAsync(new Dictionary<string, IDocument>(StringComparer.OrdinalIgnoreCase) { [pageUrl] = doc });
+        var parser = new ModDBPageParser(playwright.Object, new Mock<ILogger<ModDBPageParser>>().Object);
+
+        // Act
+        var parsed = await parser.ParseAsync(pageUrl);
+
+        // Assert
+        var topLevelComments = parsed.Sections.OfType<Comment>().ToList();
+        var parentComment = Assert.Single(topLevelComments);
+        Assert.Equal("Scorpionwins", parentComment.Author);
+        Assert.Equal("How to activate additional weapons?", parentComment.Content);
+        Assert.Equal(0, parentComment.IndentLevel);
+
+        var reply = Assert.Single(parentComment.Replies!);
+        Assert.Equal("BagaturKhan", reply.Author);
+        Assert.Equal("If you are talking about stolen tech, train your infiltrator.", reply.Content);
+        Assert.Equal(1, reply.IndentLevel);
+    }
+
+    /// <summary>
+    /// Verifies reply markup nested inside <c>.commentbody</c> does not inflate the parent content
+    /// into a huge whitespace block (the layout bug seen in the Community tab).
+    /// </summary>
+    /// <returns>A task representing the asynchronous test.</returns>
+    [Fact]
+    public async Task ParseAsync_NestedCommentsInsideCommentBody_DoesNotPolluteParentContentAsync()
+    {
+        // Arrange
+        const string pageUrl = "https://www.moddb.com/mods/example-mod/comments";
+        var playwright = CreatePlaywrightMock();
+        var doc = await CreateDocumentAsync("""
+            <html><body>
+              <div id="commentsbrowse">
+                <div class="row rowcomment" id="comment201">
+                  <div class="heading"><a href="/members/scorpionwins">Scorpionwins</a> <span class="subheading">Jul 31 2026</span></div>
+                  <div class="commentbody">
+
+
+                    How to activate additional weapons?
+                    <div class="actions">Reply Good karma Bad karma+1 vote</div>
+                    <div class="children">
+                      <div class="row rowcomment" id="comment202">
+                        <div class="heading"><a href="/members/bagaturkhan">BagaturKhan</a> <span class="subheading">Jul 31 2026</span></div>
+                        <div class="commentbody">
+                          Train your infiltrator.
+                          <div class="actions">Reply</div>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </body></html>
+            """);
+        playwright
+            .Setup(service => service.FetchAndParsePersistentManyAsync(
+                ModDBConstants.BrowserProfileName,
+                It.IsAny<IReadOnlyList<string>>(),
+                It.IsAny<CancellationToken>()))
+            .ReturnsAsync(new Dictionary<string, IDocument>(StringComparer.OrdinalIgnoreCase) { [pageUrl] = doc });
+        var parser = new ModDBPageParser(playwright.Object, new Mock<ILogger<ModDBPageParser>>().Object);
+
+        // Act
+        var parsed = await parser.ParseAsync(pageUrl);
+
+        // Assert
+        var parentComment = Assert.Single(parsed.Sections.OfType<Comment>());
+        Assert.Equal("How to activate additional weapons?", parentComment.Content);
+        Assert.DoesNotContain("BagaturKhan", parentComment.Content);
+        Assert.DoesNotContain("infiltrator", parentComment.Content, StringComparison.OrdinalIgnoreCase);
+
+        var reply = Assert.Single(parentComment.Replies!);
+        Assert.Equal("BagaturKhan", reply.Author);
+        Assert.Equal("Train your infiltrator.", reply.Content);
+    }
+
+    /// <summary>
+    /// Verifies rating widgets without author/body are not surfaced as empty Community review cards.
+    /// </summary>
+    /// <returns>A task representing the asynchronous test.</returns>
+    [Fact]
+    public async Task ParseAsync_BareRatingWidget_IsNotTreatedAsReviewAsync()
+    {
+        // Arrange
+        const string pageUrl = "https://www.moddb.com/mods/example-mod/reviews";
+        var playwright = CreatePlaywrightMock();
+        var doc = await CreateDocumentAsync("""
+            <html><body>
+              <div class="rating"><span class="score">9.0</span><span class="helpful">people found this helpful</span></div>
+              <div class="review">
+                <a href="/members/alice">Alice</a>
+                <div class="content">Solid patch for ROTR.</div>
+                <span class="score">8.5</span>
+              </div>
+            </body></html>
+            """);
+        playwright
+            .Setup(service => service.FetchAndParsePersistentManyAsync(
+                ModDBConstants.BrowserProfileName,
+                It.IsAny<IReadOnlyList<string>>(),
+                It.IsAny<CancellationToken>()))
+            .ReturnsAsync(new Dictionary<string, IDocument>(StringComparer.OrdinalIgnoreCase) { [pageUrl] = doc });
+        var parser = new ModDBPageParser(playwright.Object, new Mock<ILogger<ModDBPageParser>>().Object);
+
+        // Act
+        var parsed = await parser.ParseAsync(pageUrl);
+
+        // Assert
+        var review = Assert.Single(parsed.Sections.OfType<Review>());
+        Assert.Equal("Alice", review.Author);
+        Assert.Equal("Solid patch for ROTR.", review.Content);
+    }
+
+    /// <summary>
+    /// The live ModDB composer (<c>#commentform</c> plus guest/email rows and injected CSS) must
+    /// not appear as Community comments.
+    /// </summary>
+    /// <returns>A task representing the asynchronous test.</returns>
+    [Fact]
+    public async Task ParseAsync_CommentComposer_IsNotTreatedAsCommentsAsync()
+    {
+        const string pageUrl = "https://www.moddb.com/mods/cc-generals-undone/downloads/cc-generals-undone";
+        var playwright = CreatePlaywrightMock();
+        var doc = await CreateDocumentAsync("""
+            <html><body>
+              <h1>C&amp;C Generals Undone file</h1>
+              <h2>C&amp;C Generals Undone</h2>
+              <div id="downloadsinfo">
+                <div class="row clear"><h5>Filename</h5><span class="summary">GeneralsUndone_v1.0.zip</span></div>
+                <div class="row clear"><a class="button buttonlarge" href="/downloads/start/313719">Download Now</a></div>
+              </div>
+              <div class="normalbox formbox" id="commentform">
+                <div id="commentform" class="body">
+                  <div class="row rowcommentguest clear">
+                    <p>Your comment will be anonymous unless you join the community.
+                    <style>span.ffbcbbfaadacfformouter span { display: none; }</style></p>
+                  </div>
+                  <div class="row rowcommentsummary clear" id="commentsummary"><textarea></textarea></div>
+                  <div class="row rowcommentemail clear" id="commentemail"><input /></div>
+                </div>
+              </div>
+            </body></html>
+            """);
+        playwright
+            .Setup(service => service.FetchAndParsePersistentManyAsync(
+                ModDBConstants.BrowserProfileName,
+                It.IsAny<IReadOnlyList<string>>(),
+                It.IsAny<CancellationToken>()))
+            .ReturnsAsync(new Dictionary<string, IDocument>(StringComparer.OrdinalIgnoreCase) { [pageUrl] = doc });
+        var parser = new ModDBPageParser(playwright.Object, new Mock<ILogger<ModDBPageParser>>().Object);
+
+        var parsed = await parser.ParseAsync(pageUrl);
+
+        Assert.Empty(parsed.Sections.OfType<Comment>());
+    }
+
+    /// <summary>
+    /// File-page chrome (game icon, developer avatar, download title art) must not appear in Media.
+    /// </summary>
+    /// <returns>A task representing the asynchronous test.</returns>
+    [Fact]
+    public async Task ParseAsync_FileDetailChromeImages_AreNotGalleryMediaAsync()
+    {
+        const string pageUrl = "https://www.moddb.com/mods/cc-generals-undone/downloads/cc-generals-undone";
+        var playwright = CreatePlaywrightMock();
+        var doc = await CreateDocumentAsync("""
+            <html><body>
+              <h2>C&amp;C Generals Undone</h2>
+              <div id="downloadsinfo">
+                <div class="row clear"><h5>Filename</h5><span class="summary">GeneralsUndone_v1.0.zip</span></div>
+                <div class="row clear"><a href="/downloads/start/313719">Download Now</a></div>
+              </div>
+              <a class="thickbox" href="https://media.moddb.com/images/downloads/1/314/313719/Title.png">
+                <img alt="C&amp;C Generals Undone" src="https://media.moddb.com/cache/images/downloads/1/314/313719/thumb_620x2000/Title.png" />
+              </a>
+              <div id="modsinfo">
+                <a href="https://www.moddb.com/games/cc-generals-zero-hour">
+                  <img alt="C&amp;C: Generals Zero Hour" src="https://media.moddb.com/images/games/1/1/184/icon.gif" />
+                </a>
+                <a href="https://www.moddb.com/mods/cc-generals-undone">
+                  <img alt="C&amp;C Generals Undone" src="https://media.moddb.com/cache/images/mods/1/73/72174/crop_120x90/Screenshot.png" />
+                </a>
+                <a href="https://www.moddb.com/company/whiteskull9044">
+                  <img alt="WhiteSkull#9044" src="https://media.moddb.com/cache/images/groups/1/49/48231/crop_120x90/Screenshot.png" />
+                </a>
+              </div>
+            </body></html>
+            """);
+        playwright
+            .Setup(service => service.FetchAndParsePersistentManyAsync(
+                ModDBConstants.BrowserProfileName,
+                It.IsAny<IReadOnlyList<string>>(),
+                It.IsAny<CancellationToken>()))
+            .ReturnsAsync(new Dictionary<string, IDocument>(StringComparer.OrdinalIgnoreCase) { [pageUrl] = doc });
+        var parser = new ModDBPageParser(playwright.Object, new Mock<ILogger<ModDBPageParser>>().Object);
+
+        var parsed = await parser.ParseAsync(pageUrl);
+
+        Assert.Empty(parsed.Sections.OfType<Image>());
+    }
+
+    /// <summary>
+    /// The images tab should yield unique gallery shots, not share icons or duplicate featured thumbs.
+    /// </summary>
+    /// <returns>A task representing the asynchronous test.</returns>
+    [Fact]
+    public async Task ParseAsync_ImagesPage_ExtractsUniqueGalleryShotsAsync()
+    {
+        const string pageUrl = "https://www.moddb.com/mods/cc-generals-undone/images";
+        var playwright = CreatePlaywrightMock();
+        var doc = await CreateDocumentAsync("""
+            <html><body>
+              <div id="imagebox">
+                <a href="/mods/cc-generals-undone/images/icbm-powtruck#imagebox">
+                  <img alt="View media" src="https://media.moddb.com/cache/images/mods/1/73/72174/crop_120x90/ICBM_POWTruck.png" />
+                </a>
+                <a href="/mods/cc-generals-undone/images/spectre#imagebox">
+                  <img alt="View media" src="https://media.moddb.com/cache/images/mods/1/73/72174/crop_120x90/Spectre.png" />
+                </a>
+                <div class="media"><div class="holder">
+                  <img alt="ICBM POWTruck" src="https://media.moddb.com/cache/images/mods/1/73/72174/thumb_620x2000/ICBM_POWTruck.png" />
+                </div></div>
+                <a href="https://www.facebook.com/share"><img alt="Share on Facebook" src="data:image/png;base64,aaaa" /></a>
+              </div>
+            </body></html>
+            """);
+        playwright
+            .Setup(service => service.FetchAndParsePersistentManyAsync(
+                ModDBConstants.BrowserProfileName,
+                It.IsAny<IReadOnlyList<string>>(),
+                It.IsAny<CancellationToken>()))
+            .ReturnsAsync(new Dictionary<string, IDocument>(StringComparer.OrdinalIgnoreCase) { [pageUrl] = doc });
+        var parser = new ModDBPageParser(playwright.Object, new Mock<ILogger<ModDBPageParser>>().Object);
+
+        var parsed = await parser.ParseAsync(pageUrl);
+
+        var images = parsed.Sections.OfType<Image>().ToList();
+        Assert.Equal(2, images.Count);
+        Assert.Contains(images, image => image.Title.Contains("ICBM", StringComparison.OrdinalIgnoreCase));
+        Assert.Contains(images, image => image.Title.Contains("Spectre", StringComparison.OrdinalIgnoreCase));
+        Assert.DoesNotContain(images, image => image.Title.Contains("Share", StringComparison.OrdinalIgnoreCase));
+        Assert.DoesNotContain(images, image => image.ThumbnailUrl?.StartsWith("data:", StringComparison.OrdinalIgnoreCase) == true);
+        Assert.All(images, image => Assert.DoesNotContain("crop_", image.ThumbnailUrl ?? string.Empty));
+        Assert.All(images, image => Assert.DoesNotContain("/cache/", image.ThumbnailUrl ?? string.Empty));
+    }
+
+    /// <summary>
+    /// Image titles with CamelCase or raw filenames should be formatted with clean spaces.
+    /// </summary>
+    /// <returns>A task representing the asynchronous test.</returns>
+    [Fact]
+    public async Task ParseAsync_ImageTitles_FormatsCamelCaseAndFilenamesAsync()
+    {
+        const string pageUrl = "https://www.moddb.com/mods/test-mod/images";
+        var playwright = CreatePlaywrightMock();
+        var doc = await CreateDocumentAsync("""
+            <html><body>
+              <div id="imagebox">
+                <a href="/mods/test-mod/images/shot1">
+                  <img alt="LifeOfBRRRRTTT" src="https://media.moddb.com/cache/images/mods/1/73/72174/crop_120x90/LifeOfBRRRRTTT.png" />
+                </a>
+                <a href="/mods/test-mod/images/shot2">
+                  <img alt="BASSBASSBASSASS" src="https://media.moddb.com/cache/images/mods/1/73/72174/crop_120x90/BASSBASSBASSASS.png" />
+                </a>
+              </div>
+            </body></html>
+            """);
+        playwright
+            .Setup(service => service.FetchAndParsePersistentManyAsync(
+                ModDBConstants.BrowserProfileName,
+                It.IsAny<IReadOnlyList<string>>(),
+                It.IsAny<CancellationToken>()))
+            .ReturnsAsync(new Dictionary<string, IDocument>(StringComparer.OrdinalIgnoreCase) { [pageUrl] = doc });
+        var parser = new ModDBPageParser(playwright.Object, new Mock<ILogger<ModDBPageParser>>().Object);
+
+        var parsed = await parser.ParseAsync(pageUrl);
+
+        var images = parsed.Sections.OfType<Image>().ToList();
+        Assert.Equal(2, images.Count);
+        Assert.Equal("Life Of BRRRRTTT", images[0].Title);
+        Assert.Equal("BASSBASSBASSASS", images[1].Title);
+        Assert.Equal("https://media.moddb.com/images/mods/1/73/72174/LifeOfBRRRRTTT.png", images[0].ThumbnailUrl);
+        Assert.Equal("https://media.moddb.com/images/mods/1/73/72174/LifeOfBRRRRTTT.png", images[0].FullSizeUrl);
+    }
+
+    /// <summary>
+    /// FileDetail filename plus the parent downloads listing of the same start URL must collapse
+    /// to one release, keeping the human listing name.
+    /// </summary>
+    /// <returns>A task representing the asynchronous test.</returns>
+    [Fact]
+    public async Task ParseAsync_FileDetailAndParentDownloads_DedupesSameBinaryAsync()
+    {
+        const string pageUrl = "https://www.moddb.com/mods/cc-generals-undone/downloads/cc-generals-undone";
+        const string parentUrl = "https://www.moddb.com/mods/cc-generals-undone";
+        var documents = new Dictionary<string, IDocument>(StringComparer.OrdinalIgnoreCase)
+        {
+            [pageUrl] = await CreateDocumentAsync("""
+                <html><body>
+                  <h1>C&amp;C Generals Undone file</h1>
+                  <h2>C&amp;C Generals Undone</h2>
+                  <a href="/members/register">register</a>
+                  <div id="modsinfo"><a href="/company/whiteskull9044">WhiteSkull#9044</a></div>
+                  <span class="summary">Games : C&amp;C: Generals Zero Hour : Mods : C&amp;C Generals Undone : Files</span>
+                  <p id="downloadsummary">This is the first version of Undone, and I know it's still very much in development.</p>
+                  <div id="downloadsinfo">
+                    <div class="row clear"><h5>Filename</h5><span class="summary">GeneralsUndone_v1.0.zip</span></div>
+                    <div class="row clear"><a href="/downloads/start/313719">Download Now</a></div>
+                  </div>
+                </body></html>
+                """),
+            [parentUrl] = await CreateDocumentAsync("<html><body><h2>C&amp;C Generals Undone</h2></body></html>"),
+            [parentUrl + "/downloads"] = await CreateDocumentAsync("""
+                <div class="row rowcontent">
+                  <h4>C&amp;C Generals Undone</h4>
+                  <span class="size">289.6 MB</span>
+                  <a href="/mods/cc-generals-undone/downloads/cc-generals-undone" class="button download">Download</a>
+                </div>
+                <div class="row rowcontent">
+                  <h4>Generals Undone v1.01 Patch</h4>
+                  <span class="size">1 MB</span>
+                  <a href="/downloads/start/314093">Download</a>
+                </div>
+                """),
+            [parentUrl + "/addons"] = await CreateDocumentAsync("<html><body></body></html>"),
+            [parentUrl + "/videos"] = await CreateDocumentAsync("<html><body></body></html>"),
+            [parentUrl + "/images"] = await CreateDocumentAsync("<html><body></body></html>"),
+            [parentUrl + "/reviews"] = await CreateDocumentAsync("<html><body></body></html>"),
+            [parentUrl + "/articles"] = await CreateDocumentAsync("<html><body></body></html>"),
+        };
+        var playwright = CreatePlaywrightMock();
+        playwright
+            .Setup(service => service.FetchAndParsePersistentManyAsync(
+                ModDBConstants.BrowserProfileName,
+                It.IsAny<IReadOnlyList<string>>(),
+                It.IsAny<CancellationToken>()))
+            .Returns((string _, IReadOnlyList<string> urls, CancellationToken _) =>
+            {
+                var result = new Dictionary<string, IDocument>(StringComparer.OrdinalIgnoreCase);
+                foreach (var url in urls)
+                {
+                    if (documents.TryGetValue(url, out var doc))
+                    {
+                        result[url] = doc;
+                    }
+                }
+
+                return Task.FromResult<IReadOnlyDictionary<string, IDocument>>(result);
+            });
+        var parser = new ModDBPageParser(playwright.Object, new Mock<ILogger<ModDBPageParser>>().Object);
+
+        var parsed = await parser.ParseAsync(pageUrl);
+
+        var files = parsed.Sections.OfType<DownloadableFile>().ToList();
+        Assert.Equal(2, files.Count);
+        Assert.Contains(files, file => file.Name == "C&C Generals Undone" && file.DownloadUrl == "https://www.moddb.com/downloads/start/313719");
+        Assert.Contains(files, file => file.Name == "Generals Undone v1.01 Patch");
+        Assert.DoesNotContain(files, file => file.Name == "GeneralsUndone_v1.0.zip");
+        Assert.Equal("C&C Generals Undone", parsed.Context.Title);
+        Assert.Equal("WhiteSkull#9044", parsed.Context.Developer);
+        Assert.Contains("first version of Undone", parsed.Context.Description, StringComparison.OrdinalIgnoreCase);
+        Assert.DoesNotContain("Games :", parsed.Context.Description, StringComparison.Ordinal);
+    }
+
+    /// <summary>
+    /// Verifies that ParseFileDetailAsync correctly parses metadata when ModDB uses alternative label names
+    /// such as "File Name", "File Size", "Uploaded By", "MD5 Checksum", and "Total Downloads".
+    /// </summary>
+    /// <returns>A task that represents the asynchronous test.</returns>
+    [Fact]
+    public async Task ParseFileDetailAsync_WithAlternativeLabels_ParsesMd5ChecksumTotalDownloadsAndUploaderAsync()
+    {
+        const string pageUrl = "https://www.moddb.com/mods/cc-generals-undone/downloads/generals-undone-v101-patch";
+        var playwright = CreatePlaywrightMock();
+        playwright
+            .Setup(service => service.FetchAndParsePersistentAsync(
+                ModDBConstants.BrowserProfileName,
+                pageUrl,
+                It.IsAny<CancellationToken>()))
+            .ReturnsAsync(await CreateDocumentAsync("""
+                <html><body>
+                  <div id="downloadsinfo">
+                    <div class="row clear"><h5>File Name</h5><span class="summary">GeneralsUndone_v1.01.csf</span></div>
+                    <div class="row clear"><h5>Category</h5><span class="summary">Patch</span></div>
+                    <div class="row clear"><h5>Uploaded By</h5><span class="summary">WhiteSkull#9044</span></div>
+                    <div class="row clear"><h5>File Size</h5><span class="summary">289.6mb (303,663,235 bytes)</span></div>
+                    <div class="row clear"><h5>MD5 Checksum</h5><span class="summary">6e5b1fd58fc7a58cf21af86933116942</span></div>
+                    <div class="row clear"><h5>Total Downloads</h5><span class="summary">185</span></div>
+                    <div class="row clear"><a class="button buttonlarge" href="/downloads/start/313720">Download Now</a></div>
+                  </div>
+                </body></html>
+                """));
+        var parser = new ModDBPageParser(playwright.Object, new Mock<ILogger<ModDBPageParser>>().Object);
+
+        var parsed = await parser.ParseFileDetailAsync(pageUrl);
+
+        var file = Assert.Single(parsed.Sections.OfType<DownloadableFile>());
+        Assert.Equal("GeneralsUndone_v1.01.csf", file.Filename);
+        Assert.Equal("Patch", file.Category);
+        Assert.Equal("WhiteSkull#9044", file.Uploader);
+        Assert.Equal(303_663_235, file.SizeBytes);
+        Assert.Equal("6e5b1fd58fc7a58cf21af86933116942", file.Md5Hash);
+        Assert.Equal(185, file.DownloadCount);
+        Assert.Equal("https://www.moddb.com/downloads/start/313720", file.DownloadUrl);
+    }
+
+    /// <summary>
+    /// Verifies that ModDB download listing rows with subheading metadata (size in subheading, button class)
+    /// extract size, category, uploader, details URL, and download URL correctly.
+    /// </summary>
+    /// <returns>A task that represents the asynchronous test.</returns>
+    [Fact]
+    public async Task ParseAsync_ModernModDBDownloadsListing_ExtractsSubheadingSizeAndLinksAsync()
+    {
+        const string pageUrl = "https://www.moddb.com/mods/cc-generals-undone/downloads/cc-generals-undone";
+        const string parentUrl = "https://www.moddb.com/mods/cc-generals-undone";
+        var documents = new Dictionary<string, IDocument>(StringComparer.OrdinalIgnoreCase)
+        {
+            [pageUrl] = await CreateDocumentAsync("""
+                <html><body>
+                  <h1>C&amp;C Generals Undone file</h1>
+                  <h2>C&amp;C Generals Undone</h2>
+                  <div id="modsinfo"><a href="/company/whiteskull9044">WhiteSkull#9044</a></div>
+                  <p id="downloadsummary">First release of Undone.</p>
+                  <div id="downloadsinfo">
+                    <div class="row clear"><h5>Filename</h5><span class="summary">GeneralsUndone_v1.0.zip</span></div>
+                    <div class="row clear"><h5>Category</h5><span class="summary">Full Version</span></div>
+                    <div class="row clear"><h5>Size</h5><span class="summary">289.6mb (303,663,235 bytes)</span></div>
+                    <div class="row clear"><h5>MD5 Hash</h5><span class="summary">6e5b3fcf30fc7a58ef21af869551bb942</span></div>
+                    <div class="row clear"><a class="button buttonlarge" href="/downloads/start/313719">Download Now</a></div>
+                  </div>
+                </body></html>
+                """),
+            [parentUrl] = await CreateDocumentAsync("<html><body><h2>C&amp;C Generals Undone</h2></body></html>"),
+            [parentUrl + "/downloads"] = await CreateDocumentAsync("""
+                <div class="row rowcontent clear">
+                  <div class="heading">
+                    <h4><a href="/mods/cc-generals-undone/downloads/cc-generals-undone">C&amp;C Generals Undone</a></h4>
+                    <span class="subheading"><time datetime="2026-08-02T12:00:00+00:00">Aug 2nd, 2026</time> - Full Version, 289.6mb</span>
+                  </div>
+                  <div class="actions">
+                    <a href="/mods/cc-generals-undone/downloads/cc-generals-undone" class="button">Download</a>
+                  </div>
+                </div>
+                <div class="row rowcontent clear">
+                  <div class="heading">
+                    <h4><a href="/mods/cc-generals-undone/downloads/generals-undone-v101-patch">Generals Undone v1.01 Patch</a></h4>
+                    <span class="subheading"><time datetime="2026-08-07T12:00:00+00:00">Aug 7th, 2026</time> - Patch, 1 MB</span>
+                  </div>
+                  <div class="actions">
+                    <a href="/mods/cc-generals-undone/downloads/generals-undone-v101-patch" class="button">Download</a>
+                  </div>
+                </div>
+                """),
+            [parentUrl + "/addons"] = await CreateDocumentAsync("<html><body></body></html>"),
+            [parentUrl + "/videos"] = await CreateDocumentAsync("<html><body></body></html>"),
+            [parentUrl + "/images"] = await CreateDocumentAsync("<html><body></body></html>"),
+            [parentUrl + "/reviews"] = await CreateDocumentAsync("<html><body></body></html>"),
+            [parentUrl + "/articles"] = await CreateDocumentAsync("<html><body></body></html>"),
+        };
+        var playwright = CreatePlaywrightMock();
+        playwright
+            .Setup(service => service.FetchAndParsePersistentManyAsync(
+                ModDBConstants.BrowserProfileName,
+                It.IsAny<IReadOnlyList<string>>(),
+                It.IsAny<CancellationToken>()))
+            .Returns((string _, IReadOnlyList<string> urls, CancellationToken _) =>
+            {
+                var result = new Dictionary<string, IDocument>(StringComparer.OrdinalIgnoreCase);
+                foreach (var url in urls)
+                {
+                    if (documents.TryGetValue(url, out var doc))
+                    {
+                        result[url] = doc;
+                    }
+                }
+
+                return Task.FromResult<IReadOnlyDictionary<string, IDocument>>(result);
+            });
+        var parser = new ModDBPageParser(playwright.Object, new Mock<ILogger<ModDBPageParser>>().Object);
+
+        var parsed = await parser.ParseAsync(pageUrl);
+
+        var files = parsed.Sections.OfType<DownloadableFile>().ToList();
+        Assert.Equal(2, files.Count);
+
+        var mainRelease = Assert.Single(files, f => f.Name == "C&C Generals Undone");
+        Assert.Equal("GeneralsUndone_v1.0.zip", mainRelease.Filename);
+        Assert.Equal("https://www.moddb.com/downloads/start/313719", mainRelease.DownloadUrl);
+        Assert.Equal("https://www.moddb.com/mods/cc-generals-undone/downloads/cc-generals-undone", mainRelease.DetailsUrl);
+        Assert.Equal("Full Version", mainRelease.Category);
+        Assert.Equal(303_663_235, mainRelease.SizeBytes);
+        Assert.Equal("6e5b3fcf30fc7a58ef21af869551bb942", mainRelease.Md5Hash);
+
+        var patchRelease = Assert.Single(files, f => f.Name == "Generals Undone v1.01 Patch");
+        Assert.Equal("https://www.moddb.com/mods/cc-generals-undone/downloads/generals-undone-v101-patch", patchRelease.DetailsUrl);
+        Assert.Equal("Patch", patchRelease.Category);
+        Assert.Equal(1048576, patchRelease.SizeBytes);
+        Assert.Equal("1 MB", patchRelease.SizeDisplay);
+    }
+
+    /// <summary>
+    /// Verifies that embedded YouTube iframes on mod pages have their title, thumbnail, platform,
+    /// and normalized embed URL properly extracted.
+    /// </summary>
+    /// <returns>A task that represents the asynchronous test.</returns>
+    [Fact]
+    public async Task ParseAsync_WithYouTubeIframe_ExtractsTitlePlatformThumbnailAndEmbedUrlAsync()
+    {
+        // Arrange
+        const string pageUrl = "https://www.moddb.com/mods/korean-war-2";
+        var doc = await CreateDocumentAsync("""
+            <html><body>
+              <div class="headerbox"><h1>Korean War 2</h1></div>
+              <div class="video-container">
+                <iframe src="https://www.youtube.com/embed/fW_O3G_Z4qg" title="Korean War 2 Official Trailer" frameborder="0" allowfullscreen></iframe>
+              </div>
+              <div class="row">
+                <h3>Gameplay Teaser</h3>
+                <iframe src="https://www.youtube-nocookie.com/embed/dQw4w9WgXcQ?rel=0"></iframe>
+              </div>
+            </body></html>
+            """);
+        var playwright = CreatePlaywrightMock();
+        playwright
+            .Setup(service => service.FetchAndParsePersistentManyAsync(
+                ModDBConstants.BrowserProfileName,
+                It.IsAny<IReadOnlyList<string>>(),
+                It.IsAny<CancellationToken>()))
+            .ReturnsAsync(new Dictionary<string, IDocument>(StringComparer.OrdinalIgnoreCase) { [pageUrl] = doc });
+
+        var parser = new ModDBPageParser(playwright.Object, new Mock<ILogger<ModDBPageParser>>().Object);
+
+        // Act
+        var parsed = await parser.ParseAsync(pageUrl);
+
+        // Assert
+        var videos = parsed.Sections.OfType<Video>().ToList();
+        Assert.Equal(2, videos.Count);
+
+        var trailer = Assert.Single(videos, v => v.Title == "Korean War 2 Official Trailer");
+        Assert.Equal("YouTube", trailer.Platform);
+        Assert.Equal("https://img.youtube.com/vi/fW_O3G_Z4qg/hqdefault.jpg", trailer.ThumbnailUrl);
+        Assert.Equal("https://www.youtube.com/embed/fW_O3G_Z4qg", trailer.EmbedUrl);
+
+        var teaser = Assert.Single(videos, v => v.Title == "Gameplay Teaser");
+        Assert.Equal("YouTube", teaser.Platform);
+        Assert.Equal("https://img.youtube.com/vi/dQw4w9WgXcQ/hqdefault.jpg", teaser.ThumbnailUrl);
+        Assert.Equal("https://www.youtube.com/embed/dQw4w9WgXcQ", teaser.EmbedUrl);
+    }
+
+    /// <summary>
+    /// Verifies that ModDB /videos gallery cards are extracted from the videos section with titles,
+    /// thumbnails, platforms, and page links.
+    /// </summary>
+    /// <returns>A task that represents the asynchronous test.</returns>
+    [Fact]
+    public async Task ParseAsync_WithVideosSectionListing_ExtractsGalleryVideosAsync()
+    {
+        // Arrange
+        const string pageUrl = "https://www.moddb.com/mods/korean-war-2/downloads/korean-war-2-v020";
+        const string parentUrl = "https://www.moddb.com/mods/korean-war-2";
+        var documents = new Dictionary<string, IDocument>(StringComparer.OrdinalIgnoreCase)
+        {
+            [pageUrl] = await CreateDocumentAsync("""
+                <html><body>
+                  <div id="downloadsinfo">
+                    <div class="row clear"><h5>Filename</h5><span class="summary">KoreanWar2V020.zip</span></div>
+                    <div class="row clear"><h5>Size</h5><span class="summary">360mb</span></div>
+                    <div class="row clear"><a class="button buttonlarge" href="/downloads/start/309442">Download Now</a></div>
+                  </div>
+                </body></html>
+                """),
+            [parentUrl] = await CreateDocumentAsync("""
+                <html><body>
+                  <h1>Korean War 2</h1>
+                  <div class="sidecolumn"><div class="avatar"><img src="https://media.moddb.com/images/members/1/1/icon.jpg" /></div></div>
+                </body></html>
+                """),
+            [parentUrl + "/videos"] = await CreateDocumentAsync("""
+                <html><body>
+                  <div id="mediabrowse" class="table">
+                    <div class="row mediarow rowcontent">
+                      <div class="holder">
+                        <a href="/mods/korean-war-2/videos/iran-safir-mrl-ingame" title="Iran Safir MRL Ingame">
+                          <img src="https://media.moddb.com/cache/images/videos/1/12/11543/crop_120x90/preview.png" alt="Iran Safir MRL Ingame" />
+                          <span class="playbutton"></span>
+                        </a>
+                        <span class="title"><a href="/mods/korean-war-2/videos/iran-safir-mrl-ingame">Iran Safir MRL Ingame</a></span>
+                      </div>
+                    </div>
+                    <div class="row mediarow rowcontent">
+                      <div class="holder">
+                        <a href="/mods/korean-war-2/videos/iran-tabas-air-defense" title="Iran Tabas Air Defense System">
+                          <img src="https://media.moddb.com/cache/images/videos/1/12/11544/crop_120x90/preview2.png" alt="Iran Tabas Air Defense System" />
+                        </a>
+                        <span class="title"><a href="/mods/korean-war-2/videos/iran-tabas-air-defense">Iran Tabas Air Defense System</a></span>
+                      </div>
+                    </div>
+                  </div>
+                </body></html>
+                """),
+        };
+
+        var playwright = CreatePlaywrightMock();
+        playwright
+            .Setup(service => service.FetchAndParsePersistentManyAsync(
+                ModDBConstants.BrowserProfileName,
+                It.IsAny<IReadOnlyList<string>>(),
+                It.IsAny<CancellationToken>()))
+            .Returns((string _, IReadOnlyList<string> urls, CancellationToken _) =>
+            {
+                var result = new Dictionary<string, IDocument>(StringComparer.OrdinalIgnoreCase);
+                foreach (var url in urls)
+                {
+                    if (documents.TryGetValue(url, out var doc))
+                    {
+                        result[url] = doc;
+                    }
+                }
+
+                return Task.FromResult<IReadOnlyDictionary<string, IDocument>>(result);
+            });
+
+        var parser = new ModDBPageParser(playwright.Object, new Mock<ILogger<ModDBPageParser>>().Object);
+
+        // Act
+        var parsed = await parser.ParseAsync(pageUrl);
+
+        // Assert
+        var videos = parsed.Sections.OfType<Video>().ToList();
+        Assert.Equal(2, videos.Count);
+
+        var video1 = Assert.Single(videos, v => v.Title == "Iran Safir MRL Ingame");
+        Assert.Equal("ModDB", video1.Platform);
+        Assert.Equal("https://www.moddb.com/mods/korean-war-2/videos/iran-safir-mrl-ingame", video1.EmbedUrl);
+        Assert.Equal("https://media.moddb.com/cache/images/videos/1/12/11543/crop_120x90/preview.png", video1.ThumbnailUrl);
+
+        var video2 = Assert.Single(videos, v => v.Title == "Iran Tabas Air Defense System");
+        Assert.Equal("ModDB", video2.Platform);
+        Assert.Equal("https://www.moddb.com/mods/korean-war-2/videos/iran-tabas-air-defense", video2.EmbedUrl);
+        Assert.Equal("https://media.moddb.com/cache/images/videos/1/12/11544/crop_120x90/preview2.png", video2.ThumbnailUrl);
+    }
+
+    /// <summary>
+    /// Verifies that video cards linking to /videos/ are not duplicated into the static image gallery.
+    /// </summary>
+    /// <returns>A task that represents the asynchronous test.</returns>
+    [Fact]
+    public async Task ParseAsync_WithMediaBrowseContainingImagesAndVideos_SeparatesImagesAndVideosAsync()
+    {
+        // Arrange
+        const string pageUrl = "https://www.moddb.com/mods/test-mod";
+        var doc = await CreateDocumentAsync("""
+            <html><body>
+              <h1>Test Mod</h1>
+              <div id="mediabrowse">
+                <div class="row mediarow">
+                  <div class="holder">
+                    <a href="/mods/test-mod/images/screenshot-1" title="Ingame Base Screenshot">
+                      <img src="https://media.moddb.com/images/mods/1/1/base.png" alt="Ingame Base Screenshot" />
+                    </a>
+                  </div>
+                  <div class="holder">
+                    <a href="/mods/test-mod/videos/trailer-1" title="Ingame Trailer Video">
+                      <img src="https://media.moddb.com/cache/images/videos/1/1/trailer.png" alt="Ingame Trailer Video" />
+                    </a>
+                  </div>
+                </div>
+              </div>
+            </body></html>
+            """);
+        var playwright = CreatePlaywrightMock();
+        playwright
+            .Setup(service => service.FetchAndParsePersistentManyAsync(
+                ModDBConstants.BrowserProfileName,
+                It.IsAny<IReadOnlyList<string>>(),
+                It.IsAny<CancellationToken>()))
+            .ReturnsAsync(new Dictionary<string, IDocument>(StringComparer.OrdinalIgnoreCase) { [pageUrl] = doc });
+
+        var parser = new ModDBPageParser(playwright.Object, new Mock<ILogger<ModDBPageParser>>().Object);
+
+        // Act
+        var parsed = await parser.ParseAsync(pageUrl);
+
+        // Assert
+        var images = parsed.Sections.OfType<Image>().ToList();
+        var videos = parsed.Sections.OfType<Video>().ToList();
+
+        var image = Assert.Single(images);
+        Assert.Equal("Ingame Base Screenshot", image.Title);
+
+        var video = Assert.Single(videos);
+        Assert.Equal("Ingame Trailer Video", video.Title);
+        Assert.Equal("https://www.moddb.com/mods/test-mod/videos/trailer-1", video.EmbedUrl);
+        Assert.Equal("https://media.moddb.com/cache/images/videos/1/1/trailer.png", video.ThumbnailUrl);
+    }
+
+    /// <summary>
+    /// Verifies that non-video iframes (like download widgets) and recommendation boxes
+    /// ("You may also like...") are not parsed into the Videos collection.
+    /// </summary>
+    /// <returns>A task that represents the asynchronous test.</returns>
+    [Fact]
+    public async Task ParseAsync_WithDownloadWidgetAndRecommendations_IgnoresNonVideoWidgetsAndRecommendationsAsync()
+    {
+        // Arrange
+        const string pageUrl = "https://www.moddb.com/mods/zhe/downloads/patch-1";
+        const string parentUrl = "https://www.moddb.com/mods/zhe";
+        var documents = new Dictionary<string, IDocument>(StringComparer.OrdinalIgnoreCase)
+        {
+            [pageUrl] = await CreateDocumentAsync("""
+                <html><body>
+                  <div id="downloadsinfo">
+                    <div class="row clear"><h5>Filename</h5><span class="summary">ZHE_Patch.zip</span></div>
+                    <div class="row clear"><h5>Size</h5><span class="summary">500kb</span></div>
+                    <div class="row clear"><a class="button buttonlarge" href="/downloads/start/313875">Download Now</a></div>
+                  </div>
+                  <div class="video-container">
+                    <iframe src="https://www.moddb.com/mods/zhe/downloads/zhe-installer/widget" width="468" height="60"></iframe>
+                  </div>
+                  <div id="mediaimage">
+                    <img src="https://media.moddb.com/cache/images/downloads/1/314/313875/crop_120x90/Final.jpg" alt="Final Preview" />
+                  </div>
+                </body></html>
+                """),
+            [parentUrl] = await CreateDocumentAsync("""
+                <html><body>
+                  <h1>ZHE</h1>
+                  <div class="sidecolumn">
+                    <div class="avatar"><img src="https://static.moddb.com/html/cutoff/images/default/error_50x50.png" /></div>
+                  </div>
+                </body></html>
+                """),
+            [parentUrl + "/videos"] = await CreateDocumentAsync("""
+                <html><body>
+                  <div id="mediabrowse">
+                    <div class="holder">
+                      <a href="/mods/zhe/videos/real-trailer" title="Real Mod Trailer">
+                        <img src="https://media.moddb.com/cache/images/videos/1/1/trailer.jpg" alt="Real Mod Trailer" />
+                      </a>
+                      <span class="title"><a href="/mods/zhe/videos/real-trailer">Real Mod Trailer</a></span>
+                    </div>
+                  </div>
+                  <div id="recommendations">
+                    <h3>You may also like...</h3>
+                    <div class="holder">
+                      <a href="/mods/other-mod/videos/other-trailer" title="You may also like...">
+                        <img src="https://media.moddb.com/cache/images/videos/2/2/other.jpg" alt="You may also like..." />
+                      </a>
+                    </div>
+                  </div>
+                </body></html>
+                """),
+        };
+
+        var playwright = CreatePlaywrightMock();
+        playwright
+            .Setup(service => service.FetchAndParsePersistentManyAsync(
+                ModDBConstants.BrowserProfileName,
+                It.IsAny<IReadOnlyList<string>>(),
+                It.IsAny<CancellationToken>()))
+            .Returns((string _, IReadOnlyList<string> urls, CancellationToken _) =>
+            {
+                var result = new Dictionary<string, IDocument>(StringComparer.OrdinalIgnoreCase);
+                foreach (var url in urls)
+                {
+                    if (documents.TryGetValue(url, out var doc))
+                    {
+                        result[url] = doc;
+                    }
+                }
+
+                return Task.FromResult<IReadOnlyDictionary<string, IDocument>>(result);
+            });
+
+        var parser = new ModDBPageParser(playwright.Object, new Mock<ILogger<ModDBPageParser>>().Object);
+
+        // Act
+        var parsed = await parser.ParseAsync(pageUrl);
+
+        // Assert
+        var videos = parsed.Sections.OfType<Video>().ToList();
+        var images = parsed.Sections.OfType<Image>().ToList();
+
+        // Only the 1 real trailer should be extracted, NOT the download widget or recommendation box
+        var video = Assert.Single(videos);
+        Assert.Equal("Real Mod Trailer", video.Title);
+        Assert.Equal("https://www.moddb.com/mods/zhe/videos/real-trailer", video.EmbedUrl);
+        Assert.Equal("https://media.moddb.com/cache/images/videos/1/1/trailer.jpg", video.ThumbnailUrl);
+
+        // Preview image from file detail page should be extracted into Images
+        var image = Assert.Single(images);
+        Assert.Equal("Final Preview", image.Title);
+        Assert.Equal("https://media.moddb.com/images/downloads/1/314/313875/Final.jpg", image.ThumbnailUrl);
+        Assert.Equal("https://media.moddb.com/images/downloads/1/314/313875/Final.jpg", image.FullSizeUrl);
+
+        // Error placeholder icon must be ignored
+        Assert.Null(parsed.Context.IconUrl);
+    }
+
+    /// <summary>
+    /// Verifies that ParseFileDetailAsync extracts the file-specific heading rather than
+    /// the parent mod title inside the .headerbox container.
+    /// </summary>
+    /// <returns>A task that represents the asynchronous test.</returns>
+    [Fact]
+    public async Task ParseFileDetailAsync_WithHeaderBox_ExtractsSpecificFileHeadingNotParentModNameAsync()
+    {
+        const string pageUrl = "https://www.moddb.com/mods/cc-generals-undone/downloads/generalsundone-v101-patch";
+        var playwright = CreatePlaywrightMock();
+        playwright
+            .Setup(service => service.FetchAndParsePersistentAsync(
+                ModDBConstants.BrowserProfileName,
+                pageUrl,
+                It.IsAny<CancellationToken>()))
+            .ReturnsAsync(await CreateDocumentAsync("""
+                <html>
+                  <head>
+                    <title>Generals Undone v1.01 Patch file - C&amp;C Generals Undone mod for C&amp;C: Generals Zero Hour - ModDB</title>
+                  </head>
+                  <body>
+                    <div class="headerbox">
+                      <h1><a href="/mods/cc-generals-undone">C&amp;C Generals Undone</a></h1>
+                      <h2>C&amp;C: Generals Zero Hour mod | Released Aug 1, 2026</h2>
+                    </div>
+                    <div class="midcolumn">
+                      <div class="heading">
+                        <h2>Generals Undone v1.01 Patch</h2>
+                      </div>
+                      <div id="downloadsinfo">
+                        <div class="row clear"><h5>Filename</h5><span class="summary">GeneralsUndone_v1.01_Patch.1.zip</span></div>
+                        <div class="row clear"><h5>Category</h5><span class="summary">Patch</span></div>
+                        <div class="row clear"><h5>Uploader</h5><span class="summary">WhiteSkull#9044</span></div>
+                        <div class="row clear"><h5>Size</h5><span class="summary">188.3kb (192,819 bytes)</span></div>
+                        <div class="row clear"><h5>MD5 Hash</h5><span class="summary">5350e475319f2eaed0ab92d445b7099a</span></div>
+                        <div class="row clear"><a class="button buttonlarge" href="/downloads/start/314093">Download Now</a></div>
+                      </div>
+                      <div id="downloaddescription">
+                        <p>This is a patched .csf file that contains the entries for the USA supply truck.</p>
+                        <p>To Install:</p>
+                        <p>1. Extract the .zip folder</p>
+                      </div>
+                      <div id="downloadsmedia">
+                        <a href="https://media.moddb.com/images/downloads/1/314/314093/preview_full.png">
+                          <img src="https://media.moddb.com/cache/images/downloads/1/314/314093/crop_120x90/preview.png" />
+                        </a>
+                      </div>
+                    </div>
+                  </body>
+                </html>
+                """));
+
+        var parser = new ModDBPageParser(playwright.Object, new Mock<ILogger<ModDBPageParser>>().Object);
+
+        var parsed = await parser.ParseFileDetailAsync(pageUrl);
+
+        var file = Assert.Single(parsed.Sections.OfType<DownloadableFile>());
+        Assert.Equal("Generals Undone v1.01 Patch", file.Name);
+        Assert.Equal("GeneralsUndone_v1.01_Patch.1.zip", file.Filename);
+        Assert.Equal("Patch", file.Category);
+        Assert.Equal("5350e475319f2eaed0ab92d445b7099a", file.Md5Hash);
+        Assert.Equal(192_819, file.SizeBytes);
+        Assert.NotNull(file.Description);
+        Assert.Contains("This is a patched .csf file", file.Description, StringComparison.Ordinal);
+        Assert.Contains("To Install:", file.Description, StringComparison.Ordinal);
+        Assert.NotNull(file.PreviewImages);
+        Assert.Contains("https://media.moddb.com/images/downloads/1/314/314093/preview_full.png", file.PreviewImages);
+    }
+
+    /// <summary>
+    /// Verifies that DeduplicateDownloadableFiles keeps distinct release files separate when they have
+    /// different details/download URLs rather than collapsing them.
+    /// </summary>
+    /// <returns>A task that represents the asynchronous test.</returns>
+    [Fact]
+    public async Task ParseAsync_WithMultipleDistinctReleases_KeepsBothReleasesSeparateAsync()
+    {
+        const string pageUrl = "https://www.moddb.com/mods/cc-generals-undone/downloads/cc-generals-undone";
+        const string parentUrl = "https://www.moddb.com/mods/cc-generals-undone";
+        var documents = new Dictionary<string, IDocument>(StringComparer.OrdinalIgnoreCase)
+        {
+            [pageUrl] = await CreateDocumentAsync("""
+                <html>
+                  <head><title>C&amp;C Generals Undone file - ModDB</title></head>
+                  <body>
+                    <div class="headerbox">
+                      <h1><a href="/mods/cc-generals-undone">C&amp;C Generals Undone</a></h1>
+                    </div>
+                    <div class="midcolumn">
+                      <h2>C&amp;C Generals Undone</h2>
+                      <div id="downloadsinfo">
+                        <div class="row clear"><h5>Filename</h5><span class="summary">GeneralsUndone_v1.0.zip</span></div>
+                        <div class="row clear"><h5>Category</h5><span class="summary">Full Version</span></div>
+                        <div class="row clear"><h5>Size</h5><span class="summary">289.6mb (303,663,235 bytes)</span></div>
+                        <div class="row clear"><a class="button buttonlarge" href="/downloads/start/313719">Download Now</a></div>
+                      </div>
+                      <div id="downloaddescription">
+                        <p>This is the first version of Undone.</p>
+                      </div>
+                    </div>
+                  </body>
+                </html>
+                """),
+            [parentUrl] = await CreateDocumentAsync("<html><body><h2>C&amp;C Generals Undone</h2></body></html>"),
+            [parentUrl + "/downloads"] = await CreateDocumentAsync("""
+                <div class="row rowcontent clear">
+                  <div class="heading">
+                    <h4><a href="/mods/cc-generals-undone/downloads/cc-generals-undone">C&amp;C Generals Undone</a></h4>
+                    <span class="subheading"><time datetime="2026-08-02T12:00:00+00:00">Aug 2nd, 2026</time> - Full Version, 289.6mb</span>
+                  </div>
+                  <div class="actions">
+                    <a href="/mods/cc-generals-undone/downloads/cc-generals-undone" class="button">Download</a>
+                  </div>
+                </div>
+                <div class="row rowcontent clear">
+                  <div class="heading">
+                    <h4><a href="/mods/cc-generals-undone/downloads/generalsundone-v101-patch">Generals Undone v1.01 Patch</a></h4>
+                    <span class="subheading"><time datetime="2026-08-07T12:00:00+00:00">Aug 7th, 2026</time> - Patch, 188.3kb</span>
+                  </div>
+                  <div class="actions">
+                    <a href="/mods/cc-generals-undone/downloads/generalsundone-v101-patch" class="button">Download</a>
+                  </div>
+                </div>
+                """),
+            [parentUrl + "/addons"] = await CreateDocumentAsync("<html><body></body></html>"),
+            [parentUrl + "/videos"] = await CreateDocumentAsync("<html><body></body></html>"),
+            [parentUrl + "/images"] = await CreateDocumentAsync("<html><body></body></html>"),
+            [parentUrl + "/reviews"] = await CreateDocumentAsync("<html><body></body></html>"),
+            [parentUrl + "/articles"] = await CreateDocumentAsync("<html><body></body></html>"),
+        };
+
+        var playwright = CreatePlaywrightMock();
+        playwright
+            .Setup(service => service.FetchAndParsePersistentManyAsync(
+                ModDBConstants.BrowserProfileName,
+                It.IsAny<IReadOnlyList<string>>(),
+                It.IsAny<CancellationToken>()))
+            .Returns((string _, IReadOnlyList<string> urls, CancellationToken _) =>
+            {
+                var result = new Dictionary<string, IDocument>(StringComparer.OrdinalIgnoreCase);
+                foreach (var url in urls)
+                {
+                    if (documents.TryGetValue(url, out var doc))
+                    {
+                        result[url] = doc;
+                    }
+                }
+
+                return Task.FromResult<IReadOnlyDictionary<string, IDocument>>(result);
+            });
+
+        var parser = new ModDBPageParser(playwright.Object, new Mock<ILogger<ModDBPageParser>>().Object);
+
+        var parsed = await parser.ParseAsync(pageUrl);
+
+        var releases = parsed.Sections.OfType<DownloadableFile>().ToList();
+        Assert.Equal(2, releases.Count);
+
+        var patch = Assert.Single(releases, r => r.DetailsUrl?.Contains("generalsundone-v101-patch", StringComparison.OrdinalIgnoreCase) == true);
+        Assert.Equal("Generals Undone v1.01 Patch", patch.Name);
+        Assert.Equal("Patch", patch.Category);
+
+        var full = Assert.Single(releases, r => r.DetailsUrl?.EndsWith("cc-generals-undone", StringComparison.OrdinalIgnoreCase) == true);
+        Assert.Equal("C&C Generals Undone", full.Name);
+        Assert.Equal("Full Version", full.Category);
+        Assert.Equal("GeneralsUndone_v1.0.zip", full.Filename);
+        Assert.Contains("This is the first version of Undone.", full.Description, StringComparison.Ordinal);
+    }
+
+    /// <summary>
+    /// Gets test data for size parsing formats.
+    /// </summary>
+    public static TheoryData<string, long> SizeTestData => new()
+    {
+        { "188.3kb (192,819 bytes)", 192819L },
+        { "188.3kb", 192819L },
+        { "9,72 MB", (long)(9.72 * 1024 * 1024) },
+        { "1.07mb (1,125,450 bytes)", 1125450L },
+        { "289.6 MB", (long)(289.6 * 1024 * 1024) },
+    };
+
+    /// <summary>
+    /// Tests that ParseFileDetail handles various size formats correctly.
+    /// </summary>
+    /// <param name="sizeString">The raw size string to test.</param>
+    /// <param name="expectedBytes">The expected parsed size in bytes.</param>
+    /// <returns>A task representing the asynchronous test.</returns>
+    [Theory]
+    [MemberData(nameof(SizeTestData))]
+    public async Task ParseFileDetail_WithVariousSizeFormats_CorrectlyParsesSizeBytesAsync(string sizeString, long expectedBytes)
+    {
+        // Arrange
+        var playwright = CreatePlaywrightMock();
+        var pageUrl = "https://www.moddb.com/mods/test-mod/downloads/test-file";
+        var doc = await CreateDocumentAsync($"""
+            <html><body>
+              <div id="downloadsinfo">
+                <div class="row clear"><h5>Filename</h5><span class="summary">test_file.zip</span></div>
+                <div class="row clear"><h5>Size</h5><span class="summary">{sizeString}</span></div>
+                <div class="row clear"><a class="button buttonlarge" href="/downloads/start/12345">Download Now</a></div>
+              </div>
+            </body></html>
+            """);
+
+        playwright
+            .Setup(service => service.FetchAndParsePersistentAsync(
+                ModDBConstants.BrowserProfileName,
+                pageUrl,
+                It.IsAny<CancellationToken>()))
+            .ReturnsAsync(doc);
+
+        var parser = new ModDBPageParser(playwright.Object, new Mock<ILogger<ModDBPageParser>>().Object);
+
+        // Act
+        var parsed = await parser.ParseFileDetailAsync(pageUrl);
+
+        // Assert
+        Assert.NotNull(parsed);
+        var file = Assert.Single(parsed.Sections.OfType<DownloadableFile>());
+        Assert.NotNull(file.SizeBytes);
+
+        // Allow within 1% tolerance for floating-point calculations where byte count was not explicit
+        if (sizeString.Contains("bytes", StringComparison.OrdinalIgnoreCase))
+        {
+            Assert.Equal(expectedBytes, file.SizeBytes.Value);
+        }
+        else
+        {
+            var diff = Math.Abs(file.SizeBytes.Value - expectedBytes);
+            Assert.True(diff < expectedBytes * 0.05, $"Parsed size {file.SizeBytes.Value} was not within tolerance of {expectedBytes}");
+        }
+    }
+
+    /// <summary>
+    /// Verifies that ParseFileDetailsManyAsync requests all URLs via FetchAndParsePersistentManyAsync
+    /// and parses each document returned into a ParsedWebPage.
+    /// </summary>
+    /// <returns>A task that represents the asynchronous test.</returns>
+    [Fact]
+    public async Task ParseFileDetailsManyAsync_MultipleUrls_CallsFetchAndParsePersistentManyAsyncAndParsesAllAsync()
+    {
+        // Arrange
+        const string url1 = "https://www.moddb.com/games/cc-generals-zero-hour/addons/addon1";
+        const string url2 = "https://www.moddb.com/games/cc-generals-zero-hour/downloads/release1";
+
+        var doc1 = await CreateDocumentAsync("""
+            <html><body>
+              <div id="downloadsinfo">
+                <div class="row clear"><h5>Filename</h5><span class="summary">addon1.zip</span></div>
+                <div class="row clear"><a class="button buttonlarge" href="/addons/start/101">Download</a></div>
+              </div>
+            </body></html>
+            """);
+
+        var doc2 = await CreateDocumentAsync("""
+            <html><body>
+              <div id="downloadsinfo">
+                <div class="row clear"><h5>Filename</h5><span class="summary">release1.zip</span></div>
+                <div class="row clear"><a class="button buttonlarge" href="/downloads/start/202">Download</a></div>
+              </div>
+            </body></html>
+            """);
+
+        var playwright = CreatePlaywrightMock();
+        playwright
+            .Setup(service => service.FetchAndParsePersistentManyAsync(
+                ModDBConstants.BrowserProfileName,
+                It.Is<IReadOnlyList<string>>(urls => urls.Contains(url1) && urls.Contains(url2)),
+                It.IsAny<CancellationToken>()))
+            .ReturnsAsync(new Dictionary<string, IDocument>(StringComparer.OrdinalIgnoreCase)
+            {
+                [url1] = doc1,
+                [url2] = doc2,
+            });
+
+        var parser = new ModDBPageParser(playwright.Object, new Mock<ILogger<ModDBPageParser>>().Object);
+
+        // Act
+        var results = await parser.ParseFileDetailsManyAsync([url1, url2]);
+
+        // Assert
+        Assert.Equal(2, results.Count);
+        Assert.True(results.TryGetValue(url1, out var page1));
+        var file1 = Assert.Single(page1!.Sections.OfType<DownloadableFile>());
+        Assert.Equal("addon1.zip", file1.Name);
+        Assert.Equal("https://www.moddb.com/addons/start/101", file1.DownloadUrl);
+
+        Assert.True(results.TryGetValue(url2, out var page2));
+        var file2 = Assert.Single(page2!.Sections.OfType<DownloadableFile>());
+        Assert.Equal("release1.zip", file2.Name);
+        Assert.Equal("https://www.moddb.com/downloads/start/202", file2.DownloadUrl);
+    }
+
+    /// <summary>
+    /// Protocol-relative media URLs (starting with //media.moddb.com) should normalize to https:// without duplicating base domain.
+    /// </summary>
+    /// <returns>A task that represents the asynchronous test.</returns>
+    [Fact]
+    public async Task ParseAsync_ProtocolRelativeMediaUrls_NormalizesToHttpsSchemeAsync()
+    {
+        // Arrange
+        const string pageUrl = "https://www.moddb.com/mods/test-mod/images";
+        var doc = await CreateDocumentAsync("""
+            <html><body>
+              <div id="imagebox">
+                <a href="/mods/test-mod/images/shot1">
+                  <img alt="Screenshot One" src="//media.moddb.com/cache/images/mods/1/73/72174/crop_120x90/ScreenshotOne.png" />
+                </a>
+              </div>
+            </body></html>
+            """);
+
+        var playwright = CreatePlaywrightMock();
+        playwright
+            .Setup(service => service.FetchAndParsePersistentManyAsync(
+                ModDBConstants.BrowserProfileName,
+                It.IsAny<IReadOnlyList<string>>(),
+                It.IsAny<CancellationToken>()))
+            .ReturnsAsync(new Dictionary<string, IDocument>(StringComparer.OrdinalIgnoreCase) { [pageUrl] = doc });
+
+        var parser = new ModDBPageParser(playwright.Object, new Mock<ILogger<ModDBPageParser>>().Object);
+
+        // Act
+        var parsed = await parser.ParseAsync(pageUrl);
+
+        // Assert
+        var image = Assert.Single(parsed.Sections.OfType<Image>());
+        Assert.Equal("Screenshot One", image.Title);
+        Assert.Equal("https://media.moddb.com/images/mods/1/73/72174/ScreenshotOne.png", image.ThumbnailUrl);
+        Assert.Equal("https://media.moddb.com/images/mods/1/73/72174/ScreenshotOne.png", image.FullSizeUrl);
+        Assert.DoesNotContain("www.moddb.com//", image.ThumbnailUrl);
+    }
+
+    /// <summary>
+    /// Pagination links, RSS feeds, and navigation controls on video pages must be excluded from extracted videos.
+    /// </summary>
+    /// <returns>A task that represents the asynchronous test.</returns>
+    [Fact]
+    public async Task ParseAsync_VideosPage_ExcludesPaginationAndRssLinksAsync()
+    {
+        // Arrange
+        const string pageUrl = "https://www.moddb.com/mods/test-mod/videos";
+        var doc = await CreateDocumentAsync("""
+            <html><body>
+              <div id="videosbrowse">
+                <div class="row mediarow">
+                  <div class="holder">
+                    <a href="/mods/test-mod/videos/gameplay-trailer" title="Gameplay Trailer">
+                      <img src="//media.moddb.com/cache/images/videos/1/1/trailer.png" alt="Gameplay Trailer" />
+                    </a>
+                  </div>
+                </div>
+                <div class="pagination">
+                  <a href="/mods/test-mod/videos/page/2#videosbrowse">Next Media</a>
+                  <a href="/mods/test-mod/videos/rss/feed">RSS</a>
+                  <a class="prev" href="/mods/test-mod/videos/page/1">Previous</a>
+                </div>
+              </div>
+            </body></html>
+            """);
+
+        var playwright = CreatePlaywrightMock();
+        playwright
+            .Setup(service => service.FetchAndParsePersistentManyAsync(
+                ModDBConstants.BrowserProfileName,
+                It.IsAny<IReadOnlyList<string>>(),
+                It.IsAny<CancellationToken>()))
+            .ReturnsAsync(new Dictionary<string, IDocument>(StringComparer.OrdinalIgnoreCase) { [pageUrl] = doc });
+
+        var parser = new ModDBPageParser(playwright.Object, new Mock<ILogger<ModDBPageParser>>().Object);
+
+        // Act
+        var parsed = await parser.ParseAsync(pageUrl);
+
+        // Assert
+        var videos = parsed.Sections.OfType<Video>().ToList();
+        var video = Assert.Single(videos);
+        Assert.Equal("Gameplay Trailer", video.Title);
+        Assert.Equal("https://media.moddb.com/cache/images/videos/1/1/trailer.png", video.ThumbnailUrl);
+        Assert.DoesNotContain(videos, v => v.Title.Contains("Next", StringComparison.OrdinalIgnoreCase));
+        Assert.DoesNotContain(videos, v => v.Title.Contains("RSS", StringComparison.OrdinalIgnoreCase));
+        Assert.DoesNotContain(videos, v => v.Title.Contains("Previous", StringComparison.OrdinalIgnoreCase));
+    }
+
+    /// <summary>
+    /// Verifies that when a mod has both releases and addons, ParseAsync enriches both top releases and top addons
+    /// in the same session without dropping releases when addons have newer timestamps.
+    /// </summary>
+    /// <returns>A task representing the asynchronous test.</returns>
+    [Fact]
+    public async Task ParseAsync_ModWithReleasesAndAddons_EnrichesBothTopReleasesAndAddonsInSingleSessionAsync()
+    {
+        // Arrange
+        const string pageUrl = "https://www.moddb.com/mods/rich-mod";
+        const string release1Url = "https://www.moddb.com/mods/rich-mod/downloads/release-1";
+        const string addon1Url = "https://www.moddb.com/mods/rich-mod/addons/addon-1";
+
+        var documents = new Dictionary<string, IDocument>(StringComparer.OrdinalIgnoreCase)
+        {
+            [pageUrl] = await CreateDocumentAsync("<html><body><h1>Rich Mod</h1></body></html>"),
+            [pageUrl + "/downloads"] = await CreateDocumentAsync("""
+                <div class="row file">
+                  <h4><a href="/mods/rich-mod/downloads/release-1">Release 1</a></h4>
+                  <span class="size">500 MB</span>
+                  <time datetime="2024-01-01">Jan 1 2024</time>
+                  <a href="/downloads/start/1001">Download</a>
+                </div>
+                """),
+            [pageUrl + "/addons"] = await CreateDocumentAsync("""
+                <div class="row file">
+                  <h4><a href="/mods/rich-mod/addons/addon-1">Addon 1</a></h4>
+                  <span class="size">10 MB</span>
+                  <time datetime="2026-06-01">Jun 1 2026</time>
+                  <a href="/addons/start/2001">Download</a>
+                </div>
+                """),
+            [pageUrl + "/videos"] = await CreateDocumentAsync("<html><body></body></html>"),
+            [pageUrl + "/images"] = await CreateDocumentAsync("<html><body></body></html>"),
+            [pageUrl + "/reviews"] = await CreateDocumentAsync("<html><body></body></html>"),
+            [pageUrl + "/articles"] = await CreateDocumentAsync("<html><body></body></html>"),
+            [release1Url] = await CreateDocumentAsync("""
+                <html><body>
+                  <h1><a>Release 1</a></h1>
+                  <div id="downloadsinfo">
+                    <div class="row clear"><h5>Filename</h5><span class="summary">release_1.zip</span></div>
+                    <div class="row clear"><h5>MD5 Hash</h5><span class="summary">hash_release_1</span></div>
+                    <div class="row clear"><h5>Size</h5><span class="summary">500mb (524,288,000 bytes)</span></div>
+                    <div class="row clear"><a class="button" href="/downloads/start/1001">Download Now</a></div>
+                  </div>
+                  <div id="downloadsummary">Full release v1 description</div>
+                </body></html>
+                """),
+            [addon1Url] = await CreateDocumentAsync("""
+                <html><body>
+                  <h1><a>Addon 1</a></h1>
+                  <div id="downloadsinfo">
+                    <div class="row clear"><h5>Filename</h5><span class="summary">addon_1.zip</span></div>
+                    <div class="row clear"><h5>MD5 Hash</h5><span class="summary">hash_addon_1</span></div>
+                    <div class="row clear"><h5>Size</h5><span class="summary">10mb (10,485,760 bytes)</span></div>
+                    <div class="row clear"><a class="button" href="/addons/start/2001">Download Now</a></div>
+                  </div>
+                  <div id="downloadsummary">Addon 1 map pack description</div>
+                </body></html>
+                """),
+        };
+
+        var playwright = CreatePlaywrightMock();
+        playwright
+            .Setup(service => service.FetchAndParsePersistentManyAsync(
+                ModDBConstants.BrowserProfileName,
+                It.IsAny<IReadOnlyList<string>>(),
+                It.IsAny<CancellationToken>()))
+            .Returns((string _, IReadOnlyList<string> urls, CancellationToken _) =>
+            {
+                var result = new Dictionary<string, IDocument>(StringComparer.OrdinalIgnoreCase);
+                foreach (var url in urls)
+                {
+                    if (documents.TryGetValue(url, out var doc))
+                    {
+                        result[url] = doc;
+                    }
+                }
+
+                return Task.FromResult<IReadOnlyDictionary<string, IDocument>>(result);
+            });
+
+        var parser = new ModDBPageParser(playwright.Object, new Mock<ILogger<ModDBPageParser>>().Object);
+
+        // Act
+        var parsed = await parser.ParseAsync(pageUrl);
+
+        // Assert
+        var files = parsed.Sections.OfType<DownloadableFile>().ToList();
+        var release = Assert.Single(files, f => f.FileSectionType == FileSectionType.Downloads);
+        Assert.Equal("Release 1", release.Name);
+        Assert.Equal("release_1.zip", release.Filename);
+        Assert.Equal("hash_release_1", release.Md5Hash);
+        Assert.Equal("Full release v1 description", release.Description);
+
+        var addon = Assert.Single(files, f => f.FileSectionType == FileSectionType.Addons);
+        Assert.Equal("Addon 1", addon.Name);
+        Assert.Equal("addon_1.zip", addon.Filename);
+        Assert.Equal("hash_addon_1", addon.Md5Hash);
+        Assert.Equal("Addon 1 map pack description", addon.Description);
+
+        // Verify both the release and addon detail URLs were fetched during enrichment
+        playwright.Verify(
+            service => service.FetchAndParsePersistentManyAsync(
+                ModDBConstants.BrowserProfileName,
+                It.Is<IReadOnlyList<string>>(urls => urls.Contains(release1Url) && urls.Contains(addon1Url)),
+                It.IsAny<CancellationToken>()),
+            Times.Once);
+    }
+
+    /// <summary>
+    /// Verifies CanParse accepts valid ModDB HTTP(S) domains and rejects invalid or attacker origins.
+    /// </summary>
+    /// <param name="url">The URL to test.</param>
+    /// <param name="expected">The expected parseability result.</param>
+    [Theory]
+    [InlineData("https://www.moddb.com/mods/test-mod", true)]
+    [InlineData("http://moddb.com/mods/test-mod", true)]
+    [InlineData("https://media.moddb.com/downloads/test.zip", true)]
+    [InlineData("https://localhost/?source=moddb.com", false)]
+    [InlineData("https://moddb.com.attacker.example/mods/test", false)]
+    [InlineData("https://attacker-moddb.com/mods/test", false)]
+    [InlineData("not-a-valid-url", false)]
+    [InlineData("ftp://www.moddb.com/mods/test", false)]
+    public void CanParse_ValidatesSchemeAndHostCorrectly(string url, bool expected)
+    {
+        // Arrange
+        var playwright = new Mock<IPlaywrightService>();
+        var parser = new ModDBPageParser(playwright.Object, new Mock<ILogger<ModDBPageParser>>().Object);
+
+        // Act
+        var result = parser.CanParse(url);
+
+        // Assert
+        Assert.Equal(expected, result);
+    }
+
+    private static async Task<IDocument> CreateDocumentAsync(string html)
+    {
+        var browsingContext = BrowsingContext.New(Configuration.Default);
+        return await browsingContext.OpenAsync(request => request.Content(html));
+    }
+
+    private static Mock<IPlaywrightService> CreatePlaywrightMock()
+    {
+        var playwright = new Mock<IPlaywrightService>(MockBehavior.Strict);
+        playwright
+            .Setup(service => service.ExecuteInPersistentContextAsync(
+                It.IsAny<string>(),
+                It.IsAny<Func<Task<ParsedWebPage>>>(),
+                It.IsAny<CancellationToken>()))
+            .Returns((string _, Func<Task<ParsedWebPage>> op, CancellationToken _) => op());
+        return playwright;
+    }
+}
diff --git a/GenHub/GenHub.Tests/GenHub.Tests.Core/Features/Content/Services/LocalContentServiceTests.cs b/GenHub/GenHub.Tests/GenHub.Tests.Core/Features/Content/Services/LocalContentServiceTests.cs
new file mode 100644
index 000000000..d8f2d1692
--- /dev/null
+++ b/GenHub/GenHub.Tests/GenHub.Tests.Core/Features/Content/Services/LocalContentServiceTests.cs
@@ -0,0 +1,286 @@
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using GenHub.Core.Interfaces.Content;
+using GenHub.Core.Interfaces.Manifest;
+using GenHub.Core.Models.Content;
+using GenHub.Core.Models.Enums;
+using GenHub.Core.Models.Manifest;
+using GenHub.Core.Models.Results;
+using GenHub.Core.Services.Content;
+using Microsoft.Extensions.Logging.Abstractions;
+using Moq;
+using Xunit;
+using ContentType = GenHub.Core.Models.Enums.ContentType;
+
+namespace GenHub.Tests.Core.Features.Content.Services;
+
+/// <summary>
+/// Contains tests for <see cref="LocalContentService"/>.
+/// </summary>
+public class LocalContentServiceTests : IDisposable
+{
+    private readonly Mock<IManifestGenerationService> _manifestGenServiceMock;
+    private readonly Mock<IContentStorageService> _contentStorageServiceMock;
+    private readonly Mock<IContentReconciliationService> _reconciliationServiceMock;
+    private readonly LocalContentService _service;
+    private readonly string _tempDir;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="LocalContentServiceTests"/> class.
+    /// </summary>
+    public LocalContentServiceTests()
+    {
+        _manifestGenServiceMock = new Mock<IManifestGenerationService>();
+        _contentStorageServiceMock = new Mock<IContentStorageService>();
+        _reconciliationServiceMock = new Mock<IContentReconciliationService>();
+
+        _service = new LocalContentService(
+            _manifestGenServiceMock.Object,
+            _contentStorageServiceMock.Object,
+            _reconciliationServiceMock.Object,
+            NullLogger<LocalContentService>.Instance);
+
+        _tempDir = Path.Combine(Path.GetTempPath(), "LocalContentServiceTests_" + Guid.NewGuid().ToString("N"));
+        Directory.CreateDirectory(_tempDir);
+    }
+
+    /// <summary>
+    /// Cleans up temporary resources.
+    /// </summary>
+    public void Dispose()
+    {
+        try
+        {
+            if (Directory.Exists(_tempDir))
+            {
+                Directory.Delete(_tempDir, recursive: true);
+            }
+        }
+        catch
+        {
+            // Ignore cleanup failures
+        }
+
+        GC.SuppressFinalize(this);
+    }
+
+    /// <summary>
+    /// Verifies that CreateLocalContentManifestAsync sets EntryPoint when provided.
+    /// </summary>
+    /// <returns>A task representing the asynchronous test.</returns>
+    [Fact]
+    public async Task CreateLocalContentManifestAsync_WithEntryPoint_SetsManifestEntryPoint()
+    {
+        SetupManifestBuilder(ContentType.ModdingTool, GameType.ZeroHour, "FinalBIG", "FinalBIG.exe");
+
+        var result = await _service.CreateLocalContentManifestAsync(
+            directoryPath: _tempDir,
+            name: "FinalBIG",
+            contentType: ContentType.ModdingTool,
+            targetGame: GameType.ZeroHour,
+            entryPoint: "FinalBIG.exe");
+
+        Assert.True(result.Success);
+        Assert.NotNull(result.Data);
+        Assert.Equal("FinalBIG.exe", result.Data!.EntryPoint);
+    }
+
+    /// <summary>
+    /// Verifies that CreateLocalContentManifestAsync normalizes backslashes to forward slashes in EntryPoint.
+    /// </summary>
+    /// <returns>A task representing the asynchronous test.</returns>
+    [Fact]
+    public async Task CreateLocalContentManifestAsync_NormalizesBackslashesInEntryPoint()
+    {
+        SetupManifestBuilder(ContentType.Executable, GameType.ZeroHour, "Tool", "bin/sub/tool.exe");
+
+        var result = await _service.CreateLocalContentManifestAsync(
+            directoryPath: _tempDir,
+            name: "Tool",
+            contentType: ContentType.Executable,
+            targetGame: GameType.ZeroHour,
+            entryPoint: "bin\\sub\\tool.exe");
+
+        Assert.True(result.Success);
+        Assert.NotNull(result.Data);
+        Assert.Equal("bin/sub/tool.exe", result.Data!.EntryPoint);
+    }
+
+    /// <summary>
+    /// Verifies that CreateLocalContentManifestAsync leaves EntryPoint null when passed a whitespace-only value.
+    /// </summary>
+    /// <returns>A task representing the asynchronous test.</returns>
+    [Fact]
+    public async Task CreateLocalContentManifestAsync_WithWhitespaceOnlyEntryPoint_LeavesEntryPointNull()
+    {
+        SetupManifestBuilder(ContentType.ModdingTool, GameType.ZeroHour, "FinalBIG", "FinalBIG.exe");
+
+        var result = await _service.CreateLocalContentManifestAsync(
+            directoryPath: _tempDir,
+            name: "FinalBIG",
+            contentType: ContentType.ModdingTool,
+            targetGame: GameType.ZeroHour,
+            entryPoint: "   ");
+
+        Assert.True(result.Success);
+        Assert.NotNull(result.Data);
+        Assert.Null(result.Data!.EntryPoint);
+    }
+
+    /// <summary>
+    /// Verifies that CreateLocalContentManifestAsync rejects rooted or parent-traversal entry points.
+    /// </summary>
+    /// <param name="invalidEntryPoint">The invalid entry point path to test.</param>
+    /// <returns>A task representing the asynchronous test.</returns>
+    [Theory]
+    [InlineData("/usr/bin/tool.exe")]
+    [InlineData("../tool.exe")]
+    [InlineData("bin/../../tool.exe")]
+    public async Task CreateLocalContentManifestAsync_WithInvalidEntryPointPath_ReturnsFailure(string invalidEntryPoint)
+    {
+        SetupManifestBuilder(ContentType.Executable, GameType.ZeroHour, "Tool", "tool.exe");
+
+        var result = await _service.CreateLocalContentManifestAsync(
+            directoryPath: _tempDir,
+            name: "Tool",
+            contentType: ContentType.Executable,
+            targetGame: GameType.ZeroHour,
+            entryPoint: invalidEntryPoint);
+
+        Assert.False(result.Success);
+        Assert.Contains("invalid", result.FirstError, StringComparison.OrdinalIgnoreCase);
+    }
+
+    /// <summary>
+    /// Verifies that CreateLocalContentManifestAsync accepts entry points with double dots in file or folder names.
+    /// </summary>
+    /// <param name="validEntryPoint">The valid entry point path with dots in name.</param>
+    /// <returns>A task representing the asynchronous test.</returns>
+    [Theory]
+    [InlineData("game..exe")]
+    [InlineData("backup..old/tool.exe")]
+    public async Task CreateLocalContentManifestAsync_WithDoubleDotsInName_ReturnsSuccess(string validEntryPoint)
+    {
+        SetupManifestBuilder(ContentType.Executable, GameType.ZeroHour, "Tool", validEntryPoint);
+
+        var result = await _service.CreateLocalContentManifestAsync(
+            directoryPath: _tempDir,
+            name: "Tool",
+            contentType: ContentType.Executable,
+            targetGame: GameType.ZeroHour,
+            entryPoint: validEntryPoint);
+
+        Assert.True(result.Success);
+        Assert.NotNull(result.Data);
+        Assert.Equal(validEntryPoint, result.Data!.EntryPoint);
+    }
+
+    /// <summary>
+    /// Verifies that CreateLocalContentManifestAsync rejects an entry point that does not exist in manifest files.
+    /// </summary>
+    /// <returns>A task representing the asynchronous test.</returns>
+    [Fact]
+    public async Task CreateLocalContentManifestAsync_WithNonExistentEntryPoint_ReturnsFailure()
+    {
+        SetupManifestBuilder(ContentType.Executable, GameType.ZeroHour, "Tool", "tool.exe");
+
+        var result = await _service.CreateLocalContentManifestAsync(
+            directoryPath: _tempDir,
+            name: "Tool",
+            contentType: ContentType.Executable,
+            targetGame: GameType.ZeroHour,
+            entryPoint: "missing.exe");
+
+        Assert.False(result.Success);
+        Assert.Contains("not found", result.FirstError, StringComparison.OrdinalIgnoreCase);
+    }
+
+    /// <summary>
+    /// Verifies that CreateLocalContentManifestAsync leaves EntryPoint null when not provided.
+    /// </summary>
+    /// <returns>A task representing the asynchronous test.</returns>
+    [Fact]
+    public async Task CreateLocalContentManifestAsync_WithoutEntryPoint_LeavesEntryPointNull()
+    {
+        SetupManifestBuilder(ContentType.Mod, GameType.ZeroHour, "MyMod");
+
+        var result = await _service.CreateLocalContentManifestAsync(
+            directoryPath: _tempDir,
+            name: "MyMod",
+            contentType: ContentType.Mod,
+            targetGame: GameType.ZeroHour);
+
+        Assert.True(result.Success);
+        Assert.NotNull(result.Data);
+        Assert.Null(result.Data!.EntryPoint);
+    }
+
+    /// <summary>
+    /// Verifies that UpdateLocalContentManifestAsync passes entryPoint through to the created manifest.
+    /// </summary>
+    /// <returns>A task representing the asynchronous test.</returns>
+    [Fact]
+    public async Task UpdateLocalContentManifestAsync_WithEntryPoint_SetsEntryPointOnUpdatedManifest()
+    {
+        SetupManifestBuilder(ContentType.GameClient, GameType.ZeroHour, "GeneralsClient", "generals.exe");
+
+        _reconciliationServiceMock
+            .Setup(x => x.OrchestrateLocalUpdateAsync(
+                It.IsAny<string>(),
+                It.IsAny<ContentManifest>(),
+                It.IsAny<CancellationToken>()))
+            .ReturnsAsync(OperationResult<ContentUpdateResult>.CreateSuccess(new ContentUpdateResult()));
+
+        var result = await _service.UpdateLocalContentManifestAsync(
+            existingManifestId: "1.0.local.gameclient.old",
+            name: "GeneralsClient",
+            directoryPath: _tempDir,
+            contentType: ContentType.GameClient,
+            targetGame: GameType.ZeroHour,
+            entryPoint: "generals.exe");
+
+        Assert.True(result.Success);
+        Assert.NotNull(result.Data);
+        Assert.Equal("generals.exe", result.Data!.EntryPoint);
+    }
+
+    private void SetupManifestBuilder(ContentType contentType, GameType targetGame, string contentName, params string[] filePaths)
+    {
+        var files = filePaths.Length > 0
+            ? filePaths.Select(f => new ManifestFile { RelativePath = f, IsExecutable = f.EndsWith(".exe", StringComparison.OrdinalIgnoreCase) }).ToList()
+            : new List<ManifestFile>();
+
+        var manifest = new ContentManifest
+        {
+            Id = ManifestId.Create($"1.0.local.{contentType.ToString().ToLowerInvariant()}.{contentName.ToLowerInvariant()}"),
+            Name = contentName,
+            ContentType = contentType,
+            TargetGame = targetGame,
+            Files = files,
+        };
+
+        var builderMock = new Mock<IContentManifestBuilder>();
+        builderMock.Setup(b => b.Build()).Returns(manifest);
+
+        _manifestGenServiceMock
+            .Setup(x => x.CreateContentManifestAsync(
+                It.IsAny<string>(),
+                It.IsAny<string>(),
+                It.IsAny<string>(),
+                It.IsAny<int>(),
+                It.IsAny<ContentType>(),
+                It.IsAny<GameType>(),
+                It.IsAny<ContentDependency[]>()))
+            .ReturnsAsync(builderMock.Object);
+
+        _contentStorageServiceMock
+            .Setup(x => x.StoreContentAsync(
+                It.IsAny<ContentManifest>(),
+                It.IsAny<string>(),
+                It.IsAny<IProgress<ContentStorageProgress>?>(),
+                It.IsAny<CancellationToken>()))
+            .ReturnsAsync(OperationResult<ContentManifest>.CreateSuccess(manifest));
+    }
+}
diff --git a/GenHub/GenHub.Tests/GenHub.Tests.Core/Features/Content/Services/Publishers/PublisherManifestFactoryResolverTests.cs b/GenHub/GenHub.Tests/GenHub.Tests.Core/Features/Content/Services/Publishers/PublisherManifestFactoryResolverTests.cs
new file mode 100644
index 000000000..522569cd5
--- /dev/null
+++ b/GenHub/GenHub.Tests/GenHub.Tests.Core/Features/Content/Services/Publishers/PublisherManifestFactoryResolverTests.cs
@@ -0,0 +1,173 @@
+using System;
+using System.Collections.Generic;
+using GenHub.Core.Constants;
+using GenHub.Core.Interfaces.Common;
+using GenHub.Core.Interfaces.Content;
+using GenHub.Core.Models.Enums;
+using GenHub.Core.Models.Manifest;
+using GenHub.Features.Content.Services.Publishers;
+using Microsoft.Extensions.Logging.Abstractions;
+using Moq;
+using Xunit;
+using ContentType = GenHub.Core.Models.Enums.ContentType;
+
+namespace GenHub.Tests.Core.Features.Content.Services.Publishers;
+
+/// <summary>
+/// Unit tests for <see cref="PublisherManifestFactoryResolver"/>.
+/// </summary>
+public class PublisherManifestFactoryResolverTests
+{
+    private readonly Mock<IFileHashProvider> _hashProviderMock;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="PublisherManifestFactoryResolverTests"/> class.
+    /// </summary>
+    public PublisherManifestFactoryResolverTests()
+    {
+        _hashProviderMock = new Mock<IFileHashProvider>();
+    }
+
+    /// <summary>
+    /// Verifies that ResolveFactory returns the specialized factory when CanHandle matches.
+    /// </summary>
+    [Fact]
+    public void ResolveFactory_ReturnsSpecializedFactory_WhenCanHandleMatches()
+    {
+        // Arrange
+        var superHackersFactory = new SuperHackersManifestFactory(
+            NullLogger<SuperHackersManifestFactory>.Instance,
+            _hashProviderMock.Object);
+
+        var gitHubFactory = new GitHubManifestFactory(
+            NullLogger<GitHubManifestFactory>.Instance,
+            _hashProviderMock.Object);
+
+        var resolver = new PublisherManifestFactoryResolver(
+            [superHackersFactory, gitHubFactory],
+            NullLogger<PublisherManifestFactoryResolver>.Instance);
+
+        var manifest = new ContentManifest
+        {
+            Id = ManifestId.Create("1.0.thesuperhackers.gameclient.generals"),
+            ContentType = ContentType.GameClient,
+            Publisher = new PublisherInfo
+            {
+                Name = "TheSuperHackers",
+                PublisherType = PublisherTypeConstants.TheSuperHackers,
+            },
+        };
+
+        // Act
+        var result = resolver.ResolveFactory(manifest);
+
+        // Assert
+        Assert.NotNull(result);
+        Assert.IsType<SuperHackersManifestFactory>(result);
+    }
+
+    /// <summary>
+    /// Verifies that ResolveFactory falls back to GitHubManifestFactory for non-GameClient publisher content.
+    /// </summary>
+    [Fact]
+    public void ResolveFactory_FallsBackToGitHubFactory_WhenSpecializedFactoryCannotHandle()
+    {
+        // Arrange
+        var superHackersFactory = new SuperHackersManifestFactory(
+            NullLogger<SuperHackersManifestFactory>.Instance,
+            _hashProviderMock.Object);
+
+        var gitHubFactory = new GitHubManifestFactory(
+            NullLogger<GitHubManifestFactory>.Instance,
+            _hashProviderMock.Object);
+
+        var resolver = new PublisherManifestFactoryResolver(
+            [superHackersFactory, gitHubFactory],
+            NullLogger<PublisherManifestFactoryResolver>.Instance);
+
+        var patchManifest = new ContentManifest
+        {
+            Id = ManifestId.Create("1.0.thesuperhackers.patch.generalsgamepatch2"),
+            ContentType = ContentType.Patch,
+            Publisher = new PublisherInfo
+            {
+                Name = "TheSuperHackers",
+                PublisherType = PublisherTypeConstants.TheSuperHackers,
+            },
+        };
+
+        // Act
+        var result = resolver.ResolveFactory(patchManifest);
+
+        // Assert
+        Assert.NotNull(result);
+        Assert.IsType<GitHubManifestFactory>(result);
+    }
+
+    /// <summary>
+    /// Verifies that ResolveFactory returns null when no specialized or fallback factory is available.
+    /// </summary>
+    [Fact]
+    public void ResolveFactory_ReturnsNull_WhenNoFactoryMatchesAndNoFallbackAvailable()
+    {
+        // Arrange
+        var superHackersFactory = new SuperHackersManifestFactory(
+            NullLogger<SuperHackersManifestFactory>.Instance,
+            _hashProviderMock.Object);
+
+        var resolver = new PublisherManifestFactoryResolver(
+            [superHackersFactory],
+            NullLogger<PublisherManifestFactoryResolver>.Instance);
+
+        var patchManifest = new ContentManifest
+        {
+            Id = ManifestId.Create("1.0.testpublisher.mod.sample"),
+            ContentType = ContentType.Mod,
+            Publisher = new PublisherInfo
+            {
+                Name = "Unknown",
+                PublisherType = "unknown",
+            },
+        };
+
+        // Act
+        var result = resolver.ResolveFactory(patchManifest);
+
+        // Assert
+        Assert.Null(result);
+    }
+
+    /// <summary>
+    /// Verifies that ResolveFactory returns null when a GameClient manifest has no specialized factory,
+    /// rather than falling back to GitHubManifestFactory.
+    /// </summary>
+    [Fact]
+    public void ResolveFactory_ReturnsNull_WhenGameClientHasNoSpecializedFactory()
+    {
+        // Arrange
+        var gitHubFactory = new GitHubManifestFactory(
+            NullLogger<GitHubManifestFactory>.Instance,
+            _hashProviderMock.Object);
+
+        var resolver = new PublisherManifestFactoryResolver(
+            [gitHubFactory],
+            NullLogger<PublisherManifestFactoryResolver>.Instance);
+
+        var gameClientManifest = new ContentManifest
+        {
+            Id = ManifestId.Create("1.0.unknownpublisher.gameclient.generals"),
+            ContentType = ContentType.GameClient,
+            Publisher = new PublisherInfo
+            {
+                Name = "UnknownPublisher",
+                PublisherType = "unknownpublisher",
+            },
+        };
+
+        // Act
+        var result = resolver.ResolveFactory(gameClientManifest);
+
+        // Assert
+        Assert.Null(result);
+    }
+}
diff --git a/GenHub/GenHub.Tests/GenHub.Tests.Core/Features/Content/Services/Publishers/SuperHackersProviderTests.cs b/GenHub/GenHub.Tests/GenHub.Tests.Core/Features/Content/Services/Publishers/SuperHackersProviderTests.cs
new file mode 100644
index 000000000..2b645c6e5
--- /dev/null
+++ b/GenHub/GenHub.Tests/GenHub.Tests.Core/Features/Content/Services/Publishers/SuperHackersProviderTests.cs
@@ -0,0 +1,497 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using GenHub.Core.Constants;
+using GenHub.Core.Interfaces.Content;
+using GenHub.Core.Interfaces.GitHub;
+using GenHub.Core.Interfaces.Providers;
+using GenHub.Core.Models.Content;
+using GenHub.Core.Models.Enums;
+using GenHub.Core.Models.GitHub;
+using GenHub.Core.Models.Manifest;
+using GenHub.Core.Models.Results;
+using GenHub.Features.Content.Services.Publishers;
+using Microsoft.Extensions.Logging.Abstractions;
+using Moq;
+using Xunit;
+using ContentType = GenHub.Core.Models.Enums.ContentType;
+
+namespace GenHub.Tests.Core.Features.Content.Services.Publishers;
+
+/// <summary>
+/// Unit tests for <see cref="SuperHackersProvider"/>.
+/// </summary>
+public class SuperHackersProviderTests
+{
+    private readonly Mock<IProviderDefinitionLoader> _providerDefinitionLoaderMock;
+    private readonly Mock<IGitHubApiClient> _gitHubApiClientMock;
+    private readonly Mock<IContentResolver> _resolverMock;
+    private readonly Mock<IContentDeliverer> _delivererMock;
+    private readonly Mock<IContentValidator> _validatorMock;
+    private readonly SuperHackersProvider _provider;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="SuperHackersProviderTests"/> class.
+    /// </summary>
+    public SuperHackersProviderTests()
+    {
+        _providerDefinitionLoaderMock = new Mock<IProviderDefinitionLoader>();
+        _gitHubApiClientMock = new Mock<IGitHubApiClient>();
+        _resolverMock = new Mock<IContentResolver>();
+        _delivererMock = new Mock<IContentDeliverer>();
+        _validatorMock = new Mock<IContentValidator>();
+
+        _resolverMock.Setup(r => r.ResolverId).Returns(SuperHackersConstants.ResolverId);
+        _delivererMock.Setup(d => d.SourceName).Returns(ContentSourceNames.GitHubDeliverer);
+
+        _validatorMock.Setup(v => v.ValidateManifestAsync(It.IsAny<ContentManifest>(), It.IsAny<CancellationToken>()))
+            .ReturnsAsync(new ValidationResult("test", []));
+
+        _provider = new SuperHackersProvider(
+            _providerDefinitionLoaderMock.Object,
+            _gitHubApiClientMock.Object,
+            [_resolverMock.Object],
+            [_delivererMock.Object],
+            _validatorMock.Object,
+            NullLogger<SuperHackersProvider>.Instance);
+    }
+
+    /// <summary>
+    /// Verifies that SearchAsync returns both GeneralsGameCode and GeneralsGamePatch2 releases when available.
+    /// </summary>
+    /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
+    [Fact]
+    public async Task SearchAsync_DiscoversBothGameCodeAndGamePatch2_WhenBothAvailableAsync()
+    {
+        // Arrange
+        var gameCodeRelease = new GitHubRelease
+        {
+            TagName = "weekly-2026-08-01",
+            Name = "Weekly Release 2026-08-01",
+            Body = "Generals and Zero Hour game code updates",
+            HtmlUrl = "https://github.com/TheSuperHackers/GeneralsGameCode/releases/tag/weekly-2026-08-01",
+            CreatedAt = DateTimeOffset.UtcNow,
+        };
+
+        var gamePatch2Release = new GitHubRelease
+        {
+            TagName = "1.0.0",
+            Name = "Release 1.0.0",
+            Body = "Community Patch 2 to fix and improve Generals and Zero Hour",
+            HtmlUrl = "https://github.com/TheSuperHackers/GeneralsGamePatch2/releases/tag/1.0.0",
+            CreatedAt = DateTimeOffset.UtcNow,
+        };
+
+        _gitHubApiClientMock.Setup(c => c.GetLatestReleaseAsync(
+            SuperHackersConstants.GeneralsGameCodeOwner,
+            SuperHackersConstants.GeneralsGameCodeRepo,
+            It.IsAny<CancellationToken>()))
+            .ReturnsAsync(gameCodeRelease);
+
+        _gitHubApiClientMock.Setup(c => c.GetLatestReleaseAsync(
+            SuperHackersConstants.GeneralsGamePatch2Owner,
+            SuperHackersConstants.GeneralsGamePatch2Repo,
+            It.IsAny<CancellationToken>()))
+            .ReturnsAsync(gamePatch2Release);
+
+        var query = new ContentSearchQuery();
+
+        // Act
+        var result = await _provider.SearchAsync(query);
+
+        // Assert
+        Assert.True(result.Success);
+        var items = result.Data?.ToList();
+        Assert.NotNull(items);
+        Assert.Equal(2, items.Count);
+
+        var gameCodeItem = items.FirstOrDefault(i => i.ContentType == ContentType.GameClient);
+        Assert.NotNull(gameCodeItem);
+        Assert.Equal("weekly-2026-08-01", gameCodeItem.Version);
+        Assert.Equal(SuperHackersConstants.GeneralsGameCodeRepo, gameCodeItem.ResolverMetadata[GitHubConstants.RepoMetadataKey]);
+
+        var gamePatch2Item = items.FirstOrDefault(i => i.ContentType == ContentType.Patch);
+        Assert.NotNull(gamePatch2Item);
+        Assert.Equal("1.0.0", gamePatch2Item.Version);
+        Assert.Equal(SuperHackersConstants.GeneralsGamePatch2Repo, gamePatch2Item.ResolverMetadata[GitHubConstants.RepoMetadataKey]);
+    }
+
+    /// <summary>
+    /// Verifies that SearchAsync filters properly by repository search term.
+    /// </summary>
+    /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
+    [Fact]
+    public async Task SearchAsync_FiltersBySearchTerm_CorrectlyAsync()
+    {
+        // Arrange
+        var gamePatch2Release = new GitHubRelease
+        {
+            TagName = "1.0.0",
+            Name = "Release 1.0.0",
+            Body = "Community Patch 2",
+            HtmlUrl = "https://github.com/TheSuperHackers/GeneralsGamePatch2/releases/tag/1.0.0",
+            CreatedAt = DateTimeOffset.UtcNow,
+        };
+
+        _gitHubApiClientMock.Setup(c => c.GetLatestReleaseAsync(
+            SuperHackersConstants.GeneralsGameCodeOwner,
+            SuperHackersConstants.GeneralsGameCodeRepo,
+            It.IsAny<CancellationToken>()))
+            .ReturnsAsync(new GitHubRelease { TagName = "weekly-1", Name = "Weekly 1" });
+
+        _gitHubApiClientMock.Setup(c => c.GetLatestReleaseAsync(
+            SuperHackersConstants.GeneralsGamePatch2Owner,
+            SuperHackersConstants.GeneralsGamePatch2Repo,
+            It.IsAny<CancellationToken>()))
+            .ReturnsAsync(gamePatch2Release);
+
+        var query = new ContentSearchQuery { SearchTerm = "GeneralsGamePatch2" };
+
+        // Act
+        var result = await _provider.SearchAsync(query);
+
+        // Assert
+        Assert.True(result.Success);
+        var items = result.Data?.ToList();
+        Assert.NotNull(items);
+        Assert.Single(items);
+        Assert.Equal(ContentType.Patch, items[0].ContentType);
+    }
+
+    /// <summary>
+    /// Verifies that SearchAsync filters by ContentType correctly.
+    /// </summary>
+    /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
+    [Fact]
+    public async Task SearchAsync_FiltersByContentType_ReturnsOnlyMatchingReleasesAsync()
+    {
+        // Arrange
+        var gameCodeRelease = new GitHubRelease { TagName = "weekly-1", Name = "Weekly 1" };
+        var gamePatch2Release = new GitHubRelease { TagName = "1.0.0", Name = "Release 1.0.0" };
+
+        _gitHubApiClientMock.Setup(c => c.GetLatestReleaseAsync(
+            SuperHackersConstants.GeneralsGameCodeOwner,
+            SuperHackersConstants.GeneralsGameCodeRepo,
+            It.IsAny<CancellationToken>()))
+            .ReturnsAsync(gameCodeRelease);
+
+        _gitHubApiClientMock.Setup(c => c.GetLatestReleaseAsync(
+            SuperHackersConstants.GeneralsGamePatch2Owner,
+            SuperHackersConstants.GeneralsGamePatch2Repo,
+            It.IsAny<CancellationToken>()))
+            .ReturnsAsync(gamePatch2Release);
+
+        var query = new ContentSearchQuery { ContentType = ContentType.Patch };
+
+        // Act
+        var result = await _provider.SearchAsync(query);
+
+        // Assert
+        Assert.True(result.Success);
+        var items = result.Data?.ToList();
+        Assert.NotNull(items);
+        Assert.Single(items);
+        Assert.Equal(ContentType.Patch, items[0].ContentType);
+        Assert.Equal("1.0.0", items[0].Version);
+    }
+
+    /// <summary>
+    /// Verifies that SearchAsync filters by TargetGame correctly.
+    /// </summary>
+    /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
+    [Fact]
+    public async Task SearchAsync_FiltersByTargetGame_ReturnsMatchingReleasesAsync()
+    {
+        // Arrange
+        var gameCodeRelease = new GitHubRelease { TagName = "weekly-1", Name = "Weekly 1" };
+        var gamePatch2Release = new GitHubRelease { TagName = "1.0.0", Name = "Release 1.0.0" };
+
+        _gitHubApiClientMock.Setup(c => c.GetLatestReleaseAsync(
+            SuperHackersConstants.GeneralsGameCodeOwner,
+            SuperHackersConstants.GeneralsGameCodeRepo,
+            It.IsAny<CancellationToken>()))
+            .ReturnsAsync(gameCodeRelease);
+
+        _gitHubApiClientMock.Setup(c => c.GetLatestReleaseAsync(
+            SuperHackersConstants.GeneralsGamePatch2Owner,
+            SuperHackersConstants.GeneralsGamePatch2Repo,
+            It.IsAny<CancellationToken>()))
+            .ReturnsAsync(gamePatch2Release);
+
+        var zeroHourQuery = new ContentSearchQuery { TargetGame = GameType.ZeroHour };
+
+        // Act
+        var result = await _provider.SearchAsync(zeroHourQuery);
+
+        // Assert
+        Assert.True(result.Success);
+        var items = result.Data?.ToList();
+        Assert.NotNull(items);
+        Assert.Single(items);
+        Assert.Equal(ContentType.Patch, items[0].ContentType);
+        Assert.Equal(GameType.ZeroHour, items[0].TargetGame);
+    }
+
+    /// <summary>
+    /// Verifies that SearchAsync filters by author name and github author correctly.
+    /// </summary>
+    /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
+    [Fact]
+    public async Task SearchAsync_FiltersByAuthor_ReturnsEmptyWhenAuthorDoesNotMatchAsync()
+    {
+        // Arrange
+        var query = new ContentSearchQuery { AuthorName = "NonExistentAuthor" };
+
+        // Act
+        var result = await _provider.SearchAsync(query);
+
+        // Assert
+        Assert.True(result.Success);
+        var items = result.Data?.ToList();
+        Assert.NotNull(items);
+        Assert.Empty(items);
+    }
+
+    /// <summary>
+    /// Verifies that SearchAsync matches on display name and body text.
+    /// </summary>
+    /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
+    [Fact]
+    public async Task SearchAsync_MatchesSearchTerm_OnDisplayNameAndBodyAsync()
+    {
+        // Arrange
+        var gamePatch2Release = new GitHubRelease
+        {
+            TagName = "1.0.0",
+            Name = "Patch Release",
+            Body = "Community patch details",
+            HtmlUrl = "https://github.com/TheSuperHackers/GeneralsGamePatch2/releases/tag/1.0.0",
+            CreatedAt = DateTimeOffset.UtcNow,
+        };
+
+        _gitHubApiClientMock.Setup(c => c.GetLatestReleaseAsync(
+            SuperHackersConstants.GeneralsGameCodeOwner,
+            SuperHackersConstants.GeneralsGameCodeRepo,
+            It.IsAny<CancellationToken>()))
+            .ReturnsAsync(new GitHubRelease { TagName = "weekly-1", Name = "Weekly 1", Body = "Engine updates" });
+
+        _gitHubApiClientMock.Setup(c => c.GetLatestReleaseAsync(
+            SuperHackersConstants.GeneralsGamePatch2Owner,
+            SuperHackersConstants.GeneralsGamePatch2Repo,
+            It.IsAny<CancellationToken>()))
+            .ReturnsAsync(gamePatch2Release);
+
+        var query = new ContentSearchQuery { SearchTerm = SuperHackersConstants.GeneralsGamePatch2DisplayName };
+
+        // Act
+        var result = await _provider.SearchAsync(query);
+
+        // Assert
+        Assert.True(result.Success);
+        var items = result.Data?.ToList();
+        Assert.NotNull(items);
+        Assert.Single(items);
+        Assert.Equal(ContentType.Patch, items[0].ContentType);
+    }
+
+    /// <summary>
+    /// Verifies that SearchAsync returns failure when one target returns null release and the other throws an error.
+    /// </summary>
+    /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
+    [Fact]
+    public async Task SearchAsync_WhenOneTargetReturnsNullAndOtherErrors_ReturnsFailureAsync()
+    {
+        // Arrange
+        _gitHubApiClientMock.Setup(c => c.GetLatestReleaseAsync(
+            SuperHackersConstants.GeneralsGameCodeOwner,
+            SuperHackersConstants.GeneralsGameCodeRepo,
+            It.IsAny<CancellationToken>()))
+            .ReturnsAsync((GitHubRelease)null!);
+
+        _gitHubApiClientMock.Setup(c => c.GetLatestReleaseAsync(
+            SuperHackersConstants.GeneralsGamePatch2Owner,
+            SuperHackersConstants.GeneralsGamePatch2Repo,
+            It.IsAny<CancellationToken>()))
+            .ThrowsAsync(new InvalidOperationException("API rate limit"));
+
+        var query = new ContentSearchQuery();
+
+        // Act
+        var result = await _provider.SearchAsync(query);
+
+        // Assert
+        Assert.False(result.Success);
+        Assert.Contains("Search failed for SuperHackers targets", result.FirstError);
+    }
+
+    /// <summary>
+    /// Verifies that SearchAsync returns successful results when one repository fails.
+    /// </summary>
+    /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
+    [Fact]
+    public async Task SearchAsync_ReturnsRemainingReleases_WhenOneRepositoryFailsAsync()
+    {
+        // Arrange
+        var gameCodeRelease = new GitHubRelease { TagName = "weekly-1", Name = "Weekly 1" };
+
+        _gitHubApiClientMock.Setup(c => c.GetLatestReleaseAsync(
+            SuperHackersConstants.GeneralsGameCodeOwner,
+            SuperHackersConstants.GeneralsGameCodeRepo,
+            It.IsAny<CancellationToken>()))
+            .ReturnsAsync(gameCodeRelease);
+
+        _gitHubApiClientMock.Setup(c => c.GetLatestReleaseAsync(
+            SuperHackersConstants.GeneralsGamePatch2Owner,
+            SuperHackersConstants.GeneralsGamePatch2Repo,
+            It.IsAny<CancellationToken>()))
+            .ThrowsAsync(new InvalidOperationException("API error"));
+
+        var query = new ContentSearchQuery();
+
+        // Act
+        var result = await _provider.SearchAsync(query);
+
+        // Assert
+        Assert.True(result.Success);
+        var items = result.Data?.ToList();
+        Assert.NotNull(items);
+        Assert.Single(items);
+        Assert.Equal(ContentType.GameClient, items[0].ContentType);
+    }
+
+    /// <summary>
+    /// Verifies that SearchAsync returns failure when all matching repositories fail.
+    /// </summary>
+    /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
+    [Fact]
+    public async Task SearchAsync_ReturnsFailure_WhenAllRepositoriesFailAsync()
+    {
+        // Arrange
+        _gitHubApiClientMock.Setup(c => c.GetLatestReleaseAsync(
+            SuperHackersConstants.GeneralsGameCodeOwner,
+            SuperHackersConstants.GeneralsGameCodeRepo,
+            It.IsAny<CancellationToken>()))
+            .ThrowsAsync(new InvalidOperationException("Network failure 1"));
+
+        _gitHubApiClientMock.Setup(c => c.GetLatestReleaseAsync(
+            SuperHackersConstants.GeneralsGamePatch2Owner,
+            SuperHackersConstants.GeneralsGamePatch2Repo,
+            It.IsAny<CancellationToken>()))
+            .ThrowsAsync(new InvalidOperationException("Network failure 2"));
+
+        var query = new ContentSearchQuery();
+
+        // Act
+        var result = await _provider.SearchAsync(query);
+
+        // Assert
+        Assert.False(result.Success);
+        Assert.Contains("Search failed for SuperHackers targets", result.FirstError);
+    }
+
+    /// <summary>
+    /// Verifies that SearchAsync propagates cancellation.
+    /// </summary>
+    /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
+    [Fact]
+    public async Task SearchAsync_PropagatesCancellation_WhenCancellationRequestedAsync()
+    {
+        // Arrange
+        using var cts = new CancellationTokenSource();
+        cts.Cancel();
+
+        // Act & Assert
+        await Assert.ThrowsAnyAsync<OperationCanceledException>(
+            () => _provider.SearchAsync(new ContentSearchQuery(), cts.Token));
+    }
+
+    /// <summary>
+    /// Verifies that SearchAsync falls back to display name and tag name when release name is blank.
+    /// </summary>
+    /// <param name="releaseName">The candidate release name to test.</param>
+    /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
+    [Theory]
+    [InlineData(null)]
+    [InlineData("")]
+    [InlineData("   ")]
+    public async Task SearchAsync_UsesFallbackName_WhenReleaseNameIsBlankAsync(string? releaseName)
+    {
+        // Arrange
+        var release = new GitHubRelease
+        {
+            TagName = "alpha-4",
+            Name = releaseName ?? string.Empty,
+            Body = "Patch notes",
+            HtmlUrl = "https://github.com/TheSuperHackers/GeneralsGamePatch2/releases/tag/alpha-4",
+            CreatedAt = DateTimeOffset.UtcNow,
+        };
+
+        _gitHubApiClientMock.Setup(c => c.GetLatestReleaseAsync(
+            SuperHackersConstants.GeneralsGamePatch2Owner,
+            SuperHackersConstants.GeneralsGamePatch2Repo,
+            It.IsAny<CancellationToken>()))
+            .ReturnsAsync(release);
+
+        _gitHubApiClientMock.Setup(c => c.GetLatestReleaseAsync(
+            SuperHackersConstants.GeneralsGameCodeOwner,
+            SuperHackersConstants.GeneralsGameCodeRepo,
+            It.IsAny<CancellationToken>()))
+            .ReturnsAsync((GitHubRelease)null!);
+
+        var query = new ContentSearchQuery { ContentType = ContentType.Patch };
+
+        // Act
+        var result = await _provider.SearchAsync(query);
+
+        // Assert
+        Assert.True(result.Success);
+        var items = result.Data?.ToList();
+        Assert.NotNull(items);
+        Assert.Single(items);
+        Assert.Equal($"{SuperHackersConstants.GeneralsGamePatch2DisplayName} alpha-4", items[0].Name);
+    }
+
+    /// <summary>
+    /// Verifies that SearchAsync preserves the original release name when it is not blank.
+    /// </summary>
+    /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
+    [Fact]
+    public async Task SearchAsync_PreservesReleaseName_WhenReleaseNameIsNonBlankAsync()
+    {
+        // Arrange
+        var release = new GitHubRelease
+        {
+            TagName = "alpha-4",
+            Name = "Community Patch 2.0 Alpha 4",
+            Body = "Patch notes",
+            HtmlUrl = "https://github.com/TheSuperHackers/GeneralsGamePatch2/releases/tag/alpha-4",
+            CreatedAt = DateTimeOffset.UtcNow,
+        };
+
+        _gitHubApiClientMock.Setup(c => c.GetLatestReleaseAsync(
+            SuperHackersConstants.GeneralsGamePatch2Owner,
+            SuperHackersConstants.GeneralsGamePatch2Repo,
+            It.IsAny<CancellationToken>()))
+            .ReturnsAsync(release);
+
+        _gitHubApiClientMock.Setup(c => c.GetLatestReleaseAsync(
+            SuperHackersConstants.GeneralsGameCodeOwner,
+            SuperHackersConstants.GeneralsGameCodeRepo,
+            It.IsAny<CancellationToken>()))
+            .ReturnsAsync((GitHubRelease)null!);
+
+        var query = new ContentSearchQuery { ContentType = ContentType.Patch };
+
+        // Act
+        var result = await _provider.SearchAsync(query);
+
+        // Assert
+        Assert.True(result.Success);
+        var items = result.Data?.ToList();
+        Assert.NotNull(items);
+        Assert.Single(items);
+        Assert.Equal("Community Patch 2.0 Alpha 4", items[0].Name);
+    }
+}
diff --git a/GenHub/GenHub.Tests/GenHub.Tests.Core/Features/Content/Tools/ManagedChromiumRuntimeTests.cs b/GenHub/GenHub.Tests/GenHub.Tests.Core/Features/Content/Tools/ManagedChromiumRuntimeTests.cs
new file mode 100644
index 000000000..2f430b8ec
--- /dev/null
+++ b/GenHub/GenHub.Tests/GenHub.Tests.Core/Features/Content/Tools/ManagedChromiumRuntimeTests.cs
@@ -0,0 +1,168 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading.Tasks;
+using GenHub.Core.Models.Common;
+using GenHub.Features.Content.Services.Tools;
+using Microsoft.Extensions.Logging;
+using Microsoft.Playwright;
+using Moq;
+using Xunit;
+
+namespace GenHub.Tests.Core.Features.Content.Tools;
+
+/// <summary>
+/// Tests the app-owned Playwright Chromium runtime and request-header propagation.
+/// </summary>
+public sealed class ManagedChromiumRuntimeTests : IDisposable
+{
+    private readonly string _runtimeDirectory = Path.Combine(Path.GetTempPath(), "GenHubTests", Guid.NewGuid().ToString("N"));
+    private readonly string? _originalBrowserPath = Environment.GetEnvironmentVariable(ManagedChromiumRuntime.BrowserPathEnvironmentVariable);
+
+    /// <summary>
+    /// Verifies a pre-provisioned app-owned Chromium executable does not trigger another install.
+    /// </summary>
+    /// <returns>A task that represents the asynchronous test.</returns>
+    [Fact]
+    public async Task EnsureInstalledAsync_ExistingManagedExecutable_DoesNotRunInstallerAsync()
+    {
+        // Arrange
+        var executablePath = Path.Combine(_runtimeDirectory, "chromium.exe");
+        Directory.CreateDirectory(_runtimeDirectory);
+        await File.WriteAllTextAsync(executablePath, "browser");
+        var installerCalls = 0;
+        var consentCalls = 0;
+        var chromium = new Mock<IBrowserType>(MockBehavior.Strict);
+        chromium.SetupGet(browser => browser.ExecutablePath).Returns(executablePath);
+        var runtime = new ManagedChromiumRuntime(
+            _runtimeDirectory,
+            _ =>
+            {
+                installerCalls++;
+                return 0;
+            },
+            _ =>
+            {
+                consentCalls++;
+                return Task.FromResult(true);
+            },
+            new Mock<ILogger>().Object);
+
+        // Act
+        await runtime.EnsureInstalledAsync(chromium.Object, default);
+
+        // Assert
+        Assert.Equal(0, installerCalls);
+        Assert.Equal(0, consentCalls);
+        Assert.Equal(_runtimeDirectory, Environment.GetEnvironmentVariable(ManagedChromiumRuntime.BrowserPathEnvironmentVariable));
+    }
+
+    /// <summary>
+    /// Verifies a clean app profile asks for consent, then invokes Playwright's Chromium installer
+    /// exactly once and accepts the executable it produces, without consulting a system browser.
+    /// </summary>
+    /// <returns>A task that represents the asynchronous test.</returns>
+    [Fact]
+    public async Task EnsureInstalledAsync_MissingManagedExecutable_InstallsChromiumOnceAsync()
+    {
+        // Arrange
+        var executablePath = Path.Combine(_runtimeDirectory, "chromium.exe");
+        IReadOnlyList<string>? installerArguments = null;
+        string? consentPath = null;
+        var chromium = new Mock<IBrowserType>(MockBehavior.Strict);
+        chromium.SetupGet(browser => browser.ExecutablePath).Returns(executablePath);
+        var runtime = new ManagedChromiumRuntime(
+            _runtimeDirectory,
+            arguments =>
+            {
+                installerArguments = arguments;
+                Directory.CreateDirectory(_runtimeDirectory);
+                File.WriteAllText(executablePath, "browser");
+                return 0;
+            },
+            path =>
+            {
+                consentPath = path;
+                return Task.FromResult(true);
+            },
+            new Mock<ILogger>().Object);
+
+        // Act
+        await runtime.EnsureInstalledAsync(chromium.Object, default);
+
+        // Assert
+        Assert.Equal(_runtimeDirectory, consentPath);
+        Assert.Equal(["install", "chromium"], installerArguments);
+        Assert.True(File.Exists(executablePath));
+        Assert.Equal(_runtimeDirectory, Environment.GetEnvironmentVariable(ManagedChromiumRuntime.BrowserPathEnvironmentVariable));
+    }
+
+    /// <summary>
+    /// Verifies declining the install consent dialog cancels provisioning without downloading.
+    /// </summary>
+    /// <returns>A task that represents the asynchronous test.</returns>
+    [Fact]
+    public async Task EnsureInstalledAsync_ConsentDeclined_ThrowsWithoutInstallingAsync()
+    {
+        // Arrange
+        var executablePath = Path.Combine(_runtimeDirectory, "chromium.exe");
+        var installerCalls = 0;
+        var chromium = new Mock<IBrowserType>(MockBehavior.Strict);
+        chromium.SetupGet(browser => browser.ExecutablePath).Returns(executablePath);
+        var runtime = new ManagedChromiumRuntime(
+            _runtimeDirectory,
+            _ =>
+            {
+                installerCalls++;
+                return 0;
+            },
+            _ => Task.FromResult(false),
+            new Mock<ILogger>().Object);
+
+        // Act
+        var ex = await Assert.ThrowsAsync<OperationCanceledException>(
+            () => runtime.EnsureInstalledAsync(chromium.Object, default));
+
+        // Assert
+        Assert.Contains("cancelled", ex.Message, StringComparison.OrdinalIgnoreCase);
+        Assert.Equal(0, installerCalls);
+        Assert.False(File.Exists(executablePath));
+    }
+
+    /// <summary>
+    /// Verifies browser downloads retain ModDB's referer and other safe request headers while
+    /// excluding headers Chromium must own itself.
+    /// </summary>
+    [Fact]
+    public void BuildSafeDownloadHeaders_PreservesRefererAndFiltersUnsafeHeaders()
+    {
+        // Arrange
+        var download = new DownloadConfiguration { UserAgent = "GenHub Test Agent" };
+        download.Headers["Referer"] = "https://www.moddb.com/mods/example";
+        download.Headers["Accept"] = "application/octet-stream";
+        download.Headers["Host"] = "should-not-be-forwarded";
+        download.Headers["Content-Length"] = "123";
+
+        // Act
+        var headers = PlaywrightService.BuildSafeDownloadHeaders(download);
+
+        // Assert
+        Assert.Equal("https://www.moddb.com/mods/example", headers["Referer"]);
+        Assert.Equal("application/octet-stream", headers["Accept"]);
+        Assert.Equal("GenHub Test Agent", headers["User-Agent"]);
+        Assert.DoesNotContain("Host", headers.Keys, StringComparer.OrdinalIgnoreCase);
+        Assert.DoesNotContain("Content-Length", headers.Keys, StringComparer.OrdinalIgnoreCase);
+    }
+
+    /// <summary>
+    /// Deletes the temporary runtime directory and restores the process environment.
+    /// </summary>
+    public void Dispose()
+    {
+        Environment.SetEnvironmentVariable(ManagedChromiumRuntime.BrowserPathEnvironmentVariable, _originalBrowserPath);
+        if (Directory.Exists(_runtimeDirectory))
+        {
+            Directory.Delete(_runtimeDirectory, recursive: true);
+        }
+    }
+}
diff --git a/GenHub/GenHub.Tests/GenHub.Tests.Core/Features/GameProfiles/GameProcessManagerTests.cs b/GenHub/GenHub.Tests/GenHub.Tests.Core/Features/GameProfiles/GameProcessManagerTests.cs
index 3afee1b7b..23aea4a92 100644
--- a/GenHub/GenHub.Tests/GenHub.Tests.Core/Features/GameProfiles/GameProcessManagerTests.cs
+++ b/GenHub/GenHub.Tests/GenHub.Tests.Core/Features/GameProfiles/GameProcessManagerTests.cs
@@ -195,7 +195,7 @@ public async Task StartProcessAsync_WhenLauncherExitsCleanlyWithoutChild_Reports
         Assert.False(result.Success);
 
         var errors = string.Join(", ", result.Errors);
-        Assert.Contains("without starting", errors);
+        Assert.True(errors.Contains("without starting") || errors.Contains("did not start"), $"Expected start failure message, but got: {errors}");
         Assert.Contains(complaint, errors);
     }
 
diff --git a/GenHub/GenHub.Tests/GenHub.Tests.Core/Features/GameProfiles/ViewModels/AddLocalContentViewModelTests.cs b/GenHub/GenHub.Tests/GenHub.Tests.Core/Features/GameProfiles/ViewModels/AddLocalContentViewModelTests.cs
new file mode 100644
index 000000000..c7490ef60
--- /dev/null
+++ b/GenHub/GenHub.Tests/GenHub.Tests.Core/Features/GameProfiles/ViewModels/AddLocalContentViewModelTests.cs
@@ -0,0 +1,799 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using GenHub.Core.Interfaces.Common;
+using GenHub.Core.Interfaces.Content;
+using GenHub.Core.Models.Content;
+using GenHub.Core.Models.Enums;
+using GenHub.Core.Models.Manifest;
+using GenHub.Core.Models.Results;
+using GenHub.Features.GameProfiles.ViewModels;
+using Microsoft.Extensions.Logging.Abstractions;
+using Moq;
+using Xunit;
+using ContentType = GenHub.Core.Models.Enums.ContentType;
+
+namespace GenHub.Tests.Core.Features.GameProfiles.ViewModels;
+
+/// <summary>
+/// Contains tests for <see cref="AddLocalContentViewModel"/>.
+/// </summary>
+public class AddLocalContentViewModelTests : IDisposable
+{
+    private readonly Mock<ILocalContentService> _localContentServiceMock;
+    private readonly Mock<IContentStorageService> _contentStorageServiceMock;
+    private readonly Mock<IGenLauncherNormalizationService> _normalizationServiceMock;
+    private readonly Mock<IDialogService> _dialogServiceMock;
+    private readonly List<string> _tempDirectories = [];
+    private readonly List<AddLocalContentViewModel> _viewModels = [];
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="AddLocalContentViewModelTests"/> class.
+    /// </summary>
+    public AddLocalContentViewModelTests()
+    {
+        _localContentServiceMock = new Mock<ILocalContentService>();
+        _contentStorageServiceMock = new Mock<IContentStorageService>();
+        _normalizationServiceMock = new Mock<IGenLauncherNormalizationService>();
+        _dialogServiceMock = new Mock<IDialogService>();
+
+        _localContentServiceMock
+            .Setup(x => x.AllowedContentTypes)
+            .Returns(AddLocalContentViewModel.AllowedContentTypes);
+
+        _normalizationServiceMock
+            .Setup(x => x.DetectGenLauncherFilesAsync(It.IsAny<string>(), It.IsAny<CancellationToken>()))
+            .ReturnsAsync(new GenLauncherDetectionResult());
+    }
+
+    /// <summary>
+    /// Cleans up temporary test directories and viewmodels.
+    /// </summary>
+    public void Dispose()
+    {
+        foreach (var vm in _viewModels)
+        {
+            vm.Dispose();
+        }
+
+        foreach (var dir in _tempDirectories)
+        {
+            try
+            {
+                if (Directory.Exists(dir))
+                {
+                    Directory.Delete(dir, recursive: true);
+                }
+            }
+            catch
+            {
+                // Ignore cleanup errors
+            }
+        }
+
+        GC.SuppressFinalize(this);
+    }
+
+    /// <summary>
+    /// Verifies that the ViewModel initializes with proper defaults.
+    /// </summary>
+    [Fact]
+    public void Constructor_InitializesWithDefaultValues()
+    {
+        var vm = CreateViewModel();
+
+        Assert.NotNull(vm);
+        Assert.Equal(ContentType.Mod, vm.SelectedContentType);
+        Assert.Equal(GameType.ZeroHour, vm.SelectedGameType);
+        Assert.Empty(vm.ContentName);
+        Assert.Empty(vm.SourcePath);
+        Assert.Empty(vm.FileTree);
+        Assert.False(vm.IsEditing);
+        Assert.False(vm.CanAdd);
+        Assert.False(vm.ShowExecutableSelection);
+        Assert.Null(vm.SelectedExecutableItem);
+        Assert.Equal(0, vm.ExecutableCount);
+        Assert.Equal("Add Local Content", vm.DialogTitle);
+        Assert.Equal("Add to Library", vm.ActionButtonText);
+        Assert.Contains(ContentType.GameClient, AddLocalContentViewModel.AllowedContentTypes);
+        Assert.Contains(ContentType.ModdingTool, AddLocalContentViewModel.AllowedContentTypes);
+        Assert.Contains(ContentType.Executable, AddLocalContentViewModel.AllowedContentTypes);
+    }
+
+    /// <summary>
+    /// Verifies that PreviewIdleText changes based on SelectedContentType.
+    /// </summary>
+    /// <param name="type">The content type under test.</param>
+    /// <param name="expectedText">The expected idle description text.</param>
+    [Theory]
+    [InlineData(ContentType.Mod, "Import mod content (e.g. .big, .zip)")]
+    [InlineData(ContentType.GameClient, "Import GameClient")]
+    [InlineData(ContentType.Executable, "Import executable")]
+    [InlineData(ContentType.ModdingTool, "Import tool executable")]
+    [InlineData(ContentType.Patch, "Import patch")]
+    [InlineData(ContentType.Addon, "Import addon content")]
+    [InlineData(ContentType.Map, "Import map files")]
+    [InlineData(ContentType.MapPack, "Import map pack files")]
+    [InlineData(ContentType.Mission, "Import mission content")]
+    public void PreviewIdleText_ReturnsExpectedDescriptions(ContentType type, string expectedText)
+    {
+        var vm = CreateViewModel();
+        vm.SelectedContentType = type;
+
+        Assert.Equal(expectedText, vm.PreviewIdleText);
+    }
+
+    /// <summary>
+    /// Verifies that ShowExecutableSelection is true when ExecutableCount > 0 for GameClient, ModdingTool, and Executable.
+    /// </summary>
+    /// <param name="contentType">The content type under test.</param>
+    /// <param name="executableCount">The number of detected executables.</param>
+    /// <param name="expectedShow">The expected boolean indicating whether executable selection is shown.</param>
+    [Theory]
+    [InlineData(ContentType.GameClient, 1, true)]
+    [InlineData(ContentType.GameClient, 2, true)]
+    [InlineData(ContentType.ModdingTool, 1, true)]
+    [InlineData(ContentType.ModdingTool, 2, true)]
+    [InlineData(ContentType.Executable, 1, true)]
+    [InlineData(ContentType.Executable, 2, true)]
+    [InlineData(ContentType.GameClient, 0, false)]
+    [InlineData(ContentType.ModdingTool, 0, false)]
+    [InlineData(ContentType.Executable, 0, false)]
+    [InlineData(ContentType.Mod, 1, false)]
+    [InlineData(ContentType.Mod, 2, false)]
+    [InlineData(ContentType.Patch, 1, false)]
+    [InlineData(ContentType.Map, 1, false)]
+    public void ShowExecutableSelection_EvaluatesCorrectly_BasedOnContentTypeAndExecutableCount(
+        ContentType contentType,
+        int executableCount,
+        bool expectedShow)
+    {
+        var vm = CreateViewModel();
+        vm.SelectedContentType = contentType;
+        vm.ExecutableCount = executableCount;
+
+        Assert.Equal(expectedShow, vm.ShowExecutableSelection);
+    }
+
+    /// <summary>
+    /// Verifies that importing a directory with an executable auto-selects the executable for GameClient.
+    /// </summary>
+    /// <returns>A task representing the asynchronous test.</returns>
+    [Fact]
+    public async Task ImportContentAsync_WithSingleExecutable_ForGameClient_AutoSelectsExecutable()
+    {
+        var tempDir = CreateTempDirectory();
+        var exePath = Path.Combine(tempDir, "generals.exe");
+        var dataPath = Path.Combine(tempDir, "data.ini");
+        File.WriteAllText(exePath, "fake-exe-content");
+        File.WriteAllText(dataPath, "fake-data");
+
+        var vm = CreateViewModel();
+        vm.SelectedContentType = ContentType.GameClient;
+
+        await vm.ImportContentAsync(tempDir);
+
+        Assert.Equal(1, vm.ExecutableCount);
+        Assert.True(vm.ShowExecutableSelection);
+        Assert.NotNull(vm.SelectedExecutableItem);
+        Assert.Equal("generals.exe", vm.SelectedExecutableItem!.Name);
+        Assert.True(vm.SelectedExecutableItem.IsSelectedExecutable);
+    }
+
+    /// <summary>
+    /// Verifies that importing a directory with an executable auto-selects the executable for ModdingTool.
+    /// </summary>
+    /// <returns>A task representing the asynchronous test.</returns>
+    [Fact]
+    public async Task ImportContentAsync_WithSingleExecutable_ForModdingTool_AutoSelectsExecutable()
+    {
+        var tempDir = CreateTempDirectory();
+        var exePath = Path.Combine(tempDir, "FinalBIG.exe");
+        var dataPath = Path.Combine(tempDir, "readme.txt");
+        File.WriteAllText(exePath, "fake-exe-content");
+        File.WriteAllText(dataPath, "read me");
+
+        var vm = CreateViewModel();
+        vm.SelectedContentType = ContentType.ModdingTool;
+
+        await vm.ImportContentAsync(tempDir);
+
+        Assert.Equal(1, vm.ExecutableCount);
+        Assert.True(vm.ShowExecutableSelection);
+        Assert.NotNull(vm.SelectedExecutableItem);
+        Assert.Equal("FinalBIG.exe", vm.SelectedExecutableItem!.Name);
+        Assert.True(vm.SelectedExecutableItem.IsSelectedExecutable);
+    }
+
+    /// <summary>
+    /// Verifies that importing a directory with an executable auto-selects the executable for Executable.
+    /// </summary>
+    /// <returns>A task representing the asynchronous test.</returns>
+    [Fact]
+    public async Task ImportContentAsync_WithSingleExecutable_ForExecutable_AutoSelectsExecutable()
+    {
+        var tempDir = CreateTempDirectory();
+        var exePath = Path.Combine(tempDir, "WorldBuilder.exe");
+        File.WriteAllText(exePath, "fake-exe-content");
+
+        var vm = CreateViewModel();
+        vm.SelectedContentType = ContentType.Executable;
+
+        await vm.ImportContentAsync(tempDir);
+
+        Assert.Equal(1, vm.ExecutableCount);
+        Assert.True(vm.ShowExecutableSelection);
+        Assert.NotNull(vm.SelectedExecutableItem);
+        Assert.Equal("WorldBuilder.exe", vm.SelectedExecutableItem!.Name);
+        Assert.True(vm.SelectedExecutableItem.IsSelectedExecutable);
+    }
+
+    /// <summary>
+    /// Verifies that switching to an executable content type triggers auto-selection if an executable is in the tree.
+    /// </summary>
+    /// <param name="newType">The executable content type to switch to.</param>
+    /// <returns>A task representing the asynchronous test.</returns>
+    [Theory]
+    [InlineData(ContentType.GameClient)]
+    [InlineData(ContentType.ModdingTool)]
+    [InlineData(ContentType.Executable)]
+    public async Task SelectedContentTypeChanged_ToExecutableType_AutoSelectsFirstExecutable(ContentType newType)
+    {
+        var tempDir = CreateTempDirectory();
+        var exePath = Path.Combine(tempDir, "Launcher.exe");
+        File.WriteAllText(exePath, "fake-exe-content");
+
+        var vm = CreateViewModel();
+        vm.SelectedContentType = ContentType.Mod;
+
+        await vm.ImportContentAsync(tempDir);
+
+        // When imported as Mod, no auto-selection happened
+        Assert.Null(vm.SelectedExecutableItem);
+        Assert.False(vm.ShowExecutableSelection);
+
+        // Switch to executable type
+        vm.SelectedContentType = newType;
+
+        Assert.NotNull(vm.SelectedExecutableItem);
+        Assert.Equal("Launcher.exe", vm.SelectedExecutableItem!.Name);
+        Assert.True(vm.SelectedExecutableItem.IsSelectedExecutable);
+        Assert.True(vm.ShowExecutableSelection);
+    }
+
+    /// <summary>
+    /// Verifies manual selection of an executable via SelectExecutableCommand.
+    /// </summary>
+    /// <returns>A task representing the asynchronous test.</returns>
+    [Fact]
+    public async Task SelectExecutableCommand_SwitchesSelectedExecutable()
+    {
+        var tempDir = CreateTempDirectory();
+        var exe1Path = Path.Combine(tempDir, "Primary.exe");
+        var exe2Path = Path.Combine(tempDir, "Secondary.exe");
+        File.WriteAllText(exe1Path, "fake-exe-1");
+        File.WriteAllText(exe2Path, "fake-exe-2");
+
+        var vm = CreateViewModel();
+        vm.SelectedContentType = ContentType.ModdingTool;
+
+        await vm.ImportContentAsync(tempDir);
+
+        Assert.Equal(2, vm.ExecutableCount);
+        Assert.NotNull(vm.SelectedExecutableItem);
+
+        var initialSelected = vm.SelectedExecutableItem!;
+        var otherItem = FindInTree(vm.FileTree, f => f != initialSelected && f.IsExecutable);
+        Assert.NotNull(otherItem);
+        Assert.False(otherItem!.IsSelectedExecutable);
+
+        // Select the other executable
+        vm.SelectExecutableCommand.Execute(otherItem);
+
+        Assert.Equal(otherItem.Name, vm.SelectedExecutableItem.Name);
+        Assert.True(otherItem.IsSelectedExecutable);
+        Assert.False(initialSelected.IsSelectedExecutable);
+    }
+
+    /// <summary>
+    /// Verifies that SelectExecutableCommand ignores non-executable files.
+    /// </summary>
+    /// <returns>A task representing the asynchronous test.</returns>
+    [Fact]
+    public async Task SelectExecutableCommand_IgnoresNonExecutableItem()
+    {
+        var tempDir = CreateTempDirectory();
+        var exePath = Path.Combine(tempDir, "Tool.exe");
+        var txtPath = Path.Combine(tempDir, "Doc.txt");
+        File.WriteAllText(exePath, "fake-exe");
+        File.WriteAllText(txtPath, "text");
+
+        var vm = CreateViewModel();
+        vm.SelectedContentType = ContentType.Executable;
+
+        await vm.ImportContentAsync(tempDir);
+
+        Assert.Equal("Tool.exe", vm.SelectedExecutableItem?.Name);
+
+        var txtItem = FindInTree(vm.FileTree, f => f.Name == "Doc.txt");
+        Assert.NotNull(txtItem);
+        Assert.False(txtItem!.IsExecutable);
+
+        vm.SelectExecutableCommand.Execute(txtItem);
+
+        // Should still be Tool.exe
+        Assert.Equal("Tool.exe", vm.SelectedExecutableItem?.Name);
+        Assert.False(txtItem.IsSelectedExecutable);
+    }
+
+    /// <summary>
+    /// Verifies that CanAdd validation requires an executable for GameClient, ModdingTool, and Executable.
+    /// </summary>
+    /// <param name="type">The executable content type under test.</param>
+    /// <returns>A task representing the asynchronous test.</returns>
+    [Theory]
+    [InlineData(ContentType.GameClient)]
+    [InlineData(ContentType.ModdingTool)]
+    [InlineData(ContentType.Executable)]
+    public async Task Validation_CanAdd_RequiresExecutable_ForExecutableTypes(ContentType type)
+    {
+        var tempDir = CreateTempDirectory();
+        var txtPath = Path.Combine(tempDir, "config.ini");
+        File.WriteAllText(txtPath, "config");
+
+        var vm = CreateViewModel();
+        vm.SelectedContentType = type;
+        vm.ContentName = "Test Tool";
+
+        await vm.ImportContentAsync(tempDir);
+
+        // No executable found, so CanAdd should be false
+        Assert.Null(vm.SelectedExecutableItem);
+        Assert.False(vm.CanAdd);
+    }
+
+    /// <summary>
+    /// Verifies that CanAdd is true for non-executable types without an executable.
+    /// </summary>
+    /// <param name="type">The non-executable content type under test.</param>
+    /// <returns>A task representing the asynchronous test.</returns>
+    [Theory]
+    [InlineData(ContentType.Mod)]
+    [InlineData(ContentType.Patch)]
+    [InlineData(ContentType.Addon)]
+    [InlineData(ContentType.Map)]
+    [InlineData(ContentType.MapPack)]
+    [InlineData(ContentType.Mission)]
+    public async Task Validation_CanAdd_DoesNotRequireExecutable_ForNonExecutableTypes(ContentType type)
+    {
+        var tempDir = CreateTempDirectory();
+        var txtPath = Path.Combine(tempDir, "mod_data.big");
+        File.WriteAllText(txtPath, "big archive data");
+
+        var vm = CreateViewModel();
+        vm.SelectedContentType = type;
+        vm.ContentName = "Test Mod";
+
+        await vm.ImportContentAsync(tempDir);
+
+        Assert.True(vm.CanAdd);
+    }
+
+    /// <summary>
+    /// Verifies that CanAdd is true when an executable is present for GameClient, ModdingTool, and Executable.
+    /// </summary>
+    /// <param name="type">The executable content type under test.</param>
+    /// <returns>A task representing the asynchronous test.</returns>
+    [Theory]
+    [InlineData(ContentType.GameClient)]
+    [InlineData(ContentType.ModdingTool)]
+    [InlineData(ContentType.Executable)]
+    public async Task Validation_CanAdd_IsTrue_WhenExecutableIsPresent(ContentType type)
+    {
+        var tempDir = CreateTempDirectory();
+        var exePath = Path.Combine(tempDir, "Main.exe");
+        File.WriteAllText(exePath, "exe content");
+
+        var vm = CreateViewModel();
+        vm.SelectedContentType = type;
+        vm.ContentName = "Test Item";
+
+        await vm.ImportContentAsync(tempDir);
+
+        Assert.NotNull(vm.SelectedExecutableItem);
+        Assert.True(vm.CanAdd);
+    }
+
+    /// <summary>
+    /// Verifies that AddContentCommand forwards the relative entry point to ILocalContentService.CreateLocalContentManifestAsync.
+    /// </summary>
+    /// <returns>A task representing the asynchronous test.</returns>
+    [Fact]
+    public async Task AddContentCommand_PassesEntryPoint_ToCreateLocalContentManifestAsync()
+    {
+        var tempDir = CreateTempDirectory();
+        var exePath = Path.Combine(tempDir, "Game.exe");
+        File.WriteAllText(exePath, "exe");
+
+        string? capturedEntryPoint = null;
+        _localContentServiceMock
+            .Setup(x => x.CreateLocalContentManifestAsync(
+                It.IsAny<string>(),
+                It.IsAny<string>(),
+                It.IsAny<ContentType>(),
+                It.IsAny<GameType>(),
+                It.IsAny<string?>(),
+                It.IsAny<IProgress<ContentStorageProgress>?>(),
+                It.IsAny<CancellationToken>(),
+                It.IsAny<string?>()))
+            .Callback<string, string, ContentType, GameType, string?, IProgress<ContentStorageProgress>?, CancellationToken, string?>(
+                (_, _, _, _, _, _, _, entryPoint) => capturedEntryPoint = entryPoint)
+            .ReturnsAsync(OperationResult<ContentManifest>.CreateSuccess(new ContentManifest
+            {
+                Id = ManifestId.Create("1.0.local.gameclient.test"),
+                Name = "Test Game Client",
+                ContentType = ContentType.GameClient,
+                TargetGame = GameType.ZeroHour,
+                EntryPoint = "Game.exe",
+            }));
+
+        var vm = CreateViewModel();
+        vm.SelectedContentType = ContentType.GameClient;
+        vm.ContentName = "Test Game Client";
+
+        // Import individual file so it lands at the root of staging
+        await vm.ImportContentAsync(exePath);
+
+        Assert.True(vm.CanAdd);
+
+        await vm.AddContentCommand.ExecuteAsync(null);
+
+        Assert.Equal("Game.exe", capturedEntryPoint);
+        Assert.NotNull(vm.CreatedContentItem);
+    }
+
+    /// <summary>
+    /// Verifies that AddContentCommand with nested executable passes correct relative path as entryPoint.
+    /// </summary>
+    /// <returns>A task representing the asynchronous test.</returns>
+    [Fact]
+    public async Task AddContentCommand_WithNestedExecutable_PassesRelativePathEntryPoint()
+    {
+        var tempDir = CreateTempDirectory();
+        var subDir = Path.Combine(tempDir, "bin");
+        Directory.CreateDirectory(subDir);
+        var exePath = Path.Combine(subDir, "tool.exe");
+        File.WriteAllText(exePath, "tool exe");
+
+        string? capturedEntryPoint = null;
+        _localContentServiceMock
+            .Setup(x => x.CreateLocalContentManifestAsync(
+                It.IsAny<string>(),
+                It.IsAny<string>(),
+                It.IsAny<ContentType>(),
+                It.IsAny<GameType>(),
+                It.IsAny<string?>(),
+                It.IsAny<IProgress<ContentStorageProgress>?>(),
+                It.IsAny<CancellationToken>(),
+                It.IsAny<string?>()))
+            .Callback<string, string, ContentType, GameType, string?, IProgress<ContentStorageProgress>?, CancellationToken, string?>(
+                (_, _, _, _, _, _, _, entryPoint) => capturedEntryPoint = entryPoint)
+            .ReturnsAsync(OperationResult<ContentManifest>.CreateSuccess(new ContentManifest
+            {
+                Id = ManifestId.Create("1.0.local.moddingtool.tool"),
+                Name = "My Tool",
+                ContentType = ContentType.ModdingTool,
+                TargetGame = GameType.ZeroHour,
+            }));
+
+        var vm = CreateViewModel();
+        vm.SelectedContentType = ContentType.ModdingTool;
+        vm.ContentName = "My Tool";
+
+        await vm.ImportContentAsync(tempDir);
+
+        Assert.NotNull(vm.SelectedExecutableItem);
+
+        await vm.AddContentCommand.ExecuteAsync(null);
+
+        var dirName = Path.GetFileName(tempDir);
+        Assert.Equal($"{dirName}/bin/tool.exe", capturedEntryPoint);
+    }
+
+    /// <summary>
+    /// Verifies that LoadFromManifestAsync preserves the manifest EntryPoint when reloading for edit.
+    /// </summary>
+    /// <returns>A task representing the asynchronous test.</returns>
+    [Fact]
+    public async Task LoadFromManifestAsync_PreservesManifestEntryPoint()
+    {
+        var manifestId = ManifestId.Create("1.0.local.gameclient.zh");
+
+        var manifest = new ContentManifest
+        {
+            Id = manifestId,
+            Name = "ZH Client",
+            ContentType = ContentType.GameClient,
+            TargetGame = GameType.ZeroHour,
+            EntryPoint = "special.exe",
+            Files =
+            [
+                new ManifestFile { RelativePath = "special.exe", IsExecutable = true },
+                new ManifestFile { RelativePath = "bin/decoy.exe", IsExecutable = true },
+            ],
+        };
+
+        _contentStorageServiceMock
+            .Setup(x => x.RetrieveContentAsync(
+                It.IsAny<ManifestId>(),
+                It.IsAny<string>(),
+                It.IsAny<CancellationToken>()))
+            .Callback<ManifestId, string, CancellationToken>((_, targetPath, _) =>
+            {
+                Directory.CreateDirectory(targetPath);
+                File.WriteAllText(Path.Combine(targetPath, "special.exe"), "exe");
+                var targetSub = Path.Combine(targetPath, "bin");
+                Directory.CreateDirectory(targetSub);
+                File.WriteAllText(Path.Combine(targetSub, "decoy.exe"), "decoy");
+            })
+            .ReturnsAsync((ManifestId _, string targetPath, CancellationToken _) => OperationResult<string>.CreateSuccess(targetPath));
+
+        string? capturedEntryPoint = null;
+        _localContentServiceMock
+            .Setup(x => x.UpdateLocalContentManifestAsync(
+                It.IsAny<string>(),
+                It.IsAny<string>(),
+                It.IsAny<string>(),
+                It.IsAny<ContentType>(),
+                It.IsAny<GameType>(),
+                It.IsAny<string?>(),
+                It.IsAny<IProgress<ContentStorageProgress>?>(),
+                It.IsAny<CancellationToken>(),
+                It.IsAny<string?>()))
+            .Callback<string, string, string, ContentType, GameType, string?, IProgress<ContentStorageProgress>?, CancellationToken, string?>(
+                (_, _, _, _, _, _, _, _, entryPoint) => capturedEntryPoint = entryPoint)
+            .ReturnsAsync(OperationResult<ContentManifest>.CreateSuccess(manifest));
+
+        var item = new GenHub.Features.GameProfiles.ViewModels.ContentDisplayItem
+        {
+            Id = manifestId.Value,
+            ManifestId = manifestId,
+            DisplayName = "ZH Client",
+            ContentType = ContentType.GameClient,
+            GameType = GameType.ZeroHour,
+            InstallationType = GameInstallationType.Unknown,
+            Manifest = manifest,
+        };
+
+        var vm = CreateViewModel();
+        await vm.LoadFromManifestAsync(item);
+
+        Assert.NotNull(vm.SelectedExecutableItem);
+        Assert.Equal("special.exe", vm.SelectedExecutableItem.Name);
+
+        await vm.AddContentCommand.ExecuteAsync(null);
+        Assert.Equal("special.exe", capturedEntryPoint);
+    }
+
+    /// <summary>
+    /// Verifies that deleting an unrelated item preserves the previously selected executable.
+    /// </summary>
+    /// <returns>A task representing the asynchronous test.</returns>
+    [Fact]
+    public async Task DeleteItemAsync_PreservesSelectedExecutable()
+    {
+        var tempDir = CreateTempDirectory();
+        File.WriteAllText(Path.Combine(tempDir, "first.exe"), "first");
+        File.WriteAllText(Path.Combine(tempDir, "second.exe"), "second");
+        File.WriteAllText(Path.Combine(tempDir, "readme.txt"), "readme");
+
+        var vm = CreateViewModel();
+        vm.SelectedContentType = ContentType.GameClient;
+        vm.ContentName = "Test Client";
+        await vm.ImportContentAsync(tempDir);
+
+        var secondExe = FindInTree(vm.FileTree, f => f.Name == "second.exe");
+        Assert.NotNull(secondExe);
+        vm.SelectExecutableCommand.Execute(secondExe);
+        Assert.Equal("second.exe", vm.SelectedExecutableItem?.Name);
+
+        var readme = FindInTree(vm.FileTree, f => f.Name == "readme.txt");
+        Assert.NotNull(readme);
+        await vm.DeleteItemCommand.ExecuteAsync(readme);
+
+        Assert.NotNull(vm.SelectedExecutableItem);
+        Assert.Equal("second.exe", vm.SelectedExecutableItem.Name);
+    }
+
+    /// <summary>
+    /// Verifies that deleting the currently selected executable falls back to auto-selecting the remaining executable.
+    /// </summary>
+    /// <returns>A task representing the asynchronous test.</returns>
+    [Fact]
+    public async Task DeleteItemAsync_WhenSelectedExecutableDeleted_FallsBackToRemainingExecutable()
+    {
+        var tempDir = CreateTempDirectory();
+        File.WriteAllText(Path.Combine(tempDir, "first.exe"), "first");
+        File.WriteAllText(Path.Combine(tempDir, "second.exe"), "second");
+        File.WriteAllText(Path.Combine(tempDir, "readme.txt"), "readme");
+
+        var vm = CreateViewModel();
+        vm.SelectedContentType = ContentType.GameClient;
+        vm.ContentName = "Test Client";
+        await vm.ImportContentAsync(tempDir);
+
+        var secondExe = FindInTree(vm.FileTree, f => f.Name == "second.exe");
+        Assert.NotNull(secondExe);
+        vm.SelectExecutableCommand.Execute(secondExe);
+        Assert.Equal("second.exe", vm.SelectedExecutableItem?.Name);
+
+        await vm.DeleteItemCommand.ExecuteAsync(secondExe);
+
+        Assert.NotNull(vm.SelectedExecutableItem);
+        Assert.Equal("first.exe", vm.SelectedExecutableItem.Name);
+    }
+
+    /// <summary>
+    /// Verifies that switching content type away from executable and back preserves the selected entry point.
+    /// </summary>
+    /// <returns>A task representing the asynchronous test.</returns>
+    [Fact]
+    public async Task ContentTypeChanged_SwitchAwayAndBack_PreservesSelectedExecutable()
+    {
+        var tempDir = CreateTempDirectory();
+        File.WriteAllText(Path.Combine(tempDir, "first.exe"), "first");
+        File.WriteAllText(Path.Combine(tempDir, "second.exe"), "second");
+
+        var vm = CreateViewModel();
+        vm.SelectedContentType = ContentType.GameClient;
+        vm.ContentName = "Test Client";
+        await vm.ImportContentAsync(tempDir);
+
+        var secondExe = FindInTree(vm.FileTree, f => f.Name == "second.exe");
+        Assert.NotNull(secondExe);
+        vm.SelectExecutableCommand.Execute(secondExe);
+        Assert.Equal("second.exe", vm.SelectedExecutableItem?.Name);
+
+        // Switch to Mod (non-executable type)
+        vm.SelectedContentType = ContentType.Mod;
+        Assert.Null(vm.SelectedExecutableItem);
+
+        // Switch back to GameClient (executable type)
+        vm.SelectedContentType = ContentType.GameClient;
+        Assert.NotNull(vm.SelectedExecutableItem);
+        Assert.Equal("second.exe", vm.SelectedExecutableItem.Name);
+    }
+
+    /// <summary>
+    /// Verifies that BuildDirectoryTree prioritizes directories containing executables over non-executable directories.
+    /// </summary>
+    /// <returns>A task representing the asynchronous test.</returns>
+    [Fact]
+    public async Task BuildDirectoryTree_PrioritizesDirectoriesWithExecutables()
+    {
+        var tempDir = CreateTempDirectory();
+
+        // Create 25 directories named folder01 to folder25
+        for (var i = 1; i <= 25; i++)
+        {
+            var folder = Path.Combine(tempDir, $"folder{i:D2}");
+            Directory.CreateDirectory(folder);
+            File.WriteAllText(Path.Combine(folder, "data.txt"), "content");
+        }
+
+        // Put an executable only in the 25th folder
+        var targetFolder = Path.Combine(tempDir, "folder25");
+        File.WriteAllText(Path.Combine(targetFolder, "game.exe"), "executable");
+
+        var vm = CreateViewModel();
+        vm.SelectedContentType = ContentType.GameClient;
+        vm.ContentName = "Test Client";
+        await vm.ImportContentAsync(tempDir);
+
+        var folder25 = FindInTree(vm.FileTree, f => f.Name == "folder25");
+        Assert.NotNull(folder25);
+
+        var exe = FindInTree(folder25.Children, f => f.Name == "game.exe");
+        Assert.NotNull(exe);
+        Assert.True(exe.IsExecutable);
+    }
+
+    /// <summary>
+    /// Verifies that switching from an executable type to a non-executable type clears the selected executable.
+    /// </summary>
+    /// <returns>A task representing the asynchronous test.</returns>
+    [Fact]
+    public async Task ContentTypeChanged_FromExecutableToNonExecutable_ClearsSelectedExecutable()
+    {
+        var tempDir = CreateTempDirectory();
+        File.WriteAllText(Path.Combine(tempDir, "game.exe"), "game");
+
+        var vm = CreateViewModel();
+        vm.SelectedContentType = ContentType.GameClient;
+        vm.ContentName = "Test Client";
+        await vm.ImportContentAsync(tempDir);
+
+        Assert.NotNull(vm.SelectedExecutableItem);
+
+        vm.SelectedContentType = ContentType.Mod;
+
+        Assert.Null(vm.SelectedExecutableItem);
+    }
+
+    /// <summary>
+    /// Verifies that AddContentCommand with non-executable content type passes null as entryPoint.
+    /// </summary>
+    /// <returns>A task representing the asynchronous test.</returns>
+    [Fact]
+    public async Task AddContentCommand_WhenNonExecutableType_PassesNullEntryPoint()
+    {
+        var tempDir = CreateTempDirectory();
+        File.WriteAllText(Path.Combine(tempDir, "somefile.txt"), "text");
+
+        string? capturedEntryPoint = "INITIAL";
+        _localContentServiceMock
+            .Setup(x => x.CreateLocalContentManifestAsync(
+                It.IsAny<string>(),
+                It.IsAny<string>(),
+                It.IsAny<ContentType>(),
+                It.IsAny<GameType>(),
+                It.IsAny<string?>(),
+                It.IsAny<IProgress<ContentStorageProgress>?>(),
+                It.IsAny<CancellationToken>(),
+                It.IsAny<string?>()))
+            .Callback<string, string, ContentType, GameType, string?, IProgress<ContentStorageProgress>?, CancellationToken, string?>(
+                (_, _, _, _, _, _, _, entryPoint) => capturedEntryPoint = entryPoint)
+            .ReturnsAsync(OperationResult<ContentManifest>.CreateSuccess(new ContentManifest
+            {
+                Id = ManifestId.Create("1.0.local.mod.test"),
+                Name = "My Mod",
+                ContentType = ContentType.Mod,
+                TargetGame = GameType.ZeroHour,
+            }));
+
+        var vm = CreateViewModel();
+        vm.SelectedContentType = ContentType.Mod;
+        vm.ContentName = "My Mod";
+        await vm.ImportContentAsync(tempDir);
+
+        await vm.AddContentCommand.ExecuteAsync(null);
+
+        Assert.Null(capturedEntryPoint);
+    }
+
+    private static FileTreeItem? FindInTree(IEnumerable<FileTreeItem> items, Func<FileTreeItem, bool> predicate)
+    {
+        foreach (var item in items)
+        {
+            if (predicate(item)) return item;
+            var child = FindInTree(item.Children, predicate);
+            if (child != null) return child;
+        }
+
+        return null;
+    }
+
+    private string CreateTempDirectory()
+    {
+        var path = Path.Combine(Path.GetTempPath(), "AddLocalContentVmTests_" + Guid.NewGuid().ToString("N"));
+        Directory.CreateDirectory(path);
+        _tempDirectories.Add(path);
+        return path;
+    }
+
+    private AddLocalContentViewModel CreateViewModel()
+    {
+        var vm = new AddLocalContentViewModel(
+            _localContentServiceMock.Object,
+            _contentStorageServiceMock.Object,
+            _normalizationServiceMock.Object,
+            _dialogServiceMock.Object,
+            NullLogger<AddLocalContentViewModel>.Instance);
+        _viewModels.Add(vm);
+        return vm;
+    }
+}
diff --git a/GenHub/GenHub.Tests/GenHub.Tests.Core/Features/GameProfiles/ViewModels/MainViewModelTests.cs b/GenHub/GenHub.Tests/GenHub.Tests.Core/Features/GameProfiles/ViewModels/MainViewModelTests.cs
index ec8f7c927..ac6b1e057 100644
--- a/GenHub/GenHub.Tests/GenHub.Tests.Core/Features/GameProfiles/ViewModels/MainViewModelTests.cs
+++ b/GenHub/GenHub.Tests/GenHub.Tests.Core/Features/GameProfiles/ViewModels/MainViewModelTests.cs
@@ -1,5 +1,6 @@
 using System.Reactive.Linq;
 using GenHub.Common.ViewModels;
+using GenHub.Core.Constants;
 using GenHub.Core.Interfaces.Common;
 using GenHub.Core.Interfaces.GameInstallations;
 using GenHub.Core.Interfaces.GameProfiles;
@@ -14,6 +15,8 @@
 using GenHub.Core.Interfaces.Tools;
 using GenHub.Core.Interfaces.UserData;
 using GenHub.Core.Interfaces.Workspace;
+using GenHub.Core.Messages;
+using GenHub.Core.Models.AppUpdate;
 using GenHub.Core.Models.Common;
 using GenHub.Core.Models.Enums;
 using GenHub.Core.Models.Notifications;
@@ -160,6 +163,368 @@ public async Task InitializeAsync_MultipleCallsAreSafeAsync()
         Assert.True(true);
     }
 
+    /// <summary>
+    /// Tests that receiving <see cref="UpdateSettingsChangedMessage"/> updates periodic update timer settings without throwing.
+    /// </summary>
+    [Fact]
+    public void Receive_UpdateSettingsChangedMessage_UpdatesPeriodicTimer()
+    {
+        // Arrange
+        var (settingsVm, userSettingsMock) = CreateSettingsVm();
+        var toolsVm = CreateToolsVm();
+        var configProvider = CreateConfigProviderMock();
+        var mockVelopackUpdateManager = new Mock<IVelopackUpdateManager>();
+        var mockLogger = new Mock<ILogger<MainViewModel>>();
+        var mockNotificationService = CreateNotificationServiceMock();
+        var mockNotificationManager = new Mock<NotificationManagerViewModel>(
+            mockNotificationService.Object,
+            Mock.Of<ILogger<NotificationManagerViewModel>>(),
+            Mock.Of<ILogger<NotificationItemViewModel>>());
+        var notificationFeedVm = CreateNotificationFeedViewModel(mockNotificationService.Object);
+
+        var vm = new MainViewModel(
+            gameProfilesViewModel: CreateGameProfileLauncherViewModel(),
+            downloadsViewModel: CreateDownloadsViewModel(configProvider),
+            toolsViewModel: toolsVm,
+            settingsViewModel: settingsVm,
+            notificationManager: mockNotificationManager.Object,
+            configurationProvider: configProvider,
+            userSettingsService: userSettingsMock.Object,
+            velopackUpdateManager: mockVelopackUpdateManager.Object,
+            notificationService: mockNotificationService.Object,
+            dialogService: new Mock<IDialogService>().Object,
+            notificationFeedViewModel: notificationFeedVm,
+            infoViewModel: CreateInfoViewModel(),
+            logger: mockLogger.Object);
+
+        // Act & Assert (should not throw when enabling/disabling or changing interval)
+        vm.Receive(new UpdateSettingsChangedMessage(false, true, 30));
+        vm.Receive(new UpdateSettingsChangedMessage(false, false, 30));
+        Assert.True(true);
+    }
+
+    /// <summary>
+    /// Tests that when AutoCheckForUpdatesOnStartup is false, background update check is not triggered on initialize.
+    /// </summary>
+    /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
+    [Fact]
+    public async Task InitializeAsync_WhenAutoCheckForUpdatesOnStartupFalse_DoesNotCheckUpdatesOnStartupAsync()
+    {
+        // Arrange
+        var (settingsVm, userSettingsMock) = CreateSettingsVm();
+        userSettingsMock.Setup(x => x.Get()).Returns(new UserSettings
+        {
+            AutoCheckForUpdatesOnStartup = false,
+            AutoCheckForUpdatesPeriodically = false,
+            SubscribedBranch = "main",
+        });
+        var toolsVm = CreateToolsVm();
+        var configProvider = CreateConfigProviderMock();
+        var mockVelopackUpdateManager = new Mock<IVelopackUpdateManager>();
+        var mockLogger = new Mock<ILogger<MainViewModel>>();
+        var mockNotificationService = CreateNotificationServiceMock();
+        var mockNotificationManager = new Mock<NotificationManagerViewModel>(
+            mockNotificationService.Object,
+            Mock.Of<ILogger<NotificationManagerViewModel>>(),
+            Mock.Of<ILogger<NotificationItemViewModel>>());
+        var notificationFeedVm = CreateNotificationFeedViewModel(mockNotificationService.Object);
+
+        var vm = new MainViewModel(
+            gameProfilesViewModel: CreateGameProfileLauncherViewModel(),
+            downloadsViewModel: CreateDownloadsViewModel(configProvider),
+            toolsViewModel: toolsVm,
+            settingsViewModel: settingsVm,
+            notificationManager: mockNotificationManager.Object,
+            configurationProvider: configProvider,
+            userSettingsService: userSettingsMock.Object,
+            velopackUpdateManager: mockVelopackUpdateManager.Object,
+            notificationService: mockNotificationService.Object,
+            dialogService: new Mock<IDialogService>().Object,
+            notificationFeedViewModel: notificationFeedVm,
+            infoViewModel: CreateInfoViewModel(),
+            logger: mockLogger.Object);
+
+        await vm.InitializeAsync();
+        await Task.Delay(100);
+
+        mockVelopackUpdateManager.Verify(x => x.CheckForArtifactUpdatesAsync(It.IsAny<System.Threading.CancellationToken>()), Times.Never);
+        mockVelopackUpdateManager.Verify(x => x.CheckForUpdatesAsync(It.IsAny<System.Threading.CancellationToken>()), Times.Never);
+    }
+
+    /// <summary>
+    /// Tests that background update check queries artifact updates when subscribed to a PR.
+    /// </summary>
+    /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
+    [Fact]
+    public async Task InitializeAsync_WhenSubscribedToPr_ChecksArtifactUpdatesAsync()
+    {
+        // Arrange
+        var (settingsVm, userSettingsMock) = CreateSettingsVm();
+        userSettingsMock.Setup(x => x.Get()).Returns(new UserSettings { SubscribedPrNumber = 265 });
+        var toolsVm = CreateToolsVm();
+        var configProvider = CreateConfigProviderMock();
+        var updateCheckedTcs = new TaskCompletionSource<bool>();
+        var mockVelopackUpdateManager = new Mock<IVelopackUpdateManager>();
+        mockVelopackUpdateManager.Setup(x => x.CheckForArtifactUpdatesAsync(It.IsAny<System.Threading.CancellationToken>()))
+            .Returns(() =>
+            {
+                updateCheckedTcs.TrySetResult(true);
+                return Task.FromResult<ArtifactUpdateInfo?>(null);
+            });
+        var mockLogger = new Mock<ILogger<MainViewModel>>();
+        var mockNotificationService = CreateNotificationServiceMock();
+        var mockNotificationManager = new Mock<NotificationManagerViewModel>(
+            mockNotificationService.Object,
+            Mock.Of<ILogger<NotificationManagerViewModel>>(),
+            Mock.Of<ILogger<NotificationItemViewModel>>());
+        var notificationFeedVm = CreateNotificationFeedViewModel(mockNotificationService.Object);
+
+        var vm = new MainViewModel(
+            gameProfilesViewModel: CreateGameProfileLauncherViewModel(),
+            downloadsViewModel: CreateDownloadsViewModel(configProvider),
+            toolsViewModel: toolsVm,
+            settingsViewModel: settingsVm,
+            notificationManager: mockNotificationManager.Object,
+            configurationProvider: configProvider,
+            userSettingsService: userSettingsMock.Object,
+            velopackUpdateManager: mockVelopackUpdateManager.Object,
+            notificationService: mockNotificationService.Object,
+            dialogService: new Mock<IDialogService>().Object,
+            notificationFeedViewModel: notificationFeedVm,
+            infoViewModel: CreateInfoViewModel(),
+            logger: mockLogger.Object);
+
+        await vm.InitializeAsync();
+
+        // Await deterministic completion of background check
+        await updateCheckedTcs.Task.WaitAsync(TimeSpan.FromSeconds(5));
+
+        mockVelopackUpdateManager.Verify(x => x.CheckForArtifactUpdatesAsync(It.IsAny<System.Threading.CancellationToken>()), Times.AtLeastOnce);
+    }
+
+    /// <summary>
+    /// Tests that background update check queries artifact updates when subscribed to a branch.
+    /// </summary>
+    /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
+    [Fact]
+    public async Task InitializeAsync_WhenSubscribedToBranch_ChecksArtifactUpdatesAsync()
+    {
+        // Arrange
+        var (settingsVm, userSettingsMock) = CreateSettingsVm();
+        userSettingsMock.Setup(x => x.Get()).Returns(new UserSettings { SubscribedBranch = "main" });
+        var toolsVm = CreateToolsVm();
+        var configProvider = CreateConfigProviderMock();
+        var updateCheckedTcs = new TaskCompletionSource<bool>();
+        var mockVelopackUpdateManager = new Mock<IVelopackUpdateManager>();
+        mockVelopackUpdateManager.Setup(x => x.CheckForArtifactUpdatesAsync(It.IsAny<System.Threading.CancellationToken>()))
+            .Returns(() =>
+            {
+                updateCheckedTcs.TrySetResult(true);
+                return Task.FromResult<ArtifactUpdateInfo?>(null);
+            });
+        var mockLogger = new Mock<ILogger<MainViewModel>>();
+        var mockNotificationService = CreateNotificationServiceMock();
+        var mockNotificationManager = new Mock<NotificationManagerViewModel>(
+            mockNotificationService.Object,
+            Mock.Of<ILogger<NotificationManagerViewModel>>(),
+            Mock.Of<ILogger<NotificationItemViewModel>>());
+        var notificationFeedVm = CreateNotificationFeedViewModel(mockNotificationService.Object);
+
+        var vm = new MainViewModel(
+            gameProfilesViewModel: CreateGameProfileLauncherViewModel(),
+            downloadsViewModel: CreateDownloadsViewModel(configProvider),
+            toolsViewModel: toolsVm,
+            settingsViewModel: settingsVm,
+            notificationManager: mockNotificationManager.Object,
+            configurationProvider: configProvider,
+            userSettingsService: userSettingsMock.Object,
+            velopackUpdateManager: mockVelopackUpdateManager.Object,
+            notificationService: mockNotificationService.Object,
+            dialogService: new Mock<IDialogService>().Object,
+            notificationFeedViewModel: notificationFeedVm,
+            infoViewModel: CreateInfoViewModel(),
+            logger: mockLogger.Object);
+
+        await vm.InitializeAsync();
+
+        // Await deterministic completion of background check
+        await updateCheckedTcs.Task.WaitAsync(TimeSpan.FromSeconds(5));
+
+        mockVelopackUpdateManager.Verify(x => x.CheckForArtifactUpdatesAsync(It.IsAny<System.Threading.CancellationToken>()), Times.AtLeastOnce);
+    }
+
+    /// <summary>
+    /// Tests that background update check shows an update notification with update action and triggers progress notification on click.
+    /// </summary>
+    /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
+    [Fact]
+    public async Task InitializeAsync_WhenArtifactUpdateAvailable_ShowsNotificationWithUpdateActionAsync()
+    {
+        // Arrange
+        var (settingsVm, userSettingsMock) = CreateSettingsVm();
+        userSettingsMock.Setup(x => x.Get()).Returns(new UserSettings { SubscribedBranch = "main" });
+        var toolsVm = CreateToolsVm();
+        var configProvider = CreateConfigProviderMock();
+        var shownNotifications = new List<NotificationMessage>();
+        var notificationShownTcs = new TaskCompletionSource<NotificationMessage>();
+
+        var artifactInfo = new ArtifactUpdateInfo(
+            Version: "0.0.99999-main",
+            GitHash: "abcdef1",
+            PullRequestNumber: null,
+            WorkflowRunId: 12345,
+            WorkflowRunUrl: "https://example.com/runs/1",
+            ArtifactId: 67890,
+            ArtifactName: "genhub-velopack-linux-0.0.99999",
+            CreatedAt: DateTime.UtcNow,
+            DownloadUrl: "https://example.com/artifact.zip",
+            Size: 1024);
+
+        var installStartedTcs = new TaskCompletionSource<bool>();
+        var mockVelopackUpdateManager = new Mock<IVelopackUpdateManager>();
+        mockVelopackUpdateManager.Setup(x => x.CheckForArtifactUpdatesAsync(It.IsAny<System.Threading.CancellationToken>()))
+            .ReturnsAsync(artifactInfo);
+        mockVelopackUpdateManager.Setup(x => x.InstallArtifactAsync(
+                artifactInfo,
+                It.IsAny<IProgress<UpdateProgress>>(),
+                It.IsAny<System.Threading.CancellationToken>()))
+            .Callback(() => installStartedTcs.TrySetResult(true))
+            .Returns(Task.CompletedTask);
+
+        var mockLogger = new Mock<ILogger<MainViewModel>>();
+        var mockNotificationService = CreateNotificationServiceMock();
+        mockNotificationService.Setup(x => x.Show(It.IsAny<NotificationMessage>()))
+            .Callback<NotificationMessage>(msg =>
+            {
+                shownNotifications.Add(msg);
+                if (msg.Title == AppUpdateConstants.BranchUpdateAvailableNotificationTitle)
+                {
+                    notificationShownTcs.TrySetResult(msg);
+                }
+            });
+
+        var mockNotificationManager = new Mock<NotificationManagerViewModel>(
+            mockNotificationService.Object,
+            Mock.Of<ILogger<NotificationManagerViewModel>>(),
+            Mock.Of<ILogger<NotificationItemViewModel>>());
+        var notificationFeedVm = CreateNotificationFeedViewModel(mockNotificationService.Object);
+
+        var vm = new MainViewModel(
+            gameProfilesViewModel: CreateGameProfileLauncherViewModel(),
+            downloadsViewModel: CreateDownloadsViewModel(configProvider),
+            toolsViewModel: toolsVm,
+            settingsViewModel: settingsVm,
+            notificationManager: mockNotificationManager.Object,
+            configurationProvider: configProvider,
+            userSettingsService: userSettingsMock.Object,
+            velopackUpdateManager: mockVelopackUpdateManager.Object,
+            notificationService: mockNotificationService.Object,
+            dialogService: new Mock<IDialogService>().Object,
+            notificationFeedViewModel: notificationFeedVm,
+            infoViewModel: CreateInfoViewModel(),
+            logger: mockLogger.Object);
+
+        // Act
+        await vm.InitializeAsync();
+        var updateNotification = await notificationShownTcs.Task.WaitAsync(TimeSpan.FromSeconds(5));
+
+        // Assert
+        Assert.NotNull(updateNotification);
+        Assert.Equal(AppUpdateConstants.BranchUpdateAvailableNotificationTitle, updateNotification.Title);
+        Assert.Single(updateNotification.Actions);
+        Assert.Equal(AppUpdateConstants.UpdateAction, updateNotification.Actions[0].Text);
+
+        // Act - simulate clicking the update action button
+        updateNotification.Actions[0].Callback?.Invoke();
+
+        // Await background install execution deterministically
+        await installStartedTcs.Task.WaitAsync(TimeSpan.FromSeconds(5));
+
+        // Assert that progress notification was displayed
+        mockVelopackUpdateManager.Verify(x => x.InstallArtifactAsync(artifactInfo, It.IsAny<IProgress<UpdateProgress>>(), It.IsAny<System.Threading.CancellationToken>()), Times.Once);
+        Assert.Contains(shownNotifications, n => n.Title == AppUpdateConstants.UpdatingAppNotificationTitle);
+    }
+
+    /// <summary>
+    /// Tests that background update check does not create duplicate notifications when the same update is detected repeatedly.
+    /// </summary>
+    /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
+    [Fact]
+    public async Task InitializeAsync_WhenSameArtifactUpdateCheckedRepeatedly_DeduplicatesNotificationAsync()
+    {
+        // Arrange
+        var (settingsVm, userSettingsMock) = CreateSettingsVm();
+        userSettingsMock.Setup(x => x.Get()).Returns(new UserSettings { SubscribedBranch = "main" });
+        var toolsVm = CreateToolsVm();
+        var configProvider = CreateConfigProviderMock();
+        var shownNotifications = new List<NotificationMessage>();
+        var notificationShownTcs = new TaskCompletionSource<NotificationMessage>();
+
+        var artifactInfo = new ArtifactUpdateInfo(
+            Version: "0.0.99999-main",
+            GitHash: "abcdef1",
+            PullRequestNumber: null,
+            WorkflowRunId: 12345,
+            WorkflowRunUrl: "https://example.com/runs/1",
+            ArtifactId: 67890,
+            ArtifactName: "genhub-velopack-linux-0.0.99999",
+            CreatedAt: DateTime.UtcNow,
+            DownloadUrl: "https://example.com/artifact.zip",
+            Size: 1024);
+
+        var mockVelopackUpdateManager = new Mock<IVelopackUpdateManager>();
+        mockVelopackUpdateManager.Setup(x => x.CheckForArtifactUpdatesAsync(It.IsAny<System.Threading.CancellationToken>()))
+            .ReturnsAsync(artifactInfo);
+
+        var mockLogger = new Mock<ILogger<MainViewModel>>();
+        var mockNotificationService = CreateNotificationServiceMock();
+        mockNotificationService.Setup(x => x.Show(It.IsAny<NotificationMessage>()))
+            .Callback<NotificationMessage>(msg =>
+            {
+                shownNotifications.Add(msg);
+                if (msg.Title == AppUpdateConstants.BranchUpdateAvailableNotificationTitle)
+                {
+                    notificationShownTcs.TrySetResult(msg);
+                }
+            });
+
+        var mockNotificationManager = new Mock<NotificationManagerViewModel>(
+            mockNotificationService.Object,
+            Mock.Of<ILogger<NotificationManagerViewModel>>(),
+            Mock.Of<ILogger<NotificationItemViewModel>>());
+        var notificationFeedVm = CreateNotificationFeedViewModel(mockNotificationService.Object);
+
+        using var vm = new MainViewModel(
+            gameProfilesViewModel: CreateGameProfileLauncherViewModel(),
+            downloadsViewModel: CreateDownloadsViewModel(configProvider),
+            toolsViewModel: toolsVm,
+            settingsViewModel: settingsVm,
+            notificationManager: mockNotificationManager.Object,
+            configurationProvider: configProvider,
+            userSettingsService: userSettingsMock.Object,
+            velopackUpdateManager: mockVelopackUpdateManager.Object,
+            notificationService: mockNotificationService.Object,
+            dialogService: new Mock<IDialogService>().Object,
+            notificationFeedViewModel: notificationFeedVm,
+            infoViewModel: CreateInfoViewModel(),
+            logger: mockLogger.Object);
+
+        // Act
+        await vm.InitializeAsync();
+        await notificationShownTcs.Task.WaitAsync(TimeSpan.FromSeconds(5));
+
+        // Re-trigger update check via second initialize call and message receipt
+        vm.Receive(new UpdateSettingsChangedMessage(true, true, 5));
+        await vm.InitializeAsync();
+        await Task.Delay(200);
+
+        // Assert that branch update notification was shown exactly once
+        var branchUpdateNotifications = shownNotifications
+            .Where(n => n.Title == AppUpdateConstants.BranchUpdateAvailableNotificationTitle)
+            .ToList();
+        Assert.Single(branchUpdateNotifications);
+    }
+
     /// <summary>
     /// Tests that CurrentTabViewModel returns the correct ViewModel based on SelectedTab.
     /// </summary>
@@ -365,6 +730,7 @@ private static Mock<INotificationService> CreateNotificationServiceMock()
         mock.Setup(x => x.NotificationHistory).Returns(Observable.Empty<NotificationMessage>());
         mock.Setup(x => x.DismissRequests).Returns(Observable.Empty<Guid>());
         mock.Setup(x => x.DismissAllRequests).Returns(Observable.Empty<bool>());
+        mock.Setup(x => x.UpdateRequests).Returns(Observable.Empty<(Guid Id, string? Title, string Message)>());
         return mock;
     }
 
diff --git a/GenHub/GenHub.Tests/GenHub.Tests.Core/Features/GameProfiles/ViewModels/SettingsViewModelTests.cs b/GenHub/GenHub.Tests/GenHub.Tests.Core/Features/GameProfiles/ViewModels/SettingsViewModelTests.cs
index caadee096..5a2cd3cbb 100644
--- a/GenHub/GenHub.Tests/GenHub.Tests.Core/Features/GameProfiles/ViewModels/SettingsViewModelTests.cs
+++ b/GenHub/GenHub.Tests/GenHub.Tests.Core/Features/GameProfiles/ViewModels/SettingsViewModelTests.cs
@@ -171,6 +171,86 @@ public async Task ResetToDefaultsCommand_ResetsAllPropertiesAsync()
         Assert.Equal(3, viewModel.MaxConcurrentDownloads);
         Assert.False(viewModel.EnableDetailedLogging);
         Assert.Equal(WorkspaceConstants.DefaultWorkspaceStrategy, viewModel.DefaultWorkspaceStrategy);
+        Assert.True(viewModel.AutoCheckForUpdatesPeriodically);
+        Assert.Equal(AppUpdateConstants.DefaultPeriodicUpdateCheckIntervalMinutes, viewModel.PeriodicUpdateCheckIntervalMinutes);
+    }
+
+    /// <summary>
+    /// Verifies that periodic update settings are correctly loaded from UserSettings.
+    /// </summary>
+    [Fact]
+    public void Constructor_LoadsPeriodicUpdateSettingsFromUserSettingsService()
+    {
+        // Arrange
+        var customSettings = new UserSettings
+        {
+            AutoCheckForUpdatesPeriodically = false,
+            PeriodicUpdateCheckIntervalMinutes = 15,
+        };
+
+        _mockConfigService.Setup(x => x.Get()).Returns(customSettings);
+
+        // Act
+        var viewModel = new SettingsViewModel(
+            _mockConfigService.Object,
+            _mockLogger.Object,
+            _mockCasService.Object,
+            _mockProfileManager.Object,
+            _mockWorkspaceManager.Object,
+            _mockManifestPool.Object,
+            _mockUpdateManager.Object,
+            _mockNotificationService.Object,
+            _mockConfigurationProvider.Object,
+            _mockInstallationService.Object,
+            _mockStorageLocationService.Object,
+            _mockUserDataTracker.Object);
+
+        // Assert
+        Assert.False(viewModel.AutoCheckForUpdatesPeriodically);
+        Assert.Equal(15, viewModel.PeriodicUpdateCheckIntervalMinutes);
+    }
+
+    /// <summary>
+    /// Verifies that SaveSettingsCommand persists periodic update settings.
+    /// </summary>
+    /// <returns>A <see cref="Task"/> representing the asynchronous test operation.</returns>
+    [Fact]
+    public async Task SaveSettingsCommand_UpdatesPeriodicUpdateSettingsAsync()
+    {
+        // Arrange
+        var viewModel = new SettingsViewModel(
+            _mockConfigService.Object,
+            _mockLogger.Object,
+            _mockCasService.Object,
+            _mockProfileManager.Object,
+            _mockWorkspaceManager.Object,
+            _mockManifestPool.Object,
+            _mockUpdateManager.Object,
+            _mockNotificationService.Object,
+            _mockConfigurationProvider.Object,
+            _mockInstallationService.Object,
+            _mockStorageLocationService.Object,
+            _mockUserDataTracker.Object)
+        {
+            AutoCheckForUpdatesPeriodically = false,
+            PeriodicUpdateCheckIntervalMinutes = 45,
+        };
+
+        UserSettings? capturedSettings = null;
+        _mockConfigService.Setup(x => x.Update(It.IsAny<Action<UserSettings>>()))
+            .Callback<Action<UserSettings>>(action =>
+            {
+                capturedSettings = new UserSettings();
+                action(capturedSettings);
+            });
+
+        // Act
+        await Task.Run(() => viewModel.SaveSettingsCommand.Execute(null));
+
+        // Assert
+        Assert.NotNull(capturedSettings);
+        Assert.False(capturedSettings.AutoCheckForUpdatesPeriodically);
+        Assert.Equal(45, capturedSettings.PeriodicUpdateCheckIntervalMinutes);
     }
 
     /// <summary>
diff --git a/GenHub/GenHub.Tests/GenHub.Tests.Core/Helpers/AppUpdateVersionHelperTests.cs b/GenHub/GenHub.Tests/GenHub.Tests.Core/Helpers/AppUpdateVersionHelperTests.cs
new file mode 100644
index 000000000..84ab32157
--- /dev/null
+++ b/GenHub/GenHub.Tests/GenHub.Tests.Core/Helpers/AppUpdateVersionHelperTests.cs
@@ -0,0 +1,109 @@
+using GenHub.Core.Helpers;
+
+namespace GenHub.Tests.Core.Helpers;
+
+/// <summary>
+/// Unit tests for <see cref="AppUpdateVersionHelper"/>.
+/// </summary>
+public class AppUpdateVersionHelperTests
+{
+    /// <summary>
+    /// Tests that ExtractRunNumber extracts expected run numbers.
+    /// </summary>
+    /// <param name="version">The version string to extract the run number from.</param>
+    /// <param name="expectedRun">The expected run number.</param>
+    [Theory]
+    [InlineData("0.0.1282-pr265", 1282)]
+    [InlineData("0.0.1287-pr265", 1287)]
+    [InlineData("0.0.1287-main", 1287)]
+    [InlineData("0.0.1287-development", 1287)]
+    [InlineData("0.0.1300-fix-ci.9", 1300)]
+    [InlineData("0.0.1287", 1287)]
+    [InlineData("0.0.0-ci.500", 500)]
+    [InlineData("1.0.42", 0)]
+    [InlineData("1.2.5", 0)]
+    [InlineData("", 0)]
+    [InlineData("   ", 0)]
+    [InlineData(null, 0)]
+    [InlineData("abc", 0)]
+    public void ExtractRunNumber_WithVariousFormats_ShouldReturnExpectedNumber(string? version, int expectedRun)
+    {
+        var result = AppUpdateVersionHelper.ExtractRunNumber(version);
+        Assert.Equal(expectedRun, result);
+    }
+
+    /// <summary>
+    /// Tests that IsArtifactVersionNewer returns true when new run is greater.
+    /// </summary>
+    [Fact]
+    public void IsArtifactVersionNewer_WhenNewerRun_ShouldReturnTrue()
+    {
+        var result = AppUpdateVersionHelper.IsArtifactVersionNewer("0.0.1287-pr265", "0.0.1282-pr265");
+        Assert.True(result);
+    }
+
+    /// <summary>
+    /// Tests that IsArtifactVersionNewer returns false when same run.
+    /// </summary>
+    [Fact]
+    public void IsArtifactVersionNewer_WhenSameRun_ShouldReturnFalse()
+    {
+        var result = AppUpdateVersionHelper.IsArtifactVersionNewer("0.0.1282-pr265", "0.0.1282-pr265");
+        Assert.False(result);
+    }
+
+    /// <summary>
+    /// Tests that IsArtifactVersionNewer returns false when older run.
+    /// </summary>
+    [Fact]
+    public void IsArtifactVersionNewer_WhenOlderRun_ShouldReturnFalse()
+    {
+        var result = AppUpdateVersionHelper.IsArtifactVersionNewer("0.0.1280-pr265", "0.0.1282-pr265");
+        Assert.False(result);
+    }
+
+    /// <summary>
+    /// Tests that IsArtifactVersionNewer works for branch versions.
+    /// </summary>
+    [Fact]
+    public void IsArtifactVersionNewer_BranchVersions_ShouldCompareCorrectly()
+    {
+        Assert.True(AppUpdateVersionHelper.IsArtifactVersionNewer("0.0.1287-main", "0.0.1282-main"));
+        Assert.False(AppUpdateVersionHelper.IsArtifactVersionNewer("0.0.1282-main", "0.0.1282-main"));
+    }
+
+    /// <summary>
+    /// Tests that IsArtifactVersionNewer handles null or empty inputs.
+    /// </summary>
+    [Fact]
+    public void IsArtifactVersionNewer_WithNullOrEmpty_ShouldHandleGracefully()
+    {
+        Assert.False(AppUpdateVersionHelper.IsArtifactVersionNewer(null, "0.0.1282-pr265"));
+        Assert.False(AppUpdateVersionHelper.IsArtifactVersionNewer(string.Empty, "0.0.1282-pr265"));
+        Assert.True(AppUpdateVersionHelper.IsArtifactVersionNewer("0.0.1282-pr265", null));
+        Assert.True(AppUpdateVersionHelper.IsArtifactVersionNewer("0.0.1282-pr265", string.Empty));
+    }
+
+    /// <summary>
+    /// Tests that fallback versions like 0.0.0 are not treated as newer than installed builds.
+    /// </summary>
+    [Fact]
+    public void IsArtifactVersionNewer_FallbackZeroVersusValidRun_ShouldReturnFalse()
+    {
+        Assert.False(AppUpdateVersionHelper.IsArtifactVersionNewer("0.0.0", "0.0.1282-pr265"));
+        Assert.True(AppUpdateVersionHelper.IsArtifactVersionNewer("0.0.1282-pr265", "0.0.0"));
+    }
+
+    /// <summary>
+    /// Tests that standard version numbers compare correctly when no run number is present.
+    /// </summary>
+    [Fact]
+    public void IsArtifactVersionNewer_SemanticVersion_ShouldCompareCorrectly()
+    {
+        Assert.True(AppUpdateVersionHelper.IsArtifactVersionNewer("1.2.5", "1.1.9"));
+        Assert.False(AppUpdateVersionHelper.IsArtifactVersionNewer("1.1.9", "1.2.5"));
+        Assert.True(AppUpdateVersionHelper.IsArtifactVersionNewer("1.2.0", "1.1.0"));
+        Assert.False(AppUpdateVersionHelper.IsArtifactVersionNewer("1.1.0", "1.2.0"));
+        Assert.False(AppUpdateVersionHelper.IsArtifactVersionNewer("1.0.0", "1.0.0"));
+    }
+}
diff --git a/GenHub/GenHub.Tests/GenHub.Tests.Core/Helpers/CommandLineParserTests.cs b/GenHub/GenHub.Tests/GenHub.Tests.Core/Helpers/CommandLineParserTests.cs
new file mode 100644
index 000000000..d9d9fa997
--- /dev/null
+++ b/GenHub/GenHub.Tests/GenHub.Tests.Core/Helpers/CommandLineParserTests.cs
@@ -0,0 +1,234 @@
+using System;
+using GenHub.Core.Helpers;
+using Xunit;
+
+namespace GenHub.Tests.Core.Helpers;
+
+/// <summary>
+/// Unit tests for <see cref="CommandLineParser"/>.
+/// </summary>
+public sealed class CommandLineParserTests
+{
+    /// <summary>
+    /// Verifies that ExtractProfileId correctly extracts profile id from spaced argument.
+    /// </summary>
+    [Fact]
+    public void ExtractProfileId_WithSpacedArgument_ReturnsProfileId()
+    {
+        var args = new[] { "--other", "value", "--launch-profile", "test-profile-123" };
+
+        var result = CommandLineParser.ExtractProfileId(args);
+
+        Assert.Equal("test-profile-123", result);
+    }
+
+    /// <summary>
+    /// Verifies that ExtractProfileId correctly extracts profile id from inline argument.
+    /// </summary>
+    [Fact]
+    public void ExtractProfileId_WithInlineArgument_ReturnsProfileId()
+    {
+        var args = new[] { "--launch-profile=test-profile-456" };
+
+        var result = CommandLineParser.ExtractProfileId(args);
+
+        Assert.Equal("test-profile-456", result);
+    }
+
+    /// <summary>
+    /// Verifies that ExtractProfileId trims surrounding quotes.
+    /// </summary>
+    [Fact]
+    public void ExtractProfileId_WithQuotedValues_ReturnsTrimmedProfileId()
+    {
+        var argsSpaced = new[] { "--launch-profile", "\"quoted-profile\"" };
+        var argsInline = new[] { "--launch-profile=\"quoted-profile\"" };
+
+        Assert.Equal("quoted-profile", CommandLineParser.ExtractProfileId(argsSpaced));
+        Assert.Equal("quoted-profile", CommandLineParser.ExtractProfileId(argsInline));
+    }
+
+    /// <summary>
+    /// Verifies that ExtractProfileId returns null when launch profile argument is absent.
+    /// </summary>
+    [Fact]
+    public void ExtractProfileId_WhenMissing_ReturnsNull()
+    {
+        var args = new[] { "--verbose", "--other" };
+
+        var result = CommandLineParser.ExtractProfileId(args);
+
+        Assert.Null(result);
+    }
+
+    /// <summary>
+    /// Verifies that ExtractProfileId returns null when spaced argument has no subsequent value.
+    /// </summary>
+    [Fact]
+    public void ExtractProfileId_WhenFlagAtEndWithoutValue_ReturnsNull()
+    {
+        var args = new[] { "--launch-profile" };
+
+        var result = CommandLineParser.ExtractProfileId(args);
+
+        Assert.Null(result);
+    }
+
+    /// <summary>
+    /// Verifies that ExtractSubscriptionUrl parses direct catalog URLs.
+    /// </summary>
+    [Fact]
+    public void ExtractSubscriptionUrl_WithDirectUrl_ReturnsDecodedUrl()
+    {
+        var args = new[] { "genhub://subscribe?url=https://example.com/catalog.json" };
+
+        var result = CommandLineParser.ExtractSubscriptionUrl(args);
+
+        Assert.Equal("https://example.com/catalog.json", result);
+    }
+
+    /// <summary>
+    /// Verifies that ExtractSubscriptionUrl correctly decodes URL encoded parameters.
+    /// </summary>
+    [Fact]
+    public void ExtractSubscriptionUrl_WithUrlEncodedParameter_ReturnsDecodedUrl()
+    {
+        var args = new[] { "genhub://subscribe?url=https%3A%2F%2Fexample.com%2Fcatalog.json%3Fversion%3D1" };
+
+        var result = CommandLineParser.ExtractSubscriptionUrl(args);
+
+        Assert.Equal("https://example.com/catalog.json?version=1", result);
+    }
+
+    /// <summary>
+    /// Verifies that ExtractSubscriptionUrl trims quotes around the url value.
+    /// </summary>
+    [Fact]
+    public void ExtractSubscriptionUrl_WithQuotedArgument_ReturnsTrimmedUrl()
+    {
+        var argsClean = new[] { "genhub://subscribe?url=\"https://example.com/catalog.json\"" };
+
+        Assert.Equal("https://example.com/catalog.json", CommandLineParser.ExtractSubscriptionUrl(argsClean));
+    }
+
+    /// <summary>
+    /// Verifies that ExtractSubscriptionUrl returns null when no subscribe URI is present.
+    /// </summary>
+    [Fact]
+    public void ExtractSubscriptionUrl_WhenNotPresent_ReturnsNull()
+    {
+        var args = new[] { "--launch-profile", "test" };
+
+        var result = CommandLineParser.ExtractSubscriptionUrl(args);
+
+        Assert.Null(result);
+    }
+
+    /// <summary>
+    /// Verifies that ExtractSubscriptionUrl is case insensitive with protocol prefix and query parameter.
+    /// </summary>
+    [Fact]
+    public void ExtractSubscriptionUrl_CaseInsensitivePrefix_ReturnsUrl()
+    {
+        var args = new[] { "GENHUB://SUBSCRIBE?URL=https://example.com/catalog.json" };
+
+        var result = CommandLineParser.ExtractSubscriptionUrl(args);
+
+        Assert.Equal("https://example.com/catalog.json", result);
+    }
+
+    /// <summary>
+    /// Verifies that ExtractSubscriptionUrl returns null when subscribe URI lacks the url query parameter.
+    /// </summary>
+    [Fact]
+    public void ExtractSubscriptionUrl_WithoutUrlParameter_ReturnsNull()
+    {
+        var args = new[] { "genhub://subscribe" };
+
+        var result = CommandLineParser.ExtractSubscriptionUrl(args);
+
+        Assert.Null(result);
+    }
+
+    /// <summary>
+    /// Verifies that ExtractSubscriptionUrl returns null when the url query parameter is empty.
+    /// </summary>
+    [Fact]
+    public void ExtractSubscriptionUrl_WithEmptyUrlParameter_ReturnsNull()
+    {
+        var args = new[] { "genhub://subscribe?url=" };
+
+        var result = CommandLineParser.ExtractSubscriptionUrl(args);
+
+        Assert.Null(result);
+    }
+
+    /// <summary>
+    /// Verifies that ExtractSubscriptionUrl extracts the URL even when preceded by other arguments.
+    /// </summary>
+    [Fact]
+    public void ExtractSubscriptionUrl_WhenNotFirstArgument_ReturnsUrl()
+    {
+        var args = new[] { "--verbose", "--launch-profile", "test-profile", "genhub://subscribe?url=https://example.com/catalog.json" };
+
+        var result = CommandLineParser.ExtractSubscriptionUrl(args);
+
+        Assert.Equal("https://example.com/catalog.json", result);
+    }
+
+    /// <summary>
+    /// Verifies that ExtractSubscriptionUrl returns the first matching subscription URL when multiple are present.
+    /// </summary>
+    [Fact]
+    public void ExtractSubscriptionUrl_MultipleUrls_ReturnsFirstMatch()
+    {
+        var args = new[]
+        {
+            "genhub://subscribe?url=https://example.com/first.json",
+            "genhub://subscribe?url=https://example.com/second.json",
+        };
+
+        var result = CommandLineParser.ExtractSubscriptionUrl(args);
+
+        Assert.Equal("https://example.com/first.json", result);
+    }
+
+    /// <summary>
+    /// Verifies that ExtractSubscriptionUrl returns null for non-HTTP and non-HTTPS URI schemes.
+    /// </summary>
+    [Fact]
+    public void ExtractSubscriptionUrl_NonHttpOrHttpsScheme_ReturnsNull()
+    {
+        var fileSchemeArgs = new[] { "genhub://subscribe?url=file:///C:/malicious.exe" };
+        var jsSchemeArgs = new[] { "genhub://subscribe?url=javascript:alert(1)" };
+
+        Assert.Null(CommandLineParser.ExtractSubscriptionUrl(fileSchemeArgs));
+        Assert.Null(CommandLineParser.ExtractSubscriptionUrl(jsSchemeArgs));
+    }
+
+    /// <summary>
+    /// Verifies that ExtractSubscriptionUrl strips newlines and control characters from the URL.
+    /// </summary>
+    [Fact]
+    public void ExtractSubscriptionUrl_WithNewlinesAndControlChars_ReturnsSanitizedUrl()
+    {
+        var args = new[] { "genhub://subscribe?url=https%3A%2F%2Fexample.com%2Fcatalog.json%0D%0A" };
+
+        var result = CommandLineParser.ExtractSubscriptionUrl(args);
+
+        Assert.Equal("https://example.com/catalog.json", result);
+    }
+
+    /// <summary>
+    /// Verifies that ExtractSubscriptionUrl returns null for non-command subscribe-prefixed URIs.
+    /// </summary>
+    [Fact]
+    public void ExtractSubscriptionUrl_WithNonCommandSubscribePrefixedUri_ReturnsNull()
+    {
+        var args = new[] { "genhub://subscribe-anything?url=https://example.com/catalog.json" };
+
+        var result = CommandLineParser.ExtractSubscriptionUrl(args);
+
+        Assert.Null(result);
+    }
+}
diff --git a/GenHub/GenHub.Tests/GenHub.Tests.Core/Helpers/HtmlTextHelperTests.cs b/GenHub/GenHub.Tests/GenHub.Tests.Core/Helpers/HtmlTextHelperTests.cs
new file mode 100644
index 000000000..574b95262
--- /dev/null
+++ b/GenHub/GenHub.Tests/GenHub.Tests.Core/Helpers/HtmlTextHelperTests.cs
@@ -0,0 +1,147 @@
+using System;
+using GenHub.Core.Helpers;
+using Xunit;
+
+namespace GenHub.Tests.Core.Helpers;
+
+/// <summary>
+/// Unit tests for <see cref="HtmlTextHelper"/>.
+/// </summary>
+public sealed class HtmlTextHelperTests
+{
+    /// <summary>
+    /// Verifies that NormalizeHtml returns an empty string when input is null or whitespace.
+    /// </summary>
+    /// <param name="input">The test input string.</param>
+    [Theory]
+    [InlineData(null)]
+    [InlineData("")]
+    [InlineData("   ")]
+    [InlineData("\r\n\t")]
+    public void NormalizeHtml_NullOrWhitespace_ReturnsEmptyString(string? input)
+    {
+        var result = HtmlTextHelper.NormalizeHtml(input);
+        Assert.Equal(string.Empty, result);
+    }
+
+    /// <summary>
+    /// Verifies that NormalizeHtml converts paragraph tags into paragraphs separated by newlines.
+    /// </summary>
+    [Fact]
+    public void NormalizeHtml_ParagraphTags_ConvertsToParagraphsAndStripsTags()
+    {
+        var html = "<p>First paragraph.</p><p>Second paragraph.</p>";
+        var result = HtmlTextHelper.NormalizeHtml(html);
+
+        var expected = $"First paragraph.{Environment.NewLine}{Environment.NewLine}Second paragraph.";
+        Assert.Equal(expected, result);
+    }
+
+    /// <summary>
+    /// Verifies that NormalizeHtml converts break tags to line breaks.
+    /// </summary>
+    [Fact]
+    public void NormalizeHtml_BreakTags_ConvertsToNewlines()
+    {
+        var html = "Line 1<br>Line 2<br/>Line 3<br />Line 4";
+        var result = HtmlTextHelper.NormalizeHtml(html);
+
+        var expected = $"Line 1{Environment.NewLine}Line 2{Environment.NewLine}Line 3{Environment.NewLine}Line 4";
+        Assert.Equal(expected, result);
+    }
+
+    /// <summary>
+    /// Verifies that NormalizeHtml strips inline HTML formatting tags.
+    /// </summary>
+    [Fact]
+    public void NormalizeHtml_InlineTags_StripsTagsCleanly()
+    {
+        var html = "<b>Bold</b> <i>Italic</i> <a href=\"https://example.com\">Link</a> <span class=\"highlight\">Text</span>";
+        var result = HtmlTextHelper.NormalizeHtml(html);
+
+        Assert.Equal("Bold Italic Link Text", result);
+    }
+
+    /// <summary>
+    /// Verifies that NormalizeHtml decodes HTML entities into appropriate characters.
+    /// </summary>
+    [Fact]
+    public void NormalizeHtml_HtmlEntities_DecodesCorrectly()
+    {
+        var html = "&quot;Hello &amp; Welcome&#39;s &lt;World&gt;&quot; &nbsp; &#8211;";
+        var result = HtmlTextHelper.NormalizeHtml(html);
+
+        Assert.Equal("\"Hello & Welcome's <World>\"   –", result);
+    }
+
+    /// <summary>
+    /// Verifies that NormalizeHtml strips paragraph tags from CNC Labs description snippets.
+    /// </summary>
+    [Fact]
+    public void NormalizeHtml_CncLabsDescriptionWithPTags_ResolvesCleanly()
+    {
+        var html = "<p>The Ships and Boats War map is a game map that takes place almost</p>";
+        var result = HtmlTextHelper.NormalizeHtml(html);
+
+        Assert.Equal("The Ships and Boats War map is a game map that takes place almost", result);
+    }
+
+    /// <summary>
+    /// Verifies that NormalizeHtml collapses runs of excess blank lines to a double newline.
+    /// </summary>
+    [Fact]
+    public void NormalizeHtml_ExcessBlankLines_CollapsedToDoubleNewline()
+    {
+        var html = "First paragraph\n\n\n\n\nSecond paragraph";
+        var result = HtmlTextHelper.NormalizeHtml(html);
+
+        var expected = $"First paragraph{Environment.NewLine}{Environment.NewLine}Second paragraph";
+        Assert.Equal(expected, result);
+    }
+
+    /// <summary>
+    /// Verifies that CleanToSingleLine collapses multiple whitespace characters and newlines into a single space.
+    /// </summary>
+    [Fact]
+    public void CleanToSingleLine_WithHtmlAndNewlines_CollapsesWhitespace()
+    {
+        var html = "<p>First line</p>\n\n<p>Second   line\twith   spaces</p>";
+        var result = HtmlTextHelper.CleanToSingleLine(html);
+
+        Assert.Equal("First line Second line with spaces", result);
+    }
+
+    /// <summary>
+    /// Verifies that CleanToSingleLine truncates strings exceeding maximum length and appends an ellipsis.
+    /// </summary>
+    [Fact]
+    public void CleanToSingleLine_WithMaxLength_TruncatesWithEllipsis()
+    {
+        var html = "<p>The Ships and Boats War map is a game map that takes place almost</p>";
+        var result = HtmlTextHelper.CleanToSingleLine(html, 30);
+
+        Assert.Equal(30, result.Length);
+        Assert.EndsWith("...", result, StringComparison.Ordinal);
+        Assert.Equal("The Ships and Boats War map...", result);
+    }
+
+    /// <summary>
+    /// Verifies that TruncateWithEllipsis handles various length inputs and edge cases.
+    /// </summary>
+    /// <param name="input">The test input string.</param>
+    /// <param name="maxLength">The maximum allowed length.</param>
+    /// <param name="expected">The expected truncated output.</param>
+    [Theory]
+    [InlineData(null, 10, "")]
+    [InlineData("", 10, "")]
+    [InlineData("Short text", 20, "Short text")]
+    [InlineData("ExactLengthText", 15, "ExactLengthText")]
+    [InlineData("A very long string exceeding limit", 10, "A very ...")]
+    [InlineData("Abcdef", 3, "Abc")]
+    [InlineData("Abcdef", 2, "Ab")]
+    public void TruncateWithEllipsis_VariousInputs_BehavesCorrectly(string? input, int maxLength, string expected)
+    {
+        var result = HtmlTextHelper.TruncateWithEllipsis(input, maxLength);
+        Assert.Equal(expected, result);
+    }
+}
diff --git a/GenHub/GenHub.Tests/GenHub.Tests.Core/Integration/ContentReconciliationServiceTests.cs b/GenHub/GenHub.Tests/GenHub.Tests.Core/Integration/ContentReconciliationServiceTests.cs
index 913684ff1..6de3d7e9a 100644
--- a/GenHub/GenHub.Tests/GenHub.Tests.Core/Integration/ContentReconciliationServiceTests.cs
+++ b/GenHub/GenHub.Tests/GenHub.Tests.Core/Integration/ContentReconciliationServiceTests.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
@@ -81,7 +80,6 @@ public ContentReconciliationServiceTests()
     /// </summary>
     /// <returns>A <see cref="Task"/> representing the asynchronous unit test.</returns>
     [Fact]
-    [SuppressMessage("DeepSource", "CS-R1136", Justification = "Expression tree lambdas in Moq do not support null propagation")]
     public async Task OrchestrateLocalUpdateAsync_WhenIdChanges_ShouldAddManifestToPool_AndUpdateProfilesAsync()
     {
         // Arrange
@@ -128,7 +126,7 @@ public async Task OrchestrateLocalUpdateAsync_WhenIdChanges_ShouldAddManifestToP
         _profileManagerMock.Verify(
             x => x.UpdateProfileAsync(
                 "profile-1",
-                It.Is<UpdateProfileRequest>(r => r.GameClient != null && r.GameClient.Id == newId),
+                It.Is<UpdateProfileRequest>(r => MatchesGameClientId(r, newId)),
                 It.IsAny<CancellationToken>()),
             Times.Once,
             "Should update profile with new manifest ID");
@@ -282,4 +280,7 @@ public async Task ScheduleGarbageCollectionAsync_WhenDisabled_ReturnsFailureAsyn
         result.FirstError.Should().Be(
             GenHub.Core.Constants.CasDefaults.GarbageCollectionDisabledMessage);
     }
+
+    private static bool MatchesGameClientId(UpdateProfileRequest request, string expectedId) =>
+        request.GameClient?.Id == expectedId;
 }
diff --git a/GenHub/GenHub.Tests/GenHub.Tests.Windows/Features/Shortcuts/UriSchemeRegistrarTests.cs b/GenHub/GenHub.Tests/GenHub.Tests.Windows/Features/Shortcuts/UriSchemeRegistrarTests.cs
new file mode 100644
index 000000000..529be0d13
--- /dev/null
+++ b/GenHub/GenHub.Tests/GenHub.Tests.Windows/Features/Shortcuts/UriSchemeRegistrarTests.cs
@@ -0,0 +1,178 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.Versioning;
+using GenHub.Windows.Features.Shortcuts;
+using Microsoft.Win32;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace GenHub.Tests.Windows.Features.Shortcuts;
+
+/// <summary>
+/// Unit tests for <see cref="UriSchemeRegistrar"/>.
+/// </summary>
+/// <param name="testOutputHelper">Output helper for surfacing test diagnostic messages.</param>
+[Collection(WindowsRegistryCollection.Name)]
+[SupportedOSPlatform("windows")]
+public sealed class UriSchemeRegistrarTests(ITestOutputHelper testOutputHelper) : IDisposable
+{
+    private const string TargetKeyPath = @"Software\Classes\genhub";
+    private readonly RegistryKeySnapshot? _snapshot = CaptureInitialSnapshot();
+    private readonly bool _existedPrior = KeyExists();
+
+    /// <summary>
+    /// Verifies that Register creates or updates the genhub registry keys in HKCU.
+    /// </summary>
+    [Fact]
+    public void Register_CreatesOrUpdatesGenhubRegistryKey()
+    {
+        // Act
+        UriSchemeRegistrar.Register();
+
+        // Assert
+        using var key = Registry.CurrentUser.OpenSubKey(TargetKeyPath);
+        Assert.NotNull(key);
+
+        var protocolValue = key.GetValue(string.Empty) as string;
+        Assert.Equal("URL:genhub protocol", protocolValue);
+
+        var urlProtocolFlag = key.GetValue("URL Protocol");
+        Assert.NotNull(urlProtocolFlag);
+
+        using var commandKey = Registry.CurrentUser.OpenSubKey($@"{TargetKeyPath}\shell\open\command");
+        Assert.NotNull(commandKey);
+
+        var command = commandKey.GetValue(string.Empty) as string;
+        Assert.NotNull(command);
+        Assert.Contains("%1", command);
+        Assert.Contains(Environment.ProcessPath ?? string.Empty, command, StringComparison.OrdinalIgnoreCase);
+    }
+
+    /// <summary>
+    /// Verifies that Register can be invoked repeatedly without failure or unexpected mutations.
+    /// </summary>
+    [Fact]
+    public void Register_IsIdempotent()
+    {
+        // Act - Call twice in succession to ensure no exceptions or unintended side effects occur
+        UriSchemeRegistrar.Register();
+        var ex = Record.Exception(() => UriSchemeRegistrar.Register());
+
+        // Assert
+        Assert.Null(ex);
+    }
+
+    /// <inheritdoc/>
+    public void Dispose()
+    {
+        try
+        {
+            if (_existedPrior && _snapshot != null)
+            {
+                using var rootKey = Registry.CurrentUser.CreateSubKey(TargetKeyPath, writable: true);
+                if (rootKey != null)
+                {
+                    RestoreSnapshot(rootKey, _snapshot);
+                }
+            }
+            else
+            {
+                Registry.CurrentUser.DeleteSubKeyTree(TargetKeyPath, throwOnMissingSubKey: false);
+            }
+        }
+        catch (Exception ex)
+        {
+            testOutputHelper.WriteLine($"Failed to restore registry snapshot during test teardown: {ex.Message}");
+        }
+    }
+
+    private static bool KeyExists()
+    {
+        using var rootKey = Registry.CurrentUser.OpenSubKey(TargetKeyPath, writable: false);
+        return rootKey != null;
+    }
+
+    private static RegistryKeySnapshot? CaptureInitialSnapshot()
+    {
+        using var rootKey = Registry.CurrentUser.OpenSubKey(TargetKeyPath, writable: false);
+        return rootKey != null ? CaptureSnapshot(rootKey) : null;
+    }
+
+    private static RegistryKeySnapshot CaptureSnapshot(RegistryKey key)
+    {
+        var snapshot = new RegistryKeySnapshot
+        {
+            Name = Path.GetFileName(key.Name),
+        };
+
+        foreach (var valueName in key.GetValueNames())
+        {
+            var value = key.GetValue(valueName, null, RegistryValueOptions.DoNotExpandEnvironmentNames);
+            var kind = key.GetValueKind(valueName);
+            snapshot.Values[valueName] = (value, kind);
+        }
+
+        foreach (var subKeyName in key.GetSubKeyNames())
+        {
+            using var subKey = key.OpenSubKey(subKeyName, writable: false);
+            if (subKey != null)
+            {
+                snapshot.SubKeys.Add(CaptureSnapshot(subKey));
+            }
+        }
+
+        return snapshot;
+    }
+
+    private static void RestoreSnapshot(RegistryKey targetKey, RegistryKeySnapshot snapshot)
+    {
+        // Delete values not present in snapshot
+        foreach (var valueName in targetKey.GetValueNames())
+        {
+            if (!snapshot.Values.ContainsKey(valueName))
+            {
+                targetKey.DeleteValue(valueName, throwOnMissingValue: false);
+            }
+        }
+
+        // Restore values
+        foreach (var (valueName, (value, kind)) in snapshot.Values)
+        {
+            if (value != null)
+            {
+                targetKey.SetValue(valueName, value, kind);
+            }
+        }
+
+        // Delete subkeys not present in snapshot
+        var snapshotSubKeyNames = new HashSet<string>(snapshot.SubKeys.Select(s => s.Name), StringComparer.OrdinalIgnoreCase);
+        foreach (var subKeyName in targetKey.GetSubKeyNames())
+        {
+            if (!snapshotSubKeyNames.Contains(subKeyName))
+            {
+                targetKey.DeleteSubKeyTree(subKeyName, throwOnMissingSubKey: false);
+            }
+        }
+
+        // Restore subkeys recursively
+        foreach (var subKeySnapshot in snapshot.SubKeys)
+        {
+            using var subKey = targetKey.CreateSubKey(subKeySnapshot.Name, writable: true);
+            if (subKey != null)
+            {
+                RestoreSnapshot(subKey, subKeySnapshot);
+            }
+        }
+    }
+
+    private sealed class RegistryKeySnapshot
+    {
+        public string Name { get; set; } = string.Empty;
+
+        public Dictionary<string, (object? Value, RegistryValueKind Kind)> Values { get; } = [];
+
+        public List<RegistryKeySnapshot> SubKeys { get; } = [];
+    }
+}
diff --git a/GenHub/GenHub.Tests/GenHub.Tests.Windows/Features/Shortcuts/WindowsRegistryCollection.cs b/GenHub/GenHub.Tests/GenHub.Tests.Windows/Features/Shortcuts/WindowsRegistryCollection.cs
new file mode 100644
index 000000000..23847849f
--- /dev/null
+++ b/GenHub/GenHub.Tests/GenHub.Tests.Windows/Features/Shortcuts/WindowsRegistryCollection.cs
@@ -0,0 +1,15 @@
+using Xunit;
+
+namespace GenHub.Tests.Windows.Features.Shortcuts;
+
+/// <summary>
+/// Prevents registry tests from overlapping and racing.
+/// </summary>
+[CollectionDefinition(Name, DisableParallelization = true)]
+public class WindowsRegistryCollection
+{
+    /// <summary>
+    /// The xUnit collection name.
+    /// </summary>
+    public const string Name = "Windows registry";
+}
diff --git a/GenHub/GenHub.Windows/Features/Shortcuts/UriSchemeRegistrar.cs b/GenHub/GenHub.Windows/Features/Shortcuts/UriSchemeRegistrar.cs
new file mode 100644
index 000000000..1917cf585
--- /dev/null
+++ b/GenHub/GenHub.Windows/Features/Shortcuts/UriSchemeRegistrar.cs
@@ -0,0 +1,93 @@
+using System;
+using System.IO;
+using GenHub.Core.Constants;
+using Microsoft.Extensions.Logging;
+using Microsoft.Win32;
+
+namespace GenHub.Windows.Features.Shortcuts;
+
+/// <summary>
+/// Registers the <c>genhub://</c> URI scheme with Windows so OS/browser links open GenHub.
+/// </summary>
+/// <remarks>
+/// <para>
+/// Windows resolves custom protocols through <c>HKCU\Software\Classes\&lt;scheme&gt;</c>. Without
+/// that key the shell shows an "app not installed" dialog when a <c>genhub://</c> link is clicked.
+/// The app already parses <c>genhub://subscribe?url=...</c> from its own command line
+/// (<c>GenHub.Core.Helpers.CommandLineParser.ExtractSubscriptionUrl</c>); this registrar wires the
+/// OS shell to that path.
+/// </para>
+/// <para>
+/// Writes to <c>HKCU</c> (per-user), so no elevation is required. The registration is idempotent
+/// and self-repairs: it rewrites the command only when the executable path has changed, which is
+/// what happens every time a debug rebuild or Velopack update lands at a new path.
+/// </para>
+/// </remarks>
+public static class UriSchemeRegistrar
+{
+    private const string SchemeName = CommandLineConstants.SchemeName;
+    private const string ClassesSubKey = @"Software\Classes\" + SchemeName;
+
+    /// <summary>
+    /// Registers the <c>genhub://</c> scheme for the current user, pointing at the running
+    /// executable. Safe to call on every launch.
+    /// </summary>
+    /// <param name="logger">Optional logger for diagnostics.</param>
+    public static void Register(ILogger? logger = null)
+    {
+        var executablePath = Environment.ProcessPath;
+        if (string.IsNullOrEmpty(executablePath) || !File.Exists(executablePath))
+        {
+            logger?.LogWarning("Could not register genhub:// scheme: executable path unavailable.");
+            return;
+        }
+
+        try
+        {
+            var desiredCommand = $"\"{executablePath}\" \"%1\"";
+            var desiredProtocol = $"URL:{SchemeName} protocol";
+            var desiredIcon = $"{executablePath},0";
+
+            // Check if already registered and up-to-date before performing any writes
+            using (var existingClassesKey = Registry.CurrentUser.OpenSubKey(ClassesSubKey, writable: false))
+            {
+                if (existingClassesKey != null)
+                {
+                    var existingProtocol = existingClassesKey.GetValue(string.Empty) as string;
+                    var existingUrlProtocol = existingClassesKey.GetValue("URL Protocol");
+
+                    using var existingCommandKey = existingClassesKey.OpenSubKey(@"shell\open\command", writable: false);
+                    var existingCommand = existingCommandKey?.GetValue(string.Empty) as string;
+
+                    if (string.Equals(existingProtocol, desiredProtocol, StringComparison.OrdinalIgnoreCase) &&
+                        existingUrlProtocol != null &&
+                        string.Equals(existingCommand, desiredCommand, StringComparison.OrdinalIgnoreCase))
+                    {
+                        logger?.LogDebug("genhub:// scheme is already registered and up-to-date.");
+                        return;
+                    }
+                }
+            }
+
+            using var classesKey = Registry.CurrentUser.CreateSubKey(ClassesSubKey, writable: true);
+
+            // URL Protocol flag tells the shell this is a URI handler, not a normal file type.
+            classesKey.SetValue(string.Empty, desiredProtocol);
+            classesKey.SetValue("URL Protocol", string.Empty);
+
+            using var iconKey = classesKey.CreateSubKey("DefaultIcon");
+            iconKey.SetValue(string.Empty, desiredIcon);
+
+            using var commandKey = classesKey.CreateSubKey(@"shell\open\command");
+            commandKey.SetValue(string.Empty, desiredCommand);
+
+            logger?.LogInformation("Registered genhub:// scheme -> {ExecutablePath}", executablePath);
+        }
+        catch (Exception ex)
+        {
+            // Registration failure must never block app startup; the in-app subscribe paths still
+            // work via direct command-line invocation.
+            logger?.LogWarning(ex, "Failed to register genhub:// scheme.");
+        }
+    }
+}
diff --git a/GenHub/GenHub.Windows/Program.cs b/GenHub/GenHub.Windows/Program.cs
index 031e8108f..996834a0d 100644
--- a/GenHub/GenHub.Windows/Program.cs
+++ b/GenHub/GenHub.Windows/Program.cs
@@ -52,7 +52,7 @@ public static void Main(string[] args)
         // Extract profile ID from args if present (for IPC forwarding)
         var profileId = CommandLineParser.ExtractProfileId(args);
 
-        // Extract subscription URL from args if present (for IPC forwarding)
+        // Extract genhub://subscribe?url=... target (catalog JSON today; definition URL later)
         var subscriptionUrl = CommandLineParser.ExtractSubscriptionUrl(args);
 
         // Check for multi-instance mode (useful for debugging with multiple instances)
@@ -74,7 +74,7 @@ public static void Main(string[] args)
                     SingleInstanceManager.SendCommandToPrimaryInstance($"{IpcCommands.LaunchProfilePrefix}{profileId}");
                 }
 
-                // Forward subscribe command to primary instance if we have a subscription URL
+                // Forward subscribe so the running UI can show the confirmation dialog
                 if (!string.IsNullOrEmpty(subscriptionUrl))
                 {
                     bootstrapLogger.LogInformation("Forwarding subscribe command to primary instance: {Url}", subscriptionUrl);
@@ -94,6 +94,10 @@ public static void Main(string[] args)
             bootstrapLogger.LogInformation("Multi-instance mode enabled - skipping single-instance check");
         }
 
+        // Register the genhub:// URI scheme with Windows so clicked links open this executable.
+        // Registered for primary instance only; idempotent and per-user (HKCU).
+        Features.Shortcuts.UriSchemeRegistrar.Register(bootstrapLogger);
+
         try
         {
             bootstrapLogger.LogInformation("Starting GenHub Windows application");
diff --git a/GenHub/GenHub/App.axaml.cs b/GenHub/GenHub/App.axaml.cs
index 3017451f0..a2f92fc64 100644
--- a/GenHub/GenHub/App.axaml.cs
+++ b/GenHub/GenHub/App.axaml.cs
@@ -11,6 +11,8 @@
 using GenHub.Core.Helpers;
 using GenHub.Core.Interfaces.Common;
 using GenHub.Core.Interfaces.GameProfiles;
+using GenHub.Core.Interfaces.Notifications;
+using GenHub.Core.Models.Enums;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 
@@ -65,8 +67,8 @@ public override void OnFrameworkInitializationCompleted()
             // Subscribe to IPC commands from secondary instances (Windows only)
             SubscribeToSingleInstanceCommands(mainWindow);
 
-            // Handle launch profile from startup args (first launch with shortcut)
-            SafeFireAndForget(HandleLaunchProfileArgsAsync(desktop.Args, mainWindow), "HandleLaunchProfileArgsAsync");
+            // Handle startup arguments sequentially (launch profile, then subscription if present)
+            SafeFireAndForget(HandleStartupArgsAsync(desktop.Args, mainWindow), nameof(HandleStartupArgsAsync));
         }
 
         base.OnFrameworkInitializationCompleted();
@@ -168,6 +170,17 @@ private async void OnShutdownRequested(object? sender, ShutdownRequestedEventArg
         }
     }
 
+    private async Task HandleStartupArgsAsync(string[]? args, MainWindow mainWindow)
+    {
+        if (args == null || args.Length == 0)
+        {
+            return;
+        }
+
+        await HandleLaunchProfileArgsAsync(args, mainWindow);
+        await HandleSubscriptionArgsAsync(args, mainWindow);
+    }
+
     private async Task HandleLaunchProfileArgsAsync(string[]? args, MainWindow mainWindow)
     {
         if (args == null || args.Length == 0)
@@ -187,6 +200,25 @@ private async Task HandleLaunchProfileArgsAsync(string[]? args, MainWindow mainW
         await LaunchProfileByIdAsync(profileId, mainWindow);
     }
 
+    private async Task HandleSubscriptionArgsAsync(string[]? args, MainWindow mainWindow)
+    {
+        if (args == null || args.Length == 0)
+        {
+            return;
+        }
+
+        var subscriptionUrl = CommandLineParser.ExtractSubscriptionUrl(args);
+        if (string.IsNullOrWhiteSpace(subscriptionUrl))
+        {
+            return;
+        }
+
+        var logger = _serviceProvider.GetService<ILogger<App>>();
+        logger?.LogInformation("Startup subscription detected for URL: {Url}", subscriptionUrl);
+
+        await HandleSubscriptionUrlAsync(subscriptionUrl, mainWindow);
+    }
+
     private void SubscribeToSingleInstanceCommands(MainWindow mainWindow)
     {
         // Get the SingleInstanceManager from AppLocator (set by Windows Program.cs)
@@ -197,10 +229,7 @@ private void SubscribeToSingleInstanceCommands(MainWindow mainWindow)
         }
 
         singleInstanceManager.CommandReceived += (_, command) =>
-        {
-            // Dispatch to UI thread since the event comes from a background pipe listener
             Dispatcher.UIThread.Post(() => HandleSingleInstanceCommand(command, mainWindow));
-        };
 
         var logger = _serviceProvider.GetService<ILogger<App>>();
         logger?.LogDebug("Subscribed to single instance IPC commands");
@@ -216,7 +245,15 @@ private void HandleSingleInstanceCommand(string command, MainWindow mainWindow)
             logger?.LogInformation("Received IPC launch command for profile: {ProfileId}", profileId);
 
             // Launch the profile
-            SafeFireAndForget(LaunchProfileByIdAsync(profileId, mainWindow), "LaunchProfileByIdAsync");
+            SafeFireAndForget(LaunchProfileByIdAsync(profileId, mainWindow), nameof(LaunchProfileByIdAsync));
+        }
+        else if (command.StartsWith(IpcCommands.SubscribePrefix, StringComparison.OrdinalIgnoreCase))
+        {
+            var subscriptionUrl = command[IpcCommands.SubscribePrefix.Length..];
+            logger?.LogInformation("Received IPC subscribe command for URL: {Url}", subscriptionUrl);
+
+            // Handle the subscription URL
+            SafeFireAndForget(HandleSubscriptionUrlAsync(subscriptionUrl, mainWindow), nameof(HandleSubscriptionUrlAsync));
         }
         else
         {
@@ -269,4 +306,48 @@ private async Task LaunchProfileByIdAsync(string profileId, MainWindow mainWindo
             logger?.LogError(ex, "Exception while launching profile {ProfileId}", profileId);
         }
     }
+
+    private async Task HandleSubscriptionUrlAsync(string subscriptionUrl, MainWindow mainWindow)
+    {
+        var logger = _serviceProvider.GetService<ILogger<App>>();
+
+        try
+        {
+            var sanitizedUrl = subscriptionUrl.Replace("\r", string.Empty).Replace("\n", string.Empty).Trim('"', '\'', ' ', '\t');
+            if (!Uri.TryCreate(sanitizedUrl, UriKind.Absolute, out var uri) ||
+                (uri.Scheme != Uri.UriSchemeHttp && uri.Scheme != Uri.UriSchemeHttps))
+            {
+                logger?.LogWarning("Invalid or unsafe subscription URL: {Url}", subscriptionUrl);
+                return;
+            }
+
+            logger?.LogInformation("Handling subscription URL: {Url}", uri.AbsoluteUri);
+
+            var dialogService = _serviceProvider.GetService<IDialogService>();
+            if (dialogService != null)
+            {
+                var confirmed = await dialogService.ShowConfirmationAsync(
+                    "Subscribe to Catalog",
+                    $"Do you want to subscribe to content from:\n{uri.AbsoluteUri}",
+                    "Subscribe",
+                    "Cancel");
+
+                if (confirmed)
+                {
+                    if (mainWindow?.DataContext is MainViewModel mainViewModel)
+                    {
+                        mainViewModel.SelectTab(NavigationTab.Downloads);
+                    }
+
+                    logger?.LogInformation("User confirmed subscription to: {Url}", uri.AbsoluteUri);
+                    var notificationService = _serviceProvider.GetService<INotificationService>();
+                    notificationService?.ShowSuccess("Subscribed", $"Successfully subscribed to: {uri.AbsoluteUri}");
+                }
+            }
+        }
+        catch (Exception ex)
+        {
+            logger?.LogError(ex, "Exception while handling subscription URL {Url}", subscriptionUrl);
+        }
+    }
 }
diff --git a/GenHub/GenHub/Common/Services/ConfigurationProviderService.cs b/GenHub/GenHub/Common/Services/ConfigurationProviderService.cs
index 948cc7975..db8eb5745 100644
--- a/GenHub/GenHub/Common/Services/ConfigurationProviderService.cs
+++ b/GenHub/GenHub/Common/Services/ConfigurationProviderService.cs
@@ -144,6 +144,23 @@ public bool GetAutoCheckForUpdatesOnStartup()
         return !settings.IsExplicitlySet(nameof(UserSettings.AutoCheckForUpdatesOnStartup)) || settings.AutoCheckForUpdatesOnStartup; // App default
     }
 
+    /// <inheritdoc />
+    public bool GetAutoCheckForUpdatesPeriodically()
+    {
+        var settings = _userSettings.Get();
+        return !settings.IsExplicitlySet(nameof(UserSettings.AutoCheckForUpdatesPeriodically)) || settings.AutoCheckForUpdatesPeriodically; // App default
+    }
+
+    /// <inheritdoc />
+    public int GetPeriodicUpdateCheckIntervalMinutes()
+    {
+        var settings = _userSettings.Get();
+        var value = settings.IsExplicitlySet(nameof(UserSettings.PeriodicUpdateCheckIntervalMinutes)) && settings.PeriodicUpdateCheckIntervalMinutes > 0
+            ? settings.PeriodicUpdateCheckIntervalMinutes
+            : AppUpdateConstants.DefaultPeriodicUpdateCheckIntervalMinutes;
+        return Math.Clamp(value, AppUpdateConstants.MinPeriodicUpdateCheckIntervalMinutes, AppUpdateConstants.MaxPeriodicUpdateCheckIntervalMinutes);
+    }
+
     /// <inheritdoc />
     public bool GetEnableDetailedLogging()
     {
@@ -215,6 +232,8 @@ public UserSettings GetEffectiveSettings()
             MaxConcurrentDownloads = GetMaxConcurrentDownloads(),
             AllowBackgroundDownloads = GetAllowBackgroundDownloads(),
             AutoCheckForUpdatesOnStartup = GetAutoCheckForUpdatesOnStartup(),
+            AutoCheckForUpdatesPeriodically = GetAutoCheckForUpdatesPeriodically(),
+            PeriodicUpdateCheckIntervalMinutes = GetPeriodicUpdateCheckIntervalMinutes(),
             LastUpdateCheckTimestamp = _userSettings.Get().LastUpdateCheckTimestamp,
             EnableDetailedLogging = GetEnableDetailedLogging(),
             DefaultWorkspaceStrategy = GetDefaultWorkspaceStrategy(),
@@ -259,7 +278,11 @@ public List<string> GetGitHubDiscoveryRepositories()
             settings.GitHubDiscoveryRepositories != null && settings.GitHubDiscoveryRepositories.Count > 0)
             return settings.GitHubDiscoveryRepositories;
 
-        return ["TheSuperHackers/GeneralsGameCode"];
+        return
+        [
+            $"{SuperHackersConstants.GeneralsGameCodeOwner}/{SuperHackersConstants.GeneralsGameCodeRepo}",
+            $"{SuperHackersConstants.GeneralsGamePatch2Owner}/{SuperHackersConstants.GeneralsGamePatch2Repo}",
+        ];
     }
 
     /// <inheritdoc />
diff --git a/GenHub/GenHub/Common/ViewModels/MainViewModel.cs b/GenHub/GenHub/Common/ViewModels/MainViewModel.cs
index b433c0f22..751255560 100644
--- a/GenHub/GenHub/Common/ViewModels/MainViewModel.cs
+++ b/GenHub/GenHub/Common/ViewModels/MainViewModel.cs
@@ -13,13 +13,16 @@
 using CommunityToolkit.Mvvm.Messaging;
 using GenHub.Common.ViewModels.Dialogs;
 using GenHub.Core.Constants;
+using GenHub.Core.Helpers;
 using GenHub.Core.Interfaces.Common;
 using GenHub.Core.Interfaces.Notifications;
 using GenHub.Core.Messages;
+using GenHub.Core.Models.AppUpdate;
 using GenHub.Core.Models.Dialogs;
 using GenHub.Core.Models.Enums;
 using GenHub.Core.Models.Notifications;
 using GenHub.Features.AppUpdate.Interfaces;
+using GenHub.Features.AppUpdate.ViewModels;
 using GenHub.Features.Downloads.ViewModels;
 using GenHub.Features.GameProfiles.ViewModels;
 using GenHub.Features.Info.ViewModels;
@@ -27,6 +30,7 @@
 using GenHub.Features.Settings.ViewModels;
 using GenHub.Features.Tools.ViewModels;
 using Microsoft.Extensions.Logging;
+using Velopack;
 
 namespace GenHub.Common.ViewModels;
 
@@ -59,9 +63,11 @@ public partial class MainViewModel(
     IDialogService dialogService,
     NotificationFeedViewModel notificationFeedViewModel,
     InfoViewModel infoViewModel,
-    ILogger<MainViewModel> logger) : ObservableObject, IDisposable, IRecipient<NavigationMessage>
+    ILogger<MainViewModel> logger) : ObservableObject, IDisposable, IRecipient<NavigationMessage>, IRecipient<UpdateSettingsChangedMessage>
 {
     private readonly CancellationTokenSource _initializationCts = new();
+    private Timer? _periodicUpdateTimer;
+    private string? _lastNotifiedUpdateIdentity;
 
     /// <summary>
     /// Initializes a new instance of the <see cref="MainViewModel"/> class for design-time support.
@@ -161,6 +167,12 @@ public void Receive(NavigationMessage message)
         Dispatcher.UIThread.Post(() => SelectTab(message.Tab));
     }
 
+    /// <inheritdoc/>
+    public void Receive(UpdateSettingsChangedMessage message)
+    {
+        RestartPeriodicUpdateTimer(message.AutoCheckForUpdatesPeriodically, message.PeriodicUpdateCheckIntervalMinutes);
+    }
+
     /// <summary>
     /// Selects the specified navigation tab.
     /// </summary>
@@ -184,8 +196,15 @@ public async Task InitializeAsync()
         await InfoViewModel.InitializeAsync();
         logger?.LogInformation("MainViewModel initialized");
 
-        // Start background check with cancellation support
-        _ = CheckForUpdatesInBackgroundAsync(_initializationCts.Token);
+        var settings = userSettingsService.Get();
+        if (settings.AutoCheckForUpdatesOnStartup)
+        {
+            // Start background check with cancellation support
+            _ = CheckForUpdatesInBackgroundAsync(_initializationCts.Token);
+        }
+
+        // Initialize periodic update timer
+        RestartPeriodicUpdateTimer(settings.AutoCheckForUpdatesPeriodically, settings.PeriodicUpdateCheckIntervalMinutes);
 
         CheckForQuickStart();
     }
@@ -195,8 +214,10 @@ public async Task InitializeAsync()
     /// </summary>
     public void Dispose()
     {
+        _periodicUpdateTimer?.Dispose();
         _initializationCts?.Cancel();
         _initializationCts?.Dispose();
+        WeakReferenceMessenger.Default.UnregisterAll(this);
         GC.SuppressFinalize(this);
     }
 
@@ -223,7 +244,10 @@ private static NavigationTab LoadInitialTab(IConfigurationProviderService config
     // Register for messages
     private void RegisterMessages()
     {
-        WeakReferenceMessenger.Default.Register(this);
+        if (!WeakReferenceMessenger.Default.IsRegistered<NavigationMessage>(this))
+        {
+            WeakReferenceMessenger.Default.RegisterAll(this);
+        }
     }
 
     /// <summary>
@@ -237,61 +261,167 @@ private async Task CheckForUpdatesAsync(CancellationToken cancellationToken = de
         {
             var settings = userSettingsService.Get();
 
-            // Push settings to update manager (important context for other components)
+            // 1. check for subscribed pr artifacts
             if (settings.SubscribedPrNumber.HasValue)
             {
-                velopackUpdateManager.SubscribedPrNumber = settings.SubscribedPrNumber;
+                var prNumber = settings.SubscribedPrNumber.Value;
+                logger?.LogDebug("User subscribed to PR #{PrNumber}, checking for artifact updates", prNumber);
+                velopackUpdateManager.SubscribedPrNumber = prNumber;
+                velopackUpdateManager.SubscribedBranch = null;
+
+                var artifactUpdate = await velopackUpdateManager.CheckForArtifactUpdatesAsync(cancellationToken);
+                if (artifactUpdate != null)
+                {
+                    var currentVersionBase = UpdateNotificationViewModel.CurrentAppVersion.Split('+')[0];
+                    var artifactVersionBase = artifactUpdate.Version.Split('+')[0];
+
+                    if (AppUpdateVersionHelper.IsArtifactVersionNewer(artifactVersionBase, currentVersionBase) &&
+                        !string.Equals(artifactVersionBase, settings.DismissedUpdateVersion, StringComparison.OrdinalIgnoreCase))
+                    {
+                        var updateIdentity = $"pr:{prNumber}:{artifactVersionBase}";
+                        if (string.Equals(_lastNotifiedUpdateIdentity, updateIdentity, StringComparison.Ordinal))
+                        {
+                            logger?.LogDebug("Update notification already shown for {Identity}, skipping duplicate notification", updateIdentity);
+                            return;
+                        }
+
+                        _lastNotifiedUpdateIdentity = updateIdentity;
+                        logger?.LogInformation("PR #{PrNumber} update available: {Version}", prNumber, artifactUpdate.DisplayVersion);
+                        notificationService.Show(new NotificationMessage(
+                            NotificationType.Info,
+                            AppUpdateConstants.PrUpdateAvailableNotificationTitle,
+                            string.Format(AppUpdateConstants.PrUpdateNotificationFormat, artifactUpdate.DisplayVersion, prNumber),
+                            autoDismissMilliseconds: null,
+                            actions:
+                            [
+                                new NotificationAction(
+                                    AppUpdateConstants.UpdateAction,
+                                    () => _ = PerformOneClickUpdateAsync(artifactUpdate, null, null),
+                                    NotificationActionStyle.Primary,
+                                    dismissOnExecute: true),
+                            ],
+                            isPersistent: true,
+                            showInBadge: true));
+                    }
+                }
+
+                return;
+            }
+
+            // 2. check for subscribed branch artifacts
+            if (!string.IsNullOrWhiteSpace(settings.SubscribedBranch))
+            {
+                var branch = settings.SubscribedBranch;
+                logger?.LogDebug("User subscribed to branch '{Branch}', checking for artifact updates", branch);
+                velopackUpdateManager.SubscribedBranch = branch;
+                velopackUpdateManager.SubscribedPrNumber = null;
+
+                var artifactUpdate = await velopackUpdateManager.CheckForArtifactUpdatesAsync(cancellationToken);
+                if (artifactUpdate != null)
+                {
+                    var currentVersionBase = UpdateNotificationViewModel.CurrentAppVersion.Split('+')[0];
+                    var artifactVersionBase = artifactUpdate.Version.Split('+')[0];
+
+                    if (AppUpdateVersionHelper.IsArtifactVersionNewer(artifactVersionBase, currentVersionBase) &&
+                        !string.Equals(artifactVersionBase, settings.DismissedUpdateVersion, StringComparison.OrdinalIgnoreCase))
+                    {
+                        var updateIdentity = $"branch:{branch}:{artifactVersionBase}";
+                        if (string.Equals(_lastNotifiedUpdateIdentity, updateIdentity, StringComparison.Ordinal))
+                        {
+                            logger?.LogDebug("Update notification already shown for {Identity}, skipping duplicate notification", updateIdentity);
+                            return;
+                        }
+
+                        _lastNotifiedUpdateIdentity = updateIdentity;
+                        logger?.LogInformation("Branch '{Branch}' update available: {Version}", branch, artifactUpdate.DisplayVersion);
+                        notificationService.Show(new NotificationMessage(
+                            NotificationType.Info,
+                            AppUpdateConstants.BranchUpdateAvailableNotificationTitle,
+                            string.Format(AppUpdateConstants.BranchUpdateNotificationFormat, artifactUpdate.DisplayVersion, branch),
+                            autoDismissMilliseconds: null,
+                            actions:
+                            [
+                                new NotificationAction(
+                                    AppUpdateConstants.UpdateAction,
+                                    () => _ = PerformOneClickUpdateAsync(artifactUpdate, null, null),
+                                    NotificationActionStyle.Primary,
+                                    dismissOnExecute: true),
+                            ],
+                            isPersistent: true,
+                            showInBadge: true));
+                    }
+                }
+
+                return;
             }
 
-            // 1. Check for standard GitHub releases (Default)
-            if (string.IsNullOrEmpty(settings.SubscribedBranch))
+            // 3. check for standard github releases
+            velopackUpdateManager.SubscribedPrNumber = null;
+            velopackUpdateManager.SubscribedBranch = null;
+
+            var updateInfo = await velopackUpdateManager.CheckForUpdatesAsync(cancellationToken);
+            if (updateInfo != null)
             {
-                var updateInfo = await velopackUpdateManager.CheckForUpdatesAsync(cancellationToken);
-                if (updateInfo != null)
+                var version = updateInfo.TargetFullRelease.Version.ToString();
+                if (!string.Equals(version, settings.DismissedUpdateVersion, StringComparison.OrdinalIgnoreCase))
                 {
-                    logger?.LogInformation("GitHub release update available: {Version}", updateInfo.TargetFullRelease.Version);
-                    await Dispatcher.UIThread.InvokeAsync(() => notificationService.Show(new NotificationMessage(
+                    var updateIdentity = $"release:{version}";
+                    if (string.Equals(_lastNotifiedUpdateIdentity, updateIdentity, StringComparison.Ordinal))
+                    {
+                        logger?.LogDebug("Update notification already shown for {Identity}, skipping duplicate notification", updateIdentity);
+                        return;
+                    }
+
+                    _lastNotifiedUpdateIdentity = updateIdentity;
+                    logger?.LogInformation("GitHub release update available: {Version}", version);
+                    notificationService.Show(new NotificationMessage(
                         NotificationType.Info,
-                        "Update Available",
-                        $"A new version ({updateInfo.TargetFullRelease.Version}) is available.",
-                        null, // Persistent
+                        AppUpdateConstants.UpdateAvailableNotificationTitle,
+                        string.Format(AppUpdateConstants.ReleaseUpdateNotificationFormat, version),
+                        autoDismissMilliseconds: null,
                         actions:
                         [
                             new NotificationAction(
-                                "View Updates",
-                                () => SettingsViewModel.OpenUpdateWindowCommand.Execute(null),
+                                AppUpdateConstants.UpdateAction,
+                                () => _ = PerformOneClickUpdateAsync(null, updateInfo, null),
                                 NotificationActionStyle.Primary,
                                 dismissOnExecute: true),
-                        ])));
+                        ],
+                        isPersistent: true,
+                        showInBadge: true));
                     return;
                 }
             }
-            else
+            else if (velopackUpdateManager.HasUpdateAvailableFromGitHub)
             {
-                // 2. Check for Subscribed Branch Artifacts
-                logger?.LogDebug("User subscribed to branch '{Branch}', checking for artifact updates", settings.SubscribedBranch);
-                velopackUpdateManager.SubscribedBranch = settings.SubscribedBranch;
-                velopackUpdateManager.SubscribedPrNumber = null; // Clear PR to avoid ambiguity
-
-                var artifactUpdate = await velopackUpdateManager.CheckForArtifactUpdatesAsync(cancellationToken);
-
-                if (artifactUpdate != null)
+                var githubVersion = velopackUpdateManager.LatestVersionFromGitHub;
+                if (!string.IsNullOrWhiteSpace(githubVersion) &&
+                    !string.Equals(githubVersion, settings.DismissedUpdateVersion, StringComparison.OrdinalIgnoreCase))
                 {
-                    var newVersionBase = artifactUpdate.Version.Split('+')[0];
+                    var updateIdentity = $"github:{githubVersion}";
+                    if (string.Equals(_lastNotifiedUpdateIdentity, updateIdentity, StringComparison.Ordinal))
+                    {
+                        logger?.LogDebug("Update notification already shown for {Identity}, skipping duplicate notification", updateIdentity);
+                        return;
+                    }
 
-                    await Dispatcher.UIThread.InvokeAsync(() => notificationService.Show(new NotificationMessage(
+                    _lastNotifiedUpdateIdentity = updateIdentity;
+                    logger?.LogInformation("GitHub API release update available: {Version}", githubVersion);
+                    notificationService.Show(new NotificationMessage(
                         NotificationType.Info,
-                        "Branch Update Available",
-                        $"A new build ({newVersionBase}) is available on branch '{settings.SubscribedBranch}'.",
-                        null, // Persistent
+                        AppUpdateConstants.UpdateAvailableNotificationTitle,
+                        string.Format(AppUpdateConstants.ReleaseUpdateNotificationFormat, githubVersion),
+                        autoDismissMilliseconds: null,
                         actions:
                         [
                             new NotificationAction(
-                                "View Updates",
-                                () => SettingsViewModel.OpenUpdateWindowCommand.Execute(null),
+                                AppUpdateConstants.UpdateAction,
+                                () => _ = PerformOneClickUpdateAsync(null, null, githubVersion),
                                 NotificationActionStyle.Primary,
                                 dismissOnExecute: true),
-                        ])));
+                        ],
+                        isPersistent: true,
+                        showInBadge: true));
                 }
             }
         }
@@ -301,6 +431,99 @@ await Dispatcher.UIThread.InvokeAsync(() => notificationService.Show(new Notific
         }
     }
 
+    private async Task PerformOneClickUpdateAsync(
+        ArtifactUpdateInfo? artifactUpdate,
+        UpdateInfo? updateInfo,
+        string? githubVersion)
+    {
+        var progressNotificationId = Guid.NewGuid();
+
+        // show the progress notification immediately
+        notificationService.Show(new NotificationMessage(
+            NotificationType.Info,
+            AppUpdateConstants.UpdatingAppNotificationTitle,
+            AppUpdateConstants.UpdateStartingMessage,
+            autoDismissMilliseconds: null,
+            isPersistent: false,
+            showInBadge: false)
+        {
+            Id = progressNotificationId,
+        });
+
+        var progress = new Progress<UpdateProgress>(p =>
+        {
+            string statusText;
+            if (!string.IsNullOrWhiteSpace(p.Message))
+            {
+                statusText = p.Message;
+            }
+            else if (!string.IsNullOrWhiteSpace(p.Status))
+            {
+                statusText = p.Status;
+            }
+            else
+            {
+                statusText = $"{p.PercentComplete}%";
+            }
+
+            notificationService.Update(
+                progressNotificationId,
+                statusText,
+                AppUpdateConstants.UpdatingAppNotificationTitle);
+        });
+
+        try
+        {
+            if (artifactUpdate != null)
+            {
+                logger?.LogInformation("Starting one-click artifact install: {Version}", artifactUpdate.DisplayVersion);
+                await velopackUpdateManager.InstallArtifactAsync(artifactUpdate, progress, _initializationCts.Token);
+                notificationService.Update(
+                    progressNotificationId,
+                    AppUpdateConstants.UpdateCompleteRestartingMessage,
+                    AppUpdateConstants.UpdatingAppNotificationTitle);
+            }
+            else if (updateInfo != null)
+            {
+                logger?.LogInformation("Starting one-click release update: {Version}", updateInfo.TargetFullRelease.Version);
+                await velopackUpdateManager.DownloadUpdatesAsync(updateInfo, progress, _initializationCts.Token);
+                notificationService.Update(
+                    progressNotificationId,
+                    AppUpdateConstants.UpdateDownloadedRestartingMessage,
+                    AppUpdateConstants.UpdatingAppNotificationTitle);
+                velopackUpdateManager.ApplyUpdatesAndRestart(updateInfo);
+            }
+            else if (!string.IsNullOrWhiteSpace(githubVersion))
+            {
+                logger?.LogInformation("Opening update window for GitHub API update: {Version}", githubVersion);
+                notificationService.Dismiss(progressNotificationId);
+                OpenUpdateSettings();
+            }
+        }
+        catch (Exception ex)
+        {
+            logger?.LogError(ex, "Failed to install update");
+            notificationService.Dismiss(progressNotificationId);
+            notificationService.ShowError(
+                AppUpdateConstants.UpdateFailedNotificationTitle,
+                string.Format(AppUpdateConstants.UpdateFailedNotificationFormat, ex.Message),
+                autoDismissMs: NotificationConstants.DefaultAutoDismissMs);
+        }
+    }
+
+    private void OpenUpdateSettings()
+    {
+        SelectTab(NavigationTab.Settings);
+        if (Dispatcher.UIThread.CheckAccess())
+        {
+            SettingsViewModel.OpenUpdateWindowCommand.Execute(null);
+        }
+        else
+        {
+            Dispatcher.UIThread.Post(() => SettingsViewModel.OpenUpdateWindowCommand.Execute(null));
+        }
+    }
+
     private async Task CheckForUpdatesInBackgroundAsync(CancellationToken ct)
     {
         try
@@ -317,6 +540,42 @@ private async Task CheckForUpdatesInBackgroundAsync(CancellationToken ct)
         }
     }
 
+    private void RestartPeriodicUpdateTimer(bool enabled, int intervalMinutes)
+    {
+        _periodicUpdateTimer?.Dispose();
+        _periodicUpdateTimer = null;
+
+        if (!enabled || intervalMinutes <= 0)
+        {
+            return;
+        }
+
+        var clampedInterval = Math.Clamp(
+            intervalMinutes,
+            AppUpdateConstants.MinPeriodicUpdateCheckIntervalMinutes,
+            AppUpdateConstants.MaxPeriodicUpdateCheckIntervalMinutes);
+
+        var interval = TimeSpan.FromMinutes(clampedInterval);
+        logger?.LogDebug("Starting periodic update check timer with interval: {Interval}", interval);
+
+        _periodicUpdateTimer = new Timer(
+            OnPeriodicUpdateTimerCallback,
+            null,
+            interval,
+            interval);
+    }
+
+    private void OnPeriodicUpdateTimerCallback(object? state)
+    {
+        if (_initializationCts.IsCancellationRequested)
+        {
+            return;
+        }
+
+        logger?.LogDebug("Periodic update check timer triggered");
+        _ = CheckForUpdatesInBackgroundAsync(_initializationCts.Token);
+    }
+
     private void CheckForQuickStart()
     {
         var settings = userSettingsService.Get();
diff --git a/GenHub/GenHub/Common/Views/Dialogs/GenericMessageWindow.axaml.cs b/GenHub/GenHub/Common/Views/Dialogs/GenericMessageWindow.axaml.cs
index c67e2f4de..6ab5e9417 100644
--- a/GenHub/GenHub/Common/Views/Dialogs/GenericMessageWindow.axaml.cs
+++ b/GenHub/GenHub/Common/Views/Dialogs/GenericMessageWindow.axaml.cs
@@ -1,6 +1,9 @@
 using System;
 using Avalonia;
 using Avalonia.Controls;
+#if DEBUG
+using Avalonia.Diagnostics;
+#endif
 using Avalonia.Input;
 using Avalonia.Markup.Xaml;
 using GenHub.Common.ViewModels.Dialogs;
diff --git a/GenHub/GenHub/Common/Views/Dialogs/UpdateOptionDialogWindow.axaml b/GenHub/GenHub/Common/Views/Dialogs/UpdateOptionDialogWindow.axaml
index 7a1c10fc9..1362960c1 100644
--- a/GenHub/GenHub/Common/Views/Dialogs/UpdateOptionDialogWindow.axaml
+++ b/GenHub/GenHub/Common/Views/Dialogs/UpdateOptionDialogWindow.axaml
@@ -10,6 +10,7 @@
         Width="500" SizeToContent="Height"
         WindowStartupLocation="CenterOwner"
         SystemDecorations="None"
+        CanResize="False"
         TransparencyLevelHint="AcrylicBlur"
         Background="Transparent"
         ExtendClientAreaToDecorationsHint="True">
diff --git a/GenHub/GenHub/Common/Views/MainWindow.axaml.cs b/GenHub/GenHub/Common/Views/MainWindow.axaml.cs
index e11b82cf0..899d41a32 100644
--- a/GenHub/GenHub/Common/Views/MainWindow.axaml.cs
+++ b/GenHub/GenHub/Common/Views/MainWindow.axaml.cs
@@ -26,7 +26,7 @@ private void OnTitleBarPointerPressed(object? sender, PointerPressedEventArgs e)
     {
         if (e.GetCurrentPoint(this).Properties.IsLeftButtonPressed)
         {
-            if (e.ClickCount == 2)
+            if (e.ClickCount == 2 && CanResize)
             {
                 MaximizeButton_Click(sender, new Avalonia.Interactivity.RoutedEventArgs());
             }
diff --git a/GenHub/GenHub/Features/AppUpdate/Services/VelopackUpdateManager.cs b/GenHub/GenHub/Features/AppUpdate/Services/VelopackUpdateManager.cs
index 9732215b2..3b0388c1f 100644
--- a/GenHub/GenHub/Features/AppUpdate/Services/VelopackUpdateManager.cs
+++ b/GenHub/GenHub/Features/AppUpdate/Services/VelopackUpdateManager.cs
@@ -52,11 +52,16 @@ public partial class VelopackUpdateManager : IVelopackUpdateManager, IDisposable
     private UpdateInfo? _cachedUpdateInfo;
     private DateTime _lastArtifactCheckTime = DateTime.MinValue;
     private ArtifactUpdateInfo? _cachedArtifactUpdateInfo;
+    private int? _cachedArtifactSubscribedPrNumber;
+    private string? _cachedArtifactSubscribedBranch;
     private DateTime _lastPrListCheckTime = DateTime.MinValue;
     private IReadOnlyList<PullRequestInfo>? _cachedPrList;
     private DateTime _lastBranchListCheckTime = DateTime.MinValue;
     private IReadOnlyList<string>? _cachedBranchList;
 
+    private int? _subscribedPrNumber;
+    private string? _subscribedBranch;
+
     /// <inheritdoc/>
     public bool HasArtifactUpdateAvailable => _latestArtifactUpdate != null;
 
@@ -64,10 +69,34 @@ public partial class VelopackUpdateManager : IVelopackUpdateManager, IDisposable
     public ArtifactUpdateInfo? LatestArtifactUpdate => _latestArtifactUpdate;
 
     /// <inheritdoc/>
-    public int? SubscribedPrNumber { get; set; }
+    public int? SubscribedPrNumber
+    {
+        get => _subscribedPrNumber;
+        set
+        {
+            if (_subscribedPrNumber != value)
+            {
+                _subscribedPrNumber = value;
+                _cachedArtifactUpdateInfo = null;
+                _lastArtifactCheckTime = DateTime.MinValue;
+            }
+        }
+    }
 
     /// <inheritdoc/>
-    public string? SubscribedBranch { get; set; }
+    public string? SubscribedBranch
+    {
+        get => _subscribedBranch;
+        set
+        {
+            if (!string.Equals(_subscribedBranch, value, StringComparison.OrdinalIgnoreCase))
+            {
+                _subscribedBranch = value;
+                _cachedArtifactUpdateInfo = null;
+                _lastArtifactCheckTime = DateTime.MinValue;
+            }
+        }
+    }
 
     /// <inheritdoc/>
     public bool IsPrMergedOrClosed { get; private set; }
@@ -370,8 +399,13 @@ public string? LatestVersionFromGitHub
     /// <inheritdoc/>
     public async Task<ArtifactUpdateInfo?> CheckForArtifactUpdatesAsync(CancellationToken cancellationToken = default)
     {
-        // Check cache
-        if (DateTime.UtcNow - _lastArtifactCheckTime < AppUpdateConstants.CacheDuration)
+        var targetPrNumber = SubscribedPrNumber;
+        var targetBranch = SubscribedBranch;
+
+        // check cache
+        if (DateTime.UtcNow - _lastArtifactCheckTime < AppUpdateConstants.CacheDuration &&
+            _cachedArtifactSubscribedPrNumber == targetPrNumber &&
+            string.Equals(_cachedArtifactSubscribedBranch, targetBranch, StringComparison.OrdinalIgnoreCase))
         {
             _logger.LogInformation("Returning cached artifact update info (checked {TimeLess} ago)", (DateTime.UtcNow - _lastArtifactCheckTime).ToString(@"mm\:ss"));
             return _cachedArtifactUpdateInfo;
@@ -387,34 +421,44 @@ public string? LatestVersionFromGitHub
 
         try
         {
-            // Reset latest artifact if switching modes/channels
-            _latestArtifactUpdate = null;
+            ArtifactUpdateInfo? artifactUpdate = null;
 
-            // Priority:
-            // 1. Subscribed PR
-            // 2. Subscribed Branch
-            // 3. Overall latest
-            if (SubscribedPrNumber.HasValue)
+            // priority:
+            // 1. subscribed pr
+            // 2. subscribed branch
+            // 3. overall latest
+            if (targetPrNumber.HasValue)
             {
-                _logger.LogInformation("Checking for artifacts for subscribed PR #{PrNumber}", SubscribedPrNumber.Value);
+                _logger.LogInformation("Checking for artifacts for subscribed PR #{PrNumber}", targetPrNumber.Value);
                 var prs = await GetOpenPullRequestsAsync(cancellationToken);
-                var subscribedPr = prs.FirstOrDefault(p => p.Number == SubscribedPrNumber.Value);
-                _latestArtifactUpdate = subscribedPr?.LatestArtifact;
+                var subscribedPr = prs.FirstOrDefault(p => p.Number == targetPrNumber.Value);
+                artifactUpdate = subscribedPr?.LatestArtifact;
             }
-            else if (!string.IsNullOrEmpty(SubscribedBranch))
+            else if (!string.IsNullOrEmpty(targetBranch))
             {
-                _logger.LogInformation("Checking for artifacts for subscribed branch: {Branch}", SubscribedBranch);
-                _latestArtifactUpdate = await FindLatestArtifactAsync(SubscribedBranch, cancellationToken);
+                _logger.LogInformation("Checking for artifacts for subscribed branch: {Branch}", targetBranch);
+                artifactUpdate = await FindLatestArtifactAsync(targetBranch, cancellationToken);
             }
             else
             {
                 _logger.LogInformation("Checking for overall latest artifact");
-                _latestArtifactUpdate = await FindLatestArtifactAsync(null, cancellationToken);
+                artifactUpdate = await FindLatestArtifactAsync(null, cancellationToken);
             }
 
-            _cachedArtifactUpdateInfo = _latestArtifactUpdate;
+            // verify subscription did not change while awaiting
+            if (SubscribedPrNumber != targetPrNumber ||
+                !string.Equals(SubscribedBranch, targetBranch, StringComparison.OrdinalIgnoreCase))
+            {
+                _logger.LogInformation("Subscription changed during artifact check, discarding result");
+                return null;
+            }
+
+            _latestArtifactUpdate = artifactUpdate;
+            _cachedArtifactUpdateInfo = artifactUpdate;
+            _cachedArtifactSubscribedPrNumber = targetPrNumber;
+            _cachedArtifactSubscribedBranch = targetBranch;
             _lastArtifactCheckTime = DateTime.UtcNow;
-            return _latestArtifactUpdate;
+            return artifactUpdate;
         }
         catch (Exception ex)
         {
@@ -519,7 +563,10 @@ public async Task<IReadOnlyList<PullRequestInfo>> GetOpenPullRequestsAsync(Cance
             }
 
             var prInfos = await Task.WhenAll(prTasks);
-            results.AddRange(prInfos);
+            var sortedPrs = prInfos
+                .OrderByDescending(p => p.UpdatedAt ?? DateTimeOffset.MinValue)
+                .ToList();
+            results.AddRange(sortedPrs);
 
             // Check if subscribed PR is still open
             subscribedPrFound = results.Any(p => p.Number == SubscribedPrNumber);
@@ -859,6 +906,8 @@ public void ClearCache()
         _cachedUpdateInfo = null;
         _lastArtifactCheckTime = DateTime.MinValue;
         _cachedArtifactUpdateInfo = null;
+        _cachedArtifactSubscribedPrNumber = null;
+        _cachedArtifactSubscribedBranch = null;
         _lastPrListCheckTime = DateTime.MinValue;
         _cachedPrList = null;
         _lastBranchListCheckTime = DateTime.MinValue;
@@ -1529,7 +1578,7 @@ private HttpClient CreateConfiguredHttpClientWithToken(SecureString token)
                 }
             }
 
-            _logger.LogWarning("No suitable artifacts found in the last 10 'push' runs for branch {Branch}", branch ?? "any");
+            _logger.LogWarning("No suitable artifacts found in workflow runs for branch {Branch}", branch ?? "any");
             return null;
         }
         catch (Exception ex)
@@ -1555,15 +1604,17 @@ private HttpClient CreateConfiguredHttpClientWithToken(SecureString token)
         var shortHash = headSha.Length >= AppConstants.GitShortHashLength ? headSha[..AppConstants.GitShortHashLength] : headSha;
         var actualBranch = run.TryGetProperty("head_branch", out var b) ? b.GetString() : branch ?? "unknown";
 
-        if (!string.Equals(eventType, "push", StringComparison.OrdinalIgnoreCase))
+        _logger.LogDebug("Checking run {RunId} ({EventType}) on branch {ActualBranch}", runId, eventType, actualBranch);
+
+        if (!string.IsNullOrEmpty(branch) && !string.Equals(actualBranch, branch, StringComparison.Ordinal))
         {
-            _logger.LogDebug("Skipping run {RunId} ({EventType}) - only 'push' events are valid for branch subscriptions", runId, eventType);
+            _logger.LogDebug("Skipping run {RunId} ({ActualBranch}) - does not match requested branch {Branch}", runId, actualBranch, branch);
             return null;
         }
 
-        if (!string.IsNullOrEmpty(branch) && !string.Equals(actualBranch, branch, StringComparison.OrdinalIgnoreCase))
+        if (!string.IsNullOrEmpty(branch) && !string.Equals(eventType, "push", StringComparison.OrdinalIgnoreCase) && !string.Equals(eventType, "workflow_dispatch", StringComparison.OrdinalIgnoreCase))
         {
-            _logger.LogDebug("Skipping run {RunId} ({ActualBranch}) - does not match requested branch {Branch}", runId, actualBranch, branch);
+            _logger.LogDebug("Skipping run {RunId} ({EventType}) - not a push or workflow_dispatch event for branch {Branch}", runId, eventType, branch);
             return null;
         }
 
@@ -1607,9 +1658,50 @@ private HttpClient CreateConfiguredHttpClientWithToken(SecureString token)
         return null;
     }
 
+    private bool IsMatchingWorkflowRun(JsonElement run, string? branchName, int? prNumber)
+    {
+        var actualBranch = run.TryGetProperty("head_branch", out var b) ? b.GetString() : branchName ?? "unknown";
+        var eventType = run.TryGetProperty("event", out var e) ? e.GetString() : "unknown";
+
+        if (prNumber.HasValue)
+        {
+            if (run.TryGetProperty("pull_requests", out var prs) && prs.ValueKind == JsonValueKind.Array)
+            {
+                var prCount = 0;
+                foreach (var pr in prs.EnumerateArray())
+                {
+                    prCount++;
+                    if (pr.TryGetProperty("number", out var num) && num.GetInt32() == prNumber.Value)
+                    {
+                        return true;
+                    }
+                }
+
+                if (prCount > 0)
+                {
+                    return false;
+                }
+            }
+
+            return string.IsNullOrEmpty(branchName) || string.Equals(actualBranch, branchName, StringComparison.Ordinal);
+        }
+
+        if (!string.IsNullOrEmpty(branchName))
+        {
+            if (!string.Equals(actualBranch, branchName, StringComparison.Ordinal))
+            {
+                return false;
+            }
+
+            return string.Equals(eventType, "push", StringComparison.OrdinalIgnoreCase) ||
+                   string.Equals(eventType, "workflow_dispatch", StringComparison.OrdinalIgnoreCase);
+        }
+
+        return true;
+    }
+
     private async Task<IReadOnlyList<ArtifactUpdateInfo>> FindArtifactsAsync(HttpClient client, string? branchName, int? prNumber, CancellationToken cancellationToken)
     {
-        var results = new List<ArtifactUpdateInfo>();
         var owner = AppConstants.GitHubRepositoryOwner;
         var repo = AppConstants.GitHubRepositoryName;
 
@@ -1618,13 +1710,18 @@ private async Task<IReadOnlyList<ArtifactUpdateInfo>> FindArtifactsAsync(HttpCli
             : string.Format(ApiConstants.GitHubApiWorkflowRunsAllFormat, owner, repo);
 
         var runsResponse = await SendWithRetryAsync(client, runsUrl, cancellationToken);
-        if (runsResponse == null || !runsResponse.IsSuccessStatusCode) return [];
+        if (runsResponse == null || !runsResponse.IsSuccessStatusCode)
+        {
+            return [];
+        }
 
         var runsJson = await runsResponse.Content.ReadAsStringAsync(cancellationToken);
         using var runsDoc = JsonDocument.Parse(runsJson);
-        var workflowRuns = runsDoc.RootElement.GetProperty("workflow_runs");
+        if (!runsDoc.RootElement.TryGetProperty("workflow_runs", out var workflowRuns))
+        {
+            return [];
+        }
 
-        var addedVersions = new HashSet<string>();
         var platformFilter = GetCurrentPlatformFilter();
         if (platformFilter == null)
         {
@@ -1632,64 +1729,116 @@ private async Task<IReadOnlyList<ArtifactUpdateInfo>> FindArtifactsAsync(HttpCli
             return [];
         }
 
+        var results = new List<ArtifactUpdateInfo>();
+        var addedVersions = new HashSet<string>();
+
         foreach (var run in workflowRuns.EnumerateArray())
         {
-            var runId = run.GetProperty("id").GetInt64();
-            var runNum = run.GetProperty("run_number").GetInt32();
-            var createdAt = run.GetProperty("created_at").GetDateTimeOffset();
-            var headSha = run.GetProperty("head_sha").GetString() ?? string.Empty;
-            var shortHash = headSha.Length >= 7 ? headSha[..7] : headSha;
+            if (!IsMatchingWorkflowRun(run, branchName, prNumber))
+            {
+                continue;
+            }
 
-            var artifactsUrl = run.GetProperty("artifacts_url").GetString();
-            if (string.IsNullOrEmpty(artifactsUrl)) continue;
+            await ExtractArtifactsFromWorkflowRunAsync(client, run, prNumber, platformFilter, addedVersions, results, cancellationToken);
+        }
 
-            var artifactsResponse = await SendWithRetryAsync(client, artifactsUrl, cancellationToken);
-            if (artifactsResponse == null || !artifactsResponse.IsSuccessStatusCode) continue;
+        return [.. results.OrderByDescending(r => r.CreatedAt)];
+    }
 
-            var artifactsJson = await artifactsResponse.Content.ReadAsStringAsync(cancellationToken);
-            using var artifactsDoc = JsonDocument.Parse(artifactsJson);
-            var artifacts = artifactsDoc.RootElement.GetProperty("artifacts");
+    private async Task ExtractArtifactsFromWorkflowRunAsync(
+        HttpClient client,
+        JsonElement run,
+        int? prNumber,
+        string platformFilter,
+        HashSet<string> addedVersions,
+        List<ArtifactUpdateInfo> results,
+        CancellationToken cancellationToken)
+    {
+        var artifactsUrl = run.TryGetProperty("artifacts_url", out var u) ? u.GetString() : null;
+        if (string.IsNullOrEmpty(artifactsUrl))
+        {
+            return;
+        }
 
-            foreach (var artifact in artifacts.EnumerateArray())
-            {
-                var name = artifact.GetProperty("name").GetString();
-                if (string.IsNullOrEmpty(name) || !name.Contains("velopack", StringComparison.OrdinalIgnoreCase)) continue;
+        var artifactsResponse = await SendWithRetryAsync(client, artifactsUrl, cancellationToken);
+        if (artifactsResponse == null || !artifactsResponse.IsSuccessStatusCode)
+        {
+            return;
+        }
 
-                if (!name.Contains(platformFilter, StringComparison.OrdinalIgnoreCase))
-                {
-                    _logger.LogDebug("Skipping artifact {Name} - doesn't match platform {Platform}", name, platformFilter);
-                    continue;
-                }
+        var artifactsJson = await artifactsResponse.Content.ReadAsStringAsync(cancellationToken);
+        using var artifactsDoc = JsonDocument.Parse(artifactsJson);
+        if (!artifactsDoc.RootElement.TryGetProperty("artifacts", out var artifacts))
+        {
+            return;
+        }
 
-                var version = ExtractVersionFromArtifactName(name) ?? $"0.0.0-ci.{runNum}";
-                var uniqueKey = $"{version}|{shortHash}";
-                if (!addedVersions.Add(uniqueKey))
-                {
-                    _logger.LogDebug("Skipping duplicate artifact: {Version} ({Hash})", version, shortHash);
-                    continue;
-                }
+        if (!run.TryGetProperty("id", out var idProp) || !idProp.TryGetInt64(out var runId) ||
+            !run.TryGetProperty("run_number", out var runNumProp) || !runNumProp.TryGetInt32(out var runNum) ||
+            !run.TryGetProperty("created_at", out var createdAtProp) || !createdAtProp.TryGetDateTimeOffset(out var createdAt))
+        {
+            return;
+        }
 
-                var id = artifact.GetProperty("id").GetInt64();
-                var size = artifact.GetProperty("size_in_bytes").GetInt64();
-                var downloadUrl = artifact.GetProperty("archive_download_url").GetString();
-                var workflowRunUrl = run.GetProperty("html_url").GetString() ?? string.Empty;
-
-                var info = new ArtifactUpdateInfo(
-                    Version: version,
-                    GitHash: shortHash,
-                    PullRequestNumber: prNumber,
-                    WorkflowRunId: runId,
-                    WorkflowRunUrl: workflowRunUrl,
-                    ArtifactId: id,
-                    ArtifactName: name ?? "Unknown",
-                    CreatedAt: createdAt.UtcDateTime,
-                    DownloadUrl: downloadUrl,
-                    Size: size);
+        var headSha = run.TryGetProperty("head_sha", out var sha) ? sha.GetString() ?? string.Empty : string.Empty;
+        var shortHash = headSha.Length >= AppConstants.GitShortHashLength ? headSha[..AppConstants.GitShortHashLength] : headSha;
+        var workflowRunUrl = run.TryGetProperty("html_url", out var html) ? html.GetString() ?? string.Empty : string.Empty;
 
+        foreach (var artifact in artifacts.EnumerateArray())
+        {
+            var info = TryParseArtifactUpdateInfo(artifact, runId, runNum, createdAt.UtcDateTime, shortHash, workflowRunUrl, prNumber, platformFilter, addedVersions);
+            if (info != null)
+            {
                 results.Add(info);
             }
         }
+    }
 
-        return [.. results.OrderByDescending(r => r.CreatedAt)];
+    private ArtifactUpdateInfo? TryParseArtifactUpdateInfo(
+        JsonElement artifact,
+        long runId,
+        int runNum,
+        DateTime createdAtUtc,
+        string shortHash,
+        string workflowRunUrl,
+        int? prNumber,
+        string platformFilter,
+        HashSet<string> addedVersions)
+    {
+        var name = artifact.TryGetProperty("name", out var n) ? n.GetString() : null;
+        if (string.IsNullOrEmpty(name) || !name.Contains("velopack", StringComparison.OrdinalIgnoreCase))
+        {
+            return null;
+        }
+
+        if (!name.Contains(platformFilter, StringComparison.OrdinalIgnoreCase))
+        {
+            _logger.LogDebug("Skipping artifact {Name} - doesn't match platform {Platform}", name, platformFilter);
+            return null;
+        }
+
+        var version = ExtractVersionFromArtifactName(name) ?? $"0.0.0-ci.{runNum}";
+        var uniqueKey = $"{version}|{shortHash}";
+        if (!addedVersions.Add(uniqueKey))
+        {
+            _logger.LogDebug("Skipping duplicate artifact: {Version} ({Hash})", version, shortHash);
+            return null;
+        }
+
+        var id = artifact.GetProperty("id").GetInt64();
+        var size = artifact.GetProperty("size_in_bytes").GetInt64();
+        var downloadUrl = artifact.TryGetProperty("archive_download_url", out var dl) ? dl.GetString() : null;
+
+        return new ArtifactUpdateInfo(
+            Version: version,
+            GitHash: shortHash,
+            PullRequestNumber: prNumber,
+            WorkflowRunId: runId,
+            WorkflowRunUrl: workflowRunUrl,
+            ArtifactId: id,
+            ArtifactName: name,
+            CreatedAt: createdAtUtc,
+            DownloadUrl: downloadUrl,
+            Size: size);
     }
 }
diff --git a/GenHub/GenHub/Features/AppUpdate/ViewModels/UpdateNotificationViewModel.cs b/GenHub/GenHub/Features/AppUpdate/ViewModels/UpdateNotificationViewModel.cs
index ed34fe005..d6d9461c5 100644
--- a/GenHub/GenHub/Features/AppUpdate/ViewModels/UpdateNotificationViewModel.cs
+++ b/GenHub/GenHub/Features/AppUpdate/ViewModels/UpdateNotificationViewModel.cs
@@ -10,6 +10,7 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using GenHub.Core.Constants;
+using GenHub.Core.Helpers;
 using GenHub.Core.Interfaces.Common;
 using GenHub.Core.Interfaces.GitHub;
 using GenHub.Core.Models.AppUpdate;
@@ -25,34 +26,58 @@ namespace GenHub.Features.AppUpdate.ViewModels;
 /// </summary>
 public partial class UpdateNotificationViewModel : ObservableObject, IDisposable
 {
-    private readonly IVelopackUpdateManager _velopackUpdateManager;
-    private readonly ILogger<UpdateNotificationViewModel> _logger;
-    private readonly IUserSettingsService _userSettingsService;
-    private readonly CancellationTokenSource _cancellationTokenSource;
-    private UpdateInfo? _currentUpdateInfo;
+    private static readonly Lazy<string> CachedCurrentAppVersion = new(() =>
+    {
+        try
+        {
+            // get actual installed version from velopack
+            var updateManager = new UpdateManager(new SimpleWebSource(string.Empty));
+            var currentVersion = updateManager.CurrentVersion;
+            return currentVersion?.ToString() ?? AppConstants.AppVersion;
+        }
+        catch
+        {
+            // fallback to compile-time version if velopack fails
+            return AppConstants.AppVersion;
+        }
+    });
 
     /// <summary>
     /// Gets the current application version.
     /// </summary>
-    public static string CurrentAppVersion
+    public static string CurrentAppVersion => CachedCurrentAppVersion.Value;
+
+    /// <summary>
+    /// Gets the formatted display string of the currently installed application version.
+    /// </summary>
+    public static string DisplayCurrentVersion
     {
         get
         {
-            try
-            {
-                // Get actual installed version from Velopack
-                var updateManager = new UpdateManager(new SimpleWebSource(string.Empty));
-                var currentVersion = updateManager.CurrentVersion;
-                return currentVersion?.ToString() ?? AppConstants.AppVersion;
-            }
-            catch
+            var version = CurrentAppVersion;
+            if (string.IsNullOrWhiteSpace(version))
             {
-                // Fallback to compile-time version if Velopack fails
-                return AppConstants.AppVersion;
+                return "0.0.0";
             }
+
+            var cleanVersion = version.Split('+')[0].TrimStart('v', 'V');
+            return $"v{cleanVersion}";
         }
     }
 
+    /// <summary>
+    /// Gets the formatted display string of the currently installed application version for instance data binding.
+    /// </summary>
+    public string InstalledVersionDisplay => DisplayCurrentVersion;
+
+    private readonly IVelopackUpdateManager _velopackUpdateManager;
+    private readonly ILogger<UpdateNotificationViewModel> _logger;
+    private readonly IUserSettingsService _userSettingsService;
+    private readonly CancellationTokenSource _cancellationTokenSource;
+    private readonly List<PullRequestInfo> _allPullRequests = [];
+    private CancellationTokenSource? _loadArtifactsCts;
+    private UpdateInfo? _currentUpdateInfo;
+
     /// <summary>
     /// Gets or sets the status message.
     /// </summary>
@@ -126,6 +151,39 @@ public static string CurrentAppVersion
     [ObservableProperty]
     private ObservableCollection<PullRequestInfo> _availablePullRequests = [];
 
+    /// <summary>
+    /// Gets or sets the selected tab index (0 = Update, 1 = Browse Builds).
+    /// </summary>
+    [ObservableProperty]
+    [NotifyPropertyChangedFor(nameof(IsBrowseTabSelected))]
+    private int _selectedTabIndex;
+
+    /// <summary>
+    /// Gets a value indicating whether the browse builds tab is selected.
+    /// </summary>
+    public bool IsBrowseTabSelected => SelectedTabIndex == AppUpdateConstants.BrowseBuildsTabIndex;
+
+    /// <summary>
+    /// Gets the list of available sort options for pull requests.
+    /// </summary>
+    public IReadOnlyList<string> AvailableSortOptions { get; } =
+    [
+        AppUpdateConstants.SortOptionLastUpdated,
+        AppUpdateConstants.SortOptionPrNumberDesc,
+        AppUpdateConstants.SortOptionPrNumberAsc,
+    ];
+
+    /// <summary>
+    /// Gets or sets the selected sort option for pull requests.
+    /// </summary>
+    [ObservableProperty]
+    private string _selectedSortOption = AppUpdateConstants.SortOptionLastUpdated;
+
+    partial void OnSelectedSortOptionChanged(string value)
+    {
+        ApplyPullRequestSorting();
+    }
+
     /// <summary>
     /// Gets or sets the currently subscribed PR.
     /// </summary>
@@ -239,14 +297,14 @@ private async Task ForceRefresh()
     {
         await CheckForUpdatesAsync();
 
-        // Also refresh PRs/Branches if in browse mode
+        // also refresh prs and branches if in browse mode
         if (HasPat)
         {
             await LoadPullRequestsAsync();
             await LoadBranchesAsync();
         }
 
-        // Refresh artifacts for current subscription
+        // refresh artifacts for current subscription
         if (IsSubscribedToAny)
         {
             await LoadArtifactsForSubscribedItemAsync();
@@ -275,22 +333,40 @@ public UpdateNotificationViewModel(
         ManualRefreshCommand = new AsyncRelayCommand(ManualRefreshAsync, () => !IsChecking);
         DismissCommand = new RelayCommand(DismissUpdate);
 
-        // Check if PAT is available
+        // check if pat is available
         HasPat = gitHubTokenStorage?.HasToken() == true;
 
         _logger.LogInformation("UpdateNotificationViewModel initialized with Velopack (HasPat={HasPat})", HasPat);
 
-        // Monitor collection changes to update placeholder text
+        // monitor collection changes to update placeholder text
         AvailableVersions.CollectionChanged += (s, e) => OnPropertyChanged(nameof(VersionPlaceholderText));
 
-        // Automatically check for updates and load PRs when dialog opens
+        // automatically check for updates and load prs when dialog opens
         _ = InitializeAsync();
     }
 
     private async Task LoadArtifactsForSubscribedItemAsync()
     {
-        // Cancel any previous loading if possible, or just guard
-        if (IsLoadingVersions) return; // Simple guard, could be improved with cancellation token
+        // cancel any previous in-flight load
+        _loadArtifactsCts?.Cancel();
+        _loadArtifactsCts?.Dispose();
+        _loadArtifactsCts = null;
+
+        var targetPr = SubscribedPr;
+        var targetPrNumber = targetPr?.Number ?? _velopackUpdateManager.SubscribedPrNumber;
+        var targetBranch = SubscribedBranch;
+
+        if (targetPrNumber == null && string.IsNullOrEmpty(targetBranch))
+        {
+            IsLoadingVersions = false;
+            AvailableVersions.Clear();
+            SelectedVersion = null;
+            return;
+        }
+
+        var cts = CancellationTokenSource.CreateLinkedTokenSource(_cancellationTokenSource.Token);
+        _loadArtifactsCts = cts;
+        var token = cts.Token;
 
         IsLoadingVersions = true;
         AvailableVersions.Clear();
@@ -300,18 +376,25 @@ private async Task LoadArtifactsForSubscribedItemAsync()
         {
             IReadOnlyList<ArtifactUpdateInfo> artifacts = [];
 
-            if (SubscribedPr != null)
+            if (targetPrNumber.HasValue)
             {
-                artifacts = await _velopackUpdateManager.GetArtifactsForPullRequestAsync(SubscribedPr.Number, _cancellationTokenSource.Token);
+                _logger.LogInformation("Loading artifacts for PR #{PrNumber}", targetPrNumber.Value);
+                artifacts = await _velopackUpdateManager.GetArtifactsForPullRequestAsync(targetPrNumber.Value, token);
             }
-            else if (!string.IsNullOrEmpty(SubscribedBranch))
+            else if (!string.IsNullOrEmpty(targetBranch))
+            {
+                _logger.LogInformation("Loading artifacts for branch '{Branch}'", targetBranch);
+                artifacts = await _velopackUpdateManager.GetArtifactsForBranchAsync(targetBranch, token);
+            }
+
+            if (token.IsCancellationRequested)
             {
-                artifacts = await _velopackUpdateManager.GetArtifactsForBranchAsync(SubscribedBranch, _cancellationTokenSource.Token);
+                return;
             }
 
             _logger.LogInformation("Received {Count} platform-compatible artifacts from update manager", artifacts.Count);
 
-            // Use HashSet to prevent duplicates based on artifact ID
+            // use hashset to prevent duplicates based on artifact id
             var addedArtifactIds = new HashSet<long>();
             foreach (var artifact in artifacts)
             {
@@ -328,15 +411,29 @@ private async Task LoadArtifactsForSubscribedItemAsync()
 
             _logger.LogInformation("Loaded {Count} artifacts into AvailableVersions", AvailableVersions.Count);
 
-            // Don't auto-select to avoid duplicate display in ComboBox
+            // auto-select latest version for improved user experience
+            if (AvailableVersions.Count > 0)
+            {
+                SelectedVersion = AvailableVersions[0];
+            }
+        }
+        catch (OperationCanceledException)
+        {
+            _logger.LogDebug("Artifact loading cancelled for subscription change");
         }
         catch (Exception ex)
         {
-            _logger.LogError(ex, "Failed to load available versions");
+            if (!token.IsCancellationRequested)
+            {
+                _logger.LogError(ex, "Failed to load available versions");
+            }
         }
         finally
         {
-            IsLoadingVersions = false;
+            if (ReferenceEquals(_loadArtifactsCts, cts))
+            {
+                IsLoadingVersions = false;
+            }
         }
     }
 
@@ -345,7 +442,7 @@ private async Task LoadArtifactsForSubscribedItemAsync()
     /// </summary>
     private async Task InitializeAsync()
     {
-        // Load subscribed PR and Branch from settings
+        // load subscribed pr and branch from settings
         var settings = _userSettingsService.Get();
         if (settings.SubscribedPrNumber.HasValue)
         {
@@ -359,16 +456,16 @@ private async Task InitializeAsync()
             _logger.LogInformation("Loaded subscribed branch '{Branch}' from settings", settings.SubscribedBranch);
         }
 
-        // Load data if we have a PAT
+        // load data if we have a pat
         if (HasPat)
         {
-            // Initial check/load
+            // initial check and load
             await Task.WhenAll(
                 LoadPullRequestsAsync(),
                 LoadBranchesAsync());
         }
 
-        // Now check for updates - subscriptions will be properly populated
+        // check for updates after subscriptions are populated
         await CheckForUpdatesAsync();
     }
 
@@ -419,14 +516,14 @@ public string DisplayLatestVersion
                 return GameClientConstants.UnknownVersion;
             }
 
-            // 1. PR Update takes precedence
+            // 1. pr update takes precedence
             if (SubscribedPr?.LatestArtifact != null &&
                 string.Equals(SubscribedPr.LatestArtifact.Version, LatestVersion, StringComparison.OrdinalIgnoreCase))
             {
                 return SubscribedPr.LatestArtifact.DisplayVersion;
             }
 
-            // 2. Branch Update
+            // 2. branch update
             if (!string.IsNullOrEmpty(SubscribedBranch))
             {
                 return LatestVersion.StartsWith(SubscribedBranch, StringComparison.OrdinalIgnoreCase)
@@ -445,34 +542,135 @@ public string DisplayLatestVersion
     /// </summary>
     public void Dispose()
     {
+        _loadArtifactsCts?.Cancel();
+        _loadArtifactsCts?.Dispose();
+        _loadArtifactsCts = null;
+
         _cancellationTokenSource.Cancel();
         _cancellationTokenSource.Dispose();
         GC.SuppressFinalize(this);
     }
 
-    /// <summary>
-    /// Extracts the workflow run number from a version string like "0.0.641-pr241".
-    /// </summary>
-    private static int ExtractRunNumber(string version)
+    private void ProcessPrArtifactUpdate(ArtifactUpdateInfo artifact, int prNumber)
+    {
+        var currentVersionBase = CurrentAppVersion.Split('+')[0];
+        var prVersionBase = artifact.Version.Split('+')[0];
+
+        if (AppUpdateVersionHelper.IsArtifactVersionNewer(prVersionBase, currentVersionBase))
+        {
+            var settings = _userSettingsService.Get();
+            if (!string.Equals(prVersionBase, settings.DismissedUpdateVersion, StringComparison.OrdinalIgnoreCase))
+            {
+                IsUpdateAvailable = true;
+                LatestVersion = prVersionBase;
+                ReleaseNotesUrl = $"{AppConstants.GitHubRepositoryUrl}/pull/{prNumber}";
+                StatusMessage = $"New PR build available: {artifact.DisplayVersion}";
+                _logger.LogInformation("Subscribed to PR #{PrNumber}, new build available: {Version}", prNumber, artifact.DisplayVersion);
+                return;
+            }
+
+            StatusMessage = $"You dismissed the update for PR #{prNumber}";
+            return;
+        }
+
+        IsUpdateAvailable = false;
+        StatusMessage = $"You are on the latest build for PR #{prNumber}";
+    }
+
+    private void ProcessBranchArtifactUpdate(ArtifactUpdateInfo artifact, string branch)
+    {
+        var currentVersionBase = CurrentAppVersion.Split('+')[0];
+        var branchVersionBase = artifact.Version.Split('+')[0];
+
+        if (AppUpdateVersionHelper.IsArtifactVersionNewer(branchVersionBase, currentVersionBase))
+        {
+            var settings = _userSettingsService.Get();
+            if (!string.Equals(branchVersionBase, settings.DismissedUpdateVersion, StringComparison.OrdinalIgnoreCase))
+            {
+                IsUpdateAvailable = true;
+                LatestVersion = branchVersionBase;
+                ReleaseNotesUrl = $"{AppConstants.GitHubRepositoryUrl}/tree/{branch}";
+                StatusMessage = $"New {branch} build available: {artifact.DisplayVersion}";
+                _logger.LogInformation("Branch '{Branch}' has new build: {Version}", branch, LatestVersion);
+                return;
+            }
+
+            StatusMessage = $"You dismissed the update for branch '{branch}'";
+            return;
+        }
+
+        IsUpdateAvailable = false;
+        StatusMessage = $"You are on the latest build for {branch}";
+    }
+
+    partial void OnSelectedVersionChanged(ArtifactUpdateInfo? value)
     {
-        // Try to extract the run number before the PR suffix
-        var match = System.Text.RegularExpressions.Regex.Match(version, @"(\d+)(?:-pr\d+|-\w+)?$");
-        if (match.Success && int.TryParse(match.Groups[1].Value, out var runNumber))
+        UpdateCommandStates();
+
+        if (value == null)
         {
-            return runNumber;
+            return;
         }
 
-        // Fallback: try to parse the entire version as a number
-        var parts = version.Split('.', '-', '+');
-        foreach (var part in parts.Reverse())
+        var currentVersionBase = CurrentAppVersion.Split('+')[0];
+        var selectedVersionBase = value.Version.Split('+')[0];
+
+        if (AppUpdateVersionHelper.IsArtifactVersionNewer(selectedVersionBase, currentVersionBase))
         {
-            if (int.TryParse(part, out var number))
+            var settings = _userSettingsService.Get();
+            if (!string.Equals(selectedVersionBase, settings.DismissedUpdateVersion, StringComparison.OrdinalIgnoreCase))
             {
-                return number;
+                IsUpdateAvailable = true;
+                LatestVersion = selectedVersionBase;
+                if (value.PullRequestNumber.HasValue)
+                {
+                    ReleaseNotesUrl = $"{AppConstants.GitHubRepositoryUrl}/pull/{value.PullRequestNumber.Value}";
+                    StatusMessage = $"New PR build available: {value.DisplayVersion}";
+                }
+                else if (!string.IsNullOrEmpty(SubscribedBranch))
+                {
+                    ReleaseNotesUrl = $"{AppConstants.GitHubRepositoryUrl}/tree/{SubscribedBranch}";
+                    StatusMessage = $"New {SubscribedBranch} build available: {value.DisplayVersion}";
+                }
+                else
+                {
+                    StatusMessage = $"New build available: {value.DisplayVersion}";
+                }
+
+                return;
             }
+
+            IsUpdateAvailable = false;
+            LatestVersion = string.Empty;
+            ReleaseNotesUrl = string.Empty;
+            StatusMessage = $"You dismissed update {value.DisplayVersion}";
+            return;
         }
 
-        return 0;
+        var currentRun = AppUpdateVersionHelper.ExtractRunNumber(currentVersionBase);
+        var selectedRun = AppUpdateVersionHelper.ExtractRunNumber(selectedVersionBase);
+
+        if (currentRun > 0 && selectedRun > 0 && currentRun == selectedRun)
+        {
+            IsUpdateAvailable = false;
+            if (value.PullRequestNumber.HasValue)
+            {
+                StatusMessage = $"You are on the latest build for PR #{value.PullRequestNumber.Value}";
+            }
+            else if (!string.IsNullOrEmpty(SubscribedBranch))
+            {
+                StatusMessage = $"You are on the latest build for {SubscribedBranch}";
+            }
+            else
+            {
+                StatusMessage = $"You are on the latest build ({value.DisplayVersion})";
+            }
+        }
+        else
+        {
+            IsUpdateAvailable = false;
+            StatusMessage = $"Selected build: {value.DisplayVersion}";
+        }
     }
 
     /// <summary>
@@ -496,86 +694,32 @@ private async Task CheckForUpdatesAsync()
 
             _logger.LogInformation("Starting Velopack update check");
 
-            // Check if subscribed to a PR
+            // check if subscribed to a pr
             if (SubscribedPr != null)
             {
                 if (SubscribedPr.LatestArtifact != null)
                 {
-                    var currentVersionBase = CurrentAppVersion.Split('+')[0];
-                    var prVersionBase = SubscribedPr.LatestArtifact.Version.Split('+')[0];
-
-                    // Extract run numbers for numeric comparison
-                    var currentRun = ExtractRunNumber(currentVersionBase);
-                    var prRun = ExtractRunNumber(prVersionBase);
-
-                    _logger.LogDebug("Comparing PR #{PrNumber} versions: current run #{CurrentRun} vs new run #{PrRun}", SubscribedPr.Number, currentRun, prRun);
-
-                    if (prRun > currentRun)
-                    {
-                        var settings = _userSettingsService.Get();
-                        if (!string.Equals(prVersionBase, settings.DismissedUpdateVersion, StringComparison.OrdinalIgnoreCase))
-                        {
-                            IsUpdateAvailable = true;
-                            LatestVersion = prVersionBase;
-                            ReleaseNotesUrl = $"{AppConstants.GitHubRepositoryUrl}/pull/{SubscribedPr.Number}";
-                            StatusMessage = $"New PR build available: {SubscribedPr.LatestArtifact.DisplayVersion}";
-                            _logger.LogInformation("Subscribed to PR #{PrNumber}, new build available: run #{PrRun} (current: #{CurrentRun})", SubscribedPr.Number, prRun, currentRun);
-                            return;
-                        }
-
-                        StatusMessage = $"You dismissed the update for PR #{SubscribedPr.Number}";
-                        return;
-                    }
-
-                    IsUpdateAvailable = false;
-                    StatusMessage = $"You are on the latest build for PR #{SubscribedPr.Number}";
+                    ProcessPrArtifactUpdate(SubscribedPr.LatestArtifact, SubscribedPr.Number);
                     return;
                 }
 
-                // Try to fetch artifact for update check
+                // try to fetch artifact for update check
                 _logger.LogInformation("PR #{PrNumber} has no cached artifact, fetching for update check", SubscribedPr.Number);
                 var prArtifact = await _velopackUpdateManager.CheckForArtifactUpdatesAsync(_cancellationTokenSource.Token);
                 if (prArtifact != null)
                 {
-                    var currentVersionBase = CurrentAppVersion.Split('+')[0];
-                    var prVersionBase = prArtifact.Version.Split('+')[0];
-
-                    // Extract run numbers for numeric comparison
-                    var currentRun = ExtractRunNumber(currentVersionBase);
-                    var prRun = ExtractRunNumber(prVersionBase);
-
-                    _logger.LogDebug("Comparing fetched PR #{PrNumber} versions: current run #{CurrentRun} vs new run #{PrRun}", SubscribedPr.Number, currentRun, prRun);
-
-                    if (prRun > currentRun)
-                    {
-                        var settings = _userSettingsService.Get();
-                        if (!string.Equals(prVersionBase, settings.DismissedUpdateVersion, StringComparison.OrdinalIgnoreCase))
-                        {
-                            IsUpdateAvailable = true;
-                            LatestVersion = prVersionBase;
-                            ReleaseNotesUrl = $"{AppConstants.GitHubRepositoryUrl}/pull/{SubscribedPr.Number}";
-                            StatusMessage = $"New PR build available: {prArtifact.DisplayVersion}";
-                            _logger.LogInformation("Fetched PR #{PrNumber} artifact, new build available: run #{PrRun} (current: #{CurrentRun})", SubscribedPr.Number, prRun, currentRun);
-                            return;
-                        }
-
-                        StatusMessage = $"You dismissed the update for PR #{SubscribedPr.Number}";
-                        return;
-                    }
-
-                    IsUpdateAvailable = false;
-                    StatusMessage = $"You are on the latest build for PR #{SubscribedPr.Number}";
+                    ProcessPrArtifactUpdate(prArtifact, SubscribedPr.Number);
                     return;
                 }
 
-                // If subscribed to PR but no artifact found, don't fall through to main release
+                // if subscribed to pr but no artifact found, do not fall through to main release
                 _logger.LogInformation("Subscribed to PR #{PrNumber} but no artifact available yet", SubscribedPr.Number);
                 StatusMessage = $"Waiting for PR #{SubscribedPr.Number} build...";
                 IsUpdateAvailable = false;
                 return;
             }
 
-            // Check Branch updates if subscribed
+            // check branch updates if subscribed
             if (!string.IsNullOrEmpty(SubscribedBranch))
             {
                 _logger.LogInformation("Checking for artifact updates on branch: {Branch}", SubscribedBranch);
@@ -583,38 +727,18 @@ private async Task CheckForUpdatesAsync()
 
                 if (branchArtifact != null)
                 {
-                    var currentVersionBase = CurrentAppVersion.Split('+')[0];
-                    var artifactVersionBase = branchArtifact.Version.Split('+')[0];
-
-                    if (!string.Equals(artifactVersionBase, currentVersionBase, StringComparison.OrdinalIgnoreCase))
-                    {
-                        var settings = _userSettingsService.Get();
-                        if (!string.Equals(artifactVersionBase, settings.DismissedUpdateVersion, StringComparison.OrdinalIgnoreCase))
-                        {
-                            IsUpdateAvailable = true;
-                            LatestVersion = artifactVersionBase;
-                            ReleaseNotesUrl = $"{AppConstants.GitHubRepositoryUrl}/tree/{SubscribedBranch}";
-                            StatusMessage = $"New {SubscribedBranch} build available: {branchArtifact.Version}";
-                            _logger.LogInformation("Branch '{Branch}' has new build: {Version}", SubscribedBranch, LatestVersion);
-                            return;
-                        }
-                    }
-                    else
-                    {
-                        IsUpdateAvailable = false;
-                        StatusMessage = $"You are on the latest build for {SubscribedBranch}";
-                        return;
-                    }
+                    ProcessBranchArtifactUpdate(branchArtifact, SubscribedBranch);
+                    return;
                 }
 
-                // If subscribed to branch but no artifact found, don't fall through to main release
+                // if subscribed to branch but no artifact found, do not fall through to main release
                 _logger.LogInformation("Subscribed to branch '{Branch}' but no artifact available yet", SubscribedBranch);
                 StatusMessage = $"Waiting for {SubscribedBranch} build...";
                 IsUpdateAvailable = false;
                 return;
             }
 
-            // Check main branch releases
+            // check main branch releases
             _currentUpdateInfo = await _velopackUpdateManager.CheckForUpdatesAsync(_cancellationTokenSource.Token);
 
             if (_currentUpdateInfo != null)
@@ -681,7 +805,7 @@ private async Task ManualRefreshAsync()
 
         _logger.LogInformation("Manual refresh requested - clearing cache and dismissal status");
 
-        // Clear dismissal status in settings so the user can see the update again
+        // clear dismissal status in settings so the user can see the update again
         var settings = _userSettingsService.Get();
         if (!string.IsNullOrEmpty(settings.DismissedUpdateVersion))
         {
@@ -689,10 +813,10 @@ private async Task ManualRefreshAsync()
             await _userSettingsService.SaveAsync();
         }
 
-        // Clear manager cache
+        // clear manager cache
         _velopackUpdateManager.ClearCache();
 
-        // Reload data
+        // reload data
         if (HasPat)
         {
             await Task.WhenAll(
@@ -703,6 +827,41 @@ await Task.WhenAll(
         await CheckForUpdatesAsync();
     }
 
+    /// <summary>
+    /// Shows the update tab.
+    /// </summary>
+    [RelayCommand]
+    private void ShowUpdateTab()
+    {
+        SelectedTabIndex = AppUpdateConstants.UpdateTabIndex;
+    }
+
+    /// <summary>
+    /// Shows the browse builds tab.
+    /// </summary>
+    [RelayCommand]
+    private void ShowBrowseBuildsTab()
+    {
+        SelectedTabIndex = AppUpdateConstants.BrowseBuildsTabIndex;
+    }
+
+    /// <summary>
+    /// Selects the specified tab by index (0 = Update, 1 = Browse Builds).
+    /// </summary>
+    /// <param name="parameter">The tab index to select.</param>
+    [RelayCommand]
+    private void SelectTab(object? parameter)
+    {
+        if (parameter is int i)
+        {
+            SelectedTabIndex = Math.Clamp(i, AppUpdateConstants.UpdateTabIndex, AppUpdateConstants.MaxTabIndex);
+        }
+        else if (parameter is string s && int.TryParse(s, out var parsed))
+        {
+            SelectedTabIndex = Math.Clamp(parsed, AppUpdateConstants.UpdateTabIndex, AppUpdateConstants.MaxTabIndex);
+        }
+    }
+
     /// <summary>
     /// Opens the release notes in the default browser.
     /// </summary>
@@ -722,6 +881,29 @@ private void ViewReleaseNotes()
         }
     }
 
+    /// <summary>
+    /// Opens the specified pull request in the default browser.
+    /// </summary>
+    /// <param name="prNumber">The PR number to open.</param>
+    [RelayCommand]
+    private void OpenPullRequestUrl(int prNumber)
+    {
+        if (prNumber <= 0)
+        {
+            return;
+        }
+
+        var url = $"{AppConstants.GitHubRepositoryUrl}/pull/{prNumber}";
+        try
+        {
+            Process.Start(new ProcessStartInfo(url) { UseShellExecute = true });
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Failed to open browser for PR #{PrNumber}", prNumber);
+        }
+    }
+
     /// <summary>
     /// Downloads and applies the update using Velopack.
     /// </summary>
@@ -733,7 +915,7 @@ private async Task InstallUpdateAsync()
             return;
         }
 
-        // 0. Handle Explicitly Selected Version
+        // 0. handle explicitly selected version
         if (SelectedVersion != null)
         {
             _logger.LogInformation("Installing selected artifact version: {Version}", SelectedVersion.DisplayVersion);
@@ -741,7 +923,7 @@ private async Task InstallUpdateAsync()
             return;
         }
 
-        // 1. Handle PR Artifact Update (Auto-latest)
+        // 1. handle pr artifact update
         if (SubscribedPr?.LatestArtifact != null &&
             string.Equals(SubscribedPr.LatestArtifact.Version, LatestVersion, StringComparison.OrdinalIgnoreCase))
         {
@@ -750,7 +932,7 @@ private async Task InstallUpdateAsync()
             return;
         }
 
-        // 1.5 Handle Branch Artifact Update (Auto-latest)
+        // 1.5 handle branch artifact update
         if (!string.IsNullOrEmpty(SubscribedBranch))
         {
             _logger.LogInformation("Installing Branch '{Branch}' artifact update", SubscribedBranch);
@@ -758,7 +940,7 @@ private async Task InstallUpdateAsync()
             return;
         }
 
-        // 2. Handle Standard Velopack Update
+        // 2. handle standard velopack update
         if (_currentUpdateInfo == null)
         {
             _logger.LogError("Cannot install update - UpdateInfo is null (app not installed via Setup.exe)");
@@ -858,10 +1040,10 @@ private async Task InstallPrArtifactAsync()
             ArtifactUpdateInfo? artifactToInstall = SubscribedPr.LatestArtifact;
             if (artifactToInstall == null)
             {
-                // Clear cache to force fresh check
+                // clear cache to force fresh check
                 _velopackUpdateManager.ClearCache();
 
-                // Try to fetch the latest artifact for the PR
+                // try to fetch the latest artifact for the pr
                 artifactToInstall = await _velopackUpdateManager.CheckForArtifactUpdatesAsync(_cancellationTokenSource.Token);
                 if (artifactToInstall == null)
                 {
@@ -875,7 +1057,7 @@ private async Task InstallPrArtifactAsync()
 
             await _velopackUpdateManager.InstallArtifactAsync(artifactToInstall, progress, _cancellationTokenSource.Token);
 
-            // App will restart, this code won't execute
+            // app will restart, this code will not execute
         }
         catch (Exception ex)
         {
@@ -932,10 +1114,10 @@ private async Task InstallBranchArtifactAsync()
                 });
             });
 
-            // Clear cache to force fresh check
+            // clear cache to force fresh check
             _velopackUpdateManager.ClearCache();
 
-            // Check for latest artifact for the subscribed branch
+            // check for latest artifact for the subscribed branch
             var artifactUpdate = await _velopackUpdateManager.CheckForArtifactUpdatesAsync(_cancellationTokenSource.Token);
             if (artifactUpdate == null)
             {
@@ -948,7 +1130,7 @@ private async Task InstallBranchArtifactAsync()
 
             await _velopackUpdateManager.InstallArtifactAsync(artifactUpdate, progress, _cancellationTokenSource.Token);
 
-            // App will restart, this code won't execute
+            // app will restart, this code will not execute
         }
         catch (Exception ex)
         {
@@ -992,7 +1174,7 @@ private async Task InstallArtifactAsync(ArtifactUpdateInfo artifact)
 
             await _velopackUpdateManager.InstallArtifactAsync(artifact, progress, _cancellationTokenSource.Token);
 
-            // App will restart
+            // app will restart
         }
         catch (Exception ex)
         {
@@ -1089,10 +1271,9 @@ private async Task LoadPullRequestsAsync()
 
             await Dispatcher.UIThread.InvokeAsync(() =>
             {
-                foreach (var pr in prs)
-                {
-                    AvailablePullRequests.Add(pr);
-                }
+                _allPullRequests.Clear();
+                _allPullRequests.AddRange(prs);
+                ApplyPullRequestSorting();
             });
 
             if (_velopackUpdateManager.IsPrMergedOrClosed && _velopackUpdateManager.SubscribedPrNumber.HasValue)
@@ -1102,9 +1283,13 @@ await Dispatcher.UIThread.InvokeAsync(() =>
                 _logger.LogInformation("Subscribed PR has been merged/closed, showing warning");
             }
 
-            if (_velopackUpdateManager.SubscribedPrNumber.HasValue && SubscribedPr == null)
+            if (_velopackUpdateManager.SubscribedPrNumber.HasValue)
             {
-                SubscribedPr = AvailablePullRequests.FirstOrDefault(p => p.Number == _velopackUpdateManager.SubscribedPrNumber);
+                var matchingPr = AvailablePullRequests.FirstOrDefault(p => p.Number == _velopackUpdateManager.SubscribedPrNumber.Value);
+                if (matchingPr != null && (SubscribedPr == null || SubscribedPr.Number == matchingPr.Number))
+                {
+                    SubscribedPr = matchingPr;
+                }
             }
         }
         catch (Exception ex)
@@ -1118,6 +1303,33 @@ await Dispatcher.UIThread.InvokeAsync(() =>
         }
     }
 
+    private void ApplyPullRequestSorting()
+    {
+        if (_allPullRequests.Count == 0 && AvailablePullRequests.Count == 0)
+        {
+            return;
+        }
+
+        if (_allPullRequests.Count == 0 && AvailablePullRequests.Count > 0)
+        {
+            _allPullRequests.AddRange(AvailablePullRequests);
+        }
+
+        IEnumerable<PullRequestInfo> sorted = SelectedSortOption switch
+        {
+            AppUpdateConstants.SortOptionPrNumberDesc => _allPullRequests.OrderByDescending(p => p.Number),
+            AppUpdateConstants.SortOptionPrNumberAsc => _allPullRequests.OrderBy(p => p.Number),
+            _ => _allPullRequests.OrderByDescending(p => p.UpdatedAt ?? DateTimeOffset.MinValue),
+        };
+
+        var sortedList = sorted.ToList();
+        AvailablePullRequests.Clear();
+        foreach (var pr in sortedList)
+        {
+            AvailablePullRequests.Add(pr);
+        }
+    }
+
     [RelayCommand]
     private async Task LoadBranchesAsync()
     {
@@ -1154,11 +1366,19 @@ await Dispatcher.UIThread.InvokeAsync(() =>
     private void SubscribeToPr(int prNumber)
     {
         _velopackUpdateManager.SubscribedPrNumber = prNumber;
-        SubscribedPr = AvailablePullRequests.FirstOrDefault(p => p.Number == prNumber);
+        _velopackUpdateManager.SubscribedBranch = null;
         SubscribedBranch = null;
+        SubscribedPr = AvailablePullRequests.FirstOrDefault(p => p.Number == prNumber) ?? new PullRequestInfo
+        {
+            Number = prNumber,
+            Title = $"PR #{prNumber}",
+            BranchName = "unknown",
+            Author = "unknown",
+            State = "open",
+        };
         ShowPrMergedWarning = false;
 
-        // Clear artifact cache to force fresh check
+        // clear artifact cache to force fresh check
         _velopackUpdateManager.ClearCache();
 
         _userSettingsService.Update(settings =>
@@ -1168,11 +1388,8 @@ private void SubscribeToPr(int prNumber)
         });
         _ = _userSettingsService.SaveAsync();
 
-        if (SubscribedPr != null)
-        {
-            StatusMessage = $"Subscribed to PR #{prNumber}: {SubscribedPr.Title}";
-            _logger.LogInformation("Subscribed to PR #{PrNumber}", prNumber);
-        }
+        StatusMessage = $"Subscribed to PR #{prNumber}: {SubscribedPr.Title}";
+        _logger.LogInformation("Subscribed to PR #{PrNumber}", prNumber);
     }
 
     [RelayCommand]
@@ -1180,12 +1397,13 @@ private void SubscribeToBranch(string branchName)
     {
         if (string.IsNullOrEmpty(branchName)) return;
 
-        SubscribedBranch = branchName;
         _velopackUpdateManager.SubscribedPrNumber = null;
+        _velopackUpdateManager.SubscribedBranch = branchName;
         SubscribedPr = null;
+        SubscribedBranch = branchName;
         ShowPrMergedWarning = false;
 
-        // Clear artifact cache to force fresh check
+        // clear artifact cache to force fresh check
         _velopackUpdateManager.ClearCache();
 
         _userSettingsService.Update(settings =>
@@ -1201,6 +1419,7 @@ private void SubscribeToBranch(string branchName)
 
     partial void OnSubscribedBranchChanged(string? value)
     {
+        _velopackUpdateManager.SubscribedBranch = value;
         _ = LoadArtifactsForSubscribedItemAsync();
         OnPropertyChanged(nameof(IsSubscribedToAny));
         UpdateCommandStates();
@@ -1220,9 +1439,15 @@ partial void OnSubscribedPrChanged(PullRequestInfo? value)
     private void Unsubscribe()
     {
         _velopackUpdateManager.SubscribedPrNumber = null;
+        _velopackUpdateManager.SubscribedBranch = null;
         SubscribedPr = null;
         SubscribedBranch = null;
+        SelectedVersion = null;
         ShowPrMergedWarning = false;
+        IsUpdateAvailable = false;
+        LatestVersion = string.Empty;
+        ReleaseNotesUrl = string.Empty;
+        _currentUpdateInfo = null;
         StatusMessage = "Switched to MAIN branch updates";
 
         _userSettingsService.Update(settings =>
@@ -1233,6 +1458,7 @@ private void Unsubscribe()
         _ = _userSettingsService.SaveAsync();
 
         _logger.LogInformation("Unsubscribed from dev builds, switched to MAIN");
+        _ = CheckForUpdatesAsync();
     }
 
     [RelayCommand]
diff --git a/GenHub/GenHub/Features/AppUpdate/Views/UpdateNotificationView.axaml b/GenHub/GenHub/Features/AppUpdate/Views/UpdateNotificationView.axaml
index fc4a522ba..63c35be95 100644
--- a/GenHub/GenHub/Features/AppUpdate/Views/UpdateNotificationView.axaml
+++ b/GenHub/GenHub/Features/AppUpdate/Views/UpdateNotificationView.axaml
@@ -11,39 +11,128 @@
     </UserControl.Resources>
 
     <UserControl.Styles>
-        <Style Selector="TabItem">
+        <!-- Tab Navigation Button Styles -->
+        <Style Selector="Button.tab-btn">
             <Setter Property="FontSize" Value="14"/>
             <Setter Property="FontWeight" Value="SemiBold"/>
-            <Setter Property="Padding" Value="12,8"/>
-            <Setter Property="Foreground" Value="#AAAAAA"/>
-            <Setter Property="Margin" Value="0,0,0,12"/>
+            <Setter Property="Padding" Value="14,8"/>
+            <Setter Property="Foreground" Value="#888888"/>
+            <Setter Property="Background" Value="Transparent"/>
+            <Setter Property="BorderThickness" Value="0,0,0,2"/>
+            <Setter Property="BorderBrush" Value="Transparent"/>
+            <Setter Property="CornerRadius" Value="0"/>
+            <Setter Property="Cursor" Value="Hand"/>
         </Style>
-        <Style Selector="TabItem:selected">
+        <Style Selector="Button.tab-btn:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+            <Setter Property="Foreground" Value="#CCCCCC"/>
+            <Setter Property="Background" Value="#15FFFFFF"/>
+        </Style>
+        <Style Selector="Button.tab-btn.active">
+            <Setter Property="Foreground" Value="White"/>
+            <Setter Property="Background" Value="Transparent"/>
+            <Setter Property="BorderThickness" Value="0,0,0,2"/>
+            <Setter Property="BorderBrush" Value="{DynamicResource SystemAccentColor}"/>
+        </Style>
+        <Style Selector="Button.tab-btn.active:pointerover /template/ ContentPresenter#PART_ContentPresenter">
             <Setter Property="Foreground" Value="White"/>
+            <Setter Property="Background" Value="#15FFFFFF"/>
+            <Setter Property="BorderThickness" Value="0,0,0,2"/>
+            <Setter Property="BorderBrush" Value="{DynamicResource SystemAccentColor}"/>
+        </Style>
+
+        <!-- Clickable PR Link Style -->
+        <Style Selector="Button.pr-link">
+            <Setter Property="Background" Value="Transparent"/>
             <Setter Property="BorderThickness" Value="0"/>
+            <Setter Property="Padding" Value="0"/>
+            <Setter Property="Cursor" Value="Hand"/>
+        </Style>
+        <Style Selector="Button.pr-link:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+            <Setter Property="Background" Value="Transparent"/>
         </Style>
 
         <!-- Subscribe Button Style handling state via Tag binding -->
         <Style Selector="Button.SubscribeState">
             <Setter Property="Content" Value="Subscribe"/>
             <Setter Property="IsEnabled" Value="True"/>
+            <Setter Property="Background" Value="#1A7C3AED"/>
+            <Setter Property="Foreground" Value="#F1F5F9"/>
+            <Setter Property="BorderBrush" Value="#7C3AED"/>
+            <Setter Property="BorderThickness" Value="1"/>
+            <Setter Property="CornerRadius" Value="6"/>
+            <Setter Property="Padding" Value="12,5"/>
+            <Setter Property="FontSize" Value="12"/>
+            <Setter Property="FontWeight" Value="SemiBold"/>
+            <Setter Property="Cursor" Value="Hand"/>
+            <Setter Property="Transitions">
+                <Transitions>
+                    <BrushTransition Property="Background" Duration="0:0:0.15"/>
+                    <BrushTransition Property="BorderBrush" Duration="0:0:0.15"/>
+                </Transitions>
+            </Setter>
+        </Style>
+        <Style Selector="Button.SubscribeState:pointerover">
+            <Setter Property="Background" Value="#7C3AED"/>
+            <Setter Property="Foreground" Value="White"/>
+            <Setter Property="BorderBrush" Value="#8B5CF6"/>
+        </Style>
+        <Style Selector="Button.SubscribeState:pressed">
+            <Setter Property="Background" Value="#6D28D9"/>
+            <Setter Property="Foreground" Value="White"/>
         </Style>
         <Style Selector="Button.SubscribeState[Tag=True]">
-            <Setter Property="Content" Value="Subscribed"/>
+            <Setter Property="Content" Value="✓ Subscribed"/>
             <Setter Property="IsEnabled" Value="False"/>
-            <Setter Property="Background" Value="#207C4DFF"/>
-            <Setter Property="Foreground" Value="#CC7C4DFF"/>
-            <Setter Property="BorderBrush" Value="#7C4DFF"/>
+            <Setter Property="Background" Value="#1F22C55E"/>
+            <Setter Property="Foreground" Value="#4ADE80"/>
+            <Setter Property="BorderBrush" Value="#22C55E"/>
             <Setter Property="BorderThickness" Value="1"/>
+            <Setter Property="CornerRadius" Value="6"/>
+            <Setter Property="Padding" Value="12,5"/>
+            <Setter Property="FontSize" Value="12"/>
+            <Setter Property="FontWeight" Value="Bold"/>
+            <Setter Property="Opacity" Value="1.0"/>
+        </Style>
+        <Style Selector="Button.SubscribeState[Tag=True]:disabled /template/ ContentPresenter#PART_ContentPresenter">
+            <Setter Property="Background" Value="#1F22C55E"/>
+            <Setter Property="Foreground" Value="#4ADE80"/>
+            <Setter Property="BorderBrush" Value="#22C55E"/>
         </Style>
     </UserControl.Styles>
 
     <Grid RowDefinitions="Auto,*,Auto" Margin="20,12">
 
-        <!-- Tabs for Update vs Browse -->
-        <TabControl Grid.Row="1" Background="Transparent" Margin="-8,0">
-            <TabItem Header="Update">
-                <StackPanel Spacing="16" Margin="8,0">
+        <!-- Top Header: Tabs on Left, Sort by on Right (Same Row!) -->
+        <Grid Grid.Row="0" ColumnDefinitions="Auto,*,Auto" Margin="0,0,0,16">
+            <!-- Left: Tab Navigation -->
+            <StackPanel Grid.Column="0" Orientation="Horizontal" Spacing="4">
+                <Button Classes="tab-btn"
+                        Classes.active="{Binding !IsBrowseTabSelected}"
+                        Command="{Binding ShowUpdateTabCommand}"
+                        Content="Update"/>
+                <Button Classes="tab-btn"
+                        Classes.active="{Binding IsBrowseTabSelected}"
+                        Command="{Binding ShowBrowseBuildsTabCommand}"
+                        Content="Browse Builds"/>
+            </StackPanel>
+
+            <!-- Right: Sort by Dropdown (Only visible on Browse Builds tab) -->
+            <StackPanel Grid.Column="2" Orientation="Horizontal" Spacing="8" VerticalAlignment="Center" IsVisible="{Binding IsBrowseTabSelected}">
+                <TextBlock Text="Sort by:" FontSize="12" Foreground="#888888" VerticalAlignment="Center"/>
+                <ComboBox ItemsSource="{Binding AvailableSortOptions}"
+                          SelectedItem="{Binding SelectedSortOption}"
+                          MinWidth="160"
+                          FontSize="12"
+                          Padding="8,4"
+                          CornerRadius="6"/>
+            </StackPanel>
+        </Grid>
+
+        <!-- Main Content Area -->
+        <Panel Grid.Row="1">
+            <!-- Tab 0: Update -->
+            <ScrollViewer IsVisible="{Binding !IsBrowseTabSelected}" VerticalScrollBarVisibility="Auto">
+                <StackPanel Spacing="16" Margin="0,0,0,8">
                     <!-- Update Status Card -->
                     <Border Background="#20FFFFFF" CornerRadius="12" Padding="20" IsVisible="{Binding IsUpdateAvailable}">
                         <Grid ColumnDefinitions="Auto,*" RowDefinitions="Auto,Auto">
@@ -79,14 +168,18 @@
 
                             <!-- Release Notes Link -->
                             <Button Grid.Row="1" Grid.Column="1" Content="View Release Notes" Command="{Binding ViewReleaseNotesCommand}"
-                                    Background="Transparent" Foreground="#7C4DFF" BorderThickness="0" Padding="0" Margin="0,8,0,0" HorizontalAlignment="Left" Cursor="Hand"/>
+                                     Background="Transparent" Foreground="#7C4DFF" BorderThickness="0" Padding="0" Margin="0,8,0,0" HorizontalAlignment="Left" Cursor="Hand"/>
                         </Grid>
                     </Border>
 
                     <!-- Settings / Subscription Info -->
                     <Border Background="#15FFFFFF" CornerRadius="12" Padding="16">
                         <StackPanel Spacing="12">
-                            <TextBlock Text="Installation Source" FontSize="14" FontWeight="SemiBold" Foreground="White"/>
+                            <Grid ColumnDefinitions="*,Auto">
+                                <TextBlock Text="Installation Source" FontSize="14" FontWeight="SemiBold" Foreground="White" VerticalAlignment="Center"/>
+                                <TextBlock Grid.Column="1" Text="{Binding InstalledVersionDisplay, StringFormat='Current Version: {0}'}"
+                                           FontSize="12" Foreground="#888888" VerticalAlignment="Center"/>
+                            </Grid>
 
                             <!-- Current Source Display -->
                             <Grid ColumnDefinitions="Auto,*,Auto">
@@ -117,84 +210,147 @@
                         </StackPanel>
                     </Border>
                 </StackPanel>
-            </TabItem>
-
-            <TabItem Header="Browse Builds">
-                <Grid RowDefinitions="Auto,*">
-                    <ScrollViewer Grid.Row="1">
-                        <StackPanel Spacing="16">
-                            <!-- Pull Requests -->
-                            <Expander Header="Open Pull Requests" IsExpanded="True">
-                                <ItemsControl ItemsSource="{Binding AvailablePullRequests}">
-                                    <ItemsControl.ItemTemplate>
-                                        <DataTemplate>
-                                            <Border Background="#10FFFFFF" CornerRadius="6" Padding="12" Margin="0,0,0,8">
-                                                <Grid ColumnDefinitions="*,Auto">
-                                                    <StackPanel Spacing="4">
-                                                        <TextBlock Text="{Binding Title}" FontWeight="Medium" TextTrimming="CharacterEllipsis"/>
-                                                        <StackPanel Orientation="Horizontal" Spacing="6" Opacity="0.6">
-                                                            <TextBlock Text="{Binding Author, StringFormat='by {0}'}" FontSize="12"/>
-                                                            <TextBlock Text="•" FontSize="12"/>
-                                                            <TextBlock Text="{Binding BranchName}" FontSize="12"/>
-                                                        </StackPanel>
+            </ScrollViewer>
+
+            <!-- Tab 1: Browse Builds -->
+            <Grid IsVisible="{Binding IsBrowseTabSelected}" ColumnDefinitions="3*,2*">
+                <!-- Left Column: Open Pull Requests -->
+                <Border Grid.Column="0" Background="#0AFFFFFF" BorderBrush="#15FFFFFF" BorderThickness="1" CornerRadius="8" Padding="12" Margin="0,0,8,0">
+                    <Grid RowDefinitions="Auto,*">
+                        <!-- Column Header -->
+                        <Grid Grid.Row="0" ColumnDefinitions="*,Auto" Margin="4,0,4,12">
+                            <StackPanel Orientation="Horizontal" Spacing="8" VerticalAlignment="Center">
+                                <TextBlock Text="Open Pull Requests" FontSize="14" FontWeight="SemiBold" Foreground="White"/>
+                                <Border Background="#207C4DFF" CornerRadius="10" Padding="8,2" VerticalAlignment="Center">
+                                    <TextBlock Text="{Binding AvailablePullRequests.Count}" FontSize="11" FontWeight="Bold" Foreground="#CC7C4DFF"/>
+                                </Border>
+                            </StackPanel>
+                        </Grid>
+
+                        <!-- Scrollable PR List -->
+                        <ScrollViewer Grid.Row="1" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
+                            <ItemsControl ItemsSource="{Binding AvailablePullRequests}">
+                                <ItemsControl.ItemTemplate>
+                                    <DataTemplate>
+                                        <Border Background="#12FFFFFF" CornerRadius="6" Padding="12" Margin="0,0,6,8">
+                                            <Grid ColumnDefinitions="*,Auto">
+                                                <!-- Left side: PR Info (bounded for text trimming) -->
+                                                <Grid Grid.Column="0" RowDefinitions="Auto,Auto" Margin="0,0,12,0">
+                                                    <!-- Row 0: PR Number + Title in a 2-column grid so Title trims with ellipsis -->
+                                                    <Grid Grid.Row="0" ColumnDefinitions="Auto,*">
+                                                        <Button Grid.Column="0"
+                                                                Command="{Binding #Root.((vm:UpdateNotificationViewModel)DataContext).OpenPullRequestUrlCommand}"
+                                                                CommandParameter="{Binding Number}"
+                                                                Classes="pr-link"
+                                                                Margin="0,0,6,0"
+                                                                ToolTip.Tip="Open pull request on GitHub">
+                                                            <TextBlock Text="{Binding Number, StringFormat='#{0}'}"
+                                                                       FontWeight="Bold"
+                                                                       Foreground="{DynamicResource SystemAccentColor}"
+                                                                       TextDecorations="Underline"/>
+                                                        </Button>
+                                                        <TextBlock Grid.Column="1"
+                                                                   Text="{Binding Title}"
+                                                                   FontWeight="Medium"
+                                                                   TextTrimming="CharacterEllipsis"
+                                                                   VerticalAlignment="Center"/>
+                                                    </Grid>
+
+                                                    <!-- Row 1: Author, Branch, Date -->
+                                                    <StackPanel Grid.Row="1" Orientation="Horizontal" Spacing="6" Opacity="0.6" Margin="0,4,0,0">
+                                                        <TextBlock Text="{Binding Author, StringFormat='by {0}'}" FontSize="12" TextTrimming="CharacterEllipsis" MaxWidth="120"/>
+                                                        <TextBlock Text="•" FontSize="12"/>
+                                                        <TextBlock Text="{Binding BranchName}" FontSize="12" TextTrimming="CharacterEllipsis" MaxWidth="160"/>
+                                                        <TextBlock Text="•" FontSize="12" IsVisible="{Binding UpdatedAt, Converter={x:Static ObjectConverters.IsNotNull}}"/>
+                                                        <TextBlock Text="{Binding UpdatedAt, StringFormat='Updated: {0:g}'}" FontSize="12" IsVisible="{Binding UpdatedAt, Converter={x:Static ObjectConverters.IsNotNull}}"/>
                                                     </StackPanel>
-                                                    <Button Grid.Column="1"
-                                                            Command="{Binding #Root.((vm:UpdateNotificationViewModel)DataContext).SubscribeToPrCommand}"
-                                                            CommandParameter="{Binding Number}"
-                                                            Classes="SmallAction SubscribeState">
-                                                        <Button.Tag>
-                                                            <MultiBinding Converter="{StaticResource IsSubscribedConverter}">
-                                                                <Binding Path="." />
-                                                                <Binding Path="#Root.((vm:UpdateNotificationViewModel)DataContext).SubscribedPr" />
-                                                                <Binding Path="#Root.((vm:UpdateNotificationViewModel)DataContext).SubscribedBranch" />
-                                                            </MultiBinding>
-                                                        </Button.Tag>
-                                                    </Button>
                                                 </Grid>
-                                            </Border>
-                                        </DataTemplate>
-                                    </ItemsControl.ItemTemplate>
-                                </ItemsControl>
-                            </Expander>
-
-                            <!-- Branches -->
-                            <Expander Header="Branches">
-                                <ItemsControl ItemsSource="{Binding AvailableBranches}">
-                                    <ItemsControl.ItemTemplate>
-                                        <DataTemplate>
-                                            <Border Background="#10FFFFFF" CornerRadius="6" Padding="12" Margin="0,0,0,8">
-                                                <Grid ColumnDefinitions="*,Auto">
-                                                    <TextBlock Text="{Binding}" VerticalAlignment="Center" FontWeight="Medium"/>
-                                                    <Button Grid.Column="1"
-                                                            Command="{Binding #Root.((vm:UpdateNotificationViewModel)DataContext).SubscribeToBranchCommand}"
-                                                            CommandParameter="{Binding}"
-                                                            Classes="SmallAction SubscribeState">
-                                                        <Button.Tag>
-                                                            <MultiBinding Converter="{StaticResource IsSubscribedConverter}">
-                                                                <Binding Path="." />
-                                                                <Binding Path="#Root.((vm:UpdateNotificationViewModel)DataContext).SubscribedPr" />
-                                                                <Binding Path="#Root.((vm:UpdateNotificationViewModel)DataContext).SubscribedBranch" />
-                                                            </MultiBinding>
-                                                        </Button.Tag>
-                                                    </Button>
-                                                </Grid>
-                                            </Border>
-                                        </DataTemplate>
-                                    </ItemsControl.ItemTemplate>
-                                </ItemsControl>
-                            </Expander>
-                        </StackPanel>
-                    </ScrollViewer>
-                </Grid>
-            </TabItem>
-        </TabControl>
+
+                                                <!-- Right side: Subscribe Button -->
+                                                <Button Grid.Column="1"
+                                                        VerticalAlignment="Center"
+                                                        Command="{Binding #Root.((vm:UpdateNotificationViewModel)DataContext).SubscribeToPrCommand}"
+                                                        CommandParameter="{Binding Number}"
+                                                        Classes="SmallAction SubscribeState">
+                                                    <Button.Tag>
+                                                        <MultiBinding Converter="{StaticResource IsSubscribedConverter}">
+                                                            <Binding Path="." />
+                                                            <Binding Path="#Root.((vm:UpdateNotificationViewModel)DataContext).SubscribedPr" />
+                                                            <Binding Path="#Root.((vm:UpdateNotificationViewModel)DataContext).SubscribedBranch" />
+                                                        </MultiBinding>
+                                                    </Button.Tag>
+                                                </Button>
+                                            </Grid>
+                                        </Border>
+                                    </DataTemplate>
+                                </ItemsControl.ItemTemplate>
+                            </ItemsControl>
+                        </ScrollViewer>
+                    </Grid>
+                </Border>
+
+                <!-- Right Column: Branches -->
+                <Border Grid.Column="1" Background="#0AFFFFFF" BorderBrush="#15FFFFFF" BorderThickness="1" CornerRadius="8" Padding="12" Margin="8,0,0,0">
+                    <Grid RowDefinitions="Auto,*">
+                        <!-- Column Header -->
+                        <Grid Grid.Row="0" ColumnDefinitions="*,Auto" Margin="4,0,4,12">
+                            <StackPanel Orientation="Horizontal" Spacing="8" VerticalAlignment="Center">
+                                <TextBlock Text="Branches" FontSize="14" FontWeight="SemiBold" Foreground="White"/>
+                                <Border Background="#207C4DFF" CornerRadius="10" Padding="8,2" VerticalAlignment="Center">
+                                    <TextBlock Text="{Binding AvailableBranches.Count}" FontSize="11" FontWeight="Bold" Foreground="#CC7C4DFF"/>
+                                </Border>
+                            </StackPanel>
+                        </Grid>
+
+                        <!-- Scrollable Branches List -->
+                        <ScrollViewer Grid.Row="1" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
+                            <ItemsControl ItemsSource="{Binding AvailableBranches}">
+                                <ItemsControl.ItemTemplate>
+                                    <DataTemplate>
+                                        <Border Background="#12FFFFFF" CornerRadius="6" Padding="12" Margin="0,0,6,8">
+                                            <Grid ColumnDefinitions="*,Auto">
+                                                <TextBlock Grid.Column="0"
+                                                           Text="{Binding}"
+                                                           VerticalAlignment="Center"
+                                                           FontWeight="Medium"
+                                                           TextTrimming="CharacterEllipsis"
+                                                           Margin="0,0,12,0"/>
+                                                <Button Grid.Column="1"
+                                                        VerticalAlignment="Center"
+                                                        Command="{Binding #Root.((vm:UpdateNotificationViewModel)DataContext).SubscribeToBranchCommand}"
+                                                        CommandParameter="{Binding}"
+                                                        Classes="SmallAction SubscribeState">
+                                                    <Button.Tag>
+                                                        <MultiBinding Converter="{StaticResource IsSubscribedConverter}">
+                                                            <Binding Path="." />
+                                                            <Binding Path="#Root.((vm:UpdateNotificationViewModel)DataContext).SubscribedPr" />
+                                                            <Binding Path="#Root.((vm:UpdateNotificationViewModel)DataContext).SubscribedBranch" />
+                                                        </MultiBinding>
+                                                    </Button.Tag>
+                                                </Button>
+                                            </Grid>
+                                        </Border>
+                                    </DataTemplate>
+                                </ItemsControl.ItemTemplate>
+                            </ItemsControl>
+                        </ScrollViewer>
+                    </Grid>
+                </Border>
+            </Grid>
+        </Panel>
 
         <!-- Footer Actions -->
         <Grid Grid.Row="2" ColumnDefinitions="Auto,*,Auto" Margin="0,16,0,0">
-            <!-- Global Refresh Button -->
-            <Button Grid.Column="0" Command="{Binding ManualRefreshCommand}" Content="Check for Updates"
-                    Background="Transparent" Foreground="#AAAAAA" FontSize="14" Cursor="Hand"
-                    ToolTip.Tip="Manually check for updates and restore dismissed notifications"/>
+            <!-- Global Refresh Button & Current Version -->
+            <StackPanel Grid.Column="0" Orientation="Horizontal" Spacing="12" VerticalAlignment="Center">
+                <Button Command="{Binding ManualRefreshCommand}" Content="Check for Updates"
+                        Background="Transparent" Foreground="#AAAAAA" FontSize="14" Cursor="Hand"
+                        ToolTip.Tip="Manually check for updates and restore dismissed notifications"/>
+                <Border Background="#15FFFFFF" CornerRadius="4" Padding="8,3" VerticalAlignment="Center">
+                    <TextBlock Text="{Binding InstalledVersionDisplay}"
+                               FontSize="12" Foreground="#888888" VerticalAlignment="Center"/>
+                </Border>
+            </StackPanel>
 
             <!-- Detailed Progress Display -->
             <StackPanel Grid.Column="1" IsVisible="{Binding IsInstalling}" VerticalAlignment="Center" Margin="16,0">
diff --git a/GenHub/GenHub/Features/AppUpdate/Views/UpdateNotificationWindow.axaml b/GenHub/GenHub/Features/AppUpdate/Views/UpdateNotificationWindow.axaml
index 245136041..d60cf5e9d 100644
--- a/GenHub/GenHub/Features/AppUpdate/Views/UpdateNotificationWindow.axaml
+++ b/GenHub/GenHub/Features/AppUpdate/Views/UpdateNotificationWindow.axaml
@@ -8,7 +8,7 @@
         Title="GenHub Updates"
         Icon="/Assets/Icons/generalshub-icon.png"
         WindowStartupLocation="CenterScreen"
-        SystemDecorations="BorderOnly"
+        SystemDecorations="Full"
         TransparencyLevelHint="AcrylicBlur"
         Background="Transparent"
         ExtendClientAreaToDecorationsHint="True"
@@ -61,34 +61,63 @@
                 </StackPanel>
 
                 <!-- Window Controls-->
-                <Button Grid.Column="2"
-                        VerticalAlignment="Center"
-                        HorizontalAlignment="Center"
-                        Background="Transparent"
-                        Foreground="#CCCCCC"
-                        BorderThickness="0"
-                        Width="32" Height="32"
-                        AutomationProperties.Name="Close"
-                        AutomationProperties.AccessKey="Alt+F4"
-                        ToolTip.Tip="Close window"
-                        Click="CloseButton_Click">
-                    <Viewbox Width="12" Height="12"
-                             HorizontalAlignment="Center"
-                             VerticalAlignment="Center">
-                        <Path Data="M19,6.41L17.59,5L12,10.59L6.41,5L5,6.41L10.59,12L5,17.59L6.41,19L12,13.41L17.59,19L19,17.59L13.41,12L19,6.41Z"
-                              Fill="{Binding $parent[Button].Foreground}"
-                              Stretch="Uniform" />
-                    </Viewbox>
-                    <Button.Styles>
-                        <Style Selector="Button:pointerover">
-                            <Setter Property="Background" Value="#40FF0000"/>
-                            <Setter Property="Foreground" Value="White"/>
-                        </Style>
-                        <Style Selector="Button:pressed">
-                            <Setter Property="Background" Value="#60FF0000"/>
-                        </Style>
-                    </Button.Styles>
-                </Button>
+                <StackPanel Grid.Column="2" Orientation="Horizontal" Spacing="2" VerticalAlignment="Center">
+                    <!-- Maximize/Restore Button -->
+                    <Button VerticalAlignment="Center"
+                            HorizontalAlignment="Center"
+                            Background="Transparent"
+                            Foreground="#CCCCCC"
+                            BorderThickness="0"
+                            Width="32" Height="32"
+                            ToolTip.Tip="Maximize / Restore"
+                            Click="MaximizeButton_Click">
+                        <Viewbox Width="12" Height="12"
+                                 HorizontalAlignment="Center"
+                                 VerticalAlignment="Center">
+                            <Path Data="M4,4H20V20H4V4M6,8V18H18V8H6Z"
+                                  Fill="{Binding $parent[Button].Foreground}"
+                                  Stretch="Uniform" />
+                        </Viewbox>
+                        <Button.Styles>
+                            <Style Selector="Button:pointerover">
+                                <Setter Property="Background" Value="#2A2A2A"/>
+                                <Setter Property="Foreground" Value="White"/>
+                            </Style>
+                            <Style Selector="Button:pressed">
+                                <Setter Property="Background" Value="#404040"/>
+                            </Style>
+                        </Button.Styles>
+                    </Button>
+
+                    <!-- Close Button -->
+                    <Button VerticalAlignment="Center"
+                            HorizontalAlignment="Center"
+                            Background="Transparent"
+                            Foreground="#CCCCCC"
+                            BorderThickness="0"
+                            Width="32" Height="32"
+                            AutomationProperties.Name="Close"
+                            AutomationProperties.AccessKey="Alt+F4"
+                            ToolTip.Tip="Close window"
+                            Click="CloseButton_Click">
+                        <Viewbox Width="12" Height="12"
+                                 HorizontalAlignment="Center"
+                                 VerticalAlignment="Center">
+                            <Path Data="M19,6.41L17.59,5L12,10.59L6.41,5L5,6.41L10.59,12L5,17.59L6.41,19L12,13.41L17.59,19L19,17.59L13.41,12L19,6.41Z"
+                                  Fill="{Binding $parent[Button].Foreground}"
+                                  Stretch="Uniform" />
+                        </Viewbox>
+                        <Button.Styles>
+                            <Style Selector="Button:pointerover">
+                                <Setter Property="Background" Value="#C42B1C"/>
+                                <Setter Property="Foreground" Value="White"/>
+                            </Style>
+                            <Style Selector="Button:pressed">
+                                <Setter Property="Background" Value="#60FF0000"/>
+                            </Style>
+                        </Button.Styles>
+                    </Button>
+                </StackPanel>
             </Grid>
 
             <!-- Main content area -->
diff --git a/GenHub/GenHub/Features/AppUpdate/Views/UpdateNotificationWindow.axaml.cs b/GenHub/GenHub/Features/AppUpdate/Views/UpdateNotificationWindow.axaml.cs
index 5fd0a2bf2..ba60939db 100644
--- a/GenHub/GenHub/Features/AppUpdate/Views/UpdateNotificationWindow.axaml.cs
+++ b/GenHub/GenHub/Features/AppUpdate/Views/UpdateNotificationWindow.axaml.cs
@@ -62,23 +62,43 @@ public async Task InitializeAsync()
 
     private void InitializeComponent() => AvaloniaXamlLoader.Load(this);
 
+    /// <summary>
+    /// Handles the maximize/restore button click event.
+    /// </summary>
+    /// <param name="sender">The sender.</param>
+    /// <param name="e">The event args.</param>
+    private void MaximizeButton_Click(object? sender, RoutedEventArgs e)
+    {
+        WindowState = WindowState == WindowState.Maximized ? WindowState.Normal : WindowState.Maximized;
+    }
+
     /// <summary>
     /// Handles the close button click event.
     /// </summary>
     /// <param name="sender">The sender.</param>
     /// <param name="e">The event args.</param>
-    private void CloseButton_Click(object sender, RoutedEventArgs e)
+    private void CloseButton_Click(object? sender, RoutedEventArgs e)
     {
         Close();
     }
 
     /// <summary>
-    /// Handles pointer pressed event for the title bar to enable window dragging.
+    /// Handles pointer pressed event for the title bar to enable window dragging and double-click maximize.
     /// </summary>
     /// <param name="sender">The sender.</param>
     /// <param name="e">The pointer event args.</param>
-    private void TitleBar_PointerPressed(object sender, PointerPressedEventArgs e)
+    private void TitleBar_PointerPressed(object? sender, PointerPressedEventArgs e)
     {
-        BeginMoveDrag(e);
+        if (e.GetCurrentPoint(this).Properties.IsLeftButtonPressed)
+        {
+            if (e.ClickCount == 2)
+            {
+                MaximizeButton_Click(sender, new RoutedEventArgs());
+            }
+            else
+            {
+                BeginMoveDrag(e);
+            }
+        }
     }
 }
diff --git a/GenHub/GenHub/Features/Content/Services/CommunityOutpost/CommunityOutpostDeliverer.cs b/GenHub/GenHub/Features/Content/Services/CommunityOutpost/CommunityOutpostDeliverer.cs
index be8788503..9bc5bd496 100644
--- a/GenHub/GenHub/Features/Content/Services/CommunityOutpost/CommunityOutpostDeliverer.cs
+++ b/GenHub/GenHub/Features/Content/Services/CommunityOutpost/CommunityOutpostDeliverer.cs
@@ -97,7 +97,7 @@ await Task.Run(
                     throw new FileNotFoundException($"Archive file not found or empty: {archivePath}");
                 }
 
-                using var archive = ArchiveFactory.Open(archivePath);
+                using var archive = ArchiveFactory.Open(fileInfo);
                 foreach (var entry in archive.Entries.Where(e => !e.IsDirectory))
                 {
                     cancellationToken.ThrowIfCancellationRequested();
diff --git a/GenHub/GenHub/Features/Content/Services/ContentOrchestrator.cs b/GenHub/GenHub/Features/Content/Services/ContentOrchestrator.cs
index 1a2a4b154..53cdf9437 100644
--- a/GenHub/GenHub/Features/Content/Services/ContentOrchestrator.cs
+++ b/GenHub/GenHub/Features/Content/Services/ContentOrchestrator.cs
@@ -108,7 +108,7 @@ public async Task<OperationResult<IEnumerable<ContentSearchResult>>> SearchAsync
         _logger.LogDebug("Starting orchestrated content search with query: {SearchTerm}, ContentType: {ContentType}", query.SearchTerm, query.ContentType);
 
         // Check cache first
-        var cacheKey = $"search::{query.ProviderName}::{query.SearchTerm}::{query.ContentType}::{query.Skip}::{query.Take}::{query.SortOrder}";
+        var cacheKey = $"search::{query.ProviderName}::{query.SearchTerm}::{query.ContentType}::{query.TargetGame}::{query.AuthorName}::{query.GitHubAuthor}::{query.Language}::{query.Skip}::{query.Take}::{query.SortOrder}";
         var cachedResults = await _cache.GetAsync<List<ContentSearchResult>>(cacheKey, cancellationToken);
         if (cachedResults != null)
         {
@@ -187,8 +187,19 @@ public async Task<OperationResult<IEnumerable<ContentSearchResult>>> SearchAsync
         // than an exception, which would otherwise surface here as an empty successful search.
         cancellationToken.ThrowIfCancellationRequested();
 
+        // Deduplicate results by manifest ID across providers before sorting and pagination,
+        // preferring specialized publisher providers over generic GitHub providers.
+        var deduplicatedResults = allResults
+            .GroupBy(r => r.Id, StringComparer.OrdinalIgnoreCase)
+            .Select(g => g
+                .OrderByDescending(r =>
+                    !string.Equals(r.ProviderName, ContentSourceNames.GitHubDiscoverer, StringComparison.OrdinalIgnoreCase) &&
+                    !string.Equals(r.ProviderName, ContentSourceNames.GitHubReleasesDiscoverer, StringComparison.OrdinalIgnoreCase) ? 1 : 0)
+                .First())
+            .ToList();
+
         // Apply orchestrator-level sorting and pagination
-        var sortedResults = ApplySorting(allResults, query.SortOrder)
+        var sortedResults = ApplySorting(deduplicatedResults, query.SortOrder)
             .Skip(query.Skip)
             .Take(query.Take)
             .ToList();
diff --git a/GenHub/GenHub/Features/Content/Services/GitHub/GitHubContentDeliverer.cs b/GenHub/GenHub/Features/Content/Services/GitHub/GitHubContentDeliverer.cs
index 1814c5362..5d8578b60 100644
--- a/GenHub/GenHub/Features/Content/Services/GitHub/GitHubContentDeliverer.cs
+++ b/GenHub/GenHub/Features/Content/Services/GitHub/GitHubContentDeliverer.cs
@@ -381,7 +381,7 @@ private async Task ExtractArchiveAsync(
         await Task.Run(
             () =>
             {
-                using var archive = ArchiveFactory.Open(archiveFile);
+                using var archive = ArchiveFactory.Open(new FileInfo(archiveFile));
                 int totalEntries = archive.Entries.Count(e => !e.IsDirectory);
                 int currentEntry = 0;
 
diff --git a/GenHub/GenHub/Features/Content/Services/GitHub/GitHubResolver.cs b/GenHub/GenHub/Features/Content/Services/GitHub/GitHubResolver.cs
index f91075390..e7ac16dc3 100644
--- a/GenHub/GenHub/Features/Content/Services/GitHub/GitHubResolver.cs
+++ b/GenHub/GenHub/Features/Content/Services/GitHub/GitHubResolver.cs
@@ -186,6 +186,11 @@ await manifest.AddRemoteFileAsync(
             }
 
             var builtManifest = manifest.Build();
+            if (!string.IsNullOrEmpty(release.TagName))
+            {
+                builtManifest.Version = release.TagName;
+            }
+
             logger.LogInformation("GitHubResolver: Built manifest with ID: {ManifestId}", builtManifest.Id);
             return OperationResult<ContentManifest>.CreateSuccess(builtManifest);
         }
@@ -373,6 +378,11 @@ await manifest.AddRemoteFileAsync(
             logger.LogInformation("Successfully resolved single release asset: {AssetName}", asset.Name);
 
             var builtManifest = manifest.Build();
+            if (!string.IsNullOrEmpty(tag))
+            {
+                builtManifest.Version = tag;
+            }
+
             logger.LogInformation("GitHubResolver (Single Asset): Built manifest with ID: {ManifestId}", builtManifest.Id);
             return OperationResult<ContentManifest>.CreateSuccess(builtManifest);
         }
diff --git a/GenHub/GenHub/Features/Content/Services/Parsers/ModDBPageParser.cs b/GenHub/GenHub/Features/Content/Services/Parsers/ModDBPageParser.cs
new file mode 100644
index 000000000..b435fbd30
--- /dev/null
+++ b/GenHub/GenHub/Features/Content/Services/Parsers/ModDBPageParser.cs
@@ -0,0 +1,3253 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text.RegularExpressions;
+using System.Threading;
+using System.Threading.Tasks;
+using AngleSharp;
+using AngleSharp.Dom;
+using GenHub.Core.Constants;
+using GenHub.Core.Interfaces.Parsers;
+using GenHub.Core.Interfaces.Tools;
+using GenHub.Core.Models.Parsers;
+using Microsoft.Extensions.Logging;
+using IDocument = AngleSharp.Dom.IDocument;
+
+namespace GenHub.Features.Content.Services.Parsers;
+
+/// <summary>
+/// Parser for ModDB pages that extracts rich content including files, videos, images, articles, reviews, and comments.
+/// </summary>
+public partial class ModDBPageParser(IPlaywrightService playwrightService, ILogger<ModDBPageParser> logger) : IWebPageParser
+{
+    [GeneratedRegex(ModDBParserConstants.ParentModPathRegex, RegexOptions.IgnoreCase, "en-US")]
+    private static partial Regex MyRegex();
+
+    [GeneratedRegex(@"/(?:crop|thumb)_[^/]+/", RegexOptions.IgnoreCase, "en-US")]
+    private static partial Regex ModDBImageCropRegex();
+
+    [GeneratedRegex(@"(?<=[a-z])(?=[A-Z])|(?<=[A-Z])(?=[A-Z][a-z])", RegexOptions.None, "en-US")]
+    private static partial Regex CamelCaseSplitRegex();
+
+    [GeneratedRegex(@"(?:\b|\()(\d+(?:[.,]\d+)?\s*(?:GB|MB|KB|B|bytes|byte|gigabytes|megabytes|kilobytes)(?:\s*\([^)]+\))?)", RegexOptions.IgnoreCase, "en-US")]
+    private static partial Regex FileSizeRegex();
+
+    [GeneratedRegex(@"(?:\(|\b)(\d[\d,\s]*)\s*bytes", RegexOptions.IgnoreCase, "en-US")]
+    private static partial Regex ExactBytesRegex();
+
+    [GeneratedRegex(@"(\d+(?:[.,]\d+)?)\s*([a-zA-Z]+)", RegexOptions.IgnoreCase, "en-US")]
+    private static partial Regex NumericSizeWithUnitRegex();
+
+    [GeneratedRegex(@"(?:(?:v|embed|shorts|vi)/|(?:\?|&)v=|youtu\.be/)([a-zA-Z0-9_-]{11})", RegexOptions.IgnoreCase, "en-US")]
+    private static partial Regex YouTubeVideoIdRegex();
+
+    [GeneratedRegex(@"vimeo\.com/(?:video/)?(\d+)", RegexOptions.IgnoreCase, "en-US")]
+    private static partial Regex VimeoVideoIdRegex();
+
+    [GeneratedRegex(@"^(?<title>.+?)\s+(?:file|addon|patch|demo|mod)\s+-", RegexOptions.IgnoreCase, "en-US")]
+    private static partial Regex ModDBPageTitleRegex();
+
+    /// <summary>
+    /// Extracts parent mod URL from a FileDetail page URL.
+    /// Example: /mods/mod-name/downloads/file-name -> /mods/mod-name.
+    /// </summary>
+    private static string? ExtractParentModUrl(string url)
+    {
+        // Remove query string and fragment
+        var cleanUrl = url.Split('?')[0].Split('#')[0];
+
+        // Match pattern: /mods/mod-name/downloads/file-name or /mods/mod-name/addons/file-name
+        var match = MyRegex().Match(cleanUrl);
+
+        if (match.Success)
+        {
+            var parentPath = match.Groups[1].Value;
+
+            // Ensure it's a full URL
+            if (!parentPath.StartsWith("http", StringComparison.OrdinalIgnoreCase))
+            {
+                return ModDBConstants.BaseUrl.TrimEnd('/') + parentPath;
+            }
+
+            return parentPath;
+        }
+
+        return null;
+    }
+
+    /// <summary>
+    /// Merges primary and fallback global contexts, taking fallback values when primary is missing.
+    /// </summary>
+    private static GlobalContext MergeContext(GlobalContext primary, GlobalContext fallback)
+    {
+        return new GlobalContext(
+            Title: string.IsNullOrWhiteSpace(primary.Title) || primary.Title == "Unknown" ? fallback.Title : primary.Title,
+            Developer: string.IsNullOrWhiteSpace(primary.Developer) ? fallback.Developer : primary.Developer,
+            ReleaseDate: primary.ReleaseDate ?? fallback.ReleaseDate,
+            GameName: string.IsNullOrWhiteSpace(primary.GameName) ? fallback.GameName : primary.GameName,
+            IconUrl: string.IsNullOrWhiteSpace(primary.IconUrl) ? fallback.IconUrl : primary.IconUrl,
+            Description: string.IsNullOrWhiteSpace(primary.Description) ? fallback.Description : primary.Description);
+    }
+
+    /// <summary>
+    /// Detects the page type based on URL patterns and DOM structure.
+    /// </summary>
+    private static PageType DetectPageType(string url, IDocument document)
+    {
+        // Check for file detail page
+        if (document.QuerySelector(ModDBParserConstants.DownloadsInfoSelector) != null)
+        {
+            return PageType.FileDetail;
+        }
+
+        // Addons listings are row tables. A mod's /images tab is a gallery (#imagebox), not a list.
+        if (url.Contains("/addons", StringComparison.OrdinalIgnoreCase))
+        {
+            return PageType.List;
+        }
+
+        if (url.Contains("/images", StringComparison.OrdinalIgnoreCase) &&
+            document.QuerySelector(ModDBParserConstants.ImageGallerySelector) == null)
+        {
+            return PageType.List;
+        }
+
+        // Check for summary/news pages
+        if (document.QuerySelector(ModDBParserConstants.ArticlesBrowseSelector) != null)
+        {
+            return PageType.Summary;
+        }
+
+        // Default to detail page
+        return PageType.Detail;
+    }
+
+    /// <summary>
+    /// Extracts content sections from summary/news pages.
+    /// </summary>
+    private static List<ContentSection> ExtractSummarySections(IDocument document)
+    {
+        var sections = new List<ContentSection>();
+
+        // Extract articles
+        sections.AddRange(ExtractArticles(document));
+
+        return sections;
+    }
+
+    /// <summary>
+    /// Extracts a file from a row element.
+    /// </summary>
+    /// <param name="row">The row element containing file information.</param>
+    /// <param name="sectionType">The type of file section (Release or Addon).</param>
+    private static DownloadableFile? ExtractFileFromRow(IElement row, FileSectionType sectionType = FileSectionType.Downloads)
+    {
+        var nameEl = row.QuerySelector(ModDBParserConstants.FileNameSelector);
+        var name = nameEl?.TextContent?.Trim();
+        if (string.IsNullOrEmpty(name))
+        {
+            return null;
+        }
+
+        var (sizeBytes, sizeText) = ExtractRowFileSize(row);
+        var (uploadDate, releaseDate) = ExtractRowDates(row);
+        var category = ExtractRowCategory(row);
+        var uploader = ExtractRowUploader(row);
+        var (downloadUrl, detailsUrl) = ExtractRowUrls(row, nameEl);
+        var thumbnailUrl = ExtractRowThumbnail(row);
+        var summary = ExtractRowSummary(row);
+        var commentCount = ExtractRowCommentCount(row);
+
+        return new DownloadableFile(
+            Name: name,
+            SizeBytes: sizeBytes,
+            SizeDisplay: sizeText,
+            UploadDate: uploadDate,
+            Category: category,
+            Uploader: uploader,
+            DownloadUrl: downloadUrl,
+            CommentCount: commentCount,
+            ThumbnailUrl: thumbnailUrl,
+            FileSectionType: sectionType,
+            ReleaseDate: releaseDate,
+            DetailsUrl: detailsUrl,
+            Description: summary);
+    }
+
+    private static (long? SizeBytes, string? SizeText) ExtractRowFileSize(IElement row)
+    {
+        var sizeEl = row.QuerySelector(ModDBParserConstants.FileSizeSelector);
+        var sizeText = sizeEl?.TextContent?.Trim();
+        long? sizeBytes = null;
+        if (!string.IsNullOrEmpty(sizeText))
+        {
+            sizeBytes = ParseFileSize(sizeText);
+        }
+
+        if (sizeBytes == null || string.IsNullOrEmpty(sizeText))
+        {
+            var subHeadingEl = row.QuerySelector(ModDBParserConstants.FileSubheadingSelector);
+            var textToSearch = subHeadingEl?.TextContent ?? row.TextContent;
+            if (!string.IsNullOrWhiteSpace(textToSearch))
+            {
+                var sizeMatch = FileSizeRegex().Match(textToSearch);
+                if (sizeMatch.Success)
+                {
+                    sizeText = sizeMatch.Groups[1].Value.Trim();
+                    sizeBytes = ParseFileSize(sizeText);
+                }
+            }
+        }
+
+        return (sizeBytes, sizeText);
+    }
+
+    private static (DateTime? UploadDate, DateTime? ReleaseDate) ExtractRowDates(IElement row)
+    {
+        var dateEl = row.QuerySelector(ModDBParserConstants.FileDateSelector);
+        DateTime? uploadDate = null;
+        DateTime? releaseDate = null;
+        if (dateEl != null)
+        {
+            var dateStr = dateEl.GetAttribute("datetime") ?? dateEl.GetAttribute("title") ?? dateEl.TextContent?.Trim();
+            if (!string.IsNullOrEmpty(dateStr))
+            {
+                if (DateTime.TryParse(dateStr, out var standardDate))
+                {
+                    uploadDate = standardDate;
+                    releaseDate = standardDate;
+                }
+                else
+                {
+                    var modDBDate = ParseModDBDate(dateStr);
+                    if (modDBDate.HasValue)
+                    {
+                        uploadDate = modDBDate;
+                        releaseDate = modDBDate;
+                    }
+                }
+            }
+        }
+
+        return (uploadDate, releaseDate);
+    }
+
+    private static string? ExtractRowCategory(IElement row)
+    {
+        var category = row.QuerySelector(ModDBParserConstants.FileCategorySelector)?.TextContent?.Trim();
+        if (string.IsNullOrEmpty(category))
+        {
+            var subHeadingEl = row.QuerySelector(ModDBParserConstants.FileSubheadingSelector);
+            var subHeadingText = subHeadingEl?.TextContent?.Trim();
+            if (!string.IsNullOrEmpty(subHeadingText))
+            {
+                var categoryKeywords = new[] { "Full Version", "Patch", "Demo", "Tool", "Addon", "Map", "Skin" };
+                foreach (var keyword in categoryKeywords)
+                {
+                    if (subHeadingText.Contains(keyword, StringComparison.OrdinalIgnoreCase))
+                    {
+                        return keyword;
+                    }
+                }
+            }
+        }
+
+        return category;
+    }
+
+    private static string? ExtractRowUploader(IElement row)
+    {
+        var uploaderEl = row.QuerySelector(ModDBParserConstants.FileUploaderSelector);
+        var uploader = uploaderEl?.TextContent?.Trim();
+        return IsJunkDeveloperName(uploader) ? null : uploader;
+    }
+
+    private static (string? DownloadUrl, string? DetailsUrl) ExtractRowUrls(IElement row, IElement? nameEl)
+    {
+        string? downloadUrl = null;
+        string? detailsUrl = null;
+
+        var titleLinkEl = row.QuerySelector("h4 a, h5 a, h3 a, .heading a, .title a, a.title, .name a, a[href*='/downloads/'], a[href*='/addons/']")
+            ?? (string.Equals(nameEl?.TagName, "A", StringComparison.OrdinalIgnoreCase) ? nameEl : nameEl?.QuerySelector("a"));
+        var titleHref = titleLinkEl?.GetAttribute("href");
+        if (!string.IsNullOrEmpty(titleHref))
+        {
+            titleHref = ToAbsoluteUrl(titleHref);
+            if (!IsDirectDownloadUrl(titleHref))
+            {
+                detailsUrl = titleHref;
+            }
+            else
+            {
+                downloadUrl = titleHref;
+            }
+        }
+
+        var linkEl = row.QuerySelector(ModDBParserConstants.FileDownloadSelector);
+        var buttonHref = linkEl?.GetAttribute("href");
+        if (!string.IsNullOrEmpty(buttonHref))
+        {
+            if (!buttonHref.StartsWith("http", StringComparison.OrdinalIgnoreCase))
+            {
+                buttonHref = ModDBConstants.BaseUrl.TrimEnd('/') + "/" + buttonHref.TrimStart('/');
+            }
+
+            if (IsDirectDownloadUrl(buttonHref))
+            {
+                downloadUrl = buttonHref;
+            }
+            else if (string.IsNullOrEmpty(detailsUrl))
+            {
+                detailsUrl = buttonHref;
+            }
+        }
+
+        downloadUrl ??= detailsUrl;
+        return (downloadUrl, detailsUrl);
+    }
+
+    private static string? ExtractRowThumbnail(IElement row)
+    {
+        var imgEl = row.QuerySelector("img");
+        var thumbnailUrl = imgEl?.GetAttribute("src") ?? imgEl?.GetAttribute("data-src");
+        if (!string.IsNullOrEmpty(thumbnailUrl))
+        {
+            return (thumbnailUrl.Contains("blank.gif", StringComparison.OrdinalIgnoreCase) ||
+                    thumbnailUrl.Contains("clear.gif", StringComparison.OrdinalIgnoreCase))
+                ? null
+                : ToAbsoluteUrl(thumbnailUrl);
+        }
+
+        return null;
+    }
+
+    private static string? ExtractRowSummary(IElement row)
+    {
+        var summaryEl = row.QuerySelector("p.summary, .summary, p, div.summary");
+        var summary = summaryEl?.TextContent?.Trim();
+        return IsBreadcrumbOrLocationText(summary) ? null : summary;
+    }
+
+    private static int? ExtractRowCommentCount(IElement row)
+    {
+        var commentCountEl = row.QuerySelector(ModDBParserConstants.FileCommentCountSelector);
+        if (commentCountEl != null)
+        {
+            var countText = commentCountEl.TextContent?.Trim();
+            if (!string.IsNullOrEmpty(countText) && int.TryParse(countText, out var count))
+            {
+                return count;
+            }
+        }
+
+        return null;
+    }
+
+    /// <summary>
+    /// Extracts metadata from the sidebar profile section.
+    /// </summary>
+    private static ProfileMeta ExtractProfileMeta(IDocument document)
+    {
+        var sidebar = document.QuerySelector(ModDBParserConstants.ProfileSidebarSelector);
+        if (sidebar == null)
+        {
+            return new ProfileMeta(null, null, null, null, null, null);
+        }
+
+        string? name = null; // Often the page title, but sometimes in sidebar
+        long? sizeBytes = null;
+        string? sizeDisplay = null;
+        DateTime? releaseDate = null;
+        string? developer = null;
+        string? md5Hash = null;
+
+        var rows = sidebar.QuerySelectorAll(ModDBParserConstants.ProfileRowSelector);
+        foreach (var row in rows)
+        {
+            var labelEl = row.QuerySelector(ModDBParserConstants.ProfileLabelSelector);
+            var contentEl = row.QuerySelector(ModDBParserConstants.ProfileContentSelector);
+
+            if (labelEl == null || contentEl == null)
+            {
+                continue;
+            }
+
+            var label = labelEl.TextContent?.Trim().ToLowerInvariant().Replace(":", string.Empty);
+            var content = contentEl.TextContent?.Trim();
+
+            if (string.IsNullOrEmpty(label) || string.IsNullOrEmpty(content))
+            {
+                continue;
+            }
+
+            switch (label)
+            {
+                case "filename":
+                case "file":
+                    name = content;
+                    break;
+                case "size":
+                    sizeDisplay = content;
+
+                    // Sometimes format is "134mb (140,505,749 bytes)"
+                    // Try to parse the bytes part first if available
+                    if (content.Contains("bytes") && content.Contains('(') && content.Contains(')'))
+                    {
+                         var bytesPart = content.Split('(').Last().Replace("bytes)", string.Empty).Replace(",", string.Empty).Trim();
+                         if (long.TryParse(bytesPart, out var bytesVal))
+                         {
+                             sizeBytes = bytesVal;
+                         }
+                    }
+
+                    sizeBytes ??= ParseFileSize(content);
+
+                    break;
+                case "uploader":
+                case "author":
+                    developer = content;
+                    break;
+                case "added":
+                case "date":
+                case "release date":
+                    if (DateTime.TryParse(content, out var dt))
+                    {
+                         releaseDate = dt;
+                    }
+
+                    break;
+                case "md5 hash":
+                case "md5":
+                    md5Hash = content;
+                    break;
+                default:
+                    // Ignore other metadata labels
+                    break;
+            }
+        }
+
+        return new ProfileMeta(name, sizeBytes, sizeDisplay, releaseDate, developer, md5Hash);
+    }
+
+    /// <summary>
+    /// Extracts videos from the document, including embedded iframes, HTML5 video elements,
+    /// and video gallery cards (e.g., from the /videos tab or media widgets).
+    /// </summary>
+    private static List<Video> ExtractVideos(IDocument document)
+    {
+        var videos = new List<Video>();
+        videos.AddRange(ExtractIFrameVideos(document));
+        videos.AddRange(ExtractHtml5Videos(document));
+        videos.AddRange(ExtractGalleryCardVideos(document));
+        return DeduplicateVideoList(videos);
+    }
+
+    private static List<Video> ExtractIFrameVideos(IDocument document)
+    {
+        var videos = new List<Video>();
+        var videoElements = document.QuerySelectorAll(ModDBParserConstants.VideoSelector);
+        foreach (var videoEl in videoElements)
+        {
+            var src = videoEl.GetAttribute("src")
+                ?? videoEl.GetAttribute("data-src")
+                ?? videoEl.GetAttribute("data-video");
+
+            if (string.IsNullOrWhiteSpace(src))
+            {
+                continue;
+            }
+
+            if (src.StartsWith("//", StringComparison.Ordinal))
+            {
+                src = "https:" + src;
+            }
+
+            if (IsNonVideoIframe(src))
+            {
+                continue;
+            }
+
+            var title = ResolveIFrameVideoTitle(videoEl);
+            if (!IsUsableVideoTitle(title))
+            {
+                continue;
+            }
+
+            var (platform, thumbnailUrl, embedUrl) = ResolveVideoPlatformDetails(src, videoEl);
+
+            if (!embedUrl.StartsWith("http", StringComparison.OrdinalIgnoreCase))
+            {
+                embedUrl = ToAbsoluteUrl(embedUrl);
+            }
+
+            videos.Add(new Video(
+                Title: title,
+                ThumbnailUrl: thumbnailUrl,
+                EmbedUrl: embedUrl,
+                Platform: platform));
+        }
+
+        return videos;
+    }
+
+    private static (string Platform, string? ThumbnailUrl, string EmbedUrl) ResolveVideoPlatformDetails(string src, IElement videoEl)
+    {
+        string? thumbnailUrl = null;
+        var platform = "Unknown";
+        var embedUrl = src;
+
+        var ytMatch = YouTubeVideoIdRegex().Match(src);
+        if (ytMatch.Success)
+        {
+            var videoId = ytMatch.Groups[1].Value;
+            platform = "YouTube";
+            thumbnailUrl = $"https://img.youtube.com/vi/{videoId}/hqdefault.jpg";
+            embedUrl = $"https://www.youtube.com/embed/{videoId}";
+        }
+        else
+        {
+            var vimeoMatch = VimeoVideoIdRegex().Match(src);
+            if (vimeoMatch.Success)
+            {
+                var videoId = vimeoMatch.Groups[1].Value;
+                platform = "Vimeo";
+                embedUrl = $"https://player.vimeo.com/video/{videoId}";
+            }
+            else if (src.Contains("dailymotion", StringComparison.OrdinalIgnoreCase))
+            {
+                platform = "Dailymotion";
+            }
+            else if (src.Contains("moddb.com", StringComparison.OrdinalIgnoreCase))
+            {
+                platform = "ModDB";
+            }
+        }
+
+        if (string.IsNullOrWhiteSpace(thumbnailUrl))
+        {
+            var container = videoEl.Closest(".video, .media, .mediabox, .holder, .row, .embed, figure, .video-container");
+            var thumbEl = container?.QuerySelector(ModDBParserConstants.VideoThumbnailSelector);
+            var rawThumb = thumbEl?.GetAttribute("src") ?? thumbEl?.GetAttribute("data-src");
+            if (!string.IsNullOrWhiteSpace(rawThumb))
+            {
+                thumbnailUrl = ToAbsoluteUrl(rawThumb);
+            }
+        }
+
+        return (platform, thumbnailUrl, embedUrl);
+    }
+
+    private static List<Video> ExtractHtml5Videos(IDocument document)
+    {
+        var videos = new List<Video>();
+        var html5VideoElements = document.QuerySelectorAll("video");
+        foreach (var videoEl in html5VideoElements)
+        {
+            var src = videoEl.GetAttribute("src")
+                ?? videoEl.QuerySelector("source")?.GetAttribute("src");
+
+            if (string.IsNullOrWhiteSpace(src))
+            {
+                continue;
+            }
+
+            var poster = videoEl.GetAttribute("poster");
+            var thumbnailUrl = !string.IsNullOrWhiteSpace(poster) ? ToAbsoluteUrl(poster) : null;
+            var title = ResolveIFrameVideoTitle(videoEl);
+            if (!IsUsableVideoTitle(title))
+            {
+                continue;
+            }
+
+            videos.Add(new Video(
+                Title: title,
+                ThumbnailUrl: thumbnailUrl,
+                EmbedUrl: ToAbsoluteUrl(src),
+                Platform: "ModDB"));
+        }
+
+        return videos;
+    }
+
+    private static List<Video> ExtractGalleryCardVideos(IDocument document)
+    {
+        var videos = new List<Video>();
+        var videoLinks = document.QuerySelectorAll(ModDBParserConstants.VideoLinkSelector);
+        foreach (var linkEl in videoLinks)
+        {
+            var href = linkEl.GetAttribute("href");
+            if (string.IsNullOrWhiteSpace(href))
+            {
+                continue;
+            }
+
+            if (IsNavigationOrPaginationLink(href, linkEl))
+            {
+                continue;
+            }
+
+            if (IsInRecommendationsOrAds(linkEl))
+            {
+                continue;
+            }
+
+            var absoluteHref = ToAbsoluteUrl(href);
+            var (video, isVideo) = ExtractVideoFromGalleryLink(linkEl, absoluteHref);
+            if (isVideo && video != null)
+            {
+                videos.Add(video);
+            }
+        }
+
+        return videos;
+    }
+
+    private static bool IsNonVideoIframe(string src)
+    {
+        if (string.IsNullOrWhiteSpace(src))
+        {
+            return true;
+        }
+
+        if (src.Contains("/widget", StringComparison.OrdinalIgnoreCase) ||
+            src.Contains("/widgets/", StringComparison.OrdinalIgnoreCase) ||
+            src.Contains("doubleclick", StringComparison.OrdinalIgnoreCase) ||
+            src.Contains("googlesyndication", StringComparison.OrdinalIgnoreCase) ||
+            src.Contains("adnxs", StringComparison.OrdinalIgnoreCase) ||
+            src.Contains("amazon-adsystem", StringComparison.OrdinalIgnoreCase))
+        {
+            return true;
+        }
+
+        if (src.Contains("moddb.com", StringComparison.OrdinalIgnoreCase) &&
+            !src.Contains("/media/iframe/", StringComparison.OrdinalIgnoreCase) &&
+            !src.Contains("/media/embed/", StringComparison.OrdinalIgnoreCase) &&
+            !src.Contains("/videos/iframe/", StringComparison.OrdinalIgnoreCase) &&
+            !src.Contains("/videos/embed/", StringComparison.OrdinalIgnoreCase))
+        {
+            return true;
+        }
+
+        return false;
+    }
+
+    private static bool IsInRecommendationsOrAds(IElement el)
+    {
+        return el.Closest(ModDBParserConstants.RecommendationsSelector) != null ||
+               el.Closest("aside, #sidecolumn, .sidecolumn") != null;
+    }
+
+    private static string ResolveIFrameVideoTitle(IElement element)
+    {
+        var title = element.GetAttribute("title");
+        if (IsUsableVideoTitle(title))
+        {
+            return FormatVideoTitle(title!);
+        }
+
+        var ariaLabel = element.GetAttribute("aria-label");
+        if (IsUsableVideoTitle(ariaLabel))
+        {
+            return FormatVideoTitle(ariaLabel!);
+        }
+
+        var container = element.Closest(".video, .media, .mediabox, .holder, .row, .embed, figure, .video-container, [class*='video'], [class*='media']");
+        var containerTitleEl = container?.QuerySelector(".title, .caption, figcaption, h1, h2, h3, h4, h5, strong");
+        var containerTitle = containerTitleEl?.TextContent?.Trim();
+        if (IsUsableVideoTitle(containerTitle))
+        {
+            return FormatVideoTitle(containerTitle!);
+        }
+
+        var prev = element.PreviousElementSibling;
+        if (prev != null && (prev.TagName.StartsWith('H') || prev.ClassList.Contains("title") || prev.ClassList.Contains("caption")))
+        {
+            var prevTitle = prev.TextContent?.Trim();
+            if (IsUsableVideoTitle(prevTitle))
+            {
+                return FormatVideoTitle(prevTitle!);
+            }
+        }
+
+        var next = element.NextElementSibling;
+        if (next != null && (next.ClassList.Contains("title") || next.ClassList.Contains("caption") || next.TagName.Equals("FIGCAPTION", StringComparison.OrdinalIgnoreCase)))
+        {
+            var nextTitle = next.TextContent?.Trim();
+            if (IsUsableVideoTitle(nextTitle))
+            {
+                return FormatVideoTitle(nextTitle!);
+            }
+        }
+
+        return "Video";
+    }
+
+    private static bool IsUsableVideoTitle(string? title)
+    {
+        if (string.IsNullOrWhiteSpace(title))
+        {
+            return false;
+        }
+
+        var clean = title.Trim();
+        return !clean.Equals("Video", StringComparison.OrdinalIgnoreCase) &&
+               !clean.Equals("YouTube video player", StringComparison.OrdinalIgnoreCase) &&
+               !clean.Equals("YouTube player", StringComparison.OrdinalIgnoreCase) &&
+               !clean.Equals("Play", StringComparison.OrdinalIgnoreCase) &&
+               !clean.Equals("View media", StringComparison.OrdinalIgnoreCase) &&
+               !clean.Equals("Image", StringComparison.OrdinalIgnoreCase) &&
+               !clean.Equals("Next Media", StringComparison.OrdinalIgnoreCase) &&
+               !clean.Equals("Previous Media", StringComparison.OrdinalIgnoreCase) &&
+               !clean.Equals("Next", StringComparison.OrdinalIgnoreCase) &&
+               !clean.Equals("Previous", StringComparison.OrdinalIgnoreCase) &&
+               !clean.Equals("Prev", StringComparison.OrdinalIgnoreCase) &&
+               !clean.Equals("RSS", StringComparison.OrdinalIgnoreCase) &&
+               !clean.Equals("RSS Feed", StringComparison.OrdinalIgnoreCase) &&
+               !clean.Equals("Feed", StringComparison.OrdinalIgnoreCase) &&
+               !clean.Equals("Subscribe", StringComparison.OrdinalIgnoreCase) &&
+               !clean.StartsWith("You may also like", StringComparison.OrdinalIgnoreCase) &&
+               !clean.StartsWith("Recommended", StringComparison.OrdinalIgnoreCase) &&
+               !clean.StartsWith("Related", StringComparison.OrdinalIgnoreCase);
+    }
+
+    private static string FormatVideoTitle(string title)
+    {
+        if (string.IsNullOrWhiteSpace(title))
+        {
+            return "Video";
+        }
+
+        var formatted = title.Trim('*', ' ', '\t', '\r', '\n').Replace('_', ' ').Replace('-', ' ');
+
+        if (!formatted.Contains(' '))
+        {
+            formatted = CamelCaseSplitRegex().Replace(formatted, " ");
+        }
+
+        formatted = Regex.Replace(formatted, @"\s+", " ").Trim();
+
+        return string.IsNullOrWhiteSpace(formatted) ? "Video" : formatted;
+    }
+
+    private static (Video? Video, bool IsVideo) ExtractVideoFromGalleryLink(IElement linkEl, string absoluteHref)
+    {
+        if (absoluteHref.Contains("/widget", StringComparison.OrdinalIgnoreCase) ||
+            absoluteHref.Contains("/downloads/", StringComparison.OrdinalIgnoreCase) ||
+            absoluteHref.Contains("/addons/", StringComparison.OrdinalIgnoreCase))
+        {
+            return (null, false);
+        }
+
+        if (IsNavigationOrPaginationLink(absoluteHref, linkEl))
+        {
+            return (null, false);
+        }
+
+        var container = linkEl.Closest(".holder, .mediabox, .mediarow, .row, .rowcontent, .media, .videobox") ?? linkEl;
+
+        var img = linkEl.QuerySelector("img")
+            ?? container.QuerySelector("img");
+
+        var rawThumb = img?.GetAttribute("src") ?? img?.GetAttribute("data-src");
+        string? thumbnailUrl = null;
+        if (!string.IsNullOrWhiteSpace(rawThumb))
+        {
+            thumbnailUrl = ToAbsoluteUrl(rawThumb);
+        }
+
+        var platform = "ModDB";
+        var embedUrl = absoluteHref;
+
+        var ytMatch = YouTubeVideoIdRegex().Match(absoluteHref);
+        if (!ytMatch.Success && thumbnailUrl != null)
+        {
+            ytMatch = YouTubeVideoIdRegex().Match(thumbnailUrl);
+        }
+
+        if (ytMatch.Success)
+        {
+            var videoId = ytMatch.Groups[1].Value;
+            platform = "YouTube";
+            thumbnailUrl = $"https://img.youtube.com/vi/{videoId}/hqdefault.jpg";
+            embedUrl = $"https://www.youtube.com/embed/{videoId}";
+        }
+        else
+        {
+            var vimeoMatch = VimeoVideoIdRegex().Match(absoluteHref);
+            if (vimeoMatch.Success)
+            {
+                var videoId = vimeoMatch.Groups[1].Value;
+                platform = "Vimeo";
+                embedUrl = $"https://player.vimeo.com/video/{videoId}";
+            }
+        }
+
+        var title = ResolveGalleryVideoTitle(linkEl, container, img, absoluteHref);
+        if (!IsUsableVideoTitle(title))
+        {
+            return (null, false);
+        }
+
+        if (string.IsNullOrWhiteSpace(thumbnailUrl) && platform == "ModDB")
+        {
+            return (null, false);
+        }
+
+        return (new Video(
+            Title: title,
+            ThumbnailUrl: thumbnailUrl,
+            EmbedUrl: embedUrl,
+            Platform: platform), true);
+    }
+
+    private static string ResolveGalleryVideoTitle(IElement linkEl, IElement container, IElement? img, string absoluteHref)
+    {
+        var linkTitle = linkEl.GetAttribute("title");
+        if (IsUsableVideoTitle(linkTitle))
+        {
+            return FormatVideoTitle(linkTitle!);
+        }
+
+        var imgAlt = img?.GetAttribute("alt") ?? img?.GetAttribute("title");
+        if (IsUsableVideoTitle(imgAlt))
+        {
+            return FormatVideoTitle(imgAlt!);
+        }
+
+        var containerTitleEl = container.QuerySelector(".title a, .title, h4 a, h4, h3 a, h3, h5, .caption");
+        var containerTitle = containerTitleEl?.TextContent?.Trim();
+        if (IsUsableVideoTitle(containerTitle))
+        {
+            return FormatVideoTitle(containerTitle!);
+        }
+
+        var slug = GalleryImageKey(absoluteHref);
+        var dot = slug.LastIndexOf('.');
+        if (dot > 0)
+        {
+            slug = slug[..dot];
+        }
+
+        if (IsUsableVideoTitle(slug))
+        {
+            return FormatVideoTitle(slug);
+        }
+
+        return "Video";
+    }
+
+    private static bool IsNavigationOrPaginationLink(string href, IElement linkEl)
+    {
+        if (string.IsNullOrWhiteSpace(href))
+        {
+            return true;
+        }
+
+        var cleanHref = href.Split('?')[0].Split('#')[0].TrimEnd('/');
+        if (cleanHref.EndsWith("/videos", StringComparison.OrdinalIgnoreCase) ||
+            cleanHref.EndsWith("/media", StringComparison.OrdinalIgnoreCase) ||
+            cleanHref.EndsWith("/images", StringComparison.OrdinalIgnoreCase) ||
+            cleanHref.EndsWith("/downloads", StringComparison.OrdinalIgnoreCase) ||
+            cleanHref.EndsWith("/addons", StringComparison.OrdinalIgnoreCase) ||
+            cleanHref.EndsWith("/reviews", StringComparison.OrdinalIgnoreCase) ||
+            cleanHref.EndsWith("/articles", StringComparison.OrdinalIgnoreCase))
+        {
+            return true;
+        }
+
+        if (cleanHref.Contains("/page/", StringComparison.OrdinalIgnoreCase) ||
+            cleanHref.Contains("/rss", StringComparison.OrdinalIgnoreCase) ||
+            cleanHref.Contains("/feed", StringComparison.OrdinalIgnoreCase) ||
+            cleanHref.EndsWith(".xml", StringComparison.OrdinalIgnoreCase) ||
+            href.Contains("?page=", StringComparison.OrdinalIgnoreCase) ||
+            href.Contains("&page=", StringComparison.OrdinalIgnoreCase))
+        {
+            return true;
+        }
+
+        var text = linkEl.TextContent?.Trim();
+        if (!string.IsNullOrEmpty(text) &&
+            (text.Equals("Next Media", StringComparison.OrdinalIgnoreCase) ||
+             text.Equals("Previous Media", StringComparison.OrdinalIgnoreCase) ||
+             text.Equals("Next", StringComparison.OrdinalIgnoreCase) ||
+             text.Equals("Previous", StringComparison.OrdinalIgnoreCase) ||
+             text.Equals("Prev", StringComparison.OrdinalIgnoreCase) ||
+             text.Equals("RSS", StringComparison.OrdinalIgnoreCase) ||
+             text.Equals("RSS Feed", StringComparison.OrdinalIgnoreCase) ||
+             text.Equals("Feed", StringComparison.OrdinalIgnoreCase) ||
+             text.Equals("Subscribe", StringComparison.OrdinalIgnoreCase)))
+        {
+            return true;
+        }
+
+        var inNav = linkEl.Closest("nav, .tabs, .navigation, .pagination, .pages, .heading, #nav, .feed, .rss, .subheading, .actions") != null;
+        return inNav;
+    }
+
+    /// <summary>
+    /// Extracts gallery images from the document. Game icons, member avatars, file-page chrome,
+    /// and social-share glyphs are excluded — those previously flooded the Media tab.
+    /// </summary>
+    private static List<Image> ExtractImages(IDocument document)
+    {
+        var images = new List<Image>();
+        var seenKeys = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+
+        var elements = document.QuerySelectorAll(ModDBParserConstants.GalleryImageSelector);
+        foreach (var img in elements)
+        {
+            var src = img.GetAttribute("src") ?? img.GetAttribute("data-src");
+            if (!IsUsableModGalleryImage(src, img))
+            {
+                continue;
+            }
+
+            var thumbnailUrl = ToAbsoluteUrl(src!);
+            var key = GalleryImageKey(thumbnailUrl);
+            if (!seenKeys.Add(key))
+            {
+                continue;
+            }
+
+            var parentAnchor = img.Closest("a");
+            var anchorHref = parentAnchor?.GetAttribute("href");
+            var fullSizeUrl = GetFullSizeModDBImageSource(thumbnailUrl);
+
+            if (!string.IsNullOrWhiteSpace(anchorHref))
+            {
+                var absoluteHref = ToAbsoluteUrl(anchorHref);
+                if (absoluteHref.EndsWith(".jpg", StringComparison.OrdinalIgnoreCase) ||
+                    absoluteHref.EndsWith(".png", StringComparison.OrdinalIgnoreCase) ||
+                    absoluteHref.EndsWith(".jpeg", StringComparison.OrdinalIgnoreCase) ||
+                    absoluteHref.EndsWith(".webp", StringComparison.OrdinalIgnoreCase))
+                {
+                    fullSizeUrl = absoluteHref;
+                }
+            }
+
+            var title = ResolveGalleryImageTitle(img, thumbnailUrl, anchorHref);
+
+            images.Add(new Image(
+                Title: title,
+                ThumbnailUrl: fullSizeUrl,
+                FullSizeUrl: fullSizeUrl,
+                Description: title));
+        }
+
+        return images;
+    }
+
+    private static bool IsUsableModGalleryImage(string? src, IElement img)
+    {
+        if (IsDisallowedImageSrc(src))
+        {
+            return false;
+        }
+
+        var alt = img.GetAttribute("alt") ?? string.Empty;
+        if (IsDisallowedAltText(alt))
+        {
+            return false;
+        }
+
+        var inSidebar = img.Closest(ModDBParserConstants.ImageSidebarSelector) != null;
+        var inGallery = img.Closest(ModDBParserConstants.ImageGallerySelector) != null;
+        if (inSidebar && !inGallery)
+        {
+            return false;
+        }
+
+        var href = img.Closest("a")?.GetAttribute("href") ?? string.Empty;
+        if (IsDisallowedVideoLink(href))
+        {
+            return false;
+        }
+
+        var isModImagePage = href.Contains("/mods/", StringComparison.OrdinalIgnoreCase) &&
+                             (href.Contains("/images/", StringComparison.OrdinalIgnoreCase) ||
+                              href.Contains("/downloads/", StringComparison.OrdinalIgnoreCase) ||
+                              href.Contains("/addons/", StringComparison.OrdinalIgnoreCase));
+        var isModMediaFile = src != null && (src.Contains("/images/mods/", StringComparison.OrdinalIgnoreCase) ||
+                             src.Contains("/cache/images/mods/", StringComparison.OrdinalIgnoreCase) ||
+                             src.Contains("/images/downloads/", StringComparison.OrdinalIgnoreCase) ||
+                             src.Contains("/cache/images/downloads/", StringComparison.OrdinalIgnoreCase));
+
+        return inGallery || isModImagePage || isModMediaFile;
+    }
+
+    private static bool IsDisallowedImageSrc(string? src)
+    {
+        if (string.IsNullOrWhiteSpace(src))
+        {
+            return true;
+        }
+
+        var disallowedTokens = new[]
+        {
+            "data:", "clear.gif", "blank.gif", "/avatar/", "/button",
+            "/guest/", "/default/error", "error_50x50", "/images/games/",
+            "/images/groups/", "/images/members/", "/cache/images/games/",
+            "/cache/images/groups/", "/cache/images/members/", "icon.gif",
+        };
+
+        foreach (var token in disallowedTokens)
+        {
+            if (src.Contains(token, StringComparison.OrdinalIgnoreCase))
+            {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    private static bool IsDisallowedAltText(string alt)
+    {
+        return alt.Contains("Share on", StringComparison.OrdinalIgnoreCase) ||
+               alt.Equals("Post", StringComparison.OrdinalIgnoreCase) ||
+               alt.Contains("Email a friend", StringComparison.OrdinalIgnoreCase) ||
+               alt.Contains("Tweeeeeet", StringComparison.OrdinalIgnoreCase);
+    }
+
+    private static bool IsDisallowedVideoLink(string href)
+    {
+        return href.Contains("/videos/", StringComparison.OrdinalIgnoreCase) ||
+               href.Contains("youtube.com", StringComparison.OrdinalIgnoreCase) ||
+               href.Contains("youtu.be", StringComparison.OrdinalIgnoreCase) ||
+               href.Contains("vimeo.com", StringComparison.OrdinalIgnoreCase);
+    }
+
+    private static string GalleryImageKey(string url)
+    {
+        var path = url.Split('?')[0].Split('#')[0];
+        var slash = path.LastIndexOf('/');
+        return slash >= 0 ? path[(slash + 1)..] : path;
+    }
+
+    /// <summary>
+    /// Converts a ModDB cached/cropped thumbnail image source to a high-resolution full-size image source.
+    /// </summary>
+    private static string GetFullSizeModDBImageSource(string imageSource)
+    {
+        if (string.IsNullOrWhiteSpace(imageSource))
+        {
+            return imageSource;
+        }
+
+        var result = imageSource;
+        if (result.Contains("/cache/images/", StringComparison.OrdinalIgnoreCase))
+        {
+            result = result.Replace("/cache/images/", "/images/", StringComparison.OrdinalIgnoreCase);
+        }
+
+        result = ModDBImageCropRegex().Replace(result, "/");
+        return result;
+    }
+
+    private static string ResolveGalleryImageTitle(IElement img, string thumbnailUrl, string? anchorHref)
+    {
+        string? rawTitle = null;
+
+        var imgAlt = img.GetAttribute("alt") ?? img.GetAttribute("title");
+        if (!string.IsNullOrWhiteSpace(imgAlt) &&
+            !imgAlt.Equals("View media", StringComparison.OrdinalIgnoreCase) &&
+            !imgAlt.Equals("Image", StringComparison.OrdinalIgnoreCase) &&
+            !imgAlt.StartsWith("Share on", StringComparison.OrdinalIgnoreCase))
+        {
+            rawTitle = imgAlt.Trim();
+        }
+
+        if (string.IsNullOrWhiteSpace(rawTitle))
+        {
+            var parentAnchor = img.Closest("a");
+            if (parentAnchor != null)
+            {
+                var anchorTitle = parentAnchor.GetAttribute("title");
+                if (!string.IsNullOrWhiteSpace(anchorTitle) &&
+                    !anchorTitle.Equals("View media", StringComparison.OrdinalIgnoreCase) &&
+                    !anchorTitle.Equals("Image", StringComparison.OrdinalIgnoreCase))
+                {
+                    rawTitle = anchorTitle.Trim();
+                }
+            }
+        }
+
+        if (string.IsNullOrWhiteSpace(rawTitle))
+        {
+            var container = img.Closest(".imagebox, .mediabox, .mediarow, .holder");
+            var titleEl = container?.QuerySelector(".title, .caption");
+            var containerTitle = titleEl?.TextContent?.Trim();
+            if (!string.IsNullOrWhiteSpace(containerTitle) &&
+                !containerTitle.Equals("View media", StringComparison.OrdinalIgnoreCase) &&
+                !containerTitle.Equals("Image", StringComparison.OrdinalIgnoreCase))
+            {
+                rawTitle = containerTitle;
+            }
+        }
+
+        if (string.IsNullOrWhiteSpace(rawTitle))
+        {
+            var fileName = GalleryImageKey(thumbnailUrl);
+            var dot = fileName.LastIndexOf('.');
+            if (dot > 0)
+            {
+                fileName = fileName[..dot];
+            }
+
+            if (!string.IsNullOrWhiteSpace(fileName) &&
+                !fileName.Equals("image", StringComparison.OrdinalIgnoreCase))
+            {
+                rawTitle = fileName;
+            }
+        }
+
+        if (string.IsNullOrWhiteSpace(rawTitle) && !string.IsNullOrWhiteSpace(anchorHref))
+        {
+            var slug = GalleryImageKey(anchorHref.Split('#')[0]);
+            if (!string.IsNullOrWhiteSpace(slug))
+            {
+                rawTitle = slug;
+            }
+        }
+
+        if (string.IsNullOrWhiteSpace(rawTitle))
+        {
+            return "Image";
+        }
+
+        return FormatImageTitle(rawTitle);
+    }
+
+    private static string FormatImageTitle(string title)
+    {
+        if (string.IsNullOrWhiteSpace(title))
+        {
+            return "Image";
+        }
+
+        var formatted = title.Trim('*', ' ', '\t', '\r', '\n').Replace('_', ' ').Replace('-', ' ');
+
+        if (!formatted.Contains(' '))
+        {
+            formatted = CamelCaseSplitRegex().Replace(formatted, " ");
+        }
+
+        formatted = Regex.Replace(formatted, @"\s+", " ").Trim();
+
+        return string.IsNullOrWhiteSpace(formatted) ? "Image" : formatted;
+    }
+
+    private static string ToAbsoluteUrl(string url)
+    {
+        if (string.IsNullOrWhiteSpace(url))
+        {
+            return string.Empty;
+        }
+
+        if (url.StartsWith("http://", StringComparison.OrdinalIgnoreCase) ||
+            url.StartsWith("https://", StringComparison.OrdinalIgnoreCase))
+        {
+            return url;
+        }
+
+        if (url.StartsWith("//", StringComparison.Ordinal))
+        {
+            return "https:" + url;
+        }
+
+        if (url.StartsWith('/'))
+        {
+            return ModDBConstants.BaseUrl.TrimEnd('/') + url;
+        }
+
+        return ModDBConstants.BaseUrl.TrimEnd('/') + "/" + url;
+    }
+
+    /// <summary>
+    /// Extracts an image from a row element.
+    /// </summary>
+    private static Image? ExtractImageFromRow(IElement row)
+    {
+        var img = row.QuerySelector(ModDBParserConstants.ImageSelector);
+        if (img == null)
+        {
+            return null;
+        }
+
+        var src = img.GetAttribute("src");
+        if (string.IsNullOrEmpty(src))
+        {
+            return null;
+        }
+
+        var absUrl = ToAbsoluteUrl(src);
+        var fullSizeUrl = GetFullSizeModDBImageSource(absUrl);
+        var alt = img.GetAttribute("alt");
+        var title = !string.IsNullOrWhiteSpace(alt) ? FormatImageTitle(alt) : "Image";
+
+        return new Image(
+            Title: title,
+            ThumbnailUrl: fullSizeUrl,
+            FullSizeUrl: fullSizeUrl,
+            Description: alt);
+    }
+
+    /// <summary>
+    /// Extracts articles from the document.
+    /// </summary>
+    private static List<Article> ExtractArticles(IDocument document)
+    {
+        var articles = new List<Article>();
+
+        var articleRows = document.QuerySelectorAll(ModDBParserConstants.ArticlesSelector);
+        foreach (var row in articleRows)
+        {
+            var titleEl = row.QuerySelector(ModDBParserConstants.ArticleTitleSelector);
+            var title = titleEl?.TextContent?.Trim();
+            if (string.IsNullOrEmpty(title))
+            {
+                continue;
+            }
+
+            var authorEl = row.QuerySelector(ModDBParserConstants.ArticleAuthorSelector);
+            var author = authorEl?.TextContent?.Trim();
+
+            var dateEl = row.QuerySelector(ModDBParserConstants.ArticleDateSelector);
+            DateTime? publishDate = null;
+            if (dateEl != null)
+            {
+                var dateStr = dateEl.GetAttribute("datetime") ?? dateEl.TextContent?.Trim();
+                if (!string.IsNullOrEmpty(dateStr) && DateTime.TryParse(dateStr, out var parsedDate))
+                {
+                    publishDate = parsedDate;
+                }
+            }
+
+            var contentEl = row.QuerySelector(ModDBParserConstants.ArticleContentSelector);
+            var content = contentEl?.TextContent?.Trim();
+
+            var linkEl = row.QuerySelector(ModDBParserConstants.ArticleLinkSelector);
+            var url = linkEl?.GetAttribute("href");
+            if (!string.IsNullOrEmpty(url) && !url.StartsWith("http", StringComparison.OrdinalIgnoreCase))
+            {
+                url = "https:" + url;
+            }
+
+            articles.Add(new Article(
+                Title: title,
+                Author: author,
+                PublishDate: publishDate,
+                Content: content,
+                Url: url));
+        }
+
+        return articles;
+    }
+
+    /// <summary>
+    /// Extracts reviews from the document.
+    /// </summary>
+    private static List<Review> ExtractReviews(IDocument document)
+    {
+        var reviews = new List<Review>();
+
+        var reviewRows = document.QuerySelectorAll(ModDBParserConstants.ReviewsSelector);
+        foreach (var row in reviewRows)
+        {
+            var authorEl = row.QuerySelector(ModDBParserConstants.ReviewAuthorSelector);
+            var author = authorEl?.TextContent?.Trim();
+
+            var ratingEl = row.QuerySelector(ModDBParserConstants.ReviewRatingSelector);
+            float? rating = null;
+            if (ratingEl != null)
+            {
+                var ratingText = ratingEl.TextContent?.Trim();
+                if (!string.IsNullOrEmpty(ratingText) && float.TryParse(ratingText, NumberStyles.Float, CultureInfo.InvariantCulture, out var parsedRating))
+                {
+                    rating = parsedRating;
+                }
+            }
+
+            var contentEl = row.QuerySelector(ModDBParserConstants.ReviewContentSelector);
+            var content = contentEl?.TextContent?.Trim();
+
+            var dateEl = row.QuerySelector(ModDBParserConstants.ReviewDateSelector);
+            DateTime? date = null;
+            if (dateEl != null)
+            {
+                var dateStr = dateEl.GetAttribute("datetime") ?? dateEl.TextContent?.Trim();
+                if (!string.IsNullOrEmpty(dateStr) && DateTime.TryParse(dateStr, out var parsedDate))
+                {
+                    date = parsedDate;
+                }
+            }
+
+            var helpfulEl = row.QuerySelector(ModDBParserConstants.ReviewHelpfulSelector);
+            int? helpfulVotes = null;
+            if (helpfulEl != null)
+            {
+                var votesText = helpfulEl.TextContent?.Trim();
+                if (!string.IsNullOrEmpty(votesText) && int.TryParse(votesText, NumberStyles.Integer, CultureInfo.InvariantCulture, out var votes))
+                {
+                    helpfulVotes = votes;
+                }
+                else if (!string.IsNullOrEmpty(votesText))
+                {
+                    // "12 people found this helpful" — take the leading integer when present.
+                    var digits = new string(votesText.TakeWhile(char.IsDigit).ToArray());
+                    if (int.TryParse(digits, NumberStyles.Integer, CultureInfo.InvariantCulture, out votes))
+                    {
+                        helpfulVotes = votes;
+                    }
+                }
+            }
+
+            // Broad selectors also match bare rating widgets; skip shells with no review body.
+            if (string.IsNullOrWhiteSpace(author) && string.IsNullOrWhiteSpace(content))
+            {
+                continue;
+            }
+
+            reviews.Add(new Review(
+                Author: author,
+                Rating: rating,
+                Content: content,
+                Date: date,
+                HelpfulVotes: helpfulVotes));
+        }
+
+        return reviews;
+    }
+
+    /// <summary>
+    /// Extracts comments from the document with hierarchical thread structure.
+    /// Only posted threads inside <c>#commentsbrowse</c> are considered — the composer
+    /// (<c>#commentform</c>, guest/email rows, injected CSS) is not a comment.
+    /// </summary>
+    private static List<Comment> ExtractComments(IDocument document)
+    {
+        var comments = new List<Comment>();
+
+        var browse = document.QuerySelector(ModDBParserConstants.CommentsSelector);
+        if (browse == null)
+        {
+            return comments;
+        }
+
+        var allCommentRows = browse.QuerySelectorAll(ModDBParserConstants.CommentRowSelector);
+        var seenRows = new HashSet<IElement>();
+        var rootRows = new List<IElement>();
+
+        foreach (var row in allCommentRows)
+        {
+            if (!seenRows.Add(row))
+            {
+                continue;
+            }
+
+            // Nested replies live under .children / another .rowcomment. Do not treat
+            // #commentsbrowse (id starts with "comment") as a nesting ancestor.
+            var isNested = row.Ancestors<IElement>().Any(a =>
+                a.ClassList.Contains("children") ||
+                a.ClassList.Contains("rowcomment") ||
+                (a.Id?.StartsWith("comment", StringComparison.OrdinalIgnoreCase) == true &&
+                 !a.Id.StartsWith("comments", StringComparison.OrdinalIgnoreCase)));
+
+            if (!isNested)
+            {
+                rootRows.Add(row);
+            }
+        }
+
+        foreach (var rootRow in rootRows)
+        {
+            var comment = ParseCommentElement(rootRow, indentLevel: 0);
+            if (comment != null)
+            {
+                comments.Add(comment);
+            }
+        }
+
+        return comments;
+    }
+
+    private static Comment? ParseCommentElement(IElement row, int indentLevel)
+    {
+        if (row.ClassList.Contains("rowcommentguest") ||
+            row.ClassList.Contains("rowcommentsummary") ||
+            row.ClassList.Contains("rowcommentemail"))
+        {
+            return null;
+        }
+
+        var author = ExtractCommentAuthor(row);
+        var content = ExtractCommentContent(row);
+
+        if (string.IsNullOrWhiteSpace(author) && string.IsNullOrWhiteSpace(content))
+        {
+            return null;
+        }
+
+        var date = ExtractCommentDate(row);
+        var karma = ExtractCommentKarma(row);
+        var isCreator = row.QuerySelector(ModDBParserConstants.CommentCreatorSelector) != null;
+        var childReplies = ExtractChildReplies(row, indentLevel);
+
+        return new Comment(
+            Author: author ?? "Anonymous",
+            Content: content,
+            Date: date,
+            Karma: karma,
+            IsCreator: isCreator,
+            IndentLevel: indentLevel,
+            Replies: childReplies.Count > 0 ? childReplies : null);
+    }
+
+    private static string? ExtractCommentAuthor(IElement row)
+    {
+        var authorEl = row.QuerySelector(ModDBParserConstants.CommentAuthorSelector)
+            ?? row.QuerySelector(".username")
+            ?? row.QuerySelector("a[href*='/members/']:not([href*='/register']):not([href*='/login'])");
+        var author = authorEl?.TextContent?.Trim();
+        return IsJunkDeveloperName(author) ? null : author;
+    }
+
+    private static string? ExtractCommentContent(IElement row)
+    {
+        var contentEl = row.QuerySelector(":scope > .commentbody")
+            ?? row.QuerySelector(".commentbody")
+            ?? row.QuerySelector(ModDBParserConstants.CommentContentSelector)
+            ?? row.QuerySelector("p.comment");
+
+        string? content = null;
+        if (contentEl != null)
+        {
+            content = ExtractCleanCommentBody(contentEl);
+        }
+        else
+        {
+            var pEl = row.QuerySelector(":scope > p") ?? row.QuerySelector("p");
+            if (pEl != null)
+            {
+                content = ExtractCleanCommentBody(pEl);
+            }
+        }
+
+        return IsJunkCommentContent(content) ? null : content;
+    }
+
+    private static DateTime? ExtractCommentDate(IElement row)
+    {
+        var dateEl = row.QuerySelector(ModDBParserConstants.CommentDateSelector);
+        if (dateEl != null)
+        {
+            var dateStr = dateEl.GetAttribute("datetime") ?? dateEl.TextContent?.Trim();
+            if (!string.IsNullOrEmpty(dateStr))
+            {
+                return DateTime.TryParse(dateStr, out var parsedDate)
+                    ? parsedDate
+                    : ParseModDBDate(dateStr);
+            }
+        }
+
+        return null;
+    }
+
+    private static int? ExtractCommentKarma(IElement row)
+    {
+        var karmaEl = row.QuerySelector(ModDBParserConstants.CommentKarmaSelector);
+        if (karmaEl != null)
+        {
+            var karmaText = karmaEl.TextContent?.Trim();
+            if (!string.IsNullOrEmpty(karmaText) && int.TryParse(karmaText, out var karmaValue))
+            {
+                return karmaValue;
+            }
+        }
+
+        return null;
+    }
+
+    private static List<Comment> ExtractChildReplies(IElement row, int indentLevel)
+    {
+        var childReplies = new List<Comment>();
+        var childrenContainer = row.QuerySelector(".children");
+        if (childrenContainer == null)
+        {
+            return childReplies;
+        }
+
+        var directChildRows = childrenContainer.QuerySelectorAll(".rowcomment, div[id^='comment']:not([id^='comments'])");
+        var seenChildren = new HashSet<IElement>();
+        foreach (var childRow in directChildRows)
+        {
+            if (!seenChildren.Add(childRow))
+            {
+                continue;
+            }
+
+            var intermediateParent = childRow.Ancestors<IElement>()
+                .TakeWhile(a => a != childrenContainer)
+                .FirstOrDefault(a =>
+                    a.ClassList.Contains("rowcomment") ||
+                    (a.Id?.StartsWith("comment", StringComparison.OrdinalIgnoreCase) == true &&
+                     !a.Id.StartsWith("comments", StringComparison.OrdinalIgnoreCase)));
+
+            if (intermediateParent == null)
+            {
+                var childComment = ParseCommentElement(childRow, indentLevel + 1);
+                if (childComment != null)
+                {
+                    childReplies.Add(childComment);
+                }
+            }
+        }
+
+        return childReplies;
+    }
+
+    /// <summary>
+    /// Reads comment body text without nested reply threads or ModDB action chrome, which would
+    /// otherwise inflate the comment content into a huge empty-looking block in the UI.
+    /// </summary>
+    private static string? ExtractCleanCommentBody(IElement contentEl)
+    {
+        var clone = contentEl.Clone(deep: true) as IElement;
+        if (clone == null)
+        {
+            return CleanCommentContent(contentEl.TextContent);
+        }
+
+        foreach (var junk in clone.QuerySelectorAll(".children, .actions, .reply, .commentoptions, .toolbar"))
+        {
+            junk.Remove();
+        }
+
+        // Nested .rowcomment nodes sometimes sit inside .commentbody on live ModDB markup.
+        foreach (var nested in clone.QuerySelectorAll(".rowcomment, div[id^='comment']"))
+        {
+            nested.Remove();
+        }
+
+        return CleanCommentContent(clone.TextContent);
+    }
+
+    private static string? CleanCommentContent(string? rawText)
+    {
+        if (string.IsNullOrWhiteSpace(rawText))
+        {
+            return null;
+        }
+
+        var lines = rawText.Split(['\r', '\n']);
+        var cleanLines = new List<string>();
+        foreach (var line in lines)
+        {
+            var trimmed = line.Trim();
+            if (string.IsNullOrEmpty(trimmed) ||
+                trimmed.Equals("Reply", StringComparison.OrdinalIgnoreCase) ||
+                trimmed.StartsWith("Good karma", StringComparison.OrdinalIgnoreCase) ||
+                trimmed.StartsWith("Bad karma", StringComparison.OrdinalIgnoreCase) ||
+                trimmed.EndsWith("vote", StringComparison.OrdinalIgnoreCase) ||
+                IsJunkCommentContent(trimmed))
+            {
+                continue;
+            }
+
+            cleanLines.Add(trimmed);
+        }
+
+        return cleanLines.Count > 0 ? string.Join("\n", cleanLines) : null;
+    }
+
+    private static bool IsJunkCommentContent(string? text)
+    {
+        if (string.IsNullOrWhiteSpace(text))
+        {
+            return true;
+        }
+
+        if (text.Contains("Your comment will be anonymous", StringComparison.OrdinalIgnoreCase) ||
+            text.Contains("join the community", StringComparison.OrdinalIgnoreCase) ||
+            text.Contains("Post a comment", StringComparison.OrdinalIgnoreCase) ||
+            text.Contains("Save comment", StringComparison.OrdinalIgnoreCase) ||
+            text.Contains("sign in with your social", StringComparison.OrdinalIgnoreCase))
+        {
+            return true;
+        }
+
+        // Cloudflare/ModDB inject obfuscated CSS into the composer (span.abc { display: none; }).
+        return text.Contains('{') &&
+               (text.Contains("display:", StringComparison.OrdinalIgnoreCase) ||
+                text.Contains("formouter", StringComparison.OrdinalIgnoreCase));
+    }
+
+    private static bool IsJunkDeveloperName(string? name) =>
+        string.IsNullOrWhiteSpace(name) ||
+        name.Equals("register", StringComparison.OrdinalIgnoreCase) ||
+        name.Equals("sign in", StringComparison.OrdinalIgnoreCase) ||
+        name.Equals("login", StringComparison.OrdinalIgnoreCase) ||
+        name.Equals("guest", StringComparison.OrdinalIgnoreCase);
+
+    private static bool IsBreadcrumbOrLocationText(string? text)
+    {
+        if (string.IsNullOrWhiteSpace(text))
+        {
+            return true;
+        }
+
+        var trimmed = text.Trim();
+        return trimmed.StartsWith("Games :", StringComparison.OrdinalIgnoreCase) ||
+               trimmed.StartsWith("Mods :", StringComparison.OrdinalIgnoreCase) ||
+               (trimmed.Contains(" : Mods : ", StringComparison.OrdinalIgnoreCase) &&
+                trimmed.Contains(" : Files", StringComparison.OrdinalIgnoreCase)) ||
+               trimmed.Equals("Location", StringComparison.OrdinalIgnoreCase);
+    }
+
+    private static bool LooksLikeArchiveFileName(string? name)
+    {
+        if (string.IsNullOrWhiteSpace(name))
+        {
+            return false;
+        }
+
+        var dot = name.LastIndexOf('.');
+        if (dot <= 0 || dot >= name.Length - 1)
+        {
+            return false;
+        }
+
+        var ext = name[(dot + 1)..];
+        return ext.Length is >= 2 and <= 4 && ext.All(char.IsLetterOrDigit);
+    }
+
+    private static string? GetCanonicalModDBFileKey(string? url)
+    {
+        if (string.IsNullOrWhiteSpace(url))
+        {
+            return null;
+        }
+
+        if (!Uri.TryCreate(url, UriKind.Absolute, out var uri) &&
+            !Uri.TryCreate(new Uri(ModDBConstants.BaseUrl), url, out uri))
+        {
+            return url.Trim().TrimEnd('/').ToLowerInvariant();
+        }
+
+        var path = uri.AbsolutePath.TrimEnd('/');
+        var segments = path.Split('/', StringSplitOptions.RemoveEmptyEntries);
+        if (segments.Length == 0)
+        {
+            return null;
+        }
+
+        if (segments.Length >= 3 && (segments[^2].Equals("start", StringComparison.OrdinalIgnoreCase) || segments[^2].Equals("mirror", StringComparison.OrdinalIgnoreCase)))
+        {
+            return $"start:{segments[^1].ToLowerInvariant()}";
+        }
+
+        var lastSegment = segments[^1].ToLowerInvariant();
+        if (lastSegment.Equals("downloads", StringComparison.OrdinalIgnoreCase) ||
+            lastSegment.Equals("addons", StringComparison.OrdinalIgnoreCase) ||
+            lastSegment.Equals("files", StringComparison.OrdinalIgnoreCase))
+        {
+            return null;
+        }
+
+        return lastSegment;
+    }
+
+    private static string? NormalizeDownloadUrl(string? url)
+    {
+        if (string.IsNullOrWhiteSpace(url))
+        {
+            return null;
+        }
+
+        var trimmed = url.Trim().TrimEnd('/');
+        return Uri.TryCreate(trimmed, UriKind.Absolute, out var uri)
+            ? uri.GetLeftPart(UriPartial.Path).TrimEnd('/')
+            : trimmed;
+    }
+
+    /// <summary>
+    /// Collapses FileDetail filename rows with the parent /downloads listing of the same binary
+    /// so the Releases tab does not show both "GeneralsUndone_v1.0.zip" and "C&amp;C Generals Undone".
+    /// </summary>
+    private static List<ContentSection> DeduplicateDownloadableFiles(List<ContentSection> sections)
+    {
+        var files = sections.OfType<DownloadableFile>().ToList();
+        if (files.Count <= 1)
+        {
+            return sections;
+        }
+
+        var merged = new List<DownloadableFile>();
+        var indexByKey = new Dictionary<string, int>(StringComparer.OrdinalIgnoreCase);
+
+        foreach (var file in files)
+        {
+            var existingIndex = FindExistingFileIndex(file, merged, indexByKey);
+
+            if (existingIndex >= 0)
+            {
+                var updated = MergeDownloadableFiles(merged[existingIndex], file);
+                merged[existingIndex] = updated;
+                UpdateFileIndexKeys(updated, existingIndex, indexByKey);
+                continue;
+            }
+
+            var newIndex = merged.Count;
+            UpdateFileIndexKeys(file, newIndex, indexByKey);
+            merged.Add(file);
+        }
+
+        var sortedMerged = merged
+            .OrderByDescending(f => f.ReleaseDate ?? f.UploadDate ?? DateTime.MinValue)
+            .ThenByDescending(f => f.Version, StringComparer.OrdinalIgnoreCase)
+            .ToList();
+
+        var result = new List<ContentSection>(sections.Count);
+        var filesEmitted = false;
+        foreach (var section in sections)
+        {
+            if (section is DownloadableFile)
+            {
+                if (!filesEmitted)
+                {
+                    result.AddRange(sortedMerged);
+                    filesEmitted = true;
+                }
+
+                continue;
+            }
+
+            result.Add(section);
+        }
+
+        return result;
+    }
+
+    private static int FindExistingFileIndex(
+        DownloadableFile file,
+        List<DownloadableFile> merged,
+        Dictionary<string, int> indexByKey)
+    {
+        var downloadKey = NormalizeDownloadUrl(file.DownloadUrl);
+        var detailsKey = NormalizeDownloadUrl(file.DetailsUrl);
+        var canonicalDownloadKey = GetCanonicalModDBFileKey(file.DownloadUrl);
+        var canonicalDetailsKey = GetCanonicalModDBFileKey(file.DetailsUrl);
+        var nameKey = !string.IsNullOrWhiteSpace(file.Name) ? file.Name.Trim().ToLowerInvariant() : null;
+        var filenameKey = !string.IsNullOrWhiteSpace(file.Filename) ? file.Filename.Trim().ToLowerInvariant() : null;
+
+        var keysToTry = new[] { downloadKey, detailsKey, canonicalDownloadKey, canonicalDetailsKey, filenameKey, nameKey };
+        int existingIndex = -1;
+
+        foreach (var key in keysToTry)
+        {
+            if (key != null && indexByKey.TryGetValue(key, out var idx))
+            {
+                existingIndex = idx;
+                break;
+            }
+        }
+
+        if (existingIndex >= 0)
+        {
+            var existing = merged[existingIndex];
+            var existingCanonDetails = GetCanonicalModDBFileKey(existing.DetailsUrl);
+            var existingCanonDownload = GetCanonicalModDBFileKey(existing.DownloadUrl);
+
+            var detailsConflict = canonicalDetailsKey != null && existingCanonDetails != null &&
+                                  !string.Equals(canonicalDetailsKey, existingCanonDetails, StringComparison.OrdinalIgnoreCase);
+            var downloadConflict = IsDirectDownloadUrl(file.DownloadUrl) && IsDirectDownloadUrl(existing.DownloadUrl) &&
+                                   canonicalDownloadKey != null && existingCanonDownload != null &&
+                                   !string.Equals(canonicalDownloadKey, existingCanonDownload, StringComparison.OrdinalIgnoreCase);
+
+            if (detailsConflict || downloadConflict)
+            {
+                return -1;
+            }
+        }
+
+        return existingIndex;
+    }
+
+    private static void UpdateFileIndexKeys(
+        DownloadableFile file,
+        int targetIndex,
+        Dictionary<string, int> indexByKey)
+    {
+        var downloadKey = NormalizeDownloadUrl(file.DownloadUrl);
+        var detailsKey = NormalizeDownloadUrl(file.DetailsUrl);
+        var canonDownload = GetCanonicalModDBFileKey(file.DownloadUrl);
+        var canonDetails = GetCanonicalModDBFileKey(file.DetailsUrl);
+        var nameKey = !string.IsNullOrWhiteSpace(file.Name) ? file.Name.Trim().ToLowerInvariant() : null;
+        var filenameKey = !string.IsNullOrWhiteSpace(file.Filename) ? file.Filename.Trim().ToLowerInvariant() : null;
+
+        if (downloadKey != null) indexByKey[downloadKey] = targetIndex;
+        if (detailsKey != null) indexByKey[detailsKey] = targetIndex;
+        if (canonDownload != null) indexByKey[canonDownload] = targetIndex;
+        if (canonDetails != null) indexByKey[canonDetails] = targetIndex;
+        if (nameKey != null) indexByKey[nameKey] = targetIndex;
+        if (filenameKey != null) indexByKey[filenameKey] = targetIndex;
+    }
+
+    private static DownloadableFile MergeDownloadableFiles(DownloadableFile left, DownloadableFile right)
+    {
+        var finalName = ResolveMergedName(left.Name, right.Name);
+        var finalFilename = ResolveMergedFilename(left, right);
+        var bestDownloadUrl = ResolveBestDownloadUrl(left.DownloadUrl, right.DownloadUrl);
+        var bestDetailsUrl = ResolveBestDetailsUrl(left, right);
+
+        FileSectionType bestSectionType = left.FileSectionType != FileSectionType.Downloads
+            ? left.FileSectionType
+            : right.FileSectionType;
+
+        return left with
+        {
+            Name = finalName ?? left.Name ?? string.Empty,
+            Filename = finalFilename,
+            DownloadUrl = bestDownloadUrl,
+            DetailsUrl = bestDetailsUrl,
+            FileSectionType = bestSectionType,
+            ReleaseDate = left.ReleaseDate ?? right.ReleaseDate,
+            UploadDate = left.UploadDate ?? right.UploadDate,
+            SizeBytes = left.SizeBytes ?? right.SizeBytes,
+            SizeDisplay = left.SizeDisplay ?? right.SizeDisplay,
+            Version = left.Version ?? right.Version,
+            Category = left.Category ?? right.Category,
+            Uploader = left.Uploader ?? right.Uploader,
+            Description = left.Description ?? right.Description,
+            ThumbnailUrl = left.ThumbnailUrl ?? right.ThumbnailUrl,
+            Md5Hash = left.Md5Hash ?? right.Md5Hash,
+            DownloadCount = left.DownloadCount ?? right.DownloadCount,
+            CommentCount = left.CommentCount ?? right.CommentCount,
+        };
+    }
+
+    private static string? ResolveMergedName(string? leftName, string? rightName)
+    {
+        var preferRightName = LooksLikeArchiveFileName(leftName) && !LooksLikeArchiveFileName(rightName);
+        var preferLeftName = !LooksLikeArchiveFileName(leftName) && LooksLikeArchiveFileName(rightName);
+
+        if (preferRightName)
+        {
+            return rightName;
+        }
+
+        if (preferLeftName)
+        {
+            return leftName;
+        }
+
+        return leftName ?? rightName;
+    }
+
+    private static string? ResolveMergedFilename(DownloadableFile left, DownloadableFile right)
+    {
+        var finalFilename = left.Filename ?? right.Filename;
+        if (string.IsNullOrEmpty(finalFilename))
+        {
+            if (LooksLikeArchiveFileName(left.Name))
+            {
+                finalFilename = left.Name;
+            }
+            else if (LooksLikeArchiveFileName(right.Name))
+            {
+                finalFilename = right.Name;
+            }
+        }
+
+        return finalFilename;
+    }
+
+    private static string? ResolveBestDownloadUrl(string? leftDownloadUrl, string? rightDownloadUrl)
+    {
+        if (IsDirectDownloadUrl(leftDownloadUrl))
+        {
+            return leftDownloadUrl;
+        }
+
+        if (IsDirectDownloadUrl(rightDownloadUrl))
+        {
+            return rightDownloadUrl;
+        }
+
+        return leftDownloadUrl ?? rightDownloadUrl;
+    }
+
+    private static string? ResolveBestDetailsUrl(DownloadableFile left, DownloadableFile right)
+    {
+        string? bestDetailsUrl = left.DetailsUrl ?? right.DetailsUrl;
+        if (bestDetailsUrl == null && !IsDirectDownloadUrl(left.DownloadUrl))
+        {
+            bestDetailsUrl = left.DownloadUrl;
+        }
+
+        if (bestDetailsUrl == null && !IsDirectDownloadUrl(right.DownloadUrl))
+        {
+            bestDetailsUrl = right.DownloadUrl;
+        }
+
+        return bestDetailsUrl;
+    }
+
+    private static List<ContentSection> DeduplicateImages(List<ContentSection> sections)
+    {
+        var seen = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+        var result = new List<ContentSection>(sections.Count);
+        foreach (var section in sections)
+        {
+            if (section is Image image)
+            {
+                var key = GalleryImageKey(image.ThumbnailUrl ?? image.FullSizeUrl ?? image.Title);
+                if (!seen.Add(key))
+                {
+                    continue;
+                }
+            }
+
+            result.Add(section);
+        }
+
+        return result;
+    }
+
+    private static List<ContentSection> DeduplicateVideos(List<ContentSection> sections)
+    {
+        var videoList = sections.OfType<Video>().ToList();
+        if (videoList.Count == 0)
+        {
+            return sections;
+        }
+
+        var deduplicated = DeduplicateVideoList(videoList);
+        var result = new List<ContentSection>(sections.Count);
+        var videoEnumerator = deduplicated.GetEnumerator();
+
+        foreach (var section in sections)
+        {
+            if (section is Video)
+            {
+                if (videoEnumerator.MoveNext())
+                {
+                    result.Add(videoEnumerator.Current);
+                }
+            }
+            else
+            {
+                result.Add(section);
+            }
+        }
+
+        while (videoEnumerator.MoveNext())
+        {
+            result.Add(videoEnumerator.Current);
+        }
+
+        return result;
+    }
+
+    private static List<Video> DeduplicateVideoList(List<Video> videos)
+    {
+        var dict = new Dictionary<string, Video>(StringComparer.OrdinalIgnoreCase);
+
+        foreach (var video in videos)
+        {
+            var key = GetVideoKey(video);
+            if (!dict.TryGetValue(key, out var existing))
+            {
+                dict[key] = video;
+            }
+            else
+            {
+                var betterTitle = existing.Title;
+                if (!IsUsableVideoTitle(betterTitle) && IsUsableVideoTitle(video.Title))
+                {
+                    betterTitle = video.Title;
+                }
+
+                var betterThumb = !string.IsNullOrWhiteSpace(existing.ThumbnailUrl)
+                    ? existing.ThumbnailUrl
+                    : video.ThumbnailUrl;
+                var betterEmbed = !string.IsNullOrWhiteSpace(existing.EmbedUrl)
+                    ? existing.EmbedUrl
+                    : video.EmbedUrl;
+                var betterPlatform = !string.Equals(existing.Platform, "Unknown", StringComparison.OrdinalIgnoreCase)
+                    ? existing.Platform
+                    : video.Platform;
+
+                dict[key] = new Video(
+                    Title: betterTitle,
+                    ThumbnailUrl: betterThumb,
+                    EmbedUrl: betterEmbed,
+                    Platform: betterPlatform);
+            }
+        }
+
+        return [.. dict.Values];
+    }
+
+    private static string GetVideoKey(Video video)
+    {
+        if (!string.IsNullOrWhiteSpace(video.EmbedUrl))
+        {
+            var ytMatch = YouTubeVideoIdRegex().Match(video.EmbedUrl);
+            if (ytMatch.Success)
+            {
+                return "yt:" + ytMatch.Groups[1].Value.ToLowerInvariant();
+            }
+
+            var vimeoMatch = VimeoVideoIdRegex().Match(video.EmbedUrl);
+            if (vimeoMatch.Success)
+            {
+                return "vimeo:" + vimeoMatch.Groups[1].Value.ToLowerInvariant();
+            }
+
+            return "url:" + GalleryImageKey(video.EmbedUrl.Split('?')[0]).ToLowerInvariant();
+        }
+
+        if (!string.IsNullOrWhiteSpace(video.ThumbnailUrl))
+        {
+            var ytMatch = YouTubeVideoIdRegex().Match(video.ThumbnailUrl);
+            if (ytMatch.Success)
+            {
+                return "yt:" + ytMatch.Groups[1].Value.ToLowerInvariant();
+            }
+
+            return "thumb:" + GalleryImageKey(video.ThumbnailUrl.Split('?')[0]).ToLowerInvariant();
+        }
+
+        return "title:" + video.Title.ToLowerInvariant();
+    }
+
+    /// <summary>
+    /// Parses a file size string into bytes (e.g., "15.5 MB", "188.3kb (192,819 bytes)", "9,72 MB").
+    /// </summary>
+    private static long? ParseFileSize(string sizeText)
+    {
+        if (string.IsNullOrWhiteSpace(sizeText))
+        {
+            return null;
+        }
+
+        // Check for exact byte count in parentheses or text, e.g. "(192,819 bytes)"
+        var bytesMatch = ExactBytesRegex().Match(sizeText);
+        if (bytesMatch.Success)
+        {
+            var rawDigits = bytesMatch.Groups[1].Value.Replace(",", string.Empty).Replace(" ", string.Empty).Trim();
+            if (long.TryParse(rawDigits, NumberStyles.Integer, CultureInfo.InvariantCulture, out var exactBytesVal))
+            {
+                return exactBytesVal;
+            }
+        }
+
+        // Parse floating point size with unit, supporting comma or dot decimals and optional spacing
+        var match = NumericSizeWithUnitRegex().Match(sizeText);
+        if (!match.Success)
+        {
+            return null;
+        }
+
+        var numStr = match.Groups[1].Value.Replace(',', '.');
+        if (!double.TryParse(numStr, NumberStyles.Float, CultureInfo.InvariantCulture, out var value))
+        {
+            return null;
+        }
+
+        var unit = match.Groups[2].Value.ToUpperInvariant();
+
+        if (unit.StartsWith("G", StringComparison.OrdinalIgnoreCase))
+        {
+            return (long)(value * 1024 * 1024 * 1024);
+        }
+
+        if (unit.StartsWith("M", StringComparison.OrdinalIgnoreCase))
+        {
+            return (long)(value * 1024 * 1024);
+        }
+
+        if (unit.StartsWith("K", StringComparison.OrdinalIgnoreCase))
+        {
+            return (long)(value * 1024);
+        }
+
+        if (unit.StartsWith("B", StringComparison.OrdinalIgnoreCase))
+        {
+            return (long)value;
+        }
+
+        return null;
+    }
+
+    /// <summary>
+    /// Parses ModDB date formats like "Mar 15th, 2024" or "Added Mar 15th, 2024".
+    /// </summary>
+    private static DateTime? ParseModDBDate(string dateStr)
+    {
+        if (string.IsNullOrEmpty(dateStr))
+        {
+            return null;
+        }
+
+        // Remove common prefixes
+        dateStr = dateStr.Replace("Added", string.Empty, StringComparison.OrdinalIgnoreCase)
+                        .Replace("Released", string.Empty, StringComparison.OrdinalIgnoreCase)
+                        .Replace("Updated", string.Empty, StringComparison.OrdinalIgnoreCase)
+                        .Trim();
+
+        // Try parsing common formats
+        // Format: "Mar 15th, 2024"
+        var format1 = "MMM d'th', yyyy";
+        if (DateTime.TryParseExact(dateStr, format1, CultureInfo.InvariantCulture, DateTimeStyles.None, out var result1))
+        {
+            return result1;
+        }
+
+        // Try with st, nd, rd, th suffixes
+        var formats = new[]
+        {
+            "MMM d'st', yyyy",
+            "MMM d'nd', yyyy",
+            "MMM d'rd', yyyy",
+            "MMM d'th', yyyy",
+            "MMM dd, yyyy",
+            "MMM d, yyyy",
+            "MMMM d, yyyy",
+            "yyyy-MM-dd",
+            "MM/dd/yyyy",
+            "dd/MM/yyyy",
+        };
+
+        foreach (var format in formats)
+        {
+            if (DateTime.TryParseExact(dateStr, format, CultureInfo.InvariantCulture, DateTimeStyles.None, out var result))
+            {
+                return result;
+            }
+        }
+
+        return null;
+    }
+
+    /// <summary>
+    /// Helper class for profile metadata.
+    /// </summary>
+    private record ProfileMeta(
+        string? Name,
+        long? SizeBytes,
+        string? SizeDisplay,
+        DateTime? ReleaseDate,
+        string? Developer,
+        string? Md5Hash);
+
+    /// <summary>
+    /// Extracts content sections from list pages (addons, images).
+    /// </summary>
+    /// <param name="document">The document to extract from.</param>
+    /// <param name="sectionType">The type of file section (Release or Addon).</param>
+    private static List<ContentSection> ExtractListSections(IDocument document, FileSectionType sectionType = FileSectionType.Downloads)
+    {
+        var sections = new List<ContentSection>();
+
+        var rows = document.QuerySelectorAll(ModDBParserConstants.RowContentSelector);
+        foreach (var row in rows)
+        {
+            // Extract image
+            var image = ExtractImageFromRow(row);
+            if (image != null)
+            {
+                sections.Add(image);
+            }
+
+            // Extract file info if present
+            var file = ExtractFileFromRow(row, sectionType);
+            if (file != null)
+            {
+                sections.Add(file);
+            }
+        }
+
+        return sections;
+    }
+
+    /// <summary>
+    /// Extracts files from the document.
+    /// </summary>
+    /// <param name="document">The document to extract files from.</param>
+    /// <param name="sectionType">The type of file section (Release or Addon).</param>
+    private static List<DownloadableFile> ExtractFiles(IDocument document, FileSectionType sectionType = FileSectionType.Downloads)
+    {
+        var files = new List<DownloadableFile>();
+
+        var fileRows = document.QuerySelectorAll(ModDBParserConstants.FileRowSelector);
+        foreach (var row in fileRows)
+        {
+            var file = ExtractFileFromRow(row, sectionType);
+            if (file != null)
+            {
+                files.Add(file);
+            }
+        }
+
+        return files;
+    }
+
+    /// <summary>
+    /// Extracts content sections from detail pages.
+    /// </summary>
+    /// <param name="document">The document to extract from.</param>
+    /// <param name="sectionType">The type of file section (Release or Addon).</param>
+    private static List<ContentSection> ExtractDetailSections(IDocument document, FileSectionType sectionType = FileSectionType.Downloads)
+    {
+        var sections = new List<ContentSection>();
+
+        // Extract files
+        sections.AddRange(ExtractFiles(document, sectionType));
+
+        // Extract videos
+        sections.AddRange(ExtractVideos(document));
+
+        // Extract images
+        sections.AddRange(ExtractImages(document));
+
+        // Extract articles
+        sections.AddRange(ExtractArticles(document));
+
+        // Extract reviews
+        sections.AddRange(ExtractReviews(document));
+
+        // Extract comments
+        sections.AddRange(ExtractComments(document));
+
+        return sections;
+    }
+
+    /// <inheritdoc />
+    public string ParserId => "ModDB";
+
+    /// <inheritdoc />
+    public bool CanParse(string url) =>
+        Uri.TryCreate(url, UriKind.Absolute, out var uri) &&
+        (uri.Scheme == Uri.UriSchemeHttp || uri.Scheme == Uri.UriSchemeHttps) &&
+        (uri.Host.Equals("moddb.com", StringComparison.OrdinalIgnoreCase) ||
+         uri.Host.EndsWith(".moddb.com", StringComparison.OrdinalIgnoreCase));
+
+    /// <inheritdoc />
+    public async Task<ParsedWebPage> ParseAsync(string url, CancellationToken cancellationToken = default)
+    {
+        logger.LogInformation("Parsing ModDB page: {Url}", url);
+
+        return await playwrightService.ExecuteInPersistentContextAsync(
+            ModDBConstants.BrowserProfileName,
+            async () =>
+            {
+                var urlsToFetch = GetUrlsToFetch(url);
+
+                // fetch all required URLs on one persistent Chromium page (profile) in a single batch.
+                var fetched = await playwrightService.FetchAndParsePersistentManyAsync(
+                    ModDBConstants.BrowserProfileName,
+                    urlsToFetch,
+                    cancellationToken);
+
+                if (!fetched.TryGetValue(url, out var document))
+                {
+                    throw new InvalidOperationException($"Failed to fetch document for {url}");
+                }
+
+                var parsedPage = ParseInternalWithFetched(url, document, fetched);
+
+                // check whether there are releases and addons to be loaded before closing the browser window
+                var releaseFilesToEnrich = parsedPage.Sections.OfType<DownloadableFile>()
+                    .Where(f => f.FileSectionType == FileSectionType.Downloads && !string.IsNullOrEmpty(f.DetailsUrl ?? f.DownloadUrl))
+                    .OrderByDescending(f => f.ReleaseDate ?? f.UploadDate ?? DateTime.MinValue)
+                    .ThenByDescending(f => f.Version, StringComparer.OrdinalIgnoreCase)
+                    .Take(ContentConstants.PreloadRecentItemsLimit);
+
+                var addonFilesToEnrich = parsedPage.Sections.OfType<DownloadableFile>()
+                    .Where(f => f.FileSectionType == FileSectionType.Addons && !string.IsNullOrEmpty(f.DetailsUrl ?? f.DownloadUrl))
+                    .OrderByDescending(f => f.ReleaseDate ?? f.UploadDate ?? DateTime.MinValue)
+                    .ThenByDescending(f => f.Version, StringComparer.OrdinalIgnoreCase)
+                    .Take(ContentConstants.PreloadRecentItemsLimit);
+
+                var filesToEnrich = releaseFilesToEnrich.Concat(addonFilesToEnrich).ToList();
+
+                var urlsToEnrich = filesToEnrich
+                    .Select(f => f.DetailsUrl ?? f.DownloadUrl!)
+                    .Where(u => !fetched.ContainsKey(u))
+                    .Distinct(StringComparer.OrdinalIgnoreCase)
+                    .ToList();
+
+                if (urlsToEnrich.Count > 0)
+                {
+                    logger.LogInformation("Enriching {Count} recent releases/addons in same browser window", urlsToEnrich.Count);
+                    var enrichedFetched = await playwrightService.FetchAndParsePersistentManyAsync(
+                        ModDBConstants.BrowserProfileName,
+                        urlsToEnrich,
+                        cancellationToken);
+
+                    if (enrichedFetched.Count > 0)
+                    {
+                        var enrichedFiles = new Dictionary<string, DownloadableFile>(StringComparer.OrdinalIgnoreCase);
+                        foreach (var kvp in enrichedFetched)
+                        {
+                            var detailUrl = kvp.Key;
+                            var detailDoc = kvp.Value;
+                            var detailed = ExtractDetailedFile(detailDoc, detailUrl);
+                            if (detailed != null)
+                            {
+                                enrichedFiles[detailUrl] = detailed;
+                            }
+                        }
+
+                        if (enrichedFiles.Count > 0)
+                        {
+                            var updatedSections = new List<ContentSection>();
+                            foreach (var section in parsedPage.Sections)
+                            {
+                                if (section is DownloadableFile file)
+                                {
+                                    var key = file.DetailsUrl ?? file.DownloadUrl;
+                                    if (key != null && enrichedFiles.TryGetValue(key, out var detailed))
+                                    {
+                                        var merged = detailed with
+                                        {
+                                            Category = !string.IsNullOrEmpty(detailed.Category) ? detailed.Category : file.Category,
+                                            FileSectionType = file.FileSectionType,
+                                            UploadDate = detailed.UploadDate ?? file.UploadDate,
+                                            ReleaseDate = detailed.ReleaseDate ?? file.ReleaseDate,
+                                            ThumbnailUrl = !string.IsNullOrEmpty(detailed.ThumbnailUrl) ? detailed.ThumbnailUrl : file.ThumbnailUrl,
+                                            DetailsUrl = !string.IsNullOrEmpty(detailed.DetailsUrl) ? detailed.DetailsUrl : file.DetailsUrl,
+                                            DownloadUrl = !string.IsNullOrEmpty(detailed.DownloadUrl) ? detailed.DownloadUrl : file.DownloadUrl,
+                                            SizeBytes = detailed.SizeBytes ?? file.SizeBytes,
+                                            SizeDisplay = !string.IsNullOrEmpty(detailed.SizeDisplay) ? detailed.SizeDisplay : file.SizeDisplay,
+                                            Name = !string.IsNullOrEmpty(detailed.Name) && !string.Equals(detailed.Name, "Unknown", StringComparison.OrdinalIgnoreCase) ? detailed.Name : file.Name,
+                                        };
+                                        updatedSections.Add(merged);
+                                        continue;
+                                    }
+                                }
+
+                                updatedSections.Add(section);
+                            }
+
+                            parsedPage = parsedPage with { Sections = updatedSections };
+                        }
+                    }
+                }
+
+                return parsedPage;
+            },
+            cancellationToken);
+    }
+
+    /// <summary>
+    /// File-only parse for acquisition: returns the single <see cref="DownloadableFile"/> from a
+    /// FileDetail page and the page's own metadata, without fetching the parent mod's downloads,
+    /// addons, videos, images, reviews, and articles sections. The download path needs only the
+    /// file; the FileDetail page already carries title/developer/icon/description via its profile
+    /// sidebar. Use <see cref="ParseAsync(string, CancellationToken)"/> when the full rich page
+    /// (Media/Community/Releases/Addons) is required for display.
+    /// </summary>
+    /// <param name="url">A FileDetail URL (<c>/mods/.../downloads/file-name</c> or <c>/addons/...</c>).</param>
+    /// <param name="cancellationToken">Cancellation token.</param>
+    /// <returns>A parsed page containing the single file and the FileDetail page's context.</returns>
+    public async Task<ParsedWebPage> ParseFileDetailAsync(string url, CancellationToken cancellationToken = default)
+    {
+        logger.LogInformation("Parsing ModDB file detail (acquisition path): {Url}", url);
+
+        var document = await playwrightService.FetchAndParsePersistentAsync(
+            ModDBConstants.BrowserProfileName, url, cancellationToken);
+
+        var sections = new List<ContentSection>();
+        var file = ExtractDetailedFile(document, url);
+        if (file != null)
+        {
+            sections.Add(file);
+        }
+
+        var context = ExtractGlobalContext(document);
+
+        return new ParsedWebPage(
+            Url: new Uri(url),
+            Context: context,
+            Sections: sections,
+            PageType: PageType.FileDetail);
+    }
+
+    /// <summary>
+    /// Parses multiple file detail pages in a single parallel batch using persistent Chromium tabs.
+    /// </summary>
+    /// <param name="urls">The file detail URLs to parse.</param>
+    /// <param name="cancellationToken">Cancellation token.</param>
+    /// <returns>A dictionary of URL -> ParsedWebPage results.</returns>
+    public async Task<IReadOnlyDictionary<string, ParsedWebPage>> ParseFileDetailsManyAsync(
+        IReadOnlyList<string> urls,
+        CancellationToken cancellationToken = default)
+    {
+        if (urls == null || urls.Count == 0)
+        {
+            return new Dictionary<string, ParsedWebPage>();
+        }
+
+        logger.LogInformation("Parsing ModDB file details in parallel batch ({Count} URLs)", urls.Count);
+
+        var fetched = await playwrightService.FetchAndParsePersistentManyAsync(
+            ModDBConstants.BrowserProfileName,
+            urls,
+            cancellationToken);
+
+        var results = new Dictionary<string, ParsedWebPage>(StringComparer.OrdinalIgnoreCase);
+        foreach (var (url, document) in fetched)
+        {
+            try
+            {
+                var sections = new List<ContentSection>();
+                var file = ExtractDetailedFile(document, url);
+                if (file != null)
+                {
+                    sections.Add(file);
+                }
+
+                var context = ExtractGlobalContext(document);
+                results[url] = new ParsedWebPage(
+                    Url: new Uri(url),
+                    Context: context,
+                    Sections: sections,
+                    PageType: PageType.FileDetail);
+            }
+            catch (Exception ex)
+            {
+                logger.LogWarning(ex, "Failed to parse file detail for {Url}", url);
+            }
+        }
+
+        return results;
+    }
+
+    /// <inheritdoc />
+    public Task<ParsedWebPage> ParseAsync(string url, string html, CancellationToken cancellationToken = default)
+    {
+        var browsingContext = BrowsingContext.New(Configuration.Default);
+        var document = browsingContext.OpenAsync(req => req.Content(html), cancellationToken).GetAwaiter().GetResult();
+        return Task.FromResult(ParseInternal(url, document));
+    }
+
+    /// <summary>
+    /// Determines whether a ModDB URL points directly to an acquisition endpoint (/start/ or /mirror/)
+    /// rather than an HTML content or detail listing page.
+    /// </summary>
+    /// <param name="url">The URL to test.</param>
+    /// <returns><see langword="true"/> if the URL is a direct download link; otherwise <see langword="false"/>.</returns>
+    internal static bool IsDirectDownloadUrl(string? url)
+    {
+        if (string.IsNullOrWhiteSpace(url))
+        {
+            return false;
+        }
+
+        if (url.Contains("/downloads/start/", StringComparison.OrdinalIgnoreCase) ||
+            url.Contains("/addons/start/", StringComparison.OrdinalIgnoreCase) ||
+            url.Contains("/downloads/mirror/", StringComparison.OrdinalIgnoreCase))
+        {
+            return true;
+        }
+
+        if ((url.Contains("/mods/", StringComparison.OrdinalIgnoreCase) || url.Contains("/games/", StringComparison.OrdinalIgnoreCase)) &&
+            (url.Contains("/downloads/", StringComparison.OrdinalIgnoreCase) || url.Contains("/addons/", StringComparison.OrdinalIgnoreCase)))
+        {
+            return false;
+        }
+
+        return true;
+    }
+
+    /// <summary>
+    /// Computes the complete list of URLs needed to parse a ModDB page and its related sections
+    /// in a single Playwright batch, avoiding multiple browser launches.
+    /// </summary>
+    private static IReadOnlyList<string> GetUrlsToFetch(string url)
+    {
+        if (IsModDetailPage(url))
+        {
+            var baseUrl = Uri.TryCreate(url, UriKind.Absolute, out var uri)
+                ? $"{uri.Scheme}://{uri.Authority}{uri.AbsolutePath.TrimEnd('/')}"
+                : url.Split('?')[0].Split('#')[0].TrimEnd('/');
+
+            return
+            [
+                url,
+                baseUrl + "/downloads",
+                baseUrl + "/addons",
+                baseUrl + "/videos",
+                baseUrl + "/images",
+                baseUrl + "/reviews",
+                baseUrl + "/articles",
+            ];
+        }
+
+        var parentModUrl = ExtractParentModUrl(url);
+        if (!string.IsNullOrEmpty(parentModUrl))
+        {
+            var baseUrl = Uri.TryCreate(parentModUrl, UriKind.Absolute, out var parentUri)
+                ? $"{parentUri.Scheme}://{parentUri.Authority}{parentUri.AbsolutePath.TrimEnd('/')}"
+                : parentModUrl.Split('?')[0].Split('#')[0].TrimEnd('/');
+
+            return
+            [
+                url,
+                parentModUrl,
+                baseUrl + "/downloads",
+                baseUrl + "/addons",
+                baseUrl + "/videos",
+                baseUrl + "/images",
+                baseUrl + "/reviews",
+                baseUrl + "/articles",
+            ];
+        }
+
+        return [url];
+    }
+
+    /// <summary>
+    /// Determines if the URL is a mod detail page that should have all sections fetched.
+    /// Only the mod root (<c>/mods/{slug}</c>) qualifies — subpaths like comments, downloads,
+    /// or tutorials must not trigger the six-section Chromium sweep.
+    /// </summary>
+    private static bool IsModDetailPage(string url)
+    {
+        if (!Uri.TryCreate(url, UriKind.Absolute, out var uri))
+        {
+            return false;
+        }
+
+        // /mods/{slug} optionally with a trailing slash — nothing after the slug.
+        var segments = uri.AbsolutePath.TrimEnd('/').Split('/', StringSplitOptions.RemoveEmptyEntries);
+        return segments.Length == 2 &&
+               segments[0].Equals("mods", StringComparison.OrdinalIgnoreCase);
+    }
+
+    private static string ExtractDeveloper(IDocument document)
+    {
+        foreach (var el in document.QuerySelectorAll(ModDBParserConstants.DeveloperProfileSelector))
+        {
+            var href = el.GetAttribute("href") ?? string.Empty;
+            if (href.Contains("/register", StringComparison.OrdinalIgnoreCase) ||
+                href.Contains("/login", StringComparison.OrdinalIgnoreCase))
+            {
+                continue;
+            }
+
+            var text = el.TextContent?.Trim();
+            if (!IsJunkDeveloperName(text))
+            {
+                return text!;
+            }
+        }
+
+        foreach (var el in document.QuerySelectorAll(ModDBParserConstants.DeveloperSelector))
+        {
+            var href = el.GetAttribute("href") ?? string.Empty;
+            if (href.Contains("/register", StringComparison.OrdinalIgnoreCase) ||
+                href.Contains("/login", StringComparison.OrdinalIgnoreCase))
+            {
+                continue;
+            }
+
+            var text = el.TextContent?.Trim();
+            if (!IsJunkDeveloperName(text))
+            {
+                return text!;
+            }
+        }
+
+        return "Unknown";
+    }
+
+    private static string? ExtractDescription(IDocument document)
+    {
+        var fileDesc = ReadDescriptionFrom(document.QuerySelector(ModDBParserConstants.FileDescriptionSelector)
+            ?? document.QuerySelector("#downloaddescription")
+            ?? document.QuerySelector("#downloadsummary"));
+        if (!IsBreadcrumbOrLocationText(fileDesc))
+        {
+            var extra = document.QuerySelector("#downloaddescription");
+            var summary = document.QuerySelector("#downloadsummary");
+            var parts = new List<string>();
+            var summaryText = ReadDescriptionFrom(summary);
+            var fullText = extra != null && extra != summary ? ReadDescriptionFrom(extra) : null;
+            if (!IsBreadcrumbOrLocationText(summaryText))
+            {
+                parts.Add(summaryText!);
+            }
+
+            if (!IsBreadcrumbOrLocationText(fullText) &&
+                (summaryText == null || fullText!.IndexOf(summaryText, StringComparison.OrdinalIgnoreCase) < 0))
+            {
+                parts.Add(fullText!);
+            }
+
+            if (parts.Count > 0)
+            {
+                return string.Join("\n\n", parts);
+            }
+
+            return fileDesc;
+        }
+
+        var fullDescEl = document.QuerySelector(ModDBParserConstants.FullDescriptionSelector);
+        var fromFull = ReadDescriptionFrom(fullDescEl);
+        if (!IsBreadcrumbOrLocationText(fromFull))
+        {
+            return fromFull;
+        }
+
+        var summaryEl = document.QuerySelector(ModDBParserConstants.SummarySelector);
+        var fromSummary = ReadDescriptionFrom(summaryEl);
+        if (!IsBreadcrumbOrLocationText(fromSummary))
+        {
+            return fromSummary;
+        }
+
+        var metaDesc = document.QuerySelector("meta[name='description'], meta[property='og:description']");
+        var meta = metaDesc?.GetAttribute("content")?.Trim();
+        return IsBreadcrumbOrLocationText(meta) ? null : meta;
+    }
+
+    private static string? ReadDescriptionFrom(IElement? element)
+    {
+        if (element == null)
+        {
+            return null;
+        }
+
+        var paragraphs = element.QuerySelectorAll("p")
+            .Select(p => p.TextContent?.Trim())
+            .Where(t => !string.IsNullOrWhiteSpace(t) && !IsBreadcrumbOrLocationText(t))
+            .ToList();
+
+        if (paragraphs.Count > 0)
+        {
+            return string.Join("\n\n", paragraphs);
+        }
+
+        var text = element.TextContent?.Trim();
+        return string.IsNullOrWhiteSpace(text) ? null : text;
+    }
+
+    /// <summary>
+    /// Internal parsing logic that works with a parsed AngleSharp document.
+    /// </summary>
+    private ParsedWebPage ParseInternal(string url, IDocument document)
+    {
+        var context = ExtractGlobalContext(document);
+        var pageType = DetectPageType(url, document);
+
+        logger.LogDebug("Detected page type: {PageType}", pageType);
+
+        var sections = new List<ContentSection>();
+
+        switch (pageType)
+        {
+            case PageType.List:
+                // Determine if this is an addons list or generic list
+                var sectionType = url.Contains("/addons", StringComparison.OrdinalIgnoreCase)
+                    ? FileSectionType.Addons
+                    : FileSectionType.Downloads;
+                sections.AddRange(ExtractListSections(document, sectionType));
+                break;
+
+            case PageType.Summary:
+                sections.AddRange(ExtractSummarySections(document));
+                break;
+
+            case PageType.Detail:
+                sections.AddRange(ExtractDetailSections(document));
+                break;
+
+            case PageType.FileDetail:
+                sections.AddRange(ExtractFileDetailSections(document));
+                break;
+
+            default:
+                logger.LogWarning("Unknown page type for URL: {Url}", url);
+                break;
+        }
+
+        sections = DeduplicateDownloadableFiles(sections);
+        sections = DeduplicateImages(sections);
+        sections = DeduplicateVideos(sections);
+
+        logger.LogInformation(
+            "Parsed ModDB page: {Url}, Type={PageType}, Sections={SectionCount}",
+            url,
+            pageType,
+            sections.Count);
+
+        return new ParsedWebPage(
+            Url: new Uri(url),
+            Context: context,
+            Sections: sections,
+            PageType: pageType);
+    }
+
+    /// <summary>
+    /// Synchronous internal parsing logic that extracts content from the primary document
+    /// and any pre-fetched section documents (from the single Playwright batch).
+    /// </summary>
+    private ParsedWebPage ParseInternalWithFetched(
+        string url,
+        IDocument document,
+        IReadOnlyDictionary<string, IDocument> fetched)
+    {
+        var context = ExtractGlobalContext(document);
+        var pageType = DetectPageType(url, document);
+
+        logger.LogDebug("Detected page type: {PageType}", pageType);
+
+        var sections = new List<ContentSection>();
+
+        // Special handling for mod detail pages - populate ALL sections
+        if (IsModDetailPage(url) && pageType == PageType.Detail)
+        {
+            logger.LogInformation("Mod detail page detected, parsing all sections (downloads, addons, videos, images, reviews, articles)");
+
+            // Extract non-file content from the main page
+            sections.AddRange(ExtractVideos(document));
+            sections.AddRange(ExtractImages(document));
+            sections.AddRange(ExtractArticles(document));
+            sections.AddRange(ExtractReviews(document));
+            sections.AddRange(ExtractComments(document));
+
+            var baseUrl = url.TrimEnd('/');
+            AppendFetchedSections(sections, baseUrl, fetched);
+        }
+        else if (pageType == PageType.FileDetail)
+        {
+            var file = ExtractDetailedFile(document, url);
+            if (file != null)
+            {
+                sections.Add(file);
+            }
+
+            // Game downloads/addons are discovered as FileDetail URLs under /games/... and never enter
+            // the /mods/ parent sweep below. Pull comments and any inline media from this page so the
+            // detail view is not left with only a single Releases row.
+            AppendOnPageFileDetailSections(sections, document);
+
+            var parentModUrl = ExtractParentModUrl(url);
+            if (!string.IsNullOrEmpty(parentModUrl) && fetched.TryGetValue(parentModUrl, out var parentDoc))
+            {
+                logger.LogInformation("FileDetail page detected, extracted parent mod sections from: {ParentUrl}", parentModUrl);
+
+                var parentContext = ExtractGlobalContext(parentDoc);
+                if (!string.IsNullOrEmpty(parentContext.IconUrl))
+                {
+                    logger.LogInformation("Extracted icon from parent mod: {IconUrl}", parentContext.IconUrl);
+                }
+
+                context = MergeContext(context, parentContext);
+
+                sections.AddRange(ExtractVideos(parentDoc));
+                sections.AddRange(ExtractImages(parentDoc));
+                sections.AddRange(ExtractArticles(parentDoc));
+                sections.AddRange(ExtractReviews(parentDoc));
+                sections.AddRange(ExtractComments(parentDoc));
+
+                var baseUrl = parentModUrl.TrimEnd('/');
+                AppendFetchedSections(sections, baseUrl, fetched);
+            }
+        }
+        else
+        {
+            // Standard page handling
+            switch (pageType)
+            {
+                case PageType.List:
+                    var listSectionType = url.Contains("/addons", StringComparison.OrdinalIgnoreCase)
+                        ? FileSectionType.Addons
+                        : FileSectionType.Downloads;
+                    sections.AddRange(ExtractListSections(document, listSectionType));
+                    break;
+
+                case PageType.Summary:
+                    sections.AddRange(ExtractSummarySections(document));
+                    break;
+
+                case PageType.Detail:
+                    sections.AddRange(ExtractDetailSections(document));
+                    break;
+
+                default:
+                    logger.LogWarning("Unknown page type for URL: {Url}", url);
+                    break;
+            }
+        }
+
+        sections = DeduplicateDownloadableFiles(sections);
+        sections = DeduplicateImages(sections);
+        sections = DeduplicateVideos(sections);
+
+        logger.LogInformation(
+            "Parsed ModDB page: {Url}, Type={PageType}, Sections={SectionCount}",
+            url,
+            pageType,
+            sections.Count);
+
+        return new ParsedWebPage(
+            Url: new Uri(url),
+            Context: context,
+            Sections: sections,
+            PageType: pageType);
+    }
+
+    /// <summary>
+    /// Extracts global context from the page header and profile sidebar.
+    /// </summary>
+    private GlobalContext ExtractGlobalContext(IDocument document)
+    {
+        // 1. Extract title. File pages use h1 "... file" and h2 for the real content name.
+        var h2 = document.QuerySelector("h2 a, h2")?.TextContent?.Trim();
+        var h1 = document.QuerySelector("h1 a, h1")?.TextContent?.Trim();
+        var title = h1 ?? "Unknown";
+        if (!string.IsNullOrWhiteSpace(h2) &&
+            (string.IsNullOrWhiteSpace(h1) ||
+             h1.EndsWith(" file", StringComparison.OrdinalIgnoreCase)))
+        {
+            title = h2;
+        }
+
+        if (string.IsNullOrWhiteSpace(title) || title == "Unknown")
+        {
+            title = document.QuerySelector(".title")?.TextContent?.Trim() ?? "Unknown";
+        }
+
+        // 2. Extract developer — never the header "register" / "sign in" links.
+        var developer = ExtractDeveloper(document);
+
+        // 3. Extract release date
+        DateTime? releaseDate = null;
+        var releaseDateEl = document.QuerySelector(ModDBParserConstants.ReleaseDateSelector);
+        if (releaseDateEl != null)
+        {
+            var dateStr = releaseDateEl.GetAttribute("datetime") ?? releaseDateEl.TextContent?.Trim();
+            if (!string.IsNullOrEmpty(dateStr) && DateTime.TryParse(dateStr, out var parsedDate))
+            {
+                releaseDate = parsedDate;
+            }
+        }
+
+        // 4. Extract icon from profile sidebar
+        var iconEl = document.QuerySelector(ModDBParserConstants.ProfileIconSelector)
+            ?? document.QuerySelector(ModDBParserConstants.IconSelector);
+        var iconUrl = iconEl?.GetAttribute("src");
+        if (!string.IsNullOrEmpty(iconUrl))
+        {
+            if (!iconUrl.StartsWith("http", StringComparison.OrdinalIgnoreCase))
+            {
+                iconUrl = "https:" + iconUrl;
+            }
+
+            if (iconUrl.Contains("error_50x50", StringComparison.OrdinalIgnoreCase) ||
+                iconUrl.Contains("default/error", StringComparison.OrdinalIgnoreCase) ||
+                iconUrl.Contains("blank.gif", StringComparison.OrdinalIgnoreCase) ||
+                iconUrl.Contains("clear.gif", StringComparison.OrdinalIgnoreCase))
+            {
+                iconUrl = null;
+            }
+        }
+
+        // 5. Extract description. File pages put copy in #downloadsummary / #downloaddescription;
+        // the first .summary on those pages is the breadcrumb "Games : ... : Files".
+        var description = ExtractDescription(document);
+
+        // 6. Extract game name
+        var gameNameEl = document.QuerySelector(ModDBParserConstants.GameNameSelector);
+        var gameName = gameNameEl?.TextContent?.Trim();
+
+        logger.LogDebug(
+            "Extracted context: Title={Title}, Developer={Developer}, IconUrl={Icon}, DescriptionLength={DescLen}",
+            title,
+            developer,
+            iconUrl,
+            description?.Length ?? 0);
+
+        return new GlobalContext(
+            Title: title,
+            Developer: developer,
+            ReleaseDate: releaseDate,
+            GameName: gameName,
+            IconUrl: iconUrl,
+            Description: description);
+    }
+
+    /// <summary>
+    /// Extracts the downloadable file plus any Media/Community content already rendered on a
+    /// FileDetail page (comments, inline images, etc.). Game-scoped FileDetail URLs
+    /// (<c>/games/.../downloads/...</c>) never have a parent mod to sweep, so this on-page pass is
+    /// the only way those detail views get Community/Media tabs.
+    /// </summary>
+    private List<ContentSection> ExtractFileDetailSections(IDocument document)
+    {
+        var sections = new List<ContentSection>();
+
+        var file = ExtractDetailedFile(document, document.Url);
+        if (file != null)
+        {
+            sections.Add(file);
+        }
+
+        AppendOnPageFileDetailSections(sections, document);
+        return sections;
+    }
+
+    /// <summary>
+    /// Appends videos, images, articles, reviews, and comments already present on the current
+    /// FileDetail document. Does not navigate to sibling section URLs.
+    /// </summary>
+    private void AppendOnPageFileDetailSections(List<ContentSection> sections, IDocument document)
+    {
+        sections.AddRange(ExtractVideos(document));
+        sections.AddRange(ExtractImages(document));
+        sections.AddRange(ExtractArticles(document));
+        sections.AddRange(ExtractReviews(document));
+        sections.AddRange(ExtractComments(document));
+    }
+
+    /// <summary>
+    /// Maps already-fetched section documents into content sections. Missing keys are soft-failures
+    /// (logged by the Playwright batch fetch); this method only extracts what loaded.
+    /// </summary>
+    private void AppendFetchedSections(
+        List<ContentSection> sections,
+        string baseUrl,
+        IReadOnlyDictionary<string, IDocument> fetched)
+    {
+        TryAppendSection(sections, fetched, baseUrl + "/downloads", "downloads", doc => ExtractFiles(doc, FileSectionType.Downloads));
+        TryAppendSection(sections, fetched, baseUrl + "/addons", "addons", doc => ExtractFiles(doc, FileSectionType.Addons));
+        TryAppendSection(sections, fetched, baseUrl + "/videos", "videos", ExtractVideos);
+        TryAppendSection(sections, fetched, baseUrl + "/images", "images", ExtractImages);
+        TryAppendSection(sections, fetched, baseUrl + "/reviews", "reviews", ExtractReviews);
+        TryAppendSection(sections, fetched, baseUrl + "/articles", "articles", ExtractArticles);
+    }
+
+    private void TryAppendSection(
+        List<ContentSection> sections,
+        IReadOnlyDictionary<string, IDocument> fetched,
+        string sectionUrl,
+        string sectionName,
+        Func<IDocument, IEnumerable<ContentSection>> extract)
+    {
+        if (!fetched.TryGetValue(sectionUrl, out var sectionDoc))
+        {
+            logger.LogWarning("Failed to fetch {Section} section for {Url}", sectionName, sectionUrl);
+            return;
+        }
+
+        var sectionItems = extract(sectionDoc).ToList();
+        sections.AddRange(sectionItems);
+        logger.LogInformation("Found {Count} items in {Section} section", sectionItems.Count, sectionName);
+    }
+
+    /// <summary>
+    /// Extracts detailed file information from a file detail page.
+    /// Parses the metadata table with rows like: Filename, Category, Uploader, Size, MD5 Hash.
+    /// </summary>
+    private DownloadableFile? ExtractDetailedFile(IDocument document, string? pageUrl = null)
+    {
+        var detailsUrl = pageUrl;
+        if (string.IsNullOrEmpty(detailsUrl) && document.Url != null && document.Url.StartsWith("http", StringComparison.OrdinalIgnoreCase))
+        {
+            detailsUrl = document.Url;
+        }
+
+        var metadata = CollectDetailedFileMetadata(document);
+        var filename = metadata.GetValueOrDefault(ModDBParserConstants.MetadataFilename)
+            ?? metadata.GetValueOrDefault(ModDBParserConstants.MetadataFileNameAlt)
+            ?? metadata.GetValueOrDefault(ModDBParserConstants.MetadataFileAlt);
+
+        var name = ResolveDetailedFileName(document, filename);
+        var (sizeBytes, sizeDisplay) = ExtractDetailedFileSize(document, metadata);
+        var uploader = metadata.GetValueOrDefault(ModDBParserConstants.MetadataUploader)
+            ?? metadata.GetValueOrDefault(ModDBParserConstants.MetadataUploadedBy)
+            ?? metadata.GetValueOrDefault(ModDBParserConstants.MetadataAuthor);
+
+        var category = metadata.GetValueOrDefault(ModDBParserConstants.MetadataCategory)
+            ?? metadata.GetValueOrDefault(ModDBParserConstants.MetadataFileCategory)
+            ?? metadata.GetValueOrDefault(ModDBParserConstants.MetadataType);
+
+        var md5Hash = metadata.GetValueOrDefault(ModDBParserConstants.MetadataMd5Hash)
+            ?? metadata.GetValueOrDefault(ModDBParserConstants.MetadataMd5HashAlt)
+            ?? metadata.GetValueOrDefault(ModDBParserConstants.MetadataMd5Checksum)
+            ?? metadata.GetValueOrDefault(ModDBParserConstants.MetadataMd5)
+            ?? metadata.GetValueOrDefault(ModDBParserConstants.MetadataHash)
+            ?? metadata.GetValueOrDefault(ModDBParserConstants.MetadataChecksum);
+
+        var (uploadDate, releaseDate) = ExtractDetailedFileDates(metadata);
+        var downloadUrl = ExtractDetailedDownloadUrl(document);
+        var downloadCount = ExtractDetailedDownloadCount(metadata);
+        var description = ExtractDescription(document)
+            ?? document.QuerySelector(ModDBParserConstants.FileDescriptionContainerSelector)?.TextContent?.Trim();
+        var previewImages = ExtractDetailedPreviewImages(document);
+
+        logger.LogInformation(
+            "Extracted file: Name={Name}, Size={Size}, Uploader={Uploader}, DownloadUrl={Url}",
+            name,
+            sizeDisplay,
+            uploader,
+            downloadUrl);
+
+        var sectionType = detailsUrl?.Contains("/addons/", StringComparison.OrdinalIgnoreCase) == true ||
+                          category?.Contains("addon", StringComparison.OrdinalIgnoreCase) == true
+            ? FileSectionType.Addons
+            : FileSectionType.Downloads;
+
+        return new DownloadableFile(
+            Name: name,
+            SizeBytes: sizeBytes,
+            SizeDisplay: sizeDisplay,
+            UploadDate: uploadDate,
+            Category: category,
+            Uploader: uploader,
+            DownloadUrl: downloadUrl,
+            Md5Hash: md5Hash,
+            DownloadCount: downloadCount,
+            FileSectionType: sectionType,
+            ReleaseDate: releaseDate,
+            DetailsUrl: detailsUrl,
+            Description: description,
+            PreviewImages: previewImages.Count > 0 ? previewImages : null,
+            Filename: filename);
+    }
+
+    private Dictionary<string, string> CollectDetailedFileMetadata(IDocument document)
+    {
+        var metadata = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+        var containers = document.QuerySelectorAll("#downloadsinfo, .table, table.table, #downloadsfiles, .sidecolumn, #modsinfo, #profile");
+        foreach (var container in containers)
+        {
+            var rows = container.QuerySelectorAll("tr");
+            foreach (var row in rows)
+            {
+                var cells = row.QuerySelectorAll("td, th");
+                if (cells.Length >= 2)
+                {
+                    var key = cells[0].TextContent?.Trim().ToLowerInvariant().Replace(":", string.Empty);
+                    var value = cells[1].TextContent?.Trim();
+                    if (!string.IsNullOrEmpty(key) && !string.IsNullOrEmpty(value))
+                    {
+                        metadata[key] = value;
+                    }
+                }
+            }
+
+            var flexRows = container.QuerySelectorAll(".row.clear, .row, div.heading, dl");
+            foreach (var row in flexRows)
+            {
+                var labelEl = row.QuerySelector("h5, h4, dt, strong, .label, .rowlabel");
+                var label = labelEl?.TextContent?.Trim().ToLowerInvariant().Replace(":", string.Empty);
+                if (string.IsNullOrWhiteSpace(label))
+                {
+                    continue;
+                }
+
+                var valueElement = labelEl?.NextElementSibling
+                    ?? row.QuerySelector("span.summary, dd, time, a, .content, span");
+                var value = valueElement?.TextContent?.Trim();
+                if (!string.IsNullOrWhiteSpace(value))
+                {
+                    metadata[label] = value;
+                }
+            }
+        }
+
+        return metadata;
+    }
+
+    private string ResolveDetailedFileName(IDocument document, string? filename)
+    {
+        string? fileHeading = null;
+        var headingCandidates = document.QuerySelectorAll(ModDBParserConstants.FilePageTitleSelector);
+        foreach (var cand in headingCandidates)
+        {
+            if (cand.Closest(ModDBParserConstants.HeaderBoxSelector) != null)
+            {
+                continue;
+            }
+
+            var text = cand.TextContent?.Trim();
+            if (!string.IsNullOrWhiteSpace(text) && !text.Equals("Unknown", StringComparison.OrdinalIgnoreCase))
+            {
+                fileHeading = text;
+                break;
+            }
+        }
+
+        string? titleTagCandidate = null;
+        var docTitle = document.Title?.Trim();
+        if (!string.IsNullOrWhiteSpace(docTitle))
+        {
+            var match = ModDBPageTitleRegex().Match(docTitle);
+            if (match.Success)
+            {
+                titleTagCandidate = match.Groups["title"].Value.Trim();
+            }
+        }
+
+        var h1Title = document.QuerySelector("h1 a, h1")?.TextContent?.Trim();
+        if (!string.IsNullOrWhiteSpace(h1Title) && h1Title.EndsWith(" file", StringComparison.OrdinalIgnoreCase))
+        {
+            h1Title = h1Title[..^5].Trim();
+        }
+
+        var humanName = fileHeading
+            ?? titleTagCandidate
+            ?? (!string.IsNullOrWhiteSpace(h1Title) && !h1Title.Equals("Unknown", StringComparison.OrdinalIgnoreCase) ? h1Title : null)
+            ?? document.QuerySelector(ModDBParserConstants.FallbackTitleSelector)?.TextContent?.Trim();
+
+        return humanName ?? filename ?? "Unknown";
+    }
+
+    private (long? SizeBytes, string? SizeDisplay) ExtractDetailedFileSize(IDocument document, Dictionary<string, string> metadata)
+    {
+        string? sizeDisplay = metadata.GetValueOrDefault(ModDBParserConstants.MetadataSize)
+            ?? metadata.GetValueOrDefault(ModDBParserConstants.MetadataFileSizeAlt);
+        long? sizeBytes = null;
+
+        if (!string.IsNullOrEmpty(sizeDisplay))
+        {
+            if (sizeDisplay.Contains("bytes", StringComparison.OrdinalIgnoreCase) &&
+                sizeDisplay.Contains('(') && sizeDisplay.Contains(')'))
+            {
+                var bytesPart = sizeDisplay.Split('(').LastOrDefault()?.Replace("bytes)", string.Empty).Replace(",", string.Empty).Trim();
+                if (long.TryParse(bytesPart, out var bytesVal))
+                {
+                    sizeBytes = bytesVal;
+                }
+            }
+
+            sizeBytes ??= ParseFileSize(sizeDisplay);
+        }
+
+        if (string.IsNullOrEmpty(sizeDisplay))
+        {
+            var downloadButton = document.QuerySelector(ModDBParserConstants.MainDownloadButtonSelector);
+            sizeDisplay = downloadButton?.TextContent?.Trim();
+            if (!string.IsNullOrEmpty(sizeDisplay))
+            {
+                sizeBytes = ParseFileSize(sizeDisplay);
+            }
+        }
+
+        return (sizeBytes, sizeDisplay);
+    }
+
+    private (DateTime? UploadDate, DateTime? ReleaseDate) ExtractDetailedFileDates(Dictionary<string, string> metadata)
+    {
+        DateTime? uploadDate = null;
+        DateTime? releaseDate = null;
+        var addedStr = metadata.GetValueOrDefault(ModDBParserConstants.MetadataAdded)
+            ?? metadata.GetValueOrDefault(ModDBParserConstants.MetadataUpdated);
+
+        if (!string.IsNullOrEmpty(addedStr))
+        {
+            if (DateTime.TryParse(addedStr, out var parsedDate))
+            {
+                uploadDate = parsedDate;
+                releaseDate = parsedDate;
+            }
+            else
+            {
+                var modDBDate = ParseModDBDate(addedStr);
+                if (modDBDate.HasValue)
+                {
+                    uploadDate = modDBDate;
+                    releaseDate = modDBDate;
+                }
+            }
+        }
+
+        return (uploadDate, releaseDate);
+    }
+
+    private string? ExtractDetailedDownloadUrl(IDocument document)
+    {
+        var downloadButton = document.QuerySelector(ModDBParserConstants.MainDownloadButtonSelector);
+        if (downloadButton != null)
+        {
+            var href = downloadButton.GetAttribute("href");
+            if (!string.IsNullOrEmpty(href))
+            {
+                return ToAbsoluteUrl(href);
+            }
+        }
+
+        return null;
+    }
+
+    private int? ExtractDetailedDownloadCount(Dictionary<string, string> metadata)
+    {
+        var downloadsStr = metadata.GetValueOrDefault(ModDBParserConstants.MetadataTotalDownloads)
+            ?? metadata.GetValueOrDefault(ModDBParserConstants.MetadataDownloadCount)
+            ?? metadata.GetValueOrDefault("downloads");
+
+        if (!string.IsNullOrEmpty(downloadsStr))
+        {
+            var numberMatch = System.Text.RegularExpressions.Regex.Match(downloadsStr, @"[\d,]+");
+            if (numberMatch.Success && int.TryParse(numberMatch.Value.Replace(",", string.Empty), out var parsedDl))
+            {
+                return parsedDl;
+            }
+        }
+
+        return null;
+    }
+
+    private List<string> ExtractDetailedPreviewImages(IDocument document)
+    {
+        var previewImages = new List<string>();
+        var imageEls = document.QuerySelectorAll(ModDBParserConstants.FilePreviewImagesSelector);
+        foreach (var img in imageEls)
+        {
+            var src = img.GetAttribute("src") ?? img.GetAttribute("data-src");
+            if (string.IsNullOrWhiteSpace(src) ||
+                src.StartsWith("data:", StringComparison.OrdinalIgnoreCase) ||
+                src.Contains("blank.gif", StringComparison.OrdinalIgnoreCase) ||
+                src.Contains("clear.gif", StringComparison.OrdinalIgnoreCase) ||
+                src.Contains("guest", StringComparison.OrdinalIgnoreCase) ||
+                src.Contains("/avatar/", StringComparison.OrdinalIgnoreCase) ||
+                src.Contains("button", StringComparison.OrdinalIgnoreCase) ||
+                src.Contains("icon.gif", StringComparison.OrdinalIgnoreCase))
+            {
+                continue;
+            }
+
+            var fullUrl = ToAbsoluteUrl(src);
+            var parentAnchor = img.Closest("a");
+            var anchorHref = parentAnchor?.GetAttribute("href");
+            if (!string.IsNullOrWhiteSpace(anchorHref))
+            {
+                var absAnchor = ToAbsoluteUrl(anchorHref);
+                var isDirectImage = absAnchor.EndsWith(".jpg", StringComparison.OrdinalIgnoreCase) ||
+                                    absAnchor.EndsWith(".png", StringComparison.OrdinalIgnoreCase) ||
+                                    absAnchor.EndsWith(".jpeg", StringComparison.OrdinalIgnoreCase) ||
+                                    absAnchor.EndsWith(".webp", StringComparison.OrdinalIgnoreCase);
+
+                fullUrl = isDirectImage ? absAnchor : GetFullSizeModDBImageSource(fullUrl);
+            }
+            else
+            {
+                fullUrl = GetFullSizeModDBImageSource(fullUrl);
+            }
+
+            if (!previewImages.Contains(fullUrl))
+            {
+                previewImages.Add(fullUrl);
+            }
+        }
+
+        return previewImages;
+    }
+}
diff --git a/GenHub/GenHub/Features/Content/Services/Publishers/PublisherManifestFactoryResolver.cs b/GenHub/GenHub/Features/Content/Services/Publishers/PublisherManifestFactoryResolver.cs
index 411041ef5..0d62e14ec 100644
--- a/GenHub/GenHub/Features/Content/Services/Publishers/PublisherManifestFactoryResolver.cs
+++ b/GenHub/GenHub/Features/Content/Services/Publishers/PublisherManifestFactoryResolver.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
-using GenHub.Core.Constants;
 using GenHub.Core.Interfaces.Content;
+using GenHub.Core.Models.Enums;
 using GenHub.Core.Models.Manifest;
 using Microsoft.Extensions.Logging;
 
@@ -28,14 +28,30 @@ public class PublisherManifestFactoryResolver(IEnumerable<IPublisherManifestFact
                 "Resolved {FactoryType} for manifest {ManifestId} (Publisher: {Publisher})",
                 factory.GetType().Name,
                 manifest.Id,
-                manifest.Publisher?.PublisherType ?? GameClientConstants.UnknownVersion);
+                manifest.Publisher?.PublisherType ?? "unknown");
             return factory;
         }
 
+        // Fallback to generic GitHub manifest factory for non-GameClient publisher content (e.g., patches, mods)
+        if (manifest.ContentType != ContentType.GameClient)
+        {
+            var fallbackFactory = factories.OfType<GitHubManifestFactory>().FirstOrDefault();
+            if (fallbackFactory != null)
+            {
+                logger.LogInformation(
+                    "Resolved fallback {FactoryType} for manifest {ManifestId} (Publisher: {Publisher}, ContentType: {ContentType})",
+                    fallbackFactory.GetType().Name,
+                    manifest.Id,
+                    manifest.Publisher?.PublisherType ?? "unknown",
+                    manifest.ContentType);
+                return fallbackFactory;
+            }
+        }
+
         logger.LogWarning(
             "No factory found for manifest {ManifestId} (Publisher: {Publisher}, ContentType: {ContentType})",
             manifest.Id,
-            manifest.Publisher?.PublisherType ?? GameClientConstants.UnknownVersion,
+            manifest.Publisher?.PublisherType ?? "unknown",
             manifest.ContentType);
 
         return null;
diff --git a/GenHub/GenHub/Features/Content/Services/Publishers/SuperHackersProvider.cs b/GenHub/GenHub/Features/Content/Services/Publishers/SuperHackersProvider.cs
index b7bbf93a2..3f1b78008 100644
--- a/GenHub/GenHub/Features/Content/Services/Publishers/SuperHackersProvider.cs
+++ b/GenHub/GenHub/Features/Content/Services/Publishers/SuperHackersProvider.cs
@@ -71,57 +71,98 @@ public override async Task<OperationResult<IEnumerable<ContentSearchResult>>> Se
     {
         try
         {
+            cancellationToken.ThrowIfCancellationRequested();
             var results = new List<ContentSearchResult>();
+            var errors = new List<string>();
 
-            // Directly fetch latest release from TheSuperHackers/GeneralsGameCode
-            var latestRelease = await gitHubApiClient.GetLatestReleaseAsync(
-                SuperHackersConstants.GeneralsGameCodeOwner,
-                SuperHackersConstants.GeneralsGameCodeRepo,
-                cancellationToken);
+            var targets = new (string Owner, string Repo, ContentType ContentType, GameType? TargetGame, string DisplayName)[]
+            {
+                (SuperHackersConstants.GeneralsGameCodeOwner, SuperHackersConstants.GeneralsGameCodeRepo, ContentType.GameClient, GameType.Generals, SuperHackersConstants.PublisherName),
+                (SuperHackersConstants.GeneralsGamePatch2Owner, SuperHackersConstants.GeneralsGamePatch2Repo, ContentType.Patch, null, SuperHackersConstants.GeneralsGamePatch2DisplayName),
+            };
 
-            if (latestRelease != null &&
-                (string.IsNullOrWhiteSpace(query.AuthorName) ||
-                 query.AuthorName.Equals(SuperHackersConstants.GeneralsGameCodeOwner, StringComparison.OrdinalIgnoreCase)) &&
-                (string.IsNullOrWhiteSpace(query.SearchTerm) ||
-                 latestRelease.Name?.Contains(query.SearchTerm, StringComparison.OrdinalIgnoreCase) == true ||
-                 SuperHackersConstants.GeneralsGameCodeRepo.Contains(query.SearchTerm, StringComparison.OrdinalIgnoreCase)))
+            var matchingTargets = targets.Where(t =>
+                (!query.ContentType.HasValue || query.ContentType.Value == t.ContentType) &&
+                (!query.TargetGame.HasValue || t.TargetGame == null || query.TargetGame.Value == t.TargetGame.Value) &&
+                (string.IsNullOrWhiteSpace(query.AuthorName) || query.AuthorName.Equals(t.Owner, StringComparison.OrdinalIgnoreCase)) &&
+                (string.IsNullOrWhiteSpace(query.GitHubAuthor) || query.GitHubAuthor.Equals(t.Owner, StringComparison.OrdinalIgnoreCase))).ToList();
+
+            foreach (var (owner, repo, contentType, targetGame, displayName) in matchingTargets)
             {
-                // Generate manifest ID
-                var manifestId = ManifestIdGenerator.GenerateGitHubContentId(
-                    SuperHackersConstants.GeneralsGameCodeOwner,
-                    SuperHackersConstants.GeneralsGameCodeRepo,
-                    ContentType.GameClient,
-                    latestRelease.TagName);
-
-                var result = new ContentSearchResult
+                try
                 {
-                    Id = manifestId,
-                    Name = latestRelease.Name ?? $"{SuperHackersConstants.PublisherName} {latestRelease.TagName}",
-                    Description = latestRelease.Body ?? "SuperHackers release - details available after resolution",
-                    Version = latestRelease.TagName ?? "latest",
-                    AuthorName = SuperHackersConstants.GeneralsGameCodeOwner,
-                    ContentType = ContentType.GameClient,
-                    TargetGame = GameType.Generals, // Simplification, could infer
-                    IsInferred = false,
-                    ProviderName = SourceName,
-                    RequiresResolution = true,
-                    ResolverId = SuperHackersConstants.ResolverId,
-                    SourceUrl = latestRelease.HtmlUrl,
-                    LastUpdated = latestRelease.PublishedAt?.DateTime ?? latestRelease.CreatedAt.DateTime,
-                    ResolverMetadata =
+                    cancellationToken.ThrowIfCancellationRequested();
+
+                    var latestRelease = await gitHubApiClient.GetLatestReleaseAsync(
+                        owner,
+                        repo,
+                        cancellationToken);
+
+                    if (latestRelease != null &&
+                        (string.IsNullOrWhiteSpace(query.SearchTerm) ||
+                         latestRelease.Name?.Contains(query.SearchTerm, StringComparison.OrdinalIgnoreCase) == true ||
+                         repo.Contains(query.SearchTerm, StringComparison.OrdinalIgnoreCase) ||
+                         displayName.Contains(query.SearchTerm, StringComparison.OrdinalIgnoreCase) ||
+                         latestRelease.Body?.Contains(query.SearchTerm, StringComparison.OrdinalIgnoreCase) == true))
                     {
-                        [GitHubConstants.OwnerMetadataKey] = SuperHackersConstants.GeneralsGameCodeOwner,
-                        [GitHubConstants.RepoMetadataKey] = SuperHackersConstants.GeneralsGameCodeRepo,
-                        [GitHubConstants.TagMetadataKey] = latestRelease.TagName ?? "latest",
-                    },
-                };
-
-                result.SetData(latestRelease);
-                results.Add(result);
+                        var manifestId = ManifestIdGenerator.GenerateGitHubContentId(
+                            owner,
+                            repo,
+                            contentType,
+                            latestRelease.TagName);
+
+                        var resolvedTargetGame = targetGame ?? query.TargetGame ?? GameType.Unknown;
+
+                        var result = new ContentSearchResult
+                        {
+                            Id = manifestId,
+                            Name = !string.IsNullOrWhiteSpace(latestRelease.Name) ? latestRelease.Name : $"{displayName} {latestRelease.TagName}",
+                            Description = latestRelease.Body ?? "SuperHackers release - details available after resolution",
+                            Version = latestRelease.TagName ?? "latest",
+                            AuthorName = owner,
+                            ContentType = contentType,
+                            TargetGame = resolvedTargetGame,
+                            IsInferred = false,
+                            ProviderName = SourceName,
+                            RequiresResolution = true,
+                            ResolverId = SuperHackersConstants.ResolverId,
+                            SourceUrl = latestRelease.HtmlUrl,
+                            LastUpdated = latestRelease.PublishedAt?.DateTime ?? latestRelease.CreatedAt.DateTime,
+                            ResolverMetadata =
+                            {
+                                [GitHubConstants.OwnerMetadataKey] = owner,
+                                [GitHubConstants.RepoMetadataKey] = repo,
+                                [GitHubConstants.TagMetadataKey] = latestRelease.TagName ?? "latest",
+                            },
+                        };
+
+                        result.SetData(latestRelease);
+                        results.Add(result);
+                    }
+                }
+                catch (OperationCanceledException)
+                {
+                    throw;
+                }
+                catch (Exception ex)
+                {
+                    Logger.LogWarning(ex, "Failed to fetch SuperHackers release for {Owner}/{Repo}", owner, repo);
+                    errors.Add($"{owner}/{repo}: {ex.Message}");
+                }
+            }
+
+            if (results.Count == 0 && errors.Count > 0)
+            {
+                return OperationResult<IEnumerable<ContentSearchResult>>.CreateFailure(
+                    $"Search failed for SuperHackers targets: {string.Join("; ", errors)}");
             }
 
             return OperationResult<IEnumerable<ContentSearchResult>>.CreateSuccess(results);
         }
+        catch (OperationCanceledException)
+        {
+            throw;
+        }
         catch (Exception ex)
         {
             Logger.LogError(ex, "Failed to search SuperHackers content");
diff --git a/GenHub/GenHub/Features/Content/Services/Tools/ManagedChromiumRuntime.cs b/GenHub/GenHub/Features/Content/Services/Tools/ManagedChromiumRuntime.cs
new file mode 100644
index 000000000..a8034bac7
--- /dev/null
+++ b/GenHub/GenHub/Features/Content/Services/Tools/ManagedChromiumRuntime.cs
@@ -0,0 +1,193 @@
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+using Microsoft.Playwright;
+
+namespace GenHub.Features.Content.Services.Tools;
+
+/// <summary>
+/// Owns the app-local Playwright Chromium runtime. Playwright's NuGet package supplies the
+/// driver but deliberately does not ship browser binaries, so GenHub provisions Chromium under
+/// its application-data directory instead of relying on a system browser installation.
+/// System Chrome/Edge cannot satisfy this requirement — Playwright needs its own patched build.
+/// </summary>
+internal sealed class ManagedChromiumRuntime(
+    string runtimeDirectory,
+    Func<string[], int> installer,
+    Func<string, Task<bool>> requestInstallConsentAsync,
+    ILogger logger)
+{
+    /// <summary>
+    /// Environment variable used by Playwright to locate app-owned browser binaries.
+    /// </summary>
+    internal const string BrowserPathEnvironmentVariable = "PLAYWRIGHT_BROWSERS_PATH";
+
+    /// <summary>
+    /// Environment variable used by Playwright to locate its driver binary (node.exe).
+    /// </summary>
+    internal const string DriverPathEnvironmentVariable = "PLAYWRIGHT_DRIVER_PATH";
+
+    /// <summary>
+    /// Configures Playwright to resolve browsers only from GenHub's managed runtime directory.
+    /// </summary>
+    public void ConfigureEnvironment()
+    {
+        Directory.CreateDirectory(runtimeDirectory);
+        Environment.SetEnvironmentVariable(BrowserPathEnvironmentVariable, runtimeDirectory);
+        EnsureDriverEnvironmentVariable();
+    }
+
+    /// <summary>
+    /// Installs Chromium exactly once when the app-owned executable is unavailable,
+    /// after the user confirms the download via the standard confirmation dialog.
+    /// </summary>
+    /// <param name="chromium">The Playwright Chromium browser type.</param>
+    /// <param name="cancellationToken">Cancellation token.</param>
+    /// <returns>A task representing the asynchronous provisioning operation.</returns>
+    /// <exception cref="OperationCanceledException">Thrown when the user declines installation.</exception>
+    /// <exception cref="InvalidOperationException">Thrown when Chromium could not be provisioned.</exception>
+    public async Task EnsureInstalledAsync(IBrowserType chromium, CancellationToken cancellationToken)
+    {
+        ConfigureEnvironment();
+
+        if (File.Exists(chromium.ExecutablePath))
+        {
+            return;
+        }
+
+        logger.LogInformation(
+            "Managed Chromium is missing. Requesting user consent before installing under {RuntimeDirectory}",
+            runtimeDirectory);
+
+        var consented = await requestInstallConsentAsync(runtimeDirectory);
+        cancellationToken.ThrowIfCancellationRequested();
+
+        if (!consented)
+        {
+            logger.LogInformation("User declined managed Chromium installation under {RuntimeDirectory}", runtimeDirectory);
+            throw new OperationCanceledException(
+                "ModDB requires GenHub's managed Chromium runtime. Installation was cancelled.");
+        }
+
+        logger.LogInformation("Managed Chromium install consented. Installing under {RuntimeDirectory}", runtimeDirectory);
+
+        int exitCode = 0;
+        try
+        {
+            exitCode = await Task.Run(
+                () =>
+                {
+                    cancellationToken.ThrowIfCancellationRequested();
+                    return installer(["install", "chromium"]);
+                },
+                cancellationToken);
+        }
+        catch (OperationCanceledException)
+        {
+            throw;
+        }
+        catch (Exception ex)
+        {
+            throw new InvalidOperationException(
+                "GenHub could not install its managed Chromium runtime. Check the network connection and try the ModDB action again.",
+                ex);
+        }
+
+        cancellationToken.ThrowIfCancellationRequested();
+        if (exitCode != 0 || !File.Exists(chromium.ExecutablePath))
+        {
+            throw new InvalidOperationException(
+                "GenHub could not install its managed Chromium runtime. Check the network connection and try the ModDB action again.");
+        }
+
+        logger.LogInformation("Managed Chromium installation completed in {RuntimeDirectory}", runtimeDirectory);
+    }
+
+    private static string GetPlatformFolder()
+    {
+        if (OperatingSystem.IsWindows())
+        {
+            return "win32_x64";
+        }
+
+        if (OperatingSystem.IsLinux())
+        {
+            return System.Runtime.InteropServices.RuntimeInformation.ProcessArchitecture == System.Runtime.InteropServices.Architecture.Arm64
+                ? "linux-arm64"
+                : "linux-x64";
+        }
+
+        if (OperatingSystem.IsMacOS())
+        {
+            return System.Runtime.InteropServices.RuntimeInformation.ProcessArchitecture == System.Runtime.InteropServices.Architecture.Arm64
+                ? "darwin-arm64"
+                : "darwin-x64";
+        }
+
+        return "win32_x64";
+    }
+
+    private static string? _cachedDriverPath;
+
+    private void EnsureDriverEnvironmentVariable()
+    {
+        if (!string.IsNullOrWhiteSpace(_cachedDriverPath) && File.Exists(_cachedDriverPath))
+        {
+            Environment.SetEnvironmentVariable(DriverPathEnvironmentVariable, _cachedDriverPath);
+            return;
+        }
+
+        var existingDriverPath = Environment.GetEnvironmentVariable(DriverPathEnvironmentVariable);
+        if (!string.IsNullOrWhiteSpace(existingDriverPath) && File.Exists(existingDriverPath))
+        {
+            _cachedDriverPath = existingDriverPath;
+            return;
+        }
+
+        var platformFolder = GetPlatformFolder();
+        var nodeBinaryName = OperatingSystem.IsWindows() ? "node.exe" : "node";
+
+        var searchDirectories = new[]
+        {
+            AppContext.BaseDirectory,
+            AppDomain.CurrentDomain.BaseDirectory,
+            Path.GetDirectoryName(typeof(ManagedChromiumRuntime).Assembly.Location) ?? string.Empty,
+            Path.GetDirectoryName(Environment.ProcessPath) ?? string.Empty,
+        };
+
+        foreach (var dir in searchDirectories)
+        {
+            if (string.IsNullOrWhiteSpace(dir) || !Directory.Exists(dir))
+            {
+                continue;
+            }
+
+            var candidate = Path.Combine(dir, ".playwright", "node", platformFolder, nodeBinaryName);
+            if (File.Exists(candidate))
+            {
+                _cachedDriverPath = candidate;
+                Environment.SetEnvironmentVariable(DriverPathEnvironmentVariable, candidate);
+                logger.LogInformation("Resolved Playwright driver path: {DriverPath}", candidate);
+                return;
+            }
+
+            var current = new DirectoryInfo(dir);
+            for (var depth = 0; depth < 4 && current?.Parent != null; depth++)
+            {
+                current = current.Parent;
+                candidate = Path.Combine(current.FullName, ".playwright", "node", platformFolder, nodeBinaryName);
+                if (File.Exists(candidate))
+                {
+                    _cachedDriverPath = candidate;
+                    Environment.SetEnvironmentVariable(DriverPathEnvironmentVariable, candidate);
+                    logger.LogInformation("Resolved Playwright driver path from parent directory: {DriverPath}", candidate);
+                    return;
+                }
+            }
+        }
+
+        logger.LogWarning("Could not resolve Playwright driver node executable in any standard directory");
+    }
+}
diff --git a/GenHub/GenHub/Features/Content/Services/Tools/PlaywrightService.cs b/GenHub/GenHub/Features/Content/Services/Tools/PlaywrightService.cs
new file mode 100644
index 000000000..b88b754bf
--- /dev/null
+++ b/GenHub/GenHub/Features/Content/Services/Tools/PlaywrightService.cs
@@ -0,0 +1,1372 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using AngleSharp;
+using AngleSharp.Dom;
+using Avalonia.Threading;
+using GenHub.Core.Constants;
+using GenHub.Core.Interfaces.Common;
+using GenHub.Core.Interfaces.Notifications;
+using GenHub.Core.Interfaces.Tools;
+using GenHub.Core.Models.Results;
+using Microsoft.Extensions.Logging;
+using Microsoft.Playwright;
+
+namespace GenHub.Features.Content.Services.Tools;
+
+/// <summary>
+/// Service for managing Playwright browser instances and fetching web content.
+/// Provides shared browser resources across the application.
+/// </summary>
+/// <remarks>
+/// Initializes a new instance of the <see cref="PlaywrightService"/> class.
+/// </remarks>
+/// <param name="logger">Logger instance.</param>
+/// <param name="configurationProvider">Application configuration provider.</param>
+/// <param name="dialogService">Dialog service used to confirm managed Chromium installation.</param>
+/// <param name="notificationService">Optional notifications shown before a headed browser window opens.</param>
+public class PlaywrightService(
+    ILogger<PlaywrightService> logger,
+    IConfigurationProviderService configurationProvider,
+    IDialogService dialogService,
+    INotificationService? notificationService = null) : IPlaywrightService, IDisposable, IAsyncDisposable
+{
+    private static readonly SemaphoreSlim _browserLock = new(1, 1);
+    private static readonly SemaphoreSlim _persistentLock = new(1, 1);
+    private static readonly SemaphoreSlim _playwrightLock = new(1, 1);
+
+    /// <summary>
+    /// Serializes all headed persistent-profile operations (single fetch, multi-URL sweep, ModDB
+    /// download).
+    /// </summary>
+    private static readonly SemaphoreSlim _persistentFetchLock = new(1, 1);
+    private static readonly AsyncLocal<bool> _isInPersistentSession = new();
+    private static readonly HashSet<IPage> _inUsePersistentPages = [];
+    private static readonly HashSet<string> UnsafeExtraHeaders = new(StringComparer.OrdinalIgnoreCase)
+    {
+        "Connection",
+        "Content-Length",
+        "Cookie",
+        "Host",
+        "Proxy-Connection",
+        "Transfer-Encoding",
+        "Upgrade",
+    };
+
+    private static IPlaywright? _playwright;
+    private static IBrowser? _browser;
+    private static IBrowserContext? _persistentContext;
+    private static string? _persistentProfileName;
+    private static int _activePersistentSessions;
+
+    private ManagedChromiumRuntime? managedChromiumRuntime;
+
+    private bool _disposed;
+
+    /// <inheritdoc />
+    public async Task<IPage> CreatePageAsync(BrowserNewContextOptions? options = null, CancellationToken cancellationToken = default)
+    {
+        await EnsurePlaywrightInitializedAsync(cancellationToken);
+
+        if (_browser == null)
+        {
+            throw new InvalidOperationException("Browser not initialized");
+        }
+
+        var contextOptions = options ?? new BrowserNewContextOptions
+        {
+            UserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36",
+            ViewportSize = new ViewportSize { Width = 1366, Height = 768 },
+            Locale = "en-US",
+        };
+
+        var context = await _browser.NewContextAsync(contextOptions);
+
+        try
+        {
+            return await context.NewPageAsync();
+        }
+        catch
+        {
+            try
+            {
+                await context.CloseAsync();
+            }
+            catch (PlaywrightException)
+            {
+            }
+
+            throw;
+        }
+    }
+
+    /// <inheritdoc />
+    public async Task<IPage> CreatePersistentPageAsync(string profileName, CancellationToken cancellationToken = default)
+    {
+        var profileDir = Path.Combine(
+            configurationProvider.GetApplicationDataPath(),
+            DirectoryNames.BrowserProfiles,
+            profileName);
+
+        // Closing the last page of a headed persistent context also terminates its browser process,
+        // leaving the cached _persistentContext pointing at a dead channel. Detect that up front so
+        // the first operation after a previous page-close relaunches the profile instead of throwing
+        // TargetClosedException deep inside EnsurePersistentContextAsync/NewPageAsync.
+        await EnsurePersistentContextAsync(profileDir, cancellationToken);
+
+        if (_persistentContext == null)
+        {
+            throw new InvalidOperationException("Persistent browser context not initialized");
+        }
+
+        return await CreatePersistentPageWithRecoveryAsync(profileDir, cancellationToken);
+    }
+
+    /// <inheritdoc />
+    public async Task ClosePersistentPageAsync(IPage page, bool keepOpen = false)
+    {
+        ArgumentNullException.ThrowIfNull(page);
+
+        if (keepOpen)
+        {
+            return;
+        }
+
+        await _persistentLock.WaitAsync();
+        try
+        {
+            _inUsePersistentPages.Remove(page);
+
+            if (_persistentContext != null && IsPersistentContextAlive())
+            {
+                try
+                {
+                    var otherPages = _persistentContext.Pages.Where(p => !p.IsClosed && p != page).ToList();
+
+                    if (_activePersistentSessions > 0)
+                    {
+                        // inside an active session: if this is the last page, navigate to about:blank
+                        // so chromium remains alive for subsequent steps within the session.
+                        if (otherPages.Count == 0 && _inUsePersistentPages.Count == 0)
+                        {
+                            if (!page.IsClosed)
+                            {
+                                try
+                                {
+                                    await page.GotoAsync("about:blank");
+                                }
+                                catch (PlaywrightException)
+                                {
+                                }
+                            }
+                        }
+                        else if (!page.IsClosed)
+                        {
+                            try
+                            {
+                                await page.CloseAsync();
+                            }
+                            catch (PlaywrightException ex)
+                            {
+                                logger.LogDebug(ex, "Persistent page already closed during cleanup.");
+                            }
+                        }
+                    }
+                    else
+                    {
+                        // outside an active session: close page and immediately shut down persistent context
+                        // once all active pages finish.
+                        if (!page.IsClosed)
+                        {
+                            try
+                            {
+                                await page.CloseAsync();
+                            }
+                            catch (PlaywrightException ex)
+                            {
+                                logger.LogDebug(ex, "Persistent page already closed during cleanup.");
+                            }
+                        }
+
+                        if (_inUsePersistentPages.Count == 0)
+                        {
+                            await ClosePersistentContextCoreUnderLockAsync();
+                        }
+                    }
+                }
+                catch (PlaywrightException ex) when (IsContextClosedError(ex))
+                {
+                    _inUsePersistentPages.Clear();
+                    _persistentContext = null;
+                    _persistentProfileName = null;
+                }
+                catch (Exception ex)
+                {
+                    logger.LogDebug(ex, "Failed to inspect persistent context after page close.");
+                    _inUsePersistentPages.Clear();
+                    _persistentContext = null;
+                    _persistentProfileName = null;
+                }
+            }
+            else
+            {
+                if (!page.IsClosed)
+                {
+                    try
+                    {
+                        await page.CloseAsync();
+                    }
+                    catch (PlaywrightException)
+                    {
+                    }
+                }
+            }
+        }
+        finally
+        {
+            _persistentLock.Release();
+        }
+    }
+
+    /// <inheritdoc />
+    public async Task<string> FetchHtmlAsync(string url, CancellationToken cancellationToken = default)
+    {
+        try
+        {
+            logger.LogDebug("Fetching HTML from {Url}", url);
+
+            var page = await CreatePageAsync(cancellationToken: cancellationToken);
+            try
+            {
+                await page.GotoAsync(url, new PageGotoOptions
+                {
+                    Timeout = 30000,
+                    WaitUntil = WaitUntilState.DOMContentLoaded,
+                });
+
+                // Wait a bit for dynamic content to load
+                await Task.Delay(500, cancellationToken);
+
+                return await page.ContentAsync();
+            }
+            finally
+            {
+                var context = page.Context;
+                try
+                {
+                    await page.CloseAsync();
+                }
+                finally
+                {
+                    if (context != null)
+                    {
+                        await context.CloseAsync();
+                    }
+                }
+            }
+        }
+        catch (Exception ex)
+        {
+            logger.LogError(ex, "Failed to fetch HTML from {Url}", url);
+            throw;
+        }
+    }
+
+    /// <inheritdoc />
+    public async Task<IDocument> FetchAndParseAsync(string url, CancellationToken cancellationToken = default)
+    {
+        var html = await FetchHtmlAsync(url, cancellationToken);
+        var browsingContext = BrowsingContext.New(Configuration.Default);
+        return await browsingContext.OpenAsync(req => req.Content(html), cancellationToken);
+    }
+
+    /// <inheritdoc />
+    public async Task<IDocument> FetchAndParsePersistentAsync(string profileName, string url, CancellationToken cancellationToken = default)
+    {
+        var html = await FetchPersistentHtmlAsync(profileName, url, cancellationToken);
+        return await OpenDocumentAsync(html, cancellationToken);
+    }
+
+    /// <summary>
+    /// Executes an operation within a scoped persistent browser context session.
+    /// </summary>
+    /// <typeparam name="T">The return type of the operation.</typeparam>
+    /// <param name="profileName">The on-disk profile name.</param>
+    /// <param name="operation">The asynchronous operation to execute.</param>
+    /// <param name="cancellationToken">Cancellation token.</param>
+    /// <returns>The result of the operation.</returns>
+    public async Task<T> ExecuteInPersistentContextAsync<T>(
+        string profileName,
+        Func<Task<T>> operation,
+        CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(operation);
+
+        var profileDir = Path.Combine(
+            configurationProvider.GetApplicationDataPath(),
+            DirectoryNames.BrowserProfiles,
+            profileName);
+
+        var isOuterSession = !_isInPersistentSession.Value;
+        if (isOuterSession)
+        {
+            await _persistentFetchLock.WaitAsync(cancellationToken);
+            _isInPersistentSession.Value = true;
+        }
+
+        try
+        {
+            Interlocked.Increment(ref _activePersistentSessions);
+            try
+            {
+                await EnsurePersistentContextAsync(profileDir, cancellationToken);
+                return await operation();
+            }
+            finally
+            {
+                if (Interlocked.Decrement(ref _activePersistentSessions) == 0)
+                {
+                    await ClosePersistentContextCoreAsync();
+                }
+            }
+        }
+        finally
+        {
+            if (isOuterSession)
+            {
+                _isInPersistentSession.Value = false;
+                _persistentFetchLock.Release();
+            }
+        }
+    }
+
+    /// <inheritdoc />
+    public async Task<IReadOnlyDictionary<string, IDocument>> FetchAndParsePersistentManyAsync(
+        string profileName,
+        IReadOnlyList<string> urls,
+        CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(urls);
+
+        var results = new Dictionary<string, IDocument>(StringComparer.Ordinal);
+        if (urls.Count == 0)
+        {
+            return results;
+        }
+
+        // Preserve caller order while skipping duplicate URLs (section sweeps sometimes repeat a path).
+        var orderedUnique = new List<string>(urls.Count);
+        var seen = new HashSet<string>(StringComparer.Ordinal);
+        foreach (var url in urls)
+        {
+            if (string.IsNullOrWhiteSpace(url) || !seen.Add(url))
+            {
+                continue;
+            }
+
+            orderedUnique.Add(url);
+        }
+
+        if (orderedUnique.Count == 0)
+        {
+            return results;
+        }
+
+        var isOuterSession = !_isInPersistentSession.Value;
+        if (isOuterSession)
+        {
+            await _persistentFetchLock.WaitAsync(cancellationToken);
+            _isInPersistentSession.Value = true;
+        }
+
+        try
+        {
+            logger.LogDebug(
+                "Fetching {Count} URL(s) in parallel on persistent context (profile '{Profile}')",
+                orderedUnique.Count,
+                profileName);
+
+            var profileDir = Path.Combine(
+                configurationProvider.GetApplicationDataPath(),
+                DirectoryNames.BrowserProfiles,
+                profileName);
+
+            await EnsurePersistentContextAsync(profileDir, cancellationToken);
+            if (_persistentContext == null)
+            {
+                throw new InvalidOperationException("Persistent browser context not initialized");
+            }
+
+            var concurrentResults = new System.Collections.Concurrent.ConcurrentDictionary<string, IDocument>(StringComparer.Ordinal);
+
+            // Limit parallel tabs to avoid overwhelming system resources (max 5 parallel tabs)
+            using var tabSemaphore = new SemaphoreSlim(Math.Min(orderedUnique.Count, 5));
+
+            var tasks = orderedUnique.Select(async url =>
+            {
+                await tabSemaphore.WaitAsync(cancellationToken);
+                IPage? page = null;
+                try
+                {
+                    cancellationToken.ThrowIfCancellationRequested();
+
+                    page = await CreatePersistentPageAsync(profileName, cancellationToken);
+
+                    var html = await NavigatePersistentPageAsync(page, url, cancellationToken);
+                    var doc = await OpenDocumentAsync(html, cancellationToken);
+                    concurrentResults[url] = doc;
+                }
+                catch (Exception ex) when (ex is not OperationCanceledException)
+                {
+                    // Soft-fail per URL so one dead section does not abort the rest of the sweep.
+                    logger.LogWarning(ex, "Failed to fetch persistent URL in parallel batch: {Url}", url);
+                }
+                finally
+                {
+                    if (page != null)
+                    {
+                        await ClosePersistentPageAsync(page);
+                    }
+
+                    tabSemaphore.Release();
+                }
+            });
+
+            await Task.WhenAll(tasks);
+
+            foreach (var kvp in concurrentResults)
+            {
+                results[kvp.Key] = kvp.Value;
+            }
+        }
+        finally
+        {
+            if (isOuterSession)
+            {
+                if (_activePersistentSessions == 0 && _inUsePersistentPages.Count == 0)
+                {
+                    await ClosePersistentContextCoreAsync();
+                }
+
+                _isInPersistentSession.Value = false;
+                _persistentFetchLock.Release();
+            }
+        }
+
+        return results;
+    }
+
+    /// <inheritdoc />
+    public async Task WarmupAsync(CancellationToken cancellationToken = default)
+    {
+        try
+        {
+            await EnsureManagedPlaywrightAsync(cancellationToken);
+        }
+        catch (Exception ex) when (ex is not OperationCanceledException)
+        {
+            logger.LogDebug(ex, "Background Playwright warmup did not complete.");
+        }
+    }
+
+    /// <inheritdoc />
+    public void Dispose()
+    {
+        if (_disposed)
+        {
+            return;
+        }
+
+        Task.Run(() => DisposeAsync().AsTask()).GetAwaiter().GetResult();
+    }
+
+    /// <inheritdoc />
+    public async ValueTask DisposeAsync()
+    {
+        if (_disposed)
+        {
+            return;
+        }
+
+        if (_persistentContext != null)
+        {
+            try
+            {
+                await _persistentContext.CloseAsync();
+            }
+            catch
+            {
+            }
+            finally
+            {
+                _inUsePersistentPages.Clear();
+                _persistentContext = null;
+                _persistentProfileName = null;
+            }
+        }
+
+        if (_browser != null)
+        {
+            await _browser.CloseAsync();
+            _browser = null;
+        }
+
+        if (_playwright != null)
+        {
+            _playwright.Dispose();
+            _playwright = null;
+        }
+
+        _disposed = true;
+    }
+
+    /// <inheritdoc />
+    public async Task<DownloadResult> DownloadFileAsync(GenHub.Core.Models.Common.DownloadConfiguration configuration, CancellationToken cancellationToken = default)
+    {
+        try
+        {
+            logger.LogInformation("Starting Playwright download from {Url}", configuration.Url);
+            var stopwatch = System.Diagnostics.Stopwatch.StartNew();
+
+            var usePersistentModDbProfile = configuration.Url.Host.Equals("moddb.com", StringComparison.OrdinalIgnoreCase) ||
+                                            configuration.Url.Host.EndsWith(".moddb.com", StringComparison.OrdinalIgnoreCase);
+
+            // Headed ModDB profile is shared with FetchPersistentHtmlAsync / multi-URL sweeps —
+            // serialize so a download cannot relaunch Chromium while a section page is mid-Goto.
+            var isOuterSession = usePersistentModDbProfile && !_isInPersistentSession.Value;
+            if (isOuterSession)
+            {
+                await _persistentFetchLock.WaitAsync(cancellationToken);
+                _isInPersistentSession.Value = true;
+            }
+
+            try
+            {
+                return await DownloadFileCoreAsync(configuration, usePersistentModDbProfile, stopwatch, cancellationToken);
+            }
+            finally
+            {
+                if (isOuterSession)
+                {
+                    if (_activePersistentSessions == 0 && _inUsePersistentPages.Count == 0)
+                    {
+                        await ClosePersistentContextCoreAsync();
+                    }
+
+                    _isInPersistentSession.Value = false;
+                    _persistentFetchLock.Release();
+                }
+            }
+        }
+        catch (Exception ex)
+        {
+            logger.LogError(ex, "Playwright download failed for {Url}", configuration.Url);
+            var message = ex.Message.Contains("Executable doesn't exist", StringComparison.OrdinalIgnoreCase)
+                ? "The bundled Chromium runtime is unavailable. Install the application browser runtime and retry the ModDB download."
+                : ex.Message;
+            return DownloadResult.CreateFailure(message, bytesDownloaded: 0, elapsed: TimeSpan.Zero);
+        }
+    }
+
+    /// <summary>
+    /// Builds browser-safe request headers from a download configuration. Headers which Chromium
+    /// owns itself are ignored, while site-required headers such as <c>Referer</c> are preserved.
+    /// </summary>
+    /// <param name="configuration">Download configuration containing optional request headers.</param>
+    /// <returns>Headers safe to apply to a Playwright page.</returns>
+    internal static IReadOnlyDictionary<string, string> BuildSafeDownloadHeaders(
+        GenHub.Core.Models.Common.DownloadConfiguration configuration)
+    {
+        ArgumentNullException.ThrowIfNull(configuration);
+
+        Dictionary<string, string> headers = new(StringComparer.OrdinalIgnoreCase);
+        foreach (var (name, value) in configuration.Headers)
+        {
+            if (string.IsNullOrWhiteSpace(name) || string.IsNullOrWhiteSpace(value) || UnsafeExtraHeaders.Contains(name))
+            {
+                continue;
+            }
+
+            headers[name] = value;
+        }
+
+        if (!string.IsNullOrWhiteSpace(configuration.UserAgent) && !headers.ContainsKey("User-Agent"))
+        {
+            headers["User-Agent"] = configuration.UserAgent;
+        }
+
+        return headers;
+    }
+
+    /// <summary>
+    /// Determines whether a Playwright exception represents a transient navigation or closed-target
+    /// condition that a polling loop can safely retry (Cloudflare interstitial redirecting to the
+    /// real document, a frame detaching mid-probe, or the persistent context dying between pages).
+    /// Shared with <see cref="ContentDiscoverers.ModDBDiscoverer"/> for its listing-wait loop.
+    /// </summary>
+    /// <param name="ex">The Playwright exception to classify.</param>
+    /// <returns><see langword="true"/> if the caller should retry rather than propagate.</returns>
+    internal static bool IsContextClosedError(PlaywrightException ex) =>
+        ex.Message.Contains("Target page, context or browser has been closed", StringComparison.OrdinalIgnoreCase) ||
+        ex.Message.Contains("Browser has been closed", StringComparison.OrdinalIgnoreCase) ||
+        ex.Message.Contains("Target closed", StringComparison.OrdinalIgnoreCase) ||
+        ex.Message.Contains("Execution context was destroyed", StringComparison.OrdinalIgnoreCase) ||
+        ex.Message.Contains("Target frame was detached", StringComparison.OrdinalIgnoreCase) ||
+        ex.Message.Contains("Target.createTarget", StringComparison.OrdinalIgnoreCase);
+
+    /// <summary>
+    /// A persistent context is only reusable while it is live and still owns at least one open
+    /// page. A headed Chromium process exits once its final page closes, after which the cached
+    /// IBrowserContext reference throws on every call. Touching <see cref="IBrowserContext.Pages"/>
+    /// is the cheapest probe: it fails on a dead channel and succeeds on a live one.
+    /// </summary>
+    private static bool IsPersistentContextAlive()
+    {
+        if (_persistentContext == null)
+        {
+            return false;
+        }
+
+        try
+        {
+            // Any property/method round-trip to the dead channel raises TargetClosedException.
+            _ = _persistentContext.Pages;
+            return true;
+        }
+        catch (PlaywrightException ex) when (IsContextClosedError(ex))
+        {
+            return false;
+        }
+    }
+
+    private static bool IsBlankStartupUrl(string url) =>
+        string.IsNullOrWhiteSpace(url) ||
+        url.Equals("about:blank", StringComparison.OrdinalIgnoreCase) ||
+        url.StartsWith("chrome://newtab", StringComparison.OrdinalIgnoreCase) ||
+        url.StartsWith("chrome://new-tab", StringComparison.OrdinalIgnoreCase);
+
+    /// <summary>
+    /// Clears a closed persistent browser context so the next request launches a fresh one.
+    /// </summary>
+    private static async Task InvalidatePersistentContextAsync()
+    {
+        await _persistentLock.WaitAsync();
+        try
+        {
+            _inUsePersistentPages.Clear();
+            _persistentContext = null;
+            _persistentProfileName = null;
+        }
+        finally
+        {
+            _persistentLock.Release();
+        }
+    }
+
+    /// <summary>
+    /// Closes the persistent browser context when called under _persistentLock.
+    /// </summary>
+    private static async Task ClosePersistentContextCoreUnderLockAsync()
+    {
+        if (_persistentContext != null)
+        {
+            try
+            {
+                var nonClosedPages = _persistentContext.Pages.Where(p => !p.IsClosed).ToList();
+                foreach (var page in nonClosedPages)
+                {
+                    try
+                    {
+                        await page.CloseAsync();
+                    }
+                    catch (PlaywrightException)
+                    {
+                    }
+                }
+
+                await _persistentContext.CloseAsync();
+            }
+            catch (PlaywrightException)
+            {
+            }
+            finally
+            {
+                _inUsePersistentPages.Clear();
+                _persistentContext = null;
+                _persistentProfileName = null;
+            }
+        }
+    }
+
+    /// <summary>
+    /// Closes the persistent browser context and acquires _persistentLock.
+    /// </summary>
+    private static async Task ClosePersistentContextCoreAsync()
+    {
+        await _persistentLock.WaitAsync();
+        try
+        {
+            await ClosePersistentContextCoreUnderLockAsync();
+        }
+        finally
+        {
+            _persistentLock.Release();
+        }
+    }
+
+    private static bool IsModDbVerificationPage(string? title) =>
+        !string.IsNullOrWhiteSpace(title) &&
+        (title.Contains("Just a moment", StringComparison.OrdinalIgnoreCase) ||
+         title.Contains("Attention Required", StringComparison.OrdinalIgnoreCase) ||
+         title.Contains("Checking your browser", StringComparison.OrdinalIgnoreCase) ||
+         title.Contains("Verify you are human", StringComparison.OrdinalIgnoreCase) ||
+         title.Contains("Cloudflare", StringComparison.OrdinalIgnoreCase));
+
+    private static async Task<IDocument> OpenDocumentAsync(string html, CancellationToken cancellationToken)
+    {
+        var browsingContext = BrowsingContext.New(Configuration.Default);
+        return await browsingContext.OpenAsync(req => req.Content(html), cancellationToken);
+    }
+
+    private async Task<DownloadResult> DownloadFileCoreAsync(
+        GenHub.Core.Models.Common.DownloadConfiguration configuration,
+        bool usePersistentModDbProfile,
+        System.Diagnostics.Stopwatch stopwatch,
+        CancellationToken cancellationToken)
+    {
+        var page = usePersistentModDbProfile
+            ? await CreatePersistentPageAsync(ModDBConstants.BrowserProfileName, cancellationToken)
+            : await CreatePageAsync(cancellationToken: cancellationToken);
+
+        List<IPage> popups = [];
+        var downloadTcs = new TaskCompletionSource<IDownload>(TaskCreationOptions.RunContinuationsAsynchronously);
+
+        void OnDownload(object? sender, IDownload download) => downloadTcs.TrySetResult(download);
+        void OnPopup(object? sender, IPage popup)
+        {
+            popups.Add(popup);
+            popup.Download += OnDownload;
+        }
+
+        try
+        {
+            var requestHeaders = BuildSafeDownloadHeaders(configuration);
+            if (requestHeaders.Count > 0)
+            {
+                await page.SetExtraHTTPHeadersAsync(requestHeaders);
+            }
+
+            if (usePersistentModDbProfile)
+            {
+                logger.LogInformation("Using persistent ModDB browser profile for protected download {Url}", configuration.Url);
+                NotifyBrowserWindowOpening(
+                    "ModDB download starting",
+                    "A browser window is opening to download this file. Wait for the download to finish and do not click anything in that window.");
+            }
+
+            // ModDB frequently hands the actual binary off to a new tab/popup rather than the page
+            // that performed the navigation. A page-level Download handler therefore misses the
+            // event and the wait times out, surfacing as a download that "never completes". The
+            // context-level handler catches downloads started in ANY page of the persistent context,
+            // which is what actually fires for ModDB's popup-style mirrors.
+            page.Download += OnDownload;
+            page.Popup += OnPopup;
+
+            // Trigger the download by navigating to the URL.
+            await page.GotoAsync(configuration.Url.ToString(), new PageGotoOptions
+            {
+                Timeout = (float)configuration.Timeout.TotalMilliseconds,
+                WaitUntil = WaitUntilState.DOMContentLoaded,
+            });
+
+            // Race the download TCS against a short delay to check if it auto-started. If not,
+            // try to click a fallback download link on the page (mirrors, manual Download btn).
+            var waitTask = Task.Delay(5000, cancellationToken);
+            var completedTask = await Task.WhenAny(downloadTcs.Task, waitTask);
+
+            if (completedTask != downloadTcs.Task)
+            {
+                logger.LogInformation("Download did not start automatically within 5s. Attempting to find fallback link...");
+
+                const string FallbackSelector = "a[href*='media.moddb.com'], a[href*='files.moddb.com'], a:has-text('click here'), a:has-text('Click here'), a:has-text('here'), a#download, a.download, a.btn-download, a.buttondownload, a[href*='/mirror/'], a[href*='/downloads/start/'], a[href*='/addons/start/'], a:has-text('Download Now'), a:has-text('download now'), a:has-text('Download'), a:has-text('download'), a:has-text('mirror')";
+
+                var fallbackLink = await page.QuerySelectorAsync(FallbackSelector);
+
+                if (fallbackLink != null)
+                {
+                    var text = await fallbackLink.InnerTextAsync();
+                    logger.LogInformation("Found fallback link '{Text}', clicking...", text);
+                    try
+                    {
+                        await fallbackLink.ClickAsync(new ElementHandleClickOptions { Timeout = 5000 });
+
+                        // If clicking navigated to a /start/ page, wait briefly and check for direct mirror link
+                        var secondWait = Task.Delay(4000, cancellationToken);
+                        var secondCompleted = await Task.WhenAny(downloadTcs.Task, secondWait);
+                        if (secondCompleted != downloadTcs.Task && !string.IsNullOrWhiteSpace(page.Url) && page.Url.Contains("/start/", StringComparison.OrdinalIgnoreCase))
+                        {
+                            var startPageFallback = await page.QuerySelectorAsync("a:has-text('click here'), a:has-text('Click here'), a[href*='media.moddb.com'], a[href*='files.moddb.com'], a[href*='/mirror/']");
+                            if (startPageFallback != null)
+                            {
+                                var startText = await startPageFallback.InnerTextAsync();
+                                logger.LogInformation("Found start-page mirror link '{Text}', clicking...", startText);
+                                await startPageFallback.ClickAsync(new ElementHandleClickOptions { Timeout = 5000 });
+                            }
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        logger.LogWarning(ex, "Failed to click fallback link.");
+                    }
+                }
+                else
+                {
+                    logger.LogWarning("No fallback download link found. Continuing to wait for download event...");
+                }
+            }
+
+            // Wait for the download to START (not finish) with a generous timeout. ModDB's
+            // redirect chain plus Cloudflare can take a while before the binary begins streaming.
+            var waitTimeout = TimeSpan.FromMilliseconds(Math.Max(60000, configuration.Timeout.TotalMilliseconds));
+            var download = await downloadTcs.Task.WaitAsync(waitTimeout, cancellationToken);
+
+            if (download == null)
+            {
+                return DownloadResult.CreateFailure("Download failed to initialize (null download object).");
+            }
+
+            if (File.Exists(configuration.DestinationPath) && configuration.OverwriteExisting)
+            {
+                File.Delete(configuration.DestinationPath);
+            }
+
+            var dir = Path.GetDirectoryName(configuration.DestinationPath);
+            if (!string.IsNullOrEmpty(dir) && !Directory.Exists(dir))
+            {
+                Directory.CreateDirectory(dir);
+            }
+
+            // Wait for the full byte stream to land on disk before reporting success. SaveAsAsync
+            // streams the download into the destination; without awaiting it the file would be
+            // incomplete (or missing) and downstream extraction would fail.
+            await download.SaveAsAsync(configuration.DestinationPath);
+
+            var fileInfo = new FileInfo(configuration.DestinationPath);
+            logger.LogInformation("Playwright download completed: {Path}, Size: {Size}", configuration.DestinationPath, fileInfo.Length);
+
+            return DownloadResult.CreateSuccess(
+                configuration.DestinationPath,
+                fileInfo.Length,
+                stopwatch.Elapsed,
+                hashVerified: false);
+        }
+        finally
+        {
+            page.Popup -= OnPopup;
+            page.Download -= OnDownload;
+            foreach (var popup in popups)
+            {
+                popup.Download -= OnDownload;
+                if (!popup.IsClosed)
+                {
+                    try
+                    {
+                        await popup.CloseAsync();
+                    }
+                    catch (PlaywrightException ex)
+                    {
+                        logger.LogDebug(ex, "Popup already closed during download cleanup.");
+                    }
+                }
+            }
+
+            if (usePersistentModDbProfile)
+            {
+                await ClosePersistentPageAsync(page);
+            }
+            else
+            {
+                var context = page.Context;
+                try
+                {
+                    if (!page.IsClosed)
+                    {
+                        await page.CloseAsync();
+                    }
+                }
+                finally
+                {
+                    if (context != null)
+                    {
+                        try
+                        {
+                            await context.CloseAsync();
+                        }
+                        catch (PlaywrightException ex)
+                        {
+                            logger.LogDebug(ex, "Context already closed during download cleanup.");
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    /// <summary>
+    /// Ensures Playwright is initialized with a browser instance.
+    /// </summary>
+    private async Task EnsurePlaywrightInitializedAsync(CancellationToken cancellationToken)
+    {
+        if (_browser != null) return;
+
+        await _browserLock.WaitAsync(cancellationToken);
+        try
+        {
+            if (_browser != null) return;
+
+            await EnsureManagedPlaywrightAsync(cancellationToken);
+            _browser = await _playwright!.Chromium.LaunchAsync(new BrowserTypeLaunchOptions
+            {
+                // The shared browser is headless for ordinary parsing/fetching. Bot-protected
+                // sites that need a visible window use the persistent context instead.
+                Headless = true,
+                Args =
+                [
+                    "--disable-blink-features=AutomationControlled",
+                    "--disable-dev-shm-usage",
+                    "--no-default-browser-check",
+                    "--no-first-run",
+                    "--disable-background-networking",
+                    "--disable-component-update",
+                    "--disable-sync",
+                ],
+            });
+        }
+        finally
+        {
+            _browserLock.Release();
+        }
+    }
+
+    /// <summary>
+    /// Lazily creates (or reuses) a persistent, headed browser context for the given profile path.
+    /// Cookies and storage are written to disk, so a Cloudflare clearance cookie obtained via a
+    /// single manual challenge solve is reused for every subsequent page in the profile — across
+    /// pages and across app restarts until it expires.
+    /// </summary>
+    /// <param name="profileDir">Absolute on-disk directory for the persistent profile.</param>
+    /// <param name="cancellationToken">Cancellation token.</param>
+    /// <returns>A task representing the asynchronous operation.</returns>
+    private async Task EnsurePersistentContextAsync(string profileDir, CancellationToken cancellationToken)
+    {
+        if (IsPersistentContextAlive() && string.Equals(_persistentProfileName, profileDir, StringComparison.Ordinal))
+        {
+            return;
+        }
+
+        await _persistentLock.WaitAsync(cancellationToken);
+        try
+        {
+            // Re-check under the lock: another caller may have just recreated the context. Also
+            // drop a cached-but-dead context so the relaunch below actually runs.
+            if (!IsPersistentContextAlive())
+            {
+                _inUsePersistentPages.Clear();
+                _persistentContext = null;
+                _persistentProfileName = null;
+            }
+            else if (string.Equals(_persistentProfileName, profileDir, StringComparison.Ordinal))
+            {
+                return;
+            }
+            else if (_persistentContext != null)
+            {
+                await ClosePersistentContextCoreUnderLockAsync();
+            }
+
+            await EnsureManagedPlaywrightAsync(cancellationToken);
+            Directory.CreateDirectory(profileDir);
+
+            var context = await _playwright!.Chromium.LaunchPersistentContextAsync(
+                profileDir,
+                new BrowserTypeLaunchPersistentContextOptions
+                {
+                    Headless = false,
+                    Args =
+                    [
+                        "--disable-blink-features=AutomationControlled",
+                        "--disable-dev-shm-usage",
+                        "--no-default-browser-check",
+                        "--no-first-run",
+                        "--disable-background-networking",
+                        "--disable-background-timer-throttling",
+                        "--disable-backgrounding-occluded-windows",
+                        "--disable-breakpad",
+                        "--disable-component-update",
+                        "--disable-domain-reliability",
+                        "--disable-features=Translate,OptimizationHints,MediaRouter,DialMediaRouteProvider",
+                        "--disable-ipc-flooding-protection",
+                        "--disable-renderer-backgrounding",
+                        "--disable-sync",
+                        "--metrics-recording-only",
+                        "--no-pings",
+                        "--password-store=basic",
+                        "--use-mock-keychain",
+                    ],
+                    UserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36",
+                    ViewportSize = new ViewportSize { Width = 1366, Height = 768 },
+                    Locale = "en-US",
+                    IgnoreDefaultArgs = ["--enable-automation"],
+                });
+
+            var ctx = context;
+            context.Close += (_, _) =>
+            {
+                if (ReferenceEquals(_persistentContext, ctx))
+                {
+                    _inUsePersistentPages.Clear();
+                    _persistentContext = null;
+                    _persistentProfileName = null;
+                }
+            };
+
+            _persistentContext = context;
+            _persistentProfileName = profileDir;
+        }
+        finally
+        {
+            _persistentLock.Release();
+        }
+    }
+
+    /// <summary>
+    /// Opens a new page in the persistent context, recovering once if the cached context or its
+    /// browser process has died (the headed Chromium exits when its last page closes). The recovery
+    /// recreates the profile — the Cloudflare clearance cookie persists on disk, so the user does
+    /// not need to re-solve any challenge.
+    /// </summary>
+    private async Task<IPage> CreatePersistentPageWithRecoveryAsync(string profileDir, CancellationToken cancellationToken)
+    {
+        IPage page = null!;
+        try
+        {
+            await _persistentLock.WaitAsync(cancellationToken);
+            try
+            {
+                page = await GetOrCreatePersistentPageCoreAsync();
+            }
+            finally
+            {
+                _persistentLock.Release();
+            }
+        }
+        catch (PlaywrightException ex) when (IsContextClosedError(ex))
+        {
+            logger.LogInformation("Persistent browser context was closed; recreating profile {ProfileName}", Path.GetFileName(profileDir));
+            await InvalidatePersistentContextAsync();
+            await EnsurePersistentContextAsync(profileDir, cancellationToken);
+
+            if (_persistentContext == null)
+            {
+                throw new InvalidOperationException("Persistent browser context could not be recreated");
+            }
+
+            await _persistentLock.WaitAsync(cancellationToken);
+            try
+            {
+                page = await GetOrCreatePersistentPageCoreAsync();
+            }
+            finally
+            {
+                _persistentLock.Release();
+            }
+        }
+
+        return page;
+    }
+
+    private async Task<IPage> GetOrCreatePersistentPageCoreAsync()
+    {
+        if (_persistentContext == null)
+        {
+            throw new InvalidOperationException("Persistent browser context not initialized");
+        }
+
+        foreach (var existing in _persistentContext.Pages)
+        {
+            if (!existing.IsClosed && IsBlankStartupUrl(existing.Url) && !_inUsePersistentPages.Contains(existing))
+            {
+                _inUsePersistentPages.Add(existing);
+                await CloseOrphanStartupPagesAsync(existing);
+                return existing;
+            }
+        }
+
+        var newPage = await _persistentContext.NewPageAsync();
+        _inUsePersistentPages.Add(newPage);
+        await CloseOrphanStartupPagesAsync(newPage);
+        return newPage;
+    }
+
+    /// <summary>
+    /// Manages pre-existing blank pages opened at persistent-context launch.
+    /// Closes startup blank tabs so about:blank does not linger on screen after operations complete.
+    /// </summary>
+    private async Task CloseOrphanStartupPagesAsync(IPage keepPage)
+    {
+        if (_persistentContext == null)
+        {
+            return;
+        }
+
+        List<IPage> pages = [];
+        try
+        {
+            pages = [.. _persistentContext.Pages];
+        }
+        catch (PlaywrightException ex) when (IsContextClosedError(ex))
+        {
+            logger.LogDebug(ex, "Persistent context closed while collecting orphan startup pages.");
+            return;
+        }
+
+        var blankPages = new List<IPage>();
+        foreach (var existing in pages)
+        {
+            if (existing == keepPage || existing.IsClosed || _inUsePersistentPages.Contains(existing))
+            {
+                continue;
+            }
+
+            string url = string.Empty;
+            try
+            {
+                url = existing.Url ?? string.Empty;
+            }
+            catch (PlaywrightException ex) when (IsContextClosedError(ex))
+            {
+                continue;
+            }
+
+            if (IsBlankStartupUrl(url))
+            {
+                blankPages.Add(existing);
+            }
+        }
+
+        // Close all orphan blank pages.
+        foreach (var blankPage in blankPages)
+        {
+            try
+            {
+                await blankPage.CloseAsync();
+            }
+            catch (PlaywrightException ex)
+            {
+                logger.LogDebug(ex, "Could not close orphan startup page; it may have closed already.");
+            }
+        }
+    }
+
+    /// <summary>
+    /// Keeps Playwright's browser lookup app-owned, then installs Chromium only for a clean
+    /// runtime directory. This is shared by the headed ModDB profile and headless parsing.
+    /// </summary>
+    /// <param name="cancellationToken">Cancellation token.</param>
+    /// <returns>A task representing the browser runtime initialization.</returns>
+    private async Task EnsureManagedPlaywrightAsync(CancellationToken cancellationToken)
+    {
+        await _playwrightLock.WaitAsync(cancellationToken);
+        try
+        {
+            var runtime = GetOrCreateManagedChromiumRuntime();
+            runtime.ConfigureEnvironment();
+            _playwright ??= await Playwright.CreateAsync();
+            await runtime.EnsureInstalledAsync(_playwright.Chromium, cancellationToken);
+        }
+        finally
+        {
+            _playwrightLock.Release();
+        }
+    }
+
+    private ManagedChromiumRuntime GetOrCreateManagedChromiumRuntime()
+    {
+        return managedChromiumRuntime ??= new ManagedChromiumRuntime(
+            Path.Combine(configurationProvider.GetApplicationDataPath(), DirectoryNames.BrowserRuntime),
+            Microsoft.Playwright.Program.Main,
+            RequestManagedChromiumInstallConsentAsync,
+            logger);
+    }
+
+    /// <summary>
+    /// Asks the user (via the same confirmation dialog used for profile deletion) whether to
+    /// download GenHub's managed Playwright Chromium runtime for ModDB. System Chrome/Edge is
+    /// not used — Playwright requires its own patched build under the app data directory.
+    /// </summary>
+    private async Task<bool> RequestManagedChromiumInstallConsentAsync(string runtimeDirectory)
+    {
+        var message =
+            "ModDB requires GenHub's managed Chromium runtime (Playwright). " +
+            "This is separate from any Chrome or Edge browser already installed on your PC — those cannot be used.\n\n" +
+            "What will be installed (~240 MB download):\n" +
+            "• Playwright Chromium browser\n" +
+            "• Chromium Headless Shell\n" +
+            "• FFmpeg and Windows helper binaries\n\n" +
+            $"Install location:\n{runtimeDirectory}";
+
+        async Task<bool> ShowAsync() =>
+            await dialogService.ShowConfirmationAsync(
+                "Install Chromium Runtime for ModDB",
+                message,
+                confirmText: "Install",
+                cancelText: "Cancel");
+
+        if (Dispatcher.UIThread.CheckAccess())
+        {
+            return await ShowAsync();
+        }
+
+        return await Dispatcher.UIThread.InvokeAsync(ShowAsync);
+    }
+
+    /// <summary>
+    /// Fetches HTML in the persistent headed context, reusing the on-disk Cloudflare clearance
+    /// cookie so bot-protected pages load without another manual challenge.
+    /// </summary>
+    /// <param name="profileName">The on-disk profile name.</param>
+    /// <param name="url">The URL to fetch.</param>
+    /// <param name="cancellationToken">Cancellation token.</param>
+    /// <returns>The page HTML.</returns>
+    private async Task<string> FetchPersistentHtmlAsync(string profileName, string url, CancellationToken cancellationToken)
+    {
+        logger.LogDebug("Fetching HTML (persistent profile '{Profile}') from {Url}", profileName, url);
+
+        var isOuterSession = !_isInPersistentSession.Value;
+        if (isOuterSession)
+        {
+            await _persistentFetchLock.WaitAsync(cancellationToken);
+            _isInPersistentSession.Value = true;
+        }
+
+        try
+        {
+            var page = await CreatePersistentPageAsync(profileName, cancellationToken);
+            try
+            {
+                return await NavigatePersistentPageAsync(page, url, cancellationToken);
+            }
+            finally
+            {
+                await ClosePersistentPageAsync(page);
+            }
+        }
+        finally
+        {
+            if (isOuterSession)
+            {
+                _isInPersistentSession.Value = false;
+                _persistentFetchLock.Release();
+            }
+        }
+    }
+
+    /// <summary>
+    /// Navigates an already-open persistent page and returns its HTML after ModDB (or generic)
+    /// content is ready. Does not open or close the page — callers own the page lifetime.
+    /// </summary>
+    private async Task<string> NavigatePersistentPageAsync(IPage page, string url, CancellationToken cancellationToken)
+    {
+        await page.GotoAsync(url, new PageGotoOptions
+        {
+            Timeout = ModDBConstants.DefaultGotoTimeout,
+            WaitUntil = WaitUntilState.DOMContentLoaded,
+        });
+
+        if (url.Contains("moddb.com", StringComparison.OrdinalIgnoreCase))
+        {
+            await WaitForModDbContentAsync(page, url, cancellationToken);
+        }
+        else
+        {
+            await Task.Delay(500, cancellationToken);
+        }
+
+        return await page.ContentAsync();
+    }
+
+    private void NotifyBrowserWindowOpening(string title, string message)
+    {
+        try
+        {
+            notificationService?.ShowInfo(title, message, NotificationDurations.VeryLong);
+        }
+        catch (Exception ex)
+        {
+            logger.LogDebug(ex, "Failed to show browser-window notification.");
+        }
+    }
+
+    /// <summary>
+    /// Waits for real ModDB content instead of snapshotting the Cloudflare interstitial. This is
+    /// state-based waiting: a user can solve verification in the headed Chromium window and the
+    /// parser resumes as soon as the actual document is available.
+    /// </summary>
+    private async Task WaitForModDbContentAsync(IPage page, string url, CancellationToken cancellationToken)
+    {
+        var deadline = DateTime.UtcNow.AddMinutes(2);
+        var verificationObserved = false;
+
+        while (DateTime.UtcNow < deadline)
+        {
+            cancellationToken.ThrowIfCancellationRequested();
+
+            try
+            {
+                var title = await page.TitleAsync();
+                var isVerificationPage = IsModDbVerificationPage(title);
+                if (isVerificationPage)
+                {
+                    if (!verificationObserved)
+                    {
+                        logger.LogInformation(
+                            "ModDB verification is open in Chromium for {Url}. Waiting for the user to complete it.",
+                            url);
+                        verificationObserved = true;
+                    }
+                }
+                else
+                {
+                    var contentMarker = await page.QuerySelectorAsync(
+                        "#downloadsinfo, .row.rowcontent, .headerbox, #articlebrowse, #profile");
+                    if (contentMarker != null)
+                    {
+                        if (verificationObserved)
+                        {
+                            logger.LogInformation("ModDB verification completed; parsing content from {Url}", url);
+                        }
+
+                        return;
+                    }
+                }
+            }
+            catch (PlaywrightException ex) when (IsContextClosedError(ex))
+            {
+                // The page is navigating (e.g. the user just solved the Cloudflare challenge, or
+                // the interstitial redirected to the real document). The in-flight title/selector
+                // probe dies mid-navigation; retry on the next tick once the new document settles.
+                logger.LogDebug(ex, "Transient navigation during ModDB content wait for {Url}; retrying", url);
+            }
+
+            await Task.Delay(TimeSpan.FromMilliseconds(250), cancellationToken);
+        }
+
+        throw new TimeoutException(
+            verificationObserved
+                ? "ModDB verification was not completed in the Chromium window. Complete the check and open the content again."
+                : $"ModDB did not expose parseable content for {url}.");
+    }
+}
diff --git a/GenHub/GenHub/Features/GameProfiles/Infrastructure/GameProcessManager.cs b/GenHub/GenHub/Features/GameProfiles/Infrastructure/GameProcessManager.cs
index b62d5aeef..4fddc56f1 100644
--- a/GenHub/GenHub/Features/GameProfiles/Infrastructure/GameProcessManager.cs
+++ b/GenHub/GenHub/Features/GameProfiles/Infrastructure/GameProcessManager.cs
@@ -97,7 +97,7 @@ public async Task<OperationResult<GameProcessInfo>> StartProcessAsync(GameLaunch
 
                 if (process.HasExited)
                 {
-                    return await HandleImmediateProcessExitAsync(process, configuration, capturedErrors);
+                    return HandleImmediateProcessExit(process, configuration, capturedErrors);
                 }
             }
 
@@ -767,7 +767,7 @@ private ProcessStartInfo ConfigureProcessStartInfo(GameLaunchConfiguration confi
         return processStartInfo;
     }
 
-    private async Task<OperationResult<GameProcessInfo>> HandleImmediateProcessExitAsync(
+    private OperationResult<GameProcessInfo> HandleImmediateProcessExit(
         Process process,
         GameLaunchConfiguration configuration,
         BoundedErrorBuffer capturedErrors)
diff --git a/GenHub/GenHub/Features/GameProfiles/Services/ProfileLauncherFacade.cs b/GenHub/GenHub/Features/GameProfiles/Services/ProfileLauncherFacade.cs
index 2ffca7e4c..7e36d6669 100644
--- a/GenHub/GenHub/Features/GameProfiles/Services/ProfileLauncherFacade.cs
+++ b/GenHub/GenHub/Features/GameProfiles/Services/ProfileLauncherFacade.cs
@@ -451,99 +451,25 @@ private async Task<ProfileOperationResult<GameLaunchInfo>> LaunchToolProfileAsyn
     {
         logger.LogInformation("[Launch] Detected Tool profile, launching tool directly");
 
-        // Get the tool manifest
-        if (string.IsNullOrWhiteSpace(profile.ToolContentId))
-        {
-            return ProfileOperationResult<GameLaunchInfo>.CreateFailure(ProfileValidationConstants.ToolProfileMissingContentId);
-        }
-
-        if (!ManifestId.TryCreate(profile.ToolContentId, out var toolManifestId))
-        {
-            return ProfileOperationResult<GameLaunchInfo>.CreateFailure(
-                $"{ProfileValidationConstants.InvalidToolContentId}: {profile.ToolContentId}");
-        }
-
-        var toolManifestResult = await manifestPool.GetManifestAsync(
-            toolManifestId,
-            cancellationToken);
-
-        if (toolManifestResult.Failed || toolManifestResult.Data == null)
+        var manifestResult = await ResolveToolManifestAsync(profile, cancellationToken);
+        if (manifestResult.Failed || manifestResult.Data == null)
         {
             return ProfileOperationResult<GameLaunchInfo>.CreateFailure(
-                $"{ProfileValidationConstants.FailedToLoadToolManifest}: {toolManifestResult.FirstError}");
+                manifestResult.FirstError ?? ProfileValidationConstants.FailedToLoadToolManifest);
         }
 
-        var toolManifest = toolManifestResult.Data;
+        var toolManifest = manifestResult.Data;
         logger.LogDebug("[Launch] Tool manifest loaded: {ManifestId}", toolManifest.Id);
 
-        var toolDirectory = await manifestPool.GetContentDirectoryAsync(toolManifest.Id, cancellationToken);
-        string toolWorkspacePath = string.Empty;
-        string? actualWorkspaceId = null;
-
-        if (toolDirectory.Success && !string.IsNullOrEmpty(toolDirectory.Data))
+        var workspaceResult = await ResolveToolWorkspaceAsync(profile, toolManifest, cancellationToken);
+        if (workspaceResult.Failed)
         {
-            toolWorkspacePath = toolDirectory.Data;
-            logger.LogInformation("[Launch] Using existing tool directory: {Path}", toolWorkspacePath);
-        }
-        else
-        {
-            logger.LogInformation("[Launch] Tool content requires hydration, using WorkspaceManager");
-
-            var dummyGameClient = new GenHub.Core.Models.GameClients.GameClient
-            {
-                Name = toolManifest.Name,
-                GameType = toolManifest.TargetGame,
-            };
-
-            var appDataBase = configurationProvider.GetApplicationDataPath();
-            if (!Directory.Exists(appDataBase))
-            {
-                Directory.CreateDirectory(appDataBase);
-            }
-
-            var baseDetails = appDataBase;
-
-            var resolutionResult = await dependencyResolver.ResolveDependenciesWithManifestsAsync(profile.EnabledContentIds ?? [], cancellationToken);
-            var allManifests = resolutionResult.Success ? resolutionResult.ResolvedManifests : [toolManifest];
-
-            var requestedToolStrategy = profile.WorkspaceStrategy ?? configurationProvider.GetDefaultWorkspaceStrategy();
-            var effectiveToolStrategy = ResolveSupportedWorkspaceStrategy(requestedToolStrategy);
-
-            if (effectiveToolStrategy != requestedToolStrategy)
-            {
-                logger.LogInformation(
-                    "[Launch] Tool workspace - Switching from {OriginalStrategy} to HardLink: symlinks are unavailable in this environment",
-                    requestedToolStrategy);
-            }
-
-            actualWorkspaceId = $"{ProfileConstants.ToolProfileWorkspaceIdPrefix}-{profile.Id}";
-            var workspaceConfig = new WorkspaceConfiguration
-            {
-                Id = actualWorkspaceId,
-                Manifests = [.. allManifests],
-                GameClient = dummyGameClient,
-                Strategy = effectiveToolStrategy,
-                ForceRecreate = false,
-                ValidateAfterPreparation = true,
-                BaseInstallationPath = baseDetails,
-                WorkspaceRootPath = Path.Combine(appDataBase, DirectoryNames.ToolWorkspaces),
-                SkipCleanup = false,
-            };
-
-            var prepareResult = await workspaceManager.PrepareWorkspaceAsync(workspaceConfig, progress: null, skipCleanup: false, cancellationToken: cancellationToken);
-            if (prepareResult.Failed)
-            {
-                return ProfileOperationResult<GameLaunchInfo>.CreateFailure(
-                    $"{ProfileValidationConstants.FailedToPrepareToolWorkspace}: {prepareResult.FirstError}");
-            }
-
-            toolWorkspacePath = prepareResult.Data!.WorkspacePath;
-            logger.LogInformation("[Launch] Tool workspace prepared at: {Path}", toolWorkspacePath);
+            return ProfileOperationResult<GameLaunchInfo>.CreateFailure(
+                workspaceResult.FirstError ?? ProfileValidationConstants.FailedToPrepareToolWorkspace);
         }
 
-        var toolDirectoryPath = toolWorkspacePath;
-        var toolExecutable = toolManifest.Files?.FirstOrDefault(f => f.IsExecutable)
-            ?? toolManifest.Files?.FirstOrDefault(f => f.RelativePath.EndsWith(".exe", StringComparison.OrdinalIgnoreCase));
+        var (toolDirectoryPath, actualWorkspaceId) = workspaceResult.Data;
+        var toolExecutable = ResolveToolExecutable(toolManifest);
 
         if (toolExecutable == null)
         {
@@ -564,35 +490,7 @@ private async Task<ProfileOperationResult<GameLaunchInfo>> LaunchToolProfileAsyn
 
         try
         {
-            var processStartInfo = new ProcessStartInfo
-            {
-                FileName = toolExecutablePath,
-                WorkingDirectory = toolDirectoryPath,
-                Arguments = profile.CommandLineArguments ?? string.Empty,
-                UseShellExecute = false,
-            };
-
-            if (profile.EnvironmentVariables != null)
-            {
-                foreach (var envVar in profile.EnvironmentVariables)
-                {
-                    processStartInfo.EnvironmentVariables[envVar.Key] = envVar.Value;
-                }
-            }
-
-            Process? process = null;
-            try
-            {
-                process = Process.Start(processStartInfo);
-            }
-            catch (System.ComponentModel.Win32Exception ex) when (ex.NativeErrorCode == 740)
-            {
-                logger.LogWarning("Tool requires elevation (Error 740). Retrying with UseShellExecute=true and Verb='runas'. Environment variables will be ignored.");
-                processStartInfo.UseShellExecute = true;
-                processStartInfo.Verb = "runas";
-                process = Process.Start(processStartInfo);
-            }
-
+            var process = StartToolProcess(toolExecutablePath, toolDirectoryPath, profile);
             if (process == null)
             {
                 return ProfileOperationResult<GameLaunchInfo>.CreateFailure(ProfileValidationConstants.ToolProcessStartFailed);
@@ -631,12 +529,181 @@ private async Task<ProfileOperationResult<GameLaunchInfo>> LaunchToolProfileAsyn
         }
         catch (Exception ex)
         {
-            logger.LogError(ex, "[Launch] Tool launch failed");
+            logger.LogError(ex, "[Launch] Unexpected error launching tool for profile {ProfileId}", profileId);
             notificationService.ShowError(
                 ProfileValidationConstants.ToolLaunchFailedTitle,
                 $"Failed to launch '{profile.Name}': {ex.Message}",
                 NotificationDurations.VeryLong);
-            return ProfileOperationResult<GameLaunchInfo>.CreateFailure($"Tool launch failed: {ex.Message}");
+            return ProfileOperationResult<GameLaunchInfo>.CreateFailure(
+                $"Tool launch failed: {ex.Message}");
+        }
+    }
+
+    private async Task<ProfileOperationResult<ContentManifest>> ResolveToolManifestAsync(
+        GameProfile profile,
+        CancellationToken cancellationToken)
+    {
+        if (string.IsNullOrWhiteSpace(profile.ToolContentId))
+        {
+            return ProfileOperationResult<ContentManifest>.CreateFailure(ProfileValidationConstants.ToolProfileMissingContentId);
+        }
+
+        if (!ManifestId.TryCreate(profile.ToolContentId, out var toolManifestId))
+        {
+            return ProfileOperationResult<ContentManifest>.CreateFailure(
+                $"{ProfileValidationConstants.InvalidToolContentId}: {profile.ToolContentId}");
+        }
+
+        var toolManifestResult = await manifestPool.GetManifestAsync(
+            toolManifestId,
+            cancellationToken);
+
+        if (toolManifestResult.Failed || toolManifestResult.Data == null)
+        {
+            return ProfileOperationResult<ContentManifest>.CreateFailure(
+                $"{ProfileValidationConstants.FailedToLoadToolManifest}: {toolManifestResult.FirstError}");
+        }
+
+        return ProfileOperationResult<ContentManifest>.CreateSuccess(toolManifestResult.Data);
+    }
+
+    private async Task<ProfileOperationResult<(string WorkspacePath, string? WorkspaceId)>> ResolveToolWorkspaceAsync(
+        GameProfile profile,
+        ContentManifest toolManifest,
+        CancellationToken cancellationToken)
+    {
+        var toolDirectory = await manifestPool.GetContentDirectoryAsync(toolManifest.Id, cancellationToken);
+        if (toolDirectory.Success && !string.IsNullOrEmpty(toolDirectory.Data))
+        {
+            logger.LogInformation("[Launch] Using existing tool directory: {Path}", toolDirectory.Data);
+            return ProfileOperationResult<(string, string?)>.CreateSuccess((toolDirectory.Data, null));
+        }
+
+        logger.LogInformation("[Launch] Tool content requires hydration, using WorkspaceManager");
+
+        var dummyGameClient = new GenHub.Core.Models.GameClients.GameClient
+        {
+            Name = toolManifest.Name,
+            GameType = toolManifest.TargetGame,
+        };
+
+        var appDataBase = configurationProvider.GetApplicationDataPath();
+        if (!Directory.Exists(appDataBase))
+        {
+            Directory.CreateDirectory(appDataBase);
+        }
+
+        var resolutionResult = await dependencyResolver.ResolveDependenciesWithManifestsAsync(profile.EnabledContentIds ?? [], cancellationToken);
+        var allManifests = resolutionResult.Success ? resolutionResult.ResolvedManifests : [toolManifest];
+
+        var requestedToolStrategy = profile.WorkspaceStrategy ?? configurationProvider.GetDefaultWorkspaceStrategy();
+        var effectiveToolStrategy = ResolveSupportedWorkspaceStrategy(requestedToolStrategy);
+
+        if (effectiveToolStrategy != requestedToolStrategy)
+        {
+            logger.LogInformation(
+                "[Launch] Tool workspace - Switching from {OriginalStrategy} to HardLink: symlinks are unavailable in this environment",
+                requestedToolStrategy);
+        }
+
+        var actualWorkspaceId = $"{ProfileConstants.ToolProfileWorkspaceIdPrefix}-{profile.Id}";
+        var workspaceConfig = new WorkspaceConfiguration
+        {
+            Id = actualWorkspaceId,
+            Manifests = [.. allManifests],
+            GameClient = dummyGameClient,
+            Strategy = effectiveToolStrategy,
+            ForceRecreate = false,
+            ValidateAfterPreparation = true,
+            BaseInstallationPath = appDataBase,
+            WorkspaceRootPath = Path.Combine(appDataBase, DirectoryNames.ToolWorkspaces),
+            SkipCleanup = false,
+        };
+
+        var prepareResult = await workspaceManager.PrepareWorkspaceAsync(workspaceConfig, progress: null, skipCleanup: false, cancellationToken: cancellationToken);
+        if (prepareResult.Failed)
+        {
+            return ProfileOperationResult<(string, string?)>.CreateFailure(
+                $"{ProfileValidationConstants.FailedToPrepareToolWorkspace}: {prepareResult.FirstError}");
+        }
+
+        var toolWorkspacePath = prepareResult.Data!.WorkspacePath;
+        logger.LogInformation("[Launch] Tool workspace prepared at: {Path}", toolWorkspacePath);
+        return ProfileOperationResult<(string, string?)>.CreateSuccess((toolWorkspacePath, actualWorkspaceId));
+    }
+
+    private ManifestFile? ResolveToolExecutable(ContentManifest toolManifest)
+    {
+        var resolvedFiles = ManifestVariantResolver.ResolveFiles(toolManifest);
+        var resolution = ManifestVariantResolver.ResolveEntryPoint(toolManifest);
+
+        if (resolution.Success && resolution.RelativePath != null)
+        {
+            var toolExecutable = resolvedFiles?.FirstOrDefault(f =>
+                ManifestVariantResolver.PathsMatch(f.RelativePath, resolution.RelativePath));
+
+            if (toolExecutable != null)
+            {
+                logger.LogInformation(
+                    "[Launch] Tool executable resolved for manifest {ManifestId}: {RelativePath} ({Reason})",
+                    toolManifest.Id,
+                    toolExecutable.RelativePath,
+                    resolution.Reason);
+            }
+            else
+            {
+                logger.LogWarning(
+                    "[Launch] Entry point '{RelativePath}' resolved for tool manifest {ManifestId} ({Reason}) but not found in resolved files",
+                    resolution.RelativePath,
+                    toolManifest.Id,
+                    resolution.Reason);
+            }
+
+            return toolExecutable;
+        }
+
+        logger.LogWarning(
+            "[Launch] Entry point resolution for tool manifest '{ManifestId}' did not succeed: {Resolution}",
+            toolManifest.Id,
+            resolution);
+
+        return null;
+    }
+
+    private Process? StartToolProcess(string toolExecutablePath, string toolDirectoryPath, GameProfile profile)
+    {
+        var processStartInfo = new ProcessStartInfo
+        {
+            FileName = toolExecutablePath,
+            WorkingDirectory = toolDirectoryPath,
+            Arguments = profile.CommandLineArguments ?? string.Empty,
+            UseShellExecute = false,
+        };
+
+        if (profile.EnvironmentVariables != null)
+        {
+            foreach (var envVar in profile.EnvironmentVariables)
+            {
+                processStartInfo.EnvironmentVariables[envVar.Key] = envVar.Value;
+            }
+        }
+
+        try
+        {
+            return Process.Start(processStartInfo);
+        }
+        catch (System.ComponentModel.Win32Exception ex) when (ex.NativeErrorCode == 740)
+        {
+            logger.LogWarning("Tool requires elevation (Error 740). Retrying with UseShellExecute=true and Verb='runas'. Environment variables will be ignored.");
+            var elevatedStartInfo = new ProcessStartInfo
+            {
+                FileName = toolExecutablePath,
+                WorkingDirectory = toolDirectoryPath,
+                Arguments = profile.CommandLineArguments ?? string.Empty,
+                UseShellExecute = true,
+                Verb = "runas",
+            };
+            return Process.Start(elevatedStartInfo);
         }
     }
 
diff --git a/GenHub/GenHub/Features/GameProfiles/ViewModels/AddLocalContentViewModel.cs b/GenHub/GenHub/Features/GameProfiles/ViewModels/AddLocalContentViewModel.cs
index 55a28b999..386f01d9b 100644
--- a/GenHub/GenHub/Features/GameProfiles/ViewModels/AddLocalContentViewModel.cs
+++ b/GenHub/GenHub/Features/GameProfiles/ViewModels/AddLocalContentViewModel.cs
@@ -12,6 +12,8 @@
 using GenHub.Core.Interfaces.Common;
 using GenHub.Core.Interfaces.Content;
 using GenHub.Core.Models.Enums;
+using GenHub.Core.Models.Manifest;
+using GenHub.Core.Utilities;
 using Microsoft.Extensions.Logging;
 
 namespace GenHub.Features.GameProfiles.ViewModels;
@@ -29,7 +31,7 @@ public partial class AddLocalContentViewModel(
     IContentStorageService? contentStorageService,
     IGenLauncherNormalizationService? genLauncherNormalizationService,
     IDialogService? dialogService,
-    ILogger<AddLocalContentViewModel>? logger = null) : ObservableObject
+    ILogger<AddLocalContentViewModel>? logger = null) : ObservableObject, IDisposable
 {
     /// <summary>
     /// Gets the list of available game types.
@@ -56,6 +58,26 @@ public partial class AddLocalContentViewModel(
         ContentType.Mission,
     ];
 
+    /// <summary>
+    /// Counts the total number of executables in the given file tree items recursively.
+    /// </summary>
+    /// <param name="items">The file tree items to inspect.</param>
+    /// <returns>The total number of executable files found.</returns>
+    internal static int CountExecutables(IEnumerable<FileTreeItem> items)
+    {
+        int count = 0;
+        foreach (var item in items)
+        {
+            if (item.IsExecutable) count++;
+            count += CountExecutables(item.Children);
+        }
+
+        return count;
+    }
+
+    private static bool RequiresExecutable(ContentType contentType) =>
+        contentType is ContentType.GameClient or ContentType.ModdingTool or ContentType.Executable;
+
     private static FileTreeItem? FindFirstExecutable(IEnumerable<FileTreeItem> items)
     {
         foreach (var item in items)
@@ -75,21 +97,10 @@ public partial class AddLocalContentViewModel(
         return null;
     }
 
-    private static int CountExecutables(IEnumerable<FileTreeItem> items)
-    {
-        int count = 0;
-        foreach (var item in items)
-        {
-            if (item.IsExecutable) count++;
-            count += CountExecutables(item.Children);
-        }
-
-        return count;
-    }
-
     private readonly string _stagingPath = Path.Combine(Path.GetTempPath(), "GenHub_Staging_" + Guid.NewGuid());
 
     private string? _originalManifestId;
+    private string? _pendingEntryPoint;
 
     /// <summary>
     /// Gets a value indicating whether we are editing existing content.
@@ -177,7 +188,7 @@ private static int CountExecutables(IEnumerable<FileTreeItem> items)
     private bool _isDemoMode;
 
     /// <summary>
-    /// Gets or sets the selected executable item (for Executable/ModdingTool content type).
+    /// Gets or sets the selected executable item (for GameClient/Executable/ModdingTool content type).
     /// </summary>
     [ObservableProperty]
     private FileTreeItem? _selectedExecutableItem;
@@ -192,7 +203,7 @@ private static int CountExecutables(IEnumerable<FileTreeItem> items)
     /// <summary>
     /// Gets a value indicating whether the executable selection should be shown.
     /// </summary>
-    public bool ShowExecutableSelection => (SelectedContentType == ContentType.ModdingTool || SelectedContentType == ContentType.Executable) && ExecutableCount > 1;
+    public bool ShowExecutableSelection => RequiresExecutable(SelectedContentType) && ExecutableCount > 0;
 
     /// <summary>
     /// Gets the text to display in the preview area when no content is loaded.
@@ -255,6 +266,7 @@ public async Task LoadFromManifestAsync(ContentDisplayItem item)
             StatusMessage = "Loading existing content...";
 
             _originalManifestId = item.ManifestId.Value;
+            _pendingEntryPoint = item.Manifest?.EntryPoint;
             ContentName = item.DisplayName ?? string.Empty;
             SelectedContentType = item.ContentType;
             SelectedGameType = item.GameType;
@@ -487,24 +499,81 @@ public async Task ImportContentAsync(string path)
         }
     }
 
+    /// <inheritdoc />
+    public void Dispose()
+    {
+        _cts?.Dispose();
+        _cts = null;
+        CleanupStaging();
+        GC.SuppressFinalize(this);
+    }
+
     private static List<FileTreeItem> BuildDirectoryTree(DirectoryInfo dir)
+        => BuildDirectoryTree(dir, CollectExecutableDirectories(dir));
+
+    private static HashSet<string> CollectExecutableDirectories(DirectoryInfo root)
+    {
+        var result = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+        try
+        {
+            foreach (var file in root.EnumerateFiles("*", SearchOption.AllDirectories))
+            {
+                if (!ExecutableFileClassifier.IsLegacyLaunchCandidateFromName(file.Name)
+                    && !file.Extension.Equals(".exe", StringComparison.OrdinalIgnoreCase))
+                {
+                    continue;
+                }
+
+                for (var d = file.Directory; d != null; d = d.Parent)
+                {
+                    if (!result.Add(d.FullName))
+                    {
+                        break;
+                    }
+                }
+            }
+        }
+        catch
+        {
+            // ignore inaccessible directories
+        }
+
+        return result;
+    }
+
+    private static List<FileTreeItem> BuildDirectoryTree(DirectoryInfo dir, HashSet<string> executableDirs)
     {
         var items = new List<FileTreeItem>();
 
-        if (!dir.Exists) return items;
+        if (!dir.Exists)
+        {
+            return items;
+        }
+
+        var subDirs = dir.GetDirectories();
+        var prioritizedDirs = subDirs
+            .OrderByDescending(d => executableDirs.Contains(d.FullName))
+            .ThenBy(d => d.Name)
+            .Take(20);
 
-        foreach (var d in dir.GetDirectories().Take(20))
+        foreach (var d in prioritizedDirs)
         {
             items.Add(new FileTreeItem
             {
                 Name = d.Name,
                 IsFile = false,
                 FullPath = d.FullName,
-                Children = new ObservableCollection<FileTreeItem>(BuildDirectoryTree(d)),
+                Children = new ObservableCollection<FileTreeItem>(BuildDirectoryTree(d, executableDirs)),
             });
         }
 
-        foreach (var f in dir.GetFiles().Take(50))
+        var files = dir.GetFiles();
+        var prioritizedFiles = files
+            .OrderByDescending(f => ExecutableFileClassifier.IsLegacyLaunchCandidateFromName(f.Name) || f.Extension.Equals(".exe", StringComparison.OrdinalIgnoreCase))
+            .ThenBy(f => f.Name)
+            .Take(50);
+
+        foreach (var f in prioritizedFiles)
         {
             items.Add(new FileTreeItem { Name = f.Name, IsFile = true, FullPath = f.FullName });
         }
@@ -640,6 +709,20 @@ private async Task AddContentAsync()
 
             _cts = new CancellationTokenSource();
 
+            string? entryPoint = null;
+            if (RequiresExecutable(SelectedContentType) && SelectedExecutableItem != null && !string.IsNullOrWhiteSpace(SelectedExecutableItem.FullPath))
+            {
+                try
+                {
+                    entryPoint = Path.GetRelativePath(_stagingPath, SelectedExecutableItem.FullPath).Replace('\\', '/');
+                }
+                catch (Exception ex)
+                {
+                    logger?.LogWarning(ex, "Failed to determine relative path for selected executable '{FullPath}'. Falling back to file name '{Name}'", SelectedExecutableItem.FullPath, SelectedExecutableItem.Name);
+                    entryPoint = SelectedExecutableItem.Name;
+                }
+            }
+
             // Preserve SourcePath metadata if available
             // Note: We no longer write to "source.path" file to avoid polluting the content.
             // Instead we pass the SourcePath directly to the service.
@@ -652,7 +735,8 @@ private async Task AddContentAsync()
                     targetGame,
                     SourcePath,
                     progress,
-                    _cts.Token)
+                    _cts.Token,
+                    entryPoint)
                 : await localContentService.CreateLocalContentManifestAsync(
                     _stagingPath,
                     ContentName,
@@ -660,7 +744,8 @@ private async Task AddContentAsync()
                     targetGame,
                     SourcePath,
                     progress,
-                    _cts.Token);
+                    _cts.Token,
+                    entryPoint);
 
             if (result.Success)
             {
@@ -770,6 +855,29 @@ private void CreateMapFoldersIfNeeded()
         }
     }
 
+    private FileTreeItem? FindFileItemByRelativePath(IEnumerable<FileTreeItem> items, string relativePath)
+    {
+        var normalizedTarget = relativePath.Replace('\\', '/').TrimStart('/');
+        foreach (var item in items)
+        {
+            if (item.IsFile)
+            {
+                var itemRel = Path.GetRelativePath(_stagingPath, item.FullPath).Replace('\\', '/').TrimStart('/');
+                if (ManifestVariantResolver.PathsMatch(itemRel, normalizedTarget))
+                {
+                    return item;
+                }
+            }
+            else
+            {
+                var found = FindFileItemByRelativePath(item.Children, relativePath);
+                if (found != null) return found;
+            }
+        }
+
+        return null;
+    }
+
     private async Task RefreshStagingTreeAsync()
     {
         bool wasBusy = IsBusy;
@@ -777,6 +885,23 @@ private async Task RefreshStagingTreeAsync()
         {
             if (!wasBusy) IsBusy = true;
 
+            string? previousRelativePath = null;
+            if (SelectedExecutableItem != null && !string.IsNullOrWhiteSpace(SelectedExecutableItem.FullPath))
+            {
+                try
+                {
+                    previousRelativePath = Path.GetRelativePath(_stagingPath, SelectedExecutableItem.FullPath).Replace('\\', '/');
+                }
+                catch
+                {
+                    // Ignore path calculation error
+                }
+            }
+            else if (!string.IsNullOrWhiteSpace(_pendingEntryPoint))
+            {
+                previousRelativePath = _pendingEntryPoint;
+            }
+
             FileTree.Clear();
             SelectedExecutableItem = null; // Clear previous selection on refresh
             if (Directory.Exists(_stagingPath))
@@ -791,10 +916,29 @@ private async Task RefreshStagingTreeAsync()
 
             ExecutableCount = CountExecutables(FileTree);
 
-            // Auto-select first executable if content type requires it
-            if (SelectedContentType == ContentType.ModdingTool || SelectedContentType == ContentType.Executable)
+            // Reselect previously selected executable or auto-select first if content type requires it
+            if (RequiresExecutable(SelectedContentType))
             {
-                AutoSelectFirstExecutable();
+                FileTreeItem? matchedItem = null;
+                if (!string.IsNullOrWhiteSpace(previousRelativePath))
+                {
+                    matchedItem = FindFileItemByRelativePath(FileTree, previousRelativePath);
+                }
+
+                if (matchedItem != null && matchedItem.IsExecutable)
+                {
+                    SelectedExecutableItem = matchedItem;
+                    _pendingEntryPoint = null;
+                }
+                else
+                {
+                    _pendingEntryPoint = null;
+                    AutoSelectFirstExecutable();
+                }
+            }
+            else
+            {
+                SelectedExecutableItem = null;
             }
 
             Validate();
@@ -816,8 +960,8 @@ private void Validate()
         var stagingExists = Directory.Exists(_stagingPath);
         var stagingHasEntries = stagingExists && Directory.EnumerateFileSystemEntries(_stagingPath).Any();
 
-        // For ModdingTool (Tool) and Executable, we also need an executable selected
-        var requiresExecutable = SelectedContentType == ContentType.ModdingTool || SelectedContentType == ContentType.Executable;
+        // For GameClient, ModdingTool (Tool), and Executable, we also need an executable selected
+        var requiresExecutable = RequiresExecutable(SelectedContentType);
         var hasExecutableIfNeeded = !requiresExecutable || SelectedExecutableItem != null;
 
         CanAdd = hasName && (hasFiles || stagingHasEntries) && hasExecutableIfNeeded;
@@ -842,10 +986,44 @@ partial void OnSelectedContentTypeChanged(ContentType value)
         OnPropertyChanged(nameof(ShowExecutableSelection));
         OnPropertyChanged(nameof(PreviewIdleText));
 
-        // Auto-select first executable if switching to ModdingTool or Executable
-        if ((value == ContentType.ModdingTool || value == ContentType.Executable) && SelectedExecutableItem == null)
+        // Auto-select first executable if switching to a content type that requires it,
+        // or clear selection when switching to a non-executable content type
+        if (RequiresExecutable(value))
+        {
+            if (SelectedExecutableItem == null)
+            {
+                FileTreeItem? matchedItem = null;
+                if (!string.IsNullOrWhiteSpace(_pendingEntryPoint))
+                {
+                    matchedItem = FindFileItemByRelativePath(FileTree, _pendingEntryPoint);
+                }
+
+                if (matchedItem != null && matchedItem.IsExecutable)
+                {
+                    SelectedExecutableItem = matchedItem;
+                    _pendingEntryPoint = null;
+                }
+                else
+                {
+                    AutoSelectFirstExecutable();
+                }
+            }
+        }
+        else
         {
-            AutoSelectFirstExecutable();
+            if (SelectedExecutableItem != null && !string.IsNullOrWhiteSpace(SelectedExecutableItem.FullPath))
+            {
+                try
+                {
+                    _pendingEntryPoint = Path.GetRelativePath(_stagingPath, SelectedExecutableItem.FullPath).Replace('\\', '/');
+                }
+                catch
+                {
+                    // Ignore path calculation error
+                }
+            }
+
+            SelectedExecutableItem = null;
         }
 
         Validate();
diff --git a/GenHub/GenHub/Features/GameProfiles/ViewModels/DemoAddLocalContentViewModel.cs b/GenHub/GenHub/Features/GameProfiles/ViewModels/DemoAddLocalContentViewModel.cs
index afbd8961b..a22b52d3d 100644
--- a/GenHub/GenHub/Features/GameProfiles/ViewModels/DemoAddLocalContentViewModel.cs
+++ b/GenHub/GenHub/Features/GameProfiles/ViewModels/DemoAddLocalContentViewModel.cs
@@ -147,6 +147,7 @@ private void InitializeDemoData()
         };
 
         FileTree.Add(modFolder);
+        ExecutableCount = CountExecutables(FileTree);
 
         // Set status message
         StatusMessage = "Demo content ready. Click buttons to see what they do!";
diff --git a/GenHub/GenHub/Features/GameProfiles/ViewModels/FileTreeItem.cs b/GenHub/GenHub/Features/GameProfiles/ViewModels/FileTreeItem.cs
index 20b12e965..81052c517 100644
--- a/GenHub/GenHub/Features/GameProfiles/ViewModels/FileTreeItem.cs
+++ b/GenHub/GenHub/Features/GameProfiles/ViewModels/FileTreeItem.cs
@@ -14,17 +14,23 @@ public partial class FileTreeItem : ObservableObject
     /// <summary>
     /// Gets or sets the name of the file or directory.
     /// </summary>
-    public string Name { get; set; } = string.Empty;
+    [ObservableProperty]
+    [NotifyPropertyChangedFor(nameof(IsExecutable))]
+    private string _name = string.Empty;
 
     /// <summary>
     /// Gets or sets a value indicating whether this item is a file.
     /// </summary>
-    public bool IsFile { get; set; }
+    [ObservableProperty]
+    [NotifyPropertyChangedFor(nameof(IsExecutable))]
+    private bool _isFile;
 
     /// <summary>
     /// Gets or sets the full path of the file or directory.
     /// </summary>
-    public string FullPath { get; set; } = string.Empty;
+    [ObservableProperty]
+    [NotifyPropertyChangedFor(nameof(IsExecutable))]
+    private string _fullPath = string.Empty;
 
     /// <summary>
     /// Gets or sets the children of this item (for directories).
diff --git a/GenHub/GenHub/Features/GameProfiles/ViewModels/GameProfileSettingsViewModel.Commands.cs b/GenHub/GenHub/Features/GameProfiles/ViewModels/GameProfileSettingsViewModel.Commands.cs
index ae01bb830..fd7e36b13 100644
--- a/GenHub/GenHub/Features/GameProfiles/ViewModels/GameProfileSettingsViewModel.Commands.cs
+++ b/GenHub/GenHub/Features/GameProfiles/ViewModels/GameProfileSettingsViewModel.Commands.cs
@@ -699,7 +699,7 @@ private async Task AddLocalContentAsync(Avalonia.Controls.Window? owner)
 
             if (dialogOwner == null) return;
 
-            var vm = new AddLocalContentViewModel(
+            using var vm = new AddLocalContentViewModel(
                 _localContentService,
                 _contentStorageService,
                 _genLauncherNormalizationService,
@@ -767,7 +767,7 @@ private async Task EditContentAsync(ContentDisplayItem? contentItem)
 
             if (owner == null) return;
 
-            var vm = new AddLocalContentViewModel(
+            using var vm = new AddLocalContentViewModel(
                 _localContentService,
                 _contentStorageService,
                 _genLauncherNormalizationService,
diff --git a/GenHub/GenHub/Features/GameProfiles/Views/AddLocalContentView.axaml b/GenHub/GenHub/Features/GameProfiles/Views/AddLocalContentView.axaml
index 081789f27..d9256dfae 100644
--- a/GenHub/GenHub/Features/GameProfiles/Views/AddLocalContentView.axaml
+++ b/GenHub/GenHub/Features/GameProfiles/Views/AddLocalContentView.axaml
@@ -13,6 +13,7 @@
         <conv:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
         <conv:InvertedBoolToVisibilityConverter x:Key="InvertedBoolToVisibilityConverter" />
         <conv:BoolToTextConverter x:Key="BoolToTextConverter" />
+        <conv:ExecutableHighlightConverter x:Key="ExecutableHighlightConverter" />
     </UserControl.Resources>
 
     <UserControl.Styles>
@@ -115,7 +116,13 @@
                         <ComboBox ItemsSource="{Binding AllowedContentTypes}"
                                   SelectedItem="{Binding SelectedContentType}"
                                   HorizontalAlignment="Stretch"
-                                  Classes="glass"/>
+                                  Classes="glass">
+                            <ComboBox.ItemTemplate>
+                                <DataTemplate>
+                                    <TextBlock Text="{Binding Converter={x:Static conv:ContentTypeDisplayConverter.Instance}}"/>
+                                </DataTemplate>
+                            </ComboBox.ItemTemplate>
+                        </ComboBox>
                     </StackPanel>
 
                      <!-- Target Game -->
@@ -157,7 +164,7 @@
                             <TextBlock Text="CONTENT PREVIEW" FontSize="11" FontWeight="Bold" Foreground="#80FFFFFF" LetterSpacing="1"/>
                         </Border>
 
-                        <TreeView Grid.Row="1" ItemsSource="{Binding FileTree}" Background="Transparent" Foreground="#DDDDDD" Margin="5">
+                        <TreeView Grid.Row="1" ItemsSource="{Binding FileTree}" Background="Transparent" Foreground="#DDDDDD" Margin="5" ScrollViewer.HorizontalScrollBarVisibility="Disabled">
                             <TreeView.Styles>
                                 <Style Selector="TreeViewItem">
                                     <Setter Property="MinHeight" Value="24"/>
@@ -166,8 +173,8 @@
                             </TreeView.Styles>
                             <TreeView.ItemTemplate>
                                 <TreeDataTemplate ItemsSource="{Binding Children}">
-                                    <Grid ColumnDefinitions="*,Auto" Background="Transparent">
-                                        <DockPanel LastChildFill="True">
+                                    <Grid ColumnDefinitions="*,Auto,Auto" Background="Transparent" Margin="0,0,10,0">
+                                        <DockPanel Grid.Column="0" LastChildFill="True">
                                             <TextBlock DockPanel.Dock="Left"
                                                        Text="{Binding IsFile, Converter={StaticResource BoolToTextConverter}, ConverterParameter='📄|📁'}"
                                                        Opacity="0.7"
@@ -175,15 +182,44 @@
                                             <TextBlock Text="{Binding Name}"
                                                        VerticalAlignment="Center"
                                                        TextTrimming="CharacterEllipsis"
-                                                       ToolTip.Tip="{Binding Name}"/>
+                                                       ToolTip.Tip="{Binding Name}">
+                                                <TextBlock.Foreground>
+                                                    <MultiBinding Converter="{StaticResource ExecutableHighlightConverter}">
+                                                        <Binding Path="IsExecutable"/>
+                                                        <Binding Path="IsSelectedExecutable"/>
+                                                    </MultiBinding>
+                                                </TextBlock.Foreground>
+                                            </TextBlock>
                                         </DockPanel>
 
+                                        <!-- Select as Executable button (only for executable files when content type requires executable selection) -->
                                         <Button Grid.Column="1"
+                                                Command="{Binding ((vm:AddLocalContentViewModel)DataContext).SelectExecutableCommand, RelativeSource={RelativeSource AncestorType=UserControl}}"
+                                                CommandParameter="{Binding}"
+                                                Classes="icon-btn"
+                                                Padding="4,2"
+                                                Margin="5,0,0,0"
+                                                AutomationProperties.Name="Select as main executable"
+                                                ToolTip.Tip="Select as main executable">
+                                            <Button.IsVisible>
+                                                <MultiBinding Converter="{x:Static conv:MultiBooleanAndConverter.Instance}">
+                                                    <Binding Path="IsExecutable"/>
+                                                    <Binding Path="((vm:AddLocalContentViewModel)DataContext).ShowExecutableSelection" RelativeSource="{RelativeSource AncestorType=UserControl}"/>
+                                                </MultiBinding>
+                                            </Button.IsVisible>
+                                            <StackPanel Orientation="Horizontal" Spacing="4">
+                                                <TextBlock Text="▶" FontSize="10"/>
+                                                <TextBlock Text="{Binding IsSelectedExecutable, Converter={StaticResource BoolToTextConverter}, ConverterParameter='Selected|Select'}" FontSize="10"/>
+                                            </StackPanel>
+                                        </Button>
+
+                                        <!-- Remove Item button -->
+                                        <Button Grid.Column="2"
                                                 Command="{Binding ((vm:AddLocalContentViewModel)DataContext).DeleteItemCommand, RelativeSource={RelativeSource AncestorType=UserControl}}"
                                                 CommandParameter="{Binding}"
                                                 Classes="icon-btn"
                                                 Padding="4,2"
-                                                Margin="10,0,25,0"
+                                                Margin="10,0,0,0"
                                                 ToolTip.Tip="Remove Item">
                                             <TextBlock Text="✕" FontSize="10"/>
                                         </Button>
@@ -195,7 +231,7 @@
                         <!-- Empty State Overlay -->
                         <StackPanel Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Center" Spacing="10" IsVisible="{Binding !FileTree.Count}">
                             <TextBlock Text="No Content Loaded" Foreground="#40FFFFFF" FontSize="16" HorizontalAlignment="Center"/>
-                            <TextBlock Text="Select a source to preview structure" Foreground="#30FFFFFF" FontSize="12" HorizontalAlignment="Center"/>
+                            <TextBlock Text="{Binding PreviewIdleText}" Foreground="#30FFFFFF" FontSize="12" HorizontalAlignment="Center"/>
                         </StackPanel>
                     </Grid>
                 </Border>
diff --git a/GenHub/GenHub/Features/GameProfiles/Views/AddLocalContentView.axaml.cs b/GenHub/GenHub/Features/GameProfiles/Views/AddLocalContentView.axaml.cs
index 941a115d4..598e05199 100644
--- a/GenHub/GenHub/Features/GameProfiles/Views/AddLocalContentView.axaml.cs
+++ b/GenHub/GenHub/Features/GameProfiles/Views/AddLocalContentView.axaml.cs
@@ -34,6 +34,13 @@ protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
         InitializeBrowseActions();
     }
 
+    /// <inheritdoc />
+    protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
+    {
+        base.OnDetachedFromVisualTree(e);
+        (DataContext as IDisposable)?.Dispose();
+    }
+
     /// <summary>
     /// Called when the data context changes.
     /// </summary>
diff --git a/GenHub/GenHub/Features/GameProfiles/Views/AddLocalContentWindow.axaml b/GenHub/GenHub/Features/GameProfiles/Views/AddLocalContentWindow.axaml
index 8823922d1..7e77f4339 100644
--- a/GenHub/GenHub/Features/GameProfiles/Views/AddLocalContentWindow.axaml
+++ b/GenHub/GenHub/Features/GameProfiles/Views/AddLocalContentWindow.axaml
@@ -44,7 +44,9 @@
             <Grid RowDefinitions="30,*" Margin="20,10,20,20">
 
                 <!-- Custom Title Bar Drag Area -->
-                <Grid Grid.Row="0" Background="Transparent" IsHitTestVisible="False">
+                <Grid Grid.Row="0"
+                      Background="Transparent"
+                      PointerPressed="OnTitleBarPointerPressed">
                     <TextBlock Text="Add Local Content"
                                HorizontalAlignment="Center"
                                VerticalAlignment="Center"
diff --git a/GenHub/GenHub/Features/GameProfiles/Views/AddLocalContentWindow.axaml.cs b/GenHub/GenHub/Features/GameProfiles/Views/AddLocalContentWindow.axaml.cs
index bf07322b1..923853957 100644
--- a/GenHub/GenHub/Features/GameProfiles/Views/AddLocalContentWindow.axaml.cs
+++ b/GenHub/GenHub/Features/GameProfiles/Views/AddLocalContentWindow.axaml.cs
@@ -31,6 +31,13 @@ protected override void OnOpened(EventArgs e)
         GenHub.Infrastructure.Interop.AdminDragDropFix.Apply(this, OnAdminDrop);
     }
 
+    /// <inheritdoc />
+    protected override void OnClosed(EventArgs e)
+    {
+        base.OnClosed(e);
+        (DataContext as IDisposable)?.Dispose();
+    }
+
     /// <inheritdoc />
     protected override void OnDataContextChanged(EventArgs e)
     {
@@ -47,12 +54,13 @@ protected override void OnDataContextChanged(EventArgs e)
                     return null;
                 }
 
-                var result = await StorageProvider.OpenFolderPickerAsync(new FolderPickerOpenOptions
+                var folders = await StorageProvider.OpenFolderPickerAsync(new FolderPickerOpenOptions
                 {
                     Title = "Select Content Folder",
                     AllowMultiple = false,
                 });
-                return result.Count > 0 ? result[0].Path.LocalPath : null;
+
+                return folders.Count > 0 ? folders[0].Path.LocalPath : null;
             };
 
             vm.BrowseFileAction = async () =>
@@ -62,17 +70,48 @@ protected override void OnDataContextChanged(EventArgs e)
                     return null;
                 }
 
-                var result = await StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions
+                var files = await StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions
                 {
-                    Title = "Select Files",
+                    Title = "Select Archive File",
                     AllowMultiple = true,
-                    FileTypeFilter = [FilePickerFileTypes.All, new("Zip Archives") { Patterns = ["*.zip"] }],
+                    FileTypeFilter =
+                    [
+                        new FilePickerFileType("Archive Files")
+                        {
+                            Patterns = ["*.zip", "*.7z", "*.rar", "*.tar", "*.gz", "*.big"],
+                        },
+                        new FilePickerFileType("All Files")
+                        {
+                            Patterns = ["*.*"],
+                        },
+                    ],
                 });
-                return result.Count > 0 ? result.Select(f => f.Path.LocalPath).ToList() : null;
+
+                return files.Count > 0 ? files.Select(f => f.Path.LocalPath).ToList() : null;
             };
         }
     }
 
+    /// <summary>
+    /// Handles pointer pressed on the title bar for dragging and maximizing.
+    /// </summary>
+    /// <param name="sender">The sender.</param>
+    /// <param name="e">The event arguments.</param>
+    private void OnTitleBarPointerPressed(object? sender, PointerPressedEventArgs e)
+    {
+        if (e.GetCurrentPoint(this).Properties.IsLeftButtonPressed)
+        {
+            if (e.ClickCount == 2 && CanResize)
+            {
+                WindowState = WindowState == WindowState.Maximized ? WindowState.Normal : WindowState.Maximized;
+            }
+            else
+            {
+                BeginMoveDrag(e);
+            }
+        }
+    }
+
     private void OnAdminDrop(string[] files)
     {
         _ = ProcessAdminDropAsync(files);
diff --git a/GenHub/GenHub/Features/GameProfiles/Views/GameProfileSettingsWindow.axaml b/GenHub/GenHub/Features/GameProfiles/Views/GameProfileSettingsWindow.axaml
index e87816c32..ba31ea2a3 100644
--- a/GenHub/GenHub/Features/GameProfiles/Views/GameProfileSettingsWindow.axaml
+++ b/GenHub/GenHub/Features/GameProfiles/Views/GameProfileSettingsWindow.axaml
@@ -18,6 +18,7 @@
         WindowStartupLocation="CenterOwner"
         Background="#0F0F0F"
         Icon="avares://GenHub/Assets/Icons/generalshub-icon.png"
+        SystemDecorations="Full"
         ExtendClientAreaToDecorationsHint="True"
         ExtendClientAreaChromeHints="NoChrome"
         ExtendClientAreaTitleBarHeightHint="-1">
@@ -437,9 +438,7 @@
                 <Border Grid.Row="0"
                         Background="Transparent"
                         Height="60"
-                        PointerPressed="OnHeaderPointerPressed"
-                        PointerMoved="OnHeaderPointerMoved"
-                        PointerReleased="OnHeaderPointerReleased">
+                        PointerPressed="OnHeaderPointerPressed">
                     <Grid ColumnDefinitions="Auto,*,Auto" Margin="24,0">
                         <!-- Profile Icon & Name Group -->
                         <StackPanel Grid.Column="0" Orientation="Horizontal" Spacing="16" VerticalAlignment="Center">
diff --git a/GenHub/GenHub/Features/GameProfiles/Views/GameProfileSettingsWindow.axaml.cs b/GenHub/GenHub/Features/GameProfiles/Views/GameProfileSettingsWindow.axaml.cs
index 64273c1c5..bd3288392 100644
--- a/GenHub/GenHub/Features/GameProfiles/Views/GameProfileSettingsWindow.axaml.cs
+++ b/GenHub/GenHub/Features/GameProfiles/Views/GameProfileSettingsWindow.axaml.cs
@@ -3,7 +3,6 @@
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Markup.Xaml;
-using Avalonia.VisualTree;
 using GenHub.Core.Constants;
 using GenHub.Features.GameProfiles.ViewModels;
 
@@ -18,11 +17,6 @@ public partial class GameProfileSettingsWindow : Window
     private static double? _savedWidth;
     private static double? _savedHeight;
 
-    // Fields for manual drag detection to allow double-click to work
-    private bool _isMouseDown;
-    private Point _mouseDownPosition;
-    private PointerPressedEventArgs? _pressedEventArgs;
-
     /// <summary>
     /// Initializes a new instance of the <see cref="GameProfileSettingsWindow"/> class.
     /// </summary>
@@ -30,9 +24,6 @@ public GameProfileSettingsWindow()
     {
         InitializeComponent();
 
-        // Wire up drag handlers to the header in the shared content view
-        WireUpDragHandlers();
-
         // Subscribe to DataContext changes to handle commands
         DataContextChanged += OnDataContextChanged;
 
@@ -50,69 +41,19 @@ public GameProfileSettingsWindow()
     /// <param name="e">The event arguments.</param>
     public void OnHeaderPointerPressed(object? sender, PointerPressedEventArgs e)
     {
-        if (e.ClickCount == 2)
+        if (e.GetCurrentPoint(this).Properties.IsLeftButtonPressed)
         {
-            WindowState = WindowState == WindowState.Maximized ? WindowState.Normal : WindowState.Maximized;
-            _isMouseDown = false;
-            _pressedEventArgs = null;
-        }
-        else
-        {
-            _isMouseDown = true;
-            _mouseDownPosition = e.GetPosition(this);
-            _pressedEventArgs = e;
-        }
-    }
-
-    /// <summary>
-    /// Handles pointer moved to initiate drag only after a threshold, allowing double-clicks to pass through.
-    /// </summary>
-    /// <param name="sender">The sender.</param>
-    /// <param name="e">The event arguments.</param>
-    public void OnHeaderPointerMoved(object? sender, PointerEventArgs e)
-    {
-        if (!_isMouseDown || _pressedEventArgs == null)
-        {
-            return;
-        }
-
-        var currentPosition = e.GetPosition(this);
-        var distance = Math.Sqrt(Math.Pow(currentPosition.X - _mouseDownPosition.X, 2) + Math.Pow(currentPosition.Y - _mouseDownPosition.Y, 2));
-
-        // Drag threshold of 3 pixels
-        if (distance > 3)
-        {
-            if (WindowState == WindowState.Maximized)
+            if (e.ClickCount == 2 && CanResize)
             {
-                var screenX = Position.X + (currentPosition.X * RenderScaling);
-                var screenY = Position.Y + (currentPosition.Y * RenderScaling);
-
-                WindowState = WindowState.Normal;
-
-                var targetWidth = _savedWidth ?? Width;
-                var newX = screenX - ((targetWidth * RenderScaling) / 2);
-                var newY = screenY - (_mouseDownPosition.Y * RenderScaling);
-
-                Position = new PixelPoint((int)newX, (int)newY);
+                WindowState = WindowState == WindowState.Maximized ? WindowState.Normal : WindowState.Maximized;
+            }
+            else
+            {
+                BeginMoveDrag(e);
             }
-
-            BeginMoveDrag(_pressedEventArgs);
-            _isMouseDown = false;
-            _pressedEventArgs = null;
         }
     }
 
-    /// <summary>
-    /// Handles pointer released to reset drag state.
-    /// </summary>
-    /// <param name="sender">The sender.</param>
-    /// <param name="e">The event arguments.</param>
-    public void OnHeaderPointerReleased(object? sender, PointerReleasedEventArgs e)
-    {
-        _isMouseDown = false;
-        _pressedEventArgs = null;
-    }
-
     /// <summary>
     /// Handles the toggle fullscreen button click.
     /// </summary>
@@ -140,20 +81,6 @@ protected override void OnClosed(EventArgs e)
         base.OnClosed(e);
     }
 
-    /// <summary>
-    /// Wires up pointer event handlers to the header border in the shared content view.
-    /// </summary>
-    private void WireUpDragHandlers()
-    {
-        // Find the named header border in the shared content view
-        if (this.FindControl<GameProfileSettingsContentView>("ContentView")?.FindControl<Border>("HeaderBorder") is { } headerBorder)
-        {
-            headerBorder.PointerPressed += OnHeaderPointerPressed;
-            headerBorder.PointerMoved += OnHeaderPointerMoved;
-            headerBorder.PointerReleased += OnHeaderPointerReleased;
-        }
-    }
-
     private void InitializeComponent()
     {
         AvaloniaXamlLoader.Load(this);
diff --git a/GenHub/GenHub/Features/GameProfiles/Views/Wizard/SetupWizardView.axaml.cs b/GenHub/GenHub/Features/GameProfiles/Views/Wizard/SetupWizardView.axaml.cs
index 07fe4ce37..78c4b9180 100644
--- a/GenHub/GenHub/Features/GameProfiles/Views/Wizard/SetupWizardView.axaml.cs
+++ b/GenHub/GenHub/Features/GameProfiles/Views/Wizard/SetupWizardView.axaml.cs
@@ -1,8 +1,11 @@
+using System;
 using Avalonia;
 using Avalonia.Controls;
+#if DEBUG
+using Avalonia.Diagnostics;
+#endif
 using Avalonia.Markup.Xaml;
 using GenHub.Features.GameProfiles.ViewModels.Wizard;
-using System;
 
 namespace GenHub.Features.GameProfiles.Views.Wizard;
 
diff --git a/GenHub/GenHub/Features/Info/Services/MockToolServices.cs b/GenHub/GenHub/Features/Info/Services/MockToolServices.cs
index 0e1aaae7e..50ced9287 100644
--- a/GenHub/GenHub/Features/Info/Services/MockToolServices.cs
+++ b/GenHub/GenHub/Features/Info/Services/MockToolServices.cs
@@ -6,6 +6,7 @@
 using System.Reactive.Subjects;
 using System.Threading;
 using System.Threading.Tasks;
+using GenHub.Core.Constants;
 using GenHub.Core.Interfaces.Common;
 using GenHub.Core.Interfaces.Content;
 using GenHub.Core.Interfaces.GameProfiles;
@@ -43,6 +44,7 @@ public class MockNotificationService : INotificationService
     private readonly Subject<Guid> _dismissRequests = new();
     private readonly Subject<bool> _dismissAllRequests = new();
     private readonly Subject<NotificationMessage> _notificationHistory = new();
+    private readonly Subject<(Guid Id, string? Title, string Message)> _updateRequests = new();
 
     /// <inheritdoc/>
     public IObservable<NotificationMessage> Notifications => _notifications.AsObservable();
@@ -56,6 +58,9 @@ public class MockNotificationService : INotificationService
     /// <inheritdoc/>
     public IObservable<NotificationMessage> NotificationHistory => _notificationHistory.AsObservable();
 
+    /// <inheritdoc/>
+    public IObservable<(Guid Id, string? Title, string Message)> UpdateRequests => _updateRequests.AsObservable();
+
     /// <inheritdoc/>
     public void Show(NotificationMessage notification) => _notifications.OnNext(notification);
 
@@ -75,6 +80,10 @@ public void ShowWarning(string title, string message, int? autoDismissMs = null,
     public void ShowError(string title, string message, int? autoDismissMs = null, bool showInBadge = false)
         => Show(new NotificationMessage(NotificationType.Error, title, message, autoDismissMs, showInBadge: showInBadge));
 
+    /// <inheritdoc/>
+    public void Update(Guid notificationId, string message, string? title = null)
+        => _updateRequests.OnNext((notificationId, title, message));
+
     /// <inheritdoc/>
     public void Dismiss(Guid id) => _dismissRequests.OnNext(id);
 
@@ -457,7 +466,18 @@ public Task<MapPack> CreateMapPackAsync(string name, Guid? profileId, IEnumerabl
 public class MockLocalContentService : ILocalContentService
 {
     /// <inheritdoc/>
-    public IReadOnlyList<ContentType> AllowedContentTypes => [ContentType.Mod, ContentType.Map, ContentType.GameClient];
+    public IReadOnlyList<ContentType> AllowedContentTypes =>
+    [
+        ContentType.Mod,
+        ContentType.GameClient,
+        ContentType.Executable,
+        ContentType.ModdingTool,
+        ContentType.Patch,
+        ContentType.Addon,
+        ContentType.Map,
+        ContentType.MapPack,
+        ContentType.Mission,
+    ];
 
     /// <inheritdoc/>
     public Task<OperationResult<ContentManifest>> AddLocalContentAsync(string name, string directoryPath, ContentType contentType, GameType targetGame, CancellationToken cancellationToken = default)
@@ -466,18 +486,26 @@ public Task<OperationResult<ContentManifest>> AddLocalContentAsync(string name,
     }
 
     /// <inheritdoc/>
-    public Task<OperationResult<ContentManifest>> CreateLocalContentManifestAsync(string directoryPath, string name, ContentType contentType, GameType targetGame, string? sourcePath = null, IProgress<ContentStorageProgress>? progress = null, CancellationToken cancellationToken = default)
+    public Task<OperationResult<ContentManifest>> CreateLocalContentManifestAsync(string directoryPath, string name, ContentType contentType, GameType targetGame, string? sourcePath = null, IProgress<ContentStorageProgress>? progress = null, CancellationToken cancellationToken = default, string? entryPoint = null)
     {
-         return Task.FromResult(OperationResult<ContentManifest>.CreateSuccess(new ContentManifest { Name = name, ContentType = contentType, TargetGame = targetGame, SourcePath = sourcePath }));
+        var normalizedEntryPoint = !string.IsNullOrWhiteSpace(entryPoint)
+            ? entryPoint.Replace('\\', '/').TrimStart('/')
+            : null;
+
+        return Task.FromResult(OperationResult<ContentManifest>.CreateSuccess(new ContentManifest { Name = name, ContentType = contentType, TargetGame = targetGame, SourcePath = sourcePath, EntryPoint = normalizedEntryPoint }));
     }
 
     /// <inheritdoc/>
     public Task<OperationResult> DeleteLocalContentAsync(string manifestId, CancellationToken cancellationToken = default) => Task.FromResult(OperationResult.CreateSuccess());
 
     /// <inheritdoc/>
-    public Task<OperationResult<ContentManifest>> UpdateLocalContentManifestAsync(string existingManifestId, string name, string directoryPath, ContentType contentType, GameType targetGame, string? sourcePath = null, IProgress<ContentStorageProgress>? progress = null, CancellationToken cancellationToken = default)
+    public Task<OperationResult<ContentManifest>> UpdateLocalContentManifestAsync(string existingManifestId, string name, string directoryPath, ContentType contentType, GameType targetGame, string? sourcePath = null, IProgress<ContentStorageProgress>? progress = null, CancellationToken cancellationToken = default, string? entryPoint = null)
     {
-        return Task.FromResult(OperationResult<ContentManifest>.CreateSuccess(new ContentManifest { Name = name, ContentType = contentType, TargetGame = targetGame, SourcePath = sourcePath }));
+        var normalizedEntryPoint = !string.IsNullOrWhiteSpace(entryPoint)
+            ? entryPoint.Replace('\\', '/').TrimStart('/')
+            : null;
+
+        return Task.FromResult(OperationResult<ContentManifest>.CreateSuccess(new ContentManifest { Name = name, ContentType = contentType, TargetGame = targetGame, SourcePath = sourcePath, EntryPoint = normalizedEntryPoint }));
     }
 }
 
@@ -573,6 +601,12 @@ public static void UseDefaultConfiguration()
     /// <inheritdoc/>
     public bool GetAutoCheckForUpdatesOnStartup() => true;
 
+    /// <inheritdoc/>
+    public bool GetAutoCheckForUpdatesPeriodically() => true;
+
+    /// <inheritdoc/>
+    public int GetPeriodicUpdateCheckIntervalMinutes() => AppUpdateConstants.DefaultPeriodicUpdateCheckIntervalMinutes;
+
     /// <inheritdoc/>
     public bool GetEnableDetailedLogging() => false;
 
diff --git a/GenHub/GenHub/Features/Notifications/Services/NotificationService.cs b/GenHub/GenHub/Features/Notifications/Services/NotificationService.cs
index 92c8154e2..fac3c8e95 100644
--- a/GenHub/GenHub/Features/Notifications/Services/NotificationService.cs
+++ b/GenHub/GenHub/Features/Notifications/Services/NotificationService.cs
@@ -24,6 +24,7 @@ public class NotificationService : INotificationService, IDisposable
     private readonly Subject<Guid> _dismissSubject = new();
     private readonly Subject<bool> _dismissAllSubject = new();
     private readonly Subject<NotificationMessage> _historySubject = new();
+    private readonly Subject<(Guid Id, string? Title, string Message)> _updateSubject = new();
     private readonly List<NotificationMessage> _notificationHistory = new();
     private readonly object _historyLock = new();
     private readonly object _muteLock = new();
@@ -74,6 +75,9 @@ public NotificationService(
     /// <inheritdoc/>
     public IObservable<NotificationMessage> NotificationHistory => _historySubject;
 
+    /// <inheritdoc/>
+    public IObservable<(Guid Id, string? Title, string Message)> UpdateRequests => _updateSubject;
+
     /// <inheritdoc/>
     public NotificationMuteState MuteState
     {
@@ -175,6 +179,35 @@ public void Show(NotificationMessage notification)
         }
     }
 
+    /// <inheritdoc/>
+    public void Update(Guid notificationId, string message, string? title = null)
+    {
+        if (_disposed)
+        {
+            _logger.LogWarning("Attempted to update notification after service disposal");
+            return;
+        }
+
+        ArgumentNullException.ThrowIfNull(message);
+
+        lock (_historyLock)
+        {
+            var index = _notificationHistory.FindIndex(n => n.Id == notificationId);
+            if (index >= 0)
+            {
+                var existing = _notificationHistory[index];
+                _notificationHistory[index] = existing with
+                {
+                    Title = title ?? existing.Title,
+                    Message = message,
+                };
+            }
+        }
+
+        _logger.LogDebug("Updating notification {NotificationId}: {Message}", notificationId, message);
+        _updateSubject.OnNext((notificationId, title, message));
+    }
+
     /// <inheritdoc/>
     public async Task MuteSession(CancellationToken cancellationToken = default)
     {
@@ -317,6 +350,7 @@ public void Dispose()
         _dismissSubject?.Dispose();
         _dismissAllSubject?.Dispose();
         _historySubject?.Dispose();
+        _updateSubject?.Dispose();
         _disposed = true;
         GC.SuppressFinalize(this);
     }
diff --git a/GenHub/GenHub/Features/Notifications/ViewModels/NotificationItemViewModel.cs b/GenHub/GenHub/Features/Notifications/ViewModels/NotificationItemViewModel.cs
index 235bacfea..a010e81bd 100644
--- a/GenHub/GenHub/Features/Notifications/ViewModels/NotificationItemViewModel.cs
+++ b/GenHub/GenHub/Features/Notifications/ViewModels/NotificationItemViewModel.cs
@@ -37,15 +37,11 @@ public partial class NotificationItemViewModel : ViewModelBase, IDisposable
     /// </summary>
     public NotificationType Type { get; }
 
-    /// <summary>
-    /// Gets the notification title.
-    /// </summary>
-    public string Title { get; }
+    [ObservableProperty]
+    private string _title;
 
-    /// <summary>
-    /// Gets the notification message.
-    /// </summary>
-    public string Message { get; }
+    [ObservableProperty]
+    private string _message;
 
     /// <summary>
     /// Gets the timestamp when the notification was created.
@@ -118,8 +114,8 @@ public NotificationItemViewModel(
 
         Id = notification.Id;
         Type = notification.Type;
-        Title = notification.Title;
-        Message = notification.Message;
+        _title = notification.Title;
+        _message = notification.Message;
         Timestamp = notification.Timestamp;
         IsActionable = notification.IsActionable;
         _isVisible = false;
@@ -135,10 +131,7 @@ public NotificationItemViewModel(
             StartDismissTimer(notification.AutoDismissMilliseconds.Value);
         }
 
-        Dispatcher.UIThread.Post(() =>
-        {
-            IsVisible = true;
-        });
+        Dispatcher.UIThread.Post(() => IsVisible = true);
     }
 
     /// <summary>
diff --git a/GenHub/GenHub/Features/Notifications/ViewModels/NotificationManagerViewModel.cs b/GenHub/GenHub/Features/Notifications/ViewModels/NotificationManagerViewModel.cs
index 2637c7758..8b174a82f 100644
--- a/GenHub/GenHub/Features/Notifications/ViewModels/NotificationManagerViewModel.cs
+++ b/GenHub/GenHub/Features/Notifications/ViewModels/NotificationManagerViewModel.cs
@@ -20,6 +20,7 @@ public class NotificationManagerViewModel : ViewModelBase, IDisposable
     private readonly IDisposable _notificationSubscription;
     private readonly IDisposable _dismissSubscription;
     private readonly IDisposable _dismissAllSubscription;
+    private readonly IDisposable _updateSubscription;
     private readonly object _lock = new();
     private bool _disposed;
 
@@ -48,6 +49,7 @@ public NotificationManagerViewModel(
         _notificationSubscription = _notificationService.Notifications.Subscribe(HandleNotificationReceived);
         _dismissSubscription = _notificationService.DismissRequests.Subscribe(HandleDismissRequest);
         _dismissAllSubscription = _notificationService.DismissAllRequests.Subscribe(_ => HandleDismissAllRequest());
+        _updateSubscription = _notificationService.UpdateRequests.Subscribe(HandleUpdateRequest);
 
         _logger.LogInformation("NotificationManagerViewModel initialized");
     }
@@ -133,6 +135,7 @@ public void Dispose()
         _notificationSubscription?.Dispose();
         _dismissSubscription?.Dispose();
         _dismissAllSubscription?.Dispose();
+        _updateSubscription?.Dispose();
 
         foreach (var notification in ActiveNotifications)
         {
@@ -157,6 +160,37 @@ private void HandleDismissRequest(Guid notificationId)
         RemoveNotification(notificationId);
     }
 
+    private void HandleUpdateRequest((Guid Id, string? Title, string Message) update)
+    {
+        _logger.LogDebug("Update request received for notification {NotificationId}", update.Id);
+        Dispatcher.UIThread.InvokeAsync(
+            () =>
+            {
+                try
+                {
+                    lock (_lock)
+                    {
+                        var notification = ActiveNotifications.FirstOrDefault(n => n.Id == update.Id);
+                        if (notification != null)
+                        {
+                            if (update.Title is not null)
+                            {
+                                notification.Title = update.Title;
+                            }
+
+                            notification.Message = update.Message;
+                            _logger.LogDebug("Updated notification {NotificationId} message: {Message}", update.Id, update.Message);
+                        }
+                    }
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogError(ex, "Error updating notification {NotificationId}", update.Id);
+                }
+            },
+            DispatcherPriority.Send);
+    }
+
     private void HandleDismissAllRequest()
     {
         _logger.LogDebug("Dismiss all request received");
diff --git a/GenHub/GenHub/Features/Settings/ViewModels/SettingsViewModel.cs b/GenHub/GenHub/Features/Settings/ViewModels/SettingsViewModel.cs
index 32cce78ad..07322e27e 100644
--- a/GenHub/GenHub/Features/Settings/ViewModels/SettingsViewModel.cs
+++ b/GenHub/GenHub/Features/Settings/ViewModels/SettingsViewModel.cs
@@ -128,6 +128,12 @@ public partial class SettingsViewModel : ObservableObject, IDisposable
     [ObservableProperty]
     private bool _autoCheckForUpdatesOnStartup = true;
 
+    [ObservableProperty]
+    private bool _autoCheckForUpdatesPeriodically = true;
+
+    [ObservableProperty]
+    private int _periodicUpdateCheckIntervalMinutes = AppUpdateConstants.DefaultPeriodicUpdateCheckIntervalMinutes;
+
     [ObservableProperty]
     private bool _allowBackgroundDownloads = true;
 
@@ -195,12 +201,6 @@ public partial class SettingsViewModel : ObservableObject, IDisposable
     [ObservableProperty]
     private string _patStatusMessage = string.Empty;
 
-    [ObservableProperty]
-    private bool _isLoadingArtifacts;
-
-    [ObservableProperty]
-    private ObservableCollection<ArtifactUpdateInfo> _availableArtifacts = [];
-
     /// <summary>
     /// Initializes a new instance of the <see cref="SettingsViewModel"/> class.
     /// </summary>
@@ -486,6 +486,8 @@ private void LoadSettings()
             WorkspacePath = settings.WorkspacePath;
             MaxConcurrentDownloads = settings.MaxConcurrentDownloads;
             AutoCheckForUpdatesOnStartup = settings.AutoCheckForUpdatesOnStartup;
+            AutoCheckForUpdatesPeriodically = settings.AutoCheckForUpdatesPeriodically;
+            PeriodicUpdateCheckIntervalMinutes = settings.PeriodicUpdateCheckIntervalMinutes;
             AllowBackgroundDownloads = settings.AllowBackgroundDownloads;
             EnableDetailedLogging = settings.EnableDetailedLogging;
             DefaultWorkspaceStrategy = settings.DefaultWorkspaceStrategy;
@@ -540,6 +542,8 @@ private async Task SaveSettings()
                 settings.WorkspacePath = WorkspacePath;
                 settings.MaxConcurrentDownloads = MaxConcurrentDownloads;
                 settings.AutoCheckForUpdatesOnStartup = AutoCheckForUpdatesOnStartup;
+                settings.AutoCheckForUpdatesPeriodically = AutoCheckForUpdatesPeriodically;
+                settings.PeriodicUpdateCheckIntervalMinutes = PeriodicUpdateCheckIntervalMinutes;
                 settings.AllowBackgroundDownloads = AllowBackgroundDownloads;
                 settings.EnableDetailedLogging = EnableDetailedLogging;
                 settings.DefaultWorkspaceStrategy = DefaultWorkspaceStrategy;
@@ -569,6 +573,12 @@ private async Task SaveSettings()
 
             await _userSettingsService.SaveAsync();
 
+            // Notify components of updated update settings
+            WeakReferenceMessenger.Default.Send(new UpdateSettingsChangedMessage(
+                AutoCheckForUpdatesOnStartup,
+                AutoCheckForUpdatesPeriodically,
+                PeriodicUpdateCheckIntervalMinutes));
+
             // Apply log level change immediately without restart
             Infrastructure.DependencyInjection.LoggingModule.SetLogLevel(EnableDetailedLogging);
 
@@ -600,6 +610,8 @@ private async Task ResetToDefaults()
             WorkspacePath = string.Empty;
             MaxConcurrentDownloads = DownloadDefaults.MaxConcurrentDownloads;
             AutoCheckForUpdatesOnStartup = true;
+            AutoCheckForUpdatesPeriodically = true;
+            PeriodicUpdateCheckIntervalMinutes = AppUpdateConstants.DefaultPeriodicUpdateCheckIntervalMinutes;
             AllowBackgroundDownloads = true;
             EnableDetailedLogging = false;
             DefaultWorkspaceStrategy = WorkspaceConstants.DefaultWorkspaceStrategy;
@@ -744,6 +756,14 @@ private bool ValidateSettings()
             DownloadBufferSizeKB = DownloadDefaults.BufferSizeKB;
         }
 
+        // Validate periodic update check interval
+        if (PeriodicUpdateCheckIntervalMinutes < AppUpdateConstants.MinPeriodicUpdateCheckIntervalMinutes ||
+            PeriodicUpdateCheckIntervalMinutes > AppUpdateConstants.MaxPeriodicUpdateCheckIntervalMinutes)
+        {
+            _logger.LogWarning("Invalid PeriodicUpdateCheckIntervalMinutes value: {Value}. Resetting to default.", PeriodicUpdateCheckIntervalMinutes);
+            PeriodicUpdateCheckIntervalMinutes = AppUpdateConstants.DefaultPeriodicUpdateCheckIntervalMinutes;
+        }
+
         // Validate game install path if specified
         if (!string.IsNullOrEmpty(WorkspacePath) && !Directory.Exists(WorkspacePath))
         {
@@ -1007,7 +1027,6 @@ private async Task DeletePatAsync()
             HasGitHubPat = false;
             IsPatValid = false;
             PatStatusMessage = "GitHub PAT removed";
-            AvailableArtifacts.Clear();
         }
         catch (Exception ex)
         {
@@ -1034,45 +1053,6 @@ private void OpenUpdateWindow()
         }
     }
 
-    /// <summary>
-    /// Loads available CI artifacts for selection.
-    /// </summary>
-    [RelayCommand]
-    private async Task LoadArtifactsAsync()
-    {
-        if (_updateManager == null || !HasGitHubPat)
-        {
-            PatStatusMessage = "Configure a GitHub PAT to load artifacts";
-            return;
-        }
-
-        IsLoadingArtifacts = true;
-        AvailableArtifacts.Clear();
-
-        try
-        {
-            var artifact = await _updateManager.CheckForArtifactUpdatesAsync();
-            if (artifact != null)
-            {
-                AvailableArtifacts.Add(artifact);
-                PatStatusMessage = $"Found {AvailableArtifacts.Count} artifact(s)";
-            }
-            else
-            {
-                PatStatusMessage = "No artifacts available";
-            }
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Failed to load artifacts");
-            PatStatusMessage = $"Error loading artifacts: {ex.Message}";
-        }
-        finally
-        {
-            IsLoadingArtifacts = false;
-        }
-    }
-
     [RelayCommand]
     private async Task DeleteAllData()
     {
diff --git a/GenHub/GenHub/Features/Settings/Views/SettingsView.axaml b/GenHub/GenHub/Features/Settings/Views/SettingsView.axaml
index 719a8ae05..7a022331b 100644
--- a/GenHub/GenHub/Features/Settings/Views/SettingsView.axaml
+++ b/GenHub/GenHub/Features/Settings/Views/SettingsView.axaml
@@ -734,6 +734,28 @@
                        Classes="setting-description" Margin="24,0,0,0" />
           </StackPanel>
 
+          <!-- Periodic Update Check -->
+          <StackPanel Spacing="8">
+            <CheckBox Content="Check for updates periodically"
+                      IsChecked="{Binding AutoCheckForUpdatesPeriodically}" />
+            <TextBlock Text="Automatically check for updates in the background at regular intervals"
+                       Classes="setting-description" Margin="24,0,0,0" />
+          </StackPanel>
+
+          <StackPanel Spacing="8" IsVisible="{Binding AutoCheckForUpdatesPeriodically}">
+            <TextBlock Text="Update Check Interval (Minutes)" Classes="setting-label" />
+            <NumericUpDown Value="{Binding PeriodicUpdateCheckIntervalMinutes}"
+                           Minimum="5"
+                           Maximum="10080"
+                           Increment="5"
+                           HorizontalAlignment="Left"
+                           Width="120"
+                           FormatString="F0"
+                           LostFocus="OnTextBoxLostFocus" />
+            <TextBlock Text="How often to automatically check for updates (5-10080 minutes, default: 30 minutes)"
+                       Classes="setting-description" />
+          </StackPanel>
+
           <!-- GitHub PAT for Artifact Access -->
           <Border Background="#1E1E1E" CornerRadius="4" Padding="15" BorderBrush="#4E4E4E" BorderThickness="1">
             <StackPanel Spacing="12">
@@ -770,10 +792,6 @@
                 <Button Content="Remove PAT"
                         Command="{Binding DeletePatCommand}"
                         Classes="secondary-button" />
-                <Button Content="Refresh Artifacts"
-                        Command="{Binding LoadArtifactsCommand}"
-                        IsEnabled="{Binding !IsLoadingArtifacts}"
-                        Classes="browse-button" />
               </StackPanel>
 
               <StackPanel Orientation="Horizontal" Spacing="12">
@@ -800,38 +818,6 @@
               </Border>
             </StackPanel>
           </Border>
-
-          <!-- Available Artifacts (for PAT users) -->
-          <StackPanel Spacing="8" IsVisible="{Binding HasGitHubPat}">
-            <TextBlock Text="Available CI Artifacts" Classes="setting-label" />
-            <ItemsControl ItemsSource="{Binding AvailableArtifacts}">
-              <ItemsControl.ItemTemplate>
-                <DataTemplate>
-                  <Border Background="#3D3D3D" CornerRadius="4" Padding="12" Margin="0,4">
-                    <Grid ColumnDefinitions="*,Auto">
-                      <StackPanel Grid.Column="0" Spacing="4">
-                        <TextBlock Text="{Binding DisplayVersion}" FontWeight="SemiBold" Foreground="#FFFFFF" />
-                        <StackPanel Orientation="Horizontal" Spacing="8">
-                          <TextBlock Text="{Binding CreatedAt, StringFormat='{}{0:yyyy-MM-dd HH:mm}'}"
-                                     Foreground="#AAAAAA" FontSize="11" />
-                          <TextBlock Text="{Binding ArtifactName}"
-                                     Foreground="#888888" FontSize="11" />
-                        </StackPanel>
-                      </StackPanel>
-                      <Button Grid.Column="1"
-                              Content="View Run →"
-                              Classes="browse-button"
-                              Click="OnViewWorkflowRun"
-                              Tag="{Binding WorkflowRunUrl}" />
-                    </Grid>
-                  </Border>
-                </DataTemplate>
-              </ItemsControl.ItemTemplate>
-            </ItemsControl>
-            <TextBlock Text="No artifacts available"
-                       IsVisible="{Binding !AvailableArtifacts.Count}"
-                       Foreground="#888888" FontStyle="Italic" />
-          </StackPanel>
         </StackPanel>
       </Border>
       </Expander>
diff --git a/GenHub/GenHub/Features/Settings/Views/SettingsView.axaml.cs b/GenHub/GenHub/Features/Settings/Views/SettingsView.axaml.cs
index 35feceb9d..a4bb91502 100644
--- a/GenHub/GenHub/Features/Settings/Views/SettingsView.axaml.cs
+++ b/GenHub/GenHub/Features/Settings/Views/SettingsView.axaml.cs
@@ -20,7 +20,7 @@ public SettingsView()
         InitializeComponent();
 
         // Handle pointer press to unfocus text boxes when clicking elsewhere
-        this.AddHandler(PointerPressedEvent, OnPointerPressed, RoutingStrategies.Tunnel);
+        AddHandler(PointerPressedEvent, OnPointerPressed, RoutingStrategies.Tunnel);
     }
 
     /// <summary>
@@ -59,7 +59,7 @@ protected override void OnDataContextChanged(EventArgs e)
         if (DataContext is SettingsViewModel vm)
         {
             // Sync visibility state with current visual tree state
-            vm.IsViewVisible = this.VisualRoot != null;
+            vm.IsViewVisible = VisualRoot != null;
         }
     }
 
@@ -68,7 +68,7 @@ private void OnPointerPressed(object? sender, Avalonia.Input.PointerPressedEvent
         // If clicking outside of a TextBox, clear focus from any focused TextBox
         if (e.Source is not TextBox)
         {
-            this.Focus();
+            Focus();
         }
     }
 
@@ -95,24 +95,6 @@ private void OnOpenPatCreationUrl(object? sender, RoutedEventArgs e)
         }
     }
 
-    private void OnViewWorkflowRun(object? sender, RoutedEventArgs e)
-    {
-        if (sender is Button button && button.Tag is string url && !string.IsNullOrEmpty(url))
-        {
-            try
-            {
-                System.Diagnostics.Process.Start(new System.Diagnostics.ProcessStartInfo(url)
-                {
-                    UseShellExecute = true,
-                });
-            }
-            catch
-            {
-                // Silently fail if browser cannot be opened
-            }
-        }
-    }
-
     /// <summary>
     /// Loads and initializes the XAML components for this view.
     /// </summary>
diff --git a/GenHub/GenHub/Features/Tools/MapManager/Services/MapImportService.cs b/GenHub/GenHub/Features/Tools/MapManager/Services/MapImportService.cs
index a1e4365df..a371e17bd 100644
--- a/GenHub/GenHub/Features/Tools/MapManager/Services/MapImportService.cs
+++ b/GenHub/GenHub/Features/Tools/MapManager/Services/MapImportService.cs
@@ -42,7 +42,7 @@ public async Task<ImportResult> ImportFromUrlAsync(
             var response = await httpClient.GetAsync(url, HttpCompletionOption.ResponseHeadersRead, ct);
             response.EnsureSuccessStatusCode();
 
-            var fileName = GetFileNameFromUri(new Uri(url), response);
+            var fileName = ExtractFileName(new Uri(url), response);
             Directory.CreateDirectory(tempDir);
             var tempPath = Path.Combine(tempDir, fileName);
 
@@ -512,7 +512,7 @@ public async Task<ImportResult> ImportFromStreamAsync(
         }
     }
 
-    private static string GetFileNameFromUri(Uri uri, HttpResponseMessage response)
+    private static string ExtractFileName(Uri uri, HttpResponseMessage response)
     {
         var rawName = response.Content.Headers.ContentDisposition?.FileNameStar
             ?? response.Content.Headers.ContentDisposition?.FileName;
diff --git a/GenHub/GenHub/Features/Tools/ReplayManager/Services/ReplayImportService.cs b/GenHub/GenHub/Features/Tools/ReplayManager/Services/ReplayImportService.cs
index 827c83b21..2b6540a4d 100644
--- a/GenHub/GenHub/Features/Tools/ReplayManager/Services/ReplayImportService.cs
+++ b/GenHub/GenHub/Features/Tools/ReplayManager/Services/ReplayImportService.cs
@@ -101,7 +101,7 @@ public async Task<ImportResult> ImportFromUrlAsync(
                     return await ImportFromZipAsync(tempPath, targetVersion, progress, ct);
                 }
 
-                var importedFileName = GetFileNameFromUri(new Uri(directUrl));
+                var importedFileName = ExtractFileName(new Uri(directUrl));
                 using var stream = File.OpenRead(tempPath);
                 return await ImportFromStreamAsync(stream, importedFileName, targetVersion, ct);
             }
@@ -336,7 +336,7 @@ private static string GetUniquePath(string path)
         return path;
     }
 
-    private static string GetFileNameFromUri(Uri uri)
+    private static string ExtractFileName(Uri uri)
     {
         try
         {
diff --git a/GenHub/GenHub/Infrastructure/Converters/ExecutableHighlightConverter.cs b/GenHub/GenHub/Infrastructure/Converters/ExecutableHighlightConverter.cs
index b77a7a101..4687e4a74 100644
--- a/GenHub/GenHub/Infrastructure/Converters/ExecutableHighlightConverter.cs
+++ b/GenHub/GenHub/Infrastructure/Converters/ExecutableHighlightConverter.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
+using Avalonia;
 using Avalonia.Data.Converters;
 using Avalonia.Media;
 
@@ -11,7 +12,6 @@ namespace GenHub.Infrastructure.Converters;
 /// </summary>
 public class ExecutableHighlightConverter : IMultiValueConverter
 {
-    private static readonly SolidColorBrush DefaultBrush = new(Color.Parse("#DDDDDD"));
     private static readonly SolidColorBrush ExecutableBrush = new(Color.Parse("#90CAF9")); // Light blue for executables
     private static readonly SolidColorBrush SelectedExecutableBrush = new(Color.Parse("#4CAF50")); // Green for selected
 
@@ -20,7 +20,7 @@ public class ExecutableHighlightConverter : IMultiValueConverter
     {
         if (values.Count < 2)
         {
-            return DefaultBrush;
+            return AvaloniaProperty.UnsetValue;
         }
 
         var isExecutable = values[0] is true;
@@ -36,6 +36,6 @@ public class ExecutableHighlightConverter : IMultiValueConverter
             return ExecutableBrush;
         }
 
-        return DefaultBrush;
+        return AvaloniaProperty.UnsetValue;
     }
 }
diff --git a/GenHub/GenHub/Infrastructure/DependencyInjection/ContentPipelineModule.cs b/GenHub/GenHub/Infrastructure/DependencyInjection/ContentPipelineModule.cs
index ea7246dec..58d9be795 100644
--- a/GenHub/GenHub/Infrastructure/DependencyInjection/ContentPipelineModule.cs
+++ b/GenHub/GenHub/Infrastructure/DependencyInjection/ContentPipelineModule.cs
@@ -4,8 +4,10 @@
 using GenHub.Core.Interfaces.Content;
 using GenHub.Core.Interfaces.GitHub;
 using GenHub.Core.Interfaces.Manifest;
+using GenHub.Core.Interfaces.Parsers;
 using GenHub.Core.Interfaces.Providers;
 using GenHub.Core.Interfaces.Storage;
+using GenHub.Core.Interfaces.Tools;
 using GenHub.Core.Services.Content;
 using GenHub.Core.Services.Providers;
 using GenHub.Core.Services.Providers.VersionSchemes;
@@ -18,9 +20,11 @@
 using GenHub.Features.Content.Services.GeneralsOnline;
 using GenHub.Features.Content.Services.GitHub;
 using GenHub.Features.Content.Services.LocalContent;
+using GenHub.Features.Content.Services.Parsers;
 using GenHub.Features.Content.Services.Publishers;
 using GenHub.Features.Content.Services.Reconciliation;
 using GenHub.Features.Content.Services.SuperHackers;
+using GenHub.Features.Content.Services.Tools;
 using GenHub.Features.Downloads.ViewModels;
 using GenHub.Features.GitHub.Services;
 using GenHub.Features.Manifest;
@@ -308,6 +312,14 @@ private static void AddModDBPipeline(IServiceCollection services)
             httpClient.DefaultRequestHeaders.Add("User-Agent", ApiConstants.DefaultUserAgent);
         });
 
+        // Register Playwright service for web page parsing (singleton for shared browser instance)
+        services.AddSingleton<IPlaywrightService, PlaywrightService>();
+
+        // Register ModDB page parser (concrete and interface)
+        // Note: Multiple IWebPageParser implementations are registered for IEnumerable<IWebPageParser> injection
+        services.AddSingleton<ModDBPageParser>();
+        services.AddSingleton<IWebPageParser>(sp => sp.GetRequiredService<ModDBPageParser>());
+
         // Register ModDB discoverer (concrete and interface) with named HttpClient
         services.AddTransient<ModDBDiscoverer>(sp =>
         {
diff --git a/docs/dev/constants.md b/docs/dev/constants.md
index 0c05a990e..628285b5c 100644
--- a/docs/dev/constants.md
+++ b/docs/dev/constants.md
@@ -68,11 +68,60 @@ Application-wide constants for GenHub.
 
 Constants related to application updates and Velopack.
 
-| Constant                     | Value/Type                  | Description                                      |
-| ---------------------------- | --------------------------- | ------------------------------------------------ |
-| `PostUpdateExitDelay`        | `TimeSpan.FromSeconds(5)`   | Delay before exit after applying update          |
-| `CacheDuration`              | `TimeSpan.FromHours(1)`     | Cache duration for update checks                 |
-| `MaxHttpRetries`             | `3`                         | Maximum number of HTTP retries for failed requests |
+| Constant | Value/Type | Description |
+| --------------------------------------------- | --------------------------- | --------------------------------------------------------------------------------- |
+| `MaxHttpRetries`                              | `3`                         | Maximum number of HTTP retries for failed requests                                |
+| `UpdateTabIndex`                              | `0`                         | Index for the Update tab in update notification views                             |
+| `BrowseBuildsTabIndex`                        | `1`                         | Index for the Browse Builds tab in update notification views                      |
+| `MaxTabIndex`                                 | `1`                         | Maximum valid tab index in update notification views                              |
+| `VelopackDirectory`                          | `"velopack"`                | Velopack directory name                                                           |
+| `ArtifactPrefixWindows`                       | `"genhub-velopack-windows-"`| Artifact name prefix for Windows builds                                           |
+| `ArtifactPrefixLinux`                         | `"genhub-velopack-linux-"`  | Artifact name prefix for Linux builds                                             |
+| `ArtifactNameRelease`                         | `"GenHub-Release"`          | Artifact name for release builds                                                  |
+| `PlatformWindows`                             | `"windows"`                 | Platform string for Windows                                                       |
+| `PlatformLinux`                               | `"linux"`                   | Platform string for Linux                                                         |
+| `CheckingForUpdatesMessage`                   | `"Checking..."`             | Update checking message                                                           |
+| `UpdateAvailableTitleFormat`                  | `"Update available: v{0}"`  | Update available title format string                                              |
+| `UpdateUpToDateMessage`                       | `"You're up to date!"`      | Update up to date message                                                         |
+| `UpdateCheckFailedMessage`                    | `"Update check failed"`     | Update check failed message                                                       |
+| `InstallingMessage`                           | `"Installing..."`           | Installing message                                                                |
+| `InstallUpdateAction`                         | `"Install Update"`          | Install update action text                                                        |
+| `InitializingMessage`                         | `"Initializing..."`         | Initializing message                                                              |
+| `ReadyToRestartMessage`                       | `"Ready to restart"`        | Ready to restart message                                                          |
+| `DownloadingFormat`                           | `"Downloading... {0}%"`     | Downloading format string                                                         |
+| `UpdateDownloadedRestartingMessage`           | `"Update downloaded! Restarting application..."` | Update downloaded and restarting message                     |
+| `UpdateCompleteRestartingMessage`             | `"Update complete! Restarting..."` | Update complete and restarting message                                     |
+| `DownloadingUpdateMessage`                    | `"Downloading update..."`   | Downloading update status message                                                 |
+| `CannotInstallFromLocationMessage`            | `"Cannot install from this location"` | Cannot install from location status message                               |
+| `UpdateFailedMessage`                         | `"Update failed"`           | Update failed status message                                                      |
+| `InstallationFailedMessage`                   | `"Installation failed"`     | Installation failed status message                                                |
+| `NoArtifactAvailableMessage`                  | `"No artifact available"`   | No artifact available status message                                              |
+| `NoVersionsFoundMessage`                      | `"No versions found"`       | No versions found dropdown placeholder                                            |
+| `LoadingVersionsMessage`                      | `"Loading versions..."`     | Loading versions dropdown placeholder                                             |
+| `SelectVersionMessage`                        | `"Select a version"`        | Select a version dropdown placeholder                                             |
+| `NotAvailable`                                | `"N/A"`                     | Not available string                                                              |
+| `UpdateInstallationRequiresAppInstalledMessage` | Format string             | Message format when trying to install update from uninstalled debug directory      |
+| `UpdateAvailableNotificationTitle`            | `"Update Available"`        | Update available notification title for release channel                           |
+| `BranchUpdateAvailableNotificationTitle`      | `"Branch Update Available"` | Update available notification title for branch subscriptions                      |
+| `PrUpdateAvailableNotificationTitle`          | `"PR Update Available"`     | Update available notification title for PR subscriptions                          |
+| `UpdateAction`                                | `"Update"`                  | Update action button text                                                         |
+| `UpdatingAppNotificationTitle`                | `"Updating GenHub"`         | Title for update in progress notification                                         |
+| `UpdateStartingMessage`                       | `"Starting update..."`      | Starting update progress message                                                  |
+| `UpdateFailedNotificationTitle`               | `"Update Failed"`           | Title for update failed notification                                              |
+| `UpdateFailedNotificationFormat`              | `"Failed to install update: {0}"` | Update failed notification body format string                               |
+| `ViewUpdatesAction`                           | `"View Updates"`            | View updates action button text                                                   |
+| `ReleaseUpdateNotificationFormat`             | `"A new version ({0}) is available."` | Release update notification body format string                            |
+| `BranchUpdateNotificationFormat`              | `"A new build ({0}) is available on branch '{1}'."` | Branch update notification body format string        |
+| `PrUpdateNotificationFormat`                  | `"A new build ({0}) is available for PR #{1}."` | PR update notification body format string                |
+| `SortOptionLastUpdated`                       | `"Last Updated"`            | Sort option: sort by last updated date descending                                 |
+| `SortOptionPrNumberDesc`                      | `"PR Number (Highest)"`     | Sort option: sort by pull request number descending                               |
+| `SortOptionPrNumberAsc`                       | `"PR Number (Lowest)"`      | Sort option: sort by pull request number ascending                                |
+| `DefaultPeriodicUpdateCheckIntervalMinutes`   | `30`                        | Default interval in minutes for periodic update checks (30 minutes)               |
+| `MinPeriodicUpdateCheckIntervalMinutes`       | `5`                         | Minimum interval in minutes for periodic update checks (5 minutes)                 |
+| `MaxPeriodicUpdateCheckIntervalMinutes`       | `10080`                     | Maximum interval in minutes for periodic update checks (10080 minutes / 7 days)   |
+| `PeriodicUpdateCheckIntervalIncrementMinutes` | `5`                         | Increment step in minutes for periodic update check interval setting (5 minutes)  |
+| `PostUpdateExitDelay`                         | `TimeSpan.FromSeconds(5)`   | Delay before exit after applying update (5 seconds)                               |
+| `CacheDuration`                               | `TimeSpan.FromHours(1)`     | Cache duration for update checks (1 hour)                                         |
 
 ---
 
diff --git a/docs/dev/index.md b/docs/dev/index.md
index a9350bf97..e8c8e1a56 100644
--- a/docs/dev/index.md
+++ b/docs/dev/index.md
@@ -64,6 +64,12 @@ client.Timeout = TimeIntervals.DownloadTimeout;
 
 ---
 
+### Window Styling & OS Animations
+
+GeneralsHub defines a mandatory [Window styling and OS animation standard](./window-styling.md) to ensure all windows achieve smooth, native Desktop Window Manager (DWM) animations, proper client area extension, and reliable title bar drag/maximize handling.
+
+---
+
 ## Architecture
 
 ### Dependency Injection
diff --git a/docs/dev/window-styling.md b/docs/dev/window-styling.md
new file mode 100644
index 000000000..dd0d0ab20
--- /dev/null
+++ b/docs/dev/window-styling.md
@@ -0,0 +1,147 @@
+---
+title: Window Styling and OS Animation Standards
+description: Guidelines and architectural rules for Avalonia window configuration, custom title bars, and native OS maximize/restore animations in GenHub
+---
+
+# Window Styling & OS Animation Standards
+
+This document establishes the mandatory standards for creating and configuring `Window` instances in GenHub. Following these patterns ensures that all windows achieve smooth, native OS animations (such as Desktop Window Manager / DWM fluid maximize, restore, snap, and dragging transitions) without clunkiness or visual glitches.
+
+---
+
+## 1. The Core Architecture: Native DWM Integration
+
+Avalonia runs cross-platform across Windows, Linux, and macOS. On Windows (Win32), the operating system's **Desktop Window Manager (DWM)** manages fluid maximize/restore zoom animations, Aero Snap, and window shadows.
+
+For DWM to provide native fluid animations on windows with custom-styled title bars, the window **MUST** retain its native top-level frame (`WS_OVERLAPPEDWINDOW`) while extending its client area over the OS chrome.
+
+### Mandatory Window XAML Properties
+
+All resizable windows with custom title bars in GenHub must define these attributes:
+
+```xml
+<Window xmlns="https://github.com/avaloniaui"
+        ...
+        CanResize="True"
+        SystemDecorations="Full"
+        ExtendClientAreaToDecorationsHint="True"
+        ExtendClientAreaChromeHints="NoChrome"
+        ExtendClientAreaTitleBarHeightHint="-1">
+```
+
+### Why Each Property Matters
+
+| Property | Value | Purpose | Why It Fails Without It |
+|---|---|---|---|
+| `SystemDecorations` | `"Full"` | Retains top-level OS window styles (`WS_CAPTION`, `WS_THICKFRAME`, `WS_MAXIMIZEBOX`). | Setting `"BorderOnly"` or `"None"` strips maximize styles, causing DWM to disable maximize/restore animations and snap instantly. |
+| `ExtendClientAreaToDecorationsHint` | `"True"` | Extends the application XAML drawing surface across the entire window. | Without it, the OS renders a standard generic white/grey caption bar above the content. |
+| `ExtendClientAreaChromeHints` | `"NoChrome"` | Hides the default OS minimize, maximize, and close caption buttons. | Without it, default OS caption buttons clash with custom UI buttons. |
+| `ExtendClientAreaTitleBarHeightHint` | `"-1"` | Instructs Avalonia to remove default title bar reservation space. | Ensures full control of header height via XAML. |
+
+---
+
+## 2. Standard Title Bar Interaction Pattern
+
+### XAML Header Definition
+
+The header area should be an interactive container (`Grid` or `Border`) with a transparent background that captures pointer events:
+
+```xml
+<!-- Custom Title Bar Header Area -->
+<Grid Grid.Row="0"
+      Background="Transparent"
+      PointerPressed="OnTitleBarPointerPressed">
+    <!-- Header Content: Icons, Title, Actions, Window Controls -->
+</Grid>
+```
+
+> [!IMPORTANT]
+> Never set `IsHitTestVisible="False"` on the drag area container, or pointer events cannot be captured for dragging or double-click maximizing.
+
+### Code-Behind Handler
+
+The code-behind must implement pointer dragging and double-click maximizing using Avalonia's built-in `BeginMoveDrag`:
+
+```csharp
+/// <summary>
+/// Handles pointer pressed events on the title bar for dragging and maximizing.
+/// </summary>
+/// <param name="sender">The sender object.</param>
+/// <param name="e">The pointer event arguments.</param>
+private void OnTitleBarPointerPressed(object? sender, PointerPressedEventArgs e)
+{
+    if (e.GetCurrentPoint(this).Properties.IsLeftButtonPressed)
+    {
+        if (e.ClickCount == 2 && CanResize)
+        {
+            WindowState = WindowState == WindowState.Maximized ? WindowState.Normal : WindowState.Maximized;
+        }
+        else
+        {
+            BeginMoveDrag(e);
+        }
+    }
+}
+
+/// <summary>
+/// Handles the maximize/restore button click.
+/// </summary>
+/// <param name="sender">The sender object.</param>
+/// <param name="e">The routed event arguments.</param>
+private void MaximizeButton_Click(object? sender, RoutedEventArgs e)
+{
+    WindowState = WindowState == WindowState.Maximized ? WindowState.Normal : WindowState.Maximized;
+}
+```
+
+---
+
+## 3. Strict Rules & Anti-Patterns (For Agents & Developers)
+
+> [!CAUTION]
+> **NEVER MANUALLY TRACK MOUSE MOVES OR MANUALLY UNMAXIMIZE DURING DRAG**
+> 
+> A common anti-pattern is writing manual `PointerMoved` tracking with a pixel distance threshold, manually setting `WindowState = WindowState.Normal`, calculating pixel coordinates, and setting `Position = new PixelPoint(...)`.
+> 
+> **Why this breaks:**
+> 1. It bypasses DWM's native interactive unmaximize animation.
+> 2. It causes the window to jarringly jump/teleport on screen.
+> 3. It breaks mouse capture and makes window dragging feel laggy and disconnected.
+> 
+> **Solution:** Always call `BeginMoveDrag(e)` directly on pointer press. Avalonia and the OS window manager will handle dragging off maximized state smoothly.
+
+---
+
+> [!CAUTION]
+> **NEVER USE `SystemDecorations="BorderOnly"` ON RESIZABLE/MAXIMIZABLE WINDOWS**
+> 
+> Setting `BorderOnly` disables DWM maximize/restore zoom transitions. Always use `SystemDecorations="Full"` combined with `ExtendClientArea*`.
+
+---
+
+## 4. Window Types Reference in GenHub
+
+| Window Class | Role | `SystemDecorations` | `CanResize` | Custom Title Bar Drag |
+|---|---|---|---|---|
+| `MainWindow` | Primary application shell | `Full` | `True` | `OnTitleBarPointerPressed` |
+| `GameProfileSettingsWindow` | Profile configuration editor | `Full` | `True` | `OnHeaderPointerPressed` |
+| `UpdateNotificationWindow` | Velopack update dialog | `Full` | `True` | `TitleBar_PointerPressed` |
+| `AddLocalContentWindow` | Content importer dialog | `Full` | `True` | `OnTitleBarPointerPressed` |
+| `GenericMessageWindow` | Modal message/announcement dialog | `None` | `False` | Drag anywhere (`OnPointerPressed`) |
+| `ConfirmationDialogWindow` | Modal confirmation dialog | `None` | `False` | Drag anywhere (`OnPointerPressed`) |
+| `UpdateOptionDialogWindow` | Modal update option dialog | `None` | `False` | Modal centered |
+| `SetupWizardView` | First-run wizard dialog | `None` | `False` | Modal centered |
+| `GitHubTokenDialogView` | GitHub PAT configuration dialog | `BorderOnly` | `False` | Modal centered |
+
+---
+
+## 5. Checklist for New Windows
+
+When creating a new `Window` in GenHub:
+
+- [ ] Set `SystemDecorations="Full"` if the window can be resized or maximized.
+- [ ] Set `ExtendClientAreaToDecorationsHint="True"`, `ExtendClientAreaChromeHints="NoChrome"`, and `ExtendClientAreaTitleBarHeightHint="-1"`.
+- [ ] Implement `OnTitleBarPointerPressed` with `BeginMoveDrag(e)` and double-click maximize toggle.
+- [ ] Ensure the drag container has `Background="Transparent"` and `IsHitTestVisible="True"`.
+- [ ] Avoid manual coordinate calculation or custom drag threshold tracking.
+- [ ] Adhere to code style: no `this.`, primary constructors where applicable, no mid-comment capitalization.
diff --git a/docs/velopack-integration.md b/docs/velopack-integration.md
index e347e1ffa..4ba8ecb11 100644
--- a/docs/velopack-integration.md
+++ b/docs/velopack-integration.md
@@ -110,38 +110,52 @@ This allows users to reinstall the same PR build with different commits without
 
 ## Update Channels
 
-GenHub provides two update channels that users can switch between:
+GenHub provides three update channels that users can switch between:
 
-### Stable Channel
+### 1. Stable Channel (Default)
 
 - **Source**: GitHub Releases
-- **Versions**: `0.0.X` (no PR suffix)
-- **Updates**: Only stable builds from main branch
-- **Recommended for**: Production use
+- **Versions**: `0.0.X` (no branch/PR suffix)
+- **Updates**: Only published releases from the main branch
+- **Recommended for**: General production use
 
-### Artifacts Channel (PR Subscription)
+### 2. PR Artifacts Channel (PR Subscription)
 
-- **Source**: GitHub Actions CI artifacts
+- **Source**: GitHub Actions CI workflow artifacts
 - **Versions**: `0.0.X-prY` format
-- **Updates**: Specific PR builds
-- **Recommended for**: Testing features, bug fixes
+- **Updates**: Specific Pull Request CI builds
+- **Recommended for**: Testing specific feature branches or bug fix pull requests
 - **Requires**: GitHub Personal Access Token (PAT) with `repo` scope
 
 #### Subscribing to PR Builds
 
 1. Navigate to Settings → Updates
 2. Click "Manage Updates & PRs"
-3. Enter GitHub PAT (if not already configured)
-4. Select a PR from the list
-5. Click "Subscribe"
+3. In the "Browse Builds" tab, select a pull request
+4. Click "Subscribe"
 
-The app will now check for updates from that PR instead of stable releases.
+The application will automatically query and notify when newer CI builds are published for that PR.
+
+### 3. Branch Artifacts Channel (Branch Subscription)
+
+- **Source**: GitHub Actions CI workflow artifacts on a branch (e.g., `development`, `main`)
+- **Versions**: `0.0.X-branchname` format
+- **Updates**: Continuous integration builds on the selected branch
+- **Recommended for**: Developers and testers wanting bleeding-edge builds
 
 #### Unsubscribing
 
 1. Open "Manage Updates & PRs"
-2. Click "Unsubscribe" on the currently subscribed PR
-3. App returns to stable channel
+2. Click "Unsubscribe" on the currently subscribed PR or branch
+3. The app returns to the stable release channel
+
+### Periodic Background Update Checks
+
+GenHub supports periodic background update checks configured in **Settings**:
+- **Automatic Background Checks**: Enable or disable periodic checks
+- **Configurable Interval**: Set between 5 minutes and 7 days (default: 30 minutes)
+- **Persistent Notifications & Badges**: Prompts users with a non-intrusive one-click "Update" action in the notification feed
+- **Duplicate Prevention**: Notification records are uniquely tracked per update identity (`pr:{prNumber}:{version}`, `branch:{branch}:{version}`, or `release:{version}`) to avoid notification spam
 
 ## Building Releases
 
diff --git a/global.json b/global.json
index 1834d84d1..da333ae07 100644
--- a/global.json
+++ b/global.json
@@ -1,7 +1,7 @@
 {
   "sdk": {
     "version": "8.0.424",
-    "rollForward": "latestFeature",
+    "rollForward": "latestMajor",
     "allowPrerelease": false
   }
 }