diff --git a/.claude/agents/c-sharp-architect.md b/.claude/agents/c-sharp-architect.md
index 7a47c06..0013841 100644
--- a/.claude/agents/c-sharp-architect.md
+++ b/.claude/agents/c-sharp-architect.md
@@ -1,7 +1,7 @@
 ---
 name: c-sharp-architect
 description: Senior C# / .NET 10 architect for the AStar.Dev mono-repo. Designs solution structure, package boundaries, Blazor web app architecture, and Avalonia desktop app architecture. Use for technology selection, cross-cutting concerns design, ADRs, integration contracts, and any decision that affects multiple projects or the shape of the solution.
-tools: Read, Grep, Glob, Bash
+tools: Read, Grep, Glob, Bash, Write
 model: sonnet
 color: red
 ---
diff --git a/.claude/agents/c-sharp-dev.md b/.claude/agents/c-sharp-dev.md
index 516a905..fdd1840 100644
--- a/.claude/agents/c-sharp-dev.md
+++ b/.claude/agents/c-sharp-dev.md
@@ -6,13 +6,13 @@ model: sonnet
 color: red
 ---
 
-You are a senior C# 14 / .NET 10 engineer in the AStar.Dev mono-repo. Follow @CLAUDE.md at all times.
+Senior C# 14 / .NET 10 engineer in AStar.Dev mono-repo. Follow @CLAUDE.md always.
 
 ## Readability
 
 > Code is read far more often than it is written.
 
-See @/.claude/rules/c-sharp-code-style.md for naming, classes, immutability, record, and control-flow conventions. Additional rules:
+See @/.claude/rules/c-sharp-code-style.md for naming, classes, immutability, record, control-flow conventions.
 
 - Explicit over clever. Clear `if` beats obscure one-liner.
 
@@ -33,7 +33,7 @@ See @/.claude/rules/c-sharp-code-style.md for naming, classes, immutability, rec
 | `await foreach`                                 | Async streams (`IAsyncEnumerable<T>`)                |
 | `ConfigureAwait(false)`                         | All `await` in library/package code                  |
 
-File-scoped namespaces and implicit usings are global — never add redundant `using` for `Xunit`, `Shouldly`, or `NSubstitute`.
+File-scoped namespaces and implicit usings global — never add redundant `using` for `Xunit`, `Shouldly`, or `NSubstitute`.
 
 ## Functional patterns (AStar.Dev.Functional.Extensions)
 
@@ -45,9 +45,9 @@ File-scoped namespaces and implicit usings are global — never add redundant `u
 | Chain operations that each can fail         | `.Bind` / `.Map`         |
 
 - Don't wrap `void` side-effects in `Result`.
-- Don't chain more than ~5 `.Bind`/`.Map` without naming intermediate results — extract a method.
-- Never let a chain obscure a business rule; a named method beats an anonymous lambda.
-- **Never await a `Task<Result<T,E>>` into an intermediate variable just to call `.Match()` on the next line.** Chain `.MatchAsync()` directly on the task. The intermediate variable pattern is always wrong:
+- Don't chain more than ~5 `.Bind`/`.Map` without naming intermediate results — extract method.
+- Named method beats anonymous lambda when chain obscures business rule.
+- **Never await `Task<Result<T,E>>` into intermediate variable just to call `.Match()` next line.** Chain `.MatchAsync()` directly. Intermediate variable pattern always wrong:
   ```csharp
   // ❌ wrong — unnecessary intermediate
   var result = await service.GetAsync(ct);
@@ -57,7 +57,7 @@ File-scoped namespaces and implicit usings are global — never add redundant `u
   var value = await service.GetAsync(ct)
       .MatchAsync<TSuccess, TError, string?>(ok => ok.Value, _ => null);
   ```
-- Error-branch code (logging, setting error properties) belongs **inside** the error lambda, not after the Match in a separate `if` block. A Match followed by a null-check where the null-check body duplicates what the error branch should have done is the same mistake.
+- Error-branch code (logging, setting error properties) belongs **inside** error lambda, not after Match in separate `if` block. Match followed by null-check that duplicates error branch = same mistake.
 
 ## Project conventions
 
@@ -76,33 +76,33 @@ Organise by **business feature**, not technical artefact type. Namespace mirrors
 
 Exceptions: genuinely cross-cutting infrastructure (`Middleware/`, `Extensions/`, `Abstractions/`).
 
-For legacy code: apply if the refactor is small; otherwise raise a GitHub issue.
+Legacy code: apply if refactor small; otherwise raise GitHub issue.
 
 ## Architecture
 
 ### Dependency injection
 
-- Primary constructors for injection; no explicit field unless needed in an expression-bodied member.
-- **ReactiveUI exception**: `ReactiveCommand.CreateFromTask(InstanceMethod)` requires `this` — use an explicit constructor with `private readonly` fields. Not a violation; do not flag.
+- Primary constructors for injection; no explicit field unless needed in expression-bodied member.
+- **ReactiveUI exception**: `ReactiveCommand.CreateFromTask(InstanceMethod)` requires `this` — use explicit constructor with `private readonly` fields. Not a violation; don't flag.
 - Register in `IServiceCollection` extension methods, one file per feature area.
 
 ### Avalonia XAML (compiled bindings)
 
-`AvaloniaUseCompiledBindingsByDefault=true` is set globally. Every view with bindings **must** declare `x:DataType`:
+`AvaloniaUseCompiledBindingsByDefault=true` set globally. Every view with bindings **must** declare `x:DataType`:
 
 ```xml
 <Window xmlns:vm="clr-namespace:MyApp.MyFeature" x:DataType="vm:MyFeatureViewModel">
 ```
 
-Omitting it causes `AVLN2100` build errors.
+Omitting causes `AVLN2100` build errors.
 
-- Tree controls: use `TreeDataTemplate`, **not** `HierarchicalDataTemplate` — the latter is WPF and does not exist in Avalonia.
-- When `CompiledBinding` causes binding errors that cannot be resolved statically, fall back to `ReflectionBinding` on the specific binding — document with a comment why.
+- Tree controls: use `TreeDataTemplate`, **not** `HierarchicalDataTemplate` — latter is WPF, doesn't exist in Avalonia.
+- When `CompiledBinding` causes unresolvable static binding errors, fall back to `ReflectionBinding` on specific binding — document with comment why.
 
 ### Avalonia DI lifetimes
 
 - No HTTP scope — register `DbContext` and ViewModels as `Transient`.
-- Never `AddScoped` outside a web host (maps to app lifetime = singleton).
+- Never `AddScoped` outside web host (maps to app lifetime = singleton).
 
 ### HTTP (Refit + Polly)
 
@@ -112,34 +112,34 @@ Omitting it causes `AVLN2100` build errors.
 
 ### EF Core 10
 
-- No raw SQL except read-model queries where performance demands it; document why.
+- No raw SQL except read-model queries where performance demands; document why.
 - `AsNoTracking()` on all read-only queries.
-- Entity IDs etc should be strongly-typed wherever possible; do not use GUID, string, int when the entity type is a key part of the domain
-- Migrations in the infra project that owns the `DbContext`.
+- Entity IDs: strongly-typed wherever possible; don't use GUID, string, int when entity type is domain key.
+- Migrations in infra project owning `DbContext`.
 - Value objects via `OwnsOne` / `OwnsMany`; no primitive obsession on entity keys.
 - Always `IEntityTypeConfiguration<T>`; always load via `ApplyConfigurationsFromAssembly`.
-- **Concurrent access**: inject `IDbContextFactory<TContext>` and call `CreateDbContextAsync()` per operation — never inject `DbContext` directly into services that may be called concurrently (Avalonia has no HTTP scope; a shared `DbContext` is not thread-safe).
+- **Concurrent access**: inject `IDbContextFactory<TContext>`, call `CreateDbContextAsync()` per operation — never inject `DbContext` directly into services called concurrently (Avalonia has no HTTP scope; shared `DbContext` not thread-safe).
 
 ### Logging (Serilog)
 
 - Structured only — no string interpolation in log messages.
-- Log at the boundary and error site; no redundant intermediate logs.
+- Log at boundary and error site; no redundant intermediate logs.
 - No PII/secrets — use `HashedUserId` pattern; redact with `Serilog.Expressions` if needed.
 
 ### Validation (FluentValidation)
 
-- Validators are `sealed`, registered via assembly scanning.
+- Validators `sealed`, registered via assembly scanning.
 - Return `Result<T>.Failure(validationErrors)` from pipeline behaviour; never throw.
 
 ## Tests
 
-- All new public methods must have full unit tests exercising all branches wherever possible.
+All new public methods need full unit tests exercising all branches wherever possible.
 
 ## Code review checklist
 
 - [ ] Mid-level dev understands in 30 s without comments?
-- [ ] No inline comments describing **what** — extract a named method instead
-- [ ] No suppressions without a comment
+- [ ] No inline comments describing **what** — extract named method instead
+- [ ] No suppressions without comment
 - [ ] No `async void` (except Avalonia event handlers — documented)
 - [ ] `CancellationToken` propagated through all async chains
 - [ ] No blocking calls (`.Result`, `.Wait()`, `.GetAwaiter().GetResult()`) in async context
@@ -148,4 +148,4 @@ Omitting it causes `AVLN2100` build errors.
 - [ ] Structured log messages (no interpolated strings to Serilog)
 - [ ] New package `.csproj` has required metadata fields
 - [ ] User Story checklist items marked done
-- [ ] One Class / Interface / Record per file
+- [ ] One Class / Interface / Record per file
\ No newline at end of file
diff --git a/.claude/agents/c-sharp-dev.original.md b/.claude/agents/c-sharp-dev.original.md
new file mode 100644
index 0000000..516a905
--- /dev/null
+++ b/.claude/agents/c-sharp-dev.original.md
@@ -0,0 +1,151 @@
+---
+name: c-sharp-dev
+description: Senior C# 14 / .NET 10 developer for the AStar.Dev mono-repo. Writes clean, readable, idiomatic C# code following repo conventions, functional-first patterns via AStar.Dev.Functional.Extensions, and fully-tested discipline. Use for implementing C# features, designing APIs, and extracting C# shared utilities.
+tools: Read, Grep, Glob, Bash, Write
+model: sonnet
+color: red
+---
+
+You are a senior C# 14 / .NET 10 engineer in the AStar.Dev mono-repo. Follow @CLAUDE.md at all times.
+
+## Readability
+
+> Code is read far more often than it is written.
+
+See @/.claude/rules/c-sharp-code-style.md for naming, classes, immutability, record, and control-flow conventions. Additional rules:
+
+- Explicit over clever. Clear `if` beats obscure one-liner.
+
+## C# 14 / .NET 10 — use these, flag their absence
+
+| Feature                                         | When                                                 |
+| ----------------------------------------------- | ---------------------------------------------------- |
+| Primary constructors                            | Constructor injection                                |
+| Collection expressions `[x, y]` / `[..src, z]`  | Replacing `new List<T> { }`, `new[] { }`             |
+| `field` keyword                                 | Semi-auto properties needing one customised accessor |
+| `params ReadOnlySpan<T>`                        | Helpers formerly using `params T[]`                  |
+| `required` properties                           | DTOs and builders                                    |
+| `nameof` + `ArgumentNullException.ThrowIfNull`  | All public-API null guards                           |
+| `using` declarations (not blocks)               | Short-lived `IDisposable` in method scope            |
+| Pattern matching (`is T x`, switch expressions) | Replacing `as` casts and type checks                 |
+| `FrozenDictionary` / `FrozenSet`                | Read-only lookup tables built at startup             |
+| `[GeneratedRegex]`                              | All `Regex` usage — never `new Regex(...)`           |
+| `await foreach`                                 | Async streams (`IAsyncEnumerable<T>`)                |
+| `ConfigureAwait(false)`                         | All `await` in library/package code                  |
+
+File-scoped namespaces and implicit usings are global — never add redundant `using` for `Xunit`, `Shouldly`, or `NSubstitute`.
+
+## Functional patterns (AStar.Dev.Functional.Extensions)
+
+| Scenario                                    | Use                      |
+| ------------------------------------------- | ------------------------ |
+| Can succeed or fail with a meaningful error | `Result<T>`              |
+| Value may or may not be present             | `Option<T>`              |
+| Branch on success/failure                   | `.Match` / `.MatchAsync` |
+| Chain operations that each can fail         | `.Bind` / `.Map`         |
+
+- Don't wrap `void` side-effects in `Result`.
+- Don't chain more than ~5 `.Bind`/`.Map` without naming intermediate results — extract a method.
+- Never let a chain obscure a business rule; a named method beats an anonymous lambda.
+- **Never await a `Task<Result<T,E>>` into an intermediate variable just to call `.Match()` on the next line.** Chain `.MatchAsync()` directly on the task. The intermediate variable pattern is always wrong:
+  ```csharp
+  // ❌ wrong — unnecessary intermediate
+  var result = await service.GetAsync(ct);
+  var value = result.Match<string?>(ok => ok.Value, _ => null);
+
+  // ✅ correct — chain directly
+  var value = await service.GetAsync(ct)
+      .MatchAsync<TSuccess, TError, string?>(ok => ok.Value, _ => null);
+  ```
+- Error-branch code (logging, setting error properties) belongs **inside** the error lambda, not after the Match in a separate `if` block. A Match followed by a null-check where the null-check body duplicates what the error branch should have done is the same mistake.
+
+## Project conventions
+
+### Folder and namespace — feature over artefact type
+
+Organise by **business feature**, not technical artefact type. Namespace mirrors folder path.
+
+```
+✅ AccountManagement/
+     AccountManagementEditViewModel.cs
+     EditAccountCommand.cs
+     EditAccountCommandHandler.cs
+
+❌ ViewModels/ Commands/ Validators/   ← tells you nothing about the domain
+```
+
+Exceptions: genuinely cross-cutting infrastructure (`Middleware/`, `Extensions/`, `Abstractions/`).
+
+For legacy code: apply if the refactor is small; otherwise raise a GitHub issue.
+
+## Architecture
+
+### Dependency injection
+
+- Primary constructors for injection; no explicit field unless needed in an expression-bodied member.
+- **ReactiveUI exception**: `ReactiveCommand.CreateFromTask(InstanceMethod)` requires `this` — use an explicit constructor with `private readonly` fields. Not a violation; do not flag.
+- Register in `IServiceCollection` extension methods, one file per feature area.
+
+### Avalonia XAML (compiled bindings)
+
+`AvaloniaUseCompiledBindingsByDefault=true` is set globally. Every view with bindings **must** declare `x:DataType`:
+
+```xml
+<Window xmlns:vm="clr-namespace:MyApp.MyFeature" x:DataType="vm:MyFeatureViewModel">
+```
+
+Omitting it causes `AVLN2100` build errors.
+
+- Tree controls: use `TreeDataTemplate`, **not** `HierarchicalDataTemplate` — the latter is WPF and does not exist in Avalonia.
+- When `CompiledBinding` causes binding errors that cannot be resolved statically, fall back to `ReflectionBinding` on the specific binding — document with a comment why.
+
+### Avalonia DI lifetimes
+
+- No HTTP scope — register `DbContext` and ViewModels as `Transient`.
+- Never `AddScoped` outside a web host (maps to app lifetime = singleton).
+
+### HTTP (Refit + Polly)
+
+- `[Headers("Accept: application/json")]` at interface level.
+- Polly pipelines at registration, not call sites.
+- Wrap Refit results in `Result<T>` at service layer — callers never see `ApiException`.
+
+### EF Core 10
+
+- No raw SQL except read-model queries where performance demands it; document why.
+- `AsNoTracking()` on all read-only queries.
+- Entity IDs etc should be strongly-typed wherever possible; do not use GUID, string, int when the entity type is a key part of the domain
+- Migrations in the infra project that owns the `DbContext`.
+- Value objects via `OwnsOne` / `OwnsMany`; no primitive obsession on entity keys.
+- Always `IEntityTypeConfiguration<T>`; always load via `ApplyConfigurationsFromAssembly`.
+- **Concurrent access**: inject `IDbContextFactory<TContext>` and call `CreateDbContextAsync()` per operation — never inject `DbContext` directly into services that may be called concurrently (Avalonia has no HTTP scope; a shared `DbContext` is not thread-safe).
+
+### Logging (Serilog)
+
+- Structured only — no string interpolation in log messages.
+- Log at the boundary and error site; no redundant intermediate logs.
+- No PII/secrets — use `HashedUserId` pattern; redact with `Serilog.Expressions` if needed.
+
+### Validation (FluentValidation)
+
+- Validators are `sealed`, registered via assembly scanning.
+- Return `Result<T>.Failure(validationErrors)` from pipeline behaviour; never throw.
+
+## Tests
+
+- All new public methods must have full unit tests exercising all branches wherever possible.
+
+## Code review checklist
+
+- [ ] Mid-level dev understands in 30 s without comments?
+- [ ] No inline comments describing **what** — extract a named method instead
+- [ ] No suppressions without a comment
+- [ ] No `async void` (except Avalonia event handlers — documented)
+- [ ] `CancellationToken` propagated through all async chains
+- [ ] No blocking calls (`.Result`, `.Wait()`, `.GetAwaiter().GetResult()`) in async context
+- [ ] `ConfigureAwait(false)` on all `await` in library code
+- [ ] NO magic strings / numbers etc; use constants or enums. Extract to project-level when shared.
+- [ ] Structured log messages (no interpolated strings to Serilog)
+- [ ] New package `.csproj` has required metadata fields
+- [ ] User Story checklist items marked done
+- [ ] One Class / Interface / Record per file
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 2901269..e4bbcbb 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -5,6 +5,7 @@
         "Consolas",
         "Deserialisation",
         "Dtos",
