diff --git a/.github/scripts/create-release-archive.ps1 b/.github/scripts/create-release-archive.ps1
new file mode 100644
index 000000000..9ea0d6843
--- /dev/null
+++ b/.github/scripts/create-release-archive.ps1
@@ -0,0 +1,63 @@
+param (
+    [Parameter(Mandatory = $true)]
+    [string] $SourceDirectory,
+
+    [Parameter(Mandatory = $true)]
+    [string] $DestinationPath
+)
+
+$ErrorActionPreference = "Stop"
+
+Add-Type -AssemblyName System.IO.Compression
+Add-Type -AssemblyName System.IO.Compression.FileSystem
+
+$sourcePath = (Resolve-Path -LiteralPath $SourceDirectory).Path
+$sourceName = Split-Path -Leaf $sourcePath
+$destinationFullPath = [System.IO.Path]::GetFullPath($DestinationPath)
+$destinationDirectory = Split-Path -Parent $destinationFullPath
+
+if ($destinationDirectory) {
+    New-Item -ItemType Directory -Path $destinationDirectory -Force | Out-Null
+}
+
+if (Test-Path -LiteralPath $destinationFullPath) {
+    Remove-Item -LiteralPath $destinationFullPath -Force
+}
+
+$archive = [System.IO.Compression.ZipFile]::Open(
+    $destinationFullPath,
+    [System.IO.Compression.ZipArchiveMode]::Create)
+
+try {
+    Get-ChildItem -LiteralPath $sourcePath -Directory -Recurse -Force | ForEach-Object {
+        $relativePath = $_.FullName.Substring($sourcePath.Length).TrimStart('\', '/')
+        $entryName = "$sourceName/$($relativePath.Replace('\', '/'))/"
+        $null = $archive.CreateEntry($entryName)
+    }
+
+    Get-ChildItem -LiteralPath $sourcePath -File -Recurse -Force | ForEach-Object {
+        $relativePath = $_.FullName.Substring($sourcePath.Length).TrimStart('\', '/')
+        $entryName = "$sourceName/$($relativePath.Replace('\', '/'))"
+        [System.IO.Compression.ZipFileExtensions]::CreateEntryFromFile(
+            $archive,
+            $_.FullName,
+            $entryName,
+            [System.IO.Compression.CompressionLevel]::Optimal) | Out-Null
+    }
+}
+finally {
+    $archive.Dispose()
+}
+
+$archive = [System.IO.Compression.ZipFile]::OpenRead($destinationFullPath)
+try {
+    $invalidEntry = $archive.Entries | Where-Object { $_.FullName.Contains('\') } | Select-Object -First 1
+    if ($invalidEntry) {
+        throw "Archive entry '$($invalidEntry.FullName)' contains a Windows path separator."
+    }
+}
+finally {
+    $archive.Dispose()
+}
+
+Write-Host "Created $destinationFullPath with portable ZIP paths."
diff --git a/.github/scripts/prepare-appimage.sh b/.github/scripts/prepare-appimage.sh
new file mode 100644
index 000000000..d0ee05a3b
--- /dev/null
+++ b/.github/scripts/prepare-appimage.sh
@@ -0,0 +1,107 @@
+#!/bin/sh
+set -eu
+
+# linuxdeploy inspects every PATH entry, including inaccessible Windows paths inherited by WSL.
+PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+export PATH
+
+if [ "$#" -lt 2 ] || [ "$#" -gt 3 ]; then
+    echo "Usage: $0 RELEASE_DIRECTORY OUTPUT_APPIMAGE [VERSION]" >&2
+    exit 2
+fi
+
+SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
+REPOSITORY_ROOT=$(CDPATH= cd -- "$SCRIPT_DIR/../.." && pwd)
+RELEASE_DIRECTORY=$(CDPATH= cd -- "$1" && pwd)
+OUTPUT_DIRECTORY=$(CDPATH= cd -- "$(dirname -- "$2")" && pwd)
+OUTPUT_APPIMAGE="$OUTPUT_DIRECTORY/$(basename -- "$2")"
+VERSION_NAME="${3:-continuous}"
+WORK_DIRECTORY=$(mktemp -d)
+APP_DIRECTORY="$WORK_DIRECTORY/OpenKH.AppDir"
+TOOLS_DIRECTORY="$WORK_DIRECTORY/tools"
+ICON_PATH="$WORK_DIRECTORY/openkh.png"
+
+cleanup() {
+    rm -rf "$WORK_DIRECTORY"
+}
+trap cleanup EXIT INT TERM
+
+require_file() {
+    if [ ! -f "$1" ]; then
+        echo "Required AppImage input is missing: $1" >&2
+        exit 1
+    fi
+}
+
+require_file "$RELEASE_DIRECTORY/OpenKh.Launcher"
+require_file "$RELEASE_DIRECTORY/Apps/OpenKh.Tools.ModsManager"
+require_file "$REPOSITORY_ROOT/distribution/AppImage/AppRun"
+require_file "$REPOSITORY_ROOT/distribution/AppImage/openkh.desktop"
+require_file "$REPOSITORY_ROOT/images/openKH_Old.ico"
+
+mkdir -p \
+    "$APP_DIRECTORY/usr/bin" \
+    "$APP_DIRECTORY/usr/lib/openkh" \
+    "$APP_DIRECTORY/usr/share/applications" \
+    "$APP_DIRECTORY/usr/share/icons/hicolor/256x256/apps" \
+    "$TOOLS_DIRECTORY"
+cp -a "$RELEASE_DIRECTORY/." "$APP_DIRECTORY/usr/lib/openkh/"
+chmod +x \
+    "$APP_DIRECTORY/usr/lib/openkh/OpenKh.Launcher" \
+    "$APP_DIRECTORY/usr/lib/openkh/Apps/OpenKh.Tools.ModsManager"
+ln -s ../lib/openkh/OpenKh.Launcher "$APP_DIRECTORY/usr/bin/openkh"
+ln -s ../lib/openkh/Apps/OpenKh.Tools.ModsManager "$APP_DIRECTORY/usr/bin/openkh-mod-manager"
+install -m 644 \
+    "$REPOSITORY_ROOT/distribution/AppImage/openkh.desktop" \
+    "$APP_DIRECTORY/usr/share/applications/openkh.desktop"
+
+# The Windows icon already contains the approved OpenKH artwork at several sizes.
+convert "${REPOSITORY_ROOT}/images/openKH_Old.ico[0]" \
+    -background none \
+    -gravity center \
+    -resize 256x256 \
+    -extent 256x256 \
+    "$ICON_PATH"
+install -m 644 "$ICON_PATH" "$APP_DIRECTORY/usr/share/icons/hicolor/256x256/apps/openkh.png"
+
+LINUXDEPLOY_VERSION="${LINUXDEPLOY_VERSION:-1-alpha-20251107-1}"
+APPIMAGETOOL_VERSION="${APPIMAGETOOL_VERSION:-1.9.1}"
+LINUXDEPLOY="$TOOLS_DIRECTORY/linuxdeploy-x86_64.AppImage"
+APPIMAGETOOL="$TOOLS_DIRECTORY/appimagetool-x86_64.AppImage"
+curl --fail --location --silent --show-error \
+    "https://github.com/linuxdeploy/linuxdeploy/releases/download/${LINUXDEPLOY_VERSION}/linuxdeploy-x86_64.AppImage" \
+    --output "$LINUXDEPLOY"
+curl --fail --location --silent --show-error \
+    "https://github.com/AppImage/appimagetool/releases/download/${APPIMAGETOOL_VERSION}/appimagetool-x86_64.AppImage" \
+    --output "$APPIMAGETOOL"
+chmod +x "$LINUXDEPLOY" "$APPIMAGETOOL"
+
+set -- \
+    "$LINUXDEPLOY" \
+    --appdir "$APP_DIRECTORY" \
+    --desktop-file "$APP_DIRECTORY/usr/share/applications/openkh.desktop" \
+    --icon-file "$APP_DIRECTORY/usr/share/icons/hicolor/256x256/apps/openkh.png" \
+    --executable "$APP_DIRECTORY/usr/bin/openkh" \
+    --executable "$APP_DIRECTORY/usr/bin/openkh-mod-manager"
+
+# Avalonia loads these libraries at runtime, so the .NET app host does not expose them to ldd.
+for library_name in libfontconfig.so.1 libfreetype.so.6 libICE.so.6 libSM.so.6 libX11.so.6 libX11-xcb.so.1 libxcb.so.1; do
+    library_path=$(ldconfig -p | awk -v name="$library_name" '$1 == name { print $NF; exit }')
+    if [ -z "$library_path" ]; then
+        echo "Required Linux library was not found: $library_name" >&2
+        exit 1
+    fi
+    set -- "$@" --library "$library_path"
+done
+
+APPIMAGE_EXTRACT_AND_RUN=1 "$@"
+rm -f "$APP_DIRECTORY/AppRun"
+install -m 755 "$REPOSITORY_ROOT/distribution/AppImage/AppRun" "$APP_DIRECTORY/AppRun"
+
+rm -f "$OUTPUT_APPIMAGE"
+ARCH=x86_64 \
+VERSION="$VERSION_NAME" \
+APPIMAGE_EXTRACT_AND_RUN=1 \
+    "$APPIMAGETOOL" "$APP_DIRECTORY" "$OUTPUT_APPIMAGE"
+chmod +x "$OUTPUT_APPIMAGE"
+echo "Created $OUTPUT_APPIMAGE"
diff --git a/.github/scripts/prepare-linux-release.ps1 b/.github/scripts/prepare-linux-release.ps1
new file mode 100644
index 000000000..c2e7f28e4
--- /dev/null
+++ b/.github/scripts/prepare-linux-release.ps1
@@ -0,0 +1,83 @@
+param (
+    [string] $ReleaseDirectory = "openkh-linux-x64",
+    [string] $Configuration = "Release"
+)
+
+$ErrorActionPreference = "Stop"
+$repositoryRoot = (Resolve-Path (Join-Path $PSScriptRoot "..\..")).Path
+$launcherProject = Join-Path $repositoryRoot "OpenKh.Tools.Launcher\OpenKh.Tools.Launcher.csproj"
+$modManagerProject = Join-Path $repositoryRoot "OpenKh.Tools.ModsManager.Avalonia\OpenKh.Tools.ModsManager.csproj"
+$panaceaSourceDirectory = Join-Path $repositoryRoot "OpenKh.Research.Panacea\Release"
+$panaceaFileNames = @(
+    "OpenKH.Panacea.dll",
+    "avcodec-vgmstream-59.dll",
+    "avformat-vgmstream-59.dll",
+    "avutil-vgmstream-57.dll",
+    "bass.dll",
+    "bass_vgmstream.dll",
+    "libatrac9.dll",
+    "libcelt-0061.dll",
+    "libcelt-0110.dll",
+    "libg719_decode.dll",
+    "libmpg123-0.dll",
+    "libspeex-1.dll",
+    "libvorbis.dll",
+    "swresample-vgmstream-4.dll"
+)
+
+if (Test-Path -LiteralPath $ReleaseDirectory) {
+    throw "Release directory '$ReleaseDirectory' already exists."
+}
+
+$applicationsDirectory = Join-Path $ReleaseDirectory "Apps"
+New-Item -ItemType Directory -Path $applicationsDirectory -Force | Out-Null
+
+dotnet publish `
+    $launcherProject `
+    --configuration $Configuration `
+    --runtime linux-x64 `
+    --self-contained true `
+    --source "https://api.nuget.org/v3/index.json" `
+    --output $ReleaseDirectory `
+    /p:PublishSingleFile=true `
+    /p:IncludeNativeLibrariesForSelfExtract=true `
+    /p:DebugType=None `
+    /p:DebugSymbols=false
+
+if ($LASTEXITCODE -ne 0) {
+    throw "Publishing the Linux launcher failed with exit code $LASTEXITCODE."
+}
+
+dotnet publish `
+    $modManagerProject `
+    --configuration $Configuration `
+    --runtime linux-x64 `
+    --self-contained true `
+    --source "https://api.nuget.org/v3/index.json" `
+    --output $applicationsDirectory `
+    /p:PublishSingleFile=true `
+    /p:IncludeNativeLibrariesForSelfExtract=true `
+    /p:DebugType=None `
+    /p:DebugSymbols=false
+
+if ($LASTEXITCODE -ne 0) {
+    throw "Publishing the Linux Mod Manager failed with exit code $LASTEXITCODE."
+}
+
+foreach ($fileName in $panaceaFileNames) {
+    $sourcePath = Join-Path $panaceaSourceDirectory $fileName
+    if (-not (Test-Path -LiteralPath $sourcePath -PathType Leaf)) {
+        throw "Required Panacea file '$sourcePath' does not exist."
+    }
+    Copy-Item -LiteralPath $sourcePath -Destination $applicationsDirectory
+}
+
+Get-ChildItem -LiteralPath $ReleaseDirectory -Filter "*.pdb" -File -Recurse |
+    Remove-Item -Force
+
+Copy-Item `
+    -LiteralPath (Join-Path $repositoryRoot "distribution\README-LINUX.txt") `
+    -Destination (Join-Path $ReleaseDirectory "README-FIRST.txt")
+Copy-Item -LiteralPath (Join-Path $repositoryRoot "distribution\install-openkh-linux.sh") -Destination $ReleaseDirectory
+Copy-Item -LiteralPath (Join-Path $repositoryRoot "LICENSE") -Destination $ReleaseDirectory
+Copy-Item -LiteralPath (Join-Path $repositoryRoot "NOTICE") -Destination $ReleaseDirectory
diff --git a/.github/scripts/prepare-release.ps1 b/.github/scripts/prepare-release.ps1
index 8d988dc38..347eed7af 100644
--- a/.github/scripts/prepare-release.ps1
+++ b/.github/scripts/prepare-release.ps1
@@ -27,9 +27,11 @@ dotnet publish `
     "OpenKh.Tools.Launcher/OpenKh.Tools.Launcher.csproj" `
     --configuration $Configuration `
     --runtime win-x64 `
-    --self-contained false `
+    --self-contained true `
+    --source "https://api.nuget.org/v3/index.json" `
     --output $ReleaseDirectory `
     /p:PublishSingleFile=true `
+    /p:IncludeNativeLibrariesForSelfExtract=true `
     /p:DebugType=None `
     /p:DebugSymbols=false
 
@@ -37,6 +39,9 @@ if ($LASTEXITCODE -ne 0) {
     throw "Publishing OpenKH Launcher failed with exit code $LASTEXITCODE."
 }
 
+Get-ChildItem -LiteralPath $ReleaseDirectory -Filter "*.pdb" -File |
+    Remove-Item -Force
+
 $compatibilityExecutable = Join-Path $ReleaseDirectory "OpenKh.Tools.ModsManager.exe"
 Copy-Item `
     -LiteralPath (Join-Path $ReleaseDirectory "OpenKh.Launcher.exe") `
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index 4a2d69072..48cdbd5ff 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -16,9 +16,9 @@ jobs:
       with:
         submodules: recursive
     - name: Setup .NET
-      uses: actions/setup-dotnet@v2
+      uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 10.0.x
     - name: Restore dependencies
       run: dotnet restore
     - name: pre-build.ps1
@@ -33,50 +33,67 @@ jobs:
     - name: msbuild panacea
       run: |
         msbuild OpenKh.Research.Panacea\OpenKh.Research.Panacea.vcxproj /p:Configuration=Release /p:Platform=x64
-        xcopy "OpenKh.Research.Panacea\Release\*.dll" bin\
-        xcopy "OpenKh.Research.Panacea\Dependencies\*.dll" bin\
+        xcopy /Y "OpenKh.Research.Panacea\Release\*.dll" bin\
+        xcopy /Y "OpenKh.Research.Panacea\Dependencies\*.dll" bin\
 
     - name: Organize release for mod users
       run: powershell -ExecutionPolicy Unrestricted ./.github/scripts/prepare-release.ps1
       shell: pwsh
 
+    - name: Build Linux and Steam Deck release
+      run: powershell -ExecutionPolicy Unrestricted ./.github/scripts/prepare-linux-release.ps1
+      shell: pwsh
+
     - name: create openkh-release
       shell: bash
       env:
         RELEASE_TAG: "release2-${{github.run_number}}"
       run: |
         echo $RELEASE_TAG > openkh/openkh-release
+        echo $RELEASE_TAG > openkh-linux-x64/openkh-release
 
-    - name: zip
-      uses: TheDoctor0/zip-release@0.6.2
-      with:
-        filename: openkh.zip
-        path: openkh
+    - name: Create Windows release archive
+      run: powershell -ExecutionPolicy Unrestricted ./.github/scripts/create-release-archive.ps1 -SourceDirectory openkh -DestinationPath openkh.zip
+      shell: pwsh
 
     - name: validate update archive
       shell: pwsh
       run: |
-        $archiveListing = (7z l openkh.zip) -join "`n"
+        Add-Type -AssemblyName System.IO.Compression.FileSystem
+        $archive = [System.IO.Compression.ZipFile]::OpenRead((Resolve-Path "openkh.zip"))
+        try {
+          $archiveEntries = @($archive.Entries | ForEach-Object { $_.FullName })
+        }
+        finally {
+          $archive.Dispose()
+        }
         $requiredEntries = @(
-          "openkh\OpenKh.Launcher.exe",
-          "openkh\OpenKh.Tools.ModsManager.exe",
-          "openkh\Apps\OpenKh.Tools.ModsManager.exe"
+          "openkh/OpenKh.Launcher.exe",
+          "openkh/OpenKh.Tools.ModsManager.exe",
+          "openkh/Apps/OpenKh.Tools.ModsManager.exe"
         )
         foreach ($entry in $requiredEntries) {
-          if ($archiveListing -notmatch [regex]::Escape($entry)) {
+          if ($entry -notin $archiveEntries) {
             throw "Required update entry '$entry' is missing from openkh.zip."
           }
         }
         $obsoleteEntries = @(
-          "openkh\AdvancedTools",
-          "openkh\Apps\ModManager"
+          "openkh/AdvancedTools",
+          "openkh/Apps/ModManager"
         )
         foreach ($entry in $obsoleteEntries) {
-          if ($archiveListing -match [regex]::Escape($entry)) {
+          if ($archiveEntries | Where-Object { $_.StartsWith($entry, [System.StringComparison]::OrdinalIgnoreCase) }) {
             throw "Obsolete update entry '$entry' is present in openkh.zip."
           }
         }
 
+    - name: Upload Linux release layout
+      uses: actions/upload-artifact@v4
+      with:
+        name: openkh-linux-layout
+        path: openkh-linux-x64
+        if-no-files-found: error
+
     - name: "GitHub release latest"
       if: ${{ github.ref_name == 'master' }}
       uses: "marvinpinto/action-automatic-releases@latest"
@@ -99,3 +116,111 @@ jobs:
         title: "OpenKh Build ${{github.run_number}} (${{github.ref_name}})"
         files: |
           openkh.zip
+
+  appimage:
+    needs: build
+    runs-on: ubuntu-22.04
+
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Download Linux release layout
+      uses: actions/download-artifact@v4
+      with:
+        name: openkh-linux-layout
+        path: openkh-linux-x64
+
+    - name: Build portable Linux archive
+      shell: bash
+      run: |
+        chmod +x \
+          openkh-linux-x64/OpenKh.Launcher \
+          openkh-linux-x64/Apps/OpenKh.Tools.ModsManager \
+          openkh-linux-x64/install-openkh-linux.sh
+        tar -czf openkh-linux-x64.tar.gz openkh-linux-x64
+
+    - name: Validate portable Linux archive
+      shell: bash
+      run: |
+        archive_root="$RUNNER_TEMP/openkh-tar-test"
+        mkdir -p "$archive_root"
+        tar -xzf openkh-linux-x64.tar.gz -C "$archive_root"
+        test -x "$archive_root/openkh-linux-x64/OpenKh.Launcher"
+        test -x "$archive_root/openkh-linux-x64/Apps/OpenKh.Tools.ModsManager"
+        test -x "$archive_root/openkh-linux-x64/install-openkh-linux.sh"
+        test -f "$archive_root/openkh-linux-x64/Apps/OpenKH.Panacea.dll"
+
+    - name: Install AppImage build dependencies
+      run: |
+        sudo apt-get update
+        sudo apt-get install --yes \
+          imagemagick \
+          libfontconfig1 \
+          libfreetype6 \
+          libice6 \
+          libsm6 \
+          libx11-6 \
+          libx11-xcb1 \
+          libxcb1 \
+          xvfb
+
+    - name: Build AppImage
+      shell: bash
+      env:
+        RELEASE_TAG: release2-${{ github.run_number }}
+      run: |
+        sh ./.github/scripts/prepare-appimage.sh \
+          openkh-linux-x64 \
+          openkh-x86_64.AppImage \
+          "$RELEASE_TAG"
+
+    - name: Validate AppImage
+      shell: bash
+      run: |
+        ./openkh-x86_64.AppImage --appimage-version
+        ./openkh-x86_64.AppImage --appimage-extract >/dev/null
+        test -x squashfs-root/AppRun
+        test -x squashfs-root/usr/lib/openkh/OpenKh.Launcher
+        test -x squashfs-root/usr/lib/openkh/Apps/OpenKh.Tools.ModsManager
+        test -f squashfs-root/usr/lib/openkh/Apps/OpenKH.Panacea.dll
+        APPIMAGE_EXTRACT_AND_RUN=1 \
+          OPENKH_DATA_ROOT="$RUNNER_TEMP/openkh-appimage-test" \
+          xvfb-run -a sh -c '
+            "$1" &
+            app_pid=$!
+            sleep 5
+            if ! kill -0 "$app_pid" 2>/dev/null; then
+              wait "$app_pid" || true
+              echo "The AppImage launcher exited before the smoke test completed." >&2
+              exit 1
+            fi
+            kill "$app_pid"
+            wait "$app_pid" || true
+          ' sh ./openkh-x86_64.AppImage
+
+    - name: Upload AppImage artifact
+      uses: actions/upload-artifact@v4
+      with:
+        name: openkh-appimage
+        path: openkh-x86_64.AppImage
+        if-no-files-found: error
+
+    - name: Upload portable Linux archive
+      uses: actions/upload-artifact@v4
+      with:
+        name: openkh-linux-tarball
+        path: openkh-linux-x64.tar.gz
+        if-no-files-found: error
+
+    - name: Add AppImage to latest release
+      if: ${{ github.event_name == 'push' && github.ref_name == 'master' }}
+      env:
+        GH_TOKEN: ${{ github.token }}
+      run: gh release upload latest openkh-x86_64.AppImage openkh-linux-x64.tar.gz --clobber
+
+    - name: Add AppImage to numbered release
+      if: ${{ github.event_name == 'push' }}
+      env:
+        GH_TOKEN: ${{ github.token }}
+        RELEASE_TAG: release2-${{ github.run_number }}
+      run: gh release upload "$RELEASE_TAG" openkh-x86_64.AppImage openkh-linux-x64.tar.gz --clobber
diff --git a/OpenKh.Command.Bdxio.Library/OpenKh.Command.Bdxio.Library.csproj b/OpenKh.Command.Bdxio.Library/OpenKh.Command.Bdxio.Library.csproj
new file mode 100644
index 000000000..f3564813f
--- /dev/null
+++ b/OpenKh.Command.Bdxio.Library/OpenKh.Command.Bdxio.Library.csproj
@@ -0,0 +1,25 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+    <AssemblyName>OpenKh.Command.Bdxio.Library</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="..\OpenKh.Command.Bdxio\Antlr4\**\*.cs" Link="Antlr4\%(RecursiveDir)%(Filename)%(Extension)" />
+    <Compile Include="..\OpenKh.Command.Bdxio\Models\**\*.cs" Link="Models\%(RecursiveDir)%(Filename)%(Extension)" />
+    <Compile Include="..\OpenKh.Command.Bdxio\Utils\**\*.cs" Link="Utils\%(RecursiveDir)%(Filename)%(Extension)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="NLog" Version="5.3.2" />
+    <PackageReference Include="YamlDotNet" Version="16.3.0" />
+    <PackageReference Include="Xe.BinaryMapper" Version="1.5.2" />
+    <PackageReference Include="Antlr4.Runtime.Standard" Version="4.13.1" />
+    <ProjectReference Include="..\OpenKh.Common\OpenKh.Common.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/OpenKh.Patcher/OpenKh.Patcher.csproj b/OpenKh.Patcher/OpenKh.Patcher.csproj
index 0c265a56b..d502260a9 100644
--- a/OpenKh.Patcher/OpenKh.Patcher.csproj
+++ b/OpenKh.Patcher/OpenKh.Patcher.csproj
@@ -10,7 +10,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\OpenKh.Bbs\OpenKh.Bbs.csproj" />
-    <ProjectReference Include="..\OpenKh.Command.Bdxio\OpenKh.Command.Bdxio.csproj" />
+    <ProjectReference Include="..\OpenKh.Command.Bdxio.Library\OpenKh.Command.Bdxio.Library.csproj" />
     <ProjectReference Include="..\OpenKh.Common\OpenKh.Common.csproj" />
     <ProjectReference Include="..\OpenKh.Egs\OpenKh.Egs.csproj" />
     <ProjectReference Include="..\OpenKh.Imaging\OpenKh.Imaging.csproj" />
diff --git a/OpenKh.Patcher/PatcherProcessor.cs b/OpenKh.Patcher/PatcherProcessor.cs
index 60b80305b..23392e79c 100644
--- a/OpenKh.Patcher/PatcherProcessor.cs
+++ b/OpenKh.Patcher/PatcherProcessor.cs
@@ -8,9 +8,10 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
-using System.IO;
-using System.Linq;
-using YamlDotNet.Serialization;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using YamlDotNet.Serialization;
 
 namespace OpenKh.Patcher
 {
@@ -48,9 +49,9 @@ public Context(
                 DestinationPath = destinationPath;
             }
 
-            public string GetOriginalAssetPath(string path) => Path.Combine(OriginalAssetPath, path);
-            public string GetSourceModAssetPath(string path) => Path.Combine(SourceModAssetPath, path);
-            public string GetDestinationPath(string path) => Path.Combine(DestinationPath, path);
+            public string GetOriginalAssetPath(string path) => Path.Combine(OriginalAssetPath, NormalizeAssetPath(path));
+            public string GetSourceModAssetPath(string path) => Path.Combine(SourceModAssetPath, NormalizeAssetPath(path));
+            public string GetDestinationPath(string path) => Path.Combine(DestinationPath, NormalizeAssetPath(path));
             public void EnsureDirectoryExists(string fileName) => Directory.CreateDirectory(Path.GetDirectoryName(fileName));
             public void CopyOriginalFile(string fileName, string dstFile)
             {
@@ -62,6 +63,10 @@ public void CopyOriginalFile(string fileName, string dstFile)
                         File.Copy(originalFile, dstFile);
                 }
             }
+
+            private static string NormalizeAssetPath(string path) =>
+                path.Replace('\\', Path.DirectorySeparatorChar)
+                    .Replace('/', Path.DirectorySeparatorChar);
         }
 
         public void Patch(string originalAssets, string outputDir, string modFilePath)
@@ -94,9 +99,10 @@ public void Patch(
             IDictionary<string, string> packageMap = null,
             string LaunchGame = null,
             string Language = "en",
-            bool Tests = false,
-            Dictionary<string, bool> collectionOptionalEnabledMods = null
-        )
+            bool Tests = false,
+            Dictionary<string, bool> collectionOptionalEnabledMods = null,
+            Action<int, int> progress = null
+        )
         {
             if (collectionOptionalEnabledMods == null)
                 collectionOptionalEnabledMods = new Dictionary<string, bool> { };
@@ -111,17 +117,23 @@ public void Patch(
                 if (metadata.IsCollection && !metadata.CollectionGames.Contains(LaunchGame))
                     return;
 
-                var exclusiveLock = new object();
-                metadata.Assets.AsParallel().ForAll(assetFile =>
-                {
-                    if (assetFile.Game != null && assetFile.Game != LaunchGame)
-                        return;
-                    if (assetFile.CollectionOptional == true)
-                        if (!collectionOptionalEnabledMods.ContainsKey(assetFile.Name))
-                            return;
-                        else if (!collectionOptionalEnabledMods[assetFile.Name])
-                            return;
-                    var names = new List<string>();
+                var exclusiveLock = new object();
+                var assets = metadata.Assets
+                    .Where(assetFile => assetFile.Game == null || assetFile.Game == LaunchGame)
+                    .Where(assetFile => assetFile.CollectionOptional != true ||
+                        collectionOptionalEnabledMods.TryGetValue(assetFile.Name, out var enabled) && enabled)
+                    .ToArray();
+                var progressMaximum = assets.Sum(assetFile =>
+                    1 + (assetFile.Multi?.Count(entry => !string.IsNullOrEmpty(entry.Name)) ?? 0));
+                var progressValue = 0;
+
+                void ReportProgress() => progress?.Invoke(
+                    Interlocked.Increment(ref progressValue),
+                    progressMaximum);
+
+                assets.AsParallel().ForAll(assetFile =>
+                {
+                    var names = new List<string>();
                     names.Add(assetFile.Name);
                     if (assetFile.Multi != null)
                         names.AddRange(assetFile.Multi.Select(x => x.Name).Where(x => !string.IsNullOrEmpty(x)));
@@ -131,8 +143,11 @@ public void Patch(
                         if (assetFile.Platform == null)
                             assetFile.Platform = "both";
 
-                        if (assetFile.Required && !File.Exists(context.GetOriginalAssetPath(name)))
-                            continue;
+                        if (assetFile.Required && !File.Exists(context.GetOriginalAssetPath(name)))
+                        {
+                            ReportProgress();
+                            continue;
+                        }
 
                         string _packageFile = null;
                         switch (LaunchGame)
@@ -177,18 +192,27 @@ public void Patch(
                             {
                                 default:
                                 {
-                                    if (assetFile.Platform.ToLower() == "pc")
-                                        continue;
-
-                                    else if (_pcFile)
-                                        continue;
+                                    if (assetFile.Platform.ToLower() == "pc")
+                                    {
+                                        ReportProgress();
+                                        continue;
+                                    }
+
+                                    else if (_pcFile)
+                                    {
+                                        ReportProgress();
+                                        continue;
+                                    }
                                 }
                                 break;
 
                                 case 2:
                                 {
-                                    if (assetFile.Platform.ToLower() == "ps2")
-                                        continue;
+                                    if (assetFile.Platform.ToLower() == "ps2")
+                                    {
+                                        ReportProgress();
+                                        continue;
+                                    }
 
                                     if (assetFile.Platform.ToLower() != "ps2")
                                         packageMapLocation = _packageFile + "/" + _extraPath + name;
@@ -205,7 +229,7 @@ public void Patch(
                             // Protect against multiple mods having the same file where one uses forward slash and one uses backslash
                             lock (exclusiveLock)
                             {
-                                packageMap[name.Replace("\\", "/")] = packageMapLocation;
+                                packageMap[name.Replace("\\", "/")] = packageMapLocation.Replace("\\", "/");
                             }
                         }
 
@@ -343,10 +367,11 @@ public void Patch(
                             }
                         }
                         catch (IOException) { }
-                        //This is here so the user does not have to close Mod Manager to see what the warnings were if any. Helpful especially on PC since the build window closes after build unlike emulator where it stays open during mod injection.
-                        Log.Flush();
-                    }
-                });
+                        //This is here so the user does not have to close Mod Manager to see what the warnings were if any. Helpful especially on PC since the build window closes after build unlike emulator where it stays open during mod injection.
+                        Log.Flush();
+                        ReportProgress();
+                    }
+                });
             }
 
             catch (Exception ex)
diff --git a/OpenKh.Research.Panacea/OpenKh.Research.Panacea.vcxproj b/OpenKh.Research.Panacea/OpenKh.Research.Panacea.vcxproj
index 3b2c8bca0..0da79547d 100644
--- a/OpenKh.Research.Panacea/OpenKh.Research.Panacea.vcxproj
+++ b/OpenKh.Research.Panacea/OpenKh.Research.Panacea.vcxproj
@@ -70,7 +70,7 @@
       <DelayLoadDLLs>bass_vgmstream.dll;bass.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
     </Link>
     <PostBuildEvent>
-      <Command>copy Dependencies\*.dll ..\Debug\</Command>
+      <Command>copy /Y "Dependencies\*.dll" "$(OutDir)"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -98,7 +98,7 @@
       <DelayLoadDLLs>bass_vgmstream.dll;bass.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
     </Link>
     <PostBuildEvent>
-      <Command>copy Dependencies\*.dll ..\Release\</Command>
+      <Command>copy /Y "Dependencies\*.dll" "$(OutDir)"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -115,4 +115,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/OpenKh.Tests.Launcher.Avalonia/LauncherNavigationIntegrationTests.cs b/OpenKh.Tests.Launcher.Avalonia/LauncherNavigationIntegrationTests.cs
new file mode 100644
index 000000000..c74a38ad7
--- /dev/null
+++ b/OpenKh.Tests.Launcher.Avalonia/LauncherNavigationIntegrationTests.cs
@@ -0,0 +1,224 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
+using Avalonia.Headless;
+using Avalonia.Headless.XUnit;
+using Avalonia.Input;
+using Avalonia.Threading;
+using Avalonia.VisualTree;
+using OpenKh.Tools.Launcher;
+using OpenKh.Tools.Launcher.Updates;
+using OpenKh.Tools.ModsManager.Avalonia.Services;
+using Xunit;
+
+[assembly: AvaloniaTestApplication(typeof(App))]
+
+namespace OpenKh.Tests.Launcher.Avalonia;
+
+public sealed class LauncherNavigationIntegrationTests
+{
+    private static readonly ControllerAction[] Directions =
+    [
+        ControllerAction.NavigateUp,
+        ControllerAction.NavigateDown,
+        ControllerAction.NavigateLeft,
+        ControllerAction.NavigateRight
+    ];
+
+    [Fact]
+    public void DataDirectoryDefaultsToInstallationDirectory()
+    {
+        var installationDirectory = Path.Combine(Path.GetTempPath(), "openkh-installation");
+
+        var result = LauncherInstallation.DetectDataDirectory(installationDirectory, null);
+
+        Assert.Equal(Path.GetFullPath(installationDirectory), result);
+    }
+
+    [Fact]
+    public void DataDirectoryUsesAppImageOverride()
+    {
+        var installationDirectory = Path.Combine(Path.GetTempPath(), "openkh-installation");
+        var dataDirectory = Path.Combine(Path.GetTempPath(), "openkh-data");
+
+        var result = LauncherInstallation.DetectDataDirectory(installationDirectory, dataDirectory);
+
+        Assert.Equal(Path.GetFullPath(dataDirectory), result);
+    }
+
+    [AvaloniaFact]
+    public void HomeHasAConnectedControllerNavigationGraph()
+    {
+        using var controller = new TestControllerInputService();
+        var launcher = new MainWindow(controller, checkUpdatesOnOpen: false);
+        launcher.Show();
+        RefreshLayout(launcher, 1100, 740);
+
+        AssertConnected("Launcher home", launcher, launcher.HandleControllerAction);
+        launcher.Close();
+    }
+
+    [AvaloniaFact]
+    public void ToolsHasAConnectedControllerNavigationGraph()
+    {
+        using var controller = new TestControllerInputService();
+        var launcher = new MainWindow(controller, checkUpdatesOnOpen: false);
+        launcher.Show();
+
+        var homePanel = launcher.FindControl<Grid>("HomePanel")!;
+        var toolsPanel = launcher.FindControl<Grid>("ToolsPanel")!;
+        var toolsList = launcher.FindControl<ListBox>("ToolsList")!;
+        homePanel.IsVisible = false;
+        toolsPanel.IsVisible = true;
+        toolsList.ItemsSource = new[]
+        {
+            new MainWindow.ToolEntry("OpenKh.Tools.First.exe", "First tool", "First test tool", "first", false),
+            new MainWindow.ToolEntry("OpenKh.Tools.Second.exe", "Second tool", "Second test tool", "second", true)
+        };
+        toolsList.SelectedIndex = 0;
+        RefreshLayout(launcher, 1100, 740);
+
+        Assert.Equal(2, toolsList.GetVisualDescendants().OfType<ListBoxItem>().Count());
+        AssertConnected("Launcher tools", launcher, launcher.HandleControllerAction);
+        launcher.Close();
+    }
+
+    [AvaloniaFact]
+    public void MessageDialogHasAConnectedControllerNavigationGraph()
+    {
+        var dialogType = typeof(MainWindow).Assembly.GetType("OpenKh.Tools.Launcher.MessageDialog", throwOnError: true)!;
+        var dialog = (Window)Activator.CreateInstance(dialogType, "Test", "Test message", true)!;
+        var handler = dialogType.GetMethod(
+            "HandleControllerAction",
+            System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.NonPublic)!;
+        dialog.Show();
+        RefreshLayout(dialog, 520, 260);
+
+        AssertConnected(
+            "Launcher message dialog",
+            dialog,
+            action => handler.Invoke(dialog, [action]));
+        dialog.Close();
+    }
+
+    private static void AssertConnected(string name, Control root, Action<ControllerAction> handle)
+    {
+        var targets = GetNavigationTargets(root);
+        Assert.True(targets.Length > 0, $"{name} has no controller navigation targets.");
+
+        var edges = targets.ToDictionary(target => target, _ => new HashSet<Control>());
+        foreach (var source in targets)
+        {
+            Assert.True(FocusTarget(source), $"{name} could not focus {Describe(source)}.");
+            foreach (var direction in Directions)
+            {
+                Assert.True(FocusTarget(source), $"{name} lost {Describe(source)} before {direction}.");
+                handle(direction);
+                Dispatcher.UIThread.RunJobs();
+                var focused = TopLevel.GetTopLevel(root)?.FocusManager?.GetFocusedElement() as Control;
+                var target = GetOutermostTarget(focused);
+                Assert.True(target is not null && targets.Contains(target),
+                    $"{name} moved outside its active screen after {direction} from {Describe(source)}.");
+                edges[source].Add(target!);
+            }
+        }
+
+        var visited = new HashSet<Control> { targets[0] };
+        var pending = new Queue<Control>();
+        pending.Enqueue(targets[0]);
+        while (pending.TryDequeue(out var current))
+        {
+            foreach (var next in edges[current])
+            {
+                if (visited.Add(next))
+                    pending.Enqueue(next);
+            }
+        }
+
+        var unreachable = targets.Where(target => !visited.Contains(target)).Select(Describe).ToArray();
+        Assert.True(unreachable.Length == 0,
+            $"{name} has unreachable controls: {string.Join(", ", unreachable)}.");
+    }
+
+    private static Control[] GetNavigationTargets(Control root) => root.GetVisualDescendants()
+        .OfType<Control>()
+        .Where(IsAvailable)
+        .Where(IsNavigationKind)
+        .Where(control => !control.GetVisualAncestors()
+            .OfType<Control>()
+            .Any(ancestor => IsAvailable(ancestor) && IsNavigationKind(ancestor)))
+        .ToArray();
+
+    private static Control? GetOutermostTarget(Control? control) => control?
+        .GetVisualAncestors()
+        .Prepend(control)
+        .OfType<Control>()
+        .Where(IsAvailable)
+        .Where(IsNavigationKind)
+        .LastOrDefault();
+
+    private static bool IsAvailable(Control control) =>
+        control.Focusable &&
+        control.IsVisible &&
+        control.IsEffectivelyEnabled &&
+        control.GetVisualAncestors()
+            .OfType<Control>()
+            .All(ancestor => ancestor.IsVisible && ancestor.IsEffectivelyEnabled);
+
+    private static bool IsNavigationKind(Control control) =>
+        control is Button or TextBox or ComboBox or CheckBox or ToggleSwitch or Expander or ListBoxItem;
+
+    private static bool FocusTarget(Control target)
+    {
+        if (target.Focus(NavigationMethod.Directional))
+            return true;
+
+        return target.GetVisualDescendants()
+            .OfType<Control>()
+            .Where(IsAvailable)
+            .Any(control => control.Focus(NavigationMethod.Directional));
+    }
+
+    private static string Describe(Control control) => control switch
+    {
+        Button button => $"Button:{button.Name ?? button.Content?.ToString()}",
+        TextBox textBox => $"TextBox:{textBox.Name ?? textBox.PlaceholderText}",
+        ComboBox comboBox => $"ComboBox:{comboBox.Name}",
+        ListBoxItem item => $"ListBoxItem:{item.DataContext}",
+        _ => $"{control.GetType().Name}:{control.Name}"
+    };
+
+    private static void RefreshLayout(Window window, double width, double height)
+    {
+        window.Width = width;
+        window.Height = height;
+        Dispatcher.UIThread.RunJobs();
+        window.InvalidateMeasure();
+        (window.Content as Control)?.InvalidateMeasure();
+        window.Measure(new Size(width, height));
+        window.Arrange(new Rect(0, 0, width, height));
+        window.UpdateLayout();
+        Dispatcher.UIThread.RunJobs();
+        AvaloniaHeadlessPlatform.ForceRenderTimerTick();
+        Dispatcher.UIThread.RunJobs();
+    }
+
+    private sealed class TestControllerInputService : IControllerInputService
+    {
+        public event Action<ControllerAction>? ActionTriggered;
+        public event Action? ConnectionChanged { add { } remove { } }
+        public event Action? StatusChanged { add { } remove { } }
+        public bool IsConnected => true;
+        public string StatusText => "Controller connected";
+        public string NavigationHelpText => "Controller navigation";
+        public void Start() { }
+        public void Dispatch(ControllerAction action) => ActionTriggered?.Invoke(action);
+        public IDisposable Capture(Action<ControllerAction> handler) => new EmptyDisposable();
+        public void Dispose() { }
+
+        private sealed class EmptyDisposable : IDisposable
+        {
+            public void Dispose() { }
+        }
+    }
+}
diff --git a/OpenKh.Tests.Launcher.Avalonia/OpenKh.Tests.Launcher.Avalonia.csproj b/OpenKh.Tests.Launcher.Avalonia/OpenKh.Tests.Launcher.Avalonia.csproj
new file mode 100644
index 000000000..05c879aa3
--- /dev/null
+++ b/OpenKh.Tests.Launcher.Avalonia/OpenKh.Tests.Launcher.Avalonia.csproj
@@ -0,0 +1,26 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <IsPackable>false</IsPackable>
+    <IsPublishable>false</IsPublishable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Avalonia.Headless.XUnit" Version="12.1.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageReference Include="xunit.v3" Version="3.2.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.1.4">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\OpenKh.Tools.Launcher\OpenKh.Tools.Launcher.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/OpenKh.Tests.Launcher.Avalonia/UpdateArchiveTests.cs b/OpenKh.Tests.Launcher.Avalonia/UpdateArchiveTests.cs
new file mode 100644
index 000000000..b743152c6
--- /dev/null
+++ b/OpenKh.Tests.Launcher.Avalonia/UpdateArchiveTests.cs
@@ -0,0 +1,50 @@
+using System.Formats.Tar;
+using System.IO.Compression;
+using OpenKh.Tools.Launcher.Updates;
+using Xunit;
+
+namespace OpenKh.Tests.Launcher.Avalonia;
+
+public sealed class UpdateArchiveTests : IDisposable
+{
+    private readonly string _rootDirectory = Path.Combine(
+        Path.GetTempPath(),
+        "OpenKhUpdateArchiveTests",
+        Guid.NewGuid().ToString("N"));
+
+    [Fact]
+    public void ExtractArchiveReadsPortableLinuxTarball()
+    {
+        var packageDirectory = Path.Combine(_rootDirectory, "source", "openkh-linux-x64");
+        var applicationDirectory = Path.Combine(packageDirectory, "Apps");
+        Directory.CreateDirectory(applicationDirectory);
+        File.WriteAllText(Path.Combine(packageDirectory, "OpenKh.Launcher"), "launcher");
+        File.WriteAllText(Path.Combine(applicationDirectory, "OpenKh.Tools.ModsManager"), "manager");
+        var archivePath = Path.Combine(_rootDirectory, "openkh-linux-x64.tar.gz");
+        Directory.CreateDirectory(_rootDirectory);
+        using (var output = File.Create(archivePath))
+        using (var gzip = new GZipStream(output, CompressionLevel.SmallestSize))
+            TarFile.CreateFromDirectory(packageDirectory, gzip, includeBaseDirectory: true);
+
+        var extractionDirectory = Path.Combine(_rootDirectory, "extracted");
+        Directory.CreateDirectory(extractionDirectory);
+        OpenKhUpdateInstallerService.ExtractArchive(archivePath, extractionDirectory);
+
+        Assert.Equal(
+            "launcher",
+            File.ReadAllText(Path.Combine(extractionDirectory, "openkh-linux-x64", "OpenKh.Launcher")));
+        Assert.Equal(
+            "manager",
+            File.ReadAllText(Path.Combine(
+                extractionDirectory,
+                "openkh-linux-x64",
+                "Apps",
+                "OpenKh.Tools.ModsManager")));
+    }
+
+    public void Dispose()
+    {
+        if (Directory.Exists(_rootDirectory))
+            Directory.Delete(_rootDirectory, true);
+    }
+}
diff --git a/OpenKh.Tests.ModsManager.Avalonia/AllWindowNavigationIntegrationTests.cs b/OpenKh.Tests.ModsManager.Avalonia/AllWindowNavigationIntegrationTests.cs
new file mode 100644
index 000000000..90d7cbd2e
--- /dev/null
+++ b/OpenKh.Tests.ModsManager.Avalonia/AllWindowNavigationIntegrationTests.cs
@@ -0,0 +1,198 @@
+using global::Avalonia;
+using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
+using Avalonia.Headless;
+using Avalonia.Headless.XUnit;
+using Avalonia.Input;
+using Avalonia.Themes.Fluent;
+using Avalonia.Threading;
+using Avalonia.VisualTree;
+using OpenKh.Tools.ModsManager.Avalonia.Services;
+using ModViews = OpenKh.Tools.ModsManager.Avalonia.Views;
+using Xunit;
+
+namespace OpenKh.Tests.ModsManager.Avalonia;
+
+public sealed class AllWindowNavigationIntegrationTests
+{
+    private static readonly ControllerAction[] Directions =
+    [
+        ControllerAction.NavigateUp,
+        ControllerAction.NavigateDown,
+        ControllerAction.NavigateLeft,
+        ControllerAction.NavigateRight
+    ];
+
+    [AvaloniaFact]
+    public void EveryModManagerDialogHasAConnectedControllerNavigationGraph()
+    {
+        var screens = new (string Name, Func<ModViews.EmbeddedDialogControl> Create, Action<ModViews.EmbeddedDialogControl, ControllerAction> Handle)[]
+        {
+            ("Collection settings", () => new ModViews.CollectionSettingsWindow(), (view, action) => ((ModViews.CollectionSettingsWindow)view).HandleControllerAction(action)),
+            ("Confirmation", () => new ModViews.ConfirmationWindow(), (view, action) => ((ModViews.ConfirmationWindow)view).HandleControllerAction(action)),
+            ("Controller keyboard", () => new ModViews.ControllerKeyboardWindow(), (view, action) => ((ModViews.ControllerKeyboardWindow)view).HandleControllerAction(action)),
+            ("Creator", () => new ModViews.CreatorWindow(), (view, action) => ((ModViews.CreatorWindow)view).HandleControllerAction(action)),
+            ("Info", () => new ModViews.InfoWindow(), (view, action) => ((ModViews.InfoWindow)view).HandleControllerAction(action)),
+            ("Install mods", () => new ModViews.InstallModWindow(), (view, action) => ((ModViews.InstallModWindow)view).HandleControllerAction(action)),
+            ("Browse mods", () => new ModViews.OnlineModsWindow(), (view, action) => ((ModViews.OnlineModsWindow)view).HandleControllerAction(action)),
+            ("Presets", () => new ModViews.PresetsWindow(), (view, action) => ((ModViews.PresetsWindow)view).HandleControllerAction(action)),
+            ("Settings", () => new ModViews.SettingsWindow(), (view, action) => ((ModViews.SettingsWindow)view).HandleControllerAction(action)),
+            ("Setup", () => new ModViews.SetupWindow(), (view, action) => ((ModViews.SetupWindow)view).HandleControllerAction(action)),
+            ("Target files", () => new ModViews.TargetFilesWindow(), (view, action) => ((ModViews.TargetFilesWindow)view).HandleControllerAction(action))
+        };
+
+        var windowSizes = new[]
+        {
+            new Size(1500, 1000),
+            new Size(960, 640)
+        };
+
+        foreach (var windowSize in windowSizes)
+        {
+            foreach (var screen in screens)
+            {
+                var view = screen.Create();
+                var window = ShowContent(view, windowSize.Width, windowSize.Height);
+                AssertConnected(
+                    $"{screen.Name} at {windowSize.Width}x{windowSize.Height}",
+                    view,
+                    action => screen.Handle(view, action));
+                window.Close();
+            }
+        }
+    }
+
+    private static void AssertConnected(string name, Control root, Action<ControllerAction> handle)
+        => AssertConnectedCore(name, root, direction => handle(direction));
+
+    private static void AssertConnectedCore(string name, Control root, Action<ControllerAction> handle)
+    {
+        var targets = GetNavigationTargets(root);
+        Assert.True(targets.Length > 0, $"{name} has no controller navigation targets.");
+
+        var edges = targets.ToDictionary(target => target, _ => new HashSet<Control>());
+        foreach (var source in targets)
+        {
+            source.BringIntoView();
+            Dispatcher.UIThread.RunJobs();
+            Assert.True(FocusTarget(source), $"{name} could not focus {Describe(source)}.");
+            foreach (var direction in Directions)
+            {
+                source.BringIntoView();
+                Dispatcher.UIThread.RunJobs();
+                Assert.True(FocusTarget(source), $"{name} lost {Describe(source)} before {direction}.");
+                handle(direction);
+                Dispatcher.UIThread.RunJobs();
+                var focused = TopLevel.GetTopLevel(root)?.FocusManager?.GetFocusedElement() as Control;
+                var target = GetOutermostTarget(focused);
+                Assert.True(target is not null && targets.Contains(target), $"{name} moved outside its active screen after {direction} from {Describe(source)}.");
+                edges[source].Add(target!);
+            }
+        }
+
+        var visited = new HashSet<Control> { targets[0] };
+        var pending = new Queue<Control>();
+        pending.Enqueue(targets[0]);
+        while (pending.TryDequeue(out var current))
+        {
+            foreach (var next in edges[current])
+            {
+                if (visited.Add(next))
+                    pending.Enqueue(next);
+            }
+        }
+
+        var unreachable = targets.Where(target => !visited.Contains(target)).Select(Describe).ToArray();
+        var graph = string.Join("; ", edges.Select(edge =>
+            $"{Describe(edge.Key)} -> {string.Join(" | ", edge.Value.Select(Describe))}"));
+        var bounds = string.Join("; ", targets.Select(target =>
+        {
+            var transform = target.TransformToVisual(root);
+            var position = transform is null
+                ? target.Bounds
+                : new Rect(target.Bounds.Size).TransformToAABB(transform.Value);
+            return $"{Describe(target)}={position}";
+        }));
+        Assert.True(unreachable.Length == 0,
+            $"{name} has unreachable controls: {string.Join(", ", unreachable)}. Graph: {graph}. Bounds: {bounds}");
+    }
+
+    private static Control[] GetNavigationTargets(Control root) => root.GetVisualDescendants()
+        .OfType<Control>()
+        .Where(IsAvailable)
+        .Where(IsNavigationKind)
+        .Where(control => !control.GetVisualAncestors()
+            .OfType<Control>()
+            .Any(ancestor =>
+                ancestor is not Expander &&
+                IsAvailable(ancestor) &&
+                IsNavigationKind(ancestor)))
+        .ToArray();
+
+    private static Control? GetOutermostTarget(Control? control) => control?
+        .GetVisualAncestors()
+        .Prepend(control)
+        .OfType<Control>()
+        .Where(IsAvailable)
+        .Where(IsNavigationKind)
+        .LastOrDefault();
+
+    private static bool IsAvailable(Control control) =>
+        control.Focusable &&
+        control.IsVisible &&
+        control.IsEffectivelyEnabled &&
+        control.GetVisualAncestors()
+            .OfType<Control>()
+            .All(ancestor => ancestor.IsVisible && ancestor.IsEffectivelyEnabled);
+
+    private static bool IsNavigationKind(Control control) =>
+        control is Button or TextBox or ComboBox or CheckBox or ToggleSwitch or Expander or ListBoxItem;
+
+    private static string Describe(Control control) => control switch
+    {
+        CheckBox checkBox => $"CheckBox:{checkBox.Name ?? checkBox.Content?.ToString()}",
+        Button button => $"Button:{button.Name ?? button.Content?.ToString()}",
+        TextBox textBox => $"TextBox:{textBox.Name ?? textBox.PlaceholderText}",
+        ComboBox comboBox => $"ComboBox:{comboBox.Name}",
+        ListBoxItem item => $"ListBoxItem:{item.DataContext}",
+        _ => $"{control.GetType().Name}:{control.Name}"
+    };
+
+    private static Window ShowContent(Control content, double width, double height)
+    {
+        if (Application.Current?.Styles.OfType<FluentTheme>().Any() == false)
+            Application.Current.Styles.Add(new FluentTheme());
+
+        var window = content as Window ?? new Window { Content = content };
+        window.Width = width;
+        window.Height = height;
+        window.Show();
+        RefreshLayout(window, width, height);
+        return window;
+    }
+
+    private static void RefreshLayout(Window window, double width, double height)
+    {
+        Dispatcher.UIThread.RunJobs();
+        window.InvalidateMeasure();
+        (window.Content as Control)?.InvalidateMeasure();
+        window.Measure(new Size(width, height));
+        window.Arrange(new Rect(0, 0, width, height));
+        window.UpdateLayout();
+        Dispatcher.UIThread.RunJobs();
+        AvaloniaHeadlessPlatform.ForceRenderTimerTick();
+        Dispatcher.UIThread.RunJobs();
+    }
+
+    private static bool FocusTarget(Control target)
+    {
+        if (target.Focus(NavigationMethod.Directional))
+            return true;
+
+        return target.GetVisualDescendants()
+            .OfType<Control>()
+            .Where(IsAvailable)
+            .Any(control => control.Focus(NavigationMethod.Directional));
+    }
+
+}
diff --git a/OpenKh.Tests.ModsManager.Avalonia/ControllerNavigationIntegrationTests.cs b/OpenKh.Tests.ModsManager.Avalonia/ControllerNavigationIntegrationTests.cs
new file mode 100644
index 000000000..6e4f793f1
--- /dev/null
+++ b/OpenKh.Tests.ModsManager.Avalonia/ControllerNavigationIntegrationTests.cs
@@ -0,0 +1,775 @@
+using System.Collections.ObjectModel;
+using global::Avalonia;
+using Avalonia.Controls;
+using Avalonia.Headless;
+using Avalonia.Headless.XUnit;
+using Avalonia.Input;
+using Avalonia.Themes.Fluent;
+using Avalonia.Threading;
+using Avalonia.VisualTree;
+using OpenKh.Tools.ModsManager.Avalonia.Services;
+using OpenKh.Tools.ModsManager.Avalonia.ViewModels;
+using OpenKh.Tools.ModsManager.Avalonia.Views;
+using OpenKh.Tools.ModsManager.Core;
+using System.Reflection;
+using Xunit;
+
+namespace OpenKh.Tests.ModsManager.Avalonia;
+
+public class ControllerNavigationIntegrationTests
+{
+    [AvaloniaFact]
+    public void SetupMapsEveryAdvancedStorageBrowseButtonToItsField()
+    {
+        var setup = new SetupWindow();
+        var resolver = typeof(SetupWindow).GetMethod(
+            "GetPathTextBox",
+            BindingFlags.Instance | BindingFlags.NonPublic)!;
+
+        Assert.Same(
+            setup.FindControl<TextBox>("ModStorageTextBox"),
+            resolver.Invoke(setup, ["ModStorageTextBox"]));
+        Assert.Same(
+            setup.FindControl<TextBox>("CollectionStorageTextBox"),
+            resolver.Invoke(setup, ["CollectionStorageTextBox"]));
+        Assert.Same(
+            setup.FindControl<TextBox>("BuiltModsTextBox"),
+            resolver.Invoke(setup, ["BuiltModsTextBox"]));
+    }
+
+    [AvaloniaFact]
+    public void Pcsx2ExtractionConfirmationOnlyDescribesIsoExtraction()
+    {
+        var root = Path.Combine(Path.GetTempPath(), "OpenKhSetupConfirmationTests", Guid.NewGuid().ToString("N"));
+        try
+        {
+            var layout = InstallationLayout.Detect("ignored", ["--data-root", root]);
+            var configuration = new ModManagerConfigurationService(layout);
+            configuration.Current.GameEdition = 1;
+            var viewModel = new SetupWindowViewModel(configuration);
+            var resolver = typeof(SetupWindow).GetMethod(
+                "GetExtractionConfirmationDescription",
+                BindingFlags.Static | BindingFlags.NonPublic)!;
+
+            var message = Assert.IsType<string>(resolver.Invoke(null, [viewModel]));
+
+            Assert.Contains("ISO files", message);
+            Assert.Contains("may be overwritten", message);
+            Assert.DoesNotContain("remastered", message, StringComparison.OrdinalIgnoreCase);
+            Assert.DoesNotContain("disk space", message, StringComparison.OrdinalIgnoreCase);
+        }
+        finally
+        {
+            if (Directory.Exists(root))
+                Directory.Delete(root, true);
+        }
+    }
+
+    [AvaloniaFact]
+    public void InstallDialogUsesSeparateRepositoryAndLocalFileActions()
+    {
+        var install = new InstallModWindow();
+
+        Assert.NotNull(install.FindControl<TextBox>("SourceTextBox"));
+        Assert.NotNull(install.FindControl<TextBox>("BranchTextBox"));
+        Assert.NotNull(install.FindControl<Button>("InstallButton"));
+        Assert.NotNull(install.FindControl<Button>("ChooseFileButton"));
+        Assert.Null(install.FindControl<CheckBox>("OverwriteCheckBox"));
+    }
+
+    [AvaloniaFact]
+    public void RepositoryInstallActionAlignsWithTheBranchField()
+    {
+        var install = new InstallModWindow();
+        var window = ShowContent(install, 1500, 900);
+        var branch = install.FindControl<TextBox>("BranchTextBox")!;
+        var installButton = install.FindControl<Button>("InstallButton")!;
+
+        var branchCenter = GetCenter(branch, install);
+        var buttonCenter = GetCenter(installButton, install);
+
+        Assert.InRange(Math.Abs(branchCenter.Y - buttonCenter.Y), 0, 1);
+        window.Close();
+    }
+
+    [AvaloniaFact]
+    public async Task ControllerKeyboardTypesErasesClosesAndRestoresTheDialog()
+    {
+        var main = new MainWindow();
+        var window = ShowContent(main, 1280, 800);
+        var install = new InstallModWindow();
+        var installTask = main.ShowPageAsync<ModInstallRequest>(install);
+        Dispatcher.UIThread.RunJobs();
+        var target = install.FindControl<TextBox>("SourceTextBox")!;
+        target.Text = "ab";
+        target.CaretIndex = 2;
+        target.SelectionStart = 2;
+        target.SelectionEnd = 2;
+
+        VirtualKeyboardService.Show(target);
+        Dispatcher.UIThread.RunJobs();
+        var keyboard = main.GetVisualDescendants().OfType<ControllerKeyboardWindow>().Single();
+
+        FocusKeyboardButton(keyboard, "Character:c");
+        Assert.True(ControllerWindowNavigator.TryHandleVirtualKeyboard(ControllerAction.Confirm));
+        Assert.Equal("abc", target.Text);
+
+        FocusKeyboardButton(keyboard, "Backspace");
+        Assert.True(ControllerWindowNavigator.TryHandleVirtualKeyboard(ControllerAction.Confirm));
+        Assert.Equal("ab", target.Text);
+
+        FocusKeyboardButton(keyboard, "Done");
+        Assert.True(ControllerWindowNavigator.TryHandleVirtualKeyboard(ControllerAction.Confirm));
+        await WaitForKeyboardToCloseAsync();
+
+        Assert.False(VirtualKeyboardService.IsOpen);
+        Assert.True(install.IsAttachedToVisualTree());
+        Dispatcher.UIThread.RunJobs();
+        Assert.Same(target, main.FocusManager?.GetFocusedElement());
+
+        install.Close();
+        await installTask;
+        window.Close();
+    }
+
+    [AvaloniaFact]
+    public async Task ControllerKeyboardSupportsFaceButtonShortcuts()
+    {
+        var main = new MainWindow();
+        var window = ShowContent(main, 1280, 800);
+        var install = new InstallModWindow();
+        var installTask = main.ShowPageAsync<ModInstallRequest>(install);
+        Dispatcher.UIThread.RunJobs();
+        var target = install.FindControl<TextBox>("SourceTextBox")!;
+        target.Text = "ab";
+        target.CaretIndex = 2;
+        target.SelectionStart = 2;
+        target.SelectionEnd = 2;
+
+        VirtualKeyboardService.Show(target);
+        Dispatcher.UIThread.RunJobs();
+        var keyboard = main.GetVisualDescendants().OfType<ControllerKeyboardWindow>().Single();
+
+        Assert.True(ControllerWindowNavigator.TryHandleVirtualKeyboard(ControllerAction.Secondary));
+        Assert.Equal("a", target.Text);
+
+        Assert.True(ControllerWindowNavigator.TryHandleVirtualKeyboard(ControllerAction.MoveTop));
+        FocusKeyboardButton(keyboard, "Character:b");
+        Assert.True(ControllerWindowNavigator.TryHandleVirtualKeyboard(ControllerAction.Confirm));
+        Assert.Equal("aB", target.Text);
+
+        Assert.True(ControllerWindowNavigator.TryHandleVirtualKeyboard(ControllerAction.Cancel));
+        await WaitForKeyboardToCloseAsync();
+        install.Close();
+        await installTask;
+        window.Close();
+    }
+
+    [AvaloniaFact]
+    public async Task PressingEnterSubmitsARepositoryInstall()
+    {
+        var main = new MainWindow();
+        var window = ShowContent(main, 1280, 800);
+        var install = new InstallModWindow();
+        var installTask = main.ShowPageAsync<ModInstallRequest>(install);
+        Dispatcher.UIThread.RunJobs();
+        var source = install.FindControl<TextBox>("SourceTextBox")!;
+        source.Text = "OpenKH/example-mod";
+
+        source.RaiseEvent(new KeyEventArgs
+        {
+            RoutedEvent = InputElement.KeyDownEvent,
+            Key = Key.Enter,
+            Source = source
+        });
+
+        var request = await installTask;
+        Assert.NotNull(request);
+        Assert.Equal("OpenKH/example-mod", request.Source);
+        window.Close();
+    }
+
+    [AvaloniaFact]
+    public async Task ControllerCancelClosesOnlyTheKeyboardAndReturnsControlToTheDialog()
+    {
+        var main = new MainWindow();
+        var window = ShowContent(main, 1280, 800);
+        var install = new InstallModWindow();
+        var installTask = main.ShowPageAsync<ModInstallRequest>(install);
+        Dispatcher.UIThread.RunJobs();
+        var target = install.FindControl<TextBox>("SourceTextBox")!;
+
+        VirtualKeyboardService.Show(target);
+        Dispatcher.UIThread.RunJobs();
+        Assert.True(ControllerWindowNavigator.TryHandleVirtualKeyboard(ControllerAction.Cancel));
+        await WaitForKeyboardToCloseAsync();
+
+        Assert.False(VirtualKeyboardService.IsOpen);
+        Assert.False(installTask.IsCompleted);
+        Assert.True(install.IsAttachedToVisualTree());
+        Assert.Same(target, main.FocusManager?.GetFocusedElement());
+
+        install.Close();
+        await installTask;
+        window.Close();
+    }
+
+    [AvaloniaFact]
+    public void BrowseGridMovesDownToTheRenderedCardBelow()
+    {
+        var cards = Enumerable.Range(0, 6)
+            .Select(index => new Button { Content = $"Mod {index}", Width = 180, Height = 220 })
+            .ToArray();
+        var window = ShowCanvas(640, 500, cards.Select((card, index) =>
+            (Control: (Control)card, X: (index % 3) * 200d, Y: (index / 3) * 240d)));
+
+        Assert.True(cards[1].Focus());
+        ControllerWindowNavigator.MoveFocus(window, NavigationDirection.Down);
+
+        Assert.Same(cards[4], window.FocusManager?.GetFocusedElement());
+        window.Close();
+    }
+
+    [AvaloniaFact]
+    public void BrowseGridMovesRightIntoTheDetailsAction()
+    {
+        var cards = Enumerable.Range(0, 3)
+            .Select(index => new Button { Content = $"Mod {index}", Width = 180, Height = 220 })
+            .ToArray();
+        var installButton = new Button { Content = "Install selected mod", Width = 240, Height = 60 };
+        var window = ShowCanvas(1000, 500,
+        [
+            (cards[0], 0, 0),
+            (cards[1], 200, 0),
+            (cards[2], 400, 0),
+            (installButton, 700, 80)
+        ]);
+
+        Assert.True(cards[2].Focus());
+        ControllerWindowNavigator.MoveFocus(window, NavigationDirection.Right);
+
+        Assert.Same(installButton, window.FocusManager?.GetFocusedElement());
+        window.Close();
+    }
+
+    [AvaloniaFact]
+    public void MainMenuCanMoveRightIntoTheInstalledModList()
+    {
+        var menuButton = new Button { Content = "Setup", Width = 220, Height = 60 };
+        var list = new ListBox
+        {
+            Width = 600,
+            Height = 180,
+            ItemsSource = new[] { "Installed mod" }
+        };
+        var window = ShowCanvas(1000, 600,
+        [
+            (menuButton, 0, 300),
+            (list, 300, 240)
+        ]);
+        var item = list.GetVisualDescendants().OfType<ListBoxItem>().Single();
+
+        Assert.True(menuButton.Focus());
+        ControllerWindowNavigator.MoveFocus(window, NavigationDirection.Right);
+
+        Assert.Same(item, window.FocusManager?.GetFocusedElement());
+        Assert.Equal("Installed mod", list.SelectedItem);
+        window.Close();
+    }
+
+    [AvaloniaFact]
+    public void SetupMovesRightToBrowseAndDownToTheNextField()
+    {
+        var folderInput = new TextBox { Width = 800, Height = 50 };
+        var browseButton = new Button { Content = "Browse", Width = 120, Height = 50 };
+        var platformCombo = new ComboBox
+        {
+            Width = 220,
+            Height = 50,
+            ItemsSource = new[] { "Epic Games Store", "Steam", "Other" },
+            SelectedIndex = 1
+        };
+        var window = ShowCanvas(1000, 400,
+        [
+            (folderInput, 0, 100),
+            (browseButton, 820, 100),
+            (platformCombo, 0, 180)
+        ]);
+
+        Assert.True(folderInput.Focus());
+        ControllerWindowNavigator.MoveFocus(window, NavigationDirection.Right);
+        Assert.Same(browseButton, window.FocusManager?.GetFocusedElement());
+
+        Assert.True(folderInput.Focus());
+        ControllerWindowNavigator.MoveFocus(window, NavigationDirection.Down);
+        Assert.Same(platformCombo, window.FocusManager?.GetFocusedElement());
+        window.Close();
+    }
+
+    [AvaloniaFact]
+    public void SetupControllerOpensAdvancedStorageAndEntersItsFirstField()
+    {
+        var setup = new SetupWindow();
+        var window = ShowContent(setup, 1500, 1000);
+        var expander = setup.FindControl<Expander>("AdvancedStorageExpander")!;
+        var firstField = setup.FindControl<TextBox>("ModStorageTextBox")!;
+        var headerButton = expander.GetVisualDescendants().OfType<Button>().First();
+
+        Assert.False(expander.IsExpanded);
+        Assert.True(headerButton.Focus());
+
+        setup.HandleControllerAction(ControllerAction.Confirm);
+        Dispatcher.UIThread.RunJobs();
+
+        Assert.True(expander.IsExpanded);
+        Assert.Same(firstField, window.FocusManager?.GetFocusedElement());
+
+        setup.HandleControllerAction(ControllerAction.NavigateRight);
+        Dispatcher.UIThread.RunJobs();
+
+        var browseButton = setup.GetVisualDescendants()
+            .OfType<Button>()
+            .Single(button => Equals(button.Tag, "ModStorageTextBox"));
+        Assert.Same(browseButton, window.FocusManager?.GetFocusedElement());
+
+        setup.HandleControllerAction(ControllerAction.NavigateDown);
+        Dispatcher.UIThread.RunJobs();
+        var collectionBrowseButton = setup.GetVisualDescendants()
+            .OfType<Button>()
+            .Single(button => Equals(button.Tag, "CollectionStorageTextBox"));
+        Assert.Same(collectionBrowseButton, window.FocusManager?.GetFocusedElement());
+
+        setup.HandleControllerAction(ControllerAction.NavigateLeft);
+        Dispatcher.UIThread.RunJobs();
+        var collectionField = setup.FindControl<TextBox>("CollectionStorageTextBox")!;
+        Assert.Same(collectionField, window.FocusManager?.GetFocusedElement());
+
+        setup.HandleControllerAction(ControllerAction.NavigateDown);
+        Dispatcher.UIThread.RunJobs();
+        var builtModsField = setup.FindControl<TextBox>("BuiltModsTextBox")!;
+        Assert.Same(builtModsField, window.FocusManager?.GetFocusedElement());
+
+        setup.HandleControllerAction(ControllerAction.NavigateRight);
+        Dispatcher.UIThread.RunJobs();
+        var builtModsBrowseButton = setup.GetVisualDescendants()
+            .OfType<Button>()
+            .Single(button => Equals(button.Tag, "BuiltModsTextBox"));
+        Assert.Same(builtModsBrowseButton, window.FocusManager?.GetFocusedElement());
+        window.Close();
+    }
+
+    [AvaloniaFact]
+    public void FocusedListItemBecomesTheSelectedItem()
+    {
+        var list = new ListBox
+        {
+            Width = 500,
+            Height = 240,
+            ItemsSource = new[] { "First mod", "Second mod", "Third mod" }
+        };
+        var window = ShowCanvas(600, 300, [(list, 20, 20)]);
+        var items = list.GetVisualDescendants().OfType<ListBoxItem>().ToArray();
+
+        Assert.True(items[2].Focus());
+        ControllerWindowNavigator.SyncSelectionWithFocus(window);
+
+        Assert.Equal("Third mod", list.SelectedItem);
+        window.Close();
+    }
+
+    [AvaloniaFact]
+    public void DialogUsesItsSelectedItemWhenFocusIsBehindIt()
+    {
+        var backgroundButton = new Button { Content = "Background", Width = 220, Height = 60 };
+        var list = new ListBox
+        {
+            Width = 500,
+            Height = 260,
+            ItemsSource = new[] { "First mod", "Second mod", "Third mod" },
+            SelectedIndex = 1
+        };
+        var dialogRoot = new Grid { Width = 600, Height = 300 };
+        dialogRoot.Children.Add(list);
+        var window = ShowCanvas(1000, 600,
+        [
+            (backgroundButton, 0, 0),
+            (dialogRoot, 300, 150)
+        ]);
+        var items = list.GetVisualDescendants().OfType<ListBoxItem>().ToArray();
+
+        Assert.True(backgroundButton.Focus());
+        ControllerWindowNavigator.MoveFocus(dialogRoot, NavigationDirection.Down);
+
+        Assert.Equal("Third mod", list.SelectedItem);
+        Assert.Same(items[2], window.FocusManager?.GetFocusedElement());
+        window.Close();
+    }
+
+    [AvaloniaFact]
+    public void SetupIgnoresFocusBehindTheDialog()
+    {
+        var backgroundButton = new Button { Content = "Background", Width = 220, Height = 60 };
+        var folderInput = new TextBox { Width = 500, Height = 50 };
+        var browseButton = new Button { Content = "Browse", Width = 120, Height = 50 };
+        var dialogRoot = new Canvas { Width = 700, Height = 300 };
+        Canvas.SetLeft(folderInput, 0);
+        Canvas.SetTop(folderInput, 100);
+        Canvas.SetLeft(browseButton, 520);
+        Canvas.SetTop(browseButton, 100);
+        dialogRoot.Children.Add(folderInput);
+        dialogRoot.Children.Add(browseButton);
+        var window = ShowCanvas(1000, 600,
+        [
+            (backgroundButton, 0, 0),
+            (dialogRoot, 260, 120)
+        ]);
+
+        Assert.True(backgroundButton.Focus());
+        ControllerWindowNavigator.MoveFocus(dialogRoot, NavigationDirection.Right);
+
+        Assert.Same(browseButton, window.FocusManager?.GetFocusedElement());
+        window.Close();
+    }
+
+    [AvaloniaFact]
+    public void DisabledControlsAreSkipped()
+    {
+        var source = new Button { Content = "Source", Width = 140, Height = 50 };
+        var disabled = new Button { Content = "Disabled", Width = 140, Height = 50, IsEnabled = false };
+        var available = new Button { Content = "Available", Width = 140, Height = 50 };
+        var window = ShowCanvas(600, 200,
+        [
+            (source, 0, 50),
+            (disabled, 170, 50),
+            (available, 340, 50)
+        ]);
+
+        Assert.True(source.Focus());
+        ControllerWindowNavigator.MoveFocus(window, NavigationDirection.Right);
+
+        Assert.Same(available, window.FocusManager?.GetFocusedElement());
+        window.Close();
+    }
+
+    [AvaloniaFact]
+    public void NavigationDoesNotWrapWhenThereIsNoControlInThatDirection()
+    {
+        var left = new Button { Content = "Left", Width = 140, Height = 50 };
+        var right = new Button { Content = "Right", Width = 140, Height = 50 };
+        var window = ShowCanvas(400, 200,
+        [
+            (left, 0, 50),
+            (right, 180, 50)
+        ]);
+
+        Assert.True(right.Focus());
+        ControllerWindowNavigator.MoveFocus(window, NavigationDirection.Right);
+
+        Assert.Same(right, window.FocusManager?.GetFocusedElement());
+        window.Close();
+    }
+
+    [AvaloniaFact]
+    public void ActualBrowseModsMovesToTheCardBelowAndKeepsSelectionInSync()
+    {
+        var browse = new OnlineModsWindow();
+        var list = browse.FindControl<ListBox>("ModsList")!;
+        var mods = Enumerable.Range(0, 9)
+            .Select(index => new BrowseModStub($"Mod {index}"))
+            .ToArray();
+        list.ItemsSource = mods;
+        list.SelectedIndex = 1;
+        var window = ShowContent(browse, 1400, 900);
+        var items = list.GetVisualDescendants().OfType<ListBoxItem>().ToArray();
+        var source = items[1];
+        var sourceCenter = GetCenter(source, browse);
+        var expected = items
+            .Where(item => GetCenter(item, browse).Y > sourceCenter.Y + 1)
+            .OrderBy(item => Math.Abs(GetCenter(item, browse).X - sourceCenter.X))
+            .ThenBy(item => GetCenter(item, browse).Y)
+            .First();
+
+        Assert.True(source.Focus());
+        ControllerWindowNavigator.MoveFocus(browse, NavigationDirection.Down);
+
+        Assert.Same(expected, window.FocusManager?.GetFocusedElement());
+        Assert.Same(expected.DataContext, list.SelectedItem);
+        window.Close();
+    }
+
+    [AvaloniaFact]
+    public void ActualMainWindowCanMoveFromSetupIntoTheInstalledModList()
+    {
+        var main = new MainWindow();
+        var list = main.FindControl<ListBox>("ModList")!;
+        var window = ShowContent(main, 1280, 800);
+        var installedItem = new ListBoxItem
+        {
+            Content = "Installed mod",
+            Width = 520,
+            Height = 72,
+            HorizontalAlignment = global::Avalonia.Layout.HorizontalAlignment.Left,
+            VerticalAlignment = global::Avalonia.Layout.VerticalAlignment.Top
+        };
+        Grid.SetRow(installedItem, 1);
+        ((Grid)list.Parent!).Children.Add(installedItem);
+        RefreshLayout(window, 1280, 800);
+        var setupButton = main.FindControl<Button>("SetupNavigationButton")!;
+        setupButton.Command = new RelayCommand(() => { });
+
+        Assert.True(
+            setupButton.Focus(),
+            $"Setup focus failed. Visible: {setupButton.IsVisible}; enabled: {setupButton.IsEffectivelyEnabled}; focusable: {setupButton.Focusable}; bounds: {setupButton.Bounds}.");
+        ControllerWindowNavigator.MoveFocus(main, NavigationDirection.Right);
+
+        Assert.Same(installedItem, window.FocusManager?.GetFocusedElement());
+        window.Close();
+    }
+
+    [AvaloniaFact]
+    public void MainWindowControllerActivatesMoreCommandsWithoutCollapsingTheMenu()
+    {
+        var main = new MainWindow();
+        var creatorButton = main.FindControl<Button>("CreatorToolsButton")!;
+        var aboutButton = main.FindControl<Button>("AboutOpenKhButton")!;
+        var moreExpander = main.FindControl<Expander>("MoreExpander")!;
+        var creatorInvocations = 0;
+        var aboutInvocations = 0;
+        creatorButton.Command = new RelayCommand(() => creatorInvocations++);
+        aboutButton.Command = new RelayCommand(() => aboutInvocations++);
+        moreExpander.IsExpanded = true;
+        var window = ShowContent(main, 1280, 800);
+
+        Assert.True(creatorButton.Focus());
+        main.HandleControllerAction(ControllerAction.Confirm);
+        Assert.Equal(1, creatorInvocations);
+        Assert.True(moreExpander.IsExpanded);
+
+        Assert.True(aboutButton.Focus());
+        main.HandleControllerAction(ControllerAction.Confirm);
+        Assert.Equal(1, aboutInvocations);
+        Assert.True(moreExpander.IsExpanded);
+        window.Close();
+    }
+
+    [AvaloniaFact]
+    public void ModReorderingRequiresFocusInsideAModRow()
+    {
+        var resolver = typeof(MainWindow).GetMethod(
+            "TryGetFocusedMod",
+            BindingFlags.Static | BindingFlags.NonPublic)!;
+        var mod = new ModListItemViewModel(
+            new ModEntry
+            {
+                Id = "example/mod",
+                Name = "Example Mod",
+                Directory = "example"
+            },
+            () => { });
+        var modItem = new ListBoxItem { DataContext = mod };
+        object?[] modArguments = [modItem, null];
+        object?[] unrelatedArguments = [new Button(), null];
+
+        Assert.True(Assert.IsType<bool>(resolver.Invoke(null, modArguments)));
+        Assert.Same(mod, modArguments[1]);
+        Assert.False(Assert.IsType<bool>(resolver.Invoke(null, unrelatedArguments)));
+        Assert.Null(unrelatedArguments[1]);
+    }
+
+    [AvaloniaFact]
+    public void ActualMainWindowKeepsAMovedOffscreenModSelected()
+    {
+        var main = new MainWindow();
+        var list = main.FindControl<ListBox>("ModList")!;
+        var window = ShowContent(main, 1280, 640);
+        var mods = new ObservableCollection<string>(
+            Enumerable.Range(0, 40).Select(index => $"Installed mod {index}"));
+        list.ItemsSource = mods;
+        var selected = mods[^1];
+        list.SelectedItem = selected;
+        RefreshLayout(window, 1280, 640);
+
+        mods.Remove(selected);
+        mods.Insert(0, selected);
+        list.SelectedItem = selected;
+        Dispatcher.UIThread.RunJobs();
+
+        Assert.Equal(selected, list.SelectedItem);
+        Assert.Equal(selected, mods[0]);
+        window.Close();
+    }
+
+    [AvaloniaFact]
+    public void ActualMainWindowRestoresFocusToAModAfterReordering()
+    {
+        var mods = new ObservableCollection<ModListItemViewModel>(
+        [
+            CreateModListItem("First mod"),
+            CreateModListItem("Second mod"),
+            CreateModListItem("Third mod")
+        ]);
+        var list = new ListBox
+        {
+            Width = 600,
+            Height = 320,
+            ItemsSource = mods
+        };
+        var window = ShowCanvas(700, 400, [(list, 20, 20)]);
+        list.SelectedItem = mods[1];
+        var focusedMod = mods[1];
+        var focusedRow = list.GetVisualDescendants()
+            .OfType<ListBoxItem>()
+            .Single(item => ReferenceEquals(item.DataContext, focusedMod));
+        Assert.True(focusedRow.Focus(NavigationMethod.Directional));
+
+        mods.Move(1, 0);
+        list.SelectedItem = focusedMod;
+        var restoreFocus = typeof(MainWindow).GetMethod(
+            "RestoreModFocus",
+            BindingFlags.Static | BindingFlags.NonPublic)!;
+        restoreFocus.Invoke(null, [list, focusedMod]);
+        Dispatcher.UIThread.RunJobs();
+
+        var focusedAfterMove = Assert.IsType<ListBoxItem>(window.FocusManager?.GetFocusedElement());
+        Assert.Same(focusedMod, focusedAfterMove.DataContext);
+        window.Close();
+    }
+
+    [AvaloniaFact]
+    public void ActualSetupCanNavigateFromLuaBackendToGameDataAndBack()
+    {
+        var setup = new SetupWindow();
+        var luaKh3D = setup.FindControl<CheckBox>("LuaKh3DCheckBox")!;
+        var gameData = setup.FindControl<TextBox>("GameDataTextBox")!;
+        var window = ShowContent(setup, 1600, 1000);
+
+        Assert.True(luaKh3D.Focus());
+        var downPath = MoveAndTrace(setup, NavigationDirection.Down, 30);
+        Assert.True(downPath.Contains(gameData), string.Join(" > ", downPath.Select(Describe)));
+        var upPath = MoveAndTrace(setup, NavigationDirection.Up, 30);
+        Assert.True(upPath.Contains(luaKh3D), string.Join(" > ", upPath.Select(Describe)));
+        window.Close();
+    }
+
+    private static IReadOnlyList<Control?> MoveAndTrace(
+        Control root,
+        NavigationDirection direction,
+        int maximumMoves)
+    {
+        var path = new List<Control?>();
+        for (var move = 0; move < maximumMoves; move++)
+        {
+            path.Add(TopLevel.GetTopLevel(root)?.FocusManager?.GetFocusedElement() as Control);
+            ControllerWindowNavigator.MoveFocus(root, direction);
+        }
+
+        path.Add(TopLevel.GetTopLevel(root)?.FocusManager?.GetFocusedElement() as Control);
+        return path;
+    }
+
+    private static void FocusKeyboardButton(ControllerKeyboardWindow keyboard, string action)
+    {
+        var button = keyboard.GetVisualDescendants()
+            .OfType<Button>()
+            .Single(candidate => Equals(candidate.Tag, action));
+        Assert.True(button.Focus(NavigationMethod.Directional));
+    }
+
+    private static async Task WaitForKeyboardToCloseAsync()
+    {
+        for (var attempt = 0; attempt < 20 && VirtualKeyboardService.IsOpen; attempt++)
+        {
+            Dispatcher.UIThread.RunJobs();
+            await Task.Delay(10);
+        }
+        Dispatcher.UIThread.RunJobs();
+    }
+
+    private static string Describe(Control? control) => control switch
+    {
+        null => "null",
+        CheckBox checkBox => $"CheckBox:{checkBox.Name ?? checkBox.Content?.ToString()}",
+        Button button => $"Button:{button.Name ?? button.Content?.ToString()}",
+        TextBox textBox => $"TextBox:{textBox.Name}",
+        ComboBox comboBox => $"ComboBox:{comboBox.Name}",
+        ListBoxItem item => $"ListBoxItem:{item.DataContext}",
+        _ => $"{control.GetType().Name}:{control.Name}"
+    };
+
+    private static ModListItemViewModel CreateModListItem(string name) => new(
+        new ModEntry
+        {
+            Id = $"example/{name.Replace(' ', '-')}",
+            Name = name,
+            Directory = name
+        },
+        () => { });
+
+    private static global::Avalonia.Point GetCenter(Control control, Control root)
+    {
+        var transform = control.TransformToVisual(root)!.Value;
+        var bounds = new global::Avalonia.Rect(control.Bounds.Size).TransformToAABB(transform);
+        return new global::Avalonia.Point(bounds.Center.X, bounds.Center.Y);
+    }
+
+    private static Window ShowCanvas(
+        double width,
+        double height,
+        IEnumerable<(Control Control, double X, double Y)> controls)
+    {
+        if (global::Avalonia.Application.Current?.Styles.OfType<FluentTheme>().Any() == false)
+            global::Avalonia.Application.Current.Styles.Add(new FluentTheme());
+
+        var canvas = new Canvas();
+        foreach (var (control, x, y) in controls)
+        {
+            Canvas.SetLeft(control, x);
+            Canvas.SetTop(control, y);
+            canvas.Children.Add(control);
+        }
+
+        var window = new Window
+        {
+            Width = width,
+            Height = height,
+            Content = canvas
+        };
+        window.Show();
+        window.Measure(new global::Avalonia.Size(width, height));
+        window.Arrange(new global::Avalonia.Rect(0, 0, width, height));
+        Dispatcher.UIThread.RunJobs();
+        AvaloniaHeadlessPlatform.ForceRenderTimerTick();
+        Dispatcher.UIThread.RunJobs();
+        return window;
+    }
+
+    private static Window ShowContent(Control content, double width, double height)
+    {
+        if (global::Avalonia.Application.Current?.Styles.OfType<FluentTheme>().Any() == false)
+            global::Avalonia.Application.Current.Styles.Add(new FluentTheme());
+
+        var window = content as Window ?? new Window { Content = content };
+        window.Width = width;
+        window.Height = height;
+        window.Show();
+        RefreshLayout(window, width, height);
+        return window;
+    }
+
+    private static void RefreshLayout(Window window, double width, double height)
+    {
+        window.Measure(new global::Avalonia.Size(width, height));
+        window.Arrange(new global::Avalonia.Rect(0, 0, width, height));
+        Dispatcher.UIThread.RunJobs();
+        AvaloniaHeadlessPlatform.ForceRenderTimerTick();
+        Dispatcher.UIThread.RunJobs();
+    }
+
+    private sealed record BrowseModStub(string Title)
+    {
+        public string Author => "Author";
+        public string Initial => Title[..1];
+        public object? PreviewImage => null;
+        public object? IconImage => null;
+    }
+}
diff --git a/OpenKh.Tests.ModsManager.Avalonia/OpenKh.Tests.ModsManager.Avalonia.csproj b/OpenKh.Tests.ModsManager.Avalonia/OpenKh.Tests.ModsManager.Avalonia.csproj
new file mode 100644
index 000000000..5a6d1b4d5
--- /dev/null
+++ b/OpenKh.Tests.ModsManager.Avalonia/OpenKh.Tests.ModsManager.Avalonia.csproj
@@ -0,0 +1,26 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <IsPackable>false</IsPackable>
+    <IsPublishable>false</IsPublishable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Avalonia.Headless.XUnit" Version="12.1.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageReference Include="xunit.v3" Version="3.2.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.1.4">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\OpenKh.Tools.ModsManager.Avalonia\OpenKh.Tools.ModsManager.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/OpenKh.Tests.ModsManager.Core/InstallationLayoutTests.cs b/OpenKh.Tests.ModsManager.Core/InstallationLayoutTests.cs
new file mode 100644
index 000000000..2c88204bf
--- /dev/null
+++ b/OpenKh.Tests.ModsManager.Core/InstallationLayoutTests.cs
@@ -0,0 +1,34 @@
+using OpenKh.Tools.ModsManager.Core;
+using Xunit;
+
+namespace OpenKh.Tests.ModsManager.Core;
+
+public sealed class InstallationLayoutTests
+{
+    [Fact]
+    public void DetectUsesParentOfAppsDirectory()
+    {
+        var installationDirectory = Path.Combine(Path.GetTempPath(), "OpenKhLayoutTest");
+        var layout = InstallationLayout.Detect(Path.Combine(installationDirectory, "Apps"));
+
+        Assert.Equal(Path.GetFullPath(installationDirectory), layout.RootDirectory);
+    }
+
+    [Fact]
+    public void DetectUsesLegacyModManagerInstallationRoot()
+    {
+        var installationDirectory = Path.Combine(Path.GetTempPath(), "OpenKhLegacyLayoutTest");
+        var layout = InstallationLayout.Detect(Path.Combine(installationDirectory, "Apps", "ModManager"));
+
+        Assert.Equal(Path.GetFullPath(installationDirectory), layout.RootDirectory);
+    }
+
+    [Fact]
+    public void DetectPrefersDataRootArgument()
+    {
+        var dataRoot = Path.Combine(Path.GetTempPath(), "OpenKhCustomData");
+        var layout = InstallationLayout.Detect("ignored", ["--data-root", dataRoot]);
+
+        Assert.Equal(Path.GetFullPath(dataRoot), layout.RootDirectory);
+    }
+}
diff --git a/OpenKh.Tests.ModsManager.Core/LauncherInstallationTests.cs b/OpenKh.Tests.ModsManager.Core/LauncherInstallationTests.cs
new file mode 100644
index 000000000..66e596c9e
--- /dev/null
+++ b/OpenKh.Tests.ModsManager.Core/LauncherInstallationTests.cs
@@ -0,0 +1,66 @@
+using OpenKh.Tools.Launcher.Updates;
+using Xunit;
+
+namespace OpenKh.Tests.ModsManager.Core;
+
+public sealed class LauncherInstallationTests
+{
+    [Fact]
+    public void DetectRootSupportsCurrentAndPreviousLayouts()
+    {
+        var installationDirectory = Path.Combine(Path.GetTempPath(), "OpenKhLauncherLayoutTest");
+
+        Assert.Equal(
+            Path.GetFullPath(installationDirectory),
+            LauncherInstallation.DetectRoot(Path.Combine(installationDirectory, "Apps")));
+        Assert.Equal(
+            Path.GetFullPath(installationDirectory),
+            LauncherInstallation.DetectRoot(Path.Combine(installationDirectory, "Apps", "ModManager")));
+    }
+
+    [Fact]
+    public void FindModManagerExecutablePrefersCurrentLayout()
+    {
+        var installationDirectory = Path.Combine(
+            Path.GetTempPath(),
+            $"openkh-launcher-installation-{Guid.NewGuid():N}");
+        var executableName = OperatingSystem.IsWindows()
+            ? "OpenKh.Tools.ModsManager.exe"
+            : "OpenKh.Tools.ModsManager";
+        var rootExecutable = Path.Combine(installationDirectory, executableName);
+        var previousExecutable = Path.Combine(
+            installationDirectory,
+            "Apps",
+            "ModManager",
+            executableName);
+        var currentExecutable = Path.Combine(
+            installationDirectory,
+            "Apps",
+            executableName);
+
+        try
+        {
+            Directory.CreateDirectory(installationDirectory);
+            File.WriteAllText(rootExecutable, string.Empty);
+            Assert.Equal(
+                rootExecutable,
+                LauncherInstallation.FindModManagerExecutable(installationDirectory));
+
+            Directory.CreateDirectory(Path.GetDirectoryName(previousExecutable)!);
+            File.WriteAllText(previousExecutable, string.Empty);
+            Assert.Equal(
+                previousExecutable,
+                LauncherInstallation.FindModManagerExecutable(installationDirectory));
+
+            File.WriteAllText(currentExecutable, string.Empty);
+            Assert.Equal(
+                currentExecutable,
+                LauncherInstallation.FindModManagerExecutable(installationDirectory));
+        }
+        finally
+        {
+            if (Directory.Exists(installationDirectory))
+                Directory.Delete(installationDirectory, recursive: true);
+        }
+    }
+}
diff --git a/OpenKh.Tests.ModsManager.Core/LocalModInstallerTests.cs b/OpenKh.Tests.ModsManager.Core/LocalModInstallerTests.cs
new file mode 100644
index 000000000..8811cfc77
--- /dev/null
+++ b/OpenKh.Tests.ModsManager.Core/LocalModInstallerTests.cs
@@ -0,0 +1,138 @@
+using OpenKh.Tools.ModsManager.Core;
+using System.IO.Compression;
+using Xunit;
+
+namespace OpenKh.Tests.ModsManager.Core;
+
+public sealed class LocalModInstallerTests : IDisposable
+{
+    private readonly string _rootDirectory = Path.Combine(
+        Path.GetTempPath(),
+        "OpenKhLocalInstallerTests",
+        Guid.NewGuid().ToString("N"));
+
+    [Fact]
+    public async Task InstallExtractsWrappedPackageIntoGameDirectory()
+    {
+        var packagePath = CreatePackage(
+            "Example.zip",
+            ("Example-main/mod.yml", "title: Example Mod\noriginalAuthor: Tester\nassets: []"),
+            ("Example-main/files/content.bin", "content"));
+        var layout = InstallationLayout.Detect("ignored", ["--data-root", _rootDirectory]);
+        var installer = new LocalModInstaller(layout);
+
+        var result = await installer.InstallAsync(packagePath, GameInfo.FromId("kh2"));
+
+        Assert.Equal("Example Mod", result.DisplayName);
+        Assert.True(File.Exists(Path.Combine(result.Directory, "mod.yml")));
+        Assert.True(File.Exists(Path.Combine(result.Directory, "files", "content.bin")));
+    }
+
+    [Fact]
+    public async Task InstallRejectsEntriesOutsideDestination()
+    {
+        var packagePath = CreatePackage(
+            "Unsafe.zip",
+            ("mod.yml", "title: Unsafe\nassets: []"),
+            ("../outside.txt", "unsafe"));
+        var layout = InstallationLayout.Detect("ignored", ["--data-root", _rootDirectory]);
+        var installer = new LocalModInstaller(layout);
+
+        await Assert.ThrowsAsync<InvalidDataException>(() =>
+            installer.InstallAsync(packagePath, GameInfo.FromId("kh2")));
+
+        Assert.False(File.Exists(Path.Combine(_rootDirectory, "mods", "kh2", "outside.txt")));
+    }
+
+    [Fact]
+    public async Task InstallRejectsPatchEntriesOutsideDestination()
+    {
+        var packagePath = CreatePackage(
+            "Unsafe.kh2pcpatch",
+            ("package/original/../../outside.txt", "unsafe"));
+        var layout = InstallationLayout.Detect("ignored", ["--data-root", _rootDirectory]);
+        var installer = new LocalModInstaller(layout);
+
+        await Assert.ThrowsAsync<InvalidDataException>(() =>
+            installer.InstallAsync(packagePath, GameInfo.FromId("kh2")));
+
+        Assert.False(File.Exists(Path.Combine(_rootDirectory, "mods", "kh2", "outside.txt")));
+    }
+
+    [Fact]
+    public async Task InstallRequestsConfirmationWhenModAlreadyExists()
+    {
+        var packagePath = CreatePackage(
+            "Example.zip",
+            ("mod.yml", "title: Example Mod\nassets: []"));
+        var layout = InstallationLayout.Detect("ignored", ["--data-root", _rootDirectory]);
+        var installer = new LocalModInstaller(layout);
+        await installer.InstallAsync(packagePath, GameInfo.FromId("kh2"));
+
+        var exception = await Assert.ThrowsAsync<ModAlreadyInstalledException>(() =>
+            installer.InstallAsync(packagePath, GameInfo.FromId("kh2")));
+
+        Assert.Equal("Example", exception.ModName);
+    }
+
+    [Fact]
+    public async Task FindInstalledModDetectsAnExistingPackageWithoutThrowing()
+    {
+        var packagePath = CreatePackage(
+            "Example.zip",
+            ("mod.yml", "title: Example Mod\nassets: []"));
+        var layout = InstallationLayout.Detect("ignored", ["--data-root", _rootDirectory]);
+        var installer = new LocalModInstaller(layout);
+
+        Assert.Null(installer.FindInstalledMod(packagePath, GameInfo.FromId("kh2")));
+        await installer.InstallAsync(packagePath, GameInfo.FromId("kh2"));
+
+        Assert.Equal("Example", installer.FindInstalledMod(packagePath, GameInfo.FromId("kh2")));
+    }
+
+    [Fact]
+    public async Task FindInstalledModDetectsAnExistingPcPatchWithoutThrowing()
+    {
+        var packagePath = CreatePackage(
+            "Example.kh2pcpatch",
+            ("package/original/obj/example.bin", "content"));
+        var layout = InstallationLayout.Detect("ignored", ["--data-root", _rootDirectory]);
+        var installer = new LocalModInstaller(layout);
+
+        Assert.Null(installer.FindInstalledMod(packagePath, GameInfo.FromId("kh2")));
+        await installer.InstallAsync(packagePath, GameInfo.FromId("kh2"));
+
+        Assert.Equal("Example", installer.FindInstalledMod(packagePath, GameInfo.FromId("kh2")));
+        Assert.Equal(
+            "KH2PCPATCH",
+            File.ReadAllText(Path.Combine(
+                _rootDirectory,
+                "mods",
+                "kh2",
+                "Example",
+                ".openkh-pcpatch")));
+        var installedMod = Assert.Single(await new ModCatalogService(layout).LoadAsync(GameInfo.FromId("kh2")));
+        Assert.True(installedMod.IsPcPatch);
+    }
+
+    public void Dispose()
+    {
+        if (Directory.Exists(_rootDirectory))
+            Directory.Delete(_rootDirectory, true);
+    }
+
+    private string CreatePackage(string name, params (string Name, string Content)[] entries)
+    {
+        Directory.CreateDirectory(_rootDirectory);
+        var packagePath = Path.Combine(_rootDirectory, name);
+        using var archive = ZipFile.Open(packagePath, ZipArchiveMode.Create);
+        foreach (var item in entries)
+        {
+            var entry = archive.CreateEntry(item.Name);
+            using var writer = new StreamWriter(entry.Open());
+            writer.Write(item.Content);
+        }
+
+        return packagePath;
+    }
+}
diff --git a/OpenKh.Tests.ModsManager.Core/ModBuildServiceTests.cs b/OpenKh.Tests.ModsManager.Core/ModBuildServiceTests.cs
new file mode 100644
index 000000000..0f0386bbb
--- /dev/null
+++ b/OpenKh.Tests.ModsManager.Core/ModBuildServiceTests.cs
@@ -0,0 +1,68 @@
+using OpenKh.Tools.ModsManager.Core;
+using Xunit;
+
+namespace OpenKh.Tests.ModsManager.Core;
+
+public sealed class ModBuildServiceTests : IDisposable
+{
+    private readonly string _rootDirectory = Path.Combine(
+        Path.GetTempPath(),
+        "OpenKhModBuildServiceTests",
+        Guid.NewGuid().ToString("N"));
+
+    [Fact]
+    public async Task BuildReportsProgressWithinASingleMod()
+    {
+        var configuration = new ModManagerConfigurationService(
+            InstallationLayout.Detect("ignored", ["--data-root", _rootDirectory]));
+        configuration.EnsureDirectories();
+        var modDirectory = Path.Combine(_rootDirectory, "test-mod");
+        Directory.CreateDirectory(modDirectory);
+        File.WriteAllText(Path.Combine(modDirectory, "source.bin"), "test data");
+        File.WriteAllText(Path.Combine(modDirectory, "mod.yml"), """
+            title: Progress test
+            game: kh2
+            assets:
+            - name: first.bin
+              multi:
+              - name: second.bin
+              - name: third.bin
+              method: copy
+              source:
+              - name: source.bin
+            """);
+        var reports = new List<ModOperationProgress>();
+        var progress = new RecordingProgress(reports);
+
+        await new ModBuildService(configuration).BuildAsync(
+            GameInfo.FromId("kh2"),
+            [new ModEntry
+            {
+                Id = "progress-test",
+                Name = "Progress test",
+                Directory = modDirectory,
+                IsEnabled = true
+            }],
+            progress: progress);
+
+        var percentages = reports
+            .Where(report => report.Percentage.HasValue)
+            .Select(report => report.Percentage!.Value)
+            .ToArray();
+        Assert.Equal(0, percentages[0]);
+        Assert.Contains(percentages, percentage => percentage > 0 && percentage < 1);
+        Assert.Equal(1, percentages[^1]);
+        Assert.True(percentages.SequenceEqual(percentages.OrderBy(value => value)));
+    }
+
+    public void Dispose()
+    {
+        if (Directory.Exists(_rootDirectory))
+            Directory.Delete(_rootDirectory, true);
+    }
+
+    private sealed class RecordingProgress(List<ModOperationProgress> reports) : IProgress<ModOperationProgress>
+    {
+        public void Report(ModOperationProgress value) => reports.Add(value);
+    }
+}
diff --git a/OpenKh.Tests.ModsManager.Core/ModCatalogServiceTests.cs b/OpenKh.Tests.ModsManager.Core/ModCatalogServiceTests.cs
new file mode 100644
index 000000000..c08795e51
--- /dev/null
+++ b/OpenKh.Tests.ModsManager.Core/ModCatalogServiceTests.cs
@@ -0,0 +1,221 @@
+using OpenKh.Tools.ModsManager.Core;
+using Xunit;
+
+namespace OpenKh.Tests.ModsManager.Core;
+
+public sealed class ModCatalogServiceTests : IDisposable
+{
+    private readonly string _rootDirectory = Path.Combine(
+        Path.GetTempPath(),
+        "OpenKhModCatalogTests",
+        Guid.NewGuid().ToString("N"));
+
+    [Fact]
+    public async Task LoadReadsMetadataAndKeepsEnabledOrderFirst()
+    {
+        CreateMod("Author/EnabledSecond", "Enabled second", "Author", "Second description");
+        CreateMod("Author/EnabledFirst", "Enabled first", "Author", "First description");
+        CreateMod("LocalMod", "Local title", "Local author", "Local description");
+        File.WriteAllLines(Path.Combine(_rootDirectory, "mods-KH2.txt"),
+        [
+            "Author/EnabledFirst",
+            "Author/EnabledSecond"
+        ]);
+
+        var layout = InstallationLayout.Detect("ignored", ["--data-root", _rootDirectory]);
+        var service = new ModCatalogService(layout);
+        var mods = await service.LoadAsync(GameInfo.FromId("kh2"));
+
+        Assert.Equal(3, mods.Count);
+        Assert.Equal("Author/EnabledFirst", mods[0].Id);
+        Assert.Equal("Enabled first", mods[0].Name);
+        Assert.True(mods[0].IsEnabled);
+        Assert.Equal("Author/EnabledSecond", mods[1].Id);
+        Assert.False(mods[2].IsEnabled);
+    }
+
+    [Fact]
+    public async Task SaveEnabledOrderUsesLegacyCompatibleFile()
+    {
+        CreateMod("Author/First", "First", "Author", "Description");
+        CreateMod("Author/Second", "Second", "Author", "Description");
+        var layout = InstallationLayout.Detect("ignored", ["--data-root", _rootDirectory]);
+        var service = new ModCatalogService(layout);
+        var game = GameInfo.FromId("kh2");
+        var mods = (await service.LoadAsync(game)).ToList();
+        mods[1].IsEnabled = true;
+
+        service.SaveEnabledOrder(game, mods);
+
+        Assert.Equal(
+            new[] { mods[1].Id },
+            File.ReadAllLines(Path.Combine(_rootDirectory, "mods-KH2.txt")));
+        Assert.Equal(
+            mods.Select(mod => mod.Id),
+            File.ReadAllLines(Path.Combine(_rootDirectory, "mod-order-KH2.txt")));
+    }
+
+    [Fact]
+    public async Task RefreshKeepsTheCompleteSavedOrderIncludingDisabledMods()
+    {
+        CreateMod("Author/First", "First", "Author", "Description");
+        CreateMod("Author/Second", "Second", "Author", "Description");
+        CreateMod("Author/Third", "Third", "Author", "Description");
+        var layout = InstallationLayout.Detect("ignored", ["--data-root", _rootDirectory]);
+        var service = new ModCatalogService(layout);
+        var game = GameInfo.FromId("kh2");
+        var mods = (await service.LoadAsync(game)).ToList();
+        var customOrder = new[] { mods[2], mods[0], mods[1] };
+        customOrder[1].IsEnabled = true;
+
+        service.SaveEnabledOrder(game, customOrder);
+        var refreshed = await service.LoadAsync(game);
+
+        Assert.Equal(customOrder.Select(mod => mod.Id), refreshed.Select(mod => mod.Id));
+        Assert.False(refreshed[0].IsEnabled);
+        Assert.True(refreshed[1].IsEnabled);
+        Assert.False(refreshed[2].IsEnabled);
+    }
+
+    [Fact]
+    public async Task LoadKeepsPcPatchesBelowOpenKhModsWithoutChangingRelativeOrder()
+    {
+        CreateMod("Author/PcPatchFirst", "First legacy mod (KH2PCPATCH)", "Author", "Legacy");
+        CreateMod("Author/OpenKhFirst", "First OpenKH mod", "Author", "OpenKH");
+        CreateMod("Author/PcPatchSecond", "Second legacy mod (KH2PCPATCH)", "Author", "Legacy");
+        CreateMod("Author/OpenKhSecond", "Second OpenKH mod", "Author", "OpenKH");
+        File.WriteAllLines(Path.Combine(_rootDirectory, "mod-order-KH2.txt"),
+        [
+            "Author/PcPatchFirst",
+            "Author/OpenKhFirst",
+            "Author/PcPatchSecond",
+            "Author/OpenKhSecond"
+        ]);
+        var service = new ModCatalogService(
+            InstallationLayout.Detect("ignored", ["--data-root", _rootDirectory]));
+
+        var mods = await service.LoadAsync(GameInfo.FromId("kh2"));
+
+        Assert.Equal(
+            new[]
+            {
+                "Author/OpenKhFirst",
+                "Author/OpenKhSecond",
+                "Author/PcPatchFirst",
+                "Author/PcPatchSecond"
+            },
+            mods.Select(mod => mod.Id));
+        Assert.False(mods[0].IsPcPatch);
+        Assert.False(mods[1].IsPcPatch);
+        Assert.True(mods[2].IsPcPatch);
+        Assert.True(mods[3].IsPcPatch);
+    }
+
+    [Fact]
+    public async Task SaveEnabledOrderKeepsPcPatchesBelowOpenKhMods()
+    {
+        CreateMod("Author/PcPatch", "Legacy mod (KH2PCPATCH)", "Author", "Legacy");
+        CreateMod("Author/OpenKh", "OpenKH mod", "Author", "OpenKH");
+        var service = new ModCatalogService(
+            InstallationLayout.Detect("ignored", ["--data-root", _rootDirectory]));
+        var game = GameInfo.FromId("kh2");
+        var mods = (await service.LoadAsync(game)).ToArray();
+
+        service.SaveEnabledOrder(game, mods.Reverse());
+
+        Assert.Equal(
+            new[] { "Author/OpenKh", "Author/PcPatch" },
+            File.ReadAllLines(Path.Combine(_rootDirectory, "mod-order-KH2.txt")));
+    }
+
+    [Fact]
+    public async Task NewlyInstalledModMovesToHighestOpenKhPriority()
+    {
+        CreateMod("Author/ExistingFirst", "Existing first", "Author", "OpenKH");
+        CreateMod("Author/ExistingSecond", "Existing second", "Author", "OpenKH");
+        CreateMod("Author/PcPatch", "Legacy mod (KH2PCPATCH)", "Author", "Legacy");
+        var service = new ModCatalogService(
+            InstallationLayout.Detect("ignored", ["--data-root", _rootDirectory]));
+        var game = GameInfo.FromId("kh2");
+        service.SaveEnabledOrder(game, await service.LoadAsync(game));
+        CreateMod("Author/NewSeed", "New seed", "Author", "OpenKH");
+
+        service.MoveInstalledModToHighestPriority(game, "Author/NewSeed");
+        var mods = await service.LoadAsync(game);
+
+        Assert.Equal(
+            new[]
+            {
+                "Author/NewSeed",
+                "Author/ExistingFirst",
+                "Author/ExistingSecond",
+                "Author/PcPatch"
+            },
+            mods.Select(mod => mod.Id));
+    }
+
+    [Fact]
+    public async Task LoadIncludesFilesModifiedByTheMod()
+    {
+        var modDirectory = Path.Combine(_rootDirectory, "mods", "kh2", "Author", "FilesMod");
+        Directory.CreateDirectory(modDirectory);
+        File.WriteAllText(Path.Combine(modDirectory, "mod.yml"), """
+            title: Files mod
+            originalAuthor: Author
+            description: Modifies multiple files
+            assets:
+            - name: msg/en/sys.bar
+              method: copy
+              multi:
+              - name: msg/fr/sys.bar
+            - name: scripts/kh2/example.lua
+              method: copy
+            """);
+        var service = new ModCatalogService(InstallationLayout.Detect("ignored", ["--data-root", _rootDirectory]));
+
+        var mods = await service.LoadAsync(GameInfo.FromId("kh2"));
+
+        var mod = Assert.Single(mods);
+        Assert.Equal(
+            ["msg/en/sys.bar", "msg/fr/sys.bar", "scripts/kh2/example.lua"],
+            mod.FilesToPatch);
+    }
+
+    [Fact]
+    public async Task LoadIncludesSourceAndIssueLinksForRepositoryMods()
+    {
+        CreateMod("Author/Hosted", "Hosted", "Author", "Description");
+        var modDirectory = Path.Combine(_rootDirectory, "mods", "kh2", "Author", "Hosted");
+        var gitDirectory = Path.Combine(modDirectory, ".git");
+        Directory.CreateDirectory(gitDirectory);
+        File.WriteAllText(Path.Combine(gitDirectory, "config"), """
+            [remote "origin"]
+                url = git@github.com:Author/Hosted.git
+                fetch = +refs/heads/*:refs/remotes/origin/*
+            """);
+        var service = new ModCatalogService(InstallationLayout.Detect("ignored", ["--data-root", _rootDirectory]));
+
+        var mod = Assert.Single(await service.LoadAsync(GameInfo.FromId("kh2")));
+
+        Assert.Equal("https://github.com/Author/Hosted", mod.SourceUrl);
+        Assert.Equal("https://github.com/Author/Hosted/issues", mod.ReportBugUrl);
+    }
+
+    public void Dispose()
+    {
+        if (Directory.Exists(_rootDirectory))
+            Directory.Delete(_rootDirectory, true);
+    }
+
+    private void CreateMod(string id, string title, string author, string description)
+    {
+        var modDirectory = Path.Combine(_rootDirectory, "mods", "kh2", id.Replace('/', Path.DirectorySeparatorChar));
+        Directory.CreateDirectory(modDirectory);
+        File.WriteAllText(Path.Combine(modDirectory, "mod.yml"), $"""
+            title: {title}
+            originalAuthor: {author}
+            description: {description}
+            assets: []
+            """);
+    }
+}
diff --git a/OpenKh.Tests.ModsManager.Core/OpenKh.Tests.ModsManager.Core.csproj b/OpenKh.Tests.ModsManager.Core/OpenKh.Tests.ModsManager.Core.csproj
new file mode 100644
index 000000000..4247c5b32
--- /dev/null
+++ b/OpenKh.Tests.ModsManager.Core/OpenKh.Tests.ModsManager.Core.csproj
@@ -0,0 +1,32 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <IsPackable>false</IsPackable>
+    <IsPublishable>false</IsPublishable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageReference Include="Avalonia" Version="12.1.0" />
+    <PackageReference Include="xunit" Version="2.9.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\OpenKh.Tools.ModsManager.Core\OpenKh.Tools.ModsManager.Core.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Include="..\OpenKh.Tools.Launcher\Updates\LauncherInstallation.cs"
+             Link="Launcher\LauncherInstallation.cs" />
+    <Compile Include="..\OpenKh.Tools.ModsManager.Avalonia\Services\SpatialNavigation.cs"
+             Link="ModsManager\SpatialNavigation.cs" />
+  </ItemGroup>
+
+</Project>
diff --git a/OpenKh.Tests.ModsManager.Core/RepositoryModInstallerTests.cs b/OpenKh.Tests.ModsManager.Core/RepositoryModInstallerTests.cs
new file mode 100644
index 000000000..ee7876486
--- /dev/null
+++ b/OpenKh.Tests.ModsManager.Core/RepositoryModInstallerTests.cs
@@ -0,0 +1,44 @@
+using OpenKh.Tools.ModsManager.Core;
+using Xunit;
+
+namespace OpenKh.Tests.ModsManager.Core;
+
+public sealed class RepositoryModInstallerTests
+{
+    [Fact]
+    public void ParseSupportsRepositoryHostShorthand()
+    {
+        var address = RepositoryModInstaller.RepositoryAddress.Parse(
+            "TopazTK/KH2-ArchipelagoEnablers@codeberg.org",
+            null);
+
+        Assert.Equal("TopazTK/KH2-ArchipelagoEnablers", address.Id);
+        Assert.Equal(
+            "https://codeberg.org/TopazTK/KH2-ArchipelagoEnablers.git",
+            address.CloneUrl);
+        Assert.Null(address.Branch);
+    }
+
+    [Fact]
+    public void ParseKeepsBranchWithRepositoryHostShorthand()
+    {
+        var address = RepositoryModInstaller.RepositoryAddress.Parse(
+            "owner/repository/feature/testing@gitlab.com",
+            null);
+
+        Assert.Equal("https://gitlab.com/owner/repository.git", address.CloneUrl);
+        Assert.Equal("feature/testing", address.Branch);
+    }
+
+    [Fact]
+    public void ParseSupportsCompleteNonGithubUrl()
+    {
+        var address = RepositoryModInstaller.RepositoryAddress.Parse(
+            "https://codeberg.org/owner/repository",
+            "release");
+
+        Assert.Equal("owner/repository", address.Id);
+        Assert.Equal("https://codeberg.org/owner/repository.git", address.CloneUrl);
+        Assert.Equal("release", address.Branch);
+    }
+}
diff --git a/OpenKh.Tests.ModsManager.Core/SetupServicesTests.cs b/OpenKh.Tests.ModsManager.Core/SetupServicesTests.cs
new file mode 100644
index 000000000..9bd97d247
--- /dev/null
+++ b/OpenKh.Tests.ModsManager.Core/SetupServicesTests.cs
@@ -0,0 +1,591 @@
+using OpenKh.Tools.ModsManager.Core;
+using OpenKh.Patcher;
+using System.Net;
+using System.Net.Http;
+using System.Text;
+using Xunit;
+
+namespace OpenKh.Tests.ModsManager.Core;
+
+public sealed class SetupServicesTests : IDisposable
+{
+    private static readonly string[] PanaceaDependencies =
+    [
+        "avcodec-vgmstream-59.dll",
+        "avformat-vgmstream-59.dll",
+        "avutil-vgmstream-57.dll",
+        "bass.dll",
+        "bass_vgmstream.dll",
+        "libatrac9.dll",
+        "libcelt-0061.dll",
+        "libcelt-0110.dll",
+        "libg719_decode.dll",
+        "libmpg123-0.dll",
+        "libspeex-1.dll",
+        "libvorbis.dll",
+        "swresample-vgmstream-4.dll"
+    ];
+
+    private readonly string _rootDirectory = Path.Combine(
+        Path.GetTempPath(),
+        "OpenKhSetupServicesTests",
+        Guid.NewGuid().ToString("N"));
+
+    [Fact]
+    public void NewConfigurationDefaultsToPcSteamGlobal()
+    {
+        var configuration = new ModManagerConfiguration();
+
+        Assert.Equal(2, configuration.GameEdition);
+        Assert.Equal("Steam", configuration.PcVersion);
+        Assert.Equal("en", configuration.PcReleaseLanguage);
+    }
+
+    [Theory]
+    [InlineData("/home/deck/.local/share/OpenKH/mod", true, "Z:\\home\\deck\\.local\\share\\OpenKH\\mod")]
+    [InlineData("/run/media/deck/SD Card/OpenKH/mod", true, "Z:\\run\\media\\deck\\SD Card\\OpenKH\\mod")]
+    [InlineData("C:\\OpenKH\\mod", false, "C:\\OpenKH\\mod")]
+    public void PanaceaUsesAPathVisibleToItsWindowsProcess(
+        string path,
+        bool isLinux,
+        string expected)
+    {
+        Assert.Equal(expected, PanaceaPath.ToLoaderPath(path, isLinux));
+    }
+
+    [Fact]
+    public void LegacyGameEngineConfigurationIsMigratedToPcRelease()
+    {
+        Directory.CreateDirectory(_rootDirectory);
+        File.WriteAllText(Path.Combine(_rootDirectory, "mods-manager.yml"), "gameEdition: 0\npcVersion: ''\n");
+
+        var service = CreateConfigurationService();
+
+        Assert.Equal(2, service.Current.GameEdition);
+        Assert.Equal("Steam", service.Current.PcVersion);
+    }
+
+    [Fact]
+    public void OfficialConfigurationNamesAreLoadedAndPreserved()
+    {
+        Directory.CreateDirectory(_rootDirectory);
+        var configurationPath = Path.Combine(_rootDirectory, "mods-manager.yml");
+        var modDirectory = Path.Combine(_rootDirectory, "creator-mod");
+        File.WriteAllText(configurationPath, $$"""
+            extractedGameDataPath: '{{Path.Combine(_rootDirectory, "extracted")}}'
+            installedModsPath: '{{Path.Combine(_rootDirectory, "installed")}}'
+            installedCollectionsPath: '{{Path.Combine(_rootDirectory, "collections")}}'
+            compiledModPath: '{{Path.Combine(_rootDirectory, "compiled")}}'
+            yamlGenPrefs:
+            - label: Existing creator setup
+              gameDataPath: '{{Path.Combine(_rootDirectory, "creator-data")}}'
+              modYmlFilePath: '{{Path.Combine(modDirectory, "mod.yml")}}'
+            """);
+
+        var configuration = ModManagerConfiguration.Load(configurationPath);
+
+        Assert.Equal(Path.Combine(_rootDirectory, "extracted"), configuration.GameDataPath);
+        Assert.Equal(Path.Combine(_rootDirectory, "installed"), configuration.ModCollectionPath);
+        Assert.Equal(Path.Combine(_rootDirectory, "collections"), configuration.ModCollectionsPath);
+        Assert.Equal(Path.Combine(_rootDirectory, "compiled"), configuration.GameModPath);
+        Assert.Equal(modDirectory, Assert.Single(configuration.CreatorPreferences).ModDirectory);
+
+        configuration.Save(configurationPath);
+        var saved = File.ReadAllText(configurationPath);
+        Assert.Contains("extractedGameDataPath:", saved);
+        Assert.Contains("installedModsPath:", saved);
+        Assert.Contains("installedCollectionsPath:", saved);
+        Assert.Contains("compiledModPath:", saved);
+        Assert.Contains("yamlGenPrefs:", saved);
+        Assert.Contains("modYmlFilePath:", saved);
+        Assert.DoesNotContain("gameDataPath:", saved.Split("yamlGenPrefs:")[0]);
+        Assert.DoesNotContain("modCollectionPath:", saved);
+        Assert.DoesNotContain("creatorPreferences:", saved);
+    }
+
+    [Fact]
+    public void CustomStorageLocationsAreUsedWithoutExtraFolderNames()
+    {
+        var service = CreateConfigurationService();
+        var installed = Path.Combine(_rootDirectory, "installed");
+        var collections = Path.Combine(_rootDirectory, "collections");
+        var compiled = Path.Combine(_rootDirectory, "compiled");
+        service.Current.ModCollectionPath = installed;
+        service.Current.ModCollectionsPath = collections;
+        service.Current.GameModPath = compiled;
+        var game = GameInfo.FromId("kh2");
+
+        Assert.Equal(Path.Combine(installed, "kh2"), service.GetGameModsDirectory(game));
+        Assert.Equal(collections, service.CollectionsDirectory);
+        Assert.Equal(Path.Combine(compiled, "kh2"), service.GetGameModOutputDirectory(game));
+        Assert.Equal(compiled, service.CompiledModsRoot);
+    }
+
+    [Fact]
+    public void SharedStorageLocationKeepsInstalledAndBuiltModsSeparate()
+    {
+        var service = CreateConfigurationService();
+        var shared = Path.Combine(_rootDirectory, "shared");
+        service.Current.ModCollectionPath = shared;
+        service.Current.ModCollectionsPath = shared;
+        service.Current.GameModPath = shared;
+        var game = GameInfo.FromId("kh2");
+
+        Assert.Equal(Path.Combine(shared, "mods", "kh2"), service.GetGameModsDirectory(game));
+        Assert.Equal(Path.Combine(shared, "collections"), service.CollectionsDirectory);
+        Assert.Equal(Path.Combine(shared, "mod", "kh2"), service.GetGameModOutputDirectory(game));
+        Assert.Equal(Path.Combine(shared, "mod"), service.CompiledModsRoot);
+    }
+
+    [Fact]
+    public void InterimAvaloniaConfigurationIsMigratedToOfficialNames()
+    {
+        Directory.CreateDirectory(_rootDirectory);
+        var configurationPath = Path.Combine(_rootDirectory, "mods-manager.yml");
+        var modDirectory = Path.Combine(_rootDirectory, "creator-mod");
+        File.WriteAllText(configurationPath, $$"""
+            gameDataPath: '{{Path.Combine(_rootDirectory, "extracted")}}'
+            modCollectionPath: '{{Path.Combine(_rootDirectory, "installed")}}'
+            modCollectionsPath: '{{Path.Combine(_rootDirectory, "collections")}}'
+            gameModPath: '{{Path.Combine(_rootDirectory, "compiled")}}'
+            creatorPreferences:
+            - label: Avalonia creator setup
+              modDirectory: '{{modDirectory}}'
+              gameDataPath: '{{Path.Combine(_rootDirectory, "creator-data")}}'
+              diffToolPath: diff-tool
+            """);
+
+        var configuration = ModManagerConfiguration.Load(configurationPath);
+
+        Assert.Equal(Path.Combine(_rootDirectory, "extracted"), configuration.GameDataPath);
+        Assert.Equal(Path.Combine(_rootDirectory, "installed"), configuration.ModCollectionPath);
+        Assert.Equal(Path.Combine(_rootDirectory, "collections"), configuration.ModCollectionsPath);
+        Assert.Equal(Path.Combine(_rootDirectory, "compiled"), configuration.GameModPath);
+        var preference = Assert.Single(configuration.CreatorPreferences);
+        Assert.Equal(modDirectory, preference.ModDirectory);
+        Assert.Equal("diff-tool", preference.DiffToolPath);
+
+        var migrated = File.ReadAllText(configurationPath);
+        Assert.Contains("extractedGameDataPath:", migrated);
+        Assert.Contains("installedModsPath:", migrated);
+        Assert.Contains("yamlGenPrefs:", migrated);
+        Assert.DoesNotContain("modCollectionPath:", migrated);
+        Assert.DoesNotContain("creatorPreferences:", migrated);
+    }
+
+    [Fact]
+    public void PreviewDevViewSettingEnablesPatchingTools()
+    {
+        Directory.CreateDirectory(_rootDirectory);
+        var configurationPath = Path.Combine(_rootDirectory, "mods-manager.yml");
+        File.WriteAllText(configurationPath, "devView: true\n");
+
+        var configuration = ModManagerConfiguration.Load(configurationPath);
+
+        Assert.True(configuration.EnablePatching);
+        var migrated = File.ReadAllText(configurationPath);
+        Assert.Contains("enablePatching: true", migrated);
+        Assert.DoesNotContain("devView:", migrated);
+    }
+
+    [Fact]
+    public void LegacyCleanupOnlyTargetsApplicationFiles()
+    {
+        var appsDirectory = Path.Combine(_rootDirectory, "Apps");
+        Directory.CreateDirectory(appsDirectory);
+        Directory.CreateDirectory(Path.Combine(_rootDirectory, "mods"));
+        Directory.CreateDirectory(Path.Combine(_rootDirectory, "data"));
+        Directory.CreateDirectory(Path.Combine(_rootDirectory, "presets"));
+        Directory.CreateDirectory(Path.Combine(_rootDirectory, "AdvancedTools"));
+        File.WriteAllText(Path.Combine(_rootDirectory, "OpenKh.Launcher.exe"), "launcher");
+        File.WriteAllText(Path.Combine(_rootDirectory, "OpenKh.Tools.ModsManager.exe"), "compatibility launcher");
+        File.WriteAllText(Path.Combine(appsDirectory, "OpenKh.Tools.ModsManager.exe"), "mod manager");
+        File.WriteAllText(Path.Combine(_rootDirectory, "old-library.dll"), "old application file");
+        File.WriteAllText(Path.Combine(_rootDirectory, "mods-manager.yml"), "launchGame: kh2");
+        File.WriteAllText(Path.Combine(_rootDirectory, "mods-KH2.txt"), "OpenKH/example");
+        File.WriteAllText(Path.Combine(appsDirectory, "legacy-release-files.txt"), "old-library.dll\n");
+        File.WriteAllText(Path.Combine(appsDirectory, "legacy-release-directories.txt"), "AdvancedTools\n");
+
+        var paths = LegacyInstallationCleanup.GetLegacyPaths(_rootDirectory);
+
+        Assert.Contains(Path.Combine(_rootDirectory, "old-library.dll"), paths);
+        Assert.Contains(Path.Combine(_rootDirectory, "AdvancedTools"), paths);
+        Assert.DoesNotContain(Path.Combine(_rootDirectory, "OpenKh.Launcher.exe"), paths);
+        Assert.DoesNotContain(Path.Combine(_rootDirectory, "OpenKh.Tools.ModsManager.exe"), paths);
+        Assert.DoesNotContain(Path.Combine(_rootDirectory, "mods-manager.yml"), paths);
+        Assert.DoesNotContain(Path.Combine(_rootDirectory, "mods-KH2.txt"), paths);
+        Assert.DoesNotContain(Path.Combine(_rootDirectory, "mods"), paths);
+        Assert.DoesNotContain(Path.Combine(_rootDirectory, "data"), paths);
+        Assert.DoesNotContain(Path.Combine(_rootDirectory, "presets"), paths);
+    }
+
+    [Fact]
+    public void UpdateEnvironmentFindsLauncherAndPackagedVersion()
+    {
+        var applicationRoot = Path.Combine(_rootDirectory, "release");
+        var appsDirectory = Path.Combine(applicationRoot, "Apps");
+        var dataDirectory = Path.Combine(_rootDirectory, "data-root");
+        Directory.CreateDirectory(appsDirectory);
+        Directory.CreateDirectory(dataDirectory);
+        var launcherName = OperatingSystem.IsWindows() ? "OpenKh.Launcher.exe" : "OpenKh.Launcher";
+        var launcherPath = Path.Combine(applicationRoot, launcherName);
+        File.WriteAllText(launcherPath, "launcher");
+        File.WriteAllText(Path.Combine(applicationRoot, "openkh-release"), "release2-test");
+
+        Assert.Equal(applicationRoot, OpenKhUpdateEnvironment.FindApplicationRoot(appsDirectory));
+        Assert.Equal(
+            applicationRoot,
+            OpenKhUpdateEnvironment.FindVersionDirectory(dataDirectory, appsDirectory));
+        Assert.Equal(launcherPath, OpenKhUpdateEnvironment.FindLauncher(dataDirectory, appsDirectory));
+    }
+
+    [Fact]
+    public void ExtractedGameDataIsDetectedUsingGameSpecificFiles()
+    {
+        var dataDirectory = Path.Combine(_rootDirectory, "data");
+        Directory.CreateDirectory(Path.Combine(dataDirectory, "kh1"));
+        Directory.CreateDirectory(Path.Combine(dataDirectory, "bbs", "message"));
+        Directory.CreateDirectory(Path.Combine(dataDirectory, "Recom", "SYS"));
+        File.WriteAllText(Path.Combine(dataDirectory, "kh1", "btltbl.bin"), "data");
+        File.WriteAllText(Path.Combine(dataDirectory, "unrelated.txt"), "not game data");
+
+        var games = GameDataDetectionService.FindExtractedGames(dataDirectory);
+
+        Assert.Equal(["kh1", "bbs", "Recom"], games.Select(game => game.Id));
+    }
+
+    [Fact]
+    public async Task PanaceaUsesUnsavedSetupPathAndCanBeRemoved()
+    {
+        Directory.CreateDirectory(_rootDirectory);
+        var gameDirectory = Path.Combine(_rootDirectory, "game");
+        Directory.CreateDirectory(gameDirectory);
+        File.WriteAllText(
+            Path.Combine(_rootDirectory, "OpenKH.Panacea.dll"),
+            "Welcome to OpenKH Panacea! current loader");
+        File.WriteAllText(Path.Combine(_rootDirectory, "openkh-release"), "release2-test");
+        foreach (var dependency in PanaceaDependencies)
+            File.WriteAllText(Path.Combine(_rootDirectory, dependency), dependency);
+        var service = CreateConfigurationService();
+        var compiledModsDirectory = Path.Combine(_rootDirectory, "custom-build");
+        service.Current.GameModPath = compiledModsDirectory;
+        var panacea = new PanaceaService(service);
+
+        await panacea.InstallAsync(false, gameDirectory);
+
+        var installedStatus = panacea.GetStatus(false, gameDirectory);
+        Assert.True(installedStatus.IsInstalled);
+        Assert.Contains("Panacea version OpenKH release2-test", installedStatus.Message);
+        Assert.True(File.Exists(Path.Combine(gameDirectory, OperatingSystem.IsWindows() ? "DBGHELP.dll" : "version.dll")));
+        Assert.Equal(gameDirectory, service.Current.PcReleaseLocation);
+        Assert.Contains(
+            $"mod_path={PanaceaPath.ToLoaderPath(compiledModsDirectory)}",
+            File.ReadAllLines(Path.Combine(gameDirectory, "panacea_settings.txt")));
+
+        await panacea.RemoveAsync(false, gameDirectory);
+
+        Assert.False(panacea.GetStatus(false, gameDirectory).IsInstalled);
+    }
+
+    [Fact]
+    public async Task PanaceaCanRemoveAnOlderInstallationWithoutSourceFiles()
+    {
+        var gameDirectory = Path.Combine(_rootDirectory, "game");
+        var dependencyDirectory = Path.Combine(gameDirectory, "dependencies");
+        Directory.CreateDirectory(dependencyDirectory);
+        var loaderPath = Path.Combine(
+            gameDirectory,
+            OperatingSystem.IsWindows() ? "DBGHELP.dll" : "version.dll");
+        File.WriteAllText(loaderPath, "Welcome to OpenKH Panacea! older loader");
+        foreach (var dependency in PanaceaDependencies)
+            File.WriteAllText(Path.Combine(dependencyDirectory, dependency), "older dependency");
+        File.WriteAllText(Path.Combine(gameDirectory, "panacea_settings.txt"), "show_console=false");
+        var service = CreateConfigurationService();
+        var panacea = new PanaceaService(service);
+
+        var installedStatus = panacea.GetStatus(false, gameDirectory);
+        Assert.True(installedStatus.IsInstalled);
+        Assert.Contains("source files unavailable", installedStatus.Message);
+
+        await panacea.RemoveAsync(false, gameDirectory);
+
+        Assert.False(File.Exists(loaderPath));
+        Assert.False(Directory.Exists(dependencyDirectory));
+        Assert.False(File.Exists(Path.Combine(gameDirectory, "panacea_settings.txt")));
+        Assert.False(panacea.GetStatus(false, gameDirectory).IsInstalled);
+    }
+
+    [Theory]
+    [InlineData("Steam", true, true, true)]
+    [InlineData("Steam", false, true, true)]
+    [InlineData("Steam", true, false, false)]
+    [InlineData("Steam", false, false, true)]
+    [InlineData("EGS", false, true, false)]
+    public void GameLaunchPolicyUsesSteamForEveryLinuxSteamLaunch(
+        string pcVersion,
+        bool directLaunchConfigured,
+        bool isLinux,
+        bool expected)
+    {
+        Assert.Equal(
+            expected,
+            GameLaunchPolicy.ShouldUseSteamClient(pcVersion, directLaunchConfigured, isLinux));
+    }
+
+    [Fact]
+    public void SteamAppIdCanBeCreatedAndRemoved()
+    {
+        var gameDirectory = Path.Combine(_rootDirectory, "steam-game");
+        Directory.CreateDirectory(gameDirectory);
+        var service = new SteamAppIdService();
+
+        service.Install(gameDirectory, false);
+
+        Assert.True(service.IsInstalled(gameDirectory, false));
+        Assert.Equal("2552430", File.ReadAllText(Path.Combine(gameDirectory, "steam_appid.txt")));
+
+        service.Remove(gameDirectory, false);
+
+        Assert.False(File.Exists(Path.Combine(gameDirectory, "steam_appid.txt")));
+    }
+
+    [Fact]
+    public void PresetsSaveLoadAndRemoveEnabledMods()
+    {
+        var presets = new PresetService(CreateConfigurationService());
+
+        presets.Save("Boss practice", ["OpenKH/example", "local-tools"]);
+
+        Assert.Contains("Boss practice", presets.GetNames());
+        Assert.Equal(["OpenKH/example", "local-tools"], presets.Load("Boss practice"));
+
+        presets.Remove("Boss practice");
+        Assert.DoesNotContain("Boss practice", presets.GetNames());
+    }
+
+    [Fact]
+    public void CreatorWritesValidModMetadata()
+    {
+        var directory = Path.Combine(_rootDirectory, "created-mod");
+        var path = new ModCreatorService().Create(
+            directory,
+            "Example Mod",
+            "OpenKH Community",
+            "Example description",
+            GameInfo.FromId("kh2"));
+
+        using var stream = File.OpenRead(path);
+        var metadata = Metadata.Read(stream);
+        Assert.Equal("Example Mod", metadata.Title);
+        Assert.Equal("OpenKH Community", metadata.OriginalAuthor);
+        Assert.Equal("kh2", metadata.Game);
+        Assert.Empty(metadata.Assets);
+    }
+
+    [Fact]
+    public void CreatorCanAppendFilesAndPersistPreferences()
+    {
+        var gameData = Path.Combine(_rootDirectory, "data");
+        var sourceFile = Path.Combine(gameData, "msg", "en", "example.bar");
+        Directory.CreateDirectory(Path.GetDirectoryName(sourceFile)!);
+        File.WriteAllText(sourceFile, "game data");
+        var modDirectory = Path.Combine(_rootDirectory, "creator-mod");
+        var configuration = CreateConfigurationService();
+        var creator = new ModCreatorService(configuration);
+        creator.Create(modDirectory, "Creator Mod", "OpenKH", "Description", GameInfo.FromId("kh2"));
+
+        creator.AppendCopyFiles(modDirectory, gameData, ["msg/en/example.bar"]);
+        creator.SavePreference(new CreatorPreference
+        {
+            Label = "KH2 workflow",
+            ModDirectory = modDirectory,
+            GameDataPath = gameData,
+            DiffToolPath = "diff-tool"
+        });
+
+        using var stream = File.OpenRead(Path.Combine(modDirectory, "mod.yml"));
+        var metadata = Metadata.Read(stream);
+        var asset = Assert.Single(metadata.Assets);
+        Assert.Equal("copy", asset.Method);
+        Assert.Equal("msg/en/example.bar", asset.Name);
+        Assert.True(File.Exists(Path.Combine(modDirectory, "msg", "en", "example.bar")));
+        Assert.Equal("KH2 workflow", Assert.Single(creator.GetPreferences()).Label);
+    }
+
+    [Fact]
+    public void LuaBackendConfigurationUsesOpenKhScriptsAndCanBeRemoved()
+    {
+        var gameDirectory = Path.Combine(_rootDirectory, "lua-game");
+        Directory.CreateDirectory(gameDirectory);
+        File.WriteAllText(Path.Combine(gameDirectory, "LuaBackend.dll"), "backend");
+        File.WriteAllText(
+            Path.Combine(gameDirectory, "LuaBackend.toml"),
+            "[kh2]\nscripts = [{ path = \"scripts/kh2/\", relative = true }]\n" +
+            "game_docs = \"Documents/KINGDOM HEARTS HD 1.5+2.5 ReMIX\"\n" +
+            "# game_docs = \"My Games/KINGDOM HEARTS HD 1.5+2.5 ReMIX\"\n");
+        var configuration = CreateConfigurationService();
+        var service = new LuaBackendService(configuration);
+
+        service.Configure(gameDirectory, [GameInfo.FromId("kh2")], true);
+
+        var text = File.ReadAllText(Path.Combine(gameDirectory, "LuaBackend.toml"));
+        var expectedScripts = Path.Combine(configuration.GetGameModOutputDirectory(GameInfo.FromId("kh2")), "scripts")
+            .Replace("\\", "/");
+        Assert.Contains(expectedScripts, text);
+        Assert.Contains("[kh2]\nscripts =", text.Replace("\r\n", "\n"));
+        Assert.DoesNotContain("[kh2]scripts =", text);
+        Assert.Contains("game_docs = \"My Games/", text);
+        Assert.True(service.IsInstalled(gameDirectory));
+
+        service.Remove(gameDirectory);
+
+        Assert.False(service.IsInstalled(gameDirectory));
+    }
+
+    [Fact]
+    public void LuaBackendConfigurationPreservesScriptsIndentation()
+    {
+        var gameDirectory = Path.Combine(_rootDirectory, "lua-indentation");
+        Directory.CreateDirectory(gameDirectory);
+        File.WriteAllText(
+            Path.Combine(gameDirectory, "LuaBackend.toml"),
+            "[kh1]\r\n  scripts = [{ path = \"scripts/kh1/\", relative = true }]\r\n" +
+            "exe = \"KINGDOM HEARTS FINAL MIX.exe\"\r\n");
+        var service = new LuaBackendService(CreateConfigurationService());
+
+        service.Configure(gameDirectory, [GameInfo.FromId("kh1")], false);
+
+        var text = File.ReadAllText(Path.Combine(gameDirectory, "LuaBackend.toml"));
+        Assert.Contains("[kh1]\r\n  scripts =", text);
+        Assert.DoesNotContain("[kh1]scripts =", text);
+    }
+
+    [Fact]
+    public void LuaBackendConfigurationRepairsJoinedSectionHeader()
+    {
+        var gameDirectory = Path.Combine(_rootDirectory, "lua-joined-header");
+        Directory.CreateDirectory(gameDirectory);
+        File.WriteAllText(
+            Path.Combine(gameDirectory, "LuaBackend.toml"),
+            "[kh2]scripts = [{ path = \"scripts/kh2/\", relative = true }]\n" +
+            "exe = \"KINGDOM HEARTS II FINAL MIX.exe\"\n");
+        var service = new LuaBackendService(CreateConfigurationService());
+
+        service.Configure(gameDirectory, [GameInfo.FromId("kh2")], false);
+
+        var text = File.ReadAllText(Path.Combine(gameDirectory, "LuaBackend.toml"));
+        Assert.Contains("[kh2]\nscripts =", text.Replace("\r\n", "\n"));
+        Assert.DoesNotContain("[kh2]scripts =", text);
+    }
+
+    [Fact]
+    public void LuaBackendConfigurationReplacesMultilineScriptsArrayAndRemainsValid()
+    {
+        var gameDirectory = Path.Combine(_rootDirectory, "lua-multiline");
+        Directory.CreateDirectory(gameDirectory);
+        File.WriteAllText(
+            Path.Combine(gameDirectory, "LuaBackend.toml"),
+            "[kh2]\r\n" +
+            "scripts = [\r\n" +
+            "  { path = \"scripts/kh2/\", relative = true },\r\n" +
+            "  { path = \"C:/old/scripts\", relative = false },\r\n" +
+            "]\r\n" +
+            "exe = \"KINGDOM HEARTS II FINAL MIX.exe\"\r\n" +
+            "\r\n[bbs]\r\n" +
+            "scripts = [{ path = \"scripts/bbs/\", relative = true }]\r\n");
+        var service = new LuaBackendService(CreateConfigurationService());
+
+        service.Configure(gameDirectory, [GameInfo.FromId("kh2")], false);
+        service.Configure(gameDirectory, [GameInfo.FromId("kh2")], false);
+
+        var text = File.ReadAllText(Path.Combine(gameDirectory, "LuaBackend.toml"));
+        var normalized = text.Replace("\r\n", "\n");
+        Assert.Contains("[kh2]\nscripts =", normalized);
+        Assert.DoesNotContain("[kh2]scripts =", normalized);
+        Assert.DoesNotContain("C:/old/scripts", normalized);
+        Assert.Contains("\nexe = \"KINGDOM HEARTS II FINAL MIX.exe\"", normalized);
+        Assert.Contains("[bbs]\nscripts =", normalized);
+    }
+
+    [Fact]
+    public async Task FastRestoreOnlyRemovesGeneratedModOutput()
+    {
+        var configuration = CreateConfigurationService();
+        var game = GameInfo.FromId("kh2");
+        var output = configuration.GetGameModOutputDirectory(game);
+        Directory.CreateDirectory(output);
+        File.WriteAllText(Path.Combine(output, "generated.bin"), "generated");
+
+        await new PcPackagePatchService(configuration).RestoreAsync(game, false);
+
+        Assert.False(Directory.Exists(output));
+    }
+
+    [Fact]
+    public async Task OnlineCatalogUsesOfficialFeedImagesAndDenyList()
+    {
+        var handler = new CatalogHttpHandler();
+        using var client = new HttpClient(handler);
+        var cacheDirectory = Path.Combine(_rootDirectory, "online-cache");
+        var service = new OnlineModCatalogService(CreateConfigurationService(), client, cacheDirectory);
+
+        var mods = await service.LoadAsync(GameInfo.FromId("kh2"), ["Owner/Installed"]);
+
+        var mod = Assert.Single(mods);
+        Assert.Equal("Owner/Visible", mod.Repository);
+        Assert.Equal("Visible Mod", mod.Title);
+        Assert.True(File.Exists(mod.IconPath));
+        Assert.True(File.Exists(mod.PreviewPath));
+    }
+
+    public void Dispose()
+    {
+        if (Directory.Exists(_rootDirectory))
+            Directory.Delete(_rootDirectory, true);
+    }
+
+    private ModManagerConfigurationService CreateConfigurationService() => new(
+        InstallationLayout.Detect("ignored", ["--data-root", _rootDirectory]));
+
+    private sealed class CatalogHttpHandler : HttpMessageHandler
+    {
+        protected override Task<HttpResponseMessage> SendAsync(
+            HttpRequestMessage request,
+            CancellationToken cancellationToken)
+        {
+            var path = request.RequestUri?.AbsoluteUri ?? string.Empty;
+            if (path.EndsWith("downloadable-mods.json", StringComparison.Ordinal))
+            {
+                return Response("""
+                    {"mods":{"kh2":[
+                      {"repo":"Owner/Visible"},
+                      {"repo":"Owner/Denied"},
+                      {"repo":"Owner/Installed"}
+                    ]}}
+                    """);
+            }
+            if (path.EndsWith("deny.txt", StringComparison.Ordinal))
+                return Response("Owner/Denied\n");
+            if (path.EndsWith("mod.yml", StringComparison.Ordinal) && path.Contains("Owner/Visible", StringComparison.Ordinal))
+            {
+                return Response("title: Visible Mod\noriginalAuthor: Test Author\ndescription: Test description\ngame: kh2\nassets: []\n");
+            }
+            if (path.EndsWith("icon.png", StringComparison.Ordinal) ||
+                path.EndsWith("preview.png", StringComparison.Ordinal))
+            {
+                return Task.FromResult(new HttpResponseMessage(HttpStatusCode.OK)
+                {
+                    Content = new ByteArrayContent([1, 2, 3, 4])
+                });
+            }
+
+            return Task.FromResult(new HttpResponseMessage(HttpStatusCode.NotFound));
+        }
+
+        private static Task<HttpResponseMessage> Response(string content) => Task.FromResult(
+            new HttpResponseMessage(HttpStatusCode.OK)
+            {
+                Content = new StringContent(content, Encoding.UTF8)
+            });
+    }
+}
diff --git a/OpenKh.Tests.ModsManager.Core/SpatialNavigationTests.cs b/OpenKh.Tests.ModsManager.Core/SpatialNavigationTests.cs
new file mode 100644
index 000000000..9dccc0972
--- /dev/null
+++ b/OpenKh.Tests.ModsManager.Core/SpatialNavigationTests.cs
@@ -0,0 +1,86 @@
+using Avalonia;
+using Avalonia.Input;
+using OpenKh.Tools.ModsManager.Avalonia.Services;
+using Xunit;
+
+namespace OpenKh.Tests.ModsManager.Core;
+
+public class SpatialNavigationTests
+{
+    [Fact]
+    public void BrowseGridMovesDownWithinTheSameColumn()
+    {
+        var source = new Rect(200, 0, 180, 220);
+        var candidates = new[]
+        {
+            new Rect(0, 240, 180, 220),
+            new Rect(200, 240, 180, 220),
+            new Rect(400, 240, 180, 220)
+        };
+
+        Assert.Equal(1, SpatialNavigation.FindNearest(source, candidates, NavigationDirection.Down));
+    }
+
+    [Theory]
+    [InlineData(NavigationDirection.Left, 0)]
+    [InlineData(NavigationDirection.Right, 1)]
+    [InlineData(NavigationDirection.Up, 2)]
+    [InlineData(NavigationDirection.Down, 3)]
+    public void GridMovesToTheNearestControlInEveryDirection(NavigationDirection direction, int expected)
+    {
+        var source = new Rect(200, 200, 180, 180);
+        var candidates = new[]
+        {
+            new Rect(0, 200, 180, 180),
+            new Rect(400, 200, 180, 180),
+            new Rect(200, 0, 180, 180),
+            new Rect(200, 400, 180, 180)
+        };
+
+        Assert.Equal(expected, SpatialNavigation.FindNearest(source, candidates, direction));
+    }
+
+    [Fact]
+    public void MainMenuCanReachTheInstalledModList()
+    {
+        var menuButton = new Rect(0, 300, 220, 60);
+        var candidates = new[]
+        {
+            new Rect(300, 0, 800, 60),
+            new Rect(300, 240, 600, 180),
+            new Rect(950, 650, 280, 60)
+        };
+
+        Assert.Equal(1, SpatialNavigation.FindNearest(menuButton, candidates, NavigationDirection.Right));
+    }
+
+    [Fact]
+    public void SetupUsesHorizontalAndVerticalNeighbours()
+    {
+        var folderInput = new Rect(0, 100, 800, 50);
+        var candidates = new[]
+        {
+            new Rect(820, 100, 120, 50),
+            new Rect(0, 180, 220, 50),
+            new Rect(820, 180, 120, 50)
+        };
+
+        Assert.Equal(0, SpatialNavigation.FindNearest(folderInput, candidates, NavigationDirection.Right));
+        Assert.Equal(1, SpatialNavigation.FindNearest(folderInput, candidates, NavigationDirection.Down));
+    }
+
+    [Fact]
+    public void BrowseGridCanReachTheDetailsAction()
+    {
+        var rightmostCard = new Rect(400, 0, 180, 220);
+        var candidates = new[]
+        {
+            new Rect(0, 240, 180, 220),
+            new Rect(200, 240, 180, 220),
+            new Rect(400, 240, 180, 220),
+            new Rect(700, 500, 320, 60)
+        };
+
+        Assert.Equal(3, SpatialNavigation.FindNearest(rightmostCard, candidates, NavigationDirection.Right));
+    }
+}
diff --git a/OpenKh.Tests.ModsManager/GameDataExtractionServiceTest.cs b/OpenKh.Tests.ModsManager/GameDataExtractionServiceTest.cs
deleted file mode 100644
index d6a305d71..000000000
--- a/OpenKh.Tests.ModsManager/GameDataExtractionServiceTest.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-using OpenKh.Tools.ModsManager.Services;
-
-namespace OpenKh.Tests.ModsManager
-{
-    public class GameDataExtractionServiceTest
-    {
-        private readonly GameDataExtractionService _gameDataExtractionService = new GameDataExtractionService();
-
-        //[Fact]
-        public async Task ExtractKh2Ps2EditionAsyncTest()
-        {
-            await _gameDataExtractionService.ExtractKh2Ps2EditionAsync(
-                isoLocation: @"H:\CCD\KH2fm.ISO",
-                gameDataLocation: @"H:\Tmp\ModsManagerExtractionRoot",
-                onProgress: (progress) => Console.WriteLine($"{progress:P}")
-            );
-        }
-
-        //[Fact]
-        public async Task ExtractKhPcEditionAsyncTest()
-        {
-            var pcReleaseLocation = @"H:\Program Files\Epic Games/KH_1.5_2.5";
-            var pcReleaseLocationKH3D = @"H:\Program Files\Epic Games/KH_2.8";
-            var pcReleaseLanguage = "jp";
-            var langFolder = (ConfigurationService.PCVersion == "Steam" && pcReleaseLanguage == "en") ? "dt" : pcReleaseLanguage;
-
-            await _gameDataExtractionService.ExtractKhPcEditionAsync(
-                gameDataLocation: @"H:\Tmp\ModsManagerPcExtractionRoot",
-                onProgress: (progress) => Console.WriteLine($"{progress:P}"),
-                getKhFilePath: fileName
-                    => Path.Combine(
-                        pcReleaseLocation,
-                        "Image",
-                        langFolder,
-                        fileName
-                    ),
-                getKh3dFilePath: fileName
-                    => Path.Combine(
-                        pcReleaseLocationKH3D,
-                        "Image",
-                        langFolder,
-                        fileName
-                    ),
-                extractkh1: true,
-                extractkh2: true,
-                extractbbs: true,
-                extractrecom: true,
-                extractkh3d: true,
-                ifRetry: ex => Task.FromResult(false),
-                cancellationToken: CancellationToken.None
-            );
-        }
-    }
-}
diff --git a/OpenKh.Tests.ModsManager/ModsServiceTest.cs b/OpenKh.Tests.ModsManager/ModsServiceTest.cs
deleted file mode 100644
index 0771c913e..000000000
--- a/OpenKh.Tests.ModsManager/ModsServiceTest.cs
+++ /dev/null
@@ -1,165 +0,0 @@
-using OpenKh.Tools.ModsManager.Services;
-using Xunit;
-using Xunit.Abstractions;
-
-namespace OpenKh.Tests.ModsManager
-{
-    [Collection("Sequential")]
-    public class ModsServiceTest : IDisposable
-    {
-        private readonly ITestOutputHelper output;
-
-        public ModsServiceTest(ITestOutputHelper output)
-        {
-            this.output = output;
-        }
-
-        public void Dispose()
-        {
-            try
-            {
-                DeleteDir(Path.Combine(ConfigurationService.InstalledModsPath, "test"));
-            }
-            catch (Exception e)
-            {
-                output.WriteLine(e.Message);
-            }
-            try
-            {
-                DeleteDir(Path.Combine(ConfigurationService.InstalledCollectionsPath, "test"));
-            }
-            catch (Exception e)
-            {
-                output.WriteLine(e.Message);
-            }
-            try
-            {
-                File.Delete(Path.Combine(ConfigurationService.PresetPath, "..", "mods-KH2.txt"));
-            }
-            catch (Exception e)
-            {
-                output.WriteLine(e.Message);
-            }
-            GC.SuppressFinalize(this);
-        }
-
-        private void AddMod()
-        {
-            var modDir = ConfigurationService.InstalledModsPath;
-            Directory.CreateDirectory(Path.Combine(modDir, "test/test"));
-            using (File.Create(Path.Combine(modDir, "test/test/mod.yml"))) { }
-        }
-
-        private void EnableMod()
-        {
-            ConfigurationService.EnabledMods = new List<string> { "test/test" };
-        }
-
-        private void AddCollectionMod()
-        {
-            var modDir = ConfigurationService.InstalledCollectionsPath;
-            Directory.CreateDirectory(Path.Combine(modDir, "test/test"));
-            using (File.Create(Path.Combine(modDir, "test/test/mod.yml")))
-            { }
-        }
-
-        private static void DeleteDir(string target)
-        {
-            string[] files = Directory.GetFiles(target);
-            string[] dirs = Directory.GetDirectories(target);
-
-            foreach (string file in files)
-            {
-                File.SetAttributes(file, FileAttributes.Normal);
-                File.Delete(file);
-            }
-
-            foreach (string dir in dirs)
-            {
-                DeleteDir(dir);
-            }
-
-            Directory.Delete(target, false);
-        }
-
-        [Fact]
-        public void ModsServiceNoModsTest()
-	    {
-            var mods = ModsService.Mods;
-            Assert.Empty(mods);
-        }
-
-        [Fact]
-        public void ModsServiceModsOneStandardTest()
-        {
-            AddMod();
-            var mods = ModsService.Mods;
-            Assert.Single(mods);
-            Dispose();
-        }
-
-        [Fact]
-        public void ModsServiceModsOneCollectionTest()
-        {
-            AddCollectionMod();
-            var mods = ModsService.Mods;
-            Assert.Single(mods);
-            Dispose();
-        }
-
-        [Fact]
-        public void ModsServiceUnorderedModsEmptyTest()
-        {
-            var mods = ModsService.UnorderedMods;
-            Assert.Empty(mods);
-        }
-
-        [Fact]
-        public void ModsServiceUnorderedModsOneStandardTest()
-        {
-            AddMod();
-            var mods = ModsService.UnorderedMods;
-            Assert.Single(mods);
-            Dispose();
-        }
-
-        [Fact]
-        public void ModsServiceUnorderedModsOneCollectionTest()
-        {
-            AddCollectionMod();
-            var mods = ModsService.UnorderedMods;
-            Assert.Single(mods);
-            Dispose();
-        }
-
-        [Fact]
-        public void ModsServiceNoEnabledModsTest()
-        {
-            var mods = ModsService.EnabledMods;
-            Assert.Empty(mods);
-        }
-
-        [Fact]
-        public void ModsServiceEnabledModsTest()
-        {
-            AddMod();
-            EnableMod();
-            var mods = ModsService.EnabledMods;
-            Assert.Single(mods);
-            Dispose();
-        }
-
-        [Fact]
-        public void ModsServiceIsModBlockedFalse()
-        {
-            Assert.False(ModsService.IsModBlocked("test/test"));
-        }
-
-        [Fact]
-        public void ModsServiceIsUserBlockedFalse()
-        {
-            Assert.False(ModsService.IsUserBlocked("test/test"));
-        }
-    }
-}
-
diff --git a/OpenKh.Tests.ModsManager/OpenKh.Tests.ModsManager.csproj b/OpenKh.Tests.ModsManager/OpenKh.Tests.ModsManager.csproj
deleted file mode 100644
index 09b7c1840..000000000
--- a/OpenKh.Tests.ModsManager/OpenKh.Tests.ModsManager.csproj
+++ /dev/null
@@ -1,26 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <TargetFramework>net8.0-windows</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
-
-        <IsPackable>false</IsPackable>
-        <IsPublishable>false</IsPublishable>
-    </PropertyGroup>
-
-    <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
-        <PackageReference Include="NSubstitute" Version="5.1.0" />
-        <PackageReference Include="xunit" Version="2.9.0" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>
-        <PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <ProjectReference Include="../OpenKh.Tools.ModsManager/OpenKh.Tools.ModsManager.csproj" />
-    </ItemGroup>
-</Project>
diff --git a/OpenKh.Tests.ModsManager/OpenkhInstallationTest.cs b/OpenKh.Tests.ModsManager/OpenkhInstallationTest.cs
deleted file mode 100644
index bdf9d11ad..000000000
--- a/OpenKh.Tests.ModsManager/OpenkhInstallationTest.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-using OpenKh.Tools.ModsManager.Services;
-using Xunit;
-
-namespace OpenKh.Tests.ModsManager
-{
-    public class OpenkhInstallationTest
-    {
-        [Theory]
-        [InlineData(@"C:\OpenKh", @"C:\OpenKh")]
-        [InlineData(@"C:\OpenKh\Apps", @"C:\OpenKh")]
-        [InlineData(@"C:\OpenKh\apps", @"C:\OpenKh")]
-        [InlineData(@"C:\OpenKh\Apps\ModManager", @"C:\OpenKh")]
-        [InlineData(@"C:\OpenKh\apps\modmanager", @"C:\OpenKh")]
-        public void GetDirectoryReturnsInstallationRoot(string applicationDirectory, string expectedDirectory)
-        {
-            Assert.Equal(
-                Path.GetFullPath(expectedDirectory),
-                OpenkhInstallation.GetDirectory(applicationDirectory),
-                ignoreCase: true
-            );
-        }
-
-        [Fact]
-        public void GetModManagerExecutableSupportsCurrentAndPreviousLayouts()
-        {
-            var installationDirectory = Path.Combine(
-                Path.GetTempPath(),
-                $"openkh-installation-{Guid.NewGuid():N}"
-            );
-            var rootExecutable = Path.Combine(installationDirectory, "OpenKh.Tools.ModsManager.exe");
-            var previousExecutable = Path.Combine(
-                installationDirectory,
-                "Apps",
-                "ModManager",
-                "OpenKh.Tools.ModsManager.exe"
-            );
-            var currentExecutable = Path.Combine(
-                installationDirectory,
-                "Apps",
-                "OpenKh.Tools.ModsManager.exe"
-            );
-
-            try
-            {
-                Directory.CreateDirectory(installationDirectory);
-                File.WriteAllText(rootExecutable, string.Empty);
-                Assert.Equal(rootExecutable, OpenkhInstallation.GetModManagerExecutable(installationDirectory));
-
-                Directory.CreateDirectory(Path.GetDirectoryName(previousExecutable)!);
-                File.WriteAllText(previousExecutable, string.Empty);
-                Assert.Equal(previousExecutable, OpenkhInstallation.GetModManagerExecutable(installationDirectory));
-
-                File.WriteAllText(currentExecutable, string.Empty);
-                Assert.Equal(currentExecutable, OpenkhInstallation.GetModManagerExecutable(installationDirectory));
-            }
-            finally
-            {
-                if (Directory.Exists(installationDirectory))
-                    Directory.Delete(installationDirectory, recursive: true);
-            }
-        }
-    }
-}
diff --git a/OpenKh.Tests/Patcher/PatcherTests.cs b/OpenKh.Tests/Patcher/PatcherTests.cs
index 891f157e1..07e375862 100644
--- a/OpenKh.Tests/Patcher/PatcherTests.cs
+++ b/OpenKh.Tests/Patcher/PatcherTests.cs
@@ -70,6 +70,59 @@ public void Kh2CopyBinariesTest()
             AssertFileExists(ModOutputDir, patch.Assets[0].Name);
         }
 
+        [Fact]
+        public void Kh2CopyBinariesAcceptsWindowsSeparatorsOnEveryPlatform()
+        {
+            var patcher = new PatcherProcessor();
+            var packageMap = new Dictionary<string, string>();
+            var progressValues = new List<(int Value, int Maximum)>();
+            var patch = new Metadata
+            {
+                Assets = new List<AssetFile>
+                {
+                    new AssetFile
+                    {
+                        Name = "somedir\\nested\\somefile.bin",
+                        Multi = new List<Multi>
+                        {
+                            new Multi
+                            {
+                                Name = "somedir\\nested\\second.bin"
+                            }
+                        },
+                        Method = "copy",
+                        Source = new List<AssetFile>
+                        {
+                            new AssetFile
+                            {
+                                Name = "somedir\\nested\\somefile.bin"
+                            }
+                        }
+                    }
+                }
+            };
+
+            CreateFile(ModInputDir, "somedir", "nested", "somefile.bin").Dispose();
+
+            patcher.Patch(
+                AssetsInputDir,
+                ModOutputDir,
+                patch,
+                ModInputDir,
+                platform: 2,
+                packageMap: packageMap,
+                LaunchGame: "kh2",
+                Tests: true,
+                progress: (value, maximum) => progressValues.Add((value, maximum)));
+
+            AssertFileExists(ModOutputDir, "somedir", "nested", "somefile.bin");
+            AssertFileExists(ModOutputDir, "somedir", "nested", "second.bin");
+            Assert.Equal(
+                "kh2_first/original/somedir/nested/somefile.bin",
+                packageMap["somedir/nested/somefile.bin"]);
+            Assert.Equal([(1, 2), (2, 2)], progressValues);
+        }
+
         [Fact]
         public void Kh2CreateBinArcIfSourceDoesntExistsTest()
         {
diff --git a/OpenKh.Tools.Common/ProcessStream.cs b/OpenKh.Tools.Common/ProcessStream.cs
index 5b74258e7..3f4507559 100644
--- a/OpenKh.Tools.Common/ProcessStream.cs
+++ b/OpenKh.Tools.Common/ProcessStream.cs
@@ -1,3 +1,4 @@
+#nullable disable
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
diff --git a/OpenKh.Tools.Launcher/App.axaml b/OpenKh.Tools.Launcher/App.axaml
new file mode 100644
index 000000000..923b2ccad
--- /dev/null
+++ b/OpenKh.Tools.Launcher/App.axaml
@@ -0,0 +1,45 @@
+<Application xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             x:Class="OpenKh.Tools.Launcher.App"
+             RequestedThemeVariant="Dark">
+  <Application.Styles>
+    <FluentTheme />
+    <Style Selector="Window">
+      <Setter Property="Background" Value="#0D1420" />
+      <Setter Property="FontFamily" Value="avares://Avalonia.Fonts.Inter/Assets#Inter" />
+    </Style>
+    <Style Selector="Button">
+      <Setter Property="MinHeight" Value="44" />
+      <Setter Property="Padding" Value="18,10" />
+      <Setter Property="CornerRadius" Value="8" />
+      <Setter Property="FontWeight" Value="SemiBold" />
+      <Setter Property="HorizontalContentAlignment" Value="Center" />
+      <Setter Property="VerticalContentAlignment" Value="Center" />
+    </Style>
+    <Style Selector="Button.primary">
+      <Setter Property="Background" Value="#3978E6" />
+      <Setter Property="Foreground" Value="White" />
+    </Style>
+    <Style Selector="Button.secondary">
+      <Setter Property="Background" Value="#27364D" />
+      <Setter Property="Foreground" Value="White" />
+      <Setter Property="BorderBrush" Value="#3D506E" />
+      <Setter Property="BorderThickness" Value="1" />
+    </Style>
+    <Style Selector="Button.link">
+      <Setter Property="MinHeight" Value="28" />
+      <Setter Property="Padding" Value="4" />
+      <Setter Property="Background" Value="Transparent" />
+      <Setter Property="Foreground" Value="#8FB9F8" />
+    </Style>
+    <Style Selector="TextBox">
+      <Setter Property="MinHeight" Value="44" />
+      <Setter Property="Padding" Value="12,0" />
+      <Setter Property="CornerRadius" Value="8" />
+      <Setter Property="Background" Value="#111B29" />
+      <Setter Property="Foreground" Value="#F5F7FB" />
+      <Setter Property="BorderBrush" Value="#334661" />
+      <Setter Property="VerticalContentAlignment" Value="Center" />
+    </Style>
+  </Application.Styles>
+</Application>
diff --git a/OpenKh.Tools.Launcher/App.axaml.cs b/OpenKh.Tools.Launcher/App.axaml.cs
new file mode 100644
index 000000000..1ea97811c
--- /dev/null
+++ b/OpenKh.Tools.Launcher/App.axaml.cs
@@ -0,0 +1,82 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Input;
+using Avalonia.Interactivity;
+using Avalonia.Markup.Xaml;
+using OpenKh.Tools.ModsManager.Avalonia.Services;
+
+namespace OpenKh.Tools.Launcher;
+
+public partial class App : Application
+{
+    private readonly IControllerInputService _controller = new SdlControllerInputService();
+
+    internal IControllerInputService Controller => _controller;
+
+    public override void Initialize()
+    {
+        AvaloniaXamlLoader.Load(this);
+        InputElement.KeyDownEvent.AddClassHandler<Window>(HandleGlobalKeyDown, RoutingStrategies.Tunnel);
+    }
+
+    public override void OnFrameworkInitializationCompleted()
+    {
+        if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
+        {
+            desktop.ShutdownMode = ShutdownMode.OnMainWindowClose;
+
+            if (LegacyInstallationMigration.TryStartModManager())
+            {
+                if (!string.IsNullOrWhiteSpace(LegacyInstallationMigration.LastError))
+                    desktop.MainWindow = new MessageDialog("OpenKH Update", LegacyInstallationMigration.LastError!);
+                else
+                    desktop.Shutdown();
+
+                base.OnFrameworkInitializationCompleted();
+                return;
+            }
+
+            LegacyInstallationMigration.ScheduleCleanupIfNeeded();
+            _controller.Start();
+
+            var mainWindow = new MainWindow(_controller);
+            _controller.ActionTriggered += mainWindow.HandleControllerAction;
+            desktop.MainWindow = mainWindow;
+            desktop.Exit += (_, _) =>
+            {
+                _controller.ActionTriggered -= mainWindow.HandleControllerAction;
+                _controller.Dispose();
+            };
+        }
+
+        base.OnFrameworkInitializationCompleted();
+    }
+
+    private void HandleGlobalKeyDown(Window window, KeyEventArgs eventArgs)
+    {
+        if (eventArgs.KeyModifiers != KeyModifiers.None)
+            return;
+
+        if (eventArgs.Source is TextBox && eventArgs.Key is not Key.Escape)
+            return;
+
+        var action = eventArgs.Key switch
+        {
+            Key.Up => ControllerAction.NavigateUp,
+            Key.Down => ControllerAction.NavigateDown,
+            Key.Left => ControllerAction.NavigateLeft,
+            Key.Right => ControllerAction.NavigateRight,
+            Key.Enter or Key.Space => ControllerAction.Confirm,
+            Key.Escape => ControllerAction.Cancel,
+            Key.F5 => ControllerAction.Refresh,
+            _ => (ControllerAction?)null,
+        };
+
+        if (action is null)
+            return;
+
+        _controller.Dispatch(action.Value);
+        eventArgs.Handled = true;
+    }
+}
diff --git a/OpenKh.Tools.Launcher/App.xaml b/OpenKh.Tools.Launcher/App.xaml
deleted file mode 100644
index 9e16e5150..000000000
--- a/OpenKh.Tools.Launcher/App.xaml
+++ /dev/null
@@ -1,6 +0,0 @@
-<Application x:Class="OpenKh.Tools.Launcher.App"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <Application.Resources>
-    </Application.Resources>
-</Application>
diff --git a/OpenKh.Tools.Launcher/App.xaml.cs b/OpenKh.Tools.Launcher/App.xaml.cs
deleted file mode 100644
index 631bf9eca..000000000
--- a/OpenKh.Tools.Launcher/App.xaml.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System.Windows;
-
-namespace OpenKh.Tools.Launcher;
-
-public partial class App : Application
-{
-    protected override void OnStartup(StartupEventArgs e)
-    {
-        base.OnStartup(e);
-
-        if (LegacyInstallationMigration.TryStartModManager())
-        {
-            Shutdown();
-            return;
-        }
-
-        LegacyInstallationMigration.ScheduleCleanupIfNeeded();
-        new MainWindow().Show();
-    }
-}
diff --git a/OpenKh.Tools.Launcher/DesktopShortcutService.cs b/OpenKh.Tools.Launcher/DesktopShortcutService.cs
index 89a76d3b7..05861f30b 100644
--- a/OpenKh.Tools.Launcher/DesktopShortcutService.cs
+++ b/OpenKh.Tools.Launcher/DesktopShortcutService.cs
@@ -1,12 +1,24 @@
 using System.IO;
 using System.Runtime.InteropServices;
+using System.Text;
 
 namespace OpenKh.Tools.Launcher;
 
 internal static class DesktopShortcutService
 {
-    public static string CreateModManagerShortcut(string targetPath, string? shortcutDirectory = null)
+    public static string CreateModManagerShortcut(
+        string targetPath,
+        string? shortcutDirectory = null) =>
+        CreateModManagerShortcut(targetPath, null, shortcutDirectory);
+
+    public static string CreateModManagerShortcut(
+        string targetPath,
+        IEnumerable<string>? arguments,
+        string? shortcutDirectory = null)
     {
+        if (!OperatingSystem.IsWindows())
+            return CreateLinuxShortcut(targetPath, arguments, shortcutDirectory);
+
         shortcutDirectory ??= Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory);
         var shortcutPath = Path.Combine(shortcutDirectory, "OpenKH Mod Manager.lnk");
         var shellType = Type.GetTypeFromProgID("WScript.Shell")
@@ -28,6 +40,9 @@ public static string CreateModManagerShortcut(string targetPath, string? shortcu
 
             var shortcutType = shortcut.GetType();
             shortcutType.InvokeMember("TargetPath", System.Reflection.BindingFlags.SetProperty, null, shortcut, new object[] { targetPath });
+            var argumentText = string.Join(" ", arguments ?? []);
+            if (argumentText.Length > 0)
+                shortcutType.InvokeMember("Arguments", System.Reflection.BindingFlags.SetProperty, null, shortcut, new object[] { argumentText });
             shortcutType.InvokeMember("WorkingDirectory", System.Reflection.BindingFlags.SetProperty, null, shortcut, new object[] { Path.GetDirectoryName(targetPath)! });
             shortcutType.InvokeMember("Description", System.Reflection.BindingFlags.SetProperty, null, shortcut, new object[] { "Open OpenKH Mod Manager" });
             shortcutType.InvokeMember("IconLocation", System.Reflection.BindingFlags.SetProperty, null, shortcut, new object[] { $"{targetPath},0" });
@@ -43,4 +58,58 @@ public static string CreateModManagerShortcut(string targetPath, string? shortcu
 
         return shortcutPath;
     }
+
+    private static string CreateLinuxShortcut(
+        string targetPath,
+        IEnumerable<string>? arguments,
+        string? shortcutDirectory)
+    {
+        if (string.IsNullOrWhiteSpace(shortcutDirectory))
+        {
+            var desktop = Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory);
+            shortcutDirectory = Directory.Exists(desktop)
+                ? desktop
+                : Path.Combine(
+                    Environment.GetFolderPath(Environment.SpecialFolder.UserProfile),
+                    ".local",
+                    "share",
+                    "applications"
+                );
+        }
+
+        Directory.CreateDirectory(shortcutDirectory);
+        var shortcutPath = Path.Combine(shortcutDirectory, "openkh-mod-manager.desktop");
+        var escapedTarget = EscapeDesktopEntryValue(targetPath);
+        var escapedArguments = string.Join(" ", (arguments ?? []).Select(EscapeDesktopEntryArgument));
+        var exec = escapedArguments.Length == 0
+            ? $"\"{escapedTarget}\""
+            : $"\"{escapedTarget}\" {escapedArguments}";
+        var content = new StringBuilder()
+            .AppendLine("[Desktop Entry]")
+            .AppendLine("Type=Application")
+            .AppendLine("Name=OpenKH Mod Manager")
+            .AppendLine("Comment=Open OpenKH Mod Manager")
+            .AppendLine($"Exec={exec}")
+            .AppendLine($"Path=\"{EscapeDesktopEntryValue(Path.GetDirectoryName(targetPath) ?? string.Empty)}\"")
+            .AppendLine("Terminal=false")
+            .AppendLine("Categories=Game;Utility;")
+            .ToString();
+        File.WriteAllText(shortcutPath, content, new UTF8Encoding(false));
+        if (OperatingSystem.IsLinux() || OperatingSystem.IsFreeBSD())
+        {
+            File.SetUnixFileMode(
+                shortcutPath,
+                UnixFileMode.UserRead | UnixFileMode.UserWrite | UnixFileMode.UserExecute |
+                UnixFileMode.GroupRead | UnixFileMode.GroupExecute |
+                UnixFileMode.OtherRead | UnixFileMode.OtherExecute
+            );
+        }
+        return shortcutPath;
+    }
+
+    private static string EscapeDesktopEntryValue(string value) =>
+        value.Replace("\\", "\\\\").Replace("\"", "\\\"");
+
+    private static string EscapeDesktopEntryArgument(string value) =>
+        $"\"{EscapeDesktopEntryValue(value)}\"";
 }
diff --git a/OpenKh.Tools.Launcher/LegacyInstallationMigration.cs b/OpenKh.Tools.Launcher/LegacyInstallationMigration.cs
index c5590cc1d..540c21f2a 100644
--- a/OpenKh.Tools.Launcher/LegacyInstallationMigration.cs
+++ b/OpenKh.Tools.Launcher/LegacyInstallationMigration.cs
@@ -1,7 +1,6 @@
 using System.Diagnostics;
 using System.IO;
 using System.Text;
-using System.Windows;
 
 namespace OpenKh.Tools.Launcher;
 
@@ -10,6 +9,8 @@ internal static class LegacyInstallationMigration
     private const string LauncherExecutableName = "OpenKh.Launcher.exe";
     private const string CompatibilityExecutableName = "OpenKh.Tools.ModsManager.exe";
 
+    public static string? LastError { get; private set; }
+
     private static readonly string[] PreviousApplicationDirectories =
     {
         "AdvancedTools",
@@ -36,6 +37,7 @@ internal static class LegacyInstallationMigration
 
     public static bool TryStartModManager()
     {
+        LastError = null;
         var processPath = Environment.ProcessPath;
         if (string.IsNullOrWhiteSpace(processPath)
             || !Path.GetFileName(processPath).Equals(CompatibilityExecutableName, StringComparison.OrdinalIgnoreCase))
@@ -60,12 +62,7 @@ public static bool TryStartModManager()
 
         if (!File.Exists(modManagerPath))
         {
-            MessageBox.Show(
-                "The updated Mod Manager could not be found. Extract the latest OpenKH release again.",
-                "OpenKH Update",
-                MessageBoxButton.OK,
-                MessageBoxImage.Error
-            );
+            LastError = "The updated Mod Manager could not be found. Extract the latest OpenKH release again.";
             return true;
         }
 
@@ -87,12 +84,7 @@ public static bool TryStartModManager()
         }
         catch (Exception exception)
         {
-            MessageBox.Show(
-                $"OpenKH could not complete the update.\n\n{exception.Message}",
-                "OpenKH Update",
-                MessageBoxButton.OK,
-                MessageBoxImage.Error
-            );
+            LastError = $"OpenKH could not complete the update.\n\n{exception.Message}";
         }
 
         return true;
@@ -125,6 +117,15 @@ private static void ScheduleCleanupIfNeeded(string installationDirectory)
         if (legacyFiles.Length == 0 && legacyDirectories.Length == 0)
             return;
 
+        if (!OperatingSystem.IsWindows())
+        {
+            foreach (var filePath in legacyFiles)
+                TryDeleteFile(filePath);
+            foreach (var directoryPath in legacyDirectories)
+                TryDeleteDirectory(directoryPath);
+            return;
+        }
+
         var batchPath = Path.Combine(Path.GetTempPath(), $"openkh-migrate-{Guid.NewGuid():N}.bat");
         var batch = new StringBuilder();
 
@@ -161,12 +162,10 @@ private static void ScheduleCleanupIfNeeded(string installationDirectory)
     }
 
     private static bool IsOrganizedInstallation(string installationDirectory) =>
-        File.Exists(Path.Combine(installationDirectory, LauncherExecutableName))
-        && File.Exists(Path.Combine(
-            installationDirectory,
-            "Apps",
-            CompatibilityExecutableName
-        ));
+        (File.Exists(Path.Combine(installationDirectory, LauncherExecutableName))
+            || File.Exists(Path.Combine(installationDirectory, "OpenKh.Launcher")))
+        && (File.Exists(Path.Combine(installationDirectory, "Apps", CompatibilityExecutableName))
+            || File.Exists(Path.Combine(installationDirectory, "Apps", "OpenKh.Tools.ModsManager")));
 
     private static IEnumerable<string> GetLegacyApplicationFiles(string installationDirectory)
     {
@@ -218,4 +217,26 @@ private static bool IsLegacyApplicationFile(string filePath)
     }
 
     private static string EscapeBatchPath(string path) => $"\"{path.Replace("\"", "\"\"")}\"";
+
+    private static void TryDeleteFile(string path)
+    {
+        try
+        {
+            File.Delete(path);
+        }
+        catch (Exception exception) when (exception is IOException or UnauthorizedAccessException)
+        {
+        }
+    }
+
+    private static void TryDeleteDirectory(string path)
+    {
+        try
+        {
+            Directory.Delete(path, recursive: true);
+        }
+        catch (Exception exception) when (exception is IOException or UnauthorizedAccessException)
+        {
+        }
+    }
 }
diff --git a/OpenKh.Tools.Launcher/MainWindow.axaml b/OpenKh.Tools.Launcher/MainWindow.axaml
new file mode 100644
index 000000000..a2c1f8fab
--- /dev/null
+++ b/OpenKh.Tools.Launcher/MainWindow.axaml
@@ -0,0 +1,149 @@
+<Window xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        x:Class="OpenKh.Tools.Launcher.MainWindow"
+        Title="OpenKH Launcher"
+        Width="1100"
+        Height="740"
+        MinWidth="640"
+        MinHeight="560"
+        WindowStartupLocation="CenterScreen"
+        Background="#0D1420"
+        Foreground="#F5F7FB"
+        XYFocus.NavigationModes="Enabled">
+  <Grid RowDefinitions="Auto,*,Auto">
+    <Border Grid.Row="0" Padding="36,22" Background="#111B29" BorderBrush="#26354A" BorderThickness="0,0,0,1">
+      <Grid ColumnDefinitions="*,Auto">
+        <Image Width="210" Height="64" HorizontalAlignment="Left"
+               Source="avares://OpenKh.Launcher/Assets/OpenKH.png" Stretch="Uniform" />
+        <TextBlock Grid.Column="1" Text="LAUNCHER" Foreground="#7890B1" FontSize="13"
+                   FontWeight="SemiBold" VerticalAlignment="Center" />
+      </Grid>
+    </Border>
+
+    <Grid Grid.Row="1" Margin="36,28">
+      <Grid x:Name="HomePanel" RowDefinitions="Auto,24,*">
+        <StackPanel>
+          <TextBlock Text="What would you like to do?" FontSize="30" FontWeight="SemiBold" />
+          <TextBlock Margin="0,7,0,0"
+                     Text="Choose the Mod Manager to play with mods, or open the creator tools when you need them."
+                     Foreground="#AAB5C6" FontSize="15" TextWrapping="Wrap" />
+        </StackPanel>
+
+        <Grid x:Name="HomeCardsGrid" Grid.Row="2" ColumnDefinitions="*,22,*" RowDefinitions="*">
+          <Border x:Name="ModManagerCard" Grid.Column="0" Padding="28" Background="#172131"
+                  BorderBrush="#3978E6" BorderThickness="1" CornerRadius="12">
+            <Grid RowDefinitions="Auto,*,Auto">
+              <StackPanel>
+                <Border HorizontalAlignment="Left" Padding="10,4" Background="#193C73" CornerRadius="12">
+                  <TextBlock Text="RECOMMENDED" Foreground="#9EC5FF" FontSize="11" FontWeight="Bold" />
+                </Border>
+                <TextBlock Margin="0,18,0,0" Text="Play with mods" FontSize="25" FontWeight="SemiBold" />
+                <TextBlock Margin="0,10,0,0"
+                           Text="Install, enable, update, and launch game mods from the OpenKH Mod Manager."
+                           Foreground="#AAB5C6" FontSize="15" TextWrapping="Wrap" LineHeight="22" />
+              </StackPanel>
+              <StackPanel Grid.Row="2" Spacing="8">
+                <Button x:Name="LaunchModManagerButton" Classes="primary" Content="Open Mod Manager"
+                        Click="LaunchModManager_Click" />
+                <Button x:Name="CreateShortcutButton" Classes="secondary" Content="Create Desktop Shortcut"
+                        Click="CreateShortcut_Click" />
+                <TextBlock x:Name="ModManagerStatusText" Foreground="#EE8989" FontSize="12"
+                           TextAlignment="Center" IsVisible="False" />
+              </StackPanel>
+            </Grid>
+          </Border>
+
+          <Border x:Name="ToolsCard" Grid.Column="2" Padding="28" Background="#172131"
+                  BorderBrush="#2A3850" BorderThickness="1" CornerRadius="12">
+            <Grid RowDefinitions="Auto,*,Auto">
+              <StackPanel>
+                <Border HorizontalAlignment="Left" Padding="10,4" Background="#342D59" CornerRadius="12">
+                  <TextBlock Text="FOR MOD CREATORS" Foreground="#C8B8FF" FontSize="11" FontWeight="Bold" />
+                </Border>
+                <TextBlock Margin="0,18,0,0" Text="Create and inspect mods" FontSize="25" FontWeight="SemiBold" />
+                <TextBlock Margin="0,10,0,0"
+                           Text="Browse editors, viewers, map studios, and other specialized OpenKH utilities."
+                           Foreground="#AAB5C6" FontSize="15" TextWrapping="Wrap" LineHeight="22" />
+              </StackPanel>
+              <StackPanel Grid.Row="2" Spacing="8">
+                <Button Classes="secondary" Content="Browse Modding Tools" Click="ShowTools_Click" />
+                <TextBlock x:Name="ToolCountText" Foreground="#AAB5C6" FontSize="12" TextAlignment="Center" />
+              </StackPanel>
+            </Grid>
+          </Border>
+        </Grid>
+      </Grid>
+
+      <Grid x:Name="ToolsPanel" RowDefinitions="Auto,18,Auto,14,*,16,Auto" IsVisible="False">
+        <Grid ColumnDefinitions="Auto,18,*">
+          <Button Classes="secondary" Content="&#x2190; Back" Click="ShowHome_Click" />
+          <StackPanel Grid.Column="2" VerticalAlignment="Center">
+            <TextBlock Text="Modding Tools" FontSize="28" FontWeight="SemiBold" />
+            <TextBlock Text="Specialized utilities for creating and inspecting game content."
+                       Foreground="#AAB5C6" TextWrapping="Wrap" />
+          </StackPanel>
+        </Grid>
+
+        <Grid Grid.Row="2" ColumnDefinitions="*,12,Auto">
+          <TextBox x:Name="SearchBox" PlaceholderText="Search tools" TextChanged="SearchBox_TextChanged" />
+          <Button Grid.Column="2" Classes="secondary" Content="Open Apps Folder" Click="OpenToolsFolder_Click" />
+        </Grid>
+
+        <Border Grid.Row="4" Background="#111B29" BorderBrush="#26374E" BorderThickness="1" CornerRadius="10">
+          <ListBox x:Name="ToolsList" Background="Transparent" BorderThickness="0" Padding="8"
+                   ScrollViewer.HorizontalScrollBarVisibility="Disabled" DoubleTapped="ToolsList_DoubleTapped">
+            <ListBox.Styles>
+              <Style Selector="ListBoxItem">
+                <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+                <Setter Property="Padding" Value="0" />
+                <Setter Property="Margin" Value="0,0,0,6" />
+              </Style>
+              <Style Selector="ListBoxItem:focus-visible /template/ ContentPresenter">
+                <Setter Property="BorderBrush" Value="#8DB5FF" />
+                <Setter Property="BorderThickness" Value="3" />
+              </Style>
+            </ListBox.Styles>
+            <ListBox.ItemTemplate>
+              <DataTemplate>
+                <Border Padding="14,11" Background="#182435" CornerRadius="8">
+                  <Grid ColumnDefinitions="44,*,Auto,Auto">
+                    <Border Width="34" Height="34" HorizontalAlignment="Left" Background="#2A4163" CornerRadius="17">
+                      <TextBlock Text="{Binding Initial}" HorizontalAlignment="Center" VerticalAlignment="Center"
+                                 FontWeight="Bold" Foreground="#9EC5FF" />
+                    </Border>
+                    <StackPanel Grid.Column="1" VerticalAlignment="Center">
+                      <TextBlock Text="{Binding DisplayName}" Foreground="#F5F7FB" FontSize="15" FontWeight="SemiBold" />
+                      <TextBlock Margin="0,3,0,0" Text="{Binding Description}" Foreground="#AAB5C6"
+                                 FontSize="12" TextTrimming="CharacterEllipsis" />
+                    </StackPanel>
+                    <Button Grid.Column="2" Width="44" Height="44" Margin="10,0,0,0" Padding="0"
+                            Background="Transparent" BorderThickness="0" FontSize="22"
+                            Foreground="{Binding FavoriteColor}" Content="{Binding FavoriteSymbol}"
+                            ToolTip.Tip="{Binding FavoriteAction}" Tag="{Binding}"
+                            Click="ToggleFavorite_Click" />
+                    <Button Grid.Column="3" Margin="10,0,0,0" Classes="secondary" Padding="16,8"
+                            Content="Open" Tag="{Binding}" Click="LaunchTool_Click" />
+                  </Grid>
+                </Border>
+              </DataTemplate>
+            </ListBox.ItemTemplate>
+          </ListBox>
+        </Border>
+
+        <TextBlock x:Name="ToolsStatusText" Grid.Row="6" Foreground="#AAB5C6" />
+      </Grid>
+    </Grid>
+
+    <Border Grid.Row="2" Padding="36,13" Background="#0A101A" BorderBrush="#26354A" BorderThickness="0,1,0,0">
+      <Grid ColumnDefinitions="Auto,*,Auto">
+        <TextBlock Text="OpenKH" Foreground="#718099" FontSize="12" VerticalAlignment="Center" />
+        <StackPanel Grid.Column="2" Orientation="Horizontal" Spacing="16">
+          <Button x:Name="CheckForUpdatesButton" Classes="link" Content="Check for Updates"
+                  Click="CheckForUpdates_Click" />
+          <Button Classes="link" Content="Documentation" Click="OpenDocumentation_Click" />
+          <TextBlock x:Name="VersionText" Foreground="#718099" FontSize="12" VerticalAlignment="Center" />
+        </StackPanel>
+      </Grid>
+    </Border>
+  </Grid>
+</Window>
diff --git a/OpenKh.Tools.Launcher/MainWindow.axaml.cs b/OpenKh.Tools.Launcher/MainWindow.axaml.cs
new file mode 100644
index 000000000..978e4bc58
--- /dev/null
+++ b/OpenKh.Tools.Launcher/MainWindow.axaml.cs
@@ -0,0 +1,501 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.Interactivity;
+using Avalonia.Media;
+using Avalonia.Threading;
+using Avalonia.VisualTree;
+using OpenKh.Tools.Launcher.Updates;
+using OpenKh.Tools.ModsManager.Avalonia.Services;
+using System.Diagnostics;
+using System.Text.RegularExpressions;
+
+namespace OpenKh.Tools.Launcher;
+
+public partial class MainWindow : Window
+{
+    private const string ApplicationsDirectory = "Apps";
+    private const string FavoritesFileName = "launcher-favorites.txt";
+
+    private static readonly IReadOnlyDictionary<string, string> ToolDescriptions =
+        new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+        {
+            ["BarEditor"] = "Inspect and edit BAR archives.",
+            ["BbsEventTableEditor"] = "Edit Birth by Sleep event tables.",
+            ["BbsMapStudio"] = "Create and inspect Birth by Sleep maps.",
+            ["ImageViewer"] = "View textures and supported game images.",
+            ["IdxImg"] = "Browse and manage IDX/IMG game archives.",
+            ["Kh2BattleEditor"] = "Edit Kingdom Hearts II battle data.",
+            ["Kh2MapStudio"] = "Create and inspect Kingdom Hearts II maps.",
+            ["Kh2MdlxEditor"] = "Inspect and edit Kingdom Hearts II models.",
+            ["Kh2MsetEditor"] = "Inspect Kingdom Hearts II animation sets.",
+            ["Kh2ObjectEditor"] = "Edit Kingdom Hearts II object data.",
+            ["Kh2SystemEditor"] = "Edit Kingdom Hearts II system data.",
+            ["Kh2TextEditor"] = "Edit game messages and text resources.",
+            ["LayoutEditor"] = "Edit 2D layouts and interface assets.",
+            ["MissionEditor"] = "Edit mission data.",
+            ["ObjentryEditor"] = "Edit object entry tables.",
+        };
+
+    private readonly IControllerInputService _controller;
+    private readonly bool _checkUpdatesOnOpen;
+    private readonly List<ToolEntry> _allTools = new();
+    private readonly HashSet<string> _favoriteToolNames = new(StringComparer.OrdinalIgnoreCase);
+    private OpenKhReleaseUpdateCheckerService.CheckResult? _availableUpdate;
+    private bool _compactCards;
+
+    private string BaseDirectory => LauncherInstallation.RootDirectory;
+    private string DataDirectory => LauncherInstallation.DataDirectory;
+    private string ApplicationsPath => Path.Combine(BaseDirectory, ApplicationsDirectory);
+    private string FavoritesPath => Path.Combine(DataDirectory, FavoritesFileName);
+    private string ModManagerPath => LauncherInstallation.FindModManagerExecutable(BaseDirectory);
+    private string CompatibilityModManagerPath => Path.Combine(BaseDirectory, "OpenKh.Tools.ModsManager.exe");
+
+    public MainWindow() : this(new SdlControllerInputService())
+    {
+    }
+
+    public MainWindow(IControllerInputService controller, bool checkUpdatesOnOpen = true)
+    {
+        _controller = controller;
+        _checkUpdatesOnOpen = checkUpdatesOnOpen;
+        InitializeComponent();
+        Opened += HandleOpened;
+        SizeChanged += HandleSizeChanged;
+    }
+
+    private void HandleOpened(object? sender, EventArgs eventArgs)
+    {
+        var processPath = Environment.ProcessPath;
+        var version = string.IsNullOrWhiteSpace(processPath)
+            ? null
+            : FileVersionInfo.GetVersionInfo(processPath).ProductVersion;
+        VersionText.Text = string.IsNullOrWhiteSpace(version) ? string.Empty : $"Version {version}";
+
+        var modManagerAvailable = File.Exists(ModManagerPath);
+        LaunchModManagerButton.IsEnabled = modManagerAvailable;
+        CreateShortcutButton.IsEnabled = modManagerAvailable;
+        ModManagerStatusText.Text = modManagerAvailable ? string.Empty : "Mod Manager was not found";
+        ModManagerStatusText.IsVisible = !modManagerAvailable;
+
+        LoadFavorites();
+        LoadTools();
+        UpdateCardLayout(Bounds.Width < 900);
+        if (_checkUpdatesOnOpen)
+            _ = RefreshUpdateAvailabilityAsync(showErrors: false, showProgress: false);
+        LaunchModManagerButton.Focus();
+    }
+
+    private void HandleSizeChanged(object? sender, SizeChangedEventArgs eventArgs) =>
+        UpdateCardLayout(eventArgs.NewSize.Width < 900);
+
+    private void UpdateCardLayout(bool compact)
+    {
+        if (_compactCards == compact && HomeCardsGrid.ColumnDefinitions.Count > 0)
+            return;
+
+        _compactCards = compact;
+        if (compact)
+        {
+            HomeCardsGrid.ColumnDefinitions = new ColumnDefinitions("*");
+            HomeCardsGrid.RowDefinitions = new RowDefinitions("*,18,*");
+            Grid.SetColumn(ModManagerCard, 0);
+            Grid.SetRow(ModManagerCard, 0);
+            Grid.SetColumn(ToolsCard, 0);
+            Grid.SetRow(ToolsCard, 2);
+        }
+        else
+        {
+            HomeCardsGrid.ColumnDefinitions = new ColumnDefinitions("*,22,*");
+            HomeCardsGrid.RowDefinitions = new RowDefinitions("*");
+            Grid.SetColumn(ModManagerCard, 0);
+            Grid.SetRow(ModManagerCard, 0);
+            Grid.SetColumn(ToolsCard, 2);
+            Grid.SetRow(ToolsCard, 0);
+        }
+    }
+
+    private void LoadTools()
+    {
+        _allTools.Clear();
+        if (Directory.Exists(ApplicationsPath))
+        {
+            _allTools.AddRange(Directory.EnumerateFiles(ApplicationsPath, "OpenKh.Tools.*", SearchOption.TopDirectoryOnly)
+                .Where(IsApplicationExecutable)
+                .Where(path => !Path.GetFileNameWithoutExtension(path)
+                    .Equals("OpenKh.Tools.ModsManager", StringComparison.OrdinalIgnoreCase))
+                .Select(CreateToolEntry));
+        }
+
+        ToolCountText.Text = _allTools.Count == 0
+            ? "Tools are installed with the full OpenKH package"
+            : $"{_allTools.Count} tools available";
+        ApplyToolFilter();
+    }
+
+    private static bool IsApplicationExecutable(string path)
+    {
+        var extension = Path.GetExtension(path);
+        return extension.Equals(".exe", StringComparison.OrdinalIgnoreCase)
+            || string.IsNullOrEmpty(extension);
+    }
+
+    private ToolEntry CreateToolEntry(string executablePath)
+    {
+        var identifier = Path.GetFileName(executablePath);
+        var fileName = Path.GetFileNameWithoutExtension(executablePath);
+        var shortName = fileName.StartsWith("OpenKh.Tools.", StringComparison.OrdinalIgnoreCase)
+            ? fileName["OpenKh.Tools.".Length..]
+            : fileName;
+        var displayName = HumanizeName(shortName);
+        var description = ToolDescriptions.TryGetValue(shortName, out var knownDescription)
+            ? knownDescription
+            : "Open a specialized OpenKH modding utility.";
+        return new ToolEntry(identifier, displayName, description, executablePath, _favoriteToolNames.Contains(identifier));
+    }
+
+    private static string HumanizeName(string value)
+    {
+        var result = Regex.Replace(value, "(?<=[a-z0-9])(?=[A-Z])", " ");
+        return result
+            .Replace("Kh1", "KH1", StringComparison.OrdinalIgnoreCase)
+            .Replace("Kh2", "KH2", StringComparison.OrdinalIgnoreCase)
+            .Replace("Bbs", "BBS", StringComparison.OrdinalIgnoreCase)
+            .Replace("Idx", "IDX", StringComparison.OrdinalIgnoreCase);
+    }
+
+    private void ApplyToolFilter()
+    {
+        var query = SearchBox?.Text?.Trim() ?? string.Empty;
+        var matchingTools = string.IsNullOrWhiteSpace(query)
+            ? _allTools.AsEnumerable()
+            : _allTools.Where(tool => tool.DisplayName.Contains(query, StringComparison.CurrentCultureIgnoreCase)
+                || tool.Description.Contains(query, StringComparison.CurrentCultureIgnoreCase));
+        var filteredTools = matchingTools
+            .OrderByDescending(tool => tool.IsFavorite)
+            .ThenBy(tool => tool.DisplayName, StringComparer.CurrentCultureIgnoreCase)
+            .ToList();
+
+        if (ToolsList is not null)
+            ToolsList.ItemsSource = filteredTools;
+        if (ToolsStatusText is not null)
+        {
+            ToolsStatusText.Text = !Directory.Exists(ApplicationsPath)
+                ? "The Apps folder is not available in this installation."
+                : $"Showing {filteredTools.Count} of {_allTools.Count} tools";
+        }
+    }
+
+    private async void LaunchModManager_Click(object? sender, RoutedEventArgs eventArgs)
+    {
+        if (await TryLaunchAsync(ModManagerPath, ["--data-root", DataDirectory]))
+            Close();
+    }
+
+    private async void CheckForUpdates_Click(object? sender, RoutedEventArgs eventArgs)
+    {
+        CheckForUpdatesButton.IsEnabled = false;
+        try
+        {
+            var result = _availableUpdate?.HasUpdate == true
+                ? _availableUpdate
+                : await RefreshUpdateAvailabilityAsync(showErrors: true, showProgress: true);
+            if (result is null)
+                return;
+            if (!result.HasUpdate)
+            {
+                var message = string.IsNullOrWhiteSpace(result.CurrentVersion)
+                    ? "No OpenKH update is currently available."
+                    : $"The latest version '{result.CurrentVersion}' is already installed.";
+                await MessageDialog.ShowAsync(this, "OpenKH Update", message);
+                return;
+            }
+
+            var updateMessage = "A new version of OpenKH is available.\n" +
+                $"Current: {result.CurrentVersion}\n" +
+                $"Latest: {result.NewVersion}\n\n" +
+                "Do you want to download and install it now?";
+            if (!await MessageDialog.ShowAsync(this, "OpenKH Update", updateMessage, showCancel: true))
+                return;
+
+            CheckForUpdatesButton.Content = "Downloading Update...";
+            await new OpenKhUpdateInstallerService(BaseDirectory).UpdateAsync(
+                result.DownloadUrl,
+                rate => Dispatcher.UIThread.Post(() => CheckForUpdatesButton.Content = $"Downloading {rate:P0}"),
+                CancellationToken.None,
+                Environment.ProcessPath ?? string.Empty);
+
+            if (Avalonia.Application.Current?.ApplicationLifetime is
+                Avalonia.Controls.ApplicationLifetimes.IClassicDesktopStyleApplicationLifetime desktop)
+                desktop.Shutdown();
+        }
+        catch (Exception exception)
+        {
+            await MessageDialog.ShowAsync(this, "OpenKH Update",
+                $"OpenKH could not check for or install updates.\n\n{exception.Message}");
+        }
+        finally
+        {
+            CheckForUpdatesButton.IsEnabled = true;
+            SetUpdateAvailability(_availableUpdate?.HasUpdate == true);
+        }
+    }
+
+    private async Task<OpenKhReleaseUpdateCheckerService.CheckResult?> RefreshUpdateAvailabilityAsync(bool showErrors, bool showProgress)
+    {
+        if (showProgress)
+            CheckForUpdatesButton.Content = "Checking for Updates...";
+        try
+        {
+            var result = await new OpenKhReleaseUpdateCheckerService(BaseDirectory).CheckAsync(CancellationToken.None);
+            _availableUpdate = result;
+            SetUpdateAvailability(result.HasUpdate);
+            return result;
+        }
+        catch (Exception exception)
+        {
+            _availableUpdate = null;
+            SetUpdateAvailability(false);
+            if (showErrors)
+                await MessageDialog.ShowAsync(this, "OpenKH Update", $"OpenKH could not check for updates.\n\n{exception.Message}");
+            return null;
+        }
+    }
+
+    private void SetUpdateAvailability(bool updateAvailable)
+    {
+        CheckForUpdatesButton.Content = updateAvailable ? "Update Available" : "Check for Updates";
+        CheckForUpdatesButton.Foreground = Brush.Parse(updateAvailable ? "#7FDCAD" : "#8FB9F8");
+    }
+
+    private async void CreateShortcut_Click(object? sender, RoutedEventArgs eventArgs)
+    {
+        try
+        {
+            var target = LauncherInstallation.AppImagePath ??
+                (File.Exists(CompatibilityModManagerPath) ? CompatibilityModManagerPath : ModManagerPath);
+            var arguments = LauncherInstallation.IsAppImage ? new[] { "--mod-manager" } : null;
+            var path = DesktopShortcutService.CreateModManagerShortcut(target, arguments);
+            await MessageDialog.ShowAsync(this, "Shortcut created",
+                $"The OpenKH Mod Manager shortcut was created.\n\n{path}");
+        }
+        catch (Exception exception)
+        {
+            await MessageDialog.ShowAsync(this, "Unable to create shortcut",
+                $"OpenKH could not create the shortcut.\n\n{exception.Message}");
+        }
+    }
+
+    private void ShowTools_Click(object? sender, RoutedEventArgs eventArgs)
+    {
+        LoadTools();
+        HomePanel.IsVisible = false;
+        ToolsPanel.IsVisible = true;
+        SearchBox.Focus();
+        Dispatcher.UIThread.Post(() =>
+        {
+            if (ToolsList.ItemCount == 0)
+                return;
+
+            ToolsList.SelectedIndex = 0;
+            if (ToolsList.SelectedItem is { } selectedTool)
+                ToolsList.ScrollIntoView(selectedTool);
+        }, DispatcherPriority.Loaded);
+    }
+
+    private void ShowHome_Click(object? sender, RoutedEventArgs eventArgs) => ShowHome();
+
+    private void ShowHome()
+    {
+        ToolsPanel.IsVisible = false;
+        HomePanel.IsVisible = true;
+        LaunchModManagerButton.Focus();
+    }
+
+    private void SearchBox_TextChanged(object? sender, TextChangedEventArgs eventArgs) => ApplyToolFilter();
+
+    private void LaunchTool_Click(object? sender, RoutedEventArgs eventArgs)
+    {
+        if (sender is Button { Tag: ToolEntry tool })
+            Launch(tool.ExecutablePath);
+    }
+
+    private async void ToggleFavorite_Click(object? sender, RoutedEventArgs eventArgs)
+    {
+        if (sender is not Button { Tag: ToolEntry tool })
+            return;
+
+        var isFavorite = _favoriteToolNames.Add(tool.Identifier);
+        if (!isFavorite)
+            _favoriteToolNames.Remove(tool.Identifier);
+        tool.IsFavorite = isFavorite;
+
+        try
+        {
+            File.WriteAllLines(FavoritesPath,
+                _favoriteToolNames.OrderBy(name => name, StringComparer.OrdinalIgnoreCase));
+        }
+        catch (Exception exception) when (exception is IOException or UnauthorizedAccessException)
+        {
+            tool.IsFavorite = !isFavorite;
+            if (isFavorite)
+                _favoriteToolNames.Remove(tool.Identifier);
+            else
+                _favoriteToolNames.Add(tool.Identifier);
+            await MessageDialog.ShowAsync(this, "Unable to save favorites",
+                $"OpenKH could not save your favorites.\n\n{exception.Message}");
+        }
+
+        ApplyToolFilter();
+        ToolsList.SelectedIndex = ToolsList.ItemCount > 0 ? 0 : -1;
+        if (ToolsList.SelectedItem is not null)
+            ToolsList.ScrollIntoView(ToolsList.SelectedItem);
+    }
+
+    private void ToolsList_DoubleTapped(object? sender, TappedEventArgs eventArgs)
+    {
+        if (eventArgs.Source is Visual source && source.GetVisualAncestors().OfType<Button>().Any())
+            return;
+        if (ToolsList.SelectedItem is ToolEntry tool)
+            Launch(tool.ExecutablePath);
+    }
+
+    private void LoadFavorites()
+    {
+        _favoriteToolNames.Clear();
+        try
+        {
+            if (!File.Exists(FavoritesPath))
+                return;
+            foreach (var name in File.ReadLines(FavoritesPath).Select(line => line.Trim()).Where(line => line.Length > 0))
+                _favoriteToolNames.Add(name);
+        }
+        catch (Exception exception) when (exception is IOException or UnauthorizedAccessException)
+        {
+            _favoriteToolNames.Clear();
+        }
+    }
+
+    private void OpenToolsFolder_Click(object? sender, RoutedEventArgs eventArgs)
+    {
+        if (!Directory.Exists(ApplicationsPath))
+        {
+            _ = MessageDialog.ShowAsync(this, "Item not found", "The Apps folder was not found.");
+            return;
+        }
+        Launch(ApplicationsPath);
+    }
+
+    private void OpenDocumentation_Click(object? sender, RoutedEventArgs eventArgs) => Launch("https://openkh.dev/");
+
+    private async void Launch(string target) => await TryLaunchAsync(target);
+
+    private async Task<bool> TryLaunchAsync(string target, IEnumerable<string>? arguments = null)
+    {
+        try
+        {
+            var startInfo = new ProcessStartInfo
+            {
+                FileName = target,
+                WorkingDirectory = File.Exists(target) ? Path.GetDirectoryName(target) : AppContext.BaseDirectory,
+                UseShellExecute = true,
+            };
+            if (arguments is not null)
+            {
+                foreach (var argument in arguments)
+                    startInfo.ArgumentList.Add(argument);
+            }
+            Process.Start(startInfo);
+            return true;
+        }
+        catch (Exception exception)
+        {
+            await MessageDialog.ShowAsync(this, "Unable to open item", $"OpenKH could not open this item.\n\n{exception.Message}");
+            return false;
+        }
+    }
+
+    public void HandleControllerAction(ControllerAction action)
+    {
+        Dispatcher.UIThread.Post(() =>
+        {
+            if (ControllerWindowNavigator.TryHandleVirtualKeyboard(action) ||
+                ControllerWindowNavigator.TryShowVirtualKeyboard(this, action) ||
+                ControllerWindowNavigator.TryScroll(this, action) ||
+                ControllerWindowNavigator.TryMoveFocus(this, action))
+                return;
+
+            switch (action)
+            {
+                case ControllerAction.PreviousControl:
+                case ControllerAction.PreviousItem:
+                case ControllerAction.PreviousGame:
+                    ControllerWindowNavigator.MoveFocus(this, -1);
+                    break;
+                case ControllerAction.NextControl:
+                case ControllerAction.NextItem:
+                case ControllerAction.NextGame:
+                    ControllerWindowNavigator.MoveFocus(this, 1);
+                    break;
+                case ControllerAction.Confirm:
+                    ActivateFocusedControl();
+                    break;
+                case ControllerAction.Cancel:
+                    if (ToolsPanel.IsVisible)
+                        ShowHome();
+                    else
+                        Close();
+                    break;
+                case ControllerAction.Secondary:
+                    if (ToolsPanel.IsVisible && ToolsList.SelectedItem is ToolEntry tool)
+                        ToggleFavorite(tool);
+                    break;
+                case ControllerAction.Install:
+                    if (ToolsPanel.IsVisible && ToolsList.SelectedItem is ToolEntry selectedTool)
+                        Launch(selectedTool.ExecutablePath);
+                    break;
+                case ControllerAction.Refresh:
+                    LoadTools();
+                    break;
+            }
+        });
+    }
+
+    private void ActivateFocusedControl()
+    {
+        if (FocusManager?.GetFocusedElement() is Button button && button.IsEffectivelyEnabled)
+            button.RaiseEvent(new RoutedEventArgs(Button.ClickEvent));
+        else if (ToolsList.SelectedItem is ToolEntry tool)
+            Launch(tool.ExecutablePath);
+    }
+
+    private void ToggleFavorite(ToolEntry tool)
+    {
+        var button = new Button { Tag = tool };
+        ToggleFavorite_Click(button, new RoutedEventArgs());
+    }
+
+    public sealed class ToolEntry
+    {
+        public string Identifier { get; }
+        public string DisplayName { get; }
+        public string Description { get; }
+        public string ExecutablePath { get; }
+        public bool IsFavorite { get; set; }
+        public string Initial => DisplayName.Length == 0 ? "?" : DisplayName[..1].ToUpperInvariant();
+        public string FavoriteSymbol => IsFavorite ? "\u2605" : "\u2606";
+        public string FavoriteColor => IsFavorite ? "#FFD166" : "#93A2B8";
+        public string FavoriteAction => IsFavorite
+            ? $"Remove {DisplayName} from favorites"
+            : $"Add {DisplayName} to favorites";
+
+        public ToolEntry(string identifier, string displayName, string description, string executablePath, bool isFavorite)
+        {
+            Identifier = identifier;
+            DisplayName = displayName;
+            Description = description;
+            ExecutablePath = executablePath;
+            IsFavorite = isFavorite;
+        }
+    }
+}
diff --git a/OpenKh.Tools.Launcher/MainWindow.xaml b/OpenKh.Tools.Launcher/MainWindow.xaml
deleted file mode 100644
index 115606248..000000000
--- a/OpenKh.Tools.Launcher/MainWindow.xaml
+++ /dev/null
@@ -1,271 +0,0 @@
-<Window x:Class="OpenKh.Tools.Launcher.MainWindow"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        mc:Ignorable="d"
-        Title="OpenKH Launcher"
-        Width="920"
-        Height="620"
-        MinWidth="760"
-        MinHeight="520"
-        WindowStartupLocation="CenterScreen"
-        Background="#0D1420"
-        Foreground="#F5F7FB"
-        Loaded="Window_Loaded">
-    <Window.Resources>
-        <SolidColorBrush x:Key="MutedTextBrush" Color="#AAB5C6"/>
-        <SolidColorBrush x:Key="CardBrush" Color="#172131"/>
-        <SolidColorBrush x:Key="CardBorderBrush" Color="#2A3850"/>
-
-        <Style x:Key="PrimaryButton" TargetType="Button">
-            <Setter Property="Foreground" Value="White"/>
-            <Setter Property="Background" Value="#3978E6"/>
-            <Setter Property="BorderThickness" Value="0"/>
-            <Setter Property="Padding" Value="20,11"/>
-            <Setter Property="FontSize" Value="14"/>
-            <Setter Property="FontWeight" Value="SemiBold"/>
-            <Setter Property="Cursor" Value="Hand"/>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="Button">
-                        <Border x:Name="Border" Background="{TemplateBinding Background}" CornerRadius="6" Padding="{TemplateBinding Padding}">
-                            <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                        </Border>
-                        <ControlTemplate.Triggers>
-                            <Trigger Property="IsMouseOver" Value="True">
-                                <Setter TargetName="Border" Property="Background" Value="#4A89F7"/>
-                            </Trigger>
-                            <Trigger Property="IsEnabled" Value="False">
-                                <Setter TargetName="Border" Property="Opacity" Value="0.45"/>
-                            </Trigger>
-                        </ControlTemplate.Triggers>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
-
-        <Style x:Key="SecondaryButton" TargetType="Button" BasedOn="{StaticResource PrimaryButton}">
-            <Setter Property="Background" Value="#27364D"/>
-            <Setter Property="Padding" Value="18,10"/>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="Button">
-                        <Border x:Name="Border" Background="{TemplateBinding Background}" BorderBrush="#3D506E" BorderThickness="1" CornerRadius="6" Padding="{TemplateBinding Padding}">
-                            <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                        </Border>
-                        <ControlTemplate.Triggers>
-                            <Trigger Property="IsMouseOver" Value="True">
-                                <Setter TargetName="Border" Property="Background" Value="#324562"/>
-                            </Trigger>
-                            <Trigger Property="IsEnabled" Value="False">
-                                <Setter TargetName="Border" Property="Opacity" Value="0.45"/>
-                            </Trigger>
-                        </ControlTemplate.Triggers>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
-
-        <Style TargetType="TextBlock">
-            <Setter Property="Foreground" Value="#F5F7FB"/>
-        </Style>
-    </Window.Resources>
-
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="*"/>
-            <RowDefinition Height="Auto"/>
-        </Grid.RowDefinitions>
-
-        <Border Grid.Row="0" Padding="32,22" Background="#111B29" BorderBrush="#26354A" BorderThickness="0,0,0,1">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*"/>
-                    <ColumnDefinition Width="Auto"/>
-                </Grid.ColumnDefinitions>
-                <Image Grid.Column="0" Width="210" Height="64" HorizontalAlignment="Left" Source="Assets/OpenKH.png" Stretch="Uniform"/>
-                <TextBlock Grid.Column="1" Text="LAUNCHER" Foreground="#7890B1" FontSize="12" FontWeight="SemiBold" VerticalAlignment="Center"/>
-            </Grid>
-        </Border>
-
-        <Grid Grid.Row="1" Margin="32,28">
-            <Grid x:Name="HomePanel">
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto"/>
-                    <RowDefinition Height="24"/>
-                    <RowDefinition Height="*"/>
-                </Grid.RowDefinitions>
-
-                <StackPanel Grid.Row="0">
-                    <TextBlock Text="What would you like to do?" FontSize="28" FontWeight="SemiBold"/>
-                    <TextBlock Margin="0,7,0,0" Text="Choose the Mod Manager to play with mods, or open the creator tools when you need them." Foreground="{StaticResource MutedTextBrush}" FontSize="14"/>
-                </StackPanel>
-
-                <Grid Grid.Row="2">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="*"/>
-                        <ColumnDefinition Width="20"/>
-                        <ColumnDefinition Width="*"/>
-                    </Grid.ColumnDefinitions>
-
-                    <Border Grid.Column="0" Padding="28" Background="{StaticResource CardBrush}" BorderBrush="#3978E6" BorderThickness="1" CornerRadius="10">
-                        <Grid>
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto"/>
-                                <RowDefinition Height="*"/>
-                                <RowDefinition Height="Auto"/>
-                            </Grid.RowDefinitions>
-                            <StackPanel>
-                                <Border HorizontalAlignment="Left" Padding="9,4" Background="#193C73" CornerRadius="10">
-                                    <TextBlock Text="RECOMMENDED" Foreground="#9EC5FF" FontSize="10" FontWeight="Bold"/>
-                                </Border>
-                                <TextBlock Margin="0,18,0,0" Text="Play with mods" FontSize="23" FontWeight="SemiBold"/>
-                                <TextBlock Margin="0,10,0,0" Text="Install, enable, update, and launch game mods from the OpenKH Mod Manager." Foreground="{StaticResource MutedTextBrush}" FontSize="14" TextWrapping="Wrap" LineHeight="21"/>
-                            </StackPanel>
-                            <StackPanel Grid.Row="2">
-                                <Button x:Name="LaunchModManagerButton" Style="{StaticResource PrimaryButton}" Content="Open Mod Manager" Click="LaunchModManager_Click"/>
-                                <Button x:Name="CreateShortcutButton" Margin="0,8,0,0" Style="{StaticResource SecondaryButton}" Padding="15,7" Content="Create Desktop Shortcut" Click="CreateShortcut_Click"/>
-                                <TextBlock x:Name="ModManagerStatusText" Margin="0,9,0,0" Foreground="#EE8989" FontSize="12" TextAlignment="Center" Visibility="Collapsed"/>
-                            </StackPanel>
-                        </Grid>
-                    </Border>
-
-                    <Border Grid.Column="2" Padding="28" Background="{StaticResource CardBrush}" BorderBrush="{StaticResource CardBorderBrush}" BorderThickness="1" CornerRadius="10">
-                        <Grid>
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto"/>
-                                <RowDefinition Height="*"/>
-                                <RowDefinition Height="Auto"/>
-                            </Grid.RowDefinitions>
-                            <StackPanel>
-                                <Border HorizontalAlignment="Left" Padding="9,4" Background="#342D59" CornerRadius="10">
-                                    <TextBlock Text="FOR MOD CREATORS" Foreground="#C8B8FF" FontSize="10" FontWeight="Bold"/>
-                                </Border>
-                                <TextBlock Margin="0,18,0,0" Text="Create and inspect mods" FontSize="23" FontWeight="SemiBold"/>
-                                <TextBlock Margin="0,10,0,0" Text="Browse editors, viewers, map studios, and other specialized OpenKH utilities." Foreground="{StaticResource MutedTextBrush}" FontSize="14" TextWrapping="Wrap" LineHeight="21"/>
-                            </StackPanel>
-                            <StackPanel Grid.Row="2">
-                                <Button Style="{StaticResource SecondaryButton}" Content="Browse Modding Tools" Click="ShowTools_Click"/>
-                                <TextBlock x:Name="ToolCountText" Margin="0,9,0,0" Foreground="{StaticResource MutedTextBrush}" FontSize="12" TextAlignment="Center"/>
-                            </StackPanel>
-                        </Grid>
-                    </Border>
-                </Grid>
-            </Grid>
-
-            <Grid x:Name="ToolsPanel" Visibility="Collapsed">
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto"/>
-                    <RowDefinition Height="18"/>
-                    <RowDefinition Height="Auto"/>
-                    <RowDefinition Height="14"/>
-                    <RowDefinition Height="*"/>
-                    <RowDefinition Height="16"/>
-                    <RowDefinition Height="Auto"/>
-                </Grid.RowDefinitions>
-
-                <Grid Grid.Row="0">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition Width="18"/>
-                        <ColumnDefinition Width="*"/>
-                    </Grid.ColumnDefinitions>
-                    <Button Grid.Column="0" Style="{StaticResource SecondaryButton}" Content="← Back" Click="ShowHome_Click"/>
-                    <StackPanel Grid.Column="2" VerticalAlignment="Center">
-                        <TextBlock Text="Modding Tools" FontSize="26" FontWeight="SemiBold"/>
-                        <TextBlock Text="Specialized utilities for creating and inspecting game content." Foreground="{StaticResource MutedTextBrush}"/>
-                    </StackPanel>
-                </Grid>
-
-                <Grid Grid.Row="2">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="*"/>
-                        <ColumnDefinition Width="12"/>
-                        <ColumnDefinition Width="Auto"/>
-                    </Grid.ColumnDefinitions>
-                    <TextBox x:Name="SearchBox" Grid.Column="0" Height="40" Padding="12,8" Background="#111B29" Foreground="#F5F7FB" BorderBrush="#334661" BorderThickness="1" FontSize="14" TextChanged="SearchBox_TextChanged"/>
-                    <Button Grid.Column="2" Style="{StaticResource SecondaryButton}" Content="Open Apps Folder" Click="OpenToolsFolder_Click"/>
-                </Grid>
-
-                <Border Grid.Row="4" Background="#111B29" BorderBrush="#26374E" BorderThickness="1" CornerRadius="8">
-                    <ListBox x:Name="ToolsList" Background="Transparent" BorderThickness="0" Padding="7" ScrollViewer.HorizontalScrollBarVisibility="Disabled" MouseDoubleClick="ToolsList_MouseDoubleClick">
-                        <ListBox.ItemContainerStyle>
-                            <Style TargetType="ListBoxItem">
-                                <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
-                                <Setter Property="Padding" Value="0"/>
-                                <Setter Property="Margin" Value="0,0,0,5"/>
-                                <Setter Property="Background" Value="Transparent"/>
-                            </Style>
-                        </ListBox.ItemContainerStyle>
-                        <ListBox.ItemTemplate>
-                            <DataTemplate>
-                                <Border Padding="14,11" Background="#182435" CornerRadius="6">
-                                    <Grid>
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="42"/>
-                                            <ColumnDefinition Width="*"/>
-                                            <ColumnDefinition Width="Auto"/>
-                                            <ColumnDefinition Width="Auto"/>
-                                        </Grid.ColumnDefinitions>
-                                        <Border Grid.Column="0" Width="32" Height="32" HorizontalAlignment="Left" Background="#2A4163" CornerRadius="16">
-                                            <TextBlock Text="{Binding Initial}" HorizontalAlignment="Center" VerticalAlignment="Center" FontWeight="Bold" Foreground="#9EC5FF"/>
-                                        </Border>
-                                        <StackPanel Grid.Column="1" VerticalAlignment="Center">
-                                            <TextBlock Text="{Binding DisplayName}" Foreground="#F5F7FB" FontSize="14" FontWeight="SemiBold"/>
-                                            <TextBlock Margin="0,3,0,0" Text="{Binding Description}" Foreground="{StaticResource MutedTextBrush}" FontSize="12" TextTrimming="CharacterEllipsis"/>
-                                        </StackPanel>
-                                        <Button Grid.Column="2"
-                                                Width="38"
-                                                Height="38"
-                                                Margin="12,0,0,0"
-                                                Padding="0"
-                                                Background="Transparent"
-                                                BorderThickness="0"
-                                                Cursor="Hand"
-                                                FontFamily="Segoe UI Symbol"
-                                                FontSize="22"
-                                                Content="{Binding FavoriteSymbol}"
-                                                ToolTip="{Binding FavoriteAction}"
-                                                AutomationProperties.Name="{Binding FavoriteAction}"
-                                                Tag="{Binding}"
-                                                Click="ToggleFavorite_Click">
-                                            <Button.Style>
-                                                <Style TargetType="Button">
-                                                    <Setter Property="Foreground" Value="#93A2B8"/>
-                                                    <Style.Triggers>
-                                                        <DataTrigger Binding="{Binding IsFavorite}" Value="True">
-                                                            <Setter Property="Foreground" Value="#FFD166"/>
-                                                        </DataTrigger>
-                                                        <Trigger Property="IsMouseOver" Value="True">
-                                                            <Setter Property="Foreground" Value="#FFE29A"/>
-                                                        </Trigger>
-                                                    </Style.Triggers>
-                                                </Style>
-                                            </Button.Style>
-                                        </Button>
-                                        <Button Grid.Column="3" Margin="10,0,0,0" Style="{StaticResource SecondaryButton}" Padding="15,7" Content="Open" Tag="{Binding}" Click="LaunchTool_Click"/>
-                                    </Grid>
-                                </Border>
-                            </DataTemplate>
-                        </ListBox.ItemTemplate>
-                    </ListBox>
-                </Border>
-
-                <TextBlock x:Name="ToolsStatusText" Grid.Row="6" Foreground="{StaticResource MutedTextBrush}"/>
-            </Grid>
-        </Grid>
-
-        <Border Grid.Row="2" Padding="32,14" Background="#0A101A" BorderBrush="#26354A" BorderThickness="0,1,0,0">
-            <Grid>
-                <TextBlock Text="OpenKH" Foreground="#718099" FontSize="12"/>
-                <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
-                    <Button x:Name="CheckForUpdatesButton" Padding="0" Margin="0,0,20,0" Background="Transparent" BorderThickness="0" Foreground="#8FB9F8" Content="Check for Updates" Cursor="Hand" Click="CheckForUpdates_Click"/>
-                    <Button Padding="0" Margin="0,0,20,0" Background="Transparent" BorderThickness="0" Foreground="#8FB9F8" Content="Documentation" Cursor="Hand" Click="OpenDocumentation_Click"/>
-                    <TextBlock x:Name="VersionText" Foreground="#718099" FontSize="12" VerticalAlignment="Center"/>
-                </StackPanel>
-            </Grid>
-        </Border>
-    </Grid>
-</Window>
diff --git a/OpenKh.Tools.Launcher/MainWindow.xaml.cs b/OpenKh.Tools.Launcher/MainWindow.xaml.cs
deleted file mode 100644
index f92b2b916..000000000
--- a/OpenKh.Tools.Launcher/MainWindow.xaml.cs
+++ /dev/null
@@ -1,469 +0,0 @@
-using OpenKh.Tools.ModsManager.Services;
-using System.Diagnostics;
-using System.IO;
-using System.Text.RegularExpressions;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Input;
-using System.Windows.Media;
-
-namespace OpenKh.Tools.Launcher;
-
-public partial class MainWindow : Window
-{
-    private const string ModManagerExecutable = "OpenKh.Tools.ModsManager.exe";
-    private const string ApplicationsDirectory = "Apps";
-    private const string FavoritesFileName = "launcher-favorites.txt";
-
-    private static readonly IReadOnlyDictionary<string, string> ToolDescriptions =
-        new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
-        {
-            ["BarEditor"] = "Inspect and edit BAR archives.",
-            ["BbsEventTableEditor"] = "Edit Birth by Sleep event tables.",
-            ["BbsMapStudio"] = "Create and inspect Birth by Sleep maps.",
-            ["ImageViewer"] = "View textures and supported game images.",
-            ["IdxImg"] = "Browse and manage IDX/IMG game archives.",
-            ["Kh2BattleEditor"] = "Edit Kingdom Hearts II battle data.",
-            ["Kh2MapStudio"] = "Create and inspect Kingdom Hearts II maps.",
-            ["Kh2MdlxEditor"] = "Inspect and edit Kingdom Hearts II models.",
-            ["Kh2MsetEditor"] = "Inspect Kingdom Hearts II animation sets.",
-            ["Kh2ObjectEditor"] = "Edit Kingdom Hearts II object data.",
-            ["Kh2SystemEditor"] = "Edit Kingdom Hearts II system data.",
-            ["Kh2TextEditor"] = "Edit game messages and text resources.",
-            ["LayoutEditor"] = "Edit 2D layouts and interface assets.",
-            ["MissionEditor"] = "Edit mission data.",
-            ["ObjentryEditor"] = "Edit object entry tables.",
-        };
-
-    private readonly List<ToolEntry> _allTools = new();
-    private readonly HashSet<string> _favoriteToolNames = new(StringComparer.OrdinalIgnoreCase);
-    private OpenkhUpdateCheckerService.CheckResult? _availableUpdate;
-    private string BaseDirectory => OpenkhInstallation.Directory;
-    private string ModManagerPath => OpenkhInstallation.GetModManagerExecutable(BaseDirectory);
-    private string ApplicationsPath => Path.Combine(BaseDirectory, ApplicationsDirectory);
-    private string FavoritesPath => Path.Combine(BaseDirectory, FavoritesFileName);
-    private string CompatibilityModManagerPath => Path.Combine(BaseDirectory, ModManagerExecutable);
-
-    public MainWindow()
-    {
-        InitializeComponent();
-    }
-
-    private void Window_Loaded(object sender, RoutedEventArgs e)
-    {
-        var version = FileVersionInfo.GetVersionInfo(Environment.ProcessPath!).ProductVersion;
-        VersionText.Text = string.IsNullOrWhiteSpace(version) ? string.Empty : $"Version {version}";
-
-        var modManagerAvailable = File.Exists(ModManagerPath);
-        LaunchModManagerButton.IsEnabled = modManagerAvailable;
-        CheckForUpdatesButton.IsEnabled = true;
-        CreateShortcutButton.IsEnabled = File.Exists(CompatibilityModManagerPath);
-        ModManagerStatusText.Text = modManagerAvailable ? string.Empty : "Mod Manager was not found";
-        ModManagerStatusText.Visibility = modManagerAvailable ? Visibility.Collapsed : Visibility.Visible;
-
-        LoadFavorites();
-        LoadTools();
-        _ = RefreshUpdateAvailabilityAsync(showErrors: false, showProgress: false);
-    }
-
-    private void LoadTools()
-    {
-        _allTools.Clear();
-
-        if (Directory.Exists(ApplicationsPath))
-        {
-            _allTools.AddRange(
-                Directory.EnumerateFiles(ApplicationsPath, "OpenKh.Tools.*.exe", SearchOption.TopDirectoryOnly)
-                    .Where(path => !Path.GetFileName(path).Equals(ModManagerExecutable, StringComparison.OrdinalIgnoreCase))
-                    .Select(CreateToolEntry)
-            );
-        }
-
-        ToolCountText.Text = _allTools.Count == 0
-            ? "Tools are installed with the full OpenKH package"
-            : $"{_allTools.Count} tools available";
-
-        ApplyToolFilter();
-    }
-
-    private ToolEntry CreateToolEntry(string executablePath)
-    {
-        var identifier = Path.GetFileName(executablePath);
-        var fileNameWithoutExtension = Path.GetFileNameWithoutExtension(executablePath);
-        var shortName = fileNameWithoutExtension.StartsWith("OpenKh.Tools.", StringComparison.OrdinalIgnoreCase)
-            ? fileNameWithoutExtension["OpenKh.Tools.".Length..]
-            : fileNameWithoutExtension;
-        var displayName = HumanizeName(shortName);
-        var description = ToolDescriptions.TryGetValue(shortName, out var knownDescription)
-            ? knownDescription
-            : "Open a specialized OpenKH modding utility.";
-
-        return new ToolEntry(
-            identifier,
-            displayName,
-            description,
-            executablePath,
-            _favoriteToolNames.Contains(identifier)
-        );
-    }
-
-    private static string HumanizeName(string value)
-    {
-        var result = Regex.Replace(value, "(?<=[a-z0-9])(?=[A-Z])", " ");
-        return result
-            .Replace("Kh1", "KH1", StringComparison.OrdinalIgnoreCase)
-            .Replace("Kh2", "KH2", StringComparison.OrdinalIgnoreCase)
-            .Replace("Bbs", "BBS", StringComparison.OrdinalIgnoreCase)
-            .Replace("Idx", "IDX", StringComparison.OrdinalIgnoreCase);
-    }
-
-    private void ApplyToolFilter()
-    {
-        var query = SearchBox?.Text?.Trim() ?? string.Empty;
-        var matchingTools = string.IsNullOrWhiteSpace(query)
-            ? _allTools.AsEnumerable()
-            : _allTools
-                .Where(tool => tool.DisplayName.Contains(query, StringComparison.CurrentCultureIgnoreCase)
-                    || tool.Description.Contains(query, StringComparison.CurrentCultureIgnoreCase));
-        var filteredTools = matchingTools
-            .OrderByDescending(tool => tool.IsFavorite)
-            .ThenBy(tool => tool.DisplayName, StringComparer.CurrentCultureIgnoreCase)
-            .ToList();
-
-        if (ToolsList != null)
-            ToolsList.ItemsSource = filteredTools;
-
-        if (ToolsStatusText != null)
-        {
-            ToolsStatusText.Text = !Directory.Exists(ApplicationsPath)
-                ? "The Apps folder is not available in this installation."
-                : $"Showing {filteredTools.Count} of {_allTools.Count} tools";
-        }
-    }
-
-    private void LaunchModManager_Click(object sender, RoutedEventArgs e) => Launch(ModManagerPath);
-
-    private async void CheckForUpdates_Click(object sender, RoutedEventArgs e)
-    {
-        CheckForUpdatesButton.IsEnabled = false;
-
-        try
-        {
-            var checkResult = _availableUpdate?.HasUpdate == true
-                ? _availableUpdate
-                : await RefreshUpdateAvailabilityAsync(showErrors: true, showProgress: true);
-            if (checkResult == null)
-                return;
-
-            if (!checkResult.HasUpdate)
-            {
-                var message = string.IsNullOrWhiteSpace(checkResult.CurrentVersion)
-                    ? "No OpenKH update is currently available."
-                    : $"The latest version '{checkResult.CurrentVersion}' is already installed.";
-                MessageBox.Show(this, message, "OpenKH Update", MessageBoxButton.OK, MessageBoxImage.Information);
-                return;
-            }
-
-            var updateMessage = "A new version of OpenKH is available.\n" +
-                $"Current: {checkResult.CurrentVersion}\n" +
-                $"Latest: {checkResult.NewVersion}\n\n" +
-                "Do you want to download and install it now?";
-            if (MessageBox.Show(
-                this,
-                updateMessage,
-                "OpenKH Update",
-                MessageBoxButton.YesNo,
-                MessageBoxImage.Question
-            ) != MessageBoxResult.Yes)
-            {
-                return;
-            }
-
-            CheckForUpdatesButton.Content = "Downloading Update...";
-            var launcherPath = Path.Combine(OpenkhInstallation.Directory, "OpenKh.Launcher.exe");
-            await new OpenkhUpdateProceederService().UpdateAsync(
-                checkResult.DownloadZipUrl,
-                rate => Dispatcher.Invoke(() =>
-                    CheckForUpdatesButton.Content = $"Downloading {rate:P0}"),
-                CancellationToken.None,
-                launcherPath
-            );
-
-            Application.Current.Shutdown();
-        }
-        catch (Exception exception)
-        {
-            MessageBox.Show(
-                this,
-                $"OpenKH could not check for or install updates.\n\n{exception.Message}",
-                "OpenKH Update",
-                MessageBoxButton.OK,
-                MessageBoxImage.Error
-            );
-        }
-        finally
-        {
-            CheckForUpdatesButton.IsEnabled = true;
-            SetUpdateAvailability(_availableUpdate?.HasUpdate == true);
-        }
-    }
-
-    private async Task<OpenkhUpdateCheckerService.CheckResult?> RefreshUpdateAvailabilityAsync(
-        bool showErrors,
-        bool showProgress
-    )
-    {
-        if (showProgress)
-            CheckForUpdatesButton.Content = "Checking for Updates...";
-
-        try
-        {
-            var checkResult = await new OpenkhUpdateCheckerService().CheckAsync(CancellationToken.None);
-            _availableUpdate = checkResult;
-            SetUpdateAvailability(checkResult.HasUpdate);
-            return checkResult;
-        }
-        catch (Exception exception)
-        {
-            _availableUpdate = null;
-            SetUpdateAvailability(false);
-
-            if (showErrors)
-            {
-                MessageBox.Show(
-                    this,
-                    $"OpenKH could not check for updates.\n\n{exception.Message}",
-                    "OpenKH Update",
-                    MessageBoxButton.OK,
-                    MessageBoxImage.Error
-                );
-            }
-
-            return null;
-        }
-    }
-
-    private void SetUpdateAvailability(bool updateAvailable)
-    {
-        CheckForUpdatesButton.Content = updateAvailable ? "Update Available" : "Check for Updates";
-        CheckForUpdatesButton.Foreground = new SolidColorBrush(updateAvailable
-            ? Color.FromRgb(127, 220, 173)
-            : Color.FromRgb(143, 185, 248));
-    }
-
-    private void CreateShortcut_Click(object sender, RoutedEventArgs e)
-    {
-        try
-        {
-            var shortcutPath = DesktopShortcutService.CreateModManagerShortcut(CompatibilityModManagerPath);
-            MessageBox.Show(
-                $"The OpenKH Mod Manager shortcut was created on your desktop.\n\n{shortcutPath}",
-                "Shortcut created",
-                MessageBoxButton.OK,
-                MessageBoxImage.Information
-            );
-        }
-        catch (Exception exception)
-        {
-            MessageBox.Show(
-                $"OpenKH could not create the desktop shortcut.\n\n{exception.Message}",
-                "Unable to create shortcut",
-                MessageBoxButton.OK,
-                MessageBoxImage.Error
-            );
-        }
-    }
-
-    private void ShowTools_Click(object sender, RoutedEventArgs e)
-    {
-        LoadTools();
-        HomePanel.Visibility = Visibility.Collapsed;
-        ToolsPanel.Visibility = Visibility.Visible;
-        SearchBox.Focus();
-    }
-
-    private void ShowHome_Click(object sender, RoutedEventArgs e)
-    {
-        ToolsPanel.Visibility = Visibility.Collapsed;
-        HomePanel.Visibility = Visibility.Visible;
-    }
-
-    private void SearchBox_TextChanged(object sender, TextChangedEventArgs e) => ApplyToolFilter();
-
-    private void LaunchTool_Click(object sender, RoutedEventArgs e)
-    {
-        if (sender is Button { Tag: ToolEntry tool })
-            Launch(tool.ExecutablePath);
-    }
-
-    private void ToggleFavorite_Click(object sender, RoutedEventArgs e)
-    {
-        if (sender is not Button { Tag: ToolEntry tool })
-            return;
-
-        var isFavorite = _favoriteToolNames.Add(tool.Identifier);
-        if (!isFavorite)
-            _favoriteToolNames.Remove(tool.Identifier);
-
-        tool.IsFavorite = isFavorite;
-
-        try
-        {
-            File.WriteAllLines(
-                FavoritesPath,
-                _favoriteToolNames.OrderBy(name => name, StringComparer.OrdinalIgnoreCase)
-            );
-        }
-        catch (Exception exception) when (exception is IOException or UnauthorizedAccessException)
-        {
-            tool.IsFavorite = !isFavorite;
-            if (isFavorite)
-                _favoriteToolNames.Remove(tool.Identifier);
-            else
-                _favoriteToolNames.Add(tool.Identifier);
-
-            MessageBox.Show(
-                this,
-                $"OpenKH could not save your favorites.\n\n{exception.Message}",
-                "Unable to save favorites",
-                MessageBoxButton.OK,
-                MessageBoxImage.Error
-            );
-        }
-
-        ApplyToolFilter();
-        if (ToolsList.Items.Count > 0)
-        {
-            ToolsList.SelectedItem = null;
-            ToolsList.ScrollIntoView(ToolsList.Items[0]);
-        }
-    }
-
-    private void ToolsList_MouseDoubleClick(object sender, MouseButtonEventArgs e)
-    {
-        if (e.OriginalSource is DependencyObject source
-            && FindVisualAncestor<Button>(source) != null)
-        {
-            return;
-        }
-
-        if (ToolsList.SelectedItem is ToolEntry tool)
-            Launch(tool.ExecutablePath);
-    }
-
-    private void LoadFavorites()
-    {
-        _favoriteToolNames.Clear();
-
-        try
-        {
-            if (!File.Exists(FavoritesPath))
-                return;
-
-            foreach (var favoriteToolName in File.ReadLines(FavoritesPath)
-                .Select(line => line.Trim())
-                .Where(line => line.Length > 0))
-            {
-                _favoriteToolNames.Add(favoriteToolName);
-            }
-        }
-        catch (Exception exception) when (exception is IOException or UnauthorizedAccessException)
-        {
-            _favoriteToolNames.Clear();
-        }
-    }
-
-    private static T? FindVisualAncestor<T>(DependencyObject source) where T : DependencyObject
-    {
-        DependencyObject? current = source;
-        while (current != null)
-        {
-            if (current is T ancestor)
-                return ancestor;
-
-            current = VisualTreeHelper.GetParent(current);
-        }
-
-        return null;
-    }
-
-    private void OpenToolsFolder_Click(object sender, RoutedEventArgs e)
-    {
-        if (!Directory.Exists(ApplicationsPath))
-        {
-            ShowMissingItem("The Apps folder was not found.");
-            return;
-        }
-
-        Launch(ApplicationsPath);
-    }
-
-    private void OpenDocumentation_Click(object sender, RoutedEventArgs e) => Launch("https://openkh.dev/");
-
-    private static void Launch(string target, params string[] arguments)
-    {
-        try
-        {
-            var workingDirectory = File.Exists(target)
-                ? Path.GetDirectoryName(target)
-                : AppContext.BaseDirectory;
-
-            var startInfo = new ProcessStartInfo
-            {
-                FileName = target,
-                WorkingDirectory = workingDirectory,
-                UseShellExecute = true,
-            };
-
-            foreach (var argument in arguments)
-                startInfo.ArgumentList.Add(argument);
-
-            Process.Start(startInfo);
-        }
-        catch (Exception exception)
-        {
-            MessageBox.Show(
-                $"OpenKH could not open this item.\n\n{exception.Message}",
-                "Unable to open item",
-                MessageBoxButton.OK,
-                MessageBoxImage.Error
-            );
-        }
-    }
-
-    private static void ShowMissingItem(string message)
-    {
-        MessageBox.Show(message, "Item not found", MessageBoxButton.OK, MessageBoxImage.Information);
-    }
-
-    private sealed class ToolEntry
-    {
-        public string Identifier { get; }
-        public string DisplayName { get; }
-        public string Description { get; }
-        public string ExecutablePath { get; }
-        public bool IsFavorite { get; set; }
-        public string Initial => DisplayName.Length == 0 ? "?" : DisplayName[..1].ToUpperInvariant();
-        public string FavoriteSymbol => IsFavorite ? "★" : "☆";
-        public string FavoriteAction => IsFavorite
-            ? $"Remove {DisplayName} from favorites"
-            : $"Add {DisplayName} to favorites";
-
-        public ToolEntry(
-            string identifier,
-            string displayName,
-            string description,
-            string executablePath,
-            bool isFavorite
-        )
-        {
-            Identifier = identifier;
-            DisplayName = displayName;
-            Description = description;
-            ExecutablePath = executablePath;
-            IsFavorite = isFavorite;
-        }
-    }
-}
diff --git a/OpenKh.Tools.Launcher/MessageDialog.cs b/OpenKh.Tools.Launcher/MessageDialog.cs
new file mode 100644
index 000000000..7edeba4f9
--- /dev/null
+++ b/OpenKh.Tools.Launcher/MessageDialog.cs
@@ -0,0 +1,113 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Layout;
+using Avalonia.Media;
+using Avalonia.Threading;
+using OpenKh.Tools.ModsManager.Avalonia.Services;
+
+namespace OpenKh.Tools.Launcher;
+
+internal sealed class MessageDialog : Window
+{
+    private IDisposable? _controllerCapture;
+
+    public MessageDialog(string title, string message, bool showCancel = false)
+    {
+        Title = title;
+        Width = 520;
+        MinWidth = 360;
+        SizeToContent = SizeToContent.Height;
+        CanResize = false;
+        WindowStartupLocation = WindowStartupLocation.CenterOwner;
+        Background = Brush.Parse("#0D1420");
+
+        var okButton = new Button
+        {
+            Content = showCancel ? "Continue" : "OK",
+            Classes = { "primary" },
+            MinWidth = 110,
+        };
+        okButton.Click += (_, _) => Close(true);
+
+        var buttonPanel = new StackPanel
+        {
+            Orientation = Orientation.Horizontal,
+            HorizontalAlignment = HorizontalAlignment.Right,
+            Spacing = 10,
+            Children = { okButton },
+        };
+
+        if (showCancel)
+        {
+            var cancelButton = new Button
+            {
+                Content = "Cancel",
+                Classes = { "secondary" },
+                MinWidth = 110,
+            };
+            cancelButton.Click += (_, _) => Close(false);
+            buttonPanel.Children.Insert(0, cancelButton);
+        }
+
+        Content = new StackPanel
+        {
+            Margin = new Thickness(24),
+            Spacing = 22,
+            Children =
+            {
+                new TextBlock
+                {
+                    Text = message,
+                    Foreground = Brush.Parse("#F5F7FB"),
+                    FontSize = 15,
+                    TextWrapping = TextWrapping.Wrap,
+                    LineHeight = 22,
+                },
+                buttonPanel,
+            },
+        };
+
+        Opened += (_, _) =>
+        {
+            okButton.Focus();
+            if (Avalonia.Application.Current is App app)
+                _controllerCapture = app.Controller.Capture(HandleControllerAction);
+        };
+        Closed += (_, _) => _controllerCapture?.Dispose();
+    }
+
+    public static async Task<bool> ShowAsync(Window owner, string title, string message, bool showCancel = false) =>
+        await new MessageDialog(title, message, showCancel).ShowDialog<bool>(owner);
+
+    private void HandleControllerAction(ControllerAction action)
+    {
+        Dispatcher.UIThread.Post(() =>
+        {
+            if (ControllerWindowNavigator.TryMoveFocus(this, action))
+                return;
+
+            if (action is ControllerAction.PreviousControl or ControllerAction.PreviousItem or ControllerAction.PreviousGame)
+            {
+                ControllerWindowNavigator.MoveFocus(this, -1);
+                return;
+            }
+            if (action is ControllerAction.NextControl or ControllerAction.NextItem or ControllerAction.NextGame)
+            {
+                ControllerWindowNavigator.MoveFocus(this, 1);
+                return;
+            }
+            if (action == ControllerAction.Cancel)
+            {
+                Close(false);
+                return;
+            }
+            if (action == ControllerAction.Confirm && FocusManager?.GetFocusedElement() is Button button)
+            {
+                button.RaiseEvent(new Avalonia.Interactivity.RoutedEventArgs(Button.ClickEvent));
+                return;
+            }
+            if (action == ControllerAction.Confirm)
+                Close(true);
+        });
+    }
+}
diff --git a/OpenKh.Tools.Launcher/OpenKh.Tools.Launcher.csproj b/OpenKh.Tools.Launcher/OpenKh.Tools.Launcher.csproj
index c0a4da0e3..0c672a8ba 100644
--- a/OpenKh.Tools.Launcher/OpenKh.Tools.Launcher.csproj
+++ b/OpenKh.Tools.Launcher/OpenKh.Tools.Launcher.csproj
@@ -2,8 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net8.0-windows</TargetFramework>
-    <UseWPF>true</UseWPF>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <AssemblyName>OpenKh.Launcher</AssemblyName>
@@ -14,20 +13,31 @@
     <Company>OpenKH</Company>
     <Description>Start OpenKH applications from one organized place.</Description>
     <ApplicationIcon>..\images\openKH_Old.ico</ApplicationIcon>
+    <AvaloniaUseCompiledBindingsByDefault>false</AvaloniaUseCompiledBindingsByDefault>
   </PropertyGroup>
 
   <ItemGroup>
-    <Resource Include="..\images\OpenKH.png" Link="Assets\OpenKH.png" />
+    <AvaloniaResource Include="..\images\OpenKH.png" Link="Assets\OpenKH.png" />
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Avalonia" Version="12.1.0" />
+    <PackageReference Include="Avalonia.Desktop" Version="12.1.0" />
+    <PackageReference Include="Avalonia.Fonts.Inter" Version="12.1.0" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="12.1.0" />
     <PackageReference Include="Octokit" Version="14.0.0" />
+    <PackageReference Include="SDL3-CS" Version="3.4.12.3" />
+    <PackageReference Include="SDL3-CS.Linux" Version="3.4.12.1" />
+    <PackageReference Include="SDL3-CS.Windows" Version="3.4.12.1" />
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Include="..\OpenKh.Tools.ModsManager\Services\OpenkhInstallation.cs" Link="Updates\OpenkhInstallation.cs" />
-    <Compile Include="..\OpenKh.Tools.ModsManager\Services\OpenkhUpdateCheckerService.cs" Link="Updates\OpenkhUpdateCheckerService.cs" />
-    <Compile Include="..\OpenKh.Tools.ModsManager\Services\OpenkhUpdateProceederService.cs" Link="Updates\OpenkhUpdateProceederService.cs" />
+    <Compile Include="..\OpenKh.Tools.ModsManager.Avalonia\Services\ControllerAction.cs" Link="Input\ControllerAction.cs" />
+    <Compile Include="..\OpenKh.Tools.ModsManager.Avalonia\Services\ControllerWindowNavigator.cs" Link="Input\ControllerWindowNavigator.cs" />
+    <Compile Include="..\OpenKh.Tools.ModsManager.Avalonia\Services\IControllerInputService.cs" Link="Input\IControllerInputService.cs" />
+    <Compile Include="..\OpenKh.Tools.ModsManager.Avalonia\Services\SdlControllerInputService.cs" Link="Input\SdlControllerInputService.cs" />
+    <Compile Include="..\OpenKh.Tools.ModsManager.Avalonia\Services\SpatialNavigation.cs" Link="Input\SpatialNavigation.cs" />
+    <Compile Include="..\OpenKh.Tools.ModsManager.Avalonia\Services\VirtualKeyboardService.cs" Link="Input\VirtualKeyboardService.cs" />
   </ItemGroup>
 
 </Project>
diff --git a/OpenKh.Tools.Launcher/Program.cs b/OpenKh.Tools.Launcher/Program.cs
new file mode 100644
index 000000000..9680eda10
--- /dev/null
+++ b/OpenKh.Tools.Launcher/Program.cs
@@ -0,0 +1,15 @@
+using Avalonia;
+
+namespace OpenKh.Tools.Launcher;
+
+internal static class Program
+{
+    [STAThread]
+    public static void Main(string[] args) => BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);
+
+    public static AppBuilder BuildAvaloniaApp() => AppBuilder
+        .Configure<App>()
+        .UsePlatformDetect()
+        .WithInterFont()
+        .LogToTrace();
+}
diff --git a/OpenKh.Tools.Launcher/Properties/AssemblyInfo.cs b/OpenKh.Tools.Launcher/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..f19fef779
--- /dev/null
+++ b/OpenKh.Tools.Launcher/Properties/AssemblyInfo.cs
@@ -0,0 +1,3 @@
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("OpenKh.Tests.Launcher.Avalonia")]
diff --git a/OpenKh.Tools.Launcher/README.md b/OpenKh.Tools.Launcher/README.md
new file mode 100644
index 000000000..e7a801058
--- /dev/null
+++ b/OpenKh.Tools.Launcher/README.md
@@ -0,0 +1,27 @@
+# OpenKH Launcher
+
+The launcher is the cross-platform entry point for OpenKH releases. It keeps the Mod Manager separate from creator tools and runs on Windows, Linux, and Steam Deck.
+
+## Features
+
+- Opens the packaged Mod Manager without exposing application files to regular users.
+- Lists creator tools from the `Apps` directory with search and persistent favorites.
+- Checks for OpenKH updates and installs them without opening the Mod Manager first.
+- Creates Windows shortcuts and Linux desktop entries.
+- Migrates the previous release layout on first launch.
+- Supports SDL gamepads throughout the interface.
+- Uses Steam launcher mode when Steam Input owns the controller.
+- Opens the Steam Deck floating keyboard when a text field receives focus.
+- Runs from a single AppImage while keeping user data in the standard Linux data directory.
+
+## Publish
+
+```powershell
+.\publish.ps1 -Target All
+```
+
+The script creates self-contained, single-file builds for Windows, Linux, and Steam Deck.
+
+The release workflow also packages the Linux Launcher and Mod Manager as
+`openkh-x86_64.AppImage`. The AppImage build uses the prepared Linux release
+layout, so it contains the same Panacea files as the portable `tar.gz` archive.
diff --git a/OpenKh.Tools.Launcher/Updates/LauncherInstallation.cs b/OpenKh.Tools.Launcher/Updates/LauncherInstallation.cs
new file mode 100644
index 000000000..15ab9d12a
--- /dev/null
+++ b/OpenKh.Tools.Launcher/Updates/LauncherInstallation.cs
@@ -0,0 +1,63 @@
+namespace OpenKh.Tools.Launcher.Updates;
+
+public static class LauncherInstallation
+{
+    public const string DataRootEnvironmentVariable = "OPENKH_DATA_ROOT";
+
+    public static string RootDirectory => DetectRoot(AppContext.BaseDirectory);
+    // AppImage mounts application files read-only, so AppRun redirects mutable data here.
+    public static string DataDirectory => DetectDataDirectory(
+        RootDirectory,
+        Environment.GetEnvironmentVariable(DataRootEnvironmentVariable));
+    public static string? AppImagePath => GetAbsoluteEnvironmentPath("APPIMAGE");
+    public static bool IsAppImage => OperatingSystem.IsLinux() && AppImagePath is not null;
+
+    public static string DetectRoot(string applicationBaseDirectory)
+    {
+        var applicationDirectory = new DirectoryInfo(
+            Path.GetFullPath(applicationBaseDirectory).TrimEnd(
+                Path.DirectorySeparatorChar,
+                Path.AltDirectorySeparatorChar));
+
+        if (applicationDirectory.Name.Equals("Apps", StringComparison.OrdinalIgnoreCase) &&
+            applicationDirectory.Parent is not null)
+        {
+            return applicationDirectory.Parent.FullName;
+        }
+
+        if (applicationDirectory.Name.Equals("ModManager", StringComparison.OrdinalIgnoreCase) &&
+            applicationDirectory.Parent?.Name.Equals("Apps", StringComparison.OrdinalIgnoreCase) == true &&
+            applicationDirectory.Parent.Parent is not null)
+        {
+            return applicationDirectory.Parent.Parent.FullName;
+        }
+
+        return applicationDirectory.FullName;
+    }
+
+    public static string FindModManagerExecutable(string installationDirectory)
+    {
+        var executableName = OperatingSystem.IsWindows()
+            ? "OpenKh.Tools.ModsManager.exe"
+            : "OpenKh.Tools.ModsManager";
+        var candidates = new[]
+        {
+            Path.Combine(installationDirectory, "Apps", executableName),
+            Path.Combine(installationDirectory, "Apps", "ModManager", executableName),
+            Path.Combine(installationDirectory, executableName),
+        };
+
+        return candidates.FirstOrDefault(File.Exists) ?? candidates[0];
+    }
+
+    public static string DetectDataDirectory(string installationDirectory, string? configuredDataRoot) =>
+        string.IsNullOrWhiteSpace(configuredDataRoot)
+            ? Path.GetFullPath(installationDirectory)
+            : Path.GetFullPath(configuredDataRoot);
+
+    private static string? GetAbsoluteEnvironmentPath(string variableName)
+    {
+        var value = Environment.GetEnvironmentVariable(variableName);
+        return string.IsNullOrWhiteSpace(value) ? null : Path.GetFullPath(value);
+    }
+}
diff --git a/OpenKh.Tools.ModsManager/Services/OpenkhUpdateCheckerService.cs b/OpenKh.Tools.Launcher/Updates/OpenKhReleaseUpdateCheckerService.cs
similarity index 68%
rename from OpenKh.Tools.ModsManager/Services/OpenkhUpdateCheckerService.cs
rename to OpenKh.Tools.Launcher/Updates/OpenKhReleaseUpdateCheckerService.cs
index f187083be..672403c40 100644
--- a/OpenKh.Tools.ModsManager/Services/OpenkhUpdateCheckerService.cs
+++ b/OpenKh.Tools.Launcher/Updates/OpenKhReleaseUpdateCheckerService.cs
@@ -1,68 +1,81 @@
-using Octokit;
-using System;
-using System.IO;
-using System.Linq;
-using System.Text.RegularExpressions;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace OpenKh.Tools.ModsManager.Services
-{
-    public class OpenkhUpdateCheckerService
-    {
-        public record CheckResult(bool HasUpdate, string CurrentVersion, string NewVersion, string DownloadZipUrl);
-
-        private static readonly Regex _validTag = new Regex("^release2-(?<build>\\d+)$");
-
-        public async Task<CheckResult> CheckAsync(CancellationToken cancellation)
-        {
-            var gitClient = new GitHubClient(new ProductHeaderValue("OpenKh.Tools.ModsManager"));
-            var releases = await gitClient.Repository.Release.GetAll(
-                owner: "OpenKh",
-                name: "OpenKh",
-                options: new ApiOptions
-                {
-                    PageCount = 1,
-                    PageSize = 10,
-                    StartPage = 1
-                }
-            );
-            var latestAssets = releases
-                .OrderByDescending(release => release.CreatedAt)
-                .Where(release => _validTag.IsMatch(release.TagName))
-                .SelectMany(
-                    release => release.Assets
-                        .Where(asset => asset.Name == "openkh.zip" && asset.State == "uploaded")
-                        .Select(asset => (Release: release, Asset: asset))
-                )
-                .Take(1)
-                .ToArray();
-
-            if (latestAssets.Any())
-            {
-                var latestAsset = latestAssets.First();
-
-                var remoteReleaseTag = latestAsset.Release.TagName;
-
-                var localReleaseTagFile = Path.Combine(OpenkhInstallation.Directory, "openkh-release");
-                var localReleaseTag = File.Exists(localReleaseTagFile)
-                    ? File.ReadAllLines(localReleaseTagFile).First()
-                    : "(Unknown version)";
-
-                return new CheckResult(
-                    HasUpdate: localReleaseTag != remoteReleaseTag,
-                    CurrentVersion: localReleaseTag,
-                    NewVersion: remoteReleaseTag,
-                    DownloadZipUrl: latestAsset.Asset.BrowserDownloadUrl
-                );
-            }
-
-            return new CheckResult(
-                HasUpdate: false,
-                CurrentVersion: "",
-                NewVersion: "",
-                DownloadZipUrl: ""
-            );
-        }
-    }
-}
+using Octokit;
+using System;
+using System.IO;
+using System.Linq;
+using System.Text.RegularExpressions;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace OpenKh.Tools.Launcher.Updates
+{
+    public class OpenKhReleaseUpdateCheckerService
+    {
+        public record CheckResult(bool HasUpdate, string CurrentVersion, string NewVersion, string DownloadUrl);
+
+        private static readonly Regex _validTag = new Regex("^release2-(?<build>\\d+)$");
+        private readonly string _installationDirectory;
+
+        public OpenKhReleaseUpdateCheckerService(string installationDirectory)
+        {
+            _installationDirectory = installationDirectory;
+        }
+
+        public async Task<CheckResult> CheckAsync(CancellationToken cancellation)
+        {
+            var gitClient = new GitHubClient(new ProductHeaderValue("OpenKh.Tools.ModsManager"));
+            var releases = await gitClient.Repository.Release.GetAll(
+                owner: "OpenKh",
+                name: "OpenKh",
+                options: new ApiOptions
+                {
+                    PageCount = 1,
+                    PageSize = 10,
+                    StartPage = 1
+                }
+            );
+            var latestAssets = releases
+                .OrderByDescending(release => release.CreatedAt)
+                .Where(release => _validTag.IsMatch(release.TagName))
+                .SelectMany(
+                    release => release.Assets
+                        .Where(asset => asset.Name == GetReleaseAssetName() && asset.State == "uploaded")
+                        .Select(asset => (Release: release, Asset: asset))
+                )
+                .Take(1)
+                .ToArray();
+
+            if (latestAssets.Any())
+            {
+                var latestAsset = latestAssets.First();
+
+                var remoteReleaseTag = latestAsset.Release.TagName;
+
+                var localReleaseTagFile = Path.Combine(_installationDirectory, "openkh-release");
+                var localReleaseTag = File.Exists(localReleaseTagFile)
+                    ? File.ReadAllLines(localReleaseTagFile).First()
+                    : "(Unknown version)";
+
+                return new CheckResult(
+                    HasUpdate: localReleaseTag != remoteReleaseTag,
+                    CurrentVersion: localReleaseTag,
+                    NewVersion: remoteReleaseTag,
+                    DownloadUrl: latestAsset.Asset.BrowserDownloadUrl
+                );
+            }
+
+            return new CheckResult(
+                HasUpdate: false,
+                CurrentVersion: "",
+                NewVersion: "",
+                DownloadUrl: ""
+            );
+        }
+
+        private static string GetReleaseAssetName() =>
+            OperatingSystem.IsWindows()
+                ? "openkh.zip"
+                : LauncherInstallation.IsAppImage
+                    ? "openkh-x86_64.AppImage"
+                    : "openkh-linux-x64.tar.gz";
+    }
+}
diff --git a/OpenKh.Tools.Launcher/Updates/OpenKhUpdateInstallerService.cs b/OpenKh.Tools.Launcher/Updates/OpenKhUpdateInstallerService.cs
new file mode 100644
index 000000000..1200869f4
--- /dev/null
+++ b/OpenKh.Tools.Launcher/Updates/OpenKhUpdateInstallerService.cs
@@ -0,0 +1,293 @@
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.IO.Compression;
+using System.Formats.Tar;
+using System.Net.Http;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace OpenKh.Tools.Launcher.Updates
+{
+    public class OpenKhUpdateInstallerService
+    {
+        private readonly string _installationDirectory;
+
+        public OpenKhUpdateInstallerService(string installationDirectory)
+        {
+            _installationDirectory = installationDirectory;
+        }
+
+        public async Task UpdateAsync(
+            string downloadUrl,
+            Action<float> progress,
+            CancellationToken cancellation,
+            string executableToRestart = ""
+        )
+        {
+            if (LauncherInstallation.IsAppImage && LauncherInstallation.AppImagePath is { } appImagePath)
+            {
+                await UpdateAppImageAsync(downloadUrl, appImagePath, progress, cancellation);
+                return;
+            }
+
+            var tempId = Guid.NewGuid().ToString("N");
+            var archiveExtension = OperatingSystem.IsWindows() ? ".zip" : ".tar.gz";
+            var tempArchiveFile = Path.Combine(Path.GetTempPath(), $"openkh-{tempId}{archiveExtension}");
+
+            using (var client = new HttpClient())
+            {
+                using (var archiveOutput = File.Create(tempArchiveFile))
+                {
+                    using (var resp = await client.GetAsync(downloadUrl, cancellation))
+                    {
+                        resp.EnsureSuccessStatusCode();
+                        var maxLen = resp.Content.Headers.ContentLength;
+                        var archiveInput = await resp.Content.ReadAsStreamAsync(cancellation);
+                        await CopyToAsyncWithProgress(archiveInput, archiveOutput, maxLen, progress, cancellation);
+                    }
+                }
+            }
+
+            var tempArchiveDirectory = Path.Combine(Path.GetTempPath(), $"openkh-{tempId}");
+            Directory.CreateDirectory(tempArchiveDirectory);
+
+            ExtractArchive(tempArchiveFile, tempArchiveDirectory);
+
+            File.Delete(tempArchiveFile);
+            var extractedDirectories = Directory.GetDirectories(tempArchiveDirectory);
+            var extractedFiles = Directory.GetFiles(tempArchiveDirectory);
+            var copyFrom = extractedDirectories.Length == 1 && extractedFiles.Length == 0
+                ? extractedDirectories[0]
+                : tempArchiveDirectory;
+            var copyTo = _installationDirectory;
+            var packagedModManagerExecutable = Path.Combine(
+                copyFrom,
+                "Apps",
+                "OpenKh.Tools.ModsManager.exe"
+            );
+            var previousPackagedModManagerExecutable = Path.Combine(
+                copyFrom,
+                "Apps",
+                "ModManager",
+                "OpenKh.Tools.ModsManager.exe"
+            );
+            var modManagerExecutable = File.Exists(packagedModManagerExecutable)
+                ? Path.Combine(copyTo, "Apps", "OpenKh.Tools.ModsManager.exe")
+                : File.Exists(previousPackagedModManagerExecutable)
+                    ? Path.Combine(copyTo, "Apps", "ModManager", "OpenKh.Tools.ModsManager.exe")
+                    : LauncherInstallation.FindModManagerExecutable(copyTo);
+            var restartExecutable = string.IsNullOrWhiteSpace(executableToRestart)
+                ? modManagerExecutable
+                : executableToRestart;
+
+            if (!OperatingSystem.IsWindows())
+            {
+                await StartUnixUpdateAsync(tempId, tempArchiveDirectory, copyFrom, copyTo, restartExecutable);
+                return;
+            }
+
+            var tempBatFile = Path.Combine(Path.GetTempPath(), $"openkh-{tempId}.bat");
+            await CreateBatchFileAsync(
+                tempBatFile: tempBatFile,
+                copyFrom: copyFrom,
+                copyTo: copyTo,
+                processesToStop: new[]
+                {
+                    Path.GetFileName(restartExecutable),
+                    "OpenKh.Launcher.exe",
+                    "OpenKh.Tools.ModsManager.exe",
+                },
+                execAfter: $"start \"\" \"{restartExecutable}\""
+            );
+
+            Process.Start(
+                new ProcessStartInfo(
+                    tempBatFile
+                )
+                {
+                    UseShellExecute = true,
+                }
+            );
+        }
+
+        private static async Task StartUnixUpdateAsync(
+            string tempId,
+            string temporaryDirectory,
+            string copyFrom,
+            string copyTo,
+            string restartExecutable
+        )
+        {
+            var scriptPath = Path.Combine(Path.GetTempPath(), $"openkh-{tempId}.sh");
+            var script = new StringBuilder()
+                .AppendLine("#!/bin/sh")
+                .AppendLine($"while kill -0 {Environment.ProcessId} 2>/dev/null; do sleep 0.2; done")
+                .AppendLine($"mkdir -p {EscapeShellArg(copyTo)}")
+                .AppendLine($"cp -a {EscapeShellArg(Path.Combine(copyFrom, "."))} {EscapeShellArg(copyTo)}")
+                .AppendLine($"chmod +x {EscapeShellArg(restartExecutable)} 2>/dev/null || true")
+                .AppendLine($"rm -rf {EscapeShellArg(temporaryDirectory)}")
+                .AppendLine($"{EscapeShellArg(restartExecutable)} >/dev/null 2>&1 &")
+                .AppendLine($"rm -f {EscapeShellArg(scriptPath)}")
+                .ToString();
+            await File.WriteAllTextAsync(scriptPath, script, new UTF8Encoding(false));
+            if (OperatingSystem.IsLinux() || OperatingSystem.IsFreeBSD())
+            {
+                File.SetUnixFileMode(
+                    scriptPath,
+                    UnixFileMode.UserRead | UnixFileMode.UserWrite | UnixFileMode.UserExecute
+                );
+            }
+            Process.Start(new ProcessStartInfo
+            {
+                FileName = "/bin/sh",
+                UseShellExecute = false,
+                CreateNoWindow = true,
+                ArgumentList = { scriptPath },
+            });
+        }
+
+        internal static void ExtractArchive(string archivePath, string destinationDirectory)
+        {
+            if (archivePath.EndsWith(".tar.gz", StringComparison.OrdinalIgnoreCase))
+            {
+                using var archive = File.OpenRead(archivePath);
+                using var gzip = new GZipStream(archive, CompressionMode.Decompress);
+                TarFile.ExtractToDirectory(gzip, destinationDirectory, overwriteFiles: false);
+                return;
+            }
+
+            if (archivePath.EndsWith(".zip", StringComparison.OrdinalIgnoreCase))
+            {
+                ZipFile.ExtractToDirectory(archivePath, destinationDirectory);
+                return;
+            }
+
+            throw new InvalidDataException($"Unsupported OpenKH update archive: {Path.GetFileName(archivePath)}");
+        }
+
+        private static async Task UpdateAppImageAsync(
+            string downloadUrl,
+            string currentAppImage,
+            Action<float> progress,
+            CancellationToken cancellation)
+        {
+            if (!OperatingSystem.IsLinux())
+                throw new PlatformNotSupportedException("AppImage updates are only supported on Linux.");
+
+            var appImageDirectory = Path.GetDirectoryName(currentAppImage)
+                ?? throw new InvalidOperationException("The AppImage directory could not be determined.");
+            var writeProbe = Path.Combine(appImageDirectory, $".openkh-write-test-{Guid.NewGuid():N}");
+            await File.WriteAllTextAsync(writeProbe, string.Empty, cancellation);
+            File.Delete(writeProbe);
+
+            var tempId = Guid.NewGuid().ToString("N");
+            var downloadedAppImage = Path.Combine(Path.GetTempPath(), $"openkh-{tempId}.AppImage");
+            using (var client = new HttpClient())
+            using (var output = File.Create(downloadedAppImage))
+            using (var response = await client.GetAsync(
+                downloadUrl,
+                HttpCompletionOption.ResponseHeadersRead,
+                cancellation))
+            {
+                response.EnsureSuccessStatusCode();
+                var input = await response.Content.ReadAsStreamAsync(cancellation);
+                await CopyToAsyncWithProgress(
+                    input,
+                    output,
+                    response.Content.Headers.ContentLength,
+                    progress,
+                    cancellation);
+            }
+
+            File.SetUnixFileMode(
+                downloadedAppImage,
+                UnixFileMode.UserRead | UnixFileMode.UserWrite | UnixFileMode.UserExecute |
+                UnixFileMode.GroupRead | UnixFileMode.GroupExecute |
+                UnixFileMode.OtherRead | UnixFileMode.OtherExecute);
+
+            var scriptPath = Path.Combine(Path.GetTempPath(), $"openkh-{tempId}.sh");
+            // The mounted AppImage cannot replace its backing file until this process exits.
+            var script = new StringBuilder()
+                .AppendLine("#!/bin/sh")
+                .AppendLine($"while kill -0 {Environment.ProcessId} 2>/dev/null; do sleep 0.2; done")
+                .AppendLine($"if mv -f {EscapeShellArg(downloadedAppImage)} {EscapeShellArg(currentAppImage)}; then")
+                .AppendLine($"  chmod +x {EscapeShellArg(currentAppImage)}")
+                .AppendLine("else")
+                .AppendLine($"  rm -f {EscapeShellArg(downloadedAppImage)}")
+                .AppendLine("fi")
+                .AppendLine($"{EscapeShellArg(currentAppImage)} >/dev/null 2>&1 &")
+                .AppendLine($"rm -f {EscapeShellArg(scriptPath)}")
+                .ToString();
+            await File.WriteAllTextAsync(scriptPath, script, new UTF8Encoding(false), cancellation);
+            File.SetUnixFileMode(
+                scriptPath,
+                UnixFileMode.UserRead | UnixFileMode.UserWrite | UnixFileMode.UserExecute);
+            Process.Start(new ProcessStartInfo
+            {
+                FileName = "/bin/sh",
+                UseShellExecute = false,
+                CreateNoWindow = true,
+                ArgumentList = { scriptPath },
+            });
+        }
+
+        private static async Task CopyToAsyncWithProgress(Stream input, Stream output, long? maxLen, Action<float> progress, CancellationToken cancellation)
+        {
+            byte[] buffer = new byte[8192];
+            var totalTransferred = 0L;
+            while (true)
+            {
+                var read = await input.ReadAsync(buffer, cancellation);
+                if (read <= 0)
+                {
+                    break;
+                }
+                await output.WriteAsync(buffer.AsMemory(0, read), cancellation);
+                totalTransferred += read;
+                if (maxLen != null)
+                {
+                    progress?.Invoke((totalTransferred * 1.0f / maxLen.Value));
+                }
+            }
+        }
+
+        private async Task CreateBatchFileAsync(
+            string tempBatFile,
+            string copyFrom,
+            string copyTo,
+            string[] processesToStop,
+            string execAfter
+        )
+        {
+            var bat = new StringWriter();
+            bat.WriteLine($"chcp 65001");
+            foreach (var processToStop in processesToStop)
+                bat.WriteLine($"taskkill /f /im {EscapeRobocopyArg(processToStop)} >nul 2>&1");
+            bat.WriteLine($"robocopy  {EscapeRobocopyArg(copyFrom)} {EscapeRobocopyArg(copyTo)} /e");
+            bat.WriteLine($"if errorlevel 8 pause");
+            bat.WriteLine($"{execAfter}");
+            bat.WriteLine($"rd /s /q \"{copyFrom}\"");
+            bat.WriteLine($"del %0");
+            await File.WriteAllTextAsync(tempBatFile, bat.ToString(), Encoding.UTF8);
+        }
+
+        private string EscapeRobocopyArg(string arg)
+        {
+            if (0 <= arg.IndexOfAny(new char[] { ' ', '"' }))
+            {
+                var escaped1 = arg.Replace("\"", "\"\"");
+                var escaped2 = escaped1.EndsWith('\\') ? $"{escaped1}\\" : escaped1;
+                return $"\"{escaped2}\"";
+            }
+            else
+            {
+                return arg;
+            }
+        }
+
+        private static string EscapeShellArg(string value) =>
+            $"'{value.Replace("'", "'\\''")}'";
+    }
+}
diff --git a/OpenKh.Tools.Launcher/publish.ps1 b/OpenKh.Tools.Launcher/publish.ps1
new file mode 100644
index 000000000..343e7407c
--- /dev/null
+++ b/OpenKh.Tools.Launcher/publish.ps1
@@ -0,0 +1,41 @@
+param(
+    [ValidateSet("All", "Windows", "Linux", "SteamDeck")]
+    [string] $Target = "All",
+    [string] $Configuration = "Release",
+    [string] $OutputDirectory = "artifacts"
+)
+
+$project = Join-Path $PSScriptRoot "OpenKh.Tools.Launcher.csproj"
+$outputRoot = Join-Path $PSScriptRoot $OutputDirectory
+
+function Publish-Target([string] $runtime, [string] $folder) {
+    $output = Join-Path $outputRoot $folder
+    dotnet publish $project `
+        --configuration $Configuration `
+        --runtime $runtime `
+        --self-contained true `
+        --source "https://api.nuget.org/v3/index.json" `
+        --output $output `
+        -p:PublishSingleFile=true `
+        -p:IncludeNativeLibrariesForSelfExtract=true `
+        -p:DebugType=None `
+        -p:DebugSymbols=false
+
+    if ($LASTEXITCODE -ne 0) {
+        throw "Publishing $folder failed with exit code $LASTEXITCODE."
+    }
+
+    Get-ChildItem $output -Filter "*.pdb" -File | Remove-Item -Force
+}
+
+if ($Target -in @("All", "Windows")) {
+    Publish-Target "win-x64" "windows-x64"
+}
+
+if ($Target -in @("All", "Linux")) {
+    Publish-Target "linux-x64" "linux-x64"
+}
+
+if ($Target -in @("All", "SteamDeck")) {
+    Publish-Target "linux-x64" "steam-deck"
+}
diff --git a/OpenKh.Tools.ModsManager.Avalonia/.gitignore b/OpenKh.Tools.ModsManager.Avalonia/.gitignore
new file mode 100644
index 000000000..32938785c
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Avalonia/.gitignore
@@ -0,0 +1,2 @@
+artifacts/
+preview-data/
diff --git a/OpenKh.Tools.ModsManager.Avalonia/App.axaml b/OpenKh.Tools.ModsManager.Avalonia/App.axaml
new file mode 100644
index 000000000..88c40c982
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Avalonia/App.axaml
@@ -0,0 +1,72 @@
+<Application xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             x:Class="OpenKh.Tools.ModsManager.Avalonia.App"
+             RequestedThemeVariant="Dark">
+  <Application.Styles>
+    <FluentTheme />
+    <Style Selector="Window">
+      <Setter Property="Background" Value="#0B1220" />
+      <Setter Property="FontFamily" Value="avares://Avalonia.Fonts.Inter/Assets#Inter" />
+    </Style>
+    <Style Selector="Button">
+      <Setter Property="MinHeight" Value="44" />
+      <Setter Property="Padding" Value="18,10" />
+      <Setter Property="CornerRadius" Value="10" />
+      <Setter Property="FontWeight" Value="SemiBold" />
+      <Setter Property="HorizontalContentAlignment" Value="Center" />
+      <Setter Property="VerticalContentAlignment" Value="Center" />
+    </Style>
+    <Style Selector="Button.primary">
+      <Setter Property="Background" Value="#377DFF" />
+      <Setter Property="Foreground" Value="White" />
+    </Style>
+    <Style Selector="Button.subtle">
+      <Setter Property="Background" Value="#18243A" />
+      <Setter Property="Foreground" Value="#DCE7F8" />
+    </Style>
+    <Style Selector="Button:focus">
+      <Setter Property="BorderBrush" Value="#8DB5FF" />
+      <Setter Property="BorderThickness" Value="3" />
+    </Style>
+    <Style Selector="TextBox">
+      <Setter Property="MinHeight" Value="44" />
+      <Setter Property="CornerRadius" Value="10" />
+      <Setter Property="Background" Value="#111C2E" />
+      <Setter Property="VerticalContentAlignment" Value="Center" />
+      <Setter Property="Padding" Value="12,0" />
+    </Style>
+    <Style Selector="TextBox:focus">
+      <Setter Property="BorderBrush" Value="#8DB5FF" />
+      <Setter Property="BorderThickness" Value="3" />
+    </Style>
+    <Style Selector="ComboBox">
+      <Setter Property="MinHeight" Value="44" />
+      <Setter Property="CornerRadius" Value="10" />
+      <Setter Property="Background" Value="#111C2E" />
+      <Setter Property="VerticalContentAlignment" Value="Center" />
+    </Style>
+    <Style Selector="ComboBox:focus">
+      <Setter Property="BorderBrush" Value="#8DB5FF" />
+      <Setter Property="BorderThickness" Value="3" />
+    </Style>
+    <Style Selector="CheckBox:focus">
+      <Setter Property="Foreground" Value="#8DB5FF" />
+    </Style>
+    <Style Selector="ToggleSwitch:focus">
+      <Setter Property="Foreground" Value="#8DB5FF" />
+    </Style>
+    <Style Selector="Border.settings-card">
+      <Setter Property="Background" Value="#0F192A" />
+      <Setter Property="BorderBrush" Value="#22324C" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="CornerRadius" Value="14" />
+      <Setter Property="Padding" Value="20" />
+    </Style>
+    <Style Selector="Border.online-mod-panel">
+      <Setter Property="Background" Value="#0B1728" />
+      <Setter Property="BorderBrush" Value="#243A59" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="CornerRadius" Value="12" />
+    </Style>
+  </Application.Styles>
+</Application>
diff --git a/OpenKh.Tools.ModsManager.Avalonia/App.axaml.cs b/OpenKh.Tools.ModsManager.Avalonia/App.axaml.cs
new file mode 100644
index 000000000..d45880944
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Avalonia/App.axaml.cs
@@ -0,0 +1,114 @@
+using Avalonia;
+using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.Interactivity;
+using Avalonia.Markup.Xaml;
+using Avalonia.Threading;
+using OpenKh.Tools.ModsManager.Avalonia.ViewModels;
+using OpenKh.Tools.ModsManager.Avalonia.Views;
+using OpenKh.Tools.ModsManager.Avalonia.Services;
+using OpenKh.Tools.ModsManager.Core;
+
+namespace OpenKh.Tools.ModsManager.Avalonia;
+
+public sealed partial class App : Application
+{
+    private IControllerInputService? _controllerInput;
+
+    public override void Initialize() => AvaloniaXamlLoader.Load(this);
+
+    public override void OnFrameworkInitializationCompleted()
+    {
+        if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
+        {
+            var layout = InstallationLayout.Detect(AppContext.BaseDirectory, desktop.Args);
+            LegacyInstallationCleanup.Schedule(layout.RootDirectory);
+            var mainWindow = new MainWindow();
+            var configuration = new ModManagerConfigurationService(layout);
+            var localInstaller = new LocalModInstaller(configuration);
+            var repositoryInstaller = new RepositoryModInstaller(configuration, localInstaller);
+            var extractionService = new GameExtractionService(configuration);
+            var collectionSettings = new CollectionSettingsService(configuration);
+            var panaceaService = new PanaceaService(configuration);
+            var luaBackendService = new LuaBackendService(configuration);
+            var gameLaunchService = new GameLaunchService(configuration);
+            _controllerInput = new SdlControllerInputService();
+            var mainViewModel = new MainWindowViewModel(
+                new ModCatalogService(configuration),
+                repositoryInstaller,
+                new ModMaintenanceService(configuration),
+                new AvaloniaModInstallPrompt(mainWindow, _controllerInput),
+                new AvaloniaOnlineModsPrompt(
+                    mainWindow,
+                    new OnlineModCatalogService(configuration),
+                    repositoryInstaller,
+                    _controllerInput),
+                new AvaloniaPresetsPrompt(mainWindow, new PresetService(configuration), _controllerInput),
+                new AvaloniaSettingsPrompt(
+                    mainWindow,
+                    configuration,
+                    panaceaService,
+                    new OpenKhUpdateCheckerService(configuration),
+                    _controllerInput),
+                new AvaloniaInfoPrompt(mainWindow, _controllerInput),
+                new AvaloniaCreatorPrompt(mainWindow, new ModCreatorService(configuration), _controllerInput),
+                new AvaloniaUserDialogService(mainWindow, _controllerInput),
+                new AvaloniaSetupPrompt(
+                    mainWindow,
+                    configuration,
+                    panaceaService,
+                    luaBackendService,
+                    extractionService,
+                    _controllerInput),
+                configuration,
+                new ModBuildService(configuration),
+                gameLaunchService,
+                new AvaloniaCollectionSettingsPrompt(mainWindow, collectionSettings, _controllerInput),
+                new PcPackagePatchService(configuration),
+                _controllerInput);
+            mainWindow.DataContext = mainViewModel;
+            mainWindow.Opened += (_, _) => Dispatcher.UIThread.Post(
+                async () => await mainViewModel.RunInitialSetupAsync(),
+                DispatcherPriority.Background);
+            _controllerInput.ActionTriggered += mainWindow.HandleControllerAction;
+            InputElement.KeyDownEvent.AddClassHandler<Window>(HandleGlobalKeyDown, RoutingStrategies.Tunnel);
+            desktop.MainWindow = mainWindow;
+            desktop.Exit += (_, _) =>
+            {
+                gameLaunchService.Stop();
+                _controllerInput.Dispose();
+            };
+            _controllerInput.Start();
+        }
+
+        base.OnFrameworkInitializationCompleted();
+    }
+
+    private void HandleGlobalKeyDown(Window window, KeyEventArgs eventArgs)
+    {
+        if (_controllerInput is null || eventArgs.KeyModifiers != KeyModifiers.None)
+            return;
+
+        if (window.FocusManager?.GetFocusedElement() is TextBox && eventArgs.Key != Key.Escape)
+            return;
+
+        var action = eventArgs.Key switch
+        {
+            Key.Up => ControllerAction.NavigateUp,
+            Key.Down => ControllerAction.NavigateDown,
+            Key.Left => ControllerAction.NavigateLeft,
+            Key.Right => ControllerAction.NavigateRight,
+            Key.Enter or Key.Space => ControllerAction.Confirm,
+            Key.Escape => ControllerAction.Cancel,
+            Key.F5 => ControllerAction.Refresh,
+            _ => (ControllerAction?)null
+        };
+
+        if (action is not { } controllerAction)
+            return;
+
+        _controllerInput.Dispatch(controllerAction);
+        eventArgs.Handled = true;
+    }
+}
diff --git a/OpenKh.Tools.ModsManager.Avalonia/OpenKh.Tools.ModsManager.csproj b/OpenKh.Tools.ModsManager.Avalonia/OpenKh.Tools.ModsManager.csproj
new file mode 100644
index 000000000..05ac253d3
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Avalonia/OpenKh.Tools.ModsManager.csproj
@@ -0,0 +1,42 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <AssemblyName>OpenKh.Tools.ModsManager</AssemblyName>
+    <Product>OpenKH Mod Manager</Product>
+    <AvaloniaUseCompiledBindingsByDefault>false</AvaloniaUseCompiledBindingsByDefault>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Avalonia" Version="12.1.0" />
+    <PackageReference Include="Avalonia.Desktop" Version="12.1.0" />
+    <PackageReference Include="Avalonia.Fonts.Inter" Version="12.1.0" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="12.1.0" />
+    <PackageReference Include="SDL3-CS" Version="3.4.12.3" />
+    <PackageReference Include="SDL3-CS.Linux" Version="3.4.12.1" />
+    <PackageReference Include="SDL3-CS.Windows" Version="3.4.12.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\OpenKh.Tools.ModsManager.Core\OpenKh.Tools.ModsManager.Core.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <AvaloniaResource Include="..\images\OpenKH.png" Link="Assets\OpenKH.png" />
+    <None Include="..\OpenKh.Research.Panacea\Release\OpenKH.Panacea.dll"
+          Link="OpenKH.Panacea.dll"
+          CopyToOutputDirectory="PreserveNewest"
+          CopyToPublishDirectory="PreserveNewest"
+          Condition="Exists('..\OpenKh.Research.Panacea\Release\OpenKH.Panacea.dll')" />
+    <None Include="..\OpenKh.Research.Panacea\Dependencies\*.dll"
+          Link="%(Filename)%(Extension)"
+          CopyToOutputDirectory="PreserveNewest"
+          CopyToPublishDirectory="PreserveNewest" />
+    <Compile Remove="artifacts\**\*.cs" />
+    <Compile Remove="preview-data\**\*.cs" />
+  </ItemGroup>
+
+</Project>
diff --git a/OpenKh.Tools.ModsManager.Avalonia/Packaging/SteamDeck/install-openkh-mod-manager.sh b/OpenKh.Tools.ModsManager.Avalonia/Packaging/SteamDeck/install-openkh-mod-manager.sh
new file mode 100644
index 000000000..5aecd9f52
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Avalonia/Packaging/SteamDeck/install-openkh-mod-manager.sh
@@ -0,0 +1,23 @@
+#!/usr/bin/env sh
+set -eu
+
+SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
+APPLICATIONS_DIR="$HOME/.local/share/applications"
+DESKTOP_FILE="$APPLICATIONS_DIR/openkh-mod-manager.desktop"
+
+mkdir -p "$APPLICATIONS_DIR"
+chmod +x "$SCRIPT_DIR/OpenKh.Tools.ModsManager"
+
+{
+    printf '%s\n' '[Desktop Entry]'
+    printf '%s\n' 'Type=Application'
+    printf '%s\n' 'Name=OpenKH Mod Manager'
+    printf '%s\n' 'Comment=Manage OpenKH game mods'
+    printf 'Exec="%s"\n' "$SCRIPT_DIR/OpenKh.Tools.ModsManager"
+    printf 'Path="%s"\n' "$SCRIPT_DIR"
+    printf '%s\n' 'Terminal=false'
+    printf '%s\n' 'Categories=Game;Utility;'
+} > "$DESKTOP_FILE"
+
+echo "OpenKH Mod Manager was added to the application menu."
+echo "You can now add it to Steam from Desktop Mode."
diff --git a/OpenKh.Tools.ModsManager.Avalonia/Program.cs b/OpenKh.Tools.ModsManager.Avalonia/Program.cs
new file mode 100644
index 000000000..796cf7a61
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Avalonia/Program.cs
@@ -0,0 +1,15 @@
+using Avalonia;
+
+namespace OpenKh.Tools.ModsManager.Avalonia;
+
+internal static class Program
+{
+    [STAThread]
+    public static void Main(string[] args) => BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);
+
+    public static AppBuilder BuildAvaloniaApp() => AppBuilder
+        .Configure<App>()
+        .UsePlatformDetect()
+        .WithInterFont()
+        .LogToTrace();
+}
diff --git a/OpenKh.Tools.ModsManager.Avalonia/README.md b/OpenKh.Tools.ModsManager.Avalonia/README.md
new file mode 100644
index 000000000..0f1cc63b9
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Avalonia/README.md
@@ -0,0 +1,49 @@
+# OpenKH Mod Manager
+
+This is the official cross-platform OpenKH Mod Manager for Windows, Linux, and Steam Deck. Its interface uses Avalonia so the same application can run natively on every supported platform.
+
+## Current functionality
+
+- Uses the existing `mods-manager.yml` and enabled-mod list files.
+- Lists local mods and collections for every supported game.
+- Searches by title, author, or repository.
+- Enables and disables mods with automatic saving.
+- Changes mod priority.
+- Installs local packages, repository URLs, ZIP URLs, Lua files, and mods from the official online catalog.
+- Shows online and installed mod icons, previews, authors, descriptions, and repository information.
+- Installs, removes, updates, and configures mods and collections.
+- Saves and loads mod presets.
+- Extracts game data and configures PC, Steam, Epic, and PCSX2 installations.
+- Installs and removes Panacea, the Steam App ID helper, and Lua Backend.
+- Builds mods, patches or restores PC packages, and launches or stops supported games.
+- Provides creator workflows for metadata, target-file search, copy assets, preferences, and diff previews.
+- Checks the complete OpenKH package for updates.
+- Supports SDL gamepads with controller-specific PlayStation, Nintendo, and Xbox labels.
+- Uses Steam launcher mode when Steam Input owns the controller instead of exposing it to SDL.
+- Opens the Steam Deck floating keyboard when a text field receives focus.
+- Opens the selected mod directory.
+- Provides responsive layouts designed for Windows, Linux, and the Steam Deck screen.
+
+## Run locally
+
+```powershell
+dotnet run --project OpenKh.Tools.ModsManager.csproj -- --data-root E:\path\to\OpenKH
+```
+
+The `--data-root` argument is optional in packaged builds. An executable placed in the `Apps` directory automatically uses the parent OpenKH installation directory.
+
+## Publish
+
+On Windows:
+
+```powershell
+.\publish.ps1 -Target All
+```
+
+On Linux:
+
+```sh
+./publish.sh
+```
+
+Both scripts create self-contained, single-file builds. The Steam Deck package includes a helper that adds the Mod Manager to the Desktop Mode application menu.
diff --git a/OpenKh.Tools.ModsManager.Avalonia/Services/AvaloniaCollectionSettingsPrompt.cs b/OpenKh.Tools.ModsManager.Avalonia/Services/AvaloniaCollectionSettingsPrompt.cs
new file mode 100644
index 000000000..fac31e2c6
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Avalonia/Services/AvaloniaCollectionSettingsPrompt.cs
@@ -0,0 +1,19 @@
+using Avalonia.Controls;
+using OpenKh.Tools.ModsManager.Avalonia.Views;
+using OpenKh.Tools.ModsManager.Core;
+
+namespace OpenKh.Tools.ModsManager.Avalonia.Services;
+
+public sealed class AvaloniaCollectionSettingsPrompt(
+    MainWindow owner,
+    CollectionSettingsService settings,
+    IControllerInputService controller) : ICollectionSettingsPrompt
+{
+    public async Task<bool> ShowAsync(ModEntry mod, GameInfo game)
+    {
+        var window = new CollectionSettingsWindow(settings, mod, game);
+        using var capture = controller.Capture(
+            ControllerWindowNavigator.WithScrolling(window, window.HandleControllerAction));
+        return await owner.ShowPageAsync<bool>(window);
+    }
+}
diff --git a/OpenKh.Tools.ModsManager.Avalonia/Services/AvaloniaCreatorPrompt.cs b/OpenKh.Tools.ModsManager.Avalonia/Services/AvaloniaCreatorPrompt.cs
new file mode 100644
index 000000000..b777cfae7
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Avalonia/Services/AvaloniaCreatorPrompt.cs
@@ -0,0 +1,19 @@
+using Avalonia.Controls;
+using OpenKh.Tools.ModsManager.Avalonia.Views;
+using OpenKh.Tools.ModsManager.Core;
+
+namespace OpenKh.Tools.ModsManager.Avalonia.Services;
+
+public sealed class AvaloniaCreatorPrompt(
+    MainWindow owner,
+    ModCreatorService creator,
+    IControllerInputService controller) : ICreatorPrompt
+{
+    public async Task ShowAsync()
+    {
+        var window = new CreatorWindow(creator, controller);
+        using var capture = controller.Capture(
+            ControllerWindowNavigator.WithScrolling(window, window.HandleControllerAction));
+        await owner.ShowPageAsync<object>(window);
+    }
+}
diff --git a/OpenKh.Tools.ModsManager.Avalonia/Services/AvaloniaInfoPrompt.cs b/OpenKh.Tools.ModsManager.Avalonia/Services/AvaloniaInfoPrompt.cs
new file mode 100644
index 000000000..809690c05
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Avalonia/Services/AvaloniaInfoPrompt.cs
@@ -0,0 +1,15 @@
+using Avalonia.Controls;
+using OpenKh.Tools.ModsManager.Avalonia.Views;
+
+namespace OpenKh.Tools.ModsManager.Avalonia.Services;
+
+public sealed class AvaloniaInfoPrompt(MainWindow owner, IControllerInputService controller) : IInfoPrompt
+{
+    public async Task ShowAsync()
+    {
+        var window = new InfoWindow();
+        using var capture = controller.Capture(
+            ControllerWindowNavigator.WithScrolling(window, window.HandleControllerAction));
+        await owner.ShowPageAsync<object>(window);
+    }
+}
diff --git a/OpenKh.Tools.ModsManager.Avalonia/Services/AvaloniaModInstallPrompt.cs b/OpenKh.Tools.ModsManager.Avalonia/Services/AvaloniaModInstallPrompt.cs
new file mode 100644
index 000000000..bf5e3dad2
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Avalonia/Services/AvaloniaModInstallPrompt.cs
@@ -0,0 +1,17 @@
+using Avalonia.Controls;
+using OpenKh.Tools.ModsManager.Avalonia.Views;
+
+namespace OpenKh.Tools.ModsManager.Avalonia.Services;
+
+public sealed class AvaloniaModInstallPrompt(
+    MainWindow owner,
+    IControllerInputService controller) : IModInstallPrompt
+{
+    public async Task<ModInstallRequest?> ShowAsync()
+    {
+        var window = new InstallModWindow();
+        using var capture = controller.Capture(
+            ControllerWindowNavigator.WithScrolling(window, window.HandleControllerAction));
+        return await owner.ShowPageAsync<ModInstallRequest>(window);
+    }
+}
diff --git a/OpenKh.Tools.ModsManager.Avalonia/Services/AvaloniaModPackagePicker.cs b/OpenKh.Tools.ModsManager.Avalonia/Services/AvaloniaModPackagePicker.cs
new file mode 100644
index 000000000..7cabfa529
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Avalonia/Services/AvaloniaModPackagePicker.cs
@@ -0,0 +1,25 @@
+using Avalonia.Controls;
+using Avalonia.Platform.Storage;
+
+namespace OpenKh.Tools.ModsManager.Avalonia.Services;
+
+public sealed class AvaloniaModPackagePicker(Window owner) : IModPackagePicker
+{
+    public async Task<string?> PickPackageAsync()
+    {
+        var files = await owner.StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions
+        {
+            Title = "Install an OpenKH mod",
+            AllowMultiple = false,
+            FileTypeFilter =
+            [
+                new FilePickerFileType("OpenKH mod packages")
+                {
+                    Patterns = ["*.zip"]
+                }
+            ]
+        });
+
+        return files.Count == 0 ? null : files[0].TryGetLocalPath();
+    }
+}
diff --git a/OpenKh.Tools.ModsManager.Avalonia/Services/AvaloniaOnlineModsPrompt.cs b/OpenKh.Tools.ModsManager.Avalonia/Services/AvaloniaOnlineModsPrompt.cs
new file mode 100644
index 000000000..2ccb70fc0
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Avalonia/Services/AvaloniaOnlineModsPrompt.cs
@@ -0,0 +1,24 @@
+using Avalonia.Controls;
+using OpenKh.Tools.ModsManager.Avalonia.Views;
+using OpenKh.Tools.ModsManager.Core;
+
+namespace OpenKh.Tools.ModsManager.Avalonia.Services;
+
+public sealed class AvaloniaOnlineModsPrompt(
+    MainWindow owner,
+    OnlineModCatalogService catalog,
+    RepositoryModInstaller installer,
+    IControllerInputService controller) : IOnlineModsPrompt
+{
+    public async Task<bool> ShowAsync(
+        GameInfo game,
+        IReadOnlyCollection<string> installedIds,
+        Func<string, Task> onModInstalled)
+    {
+        var window = new OnlineModsWindow(catalog, installer, game, installedIds, onModInstalled);
+        using var capture = controller.Capture(
+            ControllerWindowNavigator.WithScrolling(window, window.HandleControllerAction));
+        await owner.ShowPageAsync<bool>(window);
+        return window.InstalledAny;
+    }
+}
diff --git a/OpenKh.Tools.ModsManager.Avalonia/Services/AvaloniaPresetsPrompt.cs b/OpenKh.Tools.ModsManager.Avalonia/Services/AvaloniaPresetsPrompt.cs
new file mode 100644
index 000000000..b2f87a432
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Avalonia/Services/AvaloniaPresetsPrompt.cs
@@ -0,0 +1,19 @@
+using Avalonia.Controls;
+using OpenKh.Tools.ModsManager.Avalonia.Views;
+using OpenKh.Tools.ModsManager.Core;
+
+namespace OpenKh.Tools.ModsManager.Avalonia.Services;
+
+public sealed class AvaloniaPresetsPrompt(
+    MainWindow owner,
+    PresetService presets,
+    IControllerInputService controller) : IPresetsPrompt
+{
+    public async Task<IReadOnlyList<string>?> ShowAsync(IReadOnlyCollection<string> enabledModIds)
+    {
+        var window = new PresetsWindow(presets, enabledModIds);
+        using var capture = controller.Capture(
+            ControllerWindowNavigator.WithScrolling(window, window.HandleControllerAction));
+        return await owner.ShowPageAsync<IReadOnlyList<string>>(window);
+    }
+}
diff --git a/OpenKh.Tools.ModsManager.Avalonia/Services/AvaloniaSettingsPrompt.cs b/OpenKh.Tools.ModsManager.Avalonia/Services/AvaloniaSettingsPrompt.cs
new file mode 100644
index 000000000..105ecf08b
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Avalonia/Services/AvaloniaSettingsPrompt.cs
@@ -0,0 +1,21 @@
+using Avalonia.Controls;
+using OpenKh.Tools.ModsManager.Avalonia.Views;
+using OpenKh.Tools.ModsManager.Core;
+
+namespace OpenKh.Tools.ModsManager.Avalonia.Services;
+
+public sealed class AvaloniaSettingsPrompt(
+    MainWindow owner,
+    ModManagerConfigurationService configuration,
+    PanaceaService panacea,
+    OpenKhUpdateCheckerService updateChecker,
+    IControllerInputService controller) : ISettingsPrompt
+{
+    public async Task<bool> ShowAsync()
+    {
+        var window = new SettingsWindow(configuration, panacea, updateChecker);
+        using var capture = controller.Capture(
+            ControllerWindowNavigator.WithScrolling(window, window.HandleControllerAction));
+        return await owner.ShowPageAsync<bool>(window);
+    }
+}
diff --git a/OpenKh.Tools.ModsManager.Avalonia/Services/AvaloniaSetupPrompt.cs b/OpenKh.Tools.ModsManager.Avalonia/Services/AvaloniaSetupPrompt.cs
new file mode 100644
index 000000000..bf6c0ed56
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Avalonia/Services/AvaloniaSetupPrompt.cs
@@ -0,0 +1,27 @@
+using Avalonia.Controls;
+using OpenKh.Tools.ModsManager.Avalonia.Views;
+using OpenKh.Tools.ModsManager.Core;
+
+namespace OpenKh.Tools.ModsManager.Avalonia.Services;
+
+public sealed class AvaloniaSetupPrompt(
+    MainWindow owner,
+    ModManagerConfigurationService configuration,
+    PanaceaService panacea,
+    LuaBackendService luaBackend,
+    GameExtractionService extraction,
+    IControllerInputService controller) : ISetupPrompt
+{
+    public async Task<bool> ShowAsync()
+    {
+        var window = new SetupWindow(
+            configuration,
+            panacea,
+            luaBackend,
+            extraction,
+            new AvaloniaUserDialogService(owner, controller));
+        using var capture = controller.Capture(
+            ControllerWindowNavigator.WithScrolling(window, window.HandleControllerAction));
+        return await owner.ShowPageAsync<bool>(window);
+    }
+}
diff --git a/OpenKh.Tools.ModsManager.Avalonia/Services/AvaloniaUserDialogService.cs b/OpenKh.Tools.ModsManager.Avalonia/Services/AvaloniaUserDialogService.cs
new file mode 100644
index 000000000..8b8ea46d0
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Avalonia/Services/AvaloniaUserDialogService.cs
@@ -0,0 +1,17 @@
+using Avalonia.Controls;
+using OpenKh.Tools.ModsManager.Avalonia.Views;
+
+namespace OpenKh.Tools.ModsManager.Avalonia.Services;
+
+public sealed class AvaloniaUserDialogService(
+    MainWindow owner,
+    IControllerInputService controller) : IUserDialogService
+{
+    public async Task<bool> ConfirmAsync(string title, string message, string confirmText)
+    {
+        var window = new ConfirmationWindow(title, message, confirmText);
+        using var capture = controller.Capture(
+            ControllerWindowNavigator.WithScrolling(window, window.HandleControllerAction));
+        return await owner.ShowPageAsync<bool>(window);
+    }
+}
diff --git a/OpenKh.Tools.ModsManager.Avalonia/Services/ControllerAction.cs b/OpenKh.Tools.ModsManager.Avalonia/Services/ControllerAction.cs
new file mode 100644
index 000000000..69d209949
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Avalonia/Services/ControllerAction.cs
@@ -0,0 +1,25 @@
+namespace OpenKh.Tools.ModsManager.Avalonia.Services;
+
+public enum ControllerAction
+{
+    NavigateUp,
+    NavigateDown,
+    NavigateLeft,
+    NavigateRight,
+    PreviousControl,
+    NextControl,
+    PreviousItem,
+    NextItem,
+    Confirm,
+    Cancel,
+    Secondary,
+    Install,
+    PreviousGame,
+    NextGame,
+    ScrollUp,
+    ScrollDown,
+    Refresh,
+    MoveUp,
+    MoveDown,
+    MoveTop
+}
diff --git a/OpenKh.Tools.ModsManager.Avalonia/Services/ControllerWindowNavigator.cs b/OpenKh.Tools.ModsManager.Avalonia/Services/ControllerWindowNavigator.cs
new file mode 100644
index 000000000..413d61bdd
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Avalonia/Services/ControllerWindowNavigator.cs
@@ -0,0 +1,251 @@
+using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
+using Avalonia.Input;
+using Avalonia;
+using Avalonia.VisualTree;
+
+namespace OpenKh.Tools.ModsManager.Avalonia.Services;
+
+public static class ControllerWindowNavigator
+{
+    private const double ScrollStep = 96;
+
+    public static Action<ControllerAction> WithScrolling(
+        Control root,
+        Action<ControllerAction> handler) =>
+        action =>
+        {
+            if (!TryHandleVirtualKeyboard(action) &&
+                !TryShowVirtualKeyboard(root, action) &&
+                !TryScroll(root, action))
+                handler(action);
+        };
+
+    public static bool TryHandleVirtualKeyboard(ControllerAction action)
+    {
+        return VirtualKeyboardService.HandleControllerAction(action);
+    }
+
+    public static bool TryShowVirtualKeyboard(Control root, ControllerAction action)
+    {
+        if (action != ControllerAction.Confirm)
+            return false;
+
+        var focused = TopLevel.GetTopLevel(root)?.FocusManager?.GetFocusedElement() as Control;
+        var textBox = focused as TextBox ?? focused?.GetVisualAncestors().OfType<TextBox>().FirstOrDefault();
+        if (textBox is null || textBox.IsReadOnly)
+            return false;
+
+        VirtualKeyboardService.Show(textBox);
+        return true;
+    }
+
+    public static bool TryScroll(Control root, ControllerAction action)
+    {
+        if (action is not (ControllerAction.ScrollUp or ControllerAction.ScrollDown))
+            return false;
+
+        var focused = TopLevel.GetTopLevel(root)?.FocusManager?.GetFocusedElement() as Control;
+        var scrollViewer = focused?.GetVisualAncestors()
+            .OfType<ScrollViewer>()
+            .FirstOrDefault(CanScroll);
+        scrollViewer ??= root.GetVisualDescendants()
+            .OfType<ScrollViewer>()
+            .Where(CanScroll)
+            .OrderByDescending(viewer => viewer.Bounds.Width * viewer.Bounds.Height)
+            .FirstOrDefault();
+        if (scrollViewer is null)
+            return true;
+
+        var direction = action == ControllerAction.ScrollUp ? -1 : 1;
+        var maximum = Math.Max(0, scrollViewer.Extent.Height - scrollViewer.Viewport.Height);
+        var nextOffset = Math.Clamp(scrollViewer.Offset.Y + (direction * ScrollStep), 0, maximum);
+        scrollViewer.Offset = new Vector(scrollViewer.Offset.X, nextOffset);
+        return true;
+    }
+
+    public static bool TryMoveFocus(Control root, ControllerAction action)
+    {
+        var direction = action switch
+        {
+            ControllerAction.NavigateUp => NavigationDirection.Up,
+            ControllerAction.NavigateDown => NavigationDirection.Down,
+            ControllerAction.NavigateLeft => NavigationDirection.Left,
+            ControllerAction.NavigateRight => NavigationDirection.Right,
+            _ => (NavigationDirection?)null
+        };
+        if (direction is null)
+            return false;
+
+        MoveFocus(root, direction.Value);
+        return true;
+    }
+
+    public static void MoveFocus(Control root, NavigationDirection direction)
+    {
+        var focused = TopLevel.GetTopLevel(root)?.FocusManager?.GetFocusedElement() as Control;
+        if (focused is null || !IsWithinRoot(focused, root))
+        {
+            focused = FindStartingTarget(root);
+            if (focused is null || !TryFocusTarget(focused))
+                return;
+
+            SyncSelectionWithFocus(root);
+        }
+
+        var source = GetNavigationTarget(focused) ?? focused;
+        var sourceBounds = GetBoundsRelativeTo(source, root);
+        if (sourceBounds is null)
+            return;
+
+        var controls = root.GetVisualDescendants()
+            .OfType<Control>()
+            .Where(IsNavigationTarget)
+            .Where(control => control != source)
+            .Where(control => !IsNestedNavigationTarget(source, control))
+            .Select(control => new
+            {
+                Control = control,
+                Bounds = GetBoundsRelativeTo(control, root)
+            })
+            .Where(candidate => candidate.Bounds is not null)
+            .ToArray();
+        var bounds = controls.Select(candidate => candidate.Bounds!.Value).ToArray();
+        var nextIndex = SpatialNavigation.FindNearest(sourceBounds.Value, bounds, direction);
+        if (nextIndex < 0)
+            return;
+
+        var next = controls[nextIndex].Control;
+        if (!TryFocusTarget(next))
+            return;
+
+        next.BringIntoView();
+        SyncSelectionWithFocus(root);
+    }
+
+    public static void MoveFocus(Control root, int offset)
+    {
+        var controls = root.GetVisualDescendants()
+            .OfType<Control>()
+            .Where(IsAvailable)
+            .ToArray();
+        if (controls.Length == 0)
+            return;
+
+        var focused = TopLevel.GetTopLevel(root)?.FocusManager?.GetFocusedElement() as Control;
+        var currentIndex = focused is null ? -1 : Array.IndexOf(controls, focused);
+        if (currentIndex < 0)
+            currentIndex = offset > 0 ? -1 : 0;
+
+        for (var step = 1; step <= controls.Length; step++)
+        {
+            var nextIndex = (currentIndex + (offset * step) + controls.Length) % controls.Length;
+            if (TryFocusTarget(controls[nextIndex]))
+            {
+                SyncSelectionWithFocus(root);
+                return;
+            }
+        }
+    }
+
+    public static void SyncSelectionWithFocus(Control root)
+    {
+        var focused = TopLevel.GetTopLevel(root)?.FocusManager?.GetFocusedElement() as Control;
+        var item = focused as ListBoxItem ??
+            focused?.GetVisualAncestors().OfType<ListBoxItem>().FirstOrDefault();
+        var listBox = item?.GetVisualAncestors().OfType<ListBox>().FirstOrDefault();
+        if (item?.DataContext is not { } model || listBox is null)
+            return;
+
+        listBox.SelectedItem = model;
+        listBox.ScrollIntoView(model);
+    }
+
+    private static bool IsAvailable(Control control) =>
+        control.Focusable && IsVisibleAndEnabled(control);
+
+    private static bool IsVisibleAndEnabled(Control control) =>
+        control.IsEffectivelyEnabled &&
+        control.IsVisible &&
+        control.GetVisualAncestors()
+            .OfType<Control>()
+            .All(ancestor => ancestor.IsVisible && ancestor.IsEffectivelyEnabled);
+
+    private static bool IsNavigationTarget(Control control) =>
+        IsAvailable(control) &&
+        IsNavigationTargetKind(control) &&
+        !control.GetVisualAncestors()
+            .OfType<Control>()
+            .Any(ancestor =>
+                ancestor is not Expander &&
+                IsAvailable(ancestor) &&
+                IsNavigationTargetKind(ancestor));
+
+    private static bool IsNavigationTargetKind(Control control) =>
+        control is Button or TextBox or ComboBox or CheckBox or ToggleSwitch or Expander or ListBoxItem;
+
+    private static Control? GetNavigationTarget(Control focused)
+    {
+        var targets = focused.GetVisualAncestors()
+            .Prepend(focused)
+            .OfType<Control>()
+            .Where(IsAvailable)
+            .Where(IsNavigationTargetKind)
+            .ToArray();
+
+        // Expanded content must navigate as individual controls instead of resolving back to its parent.
+        return targets.LastOrDefault(target => target is not Expander) ?? targets.LastOrDefault();
+    }
+
+    private static Control? FindStartingTarget(Control root)
+    {
+        foreach (var listBox in root.GetVisualDescendants().OfType<ListBox>().Where(IsVisibleAndEnabled))
+        {
+            if (listBox.SelectedItem is not { } selected)
+                continue;
+
+            var selectedContainer = listBox.GetVisualDescendants()
+                .OfType<ListBoxItem>()
+                .FirstOrDefault(item => ReferenceEquals(item.DataContext, selected));
+            if (selectedContainer is not null && IsNavigationTarget(selectedContainer))
+                return selectedContainer;
+        }
+
+        return root.GetVisualDescendants()
+            .OfType<Control>()
+            .FirstOrDefault(IsNavigationTarget);
+    }
+
+    private static bool TryFocusTarget(Control target)
+    {
+        if (target.Focus(NavigationMethod.Directional))
+            return true;
+
+        return target.GetVisualDescendants()
+            .OfType<Control>()
+            .Where(IsAvailable)
+            .Any(control => control.Focus(NavigationMethod.Directional));
+    }
+
+    private static bool IsWithinRoot(Control control, Control root) =>
+        ReferenceEquals(control, root) || control.GetVisualAncestors().Contains(root);
+
+    private static bool IsNestedNavigationTarget(Control source, Control candidate) =>
+        candidate.GetVisualAncestors().Contains(source) && source is not Expander ||
+        source.GetVisualAncestors().Contains(candidate) && candidate is not Expander;
+
+    private static Rect? GetBoundsRelativeTo(Control control, Control root)
+    {
+        var transform = control.TransformToVisual(root);
+        var localBounds = new Rect(control.Bounds.Size);
+        return transform is null ? null : localBounds.TransformToAABB(transform.Value);
+    }
+
+    private static bool CanScroll(ScrollViewer viewer) =>
+        viewer.IsVisible &&
+        viewer.IsEffectivelyEnabled &&
+        viewer.Extent.Height > viewer.Viewport.Height + 1 &&
+        viewer.GetVisualAncestors()
+            .OfType<Control>()
+            .All(ancestor => ancestor.IsVisible && ancestor.IsEffectivelyEnabled);
+}
diff --git a/OpenKh.Tools.ModsManager.Avalonia/Services/EmbeddedVirtualKeyboardHost.cs b/OpenKh.Tools.ModsManager.Avalonia/Services/EmbeddedVirtualKeyboardHost.cs
new file mode 100644
index 000000000..5023c6207
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Avalonia/Services/EmbeddedVirtualKeyboardHost.cs
@@ -0,0 +1,59 @@
+using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.Threading;
+using OpenKh.Tools.ModsManager.Avalonia.Views;
+
+namespace OpenKh.Tools.ModsManager.Avalonia.Services;
+
+public sealed class EmbeddedVirtualKeyboardHost(MainWindow owner) : IVirtualKeyboardHost
+{
+    private ControllerKeyboardWindow? _keyboard;
+
+    public bool IsOpen => _keyboard is not null;
+
+    public void Show(TextBox textBox)
+    {
+        if (_keyboard is not null)
+            return;
+
+        textBox.Focus(NavigationMethod.Directional);
+        var keyboard = new ControllerKeyboardWindow(textBox);
+        _keyboard = keyboard;
+        _ = ShowAsync(keyboard, textBox);
+    }
+
+    public bool HandleControllerAction(ControllerAction action)
+    {
+        if (_keyboard is null)
+            return false;
+
+        _keyboard.HandleControllerAction(action);
+        return true;
+    }
+
+    public bool Hide()
+    {
+        if (_keyboard is null)
+            return false;
+
+        _keyboard.Close();
+        return true;
+    }
+
+    private async Task ShowAsync(ControllerKeyboardWindow keyboard, TextBox textBox)
+    {
+        try
+        {
+            await owner.ShowPageAsync<object?>(keyboard);
+        }
+        finally
+        {
+            if (ReferenceEquals(_keyboard, keyboard))
+                _keyboard = null;
+
+            Dispatcher.UIThread.Post(
+                () => textBox.Focus(NavigationMethod.Directional),
+                DispatcherPriority.Loaded);
+        }
+    }
+}
diff --git a/OpenKh.Tools.ModsManager.Avalonia/Services/ICollectionSettingsPrompt.cs b/OpenKh.Tools.ModsManager.Avalonia/Services/ICollectionSettingsPrompt.cs
new file mode 100644
index 000000000..83b88722a
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Avalonia/Services/ICollectionSettingsPrompt.cs
@@ -0,0 +1,8 @@
+using OpenKh.Tools.ModsManager.Core;
+
+namespace OpenKh.Tools.ModsManager.Avalonia.Services;
+
+public interface ICollectionSettingsPrompt
+{
+    Task<bool> ShowAsync(ModEntry mod, GameInfo game);
+}
diff --git a/OpenKh.Tools.ModsManager.Avalonia/Services/IControllerInputService.cs b/OpenKh.Tools.ModsManager.Avalonia/Services/IControllerInputService.cs
new file mode 100644
index 000000000..25b35e10e
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Avalonia/Services/IControllerInputService.cs
@@ -0,0 +1,15 @@
+namespace OpenKh.Tools.ModsManager.Avalonia.Services;
+
+public interface IControllerInputService : IDisposable
+{
+    event Action<ControllerAction>? ActionTriggered;
+    event Action? ConnectionChanged;
+    event Action? StatusChanged;
+
+    bool IsConnected { get; }
+    string StatusText { get; }
+    string NavigationHelpText { get; }
+    void Start();
+    void Dispatch(ControllerAction action);
+    IDisposable Capture(Action<ControllerAction> handler);
+}
diff --git a/OpenKh.Tools.ModsManager.Avalonia/Services/ICreatorPrompt.cs b/OpenKh.Tools.ModsManager.Avalonia/Services/ICreatorPrompt.cs
new file mode 100644
index 000000000..7a02789e6
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Avalonia/Services/ICreatorPrompt.cs
@@ -0,0 +1,6 @@
+namespace OpenKh.Tools.ModsManager.Avalonia.Services;
+
+public interface ICreatorPrompt
+{
+    Task ShowAsync();
+}
diff --git a/OpenKh.Tools.ModsManager.Avalonia/Services/IInfoPrompt.cs b/OpenKh.Tools.ModsManager.Avalonia/Services/IInfoPrompt.cs
new file mode 100644
index 000000000..ef608cf8e
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Avalonia/Services/IInfoPrompt.cs
@@ -0,0 +1,6 @@
+namespace OpenKh.Tools.ModsManager.Avalonia.Services;
+
+public interface IInfoPrompt
+{
+    Task ShowAsync();
+}
diff --git a/OpenKh.Tools.ModsManager.Avalonia/Services/IModInstallPrompt.cs b/OpenKh.Tools.ModsManager.Avalonia/Services/IModInstallPrompt.cs
new file mode 100644
index 000000000..f4a2b6e55
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Avalonia/Services/IModInstallPrompt.cs
@@ -0,0 +1,8 @@
+namespace OpenKh.Tools.ModsManager.Avalonia.Services;
+
+public interface IModInstallPrompt
+{
+    Task<ModInstallRequest?> ShowAsync();
+}
+
+public sealed record ModInstallRequest(string Source, string? Branch, bool Overwrite = false);
diff --git a/OpenKh.Tools.ModsManager.Avalonia/Services/IModPackagePicker.cs b/OpenKh.Tools.ModsManager.Avalonia/Services/IModPackagePicker.cs
new file mode 100644
index 000000000..b41738e9b
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Avalonia/Services/IModPackagePicker.cs
@@ -0,0 +1,6 @@
+namespace OpenKh.Tools.ModsManager.Avalonia.Services;
+
+public interface IModPackagePicker
+{
+    Task<string?> PickPackageAsync();
+}
diff --git a/OpenKh.Tools.ModsManager.Avalonia/Services/IOnlineModsPrompt.cs b/OpenKh.Tools.ModsManager.Avalonia/Services/IOnlineModsPrompt.cs
new file mode 100644
index 000000000..de7976dbe
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Avalonia/Services/IOnlineModsPrompt.cs
@@ -0,0 +1,11 @@
+using OpenKh.Tools.ModsManager.Core;
+
+namespace OpenKh.Tools.ModsManager.Avalonia.Services;
+
+public interface IOnlineModsPrompt
+{
+    Task<bool> ShowAsync(
+        GameInfo game,
+        IReadOnlyCollection<string> installedIds,
+        Func<string, Task> onModInstalled);
+}
diff --git a/OpenKh.Tools.ModsManager.Avalonia/Services/IPresetsPrompt.cs b/OpenKh.Tools.ModsManager.Avalonia/Services/IPresetsPrompt.cs
new file mode 100644
index 000000000..a92a1984d
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Avalonia/Services/IPresetsPrompt.cs
@@ -0,0 +1,6 @@
+namespace OpenKh.Tools.ModsManager.Avalonia.Services;
+
+public interface IPresetsPrompt
+{
+    Task<IReadOnlyList<string>?> ShowAsync(IReadOnlyCollection<string> enabledModIds);
+}
diff --git a/OpenKh.Tools.ModsManager.Avalonia/Services/ISettingsPrompt.cs b/OpenKh.Tools.ModsManager.Avalonia/Services/ISettingsPrompt.cs
new file mode 100644
index 000000000..8e7533bc7
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Avalonia/Services/ISettingsPrompt.cs
@@ -0,0 +1,6 @@
+namespace OpenKh.Tools.ModsManager.Avalonia.Services;
+
+public interface ISettingsPrompt
+{
+    Task<bool> ShowAsync();
+}
diff --git a/OpenKh.Tools.ModsManager.Avalonia/Services/ISetupPrompt.cs b/OpenKh.Tools.ModsManager.Avalonia/Services/ISetupPrompt.cs
new file mode 100644
index 000000000..f37b9194a
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Avalonia/Services/ISetupPrompt.cs
@@ -0,0 +1,6 @@
+namespace OpenKh.Tools.ModsManager.Avalonia.Services;
+
+public interface ISetupPrompt
+{
+    Task<bool> ShowAsync();
+}
diff --git a/OpenKh.Tools.ModsManager.Avalonia/Services/IUserDialogService.cs b/OpenKh.Tools.ModsManager.Avalonia/Services/IUserDialogService.cs
new file mode 100644
index 000000000..6f51a21d8
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Avalonia/Services/IUserDialogService.cs
@@ -0,0 +1,6 @@
+namespace OpenKh.Tools.ModsManager.Avalonia.Services;
+
+public interface IUserDialogService
+{
+    Task<bool> ConfirmAsync(string title, string message, string confirmText);
+}
diff --git a/OpenKh.Tools.ModsManager.Avalonia/Services/SdlControllerInputService.cs b/OpenKh.Tools.ModsManager.Avalonia/Services/SdlControllerInputService.cs
new file mode 100644
index 000000000..96a04a3b4
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Avalonia/Services/SdlControllerInputService.cs
@@ -0,0 +1,589 @@
+using Avalonia;
+using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Threading;
+using SDL3;
+using System.Runtime.InteropServices;
+
+namespace OpenKh.Tools.ModsManager.Avalonia.Services;
+
+public sealed class SdlControllerInputService : IControllerInputService
+{
+    private const short AxisPressThreshold = 18000;
+    private const short AxisReleaseThreshold = 9000;
+    private const int AxisInitialRepeatDelayMilliseconds = 320;
+    private const int AxisRepeatIntervalMilliseconds = 90;
+    private readonly DispatcherTimer _pollTimer;
+    private readonly Dictionary<uint, IntPtr> _gamepads = [];
+    private readonly Dictionary<uint, XInputState> _xInputStates = [];
+    private readonly HashSet<SDL.GamepadButton> _pressedButtons = [];
+    private int _horizontalAxisDirection;
+    private int _verticalAxisDirection;
+    private int _rightVerticalAxisDirection;
+    private bool _leftTriggerPressed;
+    private bool _rightTriggerPressed;
+    private long _horizontalAxisNextRepeat;
+    private long _verticalAxisNextRepeat;
+    private long _rightVerticalAxisNextRepeat;
+    private int _discoveryTicks;
+    private bool _initialized;
+    private bool _xInputAvailable = OperatingSystem.IsWindows();
+    private string _statusText = "No controller detected";
+    private string _navigationHelpText = "";
+    private Action<ControllerAction>? _capturedHandler;
+
+    public SdlControllerInputService()
+    {
+        SetDisconnectedStatus();
+        _pollTimer = new DispatcherTimer
+        {
+            Interval = TimeSpan.FromMilliseconds(16)
+        };
+        _pollTimer.Tick += (_, _) => PollEvents();
+    }
+
+    public event Action<ControllerAction>? ActionTriggered;
+    public event Action? ConnectionChanged;
+    public event Action? StatusChanged;
+
+    public bool IsConnected => _gamepads.Count > 0 || _xInputStates.Count > 0;
+    public string StatusText => _statusText;
+    public string NavigationHelpText => _navigationHelpText;
+
+    public void Start()
+    {
+        try
+        {
+            SDL.SetHint("SDL_JOYSTICK_HIDAPI", "1");
+            SDL.SetHint("SDL_JOYSTICK_HIDAPI_STEAM", "1");
+            SDL.SetHint("SDL_JOYSTICK_HIDAPI_STEAMDECK", "1");
+            SDL.SetHint("SDL_JOYSTICK_ALLOW_BACKGROUND_EVENTS", "0");
+            _initialized = SDL.Init(SDL.InitFlags.Gamepad);
+            if (!_initialized)
+            {
+                _statusText = $"Controller support unavailable: {SDL.GetError()}";
+            }
+            else
+            {
+                RefreshConnectedGamepads();
+            }
+            _pollTimer.Start();
+            PollEvents();
+        }
+        catch (Exception exception) when (
+            exception is DllNotFoundException or EntryPointNotFoundException or TypeInitializationException)
+        {
+            _statusText = "Controller support unavailable";
+            if (OperatingSystem.IsWindows())
+            {
+                _pollTimer.Start();
+                PollEvents();
+            }
+            ConnectionChanged?.Invoke();
+            StatusChanged?.Invoke();
+        }
+    }
+
+    private void RefreshConnectedGamepads()
+    {
+        var gamepadIds = SDL.GetGamepads(out var count);
+        if (gamepadIds is null)
+            return;
+
+        var connectedIds = gamepadIds.Take(count).ToHashSet();
+        foreach (var removedId in _gamepads.Keys.Except(connectedIds).ToArray())
+            RemoveGamepad(removedId);
+        foreach (var instanceId in connectedIds)
+        {
+            if (_gamepads.TryGetValue(instanceId, out var gamepad) &&
+                HasGamepadIdentityChanged(instanceId, gamepad))
+            {
+                RemoveGamepad(instanceId);
+            }
+
+            AddGamepad(instanceId);
+        }
+
+        var previousStatus = _statusText;
+        var previousNavigationHelp = _navigationHelpText;
+        UpdateControllerStatus();
+        if (!string.Equals(previousStatus, _statusText, StringComparison.Ordinal) ||
+            !string.Equals(previousNavigationHelp, _navigationHelpText, StringComparison.Ordinal))
+        {
+            StatusChanged?.Invoke();
+        }
+    }
+
+    private static bool HasGamepadIdentityChanged(uint instanceId, IntPtr gamepad)
+    {
+        if (!SDL.GamepadConnected(gamepad))
+            return true;
+
+        var currentName = SDL.GetGamepadName(gamepad) ?? string.Empty;
+        var detectedName = SDL.GetGamepadNameForID(instanceId) ?? string.Empty;
+        return SDL.GetGamepadVendor(gamepad) != SDL.GetGamepadVendorForID(instanceId) ||
+               SDL.GetGamepadProduct(gamepad) != SDL.GetGamepadProductForID(instanceId) ||
+               !string.Equals(currentName, detectedName, StringComparison.OrdinalIgnoreCase);
+    }
+
+    public void Dispose()
+    {
+        _pollTimer.Stop();
+        foreach (var gamepad in _gamepads.Values)
+            SDL.CloseGamepad(gamepad);
+        _gamepads.Clear();
+        _xInputStates.Clear();
+
+        if (_initialized)
+            SDL.QuitSubSystem(SDL.InitFlags.Gamepad);
+    }
+
+    public IDisposable Capture(Action<ControllerAction> handler)
+    {
+        var previousHandler = _capturedHandler;
+        _capturedHandler = handler;
+        return new CaptureScope(this, handler, previousHandler);
+    }
+
+    private void PollEvents()
+    {
+        if (_initialized)
+        {
+            while (SDL.PollEvent(out var controllerEvent))
+            {
+                switch ((SDL.EventType)controllerEvent.Type)
+                {
+                    case SDL.EventType.GamepadAdded:
+                        AddGamepad(controllerEvent.GDevice.Which);
+                        break;
+                    case SDL.EventType.GamepadRemoved:
+                        RemoveGamepad(controllerEvent.GDevice.Which);
+                        break;
+                }
+            }
+
+            if (++_discoveryTicks >= 60)
+            {
+                _discoveryTicks = 0;
+                RefreshConnectedGamepads();
+            }
+        }
+
+        if (!PollXInputState())
+            PollGamepadState();
+    }
+
+    private bool PollXInputState()
+    {
+        if (!_xInputAvailable || !OperatingSystem.IsWindows())
+            return false;
+
+        var connectionChanged = false;
+        try
+        {
+            for (uint index = 0; index < 4; index++)
+            {
+                if (XInputGetState(index, out var currentState) != 0)
+                {
+                    connectionChanged |= _xInputStates.Remove(index);
+                    continue;
+                }
+
+                if (!_xInputStates.TryGetValue(index, out var previousState))
+                {
+                    _xInputStates[index] = currentState;
+                    connectionChanged = true;
+                    continue;
+                }
+
+                var pressedButtons = (ushort)(currentState.Gamepad.Buttons & ~previousState.Gamepad.Buttons);
+                PollXInputButtons(pressedButtons);
+                HandleAxis(SDL.GamepadAxis.LeftY, (short)-currentState.Gamepad.ThumbLY);
+                HandleAxis(SDL.GamepadAxis.LeftX, currentState.Gamepad.ThumbLX);
+                HandleAxis(SDL.GamepadAxis.RightY, (short)-currentState.Gamepad.ThumbRY);
+                HandleTrigger(
+                    currentState.Gamepad.LeftTrigger * 128,
+                    ref _leftTriggerPressed,
+                    ControllerAction.MoveUp);
+                HandleTrigger(
+                    currentState.Gamepad.RightTrigger * 128,
+                    ref _rightTriggerPressed,
+                    ControllerAction.MoveDown);
+                _xInputStates[index] = currentState;
+            }
+        }
+        catch (DllNotFoundException)
+        {
+            _xInputAvailable = false;
+            _xInputStates.Clear();
+            return false;
+        }
+        catch (EntryPointNotFoundException)
+        {
+            _xInputAvailable = false;
+            _xInputStates.Clear();
+            return false;
+        }
+
+        if (connectionChanged)
+        {
+            UpdateControllerStatus();
+            ConnectionChanged?.Invoke();
+            StatusChanged?.Invoke();
+        }
+
+        return _xInputStates.Count > 0;
+    }
+
+    private void PollXInputButtons(ushort pressedButtons)
+    {
+        DispatchXInputButton(pressedButtons, 0x0001, ControllerAction.NavigateUp);
+        DispatchXInputButton(pressedButtons, 0x0002, ControllerAction.NavigateDown);
+        DispatchXInputButton(pressedButtons, 0x0004, ControllerAction.NavigateLeft);
+        DispatchXInputButton(pressedButtons, 0x0008, ControllerAction.NavigateRight);
+        DispatchXInputButton(pressedButtons, 0x0010, ControllerAction.Refresh);
+        DispatchXInputButton(pressedButtons, 0x1000, ControllerAction.Confirm);
+        DispatchXInputButton(pressedButtons, 0x2000, ControllerAction.Cancel);
+        DispatchXInputButton(pressedButtons, 0x4000, ControllerAction.Secondary);
+        DispatchXInputButton(pressedButtons, 0x8000, ControllerAction.MoveTop);
+        DispatchXInputButton(pressedButtons, 0x0100, ControllerAction.PreviousGame);
+        DispatchXInputButton(pressedButtons, 0x0200, ControllerAction.NextGame);
+    }
+
+    private void DispatchXInputButton(ushort pressedButtons, ushort mask, ControllerAction action)
+    {
+        if ((pressedButtons & mask) != 0)
+            Dispatch(action);
+    }
+
+    private void PollGamepadState()
+    {
+        if (_gamepads.Count == 0)
+            return;
+
+        SDL.UpdateGamepads();
+        var gamepad = _gamepads.Values.First();
+        PollButton(gamepad, SDL.GamepadButton.DPadUp);
+        PollButton(gamepad, SDL.GamepadButton.DPadDown);
+        PollButton(gamepad, SDL.GamepadButton.DPadLeft);
+        PollButton(gamepad, SDL.GamepadButton.DPadRight);
+        PollButton(gamepad, SDL.GamepadButton.South);
+        PollButton(gamepad, SDL.GamepadButton.East);
+        PollButton(gamepad, SDL.GamepadButton.West);
+        PollButton(gamepad, SDL.GamepadButton.North);
+        PollButton(gamepad, SDL.GamepadButton.LeftShoulder);
+        PollButton(gamepad, SDL.GamepadButton.RightShoulder);
+        PollButton(gamepad, SDL.GamepadButton.Start);
+        HandleAxis(SDL.GamepadAxis.LeftY, SDL.GetGamepadAxis(gamepad, SDL.GamepadAxis.LeftY));
+        HandleAxis(SDL.GamepadAxis.LeftX, SDL.GetGamepadAxis(gamepad, SDL.GamepadAxis.LeftX));
+        HandleAxis(SDL.GamepadAxis.RightY, SDL.GetGamepadAxis(gamepad, SDL.GamepadAxis.RightY));
+        HandleTrigger(
+            SDL.GetGamepadAxis(gamepad, SDL.GamepadAxis.LeftTrigger),
+            ref _leftTriggerPressed,
+            ControllerAction.MoveUp);
+        HandleTrigger(
+            SDL.GetGamepadAxis(gamepad, SDL.GamepadAxis.RightTrigger),
+            ref _rightTriggerPressed,
+            ControllerAction.MoveDown);
+    }
+
+    private void PollButton(IntPtr gamepad, SDL.GamepadButton button)
+    {
+        var isPressed = SDL.GetGamepadButton(gamepad, button);
+        if (!isPressed)
+        {
+            _pressedButtons.Remove(button);
+            return;
+        }
+
+        if (_pressedButtons.Add(button))
+            HandleButton(button);
+    }
+
+    private void AddGamepad(uint instanceId)
+    {
+        if (_gamepads.ContainsKey(instanceId))
+            return;
+
+        var gamepad = SDL.OpenGamepad(instanceId);
+        if (gamepad == IntPtr.Zero)
+            return;
+
+        _gamepads[instanceId] = gamepad;
+        var name = SDL.GetGamepadName(gamepad) ?? "Gamepad";
+        var vendor = SDL.GetGamepadVendor(gamepad);
+        _statusText = $"Controller connected: {name}";
+        _navigationHelpText = GetNavigationHelpText(name, vendor);
+        ConnectionChanged?.Invoke();
+        StatusChanged?.Invoke();
+    }
+
+    private void RemoveGamepad(uint instanceId)
+    {
+        if (_gamepads.Remove(instanceId, out var gamepad))
+            SDL.CloseGamepad(gamepad);
+
+        UpdateControllerStatus();
+        if (!IsConnected)
+        {
+            _pressedButtons.Clear();
+            _horizontalAxisDirection = 0;
+            _verticalAxisDirection = 0;
+            _rightVerticalAxisDirection = 0;
+            _horizontalAxisNextRepeat = 0;
+            _verticalAxisNextRepeat = 0;
+            _rightVerticalAxisNextRepeat = 0;
+            _leftTriggerPressed = false;
+            _rightTriggerPressed = false;
+        }
+        ConnectionChanged?.Invoke();
+        StatusChanged?.Invoke();
+    }
+
+    private void HandleButton(SDL.GamepadButton button)
+    {
+        var action = button switch
+        {
+            SDL.GamepadButton.DPadUp => ControllerAction.NavigateUp,
+            SDL.GamepadButton.DPadDown => ControllerAction.NavigateDown,
+            SDL.GamepadButton.DPadLeft => ControllerAction.NavigateLeft,
+            SDL.GamepadButton.DPadRight => ControllerAction.NavigateRight,
+            SDL.GamepadButton.South => ControllerAction.Confirm,
+            SDL.GamepadButton.East => ControllerAction.Cancel,
+            SDL.GamepadButton.West => ControllerAction.Secondary,
+            SDL.GamepadButton.North => ControllerAction.MoveTop,
+            SDL.GamepadButton.LeftShoulder => ControllerAction.PreviousGame,
+            SDL.GamepadButton.RightShoulder => ControllerAction.NextGame,
+            SDL.GamepadButton.Start => ControllerAction.Refresh,
+            _ => (ControllerAction?)null
+        };
+
+        if (action.HasValue)
+            Dispatch(action.Value);
+    }
+
+    private void HandleAxis(SDL.GamepadAxis axis, short value)
+    {
+        if (axis == SDL.GamepadAxis.LeftY)
+        {
+            HandleAxisDirection(
+                value,
+                ref _verticalAxisDirection,
+                ref _verticalAxisNextRepeat,
+                ControllerAction.NavigateUp,
+                ControllerAction.NavigateDown);
+        }
+        else if (axis == SDL.GamepadAxis.LeftX)
+        {
+            HandleAxisDirection(
+                value,
+                ref _horizontalAxisDirection,
+                ref _horizontalAxisNextRepeat,
+                ControllerAction.NavigateLeft,
+                ControllerAction.NavigateRight);
+        }
+        else if (axis == SDL.GamepadAxis.RightY)
+        {
+            HandleAxisDirection(
+                value,
+                ref _rightVerticalAxisDirection,
+                ref _rightVerticalAxisNextRepeat,
+                ControllerAction.ScrollUp,
+                ControllerAction.ScrollDown);
+        }
+    }
+
+    private void HandleAxisDirection(
+        short value,
+        ref int currentDirection,
+        ref long nextRepeat,
+        ControllerAction negativeAction,
+        ControllerAction positiveAction)
+    {
+        var magnitude = Math.Abs((int)value);
+        if (magnitude < AxisReleaseThreshold)
+        {
+            currentDirection = 0;
+            nextRepeat = 0;
+            return;
+        }
+
+        if (magnitude < AxisPressThreshold)
+            return;
+
+        var direction = value < 0 ? -1 : 1;
+        var now = Environment.TickCount64;
+        if (currentDirection != direction)
+        {
+            currentDirection = direction;
+            nextRepeat = now + AxisInitialRepeatDelayMilliseconds;
+            Dispatch(direction < 0 ? negativeAction : positiveAction);
+            return;
+        }
+
+        if (now < nextRepeat)
+            return;
+
+        nextRepeat = now + AxisRepeatIntervalMilliseconds;
+        Dispatch(direction < 0 ? negativeAction : positiveAction);
+    }
+
+    private void HandleTrigger(int value, ref bool isPressed, ControllerAction action)
+    {
+        if (value < AxisReleaseThreshold)
+        {
+            isPressed = false;
+            return;
+        }
+
+        if (value < AxisPressThreshold || isPressed)
+            return;
+
+        isPressed = true;
+        Dispatch(action);
+    }
+
+    public void Dispatch(ControllerAction action)
+    {
+        if (!IsApplicationActive())
+            return;
+
+        if (_capturedHandler is { } handler)
+            handler(action);
+        else
+            ActionTriggered?.Invoke(action);
+    }
+
+    private static bool IsApplicationActive()
+    {
+        if (Application.Current?.ApplicationLifetime is not IClassicDesktopStyleApplicationLifetime desktop ||
+            desktop.Windows.Count == 0)
+        {
+            return true;
+        }
+
+        return desktop.Windows.Any(window => window.IsActive);
+    }
+
+    private static string GetNavigationHelpText(string gamepadName, ushort vendor)
+    {
+        if (vendor == 0x054c ||
+            gamepadName.Contains("DualSense", StringComparison.OrdinalIgnoreCase) ||
+            gamepadName.Contains("DualShock", StringComparison.OrdinalIgnoreCase) ||
+            gamepadName.Contains("PlayStation", StringComparison.OrdinalIgnoreCase) ||
+            gamepadName.Contains("PS4", StringComparison.OrdinalIgnoreCase) ||
+            gamepadName.Contains("PS5", StringComparison.OrdinalIgnoreCase))
+        {
+            return "D-pad / left stick: navigate   Right stick: scroll   Cross: select   Circle: back   Square: open folder   Triangle: move to top   L2/R2: move mod   L1/R1: game   Options: updates";
+        }
+
+        if (vendor == 0x057e ||
+            gamepadName.Contains("Nintendo", StringComparison.OrdinalIgnoreCase) ||
+            gamepadName.Contains("Switch", StringComparison.OrdinalIgnoreCase) ||
+            gamepadName.Contains("Joy-Con", StringComparison.OrdinalIgnoreCase))
+        {
+            return "D-pad / left stick: navigate   Right stick: scroll   B: select   A: back   Y: open folder   X: move to top   ZL/ZR: move mod   L/R: game   Plus: updates";
+        }
+
+        if (vendor == 0x28de ||
+            gamepadName.Contains("Steam Deck", StringComparison.OrdinalIgnoreCase) ||
+            gamepadName.Contains("Steam Virtual", StringComparison.OrdinalIgnoreCase))
+        {
+            return "D-pad / left stick: navigate   Right stick: scroll   A: select   B: back   X: open folder   Y: move to top   L2/R2: move mod   L1/R1: game   Menu: updates   Steam + X: keyboard";
+        }
+
+        return "D-pad / left stick: navigate   Right stick: scroll   A: select   B: back   X: open folder   Y: move to top   LT/RT: move mod   LB/RB: game   Menu: updates";
+    }
+
+    private void SetDisconnectedStatus()
+    {
+        if (IsSteamDeckEnvironment())
+        {
+            _statusText = "Steam Deck detected, waiting for controller input";
+            _navigationHelpText = "Open the app from its Steam shortcut. Use Steam + X for the keyboard.";
+            return;
+        }
+
+        _statusText = "No controller detected";
+        _navigationHelpText = string.Empty;
+    }
+
+    private void UpdateControllerStatus()
+    {
+        if (_gamepads.Count > 0)
+        {
+            var gamepad = _gamepads.Values.First();
+            var name = SDL.GetGamepadName(gamepad) ?? "Gamepad";
+            _statusText = $"Controller connected: {name}";
+            _navigationHelpText = GetNavigationHelpText(name, SDL.GetGamepadVendor(gamepad));
+            return;
+        }
+
+        if (_xInputStates.Count > 0)
+        {
+            _statusText = "Controller connected: Xbox controller";
+            _navigationHelpText = GetNavigationHelpText("Xbox controller", 0x045e);
+            return;
+        }
+
+        SetDisconnectedStatus();
+    }
+
+    private static bool IsSteamDeckEnvironment()
+    {
+        if (!OperatingSystem.IsLinux())
+            return false;
+
+        if (Environment.GetEnvironmentVariable("SteamDeck") == "1" ||
+            Environment.GetEnvironmentVariable("SteamGamepadUI") == "1")
+            return true;
+
+        try
+        {
+            return File.Exists("/etc/os-release") &&
+                   File.ReadAllText("/etc/os-release")
+                       .Contains("steamos", StringComparison.OrdinalIgnoreCase);
+        }
+        catch (IOException)
+        {
+            return false;
+        }
+        catch (UnauthorizedAccessException)
+        {
+            return false;
+        }
+    }
+
+    [DllImport("xinput1_4.dll", EntryPoint = "XInputGetState")]
+    private static extern uint XInputGetState(uint userIndex, out XInputState state);
+
+    [StructLayout(LayoutKind.Sequential)]
+    private struct XInputState
+    {
+        public uint PacketNumber;
+        public XInputGamepad Gamepad;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    private struct XInputGamepad
+    {
+        public ushort Buttons;
+        public byte LeftTrigger;
+        public byte RightTrigger;
+        public short ThumbLX;
+        public short ThumbLY;
+        public short ThumbRX;
+        public short ThumbRY;
+    }
+
+    private sealed class CaptureScope(
+        SdlControllerInputService owner,
+        Action<ControllerAction> handler,
+        Action<ControllerAction>? previousHandler) : IDisposable
+    {
+        public void Dispose()
+        {
+            if (owner._capturedHandler == handler)
+                owner._capturedHandler = previousHandler;
+        }
+    }
+}
diff --git a/OpenKh.Tools.ModsManager.Avalonia/Services/SpatialNavigation.cs b/OpenKh.Tools.ModsManager.Avalonia/Services/SpatialNavigation.cs
new file mode 100644
index 000000000..07503aa07
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Avalonia/Services/SpatialNavigation.cs
@@ -0,0 +1,71 @@
+using Avalonia;
+using Avalonia.Input;
+
+namespace OpenKh.Tools.ModsManager.Avalonia.Services;
+
+public static class SpatialNavigation
+{
+    private const double DirectionTolerance = 1;
+
+    public static int FindNearest(
+        Rect source,
+        IReadOnlyList<Rect> candidates,
+        NavigationDirection direction)
+    {
+        var sourceCenter = GetCenter(source);
+        var bestIndex = -1;
+        var bestScore = double.MaxValue;
+
+        for (var index = 0; index < candidates.Count; index++)
+        {
+            var candidate = candidates[index];
+            if (candidate.Width <= 0 || candidate.Height <= 0)
+                continue;
+
+            var candidateCenter = GetCenter(candidate);
+            if (!IsInDirection(source, candidate, direction))
+                continue;
+
+            var primaryDistance = direction is NavigationDirection.Left or NavigationDirection.Right
+                ? Math.Abs(candidateCenter.X - sourceCenter.X)
+                : Math.Abs(candidateCenter.Y - sourceCenter.Y);
+            var crossDistance = direction is NavigationDirection.Left or NavigationDirection.Right
+                ? Math.Abs(candidateCenter.Y - sourceCenter.Y)
+                : Math.Abs(candidateCenter.X - sourceCenter.X);
+            var crossGap = direction is NavigationDirection.Left or NavigationDirection.Right
+                ? GetIntervalGap(source.Top, source.Bottom, candidate.Top, candidate.Bottom)
+                : GetIntervalGap(source.Left, source.Right, candidate.Left, candidate.Right);
+
+            var score = primaryDistance + (crossDistance * 0.1) + (crossGap * 8);
+            if (score < bestScore)
+            {
+                bestScore = score;
+                bestIndex = index;
+            }
+        }
+
+        return bestIndex;
+    }
+
+    private static Point GetCenter(Rect rect) =>
+        new(rect.X + (rect.Width / 2), rect.Y + (rect.Height / 2));
+
+    private static bool IsInDirection(Rect source, Rect candidate, NavigationDirection direction) =>
+        direction switch
+        {
+            NavigationDirection.Up => candidate.Bottom < source.Center.Y - DirectionTolerance,
+            NavigationDirection.Down => candidate.Top > source.Center.Y + DirectionTolerance,
+            NavigationDirection.Left => candidate.Right < source.Center.X - DirectionTolerance,
+            NavigationDirection.Right => candidate.Left > source.Center.X + DirectionTolerance,
+            _ => false
+        };
+
+    private static double GetIntervalGap(double firstStart, double firstEnd, double secondStart, double secondEnd)
+    {
+        if (secondEnd < firstStart)
+            return firstStart - secondEnd;
+        if (secondStart > firstEnd)
+            return secondStart - firstEnd;
+        return 0;
+    }
+}
diff --git a/OpenKh.Tools.ModsManager.Avalonia/Services/VirtualKeyboardService.cs b/OpenKh.Tools.ModsManager.Avalonia/Services/VirtualKeyboardService.cs
new file mode 100644
index 000000000..32385cd43
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Avalonia/Services/VirtualKeyboardService.cs
@@ -0,0 +1,212 @@
+using Avalonia.Controls;
+using Avalonia.Input;
+using System.Diagnostics;
+using System.Runtime.InteropServices;
+
+namespace OpenKh.Tools.ModsManager.Avalonia.Services;
+
+public interface IVirtualKeyboardHost
+{
+    bool IsOpen { get; }
+    void Show(TextBox textBox);
+    bool HandleControllerAction(ControllerAction action);
+    bool Hide();
+}
+
+public static class VirtualKeyboardService
+{
+    private const string SteamKeyboardUri =
+        "steam://open/keyboard?XPosition=0&YPosition=0&Width=0&Height=0&Mode=0";
+    private const string SteamCloseKeyboardUri = "steam://close/keyboard";
+    private const uint WindowSystemCommand = 0x0112;
+    private const uint SystemCommandClose = 0xF060;
+    private static IVirtualKeyboardHost? _host;
+    private static KeyboardBackend _backend;
+    private static WeakReference<TextBox>? _target;
+
+    public static bool IsOpen => _host?.IsOpen ?? _backend != KeyboardBackend.None;
+
+    public static void Configure(IVirtualKeyboardHost host)
+    {
+        _host = host;
+    }
+
+    public static void Show(TextBox textBox)
+    {
+        if (_host is not null)
+        {
+            _host.Show(textBox);
+            return;
+        }
+
+        textBox.Focus(NavigationMethod.Directional);
+        _target = new WeakReference<TextBox>(textBox);
+
+        try
+        {
+            if (ShouldUseSteamKeyboard())
+            {
+                OpenSteamUri(SteamKeyboardUri);
+                _backend = KeyboardBackend.Steam;
+                return;
+            }
+
+            if (OperatingSystem.IsWindows())
+            {
+                ShowWindowsKeyboard();
+                _backend = KeyboardBackend.Windows;
+                return;
+            }
+
+            if (OperatingSystem.IsLinux())
+            {
+                OpenSteamUri(SteamKeyboardUri);
+                _backend = KeyboardBackend.Steam;
+            }
+        }
+        catch (Exception exception) when (
+            exception is InvalidOperationException or System.ComponentModel.Win32Exception)
+        {
+        }
+    }
+
+    public static bool HandleControllerAction(ControllerAction action)
+    {
+        if (_host is not null)
+            return _host.HandleControllerAction(action);
+        if (_backend == KeyboardBackend.None)
+            return false;
+
+        if (action == ControllerAction.Cancel)
+            Hide();
+
+        return true;
+    }
+
+    public static bool Hide()
+    {
+        if (_host is not null)
+            return _host.Hide();
+        if (_backend == KeyboardBackend.None)
+            return false;
+
+        try
+        {
+            if (_backend == KeyboardBackend.Windows)
+                HideWindowsKeyboard();
+            else if (_backend == KeyboardBackend.Steam)
+                OpenSteamUri(SteamCloseKeyboardUri);
+        }
+        catch (Exception exception) when (
+            exception is InvalidOperationException or System.ComponentModel.Win32Exception)
+        {
+        }
+        finally
+        {
+            _backend = KeyboardBackend.None;
+            if (_target?.TryGetTarget(out var textBox) == true)
+                textBox.Focus(NavigationMethod.Directional);
+            _target = null;
+        }
+
+        return true;
+    }
+
+    private static bool ShouldUseSteamKeyboard()
+    {
+        if (!OperatingSystem.IsWindows() && !OperatingSystem.IsLinux())
+            return false;
+
+        if (!string.IsNullOrWhiteSpace(Environment.GetEnvironmentVariable("SteamAppId")) ||
+            !string.IsNullOrWhiteSpace(Environment.GetEnvironmentVariable("SteamGameId")) ||
+            Environment.GetEnvironmentVariable("SteamDeck") == "1" ||
+            Environment.GetEnvironmentVariable("SteamGamepadUI") == "1")
+        {
+            return true;
+        }
+
+        try
+        {
+            var processes = Process.GetProcessesByName("steam");
+            try
+            {
+                return processes.Length > 0;
+            }
+            finally
+            {
+                foreach (var process in processes)
+                    process.Dispose();
+            }
+        }
+        catch (Exception exception) when (
+            exception is InvalidOperationException or
+            System.ComponentModel.Win32Exception or
+            PlatformNotSupportedException)
+        {
+            return false;
+        }
+    }
+
+    private static void ShowWindowsKeyboard()
+    {
+        var commonProgramFiles = Environment.GetFolderPath(Environment.SpecialFolder.CommonProgramFiles);
+        var touchKeyboard = Path.Combine(
+            commonProgramFiles,
+            "microsoft shared",
+            "ink",
+            "TabTip.exe");
+        var executable = File.Exists(touchKeyboard) ? touchKeyboard : "osk.exe";
+        Process.Start(new ProcessStartInfo
+        {
+            FileName = executable,
+            UseShellExecute = true
+        });
+    }
+
+    private static void OpenSteamUri(string uri)
+    {
+        if (OperatingSystem.IsWindows())
+        {
+            Process.Start(new ProcessStartInfo
+            {
+                FileName = uri,
+                UseShellExecute = true
+            });
+            return;
+        }
+
+        var startInfo = new ProcessStartInfo
+        {
+            FileName = "steam",
+            UseShellExecute = false
+        };
+        startInfo.ArgumentList.Add(uri);
+        Process.Start(startInfo);
+    }
+
+    private static void HideWindowsKeyboard()
+    {
+        var touchKeyboardWindow = FindWindow("IPTip_Main_Window", null);
+        if (touchKeyboardWindow != IntPtr.Zero)
+            PostMessage(touchKeyboardWindow, WindowSystemCommand, (IntPtr)SystemCommandClose, IntPtr.Zero);
+
+        foreach (var process in Process.GetProcessesByName("osk"))
+        {
+            using (process)
+                process.CloseMainWindow();
+        }
+    }
+
+    [DllImport("user32.dll", CharSet = CharSet.Unicode)]
+    private static extern IntPtr FindWindow(string? className, string? windowName);
+
+    [DllImport("user32.dll")]
+    private static extern bool PostMessage(IntPtr window, uint message, IntPtr wordParameter, IntPtr longParameter);
+
+    private enum KeyboardBackend
+    {
+        None,
+        Windows,
+        Steam
+    }
+}
diff --git a/OpenKh.Tools.ModsManager.Avalonia/ViewModels/AsyncRelayCommand.cs b/OpenKh.Tools.ModsManager.Avalonia/ViewModels/AsyncRelayCommand.cs
new file mode 100644
index 000000000..c9d539daa
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Avalonia/ViewModels/AsyncRelayCommand.cs
@@ -0,0 +1,32 @@
+using System.Windows.Input;
+
+namespace OpenKh.Tools.ModsManager.Avalonia.ViewModels;
+
+public sealed class AsyncRelayCommand(Func<Task> execute, Func<bool>? canExecute = null) : ICommand
+{
+    private bool _isRunning;
+
+    public event EventHandler? CanExecuteChanged;
+
+    public bool CanExecute(object? parameter) => !_isRunning && (canExecute?.Invoke() ?? true);
+
+    public async void Execute(object? parameter)
+    {
+        if (!CanExecute(parameter))
+            return;
+
+        try
+        {
+            _isRunning = true;
+            NotifyCanExecuteChanged();
+            await execute();
+        }
+        finally
+        {
+            _isRunning = false;
+            NotifyCanExecuteChanged();
+        }
+    }
+
+    public void NotifyCanExecuteChanged() => CanExecuteChanged?.Invoke(this, EventArgs.Empty);
+}
diff --git a/OpenKh.Tools.ModsManager.Avalonia/ViewModels/CollectionOptionViewModel.cs b/OpenKh.Tools.ModsManager.Avalonia/ViewModels/CollectionOptionViewModel.cs
new file mode 100644
index 000000000..74ad64509
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Avalonia/ViewModels/CollectionOptionViewModel.cs
@@ -0,0 +1,17 @@
+using OpenKh.Tools.ModsManager.Core;
+
+namespace OpenKh.Tools.ModsManager.Avalonia.ViewModels;
+
+public sealed class CollectionOptionViewModel(CollectionOption option) : ObservableObject
+{
+    private bool _isEnabled = option.IsEnabled;
+
+    public string Name => option.Name;
+    public bool IsEnabled
+    {
+        get => _isEnabled;
+        set => SetProperty(ref _isEnabled, value);
+    }
+
+    public CollectionOption ToModel() => new(Name, IsEnabled);
+}
diff --git a/OpenKh.Tools.ModsManager.Avalonia/ViewModels/MainWindowViewModel.cs b/OpenKh.Tools.ModsManager.Avalonia/ViewModels/MainWindowViewModel.cs
new file mode 100644
index 000000000..07c7446e0
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Avalonia/ViewModels/MainWindowViewModel.cs
@@ -0,0 +1,980 @@
+using OpenKh.Tools.ModsManager.Core;
+using OpenKh.Tools.ModsManager.Avalonia.Services;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+using Avalonia.Threading;
+
+namespace OpenKh.Tools.ModsManager.Avalonia.ViewModels;
+
+public sealed class MainWindowViewModel : ObservableObject
+{
+    private readonly ModCatalogService _catalogService;
+    private readonly RepositoryModInstaller _modInstaller;
+    private readonly ModMaintenanceService _maintenanceService;
+    private readonly IModInstallPrompt _modInstallPrompt;
+    private readonly IOnlineModsPrompt _onlineModsPrompt;
+    private readonly IPresetsPrompt _presetsPrompt;
+    private readonly ISettingsPrompt _settingsPrompt;
+    private readonly IInfoPrompt _infoPrompt;
+    private readonly ICreatorPrompt _creatorPrompt;
+    private readonly IUserDialogService _dialogs;
+    private readonly ISetupPrompt _setupPrompt;
+    private readonly ModManagerConfigurationService _configuration;
+    private readonly ModBuildService _buildService;
+    private readonly GameLaunchService _launchService;
+    private readonly ICollectionSettingsPrompt _collectionSettingsPrompt;
+    private readonly PcPackagePatchService _packagePatchService;
+    private readonly IControllerInputService _controllerInput;
+    private readonly List<ModListItemViewModel> _allMods = [];
+    private GameInfo _selectedGame;
+    private ModListItemViewModel? _selectedMod;
+    private string _searchText = string.Empty;
+    private string _statusText = "Loading your mods";
+    private string _statusForeground = "#91A2BA";
+    private bool _isBusy;
+    private bool _showAdvancedOptions;
+    private bool _startupUpdateCheckCompleted;
+
+    public MainWindowViewModel(
+        ModCatalogService catalogService,
+        RepositoryModInstaller modInstaller,
+        ModMaintenanceService maintenanceService,
+        IModInstallPrompt modInstallPrompt,
+        IOnlineModsPrompt onlineModsPrompt,
+        IPresetsPrompt presetsPrompt,
+        ISettingsPrompt settingsPrompt,
+        IInfoPrompt infoPrompt,
+        ICreatorPrompt creatorPrompt,
+        IUserDialogService dialogs,
+        ISetupPrompt setupPrompt,
+        ModManagerConfigurationService configuration,
+        ModBuildService buildService,
+        GameLaunchService launchService,
+        ICollectionSettingsPrompt collectionSettingsPrompt,
+        PcPackagePatchService packagePatchService,
+        IControllerInputService controllerInput)
+    {
+        _catalogService = catalogService;
+        _modInstaller = modInstaller;
+        _maintenanceService = maintenanceService;
+        _modInstallPrompt = modInstallPrompt;
+        _onlineModsPrompt = onlineModsPrompt;
+        _presetsPrompt = presetsPrompt;
+        _settingsPrompt = settingsPrompt;
+        _infoPrompt = infoPrompt;
+        _creatorPrompt = creatorPrompt;
+        _dialogs = dialogs;
+        _setupPrompt = setupPrompt;
+        _configuration = configuration;
+        _buildService = buildService;
+        _launchService = launchService;
+        _collectionSettingsPrompt = collectionSettingsPrompt;
+        _packagePatchService = packagePatchService;
+        _controllerInput = controllerInput;
+        _selectedGame = catalogService.DefaultGame;
+        Games = GameInfo.SupportedGames;
+        Mods = [];
+
+        RefreshCommand = new RelayCommand(() => _ = RefreshAsync(), () => !IsBusy);
+        MoveUpCommand = new RelayCommand(() => MoveSelected(-1), () => CanMoveSelected(-1));
+        MoveDownCommand = new RelayCommand(() => MoveSelected(1), () => CanMoveSelected(1));
+        MoveTopCommand = new RelayCommand(MoveSelectedToTop, () => CanMoveSelectedToTop());
+        OpenFolderCommand = new RelayCommand(OpenSelectedFolder, () => SelectedMod is not null);
+        OpenSourceCommand = new RelayCommand(
+            () => OpenUrl(SelectedMod?.SourceUrl),
+            () => SelectedMod?.HasSource == true);
+        ReportBugCommand = new RelayCommand(
+            () => OpenUrl(SelectedMod?.ReportBugUrl),
+            () => SelectedMod?.CanReportBug == true);
+        InstallCommand = new AsyncRelayCommand(InstallPackageAsync, () => !IsBusy);
+        BrowseModsCommand = new AsyncRelayCommand(BrowseOnlineModsAsync, () => !IsBusy);
+        PresetsCommand = new AsyncRelayCommand(OpenPresetsAsync, () => !IsBusy);
+        SettingsCommand = new AsyncRelayCommand(OpenSettingsAsync, () => !IsBusy);
+        InfoCommand = new AsyncRelayCommand(OpenInfoAsync, () => !IsBusy);
+        CreatorCommand = new AsyncRelayCommand(OpenCreatorAsync, () => !IsBusy);
+        CheckUpdatesCommand = new AsyncRelayCommand(CheckUpdatesAsync, () => !IsBusy && TotalCount > 0);
+        UpdateSelectedCommand = new AsyncRelayCommand(UpdateSelectedAsync, () => !IsBusy && SelectedMod?.HasUpdate == true);
+        RemoveSelectedCommand = new AsyncRelayCommand(RemoveSelectedAsync, () => !IsBusy && SelectedMod is not null);
+        SetupCommand = new AsyncRelayCommand(OpenSetupAsync, () => !IsBusy);
+        BuildCommand = new AsyncRelayCommand(BuildAsync, () => !IsBusy);
+        BuildAndPlayCommand = new AsyncRelayCommand(BuildAndPlayAsync, () => !IsBusy);
+        PlayCommand = new AsyncRelayCommand(PlayAsync, () => !IsBusy);
+        StopGameCommand = new RelayCommand(StopGame, () => IsGameRunning);
+        CollectionSettingsCommand = new AsyncRelayCommand(OpenCollectionSettingsAsync, () => !IsBusy && SelectedMod?.IsCollection == true);
+        ApplyToGameCommand = new AsyncRelayCommand(ApplyToGameAsync, () => !IsBusy && EnabledCount > 0);
+        FastPatchCommand = new AsyncRelayCommand(FastPatchAsync, () => !IsBusy && EnabledCount > 0);
+        RestoreGameCommand = new AsyncRelayCommand(RestoreGameAsync, () => !IsBusy);
+        ClearBuiltModsCommand = new AsyncRelayCommand(ClearBuiltModsAsync, () => !IsBusy);
+        ToggleAdvancedOptionsCommand = new RelayCommand(() => ShowAdvancedOptions = !ShowAdvancedOptions);
+        _controllerInput.StatusChanged += ControllerConnectionChanged;
+        _launchService.RunningStateChanged += LaunchRunningStateChanged;
+
+        _ = RefreshAsync();
+    }
+
+    public IReadOnlyList<GameInfo> Games { get; }
+    public ObservableCollection<ModListItemViewModel> Mods { get; }
+    public RelayCommand RefreshCommand { get; }
+    public RelayCommand MoveUpCommand { get; }
+    public RelayCommand MoveDownCommand { get; }
+    public RelayCommand MoveTopCommand { get; }
+    public RelayCommand OpenFolderCommand { get; }
+    public RelayCommand OpenSourceCommand { get; }
+    public RelayCommand ReportBugCommand { get; }
+    public AsyncRelayCommand InstallCommand { get; }
+    public AsyncRelayCommand BrowseModsCommand { get; }
+    public AsyncRelayCommand PresetsCommand { get; }
+    public AsyncRelayCommand SettingsCommand { get; }
+    public AsyncRelayCommand InfoCommand { get; }
+    public AsyncRelayCommand CreatorCommand { get; }
+    public AsyncRelayCommand CheckUpdatesCommand { get; }
+    public AsyncRelayCommand UpdateSelectedCommand { get; }
+    public AsyncRelayCommand RemoveSelectedCommand { get; }
+    public AsyncRelayCommand SetupCommand { get; }
+    public AsyncRelayCommand BuildCommand { get; }
+    public AsyncRelayCommand BuildAndPlayCommand { get; }
+    public AsyncRelayCommand PlayCommand { get; }
+    public RelayCommand StopGameCommand { get; }
+    public AsyncRelayCommand CollectionSettingsCommand { get; }
+    public AsyncRelayCommand ApplyToGameCommand { get; }
+    public AsyncRelayCommand FastPatchCommand { get; }
+    public AsyncRelayCommand RestoreGameCommand { get; }
+    public AsyncRelayCommand ClearBuiltModsCommand { get; }
+    public RelayCommand ToggleAdvancedOptionsCommand { get; }
+    public string InstallationDirectory => _catalogService.InstallationDirectory;
+    public string ControllerStatusText => _controllerInput.StatusText;
+    public string ControllerHelpText => _controllerInput.NavigationHelpText;
+    public bool IsControllerConnected => _controllerInput.IsConnected;
+    public bool ShowControllerHelp => IsControllerConnected || !string.IsNullOrWhiteSpace(ControllerHelpText);
+    public bool IsGameRunning => _launchService.IsRunning;
+
+    public GameInfo SelectedGame
+    {
+        get => _selectedGame;
+        set
+        {
+            if (!SetProperty(ref _selectedGame, value) || value is null)
+                return;
+
+            _configuration.Current.LaunchGame = value.Id;
+            _configuration.Save();
+            _ = RefreshAsync();
+        }
+    }
+
+    public ModListItemViewModel? SelectedMod
+    {
+        get => _selectedMod;
+        set
+        {
+            if (!SetProperty(ref _selectedMod, value))
+                return;
+
+            OnPropertyChanged(nameof(HasSelection));
+            MoveUpCommand.NotifyCanExecuteChanged();
+            MoveDownCommand.NotifyCanExecuteChanged();
+            MoveTopCommand.NotifyCanExecuteChanged();
+            OpenFolderCommand.NotifyCanExecuteChanged();
+            OpenSourceCommand.NotifyCanExecuteChanged();
+            ReportBugCommand.NotifyCanExecuteChanged();
+            UpdateSelectedCommand.NotifyCanExecuteChanged();
+            RemoveSelectedCommand.NotifyCanExecuteChanged();
+            CollectionSettingsCommand.NotifyCanExecuteChanged();
+            ApplyToGameCommand.NotifyCanExecuteChanged();
+            FastPatchCommand.NotifyCanExecuteChanged();
+            RestoreGameCommand.NotifyCanExecuteChanged();
+            ClearBuiltModsCommand.NotifyCanExecuteChanged();
+            SetupCommand.NotifyCanExecuteChanged();
+            BuildCommand.NotifyCanExecuteChanged();
+            BuildAndPlayCommand.NotifyCanExecuteChanged();
+            PlayCommand.NotifyCanExecuteChanged();
+            CollectionSettingsCommand.NotifyCanExecuteChanged();
+        }
+    }
+
+    public bool HasSelection => SelectedMod is not null;
+
+    public bool ShowAdvancedOptions
+    {
+        get => _showAdvancedOptions;
+        set => SetProperty(ref _showAdvancedOptions, value);
+    }
+
+    public bool EnablePatching => _configuration.Current.EnablePatching;
+
+    public string SearchText
+    {
+        get => _searchText;
+        set
+        {
+            if (SetProperty(ref _searchText, value))
+                ApplyFilter();
+        }
+    }
+
+    public string StatusText
+    {
+        get => _statusText;
+        private set
+        {
+            StatusForeground = "#91A2BA";
+            SetProperty(ref _statusText, value);
+        }
+    }
+
+    public string StatusForeground
+    {
+        get => _statusForeground;
+        private set => SetProperty(ref _statusForeground, value);
+    }
+
+    public bool IsBusy
+    {
+        get => _isBusy;
+        private set
+        {
+            if (!SetProperty(ref _isBusy, value))
+                return;
+
+            RefreshCommand.NotifyCanExecuteChanged();
+            InstallCommand.NotifyCanExecuteChanged();
+            BrowseModsCommand.NotifyCanExecuteChanged();
+            PresetsCommand.NotifyCanExecuteChanged();
+            SettingsCommand.NotifyCanExecuteChanged();
+            InfoCommand.NotifyCanExecuteChanged();
+            CreatorCommand.NotifyCanExecuteChanged();
+            CheckUpdatesCommand.NotifyCanExecuteChanged();
+            UpdateSelectedCommand.NotifyCanExecuteChanged();
+            RemoveSelectedCommand.NotifyCanExecuteChanged();
+            SetupCommand.NotifyCanExecuteChanged();
+            BuildCommand.NotifyCanExecuteChanged();
+            BuildAndPlayCommand.NotifyCanExecuteChanged();
+            PlayCommand.NotifyCanExecuteChanged();
+            CollectionSettingsCommand.NotifyCanExecuteChanged();
+            ApplyToGameCommand.NotifyCanExecuteChanged();
+            FastPatchCommand.NotifyCanExecuteChanged();
+            RestoreGameCommand.NotifyCanExecuteChanged();
+            ClearBuiltModsCommand.NotifyCanExecuteChanged();
+        }
+    }
+
+    public int TotalCount => _allMods.Count;
+    public int EnabledCount => _allMods.Count(mod => mod.IsEnabled);
+    public string LibrarySummary => TotalCount == 1 ? "1 installed mod" : $"{TotalCount} installed mods";
+    public string EnabledSummary => EnabledCount == 1 ? "1 enabled" : $"{EnabledCount} enabled";
+
+    private async Task RefreshAsync()
+    {
+        try
+        {
+            IsBusy = true;
+            StatusText = $"Loading {SelectedGame.DisplayName}";
+            var entries = await _catalogService.LoadAsync(SelectedGame);
+
+            _allMods.Clear();
+            _allMods.AddRange(entries.Select(entry =>
+                new ModListItemViewModel(entry, SaveEnabledOrder)));
+            ApplyFilter();
+            StatusText = TotalCount == 0
+                ? "No mods were found for this game"
+                : $"{LibrarySummary}, {EnabledSummary}";
+            NotifySummaryChanged();
+            if (!_startupUpdateCheckCompleted && _configuration.Current.AutoUpdateMods && TotalCount > 0)
+            {
+                _startupUpdateCheckCompleted = true;
+                await CheckUpdatesAsync();
+            }
+        }
+        catch (Exception exception)
+        {
+            SetErrorStatus($"Could not load mods: {exception.Message}");
+        }
+        finally
+        {
+            IsBusy = false;
+        }
+    }
+
+    private void ApplyFilter()
+    {
+        var selectedId = SelectedMod?.Id;
+        var query = SearchText.Trim();
+        var filteredMods = string.IsNullOrEmpty(query)
+            ? _allMods
+            : _allMods.Where(mod =>
+                mod.Name.Contains(query, StringComparison.OrdinalIgnoreCase) ||
+                mod.Author.Contains(query, StringComparison.OrdinalIgnoreCase) ||
+                mod.Id.Contains(query, StringComparison.OrdinalIgnoreCase));
+
+        Mods.Clear();
+        foreach (var mod in filteredMods)
+            Mods.Add(mod);
+
+        SelectedMod = Mods.FirstOrDefault(mod => mod.Id == selectedId) ?? Mods.FirstOrDefault();
+    }
+
+    private void SaveEnabledOrder()
+    {
+        _catalogService.SaveEnabledOrder(SelectedGame, _allMods.Select(mod => mod.Model));
+        StatusText = $"Mod selection saved, {EnabledSummary}";
+        NotifySummaryChanged();
+    }
+
+    private bool CanMoveSelected(int offset)
+    {
+        if (SelectedMod is null || !string.IsNullOrWhiteSpace(SearchText))
+            return false;
+
+        var index = _allMods.IndexOf(SelectedMod);
+        var targetIndex = index + offset;
+        return index >= 0 &&
+            targetIndex >= GetHighestAllowedIndex(SelectedMod) &&
+            targetIndex <= GetLowestAllowedIndex(SelectedMod);
+    }
+
+    private void MoveSelected(int offset)
+    {
+        if (!CanMoveSelected(offset) || SelectedMod is null)
+            return;
+
+        var oldIndex = _allMods.IndexOf(SelectedMod);
+        var newIndex = oldIndex + offset;
+        var selectedId = SelectedMod.Id;
+        _allMods.RemoveAt(oldIndex);
+        _allMods.Insert(newIndex, SelectedMod);
+        var selected = Mods[oldIndex];
+        Mods.RemoveAt(oldIndex);
+        Mods.Insert(newIndex, selected);
+        SelectedMod = Mods.First(mod => mod.Id == selectedId);
+        SaveEnabledOrder();
+        MoveUpCommand.NotifyCanExecuteChanged();
+        MoveDownCommand.NotifyCanExecuteChanged();
+        MoveTopCommand.NotifyCanExecuteChanged();
+    }
+
+    private bool CanMoveSelectedToTop() =>
+        SelectedMod is not null &&
+        string.IsNullOrWhiteSpace(SearchText) &&
+        _allMods.IndexOf(SelectedMod) > GetHighestAllowedIndex(SelectedMod);
+
+    private void MoveSelectedToTop()
+    {
+        if (!CanMoveSelectedToTop() || SelectedMod is null)
+            return;
+        var selectedId = SelectedMod.Id;
+        var oldIndex = _allMods.IndexOf(SelectedMod);
+        var targetIndex = GetHighestAllowedIndex(SelectedMod);
+        _allMods.Remove(SelectedMod);
+        _allMods.Insert(targetIndex, SelectedMod);
+        var selected = Mods[oldIndex];
+        Mods.RemoveAt(oldIndex);
+        Mods.Insert(targetIndex, selected);
+        SelectedMod = Mods.First(mod => mod.Id == selectedId);
+        SaveEnabledOrder();
+        MoveUpCommand.NotifyCanExecuteChanged();
+        MoveDownCommand.NotifyCanExecuteChanged();
+        MoveTopCommand.NotifyCanExecuteChanged();
+    }
+
+    private int GetHighestAllowedIndex(ModListItemViewModel mod)
+    {
+        if (!mod.IsPcPatch)
+            return 0;
+
+        var firstPcPatch = _allMods.FindIndex(item => item.IsPcPatch);
+        return firstPcPatch < 0 ? _allMods.Count : firstPcPatch;
+    }
+
+    private int GetLowestAllowedIndex(ModListItemViewModel mod)
+    {
+        if (mod.IsPcPatch)
+            return _allMods.Count - 1;
+
+        var firstPcPatch = _allMods.FindIndex(item => item.IsPcPatch);
+        return firstPcPatch < 0 ? _allMods.Count - 1 : firstPcPatch - 1;
+    }
+
+    private void OpenSelectedFolder()
+    {
+        if (SelectedMod is null)
+            return;
+
+        Process.Start(new ProcessStartInfo
+        {
+            FileName = SelectedMod.Directory,
+            UseShellExecute = true
+        });
+    }
+
+    private static void OpenUrl(string? url)
+    {
+        if (string.IsNullOrWhiteSpace(url))
+            return;
+
+        Process.Start(new ProcessStartInfo(url) { UseShellExecute = true });
+    }
+
+    private async Task InstallPackageAsync()
+    {
+        var request = await _modInstallPrompt.ShowAsync();
+        if (request is null)
+            return;
+
+        try
+        {
+            var replacingExistingMod = false;
+            if (!request.Overwrite)
+            {
+                var existingMod = _modInstaller.FindInstalledMod(
+                    request.Source,
+                    SelectedGame,
+                    request.Branch);
+                if (existingMod is not null)
+                {
+                    replacingExistingMod = true;
+                    var replace = await ConfirmReplacementAsync(existingMod);
+                    if (!replace)
+                        return;
+
+                    request = request with { Overwrite = true };
+                }
+            }
+
+            IsBusy = true;
+            StatusText = "Preparing mod installation";
+            var progress = new Progress<ModOperationProgress>(value =>
+            {
+                StatusText = value.Percentage is { } percentage
+                    ? $"{value.Message} ({percentage:P0})"
+                    : value.Message;
+            });
+            ModInstallResult result;
+            while (true)
+            {
+                try
+                {
+                    result = await _modInstaller.InstallAsync(
+                        request.Source,
+                        SelectedGame,
+                        request.Branch,
+                        request.Overwrite,
+                        progress);
+                    break;
+                }
+                catch (ModAlreadyInstalledException exception) when (!request.Overwrite)
+                {
+                    replacingExistingMod = true;
+                    IsBusy = false;
+                    var replace = await ConfirmReplacementAsync(exception.ModName);
+                    if (!replace)
+                        return;
+
+                    request = request with { Overwrite = true };
+                    IsBusy = true;
+                    StatusText = $"Replacing {exception.ModName}";
+                }
+            }
+            if (replacingExistingMod)
+                await RefreshAsync();
+            else
+                await RefreshInstalledModAsync(result.Id);
+            SelectedMod = Mods.FirstOrDefault(mod =>
+                mod.Id.Equals(result.Id, StringComparison.OrdinalIgnoreCase));
+            SetSuccessStatus($"{result.DisplayName} was installed successfully");
+        }
+        catch (Exception exception)
+        {
+            SetErrorStatus($"Could not install mod: {exception.Message}");
+        }
+        finally
+        {
+            IsBusy = false;
+        }
+    }
+
+    private async Task CheckUpdatesAsync()
+    {
+        try
+        {
+            IsBusy = true;
+            var updateCount = 0;
+            var checkedCount = 0;
+            foreach (var mod in _allMods)
+            {
+                StatusText = $"Checking {mod.Name} for updates";
+                var behindBy = await _maintenanceService.CheckForUpdateAsync(mod.Model);
+                mod.SetUpdateCount(behindBy);
+                if (behindBy > 0)
+                    updateCount++;
+                checkedCount++;
+                StatusText = $"Checked {checkedCount} of {TotalCount} mods";
+            }
+
+            StatusText = updateCount switch
+            {
+                0 => "All repository mods are up to date",
+                1 => "1 mod update is available",
+                _ => $"{updateCount} mod updates are available"
+            };
+        }
+        catch (Exception exception)
+        {
+            SetErrorStatus($"Could not check for updates: {exception.Message}");
+        }
+        finally
+        {
+            IsBusy = false;
+        }
+    }
+
+    private async Task OpenSetupAsync()
+    {
+        if (!await _setupPrompt.ShowAsync())
+            return;
+
+        _configuration.Current.WizardVersionNumber = 1;
+        _configuration.Save();
+        await RefreshAsync();
+        StatusText = "Setup was saved";
+    }
+
+    private async Task BrowseOnlineModsAsync()
+    {
+        if (!await _onlineModsPrompt.ShowAsync(
+                SelectedGame,
+                _allMods.Select(mod => mod.Id).ToArray(),
+                RefreshInstalledModAsync))
+            return;
+
+        await RefreshAsync();
+        SetSuccessStatus("Online mod installation completed");
+    }
+
+    private async Task RefreshInstalledModAsync(string modId)
+    {
+        _catalogService.MoveInstalledModToHighestPriority(SelectedGame, modId);
+        await RefreshAsync();
+        SelectedMod = Mods.FirstOrDefault(mod =>
+            mod.Id.Equals(modId, StringComparison.OrdinalIgnoreCase));
+    }
+
+    private async Task OpenPresetsAsync()
+    {
+        var enabledIds = _allMods.Where(mod => mod.IsEnabled).Select(mod => mod.Id).ToArray();
+        var presetIds = await _presetsPrompt.ShowAsync(enabledIds);
+        if (presetIds is null)
+            return;
+
+        var enabled = presetIds.ToHashSet(StringComparer.OrdinalIgnoreCase);
+        var order = presetIds
+            .Select(id => _allMods.FirstOrDefault(mod => mod.Id.Equals(id, StringComparison.OrdinalIgnoreCase)))
+            .Where(mod => mod is not null)
+            .Cast<ModListItemViewModel>()
+            .Concat(_allMods.Where(mod => !enabled.Contains(mod.Id)))
+            .ToArray();
+        foreach (var mod in _allMods)
+            mod.Model.IsEnabled = enabled.Contains(mod.Id);
+        _catalogService.SaveEnabledOrder(SelectedGame, order.Select(mod => mod.Model));
+        await RefreshAsync();
+        SetSuccessStatus("Preset applied");
+    }
+
+    private async Task OpenSettingsAsync()
+    {
+        if (await _settingsPrompt.ShowAsync())
+        {
+            if (!EnablePatching)
+                ShowAdvancedOptions = false;
+            OnPropertyChanged(nameof(EnablePatching));
+            SetSuccessStatus("Settings were saved");
+        }
+    }
+
+    private async Task<bool> ConfirmReplacementAsync(string modName)
+    {
+        var replace = await _dialogs.ConfirmAsync(
+            "Replace Existing Mod?",
+            $"A mod named '{modName}' is already installed. Replace it with the selected mod?",
+            "Replace Mod");
+        if (!replace)
+            StatusText = "Mod installation was cancelled";
+        return replace;
+    }
+
+    private Task OpenInfoAsync() => _infoPrompt.ShowAsync();
+
+    private Task OpenCreatorAsync() => _creatorPrompt.ShowAsync();
+
+    public async Task RunInitialSetupAsync()
+    {
+        if (_configuration.Current.WizardVersionNumber >= 1)
+            return;
+
+        StatusText = "Complete Setup before using the Mod Manager";
+        if (!await _setupPrompt.ShowAsync())
+        {
+            StatusText = "Setup was not completed";
+            return;
+        }
+
+        _configuration.Current.WizardVersionNumber = 1;
+        _configuration.Save();
+        await RefreshAsync();
+        SetSuccessStatus("Setup was completed");
+    }
+
+    private async Task BuildAsync()
+    {
+        try
+        {
+            IsBusy = true;
+            var progress = CreateStatusProgress();
+            var outputDirectory = await _buildService.BuildAsync(
+                SelectedGame,
+                _allMods.Select(mod => mod.Model).ToArray(),
+                progress: progress);
+            SetSuccessStatus($"Mods built in {outputDirectory}");
+        }
+        catch (Exception exception)
+        {
+            SetErrorStatus($"Could not build mods: {exception.Message}");
+        }
+        finally
+        {
+            IsBusy = false;
+        }
+    }
+
+    private async Task OpenCollectionSettingsAsync()
+    {
+        if (SelectedMod is null || !SelectedMod.IsCollection)
+            return;
+        if (await _collectionSettingsPrompt.ShowAsync(SelectedMod.Model, SelectedGame))
+        {
+            var selectedId = SelectedMod.Id;
+            var selectedName = SelectedMod.Name;
+            await RefreshAsync();
+            SelectedMod = Mods.FirstOrDefault(mod => mod.Id.Equals(selectedId, StringComparison.OrdinalIgnoreCase));
+            SetSuccessStatus($"{selectedName} collection settings were saved");
+        }
+    }
+
+    private Task ApplyToGameAsync() => PatchGameAsync(false);
+
+    private Task FastPatchAsync() => PatchGameAsync(true);
+
+    private async Task PatchGameAsync(bool fastMode)
+    {
+        var confirmed = await _dialogs.ConfirmAsync(
+            $"{(fastMode ? "Fast patch" : "Full patch")} {SelectedGame.DisplayName}?",
+            fastMode
+                ? "OpenKH will build a fast patch, create backups when needed, and replace the first game package."
+                : "OpenKH will create backups in BackupImage, build the enabled mods, and replace every affected HED/PKG file.",
+            fastMode ? "Fast patch" : "Full patch");
+        if (!confirmed)
+            return;
+
+        try
+        {
+            IsBusy = true;
+            var progress = CreateStatusProgress();
+            await _buildService.BuildAsync(
+                SelectedGame,
+                _allMods.Select(mod => mod.Model).ToArray(),
+                fastMode,
+                progress: progress);
+            await _packagePatchService.ApplyAsync(SelectedGame, fastMode, progress);
+            SetSuccessStatus($"{(fastMode ? "Fast" : "Full")} patch completed for {SelectedGame.DisplayName}");
+        }
+        catch (Exception exception)
+        {
+            SetErrorStatus($"Could not apply mods to the game: {exception.Message}");
+        }
+        finally
+        {
+            IsBusy = false;
+        }
+    }
+
+    private async Task RestoreGameAsync()
+    {
+        var confirmed = await _dialogs.ConfirmAsync(
+            $"Restore {SelectedGame.DisplayName}?",
+            "The original HED/PKG files will be restored from BackupImage and the current build output will be removed.",
+            "Restore Game");
+        if (!confirmed)
+            return;
+
+        try
+        {
+            IsBusy = true;
+            await _packagePatchService.RestoreAsync(SelectedGame, true, CreateStatusProgress());
+            SetSuccessStatus($"{SelectedGame.DisplayName} was restored");
+        }
+        catch (Exception exception)
+        {
+            SetErrorStatus($"Could not restore the game: {exception.Message}");
+        }
+        finally
+        {
+            IsBusy = false;
+        }
+    }
+
+    private async Task ClearBuiltModsAsync()
+    {
+        try
+        {
+            IsBusy = true;
+            await _packagePatchService.RestoreAsync(SelectedGame, false, CreateStatusProgress());
+            SetSuccessStatus($"Built mods were cleared for {SelectedGame.DisplayName}");
+        }
+        catch (Exception exception)
+        {
+            SetErrorStatus($"Could not clear built mods: {exception.Message}");
+        }
+        finally
+        {
+            IsBusy = false;
+        }
+    }
+
+    private async Task BuildAndPlayAsync()
+    {
+        try
+        {
+            IsBusy = true;
+            await _buildService.BuildAsync(
+                SelectedGame,
+                _allMods.Select(mod => mod.Model).ToArray(),
+                progress: CreateStatusProgress());
+            StatusText = $"Launching {SelectedGame.DisplayName}";
+            await _launchService.LaunchAsync(SelectedGame);
+            SetSuccessStatus($"{SelectedGame.DisplayName} was launched");
+        }
+        catch (Exception exception)
+        {
+            SetErrorStatus($"Could not build and launch: {exception.Message}");
+        }
+        finally
+        {
+            IsBusy = false;
+        }
+    }
+
+    private async Task PlayAsync()
+    {
+        try
+        {
+            IsBusy = true;
+            StatusText = $"Launching {SelectedGame.DisplayName}";
+            await _launchService.LaunchAsync(SelectedGame);
+            SetSuccessStatus($"{SelectedGame.DisplayName} was launched");
+        }
+        catch (Exception exception)
+        {
+            SetErrorStatus($"Could not launch game: {exception.Message}");
+        }
+        finally
+        {
+            IsBusy = false;
+        }
+    }
+
+    private void StopGame()
+    {
+        _launchService.Stop();
+        StatusText = "The running game or emulator was stopped";
+    }
+
+    private void LaunchRunningStateChanged()
+    {
+        Dispatcher.UIThread.Post(() =>
+        {
+            OnPropertyChanged(nameof(IsGameRunning));
+            StopGameCommand.NotifyCanExecuteChanged();
+        });
+    }
+
+    private Progress<ModOperationProgress> CreateStatusProgress() => new(value =>
+    {
+        StatusText = value.Percentage is { } percentage
+            ? $"{value.Message} ({percentage:P0})"
+            : value.Message;
+    });
+
+    private void SetSuccessStatus(string message)
+    {
+        StatusText = message;
+        StatusForeground = "#62D6A7";
+    }
+
+    private void SetErrorStatus(string message)
+    {
+        StatusText = message;
+        StatusForeground = "#FF7A7A";
+    }
+
+    private async Task UpdateSelectedAsync()
+    {
+        if (SelectedMod is null)
+            return;
+
+        var selectedId = SelectedMod.Id;
+        try
+        {
+            IsBusy = true;
+            var progress = new Progress<ModOperationProgress>(value =>
+            {
+                StatusText = value.Percentage is { } percentage
+                    ? $"{value.Message} ({percentage:P0})"
+                    : value.Message;
+            });
+            await _maintenanceService.UpdateAsync(SelectedMod.Model, SelectedGame, progress);
+            await RefreshAsync();
+            SelectedMod = Mods.FirstOrDefault(mod => mod.Id.Equals(selectedId, StringComparison.OrdinalIgnoreCase));
+            SetSuccessStatus($"{SelectedMod?.Name ?? selectedId} was updated successfully");
+        }
+        catch (Exception exception)
+        {
+            SetErrorStatus($"Could not update mod: {exception.Message}");
+        }
+        finally
+        {
+            IsBusy = false;
+        }
+    }
+
+    private async Task RemoveSelectedAsync()
+    {
+        if (SelectedMod is null)
+            return;
+
+        var mod = SelectedMod;
+        var confirmed = await _dialogs.ConfirmAsync(
+            $"Remove {mod.Name}?",
+            $"This will permanently remove '{mod.Id}' from this OpenKH installation.",
+            "Remove Mod");
+        if (!confirmed)
+            return;
+
+        try
+        {
+            IsBusy = true;
+            var visibleIndex = Mods.IndexOf(mod);
+            await _maintenanceService.RemoveAsync(mod.Model);
+            _allMods.Remove(mod);
+            Mods.Remove(mod);
+            SelectedMod = Mods.Count == 0
+                ? null
+                : Mods[Math.Min(Math.Max(visibleIndex, 0), Mods.Count - 1)];
+            _catalogService.SaveEnabledOrder(SelectedGame, _allMods.Select(item => item.Model));
+            NotifySummaryChanged();
+            SetSuccessStatus($"{mod.Name} was removed");
+        }
+        catch (Exception exception)
+        {
+            SetErrorStatus($"Could not remove mod: {exception.Message}");
+        }
+        finally
+        {
+            IsBusy = false;
+        }
+    }
+
+    private void NotifySummaryChanged()
+    {
+        OnPropertyChanged(nameof(TotalCount));
+        OnPropertyChanged(nameof(EnabledCount));
+        OnPropertyChanged(nameof(LibrarySummary));
+        OnPropertyChanged(nameof(EnabledSummary));
+        CheckUpdatesCommand.NotifyCanExecuteChanged();
+        BuildCommand.NotifyCanExecuteChanged();
+        BuildAndPlayCommand.NotifyCanExecuteChanged();
+        ApplyToGameCommand.NotifyCanExecuteChanged();
+        FastPatchCommand.NotifyCanExecuteChanged();
+    }
+
+    public void HandleControllerAction(ControllerAction action)
+    {
+        switch (action)
+        {
+            case ControllerAction.PreviousItem:
+                SelectRelativeMod(-1);
+                break;
+            case ControllerAction.NextItem:
+                SelectRelativeMod(1);
+                break;
+            case ControllerAction.Confirm:
+                if (SelectedMod is not null)
+                    SelectedMod.IsEnabled = !SelectedMod.IsEnabled;
+                break;
+            case ControllerAction.Cancel:
+                SearchText = string.Empty;
+                break;
+            case ControllerAction.Secondary:
+                if (OpenFolderCommand.CanExecute(null))
+                    OpenFolderCommand.Execute(null);
+                break;
+            case ControllerAction.Install:
+                if (InstallCommand.CanExecute(null))
+                    InstallCommand.Execute(null);
+                break;
+            case ControllerAction.PreviousGame:
+                SelectRelativeGame(-1);
+                break;
+            case ControllerAction.NextGame:
+                SelectRelativeGame(1);
+                break;
+            case ControllerAction.Refresh:
+                if (CheckUpdatesCommand.CanExecute(null))
+                    CheckUpdatesCommand.Execute(null);
+                break;
+            case ControllerAction.MoveUp:
+                if (MoveUpCommand.CanExecute(null))
+                    MoveUpCommand.Execute(null);
+                break;
+            case ControllerAction.MoveDown:
+                if (MoveDownCommand.CanExecute(null))
+                    MoveDownCommand.Execute(null);
+                break;
+            case ControllerAction.MoveTop:
+                if (MoveTopCommand.CanExecute(null))
+                    MoveTopCommand.Execute(null);
+                break;
+        }
+    }
+
+    private void SelectRelativeMod(int offset)
+    {
+        if (Mods.Count == 0)
+            return;
+
+        var currentIndex = SelectedMod is null ? 0 : Mods.IndexOf(SelectedMod);
+        var nextIndex = Math.Clamp(currentIndex + offset, 0, Mods.Count - 1);
+        SelectedMod = Mods[nextIndex];
+    }
+
+    private void SelectRelativeGame(int offset)
+    {
+        var currentIndex = 0;
+        for (var index = 0; index < Games.Count; index++)
+        {
+            if (Games[index] == SelectedGame)
+            {
+                currentIndex = index;
+                break;
+            }
+        }
+        var nextIndex = (currentIndex + offset + Games.Count) % Games.Count;
+        SelectedGame = Games[nextIndex];
+    }
+
+    private void ControllerConnectionChanged()
+    {
+        OnPropertyChanged(nameof(ControllerStatusText));
+        OnPropertyChanged(nameof(ControllerHelpText));
+        OnPropertyChanged(nameof(IsControllerConnected));
+        OnPropertyChanged(nameof(ShowControllerHelp));
+    }
+}
diff --git a/OpenKh.Tools.ModsManager.Avalonia/ViewModels/ModListItemViewModel.cs b/OpenKh.Tools.ModsManager.Avalonia/ViewModels/ModListItemViewModel.cs
new file mode 100644
index 000000000..2b6222886
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Avalonia/ViewModels/ModListItemViewModel.cs
@@ -0,0 +1,83 @@
+using OpenKh.Tools.ModsManager.Core;
+using Avalonia.Media.Imaging;
+
+namespace OpenKh.Tools.ModsManager.Avalonia.ViewModels;
+
+public sealed class ModListItemViewModel : ObservableObject
+{
+    private readonly Action _enabledStateChanged;
+    private bool _isEnabled;
+
+    public ModListItemViewModel(ModEntry model, Action enabledStateChanged)
+    {
+        Model = model;
+        _isEnabled = model.IsEnabled;
+        _enabledStateChanged = enabledStateChanged;
+        IconImage = LoadImage(model.IconPath);
+        PreviewImage = LoadImage(model.PreviewPath);
+    }
+
+    public ModEntry Model { get; }
+    public string Id => Model.Id;
+    public string Name => Model.Name;
+    public string Author => Model.Author;
+    public string Description => Model.Description;
+    public string Directory => Model.Directory;
+    public string? SourceUrl => Model.SourceUrl;
+    public string? ReportBugUrl => Model.ReportBugUrl;
+    public bool HasSource => !string.IsNullOrWhiteSpace(SourceUrl);
+    public bool CanReportBug => !string.IsNullOrWhiteSpace(ReportBugUrl);
+    public string Kind => Model.IsCollection ? "COLLECTION" : Model.IsPcPatch ? "PC PATCH" : "MOD";
+    public bool IsCollection => Model.IsCollection;
+    public bool IsPcPatch => Model.IsPcPatch;
+    public string Initial => string.IsNullOrWhiteSpace(Name) ? "?" : Name[..1].ToUpperInvariant();
+    public Bitmap? IconImage { get; }
+    public Bitmap? PreviewImage { get; }
+    public IReadOnlyList<string> FilesToPatch => Model.FilesToPatch;
+    public bool HasFilesToPatch => FilesToPatch.Count > 0;
+    public string FilesToPatchHeader => FilesToPatch.Count == 1
+        ? "1 file modified"
+        : $"{FilesToPatch.Count} files modified";
+    public string FilesToPatchText => string.Join(Environment.NewLine, FilesToPatch);
+    public bool HasIcon => IconImage is not null;
+    public bool HasPreview => PreviewImage is not null;
+    public bool ShowInitial => !HasIcon;
+    public int UpdateCount => Model.UpdateCount;
+    public bool HasUpdate => UpdateCount > 0;
+    public string UpdateLabel => UpdateCount == 1 ? "1 UPDATE" : $"{UpdateCount} UPDATES";
+
+    public void SetUpdateCount(int count)
+    {
+        Model.UpdateCount = Math.Max(0, count);
+        OnPropertyChanged(nameof(UpdateCount));
+        OnPropertyChanged(nameof(HasUpdate));
+        OnPropertyChanged(nameof(UpdateLabel));
+    }
+
+    private static Bitmap? LoadImage(string? fileName)
+    {
+        if (string.IsNullOrWhiteSpace(fileName) || !File.Exists(fileName))
+            return null;
+        try
+        {
+            return new Bitmap(fileName);
+        }
+        catch
+        {
+            return null;
+        }
+    }
+
+    public bool IsEnabled
+    {
+        get => _isEnabled;
+        set
+        {
+            if (!SetProperty(ref _isEnabled, value))
+                return;
+
+            Model.IsEnabled = value;
+            _enabledStateChanged();
+        }
+    }
+}
diff --git a/OpenKh.Tools.ModsManager.Avalonia/ViewModels/ObservableObject.cs b/OpenKh.Tools.ModsManager.Avalonia/ViewModels/ObservableObject.cs
new file mode 100644
index 000000000..372e54a2c
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Avalonia/ViewModels/ObservableObject.cs
@@ -0,0 +1,22 @@
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
+
+namespace OpenKh.Tools.ModsManager.Avalonia.ViewModels;
+
+public abstract class ObservableObject : INotifyPropertyChanged
+{
+    public event PropertyChangedEventHandler? PropertyChanged;
+
+    protected bool SetProperty<T>(ref T field, T value, [CallerMemberName] string? propertyName = null)
+    {
+        if (EqualityComparer<T>.Default.Equals(field, value))
+            return false;
+
+        field = value;
+        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        return true;
+    }
+
+    protected void OnPropertyChanged([CallerMemberName] string? propertyName = null) =>
+        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+}
diff --git a/OpenKh.Tools.ModsManager.Avalonia/ViewModels/RelayCommand.cs b/OpenKh.Tools.ModsManager.Avalonia/ViewModels/RelayCommand.cs
new file mode 100644
index 000000000..b2e9fd1bf
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Avalonia/ViewModels/RelayCommand.cs
@@ -0,0 +1,12 @@
+using System.Windows.Input;
+
+namespace OpenKh.Tools.ModsManager.Avalonia.ViewModels;
+
+public sealed class RelayCommand(Action execute, Func<bool>? canExecute = null) : ICommand
+{
+    public event EventHandler? CanExecuteChanged;
+
+    public bool CanExecute(object? parameter) => canExecute?.Invoke() ?? true;
+    public void Execute(object? parameter) => execute();
+    public void NotifyCanExecuteChanged() => CanExecuteChanged?.Invoke(this, EventArgs.Empty);
+}
diff --git a/OpenKh.Tools.ModsManager.Avalonia/ViewModels/SetupWindowViewModel.cs b/OpenKh.Tools.ModsManager.Avalonia/ViewModels/SetupWindowViewModel.cs
new file mode 100644
index 000000000..f0336f424
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Avalonia/ViewModels/SetupWindowViewModel.cs
@@ -0,0 +1,164 @@
+using OpenKh.Tools.ModsManager.Core;
+
+namespace OpenKh.Tools.ModsManager.Avalonia.ViewModels;
+
+public sealed class SetupWindowViewModel : ObservableObject
+{
+    private readonly ModManagerConfigurationService _service;
+    private int _gameEdition;
+    private int _pcVersionIndex;
+    private string? _pcReleaseLocation;
+    private string? _pcReleaseLocationKh3D;
+
+    public SetupWindowViewModel(ModManagerConfigurationService service)
+    {
+        _service = service;
+        var configuration = service.Current;
+        GameEdition = configuration.GameEdition == 1 ? 1 : 0;
+        ModCollectionPath = configuration.ModCollectionPath;
+        ModCollectionsPath = configuration.ModCollectionsPath;
+        GameModPath = configuration.GameModPath;
+        GameDataPath = configuration.GameDataPath;
+        PcReleaseLocation = configuration.PcReleaseLocation;
+        PcReleaseLocationKh3D = configuration.PcReleaseLocationKh3D;
+        PcVersionIndex = configuration.PcVersion.ToLowerInvariant() switch
+        {
+            "egs" => 0,
+            "steam" => 1,
+            "other" => 2,
+            _ => 1
+        };
+        LanguageIndex = configuration.PcReleaseLanguage.Equals("jp", StringComparison.OrdinalIgnoreCase) ? 1 : 0;
+        RegionId = Math.Clamp(configuration.RegionId, 0, 8);
+        SteamApiTrick1525 = configuration.SteamApiTrick1525;
+        SteamApiTrick28 = configuration.SteamApiTrick28;
+        Pcsx2Location = configuration.Pcsx2Location;
+        IsoLocationKh2 = configuration.IsoLocationKh2;
+        IsoLocationKh1 = configuration.IsoLocationKh1;
+        IsoLocationRecom = configuration.IsoLocationRecom;
+        AutoUpdateMods = configuration.AutoUpdateMods;
+        SkipRemastered = configuration.SkipRemastered;
+        EnableCache = configuration.EnableCache;
+        ShowConsole = configuration.ShowConsole;
+        DebugLog = configuration.DebugLog;
+        var gamesToExtract = configuration.GamesToExtract.ToHashSet(StringComparer.OrdinalIgnoreCase);
+        ExtractKh1 = gamesToExtract.Contains("kh1");
+        ExtractKh2 = gamesToExtract.Contains("kh2");
+        ExtractBbs = gamesToExtract.Contains("bbs");
+        ExtractRecom = gamesToExtract.Contains("Recom");
+        ExtractKh3D = gamesToExtract.Contains("kh3d");
+    }
+
+    public int GameEdition
+    {
+        get => _gameEdition;
+        set
+        {
+            if (!SetProperty(ref _gameEdition, value))
+                return;
+            OnPropertyChanged(nameof(IsPcMode));
+            OnPropertyChanged(nameof(IsPcsx2Mode));
+        }
+    }
+    public bool IsPcMode => GameEdition == 0;
+    public bool IsPcsx2Mode => GameEdition == 1;
+    public string? ModCollectionPath { get; set; }
+    public string? ModCollectionsPath { get; set; }
+    public string? GameModPath { get; set; }
+    public string? GameDataPath { get; set; }
+    public string? PcReleaseLocation
+    {
+        get => _pcReleaseLocation;
+        set => SetProperty(ref _pcReleaseLocation, value);
+    }
+
+    public string? PcReleaseLocationKh3D
+    {
+        get => _pcReleaseLocationKh3D;
+        set => SetProperty(ref _pcReleaseLocationKh3D, value);
+    }
+
+    public int PcVersionIndex
+    {
+        get => _pcVersionIndex;
+        set
+        {
+            if (SetProperty(ref _pcVersionIndex, value))
+                OnPropertyChanged(nameof(IsSteamPlatform));
+        }
+    }
+
+    public bool IsSteamPlatform => PcVersionIndex == 1;
+    public int LanguageIndex { get; set; }
+    public int RegionId { get; set; }
+    public bool SteamApiTrick1525 { get; set; }
+    public bool SteamApiTrick28 { get; set; }
+    public string? Pcsx2Location { get; set; }
+    public string? IsoLocationKh2 { get; set; }
+    public string? IsoLocationKh1 { get; set; }
+    public string? IsoLocationRecom { get; set; }
+    public bool AutoUpdateMods { get; set; }
+    public bool SkipRemastered { get; set; }
+    public bool EnableCache { get; set; }
+    public bool ShowConsole { get; set; }
+    public bool DebugLog { get; set; }
+    public bool ExtractKh1 { get; set; }
+    public bool ExtractKh2 { get; set; }
+    public bool ExtractBbs { get; set; }
+    public bool ExtractRecom { get; set; }
+    public bool ExtractKh3D { get; set; }
+
+    public void Save()
+    {
+        var configuration = _service.Current;
+        configuration.GameEdition = IsPcsx2Mode ? 1 : 2;
+        configuration.ModCollectionPath = EmptyToNull(ModCollectionPath);
+        configuration.ModCollectionsPath = EmptyToNull(ModCollectionsPath);
+        configuration.GameModPath = EmptyToNull(GameModPath);
+        configuration.GameDataPath = EmptyToNull(GameDataPath);
+        configuration.PcReleaseLocation = EmptyToNull(PcReleaseLocation);
+        configuration.PcReleaseLocationKh3D = EmptyToNull(PcReleaseLocationKh3D);
+        configuration.PcVersion = PcVersionIndex switch
+        {
+            1 => "Steam",
+            2 => "Other",
+            _ => "EGS"
+        };
+        configuration.PcReleaseLanguage = LanguageIndex == 1 ? "jp" : "en";
+        configuration.RegionId = RegionId;
+        configuration.SteamApiTrick1525 = SteamApiTrick1525;
+        configuration.SteamApiTrick28 = SteamApiTrick28;
+        configuration.Pcsx2Location = EmptyToNull(Pcsx2Location);
+        configuration.IsoLocationKh2 = EmptyToNull(IsoLocationKh2);
+        configuration.IsoLocationKh1 = EmptyToNull(IsoLocationKh1);
+        configuration.IsoLocationRecom = EmptyToNull(IsoLocationRecom);
+        configuration.AutoUpdateMods = AutoUpdateMods;
+        configuration.SkipRemastered = SkipRemastered;
+        configuration.EnableCache = EnableCache;
+        configuration.ShowConsole = ShowConsole;
+        configuration.DebugLog = DebugLog;
+        configuration.GamesToExtract = GetGamesToExtract().ToList();
+        _service.Save();
+        _service.EnsureDirectories();
+    }
+
+    public IReadOnlyCollection<GameInfo> GetSelectedGames() =>
+        GetGamesToExtract().Select(GameInfo.FromId).ToArray();
+
+    private IEnumerable<string> GetGamesToExtract()
+    {
+        if (ExtractKh1)
+            yield return "kh1";
+        if (ExtractKh2)
+            yield return "kh2";
+        if (ExtractBbs && IsPcMode)
+            yield return "bbs";
+        if (ExtractRecom)
+            yield return "Recom";
+        if (ExtractKh3D && IsPcMode)
+            yield return "kh3d";
+    }
+
+    private static string? EmptyToNull(string? value) =>
+        string.IsNullOrWhiteSpace(value) ? null : value.Trim();
+}
diff --git a/OpenKh.Tools.ModsManager.Avalonia/Views/CollectionSettingsWindow.axaml b/OpenKh.Tools.ModsManager.Avalonia/Views/CollectionSettingsWindow.axaml
new file mode 100644
index 000000000..3d82acd5a
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Avalonia/Views/CollectionSettingsWindow.axaml
@@ -0,0 +1,30 @@
+<views:EmbeddedDialogControl xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:views="using:OpenKh.Tools.ModsManager.Avalonia.Views"
+        xmlns:vm="using:OpenKh.Tools.ModsManager.Avalonia.ViewModels"
+        x:Class="OpenKh.Tools.ModsManager.Avalonia.Views.CollectionSettingsWindow"
+        XYFocus.NavigationModes="Enabled">
+  <Grid Margin="28" RowDefinitions="Auto,18,*,18,Auto">
+    <StackPanel Spacing="5">
+      <TextBlock x:Name="CollectionTitleText" FontSize="27" FontWeight="Bold" TextWrapping="Wrap" />
+      <TextBlock Text="Choose the optional parts to include when this collection is built."
+                 Foreground="#AAB9CF" TextWrapping="Wrap" />
+    </StackPanel>
+    <Border Grid.Row="2" Classes="settings-card">
+      <ListBox x:Name="OptionsListBox" BorderThickness="0" Background="Transparent">
+        <ListBox.ItemTemplate>
+          <DataTemplate x:DataType="vm:CollectionOptionViewModel">
+            <Grid Margin="5" ColumnDefinitions="*,Auto" MinHeight="48">
+              <TextBlock Text="{Binding Name}" TextWrapping="Wrap" VerticalAlignment="Center" />
+              <ToggleSwitch Grid.Column="1" IsChecked="{Binding IsEnabled}" OnContent="On" OffContent="Off" />
+            </Grid>
+          </DataTemplate>
+        </ListBox.ItemTemplate>
+      </ListBox>
+    </Border>
+    <StackPanel Grid.Row="4" Orientation="Horizontal" Spacing="12" HorizontalAlignment="Right">
+      <Button x:Name="CancelButton" Content="Cancel" MinWidth="120" Click="Cancel_OnClick" />
+      <Button x:Name="SaveButton" Classes="primary" Content="Save Collection" MinWidth="160" Click="Save_OnClick" />
+    </StackPanel>
+  </Grid>
+</views:EmbeddedDialogControl>
diff --git a/OpenKh.Tools.ModsManager.Avalonia/Views/CollectionSettingsWindow.axaml.cs b/OpenKh.Tools.ModsManager.Avalonia/Views/CollectionSettingsWindow.axaml.cs
new file mode 100644
index 000000000..f2a1fe927
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Avalonia/Views/CollectionSettingsWindow.axaml.cs
@@ -0,0 +1,68 @@
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+using OpenKh.Tools.ModsManager.Avalonia.ViewModels;
+using OpenKh.Tools.ModsManager.Core;
+using OpenKh.Tools.ModsManager.Avalonia.Services;
+
+namespace OpenKh.Tools.ModsManager.Avalonia.Views;
+
+public sealed partial class CollectionSettingsWindow : EmbeddedDialogControl
+{
+    private readonly CollectionSettingsService? _settings;
+    private readonly ModEntry? _mod;
+    private readonly GameInfo? _game;
+
+    public CollectionSettingsWindow()
+    {
+        InitializeComponent();
+    }
+
+    public CollectionSettingsWindow(CollectionSettingsService settings, ModEntry mod, GameInfo game)
+        : this()
+    {
+        _settings = settings;
+        _mod = mod;
+        _game = game;
+        CollectionTitleText.Text = mod.Name;
+        OptionsListBox.ItemsSource = settings.GetOptions(mod, game)
+            .Select(option => new CollectionOptionViewModel(option))
+            .ToArray();
+    }
+
+    private void Save_OnClick(object? sender, RoutedEventArgs eventArgs)
+    {
+        if (_settings is not null && _mod is not null && _game is not null)
+        {
+            var options = (OptionsListBox.ItemsSource as IEnumerable<CollectionOptionViewModel>)
+                ?.Select(option => option.ToModel()) ?? [];
+            _settings.SaveOptions(_mod, _game, options);
+        }
+        Close(true);
+    }
+
+    private void Cancel_OnClick(object? sender, RoutedEventArgs eventArgs) => Close(false);
+
+    public void HandleControllerAction(ControllerAction action)
+    {
+        if (ControllerWindowNavigator.TryMoveFocus(this, action))
+            return;
+        if (action is ControllerAction.PreviousControl or ControllerAction.PreviousItem or ControllerAction.PreviousGame)
+            ControllerWindowNavigator.MoveFocus(this, -1);
+        else if (action is ControllerAction.NextControl or ControllerAction.NextItem or ControllerAction.NextGame)
+            ControllerWindowNavigator.MoveFocus(this, 1);
+        else if (action == ControllerAction.Cancel)
+            Close(false);
+        else if (action == ControllerAction.Confirm)
+        {
+            var focused = FocusManager?.GetFocusedElement();
+            if (focused == SaveButton)
+                Save_OnClick(SaveButton, new RoutedEventArgs());
+            else if (focused == CancelButton)
+                Close(false);
+            else if (focused is ToggleSwitch toggleSwitch)
+                toggleSwitch.IsChecked = toggleSwitch.IsChecked != true;
+            else
+                ControllerWindowNavigator.MoveFocus(this, 1);
+        }
+    }
+}
diff --git a/OpenKh.Tools.ModsManager.Avalonia/Views/ConfirmationWindow.axaml b/OpenKh.Tools.ModsManager.Avalonia/Views/ConfirmationWindow.axaml
new file mode 100644
index 000000000..301ec1239
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Avalonia/Views/ConfirmationWindow.axaml
@@ -0,0 +1,14 @@
+<views:EmbeddedDialogControl xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:views="using:OpenKh.Tools.ModsManager.Avalonia.Views"
+        x:Class="OpenKh.Tools.ModsManager.Avalonia.Views.ConfirmationWindow"
+        XYFocus.NavigationModes="Enabled">
+  <Grid Margin="28" RowDefinitions="Auto,14,*,20,Auto">
+    <TextBlock x:Name="TitleText" FontSize="24" FontWeight="Bold" TextWrapping="Wrap" />
+    <TextBlock x:Name="MessageText" Grid.Row="2" Foreground="#C4D0E1" TextWrapping="Wrap" />
+    <StackPanel Grid.Row="4" Orientation="Horizontal" Spacing="12" HorizontalAlignment="Right">
+      <Button x:Name="CancelButton" Content="Cancel" MinWidth="110" Click="Cancel_OnClick" />
+      <Button x:Name="ConfirmButton" Classes="primary" MinWidth="130" Click="Confirm_OnClick" />
+    </StackPanel>
+  </Grid>
+</views:EmbeddedDialogControl>
diff --git a/OpenKh.Tools.ModsManager.Avalonia/Views/ConfirmationWindow.axaml.cs b/OpenKh.Tools.ModsManager.Avalonia/Views/ConfirmationWindow.axaml.cs
new file mode 100644
index 000000000..b3c0512bd
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Avalonia/Views/ConfirmationWindow.axaml.cs
@@ -0,0 +1,39 @@
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+using OpenKh.Tools.ModsManager.Avalonia.Services;
+
+namespace OpenKh.Tools.ModsManager.Avalonia.Views;
+
+public sealed partial class ConfirmationWindow : EmbeddedDialogControl
+{
+    public ConfirmationWindow()
+        : this("Confirm action", string.Empty, "Confirm")
+    {
+    }
+
+    public ConfirmationWindow(string title, string message, string confirmText)
+    {
+        InitializeComponent();
+        TitleText.Text = title;
+        MessageText.Text = message;
+        ConfirmButton.Content = confirmText;
+        Opened += (_, _) => ConfirmButton.Focus();
+    }
+
+    private void Confirm_OnClick(object? sender, RoutedEventArgs eventArgs) => Close(true);
+    private void Cancel_OnClick(object? sender, RoutedEventArgs eventArgs) => Close(false);
+
+    public void HandleControllerAction(ControllerAction action)
+    {
+        if (ControllerWindowNavigator.TryMoveFocus(this, action))
+            return;
+        if (action is ControllerAction.PreviousControl or ControllerAction.PreviousItem or ControllerAction.PreviousGame)
+            ControllerWindowNavigator.MoveFocus(this, -1);
+        else if (action is ControllerAction.NextControl or ControllerAction.NextItem or ControllerAction.NextGame)
+            ControllerWindowNavigator.MoveFocus(this, 1);
+        else if (action == ControllerAction.Cancel)
+            Close(false);
+        else if (action == ControllerAction.Confirm)
+            Close(FocusManager?.GetFocusedElement() == ConfirmButton);
+    }
+}
diff --git a/OpenKh.Tools.ModsManager.Avalonia/Views/ControllerKeyboardWindow.axaml b/OpenKh.Tools.ModsManager.Avalonia/Views/ControllerKeyboardWindow.axaml
new file mode 100644
index 000000000..2f071ff16
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Avalonia/Views/ControllerKeyboardWindow.axaml
@@ -0,0 +1,25 @@
+<views:EmbeddedDialogControl xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:views="using:OpenKh.Tools.ModsManager.Avalonia.Views"
+        x:Class="OpenKh.Tools.ModsManager.Avalonia.Views.ControllerKeyboardWindow"
+        XYFocus.NavigationModes="Enabled">
+  <Grid Margin="28" RowDefinitions="Auto,14,Auto,18,*,14,Auto">
+    <StackPanel Spacing="5">
+      <TextBlock Text="Enter Text" FontSize="27" FontWeight="Bold" />
+      <TextBlock Text="Use the controller to enter text in the selected field."
+                 Foreground="#AAB9CF" TextWrapping="Wrap" />
+    </StackPanel>
+
+    <Border Grid.Row="2" Classes="settings-card" Padding="16">
+      <TextBlock x:Name="InputPreview" FontSize="18" TextWrapping="NoWrap"
+                 TextTrimming="CharacterEllipsis" />
+    </Border>
+
+    <StackPanel x:Name="KeyboardRows" Grid.Row="4" Spacing="6"
+                HorizontalAlignment="Center" VerticalAlignment="Center" />
+
+    <TextBlock Grid.Row="6"
+               Text="D-pad or left stick: move   A or Cross: type   X or Square: backspace   Y or Triangle: shift   B or Circle: close"
+               Foreground="#71839E" FontSize="11" HorizontalAlignment="Center" />
+  </Grid>
+</views:EmbeddedDialogControl>
diff --git a/OpenKh.Tools.ModsManager.Avalonia/Views/ControllerKeyboardWindow.axaml.cs b/OpenKh.Tools.ModsManager.Avalonia/Views/ControllerKeyboardWindow.axaml.cs
new file mode 100644
index 000000000..5b7864cc1
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Avalonia/Views/ControllerKeyboardWindow.axaml.cs
@@ -0,0 +1,212 @@
+using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.Interactivity;
+using Avalonia.Layout;
+using OpenKh.Tools.ModsManager.Avalonia.Services;
+
+namespace OpenKh.Tools.ModsManager.Avalonia.Views;
+
+public sealed partial class ControllerKeyboardWindow : EmbeddedDialogControl
+{
+    private static readonly string[][] CharacterRows =
+    [
+        ["1", "2", "3", "4", "5", "6", "7", "8", "9", "0"],
+        ["q", "w", "e", "r", "t", "y", "u", "i", "o", "p"],
+        ["a", "s", "d", "f", "g", "h", "j", "k", "l"],
+        ["z", "x", "c", "v", "b", "n", "m"],
+        ["-", "_", ".", "/", "\\", ":", "@"]
+    ];
+
+    private readonly TextBox _target;
+    private readonly List<Button> _letterButtons = [];
+    private Button? _firstButton;
+    private bool _shift;
+
+    public ControllerKeyboardWindow()
+        : this(new TextBox())
+    {
+    }
+
+    public ControllerKeyboardWindow(TextBox target)
+    {
+        _target = target;
+        InitializeComponent();
+        BuildKeyboard();
+        RefreshPreview();
+        Opened += (_, _) => _firstButton?.Focus(NavigationMethod.Directional);
+    }
+
+    public void HandleControllerAction(ControllerAction action)
+    {
+        if (action == ControllerAction.Secondary)
+        {
+            Backspace();
+            return;
+        }
+
+        if (action == ControllerAction.MoveTop)
+        {
+            ToggleShift();
+            return;
+        }
+
+        if (ControllerWindowNavigator.TryMoveFocus(this, action))
+            return;
+
+        if (action is ControllerAction.PreviousControl or ControllerAction.PreviousItem or ControllerAction.PreviousGame)
+            ControllerWindowNavigator.MoveFocus(this, -1);
+        else if (action is ControllerAction.NextControl or ControllerAction.NextItem or ControllerAction.NextGame)
+            ControllerWindowNavigator.MoveFocus(this, 1);
+        else if (action == ControllerAction.Cancel)
+            Close();
+        else if (action == ControllerAction.Confirm && FocusManager?.GetFocusedElement() is Button button)
+            Activate(button);
+    }
+
+    private void BuildKeyboard()
+    {
+        foreach (var row in CharacterRows)
+            KeyboardRows.Children.Add(CreateCharacterRow(row));
+
+        KeyboardRows.Children.Add(CreateActionRow());
+    }
+
+    private Control CreateCharacterRow(IEnumerable<string> characters)
+    {
+        var panel = new StackPanel
+        {
+            Orientation = Orientation.Horizontal,
+            Spacing = 6,
+            HorizontalAlignment = HorizontalAlignment.Center
+        };
+
+        foreach (var character in characters)
+        {
+            var button = CreateButton(character, $"Character:{character}", 56);
+            if (char.IsLetter(character[0]))
+                _letterButtons.Add(button);
+            _firstButton ??= button;
+            panel.Children.Add(button);
+        }
+
+        return panel;
+    }
+
+    private Control CreateActionRow()
+    {
+        var panel = new StackPanel
+        {
+            Orientation = Orientation.Horizontal,
+            Spacing = 6,
+            HorizontalAlignment = HorizontalAlignment.Center
+        };
+
+        panel.Children.Add(CreateButton("Shift", "Shift", 90, "ShiftButton"));
+        panel.Children.Add(CreateButton("Space", "Space", 190, "SpaceButton"));
+        panel.Children.Add(CreateButton("Backspace", "Backspace", 120, "BackspaceButton"));
+        panel.Children.Add(CreateButton("Clear", "Clear", 90, "ClearButton"));
+        var done = CreateButton("Done", "Done", 110, "DoneButton");
+        done.Classes.Add("primary");
+        panel.Children.Add(done);
+        return panel;
+    }
+
+    private Button CreateButton(string content, string action, double minWidth, string? name = null)
+    {
+        var button = new Button
+        {
+            Content = content,
+            Tag = action,
+            MinWidth = minWidth,
+            Name = name
+        };
+        button.Click += Key_OnClick;
+        return button;
+    }
+
+    private void Key_OnClick(object? sender, RoutedEventArgs eventArgs)
+    {
+        if (sender is Button button)
+            Activate(button);
+    }
+
+    private void Activate(Button button)
+    {
+        if (button.Tag is not string action)
+            return;
+
+        if (action.StartsWith("Character:", StringComparison.Ordinal))
+        {
+            var value = action["Character:".Length..];
+            Insert(_shift ? value.ToUpperInvariant() : value);
+            return;
+        }
+
+        switch (action)
+        {
+            case "Shift":
+                ToggleShift();
+                break;
+            case "Space":
+                Insert(" ");
+                break;
+            case "Backspace":
+                Backspace();
+                break;
+            case "Clear":
+                _target.Text = string.Empty;
+                _target.CaretIndex = 0;
+                RefreshPreview();
+                break;
+            case "Done":
+                Close(true);
+                break;
+        }
+    }
+
+    private void Insert(string value)
+    {
+        var current = _target.Text ?? string.Empty;
+        var start = Math.Clamp(Math.Min(_target.SelectionStart, _target.SelectionEnd), 0, current.Length);
+        var end = Math.Clamp(Math.Max(_target.SelectionStart, _target.SelectionEnd), start, current.Length);
+        _target.Text = current[..start] + value + current[end..];
+        _target.CaretIndex = start + value.Length;
+        _target.SelectionStart = _target.CaretIndex;
+        _target.SelectionEnd = _target.CaretIndex;
+        RefreshPreview();
+    }
+
+    private void Backspace()
+    {
+        var current = _target.Text ?? string.Empty;
+        var start = Math.Clamp(Math.Min(_target.SelectionStart, _target.SelectionEnd), 0, current.Length);
+        var end = Math.Clamp(Math.Max(_target.SelectionStart, _target.SelectionEnd), start, current.Length);
+        if (start == end && start > 0)
+            start--;
+        if (start == end)
+            return;
+
+        _target.Text = current.Remove(start, end - start);
+        _target.CaretIndex = start;
+        _target.SelectionStart = start;
+        _target.SelectionEnd = start;
+        RefreshPreview();
+    }
+
+    private void ToggleShift()
+    {
+        _shift = !_shift;
+        foreach (var button in _letterButtons)
+        {
+            if (button.Tag is not string action)
+                continue;
+            var value = action["Character:".Length..];
+            button.Content = _shift ? value.ToUpperInvariant() : value;
+        }
+    }
+
+    private void RefreshPreview()
+    {
+        InputPreview.Text = string.IsNullOrEmpty(_target.Text) ? " " : _target.Text;
+    }
+}
diff --git a/OpenKh.Tools.ModsManager.Avalonia/Views/CreatorWindow.axaml b/OpenKh.Tools.ModsManager.Avalonia/Views/CreatorWindow.axaml
new file mode 100644
index 000000000..188ac27f0
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Avalonia/Views/CreatorWindow.axaml
@@ -0,0 +1,72 @@
+<views:EmbeddedDialogControl xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:views="using:OpenKh.Tools.ModsManager.Avalonia.Views"
+        x:Class="OpenKh.Tools.ModsManager.Avalonia.Views.CreatorWindow"
+        XYFocus.NavigationModes="Enabled">
+  <Grid Margin="28" RowDefinitions="Auto,18,*,18,Auto">
+    <StackPanel Spacing="5">
+      <TextBlock Text="Mod Creator" FontSize="27" FontWeight="Bold" />
+      <TextBlock Text="Create the initial mod.yml file for a new OpenKH mod."
+                 Foreground="#AAB9CF" TextWrapping="Wrap" />
+    </StackPanel>
+    <ScrollViewer x:Name="CreatorScrollViewer" Grid.Row="2" HorizontalScrollBarVisibility="Disabled"
+                  HorizontalContentAlignment="Stretch">
+      <Border Classes="settings-card" Width="{Binding Bounds.Width, ElementName=CreatorScrollViewer}">
+        <StackPanel Spacing="12">
+          <TextBlock Text="Preferences" FontSize="18" FontWeight="SemiBold" />
+          <TextBlock Text="Save and restore the mod folder, GameData folder, and diff tool."
+                     Foreground="#91A2BA" FontSize="11" TextWrapping="Wrap" />
+          <Grid ColumnDefinitions="*,12,Auto,8,Auto">
+            <ComboBox x:Name="PreferenceComboBox" IsEditable="True" />
+            <Button x:Name="LoadPreferenceButton" Grid.Column="2" Content="Load" Click="LoadPreference_OnClick" />
+            <Button x:Name="SavePreferenceButton" Grid.Column="4" Content="Save" Click="SavePreference_OnClick" />
+          </Grid>
+          <Border Height="1" Background="#22324C" Margin="0,6" />
+          <TextBlock Text="mod.yml" FontSize="18" FontWeight="SemiBold" />
+          <TextBlock Text="Game" FontWeight="SemiBold" />
+          <ComboBox x:Name="GameComboBox" ItemsSource="{Binding}" SelectedIndex="0">
+            <ComboBox.ItemTemplate>
+              <DataTemplate><TextBlock Text="{Binding DisplayName}" /></DataTemplate>
+            </ComboBox.ItemTemplate>
+          </ComboBox>
+          <TextBlock Text="Title" FontWeight="SemiBold" />
+          <TextBox x:Name="TitleTextBox" PlaceholderText="My OpenKH mod" />
+          <TextBlock Text="Author" FontWeight="SemiBold" />
+          <TextBox x:Name="AuthorTextBox" PlaceholderText="Author name" />
+          <TextBlock Text="Description" FontWeight="SemiBold" />
+          <TextBox x:Name="DescriptionTextBox" Height="110" AcceptsReturn="True"
+                   TextWrapping="Wrap" VerticalContentAlignment="Top" Padding="12" />
+          <TextBlock Text="Mod Folder Containing mod.yml" FontWeight="SemiBold" />
+          <Grid ColumnDefinitions="*,12,130">
+            <TextBox x:Name="DirectoryTextBox" PlaceholderText="Choose an empty mod folder" />
+            <Button x:Name="BrowseButton" Grid.Column="2" Content="Browse" Click="Browse_OnClick" />
+          </Grid>
+          <TextBlock Text="Diff Tool" FontSize="18" FontWeight="SemiBold" Margin="0,6,0,0" />
+          <TextBlock Text="Optional executable used to compare the current mod.yml with a generated preview."
+                     Foreground="#91A2BA" FontSize="11" TextWrapping="Wrap" />
+          <Grid ColumnDefinitions="*,12,130">
+            <TextBox x:Name="DiffToolTextBox" PlaceholderText="Leave empty to open the generated preview normally" />
+            <Button x:Name="BrowseDiffToolButton" Grid.Column="2" Content="Browse" Click="BrowseDiffTool_OnClick" />
+          </Grid>
+          <TextBlock Text="Target Files Appender" FontSize="18" FontWeight="SemiBold" Margin="0,6,0,0" />
+          <TextBlock Text="Search extracted GameData, copy selected source files into the mod, and append copy assets to mod.yml."
+                     Foreground="#91A2BA" FontSize="11" TextWrapping="Wrap" />
+          <Grid ColumnDefinitions="*,12,130">
+            <TextBox x:Name="GameDataTextBox" PlaceholderText="Extracted GameData folder" />
+            <Button x:Name="BrowseGameDataButton" Grid.Column="2" Content="Browse" Click="BrowseGameData_OnClick" />
+          </Grid>
+          <Grid ColumnDefinitions="*,12,180">
+            <TextBox x:Name="TargetSearchTextBox" PlaceholderText="Search target files by path" />
+            <Button x:Name="AppendFilesButton" Grid.Column="2" Content="Search and Append" Click="AppendFiles_OnClick" />
+          </Grid>
+          <TextBlock x:Name="StatusText" Foreground="#91A2BA" TextWrapping="Wrap" />
+        </StackPanel>
+      </Border>
+    </ScrollViewer>
+    <StackPanel Grid.Row="4" Orientation="Horizontal" Spacing="12" HorizontalAlignment="Right">
+      <Button x:Name="CloseButton" Content="Close" MinWidth="120" Click="Close_OnClick" />
+      <Button x:Name="PreviewButton" Content="Preview Changes" MinWidth="150" Click="Preview_OnClick" />
+      <Button x:Name="CreateButton" Classes="primary" Content="Generate or Update" MinWidth="170" Click="Create_OnClick" />
+    </StackPanel>
+  </Grid>
+</views:EmbeddedDialogControl>
diff --git a/OpenKh.Tools.ModsManager.Avalonia/Views/CreatorWindow.axaml.cs b/OpenKh.Tools.ModsManager.Avalonia/Views/CreatorWindow.axaml.cs
new file mode 100644
index 000000000..e3458b434
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Avalonia/Views/CreatorWindow.axaml.cs
@@ -0,0 +1,251 @@
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+using Avalonia.Platform.Storage;
+using OpenKh.Tools.ModsManager.Avalonia.Services;
+using OpenKh.Tools.ModsManager.Core;
+using System.Diagnostics;
+
+namespace OpenKh.Tools.ModsManager.Avalonia.Views;
+
+public sealed partial class CreatorWindow : EmbeddedDialogControl
+{
+    private readonly ModCreatorService? _creator;
+    private readonly IControllerInputService? _controller;
+
+    public CreatorWindow()
+    {
+        InitializeComponent();
+        GameComboBox.DataContext = GameInfo.SupportedGames;
+    }
+
+    public CreatorWindow(ModCreatorService creator, IControllerInputService controller) : this()
+    {
+        _creator = creator;
+        _controller = controller;
+        PreferenceComboBox.ItemsSource = creator.GetPreferences().Select(preference => preference.Label).ToArray();
+        GameDataTextBox.Text = creator.DefaultGameDataPath;
+    }
+
+    private async void Browse_OnClick(object? sender, RoutedEventArgs eventArgs)
+    {
+        var folders = await StorageProvider.OpenFolderPickerAsync(new FolderPickerOpenOptions
+        {
+            Title = "Choose a mod folder",
+            AllowMultiple = false
+        });
+        if (folders.Count > 0 && folders[0].TryGetLocalPath() is { } path)
+        {
+            DirectoryTextBox.Text = path;
+            LoadExistingMetadata(path);
+        }
+    }
+
+    private async void BrowseGameData_OnClick(object? sender, RoutedEventArgs eventArgs)
+    {
+        var folders = await StorageProvider.OpenFolderPickerAsync(new FolderPickerOpenOptions
+        {
+            Title = "Choose the extracted GameData folder",
+            AllowMultiple = false
+        });
+        if (folders.Count > 0 && folders[0].TryGetLocalPath() is { } path)
+            GameDataTextBox.Text = path;
+    }
+
+    private async void BrowseDiffTool_OnClick(object? sender, RoutedEventArgs eventArgs)
+    {
+        var files = await StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions
+        {
+            Title = "Choose a diff tool executable",
+            AllowMultiple = false
+        });
+        if (files.Count > 0 && files[0].TryGetLocalPath() is { } path)
+            DiffToolTextBox.Text = path;
+    }
+
+    private void Create_OnClick(object? sender, RoutedEventArgs eventArgs)
+    {
+        if (_creator is null || GameComboBox.SelectedItem is not GameInfo game)
+            return;
+        try
+        {
+            var path = _creator.Create(
+                DirectoryTextBox.Text ?? "",
+                TitleTextBox.Text ?? "",
+                AuthorTextBox.Text ?? "",
+                DescriptionTextBox.Text ?? "",
+                game);
+            StatusText.Text = $"Created {path}";
+            StatusText.Foreground = global::Avalonia.Media.Brush.Parse("#62D6A7");
+        }
+        catch (Exception exception)
+        {
+            StatusText.Text = exception.Message;
+            StatusText.Foreground = global::Avalonia.Media.Brush.Parse("#FF8B8B");
+        }
+    }
+
+    private void Preview_OnClick(object? sender, RoutedEventArgs eventArgs)
+    {
+        if (_creator is null || GameComboBox.SelectedItem is not GameInfo game)
+            return;
+        try
+        {
+            var previewPath = _creator.CreatePreview(
+                DirectoryTextBox.Text ?? string.Empty,
+                TitleTextBox.Text ?? string.Empty,
+                AuthorTextBox.Text ?? string.Empty,
+                DescriptionTextBox.Text ?? string.Empty,
+                game);
+            var diffTool = DiffToolTextBox.Text?.Trim();
+            if (!string.IsNullOrWhiteSpace(diffTool) && File.Exists(diffTool))
+            {
+                var currentPath = Path.Combine(DirectoryTextBox.Text!, "mod.yml");
+                if (!File.Exists(currentPath))
+                {
+                    currentPath = Path.Combine(Path.GetTempPath(), $"openkh-empty-mod-{Guid.NewGuid():N}.yml");
+                    File.WriteAllText(currentPath, string.Empty);
+                }
+                var startInfo = new ProcessStartInfo(diffTool) { UseShellExecute = false };
+                startInfo.ArgumentList.Add(currentPath);
+                startInfo.ArgumentList.Add(previewPath);
+                Process.Start(startInfo);
+            }
+            else
+            {
+                Process.Start(new ProcessStartInfo(previewPath) { UseShellExecute = true });
+            }
+            SetStatus("The generated preview was opened. Use Generate or update to apply it.", true);
+        }
+        catch (Exception exception)
+        {
+            SetStatus(exception.Message, false);
+        }
+    }
+
+    private async void AppendFiles_OnClick(object? sender, RoutedEventArgs eventArgs)
+    {
+        if (_creator is null)
+            return;
+        var window = new TargetFilesWindow(
+            _creator,
+            DirectoryTextBox.Text ?? string.Empty,
+            GameDataTextBox.Text ?? string.Empty,
+            TargetSearchTextBox.Text ?? string.Empty);
+        if (TopLevel.GetTopLevel(this) is not MainWindow owner)
+            return;
+        using var capture = _controller?.Capture(
+            ControllerWindowNavigator.WithScrolling(window, window.HandleControllerAction));
+        var result = await owner.ShowPageAsync<bool>(window);
+        if (result)
+            SetStatus("Selected target files were copied and appended to mod.yml.", true);
+    }
+
+    private void SavePreference_OnClick(object? sender, RoutedEventArgs eventArgs)
+    {
+        if (_creator is null)
+            return;
+        try
+        {
+            var label = PreferenceComboBox.Text ?? string.Empty;
+            _creator.SavePreference(new CreatorPreference
+            {
+                Label = label,
+                ModDirectory = DirectoryTextBox.Text ?? string.Empty,
+                GameDataPath = GameDataTextBox.Text ?? string.Empty,
+                DiffToolPath = DiffToolTextBox.Text ?? string.Empty
+            });
+            PreferenceComboBox.ItemsSource = _creator.GetPreferences().Select(preference => preference.Label).ToArray();
+            PreferenceComboBox.Text = label;
+            SetStatus($"Preference '{label}' was saved.", true);
+        }
+        catch (Exception exception)
+        {
+            SetStatus(exception.Message, false);
+        }
+    }
+
+    private void LoadPreference_OnClick(object? sender, RoutedEventArgs eventArgs)
+    {
+        if (_creator is null)
+            return;
+        var label = PreferenceComboBox.Text ?? string.Empty;
+        var preference = _creator.GetPreferences().LastOrDefault(item =>
+            item.Label.Equals(label, StringComparison.OrdinalIgnoreCase));
+        if (preference is null)
+        {
+            SetStatus("The selected preference was not found.", false);
+            return;
+        }
+        DirectoryTextBox.Text = preference.ModDirectory;
+        GameDataTextBox.Text = preference.GameDataPath;
+        DiffToolTextBox.Text = preference.DiffToolPath;
+        LoadExistingMetadata(preference.ModDirectory);
+        SetStatus($"Preference '{preference.Label}' was loaded.", true);
+    }
+
+    private void LoadExistingMetadata(string directory)
+    {
+        if (_creator is null)
+            return;
+        var path = Path.Combine(directory, "mod.yml");
+        if (!File.Exists(path))
+            return;
+        try
+        {
+            var metadata = _creator.ReadOrCreate(path);
+            TitleTextBox.Text = metadata.Title;
+            AuthorTextBox.Text = metadata.OriginalAuthor;
+            DescriptionTextBox.Text = metadata.Description;
+            var game = GameInfo.FromId(metadata.Game);
+            GameComboBox.SelectedItem = GameInfo.SupportedGames.FirstOrDefault(item => item.Id == game.Id);
+        }
+        catch (Exception exception)
+        {
+            SetStatus($"Could not load the existing mod.yml: {exception.Message}", false);
+        }
+    }
+
+    private void SetStatus(string message, bool successful)
+    {
+        StatusText.Text = message;
+        StatusText.Foreground = global::Avalonia.Media.Brush.Parse(successful ? "#62D6A7" : "#FF8B8B");
+    }
+
+    private void Close_OnClick(object? sender, RoutedEventArgs eventArgs) => Close();
+
+    public void HandleControllerAction(ControllerAction action)
+    {
+        if (ControllerWindowNavigator.TryMoveFocus(this, action))
+            return;
+        if (action is ControllerAction.PreviousControl or ControllerAction.PreviousItem)
+            ControllerWindowNavigator.MoveFocus(this, -1);
+        else if (action is ControllerAction.NextControl or ControllerAction.NextItem)
+            ControllerWindowNavigator.MoveFocus(this, 1);
+        else if (action == ControllerAction.Cancel)
+            Close();
+        else if (action == ControllerAction.Confirm)
+        {
+            var focused = FocusManager?.GetFocusedElement();
+            if (focused == CreateButton)
+                Create_OnClick(CreateButton, new RoutedEventArgs());
+            else if (focused == PreviewButton)
+                Preview_OnClick(PreviewButton, new RoutedEventArgs());
+            else if (focused == BrowseButton)
+                Browse_OnClick(BrowseButton, new RoutedEventArgs());
+            else if (focused == BrowseGameDataButton)
+                BrowseGameData_OnClick(BrowseGameDataButton, new RoutedEventArgs());
+            else if (focused == BrowseDiffToolButton)
+                BrowseDiffTool_OnClick(BrowseDiffToolButton, new RoutedEventArgs());
+            else if (focused == AppendFilesButton)
+                AppendFiles_OnClick(AppendFilesButton, new RoutedEventArgs());
+            else if (focused == SavePreferenceButton)
+                SavePreference_OnClick(SavePreferenceButton, new RoutedEventArgs());
+            else if (focused == LoadPreferenceButton)
+                LoadPreference_OnClick(LoadPreferenceButton, new RoutedEventArgs());
+            else if (focused == CloseButton)
+                Close();
+            else
+                ControllerWindowNavigator.MoveFocus(this, 1);
+        }
+    }
+}
diff --git a/OpenKh.Tools.ModsManager.Avalonia/Views/EmbeddedDialogControl.cs b/OpenKh.Tools.ModsManager.Avalonia/Views/EmbeddedDialogControl.cs
new file mode 100644
index 000000000..67bb62fd3
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Avalonia/Views/EmbeddedDialogControl.cs
@@ -0,0 +1,39 @@
+using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.Platform.Storage;
+
+namespace OpenKh.Tools.ModsManager.Avalonia.Views;
+
+public abstract class EmbeddedDialogControl : UserControl
+{
+    private readonly TaskCompletionSource<object?> _completion =
+        new(TaskCreationOptions.RunContinuationsAsynchronously);
+    private bool _closed;
+
+    public event EventHandler? Opened;
+    public event EventHandler? Closed;
+
+    protected IStorageProvider StorageProvider =>
+        TopLevel.GetTopLevel(this)?.StorageProvider ??
+        throw new InvalidOperationException("The page is not attached to a window.");
+
+    protected IFocusManager? FocusManager => TopLevel.GetTopLevel(this)?.FocusManager;
+
+    internal Task<object?> ShowEmbeddedAsync()
+    {
+        Opened?.Invoke(this, EventArgs.Empty);
+        return _completion.Task;
+    }
+
+    public void Close() => Close(null);
+
+    public void Close(object? result)
+    {
+        if (_closed)
+            return;
+
+        _closed = true;
+        Closed?.Invoke(this, EventArgs.Empty);
+        _completion.TrySetResult(result);
+    }
+}
diff --git a/OpenKh.Tools.ModsManager.Avalonia/Views/InfoWindow.axaml b/OpenKh.Tools.ModsManager.Avalonia/Views/InfoWindow.axaml
new file mode 100644
index 000000000..daa1a1293
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Avalonia/Views/InfoWindow.axaml
@@ -0,0 +1,25 @@
+<views:EmbeddedDialogControl xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:views="using:OpenKh.Tools.ModsManager.Avalonia.Views"
+        x:Class="OpenKh.Tools.ModsManager.Avalonia.Views.InfoWindow"
+        XYFocus.NavigationModes="Enabled">
+  <Grid Margin="28" RowDefinitions="Auto,18,*,18,Auto">
+    <StackPanel Spacing="8">
+      <Image Source="avares://OpenKh.Tools.ModsManager/Assets/OpenKH.png" Width="220" HorizontalAlignment="Left" />
+      <TextBlock Text="OpenKH Mod Manager" FontSize="27" FontWeight="Bold" />
+      <TextBlock x:Name="VersionText" Foreground="#91A2BA" />
+    </StackPanel>
+    <Border Grid.Row="2" Classes="settings-card">
+      <StackPanel Spacing="10">
+        <Button Content="Frequently Asked Questions" Tag="https://openkh.dev/tool/GUI.ModsManager/FAQ" Click="OpenLink_OnClick" />
+        <Button Content="Download Latest Version" Tag="https://github.com/OpenKH/OpenKh/releases" Click="OpenLink_OnClick" />
+        <Button Content="OpenKH Source Code" Tag="https://github.com/OpenKH/OpenKh" Click="OpenLink_OnClick" />
+        <Button Content="OpenKH Documentation" Tag="https://openkh.dev" Click="OpenLink_OnClick" />
+        <Button Content="Report Bug or Missing Features" Tag="https://github.com/OpenKH/OpenKh/issues" Click="OpenLink_OnClick" />
+        <Button Content="Join Discord Server" Tag="https://discord.openkh.dev" Click="OpenLink_OnClick" />
+      </StackPanel>
+    </Border>
+    <Button x:Name="CloseButton" Grid.Row="4" Content="Close" MinWidth="120"
+            HorizontalAlignment="Right" Click="Close_OnClick" />
+  </Grid>
+</views:EmbeddedDialogControl>
diff --git a/OpenKh.Tools.ModsManager.Avalonia/Views/InfoWindow.axaml.cs b/OpenKh.Tools.ModsManager.Avalonia/Views/InfoWindow.axaml.cs
new file mode 100644
index 000000000..b91974ae7
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Avalonia/Views/InfoWindow.axaml.cs
@@ -0,0 +1,43 @@
+using System.Diagnostics;
+using System.Reflection;
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+using OpenKh.Tools.ModsManager.Avalonia.Services;
+
+namespace OpenKh.Tools.ModsManager.Avalonia.Views;
+
+public sealed partial class InfoWindow : EmbeddedDialogControl
+{
+    public InfoWindow()
+    {
+        InitializeComponent();
+        VersionText.Text = $"Version {Assembly.GetExecutingAssembly().GetName().Version}";
+    }
+
+    private void OpenLink_OnClick(object? sender, RoutedEventArgs eventArgs)
+    {
+        if (sender is Button { Tag: string url })
+            Process.Start(new ProcessStartInfo(url) { UseShellExecute = true });
+    }
+
+    private void Close_OnClick(object? sender, RoutedEventArgs eventArgs) => Close();
+
+    public void HandleControllerAction(ControllerAction action)
+    {
+        if (ControllerWindowNavigator.TryMoveFocus(this, action))
+            return;
+        if (action is ControllerAction.PreviousControl or ControllerAction.PreviousItem)
+            ControllerWindowNavigator.MoveFocus(this, -1);
+        else if (action is ControllerAction.NextControl or ControllerAction.NextItem)
+            ControllerWindowNavigator.MoveFocus(this, 1);
+        else if (action == ControllerAction.Cancel)
+            Close();
+        else if (action == ControllerAction.Confirm && FocusManager?.GetFocusedElement() is Button button)
+        {
+            if (button == CloseButton)
+                Close();
+            else
+                OpenLink_OnClick(button, new RoutedEventArgs());
+        }
+    }
+}
diff --git a/OpenKh.Tools.ModsManager.Avalonia/Views/InstallModWindow.axaml b/OpenKh.Tools.ModsManager.Avalonia/Views/InstallModWindow.axaml
new file mode 100644
index 000000000..0786a3bf6
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Avalonia/Views/InstallModWindow.axaml
@@ -0,0 +1,55 @@
+<views:EmbeddedDialogControl xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:views="using:OpenKh.Tools.ModsManager.Avalonia.Views"
+        x:Class="OpenKh.Tools.ModsManager.Avalonia.Views.InstallModWindow"
+        XYFocus.NavigationModes="Enabled">
+  <Grid Margin="28" RowDefinitions="Auto,20,Auto,14,Auto,14,Auto,*,Auto">
+    <StackPanel Spacing="5">
+      <TextBlock Text="Install a Mod" FontSize="27" FontWeight="Bold" />
+      <TextBlock Text="Choose one of the two installation methods below."
+                 Foreground="#AAB9CF" TextWrapping="Wrap" />
+    </StackPanel>
+
+    <Border Grid.Row="2" Classes="settings-card">
+      <Grid ColumnDefinitions="*,16,Auto" RowDefinitions="Auto,7,Auto,7,Auto,7,Auto,7,Auto">
+        <TextBlock Text="Repository or Package URL" FontSize="16" FontWeight="SemiBold" />
+        <TextBox x:Name="SourceTextBox" Grid.Row="2"
+                 PlaceholderText="OpenKH/example-mod or https://github.com/OpenKH/example-mod"
+                 TextWrapping="NoWrap"
+                 KeyDown="RepositoryField_OnKeyDown" />
+        <TextBlock Grid.Row="4" Text="Branch (Optional)" FontWeight="SemiBold" />
+        <TextBox x:Name="BranchTextBox" Grid.Row="6" PlaceholderText="main"
+                 KeyDown="RepositoryField_OnKeyDown" />
+        <TextBlock Grid.Row="8"
+                   Text="GitHub repositories, custom Git hosts, ZIP links, PC Patch archives, and Lua files are supported."
+                   Foreground="#71839E" FontSize="11" TextWrapping="Wrap" />
+        <Button x:Name="InstallButton" Grid.Row="6" Grid.Column="2" Classes="primary"
+                Content="Install From Repository" MinWidth="190"
+                Click="Install_OnClick" />
+      </Grid>
+    </Border>
+
+    <TextBlock Grid.Row="4" Text="OR" HorizontalAlignment="Center"
+               Foreground="#71839E" FontWeight="Bold" />
+
+    <Border Grid.Row="6" Classes="settings-card">
+      <Grid ColumnDefinitions="*,16,Auto">
+        <StackPanel Spacing="5" VerticalAlignment="Center">
+          <TextBlock Text="Local Mod File" FontSize="16" FontWeight="SemiBold" />
+          <TextBlock Text="Choose a ZIP, PC Patch archive, or Lua file. Installation starts after the file is selected."
+                     Foreground="#AAB9CF" TextWrapping="Wrap" />
+        </StackPanel>
+        <Button x:Name="ChooseFileButton" Grid.Column="2" Content="Choose Local File"
+                MinWidth="190" Click="ChooseFile_OnClick" VerticalAlignment="Center" />
+      </Grid>
+    </Border>
+
+    <TextBlock Grid.Row="7" Margin="0,16,0,0"
+               Text="Controller: use the D-pad to move, A to activate, and B to cancel."
+               Foreground="#71839E" FontSize="11" />
+
+    <StackPanel Grid.Row="8" Orientation="Horizontal" Spacing="12" HorizontalAlignment="Right">
+      <Button x:Name="CancelButton" Content="Cancel" MinWidth="120" Click="Cancel_OnClick" />
+    </StackPanel>
+  </Grid>
+</views:EmbeddedDialogControl>
diff --git a/OpenKh.Tools.ModsManager.Avalonia/Views/InstallModWindow.axaml.cs b/OpenKh.Tools.ModsManager.Avalonia/Views/InstallModWindow.axaml.cs
new file mode 100644
index 000000000..993e97999
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Avalonia/Views/InstallModWindow.axaml.cs
@@ -0,0 +1,96 @@
+using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.Interactivity;
+using Avalonia.Platform.Storage;
+using OpenKh.Tools.ModsManager.Avalonia.Services;
+
+namespace OpenKh.Tools.ModsManager.Avalonia.Views;
+
+public sealed partial class InstallModWindow : EmbeddedDialogControl
+{
+    public InstallModWindow()
+    {
+        InitializeComponent();
+        Opened += (_, _) => SourceTextBox.Focus();
+    }
+
+    private async void ChooseFile_OnClick(object? sender, RoutedEventArgs eventArgs)
+    {
+        var files = await StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions
+        {
+            Title = "Choose an OpenKH mod",
+            AllowMultiple = false,
+            FileTypeFilter =
+            [
+                new FilePickerFileType("OpenKH mods")
+                {
+                    Patterns = ["*.zip", "*.kh2pcpatch", "*.kh1pcpatch", "*.compcpatch", "*.bbspcpatch", "*.dddpcpatch", "*.lua"]
+                }
+            ]
+        });
+
+        if (files.Count > 0 && files[0].TryGetLocalPath() is { } fileName)
+            Close(new ModInstallRequest(fileName, null));
+    }
+
+    private void Install_OnClick(object? sender, RoutedEventArgs eventArgs)
+    {
+        InstallFromRepository();
+    }
+
+    private void RepositoryField_OnKeyDown(object? sender, KeyEventArgs eventArgs)
+    {
+        if (eventArgs.Key != Key.Enter)
+            return;
+
+        eventArgs.Handled = true;
+        InstallFromRepository();
+    }
+
+    private void InstallFromRepository()
+    {
+        var source = SourceTextBox.Text?.Trim();
+        if (string.IsNullOrWhiteSpace(source))
+        {
+            SourceTextBox.Focus();
+            return;
+        }
+
+        Close(new ModInstallRequest(
+            source,
+            string.IsNullOrWhiteSpace(BranchTextBox.Text) ? null : BranchTextBox.Text.Trim()));
+    }
+
+    private void Cancel_OnClick(object? sender, RoutedEventArgs eventArgs) => Close(null);
+
+    public void HandleControllerAction(ControllerAction action)
+    {
+        if (ControllerWindowNavigator.TryMoveFocus(this, action))
+            return;
+        if (action is ControllerAction.PreviousControl or ControllerAction.PreviousItem or ControllerAction.PreviousGame)
+            ControllerWindowNavigator.MoveFocus(this, -1);
+        else if (action is ControllerAction.NextControl or ControllerAction.NextItem or ControllerAction.NextGame)
+            ControllerWindowNavigator.MoveFocus(this, 1);
+        else if (action == ControllerAction.Cancel)
+            Close(null);
+        else if (action == ControllerAction.Install)
+            Install_OnClick(InstallButton, new RoutedEventArgs());
+        else if (action == ControllerAction.Secondary)
+            ChooseFile_OnClick(ChooseFileButton, new RoutedEventArgs());
+        else if (action == ControllerAction.Confirm)
+            ActivateFocusedControl();
+    }
+
+    private void ActivateFocusedControl()
+    {
+        var focused = FocusManager?.GetFocusedElement();
+        if (focused == InstallButton)
+            Install_OnClick(InstallButton, new RoutedEventArgs());
+        else if (focused == CancelButton)
+            Close(null);
+        else if (focused == ChooseFileButton)
+            ChooseFile_OnClick(ChooseFileButton, new RoutedEventArgs());
+        else
+            ControllerWindowNavigator.MoveFocus(this, 1);
+    }
+}
diff --git a/OpenKh.Tools.ModsManager.Avalonia/Views/MainWindow.axaml b/OpenKh.Tools.ModsManager.Avalonia/Views/MainWindow.axaml
new file mode 100644
index 000000000..4f14a1bc1
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Avalonia/Views/MainWindow.axaml
@@ -0,0 +1,306 @@
+<Window xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:vm="using:OpenKh.Tools.ModsManager.Avalonia.ViewModels"
+        x:Class="OpenKh.Tools.ModsManager.Avalonia.Views.MainWindow"
+        x:DataType="vm:MainWindowViewModel"
+        Title="OpenKH Mod Manager"
+        Width="1280"
+        Height="800"
+        MinWidth="960"
+        MinHeight="640"
+        XYFocus.NavigationModes="Enabled">
+  <Grid>
+  <Grid x:Name="RootLayoutGrid" ColumnDefinitions="220,*" RowDefinitions="*,Auto">
+    <Border Grid.RowSpan="2" Background="#0F192A" BorderBrush="#22324C" BorderThickness="0,0,1,0">
+      <Grid Margin="22" RowDefinitions="Auto,20,*,20,Auto">
+        <StackPanel Spacing="8">
+          <Image Source="avares://OpenKh.Tools.ModsManager/Assets/OpenKH.png"
+                 Width="164"
+                 HorizontalAlignment="Left"
+                 Stretch="Uniform" />
+          <TextBlock Text="MOD MANAGER" FontSize="12" FontWeight="Bold" Foreground="#77A7FF" />
+        </StackPanel>
+
+        <ScrollViewer Grid.Row="2" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
+        <StackPanel Spacing="9">
+          <Button Classes="subtle" Command="{Binding BrowseModsCommand}" HorizontalAlignment="Stretch">
+            <StackPanel Orientation="Horizontal" Spacing="12">
+              <TextBlock Text="Browse Mods" VerticalAlignment="Center" />
+            </StackPanel>
+          </Button>
+          <Button Classes="subtle"
+                  Command="{Binding InstallCommand}"
+                  Content="Install Mods"
+                  HorizontalAlignment="Stretch" />
+          <Button Classes="subtle" Command="{Binding PresetsCommand}" Content="Presets" HorizontalAlignment="Stretch" />
+          <Button x:Name="SetupNavigationButton" Classes="subtle" Command="{Binding SetupCommand}" HorizontalAlignment="Stretch">
+            <StackPanel Orientation="Horizontal" Spacing="12">
+              <TextBlock Text="Game Setup" VerticalAlignment="Center" />
+            </StackPanel>
+          </Button>
+          <Button Classes="subtle" Command="{Binding SettingsCommand}" Content="App Settings" HorizontalAlignment="Stretch" />
+          <Expander x:Name="MoreExpander" Header="More" HorizontalAlignment="Stretch">
+            <StackPanel Spacing="8" Margin="0,8,0,0">
+              <Button x:Name="CreatorToolsButton" Classes="subtle" Command="{Binding CreatorCommand}" Content="Creator Tools" HorizontalAlignment="Stretch" />
+              <Button x:Name="AboutOpenKhButton" Classes="subtle" Command="{Binding InfoCommand}" Content="About OpenKH" HorizontalAlignment="Stretch" />
+            </StackPanel>
+          </Expander>
+          <Border Height="1" Margin="0,8" Background="#22324C" />
+          <Button Classes="primary" Command="{Binding BuildAndPlayCommand}" HorizontalAlignment="Stretch">
+            <TextBlock Text="Build and Launch" TextWrapping="Wrap" TextAlignment="Center" />
+          </Button>
+          <Button Classes="subtle" Command="{Binding BuildCommand}" HorizontalAlignment="Stretch">
+            <TextBlock Text="Build Mods" TextWrapping="Wrap" TextAlignment="Center" />
+          </Button>
+          <Button Classes="subtle" Command="{Binding PlayCommand}" HorizontalAlignment="Stretch">
+            <TextBlock Text="Launch Without Rebuilding" TextWrapping="Wrap" TextAlignment="Center" />
+          </Button>
+          <Button Classes="subtle" Content="Clear Built Mods" Command="{Binding ClearBuiltModsCommand}"
+                  HorizontalAlignment="Stretch" />
+          <Button Classes="subtle" Command="{Binding StopGameCommand}" IsVisible="{Binding IsGameRunning}"
+                  Content="Stop Running Game" HorizontalAlignment="Stretch" />
+          <Button Classes="subtle" Command="{Binding ToggleAdvancedOptionsCommand}"
+                  IsVisible="{Binding EnablePatching}" HorizontalAlignment="Stretch">
+            <TextBlock Text="Advanced Options" TextWrapping="Wrap" TextAlignment="Center" />
+          </Button>
+          <Border IsVisible="{Binding ShowAdvancedOptions}"
+                  Background="#111C2E" BorderBrush="#22324C" BorderThickness="1"
+                  CornerRadius="10" Padding="8">
+            <StackPanel Spacing="8">
+              <Button Classes="subtle" Content="Build and Fast Patch" Command="{Binding FastPatchCommand}"
+                      HorizontalAlignment="Stretch" />
+              <Button Classes="subtle" Content="Build and Full Patch" Command="{Binding ApplyToGameCommand}"
+                      HorizontalAlignment="Stretch" />
+              <Button Classes="subtle" Content="Full Restore" Command="{Binding RestoreGameCommand}"
+                      HorizontalAlignment="Stretch" />
+            </StackPanel>
+          </Border>
+        </StackPanel>
+        </ScrollViewer>
+
+        <Border Grid.Row="4" Background="#111E31" CornerRadius="12" Padding="14">
+          <StackPanel Spacing="5">
+            <TextBlock Text="CONTROLLER SUPPORT" FontSize="10" FontWeight="Bold" Foreground="#AAB9CF" />
+            <TextBlock Text="Windows &#x2022; Linux &#x2022; Steam Deck"
+                       FontSize="12" TextWrapping="Wrap" Foreground="#AAB9CF" />
+          </StackPanel>
+        </Border>
+      </Grid>
+    </Border>
+
+    <Grid Grid.Column="1" Margin="28,24,28,18" RowDefinitions="Auto,18,Auto,18,*">
+      <Grid ColumnDefinitions="*,280">
+        <StackPanel Spacing="4">
+          <TextBlock Text="Choose what you want to play. Changes are saved automatically."
+                     Foreground="#AAB9CF" />
+        </StackPanel>
+        <ComboBox Grid.Column="1"
+                  ItemsSource="{Binding Games}"
+                  SelectedItem="{Binding SelectedGame}"
+                  HorizontalContentAlignment="Stretch">
+          <ComboBox.ItemTemplate>
+            <DataTemplate>
+              <TextBlock Text="{Binding DisplayName}" VerticalAlignment="Center" />
+            </DataTemplate>
+          </ComboBox.ItemTemplate>
+        </ComboBox>
+      </Grid>
+
+      <Grid Grid.Row="2" ColumnDefinitions="*,16,130,12,130">
+        <TextBox PlaceholderText="Search by mod, author, or repository"
+                 Text="{Binding SearchText, UpdateSourceTrigger=PropertyChanged}" />
+        <Border Grid.Column="2" Background="#111C2E" CornerRadius="10" Padding="14,8">
+          <StackPanel>
+            <TextBlock Text="{Binding TotalCount}" FontSize="20" FontWeight="Bold" Foreground="White" />
+            <TextBlock Text="Installed" FontSize="11" Foreground="#8191AA" />
+          </StackPanel>
+        </Border>
+        <Border Grid.Column="4" Background="#11253A" CornerRadius="10" Padding="14,8">
+          <StackPanel>
+            <TextBlock Text="{Binding EnabledCount}" FontSize="20" FontWeight="Bold" Foreground="#62D6A7" />
+            <TextBlock Text="Enabled" FontSize="11" Foreground="#8191AA" />
+          </StackPanel>
+        </Border>
+      </Grid>
+
+      <ScrollViewer x:Name="WorkspaceScroller" Grid.Row="4"
+                    HorizontalScrollBarVisibility="Disabled"
+                    VerticalScrollBarVisibility="Auto"
+                    HorizontalContentAlignment="Stretch"
+                    VerticalContentAlignment="Stretch">
+      <Grid x:Name="WorkspaceGrid" ColumnDefinitions="3*,18,2*" RowDefinitions="*">
+        <Border x:Name="ModLibraryPanel" Background="#0F192A" BorderBrush="#22324C" BorderThickness="1" CornerRadius="14" Padding="10">
+          <Grid RowDefinitions="Auto,*">
+            <Grid Margin="8,4,8,10" ColumnDefinitions="*,Auto">
+              <TextBlock Text="Load Order" FontSize="15" FontWeight="SemiBold" VerticalAlignment="Center" />
+              <StackPanel Grid.Column="1" Orientation="Horizontal" Spacing="8">
+                <Button Classes="subtle" Content="Top" Command="{Binding MoveTopCommand}" ToolTip.Tip="Move to highest priority" />
+                <Button Classes="subtle" Content="&#x2191;" Command="{Binding MoveUpCommand}" ToolTip.Tip="Increase priority" />
+                <Button Classes="subtle" Content="&#x2193;" Command="{Binding MoveDownCommand}" ToolTip.Tip="Decrease priority" />
+                <Button Classes="subtle" Content="Check Updates" Command="{Binding CheckUpdatesCommand}" />
+                <Button Classes="subtle" Content="Refresh" Command="{Binding RefreshCommand}" />
+              </StackPanel>
+            </Grid>
+            <ListBox Grid.Row="1"
+                     x:Name="ModList"
+                     SelectionChanged="ModList_OnSelectionChanged"
+                     GotFocus="ModList_OnGotFocus"
+                     ItemsSource="{Binding Mods}"
+                     SelectedItem="{Binding SelectedMod}"
+                     Background="Transparent"
+                     BorderThickness="0"
+                     KeyboardNavigation.TabNavigation="Cycle">
+              <ListBox.Styles>
+                <Style Selector="ListBoxItem:selected /template/ ContentPresenter">
+                  <Setter Property="Background" Value="#1C2B44" />
+                </Style>
+                <Style Selector="ListBoxItem:focus-visible /template/ ContentPresenter">
+                  <Setter Property="BorderBrush" Value="#77A7FF" />
+                  <Setter Property="BorderThickness" Value="2" />
+                </Style>
+              </ListBox.Styles>
+              <ListBox.ItemTemplate>
+                <DataTemplate x:DataType="vm:ModListItemViewModel">
+                  <Grid Margin="4" ColumnDefinitions="52,*,Auto" MinHeight="72">
+                    <Border Width="44" Height="44" CornerRadius="12" Background="#233B60" VerticalAlignment="Center">
+                      <Grid>
+                        <Image Source="{Binding IconImage}" IsVisible="{Binding HasIcon}" Stretch="UniformToFill" />
+                        <TextBlock Text="{Binding Initial}" IsVisible="{Binding ShowInitial}"
+                                   HorizontalAlignment="Center" VerticalAlignment="Center"
+                                   FontSize="17" FontWeight="Bold" Foreground="#8DB7FF" />
+                      </Grid>
+                    </Border>
+                    <StackPanel Grid.Column="1" Margin="12,0" VerticalAlignment="Center" Spacing="3">
+                      <TextBlock Text="{Binding Name}" FontWeight="SemiBold" FontSize="14" TextTrimming="CharacterEllipsis" />
+                      <StackPanel Orientation="Horizontal" Spacing="8">
+                        <TextBlock Text="{Binding Author}" FontSize="12" Foreground="#91A2BA" />
+                        <TextBlock Text="{Binding Kind}" FontSize="10" FontWeight="Bold" Foreground="#77A7FF" />
+                        <TextBlock Text="{Binding UpdateLabel}" IsVisible="{Binding HasUpdate}"
+                                   FontSize="10" FontWeight="Bold" Foreground="#62D6A7" />
+                      </StackPanel>
+                    </StackPanel>
+                    <ToggleSwitch Grid.Column="2"
+                                  IsChecked="{Binding IsEnabled}"
+                                  OnContent="On"
+                                  OffContent="Off"
+                                  VerticalAlignment="Center" />
+                  </Grid>
+                </DataTemplate>
+              </ListBox.ItemTemplate>
+            </ListBox>
+          </Grid>
+        </Border>
+
+        <Border x:Name="ModDetailsPanel" Grid.Column="2" Background="#0F192A" BorderBrush="#22324C" BorderThickness="1" CornerRadius="14" Padding="24">
+          <Grid RowDefinitions="*,Auto">
+            <ScrollViewer IsVisible="{Binding HasSelection}">
+              <StackPanel Spacing="16">
+                <Border Width="72" Height="72" CornerRadius="18" Background="#233B60" HorizontalAlignment="Left">
+                  <Grid>
+                    <Image Source="{Binding SelectedMod.IconImage}" IsVisible="{Binding SelectedMod.HasIcon}" Stretch="UniformToFill" />
+                    <TextBlock Text="{Binding SelectedMod.Initial}" IsVisible="{Binding SelectedMod.ShowInitial}"
+                               HorizontalAlignment="Center" VerticalAlignment="Center"
+                               FontSize="28" FontWeight="Bold" Foreground="#8DB7FF" />
+                  </Grid>
+                </Border>
+                <StackPanel Spacing="5">
+                  <TextBlock Text="{Binding SelectedMod.Name}" FontSize="24" FontWeight="Bold" TextWrapping="Wrap" />
+                  <TextBlock Text="{Binding SelectedMod.Author}" Foreground="#91A2BA" />
+                </StackPanel>
+                <TextBlock Text="{Binding SelectedMod.Description}"
+                           TextWrapping="Wrap"
+                           Foreground="#C4D0E1" />
+                <Border IsVisible="{Binding SelectedMod.HasPreview}" CornerRadius="10" ClipToBounds="True">
+                  <Image Source="{Binding SelectedMod.PreviewImage}" MaxHeight="180" Stretch="Uniform" />
+                </Border>
+                <Border Background="#111C2E" CornerRadius="10" Padding="12">
+                  <TextBlock Text="{Binding SelectedMod.Id}" FontSize="12" Foreground="#91A2BA" TextWrapping="Wrap" />
+                </Border>
+                <StackPanel Orientation="Horizontal" Spacing="10"
+                            IsVisible="{Binding SelectedMod.HasSource}">
+                  <Button Classes="subtle" Content="Mod Source"
+                          Command="{Binding OpenSourceCommand}" />
+                  <Button Classes="subtle" Content="Report Bug"
+                          Command="{Binding ReportBugCommand}"
+                          IsVisible="{Binding SelectedMod.CanReportBug}" />
+                </StackPanel>
+                <Expander Header="{Binding SelectedMod.FilesToPatchHeader}"
+                          IsVisible="{Binding SelectedMod.HasFilesToPatch}"
+                          Focusable="True">
+                  <Border Background="#111C2E" CornerRadius="10" Padding="12" Margin="0,8,0,0">
+                    <TextBlock Text="{Binding SelectedMod.FilesToPatchText}"
+                               FontFamily="Cascadia Mono,Consolas"
+                               FontSize="11"
+                               Foreground="#AAB9CF"
+                               TextWrapping="Wrap" />
+                  </Border>
+                </Expander>
+              </StackPanel>
+            </ScrollViewer>
+            <StackPanel Grid.Row="1" Spacing="10">
+              <Button Classes="primary"
+                      Content="Update Mod"
+                      Command="{Binding UpdateSelectedCommand}"
+                      IsVisible="{Binding SelectedMod.HasUpdate}"
+                      HorizontalAlignment="Stretch" />
+              <Button Content="Open Mod Folder"
+                      Command="{Binding OpenFolderCommand}"
+                      HorizontalAlignment="Stretch" />
+              <Button Content="Configure Collection"
+                      Command="{Binding CollectionSettingsCommand}"
+                      IsVisible="{Binding SelectedMod.IsCollection}"
+                      HorizontalAlignment="Stretch" />
+              <Button Content="Remove Mod"
+                      Command="{Binding RemoveSelectedCommand}"
+                      HorizontalAlignment="Stretch" />
+            </StackPanel>
+          </Grid>
+        </Border>
+      </Grid>
+      </ScrollViewer>
+    </Grid>
+
+    <Border Grid.Row="1" Grid.Column="1" BorderBrush="#22324C" BorderThickness="0,1,0,0" Padding="28,11">
+      <Grid ColumnDefinitions="Auto,*" RowDefinitions="Auto,Auto,Auto,Auto">
+        <TextBlock Text="Status" FontWeight="SemiBold" Foreground="#DCE7F8" />
+        <TextBlock Grid.Column="1" Margin="8,0,0,0"
+                   Text="{Binding StatusText}" Foreground="{Binding StatusForeground}" TextWrapping="Wrap" />
+        <TextBlock Grid.Row="1" Grid.ColumnSpan="2" Margin="0,5,0,0"
+                   Text="{Binding InstallationDirectory}"
+                   Foreground="#596C88"
+                   TextTrimming="CharacterEllipsis"
+                   HorizontalAlignment="Right"
+                   MaxWidth="720" />
+        <StackPanel Grid.Row="2" Grid.ColumnSpan="2" Margin="0,7,0,0"
+                    Orientation="Horizontal" Spacing="8"
+                    IsVisible="{Binding ShowControllerHelp}">
+          <TextBlock Text="Controller" FontWeight="SemiBold" Foreground="#DCE7F8" />
+          <TextBlock Text="{Binding ControllerStatusText}" Foreground="#91A2BA" />
+        </StackPanel>
+        <TextBlock Grid.Row="3" Grid.ColumnSpan="2"
+                   Margin="0,4,0,0"
+                   Text="{Binding ControllerHelpText}"
+                   IsVisible="{Binding ShowControllerHelp}"
+                   Foreground="#71839E"
+                   FontSize="11"
+                   TextWrapping="Wrap" />
+      </Grid>
+    </Border>
+  </Grid>
+  <Border x:Name="DialogOverlay"
+          IsVisible="False"
+          Background="#F20A1220"
+          Padding="18"
+          ZIndex="100">
+    <Border Background="#0D1829"
+            BorderBrush="#314664"
+            BorderThickness="1"
+            CornerRadius="12"
+            ClipToBounds="True">
+      <ContentControl x:Name="DialogContent"
+                      HorizontalContentAlignment="Stretch"
+                      VerticalContentAlignment="Stretch" />
+    </Border>
+  </Border>
+  </Grid>
+</Window>
diff --git a/OpenKh.Tools.ModsManager.Avalonia/Views/MainWindow.axaml.cs b/OpenKh.Tools.ModsManager.Avalonia/Views/MainWindow.axaml.cs
new file mode 100644
index 000000000..b197ef633
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Avalonia/Views/MainWindow.axaml.cs
@@ -0,0 +1,199 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
+using Avalonia.Input;
+using OpenKh.Tools.ModsManager.Avalonia.Services;
+using OpenKh.Tools.ModsManager.Avalonia.ViewModels;
+using Avalonia.Threading;
+using Avalonia.VisualTree;
+
+namespace OpenKh.Tools.ModsManager.Avalonia.Views;
+
+public sealed partial class MainWindow : Window
+{
+    public MainWindow()
+    {
+        InitializeComponent();
+        VirtualKeyboardService.Configure(new EmbeddedVirtualKeyboardHost(this));
+        SizeChanged += (_, _) => UpdateResponsiveLayout();
+        Opened += (_, _) => UpdateResponsiveLayout();
+    }
+
+    public async Task<T?> ShowPageAsync<T>(EmbeddedDialogControl page)
+    {
+        var previousPage = DialogContent.Content;
+        DialogContent.Content = page;
+        DialogOverlay.IsVisible = true;
+
+        try
+        {
+            var result = await page.ShowEmbeddedAsync();
+            return result is T value ? value : default;
+        }
+        finally
+        {
+            if (ReferenceEquals(DialogContent.Content, page))
+            {
+                DialogContent.Content = previousPage;
+                DialogOverlay.IsVisible = previousPage is not null;
+            }
+        }
+    }
+
+    private void UpdateResponsiveLayout()
+    {
+        var compact = Bounds.Width < 1120;
+        WorkspaceGrid.ColumnDefinitions.Clear();
+        WorkspaceGrid.RowDefinitions.Clear();
+        if (compact)
+        {
+            WorkspaceScroller.VerticalScrollBarVisibility = global::Avalonia.Controls.Primitives.ScrollBarVisibility.Auto;
+            WorkspaceGrid.ColumnDefinitions.Add(new ColumnDefinition(GridLength.Star));
+            WorkspaceGrid.RowDefinitions.Add(new RowDefinition(new GridLength(3, GridUnitType.Star)));
+            WorkspaceGrid.RowDefinitions.Add(new RowDefinition(new GridLength(18)));
+            WorkspaceGrid.RowDefinitions.Add(new RowDefinition(new GridLength(2, GridUnitType.Star)));
+            Grid.SetColumn(ModDetailsPanel, 0);
+            Grid.SetRow(ModDetailsPanel, 2);
+            WorkspaceGrid.MinHeight = 860;
+        }
+        else
+        {
+            WorkspaceScroller.VerticalScrollBarVisibility = global::Avalonia.Controls.Primitives.ScrollBarVisibility.Disabled;
+            WorkspaceGrid.ColumnDefinitions.Add(new ColumnDefinition(new GridLength(3, GridUnitType.Star)));
+            WorkspaceGrid.ColumnDefinitions.Add(new ColumnDefinition(new GridLength(18)));
+            WorkspaceGrid.ColumnDefinitions.Add(new ColumnDefinition(new GridLength(2, GridUnitType.Star)));
+            WorkspaceGrid.RowDefinitions.Add(new RowDefinition(GridLength.Star));
+            Grid.SetColumn(ModDetailsPanel, 2);
+            Grid.SetRow(ModDetailsPanel, 0);
+            WorkspaceGrid.MinHeight = 0;
+        }
+    }
+
+    private void ModList_OnSelectionChanged(object? sender, SelectionChangedEventArgs eventArgs)
+    {
+        if (sender is not ListBox listBox || listBox.SelectedItem is not { } selectedItem)
+            return;
+
+        // Wait for collection and virtualization updates before bringing a moved item back into view.
+        Dispatcher.UIThread.Post(() =>
+        {
+            if (ReferenceEquals(listBox.SelectedItem, selectedItem))
+                listBox.ScrollIntoView(selectedItem);
+        }, DispatcherPriority.Loaded);
+    }
+
+    private void ModList_OnGotFocus(object? sender, FocusChangedEventArgs eventArgs) =>
+        SelectFocusedMod(eventArgs.Source as Control);
+
+    public void HandleControllerAction(ControllerAction action)
+    {
+        if (ControllerWindowNavigator.TryHandleVirtualKeyboard(action) ||
+            ControllerWindowNavigator.TryShowVirtualKeyboard(this, action) ||
+            ControllerWindowNavigator.TryScroll(this, action))
+            return;
+
+        if (ControllerWindowNavigator.TryMoveFocus(this, action))
+        {
+            SelectFocusedMod(FocusManager?.GetFocusedElement() as Control);
+            return;
+        }
+
+        if (action == ControllerAction.Confirm)
+        {
+            SelectFocusedMod(FocusManager?.GetFocusedElement() as Control);
+            if (ActivateFocusedControl())
+                return;
+        }
+
+        var restoreModFocus = false;
+        if (action is ControllerAction.MoveUp or ControllerAction.MoveDown or ControllerAction.MoveTop)
+        {
+            var focusedControl = FocusManager?.GetFocusedElement() as Control;
+            if (!TryGetFocusedMod(focusedControl, out var focusedMod))
+                return;
+
+            ModList.SelectedItem = focusedMod;
+            restoreModFocus = true;
+        }
+
+        if (DataContext is MainWindowViewModel viewModel)
+        {
+            viewModel.HandleControllerAction(action);
+            if (restoreModFocus && viewModel.SelectedMod is { } selectedMod)
+                RestoreModFocus(ModList, selectedMod);
+        }
+    }
+
+    private static void RestoreModFocus(ListBox list, ModListItemViewModel selectedMod)
+    {
+        list.ScrollIntoView(selectedMod);
+        Dispatcher.UIThread.Post(() =>
+        {
+            var item = list.GetVisualDescendants()
+                .OfType<ListBoxItem>()
+                .FirstOrDefault(candidate => ReferenceEquals(candidate.DataContext, selectedMod));
+            item?.Focus(NavigationMethod.Directional);
+        }, DispatcherPriority.Loaded);
+    }
+
+    private bool ActivateFocusedControl()
+    {
+        var focused = FocusManager?.GetFocusedElement();
+        if (focused is Button button && button.Command is { } command)
+        {
+            if (command.CanExecute(button.CommandParameter))
+                command.Execute(button.CommandParameter);
+            return true;
+        }
+
+        if (GetFocusedExpander(focused) is { } expander)
+        {
+            expander.IsExpanded = !expander.IsExpanded;
+            return true;
+        }
+
+        if (focused is ToggleSwitch toggleSwitch)
+        {
+            toggleSwitch.IsChecked = toggleSwitch.IsChecked != true;
+            return true;
+        }
+
+        if (focused is CheckBox checkBox)
+        {
+            checkBox.IsChecked = checkBox.IsChecked != true;
+            return true;
+        }
+
+        if (focused is ComboBox comboBox)
+        {
+            comboBox.IsDropDownOpen = !comboBox.IsDropDownOpen;
+            return true;
+        }
+
+        return false;
+    }
+
+    private static Expander? GetFocusedExpander(object? focused)
+    {
+        if (focused is Expander expander)
+            return expander;
+
+        return focused is ToggleButton toggleButton
+            ? toggleButton.GetVisualAncestors().OfType<Expander>().FirstOrDefault()
+            : null;
+    }
+
+    private void SelectFocusedMod(Control? focusedControl)
+    {
+        if (TryGetFocusedMod(focusedControl, out var mod))
+            ModList.SelectedItem = mod;
+    }
+
+    private static bool TryGetFocusedMod(Control? focusedControl, out ModListItemViewModel? mod)
+    {
+        var item = focusedControl as ListBoxItem ??
+            focusedControl?.GetVisualAncestors().OfType<ListBoxItem>().FirstOrDefault();
+        mod = item?.DataContext as ModListItemViewModel;
+        return mod is not null;
+    }
+}
diff --git a/OpenKh.Tools.ModsManager.Avalonia/Views/OnlineModsWindow.axaml b/OpenKh.Tools.ModsManager.Avalonia/Views/OnlineModsWindow.axaml
new file mode 100644
index 000000000..ff29e9d6d
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Avalonia/Views/OnlineModsWindow.axaml
@@ -0,0 +1,108 @@
+<views:EmbeddedDialogControl xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:views="using:OpenKh.Tools.ModsManager.Avalonia.Views"
+        x:Class="OpenKh.Tools.ModsManager.Avalonia.Views.OnlineModsWindow"
+        XYFocus.NavigationModes="Enabled">
+  <Grid Margin="24" RowDefinitions="Auto,14,Auto,14,*,14,Auto">
+    <StackPanel Spacing="5">
+      <TextBlock Text="Browse Mods" FontSize="28" FontWeight="Bold" />
+      <TextBlock x:Name="GameHelpText" Foreground="#AAB9CF" />
+    </StackPanel>
+
+    <TextBox x:Name="SearchTextBox" Grid.Row="2"
+             PlaceholderText="Search by name, author, description, or repository"
+             TextChanged="Search_OnTextChanged" />
+
+    <Grid Grid.Row="4" ColumnDefinitions="3*,14,2*">
+      <Border Classes="online-mod-panel" Padding="8">
+        <ListBox x:Name="ModsList" SelectionChanged="ModsList_OnSelectionChanged"
+                 GotFocus="ModsList_OnGotFocus" Background="Transparent">
+          <ListBox.ItemsPanel>
+            <ItemsPanelTemplate>
+              <WrapPanel Orientation="Horizontal" />
+            </ItemsPanelTemplate>
+          </ListBox.ItemsPanel>
+          <ListBox.Styles>
+            <Style Selector="ListBoxItem">
+              <Setter Property="Width" Value="190" />
+              <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+              <Setter Property="Padding" Value="0" />
+              <Setter Property="Margin" Value="5" />
+            </Style>
+            <Style Selector="ListBoxItem /template/ ContentPresenter">
+              <Setter Property="Background" Value="#101E32" />
+              <Setter Property="BorderBrush" Value="#203550" />
+              <Setter Property="BorderThickness" Value="1" />
+              <Setter Property="CornerRadius" Value="10" />
+            </Style>
+            <Style Selector="ListBoxItem:selected /template/ ContentPresenter">
+              <Setter Property="Background" Value="#132A49" />
+              <Setter Property="BorderBrush" Value="#397FFF" />
+              <Setter Property="BorderThickness" Value="2" />
+            </Style>
+            <Style Selector="ListBoxItem:focus-visible /template/ ContentPresenter">
+              <Setter Property="Background" Value="#132A49" />
+              <Setter Property="BorderBrush" Value="#8DB5FF" />
+              <Setter Property="BorderThickness" Value="3" />
+            </Style>
+          </ListBox.Styles>
+          <ListBox.ItemTemplate>
+            <DataTemplate>
+              <StackPanel Margin="10" Spacing="8">
+                <Border Height="86" CornerRadius="8" Background="#0B1728" ClipToBounds="True">
+                  <Image Source="{Binding PreviewImage}" Stretch="UniformToFill" />
+                </Border>
+                <Grid ColumnDefinitions="38,*">
+                  <Border Width="32" Height="32" CornerRadius="8" Background="#203A62" ClipToBounds="True">
+                    <Grid>
+                      <TextBlock Text="{Binding Initial}" HorizontalAlignment="Center" VerticalAlignment="Center"
+                                 FontWeight="Bold" Foreground="#8DB7FF" />
+                      <Image Source="{Binding IconImage}" Stretch="UniformToFill" />
+                    </Grid>
+                  </Border>
+                  <StackPanel Grid.Column="1" Spacing="2">
+                    <TextBlock Text="{Binding Title}" FontWeight="SemiBold" FontSize="12" TextTrimming="CharacterEllipsis" />
+                    <TextBlock Text="{Binding Author}" Foreground="#91A2BA" FontSize="10" TextTrimming="CharacterEllipsis" />
+                  </StackPanel>
+                </Grid>
+                <TextBlock Text="Select to view details" Foreground="#6F83A0" FontSize="9" />
+              </StackPanel>
+            </DataTemplate>
+          </ListBox.ItemTemplate>
+        </ListBox>
+      </Border>
+
+      <Border Grid.Column="2" Classes="online-mod-panel" Padding="20">
+        <Grid RowDefinitions="*,Auto">
+          <ScrollViewer>
+            <StackPanel Spacing="12">
+              <Border Background="#111C2E" CornerRadius="12" ClipToBounds="True">
+                <Image x:Name="SelectedPreviewImage" MaxHeight="220" Stretch="Uniform" />
+              </Border>
+              <TextBlock x:Name="SelectedTitleText" FontSize="22" FontWeight="Bold" TextWrapping="Wrap" />
+              <TextBlock x:Name="SelectedAuthorText" Foreground="#91A2BA" />
+              <TextBlock x:Name="SelectedDescriptionText" TextWrapping="Wrap" Foreground="#C4D0E1" />
+              <Border Background="#111C2E" CornerRadius="10" Padding="12">
+                <TextBlock x:Name="SelectedRepositoryText" Foreground="#91A2BA" TextWrapping="Wrap" />
+              </Border>
+            </StackPanel>
+          </ScrollViewer>
+          <Button x:Name="InstallSelectedButton" Grid.Row="1" Classes="primary"
+                  Content="Install Selected Mod" Click="InstallSelected_OnClick" HorizontalAlignment="Stretch" />
+        </Grid>
+      </Border>
+    </Grid>
+
+    <Grid Grid.Row="6" ColumnDefinitions="*,16,Auto">
+      <Border Background="#111C2E" CornerRadius="10" Padding="12,9">
+        <StackPanel Spacing="7">
+          <ProgressBar x:Name="LoadingProgressBar" Minimum="0" Maximum="1"
+                       Height="10" IsVisible="False" />
+          <TextBlock x:Name="StatusText" Foreground="#C4D0E1"
+                     FontWeight="SemiBold" TextWrapping="Wrap" />
+        </StackPanel>
+      </Border>
+      <Button x:Name="CloseButton" Grid.Column="2" Content="Close" Click="Close_OnClick" />
+    </Grid>
+  </Grid>
+</views:EmbeddedDialogControl>
diff --git a/OpenKh.Tools.ModsManager.Avalonia/Views/OnlineModsWindow.axaml.cs b/OpenKh.Tools.ModsManager.Avalonia/Views/OnlineModsWindow.axaml.cs
new file mode 100644
index 000000000..a3d806fed
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Avalonia/Views/OnlineModsWindow.axaml.cs
@@ -0,0 +1,331 @@
+using System.Collections.ObjectModel;
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+using Avalonia.Media.Imaging;
+using Avalonia.Input;
+using Avalonia.VisualTree;
+using OpenKh.Tools.ModsManager.Avalonia.Services;
+using OpenKh.Tools.ModsManager.Core;
+
+namespace OpenKh.Tools.ModsManager.Avalonia.Views;
+
+public sealed partial class OnlineModsWindow : EmbeddedDialogControl
+{
+    private readonly OnlineModCatalogService? _catalog;
+    private readonly RepositoryModInstaller? _installer;
+    private readonly GameInfo? _game;
+    private readonly IReadOnlyCollection<string> _installedIds = [];
+    private readonly Func<string, Task>? _onModInstalled;
+    private readonly List<OnlineModItem> _allMods = [];
+    private readonly ObservableCollection<OnlineModItem> _visibleMods = [];
+    private readonly HashSet<string> _installedRepositories = new(StringComparer.OrdinalIgnoreCase);
+    private readonly CancellationTokenSource _loadCancellation = new();
+    private bool _installedAny;
+    private bool _isCatalogLoading;
+    private bool _isInstalling;
+    private bool _isClosed;
+
+    public OnlineModsWindow()
+    {
+        InitializeComponent();
+        ModsList.ItemsSource = _visibleMods;
+    }
+
+    public OnlineModsWindow(
+        OnlineModCatalogService catalog,
+        RepositoryModInstaller installer,
+        GameInfo game,
+        IReadOnlyCollection<string> installedIds,
+        Func<string, Task> onModInstalled) : this()
+    {
+        _catalog = catalog;
+        _installer = installer;
+        _game = game;
+        _installedIds = installedIds;
+        _onModInstalled = onModInstalled;
+        GameHelpText.Text = $"Available community mods for {game.DisplayName}";
+        Opened += async (_, _) => await LoadAsync();
+        Closed += (_, _) =>
+        {
+            _isClosed = true;
+            _loadCancellation.Cancel();
+            _loadCancellation.Dispose();
+            DisposeImages();
+        };
+    }
+
+    public bool InstalledAny => _installedAny;
+
+    private async Task LoadAsync()
+    {
+        if (_catalog is null || _game is null)
+            return;
+
+        SetCatalogLoading(true);
+        try
+        {
+            var progress = new Progress<ModOperationProgress>(value =>
+            {
+                if (_isClosed)
+                    return;
+                StatusText.Text = value.Message;
+                if (value.Percentage is { } percentage)
+                {
+                    LoadingProgressBar.IsIndeterminate = false;
+                    LoadingProgressBar.Value = percentage;
+                }
+            });
+            var itemProgress = new Progress<OnlineModInfo>(mod =>
+            {
+                if (_isClosed)
+                    return;
+                TryAddCatalogMod(mod);
+                ModsList.SelectedItem ??= _visibleMods.FirstOrDefault();
+            });
+            var mods = await _catalog.LoadAsync(
+                _game,
+                _installedIds,
+                progress,
+                itemProgress,
+                _loadCancellation.Token);
+            if (_isClosed)
+                return;
+            foreach (var mod in mods)
+                TryAddCatalogMod(mod);
+            ModsList.SelectedItem ??= _visibleMods.FirstOrDefault();
+            StatusText.Text = _allMods.Count == 1 ? "1 mod is available" : $"{_allMods.Count} mods are available";
+        }
+        catch (OperationCanceledException) when (_isClosed)
+        {
+        }
+        catch (Exception exception)
+        {
+            StatusText.Text = $"Could not load online mods: {exception.Message}";
+        }
+        finally
+        {
+            if (!_isClosed)
+                SetCatalogLoading(false);
+        }
+    }
+
+    private void Search_OnTextChanged(object? sender, TextChangedEventArgs eventArgs) => ApplyFilter();
+
+    private void ApplyFilter()
+    {
+        var selected = ModsList.SelectedItem as OnlineModItem;
+        _visibleMods.Clear();
+        foreach (var mod in _allMods.Where(MatchesCurrentFilter))
+            _visibleMods.Add(mod);
+        ModsList.SelectedItem = selected is not null && _visibleMods.Contains(selected)
+            ? selected
+            : _visibleMods.FirstOrDefault();
+    }
+
+    private void TryAddCatalogMod(OnlineModInfo mod)
+    {
+        if (_installedRepositories.Contains(mod.Repository) ||
+            _allMods.Any(item => item.Repository.Equals(mod.Repository, StringComparison.OrdinalIgnoreCase)))
+            return;
+
+        var item = new OnlineModItem(mod);
+        _allMods.Add(item);
+        if (MatchesCurrentFilter(item))
+            _visibleMods.Add(item);
+    }
+
+    private bool MatchesCurrentFilter(OnlineModItem mod)
+    {
+        var query = SearchTextBox.Text?.Trim();
+        if (string.IsNullOrWhiteSpace(query))
+            return true;
+
+        var terms = query.Split(' ', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
+        return terms.All(mod.Contains);
+    }
+
+    private void ModsList_OnSelectionChanged(object? sender, SelectionChangedEventArgs eventArgs)
+    {
+        var selected = ModsList.SelectedItem as OnlineModItem;
+        SelectedTitleText.Text = selected?.Title ?? "Select a mod";
+        SelectedAuthorText.Text = selected?.Author ?? "";
+        SelectedDescriptionText.Text = selected?.Description ?? "Select an entry to view its description.";
+        SelectedRepositoryText.Text = selected?.Repository ?? "";
+        SelectedPreviewImage.Source = selected?.PreviewImage;
+        UpdateControlState();
+    }
+
+    private async void InstallSelected_OnClick(object? sender, RoutedEventArgs eventArgs)
+    {
+        if (_isInstalling || _installer is null || _game is null ||
+            ModsList.SelectedItem is not OnlineModItem selected)
+            return;
+
+        SetInstalling(true);
+        InstallSelectedButton.Content = $"Installing {selected.Title}...";
+        StatusText.Text = $"Preparing to install {selected.Title}";
+        LoadingProgressBar.Value = 0;
+        LoadingProgressBar.IsIndeterminate = true;
+        try
+        {
+            var progress = new Progress<ModOperationProgress>(value =>
+            {
+                if (_isClosed)
+                    return;
+                StatusText.Text = value.Message;
+                if (value.Percentage is { } percentage)
+                {
+                    LoadingProgressBar.IsIndeterminate = false;
+                    LoadingProgressBar.Value = percentage;
+                }
+                else
+                {
+                    LoadingProgressBar.IsIndeterminate = true;
+                }
+            });
+            var result = await _installer.InstallAsync(selected.Repository, _game, progress: progress);
+            _installedAny = true;
+            _installedRepositories.Add(selected.Repository);
+            if (_onModInstalled is not null)
+                await _onModInstalled(result.Id);
+            var currentSelection = ModsList.SelectedItem as OnlineModItem;
+            var installedIndex = _visibleMods.IndexOf(selected);
+            _allMods.Remove(selected);
+            _visibleMods.Remove(selected);
+            ModsList.SelectedItem = currentSelection is not null &&
+                !ReferenceEquals(currentSelection, selected) &&
+                _visibleMods.Contains(currentSelection)
+                    ? currentSelection
+                    : _visibleMods.Count == 0
+                        ? null
+                        : _visibleMods[Math.Clamp(installedIndex, 0, _visibleMods.Count - 1)];
+            StatusText.Text = $"{selected.Title} was installed";
+            selected.Dispose();
+        }
+        catch (Exception exception)
+        {
+            StatusText.Text = $"Could not install {selected.Title}: {exception.Message}";
+        }
+        finally
+        {
+            InstallSelectedButton.Content = "Install selected mod";
+            SetInstalling(false);
+        }
+    }
+
+    private void SetCatalogLoading(bool loading)
+    {
+        _isCatalogLoading = loading;
+        LoadingProgressBar.IsVisible = loading || _isInstalling;
+        if (loading)
+        {
+            LoadingProgressBar.Value = 0;
+            LoadingProgressBar.IsIndeterminate = true;
+        }
+        UpdateControlState();
+    }
+
+    private void SetInstalling(bool installing)
+    {
+        _isInstalling = installing;
+        LoadingProgressBar.IsVisible = installing || _isCatalogLoading;
+        if (!installing && !_isCatalogLoading)
+            LoadingProgressBar.IsIndeterminate = false;
+        UpdateControlState();
+    }
+
+    private void UpdateControlState()
+    {
+        SearchTextBox.IsEnabled = true;
+        ModsList.IsEnabled = true;
+        InstallSelectedButton.IsEnabled = !_isInstalling && ModsList.SelectedItem is not null;
+        CloseButton.IsEnabled = !_isInstalling;
+    }
+
+    private void Close_OnClick(object? sender, RoutedEventArgs eventArgs) => Close(_installedAny);
+
+    public void HandleControllerAction(ControllerAction action)
+    {
+        if (ControllerWindowNavigator.TryMoveFocus(this, action))
+            return;
+        else if (action == ControllerAction.Cancel && CloseButton.IsEnabled)
+            Close(_installedAny);
+        else if (action is ControllerAction.Confirm or ControllerAction.Install)
+            ActivateFocusedControl();
+    }
+
+    private void ModsList_OnGotFocus(object? sender, FocusChangedEventArgs eventArgs)
+    {
+        var focused = eventArgs.Source as Control;
+        var item = focused as ListBoxItem ??
+            focused?.GetVisualAncestors().OfType<ListBoxItem>().FirstOrDefault();
+        if (item?.DataContext is { } mod)
+            ModsList.SelectedItem = mod;
+    }
+
+    private void ActivateFocusedControl()
+    {
+        var focused = FocusManager?.GetFocusedElement() as Control;
+        if (focused == CloseButton)
+            Close(_installedAny);
+        else if (focused == InstallSelectedButton || focused == ModsList ||
+                 focused is ListBoxItem ||
+                 focused?.GetVisualAncestors().OfType<ListBoxItem>().Any() == true)
+            InstallSelected_OnClick(InstallSelectedButton, new RoutedEventArgs());
+    }
+
+    private void DisposeImages()
+    {
+        foreach (var mod in _allMods)
+            mod.Dispose();
+    }
+
+    private sealed class OnlineModItem : IDisposable
+    {
+        public OnlineModItem(OnlineModInfo model)
+        {
+            Repository = model.Repository;
+            Title = model.Title;
+            Author = model.Author;
+            Description = model.Description;
+            IconImage = LoadBitmap(model.IconPath, 96);
+            PreviewImage = LoadBitmap(model.PreviewPath, 720);
+        }
+
+        public string Repository { get; }
+        public string Title { get; }
+        public string Author { get; }
+        public string Description { get; }
+        public Bitmap? IconImage { get; }
+        public Bitmap? PreviewImage { get; }
+        public string Initial => string.IsNullOrWhiteSpace(Title) ? "?" : Title[..1].ToUpperInvariant();
+
+        public bool Contains(string term) =>
+            Title.Contains(term, StringComparison.OrdinalIgnoreCase) ||
+            Author.Contains(term, StringComparison.OrdinalIgnoreCase) ||
+            Description.Contains(term, StringComparison.OrdinalIgnoreCase) ||
+            Repository.Contains(term, StringComparison.OrdinalIgnoreCase);
+
+        public void Dispose()
+        {
+            IconImage?.Dispose();
+            PreviewImage?.Dispose();
+        }
+
+        private static Bitmap? LoadBitmap(string? path, int decodeWidth)
+        {
+            if (string.IsNullOrWhiteSpace(path) || !File.Exists(path))
+                return null;
+
+            try
+            {
+                using var stream = File.OpenRead(path);
+                return Bitmap.DecodeToWidth(stream, decodeWidth);
+            }
+            catch
+            {
+                return null;
+            }
+        }
+    }
+}
diff --git a/OpenKh.Tools.ModsManager.Avalonia/Views/PresetsWindow.axaml b/OpenKh.Tools.ModsManager.Avalonia/Views/PresetsWindow.axaml
new file mode 100644
index 000000000..1e6367feb
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Avalonia/Views/PresetsWindow.axaml
@@ -0,0 +1,25 @@
+<views:EmbeddedDialogControl xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:views="using:OpenKh.Tools.ModsManager.Avalonia.Views"
+        x:Class="OpenKh.Tools.ModsManager.Avalonia.Views.PresetsWindow"
+        XYFocus.NavigationModes="Enabled">
+  <Grid Margin="28" RowDefinitions="Auto,18,*,18,Auto,12,Auto">
+    <StackPanel Spacing="5">
+      <TextBlock Text="Presets" FontSize="27" FontWeight="Bold" />
+      <TextBlock Text="Save or restore the enabled mod list for the current game."
+                 Foreground="#AAB9CF" TextWrapping="Wrap" />
+    </StackPanel>
+    <Border Grid.Row="2" Classes="settings-card">
+      <ListBox x:Name="PresetList" SelectionChanged="PresetList_OnSelectionChanged" />
+    </Border>
+    <Grid Grid.Row="4" ColumnDefinitions="*,12,Auto">
+      <TextBox x:Name="PresetNameTextBox" PlaceholderText="New preset name" />
+      <Button x:Name="SavePresetButton" Grid.Column="2" Content="Save Current" Click="SavePreset_OnClick" />
+    </Grid>
+    <StackPanel Grid.Row="6" Orientation="Horizontal" Spacing="12" HorizontalAlignment="Right">
+      <Button x:Name="CloseButton" Content="Close" MinWidth="110" Click="Close_OnClick" />
+      <Button x:Name="RemoveButton" Content="Remove" MinWidth="110" Click="Remove_OnClick" />
+      <Button x:Name="ApplyButton" Classes="primary" Content="Apply" MinWidth="120" Click="Apply_OnClick" />
+    </StackPanel>
+  </Grid>
+</views:EmbeddedDialogControl>
diff --git a/OpenKh.Tools.ModsManager.Avalonia/Views/PresetsWindow.axaml.cs b/OpenKh.Tools.ModsManager.Avalonia/Views/PresetsWindow.axaml.cs
new file mode 100644
index 000000000..b4d849013
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Avalonia/Views/PresetsWindow.axaml.cs
@@ -0,0 +1,111 @@
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+using OpenKh.Tools.ModsManager.Avalonia.Services;
+using OpenKh.Tools.ModsManager.Core;
+
+namespace OpenKh.Tools.ModsManager.Avalonia.Views;
+
+public sealed partial class PresetsWindow : EmbeddedDialogControl
+{
+    private readonly PresetService? _presets;
+    private readonly IReadOnlyCollection<string> _enabledModIds = [];
+
+    public PresetsWindow()
+    {
+        InitializeComponent();
+        RefreshButtons();
+    }
+
+    public PresetsWindow(PresetService presets, IReadOnlyCollection<string> enabledModIds) : this()
+    {
+        _presets = presets;
+        _enabledModIds = enabledModIds;
+        RefreshNames();
+    }
+
+    private void RefreshNames()
+    {
+        if (_presets is null)
+            return;
+        PresetList.ItemsSource = _presets.GetNames();
+        PresetList.SelectedIndex = PresetList.ItemCount > 0 ? 0 : -1;
+        RefreshButtons();
+    }
+
+    private void RefreshButtons()
+    {
+        var selected = PresetList.SelectedItem is string;
+        ApplyButton.IsEnabled = selected;
+        RemoveButton.IsEnabled = selected;
+    }
+
+    private void PresetList_OnSelectionChanged(object? sender, SelectionChangedEventArgs eventArgs) =>
+        RefreshButtons();
+
+    private void SavePreset_OnClick(object? sender, RoutedEventArgs eventArgs)
+    {
+        if (_presets is null)
+            return;
+        try
+        {
+            _presets.Save(PresetNameTextBox.Text ?? "", _enabledModIds);
+            PresetNameTextBox.Text = "";
+            RefreshNames();
+        }
+        catch
+        {
+            PresetNameTextBox.Focus();
+        }
+    }
+
+    private void Apply_OnClick(object? sender, RoutedEventArgs eventArgs)
+    {
+        if (_presets is not null && PresetList.SelectedItem is string name)
+            Close(_presets.Load(name));
+    }
+
+    private void Remove_OnClick(object? sender, RoutedEventArgs eventArgs)
+    {
+        if (_presets is null || PresetList.SelectedItem is not string name)
+            return;
+        _presets.Remove(name);
+        RefreshNames();
+    }
+
+    private void Close_OnClick(object? sender, RoutedEventArgs eventArgs) => Close(null);
+
+    public void HandleControllerAction(ControllerAction action)
+    {
+        if (ControllerWindowNavigator.TryMoveFocus(this, action))
+        {
+            RefreshButtons();
+            return;
+        }
+        if (action is ControllerAction.PreviousControl)
+            ControllerWindowNavigator.MoveFocus(this, -1);
+        else if (action is ControllerAction.NextControl)
+            ControllerWindowNavigator.MoveFocus(this, 1);
+        else if (action is ControllerAction.PreviousItem)
+            PresetList.SelectedIndex = Math.Max(0, PresetList.SelectedIndex - 1);
+        else if (action is ControllerAction.NextItem)
+            PresetList.SelectedIndex = Math.Min(PresetList.ItemCount - 1, PresetList.SelectedIndex + 1);
+        else if (action == ControllerAction.Cancel)
+            Close(null);
+        else if (action == ControllerAction.Confirm)
+            ActivateFocusedControl();
+        RefreshButtons();
+    }
+
+    private void ActivateFocusedControl()
+    {
+        var focused = FocusManager?.GetFocusedElement();
+        if (focused == CloseButton)
+            Close(null);
+        else if (focused == RemoveButton)
+            Remove_OnClick(RemoveButton, new RoutedEventArgs());
+        else if (focused == ApplyButton || focused == PresetList)
+            Apply_OnClick(ApplyButton, new RoutedEventArgs());
+        else if (focused == SavePresetButton)
+            SavePreset_OnClick(SavePresetButton, new RoutedEventArgs());
+    }
+}
diff --git a/OpenKh.Tools.ModsManager.Avalonia/Views/SettingsWindow.axaml b/OpenKh.Tools.ModsManager.Avalonia/Views/SettingsWindow.axaml
new file mode 100644
index 000000000..4f9e7490c
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Avalonia/Views/SettingsWindow.axaml
@@ -0,0 +1,44 @@
+<views:EmbeddedDialogControl xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:views="using:OpenKh.Tools.ModsManager.Avalonia.Views"
+        x:Class="OpenKh.Tools.ModsManager.Avalonia.Views.SettingsWindow"
+        XYFocus.NavigationModes="Enabled">
+  <Grid Margin="28" RowDefinitions="Auto,18,*,18,Auto">
+    <StackPanel Spacing="5">
+      <TextBlock Text="Settings" FontSize="27" FontWeight="Bold" />
+      <TextBlock Text="General Mod Manager and Panacea behavior." Foreground="#AAB9CF" />
+    </StackPanel>
+    <ScrollViewer Grid.Row="2" HorizontalScrollBarVisibility="Disabled">
+      <StackPanel Spacing="18">
+        <Border Classes="settings-card">
+          <StackPanel Spacing="12">
+            <TextBlock Text="Mod Manager" FontSize="18" FontWeight="SemiBold" />
+            <CheckBox x:Name="AutoUpdateModsCheckBox" Content="Check repository mods for updates automatically" />
+            <CheckBox x:Name="EnablePatchingCheckBox" Content="Enable package patching tools" />
+            <Button x:Name="CheckOpenKhUpdatesButton" Content="Check for OpenKH Updates" HorizontalAlignment="Left" Click="CheckOpenKhUpdates_OnClick" />
+            <TextBlock x:Name="UpdateStatusText" Foreground="#91A2BA" TextWrapping="Wrap" />
+            <Button x:Name="InstallOpenKhUpdateButton" Content="Open Launcher to Install Update"
+                    Classes="primary" HorizontalAlignment="Left" IsVisible="False"
+                    Click="InstallOpenKhUpdate_OnClick" />
+          </StackPanel>
+        </Border>
+        <Border Classes="settings-card">
+          <StackPanel Spacing="12">
+            <TextBlock Text="Panacea Settings" FontSize="18" FontWeight="SemiBold" />
+            <TextBlock Text="These values are written to every configured Panacea installation when settings are saved."
+                       Foreground="#91A2BA" FontSize="11" TextWrapping="Wrap" />
+            <CheckBox x:Name="ShowConsoleCheckBox" Content="Enable Console" />
+            <CheckBox x:Name="DebugLogCheckBox" Content="Enable Debug Log" />
+            <CheckBox x:Name="SoundDebugCheckBox" Content="Enable Sound Debug" />
+            <CheckBox x:Name="EnableCacheCheckBox" Content="Enable Cache" />
+            <CheckBox x:Name="QuickMenuCheckBox" Content="Enable Quick Menu" />
+          </StackPanel>
+        </Border>
+      </StackPanel>
+    </ScrollViewer>
+    <StackPanel Grid.Row="4" Orientation="Horizontal" Spacing="12" HorizontalAlignment="Right">
+      <Button x:Name="CancelButton" Content="Cancel" MinWidth="120" Click="Cancel_OnClick" />
+      <Button x:Name="SaveButton" Classes="primary" Content="Save Settings" MinWidth="150" Click="Save_OnClick" />
+    </StackPanel>
+  </Grid>
+</views:EmbeddedDialogControl>
diff --git a/OpenKh.Tools.ModsManager.Avalonia/Views/SettingsWindow.axaml.cs b/OpenKh.Tools.ModsManager.Avalonia/Views/SettingsWindow.axaml.cs
new file mode 100644
index 000000000..e6ea62a60
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Avalonia/Views/SettingsWindow.axaml.cs
@@ -0,0 +1,156 @@
+using System.Diagnostics;
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+using OpenKh.Tools.ModsManager.Avalonia.Services;
+using OpenKh.Tools.ModsManager.Core;
+
+namespace OpenKh.Tools.ModsManager.Avalonia.Views;
+
+public sealed partial class SettingsWindow : EmbeddedDialogControl
+{
+    private readonly ModManagerConfigurationService? _configuration;
+    private readonly PanaceaService? _panacea;
+    private readonly OpenKhUpdateCheckerService? _updateChecker;
+    private string? _updateDownloadUrl;
+
+    public SettingsWindow()
+    {
+        InitializeComponent();
+    }
+
+    public SettingsWindow(
+        ModManagerConfigurationService configuration,
+        PanaceaService panacea,
+        OpenKhUpdateCheckerService updateChecker) : this()
+    {
+        _configuration = configuration;
+        _panacea = panacea;
+        _updateChecker = updateChecker;
+        var settings = configuration.Current;
+        AutoUpdateModsCheckBox.IsChecked = settings.AutoUpdateMods;
+        EnablePatchingCheckBox.IsChecked = settings.EnablePatching;
+        ShowConsoleCheckBox.IsChecked = settings.ShowConsole;
+        DebugLogCheckBox.IsChecked = settings.DebugLog;
+        SoundDebugCheckBox.IsChecked = settings.SoundDebug;
+        EnableCacheCheckBox.IsChecked = settings.EnableCache;
+        QuickMenuCheckBox.IsChecked = settings.QuickMenu;
+    }
+
+    private void Save_OnClick(object? sender, RoutedEventArgs eventArgs)
+    {
+        if (_configuration is null || _panacea is null)
+            return;
+        var settings = _configuration.Current;
+        settings.AutoUpdateMods = AutoUpdateModsCheckBox.IsChecked == true;
+        settings.EnablePatching = EnablePatchingCheckBox.IsChecked == true;
+        settings.ShowConsole = ShowConsoleCheckBox.IsChecked == true;
+        settings.DebugLog = DebugLogCheckBox.IsChecked == true;
+        settings.SoundDebug = SoundDebugCheckBox.IsChecked == true;
+        settings.EnableCache = EnableCacheCheckBox.IsChecked == true;
+        settings.QuickMenu = QuickMenuCheckBox.IsChecked == true;
+        _panacea.SaveSettings();
+        Close(true);
+    }
+
+    private async void CheckOpenKhUpdates_OnClick(object? sender, RoutedEventArgs eventArgs)
+    {
+        if (_updateChecker is null)
+            return;
+
+        CheckOpenKhUpdatesButton.IsEnabled = false;
+        InstallOpenKhUpdateButton.IsVisible = false;
+        UpdateStatusText.Text = "Checking the complete OpenKH package for updates...";
+        try
+        {
+            var result = await _updateChecker.CheckAsync();
+            _updateDownloadUrl = result.DownloadUrl;
+            if (result.HasUpdate)
+            {
+                UpdateStatusText.Text = $"OpenKH update available. Current: {result.CurrentVersion}. Latest: {result.LatestVersion}.";
+                InstallOpenKhUpdateButton.IsVisible = true;
+            }
+            else if (string.IsNullOrWhiteSpace(result.LatestVersion))
+            {
+                UpdateStatusText.Text = "No compatible OpenKH release package was found.";
+            }
+            else
+            {
+                UpdateStatusText.Text = $"The complete OpenKH package is up to date ({result.CurrentVersion}).";
+            }
+        }
+        catch (Exception exception)
+        {
+            UpdateStatusText.Text = $"OpenKH update check failed: {exception.Message}";
+        }
+        finally
+        {
+            CheckOpenKhUpdatesButton.IsEnabled = true;
+        }
+    }
+
+    private void InstallOpenKhUpdate_OnClick(object? sender, RoutedEventArgs eventArgs)
+    {
+        if (_configuration is null)
+            return;
+
+        try
+        {
+            var launcherPath = OpenKhUpdateEnvironment.FindLauncher(
+                _configuration.InstallationDirectory,
+                AppContext.BaseDirectory);
+            if (launcherPath is not null)
+            {
+                Process.Start(new ProcessStartInfo(launcherPath)
+                {
+                    UseShellExecute = false,
+                    WorkingDirectory = Path.GetDirectoryName(launcherPath)
+                });
+                UpdateStatusText.Text = "The OpenKH Launcher was opened. Use its update button to install the complete package.";
+                return;
+            }
+
+            if (!string.IsNullOrWhiteSpace(_updateDownloadUrl))
+            {
+                Process.Start(new ProcessStartInfo(_updateDownloadUrl) { UseShellExecute = true });
+                UpdateStatusText.Text = "The complete OpenKH package download was opened in your browser.";
+            }
+        }
+        catch (Exception exception)
+        {
+            UpdateStatusText.Text = $"Could not open the OpenKH updater: {exception.Message}";
+        }
+    }
+
+    private void Cancel_OnClick(object? sender, RoutedEventArgs eventArgs) => Close(false);
+
+    public void HandleControllerAction(ControllerAction action)
+    {
+        if (ControllerWindowNavigator.TryMoveFocus(this, action))
+            return;
+        if (action is ControllerAction.PreviousControl or ControllerAction.PreviousItem)
+            ControllerWindowNavigator.MoveFocus(this, -1);
+        else if (action is ControllerAction.NextControl or ControllerAction.NextItem)
+            ControllerWindowNavigator.MoveFocus(this, 1);
+        else if (action == ControllerAction.Cancel)
+            Close(false);
+        else if (action == ControllerAction.Confirm)
+            ActivateFocusedControl();
+    }
+
+    private void ActivateFocusedControl()
+    {
+        var focused = FocusManager?.GetFocusedElement();
+        if (focused == SaveButton)
+            Save_OnClick(SaveButton, new RoutedEventArgs());
+        else if (focused == CancelButton)
+            Close(false);
+        else if (focused == CheckOpenKhUpdatesButton)
+            CheckOpenKhUpdates_OnClick(CheckOpenKhUpdatesButton, new RoutedEventArgs());
+        else if (focused == InstallOpenKhUpdateButton)
+            InstallOpenKhUpdate_OnClick(InstallOpenKhUpdateButton, new RoutedEventArgs());
+        else if (focused is CheckBox checkBox)
+            checkBox.IsChecked = checkBox.IsChecked != true;
+        else
+            ControllerWindowNavigator.MoveFocus(this, 1);
+    }
+}
diff --git a/OpenKh.Tools.ModsManager.Avalonia/Views/SetupWindow.axaml b/OpenKh.Tools.ModsManager.Avalonia/Views/SetupWindow.axaml
new file mode 100644
index 000000000..8dbb5f0db
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Avalonia/Views/SetupWindow.axaml
@@ -0,0 +1,291 @@
+<views:EmbeddedDialogControl xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:views="using:OpenKh.Tools.ModsManager.Avalonia.Views"
+        x:Class="OpenKh.Tools.ModsManager.Avalonia.Views.SetupWindow"
+        XYFocus.NavigationModes="Enabled">
+  <Grid Margin="28" RowDefinitions="Auto,18,*,18,Auto">
+    <StackPanel Spacing="5">
+      <TextBlock Text="Setup" FontSize="30" FontWeight="Bold" />
+      <TextBlock Text="Configure game locations, loaders, and extracted data."
+                 Foreground="#AAB9CF" TextWrapping="Wrap" />
+    </StackPanel>
+
+    <ScrollViewer x:Name="SetupScrollViewer"
+                  Grid.Row="2"
+                  HorizontalScrollBarVisibility="Disabled"
+                  HorizontalContentAlignment="Stretch">
+      <StackPanel Spacing="18" Width="{Binding Bounds.Width, ElementName=SetupScrollViewer}">
+        <Border Classes="settings-card">
+          <StackPanel Spacing="12">
+            <TextBlock Text="Game Edition" FontSize="18" FontWeight="SemiBold" />
+            <ComboBox x:Name="GameEditionComboBox" SelectedIndex="{Binding GameEdition}" SelectionChanged="GameEdition_OnSelectionChanged">
+              <ComboBoxItem Content="PC Release" />
+              <ComboBoxItem Content="PCSX2" />
+            </ComboBox>
+          </StackPanel>
+        </Border>
+
+        <Border Classes="settings-card">
+          <StackPanel Spacing="12">
+            <TextBlock Text="Storage Locations" FontSize="18" FontWeight="SemiBold" />
+            <TextBlock Text="The standard OpenKH folders are used unless custom locations are configured below."
+                       Foreground="#91A2BA" FontSize="11" TextWrapping="Wrap" />
+            <Expander x:Name="AdvancedStorageExpander" Header="Advanced Storage Locations">
+              <StackPanel Spacing="10" Margin="0,10,0,0">
+                <TextBlock Text="Installed Mods Folder" FontWeight="SemiBold" />
+                <Grid ColumnDefinitions="*,12,130">
+                  <TextBox x:Name="ModStorageTextBox" Text="{Binding ModCollectionPath}" PlaceholderText="Use OpenKH/mods" />
+                  <Button Grid.Column="2" Content="Browse" Tag="ModStorageTextBox" Click="BrowseFolder_OnClick" />
+                </Grid>
+                <TextBlock Text="Installed Collections Folder" FontWeight="SemiBold" />
+                <Grid ColumnDefinitions="*,12,130">
+                  <TextBox x:Name="CollectionStorageTextBox" Text="{Binding ModCollectionsPath}" PlaceholderText="Use OpenKH/mods/collections" />
+                  <Button Grid.Column="2" Content="Browse" Tag="CollectionStorageTextBox" Click="BrowseFolder_OnClick" />
+                </Grid>
+                <TextBlock Text="Built Mods Folder" FontWeight="SemiBold" />
+                <Grid ColumnDefinitions="*,12,130">
+                  <TextBox x:Name="BuiltModsTextBox" Text="{Binding GameModPath}" PlaceholderText="Use OpenKH/mod" />
+                  <Button Grid.Column="2" Content="Browse" Tag="BuiltModsTextBox" Click="BrowseFolder_OnClick" />
+                </Grid>
+                <TextBlock Text="If installed and built mods share a custom folder, OpenKH keeps them in separate mods and mod subfolders."
+                           Foreground="#91A2BA" FontSize="11" TextWrapping="Wrap" />
+              </StackPanel>
+            </Expander>
+          </StackPanel>
+        </Border>
+
+        <Border Classes="settings-card" IsVisible="{Binding IsPcMode}">
+          <StackPanel Spacing="12">
+            <TextBlock Text="PC Release" FontSize="18" FontWeight="SemiBold" />
+            <Grid ColumnDefinitions="*">
+              <StackPanel Spacing="6">
+                <TextBlock Text="PC Platform" FontWeight="SemiBold" />
+                <ComboBox x:Name="PcVersionComboBox" SelectedIndex="{Binding PcVersionIndex}" SelectionChanged="PcVersion_OnSelectionChanged">
+                  <ComboBoxItem Content="Epic Games Store" />
+                  <ComboBoxItem Content="Steam" />
+                  <ComboBoxItem Content="Other" />
+                </ComboBox>
+              </StackPanel>
+            </Grid>
+            <Button x:Name="DetectInstallationsButton"
+                    Content="Detect Installations"
+                    HorizontalAlignment="Left"
+                    Click="DetectInstallations_OnClick" />
+            <TextBlock x:Name="DetectionStatusText"
+                       Foreground="#91A2BA"
+                       FontSize="11"
+                       TextWrapping="Wrap" />
+            <Border Background="#111C2E" CornerRadius="10" Padding="14">
+              <StackPanel Spacing="8">
+                <TextBlock Text="Game Version" FontWeight="SemiBold" />
+                <TextBlock Text="Select which PC release files are installed. Steam Global installations use the dt folder automatically."
+                           Foreground="#91A2BA" FontSize="11" TextWrapping="Wrap" />
+                <ComboBox x:Name="LanguageComboBox" SelectedIndex="{Binding LanguageIndex}">
+                  <ComboBoxItem Content="Global Version" />
+                  <ComboBoxItem Content="Japanese Version" />
+                </ComboBox>
+              </StackPanel>
+            </Border>
+            <TextBlock Text="KINGDOM HEARTS HD 1.5+2.5 ReMIX folder" FontWeight="SemiBold" TextWrapping="Wrap" />
+            <Grid ColumnDefinitions="*,12,130">
+              <TextBox x:Name="PcReleaseTextBox" Text="{Binding PcReleaseLocation}" TextChanged="PcReleaseLocation_OnTextChanged" />
+              <Button Grid.Column="2" Content="Browse" Tag="PcReleaseTextBox" Click="BrowseFolder_OnClick" />
+            </Grid>
+            <TextBlock Text="KINGDOM HEARTS HD 2.8 Final Chapter Prologue folder" FontWeight="SemiBold" TextWrapping="Wrap" />
+            <Grid ColumnDefinitions="*,12,130">
+              <TextBox x:Name="PcReleaseKh3DTextBox" Text="{Binding PcReleaseLocationKh3D}" TextChanged="PcReleaseLocation_OnTextChanged" />
+              <Button Grid.Column="2" Content="Browse" Tag="PcReleaseKh3DTextBox" Click="BrowseFolder_OnClick" />
+            </Grid>
+            <TextBlock Text="OpenKH Panacea" FontSize="16" FontWeight="SemiBold" Margin="0,8,0,0" />
+            <TextBlock Text="Panacea loads built mods without permanently patching the game packages. Install it separately for each collection you use."
+                       Foreground="#91A2BA" FontSize="11" TextWrapping="Wrap" />
+            <Border Background="#111C2E" CornerRadius="10" Padding="14">
+              <Grid ColumnDefinitions="*,12,Auto">
+                <StackPanel Spacing="3">
+                  <TextBlock Text="HD 1.5+2.5 ReMIX" FontWeight="SemiBold" />
+                  <TextBlock x:Name="Panacea1525StatusText" Foreground="#91A2BA" FontSize="11" TextWrapping="Wrap" />
+                </StackPanel>
+                <Button x:Name="Panacea1525ActionButton" Grid.Column="2" Tag="1525" Click="ManagePanacea_OnClick" />
+              </Grid>
+            </Border>
+            <Border Background="#111C2E" CornerRadius="10" Padding="14">
+              <Grid ColumnDefinitions="*,12,Auto">
+                <StackPanel Spacing="3">
+                  <TextBlock Text="HD 2.8 Final Chapter Prologue" FontWeight="SemiBold" />
+                  <TextBlock x:Name="Panacea28StatusText" Foreground="#91A2BA" FontSize="11" TextWrapping="Wrap" />
+                </StackPanel>
+                <Button x:Name="Panacea28ActionButton" Grid.Column="2" Tag="28" Click="ManagePanacea_OnClick" />
+              </Grid>
+            </Border>
+            <TextBlock Text="Lua Backend" FontSize="16" FontWeight="SemiBold" Margin="0,8,0,0" />
+            <TextBlock Text="Lua Backend loads scripts installed by OpenKH mods. Select the games whose generated script folders should be added to its configuration."
+                       Foreground="#91A2BA" FontSize="11" TextWrapping="Wrap" />
+            <Border Background="#111C2E" CornerRadius="10" Padding="14">
+              <StackPanel Spacing="10">
+                <Grid ColumnDefinitions="*,12,Auto,8,Auto">
+                  <StackPanel Spacing="3">
+                    <TextBlock Text="HD 1.5+2.5 ReMIX" FontWeight="SemiBold" />
+                    <TextBlock x:Name="LuaBackend1525StatusText" Foreground="#91A2BA" FontSize="11" TextWrapping="Wrap" />
+                  </StackPanel>
+                  <Button x:Name="LuaBackend1525ActionButton" Grid.Column="2" Tag="1525" Click="ManageLuaBackend_OnClick" />
+                  <Button x:Name="LuaBackend1525RemoveButton" Grid.Column="4" Tag="1525" Content="Remove"
+                          Click="RemoveLuaBackend_OnClick" />
+                </Grid>
+                <WrapPanel Orientation="Horizontal">
+                  <CheckBox x:Name="LuaKh1CheckBox" Content="KH1" Margin="0,0,16,4" />
+                  <CheckBox x:Name="LuaKh2CheckBox" Content="KH2" Margin="0,0,16,4" />
+                  <CheckBox x:Name="LuaBbsCheckBox" Content="BBS" Margin="0,0,16,4" />
+                  <CheckBox x:Name="LuaRecomCheckBox" Content="Re:CoM" Margin="0,0,16,4" />
+                </WrapPanel>
+              </StackPanel>
+            </Border>
+            <Border Background="#111C2E" CornerRadius="10" Padding="14">
+              <StackPanel Spacing="10">
+                <Grid ColumnDefinitions="*,12,Auto,8,Auto">
+                  <StackPanel Spacing="3">
+                    <TextBlock Text="HD 2.8 Final Chapter Prologue" FontWeight="SemiBold" />
+                    <TextBlock x:Name="LuaBackend28StatusText" Foreground="#91A2BA" FontSize="11" TextWrapping="Wrap" />
+                  </StackPanel>
+                  <Button x:Name="LuaBackend28ActionButton" Grid.Column="2" Tag="28" Click="ManageLuaBackend_OnClick" />
+                  <Button x:Name="LuaBackend28RemoveButton" Grid.Column="4" Tag="28" Content="Remove"
+                          Click="RemoveLuaBackend_OnClick" />
+                </Grid>
+                <CheckBox x:Name="LuaKh3DCheckBox" Content="Dream Drop Distance" />
+              </StackPanel>
+            </Border>
+            <Border Background="#111C2E" CornerRadius="10" Padding="14" IsVisible="{Binding IsSteamPlatform}">
+              <StackPanel Spacing="10">
+                <TextBlock Text="Direct Steam Launch" FontSize="16" FontWeight="SemiBold" />
+                <TextBlock Text="Creating steam_appid.txt lets the Mod Manager launch a game executable directly. Steam must already be running."
+                           Foreground="#91A2BA" FontSize="11" TextWrapping="Wrap" />
+                <Grid ColumnDefinitions="*,12,Auto">
+                  <StackPanel Spacing="3">
+                    <TextBlock Text="HD 1.5+2.5 ReMIX" FontWeight="SemiBold" />
+                    <TextBlock x:Name="SteamAppId1525StatusText" Foreground="#91A2BA" FontSize="11" />
+                  </StackPanel>
+                  <Button x:Name="SteamAppId1525Button" Grid.Column="2" Tag="1525" Click="SteamAppId_OnClick" />
+                </Grid>
+                <Grid ColumnDefinitions="*,12,Auto">
+                  <StackPanel Spacing="3">
+                    <TextBlock Text="HD 2.8 Final Chapter Prologue" FontWeight="SemiBold" />
+                    <TextBlock x:Name="SteamAppId28StatusText" Foreground="#91A2BA" FontSize="11" />
+                  </StackPanel>
+                  <Button x:Name="SteamAppId28Button" Grid.Column="2" Tag="28" Click="SteamAppId_OnClick" />
+                </Grid>
+              </StackPanel>
+            </Border>
+          </StackPanel>
+        </Border>
+
+        <Border Classes="settings-card" IsVisible="{Binding IsPcsx2Mode}">
+          <StackPanel Spacing="12">
+            <TextBlock Text="PCSX2" FontSize="18" FontWeight="SemiBold" />
+            <TextBlock Text="PCSX2 Executable" FontWeight="SemiBold" />
+            <Grid ColumnDefinitions="*,12,130">
+              <TextBox x:Name="Pcsx2TextBox" Text="{Binding Pcsx2Location}" />
+              <Button Grid.Column="2" Content="Browse" Tag="Pcsx2TextBox" Click="BrowseFile_OnClick" />
+            </Grid>
+            <TextBlock Text="PS2 Region and Language" FontWeight="SemiBold" />
+            <TextBlock Text="This controls the region and language values injected while the game is running."
+                       Foreground="#91A2BA" FontSize="11" TextWrapping="Wrap" />
+            <ComboBox SelectedIndex="{Binding RegionId}">
+              <ComboBoxItem Content="Default" />
+              <ComboBoxItem Content="Japanese" />
+              <ComboBoxItem Content="English (US)" />
+              <ComboBoxItem Content="English (UK)" />
+              <ComboBoxItem Content="Italian" />
+              <ComboBoxItem Content="Spanish" />
+              <ComboBoxItem Content="German" />
+              <ComboBoxItem Content="French" />
+              <ComboBoxItem Content="Final Mix" />
+            </ComboBox>
+            <TextBlock Text="Kingdom Hearts II ISO" FontWeight="SemiBold" />
+            <Grid ColumnDefinitions="*,12,130">
+              <TextBox x:Name="Kh2IsoTextBox" Text="{Binding IsoLocationKh2}" TextChanged="ExtractionSource_OnTextChanged" />
+              <Button Grid.Column="2" Content="Browse" Tag="Kh2IsoTextBox" Click="BrowseFile_OnClick" />
+            </Grid>
+            <TextBlock Text="Kingdom Hearts ISO" FontWeight="SemiBold" />
+            <Grid ColumnDefinitions="*,12,130">
+              <TextBox x:Name="Kh1IsoTextBox" Text="{Binding IsoLocationKh1}" TextChanged="ExtractionSource_OnTextChanged" />
+              <Button Grid.Column="2" Content="Browse" Tag="Kh1IsoTextBox" Click="BrowseFile_OnClick" />
+            </Grid>
+            <TextBlock Text="Re:Chain of Memories ISO" FontWeight="SemiBold" />
+            <Grid ColumnDefinitions="*,12,130">
+              <TextBox x:Name="RecomIsoTextBox" Text="{Binding IsoLocationRecom}" TextChanged="ExtractionSource_OnTextChanged" />
+              <Button Grid.Column="2" Content="Browse" Tag="RecomIsoTextBox" Click="BrowseFile_OnClick" />
+            </Grid>
+          </StackPanel>
+        </Border>
+
+        <Border Classes="settings-card">
+          <StackPanel Spacing="12">
+            <TextBlock Text="Game Data" FontSize="18" FontWeight="SemiBold" />
+            <TextBlock x:Name="PcExtractionHelpText"
+                       IsVisible="{Binding IsPcMode}"
+                       Text="OpenKH can extract every game in the 1.5+2.5 collection and Dream Drop Distance from the 2.8 collection. Select the games you want to extract. Size values are rounded up."
+                       Foreground="#AAB9CF" TextWrapping="Wrap" />
+            <TextBlock x:Name="Pcsx2ExtractionHelpText"
+                       IsVisible="{Binding IsPcsx2Mode}"
+                       Text="OpenKH can extract Kingdom Hearts, Kingdom Hearts II, and Re:Chain of Memories from their respective ISO files. Size values are estimates rounded up from known unmodified ISO files."
+                       Foreground="#AAB9CF" TextWrapping="Wrap" />
+            <WrapPanel Orientation="Horizontal">
+              <CheckBox x:Name="ExtractKh1CheckBox" IsChecked="{Binding ExtractKh1}" Margin="0,0,16,6" />
+              <CheckBox x:Name="ExtractKh2CheckBox" IsChecked="{Binding ExtractKh2}" Margin="0,0,16,6" />
+              <CheckBox x:Name="ExtractBbsCheckBox" IsChecked="{Binding ExtractBbs}" IsVisible="{Binding IsPcMode}" Margin="0,0,16,6" />
+              <CheckBox x:Name="ExtractRecomCheckBox" IsChecked="{Binding ExtractRecom}" Margin="0,0,16,6" />
+              <CheckBox x:Name="ExtractKh3DCheckBox" IsChecked="{Binding ExtractKh3D}" IsVisible="{Binding IsPcMode}" Margin="0,0,16,6" />
+            </WrapPanel>
+            <TextBlock Text="Extraction Folder Location" FontWeight="SemiBold" />
+            <Grid ColumnDefinitions="*,12,130">
+              <TextBox x:Name="GameDataTextBox" Text="{Binding GameDataPath}" PlaceholderText="Use OpenKH/data"
+                       TextChanged="ExtractionSource_OnTextChanged" />
+              <Button Grid.Column="2" Content="Browse" Tag="GameDataTextBox" Click="BrowseFolder_OnClick" />
+            </Grid>
+            <TextBlock x:Name="ExistingDataStatusText" Foreground="#91A2BA" TextWrapping="Wrap" />
+            <TextBlock Foreground="#C4D0E1" FontSize="11" TextWrapping="Wrap">
+              <Run Text="WARNING:" Foreground="#FFD166" FontWeight="Bold" />
+              <Run Text=" If you do not extract a game's data, only Lua script mods will function properly." />
+            </TextBlock>
+            <StackPanel IsVisible="{Binding IsPcMode}" Spacing="6">
+              <TextBlock Foreground="#C4D0E1" FontSize="11" TextWrapping="Wrap">
+                <Run Text="WARNING:" Foreground="#FFD166" FontWeight="Bold" />
+                <Run Text=" Remastered files account for about 80% of the listed extraction size. You can skip them to save space, but the consequences depend on the game:" />
+              </TextBlock>
+              <TextBlock Text="KH1: Remastered files include important data required for modifications beyond visual changes."
+                         Foreground="#C4D0E1" FontSize="11" TextWrapping="Wrap" Margin="12,0,0,0" />
+              <TextBlock Text="KH2: Remastered files contain images, so some mods may have missing or incorrect visuals."
+                         Foreground="#C4D0E1" FontSize="11" TextWrapping="Wrap" Margin="12,0,0,0" />
+              <TextBlock Text="Other games: Compatibility depends on the mod because their remastered files may also contain required data."
+                         Foreground="#C4D0E1" FontSize="11" TextWrapping="Wrap" Margin="12,0,0,0" />
+              <CheckBox IsChecked="{Binding SkipRemastered}" Content="Skip Extracting Remastered Files" />
+            </StackPanel>
+            <TextBlock x:Name="ExtractionAvailabilityText" Foreground="#91A2BA" FontSize="11" TextWrapping="Wrap" />
+            <TextBlock Text="Extraction can take between 5 and 15 minutes, or longer when several games are selected."
+                       Foreground="#91A2BA" FontSize="11" TextWrapping="Wrap" />
+            <Button x:Name="ExtractGameDataButton"
+                    Content="Extract Game Data"
+                    HorizontalAlignment="Left"
+                    Click="ExtractGameData_OnClick" />
+            <ProgressBar x:Name="ExtractionProgressBar" Minimum="0" Maximum="1" Value="0" Height="10" IsVisible="False" />
+            <TextBlock x:Name="ExtractionStatusText" Foreground="#91A2BA" TextWrapping="Wrap" />
+          </StackPanel>
+        </Border>
+
+        <Border Classes="settings-card">
+          <StackPanel Spacing="10">
+            <TextBlock Text="Preferences" FontSize="18" FontWeight="SemiBold" />
+            <CheckBox IsChecked="{Binding AutoUpdateMods}" Content="Check repository mods for updates automatically" />
+            <CheckBox IsChecked="{Binding EnableCache}" Content="Use the patcher cache" />
+            <CheckBox IsChecked="{Binding ShowConsole}" Content="Show the game console when supported" />
+            <CheckBox IsChecked="{Binding DebugLog}" Content="Enable debug logging" />
+          </StackPanel>
+        </Border>
+      </StackPanel>
+    </ScrollViewer>
+
+    <StackPanel Grid.Row="4" Orientation="Horizontal" Spacing="12" HorizontalAlignment="Right">
+      <Button x:Name="CancelButton" Content="Cancel" MinWidth="120" Click="Cancel_OnClick" />
+      <Button x:Name="SaveButton" Classes="primary" Content="Save Setup" MinWidth="150" Click="Save_OnClick" />
+    </StackPanel>
+  </Grid>
+</views:EmbeddedDialogControl>
diff --git a/OpenKh.Tools.ModsManager.Avalonia/Views/SetupWindow.axaml.cs b/OpenKh.Tools.ModsManager.Avalonia/Views/SetupWindow.axaml.cs
new file mode 100644
index 000000000..c0fad1e2b
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Avalonia/Views/SetupWindow.axaml.cs
@@ -0,0 +1,698 @@
+using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
+using Avalonia;
+using Avalonia.Interactivity;
+using Avalonia.Platform.Storage;
+using Avalonia.Media;
+using Avalonia.Threading;
+using Avalonia.VisualTree;
+using OpenKh.Tools.ModsManager.Avalonia.ViewModels;
+using OpenKh.Tools.ModsManager.Core;
+using OpenKh.Tools.ModsManager.Avalonia.Services;
+
+namespace OpenKh.Tools.ModsManager.Avalonia.Views;
+
+public sealed partial class SetupWindow : EmbeddedDialogControl
+{
+    private PanaceaService? _panacea;
+    private LuaBackendService? _luaBackend;
+    private GameExtractionService? _extraction;
+    private ModManagerConfigurationService? _configuration;
+    private IUserDialogService? _dialogs;
+    private readonly GameInstallationDetectionService _installationDetector = new();
+    private readonly SteamAppIdService _steamAppId = new();
+    private ComboBox? _activeComboBox;
+
+    public SetupWindow()
+    {
+        InitializeComponent();
+        var configuration = new ModManagerConfigurationService(
+            InstallationLayout.Detect(AppContext.BaseDirectory));
+        Initialize(
+            configuration,
+            new PanaceaService(configuration),
+            new LuaBackendService(configuration),
+            new GameExtractionService(configuration));
+    }
+
+    public SetupWindow(
+        ModManagerConfigurationService configuration,
+        PanaceaService panacea,
+        LuaBackendService luaBackend,
+        GameExtractionService extraction,
+        IUserDialogService? dialogs = null)
+    {
+        InitializeComponent();
+        Initialize(configuration, panacea, luaBackend, extraction, dialogs);
+    }
+
+    private void Initialize(
+        ModManagerConfigurationService configuration,
+        PanaceaService panacea,
+        LuaBackendService luaBackend,
+        GameExtractionService extraction,
+        IUserDialogService? dialogs = null)
+    {
+        _configuration = configuration;
+        _panacea = panacea;
+        _luaBackend = luaBackend;
+        _extraction = extraction;
+        _dialogs = dialogs;
+        DataContext = new SetupWindowViewModel(configuration);
+        Opened += (_, _) =>
+        {
+            SetupScrollViewer.Offset = Vector.Zero;
+            GameEditionComboBox.Focus();
+        };
+        RefreshPanaceaStatus();
+        RefreshLuaBackendStatus();
+        RefreshSteamAppIdStatus();
+        RefreshExtractionAvailability();
+    }
+
+    private async void BrowseFolder_OnClick(object? sender, RoutedEventArgs eventArgs)
+    {
+        if (sender is not Button { Tag: string textBoxName } || GetPathTextBox(textBoxName) is not { } textBox)
+            return;
+
+        var folders = await StorageProvider.OpenFolderPickerAsync(new FolderPickerOpenOptions
+        {
+            Title = "Choose a folder",
+            AllowMultiple = false
+        });
+        if (folders.Count > 0 && folders[0].TryGetLocalPath() is { } path)
+        {
+            textBox.Text = path;
+            RefreshExtractionAvailability();
+        }
+    }
+
+    private async void BrowseFile_OnClick(object? sender, RoutedEventArgs eventArgs)
+    {
+        if (sender is not Button { Tag: string textBoxName } || GetPathTextBox(textBoxName) is not { } textBox)
+            return;
+
+        var files = await StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions
+        {
+            Title = "Choose a file",
+            AllowMultiple = false
+        });
+        if (files.Count > 0 && files[0].TryGetLocalPath() is { } path)
+        {
+            textBox.Text = path;
+            RefreshExtractionAvailability();
+        }
+    }
+
+    private void Save_OnClick(object? sender, RoutedEventArgs eventArgs)
+    {
+        if (DataContext is SetupWindowViewModel viewModel)
+            viewModel.Save();
+        Close(true);
+    }
+
+    private void Cancel_OnClick(object? sender, RoutedEventArgs eventArgs) => Close(false);
+
+    private void PcReleaseLocation_OnTextChanged(object? sender, TextChangedEventArgs eventArgs) =>
+        RefreshInstallationStatuses();
+
+    private void ExtractionSource_OnTextChanged(object? sender, TextChangedEventArgs eventArgs) =>
+        RefreshExtractionAvailability();
+
+    private void GameEdition_OnSelectionChanged(object? sender, SelectionChangedEventArgs eventArgs) =>
+        RefreshExtractionAvailability();
+
+    private void PcVersion_OnSelectionChanged(object? sender, SelectionChangedEventArgs eventArgs) =>
+        RefreshInstallationStatuses();
+
+    private void RefreshInstallationStatuses()
+    {
+        RefreshPanaceaStatus();
+        RefreshLuaBackendStatus();
+        RefreshSteamAppIdStatus();
+        RefreshExtractionAvailability();
+    }
+
+    private void DetectInstallations_OnClick(object? sender, RoutedEventArgs eventArgs)
+    {
+        if (DataContext is not SetupWindowViewModel viewModel)
+            return;
+
+        var platform = viewModel.PcVersionIndex switch
+        {
+            0 => "EGS",
+            1 => "Steam",
+            _ => "Other"
+        };
+        var result = _installationDetector.Detect(platform);
+        if (!string.IsNullOrWhiteSpace(result.RemixDirectory))
+            viewModel.PcReleaseLocation = result.RemixDirectory;
+        if (!string.IsNullOrWhiteSpace(result.Kh3DDirectory))
+            viewModel.PcReleaseLocationKh3D = result.Kh3DDirectory;
+        DetectionStatusText.Text = result.Message;
+        DetectionStatusText.Foreground = global::Avalonia.Media.Brush.Parse(
+            result.RemixDirectory is not null || result.Kh3DDirectory is not null ? "#62D6A7" : "#F1B86B");
+        RefreshInstallationStatuses();
+    }
+
+    private void SteamAppId_OnClick(object? sender, RoutedEventArgs eventArgs)
+    {
+        if (sender is not Button { Tag: string target } || DataContext is not SetupWindowViewModel viewModel)
+            return;
+        var isKh3D = target == "28";
+        var releaseDirectory = GetPcReleaseDirectory(isKh3D);
+        try
+        {
+            var installed = _steamAppId.IsInstalled(releaseDirectory, isKh3D);
+            if (installed)
+                _steamAppId.Remove(releaseDirectory, isKh3D);
+            else
+                _steamAppId.Install(releaseDirectory, isKh3D);
+            if (isKh3D)
+                viewModel.SteamApiTrick28 = !installed;
+            else
+                viewModel.SteamApiTrick1525 = !installed;
+        }
+        catch (Exception exception)
+        {
+            var statusText = isKh3D ? SteamAppId28StatusText : SteamAppId1525StatusText;
+            statusText.Text = exception.Message;
+            statusText.Foreground = global::Avalonia.Media.Brush.Parse("#FF8B8B");
+            return;
+        }
+        RefreshSteamAppIdStatus();
+    }
+
+    private void RefreshSteamAppIdStatus()
+    {
+        if (SteamAppId1525Button is null || SteamAppId28Button is null)
+            return;
+        ApplySteamAppIdStatus(false);
+        ApplySteamAppIdStatus(true);
+    }
+
+    private void ApplySteamAppIdStatus(bool isKh3D)
+    {
+        var releaseDirectory = GetPcReleaseDirectory(isKh3D);
+        var validDirectory = !string.IsNullOrWhiteSpace(releaseDirectory) && Directory.Exists(releaseDirectory);
+        var installed = validDirectory && _steamAppId.IsInstalled(releaseDirectory, isKh3D);
+        if (DataContext is SetupWindowViewModel viewModel)
+        {
+            if (isKh3D)
+                viewModel.SteamApiTrick28 = installed;
+            else
+                viewModel.SteamApiTrick1525 = installed;
+        }
+        var statusText = isKh3D ? SteamAppId28StatusText : SteamAppId1525StatusText;
+        var button = isKh3D ? SteamAppId28Button : SteamAppId1525Button;
+        statusText.Text = validDirectory
+            ? installed ? "Direct launch is configured" : "Direct launch is not configured"
+            : "Configure the game folder first";
+        statusText.Foreground = global::Avalonia.Media.Brush.Parse(installed ? "#62D6A7" : "#91A2BA");
+        button.Content = installed ? "Remove" : "Create";
+        button.IsEnabled = validDirectory;
+    }
+
+    private async void ManagePanacea_OnClick(object? sender, RoutedEventArgs eventArgs)
+    {
+        if (_panacea is null || sender is not Button { Tag: string target } button)
+            return;
+        SetPanaceaButtonsEnabled(false);
+        var succeeded = false;
+        string? errorMessage = null;
+        var isKh3D = target == "28";
+        var releaseDirectory = GetPcReleaseDirectory(isKh3D);
+        var wasInstalled = _panacea.GetStatus(isKh3D, releaseDirectory).IsInstalled;
+        try
+        {
+            if (wasInstalled)
+                await _panacea.RemoveAsync(isKh3D, releaseDirectory);
+            else
+                await _panacea.InstallAsync(isKh3D, releaseDirectory);
+            succeeded = true;
+        }
+        catch (Exception exception)
+        {
+            errorMessage = exception.Message;
+        }
+        finally
+        {
+            SetPanaceaButtonsEnabled(true);
+            if (succeeded)
+                RefreshPanaceaStatus();
+            else if (errorMessage is not null)
+                SetPanaceaStatus(isKh3D, errorMessage, wasInstalled, false);
+            button.Focus();
+        }
+    }
+
+    private void RefreshPanaceaStatus()
+    {
+        if (_panacea is null)
+            return;
+        ApplyPanaceaStatus(false, _panacea.GetStatus(false, GetPcReleaseDirectory(false)));
+        ApplyPanaceaStatus(true, _panacea.GetStatus(true, GetPcReleaseDirectory(true)));
+    }
+
+    private string? GetPcReleaseDirectory(bool isKh3D) =>
+        isKh3D ? PcReleaseKh3DTextBox?.Text : PcReleaseTextBox?.Text;
+
+    private void ApplyPanaceaStatus(bool isKh3D, PanaceaStatus status)
+    {
+        SetPanaceaStatus(isKh3D, status.Message, status.IsInstalled, status.CanInstall);
+        var actionButton = isKh3D ? Panacea28ActionButton : Panacea1525ActionButton;
+        actionButton.Content = status.IsInstalled ? "Remove" : "Install";
+    }
+
+    private void SetPanaceaStatus(bool isKh3D, string message, bool installed, bool canInstall)
+    {
+        var statusText = isKh3D ? Panacea28StatusText : Panacea1525StatusText;
+        var actionButton = isKh3D ? Panacea28ActionButton : Panacea1525ActionButton;
+        statusText.Text = message;
+        statusText.Foreground = global::Avalonia.Media.Brush.Parse(installed ? "#62D6A7" : "#91A2BA");
+        actionButton.IsEnabled = installed || canInstall;
+    }
+
+    private void SetPanaceaButtonsEnabled(bool enabled)
+    {
+        Panacea1525ActionButton.IsEnabled = enabled;
+        Panacea28ActionButton.IsEnabled = enabled;
+    }
+
+    private async void ManageLuaBackend_OnClick(object? sender, RoutedEventArgs eventArgs)
+    {
+        if (_luaBackend is null || sender is not Button { Tag: string target } button ||
+            DataContext is not SetupWindowViewModel viewModel)
+        {
+            return;
+        }
+
+        var isKh3D = target == "28";
+        var gameDirectory = GetPcReleaseDirectory(isKh3D);
+        var games = GetLuaBackendGames(isKh3D);
+        SetLuaBackendBusy(true);
+        var statusText = isKh3D ? LuaBackend28StatusText : LuaBackend1525StatusText;
+        try
+        {
+            var installed = _luaBackend.IsInstalled(gameDirectory);
+            if (installed)
+            {
+                _luaBackend.Configure(gameDirectory!, games, viewModel.PcVersionIndex == 1);
+                statusText.Text = "Lua Backend was configured successfully.";
+            }
+            else
+            {
+                var progress = new Progress<ModOperationProgress>(value =>
+                {
+                    statusText.Text = value.Percentage is { } percentage
+                        ? $"{value.Message} ({percentage:P0})"
+                        : value.Message;
+                });
+                await _luaBackend.InstallAsync(
+                    gameDirectory!,
+                    games,
+                    viewModel.PcVersionIndex == 1,
+                    progress);
+            }
+            statusText.Foreground = Brush.Parse("#62D6A7");
+        }
+        catch (Exception exception)
+        {
+            statusText.Text = exception.Message;
+            statusText.Foreground = Brush.Parse("#FF8B8B");
+        }
+        finally
+        {
+            SetLuaBackendBusy(false);
+            RefreshLuaBackendStatus(preserveSuccessfulMessage: true);
+            button.Focus();
+        }
+    }
+
+    private void RemoveLuaBackend_OnClick(object? sender, RoutedEventArgs eventArgs)
+    {
+        if (_luaBackend is null || sender is not Button { Tag: string target })
+            return;
+
+        var isKh3D = target == "28";
+        var statusText = isKh3D ? LuaBackend28StatusText : LuaBackend1525StatusText;
+        try
+        {
+            _luaBackend.Remove(GetPcReleaseDirectory(isKh3D)!);
+            statusText.Text = "Lua Backend was removed.";
+            statusText.Foreground = Brush.Parse("#62D6A7");
+        }
+        catch (Exception exception)
+        {
+            statusText.Text = exception.Message;
+            statusText.Foreground = Brush.Parse("#FF8B8B");
+        }
+        RefreshLuaBackendStatus(preserveSuccessfulMessage: true);
+    }
+
+    private IReadOnlyList<GameInfo> GetLuaBackendGames(bool isKh3D)
+    {
+        var games = new List<GameInfo>();
+        if (isKh3D)
+        {
+            if (LuaKh3DCheckBox.IsChecked == true)
+                games.Add(GameInfo.FromId("kh3d"));
+            return games;
+        }
+
+        if (LuaKh1CheckBox.IsChecked == true)
+            games.Add(GameInfo.FromId("kh1"));
+        if (LuaKh2CheckBox.IsChecked == true)
+            games.Add(GameInfo.FromId("kh2"));
+        if (LuaBbsCheckBox.IsChecked == true)
+            games.Add(GameInfo.FromId("bbs"));
+        if (LuaRecomCheckBox.IsChecked == true)
+            games.Add(GameInfo.FromId("Recom"));
+        return games;
+    }
+
+    private void RefreshLuaBackendStatus(bool preserveSuccessfulMessage = false)
+    {
+        if (_luaBackend is null || LuaBackend1525ActionButton is null)
+            return;
+        ApplyLuaBackendStatus(false, preserveSuccessfulMessage);
+        ApplyLuaBackendStatus(true, preserveSuccessfulMessage);
+    }
+
+    private void ApplyLuaBackendStatus(bool isKh3D, bool preserveSuccessfulMessage)
+    {
+        var directory = GetPcReleaseDirectory(isKh3D);
+        var validDirectory = !string.IsNullOrWhiteSpace(directory) && Directory.Exists(directory);
+        var installed = validDirectory && _luaBackend!.IsInstalled(directory);
+        var statusText = isKh3D ? LuaBackend28StatusText : LuaBackend1525StatusText;
+        var actionButton = isKh3D ? LuaBackend28ActionButton : LuaBackend1525ActionButton;
+        var removeButton = isKh3D ? LuaBackend28RemoveButton : LuaBackend1525RemoveButton;
+        if (!preserveSuccessfulMessage)
+        {
+            statusText.Text = validDirectory
+                ? installed ? "Lua Backend is installed." : "Lua Backend is not installed."
+                : "Configure the game folder first.";
+            statusText.Foreground = Brush.Parse(installed ? "#62D6A7" : "#91A2BA");
+        }
+        actionButton.Content = installed ? "Configure" : "Install and configure";
+        actionButton.IsEnabled = validDirectory;
+        removeButton.IsVisible = installed;
+        removeButton.IsEnabled = installed;
+    }
+
+    private void SetLuaBackendBusy(bool busy)
+    {
+        LuaBackend1525ActionButton.IsEnabled = !busy;
+        LuaBackend28ActionButton.IsEnabled = !busy;
+        LuaBackend1525RemoveButton.IsEnabled = !busy;
+        LuaBackend28RemoveButton.IsEnabled = !busy;
+        SaveButton.IsEnabled = !busy;
+        CancelButton.IsEnabled = !busy;
+    }
+
+    private void RefreshExtractionAvailability()
+    {
+        if (_configuration is null || GameEditionComboBox is null || ExtractKh1CheckBox is null)
+            return;
+
+        var pcMode = GameEditionComboBox.SelectedIndex != 1;
+        var hasRemix = Directory.Exists(PcReleaseTextBox?.Text);
+        var hasKh3D = Directory.Exists(PcReleaseKh3DTextBox?.Text);
+        var hasKh1 = pcMode ? hasRemix : File.Exists(Kh1IsoTextBox?.Text);
+        var hasKh2 = pcMode ? hasRemix : File.Exists(Kh2IsoTextBox?.Text);
+        var hasRecom = pcMode ? hasRemix : File.Exists(RecomIsoTextBox?.Text);
+
+        ExtractKh1CheckBox.Content = pcMode ? "KH1 - 23 GB" : "KH1 - 4 GB";
+        ExtractKh2CheckBox.Content = pcMode ? "KH2 - 43 GB" : "KH2 - 4 GB";
+        ExtractRecomCheckBox.Content = pcMode ? "Re:CoM - 14 GB" : "Re:CoM - 5 GB";
+        ExtractBbsCheckBox.Content = "BBS - 19 GB";
+        ExtractKh3DCheckBox.Content = "KH3D - 51 GB";
+
+        ExtractKh1CheckBox.IsVisible = hasKh1;
+        ExtractKh2CheckBox.IsVisible = hasKh2;
+        ExtractRecomCheckBox.IsVisible = hasRecom;
+        ExtractBbsCheckBox.IsVisible = pcMode && hasRemix;
+        ExtractKh3DCheckBox.IsVisible = pcMode && hasKh3D;
+
+        var availableCount = new[]
+        {
+            ExtractKh1CheckBox,
+            ExtractKh2CheckBox,
+            ExtractBbsCheckBox,
+            ExtractRecomCheckBox,
+            ExtractKh3DCheckBox
+        }.Count(checkBox => checkBox.IsVisible);
+        ExtractionAvailabilityText.Text = availableCount > 0
+            ? $"{availableCount} game{(availableCount == 1 ? " is" : "s are")} available to extract."
+            : pcMode
+                ? "Configure a valid PC release folder above to select games."
+                : "Configure valid ISO files above to select games.";
+        ExtractGameDataButton.IsEnabled = availableCount > 0;
+        RefreshExistingDataStatus();
+    }
+
+    private void RefreshExistingDataStatus()
+    {
+        if (_configuration is null || ExistingDataStatusText is null)
+            return;
+
+        var configuredPath = GameDataTextBox?.Text;
+        string path;
+        try
+        {
+            path = string.IsNullOrWhiteSpace(configuredPath)
+                ? _configuration.GameDataDirectory
+                : Path.GetFullPath(configuredPath);
+        }
+        catch (Exception exception) when (exception is ArgumentException or NotSupportedException or PathTooLongException)
+        {
+            ExistingDataStatusText.Text = "Enter a valid extraction folder location.";
+            ExistingDataStatusText.Foreground = Brush.Parse("#F1B86B");
+            return;
+        }
+        var extractedGames = GameDataDetectionService.FindExtractedGames(path);
+        ExistingDataStatusText.Text = extractedGames.Count > 0
+            ? $"Extracted game data found: {string.Join(", ", extractedGames.Select(game => game.DisplayName))}."
+            : "You do not have extracted data from a supported game.";
+        ExistingDataStatusText.Foreground = Brush.Parse(extractedGames.Count > 0 ? "#62D6A7" : "#91A2BA");
+    }
+
+    private async void ExtractGameData_OnClick(object? sender, RoutedEventArgs eventArgs)
+    {
+        if (_extraction is null || DataContext is not SetupWindowViewModel viewModel)
+            return;
+
+        var selectedGames = new List<GameInfo>();
+        AddSelectedGame(ExtractKh1CheckBox, "kh1", selectedGames);
+        AddSelectedGame(ExtractKh2CheckBox, "kh2", selectedGames);
+        AddSelectedGame(ExtractBbsCheckBox, "bbs", selectedGames);
+        AddSelectedGame(ExtractRecomCheckBox, "Recom", selectedGames);
+        AddSelectedGame(ExtractKh3DCheckBox, "kh3d", selectedGames);
+        if (selectedGames.Count == 0)
+        {
+            ExtractionStatusText.Text = "Select at least one game.";
+            ExtractionStatusText.Foreground = Brush.Parse("#F1B86B");
+            return;
+        }
+
+        var extractionDescription = GetExtractionConfirmationDescription(viewModel);
+        var confirmed = _dialogs is null || await _dialogs.ConfirmAsync(
+            "Extract game data?",
+            extractionDescription,
+            "Start extraction");
+        if (!confirmed)
+            return;
+
+        SetExtractionBusy(true);
+        try
+        {
+            viewModel.Save();
+            ExtractionProgressBar.Value = 0;
+            ExtractionStatusText.Foreground = Brush.Parse("#91A2BA");
+            var progress = new Progress<ModOperationProgress>(value =>
+            {
+                ExtractionStatusText.Text = value.Message;
+                if (value.Percentage is { } percentage)
+                    ExtractionProgressBar.Value = percentage;
+            });
+            await _extraction.ExtractAsync(selectedGames, progress);
+            ExtractionProgressBar.Value = 1;
+            ExtractionStatusText.Text = "The game data was extracted successfully.";
+            ExtractionStatusText.Foreground = Brush.Parse("#62D6A7");
+            RefreshExistingDataStatus();
+        }
+        catch (Exception exception)
+        {
+            ExtractionStatusText.Text = $"Extraction failed: {exception.Message}";
+            ExtractionStatusText.Foreground = Brush.Parse("#FF8B8B");
+        }
+        finally
+        {
+            SetExtractionBusy(false);
+        }
+    }
+
+    private static string GetExtractionConfirmationDescription(SetupWindowViewModel viewModel)
+    {
+        if (viewModel.IsPcsx2Mode)
+        {
+            return "The selected ISO files will be extracted. Existing extracted data for the selected games may be overwritten.";
+        }
+
+        var extractionDescription = viewModel.SkipRemastered
+            ? "Remastered files will be skipped. Review the compatibility warning in Setup before continuing."
+            : "The selected games will be extracted completely, including remastered files.";
+        return $"{extractionDescription} This may require substantial disk space and can take 5 to 15 minutes or longer.\n\nExisting extracted data for the selected games may be overwritten.";
+    }
+
+    private void SetExtractionBusy(bool busy)
+    {
+        ExtractionProgressBar.IsVisible = busy || ExtractionProgressBar.Value > 0;
+        ExtractGameDataButton.IsEnabled = !busy;
+        SaveButton.IsEnabled = !busy;
+        CancelButton.IsEnabled = !busy;
+        SetupScrollViewer.IsEnabled = !busy;
+    }
+
+    private static void AddSelectedGame(CheckBox checkBox, string gameId, ICollection<GameInfo> games)
+    {
+        if (checkBox.IsVisible && checkBox.IsChecked == true)
+            games.Add(GameInfo.FromId(gameId));
+    }
+
+    private TextBox? GetPathTextBox(string name) => name switch
+    {
+        "ModStorageTextBox" => ModStorageTextBox,
+        "CollectionStorageTextBox" => CollectionStorageTextBox,
+        "BuiltModsTextBox" => BuiltModsTextBox,
+        "GameDataTextBox" => GameDataTextBox,
+        "PcReleaseTextBox" => PcReleaseTextBox,
+        "PcReleaseKh3DTextBox" => PcReleaseKh3DTextBox,
+        "Pcsx2TextBox" => Pcsx2TextBox,
+        "Kh2IsoTextBox" => Kh2IsoTextBox,
+        "Kh1IsoTextBox" => Kh1IsoTextBox,
+        "RecomIsoTextBox" => RecomIsoTextBox,
+        _ => null
+    };
+
+    public void HandleControllerAction(ControllerAction action)
+    {
+        if (HandleActiveComboBox(action))
+            return;
+
+        if (ControllerWindowNavigator.TryMoveFocus(this, action))
+            return;
+
+        if (action is ControllerAction.PreviousControl or ControllerAction.PreviousItem)
+            ControllerWindowNavigator.MoveFocus(this, -1);
+        else if (action is ControllerAction.NextControl or ControllerAction.NextItem)
+            ControllerWindowNavigator.MoveFocus(this, 1);
+        else if (action == ControllerAction.Cancel)
+            Close(false);
+        else if (action is ControllerAction.PreviousGame or ControllerAction.NextGame)
+            ChangeFocusedSelection(action == ControllerAction.PreviousGame ? -1 : 1);
+        else if (action == ControllerAction.Confirm)
+            ActivateFocusedControl();
+    }
+
+    private bool HandleActiveComboBox(ControllerAction action)
+    {
+        if (_activeComboBox is not { IsDropDownOpen: true } comboBox)
+        {
+            _activeComboBox = null;
+            return false;
+        }
+
+        if (action is ControllerAction.NavigateUp or ControllerAction.NavigateLeft or
+            ControllerAction.PreviousControl or ControllerAction.PreviousItem or ControllerAction.PreviousGame)
+            ChangeSelection(comboBox, -1);
+        else if (action is ControllerAction.NavigateDown or ControllerAction.NavigateRight or
+                 ControllerAction.NextControl or ControllerAction.NextItem or ControllerAction.NextGame)
+            ChangeSelection(comboBox, 1);
+        else if (action is ControllerAction.Confirm or ControllerAction.Cancel)
+        {
+            comboBox.IsDropDownOpen = false;
+            comboBox.Focus();
+            _activeComboBox = null;
+        }
+        else
+            return false;
+
+        return true;
+    }
+
+    private void ChangeFocusedSelection(int offset)
+    {
+        if (FocusManager?.GetFocusedElement() is not ComboBox comboBox || comboBox.ItemCount == 0)
+            return;
+        ChangeSelection(comboBox, offset);
+    }
+
+    private static void ChangeSelection(ComboBox comboBox, int offset)
+    {
+        if (comboBox.ItemCount == 0)
+            return;
+
+        comboBox.SelectedIndex = Math.Clamp(comboBox.SelectedIndex + offset, 0, comboBox.ItemCount - 1);
+    }
+
+    private void ActivateFocusedControl()
+    {
+        var focused = FocusManager?.GetFocusedElement();
+        if (focused == SaveButton)
+            Save_OnClick(SaveButton, new RoutedEventArgs());
+        else if (focused == CancelButton)
+            Close(false);
+        else if (focused is CheckBox checkBox)
+            checkBox.IsChecked = checkBox.IsChecked != true;
+        else if (focused is ComboBox comboBox)
+        {
+            _activeComboBox = comboBox;
+            comboBox.IsDropDownOpen = true;
+        }
+        else if (GetFocusedExpander(focused) is { } expander)
+        {
+            expander.IsExpanded = !expander.IsExpanded;
+            if (expander.IsExpanded)
+            {
+                // The expanded content is attached during the next layout pass.
+                Dispatcher.UIThread.Post(() =>
+                {
+                    ModStorageTextBox.BringIntoView();
+                    ModStorageTextBox.Focus();
+                }, DispatcherPriority.Input);
+            }
+        }
+        else if (focused is Button button)
+        {
+            if (button == ExtractGameDataButton)
+                ExtractGameData_OnClick(button, new RoutedEventArgs());
+            else if (button == Panacea1525ActionButton || button == Panacea28ActionButton)
+                ManagePanacea_OnClick(button, new RoutedEventArgs());
+            else if (button == LuaBackend1525ActionButton || button == LuaBackend28ActionButton)
+                ManageLuaBackend_OnClick(button, new RoutedEventArgs());
+            else if (button == LuaBackend1525RemoveButton || button == LuaBackend28RemoveButton)
+                RemoveLuaBackend_OnClick(button, new RoutedEventArgs());
+            else if (button == DetectInstallationsButton)
+                DetectInstallations_OnClick(button, new RoutedEventArgs());
+            else if (button == SteamAppId1525Button || button == SteamAppId28Button)
+                SteamAppId_OnClick(button, new RoutedEventArgs());
+            else if (button.Tag is string tag && tag is "Pcsx2TextBox" or "Kh2IsoTextBox" or "Kh1IsoTextBox" or "RecomIsoTextBox")
+                BrowseFile_OnClick(button, new RoutedEventArgs());
+            else if (button.Tag is string)
+                BrowseFolder_OnClick(button, new RoutedEventArgs());
+        }
+        else
+            ControllerWindowNavigator.MoveFocus(this, 1);
+    }
+
+    private static Expander? GetFocusedExpander(object? focused)
+    {
+        if (focused is Expander expander)
+            return expander;
+
+        return focused is ToggleButton toggleButton
+            ? toggleButton.GetVisualAncestors().OfType<Expander>().FirstOrDefault()
+            : null;
+    }
+}
diff --git a/OpenKh.Tools.ModsManager.Avalonia/Views/TargetFilesWindow.axaml b/OpenKh.Tools.ModsManager.Avalonia/Views/TargetFilesWindow.axaml
new file mode 100644
index 000000000..f95fea4fb
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Avalonia/Views/TargetFilesWindow.axaml
@@ -0,0 +1,27 @@
+<views:EmbeddedDialogControl xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:views="using:OpenKh.Tools.ModsManager.Avalonia.Views"
+        x:Class="OpenKh.Tools.ModsManager.Avalonia.Views.TargetFilesWindow"
+        XYFocus.NavigationModes="Enabled">
+  <Grid Margin="28" RowDefinitions="Auto,16,Auto,16,*,16,Auto">
+    <StackPanel Spacing="5">
+      <TextBlock Text="Select Target Files" FontSize="27" FontWeight="Bold" />
+      <TextBlock Text="Selected files will be copied into the mod and appended to mod.yml."
+                 Foreground="#AAB9CF" TextWrapping="Wrap" />
+    </StackPanel>
+    <Grid Grid.Row="2" ColumnDefinitions="*,12,130">
+      <TextBox x:Name="SearchTextBox" PlaceholderText="Search by relative path" />
+      <Button x:Name="SearchButton" Grid.Column="2" Content="Search" Click="Search_OnClick" />
+    </Grid>
+    <Border Grid.Row="4" Classes="settings-card">
+      <Grid RowDefinitions="*,12,Auto">
+        <ListBox x:Name="FilesListBox" SelectionMode="Multiple" />
+        <TextBlock x:Name="StatusText" Grid.Row="2" Foreground="#91A2BA" TextWrapping="Wrap" />
+      </Grid>
+    </Border>
+    <StackPanel Grid.Row="6" Orientation="Horizontal" Spacing="12" HorizontalAlignment="Right">
+      <Button x:Name="CancelButton" Content="Cancel" MinWidth="120" Click="Cancel_OnClick" />
+      <Button x:Name="AppendButton" Classes="primary" Content="Append Selected" MinWidth="160" Click="Append_OnClick" />
+    </StackPanel>
+  </Grid>
+</views:EmbeddedDialogControl>
diff --git a/OpenKh.Tools.ModsManager.Avalonia/Views/TargetFilesWindow.axaml.cs b/OpenKh.Tools.ModsManager.Avalonia/Views/TargetFilesWindow.axaml.cs
new file mode 100644
index 000000000..ac012e245
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Avalonia/Views/TargetFilesWindow.axaml.cs
@@ -0,0 +1,123 @@
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+using OpenKh.Tools.ModsManager.Avalonia.Services;
+using OpenKh.Tools.ModsManager.Core;
+
+namespace OpenKh.Tools.ModsManager.Avalonia.Views;
+
+public sealed partial class TargetFilesWindow : EmbeddedDialogControl
+{
+    private readonly ModCreatorService? _creator;
+    private readonly string _modDirectory = string.Empty;
+    private readonly string _gameDataPath = string.Empty;
+
+    public TargetFilesWindow()
+    {
+        InitializeComponent();
+    }
+
+    public TargetFilesWindow(
+        ModCreatorService creator,
+        string modDirectory,
+        string gameDataPath,
+        string searchText) : this()
+    {
+        _creator = creator;
+        _modDirectory = modDirectory;
+        _gameDataPath = gameDataPath;
+        SearchTextBox.Text = searchText;
+        Opened += async (_, _) => await SearchAsync();
+    }
+
+    private async void Search_OnClick(object? sender, RoutedEventArgs eventArgs) => await SearchAsync();
+
+    private async Task SearchAsync()
+    {
+        if (_creator is null)
+            return;
+        SetBusy(true);
+        StatusText.Text = "Searching extracted game data...";
+        try
+        {
+            var files = await _creator.SearchFilesAsync(_gameDataPath, SearchTextBox.Text ?? string.Empty);
+            FilesListBox.ItemsSource = files;
+            StatusText.Text = files.Count == 1 ? "1 file found" : $"{files.Count} files found";
+        }
+        catch (Exception exception)
+        {
+            StatusText.Text = exception.Message;
+        }
+        finally
+        {
+            SetBusy(false);
+        }
+    }
+
+    private void Append_OnClick(object? sender, RoutedEventArgs eventArgs)
+    {
+        if (_creator is null)
+            return;
+        var selected = FilesListBox.SelectedItems?.Cast<string>().ToArray() ?? [];
+        if (selected.Length == 0)
+        {
+            StatusText.Text = "Select at least one file.";
+            return;
+        }
+        try
+        {
+            _creator.AppendCopyFiles(_modDirectory, _gameDataPath, selected);
+            Close(true);
+        }
+        catch (Exception exception)
+        {
+            StatusText.Text = exception.Message;
+        }
+    }
+
+    private void SetBusy(bool busy)
+    {
+        SearchButton.IsEnabled = !busy;
+        AppendButton.IsEnabled = !busy;
+        FilesListBox.IsEnabled = !busy;
+    }
+
+    private void Cancel_OnClick(object? sender, RoutedEventArgs eventArgs) => Close(false);
+
+    public void HandleControllerAction(ControllerAction action)
+    {
+        if (ControllerWindowNavigator.TryMoveFocus(this, action))
+            return;
+        if (action is ControllerAction.PreviousControl)
+            ControllerWindowNavigator.MoveFocus(this, -1);
+        else if (action is ControllerAction.NextControl)
+            ControllerWindowNavigator.MoveFocus(this, 1);
+        else if (action is ControllerAction.PreviousItem or ControllerAction.NextItem)
+            MoveSelection(action == ControllerAction.PreviousItem ? -1 : 1);
+        else if (action == ControllerAction.Cancel)
+            Close(false);
+        else if (action == ControllerAction.Confirm)
+        {
+            var focused = FocusManager?.GetFocusedElement();
+            if (focused == AppendButton)
+                Append_OnClick(AppendButton, new RoutedEventArgs());
+            else if (focused == SearchButton)
+                Search_OnClick(SearchButton, new RoutedEventArgs());
+            else if (focused == CancelButton)
+                Close(false);
+            else
+                ControllerWindowNavigator.MoveFocus(this, 1);
+        }
+    }
+
+    private void MoveSelection(int offset)
+    {
+        if (FilesListBox.ItemCount == 0)
+            return;
+        FilesListBox.SelectedIndex = Math.Clamp(
+            FilesListBox.SelectedIndex < 0 ? 0 : FilesListBox.SelectedIndex + offset,
+            0,
+            FilesListBox.ItemCount - 1);
+        if (FilesListBox.SelectedItem is { } selected)
+            FilesListBox.ScrollIntoView(selected);
+    }
+}
diff --git a/OpenKh.Tools.ModsManager.Avalonia/publish.ps1 b/OpenKh.Tools.ModsManager.Avalonia/publish.ps1
new file mode 100644
index 000000000..711ada6ad
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Avalonia/publish.ps1
@@ -0,0 +1,92 @@
+param(
+    [ValidateSet("All", "Windows", "Linux", "SteamDeck")]
+    [string] $Target = "All",
+    [string] $Configuration = "Release",
+    [string] $OutputDirectory = "artifacts"
+)
+
+$project = Join-Path $PSScriptRoot "OpenKh.Tools.ModsManager.csproj"
+$outputRoot = Join-Path $PSScriptRoot $OutputDirectory
+$repositoryBuild = Join-Path $PSScriptRoot "..\bin"
+$panaceaProject = Join-Path $PSScriptRoot "..\OpenKh.Research.Panacea"
+$panaceaFileNames = @(
+    "avcodec-vgmstream-59.dll",
+    "avformat-vgmstream-59.dll",
+    "avutil-vgmstream-57.dll",
+    "bass.dll",
+    "bass_vgmstream.dll",
+    "libatrac9.dll",
+    "libcelt-0061.dll",
+    "libcelt-0110.dll",
+    "libg719_decode.dll",
+    "libmpg123-0.dll",
+    "libspeex-1.dll",
+    "libvorbis.dll",
+    "swresample-vgmstream-4.dll"
+)
+
+function Copy-PanaceaFiles([string] $output) {
+    $sources = @(
+        [pscustomobject]@{
+            Loader = Join-Path $repositoryBuild "OpenKH.Panacea.dll"
+            Dependencies = $repositoryBuild
+        },
+        [pscustomobject]@{
+            Loader = Join-Path $panaceaProject "Release\OpenKH.Panacea.dll"
+            Dependencies = Join-Path $panaceaProject "Dependencies"
+        }
+    ) | Where-Object {
+        $candidate = $_
+        (Test-Path -LiteralPath $candidate.Loader -PathType Leaf) -and
+        -not ($panaceaFileNames | Where-Object {
+            -not (Test-Path -LiteralPath (Join-Path $candidate.Dependencies $_) -PathType Leaf)
+        })
+    } | Sort-Object { (Get-Item -LiteralPath $_.Loader).LastWriteTimeUtc } -Descending
+    $source = $sources | Select-Object -First 1
+    if ($null -eq $source) {
+        Write-Warning "Panacea was not built, so it will not be included in '$output'."
+        return
+    }
+
+    Copy-Item -LiteralPath $source.Loader -Destination $output -Force
+    foreach ($fileName in $panaceaFileNames) {
+        $sourcePath = Join-Path $source.Dependencies $fileName
+        Copy-Item -LiteralPath $sourcePath -Destination $output -Force
+    }
+}
+
+function Publish-Target([string] $runtime, [string] $folder) {
+    $output = Join-Path $outputRoot $folder
+    dotnet publish $project `
+        --configuration $Configuration `
+        --runtime $runtime `
+        --self-contained true `
+        --source "https://api.nuget.org/v3/index.json" `
+        --output $output `
+        -p:PublishSingleFile=true `
+        -p:IncludeNativeLibrariesForSelfExtract=true `
+        -p:DebugType=None `
+        -p:DebugSymbols=false
+
+    if ($LASTEXITCODE -ne 0) {
+        throw "Publishing $folder failed with exit code $LASTEXITCODE."
+    }
+
+    Get-ChildItem $output -Filter "*.pdb" -File | Remove-Item -Force
+    Copy-PanaceaFiles $output
+}
+
+if ($Target -in @("All", "Windows")) {
+    Publish-Target "win-x64" "windows-x64"
+}
+
+if ($Target -in @("All", "Linux")) {
+    Publish-Target "linux-x64" "linux-x64"
+}
+
+if ($Target -in @("All", "SteamDeck")) {
+    Publish-Target "linux-x64" "steam-deck"
+    Copy-Item (Join-Path $PSScriptRoot "Packaging/SteamDeck/install-openkh-mod-manager.sh") `
+        (Join-Path $outputRoot "steam-deck/install-openkh-mod-manager.sh") `
+        -Force
+}
diff --git a/OpenKh.Tools.ModsManager.Avalonia/publish.sh b/OpenKh.Tools.ModsManager.Avalonia/publish.sh
new file mode 100644
index 000000000..339ee9196
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Avalonia/publish.sh
@@ -0,0 +1,64 @@
+#!/usr/bin/env sh
+set -eu
+
+SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
+PROJECT="$SCRIPT_DIR/OpenKh.Tools.ModsManager.csproj"
+OUTPUT_ROOT="${1:-$SCRIPT_DIR/artifacts}"
+PANACEA_LOADER="$SCRIPT_DIR/../OpenKh.Research.Panacea/Release/OpenKH.Panacea.dll"
+PANACEA_DEPENDENCIES="$SCRIPT_DIR/../OpenKh.Research.Panacea/Dependencies"
+PANACEA_FILES="
+avcodec-vgmstream-59.dll
+avformat-vgmstream-59.dll
+avutil-vgmstream-57.dll
+bass.dll
+bass_vgmstream.dll
+libatrac9.dll
+libcelt-0061.dll
+libcelt-0110.dll
+libg719_decode.dll
+libmpg123-0.dll
+libspeex-1.dll
+libvorbis.dll
+swresample-vgmstream-4.dll
+"
+
+copy_panacea_files() {
+    output="$1"
+    if [ ! -f "$PANACEA_LOADER" ]; then
+        printf '%s\n' "Warning: Panacea was not built, so it will not be included in $output." >&2
+        return
+    fi
+
+    cp "$PANACEA_LOADER" "$output/OpenKH.Panacea.dll"
+    for file_name in $PANACEA_FILES; do
+        source_path="$PANACEA_DEPENDENCIES/$file_name"
+        if [ ! -f "$source_path" ]; then
+            printf '%s\n' "Required Panacea dependency is missing: $source_path" >&2
+            exit 1
+        fi
+        cp "$source_path" "$output/$file_name"
+    done
+}
+
+publish_target() {
+    runtime="$1"
+    folder="$2"
+    dotnet publish "$PROJECT" \
+        --configuration Release \
+        --runtime "$runtime" \
+        --self-contained true \
+        --source "https://api.nuget.org/v3/index.json" \
+        --output "$OUTPUT_ROOT/$folder" \
+        -p:PublishSingleFile=true \
+        -p:IncludeNativeLibrariesForSelfExtract=true \
+        -p:DebugType=None \
+        -p:DebugSymbols=false
+    copy_panacea_files "$OUTPUT_ROOT/$folder"
+}
+
+publish_target linux-x64 linux-x64
+publish_target linux-x64 steam-deck
+cp "$SCRIPT_DIR/Packaging/SteamDeck/install-openkh-mod-manager.sh" \
+   "$OUTPUT_ROOT/steam-deck/install-openkh-mod-manager.sh"
+chmod +x "$OUTPUT_ROOT/steam-deck/OpenKh.Tools.ModsManager" \
+         "$OUTPUT_ROOT/steam-deck/install-openkh-mod-manager.sh"
diff --git a/OpenKh.Tools.ModsManager.Core/CollectionSettingsService.cs b/OpenKh.Tools.ModsManager.Core/CollectionSettingsService.cs
new file mode 100644
index 000000000..93a0610af
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Core/CollectionSettingsService.cs
@@ -0,0 +1,49 @@
+using OpenKh.Patcher;
+using System.Text.Json;
+
+namespace OpenKh.Tools.ModsManager.Core;
+
+public sealed class CollectionSettingsService(ModManagerConfigurationService configuration)
+{
+    public IReadOnlyList<CollectionOption> GetOptions(ModEntry mod, GameInfo game)
+    {
+        if (!mod.IsCollection)
+            return [];
+
+        using var stream = File.OpenRead(Path.Combine(mod.Directory, "mod.yml"));
+        var metadata = Metadata.Read(stream);
+        var settings = ReadSettings(game);
+        settings.TryGetValue(mod.Id, out var modSettings);
+        return (metadata.Assets ?? [])
+            .Where(asset => asset.CollectionOptional)
+            .Select(asset => new CollectionOption(
+                asset.Name,
+                modSettings?.TryGetValue(asset.Name, out var enabled) == true && enabled))
+            .ToArray();
+    }
+
+    public void SaveOptions(ModEntry mod, GameInfo game, IEnumerable<CollectionOption> options)
+    {
+        var settings = ReadSettings(game);
+        settings[mod.Id] = options.ToDictionary(
+            option => option.Name,
+            option => option.IsEnabled,
+            StringComparer.OrdinalIgnoreCase);
+        var fileName = configuration.GetCollectionSettingsFile(game);
+        File.WriteAllText(fileName, JsonSerializer.Serialize(settings, new JsonSerializerOptions
+        {
+            WriteIndented = true
+        }));
+    }
+
+    private Dictionary<string, Dictionary<string, bool>> ReadSettings(GameInfo game)
+    {
+        var fileName = configuration.GetCollectionSettingsFile(game);
+        if (!File.Exists(fileName) || string.IsNullOrWhiteSpace(File.ReadAllText(fileName)))
+            return new Dictionary<string, Dictionary<string, bool>>(StringComparer.OrdinalIgnoreCase);
+        return JsonSerializer.Deserialize<Dictionary<string, Dictionary<string, bool>>>(File.ReadAllText(fileName))
+            ?? new Dictionary<string, Dictionary<string, bool>>(StringComparer.OrdinalIgnoreCase);
+    }
+}
+
+public sealed record CollectionOption(string Name, bool IsEnabled);
diff --git a/OpenKh.Tools.ModsManager/Services/GameDataExtractionService.cs b/OpenKh.Tools.ModsManager.Core/Compatibility/GameDataExtractionService.cs
similarity index 96%
rename from OpenKh.Tools.ModsManager/Services/GameDataExtractionService.cs
rename to OpenKh.Tools.ModsManager.Core/Compatibility/GameDataExtractionService.cs
index 8a1890a54..a660477f5 100644
--- a/OpenKh.Tools.ModsManager/Services/GameDataExtractionService.cs
+++ b/OpenKh.Tools.ModsManager.Core/Compatibility/GameDataExtractionService.cs
@@ -1,363 +1,363 @@
-using OpenKh.Common;
-using OpenKh.Kh1;
-using OpenKh.Kh2;
-using OpenKh.Recom;
-using System;
-using System.IO;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Xe.IO;
-
-namespace OpenKh.Tools.ModsManager.Services
-{
-    public class GameDataExtractionService
-    {
-        private const int BufferSize = 65536;
-        private const string REMASTERED_FILES_FOLDER_NAME = "remastered";
-
-        public class BadConfigurationException : Exception
-        {
-            public BadConfigurationException(string message) : base(message)
-            {
-
-            }
-        }
-
-        public async Task ExtractKh1Ps2EditionAsync(
-            string isoLocation,
-            string gameDataLocation,
-            Action<float> onProgress)
-        {
-            var fileBlocks = File.OpenRead(isoLocation).Using(stream =>
-            {
-                var bufferedStream = new BufferedStream(stream);
-                var idxBlock = IsoUtility.GetFileOffset(bufferedStream, "KINGDOM.IDX;1");
-                var firstBlock = IsoUtility.GetFileOffset(bufferedStream, "SYSTEM.CNF;1");
-                return (idxBlock, firstBlock);
-            });
-
-            if (fileBlocks.idxBlock == -1 || fileBlocks.firstBlock == -1)
-            {
-                throw new BadConfigurationException(
-                    $"Unable to find the files KINGDOM.IDX and SYSTEM.CNF in the ISO at '{isoLocation}'. The extraction will stop."
-                );
-            }
-
-            onProgress(0);
-
-            await Task.Run(() =>
-            {
-                using var isoStream = File.OpenRead(isoLocation);
-
-                var idxOffset = fileBlocks.idxBlock * 0x800L;
-                var idxEntries = Idx1.Read(new SubStream(isoStream, idxOffset, isoStream.Length - idxOffset));
-
-                var firstOffset = fileBlocks.firstBlock * 0x800L;
-                var imgStream = new SubStream(isoStream, firstOffset, isoStream.Length - firstOffset);
-                var img = new Img1(imgStream, idxEntries, 0);
-
-                var fileCount = img.Entries.Count;
-                var fileProcessed = 0;
-                foreach (var fileEntry in img.Entries)
-                {
-                    var fileName = Idx1Name.Lookup(fileEntry.Value) ?? $"@noname/{fileEntry.Value.Hash:X08}";
-                    using var stream = img.FileOpen(fileEntry.Value);
-                    if (stream == null)
-                    {
-                        Log.Warn($"Unable to extract {fileName}");
-                        continue;
-                    }
-                    var fileDestination = Path.Combine(gameDataLocation, "kh1", fileName);
-                    var directoryDestination = Path.GetDirectoryName(fileDestination);
-                    if (!Directory.Exists(directoryDestination))
-                    {
-                        Directory.CreateDirectory(directoryDestination);
-                    }
-                    File.Create(fileDestination).Using(dstStream => stream.CopyTo(dstStream, BufferSize));
-
-                    fileProcessed++;
-                    onProgress((float)fileProcessed / fileCount);
-                }
-
-                onProgress(1.0f);
-            });
-        }
-
-        public async Task ExtractRecomPs2EditionAsync(
-            string isoLocation,
-            string gameDataLocation,
-            Action<float> onProgress)
-        {
-            using var stream = File.OpenRead(isoLocation);
-            var rdi_stream = IsoUtility.GetSectors(stream, 0x244, stream.SetPosition(0x244 * 0x800 + 8).ReadInt16() + 1);
-            var rdi = RootDirInfo.Read(rdi_stream);
-            await Task.Run(() => {
-                rdi.ExtractFiles(stream, Path.Combine(gameDataLocation, "Recom"), onProgress);
-            });
-            stream.Close();
-        }
-
-        public async Task ExtractKh2Ps2EditionAsync(
-            string isoLocation,
-            string gameDataLocation,
-            Action<float> onProgress)
-        {
-            var fileBlocks = File.OpenRead(isoLocation).Using(stream =>
-            {
-                var bufferedStream = new BufferedStream(stream);
-                var idxBlock = IsoUtility.GetFileOffset(bufferedStream, "KH2.IDX;1");
-                var imgBlock = IsoUtility.GetFileOffset(bufferedStream, "KH2.IMG;1");
-                return (idxBlock, imgBlock);
-            });
-
-            if (fileBlocks.idxBlock == -1 || fileBlocks.imgBlock == -1)
-            {
-                throw new BadConfigurationException(
-                    $"Unable to find the files KH2.IDX and KH2.IMG in the ISO at '{isoLocation}'. The extraction will stop."
-                );
-            }
-
-            onProgress(0);
-
-            await Task.Run(() =>
-            {
-                using var isoStream = File.OpenRead(isoLocation);
-
-                var idxOffset = fileBlocks.idxBlock * 0x800L;
-                var idx = Idx.Read(new SubStream(isoStream, idxOffset, isoStream.Length - idxOffset));
-
-                var imgOffset = fileBlocks.imgBlock * 0x800L;
-                var imgStream = new SubStream(isoStream, imgOffset, isoStream.Length - imgOffset);
-                var img = new Img(imgStream, idx, true);
-
-                var fileCount = img.Entries.Count;
-                var fileProcessed = 0;
-                foreach (var fileEntry in img.Entries)
-                {
-                    var fileName = IdxName.Lookup(fileEntry) ?? $"@{fileEntry.Hash32:08X}_{fileEntry.Hash16:04X}";
-                    using var stream = img.FileOpen(fileEntry);
-                    var fileDestination = Path.Combine(gameDataLocation, "kh2", fileName);
-                    var directoryDestination = Path.GetDirectoryName(fileDestination);
-                    if (!Directory.Exists(directoryDestination))
-                    {
-                        Directory.CreateDirectory(directoryDestination);
-                    }
-                    File.Create(fileDestination).Using(dstStream => stream.CopyTo(dstStream, BufferSize));
-
-                    fileProcessed++;
-                    onProgress((float)fileProcessed / fileCount);
-                }
-
-                onProgress(1.0f);
-            });
-        }
-
-        public async Task ExtractKhPcEditionAsync(
-            string gameDataLocation,
-            Action<float> onProgress,
-            Func<string, string> getKhFilePath,
-            Func<string, string> getKh3dFilePath,
-            bool extractkh1,
-            bool extractkh2,
-            bool extractbbs,
-            bool extractrecom,
-            bool extractkh3d,
-            Func<Exception, Task<bool>> ifRetry,
-            CancellationToken cancellationToken)
-        {
-            await Task.Run(async () =>
-            {
-                var _nameListkh1 = new string[]
-                {
-                    "first",
-                    "second",
-                    "third",
-                    "fourth",
-                    "fifth"
-                };
-                var _nameListkh2 = new string[]
-                {
-                    "first",
-                    "second",
-                    "third",
-                    "fourth",
-                    "fifth",
-                    "sixth"
-                };
-                var _nameListbbs = new string[]
-                {
-                    "first",
-                    "second",
-                    "third",
-                    "fourth"
-                };
-                var _nameListkh3d = new string[]
-                {
-                    "first",
-                    "second",
-                    "third",
-                    "fourth"
-                };
-
-                var _totalFiles = 0;
-                var _procTotalFiles = 0;
-
-                onProgress(0);
-
-                if (extractkh1)
-                {
-                    for (int i = 0; i < 5; i++)
-                    {
-                        using var _stream = new FileStream(getKhFilePath("kh1_" + _nameListkh1[i] + ".hed"), System.IO.FileMode.Open);
-                        var _hedFile = OpenKh.Egs.Hed.Read(_stream);
-                        _totalFiles += _hedFile.Count();
-                    }
-                }
-                if (extractkh2)
-                {
-                    for (int i = 0; i < 6; i++)
-                    {
-                        using var _stream = new FileStream(getKhFilePath("kh2_" + _nameListkh2[i] + ".hed"), System.IO.FileMode.Open);
-                        var _hedFile = OpenKh.Egs.Hed.Read(_stream);
-                        _totalFiles += _hedFile.Count();
-                    }
-                }
-                if (extractbbs)
-                {
-                    for (int i = 0; i < 4; i++)
-                    {
-                        using var _stream = new FileStream(getKhFilePath("bbs_" + _nameListbbs[i] + ".hed"), System.IO.FileMode.Open);
-                        var _hedFile = OpenKh.Egs.Hed.Read(_stream);
-                        _totalFiles += _hedFile.Count();
-                    }
-                }
-                if (extractrecom)
-                {
-                    using var _stream = new FileStream(getKhFilePath("Recom.hed"), System.IO.FileMode.Open);
-                    var _hedFile = OpenKh.Egs.Hed.Read(_stream);
-                    _totalFiles += _hedFile.Count();
-                }
-                if (extractkh3d)
-                {
-                    for (int i = 0; i < 4; i++)
-                    {
-                        using var _stream = new FileStream(getKh3dFilePath("kh3d_" + _nameListbbs[i] + ".hed"), System.IO.FileMode.Open);
-                        var _hedFile = OpenKh.Egs.Hed.Read(_stream);
-                        _totalFiles += _hedFile.Count();
-                    }
-                }
-
-                async Task ProcessHedStreamAsync(string outputDir, Stream hedStream, Stream img)
-                {
-                    await Task.Yield();
-
-                    foreach (var entry in OpenKh.Egs.Hed.Read(hedStream))
-                    {
-                        cancellationToken.ThrowIfCancellationRequested();
-
-                    retry:
-                        try
-                        {
-                            var hash = OpenKh.Egs.Helpers.ToString(entry.MD5);
-                            if (!OpenKh.Egs.EgsTools.Names.TryGetValue(hash, out var fileName))
-                                fileName = $"{hash}.dat";
-
-                            var outputFileName = Path.Combine(outputDir, fileName);
-
-                            OpenKh.Egs.EgsTools.CreateDirectoryForFile(outputFileName);
-
-                            var hdAsset = new OpenKh.Egs.EgsHdAsset(img.SetPosition(entry.Offset));
-
-                            File.Create(outputFileName).Using(stream => stream.Write(hdAsset.OriginalData));
-
-                            outputFileName = Path.Combine(outputDir, REMASTERED_FILES_FOLDER_NAME, fileName);
-
-                            if (!ConfigurationService.SkipRemastered)
-                            {
-
-                                foreach (var asset in hdAsset.Assets)
-                                {
-                                    var outputFileNameRemastered = Path.Combine(OpenKh.Egs.EgsTools.GetHDAssetFolder(outputFileName), asset);
-
-                                    OpenKh.Egs.EgsTools.CreateDirectoryForFile(outputFileNameRemastered);
-
-                                    var assetData = hdAsset.RemasteredAssetsDecompressedData[asset];
-                                    File.Create(outputFileNameRemastered).Using(stream => stream.Write(assetData));
-                                }
-                            }
-                        }
-                        catch (Exception ex)
-                        {
-                            if (await ifRetry(ex))
-                            {
-                                goto retry;
-                            }
-                        }
-
-                        _procTotalFiles++;
-
-                        onProgress((float)_procTotalFiles / _totalFiles);
-                    }
-                }
-
-                if (extractkh1)
-                {
-                    for (int i = 0; i < 5; i++)
-                    {
-                        var outputDir = Path.Combine(gameDataLocation, "kh1");
-                        using var hedStream = File.OpenRead(getKhFilePath("kh1_" + _nameListkh1[i] + ".hed"));
-                        using var img = File.OpenRead(getKhFilePath("kh1_" + _nameListkh1[i] + ".pkg"));
-
-                        await ProcessHedStreamAsync(outputDir, hedStream, img);
-                    }
-                }
-                if (extractkh2)
-                {
-                    for (int i = 0; i < 6; i++)
-                    {
-                        var outputDir = Path.Combine(gameDataLocation, "kh2");
-                        using var hedStream = File.OpenRead(getKhFilePath("kh2_" + _nameListkh2[i] + ".hed"));
-                        using var img = File.OpenRead(getKhFilePath("kh2_" + _nameListkh2[i] + ".pkg"));
-
-                        await ProcessHedStreamAsync(outputDir, hedStream, img);
-                    }
-                }
-                if (extractbbs)
-                {
-                    for (int i = 0; i < 4; i++)
-                    {
-                        var outputDir = Path.Combine(gameDataLocation, "bbs");
-                        using var hedStream = File.OpenRead(getKhFilePath("bbs_" + _nameListbbs[i] + ".hed"));
-                        using var img = File.OpenRead(getKhFilePath("bbs_" + _nameListbbs[i] + ".pkg"));
-
-                        await ProcessHedStreamAsync(outputDir, hedStream, img);
-                    }
-                }
-                if (extractrecom)
-                {
-                    for (int i = 0; i < 1; i++)
-                    {
-                        var outputDir = Path.Combine(gameDataLocation, "Recom");
-                        using var hedStream = File.OpenRead(getKhFilePath("Recom.hed"));
-                        using var img = File.OpenRead(getKhFilePath("Recom.pkg"));
-
-                        await ProcessHedStreamAsync(outputDir, hedStream, img);
-                    }
-                }
-                if (extractkh3d)
-                {
-                    for (int i = 0; i < 4; i++)
-                    {
-                        var outputDir = Path.Combine(gameDataLocation, "kh3d");
-                        using var hedStream = File.OpenRead(getKh3dFilePath("kh3d_" + _nameListkh3d[i] + ".hed"));
-                        using var img = File.OpenRead(getKh3dFilePath("kh3d_" + _nameListkh3d[i] + ".pkg"));
-
-                        await ProcessHedStreamAsync(outputDir, hedStream, img);
-                    }
-                }
-                onProgress(1);
-            });
-        }
-    }
-}
+using OpenKh.Common;
+using OpenKh.Kh1;
+using OpenKh.Kh2;
+using OpenKh.Recom;
+using System;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Xe.IO;
+
+namespace OpenKh.Tools.ModsManager.Core.Services
+{
+    public class GameDataExtractionService
+    {
+        private const int BufferSize = 65536;
+        private const string REMASTERED_FILES_FOLDER_NAME = "remastered";
+
+        public class BadConfigurationException : Exception
+        {
+            public BadConfigurationException(string message) : base(message)
+            {
+
+            }
+        }
+
+        public async Task ExtractKh1Ps2EditionAsync(
+            string isoLocation,
+            string gameDataLocation,
+            Action<float> onProgress)
+        {
+            var fileBlocks = File.OpenRead(isoLocation).Using(stream =>
+            {
+                var bufferedStream = new BufferedStream(stream);
+                var idxBlock = IsoUtility.GetFileOffset(bufferedStream, "KINGDOM.IDX;1");
+                var firstBlock = IsoUtility.GetFileOffset(bufferedStream, "SYSTEM.CNF;1");
+                return (idxBlock, firstBlock);
+            });
+
+            if (fileBlocks.idxBlock == -1 || fileBlocks.firstBlock == -1)
+            {
+                throw new BadConfigurationException(
+                    $"Unable to find the files KINGDOM.IDX and SYSTEM.CNF in the ISO at '{isoLocation}'. The extraction will stop."
+                );
+            }
+
+            onProgress(0);
+
+            await Task.Run(() =>
+            {
+                using var isoStream = File.OpenRead(isoLocation);
+
+                var idxOffset = fileBlocks.idxBlock * 0x800L;
+                var idxEntries = Idx1.Read(new SubStream(isoStream, idxOffset, isoStream.Length - idxOffset));
+
+                var firstOffset = fileBlocks.firstBlock * 0x800L;
+                var imgStream = new SubStream(isoStream, firstOffset, isoStream.Length - firstOffset);
+                var img = new Img1(imgStream, idxEntries, 0);
+
+                var fileCount = img.Entries.Count;
+                var fileProcessed = 0;
+                foreach (var fileEntry in img.Entries)
+                {
+                    var fileName = Idx1Name.Lookup(fileEntry.Value) ?? $"@noname/{fileEntry.Value.Hash:X08}";
+                    using var stream = img.FileOpen(fileEntry.Value);
+                    if (stream == null)
+                    {
+                        Log.Warn($"Unable to extract {fileName}");
+                        continue;
+                    }
+                    var fileDestination = Path.Combine(gameDataLocation, "kh1", fileName);
+                    var directoryDestination = Path.GetDirectoryName(fileDestination);
+                    if (!string.IsNullOrEmpty(directoryDestination) && !Directory.Exists(directoryDestination))
+                    {
+                        Directory.CreateDirectory(directoryDestination);
+                    }
+                    File.Create(fileDestination).Using(dstStream => stream.CopyTo(dstStream, BufferSize));
+
+                    fileProcessed++;
+                    onProgress((float)fileProcessed / fileCount);
+                }
+
+                onProgress(1.0f);
+            });
+        }
+
+        public async Task ExtractRecomPs2EditionAsync(
+            string isoLocation,
+            string gameDataLocation,
+            Action<float> onProgress)
+        {
+            using var stream = File.OpenRead(isoLocation);
+            var rdi_stream = IsoUtility.GetSectors(stream, 0x244, stream.SetPosition(0x244 * 0x800 + 8).ReadInt16() + 1);
+            var rdi = RootDirInfo.Read(rdi_stream);
+            await Task.Run(() => {
+                rdi.ExtractFiles(stream, Path.Combine(gameDataLocation, "Recom"), onProgress);
+            });
+            stream.Close();
+        }
+
+        public async Task ExtractKh2Ps2EditionAsync(
+            string isoLocation,
+            string gameDataLocation,
+            Action<float> onProgress)
+        {
+            var fileBlocks = File.OpenRead(isoLocation).Using(stream =>
+            {
+                var bufferedStream = new BufferedStream(stream);
+                var idxBlock = IsoUtility.GetFileOffset(bufferedStream, "KH2.IDX;1");
+                var imgBlock = IsoUtility.GetFileOffset(bufferedStream, "KH2.IMG;1");
+                return (idxBlock, imgBlock);
+            });
+
+            if (fileBlocks.idxBlock == -1 || fileBlocks.imgBlock == -1)
+            {
+                throw new BadConfigurationException(
+                    $"Unable to find the files KH2.IDX and KH2.IMG in the ISO at '{isoLocation}'. The extraction will stop."
+                );
+            }
+
+            onProgress(0);
+
+            await Task.Run(() =>
+            {
+                using var isoStream = File.OpenRead(isoLocation);
+
+                var idxOffset = fileBlocks.idxBlock * 0x800L;
+                var idx = Idx.Read(new SubStream(isoStream, idxOffset, isoStream.Length - idxOffset));
+
+                var imgOffset = fileBlocks.imgBlock * 0x800L;
+                var imgStream = new SubStream(isoStream, imgOffset, isoStream.Length - imgOffset);
+                var img = new Img(imgStream, idx, true);
+
+                var fileCount = img.Entries.Count;
+                var fileProcessed = 0;
+                foreach (var fileEntry in img.Entries)
+                {
+                    var fileName = IdxName.Lookup(fileEntry) ?? $"@{fileEntry.Hash32:08X}_{fileEntry.Hash16:04X}";
+                    using var stream = img.FileOpen(fileEntry);
+                    var fileDestination = Path.Combine(gameDataLocation, "kh2", fileName);
+                    var directoryDestination = Path.GetDirectoryName(fileDestination);
+                    if (!string.IsNullOrEmpty(directoryDestination) && !Directory.Exists(directoryDestination))
+                    {
+                        Directory.CreateDirectory(directoryDestination);
+                    }
+                    File.Create(fileDestination).Using(dstStream => stream.CopyTo(dstStream, BufferSize));
+
+                    fileProcessed++;
+                    onProgress((float)fileProcessed / fileCount);
+                }
+
+                onProgress(1.0f);
+            });
+        }
+
+        public async Task ExtractKhPcEditionAsync(
+            string gameDataLocation,
+            Action<float> onProgress,
+            Func<string, string> getKhFilePath,
+            Func<string, string> getKh3dFilePath,
+            bool extractkh1,
+            bool extractkh2,
+            bool extractbbs,
+            bool extractrecom,
+            bool extractkh3d,
+            Func<Exception, Task<bool>> ifRetry,
+            CancellationToken cancellationToken)
+        {
+            await Task.Run(async () =>
+            {
+                var _nameListkh1 = new string[]
+                {
+                    "first",
+                    "second",
+                    "third",
+                    "fourth",
+                    "fifth"
+                };
+                var _nameListkh2 = new string[]
+                {
+                    "first",
+                    "second",
+                    "third",
+                    "fourth",
+                    "fifth",
+                    "sixth"
+                };
+                var _nameListbbs = new string[]
+                {
+                    "first",
+                    "second",
+                    "third",
+                    "fourth"
+                };
+                var _nameListkh3d = new string[]
+                {
+                    "first",
+                    "second",
+                    "third",
+                    "fourth"
+                };
+
+                var _totalFiles = 0;
+                var _procTotalFiles = 0;
+
+                onProgress(0);
+
+                if (extractkh1)
+                {
+                    for (int i = 0; i < 5; i++)
+                    {
+                        using var _stream = new FileStream(getKhFilePath("kh1_" + _nameListkh1[i] + ".hed"), System.IO.FileMode.Open);
+                        var _hedFile = OpenKh.Egs.Hed.Read(_stream);
+                        _totalFiles += _hedFile.Count();
+                    }
+                }
+                if (extractkh2)
+                {
+                    for (int i = 0; i < 6; i++)
+                    {
+                        using var _stream = new FileStream(getKhFilePath("kh2_" + _nameListkh2[i] + ".hed"), System.IO.FileMode.Open);
+                        var _hedFile = OpenKh.Egs.Hed.Read(_stream);
+                        _totalFiles += _hedFile.Count();
+                    }
+                }
+                if (extractbbs)
+                {
+                    for (int i = 0; i < 4; i++)
+                    {
+                        using var _stream = new FileStream(getKhFilePath("bbs_" + _nameListbbs[i] + ".hed"), System.IO.FileMode.Open);
+                        var _hedFile = OpenKh.Egs.Hed.Read(_stream);
+                        _totalFiles += _hedFile.Count();
+                    }
+                }
+                if (extractrecom)
+                {
+                    using var _stream = new FileStream(getKhFilePath("Recom.hed"), System.IO.FileMode.Open);
+                    var _hedFile = OpenKh.Egs.Hed.Read(_stream);
+                    _totalFiles += _hedFile.Count();
+                }
+                if (extractkh3d)
+                {
+                    for (int i = 0; i < 4; i++)
+                    {
+                        using var _stream = new FileStream(getKh3dFilePath("kh3d_" + _nameListbbs[i] + ".hed"), System.IO.FileMode.Open);
+                        var _hedFile = OpenKh.Egs.Hed.Read(_stream);
+                        _totalFiles += _hedFile.Count();
+                    }
+                }
+
+                async Task ProcessHedStreamAsync(string outputDir, Stream hedStream, Stream img)
+                {
+                    await Task.Yield();
+
+                    foreach (var entry in OpenKh.Egs.Hed.Read(hedStream))
+                    {
+                        cancellationToken.ThrowIfCancellationRequested();
+
+                    retry:
+                        try
+                        {
+                            var hash = OpenKh.Egs.Helpers.ToString(entry.MD5);
+                            if (!OpenKh.Egs.EgsTools.Names.TryGetValue(hash, out var fileName))
+                                fileName = $"{hash}.dat";
+
+                            var outputFileName = Path.Combine(outputDir, fileName);
+
+                            OpenKh.Egs.EgsTools.CreateDirectoryForFile(outputFileName);
+
+                            var hdAsset = new OpenKh.Egs.EgsHdAsset(img.SetPosition(entry.Offset));
+
+                            File.Create(outputFileName).Using(stream => stream.Write(hdAsset.OriginalData));
+
+                            outputFileName = Path.Combine(outputDir, REMASTERED_FILES_FOLDER_NAME, fileName);
+
+                            if (!ConfigurationService.SkipRemastered)
+                            {
+
+                                foreach (var asset in hdAsset.Assets)
+                                {
+                                    var outputFileNameRemastered = Path.Combine(OpenKh.Egs.EgsTools.GetHDAssetFolder(outputFileName), asset);
+
+                                    OpenKh.Egs.EgsTools.CreateDirectoryForFile(outputFileNameRemastered);
+
+                                    var assetData = hdAsset.RemasteredAssetsDecompressedData[asset];
+                                    File.Create(outputFileNameRemastered).Using(stream => stream.Write(assetData));
+                                }
+                            }
+                        }
+                        catch (Exception ex)
+                        {
+                            if (await ifRetry(ex))
+                            {
+                                goto retry;
+                            }
+                        }
+
+                        _procTotalFiles++;
+
+                        onProgress((float)_procTotalFiles / _totalFiles);
+                    }
+                }
+
+                if (extractkh1)
+                {
+                    for (int i = 0; i < 5; i++)
+                    {
+                        var outputDir = Path.Combine(gameDataLocation, "kh1");
+                        using var hedStream = File.OpenRead(getKhFilePath("kh1_" + _nameListkh1[i] + ".hed"));
+                        using var img = File.OpenRead(getKhFilePath("kh1_" + _nameListkh1[i] + ".pkg"));
+
+                        await ProcessHedStreamAsync(outputDir, hedStream, img);
+                    }
+                }
+                if (extractkh2)
+                {
+                    for (int i = 0; i < 6; i++)
+                    {
+                        var outputDir = Path.Combine(gameDataLocation, "kh2");
+                        using var hedStream = File.OpenRead(getKhFilePath("kh2_" + _nameListkh2[i] + ".hed"));
+                        using var img = File.OpenRead(getKhFilePath("kh2_" + _nameListkh2[i] + ".pkg"));
+
+                        await ProcessHedStreamAsync(outputDir, hedStream, img);
+                    }
+                }
+                if (extractbbs)
+                {
+                    for (int i = 0; i < 4; i++)
+                    {
+                        var outputDir = Path.Combine(gameDataLocation, "bbs");
+                        using var hedStream = File.OpenRead(getKhFilePath("bbs_" + _nameListbbs[i] + ".hed"));
+                        using var img = File.OpenRead(getKhFilePath("bbs_" + _nameListbbs[i] + ".pkg"));
+
+                        await ProcessHedStreamAsync(outputDir, hedStream, img);
+                    }
+                }
+                if (extractrecom)
+                {
+                    for (int i = 0; i < 1; i++)
+                    {
+                        var outputDir = Path.Combine(gameDataLocation, "Recom");
+                        using var hedStream = File.OpenRead(getKhFilePath("Recom.hed"));
+                        using var img = File.OpenRead(getKhFilePath("Recom.pkg"));
+
+                        await ProcessHedStreamAsync(outputDir, hedStream, img);
+                    }
+                }
+                if (extractkh3d)
+                {
+                    for (int i = 0; i < 4; i++)
+                    {
+                        var outputDir = Path.Combine(gameDataLocation, "kh3d");
+                        using var hedStream = File.OpenRead(getKh3dFilePath("kh3d_" + _nameListkh3d[i] + ".hed"));
+                        using var img = File.OpenRead(getKh3dFilePath("kh3d_" + _nameListkh3d[i] + ".pkg"));
+
+                        await ProcessHedStreamAsync(outputDir, hedStream, img);
+                    }
+                }
+                onProgress(1);
+            });
+        }
+    }
+}
diff --git a/OpenKh.Tools.ModsManager/Interfaces/IDebugging.cs b/OpenKh.Tools.ModsManager.Core/Compatibility/IDebugging.cs
similarity index 71%
rename from OpenKh.Tools.ModsManager/Interfaces/IDebugging.cs
rename to OpenKh.Tools.ModsManager.Core/Compatibility/IDebugging.cs
index 6337619be..e7c2d917b 100644
--- a/OpenKh.Tools.ModsManager/Interfaces/IDebugging.cs
+++ b/OpenKh.Tools.ModsManager.Core/Compatibility/IDebugging.cs
@@ -1,4 +1,4 @@
-namespace OpenKh.Tools.ModsManager.Interfaces
+namespace OpenKh.Tools.ModsManager.Core.Interfaces
 {
     public interface IDebugging
     {
diff --git a/OpenKh.Tools.ModsManager/Interfaces/IOperationDispatcher.cs b/OpenKh.Tools.ModsManager.Core/Compatibility/IOperationDispatcher.cs
similarity index 77%
rename from OpenKh.Tools.ModsManager/Interfaces/IOperationDispatcher.cs
rename to OpenKh.Tools.ModsManager.Core/Compatibility/IOperationDispatcher.cs
index 96ef2ec16..eeaa02a2d 100644
--- a/OpenKh.Tools.ModsManager/Interfaces/IOperationDispatcher.cs
+++ b/OpenKh.Tools.ModsManager.Core/Compatibility/IOperationDispatcher.cs
@@ -1,6 +1,6 @@
 using System.IO;
 
-namespace OpenKh.Tools.ModsManager.Interfaces
+namespace OpenKh.Tools.ModsManager.Core.Interfaces
 {
     public interface IOperationDispatcher
     {
diff --git a/OpenKh.Tools.ModsManager/Services/Pcsx2Injector.cs b/OpenKh.Tools.ModsManager.Core/Compatibility/Pcsx2Injector.cs
similarity index 99%
rename from OpenKh.Tools.ModsManager/Services/Pcsx2Injector.cs
rename to OpenKh.Tools.ModsManager.Core/Compatibility/Pcsx2Injector.cs
index 33c15e6f5..a353eb16b 100644
--- a/OpenKh.Tools.ModsManager/Services/Pcsx2Injector.cs
+++ b/OpenKh.Tools.ModsManager.Core/Compatibility/Pcsx2Injector.cs
@@ -1,6 +1,7 @@
+#nullable disable
 using OpenKh.Common;
 using OpenKh.Tools.Common;
-using OpenKh.Tools.ModsManager.Interfaces;
+using OpenKh.Tools.ModsManager.Core.Interfaces;
 using System.Buffers;
 using System.Diagnostics;
 using System.IO;
@@ -10,7 +11,7 @@
 using System.Threading.Tasks;
 using Xe.BinaryMapper;
 
-namespace OpenKh.Tools.ModsManager.Services
+namespace OpenKh.Tools.ModsManager.Core.Services
 {
     public class Pcsx2Injector
     {
diff --git a/OpenKh.Tools.ModsManager/Services/Pcsx2MemoryService.cs b/OpenKh.Tools.ModsManager.Core/Compatibility/Pcsx2MemoryService.cs
similarity index 99%
rename from OpenKh.Tools.ModsManager/Services/Pcsx2MemoryService.cs
rename to OpenKh.Tools.ModsManager.Core/Compatibility/Pcsx2MemoryService.cs
index 22945e659..d73b1745c 100644
--- a/OpenKh.Tools.ModsManager/Services/Pcsx2MemoryService.cs
+++ b/OpenKh.Tools.ModsManager.Core/Compatibility/Pcsx2MemoryService.cs
@@ -1,3 +1,4 @@
+#nullable disable
 /*
     Kingdom Save Editor
     Copyright (C) 2020 Luciano Ciccariello
@@ -23,7 +24,7 @@ You should have received a copy of the GNU General Public License
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace OpenKh.Tools.ModsManager.Services
+namespace OpenKh.Tools.ModsManager.Core.Services
 {
     public static class Pcsx2MemoryService
     {
diff --git a/OpenKh.Tools.ModsManager.Core/GameDataDetectionService.cs b/OpenKh.Tools.ModsManager.Core/GameDataDetectionService.cs
new file mode 100644
index 000000000..3f0edcc70
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Core/GameDataDetectionService.cs
@@ -0,0 +1,29 @@
+namespace OpenKh.Tools.ModsManager.Core;
+
+public static class GameDataDetectionService
+{
+    public static IReadOnlyList<GameInfo> FindExtractedGames(string rootDirectory)
+    {
+        if (string.IsNullOrWhiteSpace(rootDirectory) || !Directory.Exists(rootDirectory))
+            return [];
+
+        return GameInfo.SupportedGames
+            .Where(game => IsExtracted(rootDirectory, game))
+            .ToArray();
+    }
+
+    private static bool IsExtracted(string rootDirectory, GameInfo game)
+    {
+        var gameDirectory = Path.Combine(rootDirectory, game.Id);
+        return game.Id.ToLowerInvariant() switch
+        {
+            "kh1" => File.Exists(Path.Combine(gameDirectory, "btltbl.bin")),
+            "kh2" => File.Exists(Path.Combine(gameDirectory, "00objentry.bin")),
+            "bbs" => Directory.Exists(Path.Combine(gameDirectory, "message")),
+            "recom" => File.Exists(Path.Combine(gameDirectory, "CST_sora.pss")) ||
+                       Directory.Exists(Path.Combine(gameDirectory, "SYS")),
+            "kh3d" => Directory.Exists(Path.Combine(gameDirectory, "setdata")),
+            _ => false
+        };
+    }
+}
diff --git a/OpenKh.Tools.ModsManager.Core/GameExtractionService.cs b/OpenKh.Tools.ModsManager.Core/GameExtractionService.cs
new file mode 100644
index 000000000..919a8c3bf
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Core/GameExtractionService.cs
@@ -0,0 +1,86 @@
+using OpenKh.Tools.ModsManager.Core.Services;
+
+namespace OpenKh.Tools.ModsManager.Core;
+
+public sealed class GameExtractionService(ModManagerConfigurationService configuration)
+{
+    private readonly GameDataExtractionService _extraction = new();
+
+    public async Task ExtractAsync(
+        IReadOnlyCollection<GameInfo> games,
+        IProgress<ModOperationProgress>? progress = null,
+        CancellationToken cancellationToken = default)
+    {
+        if (games.Count == 0)
+            throw new InvalidOperationException("Select at least one game to extract.");
+
+        ConfigurationService.SkipRemastered = configuration.Current.SkipRemastered;
+        var completedGames = 0;
+        foreach (var game in games)
+        {
+            cancellationToken.ThrowIfCancellationRequested();
+            var gameProgress = new Action<float>(value => progress?.Report(new ModOperationProgress(
+                $"Extracting {game.DisplayName}",
+                (completedGames + value) / games.Count)));
+
+            if (configuration.Current.GameEdition == 1)
+                await ExtractPs2Async(game, gameProgress);
+            else if (configuration.Current.GameEdition == 2)
+                await ExtractPcAsync(game, gameProgress, cancellationToken);
+            else
+                throw new InvalidOperationException("Game extraction is available for PC releases and PS2 ISOs.");
+            completedGames++;
+        }
+
+        configuration.Current.GamesToExtract = games.Select(game => game.Id).ToList();
+        configuration.Save();
+        progress?.Report(new ModOperationProgress("Game extraction completed", 1));
+    }
+
+    private Task ExtractPs2Async(GameInfo game, Action<float> progress)
+    {
+        var iso = game.Id.ToLowerInvariant() switch
+        {
+            "kh1" => configuration.Current.IsoLocationKh1,
+            "kh2" => configuration.Current.IsoLocationKh2,
+            "recom" => configuration.Current.IsoLocationRecom,
+            _ => throw new InvalidOperationException($"{game.DisplayName} PS2 extraction is not supported.")
+        };
+        if (string.IsNullOrWhiteSpace(iso) || !File.Exists(iso))
+            throw new FileNotFoundException($"Configure the {game.DisplayName} ISO in Setup.", iso);
+
+        return game.Id.ToLowerInvariant() switch
+        {
+            "kh1" => _extraction.ExtractKh1Ps2EditionAsync(iso, configuration.GameDataDirectory, progress),
+            "kh2" => _extraction.ExtractKh2Ps2EditionAsync(iso, configuration.GameDataDirectory, progress),
+            "recom" => _extraction.ExtractRecomPs2EditionAsync(iso, configuration.GameDataDirectory, progress),
+            _ => Task.CompletedTask
+        };
+    }
+
+    private Task ExtractPcAsync(GameInfo game, Action<float> progress, CancellationToken cancellationToken)
+    {
+        var isKh3D = game.Id.Equals("kh3d", StringComparison.OrdinalIgnoreCase);
+        var releaseDirectory = isKh3D
+            ? configuration.Current.PcReleaseLocationKh3D
+            : configuration.Current.PcReleaseLocation;
+        if (string.IsNullOrWhiteSpace(releaseDirectory) || !Directory.Exists(releaseDirectory))
+            throw new DirectoryNotFoundException($"Configure the {game.DisplayName} PC release folder in Setup.");
+
+        var languageDirectory = configuration.Current.PcVersion.Equals("Steam", StringComparison.OrdinalIgnoreCase)
+            ? "dt"
+            : configuration.Current.PcReleaseLanguage.Equals("jp", StringComparison.OrdinalIgnoreCase) ? "jp" : "en";
+        return _extraction.ExtractKhPcEditionAsync(
+            configuration.GameDataDirectory,
+            progress,
+            fileName => Path.Combine(configuration.Current.PcReleaseLocation!, "Image", languageDirectory, fileName),
+            fileName => Path.Combine(configuration.Current.PcReleaseLocationKh3D!, "Image", languageDirectory, fileName),
+            game.Id.Equals("kh1", StringComparison.OrdinalIgnoreCase),
+            game.Id.Equals("kh2", StringComparison.OrdinalIgnoreCase),
+            game.Id.Equals("bbs", StringComparison.OrdinalIgnoreCase),
+            game.Id.Equals("Recom", StringComparison.OrdinalIgnoreCase),
+            game.Id.Equals("kh3d", StringComparison.OrdinalIgnoreCase),
+            _ => Task.FromResult(false),
+            cancellationToken);
+    }
+}
diff --git a/OpenKh.Tools.ModsManager.Core/GameInfo.cs b/OpenKh.Tools.ModsManager.Core/GameInfo.cs
new file mode 100644
index 000000000..1cb03ace6
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Core/GameInfo.cs
@@ -0,0 +1,17 @@
+namespace OpenKh.Tools.ModsManager.Core;
+
+public sealed record GameInfo(string Id, string DisplayName, string EnabledModsFileName, string ConfigFileSuffix)
+{
+    public static IReadOnlyList<GameInfo> SupportedGames { get; } =
+    [
+        new("kh2", "Kingdom Hearts II", "mods-KH2.txt", "KH2"),
+        new("kh1", "Kingdom Hearts", "mods-KH1.txt", "KH1"),
+        new("bbs", "Birth by Sleep", "mods-BBS.txt", "BBS"),
+        new("Recom", "Re:Chain of Memories", "mods-ReCoM.txt", "ReCoM"),
+        new("kh3d", "Dream Drop Distance", "mods-KH3D.txt", "KH3D")
+    ];
+
+    public static GameInfo FromId(string? id) =>
+        SupportedGames.FirstOrDefault(game =>
+            game.Id.Equals(id, StringComparison.OrdinalIgnoreCase)) ?? SupportedGames[0];
+}
diff --git a/OpenKh.Tools.ModsManager.Core/GameInstallationDetectionService.cs b/OpenKh.Tools.ModsManager.Core/GameInstallationDetectionService.cs
new file mode 100644
index 000000000..f8653eee5
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Core/GameInstallationDetectionService.cs
@@ -0,0 +1,149 @@
+using System.Text.Json;
+using System.Text.RegularExpressions;
+
+namespace OpenKh.Tools.ModsManager.Core;
+
+public sealed class GameInstallationDetectionService
+{
+    private const string RemixFolderName = "KINGDOM HEARTS -HD 1.5+2.5 ReMIX-";
+    private const string Kh3DFolderName = "KINGDOM HEARTS HD 2.8 Final Chapter Prologue";
+
+    public GameInstallationDetectionResult Detect(string platform) =>
+        platform.ToLowerInvariant() switch
+        {
+            "steam" => DetectSteam(),
+            "egs" => DetectEpicGamesStore(),
+            _ => new GameInstallationDetectionResult(
+                null,
+                null,
+                "Automatic detection is available for Steam and Epic Games Store.")
+        };
+
+    private static GameInstallationDetectionResult DetectSteam()
+    {
+        var libraries = FindSteamAppsDirectories().Distinct(StringComparer.OrdinalIgnoreCase).ToArray();
+        var remix = FindSteamGame(libraries, RemixFolderName);
+        var kh3D = FindSteamGame(libraries, Kh3DFolderName);
+        return CreateResult(remix, kh3D, "Steam");
+    }
+
+    private static GameInstallationDetectionResult DetectEpicGamesStore()
+    {
+        if (!OperatingSystem.IsWindows())
+            return new GameInstallationDetectionResult(
+                null,
+                null,
+                "Epic Games Store automatic detection is only available on Windows.");
+
+        var manifestsDirectory = Path.Combine(
+            Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData),
+            "Epic",
+            "EpicGamesLauncher",
+            "Data",
+            "Manifests");
+        if (!Directory.Exists(manifestsDirectory))
+            return CreateResult(null, null, "Epic Games Store");
+
+        string? remix = null;
+        string? kh3D = null;
+        foreach (var manifest in Directory.EnumerateFiles(manifestsDirectory, "*.item"))
+        {
+            try
+            {
+                using var document = JsonDocument.Parse(File.ReadAllText(manifest));
+                var root = document.RootElement;
+                if (!root.TryGetProperty("LaunchExecutable", out var executableProperty) ||
+                    !root.TryGetProperty("InstallLocation", out var locationProperty))
+                    continue;
+
+                var executable = executableProperty.GetString();
+                var location = locationProperty.GetString();
+                if (string.IsNullOrWhiteSpace(location) || !Directory.Exists(location))
+                    continue;
+                if (executable?.Equals("KINGDOM HEARTS HD 1.5+2.5 ReMIX.exe", StringComparison.OrdinalIgnoreCase) == true)
+                    remix = location;
+                else if (executable?.Equals("KINGDOM HEARTS HD 2.8 Final Chapter Prologue.exe", StringComparison.OrdinalIgnoreCase) == true)
+                    kh3D = location;
+            }
+            catch (JsonException)
+            {
+            }
+            catch (IOException)
+            {
+            }
+        }
+
+        return CreateResult(remix, kh3D, "Epic Games Store");
+    }
+
+    private static IEnumerable<string> FindSteamAppsDirectories()
+    {
+        var home = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
+        var candidates = new List<string>();
+        if (OperatingSystem.IsWindows())
+        {
+            var programFilesX86 = Environment.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86);
+            if (!string.IsNullOrWhiteSpace(programFilesX86))
+                candidates.Add(Path.Combine(programFilesX86, "Steam", "steamapps"));
+        }
+        else if (!string.IsNullOrWhiteSpace(home))
+        {
+            candidates.Add(Path.Combine(home, ".local", "share", "Steam", "steamapps"));
+            candidates.Add(Path.Combine(home, ".steam", "steam", "steamapps"));
+        }
+
+        foreach (var steamAppsDirectory in candidates.Where(Directory.Exists))
+        {
+            yield return steamAppsDirectory;
+            var libraryFile = Path.Combine(steamAppsDirectory, "libraryfolders.vdf");
+            if (!File.Exists(libraryFile))
+                continue;
+
+            string contents;
+            try
+            {
+                contents = File.ReadAllText(libraryFile);
+            }
+            catch (IOException)
+            {
+                continue;
+            }
+
+            foreach (Match match in Regex.Matches(contents, "\\\"path\\\"\\s*\\\"([^\\\"]+)\\\"", RegexOptions.IgnoreCase))
+            {
+                var libraryRoot = match.Groups[1].Value.Replace("\\\\", "\\");
+                var librarySteamApps = Path.Combine(libraryRoot, "steamapps");
+                if (Directory.Exists(librarySteamApps))
+                    yield return librarySteamApps;
+            }
+        }
+    }
+
+    private static string? FindSteamGame(IEnumerable<string> steamAppsDirectories, string folderName)
+    {
+        foreach (var steamAppsDirectory in steamAppsDirectories)
+        {
+            var gameDirectory = Path.Combine(steamAppsDirectory, "common", folderName);
+            if (Directory.Exists(gameDirectory) && File.Exists(Path.Combine(gameDirectory, "steam_api64.dll")))
+                return gameDirectory;
+        }
+        return null;
+    }
+
+    private static GameInstallationDetectionResult CreateResult(string? remix, string? kh3D, string platform)
+    {
+        var message = (remix, kh3D) switch
+        {
+            (not null, not null) => $"Both game collections were found through {platform}.",
+            (not null, null) => $"HD 1.5+2.5 ReMIX was found through {platform}. HD 2.8 was not found.",
+            (null, not null) => $"HD 2.8 was found through {platform}. HD 1.5+2.5 ReMIX was not found.",
+            _ => $"No supported game installation was found through {platform}."
+        };
+        return new GameInstallationDetectionResult(remix, kh3D, message);
+    }
+}
+
+public sealed record GameInstallationDetectionResult(
+    string? RemixDirectory,
+    string? Kh3DDirectory,
+    string Message);
diff --git a/OpenKh.Tools.ModsManager.Core/GameLaunchPolicy.cs b/OpenKh.Tools.ModsManager.Core/GameLaunchPolicy.cs
new file mode 100644
index 000000000..bfccf639b
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Core/GameLaunchPolicy.cs
@@ -0,0 +1,11 @@
+namespace OpenKh.Tools.ModsManager.Core;
+
+public static class GameLaunchPolicy
+{
+    public static bool ShouldUseSteamClient(
+        string? pcVersion,
+        bool directLaunchConfigured,
+        bool isLinux) =>
+        string.Equals(pcVersion, "Steam", StringComparison.OrdinalIgnoreCase) &&
+        (isLinux || !directLaunchConfigured);
+}
diff --git a/OpenKh.Tools.ModsManager.Core/GameLaunchService.cs b/OpenKh.Tools.ModsManager.Core/GameLaunchService.cs
new file mode 100644
index 000000000..16888cd3a
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Core/GameLaunchService.cs
@@ -0,0 +1,325 @@
+using System.ComponentModel;
+using System.Diagnostics;
+using OpenKh.Tools.ModsManager.Core.Services;
+
+namespace OpenKh.Tools.ModsManager.Core;
+
+public sealed class GameLaunchService(ModManagerConfigurationService configuration)
+{
+    private Process? _runningProcess;
+    private Pcsx2Injector? _pcsx2Injector;
+    private static readonly IReadOnlyDictionary<string, string> Executables =
+        new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+        {
+            ["kh2"] = "KINGDOM HEARTS II FINAL MIX.exe",
+            ["kh1"] = "KINGDOM HEARTS FINAL MIX.exe",
+            ["bbs"] = "KINGDOM HEARTS Birth by Sleep FINAL MIX.exe",
+            ["Recom"] = "KINGDOM HEARTS Re_Chain of Memories.exe",
+            ["kh3d"] = "KINGDOM HEARTS Dream Drop Distance.exe"
+        };
+
+    public Task LaunchAsync(GameInfo game, CancellationToken cancellationToken = default)
+    {
+        cancellationToken.ThrowIfCancellationRequested();
+        return configuration.Current.GameEdition switch
+        {
+            1 => LaunchPcsx2Async(game),
+            2 => LaunchPcAsync(game),
+            _ => throw new InvalidOperationException("Select a supported game edition in Setup.")
+        };
+    }
+
+    public event Action? RunningStateChanged;
+
+    public bool IsRunning
+    {
+        get
+        {
+            try
+            {
+                return _runningProcess is { HasExited: false };
+            }
+            catch
+            {
+                return false;
+            }
+        }
+    }
+
+    public void Stop()
+    {
+        var process = _runningProcess;
+        _runningProcess = null;
+        _pcsx2Injector?.Stop();
+        _pcsx2Injector = null;
+        if (process is not null)
+        {
+            try
+            {
+                if (!process.HasExited)
+                {
+                    process.CloseMainWindow();
+                    if (!process.WaitForExit(1500))
+                        process.Kill(true);
+                }
+            }
+            finally
+            {
+                process.Dispose();
+            }
+        }
+        RunningStateChanged?.Invoke();
+    }
+
+    private Task LaunchPcsx2Async(GameInfo game)
+    {
+        var executable = RequireFile(configuration.Current.Pcsx2Location, "PCSX2");
+        var iso = game.Id.ToLowerInvariant() switch
+        {
+            "kh1" => configuration.Current.IsoLocationKh1,
+            "recom" => configuration.Current.IsoLocationRecom,
+            _ => configuration.Current.IsoLocationKh2
+        };
+        iso = RequireFile(iso, $"{game.DisplayName} ISO");
+        var process = StartTracked(new ProcessStartInfo
+        {
+            FileName = executable,
+            WorkingDirectory = Path.GetDirectoryName(executable),
+            ArgumentList = { iso },
+            UseShellExecute = false
+        });
+        if (OperatingSystem.IsWindows())
+        {
+            var regionId = Math.Clamp(configuration.Current.RegionId, 0, OpenKh.Kh2.Constants.Regions.Length - 1);
+            _pcsx2Injector = new Pcsx2Injector(new Pcsx2OperationDispatcher(configuration, game))
+            {
+                RegionId = regionId,
+                Region = OpenKh.Kh2.Constants.Regions[regionId],
+                Language = OpenKh.Kh2.Constants.Languages[regionId]
+            };
+            _pcsx2Injector.Run(process, new NullDebugging());
+        }
+        return Task.CompletedTask;
+    }
+
+    private Task LaunchPcAsync(GameInfo game)
+    {
+        var isKh3D = game.Id.Equals("kh3d", StringComparison.OrdinalIgnoreCase);
+        var releaseDirectory = isKh3D
+            ? configuration.Current.PcReleaseLocationKh3D
+            : configuration.Current.PcReleaseLocation;
+        if (string.IsNullOrWhiteSpace(releaseDirectory) || !Directory.Exists(releaseDirectory))
+            throw new DirectoryNotFoundException($"The {game.DisplayName} installation folder is not configured.");
+
+        WritePanaceaSettings(releaseDirectory, game);
+        if (configuration.Current.PcVersion.Equals("Steam", StringComparison.OrdinalIgnoreCase))
+        {
+            var useDirectLaunch = isKh3D
+                ? configuration.Current.SteamApiTrick28
+                : configuration.Current.SteamApiTrick1525;
+            if (GameLaunchPolicy.ShouldUseSteamClient(
+                    configuration.Current.PcVersion,
+                    useDirectLaunch,
+                    OperatingSystem.IsLinux()))
+            {
+                OpenSteamGame(isKh3D ? "2552440" : "2552430");
+                return Task.CompletedTask;
+            }
+        }
+        else if (configuration.Current.PcVersion.Equals("EGS", StringComparison.OrdinalIgnoreCase))
+        {
+            OpenEpicGame(isKh3D);
+            return Task.CompletedTask;
+        }
+
+        if (OperatingSystem.IsLinux())
+        {
+            throw new PlatformNotSupportedException(
+                "Launching Windows game executables directly is not supported on Linux. " +
+                "Select Steam or Epic Games Store so a Linux-compatible launcher can start the game.");
+        }
+
+        var executable = Path.Combine(releaseDirectory, Executables[game.Id]);
+        RequireFile(executable, game.DisplayName);
+        StartTracked(new ProcessStartInfo
+        {
+            FileName = executable,
+            WorkingDirectory = releaseDirectory,
+            UseShellExecute = false
+        });
+        return Task.CompletedTask;
+    }
+
+    private void WritePanaceaSettings(string releaseDirectory, GameInfo game)
+    {
+        if (!configuration.Current.PanaceaInstalled)
+            return;
+
+        var settingsPath = Path.Combine(releaseDirectory, "panacea_settings.txt");
+        var values = File.Exists(settingsPath)
+            ? File.ReadAllLines(settingsPath)
+                .Where(line => line.Contains('='))
+                .Select(line => line.Split('=', 2))
+                .ToDictionary(parts => parts[0].Trim(), parts => parts[1].Trim(), StringComparer.OrdinalIgnoreCase)
+            : new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+        values["mod_path"] = PanaceaPath.ToLoaderPath(
+            Path.GetFullPath(Path.Combine(configuration.GetGameModOutputDirectory(game), "..")));
+        values["show_console"] = configuration.Current.ShowConsole.ToString().ToLowerInvariant();
+        values["quick_launch"] = game.Id;
+        File.WriteAllLines(settingsPath, values.Select(value => $"{value.Key}={value.Value}"));
+    }
+
+    private static string RequireFile(string? fileName, string description)
+    {
+        if (string.IsNullOrWhiteSpace(fileName) || !File.Exists(fileName))
+            throw new FileNotFoundException($"The {description} file is not configured or cannot be found.", fileName);
+        return fileName;
+    }
+
+    private static void OpenUri(string uri) => Start(new ProcessStartInfo(uri) { UseShellExecute = true });
+
+    private static void OpenSteamGame(string appId)
+    {
+        var uri = $"steam://rungameid/{appId}";
+        if (!OperatingSystem.IsLinux())
+        {
+            OpenUri(uri);
+            return;
+        }
+
+        var launchers = new[]
+        {
+            (Command: "steam", Arguments: new[] { uri }),
+            (Command: "xdg-open", Arguments: new[] { uri }),
+            (Command: "gio", Arguments: new[] { "open", uri }),
+            (Command: "flatpak", Arguments: new[] { "run", "com.valvesoftware.Steam", uri })
+        };
+        if (TryStartFirstAvailable(launchers))
+            return;
+
+        throw new InvalidOperationException(
+            "Steam could not be found. Install Steam or make the steam, xdg-open, gio, or flatpak command available.");
+    }
+
+    private static void OpenEpicGame(bool isKh3D)
+    {
+        var appName = isKh3D
+            ? "d1a8f7c478d4439b8c60a5808715dc05"
+            : "68c214c58f694ae88c2dab6f209b43e4";
+        var epicUri = isKh3D
+            ? "com.epicgames.launcher://apps/c8ff067c1c984cd7ab1998e8a9afc8b6%3Aaa743b9f52e84930b0ba1b701951e927%3Ad1a8f7c478d4439b8c60a5808715dc05?action=launch&silent=true"
+            : "com.epicgames.launcher://apps/4158b699dd70447a981fee752d970a3e%3A5aac304f0e8948268ddfd404334dbdc7%3A68c214c58f694ae88c2dab6f209b43e4?action=launch&silent=true";
+        if (!OperatingSystem.IsLinux())
+        {
+            OpenUri(epicUri);
+            return;
+        }
+
+        var heroicUri = $"heroic://launch?appName={appName}&runner=legendary";
+        var launchers = new List<(string Command, string[] Arguments)>
+        {
+            ("heroic", ["--no-gui", "--no-sandbox", heroicUri]),
+            ("legendary", ["launch", appName])
+        };
+        if (IsFlatpakAppInstalled("com.heroicgameslauncher.hgl"))
+        {
+            launchers.Add((
+                "flatpak",
+                ["run", "com.heroicgameslauncher.hgl", "--no-gui", "--no-sandbox", heroicUri]));
+        }
+        launchers.Add(("xdg-open", [heroicUri]));
+        launchers.Add(("gio", ["open", heroicUri]));
+        launchers.Add(("xdg-open", [epicUri]));
+        launchers.Add(("gio", ["open", epicUri]));
+
+        if (TryStartFirstAvailable(launchers))
+            return;
+
+        throw new InvalidOperationException(
+            "Epic Games could not be launched on Linux. Install Heroic or Legendary, or register an Epic Games URI handler.");
+    }
+
+    private static bool TryStartFirstAvailable(
+        IEnumerable<(string Command, string[] Arguments)> launchers)
+    {
+        foreach (var launcher in launchers.Where(candidate => CommandExists(candidate.Command)))
+        {
+            try
+            {
+                var startInfo = new ProcessStartInfo
+                {
+                    FileName = launcher.Command,
+                    UseShellExecute = false
+                };
+                foreach (var argument in launcher.Arguments)
+                    startInfo.ArgumentList.Add(argument);
+                using var process = Process.Start(startInfo);
+                if (process is null)
+                    continue;
+                if (process.WaitForExit(1000) && process.ExitCode != 0)
+                    continue;
+                return true;
+            }
+            catch (Win32Exception)
+            {
+            }
+        }
+
+        return false;
+    }
+
+    private static bool CommandExists(string command)
+    {
+        var path = Environment.GetEnvironmentVariable("PATH");
+        if (string.IsNullOrWhiteSpace(path))
+            return false;
+
+        return path.Split(Path.PathSeparator, StringSplitOptions.RemoveEmptyEntries)
+            .Select(directory => Path.Combine(directory.Trim(), command))
+            .Any(File.Exists);
+    }
+
+    private static bool IsFlatpakAppInstalled(string applicationId)
+    {
+        if (!CommandExists("flatpak"))
+            return false;
+
+        var homeDirectory = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
+        var candidates = new[]
+        {
+            Path.Combine(homeDirectory, ".var", "app", applicationId),
+            Path.Combine(homeDirectory, ".local", "share", "flatpak", "app", applicationId),
+            Path.Combine(Path.DirectorySeparatorChar.ToString(), "var", "lib", "flatpak", "app", applicationId)
+        };
+        return candidates.Any(Directory.Exists);
+    }
+
+    private Process StartTracked(ProcessStartInfo startInfo)
+    {
+        Stop();
+        var process = Process.Start(startInfo) ??
+            throw new InvalidOperationException($"Could not start {startInfo.FileName}.");
+        _runningProcess = process;
+        process.EnableRaisingEvents = true;
+        process.Exited += (_, _) => HandleProcessExited(process);
+        RunningStateChanged?.Invoke();
+        return process;
+    }
+
+    private void HandleProcessExited(Process process)
+    {
+        if (!ReferenceEquals(_runningProcess, process))
+            return;
+        _pcsx2Injector?.Stop();
+        _pcsx2Injector = null;
+        _runningProcess = null;
+        process.Dispose();
+        RunningStateChanged?.Invoke();
+    }
+
+    private static void Start(ProcessStartInfo startInfo)
+    {
+        if (Process.Start(startInfo) is null)
+            throw new InvalidOperationException($"Could not start {startInfo.FileName}.");
+    }
+}
diff --git a/OpenKh.Tools.ModsManager.Core/InstallationLayout.cs b/OpenKh.Tools.ModsManager.Core/InstallationLayout.cs
new file mode 100644
index 000000000..088d67338
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Core/InstallationLayout.cs
@@ -0,0 +1,42 @@
+namespace OpenKh.Tools.ModsManager.Core;
+
+public sealed class InstallationLayout
+{
+    private InstallationLayout(string rootDirectory)
+    {
+        RootDirectory = Path.GetFullPath(rootDirectory);
+    }
+
+    public string RootDirectory { get; }
+    public string ConfigurationFile => Path.Combine(RootDirectory, "mods-manager.yml");
+
+    public static InstallationLayout Detect(string applicationBaseDirectory, IEnumerable<string>? arguments = null)
+    {
+        var argumentList = arguments?.ToArray() ?? [];
+        for (var index = 0; index < argumentList.Length - 1; index++)
+        {
+            if (argumentList[index].Equals("--data-root", StringComparison.OrdinalIgnoreCase))
+                return new InstallationLayout(argumentList[index + 1]);
+        }
+
+        var applicationDirectory = new DirectoryInfo(
+            Path.GetFullPath(applicationBaseDirectory).TrimEnd(
+                Path.DirectorySeparatorChar,
+                Path.AltDirectorySeparatorChar));
+
+        if (applicationDirectory.Name.Equals("Apps", StringComparison.OrdinalIgnoreCase) &&
+            applicationDirectory.Parent is not null)
+        {
+            return new InstallationLayout(applicationDirectory.Parent.FullName);
+        }
+
+        if (applicationDirectory.Name.Equals("ModManager", StringComparison.OrdinalIgnoreCase) &&
+            applicationDirectory.Parent?.Name.Equals("Apps", StringComparison.OrdinalIgnoreCase) == true &&
+            applicationDirectory.Parent.Parent is not null)
+        {
+            return new InstallationLayout(applicationDirectory.Parent.Parent.FullName);
+        }
+
+        return new InstallationLayout(applicationDirectory.FullName);
+    }
+}
diff --git a/OpenKh.Tools.ModsManager.Core/LegacyExtractionConfiguration.cs b/OpenKh.Tools.ModsManager.Core/LegacyExtractionConfiguration.cs
new file mode 100644
index 000000000..5a759d412
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Core/LegacyExtractionConfiguration.cs
@@ -0,0 +1,6 @@
+namespace OpenKh.Tools.ModsManager.Core.Services;
+
+internal static class ConfigurationService
+{
+    public static bool SkipRemastered { get; set; }
+}
diff --git a/OpenKh.Tools.ModsManager.Core/LegacyInstallationCleanup.cs b/OpenKh.Tools.ModsManager.Core/LegacyInstallationCleanup.cs
new file mode 100644
index 000000000..d8db11f17
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Core/LegacyInstallationCleanup.cs
@@ -0,0 +1,163 @@
+using System.Diagnostics;
+using System.Text;
+
+namespace OpenKh.Tools.ModsManager.Core;
+
+public static class LegacyInstallationCleanup
+{
+    private static readonly string[] PreviousApplicationDirectories =
+    [
+        "AdvancedTools",
+        Path.Combine("Apps", "ModManager"),
+    ];
+
+    private static readonly string[] FallbackLegacyResourceDirectories =
+    [
+        "cs-CZ", "de", "es", "fr", "hu", "it", "ja-JP", "pt-BR", "resources",
+        "ro", "ru", "runtimes", "sv", "zh-Hans",
+    ];
+
+    public static void Schedule(string installationDirectory)
+    {
+        if (!IsOrganizedInstallation(installationDirectory))
+            return;
+
+        var files = GetLegacyApplicationFiles(installationDirectory).Where(File.Exists).ToArray();
+        var directories = GetLegacyResourceDirectories(installationDirectory)
+            .Select(name => Path.Combine(installationDirectory, name))
+            .Concat(PreviousApplicationDirectories.Select(name => Path.Combine(installationDirectory, name)))
+            .Where(Directory.Exists)
+            .ToArray();
+        if (files.Length == 0 && directories.Length == 0)
+            return;
+
+        if (!OperatingSystem.IsWindows())
+        {
+            foreach (var file in files)
+                TryDeleteFile(file);
+            foreach (var directory in directories)
+                TryDeleteDirectory(directory);
+            return;
+        }
+
+        // The old root DLLs may still be loaded by the process that performed the update.
+        var batchPath = Path.Combine(Path.GetTempPath(), $"openkh-migrate-{Guid.NewGuid():N}.bat");
+        var batch = new StringBuilder()
+            .AppendLine("@echo off")
+            .AppendLine("chcp 65001 > nul")
+            .AppendLine(":wait_for_mod_manager")
+            .AppendLine($"tasklist /fi \"PID eq {Environment.ProcessId}\" 2>nul | find \"{Environment.ProcessId}\" >nul")
+            .AppendLine("if not errorlevel 1 (")
+            .AppendLine("    timeout /t 1 /nobreak >nul")
+            .AppendLine("    goto wait_for_mod_manager")
+            .AppendLine(")");
+        foreach (var file in files)
+        {
+            var path = EscapeBatchPath(file);
+            batch.AppendLine($"attrib -h -r {path} 2>nul");
+            batch.AppendLine($"del /f /q {path} 2>nul");
+        }
+        foreach (var directory in directories)
+            batch.AppendLine($"rmdir /s /q {EscapeBatchPath(directory)} 2>nul");
+        batch.AppendLine("del /f /q \"%~f0\"");
+        File.WriteAllText(batchPath, batch.ToString(), new UTF8Encoding(false));
+
+        Process.Start(new ProcessStartInfo
+        {
+            FileName = batchPath,
+            UseShellExecute = true,
+            WindowStyle = ProcessWindowStyle.Hidden,
+        });
+    }
+
+    public static IReadOnlyList<string> GetLegacyPaths(string installationDirectory) =>
+        GetLegacyApplicationFiles(installationDirectory)
+            .Concat(GetLegacyResourceDirectories(installationDirectory)
+                .Select(name => Path.Combine(installationDirectory, name)))
+            .Concat(PreviousApplicationDirectories.Select(name => Path.Combine(installationDirectory, name)))
+            .Where(path => File.Exists(path) || Directory.Exists(path))
+            .ToArray();
+
+    private static bool IsOrganizedInstallation(string installationDirectory) =>
+        (File.Exists(Path.Combine(installationDirectory, "OpenKh.Launcher.exe")) ||
+         File.Exists(Path.Combine(installationDirectory, "OpenKh.Launcher"))) &&
+        (File.Exists(Path.Combine(installationDirectory, "Apps", "OpenKh.Tools.ModsManager.exe")) ||
+         File.Exists(Path.Combine(installationDirectory, "Apps", "OpenKh.Tools.ModsManager")));
+
+    private static IEnumerable<string> GetLegacyApplicationFiles(string installationDirectory)
+    {
+        var manifestPath = Path.Combine(installationDirectory, "Apps", "legacy-release-files.txt");
+        if (!File.Exists(manifestPath))
+        {
+            return Directory.Exists(installationDirectory)
+                ? Directory.EnumerateFiles(installationDirectory, "*", SearchOption.TopDirectoryOnly)
+                    .Where(IsLegacyApplicationFile)
+                : [];
+        }
+
+        var names = File.ReadAllLines(manifestPath)
+            .Where(name => !string.IsNullOrWhiteSpace(name))
+            .ToHashSet(StringComparer.OrdinalIgnoreCase);
+        return Directory.EnumerateFiles(installationDirectory, "*", SearchOption.TopDirectoryOnly)
+            .Where(path => names.Contains(Path.GetFileName(path)) ||
+                Path.GetFileName(path).StartsWith("OpenKh.Tools.ModsManager.", StringComparison.OrdinalIgnoreCase))
+            .Where(path => !IsPreservedRootExecutable(path));
+    }
+
+    private static IEnumerable<string> GetLegacyResourceDirectories(string installationDirectory)
+    {
+        var manifestPath = Path.Combine(installationDirectory, "Apps", "legacy-release-directories.txt");
+        return File.Exists(manifestPath)
+            ? File.ReadAllLines(manifestPath).Where(name => !string.IsNullOrWhiteSpace(name))
+            : FallbackLegacyResourceDirectories;
+    }
+
+    private static bool IsLegacyApplicationFile(string path)
+    {
+        if (IsPreservedRootExecutable(path))
+            return false;
+
+        var name = Path.GetFileName(path);
+        if (Path.GetExtension(name).Equals(".dll", StringComparison.OrdinalIgnoreCase))
+            return true;
+        if (!name.StartsWith("OpenKh.", StringComparison.OrdinalIgnoreCase))
+            return false;
+        return name.EndsWith(".exe", StringComparison.OrdinalIgnoreCase) ||
+               name.EndsWith(".pdb", StringComparison.OrdinalIgnoreCase) ||
+               name.EndsWith(".deps.json", StringComparison.OrdinalIgnoreCase) ||
+               name.EndsWith(".runtimeconfig.json", StringComparison.OrdinalIgnoreCase) ||
+               name.EndsWith(".config", StringComparison.OrdinalIgnoreCase);
+    }
+
+    private static bool IsPreservedRootExecutable(string path)
+    {
+        var name = Path.GetFileName(path);
+        return name.Equals("OpenKh.Launcher.exe", StringComparison.OrdinalIgnoreCase) ||
+               name.Equals("OpenKh.Launcher", StringComparison.OrdinalIgnoreCase) ||
+               name.Equals("OpenKh.Tools.ModsManager.exe", StringComparison.OrdinalIgnoreCase);
+    }
+
+    private static string EscapeBatchPath(string path) => $"\"{path.Replace("\"", "\"\"")}\"";
+
+    private static void TryDeleteFile(string path)
+    {
+        try
+        {
+            File.Delete(path);
+        }
+        catch (Exception exception) when (exception is IOException or UnauthorizedAccessException)
+        {
+        }
+    }
+
+    private static void TryDeleteDirectory(string path)
+    {
+        try
+        {
+            Directory.Delete(path, true);
+        }
+        catch (Exception exception) when (exception is IOException or UnauthorizedAccessException)
+        {
+        }
+    }
+}
diff --git a/OpenKh.Tools.ModsManager.Core/LegacyModFormat.cs b/OpenKh.Tools.ModsManager.Core/LegacyModFormat.cs
new file mode 100644
index 000000000..cbc52570f
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Core/LegacyModFormat.cs
@@ -0,0 +1,28 @@
+namespace OpenKh.Tools.ModsManager.Core;
+
+internal static class LegacyModFormat
+{
+    public const string PcPatchMarkerFileName = ".openkh-pcpatch";
+
+    private static readonly string[] PcPatchNames =
+    [
+        "KH1PCPATCH",
+        "KH2PCPATCH",
+        "COMPCPATCH",
+        "BBSPCPATCH",
+        "DDDPCPATCH"
+    ];
+
+    public static bool IsPcPatch(string directory, ModMetadata? metadata)
+    {
+        if (File.Exists(Path.Combine(directory, PcPatchMarkerFileName)))
+            return true;
+
+        // Older imports predate the marker file but have metadata generated by the PC Patch importer.
+        return PcPatchNames.Any(name =>
+            metadata?.Title?.EndsWith($" ({name})", StringComparison.OrdinalIgnoreCase) == true ||
+            metadata?.Description?.Equals(
+                $"Metadata generated for an imported {name} modification.",
+                StringComparison.OrdinalIgnoreCase) == true);
+    }
+}
diff --git a/OpenKh.Tools.ModsManager.Core/LocalModInstaller.cs b/OpenKh.Tools.ModsManager.Core/LocalModInstaller.cs
new file mode 100644
index 000000000..533d8da30
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Core/LocalModInstaller.cs
@@ -0,0 +1,298 @@
+using System.IO.Compression;
+using OpenKh.Patcher;
+
+namespace OpenKh.Tools.ModsManager.Core;
+
+public sealed class LocalModInstaller
+{
+    private const string MetadataFileName = "mod.yml";
+    private readonly ModManagerConfigurationService _configuration;
+
+    public LocalModInstaller(InstallationLayout layout)
+        : this(new ModManagerConfigurationService(layout))
+    {
+    }
+
+    public LocalModInstaller(ModManagerConfigurationService configuration)
+    {
+        _configuration = configuration;
+        _configuration.EnsureDirectories();
+    }
+
+    public Task<ModInstallResult> InstallAsync(string packagePath, GameInfo game) =>
+        InstallAsync(packagePath, game, false, CancellationToken.None);
+
+    public Task<ModInstallResult> InstallAsync(
+        string packagePath,
+        GameInfo game,
+        bool overwrite,
+        CancellationToken cancellationToken = default) =>
+        Task.Run(() => Install(packagePath, game, overwrite, cancellationToken), cancellationToken);
+
+    public string? FindInstalledMod(string packagePath, GameInfo game)
+    {
+        if (!File.Exists(packagePath))
+            throw new FileNotFoundException("The selected mod package does not exist.", packagePath);
+
+        using var archive = ZipFile.OpenRead(packagePath);
+        var package = InspectPackage(packagePath, archive);
+        var destinationRoot = package.Metadata?.IsCollection == true
+            ? GetCollectionsDirectory()
+            : GetGameModsDirectory(game);
+        var destinationDirectory = Path.Combine(destinationRoot, package.Name);
+        return Directory.Exists(destinationDirectory) ? package.Name : null;
+    }
+
+    private ModInstallResult Install(
+        string packagePath,
+        GameInfo game,
+        bool overwrite,
+        CancellationToken cancellationToken)
+    {
+        if (!File.Exists(packagePath))
+            throw new FileNotFoundException("The selected mod package does not exist.", packagePath);
+
+        using var archive = ZipFile.OpenRead(packagePath);
+        var package = InspectPackage(packagePath, archive);
+        var destinationRoot = package.Metadata?.IsCollection == true
+            ? GetCollectionsDirectory()
+            : GetGameModsDirectory(game);
+        var destinationDirectory = Path.Combine(destinationRoot, package.Name);
+
+        if (Directory.Exists(destinationDirectory))
+        {
+            if (!overwrite)
+                throw new ModAlreadyInstalledException(package.Name);
+
+            foreach (var file in Directory.EnumerateFiles(destinationDirectory, "*", SearchOption.AllDirectories))
+                File.SetAttributes(file, FileAttributes.Normal);
+            Directory.Delete(destinationDirectory, true);
+        }
+
+        Directory.CreateDirectory(destinationDirectory);
+        try
+        {
+            if (package.PatchArchive is not null)
+            {
+                ExtractPatchArchive(archive, destinationDirectory, package.PatchArchive, cancellationToken);
+            }
+            else
+            {
+                foreach (var entry in archive.Entries)
+                {
+                    cancellationToken.ThrowIfCancellationRequested();
+                    ExtractEntry(entry, package.Layout.Prefix, destinationDirectory);
+                }
+            }
+
+            if (!File.Exists(Path.Combine(destinationDirectory, MetadataFileName)))
+                throw new InvalidDataException("The package did not extract a mod.yml file.");
+        }
+        catch
+        {
+            Directory.Delete(destinationDirectory, true);
+            throw;
+        }
+
+        return new ModInstallResult(
+            package.Name,
+            string.IsNullOrWhiteSpace(package.Metadata?.Title)
+                ? package.PatchArchive?.DisplayName ?? package.Name
+                : package.Metadata.Title,
+            destinationDirectory);
+    }
+
+    private static PackageInspection InspectPackage(string packagePath, ZipArchive archive)
+    {
+        var patchArchive = PatchArchiveInfo.FromFileName(packagePath);
+        var packageLayout = patchArchive is null ? GetPackageLayout(archive) : new PackageLayout(string.Empty);
+        ModMetadata? metadata = null;
+        if (patchArchive is null)
+        {
+            var metadataEntry = archive.Entries.First(entry =>
+                NormalizeEntryName(entry.FullName).Equals(
+                    $"{packageLayout.Prefix}{MetadataFileName}",
+                    StringComparison.OrdinalIgnoreCase));
+            using var metadataReader = new StreamReader(metadataEntry.Open());
+            metadata = ModMetadata.Read(metadataReader);
+        }
+
+        return new PackageInspection(
+            CreateSafeDirectoryName(Path.GetFileNameWithoutExtension(packagePath)),
+            packageLayout,
+            patchArchive,
+            metadata);
+    }
+
+    private static void ExtractPatchArchive(
+        ZipArchive archive,
+        string destinationDirectory,
+        PatchArchiveInfo patchArchive,
+        CancellationToken cancellationToken)
+    {
+        var assets = new List<AssetFile>();
+        foreach (var entry in archive.Entries.Where(entry => !string.IsNullOrEmpty(entry.Name)))
+        {
+            cancellationToken.ThrowIfCancellationRequested();
+            var normalizedName = NormalizeEntryName(entry.FullName);
+            var parts = normalizedName.Split('/', StringSplitOptions.RemoveEmptyEntries);
+            if (parts.Length < 2)
+                continue;
+
+            var package = parts[0];
+            var originalIndex = Array.FindIndex(parts, part => part.Equals("original", StringComparison.OrdinalIgnoreCase));
+            var relativeParts = originalIndex >= 0 ? parts.Skip(originalIndex + 1) : parts.Skip(1);
+            var relativeName = string.Join('/', relativeParts);
+            if (string.IsNullOrWhiteSpace(relativeName))
+                continue;
+
+            ExtractFile(entry, relativeName, destinationDirectory, true);
+            assets.Add(new AssetFile
+            {
+                Method = "copy",
+                Name = relativeName,
+                Package = package,
+                Platform = "pc",
+                Source = [new AssetFile { Name = relativeName }]
+            });
+        }
+
+        var metadata = new Metadata
+        {
+            Title = patchArchive.DisplayName,
+            OriginalAuthor = "Unknown",
+            Description = $"Metadata generated for an imported {patchArchive.ExtensionName} modification.",
+            Game = patchArchive.GameId,
+            Assets = assets
+        };
+        using var metadataStream = File.Create(Path.Combine(destinationDirectory, MetadataFileName));
+        metadata.Write(metadataStream);
+        File.WriteAllText(
+            Path.Combine(destinationDirectory, LegacyModFormat.PcPatchMarkerFileName),
+            patchArchive.ExtensionName);
+    }
+
+    private static PackageLayout GetPackageLayout(ZipArchive archive)
+    {
+        var fileNames = archive.Entries
+            .Where(entry => !string.IsNullOrEmpty(entry.Name))
+            .Select(entry => NormalizeEntryName(entry.FullName))
+            .ToArray();
+
+        if (fileNames.Any(name => name.Equals(MetadataFileName, StringComparison.OrdinalIgnoreCase)))
+            return new PackageLayout(string.Empty);
+
+        var metadataEntry = fileNames
+            .Where(name => name.EndsWith($"/{MetadataFileName}", StringComparison.OrdinalIgnoreCase))
+            .OrderBy(name => name.Count(character => character == '/'))
+            .FirstOrDefault();
+
+        if (metadataEntry is null)
+            throw new InvalidDataException("This package is not a valid OpenKH mod because mod.yml is missing.");
+
+        var prefix = metadataEntry[..^MetadataFileName.Length];
+        if (fileNames.Any(name => !name.StartsWith(prefix, StringComparison.OrdinalIgnoreCase)))
+        {
+            throw new InvalidDataException(
+                "The package contains files outside the directory that contains mod.yml.");
+        }
+
+        return new PackageLayout(prefix);
+    }
+
+    private static void ExtractEntry(ZipArchiveEntry entry, string prefix, string destinationDirectory)
+    {
+        var entryName = NormalizeEntryName(entry.FullName);
+        if (!entryName.StartsWith(prefix, StringComparison.OrdinalIgnoreCase))
+            return;
+
+        var relativeName = entryName[prefix.Length..];
+        if (string.IsNullOrWhiteSpace(relativeName) || string.IsNullOrEmpty(entry.Name))
+            return;
+
+        ExtractFile(entry, relativeName, destinationDirectory, false);
+    }
+
+    private static void ExtractFile(
+        ZipArchiveEntry entry,
+        string relativeName,
+        string destinationDirectory,
+        bool overwrite)
+    {
+        // Canonicalize both paths before the prefix check so archive entries cannot escape the install directory.
+        var destinationRoot = Path.GetFullPath(destinationDirectory)
+            .TrimEnd(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar)
+            + Path.DirectorySeparatorChar;
+        var destinationPath = Path.GetFullPath(Path.Combine(
+            destinationRoot,
+            relativeName.Replace('/', Path.DirectorySeparatorChar)));
+        var pathComparison = OperatingSystem.IsWindows()
+            ? StringComparison.OrdinalIgnoreCase
+            : StringComparison.Ordinal;
+        if (!destinationPath.StartsWith(destinationRoot, pathComparison))
+        {
+            throw new InvalidDataException("The package contains a file outside its destination directory.");
+        }
+
+        var parentDirectory = Path.GetDirectoryName(destinationPath);
+        if (!string.IsNullOrEmpty(parentDirectory))
+            Directory.CreateDirectory(parentDirectory);
+        entry.ExtractToFile(destinationPath, overwrite);
+    }
+
+    private string GetGameModsDirectory(GameInfo game)
+    {
+        return _configuration.GetGameModsDirectory(game);
+    }
+
+    private string GetCollectionsDirectory() => _configuration.CollectionsDirectory;
+
+    private static string NormalizeEntryName(string name) => name.Replace('\\', '/').TrimStart('/');
+
+    private static string CreateSafeDirectoryName(string name)
+    {
+        var invalidCharacters = Path.GetInvalidFileNameChars().ToHashSet();
+        var safeName = new string(name.Select(character =>
+            invalidCharacters.Contains(character) ? '_' : character).ToArray()).Trim();
+        return string.IsNullOrEmpty(safeName) ? "InstalledMod" : safeName;
+    }
+
+    private sealed record PackageLayout(string Prefix);
+
+    private sealed record PackageInspection(
+        string Name,
+        PackageLayout Layout,
+        PatchArchiveInfo? PatchArchive,
+        ModMetadata? Metadata);
+
+    private sealed record PatchArchiveInfo(string GameId, string ExtensionName, string DisplayName)
+    {
+        public static PatchArchiveInfo? FromFileName(string fileName)
+        {
+            var extension = Path.GetExtension(fileName).ToLowerInvariant();
+            var name = Path.GetFileNameWithoutExtension(fileName);
+            return extension switch
+            {
+                ".kh2pcpatch" => new("kh2", "KH2PCPATCH", $"{name} (KH2PCPATCH)"),
+                ".kh1pcpatch" => new("kh1", "KH1PCPATCH", $"{name} (KH1PCPATCH)"),
+                ".compcpatch" => new("Recom", "COMPCPATCH", $"{name} (COMPCPATCH)"),
+                ".bbspcpatch" => new("bbs", "BBSPCPATCH", $"{name} (BBSPCPATCH)"),
+                ".dddpcpatch" => new("kh3d", "DDDPCPATCH", $"{name} (DDDPCPATCH)"),
+                _ => null
+            };
+        }
+    }
+}
+
+public sealed record ModInstallResult(string Id, string DisplayName, string Directory);
+
+public sealed class ModAlreadyInstalledException : IOException
+{
+    public ModAlreadyInstalledException(string modName)
+        : base($"A mod named '{modName}' is already installed.")
+    {
+        ModName = modName;
+    }
+
+    public string ModName { get; }
+}
diff --git a/OpenKh.Tools.ModsManager.Core/LuaBackendService.cs b/OpenKh.Tools.ModsManager.Core/LuaBackendService.cs
new file mode 100644
index 000000000..24758574d
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Core/LuaBackendService.cs
@@ -0,0 +1,285 @@
+using System.IO.Compression;
+using System.Net.Http.Headers;
+using System.Text.Json;
+using System.Text.RegularExpressions;
+
+namespace OpenKh.Tools.ModsManager.Core;
+
+public sealed class LuaBackendService
+{
+    private static readonly HttpClient HttpClient = CreateHttpClient();
+    private readonly ModManagerConfigurationService _configuration;
+
+    public LuaBackendService(ModManagerConfigurationService configuration)
+    {
+        _configuration = configuration;
+    }
+
+    public bool IsInstalled(string? gameDirectory) =>
+        !string.IsNullOrWhiteSpace(gameDirectory) &&
+        File.Exists(Path.Combine(gameDirectory, "LuaBackend.dll")) &&
+        File.Exists(Path.Combine(gameDirectory, "LuaBackend.toml"));
+
+    public async Task InstallAsync(
+        string gameDirectory,
+        IReadOnlyCollection<GameInfo> games,
+        bool useSteamDocuments,
+        IProgress<ModOperationProgress>? progress = null,
+        CancellationToken cancellationToken = default)
+    {
+        ValidateGameDirectory(gameDirectory);
+        progress?.Report(new ModOperationProgress("Finding the latest Lua Backend release"));
+        var downloadUrl = await GetLatestDownloadUrlAsync(cancellationToken);
+        var temporaryRoot = Path.Combine(Path.GetTempPath(), $"openkh-lua-backend-{Guid.NewGuid():N}");
+        var archivePath = Path.Combine(temporaryRoot, "LuaBackend.zip");
+        var extractionPath = Path.Combine(temporaryRoot, "extracted");
+
+        Directory.CreateDirectory(temporaryRoot);
+        try
+        {
+            progress?.Report(new ModOperationProgress("Downloading Lua Backend", 0));
+            using (var response = await HttpClient.GetAsync(
+                       downloadUrl,
+                       HttpCompletionOption.ResponseHeadersRead,
+                       cancellationToken))
+            {
+                response.EnsureSuccessStatusCode();
+                await using var input = await response.Content.ReadAsStreamAsync(cancellationToken);
+                await using var output = File.Create(archivePath);
+                await CopyWithProgressAsync(
+                    input,
+                    output,
+                    response.Content.Headers.ContentLength,
+                    progress,
+                    cancellationToken);
+            }
+
+            Directory.CreateDirectory(extractionPath);
+            ZipFile.ExtractToDirectory(archivePath, extractionPath, true);
+            var sourceDll = Directory.EnumerateFiles(extractionPath, "DBGHELP.dll", SearchOption.AllDirectories)
+                .FirstOrDefault() ?? Directory.EnumerateFiles(extractionPath, "LuaBackend.dll", SearchOption.AllDirectories)
+                .FirstOrDefault();
+            var sourceConfiguration = Directory.EnumerateFiles(extractionPath, "LuaBackend.toml", SearchOption.AllDirectories)
+                .FirstOrDefault();
+            if (sourceDll is null || sourceConfiguration is null)
+                throw new InvalidDataException("The Lua Backend release does not contain DBGHELP.dll and LuaBackend.toml.");
+
+            File.Copy(sourceDll, Path.Combine(gameDirectory, "LuaBackend.dll"), true);
+            File.Copy(sourceConfiguration, Path.Combine(gameDirectory, "LuaBackend.toml"), true);
+            Configure(gameDirectory, games, useSteamDocuments);
+            progress?.Report(new ModOperationProgress("Lua Backend was installed and configured", 1));
+        }
+        finally
+        {
+            if (Directory.Exists(temporaryRoot))
+                Directory.Delete(temporaryRoot, true);
+        }
+    }
+
+    public void Configure(
+        string gameDirectory,
+        IReadOnlyCollection<GameInfo> games,
+        bool useSteamDocuments)
+    {
+        ValidateGameDirectory(gameDirectory);
+        var configurationPath = Path.Combine(gameDirectory, "LuaBackend.toml");
+        if (!File.Exists(configurationPath))
+            throw new FileNotFoundException("LuaBackend.toml was not found in the selected game directory.", configurationPath);
+
+        var text = File.ReadAllText(configurationPath).Replace("\\", "/");
+        foreach (var game in games)
+        {
+            var sectionName = game.Id.Equals("Recom", StringComparison.OrdinalIgnoreCase)
+                ? "recom"
+                : game.Id.ToLowerInvariant();
+            var scriptPath = Path.Combine(_configuration.GetGameModOutputDirectory(game), "scripts")
+                .Replace("\\", "/");
+            text = SetScriptsPath(text, sectionName, scriptPath);
+        }
+
+        if (useSteamDocuments)
+            text = SelectSteamDocumentsPaths(text);
+
+        File.WriteAllText(configurationPath, text);
+    }
+
+    public void Remove(string gameDirectory)
+    {
+        ValidateGameDirectory(gameDirectory);
+        File.Delete(Path.Combine(gameDirectory, "LuaBackend.dll"));
+        File.Delete(Path.Combine(gameDirectory, "LuaBackend.toml"));
+    }
+
+    private static string SetScriptsPath(string text, string sectionName, string scriptPath)
+    {
+        var newLine = DetectNewLine(text);
+        var escapedSectionName = Regex.Escape(sectionName);
+        var joinedHeaderPattern = $@"(?m)^(?<header>[^\S\r\n]*\[{escapedSectionName}\][^\S\r\n]*)(?=scripts[^\S\r\n]*=)";
+        text = new Regex(joinedHeaderPattern).Replace(
+            text,
+            match => match.Groups["header"].Value.TrimEnd(' ', '\t') + newLine,
+            1);
+
+        var sectionPattern = $@"(?ms)(?<header>^[^\S\r\n]*\[{escapedSectionName}\][^\S\r\n]*(?:\r\n|\n|\r))(?<body>.*?)(?=^[^\S\r\n]*\[|\z)";
+        return new Regex(sectionPattern).Replace(text, match =>
+        {
+            var body = match.Groups["body"].Value;
+            var scriptsLine = $"scripts = [{{ path = \"scripts/{sectionName}/\", relative = true }}, {{ path = \"{scriptPath}\", relative = false }}]";
+            body = ReplaceScriptsAssignment(body, scriptsLine, newLine);
+            return match.Groups["header"].Value + body;
+        }, 1);
+    }
+
+    private static string ReplaceScriptsAssignment(string body, string scriptsLine, string newLine)
+    {
+        const string scriptsPattern = @"(?m)^(?<indent>[^\S\r\n]*)scripts[^\S\r\n]*=";
+        var match = Regex.Match(body, scriptsPattern);
+        if (!match.Success)
+            return scriptsLine + newLine + body;
+
+        var assignmentEnd = FindAssignmentEnd(body, match.Index + match.Length);
+        return body[..match.Index] +
+            match.Groups["indent"].Value +
+            scriptsLine +
+            body[assignmentEnd..];
+    }
+
+    private static int FindAssignmentEnd(string text, int valueStart)
+    {
+        var arrayStart = text.IndexOf('[', valueStart);
+        var lineEnd = IndexOfLineEnd(text, valueStart);
+        if (arrayStart < 0 || arrayStart > lineEnd)
+            return lineEnd;
+
+        var depth = 0;
+        var inString = false;
+        var quote = '\0';
+        var escaped = false;
+        for (var index = arrayStart; index < text.Length; index++)
+        {
+            var character = text[index];
+            if (inString)
+            {
+                if (quote == '"' && character == '\\' && !escaped)
+                {
+                    escaped = true;
+                    continue;
+                }
+
+                if (character == quote && !escaped)
+                    inString = false;
+                escaped = false;
+                continue;
+            }
+
+            if (character is '"' or '\'')
+            {
+                inString = true;
+                quote = character;
+            }
+            else if (character == '[')
+            {
+                depth++;
+            }
+            else if (character == ']' && --depth == 0)
+            {
+                return index + 1;
+            }
+        }
+
+        return lineEnd;
+    }
+
+    private static int IndexOfLineEnd(string text, int startIndex)
+    {
+        for (var index = startIndex; index < text.Length; index++)
+        {
+            if (text[index] is '\r' or '\n')
+                return index;
+        }
+
+        return text.Length;
+    }
+
+    private static string DetectNewLine(string text)
+    {
+        var lineFeed = text.IndexOf('\n');
+        if (lineFeed >= 0)
+            return lineFeed > 0 && text[lineFeed - 1] == '\r' ? "\r\n" : "\n";
+        return text.Contains('\r') ? "\r" : Environment.NewLine;
+    }
+
+    private static string SelectSteamDocumentsPaths(string text)
+    {
+        var lines = text.Split('\n');
+        for (var index = 0; index < lines.Length; index++)
+        {
+            if (!lines[index].Contains("game_docs", StringComparison.Ordinal))
+                continue;
+
+            if (lines[index].Contains("My Games/", StringComparison.Ordinal))
+                lines[index] = Regex.Replace(lines[index], @"^(\s*)#\s?", "$1");
+            else if (!lines[index].TrimStart().StartsWith('#'))
+                lines[index] = Regex.Replace(lines[index], @"^(\s*)", "$1# ");
+        }
+
+        return string.Join('\n', lines);
+    }
+
+    private static async Task<string> GetLatestDownloadUrlAsync(CancellationToken cancellationToken)
+    {
+        using var response = await HttpClient.GetAsync(
+            "https://api.github.com/repos/Sirius902/LuaBackend/releases/latest",
+            cancellationToken);
+        response.EnsureSuccessStatusCode();
+        await using var stream = await response.Content.ReadAsStreamAsync(cancellationToken);
+        using var document = await JsonDocument.ParseAsync(stream, cancellationToken: cancellationToken);
+        var asset = document.RootElement.GetProperty("assets")
+            .EnumerateArray()
+            .Select(element => new
+            {
+                Name = element.GetProperty("name").GetString(),
+                Url = element.GetProperty("browser_download_url").GetString()
+            })
+            .FirstOrDefault(item =>
+                item.Name?.EndsWith(".zip", StringComparison.OrdinalIgnoreCase) == true &&
+                !string.IsNullOrWhiteSpace(item.Url));
+        return asset?.Url ?? throw new InvalidDataException("The latest Lua Backend release has no ZIP asset.");
+    }
+
+    private static async Task CopyWithProgressAsync(
+        Stream input,
+        Stream output,
+        long? contentLength,
+        IProgress<ModOperationProgress>? progress,
+        CancellationToken cancellationToken)
+    {
+        var buffer = new byte[81920];
+        long copied = 0;
+        while (true)
+        {
+            var read = await input.ReadAsync(buffer, cancellationToken);
+            if (read == 0)
+                break;
+            await output.WriteAsync(buffer.AsMemory(0, read), cancellationToken);
+            copied += read;
+            progress?.Report(new ModOperationProgress(
+                "Downloading Lua Backend",
+                contentLength is > 0 ? (double)copied / contentLength.Value : null));
+        }
+    }
+
+    private static void ValidateGameDirectory(string? gameDirectory)
+    {
+        if (string.IsNullOrWhiteSpace(gameDirectory) || !Directory.Exists(gameDirectory))
+            throw new DirectoryNotFoundException("Configure a valid PC game collection directory first.");
+    }
+
+    private static HttpClient CreateHttpClient()
+    {
+        var client = new HttpClient { Timeout = TimeSpan.FromMinutes(5) };
+        client.DefaultRequestHeaders.UserAgent.Add(new ProductInfoHeaderValue("OpenKh-ModManager", "1.0"));
+        client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/vnd.github+json"));
+        return client;
+    }
+}
diff --git a/OpenKh.Tools.ModsManager.Core/ModBuildService.cs b/OpenKh.Tools.ModsManager.Core/ModBuildService.cs
new file mode 100644
index 000000000..94541292e
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Core/ModBuildService.cs
@@ -0,0 +1,102 @@
+using OpenKh.Patcher;
+using System.Collections.Concurrent;
+using System.Text.Json;
+
+namespace OpenKh.Tools.ModsManager.Core;
+
+public sealed class ModBuildService(ModManagerConfigurationService configuration)
+{
+    public Task<string> BuildAsync(
+        GameInfo game,
+        IReadOnlyList<ModEntry> mods,
+        bool fastMode = false,
+        IProgress<ModOperationProgress>? progress = null,
+        CancellationToken cancellationToken = default) =>
+        Task.Run(() => Build(game, mods, fastMode, progress, cancellationToken), cancellationToken);
+
+    private string Build(
+        GameInfo game,
+        IReadOnlyList<ModEntry> mods,
+        bool fastMode,
+        IProgress<ModOperationProgress>? progress,
+        CancellationToken cancellationToken)
+    {
+        var outputDirectory = configuration.GetGameModOutputDirectory(game);
+        DeleteDirectoryIfPresent(outputDirectory);
+        Directory.CreateDirectory(outputDirectory);
+
+        var enabledMods = mods.Where(mod => mod.IsEnabled).Reverse().ToArray();
+        var collectionSettings = ReadCollectionSettings(game);
+        var packageMap = new ConcurrentDictionary<string, string>();
+        var patcher = new PatcherProcessor();
+
+        for (var index = 0; index < enabledMods.Length; index++)
+        {
+            cancellationToken.ThrowIfCancellationRequested();
+            var mod = enabledMods[index];
+            progress?.Report(new ModOperationProgress(
+                $"Building {mod.Name}",
+                enabledMods.Length == 0 ? 1 : (double)index / enabledMods.Length));
+            var metadataFile = Path.Combine(mod.Directory, "mod.yml");
+            using var stream = File.OpenRead(metadataFile);
+            var metadata = Metadata.Read(stream);
+            collectionSettings.TryGetValue(mod.Id, out var optionalAssets);
+            var progressLock = new object();
+            var lastReportedPercentage = -1;
+            void ReportPatchProgress(int completed, int total)
+            {
+                var modPercentage = total == 0 ? 100 : completed * 100 / total;
+                lock (progressLock)
+                {
+                    if (modPercentage <= lastReportedPercentage)
+                        return;
+
+                    lastReportedPercentage = modPercentage;
+                    var overallPercentage = (index + modPercentage / 100d) / enabledMods.Length;
+                    progress?.Report(new ModOperationProgress(
+                        $"Building {mod.Name}",
+                        overallPercentage));
+                }
+            }
+            patcher.Patch(
+                Path.Combine(configuration.GameDataDirectory, game.Id),
+                outputDirectory,
+                metadata,
+                mod.Directory,
+                configuration.Current.GameEdition,
+                fastMode,
+                packageMap,
+                game.Id,
+                configuration.Current.PcReleaseLanguage,
+                false,
+                optionalAssets,
+                ReportPatchProgress);
+        }
+
+        using var writer = File.CreateText(Path.Combine(outputDirectory, "patch-package-map.txt"));
+        foreach (var entry in packageMap.OrderBy(entry => entry.Key, StringComparer.Ordinal))
+            writer.WriteLine($"{entry.Key} $$$$ {entry.Value}");
+
+        progress?.Report(new ModOperationProgress("Mod build completed", 1));
+        return outputDirectory;
+    }
+
+    private Dictionary<string, Dictionary<string, bool>> ReadCollectionSettings(GameInfo game)
+    {
+        var fileName = configuration.GetCollectionSettingsFile(game);
+        if (!File.Exists(fileName) || string.IsNullOrWhiteSpace(File.ReadAllText(fileName)))
+            return new Dictionary<string, Dictionary<string, bool>>(StringComparer.OrdinalIgnoreCase);
+
+        return JsonSerializer.Deserialize<Dictionary<string, Dictionary<string, bool>>>(File.ReadAllText(fileName))
+            ?? new Dictionary<string, Dictionary<string, bool>>(StringComparer.OrdinalIgnoreCase);
+    }
+
+    private static void DeleteDirectoryIfPresent(string directory)
+    {
+        if (!Directory.Exists(directory))
+            return;
+        foreach (var file in Directory.EnumerateFiles(directory, "*", SearchOption.AllDirectories))
+            File.SetAttributes(file, FileAttributes.Normal);
+        Directory.Delete(directory, true);
+    }
+}
diff --git a/OpenKh.Tools.ModsManager.Core/ModCatalogService.cs b/OpenKh.Tools.ModsManager.Core/ModCatalogService.cs
new file mode 100644
index 000000000..9ebb4dd06
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Core/ModCatalogService.cs
@@ -0,0 +1,317 @@
+namespace OpenKh.Tools.ModsManager.Core;
+
+using OpenKh.Patcher;
+using System.Text.Json;
+
+public sealed class ModCatalogService
+{
+    private const string MetadataFileName = "mod.yml";
+    private readonly ModManagerConfigurationService _configuration;
+
+    public ModCatalogService(InstallationLayout layout)
+        : this(new ModManagerConfigurationService(layout))
+    {
+    }
+
+    public ModCatalogService(ModManagerConfigurationService configuration)
+    {
+        _configuration = configuration;
+        _configuration.EnsureDirectories();
+    }
+
+    public string InstallationDirectory => _configuration.InstallationDirectory;
+    public GameInfo DefaultGame => GameInfo.FromId(_configuration.Current.LaunchGame);
+
+    public Task<IReadOnlyList<ModEntry>> LoadAsync(GameInfo game) => Task.Run(() => Load(game));
+
+    public void SaveEnabledOrder(GameInfo game, IEnumerable<ModEntry> mods)
+    {
+        var orderedMods = ApplyFormatPriority(mods).ToArray();
+        File.WriteAllLines(
+            GetEnabledModsPath(game),
+            orderedMods.Where(mod => mod.IsEnabled).Select(mod => mod.Id));
+        File.WriteAllLines(
+            _configuration.GetModOrderFile(game),
+            orderedMods.Select(mod => mod.Id));
+    }
+
+    public void MoveInstalledModToHighestPriority(GameInfo game, string modId)
+    {
+        var mods = Load(game);
+        var installedMod = mods.FirstOrDefault(mod =>
+            mod.Id.Equals(modId, StringComparison.OrdinalIgnoreCase));
+        if (installedMod is null)
+            return;
+
+        SaveEnabledOrder(
+            game,
+            new[] { installedMod }.Concat(mods.Where(mod => !ReferenceEquals(mod, installedMod))));
+    }
+
+    private IReadOnlyList<ModEntry> Load(GameInfo game)
+    {
+        var enabledIds = ReadEnabledIds(game);
+        var enabledLookup = enabledIds.ToHashSet(StringComparer.OrdinalIgnoreCase);
+        var savedOrder = ReadOrderIds(game);
+        var collectionSettings = ReadCollectionSettings(game);
+        var locations = EnumerateModLocations(game)
+            .GroupBy(location => location.Id, StringComparer.OrdinalIgnoreCase)
+            .Select(group => group.First())
+            .ToDictionary(location => location.Id, StringComparer.OrdinalIgnoreCase);
+
+        var savedOrderLookup = savedOrder.ToHashSet(StringComparer.OrdinalIgnoreCase);
+        var orderedIds = (savedOrder.Count > 0 ? savedOrder : enabledIds)
+            .Where(locations.ContainsKey)
+            .Concat(locations.Keys
+                .Where(id => !savedOrderLookup.Contains(id) &&
+                    (savedOrder.Count > 0 || !enabledLookup.Contains(id)))
+                .OrderBy(id => id, StringComparer.OrdinalIgnoreCase));
+
+        var mods = orderedIds
+            .Select(id => CreateEntry(
+                locations[id],
+                enabledLookup.Contains(id),
+                game,
+                collectionSettings))
+            .ToArray();
+
+        return ApplyFormatPriority(mods).ToArray();
+    }
+
+    private IEnumerable<ModLocation> EnumerateModLocations(GameInfo game)
+    {
+        foreach (var location in EnumerateDirectory(GetGameModsDirectory(game)))
+            yield return location;
+
+        foreach (var location in EnumerateDirectory(GetCollectionsDirectory()))
+            yield return location;
+    }
+
+    private static IEnumerable<ModLocation> EnumerateDirectory(string rootDirectory)
+    {
+        if (!Directory.Exists(rootDirectory))
+            yield break;
+
+        foreach (var firstLevelDirectory in Directory.EnumerateDirectories(rootDirectory))
+        {
+            var firstLevelName = Path.GetFileName(firstLevelDirectory);
+            if (File.Exists(Path.Combine(firstLevelDirectory, MetadataFileName)))
+                yield return new ModLocation(firstLevelName, firstLevelDirectory);
+
+            foreach (var secondLevelDirectory in Directory.EnumerateDirectories(firstLevelDirectory))
+            {
+                if (!File.Exists(Path.Combine(secondLevelDirectory, MetadataFileName)))
+                    continue;
+
+                yield return new ModLocation(
+                    $"{firstLevelName}/{Path.GetFileName(secondLevelDirectory)}",
+                    secondLevelDirectory);
+            }
+        }
+    }
+
+    private static ModEntry CreateEntry(
+        ModLocation location,
+        bool isEnabled,
+        GameInfo game,
+        IReadOnlyDictionary<string, Dictionary<string, bool>> collectionSettings)
+    {
+        ModMetadata? metadata = null;
+        try
+        {
+            metadata = ModMetadata.Read(Path.Combine(location.Directory, MetadataFileName));
+        }
+        catch
+        {
+            // An invalid metadata file should not hide an installed mod from the user.
+        }
+
+        var idParts = location.Id.Split('/', 2);
+        var fallbackName = idParts.Length == 2 ? idParts[1] : idParts[0];
+        var fallbackAuthor = idParts.Length == 2 ? idParts[0] : "Local mod";
+        var iconPath = Path.Combine(location.Directory, "icon.png");
+        var previewPath = Path.Combine(location.Directory, "preview.png");
+        var (sourceUrl, reportBugUrl) = GetRepositoryLinks(location.Directory);
+
+        return new ModEntry
+        {
+            Id = location.Id,
+            Name = string.IsNullOrWhiteSpace(metadata?.Title) ? fallbackName : metadata.Title,
+            Author = string.IsNullOrWhiteSpace(metadata?.OriginalAuthor) ? fallbackAuthor : metadata.OriginalAuthor,
+            Description = string.IsNullOrWhiteSpace(metadata?.Description)
+                ? "No description is available for this mod."
+                : metadata.Description,
+            Directory = location.Directory,
+            IconPath = File.Exists(iconPath) ? iconPath : null,
+            PreviewPath = File.Exists(previewPath) ? previewPath : null,
+            SourceUrl = sourceUrl,
+            ReportBugUrl = reportBugUrl,
+            FilesToPatch = GetFilesToPatch(metadata, location.Id, game, collectionSettings),
+            IsCollection = metadata?.IsCollection == true,
+            IsPcPatch = LegacyModFormat.IsPcPatch(location.Directory, metadata),
+            IsEnabled = isEnabled
+        };
+    }
+
+    private static IEnumerable<ModEntry> ApplyFormatPriority(IEnumerable<ModEntry> mods)
+    {
+        var orderedMods = mods.ToArray();
+
+        // PC Patch packages replace complete files, so OpenKH mods must always take priority over them.
+        return orderedMods
+            .Where(mod => !mod.IsPcPatch)
+            .Concat(orderedMods.Where(mod => mod.IsPcPatch));
+    }
+
+    private static IReadOnlyList<string> GetFilesToPatch(
+        ModMetadata? metadata,
+        string modId,
+        GameInfo game,
+        IReadOnlyDictionary<string, Dictionary<string, bool>> collectionSettings)
+    {
+        collectionSettings.TryGetValue(modId, out var enabledOptionalAssets);
+        var files = new List<string>();
+        foreach (var asset in metadata?.Assets ?? [])
+        {
+            if (metadata?.IsCollection == true &&
+                !string.IsNullOrWhiteSpace(asset.Game) &&
+                !asset.Game.Equals(game.Id, StringComparison.OrdinalIgnoreCase))
+            {
+                continue;
+            }
+
+            if (asset.CollectionOptional)
+            {
+                var enabled = !string.IsNullOrWhiteSpace(asset.Name) &&
+                    enabledOptionalAssets?.TryGetValue(asset.Name, out var isEnabled) == true &&
+                    isEnabled;
+                if (!enabled)
+                    continue;
+            }
+
+            if (!string.IsNullOrWhiteSpace(asset.Name))
+                files.Add(asset.CollectionOptional ? $"{asset.Name} (optional, enabled)" : asset.Name);
+            if (asset.Multi is not null)
+                files.AddRange(asset.Multi.Select(entry => entry.Name).Where(name => !string.IsNullOrWhiteSpace(name)));
+        }
+
+        return files.Distinct(StringComparer.OrdinalIgnoreCase).ToArray();
+    }
+
+    private static (string? SourceUrl, string? ReportBugUrl) GetRepositoryLinks(string directory)
+    {
+        try
+        {
+            var configFile = Path.Combine(directory, ".git", "config");
+            if (!File.Exists(configFile))
+                return (null, null);
+
+            var sourceUrl = NormalizeRepositoryUrl(ReadOriginRemoteUrl(configFile));
+            return sourceUrl is null ? (null, null) : (sourceUrl, $"{sourceUrl}/issues");
+        }
+        catch (IOException)
+        {
+            return (null, null);
+        }
+        catch (UnauthorizedAccessException)
+        {
+            return (null, null);
+        }
+    }
+
+    private static string? ReadOriginRemoteUrl(string configFile)
+    {
+        var isOrigin = false;
+        foreach (var line in File.ReadLines(configFile))
+        {
+            var value = line.Trim();
+            if (value.StartsWith('['))
+            {
+                isOrigin = value.Equals("[remote \"origin\"]", StringComparison.OrdinalIgnoreCase);
+                continue;
+            }
+
+            if (!isOrigin || !value.StartsWith("url", StringComparison.OrdinalIgnoreCase))
+                continue;
+
+            var separator = value.IndexOf('=');
+            if (separator >= 0)
+                return value[(separator + 1)..].Trim();
+        }
+
+        return null;
+    }
+
+    private static string? NormalizeRepositoryUrl(string? remoteUrl)
+    {
+        if (string.IsNullOrWhiteSpace(remoteUrl))
+            return null;
+
+        var value = remoteUrl.Trim();
+        if (value.StartsWith("git@", StringComparison.OrdinalIgnoreCase))
+        {
+            var separator = value.IndexOf(':');
+            if (separator <= 4 || separator == value.Length - 1)
+                return null;
+            value = $"https://{value[4..separator]}/{value[(separator + 1)..]}";
+        }
+        else if (Uri.TryCreate(value, UriKind.Absolute, out var uri))
+        {
+            if (uri.Scheme is not ("http" or "https" or "ssh"))
+                return null;
+            value = $"https://{uri.Host}{uri.AbsolutePath}";
+        }
+        else
+        {
+            return null;
+        }
+
+        value = value.TrimEnd('/');
+        return value.EndsWith(".git", StringComparison.OrdinalIgnoreCase)
+            ? value[..^4]
+            : value;
+    }
+
+    private IReadOnlyList<string> ReadEnabledIds(GameInfo game)
+    {
+        var path = GetEnabledModsPath(game);
+        return File.Exists(path)
+            ? File.ReadAllLines(path).Where(line => !string.IsNullOrWhiteSpace(line)).ToArray()
+            : [];
+    }
+
+    private IReadOnlyList<string> ReadOrderIds(GameInfo game)
+    {
+        var path = _configuration.GetModOrderFile(game);
+        return File.Exists(path)
+            ? File.ReadAllLines(path).Where(line => !string.IsNullOrWhiteSpace(line)).ToArray()
+            : [];
+    }
+
+    private Dictionary<string, Dictionary<string, bool>> ReadCollectionSettings(GameInfo game)
+    {
+        var fileName = _configuration.GetCollectionSettingsFile(game);
+        if (!File.Exists(fileName) || string.IsNullOrWhiteSpace(File.ReadAllText(fileName)))
+            return new Dictionary<string, Dictionary<string, bool>>(StringComparer.OrdinalIgnoreCase);
+        try
+        {
+            return JsonSerializer.Deserialize<Dictionary<string, Dictionary<string, bool>>>(File.ReadAllText(fileName))
+                ?? new Dictionary<string, Dictionary<string, bool>>(StringComparer.OrdinalIgnoreCase);
+        }
+        catch (JsonException)
+        {
+            return new Dictionary<string, Dictionary<string, bool>>(StringComparer.OrdinalIgnoreCase);
+        }
+    }
+
+    private string GetEnabledModsPath(GameInfo game) => _configuration.GetEnabledModsFile(game);
+
+    private string GetGameModsDirectory(GameInfo game)
+    {
+        return _configuration.GetGameModsDirectory(game);
+    }
+
+    private string GetCollectionsDirectory() => _configuration.CollectionsDirectory;
+
+    private sealed record ModLocation(string Id, string Directory);
+}
diff --git a/OpenKh.Tools.ModsManager.Core/ModCreatorService.cs b/OpenKh.Tools.ModsManager.Core/ModCreatorService.cs
new file mode 100644
index 000000000..35dfad341
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Core/ModCreatorService.cs
@@ -0,0 +1,125 @@
+using OpenKh.Patcher;
+
+namespace OpenKh.Tools.ModsManager.Core;
+
+public sealed class ModCreatorService(ModManagerConfigurationService? configuration = null)
+{
+    public string DefaultGameDataPath => configuration?.GameDataDirectory ?? string.Empty;
+    public string Create(
+        string directory,
+        string title,
+        string author,
+        string description,
+        GameInfo game)
+    {
+        if (string.IsNullOrWhiteSpace(directory))
+            throw new ArgumentException("Choose a mod folder.", nameof(directory));
+        if (string.IsNullOrWhiteSpace(title))
+            throw new ArgumentException("Enter a mod title.", nameof(title));
+
+        Directory.CreateDirectory(directory);
+        var path = Path.Combine(directory, "mod.yml");
+        var metadata = ReadOrCreate(path);
+        metadata.Title = title.Trim();
+        metadata.OriginalAuthor = string.IsNullOrWhiteSpace(author) ? "Unknown author" : author.Trim();
+        metadata.Description = string.IsNullOrWhiteSpace(description) ? "No description provided." : description.Trim();
+        metadata.Game = game.Id;
+        metadata.Assets ??= [];
+        using var stream = File.Create(path);
+        metadata.Write(stream);
+        return path;
+    }
+
+    public Metadata ReadOrCreate(string modYmlPath)
+    {
+        if (!File.Exists(modYmlPath))
+            return new Metadata { Assets = [] };
+        using var stream = File.OpenRead(modYmlPath);
+        var metadata = Metadata.Read(stream) ?? new Metadata();
+        metadata.Assets ??= [];
+        return metadata;
+    }
+
+    public string CreatePreview(
+        string directory,
+        string title,
+        string author,
+        string description,
+        GameInfo game)
+    {
+        if (string.IsNullOrWhiteSpace(directory))
+            throw new ArgumentException("Choose a mod folder.", nameof(directory));
+        var existingPath = Path.Combine(directory, "mod.yml");
+        var metadata = ReadOrCreate(existingPath);
+        metadata.Title = string.IsNullOrWhiteSpace(title) ? Path.GetFileName(directory) : title.Trim();
+        metadata.OriginalAuthor = string.IsNullOrWhiteSpace(author) ? "Unknown author" : author.Trim();
+        metadata.Description = string.IsNullOrWhiteSpace(description) ? "No description provided." : description.Trim();
+        metadata.Game = game.Id;
+        metadata.Assets ??= [];
+        var previewPath = Path.Combine(Path.GetTempPath(), $"openkh-mod-preview-{Guid.NewGuid():N}.yml");
+        using var stream = File.Create(previewPath);
+        metadata.Write(stream);
+        return previewPath;
+    }
+
+    public Task<IReadOnlyList<string>> SearchFilesAsync(
+        string gameDataPath,
+        string searchText,
+        CancellationToken cancellationToken = default) => Task.Run<IReadOnlyList<string>>(() =>
+    {
+        if (string.IsNullOrWhiteSpace(gameDataPath) || !Directory.Exists(gameDataPath))
+            throw new DirectoryNotFoundException("Choose a valid GameData folder.");
+        var terms = searchText.Split(' ', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
+        return Directory.EnumerateFiles(gameDataPath, "*", SearchOption.AllDirectories)
+            .Select(path => Path.GetRelativePath(gameDataPath, path).Replace('\\', '/'))
+            .Where(path => terms.All(term => path.Contains(term, StringComparison.OrdinalIgnoreCase)))
+            .OrderBy(path => path, StringComparer.OrdinalIgnoreCase)
+            .ToArray();
+    }, cancellationToken);
+
+    public void AppendCopyFiles(
+        string modDirectory,
+        string gameDataPath,
+        IReadOnlyCollection<string> relativePaths)
+    {
+        var modYmlPath = Path.Combine(modDirectory, "mod.yml");
+        if (!File.Exists(modYmlPath))
+            throw new FileNotFoundException("Generate mod.yml before appending target files.", modYmlPath);
+        var metadata = ReadOrCreate(modYmlPath);
+        foreach (var relativePath in relativePaths.Distinct(StringComparer.OrdinalIgnoreCase))
+        {
+            var normalized = relativePath.Replace('\\', '/');
+            var sourcePath = Path.Combine(gameDataPath, normalized);
+            if (!File.Exists(sourcePath))
+                continue;
+            var destinationPath = Path.Combine(modDirectory, normalized);
+            Directory.CreateDirectory(Path.GetDirectoryName(destinationPath)!);
+            File.Copy(sourcePath, destinationPath, true);
+            metadata.Assets.RemoveAll(asset =>
+                asset.Method == "copy" && string.Equals(asset.Name, normalized, StringComparison.OrdinalIgnoreCase));
+            metadata.Assets.Add(new AssetFile
+            {
+                Name = normalized,
+                Method = "copy",
+                Source = [new AssetFile { Name = normalized }]
+            });
+        }
+        using var output = File.Create(modYmlPath);
+        metadata.Write(output);
+    }
+
+    public IReadOnlyList<CreatorPreference> GetPreferences() =>
+        configuration?.Current.CreatorPreferences ?? [];
+
+    public void SavePreference(CreatorPreference preference)
+    {
+        if (configuration is null)
+            return;
+        if (string.IsNullOrWhiteSpace(preference.Label))
+            throw new ArgumentException("Enter a preference name.", nameof(preference));
+        configuration.Current.CreatorPreferences.RemoveAll(item =>
+            item.Label.Equals(preference.Label, StringComparison.OrdinalIgnoreCase));
+        configuration.Current.CreatorPreferences.Add(preference);
+        configuration.Save();
+    }
+}
diff --git a/OpenKh.Tools.ModsManager.Core/ModEntry.cs b/OpenKh.Tools.ModsManager.Core/ModEntry.cs
new file mode 100644
index 000000000..b2a9d1e07
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Core/ModEntry.cs
@@ -0,0 +1,19 @@
+namespace OpenKh.Tools.ModsManager.Core;
+
+public sealed class ModEntry
+{
+    public required string Id { get; init; }
+    public required string Name { get; init; }
+    public string Author { get; init; } = "Unknown author";
+    public string Description { get; init; } = "No description is available for this mod.";
+    public required string Directory { get; init; }
+    public string? IconPath { get; init; }
+    public string? PreviewPath { get; init; }
+    public string? SourceUrl { get; init; }
+    public string? ReportBugUrl { get; init; }
+    public IReadOnlyList<string> FilesToPatch { get; init; } = [];
+    public bool IsCollection { get; init; }
+    public bool IsPcPatch { get; init; }
+    public bool IsEnabled { get; set; }
+    public int UpdateCount { get; set; }
+}
diff --git a/OpenKh.Tools.ModsManager.Core/ModMaintenanceService.cs b/OpenKh.Tools.ModsManager.Core/ModMaintenanceService.cs
new file mode 100644
index 000000000..030ce8c2b
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Core/ModMaintenanceService.cs
@@ -0,0 +1,121 @@
+using LibGit2Sharp;
+
+namespace OpenKh.Tools.ModsManager.Core;
+
+public sealed class ModMaintenanceService(ModManagerConfigurationService configuration)
+{
+    public Task<int> CheckForUpdateAsync(
+        ModEntry mod,
+        CancellationToken cancellationToken = default) =>
+        Task.Run(() => CheckForUpdate(mod, cancellationToken), cancellationToken);
+
+    public Task UpdateAsync(
+        ModEntry mod,
+        GameInfo game,
+        IProgress<ModOperationProgress>? progress = null,
+        CancellationToken cancellationToken = default) =>
+        Task.Run(() => Update(mod, game, progress, cancellationToken), cancellationToken);
+
+    public Task RemoveAsync(ModEntry mod, CancellationToken cancellationToken = default) =>
+        Task.Run(() =>
+        {
+            cancellationToken.ThrowIfCancellationRequested();
+            DeleteDirectory(mod.Directory);
+        }, cancellationToken);
+
+    private static int CheckForUpdate(ModEntry mod, CancellationToken cancellationToken)
+    {
+        if (!Repository.IsValid(mod.Directory))
+            return -1;
+
+        using var repository = new Repository(mod.Directory);
+        if (repository.Info.IsHeadDetached || string.IsNullOrWhiteSpace(repository.Head.RemoteName))
+            return -1;
+
+        Fetch(repository, null, cancellationToken);
+        return repository.Head.TrackingDetails.BehindBy ?? 0;
+    }
+
+    private void Update(
+        ModEntry mod,
+        GameInfo game,
+        IProgress<ModOperationProgress>? progress,
+        CancellationToken cancellationToken)
+    {
+        if (!Repository.IsValid(mod.Directory))
+            throw new InvalidOperationException("This mod was installed from a local file and cannot be updated from a repository.");
+
+        using (var repository = new Repository(mod.Directory))
+        {
+            if (repository.Info.IsHeadDetached || repository.Head.TrackedBranch?.Tip is null)
+                throw new InvalidOperationException("This repository does not track a remote branch.");
+
+            progress?.Report(new ModOperationProgress($"Fetching {mod.Name}"));
+            Fetch(repository, progress, cancellationToken);
+            cancellationToken.ThrowIfCancellationRequested();
+            repository.Reset(ResetMode.Hard, repository.Head.TrackedBranch.Tip, new CheckoutOptions
+            {
+                CheckoutModifiers = CheckoutModifiers.Force,
+                OnCheckoutProgress = (path, completed, total) =>
+                {
+                    cancellationToken.ThrowIfCancellationRequested();
+                    progress?.Report(new ModOperationProgress(
+                        string.IsNullOrWhiteSpace(path) ? $"Updating {mod.Name}" : path,
+                        total > 0 ? (double)completed / total : null));
+                }
+            });
+            SubmoduleUpdateOptions submoduleOptions = new() { Init = true };
+            foreach (var submodule in repository.Submodules)
+                repository.Submodules.Update(submodule.Name, submoduleOptions);
+        }
+
+        var metadata = ModMetadata.Read(Path.Combine(mod.Directory, "mod.yml"));
+        if (metadata.IsCollection == mod.IsCollection)
+            return;
+
+        var destination = metadata.IsCollection
+            ? Path.Combine(configuration.CollectionsDirectory, mod.Id)
+            : Path.Combine(configuration.GetGameModsDirectory(game), mod.Id);
+        if (Directory.Exists(destination))
+            throw new IOException($"Cannot move the updated mod because '{destination}' already exists.");
+        Directory.CreateDirectory(Path.GetDirectoryName(destination)!);
+        Directory.Move(mod.Directory, destination);
+    }
+
+    private static void Fetch(
+        Repository repository,
+        IProgress<ModOperationProgress>? progress,
+        CancellationToken cancellationToken)
+    {
+        var remote = repository.Network.Remotes[repository.Head.RemoteName];
+        if (remote is null)
+            throw new InvalidOperationException("The tracked remote no longer exists.");
+
+        var options = new FetchOptions
+        {
+            OnProgress = message =>
+            {
+                progress?.Report(new ModOperationProgress(message.Trim()));
+                return !cancellationToken.IsCancellationRequested;
+            },
+            OnTransferProgress = transfer =>
+            {
+                progress?.Report(new ModOperationProgress(
+                    "Receiving repository objects",
+                    transfer.TotalObjects > 0 ? (double)transfer.ReceivedObjects / transfer.TotalObjects : null));
+                return !cancellationToken.IsCancellationRequested;
+            }
+        };
+        Commands.Fetch(repository, remote.Name, remote.FetchRefSpecs.Select(spec => spec.Specification), options, null);
+        cancellationToken.ThrowIfCancellationRequested();
+    }
+
+    private static void DeleteDirectory(string directory)
+    {
+        if (!Directory.Exists(directory))
+            return;
+        foreach (var file in Directory.EnumerateFiles(directory, "*", SearchOption.AllDirectories))
+            File.SetAttributes(file, FileAttributes.Normal);
+        Directory.Delete(directory, true);
+    }
+}
diff --git a/OpenKh.Tools.ModsManager.Core/ModManagerConfiguration.cs b/OpenKh.Tools.ModsManager.Core/ModManagerConfiguration.cs
new file mode 100644
index 000000000..5c4ecbc6b
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Core/ModManagerConfiguration.cs
@@ -0,0 +1,214 @@
+using YamlDotNet.Serialization;
+using YamlDotNet.Serialization.NamingConventions;
+
+namespace OpenKh.Tools.ModsManager.Core;
+
+public sealed class ModManagerConfiguration
+{
+    private static readonly IDeserializer Deserializer = new DeserializerBuilder()
+        .IgnoreFields()
+        .IgnoreUnmatchedProperties()
+        .WithNamingConvention(CamelCaseNamingConvention.Instance)
+        .Build();
+
+    private static readonly ISerializer Serializer = new SerializerBuilder()
+        .IgnoreFields()
+        .WithNamingConvention(CamelCaseNamingConvention.Instance)
+        .Build();
+
+    public int WizardVersionNumber { get; set; }
+    [YamlMember(Alias = "installedModsPath")]
+    public string? ModCollectionPath { get; set; }
+
+    [YamlMember(Alias = "installedCollectionsPath")]
+    public string? ModCollectionsPath { get; set; }
+
+    [YamlMember(Alias = "compiledModPath")]
+    public string? GameModPath { get; set; }
+
+    [YamlMember(Alias = "extractedGameDataPath")]
+    public string? GameDataPath { get; set; }
+    public int GameEdition { get; set; } = 2;
+
+    [YamlMember(Alias = "isoLocationKH2")]
+    public string? IsoLocationKh2 { get; set; }
+
+    [YamlMember(Alias = "isoLocationKH1")]
+    public string? IsoLocationKh1 { get; set; }
+
+    public string? IsoLocationRecom { get; set; }
+    public string? OpenKhGameEngineLocation { get; set; }
+    public string? Pcsx2Location { get; set; }
+    public string? PcReleaseLocation { get; set; }
+
+    [YamlMember(Alias = "pcReleaseLocationKH3D")]
+    public string? PcReleaseLocationKh3D { get; set; }
+
+    public string PcReleaseLanguage { get; set; } = "en";
+    public int RegionId { get; set; }
+    public bool PanaceaInstalled { get; set; }
+    public bool ShowConsole { get; set; }
+    public bool DebugLog { get; set; }
+    public bool SoundDebug { get; set; }
+    public bool EnableCache { get; set; } = true;
+    public bool QuickMenu { get; set; }
+    public bool EnablePatching { get; set; }
+    public bool AutoUpdateMods { get; set; }
+
+    [YamlMember(Alias = "pcVersion")]
+    public string PcVersion { get; set; } = "Steam";
+
+    [YamlMember(Alias = "steamAPITrick1525")]
+    public bool SteamApiTrick1525 { get; set; }
+
+    [YamlMember(Alias = "steamAPITrick28")]
+    public bool SteamApiTrick28 { get; set; }
+
+    public List<string> GamesToExtract { get; set; } = [];
+    public bool SkipRemastered { get; set; }
+    public string LaunchGame { get; set; } = "kh2";
+    public bool DarkMode { get; set; } = true;
+    public bool Updated { get; set; }
+    [YamlIgnore]
+    public List<CreatorPreference> CreatorPreferences { get; set; } = [];
+
+    [YamlMember(Alias = "yamlGenPrefs")]
+    public List<YamlGeneratorPreference> YamlGeneratorPreferences
+    {
+        get => CreatorPreferences.Select(YamlGeneratorPreference.FromCreatorPreference).ToList();
+        set => CreatorPreferences = value?
+            .Select(preference => preference.ToCreatorPreference())
+            .ToList() ?? [];
+    }
+
+    public static ModManagerConfiguration Load(string fileName)
+    {
+        if (!File.Exists(fileName))
+            return new ModManagerConfiguration();
+
+        var yaml = File.ReadAllText(fileName);
+        var configuration = Deserializer.Deserialize<ModManagerConfiguration>(yaml) ?? new ModManagerConfiguration();
+        var interim = Deserializer.Deserialize<InterimConfiguration>(yaml) ?? new InterimConfiguration();
+        var migrated = configuration.ApplyInterimConfiguration(interim);
+        configuration.GamesToExtract ??= [];
+        configuration.CreatorPreferences ??= [];
+        if (migrated)
+            configuration.Save(fileName);
+        return configuration;
+    }
+
+    public void Save(string fileName)
+    {
+        var directory = Path.GetDirectoryName(fileName);
+        if (!string.IsNullOrWhiteSpace(directory))
+            Directory.CreateDirectory(directory);
+
+        var temporaryFile = $"{fileName}.tmp";
+        using (var writer = File.CreateText(temporaryFile))
+            Serializer.Serialize(writer, this);
+
+        File.Move(temporaryFile, fileName, true);
+    }
+
+    private bool ApplyInterimConfiguration(InterimConfiguration interim)
+    {
+        var migrated = false;
+        if (IsMissing(ModCollectionPath, interim.ModCollectionPath))
+        {
+            ModCollectionPath = interim.ModCollectionPath;
+            migrated = true;
+        }
+        if (IsMissing(ModCollectionsPath, interim.ModCollectionsPath))
+        {
+            ModCollectionsPath = interim.ModCollectionsPath;
+            migrated = true;
+        }
+        if (IsMissing(GameModPath, interim.GameModPath))
+        {
+            GameModPath = interim.GameModPath;
+            migrated = true;
+        }
+        if (IsMissing(GameDataPath, interim.GameDataPath))
+        {
+            GameDataPath = interim.GameDataPath;
+            migrated = true;
+        }
+        if (CreatorPreferences.Count == 0 && interim.CreatorPreferences is { Count: > 0 })
+        {
+            CreatorPreferences = interim.CreatorPreferences;
+            migrated = true;
+        }
+        if (!EnablePatching && interim.DevView == true)
+        {
+            EnablePatching = true;
+            migrated = true;
+        }
+
+        return migrated;
+    }
+
+    private static bool IsMissing(string? destination, string? source) =>
+        string.IsNullOrWhiteSpace(destination) && !string.IsNullOrWhiteSpace(source);
+
+    private sealed class InterimConfiguration
+    {
+        public string? ModCollectionPath { get; set; }
+        public string? ModCollectionsPath { get; set; }
+        public string? GameModPath { get; set; }
+        public string? GameDataPath { get; set; }
+        public bool? DevView { get; set; }
+        public List<CreatorPreference>? CreatorPreferences { get; set; }
+    }
+}
+
+public sealed class CreatorPreference
+{
+    public string Label { get; set; } = string.Empty;
+    public string ModDirectory { get; set; } = string.Empty;
+    public string GameDataPath { get; set; } = string.Empty;
+    public string DiffToolPath { get; set; } = string.Empty;
+}
+
+public sealed class YamlGeneratorPreference
+{
+    public string Label { get; set; } = string.Empty;
+    public string GameDataPath { get; set; } = string.Empty;
+    public string ModYmlFilePath { get; set; } = string.Empty;
+    public string DiffToolPath { get; set; } = string.Empty;
+
+    public CreatorPreference ToCreatorPreference() => new()
+    {
+        Label = Label,
+        GameDataPath = GameDataPath,
+        ModDirectory = GetModDirectory(ModYmlFilePath),
+        DiffToolPath = DiffToolPath,
+    };
+
+    public static YamlGeneratorPreference FromCreatorPreference(CreatorPreference preference) => new()
+    {
+        Label = preference.Label,
+        GameDataPath = preference.GameDataPath,
+        ModYmlFilePath = GetModYmlPath(preference.ModDirectory),
+        DiffToolPath = preference.DiffToolPath,
+    };
+
+    private static string GetModDirectory(string path)
+    {
+        if (string.IsNullOrWhiteSpace(path))
+            return string.Empty;
+
+        return Path.GetExtension(path).Equals(".yml", StringComparison.OrdinalIgnoreCase)
+            ? Path.GetDirectoryName(path) ?? string.Empty
+            : path;
+    }
+
+    private static string GetModYmlPath(string directory)
+    {
+        if (string.IsNullOrWhiteSpace(directory))
+            return string.Empty;
+
+        return Path.GetExtension(directory).Equals(".yml", StringComparison.OrdinalIgnoreCase)
+            ? directory
+            : Path.Combine(directory, "mod.yml");
+    }
+}
diff --git a/OpenKh.Tools.ModsManager.Core/ModManagerConfigurationService.cs b/OpenKh.Tools.ModsManager.Core/ModManagerConfigurationService.cs
new file mode 100644
index 000000000..fa54a0e2f
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Core/ModManagerConfigurationService.cs
@@ -0,0 +1,100 @@
+namespace OpenKh.Tools.ModsManager.Core;
+
+public sealed class ModManagerConfigurationService
+{
+    private readonly InstallationLayout _layout;
+
+    public ModManagerConfigurationService(InstallationLayout layout)
+    {
+        _layout = layout;
+        Current = ModManagerConfiguration.Load(layout.ConfigurationFile);
+        if (Current.GameEdition == 0)
+            Current.GameEdition = 2;
+        if (string.IsNullOrWhiteSpace(Current.PcVersion))
+            Current.PcVersion = "Steam";
+    }
+
+    public ModManagerConfiguration Current { get; }
+    public string InstallationDirectory => _layout.RootDirectory;
+    public string ModCollectionRoot => GetConfiguredRoot(
+        Current.ModCollectionPath,
+        Current.GameModPath,
+        "mods");
+    public string CompiledModsRoot => GetConfiguredRoot(
+        Current.GameModPath,
+        Current.ModCollectionPath,
+        "mod");
+    public string CollectionsDirectory => GetCollectionsDirectory();
+    public string GameDataDirectory => ResolvePath(
+        Current.GameDataPath,
+        Path.Combine(_layout.RootDirectory, "data"));
+
+    public string GetGameModsDirectory(GameInfo game) =>
+        Path.Combine(ModCollectionRoot, game.Id);
+
+    public string GetGameModOutputDirectory(GameInfo game) =>
+        Path.Combine(CompiledModsRoot, game.Id);
+
+    public string GetEnabledModsFile(GameInfo game) =>
+        Path.Combine(_layout.RootDirectory, game.EnabledModsFileName);
+
+    public string GetModOrderFile(GameInfo game) =>
+        Path.Combine(_layout.RootDirectory, $"mod-order-{game.ConfigFileSuffix}.txt");
+
+    public string GetCollectionSettingsFile(GameInfo game) =>
+        Path.Combine(_layout.RootDirectory, $"collection-mods-{game.ConfigFileSuffix}.json");
+
+    public void Save() => Current.Save(_layout.ConfigurationFile);
+
+    public void EnsureDirectories()
+    {
+        Directory.CreateDirectory(ModCollectionRoot);
+        Directory.CreateDirectory(CollectionsDirectory);
+        Directory.CreateDirectory(GameDataDirectory);
+        foreach (var game in GameInfo.SupportedGames)
+            Directory.CreateDirectory(GetGameModsDirectory(game));
+    }
+
+    private string GetCollectionsDirectory()
+    {
+        if (string.IsNullOrWhiteSpace(Current.ModCollectionsPath))
+            return Path.Combine(_layout.RootDirectory, "mods", "collections");
+
+        var configuredPath = ResolvePath(Current.ModCollectionsPath, _layout.RootDirectory);
+        if (!PathsMatch(Current.ModCollectionsPath, Current.ModCollectionPath))
+            return configuredPath;
+
+        return Path.Combine(configuredPath, "collections");
+    }
+
+    private string GetConfiguredRoot(string? configuredPath, string? conflictingPath, string fallbackName)
+    {
+        if (!string.IsNullOrWhiteSpace(configuredPath) && !PathsMatch(configuredPath, conflictingPath))
+            return ResolvePath(configuredPath, _layout.RootDirectory);
+
+        var parent = ResolvePath(configuredPath, _layout.RootDirectory);
+        return Path.Combine(parent, fallbackName);
+    }
+
+    private bool PathsMatch(string? left, string? right)
+    {
+        if (string.IsNullOrWhiteSpace(left) || string.IsNullOrWhiteSpace(right))
+            return false;
+
+        var comparison = OperatingSystem.IsWindows()
+            ? StringComparison.OrdinalIgnoreCase
+            : StringComparison.Ordinal;
+        return ResolvePath(left, _layout.RootDirectory)
+            .Equals(ResolvePath(right, _layout.RootDirectory), comparison);
+    }
+
+    private string ResolvePath(string? configuredPath, string fallbackPath)
+    {
+        if (string.IsNullOrWhiteSpace(configuredPath))
+            return Path.GetFullPath(fallbackPath);
+
+        return Path.GetFullPath(Path.IsPathRooted(configuredPath)
+            ? configuredPath
+            : Path.Combine(_layout.RootDirectory, configuredPath));
+    }
+}
diff --git a/OpenKh.Tools.ModsManager.Core/ModMetadata.cs b/OpenKh.Tools.ModsManager.Core/ModMetadata.cs
new file mode 100644
index 000000000..14044746f
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Core/ModMetadata.cs
@@ -0,0 +1,29 @@
+using OpenKh.Patcher;
+using YamlDotNet.Serialization;
+using YamlDotNet.Serialization.NamingConventions;
+
+namespace OpenKh.Tools.ModsManager.Core;
+
+internal sealed class ModMetadata
+{
+    private static readonly IDeserializer Deserializer = new DeserializerBuilder()
+        .IgnoreFields()
+        .IgnoreUnmatchedProperties()
+        .WithNamingConvention(CamelCaseNamingConvention.Instance)
+        .Build();
+
+    public string? Title { get; set; }
+    public string? OriginalAuthor { get; set; }
+    public string? Description { get; set; }
+    public bool IsCollection { get; set; }
+    public List<AssetFile>? Assets { get; set; }
+
+    public static ModMetadata Read(string fileName)
+    {
+        using var reader = File.OpenText(fileName);
+        return Deserializer.Deserialize<ModMetadata>(reader) ?? new ModMetadata();
+    }
+
+    public static ModMetadata Read(TextReader reader) =>
+        Deserializer.Deserialize<ModMetadata>(reader) ?? new ModMetadata();
+}
diff --git a/OpenKh.Tools.ModsManager.Core/ModOperationProgress.cs b/OpenKh.Tools.ModsManager.Core/ModOperationProgress.cs
new file mode 100644
index 000000000..c941bc373
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Core/ModOperationProgress.cs
@@ -0,0 +1,3 @@
+namespace OpenKh.Tools.ModsManager.Core;
+
+public sealed record ModOperationProgress(string Message, double? Percentage = null);
diff --git a/OpenKh.Tools.ModsManager.Core/NullDebugging.cs b/OpenKh.Tools.ModsManager.Core/NullDebugging.cs
new file mode 100644
index 000000000..7f2e67c01
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Core/NullDebugging.cs
@@ -0,0 +1,14 @@
+using OpenKh.Tools.ModsManager.Core.Interfaces;
+
+namespace OpenKh.Tools.ModsManager.Core;
+
+internal sealed class NullDebugging : IDebugging
+{
+    public void HideDebugger()
+    {
+    }
+
+    public void Log(long ms, string tag, string str)
+    {
+    }
+}
diff --git a/OpenKh.Tools.ModsManager.Core/OnlineModCatalogService.cs b/OpenKh.Tools.ModsManager.Core/OnlineModCatalogService.cs
new file mode 100644
index 000000000..6a380bec3
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Core/OnlineModCatalogService.cs
@@ -0,0 +1,267 @@
+using System.Net.Http.Headers;
+using System.Text.Json;
+
+namespace OpenKh.Tools.ModsManager.Core;
+
+public sealed class OnlineModCatalogService
+{
+    private const string FeedUrl = "https://raw.githubusercontent.com/OpenKH/mods-manager-feed/main/downloadable-mods.json";
+    private const string DenyListUrl = "https://raw.githubusercontent.com/OpenKH/mods-manager-feed/main/deny.txt";
+    private static readonly string[] IconNames = ["icon.png", "Icon.png", "ICON.png", "Icon.PNG", "icon.PNG"];
+    private static readonly string[] PreviewNames = ["preview.png", "Preview.png", "PREVIEW.png", "Preview.PNG", "preview.PNG"];
+    private static readonly HttpClient SharedHttpClient = CreateHttpClient();
+    private readonly HttpClient _httpClient;
+    private readonly string _cacheFile;
+    private readonly string _denyListCacheFile;
+    private readonly string _cacheDirectory;
+
+    public OnlineModCatalogService(
+        ModManagerConfigurationService configuration,
+        HttpClient? httpClient = null,
+        string? cacheDirectory = null)
+    {
+        _httpClient = httpClient ?? SharedHttpClient;
+        _cacheDirectory = cacheDirectory ?? Path.Combine(
+            Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
+            "OpenKh",
+            "downloadable-mods-cache");
+        _cacheFile = Path.Combine(_cacheDirectory, "downloadable-mods.json");
+        _denyListCacheFile = Path.Combine(_cacheDirectory, "deny.txt");
+    }
+
+    public async Task<IReadOnlyList<OnlineModInfo>> LoadAsync(
+        GameInfo game,
+        IReadOnlyCollection<string> installedIds,
+        IProgress<ModOperationProgress>? progress = null,
+        IProgress<OnlineModInfo>? itemProgress = null,
+        CancellationToken cancellationToken = default)
+    {
+        progress?.Report(new ModOperationProgress($"Downloading available mods for {game.DisplayName}"));
+        var json = await DownloadFeedAsync(cancellationToken);
+        using var document = JsonDocument.Parse(json);
+        if (!document.RootElement.TryGetProperty("mods", out var mods) ||
+            !mods.TryGetProperty(game.Id, out var gameMods) ||
+            gameMods.ValueKind != JsonValueKind.Array)
+        {
+            return [];
+        }
+
+        var installed = installedIds.ToHashSet(StringComparer.OrdinalIgnoreCase);
+        var denied = await LoadDenyListAsync(cancellationToken);
+        var repositories = gameMods.EnumerateArray()
+            .Select(element => element.TryGetProperty("repo", out var repo) ? repo.GetString() : null)
+            .Where(repo => !string.IsNullOrWhiteSpace(repo) && !installed.Contains(repo) && !denied.Contains(repo))
+            .Distinct(StringComparer.OrdinalIgnoreCase)
+            .Cast<string>()
+            .ToArray();
+
+        var completed = 0;
+        using var gate = new SemaphoreSlim(6);
+        var tasks = repositories.Select(async repository =>
+        {
+            await gate.WaitAsync(cancellationToken);
+            try
+            {
+                var mod = await LoadDetailsAsync(repository, game.Id, cancellationToken);
+                itemProgress?.Report(mod);
+                return mod;
+            }
+            finally
+            {
+                var current = Interlocked.Increment(ref completed);
+                progress?.Report(new ModOperationProgress(
+                    $"Loading mod details ({current}/{repositories.Length})",
+                    repositories.Length == 0 ? 1 : (double)current / repositories.Length));
+                gate.Release();
+            }
+        });
+
+        var result = await Task.WhenAll(tasks);
+        return result.OrderBy(mod => mod.Title, StringComparer.OrdinalIgnoreCase).ToArray();
+    }
+
+    private async Task<string> DownloadFeedAsync(CancellationToken cancellationToken)
+    {
+        try
+        {
+            var json = await _httpClient.GetStringAsync(FeedUrl, cancellationToken);
+            Directory.CreateDirectory(Path.GetDirectoryName(_cacheFile)!);
+            await File.WriteAllTextAsync(_cacheFile, json, cancellationToken);
+            return json;
+        }
+        catch when (File.Exists(_cacheFile))
+        {
+            return await File.ReadAllTextAsync(_cacheFile, cancellationToken);
+        }
+    }
+
+    private async Task<HashSet<string>> LoadDenyListAsync(CancellationToken cancellationToken)
+    {
+        string text;
+        try
+        {
+            text = await _httpClient.GetStringAsync(DenyListUrl, cancellationToken);
+            Directory.CreateDirectory(_cacheDirectory);
+            await File.WriteAllTextAsync(_denyListCacheFile, text, cancellationToken);
+        }
+        catch when (File.Exists(_denyListCacheFile))
+        {
+            text = await File.ReadAllTextAsync(_denyListCacheFile, cancellationToken);
+        }
+        catch
+        {
+            return new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+        }
+
+        return text.Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries)
+            .ToHashSet(StringComparer.OrdinalIgnoreCase);
+    }
+
+    private async Task<OnlineModInfo> LoadDetailsAsync(
+        string repository,
+        string gameId,
+        CancellationToken cancellationToken)
+    {
+        var parts = repository.Split('/', 2);
+        var fallbackTitle = parts.Length == 2 ? parts[1] : repository;
+        var fallbackAuthor = parts.Length == 2 ? parts[0] : "Unknown author";
+        var title = fallbackTitle;
+        var author = fallbackAuthor;
+        var description = "Metadata could not be loaded. The repository can still be installed.";
+        string? metadataBranch = null;
+        var cacheDirectory = Path.Combine(_cacheDirectory, SanitizeRepository(repository));
+        var metadataCachePath = Path.Combine(cacheDirectory, "mod.yml");
+        foreach (var branch in new[] { "main", "master" })
+        {
+            try
+            {
+                var metadataUrl = $"https://raw.githubusercontent.com/{repository}/{branch}/mod.yml";
+                var yaml = await _httpClient.GetStringAsync(metadataUrl, cancellationToken);
+                using var reader = new StringReader(yaml);
+                var metadata = ModMetadata.Read(reader);
+                title = string.IsNullOrWhiteSpace(metadata.Title) ? fallbackTitle : metadata.Title;
+                author = string.IsNullOrWhiteSpace(metadata.OriginalAuthor) ? fallbackAuthor : metadata.OriginalAuthor;
+                description = string.IsNullOrWhiteSpace(metadata.Description)
+                    ? "No description is available."
+                    : metadata.Description;
+                Directory.CreateDirectory(cacheDirectory);
+                await File.WriteAllTextAsync(metadataCachePath, yaml, cancellationToken);
+                metadataBranch = branch;
+                break;
+            }
+            catch (OperationCanceledException)
+            {
+                throw;
+            }
+            catch
+            {
+            }
+        }
+
+        if (metadataBranch is null && File.Exists(metadataCachePath))
+        {
+            try
+            {
+                var metadata = ModMetadata.Read(metadataCachePath);
+                title = string.IsNullOrWhiteSpace(metadata.Title) ? fallbackTitle : metadata.Title;
+                author = string.IsNullOrWhiteSpace(metadata.OriginalAuthor) ? fallbackAuthor : metadata.OriginalAuthor;
+                description = string.IsNullOrWhiteSpace(metadata.Description)
+                    ? "No description is available."
+                    : metadata.Description;
+            }
+            catch
+            {
+            }
+        }
+
+        var branches = metadataBranch is null
+            ? new[] { "main", "master" }
+            : new[] { metadataBranch }.Concat(new[] { "main", "master" })
+                .Distinct(StringComparer.OrdinalIgnoreCase)
+                .ToArray();
+        var iconPath = await DownloadImageAsync(
+            repository,
+            branches,
+            IconNames,
+            Path.Combine(cacheDirectory, "icon.png"),
+            cancellationToken);
+        var previewPath = await DownloadImageAsync(
+            repository,
+            branches,
+            PreviewNames,
+            Path.Combine(cacheDirectory, "preview.png"),
+            cancellationToken);
+
+        return new OnlineModInfo(
+            repository,
+            title,
+            author,
+            description,
+            gameId,
+            iconPath,
+            previewPath);
+    }
+
+    private async Task<string?> DownloadImageAsync(
+        string repository,
+        IReadOnlyCollection<string> branches,
+        IReadOnlyCollection<string> fileNames,
+        string cachePath,
+        CancellationToken cancellationToken)
+    {
+        if (File.Exists(cachePath) && DateTime.UtcNow - File.GetLastWriteTimeUtc(cachePath) < TimeSpan.FromDays(1))
+            return cachePath;
+
+        var encodedRepository = string.Join('/', repository.Split('/').Select(Uri.EscapeDataString));
+        foreach (var branch in branches)
+        {
+            foreach (var fileName in fileNames)
+            {
+                try
+                {
+                    var url = $"https://raw.githubusercontent.com/{encodedRepository}/{branch}/{fileName}";
+            using var response = await _httpClient.GetAsync(url, cancellationToken);
+                    if (!response.IsSuccessStatusCode)
+                        continue;
+
+                    var imageBytes = await response.Content.ReadAsByteArrayAsync(cancellationToken);
+                    Directory.CreateDirectory(Path.GetDirectoryName(cachePath)!);
+                    await File.WriteAllBytesAsync(cachePath, imageBytes, cancellationToken);
+                    return cachePath;
+                }
+                catch (OperationCanceledException)
+                {
+                    throw;
+                }
+                catch
+                {
+                }
+            }
+        }
+
+        return File.Exists(cachePath) ? cachePath : null;
+    }
+
+    private static string SanitizeRepository(string repository)
+    {
+        var invalidCharacters = Path.GetInvalidFileNameChars().ToHashSet();
+        return new string(repository.Select(character =>
+            character == '/' || character == '\\' || invalidCharacters.Contains(character) ? '_' : character).ToArray());
+    }
+
+    private static HttpClient CreateHttpClient()
+    {
+        var client = new HttpClient { Timeout = TimeSpan.FromSeconds(20) };
+        client.DefaultRequestHeaders.UserAgent.Add(new ProductInfoHeaderValue("OpenKH-ModManager", "1.0"));
+        return client;
+    }
+}
+
+public sealed record OnlineModInfo(
+    string Repository,
+    string Title,
+    string Author,
+    string Description,
+    string GameId,
+    string? IconPath,
+    string? PreviewPath);
diff --git a/OpenKh.Tools.ModsManager.Core/OpenKh.Tools.ModsManager.Core.csproj b/OpenKh.Tools.ModsManager.Core/OpenKh.Tools.ModsManager.Core.csproj
new file mode 100644
index 000000000..752293c4e
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Core/OpenKh.Tools.ModsManager.Core.csproj
@@ -0,0 +1,25 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\OpenKh.Patcher\OpenKh.Patcher.csproj" />
+    <ProjectReference Include="..\OpenKh.Recom\OpenKh.Recom.csproj" />
+    <ProjectReference Include="..\XeEngine.Tools.Public\Xe.Tools\Xe.Tools.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Include="..\OpenKh.Tools.Common\ProcessStream.cs"
+             Link="Compatibility\ProcessStream.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="LibGit2Sharp" Version="0.31.0" />
+    <PackageReference Include="YamlDotNet" Version="16.3.0" />
+  </ItemGroup>
+
+</Project>
diff --git a/OpenKh.Tools.ModsManager.Core/OpenKhUpdateCheckerService.cs b/OpenKh.Tools.ModsManager.Core/OpenKhUpdateCheckerService.cs
new file mode 100644
index 000000000..1280b0434
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Core/OpenKhUpdateCheckerService.cs
@@ -0,0 +1,106 @@
+using System.Net.Http.Headers;
+using System.Text.Json;
+using System.Text.RegularExpressions;
+
+namespace OpenKh.Tools.ModsManager.Core;
+
+public sealed record OpenKhUpdateCheckResult(
+    bool HasUpdate,
+    string CurrentVersion,
+    string LatestVersion,
+    string DownloadUrl);
+
+public sealed class OpenKhUpdateCheckerService
+{
+    private static readonly Regex ReleaseTagPattern = new(
+        "^release2-(?<build>\\d+)$",
+        RegexOptions.Compiled | RegexOptions.CultureInvariant);
+
+    private static readonly HttpClient SharedClient = CreateClient();
+    private readonly ModManagerConfigurationService _configuration;
+    private readonly HttpClient _httpClient;
+
+    public OpenKhUpdateCheckerService(
+        ModManagerConfigurationService configuration,
+        HttpClient? httpClient = null)
+    {
+        _configuration = configuration;
+        _httpClient = httpClient ?? SharedClient;
+    }
+
+    public async Task<OpenKhUpdateCheckResult> CheckAsync(CancellationToken cancellationToken = default)
+    {
+        using var response = await _httpClient.GetAsync(
+            "https://api.github.com/repos/OpenKH/OpenKh/releases?per_page=20",
+            cancellationToken);
+        response.EnsureSuccessStatusCode();
+
+        await using var content = await response.Content.ReadAsStreamAsync(cancellationToken);
+        using var releases = await JsonDocument.ParseAsync(content, cancellationToken: cancellationToken);
+        var latest = FindLatestRelease(releases.RootElement);
+        var currentVersion = ReadCurrentVersion();
+
+        return latest is null
+            ? new OpenKhUpdateCheckResult(false, currentVersion, string.Empty, string.Empty)
+            : new OpenKhUpdateCheckResult(
+                !currentVersion.Equals(latest.Value.Tag, StringComparison.OrdinalIgnoreCase),
+                currentVersion,
+                latest.Value.Tag,
+                latest.Value.DownloadUrl);
+    }
+
+    private string ReadCurrentVersion()
+    {
+        var versionDirectory = OpenKhUpdateEnvironment.FindVersionDirectory(
+            _configuration.InstallationDirectory,
+            AppContext.BaseDirectory);
+        var versionFile = Path.Combine(versionDirectory, "openkh-release");
+        if (!File.Exists(versionFile))
+            return "Unknown version";
+
+        return File.ReadLines(versionFile).FirstOrDefault()?.Trim() is { Length: > 0 } version
+            ? version
+            : "Unknown version";
+    }
+
+    private static ReleaseAsset? FindLatestRelease(JsonElement releases)
+    {
+        ReleaseAsset? latest = null;
+        var assetName = OpenKhUpdateEnvironment.ReleaseAssetName;
+        foreach (var release in releases.EnumerateArray())
+        {
+            var tag = release.GetProperty("tag_name").GetString() ?? string.Empty;
+            var match = ReleaseTagPattern.Match(tag);
+            if (!match.Success || !int.TryParse(match.Groups["build"].Value, out var build))
+                continue;
+
+            foreach (var asset in release.GetProperty("assets").EnumerateArray())
+            {
+                if (!string.Equals(asset.GetProperty("name").GetString(), assetName, StringComparison.OrdinalIgnoreCase) ||
+                    !string.Equals(asset.GetProperty("state").GetString(), "uploaded", StringComparison.OrdinalIgnoreCase))
+                {
+                    continue;
+                }
+
+                var downloadUrl = asset.GetProperty("browser_download_url").GetString();
+                if (string.IsNullOrWhiteSpace(downloadUrl))
+                    continue;
+
+                if (latest is null || build > latest.Value.Build)
+                    latest = new ReleaseAsset(build, tag, downloadUrl);
+            }
+        }
+
+        return latest;
+    }
+
+    private static HttpClient CreateClient()
+    {
+        var client = new HttpClient();
+        client.DefaultRequestHeaders.UserAgent.Add(new ProductInfoHeaderValue("OpenKh-ModManager", "1.0"));
+        client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/vnd.github+json"));
+        return client;
+    }
+
+    private readonly record struct ReleaseAsset(int Build, string Tag, string DownloadUrl);
+}
diff --git a/OpenKh.Tools.ModsManager.Core/OpenKhUpdateEnvironment.cs b/OpenKh.Tools.ModsManager.Core/OpenKhUpdateEnvironment.cs
new file mode 100644
index 000000000..79b1cd54b
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Core/OpenKhUpdateEnvironment.cs
@@ -0,0 +1,63 @@
+namespace OpenKh.Tools.ModsManager.Core;
+
+public static class OpenKhUpdateEnvironment
+{
+    public static string? AppImagePath => GetExistingAbsolutePath(
+        Environment.GetEnvironmentVariable("APPIMAGE"));
+
+    public static bool IsAppImage => OperatingSystem.IsLinux() && AppImagePath is not null;
+
+    public static string ReleaseAssetName => OperatingSystem.IsWindows()
+        ? "openkh.zip"
+        : IsAppImage
+            ? "openkh-x86_64.AppImage"
+            : "openkh-linux-x64.tar.gz";
+
+    public static string? FindLauncher(string installationDirectory, string applicationBaseDirectory)
+    {
+        if (AppImagePath is { } appImagePath)
+            return appImagePath;
+
+        var applicationRoot = FindApplicationRoot(applicationBaseDirectory);
+        var executableName = OperatingSystem.IsWindows()
+            ? "OpenKh.Launcher.exe"
+            : "OpenKh.Launcher";
+        var candidates = new[]
+        {
+            Path.Combine(installationDirectory, executableName),
+            Path.Combine(applicationRoot, executableName),
+        };
+        return candidates.FirstOrDefault(File.Exists);
+    }
+
+    public static string FindVersionDirectory(
+        string installationDirectory,
+        string applicationBaseDirectory)
+    {
+        var applicationRoot = FindApplicationRoot(applicationBaseDirectory);
+        return File.Exists(Path.Combine(applicationRoot, "openkh-release"))
+            ? applicationRoot
+            : installationDirectory;
+    }
+
+    public static string FindApplicationRoot(string applicationBaseDirectory)
+    {
+        var applicationDirectory = new DirectoryInfo(
+            Path.GetFullPath(applicationBaseDirectory).TrimEnd(
+                Path.DirectorySeparatorChar,
+                Path.AltDirectorySeparatorChar));
+        return applicationDirectory.Name.Equals("Apps", StringComparison.OrdinalIgnoreCase) &&
+               applicationDirectory.Parent is not null
+            ? applicationDirectory.Parent.FullName
+            : applicationDirectory.FullName;
+    }
+
+    private static string? GetExistingAbsolutePath(string? value)
+    {
+        if (string.IsNullOrWhiteSpace(value))
+            return null;
+
+        var path = Path.GetFullPath(value);
+        return File.Exists(path) ? path : null;
+    }
+}
diff --git a/OpenKh.Tools.ModsManager.Core/PanaceaPath.cs b/OpenKh.Tools.ModsManager.Core/PanaceaPath.cs
new file mode 100644
index 000000000..9f9e2ff66
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Core/PanaceaPath.cs
@@ -0,0 +1,13 @@
+namespace OpenKh.Tools.ModsManager.Core;
+
+internal static class PanaceaPath
+{
+    internal static string ToLoaderPath(string path, bool? isLinux = null)
+    {
+        if (!(isLinux ?? OperatingSystem.IsLinux()) || !path.StartsWith('/'))
+            return path;
+
+        // Panacea runs as Windows code inside Proton, where the Z: drive exposes the Linux filesystem.
+        return $"Z:{path.Replace('/', '\\')}";
+    }
+}
diff --git a/OpenKh.Tools.ModsManager.Core/PanaceaService.cs b/OpenKh.Tools.ModsManager.Core/PanaceaService.cs
new file mode 100644
index 000000000..2308a7e56
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Core/PanaceaService.cs
@@ -0,0 +1,292 @@
+using System.Security.Cryptography;
+using System.Text;
+
+namespace OpenKh.Tools.ModsManager.Core;
+
+public sealed class PanaceaService(ModManagerConfigurationService configuration)
+{
+    private const string PanaceaFileName = "OpenKH.Panacea.dll";
+    private static readonly byte[] PanaceaSignature = Encoding.ASCII.GetBytes("Welcome to OpenKH Panacea!");
+    private static readonly string[] DependencyFileNames =
+    [
+        "avcodec-vgmstream-59.dll",
+        "avformat-vgmstream-59.dll",
+        "avutil-vgmstream-57.dll",
+        "bass.dll",
+        "bass_vgmstream.dll",
+        "libatrac9.dll",
+        "libcelt-0061.dll",
+        "libcelt-0110.dll",
+        "libg719_decode.dll",
+        "libmpg123-0.dll",
+        "libspeex-1.dll",
+        "libvorbis.dll",
+        "swresample-vgmstream-4.dll"
+    ];
+
+    public PanaceaStatus GetStatus(bool isKh3D, string? releaseDirectoryOverride = null)
+    {
+        var releaseDirectory = GetReleaseDirectory(isKh3D, releaseDirectoryOverride, false);
+        if (releaseDirectory is null)
+            return new PanaceaStatus(false, false, "Configure the game folder first");
+
+        var sourceDirectory = FindSourceDirectory();
+        var installedFiles = GetInstalledLoaderFiles(releaseDirectory).ToArray();
+        if (installedFiles.Length == 0)
+        {
+            var availableVersion = sourceDirectory is null
+                ? string.Empty
+                : $", available Panacea version {GetSourceVersion(sourceDirectory)}";
+            return new PanaceaStatus(
+                false,
+                sourceDirectory is not null,
+                $"Not installed{availableVersion}");
+        }
+
+        var installedFile = sourceDirectory is null
+            ? installedFiles[0]
+            : installedFiles.FirstOrDefault(file =>
+                FilesMatch(Path.Combine(sourceDirectory, PanaceaFileName), file)) ?? installedFiles[0];
+        var installedVersion = GetInstalledVersion(installedFile, sourceDirectory);
+        if (sourceDirectory is null)
+        {
+            return new PanaceaStatus(
+                true,
+                false,
+                $"Installed, Panacea version {installedVersion}; source files unavailable");
+        }
+
+        var sourceFile = Path.Combine(sourceDirectory, PanaceaFileName);
+        var current = installedFiles.Any(file => FilesMatch(sourceFile, file)) &&
+                      DependencyFileNames.All(file => File.Exists(Path.Combine(releaseDirectory, "dependencies", file)));
+        return current
+            ? new PanaceaStatus(
+                true,
+                true,
+                $"Installed, Panacea version {installedVersion}, up to date")
+            : new PanaceaStatus(
+                true,
+                true,
+                $"Installed, Panacea version {installedVersion}; available {GetSourceVersion(sourceDirectory)}. Reinstall recommended");
+    }
+
+    public Task InstallAsync(
+        bool isKh3D,
+        string? releaseDirectoryOverride = null,
+        CancellationToken cancellationToken = default) =>
+        Task.Run(() => Install(isKh3D, releaseDirectoryOverride, cancellationToken), cancellationToken);
+
+    public Task RemoveAsync(
+        bool isKh3D,
+        string? releaseDirectoryOverride = null,
+        CancellationToken cancellationToken = default) =>
+        Task.Run(() => Remove(isKh3D, releaseDirectoryOverride, cancellationToken), cancellationToken);
+
+    public void SaveSettings()
+    {
+        configuration.Save();
+        WriteSettingsIfInstalled(false);
+        WriteSettingsIfInstalled(true);
+    }
+
+    private void WriteSettingsIfInstalled(bool isKh3D)
+    {
+        var releaseDirectory = GetReleaseDirectory(isKh3D, null, false);
+        if (string.IsNullOrWhiteSpace(releaseDirectory) || !GetStatus(isKh3D, releaseDirectory).IsInstalled)
+            return;
+
+        var settingsFile = Path.Combine(releaseDirectory, "panacea_settings.txt");
+        var values = File.Exists(settingsFile)
+            ? File.ReadAllLines(settingsFile)
+                .Where(line => line.Contains('='))
+                .Select(line => line.Split('=', 2))
+                .ToDictionary(parts => parts[0].Trim(), parts => parts[1].Trim(), StringComparer.OrdinalIgnoreCase)
+            : new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+        values["mod_path"] = PanaceaPath.ToLoaderPath(configuration.CompiledModsRoot);
+        values["show_console"] = configuration.Current.ShowConsole.ToString().ToLowerInvariant();
+        values["debug_log"] = configuration.Current.DebugLog.ToString().ToLowerInvariant();
+        values["sound_debug"] = configuration.Current.SoundDebug.ToString().ToLowerInvariant();
+        values["enable_cache"] = configuration.Current.EnableCache.ToString().ToLowerInvariant();
+        values["quick_menu"] = configuration.Current.QuickMenu.ToString().ToLowerInvariant();
+        File.WriteAllLines(settingsFile, values.Select(value => $"{value.Key}={value.Value}"));
+    }
+
+    private void Install(bool isKh3D, string? releaseDirectoryOverride, CancellationToken cancellationToken)
+    {
+        var releaseDirectory = GetReleaseDirectory(isKh3D, releaseDirectoryOverride, true)!;
+        SaveReleaseDirectory(isKh3D, releaseDirectory);
+        var sourceDirectory = FindSourceDirectory() ?? throw new FileNotFoundException(
+            "OpenKH.Panacea.dll and its dependencies are not available in this OpenKH build.");
+        var missingDependency = DependencyFileNames.FirstOrDefault(file =>
+            !File.Exists(Path.Combine(sourceDirectory, file)));
+        if (missingDependency is not null)
+            throw new FileNotFoundException($"The Panacea dependency '{missingDependency}' is missing.");
+
+        cancellationToken.ThrowIfCancellationRequested();
+        var destinationLoader = Path.Combine(
+            releaseDirectory,
+            OperatingSystem.IsWindows() ? "DBGHELP.dll" : "version.dll");
+        var alternateLoader = Path.Combine(
+            releaseDirectory,
+            OperatingSystem.IsWindows() ? "version.dll" : "DBGHELP.dll");
+        File.Copy(Path.Combine(sourceDirectory, PanaceaFileName), destinationLoader, true);
+        if (IsPanaceaLoader(alternateLoader))
+            File.Delete(alternateLoader);
+
+        var dependencyDirectory = Path.Combine(releaseDirectory, "dependencies");
+        Directory.CreateDirectory(dependencyDirectory);
+        foreach (var dependency in DependencyFileNames)
+        {
+            cancellationToken.ThrowIfCancellationRequested();
+            File.Copy(
+                Path.Combine(sourceDirectory, dependency),
+                Path.Combine(dependencyDirectory, dependency),
+                true);
+        }
+
+        var settingsFile = Path.Combine(releaseDirectory, "panacea_settings.txt");
+        File.WriteAllLines(settingsFile,
+        [
+            $"mod_path={PanaceaPath.ToLoaderPath(configuration.CompiledModsRoot)}",
+            $"show_console={configuration.Current.ShowConsole.ToString().ToLowerInvariant()}"
+        ]);
+        configuration.Current.PanaceaInstalled = true;
+        configuration.Save();
+    }
+
+    private void Remove(bool isKh3D, string? releaseDirectoryOverride, CancellationToken cancellationToken)
+    {
+        var releaseDirectory = GetReleaseDirectory(isKh3D, releaseDirectoryOverride, true)!;
+        SaveReleaseDirectory(isKh3D, releaseDirectory);
+        foreach (var loader in GetInstalledLoaderFiles(releaseDirectory))
+        {
+            cancellationToken.ThrowIfCancellationRequested();
+            File.Delete(loader);
+        }
+
+        var dependencyDirectory = Path.Combine(releaseDirectory, "dependencies");
+        foreach (var dependency in DependencyFileNames)
+        {
+            cancellationToken.ThrowIfCancellationRequested();
+            var installedDependency = Path.Combine(dependencyDirectory, dependency);
+            if (File.Exists(installedDependency))
+                File.Delete(installedDependency);
+        }
+        if (Directory.Exists(dependencyDirectory) && !Directory.EnumerateFileSystemEntries(dependencyDirectory).Any())
+            Directory.Delete(dependencyDirectory);
+        var settingsFile = Path.Combine(releaseDirectory, "panacea_settings.txt");
+        if (File.Exists(settingsFile))
+            File.Delete(settingsFile);
+
+        var otherStatus = GetStatus(!isKh3D);
+        configuration.Current.PanaceaInstalled = otherStatus.IsInstalled;
+        configuration.Save();
+    }
+
+    private string? FindSourceDirectory()
+    {
+        var candidates = new[]
+        {
+            AppContext.BaseDirectory,
+            Path.Combine(configuration.InstallationDirectory, "Apps", "ModManager"),
+            Path.Combine(configuration.InstallationDirectory, "Apps"),
+            configuration.InstallationDirectory
+        };
+        return candidates.FirstOrDefault(directory =>
+            File.Exists(Path.Combine(directory, PanaceaFileName)) &&
+            DependencyFileNames.All(file => File.Exists(Path.Combine(directory, file))));
+    }
+
+    private string GetInstalledVersion(string installedFile, string? sourceDirectory)
+    {
+        if (sourceDirectory is not null &&
+            FilesMatch(installedFile, Path.Combine(sourceDirectory, PanaceaFileName)))
+        {
+            return GetSourceVersion(sourceDirectory);
+        }
+
+        return GetBuildIdentifier(installedFile);
+    }
+
+    private string GetSourceVersion(string sourceDirectory)
+    {
+        var releaseFile = Path.Combine(configuration.InstallationDirectory, "openkh-release");
+        if (File.Exists(releaseFile))
+        {
+            var release = File.ReadLines(releaseFile)
+                .Select(line => line.Trim())
+                .FirstOrDefault(line => line.Length > 0);
+            if (!string.IsNullOrWhiteSpace(release))
+                return $"OpenKH {release}";
+        }
+
+        return GetBuildIdentifier(Path.Combine(sourceDirectory, PanaceaFileName));
+    }
+
+    private static string GetBuildIdentifier(string fileName)
+    {
+        using var stream = File.OpenRead(fileName);
+        var hash = Convert.ToHexString(SHA256.HashData(stream));
+        return $"build {hash[..8]}";
+    }
+
+    private string? GetReleaseDirectory(bool isKh3D, string? releaseDirectoryOverride, bool required)
+    {
+        var directory = string.IsNullOrWhiteSpace(releaseDirectoryOverride)
+            ? isKh3D
+                ? configuration.Current.PcReleaseLocationKh3D
+                : configuration.Current.PcReleaseLocation
+            : releaseDirectoryOverride.Trim();
+        if (!string.IsNullOrWhiteSpace(directory) && Directory.Exists(directory))
+            return directory;
+        if (required)
+            throw new DirectoryNotFoundException("Configure a valid PC release folder before managing Panacea.");
+        return null;
+    }
+
+    private void SaveReleaseDirectory(bool isKh3D, string releaseDirectory)
+    {
+        if (isKh3D)
+            configuration.Current.PcReleaseLocationKh3D = releaseDirectory;
+        else
+            configuration.Current.PcReleaseLocation = releaseDirectory;
+    }
+
+    private static IEnumerable<string> GetInstalledLoaderFiles(string releaseDirectory)
+    {
+        var dbgHelp = Path.Combine(releaseDirectory, "DBGHELP.dll");
+        var version = Path.Combine(releaseDirectory, "version.dll");
+        if (IsPanaceaLoader(dbgHelp))
+            yield return dbgHelp;
+        if (IsPanaceaLoader(version))
+            yield return version;
+    }
+
+    private static bool IsPanaceaLoader(string fileName)
+    {
+        if (!File.Exists(fileName))
+            return false;
+
+        try
+        {
+            return File.ReadAllBytes(fileName).AsSpan().IndexOf(PanaceaSignature) >= 0;
+        }
+        catch (IOException)
+        {
+            return false;
+        }
+        catch (UnauthorizedAccessException)
+        {
+            return false;
+        }
+    }
+
+    private static bool FilesMatch(string left, string right)
+    {
+        using var leftStream = File.OpenRead(left);
+        using var rightStream = File.OpenRead(right);
+        return MD5.HashData(leftStream).SequenceEqual(MD5.HashData(rightStream));
+    }
+}
+
+public sealed record PanaceaStatus(bool IsInstalled, bool CanInstall, string Message);
diff --git a/OpenKh.Tools.ModsManager.Core/PcPackagePatchService.cs b/OpenKh.Tools.ModsManager.Core/PcPackagePatchService.cs
new file mode 100644
index 000000000..a8f3a155c
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Core/PcPackagePatchService.cs
@@ -0,0 +1,264 @@
+using OpenKh.Common;
+using OpenKh.Egs;
+
+namespace OpenKh.Tools.ModsManager.Core;
+
+public sealed class PcPackagePatchService(ModManagerConfigurationService configuration)
+{
+    private const string OriginalFilesDirectory = "original";
+    private const string RawFilesDirectory = "raw";
+
+    public Task ApplyAsync(
+        GameInfo game,
+        bool fastMode = false,
+        IProgress<ModOperationProgress>? progress = null,
+        CancellationToken cancellationToken = default) =>
+        Task.Run(() => Apply(game, fastMode, progress, cancellationToken), cancellationToken);
+
+    public Task RestoreAsync(
+        GameInfo game,
+        bool restorePackages = true,
+        IProgress<ModOperationProgress>? progress = null,
+        CancellationToken cancellationToken = default) =>
+        Task.Run(() => Restore(game, restorePackages, progress, cancellationToken), cancellationToken);
+
+    private void Apply(
+        GameInfo game,
+        bool fastMode,
+        IProgress<ModOperationProgress>? progress,
+        CancellationToken cancellationToken)
+    {
+        if (configuration.Current.GameEdition != 2)
+            throw new InvalidOperationException("Direct package patching is only available for PC releases.");
+
+        var modOutput = configuration.GetGameModOutputDirectory(game);
+        var packageMapFile = Path.Combine(modOutput, "patch-package-map.txt");
+        if (!File.Exists(packageMapFile))
+            throw new FileNotFoundException("Build the enabled mods before applying them to the game.", packageMapFile);
+
+        var packageMap = File.ReadLines(packageMapFile)
+            .Where(line => !string.IsNullOrWhiteSpace(line))
+            .Select(line => line.Split(" $$$$ ", 2))
+            .Where(parts => parts.Length == 2)
+            .ToDictionary(parts => parts[0], parts => parts[1]);
+        StagePackages(modOutput, packageMap, cancellationToken);
+
+        var packageDirectories = Directory.EnumerateDirectories(modOutput)
+            .Where(directory => !Path.GetFileName(directory).StartsWith(".", StringComparison.Ordinal))
+            .ToArray();
+        for (var index = 0; index < packageDirectories.Length; index++)
+        {
+            cancellationToken.ThrowIfCancellationRequested();
+            var directory = packageDirectories[index];
+            var packagePart = Path.GetFileName(directory);
+            progress?.Report(new ModOperationProgress(
+                $"Applying {packagePart}",
+                (double)index / Math.Max(1, packageDirectories.Length)));
+            PatchPackage(game, directory, packagePart, fastMode, cancellationToken);
+        }
+
+        progress?.Report(new ModOperationProgress("Game packages were patched", 1));
+    }
+
+    private static void StagePackages(
+        string modOutput,
+        IReadOnlyDictionary<string, string> packageMap,
+        CancellationToken cancellationToken)
+    {
+        var stagingDirectory = Path.Combine(modOutput, ".patch-staging");
+        DeleteDirectoryIfPresent(stagingDirectory);
+        Directory.CreateDirectory(stagingDirectory);
+        foreach (var entry in packageMap)
+        {
+            cancellationToken.ThrowIfCancellationRequested();
+            var source = Path.Combine(modOutput, entry.Key);
+            var destination = Path.Combine(stagingDirectory, entry.Value);
+            if (!File.Exists(source))
+                continue;
+            Directory.CreateDirectory(Path.GetDirectoryName(destination)!);
+            File.Move(source, destination, true);
+        }
+
+        foreach (var directory in Directory.EnumerateDirectories(modOutput).Where(path => path != stagingDirectory))
+            DeleteDirectoryIfPresent(directory);
+        foreach (var directory in Directory.EnumerateDirectories(stagingDirectory))
+            Directory.Move(directory, Path.Combine(modOutput, Path.GetFileName(directory)));
+        DeleteDirectoryIfPresent(stagingDirectory);
+
+        var specialDirectory = Path.Combine(modOutput, "special");
+        if (!Directory.Exists(specialDirectory))
+            return;
+        foreach (var directory in Directory.EnumerateDirectories(specialDirectory))
+        {
+            var destination = Path.Combine(modOutput, Path.GetFileName(directory));
+            if (Directory.Exists(destination))
+                MergeDirectory(directory, destination);
+            else
+                Directory.Move(directory, destination);
+        }
+        DeleteDirectoryIfPresent(specialDirectory);
+    }
+
+    private void PatchPackage(
+        GameInfo game,
+        string patchDirectory,
+        string packagePart,
+        bool fastMode,
+        CancellationToken cancellationToken)
+    {
+        var patchFiles = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+        var originalDirectory = Path.Combine(patchDirectory, OriginalFilesDirectory);
+        var rawDirectory = Path.Combine(patchDirectory, RawFilesDirectory);
+        if (Directory.Exists(originalDirectory))
+            patchFiles.UnionWith(OpenKh.Egs.Helpers.GetAllFiles(originalDirectory));
+        if (Directory.Exists(rawDirectory))
+            patchFiles.UnionWith(OpenKh.Egs.Helpers.GetAllFiles(rawDirectory));
+
+        var packageName = GetPackageName(game, packagePart, fastMode);
+        var releaseDirectory = GetReleaseDirectory(game);
+        var languageDirectory = configuration.Current.PcVersion.Equals("Steam", StringComparison.OrdinalIgnoreCase) &&
+                                configuration.Current.PcReleaseLanguage.Equals("en", StringComparison.OrdinalIgnoreCase)
+            ? "dt"
+            : configuration.Current.PcReleaseLanguage;
+        var gamePackage = Path.Combine(releaseDirectory, "Image", languageDirectory, $"{packageName}.pkg");
+        var gameHed = Path.ChangeExtension(gamePackage, "hed");
+        if (!File.Exists(gamePackage) || !File.Exists(gameHed))
+            throw new FileNotFoundException($"Could not find the {packageName} HED/PKG files.", gamePackage);
+
+        var backupDirectory = Path.Combine(releaseDirectory, "BackupImage");
+        Directory.CreateDirectory(backupDirectory);
+        var backupPackage = Path.Combine(backupDirectory, $"{packageName}.pkg");
+        var backupHed = Path.ChangeExtension(backupPackage, "hed");
+        if (!File.Exists(backupPackage))
+        {
+            File.Copy(gamePackage, backupPackage);
+            File.Copy(gameHed, backupHed);
+        }
+        else
+        {
+            File.Copy(backupPackage, gamePackage, true);
+            File.Copy(backupHed, gameHed, true);
+        }
+
+        var temporaryDirectory = Path.Combine(configuration.InstallationDirectory, ".openkh-patched-packages");
+        Directory.CreateDirectory(temporaryDirectory);
+        var temporaryPackage = Path.Combine(temporaryDirectory, $"{packageName}-{Guid.NewGuid():N}.pkg");
+        var temporaryHed = Path.ChangeExtension(temporaryPackage, "hed");
+        try
+        {
+            using var hedStream = File.OpenRead(gameHed);
+            using var packageStream = File.OpenRead(gamePackage);
+            using var patchedHed = File.Create(temporaryHed);
+            using var patchedPackage = File.Create(temporaryPackage);
+            foreach (var header in Hed.Read(hedStream))
+            {
+                cancellationToken.ThrowIfCancellationRequested();
+                var hash = OpenKh.Egs.Helpers.ToString(header.MD5);
+                if (!EgsTools.Names.TryGetValue(hash, out var fileName))
+                    continue;
+
+                var asset = new EgsHdAsset(packageStream.SetPosition(header.Offset));
+                EgsTools.ReplaceFile(patchDirectory, fileName, patchedHed, patchedPackage, asset, header);
+                patchFiles.Remove(fileName);
+            }
+            foreach (var fileName in patchFiles)
+            {
+                cancellationToken.ThrowIfCancellationRequested();
+                EgsTools.AddFile(patchDirectory, fileName, patchedHed, patchedPackage);
+            }
+        }
+        catch
+        {
+            File.Copy(backupPackage, gamePackage, true);
+            File.Copy(backupHed, gameHed, true);
+            throw;
+        }
+
+        File.Move(temporaryPackage, gamePackage, true);
+        File.Move(temporaryHed, gameHed, true);
+    }
+
+    private void Restore(
+        GameInfo game,
+        bool restorePackages,
+        IProgress<ModOperationProgress>? progress,
+        CancellationToken cancellationToken)
+    {
+        if (!restorePackages)
+        {
+            DeleteDirectoryIfPresent(configuration.GetGameModOutputDirectory(game));
+            progress?.Report(new ModOperationProgress("Built mod output removed", 1));
+            return;
+        }
+
+        var releaseDirectory = GetReleaseDirectory(game);
+        var backupDirectory = Path.Combine(releaseDirectory, "BackupImage");
+        if (!Directory.Exists(backupDirectory))
+            throw new DirectoryNotFoundException("No BackupImage folder exists for this game installation.");
+
+        var languageDirectory = configuration.Current.PcVersion.Equals("Steam", StringComparison.OrdinalIgnoreCase) &&
+                                configuration.Current.PcReleaseLanguage.Equals("en", StringComparison.OrdinalIgnoreCase)
+            ? "dt"
+            : configuration.Current.PcReleaseLanguage;
+        var imageDirectory = Path.Combine(releaseDirectory, "Image", languageDirectory);
+        var packages = Directory.EnumerateFiles(backupDirectory, "*.pkg")
+            .Where(file => Path.GetFileName(file).Contains(game.Id, StringComparison.OrdinalIgnoreCase) ||
+                           game.Id.Equals("Recom", StringComparison.OrdinalIgnoreCase) &&
+                           Path.GetFileName(file).Contains("Recom", StringComparison.OrdinalIgnoreCase))
+            .ToArray();
+        if (packages.Length == 0)
+            throw new FileNotFoundException($"No backup packages were found for {game.DisplayName}.");
+
+        for (var index = 0; index < packages.Length; index++)
+        {
+            cancellationToken.ThrowIfCancellationRequested();
+            var backupPackage = packages[index];
+            var destinationPackage = Path.Combine(imageDirectory, Path.GetFileName(backupPackage));
+            File.Copy(backupPackage, destinationPackage, true);
+            File.Copy(Path.ChangeExtension(backupPackage, "hed"), Path.ChangeExtension(destinationPackage, "hed"), true);
+            progress?.Report(new ModOperationProgress(
+                $"Restoring {Path.GetFileNameWithoutExtension(backupPackage)}",
+                (double)(index + 1) / packages.Length));
+        }
+        DeleteDirectoryIfPresent(configuration.GetGameModOutputDirectory(game));
+    }
+
+    private string GetReleaseDirectory(GameInfo game)
+    {
+        var directory = game.Id.Equals("kh3d", StringComparison.OrdinalIgnoreCase)
+            ? configuration.Current.PcReleaseLocationKh3D
+            : configuration.Current.PcReleaseLocation;
+        if (string.IsNullOrWhiteSpace(directory) || !Directory.Exists(directory))
+            throw new DirectoryNotFoundException($"Configure the {game.DisplayName} installation folder in Setup.");
+        return directory;
+    }
+
+    private static string GetPackageName(GameInfo game, string packagePart, bool fastMode) =>
+        game.Id.ToLowerInvariant() switch
+        {
+            "kh1" => fastMode ? "kh1_first" : packagePart,
+            "bbs" => fastMode ? "bbs_first" : packagePart,
+            "recom" => "Recom",
+            "kh3d" => fastMode ? "kh3d_first" : packagePart,
+            _ => fastMode ? "kh2_first" : packagePart
+        };
+
+    private static void MergeDirectory(string source, string destination)
+    {
+        Directory.CreateDirectory(destination);
+        foreach (var directory in Directory.EnumerateDirectories(source))
+            MergeDirectory(directory, Path.Combine(destination, Path.GetFileName(directory)));
+        foreach (var file in Directory.EnumerateFiles(source))
+            File.Move(file, Path.Combine(destination, Path.GetFileName(file)), true);
+        DeleteDirectoryIfPresent(source);
+    }
+
+    private static void DeleteDirectoryIfPresent(string directory)
+    {
+        if (!Directory.Exists(directory))
+            return;
+        foreach (var file in Directory.EnumerateFiles(directory, "*", SearchOption.AllDirectories))
+            File.SetAttributes(file, FileAttributes.Normal);
+        Directory.Delete(directory, true);
+    }
+}
diff --git a/OpenKh.Tools.ModsManager.Core/Pcsx2OperationDispatcher.cs b/OpenKh.Tools.ModsManager.Core/Pcsx2OperationDispatcher.cs
new file mode 100644
index 000000000..6f0fa52f5
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Core/Pcsx2OperationDispatcher.cs
@@ -0,0 +1,80 @@
+using OpenKh.Tools.ModsManager.Core.Interfaces;
+
+namespace OpenKh.Tools.ModsManager.Core;
+
+public sealed class Pcsx2OperationDispatcher(
+    ModManagerConfigurationService configuration,
+    GameInfo game) : IOperationDispatcher
+{
+    private static readonly string[] RegionFallback = ["us", "fm", "jp", "uk", "it", "fr", "es", "de"];
+    private static readonly HashSet<string> DenyList = new(StringComparer.OrdinalIgnoreCase)
+    {
+        "dkmovie.x", "dktitle.x", "gb.x", "wm.x", "xl_limit.x", "xs_bambi.x", "xs_dh_break.x",
+        "xs_dumbo.x", "xs_genie.x", "xs_mushu.x", "xs_simba.x", "xs_tink.x", "ovl_title.x",
+        "ovl_shop.x", "ovl_movie.x", "ovl_gumibattle.x", "ovl_gumimenu.x"
+    };
+
+    public int LoadFile(Stream outStream, string fileName)
+    {
+        var finalFileName = ResolveFile(fileName);
+        if (finalFileName is null)
+            return 0;
+
+        using var input = File.OpenRead(finalFileName);
+        input.CopyTo(outStream, 512 * 1024);
+        return checked((int)input.Length);
+    }
+
+    public int GetFileSize(string fileName)
+    {
+        var finalFileName = ResolveFile(fileName);
+        return finalFileName is null ? 0 : checked((int)new FileInfo(finalFileName).Length);
+    }
+
+    private string? ResolveFile(string fileName)
+    {
+        if (DenyList.Contains(fileName))
+            return null;
+
+        var modRoot = configuration.GetGameModOutputDirectory(game);
+        var dataRoot = Path.Combine(configuration.GameDataDirectory, game.Id);
+        foreach (var candidate in EnumerateCandidates(fileName))
+        {
+            var resolved = ResolveCandidate(modRoot, candidate) ?? ResolveCandidate(dataRoot, candidate);
+            if (resolved is not null)
+                return resolved;
+        }
+
+        return null;
+    }
+
+    private static IEnumerable<string> EnumerateCandidates(string fileName)
+    {
+        yield return fileName;
+        var region = RegionFallback.FirstOrDefault(candidate =>
+            fileName.Contains($"/{candidate}/", StringComparison.OrdinalIgnoreCase) ||
+            fileName.EndsWith($".a.{candidate}", StringComparison.OrdinalIgnoreCase));
+        if (region is null)
+            yield break;
+
+        foreach (var fallback in RegionFallback)
+        {
+            yield return fileName
+                .Replace($"/{region}/", $"/{fallback}/", StringComparison.OrdinalIgnoreCase)
+                .Replace($".a.{region}", $".a.{fallback}", StringComparison.OrdinalIgnoreCase)
+                .Replace(".apdx", $".a.{fallback}", StringComparison.OrdinalIgnoreCase);
+        }
+    }
+
+    private static string? ResolveCandidate(string root, string relativePath)
+    {
+        var candidate = Path.Combine(root, relativePath);
+        if (!File.Exists(candidate))
+            return null;
+
+        var file = new FileInfo(candidate);
+        return file.LinkTarget is null
+            ? file.FullName
+            : Path.GetFullPath(file.LinkTarget, file.DirectoryName!);
+    }
+}
diff --git a/OpenKh.Tools.ModsManager.Core/PresetService.cs b/OpenKh.Tools.ModsManager.Core/PresetService.cs
new file mode 100644
index 000000000..d4c3cc4d5
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Core/PresetService.cs
@@ -0,0 +1,50 @@
+namespace OpenKh.Tools.ModsManager.Core;
+
+public sealed class PresetService
+{
+    private readonly string _presetDirectory;
+
+    public PresetService(ModManagerConfigurationService configuration)
+    {
+        _presetDirectory = Path.Combine(configuration.InstallationDirectory, "presets");
+        Directory.CreateDirectory(_presetDirectory);
+    }
+
+    public IReadOnlyList<string> GetNames() => Directory.EnumerateFiles(_presetDirectory, "*.txt")
+        .Select(Path.GetFileNameWithoutExtension)
+        .Where(name => !string.IsNullOrWhiteSpace(name))
+        .Cast<string>()
+        .OrderBy(name => name, StringComparer.OrdinalIgnoreCase)
+        .ToArray();
+
+    public void Save(string name, IEnumerable<string> enabledModIds)
+    {
+        var safeName = SanitizeName(name);
+        File.WriteAllLines(GetPath(safeName), enabledModIds);
+    }
+
+    public IReadOnlyList<string> Load(string name)
+    {
+        var path = GetPath(name);
+        if (!File.Exists(path))
+            throw new FileNotFoundException("The selected preset could not be found.", path);
+        return File.ReadAllLines(path).Where(line => !string.IsNullOrWhiteSpace(line)).ToArray();
+    }
+
+    public void Remove(string name)
+    {
+        var path = GetPath(name);
+        if (File.Exists(path))
+            File.Delete(path);
+    }
+
+    private string GetPath(string name) => Path.Combine(_presetDirectory, $"{SanitizeName(name)}.txt");
+
+    private static string SanitizeName(string name)
+    {
+        if (string.IsNullOrWhiteSpace(name))
+            throw new ArgumentException("Enter a preset name.", nameof(name));
+        var result = string.Join("+", name.Trim().Split(Path.GetInvalidFileNameChars()));
+        return string.IsNullOrWhiteSpace(result) ? "Preset" : result;
+    }
+}
diff --git a/OpenKh.Tools.ModsManager.Core/Properties/AssemblyInfo.cs b/OpenKh.Tools.ModsManager.Core/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..5d4c3d3ce
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Core/Properties/AssemblyInfo.cs
@@ -0,0 +1,3 @@
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("OpenKh.Tests.ModsManager.Core")]
diff --git a/OpenKh.Tools.ModsManager.Core/RepositoryModInstaller.cs b/OpenKh.Tools.ModsManager.Core/RepositoryModInstaller.cs
new file mode 100644
index 000000000..e3c1c5f92
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Core/RepositoryModInstaller.cs
@@ -0,0 +1,336 @@
+using LibGit2Sharp;
+using System.IO.Compression;
+using System.Net.Http.Headers;
+
+namespace OpenKh.Tools.ModsManager.Core;
+
+public sealed class RepositoryModInstaller
+{
+    private const string MetadataFileName = "mod.yml";
+    private static readonly HttpClient HttpClient = CreateHttpClient();
+    private readonly ModManagerConfigurationService _configuration;
+    private readonly LocalModInstaller _localInstaller;
+
+    public RepositoryModInstaller(
+        ModManagerConfigurationService configuration,
+        LocalModInstaller localInstaller)
+    {
+        _configuration = configuration;
+        _localInstaller = localInstaller;
+    }
+
+    public async Task<ModInstallResult> InstallAsync(
+        string source,
+        GameInfo game,
+        string? branch = null,
+        bool overwrite = false,
+        IProgress<ModOperationProgress>? progress = null,
+        CancellationToken cancellationToken = default)
+    {
+        if (string.IsNullOrWhiteSpace(source))
+            throw new ArgumentException("Enter a repository, ZIP URL, or local file.", nameof(source));
+
+        source = source.Trim();
+        if (File.Exists(source))
+            return await InstallLocalFileAsync(source, game, overwrite, progress, cancellationToken);
+
+        if (Uri.TryCreate(source, UriKind.Absolute, out var uri) && IsArchiveUri(uri))
+            return await DownloadArchiveAsync(uri, game, overwrite, progress, cancellationToken);
+
+        var repository = RepositoryAddress.Parse(source, branch);
+        return await CloneAsync(repository, game, overwrite, progress, cancellationToken);
+    }
+
+    public string? FindInstalledMod(string source, GameInfo game, string? branch = null)
+    {
+        if (string.IsNullOrWhiteSpace(source))
+            throw new ArgumentException("Enter a repository, ZIP URL, or local file.", nameof(source));
+
+        source = source.Trim();
+        if (File.Exists(source))
+        {
+            var extension = Path.GetExtension(source);
+            if (extension.Equals(".lua", StringComparison.OrdinalIgnoreCase))
+            {
+                var id = Path.GetFileNameWithoutExtension(source);
+                return Directory.Exists(Path.Combine(_configuration.GetGameModsDirectory(game), id))
+                    ? id
+                    : null;
+            }
+
+            return _localInstaller.FindInstalledMod(source, game);
+        }
+
+        if (Uri.TryCreate(source, UriKind.Absolute, out var uri) && IsArchiveUri(uri))
+            return null;
+
+        var repository = RepositoryAddress.Parse(source, branch);
+        return Directory.Exists(Path.Combine(_configuration.GetGameModsDirectory(game), repository.Id)) ||
+               Directory.Exists(Path.Combine(_configuration.CollectionsDirectory, repository.Id))
+            ? repository.Id
+            : null;
+    }
+
+    private async Task<ModInstallResult> InstallLocalFileAsync(
+        string fileName,
+        GameInfo game,
+        bool overwrite,
+        IProgress<ModOperationProgress>? progress,
+        CancellationToken cancellationToken)
+    {
+        var extension = Path.GetExtension(fileName);
+        if (extension.Equals(".lua", StringComparison.OrdinalIgnoreCase))
+            return await InstallLuaAsync(fileName, game, overwrite, cancellationToken);
+
+        progress?.Report(new ModOperationProgress($"Opening {Path.GetFileName(fileName)}"));
+        return await _localInstaller.InstallAsync(fileName, game, overwrite, cancellationToken);
+    }
+
+    private async Task<ModInstallResult> DownloadArchiveAsync(
+        Uri uri,
+        GameInfo game,
+        bool overwrite,
+        IProgress<ModOperationProgress>? progress,
+        CancellationToken cancellationToken)
+    {
+        progress?.Report(new ModOperationProgress("Downloading mod package", 0));
+        var temporaryFile = Path.Combine(Path.GetTempPath(), $"openkh-mod-{Guid.NewGuid():N}.zip");
+        try
+        {
+            using var response = await HttpClient.GetAsync(
+                uri,
+                HttpCompletionOption.ResponseHeadersRead,
+                cancellationToken);
+            response.EnsureSuccessStatusCode();
+
+            var totalBytes = response.Content.Headers.ContentLength;
+            await using var input = await response.Content.ReadAsStreamAsync(cancellationToken);
+            await using var output = File.Create(temporaryFile);
+            var buffer = new byte[81920];
+            long receivedBytes = 0;
+            while (true)
+            {
+                var count = await input.ReadAsync(buffer, cancellationToken);
+                if (count == 0)
+                    break;
+
+                await output.WriteAsync(buffer.AsMemory(0, count), cancellationToken);
+                receivedBytes += count;
+                progress?.Report(new ModOperationProgress(
+                    "Downloading mod package",
+                    totalBytes > 0 ? (double)receivedBytes / totalBytes.Value : null));
+            }
+
+            var archiveName = GetArchiveName(uri);
+            var namedTemporaryFile = Path.Combine(Path.GetDirectoryName(temporaryFile)!, archiveName);
+            File.Move(temporaryFile, namedTemporaryFile, true);
+            temporaryFile = namedTemporaryFile;
+            return await _localInstaller.InstallAsync(temporaryFile, game, overwrite, cancellationToken);
+        }
+        finally
+        {
+            if (File.Exists(temporaryFile))
+                File.Delete(temporaryFile);
+        }
+    }
+
+    private async Task<ModInstallResult> CloneAsync(
+        RepositoryAddress repository,
+        GameInfo game,
+        bool overwrite,
+        IProgress<ModOperationProgress>? progress,
+        CancellationToken cancellationToken)
+    {
+        var destination = Path.Combine(_configuration.GetGameModsDirectory(game), repository.Id);
+        var collectionDestination = Path.Combine(_configuration.CollectionsDirectory, repository.Id);
+        PrepareDestination(destination, overwrite);
+        PrepareDestination(collectionDestination, overwrite);
+        Directory.CreateDirectory(Path.GetDirectoryName(destination)!);
+
+        try
+        {
+            progress?.Report(new ModOperationProgress($"Cloning {repository.Id}", 0));
+            await Task.Run(() =>
+            {
+                cancellationToken.ThrowIfCancellationRequested();
+                var options = new CloneOptions
+                {
+                    BranchName = repository.Branch,
+                    RecurseSubmodules = true
+                };
+                options.FetchOptions.OnProgress = message =>
+                {
+                    progress?.Report(new ModOperationProgress(message.Trim()));
+                    return !cancellationToken.IsCancellationRequested;
+                };
+                options.FetchOptions.OnTransferProgress = transfer =>
+                {
+                    var percentage = transfer.TotalObjects == 0
+                        ? null
+                        : (double?)transfer.ReceivedObjects / transfer.TotalObjects;
+                    progress?.Report(new ModOperationProgress("Receiving repository objects", percentage));
+                    return !cancellationToken.IsCancellationRequested;
+                };
+
+                Repository.Clone(repository.CloneUrl, destination, options);
+                cancellationToken.ThrowIfCancellationRequested();
+            }, cancellationToken);
+
+            var metadataPath = Path.Combine(destination, MetadataFileName);
+            if (!File.Exists(metadataPath))
+                throw new InvalidDataException("The repository is not an OpenKH mod because mod.yml is missing.");
+
+            var metadata = ModMetadata.Read(metadataPath);
+            var finalDestination = destination;
+            if (metadata.IsCollection)
+            {
+                Directory.CreateDirectory(Path.GetDirectoryName(collectionDestination)!);
+                Directory.Move(destination, collectionDestination);
+                finalDestination = collectionDestination;
+            }
+
+            progress?.Report(new ModOperationProgress($"Installed {metadata.Title ?? repository.Id}", 1));
+            return new ModInstallResult(
+                repository.Id,
+                string.IsNullOrWhiteSpace(metadata.Title) ? repository.Id : metadata.Title,
+                finalDestination);
+        }
+        catch
+        {
+            DeleteDirectoryIfPresent(destination);
+            throw;
+        }
+    }
+
+    private async Task<ModInstallResult> InstallLuaAsync(
+        string fileName,
+        GameInfo game,
+        bool overwrite,
+        CancellationToken cancellationToken)
+    {
+        var id = Path.GetFileNameWithoutExtension(fileName);
+        var destination = Path.Combine(_configuration.GetGameModsDirectory(game), id);
+        PrepareDestination(destination, overwrite);
+        Directory.CreateDirectory(destination);
+
+        try
+        {
+            var lines = await File.ReadAllLinesAsync(fileName, cancellationToken);
+            var title = ReadLuaHeader(lines, "LUAGUI_NAME") ?? id;
+            var author = ReadLuaHeader(lines, "LUAGUI_AUTH") ?? "Unknown author";
+            var description = ReadLuaHeader(lines, "LUAGUI_DESC") ??
+                "This metadata was generated from a Lua mod.";
+            var scriptName = Path.GetFileName(fileName);
+            File.Copy(fileName, Path.Combine(destination, scriptName));
+            var metadata = $"title: {QuoteYaml(title)}\noriginalAuthor: {QuoteYaml(author)}\n" +
+                $"description: {QuoteYaml(description)}\nassets:\n" +
+                $"- name: scripts/{scriptName}\n  method: copy\n  source:\n  - name: {scriptName}\n";
+            await File.WriteAllTextAsync(Path.Combine(destination, MetadataFileName), metadata, cancellationToken);
+            return new ModInstallResult(id, title, destination);
+        }
+        catch
+        {
+            DeleteDirectoryIfPresent(destination);
+            throw;
+        }
+    }
+
+    private static string? ReadLuaHeader(IEnumerable<string> lines, string key)
+    {
+        var prefix = $"{key}=";
+        var line = lines.FirstOrDefault(line =>
+            line.Replace(" ", string.Empty).StartsWith(prefix, StringComparison.OrdinalIgnoreCase));
+        if (line is null)
+            return null;
+
+        return line[(line.IndexOf('=') + 1)..].Trim().Trim('\'', '"');
+    }
+
+    private static string QuoteYaml(string value) =>
+        $"\"{value.Replace("\\", "\\\\").Replace("\"", "\\\"").Replace("\r", " ").Replace("\n", " ")}\"";
+
+    private static void PrepareDestination(string destination, bool overwrite)
+    {
+        if (!Directory.Exists(destination))
+            return;
+        if (!overwrite)
+            throw new ModAlreadyInstalledException(Path.GetFileName(destination));
+        DeleteDirectoryIfPresent(destination);
+    }
+
+    private static void DeleteDirectoryIfPresent(string directory)
+    {
+        if (!Directory.Exists(directory))
+            return;
+
+        foreach (var file in Directory.EnumerateFiles(directory, "*", SearchOption.AllDirectories))
+            File.SetAttributes(file, FileAttributes.Normal);
+        Directory.Delete(directory, true);
+    }
+
+    private static bool IsArchiveUri(Uri uri) =>
+        uri.AbsolutePath.EndsWith(".zip", StringComparison.OrdinalIgnoreCase) ||
+        uri.AbsolutePath.Contains("/archive/", StringComparison.OrdinalIgnoreCase) ||
+        uri.AbsolutePath.Contains("/releases/download/", StringComparison.OrdinalIgnoreCase);
+
+    private static string GetArchiveName(Uri uri)
+    {
+        var name = Path.GetFileName(uri.AbsolutePath);
+        return name.EndsWith(".zip", StringComparison.OrdinalIgnoreCase) ? name : "DownloadedMod.zip";
+    }
+
+    private static HttpClient CreateHttpClient()
+    {
+        var client = new HttpClient();
+        client.DefaultRequestHeaders.UserAgent.Add(new ProductInfoHeaderValue("OpenKH-ModManager", "1.0"));
+        return client;
+    }
+
+    internal sealed record RepositoryAddress(string Id, string CloneUrl, string? Branch)
+    {
+        internal static RepositoryAddress Parse(string source, string? branch)
+        {
+            if (Uri.TryCreate(source, UriKind.Absolute, out var uri))
+            {
+                var parts = uri.AbsolutePath.Trim('/').Split('/', StringSplitOptions.RemoveEmptyEntries);
+                if (parts.Length < 2)
+                    throw new ArgumentException("The repository URL must include an owner and repository name.");
+
+                var repositoryName = parts[1].EndsWith(".git", StringComparison.OrdinalIgnoreCase)
+                    ? parts[1][..^4]
+                    : parts[1];
+                var detectedBranch = branch;
+                if (parts.Length >= 4 && parts[2].Equals("tree", StringComparison.OrdinalIgnoreCase))
+                    detectedBranch ??= string.Join('/', parts.Skip(3));
+                var baseUrl = $"{uri.Scheme}://{uri.Authority}/{parts[0]}/{repositoryName}.git";
+                return new RepositoryAddress($"{parts[0]}/{repositoryName}", baseUrl, detectedBranch);
+            }
+
+            var repositorySource = source.Trim().Trim('/');
+            var repositoryHost = "github.com";
+            var hostSeparator = repositorySource.LastIndexOf('@');
+            if (hostSeparator > 0)
+            {
+                repositoryHost = repositorySource[(hostSeparator + 1)..].Trim();
+                repositorySource = repositorySource[..hostSeparator].TrimEnd('/');
+                if (!Uri.TryCreate($"https://{repositoryHost}", UriKind.Absolute, out var hostUri) ||
+                    !hostUri.AbsolutePath.Equals("/", StringComparison.Ordinal))
+                {
+                    throw new ArgumentException("The repository host is not valid.");
+                }
+
+                repositoryHost = hostUri.Authority;
+            }
+
+            var sourceParts = repositorySource.Split('/', StringSplitOptions.RemoveEmptyEntries);
+            if (sourceParts.Length < 2)
+                throw new ArgumentException("Use owner/repository or paste a full repository URL.");
+            var shorthandRepositoryName = sourceParts[1].EndsWith(".git", StringComparison.OrdinalIgnoreCase)
+                ? sourceParts[1][..^4]
+                : sourceParts[1];
+            var id = $"{sourceParts[0]}/{shorthandRepositoryName}";
+            var detectedSourceBranch = branch ?? (sourceParts.Length > 2 ? string.Join('/', sourceParts.Skip(2)) : null);
+            return new RepositoryAddress(id, $"https://{repositoryHost}/{id}.git", detectedSourceBranch);
+        }
+    }
+}
diff --git a/OpenKh.Tools.ModsManager.Core/SteamAppIdService.cs b/OpenKh.Tools.ModsManager.Core/SteamAppIdService.cs
new file mode 100644
index 000000000..70b271e49
--- /dev/null
+++ b/OpenKh.Tools.ModsManager.Core/SteamAppIdService.cs
@@ -0,0 +1,41 @@
+namespace OpenKh.Tools.ModsManager.Core;
+
+public sealed class SteamAppIdService
+{
+    private const string FileName = "steam_appid.txt";
+
+    public bool IsInstalled(string? releaseDirectory, bool isKh3D)
+    {
+        var fileName = GetFileName(releaseDirectory, false);
+        return fileName is not null &&
+               File.Exists(fileName) &&
+               File.ReadAllText(fileName).Trim().Equals(GetAppId(isKh3D), StringComparison.Ordinal);
+    }
+
+    public void Install(string? releaseDirectory, bool isKh3D)
+    {
+        var fileName = GetFileName(releaseDirectory, true)!;
+        File.WriteAllText(fileName, GetAppId(isKh3D));
+    }
+
+    public void Remove(string? releaseDirectory, bool isKh3D)
+    {
+        var fileName = GetFileName(releaseDirectory, true)!;
+        if (!File.Exists(fileName))
+            return;
+        if (!File.ReadAllText(fileName).Trim().Equals(GetAppId(isKh3D), StringComparison.Ordinal))
+            throw new InvalidOperationException("The existing steam_appid.txt was not created for this game and will not be removed.");
+        File.Delete(fileName);
+    }
+
+    private static string GetAppId(bool isKh3D) => isKh3D ? "2552440" : "2552430";
+
+    private static string? GetFileName(string? releaseDirectory, bool required)
+    {
+        if (!string.IsNullOrWhiteSpace(releaseDirectory) && Directory.Exists(releaseDirectory))
+            return Path.Combine(releaseDirectory, FileName);
+        if (required)
+            throw new DirectoryNotFoundException("Configure a valid Steam game folder first.");
+        return null;
+    }
+}
diff --git a/OpenKh.Tools.ModsManager/App.config b/OpenKh.Tools.ModsManager/App.config
deleted file mode 100644
index 263404723..000000000
--- a/OpenKh.Tools.ModsManager/App.config
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-    <configSections>
-        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
-            <section name="OpenKh.Tools.ModsManager.WinSettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
-        </sectionGroup>
-    </configSections>
-    <userSettings>
-        <OpenKh.Tools.ModsManager.WinSettings>
-            <setting name="Top" serializeAs="String">
-                <value>320</value>
-            </setting>
-            <setting name="Width" serializeAs="String">
-                <value>660</value>
-            </setting>
-            <setting name="Height" serializeAs="String">
-                <value>450</value>
-            </setting>
-            <setting name="Left" serializeAs="String">
-                <value>640</value>
-            </setting>
-            <setting name="Maximized" serializeAs="String">
-                <value>False</value>
-            </setting>
-        </OpenKh.Tools.ModsManager.WinSettings>
-    </userSettings>
-</configuration>
diff --git a/OpenKh.Tools.ModsManager/App.xaml b/OpenKh.Tools.ModsManager/App.xaml
deleted file mode 100644
index 602daed05..000000000
--- a/OpenKh.Tools.ModsManager/App.xaml
+++ /dev/null
@@ -1,20 +0,0 @@
-<Application x:Class="OpenKh.Tools.ModsManager.App"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:local="clr-namespace:OpenKh.Tools.ModsManager"
-             xmlns:converters="clr-namespace:OpenKh.Tools.ModsManager.Converters"
-             StartupUri="Views/MainWindow.xaml">
-    <Application.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="pack://application:,,,/Xe.Tools.Wpf;component/Themes/Generic.xaml"/>
-                <ResourceDictionary Source="Styles/MonoStyleCheckBox.xaml" />
-            </ResourceDictionary.MergedDictionaries>
-            
-            <!-- Converters -->
-            <converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/>
-            <converters:InverseBooleanToVisibilityConverter x:Key="InverseBooleanToVisibilityConverter"/>
-            <converters:InverseBooleanConverter x:Key="InverseBooleanConverter"/>
-        </ResourceDictionary>
-    </Application.Resources>
-</Application>
diff --git a/OpenKh.Tools.ModsManager/App.xaml.cs b/OpenKh.Tools.ModsManager/App.xaml.cs
deleted file mode 100644
index 12a0e87de..000000000
--- a/OpenKh.Tools.ModsManager/App.xaml.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using OpenKh.Common;
-using System;
-using System.IO;
-using System.Windows;
-using System.Windows.Threading;
-
-namespace OpenKh.Tools.ModsManager
-{
-    /// <summary>
-    /// Interaction logic for App.xaml
-    /// </summary>
-    public partial class App : Application
-    {
-        public App()
-        {
-            // Capture unhandled exceptions
-            AppDomain.CurrentDomain.UnhandledException += (s, e) =>
-                LogUnhandledException((Exception)e.ExceptionObject, "AppDomain.CurrentDomain.UnhandledException");
-
-            DispatcherUnhandledException += (s, e) =>
-            {
-                LogUnhandledException(e.Exception, "Application.Current.DispatcherUnhandledException");
-                e.Handled = true;
-            };
-        }
-
-        private void LogUnhandledException(Exception exception, string source)
-        {
-            string errorMessage = $"Unhandled exception ({source}):\n{exception}";
-            MessageBox.Show(errorMessage, "Application Error", MessageBoxButton.OK, MessageBoxImage.Error);
-            
-            // Save the error to a log file
-            try
-            {
-                string logPath = Path.Combine(Services.OpenkhInstallation.Directory, "crash_log.txt");
-                File.AppendAllText(logPath, $"[{DateTime.Now}] {errorMessage}\n\n");
-            }
-            catch
-            {
-                // Do nothing if we can't save the log
-            }
-        }
-
-        protected override void OnExit(ExitEventArgs e)
-        {
-            Log.Close();
-            base.OnExit(e);
-        }
-    }
-}
diff --git a/OpenKh.Tools.ModsManager/AssemblyInfo.cs b/OpenKh.Tools.ModsManager/AssemblyInfo.cs
deleted file mode 100644
index 8b5504ecf..000000000
--- a/OpenKh.Tools.ModsManager/AssemblyInfo.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System.Windows;
-
-[assembly: ThemeInfo(
-    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
-                                     //(used if a resource is not found in the page,
-                                     // or application resource dictionaries)
-    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
-                                              //(used if a resource is not found in the page,
-                                              // app, or any theme specific resource dictionaries)
-)]
diff --git a/OpenKh.Tools.ModsManager/Converters/BooleanToVisibilityConverter.cs b/OpenKh.Tools.ModsManager/Converters/BooleanToVisibilityConverter.cs
deleted file mode 100644
index 59aa9a868..000000000
--- a/OpenKh.Tools.ModsManager/Converters/BooleanToVisibilityConverter.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using System;
-using System.Windows;
-using System.Windows.Data;
-
-namespace OpenKh.Tools.ModsManager.Converters
-{
-    public class BooleanToVisibilityConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-        {
-            if (value is bool boolValue)
-                return boolValue ? Visibility.Visible : Visibility.Collapsed;
-            return Visibility.Collapsed;
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-        {
-            if (value is Visibility visibility)
-                return visibility == Visibility.Visible;
-            return false;
-        }
-    }
-
-    public class InverseBooleanToVisibilityConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-        {
-            if (value is bool boolValue)
-                return !boolValue ? Visibility.Visible : Visibility.Collapsed;
-            return Visibility.Visible;
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-        {
-            if (value is Visibility visibility)
-                return visibility != Visibility.Visible;
-            return true;
-        }
-    }
-}
diff --git a/OpenKh.Tools.ModsManager/Converters/InverseBooleanConverter.cs b/OpenKh.Tools.ModsManager/Converters/InverseBooleanConverter.cs
deleted file mode 100644
index 8c262da3e..000000000
--- a/OpenKh.Tools.ModsManager/Converters/InverseBooleanConverter.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System;
-using System.Windows.Data;
-
-namespace OpenKh.Tools.ModsManager.Converters
-{
-    public class InverseBooleanConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-        {
-            if (value is bool boolValue)
-                return !boolValue;
-            return value;
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-        {
-            if (value is bool boolValue)
-                return !boolValue;
-            return value;
-        }
-    }
-}
diff --git a/OpenKh.Tools.ModsManager/Converters/RadioButtonToIntConverter.cs b/OpenKh.Tools.ModsManager/Converters/RadioButtonToIntConverter.cs
deleted file mode 100644
index 6ea287b18..000000000
--- a/OpenKh.Tools.ModsManager/Converters/RadioButtonToIntConverter.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using System.Globalization;
-using System.Windows.Data;
-
-namespace OpenKh.Tools.ModsManager.Converters
-{
-    public class RadioBoolToIntConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            return value.ToString() == parameter.ToString();
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            return value?.Equals(true) == true ? parameter : Binding.DoNothing;
-        }
-    }
-}
diff --git a/OpenKh.Tools.ModsManager/Exceptions/Exceptions.cs b/OpenKh.Tools.ModsManager/Exceptions/Exceptions.cs
deleted file mode 100644
index 0eaa637be..000000000
--- a/OpenKh.Tools.ModsManager/Exceptions/Exceptions.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-using System;
-
-namespace OpenKh.Tools.ModsManager.Exceptions
-{
-    public class ModAlreadyExistsExceptions : Exception
-    {
-        public string ModName { get; }
-
-        public ModAlreadyExistsExceptions(string modName) :
-            base($"The previous install of '{modName}' will not be overwritten. The installation will now stop.")
-        {
-            ModName = modName;
-        }
-    }
-
-    public class ModNotValidException : Exception
-    {
-        public string ModName { get; }
-
-        public ModNotValidException(string modName) :
-            base($"The mod '{modName}' does not contain a valid OpenKH compatible mod due to the missing 'mod.yml' file.")
-        {
-            ModName = modName;
-        }
-    }
-
-    public class BranchNotValidException : Exception
-    {
-        public string ModName { get; }
-
-        public string BranchName { get; }
-
-        public BranchNotValidException(string modName, string branchName) :
-            base($"The branch '{branchName}' is not valid for '{modName}'.\nOr The mod '{modName}' does not contain a valid OpenKH compatible mod due to the missing 'mod.yml' file.")
-        {
-            ModName = modName;
-            BranchName = branchName;
-        }
-    }
-
-    public class RepositoryNotFoundException : Exception
-    {
-        public string RepositoryName { get; set; }
-
-        public RepositoryNotFoundException(string repositoryName) :
-            base($"Repository '{repositoryName}' not found.")
-        {
-
-        }
-    }
-
-    public class ModMovedWithoutGameException : Exception
-    {
-        public string ModName { get; }
-
-        public ModMovedWithoutGameException(string modName) :
-            base($"The mod '{modName}' has been changed from a collection but a base game was not specified and could not be moved, it will be removed. Please reinstall in the appropriate launch game.")
-        {
-            ModName = modName;
-        }
-    }
-}
diff --git a/OpenKh.Tools.ModsManager/ExtensionMethods/ReactiveExtensions.cs b/OpenKh.Tools.ModsManager/ExtensionMethods/ReactiveExtensions.cs
deleted file mode 100644
index fd802a3cc..000000000
--- a/OpenKh.Tools.ModsManager/ExtensionMethods/ReactiveExtensions.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace OpenKh.Tools.ModsManager.ExtensionMethods
-{
-    internal static class ReactiveExtensions
-    {
-        public static T AddTo<T>(this T self, ICollection<T> collection) where T : IDisposable
-        {
-            collection.Add(self);
-            return self;
-        }
-    }
-}
diff --git a/OpenKh.Tools.ModsManager/Helpers.cs b/OpenKh.Tools.ModsManager/Helpers.cs
deleted file mode 100644
index 10918112e..000000000
--- a/OpenKh.Tools.ModsManager/Helpers.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using OpenKh.Tools.ModsManager.Services;
-using System;
-using System.Windows;
-
-namespace OpenKh.Tools.ModsManager
-{
-    public static class Helpers
-    {
-        public static bool Question(string message, string title = null) =>
-            MessageBox.Show(message, title, MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.Yes;
-
-        public static void Handle(Action action)
-        {
-            try
-            {
-                action();
-            }
-            catch (Exception ex)
-            {
-                Handle(ex);
-            }
-        }
-
-        public static T Handle<T>(Func<T> action)
-        {
-            try
-            {
-                return action();
-            }
-            catch (Exception ex)
-            {
-                Handle(ex);
-                return default;
-            }
-        }
-
-        public static void Handle(Exception ex)
-        {
-            switch (ex)
-            {
-                case RepositoryNotFoundException _:
-                    MessageBox.Show(ex.Message, "Repository not found", MessageBoxButton.OK, MessageBoxImage.Error);
-                    break;
-                default:
-                    MessageBox.Show(ex.Message, "Generic error", MessageBoxButton.OK, MessageBoxImage.Error);
-                    break;
-            }
-        }
-    }
-}
diff --git a/OpenKh.Tools.ModsManager/Images/mod-icon-placeholder.png b/OpenKh.Tools.ModsManager/Images/mod-icon-placeholder.png
deleted file mode 100644
index e69de29bb..000000000
diff --git a/OpenKh.Tools.ModsManager/Models/CollectionModModel.cs b/OpenKh.Tools.ModsManager/Models/CollectionModModel.cs
deleted file mode 100644
index 570530fd1..000000000
--- a/OpenKh.Tools.ModsManager/Models/CollectionModModel.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace OpenKh.Tools.ModsManager.Models
-{
-    public class CollectionModModel
-    {
-        public string Name { get; set; }
-        public string Author { get; set; }
-        public bool IsEnabled { get; set; }
-    }
-}
diff --git a/OpenKh.Tools.ModsManager/Models/DownloadableModModel.cs b/OpenKh.Tools.ModsManager/Models/DownloadableModModel.cs
deleted file mode 100644
index 3d246996e..000000000
--- a/OpenKh.Tools.ModsManager/Models/DownloadableModModel.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System.Windows.Media.Imaging;
-
-namespace OpenKh.Tools.ModsManager.Models
-{
-    public class DownloadableModModel
-    {
-        public string Repo { get; set; }
-        public string Title { get; set; }
-        public string OriginalAuthor { get; set; }
-        public string Description { get; set; }
-        public string Game { get; set; }
-        public BitmapImage IconImage { get; set; }
-        public BitmapImage ScreenshotImageSource { get; set; }
-        public bool IsInstalled { get; set; }
-
-        public string RepoOwner => Repo?.Split('/')[0];
-        public string RepoName => Repo?.Split('/').Length > 1 ? Repo?.Split('/')[1] : string.Empty;
-    }
-}
diff --git a/OpenKh.Tools.ModsManager/Models/GameInfoModel.cs b/OpenKh.Tools.ModsManager/Models/GameInfoModel.cs
deleted file mode 100644
index 3096a76d1..000000000
--- a/OpenKh.Tools.ModsManager/Models/GameInfoModel.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System.Collections.Generic;
-
-namespace OpenKh.Tools.ModsManager.Models
-{
-    public record GameInfoModel
-    {
-        public string Id { get; init; }
-        public string Name { get; init; }
-        public string UniqueFileName { get; init; }
-        public List<GameDetectorModel> Detectors { get; init; }
-    }
-
-    public record GameDetectorModel
-    {
-        public string FileName { get; init; }
-        public string ProductId { get; init; }
-    }
-}
diff --git a/OpenKh.Tools.ModsManager/Models/ModModel.cs b/OpenKh.Tools.ModsManager/Models/ModModel.cs
deleted file mode 100644
index efd5da960..000000000
--- a/OpenKh.Tools.ModsManager/Models/ModModel.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using OpenKh.Patcher;
-using System.Collections.Generic;
-
-namespace OpenKh.Tools.ModsManager.Models
-{
-    public class ModModel
-    {
-        public string Name { get; set; }
-        public string Path { get; set; }
-        public string IconImageSource { get; set; }
-        public string PreviewImageSource { get; set; }
-        public Metadata Metadata { get; set; }
-        public bool IsEnabled { get; set; }
-        public Dictionary<string, bool> CollectionOptionalEnabledAssets { get; set; }
-    }
-}
diff --git a/OpenKh.Tools.ModsManager/Models/ModUpdateModel.cs b/OpenKh.Tools.ModsManager/Models/ModUpdateModel.cs
deleted file mode 100644
index feefc6953..000000000
--- a/OpenKh.Tools.ModsManager/Models/ModUpdateModel.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace OpenKh.Tools.ModsManager.Models
-{
-    public class ModUpdateModel
-    {
-        public string Name { get; set; }
-        public int UpdateCount { get; set; }
-    }
-}
diff --git a/OpenKh.Tools.ModsManager/Models/ViewHelper/ActionCommand.cs b/OpenKh.Tools.ModsManager/Models/ViewHelper/ActionCommand.cs
deleted file mode 100644
index 0d020d617..000000000
--- a/OpenKh.Tools.ModsManager/Models/ViewHelper/ActionCommand.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using System.Windows.Input;
-
-namespace OpenKh.Tools.ModsManager.Models.ViewHelper
-{
-    public record ActionCommand(string Display, string ToolTip, ICommand Command)
-    {
-    }
-}
diff --git a/OpenKh.Tools.ModsManager/Models/ViewHelper/CopySourceFile.cs b/OpenKh.Tools.ModsManager/Models/ViewHelper/CopySourceFile.cs
deleted file mode 100644
index 4645a5329..000000000
--- a/OpenKh.Tools.ModsManager/Models/ViewHelper/CopySourceFile.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System;
-using System.ComponentModel;
-using System.Threading.Tasks;
-
-namespace OpenKh.Tools.ModsManager.Models.ViewHelper
-{
-    public record CopySourceFile(string Display, string ActionName, bool DestinationFileExists, Func<Task> AsyncAction) : INotifyPropertyChanged
-    {
-        public event PropertyChangedEventHandler PropertyChanged;
-
-        #region DoAction
-        private bool _doAction = false;
-        public bool DoAction
-        {
-            get => _doAction;
-            set
-            {
-                _doAction = value;
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(DoAction)));
-            }
-        }
-        #endregion
-    }
-}
diff --git a/OpenKh.Tools.ModsManager/Models/ViewHelper/PrimarySource.cs b/OpenKh.Tools.ModsManager/Models/ViewHelper/PrimarySource.cs
deleted file mode 100644
index 224d02472..000000000
--- a/OpenKh.Tools.ModsManager/Models/ViewHelper/PrimarySource.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace OpenKh.Tools.ModsManager.Models.ViewHelper
-{
-    public record PrimarySource(string Display)
-    {
-    }
-}
diff --git a/OpenKh.Tools.ModsManager/Models/ViewHelper/SearchHit.cs b/OpenKh.Tools.ModsManager/Models/ViewHelper/SearchHit.cs
deleted file mode 100644
index 980e63ad4..000000000
--- a/OpenKh.Tools.ModsManager/Models/ViewHelper/SearchHit.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace OpenKh.Tools.ModsManager.Models.ViewHelper
-{
-    public record SearchHit(string Display, string RelativePath, string FullPath)
-    {
-    }
-}
diff --git a/OpenKh.Tools.ModsManager/OpenKh.Tools.ModsManager.csproj b/OpenKh.Tools.ModsManager/OpenKh.Tools.ModsManager.csproj
deleted file mode 100644
index a27d36a17..000000000
--- a/OpenKh.Tools.ModsManager/OpenKh.Tools.ModsManager.csproj
+++ /dev/null
@@ -1,49 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>WinExe</OutputType>
-    <TargetFramework>net8.0-windows</TargetFramework>
-    <UseWPF>true</UseWPF>
-    <AssemblyTitle>Mods Manager</AssemblyTitle>
-    <Product>Mods Manager - OpenKH</Product>
-  <AssemblyVersion>25.02.10.0</AssemblyVersion><FileVersion>25.02.10.0</FileVersion><Version>25.02.10.0-local</Version><InformationalVersion>25.02.10.0-local</InformationalVersion><Authors>OpenKH contributors</Authors><Company>OpenKH</Company><Copyright>Copyright (C) OpenKH </Copyright><Description>https://github.com/OpenKH/OpenKh</Description></PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Extended.Wpf.Toolkit" Version="4.6.0" />
-    <PackageReference Include="LibGit2Sharp" Version="0.31.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="System.Runtime.Caching" Version="8.0.1" />
-    <PackageReference Include="System.Reactive" Version="6.1.0" />
-    <PackageReference Include="Octokit" Version="14.0.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\OpenKh.Common\OpenKh.Common.csproj" />
-    <ProjectReference Include="..\OpenKh.Kh1\OpenKh.Kh1.csproj" />
-    <ProjectReference Include="..\OpenKh.Egs\OpenKh.Egs.csproj" />
-    <ProjectReference Include="..\OpenKh.Kh1\OpenKh.Kh1.csproj" />
-    <ProjectReference Include="..\OpenKh.Kh2\OpenKh.Kh2.csproj" />
-    <ProjectReference Include="..\OpenKh.Patcher\OpenKh.Patcher.csproj" />
-    <ProjectReference Include="..\OpenKh.Recom\OpenKh.Recom.csproj" />
-    <ProjectReference Include="..\OpenKh.Tools.Common.WPF\OpenKh.Tools.Common.Wpf.csproj" />
-    <ProjectReference Include="..\OpenKh.Tools.Common\OpenKh.Tools.Common.csproj" />
-    <ProjectReference Include="..\XeEngine.Tools.Public\Xe.Tools.Wpf\Xe.Tools.Wpf.csproj" />
-    <ProjectReference Include="..\XeEngine.Tools.Public\Xe.Tools\Xe.Tools.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Update="WinSettings.Designer.cs">
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>WinSettings.settings</DependentUpon>
-    </Compile>
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Update="WinSettings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>WinSettings.Designer.cs</LastGenOutput>
-    </None>
-  </ItemGroup>
-
-</Project>
diff --git a/OpenKh.Tools.ModsManager/Services/ColorThemeService.cs b/OpenKh.Tools.ModsManager/Services/ColorThemeService.cs
deleted file mode 100644
index 8e1ba3fb3..000000000
--- a/OpenKh.Tools.ModsManager/Services/ColorThemeService.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using Xe.Tools;
-
-namespace OpenKh.Tools.ModsManager.Services
-{
-    public class ColorThemeService : BaseNotifyPropertyChanged
-    {
-        public bool DarkMode
-        {
-            get
-            {
-                return ConfigurationService.DarkMode;
-            }
-            set
-            {
-                ConfigurationService.DarkMode = value;
-
-                OnPropertyChanged(nameof(DarkMode));
-                OnPropertyChanged(nameof(BackgroundColor));
-                OnPropertyChanged(nameof(TextColor));
-            }
-        }
-
-        public string BackgroundColor
-        {
-            get
-            {
-                if (DarkMode)
-                {
-                    return "#2D2D2D";
-                }
-                else
-                {
-                    return "white";
-                }
-            }
-        }
-
-        public string TextColor
-        {
-            get
-            {
-                if (ConfigurationService.DarkMode)
-                {
-                    return "white";
-                }
-                else
-                {
-                    return "black";
-                }
-            }
-        }
-
-        public static readonly ColorThemeService Instance = new ColorThemeService();
-    }
-}
diff --git a/OpenKh.Tools.ModsManager/Services/ConfigurationService.cs b/OpenKh.Tools.ModsManager/Services/ConfigurationService.cs
deleted file mode 100644
index 0000ad1ce..000000000
--- a/OpenKh.Tools.ModsManager/Services/ConfigurationService.cs
+++ /dev/null
@@ -1,671 +0,0 @@
-using Newtonsoft.Json;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Net.Http;
-using System.Threading.Tasks;
-using YamlDotNet.Serialization;
-using YamlDotNet.Serialization.NamingConventions;
-
-namespace OpenKh.Tools.ModsManager.Services
-{
-    public static class ConfigurationService
-    {
-        private class LegacyConfigMigration
-        {
-            private static readonly IDeserializer _legacyvaluedeserializer =
-                new DeserializerBuilder()
-                .IgnoreFields()
-                .IgnoreUnmatchedProperties()
-                .WithNamingConvention(CamelCaseNamingConvention.Instance)
-                .Build();
-            public string ModCollectionPath { get; internal set; }
-            public string ModCollectionsPath { get; internal set; }
-            public string GameModPath { get; internal set; }
-            public string GameDataPath { get; internal set; }
-
-            public static LegacyConfigMigration Open(string fileName)
-            {
-                if (!File.Exists(fileName))
-                    return new LegacyConfigMigration();
-
-                using var reader = new StreamReader(fileName);
-                return _legacyvaluedeserializer.Deserialize<LegacyConfigMigration>(reader);
-            }
-        }
-
-        private class Config
-        {
-            private static readonly IDeserializer _deserializer =
-                new DeserializerBuilder()
-                .IgnoreFields()
-                .IgnoreUnmatchedProperties()
-                .WithNamingConvention(CamelCaseNamingConvention.Instance)
-                .Build();
-            private static readonly ISerializer _serializer =
-                new SerializerBuilder()
-                .IgnoreFields()
-                .WithNamingConvention(CamelCaseNamingConvention.Instance)
-                .Build();
-
-            public int WizardVersionNumber { get; set; }
-            public string ExtractedGameDataPath { get; internal set; }
-            public string InstalledModsPath { get; internal set; }
-            public string InstalledCollectionsPath { get; internal set; }
-            public string CompiledModPath { get; internal set; }
-            public int GameEdition { get; internal set; } = 1;
-            public string IsoLocationKH2 { get; internal set; }
-            public string IsoLocationKH1 { get; internal set; }
-            public string IsoLocationRecom { get; internal set; }
-            public string OpenKhGameEngineLocation { get; internal set; }
-            public string Pcsx2Location { get; internal set; }
-            public string PcReleaseLocation { get; internal set; }
-            public string PcReleaseLocationKH3D { get; internal set; }
-            public string PcReleaseLanguage { get; internal set; } = "en";
-            public int RegionId { get; internal set; }
-            public bool PanaceaInstalled { get; internal set; }
-            public bool ShowConsole { get; internal set; } = false;
-            public bool DebugLog { get; internal set; } = false;
-            public bool SoundDebug { get; internal set; } = false;
-            public bool EnableCache { get; internal set; } = true;
-            public bool QuickMenu { get; internal set; } = false;
-            public bool EnablePatching { get; internal set; } = false;
-            public bool AutoUpdateMods { get; internal set; }
-            public string pcVersion { get; internal set; } = "EGS";
-            public bool steamAPITrick1525 {  get; internal set; } = false;
-            public bool steamAPITrick28 { get; internal set; } = false;
-            public List<string> GamesToExtract { get; internal set; } = new List<string>();
-            public bool SkipRemastered { get; internal set; } = false;
-            public string LaunchGame { get; internal set; } = "kh2";
-            public bool DarkMode { get; internal set; } = true;
-            public List<YamlGenPref> YamlGenPrefs { get; internal set; } = new List<YamlGenPref>();
-            public bool Updated { get; internal set; }
-
-            public void Save(string fileName)
-            {
-                using var writer = new StreamWriter(fileName);
-                _serializer.Serialize(writer, this);
-            }
-
-            public static Config Open(string fileName)
-            {
-                if (!File.Exists(fileName))
-                    return new Config();
-
-                using var reader = new StreamReader(fileName);
-                return _deserializer.Deserialize<Config>(reader);
-            }
-        }
-
-        private static string StoragePath = OpenkhInstallation.Directory;
-        private static string ConfigPath = Path.Combine(StoragePath, "mods-manager.yml");
-        private static string EnabledModsPathKH1 = Path.Combine(StoragePath, "mods-KH1.txt");
-        private static string EnabledModsPathKH2 = Path.Combine(StoragePath, "mods-KH2.txt");
-        private static string EnabledModsPathBBS = Path.Combine(StoragePath, "mods-BBS.txt");
-        private static string EnabledModsPathRECOM = Path.Combine(StoragePath, "mods-ReCoM.txt");
-        private static string EnabledModsPathKH3D = Path.Combine(StoragePath, "mods-KH3D.txt");
-        private static string EnabledCollectionModsPathKH1 = Path.Combine(StoragePath, "collection-mods-KH1.json");
-        private static string EnabledCollectionModsPathKH2 = Path.Combine(StoragePath, "collection-mods-KH2.json");
-        private static string EnabledCollectionModsPathBBS = Path.Combine(StoragePath, "collection-mods-BBS.json");
-        private static string EnabledCollectionModsPathRECOM = Path.Combine(StoragePath, "collection-mods-ReCoM.json");
-        private static string EnabledCollectionModsPathKH3D = Path.Combine(StoragePath, "collection-mods-KH3D.json");
-        private static readonly LegacyConfigMigration _legacyconfig = LegacyConfigMigration.Open(ConfigPath);
-        private static readonly Config _config = Config.Open(ConfigPath);
-        public static string PresetPath = Path.Combine(StoragePath, "presets");
-        private static readonly HashSet<string> _supportedGames = new HashSet<string>()
-        {
-            "kh2",
-            "kh1",
-            "bbs",
-            "Recom",
-            "kh3d"
-        };
-
-        public class YamlGenPref
-        {
-            public string Label { get; set; }
-            public string GameDataPath { get; set; }
-            public string ModYmlFilePath { get; set; }
-
-            public override string ToString() => Label;
-        }
-
-        static ConfigurationService()
-        {
-            if (!string.IsNullOrEmpty(_legacyconfig.GameDataPath) && string.IsNullOrEmpty(_config.ExtractedGameDataPath))
-                _config.ExtractedGameDataPath = _legacyconfig.GameDataPath;
-            if (!string.IsNullOrEmpty(_legacyconfig.ModCollectionPath) && string.IsNullOrEmpty(_config.InstalledModsPath))
-                _config.InstalledModsPath = _legacyconfig.ModCollectionPath;
-            if (!string.IsNullOrEmpty(_legacyconfig.ModCollectionsPath) && string.IsNullOrEmpty(_config.InstalledCollectionsPath))
-                _config.InstalledCollectionsPath = _legacyconfig.ModCollectionsPath;
-            if (!string.IsNullOrEmpty(_legacyconfig.GameModPath) && string.IsNullOrEmpty(_config.CompiledModPath))
-                _config.CompiledModPath = _legacyconfig.GameModPath;
-
-
-            string modsPath = Path.GetFullPath(Path.Combine(InstalledModsPath, ".."));
-            if (!Directory.Exists(Path.Combine(InstalledCollectionsPath)))
-                Directory.CreateDirectory(InstalledCollectionsPath);
-            if (!Directory.Exists(Path.Combine(modsPath, "kh2")))
-                Directory.CreateDirectory(Path.Combine(modsPath, "kh2"));
-            if (!Directory.Exists(Path.Combine(modsPath, "kh1")))
-                Directory.CreateDirectory(Path.Combine(modsPath, "kh1"));
-            if (!Directory.Exists(Path.Combine(modsPath, "bbs")))
-                Directory.CreateDirectory(Path.Combine(modsPath, "bbs"));
-            if (!Directory.Exists(Path.Combine(modsPath, "Recom")))
-                Directory.CreateDirectory(Path.Combine(modsPath, "Recom"));
-            if (!Directory.Exists(Path.Combine(modsPath, "kh3d")))
-                Directory.CreateDirectory(Path.Combine(modsPath, "kh3d"));
-            if (!Directory.Exists(PresetPath))
-                Directory.CreateDirectory(PresetPath);
-
-
-            Task.Run(async () =>
-            {
-                using var client = new HttpClient();
-                var response = await client
-                    .GetAsync("https://raw.githubusercontent.com/OpenKH/mods-manager-feed/main/featured.txt");
-                FeaturedMods = (await response.Content.ReadAsStringAsync())
-                    .Split("\n")
-                    .Where(x => !string.IsNullOrEmpty(x))
-                    .ToList();
-            });
-
-            Task.Run(async () =>
-            {
-                using var client = new HttpClient();
-                var response = await client
-                    .GetAsync("https://raw.githubusercontent.com/OpenKH/mods-manager-feed/main/deny.txt");
-                BlacklistedMods = (await response.Content.ReadAsStringAsync())
-                    .Split("\n")
-                    .Where(x => !string.IsNullOrEmpty(x))
-                    .ToList();
-            });
-        }
-
-        public static ICollection<string> EnabledMods
-        {
-            get
-            {
-                switch (LaunchGame)
-                {
-                    case "kh1":
-                        return File.Exists(EnabledModsPathKH1) ? File.ReadAllLines(EnabledModsPathKH1) : new string[0];
-                    case "bbs":
-                        return File.Exists(EnabledModsPathBBS) ? File.ReadAllLines(EnabledModsPathBBS) : new string[0];
-                    case "Recom":
-                        return File.Exists(EnabledModsPathRECOM) ? File.ReadAllLines(EnabledModsPathRECOM) : new string[0];
-                    case "kh3d":
-                        return File.Exists(EnabledModsPathKH3D) ? File.ReadAllLines(EnabledModsPathKH3D) : new string[0];
-                    default:
-                        return File.Exists(EnabledModsPathKH2) ? File.ReadAllLines(EnabledModsPathKH2) : new string[0];
-                }
-            }
-            set
-            {
-                switch (LaunchGame)
-                {
-                    case "kh1":
-                        File.WriteAllLines(EnabledModsPathKH1, value);
-                        break;
-                    case "bbs":
-                        File.WriteAllLines(EnabledModsPathBBS, value);
-                        break;
-                    case "Recom":
-                        File.WriteAllLines(EnabledModsPathRECOM, value);
-                        break;
-                    case "kh3d":
-                        File.WriteAllLines(EnabledModsPathKH3D, value);
-                        break;
-                    default:
-                        File.WriteAllLines(EnabledModsPathKH2, value);
-                        break;
-                }
-            }
-        }
-
-        public static Dictionary<string, Dictionary<string, bool>> EnabledCollectionMods
-        {
-            get
-            {
-                var optionsJson = "";
-                switch (LaunchGame)
-                {
-                    case "kh1":
-                        optionsJson = File.Exists(EnabledCollectionModsPathKH1) ? File.ReadAllText(EnabledCollectionModsPathKH1) : "";
-                        break;
-                    case "bbs":
-                        optionsJson = File.Exists(EnabledCollectionModsPathBBS) ? File.ReadAllText(EnabledCollectionModsPathBBS) : "";
-                        break;
-                    case "Recom":
-                        optionsJson = File.Exists(EnabledCollectionModsPathRECOM) ? File.ReadAllText(EnabledCollectionModsPathRECOM) : "";
-                        break;
-                    case "kh3d":
-                        optionsJson = File.Exists(EnabledCollectionModsPathKH3D) ? File.ReadAllText(EnabledCollectionModsPathKH3D) : "";
-                        break;
-                    default:
-                        optionsJson = File.Exists(EnabledCollectionModsPathKH2) ? File.ReadAllText(EnabledCollectionModsPathKH2) : "";
-                        break;
-                }
-                return optionsJson != "" ? JsonConvert.DeserializeObject<Dictionary<string, Dictionary<string, bool>>> (optionsJson) : new Dictionary<string, Dictionary<string, bool>> { };
-            }
-            set
-            {
-                var jsonOut = JsonConvert.SerializeObject(value);
-                switch (LaunchGame)
-                {
-                    case "kh1":
-                        File.WriteAllText(EnabledCollectionModsPathKH1, jsonOut);
-                        break;
-                    case "bbs":
-                        File.WriteAllText(EnabledCollectionModsPathBBS, jsonOut);
-                        break;
-                    case "Recom":
-                        File.WriteAllText(EnabledCollectionModsPathRECOM, jsonOut);
-                        break;
-                    case "kh3d":
-                        File.WriteAllText(EnabledCollectionModsPathKH3D, jsonOut);
-                        break;
-                    default:
-                        File.WriteAllText(EnabledCollectionModsPathKH2, jsonOut);
-                        break;
-                }
-            }
-        }
-
-        public static ICollection<string> FeaturedMods { get; private set; }
-        public static ICollection<string> BlacklistedMods { get; private set; }
-
-        public static int WizardVersionNumber
-        {
-            get => _config.WizardVersionNumber;
-            set
-            {
-                _config.WizardVersionNumber = value;
-                _config.Save(ConfigPath);
-            }
-        }
-        public static string GameDataLocation
-        {
-            get => _config.ExtractedGameDataPath ?? Path.GetFullPath(Path.Combine(StoragePath, "data"));
-            set
-            {
-                _config.ExtractedGameDataPath = value;
-                _config.Save(ConfigPath);
-            }
-        }
-
-        public static string InstalledModsPath
-        {
-            get
-            {
-                if (!string.IsNullOrEmpty(_config.InstalledModsPath) && _config.InstalledModsPath != _config.CompiledModPath)
-                    return Path.Combine(_config.InstalledModsPath, LaunchGame);
-                else
-                    return Path.Combine(_config.InstalledModsPath ?? Path.GetFullPath(StoragePath), "mods", LaunchGame);
-            }
-            set
-            {
-                _config.InstalledModsPath = value;
-                _config.Save(ConfigPath);
-            }
-        }
-
-        public static string InstalledCollectionsPath
-        {
-            get
-            {
-                if (string.IsNullOrEmpty(_config.InstalledCollectionsPath))
-                    return Path.GetFullPath(Path.Combine(StoragePath, "mods", "collections"));
-                else if (_config.InstalledCollectionsPath != _config.InstalledModsPath)
-                    return _config.InstalledCollectionsPath;
-                else
-                    return Path.Combine(_config.InstalledCollectionsPath, "collections");
-            }
-            set
-            {
-                _config.InstalledCollectionsPath = value;
-                _config.Save(ConfigPath);
-            }
-        }
-
-        public static string CompiledModPath
-        {
-            get
-            {
-                if (!string.IsNullOrEmpty(_config.CompiledModPath) && _config.CompiledModPath != _config.InstalledModsPath)
-                    return Path.Combine(_config.CompiledModPath, LaunchGame);
-                else
-                    return Path.Combine(_config.CompiledModPath ?? Path.GetFullPath(StoragePath), "mod", LaunchGame);
-            }
-            set
-            {
-                _config.CompiledModPath = value;
-                _config.Save(ConfigPath);
-            }
-        }
-
-        public static int GameEdition
-        {
-            get => _config.GameEdition;
-            set
-            {
-                _config.GameEdition = value;
-                _config.Save(ConfigPath);
-            }
-        }
-
-        public static string IsoLocationKH2
-        {
-            get => _config.IsoLocationKH2;
-            set
-            {
-                _config.IsoLocationKH2 = value;
-                _config.Save(ConfigPath);
-            }
-        }
-        public static string IsoLocationKH1
-        {
-            get => _config.IsoLocationKH1;
-            set
-            {
-                _config.IsoLocationKH1 = value;
-                _config.Save(ConfigPath);
-            }
-        }
-        public static string IsoLocationRecom
-        {
-            get => _config.IsoLocationRecom;
-            set
-            {
-                _config.IsoLocationRecom = value;
-                _config.Save(ConfigPath);
-            }
-        }
-
-        public static string OpenKhGameEngineLocation
-        {
-            get => _config.OpenKhGameEngineLocation ?? Path.GetFullPath("OpenKh.Game.exe");
-            set
-            {
-                _config.OpenKhGameEngineLocation = value;
-                _config.Save(ConfigPath);
-            }
-        }
-
-        public static string Pcsx2Location
-        {
-            get => _config.Pcsx2Location;
-            set
-            {
-                _config.Pcsx2Location = value;
-                _config.Save(ConfigPath);
-            }
-        }
-
-        public static string PcReleaseLocation
-        {
-            get => _config.PcReleaseLocation;
-            set
-            {
-                _config.PcReleaseLocation = value;
-                _config.Save(ConfigPath);
-            }
-        }
-        public static string PcReleaseLocationKH3D
-        {
-            get => _config.PcReleaseLocationKH3D;
-            set
-            {
-                _config.PcReleaseLocationKH3D = value;
-                _config.Save(ConfigPath);
-            }
-        }
-
-        public static string PcReleaseLanguage
-        {
-            get => _config.PcReleaseLanguage;
-            set
-            {
-                _config.PcReleaseLanguage = value;
-                _config.Save(ConfigPath);
-            }
-        }
-
-        public static int RegionId
-        {
-            get => _config.RegionId;
-            set
-            {
-                _config.RegionId = value;
-                _config.Save(ConfigPath);
-            }
-        }
-
-        public static bool PanaceaInstalled
-        {
-            get => _config.PanaceaInstalled;
-            set
-            {
-                _config.PanaceaInstalled = value;
-                _config.Save(ConfigPath);
-            }
-        }
-        public static bool ShowConsole
-        {
-            get => _config.ShowConsole;
-            set
-            {
-                _config.ShowConsole = value;
-                _config.Save(ConfigPath);
-            }
-        }
-        public static bool DebugLog
-        {
-            get => _config.DebugLog;
-            set
-            {
-                _config.DebugLog = value;
-                _config.Save(ConfigPath);
-            }
-        }
-        public static bool SoundDebug
-        {
-            get => _config.SoundDebug;
-            set
-            {
-                _config.SoundDebug = value;
-                _config.Save(ConfigPath);
-            }
-        }
-        public static bool EnableCache
-        {
-            get => _config.EnableCache;
-            set
-            {
-                _config.EnableCache = value;
-                _config.Save(ConfigPath);
-            }
-        }
-        public static bool QuickMenu
-        {
-            get => _config.QuickMenu;
-            set
-            {
-                _config.QuickMenu = value;
-                _config.Save(ConfigPath);
-            }
-        }
-        public static bool EnablePatching
-        {
-            get => _config.EnablePatching;
-            set
-            {
-                _config.EnablePatching = value;
-                _config.Save(ConfigPath);
-            }
-        }
-        public static bool AutoUpdateMods
-        {
-            get => _config.AutoUpdateMods;
-            set
-            {
-                _config.AutoUpdateMods = value;
-                _config.Save(ConfigPath);
-            }
-        }
-        public static string PCVersion
-        {
-            get => _config.pcVersion;
-            set
-            {
-                _config.pcVersion = value;
-                _config.Save(ConfigPath);
-            }
-        }
-        public static bool SteamAPITrick1525
-        {
-            get => _config.steamAPITrick1525;
-            set
-            {
-                _config.steamAPITrick1525 = value;
-                _config.Save(ConfigPath);
-            }
-        }
-        public static bool SteamAPITrick28
-        {
-            get => _config.steamAPITrick28;
-            set
-            {
-                _config.steamAPITrick28 = value;
-                _config.Save(ConfigPath);
-            }
-        }
-        public static bool Extractkh1
-        {
-            get => _config.GamesToExtract.Contains("kh1");
-            set
-            {
-                if (value)
-                {
-                    _config.GamesToExtract.Add("kh1");
-                }
-                else
-                {
-                    _config.GamesToExtract.RemoveAll(x => x == "kh1");
-                }
-                _config.Save(ConfigPath);
-            }
-        }
-        public static bool Extractkh2
-        {
-            get => _config.GamesToExtract.Contains("kh2");
-            set
-            {
-                if (value)
-                {
-                    _config.GamesToExtract.Add("kh2");
-                }
-                else
-                {
-                    _config.GamesToExtract.RemoveAll(x => x == "kh2");
-                }
-                _config.Save(ConfigPath);
-            }
-        }
-        public static bool Extractbbs
-        {
-            get => _config.GamesToExtract.Contains("bbs");
-            set
-            {
-                if (value)
-                {
-                    _config.GamesToExtract.Add("bbs");
-                }
-                else
-                {
-                    _config.GamesToExtract.RemoveAll(x => x == "bbs");
-                }
-                _config.Save(ConfigPath);
-            }
-        }
-        public static bool Extractrecom
-        {
-            get => _config.GamesToExtract.Contains("Recom");
-            set
-            {
-                if (value)
-                {
-                    _config.GamesToExtract.Add("Recom");
-                }
-                else
-                {
-                    _config.GamesToExtract.RemoveAll(x => x == "Recom");
-                }
-                _config.Save(ConfigPath);
-            }
-        }
-        public static bool Extractkh3d
-        {
-            get => _config.GamesToExtract.Contains("kh3d");
-            set
-            {
-                if (value)
-                {
-                    _config.GamesToExtract.Add("kh3d");
-                }
-                else
-                {
-                    _config.GamesToExtract.RemoveAll(x => x == "kh3d");
-                }
-                _config.Save(ConfigPath);
-            }
-        }
-        public static bool SkipRemastered
-        {
-            get => _config.SkipRemastered;
-            set
-            {
-                _config.SkipRemastered = value;
-                _config.Save(ConfigPath);
-            }
-        }
-        public static string LaunchGame
-        {
-            get => _supportedGames.Contains(_config.LaunchGame) ? _config.LaunchGame : _config.LaunchGame = "kh2";
-            set
-            {
-                _config.LaunchGame = value;
-                _config.Save(ConfigPath);
-            }
-        }
-        public static bool DarkMode
-        {
-            get => _config.DarkMode;
-            set
-            {
-                _config.DarkMode = value;
-                _config.Save(ConfigPath);
-            }
-        }
-
-        public static IEnumerable<YamlGenPref> YamlGenPrefs
-        {
-            get => _config.YamlGenPrefs.AsReadOnly();
-            set
-            {
-                _config.YamlGenPrefs = value.ToList();
-                _config.Save(ConfigPath);
-            }
-        }
-
-        public static bool Updated
-        {
-            get => _config.Updated;
-            set
-            {
-                _config.Updated = value;
-                _config.Save(ConfigPath);
-            }
-        }
-    }
-}
diff --git a/OpenKh.Tools.ModsManager/Services/DownloadableModsService.cs b/OpenKh.Tools.ModsManager/Services/DownloadableModsService.cs
deleted file mode 100644
index c7bba4b47..000000000
--- a/OpenKh.Tools.ModsManager/Services/DownloadableModsService.cs
+++ /dev/null
@@ -1,770 +0,0 @@
-using OpenKh.Patcher;
-using OpenKh.Tools.ModsManager.Models;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Windows.Media.Imaging;
-
-namespace OpenKh.Tools.ModsManager.Services
-{
-    public class DownloadableModsService
-    {
-        /// <summary>
-        /// Delegate and event for status updates notification
-        /// </summary>
-        /// <param name="status"></param>
-        public delegate void StatusUpdateHandler(string status);
-
-        /// <summary>
-        /// Notify for status updates
-        /// </summary>
-        public event StatusUpdateHandler OnStatusUpdate;
-
-        /// <summary>
-        /// Notify for diagnostic log messages
-        /// </summary>
-        /// <param name="status"></param>
-        public delegate void DiagLogHandler(string status);
-
-        /// <summary>
-        /// Notify for diagnostic log messages
-        /// </summary>
-        public event DiagLogHandler OnDiagLog;
-
-        private const string DownloadableModsJsonUrl = "https://raw.githubusercontent.com/OpenKH/mods-manager-feed/main/downloadable-mods.json";
-
-        private const string ModMetadataFileName = "mod.yml";
-
-        /// <summary>
-        /// Different file name variants for better compatibility
-        /// </summary>
-        private static readonly string[] ModIconFileNames = { "icon.png", "Icon.png", "ICON.png", "Icon.PNG", "icon.PNG" };
-
-        private static readonly string[] ModPreviewFileNames = { "preview.png", "Preview.png", "PREVIEW.png", "Preview.PNG", "preview.PNG" };
-
-        /// <summary>
-        /// A cache directory name for cache mechanism of this DownloadableModsService.
-        /// This directory will be placed like `%LOCALAPPDATA%/OpenKh/downloadable-mods-cache`
-        /// </summary>
-        private const string CacheDirectoryName = "downloadable-mods-cache";
-
-        /// <summary>
-        /// HTTP request timeout (5 seconds)
-        /// </summary>
-        private static readonly TimeSpan RequestTimeout = TimeSpan.FromSeconds(5);
-
-        /// <summary>
-        /// Cache of downloadable mods by game
-        /// </summary>
-        private readonly Dictionary<string, List<DownloadableModModel>> _modsCache = new Dictionary<string, List<DownloadableModModel>>();
-
-        /// <summary>
-        /// Cache expiration time (1 day)
-        /// </summary>
-        private static readonly TimeSpan CacheExpiration = TimeSpan.FromDays(1);
-
-        private static Lazy<DownloadableModsService> _lazyDefault = new Lazy<DownloadableModsService>(
-            () => new DownloadableModsService()
-        );
-
-        /// <summary>
-        /// Provide a singleton default instance
-        /// </summary>
-        public static DownloadableModsService Default => _lazyDefault.Value;
-
-        /// <summary>
-        /// Encodes the repository path to handle special characters in URLs
-        /// </summary>
-        /// <param name="repositoryPath">Repository path in username/repository format</param>
-        /// <returns>URL-safe encoded path</returns>
-        private string EncodeRepositoryPath(string repo)
-        {
-            if (string.IsNullOrEmpty(repo))
-                return string.Empty;
-
-            try
-            {
-                // Encode each part of the repository (username/repository-name) separately
-                var parts = repo.Split('/');
-                if (parts.Length != 2)
-                    return repo;
-
-                string encodedOwner = Uri.EscapeDataString(parts[0]);
-                string encodedRepo = Uri.EscapeDataString(parts[1]);
-
-                return $"{encodedOwner}/{encodedRepo}";
-            }
-            catch (Exception ex)
-            {
-                OnDiagLog?.Invoke($"Error encoding repository path: {ex.Message}");
-                return repo; // In case of error, return the original
-            }
-        }
-
-        /// <summary>
-        /// Attempts to load an image by trying different filename variants and branches
-        /// </summary>
-        private async Task TryLoadImageWithVariants(
-            DownloadableModModel mod,
-            string cachePath,
-            string encodedRepo,
-            string[] fileNameVariants,
-            Action<BitmapImage> setImage,
-            CancellationToken cancellationToken = default)
-        {
-            // Repository branches to try
-            string[] branches = { "main", "master" };
-            bool success = false;
-
-            foreach (var branch in branches)
-            {
-                if (success)
-                    break;
-
-                foreach (var fileName in fileNameVariants)
-                {
-                    try
-                    {
-                        // Build the URL and specific cache path for this combination
-                        string url = $"https://raw.githubusercontent.com/{encodedRepo}/{branch}/{fileName}";
-                        string specificCachePath = Path.Combine(
-                            Path.GetDirectoryName(cachePath),
-                            $"{branch}_{fileName}_{Path.GetFileName(cachePath)}");
-
-                        OnDiagLog?.Invoke($"Trying URL: {url}");
-
-                        // Try to load this variant
-                        await LoadImageWithCache(mod, specificCachePath, url, setImage, cancellationToken);
-
-                        // If we get here, we assume it was successful
-                        OnDiagLog?.Invoke($"Success with URL: {url}");
-                        success = true;
-                        break;
-                    }
-                    catch (Exception ex)
-                    {
-                        OnDiagLog?.Invoke($"Error with variant {fileName} in branch {branch}: {ex.Message}");
-                        // Continue with the next variant
-                    }
-                }
-            }
-
-            if (!success)
-            {
-                OnDiagLog?.Invoke($"Could not load any image variant for {mod.Repo}");
-            }
-        }
-
-        /// <summary>
-        /// Last cache update time by game
-        /// </summary>
-        private readonly Dictionary<string, DateTime> _lastCacheUpdate = new Dictionary<string, DateTime>();
-
-        /// <summary>
-        /// Base directory for file cache
-        /// </summary>
-        private readonly string _cacheDirectory = Path.Combine(
-            Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
-            "OpenKh", CacheDirectoryName);
-
-        public DownloadableModsService(
-            string cacheDirectory = null)
-        {
-            _cacheDirectory = cacheDirectory ?? _cacheDirectory;
-
-            if (!Directory.Exists(_cacheDirectory))
-                Directory.CreateDirectory(_cacheDirectory);
-        }
-
-        /// <summary>
-        /// Get the list of downloadable mods for a specific game
-        /// </summary>
-        public async Task GetDownloadableModsForGameAsync(
-            string gameId,
-            Func<DownloadableModModel, Task> emitAsync,
-            bool fallbackToLocalCache = true,
-            CancellationToken cancellationToken = default)
-        {
-            OnStatusUpdate?.Invoke("Starting mod loading...");
-
-            await GetDownloadableModsForGameInternalAsync(gameId, emitAsync, fallbackToLocalCache, cancellationToken);
-        }
-
-        private async Task GetDownloadableModsForGameInternalAsync(
-            string gameId,
-            Func<DownloadableModModel, Task> emitAsync,
-            bool fallbackToLocalCache = true,
-            CancellationToken cancellationToken = default
-        )
-        {
-            // Check if cancellation is requested
-            cancellationToken.ThrowIfCancellationRequested();
-            OnStatusUpdate?.Invoke("Checking available cache...");
-
-            // Check if we have valid cache
-            if (_modsCache.TryGetValue(gameId, out var cachedMods) &&
-                _lastCacheUpdate.TryGetValue(gameId, out var lastUpdate) &&
-                DateTime.Now - lastUpdate < CacheExpiration)
-            {
-                OnStatusUpdate?.Invoke("Using cached data (less than 1 hour old)...");
-
-                // Cache is up to date, filter out any mod that's already installed
-                var installedMods = ModsService.Mods.ToHashSet();
-                var filteredMods = cachedMods
-                    .Where(mod => !installedMods.Contains(mod.Repo))
-                    .ToList();
-
-                OnStatusUpdate?.Invoke($"Found {filteredMods.Count} available mods in cache");
-
-                foreach (var mod in filteredMods)
-                {
-                    await emitAsync(mod);
-                }
-            }
-
-            // No cache or it's expired, load from network
-
-            try
-            {
-                // Check if cancellation is requested
-                cancellationToken.ThrowIfCancellationRequested();
-
-                OnStatusUpdate?.Invoke($"Downloading mod list for {gameId}...");
-
-                // Get the list of available mods from the JSON
-                using var client = new HttpClient();
-                client.Timeout = RequestTimeout;
-
-                // Use GetAsync with HttpCompletionOption.ResponseHeadersRead for better performance
-                using var response = await client.GetAsync(DownloadableModsJsonUrl, HttpCompletionOption.ResponseHeadersRead, cancellationToken);
-                response.EnsureSuccessStatusCode();
-
-                var jsonContent = await response.Content.ReadAsStringAsync();
-
-                // Save JSON to cache
-                try
-                {
-                    OnStatusUpdate?.Invoke("Saving data to cache...");
-                    var jsonCachePath = Path.Combine(_cacheDirectory, "downloadable-mods.json");
-                    await File.WriteAllTextAsync(jsonCachePath, jsonContent, cancellationToken);
-                }
-                catch (Exception ex)
-                {
-                    OnDiagLog?.Invoke($"Error caching JSON: {ex.Message}");
-                }
-
-                // Check if cancellation is requested
-                cancellationToken.ThrowIfCancellationRequested();
-
-                OnStatusUpdate?.Invoke("Processing server data...");
-
-                using var modData = System.Text.Json.JsonDocument.Parse(jsonContent);
-
-                if (true
-                    && modData.RootElement.ValueKind == System.Text.Json.JsonValueKind.Object
-                    && modData.RootElement.TryGetProperty("mods", out var modsElements)
-                    && modsElements.ValueKind == System.Text.Json.JsonValueKind.Object
-                    && modsElements.TryGetProperty(gameId, out var gameModsElement)
-                    && gameModsElement.ValueKind == System.Text.Json.JsonValueKind.Array
-                )
-                {
-                    // Get list of installed mods to filter
-                    var installedMods = ModsService.Mods.ToHashSet();
-                    var blacklistedMods = ConfigurationService.BlacklistedMods ?? Enumerable.Empty<string>();
-                    var modTasks = new List<Task<DownloadableModModel>>();
-                    var allMods = new List<DownloadableModModel>(); // List of all mods (installed or not) for caching
-
-                    int totalMods = gameModsElement.EnumerateArray().Count();
-
-                    OnStatusUpdate?.Invoke($"Found {totalMods} mods for {gameId}. Loading details...");
-
-                    // Check if cancellation is requested
-                    cancellationToken.ThrowIfCancellationRequested();
-
-                    var modElements = gameModsElement.EnumerateArray().ToArray();
-
-                    var numEmitted = 0;
-
-                    // Process each mod entry and create tasks for parallel loading
-                    foreach (var (modElement, processedMods) in modElements.Select((modElement, processedMods) => (modElement, processedMods)))
-                    {
-                        // Check if cancellation is requested
-                        cancellationToken.ThrowIfCancellationRequested();
-
-                        // Update status before processing batch
-                        OnStatusUpdate?.Invoke($"Loading mod details... ({processedMods}/{totalMods})");
-
-                        if (false
-                            // skip if repo property is missing or invalid
-                            || !modElement.TryGetProperty("repo", out var repoElement)
-                            // skip if repo is null or not a string
-                            || repoElement.ValueKind != System.Text.Json.JsonValueKind.String
-                            || !(repoElement.GetString() is string repo)
-                            || repo == null
-                        )
-                        {
-                            continue;
-                        }
-
-                        // Create base mod entry for all mods (for caching)
-                        var mod = new DownloadableModModel
-                        {
-                            Repo = repo,
-                            Game = gameId
-                        };
-
-                        allMods.Add(mod);
-
-                        // Skip already installed mods from the result list but still process for caching
-                        bool isInstalled = installedMods.Contains(repo);
-                        bool isBlacklisted = blacklistedMods.Contains(repo);
-
-                        // Add task to load this mod
-                        try
-                        {
-                            cancellationToken.ThrowIfCancellationRequested();
-                            // Use file cache for metadata/images
-                            await LoadMetadataWithCache(mod, cancellationToken);
-                        }
-                        catch (OperationCanceledException)
-                        {
-                            throw; // Re-throw cancellation exceptions
-                        }
-                        catch (Exception ex)
-                        {
-                            OnDiagLog?.Invoke($"Error loading mod {repo}: {ex.Message}");
-                        }
-
-                        if (isInstalled || isBlacklisted)
-                        {
-                            continue;
-                        }
-                        else
-                        {
-                            await emitAsync(mod);
-                            numEmitted += 1;
-                        }
-                    }
-
-                    // Update cache
-                    _modsCache[gameId] = allMods;
-                    _lastCacheUpdate[gameId] = DateTime.Now;
-
-                    OnStatusUpdate?.Invoke($"Loading completed. {numEmitted} mods available for installation.");
-                }
-            }
-            catch (Exception ex)
-            {
-                OnDiagLog?.Invoke($"Error loading downloadable mods: {ex.Message}");
-
-                if (fallbackToLocalCache)
-                {
-                    // Try to load from local cache in case of network error
-                    try
-                    {
-                        foreach (var it in await GetDownloadableModsLocallyAsync(gameId))
-                        {
-                            await emitAsync(it);
-                        }
-                    }
-                    catch (Exception cacheEx)
-                    {
-                        OnDiagLog?.Invoke($"Error loading from cache: {cacheEx.Message}");
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// Get downloadable mods from local cache only
-        /// </summary>
-        public async Task<List<DownloadableModModel>> GetDownloadableModsLocallyAsync(string gameId)
-        {
-            var mods = new List<DownloadableModModel>();
-
-            var jsonCachePath = Path.Combine(_cacheDirectory, "downloadable-mods.json");
-            if (File.Exists(jsonCachePath))
-            {
-                var jsonContent = await File.ReadAllTextAsync(jsonCachePath);
-                using var modData = System.Text.Json.JsonDocument.Parse(jsonContent);
-
-                var blacklistedMods = ConfigurationService.BlacklistedMods ?? Enumerable.Empty<string>();
-
-                if (true
-                    && modData.RootElement.TryGetProperty("mods", out var modsElement)
-                    && modsElement.ValueKind == System.Text.Json.JsonValueKind.Object
-                    && modsElement.TryGetProperty(gameId, out var gameModsElement)
-                    && gameModsElement.ValueKind == System.Text.Json.JsonValueKind.Array
-                )
-                {
-                    var installedMods = ModsService.Mods.ToHashSet();
-                    foreach (var modElement in gameModsElement
-                        .EnumerateArray()
-                        .Where(it => it.ValueKind == System.Text.Json.JsonValueKind.Object)
-                    )
-                    {
-                        if (false
-                            // skip if repo property is missing or invalid
-                            || !modElement.TryGetProperty("repo", out var repoElement)
-                            // skip if repo is null or not a string
-                            || repoElement.ValueKind != System.Text.Json.JsonValueKind.String
-                            || !(repoElement.GetString() is string repo)
-                            || repo == null
-                            // skip if already installed
-                            || installedMods.Contains(repo)
-                            // skip if blacklisted
-                            || blacklistedMods.Contains(repo)
-                        )
-                        {
-                            continue;
-                        }
-
-                        var mod = new DownloadableModModel
-                        {
-                            Repo = repo,
-                            Game = gameId,
-                            Title = repo.Split('/').Last(),
-                            Description = "Loaded from local cache. Limited information available."
-                        };
-                        mods.Add(mod);
-                    }
-                }
-            }
-
-            return mods;
-        }
-
-        private async Task LoadMetadataWithCache(DownloadableModModel mod, CancellationToken cancellationToken = default)
-        {
-            try
-            {
-                // Create cache directory for this specific repository
-                string modCacheDir = Path.Combine(_cacheDirectory, mod.Repo.Replace('/', '_'));
-                string metadataPath = Path.Combine(modCacheDir, ModMetadataFileName);
-                string iconPath = Path.Combine(modCacheDir, ModIconFileNames[0]);
-                string previewPath = Path.Combine(modCacheDir, ModPreviewFileNames[0]);
-
-                if (!Directory.Exists(modCacheDir))
-                    Directory.CreateDirectory(modCacheDir);
-
-                // Load metadata
-                Metadata metadata = null;
-
-                // Try loading from cache first
-                if (File.Exists(metadataPath) && (DateTime.Now - File.GetLastWriteTime(metadataPath) < CacheExpiration))
-                {
-                    try
-                    {
-                        using var stream = File.OpenRead(metadataPath);
-                        metadata = Metadata.Read(stream);
-                    }
-                    catch (Exception ex)
-                    {
-                        OnDiagLog?.Invoke($"Error reading cached metadata: {ex.Message}");
-                    }
-                }
-
-                // If unable to load from cache, load from network
-                if (metadata == null)
-                {
-                    using var client = new HttpClient();
-                    client.Timeout = RequestTimeout;
-
-                    // Load metadata file
-                    var modYmlUrl = $"https://raw.githubusercontent.com/{mod.Repo}/main/{ModMetadataFileName}";
-                    var metadataContent = await client.GetStringAsync(modYmlUrl);
-
-                    // Parse YAML to get metadata
-                    using var stream = new MemoryStream(System.Text.Encoding.UTF8.GetBytes(metadataContent));
-                    metadata = Metadata.Read(stream);
-
-                    // Save to cache
-                    try
-                    {
-                        await File.WriteAllTextAsync(metadataPath, metadataContent);
-                    }
-                    catch (Exception ex)
-                    {
-                        OnDiagLog?.Invoke($"Error caching metadata: {ex.Message}");
-                    }
-                }
-
-                // Map metadata to model
-                mod.Title = metadata.Title ?? mod.RepoName;
-                mod.OriginalAuthor = metadata.OriginalAuthor ?? mod.RepoOwner;
-                mod.Description = metadata.Description ?? "No description available.";
-
-                // Encode repository path to handle special characters
-                string encodedRepo = EncodeRepositoryPath(mod.Repo);
-
-                // DEBUG: Show all possible paths for debugging
-                OnDiagLog?.Invoke($"Original repository: {mod.Repo}");
-                OnDiagLog?.Invoke($"Encoded repository: {encodedRepo}");
-
-                // Load the icon by trying different variants
-                await TryLoadImageWithVariants(mod, iconPath, encodedRepo, ModIconFileNames, image => mod.IconImage = image, cancellationToken);
-
-                // Load the preview image by trying different variants
-                await TryLoadImageWithVariants(mod, previewPath, encodedRepo, ModPreviewFileNames, image => mod.ScreenshotImageSource = image, cancellationToken);
-            }
-            catch (Exception ex)
-            {
-                OnDiagLog?.Invoke($"Error loading metadata for {mod.Repo}: {ex.Message}");
-                // Set default values if metadata loading fails
-                mod.Title = mod.Title ?? mod.RepoName;
-                mod.OriginalAuthor = mod.OriginalAuthor ?? mod.RepoOwner;
-                mod.Description = mod.Description ?? $"Could not load description for {mod.Repo}. Check your internet connection or try again later.";
-
-                // Create default image if needed
-                if (mod.IconImage == null)
-                {
-                    try
-                    {
-                        mod.IconImage = GetTextBasedAvatarImageOf(mod.RepoName ?? "?");
-                    }
-                    catch (Exception exIconImage)
-                    {
-                        OnDiagLog?.Invoke($"Error creating placeholder: {exIconImage.Message}");
-                    }
-                }
-            }
-        }
-
-        private BitmapImage GetTextBasedAvatarImageOf(string name)
-        {
-            // Create a simple colored rectangle as placeholder
-            var drawingVisual = new System.Windows.Media.DrawingVisual();
-            using (var drawingContext = drawingVisual.RenderOpen())
-            {
-                drawingContext.DrawRectangle(
-                    new System.Windows.Media.SolidColorBrush(System.Windows.Media.Color.FromRgb(100, 149, 237)), // Cornflower blue
-                    null,
-                    new System.Windows.Rect(0, 0, 64, 64));
-
-                // Add text with repo name
-                var formattedText = new System.Windows.Media.FormattedText(
-                    (name + "  ").Substring(0, 2).Trim(),
-                    System.Globalization.CultureInfo.InvariantCulture,
-                    System.Windows.FlowDirection.LeftToRight,
-                    new System.Windows.Media.Typeface("Arial"),
-                    24,
-                    System.Windows.Media.Brushes.White,
-                    1.0);
-
-                drawingContext.DrawText(formattedText,
-                    new System.Windows.Point((64 - formattedText.Width) / 2, (64 - formattedText.Height) / 2));
-            }
-
-            var renderTarget = new System.Windows.Media.Imaging.RenderTargetBitmap(
-                64, 64, 96, 96, System.Windows.Media.PixelFormats.Pbgra32);
-            renderTarget.Render(drawingVisual);
-            renderTarget.Freeze();
-
-            // Convert RenderTargetBitmap to BitmapImage
-            var encoder = new System.Windows.Media.Imaging.PngBitmapEncoder();
-            encoder.Frames.Add(System.Windows.Media.Imaging.BitmapFrame.Create(renderTarget));
-
-            // Don't dispose the stream until after the BitmapImage has loaded from it
-            var memoryStream = new System.IO.MemoryStream();
-            encoder.Save(memoryStream);
-            memoryStream.Position = 0;
-
-            var bitmapImage = new BitmapImage();
-            bitmapImage.BeginInit();
-            bitmapImage.CacheOption = BitmapCacheOption.OnLoad;
-            bitmapImage.StreamSource = memoryStream;
-            bitmapImage.EndInit();
-            bitmapImage.Freeze();
-
-            // Safe to dispose now that image is frozen
-            memoryStream.Dispose();
-
-            return bitmapImage;
-        }
-
-        private async Task LoadImageWithCache(DownloadableModModel mod, string cachePath, string url, Action<BitmapImage> setImage, CancellationToken cancellationToken = default)
-        {
-            try
-            {
-                // Always show a placeholder first
-                CreatePlaceholderImage(mod, setImage);
-
-                byte[] imageData = null;
-
-                // IMPORTANT: Force image downloads to solve cache problems
-                bool forceRefresh = true; // Temporarily always download images
-
-                // Extra debugging for URL
-                OnDiagLog?.Invoke($"Attempting to load image from URL: {url}");
-                OnDiagLog?.Invoke($"Cache path: {cachePath}");
-
-                // Try to load from cache first if not forcing refresh
-                if (!forceRefresh && File.Exists(cachePath))
-                {
-                    try
-                    {
-                        imageData = File.ReadAllBytes(cachePath);
-                        OnDiagLog?.Invoke($"Image loaded from cache: {cachePath}");
-                    }
-                    catch (Exception ex)
-                    {
-                        OnDiagLog?.Invoke($"Error reading cached image: {ex.Message}");
-                        // Delete corrupt cache file
-                        try
-                        { File.Delete(cachePath); }
-                        catch { }
-                    }
-                }
-
-                // If not in cache, cache read failed, or forcing refresh, download it
-                if (imageData == null || forceRefresh)
-                {
-                    try
-                    {
-                        using var client = new HttpClient();
-                        client.Timeout = TimeSpan.FromSeconds(20); // Longer timeout
-
-                        // Add User-Agent to avoid potential blocks
-                        client.DefaultRequestHeaders.Add("User-Agent", "OpenKh-ModManager/1.0");
-
-                        OnDiagLog?.Invoke($"Downloading image from URL: {url}");
-                        var response = await client.GetAsync(url, cancellationToken);
-
-                        if (response.IsSuccessStatusCode)
-                        {
-                            imageData = await response.Content.ReadAsByteArrayAsync();
-                            OnDiagLog?.Invoke($"Image downloaded successfully: {imageData.Length} bytes");
-
-                            try
-                            {
-                                // Create cache directory if it doesn't exist
-                                var directory = Path.GetDirectoryName(cachePath);
-                                if (!Directory.Exists(directory))
-                                {
-                                    Directory.CreateDirectory(directory);
-                                }
-
-                                // Save to cache
-                                File.WriteAllBytes(cachePath, imageData);
-                            }
-                            catch (Exception ex)
-                            {
-                                OnDiagLog?.Invoke($"Error saving image to cache: {ex.Message}");
-                            }
-                        }
-                        else
-                        {
-                            OnDiagLog?.Invoke($"Failed to download image: {response.StatusCode} for {url}");
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        OnDiagLog?.Invoke($"Error downloading image: {ex.Message} for {url}");
-                    }
-                }
-
-                // If we have image data, create a BitmapImage from it
-                if (imageData != null)
-                {
-                    try
-                    {
-                        var bitmap = new BitmapImage();
-                        using (var ms = new MemoryStream(imageData))
-                        {
-                            bitmap.BeginInit();
-                            bitmap.CreateOptions = BitmapCreateOptions.IgnoreColorProfile;
-                            bitmap.CacheOption = BitmapCacheOption.OnLoad;
-                            bitmap.StreamSource = ms;
-                            bitmap.EndInit();
-                            bitmap.Freeze(); // Important for cross-thread usage
-                        }
-
-                        setImage(bitmap);
-                        OnDiagLog?.Invoke($"Image set successfully to UI");
-                    }
-                    catch (Exception ex)
-                    {
-                        OnDiagLog?.Invoke($"Error creating BitmapImage: {ex.Message}");
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                OnDiagLog?.Invoke($"Unhandled error in LoadImageWithCache: {ex.Message}");
-            }
-        }
-
-        private void CreatePlaceholderImage(DownloadableModModel mod, Action<BitmapImage> setImage)
-        {
-            try
-            {
-                // Create colored rectangle with text
-                var drawingVisual = new System.Windows.Media.DrawingVisual();
-                using (var drawingContext = drawingVisual.RenderOpen())
-                {
-                    // Pick a color based on repository name
-                    byte[] nameBytes = System.Text.Encoding.UTF8.GetBytes(mod.Repo ?? "unknown");
-                    var r = (byte)((nameBytes.Length > 0 ? nameBytes[0] : 100) % 200 + 55);
-                    var g = (byte)((nameBytes.Length > 1 ? nameBytes[1] : 149) % 200 + 55);
-                    var b = (byte)((nameBytes.Length > 2 ? nameBytes[2] : 237) % 200 + 55);
-
-                    var brush = new System.Windows.Media.SolidColorBrush(
-                        System.Windows.Media.Color.FromRgb(r, g, b));
-
-                    drawingContext.DrawRectangle(brush, null, new System.Windows.Rect(0, 0, 64, 64));
-
-                    // Get first two letters of repo name as text
-                    string initials = "?";
-                    if (!string.IsNullOrEmpty(mod.RepoName))
-                    {
-                        initials = mod.RepoName.Substring(0, Math.Min(2, mod.RepoName.Length)).ToUpper();
-                    }
-
-                    var formattedText = new System.Windows.Media.FormattedText(
-                        initials,
-                        System.Globalization.CultureInfo.InvariantCulture,
-                        System.Windows.FlowDirection.LeftToRight,
-                        new System.Windows.Media.Typeface("Arial"),
-                        24,
-                        System.Windows.Media.Brushes.White,
-                        System.Windows.Media.VisualTreeHelper.GetDpi(drawingVisual).PixelsPerDip);
-
-                    // Center the text
-                    drawingContext.DrawText(formattedText,
-                        new System.Windows.Point((64 - formattedText.Width) / 2, (64 - formattedText.Height) / 2));
-                }
-
-                // Render to bitmap
-                var renderTarget = new System.Windows.Media.Imaging.RenderTargetBitmap(
-                    64, 64, 96, 96, System.Windows.Media.PixelFormats.Pbgra32);
-                renderTarget.Render(drawingVisual);
-
-                // Convert to BitmapImage
-                var encoder = new System.Windows.Media.Imaging.PngBitmapEncoder();
-                encoder.Frames.Add(System.Windows.Media.Imaging.BitmapFrame.Create(renderTarget));
-
-                using var memoryStream = new System.IO.MemoryStream();
-                encoder.Save(memoryStream);
-                memoryStream.Position = 0;
-
-                var bitmapImage = new BitmapImage();
-                bitmapImage.BeginInit();
-                bitmapImage.CacheOption = BitmapCacheOption.OnLoad;
-                bitmapImage.StreamSource = memoryStream;
-                bitmapImage.EndInit();
-                bitmapImage.Freeze();
-
-                // Set the placeholder image
-                setImage(bitmapImage);
-            }
-            catch (Exception ex)
-            {
-                OnDiagLog?.Invoke($"Error creating placeholder: {ex.Message}");
-            }
-        }
-    }
-}
diff --git a/OpenKh.Tools.ModsManager/Services/GameService.cs b/OpenKh.Tools.ModsManager/Services/GameService.cs
deleted file mode 100644
index a3f7f72f5..000000000
--- a/OpenKh.Tools.ModsManager/Services/GameService.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-using OpenKh.Common;
-using OpenKh.Tools.ModsManager.Models;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-
-namespace OpenKh.Tools.ModsManager.Services
-{
-    public static class GameService
-    {
-        private const int BlockIso = 0x800;
-        private static readonly List<GameInfoModel> Games = new()
-        {
-            new GameInfoModel()
-            {
-                Id = "kh1",
-                Name = "Kingdom Hearts I",
-                UniqueFileName = "btltbl.bin",
-                Detectors = new()
-                {
-                    new GameDetectorModel { FileName = "SYSTEM.CNF;1", ProductId = "SLPS_251.05;1" },
-                    new GameDetectorModel { FileName = "SYSTEM.CNF;1", ProductId = "SLUS_203.70;1" },
-                    new GameDetectorModel { FileName = "SYSTEM.CNF;1", ProductId = "SLPS_251.97;1" },
-                    new GameDetectorModel { FileName = "SYSTEM.CNF;1", ProductId = "SLPS_251.98;1" },
-                }
-            },
-            new GameInfoModel()
-            {
-                Id = "kh2",
-                Name = "Kingdom Hearts II",
-                UniqueFileName = "00objentry.bin",
-                Detectors = new()
-                {
-                    new GameDetectorModel { FileName = "SYSTEM.CNF;1", ProductId = "SLPM_662.33;1" },
-                    new GameDetectorModel { FileName = "SYSTEM.CNF;1", ProductId = "SLUS_210.05;1" },
-                    new GameDetectorModel { FileName = "SYSTEM.CNF;1", ProductId = "SLES_541.14;1" },
-                    new GameDetectorModel { FileName = "SYSTEM.CNF;1", ProductId = "SLES_542.32;1" },
-                    new GameDetectorModel { FileName = "SYSTEM.CNF;1", ProductId = "SLES_542.33;1" },
-                    new GameDetectorModel { FileName = "SYSTEM.CNF;1", ProductId = "SLES_542.34;1" },
-                    new GameDetectorModel { FileName = "SYSTEM.CNF;1", ProductId = "SLPM_666.75;1" },
-                }
-            },
-            new GameInfoModel()
-            {
-                Id = "Recom",
-                Name = "Kingdom Hearts Re:Chain of Memories",
-                UniqueFileName = "CST_sora.pss",
-                Detectors = new()
-                {
-                    new GameDetectorModel { FileName = "SYSTEM.CNF;1", ProductId = "SLPM_666.76;1" },
-                    new GameDetectorModel { FileName = "SYSTEM.CNF;1", ProductId = "SLUS_217.99;1" },
-                }
-            }
-        };
-
-        public static GameInfoModel DetectGameId(string isoFilePath)
-        {
-            using var stream = File.OpenRead(isoFilePath);
-            foreach (var game in Games)
-            {
-                foreach (var detector in game.Detectors)
-                {
-                    var blockIndex = IsoUtility.GetFileOffset(stream, detector.FileName);
-                    if (blockIndex < 0)
-                        continue;
-
-                    var data = stream.SetPosition(blockIndex * BlockIso).ReadBytes(BlockIso);
-                    var expectData = Encoding.UTF8.GetBytes(detector.ProductId);
-                    if (string.Join(' ', data).Contains(string.Join(' ', expectData))) // TODO: inefficient, but it works lol
-                        return game;
-                }
-            }
-
-            return default;
-        }
-
-        public static GameInfoModel Lookup(string gameId) => Games.FirstOrDefault(x => x.Id == gameId);
-
-        public static bool FolderContainsUniqueFile(string gameId, string path)
-        {
-            var game = Lookup(gameId);
-            if (game == null)
-                return false;
-
-            return File.Exists(Path.Combine(path, game.UniqueFileName));
-        }
-    }
-}
diff --git a/OpenKh.Tools.ModsManager/Services/GetActiveWindowService.cs b/OpenKh.Tools.ModsManager/Services/GetActiveWindowService.cs
deleted file mode 100644
index f6761ce6a..000000000
--- a/OpenKh.Tools.ModsManager/Services/GetActiveWindowService.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System.Linq;
-using System.Windows;
-
-namespace OpenKh.Tools.ModsManager.Services
-{
-    public class GetActiveWindowService
-    {
-        public Window GetActiveWindow() => Application.Current.Windows.OfType<Window>().SingleOrDefault(x => x.IsActive);
-    }
-}
diff --git a/OpenKh.Tools.ModsManager/Services/GetDiffService.cs b/OpenKh.Tools.ModsManager/Services/GetDiffService.cs
deleted file mode 100644
index 0a8008283..000000000
--- a/OpenKh.Tools.ModsManager/Services/GetDiffService.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System;
-using System.Threading.Tasks;
-
-namespace OpenKh.Tools.ModsManager.Services
-{
-    public class GetDiffService
-    {
-        public string Name { get; set; }
-        public Func<byte[], byte[], Task<byte[]>> DiffAsync { get; set; }
-    }
-}
diff --git a/OpenKh.Tools.ModsManager/Services/GetDiffToolsService.cs b/OpenKh.Tools.ModsManager/Services/GetDiffToolsService.cs
deleted file mode 100644
index e85bb77b5..000000000
--- a/OpenKh.Tools.ModsManager/Services/GetDiffToolsService.cs
+++ /dev/null
@@ -1,114 +0,0 @@
-using Microsoft.Win32;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace OpenKh.Tools.ModsManager.Services
-{
-    public class GetDiffToolsService
-    {
-        /// <param name="extension">`.yml`</param>
-        public IEnumerable<GetDiffService> GetDiffServices(string extension)
-        {
-            Func<byte[], byte[], Task<byte[]>> CreateDiffAsync(string exe)
-            {
-                return async (rawInput, rawOutput) =>
-                {
-                    var tempInput = Path.GetTempFileName() + extension;
-                    var tempOutput = Path.GetTempFileName() + extension;
-                    try
-                    {
-                        await File.WriteAllBytesAsync(tempInput, rawInput ?? new byte[0]);
-                        await File.WriteAllBytesAsync(tempOutput, rawOutput ?? new byte[0]);
-
-                        var process = System.Diagnostics.Process.Start(
-                            exe,
-                            $"\"{tempInput}\" \"{tempOutput}\""
-                        );
-                        await process.WaitForExitAsync();
-
-                        if (process.ExitCode == 0)
-                        {
-                            return await File.ReadAllBytesAsync(tempOutput);
-                        }
-                        else
-                        {
-                            return null;
-                        }
-                    }
-                    finally
-                    {
-                        File.Delete(tempInput);
-                        File.Delete(tempOutput);
-                    }
-                };
-            }
-
-            IEnumerable<string> TryToReadReg(string fullPath)
-            {
-                var exe = Registry.GetValue(Path.GetDirectoryName(fullPath), Path.GetFileName(fullPath), "") + "";
-                if (File.Exists(exe))
-                {
-                    yield return exe;
-                }
-            }
-
-            IEnumerable<string> TryToFindExe(string exe)
-            {
-                if (File.Exists(exe))
-                {
-                    yield return exe;
-                }
-            }
-
-            IEnumerable<GetDiffService> TwoFileDiff(string name, IEnumerable<string> exeFiles)
-            {
-                return exeFiles
-                    .Distinct(StringComparer.InvariantCultureIgnoreCase)
-                    .Select(
-                        exe => new GetDiffService
-                        {
-                            Name = $"{name} ({Path.GetDirectoryName(exe)})",
-                            DiffAsync = CreateDiffAsync(exe),
-                        }
-                    );
-            }
-
-            foreach (var one in new GetDiffService[0]
-                .Concat(
-                    TwoFileDiff(
-                        "WinMerge.exe",
-                        new string[0]
-                            .Concat(TryToFindExe(@"C:\Program Files\WinMerge\WinMergeU.exe"))
-                            .Concat(TryToFindExe(@"C:\Program Files (x86)\WinMerge\WinMergeU.exe"))
-                    )
-                )
-                .Concat(
-                    TwoFileDiff(
-                        "TortoiseGitMerge.exe",
-                        new string[0]
-                            .Concat(TryToReadReg(@"HKEY_LOCAL_MACHINE\SOFTWARE\TortoiseGit\TMergePath"))
-                            .Concat(TryToReadReg(@"HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\TortoiseGit\TMergePath"))
-                            .Concat(TryToFindExe(@"C:\Program Files\TortoiseGit\bin\TortoiseGitMerge.exe"))
-                            .Concat(TryToFindExe(@"C:\Program Files (x86)\TortoiseGit\bin\TortoiseGitMerge.exe"))
-                    )
-                )
-                .Concat(
-                    TwoFileDiff(
-                        "TortoiseMerge.exe",
-                        new string[0]
-                            .Concat(TryToReadReg(@"HKEY_LOCAL_MACHINE\SOFTWARE\TortoiseSVN\TMergePath"))
-                            .Concat(TryToReadReg(@"HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\TortoiseSVN\TMergePath"))
-                            .Concat(TryToFindExe(@"C:\Program Files\TortoiseSVN\bin\TortoiseGitMerge.exe"))
-                            .Concat(TryToFindExe(@"C:\Program Files (x86)\TortoiseSVN\bin\TortoiseGitMerge.exe"))
-                    )
-                )
-            )
-            {
-                yield return one;
-            }
-        }
-    }
-}
diff --git a/OpenKh.Tools.ModsManager/Services/KeywordsMatcherService.cs b/OpenKh.Tools.ModsManager/Services/KeywordsMatcherService.cs
deleted file mode 100644
index 956e2b8a4..000000000
--- a/OpenKh.Tools.ModsManager/Services/KeywordsMatcherService.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System;
-using System.Linq;
-using System.Text.RegularExpressions;
-
-namespace OpenKh.Tools.ModsManager.Services
-{
-    public class KeywordsMatcherService
-    {
-        public Func<string, bool> CreateMatcher(string inputKeywords)
-        {
-            var inputKeywordArray = Regex.Split(inputKeywords.ToLowerInvariant(), "\\s+")
-                .Where(it => it.Length != 0)
-                .ToArray();
-
-            return testKeywords =>
-            {
-                testKeywords = testKeywords.ToLowerInvariant();
-                return inputKeywordArray.All(it => 0 <= testKeywords.IndexOf(it));
-            };
-        }
-    }
-}
diff --git a/OpenKh.Tools.ModsManager/Services/ModsService.cs b/OpenKh.Tools.ModsManager/Services/ModsService.cs
deleted file mode 100644
index b3c213ee4..000000000
--- a/OpenKh.Tools.ModsManager/Services/ModsService.cs
+++ /dev/null
@@ -1,710 +0,0 @@
-using LibGit2Sharp;
-using OpenKh.Common;
-using OpenKh.Patcher;
-using OpenKh.Tools.ModsManager.Exceptions;
-using OpenKh.Tools.ModsManager.Models;
-using OpenKh.Tools.ModsManager.ViewModels;
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.IO;
-using System.IO.Compression;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Windows;
-using static OpenKh.Tools.ModsManager.Helpers;
-
-namespace OpenKh.Tools.ModsManager.Services
-{
-    public static class ModsService
-    {
-        private const string ModMetadata = "mod.yml";
-        private const string DefaultGitBranch = "main";
-
-        private static string[] _gameList = new string[]
-        {
-            "OpenKH",
-            "PCSX2-EX",
-            "PC"
-        };
-
-        private static string[] _langList = new string[]
-        {
-            "Default",
-            "Japanese",
-            "English [US]",
-            "English [UK]",
-            "Italian",
-            "Spanish",
-            "German",
-            "French",
-            "Final Mix"
-        };
-
-        public static IEnumerable<string> Mods
-        {
-            get
-            {
-                var allMods = UnorderedMods.ToList();
-                var enabledMods = EnabledMods.ToHashSet();
-                var disabledMods = new List<string>(allMods.Count);
-                foreach (var mod in allMods)
-                {
-                    if (!enabledMods.Contains(mod))
-                        disabledMods.Add(mod);
-                }
-
-                return enabledMods.Concat(disabledMods);
-            }
-        }
-
-        public static IEnumerable<string> UnorderedMods
-        {
-            get
-            {
-                var modsPath = ConfigurationService.InstalledModsPath;
-                foreach (var dir in Directory.GetDirectories(modsPath))
-                {
-                    var authorName = Path.GetFileName(dir);
-                    foreach (var subdir in Directory.GetDirectories(dir))
-                    {
-                        var repoName = Path.GetFileName(subdir);
-                        if (File.Exists(Path.Combine(subdir, ModMetadata)))
-                            yield return $"{authorName}/{repoName}";
-                    }
-
-                    if (File.Exists(Path.Combine(dir, ModMetadata)))
-                        yield return authorName;
-                }
-                var collectionsPath = ConfigurationService.InstalledCollectionsPath;
-                foreach (var dir in Directory.GetDirectories(collectionsPath))
-                {
-                    var authorName = Path.GetFileName(dir);
-                    foreach (var subdir in Directory.GetDirectories(dir))
-                    {
-                        var repoName = Path.GetFileName(subdir);
-                        if (File.Exists(Path.Combine(subdir, ModMetadata)))
-                        {
-                            yield return $"{authorName}/{repoName}";
-                        }
-                    }
-                }
-            }
-        }
-
-        public static IEnumerable<string> EnabledMods
-        {
-            get
-            {
-                var mods = UnorderedMods.ToList();
-                foreach (var mod in ConfigurationService.EnabledMods)
-                {
-                    if (mods.Contains(mod))
-                        yield return mod;
-                }
-            }
-        }
-
-        public static bool IsModBlocked(string repositoryName)
-            {
-            if (ConfigurationService.BlacklistedMods != null)
-                return ConfigurationService.BlacklistedMods.Any(x => x.Equals(repositoryName, StringComparison.InvariantCultureIgnoreCase));
-            return false;
-            }
-
-        public static bool IsUserBlocked(string repositoryName) =>
-            IsModBlocked(Path.GetDirectoryName(repositoryName));
-
-        public static Task InstallMod(
-            string name,
-            bool isZipFile,
-            bool isLuaFile,
-            Action<string> progressOutput = null,
-            Action<float> progressNumber = null,
-            string platformUrl = null,
-            string branchName = null)
-        {
-            if (!isZipFile && !isLuaFile)
-            {
-                return Task.Run(() => InstallModFromGit(name, progressOutput, progressNumber, platformUrl, branchName));
-            }
-            else if (isZipFile && !isLuaFile)
-            {
-                return Task.Run(() => InstallModFromZip(name, progressOutput, progressNumber));
-            }
-            else
-            {
-                return Task.Run(() => InstallModFromLua(name));
-            }
-        }
-
-        public static void InstallModFromZip(
-            string fileName,
-            Action<string> progressOutput = null,
-            Action<float> progressNumber = null)
-        {
-            var modName = Path.GetFileNameWithoutExtension(fileName);
-            progressOutput?.Invoke($"Opening '{modName}' zip archive...");
-
-            using var zipFile = ZipFile.OpenRead(fileName);
-
-            var isModPatch = fileName.ToLower().Contains(".kh2pcpatch") || fileName.ToLower().Contains(".kh1pcpatch") || fileName.ToLower().Contains(".compcpatch") || fileName.ToLower().Contains(".bbspcpatch") || fileName.ToLower().Contains(".dddpcpatch") ? true : false;
-            var isValidMod = zipFile.GetEntry(ModMetadata) != null || isModPatch;
-
-            if (!isValidMod)
-                throw new ModNotValidException(modName);
-
-            var modPath = GetModPath(modName);
-            if (Directory.Exists(modPath))
-            {
-                var errorMessage = MessageBox.Show($"A mod with the name '{modName}' already exists. Do you want to overwrite the mod install.", "Warning", MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No, MessageBoxOptions.DefaultDesktopOnly);
-
-                switch (errorMessage)
-                {
-                    case MessageBoxResult.Yes:
-                        MainViewModel.overwriteMod = true;
-                        Directory.Delete(modPath, true);
-                        break;
-                    case MessageBoxResult.No:
-                        throw new ModAlreadyExistsExceptions(modName);
-                }
-            }
-
-            Directory.CreateDirectory(modPath);
-
-            var entryExtractCount = 0;
-            var entryCount = zipFile.Entries.Count;
-
-            foreach (var entry in zipFile.Entries.Where(x => !string.IsNullOrEmpty(x.Name)))
-            {
-                var _str = entry.FullName;
-                var _strSplitter = _str.IndexOf('/') > -1 ? "/" : "\\";
-
-                var _splitStr = _str.Split(_strSplitter);
-                var _package = _splitStr[0];
-
-                if (isModPatch)
-                {
-                    if (_str.Contains("original"))
-                        _str = String.Join("\\", _splitStr.Skip(2));
-
-                    else
-                        _str = String.Join("\\", _splitStr.Skip(1));
-                }
-
-                progressOutput?.Invoke($"Extracting '{_str}'...");
-                progressNumber?.Invoke((float)entryExtractCount / entryCount);
-                var dstFileName = Path.Combine(modPath, _str);
-                var dstFilePath = Path.GetDirectoryName(dstFileName);
-                if (!Directory.Exists(dstFilePath))
-                    Directory.CreateDirectory(dstFilePath);
-                File.Create(dstFileName)
-                    .Using(outStream =>
-                    {
-                        using var zipStream = entry.Open();
-                        zipStream.CopyTo(outStream);
-                    });
-
-                entryExtractCount++;
-            }
-
-            if (isModPatch)
-            {
-                var _yamlGen = new Metadata();
-                if (fileName.ToLower().Contains(".kh2pcpatch"))
-                {
-                    _yamlGen.Title = modName + " (KH2PCPATCH)";
-                    _yamlGen.Game = "kh2";
-                    _yamlGen.Description = "This is an automatically generated metadata for this KH2PCPATCH Modification.";
-                }
-                else if (fileName.ToLower().Contains(".kh1pcpatch"))
-                {
-                    _yamlGen.Title = modName + " (KH1PCPATCH)";
-                    _yamlGen.Game = "kh1";
-                    _yamlGen.Description = "This is an automatically generated metadata for this KH1PCPATCH Modification.";
-                }
-                else if (fileName.ToLower().Contains(".compcpatch"))
-                {
-                    _yamlGen.Title = modName + " (COMPCPATCH)";
-                    _yamlGen.Game = "Recom";
-                    _yamlGen.Description = "This is an automatically generated metadata for this COMPCPATCH Modification.";
-                }
-                else if (fileName.ToLower().Contains(".bbspcpatch"))
-                {
-                    _yamlGen.Title = modName + " (BBSPCPATCH)";
-                    _yamlGen.Game = "bbs";
-                    _yamlGen.Description = "This is an automatically generated metadata for this BBSPCPATCH Modification.";
-                }
-                else if (fileName.ToLower().Contains(".dddpcpatch"))
-                {
-                    _yamlGen.Title = modName + " (DDDPCPATCH)";
-                    _yamlGen.Game = "kh3d";
-                    _yamlGen.Description = "This is an automatically generated metadata for this DDDPCPATCH Modification.";
-                }
-                _yamlGen.OriginalAuthor = "Unknown";
-                _yamlGen.Assets = new List<AssetFile>();
-
-                foreach (var entry in zipFile.Entries.Where(x => !string.IsNullOrEmpty(x.Name)))
-                {
-                    var _str = entry.FullName;
-                    var _strSplitter = _str.IndexOf('/') > -1 ? "/" : "\\";
-
-                    var _splitStr = _str.Split(_strSplitter);
-                    var _package = _splitStr[0];
-
-                    if (_str.Contains("original"))
-                        _str = String.Join("\\", _splitStr.Skip(2));
-
-                    else
-                        _str = String.Join("\\", _splitStr.Skip(1));
-
-                    var _assetFile = new AssetFile();
-                    var _assetSource = new AssetFile();
-
-                    _assetSource.Name = _str;
-
-                    _assetFile.Method = "copy";
-                    _assetFile.Name = _str;
-                    _assetFile.Package = _package;
-                    _assetFile.Source = new List<AssetFile>() { _assetSource };
-                    _assetFile.Platform = "pc";
-
-                    _yamlGen.Assets.Add(_assetFile);
-                }
-
-                var _yamlPath = Path.Combine(modPath + "/mod.yml");
-
-                File.WriteAllText(_yamlPath, _yamlGen.ToString());
-            }
-        }
-
-        public static async Task InstallModFromGit(
-            string repositoryName,
-            Action<string> progressOutput = null,
-            Action<float> progressNumber = null,
-            string platformName = null,
-            string branchName = null)
-        {
-            var parts = repositoryName.Split('/');
-            if (parts.Length >= 3)
-            {
-                if (string.IsNullOrWhiteSpace(branchName))
-                    branchName = string.Join("/", parts.Skip(2));
-                repositoryName = $"{parts[0]}/{parts[1]}";
-            }
-
-            if (!string.IsNullOrWhiteSpace(branchName))
-            {
-                progressOutput?.Invoke($"Fetching file {ModMetadata} from branch {branchName}");
-                var isValidMod = await RepositoryService.IsFileExists(repositoryName, branchName, ModMetadata, progressOutput, progressNumber, platformName);
-                if (!isValidMod)
-                    throw new BranchNotValidException(repositoryName, branchName);
-            }
-            else
-            {
-                branchName = DefaultGitBranch;
-                progressOutput?.Invoke($"Fetching file {ModMetadata} from {branchName}");
-                var isValidMod = await RepositoryService.IsFileExists(repositoryName, branchName, ModMetadata, progressOutput, progressNumber, platformName);
-                if (!isValidMod)
-                {
-                    progressOutput?.Invoke($"{ModMetadata} not found, fetching default branch name");
-                    branchName = await RepositoryService.GetMainBranchFromRepository(repositoryName);
-                    if (branchName == null)
-                        throw new RepositoryNotFoundException(repositoryName);
-
-                    progressOutput?.Invoke($"Fetching file {ModMetadata} from {branchName}");
-                    isValidMod = await RepositoryService.IsFileExists(repositoryName, branchName, ModMetadata, progressOutput, progressNumber, platformName);
-                }
-
-                if (!isValidMod)
-                    throw new ModNotValidException(repositoryName);
-            }
-
-            var modPaths = new List<string> {
-                GetModPath(repositoryName),
-                GetCollectionPath(repositoryName)
-            };
-            if (modPaths.Any(mod => Directory.Exists(mod)))
-            {
-                var errorMessage = MessageBox.Show($"A mod with the name '{repositoryName}' already exists. Do you want to overwrite the mod install.", "Warning", MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No , MessageBoxOptions.DefaultDesktopOnly);
-
-                switch (errorMessage)
-                {
-                    case MessageBoxResult.Yes:
-                        MainViewModel.overwriteMod = true;
-                        foreach (var existingModPath in modPaths.Where(Directory.Exists))
-                            await CleanModFiles(existingModPath);
-                        await ClearOldMods(repositoryName);
-                        break;
-                    case MessageBoxResult.No:
-                        throw new ModAlreadyExistsExceptions(repositoryName);
-                }
-            }
-            var modPath = modPaths[0];
-            Directory.CreateDirectory(modPath);
-
-            progressOutput?.Invoke($"Mod found, initializing cloning process");
-            await Task.Run(() =>
-            {
-                var options = new CloneOptions
-                {
-                    RecurseSubmodules = true,
-                    BranchName = branchName,
-                };
-                options.FetchOptions.OnProgress = (serverProgressOutput) =>
-                {
-                    progressOutput?.Invoke(serverProgressOutput);
-                    return true;
-                };
-                options.FetchOptions.OnTransferProgress = (progress) =>
-                {
-                    var nProgress = ((float)progress.ReceivedObjects / (float)progress.TotalObjects);
-                    progressNumber?.Invoke(nProgress);
-
-                    progressOutput?.Invoke("Received Bytes: " + (progress.ReceivedBytes / 1048576) + " MB");
-                    return true;
-                };
-
-                var _fetchPlatformUrl = new Uri("https://github.com/");
-                var _fetchRelativeUri = new Uri(_fetchPlatformUrl, $"{repositoryName}");
-
-                if (!String.IsNullOrWhiteSpace(platformName))
-                {
-                    _fetchPlatformUrl = new Uri(platformName.Contains("http") ? platformName : "https://" + platformName);
-                    _fetchRelativeUri = new Uri(_fetchPlatformUrl, $"{repositoryName}");
-                }
-
-                Repository.Clone(_fetchRelativeUri.ToString(), modPath, options);
-            });
-            if (IsCollection(repositoryName))
-                await MoveToCollection(repositoryName);
-        }
-
-        public static void InstallModFromLua(string fileName)
-        {
-            string modName = Path.GetFileNameWithoutExtension(fileName);
-            string modAuthor = null;
-            string modDescription = null;
-
-            if (!fileName.Contains(".lua"))
-                throw new ModNotValidException(modName);
-
-            string modPath = GetModPath(modName);
-            if (Directory.Exists(modPath))
-            {
-                var errorMessage = MessageBox.Show($"A mod with the name '{modName}' already exists. Do you want to overwrite the mod install.", "Warning", MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No, MessageBoxOptions.DefaultDesktopOnly);
-
-                switch (errorMessage)
-                {
-                    case MessageBoxResult.Yes:
-                        MainViewModel.overwriteMod = true;
-                        Directory.Delete(modPath, true);
-                        break;
-                    case MessageBoxResult.No:
-                        throw new ModAlreadyExistsExceptions(modName);
-                }
-            }
-            Directory.CreateDirectory(modPath);
-            File.Copy(fileName, Path.Combine(modPath, Path.GetFileName(fileName)));
-
-            StreamReader r = new StreamReader(Path.Combine(modPath, Path.GetFileName(fileName)));
-            while (!r.EndOfStream)
-            {
-                string line = r.ReadLine();
-
-                if (line.Contains("LUAGUI"))
-                {
-                    string _lineGib = "";
-                    string _lineLead = "";
-
-                    _lineGib = line.Substring(line.IndexOf("=") + 1).Replace("\"", "").Replace("\'", "").Trim();
-                    _lineLead = string.Concat(line.Take(11));
-
-                    switch (_lineLead)
-                    {
-                        case "LUAGUI_NAME":
-                            modName = "\"" + _lineGib + "\"";
-                            break;
-                        case "LUAGUI_AUTH":
-                            modAuthor = "\"" + _lineGib + "\"";
-                            break;
-                        case "LUAGUI_DESC":
-                            modDescription = "\"" + _lineGib + "\"";
-                            break;
-                    }
-
-                    if (modName != null && modAuthor != null && modDescription != null)
-                        break;
-                }
-            }
-            r.Close();
-            modDescription ??= "This is an automatically generated metadata for a Lua Zip Mod";
-            string yaml = $"title: {modName}\r\n{(modAuthor != null ? $"author: {modAuthor}\r\n" : "")}description: {modDescription}\r\n" +
-                $"assets:\r\n- name: scripts/{Path.GetFileName(fileName)}\r\n  method: copy\r\n  source:\r\n  - name: {Path.GetFileName(fileName)}";
-            string _yamlPath = Path.Combine(modPath + "/mod.yml");
-
-            File.WriteAllText(_yamlPath, yaml);
-        }
-
-        public static string GetModPath(string repositoryName) =>
-            Path.Combine(ConfigurationService.InstalledModsPath, repositoryName);
-        public static string GetModsGamePath(string repositoryName, string game) =>
-            Path.Combine(ConfigurationService.InstalledModsPath, "..", game, repositoryName);
-        public static string GetCollectionPath(string repositoryName) =>
-            Path.Combine(ConfigurationService.InstalledCollectionsPath, repositoryName);
-
-        public static IEnumerable<ModModel> GetMods(IEnumerable<string> modNames)
-        {
-            var enabledMods = ConfigurationService.EnabledMods;
-            var collectionEnabledMods = ConfigurationService.EnabledCollectionMods;
-            foreach (var modName in modNames)
-            {
-                var collectionEnabledAssets = collectionEnabledMods.ContainsKey(modName) ? collectionEnabledMods[modName] : new Dictionary<string, bool> { };
-                var modPath = GetModPath(modName);
-                if (!Directory.Exists(modPath))
-                    modPath = GetCollectionPath(modName);
-                if (!Directory.Exists(modPath))
-                    throw new ModNotValidException(modName);
-                yield return new ModModel
-                {
-                    Name = modName,
-                    Path = modPath,
-                    IconImageSource = Path.Combine(modPath, "icon.png"),
-                    PreviewImageSource = Path.Combine(modPath, "preview.png"),
-                    Metadata = GetMetadata(modPath),
-                    IsEnabled = enabledMods.Contains(modName),
-                    CollectionOptionalEnabledAssets = collectionEnabledAssets
-                };
-            }
-        }
-
-        public static async IAsyncEnumerable<ModUpdateModel> FetchUpdates()
-        {
-            foreach (var modName in Mods)
-            {
-                var modPath = GetModPath(modName);
-                var isCollection = false;
-                if (!Directory.Exists(modPath))
-                {
-                    isCollection = true;
-                    modPath = GetCollectionPath(modName);
-                }
-                var updateCount = await RepositoryService.FetchUpdate(modPath);
-                var metadata = GetMetadata(modPath);
-                if (isCollection && !metadata.IsCollection)
-                    await MoveFromCollection(modName);
-                else if (!isCollection && metadata.IsCollection)
-                    if (!Directory.Exists(GetCollectionPath(modName)))
-                        await MoveToCollection(modName);
-                    else
-                        await CleanModFiles(GetModPath(modName));
-                if (updateCount > 0)
-                    yield return new ModUpdateModel
-                    {
-                        Name = modName,
-                        UpdateCount = updateCount
-                    };
-            }
-        }
-
-        public static Task Update(string modName,
-            Action<string> progressOutput = null,
-            Action<float> progressNumber = null) => Task.Run(() => Handle(() =>
-            {
-                var modPath = GetModPath(modName);
-                var isCollection = false;
-                if (!Directory.Exists(modPath))
-                {
-                    isCollection = true;
-                    modPath = GetCollectionPath(modName);
-                }
-                RepositoryService.FetchAndResetUponOrigin(modPath, progressOutput, progressNumber);
-                var metadata = GetMetadata(modPath);
-                if (isCollection && !metadata.IsCollection)
-                    MoveFromCollection(modName);
-                else if (!isCollection && metadata.IsCollection)
-                    MoveToCollection(modName);
-            }));
-
-        public static Task<bool> RunPatcherAsync(bool fastMode) => Task.Run(() => Handle(() =>
-        {
-            if (Directory.Exists(ConfigurationService.CompiledModPath))
-            {
-                try
-                {
-                    Directory.Delete(ConfigurationService.CompiledModPath, true);
-                }
-                catch (Exception ex)
-                {
-                    Log.Warn("Unable to fully clean the mod directory:\n{0}", ex.Message);
-                }
-            }
-
-            Directory.CreateDirectory(ConfigurationService.CompiledModPath);
-
-            var patcherProcessor = new PatcherProcessor();
-            var modsList = GetMods(EnabledMods).ToList();
-            var collectionOptionalModsList = ConfigurationService.EnabledCollectionMods;
-            var enabledOptionalAssets = new Dictionary<string, bool> { };
-            var packageMap = new ConcurrentDictionary<string, string>();
-
-            for (var i = modsList.Count - 1; i >= 0; i--)
-            {
-                var mod = modsList[i];
-                Log.Info($"Building {mod.Name} for {_gameList[ConfigurationService.GameEdition]} - {_langList[ConfigurationService.RegionId]}");
-                if (collectionOptionalModsList.ContainsKey(mod.Name))
-                    enabledOptionalAssets = collectionOptionalModsList[mod.Name];
-
-                patcherProcessor.Patch(
-                    Path.Combine(ConfigurationService.GameDataLocation, ConfigurationService.LaunchGame),
-                    ConfigurationService.CompiledModPath,
-                    mod.Metadata,
-                    mod.Path,
-                    ConfigurationService.GameEdition,
-                    fastMode,
-                    packageMap,
-                    ConfigurationService.LaunchGame,
-                    ConfigurationService.PcReleaseLanguage,
-                    false,
-                    enabledOptionalAssets);
-            }
-
-            using var packageMapWriter = new StreamWriter(Path.Combine(ConfigurationService.CompiledModPath, "patch-package-map.txt"));
-            foreach (var entry in packageMap)
-                packageMapWriter.WriteLine(entry.Key + " $$$$ " + entry.Value);
-            packageMapWriter.Flush();
-            packageMapWriter.Close();
-
-            return true;
-        }));
-
-        private static string GetSourceFromUrl(string url)
-        {
-            var projectNameIndex = url.LastIndexOf('/');
-            if (projectNameIndex < 0)
-                return null;
-            var projectName = url.Substring(projectNameIndex + 1);
-            if (projectName.EndsWith(".git"))
-                projectName = projectName.Substring(0, projectName.Length - 4);
-
-            var firstPart = url.Substring(0, projectNameIndex);
-            var authorNameIndex = firstPart.LastIndexOf('/');
-            if (authorNameIndex < 0)
-                authorNameIndex = firstPart.LastIndexOf(':');
-            if (authorNameIndex < 0)
-                return null;
-            var authorName = firstPart.Substring(authorNameIndex + 1);
-
-            return $"{authorName}/{projectName}";
-        }
-
-        private static string GetSourceFromRepository(Repository repository)
-        {
-            if (repository == null)
-                return null;
-
-            var remote = repository.Network.Remotes.FirstOrDefault();
-            return remote != null ? GetSourceFromUrl(remote.Url) : null;
-        }
-
-        public static bool IsCollection(string modName)
-        {
-            var modPath = GetModPath(modName);
-            if (!Directory.Exists(modPath))
-                modPath = GetCollectionPath(modName);
-            var metadata = GetMetadata(modPath);
-            if (metadata.IsCollection)
-                return true;
-            return false;
-        }
-
-        public static Task MoveToCollection(string modName) => Task.Run(() => Handle(() =>
-        {
-            var modPath = GetModPath(modName);
-            var collectionPath = GetCollectionPath(modName);
-            var authorPath = GetCollectionPath(modName.Split("/")[0]);
-            {
-                if (!Directory.Exists(authorPath))
-                    Directory.CreateDirectory(authorPath);
-                Directory.Move(modPath, collectionPath);
-            }
-        }));
-
-        public static Task MoveFromCollection(string modName) => Task.Run(() => Handle(() =>
-        {
-            var modPath = GetCollectionPath(modName);
-            var metadata = GetMetadata(modPath);
-            if (metadata.Game != null)
-            {
-                var gamePath = GetModsGamePath(modName, metadata.Game);
-                var authorPath = GetModsGamePath(modName.Split("/")[0], metadata.Game);
-                if (!Directory.Exists(authorPath))
-                    Directory.CreateDirectory(authorPath);
-                Directory.Move(modPath, gamePath);
-            }
-            else
-            {
-                ClearOldModsCore(modName);
-                throw new ModMovedWithoutGameException(modName);
-            }
-        }));
-
-        public static Task ClearOldMods(string modName) => Task.Run(() => Handle(() => ClearOldModsCore(modName)));
-
-        private static void ClearOldModsCore(string modName)
-        {
-            foreach (var game in new List<string> { "kh1", "kh2", "bbs", "Recom", "kh3d" })
-            {
-                var modPath = GetModsGamePath(modName, game);
-                if (Directory.Exists(modPath))
-                    CleanModFilesCore(modPath);
-            }
-            var collectionPath = GetCollectionPath(modName);
-            if (Directory.Exists(collectionPath))
-                CleanModFilesCore(collectionPath);
-        }
-
-        public static Task CleanModFiles(string modPath) => Task.Run(() => Handle(() => CleanModFilesCore(modPath)));
-
-        private static void CleanModFilesCore(string modPath)
-        {
-            foreach (var filePath in Directory.GetFiles(modPath, "*", SearchOption.AllDirectories))
-            {
-                var attributes = File.GetAttributes(filePath);
-                if (attributes.HasFlag(FileAttributes.ReadOnly))
-                    File.SetAttributes(filePath, attributes & ~FileAttributes.ReadOnly);
-            }
-            Directory.Delete(modPath, true);
-        }
-
-        public static Metadata GetMetadata(string modPath)
-        {
-            return File.OpenRead(Path.Combine(modPath, ModMetadata)).Using(Metadata.Read);
-        }
-
-        public static IEnumerable<CollectionModModel> GetCollectionOptionalMods(ModModel mod)
-        {
-            var enabledMods = ConfigurationService.EnabledCollectionMods;
-            foreach (var asset in mod.Metadata.Assets)
-            {
-                if (!asset.CollectionOptional)
-                    continue;
-                var enabled = false;
-                if (enabledMods.ContainsKey(mod.Name))
-                {
-                    if (enabledMods[mod.Name].ContainsKey(asset.Name))
-                        enabled = enabledMods[mod.Name][asset.Name];
-                    else
-                        enabledMods[mod.Name][asset.Name] = false;
-                }
-                yield return new CollectionModModel
-                {
-                    Name = asset.Name,
-                    Author = mod.Metadata.OriginalAuthor,
-                    IsEnabled = enabled
-                };
-            }
-            ConfigurationService.EnabledCollectionMods = enabledMods;
-        }
-    }
-}
diff --git a/OpenKh.Tools.ModsManager/Services/OpenkhInstallation.cs b/OpenKh.Tools.ModsManager/Services/OpenkhInstallation.cs
deleted file mode 100644
index 038a287de..000000000
--- a/OpenKh.Tools.ModsManager/Services/OpenkhInstallation.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using System;
-using System.IO;
-
-namespace OpenKh.Tools.ModsManager.Services
-{
-    public static class OpenkhInstallation
-    {
-        private const string ModManagerExecutableName = "OpenKh.Tools.ModsManager.exe";
-
-        public static string Directory => GetDirectory(AppContext.BaseDirectory);
-
-        public static string GetDirectory(string applicationBaseDirectory)
-        {
-            var applicationDirectory = new DirectoryInfo(
-                Path.GetFullPath(applicationBaseDirectory).TrimEnd(
-                    Path.DirectorySeparatorChar,
-                    Path.AltDirectorySeparatorChar
-                )
-            );
-            if (applicationDirectory.Name.Equals("Apps", StringComparison.OrdinalIgnoreCase)
-                && applicationDirectory.Parent != null)
-            {
-                return applicationDirectory.Parent.FullName;
-            }
-
-            var appsDirectory = applicationDirectory.Parent;
-            var installationDirectory = appsDirectory?.Parent;
-            return applicationDirectory.Name.Equals("ModManager", StringComparison.OrdinalIgnoreCase)
-                    && appsDirectory?.Name.Equals("Apps", StringComparison.OrdinalIgnoreCase) == true
-                    && installationDirectory != null
-                ? installationDirectory.FullName
-                : applicationDirectory.FullName;
-        }
-
-        public static string GetModManagerExecutable(string installationDirectory)
-        {
-            var packagedPath = Path.Combine(installationDirectory, "Apps", ModManagerExecutableName);
-            if (File.Exists(packagedPath))
-                return packagedPath;
-
-            var previousPackagedPath = Path.Combine(
-                installationDirectory,
-                "Apps",
-                "ModManager",
-                ModManagerExecutableName
-            );
-
-            return File.Exists(previousPackagedPath)
-                ? previousPackagedPath
-                : Path.Combine(installationDirectory, ModManagerExecutableName);
-        }
-    }
-}
diff --git a/OpenKh.Tools.ModsManager/Services/OpenkhUpdateProceederService.cs b/OpenKh.Tools.ModsManager/Services/OpenkhUpdateProceederService.cs
deleted file mode 100644
index b43c68f46..000000000
--- a/OpenKh.Tools.ModsManager/Services/OpenkhUpdateProceederService.cs
+++ /dev/null
@@ -1,146 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.IO;
-using System.IO.Compression;
-using System.Net.Http;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace OpenKh.Tools.ModsManager.Services
-{
-    public class OpenkhUpdateProceederService
-    {
-        public async Task UpdateAsync(
-            string downloadZipUrl,
-            Action<float> progress,
-            CancellationToken cancellation,
-            string executableToRestart = ""
-        )
-        {
-            var tempId = Guid.NewGuid().ToString("N");
-            var tempZipFile = Path.Combine(Path.GetTempPath(), $"openkh-{tempId}.zip");
-
-            using (var client = new HttpClient())
-            {
-                using (var zipOutput = File.Create(tempZipFile))
-                {
-                    using (var resp = await client.GetAsync(downloadZipUrl, cancellation))
-                    {
-                        var maxLen = resp.Content.Headers.ContentLength;
-                        var zipInput = await resp.Content.ReadAsStreamAsync();
-                        await CopyToAsyncWithProgress(zipInput, zipOutput, maxLen, progress, cancellation);
-                    }
-                }
-            }
-
-            var tempZipDir = Path.Combine(Path.GetTempPath(), $"openkh-{tempId}");
-            Directory.CreateDirectory(tempZipDir);
-
-            using (var zip = ZipFile.OpenRead(tempZipFile))
-            {
-                zip.ExtractToDirectory(tempZipDir);
-            }
-
-            File.Delete(tempZipFile);
-            var tempBatFile = Path.Combine(Path.GetTempPath(), $"openkh-{tempId}.bat");
-
-            var copyFrom = Path.Combine(tempZipDir, "openkh");
-            var copyTo = OpenkhInstallation.Directory;
-            var packagedModManagerExecutable = Path.Combine(
-                copyFrom,
-                "Apps",
-                "OpenKh.Tools.ModsManager.exe"
-            );
-            var previousPackagedModManagerExecutable = Path.Combine(
-                copyFrom,
-                "Apps",
-                "ModManager",
-                "OpenKh.Tools.ModsManager.exe"
-            );
-            var modManagerExecutable = File.Exists(packagedModManagerExecutable)
-                ? Path.Combine(copyTo, "Apps", "OpenKh.Tools.ModsManager.exe")
-                : File.Exists(previousPackagedModManagerExecutable)
-                    ? Path.Combine(copyTo, "Apps", "ModManager", "OpenKh.Tools.ModsManager.exe")
-                    : OpenkhInstallation.GetModManagerExecutable(copyTo);
-            var restartExecutable = string.IsNullOrWhiteSpace(executableToRestart)
-                ? modManagerExecutable
-                : executableToRestart;
-            await CreateBatchFileAsync(
-                tempBatFile: tempBatFile,
-                copyFrom: copyFrom,
-                copyTo: copyTo,
-                processesToStop: new[]
-                {
-                    Path.GetFileName(restartExecutable),
-                    "OpenKh.Launcher.exe",
-                    "OpenKh.Tools.ModsManager.exe",
-                },
-                execAfter: $"start \"\" \"{restartExecutable}\""
-            );
-
-            Process.Start(
-                new ProcessStartInfo(
-                    tempBatFile
-                )
-                {
-                    UseShellExecute = true,
-                }
-            );
-        }
-
-        private async Task CopyToAsyncWithProgress(Stream input, Stream output, long? maxLen, Action<float> progress, CancellationToken cancellation)
-        {
-            byte[] buffer = new byte[8192];
-            var totalTransferred = 0L;
-            while (true)
-            {
-                var read = await input.ReadAsync(buffer, cancellation);
-                if (read <= 0)
-                {
-                    break;
-                }
-                await output.WriteAsync(buffer.AsMemory(0, read), cancellation);
-                totalTransferred += read;
-                if (maxLen != null)
-                {
-                    progress?.Invoke((totalTransferred * 1.0f / maxLen.Value));
-                }
-            }
-        }
-
-        private async Task CreateBatchFileAsync(
-            string tempBatFile,
-            string copyFrom,
-            string copyTo,
-            string[] processesToStop,
-            string execAfter
-        )
-        {
-            var bat = new StringWriter();
-            bat.WriteLine($"chcp 65001");
-            foreach (var processToStop in processesToStop)
-                bat.WriteLine($"taskkill /f /im {EscapeRobocopyArg(processToStop)} >nul 2>&1");
-            bat.WriteLine($"robocopy  {EscapeRobocopyArg(copyFrom)} {EscapeRobocopyArg(copyTo)} /e");
-            bat.WriteLine($"if errorlevel 8 pause");
-            bat.WriteLine($"{execAfter}");
-            bat.WriteLine($"rd /s /q \"{copyFrom}\"");
-            bat.WriteLine($"del %0");
-            await File.WriteAllTextAsync(tempBatFile, bat.ToString(), Encoding.UTF8);
-        }
-
-        private string EscapeRobocopyArg(string arg)
-        {
-            if (0 <= arg.IndexOfAny(new char[] { ' ', '"' }))
-            {
-                var escaped1 = arg.Replace("\"", "\"\"");
-                var escaped2 = escaped1.EndsWith('\\') ? $"{escaped1}\\" : escaped1;
-                return $"\"{escaped2}\"";
-            }
-            else
-            {
-                return arg;
-            }
-        }
-    }
-}
diff --git a/OpenKh.Tools.ModsManager/Services/OperationDispatcher.cs b/OpenKh.Tools.ModsManager/Services/OperationDispatcher.cs
deleted file mode 100644
index 0dff8a9dc..000000000
--- a/OpenKh.Tools.ModsManager/Services/OperationDispatcher.cs
+++ /dev/null
@@ -1,174 +0,0 @@
-using OpenKh.Common;
-using OpenKh.Tools.ModsManager.Interfaces;
-using System;
-using System.Collections.Generic;
-using System.IO;
-
-namespace OpenKh.Tools.ModsManager.Services
-{
-    public class OperationDispatcher : IOperationDispatcher
-    {
-        private static readonly string[] _regionFallback = new[]
-        {
-            "us", "fm", "jp", "uk", "it", "fr", "es", "de"
-        };
-
-        private static readonly HashSet<string> _denyList = new HashSet<string>
-        {
-            // KH1
-            "dkmovie.x",
-            "dktitle.x",
-            "gb.x",
-            "wm.x",
-            "xl_limit.x",
-            "xs_bambi.x",
-            "xs_dh_break.x",
-            "xs_dumbo.x",
-            "xs_genie.x",
-            "xs_mushu.x",
-            "xs_simba.x",
-            "xs_tink.x",
-            // KH2
-            "ovl_title.x",
-            "ovl_shop.x",
-            "ovl_movie.x",
-            "ovl_gumibattle.x",
-            "ovl_gumimenu.x",
-            "ovl_gumimenu.x",
-        };
-
-        public int LoadFile(Stream outStream, string fileName)
-        {
-            int status = GetFinalNamePath(fileName, out var finalFileName);
-            if (status == 0)
-            {
-                Log.Info($"Load file {finalFileName}");
-                return File.OpenRead(finalFileName).Using(x =>
-                {
-                    x.CopyTo(outStream, 512 * 1024);
-                    return (int)x.Length;
-                });
-            }
-            else if (status == -1)
-            {
-                Log.Warn($"File {fileName} is on the deny list, falling back");
-            }
-            else
-            {
-                Log.Warn($"File {fileName} not found, falling back");
-            }
-            return 0;
-        }
-
-        public int GetFileSize(string fileName)
-        {
-            if (GetFinalNamePath(fileName, out var finalFileName) == 0)
-                return (int)new FileInfo(finalFileName).Length;
-
-            return 0;
-        }
-
-        public static bool IsSymbolicLink(string fileName)
-        {
-            if (File.Exists(fileName))
-            {
-                FileAttributes attributes = File.GetAttributes(fileName);
-                return (attributes & FileAttributes.ReparsePoint) == FileAttributes.ReparsePoint;
-            }
-            return false;
-        }
-
-        private static int GetFinalNamePath(string fileName, out string finalFileName)
-        {
-            FileSystemInfo fileInfo;
-            String basePath;
-            do
-            {
-                if (_denyList.Contains(fileName))
-                {
-                    finalFileName = null;
-                    return -1;  // Error Code -1: denied
-                }
-
-                basePath = ConfigurationService.CompiledModPath;
-                finalFileName = Path.Combine(basePath, fileName);
-                if (File.Exists(finalFileName))
-                {
-                    if (IsSymbolicLink(finalFileName))
-                    {
-                        fileInfo = new FileInfo(finalFileName);
-                        fileName = Path.GetRelativePath(basePath, fileInfo.LinkTarget);
-                        continue;
-                    }
-                    return 0;
-                }
-
-                basePath = Path.Combine(ConfigurationService.GameDataLocation, ConfigurationService.LaunchGame);
-                finalFileName = Path.Combine(basePath, fileName);
-                if (File.Exists(finalFileName))
-                {
-                    if (IsSymbolicLink(finalFileName))
-                    {
-                        fileInfo = new FileInfo(finalFileName);
-                        fileName = Path.GetRelativePath(basePath, fileInfo.LinkTarget);
-                        continue;
-                    }
-                    return 0;
-                }
-
-                var region = GetRegion(fileName);
-                if (region == null)
-                    return -2;  // Error Code -2: file not found
-
-                foreach (var fallback in _regionFallback)
-                {
-                    var temptativeRegionalFallbackFileName = fileName
-                        .Replace($"/{region}/", $"/{fallback}/")
-                        .Replace($".a.{region}", $".a.{fallback}")
-                        .Replace($".apdx", $".a.{fallback}");
-                    basePath = ConfigurationService.CompiledModPath;
-                    finalFileName = Path.Combine(basePath, temptativeRegionalFallbackFileName);
-                    if (File.Exists(finalFileName))
-                    {
-                        if (IsSymbolicLink(finalFileName))
-                        {
-                            fileInfo = new FileInfo(finalFileName);
-                            fileName = Path.GetRelativePath(basePath, fileInfo.LinkTarget);
-                            continue;
-                        }
-                        return 0;
-                    }
-
-                    basePath = Path.Combine(ConfigurationService.GameDataLocation, ConfigurationService.LaunchGame);
-                    finalFileName = Path.Combine(basePath, temptativeRegionalFallbackFileName);
-                    if (File.Exists(finalFileName))
-                    {
-                        if (IsSymbolicLink(finalFileName))
-                        {
-                            fileInfo = new FileInfo(finalFileName);
-                            fileName = Path.GetRelativePath(basePath, fileInfo.LinkTarget);
-                            continue;
-                        }
-                        return 0;
-                    }
-                }
-
-                finalFileName = null;
-                return -2;  // Error Code -2: file not found
-
-            } while (true);
-        }
-
-        private static string GetRegion(string fileName)
-        {
-            foreach (var region in Kh2.Constants.Regions)
-            {
-                if (fileName.Contains($"/{region}/") ||
-                    fileName.EndsWith($".a.{region}"))
-                    return region;
-            }
-
-            return null;
-        }
-    }
-}
diff --git a/OpenKh.Tools.ModsManager/Services/ProgressWindowService.cs b/OpenKh.Tools.ModsManager/Services/ProgressWindowService.cs
deleted file mode 100644
index fa0493d00..000000000
--- a/OpenKh.Tools.ModsManager/Services/ProgressWindowService.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-using OpenKh.Tools.ModsManager.Views;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using Xe.Tools.Wpf.Commands;
-
-namespace OpenKh.Tools.ModsManager.Services
-{
-    public class ProgressWindowService
-    {
-        public record ProgressMonitor(
-            Action<string> SetTitle,
-            Action<float> SetProgress,
-            CancellationToken Cancellation
-        );
-
-        public async Task ShowAsync(Func<ProgressMonitor, Task> yourService)
-        {
-            await ShowAsync(
-                async monitor =>
-                {
-                    await yourService(monitor);
-                    return true;
-                }
-            );
-        }
-
-        public async Task<T> ShowAsync<T>(
-            Func<ProgressMonitor, Task<T>> yourService
-        )
-        {
-            Action cancel = () => { };
-            var vm = new WorkInProgressWindow.TViewModel(
-                DialogTitle: "OpenKh",
-                OperationName: "Work in progress",
-                ProgressUnknown: true,
-                ProgressValue: 0f,
-                Cancel: new RelayCommand(
-                    _ =>
-                    {
-                        cancel();
-                    }
-                ),
-                CancelEnabled: true
-            );
-            var window = new WorkInProgressWindow() { ViewModel = vm, };
-            window.Show();
-            var cancelSource = new CancellationTokenSource();
-            var monitor = new ProgressMonitor(
-                SetTitle: title =>
-                {
-                    vm = vm with { OperationName = title, };
-                    window.ViewModel = vm;
-                },
-                SetProgress: rate =>
-                {
-                    vm = vm with { ProgressValue = rate, ProgressUnknown = false, };
-                    window.ViewModel = vm;
-                },
-                Cancellation: cancelSource.Token
-            );
-            cancel = () =>
-            {
-                cancelSource.Cancel();
-                vm = vm with { CancelEnabled = false };
-                window.ViewModel = vm;
-            };
-            try
-            {
-                var result = await yourService(monitor);
-                return result;
-            }
-            finally
-            {
-                window.Close();
-            }
-        }
-
-        public class Agent : IDisposable
-        {
-            public void Dispose()
-            {
-                throw new NotImplementedException();
-            }
-        }
-    }
-}
diff --git a/OpenKh.Tools.ModsManager/Services/QueryApplyPatchService.cs b/OpenKh.Tools.ModsManager/Services/QueryApplyPatchService.cs
deleted file mode 100644
index 89ea615ac..000000000
--- a/OpenKh.Tools.ModsManager/Services/QueryApplyPatchService.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System.Threading.Tasks;
-using System.Windows;
-
-namespace OpenKh.Tools.ModsManager.Services
-{
-    public class QueryApplyPatchService
-    {
-        public async Task<bool> QueryAsync()
-        {
-            var source = new TaskCompletionSource<bool>();
-
-            source.SetResult(MessageBox.Show("Do you apply the result of output file?", "ModsManager", MessageBoxButton.YesNoCancel, MessageBoxImage.Exclamation) == MessageBoxResult.Yes);
-
-            return await source.Task;
-        }
-    }
-}
diff --git a/OpenKh.Tools.ModsManager/Services/RepositoryService.cs b/OpenKh.Tools.ModsManager/Services/RepositoryService.cs
deleted file mode 100644
index c450833cc..000000000
--- a/OpenKh.Tools.ModsManager/Services/RepositoryService.cs
+++ /dev/null
@@ -1,161 +0,0 @@
-using LibGit2Sharp;
-using LibGit2Sharp.Handlers;
-using Newtonsoft.Json;
-using System;
-using System.IO;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
-
-namespace OpenKh.Tools.ModsManager.Services
-{
-    public class RepositoryNotFoundException : Exception
-    {
-        public RepositoryNotFoundException(string repositoryName) :
-            base($"There is no repository under the name of '{repositoryName}' in GitHub. Please be aware that the name is case sensitive.")
-        {
-            RepositoryName = repositoryName;
-        }
-
-        public string RepositoryName { get; }
-    }
-
-    public static class RepositoryService
-    {
-        private class ReposResponse
-        {
-            [JsonProperty("default_branch")]
-            public string DefaultBranch { get; set; }
-        }
-
-        public static async Task<string> GetMainBranchFromRepository(string repositoryName)
-        {
-            using var client = new HttpClient();
-            using var request = new HttpRequestMessage(HttpMethod.Get, $"https://api.github.com/repos/{repositoryName}");
-            request.Headers.UserAgent.TryParseAdd("OpenKH Mods Manager/1.0");
-            using var response = await client.SendAsync(request);
-            if (response.StatusCode != HttpStatusCode.OK)
-                throw new RepositoryNotFoundException(repositoryName);
-
-            return JsonConvert.DeserializeObject<ReposResponse>(await response.Content.ReadAsStringAsync())?.DefaultBranch;
-        }
-
-        public static Task<bool> IsFileExists(string repoName, string branch, string filePath, Action<string> progressOutput = null, Action<float> progressNumber = null, string platformUrl = null)
-        {                                                                                      
-            if (!string.IsNullOrEmpty(platformUrl))
-            {
-                var _fetchBaseUri = new Uri(platformUrl.Contains("http") ? platformUrl : "https://" + platformUrl);
-                var _fetchRelativeUri = new Uri(_fetchBaseUri, $"{repoName}");
-
-                var _fetchRepoParent = $"gitfetch";
-                var _fetchRepoDirectory = $"gitfetch/{repoName}/{branch}";
-
-                var _cloneOptions = new CloneOptions
-                {
-                    Checkout = false,
-                    IsBare = true,
-                    BranchName = branch,
-                };
-
-                _cloneOptions.FetchOptions.Depth = 1;
-                _cloneOptions.FetchOptions.Prune = true;
-
-                _cloneOptions.FetchOptions.OnTransferProgress = new TransferProgressHandler((progress) =>
-                {
-                    progressOutput.Invoke($"Checking if Git is a Mod: {progress.ReceivedObjects} / {progress.TotalObjects}");
-                    progressNumber.Invoke((float)progress.ReceivedObjects / (float)progress.TotalObjects);
-
-                    return true;
-                });
-
-                Repository.Clone(_fetchRelativeUri.ToString(), _fetchRepoDirectory, _cloneOptions);
-                var _fetchRepository = new Repository(_fetchRepoDirectory);
-
-                var _fetchCommit = _fetchRepository.Head.Tip;
-                var _doesModFileExist = _fetchCommit["mod.yml"] != null;
-
-                _fetchRepository.Dispose();
-
-                if (Directory.Exists(_fetchRepoParent))
-                {
-                    var _fetchAllFiles = Directory.GetFiles(_fetchRepoParent, "*", SearchOption.AllDirectories);
-                    var _fetchAllDirectories = Directory.GetDirectories(_fetchRepoParent, "*", SearchOption.AllDirectories);
-
-                    foreach (var _fetchFile in _fetchAllFiles)
-                        File.SetAttributes(_fetchFile, FileAttributes.Normal);
-
-                    foreach (string _fetchDirectory in _fetchAllDirectories)
-                        File.SetAttributes(_fetchDirectory, FileAttributes.Normal);
-
-                    Directory.Delete(_fetchRepoParent, true);
-                }
-
-                return Task.FromResult(_doesModFileExist);
-            }
-
-            else
-                return IsFileExists($"https://raw.githubusercontent.com/{repoName}/{branch}/{filePath}");
-        }
-
-        public static async Task<bool> IsFileExists(string url)
-        {
-            using var client = new HttpClient();
-            using var response = await client.GetAsync(url, HttpCompletionOption.ResponseHeadersRead);
-            return response.StatusCode == HttpStatusCode.OK;
-        }
-
-        public static Task<int> FetchUpdate(string path) => Task.Run(() =>
-        {
-            if (!Repository.IsValid(path))
-                return -1;
-
-            using var repository = new Repository(path);
-            if (repository.Info.IsHeadDetached)
-                return -1;
-
-            Fetch(repository);
-            return repository.Head.TrackingDetails.BehindBy ?? 0;
-        });
-
-        public static Task FetchAndResetUponOrigin(string path,
-            Action<string> progressOutput = null,
-            Action<float> progressNumber = null) => Task.Run(() =>
-        {
-            if (!Repository.IsValid(path))
-                return;
-
-            using var repository = new Repository(path);
-            if (repository.Info.IsHeadDetached)
-                return;
-
-            Fetch(repository);
-            repository.Reset(ResetMode.Hard, repository.Head.TrackedBranch.Tip, new CheckoutOptions
-            {
-                CheckoutModifiers = CheckoutModifiers.Force,
-                CheckoutNotifyFlags = CheckoutNotifyFlags.None,
-                OnCheckoutProgress = (string path, int completedSteps, int totalSteps) =>
-                {
-                    progressOutput?.Invoke(path);
-                    var nProgress = (float)completedSteps / totalSteps;
-                    progressNumber?.Invoke(nProgress);
-                }
-            });
-        });
-
-        private static void Fetch(Repository repository)
-        {
-            if (string.IsNullOrEmpty(repository.Head.RemoteName))
-                return;
-
-            try
-            {
-                repository.Network.Fetch(repository.Head.RemoteName, new string[0]);
-            }
-            catch
-            {
-
-            }
-        }
-    }
-}
diff --git a/OpenKh.Tools.ModsManager/Services/SettingBinding.cs b/OpenKh.Tools.ModsManager/Services/SettingBinding.cs
deleted file mode 100644
index 8b51777f3..000000000
--- a/OpenKh.Tools.ModsManager/Services/SettingBinding.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System.Windows.Data;
-
-namespace OpenKh.Tools.ModsManager.Services
-{
-    public class SettingBinding : Binding
-    {
-        public SettingBinding()
-        {
-            Initialize();
-        }
-
-        public SettingBinding(string path)
-            : base(path)
-        {
-            Initialize();
-        }
-
-        private void Initialize()
-        {
-            this.Source = WinSettings.Default;
-            this.Mode = BindingMode.TwoWay;
-        }
-    }
-}
diff --git a/OpenKh.Tools.ModsManager/Services/WizardPageStackService.cs b/OpenKh.Tools.ModsManager/Services/WizardPageStackService.cs
deleted file mode 100644
index 615d4dff0..000000000
--- a/OpenKh.Tools.ModsManager/Services/WizardPageStackService.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using System.Collections.Generic;
-using System.Windows;
-using Xceed.Wpf.Toolkit;
-
-namespace OpenKh.Tools.ModsManager.Services
-{
-    public class WizardPageStackService : DependencyObject
-    {
-        public static readonly DependencyProperty BackProperty = DependencyProperty.Register(
-            "Back",
-            typeof(WizardPage),
-            typeof(WizardPageStackService),
-            new PropertyMetadata(null)
-        );
-
-        private readonly List<WizardPage> _pages = new List<WizardPage>();
-
-        public WizardPage Back
-        {
-            get => (WizardPage)GetValue(BackProperty);
-            set => SetValue(BackProperty, value);
-        }
-
-        internal void OnPageChanged(WizardPage page)
-        {
-            int found = _pages.IndexOf(page);
-            if (found != -1)
-            {
-                _pages.RemoveRange(found + 1, _pages.Count - (found + 1));
-            }
-            else
-            {
-                _pages.Add(page);
-            }
-
-            Back = (_pages.Count <= 1) ? null : _pages[_pages.Count - 2];
-        }
-    }
-}
diff --git a/OpenKh.Tools.ModsManager/Services/YamlGeneratorService.cs b/OpenKh.Tools.ModsManager/Services/YamlGeneratorService.cs
deleted file mode 100644
index dc2d7eae0..000000000
--- a/OpenKh.Tools.ModsManager/Services/YamlGeneratorService.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-using OpenKh.Patcher;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace OpenKh.Tools.ModsManager.Services
-{
-    public class YamlGeneratorService
-    {
-        /// <returns>Return final yml blob if it is good to save. Otherwise return `null` if it is not fit to save.</returns>
-        public delegate Task<byte[]> GetDiffAsyncDelegate(byte[] rawInput, byte[] rawOutput);
-
-        public async Task RefillAssetFilesAsync(
-            List<AssetFile> assetFiles,
-            string sourceDir
-        )
-        {
-            string NormalizePath(string path) => path?.Replace('\\', '/');
-
-            IEnumerable<AssetFile> EnumerateAllSources(IEnumerable<AssetFile> list)
-            {
-                if (list != null)
-                {
-                    foreach (var one in list)
-                    {
-                        yield return one;
-
-                        foreach (var child in EnumerateAllSources(one.Source))
-                        {
-                            yield return child;
-                        }
-                    }
-                }
-            }
-
-            foreach (var asset in EnumerateAllSources(assetFiles))
-            {
-                asset.Name = NormalizePath(asset.Name);
-            }
-
-            var assets = new List<AssetFile>();
-
-            foreach (var subDir in "anm ard bgm dbg effect event field2d file gumibattle gumiblock gumimenu itempic libretto limit magic map menu minigame msg msn npack obj se vagstream voice remastered".Split(' '))
-            {
-                var firstDirPath = Path.Combine(sourceDir, subDir);
-                if (Directory.Exists(firstDirPath))
-                {
-                    assets.AddRange(
-                        Directory.EnumerateFiles(firstDirPath, "*", SearchOption.AllDirectories)
-                            .Select(
-                                filePath =>
-                                {
-                                    var relativePath = Path.GetRelativePath(sourceDir, filePath).Replace('\\', '/');
-                                    return new AssetFile
-                                    {
-                                        Name = relativePath,
-                                        Method = "copy",
-                                        Source = new List<AssetFile>(
-                                            new AssetFile[]
-                                            {
-                                                new AssetFile
-                                                {
-                                                    Name = relativePath,
-                                                }
-                                            }
-                                        ),
-                                    };
-                                }
-                            )
-                    );
-                }
-            }
-
-            foreach (var asset in assets)
-            {
-                if (!EnumerateAllSources(assetFiles).Any(it => it.Name == asset.Name))
-                {
-                    assetFiles.Add(asset);
-                }
-            }
-        }
-    }
-}
diff --git a/OpenKh.Tools.ModsManager/Styles/MonoStyleCheckBox.xaml b/OpenKh.Tools.ModsManager/Styles/MonoStyleCheckBox.xaml
deleted file mode 100644
index 2c23bc624..000000000
--- a/OpenKh.Tools.ModsManager/Styles/MonoStyleCheckBox.xaml
+++ /dev/null
@@ -1,130 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <Style TargetType="{x:Type CheckBox}">
-        <Setter Property="SnapsToDevicePixels"
-                Value="true" />
-        <Setter Property="OverridesDefaultStyle"
-                Value="true" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type CheckBox}">
-                    <BulletDecorator Background="Transparent">
-                        <BulletDecorator.Bullet>
-                            <Border x:Name="Border"
-                                    Width="13"
-                                    Height="13"
-                                    BorderBrush="{TemplateBinding Foreground}"
-                                    CornerRadius="0"
-                                    BorderThickness="1">
-                                <Grid>
-                                    <Path Visibility="Collapsed"
-                                          Width="7"
-                                          Height="7"
-                                          x:Name="CheckMark"
-                                          SnapsToDevicePixels="False"
-                                          StrokeThickness="2"
-                                          Stroke="{TemplateBinding Foreground}"
-                                          Data="M 0 0 L 7 7 M 0 7 L 7 0">
-                                    </Path>
-                                    <Path Visibility="Collapsed"
-                                          Width="7"
-                                          Height="7"
-                                          x:Name="InderminateMark"
-                                          SnapsToDevicePixels="False"
-                                          StrokeThickness="2"
-                                          Stroke="{TemplateBinding Foreground}"
-                                          Data="M 0 7 L 7 0">
-                                    </Path>
-                                </Grid>
-                            </Border>
-                        </BulletDecorator.Bullet>
-                        <VisualStateManager.VisualStateGroups>
-                            <VisualStateGroup x:Name="CommonStates">
-                                <VisualState x:Name="Normal" />
-                                <VisualState x:Name="MouseOver">
-                                    <Storyboard>
-                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="Border"
-                                                                       Storyboard.TargetProperty="Opacity">
-                                            <EasingDoubleKeyFrame KeyTime="0"
-                                                                  Value="0.7" />
-                                        </DoubleAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="Pressed">
-                                    <Storyboard>
-                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="Border"
-                                                                       Storyboard.TargetProperty="Opacity">
-                                            <EasingDoubleKeyFrame KeyTime="0"
-                                                                  Value="0.6" />
-                                        </DoubleAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(Border.Background)"
-                                                                       Storyboard.TargetName="Border">
-                                            <DiscreteObjectKeyFrame KeyTime="0">
-                                                <DiscreteObjectKeyFrame.Value>
-                                                    <SolidColorBrush Color="LightGray" />
-                                                </DiscreteObjectKeyFrame.Value>
-                                            </DiscreteObjectKeyFrame>
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="Disabled">
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(Border.Background)"
-                                                                       Storyboard.TargetName="Border">
-                                            <DiscreteObjectKeyFrame KeyTime="0">
-                                                <DiscreteObjectKeyFrame.Value>
-                                                    <SolidColorBrush Color="LightGray" />
-                                                </DiscreteObjectKeyFrame.Value>
-                                            </DiscreteObjectKeyFrame>
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(Path.Stroke)"
-                                                                       Storyboard.TargetName="CheckMark">
-                                            <DiscreteObjectKeyFrame KeyTime="0">
-                                                <DiscreteObjectKeyFrame.Value>
-                                                    <SolidColorBrush Color="Black" />
-                                                </DiscreteObjectKeyFrame.Value>
-                                            </DiscreteObjectKeyFrame>
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(Path.Stroke)"
-                                                                       Storyboard.TargetName="InderminateMark">
-                                            <DiscreteObjectKeyFrame KeyTime="0">
-                                                <DiscreteObjectKeyFrame.Value>
-                                                    <SolidColorBrush Color="Black" />
-                                                </DiscreteObjectKeyFrame.Value>
-                                            </DiscreteObjectKeyFrame>
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                            </VisualStateGroup>
-                            <VisualStateGroup x:Name="CheckStates">
-                                <VisualState x:Name="Checked">
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Visibility)"
-                                                                       Storyboard.TargetName="CheckMark">
-                                            <DiscreteObjectKeyFrame KeyTime="0"
-                                                                    Value="{x:Static Visibility.Visible}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="Unchecked" />
-                                <VisualState x:Name="Indeterminate">
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Visibility)"
-                                                                       Storyboard.TargetName="InderminateMark">
-                                            <DiscreteObjectKeyFrame KeyTime="0"
-                                                                    Value="{x:Static Visibility.Visible}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                            </VisualStateGroup>
-                        </VisualStateManager.VisualStateGroups>
-                        <ContentPresenter Margin="4,0,0,0"
-                                          VerticalAlignment="Center"
-                                          HorizontalAlignment="Left"
-                                          RecognizesAccessKey="True" />
-                    </BulletDecorator>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-</ResourceDictionary>
diff --git a/OpenKh.Tools.ModsManager/UserControls/FolderSelectorControl.xaml b/OpenKh.Tools.ModsManager/UserControls/FolderSelectorControl.xaml
deleted file mode 100644
index 8f762f48f..000000000
--- a/OpenKh.Tools.ModsManager/UserControls/FolderSelectorControl.xaml
+++ /dev/null
@@ -1,20 +0,0 @@
-<UserControl x:Class="OpenKh.Tools.ModsManager.UserControls.FolderSelectorControl"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:local="clr-namespace:OpenKh.Tools.ModsManager.UserControls"
-             mc:Ignorable="d"
-             d:DesignHeight="20" d:DesignWidth="200"
-             x:Name="_self">
-    <Grid>
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="*"/>
-            <ColumnDefinition Width="20"/>
-        </Grid.ColumnDefinitions>
-        <TextBox Grid.Column="0" Text="{Binding FolderPath, ElementName=_self, UpdateSourceTrigger=PropertyChanged}"/>
-        <Button Grid.Column="1" Click="Button_Click">
-            <Image Source="{StaticResource FolderOpen_16x}"/>
-        </Button>
-    </Grid>
-</UserControl>
diff --git a/OpenKh.Tools.ModsManager/UserControls/FolderSelectorControl.xaml.cs b/OpenKh.Tools.ModsManager/UserControls/FolderSelectorControl.xaml.cs
deleted file mode 100644
index caeaac809..000000000
--- a/OpenKh.Tools.ModsManager/UserControls/FolderSelectorControl.xaml.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using System.Windows;
-using System.Windows.Controls;
-using Xe.Tools.Wpf.Dialogs;
-
-namespace OpenKh.Tools.ModsManager.UserControls
-{
-    /// <summary>
-    /// Interaction logic for FolderSelectorControl.xaml
-    /// </summary>
-    public partial class FolderSelectorControl : UserControl
-    {
-        public FolderSelectorControl()
-        {
-            InitializeComponent();
-        }
-
-        public static readonly DependencyProperty FolderPathProperty = DependencyProperty.Register(
-            nameof(FolderPath),
-            typeof(string),
-            typeof(FolderSelectorControl),
-            new PropertyMetadata(string.Empty)
-        );
-
-        public string FolderPath
-        {
-            get => (string)GetValue(FolderPathProperty);
-            set => SetValue(FolderPathProperty, value);
-        }
-
-        private void Button_Click(object sender, RoutedEventArgs e)
-        {
-            FileDialog.OnFolder(
-                path => FolderPath = path,
-                FolderPath,
-                Window.GetWindow(this)
-            );
-        }
-    }
-}
diff --git a/OpenKh.Tools.ModsManager/UserControls/SaveFileSelectorControl.xaml b/OpenKh.Tools.ModsManager/UserControls/SaveFileSelectorControl.xaml
deleted file mode 100644
index 581648231..000000000
--- a/OpenKh.Tools.ModsManager/UserControls/SaveFileSelectorControl.xaml
+++ /dev/null
@@ -1,20 +0,0 @@
-<UserControl x:Class="OpenKh.Tools.ModsManager.UserControls.SaveFileSelectorControl"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:local="clr-namespace:OpenKh.Tools.ModsManager.UserControls"
-             mc:Ignorable="d"
-             d:DesignHeight="20" d:DesignWidth="200"
-             x:Name="_self">
-    <Grid>
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="*"/>
-            <ColumnDefinition Width="20"/>
-        </Grid.ColumnDefinitions>
-        <TextBox Grid.Column="0" Text="{Binding FilePath, ElementName=_self, UpdateSourceTrigger=PropertyChanged}"/>
-        <Button Grid.Column="1" Click="Button_Click">
-            <Image Source="{StaticResource FolderOpen_16x}"/>
-        </Button>
-    </Grid>
-</UserControl>
diff --git a/OpenKh.Tools.ModsManager/UserControls/SaveFileSelectorControl.xaml.cs b/OpenKh.Tools.ModsManager/UserControls/SaveFileSelectorControl.xaml.cs
deleted file mode 100644
index 501fe53a3..000000000
--- a/OpenKh.Tools.ModsManager/UserControls/SaveFileSelectorControl.xaml.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Windows;
-using System.Windows.Controls;
-using Xe.Tools.Wpf.Dialogs;
-
-namespace OpenKh.Tools.ModsManager.UserControls
-{
-    /// <summary>
-    /// Interaction logic for SaveFileSelectorControl.xaml
-    /// </summary>
-    public partial class SaveFileSelectorControl : UserControl
-    {
-        public SaveFileSelectorControl()
-        {
-            InitializeComponent();
-        }
-
-        public static readonly DependencyProperty FilePathProperty = DependencyProperty.Register(
-            nameof(FilePath),
-            typeof(string),
-            typeof(SaveFileSelectorControl),
-            new PropertyMetadata(string.Empty)
-        );
-
-        public string FilePath
-        {
-            get => (string)GetValue(FilePathProperty);
-            set => SetValue(FilePathProperty, value);
-        }
-
-        public static readonly DependencyProperty FilterProperty = DependencyProperty.Register(
-            nameof(Filter),
-            typeof(string),
-            typeof(SaveFileSelectorControl),
-            new PropertyMetadata(string.Empty)
-        );
-
-        public string Filter
-        {
-            get => (string)GetValue(FilterProperty);
-            set => SetValue(FilterProperty, value);
-        }
-
-        private void Button_Click(object sender, RoutedEventArgs e)
-        {
-            IEnumerable<FileDialogFilter> filters =
-                (Filter.Length != 0)
-                    ? Filter.Split('|')
-                        .Chunk(2)
-                        .Select(pair => FileDialogFilter.ByPatterns(pair[0], pair[1].Split(';').AsEnumerable()))
-                        .ToArray()
-                    : null;
-
-            FileDialog.OnSave(
-                path => FilePath = path,
-                filters,
-                FilePath,
-                Window.GetWindow(this)
-            );
-        }
-    }
-}
diff --git a/OpenKh.Tools.ModsManager/UserControls/TaskStatusByIconControl.xaml b/OpenKh.Tools.ModsManager/UserControls/TaskStatusByIconControl.xaml
deleted file mode 100644
index 1b682e478..000000000
--- a/OpenKh.Tools.ModsManager/UserControls/TaskStatusByIconControl.xaml
+++ /dev/null
@@ -1,10 +0,0 @@
-<UserControl x:Class="OpenKh.Tools.ModsManager.UserControls.TaskStatusByIconControl"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:local="clr-namespace:OpenKh.Tools.ModsManager.UserControls"
-             mc:Ignorable="d"
-             d:DesignHeight="32" d:DesignWidth="32">
-    <Image Name="_icon" />
-</UserControl>
diff --git a/OpenKh.Tools.ModsManager/UserControls/TaskStatusByIconControl.xaml.cs b/OpenKh.Tools.ModsManager/UserControls/TaskStatusByIconControl.xaml.cs
deleted file mode 100644
index 8f4c663dd..000000000
--- a/OpenKh.Tools.ModsManager/UserControls/TaskStatusByIconControl.xaml.cs
+++ /dev/null
@@ -1,152 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Media;
-
-namespace OpenKh.Tools.ModsManager.UserControls
-{
-    /// <summary>
-    /// Interaction logic for TaskStatusByIconControl.xaml
-    /// </summary>
-    public partial class TaskStatusByIconControl : UserControl
-    {
-        private DependencyProperty _state = ReadyIconProperty;
-
-        private static void IconPropertyChangedCallback(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ((TaskStatusByIconControl)d).IconPropertyChangedCallback(e.Property);
-        }
-
-        private void IconPropertyChangedCallback(DependencyProperty property)
-        {
-            if (ReferenceEquals(_state, property))
-            {
-                _icon.Source = (ImageSource)GetValue(property);
-            }
-        }
-
-        #region ReadyIcon Property
-        public ImageSource ReadyIcon
-        {
-            get => (ImageSource)GetValue(ReadyIconProperty);
-            set => SetValue(ReadyIconProperty, value);
-        }
-
-        public static readonly DependencyProperty ReadyIconProperty = DependencyProperty.Register(
-            nameof(ReadyIcon),
-            typeof(ImageSource),
-            typeof(TaskStatusByIconControl),
-            new PropertyMetadata(null, IconPropertyChangedCallback)
-        );
-
-        #endregion
-
-        #region InProgressIcon Property
-        public ImageSource InProgressIcon
-        {
-            get => (ImageSource)GetValue(InProgressIconProperty);
-            set => SetValue(InProgressIconProperty, value);
-        }
-
-        public static readonly DependencyProperty InProgressIconProperty = DependencyProperty.Register(
-            nameof(InProgressIcon),
-            typeof(ImageSource),
-            typeof(TaskStatusByIconControl),
-            new PropertyMetadata(null, IconPropertyChangedCallback)
-        );
-        #endregion
-
-        #region SuccessfulIcon Property
-        public ImageSource SuccessfulIcon
-        {
-            get => (ImageSource)GetValue(SuccessfulIconProperty);
-            set => SetValue(SuccessfulIconProperty, value);
-        }
-
-        public static readonly DependencyProperty SuccessfulIconProperty = DependencyProperty.Register(
-            nameof(SuccessfulIcon),
-            typeof(ImageSource),
-            typeof(TaskStatusByIconControl),
-            new PropertyMetadata(null, IconPropertyChangedCallback)
-        );
-        #endregion
-
-        #region FailureIcon Property
-        public ImageSource FailureIcon
-        {
-            get => (ImageSource)GetValue(FailureIconProperty);
-            set => SetValue(FailureIconProperty, value);
-        }
-
-        public static readonly DependencyProperty FailureIconProperty = DependencyProperty.Register(
-            nameof(FailureIcon),
-            typeof(ImageSource),
-            typeof(TaskStatusByIconControl),
-            new PropertyMetadata(null, IconPropertyChangedCallback)
-        );
-        #endregion
-
-        #region Task Property
-        public Task Task
-        {
-            get => (Task)GetValue(TaskProperty);
-            set => SetValue(TaskProperty, value);
-        }
-
-        public static readonly DependencyProperty TaskProperty = DependencyProperty.Register(
-            nameof(Task),
-            typeof(Task),
-            typeof(TaskStatusByIconControl),
-            new PropertyMetadata(null, TaskPropertyChangedCallback)
-        );
-
-        private static void TaskPropertyChangedCallback(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ((TaskStatusByIconControl)d).TaskPropertyChangedCallback((Task)e.NewValue);
-        }
-
-        private void TaskPropertyChangedCallback(Task value)
-        {
-            _icon.ToolTip = "";
-
-            if (value == null)
-            {
-                IconPropertyChangedCallback(_state = ReadyIconProperty);
-            }
-            else
-            {
-                async void AwaitAsync(Task task)
-                {
-                    try
-                    {
-                        IconPropertyChangedCallback(_state = InProgressIconProperty);
-
-                        await task;
-
-                        if (ReferenceEquals(task, Task))
-                        {
-                            IconPropertyChangedCallback(_state = SuccessfulIconProperty);
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        if (ReferenceEquals(task, Task))
-                        {
-                            IconPropertyChangedCallback(_state = FailureIconProperty);
-                            _icon.ToolTip = ex + "";
-                        }
-                    }
-                }
-
-                AwaitAsync(value);
-            }
-        }
-        #endregion
-
-        public TaskStatusByIconControl()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/OpenKh.Tools.ModsManager/UserControls/TaskStatusObserverControl.xaml b/OpenKh.Tools.ModsManager/UserControls/TaskStatusObserverControl.xaml
deleted file mode 100644
index c62e48fda..000000000
--- a/OpenKh.Tools.ModsManager/UserControls/TaskStatusObserverControl.xaml
+++ /dev/null
@@ -1,10 +0,0 @@
-<UserControl x:Class="OpenKh.Tools.ModsManager.UserControls.TaskStatusObserverControl"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:local="clr-namespace:OpenKh.Tools.ModsManager.UserControls"
-             mc:Ignorable="d"
-             d:DesignHeight="15" d:DesignWidth="100">
-    <TextBlock Text="(Task result here)" Name="_label" />
-</UserControl>
diff --git a/OpenKh.Tools.ModsManager/UserControls/TaskStatusObserverControl.xaml.cs b/OpenKh.Tools.ModsManager/UserControls/TaskStatusObserverControl.xaml.cs
deleted file mode 100644
index 13f80dc9a..000000000
--- a/OpenKh.Tools.ModsManager/UserControls/TaskStatusObserverControl.xaml.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-
-namespace OpenKh.Tools.ModsManager.UserControls
-{
-    /// <summary>
-    /// Interaction logic for TaskStatusObserverControl.xaml
-    /// </summary>
-    public partial class TaskStatusObserverControl : UserControl
-    {
-        public static readonly DependencyProperty TaskProperty = DependencyProperty.Register(
-            nameof(Task),
-            typeof(Task),
-            typeof(TaskStatusObserverControl),
-            new PropertyMetadata(null, TaskPropertyChangedCallback)
-        );
-
-        private static void TaskPropertyChangedCallback(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ((TaskStatusObserverControl)d).TaskPropertyChangedCallback((Task)e.NewValue);
-        }
-
-        private void TaskPropertyChangedCallback(Task value)
-        {
-            if (value == null)
-            {
-                _label.Text = "(Task result here)";
-            }
-            else
-            {
-                async void AwaitAsync(Task task)
-                {
-                    try
-                    {
-                        _label.Text = "(Awaiting task result)";
-
-                        await task;
-
-                        if (ReferenceEquals(task, Task))
-                        {
-                            _label.Text = $"Done on {DateTime.Now}";
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        if (ReferenceEquals(task, Task))
-                        {
-                            _label.Text = $"Error: {ex.Message}";
-                            _label.ToolTip = ex + "";
-                        }
-                    }
-                }
-
-                AwaitAsync(value);
-            }
-        }
-
-        public Task Task
-        {
-            get => (Task)GetValue(TaskProperty);
-            set
-            {
-                SetValue(TaskProperty, value);
-            }
-        }
-
-        public TaskStatusObserverControl()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/OpenKh.Tools.ModsManager/ViewModels/CollectionSettingsViewModel.cs b/OpenKh.Tools.ModsManager/ViewModels/CollectionSettingsViewModel.cs
deleted file mode 100644
index 601c68393..000000000
--- a/OpenKh.Tools.ModsManager/ViewModels/CollectionSettingsViewModel.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using OpenKh.Tools.ModsManager.Models;
-using OpenKh.Tools.ModsManager.Services;
-using Xe.Tools;
-
-namespace OpenKh.Tools.ModsManager.ViewModels
-{
-    public class CollectionSettingsViewModel : BaseNotifyPropertyChanged
-    {
-        public ColorThemeService ColorTheme => ColorThemeService.Instance;
-        private readonly CollectionModModel _model;
-        private readonly IChangeCollectionModEnableState _changeModEnableState;
-        public CollectionSettingsViewModel(CollectionModModel model, IChangeCollectionModEnableState changeModEnableState)
-        {
-            _model = model;
-            _changeModEnableState = changeModEnableState;
-        }
-        public string Name => _model.Name;
-        public string Author => _model.Author;
-        public bool Enabled
-        {
-            get => _model.IsEnabled;
-            set
-            {
-                _model.IsEnabled = value;
-                _changeModEnableState.CollectionModEnableStateChanged();
-                OnPropertyChanged();
-            }
-        }
-
-    }
-}
diff --git a/OpenKh.Tools.ModsManager/ViewModels/DownloadableModViewModel.cs b/OpenKh.Tools.ModsManager/ViewModels/DownloadableModViewModel.cs
deleted file mode 100644
index 8c6217d4f..000000000
--- a/OpenKh.Tools.ModsManager/ViewModels/DownloadableModViewModel.cs
+++ /dev/null
@@ -1,101 +0,0 @@
-using OpenKh.Tools.Common.Wpf;
-using OpenKh.Tools.ModsManager.Models;
-using OpenKh.Tools.ModsManager.Services;
-using OpenKh.Tools.ModsManager.Views;
-using System;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Input;
-using System.Windows.Media.Imaging;
-using Xe.Tools;
-using Xe.Tools.Wpf.Commands;
-
-namespace OpenKh.Tools.ModsManager.ViewModels
-{
-    public class DownloadableModViewModel : BaseNotifyPropertyChanged
-    {
-        private readonly DownloadableModModel _model;
-        private bool _isInstalling;
-
-        // Event to notify when mod installation is complete
-        public event Action<DownloadableModViewModel> ModInstalled;
-
-        public DownloadableModViewModel(DownloadableModModel model)
-        {
-            _model = model;
-            InstallCommand = new RelayCommand(_ => InstallMod(), _ => !IsInstalling);
-        }
-
-        public string Repo => _model.Repo;
-        public string Title => _model.Title;
-        public string Author => _model.OriginalAuthor;
-        public string Description => _model.Description;
-        public string Game => _model.Game;
-        public BitmapImage IconImage => _model.IconImage;
-        public BitmapImage ScreenshotImage => _model.ScreenshotImageSource;
-        public string RepoUrl => $"https://github.com/{_model.Repo}";
-
-        public ICommand InstallCommand { get; }
-
-        public bool IsInstalling
-        {
-            get => _isInstalling;
-            set
-            {
-                _isInstalling = value;
-                OnPropertyChanged();
-                CommandManager.InvalidateRequerySuggested();
-            }
-        }
-
-        private async void InstallMod()
-        {
-            if (IsInstalling)
-                return;
-
-            IsInstalling = true;
-            InstallModProgressWindow progressWindow = null;
-            try
-            {
-                // Create and show the progress window
-                progressWindow = Application.Current.Dispatcher.Invoke(() =>
-                {
-                    var window = new InstallModProgressWindow
-                    {
-                        ModName = Repo,
-                        ProgressText = "Initializing",
-                        ShowActivated = true
-                    };
-                    window.Show();
-                    return window;
-                });
-
-                // Install mod with progress updates
-                await Task.Run(() => ModsService.InstallModFromGit(Repo,
-                    progress => {
-                        Application.Current.Dispatcher.Invoke(() => progressWindow.ProgressText = progress);
-                    },
-                    nProgress => {
-                        Application.Current.Dispatcher.Invoke(() => progressWindow.ProgressValue = nProgress);
-                    }
-                ));
-
-                // Notify that the mod was successfully installed
-                ModInstalled?.Invoke(this);
-            }
-            catch (Exception ex)
-            {
-                System.Windows.MessageBox.Show(
-                    $"Error installing mod {Title}: {ex.Message}",
-                    "Error",
-                    System.Windows.MessageBoxButton.OK,
-                    System.Windows.MessageBoxImage.Error);
-            }
-            finally
-            {
-                Application.Current.Dispatcher.Invoke(() => progressWindow?.Close());
-                IsInstalling = false;
-            }
-        }
-    }
-}
diff --git a/OpenKh.Tools.ModsManager/ViewModels/MainViewModel.cs b/OpenKh.Tools.ModsManager/ViewModels/MainViewModel.cs
deleted file mode 100644
index 4b0d923e3..000000000
--- a/OpenKh.Tools.ModsManager/ViewModels/MainViewModel.cs
+++ /dev/null
@@ -1,1649 +0,0 @@
-using OpenKh.Common;
-using OpenKh.Tools.Common.Wpf;
-using OpenKh.Tools.ModsManager.Models;
-using OpenKh.Tools.ModsManager.Services;
-using OpenKh.Tools.ModsManager.Views;
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Input;
-using Xe.Tools;
-using Xe.Tools.Wpf.Commands;
-using static OpenKh.Tools.ModsManager.Helpers;
-
-namespace OpenKh.Tools.ModsManager.ViewModels
-{
-    public interface IChangeModEnableState
-    {
-        void ModEnableStateChanged();
-    }
-
-    public class MainViewModel : BaseNotifyPropertyChanged, IChangeModEnableState
-    {
-        public ColorThemeService ColorTheme => ColorThemeService.Instance;
-        private static Version _version = Assembly.GetEntryAssembly()?.GetName()?.Version;
-        private static string ApplicationName = Utilities.GetApplicationName();
-        private static string ApplicationVersion = Utilities.GetApplicationVersion();
-        private Window Window => Application.Current.Windows.OfType<Window>().FirstOrDefault(x => x.IsActive);
-        private GetActiveWindowService _getActiveWindowService = new GetActiveWindowService();
-
-        private DebuggingWindow _debuggingWindow = new DebuggingWindow();
-        private ModViewModel _selectedValue;
-        private Pcsx2Injector _pcsx2Injector;
-        private Process _runningProcess;
-        private bool _isBuilding;
-        private bool _pc;
-        private bool _pcsx2;
-        private bool _panaceaInstalled;
-        private bool _panaceaConsoleEnabled;
-        private bool _panaceaDebugLogEnabled;
-        private bool _panaceaSoundDebugEnabled;
-        private bool _panaceaCacheEnabled;
-        private bool _panaceaQuickMenuEnabled;
-        private bool _enablePatching;
-        private bool _autoUpdateMods = false;
-        private string _launchGame = "kh2";
-        private List<string> _supportedGames = new List<string>()
-        {
-            "kh2",
-            "kh1",
-            "bbs",
-            "Recom",
-            "kh3d"
-        };
-        private List<string> _supportedPCSX2Games = new List<string>()
-        {
-            "kh2",
-            "kh1",
-            "Recom"
-        };
-        private int _wizardVersionNumber = 1;
-        private string[] executable = new string[]
-        {
-            "KINGDOM HEARTS II FINAL MIX.exe",
-            "KINGDOM HEARTS FINAL MIX.exe",
-            "KINGDOM HEARTS Birth by Sleep FINAL MIX.exe",
-            "KINGDOM HEARTS Re_Chain of Memories.exe",
-            "KINGDOM HEARTS Dream Drop Distance.exe"
-        };
-        private int launchExecutable = 0;
-
-        private const string RAW_FILES_FOLDER_NAME = "raw";
-        private const string ORIGINAL_FILES_FOLDER_NAME = "original";
-        private const string REMASTERED_FILES_FOLDER_NAME = "remastered";
-
-        public static bool overwriteMod = false;
-        public string Title => ApplicationName;
-        public string CurrentVersion => ApplicationVersion;
-        public ObservableCollection<ModViewModel> ModsList { get; set; }
-        public ObservableCollection<string> PresetList { get; set; }
-        public RelayCommand ExitCommand { get; set; }
-        public RelayCommand AddModCommand { get; set; }
-        public RelayCommand RemoveModCommand { get; set; }
-        public RelayCommand OpenModFolderCommand { get; set; }
-        public RelayCommand MoveTop { get; set; }
-        public RelayCommand MoveUp { get; set; }
-        public RelayCommand MoveDown { get; set; }
-        public RelayCommand BuildCommand { get; set; }
-        public RelayCommand PatchCommand { get; set; }
-        public RelayCommand RestoreCommand { get; set; }
-        public RelayCommand RunCommand { get; set; }
-        public RelayCommand BuildAndRunCommand { get; set; }
-        public RelayCommand StopRunningInstanceCommand { get; set; }
-        public RelayCommand WizardCommand { get; set; }
-        public ICommand OpenPresetMenuCommand { get; private set; }
-        public ICommand CheckForModUpdatesCommand { get; private set; }
-        public ICommand OpenLinkCommand { get; private set; }
-        public ICommand CheckOpenkhUpdateCommand { get; private set; }
-        public ICommand YamlGeneratorCommand { get; private set; }
-        public ICommand OpenModSearchCommand { get; private set; }
-
-        public ModViewModel SelectedValue
-        {
-            get => _selectedValue;
-            set
-            {
-                _selectedValue = value;
-                OnPropertyChanged();
-                OnPropertyChanged(nameof(IsModSelected));
-                OnPropertyChanged(nameof(IsModInfoVisible));
-                OnPropertyChanged(nameof(IsModUnselectedMessageVisible));
-                OnPropertyChanged(nameof(MoveUp));
-                OnPropertyChanged(nameof(MoveDown));
-                OnPropertyChanged(nameof(AddModCommand));
-                OnPropertyChanged(nameof(RemoveModCommand));
-                OnPropertyChanged(nameof(OpenModFolderCommand));
-            }
-        }
-
-        public bool IsModSelected => SelectedValue != null;
-
-        public Visibility IsModInfoVisible => IsModSelected ? Visibility.Visible : Visibility.Collapsed;
-        public Visibility IsModUnselectedMessageVisible => !IsModSelected ? Visibility.Visible : Visibility.Collapsed;
-        public Visibility PatchVisible => PC &&  EnablePatching ? Visibility.Visible : Visibility.Collapsed;
-        public Visibility notPC => !PC ? Visibility.Visible : Visibility.Collapsed;
-        public Visibility isPC => PC ? Visibility.Visible : Visibility.Collapsed;
-        public bool GameSelectInteractable => (PC && Directory.Exists(ConfigurationService.PcReleaseLocation)) || (PCSX2 && MultiEmuGames);
-        public Visibility GameSelectVisible => PC || PCSX2 ? Visibility.Visible : Visibility.Collapsed;
-        public Visibility GameSelectKH2 => (PC && Directory.Exists(ConfigurationService.PcReleaseLocation)) || (PCSX2 && ConfigurationService.IsoLocationKH2 != null) ? Visibility.Visible : Visibility.Collapsed;
-        public Visibility GameSelectKH1 => (PC && Directory.Exists(ConfigurationService.PcReleaseLocation)) || (PCSX2 && ConfigurationService.IsoLocationKH1 != null) ? Visibility.Visible : Visibility.Collapsed;
-        public Visibility GameSelectBBS => (PC && Directory.Exists(ConfigurationService.PcReleaseLocation)) ? Visibility.Visible : Visibility.Collapsed;
-        public Visibility GameSelectRecom => (PC && Directory.Exists(ConfigurationService.PcReleaseLocation)) || (PCSX2 && ConfigurationService.IsoLocationRecom != null) ? Visibility.Visible : Visibility.Collapsed;
-        public Visibility GameSelectKH3D => (PC && Directory.Exists(ConfigurationService.PcReleaseLocationKH3D)) ? Visibility.Visible : Visibility.Collapsed;
-        public Visibility PanaceaSettings => PC && PanaceaInstalled ? Visibility.Visible : Visibility.Collapsed;
-
-        public enum GameIDs {
-            KH2 = 0,
-            KH1 = 1,
-            BBS = 2,
-            Recom = 3,
-            KH3D = 4,
-        };
-
-        public bool MultiEmuGames
-        {
-            get
-            {
-                int count = 0;
-                if (ConfigurationService.IsoLocationKH2 != null)
-                {
-                    count++;
-                }
-                if (ConfigurationService.IsoLocationKH1 != null)
-                {
-                    count++;
-                }
-                if (ConfigurationService.IsoLocationRecom != null)
-                {
-                    count++;
-                }
-                if (count > 1)
-                {
-                    return true;
-                }
-                return false;
-            }
-        }
-        public bool PanaceaConsoleEnabled
-        {
-            get => _panaceaConsoleEnabled;
-            set
-            {
-                _panaceaConsoleEnabled = value;
-                ConfigurationService.ShowConsole = _panaceaConsoleEnabled;
-                if (_panaceaDebugLogEnabled)
-                    PanaceaDebugLogEnabled = false;
-                OnPropertyChanged(nameof(PanaceaConsoleEnabled));
-                UpdatePanaceaSettings();
-            }
-        }
-        public bool PanaceaDebugLogEnabled
-        {
-            get => _panaceaDebugLogEnabled;
-            set
-            {
-                _panaceaDebugLogEnabled = value;
-                ConfigurationService.DebugLog = _panaceaDebugLogEnabled;
-                if (_panaceaSoundDebugEnabled)
-                    PanaceaSoundDebugEnabled = false;
-                OnPropertyChanged(nameof(PanaceaDebugLogEnabled));
-                UpdatePanaceaSettings();
-            }
-        }
-        public bool PanaceaSoundDebugEnabled
-        {
-            get => _panaceaSoundDebugEnabled;
-            set
-            {
-                _panaceaSoundDebugEnabled = value;
-                ConfigurationService.SoundDebug = _panaceaSoundDebugEnabled;
-                OnPropertyChanged(nameof(PanaceaSoundDebugEnabled));
-                UpdatePanaceaSettings();
-            }
-
-        }
-        public bool PanaceaCacheEnabled
-        {
-            get => _panaceaCacheEnabled;
-            set
-            {
-                _panaceaCacheEnabled = value;
-                ConfigurationService.EnableCache = _panaceaCacheEnabled;
-                UpdatePanaceaSettings();
-            }
-        }
-        public bool PanaceaQuickMenuEnabled
-        {
-            get => _panaceaQuickMenuEnabled;
-            set
-            {
-                _panaceaQuickMenuEnabled = value;
-                ConfigurationService.QuickMenu = _panaceaQuickMenuEnabled;
-                UpdatePanaceaSettings();
-            }
-        }
-        public bool EnablePatching
-        {
-            get => _enablePatching;
-            set
-            {
-                _enablePatching = value;
-                ConfigurationService.EnablePatching = EnablePatching;
-                OnPropertyChanged(nameof(PatchVisible));
-            }
-        }
-        public bool AutoUpdateMods
-        {
-            get => _autoUpdateMods;
-            set
-            {
-                _autoUpdateMods = value;
-                ConfigurationService.AutoUpdateMods = _autoUpdateMods;
-            }
-        }
-        public bool PanaceaInstalled
-        {
-            get => _panaceaInstalled;
-            set
-            {
-                _panaceaInstalled = value;
-                OnPropertyChanged(nameof(PatchVisible));
-                OnPropertyChanged(nameof(PanaceaSettings));
-            }
-        }
-
-        public bool PC
-        {
-            get => _pc;
-            set
-            {
-                _pc = value;
-                OnPropertyChanged(nameof(PC));
-                OnPropertyChanged(nameof(PatchVisible));
-                OnPropertyChanged(nameof(notPC));
-                OnPropertyChanged(nameof(isPC));
-                OnPropertyChanged(nameof(GameSelectVisible));
-                OnPropertyChanged(nameof(GameSelectInteractable));
-                OnPropertyChanged(nameof(PanaceaSettings));
-            }
-        }
-
-        public bool PCSX2
-        {
-            get => _pcsx2;
-            set
-            {
-                _pcsx2 = value;
-                OnPropertyChanged(nameof(PCSX2));
-                OnPropertyChanged(nameof(PatchVisible));
-                OnPropertyChanged(nameof(notPC));
-                OnPropertyChanged(nameof(isPC));
-                OnPropertyChanged(nameof(GameSelectVisible));
-                OnPropertyChanged(nameof(GameSelectInteractable));
-                OnPropertyChanged(nameof(PanaceaSettings));
-            }
-        }
-
-        public int GametoLaunch
-        {
-            get
-            {
-                switch (_launchGame)
-                {
-                    case "kh2":
-                        launchExecutable = (int)GameIDs.KH2;
-                        break;
-                    case "kh1":
-                        launchExecutable = (int)GameIDs.KH1;
-                        break;
-                    case "bbs":
-                        launchExecutable = (int)GameIDs.BBS;
-                        break;
-                    case "Recom":
-                        launchExecutable = (int)GameIDs.Recom;
-                        break;
-                    case "kh3d":
-                        launchExecutable = (int)GameIDs.KH3D;
-                        break;
-                    default:
-                        launchExecutable = (int)GameIDs.KH2;
-                        break;
-                }
-                return launchExecutable;
-            }
-            set
-            {
-                launchExecutable = value;
-                switch ((GameIDs)value)
-                {
-                    case GameIDs.KH2:
-                        _launchGame = "kh2";
-                        break;
-                    case GameIDs.KH1:
-                        _launchGame = "kh1";
-                        break;
-                    case GameIDs.BBS:
-                        _launchGame = "bbs";
-                        break;
-                    case GameIDs.Recom:
-                        _launchGame = "Recom";
-                        break;
-                    case GameIDs.KH3D:
-                        _launchGame = "kh3d";
-                        break;
-                    default:
-                        _launchGame = "kh2";
-                        break;
-                }
-                ConfigurationService.LaunchGame = _launchGame;
-                ReloadModsList();
-                if (ModsList.Count > 0)
-                    _ = FetchUpdates();
-            }
-        }
-
-        public bool IsBuilding
-        {
-            get => _isBuilding;
-            set
-            {
-                _isBuilding = value;
-                Application.Current.Dispatcher.Invoke(() =>
-                {
-                    OnPropertyChanged(nameof(BuildCommand));
-                    OnPropertyChanged(nameof(BuildAndRunCommand));
-                });
-            }
-        }
-
-        public bool IsRunning => _runningProcess != null;
-
-        public MainViewModel()
-        {
-            if (Directory.Exists($"gitfetch"))
-            {
-                var _fetchAllFiles = Directory.GetFiles($"gitfetch", "*", SearchOption.AllDirectories);
-                var _fetchAllDirectories = Directory.GetDirectories($"gitfetch", "*", SearchOption.AllDirectories);
-
-                foreach (var _fetchFile in _fetchAllFiles)
-                    File.SetAttributes(_fetchFile, FileAttributes.Normal);
-
-                foreach (string _fetchDirectory in _fetchAllDirectories)
-                    File.SetAttributes(_fetchDirectory, FileAttributes.Normal);
-
-                Directory.Delete($"gitfetch", true);
-            }
-
-
-            if (ConfigurationService.GameEdition == SetupWizardViewModel.PC)
-            {
-                PC = true;
-                PCSX2 = false;
-                PanaceaInstalled = ConfigurationService.PanaceaInstalled;
-                EnablePatching = ConfigurationService.EnablePatching;
-                _panaceaConsoleEnabled = ConfigurationService.ShowConsole;
-                _panaceaDebugLogEnabled = ConfigurationService.DebugLog;
-                _panaceaSoundDebugEnabled = ConfigurationService.SoundDebug;
-                _panaceaCacheEnabled = ConfigurationService.EnableCache;
-                _panaceaQuickMenuEnabled = ConfigurationService.QuickMenu;
-
-                if (PanaceaInstalled && ConfigurationService.Updated)
-                {
-                    try
-                    {
-                        string PanaceaSourceLocation = Path.Combine(AppContext.BaseDirectory, "OpenKH.Panacea.dll");
-                        if (ConfigurationService.PcReleaseLocation != null)
-                        {
-                            string PanaceaDestinationLocation = Path.Combine(ConfigurationService.PcReleaseLocation, "DBGHELP.dll");
-                            string PanaceaAlternateLocation = Path.Combine(ConfigurationService.PcReleaseLocation, "version.dll");
-                            if (Process.GetProcessesByName("winlogon").Length > 0)
-                            {
-                                File.Copy(PanaceaSourceLocation, PanaceaDestinationLocation, true);
-                                File.Delete(PanaceaAlternateLocation);
-                            }
-                            else
-                            {
-                                File.Copy(PanaceaSourceLocation, PanaceaAlternateLocation, true);
-                                File.Delete(PanaceaDestinationLocation);
-                            }
-                        }
-                        if (ConfigurationService.PcReleaseLocationKH3D != null)
-                        {
-                            string PanaceaDestinationLocationkh3d = Path.Combine(ConfigurationService.PcReleaseLocationKH3D, "DBGHELP.dll");
-                            string PanaceaAlternateLocationkh3d = Path.Combine(ConfigurationService.PcReleaseLocationKH3D, "version.dll");
-                            if (Process.GetProcessesByName("winlogon").Length > 0)
-                            {
-                                File.Copy(PanaceaSourceLocation, PanaceaDestinationLocationkh3d, true);
-                                File.Delete(PanaceaAlternateLocationkh3d);
-                            }
-                            else
-                            {
-                                File.Copy(PanaceaSourceLocation, PanaceaAlternateLocationkh3d, true);
-                                File.Delete(PanaceaDestinationLocationkh3d);
-                            }
-                        }
-                        ConfigurationService.Updated = false;
-                        MessageBox.Show(
-                               $"Panacea has successfully been updated alongside Mods Manager.\nIf you notice any mod loading bugs you might still want to uninstall and reinstall Panacea just in case.",
-                               "Success",
-                               MessageBoxButton.OK,
-                               MessageBoxImage.Information);
-                    }
-                    catch
-                    {
-                        ConfigurationService.Updated = false;
-                        MessageBox.Show(
-                               $"Unable to automatically update Panacea.\nPlease manually run the setup wizard and reinstall Panacea.",
-                               "Error",
-                               MessageBoxButton.OK,
-                               MessageBoxImage.Error);
-                    }
-                }
-            }
-            else if (ConfigurationService.GameEdition == SetupWizardViewModel.PCSX2)
-            {
-                PC = false;
-                PCSX2 = true;
-            }
-            else
-            {
-                PC = false;
-                PCSX2 = false;
-            }
-            if (_supportedGames.Contains(ConfigurationService.LaunchGame) && PC || _supportedPCSX2Games.Contains(ConfigurationService.LaunchGame) && PCSX2)
-                _launchGame = ConfigurationService.LaunchGame;
-            else
-                ConfigurationService.LaunchGame = _launchGame;
-
-            AutoUpdateMods = ConfigurationService.AutoUpdateMods;
-
-            try
-            {
-                Log.OnLogDispatch += (long ms, string tag, string message) =>
-                    _debuggingWindow.Log(ms, tag, message);
-            }
-            catch
-            {
-                MessageBox.Show(
-                       $"Mods Manager had problems starting. Will now force close any instances of Mods Manager to hopefully allow you to re-open the program.",
-                       "Error",
-                       MessageBoxButton.OK,
-                       MessageBoxImage.Error);
-                Process[] runningProcesses = Process.GetProcesses();
-                foreach (Process process in runningProcesses)
-                {
-                    if (process.ProcessName == "OpenKh.Tools.ModsManager" && process.Id != Process.GetCurrentProcess().Id)
-                    {
-                        process.Kill(true);
-                    }
-                }
-                Process.GetCurrentProcess().Kill();
-            }
-
-            ReloadModsList();
-            SelectedValue = ModsList.FirstOrDefault();
-            ReloadPresetList();
-
-            ExitCommand = new RelayCommand(_ => Window.Close());
-            AddModCommand = new RelayCommand(_ =>
-            {
-                var view = new InstallModView();
-                if (view.ShowDialog() != true)
-                    return;
-
-                Task.Run(async () =>
-                {
-                    InstallModProgressWindow progressWindow = null;
-                    try
-                    {
-                        var name = view.RepositoryName;
-                        var isZipFile = view.IsZipFile;
-                        var isLuaFile = view.IsLuaFile;
-                        var platformUrl = view.PlatformURL;
-                        var branchName = view.BranchName;
-                        progressWindow = Application.Current.Dispatcher.Invoke(() =>
-                        {
-                            var progressWindow = new InstallModProgressWindow
-                            {
-                                ModName = isZipFile ? Path.GetFileName(name) : name,
-                                ProgressText = "Initializing",
-                                ShowActivated = true
-                            };
-                            progressWindow.Show();
-                            return progressWindow;
-                        });
-
-                        if (name.Contains("@"))
-                        {
-                            var _fetchNameWithPlatform = name.Split("@");
-
-                            name = _fetchNameWithPlatform[0];
-                            platformUrl = _fetchNameWithPlatform[1];
-                        }
-
-                        await ModsService.InstallMod(name, isZipFile, isLuaFile, progress =>
-                        {
-                            Application.Current.Dispatcher.Invoke(() => progressWindow.ProgressText = progress);
-                        }, nProgress =>
-                        {
-                            Application.Current.Dispatcher.Invoke(() => progressWindow.ProgressValue = nProgress);
-                        }, platformUrl, branchName);
-                        var repoName = name;
-                        if (!isZipFile && !isLuaFile)
-                        {
-                            var nameParts = name.Split('/');
-                            if (nameParts.Length == 3)
-                                repoName = $"{nameParts[0]}/{nameParts[1]}";
-                        }
-                        var actualName = isZipFile || isLuaFile ? Path.GetFileNameWithoutExtension(name) : repoName;
-                        var mod = ModsService.GetMods(new string[] { actualName }).First();
-                        Application.Current.Dispatcher.Invoke(() =>
-                        {
-                            progressWindow.Close();
-                            if (overwriteMod)
-                            {
-                                var modRemove = ModsList.FirstOrDefault(smod => smod.Title == mod.Metadata.Title);
-                                if (modRemove != null)
-                                    ModsList.RemoveAt(ModsList.IndexOf(modRemove));
-                                overwriteMod = false;
-                            }
-                            ModsList.Insert(0, Map(mod));
-                            SelectedValue = ModsList[0];
-                        });
-                    }
-                    catch (Exception ex)
-                    {
-                        Log.Warn("Unable to install the mod `{0}`: {1}\n"
-                            , view.RepositoryName
-                            , Log.FormatSecondaryLinesWithIndent(ex.ToString(), "  ")
-                        );
-                        Handle(ex);
-                    }
-                    finally
-                    {
-                        Application.Current.Dispatcher.Invoke(() => progressWindow?.Close());
-                    }
-                });
-            }, _ => true);
-            RemoveModCommand = new RelayCommand(_ =>
-            {
-                var mod = SelectedValue;
-                if (Question($"Do you want to delete the mod '{mod.Source}'?", $"Remove mod {mod.Source}"))
-                {
-                    Handle(() =>
-                    {
-                        ModsService.CleanModFiles(mod.Path);
-                        ModsList.RemoveAt(ModsList.IndexOf(SelectedValue));
-                    });
-                }
-            }, _ => IsModSelected);
-            OpenModFolderCommand = new RelayCommand(_ =>
-            {
-                using var process = Process.Start(new ProcessStartInfo
-                {
-                    FileName = SelectedValue.Path,
-                    UseShellExecute = true
-                });
-            }, _ => IsModSelected);
-            MoveTop = new RelayCommand(_ => MoveSelectedModTop(), _ => CanSelectedModMoveUp());
-            MoveUp = new RelayCommand(_ => MoveSelectedModUp(), _ => CanSelectedModMoveUp());
-            MoveDown = new RelayCommand(_ => MoveSelectedModDown(), _ => CanSelectedModMoveDown());
-            BuildCommand = new RelayCommand(async _ =>
-            {
-                ResetLogWindow();
-                await BuildPatches(false);
-                CloseAllWindows();
-            }, _ => !IsBuilding);
-
-            PatchCommand = new RelayCommand(async (fastMode) =>
-            {
-                try
-                {
-                    ResetLogWindow();
-                    await BuildPatches(Convert.ToBoolean(fastMode));
-                    await PatchGame(Convert.ToBoolean(fastMode));
-                    CloseAllWindows();
-                }
-                catch (Exception ex)
-                {
-                    MessageBox.Show(ex.Message);
-                    return;
-                }
-            }, _ => !IsBuilding);
-
-            RunCommand = new RelayCommand(async _ =>
-            {
-                CloseRunningProcess();
-                ResetLogWindow();
-                await RunGame();
-            });
-
-            RestoreCommand = new RelayCommand(async (patched) =>
-            {
-                ResetLogWindow();
-                await RestoreGame(Convert.ToBoolean(patched));
-                CloseAllWindows();
-            });
-            BuildAndRunCommand = new RelayCommand(async _ =>
-            {
-                CloseRunningProcess();
-                ResetLogWindow();
-                if (await BuildPatches(false))
-                    await RunGame();
-            }, _ => !IsBuilding);
-            StopRunningInstanceCommand = new RelayCommand(_ =>
-            {
-                CloseRunningProcess();
-                ResetLogWindow();
-            }, _ => IsRunning);
-            WizardCommand = new RelayCommand(_ =>
-            {
-                var dialog = new SetupWizardWindow();
-                if (dialog.ShowDialog() != null)
-                {
-                    if (ConfigurationService.GameEdition == SetupWizardViewModel.PC)
-                    {
-                        PC = true;
-                        PCSX2 = false;
-                        PanaceaInstalled = ConfigurationService.PanaceaInstalled;
-                        if (!Directory.Exists(ConfigurationService.PcReleaseLocation))
-                        {
-                            if (Directory.Exists(ConfigurationService.PcReleaseLocationKH3D))
-                            {
-                                GametoLaunch = (int)GameIDs.KH3D;
-                            }
-                            else
-                            {
-                                MessageBox.Show(
-                                "Unable to locate install locations for both KINGDOM HEARTS HD 1.5+2.5 ReMIX and KINGDOM HEARTS HD 2.8 Final Chapter Prologue. They are either missing or corrupted. Please re-run the setup wizard and confirm the install paths are correct.",
-                                "Run error", MessageBoxButton.OK, MessageBoxImage.Error);
-                            }
-                        }
-                    }
-                    else if (ConfigurationService.GameEdition == SetupWizardViewModel.PCSX2)
-                    {
-                        PC = false;
-                        PCSX2 = true;
-                        string? launchIso;
-                        switch (_launchGame)
-                        {
-                            case "kh2":
-                                launchIso = ConfigurationService.IsoLocationKH2;
-                                break;
-                            case "kh1":
-                                launchIso = ConfigurationService.IsoLocationKH1;
-                                break;
-                            case "Recom":
-                                launchIso = ConfigurationService.IsoLocationRecom;
-                                break;
-                            default:
-                                launchIso = null;
-                                break;
-                        }
-                        GameInfoModel? game;
-                        if (!String.IsNullOrEmpty(launchIso))
-                        {
-                            game = GameService.DetectGameId(launchIso);
-                        }
-                        else
-                        {
-                            game = null;
-                        }
-                        if (!_supportedPCSX2Games.Contains(_launchGame) || launchIso == null || game == null || game?.Id != _launchGame)
-                        {
-                            if (ConfigurationService.IsoLocationKH2 != null && (game = GameService.DetectGameId(ConfigurationService.IsoLocationKH2)) != null && game?.Id == "kh2")
-                            {
-                                GametoLaunch = (int)GameIDs.KH2;
-                            }
-                            else if (ConfigurationService.IsoLocationKH1 != null && (game = GameService.DetectGameId(ConfigurationService.IsoLocationKH1)) != null && game?.Id == "kh1")
-                            {
-                                GametoLaunch = (int)GameIDs.KH1;
-                            }
-                            else if (ConfigurationService.IsoLocationRecom != null && (game = GameService.DetectGameId(ConfigurationService.IsoLocationRecom)) != null && game?.Id == "Recom")
-                            {
-                                GametoLaunch = (int)GameIDs.Recom;
-                            }
-                            else
-                            {
-                                GametoLaunch = (int)GameIDs.KH2;
-                            }
-                        }
-                    }
-                    else
-                    {
-                        PC = false;
-                        PCSX2 = false;
-                        GametoLaunch = (int)GameIDs.KH2;
-                    }
-                    ConfigurationService.WizardVersionNumber = _wizardVersionNumber;
-                }
-                OnPropertyChanged(nameof(GametoLaunch));
-                OnPropertyChanged(nameof(GameSelectKH2));
-                OnPropertyChanged(nameof(GameSelectKH1));
-                OnPropertyChanged(nameof(GameSelectBBS));
-                OnPropertyChanged(nameof(GameSelectRecom));
-                OnPropertyChanged(nameof(GameSelectKH3D));
-            });
-
-            OpenPresetMenuCommand = new RelayCommand(_ =>
-            {
-                PresetsWindow view = new PresetsWindow(this);
-                view.ShowDialog();
-            });
-
-            CheckForModUpdatesCommand = new RelayCommand(_ =>
-            {
-                _ = FetchUpdates();
-            });
-
-            OpenLinkCommand = new RelayCommand(url => Process.Start(new ProcessStartInfo(url as string)
-            {
-                UseShellExecute = true
-            }));
-
-            CheckOpenkhUpdateCommand = new RelayCommand(
-                _ => _ = UpdateOpenkhAsync()
-            );
-
-            YamlGeneratorCommand = new RelayCommand(
-                _ =>
-                {
-                    var window = new YamlGeneratorWindow()
-                    {
-                        Owner = _getActiveWindowService.GetActiveWindow(),
-                    };
-                    window.Closing += (_, e) =>
-                    {
-                        if (!e.Cancel)
-                        {
-                            window.Owner?.Focus();
-                        }
-                    };
-                    window.Show();
-                }
-            );
-
-            OpenModSearchCommand = new RelayCommand(
-                _ =>
-                {
-                    var searchWindow = new ModSearchWindow(
-                        reloadModsList: () => ReloadModsList()
-                    )
-                    {
-                        Owner = _getActiveWindowService.GetActiveWindow(),
-                        WindowStartupLocation = WindowStartupLocation.CenterOwner
-                    };
-                    searchWindow.Closing += (_, e) =>
-                    {
-                        if (!e.Cancel)
-                        {
-                            searchWindow.Owner?.Focus();
-                            // Reload mods list to show newly installed mods
-                            ReloadModsList();
-                        }
-                    };
-                    searchWindow.Show();
-                }
-            );
-
-            if (Directory.Exists(ConfigurationService.InstalledModsPath))
-            {
-                var _fetchAllFiles = Directory.GetFiles(ConfigurationService.InstalledModsPath, "*", SearchOption.AllDirectories);
-                var _fetchAllDirectories = Directory.GetDirectories(ConfigurationService.InstalledModsPath, "*", SearchOption.AllDirectories);
-
-                foreach (var _fetchFile in _fetchAllFiles)
-                    File.SetAttributes(_fetchFile, FileAttributes.Normal);
-
-                foreach (string _fetchDirectory in _fetchAllDirectories)
-                    File.SetAttributes(_fetchDirectory, FileAttributes.Normal);
-            }
-
-            _pcsx2Injector = new Pcsx2Injector(new OperationDispatcher());
-            _ = FetchUpdates();
-
-            if (ConfigurationService.WizardVersionNumber < _wizardVersionNumber)
-                WizardCommand.Execute(null);
-        }
-
-        public void CloseAllWindows()
-        {
-            CloseRunningProcess();
-            Application.Current.Dispatcher.Invoke(_debuggingWindow.Close);
-        }
-
-        public void CloseRunningProcess()
-        {
-            if (_runningProcess == null)
-                return;
-
-            _pcsx2Injector.Stop();
-            _runningProcess.CloseMainWindow();
-            _runningProcess.Kill();
-            _runningProcess.Dispose();
-            _runningProcess = null;
-            OnPropertyChanged(nameof(StopRunningInstanceCommand));
-        }
-
-        private void ResetLogWindow()
-        {
-            if (_debuggingWindow != null)
-                Application.Current.Dispatcher.Invoke(_debuggingWindow.Close);
-            _debuggingWindow = new DebuggingWindow();
-            Application.Current.Dispatcher.Invoke(_debuggingWindow.Show);
-            _debuggingWindow.ClearLogs();
-        }
-
-        private async Task<bool> BuildPatches(bool fastMode)
-        {
-            IsBuilding = true;
-            var result = await ModsService.RunPatcherAsync(fastMode);
-            IsBuilding = false;
-
-            return result;
-        }
-
-        private Task RunGame()
-        {
-            ProcessStartInfo processStartInfo;
-            bool isPcsx2 = false;
-            switch (ConfigurationService.GameEdition)
-            {
-                case SetupWizardViewModel.OpenKHGameEngine:
-                    Log.Info("Starting OpenKH Game Engine");
-                    processStartInfo = new ProcessStartInfo
-                    {
-                        FileName = ConfigurationService.OpenKhGameEngineLocation,
-                        WorkingDirectory = Path.GetDirectoryName(ConfigurationService.OpenKhGameEngineLocation),
-                        Arguments = $"--data \"{ConfigurationService.GameDataLocation}\" --modpath \"{ConfigurationService.CompiledModPath}\"",
-                        RedirectStandardOutput = true,
-                        RedirectStandardError = true,
-                        UseShellExecute = false,
-                    };
-                    break;
-                case SetupWizardViewModel.PCSX2:
-                    Log.Info("Starting PCSX2");
-                    _pcsx2Injector.RegionId = ConfigurationService.RegionId;
-                    _pcsx2Injector.Region = Kh2.Constants.Regions[_pcsx2Injector.RegionId];
-                    _pcsx2Injector.Language = Kh2.Constants.Languages[_pcsx2Injector.RegionId];
-
-                    String IsoLocation;
-                    switch (_launchGame)
-                    {
-                        case "kh2":
-                            IsoLocation = ConfigurationService.IsoLocationKH2;
-                            break;
-                        case "kh1":
-                            IsoLocation = ConfigurationService.IsoLocationKH1;
-                            break;
-                        case "Recom":
-                            IsoLocation = ConfigurationService.IsoLocationRecom;
-                            break;
-                        default:
-                            IsoLocation = ConfigurationService.IsoLocationKH2;
-                            break;
-                    }
-
-                    if (IsoLocation != null)
-                    {
-                        processStartInfo = new ProcessStartInfo
-                        {
-                            FileName = ConfigurationService.Pcsx2Location,
-                            WorkingDirectory = Path.GetDirectoryName(ConfigurationService.Pcsx2Location),
-                            Arguments = $"\"{IsoLocation}\"",
-                            RedirectStandardOutput = true,
-                            RedirectStandardError = true,
-                            UseShellExecute = false,
-                        };
-                        isPcsx2 = true;
-                    }
-                    else
-                    {
-                        processStartInfo = null;
-                    }
-                    break;
-                case SetupWizardViewModel.PC:
-                    if (ConfigurationService.PCVersion == "EGS" && !(_launchGame == "kh3d"))
-                    {
-                        if (Directory.Exists(ConfigurationService.PcReleaseLocation))
-                        {
-                            if (ConfigurationService.PanaceaInstalled)
-                            {
-                                string panaceaSettings = Path.Combine(ConfigurationService.PcReleaseLocation, "panacea_settings.txt");
-                                if (!File.Exists(panaceaSettings))
-                                {
-                                    File.WriteAllLines(Path.Combine(ConfigurationService.PcReleaseLocation, "panacea_settings.txt"),
-                                    [
-                                    $"mod_path={Path.GetFullPath(Path.Combine(ConfigurationService.CompiledModPath,".."))}",
-                                    $"show_console={false}",
-                                    ]);
-                                }
-                                File.AppendAllText(panaceaSettings, "\nquick_launch=" + _launchGame);
-                            }
-                            processStartInfo = new ProcessStartInfo
-                            {
-                                FileName = "com.epicgames.launcher://apps/4158b699dd70447a981fee752d970a3e%3A5aac304f0e8948268ddfd404334dbdc7%3A68c214c58f694ae88c2dab6f209b43e4?action=launch&silent=true",
-                                UseShellExecute = true,
-                            };
-                            Process.Start(processStartInfo);
-                            CloseAllWindows();
-                            return Task.CompletedTask;
-                        }
-                        else
-                        {
-                            MessageBox.Show(
-                            "Unable to locate KINGDOM HEARTS HD 1.5+2.5 ReMIX install. Please re-run the setup wizard and confirm it is correct.",
-                            "Run error", MessageBoxButton.OK, MessageBoxImage.Error);
-                            CloseAllWindows();
-                            return Task.CompletedTask;
-                        }
-                    }
-                    else if (ConfigurationService.PCVersion == "EGS" && _launchGame == "kh3d")
-                    {
-                        if (Directory.Exists(ConfigurationService.PcReleaseLocationKH3D))
-                        {
-                            if (ConfigurationService.PanaceaInstalled)
-                            {
-                                string panaceaSettings = Path.Combine(ConfigurationService.PcReleaseLocationKH3D, "panacea_settings.txt");
-                                if (!File.Exists(panaceaSettings))
-                                {
-                                        File.WriteAllLines(Path.Combine(ConfigurationService.PcReleaseLocationKH3D, "panacea_settings.txt"),
-                                        [
-                                        $"mod_path={Path.GetFullPath(Path.Combine(ConfigurationService.CompiledModPath,".."))}",
-                                        $"show_console={false}",
-                                        ]);
-                                }
-                                File.AppendAllText(panaceaSettings, "\nquick_launch=" + _launchGame);
-                            }
-                            processStartInfo = new ProcessStartInfo
-                            {
-                                FileName = "com.epicgames.launcher://apps/c8ff067c1c984cd7ab1998e8a9afc8b6%3Aaa743b9f52e84930b0ba1b701951e927%3Ad1a8f7c478d4439b8c60a5808715dc05?action=launch&silent=true",
-                                UseShellExecute = true,
-                            };
-                            Process.Start(processStartInfo);
-                            CloseAllWindows();
-                            return Task.CompletedTask;
-                        }
-                        else
-                        {
-                            MessageBox.Show(
-                            "Unable to locate KINGDOM HEARTS HD 2.8 Final Chapter Prologue install. Please re-run the setup wizard and confirm it is correct.",
-                            "Run error", MessageBoxButton.OK, MessageBoxImage.Error);
-                            CloseAllWindows();
-                            return Task.CompletedTask;
-                        }
-                    }
-                    if (ConfigurationService.PCVersion == "Steam" && !(_launchGame == "kh3d") && ConfigurationService.SteamAPITrick1525 == false)
-                    {
-                        if (Directory.Exists(ConfigurationService.PcReleaseLocation))
-                        {
-                            if (ConfigurationService.PanaceaInstalled)
-                            {
-                                string panaceaSettings = Path.Combine(ConfigurationService.PcReleaseLocation, "panacea_settings.txt");
-                                if (!File.Exists(panaceaSettings))
-                                {
-                                    File.WriteAllLines(Path.Combine(ConfigurationService.PcReleaseLocation, "panacea_settings.txt"),
-                                    [
-                                    $"mod_path={Path.GetFullPath(Path.Combine(ConfigurationService.CompiledModPath,".."))}",
-                                    $"show_console={false}",
-                                    ]);
-                                }
-                                File.AppendAllText(panaceaSettings, "\nquick_launch=" + _launchGame);
-                            }
-                            processStartInfo = new ProcessStartInfo
-                            {
-                                FileName = "steam://rungameid/2552430",
-                                UseShellExecute = true,
-                            };
-                            Process.Start(processStartInfo);
-                            CloseAllWindows();
-                            return Task.CompletedTask;
-                        }
-                        else
-                        {
-                            MessageBox.Show(
-                            "Unable to locate KINGDOM HEARTS HD 1.5+2.5 ReMIX install. Please re-run the setup wizard and confirm it is correct.",
-                            "Run error", MessageBoxButton.OK, MessageBoxImage.Error);
-                            CloseAllWindows();
-                            return Task.CompletedTask;
-                        }
-                    }
-                    else if (ConfigurationService.PCVersion == "Steam" && _launchGame == "kh3d" && ConfigurationService.SteamAPITrick28 == false)
-                    {
-                        if (Directory.Exists(ConfigurationService.PcReleaseLocationKH3D))
-                        {
-                            string panaceaSettings = Path.Combine(ConfigurationService.PcReleaseLocationKH3D, "panacea_settings.txt");
-                            if (ConfigurationService.PanaceaInstalled)
-                            {
-                                if (!File.Exists(panaceaSettings))
-                                {
-                                    File.WriteAllLines(Path.Combine(ConfigurationService.PcReleaseLocationKH3D, "panacea_settings.txt"),
-                                    [
-                                    $"mod_path={Path.GetFullPath(Path.Combine(ConfigurationService.CompiledModPath,".."))}",
-                                    $"show_console={false}",
-                                    ]);
-                                }
-                                File.AppendAllText(panaceaSettings, "\nquick_launch=" + _launchGame);
-                            }
-                            processStartInfo = new ProcessStartInfo
-                            {
-                                FileName = "steam://rungameid/2552440",
-                                UseShellExecute = true,
-                            };
-                            Process.Start(processStartInfo);
-                            CloseAllWindows();
-                            return Task.CompletedTask;
-                        }
-                        else
-                        {
-                            MessageBox.Show(
-                            "Unable to locate KINGDOM HEARTS HD 2.8 Final Chapter Prologue install. Please re-run the setup wizard and confirm it is correct.",
-                            "Run error", MessageBoxButton.OK, MessageBoxImage.Error);
-                            CloseAllWindows();
-                            return Task.CompletedTask;
-                        }
-                    }
-                    else
-                    {
-                        string filename = "";
-
-                        try
-                        {
-                            if (!(_launchGame == "kh3d"))
-                            {
-                                if (Directory.Exists(ConfigurationService.PcReleaseLocation))
-                                {
-                                    string panaceaSettings = Path.Combine(ConfigurationService.PcReleaseLocation, "panacea_settings.txt");
-                                    if (ConfigurationService.PanaceaInstalled && !File.Exists(panaceaSettings))
-                                    {
-                                        File.WriteAllLines(Path.Combine(ConfigurationService.PcReleaseLocation, "panacea_settings.txt"),
-                                        [
-                                        $"mod_path={Path.GetFullPath(Path.Combine(ConfigurationService.CompiledModPath,".."))}",
-                                        $"show_console={false}",
-                                        ]);
-                                    }
-                                    filename = Path.Combine(ConfigurationService.PcReleaseLocation, executable[launchExecutable]);
-                                }
-                                else
-                                {
-                                    MessageBox.Show(
-                                    "Unable to locate KINGDOM HEARTS HD 1.5+2.5 ReMIX install. Please re-run the setup wizard and confirm it is correct.",
-                                    "Run error", MessageBoxButton.OK, MessageBoxImage.Error);
-                                    CloseAllWindows();
-                                    return Task.CompletedTask;
-                                }
-                            }
-                            else
-                            {
-                                if (Directory.Exists(ConfigurationService.PcReleaseLocationKH3D))
-                                {
-                                    string panaceaSettings = Path.Combine(ConfigurationService.PcReleaseLocationKH3D, "panacea_settings.txt");
-                                    if (ConfigurationService.PanaceaInstalled && !File.Exists(panaceaSettings))
-                                    {
-                                        File.WriteAllLines(Path.Combine(ConfigurationService.PcReleaseLocationKH3D, "panacea_settings.txt"),
-                                        [
-                                        $"mod_path={Path.GetFullPath(Path.Combine(ConfigurationService.CompiledModPath,".."))}",
-                                        $"show_console={false}",
-                                        ]);
-                                    }
-                                    filename = Path.Combine(ConfigurationService.PcReleaseLocationKH3D, executable[launchExecutable]);
-                                }
-                                else
-                                {
-                                    MessageBox.Show(
-                                    "Unable to locate KINGDOM HEARTS HD 2.8 Final Chapter Prologue install. Please re-run the setup wizard and confirm it is correct.",
-                                    "Run error", MessageBoxButton.OK, MessageBoxImage.Error);
-                                    CloseAllWindows();
-                                    return Task.CompletedTask;
-                                }
-                            }
-                            processStartInfo = new ProcessStartInfo
-                            {
-                                FileName = filename,
-                                WorkingDirectory = Path.GetDirectoryName(filename),
-                                UseShellExecute = false,
-                            };
-                            Process.Start(processStartInfo);
-                            CloseAllWindows();
-                            return Task.CompletedTask;
-                        }
-                        catch (Exception ex)
-                        {
-                            Log.Warn("Unable to locate the game executable `{0}`: {1}\n"
-                                , filename
-                                , Log.FormatSecondaryLinesWithIndent(ex.ToString(), "  ")
-                            );
-
-                            MessageBox.Show(
-                           "Unable to locate game executable. Please make sure your Kingdom Hearts executable is correctly named and in the correct folder.",
-                           "Run error", MessageBoxButton.OK, MessageBoxImage.Error);
-                            CloseAllWindows();
-                            return Task.CompletedTask;
-                        }
-                    }
-                default:
-                    return Task.CompletedTask;
-            }
-
-            if (processStartInfo == null || !File.Exists(processStartInfo.FileName))
-            {
-                MessageBox.Show(
-                    "Unable to locate the executable. Please run the Wizard by going to the Settings menu.",
-                    "Run error", MessageBoxButton.OK, MessageBoxImage.Error);
-                CloseAllWindows();
-                return Task.CompletedTask;
-            }
-
-            _runningProcess = new Process() { StartInfo = processStartInfo };
-            _runningProcess.OutputDataReceived += (sender, e) => CaptureLog(e.Data);
-            _runningProcess.ErrorDataReceived += (sender, e) => CaptureLog(e.Data);
-            _runningProcess.Start();
-            _runningProcess.BeginOutputReadLine();
-            _runningProcess.BeginErrorReadLine();
-            if (isPcsx2)
-                _pcsx2Injector.Run(_runningProcess, _debuggingWindow);
-
-            OnPropertyChanged(nameof(StopRunningInstanceCommand));
-            return Task.Run(() =>
-            {
-                _runningProcess.WaitForExit();
-                CloseAllWindows();
-            });
-        }
-
-        private void CaptureLog(string data)
-        {
-            if (data == null)
-                return;
-            else if (data.Contains("err", StringComparison.InvariantCultureIgnoreCase))
-                Log.Err(data);
-            else if (data.Contains("wrn", StringComparison.InvariantCultureIgnoreCase))
-                Log.Warn(data);
-            else if (data.Contains("warn", StringComparison.InvariantCultureIgnoreCase))
-                Log.Warn(data);
-            else
-                Log.Info(data);
-        }
-
-        public void ReloadModsList()
-        {
-            ModsList = new ObservableCollection<ModViewModel>(
-                ModsService.GetMods(ModsService.Mods).Select(Map));
-            OnPropertyChanged(nameof(ModsList));
-            OnPropertyChanged(nameof(ModViewModel.CollectionModsList));
-        }
-
-        private ModViewModel Map(ModModel mod) => new (mod, this);
-
-        public void ModEnableStateChanged()
-        {
-            ConfigurationService.EnabledMods = ModsList
-                .Where(x => x.Enabled)
-                .Select(x => x.Source)
-                .ToList();
-            OnPropertyChanged(nameof(BuildAndRunCommand));
-        }
-
-        private void MoveSelectedModDown()
-        {
-            var selectedIndex = ModsList.IndexOf(SelectedValue);
-            if (selectedIndex < 0)
-                return;
-
-            var item = ModsList[selectedIndex];
-            ModsList.RemoveAt(selectedIndex);
-            ModsList.Insert(++selectedIndex, item);
-            SelectedValue = ModsList[selectedIndex];
-            ModEnableStateChanged();
-        }
-
-        private void MoveSelectedModUp()
-        {
-            var selectedIndex = ModsList.IndexOf(SelectedValue);
-            if (selectedIndex < 0)
-                return;
-
-            var item = ModsList[selectedIndex];
-            ModsList.RemoveAt(selectedIndex);
-            ModsList.Insert(--selectedIndex, item);
-            SelectedValue = ModsList[selectedIndex];
-            ModEnableStateChanged();
-        }
-        private void MoveSelectedModTop()
-        {
-            var selectedIndex = ModsList.IndexOf(SelectedValue);
-            if (selectedIndex < 0)
-                return;
-
-            var item = ModsList[selectedIndex];
-            ModsList.RemoveAt(selectedIndex);
-            ModsList.Insert(selectedIndex = 0, item);
-            SelectedValue = ModsList[selectedIndex];
-            ModEnableStateChanged();
-        }
-
-        private async Task PatchGame(bool fastMode)
-        {
-            await Task.Run(() =>
-            {
-                if (ConfigurationService.GameEdition == SetupWizardViewModel.PC)
-                {
-                    // Use the package map file to rearrange the files in the structure needed by the patcher
-                    var packageMapLocation = Path.Combine(ConfigurationService.CompiledModPath, "patch-package-map.txt");
-                    var packageMap = File
-                        .ReadLines(packageMapLocation)
-                        .Select(line => line.Split(" $$$$ "))
-                        .ToDictionary(array => array[0], array => array[1]);
-
-                    var patchStagingDir = Path.Combine(ConfigurationService.CompiledModPath, "patch-staging");
-                    if (Directory.Exists(patchStagingDir))
-                        Directory.Delete(patchStagingDir, true);
-                    Directory.CreateDirectory(patchStagingDir);
-                    foreach (var entry in packageMap)
-                    {
-                        var sourceFile = Path.Combine(ConfigurationService.CompiledModPath, entry.Key);
-                        var destFile = Path.Combine(patchStagingDir, entry.Value);
-                        if (File.Exists(sourceFile))
-                        {
-                            Directory.CreateDirectory(Path.GetDirectoryName(destFile));
-                            File.Move(sourceFile, destFile);
-                        }
-                    }
-
-                    foreach (var directory in Directory.GetDirectories(Path.Combine(ConfigurationService.CompiledModPath)))
-                        if (!"patch-staging".Equals(Path.GetFileName(directory)))
-                            Directory.Delete(directory, true);
-
-                    var stagingDirs = Directory.GetDirectories(patchStagingDir).Select(directory => Path.GetFileName(directory)).ToHashSet();
-
-                    string[] specialDirs = Array.Empty<string>();
-                    var specialStagingDir = Path.Combine(patchStagingDir, "special");
-                    if (Directory.Exists(specialStagingDir))
-                        specialDirs = Directory.GetDirectories(specialStagingDir).Select(directory => Path.GetFileName(directory)).ToArray();
-
-                    foreach (var packageName in stagingDirs)
-                        Directory.Move(Path.Combine(patchStagingDir, packageName), Path.Combine(ConfigurationService.CompiledModPath, packageName));
-                    foreach (var specialDir in specialDirs)
-                        Directory.Move(Path.Combine(ConfigurationService.CompiledModPath, "special", specialDir), Path.Combine(ConfigurationService.CompiledModPath, specialDir));
-
-                    stagingDirs.Remove("special"); // Since it's not actually a real game package
-                    Directory.Delete(patchStagingDir, true);
-
-                    var specialModDir = Path.Combine(ConfigurationService.CompiledModPath, "special");
-                    if (Directory.Exists(specialModDir))
-                        Directory.Delete(specialModDir, true);
-
-                    foreach (var directory in stagingDirs.Select(packageDir => Path.Combine(ConfigurationService.CompiledModPath, packageDir)))
-                    {
-                        if (specialDirs.Contains(Path.GetDirectoryName(directory)))
-                            continue;
-
-                        var patchFiles = new List<string>();
-                        var _dirPart = new DirectoryInfo(directory).Name;
-
-                        var _orgPath = Path.Combine(directory, ORIGINAL_FILES_FOLDER_NAME);
-                        var _rawPath = Path.Combine(directory, RAW_FILES_FOLDER_NAME);
-
-                        if (Directory.Exists(_orgPath))
-                            patchFiles = OpenKh.Egs.Helpers.GetAllFiles(_orgPath).ToList();
-
-                        if (Directory.Exists(_rawPath))
-                            patchFiles.AddRange(OpenKh.Egs.Helpers.GetAllFiles(_rawPath).ToList());
-
-                        string _pkgSoft;
-                        switch (_launchGame)
-                        {
-                            case "kh1":
-                                _pkgSoft = fastMode ? "kh1_first" : _dirPart;
-                                break;
-                            case "bbs":
-                                _pkgSoft = fastMode ? "bbs_first" : _dirPart;
-                                break;
-                            case "Recom":
-                                _pkgSoft = "Recom";
-                                break;
-                            case "kh3d":
-                                _pkgSoft = fastMode ? "kh3d_first" : _dirPart;
-                                break;
-                            default:
-                                _pkgSoft = fastMode ? "kh2_first" : _dirPart;
-                                break;
-
-                        }
-                        string _pkgName = null;
-                        string _backupDir = null;
-                        if (_launchGame != "kh3d" && ConfigurationService.PcReleaseLocation != null)
-                        {
-                            _pkgName = Path.Combine(ConfigurationService.PcReleaseLocation, "Image", ConfigurationService.PCVersion == "Steam" && ConfigurationService.PcReleaseLanguage == "en" ? "dt" : ConfigurationService.PcReleaseLanguage, _pkgSoft + ".pkg");
-                            _backupDir = Path.Combine(ConfigurationService.PcReleaseLocation, "BackupImage");
-                        }
-                        else if (ConfigurationService.PcReleaseLocationKH3D != null)
-                        {
-                            _pkgName = Path.Combine(ConfigurationService.PcReleaseLocationKH3D, "Image", ConfigurationService.PCVersion == "Steam" && ConfigurationService.PcReleaseLanguage == "en" ? "dt" : ConfigurationService.PcReleaseLanguage, _pkgSoft + ".pkg");
-                            _backupDir = Path.Combine(ConfigurationService.PcReleaseLocationKH3D, "BackupImage");
-                        }
-                        else
-                        {
-                            Log.Warn("Game Location for selected game cannot be found! Re-run th setup wizard to confirm the path is correct and/or confirm launchgame in the top right is correct.");
-                            break;
-                        }
-
-                        if (!Directory.Exists(_backupDir))
-                            Directory.CreateDirectory(_backupDir);
-
-                        var outputDir = "patchedpkgs";
-                        var hedFile = Path.ChangeExtension(_pkgName, "hed");
-
-                        if (!File.Exists(_backupDir + "/" + _pkgSoft + ".pkg"))
-                        {
-                            Log.Info($"Backing Up Package File {_pkgSoft}");
-
-                            File.Copy(_pkgName, _backupDir + "/" + _pkgSoft + ".pkg");
-                            File.Copy(hedFile, _backupDir + "/" + _pkgSoft + ".hed");
-                        }
-
-                        else
-                        {
-                            Log.Info($"Restoring Package File {_pkgSoft}");
-
-                            File.Delete(hedFile);
-                            File.Delete(_pkgName);
-
-                            File.Copy(_backupDir + "/" + _pkgSoft + ".pkg", _pkgName);
-                            File.Copy(_backupDir + "/" + _pkgSoft + ".hed", hedFile);
-                        }
-
-                        using var hedStream = File.OpenRead(hedFile);
-                        using var pkgStream = File.OpenRead(_pkgName);
-                        var hedHeaders = OpenKh.Egs.Hed.Read(hedStream).ToList();
-
-                        if (!Directory.Exists(outputDir))
-                            Directory.CreateDirectory(outputDir);
-
-                        using var patchedHedStream = File.Create(Path.Combine(outputDir, Path.GetFileName(hedFile)));
-                        using var patchedPkgStream = File.Create(Path.Combine(outputDir, Path.GetFileName(_pkgName)));
-
-                        foreach (var hedHeader in hedHeaders)
-                        {
-                            var hash = OpenKh.Egs.Helpers.ToString(hedHeader.MD5);
-
-                            // We don't know this filename, we ignore it
-                            if (!OpenKh.Egs.EgsTools.Names.TryGetValue(hash, out var filename))
-                                continue;
-
-                            var asset = new OpenKh.Egs.EgsHdAsset(pkgStream.SetPosition(hedHeader.Offset));
-
-                            if (patchFiles.Contains(filename))
-                            {
-                                patchFiles.Remove(filename);
-
-                                if (hedHeader.DataLength > 0)
-                                {
-                                    OpenKh.Egs.EgsTools.ReplaceFile(directory, filename, patchedHedStream, patchedPkgStream, asset, hedHeader);
-                                    Log.Info($"Replacing File {filename} in {_pkgSoft}");
-                                }
-                            }
-
-                            else
-                            {
-                                OpenKh.Egs.EgsTools.ReplaceFile(directory, filename, patchedHedStream, patchedPkgStream, asset, hedHeader);
-                                Log.Info($"Skipped File {filename} in {_pkgSoft}");
-                            }
-                        }
-
-                        // Add all files that are not in the original HED file and inject them in the PKG stream too
-                        foreach (var filename in patchFiles)
-                        {
-                            OpenKh.Egs.EgsTools.AddFile(directory, filename, patchedHedStream, patchedPkgStream);
-                            Log.Info($"Adding File {filename} to {_pkgSoft}");
-                        }
-
-                        hedStream.Close();
-                        pkgStream.Close();
-
-                        patchedHedStream.Close();
-                        patchedPkgStream.Close();
-
-                        File.Delete(hedFile);
-                        File.Delete(_pkgName);
-
-                        File.Move(Path.Combine(outputDir, Path.GetFileName(hedFile)), hedFile);
-                        File.Move(Path.Combine(outputDir, Path.GetFileName(_pkgName)), _pkgName);
-                    }
-                }
-            });
-        }
-
-        private async Task RestoreGame(bool patched)
-        {
-            await Task.Run(() =>
-            {
-                if (ConfigurationService.GameEdition == SetupWizardViewModel.PC)
-                {
-                    if (patched && _launchGame != "kh3d")
-                    {
-                        if (ConfigurationService.PcReleaseLocation == null || !Directory.Exists(Path.Combine(ConfigurationService.PcReleaseLocation, "BackupImage")))
-                        {
-                            Log.Warn("backup folder cannot be found! Cannot restore the game.");
-                        }
-                        else
-                        {
-                            foreach (var file in Directory.GetFiles(Path.Combine(ConfigurationService.PcReleaseLocation, "BackupImage")).Where(x => x.Contains(".pkg") && (x.Contains(_launchGame))))
-                            {
-                                Log.Info($"Restoring Package File {file.Replace(".pkg", "")}");
-
-                                var _fileBare = Path.GetFileName(file);
-                                var _trueName = Path.Combine(ConfigurationService.PcReleaseLocation, "Image", ConfigurationService.PCVersion == "Steam" && ConfigurationService.PcReleaseLanguage == "en" ? "dt" : ConfigurationService.PcReleaseLanguage, _fileBare);
-
-                                File.Delete(Path.ChangeExtension(_trueName, "hed"));
-                                File.Delete(_trueName);
-
-                                File.Copy(file, _trueName);
-                                File.Copy(Path.ChangeExtension(file, "hed"), Path.ChangeExtension(_trueName, "hed"));
-                            }
-                        }
-
-                    }
-                    else if (patched)
-                    {
-                        if (ConfigurationService.PcReleaseLocationKH3D == null || !Directory.Exists(Path.Combine(ConfigurationService.PcReleaseLocationKH3D, "BackupImage")))
-                        {
-                            Log.Warn("backup folder cannot be found! Cannot restore the game.");
-                        }
-                        else
-                        {
-                            foreach (var file in Directory.GetFiles(Path.Combine(ConfigurationService.PcReleaseLocationKH3D, "BackupImage")).Where(x => x.Contains(".pkg") && (x.Contains(_launchGame))))
-                            {
-                                Log.Info($"Restoring Package File {file.Replace(".pkg", "")}");
-
-                                var _fileBare = Path.GetFileName(file);
-                                var _trueName = Path.Combine(ConfigurationService.PcReleaseLocationKH3D, "Image", ConfigurationService.PCVersion == "Steam" && ConfigurationService.PcReleaseLanguage == "en" ? "dt" : ConfigurationService.PcReleaseLanguage, _fileBare);
-
-                                File.Delete(Path.ChangeExtension(_trueName, "hed"));
-                                File.Delete(_trueName);
-
-                                File.Copy(file, _trueName);
-                                File.Copy(Path.ChangeExtension(file, "hed"), Path.ChangeExtension(_trueName, "hed"));
-                            }
-                        }
-
-                    }
-                    if (Directory.Exists(ConfigurationService.CompiledModPath))
-                    {
-                        try
-                        {
-                            Directory.Delete(ConfigurationService.CompiledModPath, true);
-                        }
-                        catch (Exception ex)
-                        {
-                            Log.Warn("Unable to fully clean the mod directory:\n{0}", ex.Message);
-                        }
-                    }
-                }
-            });
-        }
-
-        private bool CanSelectedModMoveDown() =>
-            SelectedValue != null && ModsList.IndexOf(SelectedValue) < ModsList.Count - 1;
-
-        private bool CanSelectedModMoveUp() =>
-            SelectedValue != null && ModsList.IndexOf(SelectedValue) > 0;
-
-        private async Task FetchUpdates()
-        {
-            await Task.Delay(50); // fixes a bug where the UI wanted to refresh too soon
-            await foreach (var modUpdate in ModsService.FetchUpdates())
-            {
-                var mod = ModsList.FirstOrDefault(x => x.Source == modUpdate.Name);
-                if (mod == null)
-                    continue;
-
-                Application.Current.Dispatcher.Invoke(() =>
-                    mod.UpdateCount = modUpdate.UpdateCount);
-            }
-            if (AutoUpdateMods)
-            {
-                foreach (var mod in ModsList)
-                {
-                    if (mod.UpdateCount > 0)
-                        await ModsService.Update(mod.Source);
-                }
-                ReloadModsList();
-            }
-        }
-
-        private async Task UpdateOpenkhAsync()
-        {
-            var progressWindowService = new ProgressWindowService();
-
-            var checkResult = await progressWindowService.ShowAsync(
-                async monitor =>
-                {
-                    monitor.SetTitle("Checking update from github.com");
-                    var result = await new OpenkhUpdateCheckerService().CheckAsync(monitor.Cancellation);
-                    monitor.Cancellation.ThrowIfCancellationRequested();
-                    return result;
-                }
-            );
-            if (checkResult.HasUpdate)
-            {
-                var message = "A new version of OpenKh has been detected!\n" +
-                    $"[Current: {checkResult.CurrentVersion}, Latest: {checkResult.NewVersion}]\n\n" +
-                    "Do you wish to update the game?";
-
-                if (MessageBox.Show(message, "OpenKh", MessageBoxButton.YesNo) == MessageBoxResult.Yes)
-                {
-                    await progressWindowService.ShowAsync(
-                        async monitor =>
-                        {
-                            monitor.SetTitle("Updating");
-
-                            await new OpenkhUpdateProceederService().UpdateAsync(
-                                checkResult.DownloadZipUrl,
-                                rate => monitor.SetProgress(rate),
-                                monitor.Cancellation
-                            );
-                        }
-                    );
-                    ConfigurationService.Updated = true;
-                    // quit app
-                    Window?.Close();
-                }
-            }
-            else
-            {
-                var message = $"The latest version '{checkResult.CurrentVersion}' is already installed!";
-
-                MessageBox.Show(message, "OpenKh");
-            }
-        }
-
-        public void UpdatePanaceaSettings()
-        {
-            if (PanaceaInstalled)
-            {
-                string configTargetPath;
-
-                if (_launchGame != "kh3d" && ConfigurationService.PcReleaseLocation != null)
-                    configTargetPath = ConfigurationService.PcReleaseLocation;
-                else if (ConfigurationService.PcReleaseLocationKH3D != null)
-                    configTargetPath = ConfigurationService.PcReleaseLocationKH3D;
-                else
-                {
-                    Log.Warn("Unable to update Panacea settings! Game installation directory is not configured or is invalid.");
-
-                    return;
-                }
-
-                string panaceaSettings = Path.Combine(configTargetPath, "panacea_settings.txt");
-                string[] lines = File.Exists(panaceaSettings) ? File.ReadAllLines(panaceaSettings) : Array.Empty<string>();
-                string textToWrite = $"mod_path={Path.GetFullPath(Path.Combine(ConfigurationService.CompiledModPath,".."))}\r\n";
-                foreach (string entry in lines)
-                {
-                    if (entry.Contains("dev_path"))
-                    {
-                        textToWrite += entry;
-                        break;
-                    }
-                }
-                textToWrite += $"\r\nshow_console={_panaceaConsoleEnabled}\r\n" +
-                    $"debug_log={_panaceaDebugLogEnabled}\r\nsound_debug={_panaceaSoundDebugEnabled}\r\n" +
-                    $"enable_cache={_panaceaCacheEnabled}\r\nquick_menu={_panaceaQuickMenuEnabled}";
-                File.WriteAllText(panaceaSettings, textToWrite);
-            }
-        }
-
-        // PRESETS
-        public void SavePreset(string presetName)
-        {
-            string name = string.Join("+", presetName.Split(Path.GetInvalidFileNameChars()));
-            List<string> enabledMods = ModsList
-            .Where(x => x.Enabled)
-            .Select(x => x.Source)
-            .ToList();
-            File.WriteAllLines(Path.Combine(ConfigurationService.PresetPath, name + ".txt"), enabledMods);
-            if (!PresetList.Contains(name))
-            {
-                PresetList.Add(name);
-            }
-        }
-        public void RemovePreset(string presetName)
-        {
-            File.Delete(Path.Combine(ConfigurationService.PresetPath, presetName + ".txt"));
-            PresetList.Remove(presetName);
-        }
-
-        public void LoadPreset(string presetName)
-        {
-            string filename = Path.Combine(ConfigurationService.PresetPath, presetName + ".txt");
-            if (File.Exists(filename))
-            {
-                ConfigurationService.EnabledMods = File.ReadAllLines(filename);
-                ReloadModsList();
-                if (ModsList.Count > 0)
-                    _ = FetchUpdates();
-            }
-            else
-            {
-                MessageBox.Show("Cannot find preset", "Error", MessageBoxButton.OK, MessageBoxImage.Exclamation);
-            }
-        }
-
-        public void ReloadPresetList()
-        {
-            if (PresetList == null)
-                PresetList = new ObservableCollection<string>();
-
-            PresetList.Clear();
-            foreach (string presetFilePath in Directory.GetFiles(ConfigurationService.PresetPath))
-            {
-                PresetList.Add(Path.GetFileNameWithoutExtension(presetFilePath));
-            }
-        }
-    }
-}
diff --git a/OpenKh.Tools.ModsManager/ViewModels/ModViewModel.cs b/OpenKh.Tools.ModsManager/ViewModels/ModViewModel.cs
deleted file mode 100644
index 472dc5bd3..000000000
--- a/OpenKh.Tools.ModsManager/ViewModels/ModViewModel.cs
+++ /dev/null
@@ -1,350 +0,0 @@
-using LibGit2Sharp;
-using OpenKh.Common;
-using OpenKh.Tools.ModsManager.Models;
-using OpenKh.Tools.ModsManager.Services;
-using OpenKh.Tools.ModsManager.Views;
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.IO;
-using System.Linq;
-using System.Security.Policy;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using Xe.Tools;
-using Xe.Tools.Wpf.Commands;
-using static OpenKh.Tools.ModsManager.Helpers;
-
-namespace OpenKh.Tools.ModsManager.ViewModels
-{
-    public interface IChangeCollectionModEnableState
-    {
-        void CollectionModEnableStateChanged();
-    }
-    public class ModViewModel : BaseNotifyPropertyChanged, IChangeCollectionModEnableState
-    {
-        public ColorThemeService ColorTheme => ColorThemeService.Instance;
-        private static readonly string FallbackImage = null;
-        private readonly ModModel _model;
-        private CollectionSettingsViewModel _selectedCollectionValue;
-        private readonly IChangeModEnableState _changeModEnableState;
-        private int _updateCount;
-        public ObservableCollection<CollectionSettingsViewModel> CollectionModsList { get; set; }
-
-        public ModViewModel(ModModel model, IChangeModEnableState changeModEnableState)
-        {
-            _model = model;
-            _changeModEnableState = changeModEnableState;
-
-            var nameIndex = Source.IndexOf('/');
-            if (nameIndex > 0 && Repository.IsValid(_model.Path))
-            {
-                Author = Source[0..nameIndex];
-                Name = Source[(nameIndex + 1)..];
-
-                var _fetchRepository = new Repository(_model.Path);
-                var _fetchRemoteUrl = _fetchRepository.Network.Remotes.ElementAt(0).Url.TrimEnd('/');
-
-                SourceUrl = _fetchRemoteUrl;
-                ReportBugUrl = _fetchRemoteUrl + "/issues";
-
-                AuthorUrl = _fetchRemoteUrl.Substring(0, _fetchRemoteUrl.LastIndexOf('/') + 1);
-            }
-            else
-            {
-                Author = _model.Metadata?.OriginalAuthor;
-                Name = Source;
-            }
-
-            ReadMetadata();
-            if (IsCollection)
-            {
-                ReloadCollectionModsList();
-                CollectionSelectedValue = CollectionModsList.FirstOrDefault();
-            }
-
-            if (Title != null)
-                Name = Title;
-
-            UpdateCommand = new RelayCommand(async _ =>
-            {
-                InstallModProgressWindow progressWindow = null;
-                try
-                {
-                    progressWindow = Application.Current.Dispatcher.Invoke(() =>
-                    {
-                        var progressWindow = new InstallModProgressWindow
-                        {
-                            OperationName = "Updating",
-                            ModName = Source,
-                            ProgressText = "Initializing",
-                            ShowActivated = true
-                        };
-                        progressWindow.Show();
-                        return progressWindow;
-                    });
-
-                    await ModsService.Update(Source, progress =>
-                    {
-                        Application.Current.Dispatcher.Invoke(() => progressWindow.ProgressText = progress);
-                    }, nProgress =>
-                    {
-                        Application.Current.Dispatcher.Invoke(() => progressWindow.ProgressValue = nProgress);
-                    });
-
-                    Application.Current.Dispatcher.Invoke(() =>
-                    {
-                        progressWindow.ProgressText = "Reading latest changes";
-                        progressWindow.ProgressValue = 1f;
-                    });
-
-                    var mod = ModsService.GetMods(new string[] { Source }).First();
-                    ReadMetadata();
-
-                    Application.Current.Dispatcher.Invoke(() =>
-                    {
-                        progressWindow.Close();
-                    });
-                }
-                catch (Exception ex)
-                {
-                    Log.Warn("Unable to update the mod `{0}`: {1}\n"
-                        , Source
-                        , Log.FormatSecondaryLinesWithIndent(ex.ToString(), "  ")
-                    );
-                    Handle(ex);
-                }
-                finally
-                {
-                    Application.Current.Dispatcher.Invoke(() => progressWindow?.Close());
-                }
-            });
-
-            CollectionSettingsCommand = new RelayCommand(_ =>
-            {
-                var view = new CollectionSettingsView();
-                view.DataContext = this;
-                if (view.ShowDialog() != true)
-                {
-                    if (!ConfigurationService.EnabledCollectionMods.ContainsKey(_model.Name))
-                    {
-                        var temp = ConfigurationService.EnabledCollectionMods;
-                        temp[_model.Name] = new Dictionary<string, bool> { };
-                        ConfigurationService.EnabledCollectionMods = temp;
-                    }
-                    _model.CollectionOptionalEnabledAssets = ConfigurationService.EnabledCollectionMods[_model.Name];
-                    FilesToPatch = string.Join('\n', GetFilesToPatch());
-                    return;
-                }
-            });
-        }
-
-        public RelayCommand UpdateCommand { get; }
-
-        public RelayCommand CollectionSettingsCommand { get; set; }
-
-        public bool Enabled
-        {
-            get => _model.IsEnabled;
-            set
-            {
-                _model.IsEnabled = value;
-                _changeModEnableState.ModEnableStateChanged();
-                OnPropertyChanged();
-            }
-        }
-
-        public CollectionSettingsViewModel CollectionSelectedValue
-        {
-            get => _selectedCollectionValue;
-            set
-            {
-                _selectedCollectionValue = value;
-                OnPropertyChanged();
-                OnPropertyChanged(nameof(IsModSelected));
-                OnPropertyChanged(nameof(IsModUnselectedMessageVisible));
-            }
-        }
-
-        public bool IsModSelected => CollectionSelectedValue != null;
-        public ImageSource IconImage { get; private set; }
-        public ImageSource PreviewImage { get; private set; }
-        public Visibility PreviewImageVisibility => PreviewImage != null ? Visibility.Visible : Visibility.Collapsed;
-
-        public bool IsHosted => _model.Name.Contains('/');
-        public bool IsCollection => _model.Metadata.IsCollection;
-        public string Path => _model.Path;
-        public Visibility SourceVisibility => IsHosted ? Visibility.Visible : Visibility.Collapsed;
-        public Visibility LocalVisibility => !IsHosted ? Visibility.Visible : Visibility.Collapsed;
-        public Visibility CollectionSettingsVisibility => IsCollection ? Visibility.Visible : Visibility.Collapsed;
-        public Visibility IsModUnselectedMessageVisible => !IsModSelected ? Visibility.Visible : Visibility.Collapsed;
-
-        public string Title => _model?.Metadata?.Title ?? Name;
-        public string Name { get; }
-        public string Author { get; }
-        public string Source => _model.Name;
-        public string AuthorUrl { get; set; }
-        public string SourceUrl { get; set; }
-        public string ReportBugUrl { get; set; }
-        public string FilesToPatch
-        {
-            get
-            {
-                return string.Join('\n', GetFilesToPatch());
-            }
-            set
-            {
-                OnPropertyChanged();
-            }
-        }
-
-        public string Description => _model.Metadata?.Description;
-
-        public string Homepage
-        {
-            get
-            {
-                if (Source == null)
-                    return null;
-
-                var author = System.IO.Path.GetDirectoryName(Source);
-                var project = System.IO.Path.GetFileName(Source);
-                return $"https://{author}.github.io/{project}";
-            }
-        }
-
-        public int UpdateCount
-        {
-            get => _updateCount;
-            set
-            {
-                _updateCount = value;
-                OnPropertyChanged();
-                OnPropertyChanged(nameof(IsUpdateAvailable));
-                OnPropertyChanged(nameof(UpdateVisibility));
-            }
-        }
-
-        public bool IsUpdateAvailable => UpdateCount > 0;
-        public Visibility UpdateVisibility => IsUpdateAvailable ? Visibility.Visible : Visibility.Collapsed;
-
-        private IEnumerable<string> GetFilesToPatch()
-        {
-            foreach (var asset in _model.Metadata?.Assets ?? Enumerable.Empty<Patcher.AssetFile>())
-            {
-                var isOptionalEnabled = false;
-                if (asset.CollectionOptional == true)
-                {
-                    _model.CollectionOptionalEnabledAssets.TryGetValue(asset.Name, out isOptionalEnabled);
-                    if (!isOptionalEnabled)
-                        continue;
-                }
-                if (_model.Metadata.IsCollection)
-                    if (asset.Game != ConfigurationService.LaunchGame)
-                        continue;
-                yield return isOptionalEnabled ? $"{asset.Name} (optional, enabled)" : asset.Name;
-                if (asset.Multi != null)
-                {
-                    foreach (var multiAsset in asset.Multi)
-                        yield return multiAsset.Name;
-                }
-            }
-        }
-
-        private void ReadMetadata() => Task.Run(() =>
-        {
-            LoadImage(_model.IconImageSource, FallbackImage, image =>
-            {
-                IconImage = image;
-                OnPropertyChanged(nameof(IconImage));
-            });
-            LoadImage(_model.PreviewImageSource, null, image =>
-            {
-                PreviewImage = image;
-                OnPropertyChanged(nameof(PreviewImage));
-                OnPropertyChanged(nameof(PreviewImageVisibility));
-            });
-
-            Application.Current.Dispatcher.Invoke(() =>
-            {
-                OnPropertyChanged(nameof(Title));
-                OnPropertyChanged(nameof(Description));
-                OnPropertyChanged(nameof(Homepage));
-                OnPropertyChanged(nameof(FilesToPatch));
-                UpdateCount = 0;
-            });
-        });
-
-        private void ReloadCollectionModsList()
-        {
-            CollectionModsList = new ObservableCollection<CollectionSettingsViewModel>(
-                ModsService.GetCollectionOptionalMods(_model).Select(Map));
-            OnPropertyChanged(nameof(CollectionModsList));
-        }
-        public void CollectionModEnableStateChanged()
-        {
-            var mods = CollectionModsList.ToList();
-            var current = new Dictionary<string, bool> { };
-            var holder = ConfigurationService.EnabledCollectionMods;
-            if (holder.ContainsKey(_model.Name))
-            {
-                current = holder[_model.Name];
-                foreach (KeyValuePair<string, bool> entry in current)
-                    foreach (var mod in mods)
-                        if (mod.Name == entry.Key)
-                        {
-                            current[mod.Name] = mod.Enabled;
-                        }
-            }
-            else
-            {
-                holder[_model.Name] = new Dictionary<string, bool> { };
-                current = holder[_model.Name];
-                foreach (var mod in mods)
-                {
-                    current[mod.Name] = mod.Enabled;
-                }
-            }
-            holder[_model.Name] = current;
-            ConfigurationService.EnabledCollectionMods = holder;
-        }
-        private CollectionSettingsViewModel Map(CollectionModModel mod) => new (mod, this);
-
-        private static void LoadImage(string source, string fallback, Action<ImageSource> setter)
-        {
-            if (string.IsNullOrEmpty(source) && !string.IsNullOrEmpty(fallback))
-            {
-                LoadImage(fallback, null, setter);
-                return;
-            }
-
-            try
-            {
-                if (!File.Exists(source))
-                {
-                    if (!string.IsNullOrEmpty(fallback))
-                        LoadImage(fallback, null, setter);
-                    return;
-                }
-
-                using (var fs = new FileStream(source, FileMode.Open))
-                {
-                    var bitmapImage = new BitmapImage();
-                    bitmapImage.BeginInit();
-                    bitmapImage.StreamSource = fs;
-                    bitmapImage.CacheOption = BitmapCacheOption.OnLoad;
-                    bitmapImage.EndInit();
-                    bitmapImage.Freeze();
-
-                    Application.Current.Dispatcher.Invoke(() => setter(bitmapImage));
-                }
-            }
-            catch
-            {
-                // Silently fail if the image can not be loaded
-            }
-        }
-    }
-}
diff --git a/OpenKh.Tools.ModsManager/ViewModels/SetupWizardViewModel.cs b/OpenKh.Tools.ModsManager/ViewModels/SetupWizardViewModel.cs
deleted file mode 100644
index a4dacd229..000000000
--- a/OpenKh.Tools.ModsManager/ViewModels/SetupWizardViewModel.cs
+++ /dev/null
@@ -1,1953 +0,0 @@
-using Octokit;
-using OpenKh.Common;
-using OpenKh.Tools.Common.Wpf;
-using OpenKh.Tools.ModsManager.Services;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Net;
-using System.Threading.Tasks;
-using System.Windows;
-using Xe.Tools;
-using Xe.Tools.Wpf.Commands;
-using Xe.Tools.Wpf.Dialogs;
-using System.Text.RegularExpressions;
-using System.Threading;
-using System.IO.Compression;
-using System.Diagnostics;
-
-namespace OpenKh.Tools.ModsManager.ViewModels
-{
-    public class SetupWizardViewModel : BaseNotifyPropertyChanged
-    {
-        public ColorThemeService ColorTheme => ColorThemeService.Instance;
-        private const int BufferSize = 65536;
-        private readonly GameDataExtractionService _gameDataExtractionService = new GameDataExtractionService();
-        private static readonly string PanaceaDllName = "OpenKH.Panacea.dll";
-        private static string ApplicationName = Utilities.GetApplicationName();
-        private static List<FileDialogFilter> _isoFilter = FileDialogFilterComposer
-            .Compose()
-            .AddExtensions("PlayStation 2 game ISO", "iso");
-        private static List<FileDialogFilter> _openkhGeFilter = FileDialogFilterComposer
-            .Compose()
-            .AddExtensions("OpenKH Game Engine Executable", "*Game.exe");
-        private static List<FileDialogFilter> _pcsx2Filter = FileDialogFilterComposer
-            .Compose()
-            .AddExtensions("PCSX2 Emulator", "exe");
-
-        public const int OpenKHGameEngine = 0;
-        public const int PCSX2 = 1;
-        public const int PC = 2;
-
-        private int _gameEdition;
-        private string _isoLocation = null;
-        private string _isoLocationKH2 = ConfigurationService.IsoLocationKH2;
-        private string _isoLocationKH1 = ConfigurationService.IsoLocationKH1;
-        private string _isoLocationRecom = ConfigurationService.IsoLocationRecom;
-        private string _openKhGameEngineLocation = ConfigurationService.OpenKhGameEngineLocation;
-        private string _pcsx2Location = ConfigurationService.Pcsx2Location;
-        private string _pcReleaseLocation = ConfigurationService.PcReleaseLocation;
-        private string _pcReleaseLocationKH3D = ConfigurationService.PcReleaseLocationKH3D;
-        private int _gameCollection = 0;
-        private string _pcReleaseLanguage = ConfigurationService.PcReleaseLanguage;
-        private string _gameDataLocation = ConfigurationService.GameDataLocation;
-        private List<string> LuaScriptPaths = new List<string>();
-        private bool _overrideGameDataFound = false;
-
-        private Xceed.Wpf.Toolkit.WizardPage _wizardPageAfterIntro;
-        public Xceed.Wpf.Toolkit.WizardPage WizardPageAfterIntro
-        {
-            get => _wizardPageAfterIntro;
-            private set
-            {
-                _wizardPageAfterIntro = value;
-                OnPropertyChanged();
-            }
-        }
-        private Xceed.Wpf.Toolkit.WizardPage _wizardPageAfterGameData;
-        public Xceed.Wpf.Toolkit.WizardPage WizardPageAfterGameData
-        {
-            get => _wizardPageAfterGameData;
-            private set
-            {
-                _wizardPageAfterGameData = value;
-                OnPropertyChanged();
-            }
-        }
-        private Xceed.Wpf.Toolkit.WizardPage _wizardPageAfterLuaBackend;
-        public Xceed.Wpf.Toolkit.WizardPage WizardPageAfterLuaBackend
-        {
-            get => _wizardPageAfterLuaBackend;
-            private set
-            {
-                _wizardPageAfterLuaBackend = value;
-                OnPropertyChanged();
-            }
-        }
-        public Xceed.Wpf.Toolkit.WizardPage PageIsoSelection { get; internal set; }
-        public Xceed.Wpf.Toolkit.WizardPage PageEosInstall { get; internal set; }
-        public Xceed.Wpf.Toolkit.WizardPage PageSteamAPITrick { get; internal set; }
-        public Xceed.Wpf.Toolkit.WizardPage PageRegion { get; internal set; }
-        public Xceed.Wpf.Toolkit.WizardPage PageGameData { get; internal set; }
-        public Xceed.Wpf.Toolkit.WizardPage LastPage { get; internal set; }
-
-        public WizardPageStackService PageStack { get; set; } = new WizardPageStackService();
-
-        private const string RAW_FILES_FOLDER_NAME = "raw";
-        private const string ORIGINAL_FILES_FOLDER_NAME = "original";
-        private const string REMASTERED_FILES_FOLDER_NAME = "remastered";
-
-        public string Title => $"Set-up wizard | {ApplicationName}";
-
-        public RelayCommand SelectIsoCommand { get; }
-        public string GameId { get; set; }
-        public string GameName { get; set; }
-        public string IsoLocation
-        {
-            get => _isoLocation;
-            set
-            {
-                _isoLocation = value;
-                if (File.Exists(_isoLocation))
-                {
-                    var game = GameService.DetectGameId(_isoLocation);
-                    GameId = game?.Id;
-                    GameName = game?.Name;
-                }
-                else
-                {
-                    GameId = null;
-                    GameName = null;
-                }
-
-                OnPropertyChanged();
-                OnPropertyChanged(nameof(GameName));
-            }
-        }
-        public void ValidateIsoLocations()
-        {
-            GameName = null;
-            if (!File.Exists(_isoLocationKH2) || GameService.DetectGameId(_isoLocationKH2)?.Id != "kh2")
-            {
-                _isoLocation = _isoLocationKH2;
-                GameId = null;
-                if (string.IsNullOrEmpty(GameName))
-                {
-                    GameName = "Kingdom Hearts II";
-                }
-                else
-                {
-                    GameName += " & Kingdom Hearts II";
-                }
-            }
-            if (!File.Exists(_isoLocationKH1) || GameService.DetectGameId(_isoLocationKH1)?.Id != "kh1")
-            {
-                _isoLocation = _isoLocationKH1;
-                GameId = null;
-                if (string.IsNullOrEmpty(GameName))
-                {
-                    GameName = "Kingdom Hearts I";
-                }
-                else
-                {
-                    GameName += " & Kingdom Hearts I";
-                }
-            }
-            if (!File.Exists(_isoLocationRecom) || GameService.DetectGameId(_isoLocationRecom)?.Id != "Recom")
-            {
-                _isoLocation = _isoLocationRecom;
-                GameId = null;
-                if (string.IsNullOrEmpty(GameName))
-                {
-                    GameName = "Kingdom Hearts Re:Chain of Memories";
-                }
-                else
-                {
-                    GameName += " & Kingdom Hearts Re:Chain of Memories";
-                }
-            }
-            OnPropertyChanged(nameof(GameName));
-            OnPropertyChanged(nameof(GameNotRecognizedVisibility));
-            OnPropertyChanged(nameof(IsGameRecognized));
-        }
-        public string IsoLocationKH2
-        {
-            get => _isoLocationKH2;
-            set
-            {
-                _isoLocationKH2 = value;
-                WizardPageAfterGameData = !string.IsNullOrEmpty(_isoLocationKH2) ? PageRegion : LastPage;
-                ConfigurationService.IsoLocationKH2 = _isoLocationKH2;
-
-                OnPropertyChanged();
-                OnPropertyChanged(nameof(IsGameDataFound));
-                OnPropertyChanged(nameof(GameDataFoundVisibility));
-                OnPropertyChanged(nameof(GameDataNotFoundVisibility));
-                OnPropertyChanged(nameof(KH2RecognizedVisibility));
-                OnPropertyChanged(nameof(WizardPageAfterGameData));
-            }
-        }
-        public string IsoLocationKH1
-        {
-            get => _isoLocationKH1;
-            set
-            {
-                _isoLocationKH1 = value;
-                ConfigurationService.IsoLocationKH1 = _isoLocationKH1;
-
-                OnPropertyChanged();
-                OnPropertyChanged(nameof(IsGameDataFound));
-                OnPropertyChanged(nameof(GameDataFoundVisibility));
-                OnPropertyChanged(nameof(GameDataNotFoundVisibility));
-                OnPropertyChanged(nameof(KH1RecognizedVisibility));
-            }
-        }
-        public string IsoLocationRecom
-        {
-            get => _isoLocationRecom;
-            set
-            {
-                _isoLocationRecom = value;
-                ConfigurationService.IsoLocationRecom = _isoLocationRecom;
-
-                OnPropertyChanged();
-                OnPropertyChanged(nameof(IsGameDataFound));
-                OnPropertyChanged(nameof(GameDataFoundVisibility));
-                OnPropertyChanged(nameof(GameDataNotFoundVisibility));
-                OnPropertyChanged(nameof(RecomRecognizedVisibility));
-            }
-        }
-        public bool IsIsoSelected => (!string.IsNullOrEmpty(IsoLocation) && File.Exists(IsoLocation));
-        public bool IsGameRecognized => (IsIsoSelected && GameId != null);
-        public Visibility GameRecognizedVisibility => IsIsoSelected && GameId != null ? Visibility.Visible : Visibility.Collapsed;
-        public Visibility GameNotRecognizedVisibility => IsIsoSelected && GameId == null ? Visibility.Visible : Visibility.Collapsed;
-        public Visibility KH1RecognizedVisibility => !string.IsNullOrEmpty(_isoLocationKH1) ? Visibility.Visible : Visibility.Collapsed;
-        public Visibility KH2RecognizedVisibility => !string.IsNullOrEmpty(_isoLocationKH2) ? Visibility.Visible : Visibility.Collapsed;
-        public Visibility RecomRecognizedVisibility => !string.IsNullOrEmpty(_isoLocationRecom) ? Visibility.Visible : Visibility.Collapsed;
-
-        public bool IsGameSelected
-        {
-            get
-            {
-                return GameEdition switch
-                {
-                    OpenKHGameEngine => !string.IsNullOrEmpty(OpenKhGameEngineLocation) && File.Exists(OpenKhGameEngineLocation),
-                    PCSX2 => !string.IsNullOrEmpty(Pcsx2Location) && File.Exists(Pcsx2Location),
-                    PC => (!string.IsNullOrEmpty(PcReleaseLocation) &&
-                        Directory.Exists(PcReleaseLocation) &&
-                        (File.Exists(Path.Combine(PcReleaseLocation, "EOSSDK-Win64-Shipping.dll")) ||
-                        File.Exists(Path.Combine(PcReleaseLocation, "steam_api64.dll"))))||
-                        (!string.IsNullOrEmpty(PcReleaseLocationKH3D) &&
-                        Directory.Exists(PcReleaseLocationKH3D) &&
-                        (File.Exists(Path.Combine(PcReleaseLocationKH3D, "EOSSDK-Win64-Shipping.dll")) ||
-                        File.Exists(Path.Combine(PcReleaseLocationKH3D, "steam_api64.dll")))),
-                    _ => false,
-                };
-            }
-        }
-
-        public int GameEdition
-        {
-            get
-            {
-                _gameEdition = ConfigurationService.GameEdition;
-                WizardPageAfterIntro = _gameEdition switch
-                {
-                    OpenKHGameEngine => LastPage,
-                    PCSX2 => PageIsoSelection,
-                    PC => PageEosInstall,
-                    _ => null,
-                };
-                WizardPageAfterGameData = _gameEdition switch
-                {
-                    OpenKHGameEngine => LastPage,
-                    PCSX2 => !string.IsNullOrEmpty(_isoLocationKH2) ? PageRegion : LastPage,
-                    PC => LastPage,
-                    _ => null,
-                };
-                return _gameEdition;
-            }
-            set
-            {
-                _gameEdition = value;
-                ConfigurationService.GameEdition = _gameEdition;
-                WizardPageAfterIntro = _gameEdition switch
-                {
-                    OpenKHGameEngine => LastPage,
-                    PCSX2 => PageIsoSelection,
-                    PC => PageEosInstall,
-                    _ => null,
-                };
-                WizardPageAfterGameData = _gameEdition switch
-                {
-                    OpenKHGameEngine => LastPage,
-                    PCSX2 => !string.IsNullOrEmpty(_isoLocationKH2) ? PageRegion : LastPage,
-                    PC => LastPage,
-                    _ => null,
-                };
-
-                OnPropertyChanged();
-                OnPropertyChanged(nameof(IsGameSelected));
-                OnPropertyChanged(nameof(OpenKhGameEngineConfigVisibility));
-                OnPropertyChanged(nameof(Pcsx2ConfigVisibility));
-                OnPropertyChanged(nameof(PcReleaseConfigVisibility));
-                OnPropertyChanged(nameof(BothPcReleaseSelected));
-                OnPropertyChanged(nameof(PcRelease1525Selected));
-                OnPropertyChanged(nameof(PcRelease28Selected));
-            }
-        }
-        public int PCReleaseLanguage
-        {
-            get
-            {
-                switch (_pcReleaseLanguage)
-                {
-                    case "jp":
-                        return 1;
-                    default:
-                        return 0;
-                }
-            }
-            set
-            {
-                switch (value)
-                {
-                    case 1:
-                        ConfigurationService.PcReleaseLanguage = "jp";
-                        _pcReleaseLanguage = "jp";
-                        break;
-                    default:
-                        ConfigurationService.PcReleaseLanguage = "en";
-                        _pcReleaseLanguage = "en";
-                        break;
-                }
-            }
-        }
-
-        public int LaunchOption
-        {
-            get
-            {
-                switch (ConfigurationService.PCVersion)
-                {
-                    case "Steam":
-                        WizardPageAfterLuaBackend = PageSteamAPITrick;
-                        return 1;
-                    case "Other":
-                        WizardPageAfterLuaBackend = PageGameData;
-                        return 2;
-                    default:
-                        WizardPageAfterLuaBackend = PageGameData;
-                        return 0;
-                }
-            }
-            set
-            {
-                switch (value)
-                {
-                    case 1:
-                        ConfigurationService.PCVersion = "Steam";
-                        WizardPageAfterLuaBackend = PageSteamAPITrick;
-                        break;
-                    case 2:
-                        ConfigurationService.PCVersion = "Other";
-                        WizardPageAfterLuaBackend = PageGameData;
-                        break;
-                    default:
-                        ConfigurationService.PCVersion = "EGS";
-                        WizardPageAfterLuaBackend = PageGameData;
-                        break;
-                }
-            }
-        }
-        public RelayCommand SelectOpenKhGameEngineCommand { get; }
-        public Visibility OpenKhGameEngineConfigVisibility => GameEdition == OpenKHGameEngine ? Visibility.Visible : Visibility.Collapsed;
-        public string OpenKhGameEngineLocation
-        {
-            get => _openKhGameEngineLocation;
-            set
-            {
-                _openKhGameEngineLocation = value;
-                ConfigurationService.OpenKhGameEngineLocation = _openKhGameEngineLocation;
-                OnPropertyChanged();
-                OnPropertyChanged(nameof(IsGameSelected));
-            }
-        }
-
-        public RelayCommand SelectPcsx2Command { get; }
-        public Visibility Pcsx2ConfigVisibility => GameEdition == PCSX2 ? Visibility.Visible : Visibility.Collapsed;
-        public string Pcsx2Location
-        {
-            get => _pcsx2Location;
-            set
-            {
-                _pcsx2Location = value;
-                ConfigurationService.Pcsx2Location = _pcsx2Location;
-                OnPropertyChanged();
-                OnPropertyChanged(nameof(IsGameSelected));
-            }
-        }
-
-        public RelayCommand SelectPcReleaseCommand { get; }
-        public RelayCommand SelectPcReleaseKH3DCommand { get; }
-        public Visibility PcReleaseConfigVisibility => GameEdition == PC  ? Visibility.Visible : Visibility.Collapsed;
-        public Visibility BothPcReleaseSelected => PcReleaseSelections == "both" ? Visibility.Visible : Visibility.Collapsed;
-        public Visibility PcRelease1525Selected => PcReleaseSelections == "1.5+2.5" ? Visibility.Visible: Visibility.Collapsed;
-        public Visibility PcRelease28Selected => PcReleaseSelections == "2.8" ? Visibility.Visible : Visibility.Collapsed;
-        public Visibility InstallForPc1525 => GameCollection == 0 && (PcReleaseSelections == "both" || PcReleaseSelections == "1.5+2.5") ? Visibility.Visible : Visibility.Collapsed;
-        public Visibility InstallForPc28 => GameCollection == 1 && (PcReleaseSelections == "both" || PcReleaseSelections == "2.8") ? Visibility.Visible :Visibility.Collapsed;
-        public string PcReleaseLocation
-        {
-            get => _pcReleaseLocation;
-            set
-            {
-                _pcReleaseLocation = value;
-                ConfigurationService.PcReleaseLocation = _pcReleaseLocation;
-                OnPropertyChanged();
-                OnPropertyChanged(nameof(IsLastPanaceaVersionInstalled));
-                OnPropertyChanged(nameof(PanaceaInstalledVisibility));
-                OnPropertyChanged(nameof(PanaceaNotInstalledVisibility));
-                OnPropertyChanged(nameof(IsGameSelected));
-                OnPropertyChanged(nameof(IsGameDataFound));
-                OnPropertyChanged(nameof(LuaBackendFoundVisibility));
-                OnPropertyChanged(nameof(LuaBackendNotFoundVisibility));
-                OnPropertyChanged(nameof(BothPcReleaseSelected));
-                OnPropertyChanged(nameof(PcRelease1525Selected));
-                OnPropertyChanged(nameof(PcRelease28Selected));
-                OnPropertyChanged(nameof(InstallForPc1525));
-                OnPropertyChanged(nameof(SteamAPIFileFound));
-                OnPropertyChanged(nameof(SteamAPIFileNotFound));
-            }
-        }
-
-        public string PcReleaseLocationKH3D
-        {
-            get => _pcReleaseLocationKH3D;
-            set
-            {
-                _pcReleaseLocationKH3D = value;
-                ConfigurationService.PcReleaseLocationKH3D = _pcReleaseLocationKH3D;
-                OnPropertyChanged();
-                OnPropertyChanged(nameof(IsLastPanaceaVersionInstalled));
-                OnPropertyChanged(nameof(PanaceaInstalledVisibility));
-                OnPropertyChanged(nameof(PanaceaNotInstalledVisibility));
-                OnPropertyChanged(nameof(IsGameSelected));
-                OnPropertyChanged(nameof(IsGameDataFound));
-                OnPropertyChanged(nameof(LuaBackendFoundVisibility));
-                OnPropertyChanged(nameof(LuaBackendNotFoundVisibility));
-                OnPropertyChanged(nameof(BothPcReleaseSelected));
-                OnPropertyChanged(nameof(PcRelease1525Selected));
-                OnPropertyChanged(nameof(PcRelease28Selected));
-                OnPropertyChanged(nameof(InstallForPc28));
-                OnPropertyChanged(nameof(SteamAPIFileFound));
-                OnPropertyChanged(nameof(SteamAPIFileNotFound));
-            }
-        }
-
-        public string PcReleaseSelections
-        {
-            get
-            {
-                if (Directory.Exists(PcReleaseLocation) && (File.Exists(Path.Combine(PcReleaseLocation, "EOSSDK-Win64-Shipping.dll")) ||
-                    File.Exists(Path.Combine(PcReleaseLocation, "steam_api64.dll"))) &&
-                    Directory.Exists(PcReleaseLocationKH3D) && (File.Exists(Path.Combine(PcReleaseLocationKH3D, "EOSSDK-Win64-Shipping.dll")) ||
-                    File.Exists(Path.Combine(PcReleaseLocationKH3D, "steam_api64.dll"))) && _gameEdition == PC)
-                {
-                    return "both";
-                }
-                else if (Directory.Exists(PcReleaseLocation) && (File.Exists(Path.Combine(PcReleaseLocation, "EOSSDK-Win64-Shipping.dll")) ||
-                    File.Exists(Path.Combine(PcReleaseLocation, "steam_api64.dll"))) && _gameEdition == PC)
-                {
-
-                    return "1.5+2.5";
-                }
-                else if (Directory.Exists(PcReleaseLocationKH3D) && (File.Exists(Path.Combine(PcReleaseLocationKH3D, "EOSSDK-Win64-Shipping.dll")) ||
-                    File.Exists(Path.Combine(PcReleaseLocationKH3D, "steam_api64.dll"))) && _gameEdition == PC)
-                {
-
-                    return "2.8";
-                }
-                return "";
-            }
-        }
-
-        public int GameCollection
-        {
-            get => _gameCollection;
-            set
-            {
-                _gameCollection = value;
-                OnPropertyChanged(nameof(GameCollection));
-                OnPropertyChanged(nameof(InstallForPc1525));
-                OnPropertyChanged(nameof(InstallForPc28));
-                OnPropertyChanged(nameof(LuaBackendFoundVisibility));
-                OnPropertyChanged(nameof(LuaBackendNotFoundVisibility));
-                OnPropertyChanged(nameof(IsLastPanaceaVersionInstalled));
-                OnPropertyChanged(nameof(PanaceaInstalledVisibility));
-                OnPropertyChanged(nameof(PanaceaNotInstalledVisibility));
-                OnPropertyChanged(nameof(SteamAPIFileFound));
-                OnPropertyChanged(nameof(SteamAPIFileNotFound));
-            }
-        }
-        public bool Extractkh1
-        {
-            get => ConfigurationService.Extractkh1;
-            set => ConfigurationService.Extractkh1 = value;
-        }
-        public bool Extractkh2
-        {
-            get => ConfigurationService.Extractkh2;
-            set => ConfigurationService.Extractkh2 = value;
-        }
-        public bool Extractbbs
-        {
-            get => ConfigurationService.Extractbbs;
-            set => ConfigurationService.Extractbbs = value;
-        }
-        public bool Extractrecom
-        {
-            get => ConfigurationService.Extractrecom;
-            set => ConfigurationService.Extractrecom = value;
-        }
-        public bool Extractkh3d
-        {
-            get => ConfigurationService.Extractkh3d;
-            set => ConfigurationService.Extractkh3d = value;
-        }
-        public bool SkipRemastered
-        {
-            get => ConfigurationService.SkipRemastered;
-            set => ConfigurationService.SkipRemastered = value;
-        }
-        public bool LuaConfigkh1
-        {
-            get => LuaScriptPaths.Contains("kh1");
-            set
-            {
-                if (value)
-                {
-                    LuaScriptPaths.Add("kh1");
-                }
-                else
-                {
-                    LuaScriptPaths.Remove("kh1");
-                }
-            }
-        }
-        public bool LuaConfigkh2
-        {
-            get => LuaScriptPaths.Contains("kh2");
-            set
-            {
-                if (value)
-                {
-                    LuaScriptPaths.Add("kh2");
-                }
-                else
-                {
-                    LuaScriptPaths.Remove("kh2");
-                }
-            }
-        }
-        public bool LuaConfigbbs
-        {
-            get => LuaScriptPaths.Contains("bbs");
-            set
-            {
-                if (value)
-                {
-                    LuaScriptPaths.Add("bbs");
-                }
-                else
-                {
-                    LuaScriptPaths.Remove("bbs");
-                }
-            }
-        }
-        public bool LuaConfigrecom
-        {
-            get => LuaScriptPaths.Contains("Recom");
-            set
-            {
-                if (value)
-                {
-                    LuaScriptPaths.Add("Recom");
-                }
-                else
-                {
-                    LuaScriptPaths.Remove("Recom");
-                }
-            }
-        }
-        public bool LuaConfigkh3d
-        {
-            get => LuaScriptPaths.Contains("kh3d");
-            set
-            {
-                if (value)
-                {
-                    LuaScriptPaths.Add("kh3d");
-                }
-                else
-                {
-                    LuaScriptPaths.Remove("kh3d");
-                }
-            }
-        }
-        public bool OverrideGameDataFound
-        {
-            get => _overrideGameDataFound;
-            set
-            {
-                _overrideGameDataFound = value;
-                OnPropertyChanged();
-                OnPropertyChanged(nameof(IsGameDataFound));
-                OnPropertyChanged(nameof(GameDataNotFoundVisibility));
-                OnPropertyChanged(nameof(GameDataFoundVisibility));
-            }
-
-        }
-
-        public RelayCommand SelectGameDataLocationCommand { get; }
-        public string GameDataLocation
-        {
-            get => ConfigurationService.GameDataLocation = _gameDataLocation;
-            set
-            {
-                _gameDataLocation = value;
-                ConfigurationService.GameDataLocation = value;
-                OnPropertyChanged();
-                OnPropertyChanged(nameof(IsGameDataFound));
-                OnPropertyChanged(nameof(GameDataNotFoundVisibility));
-                OnPropertyChanged(nameof(GameDataFoundVisibility));
-            }
-        }
-
-        public bool IsNotExtracting { get; private set; }
-        public bool IsGameDataFound => IsNotExtracting &&
-            ((GameEdition == PCSX2 && (GameService.FolderContainsUniqueFile("kh2", Path.Combine(GameDataLocation, "kh2")) ||
-            GameService.FolderContainsUniqueFile("kh1", Path.Combine(GameDataLocation, "kh1")) ||
-            GameService.FolderContainsUniqueFile("Recom", Path.Combine(GameDataLocation, "Recom")))) ||
-            (GameEdition == PC && (GameService.FolderContainsUniqueFile("kh2", Path.Combine(GameDataLocation, "kh2")) ||
-            GameService.FolderContainsUniqueFile("kh1", Path.Combine(GameDataLocation, "kh1")) ||
-            Directory.Exists(Path.Combine(GameDataLocation, "bbs", "message")) ||
-            Directory.Exists(Path.Combine(GameDataLocation, "Recom", "SYS"))||
-            Directory.Exists(Path.Combine(GameDataLocation, "kh3d","setdata"))))||
-            OverrideGameDataFound);
-        public Visibility GameDataNotFoundVisibility => !IsGameDataFound ? Visibility.Visible : Visibility.Collapsed;
-        public Visibility GameDataFoundVisibility => IsGameDataFound ? Visibility.Visible : Visibility.Collapsed;
-        public Visibility ProgressBarVisibility => IsNotExtracting ? Visibility.Collapsed : Visibility.Visible;
-        public Visibility ExtractionCompleteVisibility => ExtractionProgress == 1f ? Visibility.Visible : Visibility.Collapsed;
-        public RelayCommand ExtractGameDataCommand { get; set; }
-        public float ExtractionProgress { get; set; }
-        public int RegionId
-        {
-            get
-            {
-                return ConfigurationService.RegionId;
-            }
-            set
-            {
-                ConfigurationService.RegionId = value;
-            }
-        }
-        public bool IsLuaBackendInstalled
-        {
-            get
-            {
-                if (PcReleaseLocation != null && GameCollection == 0)
-                {
-                    return File.Exists(Path.Combine(PcReleaseLocation, "LuaBackend.dll")) && File.Exists(Path.Combine(PcReleaseLocation, "LuaBackend.toml"));
-                }
-                else if (PcReleaseLocationKH3D != null && GameCollection == 1)
-                {
-                    return File.Exists(Path.Combine(PcReleaseLocationKH3D, "LuaBackend.dll")) && File.Exists(Path.Combine(PcReleaseLocationKH3D, "LuaBackend.toml"));
-                }
-                else
-                    return false;
-            }
-        }
-        public bool IsSteamAPIFileInstalled
-        {
-            get
-            {
-                if (PcReleaseLocation != null && GameCollection == 0 && ConfigurationService.PCVersion == "Steam")
-                {
-                    if (File.Exists(Path.Combine(PcReleaseLocation, "steam_appid.txt")))
-                    {
-                        ConfigurationService.SteamAPITrick1525 = true;
-                        return true;
-                    }
-                    return false;
-                }
-                else if (PcReleaseLocationKH3D != null && GameCollection == 1)
-                {
-                    if (File.Exists(Path.Combine(PcReleaseLocationKH3D, "steam_appid.txt")))
-                    {
-                        ConfigurationService.SteamAPITrick28 = true;
-                        return true;
-                    }
-                    return false;
-                }
-                else
-                return false;
-            }
-        }
-        public RelayCommand InstallSteamAPIFile {  get; set; }
-        public RelayCommand RemoveSteamAPIFile { get; set; }
-        public RelayCommand InstallLuaBackendCommand { get; set; }
-        public RelayCommand RemoveLuaBackendCommand { get; set; }
-        public Visibility LuaBackendFoundVisibility => IsLuaBackendInstalled ? Visibility.Visible : Visibility.Collapsed;
-        public Visibility LuaBackendNotFoundVisibility => IsLuaBackendInstalled ? Visibility.Collapsed : Visibility.Visible;
-        public Visibility SteamAPIFileFound => IsSteamAPIFileInstalled ? Visibility.Visible : Visibility.Collapsed;
-        public Visibility SteamAPIFileNotFound => IsSteamAPIFileInstalled ? Visibility.Collapsed : Visibility.Visible;
-        public RelayCommand InstallPanaceaCommand { get; }
-        public RelayCommand DetectInstallsCommand { get; }
-        public RelayCommand RemovePanaceaCommand { get; }
-        public bool PanaceaInstalled { get; set; }
-        private string PanaceaSourceLocation => Path.Combine(AppContext.BaseDirectory, PanaceaDllName);
-        public Visibility PanaceaNotInstalledVisibility => !IsLastPanaceaVersionInstalled ? Visibility.Visible : Visibility.Collapsed;
-        public Visibility PanaceaInstalledVisibility => IsLastPanaceaVersionInstalled ? Visibility.Visible : Visibility.Collapsed;
-        public bool IsLastPanaceaVersionInstalled
-        {
-            get
-            {
-                if (PcReleaseLocation == null && GameCollection == 0)
-                {
-                    // Won't be able to find the source location
-                    PanaceaInstalled = false;
-                    ConfigurationService.PanaceaInstalled = PanaceaInstalled;
-                    return false;
-                }
-
-                if (PcReleaseLocationKH3D == null && GameCollection == 1)
-                {
-                    // Won't be able to find the source location
-                    PanaceaInstalled = false;
-                    ConfigurationService.PanaceaInstalled = PanaceaInstalled;
-                    return false;
-                }
-
-                if (!File.Exists(PanaceaSourceLocation))
-                {
-                    // While debugging it is most likely to not have the compiled
-                    // DLL into the right place. So don't bother.
-                    PanaceaInstalled = true;
-                    ConfigurationService.PanaceaInstalled = PanaceaInstalled;
-                    return true;
-                }
-
-                byte[] CalculateChecksum(string fileName) =>
-                    System.Security.Cryptography.MD5.Create().Using(md5 =>
-                        File.OpenRead(fileName).Using(md5.ComputeHash));
-                bool IsEqual(byte[] left, byte[] right)
-                {
-                    for (var i = 0; i < left.Length; i++)
-                        if (left[i] != right[i])
-                        {
-                            PanaceaInstalled = false;
-                            ConfigurationService.PanaceaInstalled = PanaceaInstalled;
-                            return false;
-                        }
-                    PanaceaInstalled = true;
-                    ConfigurationService.PanaceaInstalled = PanaceaInstalled;
-                    return true;
-                }
-                string PanaceaDestinationLocation = null;
-                string PanaceaAlternateLocation = null;
-                if (GameCollection == 0)
-                {
-                    PanaceaDestinationLocation = Path.Combine(PcReleaseLocation, "DBGHELP.dll");
-                    PanaceaAlternateLocation = Path.Combine(PcReleaseLocation, "version.dll");
-                }
-                else
-                {
-                    PanaceaDestinationLocation = Path.Combine(PcReleaseLocationKH3D, "DBGHELP.dll");
-                    PanaceaAlternateLocation = Path.Combine(PcReleaseLocationKH3D, "version.dll");
-                }
-
-                if (File.Exists(PanaceaDestinationLocation) && !File.Exists(PanaceaAlternateLocation))
-                {
-                    if(IsEqual(CalculateChecksum(PanaceaSourceLocation),CalculateChecksum(PanaceaDestinationLocation)))
-                    {
-                        PanaceaInstalled = true;
-                        ConfigurationService.PanaceaInstalled = PanaceaInstalled;
-                        return true;
-                    }
-                    return false;
-                }
-                else if (File.Exists(PanaceaAlternateLocation) && !File.Exists(PanaceaDestinationLocation))
-                {
-                    if (IsEqual(CalculateChecksum(PanaceaSourceLocation),CalculateChecksum(PanaceaAlternateLocation)))
-                    {
-                        PanaceaInstalled = true;
-                        ConfigurationService.PanaceaInstalled = PanaceaInstalled;
-                        return true;
-                    }
-                    return false;
-                }
-                else if (File.Exists(PanaceaDestinationLocation) && File.Exists(PanaceaAlternateLocation))
-                {
-                    if (IsEqual(CalculateChecksum(PanaceaSourceLocation),CalculateChecksum(PanaceaDestinationLocation)) ||
-                        IsEqual(CalculateChecksum(PanaceaSourceLocation),CalculateChecksum(PanaceaAlternateLocation)))
-                    {
-                        PanaceaInstalled = true;
-                        ConfigurationService.PanaceaInstalled = PanaceaInstalled;
-                        return true;
-                    }
-                    return false;
-                }
-                else
-                {
-                    PanaceaInstalled = false;
-                    ConfigurationService.PanaceaInstalled = PanaceaInstalled;
-                    return false;
-                }
-            }
-        }
-
-        public SetupWizardViewModel()
-        {
-            IsNotExtracting = true;
-            ValidateIsoLocations();
-            SelectIsoCommand = new RelayCommand(param => {
-                string gameId = param as string;
-                FileDialog.OnOpen(
-                    fileName => {
-                        IsoLocation = fileName;
-                        switch (gameId)
-                        {
-                            case "kh2":
-                                IsoLocationKH2 = fileName;
-                                if (string.IsNullOrEmpty(GameName))
-                                {
-                                    GameName = "Kingdom Hearts II";
-                                }
-                                break;
-                            case "kh1":
-                                IsoLocationKH1 = fileName;
-                                if (string.IsNullOrEmpty(GameName))
-                                {
-                                    GameName = "Kingdom Hearts I";
-                                }
-                                break;
-                            case "Recom":
-                                IsoLocationRecom = fileName;
-                                if (string.IsNullOrEmpty(GameName))
-                                {
-                                    GameName = "Kingdom Hearts Re:Chain of Memories";
-                                }
-                                break;
-                        }
-
-                        OnPropertyChanged(nameof(GameName));
-                        OnPropertyChanged(nameof(IsIsoSelected));
-                        OnPropertyChanged(nameof(GameRecognizedVisibility));
-                        OnPropertyChanged(nameof(GameNotRecognizedVisibility));
-                        OnPropertyChanged(nameof(IsGameRecognized));
-                    },
-                    _isoFilter
-                );
-            });
-            SelectOpenKhGameEngineCommand = new RelayCommand(_ =>
-                FileDialog.OnOpen(fileName => OpenKhGameEngineLocation = fileName, _openkhGeFilter));
-            SelectPcsx2Command = new RelayCommand(_ =>
-                FileDialog.OnOpen(fileName => Pcsx2Location = fileName, _pcsx2Filter));
-            SelectPcReleaseCommand = new RelayCommand(_ =>
-                FileDialog.OnFolder(path => PcReleaseLocation = path));
-            SelectPcReleaseKH3DCommand = new RelayCommand(_ =>
-                FileDialog.OnFolder(path => PcReleaseLocationKH3D = path));
-            SelectGameDataLocationCommand = new RelayCommand(_ =>
-                FileDialog.OnFolder(path => GameDataLocation = path));
-            ExtractGameDataCommand = new RelayCommand(async _ =>
-            {
-            BEGIN:
-                try
-                {
-                    if (GameEdition == PCSX2)
-                    {
-                        if (Extractkh2 && !string.IsNullOrEmpty(IsoLocationKH2) && GameService.DetectGameId(IsoLocationKH2)?.Id == "kh2")
-                        {
-                            await ExtractGameData(IsoLocationKH2, GameDataLocation);
-                        }
-                        if (Extractkh1 && !string.IsNullOrEmpty(IsoLocationKH1) && GameService.DetectGameId(IsoLocationKH1)?.Id == "kh1")
-                        {
-                            await ExtractGameData(IsoLocationKH1, GameDataLocation);
-                        }
-                        if (Extractrecom && !string.IsNullOrEmpty(IsoLocationRecom) && GameService.DetectGameId(IsoLocationRecom)?.Id == "Recom")
-                        {
-                            await ExtractGameData(IsoLocationRecom, GameDataLocation);
-                        }
-                    }
-                    else if (GameEdition == PC)
-                    {
-                        string GamesFound = PcReleaseSelections;
-                        if (GamesFound == "1.5+2.5")
-                        {
-                            if (Extractkh3d)
-                            {
-                                Extractkh3d = false;
-                            }
-                        }
-                        else if (GamesFound == "2.8")
-                        {
-                            if (Extractkh1)
-                            {
-                                Extractkh1 = false;
-                            }
-                            if (Extractkh2)
-                            {
-                                Extractkh2 = false;
-                            }
-                            if (Extractbbs)
-                            {
-                                Extractbbs = false;
-                            }
-                            if (Extractrecom)
-                            {
-                                Extractrecom = false;
-                            }
-                        }
-                        await ExtractGameData(null, GameDataLocation);
-                    }
-                }
-                catch (OperationCanceledException)
-                {
-                    // user closed the dialog
-                }
-                catch (GameDataExtractionService.BadConfigurationException _ex)
-                {
-                    MessageBox.Show(
-                        _ex.Message,
-                        "Extraction error",
-                        MessageBoxButton.OK,
-                        MessageBoxImage.Error);
-                }
-                catch (Exception _ex)
-                {
-                    var _sysMessage = MessageBox.Show(_ex.Message + "\n\nWould you like to try again?", "An Exception was Caught!", MessageBoxButton.YesNo, MessageBoxImage.Warning);
-
-                    switch (_sysMessage)
-                    {
-                        case MessageBoxResult.Yes:
-                            goto BEGIN;
-                    }
-                }
-            });
-            DetectInstallsCommand = new RelayCommand(_ =>
-            {
-                if (ConfigurationService.PCVersion == "EGS")
-                {
-                    // Get ProgramData Folder Location
-                    string programDataFolder = Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData);
-                    string directoryPath = Path.Combine(programDataFolder, "Epic\\EpicGamesLauncher\\Data\\Manifests");
-
-                    if (!Directory.Exists(directoryPath))
-                    {
-                        MessageBox.Show("No Game Install Locations Found\nPlease Manually Browse To Your Game Install Directory", "Failure", MessageBoxButton.OK);
-                        return;
-                    }
-
-                    // Get List of .item Files in C:\ProgramData\Epic\EpicGamesLauncher\Data\Manifests\
-                    IEnumerable<string> itemFiles = Directory.EnumerateFiles(directoryPath, "*.item");
-
-                    if (!itemFiles.Any())
-                    {
-                        MessageBox.Show("No Game Install Locations Found\nPlease Manually Browse To Your Game Install Directory", "Failure", MessageBoxButton.OK);
-                        return;
-                    }
-
-                    bool installLocationFoundRemix = false;
-                    bool installLocationFound3D = false;
-                    try
-                    {
-                        foreach (string itemFile in itemFiles)
-                        {
-                            // Read Each .item File and Locate Install Location For Games
-                            using StreamReader sr = new StreamReader(itemFile);
-                            string line;
-                            if (sr != null)
-                            {
-                                while ((line = sr.ReadLine()) is not null)
-                                {
-                                    if (line.Contains("\"LaunchExecutable\": \"KINGDOM HEARTS HD 1.5+2.5 ReMIX.exe\","))
-                                    {
-                                        while ((line = sr.ReadLine()) is not null)
-                                        {
-                                            if (line.Contains("\"InstallLocation\": \""))
-                                            {
-                                                int startIndex = line.IndexOf("\": \"") + 4;
-                                                int endIndex = line.IndexOf("\",");
-                                                string parsedText = line[startIndex..endIndex];
-                                                parsedText = parsedText.Replace("\\\\", "\\");
-                                                PcReleaseLocation = parsedText;
-                                                if (File.Exists(Path.Combine(PcReleaseLocation, "EOSSDK-Win64-Shipping.dll")))
-                                                {
-                                                    installLocationFoundRemix = true;
-                                                }
-                                            }
-                                        }
-                                    }
-                                    else if (line.Contains("\"LaunchExecutable\": \"KINGDOM HEARTS HD 2.8 Final Chapter Prologue.exe\","))
-                                    {
-                                        while ((line = sr.ReadLine()) is not null)
-                                        {
-                                            if (line.Contains("\"InstallLocation\": \""))
-                                            {
-                                                int startIndex = line.IndexOf("\": \"") + 4;
-                                                int endIndex = line.IndexOf("\",");
-                                                string parsedText = line[startIndex..endIndex];
-                                                parsedText = parsedText.Replace("\\\\", "\\");
-                                                PcReleaseLocationKH3D = parsedText;
-                                                if (File.Exists(Path.Combine(PcReleaseLocationKH3D, "EOSSDK-Win64-Shipping.dll")))
-                                                {
-                                                    installLocationFound3D = true;
-                                                }
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                        if (!installLocationFoundRemix && !installLocationFound3D)
-                        {
-                            MessageBox.Show("No Game Install Locations Found\nThis may be caused by missing files in the game install folder. If you have an installation verify your game files through Epic Games Store to get the missing files and try again." +
-                                "\nPlease Manually Browse To Your Game Install Directory", "Failure", MessageBoxButton.OK);
-                        }
-                        else if (!installLocationFoundRemix && installLocationFound3D)
-                        {
-                            MessageBox.Show("Kingdom Hearts HD 1.5+2.5: MISSING\n(This may be caused by missing files in the game install folder. If you have an installation verify your game files through Epic Games Store to get the missing files and try again.)" +
-                                "\nKingdom Hearts HD 2.8: FOUND", "Success", MessageBoxButton.OK);
-                        }
-                        else if (installLocationFoundRemix && !installLocationFound3D)
-                        {
-                            MessageBox.Show("Kingdom Hearts HD 1.5+2.5: FOUND\nKingdom Hearts HD 2.8: MISSING" +
-                                "\n(This may be caused by missing files in the game install folder. If you have an installation verify your game files through Epic Games Store to get the missing files and try again.)", "Success", MessageBoxButton.OK);
-                        }
-                        else
-                        {
-                            MessageBox.Show("Kingdom Hearts HD 1.5+2.5: FOUND\nKingdom Hearts HD 2.8: FOUND", "Success", MessageBoxButton.OK);
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        MessageBox.Show(ex.Message + "\nPlease Manually Browse To Your Game Install Directory");
-                        return;
-                    }
-                }
-                else if (ConfigurationService.PCVersion == "Steam")
-                {
-                    // Get ProgramFilesX86 Location
-                    string programDataFolder = Environment.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86);
-                    string directoryPath = Path.Combine(programDataFolder, "Steam\\steamapps");
-
-                    if (!Directory.Exists(directoryPath))
-                    {
-                        MessageBox.Show("No Game Install Locations Found\nPlease Manually Browse To Your Game Install Directory", "Failure", MessageBoxButton.OK);
-                        return;
-                    }
-
-                    bool installLocationFoundRemix = false;
-                    bool installLocationFound3D = false;
-                    // Read the entire content of the VDF file
-                    string vdfContent;
-                    try
-                    {
-                        vdfContent = File.ReadAllText(Path.Combine(directoryPath, "libraryfolders.vdf"));
-                    }
-                    catch (Exception ex)
-                    {
-                        MessageBox.Show(ex.Message + "\nPlease Manually Browse To Your Game Install Directory");
-                        return;
-                    }
-                    try
-                    {
-                        // Define a regular expression to match "path" values
-                        Regex regex = new Regex(@"""path""\s*""([^""]*)""", RegexOptions.IgnoreCase);
-                        // MatchCollection to store all matches found
-                        MatchCollection matches = regex.Matches(vdfContent);
-                        // Iterate through matches and print out the "path" values
-                        if (Directory.Exists(directoryPath))
-                        {
-                            foreach (Match match in matches)
-                            {
-                                string pathValue = match.Groups[1].Value; // Group 1 is the path raw, without the key
-                                Console.WriteLine($"Path: {pathValue}");
-                                string parsedText = pathValue.Replace(@"\\", @"\");
-                                string commonGamesDirectory = Path.Combine(parsedText, "steamapps\\common");
-                                if (Directory.Exists(commonGamesDirectory))
-                                {
-                                    string kH1525Path = Path.Combine(commonGamesDirectory, @"KINGDOM HEARTS -HD 1.5+2.5 ReMIX-");
-                                    string kH28Path = Path.Combine(commonGamesDirectory, @"KINGDOM HEARTS HD 2.8 Final Chapter Prologue");
-                                    if (File.Exists(Path.Combine(kH1525Path, "steam_api64.dll")))
-                                    {
-                                        installLocationFoundRemix = true;
-                                        PcReleaseLocation = kH1525Path;
-                                    }
-                                    if (File.Exists(Path.Combine(kH28Path, "steam_api64.dll")))
-                                    {
-                                        installLocationFound3D = true;
-                                        PcReleaseLocationKH3D = kH28Path;
-                                    }
-                                }
-                            }
-                        }
-                        if (!installLocationFoundRemix && !installLocationFound3D)
-                        {
-                            MessageBox.Show("No Game Install Locations Found\nThis may be caused by missing files in the game install folder. If you have an installation verify your game files through Steam to get the missing files and try again." +
-                                "\nPlease Manually Browse To Your Game Install Directory", "Failure", MessageBoxButton.OK);
-                        }
-                        else if (!installLocationFoundRemix && installLocationFound3D)
-                        {
-                            MessageBox.Show("Kingdom Hearts HD 1.5+2.5: MISSING (This may be caused by missing files in the game install folder. If you have an installation verify your game files through Steam to get the missing files and try again.)" +
-                                "\nKingdom Hearts HD 2.8: FOUND", "Success", MessageBoxButton.OK);
-                        }
-                        else if (installLocationFoundRemix && !installLocationFound3D)
-                        {
-                            MessageBox.Show("Kingdom Hearts HD 1.5+2.5: FOUND\nKingdom Hearts HD 2.8: MISSING" +
-                                "(This may be caused by missing files in the game install folder. If you have an installation verify your game files through Steam to get the missing files and try again.)", "Success", MessageBoxButton.OK);
-                        }
-                        else
-                        {
-                            MessageBox.Show("Kingdom Hearts HD 1.5+2.5: FOUND\nKingdom Hearts HD 2.8: FOUND", "Success", MessageBoxButton.OK);
-                        }
-
-                    }
-                    catch (Exception ex)
-                    {
-                        MessageBox.Show(ex.Message);
-                        return;
-                    }
-                }
-                else
-                {
-                    MessageBox.Show("Launcher \"Other\" does not support auto detect game installation. If you wish to use this feature select either EGS or Steam on the dropdown above", "Unsupported", MessageBoxButton.OK);
-                }
-
-            });
-            InstallPanaceaCommand = new RelayCommand(AlternateName =>
-            {
-                if (File.Exists(PanaceaSourceLocation))
-                {
-                    // Again, do not bother in debug mode
-                    string PanaceaDestinationLocation = null;
-                    string PanaceaAlternateLocation = null;
-                    string PanaceaDependenciesLocation = null;
-                    if (GameCollection == 0 && PcReleaseLocation != null)
-                    {
-                        PanaceaDestinationLocation = Path.Combine(PcReleaseLocation, "DBGHELP.dll");
-                        PanaceaAlternateLocation = Path.Combine(PcReleaseLocation, "version.dll");
-                        PanaceaDependenciesLocation = Path.Combine(PcReleaseLocation, "dependencies");
-                    }
-                    else if (GameCollection == 1 && PcReleaseLocationKH3D != null)
-                    {
-                        PanaceaDestinationLocation = Path.Combine(PcReleaseLocationKH3D, "DBGHELP.dll");
-                        PanaceaAlternateLocation = Path.Combine(PcReleaseLocationKH3D, "version.dll");
-                        PanaceaDependenciesLocation = Path.Combine(PcReleaseLocationKH3D, "dependencies");
-                    }
-                    else if (PanaceaDestinationLocation == null || PanaceaAlternateLocation == null || PanaceaDestinationLocation == null)
-                    {
-                        MessageBox.Show(
-                                $"At least one filepath is invalid check you selected a correct filepath for the collection you are trying to install panacea for.",
-                                "Error",
-                                MessageBoxButton.OK,
-                                MessageBoxImage.Error);
-                        return;
-                    }
-                    if (!Directory.Exists(PanaceaDependenciesLocation))
-                    {
-                        Directory.CreateDirectory(PanaceaDependenciesLocation);
-                    }
-                    try
-                    {
-                        if(Process.GetProcessesByName("winlogon").Length > 0)
-                        {
-                            File.Copy(PanaceaSourceLocation, PanaceaDestinationLocation, true);
-                            File.Delete(PanaceaAlternateLocation);
-                        }
-                        else
-                        {
-                            File.Copy(PanaceaSourceLocation, PanaceaAlternateLocation, true);
-                            File.Delete(PanaceaDestinationLocation);
-                        }
-                        if (Directory.Exists(PcReleaseLocation))
-                        {
-                            File.WriteAllLines(Path.Combine(PcReleaseLocation, "panacea_settings.txt"),
-                                [
-                                $"mod_path={Path.GetFullPath(Path.Combine(ConfigurationService.CompiledModPath,".."))}",
-                                $"show_console={false}",
-                                ]);
-                        }
-                        if (Directory.Exists(PcReleaseLocationKH3D))
-                        {
-                            File.WriteAllLines(Path.Combine(PcReleaseLocationKH3D, "panacea_settings.txt"),
-                                [
-                                $"mod_path={Path.GetFullPath(Path.Combine(ConfigurationService.CompiledModPath,".."))}",
-                                $"show_console={false}",
-                                ]);
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        MessageBox.Show(ex.Message);
-                        PanaceaInstalled = false;
-                        ConfigurationService.PanaceaInstalled = PanaceaInstalled;
-                        return;
-                    }
-                    try
-                    {
-                        File.Copy(Path.Combine(AppContext.BaseDirectory, "avcodec-vgmstream-59.dll"), Path.Combine(PanaceaDependenciesLocation, "avcodec-vgmstream-59.dll"), true);
-                        File.Copy(Path.Combine(AppContext.BaseDirectory, "avformat-vgmstream-59.dll"), Path.Combine(PanaceaDependenciesLocation, "avformat-vgmstream-59.dll"), true);
-                        File.Copy(Path.Combine(AppContext.BaseDirectory, "avutil-vgmstream-57.dll"), Path.Combine(PanaceaDependenciesLocation, "avutil-vgmstream-57.dll"), true);
-                        File.Copy(Path.Combine(AppContext.BaseDirectory, "bass.dll"), Path.Combine(PanaceaDependenciesLocation, "bass.dll"), true);
-                        File.Copy(Path.Combine(AppContext.BaseDirectory, "bass_vgmstream.dll"), Path.Combine(PanaceaDependenciesLocation, "bass_vgmstream.dll"), true);
-                        File.Copy(Path.Combine(AppContext.BaseDirectory, "libatrac9.dll"), Path.Combine(PanaceaDependenciesLocation, "libatrac9.dll"), true);
-                        File.Copy(Path.Combine(AppContext.BaseDirectory, "libcelt-0061.dll"), Path.Combine(PanaceaDependenciesLocation, "libcelt-0061.dll"), true);
-                        File.Copy(Path.Combine(AppContext.BaseDirectory, "libcelt-0110.dll"), Path.Combine(PanaceaDependenciesLocation, "libcelt-0110.dll"), true);
-                        File.Copy(Path.Combine(AppContext.BaseDirectory, "libg719_decode.dll"), Path.Combine(PanaceaDependenciesLocation, "libg719_decode.dll"), true);
-                        File.Copy(Path.Combine(AppContext.BaseDirectory, "libmpg123-0.dll"), Path.Combine(PanaceaDependenciesLocation, "libmpg123-0.dll"), true);
-                        File.Copy(Path.Combine(AppContext.BaseDirectory, "libspeex-1.dll"), Path.Combine(PanaceaDependenciesLocation, "libspeex-1.dll"), true);
-                        File.Copy(Path.Combine(AppContext.BaseDirectory, "libvorbis.dll"), Path.Combine(PanaceaDependenciesLocation, "libvorbis.dll"), true);
-                        File.Copy(Path.Combine(AppContext.BaseDirectory, "swresample-vgmstream-4.dll"), Path.Combine(PanaceaDependenciesLocation, "swresample-vgmstream-4.dll"), true);
-                    }
-                    catch
-                    {
-                        MessageBox.Show(
-                            $"Missing panacea dependencies. Unable to fully install panacea.",
-                            "Extraction error",
-                            MessageBoxButton.OK,
-                            MessageBoxImage.Error);
-                        File.Delete(PanaceaDestinationLocation);
-                        File.Delete(PanaceaAlternateLocation);
-                        File.Delete(Path.Combine(PanaceaDependenciesLocation, "avcodec-vgmstream-59.dll"));
-                        File.Delete(Path.Combine(PanaceaDependenciesLocation, "avformat-vgmstream-59.dll"));
-                        File.Delete(Path.Combine(PanaceaDependenciesLocation, "avutil-vgmstream-57.dll"));
-                        File.Delete(Path.Combine(PanaceaDependenciesLocation, "bass.dll"));
-                        File.Delete(Path.Combine(PanaceaDependenciesLocation, "bass_vgmstream.dll"));
-                        File.Delete(Path.Combine(PanaceaDependenciesLocation, "libatrac9.dll"));
-                        File.Delete(Path.Combine(PanaceaDependenciesLocation, "libcelt-0061.dll"));
-                        File.Delete(Path.Combine(PanaceaDependenciesLocation, "libcelt-0110.dll"));
-                        File.Delete(Path.Combine(PanaceaDependenciesLocation, "libg719_decode.dll"));
-                        File.Delete(Path.Combine(PanaceaDependenciesLocation, "libmpg123-0.dll"));
-                        File.Delete(Path.Combine(PanaceaDependenciesLocation, "libspeex-1.dll"));
-                        File.Delete(Path.Combine(PanaceaDependenciesLocation, "libvorbis.dll"));
-                        File.Delete(Path.Combine(PanaceaDependenciesLocation, "swresample-vgmstream-4.dll"));
-                        File.Delete(Path.Combine(PcReleaseLocation, "panacea_settings.txt"));
-                        File.Delete(Path.Combine(PcReleaseLocationKH3D, "panacea_settings.txt"));
-                        PanaceaInstalled = false;
-                        ConfigurationService.PanaceaInstalled = PanaceaInstalled;
-                        return;
-                    }
-                    OnPropertyChanged(nameof(IsLastPanaceaVersionInstalled));
-                    OnPropertyChanged(nameof(PanaceaInstalledVisibility));
-                    OnPropertyChanged(nameof(PanaceaNotInstalledVisibility));
-                    PanaceaInstalled = true;
-                    ConfigurationService.PanaceaInstalled = PanaceaInstalled;
-                }
-            });
-            RemovePanaceaCommand = new RelayCommand(_ =>
-            {
-                string PanaceaDestinationLocation = null;
-                string PanaceaAlternateLocation = null;
-                string PanaceaDependenciesLocation = null;
-                if (GameCollection == 0 && PcReleaseLocation != null)
-                {
-                    PanaceaDestinationLocation = Path.Combine(PcReleaseLocation, "DBGHELP.dll");
-                    PanaceaAlternateLocation = Path.Combine(PcReleaseLocation, "version.dll");
-                    PanaceaDependenciesLocation = Path.Combine(PcReleaseLocation, "dependencies");
-                }
-                else if (GameCollection == 1 && PcReleaseLocationKH3D != null)
-                {
-                    PanaceaDestinationLocation = Path.Combine(PcReleaseLocationKH3D, "DBGHELP.dll");
-                    PanaceaAlternateLocation = Path.Combine(PcReleaseLocationKH3D, "version.dll");
-                    PanaceaDependenciesLocation = Path.Combine(PcReleaseLocationKH3D, "dependencies");
-                }
-                else if (PanaceaDestinationLocation == null || PanaceaAlternateLocation == null || PanaceaDestinationLocation == null)
-                {
-                    MessageBox.Show(
-                            $"At least one filepath is invalid check you selected a correct filepath for the collection you are trying to uninstall panacea for.",
-                            "Error",
-                            MessageBoxButton.OK,
-                            MessageBoxImage.Error);
-                    return;
-                }
-                try
-                {
-                    if (File.Exists(PanaceaDestinationLocation) || File.Exists(PanaceaAlternateLocation))
-                    {
-                        File.Delete(PanaceaDestinationLocation);
-                        File.Delete(PanaceaAlternateLocation);
-                        File.Delete(Path.Combine(PanaceaDependenciesLocation, "avcodec-vgmstream-59.dll"));
-                        File.Delete(Path.Combine(PanaceaDependenciesLocation, "avformat-vgmstream-59.dll"));
-                        File.Delete(Path.Combine(PanaceaDependenciesLocation, "avutil-vgmstream-57.dll"));
-                        File.Delete(Path.Combine(PanaceaDependenciesLocation, "bass.dll"));
-                        File.Delete(Path.Combine(PanaceaDependenciesLocation, "bass_vgmstream.dll"));
-                        File.Delete(Path.Combine(PanaceaDependenciesLocation, "libatrac9.dll"));
-                        File.Delete(Path.Combine(PanaceaDependenciesLocation, "libcelt-0061.dll"));
-                        File.Delete(Path.Combine(PanaceaDependenciesLocation, "libcelt-0110.dll"));
-                        File.Delete(Path.Combine(PanaceaDependenciesLocation, "libg719_decode.dll"));
-                        File.Delete(Path.Combine(PanaceaDependenciesLocation, "libmpg123-0.dll"));
-                        File.Delete(Path.Combine(PanaceaDependenciesLocation, "libspeex-1.dll"));
-                        File.Delete(Path.Combine(PanaceaDependenciesLocation, "libvorbis.dll"));
-                        File.Delete(Path.Combine(PanaceaDependenciesLocation, "swresample-vgmstream-4.dll"));
-                        if (GameCollection == 0 && PcReleaseLocation != null)
-                        {
-                            File.Delete(Path.Combine(PcReleaseLocation, "panacea_settings.txt"));
-                        }
-                        if (GameCollection == 1 && PcReleaseLocationKH3D != null)
-                        {
-                            File.Delete(Path.Combine(PcReleaseLocationKH3D, "panacea_settings.txt"));
-                        }
-                    }
-                    OnPropertyChanged(nameof(IsLastPanaceaVersionInstalled));
-                    OnPropertyChanged(nameof(PanaceaInstalledVisibility));
-                    OnPropertyChanged(nameof(PanaceaNotInstalledVisibility));
-                    PanaceaInstalled = false;
-                    ConfigurationService.PanaceaInstalled = PanaceaInstalled;
-                }
-                catch (Exception ex)
-                {
-                    MessageBox.Show(ex.Message);
-                    return;
-                }
-            });
-            InstallLuaBackendCommand = new RelayCommand(installed =>
-            {
-                try
-                {
-                    if (!Convert.ToBoolean(installed))
-                    {
-                        var gitClient = new GitHubClient(new ProductHeaderValue("LuaBackend"));
-                        var releases = gitClient.Repository.Release.GetLatest(owner: "Sirius902", name: "LuaBackend").Result;
-                        string DownPath = Path.GetTempPath() + "LuaBackend" + Path.GetExtension(releases.Assets[0].Name);
-                        string TempExtractionLocation = Path.GetTempPath() + "LuaBackend";
-                        #pragma warning disable SYSLIB0014 // Type or member is obsolete
-                        var _client = new WebClient();
-                        #pragma warning restore SYSLIB0014 // Type or member is obsolete
-                        _client.DownloadFile(new System.Uri(releases.Assets[0].BrowserDownloadUrl), DownPath);
-                        try
-                        {
-                            using (var zip = ZipFile.OpenRead(DownPath))
-                            {
-                                zip.ExtractToDirectory(TempExtractionLocation, true);
-                            }
-                        }
-                        catch
-                        {
-                            MessageBox.Show(
-                                    $"Unable to extract \"{Path.GetFileName(DownPath)}\" as it is not a zip file. You may have to install it manually.",
-                                    "Run error", MessageBoxButton.OK, MessageBoxImage.Error);
-                            File.Delete(DownPath);
-                            File.Delete(TempExtractionLocation);
-                            return;
-                        }
-                        string DestinationCollection = null;
-                        if (GameCollection == 0)
-                        {
-                            DestinationCollection = PcReleaseLocation;
-                        }
-                        else
-                        {
-                            DestinationCollection = PcReleaseLocationKH3D;
-                        }
-                        if (DestinationCollection == null)
-                        {
-                            MessageBox.Show(
-                                    $"At least one filepath is invalid check you selected a correct filepath for the collection you are trying to install Lua Backend for.",
-                                    "Error",
-                                    MessageBoxButton.OK,
-                                    MessageBoxImage.Error);
-                            File.Delete(DownPath);
-                            Directory.Delete(TempExtractionLocation, true);
-                            return;
-                        }
-                        else
-                        {
-                            if (File.Exists(Path.Combine(TempExtractionLocation, "DBGHELP.dll")))
-                            {
-                                File.Move(Path.Combine(TempExtractionLocation, "DBGHELP.dll"), Path.Combine(DestinationCollection, "LuaBackend.dll"), true);
-                            }
-                            if (File.Exists(Path.Combine(TempExtractionLocation, "LuaBackend.toml")))
-                            {
-                                File.Move(Path.Combine(TempExtractionLocation, "LuaBackend.toml"), Path.Combine(DestinationCollection, "LuaBackend.toml"), true);
-                                string config = File.ReadAllText(Path.Combine(DestinationCollection, "LuaBackend.toml")).Replace("\\", "/").Replace("\\\\", "/");
-                                if (LuaScriptPaths.Contains("kh1") && GameCollection == 0)
-                                {
-                                    int index = config.IndexOf("true }", config.IndexOf("[kh1]")) + 6;
-                                    config = config.Insert(index, ", {path = \"" + Path.Combine(Path.GetFullPath(Path.Combine(ConfigurationService.CompiledModPath, "..")), "kh1/scripts\" , relative = false}").Replace("\\", "/"));
-                                }
-                                if (LuaScriptPaths.Contains("kh2") && GameCollection == 0)
-                                {
-                                    int index = config.IndexOf("true }", config.IndexOf("[kh2]")) + 6;
-                                    config = config.Insert(index, ", {path = \"" + Path.Combine(Path.GetFullPath(Path.Combine(ConfigurationService.CompiledModPath, "..")), "kh2/scripts\" , relative = false}").Replace("\\", "/"));
-                                }
-                                if (LuaScriptPaths.Contains("bbs") && GameCollection == 0)
-                                {
-                                    int index = config.IndexOf("true }", config.IndexOf("[bbs]")) + 6;
-                                    config = config.Insert(index, ", {path = \"" + Path.Combine(Path.GetFullPath(Path.Combine(ConfigurationService.CompiledModPath, "..")), "bbs/scripts\" , relative = false}").Replace("\\", "/"));
-                                }
-                                if (LuaScriptPaths.Contains("Recom") && GameCollection == 0)
-                                {
-                                    int index = config.IndexOf("true }", config.IndexOf("[recom]")) + 6;
-                                    config = config.Insert(index, ", {path = \"" + Path.Combine(Path.GetFullPath(Path.Combine(ConfigurationService.CompiledModPath, "..")), "Recom/scripts\" , relative = false}").Replace("\\", "/"));
-                                }
-                                if (LuaScriptPaths.Contains("kh3d") && GameCollection == 1)
-                                {
-                                    int index = config.IndexOf("true }", config.IndexOf("[kh3d]")) + 6;
-                                    config = config.Insert(index, ", {path = \"" + Path.Combine(Path.GetFullPath(Path.Combine(ConfigurationService.CompiledModPath, "..")), "kh3d/scripts\" , relative = false}").Replace("\\", "/"));
-                                }
-                                if (ConfigurationService.PCVersion == "Steam")
-                                {
-                                    int indexEGS = 0;
-                                    int indexSteam = 0;
-                                    //KH3D
-                                    indexEGS = config.IndexOf("game_docs = \"KINGDOM HEARTS HD 2.8 Final Chapter Prologue\"", config.IndexOf("[kh3d]"));
-                                    indexSteam = config.IndexOf("# game_docs = \"My Games/KINGDOM HEARTS HD 2.8 Final Chapter Prologue\"", config.IndexOf("[kh3d]"));
-                                    if (indexEGS > 0 && indexSteam > 0)
-                                    {
-                                        config = config.Remove(indexSteam, 2);
-                                        config = config.Insert(indexEGS, "# ");
-                                    }
-                                    //ReCoM
-                                    indexEGS = config.IndexOf("game_docs = \"KINGDOM HEARTS HD 1.5+2.5 ReMIX\"", config.IndexOf("[recom]"));
-                                    indexSteam = config.IndexOf("# game_docs = \"My Games/KINGDOM HEARTS HD 1.5+2.5 ReMIX\"", config.IndexOf("[recom]"));
-                                    if (indexEGS > 0 && indexSteam > 0)
-                                    {
-                                        config = config.Remove(indexSteam, 2);
-                                        config = config.Insert(indexEGS, "# ");
-                                    }
-                                    //BBS
-                                    indexEGS = config.IndexOf("game_docs = \"KINGDOM HEARTS HD 1.5+2.5 ReMIX\"", config.IndexOf("[bbs]"));
-                                    indexSteam = config.IndexOf("# game_docs = \"My Games/KINGDOM HEARTS HD 1.5+2.5 ReMIX\"", config.IndexOf("[bbs]"));
-                                    if (indexEGS > 0 && indexSteam > 0)
-                                    {
-                                        config = config.Remove(indexSteam, 2);
-                                        config = config.Insert(indexEGS, "# ");
-                                    }
-                                    //KH2
-                                    indexEGS = config.IndexOf("game_docs = \"KINGDOM HEARTS HD 1.5+2.5 ReMIX\"", config.IndexOf("[kh2]"));
-                                    indexSteam = config.IndexOf("# game_docs = \"My Games/KINGDOM HEARTS HD 1.5+2.5 ReMIX\"", config.IndexOf("[kh2]"));
-                                    if (indexEGS > 0 && indexSteam > 0)
-                                    {
-                                        config = config.Remove(indexSteam, 2);
-                                        config = config.Insert(indexEGS, "# ");
-                                    }
-                                    //KH1
-                                    indexEGS = config.IndexOf("game_docs = \"KINGDOM HEARTS HD 1.5+2.5 ReMIX\"", config.IndexOf("[kh1]"));
-                                    indexSteam = config.IndexOf("# game_docs = \"My Games/KINGDOM HEARTS HD 1.5+2.5 ReMIX\"", config.IndexOf("[kh1]"));
-                                    if (indexEGS > 0 && indexSteam > 0)
-                                    {
-                                        config = config.Remove(indexSteam, 2);
-                                        config = config.Insert(indexEGS, "# ");
-                                    }
-                                }
-                                File.WriteAllText(Path.Combine(DestinationCollection, "LuaBackend.toml"), config);
-                            }
-                            File.Delete(DownPath);
-                            Directory.Delete(TempExtractionLocation);
-                            OnPropertyChanged(nameof(IsLuaBackendInstalled));
-                            OnPropertyChanged(nameof(LuaBackendFoundVisibility));
-                            OnPropertyChanged(nameof(LuaBackendNotFoundVisibility));
-                        }
-                    }
-                    else
-                    {
-                        string DestinationCollection = null;
-                        if (GameCollection == 0)
-                        {
-                            DestinationCollection = PcReleaseLocation;
-                        }
-                        else
-                        {
-                            DestinationCollection = PcReleaseLocationKH3D;
-                        }
-                        if (DestinationCollection == null)
-                        {
-                            MessageBox.Show(
-                                    $"At least one filepath is invalid check you selected a correct filepath for the collection you are trying to configure Lua Backend for.",
-                                    "Error",
-                                    MessageBoxButton.OK,
-                                    MessageBoxImage.Error);
-                            return;
-                        }
-                        else
-                        {
-                            if (File.Exists(Path.Combine(DestinationCollection, "LuaBackend.toml")))
-                            {
-                                string config = File.ReadAllText(Path.Combine(DestinationCollection, "LuaBackend.toml")).Replace("\\", "/").Replace("\\\\", "/");
-                                if (LuaScriptPaths.Contains("kh1") && GameCollection == 0)
-                                {
-                                    if (config.Contains("mod/kh1/scripts"))
-                                    {
-                                        var errorMessage = MessageBox.Show($"Your Lua Backend is already configured to run Lua scripts for KH1 from an OpenKH Mod Manager." +
-                                            $" Do you want to change Lua Backend to run scripts for KH1 from this version of OpenKH Mod Manager instead?", "Warning",
-                                            MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No, MessageBoxOptions.DefaultDesktopOnly);
-
-                                        switch (errorMessage)
-                                        {
-                                            case MessageBoxResult.Yes:
-                                            {
-                                                int index = config.IndexOf("scripts", config.IndexOf("[kh1]"));
-                                                config = config.Remove(index, config.IndexOf("]", index) - index + 1);
-                                                config = config.Insert(index, "scripts = [{ path = \"scripts/kh1/\", relative = true }" +
-                                                    ", {path = \"" + Path.Combine(Path.GetFullPath(Path.Combine(ConfigurationService.CompiledModPath, "..")), "kh1/scripts\" , relative = false}]").Replace("\\", "/"));
-                                                break;
-                                            }
-                                        }
-                                    }
-                                    else
-                                    {
-                                        int index = config.IndexOf("scripts", config.IndexOf("[kh1]"));
-                                        config = config.Remove(index, config.IndexOf("]", index) - index + 1);
-                                        config = config.Insert(index, "scripts = [{ path = \"scripts/kh1/\", relative = true }" +
-                                            ", {path = \"" + Path.Combine(Path.GetFullPath(Path.Combine(ConfigurationService.CompiledModPath, "..")), "kh1/scripts\" , relative = false}]").Replace("\\", "/"));
-                                    }
-                                }
-                                if (LuaScriptPaths.Contains("kh2") && GameCollection == 0)
-                                {
-                                    if (config.Contains("mod/kh2/scripts"))
-                                    {
-                                        var errorMessage = MessageBox.Show($"Your Lua Backend is already configured to run Lua scripts for KH2 from an OpenKH Mod Manager." +
-                                            $" Do you want to change Lua Backend to run scripts for KH2 from this version of OpenKH Mod Manager instead?", "Warning",
-                                            MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No, MessageBoxOptions.DefaultDesktopOnly);
-
-                                        switch (errorMessage)
-                                        {
-                                            case MessageBoxResult.Yes:
-                                            {
-                                                int index = config.IndexOf("scripts", config.IndexOf("[kh2]"));
-                                                config = config.Remove(index, config.IndexOf("]", index) - index + 1);
-                                                config = config.Insert(index, "scripts = [{ path = \"scripts/kh2/\", relative = true }" +
-                                                    ", {path = \"" + Path.Combine(Path.GetFullPath(Path.Combine(ConfigurationService.CompiledModPath, "..")), "kh2/scripts\" , relative = false}]").Replace("\\", "/"));
-                                                break;
-                                            }
-                                        }
-                                    }
-                                    else
-                                    {
-                                        int index = config.IndexOf("scripts", config.IndexOf("[kh2]"));
-                                        config = config.Remove(index, config.IndexOf("]", index) - index + 1);
-                                        config = config.Insert(index, "scripts = [{ path = \"scripts/kh2/\", relative = true }" +
-                                            ", {path = \"" + Path.Combine(Path.GetFullPath(Path.Combine(ConfigurationService.CompiledModPath, "..")), "kh2/scripts\" , relative = false}]").Replace("\\", "/"));
-                                    }
-                                }
-                                if (LuaScriptPaths.Contains("bbs") && GameCollection == 0)
-                                {
-                                    if (config.Contains("mod/bbs/scripts"))
-                                    {
-                                        var errorMessage = MessageBox.Show($"Your Lua Backend is already configured to run Lua scripts for BBS from an OpenKH Mod Manager." +
-                                            $" Do you want to change Lua Backend to run scripts for BBS from this version of OpenKH Mod Manager instead?", "Warning",
-                                            MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No, MessageBoxOptions.DefaultDesktopOnly);
-
-                                        switch (errorMessage)
-                                        {
-                                            case MessageBoxResult.Yes:
-                                            {
-                                                int index = config.IndexOf("scripts", config.IndexOf("[bbs]"));
-                                                config = config.Remove(index, config.IndexOf("]", index) - index + 1);
-                                                config = config.Insert(index, "scripts = [{ path = \"scripts/bbs/\", relative = true }" +
-                                                    ", {path = \"" + Path.Combine(Path.GetFullPath(Path.Combine(ConfigurationService.CompiledModPath, "..")), "bbs/scripts\" , relative = false}]").Replace("\\", "/"));
-                                                break;
-                                            }
-                                        }
-                                    }
-                                    else
-                                    {
-                                        int index = config.IndexOf("scripts", config.IndexOf("[bbs]"));
-                                        config = config.Remove(index, config.IndexOf("]", index) - index + 1);
-                                        config = config.Insert(index, "scripts = [{ path = \"scripts/bbs/\", relative = true }" +
-                                            ", {path = \"" + Path.Combine(Path.GetFullPath(Path.Combine(ConfigurationService.CompiledModPath, "..")), "bbs/scripts\" , relative = false}]").Replace("\\", "/"));
-                                    }
-                                }
-                                if (LuaScriptPaths.Contains("Recom") && GameCollection == 0)
-                                {
-                                    if (config.Contains("mod/Recom/scripts"))
-                                    {
-                                        var errorMessage = MessageBox.Show($"Your Lua Backend is already configured to run Lua scripts for ReCoM from an OpenKH Mod Manager." +
-                                            $" Do you want to change Lua Backend to run scripts for ReCoM from this version of OpenKH Mod Manager instead?", "Warning",
-                                            MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No, MessageBoxOptions.DefaultDesktopOnly);
-
-                                        switch (errorMessage)
-                                        {
-                                            case MessageBoxResult.Yes:
-                                            {
-                                                int index = config.IndexOf("scripts", config.IndexOf("[recom]"));
-                                                config = config.Remove(index, config.IndexOf("]", index) - index + 1);
-                                                config = config.Insert(index, "scripts = [{ path = \"scripts/recom/\", relative = true }" +
-                                                    ", {path = \"" + Path.Combine(Path.GetFullPath(Path.Combine(ConfigurationService.CompiledModPath, "..")), "Recom/scripts\" , relative = false}]").Replace("\\", "/"));
-                                                break;
-                                            }
-                                        }
-                                    }
-                                    else
-                                    {
-                                        int index = config.IndexOf("scripts", config.IndexOf("[recom]"));
-                                        config = config.Remove(index, config.IndexOf("]", index) - index + 1);
-                                        config = config.Insert(index, "scripts = [{ path = \"scripts/recom/\", relative = true }" +
-                                            ", {path = \"" + Path.Combine(Path.GetFullPath(Path.Combine(ConfigurationService.CompiledModPath, "..")), "Recom/scripts\" , relative = false}]").Replace("\\", "/"));
-                                    }
-                                }
-                                if (LuaScriptPaths.Contains("kh3d") && GameCollection == 1)
-                                {
-                                    if (config.Contains("mod/kh3d/scripts"))
-                                    {
-                                        var errorMessage = MessageBox.Show($"Your Lua Backend is already configured to run Lua scripts for KH3D from an OpenKH Mod Manager." +
-                                            $" Do you want to change Lua Backend to run scripts for KH3D from this version of OpenKH Mod Manager instead?", "Warning",
-                                            MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No, MessageBoxOptions.DefaultDesktopOnly);
-
-                                        switch (errorMessage)
-                                        {
-                                            case MessageBoxResult.Yes:
-                                            {
-                                                int index = config.IndexOf("scripts", config.IndexOf("[kh3d]"));
-                                                config = config.Remove(index, config.IndexOf("]", index) - index + 1);
-                                                config = config.Insert(index, "scripts = [{ path = \"scripts/kh3d/\", relative = true }" +
-                                                    ", {path = \"" + Path.Combine(Path.GetFullPath(Path.Combine(ConfigurationService.CompiledModPath, "..")), "kh3d/scripts\" , relative = false}]").Replace("\\", "/"));
-                                                break;
-                                            }
-                                        }
-                                    }
-                                    else
-                                    {
-                                        int index = config.IndexOf("scripts", config.IndexOf("[kh3d]"));
-                                        config = config.Remove(index, config.IndexOf("]", index) - index + 1);
-                                        config = config.Insert(index, "scripts = [{ path = \"scripts/kh3d/\", relative = true }" +
-                                            ", {path = \"" + Path.Combine(Path.GetFullPath(Path.Combine(ConfigurationService.CompiledModPath, "..")), "kh3d/scripts\" , relative = false}]").Replace("\\", "/"));
-                                    }
-                                }
-                                if (ConfigurationService.PCVersion == "Steam")
-                                {
-                                    int indexEGS = 0;
-                                    int indexSteam = 0;
-                                    //KH3D
-                                    indexEGS = config.IndexOf("game_docs = \"KINGDOM HEARTS HD 2.8 Final Chapter Prologue\"", config.IndexOf("[kh3d]"));
-                                    indexSteam = config.IndexOf("# game_docs = \"My Games/KINGDOM HEARTS HD 2.8 Final Chapter Prologue\"", config.IndexOf("[kh3d]"));
-                                    if (indexEGS > 0 && indexSteam > 0)
-                                    {
-                                        config = config.Remove(indexSteam, 2);
-                                        config = config.Insert(indexEGS, "# ");
-                                    }
-                                    //ReCoM
-                                    indexEGS = config.IndexOf("game_docs = \"KINGDOM HEARTS HD 1.5+2.5 ReMIX\"", config.IndexOf("[recom]"));
-                                    indexSteam = config.IndexOf("# game_docs = \"My Games/KINGDOM HEARTS HD 1.5+2.5 ReMIX\"", config.IndexOf("[recom]"));
-                                    if (indexEGS > 0 && indexSteam > 0)
-                                    {
-                                        config = config.Remove(indexSteam, 2);
-                                        config = config.Insert(indexEGS, "# ");
-                                    }
-                                    //BBS
-                                    indexEGS = config.IndexOf("game_docs = \"KINGDOM HEARTS HD 1.5+2.5 ReMIX\"", config.IndexOf("[bbs]"));
-                                    indexSteam = config.IndexOf("# game_docs = \"My Games/KINGDOM HEARTS HD 1.5+2.5 ReMIX\"", config.IndexOf("[bbs]"));
-                                    if (indexEGS > 0 && indexSteam > 0)
-                                    {
-                                        config = config.Remove(indexSteam, 2);
-                                        config = config.Insert(indexEGS, "# ");
-                                    }
-                                    //KH2
-                                    indexEGS = config.IndexOf("game_docs = \"KINGDOM HEARTS HD 1.5+2.5 ReMIX\"", config.IndexOf("[kh2]"));
-                                    indexSteam = config.IndexOf("# game_docs = \"My Games/KINGDOM HEARTS HD 1.5+2.5 ReMIX\"", config.IndexOf("[kh2]"));
-                                    if (indexEGS > 0 && indexSteam > 0)
-                                    {
-                                        config = config.Remove(indexSteam, 2);
-                                        config = config.Insert(indexEGS, "# ");
-                                    }
-                                    //KH1
-                                    indexEGS = config.IndexOf("game_docs = \"KINGDOM HEARTS HD 1.5+2.5 ReMIX\"", config.IndexOf("[kh1]"));
-                                    indexSteam = config.IndexOf("# game_docs = \"My Games/KINGDOM HEARTS HD 1.5+2.5 ReMIX\"", config.IndexOf("[kh1]"));
-                                    if (indexEGS > 0 && indexSteam > 0)
-                                    {
-                                        config = config.Remove(indexSteam, 2);
-                                        config = config.Insert(indexEGS, "# ");
-                                    }
-                                }
-                                File.WriteAllText(Path.Combine(DestinationCollection, "LuaBackend.toml"), config);
-                                OnPropertyChanged(nameof(IsLuaBackendInstalled));
-                                OnPropertyChanged(nameof(LuaBackendFoundVisibility));
-                                OnPropertyChanged(nameof(LuaBackendNotFoundVisibility));
-                            }
-                        }
-                    }
-                }
-                catch (Exception ex)
-                {
-                    MessageBox.Show(ex.Message);
-                    return;
-                }
-            });
-            RemoveLuaBackendCommand = new RelayCommand(_ =>
-            {
-                try
-                {
-                    if (GameCollection == 0 && PcReleaseLocation == null || GameCollection == 1 && PcReleaseLocationKH3D == null)
-                    {
-                        MessageBox.Show(
-                                $"At least one filepath is invalid check you selected a correct filepath for the collection you are trying to uninstall Lua Backend for.",
-                                "Error",
-                                MessageBoxButton.OK,
-                                MessageBoxImage.Error);
-                        return;
-                    }
-                    else
-                    {
-                        if (GameCollection == 0)
-                        {
-                            File.Delete(Path.Combine(PcReleaseLocation, "LuaBackend.dll"));
-                            File.Delete(Path.Combine(PcReleaseLocation, "LuaBackend.toml"));
-                        }
-                        else if (GameCollection == 1)
-                        {
-                            File.Delete(Path.Combine(PcReleaseLocationKH3D, "LuaBackend.dll"));
-                            File.Delete(Path.Combine(PcReleaseLocationKH3D, "LuaBackend.toml"));
-                        }
-                        OnPropertyChanged(nameof(IsLuaBackendInstalled));
-                        OnPropertyChanged(nameof(LuaBackendFoundVisibility));
-                        OnPropertyChanged(nameof(LuaBackendNotFoundVisibility));
-                    }
-                }
-                catch (Exception ex)
-                {
-                    MessageBox.Show(ex.Message);
-                    return;
-                }
-            });
-            InstallSteamAPIFile = new RelayCommand(_ =>
-            {
-                try
-                {
-                    if (GameCollection == 0)
-                    {
-                        if (Directory.Exists(PcReleaseLocation))
-                        {
-                            File.WriteAllText(Path.Combine(PcReleaseLocation, "steam_appid.txt"), "2552430");
-                            ConfigurationService.SteamAPITrick1525 = true;
-                        }
-                    }
-                    else if (GameCollection == 1)
-                    {
-                        if (Directory.Exists(PcReleaseLocationKH3D))
-                        {
-                            File.WriteAllText(Path.Combine(PcReleaseLocationKH3D, "steam_appid.txt"), "2552440");
-                            ConfigurationService.SteamAPITrick28 = true;
-                        }
-                    }
-                    OnPropertyChanged(nameof(SteamAPIFileFound));
-                    OnPropertyChanged(nameof(SteamAPIFileNotFound));
-                }
-                catch (Exception ex)
-                {
-                    MessageBox.Show(ex.Message);
-                    return;
-                }
-            });
-            RemoveSteamAPIFile = new RelayCommand(_ =>
-            {
-                try
-                {
-                    if (GameCollection == 0)
-                    {
-                        if (PcReleaseLocation != null && File.Exists(Path.Combine(PcReleaseLocation, "steam_appid.txt")))
-                        {
-                            File.Delete(Path.Combine(PcReleaseLocation, "steam_appid.txt"));
-                            ConfigurationService.SteamAPITrick1525 = false;
-                        }
-                    }
-                    else if (GameCollection == 1)
-                    {
-                        if (PcReleaseLocationKH3D != null && File.Exists(Path.Combine(PcReleaseLocationKH3D, "steam_appid.txt")))
-                        {
-                            File.Delete(Path.Combine(PcReleaseLocationKH3D, "steam_appid.txt"));
-                            ConfigurationService.SteamAPITrick28 = false;
-                        }
-                    }
-                    OnPropertyChanged(nameof(SteamAPIFileFound));
-                    OnPropertyChanged(nameof(SteamAPIFileNotFound));
-                }
-                catch (Exception ex)
-                {
-                    MessageBox.Show(ex.Message);
-                    return;
-                }
-            });
-        }
-
-        private async Task ExtractGameData(string isoLocation, string gameDataLocation)
-        {
-            void MarkStarted()
-            {
-                IsNotExtracting = false;
-                ExtractionProgress = 0;
-                OnPropertyChanged(nameof(IsNotExtracting));
-                OnPropertyChanged(nameof(IsGameDataFound));
-                OnPropertyChanged(nameof(ProgressBarVisibility));
-                OnPropertyChanged(nameof(ExtractionCompleteVisibility));
-                OnPropertyChanged(nameof(ExtractionProgress));
-            }
-
-            void MarkSuccessful()
-            {
-                IsNotExtracting = true;
-                ExtractionProgress = 1.0f;
-                OnPropertyChanged(nameof(IsNotExtracting));
-                OnPropertyChanged(nameof(IsGameDataFound));
-                OnPropertyChanged(nameof(GameDataNotFoundVisibility));
-                OnPropertyChanged(nameof(GameDataFoundVisibility));
-                OnPropertyChanged(nameof(ProgressBarVisibility));
-                OnPropertyChanged(nameof(ExtractionCompleteVisibility));
-                OnPropertyChanged(nameof(ExtractionProgress));
-            }
-
-            void MarkFailure()
-            {
-                IsNotExtracting = true;
-                OnPropertyChanged(nameof(IsNotExtracting));
-                OnPropertyChanged(nameof(IsGameDataFound));
-                OnPropertyChanged(nameof(ProgressBarVisibility));
-                OnPropertyChanged(nameof(ExtractionCompleteVisibility));
-                OnPropertyChanged(nameof(ExtractionProgress));
-            }
-
-            Action<float> CreateOnProgressProcessor()
-            {
-                var lastProgress = 0f;
-
-                return progress =>
-                {
-                    if (progress == 0)
-                    {
-                        System.Windows.Application.Current.Dispatcher.Invoke(() => MarkStarted());
-                    }
-                    else if (progress == 1)
-                    {
-                        System.Windows.Application.Current.Dispatcher.Invoke(() => MarkSuccessful());
-                    }
-                    else
-                    {
-                        if (0.01f <= progress - lastProgress)
-                        {
-                            lastProgress = progress;
-
-                            System.Windows.Application.Current.Dispatcher.Invoke(() =>
-                            {
-                                ExtractionProgress = progress;
-                                OnPropertyChanged(nameof(ExtractionProgress));
-                            });
-                        }
-                    }
-                };
-            }
-
-            try
-            {
-                switch (GameEdition)
-                {
-                    default:
-                        break;
-
-                    case PCSX2:
-                    {
-                        if (isoLocation != null)
-                        {
-                            var game = GameService.DetectGameId(isoLocation);
-                            if (game != null)
-                            {
-                                switch (game?.Id)
-                                {
-                                    case "kh1":
-                                        await _gameDataExtractionService.ExtractKh1Ps2EditionAsync(
-                                            isoLocation: isoLocation,
-                                            gameDataLocation: gameDataLocation,
-                                            onProgress: CreateOnProgressProcessor()
-                                        );
-                                        break;
-                                    case "kh2":
-                                        await _gameDataExtractionService.ExtractKh2Ps2EditionAsync(
-                                            isoLocation: isoLocation,
-                                            gameDataLocation: gameDataLocation,
-                                            onProgress: CreateOnProgressProcessor()
-                                        );
-                                        break;
-                                    case "Recom":
-                                        await _gameDataExtractionService.ExtractRecomPs2EditionAsync(
-                                            isoLocation: isoLocation,
-                                            gameDataLocation: gameDataLocation,
-                                            onProgress: CreateOnProgressProcessor()
-                                        );
-                                        break;
-                                }
-                            }
-                        }
-                        break;
-                    }
-
-                    case PC:
-                    {
-                        var langFolder = ConfigurationService.PCVersion == "Steam" ? "dt" : _pcReleaseLanguage == "jp" ? "jp" : "en";
-
-                        await _gameDataExtractionService.ExtractKhPcEditionAsync(
-                            gameDataLocation: gameDataLocation,
-                            onProgress: CreateOnProgressProcessor(),
-                            getKhFilePath: fileName
-                                => Path.Combine(
-                                    _pcReleaseLocation,
-                                    "Image",
-                                    langFolder,
-                                    fileName
-                                ),
-                            getKh3dFilePath: fileName
-                                => Path.Combine(
-                                    _pcReleaseLocationKH3D,
-                                    "Image",
-                                    langFolder,
-                                    fileName
-                                ),
-                            extractkh1: ConfigurationService.Extractkh1,
-                            extractkh2: ConfigurationService.Extractkh2,
-                            extractbbs: ConfigurationService.Extractbbs,
-                            extractrecom: ConfigurationService.Extractrecom,
-                            extractkh3d: ConfigurationService.Extractkh3d,
-                            ifRetry: async ex =>
-                            {
-                                var delayedResult = new TaskCompletionSource<bool>();
-
-                                await System.Windows.Application.Current.Dispatcher.InvokeAsync(
-                                    () =>
-                                    {
-                                        var selection = MessageBox.Show(ex.Message + "\n\nWould you like to retry again?", "An Exception was Caught!", MessageBoxButton.YesNoCancel, MessageBoxImage.Warning);
-
-                                        switch (selection)
-                                        {
-                                            case MessageBoxResult.Yes:
-                                                delayedResult.SetResult(true);
-                                                return;
-                                            case MessageBoxResult.No:
-                                                delayedResult.SetResult(false);
-                                                return;
-                                            default:
-                                                delayedResult.SetException(ex);
-                                                return;
-                                        }
-                                    }
-                                )
-                                    .Task;
-
-                                return await delayedResult.Task;
-                            },
-                            cancellationToken: Abort
-                        );
-                        break;
-                    }
-                }
-            }
-            catch
-            {
-                System.Windows.Application.Current.Dispatcher.Invoke(() => MarkFailure());
-                throw;
-            }
-        }
-
-        private CancellationTokenSource _abort = new CancellationTokenSource();
-        public CancellationToken Abort => _abort.Token;
-        public void SetAborted() => _abort.Cancel();
-    }
-}
diff --git a/OpenKh.Tools.ModsManager/Views/CollectionOptionalModDetailsView.xaml b/OpenKh.Tools.ModsManager/Views/CollectionOptionalModDetailsView.xaml
deleted file mode 100644
index a5b152aea..000000000
--- a/OpenKh.Tools.ModsManager/Views/CollectionOptionalModDetailsView.xaml
+++ /dev/null
@@ -1,18 +0,0 @@
-<UserControl x:Class="OpenKh.Tools.ModsManager.Views.CollectionOptionalModDetailsView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:local="clr-namespace:OpenKh.Tools.ModsManager.Views"
-             mc:Ignorable="d"
-             d:DesignHeight="450" d:DesignWidth="256">
-    <UserControl.Resources>
-        <Style TargetType="Expander">
-            <Setter Property="Foreground" Value="{Binding ColorTheme.TextColor}"/>
-        </Style>
-    </UserControl.Resources>
-    <StackPanel>
-        <TextBlock Margin="3 0 0 3" FontWeight="Bold" Text="{Binding Name}" d:Text="Mod name"/>
-        <TextBlock Margin="3 0 0 3" Text="{Binding Author}" d:Text="Author name"/>
-    </StackPanel>
-</UserControl>
diff --git a/OpenKh.Tools.ModsManager/Views/CollectionOptionalModDetailsView.xaml.cs b/OpenKh.Tools.ModsManager/Views/CollectionOptionalModDetailsView.xaml.cs
deleted file mode 100644
index d4ed1d6ac..000000000
--- a/OpenKh.Tools.ModsManager/Views/CollectionOptionalModDetailsView.xaml.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System.Windows.Controls;
-
-namespace OpenKh.Tools.ModsManager.Views
-{
-    /// <summary>
-    /// Interaction logic for CollectionOptionalModDetailsView.xaml
-    /// </summary>
-    public partial class CollectionOptionalModDetailsView : UserControl
-    {
-        public CollectionOptionalModDetailsView()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/OpenKh.Tools.ModsManager/Views/CollectionSettingsView.xaml b/OpenKh.Tools.ModsManager/Views/CollectionSettingsView.xaml
deleted file mode 100644
index a3f986948..000000000
--- a/OpenKh.Tools.ModsManager/Views/CollectionSettingsView.xaml
+++ /dev/null
@@ -1,86 +0,0 @@
-<Window x:Class="OpenKh.Tools.ModsManager.Views.CollectionSettingsView"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-		xmlns:my="clr-namespace:OpenKh.Tools.ModsManager.Services"
-        xmlns:vm="clr-namespace:OpenKh.Tools.ModsManager.ViewModels"
-        xmlns:local="clr-namespace:OpenKh.Tools.ModsManager.Views"
-		d:DataContext="{d:DesignInstance Type=vm:CollectionSettingsViewModel}"
-        mc:Ignorable="d"
-        WindowStartupLocation="CenterScreen"
-        Title="Collection Settings"
-		d:DesignHeight="300" d:DesignWidth="400" Background="{Binding ColorTheme.BackgroundColor}">
-    <Window.Resources>
-		<ControlTemplate x:Key="collectionModList" TargetType="ListBox">
-			<Border Name="Border" BorderThickness="1">
-				<Border.BorderBrush>
-					<SolidColorBrush Color="#FFABADB3" />
-				</Border.BorderBrush>
-				<Grid>
-					<Grid.RowDefinitions>
-						<RowDefinition Height="Auto"/>
-						<RowDefinition Height="*"/>
-						<RowDefinition Height="Auto"/>
-					</Grid.RowDefinitions>
-					<ScrollViewer Grid.Row="1" Margin="0" Background="{Binding ColorTheme.BackgroundColor}">
-						<StackPanel Margin="0" IsItemsHost="True"/>
-					</ScrollViewer>
-				</Grid>
-			</Border>
-		</ControlTemplate>
-		<Style TargetType="TextBlock">
-			<Setter Property="Foreground" Value="{Binding ColorTheme.TextColor}"/>
-		</Style>
-	</Window.Resources>
-	<Grid Margin="10">
-		<Grid.ColumnDefinitions>
-			<ColumnDefinition Width="2*"/>
-			<ColumnDefinition Width="*"/>
-		</Grid.ColumnDefinitions>
-		<ListBox
-        Template="{DynamicResource collectionModList}"
-        Grid.Column="0"
-        VerticalAlignment="Stretch"
-        ItemsSource="{Binding CollectionModsList}"
-        SelectedValue="{Binding CollectionSelectedValue}"
-        HorizontalContentAlignment="Stretch">
-			<ListBox.ItemTemplate>
-				<DataTemplate>
-					<Grid Height="64" Margin="3">
-						<Grid.ColumnDefinitions>
-							<ColumnDefinition Width="Auto"/>
-							<ColumnDefinition Width="*"/>
-						</Grid.ColumnDefinitions>
-
-						<CheckBox Grid.Column="0" VerticalAlignment="Center" VerticalContentAlignment="Center" IsChecked="{Binding Enabled}" Foreground="{Binding ColorTheme.TextColor}">
-							<CheckBox.Content>
-								<Grid Margin="3 1 10 0">
-									<Image Width="64" Height="64" Source="{Binding IconImage}"/>
-								</Grid>
-							</CheckBox.Content>
-						</CheckBox>
-						<StackPanel Grid.Column="1">
-							<TextBlock Text="{Binding Name}" FontWeight="Bold" Foreground="{Binding ColorTheme.TextColor}"/>
-							<TextBlock Text="{Binding Author}" Foreground="{Binding ColorTheme.TextColor}"/>
-						</StackPanel>
-					</Grid>
-				</DataTemplate>
-			</ListBox.ItemTemplate>
-		</ListBox>
-		<Grid Grid.Column="1">
-			<StackPanel Visibility="{Binding IsModUnselectedMessageVisible}">
-				<TextBlock Margin="3 0 0 3" Text="The selected mod info will be displayed here." TextWrapping="Wrap"/>
-				<TextBlock Margin="3 0 0 3" TextWrapping="Wrap" Text="&#x0a;To have a mod included in patching tick the box next to it.&#x0a;"></TextBlock>
-				<TextBlock Margin="3 0 0 3" TextWrapping="Wrap">
-					After selecting the mods you wish to run with
-					close this window and follow your normal 'Build'
-					process with either the 'Build' or 'Build and Run' commands.
-				</TextBlock>
-			</StackPanel>
-			<ScrollViewer Visibility="{Binding IsModInfoVisible}">
-				<local:CollectionOptionalModDetailsView Grid.Column="3" DataContext="{Binding CollectionSelectedValue}"/>
-			</ScrollViewer>
-		</Grid>
-	</Grid>
-</Window>
diff --git a/OpenKh.Tools.ModsManager/Views/CollectionSettingsView.xaml.cs b/OpenKh.Tools.ModsManager/Views/CollectionSettingsView.xaml.cs
deleted file mode 100644
index 4da57160b..000000000
--- a/OpenKh.Tools.ModsManager/Views/CollectionSettingsView.xaml.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System.Windows;
-
-namespace OpenKh.Tools.ModsManager.Views
-{
-    /// <summary>
-    /// Interaction logic for CollectionSettingsView.xaml
-    /// </summary>
-    public partial class CollectionSettingsView : Window
-    {
-        public CollectionSettingsView()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/OpenKh.Tools.ModsManager/Views/CopySourceFilesVM.cs b/OpenKh.Tools.ModsManager/Views/CopySourceFilesVM.cs
deleted file mode 100644
index db0bc11c3..000000000
--- a/OpenKh.Tools.ModsManager/Views/CopySourceFilesVM.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-using OpenKh.Tools.ModsManager.Models.ViewHelper;
-using OpenKh.Tools.ModsManager.Services;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Windows.Input;
-using Xe.Tools;
-
-namespace OpenKh.Tools.ModsManager.Views
-{
-    public class CopySourceFilesVM : BaseNotifyPropertyChanged
-    {
-        public ColorThemeService ColorTheme => ColorThemeService.Instance;
-
-        public ICommand ProceedCommand { get; set; }
-
-        #region ProceedTask
-        private Task _proceedTask = null;
-        public Task ProceedTask
-        {
-            get => _proceedTask;
-            set
-            {
-                _proceedTask = value;
-                OnPropertyChanged(nameof(ProceedTask));
-            }
-        }
-        #endregion
-
-        #region CopySourceList
-        private IEnumerable<CopySourceFile> _copySourceList = Array.Empty<CopySourceFile>();
-        public IEnumerable<CopySourceFile> CopySourceList
-        {
-            get => _copySourceList;
-            set
-            {
-                _copySourceList = value;
-                OnPropertyChanged(nameof(CopySourceList));
-            }
-        }
-        #endregion
-
-        #region SelectedPrimarySource
-        private PrimarySource _selectedPrimarySource = null;
-        public PrimarySource SelectedPrimarySource
-        {
-            get => _selectedPrimarySource;
-            set
-            {
-                _selectedPrimarySource = value;
-                OnPropertyChanged(nameof(SelectedPrimarySource));
-            }
-        }
-        #endregion
-
-        #region PrimarySourceList
-        private IEnumerable<PrimarySource> _primarySourceList = Array.Empty<PrimarySource>();
-        public IEnumerable<PrimarySource> PrimarySourceList
-        {
-            get => _primarySourceList;
-            set
-            {
-                _primarySourceList = value;
-                OnPropertyChanged(nameof(PrimarySourceList));
-                SelectedPrimarySource = value?.FirstOrDefault();
-            }
-        }
-        #endregion
-
-        public ICommand CheckAllCommand { get; set; }
-        public ICommand UncheckAllCommand { get; set; }
-    }
-}
diff --git a/OpenKh.Tools.ModsManager/Views/CopySourceFilesWindow.xaml b/OpenKh.Tools.ModsManager/Views/CopySourceFilesWindow.xaml
deleted file mode 100644
index a9c5ecc0e..000000000
--- a/OpenKh.Tools.ModsManager/Views/CopySourceFilesWindow.xaml
+++ /dev/null
@@ -1,72 +0,0 @@
-<Window x:Class="OpenKh.Tools.ModsManager.Views.CopySourceFilesWindow"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:OpenKh.Tools.ModsManager.Views"
-        xmlns:userControls="clr-namespace:OpenKh.Tools.ModsManager.UserControls"
-        d:DataContext="{d:DesignInstance local:CopySourceFilesVM}"
-        Background="{Binding ColorTheme.BackgroundColor}"
-        WindowStartupLocation="CenterOwner"
-        mc:Ignorable="d"
-        Title="CopySourceFilesWindow" Height="543" Width="422">
-    <FrameworkElement.Resources>
-        <Style TargetType="TextBlock">
-            <Setter Property="Foreground" Value="{Binding ColorTheme.TextColor}"/>
-        </Style>
-    </FrameworkElement.Resources>
-    <DockPanel LastChildFill="True">
-        <TextBlock Visibility="Collapsed" Foreground="{Binding ColorTheme.TextColor}" Name="_forTheme" />
-        <StackPanel DockPanel.Dock="Bottom" VerticalAlignment="Bottom" Orientation="Horizontal">
-            <Button Content="Proceed" HorizontalAlignment="Left" Padding="7" Margin="7" Command="{Binding ProceedCommand}" />
-            <userControls:TaskStatusObserverControl VerticalAlignment="Center" Task="{Binding ProceedTask}" />
-        </StackPanel>
-        <TextBlock Text="Select primary one if applicable:" Padding="7" DockPanel.Dock="Top" />
-        <ComboBox DockPanel.Dock="Top" Margin="7" ItemsSource="{Binding PrimarySourceList}" SelectedItem="{Binding SelectedPrimarySource}"
-                  >
-            <ComboBox.ItemTemplate>
-                <DataTemplate>
-                    <TextBlock Text="{Binding Display}" />
-                </DataTemplate>
-            </ComboBox.ItemTemplate>
-        </ComboBox>
-        <TextBlock Text="Tools:" Padding="7" DockPanel.Dock="Top" />
-        <StackPanel DockPanel.Dock="Top" Orientation="Horizontal">
-            <Button Margin="7,7,0,7" Padding="3" Command="{Binding CheckAllCommand}" MinWidth="60">
-                <TextBlock TextAlignment="Center">Check<LineBreak />all</TextBlock>
-            </Button>
-            <Button Margin="7,7,0,7" Padding="3" Command="{Binding UncheckAllCommand}" MinWidth="60">
-                <TextBlock TextAlignment="Center">Uncheck<LineBreak />all</TextBlock>
-            </Button>
-        </StackPanel>
-        <TextBlock Text="Select actions for source:" Padding="7" DockPanel.Dock="Top" />
-        <Border Margin="7" BorderBrush="Gray" BorderThickness="1">
-            <ScrollViewer VerticalScrollBarVisibility="Visible">
-                <ItemsControl ItemsSource="{Binding CopySourceList}">
-                    <ItemsControl.ItemsPanel>
-                        <ItemsPanelTemplate>
-                            <StackPanel />
-                        </ItemsPanelTemplate>
-                    </ItemsControl.ItemsPanel>
-                    <ItemsControl.ItemTemplate>
-                        <DataTemplate>
-                            <DockPanel LastChildFill="True" VerticalAlignment="Top" Margin="3">
-                                <StackPanel Orientation="Horizontal" DockPanel.Dock="Right" VerticalAlignment="Center">
-                                    <CheckBox Content="Exists" IsChecked="{Binding DestinationFileExists}" IsEnabled="False" VerticalAlignment="Center" Margin="3"
-                                      Foreground="{Binding Foreground,ElementName=_forTheme}"
-                                      />
-                                    <CheckBox Content="{Binding ActionName}" IsChecked="{Binding DoAction}" VerticalAlignment="Center" Margin="3"
-                                      Foreground="{Binding Foreground,ElementName=_forTheme}"
-                                      />
-                                </StackPanel>
-                                <TextBlock Text="{Binding Display}" Padding="3" TextTrimming="CharacterEllipsis"
-                                   Foreground="{Binding Foreground,ElementName=_forTheme}"
-                                   />
-                            </DockPanel>
-                        </DataTemplate>
-                    </ItemsControl.ItemTemplate>
-                </ItemsControl>
-            </ScrollViewer>
-        </Border>
-    </DockPanel>
-</Window>
diff --git a/OpenKh.Tools.ModsManager/Views/CopySourceFilesWindow.xaml.cs b/OpenKh.Tools.ModsManager/Views/CopySourceFilesWindow.xaml.cs
deleted file mode 100644
index eddddca4c..000000000
--- a/OpenKh.Tools.ModsManager/Views/CopySourceFilesWindow.xaml.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System.Windows;
-
-namespace OpenKh.Tools.ModsManager.Views
-{
-    /// <summary>
-    /// Interaction logic for CopySourceFilesWindow.xaml
-    /// </summary>
-    public partial class CopySourceFilesWindow : Window
-    {
-        public CopySourceFilesWindow()
-        {
-            InitializeComponent();
-            DataContext = VM = new CopySourceFilesVM();
-        }
-
-        public CopySourceFilesVM VM { get; }
-    }
-}
diff --git a/OpenKh.Tools.ModsManager/Views/DebuggingWindow.xaml b/OpenKh.Tools.ModsManager/Views/DebuggingWindow.xaml
deleted file mode 100644
index a47f55f89..000000000
--- a/OpenKh.Tools.ModsManager/Views/DebuggingWindow.xaml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Window x:Class="OpenKh.Tools.ModsManager.Views.DebuggingWindow"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:OpenKh.Tools.ModsManager.Views"
-        mc:Ignorable="d"
-        Title="Debug window" Height="450" Width="800" FontFamily="Courier New" Background="#FF282C34">
-    <ScrollViewer>
-        <StackPanel x:Name="LogPanel"/>
-    </ScrollViewer>
-</Window>
diff --git a/OpenKh.Tools.ModsManager/Views/DebuggingWindow.xaml.cs b/OpenKh.Tools.ModsManager/Views/DebuggingWindow.xaml.cs
deleted file mode 100644
index 077da66ca..000000000
--- a/OpenKh.Tools.ModsManager/Views/DebuggingWindow.xaml.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-using OpenKh.Tools.ModsManager.Interfaces;
-using System.ComponentModel;
-using System.Runtime.CompilerServices;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Media;
-
-namespace OpenKh.Tools.ModsManager.Views
-{
-    /// <summary>
-    /// Interaction logic for DebuggingWindow.xaml
-    /// </summary>
-    public partial class DebuggingWindow : Window, IDebugging, INotifyPropertyChanged
-    {
-        private static readonly Brush[] _brushes = new Brush[]
-        {
-            new SolidColorBrush(Color.FromRgb(220, 223, 228)),
-            new SolidColorBrush(Color.FromRgb(229, 192, 123)),
-            new SolidColorBrush(Color.FromRgb(224, 108, 117)),
-        };
-
-        public DebuggingWindow()
-        {
-            InitializeComponent();
-            DataContext = this;
-        }
-
-        public void ClearLogs()
-        {
-            Application.Current.Dispatcher.Invoke(LogPanel.Children.Clear);
-        }
-
-        public void HideDebugger()
-        {
-            Task.Run(() => Application.Current.Dispatcher.Invoke(Hide));
-        }
-
-        public void Log(long ms, string tag, string message) => Task.Run(() =>
-        {
-            Application.Current.Dispatcher.Invoke(() =>
-            {
-                var str = $"[{(ms / 1000):D3}.{(ms % 1000):D3}] {tag} {message}";
-                var brush = tag switch
-                {
-                    "INF" => _brushes[0],
-                    "WRN" => _brushes[1],
-                    "ERR" => _brushes[2],
-                    _ => _brushes[0],
-                };
-                LogPanel.Children.Insert(0, new TextBlock
-                {
-                    Text = str,
-                    Foreground = brush,
-                    TextWrapping = TextWrapping.Wrap
-                });
-            });
-        });
-
-        protected void OnPropertyChanged([CallerMemberName] string propertyName = null)
-        {
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
-        }
-
-        public event PropertyChangedEventHandler PropertyChanged;
-    }
-}
diff --git a/OpenKh.Tools.ModsManager/Views/InstallModProgressWindow.xaml b/OpenKh.Tools.ModsManager/Views/InstallModProgressWindow.xaml
deleted file mode 100644
index 5a845e7a8..000000000
--- a/OpenKh.Tools.ModsManager/Views/InstallModProgressWindow.xaml
+++ /dev/null
@@ -1,19 +0,0 @@
-<Window x:Class="OpenKh.Tools.ModsManager.Views.InstallModProgressWindow"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:OpenKh.Tools.ModsManager.Views"
-        mc:Ignorable="d"
-        Title="{Binding DialogTitle}" d:Title="Installing mod..." Height="120" Width="300" SizeToContent="WidthAndHeight" ResizeMode="NoResize" WindowStartupLocation="CenterScreen">
-    <StackPanel Margin="10">
-        <TextBlock Margin="0 0 0 10" d:Text="Installing the mod XYZ">
-            <Run Text="{Binding OperationName}"/>
-            <Run> the mod </Run>
-            <Run FontWeight="Bold" Text="{Binding ModName}" d:Text="openkh/mod-template"/>
-            <Run>...</Run>
-        </TextBlock>
-        <ProgressBar Margin="0 0 0 10" Height="20" IsIndeterminate="{Binding ProgressUnknown}" Value="{Binding ProgressValue}" Maximum="1" d:IsIndeterminate="True" />
-        <TextBlock Text="{Binding ProgressText}" d:Text="Downloading file title1.png"/>
-    </StackPanel>
-</Window>
diff --git a/OpenKh.Tools.ModsManager/Views/InstallModProgressWindow.xaml.cs b/OpenKh.Tools.ModsManager/Views/InstallModProgressWindow.xaml.cs
deleted file mode 100644
index e83376ef2..000000000
--- a/OpenKh.Tools.ModsManager/Views/InstallModProgressWindow.xaml.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-using System.ComponentModel;
-using System.Runtime.CompilerServices;
-using System.Windows;
-
-namespace OpenKh.Tools.ModsManager.Views
-{
-    /// <summary>
-    /// Interaction logic for InstallModProgressWindow.xaml
-    /// </summary>
-    public partial class InstallModProgressWindow : Window, INotifyPropertyChanged
-    {
-        private string _modName;
-        private string _progressText;
-        private bool _progressUnknown;
-        private float _progressValue;
-        private string _operationName = "Installing";
-
-        public InstallModProgressWindow()
-        {
-            InitializeComponent();
-            DataContext = this;
-            Closed += (sender, args) =>
-            {
-                if (args is CancelEventArgs cancelEventArgs)
-                    cancelEventArgs.Cancel = true;
-            };
-        }
-
-        public string OperationName
-        {
-            get => _operationName;
-            set
-            {
-                _operationName = value;
-                OnPropertyChanged();
-                OnPropertyChanged(nameof(Title));
-            }
-        }
-
-        public string DialogTitle => $"{OperationName} mod...";
-
-        public string ModName
-        {
-            get => _modName;
-            set
-            {
-                _modName = value;
-                OnPropertyChanged();
-            }
-        }
-
-        public string ProgressText
-        {
-            get => _progressText;
-            set
-            {
-                _progressText = value;
-                OnPropertyChanged();
-            }
-        }
-
-        public bool ProgressUnknown
-        {
-            get => _progressUnknown;
-            private set
-            {
-                _progressUnknown = value;
-                OnPropertyChanged();
-            }
-        }
-
-        public float ProgressValue
-        {
-            get => _progressValue;
-            set
-            {
-                ProgressUnknown = false;
-                _progressValue = value;
-                OnPropertyChanged();
-            }
-        }
-
-        public event PropertyChangedEventHandler PropertyChanged;
-        protected void OnPropertyChanged([CallerMemberName] string propertyName = null)
-        {
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
-        }
-    }
-}
diff --git a/OpenKh.Tools.ModsManager/Views/InstallModView.xaml b/OpenKh.Tools.ModsManager/Views/InstallModView.xaml
deleted file mode 100644
index d443ca61d..000000000
--- a/OpenKh.Tools.ModsManager/Views/InstallModView.xaml
+++ /dev/null
@@ -1,71 +0,0 @@
-<Window x:Class="OpenKh.Tools.ModsManager.Views.InstallModView"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:OpenKh.Tools.ModsManager.Views"
-        xmlns:ctrls="clr-namespace:System.Windows.Controls"
-        mc:Ignorable="d"
-        WindowStartupLocation="CenterScreen"
-        ResizeMode="NoResize"
-         FocusManager.FocusedElement="{Binding ElementName=txtSourceModUrl}"
-        Title="Install a new mod or Lua Script..." Height="183" Width="300" SizeToContent="Height" Background="{Binding ColorTheme.BackgroundColor}" Foreground="{Binding ColorTheme.TextColor}">
-    <Window.InputBindings>
-        <KeyBinding Key="Esc" Command="{Binding CloseCommand}"/>
-    </Window.InputBindings>
-    <Window.Resources>
-        <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/>
-    </Window.Resources>
-    <Grid Margin="10">
-        <Grid.RowDefinitions>
-            <RowDefinition Height="*"/>
-            <RowDefinition Height="10"/>
-            <RowDefinition Height="24"/>
-        </Grid.RowDefinitions>
-        <StackPanel Grid.Row="0">
-            <TextBlock Margin="0 0 0 3">Add a new mod from GitHub</TextBlock>
-            <Grid Margin="0 0 0 5" Background="White">
-                <TextBlock Margin="5,1" MinWidth="50" Text="eg. openkh/my-kingdomhearts-mod"
-                   Foreground="Gray" Visibility="{Binding ElementName=txtSourceModUrl, Path=Text.IsEmpty, Converter={StaticResource BooleanToVisibilityConverter}}" IsHitTestVisible="False"/>
-                <TextBox Name="txtSourceModUrl" Background="Transparent" Text="{Binding RepositoryName, UpdateSourceTrigger=PropertyChanged}" KeyUp="txtSourceModUrl_KeyUp" />
-            </Grid>
-            
-            <TextBlock Margin="0 0 0 3">Install a Mod Archive or Lua Script</TextBlock>
-            <Button Margin="0 0 0 5" Click="InstallLocalFile_Click">Select and install Mod Archive or Lua Script</Button>
-           
-            <Expander Header="More Options" Foreground="{Binding ColorTheme.TextColor}">
-                <StackPanel>
-                    <TextBlock Margin="0 0 0 3">Hosted Platform (optional)</TextBlock>
-                    <Grid Margin="0 0 0 5" Background="White">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="211*"/>
-                            <ColumnDefinition Width="70*"/>
-                        </Grid.ColumnDefinitions>
-                        <TextBlock Margin="5,1,5,1" MinWidth="50" Text="eg. https://github.com/"
-                   Foreground="Gray" Visibility="{Binding ElementName=txtPlatformUrl, Path=Text.IsEmpty, Converter={StaticResource BooleanToVisibilityConverter}}" IsHitTestVisible="False" Grid.ColumnSpan="2"/>
-                        <TextBox Name="txtPlatformUrl" Background="Transparent" Text="{Binding PlatformURL, UpdateSourceTrigger=PropertyChanged}" KeyUp="txtSourceModUrl_KeyUp" Grid.ColumnSpan="2" />
-                    </Grid>
-
-                    <TextBlock Margin="0 0 0 3">Branch (optional)</TextBlock>
-                    <Grid Margin="0 0 0 5" Background="White">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="211*"/>
-                            <ColumnDefinition Width="70*"/>
-                        </Grid.ColumnDefinitions>
-                        <TextBlock Margin="5,1,5,1" MinWidth="50" Text="eg. main"
-                   Foreground="Gray" Visibility="{Binding ElementName=txtBranchName, Path=Text.IsEmpty, Converter={StaticResource BooleanToVisibilityConverter}}" IsHitTestVisible="False" Grid.ColumnSpan="2"/>
-                        <TextBox Name="txtBranchName" Background="Transparent" Text="{Binding BranchName, UpdateSourceTrigger=PropertyChanged}" KeyUp="txtSourceModUrl_KeyUp" Grid.ColumnSpan="2" />
-                    </Grid>
-                </StackPanel>
-            </Expander>
-        </StackPanel>
-
-        <Grid Grid.Row="2">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*"/>
-                <ColumnDefinition Width="60"/>
-            </Grid.ColumnDefinitions>
-            <Button Grid.Column="1" Click="Install_Click">Install</Button>
-        </Grid>
-    </Grid>
-</Window>
diff --git a/OpenKh.Tools.ModsManager/Views/InstallModView.xaml.cs b/OpenKh.Tools.ModsManager/Views/InstallModView.xaml.cs
deleted file mode 100644
index 5fcf36f91..000000000
--- a/OpenKh.Tools.ModsManager/Views/InstallModView.xaml.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-using OpenKh.Tools.ModsManager.Services;
-using System.Collections.Generic;
-using System.Windows;
-using Xe.Tools.Wpf.Commands;
-using Xe.Tools.Wpf.Dialogs;
-
-namespace OpenKh.Tools.ModsManager.Views
-{
-    /// <summary>
-    /// Interaction logic for InstallModView.xaml
-    /// </summary>
-    public partial class InstallModView : Window
-    {
-        public ColorThemeService ColorTheme => ColorThemeService.Instance;
-        private static readonly IEnumerable<FileDialogFilter> _zipFilter = FileDialogFilterComposer
-            .Compose()
-            .AddExtensions("Mod archive", "zip", "kh2pcpatch", "kh1pcpatch", "compcpatch", "bbspcpatch", "dddpcpatch", "lua");
-
-        public RelayCommand CloseCommand { get; }
-        public string RepositoryName { get; set; }
-        public string PlatformURL { get; set; }
-        public string BranchName { get; set; }
-        public bool IsZipFile { get; private set; }
-        public bool IsLuaFile { get; private set; } = false;
-
-        public InstallModView()
-        {
-            InitializeComponent();
-            DataContext = this;
-
-            CloseCommand = new RelayCommand(_ => Close());
-        }
-
-        private void Install_Click(object sender, RoutedEventArgs e)
-        {
-            var isBlocked = false;
-            var blockedMessage = string.Empty;
-            if (ModsService.IsUserBlocked(RepositoryName))
-            {
-                isBlocked = true;
-                blockedMessage = "The author of this mod violated OpenKH rules therefore we do not recommend their mods. Do you wish to install it anyway?";
-            }
-            else if (ModsService.IsModBlocked(RepositoryName))
-            {
-                isBlocked = true;
-                blockedMessage = "The selected mod violates OpenKH rules, therefore we do not recommend its installation. Do you wish to install it anyway?";
-            }
-
-            if (isBlocked)
-            {
-                var result = MessageBox.Show(blockedMessage, $"Warning on installing {RepositoryName}", MessageBoxButton.YesNo, MessageBoxImage.Warning);
-                DialogResult = result == MessageBoxResult.Yes;
-            }
-            else
-                DialogResult = true;
-
-            Close();
-        }
-
-        private void InstallLocalFile_Click(object sender, RoutedEventArgs e)
-        {
-            FileDialog.OnOpen(fileName =>
-            {
-                if (!fileName.Contains(".lua"))
-                {
-                    IsZipFile = true;
-                    RepositoryName = fileName;
-                    DialogResult = true;
-                    Close();
-                }
-                else
-                {
-                    IsZipFile = false;
-                    IsLuaFile = true;
-                    RepositoryName = fileName;
-                    DialogResult = true;
-                    Close();
-                }
-            }, _zipFilter);
-        }
-
-        private void txtSourceModUrl_KeyUp(object sender, System.Windows.Input.KeyEventArgs e)
-        {
-            if (e.Key == System.Windows.Input.Key.Enter)
-                Install_Click(sender, e);
-
-            e.Handled = true;
-        }
-    }
-}
diff --git a/OpenKh.Tools.ModsManager/Views/MainWindow.xaml b/OpenKh.Tools.ModsManager/Views/MainWindow.xaml
deleted file mode 100644
index 91e32cca4..000000000
--- a/OpenKh.Tools.ModsManager/Views/MainWindow.xaml
+++ /dev/null
@@ -1,173 +0,0 @@
-<Window x:Class="OpenKh.Tools.ModsManager.Views.MainWindow"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:OpenKh.Tools.ModsManager.Views" xmlns:my="clr-namespace:OpenKh.Tools.ModsManager.Services"
-        xmlns:vm="clr-namespace:OpenKh.Tools.ModsManager.ViewModels"
-        d:DataContext="{d:DesignInstance Type=vm:MainViewModel}"
-        mc:Ignorable="d"
-        Title="{Binding Title}"
-        Height="{my:SettingBinding Height}"
-        Width="{my:SettingBinding Width}"
-        Left="{my:SettingBinding Left}"
-        Top="{my:SettingBinding Top}">
-    <Window.InputBindings>
-        <KeyBinding Key="F4" Modifiers="Alt" Command="{Binding ExitCommand}"/>
-        <KeyBinding Key="Insert" Command="{Binding AddModCommand}"/>
-        <KeyBinding Key="Delete" Command="{Binding RemoveModCommand}"/>
-        <KeyBinding Key="O" Modifiers="Ctrl" Command="{Binding OpenModFolderCommand}"/>
-        <KeyBinding Key="Up" Modifiers="Alt" Command="{Binding MoveUp}"/>
-        <KeyBinding Key="Down" Modifiers="Alt" Command="{Binding MoveDown}"/>
-        <KeyBinding Key="F5" Command="{Binding BuildAndRunCommand}"/>
-        <KeyBinding Key="B" Modifiers="Ctrl" Command="{Binding BuildCommand}"/>
-        <KeyBinding Key="F5" Modifiers="Ctrl" Command="{Binding RunCommand}"/>
-        <KeyBinding Key="F5" Modifiers="Shift" Command="{Binding StopRunningInstanceCommand}"/>
-        <KeyBinding Key="W" Modifiers="Alt" Command="{Binding WizardCommand}"/>
-    </Window.InputBindings>
-    <Window.Resources>
-        <ControlTemplate x:Key="modList" TargetType="ListBox">
-            <Border Name="Border" BorderThickness="1">
-                <Border.BorderBrush>
-                    <SolidColorBrush Color="#FFABADB3" />
-                </Border.BorderBrush>
-                <Grid>
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto"/>
-                        <RowDefinition Height="*"/>
-                        <RowDefinition Height="Auto"/>
-                    </Grid.RowDefinitions>
-                    <StackPanel Grid.Row="0" Margin="3">
-                        <TextBlock HorizontalAlignment="Center" Text="Highest priority"/>
-                        <Separator Margin="3" Background="#FFABADB3"/>
-                    </StackPanel>
-                    <StackPanel Grid.Row="2" Margin="3">
-                        <Separator Margin="3" Background="#FFABADB3"/>
-                        <TextBlock HorizontalAlignment="Center" Text="Lowest priority"/>
-                    </StackPanel>
-                    <ScrollViewer Grid.Row="1" Margin="0" Focusable="false">
-                        <StackPanel Margin="0" IsItemsHost="True" />
-                    </ScrollViewer>
-                </Grid>
-            </Border>
-        </ControlTemplate>
-    </Window.Resources>
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="*"/>
-        </Grid.RowDefinitions>
-
-        <Menu Grid.Row="0">
-            <MenuItem Header="_Mods">
-                <MenuItem Header="_Install a new mod" Command="{Binding AddModCommand}" InputGestureText="Ins"/>
-                <MenuItem Header="Search _Online mods" Command="{Binding OpenModSearchCommand}">
-                    <MenuItem.Icon>
-                        <Image Source="{StaticResource Search_16x}"/>
-                    </MenuItem.Icon>
-                </MenuItem>
-                <Separator/>
-                <MenuItem Header="_Open mod folder" Command="{Binding OpenModFolderCommand}" InputGestureText="Ctrl+O"/>
-                <MenuItem Header="_Delete selected mod" Command="{Binding RemoveModCommand}" InputGestureText="Del"/>
-                <MenuItem Header="Increase priority" Command="{Binding MoveUp}" InputGestureText="Alt+Up"/>
-                <MenuItem Header="Decrease priority" Command="{Binding MoveDown}" InputGestureText="Alt+Down"/>
-                <Separator/>
-                <MenuItem Header="E_xit" Command="{Binding ExitCommand}" InputGestureText="Alt+F4"/>
-            </MenuItem>
-            <MenuItem Header="Mod Loader">
-                <MenuItem Header="Build and Run" Command="{Binding BuildAndRunCommand}" InputGestureText="F5"/>
-                <MenuItem Header="Build Only" Command="{Binding BuildCommand}" InputGestureText="Ctrl+B"/>
-                <MenuItem Header="Run Only" Command="{Binding RunCommand}" InputGestureText="Ctrl+F5"/>
-                <MenuItem Header="Stop" Command="{Binding StopRunningInstanceCommand}" Visibility="{Binding notPC}" InputGestureText="Shift+F5"/>
-                <MenuItem Header="Fast Restore" Command="{Binding RestoreCommand}" Visibility="{Binding isPC}" CommandParameter="False" InputGestureText="Ctrl+R"/>
-            </MenuItem>
-            <MenuItem Header="Patching" Visibility="{Binding PatchVisible}">
-                <MenuItem Header="Build and Patch" Command="{Binding PatchCommand}" CommandParameter="false" InputGestureText="Ctrl+P"/>
-                <MenuItem Header="Build and Fast Patch" Command="{Binding PatchCommand}" CommandParameter="true" InputGestureText="Ctrl+P+F"/>
-                <MenuItem Header="Run Only" Command="{Binding RunCommand}" InputGestureText="Ctrl+F5"/>
-                <MenuItem Header="Full Restore" Command="{Binding RestoreCommand}" CommandParameter="True" InputGestureText="Ctrl+R"/>
-            </MenuItem>
-            <MenuItem Header="_Settings">
-                <MenuItem Header="Run _wizard" Command="{Binding WizardCommand}"  InputGestureText="Alt+W"/>
-                <MenuItem Header="Auto Update Mods" IsCheckable="True" ToolTip="When enabled Mod Manager will automatically update all mods on startup." IsChecked="{Binding AutoUpdateMods}" StaysOpenOnClick="True"/>
-                <MenuItem Header="Check for update" Command="{Binding CheckOpenkhUpdateCommand}"/>
-                <MenuItem Header="Check Mods for Updates" Command="{Binding CheckForModUpdatesCommand}"/>
-                <MenuItem Header="Dark Mode" IsCheckable="True" IsChecked="{Binding ColorTheme.DarkMode}" StaysOpenOnClick="True"/>
-                <MenuItem Header="Panacea Settings" Visibility="{Binding PanaceaSettings}">
-                    <MenuItem Header="Enable Console" IsCheckable="True" IsChecked="{Binding PanaceaConsoleEnabled}" StaysOpenOnClick="True"/>
-                    <MenuItem Header="Enable Debug Log" IsCheckable="True" IsChecked="{Binding PanaceaDebugLogEnabled}" IsEnabled="{Binding PanaceaConsoleEnabled}" StaysOpenOnClick="True"/>
-                    <MenuItem Header="Enable Sound Debug" IsCheckable="True" IsChecked="{Binding PanaceaSoundDebugEnabled}" IsEnabled="{Binding PanaceaDebugLogEnabled}" StaysOpenOnClick="True"/>
-                    <MenuItem Header="Enable Cache" IsCheckable="True" IsChecked="{Binding PanaceaCacheEnabled}" StaysOpenOnClick="True"/>
-                    <MenuItem Header="Enable Quick Menu" IsCheckable="True" IsChecked="{Binding PanaceaQuickMenuEnabled}" StaysOpenOnClick="True"/>
-                </MenuItem>
-            </MenuItem>
-            <MenuItem Header="_Info">
-                <MenuItem IsEnabled="False">
-                    <MenuItem.Icon>
-                        <Image Source="{StaticResource UIAbout_16x}"/>
-                    </MenuItem.Icon>
-                    <MenuItem.Header>
-                        <TextBlock Foreground="Black">
-                            <Run Text="Version: "/>
-                            <Run Text="{Binding CurrentVersion, Mode=OneTime}"/>
-                        </TextBlock>
-                    </MenuItem.Header>
-                </MenuItem>
-                <Separator/>
-                <MenuItem Header="Frequently Asked Questions" Command="{Binding OpenLinkCommand}"
-                    CommandParameter="https://openkh.dev/tool/GUI.ModsManager/FAQ">
-                    <MenuItem.Icon>
-                        <Image Source="{StaticResource WebURL_16x}"/>
-                    </MenuItem.Icon>
-                </MenuItem>
-                <Separator/>
-                <MenuItem Header="Download _latest version" Command="{Binding OpenLinkCommand}"
-                    CommandParameter="https://github.com/OpenKH/OpenKh/releases">
-                    <MenuItem.Icon>
-                        <Image Source="{StaticResource WebURL_16x}"/>
-                    </MenuItem.Icon>
-                </MenuItem>
-                <MenuItem Header="OpenKH source code" Command="{Binding OpenLinkCommand}"
-                    CommandParameter="https://github.com/OpenKH/OpenKh">
-                    <MenuItem.Icon>
-                        <Image Source="{StaticResource WebURL_16x}"/>
-                    </MenuItem.Icon>
-                </MenuItem>
-                <MenuItem Header="OpenKH documentation" Command="{Binding OpenLinkCommand}"
-                    CommandParameter="https://openkh.dev">
-                    <MenuItem.Icon>
-                        <Image Source="{StaticResource WebURL_16x}"/>
-                    </MenuItem.Icon>
-                </MenuItem>
-                <MenuItem Header="Report bug or missing features" Command="{Binding OpenLinkCommand}"
-                    CommandParameter="https://github.com/OpenKH/OpenKh/issues">
-                    <MenuItem.Icon>
-                        <Image Source="{StaticResource WebURL_16x}"/>
-                    </MenuItem.Icon>
-                </MenuItem>
-                <MenuItem Header="Join Discord server" Command="{Binding OpenLinkCommand}"
-                    CommandParameter="https://discord.openkh.dev">
-                    <MenuItem.Icon>
-                        <Image Source="{StaticResource WebURL_16x}"/>
-                    </MenuItem.Icon>
-                </MenuItem>
-                <MenuItem Header="Enable Patching" IsCheckable="True" IsChecked="{Binding EnablePatching}" StaysOpenOnClick="True"/>
-            </MenuItem>
-            <MenuItem Header="Presets" Command="{Binding OpenPresetMenuCommand}"/>
-            <MenuItem Header="PC Version" Focusable="False" IsHitTestVisible="False" Visibility="{Binding isPC}"/>
-            <MenuItem Header="Emulator" Focusable="False" IsHitTestVisible="False" Visibility="{Binding notPC}"/>
-            <MenuItem Header="_Creator">
-                <MenuItem Header="_YamlGenerator" Command="{Binding YamlGeneratorCommand}" />
-            </MenuItem>
-        </Menu>
-        <ComboBox SelectedIndex="{Binding GametoLaunch}" Visibility="{Binding GameSelectVisible}" IsHitTestVisible="{Binding GameSelectInteractable}" Focusable="{Binding GameSelectInteractable}" HorizontalAlignment="Right" Margin="0,0,10,0" MinWidth="144">
-            <ComboBoxItem Visibility="{Binding GameSelectKH2}">Kingdom Hearts 2</ComboBoxItem>
-            <ComboBoxItem Visibility="{Binding GameSelectKH1}">Kingdom Hearts 1</ComboBoxItem>
-            <ComboBoxItem Visibility="{Binding GameSelectBBS}">Birth by Sleep</ComboBoxItem>
-            <ComboBoxItem Visibility="{Binding GameSelectRecom}">Re:Chain of Memories</ComboBoxItem>
-            <ComboBoxItem Visibility="{Binding GameSelectKH3D}">Dream Drop Distance</ComboBoxItem>
-        </ComboBox>
-        <local:ModManagerView Grid.Row="1" DataContext="{Binding}"/>
-
-    </Grid>
-</Window>
diff --git a/OpenKh.Tools.ModsManager/Views/MainWindow.xaml.cs b/OpenKh.Tools.ModsManager/Views/MainWindow.xaml.cs
deleted file mode 100644
index 4e4ba1399..000000000
--- a/OpenKh.Tools.ModsManager/Views/MainWindow.xaml.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using OpenKh.Tools.ModsManager.ViewModels;
-using System;
-using System.Windows;
-
-namespace OpenKh.Tools.ModsManager.Views
-{
-    /// <summary>
-    /// Interaction logic for MainWindow.xaml
-    /// </summary>
-    public partial class MainWindow : Window
-    {
-        public MainWindow()
-        {
-            InitializeComponent();
-            DataContext = new MainViewModel();
-        }
-
-        protected override void OnClosed(EventArgs e)
-        {
-            (DataContext as MainViewModel)?.CloseAllWindows();
-            WinSettings.Default.Save();
-            base.OnClosed(e);
-        }
-
-        private void MenuItem_Click(object sender, RoutedEventArgs e)
-        {
-
-        }
-    }
-}
diff --git a/OpenKh.Tools.ModsManager/Views/ModDetailsView.xaml b/OpenKh.Tools.ModsManager/Views/ModDetailsView.xaml
deleted file mode 100644
index 194898bff..000000000
--- a/OpenKh.Tools.ModsManager/Views/ModDetailsView.xaml
+++ /dev/null
@@ -1,68 +0,0 @@
-<UserControl x:Class="OpenKh.Tools.ModsManager.Views.ModDetailsView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:local="clr-namespace:OpenKh.Tools.ModsManager.Views"
-             mc:Ignorable="d"
-             d:DesignHeight="450" d:DesignWidth="256">
-    <UserControl.Resources>
-        <SolidColorBrush x:Key="textHyperlink" Color="#569CD6"/>
-        <Style TargetType="Expander">
-            <Setter Property="Foreground" Value="{Binding ColorTheme.TextColor}"/>
-        </Style>
-    </UserControl.Resources>
-    <StackPanel>
-        <TextBlock Margin="0 0 0 3" FontWeight="Bold" Text="{Binding Title}" d:Text="Mod title"/>
-        <StackPanel Visibility="{Binding SourceVisibility}">
-            <TextBlock Margin="0 0 0 3">
-                <Hyperlink NavigateUri="{Binding AuthorUrl}" TextDecorations="{x:Null}" RequestNavigate="Hyperlink_RequestNavigate">
-                    <TextBlock Text="{Binding Author}" Foreground="{DynamicResource textHyperlink}" d:Text="Author name"/>
-                </Hyperlink>
-            </TextBlock>
-            <StackPanel Visibility="{Binding UpdateVisibility}">
-                <TextBlock Margin="0 0 0 3">
-                <Run>The mod is </Run>
-                <Run Text="{Binding UpdateCount}"/>
-                <Run> updates behind.</Run>
-                </TextBlock>
-                <Button Margin="0 0 0 3" Content="Download updates" Command="{Binding UpdateCommand}"/>
-            </StackPanel>
-        </StackPanel>
-        <Image MaxWidth="256" MaxHeight="144" Margin="0 3 0 3" Source="{Binding PreviewImage}" Visibility="{Binding PreviewImageVisibility}"/>
-        <TextBlock Margin="0 0 0 3" TextWrapping="Wrap" Text="{Binding Description}"/>
-        <StackPanel Visibility="{Binding SourceVisibility}">
-                <TextBlock Margin="0 0 0 3">
-                <Hyperlink NavigateUri="{Binding SourceUrl}" TextDecorations="{x:Null}" RequestNavigate="Hyperlink_RequestNavigate">
-                    <TextBlock Text="Mod source code" Foreground="{DynamicResource textHyperlink}"/>
-                </Hyperlink>
-            </TextBlock>
-            <TextBlock Margin="0 0 0 3">
-                <Hyperlink NavigateUri="{Binding ReportBugUrl}" TextDecorations="{x:Null}" RequestNavigate="Hyperlink_RequestNavigate">
-                    <TextBlock Text="Report bug" Foreground="{DynamicResource textHyperlink}"/>
-                </Hyperlink>
-            </TextBlock>
-        </StackPanel>
-        <StackPanel Visibility="{Binding LocalVisibility}">
-            <TextBlock Margin="0 0 0 3" TextWrapping="Wrap" FontStyle="Italic">
-                This mod is available only locally and it is not linked to any GitHub repository.
-            </TextBlock>
-        </StackPanel>
-        <Grid>
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition></ColumnDefinition>
-                <ColumnDefinition></ColumnDefinition>
-            </Grid.ColumnDefinitions>
-            <StackPanel Visibility="{Binding CollectionSettingsVisibility}">
-                <Button Margin="0 0 0 3"
-                        Command="{Binding CollectionSettingsCommand}"
-                        ToolTip="Control which optional mod files are patched for this collection.">
-                    <TextBlock Text="Collection Settings"></TextBlock>
-                </Button>
-            </StackPanel>
-        </Grid>
-        <Expander Header="Files to patch">
-            <TextBlock Text="{Binding FilesToPatch}" TextWrapping="Wrap" d:Text="msg/jp/sys.bar"/>
-        </Expander>
-    </StackPanel>
-</UserControl>
diff --git a/OpenKh.Tools.ModsManager/Views/ModDetailsView.xaml.cs b/OpenKh.Tools.ModsManager/Views/ModDetailsView.xaml.cs
deleted file mode 100644
index c2ae64ba8..000000000
--- a/OpenKh.Tools.ModsManager/Views/ModDetailsView.xaml.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System.Diagnostics;
-using System.Windows.Controls;
-using System.Windows.Navigation;
-
-namespace OpenKh.Tools.ModsManager.Views
-{
-    /// <summary>
-    /// Interaction logic for ModDetailsView.xaml
-    /// </summary>
-    public partial class ModDetailsView : UserControl
-    {
-        public ModDetailsView()
-        {
-            InitializeComponent();
-        }
-
-        private void Hyperlink_RequestNavigate(object sender, RequestNavigateEventArgs e)
-        {
-            using var proc = new Process();
-            proc.StartInfo.UseShellExecute = true;
-            proc.StartInfo.FileName = e.Uri.AbsoluteUri;
-            proc.Start();
-        }
-    }
-}
diff --git a/OpenKh.Tools.ModsManager/Views/ModManagerView.xaml b/OpenKh.Tools.ModsManager/Views/ModManagerView.xaml
deleted file mode 100644
index ca89886bb..000000000
--- a/OpenKh.Tools.ModsManager/Views/ModManagerView.xaml
+++ /dev/null
@@ -1,129 +0,0 @@
-<UserControl x:Class="OpenKh.Tools.ModsManager.Views.ModManagerView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:local="clr-namespace:OpenKh.Tools.ModsManager.Views"
-             mc:Ignorable="d"
-             d:DesignHeight="450" d:DesignWidth="600" Background="{Binding ColorTheme.BackgroundColor}">
-    <UserControl.Resources>
-        <ControlTemplate x:Key="modList" TargetType="ListBox">
-            <Border Name="Border" BorderThickness="1">
-                <Border.BorderBrush>
-                    <SolidColorBrush Color="#FFABADB3" />
-                </Border.BorderBrush>
-                <Grid>
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto"/>
-                        <RowDefinition Height="*"/>
-                        <RowDefinition Height="Auto"/>
-                    </Grid.RowDefinitions>
-                    <StackPanel Grid.Row="0" Margin="3" Background="{Binding ColorTheme.BackgroundColor}">
-                        <TextBlock HorizontalAlignment="Center" Text="Highest priority" Foreground="{Binding ColorTheme.TextColor}"/>
-                        <Separator Margin="3" Background="#FFABADB3"/>
-                    </StackPanel>
-                    <StackPanel Grid.Row="2" Margin="3" Background="{Binding ColorTheme.BackgroundColor}">
-                        <Separator Margin="3" Background="#FFABADB3"/>
-                        <TextBlock HorizontalAlignment="Center" Text="Lowest priority" Foreground="{Binding ColorTheme.TextColor}"/>
-                    </StackPanel>
-                    <ScrollViewer Grid.Row="1" Margin="0" Background="{Binding ColorTheme.BackgroundColor}">
-                        <StackPanel Margin="0" IsItemsHost="True"/>
-                    </ScrollViewer>
-                </Grid>
-            </Border>
-        </ControlTemplate>
-        <Style TargetType="TextBlock">
-            <Setter Property="Foreground" Value="{Binding ColorTheme.TextColor}"/>
-        </Style>
-    </UserControl.Resources>
-    <Grid Margin="10">
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="*"/>
-            <ColumnDefinition Width="24"/>
-            <ColumnDefinition Width="10"/>
-            <ColumnDefinition Width="282"/>
-        </Grid.ColumnDefinitions>
-
-        <ListBox
-            Template="{DynamicResource modList}"
-            Grid.Column="0"
-            VerticalAlignment="Stretch"
-            ItemsSource="{Binding ModsList}"
-            SelectedValue="{Binding SelectedValue}" KeyUp="ListBox_KeyUp"
-            HorizontalContentAlignment="Stretch">
-            <ListBox.ItemTemplate>
-                <DataTemplate>
-                    <Grid Height="64" Margin="3">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="Auto"/>
-                            <ColumnDefinition Width="*"/>
-                        </Grid.ColumnDefinitions>
-
-                        <CheckBox Grid.Column="0" VerticalAlignment="Center" VerticalContentAlignment="Center" IsChecked="{Binding Enabled}" Foreground="{Binding ColorTheme.TextColor}">
-                            <CheckBox.Content>
-                                <Grid Margin="3 1 10 0">
-                                    <Image Width="64" Height="64" Source="{Binding IconImage}"/>
-                                </Grid>
-                            </CheckBox.Content>
-                        </CheckBox>
-                        <StackPanel Grid.Column="1">
-                            <TextBlock Text="{Binding Name}" FontWeight="Bold" Foreground="{Binding ColorTheme.TextColor}"/>
-                            <TextBlock Text="{Binding Author}" Foreground="{Binding ColorTheme.TextColor}"/>
-                            <TextBlock Visibility="{Binding UpdateVisibility}" Text="Update available" Foreground="{Binding ColorTheme.TextColor}"/>
-                        </StackPanel>
-                    </Grid>
-                </DataTemplate>
-            </ListBox.ItemTemplate>
-        </ListBox>
-        <Grid Grid.Column="1">
-            <StackPanel VerticalAlignment="Center">
-                <Button Grid.Row="0" Margin="0 3 0 3" Command="{Binding MoveTop}" ToolTip="Moves Selected mod to the top.">
-                    <Image Source="{StaticResource ExpandChevronRightGroup_16x}" RenderTransformOrigin="0.5,0.5">
-                        <Image.RenderTransform>
-                            <TransformGroup>
-                                <ScaleTransform/>
-                                <SkewTransform/>
-                                <RotateTransform Angle="-90"/>
-                                <TranslateTransform/>
-                            </TransformGroup>
-                        </Image.RenderTransform>
-                    </Image>
-                </Button>
-                <Button Grid.Row="0" Margin="0 3 0 3" Command="{Binding MoveUp}" ToolTip="Moves selected mod up increasing its priority.">
-                    <Image Source="{StaticResource AddRowToAbove_16x}"/>
-                </Button>
-                <Button Grid.Row="4" Margin="0 3 0 3" Command="{Binding MoveDown}" ToolTip="Moves selected mod down decreasing its priority.">
-                    <Image Source="{StaticResource AddRowToBelow_16x}"/>
-                </Button>
-                <Button Grid.Row="2" Margin="0 3 0 3" Command="{Binding AddModCommand}" ToolTip="Install a new mod.">
-                    <Image Source="{StaticResource Add_16x}"/>
-                </Button>
-                <Button Grid.Row="2" Margin="0 3 0 3" Command="{Binding RemoveModCommand}" ToolTip="Delete selected mod.">
-                    <Image Source="{StaticResource Remove_color_16x}"/>
-                </Button>
-                <Button Grid.Row="2" Margin="0 3 0 3" Command="{Binding OpenModSearchCommand}" ToolTip="Search and download mods online.">
-                    <Image Source="{StaticResource Search_16x}"/>
-                </Button>
-            </StackPanel>
-        </Grid>
-        <Grid Grid.Column="3">
-            <StackPanel Visibility="{Binding IsModUnselectedMessageVisible}">
-                <TextBlock Margin="0 0 0 3" Text="The selected mod info will be displayed here." TextWrapping="Wrap"/>
-                <TextBlock Margin="0 0 0 3" TextWrapping="Wrap">
-                    To add a new mod click the '+' button or go to the Mods menu.
-                    A simple mod to add for testing can be 'OpenKH/mod-template'.
-                </TextBlock>
-                <TextBlock Margin="0 0 0 3" TextWrapping="Wrap">
-                    Once you have selected the mods you want to, go to the menu 'Run'
-                    and then select 'Build and Run'! The 'Build' is only required when the
-                    content of a mod or the selected mod changes. If you are unsure, you
-                    can just always use 'Build and Run'.
-                </TextBlock>
-            </StackPanel>
-            <ScrollViewer Visibility="{Binding IsModInfoVisible}">
-                <local:ModDetailsView Grid.Column="3" DataContext="{Binding SelectedValue}"/>
-            </ScrollViewer>
-        </Grid>
-
-    </Grid>
-</UserControl>
diff --git a/OpenKh.Tools.ModsManager/Views/ModManagerView.xaml.cs b/OpenKh.Tools.ModsManager/Views/ModManagerView.xaml.cs
deleted file mode 100644
index 5479153f0..000000000
--- a/OpenKh.Tools.ModsManager/Views/ModManagerView.xaml.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using OpenKh.Tools.ModsManager.ViewModels;
-using System.Windows.Controls;
-
-namespace OpenKh.Tools.ModsManager.Views
-{
-    /// <summary>
-    /// Interaction logic for ModManagerView.xaml
-    /// </summary>
-    public partial class ModManagerView : UserControl
-    {
-        public ModManagerView()
-        {
-            InitializeComponent();
-        }
-
-        private void ListBox_KeyUp(object sender, System.Windows.Input.KeyEventArgs e)
-        {
-            if (e.Key == System.Windows.Input.Key.Delete)
-                (DataContext as MainViewModel).RemoveModCommand.Execute(null);
-            if (e.Key == System.Windows.Input.Key.Space)
-                (DataContext as MainViewModel).SelectedValue.Enabled = !(DataContext as MainViewModel).SelectedValue.Enabled;
-        }
-    }
-}
diff --git a/OpenKh.Tools.ModsManager/Views/ModSearchVM.cs b/OpenKh.Tools.ModsManager/Views/ModSearchVM.cs
deleted file mode 100644
index 2a2d66604..000000000
--- a/OpenKh.Tools.ModsManager/Views/ModSearchVM.cs
+++ /dev/null
@@ -1,163 +0,0 @@
-using OpenKh.Tools.ModsManager.Services;
-using OpenKh.Tools.ModsManager.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Data;
-using System.Windows.Input;
-
-namespace OpenKh.Tools.ModsManager.Views
-{
-    public class ModSearchVM : INotifyPropertyChanged
-    {
-        public event PropertyChangedEventHandler PropertyChanged;
-
-        public ColorThemeService ColorTheme => ColorThemeService.Instance;
-
-        public CollectionViewSource DownloadableMods { get; } = new CollectionViewSource();
-
-        /// <summary>
-        /// Command for clearing the search box
-        /// </summary>
-        public ICommand ClearSearchCommand { get; set; }
-
-        public ICommand CancelCommand { get; set; }
-
-        public ICommand ClearLog { get; set; }
-
-        public ICommand ShowLog { get; set; }
-
-        public ICommand CopyLog { get; set; }
-
-        #region IsLoading
-        private bool _isLoading;
-
-        public bool IsLoading
-        {
-            get => _isLoading;
-            set
-            {
-                _isLoading = value;
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsLoading)));
-            }
-        }
-        #endregion
-
-        #region LoadingStatusText
-        private string _loadingStatusText = "Initializing...";
-
-        public string LoadingStatusText
-        {
-            get => _loadingStatusText;
-            set
-            {
-                _loadingStatusText = value;
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(LoadingStatusText)));
-            }
-        }
-        #endregion
-
-        #region SearchQuery
-        private string _searchQuery = "";
-
-        public string SearchQuery
-        {
-            get => _searchQuery;
-            set
-            {
-                _searchQuery = value;
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(SearchQuery)));
-            }
-        }
-        #endregion
-
-        #region HasSearchQuery
-        private bool _hasSearchQuery;
-
-        public bool HasSearchQuery
-        {
-            get => _hasSearchQuery;
-            set
-            {
-                _hasSearchQuery = value;
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(HasSearchQuery)));
-            }
-        }
-        #endregion
-
-        #region HasNoMods
-        private bool _hasNoMods;
-
-        public bool HasNoMods
-        {
-            get => _hasNoMods;
-            set
-            {
-                _hasNoMods = value;
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(HasNoMods)));
-            }
-        }
-        #endregion
-
-        #region HasSelectedMod
-        private bool _hasSelectedMod;
-
-        public bool HasSelectedMod
-        {
-            get => _hasSelectedMod;
-            set
-            {
-                _hasSelectedMod = value;
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(HasSelectedMod)));
-            }
-        }
-        #endregion
-
-        #region SelectedMod
-        private DownloadableModViewModel _selectedMod;
-
-        public DownloadableModViewModel SelectedMod
-        {
-            get => _selectedMod;
-            set
-            {
-                _selectedMod = value;
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(SelectedMod)));
-            }
-        }
-        #endregion
-
-        #region HasLog
-        private bool _hasLog;
-
-        public bool HasLog
-        {
-            get => _hasLog;
-            set
-            {
-                _hasLog = value;
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(HasLog)));
-            }
-        }
-        #endregion
-
-        #region NumMessages
-        private int _numMessages;
-
-        public int NumMessages
-        {
-            get => _numMessages;
-            set
-            {
-                _numMessages = value;
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(NumMessages)));
-            }
-        }
-        #endregion
-
-    }
-}
diff --git a/OpenKh.Tools.ModsManager/Views/ModSearchWindow.xaml b/OpenKh.Tools.ModsManager/Views/ModSearchWindow.xaml
deleted file mode 100644
index 623c720d1..000000000
--- a/OpenKh.Tools.ModsManager/Views/ModSearchWindow.xaml
+++ /dev/null
@@ -1,214 +0,0 @@
-<Window x:Class="OpenKh.Tools.ModsManager.Views.ModSearchWindow"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:OpenKh.Tools.ModsManager.Views"
-        mc:Ignorable="d"
-        d:DataContext="{d:DesignInstance Type=local:ModSearchVM}"
-        Title="Online Mods" Height="500" Width="800"
-        WindowStartupLocation="CenterOwner" Background="{Binding ColorTheme.BackgroundColor}">
-    <Grid Margin="10">
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="*"/>
-        </Grid.RowDefinitions>
-
-        <!-- Header with title and search -->
-        <Grid Grid.Row="0" Margin="0 0 0 10">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto"/>
-                <RowDefinition Height="Auto"/>
-            </Grid.RowDefinitions>
-
-            <TextBlock Grid.Row="0" Text="Available Online Mods" FontSize="18" FontWeight="Bold" 
-                       Foreground="{Binding ColorTheme.TextColor}" VerticalAlignment="Center"/>
-
-            <!-- Search box -->
-            <Grid Grid.Row="1" Margin="0,10,0,0">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto"/>
-                    <ColumnDefinition Width="*"/>
-                    <ColumnDefinition Width="Auto"/>
-                </Grid.ColumnDefinitions>
-
-                <Image Grid.Column="0" Source="{StaticResource Search_16x}" Width="16" Height="16" Margin="5,0,5,0" VerticalAlignment="Center"/>
-
-                <TextBox Grid.Column="1" x:Name="SearchBox" Padding="5,3" Margin="0,0,0,0"
-                         Text="{Binding SearchQuery, UpdateSourceTrigger=PropertyChanged}"
-                         VerticalContentAlignment="Center"
-                         BorderBrush="#AAAAAA"
-                         Background="#22FFFFFF"
-                         Foreground="{Binding ColorTheme.TextColor}">
-                    <TextBox.Style>
-                        <Style TargetType="TextBox">
-                            <Setter Property="Template">
-                                <Setter.Value>
-                                    <ControlTemplate TargetType="TextBox">
-                                        <Grid>
-                                            <TextBlock Text="Search by name or description..." 
-                                                   Foreground="Gray" Margin="5,3,0,0"
-                                                   Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Text.IsEmpty, Converter={StaticResource BooleanToVisibilityConverter}}"/>
-                                            <Border Background="{TemplateBinding Background}"
-                                                BorderThickness="{TemplateBinding BorderThickness}"
-                                                BorderBrush="{TemplateBinding BorderBrush}">
-                                                <ScrollViewer x:Name="PART_ContentHost"/>
-                                            </Border>
-                                        </Grid>
-                                    </ControlTemplate>
-                                </Setter.Value>
-                            </Setter>
-                        </Style>
-                    </TextBox.Style>
-                </TextBox>
-
-                <Button Grid.Column="2" Content="Clear" Width="60" Margin="5,0,0,0" 
-                        Command="{Binding ClearSearchCommand}" 
-                        Visibility="{Binding HasSearchQuery, Converter={StaticResource BooleanToVisibilityConverter}}"/>
-            </Grid>
-        </Grid>
-
-        <!-- Main content with mods list and details -->
-        <Grid Grid.Row="1">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*"/>
-                <ColumnDefinition Width="10"/>
-                <ColumnDefinition Width="300"/>
-            </Grid.ColumnDefinitions>
-
-            <!-- Mods list with top info bars including loading indicator -->
-            <Grid Grid.Column="0">
-                <DockPanel LastChildFill="True">
-                    <!-- Loading indicator with more detailed information -->
-                    <Grid Background="#DD000000" Visibility="{Binding IsLoading, Converter={StaticResource BooleanToVisibilityConverter}}" DockPanel.Dock="Top">
-                        <Border BorderBrush="#888888" BorderThickness="2">
-                            <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center" Margin="2">
-                                <TextBlock Text="Loading mods..." FontSize="18" Foreground="White" HorizontalAlignment="Center" FontWeight="Bold"/>
-                                <TextBlock Text="{Binding LoadingStatusText}" FontSize="14" Foreground="White" HorizontalAlignment="Center" Margin="0,2,0,2" TextWrapping="Wrap" TextAlignment="Center"/>
-                                <ProgressBar IsIndeterminate="True" Height="10" Width="250" Margin="0,2,0,2"/>
-                                <Button HorizontalAlignment="Center" Margin="0,5,0,0" Command="{Binding CancelCommand}">Cancel</Button>
-                            </StackPanel>
-                        </Border>
-                    </Grid>
-
-                    <!-- Local log messages -->
-                    <Grid Background="#DD000000" Visibility="{Binding HasLog, Converter={StaticResource BooleanToVisibilityConverter}}" DockPanel.Dock="Top">
-                        <Border BorderBrush="#888888" BorderThickness="2">
-                            <DockPanel LastChildFill="True" Margin="3">
-                                <Button Command="{Binding ClearLog}" DockPanel.Dock="Right" Margin="3,0">Clear</Button>
-                                <Button Command="{Binding ShowLog}" DockPanel.Dock="Right" Margin="3,0">Show last 100</Button>
-                                <Button Command="{Binding CopyLog}" DockPanel.Dock="Right" Margin="3,0">Copy to clipboard</Button>
-                                <TextBlock Foreground="White">Has <Run Text="{Binding NumMessages,FallbackValue=0}" /> messages</TextBlock>
-                            </DockPanel>
-                        </Border>
-                    </Grid>
-
-                    <!-- Coexist empty list message and mod list by placing this Grid -->
-                    <Grid>
-                        <ScrollViewer VerticalScrollBarVisibility="Auto">
-                            <ItemsControl ItemsSource="{Binding DownloadableMods.View}">
-                                <ItemsControl.ItemTemplate>
-                                    <DataTemplate>
-                                        <Border Margin="0,5" Padding="10" Background="#22FFFFFF" BorderBrush="#33FFFFFF" BorderThickness="1" 
-                                                CornerRadius="5" Cursor="Hand" MouseLeftButtonDown="Mod_MouseLeftButtonDown">
-                                            <Grid>
-                                                <Grid.ColumnDefinitions>
-                                                    <ColumnDefinition Width="64"/>
-                                                    <ColumnDefinition Width="*"/>
-                                                    <ColumnDefinition Width="Auto"/>
-                                                </Grid.ColumnDefinitions>
-
-                                                <!-- Mod icon -->
-                                                <Image Grid.Column="0" Width="64" Height="64" Source="{Binding IconImage}" 
-                                                       RenderOptions.BitmapScalingMode="HighQuality" Margin="0,0,10,0"/>
-
-                                                <!-- Mod info -->
-                                                <StackPanel Grid.Column="1" VerticalAlignment="Center">
-                                                    <TextBlock Text="{Binding Title}" FontWeight="Bold" FontSize="14" 
-                                                               TextWrapping="NoWrap" TextTrimming="CharacterEllipsis"
-                                                               Foreground="{Binding DataContext.ColorTheme.TextColor, RelativeSource={RelativeSource AncestorType=Window}}"/>
-                                                    <TextBlock Text="{Binding Author}" FontSize="12" Opacity="0.7" 
-                                                               TextWrapping="NoWrap" TextTrimming="CharacterEllipsis"
-                                                               Foreground="{Binding DataContext.ColorTheme.TextColor, RelativeSource={RelativeSource AncestorType=Window}}"/>
-                                                    <TextBlock Text="{Binding Description}" FontSize="12" TextWrapping="Wrap" MaxHeight="40" 
-                                                               TextTrimming="CharacterEllipsis" Margin="0,5,0,0"
-                                                               Foreground="{Binding DataContext.ColorTheme.TextColor, RelativeSource={RelativeSource AncestorType=Window}}"/>
-                                                </StackPanel>
-
-                                                <!-- Install button -->
-                                                <Button Grid.Column="2" Content="Install" Command="{Binding InstallCommand}" 
-                                                        Padding="8,3" Margin="10,0,0,0" VerticalAlignment="Center" Width="70" Height="28"
-                                                        IsEnabled="{Binding IsInstalling, Converter={StaticResource InverseBooleanConverter}}">
-                                                    <Button.Style>
-                                                        <Style TargetType="Button" BasedOn="{StaticResource {x:Type Button}}">
-                                                            <Style.Triggers>
-                                                                <DataTrigger Binding="{Binding IsInstalling}" Value="True">
-                                                                    <Setter Property="Content" Value="Installing..."/>
-                                                                </DataTrigger>
-                                                            </Style.Triggers>
-                                                        </Style>
-                                                    </Button.Style>
-                                                </Button>
-                                            </Grid>
-                                        </Border>
-                                    </DataTemplate>
-                                </ItemsControl.ItemTemplate>
-                            </ItemsControl>
-                        </ScrollViewer>
-                        <!-- Empty list message -->
-                        <TextBlock Text="No mods available for this game" 
-                                   Visibility="{Binding HasNoMods, Converter={StaticResource BooleanToVisibilityConverter}}"
-                                   HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="16"
-                                   Foreground="{Binding ColorTheme.TextColor}"/>
-                    </Grid>
-                </DockPanel>
-            </Grid>
-
-            <!-- Mod details panel -->
-            <Border Grid.Column="2" Background="#22FFFFFF" BorderBrush="#33FFFFFF" BorderThickness="1" CornerRadius="5" Padding="10">
-                <ScrollViewer VerticalScrollBarVisibility="Auto">
-                    <StackPanel>
-                        <!-- Selected mod details -->
-                        <Grid Visibility="{Binding HasSelectedMod, Converter={StaticResource BooleanToVisibilityConverter}}">
-                            <StackPanel>
-                                <!-- Preview image -->
-                                <Border Height="150" Margin="0,0,0,10" Background="#11FFFFFF" BorderBrush="#22FFFFFF" BorderThickness="1">
-                                    <Image Source="{Binding SelectedMod.ScreenshotImage}" Stretch="Uniform" 
-                                           RenderOptions.BitmapScalingMode="HighQuality"/>
-                                </Border>
-
-                                <!-- Details -->
-                                <TextBlock Text="{Binding SelectedMod.Title}" FontWeight="Bold" FontSize="18" 
-                                           TextWrapping="Wrap" Margin="0,0,0,5"
-                                           Foreground="{Binding ColorTheme.TextColor}"/>
-
-                                <TextBlock Text="{Binding SelectedMod.Author, StringFormat=Author: {0}}" FontSize="14" 
-                                           Margin="0,0,0,10" Foreground="{Binding ColorTheme.TextColor}"/>
-
-                                <TextBlock Text="Description:" FontWeight="Bold" Foreground="{Binding ColorTheme.TextColor}"/>
-                                <TextBlock Text="{Binding SelectedMod.Description}" TextWrapping="Wrap" Margin="0,5,0,10"
-                                           Foreground="{Binding ColorTheme.TextColor}"/>
-
-                                <!-- Repository link -->
-                                <TextBlock Text="Repository:" FontWeight="Bold" Foreground="{Binding ColorTheme.TextColor}"/>
-                                <TextBlock Margin="0,5,0,0" Foreground="{Binding ColorTheme.TextColor}">
-                                    <Hyperlink NavigateUri="{Binding SelectedMod.RepoUrl}" RequestNavigate="Hyperlink_RequestNavigate">
-                                        <TextBlock Text="{Binding SelectedMod.Repo}" TextWrapping="Wrap"/>
-                                    </Hyperlink>
-                                </TextBlock>
-
-                                <!-- Installation button has been removed from details panel -->
-                            </StackPanel>
-                        </Grid>
-
-                        <!-- No selection message -->
-                        <TextBlock Text="Select a mod to view details" 
-                                   Visibility="{Binding HasSelectedMod, Converter={StaticResource InverseBooleanToVisibilityConverter}}"
-                                   HorizontalAlignment="Center" VerticalAlignment="Center" TextWrapping="Wrap" TextAlignment="Center"
-                                   Foreground="{Binding ColorTheme.TextColor}"/>
-                    </StackPanel>
-                </ScrollViewer>
-            </Border>
-        </Grid>
-    </Grid>
-</Window>
diff --git a/OpenKh.Tools.ModsManager/Views/ModSearchWindow.xaml.cs b/OpenKh.Tools.ModsManager/Views/ModSearchWindow.xaml.cs
deleted file mode 100644
index 02379f5b4..000000000
--- a/OpenKh.Tools.ModsManager/Views/ModSearchWindow.xaml.cs
+++ /dev/null
@@ -1,443 +0,0 @@
-using OpenKh.Tools.ModsManager.ExtensionMethods;
-using OpenKh.Tools.ModsManager.Models;
-using OpenKh.Tools.ModsManager.Services;
-using OpenKh.Tools.ModsManager.ViewModels;
-using System;
-using System.Collections.ObjectModel;
-using System.Collections.Specialized;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Linq;
-using System.Reactive.Concurrency;
-using System.Reactive.Disposables;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Input;
-using System.Windows.Navigation;
-using System.Windows.Threading;
-using Xe.Tools.Wpf.Commands;
-using static OpenKh.Tools.ModsManager.Services.DownloadableModsService;
-
-namespace OpenKh.Tools.ModsManager.Views
-{
-    public partial class ModSearchWindow : Window
-    {
-        private readonly string _currentGameId;
-        private readonly ObservableCollection<DownloadableModViewModel> _allMods = new ObservableCollection<DownloadableModViewModel>();
-        private readonly Action _reloadModsList;
-        private readonly CompositeDisposable _disposables = new CompositeDisposable();
-        private readonly DownloadableModsService _downloadableModsService = DownloadableModsService.Default;
-        private readonly Subject<DownloadableModViewModel> _onModInstalled = new Subject<DownloadableModViewModel>();
-        private readonly ObservableCollection<string> _messages = new ObservableCollection<string>();
-        private readonly Subject<string> _emitMessage = new Subject<string>();
-        private readonly Subject<DownloadableModModel> _modEmitter = new Subject<DownloadableModModel>();
-        private System.Windows.Data.FilterEventHandler _lastFilter = null;
-
-        /// <summary>
-        /// Cancelation token for loading operation
-        /// </summary>
-        private CancellationTokenSource _cts = new CancellationTokenSource();
-
-        /// <summary>
-        /// CancellationToken of _cts. Safe for disposal of _cts.
-        /// </summary>
-        private CancellationToken _ct = CancellationToken.None;
-
-        public ModSearchVM VM { get; }
-
-        public ModSearchWindow(Action reloadModsList = null)
-        {
-            InitializeComponent();
-            DataContext = VM = new ModSearchVM();
-            _reloadModsList = reloadModsList;
-
-            IObservable<PropertyChangedEventArgs> OnVmPropertyChanged(string propertyName)
-                => Observable.FromEvent<PropertyChangedEventHandler, PropertyChangedEventArgs>(
-                    h => (s, e) => h(e),
-                    h => VM.PropertyChanged += h,
-                    h => VM.PropertyChanged -= h
-                )
-                    .Where(it => it.PropertyName == null || it.PropertyName == propertyName)
-                    ;
-
-            OnVmPropertyChanged(nameof(VM.SearchQuery))
-                .Subscribe(
-                    e =>
-                    {
-                        VM.HasSearchQuery = !string.IsNullOrEmpty(VM.SearchQuery);
-                        ApplyNewFilter();
-                    }
-                )
-                .AddTo(_disposables);
-
-            OnVmPropertyChanged(nameof(VM.SelectedMod))
-                .Subscribe(
-                    e =>
-                    {
-                        VM.HasSelectedMod = VM.SelectedMod != null;
-                    }
-                )
-                .AddTo(_disposables);
-
-            VM.DownloadableMods.Source = _allMods;
-
-            Observable.CombineLatest(
-                Observable.FromEvent<NotifyCollectionChangedEventHandler, NotifyCollectionChangedEventArgs>(
-                    h => (s, e) => h(e),
-                    h => VM.DownloadableMods.View.CollectionChanged += h,
-                    h => VM.DownloadableMods.View.CollectionChanged -= h
-                ),
-                OnVmPropertyChanged(nameof(VM.IsLoading)),
-                (a, b) => !VM.IsLoading && VM.DownloadableMods.View.IsEmpty
-            )
-                .Subscribe(it => VM.HasNoMods = it)
-                .AddTo(_disposables);
-
-            // Subscribe to status update events
-            Observable.FromEvent<StatusUpdateHandler, string>(
-                h => arg => h(arg),
-                h => _downloadableModsService.OnStatusUpdate += h,
-                h => _downloadableModsService.OnStatusUpdate -= h
-            )
-                .ObserveOn(DispatcherSynchronizationContext.Current)
-                .Subscribe(
-                    status =>
-                    {
-                        // Event handler to update the loading status
-                        VM.LoadingStatusText = status;
-
-                        _emitMessage.OnNext(status);
-                    }
-                )
-                .AddTo(_disposables);
-
-            // Subscribe to diag log events
-            Observable.FromEvent<DiagLogHandler, string>(
-                h => arg => h(arg),
-                h => _downloadableModsService.OnDiagLog += h,
-                h => _downloadableModsService.OnDiagLog -= h
-            )
-                .ObserveOn(DispatcherSynchronizationContext.Current)
-                .Subscribe(
-                    status =>
-                    {
-                        _emitMessage.OnNext(status);
-                    }
-                )
-                .AddTo(_disposables);
-
-            _onModInstalled
-                .ObserveOn(DispatcherSynchronizationContext.Current)
-                .Subscribe(
-                    mod =>
-                    {
-                        try
-                        {
-                            // Clear selected mod if it was the one installed
-                            if (VM.SelectedMod == mod)
-                                VM.SelectedMod = null;
-
-                            // Remove the mod from the list
-                            _allMods.Remove(mod);
-
-                            VM.DownloadableMods.View.Refresh();
-
-                            // Select another mod if available
-                            if (VM.SelectedMod == null && VM.DownloadableMods.View.MoveCurrentToFirst())
-                                VM.SelectedMod = (DownloadableModViewModel)VM.DownloadableMods.View.CurrentItem;
-
-                            // Update the main window's mod list if main view model is available
-                            // Refresh the mods list in the main window
-                            _reloadModsList?.Invoke();
-                        }
-                        catch (Exception ex)
-                        {
-                            MessageBox.Show($"Error updating mod lists: {ex.Message}", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
-                        }
-                    }
-                )
-                .AddTo(_disposables);
-
-            Observable.FromEvent<NotifyCollectionChangedEventHandler, NotifyCollectionChangedEventArgs>(
-                h => (s, e) => h(e),
-                h => _messages.CollectionChanged += h,
-                h => _messages.CollectionChanged -= h
-            )
-                .ObserveOn(Scheduler.Immediate)
-                .Subscribe(
-                    e =>
-                    {
-                        VM.HasLog = _messages.Any();
-                        VM.NumMessages = _messages.Count;
-                    }
-                )
-                .AddTo(_disposables);
-
-            _emitMessage
-                .ObserveOn(DispatcherSynchronizationContext.Current)
-                .Subscribe(msg => _messages.Add(msg))
-                .AddTo(_disposables);
-
-            // Use the current game ID from configuration
-            _currentGameId = ConfigurationService.LaunchGame;
-
-            _modEmitter
-                .ObserveOn(DispatcherSynchronizationContext.Current)
-                .Subscribe(
-                    mod =>
-                    {
-                        var modVm = new DownloadableModViewModel(mod);
-                        modVm.ModInstalled += OnModInstalled;
-                        AddOrUpdateMod(modVm);
-                    }
-                )
-                .AddTo(_disposables);
-
-            // Initialize commands
-            VM.ClearSearchCommand = new RelayCommand(_ => ClearSearch());
-
-            VM.CancelCommand = new RelayCommand(_ => _cts.Cancel());
-
-            VM.ClearLog = new RelayCommand(_ => _messages.Clear());
-
-            VM.ShowLog = new RelayCommand(_ => MessageBox.Show(string.Join("\n", _messages.TakeLast(100))));
-
-            VM.CopyLog = new RelayCommand(
-                _ =>
-                {
-                    try
-                    {
-                        Clipboard.SetText(string.Join("\n", _messages));
-                    }
-                    catch (Exception ex)
-                    {
-                        MessageBox.Show($"Error copying log to clipboard: {ex.Message}", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
-                    }
-                }
-            );
-
-            Loaded += ModSearchWindow_Loaded;
-
-            // Clean up resources on close
-            Closed += (s, e) =>
-            {
-                _cts.Cancel();
-                _cts.Dispose();
-                _modEmitter.OnCompleted();
-                _onModInstalled.OnCompleted();
-                _emitMessage.OnCompleted();
-                _disposables.Dispose();
-            };
-        }
-
-        private async void ModSearchWindow_Loaded(object sender, RoutedEventArgs e)
-        {
-            // Load mods for the game
-            await LoadModsForSelectedGame();
-        }
-
-        // Removed game selector event handler as we now use the game selected in the main window
-
-        private async Task LoadModsForSelectedGame()
-        {
-            if (string.IsNullOrEmpty(_currentGameId))
-                return;
-
-            // Cancel any previous operation in progress
-            _cts.Cancel();
-            _cts.Dispose();
-            _cts = new CancellationTokenSource();
-            _ct = _cts.Token;
-
-            try
-            {
-                VM.IsLoading = true;
-                VM.LoadingStatusText = $"Loading mods for {GetGameName(_currentGameId)}...";
-
-                _allMods.Clear();
-
-                try
-                {
-                    foreach (var one in await _downloadableModsService.GetDownloadableModsLocallyAsync(_currentGameId))
-                    {
-                        _modEmitter.OnNext(one);
-                    }
-
-                    // Use the new method with cancellation support
-                    await _downloadableModsService.GetDownloadableModsForGameAsync(
-                        gameId: _currentGameId,
-                        emitAsync: async mod => _modEmitter.OnNext(mod),
-                        fallbackToLocalCache: false,
-                        cancellationToken: _ct
-                    );
-                }
-                catch (OperationCanceledException)
-                {
-                    // Operation cancelled, return empty list
-                    return;
-                }
-                catch (Exception ex)
-                {
-                    // Capture other exceptions and display them
-                    VM.LoadingStatusText = $"Error: {ex.Message}";
-                    _emitMessage.OnNext($"Full exception data: {ex}");
-                    return;
-                }
-
-                var filtered = VM.DownloadableMods.View
-                    .Cast<DownloadableModViewModel>();
-
-                // Select first item
-                VM.SelectedMod = filtered
-                    .FirstOrDefault();
-
-                // Show the number of mods found
-                if (filtered.Any())
-                {
-                    VM.LoadingStatusText = $"Found {filtered.Count()} available mods for {GetGameName(_currentGameId)}";
-                }
-                else
-                {
-                    VM.LoadingStatusText = $"No available mods found for {GetGameName(_currentGameId)}";
-                }
-            }
-            catch (Exception ex)
-            {
-                MessageBox.Show($"Error loading mods: {ex.Message}", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
-            }
-            finally
-            {
-                VM.IsLoading = false;
-            }
-        }
-
-        private void AddOrUpdateMod(DownloadableModViewModel modVm)
-        {
-            for (int y = 0, cy = _allMods.Count; y < cy; y++)
-            {
-                if (_allMods[y].Repo == modVm.Repo)
-                {
-                    // Update existing mod
-                    _allMods[y] = modVm;
-                    return;
-                }
-            }
-
-            // Add new mod
-            _allMods.Add(modVm);
-        }
-
-        /// <summary>
-        /// Filters the mods list based on the current search query
-        /// </summary>
-        private void ApplyNewFilter()
-        {
-            // Remember selected mod
-            var selectedMod = VM.SelectedMod;
-
-            if (_lastFilter != null)
-            {
-                VM.DownloadableMods.Filter -= _lastFilter;
-                _lastFilter = null;
-            }
-
-            // If we have a search query, filter by title and description
-            if (!string.IsNullOrWhiteSpace(VM.SearchQuery))
-            {
-                var searchTerms = VM.SearchQuery.ToLower().Split(' ', StringSplitOptions.RemoveEmptyEntries);
-
-                _lastFilter = (s, e) =>
-                {
-                    if (e.Item is DownloadableModViewModel mod)
-                    {
-                        // Check if any search term is found in title, description, or author
-                        e.Accepted = searchTerms.All(term =>
-                            (mod.Title?.ToLower().Contains(term) == true) ||
-                            (mod.Description?.ToLower().Contains(term) == true) ||
-                            (mod.Author?.ToLower().Contains(term) == true));
-                    }
-                    else
-                    {
-                        e.Accepted = false;
-                    }
-                };
-                VM.DownloadableMods.Filter += _lastFilter;
-            }
-
-            var filtered = VM.DownloadableMods.View.Cast<DownloadableModViewModel>();
-
-            // Try to restore selection or select first item
-            if (true
-                && selectedMod != null
-                && filtered
-                    .FirstOrDefault(vm => vm.Repo == selectedMod.Repo) is var found
-                && found != null
-            )
-            {
-                VM.SelectedMod = found;
-            }
-            else if (filtered.Any())
-            {
-                VM.SelectedMod = filtered.First();
-            }
-            else
-            {
-                VM.SelectedMod = null;
-            }
-        }
-
-        /// <summary>
-        /// Clears the search box and shows all mods
-        /// </summary>
-        private void ClearSearch()
-        {
-            VM.SearchQuery = string.Empty;
-        }
-
-        private void Mod_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
-        {
-            if (sender is FrameworkElement element && element.DataContext is DownloadableModViewModel mod)
-            {
-                VM.SelectedMod = mod;
-            }
-        }
-
-        private void Hyperlink_RequestNavigate(object sender, RequestNavigateEventArgs e)
-        {
-            Process.Start(new ProcessStartInfo(e.Uri.AbsoluteUri) { UseShellExecute = true });
-            e.Handled = true;
-        }
-
-        // Helper method to get readable game name
-        private string GetGameName(string gameId)
-        {
-            switch (gameId?.ToLower())
-            {
-                case "kh1":
-                    return "Kingdom Hearts 1";
-                case "kh2":
-                    return "Kingdom Hearts 2";
-                case "bbs":
-                    return "Birth By Sleep";
-                case "recom":
-                    return "Re:Chain of Memories";
-                case "kh3d":
-                    return "Dream Drop Distance";
-                default:
-                    return gameId ?? "Unknown Game";
-            }
-        }
-
-        /// <summary>
-        /// Called when a mod has been successfully installed
-        /// </summary>
-        /// <param name="mod">The mod that was installed</param>
-        private void OnModInstalled(DownloadableModViewModel mod)
-        {
-            _onModInstalled.OnNext(mod);
-        }
-    }
-}
diff --git a/OpenKh.Tools.ModsManager/Views/NotepadVM.cs b/OpenKh.Tools.ModsManager/Views/NotepadVM.cs
deleted file mode 100644
index 264dcbae4..000000000
--- a/OpenKh.Tools.ModsManager/Views/NotepadVM.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using OpenKh.Tools.ModsManager.Services;
-using System.Windows.Input;
-using Xe.Tools;
-
-namespace OpenKh.Tools.ModsManager.Views
-{
-    public class NotepadVM : BaseNotifyPropertyChanged
-    {
-        public ColorThemeService ColorTheme => ColorThemeService.Instance;
-
-        #region CopyAllCommand
-        private ICommand _copyAllCommand = null;
-        public ICommand CopyAllCommand
-        {
-            get => _copyAllCommand;
-            set
-            {
-                _copyAllCommand = value;
-                OnPropertyChanged(nameof(CopyAllCommand));
-            }
-        }
-        #endregion
-
-        #region SaveAsCommand
-        private ICommand _saveAsCommand = null;
-        public ICommand SaveAsCommand
-        {
-            get => _saveAsCommand;
-            set
-            {
-                _saveAsCommand = value;
-                OnPropertyChanged(nameof(SaveAsCommand));
-            }
-        }
-        #endregion
-
-        #region Text
-        private string _text = "";
-        public string Text
-        {
-            get => _text;
-            set
-            {
-                _text = value;
-                OnPropertyChanged(nameof(Text));
-            }
-        }
-        #endregion
-    }
-}
diff --git a/OpenKh.Tools.ModsManager/Views/NotepadWindow.xaml b/OpenKh.Tools.ModsManager/Views/NotepadWindow.xaml
deleted file mode 100644
index cc3b31bf0..000000000
--- a/OpenKh.Tools.ModsManager/Views/NotepadWindow.xaml
+++ /dev/null
@@ -1,31 +0,0 @@
-<Window x:Class="OpenKh.Tools.ModsManager.Views.NotepadWindow"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:OpenKh.Tools.ModsManager.Views"
-        mc:Ignorable="d"
-        d:DataContext="{d:DesignInstance local:NotepadVM}"
-        WindowStartupLocation="CenterOwner"
-        Title="NotepadWindow" Height="450" Width="800">
-    <DockPanel LastChildFill="True">
-        <ToolBarTray DockPanel.Dock="Top">
-            <ToolBar>
-                <Button Command="{Binding CopyAllCommand}">
-                    <AccessText>_Copy all</AccessText>
-                </Button>
-                <Separator />
-                <Button Command="{Binding SaveAsCommand}">
-                    <AccessText>Save _as</AccessText>
-                </Button>
-            </ToolBar>
-        </ToolBarTray>
-        <TextBox Text="{Binding Text}" AcceptsReturn="True" AcceptsTab="True"
-                 HorizontalScrollBarVisibility="Visible"
-                 VerticalScrollBarVisibility="Visible"
-                 Foreground="{Binding ColorTheme.TextColor}"
-                 Background="{Binding ColorTheme.BackgroundColor}"
-                 FontFamily="Lucida Console"
-                 />
-    </DockPanel>
-</Window>
diff --git a/OpenKh.Tools.ModsManager/Views/NotepadWindow.xaml.cs b/OpenKh.Tools.ModsManager/Views/NotepadWindow.xaml.cs
deleted file mode 100644
index 8881f0563..000000000
--- a/OpenKh.Tools.ModsManager/Views/NotepadWindow.xaml.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-using OpenKh.Tools.ModsManager.Services;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Windows;
-using Xe.Tools.Wpf.Commands;
-using Xe.Tools.Wpf.Dialogs;
-
-namespace OpenKh.Tools.ModsManager.Views
-{
-    /// <summary>
-    /// Interaction logic for NotepadWindow.xaml
-    /// </summary>
-    public partial class NotepadWindow : Window
-    {
-        private readonly GetActiveWindowService _getActiveWindowService = new GetActiveWindowService();
-
-        public NotepadWindow()
-        {
-            InitializeComponent();
-            DataContext = VM = new NotepadVM();
-
-            VM.CopyAllCommand = new RelayCommand(
-                _ =>
-                {
-                    try
-                    {
-                        Clipboard.SetText(VM.Text);
-                    }
-                    catch (Exception ex)
-                    {
-                        MessageBox.Show("Failed to copy!\n\n" + ex);
-                    }
-                }
-            );
-
-            var saveTo = "";
-
-            VM.SaveAsCommand = new RelayCommand(
-                _ =>
-                {
-                    FileDialog.OnSave(
-                        path =>
-                        {
-                            saveTo = path;
-
-                            try
-                            {
-                                File.WriteAllText(path, VM.Text);
-                            }
-                            catch (Exception ex)
-                            {
-                                MessageBox.Show("Failed to save to file!\n\n" + ex);
-                            }
-                        },
-                        new List<FileDialogFilter>()
-                            .AddAllFiles(),
-                        saveTo,
-                        _getActiveWindowService.GetActiveWindow()
-                    );
-                }
-            );
-        }
-
-        public NotepadVM VM { get; }
-    }
-}
diff --git a/OpenKh.Tools.ModsManager/Views/PresetsWindow.xaml b/OpenKh.Tools.ModsManager/Views/PresetsWindow.xaml
deleted file mode 100644
index 75aea700b..000000000
--- a/OpenKh.Tools.ModsManager/Views/PresetsWindow.xaml
+++ /dev/null
@@ -1,60 +0,0 @@
-<Window x:Class="OpenKh.Tools.ModsManager.Views.PresetsWindow"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:OpenKh.Tools.ModsManager.Views"
-        mc:Ignorable="d"
-        WindowStartupLocation="CenterScreen"
-        ResizeMode="NoResize"
-         FocusManager.FocusedElement="{Binding ElementName=txtSourceModUrl}"
-        Title="Presets" Height="300" Width="300" SizeToContent="Height" Background="{Binding ColorTheme.BackgroundColor}">
-
-    <Window.InputBindings>
-        <KeyBinding Key="Esc" Command="{Binding CloseCommand}"/>
-    </Window.InputBindings>
-    <Window.Resources>
-        <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/>
-    </Window.Resources>
-
-    <!-- Preset List -->
-    <DockPanel Margin="10">
-
-        <!-- Add new preset -->
-        <StackPanel DockPanel.Dock="Bottom">
-            <TextBlock Margin="0 0 0 3" Foreground="{Binding ColorTheme.TextColor}">Name Preset</TextBlock>
-            <Grid Margin="0 0 0 5" Background="White">
-                <TextBlock Margin="5,1" MinWidth="50" Text="Enter New Preset Name"
-                   Foreground="Gray" Visibility="{Binding ElementName=txtSourceModUrl, Path=Text.IsEmpty, Converter={StaticResource BooleanToVisibilityConverter}}" IsHitTestVisible="False"/>
-                <TextBox Name="txtSourceModUrl" Background="Transparent" Text="{Binding PresetName, UpdateSourceTrigger=PropertyChanged}" KeyUp="txtSourceModUrl_KeyUp" />
-            </Grid>
-            <Button Click="Save_Click">Save</Button>
-        </StackPanel>
-
-        <Grid>
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*"/>
-                <ColumnDefinition Width="100"/>
-            </Grid.ColumnDefinitions>
-            <ScrollViewer Grid.Column="0" MinHeight="200">
-                <ListView Name="List_Presets" ItemsSource="{Binding Path=MainVm.PresetList}" Background="{Binding ColorTheme.BackgroundColor}" Foreground="{Binding ColorTheme.TextColor}">
-                    <ListView.ItemTemplate>
-                        <DataTemplate>
-                            <StackPanel Orientation="Horizontal">
-                                <TextBlock VerticalAlignment="Center" Text="{Binding}"/>
-                                <!--<Button Margin="5 0 0 0" Click="Button_ApplyPreset">Apply</Button>
-                                <Button Margin="5 0 0 0" Click="Button_RemovePreset">Remove</Button>-->
-                            </StackPanel>
-                        </DataTemplate>
-                    </ListView.ItemTemplate>
-                </ListView>
-            </ScrollViewer>
-
-            <StackPanel Grid.Column="1" Margin="10">
-                <Button Click="Button_ApplyPreset" Margin="0 10">Apply</Button>
-                <Button Click="Button_RemovePreset">Remove</Button>
-            </StackPanel>
-        </Grid>
-
-    </DockPanel>
-</Window>
diff --git a/OpenKh.Tools.ModsManager/Views/PresetsWindow.xaml.cs b/OpenKh.Tools.ModsManager/Views/PresetsWindow.xaml.cs
deleted file mode 100644
index 31fdf104f..000000000
--- a/OpenKh.Tools.ModsManager/Views/PresetsWindow.xaml.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-using OpenKh.Tools.ModsManager.Services;
-using OpenKh.Tools.ModsManager.ViewModels;
-using System.Windows;
-using Xe.Tools.Wpf.Commands;
-
-namespace OpenKh.Tools.ModsManager.Views
-{
-    public partial class PresetsWindow : Window
-    {
-        public ColorThemeService ColorTheme => ColorThemeService.Instance;
-        public MainViewModel MainVm { get; set; }
-        public RelayCommand CloseCommand { get; }
-        public string PresetName { get; set; }
-
-        public PresetsWindow()
-        {
-            InitializeComponent();
-            DataContext = this;
-
-            CloseCommand = new RelayCommand(_ => Close());
-        }
-        public PresetsWindow(MainViewModel mvm)
-        {
-            MainVm = mvm;
-            InitializeComponent();
-            DataContext = this;
-
-            CloseCommand = new RelayCommand(_ => Close());
-        }
-
-        private void Save_Click(object sender, RoutedEventArgs e)
-        {
-            MainVm.SavePreset(txtSourceModUrl.Text);
-        }
-
-        private void txtSourceModUrl_KeyUp(object sender, System.Windows.Input.KeyEventArgs e)
-        {
-            if (e.Key == System.Windows.Input.Key.Enter)
-                Save_Click(sender, e);
-
-            e.Handled = true;
-        }
-
-        private void Button_ApplyPreset(object sender, RoutedEventArgs e)
-        {
-            if (List_Presets.SelectedItem == null)
-                return;
-
-            string presetName = (string)List_Presets.SelectedItem;
-            MainVm.LoadPreset(presetName);
-            Close();
-        }
-
-        private void Button_RemovePreset(object sender, RoutedEventArgs e)
-        {
-            if (List_Presets.SelectedItem == null)
-                return;
-            string presetName = (string)List_Presets.SelectedItem;
-            MessageBoxResult messageBoxResult = MessageBox.Show($"Do you want to remove {presetName} preset.", "Delete Confirmation", MessageBoxButton.YesNo);
-            if (messageBoxResult == MessageBoxResult.Yes)
-            {
-                MainVm.RemovePreset(presetName);
-            }
-
-        }
-    }
-}
diff --git a/OpenKh.Tools.ModsManager/Views/SelectModTargetFilesVM.cs b/OpenKh.Tools.ModsManager/Views/SelectModTargetFilesVM.cs
deleted file mode 100644
index e5231c25c..000000000
--- a/OpenKh.Tools.ModsManager/Views/SelectModTargetFilesVM.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-using OpenKh.Tools.ModsManager.Models.ViewHelper;
-using OpenKh.Tools.ModsManager.Services;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Windows.Input;
-using Xe.Tools;
-
-namespace OpenKh.Tools.ModsManager.Views
-{
-    public class SelectModTargetFilesVM : BaseNotifyPropertyChanged
-    {
-        public ColorThemeService ColorTheme => ColorThemeService.Instance;
-
-        #region SearchCommand
-        private ICommand _searchCommand = null;
-        public ICommand SearchCommand
-        {
-            get => _searchCommand;
-            set
-            {
-                _searchCommand = value;
-                OnPropertyChanged(nameof(SearchCommand));
-            }
-        }
-        #endregion
-
-        #region SearchKeywords
-        private string _searchKeywords = "";
-        public string SearchKeywords
-        {
-            get => _searchKeywords;
-            set
-            {
-                _searchKeywords = value;
-                OnPropertyChanged(nameof(SearchKeywords));
-            }
-        }
-        #endregion
-
-        #region SearchHits
-        private IEnumerable<SearchHit> _searchHits = Enumerable.Empty<SearchHit>();
-        public IEnumerable<SearchHit> SearchHits
-        {
-            get => _searchHits;
-            set
-            {
-                _searchHits = value;
-                OnPropertyChanged(nameof(SearchHits));
-            }
-        }
-        #endregion
-
-        #region SearchingTask
-        private Task _searchingTask = null;
-        public Task SearchingTask
-        {
-            get => _searchingTask;
-            set
-            {
-                _searchingTask = value;
-                OnPropertyChanged(nameof(SearchingTask));
-            }
-        }
-        #endregion
-
-        #region Actions
-        private IEnumerable<ActionCommand> _actions = Array.Empty<ActionCommand>();
-        public IEnumerable<ActionCommand> Actions
-        {
-            get => _actions;
-            set
-            {
-                _actions = value;
-                OnPropertyChanged(nameof(Actions));
-            }
-        }
-        #endregion
-
-        #region SearchHitSelectedList
-        private IEnumerable<SearchHit> _searchHitSelectedList = Array.Empty<SearchHit>();
-        public IEnumerable<SearchHit> SearchHitSelectedList
-        {
-            get => _searchHitSelectedList;
-            set
-            {
-                _searchHitSelectedList = value;
-                OnPropertyChanged(nameof(SearchHitSelectedList));
-            }
-        }
-        #endregion
-
-    }
-}
diff --git a/OpenKh.Tools.ModsManager/Views/SelectModTargetFilesWindow.xaml b/OpenKh.Tools.ModsManager/Views/SelectModTargetFilesWindow.xaml
deleted file mode 100644
index c8e6667a9..000000000
--- a/OpenKh.Tools.ModsManager/Views/SelectModTargetFilesWindow.xaml
+++ /dev/null
@@ -1,67 +0,0 @@
-<Window x:Class="OpenKh.Tools.ModsManager.Views.SelectModTargetFilesWindow"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:OpenKh.Tools.ModsManager.Views"
-        xmlns:viewHelper="clr-namespace:OpenKh.Tools.ModsManager.Models.ViewHelper"
-        xmlns:userControls="clr-namespace:OpenKh.Tools.ModsManager.UserControls"
-        Background="{Binding ColorTheme.BackgroundColor}"
-        WindowStartupLocation="CenterOwner"
-        d:DataContext="{d:DesignInstance Type=local:SelectModTargetFilesVM}"
-        mc:Ignorable="d"
-        Title="SelectModTargetFilesWindow" Height="558" Width="800">
-    <DockPanel LastChildFill="True">
-        <DockPanel.Resources>
-            <Style TargetType="TextBlock">
-                <Setter Property="Padding" Value="3"/>
-                <Setter Property="Foreground" Value="{Binding ColorTheme.TextColor}"/>
-            </Style>
-        </DockPanel.Resources>
-        <DockPanel LastChildFill="True" DockPanel.Dock="Top" VerticalAlignment="Top">
-            <TextBlock Margin="3" DockPanel.Dock="Left" VerticalAlignment="Center" HorizontalAlignment="Left">Search keywords:</TextBlock>
-            <userControls:TaskStatusByIconControl Width="32" Height="32" DockPanel.Dock="Right" Margin="3,0,3,0"
-                                                  Task="{Binding SearchingTask}"
-                                                  ReadyIcon="{StaticResource StatusNotStarted_16x}"
-                                                  InProgressIcon="{StaticResource Search_16x}"
-                                                  SuccessfulIcon="{StaticResource StatusNotStartedGreen_16x}"
-                                                  FailureIcon="{StaticResource StatusCriticalError_16x}"
-                                                  />
-            <Button Margin="3" DockPanel.Dock="Right" Content="_Search" Padding="7" Command="{Binding SearchCommand}" IsDefault="True" />
-            <TextBox Margin="3" VerticalAlignment="Center" Padding="3" Text="{Binding SearchKeywords,UpdateSourceTrigger=PropertyChanged}" />
-        </DockPanel>
-        <TextBlock Text="Search result (one item represents one file)" Margin="3" DockPanel.Dock="Top" />
-        <StackPanel DockPanel.Dock="Right" HorizontalAlignment="Right" VerticalAlignment="Stretch">
-            <TextBlock Text="Actions:" Margin="3" />
-            <ItemsControl ItemsSource="{Binding Actions}">
-                <ItemsControl.ItemTemplate>
-                    <DataTemplate>
-                        <Button Content="{Binding Display}" Padding="7" Margin="5" Command="{Binding Command}" />
-                    </DataTemplate>
-                </ItemsControl.ItemTemplate>
-            </ItemsControl>
-        </StackPanel>
-        <GroupBox Header="Help" DockPanel.Dock="Bottom"
-                  Foreground="{Binding ColorTheme.TextColor}">
-            <ItemsControl ItemsSource="{Binding Actions}">
-                <ItemsControl.ItemTemplate>
-                    <DataTemplate>
-                        <TextBlock TextWrapping="Wrap">
-                            <Underline><Run Text="{Binding Display}" /></Underline><LineBreak />
-                            <TextBlock Margin="7,0,0,0" Text="{Binding ToolTip}" TextWrapping="Wrap"></TextBlock>
-                        </TextBlock>
-                    </DataTemplate>
-                </ItemsControl.ItemTemplate>
-            </ItemsControl>
-        </GroupBox>
-
-        <ListBox Margin="3" ItemsSource="{Binding SearchHits}" SelectionChanged="ListBox_SelectionChanged"
-                 SelectionMode="Extended">
-            <ListBox.ItemTemplate>
-                <DataTemplate>
-                    <TextBlock Text="{Binding Display}" HorizontalAlignment="Stretch" />
-                </DataTemplate>
-            </ListBox.ItemTemplate>
-        </ListBox>
-    </DockPanel>
-</Window>
diff --git a/OpenKh.Tools.ModsManager/Views/SelectModTargetFilesWindow.xaml.cs b/OpenKh.Tools.ModsManager/Views/SelectModTargetFilesWindow.xaml.cs
deleted file mode 100644
index f8ed790bc..000000000
--- a/OpenKh.Tools.ModsManager/Views/SelectModTargetFilesWindow.xaml.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using OpenKh.Tools.ModsManager.Models.ViewHelper;
-using System.Linq;
-using System.Windows;
-using System.Windows.Controls;
-
-namespace OpenKh.Tools.ModsManager.Views
-{
-    /// <summary>
-    /// Interaction logic for SelectModTargetFilesWindow.xaml
-    /// </summary>
-    public partial class SelectModTargetFilesWindow : Window
-    {
-        public SelectModTargetFilesWindow()
-        {
-            InitializeComponent();
-            DataContext = VM = new SelectModTargetFilesVM();
-        }
-
-        public SelectModTargetFilesVM VM { get; }
-
-        private void ListBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
-        {
-            VM.SearchHitSelectedList = ((ListBox)sender).SelectedItems
-                .OfType<SearchHit>()
-                .ToArray();
-        }
-    }
-}
diff --git a/OpenKh.Tools.ModsManager/Views/SetupWizardWindow.xaml b/OpenKh.Tools.ModsManager/Views/SetupWizardWindow.xaml
deleted file mode 100644
index 7ece19ec1..000000000
--- a/OpenKh.Tools.ModsManager/Views/SetupWizardWindow.xaml
+++ /dev/null
@@ -1,445 +0,0 @@
-<Window x:Class="OpenKh.Tools.ModsManager.Views.SetupWizardWindow"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:OpenKh.Tools.ModsManager.Views"
-        xmlns:converters="clr-namespace:OpenKh.Tools.ModsManager.Converters"
-        xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-        mc:Ignorable="d"
-        WindowStartupLocation="CenterScreen"
-        Title="{Binding Title}" d:Title="OpenKH Mods Manager set-up"
-        Height="500" Width="400" ResizeMode="NoResize">
-    <Window.Resources>
-        <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/>
-        <SolidColorBrush x:Key="textHyperlink" Color="#569CD6" />
-        <Style TargetType="xctk:WizardPage">
-            <Setter Property="Foreground" Value="{Binding ColorTheme.TextColor}"/>
-            <Setter Property="Background" Value="{Binding ColorTheme.BackgroundColor}"/>
-            <Setter Property="HeaderBackground" Value="{Binding ColorTheme.BackgroundColor}"/>
-            <Setter Property="ExteriorPanelBackground" Value="#FF4E4E4E"/>
-        </Style>
-    </Window.Resources>
-    <xctk:Wizard
-        Name="wizard"
-        HelpButtonVisibility="Collapsed"
-        CancelButtonClosesWindow="True"
-        FinishButtonClosesWindow="True"
-        CurrentPage="{Binding ElementName=PageGameEdition}"
-        PageChanged="Wizard_PageChanged"
-        Finish="Wizard_Finish" Background="{Binding ColorTheme.BackgroundColor}">
-        <xctk:WizardPage
-            x:Name="IntroPage"
-            Title="Welcome to OpenKH Mods Manager"
-            PageType="Exterior"
-            Description="This set-up will guide you through the basic configuration of this tool, allowing you to install and play mods from the best modders in the Kingdom Hearts community."
-            NextPage="{Binding ElementName=PageGameEdition}">
-        </xctk:WizardPage>
-
-        <xctk:WizardPage
-            x:Name="PageGameEdition"
-            PageType="Interior"
-            Title="Game edition"
-            CanSelectNextPage="{Binding IsGameSelected}"
-            Description="Selected the preferred edition to launch the game"
-            PreviousPage="{Binding PageStack.Back}"
-            NextPage="{Binding WizardPageAfterIntro}">
-            <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
-                <StackPanel>
-                    <TextBlock Margin="0 0 0 3">Game edition</TextBlock>
-                    <ComboBox Margin="0 0 0 6" SelectedIndex="{Binding GameEdition}">
-                        <ComboBoxItem Visibility="{Binding OpenKhGameEngineVisible}">OpenKH Game Engine</ComboBoxItem>
-                        <ComboBoxItem>PlayStation 2 using PCSX2 emulator</ComboBoxItem>
-                        <ComboBoxItem>PC Release</ComboBoxItem>
-                    </ComboBox>
-                    <StackPanel Visibility="{Binding OpenKhGameEngineConfigVisibility}">
-                        <TextBlock Margin="0 0 0 3">Please select the location of OpenKH Game Engine</TextBlock>
-                        <Grid Margin="0 0 0 3">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*"/>
-                                <ColumnDefinition Width="20"/>
-                            </Grid.ColumnDefinitions>
-                            <TextBox Grid.Column="0" Text="{Binding OpenKhGameEngineLocation, UpdateSourceTrigger=PropertyChanged}"/>
-                            <Button Grid.Column="1" Grid.Row="4" Command="{Binding SelectOpenKhGameEngineCommand}">
-                                <Image Source="{StaticResource FolderOpen_16x}"/>
-                            </Button>
-                        </Grid>
-                        <TextBlock Margin="0 0 0 3">NOTE: The engine is work in progress and might show inaccuracy.</TextBlock>
-                    </StackPanel>
-                    <StackPanel Visibility="{Binding Pcsx2ConfigVisibility}">
-                        <TextBlock Margin="0 0 0 3">Please select the location of PCSX2 emulator</TextBlock>
-                        <Grid Margin="0 0 0 3">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*"/>
-                                <ColumnDefinition Width="20"/>
-                            </Grid.ColumnDefinitions>
-                            <TextBox Grid.Column="0" Text="{Binding Pcsx2Location, UpdateSourceTrigger=PropertyChanged}"/>
-                            <Button Grid.Column="1" Grid.Row="4" Command="{Binding SelectPcsx2Command}">
-                                <Image Source="{StaticResource FolderOpen_16x}"/>
-                            </Button>
-                        </Grid>
-                        <TextBlock Margin="0 0 0 3">NOTE: Only PCSX2 up to 1.6.0 and PCSX2-EX are supported.</TextBlock>
-                    </StackPanel>
-                    <StackPanel Visibility="{Binding PcReleaseConfigVisibility}">
-                        <TextBlock Margin="0 0 0 3" TextWrapping="Wrap">
-                    Select if you have the Japanese version or the Global version.
-                        </TextBlock>
-                        <ComboBox Margin="0 0 0 6" SelectedIndex="{Binding PCReleaseLanguage}">
-                            <ComboBoxItem>Global</ComboBoxItem>
-                            <ComboBoxItem>Japanese</ComboBoxItem>
-                        </ComboBox>
-                        <TextBlock Margin="0 0 0 3" TextWrapping="Wrap">
-                    Select the launcher you use for the supported Kingdom Hearts games.
-                        </TextBlock>
-                        <ComboBox Margin="0 0 0 6" SelectedIndex="{Binding LaunchOption}">
-                            <ComboBoxItem>Epic Games Store</ComboBoxItem>
-                            <ComboBoxItem>Steam</ComboBoxItem>
-                            <ComboBoxItem>Other</ComboBoxItem>
-                        </ComboBox>
-                        <TextBlock Margin="0 0 0 3" TextWrapping="Wrap">
-                        Mod Manager supports both the 1.5+2.5 collection and KH3D from the 2.8 collection choose the filepath for at least one of the collections.
-                        </TextBlock>
-                        <Button Margin="0 10 0 10" Command="{Binding DetectInstallsCommand}">Detect Installations</Button>
-                        <TextBlock Margin="0 0 0 3">Folder location of the PC release of 1.5+2.5</TextBlock>
-                        <Grid Margin="0 0 0 3">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*"/>
-                                <ColumnDefinition Width="20"/>
-                            </Grid.ColumnDefinitions>
-                            <TextBox Grid.Column="0" Text="{Binding PcReleaseLocation, UpdateSourceTrigger=PropertyChanged}"/>
-                            <Button Grid.Column="1" Grid.Row="4" Command="{Binding SelectPcReleaseCommand}">
-                                <Image Source="{StaticResource FolderOpen_16x}"/>
-                            </Button>
-                        </Grid>
-                        <TextBlock Margin="0 0 0 3">Folder location of the PC release of 2.8</TextBlock>
-                        <Grid Margin="0 0 0 3">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*"/>
-                                <ColumnDefinition Width="20"/>
-                            </Grid.ColumnDefinitions>
-                            <TextBox Grid.Column="0" Text="{Binding PcReleaseLocationKH3D, UpdateSourceTrigger=PropertyChanged}"/>
-                            <Button Grid.Column="1" Grid.Row="4" Command="{Binding SelectPcReleaseKH3DCommand}">
-                                <Image Source="{StaticResource FolderOpen_16x}"/>
-                            </Button>
-                        </Grid>
-                        <TextBlock Margin="0 0 0 3" TextWrapping="Wrap">NOTE: Always be sure to use a supported version or risk breaking compatibility</TextBlock>
-                    </StackPanel>
-                </StackPanel>
-            </ScrollViewer>
-        </xctk:WizardPage>
-        <xctk:WizardPage
-            x:Name="PageIsoSelection"
-            PageType="Interior"
-            Title="Configure the game you want to mod"
-            Description="Do not worry, you can change this option later"
-            PreviousPage="{Binding PageStack.Back}"
-            NextPage="{Binding ElementName=PageGameData}">
-            <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
-                <StackPanel>
-                    <TextBlock>Supported games:</TextBlock>
-                    <StackPanel Margin="10 3 0 10">
-                        <TextBlock>Kingdom Hearts I (JP, US, Final Mix)</TextBlock>
-                        <TextBlock>Kingdom Hearts II (JP, US, EU, Final Mix)</TextBlock>
-                        <TextBlock>Kingdom Hearts Re:Chain of Memories (JP, US)</TextBlock>
-                    </StackPanel>
-                    <TextBlock Margin="0 0 0 3">Please select the location of the PlayStation 2 ISO Images.</TextBlock>
-                    <TextBlock Margin="0 0 0 3">Kingdom Hearts 2 PlayStation 2 ISO Image.</TextBlock>
-                    <Grid Margin="0 0 0 3">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="*"/>
-                            <ColumnDefinition Width="20"/>
-                        </Grid.ColumnDefinitions>
-                        <TextBox Grid.Column="0" Text="{Binding IsoLocationKH2, UpdateSourceTrigger=PropertyChanged}"/>
-                        <Button Grid.Column="1" Grid.Row="4" Command="{Binding SelectIsoCommand}" CommandParameter="kh2">
-                            <Image Source="{StaticResource FolderOpen_16x}"/>
-                        </Button>
-                    </Grid>
-                    <TextBlock Margin="0 0 0 3">Kingdom Hearts 1 PlayStation 2 ISO Image.</TextBlock>
-                    <Grid Margin="0 0 0 3">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="*"/>
-                            <ColumnDefinition Width="20"/>
-                        </Grid.ColumnDefinitions>
-                        <TextBox Grid.Column="0" Text="{Binding IsoLocationKH1, UpdateSourceTrigger=PropertyChanged}"/>
-                        <Button Grid.Column="1" Grid.Row="4" Command="{Binding SelectIsoCommand}" CommandParameter="kh1">
-                            <Image Source="{StaticResource FolderOpen_16x}"/>
-                        </Button>
-                    </Grid>
-                    <TextBlock Margin="0 0 0 3">Kingdom Hearts Re: Chain of Memories PlayStation 2 ISO Image.</TextBlock>
-                    <Grid Margin="0 0 0 3">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="*"/>
-                            <ColumnDefinition Width="20"/>
-                        </Grid.ColumnDefinitions>
-                        <TextBox Grid.Column="0" Text="{Binding IsoLocationRecom, UpdateSourceTrigger=PropertyChanged}"/>
-                        <Button Grid.Column="1" Grid.Row="4" Command="{Binding SelectIsoCommand}" CommandParameter="Recom">
-                            <Image Source="{StaticResource FolderOpen_16x}"/>
-                        </Button>
-                    </Grid>
-                    <TextBlock TextWrapping="Wrap" Visibility="{Binding GameRecognizedVisibility}">
-                    <Run>A copy of </Run>
-                    <Run Text="{Binding GameName}" d:Text="Some KH game"/>
-                    <Run> was successfully recognized!</Run>
-                    </TextBlock>
-                    <TextBlock TextWrapping="Wrap" Visibility="{Binding GameNotRecognizedVisibility}">
-                    <Run>It was not possible to recognize the game of the ISO you provided for </Run>
-                    <Run Text="{Binding GameName}" d:Text="Some KH game"/>
-                    <Run>. Be sure that the game is within the list of supported games and that you chose the corresponding game to provide the ISO for.</Run>
-                    </TextBlock>
-                </StackPanel>
-            </ScrollViewer>
-        </xctk:WizardPage>
-        <xctk:WizardPage
-            x:Name="PageGameData"
-            PageType="Interior"
-            Title="Set Game Data Location"
-            Description="It might be necessary to extract game's data."
-            CanSelectNextPage="{Binding IsGameDataFound}"
-            CanSelectPreviousPage="{Binding IsNotExtracting}"
-            CanCancel="{Binding IsNotExtracting}"
-            PreviousPage="{Binding PageStack.Back}"
-            NextPage="{Binding WizardPageAfterGameData}"
-            IsEnabled="{Binding IsNotExtracting}">
-            <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
-                <StackPanel>
-                    <TextBlock Margin="0,0,0,3" TextWrapping="Wrap" Visibility="{Binding PcReleaseConfigVisibility}">
-                            OpenKH can extract all games in the 1.5 + 2.5 collection and KH3D from the 2.8 collection. Check the games below you wish to extract.
-                            If you do not see the game you want to use Mod Manager for please go back to the Game Edition page and make sure you selected the correct filepath.
-                            Size values are rounded up.
-                    </TextBlock>
-                    <TextBlock Margin="0,0,0,3" TextWrapping="Wrap" Visibility="{Binding Pcsx2ConfigVisibility}">
-                        OpenKH can extract KH1, KH2, and Recom from their respective ISO files. Check the games below you wish to extract.
-                        If you do not see the game you want to use Mod Manager for please go back to the ISO Selection page and make sure you provided the path to the ISO file.
-                        Size values are estimates that are rounded up from known unmodified ISO files.
-                    </TextBlock>
-                    <StackPanel Visibility="{Binding BothPcReleaseSelected}">
-                        <StackPanel Orientation="Horizontal">
-                            <CheckBox IsChecked="{Binding Extractkh1}" Content="KH1-23GB" Margin="0 0 6 4"/>
-                            <CheckBox IsChecked="{Binding Extractkh2}" Content="KH2-43GB" Margin="0 0 6 4"/>
-                            <CheckBox IsChecked="{Binding Extractbbs}" Content="BBS-19GB" Margin="0 0 6 4"/>
-                            <CheckBox IsChecked="{Binding Extractrecom}" Content="ReCoM-14GB" Margin="0 0 6 4"/>
-                        </StackPanel>
-                        <StackPanel Orientation="Horizontal">
-                            <CheckBox IsChecked="{Binding Extractkh3d}" Content="KH3D-51GB" Margin="0 0 6 4"/>
-                        </StackPanel>
-                    </StackPanel>
-                    <StackPanel Orientation="Horizontal" Visibility="{Binding PcRelease1525Selected}">
-                        <CheckBox IsChecked="{Binding Extractkh1}" Content="KH1-23GB" Margin="0 0 6 4"/>
-                        <CheckBox IsChecked="{Binding Extractkh2}" Content="KH2-43GB" Margin="0 0 6 4"/>
-                        <CheckBox IsChecked="{Binding Extractbbs}" Content="BBS-19GB" Margin="0 0 6 4"/>
-                        <CheckBox IsChecked="{Binding Extractrecom}" Content="ReCoM-14GB" Margin="0 0 6 4"/>
-                    </StackPanel>
-                    <StackPanel Orientation="Horizontal" Visibility="{Binding PcRelease28Selected}">
-                        <CheckBox IsChecked="{Binding Extractkh3d}" Content="KH3D-51GB" Margin="0 0 6 4"/>
-                    </StackPanel>
-                    <StackPanel Orientation="Horizontal" Visibility="{Binding Pcsx2ConfigVisibility}">
-                        <CheckBox IsChecked="{Binding Extractkh1}" Content="KH1-4GB" Margin="0 0 6 4" Visibility="{Binding KH1RecognizedVisibility}"/>
-                        <CheckBox IsChecked="{Binding Extractkh2}" Content="KH2-4GB" Margin="0 0 6 4" Visibility="{Binding KH2RecognizedVisibility}"/>
-                        <CheckBox IsChecked="{Binding Extractrecom}" Content="ReCoM-5GB" Margin="0 0 6 4" Visibility="{Binding RecomRecognizedVisibility}"/>
-                    </StackPanel>
-                    <TextBlock Margin="0 0 0 3">Extraction folder location:</TextBlock>
-                    <Grid Margin="0 0 0 3">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="*"/>
-                            <ColumnDefinition Width="20"/>
-                        </Grid.ColumnDefinitions>
-                        <TextBox Grid.Column="0" Text="{Binding GameDataLocation, UpdateSourceTrigger=PropertyChanged}"/>
-                        <Button Grid.Column="1" Grid.Row="4" Command="{Binding SelectGameDataLocationCommand}">
-                            <Image Source="{StaticResource FolderOpen_16x}"/>
-                        </Button>
-                    </Grid>
-                    <StackPanel Visibility="{Binding Pcsx2ConfigVisibility}">
-                        <TextBlock Margin="0 0 0 6" Visibility="{Binding GameDataNotFoundVisibility}">
-                        It seems you do not have your Game Data extracted.
-                        </TextBlock>
-                        <TextBlock Margin="0 0 0 6" Visibility="{Binding GameDataFoundVisibility}">
-                        You already have your Game Data extracted.
-                        </TextBlock>
-                    </StackPanel>
-                    <StackPanel Visibility="{Binding PcReleaseConfigVisibility}">
-                        <TextBlock Margin="0 0 0 6" Visibility="{Binding GameDataNotFoundVisibility}">
-                            You do not have any extracted data from a supported game.
-                        </TextBlock>
-                        <TextBlock Margin="0 0 0 6" Visibility="{Binding GameDataFoundVisibility}">
-                            You already have extracted data from a supported game.
-                        </TextBlock>
-                    </StackPanel>
-                    <TextBlock Margin="0 0 0 3" TextWrapping="Wrap" Visibility="{Binding Pcsx2ConfigVisibility}">
-                        Press the button below to initialize the game extraction. It will take between 5 and 15 minutes based on the speed of your hard drive.
-                    </TextBlock>
-                    <TextBlock Margin="0 0 0 3" TextWrapping="Wrap" Visibility="{Binding PcReleaseConfigVisibility}">
-                        Press the button below to initialize the game extraction. Depending on the speed of your storage, if its a hard drive or an SSD, and how many games selected to extract extraction time may vary a lot.
-                    </TextBlock>
-                    <Button Margin="0 0 0 6" Width="120" Height="22" HorizontalAlignment="Left" Command="{Binding ExtractGameDataCommand}">Extract game data</Button>
-                    <ProgressBar Margin="0 0 0 6" Height="22" Visibility="{Binding ProgressBarVisibility}" Minimum="0" Maximum="1" Value="{Binding ExtractionProgress}"/>
-                    <TextBlock Margin="0 0 0 3" Visibility="{Binding ExtractionCompleteVisibility}">
-                        The extraction of the game's data succeded!
-                    </TextBlock>
-                    <TextBlock Margin="0 0 0 3" TextWrapping="Wrap" Visibility="{Binding PcReleaseConfigVisibility}">
-                            <Run Foreground="Red">WARNING</Run>
-                            If you do not extract a games data only Lua Scripts will function properly. Only check the box below if you will only be installing Lua Scripts in Mods Manager.
-                    </TextBlock>
-                    <CheckBox IsChecked="{Binding OverrideGameDataFound}" Content="Skip Game Extraction" Visibility="{Binding PcReleaseConfigVisibility}" Margin="0 0 0 4"/>
-                    <TextBlock Margin="0 0 0 3" TextWrapping="Wrap" Visibility="{Binding PcReleaseConfigVisibility}">
-                        <Run Foreground="Red">WARNING</Run>
-                        If you do not have the space to extract the remastered files for each game (which are about 80% of the sizes listed above) you can check the box below to skip extracting them.
-                        The consequence of doing so depends on the game:<LineBreak/><LineBreak/>
-                        - KH1 there are important data files that are needed for modifying the game beyond just visual.<LineBreak/><LineBreak/>
-                        - KH2 there is only images so some mods may have visual issues because of this.<LineBreak/><LineBreak/>
-                        - Other games I don't know I am unaware of people modifying the games in similar methods to KH1 and KH2 (This information mainly comes from KH1 AP Rando and KH2 Standalone and AP Rando.
-                    </TextBlock>
-                    <CheckBox Visibility="{Binding PcReleaseConfigVisibility}" IsChecked="{Binding SkipRemastered}" Content="Skip Extracting Remastered Files"/>
-                </StackPanel>
-            </ScrollViewer>
-        </xctk:WizardPage>
-        <xctk:WizardPage
-            x:Name="PageRegion"
-            PageType="Interior"
-            Title="Set your preferred region"
-            Description="This will instruct the game to force to load specific languages"
-            CanSelectNextPage="{Binding IsGameDataFound}"
-            PreviousPage="{Binding PageStack.Back}"
-            NextPage="{Binding ElementName=LastPage}">
-            <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
-                <StackPanel>
-                    <TextBlock>Region</TextBlock>
-                    <ComboBox Margin="0 0 0 6" SelectedIndex="{Binding RegionId}">
-                        <ComboBoxItem>Use game default region</ComboBoxItem>
-                        <ComboBoxItem>Japanese (text JP, menu JP, voice JP)</ComboBoxItem>
-                        <ComboBoxItem>English (text US, menu US, voice US)</ComboBoxItem>
-                        <ComboBoxItem>English (text US, menu UK, voice US)</ComboBoxItem>
-                        <ComboBoxItem>Italian (text IT, menu IT, voice IT)</ComboBoxItem>
-                        <ComboBoxItem>Spanish (text SP, menu SP, voice SP)</ComboBoxItem>
-                        <ComboBoxItem>German (text GR, menu GR, voice GR)</ComboBoxItem>
-                        <ComboBoxItem>French (text FR, menu FR, voice FR)</ComboBoxItem>
-                        <ComboBoxItem>Final Mix (text JP, menu FM, voice US)</ComboBoxItem>
-                    </ComboBox>
-                    <TextBlock Margin="0 0 0 3" TextWrapping="Wrap">
-                    Forces to load the internal configuration to a specific region for supported games. This allows to effectively load files from other languages, swap the O and X buttons and use the font table in a different way.
-                    Do not worry if some region files are not found as the Mods Manager has a fallback mechanic.
-                    </TextBlock>
-                    <TextBlock>Supported games:</TextBlock>
-                    <StackPanel Margin="10 3 0 10">
-                        <TextBlock>Kingdom Hearts II (JP, US, EU, Final Mix)</TextBlock>
-                    </StackPanel>
-                </StackPanel>
-            </ScrollViewer>
-        </xctk:WizardPage>
-
-        <xctk:WizardPage
-            x:Name="PageEosInstall"
-            PageType="Interior"
-            Title="Install OpenKH Panacea (Optional and Experimental)"
-            Description="Install automatic mod loading support into the game's folder."
-            PreviousPage="{Binding PageStack.Back}"
-            NextPage="{Binding ElementName=PageLuaBackendInstall}">
-            <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
-                <StackPanel>
-                    <TextBlock Margin="0 0 0 3">Game Collection</TextBlock>
-                    <ComboBox Margin="0 0 0 6" SelectedIndex="{Binding GameCollection}">
-                        <ComboBoxItem>KINGDOM HEARTS HD 1.5+2.5 ReMIX</ComboBoxItem>
-                        <ComboBoxItem>KINGDOM HEARTS HD 2.8 Final Chapter Prologue</ComboBoxItem>
-                    </ComboBox>
-                    <TextBlock Margin="0 0 0 3" TextWrapping="Wrap">
-                            Panacea allows the PC version of Kingdom Hearts to load the mods you have installed, without
-                            modifying the game files.
-                            Panacea will run every time you start the game and attempt to load built mods. To uninstall Panacea, click Remove Panacea button.
-                    </TextBlock>
-                    <StackPanel Visibility="{Binding PanaceaNotInstalledVisibility}">
-                        <TextBlock Margin="0 0 0 3" TextWrapping="Wrap">
-                            It seems you do not have Panacea installed or you are running a different version than the one
-                            compatible with this version of Mods Manager. We need your permission to install it into the game's folder.
-                            If you choose not to install, you may need to use one of the Build and Patch options to apply mods
-                            to your game.
-                        </TextBlock>
-                        <Button
-                            Margin="0 0 0 6"
-                            Content="Install Panacea"
-                            HorizontalAlignment="Left"
-                            Width="205"
-                            Command="{Binding InstallPanaceaCommand}"/>
-                    </StackPanel>
-                    <StackPanel Visibility="{Binding PanaceaInstalledVisibility}">
-                        <TextBlock Margin="0 0 0 3" TextWrapping="Wrap">
-                            OpenKH Panacea is installed!
-                        </TextBlock>
-                        <Button
-                            Margin="0 0 0 6"
-                            Content="Remove Panacea"
-                            HorizontalAlignment="Left"
-                            Width="160"
-                            Command="{Binding RemovePanaceaCommand}"/>
-                    </StackPanel>
-                </StackPanel>
-            </ScrollViewer>
-        </xctk:WizardPage>
-        <xctk:WizardPage
-            x:Name="PageLuaBackendInstall"
-            PageType="Interior"
-            Title="Install Lua Backend"
-            Description="Lua Backend allows you to use Lua Scripts with the PC version of Kingdom Hearts."
-            PreviousPage="{Binding PageStack.Back}"
-            NextPage="{Binding WizardPageAfterLuaBackend}">
-            <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
-                <StackPanel>
-                    <TextBlock Margin="0 0 0 3">Game Collection</TextBlock>
-                    <ComboBox Margin="0 0 0 6" SelectedIndex="{Binding GameCollection}">
-                        <ComboBoxItem>KINGDOM HEARTS HD 1.5+2.5 ReMIX</ComboBoxItem>
-                        <ComboBoxItem>KINGDOM HEARTS HD 2.8 Final Chapter Prologue</ComboBoxItem>
-                    </ComboBox>
-                    <TextBlock Margin="0 0 0 3" TextWrapping="Wrap" Visibility="{Binding LuaBackendNotFoundVisibility}">
-                It seems you have not installed Lua Backend for use with Panacea. If you wish to do this press the button below. Also if you wish to have OpenKH configure it so Lua Backend can load scripts installed in Mod Manager check the games below.
-                    </TextBlock>
-                    <TextBlock Margin="0 0 0 6" Visibility="{Binding LuaBackendFoundVisibility}" TextWrapping="Wrap">
-                Lua Backend is installed! for use with Panacea. If you have not already and wish to configure it so it runs scripts from mods installed into OpenKH check the games below and press the configure button.
-                    </TextBlock>
-                    <StackPanel Orientation="Horizontal" Visibility="{Binding InstallForPc1525}">
-                        <CheckBox IsChecked="{Binding LuaConfigkh1}" Content="KH1" Margin="0 0 10 4"/>
-                        <CheckBox IsChecked="{Binding LuaConfigkh2}" Content="KH2" Margin="0 0 10 4"/>
-                        <CheckBox IsChecked="{Binding LuaConfigbbs}" Content="BBS" Margin="0 0 10 4"/>
-                        <CheckBox IsChecked="{Binding LuaConfigrecom}" Content="ReCoM" Margin="0 0 10 4"/>
-                    </StackPanel>
-                    <StackPanel Orientation="Horizontal" Visibility="{Binding InstallForPc28}">
-                        <CheckBox IsChecked="{Binding LuaConfigkh3d}" Content="KH3D" Margin="0 0 10 4"/>
-                    </StackPanel>
-                    <Button Margin="0 0 0 6" Content="Install and Configure Lua Backend" HorizontalAlignment="Left" Width="200" Command="{Binding InstallLuaBackendCommand}" CommandParameter="false" Visibility="{Binding LuaBackendNotFoundVisibility}"/>
-                    <Button Margin="0 0 0 6" Content="Configure Lua Backend" HorizontalAlignment="Left" Width="200" Command="{Binding InstallLuaBackendCommand}" CommandParameter="true" Visibility="{Binding LuaBackendFoundVisibility}"/>
-                    <TextBlock Margin="0 2 0 10" Visibility="{Binding LuaBackendFoundVisibility}" TextWrapping="Wrap">
-                If you wish to uninstall Lua Backend completely press the button below.
-                    </TextBlock>
-                    <Button Margin="0 0 0 6" Content="Uninstall Lua Backend" HorizontalAlignment="Left" Width="200" Command="{Binding RemoveLuaBackendCommand}" Visibility="{Binding LuaBackendFoundVisibility}"/>
-                </StackPanel>
-            </ScrollViewer>
-        </xctk:WizardPage>
-        <xctk:WizardPage
-            x:Name="PageSteamAPITrick"
-            PageType="Interior"
-            Title="Launch Games Directly (Steam)"
-            Description="Steam allows you to launch the exes directly through a one line text file located in the games install folder."
-            PreviousPage="{Binding PageStack.Back}"
-            NextPage="{Binding ElementName=PageGameData}">
-            <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
-                <StackPanel>
-                    <TextBlock Margin="0 0 0 3">Game Collection</TextBlock>
-                    <ComboBox Margin="0 0 0 6" SelectedIndex="{Binding GameCollection}">
-                        <ComboBoxItem>KINGDOM HEARTS HD 1.5+2.5 ReMIX</ComboBoxItem>
-                        <ComboBoxItem>KINGDOM HEARTS HD 2.8 Final Chapter Prologue</ComboBoxItem>
-                    </ComboBox>
-                    <TextBlock Margin="0 0 0 3" TextWrapping="Wrap">
-                   <Run Foreground="Red">WARNING</Run>
-                    Steam must be running otherwise the game will fail to start. It will start to open then crash for seemingly no reason. Make sure steam is open if using this.
-                    </TextBlock>
-                    <Button Margin="0 0 0 6" Content="Create steam__appid.txt" HorizontalAlignment="Left" Width="200" Command="{Binding InstallSteamAPIFile}" Visibility="{Binding SteamAPIFileNotFound}"/>
-                    <Button Margin="0 0 0 6" Content="Delete steam__appid.txt" HorizontalAlignment="Left" Width="200" Command="{Binding RemoveSteamAPIFile}" Visibility="{Binding SteamAPIFileFound}"/>
-                </StackPanel>
-            </ScrollViewer>
-        </xctk:WizardPage>
-        <xctk:WizardPage
-            x:Name="LastPage"
-            PageType="Exterior"
-            Title="You're set!"
-            Description="You successfully configured OpenKH Mods Manager. Have fun with all the amazing mods that the community has to offer!"
-            PreviousPage="{Binding PageStack.Back}"
-            CanFinish="True"/>
-    </xctk:Wizard>
-</Window>
diff --git a/OpenKh.Tools.ModsManager/Views/SetupWizardWindow.xaml.cs b/OpenKh.Tools.ModsManager/Views/SetupWizardWindow.xaml.cs
deleted file mode 100644
index 0782cec33..000000000
--- a/OpenKh.Tools.ModsManager/Views/SetupWizardWindow.xaml.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-using OpenKh.Common;
-using OpenKh.Tools.ModsManager.ViewModels;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Navigation;
-using Xceed.Wpf.Toolkit;
-
-namespace OpenKh.Tools.ModsManager.Views
-{
-    /// <summary>
-    /// Interaction logic for SetupWizardWindow.xaml
-    /// </summary>
-    public partial class SetupWizardWindow : Window
-    {
-        private readonly SetupWizardViewModel _vm;
-
-        public SetupWizardWindow()
-        {
-            InitializeComponent();
-            DataContext = _vm = new SetupWizardViewModel();
-
-            _vm.PageIsoSelection = PageIsoSelection;
-            _vm.PageEosInstall = PageEosInstall;
-            _vm.PageRegion = PageRegion;
-            _vm.PageGameData = PageGameData;
-            _vm.PageSteamAPITrick = PageSteamAPITrick;
-            _vm.LastPage = LastPage;
-
-            _vm.PageStack.OnPageChanged(wizard.CurrentPage);
-
-            Closed += (sender, e) => _vm.SetAborted();
-        }
-
-        private void Wizard_Finish(object sender, Xceed.Wpf.Toolkit.Core.CancelRoutedEventArgs e)
-        {
-            DialogResult = true;
-        }
-
-        private void Wizard_PageChanged(object sender, RoutedEventArgs e)
-        {
-            _vm?.PageStack.OnPageChanged(((Wizard)sender).CurrentPage);
-        }
-
-        private void NavigateURL(object sender, RequestNavigateEventArgs e) =>
-            new Process()
-            {
-                StartInfo = new ProcessStartInfo
-                {
-                    UseShellExecute = true,
-                    FileName = e.Uri.AbsoluteUri
-                }
-            }.Using(x => x.Start());
-    }
-}
diff --git a/OpenKh.Tools.ModsManager/Views/WorkInProgressWindow.xaml b/OpenKh.Tools.ModsManager/Views/WorkInProgressWindow.xaml
deleted file mode 100644
index 987d2830a..000000000
--- a/OpenKh.Tools.ModsManager/Views/WorkInProgressWindow.xaml
+++ /dev/null
@@ -1,16 +0,0 @@
-<Window x:Class="OpenKh.Tools.ModsManager.Views.WorkInProgressWindow"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:OpenKh.Tools.ModsManager.Views"
-        mc:Ignorable="d"
-        Title="{Binding DialogTitle}" d:Title="Installing mod..." Height="120" Width="300" SizeToContent="WidthAndHeight" ResizeMode="NoResize" WindowStartupLocation="CenterScreen">
-    <StackPanel Margin="10">
-        <TextBlock Margin="0 0 0 10" d:Text="Installing the mod XYZ">
-            <Run Text="{Binding OperationName}"/>
-        </TextBlock>
-        <ProgressBar Margin="0 0 0 10" Height="20" IsIndeterminate="{Binding ProgressUnknown}" Value="{Binding ProgressValue}" Maximum="1" d:IsIndeterminate="True" />
-        <Button HorizontalAlignment="Center" Command="{Binding Cancel}" IsEnabled="{Binding CancelEnabled}">Cancel</Button>
-    </StackPanel>
-</Window>
diff --git a/OpenKh.Tools.ModsManager/Views/WorkInProgressWindow.xaml.cs b/OpenKh.Tools.ModsManager/Views/WorkInProgressWindow.xaml.cs
deleted file mode 100644
index f3a4700c3..000000000
--- a/OpenKh.Tools.ModsManager/Views/WorkInProgressWindow.xaml.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System.ComponentModel;
-using System.Windows;
-using System.Windows.Input;
-
-namespace OpenKh.Tools.ModsManager.Views
-{
-    /// <summary>
-    /// Interaction logic for WorkInProgressWindow.xaml
-    /// </summary>
-    public partial class WorkInProgressWindow : Window
-    {
-        public record TViewModel(
-            string DialogTitle,
-            string OperationName,
-            bool ProgressUnknown,
-            float ProgressValue,
-            ICommand Cancel,
-            bool CancelEnabled
-        );
-
-        public WorkInProgressWindow()
-        {
-            InitializeComponent();
-            Closed += (sender, args) =>
-            {
-                if (args is CancelEventArgs cancelEventArgs)
-                {
-                    cancelEventArgs.Cancel = true;
-                }
-
-                ViewModel?.Cancel?.Execute(null);
-            };
-        }
-
-        public TViewModel ViewModel
-        {
-            get => (TViewModel)DataContext;
-            set => DataContext = value;
-        }
-    }
-}
diff --git a/OpenKh.Tools.ModsManager/Views/YamlGeneratorVM.cs b/OpenKh.Tools.ModsManager/Views/YamlGeneratorVM.cs
deleted file mode 100644
index 7c1600cff..000000000
--- a/OpenKh.Tools.ModsManager/Views/YamlGeneratorVM.cs
+++ /dev/null
@@ -1,185 +0,0 @@
-using OpenKh.Tools.ModsManager.Services;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Windows.Input;
-using Xe.Tools;
-
-namespace OpenKh.Tools.ModsManager.Views
-{
-    public class YamlGeneratorVM : BaseNotifyPropertyChanged
-    {
-        public ColorThemeService ColorTheme => ColorThemeService.Instance;
-
-        #region GenerateCommand
-        private ICommand _generateCommand = null;
-        public ICommand GenerateCommand
-        {
-            get => _generateCommand;
-            set
-            {
-                _generateCommand = value;
-                OnPropertyChanged(nameof(GenerateCommand));
-            }
-        }
-        #endregion
-
-        #region LoadPrefCommand
-        private ICommand _loadPrefCommand = null;
-        public ICommand LoadPrefCommand
-        {
-            get => _loadPrefCommand;
-            set
-            {
-                _loadPrefCommand = value;
-                OnPropertyChanged(nameof(LoadPrefCommand));
-            }
-        }
-        #endregion
-
-        #region SavePrefCommand
-        private ICommand _savePrefCommand = null;
-        public ICommand SavePrefCommand
-        {
-            get => _savePrefCommand;
-            set
-            {
-                _savePrefCommand = value;
-                OnPropertyChanged(nameof(SavePrefCommand));
-            }
-        }
-        #endregion
-
-        #region SelectedPref
-        private ConfigurationService.YamlGenPref _selectedPref = null;
-        public ConfigurationService.YamlGenPref SelectedPref
-        {
-            get => _selectedPref;
-            set
-            {
-                _selectedPref = value;
-                OnPropertyChanged(nameof(SelectedPref));
-            }
-        }
-        #endregion
-
-        #region PrefLabel
-        private string _prefLabel = "";
-        public string PrefLabel
-        {
-            get => _prefLabel;
-            set
-            {
-                _prefLabel = value;
-                OnPropertyChanged(nameof(PrefLabel));
-            }
-        }
-        #endregion
-
-        #region Prefs
-        private IEnumerable<ConfigurationService.YamlGenPref> _prefs = Array.Empty<ConfigurationService.YamlGenPref>();
-        public IEnumerable<ConfigurationService.YamlGenPref> Prefs
-        {
-            get => _prefs;
-            set
-            {
-                _prefs = value;
-                OnPropertyChanged(nameof(Prefs));
-            }
-        }
-        #endregion
-
-        #region ModYmlFilePath
-        private string _modYmlFilePath = "";
-        public string ModYmlFilePath
-        {
-            get => _modYmlFilePath;
-            set
-            {
-                _modYmlFilePath = value;
-                OnPropertyChanged(nameof(ModYmlFilePath));
-            }
-        }
-        #endregion
-
-        #region GeneratingTask
-        private Task _generatingTask;
-        public Task GeneratingTask
-        {
-            get => _generatingTask;
-            set
-            {
-                _generatingTask = value;
-                OnPropertyChanged(nameof(GeneratingTask));
-            }
-        }
-        #endregion
-
-        #region Tools
-        private IEnumerable<GetDiffService> _tools = Enumerable.Empty<GetDiffService>();
-        public IEnumerable<GetDiffService> Tools
-        {
-            get => _tools;
-            set
-            {
-                _tools = value;
-                OnPropertyChanged(nameof(Tools));
-                SelectedTool = _tools?.FirstOrDefault();
-            }
-        }
-        #endregion
-
-        #region SelectedTool
-        private GetDiffService _selectedTool;
-        public GetDiffService SelectedTool
-        {
-            get => _selectedTool;
-            set
-            {
-                _selectedTool = value;
-                OnPropertyChanged(nameof(SelectedTool));
-            }
-        }
-        #endregion
-
-        #region GameDataPath
-        private string _gameDataPath = "";
-        public string GameDataPath
-        {
-            get => _gameDataPath;
-            set
-            {
-                _gameDataPath = value;
-                OnPropertyChanged(nameof(GameDataPath));
-            }
-        }
-        #endregion
-
-        #region AppenderCommand
-        private ICommand _appenderCommand = null;
-        public ICommand AppenderCommand
-        {
-            get => _appenderCommand;
-            set
-            {
-                _appenderCommand = value;
-                OnPropertyChanged(nameof(AppenderCommand));
-            }
-        }
-        #endregion
-
-        #region AppenderTask
-        private Task _appenderTask;
-        public Task AppenderTask
-        {
-            get => _appenderTask;
-            set
-            {
-                _appenderTask = value;
-                OnPropertyChanged(nameof(AppenderTask));
-            }
-        }
-        #endregion
-    }
-}
diff --git a/OpenKh.Tools.ModsManager/Views/YamlGeneratorWindow.xaml b/OpenKh.Tools.ModsManager/Views/YamlGeneratorWindow.xaml
deleted file mode 100644
index e163e1c68..000000000
--- a/OpenKh.Tools.ModsManager/Views/YamlGeneratorWindow.xaml
+++ /dev/null
@@ -1,86 +0,0 @@
-<Window x:Class="OpenKh.Tools.ModsManager.Views.YamlGeneratorWindow"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:OpenKh.Tools.ModsManager.Views"
-        xmlns:userControls="clr-namespace:OpenKh.Tools.ModsManager.UserControls"
-        Background="{Binding ColorTheme.BackgroundColor}"
-        WindowStartupLocation="CenterOwner"
-        d:DataContext="{d:DesignInstance Type=local:YamlGeneratorVM}"
-        mc:Ignorable="d"
-        Title="YamlGeneratorWindow" Height="694" Width="426">
-    <DockPanel Margin="7">
-        <DockPanel.Resources>
-            <Style TargetType="TextBlock">
-                <Setter Property="Padding" Value="3"/>
-                <Setter Property="Foreground" Value="{Binding ColorTheme.TextColor}"/>
-            </Style>
-            <Style TargetType="GroupBox">
-                <Setter Property="Foreground" Value="{Binding ColorTheme.TextColor}"/>
-            </Style>
-        </DockPanel.Resources>
-        <StackPanel Orientation="Vertical">
-            <GroupBox Header="About">
-                <TextBlock TextWrapping="Wrap">YamlGenerator is an embedded tool. Provide a rapid crafting tools to satisfy mod.yml. This is a specialized utility for mod authors.</TextBlock>
-            </GroupBox>
-            <GroupBox Header="Preferences">
-                <StackPanel>
-                    <TextBlock TextWrapping="Wrap">Load and save the fields of: <Italic>mod.yml</Italic> and <Italic>GameDataPath</Italic></TextBlock>
-                    <StackPanel Orientation="Horizontal">
-                        <ComboBox ItemsSource="{Binding Prefs}" VerticalAlignment="Center" IsEditable="True" Width="200"
-                          Text="{Binding PrefLabel,UpdateSourceTrigger=PropertyChanged}"
-                          SelectedItem="{Binding SelectedPref}"
-                          >
-                            <ComboBox.ItemTemplate>
-                                <DataTemplate>
-                                    <TextBlock Text="{Binding Label}" />
-                                </DataTemplate>
-                            </ComboBox.ItemTemplate>
-                        </ComboBox>
-                        <TextBlock />
-                        <Button Content="Load from it" Command="{Binding LoadPrefCommand}" HorizontalAlignment="Left" Padding="7" />
-                        <TextBlock />
-                        <Button Content="Save to it" Command="{Binding SavePrefCommand}" HorizontalAlignment="Left" Padding="7" />
-                    </StackPanel>
-                </StackPanel>
-            </GroupBox>
-            <GroupBox Header="mod.yml">
-                <StackPanel>
-                    <TextBlock >Enter the file path to <Italic>mod.yml</Italic></TextBlock>
-                    <userControls:SaveFileSelectorControl FilePath="{Binding ModYmlFilePath,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
-                                                      Filter="mod.yml|mod.yml|*|*" />
-                </StackPanel>
-            </GroupBox>
-            <GroupBox Header="Diff tool selection">
-                <StackPanel>
-                    <TextBlock TextWrapping="Wrap">You can select a diff tool to see changes for <Italic>mod.yml</Italic></TextBlock>
-                    <ComboBox ItemsSource="{Binding Tools}" SelectedItem="{Binding SelectedTool}">
-                        <ComboBox.ItemTemplate>
-                            <DataTemplate>
-                                <TextBlock Text="{Binding Name}" />
-                            </DataTemplate>
-                        </ComboBox.ItemTemplate>
-                    </ComboBox>
-                </StackPanel>
-            </GroupBox>
-            <GroupBox Header="Generator" Padding="7">
-                <StackPanel>
-                    <TextBlock TextWrapping="Wrap">This generator will construct an initial <Italic>mod.yml</Italic> for you.</TextBlock>
-                    <Button Content="Generate or update mod.yml" Command="{Binding GenerateCommand}" HorizontalAlignment="Left" Padding="7" />
-                    <userControls:TaskStatusObserverControl Padding="3" Task="{Binding GeneratingTask}" />
-                </StackPanel>
-            </GroupBox>
-            <GroupBox Header="Target files appender" Padding="7">
-                <StackPanel>
-                    <TextBlock TextWrapping="Wrap">This appender will copy the source files from <Italic>GameDataPath</Italic> into <Italic>mod.yml</Italic>. After copy process, you can edit the copied files for modding purpose.</TextBlock>
-                    <TextBlock>GameDataPath</TextBlock>
-                    <userControls:FolderSelectorControl FolderPath="{Binding GameDataPath,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" />
-                    <TextBlock />
-                    <Button Content="Begin" Command="{Binding AppenderCommand}" HorizontalAlignment="Left" Padding="7" />
-                    <userControls:TaskStatusObserverControl Padding="3" Task="{Binding AppenderTask}" />
-                </StackPanel>
-            </GroupBox>
-        </StackPanel>
-    </DockPanel>
-</Window>
diff --git a/OpenKh.Tools.ModsManager/Views/YamlGeneratorWindow.xaml.cs b/OpenKh.Tools.ModsManager/Views/YamlGeneratorWindow.xaml.cs
deleted file mode 100644
index 01fd4928d..000000000
--- a/OpenKh.Tools.ModsManager/Views/YamlGeneratorWindow.xaml.cs
+++ /dev/null
@@ -1,839 +0,0 @@
-using OpenKh.Common;
-using OpenKh.Kh2;
-using OpenKh.Patcher;
-using OpenKh.Patcher.BarEntryExtractor;
-using OpenKh.Tools.Common.Wpf;
-using OpenKh.Tools.ModsManager.Models.ViewHelper;
-using OpenKh.Tools.ModsManager.Services;
-using System;
-using System.Collections.Generic;
-using System.Collections.Immutable;
-using System.ComponentModel;
-using System.IO;
-using System.Linq;
-using System.Reactive.Concurrency;
-using System.Reactive.Disposables;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
-using System.Threading.Tasks;
-using System.Windows;
-using Xe.Tools.Wpf.Commands;
-using YamlDotNet.Serialization;
-
-namespace OpenKh.Tools.ModsManager.Views
-{
-    /// <summary>
-    /// Interaction logic for YamlGeneratorWindow.xaml
-    /// </summary>
-    public partial class YamlGeneratorWindow : Window
-    {
-        private readonly YamlGeneratorService _yamlGeneratorService = new YamlGeneratorService();
-        private readonly GetDiffToolsService _getDiffToolsService = new GetDiffToolsService();
-        private readonly GetActiveWindowService _getActiveWindowService = new GetActiveWindowService();
-        private readonly QueryApplyPatchService _queryApplyPatchService = new QueryApplyPatchService();
-        private readonly KeywordsMatcherService _keywordsMatcherService = new KeywordsMatcherService();
-        private readonly ISerializer _listSer = new SerializerBuilder()
-            .Build();
-        private readonly ProvideExtractorsService _provideExtractorsService = new ProvideExtractorsService();
-        private readonly CompositeDisposable _disposable = new CompositeDisposable();
-
-        private record MixedSource(CopySourceFile CopySourceFile, AssetFile AssetFile);
-
-        public YamlGeneratorVM VM { get; }
-
-        public YamlGeneratorWindow()
-        {
-            InitializeComponent();
-            DataContext = VM = new YamlGeneratorVM();
-
-            var extractors = _provideExtractorsService
-                .GetExtractors()
-                .ToImmutableArray();
-
-            GetDiffService diffTool = null;
-
-            async Task ModifyMetadataAsync(
-                Func<Metadata, Task> action
-            )
-            {
-                var modYmlFilePath = VM.ModYmlFilePath;
-
-                var rawInput = await Task.Run(() => File.Exists(modYmlFilePath))
-                    ? await File.ReadAllBytesAsync(modYmlFilePath)
-                    : null;
-
-                var mod = (rawInput != null)
-                    ? Metadata.Read(new MemoryStream(rawInput, false))
-                    : new Metadata();
-
-                var createNewModYml = mod == null;
-
-                mod ??= new Metadata(); // The empty yaml file brings null instance.
-
-                mod.Title ??= Path.GetFileName(Path.GetDirectoryName(modYmlFilePath));
-                mod.OriginalAuthor ??= "You";
-                mod.Description ??= $"Generated on {DateTime.UtcNow:R}";
-                mod.Assets ??= new List<AssetFile>();
-
-                await action(mod);
-
-                mod.Assets = MergeAssetSource(mod.Assets.ToArray());
-
-                {
-                    var temp = new MemoryStream();
-                    mod.Write(temp);
-                    var rawOutput = temp.ToArray();
-
-                    var rawOutput2 = await diffTool.DiffAsync(rawInput, rawOutput);
-                    if (rawOutput2 != null)
-                    {
-                        if (createNewModYml || await _queryApplyPatchService.QueryAsync())
-                        {
-                            await File.WriteAllBytesAsync(modYmlFilePath, rawOutput2);
-                            return;
-                        }
-                        else
-                        {
-                            return;
-                        }
-                    }
-                    else
-                    {
-                        return;
-                    }
-                }
-            }
-
-            void DisplayCopy(
-                IEnumerable<PrimarySource> primarySourceList,
-                Func<PrimarySource, IEnumerable<CopySourceFile>> getCopySourceList,
-                Func<IEnumerable<CopySourceFile>, Task> proceedAsync
-            )
-            {
-                var copyWin = new CopySourceFilesWindow();
-                copyWin.Owner = _getActiveWindowService.GetActiveWindow();
-                var copyDisposables = new CompositeDisposable();
-                copyWin.Closed += (_, __) =>
-                {
-                    copyWin.Owner?.Focus();
-                    copyDisposables.Dispose();
-                };
-                var copyVm = copyWin.VM;
-                SimpleAsyncActionCommand<object> proceedCopyCommand;
-                copyVm.ProceedCommand = proceedCopyCommand = new SimpleAsyncActionCommand<object>(
-                    async _ =>
-                    {
-                        await proceedAsync(copyVm.CopySourceList);
-
-                        copyWin.Close();
-                    },
-                    task => copyVm.ProceedTask = task
-                )
-                {
-                    IsEnabled = false,
-                };
-
-                copyDisposables.Add(
-                    Observable.FromEvent<PropertyChangedEventHandler, PropertyChangedEventArgs>(
-                        h => (s, e) => h(e),
-                        h => copyVm.PropertyChanged += h,
-                        h => copyVm.PropertyChanged -= h
-                    )
-                        .Where(it => it.PropertyName == null || it.PropertyName == nameof(copyVm.SelectedPrimarySource))
-                        .Select(it => copyVm.SelectedPrimarySource)
-                        .Subscribe(
-                            one =>
-                            {
-                                proceedCopyCommand.IsEnabled = one != null;
-
-                                copyVm.CopySourceList = getCopySourceList(one)
-                                    .ToArray();
-                            }
-                        )
-                );
-
-                copyVm.CheckAllCommand = new RelayCommand(
-                    _ =>
-                    {
-                        copyVm.CopySourceList.ToList().ForEach(it => it.DoAction = true);
-                    }
-                );
-                copyVm.UncheckAllCommand = new RelayCommand(
-                    _ =>
-                    {
-                        copyVm.CopySourceList.ToList().ForEach(it => it.DoAction = false);
-                    }
-                );
-                copyVm.PrimarySourceList = primarySourceList
-                    .ToArray();
-                copyWin.Show();
-            }
-
-            List<AssetFile> CreateSourceFromArgs(params AssetFile[] assetFiles) => new List<AssetFile>(assetFiles);
-
-
-            SimpleAsyncActionCommand<object> appenderCommand;
-
-            VM.AppenderCommand = appenderCommand = new SimpleAsyncActionCommand<object>(
-                async _ =>
-                {
-                    SimpleAsyncActionCommand<object> searchCommand;
-
-                    var sourceDir = VM.GameDataPath;
-                    var destDir = Path.GetDirectoryName(VM.ModYmlFilePath);
-
-                    var targetWindow = new SelectModTargetFilesWindow();
-                    var targetVm = targetWindow.VM;
-                    targetVm.SearchCommand = searchCommand = new SimpleAsyncActionCommand<object>(
-                        async _ =>
-                        {
-                            var ifMatch = _keywordsMatcherService.CreateMatcher(targetVm.SearchKeywords);
-                            targetVm.SearchHits = await Task.Run(
-                                () => Directory.EnumerateFiles(sourceDir, "*", SearchOption.AllDirectories)
-                                    .Select(
-                                        file => (
-                                            Path: file,
-                                            Relative: Path.GetRelativePath(sourceDir, file)
-                                                .Replace('\\', '/')
-                                        )
-                                    )
-                                    .Where(pair => ifMatch(pair.Relative))
-                                    .Select(
-                                        pair => new SearchHit(
-                                            FullPath: pair.Path,
-                                            RelativePath: pair.Relative,
-                                            Display: pair.Relative
-                                        )
-                                    )
-                                    .ToArray()
-                            );
-                        },
-                        it => targetVm.SearchingTask = it
-                    );
-
-                    var selectionIsGood = new BehaviorSubject<bool>(false);
-
-                    var actions = new List<ActionCommand>();
-
-                    SimpleAsyncActionCommand<object> copyMultiCommand;
-                    SimpleAsyncActionCommand<object> copyEachCommand;
-                    SimpleAsyncActionCommand<object> binArcCommand;
-                    SimpleAsyncActionCommand<object> pathCommand;
-
-                    var hits = Enumerable.Empty<SearchHit>();
-
-                    actions.Add(
-                        new ActionCommand(
-                            "Copy multi",
-                            "Choose one more multiple files. And then select a representative file at the next window. Only the representative file will be copied. The rest files will just refer to representative file by multi field.",
-                            copyMultiCommand = new SimpleAsyncActionCommand<object>(
-                                async _ =>
-                                {
-                                    await Task.Yield();
-
-                                    SearchHit selectedHit = null;
-
-                                    DisplayCopy(
-                                        primarySourceList: hits
-                                            .Select(hit => new PrimarySource(hit.Display)),
-                                        getCopySourceList: one =>
-                                        {
-                                            return hits
-                                                .Where(
-                                                    hit => hit.Display == one?.Display
-                                                )
-                                                .Select(
-                                                    hit =>
-                                                    {
-                                                        selectedHit = hit;
-
-                                                        var sourcePath = Path.Combine(sourceDir, hit.RelativePath);
-                                                        var destPath = Path.Combine(destDir, hit.RelativePath);
-                                                        var exists = File.Exists(destPath);
-                                                        return new CopySourceFile(
-                                                            one.Display,
-                                                            "Copy",
-                                                            exists,
-                                                            async () =>
-                                                            {
-                                                                await Task.Run(
-                                                                    () => File.Copy(sourcePath, destPath, true)
-                                                                );
-                                                            }
-                                                        )
-                                                        {
-                                                            DoAction = !exists,
-                                                        };
-                                                    }
-                                                );
-                                        },
-                                        proceedAsync: async copySourceList =>
-                                        {
-                                            foreach (var source in copySourceList.Where(it => it.DoAction))
-                                            {
-                                                await source.AsyncAction();
-                                            }
-
-                                            await ModifyMetadataAsync(
-                                                async mod =>
-                                                {
-                                                    await Task.Yield();
-
-                                                    mod.Assets.Add(
-                                                        new AssetFile
-                                                        {
-                                                            Name = selectedHit.RelativePath,
-                                                            Multi = new List<Multi>(
-                                                                hits
-                                                                    .Where(
-                                                                        hit => !ReferenceEquals(hit, selectedHit)
-                                                                    )
-                                                                    .Select(
-                                                                        hit => new Multi
-                                                                        {
-                                                                            Name = hit.RelativePath,
-                                                                        }
-                                                                    )
-                                                                    .ToArray()
-                                                            ),
-                                                            Method = "copy",
-                                                            Source = CreateSourceFromArgs(
-                                                                new AssetFile
-                                                                {
-                                                                    Name = selectedHit.RelativePath,
-                                                                }
-                                                            ),
-                                                        }
-                                                    );
-                                                }
-                                            );
-                                        }
-                                    );
-                                }
-                            )
-                            {
-                                IsEnabled = false,
-                            }
-                        )
-                    );
-
-                    actions.Add(
-                        new ActionCommand(
-                            "Copy each",
-                            "Choose one more multiple files. Each file is simply copied. And then each file is mapped correspondingly.",
-                            copyEachCommand = new SimpleAsyncActionCommand<object>(
-                                async _ =>
-                                {
-                                    await Task.Yield();
-
-                                    var copySourceList = hits
-                                        .Select(
-                                            hit =>
-                                            {
-                                                var sourcePath = Path.Combine(sourceDir, hit.RelativePath);
-                                                var destPath = Path.Combine(destDir, hit.RelativePath);
-                                                var exists = File.Exists(destPath);
-                                                return new CopySourceFile(
-                                                    hit.RelativePath,
-                                                    "Copy",
-                                                    exists,
-                                                    async () =>
-                                                    {
-                                                        await Task.Run(
-                                                            () => File.Copy(sourcePath, destPath, true)
-                                                        );
-                                                    }
-                                                )
-                                                {
-                                                    DoAction = !exists,
-                                                };
-                                            }
-                                        )
-                                        .ToArray();
-
-                                    DisplayCopy(
-                                        primarySourceList: new PrimarySource[] { new PrimarySource("(No selection needed)") },
-                                        getCopySourceList: one => copySourceList,
-                                        proceedAsync: async copySourceList =>
-                                        {
-                                            foreach (var source in copySourceList.Where(it => it.DoAction))
-                                            {
-                                                await source.AsyncAction();
-                                            }
-
-                                            await ModifyMetadataAsync(
-                                                async mod =>
-                                                {
-                                                    await Task.Yield();
-
-                                                    mod.Assets.AddRange(
-                                                        hits
-                                                            .Select(
-                                                                hit => new AssetFile
-                                                                {
-                                                                    Name = hit.RelativePath,
-                                                                    Method = "copy",
-                                                                    Source = CreateSourceFromArgs(
-                                                                        new AssetFile
-                                                                        {
-                                                                            Name = hit.RelativePath,
-                                                                        }
-                                                                    ),
-                                                                }
-                                                            )
-                                                    );
-                                                }
-                                            );
-                                        }
-                                    );
-                                }
-                            )
-                            {
-                                IsEnabled = false,
-                            }
-                        )
-                    );
-
-                    actions.Add(
-                        new ActionCommand(
-                            "binarc",
-                            "Choose one more multiple files. Expand each file as bar file. And then you can select the required bar entries to be extracted.",
-                            binArcCommand = new SimpleAsyncActionCommand<object>(
-                                async _ =>
-                                {
-                                    await Task.Yield();
-
-                                    IEnumerable<MixedSource> mixedSourceList = Array.Empty<MixedSource>();
-
-                                    IEnumerable<MixedSource> UpdateMixedSourceListAndReturn(bool applyExtractors)
-                                    {
-                                        return mixedSourceList = hits
-                                            .SelectMany(
-                                                hit =>
-                                                {
-                                                    var sourcePath = Path.Combine(sourceDir, hit.RelativePath);
-
-                                                    var stream = new MemoryStream(File.ReadAllBytes(sourcePath), false);
-
-                                                    var barEntries = Bar.IsValid(stream)
-                                                        ? Bar.Read(stream).AsEnumerable()
-                                                        : Array.Empty<Bar.Entry>();
-
-                                                    return barEntries
-                                                        .Select(
-                                                            barEntry =>
-                                                            {
-                                                                var extractor = applyExtractors
-                                                                    ? extractors.FirstOrDefault(
-                                                                        one => one.IfApply(barEntry.Name, barEntry.Type, barEntry.Index)
-                                                                            && one.SourceFileTest(hit.RelativePath)
-                                                                    )
-                                                                    : null;
-
-                                                                var destRelative = Path.Combine(
-                                                                    Path.GetDirectoryName(hit.RelativePath),
-                                                                    $"{Path.GetFileNameWithoutExtension(hit.RelativePath)}_{barEntry.Name}{extractor?.FileExtension}"
-                                                                );
-                                                                var destPath = Path.Combine(
-                                                                    destDir,
-                                                                    destRelative
-                                                                );
-
-                                                                var exists = File.Exists(destPath);
-
-                                                                var copySourceFile = new CopySourceFile(
-                                                                    $"{hit.RelativePath} ({barEntry.Name} {barEntry.Type} {extractor?.FileExtension})",
-                                                                    "Extract",
-                                                                    exists,
-                                                                    async () =>
-                                                                    {
-                                                                        await Task.Run(
-                                                                            async () =>
-                                                                            {
-                                                                                Directory.CreateDirectory(Path.GetDirectoryName(destPath));
-
-                                                                                using (var destStream = File.Create(destPath))
-                                                                                {
-                                                                                    if (extractor?.ExtractAsync != null)
-                                                                                    {
-                                                                                        await destStream.WriteAsync(
-                                                                                            await extractor.ExtractAsync(barEntry)
-                                                                                        );
-                                                                                    }
-                                                                                    else
-                                                                                    {
-                                                                                        barEntry.Stream.FromBegin().CopyTo(destStream);
-                                                                                    }
-                                                                                }
-                                                                            }
-                                                                        );
-                                                                    }
-                                                                )
-                                                                {
-                                                                    DoAction = !exists,
-                                                                };
-
-                                                                var assetFile = new AssetFile
-                                                                {
-                                                                    Name = hit.RelativePath,
-                                                                    Method = "binarc",
-                                                                    Source = (extractor?
-                                                                        .SourceBuilder(
-                                                                            new SourceBuilderArg(
-                                                                                DestName: barEntry.Name,
-                                                                                DestType: barEntry.Type.ToString().ToLowerInvariant(),
-                                                                                SourceName: destRelative.Replace('\\', '/'),
-                                                                                OriginalRelativePath: hit.RelativePath
-                                                                            )
-                                                                        )?
-                                                                        .ToList()
-                                                                    )
-                                                                        ?? CreateSourceFromArgs(
-                                                                            new AssetFile
-                                                                            {
-                                                                                Name = barEntry.Name,
-                                                                                Type = barEntry.Type.ToString().ToLowerInvariant(),
-                                                                                Method = "copy",
-                                                                                Source = CreateSourceFromArgs(
-                                                                                    new AssetFile
-                                                                                    {
-                                                                                        Name = destRelative.Replace('\\', '/'),
-                                                                                    }
-                                                                                ),
-                                                                            }
-                                                                    ),
-                                                                };
-
-                                                                return new MixedSource(copySourceFile, assetFile);
-                                                            }
-                                                        );
-                                                }
-                                            )
-                                            .ToArray();
-                                    }
-
-                                    var applyExtractors = new PrimarySource("Apply built in extractors");
-                                    var applyNone = new PrimarySource("None");
-
-                                    DisplayCopy(
-                                        primarySourceList: new PrimarySource[] { applyExtractors, applyNone, },
-                                        getCopySourceList: one =>
-                                        {
-                                            return UpdateMixedSourceListAndReturn(
-                                                applyExtractors: ReferenceEquals(one, applyExtractors)
-                                            )
-                                                .Select(tuple => tuple.CopySourceFile);
-                                        },
-                                        proceedAsync: async copySourceList =>
-                                        {
-                                            foreach (var source in copySourceList.Where(it => it.DoAction))
-                                            {
-                                                try
-                                                {
-                                                    await source.AsyncAction();
-                                                }
-                                                catch (Exception ex)
-                                                {
-                                                    throw new Exception($"Error while processing of: {source.Display}", ex);
-                                                }
-                                            }
-
-                                            await ModifyMetadataAsync(
-                                                async mod =>
-                                                {
-                                                    await Task.Yield();
-
-                                                    mod.Assets.AddRange(
-                                                        mixedSourceList
-                                                            .Where(
-                                                                tuple => tuple.CopySourceFile.DoAction || tuple.CopySourceFile.DestinationFileExists
-                                                            )
-                                                            .Select(
-                                                                tuple => tuple.AssetFile
-                                                            )
-                                                    );
-                                                }
-                                            );
-                                        }
-                                    );
-                                }
-                            )
-                            {
-                                IsEnabled = false,
-                            }
-                        )
-                    );
-
-                    actions.Add(
-                        new ActionCommand(
-                            "path",
-                            "Choose one more multiple files. And then, this will display the path list of selected files, as multi field of mod.yml file.",
-                            pathCommand = new SimpleAsyncActionCommand<object>(
-                                async _ =>
-                                {
-                                    await Task.Yield();
-
-                                    var noteWin = new NotepadWindow();
-                                    var noteVm = noteWin.VM;
-                                    noteVm.Text = _listSer.Serialize(
-                                        new
-                                        {
-                                            multi = hits
-                                                .Select(hit => hit.RelativePath)
-                                                .ToArray(),
-                                        }
-                                    );
-                                    noteWin.Owner = _getActiveWindowService.GetActiveWindow();
-                                    noteWin.Closed += (_, __) => noteWin.Owner?.Focus();
-                                    noteWin.Show();
-                                }
-                            )
-                            {
-                                IsEnabled = false,
-                            }
-                        )
-                    );
-
-                    targetVm.Actions = actions;
-
-                    selectionIsGood
-                        .ObserveOn(Scheduler.Immediate)
-                        .Subscribe(
-                            it =>
-                            {
-                                copyMultiCommand.IsEnabled = it;
-                                copyEachCommand.IsEnabled = it;
-                                binArcCommand.IsEnabled = it;
-                                pathCommand.IsEnabled = it;
-                            }
-                        );
-
-                    var targetDisposables = new CompositeDisposable();
-
-                    targetDisposables.Add(
-                        Observable.FromEvent<PropertyChangedEventHandler, PropertyChangedEventArgs>(
-                            h => (s, e) => h(e),
-                            h => targetVm.PropertyChanged += h,
-                            h => targetVm.PropertyChanged -= h
-                        )
-                            .Where(it => it.PropertyName == null || it.PropertyName == nameof(targetVm.SearchHitSelectedList))
-                            .Select(it => targetVm.SearchHitSelectedList)
-                            .Subscribe(
-                                them =>
-                                {
-                                    hits = them;
-                                    selectionIsGood.OnNext(them.Any());
-                                }
-                            )
-                    );
-
-                    targetWindow.Owner = _getActiveWindowService.GetActiveWindow();
-                    targetWindow.Closed += (_, __) =>
-                    {
-                        targetWindow.Owner?.Focus();
-                        targetDisposables.Dispose();
-                    };
-                    targetWindow.Show();
-                },
-                task => VM.AppenderTask = task
-            );
-
-            SimpleAsyncActionCommand<object> generateCommand;
-
-            VM.GenerateCommand = generateCommand = new SimpleAsyncActionCommand<object>(
-                async _ =>
-                {
-                    await ModifyMetadataAsync(
-                        async mod =>
-                        {
-                            await _yamlGeneratorService.RefillAssetFilesAsync(
-                            assetFiles: mod.Assets,
-                            sourceDir: Path.GetDirectoryName(VM.ModYmlFilePath)
-                        );
-                        }
-                    );
-                },
-                    task => VM.GeneratingTask = task
-                );
-
-            var toolIsGood = new BehaviorSubject<bool>(false);
-
-            var vmPropertyChanged = Observable.FromEvent<PropertyChangedEventHandler, PropertyChangedEventArgs>(
-                h => (s, e) => h(e),
-                h => VM.PropertyChanged += h,
-                h => VM.PropertyChanged -= h
-            );
-
-            _disposable.Add(
-                vmPropertyChanged
-                    .Where(it => it.PropertyName == null || it.PropertyName == nameof(VM.Tools))
-                    .Select(it => VM.Tools.FirstOrDefault())
-                    .ObserveOn(Scheduler.Immediate)
-                    .Subscribe(
-                        it =>
-                        {
-                            diffTool = it;
-                            toolIsGood.OnNext(it != null);
-                        }
-                    )
-            );
-
-            var ymlFilePathIsGood = new BehaviorSubject<bool>(false);
-
-            _disposable.Add(
-                vmPropertyChanged
-                    .Where(it => it.PropertyName == null || it.PropertyName == nameof(VM.ModYmlFilePath))
-                    .Select(it => VM.ModYmlFilePath)
-                    .ObserveOn(Scheduler.Immediate)
-                    .Subscribe(
-                        it =>
-                        {
-                            ymlFilePathIsGood.OnNext(it.Length != 0);
-                        }
-                    )
-            );
-
-            Observable
-                .CombineLatest(toolIsGood, ymlFilePathIsGood)
-                .ObserveOn(Scheduler.Immediate)
-                .Subscribe(array => generateCommand.IsEnabled = array.All(it => it));
-
-            var gameDataPathIsGood = new BehaviorSubject<bool>(false);
-
-            _disposable.Add(
-                vmPropertyChanged
-                    .Where(it => it.PropertyName == null || it.PropertyName == nameof(VM.GameDataPath))
-                    .Select(it => VM.GameDataPath)
-                    .ObserveOn(Scheduler.Immediate)
-                    .Subscribe(
-                        path =>
-                        {
-                            try
-                            {
-                                gameDataPathIsGood.OnNext((1 <= path?.Length) && Directory.Exists(path));
-                            }
-                            catch
-                            {
-                                // ignore
-                            }
-                        }
-                    )
-            );
-
-            Observable
-                .CombineLatest(ymlFilePathIsGood, gameDataPathIsGood)
-                .ObserveOn(Scheduler.Immediate)
-                .Subscribe(array => appenderCommand.IsEnabled = array.All(it => it));
-
-            {
-                VM.Tools = _getDiffToolsService.GetDiffServices(".yml")
-                    .Append(
-                        new GetDiffService
-                        {
-                            Name = "Use output as is",
-                            DiffAsync = async (rawInput, rawOutput) =>
-                            {
-                                await Task.Yield();
-                                return rawOutput;
-                            }
-                        }
-                    )
-                    .ToArray();
-            }
-
-            void LoadPref(ConfigurationService.YamlGenPref pref)
-            {
-                VM.GameDataPath = pref.GameDataPath;
-                VM.ModYmlFilePath = pref.ModYmlFilePath;
-            }
-
-            VM.LoadPrefCommand = new RelayCommand(
-                _ =>
-                {
-                    if (ConfigurationService.YamlGenPrefs.LastOrDefault(it => it.Label == VM.PrefLabel) is ConfigurationService.YamlGenPref pref)
-                    {
-                        LoadPref(pref);
-                    }
-                }
-            );
-
-            VM.SavePrefCommand = new RelayCommand(
-                _ =>
-                {
-                    if (VM.PrefLabel.Length == 0)
-                    {
-                        VM.PrefLabel = $"Saved at {DateTime.Now}";
-                    }
-
-                    var prefList = ConfigurationService.YamlGenPrefs.ToList();
-                    prefList.RemoveAll(
-                        pref => pref.Label == VM.PrefLabel
-                    );
-                    prefList.Add(
-                        new ConfigurationService.YamlGenPref
-                        {
-                            Label = VM.PrefLabel,
-                            GameDataPath = VM.GameDataPath,
-                            ModYmlFilePath = VM.ModYmlFilePath,
-                        }
-                    );
-                    ConfigurationService.YamlGenPrefs = prefList;
-
-                    var prev = VM.SelectedPref;
-                    VM.Prefs = prefList;
-                    VM.SelectedPref = prefList.LastOrDefault(it => it.Label == prev?.Label);
-                }
-            );
-
-            VM.Prefs = ConfigurationService.YamlGenPrefs;
-
-            if (ConfigurationService.YamlGenPrefs.LastOrDefault(it => it.Label == "default") is ConfigurationService.YamlGenPref pref)
-            {
-                VM.SelectedPref = pref;
-                LoadPref(pref);
-            }
-        }
-
-        private List<AssetFile> MergeAssetSource(IEnumerable<AssetFile> sourceAssets)
-        {
-            var newAssets = new List<AssetFile>();
-
-            foreach (var source in sourceAssets)
-            {
-                if (false)
-                { }
-                else if (source.Method == "copy")
-                {
-                    newAssets.RemoveAll(it => it.Name == source.Name);
-                    newAssets.Add(source);
-                }
-                else if (source.Method == "binarc")
-                {
-                    var exists = newAssets.FirstOrDefault(it => it.Name == source.Name && it.Method == source.Method);
-                    if (exists == null)
-                    {
-                        exists = source;
-                        newAssets.Add(exists);
-                    }
-
-                    exists.Source ??= new List<AssetFile>();
-
-                    foreach (var one in source.Source?.ToArray() ?? Enumerable.Empty<AssetFile>())
-                    {
-                        exists.Source.RemoveAll(it => it.Name == one.Name && it.Method == one.Method);
-                        exists.Source.Add(one);
-                    }
-
-                }
-            }
-
-            return newAssets;
-        }
-
-        protected override void OnClosed(EventArgs e)
-        {
-            base.OnClosed(e);
-            _disposable.Dispose();
-        }
-    }
-}
diff --git a/OpenKh.Tools.ModsManager/WinSettings.Designer.cs b/OpenKh.Tools.ModsManager/WinSettings.Designer.cs
deleted file mode 100644
index 60a46a1e8..000000000
--- a/OpenKh.Tools.ModsManager/WinSettings.Designer.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace OpenKh.Tools.ModsManager {
-    
-    
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.12.0.0")]
-    internal sealed partial class WinSettings : global::System.Configuration.ApplicationSettingsBase {
-        
-        private static WinSettings defaultInstance = ((WinSettings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new WinSettings())));
-        
-        public static WinSettings Default {
-            get {
-                return defaultInstance;
-            }
-        }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("320")]
-        public double Top {
-            get {
-                return ((double)(this["Top"]));
-            }
-            set {
-                this["Top"] = value;
-            }
-        }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("660")]
-        public double Width {
-            get {
-                return ((double)(this["Width"]));
-            }
-            set {
-                this["Width"] = value;
-            }
-        }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("450")]
-        public double Height {
-            get {
-                return ((double)(this["Height"]));
-            }
-            set {
-                this["Height"] = value;
-            }
-        }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("640")]
-        public double Left {
-            get {
-                return ((double)(this["Left"]));
-            }
-            set {
-                this["Left"] = value;
-            }
-        }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("False")]
-        public bool Maximized {
-            get {
-                return ((bool)(this["Maximized"]));
-            }
-            set {
-                this["Maximized"] = value;
-            }
-        }
-    }
-}
diff --git a/OpenKh.Tools.ModsManager/WinSettings.settings b/OpenKh.Tools.ModsManager/WinSettings.settings
deleted file mode 100644
index 69ad13e11..000000000
--- a/OpenKh.Tools.ModsManager/WinSettings.settings
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="OpenKh.Tools.ModsManager" GeneratedClassName="WinSettings">
-  <Profiles />
-  <Settings>
-    <Setting Name="Top" Type="System.Double" Scope="User">
-      <Value Profile="(Default)">320</Value>
-    </Setting>
-    <Setting Name="Width" Type="System.Double" Scope="User">
-      <Value Profile="(Default)">660</Value>
-    </Setting>
-    <Setting Name="Height" Type="System.Double" Scope="User">
-      <Value Profile="(Default)">450</Value>
-    </Setting>
-    <Setting Name="Left" Type="System.Double" Scope="User">
-      <Value Profile="(Default)">640</Value>
-    </Setting>
-    <Setting Name="Maximized" Type="System.Boolean" Scope="User">
-      <Value Profile="(Default)">False</Value>
-    </Setting>
-  </Settings>
-</SettingsFile>
\ No newline at end of file
diff --git a/OpenKh.sln b/OpenKh.sln
index 65f4f3209..757a2b986 100644
--- a/OpenKh.sln
+++ b/OpenKh.sln
@@ -178,8 +178,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenKh.Tools.OloEditor", "O
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenKh.Tools.MissionEditor", "OpenKh.Tools.MissionEditor\OpenKh.Tools.MissionEditor.csproj", "{A88E268F-A8CC-48E4-8AE9-5CC7A774022D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenKh.Tools.ModsManager", "OpenKh.Tools.ModsManager\OpenKh.Tools.ModsManager.csproj", "{A1BCC739-3BDC-41AF-BD0B-78C5E55F88A2}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenKh.Tools.Launcher", "OpenKh.Tools.Launcher\OpenKh.Tools.Launcher.csproj", "{B33409B4-C097-4CE2-98A7-36C4FF41BCFA}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenKh.Kh1", "OpenKh.Kh1\OpenKh.Kh1.csproj", "{EB189B6E-AFA0-463D-8DE8-A51ED32969FD}"
@@ -208,6 +206,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenKh.Command.AnbMaker", "
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenKh.Command.Bdxio", "OpenKh.Command.Bdxio\OpenKh.Command.Bdxio.csproj", "{F0A7BD0D-C717-45D5-9544-4C3AECC3740F}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenKh.Command.Bdxio.Library", "OpenKh.Command.Bdxio.Library\OpenKh.Command.Bdxio.Library.csproj", "{62F250C4-F2BD-47C1-BCAE-05E7D7F9206D}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenKh.DeeperTree", "OpenKh.DeeperTree\OpenKh.DeeperTree.csproj", "{1D074EA4-9964-43EC-9389-7E60C2545C13}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenKh.Command.Txa", "OpenKh.Command.Txa\OpenKh.Command.Txa.csproj", "{EAD6D51F-5106-4E11-A4E4-104A18C0235B}"
@@ -226,14 +226,24 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ModelingToolkit", "Modeling
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Graphical tool tests", "Graphical tool tests", "{EC12F6FC-5753-430C-AE13-09EFD219E432}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenKh.Tests.ModsManager", "OpenKh.Tests.ModsManager\OpenKh.Tests.ModsManager.csproj", "{788CDE3D-77D8-4910-8D1A-C829EFD591D2}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenKh.Command.KHAnimationConverter", "OpenKh.Command.KHAnimationConverter\OpenKh.Command.KHAnimationConverter.csproj", "{A8DAC079-E416-4574-9B54-19EED185D368}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Openkh.Tools.Kh2LocalSetEditor", "Openkh.Tools.Kh2LocalSetEditor\Openkh.Tools.Kh2LocalSetEditor.csproj", "{D58EEC5B-962C-4888-953B-4A443015E45D}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenKh.Recom", "OpenKh.Recom\OpenKh.Recom.csproj", "{E9CAA582-1823-4B42-8218-F4B7B2C788D3}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenKh.Tools.ModsManager.Core", "OpenKh.Tools.ModsManager.Core\OpenKh.Tools.ModsManager.Core.csproj", "{E57E5A3D-CDEA-4A40-BC51-43ECAB0F1E02}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenKh.Tools.ModsManager", "OpenKh.Tools.ModsManager.Avalonia\OpenKh.Tools.ModsManager.csproj", "{0596515A-353E-4762-95E9-851B6CE93E9E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{0AB3BF05-4346-4AA6-1389-037BE0695223}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenKh.Tests.ModsManager.Core", "OpenKh.Tests.ModsManager.Core\OpenKh.Tests.ModsManager.Core.csproj", "{8EB2DE33-35DB-49FC-B38C-39D3597917AC}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenKh.Tests.ModsManager.Avalonia", "OpenKh.Tests.ModsManager.Avalonia\OpenKh.Tests.ModsManager.Avalonia.csproj", "{2675DCA2-0E95-485C-85EA-ED56F2206899}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenKh.Tests.Launcher.Avalonia", "OpenKh.Tests.Launcher.Avalonia\OpenKh.Tests.Launcher.Avalonia.csproj", "{FC8505CD-CFBE-471D-8E19-0A1341017B44}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		.NET Debug|Any CPU = .NET Debug|Any CPU
@@ -738,14 +748,6 @@ Global
 		{A88E268F-A8CC-48E4-8AE9-5CC7A774022D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A88E268F-A8CC-48E4-8AE9-5CC7A774022D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A88E268F-A8CC-48E4-8AE9-5CC7A774022D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A1BCC739-3BDC-41AF-BD0B-78C5E55F88A2}..NET Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A1BCC739-3BDC-41AF-BD0B-78C5E55F88A2}..NET Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A1BCC739-3BDC-41AF-BD0B-78C5E55F88A2}..NET Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A1BCC739-3BDC-41AF-BD0B-78C5E55F88A2}..NET Release|Any CPU.Build.0 = Release|Any CPU
-		{A1BCC739-3BDC-41AF-BD0B-78C5E55F88A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A1BCC739-3BDC-41AF-BD0B-78C5E55F88A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A1BCC739-3BDC-41AF-BD0B-78C5E55F88A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A1BCC739-3BDC-41AF-BD0B-78C5E55F88A2}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B33409B4-C097-4CE2-98A7-36C4FF41BCFA}..NET Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B33409B4-C097-4CE2-98A7-36C4FF41BCFA}..NET Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B33409B4-C097-4CE2-98A7-36C4FF41BCFA}..NET Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -856,6 +858,14 @@ Global
 		{F0A7BD0D-C717-45D5-9544-4C3AECC3740F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F0A7BD0D-C717-45D5-9544-4C3AECC3740F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F0A7BD0D-C717-45D5-9544-4C3AECC3740F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{62F250C4-F2BD-47C1-BCAE-05E7D7F9206D}..NET Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{62F250C4-F2BD-47C1-BCAE-05E7D7F9206D}..NET Debug|Any CPU.Build.0 = Debug|Any CPU
+		{62F250C4-F2BD-47C1-BCAE-05E7D7F9206D}..NET Release|Any CPU.ActiveCfg = Release|Any CPU
+		{62F250C4-F2BD-47C1-BCAE-05E7D7F9206D}..NET Release|Any CPU.Build.0 = Release|Any CPU
+		{62F250C4-F2BD-47C1-BCAE-05E7D7F9206D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{62F250C4-F2BD-47C1-BCAE-05E7D7F9206D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{62F250C4-F2BD-47C1-BCAE-05E7D7F9206D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{62F250C4-F2BD-47C1-BCAE-05E7D7F9206D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1D074EA4-9964-43EC-9389-7E60C2545C13}..NET Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1D074EA4-9964-43EC-9389-7E60C2545C13}..NET Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1D074EA4-9964-43EC-9389-7E60C2545C13}..NET Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -920,14 +930,6 @@ Global
 		{3603444C-3A1B-487D-AA6B-9AACB5530DD6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3603444C-3A1B-487D-AA6B-9AACB5530DD6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3603444C-3A1B-487D-AA6B-9AACB5530DD6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{788CDE3D-77D8-4910-8D1A-C829EFD591D2}..NET Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{788CDE3D-77D8-4910-8D1A-C829EFD591D2}..NET Debug|Any CPU.Build.0 = Debug|Any CPU
-		{788CDE3D-77D8-4910-8D1A-C829EFD591D2}..NET Release|Any CPU.ActiveCfg = Release|Any CPU
-		{788CDE3D-77D8-4910-8D1A-C829EFD591D2}..NET Release|Any CPU.Build.0 = Release|Any CPU
-		{788CDE3D-77D8-4910-8D1A-C829EFD591D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{788CDE3D-77D8-4910-8D1A-C829EFD591D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{788CDE3D-77D8-4910-8D1A-C829EFD591D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{788CDE3D-77D8-4910-8D1A-C829EFD591D2}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A8DAC079-E416-4574-9B54-19EED185D368}..NET Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A8DAC079-E416-4574-9B54-19EED185D368}..NET Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A8DAC079-E416-4574-9B54-19EED185D368}..NET Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -952,6 +954,46 @@ Global
 		{E9CAA582-1823-4B42-8218-F4B7B2C788D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E9CAA582-1823-4B42-8218-F4B7B2C788D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E9CAA582-1823-4B42-8218-F4B7B2C788D3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E57E5A3D-CDEA-4A40-BC51-43ECAB0F1E02}..NET Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E57E5A3D-CDEA-4A40-BC51-43ECAB0F1E02}..NET Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E57E5A3D-CDEA-4A40-BC51-43ECAB0F1E02}..NET Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E57E5A3D-CDEA-4A40-BC51-43ECAB0F1E02}..NET Release|Any CPU.Build.0 = Release|Any CPU
+		{E57E5A3D-CDEA-4A40-BC51-43ECAB0F1E02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E57E5A3D-CDEA-4A40-BC51-43ECAB0F1E02}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E57E5A3D-CDEA-4A40-BC51-43ECAB0F1E02}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E57E5A3D-CDEA-4A40-BC51-43ECAB0F1E02}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0596515A-353E-4762-95E9-851B6CE93E9E}..NET Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0596515A-353E-4762-95E9-851B6CE93E9E}..NET Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0596515A-353E-4762-95E9-851B6CE93E9E}..NET Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0596515A-353E-4762-95E9-851B6CE93E9E}..NET Release|Any CPU.Build.0 = Release|Any CPU
+		{0596515A-353E-4762-95E9-851B6CE93E9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0596515A-353E-4762-95E9-851B6CE93E9E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0596515A-353E-4762-95E9-851B6CE93E9E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0596515A-353E-4762-95E9-851B6CE93E9E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8EB2DE33-35DB-49FC-B38C-39D3597917AC}..NET Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8EB2DE33-35DB-49FC-B38C-39D3597917AC}..NET Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8EB2DE33-35DB-49FC-B38C-39D3597917AC}..NET Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8EB2DE33-35DB-49FC-B38C-39D3597917AC}..NET Release|Any CPU.Build.0 = Release|Any CPU
+		{8EB2DE33-35DB-49FC-B38C-39D3597917AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8EB2DE33-35DB-49FC-B38C-39D3597917AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8EB2DE33-35DB-49FC-B38C-39D3597917AC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8EB2DE33-35DB-49FC-B38C-39D3597917AC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2675DCA2-0E95-485C-85EA-ED56F2206899}..NET Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2675DCA2-0E95-485C-85EA-ED56F2206899}..NET Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2675DCA2-0E95-485C-85EA-ED56F2206899}..NET Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2675DCA2-0E95-485C-85EA-ED56F2206899}..NET Release|Any CPU.Build.0 = Release|Any CPU
+		{2675DCA2-0E95-485C-85EA-ED56F2206899}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2675DCA2-0E95-485C-85EA-ED56F2206899}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2675DCA2-0E95-485C-85EA-ED56F2206899}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2675DCA2-0E95-485C-85EA-ED56F2206899}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FC8505CD-CFBE-471D-8E19-0A1341017B44}..NET Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FC8505CD-CFBE-471D-8E19-0A1341017B44}..NET Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FC8505CD-CFBE-471D-8E19-0A1341017B44}..NET Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FC8505CD-CFBE-471D-8E19-0A1341017B44}..NET Release|Any CPU.Build.0 = Release|Any CPU
+		{FC8505CD-CFBE-471D-8E19-0A1341017B44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FC8505CD-CFBE-471D-8E19-0A1341017B44}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FC8505CD-CFBE-471D-8E19-0A1341017B44}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FC8505CD-CFBE-471D-8E19-0A1341017B44}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1024,7 +1066,6 @@ Global
 		{5B6A7706-0028-4634-AE35-18E2BEAFD3D4} = {402B2669-D594-4DFA-965B-02A92626ADC6}
 		{940E9927-13D3-4CC7-8034-37982E3885C2} = {402B2669-D594-4DFA-965B-02A92626ADC6}
 		{A88E268F-A8CC-48E4-8AE9-5CC7A774022D} = {402B2669-D594-4DFA-965B-02A92626ADC6}
-		{A1BCC739-3BDC-41AF-BD0B-78C5E55F88A2} = {402B2669-D594-4DFA-965B-02A92626ADC6}
 		{B33409B4-C097-4CE2-98A7-36C4FF41BCFA} = {402B2669-D594-4DFA-965B-02A92626ADC6}
 		{EB189B6E-AFA0-463D-8DE8-A51ED32969FD} = {0FB7CD6A-EE31-467D-A590-267DCD028618}
 		{3EF82533-6397-496F-A70F-429BB3611A17} = {9AEB4887-7C23-4992-A26D-A1E73DC4FE53}
@@ -1039,6 +1080,7 @@ Global
 		{6EF1EA92-13A6-4B3D-A465-54B6C9319AC5} = {0FB7CD6A-EE31-467D-A590-267DCD028618}
 		{D1180437-8B35-4A18-8A08-425B876159B2} = {9C52D787-9819-4B89-989B-EEA6FEB20731}
 		{F0A7BD0D-C717-45D5-9544-4C3AECC3740F} = {9C52D787-9819-4B89-989B-EEA6FEB20731}
+		{62F250C4-F2BD-47C1-BCAE-05E7D7F9206D} = {9C52D787-9819-4B89-989B-EEA6FEB20731}
 		{1D074EA4-9964-43EC-9389-7E60C2545C13} = {0FB7CD6A-EE31-467D-A590-267DCD028618}
 		{EAD6D51F-5106-4E11-A4E4-104A18C0235B} = {9C52D787-9819-4B89-989B-EEA6FEB20731}
 		{4A16893C-3E9B-4547-AE22-FDF7FD216137} = {402B2669-D594-4DFA-965B-02A92626ADC6}
@@ -1046,10 +1088,14 @@ Global
 		{A635E041-7F5D-4CD5-BB87-0F692EA1AD3E} = {4FBC958A-4685-4DF2-8D4F-98850BAE61B3}
 		{E9AE2FAE-4335-4C75-9272-3B6C6D70072B} = {402B2669-D594-4DFA-965B-02A92626ADC6}
 		{3603444C-3A1B-487D-AA6B-9AACB5530DD6} = {4FBC958A-4685-4DF2-8D4F-98850BAE61B3}
-		{788CDE3D-77D8-4910-8D1A-C829EFD591D2} = {EC12F6FC-5753-430C-AE13-09EFD219E432}
 		{A8DAC079-E416-4574-9B54-19EED185D368} = {9C52D787-9819-4B89-989B-EEA6FEB20731}
 		{D58EEC5B-962C-4888-953B-4A443015E45D} = {402B2669-D594-4DFA-965B-02A92626ADC6}
 		{E9CAA582-1823-4B42-8218-F4B7B2C788D3} = {0FB7CD6A-EE31-467D-A590-267DCD028618}
+		{E57E5A3D-CDEA-4A40-BC51-43ECAB0F1E02} = {0FB7CD6A-EE31-467D-A590-267DCD028618}
+		{0596515A-353E-4762-95E9-851B6CE93E9E} = {402B2669-D594-4DFA-965B-02A92626ADC6}
+		{8EB2DE33-35DB-49FC-B38C-39D3597917AC} = {0AB3BF05-4346-4AA6-1389-037BE0695223}
+		{2675DCA2-0E95-485C-85EA-ED56F2206899} = {0AB3BF05-4346-4AA6-1389-037BE0695223}
+		{FC8505CD-CFBE-471D-8E19-0A1341017B44} = {0AB3BF05-4346-4AA6-1389-037BE0695223}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {1DF3960B-4FE5-4E56-92D4-2FC0A912E823}
diff --git a/build.ps1 b/build.ps1
index c58e114f3..4fc653c1b 100644
--- a/build.ps1
+++ b/build.ps1
@@ -34,6 +34,13 @@ function Get-CSProjects([string]$filter) {
         if ( Test-Path -Path $csprojPath -PathType Leaf ) {
             Write-Output $csprojPath
         }
+        else {
+            # Some projects retain their public assembly name after moving to a platform-specific directory.
+            $projectFiles = @(Get-ChildItem -LiteralPath $_.FullName -Filter "*.csproj" -File)
+            if ($projectFiles.Count -eq 1) {
+                Write-Output $projectFiles[0].FullName
+            }
+        }
     }
 }
 
@@ -53,23 +60,24 @@ dotnet test --configuration $sourceConfiguration --verbosity $verbosity
 Test-Success $LASTEXITCODE
 
 # Create temporary solution
-dotnet new sln -n $solutionBase --force
+dotnet new sln -n $solutionBase --force --format sln
 Test-Success $LASTEXITCODE
 
 # Add items to solution
 Get-CSProjects "OpenKh.Command.*" | ForEach-Object {
-    dotnet sln $solution add $_
+    dotnet sln $solution add $_ --in-root --include-references false
+    Test-Success $LASTEXITCODE
 }
 Get-CSProjects "OpenKh.Tools.*" | ForEach-Object {
-    dotnet sln $solution add $_
+    dotnet sln $solution add $_ --in-root --include-references false
     Test-Success $LASTEXITCODE
 }
 Get-CSProjects "OpenKh.WinShell.*" | ForEach-Object {
-    dotnet sln $solution add $_
+    dotnet sln $solution add $_ --in-root --include-references false
     Test-Success $LASTEXITCODE
 }
 Get-CSProjects "OpenKh.Game*" | ForEach-Object {
-    dotnet sln $solution add $_
+    dotnet sln $solution add $_ --in-root --include-references false
     Test-Success $LASTEXITCODE
 }
 
diff --git a/distribution/AppImage/AppRun b/distribution/AppImage/AppRun
new file mode 100644
index 000000000..c41f5174f
--- /dev/null
+++ b/distribution/AppImage/AppRun
@@ -0,0 +1,18 @@
+#!/bin/sh
+set -eu
+
+APP_DIRECTORY="${APPDIR:-$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)}"
+APP_ROOT="$APP_DIRECTORY/usr/lib/openkh"
+DATA_ROOT="${OPENKH_DATA_ROOT:-${XDG_DATA_HOME:-$HOME/.local/share}/OpenKH}"
+
+mkdir -p "$DATA_ROOT"
+export OPENKH_DATA_ROOT="$DATA_ROOT"
+export LD_LIBRARY_PATH="$APP_DIRECTORY/usr/lib:${APP_ROOT}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}"
+cd "$DATA_ROOT"
+
+if [ "${1:-}" = "--mod-manager" ]; then
+    shift
+    exec "$APP_ROOT/Apps/OpenKh.Tools.ModsManager" --data-root "$DATA_ROOT" "$@"
+fi
+
+exec "$APP_ROOT/OpenKh.Launcher" "$@"
diff --git a/distribution/AppImage/openkh.desktop b/distribution/AppImage/openkh.desktop
new file mode 100644
index 000000000..863a31017
--- /dev/null
+++ b/distribution/AppImage/openkh.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Name=OpenKH
+Comment=Manage and play Kingdom Hearts mods
+Exec=openkh
+Icon=openkh
+Terminal=false
+Categories=Game;Utility;
+StartupWMClass=OpenKh.Launcher
diff --git a/distribution/README-LINUX.txt b/distribution/README-LINUX.txt
new file mode 100644
index 000000000..76fb107c1
--- /dev/null
+++ b/distribution/README-LINUX.txt
@@ -0,0 +1,44 @@
+OPENKH QUICK START FOR LINUX AND STEAM DECK
+============================================
+
+APPIMAGE
+--------
+
+Download openkh-x86_64.AppImage, make it executable, and run it:
+
+    chmod +x openkh-x86_64.AppImage
+    ./openkh-x86_64.AppImage
+
+The AppImage contains both the Launcher and Mod Manager. Settings, installed
+mods, and extracted game data are stored in $XDG_DATA_HOME/OpenKH or, when that
+variable is not set, $HOME/.local/share/OpenKH.
+
+PORTABLE TAR.GZ
+---------------
+
+Open a terminal in this folder and run:
+
+    sh install-openkh-linux.sh
+
+The installer makes the applications executable and adds OpenKH to the desktop
+application menu. On Steam Deck, open Steam in Desktop Mode, select "Add a
+Non-Steam Game", and choose OpenKH. You can then return to Game Mode.
+
+Start OpenKH with the launcher. Choose "Open Mod Manager" to install and play
+mods. The launcher and Mod Manager support Steam Input, SDL controllers, and the
+Steam Deck floating keyboard in text fields.
+
+For Steam PC releases, OpenKH starts the game through Steam and Proton. Steam
+launch options configured for the collection are preserved. For Epic Games
+Store releases, OpenKH uses Heroic or Legendary when either launcher is
+installed. Panacea can be installed from Setup on Linux and is injected into
+the Windows game under Proton or Wine.
+
+The Apps folder contains the Mod Manager and its required resources. Keep it
+next to the launcher.
+
+Use "Check for Updates" in the launcher footer to check and install the Linux
+OpenKH package. Updates are only installed after you confirm them.
+
+Documentation: https://openkh.dev/
+Support:       https://discord.openkh.dev/
diff --git a/distribution/install-openkh-linux.sh b/distribution/install-openkh-linux.sh
new file mode 100644
index 000000000..6bbf1b385
--- /dev/null
+++ b/distribution/install-openkh-linux.sh
@@ -0,0 +1,24 @@
+#!/usr/bin/env sh
+set -eu
+
+SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
+APPLICATIONS_DIR="$HOME/.local/share/applications"
+DESKTOP_FILE="$APPLICATIONS_DIR/openkh.desktop"
+
+chmod +x "$SCRIPT_DIR/OpenKh.Launcher"
+chmod +x "$SCRIPT_DIR/Apps/OpenKh.Tools.ModsManager"
+mkdir -p "$APPLICATIONS_DIR"
+
+{
+    printf '%s\n' '[Desktop Entry]'
+    printf '%s\n' 'Type=Application'
+    printf '%s\n' 'Name=OpenKH'
+    printf '%s\n' 'Comment=Open the OpenKH Launcher'
+    printf 'Exec="%s"\n' "$SCRIPT_DIR/OpenKh.Launcher"
+    printf 'Path="%s"\n' "$SCRIPT_DIR"
+    printf '%s\n' 'Terminal=false'
+    printf '%s\n' 'Categories=Game;Utility;'
+} > "$DESKTOP_FILE"
+
+echo "OpenKH was added to the application menu."
+echo "Steam Deck users can now add it to Steam from Desktop Mode."
diff --git a/global.json b/global.json
index 285b9d372..512142d2b 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.416",
+    "version": "10.0.100",
     "rollForward": "latestFeature"
   }
 }