+        "graphify",
         "Initialise",
         "KHTML",
         "safebrowsing",
diff --git a/CLAUDE.md b/CLAUDE.md
index b461c2f..eddbe6e 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -1,8 +1,6 @@
-
-
 # CLAUDE.md
 
-This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
+Guidance for Claude Code when working in this repo.
 
 ## Commands
 
@@ -20,32 +18,38 @@ dotnet test --filter "FullyQualifiedName~DownloadImagesFromSearchResults"
 dotnet test AStar.Dev.Wallpaper.Scrapper/AStar.Dev.Wallpaper.Scrapper.csproj
 ```
 
+## NON-NEGOTIABLE RULES
+
+ALWAYS use serena / graphify to aid understanding / you need to explore the code-base. NO EXCEPTIONS
+ALWAYS use TDD - use the c-sharp-qa subagent to write failing tests and COMMIT before using c-sharp-dev subagent to implement the production code. Ensure all tests (new and existing) pass before reporting success.
+ALWAYS use the c-sharp-reviewer subagent to review tests and production code once the c-sharp-dev subagent reports completion. ALWAYS fix the issues reported - use a new c-sharp-dev subagent to fix.
+
 ## Architecture
 
-Solution targets **net10.0** across all projects. `TreatWarningsAsErrors` is enabled in both Debug and Release configurations.
+Targets **net10.0** across all projects. `TreatWarningsAsErrors` enabled in Debug and Release.
 
 ### Projects
 
-**`AStar.Dev.Wallpaper.Scrapper`** — the main executable. Structured as a **Reqnroll (BDD) test project** — there is no `Main()`; the test runner executes Gherkin scenarios that drive the scraping workflow.
+**`AStar.Dev.Wallpaper.Scrapper`** — main executable. Structured as **Reqnroll (BDD) test project** — no `Main()`; test runner executes Gherkin scenarios driving scrape workflow.
 
-- `Features/` — Gherkin `.feature` files (three scraping workflows: search results, subscriptions, top wallpapers)
+- `Features/` — Gherkin `.feature` files (three workflows: search results, subscriptions, top wallpapers)
 - `StepDefinitions/` — Reqnroll step bindings wired to Playwright page objects
 - `Pages/` — Page Object Model classes wrapping Playwright `IPage` (login, search results, image page, subscriptions, top wallpapers)
-- `Hooks/Hooks.cs` — Reqnroll lifecycle: spins up Playwright Chromium/Edge browser, builds Serilog logger, registers all DI instances into Reqnroll's `ObjectContainer`
-- `Support/` — helpers: `ConfigurationFactory` (loads config), `ConfigurationSaver`, `DirectoryHelper`, `ImageRetrieverHelper`, `ImageSaveHelper`, `TagsFactory`
+- `Hooks/Hooks.cs` — Reqnroll lifecycle: spins up Playwright Chromium/Edge, builds Serilog logger, registers DI into Reqnroll's `ObjectContainer`
+- `Support/` — helpers: `ConfigurationFactory`, `ConfigurationSaver`, `DirectoryHelper`, `ImageRetrieverHelper`, `ImageSaveHelper`, `TagsFactory`
 - `Models/` — strongly-typed bindings for `appsettings.json` sections (`ScrapeConfiguration`, `SearchConfiguration`, `ScrapeDirectories`, `UserConfiguration`, etc.)
 - `DTOs/` — deserialization models for `tagsTextToIgnore.json` and `tagsToIgnoreCompletely.json`
 
 **`AStar.Dev.Guard.Clauses`** — NuGet package. Single `GuardAgainst.Null<T>()` helper.
 
-**`AStar.Dev.Infrastructure.FilesDb`** — NuGet package. EF Core (SQL Server) infrastructure for file metadata. `EnumerableExtensions` provides filtering/sorting/duplicate-detection over `FileDetail` collections. Note: marked with `[Refactor]` — may duplicate logic in the files API project.
+**`AStar.Dev.Infrastructure.FilesDb`** — NuGet package. EF Core (SQL Server) infrastructure for file metadata. `EnumerableExtensions` provides filtering/sorting/duplicate-detection over `FileDetail` collections. Marked `[Refactor]` — may duplicate logic in files API project.
 
-**`AStar.Dev.Utilities`** — NuGet package. Extension methods and helpers shared across AStar packages (`StringExtensions`, `LinqExtensions`, `EncryptionExtensions`, `EnumExtensions`, `PathOperationExtensions`, `RegexExtensions`, `ObjectExtensions`, `ApplicationPathsProvider`).
+**`AStar.Dev.Utilities`** — NuGet package. Shared extension methods/helpers (`StringExtensions`, `LinqExtensions`, `EncryptionExtensions`, `EnumExtensions`, `PathOperationExtensions`, `RegexExtensions`, `ObjectExtensions`, `ApplicationPathsProvider`).
 
 ### Configuration
 
-`ConfigurationFactory` merges two sources (in order, later overrides earlier):
-1. `appsettings.json` in the project root — non-secret defaults
+`ConfigurationFactory` merges two sources (later overrides earlier):
+1. `appsettings.json` in project root — non-secret defaults
 2. **User Secrets** (`UserSecretsId: c35e09dc-dc30-416a-95a6-ec1a5ba1b43f`) — SQL connection string, login credentials
 
 Sensitive fields (`connectionStrings.sqlServer`, `userConfiguration.password`) must live in User Secrets, not `appsettings.json`.
@@ -54,12 +58,12 @@ Sensitive fields (`connectionStrings.sqlServer`, `userConfiguration.password`) m
 
 ### Logging
 
-Serilog, configured via `appsettings.json`. Writes to Console and Seq (`http://localhost:5341`). The `Hooks` constructor also hard-codes a Seq sink at the same address.
+Serilog via `appsettings.json`. Writes to Console and Seq (`http://localhost:5341`). `Hooks` constructor also hard-codes Seq sink at same address.
 
 ### Tag filtering
 
-Two JSON files control which wallpapers are skipped:
-- `tagsToIgnoreCompletely.json` — skip any image whose tags include these values
-- `tagsTextToIgnore.json` — skip based on partial text match in tag names
+Two JSON files control skipped wallpapers:
+- `tagsToIgnoreCompletely.json` — skip images whose tags include these values
+- `tagsTextToIgnore.json` — skip on partial text match in tag names
 
-Both are loaded by `TagsFactory` and registered into Reqnroll's DI container in `Hooks`.
+Both loaded by `TagsFactory`, registered into Reqnroll DI in `Hooks`.
\ No newline at end of file
diff --git a/CLAUDE.original.md b/CLAUDE.original.md
new file mode 100644
index 0000000..b461c2f
--- /dev/null
+++ b/CLAUDE.original.md
@@ -0,0 +1,65 @@
+
+
+# CLAUDE.md
+
+This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
+
+## Commands
+
+```bash
+# Build entire solution
+dotnet build AStar.Dev.Web.Scrapper.slnx
+
+# Run all Reqnroll scenarios
+dotnet test AStar.Dev.Web.Scrapper.slnx
+
+# Run a specific scenario by name
+dotnet test --filter "FullyQualifiedName~DownloadImagesFromSearchResults"
+
+# Run a specific project's tests
+dotnet test AStar.Dev.Wallpaper.Scrapper/AStar.Dev.Wallpaper.Scrapper.csproj
+```
+
+## Architecture
+
+Solution targets **net10.0** across all projects. `TreatWarningsAsErrors` is enabled in both Debug and Release configurations.
+
+### Projects
+
+**`AStar.Dev.Wallpaper.Scrapper`** — the main executable. Structured as a **Reqnroll (BDD) test project** — there is no `Main()`; the test runner executes Gherkin scenarios that drive the scraping workflow.
+
+- `Features/` — Gherkin `.feature` files (three scraping workflows: search results, subscriptions, top wallpapers)
+- `StepDefinitions/` — Reqnroll step bindings wired to Playwright page objects
+- `Pages/` — Page Object Model classes wrapping Playwright `IPage` (login, search results, image page, subscriptions, top wallpapers)
+- `Hooks/Hooks.cs` — Reqnroll lifecycle: spins up Playwright Chromium/Edge browser, builds Serilog logger, registers all DI instances into Reqnroll's `ObjectContainer`
+- `Support/` — helpers: `ConfigurationFactory` (loads config), `ConfigurationSaver`, `DirectoryHelper`, `ImageRetrieverHelper`, `ImageSaveHelper`, `TagsFactory`
+- `Models/` — strongly-typed bindings for `appsettings.json` sections (`ScrapeConfiguration`, `SearchConfiguration`, `ScrapeDirectories`, `UserConfiguration`, etc.)
+- `DTOs/` — deserialization models for `tagsTextToIgnore.json` and `tagsToIgnoreCompletely.json`
+
+**`AStar.Dev.Guard.Clauses`** — NuGet package. Single `GuardAgainst.Null<T>()` helper.
+
+**`AStar.Dev.Infrastructure.FilesDb`** — NuGet package. EF Core (SQL Server) infrastructure for file metadata. `EnumerableExtensions` provides filtering/sorting/duplicate-detection over `FileDetail` collections. Note: marked with `[Refactor]` — may duplicate logic in the files API project.
+
+**`AStar.Dev.Utilities`** — NuGet package. Extension methods and helpers shared across AStar packages (`StringExtensions`, `LinqExtensions`, `EncryptionExtensions`, `EnumExtensions`, `PathOperationExtensions`, `RegexExtensions`, `ObjectExtensions`, `ApplicationPathsProvider`).
+
+### Configuration
+
+`ConfigurationFactory` merges two sources (in order, later overrides earlier):
+1. `appsettings.json` in the project root — non-secret defaults
+2. **User Secrets** (`UserSecretsId: c35e09dc-dc30-416a-95a6-ec1a5ba1b43f`) — SQL connection string, login credentials
+
+Sensitive fields (`connectionStrings.sqlServer`, `userConfiguration.password`) must live in User Secrets, not `appsettings.json`.
+
+`ConfigurationFactory` also normalises `SearchConfiguration.SearchString` and `Subscriptions` URLs (strips base URL prefix and trailing page number) before returning.
+
+### Logging
+
+Serilog, configured via `appsettings.json`. Writes to Console and Seq (`http://localhost:5341`). The `Hooks` constructor also hard-codes a Seq sink at the same address.
+
+### Tag filtering
+
+Two JSON files control which wallpapers are skipped:
+- `tagsToIgnoreCompletely.json` — skip any image whose tags include these values
+- `tagsTextToIgnore.json` — skip based on partial text match in tag names
+
+Both are loaded by `TagsFactory` and registered into Reqnroll's DI container in `Hooks`.
diff --git a/Directory.Build.props b/Directory.Build.props
new file mode 100644
index 0000000..cfd2bd7
--- /dev/null
+++ b/Directory.Build.props
@@ -0,0 +1,134 @@
+<Project>
+
+  <!--
+    Directory.Build.props — repo root
+    ══════════════════════════════════
+    MSBuild automatically imports this file for every .csproj in the repo,
+    walking up from the project folder until it finds one.
+
+    Sub-folders (e.g. apps/web/, packages/core/) can have their own
+    Directory.Build.props that imports this one and then overrides specific
+    properties. Pattern for a child file:
+
+        <Project>
+          <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
+          <PropertyGroup>
+            ... overrides here ...
+          </PropertyGroup>
+        </Project>
+  -->
+
+  <!-- ── Target framework ───────────────────────────────────────────────── -->
+  <PropertyGroup>
+    <!--
+      Default TFM for all projects. Avalonia and Blazor both support net10.0.
+      Desktop apps that need platform-specific APIs can override with
+      net10.0-windows, net10.0-macos etc. in their own .csproj.
+    -->
+    <TargetFramework>net10.0</TargetFramework>
+
+    <!--
+      Produce deterministic builds — same inputs always produce identical
+      binary output. Important for NuGet package reproducibility.
+    -->
+    <Deterministic>true</Deterministic>
+  </PropertyGroup>
+
+  <!-- ── Language & compiler ────────────────────────────────────────────── -->
+  <PropertyGroup>
+    <!-- Always use the latest stable C# version available in the SDK -->
+    <LangVersion>latest</LangVersion>
+
+    <!-- Enforce nullable reference types across the whole repo.
+         New code must be null-safe; existing code will surface warnings
+         as you migrate. Set to 'warnings' first if onboarding a large
+         legacy codebase. -->
+    <Nullable>enable</Nullable>
+
+    <!-- Enable implicit global usings (System, System.Linq, etc.)
+         Each project type (web, console, test) gets its own set automatically. -->
+    <ImplicitUsings>enable</ImplicitUsings>
+
+    <!-- Treat all compiler warnings as errors in CI.
+         Override to 'false' in a specific project if you have a legitimate
+         exception (e.g. a generated-code project). -->
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+
+    <!-- Enable .NET 10 analysis rules at the recommended level.
+         'Default' is a good balance; switch to 'All' if you want maximum
+         pedantry on new projects. -->
+    <AnalysisLevel>latest-recommended</AnalysisLevel>
+    <EnableNETAnalyzers>true</EnableNETAnalyzers>
+  </PropertyGroup>
+
+  <!-- ── NuGet package metadata (applies to all published packages) ──────── -->
+  <PropertyGroup>
+    <!--
+      Shared metadata for all ~50 NuGet packages. Individual packages can
+      override any of these in their own .csproj.
+    -->
+    <Authors>Jason Barden</Authors>
+    <Company>AStar Development</Company>
+    <Copyright>Copyright © $([System.DateTime]::Now.Year) AStar Development</Copyright>
+
+    <!--
+      Version is set by CI via -p:Version=$(GitTag) at publish time.
+      This is the fallback for local development builds.
+    -->
+    <Version>0.1.0</Version>
+    <AssemblyVersion>0.1.0.0</AssemblyVersion>
+    <FileVersion>0.1.0.0</FileVersion>
+
+    <!-- Embed symbols in the package for a better debugging experience -->
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+
+    <!-- Embed source files in the PDB so consumers can step through your code -->
+    <EmbedAllSources>true</EmbedAllSources>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+
+    <!--
+      Required for deterministic/source-linked builds.
+      Set your actual GitHub repo URL here.
+    -->
+    <RepositoryUrl>https://github.com/your-org/astar-dev-mono/</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+  </PropertyGroup>
+
+  <!-- ── Output paths ───────────────────────────────────────────────────── -->
+  <PropertyGroup>
+    <!--
+      Redirect all bin/ and obj/ output to a single folder at the repo root.
+      This keeps the source tree clean and makes it easy to .gitignore
+      all build output in one line: /artifacts/
+    -->
+    <BaseOutputPath>$(MSBuildThisFileDirectory)artifacts/bin/$(MSBuildProjectName)</BaseOutputPath>
+    <BaseIntermediateOutputPath>$(MSBuildThisFileDirectory)artifacts/obj/$(MSBuildProjectName)</BaseIntermediateOutputPath>
+
+    <!-- Keep the standard Debug/Release subfolder structure within artifacts/ -->
+    <AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
+    <AppendRuntimeIdentifierToOutputPath>true</AppendRuntimeIdentifierToOutputPath>
+  </PropertyGroup>
+
+  <!-- ── Test projects ──────────────────────────────────────────────────── -->
+  <!--
+    Projects whose names contain .Tests (covering *.Tests, *.Tests.Unit,
+    *.Tests.Integration etc.) or end in .IntegrationTests are not published
+    as NuGet packages.
+
+    CA1707 (identifier contains underscores) is suppressed because the repo
+    mandates the when_[action]_then_[outcome] snake_case naming convention
+    for all test methods; underscores are intentional and required by style.
+  -->
+  <PropertyGroup Condition="$(MSBuildProjectName.Contains('.Tests'))
+                          Or $(MSBuildProjectName.EndsWith('.IntegrationTests'))">
+    <IsPackable>false</IsPackable>
+    <IsPublishable>false</IsPublishable>
+    <!--
+      CA1859: Use concrete types for fields — suppressed in tests because the
+      sut field must be typed to the interface to exercise the public contract.
+    -->
+    <NoWarn>$(NoWarn);CA1707;CA1859</NoWarn>
+  </PropertyGroup>
+
+</Project>
diff --git a/src/AStar.Dev.FunctionalParadigm/AStar.Dev.FunctionalParadigm.csproj b/src/AStar.Dev.FunctionalParadigm/AStar.Dev.FunctionalParadigm.csproj
index b760144..84fc2de 100644
--- a/src/AStar.Dev.FunctionalParadigm/AStar.Dev.FunctionalParadigm.csproj
+++ b/src/AStar.Dev.FunctionalParadigm/AStar.Dev.FunctionalParadigm.csproj
@@ -1,9 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net10.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
+    <!--
+      CA1716: 'Option' and 'Option<T>' conflict with Visual Basic's reserved keyword 'Option'.
+      These names are intentional — 'Option' is the canonical functional-programming monad name,
+      and this library targets C# consumers exclusively. VB.NET compatibility is not a goal.
+    -->
+    <NoWarn>CA1716</NoWarn>
   </PropertyGroup>
 
 </Project>
diff --git a/src/AStar.Dev.FunctionalParadigm/Result.cs b/src/AStar.Dev.FunctionalParadigm/Result.cs
index d4760e8..d250637 100644
--- a/src/AStar.Dev.FunctionalParadigm/Result.cs
+++ b/src/AStar.Dev.FunctionalParadigm/Result.cs
@@ -1,16 +1,17 @@
-namespace AStar.Dev.FunctionalParadigm;
+namespace AStar.Dev.FunctionalParadigm;
 
-public abstract record Result<TResult, TError>
+/// <summary>
+///     Factory methods for creating instances of <see cref="Result{TResult,TError}" />.
+/// </summary>
+public static class Result
 {
-    public static Result<TResult, TError> Success(TResult value) => new Ok<TResult, TError>(value);
+    /// <summary>
+    ///     Creates a success <see cref="Result{TResult,TError}" /> wrapping the specified value.
+    /// </summary>
+    public static Result<TResult, TError> Success<TResult, TError>(TResult value) => new Ok<TResult, TError>(value);
 
-    public static Result<TResult, TError> Failure(TError error) => new Fail<TResult, TError>(error);
-
-    public static implicit operator Result<TResult, TError>(TResult value) => Success(value);
-
-    public static implicit operator Result<TResult, TError>(TError error) => Failure(error);
+    /// <summary>
+    ///     Creates a failure <see cref="Result{TResult,TError}" /> wrapping the specified error.
+    /// </summary>
+    public static Result<TResult, TError> Failure<TResult, TError>(TError error) => new Fail<TResult, TError>(error);
 }
-
-public record Ok<TResult, TError>(TResult Value) : Result<TResult, TError>;
-
-public record Fail<TResult, TError>(TError Error) : Result<TResult, TError>;
diff --git a/src/AStar.Dev.FunctionalParadigm/Result{TResult,TError}.cs b/src/AStar.Dev.FunctionalParadigm/Result{TResult,TError}.cs
new file mode 100644
index 0000000..7006ad5
--- /dev/null
+++ b/src/AStar.Dev.FunctionalParadigm/Result{TResult,TError}.cs
@@ -0,0 +1,31 @@
+namespace AStar.Dev.FunctionalParadigm;
+
+/// <summary>
+///     Represents the outcome of an operation that may either succeed with a
+///     <typeparamref name="TResult" /> or fail with a <typeparamref name="TError" />.
+///     Use the <see cref="Result" /> factory class to construct instances.
+/// </summary>
+/// <typeparam name="TResult">The type of the success value.</typeparam>
+/// <typeparam name="TError">The type of the failure error.</typeparam>
+public abstract record Result<TResult, TError>
+{
+    /// <summary>
+    ///     Implicitly lifts a success value into a <see cref="Result{TResult,TError}" />.
+    /// </summary>
+    public static implicit operator Result<TResult, TError>(TResult value) => new Ok<TResult, TError>(value);
+
+    /// <summary>
+    ///     Implicitly lifts an error into a <see cref="Result{TResult,TError}" />.
+    /// </summary>
+    public static implicit operator Result<TResult, TError>(TError error) => new Fail<TResult, TError>(error);
+}
+
+/// <summary>
+///     Represents a successful <see cref="Result{TResult,TError}" /> carrying a value.
+/// </summary>
+public record Ok<TResult, TError>(TResult Value) : Result<TResult, TError>;
+
+/// <summary>
+///     Represents a failed <see cref="Result{TResult,TError}" /> carrying an error.
+/// </summary>
+public record Fail<TResult, TError>(TError Error) : Result<TResult, TError>;
diff --git a/src/AStar.Dev.Guard.Clauses/AStar.Dev.Guard.Clauses.csproj b/src/AStar.Dev.Guard.Clauses/AStar.Dev.Guard.Clauses.csproj
index c645a60..6c07208 100644
--- a/src/AStar.Dev.Guard.Clauses/AStar.Dev.Guard.Clauses.csproj
+++ b/src/AStar.Dev.Guard.Clauses/AStar.Dev.Guard.Clauses.csproj
@@ -1,18 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net10.0</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
         <ApplicationIcon>astar.ico</ApplicationIcon>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
         <Authors>AStar Development, Jason Barden</Authors>
         <Copyright>AStar Development, 2025</Copyright>
         <PackageProjectUrl>https://github.com/astar-development/</PackageProjectUrl>
         <RepositoryUrl>https://github.com/astar-development/</RepositoryUrl>
-        <RepositoryType>git</RepositoryType>
-        <IncludeSymbols>True</IncludeSymbols>
-        <SymbolPackageFormat>snupkg</SymbolPackageFormat>
         <PackageReadmeFile>Readme.md</PackageReadmeFile>
         <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
         <PackageLicenseFile>LICENSE</PackageLicenseFile>
@@ -24,14 +18,4 @@
         <None Include="Readme.md" Pack="true" PackagePath=""/>
     </ItemGroup>
 
-    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-        <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
-        <NoWarn>1701;1702;</NoWarn>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-        <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
-        <NoWarn>1701;1702;</NoWarn>
-    </PropertyGroup>
-
 </Project>
diff --git a/src/AStar.Dev.Guard.Clauses/AStar.Dev.Guard.Clauses.xml b/src/AStar.Dev.Guard.Clauses/AStar.Dev.Guard.Clauses.xml
index 1ea8107..404d8ec 100644
--- a/src/AStar.Dev.Guard.Clauses/AStar.Dev.Guard.Clauses.xml
+++ b/src/AStar.Dev.Guard.Clauses/AStar.Dev.Guard.Clauses.xml
@@ -16,7 +16,7 @@
             <typeparam name="T">
                 Specifies the generic object to check for null.
             </typeparam>
-            <param name="object">
+            <param name="value">
                 The object to check for null.
             </param>
             <returns>
diff --git a/src/AStar.Dev.Guard.Clauses/GuardAgainst.cs b/src/AStar.Dev.Guard.Clauses/GuardAgainst.cs
index 169d8ca..a8fb905 100644
--- a/src/AStar.Dev.Guard.Clauses/GuardAgainst.cs
+++ b/src/AStar.Dev.Guard.Clauses/GuardAgainst.cs
@@ -1,4 +1,4 @@
-namespace AStar.Dev.Guard.Clauses;
+namespace AStar.Dev.Guard.Clauses;
 
 /// <summary>
 ///     The root <seealso href="GuardAgainst"></seealso> class.
@@ -11,7 +11,7 @@ public static class GuardAgainst
     /// <typeparam name="T">
     ///     Specifies the generic object to check for null.
     /// </typeparam>
-    /// <param name="object">
+    /// <param name="value">
     ///     The object to check for null.
     /// </param>
     /// <returns>
@@ -20,6 +20,6 @@ public static class GuardAgainst
     /// <exception cref="ArgumentNullException">
     ///     Thrown when the object is, in fact, null.
     /// </exception>
-    public static T Null<T>(T @object)
-        => @object is null ? throw new ArgumentNullException(nameof(@object)) : @object;
+    public static T Null<T>(T value)
+        => value is null ? throw new ArgumentNullException(nameof(value)) : value;
 }
diff --git a/src/AStar.Dev.Infrastructure.FilesDb/AStar.Dev.Infrastructure.FilesDb.csproj b/src/AStar.Dev.Infrastructure.FilesDb/AStar.Dev.Infrastructure.FilesDb.csproj
index c530f63..cbeb768 100644
--- a/src/AStar.Dev.Infrastructure.FilesDb/AStar.Dev.Infrastructure.FilesDb.csproj
+++ b/src/AStar.Dev.Infrastructure.FilesDb/AStar.Dev.Infrastructure.FilesDb.csproj
@@ -1,24 +1,30 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net10.0</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
         <ApplicationIcon>astar.ico</ApplicationIcon>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
         <Authors>AStar Development, Jason Barden</Authors>
         <Copyright>AStar Development, 2025</Copyright>
         <PackageProjectUrl>https://github.com/astar-development/</PackageProjectUrl>
         <RepositoryUrl>https://github.com/astar-development/</RepositoryUrl>
-        <RepositoryType>git</RepositoryType>
-        <IncludeSymbols>True</IncludeSymbols>
-        <SymbolPackageFormat>snupkg</SymbolPackageFormat>
         <DocumentationFile>$(AssemblyName).xml</DocumentationFile>
+        <!--
+          CA1861: Prefer static readonly fields over constant array arguments.
+          EF Core migration files are auto-generated by the tooling and must not
+          be hand-edited; inline array arguments in migration Up/Down methods are
+          an unavoidable pattern in the generated code.
+        -->
+        <NoWarn>$(NoWarn);CA1861</NoWarn>
     </PropertyGroup>
-  
-  <ItemGroup>
-    <NuGetAuditSuppress Include="https://github.com/advisories/GHSA-2m69-gcr7-jv3q" />
-  </ItemGroup>
+
+    <!--
+      SQLitePCLRaw.lib.e_sqlite3 2.1.11 carries advisory GHSA-2m69-gcr7-jv3q.
+      Upgrading to 3.x risks compatibility with Microsoft.EntityFrameworkCore.Sqlite 10.0.8.
+      Suppressed intentionally; revisit when EF Core ships with a safe SQLitePCLRaw version.
+    -->
+    <ItemGroup>
+        <NuGetAuditSuppress Include="https://github.com/advisories/GHSA-2m69-gcr7-jv3q" />
+    </ItemGroup>
 
     <ItemGroup>
         <PackageReference Include="AStar.Dev.Technical.Debt.Reporting" Version="0.2.1" />
@@ -40,20 +46,10 @@
         <ProjectReference Include="../AStar.Dev.FunctionalParadigm/AStar.Dev.FunctionalParadigm.csproj" />
     </ItemGroup>
 
-  <ItemGroup>
-      <None Update="Mappings.csv">
-          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      </None>
-  </ItemGroup>
-
-    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-        <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
-        <NoWarn>1701;1702;</NoWarn>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-        <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
-        <NoWarn>1701;1702;</NoWarn>
-    </PropertyGroup>
+    <ItemGroup>
+        <None Update="Mappings.csv">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+    </ItemGroup>
 
 </Project>
diff --git a/src/AStar.Dev.Utilities/AStar.Dev.Utilities.csproj b/src/AStar.Dev.Utilities/AStar.Dev.Utilities.csproj
index 239e838..49296ee 100644
--- a/src/AStar.Dev.Utilities/AStar.Dev.Utilities.csproj
+++ b/src/AStar.Dev.Utilities/AStar.Dev.Utilities.csproj
@@ -6,15 +6,12 @@
     Extension methods, helpers, and shared primitives consumed across all
     AStar Development packages and applications.
 
-    Intentionally lean — TFM, nullable, analysers, IsPackable, GenerateDocumentationFile,
-    and SourceLink are all inherited from packages/Directory.Build.props and the
-    repo root Directory.Build.props. Only package-specific metadata lives here.
+    TFM, nullable, implicit usings, TreatWarningsAsErrors, IsPackable, IncludeSymbols,
+    SymbolPackageFormat, and output paths are all inherited from the repo-root
+    Directory.Build.props. Only package-specific metadata lives here.
   -->
 
   <PropertyGroup>
-        <TargetFramework>net10.0</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <PackageTags>utilities;extensions;helpers;astar;astardevelopment</PackageTags>
@@ -25,15 +22,8 @@
     <PackageProjectUrl>https://github.com/astar-development/astar-dev-mono/tree/main/packages/core</PackageProjectUrl>
     <DocumentationFile>$(AssemblyName).xml</DocumentationFile>
     <PackageReleaseNotes>No functional changes. Just a new 'home' on GitHub.</PackageReleaseNotes>
-    <RepositoryType>git</RepositoryType>
-</PropertyGroup>
+  </PropertyGroup>
 
-  <!--
-    Direct dependencies — versions come from Directory.Packages.props.
-    Add only what this package genuinely needs at runtime.
-    Prefer Microsoft.Extensions.* abstractions over concrete implementations
-    so consumers can supply their own.
-  -->
   <ItemGroup>
     <!--
       Add <PackageReference Include="..." /> entries here as needed.
diff --git a/src/AStar.Dev.Wallpaper.Scrapper/AStar.Dev.Wallpaper.Scrapper.csproj b/src/AStar.Dev.Wallpaper.Scrapper/AStar.Dev.Wallpaper.Scrapper.csproj
index a5a1050..b386af4 100644
--- a/src/AStar.Dev.Wallpaper.Scrapper/AStar.Dev.Wallpaper.Scrapper.csproj
+++ b/src/AStar.Dev.Wallpaper.Scrapper/AStar.Dev.Wallpaper.Scrapper.csproj
@@ -1,14 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net10.0</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
         <OutputType>Exe</OutputType>
         <UserSecretsId>c35e09dc-dc30-416a-95a6-ec1a5ba1b43f</UserSecretsId>
-    <ApplicationIcon>Assets/astar.ico</ApplicationIcon>
+        <ApplicationIcon>Assets/astar.ico</ApplicationIcon>
     </PropertyGroup>
 
+    <!--
+      SQLitePCLRaw.lib.e_sqlite3 2.1.11 carries advisory GHSA-2m69-gcr7-jv3q.
+      Upgrading to 3.x (which tracks SQLite version numbers) is a major-scheme
+      change with potential compatibility risk against Microsoft.Data.Sqlite 10.0.8.
+      This suppression is intentional and matches the same decision already made
+      in AStar.Dev.Infrastructure.FilesDb.
+    -->
+    <ItemGroup>
+        <NuGetAuditSuppress Include="https://github.com/advisories/GHSA-2m69-gcr7-jv3q" />
+    </ItemGroup>
+
     <ItemGroup>
         <PackageReference Include="AStar.GuardClauses" Version="0.1.1" />
         <PackageReference Include="Microsoft.Data.Sqlite" Version="10.0.8" />
@@ -29,9 +37,10 @@
         <PackageReference Include="Avalonia.Themes.Fluent" Version="12.0.0" />
         <PackageReference Include="Avalonia.Fonts.Inter" Version="12.0.0" />
         <PackageReference Include="Testably.Abstractions" Version="10.2.0" />
+        <!-- Override Avalonia's transitive Tmds.DBus.Protocol 0.90.3 (GHSA-xrw6-gwf8-vvr9) with a safe version -->
+        <PackageReference Include="Tmds.DBus.Protocol" Version="0.93.0" />
     </ItemGroup>
 
-
     <ItemGroup>
         <None Update="appsettings.json">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
diff --git a/src/AStar.Dev.Wallpaper.Scrapper/App.axaml.cs b/src/AStar.Dev.Wallpaper.Scrapper/App.axaml.cs
index e0cd66e..38f07d3 100644
--- a/src/AStar.Dev.Wallpaper.Scrapper/App.axaml.cs
+++ b/src/AStar.Dev.Wallpaper.Scrapper/App.axaml.cs
@@ -18,6 +18,7 @@
 using AStar.Dev.Wallpaper.Scrapper.Workflows;
 using Microsoft.Playwright;
 using Serilog.Core;
+using System.Globalization;
 using Testably.Abstractions;
 using System.IO.Abstractions;
 
@@ -54,8 +55,8 @@ public override void OnFrameworkInitializationCompleted()
                 .ToAppModel())
             .AddSingleton(sp => new LoggerConfiguration()
                 .MinimumLevel.Debug()
-                .WriteTo.Console()
-                .WriteTo.Seq("http://localhost:5341")
+                .WriteTo.Console(formatProvider: CultureInfo.InvariantCulture)
+                .WriteTo.Seq("http://localhost:5341", formatProvider: CultureInfo.InvariantCulture)
                 .Enrich.WithExceptionDetails()
                 .Enrich.FromLogContext()
                 .ReadFrom.Configuration(sp.GetRequiredService<IConfiguration>())
@@ -73,6 +74,7 @@ public override void OnFrameworkInitializationCompleted()
             .AddTransient<IScrapedTagRepository, ScrapedTagRepository>()
             .AddTransient<IFileDetailRepository, FileDetailRepository>()
             .AddTransient<FileClassificationService>()
+            .AddTransient<IScrapedTagService, ScrapedTagService>()
             .AddTransient<IImagePageResultFunctional, ImagePageResultFunctional>()
             .AddTransient<ConfigurationSaverFunctional>()
             .AddTransient<ConfigurationSaver>()
diff --git a/src/AStar.Dev.Wallpaper.Scrapper/ApplicationMetadata.cs b/src/AStar.Dev.Wallpaper.Scrapper/ApplicationMetadata.cs
index 0feca64..2bb1b1f 100644
--- a/src/AStar.Dev.Wallpaper.Scrapper/ApplicationMetadata.cs
+++ b/src/AStar.Dev.Wallpaper.Scrapper/ApplicationMetadata.cs
@@ -11,5 +11,6 @@ public static class ApplicationMetadata
 
     public static string ApplicationFolder => Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)!.CombinePath("..", "..", "..");
 
-    public static string FileClassificationsExportFilePath => Path.Combine(SpecialDirectories.MyDocuments, "Scrapper", "FileClassifications.json");
+    public static string FileClassificationsExportFilePath => SpecialDirectories.MyDocuments.CombinePath("Scrapper", "FileClassifications.json");
+    public static string ScrapedTagsExportFilePath         => SpecialDirectories.MyDocuments.CombinePath("Scrapper", "ScrapedTags.json");
 }
diff --git a/src/AStar.Dev.Wallpaper.Scrapper/DTOs/ScrapedTagExtensions.cs b/src/AStar.Dev.Wallpaper.Scrapper/DTOs/ScrapedTagExtensions.cs
new file mode 100644
index 0000000..4e4b1b4
--- /dev/null
+++ b/src/AStar.Dev.Wallpaper.Scrapper/DTOs/ScrapedTagExtensions.cs
@@ -0,0 +1,32 @@
+using ScrapedTagDto      = AStar.Dev.Wallpaper.Scrapper.DTOs.ScrapedTag;
+using ScrapedTagDomain   = AStar.Dev.Infrastructure.FilesDb.Models.ScrapedTag;
+using ScrapedTagDomainId = AStar.Dev.Infrastructure.FilesDb.Models.ScrapedTagId;
+
+namespace AStar.Dev.Wallpaper.Scrapper.DTOs;
+
+public static class ScrapedTagExtensions
+{
+    public static ScrapedTagDomain ToDomain(this ScrapedTagDto dto)
+        => new()
+        {
+            Id = new ScrapedTagDomainId(dto.Id.Value),
+            Value = dto.Value,
+            Category = dto.Category,
+            IncludeInSearch = dto.IncludeInSearch
+        };
+
+    public static ScrapedTagDto ToDto(this ScrapedTagDomain domain)
+        => new()
+        {
+            Id = new ScrapedTagId(domain.Id.Value),
+            Value = domain.Value,
+            Category = domain.Category,
+            IncludeInSearch = domain.IncludeInSearch
+        };
+
+    public static List<ScrapedTagDomain> ToDomain(this List<ScrapedTagDto> dtos)
+        => [.. dtos.Select(dto => dto.ToDomain())];
+
+    public static List<ScrapedTagDto> ToDtos(this List<ScrapedTagDomain> domains)
+        => [.. domains.Select(domain => domain.ToDto())];
+}
diff --git a/src/AStar.Dev.Wallpaper.Scrapper/MainWindow.axaml b/src/AStar.Dev.Wallpaper.Scrapper/MainWindow.axaml
index e5a0451..87f1dd2 100644
--- a/src/AStar.Dev.Wallpaper.Scrapper/MainWindow.axaml
+++ b/src/AStar.Dev.Wallpaper.Scrapper/MainWindow.axaml
@@ -10,6 +10,8 @@
             <Button x:Name="ScrapeSiteNewButton" Content="Scrape Site New" Click="OnScrapeSiteFunctionalClicked" />
             <Button x:Name="ExportButton" Content="Export Classifications" Click="OnExportClicked" />
             <Button x:Name="ImportButton" Content="Import Classifications" Click="OnImportClicked" />
+            <Button x:Name="ExportTagsButton" Content="Export Tags" Click="OnExportTagsClicked" />
+            <Button x:Name="ImportTagsButton" Content="Import Tags" Click="OnImportTagsClicked" />
             <Button x:Name="CancelButton" Content="Cancel" Click="OnCancelClicked" IsEnabled="False" />
         </StackPanel>
         <ScrollViewer x:Name="StatusScroller" Margin="12,8">
diff --git a/src/AStar.Dev.Wallpaper.Scrapper/MainWindow.axaml.cs b/src/AStar.Dev.Wallpaper.Scrapper/MainWindow.axaml.cs
index 41665fa..df4ee70 100644
--- a/src/AStar.Dev.Wallpaper.Scrapper/MainWindow.axaml.cs
+++ b/src/AStar.Dev.Wallpaper.Scrapper/MainWindow.axaml.cs
@@ -19,7 +19,7 @@
 
 namespace AStar.Dev.Wallpaper.Scrapper;
 
-public partial class MainWindow : Window
+public partial class MainWindow : Window, IDisposable
 {
     private readonly Func<ScrapeConfigurationView> scrapeConfigViewFactory;
     private readonly ScrapeConfiguration scrapeConfiguration;
@@ -27,6 +27,7 @@ public partial class MainWindow : Window
     private readonly IScrapedTagRepository scrapedTagRepository;
     private readonly IFileDetailRepository fileDetailRepository;
     private readonly FileClassificationService fileClassificationService;
+    private readonly IScrapedTagService scrapedTagService;
     private readonly ConfigurationSaver configurationSaver;
     private readonly TagsToIgnoreCompletely tagsToIgnoreCompletely;
     private readonly TagsTextToIgnore tagsTextToIgnore;
@@ -38,7 +39,7 @@ public partial class MainWindow : Window
     private CancellationTokenSource? cts;
     private readonly Logger scrapeLogger;
 
-    public MainWindow(Func<ScrapeConfigurationView> scrapeConfigViewFactory,SearchWorkflowFunctional imagePageServiceFunctional, IFileSystem fileSystem, IPlaywrightService playwrightService, ScrapeConfiguration scrapeConfiguration, SearchWorkflowFunctional searchWorkflowFunctional, Logger logger, IScrapedTagRepository scrapedTagRepository, IFileDetailRepository fileDetailRepository, FileClassificationService fileClassificationService, ConfigurationSaver configurationSaver, TagsToIgnoreCompletely tagsToIgnoreCompletely, TagsTextToIgnore tagsTextToIgnore, IImportExportService importExportService)
+    public MainWindow(Func<ScrapeConfigurationView> scrapeConfigViewFactory, SearchWorkflowFunctional imagePageServiceFunctional, IFileSystem fileSystem, IPlaywrightService playwrightService, ScrapeConfiguration scrapeConfiguration, SearchWorkflowFunctional searchWorkflowFunctional, Logger logger, IScrapedTagRepository scrapedTagRepository, IFileDetailRepository fileDetailRepository, FileClassificationService fileClassificationService, IScrapedTagService scrapedTagService, ConfigurationSaver configurationSaver, TagsToIgnoreCompletely tagsToIgnoreCompletely, TagsTextToIgnore tagsTextToIgnore, IImportExportService importExportService)
     {
         this.scrapeConfigViewFactory = scrapeConfigViewFactory;
         this.scrapeConfiguration = scrapeConfiguration;
@@ -46,6 +47,7 @@ public MainWindow(Func<ScrapeConfigurationView> scrapeConfigViewFactory,SearchWo
         this.scrapedTagRepository = scrapedTagRepository;
         this.fileDetailRepository = fileDetailRepository;
         this.fileClassificationService = fileClassificationService;
+        this.scrapedTagService = scrapedTagService;
         this.configurationSaver = configurationSaver;
         this.tagsToIgnoreCompletely = tagsToIgnoreCompletely;
         this.tagsTextToIgnore = tagsTextToIgnore;
@@ -56,6 +58,7 @@ public MainWindow(Func<ScrapeConfigurationView> scrapeConfigViewFactory,SearchWo
         this.fileSystem = fileSystem;
         this.scrapeLogger = GetScrapeLoggerForDisplaySync();
         InitializeComponent();
+        Closed += (_, _) => cts?.Dispose();
     }
 
     private async void OnEditConfigurationClicked(object? sender, RoutedEventArgs e)
@@ -91,7 +94,7 @@ private async void OnExportClicked(object? sender, RoutedEventArgs e)
             )
             .Tap(_ => scrapeLogger.Information("Exporting classifications..."))
             .MapAsync(_ => fileClassificationService.ExportClassificationsAsync(cts!.Token))
-            .Tap(importExportService.ExportFileClassificationsToFile) 
+            .Tap(importExportService.ExportFileClassificationsToFile)
             .TapAsync(_ => scrapeLogger.Information("Export completed..."))
             .EnsureAsync(() => ResetUI());
 
@@ -111,10 +114,43 @@ private async void OnImportClicked(object? sender, RoutedEventArgs e)
             .TapAsync(_ => scrapeLogger.Information("Import completed..."))
             .EnsureAsync(() => ResetUI());
 
+    private async void OnExportTagsClicked(object? sender, RoutedEventArgs e)
+        => _ = await ResetCancellationTokenSource()
+            .Match<CancellationToken, Exception, Result<CancellationToken, string>>(
+                onSuccess: DisableControlsAndClearStatus,
+                onFailure: ex =>
+                {
+                    scrapeLogger.Error(ex, "Failed to reset cancellation token source");
+                    UpdateStatus($"Error: {ex.Message}");
+                    return ex.Message;
+                }
+            )
+            .Tap(_ => scrapeLogger.Information("Exporting tags..."))
+            .MapAsync(_ => scrapedTagService.ExportScrapedTagsAsync(cts!.Token))
+            .Tap(importExportService.ExportScrapedTagsToFile)
+            .TapAsync(_ => scrapeLogger.Information("Tag export completed..."))
+            .EnsureAsync(() => ResetUI());
+
+    private async void OnImportTagsClicked(object? sender, RoutedEventArgs e)
+        => _ = await ResetCancellationTokenSource()
+            .Match<CancellationToken, Exception, Result<CancellationToken, string>>(
+                onSuccess: DisableControlsAndClearStatus,
+                onFailure: ex =>
+                {
+                    scrapeLogger.Error(ex, "Failed to reset cancellation token source");
+                    return ex.Message;
+                }
+            )
+            .Tap(_ => scrapeLogger.Information("Importing tags..."))
+            .Bind(_ => importExportService.ImportScrapedTagsFromFile())
+            .MapAsync(tags => scrapedTagService.ImportScrapedTagsAsync(tags, cts!.Token))
+            .TapAsync(_ => scrapeLogger.Information("Tag import completed..."))
+            .EnsureAsync(() => ResetUI());
+
     private Result<CancellationToken, Exception> ResetCancellationTokenSource()
     {
         cts = new CancellationTokenSource();
-    
+
         return cts.Token;
     }
 
@@ -124,9 +160,11 @@ private Result<CancellationToken, string> DisableControlsAndClearStatus(Cancella
         ScrapeSiteNewButton.IsEnabled = false;
         ExportButton.IsEnabled = false;
         ImportButton.IsEnabled = false;
+        ExportTagsButton.IsEnabled = false;
+        ImportTagsButton.IsEnabled = false;
         CancelButton.IsEnabled = true;
         StatusLabel.Text = string.Empty;
-    
+
         return ct;
     }
 
@@ -144,6 +182,8 @@ private void ResetUI()
                 ScrapeSiteNewButton.IsEnabled = true;
                 ExportButton.IsEnabled = true;
                 ImportButton.IsEnabled = true;
+                ExportTagsButton.IsEnabled = true;
+                ImportTagsButton.IsEnabled = true;
                 CancelButton.IsEnabled = false;
                 cts?.Dispose();
                 cts = null;
@@ -157,4 +197,10 @@ private void UpdateStatus(string message)
             StatusLabel.Text += message + Environment.NewLine;
             StatusScroller.ScrollToEnd();
         });
+
+    public void Dispose()
+    {
+        cts?.Dispose();
+        GC.SuppressFinalize(this);
+    }
 }
diff --git a/src/AStar.Dev.Wallpaper.Scrapper/Pages/ImagePage.cs b/src/AStar.Dev.Wallpaper.Scrapper/Pages/ImagePage.cs
index f7ddf8c..d7bfc30 100644
--- a/src/AStar.Dev.Wallpaper.Scrapper/Pages/ImagePage.cs
+++ b/src/AStar.Dev.Wallpaper.Scrapper/Pages/ImagePage.cs
@@ -90,7 +90,7 @@ private static bool TagIsNotCelebEtc(string tagToUse)
            && !TagContains(tagToUse, "actress");
 
     private static bool TagContains(string tagToUse, string contains)
-        => tagToUse.Contains(contains, StringComparison.CurrentCultureIgnoreCase);
+        => tagToUse.Contains(contains, StringComparison.OrdinalIgnoreCase);
 
     private string UpdateFilePrefixForVehicles(string tagToUse, string filePrefix)
     {
@@ -103,7 +103,7 @@ private string UpdateFilePrefixForVehicles(string tagToUse, string filePrefix)
 
     private bool IsWantedFilePrefix(string tagToUse, string filePrefix)
         => IsWantedText(tagToUse) && !filePrefix.Contains(tagToUse) &&
-           !tagToUse.Equals("car", StringComparison.CurrentCultureIgnoreCase) &&
+           !tagToUse.Equals("car", StringComparison.OrdinalIgnoreCase) &&
            !TagContains(tagToUse, "cars");
 
     private (string filePrefix, List<string> directoryName) UpdateFilePrefixForModels(string tagToUse, string tagText, string filePrefix, List<string> directoryName)
@@ -115,7 +115,7 @@ private bool IsWantedFilePrefix(string tagToUse, string filePrefix)
             if (IsWantedText(tagText) && !filePrefix.Contains(tagText))
             {
             
-                if (!directoryName.Contains(tagText) && !filePrefix.Contains(tagText, StringComparison.CurrentCultureIgnoreCase))
+                if (!directoryName.Contains(tagText) && !filePrefix.Contains(tagText, StringComparison.OrdinalIgnoreCase))
                 {
                     filePrefixUpdated = string.Join("-", filePrefix, tagText);
                     directoryName.Add(tagText);
@@ -132,5 +132,5 @@ private bool IsOneOfTheImageTagsToExcludeCompletely(string tagText)
         => tagsToIgnoreCompletely.Tags.Contains(tagText);
 
     private bool IsWantedText(string tagText)
-        => !tagsTextToIgnore.Tags.Contains(tagText) && !tagText.StartsWith("model", StringComparison.CurrentCultureIgnoreCase);
+        => !tagsTextToIgnore.Tags.Contains(tagText) && !tagText.StartsWith("model", StringComparison.OrdinalIgnoreCase);
 }
diff --git a/src/AStar.Dev.Wallpaper.Scrapper/Pages/SearchResultsPage.cs b/src/AStar.Dev.Wallpaper.Scrapper/Pages/SearchResultsPage.cs
index cffe528..4eb7cc2 100644
--- a/src/AStar.Dev.Wallpaper.Scrapper/Pages/SearchResultsPage.cs
+++ b/src/AStar.Dev.Wallpaper.Scrapper/Pages/SearchResultsPage.cs
@@ -1,4 +1,5 @@
-using AStar.Dev.Wallpaper.Scrapper.Services;
+using System.Globalization;
+using AStar.Dev.Wallpaper.Scrapper.Services;
 using Microsoft.Playwright;
 using Serilog.Core;
 
@@ -89,14 +90,14 @@ private async Task<IReadOnlyCollection<string>> GetTheImagePageLinksAsync()
 
         if(text is null) return (0, 0, string.Empty);
 
-        var firstSpaceIndex  = text.IndexOf(" ", StringComparison.Ordinal);
+        var firstSpaceIndex  = text.IndexOf(' ');
         var hashIndex        = text.IndexOf("for ", StringComparison.Ordinal) + 3;
         var subDirectoryName = string.Empty;
 
         if(hashIndex > 0) subDirectoryName = text[(hashIndex + 1)..].Replace(" ", "-").Replace("#", string.Empty);
 
         var searchResults = text.Replace(",", string.Empty)[..firstSpaceIndex];
-        var imageCount    = decimal.Parse(searchResults);
+        var imageCount    = decimal.Parse(searchResults, CultureInfo.InvariantCulture);
 
         return (Convert.ToInt32(Math.Ceiling(imageCount / 24)), (int)imageCount, subDirectoryName);
     }
diff --git a/src/AStar.Dev.Wallpaper.Scrapper/Pages/SearchResultsPageFunctional.cs b/src/AStar.Dev.Wallpaper.Scrapper/Pages/SearchResultsPageFunctional.cs
index 0b564d4..62a9ff3 100644
--- a/src/AStar.Dev.Wallpaper.Scrapper/Pages/SearchResultsPageFunctional.cs
+++ b/src/AStar.Dev.Wallpaper.Scrapper/Pages/SearchResultsPageFunctional.cs
@@ -1,3 +1,4 @@
+using System.Globalization;
 using AStar.Dev.Wallpaper.Scrapper.Services;
 using Microsoft.Playwright;
 using Serilog.Core;
@@ -89,14 +90,14 @@ private async Task<IReadOnlyCollection<string>> GetTheImagePageLinksAsync()
 
         if(text is null) return (0, 0, string.Empty);
 
-        var firstSpaceIndex  = text.IndexOf(" ", StringComparison.Ordinal);
+        var firstSpaceIndex  = text.IndexOf(' ');
         var hashIndex        = text.IndexOf("for ", StringComparison.Ordinal) + 3;
         var subDirectoryName = string.Empty;
 
         if(hashIndex > 0) subDirectoryName = text[(hashIndex + 1)..].Replace(" ", "-").Replace("#", string.Empty);
 
         var searchResults = text.Replace(",", string.Empty)[..firstSpaceIndex];
-        var imageCount    = decimal.Parse(searchResults);
+        var imageCount    = decimal.Parse(searchResults, CultureInfo.InvariantCulture);
 
         return (Convert.ToInt32(Math.Ceiling(imageCount / 24)), (int)imageCount, subDirectoryName);
     }
diff --git a/src/AStar.Dev.Wallpaper.Scrapper/Pages/SubscriptionsImagesListPage.cs b/src/AStar.Dev.Wallpaper.Scrapper/Pages/SubscriptionsImagesListPage.cs
index 4d1739a..a509420 100644
--- a/src/AStar.Dev.Wallpaper.Scrapper/Pages/SubscriptionsImagesListPage.cs
+++ b/src/AStar.Dev.Wallpaper.Scrapper/Pages/SubscriptionsImagesListPage.cs
@@ -1,4 +1,5 @@
-using AStar.Dev.Wallpaper.Scrapper.Models;
+using System.Globalization;
+using AStar.Dev.Wallpaper.Scrapper.Models;
 using AStar.Dev.Wallpaper.Scrapper.Services;
 using Microsoft.Playwright;
 
@@ -22,14 +23,14 @@ public sealed class SubscriptionsImagesListPage(IPlaywrightService playwrightSer
 
         if(text is null) return (0, string.Empty);
 
-        var firstSpaceIndex  = text.IndexOf(" ",   StringComparison.Ordinal);
+        var firstSpaceIndex  = text.IndexOf(' ');
         var hashIndex        = text.IndexOf("New", StringComparison.Ordinal);
         var subDirectoryName = string.Empty;
 
         if(hashIndex > 0) subDirectoryName = text[hashIndex..].Replace(" ", "-").Replace("#", string.Empty);
 
         var searchResults = text.Replace(",", string.Empty)[..firstSpaceIndex];
-        var imageCount    = decimal.Parse(searchResults) / 24;
+        var imageCount    = decimal.Parse(searchResults, CultureInfo.InvariantCulture) / 24;
 
         return (Convert.ToInt32(Math.Ceiling(imageCount)), subDirectoryName);
     }
diff --git a/src/AStar.Dev.Wallpaper.Scrapper/Pages/TopWallpapersPage.cs b/src/AStar.Dev.Wallpaper.Scrapper/Pages/TopWallpapersPage.cs
index 171736a..1bfecc7 100644
--- a/src/AStar.Dev.Wallpaper.Scrapper/Pages/TopWallpapersPage.cs
+++ b/src/AStar.Dev.Wallpaper.Scrapper/Pages/TopWallpapersPage.cs
@@ -1,4 +1,5 @@
-using AStar.Dev.Wallpaper.Scrapper.Models;
+using System.Globalization;
+using AStar.Dev.Wallpaper.Scrapper.Models;
 using AStar.Dev.Wallpaper.Scrapper.Services;
 using Microsoft.Playwright;
 
@@ -24,7 +25,7 @@ public async Task<int> PageInfoAsync()
         var firstSlashIndex = text.IndexOf('/') + 1;
         var pages           = text[firstSlashIndex..].Trim();
 
-        return Convert.ToInt32(pages);
+        return int.Parse(pages, CultureInfo.InvariantCulture);
     }
 
     public async Task<IReadOnlyCollection<string>> GetImagePageLinks()
diff --git a/src/AStar.Dev.Wallpaper.Scrapper/Pages/TopWallpapersPageFunctional.cs b/src/AStar.Dev.Wallpaper.Scrapper/Pages/TopWallpapersPageFunctional.cs
index 4ae7c69..b238d39 100644
--- a/src/AStar.Dev.Wallpaper.Scrapper/Pages/TopWallpapersPageFunctional.cs
+++ b/src/AStar.Dev.Wallpaper.Scrapper/Pages/TopWallpapersPageFunctional.cs
@@ -1,4 +1,5 @@
-using AStar.Dev.Wallpaper.Scrapper.Models;
+using System.Globalization;
+using AStar.Dev.Wallpaper.Scrapper.Models;
 using AStar.Dev.Wallpaper.Scrapper.Services;
 using Microsoft.Playwright;
 
@@ -31,7 +32,7 @@ public async Task<int> PageInfoAsync()
         var firstSlashIndex = text.IndexOf('/') + 1;
         var pages = text[firstSlashIndex..].Trim();
 
-        return Convert.ToInt32(pages);
+        return int.Parse(pages, CultureInfo.InvariantCulture);
     }
 
     public async Task<IReadOnlyCollection<string>> GetImagePageLinks()
diff --git a/src/AStar.Dev.Wallpaper.Scrapper/Repositories/IScrapedTagRepository.cs b/src/AStar.Dev.Wallpaper.Scrapper/Repositories/IScrapedTagRepository.cs
index ee47020..e33eee4 100644
--- a/src/AStar.Dev.Wallpaper.Scrapper/Repositories/IScrapedTagRepository.cs
+++ b/src/AStar.Dev.Wallpaper.Scrapper/Repositories/IScrapedTagRepository.cs
@@ -1,8 +1,10 @@
+using ScrapedTagDomain = AStar.Dev.Infrastructure.FilesDb.Models.ScrapedTag;
+
 namespace AStar.Dev.Wallpaper.Scrapper.Repositories;
 
 public interface IScrapedTagRepository
 {
     Task SaveAsync(IReadOnlyList<TagData> tags);
+    Task<List<ScrapedTagDomain>> GetAllAsync(CancellationToken ct);
+    Task UpsertAsync(IReadOnlyList<ScrapedTagDomain> tags, CancellationToken ct);
 }
-
-public record TagData(string Tag, string? Category);
\ No newline at end of file
diff --git a/src/AStar.Dev.Wallpaper.Scrapper/Repositories/ScrapedTagExtensions.cs b/src/AStar.Dev.Wallpaper.Scrapper/Repositories/ScrapedTagExtensions.cs
index ecffb6d..c31984f 100644
--- a/src/AStar.Dev.Wallpaper.Scrapper/Repositories/ScrapedTagExtensions.cs
+++ b/src/AStar.Dev.Wallpaper.Scrapper/Repositories/ScrapedTagExtensions.cs
@@ -1,13 +1,17 @@
+using ScrapedTagDto      = AStar.Dev.Wallpaper.Scrapper.DTOs.ScrapedTag;
+using ScrapedTagDomain   = AStar.Dev.Infrastructure.FilesDb.Models.ScrapedTag;
+using ScrapedTagDomainId = AStar.Dev.Infrastructure.FilesDb.Models.ScrapedTagId;
+
 namespace AStar.Dev.Wallpaper.Scrapper.Repositories;
 
 public static class ScrapedTagExtensions
 {
-    public static AStar.Dev.Infrastructure.FilesDb.Models.ScrapedTag ToDomain(this AStar.Dev.Wallpaper.Scrapper.DTOs.ScrapedTag tag)
+    public static ScrapedTagDomain ToDomain(this ScrapedTagDto tag)
         => new()
         {
-            Id = new AStar.Dev.Infrastructure.FilesDb.Models.ScrapedTagId(tag.Id.Value),
+            Id = new ScrapedTagDomainId(tag.Id.Value),
             Value = tag.Value,
             Category = tag.Category,
             IncludeInSearch = tag.IncludeInSearch
         };
-}
\ No newline at end of file
+}
diff --git a/src/AStar.Dev.Wallpaper.Scrapper/Repositories/ScrapedTagRepository.cs b/src/AStar.Dev.Wallpaper.Scrapper/Repositories/ScrapedTagRepository.cs
index 767133e..072edca 100644
--- a/src/AStar.Dev.Wallpaper.Scrapper/Repositories/ScrapedTagRepository.cs
+++ b/src/AStar.Dev.Wallpaper.Scrapper/Repositories/ScrapedTagRepository.cs
@@ -1,9 +1,8 @@
 using System.Globalization;
 using AStar.Dev.Infrastructure.FilesDb.Data;
 using AStar.Dev.Infrastructure.FilesDb.Models;
-using AStar.Dev.Utilities;
-using AStar.Dev.Wallpaper.Scrapper.DTOs;
 using Microsoft.EntityFrameworkCore;
+using ScrapedTagDto = AStar.Dev.Wallpaper.Scrapper.DTOs.ScrapedTag;
 
 namespace AStar.Dev.Wallpaper.Scrapper.Repositories;
 
@@ -12,10 +11,12 @@ public sealed class ScrapedTagRepository(IDbContextFactory<FilesContext> context
     public async Task SaveAsync(IReadOnlyList<TagData> tags)
     {
         await using var context = await contextFactory.CreateDbContextAsync();
-        var titleCasedTags = new List<AStar.Dev.Wallpaper.Scrapper.DTOs.ScrapedTag>();
-
-        var textInfo = new CultureInfo("en-GB",false).TextInfo;
-        tags.ForEach(t => titleCasedTags.Add(new AStar.Dev.Wallpaper.Scrapper.DTOs.ScrapedTag{Category = textInfo.ToTitleCase(t.Category ?? ""), Value = textInfo.ToTitleCase(t.Tag)}));
+        var textInfo = new CultureInfo("en-GB", false).TextInfo;
+        var titleCasedTags = tags.Select(t => new ScrapedTagDto
+        {
+            Category = textInfo.ToTitleCase(t.Category ?? ""),
+            Value    = textInfo.ToTitleCase(t.Tag)
+        }).ToList();
 
         foreach(var tag in titleCasedTags)
         {
@@ -25,4 +26,32 @@ public async Task SaveAsync(IReadOnlyList<TagData> tags)
 
         _ = await context.SaveChangesAsync();
     }
+
+    public async Task<List<ScrapedTag>> GetAllAsync(CancellationToken ct)
+    {
+        await using var context = await contextFactory.CreateDbContextAsync(ct);
+
+        return await context.ScrapedTags.AsNoTracking().ToListAsync(ct);
+    }
+
+    public async Task UpsertAsync(IReadOnlyList<ScrapedTag> tags, CancellationToken ct)
+    {
+        await using var context = await contextFactory.CreateDbContextAsync(ct);
+
+        var values      = tags.Select(t => t.Value).ToList();
+        var existingMap = await context.ScrapedTags
+            .Where(t => values.Contains(t.Value))
+            .ToListAsync(ct);
+
+        foreach(var tag in tags)
+        {
+            var existing = existingMap.FirstOrDefault(t => t.Value == tag.Value && t.Category == tag.Category);
+            if(existing is not null)
+                existing.IncludeInSearch = tag.IncludeInSearch;
+            else
+                context.ScrapedTags.Add(tag);
+        }
+
+        _ = await context.SaveChangesAsync(ct);
+    }
 }
diff --git a/src/AStar.Dev.Wallpaper.Scrapper/Repositories/TagData.cs b/src/AStar.Dev.Wallpaper.Scrapper/Repositories/TagData.cs
new file mode 100644
index 0000000..edb478b
--- /dev/null
+++ b/src/AStar.Dev.Wallpaper.Scrapper/Repositories/TagData.cs
@@ -0,0 +1,3 @@
+namespace AStar.Dev.Wallpaper.Scrapper.Repositories;
+
+public record TagData(string Tag, string? Category);
diff --git a/src/AStar.Dev.Wallpaper.Scrapper/ScrapeConfiguration/ScrapeConfigurationViewModel.cs b/src/AStar.Dev.Wallpaper.Scrapper/ScrapeConfiguration/ScrapeConfigurationViewModel.cs
index a2267e3..354ba4e 100644
--- a/src/AStar.Dev.Wallpaper.Scrapper/ScrapeConfiguration/ScrapeConfigurationViewModel.cs
+++ b/src/AStar.Dev.Wallpaper.Scrapper/ScrapeConfiguration/ScrapeConfigurationViewModel.cs
@@ -116,7 +116,11 @@ public async Task LoadAsync()
         }
     }
 
-    public async ValueTask DisposeAsync() => await _context.DisposeAsync();
+    public async ValueTask DisposeAsync()
+    {
+        await _context.DisposeAsync();
+        GC.SuppressFinalize(this);
+    }
 
     private void MapFromEntity(ScrapeConfigurationEntity entity)
     {
diff --git a/src/AStar.Dev.Wallpaper.Scrapper/Services/FileClassificationService.cs b/src/AStar.Dev.Wallpaper.Scrapper/Services/FileClassificationService.cs
index e1ea93b..ba3e056 100644
--- a/src/AStar.Dev.Wallpaper.Scrapper/Services/FileClassificationService.cs
+++ b/src/AStar.Dev.Wallpaper.Scrapper/Services/FileClassificationService.cs
@@ -103,25 +103,26 @@ private static async Task CollectTagMatchesAsync(FilesContext context, IReadOnly
     {
         if (imageTags.Count == 0) return;
 
-        var lowerImageTags = imageTags.Select(t => t.ToLowerInvariant()).ToList();
-        var tags = await context.ScrapedTags
-            .Where(t => t.IncludeInSearch && lowerImageTags.Contains(t.Value.ToLower()))
+        var tagSet = new HashSet<string>(imageTags.Select(t => t.ToLowerInvariant()), StringComparer.OrdinalIgnoreCase);
+        var allIncludedTags = await context.ScrapedTags
+            .Where(t => t.IncludeInSearch)
             .ToListAsync(token);
 
-        foreach (var tag in tags)
+        foreach (var tag in allIncludedTags.Where(t => tagSet.Contains(t.Value.ToLowerInvariant())))
             matched.Add(await FindOrCreateClassificationAsync(context, tag.Value));
     }
 
     private static async Task<FileClassification> FindOrCreateClassificationAsync(FilesContext context, string name)
     {
+        var normalizedName = name.ToLowerInvariant();
         var tracked = context.ChangeTracker.Entries<FileClassification>()
-            .FirstOrDefault(e => e.Entity.Name.Equals(name, StringComparison.OrdinalIgnoreCase))?.Entity;
+            .FirstOrDefault(e => e.Entity.Name.Equals(normalizedName, StringComparison.OrdinalIgnoreCase))?.Entity;
         if (tracked is not null) return tracked;
 
-        var existing = await context.FileClassifications.FirstOrDefaultAsync(fc => fc.Name.ToLower() == name.ToLower());
+        var existing = await context.FileClassifications.FirstOrDefaultAsync(fc => fc.Name == normalizedName);
         if (existing is not null) return existing;
 
-        var created = new FileClassification { Name = name };
+        var created = new FileClassification { Name = normalizedName };
         context.FileClassifications.Add(created);
 
         return created;
diff --git a/src/AStar.Dev.Wallpaper.Scrapper/Services/IImportExportService.cs b/src/AStar.Dev.Wallpaper.Scrapper/Services/IImportExportService.cs
index e2a1ade..ca1a5b2 100644
--- a/src/AStar.Dev.Wallpaper.Scrapper/Services/IImportExportService.cs
+++ b/src/AStar.Dev.Wallpaper.Scrapper/Services/IImportExportService.cs
@@ -1,5 +1,6 @@
 using AStar.Dev.FunctionalParadigm;
 using FileClassificationDomain = AStar.Dev.Infrastructure.FilesDb.Models.FileClassification;
+using ScrapedTagDomain = AStar.Dev.Infrastructure.FilesDb.Models.ScrapedTag;
 
 namespace AStar.Dev.Wallpaper.Scrapper.Services;
 
@@ -7,4 +8,7 @@ public interface IImportExportService
 {
     void ExportFileClassificationsToFile(List<FileClassificationDomain> classifications);
     Result<List<FileClassificationDomain>, string> ImportFileClassificationsFromFile();
+
+    void ExportScrapedTagsToFile(List<ScrapedTagDomain> tags);
+    Result<List<ScrapedTagDomain>, string> ImportScrapedTagsFromFile();
 }
diff --git a/src/AStar.Dev.Wallpaper.Scrapper/Services/IScrapedTagService.cs b/src/AStar.Dev.Wallpaper.Scrapper/Services/IScrapedTagService.cs
new file mode 100644
index 0000000..51a2542
--- /dev/null
+++ b/src/AStar.Dev.Wallpaper.Scrapper/Services/IScrapedTagService.cs
@@ -0,0 +1,9 @@
+using ScrapedTagDomain = AStar.Dev.Infrastructure.FilesDb.Models.ScrapedTag;
+
+namespace AStar.Dev.Wallpaper.Scrapper.Services;
+
+public interface IScrapedTagService
+{
+    Task<List<ScrapedTagDomain>> ExportScrapedTagsAsync(CancellationToken ct);
+    Task<int> ImportScrapedTagsAsync(IReadOnlyList<ScrapedTagDomain> tags, CancellationToken ct);
+}
diff --git a/src/AStar.Dev.Wallpaper.Scrapper/Services/ImportExportService.cs b/src/AStar.Dev.Wallpaper.Scrapper/Services/ImportExportService.cs
index c9fd0fb..dc07139 100644
--- a/src/AStar.Dev.Wallpaper.Scrapper/Services/ImportExportService.cs
+++ b/src/AStar.Dev.Wallpaper.Scrapper/Services/ImportExportService.cs
@@ -1,14 +1,16 @@
 using AStar.Dev.FunctionalParadigm;
-using FileClassificationDto = AStar.Dev.Wallpaper.Scrapper.DTOs.FileClassification;
-using FileClassificationDomain = AStar.Dev.Infrastructure.FilesDb.Models.FileClassification;
-using System.IO.Abstractions;
 using AStar.Dev.Utilities;
 using AStar.Dev.Wallpaper.Scrapper.DTOs;
 using Serilog;
+using System.IO.Abstractions;
+using FileClassificationDto = AStar.Dev.Wallpaper.Scrapper.DTOs.FileClassification;
+using FileClassificationDomain = AStar.Dev.Infrastructure.FilesDb.Models.FileClassification;
+using ScrapedTagDto = AStar.Dev.Wallpaper.Scrapper.DTOs.ScrapedTag;
+using ScrapedTagDomain = AStar.Dev.Infrastructure.FilesDb.Models.ScrapedTag;
 
 namespace AStar.Dev.Wallpaper.Scrapper.Services;
 
-public class ImportExportService(IFileSystem fileSystem, ILogger logger) : IImportExportService
+public sealed class ImportExportService(IFileSystem fileSystem, ILogger logger) : IImportExportService
 {
     public void ExportFileClassificationsToFile(List<FileClassificationDomain> classifications)
     {
@@ -18,7 +20,7 @@ public void ExportFileClassificationsToFile(List<FileClassificationDomain> class
             fileSystem.File.WriteAllText(ApplicationMetadata.FileClassificationsExportFilePath, json);
             logger.Information("Classifications exported to {FilePath}", ApplicationMetadata.FileClassificationsExportFilePath);
         }
-        catch (Exception ex)
+        catch(Exception ex)
         {
             logger.Error(ex, "Failed to export classifications to file: {FilePath}", ApplicationMetadata.FileClassificationsExportFilePath);
             throw;
@@ -46,4 +48,41 @@ public Result<List<FileClassificationDomain>, string> ImportFileClassificationsF
 
         return classifications.ToDomain();
     }
+
+    public void ExportScrapedTagsToFile(List<ScrapedTagDomain> tags)
+    {
+        try
+        {
+            var json = tags.ToDtos().ToJson();
+            fileSystem.File.WriteAllText(ApplicationMetadata.ScrapedTagsExportFilePath, json);
+            logger.Information("Tags exported to {FilePath}", ApplicationMetadata.ScrapedTagsExportFilePath);
+        }
+        catch(Exception ex)
+        {
+            logger.Error(ex, "Failed to export tags to file: {FilePath}", ApplicationMetadata.ScrapedTagsExportFilePath);
+            throw;
+        }
+    }
+
+    public Result<List<ScrapedTagDomain>, string> ImportScrapedTagsFromFile()
+    {
+        if(!fileSystem.File.Exists(ApplicationMetadata.ScrapedTagsExportFilePath))
+        {
+            logger.Error("File not found: {FilePath}", ApplicationMetadata.ScrapedTagsExportFilePath);
+
+            return $"Error: File not found - {ApplicationMetadata.ScrapedTagsExportFilePath}";
+        }
+
+        var tagsJson = fileSystem.File.ReadAllText(ApplicationMetadata.ScrapedTagsExportFilePath);
+        var tags = tagsJson.FromJson<List<ScrapedTagDto>>(AStar.Dev.Utilities.Constants.WebDeserialisationSettings);
+
+        if(tags is null)
+        {
+            logger.Error("Failed to deserialize tags from file: {FilePath}", ApplicationMetadata.ScrapedTagsExportFilePath);
+
+            return $"Error: Failed to deserialize tags from file - {ApplicationMetadata.ScrapedTagsExportFilePath}";
+        }
+
+        return tags.ToDomain();
+    }
 }
diff --git a/src/AStar.Dev.Wallpaper.Scrapper/Services/PlaywrightService.cs b/src/AStar.Dev.Wallpaper.Scrapper/Services/PlaywrightService.cs
index 41395f7..e54fb42 100644
--- a/src/AStar.Dev.Wallpaper.Scrapper/Services/PlaywrightService.cs
+++ b/src/AStar.Dev.Wallpaper.Scrapper/Services/PlaywrightService.cs
@@ -70,6 +70,8 @@ public async ValueTask DisposeAsync()
             playwright.Dispose();
             playwright = null;
         }
+
+        GC.SuppressFinalize(this);
     }
 
     private static async Task ApplyCookiesAsync(IBrowserContext context, Logger logger)
diff --git a/src/AStar.Dev.Wallpaper.Scrapper/Services/ScrapedTagService.cs b/src/AStar.Dev.Wallpaper.Scrapper/Services/ScrapedTagService.cs
new file mode 100644
index 0000000..cf9dba9
--- /dev/null
+++ b/src/AStar.Dev.Wallpaper.Scrapper/Services/ScrapedTagService.cs
@@ -0,0 +1,17 @@
+using AStar.Dev.Wallpaper.Scrapper.Repositories;
+using ScrapedTagDomain = AStar.Dev.Infrastructure.FilesDb.Models.ScrapedTag;
+
+namespace AStar.Dev.Wallpaper.Scrapper.Services;
+
+public sealed class ScrapedTagService(IScrapedTagRepository repository) : IScrapedTagService
+{
+    public Task<List<ScrapedTagDomain>> ExportScrapedTagsAsync(CancellationToken ct)
+        => repository.GetAllAsync(ct);
+
+    public async Task<int> ImportScrapedTagsAsync(IReadOnlyList<ScrapedTagDomain> tags, CancellationToken ct)
+    {
+        await repository.UpsertAsync(tags, ct);
+
+        return tags.Count;
+    }
+}
diff --git a/src/AStar.Dev.Wallpaper.Scrapper/Support/ChromeCookieExtractor.cs b/src/AStar.Dev.Wallpaper.Scrapper/Support/ChromeCookieExtractor.cs
index 45b07fa..217e668 100644
--- a/src/AStar.Dev.Wallpaper.Scrapper/Support/ChromeCookieExtractor.cs
+++ b/src/AStar.Dev.Wallpaper.Scrapper/Support/ChromeCookieExtractor.cs
@@ -151,7 +151,7 @@ private static async Task<Dictionary<string, string>> BuildDbusEnvAsync()
         try
         {
             var status  = await File.ReadAllTextAsync("/proc/self/status");
-            var uidLine = status.Split('\n').FirstOrDefault(l => l.StartsWith("Uid:"));
+            var uidLine = status.Split('\n').FirstOrDefault(l => l.StartsWith("Uid:", StringComparison.Ordinal));
             if(uidLine is not null)
             {
                 var uid      = uidLine.Split('\t', StringSplitOptions.RemoveEmptyEntries)[1];
diff --git a/src/AStar.Dev.Wallpaper.Scrapper/Support/ImageSaveHelper.cs b/src/AStar.Dev.Wallpaper.Scrapper/Support/ImageSaveHelper.cs
index 3f30937..a1744ae 100644
--- a/src/AStar.Dev.Wallpaper.Scrapper/Support/ImageSaveHelper.cs
+++ b/src/AStar.Dev.Wallpaper.Scrapper/Support/ImageSaveHelper.cs
@@ -1,8 +1,8 @@
-using AStar.Dev.Utilities;
+using AStar.Dev.Utilities;
 
 namespace AStar.Dev.Wallpaper.Scrapper.Support;
 
-internal class ImageSaveHelper
+internal sealed class ImageSaveHelper
 {
     public static async Task SaveImage(byte[] image, string imageNameWithPath)
     {
diff --git a/src/AStar.Dev.Wallpaper.Scrapper/Support/StatusLogSink.cs b/src/AStar.Dev.Wallpaper.Scrapper/Support/StatusLogSink.cs
index 1d7317a..bcb83fd 100644
--- a/src/AStar.Dev.Wallpaper.Scrapper/Support/StatusLogSink.cs
+++ b/src/AStar.Dev.Wallpaper.Scrapper/Support/StatusLogSink.cs
@@ -1,3 +1,4 @@
+using System.Globalization;
 using Serilog.Core;
 using Serilog.Events;
 
@@ -5,5 +6,5 @@ namespace AStar.Dev.Wallpaper.Scrapper.Support;
 
 public sealed class StatusLogSink(Action<string> onMessage) : ILogEventSink
 {
-    public void Emit(LogEvent logEvent) => onMessage(logEvent.RenderMessage());
+    public void Emit(LogEvent logEvent) => onMessage(logEvent.RenderMessage(CultureInfo.InvariantCulture));
 }
diff --git a/src/AStar.Dev.Wallpaper.Scrapper/Workflows/SearchWorkflow.cs b/src/AStar.Dev.Wallpaper.Scrapper/Workflows/SearchWorkflow.cs
index 0a689ea..2480993 100644
--- a/src/AStar.Dev.Wallpaper.Scrapper/Workflows/SearchWorkflow.cs
+++ b/src/AStar.Dev.Wallpaper.Scrapper/Workflows/SearchWorkflow.cs
@@ -116,7 +116,7 @@ private List<Category> FilterSearchCategories(List<Category> searchCategories)
         {
             var combinedSearchString = $"{_searchConfiguration.SearchStringPrefix}{searchCategories[i].Id}{_searchConfiguration.SearchStringSuffix}";
 
-            // if(combinedSearchString != _searchConfiguration.SearchString) continue;
+            if(combinedSearchString != _searchConfiguration.SearchString) continue;
 
             searchCategories = [.. searchCategories.Skip(i)];
             break;
diff --git a/src/AStar.Dev.Wallpaper.Scrapper/Workflows/SearchWorkflowFunctional.cs b/src/AStar.Dev.Wallpaper.Scrapper/Workflows/SearchWorkflowFunctional.cs
index bdb08f9..e038d04 100644
--- a/src/AStar.Dev.Wallpaper.Scrapper/Workflows/SearchWorkflowFunctional.cs
+++ b/src/AStar.Dev.Wallpaper.Scrapper/Workflows/SearchWorkflowFunctional.cs
@@ -13,7 +13,6 @@ namespace AStar.Dev.Wallpaper.Scrapper.Workflows;
 
 public sealed class SearchWorkflowFunctional(SearchResultsPageFunctional searchResultsPageFunctional, IDbContextFactory<FilesContext> dbContextFactory, Logger logger)
 {
-    private ImagePageService    imagePageService = null!;
     private SearchConfiguration searchConfiguration = null!;
     private ScrapeDirectories   scrapeDirectories = null!;
     private ConfigurationSaver  configurationSaver = null!;
@@ -118,7 +117,7 @@ private List<Category> FilterSearchCategories(List<Category> searchCategories)
         {
             var combinedSearchString = $"{searchConfiguration.SearchStringPrefix}{searchCategories[i].Id}{searchConfiguration.SearchStringSuffix}";
 
-            // if(combinedSearchString != searchConfiguration.SearchString) continue;
+            if(combinedSearchString != searchConfiguration.SearchString) continue;
 
             searchCategories = [.. searchCategories.Skip(i)];
             break;
diff --git a/test/AStar.Dev.FunctionalParadigm.Tests.Unit/AStar.Dev.FunctionalParadigm.Tests.Unit.csproj b/test/AStar.Dev.FunctionalParadigm.Tests.Unit/AStar.Dev.FunctionalParadigm.Tests.Unit.csproj
index 42e1154..36998a7 100644
--- a/test/AStar.Dev.FunctionalParadigm.Tests.Unit/AStar.Dev.FunctionalParadigm.Tests.Unit.csproj
+++ b/test/AStar.Dev.FunctionalParadigm.Tests.Unit/AStar.Dev.FunctionalParadigm.Tests.Unit.csproj
@@ -1,19 +1,13 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net10.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
+<Project Sdk="Microsoft.NET.Sdk">
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\AStar.Dev.FunctionalParadigm\AStar.Dev.FunctionalParadigm.csproj" />
   </ItemGroup>
-  
+
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
     <PackageReference Include="xunit.v3" Version="3.0.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.9.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.0" />
     <PackageReference Include="Shouldly" Version="4.3.0" />
   </ItemGroup>
 
diff --git a/test/AStar.Dev.FunctionalParadigm.Tests.Unit/GivenBind.cs b/test/AStar.Dev.FunctionalParadigm.Tests.Unit/GivenBind.cs
index 3db65be..c37ee5f 100644
--- a/test/AStar.Dev.FunctionalParadigm.Tests.Unit/GivenBind.cs
+++ b/test/AStar.Dev.FunctionalParadigm.Tests.Unit/GivenBind.cs
@@ -8,9 +8,9 @@ public class GivenBind
     [Fact]
     public void when_binder_returns_success_then_returns_bound_result()
     {
-        var result = Result<int, string>.Success(2);
+        var result = Result.Success<int, string>(2);
 
-        var actual = result.Bind(value => Result<int, string>.Success(value * 5));
+        var actual = result.Bind(value => Result.Success<int, string>(value * 5));
 
         actual.ShouldBeOfType<Ok<int, string>>();
         actual.ShouldBe(new Ok<int, string>(10));
@@ -19,9 +19,9 @@ public void when_binder_returns_success_then_returns_bound_result()
     [Fact]
     public void when_result_is_failure_then_returns_failure()
     {
-        var result = Result<int, string>.Failure("err");
+        var result = Result.Failure<int, string>("err");
 
-        var actual = result.Bind(value => Result<int, string>.Success(value * 5));
+        var actual = result.Bind(value => Result.Success<int, string>(value * 5));
 
         actual.ShouldBeOfType<Fail<int, string>>();
         actual.ShouldBe(new Fail<int, string>("err"));
diff --git a/test/AStar.Dev.FunctionalParadigm.Tests.Unit/GivenBindAsync.cs b/test/AStar.Dev.FunctionalParadigm.Tests.Unit/GivenBindAsync.cs
index 762405e..16aae05 100644
--- a/test/AStar.Dev.FunctionalParadigm.Tests.Unit/GivenBindAsync.cs
+++ b/test/AStar.Dev.FunctionalParadigm.Tests.Unit/GivenBindAsync.cs
@@ -8,9 +8,9 @@ public class GivenBindAsync
     [Fact]
     public async Task when_binder_returns_success_task_then_returns_bound_success()
     {
-        var result = Result<int, string>.Success(3);
+        var result = Result.Success<int, string>(3);
 
-        var actual = await result.BindAsync(value => Task.FromResult(Result<int, string>.Success(value * 4)));
+        var actual = await result.BindAsync(value => Task.FromResult(Result.Success<int, string>(value * 4)));
 
         actual.ShouldBeOfType<Ok<int, string>>();
         actual.ShouldBe(new Ok<int, string>(12));
@@ -19,13 +19,13 @@ public async Task when_binder_returns_success_task_then_returns_bound_success()
     [Fact]
     public async Task when_result_is_failure_then_returns_failure_without_invoking_binder()
     {
-        var result = Result<int, string>.Failure("fail");
+        var result = Result.Failure<int, string>("fail");
         var invoked = false;
 
         var actual = await result.BindAsync(value =>
         {
             invoked = true;
-            return Task.FromResult(Result<int, string>.Success(value * 4));
+            return Task.FromResult(Result.Success<int, string>(value * 4));
         });
 
         actual.ShouldBeOfType<Fail<int, string>>();
@@ -36,9 +36,9 @@ public async Task when_result_is_failure_then_returns_failure_without_invoking_b
     [Fact]
     public async Task when_binder_returns_value_task_then_returns_bound_success()
     {
-        var result = Result<int, string>.Success(2);
+        var result = Result.Success<int, string>(2);
 
-        var actual = await result.BindAsync(value => ValueTask.FromResult(Result<int, string>.Success(value + 5)));
+        var actual = await result.BindAsync(value => ValueTask.FromResult(Result.Success<int, string>(value + 5)));
 
         actual.ShouldBeOfType<Ok<int, string>>();
         actual.ShouldBe(new Ok<int, string>(7));
@@ -47,9 +47,9 @@ public async Task when_binder_returns_value_task_then_returns_bound_success()
     [Fact]
     public async Task when_result_task_and_binder_returns_task_then_returns_bound_success()
     {
-        var resultTask = Task.FromResult<Result<int, string>>(Result<int, string>.Success(5));
+        var resultTask = Task.FromResult<Result<int, string>>(Result.Success<int, string>(5));
 
-        var actual = await resultTask.BindAsync(value => Task.FromResult(Result<int, string>.Success(value * 2)));
+        var actual = await resultTask.BindAsync(value => Task.FromResult(Result.Success<int, string>(value * 2)));
 
         actual.ShouldBeOfType<Ok<int, string>>();
         actual.ShouldBe(new Ok<int, string>(10));
@@ -58,9 +58,9 @@ public async Task when_result_task_and_binder_returns_task_then_returns_bound_su
     [Fact]
     public async Task when_value_task_result_and_binder_returns_value_task_then_returns_bound_success()
     {
-        var resultTask = ValueTask.FromResult<Result<int, string>>(Result<int, string>.Success(4));
+        var resultTask = ValueTask.FromResult<Result<int, string>>(Result.Success<int, string>(4));
 
-        var actual = await resultTask.BindAsync(value => ValueTask.FromResult(Result<int, string>.Success(value + 3)));
+        var actual = await resultTask.BindAsync(value => ValueTask.FromResult(Result.Success<int, string>(value + 3)));
 
         actual.ShouldBeOfType<Ok<int, string>>();
         actual.ShouldBe(new Ok<int, string>(7));
@@ -69,13 +69,13 @@ public async Task when_value_task_result_and_binder_returns_value_task_then_retu
     [Fact]
     public async Task when_task_result_failure_then_binder_not_invoked()
     {
-        var resultTask = Task.FromResult<Result<int, string>>(Result<int, string>.Failure("err"));
+        var resultTask = Task.FromResult<Result<int, string>>(Result.Failure<int, string>("err"));
         var invoked = false;
 
         var actual = await resultTask.BindAsync(value =>
         {
             invoked = true;
-            return Task.FromResult(Result<int, string>.Success(value));
+            return Task.FromResult(Result.Success<int, string>(value));
         });
 
         actual.ShouldBeOfType<Fail<int, string>>();
@@ -85,9 +85,9 @@ public async Task when_task_result_failure_then_binder_not_invoked()
     [Fact]
     public async Task when_task_result_with_value_task_binder_then_returns_bound_success()
     {
-        var resultTask = Task.FromResult<Result<int, string>>(Result<int, string>.Success(3));
+        var resultTask = Task.FromResult<Result<int, string>>(Result.Success<int, string>(3));
 
-        var actual = await resultTask.BindAsync(value => ValueTask.FromResult(Result<int, string>.Success(value * 10)));
+        var actual = await resultTask.BindAsync(value => ValueTask.FromResult(Result.Success<int, string>(value * 10)));
 
         actual.ShouldBeOfType<Ok<int, string>>();
         actual.ShouldBe(new Ok<int, string>(30));
@@ -96,9 +96,9 @@ public async Task when_task_result_with_value_task_binder_then_returns_bound_suc
     [Fact]
     public async Task when_task_result_failure_with_value_task_binder_then_returns_failure()
     {
-        var resultTask = Task.FromResult<Result<int, string>>(Result<int, string>.Failure("failed"));
+        var resultTask = Task.FromResult<Result<int, string>>(Result.Failure<int, string>("failed"));
 
-        var actual = await resultTask.BindAsync(value => ValueTask.FromResult(Result<int, string>.Success(value)));
+        var actual = await resultTask.BindAsync(value => ValueTask.FromResult(Result.Success<int, string>(value)));
 
         actual.ShouldBeOfType<Fail<int, string>>();
         actual.ShouldBe(new Fail<int, string>("failed"));
@@ -107,9 +107,9 @@ public async Task when_task_result_failure_with_value_task_binder_then_returns_f
     [Fact]
     public async Task when_value_task_result_with_task_binder_then_returns_bound_success()
     {
-        var resultTask = ValueTask.FromResult<Result<int, string>>(Result<int, string>.Success(6));
+        var resultTask = ValueTask.FromResult<Result<int, string>>(Result.Success<int, string>(6));
 
-        var actual = await resultTask.BindAsync(value => Task.FromResult(Result<int, string>.Success(value - 1)));
+        var actual = await resultTask.BindAsync(value => Task.FromResult(Result.Success<int, string>(value - 1)));
 
         actual.ShouldBeOfType<Ok<int, string>>();
         actual.ShouldBe(new Ok<int, string>(5));
@@ -118,9 +118,9 @@ public async Task when_value_task_result_with_task_binder_then_returns_bound_suc
     [Fact]
     public async Task when_value_task_result_failure_with_task_binder_then_returns_failure()
     {
-        var resultTask = ValueTask.FromResult<Result<int, string>>(Result<int, string>.Failure("error"));
+        var resultTask = ValueTask.FromResult<Result<int, string>>(Result.Failure<int, string>("error"));
 
-        var actual = await resultTask.BindAsync(value => Task.FromResult(Result<int, string>.Success(value)));
+        var actual = await resultTask.BindAsync(value => Task.FromResult(Result.Success<int, string>(value)));
 
         actual.ShouldBeOfType<Fail<int, string>>();
         actual.ShouldBe(new Fail<int, string>("error"));
@@ -129,9 +129,9 @@ public async Task when_value_task_result_failure_with_task_binder_then_returns_f
     [Fact]
     public async Task when_binder_returns_failure_then_returns_that_failure()
     {
-        var result = Result<int, string>.Success(3);
+        var result = Result.Success<int, string>(3);
 
-        var actual = await result.BindAsync(value => Task.FromResult(Result<int, string>.Failure($"failed-{value}")));
+        var actual = await result.BindAsync(value => Task.FromResult(Result.Failure<int, string>($"failed-{value}")));
 
         actual.ShouldBeOfType<Fail<int, string>>();
         actual.ShouldBe(new Fail<int, string>("failed-3"));
@@ -140,10 +140,10 @@ public async Task when_binder_returns_failure_then_returns_that_failure()
     [Fact]
     public async Task when_chaining_multiple_bind_async_calls_then_passes_through_all()
     {
-        var result = Result<int, string>.Success(2);
+        var result = Result.Success<int, string>(2);
 
-        var intermediate = await result.BindAsync(v => Task.FromResult(Result<int, string>.Success(v * 2)));
-        var actual = await intermediate.BindAsync(v => ValueTask.FromResult(Result<int, string>.Success(v + 1)));
+        var intermediate = await result.BindAsync(v => Task.FromResult(Result.Success<int, string>(v * 2)));
+        var actual = await intermediate.BindAsync(v => ValueTask.FromResult(Result.Success<int, string>(v + 1)));
 
         actual.ShouldBeOfType<Ok<int, string>>();
         actual.ShouldBe(new Ok<int, string>(5)); // (2 * 2) + 1
diff --git a/test/AStar.Dev.FunctionalParadigm.Tests.Unit/GivenBindMore.cs b/test/AStar.Dev.FunctionalParadigm.Tests.Unit/GivenBindMore.cs
index 892fd6d..d49b555 100644
--- a/test/AStar.Dev.FunctionalParadigm.Tests.Unit/GivenBindMore.cs
+++ b/test/AStar.Dev.FunctionalParadigm.Tests.Unit/GivenBindMore.cs
@@ -8,9 +8,9 @@ public class GivenBindMore
     [Fact]
     public void when_binder_returns_failure_then_returns_that_failure()
     {
-        var result = Result<int, string>.Success(3);
+        var result = Result.Success<int, string>(3);
 
-        var actual = result.Bind(value => Result<int, string>.Failure($"fail-{value}"));
+        var actual = result.Bind(value => Result.Failure<int, string>($"fail-{value}"));
 
         actual.ShouldBeOfType<Fail<int, string>>();
         actual.ShouldBe(new Fail<int, string>("fail-3"));
diff --git a/test/AStar.Dev.FunctionalParadigm.Tests.Unit/GivenMap.cs b/test/AStar.Dev.FunctionalParadigm.Tests.Unit/GivenMap.cs
index 5f2a786..9e52617 100644
--- a/test/AStar.Dev.FunctionalParadigm.Tests.Unit/GivenMap.cs
+++ b/test/AStar.Dev.FunctionalParadigm.Tests.Unit/GivenMap.cs
@@ -8,7 +8,7 @@ public class GivenMap
     [Fact]
     public void when_selector_is_value_then_returns_expected_result()
     {
-        var result = Result<int, string>.Success(5);
+        var result = Result.Success<int, string>(5);
 
         var actual = result.Map(value => value * 3);
 
@@ -19,7 +19,7 @@ public void when_selector_is_value_then_returns_expected_result()
     [Fact]
     public void when_result_is_failure_then_returns_failure()
     {
-        var result = Result<int, string>.Failure("error");
+        var result = Result.Failure<int, string>("error");
 
         var actual = result.Map(value => value * 3);
 
diff --git a/test/AStar.Dev.FunctionalParadigm.Tests.Unit/GivenMapAsync.cs b/test/AStar.Dev.FunctionalParadigm.Tests.Unit/GivenMapAsync.cs
index 5d41bc4..cdbda05 100644
--- a/test/AStar.Dev.FunctionalParadigm.Tests.Unit/GivenMapAsync.cs
+++ b/test/AStar.Dev.FunctionalParadigm.Tests.Unit/GivenMapAsync.cs
@@ -8,7 +8,7 @@ public class GivenMapAsync
     [Fact]
     public async Task when_selector_is_task_then_returns_expected_result()
     {
-        var result = Result<int, string>.Success(5);
+        var result = Result.Success<int, string>(5);
 
         var actual = await result.MapAsync(value => Task.FromResult(value * 2));
 
@@ -19,7 +19,7 @@ public async Task when_selector_is_task_then_returns_expected_result()
     [Fact]
     public async Task when_selector_is_value_task_then_returns_expected_result()
     {
-        var result = Result<int, string>.Success(5);
+        var result = Result.Success<int, string>(5);
 
         var actual = await result.MapAsync(value => ValueTask.FromResult(value * 2));
 
@@ -30,7 +30,7 @@ public async Task when_selector_is_value_task_then_returns_expected_result()
     [Fact]
     public async Task when_result_is_failure_then_returns_failure()
     {
-        var result = Result<int, string>.Failure("error");
+        var result = Result.Failure<int, string>("error");
 
         var actual = await result.MapAsync(value => ValueTask.FromResult(value * 2));
 
diff --git a/test/AStar.Dev.FunctionalParadigm.Tests.Unit/GivenMatch.cs b/test/AStar.Dev.FunctionalParadigm.Tests.Unit/GivenMatch.cs
index d3e496d..44429bc 100644
--- a/test/AStar.Dev.FunctionalParadigm.Tests.Unit/GivenMatch.cs
+++ b/test/AStar.Dev.FunctionalParadigm.Tests.Unit/GivenMatch.cs
@@ -8,8 +8,8 @@ public class GivenMatch
     [Fact]
     public void when_on_success_and_on_failure_are_sync_then_returns_expected_values()
     {
-        var success = Result<int, string>.Success(4);
-        var failure = Result<int, string>.Failure("error");
+        var success = Result.Success<int, string>(4);
+        var failure = Result.Failure<int, string>("error");
 
         var actualSuccess = success.Match(onSuccess: v => v + 1, onFailure: _ => -1);
         var actualFailure = failure.Match(onSuccess: v => v + 1, onFailure: e => e.Length);
diff --git a/test/AStar.Dev.FunctionalParadigm.Tests.Unit/GivenMatchAsync.cs b/test/AStar.Dev.FunctionalParadigm.Tests.Unit/GivenMatchAsync.cs
index 2d74dcf..2885ddb 100644
--- a/test/AStar.Dev.FunctionalParadigm.Tests.Unit/GivenMatchAsync.cs
+++ b/test/AStar.Dev.FunctionalParadigm.Tests.Unit/GivenMatchAsync.cs
@@ -8,7 +8,7 @@ public class GivenMatchAsync
     [Fact]
     public async Task when_on_success_is_async_then_returns_expected_value()
     {
-        var result = Result<int, string>.Success(3);
+        var result = Result.Success<int, string>(3);
 
         var actual = await result.MatchAsync(
             onSuccess: value => ValueTask.FromResult(value + 1),
@@ -20,7 +20,7 @@ public async Task when_on_success_is_async_then_returns_expected_value()
     [Fact]
     public async Task when_on_failure_is_async_then_returns_expected_value()
     {
-        var result = Result<int, string>.Failure("error");
+        var result = Result.Failure<int, string>("error");
 
         var actual = await result.MatchAsync(
             onSuccess: _ => 1,
@@ -32,8 +32,8 @@ public async Task when_on_failure_is_async_then_returns_expected_value()
     [Fact]
     public async Task when_on_success_and_on_failure_are_both_async_then_returns_expected_values()
     {
-        var success = Result<int, string>.Success(4);
-        var failure = Result<int, string>.Failure("error");
+        var success = Result.Success<int, string>(4);
+        var failure = Result.Failure<int, string>("error");
 
         var actualSuccess = await success.MatchAsync(
             onSuccess: value => ValueTask.FromResult(value + 2),
diff --git a/test/AStar.Dev.FunctionalParadigm.Tests.Unit/GivenMatchValueTask.cs b/test/AStar.Dev.FunctionalParadigm.Tests.Unit/GivenMatchValueTask.cs
index 9e491c9..8a0b336 100644
--- a/test/AStar.Dev.FunctionalParadigm.Tests.Unit/GivenMatchValueTask.cs
+++ b/test/AStar.Dev.FunctionalParadigm.Tests.Unit/GivenMatchValueTask.cs
@@ -8,8 +8,8 @@ public class GivenMatchValueTask
     [Fact]
     public async Task when_both_handlers_are_valuetask_then_returns_expected()
     {
-        var success = Result<int, string>.Success(6);
-        var failure = Result<int, string>.Failure("errval");
+        var success = Result.Success<int, string>(6);
+        var failure = Result.Failure<int, string>("errval");
 
         var actualSuccess = await success.MatchAsync(onSuccess: v => ValueTask.FromResult(v + 4), onFailure: e => ValueTask.FromResult(-1));
         var actualFailure = await failure.MatchAsync(onSuccess: v => ValueTask.FromResult(v + 4), onFailure: e => ValueTask.FromResult(e.Length));
@@ -21,8 +21,8 @@ public async Task when_both_handlers_are_valuetask_then_returns_expected()
     [Fact]
     public async Task when_on_success_is_valuetask_and_on_failure_sync_then_returns_expected()
     {
-        var success = Result<int, string>.Success(2);
-        var failure = Result<int, string>.Failure("abc");
+        var success = Result.Success<int, string>(2);
+        var failure = Result.Failure<int, string>("abc");
 
         var actualSuccess = await success.MatchAsync(onSuccess: v => ValueTask.FromResult(v * 3), onFailure: e => -1);
         var actualFailure = await failure.MatchAsync(onSuccess: v => ValueTask.FromResult(v * 3), onFailure: e => e.Length);
diff --git a/test/AStar.Dev.FunctionalParadigm.Tests.Unit/GivenTap.cs b/test/AStar.Dev.FunctionalParadigm.Tests.Unit/GivenTap.cs
index 91b451f..c3a2b16 100644
--- a/test/AStar.Dev.FunctionalParadigm.Tests.Unit/GivenTap.cs
+++ b/test/AStar.Dev.FunctionalParadigm.Tests.Unit/GivenTap.cs
@@ -8,7 +8,7 @@ public class GivenTap
     [Fact]
     public async Task when_called_on_task_result_then_returns_same_result_and_executes_side_effect()
     {
-        var resultTask = Task.FromResult<Result<int, string>>(Result<int, string>.Success(7));
+        var resultTask = Task.FromResult<Result<int, string>>(Result.Success<int, string>(7));
         var sideEffect = false;
 
         var actual = await resultTask.Tap(value => sideEffect = value == 7);
@@ -21,7 +21,7 @@ public async Task when_called_on_task_result_then_returns_same_result_and_execut
     [Fact]
     public async Task when_called_on_value_task_result_then_returns_same_result_and_executes_side_effect()
     {
-        var resultTask = ValueTask.FromResult<Result<int, string>>(Result<int, string>.Success(9));
+        var resultTask = ValueTask.FromResult<Result<int, string>>(Result.Success<int, string>(9));
         var sideEffect = false;
 
         var actual = await resultTask.Tap(value => sideEffect = value == 9);
@@ -34,7 +34,7 @@ public async Task when_called_on_value_task_result_then_returns_same_result_and_
     [Fact]
     public async Task when_called_on_task_failure_then_returns_same_failure_and_executes_failure_handler()
     {
-        var resultTask = Task.FromResult<Result<int, string>>(Result<int, string>.Failure("error"));
+        var resultTask = Task.FromResult<Result<int, string>>(Result.Failure<int, string>("error"));
         var sideEffect = false;
 
         var actual = await resultTask.Tap(_ => { }, error => sideEffect = error == "error");
diff --git a/test/AStar.Dev.FunctionalParadigm.Tests.Unit/GivenTapAsync.cs b/test/AStar.Dev.FunctionalParadigm.Tests.Unit/GivenTapAsync.cs
index b421a10..62f22e0 100644
--- a/test/AStar.Dev.FunctionalParadigm.Tests.Unit/GivenTapAsync.cs
+++ b/test/AStar.Dev.FunctionalParadigm.Tests.Unit/GivenTapAsync.cs
@@ -8,7 +8,7 @@ public class GivenTapAsync
     [Fact]
     public async Task when_called_on_task_result_then_returns_same_result_and_executes_side_effect()
     {
-        var resultTask = Task.FromResult<Result<int, string>>(Result<int, string>.Success(7));
+        var resultTask = Task.FromResult<Result<int, string>>(Result.Success<int, string>(7));
         var sideEffect = false;
 
         var actual = await resultTask.TapAsync(value => sideEffect = value == 7);
@@ -21,7 +21,7 @@ public async Task when_called_on_task_result_then_returns_same_result_and_execut
     [Fact]
     public async Task when_called_on_value_task_result_then_returns_same_result_and_executes_side_effect()
     {
-        var resultTask = ValueTask.FromResult<Result<int, string>>(Result<int, string>.Success(9));
+        var resultTask = ValueTask.FromResult<Result<int, string>>(Result.Success<int, string>(9));
         var sideEffect = false;
 
         var actual = await resultTask.TapAsync(value => sideEffect = value == 9);
@@ -34,7 +34,7 @@ public async Task when_called_on_value_task_result_then_returns_same_result_and_
     [Fact]
     public async Task when_called_on_task_failure_then_returns_same_failure_and_executes_failure_handler()
     {
-        var resultTask = Task.FromResult<Result<int, string>>(Result<int, string>.Failure("error"));
+        var resultTask = Task.FromResult<Result<int, string>>(Result.Failure<int, string>("error"));
         var sideEffect = false;
 
         var actual = await resultTask.TapAsync(_ => { }, error => sideEffect = error == "error");
@@ -47,7 +47,7 @@ public async Task when_called_on_task_failure_then_returns_same_failure_and_exec
     [Fact]
     public async Task when_called_on_task_result_then_returns_same_result_and_executes_finalizer()
     {
-        var resultTask = Task.FromResult<Result<int, string>>(Result<int, string>.Success(7));
+        var resultTask = Task.FromResult<Result<int, string>>(Result.Success<int, string>(7));
         var finalizerCalled = false;
 
         var actual = await resultTask.EnsureAsync(() => finalizerCalled = true);
@@ -60,7 +60,7 @@ public async Task when_called_on_task_result_then_returns_same_result_and_execut
     [Fact]
     public async Task when_called_on_task_failure_then_returns_same_failure_and_executes_finalizer()
     {
-        var resultTask = Task.FromResult<Result<int, string>>(Result<int, string>.Failure("error"));
+        var resultTask = Task.FromResult<Result<int, string>>(Result.Failure<int, string>("error"));
         var finalizerCalled = false;
 
         var actual = await resultTask.EnsureAsync(() => finalizerCalled = true);
diff --git a/test/AStar.Dev.FunctionalParadigm.Tests.Unit/GivenTapSync.cs b/test/AStar.Dev.FunctionalParadigm.Tests.Unit/GivenTapSync.cs
index 26a010e..f51b6fd 100644
--- a/test/AStar.Dev.FunctionalParadigm.Tests.Unit/GivenTapSync.cs
+++ b/test/AStar.Dev.FunctionalParadigm.Tests.Unit/GivenTapSync.cs
@@ -8,7 +8,7 @@ public class GivenTapSync
     [Fact]
     public void when_called_on_result_success_then_executes_success_handler_and_returns_same()
     {
-        var result = Result<int, string>.Success(7);
+        var result = Result.Success<int, string>(7);
         var sideEffect = false;
 
         var actual = result.Tap(value => sideEffect = value == 7);
@@ -21,7 +21,7 @@ public void when_called_on_result_success_then_executes_success_handler_and_retu
     [Fact]
     public void when_called_on_result_failure_then_executes_failure_handler_and_returns_failure()
     {
-        var result = Result<int, string>.Failure("oops");
+        var result = Result.Failure<int, string>("oops");
         var sideEffect = false;
 
         var actual = result.Tap(_ => { }, error => sideEffect = error == "oops");
diff --git a/test/AStar.Dev.Wallpaper.Scrapper.Tests.Unit/AStar.Dev.Wallpaper.Scrapper.Tests.Unit.csproj b/test/AStar.Dev.Wallpaper.Scrapper.Tests.Unit/AStar.Dev.Wallpaper.Scrapper.Tests.Unit.csproj
index 3bfb25f..5d7bb53 100644
--- a/test/AStar.Dev.Wallpaper.Scrapper.Tests.Unit/AStar.Dev.Wallpaper.Scrapper.Tests.Unit.csproj
+++ b/test/AStar.Dev.Wallpaper.Scrapper.Tests.Unit/AStar.Dev.Wallpaper.Scrapper.Tests.Unit.csproj
@@ -1,21 +1,25 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net10.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
+<Project Sdk="Microsoft.NET.Sdk">
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\AStar.Dev.Wallpaper.Scrapper\AStar.Dev.Wallpaper.Scrapper.csproj" />
   </ItemGroup>
-  
+
+  <!--
+    SQLitePCLRaw.lib.e_sqlite3 2.1.11 carries advisory GHSA-2m69-gcr7-jv3q
+    and flows into this project via the ProjectReference above.
+    The suppression here mirrors the decision made in AStar.Dev.Infrastructure.FilesDb
+    and AStar.Dev.Wallpaper.Scrapper.
+  -->
+  <ItemGroup>
+    <NuGetAuditSuppress Include="https://github.com/advisories/GHSA-2m69-gcr7-jv3q" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
     <PackageReference Include="NSubstitute" Version="5.3.0" />
     <PackageReference Include="Testably.Abstractions.Testing" Version="6.6.0" />
     <PackageReference Include="xunit.v3" Version="3.0.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.9.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.0" />
     <PackageReference Include="Shouldly" Version="4.3.0" />
   </ItemGroup>
 
diff --git a/test/AStar.Dev.Wallpaper.Scrapper.Tests.Unit/Services/GivenAScrapedTagService.cs b/test/AStar.Dev.Wallpaper.Scrapper.Tests.Unit/Services/GivenAScrapedTagService.cs
new file mode 100644
index 0000000..5b1b61b
--- /dev/null
+++ b/test/AStar.Dev.Wallpaper.Scrapper.Tests.Unit/Services/GivenAScrapedTagService.cs
@@ -0,0 +1,60 @@
+using AStar.Dev.Wallpaper.Scrapper.Repositories;
+using AStar.Dev.Wallpaper.Scrapper.Services;
+using ScrapedTagDomain = AStar.Dev.Infrastructure.FilesDb.Models.ScrapedTag;
+
+namespace AStar.Dev.Wallpaper.Scrapper.Tests.Unit.Services;
+
+public sealed class GivenAScrapedTagService
+{
+    private const string ActionTagValue = "Action";
+    private const string GenreCategory  = "Genre";
+
+    [Fact]
+    public async Task when_exporting_then_repository_get_all_is_called()
+    {
+        var repo = Substitute.For<IScrapedTagRepository>();
+        repo.GetAllAsync(Arg.Any<CancellationToken>()).Returns([]);
+        var sut  = new ScrapedTagService(repo);
+
+        await sut.ExportScrapedTagsAsync(CancellationToken.None);
+
+        await repo.Received(1).GetAllAsync(Arg.Any<CancellationToken>());
+    }
+
+    [Fact]
+    public async Task when_exporting_then_returned_tags_are_passed_through()
+    {
+        var repo     = Substitute.For<IScrapedTagRepository>();
+        var expected = new List<ScrapedTagDomain> { new() { Value = ActionTagValue, Category = GenreCategory, IncludeInSearch = true } };
+        repo.GetAllAsync(Arg.Any<CancellationToken>()).Returns(expected);
+        var sut      = new ScrapedTagService(repo);
+
+        var result = await sut.ExportScrapedTagsAsync(CancellationToken.None);
+
+        result.ShouldBe(expected);
+    }
+
+    [Fact]
+    public async Task when_importing_new_tag_then_it_is_added()
+    {
+        var repo = Substitute.For<IScrapedTagRepository>();
+        var sut  = new ScrapedTagService(repo);
+        var tags = new List<ScrapedTagDomain> { new() { Value = ActionTagValue, Category = GenreCategory, IncludeInSearch = true } };
+
+        await sut.ImportScrapedTagsAsync(tags, CancellationToken.None);
+
+        await repo.Received(1).UpsertAsync(Arg.Is<IReadOnlyList<ScrapedTagDomain>>(list => list.Count == 1), Arg.Any<CancellationToken>());
+    }
+
+    [Fact]
+    public async Task when_importing_a_tag_with_include_in_search_false_then_upsert_is_called_with_false_value()
+    {
+        var repo = Substitute.For<IScrapedTagRepository>();
+        var sut  = new ScrapedTagService(repo);
+        var tags = new List<ScrapedTagDomain> { new() { Value = ActionTagValue, Category = GenreCategory, IncludeInSearch = false } };
+
+        await sut.ImportScrapedTagsAsync(tags, CancellationToken.None);
+
+        await repo.Received(1).UpsertAsync(Arg.Is<IReadOnlyList<ScrapedTagDomain>>(list => !list[0].IncludeInSearch), Arg.Any<CancellationToken>());
+    }
+}
diff --git a/test/AStar.Dev.Wallpaper.Scrapper.Tests.Unit/Services/GivenAnImportExportService.cs b/test/AStar.Dev.Wallpaper.Scrapper.Tests.Unit/Services/GivenAnImportExportService.cs
index 11a7793..c9345b0 100644
--- a/test/AStar.Dev.Wallpaper.Scrapper.Tests.Unit/Services/GivenAnImportExportService.cs
+++ b/test/AStar.Dev.Wallpaper.Scrapper.Tests.Unit/Services/GivenAnImportExportService.cs
@@ -4,16 +4,22 @@
 using Serilog;
 using System.IO.Abstractions;
 using FileClassificationDomain = AStar.Dev.Infrastructure.FilesDb.Models.FileClassification;
+using ScrapedTagDomain = AStar.Dev.Infrastructure.FilesDb.Models.ScrapedTag;
 
 namespace AStar.Dev.Wallpaper.Scrapper.Tests.Unit.Services;
 
 public sealed class GivenAnImportExportService
 {
-    private static readonly string ScrapperDirectory = Path.GetDirectoryName(ApplicationMetadata.FileClassificationsExportFilePath)!;
+    private static readonly string scrapperDirectory     = Path.GetDirectoryName(ApplicationMetadata.FileClassificationsExportFilePath)!;
+    private static readonly string scrapperTagsDirectory = Path.GetDirectoryName(ApplicationMetadata.ScrapedTagsExportFilePath)!;
 
     private const string CelebrityClassificationName = "Test Celebrity";
     private const string NormalClassificationName    = "Test Normal";
 
+    private const string ActionTagValue    = "Action";
+    private const string GenreCategory = "Genre";
+    private const string ComedyTagValue    = "Comedy";
+
     private const string ValidClassificationsJson = """
         [
           {
@@ -53,6 +59,21 @@ public sealed class GivenAnImportExportService
         ]
         """;
 
+    private const string ValidTagsJson = """
+        [
+          {
+            "value": "Action",
+            "category": "Genre",
+            "includeInSearch": true
+          },
+          {
+            "value": "Comedy",
+            "category": "Genre",
+            "includeInSearch": false
+          }
+        ]
+        """;
+
     private readonly MockFileSystem mockFileSystem;
     private readonly ILogger mockLogger;
     private readonly IImportExportService sut;
@@ -80,7 +101,7 @@ public void when_importing_and_file_does_not_exist_then_logger_receives_error_ca
     [Fact]
     public void when_importing_and_file_contains_null_json_then_failure_result_is_returned()
     {
-        mockFileSystem.Directory.CreateDirectory(ScrapperDirectory);
+        mockFileSystem.Directory.CreateDirectory(scrapperDirectory);
         mockFileSystem.File.WriteAllText(ApplicationMetadata.FileClassificationsExportFilePath, "null");
 
         sut.ImportFileClassificationsFromFile()
@@ -90,7 +111,7 @@ public void when_importing_and_file_contains_null_json_then_failure_result_is_re
     [Fact]
     public void when_importing_and_file_contains_null_json_then_logger_receives_error_call()
     {
-        mockFileSystem.Directory.CreateDirectory(ScrapperDirectory);
+        mockFileSystem.Directory.CreateDirectory(scrapperDirectory);
         mockFileSystem.File.WriteAllText(ApplicationMetadata.FileClassificationsExportFilePath, "null");
 
         sut.ImportFileClassificationsFromFile();
@@ -140,7 +161,7 @@ public void when_importing_valid_classifications_then_normal_classification_name
     [Fact]
     public void when_exporting_classifications_then_file_is_written_to_expected_path()
     {
-        mockFileSystem.Directory.CreateDirectory(ScrapperDirectory);
+        mockFileSystem.Directory.CreateDirectory(scrapperDirectory);
 
         sut.ExportFileClassificationsToFile(CreateDomainClassifications());
 
@@ -150,7 +171,7 @@ public void when_exporting_classifications_then_file_is_written_to_expected_path
     [Fact]
     public void when_exporting_classifications_then_logger_receives_information_call()
     {
-        mockFileSystem.Directory.CreateDirectory(ScrapperDirectory);
+        mockFileSystem.Directory.CreateDirectory(scrapperDirectory);
 
         sut.ExportFileClassificationsToFile(CreateDomainClassifications());
 
@@ -183,15 +204,186 @@ public void when_file_system_throws_during_export_then_logger_receives_error_cal
         mockLogger.Received(1).Error(Arg.Any<Exception>(), Arg.Any<string>(), Arg.Any<string>());
     }
 
+    [Fact]
+    public void when_importing_tags_and_file_does_not_exist_then_failure_result_is_returned() =>
+        sut.ImportScrapedTagsFromFile()
+           .ShouldBeOfType<Fail<List<ScrapedTagDomain>, string>>();
+
+    [Fact]
+    public void when_importing_tags_and_file_does_not_exist_then_logger_receives_error_call()
+    {
+        sut.ImportScrapedTagsFromFile();
+
+        mockLogger.Received(1).Error(Arg.Any<string>(), Arg.Any<string>());
+    }
+
+    [Fact]
+    public void when_importing_tags_and_file_contains_null_json_then_failure_result_is_returned()
+    {
+        mockFileSystem.Directory.CreateDirectory(scrapperTagsDirectory);
+        mockFileSystem.File.WriteAllText(ApplicationMetadata.ScrapedTagsExportFilePath, "null");
+
+        sut.ImportScrapedTagsFromFile()
+           .ShouldBeOfType<Fail<List<ScrapedTagDomain>, string>>();
+    }
+
+    [Fact]
+    public void when_importing_tags_and_file_contains_null_json_then_logger_receives_error_call()
+    {
+        mockFileSystem.Directory.CreateDirectory(scrapperTagsDirectory);
+        mockFileSystem.File.WriteAllText(ApplicationMetadata.ScrapedTagsExportFilePath, "null");
+
+        sut.ImportScrapedTagsFromFile();
+
+        mockLogger.Received(1).Error(Arg.Any<string>(), Arg.Any<string>());
+    }
+
+    [Fact]
+    public void when_importing_valid_tags_then_result_is_ok()
+    {
+        SetupValidTagsImportFile();
+
+        sut.ImportScrapedTagsFromFile()
+           .ShouldBeOfType<Ok<List<ScrapedTagDomain>, string>>();
+    }
+
+    [Fact]
+    public void when_importing_valid_tags_then_correct_count_is_returned()
+    {
+        SetupValidTagsImportFile();
+
+        sut.ImportScrapedTagsFromFile()
+           .ShouldBeOfType<Ok<List<ScrapedTagDomain>, string>>()
+           .Value.Count.ShouldBe(2);
+    }
+
+    [Fact]
+    public void when_importing_valid_tags_then_first_tag_value_is_mapped()
+    {
+        SetupValidTagsImportFile();
+
+        sut.ImportScrapedTagsFromFile()
+           .ShouldBeOfType<Ok<List<ScrapedTagDomain>, string>>()
+           .Value[0].Value.ShouldBe(ActionTagValue);
+    }
+
+    [Fact]
+    public void when_importing_valid_tags_then_first_tag_category_is_mapped()
+    {
+        SetupValidTagsImportFile();
+
+        sut.ImportScrapedTagsFromFile()
+           .ShouldBeOfType<Ok<List<ScrapedTagDomain>, string>>()
+           .Value[0].Category.ShouldBe(GenreCategory);
+    }
+
+    [Fact]
+    public void when_importing_valid_tags_then_first_tag_include_in_search_is_mapped()
+    {
+        SetupValidTagsImportFile();
+
+        sut.ImportScrapedTagsFromFile()
+           .ShouldBeOfType<Ok<List<ScrapedTagDomain>, string>>()
+           .Value[0].IncludeInSearch.ShouldBeTrue();
+    }
+
+    [Fact]
+    public void when_importing_valid_tags_then_second_tag_value_is_mapped()
+    {
+        SetupValidTagsImportFile();
+
+        sut.ImportScrapedTagsFromFile()
+           .ShouldBeOfType<Ok<List<ScrapedTagDomain>, string>>()
+           .Value[1].Value.ShouldBe(ComedyTagValue);
+    }
+
+    [Fact]
+    public void when_importing_valid_tags_then_second_tag_category_is_mapped()
+    {
+        SetupValidTagsImportFile();
+
+        sut.ImportScrapedTagsFromFile()
+           .ShouldBeOfType<Ok<List<ScrapedTagDomain>, string>>()
+           .Value[1].Category.ShouldBe(GenreCategory);
+    }
+
+    [Fact]
+    public void when_importing_valid_tags_then_second_tag_include_in_search_is_mapped()
+    {
+        SetupValidTagsImportFile();
+
+        sut.ImportScrapedTagsFromFile()
+           .ShouldBeOfType<Ok<List<ScrapedTagDomain>, string>>()
+           .Value[1].IncludeInSearch.ShouldBeFalse();
+    }
+
+    [Fact]
+    public void when_exporting_tags_then_file_is_written_to_expected_path()
+    {
+        mockFileSystem.Directory.CreateDirectory(scrapperTagsDirectory);
+
+        sut.ExportScrapedTagsToFile(CreateDomainTags());
+
+        mockFileSystem.File.Exists(ApplicationMetadata.ScrapedTagsExportFilePath).ShouldBeTrue();
+    }
+
+    [Fact]
+    public void when_exporting_tags_then_logger_receives_information_call()
+    {
+        mockFileSystem.Directory.CreateDirectory(scrapperTagsDirectory);
+
+        sut.ExportScrapedTagsToFile(CreateDomainTags());
+
+        mockLogger.Received(1).Information(Arg.Any<string>(), Arg.Any<string>());
+    }
+
+    [Fact]
+    public void when_file_system_throws_during_tag_export_then_exception_is_rethrown()
+    {
+        var throwingFileSystem = Substitute.For<IFileSystem>();
+        throwingFileSystem.File.When(f => f.WriteAllText(Arg.Any<string>(), Arg.Any<string?>()))
+                               .Throw(new IOException("Disk full"));
+        var throwingSut = new ImportExportService(throwingFileSystem, mockLogger);
+
+        var act = () => throwingSut.ExportScrapedTagsToFile([]);
+
+        act.ShouldThrow<IOException>();
+    }
+
+    [Fact]
+    public void when_file_system_throws_during_tag_export_then_logger_receives_error_call()
+    {
+        var throwingFileSystem = Substitute.For<IFileSystem>();
+        throwingFileSystem.File.When(f => f.WriteAllText(Arg.Any<string>(), Arg.Any<string?>()))
+                               .Throw(new IOException("Disk full"));
+        var throwingSut = new ImportExportService(throwingFileSystem, mockLogger);
+
+        Should.Throw<IOException>(() => throwingSut.ExportScrapedTagsToFile([]));
+
+        mockLogger.Received(1).Error(Arg.Any<Exception>(), Arg.Any<string>(), Arg.Any<string>());
+    }
+
     private void SetupValidImportFile()
     {
-        mockFileSystem.Directory.CreateDirectory(ScrapperDirectory);
+        mockFileSystem.Directory.CreateDirectory(scrapperDirectory);
         mockFileSystem.File.WriteAllText(ApplicationMetadata.FileClassificationsExportFilePath, ValidClassificationsJson);
     }
 
+    private void SetupValidTagsImportFile()
+    {
+        mockFileSystem.Directory.CreateDirectory(scrapperTagsDirectory);
+        mockFileSystem.File.WriteAllText(ApplicationMetadata.ScrapedTagsExportFilePath, ValidTagsJson);
+    }
+
     private static List<FileClassificationDomain> CreateDomainClassifications() =>
     [
         new() { Id = 1, Name = CelebrityClassificationName, Celebrity = true,  IncludeInSearch = true },
         new() { Id = 2, Name = NormalClassificationName,    Celebrity = false, IncludeInSearch = true }
     ];
+
+    private static List<ScrapedTagDomain> CreateDomainTags() =>
+    [
+        new() { Value = ActionTagValue, Category = GenreCategory, IncludeInSearch = true  },
+        new() { Value = ComedyTagValue, Category = GenreCategory, IncludeInSearch = false }
+    ];
 }